Use a tracebox to simplify sentry location

Author: drzel

csqc/main.qc

@@ -230,7 +230,7 @@ void adjustEntityAboveGround(entity ent) {
     tracebox(startPos, ent.mins, ent.maxs, endPos, MOVE_NORMAL, ent);
 
     // Move the entity up to be 1 unit above the ground
-    ent.origin[2] = trace_endpos[2] - (ent.mins[2] - ent.maxs[2]) + 1; // 1 unit above the ground
+    ent.origin[2] = trace_endpos[2] + 1; // 1 unit above the ground
 }
 
 noref void(float width, float height, float menushown) CSQC_UpdateView = {
@@ -265,7 +265,7 @@ noref void(float width, float height, float menushown) CSQC_UpdateView = {
         v_forward_sentry.y = xy_pos.y;
 
         sentry_preview.origin = PM_Org() + v_forward_sentry;
-        adjustEntityAboveGround(sentry_preview);
+        /* adjustEntityAboveGround(sentry_preview); */
         sentry_preview_range_sphere.origin = sentry_preview.origin;
         sentry_preview.angles_y = anglemod(view_angles_y + sentry_preview_offset);
     } else {
@@ -879,7 +879,7 @@ void _Sync_ServerCommandFrame() {
 
     if (previewing_sentry) {
         if (game_state.is_alive) {
-            sentry_fits = CheckArea(sentry_preview, player_localentnum);
+            sentry_fits = CheckArea(sentry_preview, edict_num(player_localentnum));
             sentry_preview.colormod = sentry_fits ? '1 1 1' : '0.5 0.2 0.2';
         } else {
             SentryPreviewStop();

share/engineer.qc

@@ -1,59 +1,12 @@
-float (entity obj, float builder) CheckArea = {
-    local vector src;
-    local vector end;
-    local float pos;
-    local entity te;
+float (entity obj, entity builder) CheckArea = {
+    vector start, end;
+    start = obj.origin;
+    end = start;
+    tracebox(start, obj.mins, obj.maxs, end, MOVE_NORMAL, builder);
 
-    pos = pointcontents(obj.origin);
-    if ((pos == CONTENT_SOLID) || (pos == CONTENT_SKY)) {
+    if (trace_inopen) {
+        return (1);
+    } else {
         return (0);
     }
-    src_x = (obj.origin_x) + 24;
-    src_y = (obj.origin_y) + 24;
-    src_z = (obj.origin_z);
-    pos = pointcontents(src);
-    if ((pos == CONTENT_SOLID) || (pos == CONTENT_SKY)) {
-        return (0);
-    }
-    end_x = (obj.origin_x) - 16;
-    end_y = (obj.origin_y) - 16;
-    end_z = (obj.origin_z);
-    traceline(src, end, 1, obj);
-    if (trace_fraction != 1) {
-        return (0);
-    }
-    pos = pointcontents(end);
-    if ((pos == CONTENT_SOLID) || (pos == CONTENT_SKY)) {
-        return (0);
-    }
-    src_x = (obj.origin_x) - 16;
-    src_y = (obj.origin_y) + 16;
-    src_z = (obj.origin_z);
-    pos = pointcontents(src);
-    if ((pos == CONTENT_SOLID) || (pos == CONTENT_SKY)) {
-        return (0);
-    }
-    end_x = (obj.origin_x) + 16;
-    end_y = (obj.origin_y) - 16;
-    end_z = (obj.origin_z);
-    traceline(src, end, 1, obj);
-    if (trace_fraction != 1) {
-        return (0);
-    }
-    pos = pointcontents(end);
-    if ((pos == CONTENT_SOLID) || (pos == CONTENT_SKY)) {
-        return (0);
-    }
-    /* traceline(builder.origin, obj.origin, 1, builder); */
-    /* if (trace_fraction != 1) { */
-    /*     return (0); */
-    /* } */
-
-    te = findradius(obj.origin, 64);
-    if (te != world) {
-        if !(te.movetype == MOVETYPE_WALK && builder && num_for_edict(te.owner) == builder) {
-            return (0);
-        }
-    }
-    return (1);
 };

ssqc/engineer.qc

@@ -612,7 +612,7 @@ void (float objtobuild, float offset) TeamFortress_Build = {
         self.sentry_ticks = 0;
     }
 
-    if (!CheckArea(newmis, 0)) {
+    if (!CheckArea(newmis, self)) {
         sprint(self, PRINT_HIGH, "You can't build here\n");
         dremove(newmis);
         return;