[Scummvm-cvs-logs] scummvm master -> 7761c75c31eb8bb7b9794649fe9a7fbbccdced03

Kirben kirben at optusnet.com.au
Wed Aug 20 00:37:41 CEST 2014


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:
7761c75c31 SCUMM: Fix Bug #6711- Wrong quit message shown in Pajama Sam Lost and Found.


Commit: 7761c75c31eb8bb7b9794649fe9a7fbbccdced03
    https://github.com/scummvm/scummvm/commit/7761c75c31eb8bb7b9794649fe9a7fbbccdced03
Author: Kirben (kirben at optusnet.com.au)
Date: 2014-08-20T08:36:40+10:00

Commit Message:
SCUMM: Fix Bug #6711- Wrong quit message shown in Pajama Sam Lost and Found.

Changed paths:
    engines/scumm/dialogs.cpp



diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 8321daa..5212094 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -428,7 +428,9 @@ const Common::String InfoDialog::queryResString(int stringno) {
 	if (stringno == 0)
 		return String();
 
-	if (_vm->_game.version == 8)
+	if (_vm->_game.heversion >= 80)
+		return _(string_map_table_v6[stringno - 1].string);
+	else if (_vm->_game.version == 8)
 		result = (const byte *)string_map_table_v8[stringno - 1].string;
 	else if (_vm->_game.version == 7)
 		result = _vm->getStringAddressVar(string_map_table_v7[stringno - 1].num);






More information about the Scummvm-git-logs mailing list