[Scummvm-cvs-logs] SF.net SVN: scummvm:[52579] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 52579
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52579&view=rev
Author:   lordhoto
Date:     2010-09-05 22:56:25 +0000 (Sun, 05 Sep 2010)

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

This fixes crashes with the plugins branch for dhewg.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v1.h
    scummvm/trunk/engines/kyra/saveload.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h	2010-09-05 22:56:03 UTC (rev 52578)
+++ scummvm/trunk/engines/kyra/kyra_v1.h	2010-09-05 22:56:25 UTC (rev 52579)
@@ -387,6 +387,7 @@
 	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);
 

Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp	2010-09-05 22:56:03 UTC (rev 52578)
+++ scummvm/trunk/engines/kyra/saveload.cpp	2010-09-05 22:56:25 UTC (rev 52579)
@@ -224,9 +224,8 @@
 }
 
 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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.