thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Explain the rational of the CursorMan.pushCursor calls directly

Browse source 
Instead of referring to the commit log of a prior ref.
Also rewrap some comments.

svn-id: r48628
This commit is contained in:
Max Horn 2010-04-11 19:04:24 +00:00
parent f2ff555996
commit 3745c73788
1 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
engines/engine.cpp
View file

@ -99,22 +99,28 @@ Engine::Engine(OSystem *syst)
Common::setErrorOutputFormatter(defaultOutputFormatter);
Common::setErrorHandler(defaultErrorHandler);
// FIXME: Get rid of the following again. It is only here temporarily.
// We really should never run with a non-working Mixer, so ought to handle
// this at a much earlier stage. If we *really* want to support systems
// without a working mixer, then we need more work. E.g. we could modify the
// Mixer to immediately drop any streams passed to it. This way, at least
// we don't crash because heaps of (sound) memory get allocated but never
// freed. Of course, there still would be problems with many games...
// FIXME: Get rid of the following again. It is only here
// temporarily. We really should never run with a non-working Mixer,
// so ought to handle this at a much earlier stage. If we *really*
// want to support systems without a working mixer, then we need
// more work. E.g. we could modify the Mixer to immediately drop any
// streams passed to it. This way, at least we don't crash because
// heaps of (sound) memory get allocated but never freed. Of course,
// there still would be problems with many games...
if (!_mixer->isReady())
warning("Sound initialization failed. This may cause severe problems in some games.");
// Setup a dummy cursor and palette, so that all engines can use CursorMan.replace
// without having any headaches about memory leaks. Check commit log of r48620 for
// some information about this.
// Setup a dummy cursor and palette, so that all engines can use
// CursorMan.replace without having any headaches about memory leaks.
//
// If an engine only used CursorMan.replaceCursor and no cursor has
// been setup before, then replaceCursor just uses pushCursor. This
// means that that the engine's cursor is never again removed from
// CursorMan. Hence we setup a fake cursor here and remove it again
// in the destructor.
CursorMan.pushCursor(NULL, 0, 0, 0, 0, 0);
// Note: Using this dummy palette will actually disable cursor palettes till the
// user enables it again.
// Note: Using this dummy palette will actually disable cursor
// palettes till the user enables it again.
CursorMan.pushCursorPalette(NULL, 0, 0);
}