libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-12 14:09:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MADS: Some refactoring in scene group 3

Browse Source
This commit is contained in:
Strangerke 2014-05-19 22:50:30 +02:00
parent 499f09a1c0
commit 410ba93433
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
engines/mads/nebular/nebular_scenes3.cpp
View File

@ -2138,8 +2138,6 @@ void Scene316::handleRoxInGrate() {
} }
void Scene316::enter() { void Scene316::enter() {
int series;
if (_globals[kSexOfRex] == REX_MALE) { if (_globals[kSexOfRex] == REX_MALE) {
_globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('g', -1)); _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('g', -1));
_globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RXCL_8"); _globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RXCL_8");
@ -2165,8 +2163,8 @@ void Scene316::enter() {
_game._player._stepEnabled = false; _game._player._stepEnabled = false;
_game._player._visible = false; _game._player._visible = false;
_vm->_sound->command(44); _vm->_sound->command(44);
series = (_globals[kSexOfRex] == REX_MALE) ? 1 : 2; int spriteIdx = (_globals[kSexOfRex] == REX_MALE) ? 1 : 2;
_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[series], false, 6, 1, 0, 0); _globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[spriteIdx], false, 6, 1, 0, 0);
_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 2); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 2);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 60); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 60);
} else if (_scene->_priorSceneId != -2) } else if (_scene->_priorSceneId != -2)
@ -2177,8 +2175,6 @@ void Scene316::enter() {
} }
void Scene316::step() { void Scene316::step() {
int temp;
if (_game._trigger == 60) { if (_game._trigger == 60) {
_scene->_sequences.updateTimeout(-1, _globals._sequenceIndexes[1]); _scene->_sequences.updateTimeout(-1, _globals._sequenceIndexes[1]);
_game._player._visible = true; _game._player._visible = true;
@ -2200,20 +2196,22 @@ void Scene316::step() {
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 72); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 72);
break; break;
case 71: case 71: {
temp = _globals._sequenceIndexes[3]; int synxIdx = _globals._sequenceIndexes[3];
_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, -2); _globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, -2);
_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 3); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 3);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], temp); _scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], synxIdx);
}
break; break;
case 72: case 72: {
temp = _globals._sequenceIndexes[6]; int synxIdx = _globals._sequenceIndexes[6];
_globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 12, 1, 0, 0); _globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 12, 1, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[6], 6, 9); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[6], 6, 9);
_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[6]); _scene->_sequences.setMsgLayout(_globals._sequenceIndexes[6]);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[6], temp); _scene->_sequences.updateTimeout(_globals._sequenceIndexes[6], synxIdx);
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 73); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 73);
}
break; break;
case 73: case 73:
@ -2230,11 +2228,12 @@ void Scene316::step() {
_scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 75); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 75);
break; break;
case 74: case 74: {
temp = _globals._sequenceIndexes[3]; int synxIdx = _globals._sequenceIndexes[3];
_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1); _globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 12); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 12);
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], temp); _scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], synxIdx);
}
break; break;
case 75: case 75:
@ -2360,17 +2359,15 @@ void Scene318::setup() {
} }
void Scene318::handleDialog() { void Scene318::handleDialog() {
int temp;
if (!_game._trigger) { if (!_game._trigger) {
_game._player._stepEnabled = false; _game._player._stepEnabled = false;
handleRexDialogs(_action._activeAction._verbId); handleRexDialogs(_action._activeAction._verbId);
} else if (_game._trigger == 2) { } else if (_game._trigger == 2) {
temp = _globals._sequenceIndexes[2]; int synxIdx = _globals._sequenceIndexes[2];
_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 1); _globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
_scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(142, 121)); _scene->_sequences.setMsgPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
_scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], temp); _scene->_sequences.updateTimeout(_globals._sequenceIndexes[2], synxIdx);
_vm->_sound->command(3); _vm->_sound->command(3);
_scene->_userInterface.setup(kInputLimitedSentences); _scene->_userInterface.setup(kInputLimitedSentences);
_game._player._stepEnabled = true; _game._player._stepEnabled = true;