zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Christoph Oelckers 2014-01-17 20:45:20 +01:00
parent af3e619232 9a74f96702
commit e126c3ec2f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CMakeLists.txt
View File

@ -1126,10 +1126,11 @@ if( NOT WIN32 )
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/link-make COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/link-make
COMMAND /bin/sh -c ${CMAKE_CURRENT_BINARY_DIR}/link-make ) COMMAND /bin/sh -c ${CMAKE_CURRENT_BINARY_DIR}/link-make )
endif( NOT WIN32 ) endif( NOT WIN32 )
if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
# GCC misoptimizes this file # GCC misoptimizes this file
set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" ) set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" )
endif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
# Need to enable intrinsics for this file. # Need to enable intrinsics for this file.
if( SSE_MATTERS ) if( SSE_MATTERS )
set_source_files_properties( x86.cpp PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" ) set_source_files_properties( x86.cpp PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )

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

@ -608,7 +608,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;
} }
@ -620,7 +620,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;
} }

3
src/sdl/i_system.cpp
View File

@ -704,8 +704,7 @@ int I_PickIWad (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
printf ("%d. %s (%s)\n", i+1, wads[i].Name.GetChars(), filepart); printf ("%d. %s (%s)\n", i+1, wads[i].Name.GetChars(), filepart);
} }
printf ("Which one? "); printf ("Which one? ");
scanf ("%d", &i); if (scanf ("%d", &i) != 1 || i > numwads)
if (i > numwads)
return -1; return -1;
return i-1; return i-1;
} }