[Scummvm-cvs-logs] SF.net SVN: scummvm: [31621] scummvm/trunk/engines/m4

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Apr 20 19:26:48 CEST 2008


Revision: 31621
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31621&view=rev
Author:   thebluegr
Date:     2008-04-20 10:26:48 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
More compilation fixes by lordhoto

Modified Paths:
--------------
    scummvm/trunk/engines/m4/rails.cpp
    scummvm/trunk/engines/m4/scene.cpp
    scummvm/trunk/engines/m4/script.cpp

Modified: scummvm/trunk/engines/m4/rails.cpp
===================================================================
--- scummvm/trunk/engines/m4/rails.cpp	2008-04-20 17:17:24 UTC (rev 31620)
+++ scummvm/trunk/engines/m4/rails.cpp	2008-04-20 17:26:48 UTC (rev 31621)
@@ -324,6 +324,7 @@
 	}
 }
 
+/*
 static RailNode* duplicatePath(RailNode *pathStart) {
 	RailNode *newNode = NULL;
 	RailNode *firstNode = NULL;
@@ -349,6 +350,7 @@
 
 	return firstNode;
 }
+*/
 
 bool Rails::getShortestPath(int32 origID, int32 destID, RailNode **shortPath) {
 	// TODO

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2008-04-20 17:17:24 UTC (rev 31620)
+++ scummvm/trunk/engines/m4/scene.cpp	2008-04-20 17:26:48 UTC (rev 31621)
@@ -228,7 +228,6 @@
 	int hotspotCount = hotspotStream->readUint16LE();
 	delete hotspotStream;
 
-	HotSpotList *hotspotList = _sceneResources.hotspots;
 	_sceneResources.hotspotCount = hotspotCount;
 
 	hotspotStream = hotSpotData.getItemStream(1);
@@ -483,10 +482,12 @@
 				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());

Modified: scummvm/trunk/engines/m4/script.cpp
===================================================================
--- scummvm/trunk/engines/m4/script.cpp	2008-04-20 17:17:24 UTC (rev 31620)
+++ scummvm/trunk/engines/m4/script.cpp	2008-04-20 17:26:48 UTC (rev 31621)
@@ -1105,8 +1105,8 @@
 
 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_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_wilburParse() {
-	const ParserArray& parserArray = DATA(0, ParserArray);
+	//const ParserArray& parserArray = DATA(0, ParserArray);
 	RETURN(0);
 	return 1;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list