Merge branch 'main' of https://github.com/TheSuperHackers/GeneralsGameCode into headless_sh

Author: helmutbuhler

Core/CMakeLists.txt

@@ -1,8 +1,14 @@
 # c stands for core, i stands for Interface
 add_library(corei_libraries_include INTERFACE)
+add_library(corei_libraries_source_wwvegas INTERFACE)
+add_library(corei_libraries_source_wwvegas_wwdebug INTERFACE)
+add_library(corei_libraries_source_wwvegas_wwlib INTERFACE)
 add_library(corei_always INTERFACE)
 
 target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
+target_include_directories(corei_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
+target_include_directories(corei_libraries_source_wwvegas_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
+target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libraries/Source/WWVegas/WWLib")
 target_link_libraries(corei_always INTERFACE
     core_utility
     corei_libraries_include

Core/Libraries/CMakeLists.txt

@@ -1,5 +1,5 @@
 # WW common libraries decended from earliest C&C games
-#add_subdirectory(Source/WWVegas)
+add_subdirectory(Source/WWVegas)
 
 # profiling library
 #add_subdirectory(Source/profile)

Core/Libraries/Source/WWVegas/CMakeLists.txt

@@ -0,0 +1,58 @@
+# Interface libraries to set common defines and includes, avoid duplication later
+add_library(core_wwcommon INTERFACE)
+
+target_compile_definitions(core_wwcommon INTERFACE
+    #NOMINMAX
+    WIN32_LEAN_AND_MEAN
+)
+
+target_link_libraries(core_wwcommon INTERFACE
+    d3d8lib
+    core_config
+    core_utility
+    milesstub
+    stlport
+)
+
+target_include_directories(core_wwcommon INTERFACE
+    .
+    WWDebug
+    WWLib
+)
+
+# add_subdirectory(WWAudio)
+add_subdirectory(WWDebug)
+add_subdirectory(WWLib)
+# add_subdirectory(WWMath)
+# add_subdirectory(Wwutil)
+# add_subdirectory(WWSaveLoad)
+add_subdirectory(WWStub)
+# add_subdirectory(WW3D2)
+# add_subdirectory(WWDownload)
+# add_subdirectory(wwshade)
+
+# Helpful interface to bundle the ww modules together.
+add_library(core_wwvegas INTERFACE)
+
+target_include_directories(core_wwvegas INTERFACE
+    .
+    #WW3D2
+    WWDebug
+    #WWDownload
+    WWLib
+    #WWMath
+    #WWSaveLoad
+    #Wwutil
+    #wwshade
+)
+
+target_link_libraries(core_wwvegas INTERFACE
+    # core_ww3d2
+    core_wwdebug
+    # core_wwdownload
+    core_wwlib
+    # core_wwmath
+    # core_wwsaveload
+    # core_wwshade
+    # core_wwutil
+)

Core/Libraries/Source/WWVegas/WWDebug/CMakeLists.txt

@@ -0,0 +1,21 @@
+# Set source files
+set(WWDEBUG_SRC
+    wwdebug.cpp
+    wwdebug.h
+    wwhack.h
+    wwmemlog.cpp
+    wwmemlog.h
+    wwprofile.cpp
+    wwprofile.h
+)
+
+# Targets to build.
+add_library(core_wwdebug STATIC)
+set_target_properties(core_wwdebug PROPERTIES OUTPUT_NAME wwdebug)
+
+target_sources(core_wwdebug PRIVATE ${WWDEBUG_SRC})
+
+target_link_libraries(core_wwdebug PRIVATE
+    core_wwcommon
+    corei_always
+)

GeneralsMD/Code/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp renamed to Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp

@@ -110,7 +110,8 @@ void					WWDebug_DBWin32_Message_Handler( const char * message);
 ** WWDEBUG_SAY(("dir = %f\n",dir));
 */
 
-#include "../../../../GameEngine/Include/Common/Debug.h"
+// TheSuperHackers @compile feliwir 12/04/2025 Both Debug headers are identical. Use ZH.
+#include "../../../../../GeneralsMD/Code/GameEngine/Include/Common/Debug.h"
 
 #ifdef DEBUG_LOGGING
 #define WWDEBUG_SAY(x)							DEBUG_LOG(x)

GeneralsMD/Code/Libraries/Source/WWVegas/WWDebug/wwdebug.h renamed to Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h

@@ -153,16 +153,16 @@ set(WWLIB_SRC
 )
 
 # Targets to build.
-add_library(z_wwlib STATIC)
-set_target_properties(z_wwlib PROPERTIES OUTPUT_NAME wwlib)
+add_library(core_wwlib STATIC)
+set_target_properties(core_wwlib PROPERTIES OUTPUT_NAME wwlib)
 
-target_sources(z_wwlib PRIVATE ${WWLIB_SRC})
+target_sources(core_wwlib PRIVATE ${WWLIB_SRC})
 
-target_include_directories(z_wwlib PUBLIC
+target_include_directories(core_wwlib PUBLIC
     .
 )
 
-target_link_libraries(z_wwlib PRIVATE
-    z_wwcommon
-    zi_always
+target_link_libraries(core_wwlib PRIVATE
+    core_wwcommon
+    corei_always
 )

GeneralsMD/Code/Libraries/Source/WWVegas/WWDebug/wwhack.h renamed to Core/Libraries/Source/WWVegas/WWDebug/wwhack.h

@@ -0,0 +1,16 @@
+# Set source files
+set(WWSTUB_SRC
+    wwallocstub.cpp
+    wwdebugstub.cpp
+)
+
+# Targets to build.
+add_library(core_wwstub STATIC)
+set_target_properties(core_wwstub PROPERTIES OUTPUT_NAME wwstub)
+
+target_sources(core_wwstub PRIVATE ${WWSTUB_SRC})
+
+target_link_libraries(core_wwstub PRIVATE
+    core_wwcommon
+    corei_always
+)

GeneralsMD/Code/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp renamed to Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp

@@ -0,0 +1,65 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers 
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// TheSuperHackers @compile feliwir 15/04/2025 Simple allocator implementation useful for tools
+#include "always.h"
+#include <stdlib.h>
+
+#ifdef _OPERATOR_NEW_DEFINED_
+
+void *operator new(size_t size)
+{
+	return malloc(size);
+}
+
+void *operator new[](size_t size)
+{
+	return malloc(size);
+}
+ 
+void operator delete(void *p)
+{
+	free(p);
+}
+
+void operator delete[](void *p)
+{
+	free(p);
+}
+
+void* operator new(size_t size, const char * fname, int)
+{
+	return malloc(size);
+}
+
+void operator delete(void * p, const char *, int)
+{
+	free(p);
+}
+
+void* operator new[](size_t size, const char * fname, int)
+{
+	return malloc(size);
+}
+
+void operator delete[](void * p, const char *, int)
+{
+	free(p);
+}
+
+#endif

GeneralsMD/Code/Libraries/Source/WWVegas/WWDebug/wwmemlog.h renamed to Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h

@@ -0,0 +1,58 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers 
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// TheSuperHackers @compile feliwir 15/04/2025 Simple debug implementation useful for tools
+#include "wwdebug.h"
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+char* TheCurrentIgnoreCrashPtr = NULL;
+
+
+#ifdef DEBUG_LOGGING
+
+void DebugLog(const char *format, ...)
+{
+	// Print it to the console
+	char theBuffer[8192];
+
+	va_list arg;
+	va_start(arg, format);
+	vsprintf(theBuffer, format, arg);
+	va_end(arg);
+} 
+
+#endif
+
+#ifdef DEBUG_CRASHING
+
+void DebugCrash(const char *format, ...)
+{
+	// Print it to the console
+	char theCrashBuffer[8192];
+	va_list arg;
+	va_start(arg, format);
+	vsprintf(theCrashBuffer, format, arg);
+	va_end(arg);
+
+	// Quit
+	exit(EXIT_FAILURE);
+}
+
+#endif

GeneralsMD/Code/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp renamed to Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp

@@ -5,8 +5,6 @@ add_library(gi_gameenginedevice_include INTERFACE)
 add_library(gi_libraries_include INTERFACE)
 add_library(gi_libraries_source_wwvegas INTERFACE)
 add_library(gi_libraries_source_wwvegas_ww3d2 INTERFACE)
-add_library(gi_libraries_source_wwvegas_wwdebug INTERFACE)
-add_library(gi_libraries_source_wwvegas_wwlib INTERFACE)
 add_library(gi_libraries_source_wwvegas_wwmath INTERFACE)
 add_library(gi_libraries_source_wwvegas_wwsaveload INTERFACE)
 add_library(gi_main INTERFACE)
@@ -18,8 +16,6 @@ target_include_directories(gi_gameenginedevice_include INTERFACE "GameEngineDevi
 target_include_directories(gi_libraries_include INTERFACE "Libraries/Include")
 target_include_directories(gi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
 target_include_directories(gi_libraries_source_wwvegas_ww3d2 INTERFACE "Libraries/Source/WWVegas/WW3D2")
-target_include_directories(gi_libraries_source_wwvegas_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
-target_include_directories(gi_libraries_source_wwvegas_wwlib INTERFACE "Libraries/Source/WWVegas/WWLib")
 target_include_directories(gi_libraries_source_wwvegas_wwmath INTERFACE "Libraries/Source/WWVegas/WWMath")
 target_include_directories(gi_libraries_source_wwvegas_wwsaveload INTERFACE "Libraries/Source/WWVegas/WWSaveLoad")
 target_include_directories(gi_main INTERFACE "Main")

GeneralsMD/Code/Libraries/Source/WWVegas/WWDebug/wwprofile.h renamed to Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h

@@ -79,6 +79,7 @@ class SpecialPowerTemplate;
 class WeaponTemplate;
 class DamageInfo;
 class ParticleSystemTemplate;
+class StealthUpdate;
 
 
 //-------------------------------------------------------------------------------------------------
@@ -163,6 +164,7 @@ class BehaviorModule : public ObjectModule, public BehaviorModuleInterface
 	virtual SpecialPowerModuleInterface* getSpecialPower() { return NULL; }
 	virtual UpdateModuleInterface* getUpdate() { return NULL; }
 	virtual UpgradeModuleInterface* getUpgrade() { return NULL; }
+	virtual StealthUpdate* getStealth() { return NULL; }
 
 	virtual ParkingPlaceBehaviorInterface* getParkingPlaceBehaviorInterface() { return NULL; }
 	virtual RebuildHoleBehaviorInterface* getRebuildHoleBehaviorInterface() { return NULL; }

GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/BSEARCH.H renamed to Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H

@@ -123,6 +123,8 @@ class StealthUpdate : public UpdateModule
 	StealthUpdate( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
+	virtual StealthUpdate* getStealth() { return this; }
+
 	virtual UpdateSleepTime update();
 
 	//Still gets called, even if held -ML

GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/BUFF.H renamed to Core/Libraries/Source/WWVegas/WWLib/BUFF.H

@@ -45,6 +45,7 @@
 #include "GameLogic/WeaponBonusConditionFlags.h"
 #include "GameLogic/WeaponSet.h"
 #include "GameLogic/WeaponSetFlags.h"
+#include "GameLogic/Module/StealthUpdate.h"
 
 //-----------------------------------------------------------------------------
 //           Forward References
@@ -271,6 +272,7 @@ class Object : public Thing, public Snapshot
 
 	BodyModuleInterface* getBodyModule() const { return m_body; }
 	ContainModuleInterface* getContain() const { return m_contain; }
+	StealthUpdate* getStealth() const { return m_stealth; }
 	SpawnBehaviorInterface* getSpawnBehaviorInterface() const;
 
 
@@ -691,6 +693,7 @@ class Object : public Thing, public Snapshot
 	// cache these, for convenience
 	ContainModuleInterface*				m_contain;
 	BodyModuleInterface*					m_body;
+	StealthUpdate*						m_stealth;
 
 	AIUpdateInterface*						m_ai;	///< ai interface (if any), cached for handy access. (duplicate of entry in the module array!)
 	PhysicsBehavior*							m_physics;	///< physics interface (if any), cached for handy access. (duplicate of entry in the module array!)

GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/CMakeLists.txt renamed to Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt

@@ -1093,8 +1093,7 @@ void Player::becomingLocalPlayer(Bool yes)
 					Drawable *draw = object->getDrawable();
 					if( draw )
 					{
-						static NameKeyType key_StealthUpdate = NAMEKEY( "StealthUpdate" );
-						StealthUpdate *update = (StealthUpdate*)object->findUpdateModule( key_StealthUpdate );
+						StealthUpdate *update = object->getStealth();
 						if( update && update->isDisguised() )
 						{
 							Player *disguisedPlayer = ThePlayerList->getNthPlayer( update->getDisguisedPlayerIndex() );

GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/CRC.H renamed to Core/Libraries/Source/WWVegas/WWLib/CRC.H

@@ -426,8 +426,7 @@ void Radar::addObject( Object *obj )
 		//Because we have support for disguised units pretending to be units from another
 		//team, we need to intercept it here and make sure it's rendered appropriately
 		//based on which client is rendering it.
-		static NameKeyType key_StealthUpdate = NAMEKEY( "StealthUpdate" );
-		StealthUpdate *update = (StealthUpdate*)obj->findUpdateModule( key_StealthUpdate );
+		StealthUpdate *update = obj->getStealth();
 		if( update )
 		{
 			if( update->isDisguised() )

GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/CallbackHook.h renamed to Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h

@@ -2126,8 +2126,7 @@ void Drawable::setStealthLook(StealthLookType look)
 				if( obj )
 				{
 					//Try to get the stealthupdate module and see if the opacity value is overriden.
-					static NameKeyType key_StealthUpdate = NAMEKEY("StealthUpdate");
-					StealthUpdate* stealth = (StealthUpdate *)obj->findUpdateModule(key_StealthUpdate);
+					StealthUpdate* stealth = obj->getStealth();
 					if( stealth )
 					{
 						if( stealth->isDisguised() )

Generals/Code/Libraries/Source/WWVegas/WWLib/Except.cpp renamed to Core/Libraries/Source/WWVegas/WWLib/Except.cpp

@@ -2506,8 +2506,7 @@ void ControlBar::setPortraitByObject( Object *obj )
 				setPortraitByObject( NULL );
 				return;
 			}
-			static NameKeyType key_StealthUpdate = NAMEKEY("StealthUpdate");
-			StealthUpdate* stealth = (StealthUpdate *)obj->findUpdateModule(key_StealthUpdate);
+			StealthUpdate* stealth = obj->getStealth();
 			if( stealth && stealth->isDisguised() )
 			{
 				//Fake player upgrades too!

Generals/Code/Libraries/Source/WWVegas/WWLib/Except.h renamed to Core/Libraries/Source/WWVegas/WWLib/Except.h

@@ -2218,8 +2218,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 				//Because we have support for disguised units pretending to be units from another
 				//team, we need to intercept it here and make sure it's rendered appropriately
 				//based on which client is rendering it.
-				static NameKeyType key_StealthUpdate = NAMEKEY( "StealthUpdate" );
-				StealthUpdate *update = (StealthUpdate*)obj->findUpdateModule( key_StealthUpdate );
+				StealthUpdate *update = obj->getStealth();
 				if( update )
 				{
 					if( update->isDisguised() )