[Scummvm-cvs-logs] SF.net SVN: scummvm:[36050] scummvm/trunk/engines/cruise

[dreammaster at users.sourceforge.net]

Revision: 36050
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36050&view=rev
Author:   dreammaster
Date:     2009-01-25 05:44:18 +0000 (Sun, 25 Jan 2009)

Log Message:
-----------
Minor cleanup and changed g_cruise to _vm for consistency

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/cruise.cpp
    scummvm/trunk/engines/cruise/cruise.h
    scummvm/trunk/engines/cruise/function.cpp

Modified: scummvm/trunk/engines/cruise/cruise.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise.cpp	2009-01-25 04:29:25 UTC (rev 36049)
+++ scummvm/trunk/engines/cruise/cruise.cpp	2009-01-25 05:44:18 UTC (rev 36050)
@@ -40,9 +40,8 @@
 
 //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 @@
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType,
 	                              ConfMan.getInt("music_volume"));
 
-	g_cruise = this;
+	_vm = this;
 
 	syst->getEventManager()->registerRandomSource(_rnd, "cruise");
 }

Modified: scummvm/trunk/engines/cruise/cruise.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise.h	2009-01-25 04:29:25 UTC (rev 36049)
+++ scummvm/trunk/engines/cruise/cruise.h	2009-01-25 05:44:18 UTC (rev 36050)
@@ -76,7 +76,7 @@
 	bool _preLoad;
 };
 
-extern CruiseEngine *g_cruise;
+extern CruiseEngine *_vm;
 
 #define BOOT_PRC_NAME "AUTO00.PRC"
 
@@ -103,7 +103,6 @@
 	kCmpLT = (1 << 2)
 };
 
-extern Common::SaveFileManager * g_saveFileMan;	// TEMP
 
 } // End of namespace Cruise
 

Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp	2009-01-25 04:29:25 UTC (rev 36049)
+++ scummvm/trunk/engines/cruise/function.cpp	2009-01-25 05:44:18 UTC (rev 36050)
@@ -191,7 +191,7 @@
 		return (0);
 	}
 
-	return (g_cruise->_rnd.getRandomNumber(var - 1));
+	return (_vm->_rnd.getRandomNumber(var - 1));
 }
 
 int16 Op_PlayFX(void) {		// TODO: implement


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