WINTERMUTE: Privatize/Protect variables that don't need to be public.

1 files changed, 43 insertions, 42 deletions

diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h
index 6575544db0..198e415cc4 100644
--- a/engines/wintermute/base/particles/part_emitter.h
+++ b/engines/wintermute/base/particles/part_emitter.h
@@ -43,88 +43,89 @@ public:
 	PartEmitter(BaseGame *inGame, BaseScriptHolder *Owner);

 	virtual ~PartEmitter(void);

 

+	int _fadeOutTime;

+

+	bool start();

+

+	bool update();

+	bool display() { return display(NULL); } // To avoid shadowing the inherited display-function.

+	bool display(BaseRegion *region);

+

+	bool sortParticlesByZ();

+	bool addSprite(const char *filename);

+	bool removeSprite(const char *filename);

+	bool setBorder(int x, int y, int width, int height);

+	bool setBorderThickness(int thicknessLeft, int thicknessRight, int thicknessTop, int thicknessBottom);

+

+	bool addForce(const char *name, PartForce::TForceType type, int posX, int posY, float angle, float strength);

+	bool removeForce(const char *name);

+

+	BaseArray<PartForce *, PartForce *> _forces;

+

+	// scripting interface

+	virtual ScValue *scGetProperty(const char *name);

+	virtual bool scSetProperty(const char *name, ScValue *value);

+	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);

+	virtual const char *scToString();

+

+

+private:

 	int _width;

 	int _height;

-

+	

 	int _angle1;

 	int _angle2;

-

+	

 	float _rotation1;

 	float _rotation2;

-

+	

 	float _angVelocity1;

 	float _angVelocity2;

-

+	

 	float _growthRate1;

 	float _growthRate2;

 	bool _exponentialGrowth;

-

+	

 	float _velocity1;

 	float _velocity2;

 	bool _velocityZBased;

-

+	

 	float _scale1;

 	float _scale2;

 	bool _scaleZBased;

-

+	

 	int _maxParticles;

-

+	

 	int _lifeTime1;

 	int _lifeTime2;

 	bool _lifeTimeZBased;

-

+	

 	int _genInterval;

 	int _genAmount;

-

+	

 	bool _running;

 	int _overheadTime;

-

+	

 	int _maxBatches;

 	int _batchesGenerated;

-

+	

 	Rect32 _border;

 	int _borderThicknessLeft;

 	int _borderThicknessRight;

 	int _borderThicknessTop;

 	int _borderThicknessBottom;

-

+	

 	int _fadeInTime;

-	int _fadeOutTime;

-

+	

 	int _alpha1;

 	int _alpha2;

 	bool _alphaTimeBased;

-

+	

 	bool _useRegion;

-

+	

 	char *_emitEvent;

 	BaseScriptHolder *_owner;

 

-	bool start();

-

-	bool update();

-	bool display() { return display(NULL); } // To avoid shadowing the inherited display-function.

-	bool display(BaseRegion *region);

-

-	bool sortParticlesByZ();

-	bool addSprite(const char *filename);

-	bool removeSprite(const char *filename);

-	bool setBorder(int x, int y, int width, int height);

-	bool setBorderThickness(int thicknessLeft, int thicknessRight, int thicknessTop, int thicknessBottom);

-

-	bool addForce(const char *name, PartForce::TForceType type, int posX, int posY, float angle, float strength);

-	bool removeForce(const char *name);

-

-	BaseArray<PartForce *, PartForce *> _forces;

-

-	// scripting interface

-	virtual ScValue *scGetProperty(const char *name);

-	virtual bool scSetProperty(const char *name, ScValue *value);

-	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);

-	virtual const char *scToString();

-

-

-private:

 	PartForce *addForceByName(const char *name);

 	int static compareZ(const void *obj1, const void *obj2);

 	bool initParticle(PartParticle *particle, uint32 currentTime, uint32 timerDelta);