diff options
| author | Eric Fry | 2018-05-02 18:46:32 +1000 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | 2f551cabbacf64d336a855ec087fb6e31c484161 (patch) | |
| tree | 7876ccaba47771958dbd827802c96efeda0550c4 /engines/illusions | |
| parent | 5dd96b6fbe574d8ea2ec3710b46fe94779c3d3ce (diff) | |
| download | scummvm-rg350-2f551cabbacf64d336a855ec087fb6e31c484161.tar.gz scummvm-rg350-2f551cabbacf64d336a855ec087fb6e31c484161.tar.bz2 scummvm-rg350-2f551cabbacf64d336a855ec087fb6e31c484161.zip | |
ILLUSIONS: Change video skip key from escape to space
Add debug logging on unknown background info field
Removed unused debug variables
Diffstat (limited to 'engines/illusions')
| -rw-r--r-- | engines/illusions/duckman/scriptopcodes_duckman.cpp | 2 | ||||
| -rw-r--r-- | engines/illusions/illusions.cpp | 2 | ||||
| -rw-r--r-- | engines/illusions/resources/backgroundresource.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/illusions/duckman/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp index c453aebd0a..db8a7a8b15 100644 --- a/engines/illusions/duckman/scriptopcodes_duckman.cpp +++ b/engines/illusions/duckman/scriptopcodes_duckman.cpp @@ -276,7 +276,7 @@ void ScriptOpcodes_Duckman::opUnloadResourcesBySceneId(ScriptThread *scriptThrea //static uint dsceneId = 0x10002, dthreadId = 0x20001;//Debug menu, not supported //static uint dsceneId = 0x10044, dthreadId = 0x000202B8; // Starship Enterprise //static uint dsceneId = 0x00010039, dthreadId = 0x00020089; // Map -static uint dsceneId = 0x00010052, dthreadId = 0x00020347; // Credits +//static uint dsceneId = 0x00010052, dthreadId = 0x00020347; // Credits void ScriptOpcodes_Duckman::opChangeScene(ScriptThread *scriptThread, OpCall &opCall) { ARG_SKIP(2); diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp index 7b2f5f9b04..cc8e769726 100644 --- a/engines/illusions/illusions.cpp +++ b/engines/illusions/illusions.cpp @@ -303,7 +303,7 @@ void IllusionsEngine::playVideo(uint32 videoId, uint32 objectId, uint32 priority Common::Event event; while (_eventMan->pollEvent(event)) { - if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || + if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_SPACE) || event.type == Common::EVENT_LBUTTONUP) skipVideo = true; } diff --git a/engines/illusions/resources/backgroundresource.cpp b/engines/illusions/resources/backgroundresource.cpp index 68bccf7ced..1eff8e044f 100644 --- a/engines/illusions/resources/backgroundresource.cpp +++ b/engines/illusions/resources/backgroundresource.cpp @@ -58,7 +58,7 @@ void TileMap::load(byte *dataStart, Common::SeekableReadStream &stream) { void BgInfo::load(byte *dataStart, Common::SeekableReadStream &stream) { _flags = stream.readUint32LE(); - stream.skip(2); // Unknown + uint16 unknown = stream.readUint16LE(); // TODO Unknown _priorityBase = stream.readSint16LE(); _surfInfo.load(stream); loadPoint(stream, _panPoint); @@ -67,8 +67,8 @@ void BgInfo::load(byte *dataStart, Common::SeekableReadStream &stream) { stream.seek(tileMapOffs); _tileMap.load(dataStart, stream); _tilePixels = dataStart + tilePixelsOffs; - debug(0, "BgInfo::load() _flags: %08X; _priorityBase: %d; tileMapOffs: %08X; tilePixelsOffs: %08X", - _flags, _priorityBase, tileMapOffs, tilePixelsOffs); + debug(0, "BgInfo::load() _flags: %08X; unknown: %04X; _priorityBase: %d; tileMapOffs: %08X; tilePixelsOffs: %08X", + _flags, unknown, _priorityBase, tileMapOffs, tilePixelsOffs); } // PriorityLayer |