Merge remote-tracking branch 'KartKrew/master' into Galactic

This commit is contained in:
Galactice committed 2022-12-15 14:56:44 -05:00
commit dbac87abba
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -1322,7 +1322,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++)
+1 -1
View File
@@ -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