Merge branch 'master' of ssh://repo.or.cz/d2df-sdl

diff --combined src/shared/MAPDEF.pas
index d414e7248661e5768524bbd1e4c5748c981b839f,8f46f5fae83846bede07385994e620fdf12c9bbe..9fd1becc1060410fa9a2d69d17653a5c4bf38ab0
--- 1/src/shared/MAPDEF.pas
--- 2/src/shared/MAPDEF.pas
+++ b/src/shared/MAPDEF.pas
@@@ -224,7 -224,7 +224,7 @@@ cons
    TEXTURE_SPECIAL_ACID2 = DWORD(-3);
    TEXTURE_NONE = DWORD(-4);
  
- Type
+ type
    TPoint = packed record
      X, Y: LongInt;
    end;
@@@ -304,13 -304,13 +304,13 @@@
                               HealInterval: Word;
                               HealMax: Boolean;
                               HealSilent: Boolean);
-       TRIGGER_SHOT:         (ShotType: Byte;
+       TRIGGER_SHOT:         (ShotPos: TPoint;
+                              ShotType: Byte;
+                              ShotTarget: Byte;
                               ShotSound: Boolean;
+                              ShotAllMap: Boolean;
                               ShotPanelID: Integer;
-                              ShotTarget: Byte;
                               ShotIntSight: Word;
-                              ShotAllMap: Boolean;
-                              ShotPos: TPoint;
                               ShotAngle: Word;
                               ShotWait: Word;
                               ShotAccuracy: Word;
@@@ -332,12 -332,6 +332,12 @@@
                               FXSpreadD: Byte);
    end;
  
 +{$INCLUDE mapstructsizes.inc}
 +
  implementation
  
 +uses SysUtils;
 +
 +{$INCLUDE mapstructio.inc}
 +
  end.