aboutsummaryrefslogtreecommitdiff
path: root/script_v1.cpp
diff options
context:
space:
mode:
authorMax Horn2002-05-14 20:07:08 +0000
committerMax Horn2002-05-14 20:07:08 +0000
commit1d3e00185c7e68eca199767d85c71238c6802709 (patch)
tree4b142dc0a78ba904814dab5ca623f683b4487a11 /script_v1.cpp
parent3d69ee488a262e991947beafff40a17248c169f3 (diff)
downloadscummvm-rg350-1d3e00185c7e68eca199767d85c71238c6802709.tar.gz
scummvm-rg350-1d3e00185c7e68eca199767d85c71238c6802709.tar.bz2
scummvm-rg350-1d3e00185c7e68eca199767d85c71238c6802709.zip
fixed var shadowing warning
svn-id: r4325
Diffstat (limited to 'script_v1.cpp')
-rw-r--r--script_v1.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/script_v1.cpp b/script_v1.cpp
index db393f34fe..89ea6fad4e 100644
--- a/script_v1.cpp
+++ b/script_v1.cpp
@@ -1319,23 +1319,19 @@ void Scumm::o5_getActorX()
void Scumm::o5_getActorY()
{
-
- int actor;
+ int a;
getResultPos();
if(_gameId == GID_INDY3_256)
-
- actor = getVarOrDirectByte(0x80);
-
+ a = getVarOrDirectByte(0x80);
else
+ a = getVarOrDirectWord(0x80);
- actor = getVarOrDirectWord(0x80);
- setResult(getObjY(actor));
+ setResult(getObjY(a));
}
void Scumm::o5_getAnimCounter()
{
-
Actor *a;
getResultPos();
@@ -1343,9 +1339,7 @@ void Scumm::o5_getAnimCounter()
if(a) // FIXME
setResult(a->cost.animCounter1);
-
else
-
setResult(0);
}