[Scummvm-cvs-logs] SF.net SVN: scummvm:[35562] scummvm/trunk/engines/saga
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Fri Dec 26 14:50:13 CET 2008
Revision: 35562
http://scummvm.svn.sourceforge.net/scummvm/?rev=35562&view=rev
Author: thebluegr
Date: 2008-12-26 13:50:12 +0000 (Fri, 26 Dec 2008)
Log Message:
-----------
The verb<->textId assignment is needed only for ITE
Modified Paths:
--------------
scummvm/trunk/engines/saga/interface.cpp
scummvm/trunk/engines/saga/saga.h
Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp 2008-12-26 13:30:06 UTC (rev 35561)
+++ scummvm/trunk/engines/saga/interface.cpp 2008-12-26 13:50:12 UTC (rev 35562)
@@ -52,25 +52,9 @@
namespace Saga {
-static int verbTypeToTextStringsIdLUT[2][kVerbTypeIdsMax] = {
- {-1,
- kTextPickUp,
- kTextLookAt,
- kTextWalkTo,
- kTextTalkTo,
- kTextOpen,
- kTextClose,
- kTextGive,
- kTextUse},
- {-1,
- kVerbIHNMWalk,
- kVerbIHNMLookAt,
- kVerbIHNMTake,
- kVerbIHNMUse,
- kVerbIHNMTalkTo,
- kVerbIHNMSwallow,
- kVerbIHNMGive,
- kVerbIHNMPush}
+static int verbToTextIdITE[] = {
+ kTextWalkTo, kTextLookAt, kTextPickUp, kTextTalkTo,
+ kTextOpen, kTextClose, kTextUse, kTextGive
};
// This maps the internally used string ITE IDs to the LUT strings loaded in IHNM
@@ -2368,10 +2352,10 @@
int textId;
if (_vm->getGameId() == GID_ITE) {
- textId = verbTypeToTextStringsIdLUT[0][panelButton->id];
+ textId = verbToTextIdITE[panelButton->id - 1];
text = _vm->getTextString(textId);
} else {
- textId = verbTypeToTextStringsIdLUT[1][panelButton->id];
+ textId = panelButton->id;
text = _vm->_script->_mainStrings.getString(textId + 1);
textShadowKnownColor = kKnownColorTransparent;
}
Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h 2008-12-26 13:30:06 UTC (rev 35561)
+++ scummvm/trunk/engines/saga/saga.h 2008-12-26 13:50:12 UTC (rev 35562)
@@ -205,14 +205,15 @@
};
enum TextStringIds {
+ kTextPickUp,
+ kTextLookAt,
kTextWalkTo,
- kTextLookAt,
- kTextPickUp,
kTextTalkTo,
kTextOpen,
kTextClose,
+ kTextGive,
kTextUse,
- kTextGive,
+
kTextOptions,
kTextTest,
kTextDemo,
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