LASTEXPRESS: Fix GCC warnings

svn-id: r53588

39 files changed, 40 insertions, 42 deletions

diff --git a/engines/lastexpress/data/scene.h b/engines/lastexpress/data/scene.h
index ae2f3d2d28..c4a34e127b 100644
--- a/engines/lastexpress/data/scene.h
+++ b/engines/lastexpress/data/scene.h
@@ -169,7 +169,7 @@ public:
 	bool load(Common::SeekableReadStream *stream);
 	Scene *get(SceneIndex index);
 
-	uint32 count() const { return _scenes.size() - 1; };
+	uint32 count() const { return _scenes.size() - 1; }
 
 private:
 	Common::SeekableReadStream *_stream;
diff --git a/engines/lastexpress/data/sequence.h b/engines/lastexpress/data/sequence.h
index eadc2962f8..7de4b2dfa4 100644
--- a/engines/lastexpress/data/sequence.h
+++ b/engines/lastexpress/data/sequence.h
@@ -155,7 +155,7 @@ public:
 
 	bool load(Common::SeekableReadStream *stream, byte field30 = 15);
 
-	uint16 count() const { return (uint16)_frames.size(); };
+	uint16 count() const { return (uint16)_frames.size(); }
 	AnimFrame *getFrame(uint16 index = 0);
 	FrameInfo *getFrameInfo(uint16 index = 0);
 
diff --git a/engines/lastexpress/entities/abbot.h b/engines/lastexpress/entities/abbot.h
index 4637fbd817..ac4d260311 100644
--- a/engines/lastexpress/entities/abbot.h
+++ b/engines/lastexpress/entities/abbot.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Abbot : public Entity {
 public:
 	Abbot(LastExpressEngine *engine);
-	~Abbot() {};
+	~Abbot() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/alexei.h b/engines/lastexpress/entities/alexei.h
index dc1a136143..28e1466e91 100644
--- a/engines/lastexpress/entities/alexei.h
+++ b/engines/lastexpress/entities/alexei.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Alexei : public Entity {
 public:
 	Alexei(LastExpressEngine *engine);
-	~Alexei() {};
+	~Alexei() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/alouan.h b/engines/lastexpress/entities/alouan.h
index 282117fcea..d663b0b624 100644
--- a/engines/lastexpress/entities/alouan.h
+++ b/engines/lastexpress/entities/alouan.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Alouan : public Entity {
 public:
 	Alouan(LastExpressEngine *engine);
-	~Alouan() {};
+	~Alouan() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/anna.h b/engines/lastexpress/entities/anna.h
index 4712f4b262..6085bf1089 100644
--- a/engines/lastexpress/entities/anna.h
+++ b/engines/lastexpress/entities/anna.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Anna : public Entity {
 public:
 	Anna(LastExpressEngine *engine);
-	~Anna() {};
+	~Anna() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/august.h b/engines/lastexpress/entities/august.h
index e684fc0361..e7c0d62ed4 100644
--- a/engines/lastexpress/entities/august.h
+++ b/engines/lastexpress/entities/august.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class August : public Entity {
 public:
 	August(LastExpressEngine *engine);
-	~August() {};
+	~August() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/boutarel.h b/engines/lastexpress/entities/boutarel.h
index 22f8e62b62..aeac23b359 100644
--- a/engines/lastexpress/entities/boutarel.h
+++ b/engines/lastexpress/entities/boutarel.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Boutarel : public Entity {
 public:
 	Boutarel(LastExpressEngine *engine);
-	~Boutarel() {};
+	~Boutarel() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/chapters.h b/engines/lastexpress/entities/chapters.h
index 845fe8b727..6a31727c23 100644
--- a/engines/lastexpress/entities/chapters.h
+++ b/engines/lastexpress/entities/chapters.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Chapters : public Entity {
 public:
 	Chapters(LastExpressEngine *engine);
-	~Chapters() {};
+	~Chapters() {}
 
 	/**
 	 * Saves the game
diff --git a/engines/lastexpress/entities/cooks.h b/engines/lastexpress/entities/cooks.h
index 7f1a70fb8a..2904d2c66b 100644
--- a/engines/lastexpress/entities/cooks.h
+++ b/engines/lastexpress/entities/cooks.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Cooks : public Entity {
 public:
 	Cooks(LastExpressEngine *engine);
-	~Cooks() {};
+	~Cooks() {}
 
 	/**
 	 * Draws the entity
diff --git a/engines/lastexpress/entities/coudert.h b/engines/lastexpress/entities/coudert.h
index e86e519385..1c2d340718 100644
--- a/engines/lastexpress/entities/coudert.h
+++ b/engines/lastexpress/entities/coudert.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Coudert : public Entity {
 public:
 	Coudert(LastExpressEngine *engine);
-	~Coudert() {};
+	~Coudert() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/entity39.h b/engines/lastexpress/entities/entity39.h
index 652dbd139e..344cf5b494 100644
--- a/engines/lastexpress/entities/entity39.h
+++ b/engines/lastexpress/entities/entity39.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Entity39 : public Entity {
 public:
 	Entity39(LastExpressEngine *engine);
-	~Entity39() {};
+	~Entity39() {}
 
 	/**
 	 * Setup Chapter 1
diff --git a/engines/lastexpress/entities/francois.h b/engines/lastexpress/entities/francois.h
index 894a60bc5b..f14ddf0ffb 100644
--- a/engines/lastexpress/entities/francois.h
+++ b/engines/lastexpress/entities/francois.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Francois : public Entity {
 public:
 	Francois(LastExpressEngine *engine);
-	~Francois() {};
+	~Francois() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/gendarmes.h b/engines/lastexpress/entities/gendarmes.h
index b0aec28bfb..96946f7329 100644
--- a/engines/lastexpress/entities/gendarmes.h
+++ b/engines/lastexpress/entities/gendarmes.h
@@ -38,7 +38,7 @@ class LastExpressEngine;
 class Gendarmes : public Entity {
 public:
 	Gendarmes(LastExpressEngine *engine);
-	~Gendarmes() {};
+	~Gendarmes() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/hadija.h b/engines/lastexpress/entities/hadija.h
index 4792f97cad..2467440170 100644
--- a/engines/lastexpress/entities/hadija.h
+++ b/engines/lastexpress/entities/hadija.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Hadija : public Entity {
 public:
 	Hadija(LastExpressEngine *engine);
-	~Hadija() {};
+	~Hadija() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/ivo.h b/engines/lastexpress/entities/ivo.h
index 65bf9de165..f8a7cc7a80 100644
--- a/engines/lastexpress/entities/ivo.h
+++ b/engines/lastexpress/entities/ivo.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Ivo : public Entity {
 public:
 	Ivo(LastExpressEngine *engine);
-	~Ivo() {};
+	~Ivo() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/kahina.h b/engines/lastexpress/entities/kahina.h
index 1eba9c62d9..03f66160a0 100644
--- a/engines/lastexpress/entities/kahina.h
+++ b/engines/lastexpress/entities/kahina.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Kahina : public Entity {
 public:
 	Kahina(LastExpressEngine *engine);
-	~Kahina() {};
+	~Kahina() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/kronos.h b/engines/lastexpress/entities/kronos.h
index 5d8efbd4c2..f73c245347 100644
--- a/engines/lastexpress/entities/kronos.h
+++ b/engines/lastexpress/entities/kronos.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Kronos : public Entity {
 public:
 	Kronos(LastExpressEngine *engine);
-	~Kronos() {};
+	~Kronos() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/mahmud.h b/engines/lastexpress/entities/mahmud.h
index 0b65a8bcff..a0d339cb60 100644
--- a/engines/lastexpress/entities/mahmud.h
+++ b/engines/lastexpress/entities/mahmud.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Mahmud : public Entity {
 public:
 	Mahmud(LastExpressEngine *engine);
-	~Mahmud() {};
+	~Mahmud() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/max.h b/engines/lastexpress/entities/max.h
index 404ee42f5f..d9e570df3e 100644
--- a/engines/lastexpress/entities/max.h
+++ b/engines/lastexpress/entities/max.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Max : public Entity {
 public:
 	Max(LastExpressEngine *engine);
-	~Max() {};
+	~Max() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/mertens.h b/engines/lastexpress/entities/mertens.h
index c6b800f1ff..f720dce0e0 100644
--- a/engines/lastexpress/entities/mertens.h
+++ b/engines/lastexpress/entities/mertens.h
@@ -45,7 +45,7 @@ private:
 
 public:
 	Mertens(LastExpressEngine *engine);
-	~Mertens() {};
+	~Mertens() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/milos.h b/engines/lastexpress/entities/milos.h
index 4bbafaaaa7..a6977e58d6 100644
--- a/engines/lastexpress/entities/milos.h
+++ b/engines/lastexpress/entities/milos.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Milos : public Entity {
 public:
 	Milos(LastExpressEngine *engine);
-	~Milos() {};
+	~Milos() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/mmeboutarel.h b/engines/lastexpress/entities/mmeboutarel.h
index 548a0635cb..0d18a990fa 100644
--- a/engines/lastexpress/entities/mmeboutarel.h
+++ b/engines/lastexpress/entities/mmeboutarel.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class MmeBoutarel : public Entity {
 public:
 	MmeBoutarel(LastExpressEngine *engine);
-	~MmeBoutarel() {};
+	~MmeBoutarel() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/pascale.h b/engines/lastexpress/entities/pascale.h
index d899037c0b..e19c175800 100644
--- a/engines/lastexpress/entities/pascale.h
+++ b/engines/lastexpress/entities/pascale.h
@@ -36,8 +36,7 @@ class LastExpressEngine;
 class Pascale : public Entity {
 public:
 	Pascale(LastExpressEngine *engine);
-	~Pascale() {};
-
+	~Pascale() {}
 
 	/**
 	 * Draws the entity
diff --git a/engines/lastexpress/entities/rebecca.h b/engines/lastexpress/entities/rebecca.h
index bf836b1fa3..399bad5020 100644
--- a/engines/lastexpress/entities/rebecca.h
+++ b/engines/lastexpress/entities/rebecca.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Rebecca : public Entity {
 public:
 	Rebecca(LastExpressEngine *engine);
-	~Rebecca() {};
+	~Rebecca() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/salko.h b/engines/lastexpress/entities/salko.h
index 49059c4b40..3555bfc329 100644
--- a/engines/lastexpress/entities/salko.h
+++ b/engines/lastexpress/entities/salko.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Salko : public Entity {
 public:
 	Salko(LastExpressEngine *engine);
-	~Salko() {};
+	~Salko() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/servers0.h b/engines/lastexpress/entities/servers0.h
index 61a060f0c2..d32d0be7b3 100644
--- a/engines/lastexpress/entities/servers0.h
+++ b/engines/lastexpress/entities/servers0.h
@@ -36,8 +36,7 @@ class LastExpressEngine;
 class Servers0 : public Entity {
 public:
 	Servers0(LastExpressEngine *engine);
-	~Servers0() {};
-
+	~Servers0() {}
 
 	/**
 	 * Call a savepoint (or draw sequence in default case)
diff --git a/engines/lastexpress/entities/servers1.h b/engines/lastexpress/entities/servers1.h
index f05d994d21..deceac6176 100644
--- a/engines/lastexpress/entities/servers1.h
+++ b/engines/lastexpress/entities/servers1.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Servers1 : public Entity {
 public:
 	Servers1(LastExpressEngine *engine);
-	~Servers1() {};
+	~Servers1() {}
 
 	/**
 	 * Updates parameter 2 using time value
diff --git a/engines/lastexpress/entities/sophie.h b/engines/lastexpress/entities/sophie.h
index 51d3d084b6..24a70188da 100644
--- a/engines/lastexpress/entities/sophie.h
+++ b/engines/lastexpress/entities/sophie.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Sophie : public Entity {
 public:
 	Sophie(LastExpressEngine *engine);
-	~Sophie() {};
+	~Sophie() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/tables.h b/engines/lastexpress/entities/tables.h
index e7f51da66a..e5fe28128b 100644
--- a/engines/lastexpress/entities/tables.h
+++ b/engines/lastexpress/entities/tables.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Tables : public Entity {
 public:
 	Tables(LastExpressEngine *engine, EntityIndex id);
-	~Tables() {};
+	~Tables() {}
 
 	/**
 	 * Setup Chapter 1
diff --git a/engines/lastexpress/entities/tatiana.h b/engines/lastexpress/entities/tatiana.h
index 8dc5de9b35..5cba7e8268 100644
--- a/engines/lastexpress/entities/tatiana.h
+++ b/engines/lastexpress/entities/tatiana.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Tatiana : public Entity {
 public:
 	Tatiana(LastExpressEngine *engine);
-	~Tatiana() {};
+	~Tatiana() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/train.h b/engines/lastexpress/entities/train.h
index 4c6e2989ff..95cb0f28bd 100644
--- a/engines/lastexpress/entities/train.h
+++ b/engines/lastexpress/entities/train.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Train : public Entity {
 public:
 	Train(LastExpressEngine *engine);
-	~Train() {};
+	~Train() {}
 
 	/**
 	 * Saves the game
diff --git a/engines/lastexpress/entities/vassili.h b/engines/lastexpress/entities/vassili.h
index 113bc1d958..dc3631dd03 100644
--- a/engines/lastexpress/entities/vassili.h
+++ b/engines/lastexpress/entities/vassili.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Vassili : public Entity {
 public:
 	Vassili(LastExpressEngine *engine);
-	~Vassili() {};
+	~Vassili() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/verges.h b/engines/lastexpress/entities/verges.h
index 3162d4e0ea..83c44fcc7c 100644
--- a/engines/lastexpress/entities/verges.h
+++ b/engines/lastexpress/entities/verges.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Verges : public Entity {
 public:
 	Verges(LastExpressEngine *engine);
-	~Verges() {};
+	~Verges() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/vesna.h b/engines/lastexpress/entities/vesna.h
index 4a0a8550b2..74a1c0b6e9 100644
--- a/engines/lastexpress/entities/vesna.h
+++ b/engines/lastexpress/entities/vesna.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Vesna : public Entity {
 public:
 	Vesna(LastExpressEngine *engine);
-	~Vesna() {};
+	~Vesna() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/entities/yasmin.h b/engines/lastexpress/entities/yasmin.h
index 125b11d566..50a19c535f 100644
--- a/engines/lastexpress/entities/yasmin.h
+++ b/engines/lastexpress/entities/yasmin.h
@@ -36,7 +36,7 @@ class LastExpressEngine;
 class Yasmin : public Entity {
 public:
 	Yasmin(LastExpressEngine *engine);
-	~Yasmin() {};
+	~Yasmin() {}
 
 	/**
 	 * Resets the entity
diff --git a/engines/lastexpress/eventhandler.h b/engines/lastexpress/eventhandler.h
index 8536bba7e7..106878fbbd 100644
--- a/engines/lastexpress/eventhandler.h
+++ b/engines/lastexpress/eventhandler.h
@@ -44,8 +44,8 @@ public:
 	// Function pointer for event handler
 	typedef Common::Functor1<const Common::Event&, void> EventFunction;
 
-	virtual void eventMouse(const Common::Event &ev) {};    // Event type 1
-	virtual void eventTick(const Common::Event &ev) {};     // Event type 3
+	virtual void eventMouse(const Common::Event &ev) {}    // Event type 1
+	virtual void eventTick(const Common::Event &ev) {}     // Event type 3
 };
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp
index ef21fee0ae..0ef5b1b740 100644
--- a/engines/lastexpress/game/entities.cpp
+++ b/engines/lastexpress/game/entities.cpp
@@ -221,7 +221,7 @@ int Entities::getPosition(CarIndex car, Position position) {
 	if (car < 0 || car > 10)
 		error("Entities::getPosition: trying to access an invalid car (was: %d, valid:0-9)", car);
 
-	if (position < 0 || position > 100)
+	if (position > 100)
 		error("Entities::getPosition: trying to access an invalid position (was: %d, valid:0-100)", position);
 
 	return _positions[index];
diff --git a/engines/lastexpress/game/sound.h b/engines/lastexpress/game/sound.h
index 3cb17db80c..3f3941f207 100644
--- a/engines/lastexpress/game/sound.h
+++ b/engines/lastexpress/game/sound.h
@@ -273,7 +273,7 @@ private:
 			subtitle = NULL;
 
 			isStreamed = false;
-		};
+		}
 	};
 
 	// Engine