index 6748a005098b7874218adc0e15af4fcd3fa5a631..89adae44b57715f36df45b231cb7fc660ceca8da 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
+{$MODE DELPHI}
unit g_triggers;
interface
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
TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF:
begin
PressCount := PressCount + 1;
-
+
if PressTime = -1 then
PressTime := Data.Wait;
p := g_Player_Get(ActivateUID);
if p = nil then
Exit;
-
+
if Data.ResetVel then
begin
p.GameVelX := 0;
k: Byte;
p: TPlayer;
begin
+ Result := nil;
+
if gTriggers = nil then Exit;
case g_GetUIDType(UID) of
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