aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-01-24 22:12:15 +0100
committerWillem Jan Palenstijn2013-01-24 22:12:15 +0100
commit498fe75dc5fbb6ec52f0d437b5c1301331023715 (patch)
treee17958799ad6c768a68a573fece3ef966a6e038a /engines
parent89cd5e74161b2a2e1350dc896f32248ba2a20260 (diff)
downloadscummvm-rg350-498fe75dc5fbb6ec52f0d437b5c1301331023715.tar.gz
scummvm-rg350-498fe75dc5fbb6ec52f0d437b5c1301331023715.tar.bz2
scummvm-rg350-498fe75dc5fbb6ec52f0d437b5c1301331023715.zip
SCI: Fix shadow warning
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/kstring.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index a6ef5be787..82206508e8 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -571,9 +571,9 @@ reg_t kMessage(EngineState *s, int argc, reg_t *argv) {
}
case K_MESSAGE_LASTMESSAGE: {
MessageTuple msg;
- int module;
+ int lastModule;
- s->_msgState->lastQuery(module, msg);
+ s->_msgState->lastQuery(lastModule, msg);
bool ok = false;
@@ -582,7 +582,7 @@ reg_t kMessage(EngineState *s, int argc, reg_t *argv) {
if (buffer) {
ok = true;
- WRITE_LE_UINT16(buffer, module);
+ WRITE_LE_UINT16(buffer, lastModule);
WRITE_LE_UINT16(buffer + 2, msg.noun);
WRITE_LE_UINT16(buffer + 4, msg.verb);
WRITE_LE_UINT16(buffer + 6, msg.cond);
@@ -593,7 +593,7 @@ reg_t kMessage(EngineState *s, int argc, reg_t *argv) {
if (buffer) {
ok = true;
- buffer[0] = make_reg(0, module);
+ buffer[0] = make_reg(0, lastModule);
buffer[1] = make_reg(0, msg.noun);
buffer[2] = make_reg(0, msg.verb);
buffer[3] = make_reg(0, msg.cond);