thanks to de-we for these great icons (I have not figured out how to use them yet...

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index 4470a753ccc338f78dd24f9c26da11f6e1328d1a..afc29be8f473b0faf8d2e350685c95258b9cb8ef 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-static cvar_t sv_cullentities_pvs = {0, "sv_cullentities_pvs", "0"}; // fast but loose
-static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "1"}; // tends to get false negatives, uses a timeout to keep entities visible a short time after becoming hidden
+static cvar_t sv_cullentities_pvs = {0, "sv_cullentities_pvs", "1"}; // fast but loose
+static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "0"}; // tends to get false negatives, uses a timeout to keep entities visible a short time after becoming hidden
 static cvar_t sv_cullentities_stats = {0, "sv_cullentities_stats", "0"};
 static cvar_t sv_entpatch = {0, "sv_entpatch", "1"};
 
@@ -37,6 +37,7 @@ mempool_t *sv_edicts_mempool = NULL;
 
 extern void SV_Phys_Init (void);
 extern void SV_World_Init (void);
+static void SV_SaveEntFile_f(void);
 
 /*
 ===============
@@ -47,6 +48,7 @@ void SV_Init (void)
 {
        int i;
 
+       Cmd_AddCommand("sv_saveentfile", SV_SaveEntFile_f);
        Cvar_RegisterVariable (&sv_maxvelocity);
        Cvar_RegisterVariable (&sv_gravity);
        Cvar_RegisterVariable (&sv_friction);
@@ -72,6 +74,18 @@ void SV_Init (void)
        sv_edicts_mempool = Mem_AllocPool("server edicts");
 }
 
+static void SV_SaveEntFile_f(void)
+{
+       char basename[MAX_QPATH];
+       if (!sv.active || !sv.worldmodel)
+       {
+               Con_Printf("Not running a server\n");
+               return;
+       }
+       FS_StripExtension(sv.worldmodel->name, basename, sizeof(basename));
+       FS_WriteFile(va("%s.ent", basename), sv.worldmodel->brush.entities, strlen(sv.worldmodel->brush.entities));
+}
+
 /*
 =============================================================================
 
@@ -1757,7 +1771,11 @@ void SV_SpawnServer (const char *server)
        if (sv.active)
                SV_SendReconnect();
        else
+       {
+               // make sure cvars have been checked before opening the ports
+               NetConn_ServerFrame();
                NetConn_OpenServerPorts(true);
+       }
 
 //
 // make cvars consistant