aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.h
diff options
context:
space:
mode:
authorMax Horn2003-03-07 02:43:21 +0000
committerMax Horn2003-03-07 02:43:21 +0000
commit5944944f78f01757d1dc70ef189d569cceabd7bb (patch)
treebd30e9c4b6e0d2621e7b329717e3a7dd55f2ae4a /scumm/actor.h
parent5537fc3df3b78f68e0b5923f9d4628350f9771c2 (diff)
downloadscummvm-rg350-5944944f78f01757d1dc70ef189d569cceabd7bb.tar.gz
scummvm-rg350-5944944f78f01757d1dc70ef189d569cceabd7bb.tar.bz2
scummvm-rg350-5944944f78f01757d1dc70ef189d569cceabd7bb.zip
properly init Actor objects instead of one big evil hackish memset...
svn-id: r6733
Diffstat (limited to 'scumm/actor.h')
-rw-r--r--scumm/actor.h18
1 files changed, 16 insertions, 2 deletions
diff --git a/scumm/actor.h b/scumm/actor.h
index 2acda69dce..5691837518 100644
--- a/scumm/actor.h
+++ b/scumm/actor.h
@@ -109,8 +109,22 @@ public:
// Constructor, sets all data to 0
Actor() {
- memset(this, 0, sizeof(Actor));
- } void initActorClass(Scumm *scumm) {
+ top = bottom = 0;
+ number = 0;
+ needRedraw = needBgReset = costumeNeedsInit = visible = false;
+ flip = false;
+ frame = 0;
+ walkbox = 0;
+ animProgress = 0;
+ memset(animVariable, 0, sizeof(animVariable));
+ memset(palette, 0, sizeof(palette));
+
+ walk_script = 0;
+
+ initActor(1);
+ }
+
+ void initActorClass(Scumm *scumm) {
_vm = scumm;
}
//protected: