From 258901bab96f0050385a9912c8ea0fe2a41b2d6f Mon Sep 17 00:00:00 2001 From: Nicola Mettifogo Date: Wed, 19 Sep 2007 08:40:12 +0000 Subject: Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. svn-id: r28966 --- engines/scumm/insane/insane_enemy.cpp | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'engines/scumm/insane/insane_enemy.cpp') diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp index 3866cf230d..a152a675ef 100644 --- a/engines/scumm/insane/insane_enemy.cpp +++ b/engines/scumm/insane/insane_enemy.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" @@ -98,7 +98,7 @@ int32 Insane::enemy0handler(int32 actor1, int32 actor2, int32 probability) { act2damage = _actor[actor2].damage; // ebp act1x = _actor[actor1].x; // esi act2x = _actor[actor2].x; // edi - + if (!_actor[actor1].defunct) { if (_enHdlVar[EN_ROTT1][1] > _enHdlVar[EN_ROTT1][2]) { if (act1damage - act2damage >= 30) { @@ -262,7 +262,7 @@ int32 Insane::enemy1handler(int32 actor1, int32 actor2, int32 probability) { act2damage = _actor[actor2].damage; // ebp act1x = _actor[actor1].x; // esi act2x = _actor[actor2].x; // edi - + if (!_actor[actor1].defunct) { if (_enHdlVar[EN_ROTT2][1] > _enHdlVar[EN_ROTT2][2]) { if (act1damage - act2damage >= 30) { @@ -556,7 +556,7 @@ int32 Insane::enemy3handler(int32 actor1, int32 actor2, int32 probability) { act2damage = _actor[actor2].damage; // ebp act1x = _actor[actor1].x; // esi act2x = _actor[actor2].x; // edi - + if (!_actor[actor1].defunct) { if (_enHdlVar[EN_VULTF1][1] > _enHdlVar[EN_VULTF1][2]) { if ((act1damage - act2damage >= 30) && (_vm->_rnd.getRandomNumber(probability - 1) != 1)) @@ -664,7 +664,7 @@ int32 Insane::enemy3handler(int32 actor1, int32 actor2, int32 probability) { } _enHdlVar[EN_VULTF1][7] = _enHdlVar[EN_VULTF1][8]; } - + } _enHdlVar[EN_VULTF1][1]++; _enHdlVar[EN_VULTF1][3]++; @@ -882,7 +882,7 @@ int32 Insane::enemy5handler(int32 actor1, int32 actor2, int32 probability) { act1damage = _actor[actor1].damage; // ebx act1x = _actor[actor1].x; // esi act2x = _actor[actor2].x; // ebp - + dist = ABS(act1x - act2x); if (weaponMaxRange(actor1) >= dist) { @@ -1187,7 +1187,7 @@ int32 Insane::enemy7handler(int32 actor1, int32 actor2, int32 probability) { goto _labelA; } } - + if (weaponMaxRange(actor1) <= dist) { if (act2x < act1x) _actor[actor1].cursorX = -101; @@ -1342,7 +1342,7 @@ void Insane::turnEnemy(bool battle) { if (battle) buttons = actionEnemy(); - debug(5, "11:%d 12:%d 13:%d 10:%d", _actor[1].act[1].state, + debug(5, "11:%d 12:%d 13:%d 10:%d", _actor[1].act[1].state, _actor[1].act[2].state, _actor[1].act[3].state, _actor[1].act[0].state); actor11Reaction(buttons); actor12Reaction(buttons); @@ -1361,7 +1361,7 @@ void Insane::actor11Reaction(int32 buttons) { setEnemyAnimation(1, 6); _actor[1].act[1].state = 41; } - + if (_actor[1].cursorX >= -100) { setEnemyAnimation(1, 7); _actor[1].act[1].state = 40; @@ -1388,7 +1388,7 @@ void Insane::actor11Reaction(int32 buttons) { setEnemyAnimation(1, 8); _actor[1].act[1].state = 39; } - + if (_actor[1].field_8 == 48) _actor[1].tilt = 0; else @@ -1445,7 +1445,7 @@ void Insane::actor11Reaction(int32 buttons) { setEnemyAnimation(1, 12); _actor[1].act[1].state = 57; } - + if (_actor[1].cursorX <= 100) { setEnemyAnimation(1, 11); _actor[1].act[1].state = 56; @@ -1456,13 +1456,13 @@ void Insane::actor11Reaction(int32 buttons) { _actor[1].x += _actor[1].cursorX / 32; break; } - + tmpx = _actor[1].x; tmpy = _actor[1].y + _actor[1].y1; if (_actor[1].act[1].room) smlayer_putActor(1, 1, tmpx, tmpy, _smlayer_room2); - else + else smlayer_putActor(1, 1, tmpx, tmpy, _smlayer_room); _actor[1].animWeaponClass = _actor[1].weaponClass; @@ -1529,7 +1529,7 @@ void Insane::chooseEnemyWeaponAnim(int32 buttons) { default: switchEnemyWeapon(); } - + _weaponEnemyJustSwitched = true; } else { _weaponEnemyJustSwitched = false; @@ -1583,7 +1583,7 @@ void Insane::setEnemyState(void) { _actor[1].act[2].state = 98; else _actor[1].act[2].state = 99; - + return; } @@ -1803,7 +1803,7 @@ void Insane::actor12Reaction(int32 buttons) { smlayer_setActorFacing(1, 2, 20, 180); _actor[1].act[2].state = 16; } - break; + break; default: smlayer_setActorFacing(1, 2, 20, 180); _actor[1].act[2].state = 16; @@ -1971,7 +1971,7 @@ void Insane::actor12Reaction(int32 buttons) { } else { smlayer_setActorFacing(1, 2, 20, 180); _actor[1].act[2].state = 24; - + if (!_actor[1].field_54) smlayer_startSfx(246); } @@ -2065,7 +2065,7 @@ void Insane::actor12Reaction(int32 buttons) { case 34: smlayer_setActorLayer(1, 2, 5); _actor[1].kicking = false; - + if (!smlayer_actorNeedRedraw(1, 2)) { setEnemyState(); _actor[1].act[2].tilt = 0; @@ -2077,7 +2077,7 @@ void Insane::actor12Reaction(int32 buttons) { case 35: smlayer_setActorLayer(1, 2, 5); _actor[1].kicking = false; - + if (!smlayer_actorNeedRedraw(1, 2)) { switchEnemyWeapon(); _actor[1].act[2].tilt = 0; @@ -2386,7 +2386,7 @@ void Insane::actor12Reaction(int32 buttons) { smlayer_setActorLayer(1, 2, 4); _actor[1].kicking = false; if (_actor[1].act[2].frame >= 19) { - queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, + queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, _continueFrame1, 1300); _actor[1].act[2].state = 96; } @@ -2450,7 +2450,7 @@ void Insane::actor12Reaction(int32 buttons) { _actor[1].act[2].state = 103; case 103: _actor[1].kicking = false; - + if (_actor[1].act[2].frame >= 18 || ((_actor[1].x < 50 || _actor[1].x > 270) && _actor[1].act[2].frame >= 9)) { _enemy[EN_CAVEFISH].isEmpty = 1; @@ -2527,7 +2527,7 @@ void Insane::actor12Reaction(int32 buttons) { case 114: smlayer_setActorLayer(1, 2, 25); _actor[1].kicking = false; - + if (_actor[1].act[2].frame >= 16 || ((_actor[1].x < 50 || _actor[1].x > 270) && (_actor[1].act[2].frame >= 8))) { queueSceneSwitch(11, 0, _enemy[_currEnemy].filename, 64, 0, 0, 0); @@ -2549,7 +2549,7 @@ void Insane::actor12Reaction(int32 buttons) { case 116: smlayer_setActorLayer(1, 2, 25); _actor[1].kicking = false; - + if (_actor[1].act[2].frame >= 17 || ((_actor[1].x < 50 || _actor[1].x > 270) && _actor[1].act[2].frame >= 8)) { queueSceneSwitch(11, 0, _enemy[_currEnemy].filename, 64, 0, 0, 0); @@ -2607,7 +2607,7 @@ void Insane::actor13Reaction(int32 buttons) { case 52: if (_actor[1].runningSound) smlayer_stopSound(_actor[1].runningSound); - + if (_currScenePropIdx) shutCurrentScene(); @@ -2780,7 +2780,7 @@ int32 Insane::actionEnemy(void) { if (_actor[0].x + 90 > _actor[1].x) _actor[1].x = _actor[0].x + 90; } - + if (_actor[1].x < 0) { _actor[1].x = 0; _actor[1].x1 = -_actor[1].x1; -- cgit v1.2.3