[Scummvm-cvs-logs] SF.net SVN: scummvm:[41085] scummvm/trunk/engines/gob

[fingolfin at users.sourceforge.net]

Revision: 41085
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41085&view=rev
Author:   fingolfin
Date:     2009-05-31 22:29:50 +0000 (Sun, 31 May 2009)

Log Message:
-----------
GOB: Got rid of GobEngine::_vm

Modified Paths:
--------------
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/gob.h

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2009-05-31 22:29:06 UTC (rev 41084)
+++ scummvm/trunk/engines/gob/gob.cpp	2009-05-31 22:29:50 UTC (rev 41085)
@@ -68,8 +68,6 @@
 };
 
 GobEngine::GobEngine(OSystem *syst) : Engine(syst) {
-	_vm = this;
-
 	_sound     = 0; _mult     = 0; _game   = 0;
 	_global    = 0; _dataIO   = 0; _goblin = 0;
 	_vidPlayer = 0; _init     = 0; _inter  = 0;
@@ -112,18 +110,18 @@
 }
 
 void GobEngine::validateLanguage() {
-	if (_vm->_global->_languageWanted != _vm->_global->_language) {
+	if (_global->_languageWanted != _global->_language) {
 		warning("Your game version doesn't support the requested language %s",
-				getLangDesc(_vm->_global->_languageWanted));
+				getLangDesc(_global->_languageWanted));
 
-		if (((_vm->_global->_languageWanted == 2) && (_vm->_global->_language == 5)) ||
-		    ((_vm->_global->_languageWanted == 5) && (_vm->_global->_language == 2)))
-			warning("Using %s instead", getLangDesc(_vm->_global->_language));
+		if (((_global->_languageWanted == 2) && (_global->_language == 5)) ||
+		    ((_global->_languageWanted == 5) && (_global->_language == 2)))
+			warning("Using %s instead", getLangDesc(_global->_language));
 		else
 			warning("Using the first language available: %s",
-					getLangDesc(_vm->_global->_language));
+					getLangDesc(_global->_language));
 
-		_vm->_global->_languageWanted = _vm->_global->_language;
+		_global->_languageWanted = _global->_language;
 	}
 }
 
@@ -134,9 +132,9 @@
 }
 
 Endianness GobEngine::getEndianness() const {
-	if ((_vm->getPlatform() == Common::kPlatformAmiga) ||
-	    (_vm->getPlatform() == Common::kPlatformMacintosh) ||
-	    (_vm->getPlatform() == Common::kPlatformAtariST))
+	if ((getPlatform() == Common::kPlatformAmiga) ||
+	    (getPlatform() == Common::kPlatformMacintosh) ||
+	    (getPlatform() == Common::kPlatformAtariST))
 		return kEndiannessBE;
 
 	return kEndiannessLE;
@@ -267,13 +265,13 @@
 	} else {
 		uint32 duration = _system->getMillis() - _pauseStart;
 
-		_vm->_vidPlayer->notifyPaused(duration);
-		_vm->_util->notifyPaused(duration);
+		_vidPlayer->notifyPaused(duration);
+		_util->notifyPaused(duration);
 
-		_vm->_game->_startTimeKey += duration;
-		_vm->_draw->_cursorTimeKey += duration;
-		if (_vm->_inter->_soundEndTimeKey != 0)
-			_vm->_inter->_soundEndTimeKey += duration;
+		_game->_startTimeKey += duration;
+		_draw->_cursorTimeKey += duration;
+		if (_inter->_soundEndTimeKey != 0)
+			_inter->_soundEndTimeKey += duration;
 	}
 
 	_mixer->pauseAll(pause);

Modified: scummvm/trunk/engines/gob/gob.h
===================================================================
--- scummvm/trunk/engines/gob/gob.h	2009-05-31 22:29:06 UTC (rev 41084)
+++ scummvm/trunk/engines/gob/gob.h	2009-05-31 22:29:50 UTC (rev 41085)
@@ -136,8 +136,6 @@
 
 class GobEngine : public Engine {
 private:
-	GobEngine *_vm;
-
 	GameType _gameType;
 	int32 _features;
 	Common::Platform _platform;


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