MORTEVIELLE: Rename menu entry type erroneously named

scummvm · Apr 6, 2012 · bb5175c · bb5175c
1 parent 87ccfb4
commit bb5175c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
@@ -68,7 +68,7 @@ void Menu::menut(int no, Common::String name) {
 	case MENU_ACTION:
 		_actionStringArray[l] = s;
 		break;
-	case MENU_SUB_ACTION:
+	case MENU_SELF:
 		_selfStringArray[l] = s;
 		break;
 	case MENU_DISCUSS:
@@ -101,7 +101,7 @@ void Menu::disableMenuItem(int no) {
 	case MENU_ACTION:
 		_actionStringArray[l].setChar('*', 0);
 		break;
-	case MENU_SUB_ACTION:
+	case MENU_SELF:
 		_selfStringArray[l].setChar('*', 0);
 		break;
 	case MENU_DISCUSS:
@@ -132,7 +132,7 @@ void Menu::enableMenuItem(int no) {
 	case MENU_ACTION:
 		_actionStringArray[l].setChar(' ', 0);
 		break;
-	case MENU_SUB_ACTION:
+	case MENU_SELF:
 		_selfStringArray[l].setChar(' ', 0);
 		// The original sets two times the same value. Skipped
 		// _selfStringArray[l].setChar(' ', 0);
@@ -422,7 +422,7 @@ void Menu::mdn() {
 			else if (x < 172 * res)
 				ix = MENU_ACTION;
 			else if (x < 220 * res)
-				ix = MENU_SUB_ACTION;
+				ix = MENU_SELF;
 			else if (x < 268 * res)
 				ix = MENU_DISCUSS;
 			else

diff --git a/engines/mortevielle/menu.h b/engines/mortevielle/menu.h
@@ -60,7 +60,7 @@ class Menu {
 };
 
 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
 };
 

diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
@@ -588,7 +588,7 @@ void MortevielleEngine::handleAction() {
 			temps = Alert::show(_hintPctMessage, 1);
 			return;
 		} 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;
 				ecr3(g_vm->getEngineString(S_IDEM));
 			} else
@@ -611,7 +611,7 @@ void MortevielleEngine::handleAction() {
 				num = 0;
 		} else {
 			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];
 			if (! anyone) {
 				if ((fouil) || (obpart)) {