[Scummvm-cvs-logs] scummvm master -> 7560007ba9becb824c9a107b65f6a630daea9e58

bluegr md5 at scummvm.org
Sun Jan 15 20:43:08 CET 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7560007ba9 SCI: Simplify kString(Dup) using the overloaded = operator


Commit: 7560007ba9becb824c9a107b65f6a630daea9e58
    https://github.com/scummvm/scummvm/commit/7560007ba9becb824c9a107b65f6a630daea9e58
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-01-15T11:42:09-08:00

Commit Message:
SCI: Simplify kString(Dup) using the overloaded = operator

Thanks to wjp for his suggestion

Changed paths:
    engines/sci/engine/kstring.cpp



diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 03359b4..089ba0e 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -752,14 +752,7 @@ reg_t kString(EngineState *s, int argc, reg_t *argv) {
 		SciString *dupString = s->_segMan->allocateString(&stringHandle);
 
 		if (argv[1].segment == s->_segMan->getStringSegmentId()) {
-			SciString *sciString = s->_segMan->lookupString(argv[1]);
-			const char *rawString = sciString->getRawData();
-			uint32 size = sciString->getSize();
-
-			dupString->setSize(sciString->getSize());
-
-			for (uint32 i = 0; i < size; i++)
-				dupString->setValue(i, rawString[i]);
+			*dupString = *s->_segMan->lookupString(argv[1]);
 		} else {
 			dupString->fromString(s->_segMan->getString(argv[1]));
 		}






More information about the Scummvm-git-logs mailing list