X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2FMAPDEF.pas;h=f6678e921683bb659ec77dd3a6805658f21fb0b2;hb=ee55194b1f1e2a8721038eff788b64534393661c;hp=d414e7248661e5768524bbd1e4c5748c981b839f;hpb=72c3f99bafeeefa72bcbc3c9c589a82a53c3a73d;p=d2df-sdl.git

diff --git a/src/shared/MAPDEF.pas b/src/shared/MAPDEF.pas
index d414e72..f6678e9 100644
--- a/src/shared/MAPDEF.pas
+++ b/src/shared/MAPDEF.pas
@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE a_modes.inc}
+{$M+}
 unit MAPDEF;
 
 {
@@ -29,6 +30,9 @@ interface
 uses
   MAPSTRUCT;
 
+// *** WARNING! ***
+//   keep all constants in sync with "mapdesc.txt"!
+//   or even better: regenerate this part directly from "mapdesc.txt".
 const
   PANEL_NONE      = 0;
   PANEL_WALL      = 1;
@@ -92,8 +96,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 +166,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 +194,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;
 
@@ -224,7 +236,7 @@ const
   TEXTURE_SPECIAL_ACID2 = DWORD(-3);
   TEXTURE_NONE = DWORD(-4);
 
-Type
+type
   TPoint = packed record
     X, Y: LongInt;
   end;
@@ -304,13 +316,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;
@@ -330,6 +342,8 @@ Type
                              FXSpreadR: Byte;
                              FXSpreadU: Byte;
                              FXSpreadD: Byte);
+      TRIGGER_SCRIPT:       (SCRProc: Char64;
+                             SCRArg: Integer);
   end;
 
 {$INCLUDE mapstructsizes.inc}