Merge branch 'build-better' into staging

Author: drzel

csqc/input.qc

@@ -4,15 +4,6 @@ void FO_Menu_Game(float);
 // TRUE --> capture input
 // FALSE --> pass input on
 float(float evtype, float scanx, float chary, float devid) CSQC_InputEvent = {
-    switch (evtype)
-    {
-        case IE_MOUSEDELTA:
-            if (previewing_sentry) {
-                sentry_preview.angles_y = anglemod(input_angles_y + (sentry_preview_offset + 180));
-            }
-        default:
-    }
-
     if (fo_hud_editor || fo_hud_menu_active) {
         sui_input_event(evtype, scanx, chary, devid);
         float menu_mouse = (fo_hud_menu_active && (CurrentMenu.flags & FO_MENU_FLAG_USE_MOUSE));

csqc/main.qc

@@ -18,8 +18,6 @@ float CalculateWaterLevel();
 void RenderHitTexts();
 entity sentry_preview;
 entity sentry_preview_range_sphere;
-entity temp_sentry;
-entity temp_self;
 float sentry_preview_offset;
 float previewing_sentry;
 float prevent_firing;
@@ -29,27 +27,6 @@ void GetSelf() = {
     self = findfloat(world, entnum, player_localentnum);
 }
 
-/* vector AnglesToVector(vector angles) { */
-/*     float pitch, yaw, roll; */
-/*     vector dir; */
-
-/*     pitch = angles_x * (M_PI / 180.0); */
-/*     yaw = angles_y * (M_PI / 180.0); */
-/*     roll = angles_z * (M_PI / 180.0); */
-
-/*     dir_x = cos(yaw) * cos(pitch); */
-/*     dir_y = sin(yaw) * cos(pitch); */
-/*     dir_z = -sin(pitch); */
-
-/*     return dir; */
-/* } */
-
-/* vector GetNewPosition(entity ent, vector angle_offsets, float distance) { */
-/*     vector dir = AnglesToVector(ent.angles + angle_offsets); */
-/*     vector new_position = ent.origin + dir * distance; */
-/*     return new_position; */
-/* } */
-
 void PushToSlotHistory(float value) {
     if (slot_history_top >= MAX_SLOT_HISTORY_SIZE) {
         // Stack is full
@@ -211,9 +188,6 @@ noref void(float apiver, string enginename, float enginever) CSQC_Init = {
 
     pengine.view_mask = MASK_VIEWMODEL;  // Start with engine models.
 
-    temp_sentry = spawn();
-    temp_self = spawn();
-
     precache_model("progs/turrpreview.mdl");
     sentry_preview = spawn();
     setmodel(sentry_preview, "progs/turrpreview.mdl");
@@ -268,23 +242,16 @@ noref void(float width, float height, float menushown) CSQC_UpdateView = {
 
     if (previewing_sentry) {
         makevectors(view_angles);
-
-        // can probably use trig here so we don't need to normalize twice
-        local vector z_pos;
-        z_pos.z = (normalize(v_forward) * 64).z;
+        local vector v_forward_sentry;
+        v_forward_sentry.z = (normalize(v_forward) * 64).z;
         v_forward_z = 0;
         local vector xy_pos = normalize(v_forward) * 64;
-
-        local vector v_forward_sentry;
         v_forward_sentry.x = xy_pos.x;
         v_forward_sentry.y = xy_pos.y;
-        v_forward_sentry.z = z_pos.z;
 
         sentry_preview.origin = PM_Org() + v_forward_sentry;
-        setorigin(temp_self, sentry_preview.origin);
-        temp_sentry.origin = sentry_preview.origin;
-        local vector v_forward_range = normalize(v_forward) * 1024;
         sentry_preview_range_sphere.origin = sentry_preview.origin;
+        sentry_preview.angles_y = anglemod(view_angles_y + sentry_preview_offset);
     } else {
         setproperty(VF_DRAWCROSSHAIR, 1);       // we want to draw our crosshair!
     }
@@ -336,8 +303,8 @@ noref float(string cmd) CSQC_ConsoleCommand = {
                     break;
                 case PC_ENGINEER:
                     if (previewing_sentry) {
-                        sentry_preview.angles_y -= 15;
-                        sentry_preview_offset -= 15;
+                        anglemod(sentry_preview.angles_y -= 15);
+                        anglemod(sentry_preview_offset -= 15);
                     } else {
                         localcmd("cmd sentry rotate 15\n");
                     }
@@ -351,8 +318,8 @@ noref float(string cmd) CSQC_ConsoleCommand = {
                     break;
                 case PC_ENGINEER:
                     if (previewing_sentry) {
-                        sentry_preview.angles_y += 15;
-                        sentry_preview_offset += 15;
+                        anglemod(sentry_preview.angles_y += 15);
+                        anglemod(sentry_preview_offset += 15);
                     } else {
                         localcmd("cmd sentry rotate -15\n");
                     }
@@ -745,7 +712,7 @@ void FO_ApplyCussInput() {
 void PM_InputFrame();
 
 void SentryPreviewStart() {
-    sentry_preview_offset = 180;
+    sentry_preview_offset = 0;
     sentry_preview.angles_y = input_angles_y;
     sentry_preview.drawmask = MASK_ENGINE;
 
@@ -810,7 +777,7 @@ noref void CSQC_Input_Frame() {
             if (previewing_sentry) {
                 if (keydowns & BUTTON0) {
                     if (sentry_fits) {
-                        localcmd(sprintf("cmd build sentry %f\n", sentry_preview_offset));
+                        localcmd(sprintf("cmd build sentry %f\n", anglemod(180 + sentry_preview_offset)));
                         SentryPreviewStop();
                     } else {
                         print("Can't build here\n");
@@ -903,13 +870,14 @@ void _Sync_ServerCommandFrame() {
     CsGrenTimer::UpdateSoundStack();
     UpdateTeamColorCrosshair();
 
-    if (!game_state.is_alive) {
-        if (previewing_sentry)
+    if (previewing_sentry) {
+        if (game_state.is_alive) {
+            sentry_fits = CheckArea(sentry_preview);
+            sentry_preview.colormod = sentry_fits ? '1 1 1' : '0.5 0.2 0.2';
+        } else {
             SentryPreviewStop();
+        }
     }
-
-    sentry_fits = CheckArea(temp_sentry, temp_self);
-    sentry_preview.colormod = sentry_fits ? '1 1 1' : '1 0.5 0.5';
 }
 
 

share/engineer.qc

@@ -1,4 +1,4 @@
-float (entity obj, entity builder) CheckArea = {
+float (entity obj) CheckArea = {
     local vector src;
     local vector end;
     local float pos;
@@ -8,16 +8,16 @@ float (entity obj, entity builder) CheckArea = {
     if ((pos == CONTENT_SOLID) || (pos == CONTENT_SKY)) {
         return (0);
     }
-    src_x = (obj.origin_x + obj.maxs_x) + 24;
-    src_y = (obj.origin_y + obj.maxs_y) + 24;
-    src_z = (obj.origin_z + obj.maxs_z);
+    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 + obj.mins_x) - 16;
-    end_y = (obj.origin_y + obj.mins_y) - 16;
-    end_z = (obj.origin_z + obj.mins_z);
+    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);
@@ -26,16 +26,16 @@ float (entity obj, entity builder) CheckArea = {
     if ((pos == CONTENT_SOLID) || (pos == CONTENT_SKY)) {
         return (0);
     }
-    src_x = (obj.origin_x + obj.mins_x) - 16;
-    src_y = (obj.origin_y + obj.maxs_y) + 16;
-    src_z = (obj.origin_z + obj.maxs_z);
+    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 + obj.maxs_x) + 16;
-    end_y = (obj.origin_y + obj.mins_y) - 16;
-    end_z = (obj.origin_z + obj.mins_z);
+    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);
@@ -48,6 +48,7 @@ float (entity obj, entity builder) CheckArea = {
     /* if (trace_fraction != 1) { */
     /*     return (0); */
     /* } */
+
     te = findradius(obj.origin, 64);
     if (te != world) {
         return (0);

ssqc/engineer.qc

@@ -533,7 +533,6 @@ void () TeamFortress_EngineerBuildStop = {
     }
 }
 
-// here
 void (float objtobuild, float offset) TeamFortress_Build = {
     if (cb_prematch) {
         sprint(self, PRINT_MEDIUM, "You cannot build during prematch\n");
@@ -560,15 +559,12 @@ void (float objtobuild, float offset) TeamFortress_Build = {
     /* v_forward = normalize(v_forward) * 64; */
     /* newmis.origin = self.origin + v_forward; */
 
-    local vector z_pos;
-    z_pos.z = (normalize(v_forward) * 64).z;
+    local vector v_forward_sentry;
+    v_forward_sentry.z = (normalize(v_forward) * 64).z;
     v_forward_z = 0;
     local vector xy_pos = normalize(v_forward) * 64;
-
-    local vector v_forward_sentry;
     v_forward_sentry.x = xy_pos.x;
     v_forward_sentry.y = xy_pos.y;
-    v_forward_sentry.z = z_pos.z;
 
     newmis.origin = self.origin + v_forward_sentry;
 
@@ -616,7 +612,7 @@ void (float objtobuild, float offset) TeamFortress_Build = {
         self.sentry_ticks = 0;
     }
 
-    if (CheckArea(newmis, self) == 0) {
+    if (!CheckArea(newmis)) {
         sprint(self, PRINT_HIGH, "You can't build here\n");
         dremove(newmis);
         return;