aboutsummaryrefslogtreecommitdiff
path: root/saga/saga.cpp
diff options
context:
space:
mode:
authorAndrew Kurushin2005-01-08 21:06:06 +0000
committerAndrew Kurushin2005-01-08 21:06:06 +0000
commit9c7a604c8bcf6903e83787dc3e8513515489d892 (patch)
tree0aa418cf80f5c628a3aa37d29119d6a8e7e73d98 /saga/saga.cpp
parentbdb1b1eb1c21faf8dfc00ce4fb57965cdb649d8a (diff)
downloadscummvm-rg350-9c7a604c8bcf6903e83787dc3e8513515489d892.tar.gz
scummvm-rg350-9c7a604c8bcf6903e83787dc3e8513515489d892.tar.bz2
scummvm-rg350-9c7a604c8bcf6903e83787dc3e8513515489d892.zip
rename StringsList to StringsTable
svn-id: r16492
Diffstat (limited to 'saga/saga.cpp')
-rw-r--r--saga/saga.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/saga/saga.cpp b/saga/saga.cpp
index 7f8dd3c946..0c03d9f0c0 100644
--- a/saga/saga.cpp
+++ b/saga/saga.cpp
@@ -283,16 +283,16 @@ void SagaEngine::shutdown() {
_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 @@ void SagaEngine::loadStrings(StringsList &stringsList, const byte *stringsPointe
}
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 @@ void SagaEngine::loadStrings(StringsList &stringsList, const byte *stringsPointe
if (offset > stringsLength) {
error("invalid string offset");
}
- stringsList.strings[i] = (const char *)stringsList.stringsPointer + offset;
+ stringsTable.strings[i] = (const char *)stringsTable.stringsPointer + offset;
}
}