cleaned up the stupid forcedeveloper hack, now changes the default string of the...

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 846ece819758f266df36dd10c220f6ae4ff49e25..985830985448a1ccfe17af159edfe89eec5a8d0b 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();
 }
 
@@ -395,27 +395,6 @@ void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
 
 
 
-/*
-===============================================================================
-
-POINT TESTING IN HULLS
-
-===============================================================================
-*/
-
-/*
-============
-SV_TestEntityPosition
-
-This could be a lot more efficient...
-============
-*/
-int SV_TestEntityPosition (prvm_edict_t *ent)
-{
-       return SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, MOVE_NORMAL, ent).startsolid;
-}
-
-
 /*
 ===============================================================================
 
@@ -438,7 +417,6 @@ trace_t SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t
        model_t *model = NULL;
        matrix4x4_t matrix, imatrix;
        float tempnormal[3], starttransformed[3], endtransformed[3];
-       float starttransformedmins[3], starttransformedmaxs[3], endtransformedmins[3], endtransformedmaxs[3];
 
        memset(&trace, 0, sizeof(trace));
        trace.fraction = trace.realfraction = 1;
@@ -495,11 +473,7 @@ trace_t SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t
                int frame;
                frame = (int)ent->fields.server->frame;
                frame = bound(0, frame, (model->numframes - 1));
-               VectorAdd(starttransformed, maxs, starttransformedmaxs);
-               VectorAdd(endtransformed, maxs, endtransformedmaxs);
-               VectorAdd(starttransformed, mins, starttransformedmins);
-               VectorAdd(endtransformed, mins, endtransformedmins);
-               model->TraceBox(model, frame, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, hitsupercontents);
+               model->TraceBox(model, frame, &trace, starttransformed, mins, maxs, endtransformed, hitsupercontents);
        }
        else
                Collision_ClipTrace_Box(&trace, ent->fields.server->mins, ent->fields.server->maxs, starttransformed, mins, maxs, endtransformed, hitsupercontents, SUPERCONTENTS_SOLID);
@@ -527,14 +501,9 @@ SV_ClipMoveToWorld
 trace_t SV_ClipMoveToWorld(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents)
 {
        trace_t trace;
-       float starttransformedmins[3], starttransformedmaxs[3], endtransformedmins[3], endtransformedmaxs[3];
        memset(&trace, 0, sizeof(trace));
        trace.fraction = trace.realfraction = 1;
-       VectorAdd(start, maxs, starttransformedmaxs);
-       VectorAdd(end, maxs, endtransformedmaxs);
-       VectorAdd(start, mins, starttransformedmins);
-       VectorAdd(end, mins, endtransformedmins);
-       sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, hitsupercontents);
+       sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, start, mins, maxs, end, hitsupercontents);
        trace.fraction = bound(0, trace.fraction, 1);
        trace.realfraction = bound(0, trace.realfraction, 1);
        VectorLerp(start, trace.fraction, end, trace.endpos);