unify(common): Merge GameCommon and related code (TheSuperHackers#2180)

Author: xezon

Generals/Code/GameEngine/Include/Common/GameCommon.h

@@ -47,14 +47,18 @@
 
 #pragma once
 
+#define DONT_ALLOW_DEBUG_CHEATS_IN_RELEASE ///< Take of the DONT to get cheats back in to release
+
+//#define _CAMPEA_DEMO
+
 // ----------------------------------------------------------------------------------------------
 #include "Lib/BaseType.h"
 #include "WWCommon.h"
 #include "Common/GameDefines.h"
 
 // ----------------------------------------------------------------------------------------------
 #if defined(RTS_DEBUG)
-	#define NO_DUMP_PERF_STATS
+	#define DUMP_PERF_STATS
 #else
 	#define NO_DUMP_PERF_STATS
 #endif
@@ -119,6 +123,18 @@ enum
 	#error "this is the wrong size"
 #endif
 
+// ----------------------------------------------------------------------------------------------
+enum
+{
+	MAX_GLOBAL_GENERAL_TYPES = 9,		///< number of playable General Types, not including the boss)
+
+	/// The start of the playable global generals playertemplates
+	GLOBAL_GENERAL_BEGIN = 5,
+
+	/// The end of the playable global generals
+	GLOBAL_GENERAL_END = (GLOBAL_GENERAL_BEGIN + MAX_GLOBAL_GENERAL_TYPES - 1)
+};
+
 //-------------------------------------------------------------------------------------------------
 enum GameDifficulty CPP_11(: Int)
 {
@@ -207,6 +223,7 @@ enum CommandSourceType CPP_11(: Int)
 	CMD_FROM_SCRIPT,
 	CMD_FROM_AI,
 	CMD_FROM_DOZER,							// Special rare command when the dozer originates a command to attack a mine. Mines are not ai-attackable, and it seems deceitful for the dozer to generate a player or script command. jba.
+	CMD_DEFAULT_SWITCH_WEAPON,	// Special case: A weapon that can be chosen -- this is the default case (machine gun vs flashbang).
 
 	COMMAND_SOURCE_TYPE_COUNT
 };

Generals/Code/GameEngine/Include/Common/GlobalData.h

@@ -280,6 +280,8 @@ class GlobalData : public SubsystemInterface
 
 #ifdef DUMP_PERF_STATS
 	Bool m_dumpPerformanceStatistics;
+  Bool  m_dumpStatsAtInterval;///< should I automatically dum stats every in N frames
+  Int   m_statsInterval;       ///< if so, how many is N?
 #endif
 
 	Bool m_forceBenchmark;	///<forces running of CPU detection benchmark, even on known cpu's.

Generals/Code/GameEngine/Include/GameLogic/AI.h

@@ -308,10 +308,11 @@ class Waypoint;
 class Team;
 class Weapon;
 
-// TheSuperHackers @build xezon 22/03/2025 Renames AI_PASSIVE to not conflict with macro in ws2def.h
+// TheSuperHackers @build xezon 17/03/2025 Renames AI_PASSIVE to not conflict with macro in ws2def.h
 
 // Note - written out in save/load xfer and .map files, don't change these numbers.
-enum AttitudeType CPP_11(: Int) {
+enum AttitudeType CPP_11(: Int)
+{
 	ATTITUDE_SLEEP = -2,
 	ATTITUDE_PASSIVE=-1,
 	ATTITUDE_NORMAL=0,
@@ -331,6 +332,7 @@ static const char *const TheCommandSourceMaskNames[] =
 	"FROM_SCRIPT",
 	"FROM_AI",
 	"FROM_DOZER", //don't use this
+	"DEFAULT_SWITCH_WEAPON", //unit will pick this weapon when normal logic fails.
 
 	nullptr
 };

Generals/Code/GameEngine/Source/Common/GlobalData.cpp

@@ -1019,6 +1019,8 @@ GlobalData::GlobalData()
 
 #ifdef DUMP_PERF_STATS
 	m_dumpPerformanceStatistics = FALSE;
+  m_dumpStatsAtInterval = FALSE;
+  m_statsInterval = 30;
 #endif
 
 	m_forceBenchmark = FALSE;	///<forces running of CPU detection benchmark, even on known cpu's.

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp

@@ -263,7 +263,7 @@ void StatDumpClass::dumpStats()
 	fprintf( m_fp, "  Video RAM: %d\n", Debug_Statistics::Get_Record_Texture_Size() - 1376256 );
 
 	// terrain stats
-	fprintf( m_fp, "  3-Way Blends: %d, Shoreline Blends: %d\n", TheTerrainRenderObject->getNumExtraBlendTiles(), TheTerrainRenderObject->getNumShoreLineTiles() );
+	fprintf( m_fp, "  3-Way Blends: %d/%d, \n Shoreline Blends: %d/%d\n", TheTerrainRenderObject->getNumExtraBlendTiles(TRUE),TheTerrainRenderObject->getNumExtraBlendTiles(FALSE), TheTerrainRenderObject->getNumShoreLineTiles(TRUE),TheTerrainRenderObject->getNumShoreLineTiles(FALSE));
 
 	fprintf( m_fp, "\n" );