[Scummvm-cvs-logs] scummvm master -> 46ec2c4d732797d300608cc04bf14dd0a699ebe8

wjp wjp at usecode.org
Tue Nov 15 13:48:44 CET 2011


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:
46ec2c4d73 DREAMWEB: Use strcpy/strlen instead of manual loops


Commit: 46ec2c4d732797d300608cc04bf14dd0a699ebe8
    https://github.com/scummvm/scummvm/commit/46ec2c4d732797d300608cc04bf14dd0a699ebe8
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-15T04:45:34-08:00

Commit Message:
DREAMWEB: Use strcpy/strlen instead of manual loops

Changed paths:
    engines/dreamweb/object.cpp



diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 9bb5a7d..5e822ca 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -249,14 +249,12 @@ void DreamGenContext::transfertext() {
 	segRef(data.word(kExtras)).word(kExtextdat + data.byte(kExpos) * 2) = data.word(kExtextpos);
 	uint16 freeTextOffset = data.byte(kItemtotran) * 2;
 	uint16 srcOffset = segRef(data.word(kFreedesc)).word(kFreetextdat + freeTextOffset);
-	const uint8 *src = segRef(data.word(kFreedesc)).ptr(kFreetext + srcOffset, 0);
-	uint8 *dst = segRef(data.word(kExtras)).ptr(kExtext + data.word(kExtextpos), 0);
-	uint8 c;
-	do {
-		c = *src++;
-		*dst++ = c;
-		++data.word(kExtextpos);
-	} while (c);
+	const char *src = (const char *)segRef(data.word(kFreedesc)).ptr(kFreetext + srcOffset, 0);
+	char *dst = (char *)segRef(data.word(kExtras)).ptr(kExtext + data.word(kExtextpos), 0);
+
+	strcpy(dst, src);
+
+	data.word(kExtextpos) += strlen(src) + 1;
 }
 
 






More information about the Scummvm-git-logs mailing list