From 4522b4953ea1a11a5b29f604d0933663b1e67f81 Mon Sep 17 00:00:00 2001 From: Eidolon Date: Wed, 4 Jan 2023 19:36:33 -0600 Subject: [PATCH] core: change SRB2WADDIR var to RINGRACERSWADDIR --- src/sdl/SDL_main/SDL_macosx_main.m | 4 ++-- src/sdl/i_system.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sdl/SDL_main/SDL_macosx_main.m b/src/sdl/SDL_main/SDL_macosx_main.m index 226afe13d..273dcfd39 100644 --- a/src/sdl/SDL_main/SDL_macosx_main.m +++ b/src/sdl/SDL_main/SDL_macosx_main.m @@ -287,8 +287,8 @@ static void CustomApplicationMain (int argc, char **argv) [self fixMenu:[NSApp mainMenu] withAppName:getApplicationName()]; #endif - if (!getenv("SRB2WADDIR")) - setenv("SRB2WADDIR", [[[NSBundle mainBundle] resourcePath] UTF8String], 1); + if (!getenv("RINGRACERSWADDIR")) + setenv("RINGRACERSWADDIR", [[[NSBundle mainBundle] resourcePath] UTF8String], 1); /* Hand off to main application code */ status = SDL_main (gArgc, gArgv); diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index b390b6d1e..515dc3e95 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -989,7 +989,7 @@ INT32 I_GetJoystickDeviceIndex(SDL_GameController *dev) SDL_Joystick *joystick = NULL; joystick = SDL_GameControllerGetJoystick(dev); - + if (joystick) { return SDL_JoystickInstanceID(joystick); @@ -2242,9 +2242,9 @@ static const char *locateWad(void) const char *envstr; const char *WadPath; - I_OutputMsg("SRB2WADDIR"); - // does SRB2WADDIR exist? - if (((envstr = I_GetEnv("SRB2WADDIR")) != NULL) && isWadPathOk(envstr)) + I_OutputMsg("RINGRACERSWADDIR"); + // does RINGRACERSWADDIR exist? + if (((envstr = I_GetEnv("RINGRACERSWADDIR")) != NULL) && isWadPathOk(envstr)) return envstr; #ifndef NOCWD