From: fgsfds <pvt.fgsfds@gmail.com>
Date: Mon, 5 Aug 2019 22:24:49 +0000 (+0300)
Subject: Merge branch 'master' of https://repo.or.cz/d2df-sdl
X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=06667349c1efd05099ff0617dfdf17dc7a097828;hp=edb1ac42b71cbc5a4bc460d8b0b64572f65dd0fa

Merge branch 'master' of https://repo.or.cz/d2df-sdl
---

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index ddf4825..6bfc34c 100644
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -5276,7 +5276,7 @@ begin
         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 21b2061..8a5e652 100644
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
@@ -2346,7 +2346,7 @@ begin
                 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