no more path splitting in wad reading, it's useless

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

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 89adae44b57715f36df45b231cb7fc660ceca8da..609c309e4936e8b0851fe94cd43612a4d28e9577 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
@@ -1993,12 +1993,12 @@ begin
   // Åùå íåò òàêîãî çâóêà:
     if not g_Sound_Exists(Trigger.Data.SoundName) then
     begin
-      g_ProcessResourceStr(Trigger.Data.SoundName, @fn, nil, nil);
+      fn := g_ExtractWadName(Trigger.Data.SoundName);
 
       if fn = '' then
         begin // Çâóê â ôàéëå ñ êàðòîé
-          g_ProcessResourceStr(gMapInfo.Map, @mapw, nil, nil);
-          fn := mapw + Trigger.Data.SoundName;
+          mapw := g_ExtractWadName(gMapInfo.Map);
+          fn := mapw+':'+g_ExtractFilePathName(Trigger.Data.SoundName);
         end
       else // Çâóê â îòäåëüíîì ôàéëå
         fn := GameDir + '/wads/' + Trigger.Data.SoundName;
@@ -2026,12 +2026,12 @@ begin
   // Åùå íåò òàêîé ìóçûêè:
     if not g_Sound_Exists(Trigger.Data.MusicName) then
     begin
-      g_ProcessResourceStr(Trigger.Data.MusicName, @fn, nil, nil);
+      fn := g_ExtractWadName(Trigger.Data.MusicName);
 
       if fn = '' then
         begin // Ìóçûêà â ôàéëå ñ êàðòîé
-          g_ProcessResourceStr(gMapInfo.Map, @mapw, nil, nil);
-          fn := mapw + Trigger.Data.MusicName;
+          mapw := g_ExtractWadName(gMapInfo.Map);
+          fn := mapw+':'+g_ExtractFilePathName(Trigger.Data.MusicName);
         end
       else // Ìóçûêà â ôàéëå ñ êàðòîé
         fn := GameDir+'/wads/'+Trigger.Data.MusicName;