q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-12-24 14:54:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename isMenuEnabled to isMenuEnabled_ to avoid a symbol collicion that (can) happens at runtime

Browse Source
This commit is contained in:
ptitSeb 2016-04-06 13:54:22 +02:00
parent 4757cbbd2b
commit ddb0e94ef2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/GameMP/Game.cpp
View File

@ -1023,7 +1023,7 @@ void CGame::InitInternal( void)
extern CTString GetCurrentGameTypeName(void);
extern ULONG GetSpawnFlagsForGameType(INDEX);
extern ULONG GetSpawnFlagsForGameTypeCfunc(void* pArgs);
extern BOOL IsMenuEnabled(const CTString &);
extern BOOL IsMenuEnabled_(const CTString &);
extern BOOL IsMenuEnabledCfunc(void* pArgs);
_pShell->DeclareSymbol("user CTString GetGameAgentRulesInfo(void);", (void *)&GetGameAgentRulesInfo);
_pShell->DeclareSymbol("user CTString GetGameTypeName(INDEX);", (void *)&GetGameTypeNameCfunc);
@ -1035,7 +1035,7 @@ void CGame::InitInternal( void)
_pShell->DeclareSymbol("CTString GetGameTypeNameSS(INDEX);", (void *)&GetGameTypeName);
_pShell->DeclareSymbol("INDEX GetSpawnFlagsForGameTypeSS(INDEX);", (void *)&GetSpawnFlagsForGameType);
_pShell->DeclareSymbol("INDEX IsMenuEnabledSS(CTString);", (void *)&IsMenuEnabled);
_pShell->DeclareSymbol("INDEX IsMenuEnabledSS(CTString);", (void *)&IsMenuEnabled_);
_pShell->DeclareSymbol("user const INDEX ctl_iCurrentPlayerLocal;", (void *)&ctl_iCurrentPlayerLocal);
_pShell->DeclareSymbol("user const INDEX ctl_iCurrentPlayer;", (void *)&ctl_iCurrentPlayer);

4
Sources/GameMP/SessionProperties.cpp
View File

@ -251,7 +251,7 @@ void CGame::SetMultiPlayerSession(CSessionProperties &sp)
}
}
BOOL IsMenuEnabled(const CTString &strMenuName)
BOOL IsMenuEnabled_(const CTString &strMenuName)
{
if (strMenuName=="Single Player") {
return TRUE;
@ -272,7 +272,7 @@ BOOL IsMenuEnabled(const CTString &strMenuName)
BOOL IsMenuEnabledCfunc(void* pArgs)
{
CTString strMenuName = *NEXTARGUMENT(CTString*);
return IsMenuEnabled(strMenuName);
return IsMenuEnabled_(strMenuName);
}
CTString GetGameTypeName(INDEX iMode)