zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix standalone warnings.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6288 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-06-27 01:50:48 +00:00
parent 10d478eba8
commit 6487dc0db6
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/duke3d/src/anim.cpp
View file

@ -93,6 +93,13 @@ void Anim_Init(void)
uint8_t frame; uint8_t frame;
}; };
static defaultanmsound const logo[] =
{
{ FLY_BY, 1 },
{ PIPEBOMB_EXPLODE, 19 },
};
#ifndef EDUKE32_STANDALONE
static defaultanmsound const cineov2[] = static defaultanmsound const cineov2[] =
{ {
{ WIND_AMBIENCE, 1 }, { WIND_AMBIENCE, 1 },
@ -117,12 +124,6 @@ void Anim_Init(void)
{ PIPEBOMB_EXPLODE, 158 }, { PIPEBOMB_EXPLODE, 158 },
}; };
static defaultanmsound const logo[] =
{
{ FLY_BY, 1 },
{ PIPEBOMB_EXPLODE, 19 },
};
static defaultanmsound const vol42a[] = static defaultanmsound const vol42a[] =
{ {
{ INTRO4_B, 1 }, { INTRO4_B, 1 },
@ -165,7 +166,7 @@ void Anim_Init(void)
{ DUKE_UNDERWATER, 40 }, { DUKE_UNDERWATER, 40 },
{ BIGBANG, 50 }, { BIGBANG, 50 },
}; };
#endif
struct defaultanm { struct defaultanm {
char const *fn; char const *fn;
@ -235,7 +236,7 @@ int32_t Anim_Play(const char *fn)
uint16_t framenum = 0; uint16_t framenum = 0;
while (getrendermode() >= REND_POLYMOST) // if, really while (getrendermode() >= REND_POLYMOST) // if, really
{ {
char *dot = Bstrrchr(fn, '.'); char const * dot = Bstrrchr(fn, '.');
if (!dot) if (!dot)
break; break;

2
source/duke3d/src/menus.cpp
View file

@ -69,10 +69,12 @@ static FORCE_INLINE void WithSDL2_StopTextInput()
#endif #endif
} }
#ifndef EDUKE32_STANDALONE
static void mgametext(int32_t x, int32_t y, char const * t) 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); 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) 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); 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);