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 ddf4825b2ee994232eaf81bc22a58ff101935c65..6bfc34c0de5302e5291f7d323429e2df16249fbb 100644 (file)
--- 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 21b206127a34928f44cb9c90de0fd5adcbfc570b..8a5e652d01bef9f729d7a78e50dabc837fcc5e4c 100644 (file)
--- 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