aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/actor.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm/actor.h')
-rw-r--r--engines/scumm/actor.h26
1 files changed, 21 insertions, 5 deletions
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 632a819467..7576b9aa95 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -127,9 +127,6 @@ public:
uint16 _sound[32];
CostumeData _cost;
- /* C64 maniac specific */
- byte _miscflags;
-
/* HE specific */
bool _heNoTalkAnimation;
bool _heSkipLimbs;
@@ -179,13 +176,14 @@ protected:
public:
- Actor();
+ Actor(int id);
+ virtual ~Actor() {}
//protected:
void hideActor();
void showActor();
- void initActor(int mode);
+ virtual void initActor(int mode);
void putActor() {
putActor(_pos.x, _pos.y, _room);
@@ -320,6 +318,24 @@ protected:
void findPathTowardsOld(byte box, byte box2, byte box3, Common::Point &p2, Common::Point &p3);
};
+class ActorC64 : public Actor {
+public:
+ // FIXME: This flag is never saved, which might lead to broken save states.
+ byte _miscflags;
+
+public:
+ ActorC64(int id) : Actor(id) {}
+ virtual void initActor(int mode) {
+ if (mode == -1) {
+ _miscflags = 0;
+ }
+ }
+
+protected:
+
+};
+
+
} // End of namespace Scumm
#endif