From e0d111b2ecbb178fda6d46d49bce135174a269be Mon Sep 17 00:00:00 2001 From: taose Date: Fri, 3 Mar 2017 16:32:30 +0000 Subject: [PATCH] Fixing music bug as fixed by @Ezeer --- data/music/{music => }/AUTHORS | 0 data/music/{music => }/AyMambo.ogg | Bin data/music/{music => }/BlackLlama.ogg | Bin data/music/{music => }/Bliss.ogg | Bin data/music/{music => }/COPYING | 0 data/music/{music => }/DepressionChamber.ogg | Bin data/music/{music => }/DockingProcedures.ogg | Bin data/music/{music => }/InnerChild.ogg | Bin data/music/{music => }/LICENSE.STANDALONE | 0 data/music/{music => }/Machina.ogg | Bin data/music/{music => }/MezzaMessa.ogg | Bin data/music/{music => }/SonOfSandFleaRemix.ogg | Bin data/music/{music => }/Trapped.ogg | Bin data/music/{music => }/aerapeace.ogg | Bin data/music/{music => }/aerathemebattle.ogg | Bin data/music/{music => }/agriculture.ogg | Bin data/music/{music => }/agriculture_p.ogg | Bin data/music/{music => }/alienrockalectro.ogg | Bin data/music/{music => }/alienrockalectro2.ogg | Bin data/music/{music => }/asteroids.ogg | Bin data/music/{music => }/battle1.ogg | Bin data/music/{music => }/battle2.ogg | Bin data/music/{music => }/battle3electro.ogg | Bin data/music/{music => }/battle4showdown.ogg | Bin data/music/{music => }/battle5.ogg | Bin data/music/{music => }/battle5_p.ogg | Bin data/music/{music => }/cosmostation.ogg | Bin data/music/{music => }/cosmostation_crowded.ogg | Bin data/music/{music => }/funeral.ogg | Bin data/music/{music => }/galacticbattle.ogg | Bin data/music/{music => }/industrialmixed.ogg | Bin data/music/{music => }/isobattle.ogg | Bin data/music/{music => }/isopeace.ogg | Bin data/music/{music => }/launch2.ogg | Bin data/music/{music => }/launch3chatstart.ogg | Bin data/music/{music => }/launchjoke.ogg | Bin data/music/{music => }/liftoff.ogg | Bin data/music/{music => }/lightslease_p.ogg | Bin data/music/{music => }/loss1.ogg | Bin data/music/{music => }/militarybase_p.ogg | Bin data/music/{music => }/mission.ogg | Bin data/music/{music => }/news1.ogg | Bin data/music/{music => }/ocean.ogg | Bin data/music/{music => }/peace1.ogg | Bin data/music/{music => }/peace2.ogg | Bin data/music/{music => }/peace3.ogg | Bin data/music/{music => }/peace4.ogg | Bin data/music/{music => }/peace5.ogg | Bin data/music/{music => }/peace5_p.ogg | Bin data/music/{music => }/peace6.ogg | Bin data/music/{music => }/peace6_p.ogg | Bin data/music/{music => }/peace7.ogg | Bin data/music/{music => }/snow.ogg | Bin data/music/{music => }/steel_p.ogg | Bin data/music/{music => }/terranbattle.ogg | Bin data/music/{music => }/terranpeace.ogg | Bin data/music/{music => }/terranpeace2.ogg | Bin data/music/{music => }/university_p.ogg | Bin data/music/{music => }/vegastrike-music.spec | 0 data/music/{music => }/victory.ogg | Bin data/music/{music => }/victory2.ogg | Bin data/music/{music => }/victory_p.ogg | Bin engine/src/cmd/music.cpp | 4 +++- 63 files changed, 3 insertions(+), 1 deletion(-) rename data/music/{music => }/AUTHORS (100%) rename data/music/{music => }/AyMambo.ogg (100%) rename data/music/{music => }/BlackLlama.ogg (100%) rename data/music/{music => }/Bliss.ogg (100%) rename data/music/{music => }/COPYING (100%) rename data/music/{music => }/DepressionChamber.ogg (100%) rename data/music/{music => }/DockingProcedures.ogg (100%) rename data/music/{music => }/InnerChild.ogg (100%) rename data/music/{music => }/LICENSE.STANDALONE (100%) rename data/music/{music => }/Machina.ogg (100%) rename data/music/{music => }/MezzaMessa.ogg (100%) rename data/music/{music => }/SonOfSandFleaRemix.ogg (100%) rename data/music/{music => }/Trapped.ogg (100%) rename data/music/{music => }/aerapeace.ogg (100%) rename data/music/{music => }/aerathemebattle.ogg (100%) rename data/music/{music => }/agriculture.ogg (100%) rename data/music/{music => }/agriculture_p.ogg (100%) rename data/music/{music => }/alienrockalectro.ogg (100%) rename data/music/{music => }/alienrockalectro2.ogg (100%) rename data/music/{music => }/asteroids.ogg (100%) rename data/music/{music => }/battle1.ogg (100%) rename data/music/{music => }/battle2.ogg (100%) rename data/music/{music => }/battle3electro.ogg (100%) rename data/music/{music => }/battle4showdown.ogg (100%) rename data/music/{music => }/battle5.ogg (100%) rename data/music/{music => }/battle5_p.ogg (100%) rename data/music/{music => }/cosmostation.ogg (100%) rename data/music/{music => }/cosmostation_crowded.ogg (100%) rename data/music/{music => }/funeral.ogg (100%) rename data/music/{music => }/galacticbattle.ogg (100%) rename data/music/{music => }/industrialmixed.ogg (100%) rename data/music/{music => }/isobattle.ogg (100%) rename data/music/{music => }/isopeace.ogg (100%) rename data/music/{music => }/launch2.ogg (100%) rename data/music/{music => }/launch3chatstart.ogg (100%) rename data/music/{music => }/launchjoke.ogg (100%) rename data/music/{music => }/liftoff.ogg (100%) rename data/music/{music => }/lightslease_p.ogg (100%) rename data/music/{music => }/loss1.ogg (100%) rename data/music/{music => }/militarybase_p.ogg (100%) rename data/music/{music => }/mission.ogg (100%) rename data/music/{music => }/news1.ogg (100%) rename data/music/{music => }/ocean.ogg (100%) rename data/music/{music => }/peace1.ogg (100%) rename data/music/{music => }/peace2.ogg (100%) rename data/music/{music => }/peace3.ogg (100%) rename data/music/{music => }/peace4.ogg (100%) rename data/music/{music => }/peace5.ogg (100%) rename data/music/{music => }/peace5_p.ogg (100%) rename data/music/{music => }/peace6.ogg (100%) rename data/music/{music => }/peace6_p.ogg (100%) rename data/music/{music => }/peace7.ogg (100%) rename data/music/{music => }/snow.ogg (100%) rename data/music/{music => }/steel_p.ogg (100%) rename data/music/{music => }/terranbattle.ogg (100%) rename data/music/{music => }/terranpeace.ogg (100%) rename data/music/{music => }/terranpeace2.ogg (100%) rename data/music/{music => }/university_p.ogg (100%) rename data/music/{music => }/vegastrike-music.spec (100%) rename data/music/{music => }/victory.ogg (100%) rename data/music/{music => }/victory2.ogg (100%) rename data/music/{music => }/victory_p.ogg (100%) diff --git a/data/music/music/AUTHORS b/data/music/AUTHORS similarity index 100% rename from data/music/music/AUTHORS rename to data/music/AUTHORS diff --git a/data/music/music/AyMambo.ogg b/data/music/AyMambo.ogg similarity index 100% rename from data/music/music/AyMambo.ogg rename to data/music/AyMambo.ogg diff --git a/data/music/music/BlackLlama.ogg b/data/music/BlackLlama.ogg similarity index 100% rename from data/music/music/BlackLlama.ogg rename to data/music/BlackLlama.ogg diff --git a/data/music/music/Bliss.ogg b/data/music/Bliss.ogg similarity index 100% rename from data/music/music/Bliss.ogg rename to data/music/Bliss.ogg diff --git a/data/music/music/COPYING b/data/music/COPYING similarity index 100% rename from data/music/music/COPYING rename to data/music/COPYING diff --git a/data/music/music/DepressionChamber.ogg b/data/music/DepressionChamber.ogg similarity index 100% rename from data/music/music/DepressionChamber.ogg rename to data/music/DepressionChamber.ogg diff --git a/data/music/music/DockingProcedures.ogg b/data/music/DockingProcedures.ogg similarity index 100% rename from data/music/music/DockingProcedures.ogg rename to data/music/DockingProcedures.ogg diff --git a/data/music/music/InnerChild.ogg b/data/music/InnerChild.ogg similarity index 100% rename from data/music/music/InnerChild.ogg rename to data/music/InnerChild.ogg diff --git a/data/music/music/LICENSE.STANDALONE b/data/music/LICENSE.STANDALONE similarity index 100% rename from data/music/music/LICENSE.STANDALONE rename to data/music/LICENSE.STANDALONE diff --git a/data/music/music/Machina.ogg b/data/music/Machina.ogg similarity index 100% rename from data/music/music/Machina.ogg rename to data/music/Machina.ogg diff --git a/data/music/music/MezzaMessa.ogg b/data/music/MezzaMessa.ogg similarity index 100% rename from data/music/music/MezzaMessa.ogg rename to data/music/MezzaMessa.ogg diff --git a/data/music/music/SonOfSandFleaRemix.ogg b/data/music/SonOfSandFleaRemix.ogg similarity index 100% rename from data/music/music/SonOfSandFleaRemix.ogg rename to data/music/SonOfSandFleaRemix.ogg diff --git a/data/music/music/Trapped.ogg b/data/music/Trapped.ogg similarity index 100% rename from data/music/music/Trapped.ogg rename to data/music/Trapped.ogg diff --git a/data/music/music/aerapeace.ogg b/data/music/aerapeace.ogg similarity index 100% rename from data/music/music/aerapeace.ogg rename to data/music/aerapeace.ogg diff --git a/data/music/music/aerathemebattle.ogg b/data/music/aerathemebattle.ogg similarity index 100% rename from data/music/music/aerathemebattle.ogg rename to data/music/aerathemebattle.ogg diff --git a/data/music/music/agriculture.ogg b/data/music/agriculture.ogg similarity index 100% rename from data/music/music/agriculture.ogg rename to data/music/agriculture.ogg diff --git a/data/music/music/agriculture_p.ogg b/data/music/agriculture_p.ogg similarity index 100% rename from data/music/music/agriculture_p.ogg rename to data/music/agriculture_p.ogg diff --git a/data/music/music/alienrockalectro.ogg b/data/music/alienrockalectro.ogg similarity index 100% rename from data/music/music/alienrockalectro.ogg rename to data/music/alienrockalectro.ogg diff --git a/data/music/music/alienrockalectro2.ogg b/data/music/alienrockalectro2.ogg similarity index 100% rename from data/music/music/alienrockalectro2.ogg rename to data/music/alienrockalectro2.ogg diff --git a/data/music/music/asteroids.ogg b/data/music/asteroids.ogg similarity index 100% rename from data/music/music/asteroids.ogg rename to data/music/asteroids.ogg diff --git a/data/music/music/battle1.ogg b/data/music/battle1.ogg similarity index 100% rename from data/music/music/battle1.ogg rename to data/music/battle1.ogg diff --git a/data/music/music/battle2.ogg b/data/music/battle2.ogg similarity index 100% rename from data/music/music/battle2.ogg rename to data/music/battle2.ogg diff --git a/data/music/music/battle3electro.ogg b/data/music/battle3electro.ogg similarity index 100% rename from data/music/music/battle3electro.ogg rename to data/music/battle3electro.ogg diff --git a/data/music/music/battle4showdown.ogg b/data/music/battle4showdown.ogg similarity index 100% rename from data/music/music/battle4showdown.ogg rename to data/music/battle4showdown.ogg diff --git a/data/music/music/battle5.ogg b/data/music/battle5.ogg similarity index 100% rename from data/music/music/battle5.ogg rename to data/music/battle5.ogg diff --git a/data/music/music/battle5_p.ogg b/data/music/battle5_p.ogg similarity index 100% rename from data/music/music/battle5_p.ogg rename to data/music/battle5_p.ogg diff --git a/data/music/music/cosmostation.ogg b/data/music/cosmostation.ogg similarity index 100% rename from data/music/music/cosmostation.ogg rename to data/music/cosmostation.ogg diff --git a/data/music/music/cosmostation_crowded.ogg b/data/music/cosmostation_crowded.ogg similarity index 100% rename from data/music/music/cosmostation_crowded.ogg rename to data/music/cosmostation_crowded.ogg diff --git a/data/music/music/funeral.ogg b/data/music/funeral.ogg similarity index 100% rename from data/music/music/funeral.ogg rename to data/music/funeral.ogg diff --git a/data/music/music/galacticbattle.ogg b/data/music/galacticbattle.ogg similarity index 100% rename from data/music/music/galacticbattle.ogg rename to data/music/galacticbattle.ogg diff --git a/data/music/music/industrialmixed.ogg b/data/music/industrialmixed.ogg similarity index 100% rename from data/music/music/industrialmixed.ogg rename to data/music/industrialmixed.ogg diff --git a/data/music/music/isobattle.ogg b/data/music/isobattle.ogg similarity index 100% rename from data/music/music/isobattle.ogg rename to data/music/isobattle.ogg diff --git a/data/music/music/isopeace.ogg b/data/music/isopeace.ogg similarity index 100% rename from data/music/music/isopeace.ogg rename to data/music/isopeace.ogg diff --git a/data/music/music/launch2.ogg b/data/music/launch2.ogg similarity index 100% rename from data/music/music/launch2.ogg rename to data/music/launch2.ogg diff --git a/data/music/music/launch3chatstart.ogg b/data/music/launch3chatstart.ogg similarity index 100% rename from data/music/music/launch3chatstart.ogg rename to data/music/launch3chatstart.ogg diff --git a/data/music/music/launchjoke.ogg b/data/music/launchjoke.ogg similarity index 100% rename from data/music/music/launchjoke.ogg rename to data/music/launchjoke.ogg diff --git a/data/music/music/liftoff.ogg b/data/music/liftoff.ogg similarity index 100% rename from data/music/music/liftoff.ogg rename to data/music/liftoff.ogg diff --git a/data/music/music/lightslease_p.ogg b/data/music/lightslease_p.ogg similarity index 100% rename from data/music/music/lightslease_p.ogg rename to data/music/lightslease_p.ogg diff --git a/data/music/music/loss1.ogg b/data/music/loss1.ogg similarity index 100% rename from data/music/music/loss1.ogg rename to data/music/loss1.ogg diff --git a/data/music/music/militarybase_p.ogg b/data/music/militarybase_p.ogg similarity index 100% rename from data/music/music/militarybase_p.ogg rename to data/music/militarybase_p.ogg diff --git a/data/music/music/mission.ogg b/data/music/mission.ogg similarity index 100% rename from data/music/music/mission.ogg rename to data/music/mission.ogg diff --git a/data/music/music/news1.ogg b/data/music/news1.ogg similarity index 100% rename from data/music/music/news1.ogg rename to data/music/news1.ogg diff --git a/data/music/music/ocean.ogg b/data/music/ocean.ogg similarity index 100% rename from data/music/music/ocean.ogg rename to data/music/ocean.ogg diff --git a/data/music/music/peace1.ogg b/data/music/peace1.ogg similarity index 100% rename from data/music/music/peace1.ogg rename to data/music/peace1.ogg diff --git a/data/music/music/peace2.ogg b/data/music/peace2.ogg similarity index 100% rename from data/music/music/peace2.ogg rename to data/music/peace2.ogg diff --git a/data/music/music/peace3.ogg b/data/music/peace3.ogg similarity index 100% rename from data/music/music/peace3.ogg rename to data/music/peace3.ogg diff --git a/data/music/music/peace4.ogg b/data/music/peace4.ogg similarity index 100% rename from data/music/music/peace4.ogg rename to data/music/peace4.ogg diff --git a/data/music/music/peace5.ogg b/data/music/peace5.ogg similarity index 100% rename from data/music/music/peace5.ogg rename to data/music/peace5.ogg diff --git a/data/music/music/peace5_p.ogg b/data/music/peace5_p.ogg similarity index 100% rename from data/music/music/peace5_p.ogg rename to data/music/peace5_p.ogg diff --git a/data/music/music/peace6.ogg b/data/music/peace6.ogg similarity index 100% rename from data/music/music/peace6.ogg rename to data/music/peace6.ogg diff --git a/data/music/music/peace6_p.ogg b/data/music/peace6_p.ogg similarity index 100% rename from data/music/music/peace6_p.ogg rename to data/music/peace6_p.ogg diff --git a/data/music/music/peace7.ogg b/data/music/peace7.ogg similarity index 100% rename from data/music/music/peace7.ogg rename to data/music/peace7.ogg diff --git a/data/music/music/snow.ogg b/data/music/snow.ogg similarity index 100% rename from data/music/music/snow.ogg rename to data/music/snow.ogg diff --git a/data/music/music/steel_p.ogg b/data/music/steel_p.ogg similarity index 100% rename from data/music/music/steel_p.ogg rename to data/music/steel_p.ogg diff --git a/data/music/music/terranbattle.ogg b/data/music/terranbattle.ogg similarity index 100% rename from data/music/music/terranbattle.ogg rename to data/music/terranbattle.ogg diff --git a/data/music/music/terranpeace.ogg b/data/music/terranpeace.ogg similarity index 100% rename from data/music/music/terranpeace.ogg rename to data/music/terranpeace.ogg diff --git a/data/music/music/terranpeace2.ogg b/data/music/terranpeace2.ogg similarity index 100% rename from data/music/music/terranpeace2.ogg rename to data/music/terranpeace2.ogg diff --git a/data/music/music/university_p.ogg b/data/music/university_p.ogg similarity index 100% rename from data/music/music/university_p.ogg rename to data/music/university_p.ogg diff --git a/data/music/music/vegastrike-music.spec b/data/music/vegastrike-music.spec similarity index 100% rename from data/music/music/vegastrike-music.spec rename to data/music/vegastrike-music.spec diff --git a/data/music/music/victory.ogg b/data/music/victory.ogg similarity index 100% rename from data/music/music/victory.ogg rename to data/music/victory.ogg diff --git a/data/music/music/victory2.ogg b/data/music/victory2.ogg similarity index 100% rename from data/music/music/victory2.ogg rename to data/music/victory2.ogg diff --git a/data/music/music/victory_p.ogg b/data/music/victory_p.ogg similarity index 100% rename from data/music/music/victory_p.ogg rename to data/music/victory_p.ogg diff --git a/engine/src/cmd/music.cpp b/engine/src/cmd/music.cpp index 1db8a3ac42..317ea371e3 100644 --- a/engine/src/cmd/music.cpp +++ b/engine/src/cmd/music.cpp @@ -448,7 +448,9 @@ readerThread( if (foundcache) { *me->music_load_info = wherecache->second; me->freeWav = false; - } + } else if ( !AUDLoadSoundFile( songname, + me->music_load_info, true)) + { VSFileSystem::vs_dprintf(1, "Failed to load music file \"%s\"", songname);} } if (me->freeWav && docacheme) { me->freeWav = false;