fixed wadeditor; added nosound mode; fixed codepage problems; fixed pointers; cleanup

[d2df-editor.git] / src / shared / MAPDEF.pas

diff --git a/src/shared/MAPDEF.pas b/src/shared/MAPDEF.pas
index 8ad2ccd230736d1d1eb9a34a8c7e0b94208accb1..2cb45aa51f34629e50e69b5689e232069a9be8a4 100644 (file)
--- a/src/shared/MAPDEF.pas
+++ b/src/shared/MAPDEF.pas
@@ -1,6 +1,6 @@
 unit MAPDEF;
 
-{$MODE Delphi}
+{$INCLUDE ../shared/a_modes.inc}
 
 {
 -----------------------------------
@@ -78,8 +78,10 @@ const
   ITEM_HELMET                = 34;
   ITEM_JETPACK               = 35;
   ITEM_INVIS                 = 36;
+  ITEM_WEAPON_FLAMETHROWER   = 37;
+  ITEM_AMMO_FUELCAN          = 38;
 
-  ITEM_MAX                   = 36; // store the last item's id in here
+  ITEM_MAX                   = 38; // store the last item's id in here
                                    // use this in for loops
 
   ITEM_OPTION_ONLYDM = 1;
@@ -173,6 +175,11 @@ const
   TRIGGER_SHOT_TARGET_MONPLR = 5;
   TRIGGER_SHOT_TARGET_PLRMON = 6;
 
+  TRIGGER_SHOT_AIM_DEFAULT   = 0;
+  TRIGGER_SHOT_AIM_ALLMAP    = 1;
+  TRIGGER_SHOT_AIM_TRACE     = 2;
+  TRIGGER_SHOT_AIM_TRACEALL  = 3;
+
   TRIGGER_EFFECT_PARTICLE  = 0;
   TRIGGER_EFFECT_ANIMATION = 1;
 
@@ -290,13 +297,13 @@ Type
                              HealInterval: Word;
                              HealMax: Boolean;
                              HealSilent: Boolean);
-      TRIGGER_SHOT:         (ShotType: Byte;
+      TRIGGER_SHOT:         (ShotPos: TPoint;
+                             ShotType: Byte;
+                             ShotTarget: Byte;
                              ShotSound: Boolean;
+                             ShotAim: Byte;
                              ShotPanelID: Integer;
-                             ShotTarget: Byte;
                              ShotIntSight: Word;
-                             ShotAllMap: Boolean;
-                             ShotPos: TPoint;
                              ShotAngle: Word;
                              ShotWait: Word;
                              ShotAccuracy: Word;