Backups/SA-MP
1
0 Fork 0
mirror of https://github.com/dashr9230/SA-MP.git synced 2026-10-11 09:48:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

De-inline CNetGame::DisableMapIcon to restore ScrUnk90; hand-expand it at both map-icon call sites instead

Browse Source
This commit is contained in:
ricardoofnl committed 2026-09-03 05:32:10 +07:00
1 parent d7a9f31a83
commit 27dcb2fdf2
2 files changed
+21 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

saco/net/netgame.cpp
+20 -2
View File
@@ -118,7 +118,11 @@ DWORD CNetGame::GetTime()
void CNetGame::SetMapIcon(BYTE byteIndex, float fX, float fY, float fZ, BYTE byteIcon, DWORD dwColor, int iStyle)
{
if (byteIndex >= 100) return;
if (m_dwMapIcon[byteIndex] != NULL) DisableMapIcon(byteIndex);
if (m_dwMapIcon[byteIndex] != NULL) {
if (byteIndex >= 100) return;
ScriptCommand(&disable_marker, m_dwMapIcon[byteIndex]);
m_dwMapIcon[byteIndex] = NULL;
}
//ScriptCommand(&create_radar_marker_without_sphere, fX, fY, fZ, byteIcon, &m_dwMapIcon);
m_dwMapIcon[byteIndex] = pGame->CreateRadarMarkerIcon(byteIcon, fX, fY, fZ, dwColor, iStyle);
}
@@ -135,12 +139,26 @@ void CNetGame::ResetMapIcons()
BYTE i;
for (i = 0; i < 100; i++)
{
if (m_dwMapIcon[i] != NULL) DisableMapIcon(i);
if (m_dwMapIcon[i] != NULL) {
if (i >= 100) return;
ScriptCommand(&disable_marker, m_dwMapIcon[i]);
m_dwMapIcon[i] = NULL;
}
}
}
//----------------------------------------------------
// MATCH
void CNetGame::DisableMapIcon(BYTE byteIndex)
{
if (byteIndex >= 100) return;
ScriptCommand(&disable_marker, m_dwMapIcon[byteIndex]);
m_dwMapIcon[byteIndex] = NULL;
}
//----------------------------------------------------
//----------------------------------------------------
// MATCH
saco/net/netgame.h
+1 -5
View File
@@ -106,11 +106,7 @@ public:
void ResetMapIcons();
void SetMapIcon(BYTE byteIndex, float fX, float fY, float fZ, BYTE byteIcon, DWORD dwColor, int iStyle);
// MATCH
inline void DisableMapIcon(BYTE byteIndex) { // .text:10008FB0
if (byteIndex >= 100) return;
ScriptCommand(&disable_marker, m_dwMapIcon[byteIndex]);
m_dwMapIcon[byteIndex] = NULL;
};
void DisableMapIcon(BYTE byteIndex); // .text:10008FB0
CMenuPool * GetMenuPool() { return m_pPools->pMenuPool; }; // .text:100084F0
void AttemptConnect(); // .text:10008940