[Scummvm-cvs-logs] SF.net SVN: scummvm: [31040] scummvm/trunk/engines/kyra
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Tue Mar 4 00:02:00 CET 2008
Revision: 31040
http://scummvm.svn.sourceforge.net/scummvm/?rev=31040&view=rev
Author: Kirben
Date: 2008-03-03 15:01:59 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
Fix compile.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/kyra/screen.h
Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp 2008-03-03 22:51:16 UTC (rev 31039)
+++ scummvm/trunk/engines/kyra/screen.cpp 2008-03-03 23:01:59 UTC (rev 31040)
@@ -761,8 +761,8 @@
}
}
-void Screen::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum, bool xor) {
- debugC(9, kDebugLevelScreen, "Screen::fillRect(%d, %d, %d, %d, %d, %d, %d)", x1, y1, x2, y2, color, pageNum, xor);
+void Screen::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum, bool xored) {
+ debugC(9, kDebugLevelScreen, "Screen::fillRect(%d, %d, %d, %d, %d, %d, %d)", x1, y1, x2, y2, color, pageNum, xored);
assert(x2 < SCREEN_W && y2 < SCREEN_H);
if (pageNum == -1)
pageNum = _curPage;
@@ -774,7 +774,7 @@
clearOverlayRect(pageNum, x1, y1, x2-x1+1, y2-y1+1);
- if (xor) {
+ if (xored) {
for (; y1 <= y2; ++y1) {
for (int x = x1; x <= x2; ++x)
dst[x] ^= color;
Modified: scummvm/trunk/engines/kyra/screen.h
===================================================================
--- scummvm/trunk/engines/kyra/screen.h 2008-03-03 22:51:16 UTC (rev 31039)
+++ scummvm/trunk/engines/kyra/screen.h 2008-03-03 23:01:59 UTC (rev 31040)
@@ -127,7 +127,7 @@
void copyBlockToPage(int pageNum, int x, int y, int w, int h, const uint8 *src);
void shuffleScreen(int sx, int sy, int w, int h, int srcPage, int dstPage, int ticks, bool transparent);
- void fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum = -1, bool xor = false);
+ void fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum = -1, bool xored = false);
void clearPage(int pageNum);
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