mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-13 13:10:53 +00:00
Better method, shouldn't be used in PC FT demo.
svn-id: r14527
This commit is contained in:
parent
599f9382d7
commit
a6e1eb9c95
@ -808,10 +808,8 @@ void Insane::prepareScenePropScene(int32 scenePropNum, bool arg_4, bool arg_8) {
|
|||||||
|
|
||||||
debugC(DEBUG_INSANE, "Insane::prepareScenePropScene(%d, %d, %d)", scenePropNum, arg_4, arg_8);
|
debugC(DEBUG_INSANE, "Insane::prepareScenePropScene(%d, %d, %d)", scenePropNum, arg_4, arg_8);
|
||||||
|
|
||||||
if (!((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) {
|
if (((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) || !loadScenePropSounds(idx))
|
||||||
if (!loadScenePropSounds(idx))
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
_actor[0].defunct = arg_4;
|
_actor[0].defunct = arg_4;
|
||||||
_actor[1].defunct = arg_8;
|
_actor[1].defunct = arg_8;
|
||||||
|
@ -2643,9 +2643,7 @@ void Insane::actor13Reaction(int32 buttons) {
|
|||||||
_actor[1].act[3].state = 70;
|
_actor[1].act[3].state = 70;
|
||||||
break;
|
break;
|
||||||
case 70:
|
case 70:
|
||||||
if (!_actor[1].scenePropSubIdx || ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) {
|
if (_actor[1].scenePropSubIdx) {
|
||||||
_actor[1].act[3].state = 118;
|
|
||||||
} else {
|
|
||||||
smlayer_setActorFacing(1, 3, 4, 180);
|
smlayer_setActorFacing(1, 3, 4, 180);
|
||||||
tmp = _currScenePropIdx + _actor[1].scenePropSubIdx;
|
tmp = _currScenePropIdx + _actor[1].scenePropSubIdx;
|
||||||
if (!smlayer_startVoice(_sceneProp[tmp].sound))
|
if (!smlayer_startVoice(_sceneProp[tmp].sound))
|
||||||
@ -2653,6 +2651,8 @@ void Insane::actor13Reaction(int32 buttons) {
|
|||||||
else
|
else
|
||||||
_actor[1].runningSound = _sceneProp[tmp].sound;
|
_actor[1].runningSound = _sceneProp[tmp].sound;
|
||||||
_actor[1].act[3].state = 72;
|
_actor[1].act[3].state = 72;
|
||||||
|
} else {
|
||||||
|
_actor[1].act[3].state = 118;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 71:
|
case 71:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user