diff options
Diffstat (limited to 'engines/cruise/object.cpp')
| -rw-r--r-- | engines/cruise/object.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/engines/cruise/object.cpp b/engines/cruise/object.cpp index 3e61ff4d7d..845fc34d1f 100644 --- a/engines/cruise/object.cpp +++ b/engines/cruise/object.cpp @@ -116,14 +116,10 @@ int16 getMultipleObjectParam(int16 overlayIdx, int16 objectIdx, objectParamsQuer } void setObjectPosition(int16 ovlIdx, int16 objIdx, int16 param3, int16 param4) { - objDataStruct *ptr; - objectParams *ptr2; - - ptr = getObjectDataFromOverlay(ovlIdx, objIdx); - - if (!ptr) { + objDataStruct *ptr = getObjectDataFromOverlay(ovlIdx, objIdx); + if (!ptr) return; - } + //overlayTable[param1].ovlData switch (ptr->_class) { @@ -138,7 +134,7 @@ void setObjectPosition(int16 ovlIdx, int16 objIdx, int16 param3, int16 param4) { case UNIQUE: return; case VARIABLE: { - ptr2 = &overlayTable[ovlIdx].ovlData->arrayObjVar[ptr->_varTableIdx]; + objectParams *ptr2 = &overlayTable[ovlIdx].ovlData->arrayObjVar[ptr->_varTableIdx]; switch (param3) { case 0: { // x @@ -167,14 +163,14 @@ void setObjectPosition(int16 ovlIdx, int16 objIdx, int16 param3, int16 param4) { break; } default: { - ASSERT(0); + assert(0); } } break; } default: { - ASSERT(0); + assert(0); } } } |