Merge branch 'Mario/hlac_sound_fix' into 'master'
authorLegendaryGuard <rootuser999@gmail.com>
Sat, 2 Jul 2022 21:04:48 +0000 (21:04 +0000)
committerLegendaryGuard <rootuser999@gmail.com>
Sat, 2 Jul 2022 21:04:48 +0000 (21:04 +0000)
Merge branch Mario/hlac_sound_fix (S merge request)

See merge request xonotic/xonotic-data.pk3dir!1040

qcsrc/client/announcer.qc
qcsrc/client/hud/panel/centerprint.qc
qcsrc/client/hud/panel/centerprint.qh
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/scoreboard.qh
qcsrc/client/main.qh
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/nades/nades.qc

index d46595e8718bde0a2007fb276a6e54ab6b49d7ca..e15bc23b7e23c62251f9af84547d070bb3accc5a 100644 (file)
@@ -42,7 +42,7 @@ void Announcer_Duel()
        strcpy(prev_pl2_name, pl2_name);
 
        // There are new duelers, update title
-       centerprint_SetDuelTitle(pl1_name, pl2_name, _("vs"));
+       centerprint_SetDuelTitle(pl1_name, pl2_name);
 }
 
 void Announcer_ClearTitle()
index 1af0e330147c68176e7a4af911c2037fd18e5adb..e5144bd74d7c8d7c0da2f0faab64122cab22ba74 100644 (file)
@@ -151,11 +151,11 @@ void centerprint_KillAll()
        }
 }
 
-void centerprint_SetDuelTitle(string left, string right, string div)
+void centerprint_SetDuelTitle(string left, string right)
 {
-       strcpy(centerprint_title_left, left);
-       strcpy(centerprint_title_right, right);
-       centerprint_SetTitle(sprintf("^BG%s^BG  %s  %s", left, div, right));
+       float namesize = autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x;
+       strcpy(centerprint_title_left, textShortenToWidth(left, namesize, hud_fontsize, stringwidth_colors));
+       strcpy(centerprint_title_right, textShortenToWidth(right, namesize, hud_fontsize, stringwidth_colors));
 }
 
 void centerprint_SetTitle(string title)
@@ -267,25 +267,67 @@ void HUD_CenterPrint()
        align = bound(0, autocvar_hud_panel_centerprint_align, 1);
 
        // Show title if available
-       if(centerprint_title) {
+       if(centerprint_title != "" || centerprint_title_left != "") {
                vector fontsize = cp_fontsize * autocvar_hud_panel_centerprint_fontscale_title;
-               float width = stringwidth(centerprint_title, true, fontsize);
-
-               pos.x = panel_pos.x + (panel_size.x - width) * align;
+               float width = 0, right_width = 0, left_width = 0,  max_rl_width = 0;
+               if (centerprint_title != "")
+               {
+                       width = stringwidth(centerprint_title, true, fontsize);
+               }
+               else
+               {
+                       right_width = stringwidth(centerprint_title_right, true, fontsize);
+                       left_width = stringwidth(centerprint_title_left, true, fontsize);
+               }
 
                if (autocvar_hud_panel_centerprint_flip)
                        pos.y -= fontsize.y;
-               if (centerprint_title_left != "" && align == 0.5) // Center line at the main word (for duels)
-                       pos.x += (stringwidth(centerprint_title_right, true, fontsize) - stringwidth(centerprint_title_left, true, fontsize)) / 2;
 
-               drawcolorcodedstring(pos, centerprint_title, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+               vector duel_title_pos = '0 0 0';
+               float padding = stringwidth(" ", false, fontsize) * 2;
+               if (centerprint_title_left != "")
+               {
+                       if (left_width > right_width)
+                               max_rl_width = left_width;
+                       else
+                               max_rl_width = right_width;
+
+                       width = max_rl_width * 2 + padding * 6 + stringwidth(_("vs"), false, fontsize);
+                       pos.x += (panel_size.x - width) * align;
+                       duel_title_pos = pos;
+
+                       pos.x += padding;
+                       if (left_width < right_width)
+                               pos.x += (max_rl_width - left_width) * 0.5;
+                       drawcolorcodedstring(pos, centerprint_title_left, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+
+                       pos.x = duel_title_pos.x + max_rl_width + padding * 3;
+                       drawstring(pos, _("vs"), fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+
+                       pos.x = duel_title_pos.x + width - padding - max_rl_width;
+                       if (left_width >= right_width)
+                               pos.x += (max_rl_width - right_width) * 0.5;
+                       drawcolorcodedstring(pos, centerprint_title_right, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+               }
+               else
+               {
+                       pos.x = panel_pos.x + (panel_size.x - width) * align;
+                       drawcolorcodedstring(pos, centerprint_title, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+               }
 
                if (autocvar_hud_panel_centerprint_flip)
                        pos.y -= cp_fontsize.y * CENTERPRINT_TITLE_SPACING;
                else
                        pos.y += fontsize.y + (hud_fontsize.y * CENTERPRINT_TITLE_SPACING);
 
-               drawfill(pos, vec2(width, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               if (centerprint_title_left != "")
+               {
+                       pos.x = duel_title_pos.x;
+                       drawfill(pos, vec2(max_rl_width + padding * 2, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawfill(pos + vec2(width - max_rl_width - padding * 2, 0), vec2(max_rl_width + padding * 2, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               }
+               else
+                       drawfill(pos, vec2(width, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 
                if (autocvar_hud_panel_centerprint_flip)
                        pos.y -= cp_fontsize.y * CENTERPRINT_TITLE_SPACING;
index 02a046a6a140015eae8167254f1ff670e2354854..98f268b3456570268cde81205dc700b609d58ca2 100644 (file)
@@ -23,6 +23,6 @@ void centerprint_AddStandard(string strMessage);
 void centerprint_Kill(int id);
 void centerprint_KillAll();
 
-void centerprint_SetDuelTitle(string left, string right, string div);
+void centerprint_SetDuelTitle(string left, string right);
 void centerprint_SetTitle(string title);
 void centerprint_ClearTitle();
index 01df92c4b4d14e8a08bdb6f931ad5a60d79a76eb..99dbfece70e019f905a0f8d6fd02513abbff8aaa 100644 (file)
@@ -80,7 +80,6 @@ float autocvar_hud_panel_scoreboard_table_highlight_alpha = 0.2;
 float autocvar_hud_panel_scoreboard_table_highlight_alpha_self = 0.4;
 float autocvar_hud_panel_scoreboard_table_highlight_alpha_eliminated = 0.6;
 float autocvar_hud_panel_scoreboard_bg_teams_color_team = 0;
-float autocvar_hud_panel_scoreboard_namesize = 15;
 float autocvar_hud_panel_scoreboard_team_size_position = 0;
 float autocvar_hud_panel_scoreboard_spectators_position = 1;
 
index cd43b341ec78ab041ab7a04db67b1135decb7a64..2989b54b0108572c014040f3a2975bd21c3edc2c 100644 (file)
@@ -3,6 +3,7 @@
 
 bool autocvar_cl_deathscoreboard;
 string autocvar_scoreboard_columns;
+float autocvar_hud_panel_scoreboard_namesize = 15;
 
 bool scoreboard_showscores;
 
index 7be53f6dee116b558d6a14a931c7aee72bf5d991..a2b0fe31c962c70277b5e6987eda31e997df5a3a 100644 (file)
@@ -123,7 +123,6 @@ bool vote_waiting_for_me;
 
 float current_zoomfraction;
 
-int cs_project_is_b0rked;
 int vid_width, vid_height;
 float vid_pixelheight;
 
index 530324656373d1346762879984b5473795df5af5..5f95d4f77a7645c9803eb13c0c4820b472e3ae29 100644 (file)
@@ -359,11 +359,6 @@ STATIC_INIT(viewmodel) {
 vector project_3d_to_2d(vector vec)
 {
        vec = cs_project(vec);
-       if(cs_project_is_b0rked > 0)
-       {
-               vec.x *= vid_conwidth / vid_width;
-               vec.y *= vid_conheight / vid_height;
-       }
        return vec;
 }
 
@@ -1726,34 +1721,6 @@ void CSQC_UpdateView(entity this, float w, float h)
                NextFrameCommand = string_null;
        }
 
-       // we must do this check AFTER a frame was rendered, or it won't work
-       if(cs_project_is_b0rked == 0)
-       {
-               string w0, h0;
-               w0 = ftos(autocvar_vid_conwidth);
-               h0 = ftos(autocvar_vid_conheight);
-               //setproperty(VF_VIEWPORT, '0 0 0', '640 480 0');
-               //setproperty(VF_FOV, '90 90 0');
-               setproperty(VF_ORIGIN, '0 0 0');
-               setproperty(VF_ANGLES, '0 0 0');
-               setproperty(VF_PERSPECTIVE, 1);
-               vector forward, right, up;
-               MAKE_VECTORS('0 0 0', forward, right, up);
-               vector v1, v2;
-               cvar_set("vid_conwidth", "800");
-               cvar_set("vid_conheight", "600");
-               v1 = cs_project(forward);
-               cvar_set("vid_conwidth", "640");
-               cvar_set("vid_conheight", "480");
-               v2 = cs_project(forward);
-               if(v1 == v2)
-                       cs_project_is_b0rked = 1;
-               else
-                       cs_project_is_b0rked = -1;
-               cvar_set("vid_conwidth", w0);
-               cvar_set("vid_conheight", h0);
-       }
-
        HUD_Mouse(local_player);
 
        cl_notice_run();
index 5ea4cb49cfb9a4d4deb6802d8bf8e82d1cad3491..2d0a234098fefe2b6b5a6eb979103cb9bf6c6e31 100644 (file)
@@ -675,9 +675,13 @@ void nade_heal_boom(entity this)
 
 void nade_monster_boom(entity this)
 {
+       if(!autocvar_g_monsters)
+               return;
        entity e = spawn();
        e.noalign = true; // don't drop to floor
        e = spawnmonster(e, this.pokenade_type, MON_Null, this.realowner, this.realowner, this.origin, false, false, 1);
+       if(!e)
+               return; // monster failed to be spawned
 
        if(autocvar_g_nades_pokenade_monster_lifetime > 0)
                e.monster_lifetime = time + autocvar_g_nades_pokenade_monster_lifetime;
@@ -732,6 +736,11 @@ void nade_boom(entity this)
                        nade_blast = false;
                        break;
                case NADE_TYPE_MONSTER:
+                       if(!autocvar_g_monsters)
+                       {
+                               expef = EFFECT_NADE_EXPLODE(this.realowner.team);
+                               break; // fall back to a standard nade explosion
+                       }
                case NADE_TYPE_SPAWN:
                        nade_blast = false;
                        switch(this.realowner.team)