thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MOHAWK: Implement Mechanical var getters 4 and 15

Browse source
This commit is contained in:
Bastien Bouclet 2011-02-12 20:12:32 +01:00
parent f2e5b126cf
commit d11b57e609
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
engines/mohawk/myst_stacks/mechanical.cpp
View file

@ -38,6 +38,8 @@ namespace Mohawk {
MystScriptParser_Mechanical::MystScriptParser_Mechanical(MohawkEngine_Myst *vm) : MystScriptParser_Mechanical::MystScriptParser_Mechanical(MohawkEngine_Myst *vm) :
MystScriptParser(vm), _state(vm->_gameState->_mechanical) { MystScriptParser(vm), _state(vm->_gameState->_mechanical) {
setupOpcodes(); setupOpcodes();
_mystStaircaseState = false;
} }
MystScriptParser_Mechanical::~MystScriptParser_Mechanical() { MystScriptParser_Mechanical::~MystScriptParser_Mechanical() {
@ -102,16 +104,15 @@ void MystScriptParser_Mechanical::runPersistentScripts() {
uint16 MystScriptParser_Mechanical::getVar(uint16 var) { uint16 MystScriptParser_Mechanical::getVar(uint16 var) {
switch(var) { switch(var) {
case 0: // Sirrus's Secret Panel State case 0: // Sirrus's Secret Panel State2
return _state.sirrusPanelState; return _state.sirrusPanelState;
case 1: // Achenar's Secret Panel State case 1: // Achenar's Secret Panel State
return _state.achenarPanelState; return _state.achenarPanelState;
// case 3: // Sirrus's Secret Room Crate State // case 3: // Sirrus's Secret Room Crate State
// return 0; // return 0;
// return 1; // return 1;
// case 4: // Myst Book Room Staircase State case 4: // Myst Book Room Staircase State
// return 0; // Staircase Up return _mystStaircaseState;
// return 1; // Staircase Down
// case 5: // Fortress Position // case 5: // Fortress Position
// return 0; // Island with Code Lock // return 0; // Island with Code Lock
// return 1; // Island with Last Two Symbols of Code // return 1; // Island with Last Two Symbols of Code
@ -136,10 +137,14 @@ uint16 MystScriptParser_Mechanical::getVar(uint16 var) {
// return 3; // return 3;
// return 4; // return 4;
// return 5; // return 5;
// case 15: // Code Lock Execute Button State(?) case 15: // Code Lock Execute Button Script
// return 0; if (_mystStaircaseState)
// return 1; return 0;
// return 2; else if (_state.codeShape[0] == 2 && _state.codeShape[1] == 8
&& _state.codeShape[2] == 5 && _state.codeShape[3] == 1)
return 1;
else
return 2;
case 16: // Code Lock Shape #1 - Left case 16: // Code Lock Shape #1 - Left
case 17: // Code Lock Shape #2 case 17: // Code Lock Shape #2
case 18: // Code Lock Shape #3 case 18: // Code Lock Shape #3
@ -171,8 +176,8 @@ void MystScriptParser_Mechanical::toggleVar(uint16 var) {
switch(var) { switch(var) {
// case 3: // Sirrus's Secret Room Crate State // case 3: // Sirrus's Secret Room Crate State
// temp ^= 1; // temp ^= 1;
// case 4: // Code Lock Puzzle Correct / Myst Book Room Staircase State case 4: // Myst Book Room Staircase State
// temp ^= 1; _mystStaircaseState ^= 1;
case 10: // Fortress Staircase State case 10: // Fortress Staircase State
_state.staircaseState ^= 1; _state.staircaseState ^= 1;
case 16: // Code Lock Shape #1 - Left case 16: // Code Lock Shape #1 - Left

2
engines/mohawk/myst_stacks/mechanical.h
View file

@ -95,6 +95,8 @@ private:
DECLARE_OPCODE(opcode_300); DECLARE_OPCODE(opcode_300);
MystGameState::Mechanical &_state; MystGameState::Mechanical &_state;
bool _mystStaircaseState; // 76
}; };
} // End of namespace Mohawk } // End of namespace Mohawk