X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_triggers.pas;h=5283e7008751eee7805ac02aca4c6eff48534159;hb=16e6289eea5bcd1029365aea672a92b4f5c71c19;hp=9ca5756b048cd9409686c8f59496c1a7ed522b67;hpb=27b297c1c90cca9fe2b4e52a0af81e70e3ce4d4e;p=d2df-sdl.git

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 9ca5756..5283e70 100644
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
@@ -13,7 +13,7 @@
  * 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 ../shared/a_modes.inc}
 unit g_triggers;
 
 interface
@@ -101,7 +101,7 @@ uses
   g_player, g_map, Math, g_gfx, g_game, g_textures,
   g_console, g_monsters, g_items, g_phys, g_weapons,
   wadreader, g_main, SysUtils, e_log, g_language,
-  g_options, g_net, g_netmsg, g_scripts;
+  g_options, g_net, g_netmsg;
 
 const
   TRIGGER_SIGNATURE = $52475254; // 'TRGR'
@@ -926,6 +926,7 @@ end;
 
 function tr_ShotAimCheck(var Trigger: TTrigger; Obj: PObj): Boolean;
 begin
+  result := false;
   with Trigger do
   begin
     if TriggerType <> TRIGGER_SHOT then
@@ -2018,13 +2019,6 @@ begin
           end;
           TimeOut := Data.FXWait;
         end;
-
-      TRIGGER_SCRIPT:
-        begin
-          g_Scripts_ProcExec(Data.SCRProc, [ID, ActivateUID, actType, Data.SCRArg], 'map');
-          TimeOut := 0;
-          Result := True;
-        end;
     end;
   end;