diff options
author | Eugene Sandulenko | 2004-01-26 15:41:30 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2004-01-26 15:41:30 +0000 |
commit | 7a7cb7e02b6cebdeeaf17eb7a30646813c322d01 (patch) | |
tree | 424000ed8f6847074ff540b1a2747a2a5e5c50c2 /scumm/insane | |
parent | 64a99ea13dc044ede1a41650b97357f124ebd060 (diff) | |
download | scummvm-rg350-7a7cb7e02b6cebdeeaf17eb7a30646813c322d01.tar.gz scummvm-rg350-7a7cb7e02b6cebdeeaf17eb7a30646813c322d01.tar.bz2 scummvm-rg350-7a7cb7e02b6cebdeeaf17eb7a30646813c322d01.zip |
o Fixed bug with lost inventory
o Gave meaningful names to many variables
o Eliminated some slipped debug output
o Fixed vista-ranch scenes transition
o Now it is possible to equip goggles
svn-id: r12623
Diffstat (limited to 'scumm/insane')
-rw-r--r-- | scumm/insane/insane.cpp | 29 | ||||
-rw-r--r-- | scumm/insane/insane.h | 23 | ||||
-rw-r--r-- | scumm/insane/insane_ben.cpp | 26 | ||||
-rw-r--r-- | scumm/insane/insane_iact.cpp | 32 | ||||
-rw-r--r-- | scumm/insane/insane_scenes.cpp | 136 |
5 files changed, 111 insertions, 135 deletions
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp index 5e0c3dbd68..fe10f9cb51 100644 --- a/scumm/insane/insane.cpp +++ b/scumm/insane/insane.cpp @@ -145,31 +145,24 @@ void Insane::initvars(void) { _kickEnemyProgress = false; _weaponEnemyJustSwitched = false; _beenCheated = 0; + _posBrokenTruck = 0; + _posBrokenCar = 0; + _roadLeftBranch = false; + _roadRightBranch = false; + _carIsBroken = false; _val11d = 0; _val32d = -1; _val51d = 0; _val52d = 0; _val53d = 0; _val54d = 0; - _val55d = 0; - _val56d = 0; _val57d = 0; - _val109w = 0x40; - _val10b = 3; - _val110w = 0x100; - _val111w = 0x20; - _val112w = 0x20; - _val113d = 1; - _val115w = 0; - _val116w = 0; - _val119_ = false; - _val120_ = false; + _val115_ = false; _val121_ = false; _val122_ = false; _val123_ = false; _val124_ = false; _val211d = 0; - _val212_ = 0; _val213d = 0; _val214d = -1; _val215d = 0; @@ -677,11 +670,11 @@ void Insane::readState(void) { _smlayer_room = readArray(320); _smlayer_room2 = readArray(321); - _val55d = readArray(322); + _posBrokenTruck = readArray(322); _val53d = readArray(323); _val57d = readArray(324); _val52d = readArray(325); - _val56d = readArray(326); + _posBrokenCar = readArray(326); _val54d = readArray(327); _val51d = readArray(328); _enemy[EN_TORQUE].field_8 = readArray(337); @@ -1090,8 +1083,8 @@ void Insane::escapeKeyHandler(void) { case 16: writeArray(4, 0); writeArray(5, 1); - writeArray(1, _val56d); - writeArray(3, _val55d); + writeArray(1, _posBrokenCar); + writeArray(3, _posBrokenTruck); smush_setToFinish(); break; case 15: @@ -1175,12 +1168,10 @@ int Insane::smlayer_loadSound(int id, int flag, int phase) { } void Insane::IMUSE_shutVolume(void) { - debug(0, "***************************************************"); _vm->_imuse->pause(true); } void Insane::IMUSE_restoreVolume(void) { - debug(0, "***************************************************"); _vm->_imuse->pause(false); } diff --git a/scumm/insane/insane.h b/scumm/insane/insane.h index f4bd574dd4..c5f075d1b1 100644 --- a/scumm/insane/insane.h +++ b/scumm/insane/insane.h @@ -158,35 +158,26 @@ class Insane { byte _smush_earlyFluContents[0x31a]; int16 _enemyState[9][10]; byte _iactBits[0x80]; - int32 _val8d; - byte _val10b; + int16 _mainRoadPos; + int16 _posBrokenCar; + int16 _posBrokenTruck; + bool _roadLeftBranch; + bool _roadRightBranch; + bool _carIsBroken; int32 _val11d; int32 _val32d; - int32 _val50d; int32 _val51d; int32 _val52d; int32 _val53d; int32 _val54d; - int32 _val55d; - int32 _val56d; int32 _val57d; - int16 _val109w; - int16 _val110w; - int16 _val111w; - int16 _val112w; - int32 _val113d; int32 _val114d16[16]; - int16 _val115w; - int16 _val116w; - bool _val119_; - bool _val120_; + bool _val115_; bool _val121_; bool _val122_; bool _val123_; bool _val124_; - int32 _val128d; int32 _val211d; - int32 _val212_; int32 _val213d; int32 _val214d; int32 _val215d; diff --git a/scumm/insane/insane_ben.cpp b/scumm/insane/insane_ben.cpp index 6f81feaaa3..ee55c34ebe 100644 --- a/scumm/insane/insane_ben.cpp +++ b/scumm/insane/insane_ben.cpp @@ -239,7 +239,7 @@ void Insane::mineChooseRoad(int32 buttons) { return; if (_actor[0].field_8 == 112) { - if (_actor[0].frame < 18 || !_needSceneSwitch) + if (_actor[0].frame < 18 || _needSceneSwitch) return; queueSceneSwitch(18, 0, "fishgogg.san", 64, 0, 0, 0); @@ -254,7 +254,7 @@ void Insane::mineChooseRoad(int32 buttons) { smush_setToFinish(); } - if (_val119_ && !_needSceneSwitch) { + if (_roadLeftBranch && !_needSceneSwitch) { _iactSceneId2 = _iactSceneId; queueSceneSwitch(2, 0, "mineexit.san", 64, 0, 0, 0); } @@ -275,7 +275,7 @@ void Insane::mineChooseRoad(int32 buttons) { drawSpeedyActor(buttons); - if ((buttons & 1) && _currSceneId == 1 && _val119_ && !_needSceneSwitch) { + if ((buttons & 1) && _currSceneId == 1 && _roadLeftBranch && !_needSceneSwitch) { _iactSceneId2 = _iactSceneId; queueSceneSwitch(2, 0, "mineexit.san", 64, 0, 0, 0); } @@ -301,7 +301,7 @@ void Insane::mineChooseRoad(int32 buttons) { if ((buttons & 1) == 0) return; - if (_val119_ && !_needSceneSwitch) { + if (_roadLeftBranch && !_needSceneSwitch) { _iactSceneId2 = _iactSceneId; if (readArray(4) && _val211d < 3) { @@ -312,16 +312,16 @@ void Insane::mineChooseRoad(int32 buttons) { } } - if (_val120_) { - writeArray(1, _val55d); + if (_roadRightBranch) { + writeArray(1, _posBrokenTruck); writeArray(3, _val57d); smush_setToFinish(); } - if (!_val212_) + if (!_carIsBroken) return; - writeArray(1, _val56d); + writeArray(1, _posBrokenCar); writeArray(3, _val57d); smush_setToFinish(); break; @@ -338,7 +338,7 @@ void Insane::mineChooseRoad(int32 buttons) { if ((buttons & 1) == 0) return; - if (_val119_ && !_needSceneSwitch) { + if (_roadLeftBranch && !_needSceneSwitch) { _iactSceneId2 = _iactSceneId; if (readArray(4) && _val211d < 3) { @@ -349,16 +349,16 @@ void Insane::mineChooseRoad(int32 buttons) { } } - if (_val120_) { - writeArray(1, _val55d); + if (_roadRightBranch) { + writeArray(1, _posBrokenTruck); writeArray(3, _val53d); smush_setToFinish(); } - if (!_val212_) + if (!_carIsBroken) return; - writeArray(1, _val56d); + writeArray(1, _posBrokenCar); writeArray(3, _val53d); smush_setToFinish(); break; diff --git a/scumm/insane/insane_iact.cpp b/scumm/insane/insane_iact.cpp index 42f7cc513c..99d5c4679b 100644 --- a/scumm/insane/insane_iact.cpp +++ b/scumm/insane/insane_iact.cpp @@ -36,7 +36,7 @@ namespace Scumm { void Insane::procIACT(byte *renderBitmap, int32 codecparam, int32 setupsan12, int32 setupsan13, Chunk &b, int32 size, int32 flags) { - if (_keyboardDisable || _val116w) + if (_keyboardDisable) return; switch (_currSceneId) { @@ -134,14 +134,14 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12, case 38: smlayer_drawSomething(renderBitmap, codecparam, 50, 20, 3, _smush_iconsNut, 7, 0, 0); - _val119_ = true; + _roadLeftBranch = true; _iactSceneId = par4; break; case 7: if (readArray(4) != 0) return; - _val120_ = true; + _roadRightBranch = true; smlayer_drawSomething(renderBitmap, codecparam, 160, 20, 3, _smush_icons2Nut, 8, 0, 0); break; @@ -149,7 +149,7 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (readArray(4) == 0 || readArray(6) == 0) return; - writeArray(1, _val55d); + writeArray(1, _posBrokenTruck); writeArray(3, _val57d); smush_setToFinish(); @@ -194,7 +194,7 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (_val32d < 0 || _val32d > 4) if (readArray(8)) { smlayer_drawSomething(renderBitmap, codecparam, 270, 20, 3, - _smush_icons2Nut, 20, 0, 0); + _smush_iconsNut, 20, 0, 0); _val122_ = true; } } @@ -427,14 +427,14 @@ void Insane::iactScene4(byte *renderBitmap, int32 codecparam, int32 setupsan12, case 38: smlayer_drawSomething(renderBitmap, codecparam, 270, 20, 3, _smush_icons2Nut, 10, 0, 0); - _val119_ = true; + _roadLeftBranch = true; _iactSceneId = par4; break; case 7: if (readArray(4) != 0) return; - _val120_ = true; + _roadRightBranch = true; smlayer_drawSomething(renderBitmap, codecparam, 160, 20, 3, _smush_icons2Nut, 8, 0, 0); break; @@ -442,7 +442,7 @@ void Insane::iactScene4(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (readArray(4) == 0 || readArray(6) == 0) return; - writeArray(1, _val55d); + writeArray(1, _posBrokenTruck); writeArray(3, _val57d); smush_setToFinish(); @@ -451,14 +451,14 @@ void Insane::iactScene4(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (readArray(5) == 0) return; - _val212_ = true; + _carIsBroken = true; smlayer_drawSomething(renderBitmap, codecparam, 160, 20, 3, _smush_icons2Nut, 8, 0, 0); break; case 11: smlayer_drawSomething(renderBitmap, codecparam, 50, 20, 3, _smush_icons2Nut, 9, 0, 0); - _val119_ = true; + _roadLeftBranch = true; _iactSceneId = par4; break; } @@ -508,14 +508,14 @@ void Insane::iactScene6(byte *renderBitmap, int32 codecparam, int32 setupsan12, case 38: smlayer_drawSomething(renderBitmap, codecparam, 270, 20, 3, _smush_icons2Nut, 10, 0, 0); - _val119_ = true; + _roadLeftBranch = true; _iactSceneId = par4; break; case 7: if (readArray(4) != 0) return; - _val120_ = true; + _roadRightBranch = true; smlayer_drawSomething(renderBitmap, codecparam, 160, 20, 3, _smush_icons2Nut, 8, 0, 0); break; @@ -523,7 +523,7 @@ void Insane::iactScene6(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (readArray(4) == 0 || readArray(6) == 0) return; - writeArray(1, _val55d); + writeArray(1, _posBrokenTruck); writeArray(3, _val53d); smush_setToFinish(); @@ -532,14 +532,14 @@ void Insane::iactScene6(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (readArray(5) == 0) return; - _val212_ = true; + _carIsBroken = true; smlayer_drawSomething(renderBitmap, codecparam, 160, 20, 3, _smush_icons2Nut, 8, 0, 0); break; case 11: smlayer_drawSomething(renderBitmap, codecparam, 50, 20, 3, _smush_icons2Nut, 9, 0, 0); - _val119_ = true; + _roadLeftBranch = true; _iactSceneId = par4; break; } @@ -571,7 +571,7 @@ void Insane::iactScene17(byte *renderBitmap, int32 codecparam, int32 setupsan12, case 38: smlayer_drawSomething(renderBitmap, codecparam, 28, 48, 1, _smush_iconsNut, 6, 0, 0); - _val119_ = true; + _roadLeftBranch = true; _iactSceneId = par4; if (_counter1 <= 4) { if (_counter1 == 4) diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp index 49d5540016..7a6c101b39 100644 --- a/scumm/insane/insane_scenes.cpp +++ b/scumm/insane/insane_scenes.cpp @@ -45,13 +45,6 @@ void Insane::runScene(int arraynum) { _numberArray = arraynum; - // set4Values() - _val109w = 114; - _val110w = 256; - _val111w = 4; - _val112w = 256; - // set1Value() - _val113d = 0; // zeroValues1() _objArray2Idx = 0; _objArray2Idx2 = 0; @@ -67,7 +60,6 @@ void Insane::runScene(int arraynum) { smush_warpMouse(160, 100, -1); putActors(); readState(); - _val10b = _val50d; // FIXME: seems to be unused setTrsFile(_trsFilePtr); // FIXME: we don't need it debug(0, "INSANE Arg: %d", readArray(0)); @@ -77,18 +69,19 @@ void Insane::runScene(int arraynum) { initScene(1); setupValues(); smlayer_setActorCostume(0, 2, readArray(10)); - smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1+190, _smlayer_room2); + smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1 + 190, _smlayer_room2); startVideo("minedriv.san", 1, 32, 12, 0); break; case 2: setupValues(); smlayer_setActorCostume(0, 2, readArray(11)); - smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1+190, _smlayer_room2); - _val8d = readArray(2); - if (_val55d) { + smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1 + 190, _smlayer_room2); + + _mainRoadPos = readArray(2); + if (_mainRoadPos == _posBrokenTruck) { initScene(5); startVideo("tovista2.san", 1, 32, 12, 0); - } else if (_val56d) { + } else if (_mainRoadPos == _posBrokenCar) { initScene(5); startVideo("tovista2.san", 1, 32, 12, 0, _smush_tovista2Flu, 60); } else { @@ -99,12 +92,12 @@ void Insane::runScene(int arraynum) { case 3: setupValues(); smlayer_setActorCostume(0, 2, readArray(11)); - smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1+190, _smlayer_room2); - _val8d = readArray(2); - if (_val55d) { + smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1 + 190, _smlayer_room2); + _mainRoadPos = readArray(2); + if (_mainRoadPos == _posBrokenTruck) { initScene(6); startVideo("toranch.san", 1, 32, 12, 0, _smush_toranchFlu, 300); - } else if (_val56d) { + } else if (_mainRoadPos == _posBrokenCar) { initScene(6); startVideo("toranch.san", 1, 32, 12, 0, _smush_toranchFlu, 240); } else { @@ -128,7 +121,7 @@ void Insane::runScene(int arraynum) { setupValues(); smlayer_setFluPalette(_smush_roadrashRip, 1); smlayer_setActorCostume(0, 2, readArray(10)); - smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1+190, _smlayer_room2); + smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1 + 190, _smlayer_room2); startVideo("minedriv.san", 1, 32, 12, 0, _smush_minedrivFlu, 420); break; case 7: @@ -196,6 +189,7 @@ int Insane::initScene(int sceneId) { _sceneData2Loaded = 1; _currSceneId = sceneId; + return 1; } @@ -624,7 +618,7 @@ void Insane::setSceneCostumes(int sceneId) { switch (sceneId) { case 1: smlayer_setActorCostume(0, 2, readArray(10)); - smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1+190, _smlayer_room2); + smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1 + 190, _smlayer_room2); smlayer_setFluPalette(_smush_roadrashRip, 0); setupValues(); return; @@ -645,7 +639,7 @@ void Insane::setSceneCostumes(int sceneId) { return; break; case 21: - _currEnemy = EN_ROTT3; // PATCH + _currEnemy = EN_ROTT3; setEnemyCostumes(); _actor[1].y = 200; smlayer_setFluPalette(_smush_roadrashRip, 0); @@ -804,6 +798,7 @@ void Insane::procPreRendering(void) { switchSceneIfNeeded(); if (_sceneData1Loaded) { + _val115_ = 1; if (!_keyboardDisable) { smush_changeState(1); _smush_isPauseImuse = true; @@ -811,13 +806,12 @@ void Insane::procPreRendering(void) { _keyboardDisable = 1; } } else { - _val115w = 0; + _val115_ = 0; if (_keyboardDisable) { - if (!_val116w) { - smush_changeState(0); - _smush_isPauseImuse = false; - IMUSE_restoreVolume(); - } + smush_changeState(0); + _smush_isPauseImuse = false; + IMUSE_restoreVolume(); + _keyboardDisable = 0; } } @@ -830,7 +824,7 @@ void Insane::procPostRendering(byte *renderBitmap, int32 codecparam, int32 setup int32 tmpSnd; bool needMore = false; - if(!_keyboardDisable && !_val116w) { + if(!_keyboardDisable) { switch (_currSceneId) { case 12: postCase11(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame); @@ -978,7 +972,7 @@ void Insane::procPostRendering(byte *renderBitmap, int32 codecparam, int32 setup _actor[1].act[0].frame++; } - if (!_val115w) { + if (!_val115_) { smlayer_overrideDrawActorAt(&renderBitmap[0], renderBitmap[2], renderBitmap[3]); _isBenCut = 0; } @@ -986,7 +980,7 @@ void Insane::procPostRendering(byte *renderBitmap, int32 codecparam, int32 setup if (_isBenCut) smlayer_drawSomething(renderBitmap, codecparam, 89, 56, 1, _smush_bencutNut, 0, 0, 0); - if (!_keyboardDisable && !_val116w) + if (!_keyboardDisable) _vm->processActors(); if (needMore) @@ -1006,8 +1000,8 @@ void Insane::postCase11(byte *renderBitmap, int32 codecparam, int32 setupsan12, _continueFrame, 1300); } } - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; } void Insane::postCase0(byte *renderBitmap, int32 codecparam, int32 setupsan12, @@ -1021,8 +1015,8 @@ void Insane::postCase0(byte *renderBitmap, int32 codecparam, int32 setupsan12, smush_rewindCurrentSan(1088, -1, -1); _val121_ = false; - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; _val122_ = false; _val123_ = false; _continueFrame1 = curFrame; @@ -1041,8 +1035,8 @@ void Insane::postCase17(byte *renderBitmap, int32 codecparam, int32 setupsan12, writeArray(9, 0); } } - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; } void Insane::postCase16(byte *renderBitmap, int32 codecparam, int32 setupsan12, @@ -1080,8 +1074,8 @@ void Insane::postCase16(byte *renderBitmap, int32 codecparam, int32 setupsan12, } _val121_ = false; _val123_ = false; - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; _val124_ = false; _counter1++; _continueFrame1 = curFrame; @@ -1098,8 +1092,8 @@ void Insane::postCase1(byte *renderBitmap, int32 codecparam, int32 setupsan12, queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0, flu->startFrame, flu->numFrames); } - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; } void Insane::postCase2(byte *renderBitmap, int32 codecparam, int32 setupsan12, @@ -1114,8 +1108,8 @@ void Insane::postCase2(byte *renderBitmap, int32 codecparam, int32 setupsan12, smush_rewindCurrentSan(1088, -1, -1); _val121_ = false; - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; _continueFrame = curFrame; } @@ -1128,8 +1122,8 @@ void Insane::postCase20(byte *renderBitmap, int32 codecparam, int32 setupsan12, smush_rewindCurrentSan(1088, -1, -1); _val121_ = false; - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; _continueFrame = curFrame; } @@ -1171,9 +1165,9 @@ void Insane::postCase3(byte *renderBitmap, int32 codecparam, int32 setupsan12, } } - _val212_ = false; - _val120_ = false; - _val119_ = false; + _carIsBroken = false; + _roadRightBranch = false; + _roadLeftBranch = false; _iactSceneId = 0; } @@ -1203,9 +1197,9 @@ void Insane::postCase5(byte *renderBitmap, int32 codecparam, int32 setupsan12, } } - _val212_ = false; - _val120_ = false; - _val119_ = false; + _carIsBroken = false; + _roadRightBranch = false; + _roadLeftBranch = false; _iactSceneId = 0; } @@ -1222,8 +1216,8 @@ void Insane::postCase6(byte *renderBitmap, int32 codecparam, int32 setupsan12, queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0, flu->startFrame, flu->numFrames); } - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; } void Insane::postCase8(byte *renderBitmap, int32 codecparam, int32 setupsan12, @@ -1244,8 +1238,8 @@ void Insane::postCase8(byte *renderBitmap, int32 codecparam, int32 setupsan12, } } - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; } void Insane::postCase9(byte *renderBitmap, int32 codecparam, int32 setupsan12, @@ -1255,8 +1249,8 @@ void Insane::postCase9(byte *renderBitmap, int32 codecparam, int32 setupsan12, queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, _continueFrame1, 1300); } - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; } void Insane::postCase10(byte *renderBitmap, int32 codecparam, int32 setupsan12, @@ -1282,19 +1276,19 @@ void Insane::postCase10(byte *renderBitmap, int32 codecparam, int32 setupsan12, switch (_enemy[_currEnemy].weapon) { case INV_CHAIN: - _actor[1].inventory[INV_CHAIN] = 1; + _actor[0].inventory[INV_CHAIN] = 1; queueSceneSwitch(12, 0, "liftchay.san", 0, 0, 0, 0); break; case INV_CHAINSAW: - _actor[1].inventory[INV_CHAINSAW] = 1; + _actor[0].inventory[INV_CHAINSAW] = 1; queueSceneSwitch(12, 0, "liftsaw.san", 0, 0, 0, 0); break; case INV_MACE: - _actor[1].inventory[INV_MACE] = 1; + _actor[0].inventory[INV_MACE] = 1; queueSceneSwitch(12, 0, "liftmace.san", 0, 0, 0, 0); break; case INV_2X4: - _actor[1].inventory[INV_2X4] = 1; + _actor[0].inventory[INV_2X4] = 1; queueSceneSwitch(12, 0, "liftbord.san", 0, 0, 0, 0); break; default: @@ -1305,8 +1299,8 @@ void Insane::postCase10(byte *renderBitmap, int32 codecparam, int32 setupsan12, } } - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; } void Insane::postCase12(byte *renderBitmap, int32 codecparam, int32 setupsan12, @@ -1389,8 +1383,8 @@ void Insane::postCase12(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (curFrame >= maxFrame) smush_rewindCurrentSan(1088, -1, -1); - _val119_ = 0; - _val120_ = 0; + _roadLeftBranch = false; + _roadRightBranch = false; _continueFrame = curFrame; } @@ -1406,8 +1400,8 @@ void Insane::postCase23(byte *renderBitmap, int32 codecparam, int32 setupsan12, queueSceneSwitch(5, 0, "tovista2.san", 64, 0, 0, 290); } } - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; } void Insane::postCase14(byte *renderBitmap, int32 codecparam, int32 setupsan12, @@ -1416,8 +1410,8 @@ void Insane::postCase14(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (_currSceneId == 16) { writeArray(4, 0); writeArray(5, 1); - writeArray(1, _val56d); - writeArray(3, _val55d); + writeArray(1, _posBrokenCar); + writeArray(3, _posBrokenTruck); smush_setToFinish(); } else { switch (_tempSceneId) { @@ -1431,8 +1425,8 @@ void Insane::postCase14(byte *renderBitmap, int32 codecparam, int32 setupsan12, } } - _val119_ = false; - _val120_ = false; + _roadLeftBranch = false; + _roadRightBranch = false; } void Insane::postCaseAll(byte *renderBitmap, int32 codecparam, int32 setupsan12, @@ -1477,8 +1471,8 @@ void Insane::postCaseAll(byte *renderBitmap, int32 codecparam, int32 setupsan12, } } } - _val119_ = 0; - _val120_ = 0; + _roadLeftBranch = false; + _roadRightBranch = false; _continueFrame = curFrame; } |