rename StringsList to StringsTable

svn-id: r16492

4 files changed, 15 insertions, 16 deletions

diff --git a/saga/actor.h b/saga/actor.h
index dfb6421b19..49b8446f55 100644
--- a/saga/actor.h
+++ b/saga/actor.h
@@ -343,7 +343,7 @@ private:
 	ActorOrderList _drawOrderList;
 	ActorData _actors[ACTORCOUNT];
 	SpeechData _activeSpeech;
-	StringsList _actorsStrings;
+	StringsTable _actorsStrings;
 
 //path stuff
 	Rect _barrierList[ACTOR_BARRIERS_MAX];
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;
 	}
 }
 
diff --git a/saga/saga.h b/saga/saga.h
index 7e07cce4c5..8e531fc861 100644
--- a/saga/saga.h
+++ b/saga/saga.h
@@ -123,7 +123,7 @@ enum HitZoneFlags {
 	kHitZoneTerminus = (1 << 3)
 };
 
-struct StringsList {
+struct StringsTable {
 	byte *stringsPointer;
 	int stringsCount;
 	const char **strings;
@@ -140,7 +140,7 @@ struct StringsList {
 		memset(this, 0, sizeof(*this));
 	}
 
-	StringsList() {
+	StringsTable() {
 		memset(this, 0, sizeof(*this));
 	}
 };
@@ -323,7 +323,7 @@ public:
 	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:
diff --git a/saga/script.h b/saga/script.h
index 662efd70e7..30a58028ae 100644
--- a/saga/script.h
+++ b/saga/script.h
@@ -207,7 +207,7 @@ struct VOICE_LUT {
 struct ScriptData {
 	int loaded;
 	SCRIPT_BYTECODE *bytecode;
-	StringsList strings;
+	StringsTable strings;
 	VOICE_LUT *voice;
 };
 
@@ -235,7 +235,6 @@ public:
 	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 @@ protected:
 	ScriptData *_currentScript;
 	ScriptDataBuf _dataBuf[SCRIPT_DATABUF_NUM];
 	ScriptThreadList _threadList;
-	StringsList _mainStrings;
+	StringsTable _mainStrings;
 
 //verb	
 	bool _firstObjectSet;