WINTERMUTE: Get rid of the C-prefix for class-definitions.

1 files changed, 16 insertions, 16 deletions

diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h
index 8f3ce84eb4..6ddec287d6 100644
--- a/engines/wintermute/base/base_sprite.h
+++ b/engines/wintermute/base/base_sprite.h
@@ -34,13 +34,13 @@
 #include "engines/wintermute/base/base_script_holder.h"

 

 namespace WinterMute {

-class CBFrame;

-class CBSurface;

-class CBObject;

-class CBSprite: public CBScriptHolder {

+class BaseFrame;

+class BaseSurface;

+class BaseObject;

+class BaseSprite: public BaseScriptHolder {

 public:

 	bool killAllSounds();

-	CBSurface *getSurface();

+	BaseSurface *getSurface();

 	char *_editorBgFile;

 	int _editorBgOffsetX;

 	int _editorBgOffsetY;

@@ -50,38 +50,38 @@ public:
 	void cleanup();

 	void setDefaults();

 	bool _precise;

-	DECLARE_PERSISTENT(CBSprite, CBScriptHolder)

+	DECLARE_PERSISTENT(BaseSprite, BaseScriptHolder)

 

 	bool _editorAllFrames;

 	bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100);

 	int _moveY;

 	int _moveX;

-	bool display(int x, int y, CBObject *registerOwner = NULL, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL);

+	bool display(int x, int y, BaseObject *registerOwner = NULL, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL);

 	bool GetCurrentFrame(float zoomX = 100, float zoomY = 100);

 	bool _canBreak;

 	bool _editorMuted;

 	bool _continuous;

 	void reset();

-	CBObject *_owner;

+	BaseObject *_owner;

 	bool _changed;

 	bool _paused;

 	bool _finished;

 	bool loadBuffer(byte *buffer, bool compete = true, int lifeTime = -1, TSpriteCacheType cacheType = CACHE_ALL);

 	bool loadFile(const char *filename, int lifeTime = -1, TSpriteCacheType cacheType = CACHE_ALL);

 	uint32 _lastFrameTime;

-	bool draw(int x, int y, CBObject *Register = NULL, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF);

+	bool draw(int x, int y, BaseObject *Register = NULL, float zoomX = 100, float zoomY = 100, uint32 alpha = 0xFFFFFFFF);

 	bool _looping;

 	int _currentFrame;

 	bool addFrame(const char *filename, uint32 delay = 0, int hotspotX = 0, int hotspotY = 0, Rect32 *rect = NULL);

-	CBSprite(CBGame *inGame, CBObject *owner = NULL);

-	virtual ~CBSprite();

-	CBArray<CBFrame *, CBFrame *> _frames;

-	bool saveAsText(CBDynBuffer *buffer, int indent);

+	BaseSprite(BaseGame *inGame, BaseObject *owner = NULL);

+	virtual ~BaseSprite();

+	BaseArray<BaseFrame *, BaseFrame *> _frames;

+	bool saveAsText(BaseDynamicBuffer *buffer, int indent);

 

 	// scripting interface

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

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

-	virtual bool scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);

+	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();

 };