[Scummvm-cvs-logs] SF.net SVN: scummvm: [26732] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 26732
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26732&view=rev
Author:   thebluegr
Date:     2007-05-01 14:48:18 -0700 (Tue, 01 May 2007)

Log Message:
-----------
Fix for verbs in IHNM

Modified Paths:
--------------
    scummvm/trunk/engines/saga/displayinfo.h
    scummvm/trunk/engines/saga/interface.cpp

Modified: scummvm/trunk/engines/saga/displayinfo.h
===================================================================
--- scummvm/trunk/engines/saga/displayinfo.h	2007-05-01 21:40:56 UTC (rev 26731)
+++ scummvm/trunk/engines/saga/displayinfo.h	2007-05-01 21:48:18 UTC (rev 26732)
@@ -283,14 +283,16 @@
 #define IHNM_CONVERSE_TEXT_LINES        10
 
 static PanelButton IHNM_MainPanelButtons[] = {
-	{kPanelButtonVerb,		106,12,		114,30,	kVerbIHNMWalk,'w',0,	0,1,0},
-	{kPanelButtonVerb,		106,44,		114,30,	kVerbIHNMLookAt,'l',0,	2,3,0},
-	{kPanelButtonVerb,		106,76,		114,30, kVerbIHNMTake,'k',0,	4,5,0},
-	{kPanelButtonVerb,		106,108,	114,30, kVerbIHNMUse,'u',0,		6,7,0},
-	{kPanelButtonVerb,		223,12,		114,30, kVerbIHNMTalkTo,'t',0,	8,9,0},
-	{kPanelButtonVerb,		223,44,		114,30, kVerbIHNMSwallow,'s',0,	10,11,0},
-	{kPanelButtonVerb,		223,76,		114,30, kVerbIHNMGive,'g',0,	12,13,0},
-	{kPanelButtonVerb,		223,108,	114,30, kVerbIHNMPush,'p',0,	14,15,0},
+	// TODO: The +2's are needed here to fix the verbs, investigate why
+	// The computation of textid in Interface::drawVerbPanelText has also been changed accordingly
+	{kPanelButtonVerb,		106,12,		114,30,	kVerbIHNMWalk + 2,'w',0,	0,1,0},
+	{kPanelButtonVerb,		106,44,		114,30,	kVerbIHNMLookAt + 2,'l',0,	2,3,0},
+	{kPanelButtonVerb,		106,76,		114,30, kVerbIHNMTake + 2,'k',0,	4,5,0},
+	{kPanelButtonVerb,		106,108,	114,30, kVerbIHNMUse + 2,'u',0,		6,7,0},
+	{kPanelButtonVerb,		223,12,		114,30, kVerbIHNMTalkTo + 2,'t',0,	8,9,0},
+	{kPanelButtonVerb,		223,44,		114,30, kVerbIHNMSwallow + 2,'s',0,	10,11,0},
+	{kPanelButtonVerb,		223,76,		114,30, kVerbIHNMGive + 2,'g',0,	12,13,0},
+	{kPanelButtonVerb,		223,108,	114,30, kVerbIHNMPush + 2,'p',0,	14,15,0},
 	{kPanelButtonArrow,		606,22,		20,25,	-1,'[',0,			0,0,0}, //TODO: arrow Sprite Numbers
 	{kPanelButtonArrow,		606,108,	20,25,	1,']',0,			0,0,0},
 

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-05-01 21:40:56 UTC (rev 26731)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-05-01 21:48:18 UTC (rev 26732)
@@ -69,14 +69,14 @@
 	-1,
 	-1},
 	{-1, 
-	3, //TODO:check
-	2, 
-	1, 
-	5, 
-	6, //TODO:check
-	8, //TODO:check
-	7, 
-	4}
+	kVerbIHNMWalk,
+	kVerbIHNMLookAt,
+	kVerbIHNMTake, 
+	kVerbIHNMUse, 
+	kVerbIHNMTalkTo,
+	kVerbIHNMSwallow,
+	kVerbIHNMGive, 
+	kVerbIHNMPush}
 };
 
 Interface::Interface(SagaEngine *vm) : _vm(vm) {
@@ -1939,7 +1939,8 @@
 		textId = verbTypeToTextStringsIdLUT[0][panelButton->id];
 		text = _vm->getTextString(textId);
 	} else {
-		textId = verbTypeToTextStringsIdLUT[1][panelButton->id];
+		// This -2 has been placed because of the changes in the ids in IHNM_MainPanelButtons
+		textId = verbTypeToTextStringsIdLUT[1][panelButton->id - 2];
 		text = _vm->_script->_mainStrings.getString(textId + 1);
 		textShadowKnownColor = kKnownColorTransparent;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.