aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-06-01 11:30:37 +0200
committerStrangerke2014-06-01 11:50:44 +0200
commit7f19bbb21df67faf49642abf6df049e1768847ec (patch)
tree16c5add07117429778fa493000c678c1a81358c6 /engines
parenta6ead6bba80f817fc0799e8d8fc3c789443e41f6 (diff)
downloadscummvm-rg350-7f19bbb21df67faf49642abf6df049e1768847ec.tar.gz
scummvm-rg350-7f19bbb21df67faf49642abf6df049e1768847ec.tar.bz2
scummvm-rg350-7f19bbb21df67faf49642abf6df049e1768847ec.zip
CRUISE: Reduce the scope of a variable, remove a useless increment
Diffstat (limited to 'engines')
-rw-r--r--engines/cruise/dataLoader.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index 8532d3074e..d2426331b1 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -433,7 +433,6 @@ int loadSetEntry(const char *name, uint8 *ptr, int currentEntryIdx, int currentD
int resourceSize;
int fileIndex;
setHeaderEntry localBuffer;
- uint8 *ptr5;
Common::MemoryReadStream s4(ptr + offset + 6, 16);
@@ -472,12 +471,9 @@ int loadSetEntry(const char *name, uint8 *ptr, int currentEntryIdx, int currentD
filesDatabase[fileIndex].width += 2;
}
- ptr5 = ptr3 + localBuffer.offset + numIdx * 16;
-
+ uint8 *ptr5 = ptr3 + localBuffer.offset + numIdx * 16;
memcpy(filesDatabase[fileIndex].subData.ptr, ptr5, resourceSize);
- ptr5 += resourceSize;
-
switch (localBuffer.type) {
case 0: { // polygon
filesDatabase[fileIndex].subData.resourceType = OBJ_TYPE_POLY;