diff options
author | Travis Howell | 2008-03-03 23:01:59 +0000 |
---|---|---|
committer | Travis Howell | 2008-03-03 23:01:59 +0000 |
commit | 61390db7f0ca39858036424108c6d3e8427613af (patch) | |
tree | ca01f2ca627fa95886a8e2e48249bba36a5de896 | |
parent | 6c41dbdef277e05d2a2014a8978f5d87d24ac704 (diff) | |
download | scummvm-rg350-61390db7f0ca39858036424108c6d3e8427613af.tar.gz scummvm-rg350-61390db7f0ca39858036424108c6d3e8427613af.tar.bz2 scummvm-rg350-61390db7f0ca39858036424108c6d3e8427613af.zip |
Fix compile.
svn-id: r31040
-rw-r--r-- | engines/kyra/screen.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/screen.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 762b6a20ce..d323eb21ca 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -761,8 +761,8 @@ void Screen::shuffleScreen(int sx, int sy, int w, int h, int srcPage, int dstPag } } -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 @@ void Screen::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum, 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; diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h index 4a45c7184c..152ba91a21 100644 --- a/engines/kyra/screen.h +++ b/engines/kyra/screen.h @@ -127,7 +127,7 @@ public: 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); |