[Scummvm-cvs-logs] scummvm master -> 63c462efcef09dabf70f8b8ffb6117e23614b122

Strangerke Strangerke at scummvm.org
Wed Jun 26 20:13:10 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
63c462efce HOPKINS: Remove erroneous static keyword, get rid of g_vm


Commit: 63c462efcef09dabf70f8b8ffb6117e23614b122
    https://github.com/scummvm/scummvm/commit/63c462efcef09dabf70f8b8ffb6117e23614b122
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-06-26T11:11:00-07:00

Commit Message:
HOPKINS: Remove erroneous static keyword, get rid of g_vm

Changed paths:
    engines/hopkins/hopkins.cpp
    engines/hopkins/hopkins.h
    engines/hopkins/saveload.cpp
    engines/hopkins/saveload.h



diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 2aaf44c..b773808 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -35,12 +35,9 @@
 
 namespace Hopkins {
 
-HopkinsEngine *g_vm;
-
 HopkinsEngine::HopkinsEngine(OSystem *syst, const HopkinsGameDescription *gameDesc) : Engine(syst),
 		_gameDescription(gameDesc), _randomSource("Hopkins") {
 	DebugMan.addDebugChannel(kDebugPath, "Path", "Pathfinding debug level");
-	g_vm = this;
 	_animMan = new AnimationManager(this);
 	_computer = new ComputerManager(this);
 	_dialog = new DialogsManager(this);
diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h
index 777fd1c..398e41a 100644
--- a/engines/hopkins/hopkins.h
+++ b/engines/hopkins/hopkins.h
@@ -183,9 +183,6 @@ public:
 	virtual void syncSoundSettings();
 };
 
-// Global reference to the HopkinsEngine object
-extern HopkinsEngine *g_vm;
-
 } // End of namespace Hopkins
 
 #endif /* HOPKINS_HOPKINS_H */
diff --git a/engines/hopkins/saveload.cpp b/engines/hopkins/saveload.cpp
index 45b4885..fd36480 100644
--- a/engines/hopkins/saveload.cpp
+++ b/engines/hopkins/saveload.cpp
@@ -216,7 +216,7 @@ Common::Error SaveLoadManager::loadGame(int slot) {
 bool SaveLoadManager::readSavegameHeader(int slot, hopkinsSavegameHeader &header) {
 	// Try and open the save file for reading
 	Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(
-		g_vm->generateSaveName(slot));
+		_vm->generateSaveName(slot));
 	if (!saveFile)
 		return false;
 
diff --git a/engines/hopkins/saveload.h b/engines/hopkins/saveload.h
index 221a445..6fee814 100644
--- a/engines/hopkins/saveload.h
+++ b/engines/hopkins/saveload.h
@@ -63,7 +63,7 @@ public:
 
 	static bool readSavegameHeader(Common::InSaveFile *in, hopkinsSavegameHeader &header);
 	void writeSavegameHeader(Common::OutSaveFile *out, hopkinsSavegameHeader &header);
-	static bool readSavegameHeader(int slot, hopkinsSavegameHeader &header);
+	bool readSavegameHeader(int slot, hopkinsSavegameHeader &header);
 	Common::Error saveGame(int slot, const Common::String &saveName);
 	Common::Error loadGame(int slot);
 






More information about the Scummvm-git-logs mailing list