From: Ketmar Dark <ketmar@ketmar.no-ip.org>
Date: Tue, 21 Jun 2016 02:01:58 +0000 (+0300)
Subject: Merge branch 'master' of ssh://repo.or.cz/d2df-sdl
X-Git-Url: https://deadsoftware.ru/gitweb?a=commitdiff_plain;h=0e46dc14295c14554d7e8216282054679b2f9a5a;hp=-c;p=d2df-sdl.git

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

0e46dc14295c14554d7e8216282054679b2f9a5a
diff --combined src/shared/MAPDEF.pas
index d414e72,8f46f5f..9fd1bec
--- a/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.