[Scummvm-cvs-logs] scummvm master -> 5a1f75eae3a1d15bf0c610d2468a2afef30a893b

lordhoto lordhoto at gmail.com
Sat Aug 20 19:35:18 CEST 2011


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:
5a1f75eae3 AGOS: Slight cleanup.


Commit: 5a1f75eae3a1d15bf0c610d2468a2afef30a893b
    https://github.com/scummvm/scummvm/commit/5a1f75eae3a1d15bf0c610d2468a2afef30a893b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-20T10:30:18-07:00

Commit Message:
AGOS: Slight cleanup.

Now AgosEngine::_language is of type Common::Language instead of uint16. It is
currently only used with values of that enumeration, thus it should be safe to
use that type for it too.

Changed paths:
    engines/agos/agos.h
    engines/agos/script_s1.cpp



diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 359dfd5..820bc02 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -324,7 +324,7 @@ protected:
 	bool _backFlag;
 
 	uint16 _debugMode;
-	uint16 _language;
+	Common::Language _language;
 	bool _copyProtection;
 	bool _pause;
 	bool _dumpScripts;
diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp
index b5c39fb..a07c05b 100644
--- a/engines/agos/script_s1.cpp
+++ b/engines/agos/script_s1.cpp
@@ -310,7 +310,7 @@ void AGOSEngine_Simon1::os1_pauseGame() {
 
 	Common::KeyCode keyYes, keyNo;
 
-	Common::getLanguageYesNo((Common::Language)_language, keyYes, keyNo);
+	Common::getLanguageYesNo(_language, keyYes, keyNo);
 
 	while (!shouldQuit()) {
 		delay(1);






More information about the Scummvm-git-logs mailing list