X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=2c8ae0fb8dcdc8507c2184aaccc0ca4a660b3183;hb=a1338c3de8d2613ba82d89921630df1ae7b183d0;hp=8271428fc1389de5deabaedb962b6742e64dd8ee;hpb=13368a9269fe9fa4850a53f4611b3ec23b544d03;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 8271428..2c8ae0f 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -186,6 +186,7 @@ const GAME_OPTION_DMKEYS = 128; GAME_OPTION_TEAMHITTRACE = 256; GAME_OPTION_TEAMHITPROJECTILE = 512; + GAME_OPTION_TEAMABSORBDAMAGE = 1024; STATE_NONE = 0; STATE_MENU = 1; @@ -5514,13 +5515,17 @@ begin begin ParseGameFlag(GAME_OPTION_TEAMDAMAGE, I_MSG_FRIENDLY_FIRE_OFF, I_MSG_FRIENDLY_FIRE_ON); end + else if cmd = 'g_friendly_absorb_damage' then + begin + 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