diff options
| author | Johannes Schickel | 2010-09-05 22:56:25 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-09-05 22:56:25 +0000 |
| commit | f69bfaf355b2544bf8ca8cc6cf3209773b8ad005 (patch) | |
| tree | 44acb43795db0d32cf2caa617fffcfe18773018c /engines/kyra | |
| parent | b6663bb942780ed9786992ca1fd757fc96f1412d (diff) | |
| download | scummvm-rg350-f69bfaf355b2544bf8ca8cc6cf3209773b8ad005.tar.gz scummvm-rg350-f69bfaf355b2544bf8ca8cc6cf3209773b8ad005.tar.bz2 scummvm-rg350-f69bfaf355b2544bf8ca8cc6cf3209773b8ad005.zip | |
KYRA: Get rid of local static non-POD object.
This fixes crashes with the plugins branch for dhewg.
svn-id: r52579
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_v1.h | 1 | ||||
| -rw-r--r-- | engines/kyra/saveload.cpp | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index f05e113456..d077d3a3b0 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -387,6 +387,7 @@ protected: bool canSaveGameStateCurrently() { return _isSaveAllowed; } const char *getSavegameFilename(int num); + Common::String _savegameFilename; static Common::String getSavegameFilename(const Common::String &target, int num); bool saveFileLoadable(int slot); diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index 56e1c73d0a..b1cc954137 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -224,9 +224,8 @@ Common::WriteStream *KyraEngine_v1::openSaveForWriting(const char *filename, con } const char *KyraEngine_v1::getSavegameFilename(int num) { - static Common::String filename; - filename = getSavegameFilename(_targetName, num); - return filename.c_str(); + _savegameFilename = getSavegameFilename(_targetName, num); + return _savegameFilename.c_str(); } Common::String KyraEngine_v1::getSavegameFilename(const Common::String &target, int num) { |