diff --git a/src/d_main.c b/src/d_main.c
index 4cdfb13d92b87c03697fba302442b0604549b065..fbec5f7d8d35fcaf4adb0cb02052013098ee00a3 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -730,11 +730,6 @@ void D_StartTitle(void)
CON_ToggleOff();
// Reset the palette
-#ifdef HWRENDER
- if (rendermode == render_opengl)
- HWR_SetPaletteColor(0);
- else
-#endif
if (rendermode != render_none)
V_SetPaletteLump("PLAYPAL");
}
@@ -1223,7 +1218,7 @@ void D_SRB2Main(void)
CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n");
R_Init();
- // setting up sound
+ // setting up sound
if (dedicated)
{
nosound = true;
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 81021ef7f1edce65002771940633eee2086454c5..a5fe6b67322595d4ca69cb5badefaa3f123ec0e2 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -2901,8 +2901,8 @@ static boolean HWR_CheckBBox(fixed_t *bspcoord)
py2 = bspcoord[checkcoord[boxpos][3]];
// check clip list for an open space
- angle1 = R_PointToAngle(px1, py1) - dup_viewangle;
- angle2 = R_PointToAngle(px2, py2) - dup_viewangle;
+ angle1 = R_PointToAngle2(dup_viewx>>1, dup_viewy>>1, px1>>1, py1>>1) - dup_viewangle;
+ angle2 = R_PointToAngle2(dup_viewx>>1, dup_viewy>>1, px2>>1, py2>>1) - dup_viewangle;
span = angle1 - angle2;
@@ -4228,6 +4228,9 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
i = 0;
temp = FLOAT_TO_FIXED(realtop);
+ if (spr->mobj->frame & FF_FULLBRIGHT)
+ lightlevel = 255;
+
#ifdef ESLOPE
for (i = 1; i < sector->numlights; i++)
{
@@ -4235,14 +4238,16 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
: sector->lightlist[i].height;
if (h <= temp)
{
- lightlevel = *list[i-1].lightlevel;
+ if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ lightlevel = *list[i-1].lightlevel;
colormap = list[i-1].extra_colormap;
break;
}
}
#else
i = R_GetPlaneLight(sector, temp, false);
- lightlevel = *list[i].lightlevel;
+ if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ lightlevel = *list[i].lightlevel;
colormap = list[i].extra_colormap;
#endif
@@ -4257,7 +4262,8 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
// even if we aren't changing colormap or lightlevel, we still need to continue drawing down the sprite
if (!(list[i].flags & FF_NOSHADE) && (list[i].flags & FF_CUTSPRITES))
{
- lightlevel = *list[i].lightlevel;
+ if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ lightlevel = *list[i].lightlevel;
colormap = list[i].extra_colormap;
}
diff --git a/src/m_fixed.c b/src/m_fixed.c
index ce7471a28dac8cbd57aa96c58ed74d04fc00ded3..014457386030740900f05ebd5048a37e522ddddf 100644
--- a/src/m_fixed.c
+++ b/src/m_fixed.c
@@ -33,7 +33,9 @@
*/
fixed_t FixedMul(fixed_t a, fixed_t b)
{
- return (fixed_t)((((INT64)a * b) ) / FRACUNIT);
+ // Need to cast to unsigned before shifting to avoid undefined behaviour
+ // for negative integers
+ return (fixed_t)(((UINT64)((INT64)a * b)) >> FRACBITS);
}
#endif //__USE_C_FIXEDMUL__
diff --git a/src/m_menu.c b/src/m_menu.c
index 0ab771579c288f4f7453826d3a2e649409ececac..79ac6800b7cf18a7fb7df362f37dc5329f150e4a 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -6543,7 +6543,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
if (choice < 32 || choice > 127 || itemOn != 0)
break;
l = strlen(setupm_name);
- if (l < MAXPLAYERNAME-1)
+ if (l < MAXPLAYERNAME)
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_name[l] =(char)choice;
diff --git a/src/p_setup.c b/src/p_setup.c
index 52cd6ddbb1c1dd404cd12c83e0f4dca727a5b26b..d8c913e0f0730fda1484aefb29d95c178db2dd9c 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2503,11 +2503,6 @@ boolean P_SetupLevel(boolean skipprecip)
// Reset the palette
-#ifdef HWRENDER
- if (rendermode == render_opengl)
- HWR_SetPaletteColor(0);
- else
-#endif
if (rendermode != render_none)
V_SetPaletteLump("PLAYPAL");
@@ -3003,7 +2998,7 @@ boolean P_AddWadFile(const char *wadfilename, char **firstmapname)
if ((numlumps = W_LoadWadFile(wadfilename)) == INT16_MAX)
{
- CONS_Printf(M_GetText("Errors occured while loading %s; not added.\n"), wadfilename);
+ CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), wadfilename);
return false;
}
else wadnum = (UINT16)(numwadfiles-1);
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 87ce84158ed90afe61d422dd3b8bffa817a6677b..4eab0ae3ccfaf2a4fa6abac78f388e3f47b4c07b 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -658,6 +658,14 @@ static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
SDL_memset(&event, 0, sizeof(event_t));
+ // Ignore the event if the mouse is not actually focused on the window.
+ // This can happen if you used the mouse to restore keyboard focus;
+ // this apparently makes a mouse button down event but not a mouse button up event,
+ // resulting in whatever key was pressed down getting "stuck" if we don't ignore it.
+ // -- Monster Iestyn (28/05/18)
+ if (SDL_GetMouseFocus() != window)
+ return;
+
/// \todo inputEvent.button.which
if (USE_MOUSEINPUT)
{
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 3562a9b713ef11bfec43436917ca56afbfa700bb..72e0b6b94c882881db6a7f7de6f616c287722817 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -210,17 +210,17 @@ void ST_doPaletteStuff(void)
else
palette = 0;
+#ifdef HWRENDER
+ if (rendermode == render_opengl)
+ palette = 0; // No flashpals here in OpenGL
+#endif
+
palette = min(max(palette, 0), 13);
if (palette != st_palette)
{
st_palette = palette;
-#ifdef HWRENDER
- if (rendermode == render_opengl)
- HWR_SetPaletteColor(0);
- else
-#endif
if (rendermode != render_none)
{
V_SetPaletteLump(GetPalette()); // Reset the palette