X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_weapons.pas;h=3949fe93e8a6036274670ca635e1f6bf6dec6140;hb=939a343cdc93545211b37de24e9d406bf54dcaf0;hp=5505731729eb497613804cd78aa72d00886d96c8;hpb=281969a1bea9afbf36babebcf9208549929a96f4;p=d2df-sdl.git

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index 5505731..3949fe9 100644
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -1117,6 +1116,7 @@ begin
   g_Sound_CreateWADEx('SOUND_WEAPON_FIRECGUN', GameWAD+':SOUNDS\FIRECGUN');
   g_Sound_CreateWADEx('SOUND_WEAPON_FIREBFG', GameWAD+':SOUNDS\FIREBFG');
   g_Sound_CreateWADEx('SOUND_FIRE', GameWAD+':SOUNDS\FIRE');
+  g_Sound_CreateWADEx('SOUND_IGNITE', GameWAD+':SOUNDS\IGNITE');
   g_Sound_CreateWADEx('SOUND_WEAPON_STARTFIREBFG', GameWAD+':SOUNDS\STARTFIREBFG');
   g_Sound_CreateWADEx('SOUND_WEAPON_EXPLODEROCKET', GameWAD+':SOUNDS\EXPLODEROCKET');
   g_Sound_CreateWADEx('SOUND_WEAPON_EXPLODEBFG', GameWAD+':SOUNDS\EXPLODEBFG');
@@ -1186,6 +1186,7 @@ begin
   g_Sound_Delete('SOUND_WEAPON_FIRECGUN');
   g_Sound_Delete('SOUND_WEAPON_FIREBFG');
   g_Sound_Delete('SOUND_FIRE');
+  g_Sound_Delete('SOUND_IGNITE');
   g_Sound_Delete('SOUND_WEAPON_STARTFIREBFG');
   g_Sound_Delete('SOUND_WEAPON_EXPLODEROCKET');
   g_Sound_Delete('SOUND_WEAPON_EXPLODEBFG');
@@ -2344,7 +2345,7 @@ begin
                 Stopped := MOVE_HITCEIL;
             end;
 
-            a := IfThen(Stopped = 0, 3, 1);
+            a := IfThen(Stopped = 0, 10, 1);
           // Åñëè â êîãî-òî ïîïàëè
             if g_Weapon_Hit(@Obj, a, SpawnerUID, HIT_FLAME, False) <> 0 then
             begin