From a1338c3de8d2613ba82d89921630df1ae7b183d0 Mon Sep 17 00:00:00 2001 From: TerminalHash Date: Sat, 18 Sep 2021 15:04:27 +0300 Subject: [PATCH] added some new msgs for friendlyfire options --- src/game/g_game.pas | 6 +++--- src/game/g_language.pas | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/game/g_game.pas b/src/game/g_game.pas index a2dacb9..2c8ae0f 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -5517,15 +5517,15 @@ begin end else if cmd = 'g_friendly_absorb_damage' then begin - ParseGameFlag(GAME_OPTION_TEAMABSORBDAMAGE, I_MSG_FRIENDLY_FIRE_OFF, I_MSG_FRIENDLY_FIRE_ON); + ParseGameFlag(GAME_OPTION_TEAMABSORBDAMAGE, I_MSG_FRIENDLY_ABSORB_DAMAGE_OFF, I_MSG_FRIENDLY_ABSORB_DAMAGE_ON); end else if cmd = 'g_friendly_hit_trace' then begin - ParseGameFlag(GAME_OPTION_TEAMHITTRACE, I_MSG_FRIENDLY_FIRE_OFF, I_MSG_FRIENDLY_FIRE_ON); + ParseGameFlag(GAME_OPTION_TEAMHITTRACE, I_MSG_FRIENDLY_HIT_TRACE_OFF, I_MSG_FRIENDLY_HIT_TRACE_ON); end else if cmd = 'g_friendly_hit_projectile' then begin - ParseGameFlag(GAME_OPTION_TEAMHITPROJECTILE, I_MSG_FRIENDLY_FIRE_OFF, I_MSG_FRIENDLY_FIRE_ON); + ParseGameFlag(GAME_OPTION_TEAMHITPROJECTILE, I_MSG_FRIENDLY_PROJECT_TRACE_OFF, I_MSG_FRIENDLY_PROJECT_TRACE_ON); end else if cmd = 'g_weaponstay' then begin diff --git a/src/game/g_language.pas b/src/game/g_language.pas index f7b553c..b58ff34 100644 --- a/src/game/g_language.pas +++ b/src/game/g_language.pas @@ -574,6 +574,12 @@ type I_MSG_GAMEMODE_CHANGE, I_MSG_FRIENDLY_FIRE_ON, I_MSG_FRIENDLY_FIRE_OFF, + I_MSG_FRIENDLY_PROJECT_TRACE_ON, + I_MSG_FRIENDLY_PROJECT_TRACE_OFF, + I_MSG_FRIENDLY_HIT_TRACE_ON, + I_MSG_FRIENDLY_HIT_TRACE_OFF, + I_MSG_FRIENDLY_ABSORB_DAMAGE_ON, + I_MSG_FRIENDLY_ABSORB_DAMAGE_OFF, I_MSG_WEAPONSTAY_ON, I_MSG_WEAPONSTAY_OFF, I_MSG_ALLOWEXIT_ON, @@ -1715,6 +1721,18 @@ const 'Óðîí ñâîèõ âêëþ÷¸í'), ('MSG FRIENDLY FIRE OFF', 'Friendly Fire disabled', 'Óðîíà ñâîèõ íåò'), + ('MSG FRIENDLY PROJECT TRACE ON', 'Projectile tracing enabled', + 'Ñíàðÿäû áóäóò ïðîõîäèòü ñêâîçü òèììåéòîâ'), + ('MSG FRIENDLY PROJECT TRACE OFF', 'Projectile tracing disabled', + 'Ñíàðÿäû áóäóò ñòàëêèâàòüñÿ ñ òèììåéòàìè'), + ('MSG FRIENDLY HIT TRACE ON', 'Hit tracing enabled', + 'Ïóëè áóäóò ïðîõîäèòü ñêâîçü òèììåéòîâ'), + ('MSG FRIENDLY HIT TRACE OFF', 'Hit tracing disabled', + 'Ïóëè áóäóò ñòàëêèâàòüñÿ ñ òèììåéòàìè'), + ('MSG FRIENDLY ABSORB DAMAGE ON', 'Damage absorbing by teammates enabled', + 'Òèììåéòû áóäóò ïîãëîùàòü ÷àñòü óðîíà'), + ('MSG FRIENDLY ABSORB DAMAGE OFF', 'Damage absorbing by teammates disabled', + 'Óðîí ñêâîçü òèììåéòîâ áóäåò ñòàíäàðòíûì'), ('MSG WEAPONSTAY ON', 'Weapon Stay enabled', 'Îðóæèå îñòà¸òñÿ ïîñëå ïîäáîðà'), ('MSG WEAPONSTAY OFF', 'Weapon Stay disabled', -- 2.29.2