[Scummvm-cvs-logs] CVS: scummvm/saga saga.cpp,1.140,1.141 script.cpp,1.83,1.84

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24573

Modified Files:
	saga.cpp script.cpp 
Log Message:
Cleanup.


Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- saga.cpp	8 Oct 2005 16:25:18 -0000	1.140
+++ saga.cpp	8 Oct 2005 21:28:14 -0000	1.141
@@ -389,11 +389,9 @@
 	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());

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- script.cpp	8 Oct 2005 15:20:11 -0000	1.83
+++ script.cpp	8 Oct 2005 21:28:14 -0000	1.84
@@ -130,12 +130,8 @@
 	// 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);