cleanup

svn-id: r11364

3 files changed, 10 insertions, 15 deletions

diff --git a/sword2/function.cpp b/sword2/function.cpp
index c812ac4375..9e4e14826e 100644
--- a/sword2/function.cpp
+++ b/sword2/function.cpp
@@ -184,16 +184,15 @@ int32 Logic::fnRandomPause(int32 *params) {
 }
 
 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;
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index d6bce469ad..edddfdeab5 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -194,7 +194,7 @@ void Sword2Engine::errorString(const char *buf1, char *buf2) {
 	}
 }
 
-int32 Sword2Engine::InitialiseGame(void) {
+int32 Sword2Engine::initialiseGame(void) {
 	// init engine drivers
 
 	uint8 *file;
@@ -276,7 +276,7 @@ void Sword2Engine::go() {
 	_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 @@ void Sword2Engine::go() {
 	debug(5, "CALLING: readOptionSettings");
 	_gui->readOptionSettings();
 
-	debug(5, "CALLING: InitialiseGame");
-	if (InitialiseGame()) {
+	debug(5, "CALLING: initialiseGame");
+	if (initialiseGame()) {
 		closeGame();
 		return;
 	}
diff --git a/sword2/sword2.h b/sword2/sword2.h
index ab639fcf50..46018eaff0 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -129,8 +129,7 @@ public:
 	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 @@ public:
 
 	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];