id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-14 22:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'RBDOOM/master'

Browse source
This commit is contained in:
Robert Beckebans 2015-05-01 15:10:23 +02:00
commit ee2934781f
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
neo/CMakeLists.txt
View file

@ -78,12 +78,12 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
#endif()
# the warnings are used for every profile anyway, so put them in a variable
set(my_warn_flags "-Wno-pragmas -Wno-unused-variable -Wno-unused-but-set-variable -Wno-switch -Wno-unused-value -Winvalid-pch -Wno-multichar")
set(my_warn_flags "-Wno-pragmas -Wno-unused-variable -Wno-switch -Wno-unused-value -Winvalid-pch -Wno-multichar")
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
# append clang-specific settings for warnings (the second one make sure clang doesn't complain
# about unknown -W flags, like -Wno-unused-but-set-variable)
set(my_warn_flags "${my_warn_flags} -Wno-local-type-template-args -Wno-unknown-warning-option -Wno-inline-new-delete")
set(my_warn_flags "${my_warn_flags} -Wno-local-type-template-args -Wno-unknown-warning-option -Wno-inline-new-delete -Wno-switch-enum")
endif()
if(NOT CMAKE_CROSSCOMPILING AND ONATIVE)

2
neo/d3xp/SecurityCamera.cpp
View file

@ -146,7 +146,7 @@ void idSecurityCamera::Spawn()
}
negativeSweep = ( sweepAngle < 0 ) ? true : false;
sweepAngle = abs( sweepAngle );
sweepAngle = idMath::Fabs( sweepAngle );
scanFovCos = cos( scanFov * idMath::PI / 360.0f );

2
neo/d3xp/ai/AI.cpp
View file

@ -2465,7 +2465,7 @@ bool idAI::NewWanderDir( const idVec3& dest )
}
// try other directions
if( ( gameLocal.random.RandomInt() & 1 ) || abs( deltay ) > abs( deltax ) )
if( ( gameLocal.random.RandomInt() & 1 ) || idMath::Fabs( deltay ) > idMath::Fabs( deltax ) )
{
tdir = d[ 1 ];
d[ 1 ] = d[ 2 ];