Dynamic HUD: hard limit effect scale

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index 7a526c7ab1f60e225542c1e472bf5a366486ce10..e5606ed7979797dbe5e1bfe418bb9c633234a3f0 100644 (file)
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -469,10 +469,12 @@ bool Hud_Shake_Update()
                return false;
 
        float f = elapsed_time - i;
-       hud_dynamic_shake_ofs.x = ((1 - f) * hud_dynamic_shake_x[i] + f * hud_dynamic_shake_x[i+1]) * vid_conwidth * 0.27;
-       hud_dynamic_shake_ofs.y = ((1 - f) * hud_dynamic_shake_y[i] + f * hud_dynamic_shake_y[i+1]) * vid_conheight * 0.27;
-       hud_dynamic_shake_ofs.z = 0;
-       hud_dynamic_shake_ofs *= hud_dynamic_shake_factor * autocvar_hud_dynamic_shake_scale;
+       hud_dynamic_shake_realofs.x = (1 - f) * hud_dynamic_shake_x[i] + f * hud_dynamic_shake_x[i+1];
+       hud_dynamic_shake_realofs.y = (1 - f) * hud_dynamic_shake_y[i] + f * hud_dynamic_shake_y[i+1];
+       hud_dynamic_shake_realofs.z = 0;
+       hud_dynamic_shake_realofs *= hud_dynamic_shake_factor * autocvar_hud_dynamic_shake_scale;
+       hud_dynamic_shake_realofs.x = bound(-0.1, hud_dynamic_shake_realofs.x, 0.1) * vid_conwidth;
+       hud_dynamic_shake_realofs.y = bound(-0.1, hud_dynamic_shake_realofs.y, 0.1) * vid_conheight;
        return true;
 }
 
@@ -490,6 +492,9 @@ void Hud_Dynamic_Frame()
        if (fabs(hud_dynamic_ofs.x) < 0.001) hud_dynamic_ofs.x = 0;
        if (fabs(hud_dynamic_ofs.y) < 0.001) hud_dynamic_ofs.y = 0;
        if (fabs(hud_dynamic_ofs.z) < 0.001) hud_dynamic_ofs.z = 0;
+       hud_dynamic_ofs.x = bound(-0.1, hud_dynamic_ofs.x, 0.1);
+       hud_dynamic_ofs.y = bound(-0.1, hud_dynamic_ofs.y, 0.1);
+       hud_dynamic_ofs.z = bound(-0.1, hud_dynamic_ofs.z, 0.1);
 
        float health = STAT(HEALTH);
        if(autocvar_hud_dynamic_shake > 0 && !autocvar__hud_configure && health > 0)

diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh
index 4a3c1f4e3a88b136486ce27912252b4206b23689..2824dc205f943ccac195888ad4e1fab72fea4e92 100644 (file)
--- a/qcsrc/client/hud/hud.qh
+++ b/qcsrc/client/hud/hud.qh
@@ -149,7 +149,7 @@ float current_player;
 float autocvar_hud_dynamic_follow;
 float autocvar_hud_dynamic_follow_scale;
 
-vector hud_dynamic_shake_ofs;
+vector hud_dynamic_shake_realofs;
 float hud_dynamic_shake_factor;
 float hud_dynamic_shake_time;
 
@@ -397,7 +397,7 @@ REGISTER_HUD_PANEL(QUICKMENU,       HUD_QuickMenu,      quickmenu,      PANEL_CO
                panel_bg_padding = panel.current_panel_bg_padding;                                                          \
                panel_fg_alpha = panel.current_panel_fg_alpha * hud_fade_alpha;                                             \
        }                                                                                                               \
-       if(hud_dynamic_shake_factor > 0) panel_pos += hud_dynamic_shake_ofs; \
+       if(hud_dynamic_shake_factor > 0) panel_pos += hud_dynamic_shake_realofs; \
        if(hud_dynamic_ofs.y) panel_pos.x += hud_dynamic_ofs.y * vid_conwidth; \
        if(hud_dynamic_ofs.z) panel_pos.y += hud_dynamic_ofs.z * vid_conheight; \
        if(hud_dynamic_ofs.x) { \