X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_triggers.pas;h=8e8cf44e9a8bbb282b541828fc6ee83517e5bad4;hb=d1e9c820c486228a7f80ac8c1e2928abea10f0bd;hp=6748a005098b7874218adc0e15af4fcd3fa5a631;hpb=88ce644db1b40111bdb380f4357fa59bdb5173be;p=d2df-sdl.git

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 6748a00..8e8cf44 100644
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
@@ -71,7 +71,7 @@ implementation
 uses
   g_player, g_map, Math, g_gfx, g_game, g_textures,
   g_console, g_monsters, g_items, g_phys, g_weapons,
-  WADEDITOR, g_main, SysUtils, e_log, g_language,
+  wadreader, g_main, SysUtils, e_log, g_language,
   g_options, g_net, g_netmsg;
 
 const
@@ -805,7 +805,7 @@ begin
       TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF:
         begin
           PressCount := PressCount + 1;
-          
+
           if PressTime = -1 then
             PressTime := Data.Wait;
 
@@ -1166,7 +1166,7 @@ begin
                 p := g_Player_Get(ActivateUID);
                 if p = nil then
                   Exit;
-                  
+
                 if Data.ResetVel then
                 begin
                   p.GameVelX := 0;
@@ -2330,6 +2330,8 @@ var
   k: Byte;
   p: TPlayer;
 begin
+  Result := nil;
+
   if gTriggers = nil then Exit;
 
   case g_GetUIDType(UID) of
@@ -2345,8 +2347,6 @@ begin
     else k := 0;
   end;
 
-  Result := nil;
-
   for a := 0 to High(gTriggers) do
     if (gTriggers[a].TriggerType <> TRIGGER_NONE) and
        (gTriggers[a].TimeOut = 0) and