SCI32: Rewrite kArray & kString

This change invalidates earlier SCI32 save games, which separated
arrays and strings in an incompatible manner. Old save games
contain invalid references to a string segment which no longer
exists, and contain incompatible array structures that lack
critical type information.

1 files changed, 2 insertions, 15 deletions

diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index 5300b72b71..b0615b4213 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -439,21 +439,8 @@ Common::String MessageState::processString(const char *s) {
 void MessageState::outputString(reg_t buf, const Common::String &str) {
 #ifdef ENABLE_SCI32
 	if (getSciVersion() >= SCI_VERSION_2) {
-		if (_segMan->getSegmentType(buf.getSegment()) == SEG_TYPE_STRING) {
-			SciString *sciString = _segMan->lookupString(buf);
-			sciString->setSize(str.size() + 1);
-			for (uint32 i = 0; i < str.size(); i++)
-				sciString->setValue(i, str.c_str()[i]);
-			sciString->setValue(str.size(), 0);
-		} else if (_segMan->getSegmentType(buf.getSegment()) == SEG_TYPE_ARRAY) {
-			// Happens in the intro of LSL6, we are asked to write the string
-			// into an array
-			SciArray<reg_t> *sciString = _segMan->lookupArray(buf);
-			sciString->setSize(str.size() + 1);
-			for (uint32 i = 0; i < str.size(); i++)
-				sciString->setValue(i, make_reg(0, str.c_str()[i]));
-			sciString->setValue(str.size(), NULL_REG);
-		}
+		SciArray *sciString = _segMan->lookupArray(buf);
+		sciString->fromString(str);
 	} else {
 #endif
 		SegmentRef buffer_r = _segMan->dereference(buf);