diff options
| author | Strangerke | 2014-06-06 22:49:21 +0200 |
|---|---|---|
| committer | Strangerke | 2014-06-06 22:49:21 +0200 |
| commit | 8cb50b52e0e6614343419ca75803c8a18cf085df (patch) | |
| tree | d4aa9af4bebe7b4ee526fb65f03094550ec5ca66 /engines/cruise/object.cpp | |
| parent | 23abf274a7a2f3de00d1e203b3675785af3184d1 (diff) | |
| download | scummvm-rg350-8cb50b52e0e6614343419ca75803c8a18cf085df.tar.gz scummvm-rg350-8cb50b52e0e6614343419ca75803c8a18cf085df.tar.bz2 scummvm-rg350-8cb50b52e0e6614343419ca75803c8a18cf085df.zip | |
CRUISE: Reduce the scope of some more variables
Diffstat (limited to 'engines/cruise/object.cpp')
| -rw-r--r-- | engines/cruise/object.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/engines/cruise/object.cpp b/engines/cruise/object.cpp index 3e61ff4d7d..664627b9a4 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 |