From e06918c29f570bc07f29d0cdf20537cdcad5a63c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 20 Apr 2008 17:26:48 +0000
Subject: More compilation fixes by lordhoto

svn-id: r31621
---
 engines/m4/rails.cpp  |  2 ++
 engines/m4/scene.cpp  |  3 ++-
 engines/m4/script.cpp | 12 ++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/m4/rails.cpp b/engines/m4/rails.cpp
index d5139cc3c4..0153934a88 100644
--- a/engines/m4/rails.cpp
+++ b/engines/m4/rails.cpp
@@ -324,6 +324,7 @@ void Rails::disposePath(RailNode *pathStart) {
 	}
 }
 
+/*
 static RailNode* duplicatePath(RailNode *pathStart) {
 	RailNode *newNode = NULL;
 	RailNode *firstNode = NULL;
@@ -349,6 +350,7 @@ static RailNode* duplicatePath(RailNode *pathStart) {
 
 	return firstNode;
 }
+*/
 
 bool Rails::getShortestPath(int32 origID, int32 destID, RailNode **shortPath) {
 	// TODO
diff --git a/engines/m4/scene.cpp b/engines/m4/scene.cpp
index 787b8dd8eb..a2c9d808db 100644
--- a/engines/m4/scene.cpp
+++ b/engines/m4/scene.cpp
@@ -228,7 +228,6 @@ void Scene::loadSceneHotSpotsMads(int sceneNumber) {
 	int hotspotCount = hotspotStream->readUint16LE();
 	delete hotspotStream;
 
-	HotSpotList *hotspotList = _sceneResources.hotspots;
 	_sceneResources.hotspotCount = hotspotCount;
 
 	hotspotStream = hotSpotData.getItemStream(1);
@@ -483,10 +482,12 @@ bool Scene::onEvent(M4EventType eventType, int param1, int x, int y, bool &captu
 				if (currentHotSpot != NULL && currentHotSpot->getActive()) {
 					update();
 					_vm->_actor->setWalkerDirection(currentHotSpot->getFacing());
+					/*
 					int posX = currentHotSpot->getFeetX();
 					int posY = currentHotSpot->getFeetY() -
 							   scaleValue(_vm->_actor->getWalkerHeight(), _vm->_actor->getWalkerScaling(), 0);
 					//_vm->_actor->placeWalkerSpriteAt(0, posX, posY);
+					*/
 
 					// Player said.... (for scene scripts)
 					printf("Player said: %s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());
diff --git a/engines/m4/script.cpp b/engines/m4/script.cpp
index e7026a381d..c1725cbfdd 100644
--- a/engines/m4/script.cpp
+++ b/engines/m4/script.cpp
@@ -1105,8 +1105,8 @@ int ScriptInterpreter::o1_setHotspot() {
 
 int ScriptInterpreter::o1_loadConversation() {
 	const char *name = STRING(0);
-	int trigger = INTEGER(1);
-	int flag = INTEGER(2);
+	//int trigger = INTEGER(1);
+	//int flag = INTEGER(2);
 
 	// TODO; just to show something
 	_vm->_converse->startConversation(name);
@@ -1177,17 +1177,17 @@ int ScriptInterpreter::o1_unloadSeries() {
 }
 
 int ScriptInterpreter::o1_preloadBreakSeries() {
-	const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList);
+	//const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList);
 	return 1;
 }
 
 int ScriptInterpreter::o1_unloadBreakSeries() {
-	const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList);
+	//const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList);
 	return 1;
 }
 
 int ScriptInterpreter::o1_startBreakSeries() {
-	const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList);
+	//const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList);
 	return 1;
 }
 
@@ -1271,7 +1271,7 @@ int ScriptInterpreter::o1_wilburSaid() {
 }
 
 int ScriptInterpreter::o1_wilburParse() {
-	const ParserArray& parserArray = DATA(0, ParserArray);
+	//const ParserArray& parserArray = DATA(0, ParserArray);
 	RETURN(0);
 	return 1;
 }
-- 
cgit v1.2.3