[Gtkradiant] new 1.2.1-nightly setup with new q3map

[EvilTypeGuy]

--wac7ysb48OaltWcw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Attached is a small patch that implements the fs_homepath you wanted for the 
linux build of q3map...

I have no way to test it here, but it compiles fine, and it does exactly what we 
do for fs_basegame, so it should work...

-EvilTypeGuy

On Fri, Jan 04, 2002 at 06:24:53PM +0100, Timothee Besset wrote:
> Ok, I updated the setup:
> This one has GtkRadiant core 1.2.1 and Q3 game pack
> 
> This q3map is a release build of ydnar's patches + source update from Id + 
> -game switch in preparation for Wolf
> 
> http://zerowing.idsoftware.com/nightly/GtkRadiantSetup-1.2.1-nightly-01042002.exe
> 
> The q3map definitely needs to be tested.
> 
> TTimo
> 
> 
> _______________________________________________
> Gtkradiant mailing list
> Gtkradiant@zerowing.idsoftware.com
> http://zerowing.idsoftware.com/mailman/listinfo/gtkradiant
> 

--wac7ysb48OaltWcw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="fs_homepath.patch"

Index: bsp.c
===================================================================
RCS file: /cvs/GtkRadiant/tools/quake3/q3map/bsp.c,v
retrieving revision 1.15
diff -u -3 -p -r1.15 bsp.c
--- bsp.c	4 Jan 2002 14:32:46 -0000	1.15
+++ bsp.c	4 Jan 2002 18:19:06 -0000
@@ -507,7 +507,7 @@ quake3 is the default setting
 char *game = NULL;
 char *fs_basegame = NULL;
 #if defined(__linux__)
-#error do an fs_homepath for .q3a etc.
+char *fs_homepath = NULL;
 #endif
 
 int main (int argc, char **argv)
@@ -571,6 +571,11 @@ int main (int argc, char **argv)
     strcpy(game, "quake3");
     fs_basegame = (char *)safe_malloc(10);
     strcpy(fs_basegame, "baseq3");
+
+#if defined (__linux__) || defined (__APPLE__)
+    fs_homepath = (char *)safe_malloc(10);
+    strcpy(fs_homepath, ".q3a");
+#endif
   }
 
   if (!strcmp(game, "wolf"))
@@ -579,6 +584,11 @@ int main (int argc, char **argv)
     bsp_version = WOLF_BSP_VERSION;
     fs_basegame = (char *)safe_malloc(10);
     strcpy(fs_basegame, "main");
+
+#if defined (__linux__) || defined (__APPLE__)
+    fs_homepath = (char *)safe_malloc(10);
+    strcpy(fs_homepath, ".wolf");
+#endif
   }
   // nothing to be done on Q3 config, just check for unknown game name
   else if (strcmp(game, "quake3"))
@@ -645,7 +655,7 @@ int main (int argc, char **argv)
 
   if (moddir != NULL)
   {
-    sprintf (path, "%s/.q3a/%s/", homedir, moddir);
+    sprintf (path, "%s/%s/%s/", homedir, fs_homepath, moddir);
     vfsInitDirectory (path);
   }
 
@@ -655,7 +665,7 @@ int main (int argc, char **argv)
     vfsInitDirectory (path);
   }
 
-  sprintf (path, "%s/.q3a/baseq3/", homedir);
+  sprintf (path, "%s/%s/baseq3/", homedir, fs_homepath);
   vfsInitDirectory (path);
 
   sprintf (path, "%sbaseq3/", gamedirparam);

--wac7ysb48OaltWcw--