aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-06-28 22:07:53 +0200
committerStrangerke2013-06-28 22:07:53 +0200
commitfae077d848ddacc083cf37ed02ea8088f52f6f1b (patch)
tree4121202949f6b82151703b2e719c3e7a2e06fe6f
parent554e04535f3815cdf130f1b98cc9aa1dd3b7e0bb (diff)
downloadscummvm-rg350-fae077d848ddacc083cf37ed02ea8088f52f6f1b.tar.gz
scummvm-rg350-fae077d848ddacc083cf37ed02ea8088f52f6f1b.tar.bz2
scummvm-rg350-fae077d848ddacc083cf37ed02ea8088f52f6f1b.zip
MORTEVIELLE: Get rid of some magic values
-rw-r--r--engines/mortevielle/menu.cpp20
-rw-r--r--engines/mortevielle/mortevielle.h2
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index 408ea0746d..6035c3ae11 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -239,30 +239,30 @@ void Menu::invert(int indx) {
Common::String str;
switch (_msg3) {
- case 1:
+ case MENU_INVENTORY:
str = _inventoryStringArray[menuIndex];
break;
- case 2:
+ case MENU_MOVE:
str = _moveStringArray[menuIndex];
break;
- case 3:
+ case MENU_ACTION:
str = _actionStringArray[menuIndex];
break;
- case 4:
+ case MENU_SELF:
str = _selfStringArray[menuIndex];
break;
- case 5:
+ case MENU_DISCUSS:
str = _discussStringArray[menuIndex];
break;
- case 6:
+ case MENU_FILE:
str = _vm->getEngineString(S_SAVE_LOAD + menuIndex);
break;
- case 7:
+ case MENU_SAVE:
str = _vm->getEngineString(S_SAVE_LOAD + 1);
str += ' ';
str += (char)(48 + menuIndex);
break;
- case 8:
+ case MENU_LOAD:
if (menuIndex == 1) {
str = _vm->getEngineString(S_RESTART);
} else {
@@ -470,9 +470,9 @@ void Menu::updateMenu() {
_vm->setMouseClick(false);
menuUp(_msg3);
if (lo(_msg4) == 1)
- _msg3 = 7;
+ _msg3 = MENU_SAVE;
else
- _msg3 = 8;
+ _msg3 = MENU_LOAD;
menuDown(_msg3);
_vm->setMouseClick(false);
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index ac86eb1b71..e2d1a5eef2 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -432,6 +432,7 @@ private:
void drawPictureWithText();
void addObjectToInventory(int objectId);
void putInHand(int &objId);
+ void prepareDisplayText();
void cinq_huit(char &c, int &idx, byte &pt, bool &the_end);
void copcha();
@@ -444,7 +445,6 @@ private:
void init_nbrepm();
void aniof(int ouf, int num);
void tlu(int af, int ob);
- void prepareDisplayText();
void mennor();
void tsuiv();
void treg(int objId);