DEADSOFTWARE

added some new msgs for friendlyfire options
authorTerminalHash <lyashuk.voxx@gmail.com>
Sat, 18 Sep 2021 12:04:27 +0000 (15:04 +0300)
committerTerminalHash <lyashuk.voxx@gmail.com>
Sat, 18 Sep 2021 12:04:27 +0000 (15:04 +0300)
src/game/g_game.pas
src/game/g_language.pas

index a2dacb982a9ee91a1127e1b18e74c3082fca9b39..2c8ae0fb8dcdc8507c2184aaccc0ca4a660b3183 100644 (file)
@@ -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
index f7b553c4151c9f394aef8865c6038255c979f070..b58ff34c0b603cf9d49f84a23aaf7e29bbc2bde6 100644 (file)
@@ -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',