diff options
-rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
-rw-r--r-- | engines/dreamweb/dreambase.h | 2 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.cpp | 2 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.h | 1 | ||||
-rw-r--r-- | engines/dreamweb/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/dreamweb/sound.cpp | 2 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 4 | ||||
-rw-r--r-- | engines/dreamweb/titles.cpp | 4 |
8 files changed, 10 insertions, 8 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index a8abb4f18e..d5db8b0f06 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -138,6 +138,7 @@ p = parser(skip_binary_data = [ 'currentframe', 'takeoff', 'reelpointer', + 'roomssample', 'needsoundbuff', 'oldint8seg', 'oldint8add', diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h index c9bb2dfd86..14e3349448 100644 --- a/engines/dreamweb/dreambase.h +++ b/engines/dreamweb/dreambase.h @@ -118,6 +118,8 @@ public: bool _subtitles; bool _foreignRelease; + uint8 _roomsSample; + // from backdrop.cpp void doBlocks(); uint8 getXAd(const uint8 *setData, uint8 *result); diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 331122ea05..7c4d9baa2b 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -75,7 +75,7 @@ void DreamGenContext::__start() { //0x0150: .... .... .... .... 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //0x0160: .... .... .... .... - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, }; ds.assign(src, src + sizeof(src)); dreamweb(); } diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 5a0100dcd9..65293fa8f3 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -306,7 +306,6 @@ static const uint16 kCh0repeat = 373; static const uint16 kCh1playing = 374; static const uint16 kCh1blockstocopy = 375; static const uint16 kCurrentsample = 377; -static const uint16 kRoomssample = 378; static const uint16 kBlocktextdat = (0); static const uint16 kPersonframes = (0); static const uint16 kDebuglevel1 = (0); diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp index 525c48e4d4..159f8865f0 100644 --- a/engines/dreamweb/saveload.cpp +++ b/engines/dreamweb/saveload.cpp @@ -440,7 +440,7 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) { const Room ¤tRoom = g_roomData[data.byte(kLocation)]; Room madeUpRoom = currentRoom; - madeUpRoom.roomsSample = data.byte(kRoomssample); + madeUpRoom.roomsSample = _roomsSample; madeUpRoom.mapX = data.byte(kMapx); madeUpRoom.mapY = data.byte(kMapy); madeUpRoom.liftFlag = data.byte(kLiftflag); diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp index 289bca9aea..83482194b7 100644 --- a/engines/dreamweb/sound.cpp +++ b/engines/dreamweb/sound.cpp @@ -97,7 +97,7 @@ void DreamBase::cancelCh1() { } void DreamBase::loadRoomsSample() { - uint8 sample = data.byte(kRoomssample); + uint8 sample = _roomsSample; if (sample == 255 || data.byte(kCurrentsample) == sample) return; // loaded already diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 6a7516bf82..8ad7b3d114 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -1034,7 +1034,7 @@ void DreamBase::clearAndLoad(uint16 seg, uint8 c, void DreamBase::startLoading(const Room &room) { data.byte(kCombatcount) = 0; - data.byte(kRoomssample) = room.roomsSample; + _roomsSample = room.roomsSample; data.byte(kMapx) = room.mapX; data.byte(kMapy) = room.mapY; data.byte(kLiftflag) = room.liftFlag; @@ -3159,7 +3159,7 @@ void DreamBase::showGun() { data.byte(kColourpos) = 0; data.byte(kNumtofade) = 128; hangOn(200); - data.byte(kRoomssample) = 34; + _roomsSample = 34; loadRoomsSample(); data.byte(kVolume) = 0; loadIntoTemp("DREAMWEB.G13"); diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp index a521036202..ed54c4b09e 100644 --- a/engines/dreamweb/titles.cpp +++ b/engines/dreamweb/titles.cpp @@ -38,7 +38,7 @@ void DreamBase::endGame() { void DreamBase::monkSpeaking() { // FIXME: This is the CD version only. - data.byte(kRoomssample) = 35; + _roomsSample = 35; loadRoomsSample(); loadIntoTemp("DREAMWEB.G15"); clearWork(); @@ -263,7 +263,7 @@ void DreamBase::set16ColPalette() { } void DreamBase::realCredits() { - data.byte(kRoomssample) = 33; + _roomsSample = 33; loadRoomsSample(); data.byte(kVolume) = 0; |