aboutsummaryrefslogtreecommitdiff
path: root/engines/mortevielle/mortevielle.cpp
diff options
context:
space:
mode:
authorStrangerke2012-02-25 21:13:24 +0100
committerStrangerke2012-04-06 08:22:02 +0200
commit8072e9e97a909e2d1f9d97c6af4d2ec6a08df14d (patch)
treea57acfe09f73d0093140f4f05d23f22d0dbca0c3 /engines/mortevielle/mortevielle.cpp
parentb414beeff286c6138e6c50235b54de4925a97934 (diff)
downloadscummvm-rg350-8072e9e97a909e2d1f9d97c6af4d2ec6a08df14d.tar.gz
scummvm-rg350-8072e9e97a909e2d1f9d97c6af4d2ec6a08df14d.tar.bz2
scummvm-rg350-8072e9e97a909e2d1f9d97c6af4d2ec6a08df14d.zip
MORTEVIELLE: Rename remaining Menu enums, rename _staticStrings into _engineStrings as a preliminar work on an English DOS version
Diffstat (limited to 'engines/mortevielle/mortevielle.cpp')
-rw-r--r--engines/mortevielle/mortevielle.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 6be14bdfa9..4f367412fc 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -212,7 +212,7 @@ Common::ErrorCode MortevielleEngine::loadMortDat() {
// Close the file
f.close();
- assert(_staticStrings.size() > 0);
+ assert(_engineStrings.size() > 0);
return Common::kNoError;
}
@@ -240,7 +240,7 @@ void MortevielleEngine::readStaticStrings(Common::File &f, int dataSize) {
while ((ch = (char)f.readByte()) != '\0')
s += ch;
- _staticStrings.push_back(s);
+ _engineStrings.push_back(s);
dataSize -= s.size() + 1;
}
assert(dataSize == 0);
@@ -565,19 +565,19 @@ void MortevielleEngine::handleAction() {
changeGraphicalDevice((uint)(ord(inkey) - 1) >> 1);
return;
}
- if (choisi && (msg[3] == sauve)) {
+ if (choisi && (msg[3] == MENU_SAVE)) {
Common::String saveName = Common::String::format("Savegame #%d", msg[4] & 7);
g_vm->_savegameManager.saveGame(msg[4] & 7, saveName);
}
- if (choisi && (msg[3] == charge))
+ if (choisi && (msg[3] == MENU_LOAD))
g_vm->_savegameManager.loadGame((msg[4] & 7) - 1);
if (inkey == '\103') { /* F9 */
temps = Alert::show(stpou, 1);
return;
} else if (inkey == '\77') {
- if ((mnumo != OPCODE_NONE) && ((msg[3] == action) || (msg[3] == saction))) {
+ if ((mnumo != OPCODE_NONE) && ((msg[3] == MENU_ACTION) || (msg[3] == MENU_SUB_ACTION))) {
msg[4] = mnumo;
- ecr3(g_vm->getString(S_IDEM));
+ ecr3(g_vm->getEngineString(S_IDEM));
} else
return;
} else if (inkey == '\104') {
@@ -598,7 +598,7 @@ void MortevielleEngine::handleAction() {
num = 0;
} else {
mnumo = msg[3];
- if ((msg[3] == action) || (msg[3] == saction))
+ if ((msg[3] == MENU_ACTION) || (msg[3] == MENU_SUB_ACTION))
mnumo = msg[4];
if (! anyone) {
if ((fouil) || (obpart)) {