X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2FMAPDEF.pas;h=ef4eaf63675fdd137368ba9a01b2a85da2738146;hb=f0c98dc86657bdc08f6049872f12b554e1654fa4;hp=8f46f5fae83846bede07385994e620fdf12c9bbe;hpb=768d1a2f7dede48362925a4ea213add3df997ad8;p=d2df-sdl.git

diff --git a/src/shared/MAPDEF.pas b/src/shared/MAPDEF.pas
index 8f46f5f..ef4eaf6 100644
--- a/src/shared/MAPDEF.pas
+++ b/src/shared/MAPDEF.pas
@@ -92,8 +92,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;
@@ -160,7 +162,8 @@ const
   TRIGGER_HEALTH          = 26;
   TRIGGER_SHOT            = 27;
   TRIGGER_EFFECT          = 28;
-  TRIGGER_MAX             = 28;
+  TRIGGER_SCRIPT          = 29;
+  TRIGGER_MAX             = 29;
 
   TRIGGER_SHOT_PISTOL  = 0;
   TRIGGER_SHOT_BULLET  = 1;
@@ -187,6 +190,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;
 
@@ -308,7 +316,7 @@ type
                              ShotType: Byte;
                              ShotTarget: Byte;
                              ShotSound: Boolean;
-                             ShotAllMap: Boolean;
+                             ShotAim: Byte;
                              ShotPanelID: Integer;
                              ShotIntSight: Word;
                              ShotAngle: Word;
@@ -330,8 +338,16 @@ type
                              FXSpreadR: Byte;
                              FXSpreadU: Byte;
                              FXSpreadD: Byte);
+      TRIGGER_SCRIPT:       (SCRProc: Char64;
+                             SCRArg: Integer);
   end;
 
+{$INCLUDE mapstructsizes.inc}
+
 implementation
 
+uses SysUtils;
+
+{$INCLUDE mapstructio.inc}
+
 end.