[Scummvm-cvs-logs] SF.net SVN: scummvm:[53096] scummvm/trunk/engines/toon

salty-horse at users.sourceforge.net salty-horse at users.sourceforge.net
Sat Oct 9 12:29:11 CEST 2010


Revision: 53096
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53096&view=rev
Author:   salty-horse
Date:     2010-10-09 10:29:11 +0000 (Sat, 09 Oct 2010)

Log Message:
-----------
TOON: Semicolon cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/toon/anim.h
    scummvm/trunk/engines/toon/audio.h
    scummvm/trunk/engines/toon/character.h
    scummvm/trunk/engines/toon/hotspot.h
    scummvm/trunk/engines/toon/resource.h

Modified: scummvm/trunk/engines/toon/anim.h
===================================================================
--- scummvm/trunk/engines/toon/anim.h	2010-10-09 01:36:38 UTC (rev 53095)
+++ scummvm/trunk/engines/toon/anim.h	2010-10-09 10:29:11 UTC (rev 53096)
@@ -108,19 +108,19 @@
 	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);

Modified: scummvm/trunk/engines/toon/audio.h
===================================================================
--- scummvm/trunk/engines/toon/audio.h	2010-10-09 01:36:38 UTC (rev 53095)
+++ scummvm/trunk/engines/toon/audio.h	2010-10-09 10:29:11 UTC (rev 53096)
@@ -57,13 +57,13 @@
 	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();
 

Modified: scummvm/trunk/engines/toon/character.h
===================================================================
--- scummvm/trunk/engines/toon/character.h	2010-10-09 01:36:38 UTC (rev 53095)
+++ scummvm/trunk/engines/toon/character.h	2010-10-09 10:29:11 UTC (rev 53096)
@@ -94,7 +94,7 @@
 	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);

Modified: scummvm/trunk/engines/toon/hotspot.h
===================================================================
--- scummvm/trunk/engines/toon/hotspot.h	2010-10-09 01:36:38 UTC (rev 53095)
+++ scummvm/trunk/engines/toon/hotspot.h	2010-10-09 10:29:11 UTC (rev 53096)
@@ -42,7 +42,7 @@
 	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 @@
 	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);

Modified: scummvm/trunk/engines/toon/resource.h
===================================================================
--- scummvm/trunk/engines/toon/resource.h	2010-10-09 01:36:38 UTC (rev 53095)
+++ scummvm/trunk/engines/toon/resource.h	2010-10-09 10:29:11 UTC (rev 53096)
@@ -40,7 +40,7 @@
 
 	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(); 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list