[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.69,1.70 resnames.h,1.28,1.29 script.cpp,1.67,1.68
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Wed Jun 8 06:50:36 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: web/screenshots big_scummvm_0.png,1.3,1.4 big_scummvm_10.png,1.3,1.4 scummvm_0.png,1.4,1.5 scummvm_10.png,1.3,1.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.70,1.71 interface.cpp,1.103,1.104 resnames.h,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10946
Modified Files:
game.cpp resnames.h script.cpp
Log Message:
Added IHNM "main strings" resource. It's trial-and-error, so it may be the
wrong one, but it does contain the verb strings. Unlike IHNM, it does not
contain the object names. We'll need to do something about that eventually.
Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- game.cpp 4 Jun 2005 12:25:25 -0000 1.69
+++ game.cpp 8 Jun 2005 13:49:56 -0000 1.70
@@ -397,7 +397,7 @@
0,
0,
0,
- 0,
+ RID_IHNM_MAIN_STRINGS,
0
};
Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- resnames.h 26 May 2005 09:45:15 -0000 1.28
+++ resnames.h 8 Jun 2005 13:49:56 -0000 1.29
@@ -68,6 +68,7 @@
#define RID_IHNM_MAIN_PANEL 9
#define RID_IHNM_CONVERSE_PANEL 10
+#define RID_IHNM_MAIN_STRINGS 21
// Puzzle portraits
#define RID_ITE_SAKKA_APPRAISING 6
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- script.cpp 22 May 2005 11:59:21 -0000 1.67
+++ script.cpp 8 Jun 2005 13:49:56 -0000 1.68
@@ -138,8 +138,21 @@
}
RSC_FreeResource(resourcePointer);
-
- result = RSC_LoadResource(resourceContext, _vm->getResourceDescription()->mainStringsResourceId, &stringsPointer, &stringsLength); // fixme: IHNM
+
+ // TODO
+ //
+ // 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...
+
+ result = RSC_LoadResource(resourceContext, _vm->getResourceDescription()->mainStringsResourceId, &stringsPointer, &stringsLength);
+
if ((result != SUCCESS) || (stringsLength == 0)) {
error("Error loading strings list resource");
}
@@ -200,7 +213,7 @@
if ((result != SUCCESS) || (resourceLength == 0)) {
error("Script::loadModule() Error loading strings list resource");
}
-
+
_vm->loadStrings(_modules[scriptModuleNumber].strings, resourcePointer, resourceLength);
RSC_FreeResource(resourcePointer);
- Previous message: [Scummvm-cvs-logs] CVS: web/screenshots big_scummvm_0.png,1.3,1.4 big_scummvm_10.png,1.3,1.4 scummvm_0.png,1.4,1.5 scummvm_10.png,1.3,1.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.70,1.71 interface.cpp,1.103,1.104 resnames.h,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list