summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1e0f0d4)
raw | patch | inline | side by side (parent: 1e0f0d4)
author | fgsfds <pvt.fgsfds@gmail.com> | |
Mon, 7 Jun 2021 18:48:08 +0000 (21:48 +0300) | ||
committer | fgsfds <pvt.fgsfds@gmail.com> | |
Mon, 7 Jun 2021 18:48:08 +0000 (21:48 +0300) |
src/game/g_game.pas | patch | blob | history | |
src/game/g_weapons.pas | patch | blob | history |
diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index fefa3c02080d73ec8e361df0b58be05380fcdae6..a2dacb982a9ee91a1127e1b18e74c3082fca9b39 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
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 1dd468824ba1b023ad7e514c86ac166654a45a9f..32fc8f6c04a770ee0c0e34bfc5ab630b4958d20b 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
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));