Minor cleanup and changed g_cruise to _vm for consistency

svn-id: r36050

3 files changed, 4 insertions, 6 deletions

diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp
index ad1ede292f..b1eafabe5c 100644
--- a/engines/cruise/cruise.cpp
+++ b/engines/cruise/cruise.cpp
@@ -40,9 +40,8 @@ namespace Cruise {
 
 //SoundDriver *g_soundDriver;
 //SfxPlayer *g_sfxPlayer;
-Common::SaveFileManager * g_saveFileMan;
 
-CruiseEngine *g_cruise;
+CruiseEngine *_vm;
 
 CruiseEngine::CruiseEngine(OSystem * syst, const CRUISEGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
 
@@ -59,7 +58,7 @@ CruiseEngine::CruiseEngine(OSystem * syst, const CRUISEGameDescription *gameDesc
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType,
 	                              ConfMan.getInt("music_volume"));
 
-	g_cruise = this;
+	_vm = this;
 
 	syst->getEventManager()->registerRandomSource(_rnd, "cruise");
 }
diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h
index a6bf297998..e87223df57 100644
--- a/engines/cruise/cruise.h
+++ b/engines/cruise/cruise.h
@@ -76,7 +76,7 @@ private:
 	bool _preLoad;
 };
 
-extern CruiseEngine *g_cruise;
+extern CruiseEngine *_vm;
 
 #define BOOT_PRC_NAME "AUTO00.PRC"
 
@@ -103,7 +103,6 @@ enum {
 	kCmpLT = (1 << 2)
 };
 
-extern Common::SaveFileManager * g_saveFileMan;	// TEMP
 
 } // End of namespace Cruise
 
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index a705f03efc..812985c0b0 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -191,7 +191,7 @@ int16 Op_Random(void) {		// TODO: implement
 		return (0);
 	}
 
-	return (g_cruise->_rnd.getRandomNumber(var - 1));
+	return (_vm->_rnd.getRandomNumber(var - 1));
 }
 
 int16 Op_PlayFX(void) {		// TODO: implement