Add sounds for flamethrower

[d2df-sdl.git] / src / game / g_triggers.pas

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 19edc46fd96b97b9efec5d5f156af12da87ae73d..1673cefedadeab37f1f565cd3b100a7a6684119c 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
@@ -1,4 +1,4 @@
-(* Copyright (C)  DooM 2D:Forever Developers
+(* Copyright (C)  Doom 2D: Forever Developers
  *
  * 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
@@ -592,17 +592,17 @@ begin
   if (gLifts[PanelID].PanelType = PANEL_LIFTUP) or (gLifts[PanelID].PanelType = PANEL_LIFTDOWN) then
   begin
     case d of
-      0: t := 0;
-      1: t := 1;
-      else t := IfThen(gLifts[PanelID].LiftType = 1, 0, 1);
+      0: t := LIFTTYPE_UP;
+      1: t := LIFTTYPE_DOWN;
+      else t := IfThen(gLifts[PanelID].LiftType = LIFTTYPE_DOWN, LIFTTYPE_UP, LIFTTYPE_DOWN);
     end
   end
   else if (gLifts[PanelID].PanelType = PANEL_LIFTLEFT) or (gLifts[PanelID].PanelType = PANEL_LIFTRIGHT) then
   begin
     case d of
-      0: t := 2;
-      1: t := 3;
-      else t := IfThen(gLifts[PanelID].LiftType = 2, 3, 2);
+      0: t := LIFTTYPE_LEFT;
+      1: t := LIFTTYPE_RIGHT;
+      else t := IfThen(gLifts[PanelID].LiftType = LIFTTYPE_LEFT, LIFTTYPE_RIGHT, LIFTTYPE_LEFT);
     end;
   end;
 
@@ -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_GAME_BURNING';
+      end;
+
     else exit;
   end;
 
@@ -847,7 +853,7 @@ begin
       dx += Random(tgcAccuracy)-Random(tgcAccuracy);
       dy += Random(tgcAccuracy)-Random(tgcAccuracy);
 
-      tr_SpawnShot(tgcShotType, wx, wy, dx, dy, not tgcQuiet, TargetUID);
+      tr_SpawnShot(tgcShotType, wx, wy, dx, dy, tgcShotSound, TargetUID);
     end
     else
     begin