diff options
| author | Max Horn | 2007-04-27 19:59:40 +0000 |
|---|---|---|
| committer | Max Horn | 2007-04-27 19:59:40 +0000 |
| commit | bead956c8de3eb8548de9b799c12b46b424cc14c (patch) | |
| tree | b9421966ac2c018909be1172b85fa5d20b0734fe /engines/cruise/object.cpp | |
| parent | b4e196e4fd2f6efef5e109cf0e8449eb8ae50130 (diff) | |
| download | scummvm-rg350-bead956c8de3eb8548de9b799c12b46b424cc14c.tar.gz scummvm-rg350-bead956c8de3eb8548de9b799c12b46b424cc14c.tar.bz2 scummvm-rg350-bead956c8de3eb8548de9b799c12b46b424cc14c.zip | |
Fixing more warnings
svn-id: r26618
Diffstat (limited to 'engines/cruise/object.cpp')
| -rw-r--r-- | engines/cruise/object.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/cruise/object.cpp b/engines/cruise/object.cpp index a584aead37..6770bae57d 100644 --- a/engines/cruise/object.cpp +++ b/engines/cruise/object.cpp @@ -282,7 +282,7 @@ void setObjectPosition(int16 param1,int16 objIdx,int16 param3,int16 param4) void Op_7Sub1(int16 param1, int16 param2, objectStruct* objPtr) { int16 var; - objectStruct* var8; + objectStruct* var8_; objectStruct* var40; objectStruct* var3E; objectStruct* currentObjPtrPrevious; @@ -297,7 +297,7 @@ void Op_7Sub1(int16 param1, int16 param2, objectStruct* objPtr) match = NULL; var40 = NULL; var3E = NULL; - var8 = objPtr; + var8_ = objPtr; while(currentObjPtr2) { @@ -351,7 +351,7 @@ void Op_7Sub1(int16 param1, int16 param2, objectStruct* objPtr) if(var>var2) { - var8 = currentObjPtr2; + var8_ = currentObjPtr2; } currentObjPtrPrevious=currentObjPtrPrevious->next; @@ -364,14 +364,14 @@ void Op_7Sub1(int16 param1, int16 param2, objectStruct* objPtr) { objectStruct* temp; - temp = var8->next; + temp = var8_->next; - var8->next = var40; + var8_->next = var40; match->next = temp; - if(objPtr!=var8) + if(objPtr!=var8_) { - var40->prev = var8; + var40->prev = var8_; } if(!temp) |