X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fmapdef%2Fmapdef.txt;h=4a27ccfa1b675d8820166afd52c231f3ef7325b1;hb=58722c153faad833472ba181784dcde8cf65152e;hp=db3a64fe7de8c6d1b20d16f2c3a58ab9ee103385;hpb=2b04301f4303668096c37c21e06af70930f55b7f;p=d2df-sdl.git

diff --git a/src/mapdef/mapdef.txt b/src/mapdef/mapdef.txt
index db3a64f..4a27ccf 100644
--- a/src/mapdef/mapdef.txt
+++ b/src/mapdef/mapdef.txt
@@ -15,6 +15,7 @@
 //   `as txy` will use `tX` and `tY` for points
 //   `as wh` will use `Width` and `Height` for size
 //   `as twh` will use `tWidth` and `tHeight` for size
+//   `as monsterid`: special hack for triggers: monster record number+1 in binary (so 0 means "none")
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -51,6 +52,11 @@ TPanelRec_1 is "panel" size 18 bytes binblock 2 {
   PanelType is "type" type ushort offset 14 bitset unique PanelType;
   Alpha is "alpha" type ubyte offset 16 default 0 omitdefault;
   Flags is "flags" type ubyte offset 17 bitset PanelFlag default PANEL_FLAG_NONE omitdefault;
+  // moving platform options, not in binary
+  MoveSpeed is "move_speed" type point default (0 0) omitdefault;
+  MoveStart is "move_start" type point default (0 0) omitdefault;
+  MoveEnd is "move_end" type point default (0 0) omitdefault;
+  MoveActive is "move_active" type bool default false omitdefault;
   // not in binary
   //Id is "id" type string default "" omitdefault;
   // internals
@@ -392,14 +398,16 @@ TriggerData for (TRIGGER_OPENDOOR, TRIGGER_CLOSEDOOR, TRIGGER_DOOR, TRIGGER_DOOR
 TriggerData for (TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF) {
   //tX is "tx" type int offset 0;
   //tY is "ty" type int offset 4;
-  Pos is "position" type point offset 0 as txy;
+  Pos is "position" type point offset 0 as txy default (0 0);
   //tWidth is "width" type ushort offset 8;
   //tHeight is "height" type ushort offset 10;
-  Size is "size" type size offset 8 as twh;
-  Wait is "wait" type ushort offset 12;
-  Count is "count" type ushort offset 14;
-  MonsterID is "monsterid" type int offset 16 monster;
-  ExtRandom is "extrandom" type bool offset 20;
+  Size is "size" type size offset 8 as twh default (0 0);
+  Wait is "wait" type ushort offset 12 default 0;
+  Count is "count" type ushort offset 14 default 0;
+  MonsterID is "monsterid" type int offset 16 monster as monsterid default null;
+  ExtRandom is "extrandom" type bool offset 20 default false;
+  // this one is for moving platforms
+  PanelId is "panelid" type int panel default null omitdefault;
 }
 
 TriggerData for TRIGGER_SECRET {