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

KYRA: Get rid of local static non-POD object.

Browse source 
This fixes crashes with the plugins branch for dhewg.

svn-id: r52579
This commit is contained in:
Johannes Schickel 2010-09-05 22:56:25 +00:00
parent b6663bb942
commit f69bfaf355
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/kyra/kyra_v1.h
View file

@ -387,6 +387,7 @@ protected:
bool canSaveGameStateCurrently() { return _isSaveAllowed; } bool canSaveGameStateCurrently() { return _isSaveAllowed; }
const char *getSavegameFilename(int num); const char *getSavegameFilename(int num);
Common::String _savegameFilename;
static Common::String getSavegameFilename(const Common::String &target, int num); static Common::String getSavegameFilename(const Common::String &target, int num);
bool saveFileLoadable(int slot); bool saveFileLoadable(int slot);

5
engines/kyra/saveload.cpp
View file

@ -224,9 +224,8 @@ Common::WriteStream *KyraEngine_v1::openSaveForWriting(const char *filename, con
} }
const char *KyraEngine_v1::getSavegameFilename(int num) { const char *KyraEngine_v1::getSavegameFilename(int num) {
static Common::String filename; _savegameFilename = getSavegameFilename(_targetName, num);
filename = getSavegameFilename(_targetName, num); return _savegameFilename.c_str();
return filename.c_str();
} }
Common::String KyraEngine_v1::getSavegameFilename(const Common::String &target, int num) { Common::String KyraEngine_v1::getSavegameFilename(const Common::String &target, int num) {