X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_triggers.pas;h=f5bf2d2fabd2e9e49ce1874d65ce32ba901304ee;hb=f924968c450e1dc566b3abdde8d2aeac4de11fd0;hp=4aca319356ce70040c524a93dbd1681de2c85c57;hpb=94a927ca673a2d8af4b8449d434f3c70f38b11c1;p=d2df-sdl.git

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 4aca319..f5bf2d2 100644
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
@@ -237,7 +237,7 @@ begin
       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;
@@ -2409,7 +2409,7 @@ begin
     //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
@@ -2447,7 +2447,7 @@ begin
   // 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']));
@@ -3347,7 +3347,7 @@ begin
     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