[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.43,1.44 insane_enemy.cpp,1.11,1.12

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm/insane
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2191/scumm/insane

Modified Files:
	insane.cpp insane_enemy.cpp 
Log Message:

A few more correction for INSANE in PC FT demo


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- insane.cpp	8 Aug 2004 04:39:27 -0000	1.43
+++ insane.cpp	9 Aug 2004 02:35:30 -0000	1.44
@@ -176,7 +176,7 @@
 	
 	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);

Index: insane_enemy.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_enemy.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- insane_enemy.cpp	5 Aug 2004 05:35:43 -0000	1.11
+++ insane_enemy.cpp	9 Aug 2004 02:35:30 -0000	1.12
@@ -1362,8 +1362,7 @@
 				_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 @@
 			_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 @@
 			else
 				_actor[1].runningSound = _sceneProp[tmp].sound;
 			_actor[1].act[3].state = 72;
-		} else {
-			_actor[1].act[3].state = 118;
 		}
 		break;
 	case 71: