fix for EF_FLAME and lots of other bugs with 16bit/8bit fields (modelindex, frame...

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 3b331b92724afbee291897b4eab66ea4a58667b7..d8d092ff3a745e5cfec99cf500a5a5b6237a8e8e 100644 (file)
--- a/world.c
+++ b/world.c
@@ -125,19 +125,18 @@ void SV_InitBoxHull (void)
        for (i=0 ; i<6 ; i++)
        {
                box_clipnodes[i].planenum = i;
-               
+
                side = i&1;
-               
+
                box_clipnodes[i].children[side] = CONTENTS_EMPTY;
                if (i != 5)
                        box_clipnodes[i].children[side^1] = i + 1;
                else
                        box_clipnodes[i].children[side^1] = CONTENTS_SOLID;
-               
+
                box_planes[i].type = i>>1;
                box_planes[i].normal[i>>1] = 1;
        }
-
 }
 
 
@@ -418,7 +417,7 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
 
        if (ent->area.prev)
                SV_UnlinkEdict (ent);   // unlink from old position
-               
+
        if (ent == sv.edicts)
                return;         // don't add the world
 
@@ -999,7 +998,7 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e
        clip.trace = SV_ClipMoveToEntity (sv.edicts, start, mins, maxs, end);
 
        // clip to entities
-       if (!clip.trace.allsolid)
+       //if (!clip.trace.allsolid)
        {
                // create the bounding box of the entire move
                SV_MoveBounds ( start, clip.mins2, clip.maxs2, end, clip.boxmins, clip.boxmaxs );