Skip to content

Commit 56d81d4

Browse files
committed
Add min-client for fireballdestruct special world property
1 parent 219ad73 commit 56d81d4

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

Server/mods/deathmatch/logic/CGame.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
#define MAX_PROJECTILE_SYNC_DISTANCE 400.0f
7676

7777
#define RELEASE_MIN_CLIENT_VERSION "1.6.0-0.00000"
78+
#define FIREBALLDESTRUCT_MIN_CLIENT_VERSION "1.6.0-9.22199"
7879

7980
#ifndef WIN32
8081
#include <limits.h>
@@ -4563,13 +4564,11 @@ CMtaVersion CGame::CalculateMinClientRequirement()
45634564
if (strNewMin < strMinClientRequirementFromResources)
45644565
strNewMin = strMinClientRequirementFromResources;
45654566

4566-
#if 0
4567-
if (g_pGame->IsGlitchEnabled(GLITCH_DONTBURNFLIPPEDCARS))
4567+
if (!g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::FIREBALLDESTRUCT))
45684568
{
4569-
if (strNewMin < DONTBURNFLIPPEDCARS_MIN_CLIENT_VERSION)
4570-
strNewMin = DONTBURNFLIPPEDCARS_MIN_CLIENT_VERSION;
4569+
if (strNewMin < FIREBALLDESTRUCT_MIN_CLIENT_VERSION)
4570+
strNewMin = FIREBALLDESTRUCT_MIN_CLIENT_VERSION;
45714571
}
4572-
#endif
45734572

45744573
// Log effective min client version
45754574
if (strNewMin != m_strPrevMinClientConnectRequirement)
@@ -4588,15 +4587,14 @@ CMtaVersion CGame::CalculateMinClientRequirement()
45884587
SendSyncSettings();
45894588
}
45904589

4591-
#if 0
45924590
// Do version based kick check as well
45934591
{
45944592
CMtaVersion strKickMin;
45954593

4596-
if (g_pGame->IsGlitchEnabled(GLITCH_DONTBURNFLIPPEDCARS))
4594+
if (!g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::FIREBALLDESTRUCT))
45974595
{
4598-
if (strKickMin < DONTBURNFLIPPEDCARS_MIN_CLIENT_VERSION)
4599-
strKickMin = DONTBURNFLIPPEDCARS_MIN_CLIENT_VERSION;
4596+
if (strKickMin < FIREBALLDESTRUCT_MIN_CLIENT_VERSION)
4597+
strKickMin = FIREBALLDESTRUCT_MIN_CLIENT_VERSION;
46004598
}
46014599

46024600
if (strKickMin != m_strPrevMinClientKickRequirement)
@@ -4619,7 +4617,6 @@ CMtaVersion CGame::CalculateMinClientRequirement()
46194617
CLogger::LogPrintf(SString("Forced %d player(s) to reconnect so they can update to %s\n", uiNumIncompatiblePlayers, *strKickMin));
46204618
}
46214619
}
4622-
#endif
46234620

46244621
// Also seems a good place to keep this setting synchronized
46254622
g_pBandwidthSettings->NotifyBulletSyncEnabled(g_pGame->IsBulletSyncActive());

0 commit comments

Comments
 (0)