[Scummvm-cvs-logs] SF.net SVN: scummvm: [21505] scummvm/trunk/engines/scumm/insane
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Thu Mar 30 15:59:04 CEST 2006
Revision: 21505
Author: kirben
Date: 2006-03-30 15:58:37 -0800 (Thu, 30 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21505&view=rev
Log Message:
-----------
Improve mine road in PC demo of FT
Modified Paths:
--------------
scummvm/trunk/engines/scumm/insane/insane.cpp
scummvm/trunk/engines/scumm/insane/insane_ben.cpp
scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
Modified: scummvm/trunk/engines/scumm/insane/insane.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane.cpp 2006-03-30 13:47:18 UTC (rev 21504)
+++ scummvm/trunk/engines/scumm/insane/insane.cpp 2006-03-30 23:58:37 UTC (rev 21505)
@@ -959,8 +959,9 @@
void Insane::escapeKeyHandler(void) {
struct fluConf *flu;
- // Demos have just one scene
- if (!_insaneIsRunning || _vm->_game.features & GF_DEMO) {
+ // The Macintosh demo has just one scene
+ if (((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformMacintosh)) ||
+ !_insaneIsRunning) {
smush_setToFinish();
return;
}
@@ -971,8 +972,12 @@
debugC(DEBUG_INSANE, "scene: %d", _currSceneId);
switch (_currSceneId) {
case 1:
- queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, _continueFrame1, 1300);
- writeArray(9, 0);
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC)) {
+ queueSceneSwitch(1, 0, "minedriv.san", 64, 0, 0, 0);
+ } else {
+ queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, _continueFrame1, 1300);
+ writeArray(9, 0);
+ }
break;
case 18:
queueSceneSwitch(17, _smush_minedrivFlu, "minedriv.san", 64, 0, _continueFrame1, 1300);
@@ -980,8 +985,11 @@
break;
case 2:
flu = &_fluConf[14 + _iactSceneId2];
- queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
- flu->startFrame, flu->numFrames);
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
+ queueSceneSwitch(4, 0, "tovista.san", 64, 0, 0, 0);
+ else
+ queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
+ flu->startFrame, flu->numFrames);
break;
case 3:
queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, _continueFrame, 1300);
@@ -1031,12 +1039,18 @@
break;
case 8:
flu = &_fluConf[7 + _iactSceneId2];
- queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
+ queueSceneSwitch(1, 0, "minedriv.san", 64, 0, 0, 0);
+ else
+ queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
flu->startFrame, flu->numFrames);
break;
case 7:
flu = &_fluConf[0 + _iactSceneId2];
- queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
+ queueSceneSwitch(1, 0, "minedriv.san", 64, 0, 0, 0);
+ else
+ queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
flu->startFrame, flu->numFrames);
break;
case 23:
@@ -1052,7 +1066,10 @@
queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, _continueFrame1, 1300);
break;
case 13:
- queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, _continueFrame, 1300);
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
+ queueSceneSwitch(1, 0, "minedriv.san", 64, 0, 0, 0);
+ else
+ queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, _continueFrame, 1300);
break;
case 24:
queueSceneSwitch(21, 0, "rottfite.san", 64, 0, 0, 0);
Modified: scummvm/trunk/engines/scumm/insane/insane_ben.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_ben.cpp 2006-03-30 13:47:18 UTC (rev 21504)
+++ scummvm/trunk/engines/scumm/insane/insane_ben.cpp 2006-03-30 23:58:37 UTC (rev 21505)
@@ -1900,29 +1900,41 @@
switch (_actor[0].weapon) {
case INV_CHAIN:
- smlayer_setActorCostume(0, 2, readArray(20));
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
+ smlayer_setActorCostume(0, 2, readArray(19));
+ else
+ smlayer_setActorCostume(0, 2, readArray(20));
smlayer_setActorFacing(0, 2, 18, 180);
_actor[0].weaponClass = 1;
_actor[0].act[2].state = 34;
break;
case INV_CHAINSAW:
- smlayer_setActorCostume(0, 2, readArray(24));
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
+ smlayer_setActorCostume(0, 2, readArray(23));
+ else
+ smlayer_setActorCostume(0, 2, readArray(24));
smlayer_setActorFacing(0, 2, 18, 180);
_actor[0].weaponClass = 1;
_actor[0].act[2].state = 34;
break;
case INV_MACE:
- smlayer_setActorCostume(0, 2, readArray(23));
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
+ smlayer_setActorCostume(0, 2, readArray(22));
+ else
+ smlayer_setActorCostume(0, 2, readArray(23));
smlayer_setActorFacing(0, 2, 18, 180);
_actor[0].weaponClass = 1;
_actor[0].act[2].state = 34;
break;
case INV_2X4:
- if (_currEnemy == EN_CAVEFISH)
- smlayer_setActorCostume(0, 2, readArray(38));
- else
- smlayer_setActorCostume(0, 2, readArray(19));
-
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC)) {
+ smlayer_setActorCostume(0, 2, readArray(18));
+ } else {
+ if (_currEnemy == EN_CAVEFISH)
+ smlayer_setActorCostume(0, 2, readArray(38));
+ else
+ smlayer_setActorCostume(0, 2, readArray(19));
+ }
smlayer_setActorFacing(0, 2, 18, 180);
_actor[0].weaponClass = 1;
_actor[0].act[2].state = 34;
Modified: scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_scenes.cpp 2006-03-30 13:47:18 UTC (rev 21504)
+++ scummvm/trunk/engines/scumm/insane/insane_scenes.cpp 2006-03-30 23:58:37 UTC (rev 21505)
@@ -639,7 +639,10 @@
return;
break;
case 2:
- smlayer_setActorCostume(0, 2, readArray(10));
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
+ smlayer_setActorCostume(0, 2, readArray(9));
+ else
+ smlayer_setActorCostume(0, 2, readArray(10));
setupValues();
return;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list