thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HOPKINS: Remove erroneous static keyword, get rid of g_vm

Browse source
This commit is contained in:
Strangerke 2013-06-26 20:11:00 +02:00
parent 3d373281b4
commit 63c462efce
4 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/hopkins/hopkins.cpp
View file

@ -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);

3
engines/hopkins/hopkins.h
View file

@ -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 */

2
engines/hopkins/saveload.cpp
View file

@ -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;

2
engines/hopkins/saveload.h
View file

@ -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);