[Scummvm-cvs-logs] scummvm master -> 50ef208e311540ca5cb55e98e6af5c7efbaf06f5

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
50ef208e31 MORTEVIELLE: Add some more checks in order to handle properly the first character of some German menu entries


Commit: 50ef208e311540ca5cb55e98e6af5c7efbaf06f5
    https://github.com/scummvm/scummvm/commit/50ef208e311540ca5cb55e98e6af5c7efbaf06f5
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-19T22:44:41-07:00

Commit Message:
MORTEVIELLE: Add some more checks in order to handle properly the first character of some German menu entries

Changed paths:
    engines/mortevielle/menu.cpp



diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index c754093..5885d32 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -168,17 +168,23 @@ void Menu::setText(MenuItem item, Common::String name) {
 			_inventoryStringArray[item._actionId].insertChar(' ', 0);
 		}
 		break;
-	case MENU_MOVE:
+	case MENU_MOVE: {
+		// If the first character isn't '*' or ' ' then it's missing a heading space
+		char c = s[0];
+		if (c != '*' && c != ' ')
+			s.insertChar(' ', 0);
+
 		while (s.size() < 22)
 			s += ' ';
 
 		_moveStringArray[item._actionId] = s;
+		}
 		break;
 	case MENU_ACTION: {
 		// If the first character isn't '*' or ' ' then it's missing a heading space
 		char c = s[0];
 		if (c != '*' && c != ' ')
-			s = ' ' + s;
+			s.insertChar(' ', 0);
 
 		while (s.size() < 10)
 			s += ' ';
@@ -190,7 +196,7 @@ void Menu::setText(MenuItem item, Common::String name) {
 		// If the first character isn't '*' or ' ' then it's missing a heading space
 		char c = s[0];
 		if (c != '*' && c != ' ')
-			s = ' ' + s;
+			s.insertChar(' ', 0);
 
 		while (s.size() < 10)
 			s += ' ';
@@ -677,13 +683,16 @@ void Menu::initMenu() {
 		_moveStringArray[i] = "*                       ";
 	for (int i = 1; i < 22; i++) {
 		_actionStringArray[i] = _vm->getString(i + kMenuActionStringIndex);
-
+		if ((_actionStringArray[i][0] != '*') && (_actionStringArray[i][0] != ' '))
+			_actionStringArray[i].insertChar(' ', 0);
 		while (_actionStringArray[i].size() < 10)
 			_actionStringArray[i] += ' ';
 
 		if (i < 9) {
 			if (i < 6) {
 				_selfStringArray[i] = _vm->getString(i + kMenuSelfStringIndex);
+				if ((_selfStringArray[i][0] != '*') && (_selfStringArray[i][0] != ' '))
+					_selfStringArray[i].insertChar(' ', 0);
 				while (_selfStringArray[i].size() < 10)
 					_selfStringArray[i] += ' ';
 			}