From b6bc534fac4d6ee774afff8a7650dd135b3888b6 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Tue, 16 Sep 2025 16:23:49 +0200 Subject: [PATCH 1/2] fix: Fix malformed string lists --- Core/GameEngine/Source/Common/RandomValue.cpp | 4 ++-- .../Code/GameEngine/Include/GameLogic/Module/BodyModule.h | 2 ++ .../GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Core/GameEngine/Source/Common/RandomValue.cpp b/Core/GameEngine/Source/Common/RandomValue.cpp index f9e63adbf3..801a604d01 100644 --- a/Core/GameEngine/Source/Common/RandomValue.cpp +++ b/Core/GameEngine/Source/Common/RandomValue.cpp @@ -352,7 +352,7 @@ DEBUG_LOG(( "%d: GetGameAudioRandomValueReal = %f, %s line %d", /*static*/ const char *GameClientRandomVariable::DistributionTypeNames[] = { - "CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS" + "CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS", NULL }; /** @@ -397,7 +397,7 @@ Real GameClientRandomVariable::getValue( void ) const /*static*/ const char *GameLogicRandomVariable::DistributionTypeNames[] = { - "CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS" + "CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS", NULL }; /** diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h index 11dda5bbb4..d6b80eff8a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h @@ -86,6 +86,8 @@ static const char* TheMaxHealthChangeTypeNames[] = "SAME_CURRENTHEALTH", "PRESERVE_RATIO", "ADD_CURRENT_HEALTH_TOO", + "FULLY_HEAL", + NULL }; #endif diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index c3191d8f4b..2c7dfeab02 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -713,6 +713,7 @@ static const char* DebrisDispositionNames[] = "FLOATING", "INHERIT_VELOCITY", "WHIRLING", + NULL }; std::vector debrisModelNamesGlobalHack; From 721f49ab014875570b235c007583f35ca003a524 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Fri, 19 Sep 2025 10:35:30 +0200 Subject: [PATCH 2/2] Replicate in Generals --- Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h | 1 + .../GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h index 392c5a95bf..2468bd7cae 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h @@ -85,6 +85,7 @@ static const char* TheMaxHealthChangeTypeNames[] = "SAME_CURRENTHEALTH", "PRESERVE_RATIO", "ADD_CURRENT_HEALTH_TOO", + NULL }; #endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp index 5f280a2c19..16f9ee8b08 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp @@ -704,6 +704,7 @@ static const char* DebrisDispositionNames[] = "FLOATING", "INHERIT_VELOCITY", "WHIRLING", + NULL }; std::vector debrisModelNamesGlobalHack;