Merge branch 'master' into restream

Dutchman101 · web-flow · commit 600fcff012c6 · 2025-08-12T20:21:30.000Z
diff --git a/Client/core/CCommandFuncs.cpp b/Client/core/CCommandFuncs.cpp
@@ -318,6 +318,10 @@ void CCommandFuncs::Reconnect(const char* szParameters)
         // Start the connect
         if (CCore::GetSingleton().GetConnectManager()->Reconnect(strHost.c_str(), usPort, strPassword.c_str(), false))
         {
+            if (CCore::GetSingleton().GetConnectManager()->WasQuickConnect())
+            {
+                CCore::GetSingleton().GetConnectManager()->SetQuickConnect(false);
+            }
             CCore::GetSingleton().GetConsole()->Printf(_("reconnect: Reconnecting to %s:%u..."), strHost.c_str(), usPort);
         }
         else
diff --git a/Client/core/CConnectManager.h b/Client/core/CConnectManager.h
@@ -26,10 +26,14 @@ class CConnectManager
 
     bool Abort();
 
+    bool WasQuickConnect() const noexcept { return m_quickConnect; }
+
     void DoPulse();
 
     void OnServerExists();
 
+    void SetQuickConnect(bool quick) noexcept { m_quickConnect = quick; }
+    
     static void OpenServerFirewall(in_addr Address, ushort usHttpPort = 80, bool bHighPriority = false);
 
     static bool StaticProcessPacket(unsigned char ucPacketID, class NetBitStreamInterface& bitStream);
@@ -59,4 +63,5 @@ class CConnectManager
     bool             m_bNotifyServerBrowser;
 
     bool CheckNickProvided(const char* szNick);
+    bool m_quickConnect{false};
 };
diff --git a/Client/core/CMainMenu.cpp b/Client/core/CMainMenu.cpp
@@ -850,6 +850,9 @@ bool CMainMenu::OnMenuClick(CGUIMouseEventArgs Args)
                 }
      
                 break;
+            case MENU_ITEM_QUICK_CONNECT:
+                AskUserIfHeWantsToDisconnect(m_pHoveredItem->menuType);
+                return true;
             default:
                 break;
         }
@@ -914,7 +917,8 @@ bool CMainMenu::OnQuickConnectButtonClick(CGUIElement* pElement, bool left)
             ShowNetworkNotReadyWindow();
             return true;
         }
-
+        
+        g_pCore->GetConnectManager()->SetQuickConnect(true);
         g_pCore->GetCommands()->Execute("reconnect", "");
     }
     else
@@ -1262,6 +1266,9 @@ void CMainMenu::WantsToDisconnectCallBack(void* pData, uint uiButton)
             case MENU_ITEM_DISCONNECT:
                 OnDisconnectButtonClick();
                 break;
+            case MENU_ITEM_QUICK_CONNECT:
+                OnQuickConnectButtonClick(nullptr, true);
+                break;
             default:
                 break;
         }
diff --git a/Client/game_sa/CHudSA.cpp b/Client/game_sa/CHudSA.cpp
@@ -122,6 +122,9 @@ void CHudSA::InitComponentList()
         {1, HUD_VEHICLE_NAME, 1, FUNC_DrawVehicleName, 1, 0xCC, 0xC3},
         {1, HUD_AREA_NAME, 1, FUNC_DrawAreaName, 1, 0xCC, 0xC3},
         {1, HUD_RADAR, 1, FUNC_DrawRadar, 1, 0xCC, 0xC3},
+        {1, HUD_RADAR_MAP, 1, FUNC_CRadar_DrawMap, 1, 0xCC, 0xC3},
+        {1, HUD_RADAR_BLIPS, 1, FUNC_CRadar_DrawBlips, 1, 0xCC, 0xC3},
+        {1, HUD_RADAR_ALTIMETER, 1, CODE_ShowRadarAltimeter, 2, 0xCC, 0xEB30},
         {1, HUD_CLOCK, 0, VAR_DisableClock, 1, 1, 0},
         {1, HUD_RADIO, 1, FUNC_DrawRadioName, 1, 0xCC, 0xC3},
         {1, HUD_WANTED, 1, FUNC_DrawWantedLevel, 1, 0xCC, 0xC3},
diff --git a/Client/game_sa/CHudSA.h b/Client/game_sa/CHudSA.h
@@ -49,7 +49,11 @@
 #define FUNC_CSprite2d_Draw                  0x728350
 #define FUNC_CSprite_RenderOneXLUSprite     0x70D000
 
+#define FUNC_CRadar_DrawMap         0x586B00
+#define FUNC_CRadar_DrawBlips       0x588050
+
 #define CODE_ShowMoney              0x58F47D
+#define CODE_ShowRadarAltimeter     0x58A5A6
 
 #define VAR_CTheScripts_bDrawCrossHair 0xA44490
 #define VAR_RSGlobal                   0xC17040
diff --git a/Client/mods/deathmatch/logic/CClientExplosionManager.cpp b/Client/mods/deathmatch/logic/CClientExplosionManager.cpp
@@ -39,6 +39,23 @@ bool CClientExplosionManager::Hook_StaticExplosionCreation(CEntity* pGameExplodi
     return g_pExplosionManager->Hook_ExplosionCreation(pGameExplodingEntity, pGameCreator, vecPosition, explosionType);
 }
 
+eWeaponType CClientExplosionManager::GetWeaponTypeFromExplosionType(const eExplosionType explosionType)
+{
+    switch (explosionType) {
+        case EXP_TYPE_GRENADE:
+            return WEAPONTYPE_GRENADE;
+        case EXP_TYPE_MOLOTOV:
+            return WEAPONTYPE_MOLOTOV;
+        case EXP_TYPE_ROCKET:
+        case EXP_TYPE_ROCKET_WEAK:
+            return WEAPONTYPE_ROCKET;
+        case EXP_TYPE_TANK_GRENADE:
+            return WEAPONTYPE_TANK_GRENADE;
+        default:
+            return WEAPONTYPE_EXPLOSION;
+    }
+}
+
 bool CClientExplosionManager::Hook_ExplosionCreation(CEntity* pGameExplodingEntity, CEntity* pGameCreator, const CVector& vecPosition,
                                                      eExplosionType explosionType)
 {
@@ -53,7 +70,23 @@ bool CClientExplosionManager::Hook_ExplosionCreation(CEntity* pGameExplodingEnti
     CClientEntity* const pResponsible = pPools->GetClientEntity(reinterpret_cast<DWORD*>(pResponsibleGameEntity->GetInterface()));
 
     if (!pResponsible)
-        return false;
+    {
+        if (!pGameCreator)
+            return false;
+
+        CClientPlayer* localPlayer = m_pManager->GetPlayerManager()->GetLocalPlayer();
+        if (!localPlayer || localPlayer->GetGameEntity() != pGameCreator)
+            return false;
+
+        eWeaponType explosionWeaponType = GetWeaponTypeFromExplosionType(explosionType);
+
+        CLuaArguments arguments;
+        arguments.PushNumber(vecPosition.fX);
+        arguments.PushNumber(vecPosition.fY);
+        arguments.PushNumber(vecPosition.fZ);
+        arguments.PushNumber(explosionWeaponType);
+        return localPlayer->CallEvent("onClientExplosion", arguments, true);
+    }
 
     // Determine the used weapon
     eWeaponType explosionWeaponType = WEAPONTYPE_EXPLOSION;
@@ -167,25 +200,22 @@ CExplosion* CClientExplosionManager::Create(eExplosionType explosionType, CVecto
     if (responsibleWeapon != WEAPONTYPE_UNARMED)
         m_LastWeaponType = responsibleWeapon;
     else
+        m_LastWeaponType = GetWeaponTypeFromExplosionType(explosionType);
+
+    if (pCreator && pCreator->IsLocalEntity())
     {
-        switch (explosionType)
+        bool allowExplosion = Hook_ExplosionCreation(nullptr, pGameCreator, vecPosition, explosionType);
+        if (!allowExplosion)
+            return nullptr;
+    }
+    else if (!pCreator)
+    {
+        CClientPlayer* localPlayer = m_pManager->GetPlayerManager()->GetLocalPlayer();
+        if (localPlayer)
         {
-            case EXP_TYPE_GRENADE:
-                m_LastWeaponType = WEAPONTYPE_GRENADE;
-                break;
-            case EXP_TYPE_MOLOTOV:
-                m_LastWeaponType = WEAPONTYPE_MOLOTOV;
-                break;
-            case EXP_TYPE_ROCKET:
-            case EXP_TYPE_ROCKET_WEAK:
-                m_LastWeaponType = WEAPONTYPE_ROCKET;
-                break;
-            case EXP_TYPE_TANK_GRENADE:
-                m_LastWeaponType = WEAPONTYPE_TANK_GRENADE;
-                break;
-            default:
-                m_LastWeaponType = WEAPONTYPE_EXPLOSION;
-                break;
+            bool allowExplosion = Hook_ExplosionCreation(nullptr, localPlayer->GetGameEntity(), vecPosition, explosionType);
+            if (!allowExplosion)
+                return nullptr;
         }
     }
 
diff --git a/Client/mods/deathmatch/logic/CClientExplosionManager.h b/Client/mods/deathmatch/logic/CClientExplosionManager.h
@@ -34,5 +34,6 @@ class CClientExplosionManager
     CClientEntityPtr m_pLastCreator;
 
 private:
-    CClientManager* m_pManager;
+    CClientManager*  m_pManager;
+    eWeaponType      GetWeaponTypeFromExplosionType(const eExplosionType explosionType);
 };
diff --git a/Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp b/Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp
@@ -104,6 +104,9 @@ ADD_ENUM(HUD_MONEY, "money")
 ADD_ENUM(HUD_VEHICLE_NAME, "vehicle_name")
 ADD_ENUM(HUD_AREA_NAME, "area_name")
 ADD_ENUM(HUD_RADAR, "radar")
+ADD_ENUM(HUD_RADAR_MAP, "radar_map")
+ADD_ENUM(HUD_RADAR_BLIPS, "radar_blips")
+ADD_ENUM(HUD_RADAR_ALTIMETER, "radar_altimeter")
 ADD_ENUM(HUD_CLOCK, "clock")
 ADD_ENUM(HUD_RADIO, "radio")
 ADD_ENUM(HUD_WANTED, "wanted")
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp
@@ -653,7 +653,8 @@ bool CLuaPlayerDefs::IsPlayerCrosshairVisible()
 
 bool CLuaPlayerDefs::SetPlayerHudComponentProperty(eHudComponent component, eHudComponentProperty property, std::variant<CVector2D, float, bool, std::string> value)
 {
-    if (component == HUD_ALL || component == HUD_CROSSHAIR || component == HUD_VITAL_STATS || component == HUD_HELP_TEXT || component == HUD_RADAR)
+    if (component == HUD_ALL || component == HUD_CROSSHAIR || component == HUD_VITAL_STATS || component == HUD_HELP_TEXT || component == HUD_RADAR
+        || component == HUD_RADAR_MAP || component == HUD_RADAR_BLIPS || component == HUD_RADAR_ALTIMETER)
         return false;
 
     CHud* hud = g_pGame->GetHud();
diff --git a/Client/sdk/game/CHud.h b/Client/sdk/game/CHud.h
@@ -31,6 +31,9 @@ enum eHudComponent
     HUD_ALL,
     HUD_VITAL_STATS,
     HUD_HELP_TEXT,
+    HUD_RADAR_MAP,
+    HUD_RADAR_BLIPS,
+    HUD_RADAR_ALTIMETER,
 };
 
 enum class eHudComponentProperty
diff --git a/Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp b/Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp
@@ -78,6 +78,9 @@ ADD_ENUM(HUD_MONEY, "money")
 ADD_ENUM(HUD_VEHICLE_NAME, "vehicle_name")
 ADD_ENUM(HUD_AREA_NAME, "area_name")
 ADD_ENUM(HUD_RADAR, "radar")
+ADD_ENUM(HUD_RADAR_MAP, "radar_map")
+ADD_ENUM(HUD_RADAR_BLIPS, "radar_blips")
+ADD_ENUM(HUD_RADAR_ALTIMETER, "radar_altimeter")
 ADD_ENUM(HUD_CLOCK, "clock")
 ADD_ENUM(HUD_RADIO, "radio")
 ADD_ENUM(HUD_WANTED, "wanted")
diff --git a/Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h b/Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h
@@ -56,6 +56,11 @@ enum eHudComponent
     HUD_WANTED,
     HUD_CROSSHAIR,
     HUD_ALL,
+    HUD_VITAL_STATS,    // Unused on server, but used on client side
+    HUD_HELP_TEXT,      // Unused on server, but used on client side
+    HUD_RADAR_MAP,
+    HUD_RADAR_BLIPS,
+    HUD_RADAR_ALTIMETER,
 };
 DECLARE_ENUM(eHudComponent);
 
diff --git a/vendor/cegui-0.4.0-custom/src/tinyxml/tinyxml.cpp b/vendor/cegui-0.4.0-custom/src/tinyxml/tinyxml.cpp
@@ -722,9 +722,11 @@ void TiXmlElement::SetAttribute( const char * name, int val )
 
 void TiXmlElement::SetDoubleAttribute( const char * name, double val )
 {	
-	char buf[128];
-	sprintf( buf, "%f", val );
+	#define TIXML_DOUBLE_BUFFER_SIZE 128
+	char buf[TIXML_DOUBLE_BUFFER_SIZE];
+	snprintf( buf, TIXML_DOUBLE_BUFFER_SIZE, "%f", val );
 	SetAttribute( name, buf );
+    #undef TIXML_DOUBLE_BUFFER_SIZE
 }
 
 
@@ -1141,7 +1143,7 @@ void TiXmlAttribute::SetIntValue( int _value )
 void TiXmlAttribute::SetDoubleValue( double _value )
 {
 	char buf [64];
-	sprintf (buf, "%lf", _value);
+	snprintf(buf, sizeof(buf), "%lf", _value);
 	SetValue (buf);
 }
 
diff --git a/vendor/cegui-0.4.0-custom/src/tinyxml/tinyxmlparser.cpp b/vendor/cegui-0.4.0-custom/src/tinyxml/tinyxmlparser.cpp
@@ -261,6 +261,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding )
 						else
 							{ p +=3; ++col; }	// A normal character.
 					}
+                    else
+                    {
+                    	// TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so
+                    	// there is something wrong here. Just advance the pointer to evade infinite loops
+                    	++p;
+                    }
 				}
 				else
 				{
@@ -1478,6 +1484,10 @@ const char* TiXmlDeclaration::Parse( const char* p, TiXmlParsingData* data, TiXm
 		}
 
 		p = SkipWhiteSpace( p, _encoding );
+        if ( !p || !*p )
+        {
+        	break;
+        }
 		if ( StringEqual( p, "version", true, _encoding ) )
 		{
 			TiXmlAttribute attrib;
diff --git a/vendor/tinyxml/tinyxmlparser.cpp b/vendor/tinyxml/tinyxmlparser.cpp
@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding )
 						else
 							{ p +=3; ++col; }	// A normal character.
 					}
+                    else
+                    {
+                    	// TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so
+                    	// there is something wrong here. Just advance the pointer to evade infinite loops
+                    	++p;
+                    }
 				}
 				else
 				{
@@ -1602,6 +1608,10 @@ const char* TiXmlDeclaration::Parse( const char* p, TiXmlParsingData* data, TiXm
 		}
 
 		p = SkipWhiteSpace( p, _encoding );
+        if ( !p || !*p )
+        {
+        	break;
+        }
 		if ( StringEqual( p, "version", true, _encoding ) )
 		{
 			TiXmlAttribute attrib;

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,10 @@ void CCommandFuncs::Reconnect(const char* szParameters)`
`318`	`318`	`// Start the connect`
`319`	`319`	`if (CCore::GetSingleton().GetConnectManager()->Reconnect(strHost.c_str(), usPort, strPassword.c_str(), false))`
`320`	`320`	`{`
	`321`	`+ if (CCore::GetSingleton().GetConnectManager()->WasQuickConnect())`
	`322`	`+ {`
	`323`	`+ CCore::GetSingleton().GetConnectManager()->SetQuickConnect(false);`
	`324`	`+ }`
`321`	`325`	`CCore::GetSingleton().GetConsole()->Printf(_("reconnect: Reconnecting to %s:%u..."), strHost.c_str(), usPort);`
`322`	`326`	`}`
`323`	`327`	`else`
Original file line number	Diff line number	Diff line change
`@@ -850,6 +850,9 @@ bool CMainMenu::OnMenuClick(CGUIMouseEventArgs Args)`
`850`	`850`	`}`
`851`	`851`
`852`	`852`	`break;`
	`853`	`+ case MENU_ITEM_QUICK_CONNECT:`
	`854`	`+ AskUserIfHeWantsToDisconnect(m_pHoveredItem->menuType);`
	`855`	`+ return true;`
`853`	`856`	`default:`
`854`	`857`	`break;`
`855`	`858`	`}`
`@@ -914,7 +917,8 @@ bool CMainMenu::OnQuickConnectButtonClick(CGUIElement* pElement, bool left)`
`914`	`917`	`ShowNetworkNotReadyWindow();`
`915`	`918`	`return true;`
`916`	`919`	`}`
`917`		`-`
	`920`	`+`
	`921`	`+ g_pCore->GetConnectManager()->SetQuickConnect(true);`
`918`	`922`	`g_pCore->GetCommands()->Execute("reconnect", "");`
`919`	`923`	`}`
`920`	`924`	`else`
`@@ -1262,6 +1266,9 @@ void CMainMenu::WantsToDisconnectCallBack(void* pData, uint uiButton)`
`1262`	`1266`	`case MENU_ITEM_DISCONNECT:`
`1263`	`1267`	`OnDisconnectButtonClick();`
`1264`	`1268`	`break;`
	`1269`	`+ case MENU_ITEM_QUICK_CONNECT:`
	`1270`	`+ OnQuickConnectButtonClick(nullptr, true);`
	`1271`	`+ break;`
`1265`	`1272`	`default:`
`1266`	`1273`	`break;`
`1267`	`1274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,8 @@ bool CLuaPlayerDefs::IsPlayerCrosshairVisible()`
`653`	`653`
`654`	`654`	`bool CLuaPlayerDefs::SetPlayerHudComponentProperty(eHudComponent component, eHudComponentProperty property, std::variant<CVector2D, float, bool, std::string> value)`
`655`	`655`	`{`
`656`		`- if (component == HUD_ALL \|\| component == HUD_CROSSHAIR \|\| component == HUD_VITAL_STATS \|\| component == HUD_HELP_TEXT \|\| component == HUD_RADAR)`
	`656`	`+ if (component == HUD_ALL \|\| component == HUD_CROSSHAIR \|\| component == HUD_VITAL_STATS \|\| component == HUD_HELP_TEXT \|\| component == HUD_RADAR`
	`657`	`+ \|\| component == HUD_RADAR_MAP \|\| component == HUD_RADAR_BLIPS \|\| component == HUD_RADAR_ALTIMETER)`
`657`	`658`	`return false;`
`658`	`659`
`659`	`660`	`CHud* hud = g_pGame->GetHud();`