GameLogic.globalDict blenderplayer now keeps settings when loading new blend files.

workaround for python stopping and starting by storing the dictionary as marshal'd data. this means only python types are supported.
This feature is needed so when switching from a menu to a level blendfile, the configuration isnt lost.

1 files changed, 18 insertions, 1 deletions

diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 8222e5c8bac..26a85128025 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -293,7 +293,9 @@ int main(int argc, char** argv)
 	GHOST_TUns32 fullScreenHeight= 0;
 	int fullScreenBpp = 32;
 	int fullScreenFrequency = 60;
-
+	char* pyGlobalDictString = NULL; /* store python dict data between blend file loading */
+	int pyGlobalDictString_Length = 0;
+	
 #ifdef __linux__
 #ifdef __alpha__
 	signal (SIGFPE, SIG_IGN);
@@ -625,6 +627,10 @@ int main(int argc, char** argv)
 						
 						titlename = maggie->name;
 						
+						// Set the GameLogic.globalDict from marshal'd data, so we can load new blend files
+						// abd keep data in GameLogic.globalDict
+						app.SetPyGlobalDictMarshal(pyGlobalDictString, pyGlobalDictString_Length);
+						
 						// Check whether the game should be displayed full-screen
 						if ((!fullScreenParFound) && (!windowParFound))
 						{
@@ -750,6 +756,12 @@ int main(int argc, char** argv)
 							}
 						}
 						app.StopGameEngine();
+						
+						// GameLogic.globalDict has been converted into a buffer
+						// store in pyGlobalDictString so we can restore after python has stopped and started.
+						pyGlobalDictString = app.GetPyGlobalDictMarshal();
+						pyGlobalDictString_Length = app.GetPyGlobalDictMarshalLength();
+						
 						BLO_blendfiledata_free(bfd);
 						
 #ifdef __APPLE__
@@ -772,6 +784,11 @@ int main(int argc, char** argv)
 		}
 	}
 
+	if (pyGlobalDictString) {
+		free(pyGlobalDictString);
+		pyGlobalDictString = NULL;
+	}
+	
 	return error ? -1 : 0;
 }