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

MORTEVIELLE: Rename menu entry type erroneously named

Browse source
This commit is contained in:
Strangerke 2012-02-28 07:59:51 +01:00
parent 4361f843fd
commit f98a818c36
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/mortevielle/menu.cpp
View file

@ -68,7 +68,7 @@ void Menu::menut(int no, Common::String name) {
case MENU_ACTION: case MENU_ACTION:
_actionStringArray[l] = s; _actionStringArray[l] = s;
break; break;
case MENU_SUB_ACTION: case MENU_SELF:
_selfStringArray[l] = s; _selfStringArray[l] = s;
break; break;
case MENU_DISCUSS: case MENU_DISCUSS:
@ -101,7 +101,7 @@ void Menu::disableMenuItem(int no) {
case MENU_ACTION: case MENU_ACTION:
_actionStringArray[l].setChar('*', 0); _actionStringArray[l].setChar('*', 0);
break; break;
case MENU_SUB_ACTION: case MENU_SELF:
_selfStringArray[l].setChar('*', 0); _selfStringArray[l].setChar('*', 0);
break; break;
case MENU_DISCUSS: case MENU_DISCUSS:
@ -132,7 +132,7 @@ void Menu::enableMenuItem(int no) {
case MENU_ACTION: case MENU_ACTION:
_actionStringArray[l].setChar(' ', 0); _actionStringArray[l].setChar(' ', 0);
break; break;
case MENU_SUB_ACTION: case MENU_SELF:
_selfStringArray[l].setChar(' ', 0); _selfStringArray[l].setChar(' ', 0);
// The original sets two times the same value. Skipped // The original sets two times the same value. Skipped
// _selfStringArray[l].setChar(' ', 0); // _selfStringArray[l].setChar(' ', 0);
@ -422,7 +422,7 @@ void Menu::mdn() {
else if (x < 172 * res) else if (x < 172 * res)
ix = MENU_ACTION; ix = MENU_ACTION;
else if (x < 220 * res) else if (x < 220 * res)
ix = MENU_SUB_ACTION; ix = MENU_SELF;
else if (x < 268 * res) else if (x < 268 * res)
ix = MENU_DISCUSS; ix = MENU_DISCUSS;
else else

2
engines/mortevielle/menu.h
View file

@ -60,7 +60,7 @@ public:
}; };
enum { enum {
MENU_INVENTORY = 1, MENU_MOVE = 2, MENU_ACTION = 3, MENU_SUB_ACTION = 4, MENU_INVENTORY = 1, MENU_MOVE = 2, MENU_ACTION = 3, MENU_SELF = 4,
MENU_DISCUSS = 5, MENU_FILE = 6, MENU_SAVE = 7, MENU_LOAD = 8 MENU_DISCUSS = 5, MENU_FILE = 6, MENU_SAVE = 7, MENU_LOAD = 8
}; };

4
engines/mortevielle/mortevielle.cpp
View file

@ -588,7 +588,7 @@ void MortevielleEngine::handleAction() {
temps = Alert::show(_hintPctMessage, 1); temps = Alert::show(_hintPctMessage, 1);
return; return;
} else if (inkey == '\77') { } else if (inkey == '\77') {
if ((mnumo != OPCODE_NONE) && ((msg[3] == MENU_ACTION) || (msg[3] == MENU_SUB_ACTION))) { if ((mnumo != OPCODE_NONE) && ((msg[3] == MENU_ACTION) || (msg[3] == MENU_SELF))) {
msg[4] = mnumo; msg[4] = mnumo;
ecr3(g_vm->getEngineString(S_IDEM)); ecr3(g_vm->getEngineString(S_IDEM));
} else } else
@ -611,7 +611,7 @@ void MortevielleEngine::handleAction() {
num = 0; num = 0;
} else { } else {
mnumo = msg[3]; mnumo = msg[3];
if ((msg[3] == MENU_ACTION) || (msg[3] == MENU_SUB_ACTION)) if ((msg[3] == MENU_ACTION) || (msg[3] == MENU_SELF))
mnumo = msg[4]; mnumo = msg[4];
if (! anyone) { if (! anyone) {
if ((fouil) || (obpart)) { if ((fouil) || (obpart)) {