[Scummvm-cvs-logs] scummvm master -> 901eeea62e679e6b657bf2301adbc9d4c01a9cb1

[Kirben]

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:
901eeea62e AGOS: Convert verb ids for Simon the Sorcerer 2.


Commit: 901eeea62e679e6b657bf2301adbc9d4c01a9cb1
    https://github.com/scummvm/scummvm/commit/901eeea62e679e6b657bf2301adbc9d4c01a9cb1
Author: Kirben (kirben at optusnet.com.au)
Date: 2014-03-01T03:54:18-08:00

Commit Message:
AGOS: Convert verb ids for Simon the Sorcerer 2.

Changed paths:
    engines/agos/verb.cpp



diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp
index 45dbfd0..fb38783 100644
--- a/engines/agos/verb.cpp
+++ b/engines/agos/verb.cpp
@@ -249,12 +249,18 @@ void AGOSEngine::clearName() {
 	resetNameWindow();
 }
 
+static const byte convertVerbID[9] = {
+	0, 1, 5, 11, 8, 7, 10, 3, 2
+};
+
 void AGOSEngine::printVerbOf(uint hitarea_id) {
 	const char *txt;
 	const char * const *verb_names;
 	const char * const *verb_prep_names;
 
 	hitarea_id -= 101;
+	if (getGameType() == GType_SIMON2)
+		hitarea_id = convertVerbID[hitarea_id];
 
 	if (_showPreposition) {
 		switch (_language) {