Added type "Flame" to trigger SpawnShot

Signed-off-by: DeaDDooMER <deaddoomer@deadsoftware.ru>

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 07b0d7d5f01791cb006c468aa6dc61e11782c828..562c941855cf6f6a62e24ab459ee31bd5d976146 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
@@ -806,6 +806,12 @@ begin
         snd := 'SOUND_WEAPON_EXPLODEBFG';
       end;
 
+    TRIGGER_SHOT_FLAME:
+      begin
+        g_Weapon_flame(wx, wy, dx, dy, 0, -1, True);
+        //snd := 'SOUND_WEAPON_FIREPLASMA';
+      end;
+
     else exit;
   end;
 

diff --git a/src/mapdef/mapdef.txt b/src/mapdef/mapdef.txt
index df3298a5ae34967472c81aea9aebf6c4790f5547..375ef4a43c69b0b1b4de3cc61b2c3a1d962db0ff 100644 (file)
--- a/src/mapdef/mapdef.txt
+++ b/src/mapdef/mapdef.txt
@@ -289,6 +289,7 @@ enum TriggerShot {
   TRIGGER_SHOT_BFG, // 12
   TRIGGER_SHOT_EXPL, // 13
   TRIGGER_SHOT_BFGEXPL, // 14
+  TRIGGER_SHOT_FLAME, // 15
   //
   TRIGGER_SHOT_MAX = MAX,
 }

diff --git a/src/shared/mapdef.inc b/src/shared/mapdef.inc
index 61e689126ddbca2cf1bd7aecf5fb0f578c37a8db..8eca3cceea8ecad7e83dc319cd6a178648713b8c 100644 (file)
--- a/src/shared/mapdef.inc
+++ b/src/shared/mapdef.inc
@@ -196,7 +196,8 @@ const
   TRIGGER_SHOT_BFG = 12;
   TRIGGER_SHOT_EXPL = 13;
   TRIGGER_SHOT_BFGEXPL = 14;
-  TRIGGER_SHOT_MAX = 14;
+  TRIGGER_SHOT_FLAME = 15;
+  TRIGGER_SHOT_MAX = 15;
 
 // TriggerShotTarget
 const
@@ -1088,4 +1089,4 @@ const defaultMapDef: AnsiString = ''+
   #114#101#97#100#95#100#34#32#116#121#112#101#32#117#98#121#116#101#32#111+
   #102#102#115#101#116#32#49#53#32#119#114#105#116#101#100#101#102#97#117#108+
   #116#59#10#125#10
-;
\ No newline at end of file
+;