diff --git a/Makefile b/Makefile index 4021eec..324d423 100644 --- a/Makefile +++ b/Makefile @@ -113,9 +113,10 @@ $(ISO_IMAGE): $(KERNEL_ELF) limine.conf limine-setup # Copy README and WAD @if [ -f README.md ]; then cp README.md $(ISO_DIR)/; fi - @if [ -f doom1.wad ]; then \ - cp doom1.wad $(ISO_DIR)/; \ - echo " module_path: boot():/doom1.wad" >> $(ISO_DIR)/limine.conf; \ + @if [ -f $(SRC_DIR)/userland/doom/doom1.wad ]; then \ + mkdir -p $(ISO_DIR)/Library/DOOM; \ + cp $(SRC_DIR)/userland/doom/doom1.wad $(ISO_DIR)/Library/DOOM/; \ + echo " module_path: boot():/Library/DOOM/doom1.wad" >> $(ISO_DIR)/limine.conf; \ fi # Copy Wallpapers diff --git a/boredos.iso b/boredos.iso index c6fc81e..f1cf41d 100644 Binary files a/boredos.iso and b/boredos.iso differ diff --git a/build/main.o b/build/main.o index cb8029d..fb41ce1 100644 Binary files a/build/main.o and b/build/main.o differ diff --git a/limine.conf b/limine.conf index 6f018c8..be1fc5f 100644 --- a/limine.conf +++ b/limine.conf @@ -13,4 +13,3 @@ backdrop: 000000 /BoredOS protocol: limine path: boot():/boredos.elf - module_path: boot():/doom1.wad diff --git a/src/kernel/main.c b/src/kernel/main.c index 60c2c82..b6869cf 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -156,6 +156,7 @@ void kmain(void) { fat32_mkdir("/Library/images"); fat32_mkdir("/Library/images/Wallpapers"); fat32_mkdir("/Library/Fonts"); + fat32_mkdir("/Library/DOOM"); if (module_request.response == NULL) { serial_write("[DEBUG] ERROR: Limine Module Response is NULL!\n"); diff --git a/doom1.wad b/src/kernel/userland/doom/doom1.wad similarity index 100% rename from doom1.wad rename to src/kernel/userland/doom/doom1.wad diff --git a/src/kernel/userland/doom/doomgeneric_boredos.c b/src/kernel/userland/doom/doomgeneric_boredos.c index e183c98..1894fae 100644 --- a/src/kernel/userland/doom/doomgeneric_boredos.c +++ b/src/kernel/userland/doom/doomgeneric_boredos.c @@ -121,7 +121,7 @@ int DG_GetKey(int* pressed, unsigned char* key) { int main(int argc, char** argv) { (void)argc; (void)argv; - char* fake_argv[] = {"doom", "-iwad", "A:/doom1.wad"}; + char* fake_argv[] = {"doom", "-iwad", "A:/Library/DOOM/doom1.wad"}; doomgeneric_Create(3, fake_argv); while (1) {