[Scummvm-cvs-logs] SF.net SVN: scummvm: [21503] scummvm/trunk/engines/scumm/insane
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Thu Mar 30 03:54:01 CEST 2006
Revision: 21503
Author: kirben
Date: 2006-03-30 03:52:49 -0800 (Thu, 30 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21503&view=rev
Log Message:
-----------
Allow interactive mine road in PC version of FT demo
Modified Paths:
--------------
scummvm/trunk/engines/scumm/insane/insane_iact.cpp
scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
Modified: scummvm/trunk/engines/scumm/insane/insane_iact.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_iact.cpp 2006-03-30 10:06:16 UTC (rev 21502)
+++ scummvm/trunk/engines/scumm/insane/insane_iact.cpp 2006-03-30 11:52:49 UTC (rev 21503)
@@ -324,9 +324,6 @@
int32 setupsan13, Chunk &b, int32 size, int32 flags) {
_player->checkBlock(b, TYPE_IACT, 8);
- if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
- return;
-
int16 par1, par2, par3, par4, par5;
par1 = b.getWord(); // edx
Modified: scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane_scenes.cpp 2006-03-30 10:06:16 UTC (rev 21502)
+++ scummvm/trunk/engines/scumm/insane/insane_scenes.cpp 2006-03-30 11:52:49 UTC (rev 21503)
@@ -62,7 +62,10 @@
case 1:
initScene(1);
setupValues();
- 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));
smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1 + 190, _smlayer_room2);
startVideo("minedriv.san", 1, 32, 12, 0);
break;
@@ -91,7 +94,10 @@
break;
case 3:
setupValues();
- smlayer_setActorCostume(0, 2, readArray(11));
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
+ smlayer_setActorCostume(0, 2, readArray(10));
+ else
+ smlayer_setActorCostume(0, 2, readArray(11));
smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1 + 190, _smlayer_room2);
_mainRoadPos = readArray(2);
if (_mainRoadPos == _posBrokenTruck) {
@@ -142,7 +148,9 @@
_insaneIsRunning = false;
- if (!((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))) {
+ if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC)) {
+ _currEnemy = EN_ROTT1;
+ } else {
writeArray(50, _actor[0].inventory[INV_CHAIN]);
writeArray(51, _actor[0].inventory[INV_CHAINSAW]);
writeArray(52, _actor[0].inventory[INV_MACE]);
@@ -618,7 +626,10 @@
switch (sceneId) {
case 1:
- 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));
smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1 + 190, _smlayer_room2);
smlayer_setFluPalette(_smush_roadrashRip, 0);
setupValues();
@@ -1000,7 +1011,10 @@
if (_firstBattle) {
smush_setToFinish();
} else {
- queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 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,
_continueFrame, 1300);
}
}
@@ -1093,8 +1107,11 @@
if ((curFrame >= maxFrame) && !_needSceneSwitch) {
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);
}
_roadBranch = false;
_roadStop = false;
@@ -1133,10 +1150,7 @@
void Insane::postCase3(byte *renderBitmap, int32 codecparam, int32 setupsan12,
int32 setupsan13, int32 curFrame, int32 maxFrame) {
- if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC))
- turnBen(false);
- else
- turnBen(true);
+ turnBen(true);
if (_actor[0].x >= 158 && _actor[0].x <= 168) {
if (!smlayer_isSoundRunning(86))
@@ -1220,9 +1234,12 @@
flu = &_fluConf[7 + _iactSceneId2];
else
flu = &_fluConf[0 + _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(1, 0, "minedriv.san", 64, 0, 0, 0);
+ else
+ queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
+ flu->startFrame, flu->numFrames);
}
_roadBranch = false;
_roadStop = false;
@@ -1237,11 +1254,15 @@
queueSceneSwitch(13, _smush_minefiteFlu, "minefite.san", 64, 0,
_continueFrame, 1300);
} else {
- if (_currSceneId == 23) {
- queueSceneSwitch(21, 0, "rottfite.san", 64, 0, 0, 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,
+ if (_currSceneId == 23) {
+ queueSceneSwitch(21, 0, "rottfite.san", 64, 0, 0, 0);
+ } else {
+ queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0,
_continueFrame, 1300);
+ }
}
}
}
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