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

[Travis Howell]

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

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

Better method, shouldn't be used in PC FT demo.


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- insane.cpp	9 Aug 2004 02:35:30 -0000	1.44
+++ insane.cpp	9 Aug 2004 03:21:51 -0000	1.45
@@ -808,10 +808,8 @@
 
 	debugC(DEBUG_INSANE, "Insane::prepareScenePropScene(%d, %d, %d)", scenePropNum, arg_4, arg_8);
 
-	if (!((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) {
-		if (!loadScenePropSounds(idx))
+	if (((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) || !loadScenePropSounds(idx))
 			return;
-	}
 
 	_actor[0].defunct = arg_4;
 	_actor[1].defunct = arg_8;

Index: insane_enemy.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_enemy.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- insane_enemy.cpp	9 Aug 2004 02:35:30 -0000	1.12
+++ insane_enemy.cpp	9 Aug 2004 03:21:51 -0000	1.13
@@ -2643,9 +2643,7 @@
 			_actor[1].act[3].state = 70;
 		break;
 	case 70:
-		if (!_actor[1].scenePropSubIdx || ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) {
-			_actor[1].act[3].state = 118;
-		} else {
+		if (_actor[1].scenePropSubIdx) {
 			smlayer_setActorFacing(1, 3, 4, 180);
 			tmp = _currScenePropIdx + _actor[1].scenePropSubIdx;
 			if (!smlayer_startVoice(_sceneProp[tmp].sound))
@@ -2653,6 +2651,8 @@
 			else
 				_actor[1].runningSound = _sceneProp[tmp].sound;
 			_actor[1].act[3].state = 72;
+		} else {
+			_actor[1].act[3].state = 118;
 		}
 		break;
 	case 71: