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

CINE: Get rid of g_saveFileMan

Browse source 
svn-id: r50944
This commit is contained in:
Max Horn 2010-07-16 21:56:30 +00:00
parent e75eee21e3
commit 587f3cf958
5 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/cine/cine.cpp
View file

@ -48,10 +48,9 @@
namespace Cine { namespace Cine {
Sound *g_sound; Sound *g_sound = 0;
Common::SaveFileManager *g_saveFileMan;
CineEngine *g_cine; CineEngine *g_cine = 0;
CineEngine::CineEngine(OSystem *syst, const CINEGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) { CineEngine::CineEngine(OSystem *syst, const CINEGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
DebugMan.addDebugChannel(kCineDebugScript, "Script", "Script debug level"); DebugMan.addDebugChannel(kCineDebugScript, "Script", "Script debug level");
@ -88,7 +87,6 @@ Common::Error CineEngine::run() {
// Paula chipset for Amiga and Atari versions // Paula chipset for Amiga and Atari versions
g_sound = new PaulaSound(_mixer, this); g_sound = new PaulaSound(_mixer, this);
} }
g_saveFileMan = _saveFileMan;
_restartRequested = false; _restartRequested = false;

2
engines/cine/cine.h
View file

@ -190,8 +190,6 @@ enum {
}; };
extern Common::SaveFileManager *g_saveFileMan; // TEMP
} // End of namespace Cine } // End of namespace Cine
#endif #endif

2
engines/cine/detection.cpp
View file

@ -251,7 +251,7 @@ Common::Error CineEngine::saveGameState(int slot, const char *desc) {
char indexFile[80]; char indexFile[80];
snprintf(indexFile, 80, "%s.dir", _targetName.c_str()); snprintf(indexFile, 80, "%s.dir", _targetName.c_str());
Common::OutSaveFile *fHandle = g_saveFileMan->openForSaving(indexFile); Common::OutSaveFile *fHandle = _saveFileMan->openForSaving(indexFile);
if (!fHandle) { if (!fHandle) {
warning("Unable to open file %s for saving", indexFile); warning("Unable to open file %s for saving", indexFile);
return Common::kUnknownError; return Common::kUnknownError;

6
engines/cine/saveload.cpp
View file

@ -465,7 +465,7 @@ bool CineEngine::loadSaveDirectory() {
char tmp[80]; char tmp[80];
snprintf(tmp, 80, "%s.dir", _targetName.c_str()); snprintf(tmp, 80, "%s.dir", _targetName.c_str());
fHandle = g_saveFileMan->openForLoading(tmp); fHandle = _saveFileMan->openForLoading(tmp);
if (!fHandle) { if (!fHandle) {
return false; return false;
@ -771,7 +771,7 @@ bool CineEngine::loadPlainSaveFW(Common::SeekableReadStream &in, CineSaveGameFor
} }
bool CineEngine::makeLoad(char *saveName) { bool CineEngine::makeLoad(char *saveName) {
Common::SharedPtr<Common::InSaveFile> saveFile(g_saveFileMan->openForLoading(saveName)); Common::SharedPtr<Common::InSaveFile> saveFile(_saveFileMan->openForLoading(saveName));
if (!saveFile) { if (!saveFile) {
renderer->drawString(otherMessages[0], 0); renderer->drawString(otherMessages[0], 0);
@ -966,7 +966,7 @@ void CineEngine::makeSaveOS(Common::OutSaveFile &out) {
} }
void CineEngine::makeSave(char *saveFileName) { void CineEngine::makeSave(char *saveFileName) {
Common::SharedPtr<Common::OutSaveFile> fHandle(g_saveFileMan->openForSaving(saveFileName)); Common::SharedPtr<Common::OutSaveFile> fHandle(_saveFileMan->openForSaving(saveFileName));
setMouseCursor(MOUSE_CURSOR_DISK); setMouseCursor(MOUSE_CURSOR_DISK);

2
engines/cine/various.cpp
View file

@ -450,7 +450,7 @@ void CineEngine::makeSystemMenu() {
snprintf(tmp, 80, "%s.dir", _targetName.c_str()); snprintf(tmp, 80, "%s.dir", _targetName.c_str());
Common::OutSaveFile *fHandle = g_saveFileMan->openForSaving(tmp); Common::OutSaveFile *fHandle = _saveFileMan->openForSaving(tmp);
if (!fHandle) { if (!fHandle) {
warning("Unable to open file %s for saving", tmp); warning("Unable to open file %s for saving", tmp);
break; break;