[Scummvm-git-logs] scummvm master -> 903ca295583ec0e9e42366be9303340770f02c54

[bluegr]

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:
903ca29558 SCI: Fix kAddMenu language separator parsing


Commit: 903ca295583ec0e9e42366be9303340770f02c54
    https://github.com/scummvm/scummvm/commit/903ca295583ec0e9e42366be9303340770f02c54
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-03-29T19:12:52+02:00

Commit Message:
SCI: Fix kAddMenu language separator parsing

Fixes bug #10926 that prevents SQ3 German Amiga from loading

Changed paths:
    engines/sci/graphics/menu.cpp


diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp
index e677f0b..8f6cfa1 100644
--- a/engines/sci/graphics/menu.cpp
+++ b/engines/sci/graphics/menu.cpp
@@ -130,9 +130,13 @@ void GfxMenu::kernelAddEntry(Common::String title, Common::String content, reg_t
 				altPos = curPos;
 				break;
 			case '#': // Function-prefix
-				if (functionPos)
-					error("multiple function markers within one menu-item");
-				functionPos = curPos;
+				// #G is used as language separator (SQ3 German Amiga) so only
+				//  treat # as a function prefix once ` has been reached
+				if (rightAlignedPos) {
+					if (functionPos)
+						error("multiple function markers within one menu-item");
+					functionPos = curPos;
+				}
 				break;
 			}
 			curPos++;
@@ -197,6 +201,7 @@ void GfxMenu::kernelAddEntry(Common::String title, Common::String content, reg_t
 				separatorCount++;
 				break;
 			case '%':
+			case '#':
 				// Some multilingual sci01 games use e.g. '--!%G--!' (which doesn't really make sense)
 				separatorCount += 2;
 				curPos++;