8MB stack size linker options on all VC2008 proj files.

[xonotic/netradiant.git] / contrib / gtkgensurf / gensurf.cpp

diff --git a/contrib/gtkgensurf/gensurf.cpp b/contrib/gtkgensurf/gensurf.cpp
index 32b54b5578519e41452325207671bee5a9b4c50f..77ef30863052509976420b81ac2fbcf6744e4a40 100644 (file)
--- a/contrib/gtkgensurf/gensurf.cpp
+++ b/contrib/gtkgensurf/gensurf.cpp
@@ -133,11 +133,12 @@ bool GenSurfInit ()
   else */
     Game = QUAKE3;
 
-  ReadIniFile (gszIni);
 
   if (g_pWnd == NULL)
     g_pWnd = create_main_dialog ();
 
+  ReadIniFile (gszIni);
+
   return true;
 }
 
@@ -291,9 +292,10 @@ void ReadIniFile (const char *file)
   if(!strlen(Texture[GENESIS3D][0])) strcpy(Texture[GENESIS3D][0],"textures/rock13");
   if(!strlen(Texture[QUAKE3][0]))    strcpy(Texture[QUAKE3][0],   "textures/organics/grass3");
   if(!strlen(Texture[QUAKE3][1]))    strcpy(Texture[QUAKE3][1],   "textures/common/caulk");
-
   strcpy (gbmp.name, g_FuncTable.m_pfnProfileLoadString (file, "Bitmap","Filename",""));
 
+
+  gbmp.colors = NULL;
   if (strlen(gbmp.name))
     OpenBitmap ();
 
@@ -321,7 +323,7 @@ varargs versions of all text functions.
 FIXME: make this buffer size safe someday
 ============
 */
-char *va (char *format, ...)
+char *va (const char *format, ...)
 {
   va_list argptr;
   static char string[1024];
@@ -330,7 +332,7 @@ char *va (char *format, ...)
   vsprintf (string, format,argptr);
   va_end (argptr);
 
-  return string;       
+  return string;
 }
 
 
@@ -397,11 +399,11 @@ void UpdatePreview (bool DataChange)
 void SaveSetup (GtkWidget *parent)
 {
   const char *name = g_FuncTable.m_pfnFileDialog (parent, false, "Save GenSurf Settings",
-                                             g_FuncTable.m_pfnProfileGetDirectory ());
+                                             g_FuncTable.m_pfnProfileGetDirectory (), "gtkgensurf", NULL);
 
   if (name != NULL)
   {
-    char key[32], text[32]; 
+    char key[32], text[32];
     int i, j;
 
     WriteIniFile (name);
@@ -436,7 +438,7 @@ void OpenSetup (GtkWidget *parent, int UseDefaults)
     name = g_strdup ("plugins/defaults.srf"); // dummy string
   else
     name = g_FuncTable.m_pfnFileDialog (parent, true, "Open GenSurf Settings",
-                                        g_FuncTable.m_pfnProfileGetDirectory ());
+                                        g_FuncTable.m_pfnProfileGetDirectory (), "gtkgensurf", NULL);
 
   if(name != NULL)
   {