OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Randy Heit 2016-02-18 22:05:40 -06:00
commit fbbaae781b
11 changed files with 39 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/CMakeLists.txt
View file

@ -35,14 +35,6 @@ if( CMAKE_SIZEOF_VOID_P MATCHES "8" )
set( X64 64 )
endif()
if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
set ( FASTMATH "-ffast-math" )
else()
if ( MSVC )
set ( FASTMATH "/fp:fast" )
endif()
endif()
# You can either use "make install" on the FMOD distribution to put it
# in standard system locations, or you can unpack the FMOD distribution
# in the root of the zdoom tree. e.g.:
@ -866,6 +858,7 @@ set( NOT_COMPILED_SOURCE_FILES
asm_x86_64/tmap3.s
)
# Enable fast math for some sources
set( FASTMATH_SOURCES
r_swrenderer.cpp
r_3dfloors.cpp
@ -1203,12 +1196,12 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE
zzautozend.cpp
)
set_source_files_properties( ${FASTMATH_SOURCES} PROPERTIES COMPILE_FLAGS ${FASTMATH} )
set_source_files_properties( ${FASTMATH_SOURCES} PROPERTIES COMPILE_FLAGS ${ZD_FASTMATH_FLAG} )
set_source_files_properties( xlat/parse_xlat.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c" )
set_source_files_properties( sc_man.cpp PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h" )
set_source_files_properties( ${NOT_COMPILED_SOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE )
if ( WIN32 )
set_source_files_properties( win32/fb_d3d9.cpp win32/fb_d3d9_wipe.cpp PROPERTIES COMPILE_FLAGS ${FASTMATH} )
set_source_files_properties( win32/fb_d3d9.cpp win32/fb_d3d9_wipe.cpp PROPERTIES COMPILE_FLAGS ${ZD_FASTMATH_FLAG} )
endif()

1
src/g_strife/a_strifestuff.cpp
View file

@ -20,6 +20,7 @@
#include "v_font.h"
#include "farchive.h"
#include "p_spec.h"
#include "portal.h"
// Include all the other Strife stuff here to reduce compile time
#include "a_acolyte.cpp"

3
src/r_utility.cpp
View file

@ -34,7 +34,7 @@
#include "doomstat.h"
#include "m_random.h"
#include "m_bbox.h"
#include "p_local.h"
#include "portal.h"
#include "r_sky.h"
#include "st_stuff.h"
#include "c_cvars.h"
@ -57,6 +57,7 @@
#include "farchive.h"
#include "r_utility.h"
#include "d_player.h"
#include "portal.h"
// EXTERNAL DATA DECLARATIONS ----------------------------------------------

27
src/thingdef/thingdef_codeptr.cpp
View file

@ -3210,28 +3210,23 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_JumpIf)
// A_CountdownArg
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CountdownArg)
{
PARAM_ACTION_PROLOGUE;
PARAM_INT(argnum);
PARAM_STATE_OPT(state) { state = self->FindState(NAME_Death); }
PARAM_INT(cnt);
PARAM_STATE_OPT(state) { state = self->FindState(NAME_Death); }
if (argnum >= 0 && argnum < (int)countof(self->args))
if (cnt<0 || cnt >= 5) return 0;
if (!self->args[cnt]--)
{
if (!self->args[argnum]--)
if (self->flags&MF_MISSILE)
{
if (self->flags & MF_MISSILE)
{
P_ExplodeMissile(self, NULL, NULL);
}
else if (self->flags & MF_SHOOTABLE)
{
P_DamageMobj(self, NULL, NULL, self->health, NAME_None, DMG_FORCED);
}
else
{
self->SetState(self->FindState(NAME_Death));
}
P_ExplodeMissile(self, NULL, NULL);
}
else if (self->flags&MF_SHOOTABLE)
{
P_DamageMobj(self, NULL, NULL, self->health, NAME_None, DMG_FORCED);
}
else
{