From cbae5c79b702494dd30abb9504767029fba065ae Mon Sep 17 00:00:00 2001
From: segrax
Date: Tue, 17 Jan 2012 20:03:52 +1100
Subject: SCUMM: Change vars to ints, remove unused variable for now

---
 engines/scumm/actor.cpp   | 5 ++---
 engines/scumm/actor.h     | 5 ++---
 engines/scumm/costume.cpp | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 950f580f42..e703c55192 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -866,8 +866,7 @@ void Actor::setDirection(int direction) {
 		    _vm->_costumeLoader->costumeDecodeData(this, _standFrame, 0);
 
         // 0x2C17
-
-        ((ActorC64*) this)->_byte_FD0A = 0xFF;
+        ((ActorC64*) this)->_byte_FD0A = -1;
 
 		_needRedraw = true;
 		return;
@@ -2653,7 +2652,7 @@ void ActorC64::animateActor(int anim) {
 
     if( this->isInCurrentRoom() ) {
 
-       this->_costCommandNew = anim;
+      // this->_costCommandNew = anim;
        this->_byte_FD0A = this->_byte_FDE8;
 
        // 0x273A
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 1feb1afaa5..a2b36e51ca 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -348,14 +348,13 @@ enum ActorC64MiscFlags {
 
 class ActorC64 : public Actor_v2 {
 public:
-    byte _costCommandNew;
 	byte _costCommand, _costFrame;
 	byte _miscflags;
 	byte _speaking, _speakingPrev;
 
-    byte _byte_FDE8;
+    int8 _byte_FDE8;
     int8 _byte_FD0A;
-    byte _byte_FCE2[8];
+    int8 _byte_FCE2[8];
     
 
 public:
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 0c091c38bf..68eeeea674 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1464,7 +1464,7 @@ byte C64CostumeLoader::increaseAnims(Actor *a) {
                 // 0x2556
                 --a->_cost.curpos[limb];
 
-                A->_costCommandNew = 0xFF;
+                //A->_costCommandNew = 0xFF;
                 //A->_costCommand = 0xFF;
                 
                 // 0x2568
-- 
cgit v1.2.3