diff --git a/source/duke3d/src/common.cpp b/source/duke3d/src/common.cpp index 0045364ac..c21448028 100644 --- a/source/duke3d/src/common.cpp +++ b/source/duke3d/src/common.cpp @@ -509,7 +509,7 @@ void G_LoadGroups(int32_t autoload) pathsearchmode = bakpathsearchmode; } -#ifdef _WIN32 +#if defined _WIN32 && !defined EDUKE32_STANDALONE static int G_ReadRegistryValue(char const * const SubKey, char const * const Value, char * const Output, DWORD * OutputSize) { // KEY_WOW64_32KEY gets us around Wow6432Node on 64-bit builds diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp index 39a594fe0..62378a6a4 100644 --- a/source/duke3d/src/gamedef.cpp +++ b/source/duke3d/src/gamedef.cpp @@ -6333,8 +6333,8 @@ void C_Compile(const char *fileName) { if (g_loadFromGroupOnly == 1 || numgroupfiles == 0) { - char const *gf = G_GrpFile(); #ifndef EDUKE32_STANDALONE + char const *gf = G_GrpFile(); Bsprintf(tempbuf,"Required game data was not found. A valid copy of \"%s\" or other compatible data is needed to run EDuke32.\n\n" "You can find \"%s\" in the \"DN3DINST\" or \"ATOMINST\" directory on your Duke Nukem 3D installation disc.\n\n" "Please copy \"%s\" to your game directory and restart EDuke32!", gf, gf, gf); diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp index b25e42153..610588186 100644 --- a/source/duke3d/src/menus.cpp +++ b/source/duke3d/src/menus.cpp @@ -77,6 +77,7 @@ static int32_t mgametext_xbetween = -(1<<16); #define mmenutext(x,y,t) G_ScreenText(BIGALPHANUM, x, (y) - (12<<16), 65536L, 0, 0, (const char *)OSD_StripColors(menutextbuf,t), 0, 0, 2|8|16|ROTATESPRITE_FULL16, 0, 5<<16, 16<<16, 0, 0, TEXT_BIGALPHANUM|TEXT_UPPERCASE|TEXT_LITERALESCAPE, 0, 0, xdim-1, ydim-1) #define mmenutextcenter(x,y,t) G_ScreenText(BIGALPHANUM, (MENU_MARGIN_CENTER<<16) + (x), (y) - (12<<16), 65536L, 0, 0, (const char *)OSD_StripColors(menutextbuf,t), 0, 0, 2|8|16|ROTATESPRITE_FULL16, 0, 5<<16, 16<<16, 0, 0, TEXT_BIGALPHANUM|TEXT_UPPERCASE|TEXT_LITERALESCAPE|TEXT_XCENTER, 0, 0, xdim-1, ydim-1) +#ifndef EDUKE32_STANDALONE static void shadowminitext(int32_t x, int32_t y, const char *t, int32_t p) { int32_t f = 0; @@ -86,6 +87,7 @@ static void shadowminitext(int32_t x, int32_t y, const char *t, int32_t p) G_ScreenTextShadow(1, 1, MINIFONT, x, y, 65536, 0, 0, t, 0, p, 2|8|16|ROTATESPRITE_FULL16, 0, 4<<16, 8<<16, 1<<16, 0, f, 0, 0, xdim-1, ydim-1); } +#endif static void creditsminitext(int32_t x, int32_t y, const char *t, int32_t p) { int32_t f = TEXT_XCENTER;