+Added Urre's game, "Strap-on-bomb Car"

[xonotic/darkplaces.git] / model_brush.c

diff --git a/model_brush.c b/model_brush.c
index d371c7df90bf059c08341369b73c0cb98fd65e52..2b22592ae11302f5490f9765eb3f4fe584082f56 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -1578,7 +1578,9 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
                        // LordHavoc: HL sky textures are entirely different than quake
                        if (!loadmodel->brush.ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == mtheight * 2)
                        {
-                               data = loadimagepixelsbgra(tx->name, false, false, r_texture_convertsRGB_skin.integer);
+                               data = loadimagepixelsbgra(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), false, false, r_texture_convertsRGB_skin.integer);
+                               if (!data)
+                                       data = loadimagepixelsbgra(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), false, false, r_texture_convertsRGB_skin.integer);
                                if (data && image_width == image_height * 2)
                                {
                                        R_Q1BSP_LoadSplitSky(data, image_width, image_height, 4);
@@ -5758,7 +5760,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
        vec_t backdist1;
        vec_t backdist2;
        vec_t backfrac;
-       vec3_t clipped[2];
+       vec3_t clipped, newstart, newend;
 #endif
        vec3_t segmentmins;
        vec3_t segmentmaxs;
@@ -5823,8 +5825,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START end START END
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[0]);
-                       start = clipped[0];
+                       VectorLerp(start, frontfrac, end, newstart); start = newstart;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5838,8 +5839,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 #ifdef BIHLINECLIP
                        // start END START END
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[0]);
-                       end = clipped[0];
+                       VectorLerp(start, frontfrac, end, newend); end = newend;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5857,8 +5857,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #ifdef BIHLINECLIP
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       end = clipped[0];
+                       VectorLerp(start, backfrac, end, newend); end = newend;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5872,11 +5871,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START end start END
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped[1], end, linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped, end, linestart, lineend);
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       end = clipped[0];
+                       VectorLerp(start, backfrac, end, newend); end = newend;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5892,11 +5890,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // start END start END
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped[1], linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped, linestart, lineend);
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       end = clipped[0];
+                       VectorLerp(start, backfrac, end, newend); end = newend;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5912,8 +5909,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START END start END
 #ifdef BIHLINECLIP
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       end = clipped[0];
+                       VectorLerp(start, backfrac, end, newend); end = newend;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5928,8 +5924,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #ifdef BIHLINECLIP
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       start = clipped[0];
+                       VectorLerp(start, backfrac, end, newstart); start = newstart;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5943,11 +5938,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START end START end
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped[1], end, linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped, end, linestart, lineend);
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       start = clipped[0];
+                       VectorLerp(start, backfrac, end, newstart); start = newstart;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5963,11 +5957,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // start END START end
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped[1], linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped, linestart, lineend);
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       start = clipped[0];
+                       VectorLerp(start, backfrac, end, newstart); start = newstart;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5983,8 +5976,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START END START end
 #ifdef BIHLINECLIP
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       start = clipped[0];
+                       VectorLerp(start, backfrac, end, newstart); start = newstart;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -6003,8 +5995,8 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START end start end
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped[1], end, linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped, end, linestart, lineend);
 #else
                        Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #endif
@@ -6014,8 +6006,8 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // start END start end
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped[1], linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped, linestart, lineend);
 #else
                        Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #endif