[Scummvm-cvs-logs] SF.net SVN: scummvm: [26970] scummvm/trunk/engines/saga
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sun May 27 13:49:09 CEST 2007
Revision: 26970
http://scummvm.svn.sourceforge.net/scummvm/?rev=26970&view=rev
Author: thebluegr
Date: 2007-05-27 04:49:08 -0700 (Sun, 27 May 2007)
Log Message:
-----------
Verb actions are working correctly now in IHNM. Some verbs are still non-functional
Modified Paths:
--------------
scummvm/trunk/engines/saga/displayinfo.h
scummvm/trunk/engines/saga/interface.cpp
scummvm/trunk/engines/saga/script.cpp
Modified: scummvm/trunk/engines/saga/displayinfo.h
===================================================================
--- scummvm/trunk/engines/saga/displayinfo.h 2007-05-27 11:46:42 UTC (rev 26969)
+++ scummvm/trunk/engines/saga/displayinfo.h 2007-05-27 11:49:08 UTC (rev 26970)
@@ -283,16 +283,14 @@
#define IHNM_CONVERSE_TEXT_LINES 10
static PanelButton IHNM_MainPanelButtons[] = {
- // 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},
+ {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},
{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-27 11:46:42 UTC (rev 26969)
+++ scummvm/trunk/engines/saga/interface.cpp 2007-05-27 11:49:08 UTC (rev 26970)
@@ -1972,9 +1972,8 @@
if (_vm->getGameType() == GType_ITE) {
textId = verbTypeToTextStringsIdLUT[0][panelButton->id];
text = _vm->getTextString(textId);
- } else {
- // This -2 has been placed because of the changes in the ids in IHNM_MainPanelButtons
- textId = verbTypeToTextStringsIdLUT[1][panelButton->id - 2];
+ } else {
+ textId = verbTypeToTextStringsIdLUT[1][panelButton->id];
text = _vm->_script->_mainStrings.getString(textId + 1);
textShadowKnownColor = kKnownColorTransparent;
}
Modified: scummvm/trunk/engines/saga/script.cpp
===================================================================
--- scummvm/trunk/engines/saga/script.cpp 2007-05-27 11:46:42 UTC (rev 26969)
+++ scummvm/trunk/engines/saga/script.cpp 2007-05-27 11:49:08 UTC (rev 26970)
@@ -287,7 +287,10 @@
return;
}
- verbName = _mainStrings.getString(_leftButtonVerb - 1);
+ if (_vm->getGameType() == GType_ITE)
+ verbName = _mainStrings.getString(_leftButtonVerb - 1);
+ else
+ verbName = _mainStrings.getString(_leftButtonVerb + 1);
if (objectTypeId(_currentObject[0]) == kGameObjectNone) {
_vm->_interface->setStatusText(verbName, statusColor);
@@ -360,22 +363,24 @@
return kVerbIHNMNone;
case kVerbWalkTo:
return kVerbIHNMWalk;
- case kVerbGive:
- return kVerbIHNMGive;
- case kVerbUse:
- return kVerbIHNMUse;
- case kVerbEnter:
- return kVerbIHNMEnter;
case kVerbLookAt:
return kVerbIHNMLookAt;
case kVerbPickUp:
return kVerbIHNMTake;
+ case kVerbUse:
+ return kVerbIHNMUse;
+ case kVerbTalkTo:
+ return kVerbIHNMTalkTo;
case kVerbOpen:
return -2;
+ // return kVerbIHNMSwallow;
+ case kVerbGive:
+ return kVerbIHNMGive;
case kVerbClose:
return -2;
- case kVerbTalkTo:
- return kVerbIHNMTalkTo;
+ // return kVerbIHNMPush;
+ case kVerbEnter:
+ return kVerbIHNMEnter;
case kVerbWalkOnly:
return kVerbIHNMWalkOnly;
case kVerbLookOnly:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list