aboutsummaryrefslogtreecommitdiff
path: root/engines/mortevielle/menu.cpp
diff options
context:
space:
mode:
authorStrangerke2012-03-08 08:24:54 +0100
committerStrangerke2012-04-06 08:22:57 +0200
commit36a65ad3c9c858f72ba62d16d58b6996228b27fa (patch)
tree4fb75881271198c1559e82114ca06cbfc120f8fd /engines/mortevielle/menu.cpp
parent09c157b3b33122b645f93c81f8b524caabbd62d5 (diff)
downloadscummvm-rg350-36a65ad3c9c858f72ba62d16d58b6996228b27fa.tar.gz
scummvm-rg350-36a65ad3c9c858f72ba62d16d58b6996228b27fa.tar.bz2
scummvm-rg350-36a65ad3c9c858f72ba62d16d58b6996228b27fa.zip
MORTEVIELLE: Move (and rename) some more globals to MortevielleEngine
Diffstat (limited to 'engines/mortevielle/menu.cpp')
-rw-r--r--engines/mortevielle/menu.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index f2f19b6eee..9a0bcec2de 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -192,9 +192,9 @@ void Menu::drawMenu() {
_menuActive = true;
g_msg4 = OPCODE_NONE;
g_msg3 = OPCODE_NONE;
- g_choisi = false;
+ _menuSelected = false;
g_vm->setMouseClick(false);
- g_test0 = false;
+ _multiTitle = false;
}
void Menu::invers(int ix) {
@@ -353,7 +353,7 @@ void Menu::menuDown(int ii) {
}
g_vm->_screenSurface.putxy(xco, g_vm->_screenSurface._textPos.y + 8);
} while (cx != nb_lig);
- g_test0 = true;
+ _multiTitle = true;
showMouse();
}
@@ -361,7 +361,7 @@ void Menu::menuDown(int ii) {
* Menu is being removed, so restore the previous background area.
*/
void Menu::menuUp(int xx) {
- if (g_test0) {
+ if (_multiTitle) {
charecr(10, (g_menuConstants[xx - 1][1] + 1) << 1);
/* Restore the background area */
@@ -375,7 +375,7 @@ void Menu::menuUp(int xx) {
// Copy the data
Common::copy(pSrc, pSrc + (400 - 10) * SCREEN_WIDTH, pDest);
- g_test0 = false;
+ _multiTitle = false;
}
}
@@ -428,7 +428,7 @@ void Menu::mdn() {
else
ix = MENU_FILE;
- if ((ix != g_msg3) || (!g_test0))
+ if ((ix != g_msg3) || (!_multiTitle))
if (!((ix == MENU_FILE) && ((g_msg3 == MENU_SAVE) || (g_msg3 == MENU_LOAD)))) {
menuUp(g_msg3);
menuDown(ix);
@@ -436,7 +436,7 @@ void Menu::mdn() {
g_msg4 = OPCODE_NONE;
}
} else { // Not in the MenuTitle line
- if ((y > 11) && (g_test0))
+ if ((y > 11) && (_multiTitle))
util(x, y);
}
} else { // There was a click
@@ -453,7 +453,7 @@ void Menu::mdn() {
g_vm->setMouseClick(false);
} else {
// A menu was clicked on
- g_choisi = (g_test0) && (g_msg4 != OPCODE_NONE);
+ _menuSelected = (_multiTitle) && (g_msg4 != OPCODE_NONE);
menuUp(g_msg3);
g_msg[4] = g_msg4;
g_msg[3] = g_msg3;