diff options
| author | Travis Howell | 2004-08-09 02:35:30 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-09 02:35:30 +0000 |
| commit | 599f9382d76b842a18231a08f5e9c4584081c9db (patch) | |
| tree | 1f27709970c41a06834fd47e1fc3da46583d5bcd | |
| parent | d63d23ed077eb958e3dbdb6d760fe4b75af258de (diff) | |
| download | scummvm-rg350-599f9382d76b842a18231a08f5e9c4584081c9db.tar.gz scummvm-rg350-599f9382d76b842a18231a08f5e9c4584081c9db.tar.bz2 scummvm-rg350-599f9382d76b842a18231a08f5e9c4584081c9db.zip | |
A few more correction for INSANE in PC FT demo
svn-id: r14526
| -rw-r--r-- | scumm/insane/insane.cpp | 2 | ||||
| -rw-r--r-- | scumm/insane/insane_enemy.cpp | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp index 31453f57d6..5b5df158bb 100644 --- a/scumm/insane/insane.cpp +++ b/scumm/insane/insane.cpp @@ -176,7 +176,7 @@ void Insane::initvars(void) { if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) { init_enemyStruct(EN_ROTT1, EN_ROTT1, 0, 0, 160, 0, INV_MACE, 63, "endcrshr.san", - 25, 16, 15, 26, 11, 3); + 25, 15, 16, 26, 11, 3); } else { init_enemyStruct(EN_ROTT1, EN_ROTT1, 0, 0, 160, 0, INV_MACE, 90, "wr2_rott.san", 26, 16, 17, 27, 11, 3); diff --git a/scumm/insane/insane_enemy.cpp b/scumm/insane/insane_enemy.cpp index d0553996ab..9cc96532fe 100644 --- a/scumm/insane/insane_enemy.cpp +++ b/scumm/insane/insane_enemy.cpp @@ -1362,8 +1362,7 @@ void Insane::turnEnemy(bool battle) { _actor[1].act[2].state, _actor[1].act[3].state, _actor[1].act[0].state); actor11Reaction(buttons); actor12Reaction(buttons); - if (!((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) - actor13Reaction(buttons); + actor13Reaction(buttons); actor10Reaction(buttons); } @@ -2644,7 +2643,9 @@ void Insane::actor13Reaction(int32 buttons) { _actor[1].act[3].state = 70; break; case 70: - if (_actor[1].scenePropSubIdx) { + if (!_actor[1].scenePropSubIdx || ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) { + _actor[1].act[3].state = 118; + } else { smlayer_setActorFacing(1, 3, 4, 180); tmp = _currScenePropIdx + _actor[1].scenePropSubIdx; if (!smlayer_startVoice(_sceneProp[tmp].sound)) @@ -2652,8 +2653,6 @@ void Insane::actor13Reaction(int32 buttons) { else _actor[1].runningSound = _sceneProp[tmp].sound; _actor[1].act[3].state = 72; - } else { - _actor[1].act[3].state = 118; } break; case 71: |