trigger data now cached on map loading (so it should be as fast as the previous trigg...

[d2df-sdl.git] / src / game / g_netmsg.pas

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 88764ed9a2bd913b481a581d55c0d65450d6c3f8..3a2304bb005bca95012c7b85563ee780dddef21e 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -914,7 +914,7 @@ begin
   NetOut.Write(EvStr);
   NetOut.Write(Byte(gLastMap));
   NetOut.Write(gTime);
-  if (EvType = NET_EV_MAPSTART) and (Pos(':\', EvStr) > 0) then
+  if (EvType = NET_EV_MAPSTART) and isWadPath(EvStr) then
   begin
     NetOut.Write(Byte(1));
     NetOut.Write(gWADHash);
@@ -1668,7 +1668,7 @@ begin
       gWADHash := EvHash;
       if not g_Game_StartMap(EvStr, True) then
       begin
-        if Pos(':\', EvStr) = 0 then
+        if not isWadPath(EvStr) then
           g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [gGameSettings.WAD + ':\' + EvStr]))
         else
           g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [EvStr]));
@@ -2462,10 +2462,10 @@ begin
         begin
           if SPlaying then
           begin
-            if trigData.trigLocal then
-              Sound.PlayVolumeAt(X+(Width div 2), Y+(Height div 2), trigData.trigVolume/255.0)
+            if tgcLocal then
+              Sound.PlayVolumeAt(X+(Width div 2), Y+(Height div 2), tgcVolume/255.0)
             else
-              Sound.PlayPanVolume((trigData.trigPan-127.0)/128.0, trigData.trigVolume/255.0);
+              Sound.PlayPanVolume((tgcPan-127.0)/128.0, tgcVolume/255.0);
             Sound.SetPosition(SPos);
           end
           else