summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 20a86a0)
raw | patch | inline | side by side (parent: 20a86a0)
author | Joseph Stalin <granminigun@pm.me> | |
Mon, 5 Aug 2019 18:11:56 +0000 (23:11 +0500) | ||
committer | Joseph Stalin <granminigun@pm.me> | |
Mon, 5 Aug 2019 18:12:25 +0000 (23:12 +0500) |
src/game/g_player.pas | patch | blob | history | |
src/game/g_weapons.pas | patch | blob | history |
diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 88070c61c04866a6c79bcea7dc8d39f88545fa12..6492695c3ac29fa312b3bfb4927b0c12af8b7aa7 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
if FFirePainTime <= 0 then
begin
if g_Game_IsServer then
- Damage(5, FFireAttacker, 0, 0, HIT_FLAME);
+ Damage(6, FFireAttacker, 0, 0, HIT_FLAME);
FFirePainTime := 18;
end;
FFirePainTime := FFirePainTime - 1;
diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index 21b206127a34928f44cb9c90de0fd5adcbfc570b..8a5e652d01bef9f729d7a78e50dabc837fcc5e4c 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
Stopped := MOVE_HITCEIL;
end;
- a := IfThen(Stopped = 0, 3, 1);
+ a := IfThen(Stopped = 0, 6, 1);
// Åñëè â êîãî-òî ïîïàëè
if g_Weapon_Hit(@Obj, a, SpawnerUID, HIT_FLAME, False) <> 0 then
begin