From: fgsfds Date: Mon, 7 Jun 2021 18:48:08 +0000 (+0300) Subject: fix whitespace X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=c60d605e4dcebc72dbfab66af51ddddcd2019037;p=d2df-sdl.git fix whitespace --- diff --git a/src/game/g_game.pas b/src/game/g_game.pas index fefa3c0..a2dacb9 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -5516,9 +5516,9 @@ 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_FIRE_OFF, I_MSG_FRIENDLY_FIRE_ON); - end + begin + ParseGameFlag(GAME_OPTION_TEAMABSORBDAMAGE, I_MSG_FRIENDLY_FIRE_OFF, I_MSG_FRIENDLY_FIRE_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); diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas index 1dd4688..32fc8f6 100644 --- a/src/game/g_weapons.pas +++ b/src/game/g_weapons.pas @@ -1416,11 +1416,11 @@ var begin if ((gGameSettings.Options and (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMDAMAGE)) = 0) and (spawnerPlr.Team <> TEAM_NONE) and (spawnerPlr.Team = gPlayers[idx].Team) then - begin - if (spawnerPlr <> gPlayers[idx]) and ((gGameSettings.Options and GAME_OPTION_TEAMABSORBDAMAGE) = 0) then - dmg := Max(1, dmg div 2); - exit; - end; + begin + if (spawnerPlr <> gPlayers[idx]) and ((gGameSettings.Options and GAME_OPTION_TEAMABSORBDAMAGE) = 0) then + dmg := Max(1, dmg div 2); + exit; + end; end; result := HitPlayer(gPlayers[idx], dmg, (xi*v)*10, (yi*v)*10-3, SpawnerUID, HIT_SOME); if result and (v <> 0) then gPlayers[idx].Push((xi*v), (yi*v));