1 files changed, 3 insertions, 72 deletions

diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 71130e5b0b..b86e2f63fe 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -33,7 +33,6 @@
 #include "tsage/graphics.h"
 #include "tsage/resources.h"
 #include "tsage/saveload.h"
-#include "tsage/sound.h"
 
 namespace tSage {
 
@@ -229,12 +228,12 @@ protected:
 	int regionIndexOf(int xp, int yp) { return regionIndexOf(Common::Point(xp, yp)); }
 	int findClosestRegion(Common::Point &pt, const Common::List<int> &indexList);
 	int checkMover(Common::Point &srcPos, const Common::Point &destPos);
-	void checkMovement2(const Common::Point &pt1, const Common::Point &pt2, int numSteps, Common::Point &ptOut);
-	int proc1(int *routeList, int srcRegion, int destRegion, int &v);
+	void doStepsOfNpcMovement(const Common::Point &pt1, const Common::Point &pt2, int numSteps, Common::Point &ptOut);
+	int calculateRestOfRoute(int *routeList, int srcRegion, int destRegion, bool &foundRoute);
 
 	static Common::Point *findLinePoint(RouteEnds *routeEnds, Common::Point *objPos, int length, Common::Point *outPos);
 	static int findDistance(const Common::Point &pt1, const Common::Point &pt2);
-	static bool sub_F8E5(const Common::Point &pt1, const Common::Point &pt2, const Common::Point &pt3,
+	static bool sub_F8E5_calculatePoint(const Common::Point &pt1, const Common::Point &pt2, const Common::Point &pt3,
 		const Common::Point &pt4, Common::Point *ptOut = NULL);
 public:
 	Common::Point _finalDest;
@@ -719,74 +718,6 @@ public:
 
 /*--------------------------------------------------------------------------*/
 
-class GameSoundHandler {
-public:
-	void proc1() {
-		warning("TODO: GameSoundHandler::proc1");
-	}
-	void proc5(int v) {
-		warning("TODO: GameSoundHandler::proc5");
-	}
-	void proc11(int v1, int v2, int v3, int v4) {
-		warning("TODO: GameSoundHandler::proc11");
-	}
-	int proc12() {
-		// TODO
-		return -1;
-	}
-	void proc2(int v) {
-		// TODO
-	}
-	int proc3() {
-		return 0;
-	}
-	void setVolume(int volume) {
-		warning("TODO GameSoundHandler::setVolume");
-	}
-	void startSound(int soundNum) {
-		warning("TODO GameSoundHandler::startSound");
-	}
-};
-
-class SoundHandler : public EventHandler {
-public:
-	GameSoundHandler _sound;
-	Action *_action;
-	int _field280;
-public:
-	SoundHandler();
-	~SoundHandler();
-
-	void startSound(int soundNum, Action *action = NULL, int volume = 127);
-	void proc1(Action *action) {
-		proc11(0, 5, 10, 1, action);
-	}
-	void proc2(int v) {
-		warning("TODO: SoundHandler::proc2");
-	}
-	void proc3() {
-		warning("TODO: SoundHandler::proc5");
-	}
-	void proc4() {
-		_sound.proc1();
-	}
-	void proc5(int v) {
-		_sound.proc5(v);
-	}
-	void proc11(int v1, int v2, int v3, int v4, Action *action) {
-		if (action)
-			_action = action;
-
-		_sound.proc11(v1, v2, v3, v4);
-	}
-	void setVolume(int volume) { _sound.setVolume(volume); }
-
-	virtual Common::String getClassName() { return "SoundHandler"; }
-	virtual void dispatch();
-};
-
-/*--------------------------------------------------------------------------*/
-
 class SceneItemList : public SynchronizedList<SceneItem *> {
 public:
 	void addItems(SceneItem *first, ...);