Merge pull request #137 from fingolfin/various-cleanup

Various cleanup

5 files changed, 12 insertions, 3 deletions

diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 6bb3beec78..e9923aba2e 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -809,8 +809,6 @@ public:
 	virtual void replayImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
 		int16 p4, int16 p5, int16 p6, int16 p7) = 0;
 	virtual void releaseImageStack() = 0;
-	virtual	int saveGame(const Common::String &fileName, const Common::String &saveName) = 0;
-	virtual int loadGame(const Common::String &fileName, bool checkId = true) = 0;
 
 	int _soundemu;
 
diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 41d9cc3ac9..7e04328a67 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -1702,6 +1702,9 @@ void cmdSetItemView(AgiGame *state, uint8 *p) {
 
 void cmdCallV1(AgiGame *state, uint8 *p) {
 	state->_vm->agiLoadResource(rLOGIC, p0);
+	// FIXME: The following instruction looks incomplete.
+	// Maybe something is meant to be assigned to, or read from,
+	// the logic_list entry?
 	state->logic_list[++state->max_logics];
 	_v[13] = 1;
 }
diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h
index 1e504fbdea..cb6d4e3168 100644
--- a/engines/hugo/sound.h
+++ b/engines/hugo/sound.h
@@ -43,6 +43,12 @@ public:
 	void pause(bool p);
 	void play(uint8 *stream, uint16 size);
 
+	// The following line prevents compiler warnings about hiding the pause()
+	// method from the parent class.
+	// FIXME: Maybe the pause(bool p) method should be removed and the
+	// pause/resume methods of the parent class be used instead?
+	virtual void pause() { Audio::MidiPlayer::pause(); }
+
 	uint32 getBaseTempo();
 
 	// Overload Audio::MidiPlayer method
diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index d0d0e0ee40..f5a3938f2b 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -65,6 +65,9 @@ public:
 
 	void add(EventHandler *obj);
 	void remove(EventHandler *obj);
+	// The following line prevents compiler warnings about hiding the remove()
+	// method from the parent class.
+	virtual void remove() { EventHandler::remove(); }
 };
 
 class Timer: public EventHandler {
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index cbd3d9f77c..060ffee121 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -421,7 +421,6 @@ public:
 	virtual void destroy() {}
 	virtual bool startAction(CursorType action, Event &event);
 	virtual void doAction(int action);
-	virtual bool performAction(CursorType action, Event &event) { return startAction(action, event); }
 
 	bool contains(const Common::Point &pt);
 	void setBounds(const Rect &newBounds) { _bounds = newBounds; }