[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.203,1.204 scumm.h,1.384,1.385

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15277

Modified Files:
	string.cpp scumm.h 
Log Message:
addMessageToStack doesn't have to return anything anymore

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- string.cpp	15 Mar 2004 03:33:08 -0000	1.203
+++ string.cpp	19 Mar 2004 19:40:34 -0000	1.204
@@ -466,7 +466,7 @@
 	}
 }
 
-const byte *ScummEngine::addMessageToStack(const byte *msg, byte *dstBuffer, int dstBufferSize) {
+void ScummEngine::addMessageToStack(const byte *msg, byte *dstBuffer, int dstBufferSize) {
 	uint num = 0;
 	uint32 val;
 	byte chr;
@@ -478,7 +478,7 @@
 
 	if (msg == NULL) {
 		warning("Bad message in addMessageToStack, ignoring");
-		return NULL;
+		return;
 	}
 
 	while ((buf[num++] = chr = *msg++) != 0) {
@@ -566,8 +566,6 @@
 		if (_msgPtrToAdd >= dstBuffer + dstBufferSize)
 			error("addMessageToStack: buffer overflow!");
 	}
-
-	return msg;
 }
 
 void ScummEngine::addIntToStack(int var) {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -d -r1.384 -r1.385
--- scumm.h	17 Mar 2004 01:50:15 -0000	1.384
+++ scumm.h	19 Mar 2004 19:40:34 -0000	1.385
@@ -1060,7 +1060,7 @@
 
 	void CHARSET_1();
 	void drawString(int a, const byte *msg);
-	const byte *addMessageToStack(const byte *msg, byte *dstBuffer, int dstBufferSize);
+	void addMessageToStack(const byte *msg, byte *dstBuffer, int dstBufferSize);
 	void addIntToStack(int var);
 	void addVerbToStack(int var);
 	void addNameToStack(int var);