aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins/anim.cpp
diff options
context:
space:
mode:
authorStrangerke2013-01-31 23:52:01 +0100
committerStrangerke2013-01-31 23:52:01 +0100
commit334968c5ffed9cfd24ab47860ac980f571eb5c8b (patch)
tree74689eb5f6f51da87aedc2b4bd050e0f87b9d319 /engines/hopkins/anim.cpp
parent7d743c9e77ee12049bfeb220557f236a9dd2f2d6 (diff)
downloadscummvm-rg350-334968c5ffed9cfd24ab47860ac980f571eb5c8b.tar.gz
scummvm-rg350-334968c5ffed9cfd24ab47860ac980f571eb5c8b.tar.bz2
scummvm-rg350-334968c5ffed9cfd24ab47860ac980f571eb5c8b.zip
HOPKINS: More refactoring in AnimationManager and ComputerManager
Diffstat (limited to 'engines/hopkins/anim.cpp')
-rw-r--r--engines/hopkins/anim.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index fea9eb38cb..52212c6b45 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -634,18 +634,11 @@ void AnimationManager::searchAnim(const byte *data, int animIndex, int bufSize)
int curSrcDataIndx = dataIdx + 25;
for (int i = 0; i <= 4999; i++) {
- int v22 = READ_LE_UINT16(data + curSrcDataIndx + 4);
- WRITE_LE_UINT16(dataP + curDestDataIndx, READ_LE_UINT16(data + curSrcDataIndx));
- WRITE_LE_UINT16(dataP + curDestDataIndx + 2, READ_LE_UINT16(data + curSrcDataIndx + 2));
- WRITE_LE_UINT16(dataP + curDestDataIndx + 4, v22);
- WRITE_LE_UINT16(dataP + curDestDataIndx + 6, READ_LE_UINT16(data + curSrcDataIndx + 6));
- dataP[curDestDataIndx + 8] = data[curSrcDataIndx + 8];
- dataP[curDestDataIndx + 9] = data[curSrcDataIndx + 9];
-
+ memcpy(dataP + curDestDataIndx, data + curSrcDataIndx, 10);
+ if (!READ_LE_UINT16(data + curSrcDataIndx + 4))
+ break;
curDestDataIndx += 10;
curSrcDataIndx += 10;
- if (!v22)
- break;
}
break;
}