aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/gui_v2.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2008-03-09 12:25:48 +0000
committerTorbjörn Andersson2008-03-09 12:25:48 +0000
commit95c5a48853f8437606008c6705e400699dc3ee43 (patch)
tree427c8ed5d04dae1e603781b848877d0292a05658 /engines/kyra/gui_v2.cpp
parent24b04c6f5143e87f2502c34a0a1b8ad89f5535fb (diff)
downloadscummvm-rg350-95c5a48853f8437606008c6705e400699dc3ee43.tar.gz
scummvm-rg350-95c5a48853f8437606008c6705e400699dc3ee43.tar.bz2
scummvm-rg350-95c5a48853f8437606008c6705e400699dc3ee43.zip
Fixed warning.
svn-id: r31086
Diffstat (limited to 'engines/kyra/gui_v2.cpp')
-rw-r--r--engines/kyra/gui_v2.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index 2bf2c9c7f3..d1a3b6c954 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -935,8 +935,8 @@ void KyraEngine_v2::bookLoop() {
}
}
-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 @@ void KyraEngine_v2::bookDecodeText(uint8 *text) {
*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 @@ void KyraEngine_v2::bookPrintText(int dstPage, const uint8 *text, int x, int y,
_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;