diff options
| author | Strangerke | 2012-03-09 20:09:19 +0100 |
|---|---|---|
| committer | Strangerke | 2012-04-06 08:23:01 +0200 |
| commit | 61afdadcb6493d0e349104ccb467faa4905d7eb7 (patch) | |
| tree | e0c25ad69a0c194be25876be7aa36fca13064bf2 /engines/mortevielle/mortevielle.cpp | |
| parent | 24866fe395ebee1e127e749ee9209f45b98e729d (diff) | |
| download | scummvm-rg350-61afdadcb6493d0e349104ccb467faa4905d7eb7.tar.gz scummvm-rg350-61afdadcb6493d0e349104ccb467faa4905d7eb7.tar.bz2 scummvm-rg350-61afdadcb6493d0e349104ccb467faa4905d7eb7.zip | |
MORTEVIELLE: Some more renaming, fix a couple of GCC warnings
Diffstat (limited to 'engines/mortevielle/mortevielle.cpp')
| -rw-r--r-- | engines/mortevielle/mortevielle.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp index 42c714e456..8677798477 100644 --- a/engines/mortevielle/mortevielle.cpp +++ b/engines/mortevielle/mortevielle.cpp @@ -144,7 +144,7 @@ Common::ErrorCode MortevielleEngine::initialise() { g_currGraphicalDevice = MODE_EGA; g_newGraphicalDevice = g_currGraphicalDevice; - g_zuul = false; + _zuul = false; charpal(); charge_cfiph(); charge_cfiec(); @@ -613,13 +613,13 @@ void MortevielleEngine::handleAction() { if ((g_msg[3] == MENU_ACTION) || (g_msg[3] == MENU_SELF)) g_mnumo = g_msg[4]; if (!g_anyone) { - if ((g_heroSearching) || (g_obpart)) { + if ((g_vm->_heroSearching) || (_obpart)) { if (y_s < 12) return; if ((g_msg[4] == OPCODE_SOUND) || (g_msg[4] == OPCODE_LIFT)) { oo = true; - if ((g_msg[4] == OPCODE_LIFT) || (g_obpart)) { + if ((g_msg[4] == OPCODE_LIFT) || (_obpart)) { endSearch(); g_caff = g_s._currPlace; g_crep = 998; @@ -639,10 +639,10 @@ void MortevielleEngine::handleAction() { g_okdes = false; dessin(0); } - if ((!g_syn) || (_col)) + if ((!g_vm->_syn) || (_col)) repon(2, g_crep); } - } while (g_syn); + } while (g_vm->_syn); if (g_ctrm != 0) tctrm(); } |