lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VC build fixes

This commit is contained in:
Marco Z 2018-11-20 21:54:20 -05:00
parent 0af071dbca
commit ddd357d27c
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/hw_main.c
View File

@ -5731,7 +5731,7 @@ static void HWR_DrawSkyBackground(player_t *player)
dimensionmultiply = ((float)textures[texturetranslation[skytexture]]->width/256.0f); dimensionmultiply = ((float)textures[texturetranslation[skytexture]]->width/256.0f);
v[0].sow = v[3].sow = ((float) (-angle) / ((ANGLE_90-1)*dimensionmultiply)); // left v[0].sow = v[3].sow = ((float) (-(float)angle) / ((ANGLE_90-1)*dimensionmultiply)); // left
v[2].sow = v[1].sow = v[0].sow + (1.0f/dimensionmultiply); // right (or left + 1.0f) v[2].sow = v[1].sow = v[0].sow + (1.0f/dimensionmultiply); // right (or left + 1.0f)
// use +angle and -1.0f above instead if you wanted old backwards behavior // use +angle and -1.0f above instead if you wanted old backwards behavior

2
src/m_cheat.c
View File

@ -571,7 +571,7 @@ void Command_Teleport_f(void)
} }
else // scan the thinkers to find starposts... else // scan the thinkers to find starposts...
{ {
mobj_t *mo2; mobj_t *mo2 = NULL;
thinker_t *th; thinker_t *th;
INT32 starpostmax = 0; INT32 starpostmax = 0;

2
src/p_saveg.c
View File

@ -486,7 +486,7 @@ static UINT32 num_ffloors = 0; // for loading
// But also check for equality and return the matching index // But also check for equality and return the matching index
static UINT32 CheckAddNetColormapToList(extracolormap_t *extra_colormap) static UINT32 CheckAddNetColormapToList(extracolormap_t *extra_colormap)
{ {
extracolormap_t *exc, *exc_prev; extracolormap_t *exc, *exc_prev = NULL;
UINT32 i = 0; UINT32 i = 0;
if (!net_colormaps) if (!net_colormaps)

9
src/st_stuff.c
View File

@ -1509,7 +1509,7 @@ static void ST_drawNiGHTSLink(void)
else else
colornum = linkColor[mag][sel]; colornum = linkColor[mag][sel];
aflag |= ((stplyr->linktimer < nightslinktics/3) aflag |= ((stplyr->linktimer < (UINT32)nightslinktics/3)
? (9 - 9*stplyr->linktimer/(nightslinktics/3)) << V_ALPHASHIFT ? (9 - 9*stplyr->linktimer/(nightslinktics/3)) << V_ALPHASHIFT
: 0); : 0);
@ -1613,11 +1613,12 @@ static void ST_drawNiGHTSHUD(void)
#endif #endif
ST_DrawTopLeftOverlayPatch(16, 8, nbracket); ST_DrawTopLeftOverlayPatch(16, 8, nbracket);
if (G_IsSpecialStage(gamemap)) if (G_IsSpecialStage(gamemap))
ST_DrawTopLeftOverlayPatch(24, 16, (
#ifdef MANIASPHERES #ifdef MANIASPHERES
(stplyr->bonustime && (leveltime & 4)) ? nssbon : ST_DrawTopLeftOverlayPatch(24, 16, (
(stplyr->bonustime && (leveltime & 4)) ? nssbon : nsshud));
#else
ST_DrawTopLeftOverlayPatch(24, 16, (nsshud));
#endif #endif
nsshud));
else else
ST_DrawTopLeftOverlayPatch(24, 16, *(((stplyr->bonustime) ? nbon : nhud)+((leveltime/2)%12))); ST_DrawTopLeftOverlayPatch(24, 16, *(((stplyr->bonustime) ? nbon : nhud)+((leveltime/2)%12)));