Skip to content

Commit

Permalink
Showing 2 changed files with 25 additions and 13 deletions.
16 changes: 14 additions & 2 deletions code/client/shared/CrossBuildRuntime.h
Original file line number Diff line number Diff line change
@@ -19,18 +19,30 @@ namespace xbr
//

// TODO: Replace with the default game build once we use latest game build as default instead of the 1604 one.
inline unsigned int GetLatestStableGTA5Build()
{
return 3258;
}

inline unsigned int GetLatestStableRDR3Build()
{
return 1491;
}

#ifndef IS_FXSERVER
inline unsigned int GetLatestStableGameBuild()
{
#if defined(IS_RDR3)
return 1491;
return GetLatestStableRDR3Build();
#elif defined(GTA_FIVE)
return 3258;
return GetLatestStableGTA5Build();
#elif defined(GTA_NY)
return 43;
#else
return 0;
#endif
}
#endif

struct GameBuildUniquifier
{
22 changes: 11 additions & 11 deletions code/components/citizen-server-impl/include/state/ServerGameState.h
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ inline bool Is2060()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 2060) || fx::GetEnforcedGameBuildNumber() >= 2060;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 2060) || fx::GetEnforcedGameBuildNumber() >= 2060;
})();

return value;
@@ -68,7 +68,7 @@ inline bool Is2189()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 2189) || fx::GetEnforcedGameBuildNumber() >= 2189;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 2189) || fx::GetEnforcedGameBuildNumber() >= 2189;
})();

return value;
@@ -78,7 +78,7 @@ inline bool Is2372()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 2372) || fx::GetEnforcedGameBuildNumber() >= 2372;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 2372) || fx::GetEnforcedGameBuildNumber() >= 2372;
})();

return value;
@@ -88,7 +88,7 @@ inline bool Is2545()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 2545) || fx::GetEnforcedGameBuildNumber() >= 2545;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 2545) || fx::GetEnforcedGameBuildNumber() >= 2545;
})();

return value;
@@ -98,7 +98,7 @@ inline bool Is2612()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 2612) || fx::GetEnforcedGameBuildNumber() >= 2612;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 2612) || fx::GetEnforcedGameBuildNumber() >= 2612;
})();

return value;
@@ -108,7 +108,7 @@ inline bool Is2699()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 2699) || fx::GetEnforcedGameBuildNumber() >= 2699;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 2699) || fx::GetEnforcedGameBuildNumber() >= 2699;
})();

return value;
@@ -118,7 +118,7 @@ inline bool Is2802()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 2802) || fx::GetEnforcedGameBuildNumber() >= 2802;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 2802) || fx::GetEnforcedGameBuildNumber() >= 2802;
})();

return value;
@@ -128,7 +128,7 @@ inline bool Is2944()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 2944) || fx::GetEnforcedGameBuildNumber() >= 2944;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 2944) || fx::GetEnforcedGameBuildNumber() >= 2944;
})();

return value;
@@ -138,7 +138,7 @@ inline bool Is3095()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 3095) || fx::GetEnforcedGameBuildNumber() >= 3095;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 3095) || fx::GetEnforcedGameBuildNumber() >= 3095;
})();

return value;
@@ -148,7 +148,7 @@ inline bool Is3258()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 3258) || fx::GetEnforcedGameBuildNumber() >= 3258;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 3258) || fx::GetEnforcedGameBuildNumber() >= 3258;
})();

return value;
@@ -158,7 +158,7 @@ inline bool Is3323()
{
static bool value = ([]()
{
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGameBuild() >= 3323) || fx::GetEnforcedGameBuildNumber() >= 3323;
return (!fx::GetReplaceExecutable() && xbr::GetLatestStableGTA5Build() >= 3323) || fx::GetEnforcedGameBuildNumber() >= 3323;
})();

return value;

0 comments on commit 7ab2d51

Please sign in to comment.