From 9d1bfcd88b23a9bdae90804190a57b62ae9b7695 Mon Sep 17 00:00:00 2001
From: dashodanger <none@none.com>
Date: Tue, 1 Oct 2024 19:05:12 -0600
Subject: [PATCH] Adjust ZDoom Fauna module and sound locations

---
 .../{ => games/doom}/data/sounds/DSRATDI1.ogg       | Bin
 .../{ => games/doom}/data/sounds/DSRATDI2.ogg       | Bin
 .../{ => games/doom}/data/sounds/DSRATIDL.ogg       | Bin
 .../{ => games/doom}/data/sounds/FLYBUZZ.ogg        | Bin
 .../{ => games/doom}/data/sounds/RATCRAWL.ogg       | Bin
 .../modules/gzdoom_fauna.lua                        |  12 ++++++------
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename addons/Obsidian Non-Free Addons/{ => games/doom}/data/sounds/DSRATDI1.ogg (100%)
 rename addons/Obsidian Non-Free Addons/{ => games/doom}/data/sounds/DSRATDI2.ogg (100%)
 rename addons/Obsidian Non-Free Addons/{ => games/doom}/data/sounds/DSRATIDL.ogg (100%)
 rename addons/Obsidian Non-Free Addons/{ => games/doom}/data/sounds/FLYBUZZ.ogg (100%)
 rename addons/Obsidian Non-Free Addons/{ => games/doom}/data/sounds/RATCRAWL.ogg (100%)

diff --git a/addons/Obsidian Non-Free Addons/data/sounds/DSRATDI1.ogg b/addons/Obsidian Non-Free Addons/games/doom/data/sounds/DSRATDI1.ogg
similarity index 100%
rename from addons/Obsidian Non-Free Addons/data/sounds/DSRATDI1.ogg
rename to addons/Obsidian Non-Free Addons/games/doom/data/sounds/DSRATDI1.ogg
diff --git a/addons/Obsidian Non-Free Addons/data/sounds/DSRATDI2.ogg b/addons/Obsidian Non-Free Addons/games/doom/data/sounds/DSRATDI2.ogg
similarity index 100%
rename from addons/Obsidian Non-Free Addons/data/sounds/DSRATDI2.ogg
rename to addons/Obsidian Non-Free Addons/games/doom/data/sounds/DSRATDI2.ogg
diff --git a/addons/Obsidian Non-Free Addons/data/sounds/DSRATIDL.ogg b/addons/Obsidian Non-Free Addons/games/doom/data/sounds/DSRATIDL.ogg
similarity index 100%
rename from addons/Obsidian Non-Free Addons/data/sounds/DSRATIDL.ogg
rename to addons/Obsidian Non-Free Addons/games/doom/data/sounds/DSRATIDL.ogg
diff --git a/addons/Obsidian Non-Free Addons/data/sounds/FLYBUZZ.ogg b/addons/Obsidian Non-Free Addons/games/doom/data/sounds/FLYBUZZ.ogg
similarity index 100%
rename from addons/Obsidian Non-Free Addons/data/sounds/FLYBUZZ.ogg
rename to addons/Obsidian Non-Free Addons/games/doom/data/sounds/FLYBUZZ.ogg
diff --git a/addons/Obsidian Non-Free Addons/data/sounds/RATCRAWL.ogg b/addons/Obsidian Non-Free Addons/games/doom/data/sounds/RATCRAWL.ogg
similarity index 100%
rename from addons/Obsidian Non-Free Addons/data/sounds/RATCRAWL.ogg
rename to addons/Obsidian Non-Free Addons/games/doom/data/sounds/RATCRAWL.ogg
diff --git a/addons/Obsidian Non-Free Addons/modules/gzdoom_fauna.lua b/addons/Obsidian Non-Free Addons/modules/gzdoom_fauna.lua
index a9973fa36c..f994b10107 100644
--- a/addons/Obsidian Non-Free Addons/modules/gzdoom_fauna.lua	
+++ b/addons/Obsidian Non-Free Addons/modules/gzdoom_fauna.lua	
@@ -475,7 +475,7 @@ function FAUNA_MODULE.all_done()
 
     local dir = "games/doom/data/"
     gui.wad_merge_sections(dir .. "Fly.wad")
-    gui.wad_insert_file("data/sounds/FLYBUZZ.ogg", "FLYBUZZ")
+    gui.wad_insert_file(dir .. "sounds/FLYBUZZ.ogg", "FLYBUZZ")
   end
 
   if PARAM.bool_rats == 1 then
@@ -483,11 +483,11 @@ function FAUNA_MODULE.all_done()
 
     local dir = "games/doom/data/"
     gui.wad_merge_sections(dir .. "Rats.wad")
-    gui.wad_insert_file("data/sounds/DSRAT.ogg", "DSRAT")
-    gui.wad_insert_file("data/sounds/DSRATIDL.ogg", "DSRATIDL")
-    gui.wad_insert_file("data/sounds/DSRATDI1.ogg", "DSRATDI1")
-    gui.wad_insert_file("data/sounds/DSRATDI2.ogg", "DSRATDI2")
-    gui.wad_insert_file("data/sounds/RATCRAWL.ogg", "RATCRAWL")
+    gui.wad_insert_file(dir .. "sounds/DSRAT.ogg", "DSRAT")
+    gui.wad_insert_file(dir .. "sounds/DSRATIDL.ogg", "DSRATIDL")
+    gui.wad_insert_file(dir .. "sounds/DSRATDI1.ogg", "DSRATDI1")
+    gui.wad_insert_file(dir .. "sounds/DSRATDI2.ogg", "DSRATDI2")
+    gui.wad_insert_file(dir .. "sounds/RATCRAWL.ogg", "RATCRAWL")
   end
 end