renamed NetConn_UpdateServerStuff to NetConn_UpdateSockets and made it non-static...

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 0a9a58618c600d49105384988246abffe0925f4a..8195fa762c9c9e0d46c73167786818dc1f2adf46 100644 (file)
--- a/world.c
+++ b/world.c
@@ -29,8 +29,8 @@ line of sight checks trace->inopen and trace->inwater, but bullets don't
 
 */
 
-cvar_t sv_debugmove = {CVAR_NOTIFY, "sv_debugmove", "0"};
-cvar_t sv_areagrid_mingridsize = {CVAR_NOTIFY, "sv_areagrid_mingridsize", "64"};
+cvar_t sv_debugmove = {CVAR_NOTIFY, "sv_debugmove", "0", "disables collision detection optimizations for debugging purposes"};
+cvar_t sv_areagrid_mingridsize = {CVAR_NOTIFY, "sv_areagrid_mingridsize", "64", "minimum areagrid cell size, smaller values work better for lots of small objects, higher values for large objects"};
 
 void SV_AreaStats_f(void);
 
@@ -38,7 +38,7 @@ void SV_World_Init(void)
 {
        Cvar_RegisterVariable(&sv_debugmove);
        Cvar_RegisterVariable(&sv_areagrid_mingridsize);
-       Cmd_AddCommand("sv_areastats", SV_AreaStats_f);
+       Cmd_AddCommand("sv_areastats", SV_AreaStats_f, "prints information on culling grid system");
        Collision_Init();
 }
 
@@ -386,13 +386,10 @@ void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
                ent->fields.server->absmax[2] += 1;
        }
 
-       //if (ent->fields.server->solid == SOLID_NOT)
-       //      return;
-
        SV_LinkEdict_AreaGrid(ent);
 
 // if touch_triggers, touch all entities at this node and descend for more
-       if (touch_triggers)
+       if (touch_triggers && ent->fields.server->solid != SOLID_NOT)
                SV_TouchAreaGrid(ent);
 }