From 5e325a5b285e03f9099fa6b81c2f6a85fabe4b06 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Thu, 26 Jul 2012 18:47:31 +0200 Subject: WINTERMUTE: Privatize most fields in AdActor --- engines/wintermute/ad/ad_actor.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/engines/wintermute/ad/ad_actor.h b/engines/wintermute/ad/ad_actor.h index 870b3e8418..5da014bcda 100644 --- a/engines/wintermute/ad/ad_actor.h +++ b/engines/wintermute/ad/ad_actor.h @@ -53,9 +53,17 @@ public: BasePoint *_targetPoint; virtual bool update(); virtual bool display(); + virtual void turnTo(TDirection dir); + AdActor(BaseGame *inGame/*=NULL*/); + virtual ~AdActor(); + bool loadFile(const char *filename); + bool loadBuffer(byte *buffer, bool complete = true); + + +private: TDirection _targetDir; TDirection _afterWalkDir; - virtual void turnTo(TDirection dir); + AdPath *_path; AdSpriteSet *_walkSprite; AdSpriteSet *_standSprite; @@ -64,11 +72,6 @@ public: BaseArray _talkSprites; BaseArray _talkSpritesEx; TDirection _dir; - AdActor(BaseGame *inGame/*=NULL*/); - virtual ~AdActor(); - bool loadFile(const char *filename); - bool loadBuffer(byte *buffer, bool complete = true); - // new anim system Common::String _talkAnimName; Common::String _idleAnimName; @@ -85,7 +88,6 @@ public: virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name); virtual const char *scToString(); -private: bool setDefaultAnimNames(); BaseSprite *getTalkStanceOld(const char *stance); bool mergeAnims(const char *animsFilename); -- cgit v1.2.3