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

Merge branch 'nov20-build-fixes' into 'master'

Browse source 
Nov20 build fixes

See merge request STJr/SRB2Internal!205
This commit is contained in:
Digiku 2018-11-21 17:23:20 -05:00
parent e599428442 c0df7b47c5
commit bb38aa649f
6 changed files with 14 additions and 14 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 = (-1.0f * 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_map.c
View file

@ -134,7 +134,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
{ {
fixed_t vertispeed = spring->info->mass; fixed_t vertispeed = spring->info->mass;
fixed_t horizspeed = spring->info->damage; fixed_t horizspeed = spring->info->damage;
boolean final; boolean final = false;
// Object was already sprung this tic // Object was already sprung this tic
if (object->eflags & MFE_SPRUNG) if (object->eflags & MFE_SPRUNG)

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

@ -1510,7 +1510,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);
@ -1614,11 +1614,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)));

9
src/y_inter.c
View file

@ -1909,8 +1909,8 @@ static void Y_AwardCoopBonuses(void)
} }
ptlives = min( ptlives = min(
((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((players[i].score/50000) - (oldscore/50000), 0) : 0), (INT32)((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((INT32)((players[i].score/50000) - (oldscore/50000)), (INT32)0) : 0),
(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives)); (INT32)(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives));
if (ptlives) if (ptlives)
P_GivePlayerLives(&players[i], ptlives); P_GivePlayerLives(&players[i], ptlives);
@ -1955,9 +1955,8 @@ static void Y_AwardSpecialStageBonus(void)
// grant extra lives right away since tally is faked // grant extra lives right away since tally is faked
ptlives = min( ptlives = min(
((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((players[i].score/50000) - (oldscore/50000), 0) : 0), (INT32)((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((INT32)((players[i].score/50000) - (oldscore/50000)), (INT32)0) : 0),
(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives)); (INT32)(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives));
if (ptlives)
P_GivePlayerLives(&players[i], ptlives); P_GivePlayerLives(&players[i], ptlives);
if (i == consoleplayer) if (i == consoleplayer)