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

Oops. Moved too much code in the last commit.

Browse source 
svn-id: r30162
This commit is contained in:
Eugene Sandulenko 2008-01-02 18:59:15 +00:00
parent 2d94049bea
commit 040a7b54fa
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/scumm/cursor.cpp
View file

@ -468,12 +468,6 @@ void ScummEngine_v2::setBuiltinCursor(int idx) {
} }
void ScummEngine_v5::resetCursors() { void ScummEngine_v5::resetCursors() {
// All "classic" games (V5 and older) encrypted their data files
// with exception of the GF_OLD256 games and the PC-Engine version
// of Loom.
if (!(_game.features & GF_OLD256) && _game.platform != Common::kPlatformPCEngine)
_game.features |= GF_USE_KEY;
static const uint16 default_cursor_images[4][16] = { static const uint16 default_cursor_images[4][16] = {
/* cross-hair */ /* cross-hair */
{ 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0000, 0x7e3f, { 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0000, 0x7e3f,

6
engines/scumm/scumm.cpp
View file

@ -602,6 +602,12 @@ ScummEngine::~ScummEngine() {
ScummEngine_v5::ScummEngine_v5(OSystem *syst, const DetectorResult &dr) ScummEngine_v5::ScummEngine_v5(OSystem *syst, const DetectorResult &dr)
: ScummEngine(syst, dr) { : ScummEngine(syst, dr) {
// All "classic" games (V5 and older) encrypted their data files
// with exception of the GF_OLD256 games and the PC-Engine version
// of Loom.
if (!(_game.features & GF_OLD256) && _game.platform != Common::kPlatformPCEngine)
_game.features |= GF_USE_KEY;
resetCursors(); resetCursors();
// Setup flashlight // Setup flashlight