zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'viewpitch_overflow_fix' of https://github.com/edward-san/zdoom into maint

Browse source
This commit is contained in:
Christoph Oelckers 2014-01-17 20:43:03 +01:00
commit 9a74f96702
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_game.cpp
View file

@ -775,7 +775,7 @@ void G_AddViewPitch (int look)
else if (look > 0) else if (look > 0)
{ {
// Avoid overflowing // Avoid overflowing
if (LocalViewPitch + look <= LocalViewPitch) if (LocalViewPitch > INT_MAX - look)
{ {
LocalViewPitch = 0x78000000; LocalViewPitch = 0x78000000;
} }
@ -787,7 +787,7 @@ void G_AddViewPitch (int look)
else if (look < 0) else if (look < 0)
{ {
// Avoid overflowing // Avoid overflowing
if (LocalViewPitch + look >= LocalViewPitch) if (LocalViewPitch < INT_MIN - look)
{ {
LocalViewPitch = -0x78000000; LocalViewPitch = -0x78000000;
} }

4
src/r_utility.cpp
View file

@ -602,7 +602,7 @@ void R_InterpolateView (player_t *player, fixed_t frac, InterpolationViewer *ivi
if (delta > 0) if (delta > 0)
{ {
// Avoid overflowing viewpitch (can happen when a netgame is stalled) // Avoid overflowing viewpitch (can happen when a netgame is stalled)
if (viewpitch + delta <= viewpitch) if (viewpitch > INT_MAX - delta)
{ {
viewpitch = player->MaxPitch; viewpitch = player->MaxPitch;
} }
@ -614,7 +614,7 @@ void R_InterpolateView (player_t *player, fixed_t frac, InterpolationViewer *ivi
else if (delta < 0) else if (delta < 0)
{ {
// Avoid overflowing viewpitch (can happen when a netgame is stalled) // Avoid overflowing viewpitch (can happen when a netgame is stalled)
if (viewpitch + delta >= viewpitch) if (viewpitch < INT_MIN - delta)
{ {
viewpitch = player->MinPitch; viewpitch = player->MinPitch;
} }