diff options
| author | Ori Avtalion | 2010-10-09 10:29:11 +0000 | 
|---|---|---|
| committer | Ori Avtalion | 2010-10-09 10:29:11 +0000 | 
| commit | 2ab013941a2d338d938e41df0f490ea9ae6475f8 (patch) | |
| tree | 27d68751255f49927764e689bb9c419ad3769e00 | |
| parent | 88416b870d36116a32e33381733599d231f16e88 (diff) | |
| download | scummvm-rg350-2ab013941a2d338d938e41df0f490ea9ae6475f8.tar.gz scummvm-rg350-2ab013941a2d338d938e41df0f490ea9ae6475f8.tar.bz2 scummvm-rg350-2ab013941a2d338d938e41df0f490ea9ae6475f8.zip | |
TOON: Semicolon cleanup
svn-id: r53096
| -rw-r--r-- | engines/toon/anim.h | 12 | ||||
| -rw-r--r-- | engines/toon/audio.h | 6 | ||||
| -rw-r--r-- | engines/toon/character.h | 2 | ||||
| -rw-r--r-- | engines/toon/hotspot.h | 4 | ||||
| -rw-r--r-- | engines/toon/resource.h | 2 | 
5 files changed, 13 insertions, 13 deletions
| diff --git a/engines/toon/anim.h b/engines/toon/anim.h index dbfd7eda54..2672365ee6 100644 --- a/engines/toon/anim.h +++ b/engines/toon/anim.h @@ -108,19 +108,19 @@ public:  	void setUseMask(bool useMask);  	void moveRelative(int32 dx, int32 dy, int32 dz);  	void getRect(int32 *x1, int32 *y1, int32 *x2, int32 *y2) const; -	int32 getX() const { return _x; }; -	int32 getY() const { return _y; }; -	int32 getZ() const { return _z; }; +	int32 getX() const { return _x; } +	int32 getY() const { return _y; } +	int32 getZ() const { return _z; }  	int32 getX2() const;  	int32 getY2() const;  	int32 getZ2() const; -	int32 getFrame() const { return _currentFrame; }; +	int32 getFrame() const { return _currentFrame; }  	void reset();  	void save(Common::WriteStream *stream);  	void load(Common::ReadStream *stream); -	void setId(int32 id) { _id = id; }; -	int32 getId() const { return _id; }; +	void setId(int32 id) { _id = id; } +	int32 getId() const { return _id; }  	void setX(int32 x, bool relative = false);  	void setY(int32 y, bool relative = false); diff --git a/engines/toon/audio.h b/engines/toon/audio.h index 7c62ea3e7e..ae46531817 100644 --- a/engines/toon/audio.h +++ b/engines/toon/audio.h @@ -57,13 +57,13 @@ protected:  	int32 readBuffer(int16 *buffer, const int numSamples);  	bool isStereo() const {  		return false; -	}; +	}  	int getRate() const {  		return 22100; -	}; +	}  	bool endOfData() const {  		return _stopped; -	}; +	}  	void handleFade(int32 numSamples);  	void stopNow(); diff --git a/engines/toon/character.h b/engines/toon/character.h index d87217d7a9..997a401403 100644 --- a/engines/toon/character.h +++ b/engines/toon/character.h @@ -94,7 +94,7 @@ public:  	virtual void stopWalk();  	virtual void stopSpecialAnim();  	virtual void updateIdle(); -	virtual int32 getRandomIdleAnim() { return 0; }; +	virtual int32 getRandomIdleAnim() { return 0; }  	int32 getFacingFromDirection(int32 dx, int32 dy);  	static const SpecialCharacterAnimation *getSpecialAnimation(int32 characterId, int32 animationId); diff --git a/engines/toon/hotspot.h b/engines/toon/hotspot.h index 9f119635bb..233bcebcb7 100644 --- a/engines/toon/hotspot.h +++ b/engines/toon/hotspot.h @@ -42,7 +42,7 @@ public:  	int16 getPriority() const { return READ_LE_INT16(_data + 7); }  	int16 getType() const { return READ_LE_INT16(_data + 8); }  	int16 getData(int32 id) const { return READ_LE_INT16(_data + id); } -	void setData(int32 id, int16 val) { WRITE_LE_UINT16(&_data[id], val); }; +	void setData(int32 id, int16 val) { WRITE_LE_UINT16(&_data[id], val); }  private:  	int16 _data[256]; @@ -57,7 +57,7 @@ public:  	int32 Find(int32 x, int32 y);  	int32 FindBasedOnCorner(int32 x, int32 y);  	HotspotData *Get(int32 id); -	int32 getCount() const { return _numItems; }; +	int32 getCount() const { return _numItems; }  	void load(Common::ReadStream *Stream);  	void save(Common::WriteStream *Stream); diff --git a/engines/toon/resource.h b/engines/toon/resource.h index c1892b31e6..f1d472cdd6 100644 --- a/engines/toon/resource.h +++ b/engines/toon/resource.h @@ -40,7 +40,7 @@ public:  	void open(Common::SeekableReadStream *rs, Common::String packName, bool preloadEntirePackage);  	uint8 *getFileData(Common::String fileName, uint32 *fileSize); -	Common::String getPackName() { return _packName; }; +	Common::String getPackName() { return _packName; }  	Common::SeekableReadStream *createReadStream(Common::String fileName);  	void close();  | 
