[Scummvm-cvs-logs] scummvm master -> f9d2871eb4c1fa9e11e051dfd65d85bc892f8bc1

salty-horse ori at avtalion.name
Tue Jul 3 17:29:03 CEST 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f9d2871eb4 JANITORIAL: Remove extra semicolons


Commit: f9d2871eb4c1fa9e11e051dfd65d85bc892f8bc1
    https://github.com/scummvm/scummvm/commit/f9d2871eb4c1fa9e11e051dfd65d85bc892f8bc1
Author: Ori Avtalion (ori at avtalion.name)
Date: 2012-07-03T08:28:14-07:00

Commit Message:
JANITORIAL: Remove extra semicolons

Changed paths:
    engines/dreamweb/dreamweb.h
    engines/kyra/eobcommon.h
    engines/tsage/ringworld2/ringworld2_speakers.h



diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 48d44c0..1f6deb8 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -152,8 +152,8 @@ public:
 	uint8 modifyChar(uint8 c) const;
 	Common::String modifyFileName(const char *);
 
-	const Common::String& getDatafilePrefix() { return _datafilePrefix; };
-	const Common::String& getSpeechDirName() { return _speechDirName; };
+	const Common::String& getDatafilePrefix() { return _datafilePrefix; }
+	const Common::String& getSpeechDirName() { return _speechDirName; }
 
 private:
 	void keyPressed(uint16 ascii);
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 050fe2b..f60e755 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -263,7 +263,7 @@ protected:
 
 	// Main Menu, Intro, Finale
 	virtual int mainMenu() = 0;
-	virtual void seq_xdeath() {};
+	virtual void seq_xdeath() {}
 	virtual void seq_playFinale() = 0;
 	bool _playFinale;
 
@@ -921,8 +921,8 @@ protected:
 	void usePotion(int charIndex, int weaponSlot);
 	void useWand(int charIndex, int weaponSlot);
 
-	virtual void turnUndeadAuto() {};
-	virtual void turnUndeadAutoHit() {};
+	virtual void turnUndeadAuto() {}
+	virtual void turnUndeadAutoHit() {}
 
 	void castSpell(int spell, int weaponSlot);
 	void removeCharacterEffect(int spell, int charIndex, int showWarning);
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index e336564..fa2946d 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -504,14 +504,14 @@ public:
 
 class SpeakerSoldier300 : public SpeakerSoldier {
 public:
-	SpeakerSoldier300() : SpeakerSoldier(60) {};
+	SpeakerSoldier300() : SpeakerSoldier(60) {}
 	virtual Common::String getClassName() { return "SpeakerSoldier300"; }
 	virtual void proc15();
 };
 
 class SpeakerSoldier1625 : public SpeakerSoldier {
 public:
-	SpeakerSoldier1625() : SpeakerSoldier(5) {};
+	SpeakerSoldier1625() : SpeakerSoldier(5) {}
 	virtual Common::String getClassName() { return "SpeakerSoldier1625"; }
 };
 
@@ -585,7 +585,7 @@ public:
 
 class SpeakerWebbster3240 : public SpeakerWebbster {
 public:
-	SpeakerWebbster3240() : SpeakerWebbster(10) {};
+	SpeakerWebbster3240() : SpeakerWebbster(10) {}
 
 	virtual Common::String getClassName() { return "SpeakerWebbster3240"; }
 	virtual void proc15();
@@ -593,7 +593,7 @@ public:
 
 class SpeakerWebbster3375 : public SpeakerWebbster {
 public:
-	SpeakerWebbster3375() : SpeakerWebbster(60) {};
+	SpeakerWebbster3375() : SpeakerWebbster(60) {}
 
 	virtual Common::String getClassName() { return "SpeakerWebbster3375"; }
 	virtual void proc15();
@@ -601,7 +601,7 @@ public:
 
 class SpeakerWebbster3385 : public SpeakerWebbster {
 public:
-	SpeakerWebbster3385() : SpeakerWebbster(60) {};
+	SpeakerWebbster3385() : SpeakerWebbster(60) {}
 
 	virtual Common::String getClassName() { return "SpeakerWebbster3385"; }
 	virtual void proc15();
@@ -609,7 +609,7 @@ public:
 
 class SpeakerWebbster3395 : public SpeakerWebbster {
 public:
-	SpeakerWebbster3395() : SpeakerWebbster(60) {};
+	SpeakerWebbster3395() : SpeakerWebbster(60) {}
 
 	virtual Common::String getClassName() { return "SpeakerWebbster3395"; }
 	virtual void proc15();
@@ -617,7 +617,7 @@ public:
 
 class SpeakerWebbster3400 : public SpeakerWebbster {
 public:
-	SpeakerWebbster3400() : SpeakerWebbster(27) {};
+	SpeakerWebbster3400() : SpeakerWebbster(27) {}
 
 	virtual Common::String getClassName() { return "SpeakerWebbster3400"; }
 	virtual void proc15();






More information about the Scummvm-git-logs mailing list