aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Crossfield2012-01-28 09:38:54 +1100
committerTobias Gunkel2012-02-11 08:29:41 +0100
commitc6688cf0d516543a051841116d5175ca8bcee39f (patch)
treec7c7e1a15516c00178affb21e9ed029a5d2a61dc
parent9ba01d020b8a48bed57977a430c532a3237dedd0 (diff)
downloadscummvm-rg350-c6688cf0d516543a051841116d5175ca8bcee39f.tar.gz
scummvm-rg350-c6688cf0d516543a051841116d5175ca8bcee39f.tar.bz2
scummvm-rg350-c6688cf0d516543a051841116d5175ca8bcee39f.zip
SCUMM: Remove unused variable, remove old comment
-rw-r--r--engines/scumm/costume.cpp5
-rw-r--r--engines/scumm/costume.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 3bb62c2de5..e3a2203adc 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1280,8 +1280,6 @@ void C64CostumeLoader::loadCostume(int id) {
_frameOffsets = _baseptr + READ_LE_UINT16(ptr + 5);
_dataOffsets = ptr;
_animCmds = _baseptr + READ_LE_UINT16(ptr + 7);
-
- _maxHeight = 0;
}
void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
@@ -1314,7 +1312,8 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
continue;
// Store the limb frame number (clear the flipped status)
- a->_cost.frame[limb] = (limbFrameNumber & 0x7f); // limb animation-frames ptr
+ a->_cost.frame[limb] = (limbFrameNumber & 0x7f);
+
if( A->_limb_flipped[limb] != true )
a->_cost.start[limb] = 0xFFFF;
diff --git a/engines/scumm/costume.h b/engines/scumm/costume.h
index 38e21d586f..4600cc5670 100644
--- a/engines/scumm/costume.h
+++ b/engines/scumm/costume.h
@@ -76,8 +76,6 @@ public:
byte getFrame( ActorC64 *A );
- int _maxHeight;
-
protected:
};