SCI: Removed the system strings code and replaced it with a much more simplified version, thus greatly simplifying handling of system strings

svn-id: r54805

1 files changed, 0 insertions, 28 deletions

diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp
index e40777755f..390e783329 100644
--- a/engines/sci/engine/segment.cpp
+++ b/engines/sci/engine/segment.cpp
@@ -52,9 +52,6 @@ SegmentObj *SegmentObj::createSegmentObj(SegmentType type) {
 	case SEG_TYPE_LOCALS:
 		mem = new LocalVariables();
 		break;
-	case SEG_TYPE_SYS_STRINGS:
-		mem = new SystemStrings();
-		break;
 	case SEG_TYPE_STACK:
 		mem = new DataStack();
 		break;
@@ -99,9 +96,6 @@ const char *SegmentObj::getSegmentTypeName(SegmentType type) {
 	case SEG_TYPE_LOCALS:
 		return "locals";
 		break;
-	case SEG_TYPE_SYS_STRINGS:
-		return "strings";
-		break;
 	case SEG_TYPE_STACK:
 		return "stack";
 		break;
@@ -201,28 +195,6 @@ SegmentRef DynMem::dereference(reg_t pointer) {
 	return ret;
 }
 
-bool SystemStrings::isValidOffset(uint16 offset) const {
-	return offset < SYS_STRINGS_MAX && !_strings[offset]._name.empty();
-}
-
-SegmentRef SystemStrings::dereference(reg_t pointer) {
-	SegmentRef ret;
-	ret.isRaw = true;
-	ret.maxSize = _strings[pointer.offset]._maxSize;
-	if (isValidOffset(pointer.offset))
-		ret.raw = (byte *)(_strings[pointer.offset]._value);
-	else {
-		if (g_sci->getGameId() == GID_KQ5) {
-			// This occurs in KQ5CD when interacting with certain objects
-		} else {
-			error("SystemStrings::dereference(): Attempt to dereference invalid pointer %04x:%04x", PRINT_REG(pointer));
-		}
-	}
-
-	return ret;
-}
-
-
 //-------------------- clones --------------------
 
 Common::Array<reg_t> CloneTable::listAllOutgoingReferences(reg_t addr) const {