X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2FMAPDEF.pas;h=232578b48683a9428a4044e24d7959f376e12c57;hb=refs%2Fheads%2Fmaster;hp=8ad2ccd230736d1d1eb9a34a8c7e0b94208accb1;hpb=b72e164f0fb64e3301ae8ca217449daf6a9d301d;p=d2df-editor.git

diff --git a/src/shared/MAPDEF.pas b/src/shared/MAPDEF.pas
index 8ad2ccd..232578b 100644
--- a/src/shared/MAPDEF.pas
+++ b/src/shared/MAPDEF.pas
@@ -1,6 +1,6 @@
 unit MAPDEF;
 
-{$MODE Delphi}
+{$INCLUDE ../shared/a_modes.inc}
 
 {
 -----------------------------------
@@ -59,7 +59,7 @@ const
   ITEM_WEAPON_ROCKETLAUNCHER = 15;
   ITEM_WEAPON_PLASMA         = 16;
   ITEM_WEAPON_BFG            = 17;
-  ITEM_WEAPON_SUPERPULEMET   = 18;
+  ITEM_WEAPON_SUPERCHAINGUN  = 18;
   ITEM_AMMO_BULLETS          = 19;
   ITEM_AMMO_BULLETS_BOX      = 20;
   ITEM_AMMO_SHELLS           = 21;
@@ -72,14 +72,16 @@ const
   ITEM_KEY_RED               = 28;
   ITEM_KEY_GREEN             = 29;
   ITEM_KEY_BLUE              = 30;
-  ITEM_WEAPON_KASTET         = 31;
+  ITEM_WEAPON_IRONFIST       = 31;
   ITEM_WEAPON_PISTOL         = 32;
   ITEM_BOTTLE                = 33;
   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;
@@ -163,7 +165,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;
 
   TRIGGER_SHOT_TARGET_NONE   = 0;
   TRIGGER_SHOT_TARGET_MON    = 1;
@@ -173,6 +176,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;
 
@@ -285,18 +293,19 @@ Type
                              MessageText: Char100;
                              MessageTime: Word);
       TRIGGER_DAMAGE:       (DamageValue: Word;
-                             DamageInterval: Word);
+                             DamageInterval: Word;
+                             DamageKind: Byte);
       TRIGGER_HEALTH:       (HealValue: Word;
                              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;