index ee77fded2fcf6630294bd53e9e3568412fa1ece5..07b0d7d5f01791cb006c468aa6dc61e11782c828 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
xdynrec, hashtable, exoma;
type
- THashStrVariant = specialize THashBase<AnsiString, Variant>;
-
TActivator = record
UID: Word;
TimeOut: Word;
if (Length(afldname) > 4) and (afldname[1] = 'u') and (afldname[2] = 's') and
(afldname[3] = 'e') and (afldname[4] = 'r') then
begin
- if (me.userVars = nil) then me.userVars := THashStrVariant.Create(hashStrHash, hashStrEqu);
+ if (me.userVars = nil) then me.userVars := THashStrVariant.Create();
me.userVars.put(afldname, aval);
exit;
end;
Dec(idx);
end;
TimeOut := tgcWait;
+ result := true;
end;
end;
end;
// update cached trigger variables
trigUpdateCacheData(ptg^, ptg.trigDataRec);
- ptg.userVars := nil; //THashStrVariant.Create(hashStrHash, hashStrEqu);
+ ptg.userVars := nil;
try
ptg.exoThink := TExprBase.parseStatList(tgclist, VarToStr(trec.user['exoma_think']));
if (uvcount < 0) or (uvcount > 1024*1024) then raise XStreamError.Create('invalid number of user vars in trigger');
if (uvcount > 0) then
begin
- gTriggers[i].userVars := THashStrVariant.Create(hashStrHash, hashStrEqu);
+ gTriggers[i].userVars := THashStrVariant.Create();
vv := Unassigned;
while (uvcount > 0) do
begin