index 4aca319356ce70040c524a93dbd1681de2c85c57..f5bf2d2fabd2e9e49ce1874d65ce32ba901304ee 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
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(hsihash, hsiequ);
+ if (me.userVars = nil) then me.userVars := THashStrVariant.Create(hashStrHash, hashStrEqu);
me.userVars.put(afldname, aval);
exit;
end;
//HACK!
if (gTriggers[find_id].TriggerType <> TRIGGER_SECRET) then
begin
- e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [gTriggers[find_id].TriggerType], MSG_WARNING);
+ e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [gTriggers[find_id].TriggerType], TMsgType.Warning);
end;
end
else
// update cached trigger variables
trigUpdateCacheData(gTriggers[find_id], gTriggers[find_id].trigDataRec);
- gTriggers[find_id].userVars := nil; //THashStrVariant.Create(hsihash, hsiequ);
+ gTriggers[find_id].userVars := nil; //THashStrVariant.Create(hashStrHash, hashStrEqu);
try
gTriggers[find_id].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(hsihash, hsiequ);
+ gTriggers[i].userVars := THashStrVariant.Create(hashStrHash, hashStrEqu);
vv := Unassigned;
while (uvcount > 0) do
begin