From 481369cc6c78bfae8d9231b82827b18b4cbdb6c8 Mon Sep 17 00:00:00 2001 From: Lach <54614944+lachablock@users.noreply.github.com> Date: Wed, 2 Nov 2022 23:25:30 +1100 Subject: [PATCH 1/2] Use SDL version of executable icon at runtime on macOS --- src/sdl/i_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 02bea08d5..bb2b9f13c 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -42,7 +42,7 @@ #ifdef HAVE_IMAGE #include "SDL_image.h" -#elif 1 +#elif (!defined(__APPLE__)) #define LOAD_XPM //I want XPM! #include "IMG_xpm.c" //Alam: I don't want to add SDL_Image.dll/so #define HAVE_IMAGE //I have SDL_Image, sortof From 7e7d45e20933b0a58c10998f0cff4b55c03c3f64 Mon Sep 17 00:00:00 2001 From: Callmore <22885888+Callmore@users.noreply.github.com> Date: Fri, 4 Nov 2022 21:15:19 +0000 Subject: [PATCH 2/2] No more fucking arbitrary numbers --- src/d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_main.c b/src/d_main.c index b2591b948..0d36fc8e2 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1311,7 +1311,7 @@ void D_SRB2Main(void) // // search for maps // - for (wadnum = 4; wadnum < 6; wadnum++) // fucking arbitrary numbers + for (wadnum = 0; wadnum < mainwads; wadnum++) { lumpinfo = wadfiles[wadnum]->lumpinfo; for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)