From 428e1c182f87bcda0f39eade57f5e2f7cf8d44c3 Mon Sep 17 00:00:00 2001
From: dashodanger <none@none.com>
Date: Wed, 2 Oct 2024 08:20:03 -0600
Subject: [PATCH] More resource updates

---
 data/licenses/License Attribution.txt               |   4 ++--
 .../games => games}/doom/data/doom_falls.wad        | Bin
 .../games => games}/doom/data/lift_flat.wad         | Bin
 .../games => games}/doom/data/metal_step.wad        | Bin
 .../games => games}/doom/data/short_bars.wad        | Bin
 .../games => games}/doom/data/vine_dude.wad         | Bin
 games/doom/resources.lua                            |  10 +++++-----
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename {addons/Obsidian Non-Free Addons/games => games}/doom/data/doom_falls.wad (100%)
 rename {addons/Obsidian Non-Free Addons/games => games}/doom/data/lift_flat.wad (100%)
 rename {addons/Obsidian Non-Free Addons/games => games}/doom/data/metal_step.wad (100%)
 rename {addons/Obsidian Non-Free Addons/games => games}/doom/data/short_bars.wad (100%)
 rename {addons/Obsidian Non-Free Addons/games => games}/doom/data/vine_dude.wad (100%)

diff --git a/data/licenses/License Attribution.txt b/data/licenses/License Attribution.txt
index 5b27871b23..38c8a8505e 100644
--- a/data/licenses/License Attribution.txt	
+++ b/data/licenses/License Attribution.txt	
@@ -15,9 +15,9 @@ BSD 3-Clause License
 				Copyright (c) 1990, Jeff Sparkes.
 				Copyright (c) 1989, Georgia Tech Research Corporation (GTRC), Atlanta, GA 30332.
 
-Blasphemer (HERETIC1 loading image) - Copyright (c) 2021 Contributors to the Blasphemer project
+Blasphemer (Assorted graphic assets) - Copyright (c) 2021 Contributors to the Blasphemer project
 
-Freedoom (Icon of Sin replacement graphics) - Copyright (c) 2001-2019 Contributors to the Freedoom project
+Freedoom (Assorted graphic assets) - Copyright (c) 2001-2019 Contributors to the Freedoom project
 
 ===========================================================================================
 CC0 1.0 Universal License
diff --git a/addons/Obsidian Non-Free Addons/games/doom/data/doom_falls.wad b/games/doom/data/doom_falls.wad
similarity index 100%
rename from addons/Obsidian Non-Free Addons/games/doom/data/doom_falls.wad
rename to games/doom/data/doom_falls.wad
diff --git a/addons/Obsidian Non-Free Addons/games/doom/data/lift_flat.wad b/games/doom/data/lift_flat.wad
similarity index 100%
rename from addons/Obsidian Non-Free Addons/games/doom/data/lift_flat.wad
rename to games/doom/data/lift_flat.wad
diff --git a/addons/Obsidian Non-Free Addons/games/doom/data/metal_step.wad b/games/doom/data/metal_step.wad
similarity index 100%
rename from addons/Obsidian Non-Free Addons/games/doom/data/metal_step.wad
rename to games/doom/data/metal_step.wad
diff --git a/addons/Obsidian Non-Free Addons/games/doom/data/short_bars.wad b/games/doom/data/short_bars.wad
similarity index 100%
rename from addons/Obsidian Non-Free Addons/games/doom/data/short_bars.wad
rename to games/doom/data/short_bars.wad
diff --git a/addons/Obsidian Non-Free Addons/games/doom/data/vine_dude.wad b/games/doom/data/vine_dude.wad
similarity index 100%
rename from addons/Obsidian Non-Free Addons/games/doom/data/vine_dude.wad
rename to games/doom/data/vine_dude.wad
diff --git a/games/doom/resources.lua b/games/doom/resources.lua
index 33332c1892..873ebc3aeb 100644
--- a/games/doom/resources.lua
+++ b/games/doom/resources.lua
@@ -944,15 +944,15 @@ function DOOM.all_done()
 
   local dir = "games/doom/data/"
 
-  --gui.wad_merge_sections(dir .. "doom_falls.wad")
-  --gui.wad_merge_sections(dir .. "lift_flat.wad")
-  --gui.wad_merge_sections(dir .. "metal_step.wad")
-  --gui.wad_merge_sections(dir .. "vine_dude.wad")
+  gui.wad_merge_sections(dir .. "doom_falls.wad")
+  gui.wad_merge_sections(dir .. "lift_flat.wad")
+  gui.wad_merge_sections(dir .. "metal_step.wad")
+  gui.wad_merge_sections(dir .. "vine_dude.wad")
   gui.wad_merge_sections(dir .. "logos.wad")
   gui.wad_merge_sections(dir .. "invisible_wall.wad")
 
   if OB_CONFIG.game == "doom1" or OB_CONFIG.game == "ultdoom" then
-    --gui.wad_merge_sections(dir .. "short_bars.wad")
+    gui.wad_merge_sections(dir .. "short_bars.wad")
   end
 
   if ob_mod_enabled("compress_output") == 1 then