[Scummvm-cvs-logs] CVS: scummvm/sword2 function.cpp,1.41,1.42 sword2.cpp,1.86,1.87 sword2.h,1.44,1.45

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv22037

Modified Files:
	function.cpp sword2.cpp sword2.h 
Log Message:
cleanup


Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- function.cpp	16 Nov 2003 14:18:28 -0000	1.41
+++ function.cpp	25 Nov 2003 09:05:09 -0000	1.42
@@ -184,16 +184,15 @@
 }
 
 int32 Logic::fnPassGraph(int32 *params) {
-	// makes an engine local copy of passed graphic_structure and
-	// mega_structure - run script 4 of an object to request this
-	// used by fnTurnTo(id) etc
+	// makes an engine local copy of passed Object_graphic - run script 4
+	// of an object to request this used by fnTurnTo(id) etc
 	//
 	// remember, we cannot simply read a compact any longer but instead
 	// must request it from the object itself
 
-	// params:	0 pointer to a graphic structure (might not need this?)
+	// params:	0 pointer to an Object_graphic structure
 
-	memcpy(&_vm->_engineGraph, _vm->_memory->intToPtr(params[0]), sizeof(Object_graphic));
+	warning("fnPassGraph() is a no-op now");
 
 	// makes no odds
 	return IR_CONT;

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- sword2.cpp	16 Nov 2003 14:18:29 -0000	1.86
+++ sword2.cpp	25 Nov 2003 09:05:09 -0000	1.87
@@ -194,7 +194,7 @@
 	}
 }
 
-int32 Sword2Engine::InitialiseGame(void) {
+int32 Sword2Engine::initialiseGame(void) {
 	// init engine drivers
 
 	uint8 *file;
@@ -276,7 +276,7 @@
 	_keyboardEvent ke;
 
 	// Call the application "Revolution" until the resource manager is
-	// ready to dig the name out of a text file. See InitialiseGame()
+	// ready to dig the name out of a text file. See initialiseGame()
 	// which calls InitialiseFontResourceFlags() in maketext.cpp
 	//
 	// Have to do it like this since we cannot really fire up the resource
@@ -286,8 +286,8 @@
 	debug(5, "CALLING: readOptionSettings");
 	_gui->readOptionSettings();
 
-	debug(5, "CALLING: InitialiseGame");
-	if (InitialiseGame()) {
+	debug(5, "CALLING: initialiseGame");
+	if (initialiseGame()) {
 		closeGame();
 		return;
 	}

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- sword2.h	23 Nov 2003 13:40:24 -0000	1.44
+++ sword2.h	25 Nov 2003 09:05:10 -0000	1.45
@@ -129,8 +129,7 @@
 	Sword2Engine(GameDetector *detector, OSystem *syst);
 	~Sword2Engine();
 	void go(void);
-	void parseEvents(void);
-	int32 InitialiseGame(void);
+	int32 initialiseGame(void);
 	uint32 _features;
 	char *_targetName; // target name for saves
 
@@ -191,10 +190,7 @@
 
 	int32 initBackground(int32 res, int32 new_palette);
 
-	// These two are set by fnPassGraph() and fnPassMega().
-	// FIXME: _engineGraph isn't used at all, is it?
-
-	Object_graphic _engineGraph;
+	// Set by fnPassMega()
 	Object_mega _engineMega;
 
 	menu_object _tempList[TOTAL_engine_pockets];