Merge branch 'build-better' into staging

Author: drzel

csqc/main.qc

@@ -897,7 +897,7 @@ void _Sync_ServerCommandFrame() {
 
     if (previewing_sentry) {
         if (game_state.is_alive) {
-            sentry_fits = CheckArea(sentry_preview);
+            sentry_fits = CheckArea(sentry_preview, player_localentnum);
             sentry_preview.colormod = sentry_fits ? '1 1 1' : '0.5 0.2 0.2';
         } else {
             SentryPreviewStop();

share/engineer.qc

@@ -1,4 +1,4 @@
-float (entity obj) CheckArea = {
+float (entity obj, float builder) CheckArea = {
     local vector src;
     local vector end;
     local float pos;
@@ -51,7 +51,9 @@ float (entity obj) CheckArea = {
 
     te = findradius(obj.origin, 64);
     if (te != world) {
-        return (0);
+        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)) {
+    if (!CheckArea(newmis, 0)) {
         sprint(self, PRINT_HIGH, "You can't build here\n");
         dremove(newmis);
         return;