aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Augereau2011-12-04 16:53:43 +0100
committerBertrand Augereau2011-12-04 16:54:05 +0100
commit22a7ab4424f4731a998b17725c89621070231380 (patch)
treea0f1e16e76cc4ad78181e7e0f6f3ecd1ca76daf2
parent277a1c950b2927b77d0987cc85d4737787995c6e (diff)
downloadscummvm-rg350-22a7ab4424f4731a998b17725c89621070231380.tar.gz
scummvm-rg350-22a7ab4424f4731a998b17725c89621070231380.tar.bz2
scummvm-rg350-22a7ab4424f4731a998b17725c89621070231380.zip
DREAMWEB: Minor warning fix (shadowing)
-rw-r--r--engines/dreamweb/object.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index f617bfb21d..4877937060 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -73,8 +73,7 @@ void DreamGenContext::obToInv() {
}
void DreamGenContext::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
- Frame *icons1 = (Frame *)getSegment(data.word(kIcons1)).ptr(0, 0);
- showFrame(icons1, x - 2, y - 1, 10, 0);
+ showFrame(icons1(), x - 2, y - 1, 10, 0);
if (index == 0xff)
return;
@@ -85,7 +84,7 @@ void DreamGenContext::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
const DynObject *object = (const DynObject *)getAnyAdDir(index, flag);
bool worn = isItWorn(object);
if (worn)
- showFrame(icons1, x - 3, y - 2, 7, 0);
+ showFrame(icons1(), x - 3, y - 2, 7, 0);
}
void DreamGenContext::obPicture() {