diff --git a/source/duke3d/src/anim.cpp b/source/duke3d/src/anim.cpp index ba2b5f09e..10fc7db3d 100644 --- a/source/duke3d/src/anim.cpp +++ b/source/duke3d/src/anim.cpp @@ -93,6 +93,13 @@ void Anim_Init(void) uint8_t frame; }; + static defaultanmsound const logo[] = + { + { FLY_BY, 1 }, + { PIPEBOMB_EXPLODE, 19 }, + }; + +#ifndef EDUKE32_STANDALONE static defaultanmsound const cineov2[] = { { WIND_AMBIENCE, 1 }, @@ -117,12 +124,6 @@ void Anim_Init(void) { PIPEBOMB_EXPLODE, 158 }, }; - static defaultanmsound const logo[] = - { - { FLY_BY, 1 }, - { PIPEBOMB_EXPLODE, 19 }, - }; - static defaultanmsound const vol42a[] = { { INTRO4_B, 1 }, @@ -165,7 +166,7 @@ void Anim_Init(void) { DUKE_UNDERWATER, 40 }, { BIGBANG, 50 }, }; - +#endif struct defaultanm { char const *fn; @@ -235,7 +236,7 @@ int32_t Anim_Play(const char *fn) uint16_t framenum = 0; while (getrendermode() >= REND_POLYMOST) // if, really { - char *dot = Bstrrchr(fn, '.'); + char const * dot = Bstrrchr(fn, '.'); if (!dot) break; diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp index 3b06187b8..d746d8e78 100644 --- a/source/duke3d/src/menus.cpp +++ b/source/duke3d/src/menus.cpp @@ -69,10 +69,12 @@ static FORCE_INLINE void WithSDL2_StopTextInput() #endif } +#ifndef EDUKE32_STANDALONE static void mgametext(int32_t x, int32_t y, char const * t) { G_ScreenText(MF_Bluefont.tilenum, x, y, MF_Bluefont.zoom, 0, 0, t, 0, MF_Bluefont.pal, 2|8|16|ROTATESPRITE_FULL16, 0, MF_Bluefont.emptychar.x, MF_Bluefont.emptychar.y, MF_Bluefont.between.x, MF_Bluefont.between.y, MF_Bluefont.textflags, 0, 0, xdim-1, ydim-1); } +#endif static vec2_t mgametextcenter(int32_t x, int32_t y, char const * t, int32_t f = 0) { return G_ScreenText(MF_Bluefont.tilenum, (MENU_MARGIN_CENTER<<16) + x, y, MF_Bluefont.zoom, 0, 0, t, 0, MF_Bluefont.pal, 2|8|16|ROTATESPRITE_FULL16, 0, MF_Bluefont.emptychar.x, MF_Bluefont.emptychar.y, MF_Bluefont.between.x, MF_Bluefont.between.y, MF_Bluefont.textflags|f|TEXT_XCENTER, 0, 0, xdim-1, ydim-1);