diff options
author | Torbjörn Andersson | 2005-10-08 21:28:14 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2005-10-08 21:28:14 +0000 |
commit | 60b85c5137f05ea248ccb54c1a454cb4bc1ebd03 (patch) | |
tree | d24eab27a12a9b1690384f1f2a396c44f2a1506e /saga | |
parent | f14365e3f9e82710e946e2110c13fd0ecd3d71b5 (diff) | |
download | scummvm-rg350-60b85c5137f05ea248ccb54c1a454cb4bc1ebd03.tar.gz scummvm-rg350-60b85c5137f05ea248ccb54c1a454cb4bc1ebd03.tar.bz2 scummvm-rg350-60b85c5137f05ea248ccb54c1a454cb4bc1ebd03.zip |
Cleanup.
svn-id: r18972
Diffstat (limited to 'saga')
-rw-r--r-- | saga/saga.cpp | 2 | ||||
-rw-r--r-- | saga/script.cpp | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/saga/saga.cpp b/saga/saga.cpp index 795415970a..fe83e387a7 100644 --- a/saga/saga.cpp +++ b/saga/saga.cpp @@ -389,11 +389,9 @@ const char *SagaEngine::getObjectName(uint16 objectId) { case kGameObjectObject: obj = _actor->getObj(objectId); return _script->_mainStrings.getString(obj->_nameIndex); - break; case kGameObjectActor: actor = _actor->getActor(objectId); return _actor->_actorsStrings.getString(actor->_nameIndex); - break; case kGameObjectHitZone: hitZone = _scene->_objectMap->getHitZone(objectIdToIndex(objectId)); return _scene->_sceneStrings.getString(hitZone->getNameIndex()); diff --git a/saga/script.cpp b/saga/script.cpp index c3088d5883..79e5632e8c 100644 --- a/saga/script.cpp +++ b/saga/script.cpp @@ -130,12 +130,8 @@ Script::Script(SagaEngine *vm) : _vm(vm) { // In ITE, the "main strings" resource contains both the verb strings // and the object names. // - // In IHNM, the "main strings" does not contain the verb strings. - // Instead, it looks as if the object names are divided over several - // different string lists. One per character, perhaps? - // - // Or maybe I'm looking at the wrong resource. I found the IHNM one by - // trial and error... + // In IHNM, the "main strings" contains the verb strings, but not the + // object verbs. At least, I think that's the case. _vm->_resource->loadResource(resourceContext, _vm->getResourceDescription()->mainStringsResourceId, stringsPointer, stringsLength); |