aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2010-04-11 18:30:42 +0000
committerJohannes Schickel2010-04-11 18:30:42 +0000
commitb928da4418d7acf05cc1b0889b0142fee177681e (patch)
treecd1d4b8f19a6ea2c4fb2615db2f2e540a7866d05 /engines/scumm/scumm.cpp
parent19e620ba60cf08b8d039dff3777061da1a0b21b8 (diff)
downloadscummvm-rg350-b928da4418d7acf05cc1b0889b0142fee177681e.tar.gz
scummvm-rg350-b928da4418d7acf05cc1b0889b0142fee177681e.tar.bz2
scummvm-rg350-b928da4418d7acf05cc1b0889b0142fee177681e.zip
Setup and destroy a dummy cursor and palette in the Engine class.
The idea behind this is exactly the same as behind r48620, but it affects all engines, thus engine authors can now use CursorMan.replaceCursor without having to worry about possible memory leaks or the like. svn-id: r48626
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index a24fc650a5..5555d961b2 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -550,12 +550,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
Common::addDebugChannel(debugChannels[i].flag, debugChannels[i].channel, debugChannels[i].desc);
g_eventRec.registerRandomSource(_rnd, "scumm");
-
- // Setup a dummy cursor and palette. The latter is only
- // required by HE, thus we might consider to do that only
- // for HE games.
- CursorMan.pushCursor(NULL, 0, 0, 0, 0, 0);
- CursorMan.pushCursorPalette(NULL, 0, 0);
}
@@ -612,10 +606,6 @@ ScummEngine::~ScummEngine() {
delete _res;
delete _gdi;
-
- // Remove our cursors again to prevent memory leaks
- CursorMan.popCursor();
- CursorMan.popCursorPalette();
}