Merge remote-tracking branch 'origin/master'

CMakeLists.txt

@@ -188,6 +188,16 @@ option(FORCE_INTERNAL_JPEG "Use internal jpeg")
 option(FORCE_INTERNAL_BZIP2 "Use internal bzip2")
 option(FORCE_INTERNAL_GME "Use internal gme" ON)
 
+# Fast math flags, required by some subprojects
+set( ZD_FASTMATH_FLAG "" )
+if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+	set( ZD_FASTMATH_FLAG "-ffast-math" )
+else()
+	if( MSVC )
+		set( ZD_FASTMATH_FLAG "/fp:fast" )
+	endif()
+endif()
+
 if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
 	message( STATUS "Using system zlib" )
 else()

dumb/CMakeLists.txt

@@ -14,9 +14,8 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
 	endif(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
 endif()
 
-if( MSVC )
+# Enable fast flag for dumb
-	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:fast" )
+set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ZD_FASTMATH_FLAG}" )
-endif()
 
 CHECK_FUNCTION_EXISTS( itoa ITOA_EXISTS )
 if( NOT ITOA_EXISTS )

game-music-emu/CMakeLists.txt

@@ -29,11 +29,8 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
 	endif()
 endif()
 
-if( MSVC )
+# Enable fast flag for GME
-	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:fast" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ZD_FASTMATH_FLAG}" )
-	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast" )
-endif()
-
 
 # Default emulators to build (all of them! ;)
 if (NOT DEFINED USE_GME_AY)

gdtoa/CMakeLists.txt

@@ -5,13 +5,16 @@ set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" )
 # Disable warnings for << operator precedence (4554) and
 # unreferenced labels (4102) from VC
 if( MSVC )
-	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4554 /wd4102 /fp:fast" )
+	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4554 /wd4102" )
 endif()
 
 if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
 	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
 endif()
 
+# Enable fast flag for gdtoa
+set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ZD_FASTMATH_FLAG}" )
+
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
 add_definitions( -DINFNAN_CHECK -DMULTIPLE_THREADS )
 

src/CMakeLists.txt

@@ -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()
 
 

src/g_strife/a_strifestuff.cpp

@@ -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"

src/r_utility.cpp

@@ -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 ----------------------------------------------

src/thingdef/thingdef_codeptr.cpp

@@ -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_INT(cnt);
-	PARAM_STATE_OPT(state)	{ state = self->FindState(NAME_Death); }
+	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);
-			{
+		}
-				P_ExplodeMissile(self, NULL, NULL);
+		else if (self->flags&MF_SHOOTABLE)
-			}
+		{
-			else if (self->flags & MF_SHOOTABLE)
+			P_DamageMobj(self, NULL, NULL, self->health, NAME_None, DMG_FORCED);
-			{
-				P_DamageMobj(self, NULL, NULL, self->health, NAME_None, DMG_FORCED);
-			}
-			else
-			{
-				self->SetState(self->FindState(NAME_Death));
-			}
 		}
 		else
 		{

wadsrc/static/actors/doom/fatso.txt

@@ -34,7 +34,7 @@ ACTOR Fatso
 		FATT H 10 BRIGHT A_FatAttack2
 		FATT IG 5 A_FaceTarget
 		FATT H 10 BRIGHT A_FatAttack3
-		FATT IG 5
+		FATT IG 5 A_FaceTarget
 		Goto See
 	Pain:
 		FATT J 3

wadsrc/static/actors/doom/painelemental.txt

@@ -29,8 +29,8 @@ ACTOR PainElemental
 	Missile:
 		PAIN D 5 A_FaceTarget
 		PAIN E 5 A_FaceTarget
-		PAIN F 4 BRIGHT A_FaceTarget
+		PAIN F 5 BRIGHT A_FaceTarget
-		PAIN F 1 BRIGHT A_PainAttack
+		PAIN F 0 BRIGHT A_PainAttack
 		Goto See
 	Pain:
 		PAIN G 6

wadsrc/static/actors/doom/revenant.txt

@@ -31,7 +31,7 @@ ACTOR Revenant
 		SKEL AABBCCDDEEFF 2 A_Chase
 		Loop
 	Melee:
-		SKEL G 1 A_FaceTarget
+		SKEL G 0 A_FaceTarget
 		SKEL G 6 A_SkelWhoosh
 		SKEL H 6 A_FaceTarget
 		SKEL I 6 A_SkelFist