include_p1xbraten_menus -> include_p1xbraten_cfgs

Makefile

@@ -32,7 +32,7 @@ apply-patches:
 	$(PATCH) < patches/listteams.patch
 	$(PATCH) < patches/extrapings.patch
 	$(PATCH) < patches/execfile.patch
-	$(PATCH) < patches/include_p1xbraten_menus.patch
+	$(PATCH) < patches/include_p1xbraten_cfgs.patch
 	$(PATCH) < patches/tex_commands.patch
 	$(PATCH) < patches/decouple_framedrawing.patch
 	$(PATCH) < patches/crosshaircolor.patch
@@ -50,12 +50,12 @@ gzip-menus:
 	gzip --keep --force --best --no-name data/p1xbraten/gamehud.cfg && xxd -i - data/p1xbraten/gamehud.cfg.gz.xxd < data/p1xbraten/gamehud.cfg.gz
 
 _include-menus:
-	sed -i "s/0,\/\/menuscrc/0x$(shell crc32 data/p1xbraten/menus.cfg),/" src/fpsgame/p1xbraten_menus.cpp
-	sed -i "s/embeddedfile<0> menuscfg/embeddedfile<$(shell stat --printf="%s" data/p1xbraten/menus.cfg.gz)> menuscfg/" src/fpsgame/p1xbraten_menus.cpp
-	sed -i "s/0,\/\/mastercrc/0x$(shell crc32 data/p1xbraten/master.cfg),/" src/fpsgame/p1xbraten_menus.cpp
-	sed -i "s/embeddedfile<0> mastercfg/embeddedfile<$(shell stat --printf="%s" data/p1xbraten/master.cfg.gz)> mastercfg/" src/fpsgame/p1xbraten_menus.cpp
-	sed -i "s/0,\/\/gamehudcrc/0x$(shell crc32 data/p1xbraten/gamehud.cfg),/" src/fpsgame/p1xbraten_menus.cpp
-	sed -i "s/embeddedfile<0> gamehudcfg/embeddedfile<$(shell stat --printf="%s" data/p1xbraten/gamehud.cfg.gz)> gamehudcfg/" src/fpsgame/p1xbraten_menus.cpp
+	sed -i "s/0,\/\/menuscrc/0x$(shell crc32 data/p1xbraten/menus.cfg),/" src/fpsgame/p1xbraten_cfgs.cpp
+	sed -i "s/embeddedfile<0> menuscfg/embeddedfile<$(shell stat --printf="%s" data/p1xbraten/menus.cfg.gz)> menuscfg/" src/fpsgame/p1xbraten_cfgs.cpp
+	sed -i "s/0,\/\/mastercrc/0x$(shell crc32 data/p1xbraten/master.cfg),/" src/fpsgame/p1xbraten_cfgs.cpp
+	sed -i "s/embeddedfile<0> mastercfg/embeddedfile<$(shell stat --printf="%s" data/p1xbraten/master.cfg.gz)> mastercfg/" src/fpsgame/p1xbraten_cfgs.cpp
+	sed -i "s/0,\/\/gamehudcrc/0x$(shell crc32 data/p1xbraten/gamehud.cfg),/" src/fpsgame/p1xbraten_cfgs.cpp
+	sed -i "s/embeddedfile<0> gamehudcfg/embeddedfile<$(shell stat --printf="%s" data/p1xbraten/gamehud.cfg.gz)> gamehudcfg/" src/fpsgame/p1xbraten_cfgs.cpp
 
 clean-sauer: check-env
 	cd $(SAUER_DIR) && \

patches/include_p1xbraten_menus.patch → patches/include_p1xbraten_cfgs.patch

@@ -1,22 +1,34 @@
 Index: src/Makefile
 ===================================================================
---- src/Makefile	(revision 6490)
+--- src/Makefile	(revision 6496)
 +++ src/Makefile	(working copy)
 @@ -127,6 +127,7 @@
  	fpsgame/fps.o \
  	fpsgame/monster.o \
  	fpsgame/movable.o \
-+	fpsgame/p1xbraten_menus.o \
++	fpsgame/p1xbraten_cfgs.o \
  	fpsgame/render.o \
  	fpsgame/scoreboard.o \
  	fpsgame/server.o \
-Index: src/fpsgame/p1xbraten_menus.cpp
+Index: src/engine/main.cpp
 ===================================================================
---- src/fpsgame/p1xbraten_menus.cpp	(nonexistent)
-+++ src/fpsgame/p1xbraten_menus.cpp	(working copy)
-@@ -0,0 +1,79 @@
+--- src/engine/main.cpp	(revision 6496)
++++ src/engine/main.cpp	(working copy)
+@@ -1299,6 +1299,7 @@
+     defformatstring(gamecfgname, "data/game_%s.cfg", game::gameident());
+     execfile(gamecfgname);
+     if(game::savedservers()) execfile(game::savedservers(), false);
++    game::writep1xbratencfgs();
+
+     identflags |= IDF_PERSIST;
+
+Index: src/fpsgame/p1xbraten_cfgs.cpp
+===================================================================
+--- src/fpsgame/p1xbraten_cfgs.cpp	(nonexistent)
++++ src/fpsgame/p1xbraten_cfgs.cpp	(working copy)
+@@ -0,0 +1,66 @@
 +#include "cube.h"
-+#include "p1xbraten_menus.h"
++#include "p1xbraten_cfgs.h"
 +
 +namespace game {
 +    struct embeddedfile<0> menuscfg = {
@@ -62,17 +74,8 @@ Index: src/fpsgame/p1xbraten_menus.cpp
 +        return 0;
 +    }
 +
-+    extern int usep1xbratenmenus;
-+
-+    void executep1xbratenmenufiles()
-+    {
-+        if(usep1xbratenmenus) execfile(menuscfg.name);
-+    }
-+
-+    int writep1xbratenmenufiles()
++    int writep1xbratencfgs()
 +    {
-+        if(!usep1xbratenmenus) return 1;
-+
 +        int err = update(&menuscfg);
 +        if(err) { conoutf("\f6error updating %s (error code %d)!", menuscfg.name, err); return err; }
 +
@@ -86,18 +89,14 @@ Index: src/fpsgame/p1xbraten_menus.cpp
 +    }
 +
 +    VARFP(usep1xbratenmenus, 0, 1, 1, {
-+        if(usep1xbratenmenus)
-+        {
-+            writep1xbratenmenufiles();
-+            executep1xbratenmenufiles();
-+        }
++        if(usep1xbratenmenus) execfile(menuscfg.name);
 +        else execfile("data/menus.cfg");
 +    });
 +}
-Index: src/fpsgame/p1xbraten_menus.h
+Index: src/fpsgame/p1xbraten_cfgs.h
 ===================================================================
---- src/fpsgame/p1xbraten_menus.h	(nonexistent)
-+++ src/fpsgame/p1xbraten_menus.h	(working copy)
+--- src/fpsgame/p1xbraten_cfgs.h	(nonexistent)
++++ src/fpsgame/p1xbraten_cfgs.h	(working copy)
 @@ -0,0 +1,10 @@
 +#include "cube.h"
 +
@@ -112,20 +111,19 @@ Index: src/fpsgame/p1xbraten_menus.h
 \ No newline at end of file
 Index: src/shared/igame.h
 ===================================================================
---- src/shared/igame.h	(revision 6490)
+--- src/shared/igame.h	(revision 6496)
 +++ src/shared/igame.h	(working copy)
-@@ -48,6 +48,8 @@
+@@ -48,6 +48,7 @@
      extern const char *autoexec();
      extern const char *savedservers();
      extern void loadconfigs();
-+    extern int writep1xbratenmenufiles();
-+    extern void executep1xbratenmenufiles();
++    extern int writep1xbratencfgs();
 
      extern void updateworld();
      extern void initclient();
 Index: src/shared/stream.cpp
 ===================================================================
---- src/shared/stream.cpp	(revision 6490)
+--- src/shared/stream.cpp	(revision 6496)
 +++ src/shared/stream.cpp	(working copy)
 @@ -853,7 +853,15 @@
          return true;
@@ -146,13 +144,13 @@ Index: src/shared/stream.cpp
      {
 Index: src/vcpp/sauerbraten.vcxproj
 ===================================================================
---- src/vcpp/sauerbraten.vcxproj	(revision 6490)
+--- src/vcpp/sauerbraten.vcxproj	(revision 6496)
 +++ src/vcpp/sauerbraten.vcxproj	(working copy)
 @@ -1132,6 +1132,20 @@
        <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)2.obj</ObjectFileName>
        <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)2.obj</ObjectFileName>
      </ClCompile>
-+    <ClCompile Include="..\fpsgame\p1xbraten_menus.cpp">
++    <ClCompile Include="..\fpsgame\p1xbraten_cfgs.cpp">
 +      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cube.h</PrecompiledHeaderFile>
 +      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cube.h</PrecompiledHeaderFile>
 +      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)cube.pch</PrecompiledHeaderOutputFile>

src/Makefile

@@ -129,7 +129,7 @@ CLIENT_OBJS= \
 	fpsgame/fragmessages.o \
 	fpsgame/monster.o \
 	fpsgame/movable.o \
-	fpsgame/p1xbraten_menus.o \
+	fpsgame/p1xbraten_cfgs.o \
 	fpsgame/render.o \
 	fpsgame/scoreboard.o \
 	fpsgame/server.o \
@@ -529,13 +529,13 @@ fpsgame/movable.o: shared/ents.h shared/command.h shared/glexts.h
 fpsgame/movable.o: shared/glemu.h shared/iengine.h shared/igame.h
 fpsgame/movable.o: shared/authservers.h fpsgame/ai.h
 fpsgame/movable.o: fpsgame/weaponstats_type.h fpsgame/fragmessages.h
-fpsgame/p1xbraten_menus.o: shared/cube.h shared/tools.h shared/geom.h
-fpsgame/p1xbraten_menus.o: shared/ents.h shared/command.h shared/glexts.h
-fpsgame/p1xbraten_menus.o: shared/glemu.h shared/iengine.h shared/igame.h
-fpsgame/p1xbraten_menus.o: shared/authservers.h fpsgame/p1xbraten_menus.h
-fpsgame/p1xbraten_menus.o: ../data/p1xbraten/menus.cfg.gz.xxd
-fpsgame/p1xbraten_menus.o: ../data/p1xbraten/master.cfg.gz.xxd
-fpsgame/p1xbraten_menus.o: ../data/p1xbraten/gamehud.cfg.gz.xxd
+fpsgame/p1xbraten_cfgs.o: shared/cube.h shared/tools.h shared/geom.h
+fpsgame/p1xbraten_cfgs.o: shared/ents.h shared/command.h shared/glexts.h
+fpsgame/p1xbraten_cfgs.o: shared/glemu.h shared/iengine.h shared/igame.h
+fpsgame/p1xbraten_cfgs.o: shared/authservers.h fpsgame/p1xbraten_cfgs.h
+fpsgame/p1xbraten_cfgs.o: ../data/p1xbraten/menus.cfg.gz.xxd
+fpsgame/p1xbraten_cfgs.o: ../data/p1xbraten/master.cfg.gz.xxd
+fpsgame/p1xbraten_cfgs.o: ../data/p1xbraten/gamehud.cfg.gz.xxd
 fpsgame/render.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h
 fpsgame/render.o: shared/ents.h shared/command.h shared/glexts.h
 fpsgame/render.o: shared/glemu.h shared/iengine.h shared/igame.h

src/engine/main.cpp

@@ -1315,6 +1315,7 @@ int main(int argc, char **argv)
     defformatstring(gamecfgname, "data/game_%s.cfg", game::gameident());
     execfile(gamecfgname);
     if(game::savedservers()) execfile(game::savedservers(), false);
+    game::writep1xbratencfgs();
 
     identflags |= IDF_PERSIST;
 

src/fpsgame/p1xbraten_menus.cpp → src/fpsgame/p1xbraten_cfgs.cpp

@@ -1,5 +1,5 @@
 #include "cube.h"
-#include "p1xbraten_menus.h"
+#include "p1xbraten_cfgs.h"
 
 namespace game {
     struct embeddedfile<16060> menuscfg = {
@@ -45,17 +45,8 @@ namespace game {
         return 0;
     }
 
-    extern int usep1xbratenmenus;
-
-    void executep1xbratenmenufiles()
-    {
-        if(usep1xbratenmenus) execfile(menuscfg.name);
-    }
-
-    int writep1xbratenmenufiles()
+    int writep1xbratencfgs()
     {
-        if(!usep1xbratenmenus) return 1;
-
         int err = update(&menuscfg);
         if(err) { conoutf("\f6error updating %s (error code %d)!", menuscfg.name, err); return err; }
 
@@ -69,11 +60,7 @@ namespace game {
     }
 
     VARFP(usep1xbratenmenus, 0, 1, 1, {
-        if(usep1xbratenmenus)
-        {
-            writep1xbratenmenufiles();
-            executep1xbratenmenufiles();
-        }
+        if(usep1xbratenmenus) execfile(menuscfg.name);
         else execfile("data/menus.cfg");
     });
 }

src/shared/igame.h

@@ -48,8 +48,7 @@ namespace game
     extern const char *autoexec();
     extern const char *savedservers();
     extern void loadconfigs();
-    extern int writep1xbratenmenufiles();
-    extern void executep1xbratenmenufiles();
+    extern int writep1xbratencfgs();
 
     extern void updateworld();
     extern void initclient();

src/vcpp/sauerbraten.vcxproj

@@ -1155,7 +1155,7 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)2.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)2.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\fpsgame\p1xbraten_menus.cpp">
+    <ClCompile Include="..\fpsgame\p1xbraten_cfgs.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cube.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cube.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)cube.pch</PrecompiledHeaderOutputFile>