[Scummvm-cvs-logs] CVS: scummvm/saga actor.h,1.43,1.44 saga.cpp,1.82,1.83 saga.h,1.66,1.67 script.h,1.49,1.50
Andrew Kurushin
h00ligan at users.sourceforge.net
Sat Jan 8 13:07:05 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.82,1.83 actor.h,1.42,1.43 console.cpp,1.26,1.27 console.h,1.12,1.13 interface.cpp,1.53,1.54 interface.h,1.22,1.23 render.h,1.21,1.22 resnames.h,1.17,1.18 saga.cpp,1.81,1.82 saga.h,1.65,1.66 script.cpp,1.42,1.43 script.h,1.48,1.49 sfuncs.cpp,1.73,1.74 sprite.cpp,1.37,1.38 sprite.h,1.12,1.13 sthread.cpp,1.55,1.56
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.76,1.77 file.h,1.31,1.32 stream.cpp,1.5,1.6 stream.h,1.11,1.12 system.cpp,1.17,1.18 system.h,1.80,1.81
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12427
Modified Files:
actor.h saga.cpp saga.h script.h
Log Message:
rename StringsList to StringsTable
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- actor.h 8 Jan 2005 20:30:06 -0000 1.43
+++ actor.h 8 Jan 2005 21:06:06 -0000 1.44
@@ -343,7 +343,7 @@
ActorOrderList _drawOrderList;
ActorData _actors[ACTORCOUNT];
SpeechData _activeSpeech;
- StringsList _actorsStrings;
+ StringsTable _actorsStrings;
//path stuff
Rect _barrierList[ACTOR_BARRIERS_MAX];
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- saga.cpp 8 Jan 2005 20:30:06 -0000 1.82
+++ saga.cpp 8 Jan 2005 21:06:06 -0000 1.83
@@ -283,16 +283,16 @@
_system->quit();
}
-void SagaEngine::loadStrings(StringsList &stringsList, const byte *stringsPointer, size_t stringsLength) {
+void SagaEngine::loadStrings(StringsTable &stringsTable, const byte *stringsPointer, size_t stringsLength) {
uint16 stringsCount;
uint16 i;
size_t offset;
- stringsList.stringsPointer = (byte*)malloc(stringsLength);
- memcpy(stringsList.stringsPointer, stringsPointer, stringsLength);
+ stringsTable.stringsPointer = (byte*)malloc(stringsLength);
+ memcpy(stringsTable.stringsPointer, stringsPointer, stringsLength);
- MemoryReadStreamEndian scriptS(stringsList.stringsPointer, stringsLength, IS_BIG_ENDIAN);
+ MemoryReadStreamEndian scriptS(stringsTable.stringsPointer, stringsLength, IS_BIG_ENDIAN);
offset = scriptS.readUint16();
if (offset > stringsLength) {
@@ -300,11 +300,11 @@
}
stringsCount = offset / 2;
- stringsList.stringsCount = stringsCount;
+ stringsTable.stringsCount = stringsCount;
- stringsList.strings = (const char **)malloc(stringsCount * sizeof(const char *));
- if (stringsList.strings == NULL) {
- error("No enough memory for strings list");
+ stringsTable.strings = (const char **)malloc(stringsCount * sizeof(const char *));
+ if (stringsTable.strings == NULL) {
+ error("No enough memory for strings Table");
}
scriptS.seek(0);
@@ -313,7 +313,7 @@
if (offset > stringsLength) {
error("invalid string offset");
}
- stringsList.strings[i] = (const char *)stringsList.stringsPointer + offset;
+ stringsTable.strings[i] = (const char *)stringsTable.stringsPointer + offset;
}
}
Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- saga.h 8 Jan 2005 20:30:06 -0000 1.66
+++ saga.h 8 Jan 2005 21:06:06 -0000 1.67
@@ -123,7 +123,7 @@
kHitZoneTerminus = (1 << 3)
};
-struct StringsList {
+struct StringsTable {
byte *stringsPointer;
int stringsCount;
const char **strings;
@@ -140,7 +140,7 @@
memset(this, 0, sizeof(*this));
}
- StringsList() {
+ StringsTable() {
memset(this, 0, sizeof(*this));
}
};
@@ -323,7 +323,7 @@
int decodeBGImage(const byte *image_data, size_t image_size,
byte **output_buf, size_t *output_buf_len, int *w, int *h);
const byte *getImagePal(const byte *image_data, size_t image_size);
- void loadStrings(StringsList &stringsList, const byte *stringsPointer, size_t stringsLength);
+ void loadStrings(StringsTable &stringsTable, const byte *stringsPointer, size_t stringsLength);
const char *getObjectName(uint16 objectId);
public:
Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- script.h 8 Jan 2005 20:30:06 -0000 1.49
+++ script.h 8 Jan 2005 21:06:06 -0000 1.50
@@ -207,7 +207,7 @@
struct ScriptData {
int loaded;
SCRIPT_BYTECODE *bytecode;
- StringsList strings;
+ StringsTable strings;
VOICE_LUT *voice;
};
@@ -235,7 +235,6 @@
int freeScript();
SCRIPT_BYTECODE *loadBytecode(byte *bytecode_p, size_t bytecode_len);
VOICE_LUT *loadVoiceLUT(const byte *voicelut_p, size_t voicelut_len, ScriptData *script);
- int disassemble(SCRIPT_BYTECODE *script_list, StringsList *strings);
bool isInitialized() const { return _initialized; }
bool isVoiceLUTPresent() const { return _voiceLUTPresent; }
@@ -265,7 +264,7 @@
ScriptData *_currentScript;
ScriptDataBuf _dataBuf[SCRIPT_DATABUF_NUM];
ScriptThreadList _threadList;
- StringsList _mainStrings;
+ StringsTable _mainStrings;
//verb
bool _firstObjectSet;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.82,1.83 actor.h,1.42,1.43 console.cpp,1.26,1.27 console.h,1.12,1.13 interface.cpp,1.53,1.54 interface.h,1.22,1.23 render.h,1.21,1.22 resnames.h,1.17,1.18 saga.cpp,1.81,1.82 saga.h,1.65,1.66 script.cpp,1.42,1.43 script.h,1.48,1.49 sfuncs.cpp,1.73,1.74 sprite.cpp,1.37,1.38 sprite.h,1.12,1.13 sthread.cpp,1.55,1.56
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.76,1.77 file.h,1.31,1.32 stream.cpp,1.5,1.6 stream.h,1.11,1.12 system.cpp,1.17,1.18 system.h,1.80,1.81
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list