[Scummvm-cvs-logs] scummvm master -> 46fe6b64b9bac081384107192b7bcd24fbb255f5

[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:
46fe6b64b9 ZVISION: Properly handle confirmation dialogs in the French ver. of ZGI


Commit: 46fe6b64b9bac081384107192b7bcd24fbb255f5
    https://github.com/scummvm/scummvm/commit/46fe6b64b9bac081384107192b7bcd24fbb255f5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-01-21T12:36:02+02:00

Commit Message:
ZVISION: Properly handle confirmation dialogs in the French ver. of ZGI

Changed paths:
    engines/zvision/graphics/render_manager.cpp



diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index a65117f..3cd9701 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -992,7 +992,8 @@ bool RenderManager::askQuestion(const Common::String &str) {
 				// English: yes/no
 				// German: ja/nein
 				// Spanish: si/no
-				// French: F4/any other key
+				// French Nemesis: F4/any other key
+				// French ZGI: oui/non
 				switch (evnt.kbd.keycode) {
 				case Common::KEYCODE_y:
 					if (_engine->getLanguage() == Common::EN_ANY)
@@ -1006,15 +1007,19 @@ bool RenderManager::askQuestion(const Common::String &str) {
 					if (_engine->getLanguage() == Common::ES_ESP)
 						result = 2;
 					break;
+				case Common::KEYCODE_o:
+					if (_engine->getLanguage() == Common::FR_FRA && _engine->getGameId() == GID_GRANDINQUISITOR)
+						result = 2;
+					break;
 				case Common::KEYCODE_F4:
-					if (_engine->getLanguage() == Common::FR_FRA)
+					if (_engine->getLanguage() == Common::FR_FRA && _engine->getGameId() == GID_NEMESIS)
 						result = 2;
 					break;
 				case Common::KEYCODE_n:
 					result = 1;
 					break;
 				default:
-					if (_engine->getLanguage() == Common::FR_FRA)
+					if (_engine->getLanguage() == Common::FR_FRA && _engine->getGameId() == GID_NEMESIS)
 						result = 1;
 					break;
 				}