From 4fd84369110f708a802320363f6694aa278ffd21 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sun, 31 Jul 2022 13:24:01 -0500 Subject: [PATCH 1/2] targeted fix for #45 as there was no consensus on conversion to explosions from the RFA, holding https://github.com/Azaezel/Torque3D-1/commit/7a88b2d489554729f08715d36fcf50c09e40f200 on back untill we adress that in the ECS pass with 4.1 --- Engine/source/T3D/fx/splash.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Engine/source/T3D/fx/splash.cpp b/Engine/source/T3D/fx/splash.cpp index 7cc835c93..509dd8923 100644 --- a/Engine/source/T3D/fx/splash.cpp +++ b/Engine/source/T3D/fx/splash.cpp @@ -481,6 +481,7 @@ void Splash::processTick(const Move*) if( mCurrMS >= mEndingMS ) { mDead = true; + deleteObject(); } } } From 04e108729e755b8feb92303ecda5971f27eabbb1 Mon Sep 17 00:00:00 2001 From: Areloch Date: Thu, 4 Aug 2022 14:01:54 -0500 Subject: [PATCH 2/2] Adjusts logic for definingi TORQUE_DEBUG and TORQUE_RELEASE to be consistent across platforms --- Tools/CMake/torque3d.cmake | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index ef6192c45..8bb13697c 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -161,14 +161,6 @@ mark_as_advanced(TORQUE_DEDICATED) ############################################################################### # options ############################################################################### -if(NOT MSVC AND NOT APPLE) # handle single-configuration generator - set(TORQUE_BUILD_TYPE "Debug" CACHE STRING "Select one of Debug, Release and RelWithDebInfo") - set_property(CACHE TORQUE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo") - - set(TORQUE_ADDITIONAL_LINKER_FLAGS "" CACHE STRING "Additional linker flags") - mark_as_advanced(TORQUE_ADDITIONAL_LINKER_FLAGS) -endif() - option(TORQUE_SECURE_VFS "Secure VFS configuration. Arbitrary script access to file system will be heavily restricted." OFF) mark_as_advanced(TORQUE_SECURE_VFS) @@ -251,20 +243,6 @@ if(WIN32) endif() endif() -# build types -if(NOT MSVC AND NOT APPLE) # handle single-configuration generator - set(CMAKE_BUILD_TYPE ${TORQUE_BUILD_TYPE}) - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(TORQUE_DEBUG TRUE) - elseif(CMAKE_BUILD_TYPE STREQUAL "Release") - set(TORQUE_RELEASE TRUE) - elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") - set(TORQUE_RELEASE TRUE) - else() - message(FATAL_ERROR "Please select Debug, Release or RelWithDebInfo for TORQUE_BUILD_TYPE") - endif() -endif() - ############################################################################### # Always enabled paths first ############################################################################### @@ -786,6 +764,7 @@ endif() # Always enabled Definitions ############################################################################### addDef(TORQUE_DEBUG Debug) +addDef(TORQUE_RELEASE "RelWithDebInfo;Release") addDef(TORQUE_ENABLE_ASSERTS "Debug;RelWithDebInfo") addDef(TORQUE_DEBUG_GFX_MODE "RelWithDebInfo") addDef(TORQUE_SHADERGEN)