[Scummvm-cvs-logs] SF.net SVN: scummvm: [31086] scummvm/trunk/engines/kyra/gui_v2.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun Mar 9 13:25:48 CET 2008


Revision: 31086
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31086&view=rev
Author:   eriktorbjorn
Date:     2008-03-09 05:25:48 -0700 (Sun, 09 Mar 2008)

Log Message:
-----------
Fixed warning.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_v2.cpp

Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp	2008-03-09 12:19:42 UTC (rev 31085)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp	2008-03-09 12:25:48 UTC (rev 31086)
@@ -935,8 +935,8 @@
 	}
 }
 
-void KyraEngine_v2::bookDecodeText(uint8 *text) {
-	uint8 *dst = text, *op = text;
+void KyraEngine_v2::bookDecodeText(uint8 *str) {
+	uint8 *dst = str, *op = str;
 	while (*op != 0x1A) {
 		while (*op != 0x1A && *op != 0x0D)
 			*dst++ = *op++;
@@ -950,7 +950,7 @@
 	*dst = 0;
 }
 
-void KyraEngine_v2::bookPrintText(int dstPage, const uint8 *text, int x, int y, uint8 color) {
+void KyraEngine_v2::bookPrintText(int dstPage, const uint8 *str, int x, int y, uint8 color) {
 	int curPageBackUp = _screen->_curPage;
 	_screen->_curPage = dstPage;
 
@@ -959,7 +959,7 @@
 	_screen->_charWidth = -2;
 
 	_screen->hideMouse();
-	_screen->printText((const char*)text, x, y, color, 0);
+	_screen->printText((const char*)str, x, y, color, 0);
 	_screen->showMouse();
 
 	_screen->_charWidth = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list