[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.72,1.73

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Dec 28 06:59:01 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv359

Modified Files:
	string.cpp 
Log Message:
fix compilation under VC6

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- string.cpp	28 Dec 2002 12:22:39 -0000	1.72
+++ string.cpp	28 Dec 2002 14:58:16 -0000	1.73
@@ -820,7 +820,7 @@
 			pos += 3;
 			byte *pointer = (byte *)strchr((char*)text + 1, '/');
 			if (pointer != NULL)
-				memcpy(trans_buff, pointer + 1, resStrLen(pointer + 1) + 1);
+				memcpy(trans_buff, pointer + 1, resStrLen((char*)pointer + 1) + 1);
 			else
 				trans_buff[0] = '\0';
 			return;
@@ -880,12 +880,12 @@
 	if (text[0] == '/') {
 		byte *pointer = (byte *)strchr((char*)text + 1, '/');
 		if (pointer != NULL)
-			memcpy(trans_buff, pointer + 1, resStrLen(pointer + 1) + 1);
+			memcpy(trans_buff, pointer + 1, resStrLen((char*)pointer + 1) + 1);
 		else
 			trans_buff[0] = '\0';
 		return;
 	}
 
-	memcpy(trans_buff, text, resStrLen(text) + 1);
+	memcpy(trans_buff, text, resStrLen((char*)text) + 1);
 }
 





More information about the Scummvm-git-logs mailing list