Skip to content

Commit bbf74ba

Browse files
committed
Include or exclude VERSION_TYPE_UNTESTED in some places
1 parent 4be957b commit bbf74ba

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

Client/core/CGUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void CLocalGUI::CreateWindows(bool bGameIsAlreadyLoaded)
158158
m_pLabelVersionTag->SetTextColor(255, 255, 255);
159159
m_pLabelVersionTag->SetZOrderingEnabled(false);
160160
m_pLabelVersionTag->MoveToBack();
161-
if (MTASA_VERSION_TYPE < VERSION_TYPE_RELEASE)
161+
if (MTASA_VERSION_TYPE < VERSION_TYPE_UNTESTED)
162162
m_pLabelVersionTag->SetAlwaysOnTop(true);
163163

164164
// Create mainmenu

Client/loader/MainFunctions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ void CheckDataFiles()
977977
//////////////////////////////////////////////////////////
978978
void CheckLibVersions()
979979
{
980-
#if MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE
980+
#if MTASA_VERSION_TYPE < VERSION_TYPE_UNTESTED
981981

982982
const char* moduleList[] = {"MTA\\loader.dll",
983983
"MTA\\cgui.dll",

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,10 +1272,10 @@ bool MinClientReqCheck(CScriptArgReader& argStream, const char* szVersionReq, co
12721272
{
12731273
if (pResource->GetMinClientReq() < szVersionReq)
12741274
{
1275-
#if MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE
1275+
#if MTASA_VERSION_TYPE < VERSION_TYPE_UNTESTED
12761276
if (szReason)
12771277
argStream.SetVersionWarning(szVersionReq, "client", szReason);
1278-
#endif
1278+
#endif
12791279
return false;
12801280
}
12811281
}
@@ -1299,11 +1299,11 @@ void MinClientReqCheck(lua_State* luaVM, const char* szVersionReq, const char* s
12991299

13001300
if (pResource->GetMinClientReq() < szVersionReq)
13011301
{
1302-
#if MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE
1302+
#if MTASA_VERSION_TYPE < VERSION_TYPE_UNTESTED
13031303
SString err("<min_mta_version> section in the meta.xml is incorrect or missing (expected at least client %s because %s)",
13041304
szVersionReq, szReason);
13051305
throw std::invalid_argument(err);
1306-
#endif
1306+
#endif
13071307
}
13081308

13091309
}

Server/mods/deathmatch/logic/CConsoleCommands.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1570,7 +1570,7 @@ bool CConsoleCommands::OpenPortsTest(CConsole* pConsole, const char* szArguments
15701570
{
15711571
if (pClient->GetClientType() == CClient::CLIENT_CONSOLE)
15721572
{
1573-
#if MTASA_VERSION_TYPE < VERSION_TYPE_RELEASE
1573+
#if MTASA_VERSION_TYPE < VERSION_TYPE_UNTESTED
15741574
if (SStringX(szArguments) == "crashme")
15751575
{
15761576
// For testing crash handling

Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,9 +593,9 @@ void MinServerReqCheck(CScriptArgReader& argStream, const char* szVersionReq, co
593593
{
594594
if (pResource->GetMinServerRequirement() < szVersionReq)
595595
{
596-
#if MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE
596+
#if MTASA_VERSION_TYPE < VERSION_TYPE_UNTESTED
597597
argStream.SetVersionWarning(szVersionReq, "server", szReason);
598-
#endif
598+
#endif
599599
}
600600
}
601601
}

Server/mods/deathmatch/logic/luadefs/CLuaFunctionDefs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void CLuaFunctionDefs::LoadFunctions()
4040
{"setWeaponProperty", CLuaFunctionDefs::SetWeaponProperty}, {"setWeaponAmmo", CLuaFunctionDefs::SetWeaponAmmo},
4141
{"getSlotFromWeapon", CLuaFunctionDefs::GetSlotFromWeapon},
4242

43-
#if MTASA_VERSION_TYPE < VERSION_TYPE_RELEASE
43+
#if MTASA_VERSION_TYPE < VERSION_TYPE_UNTESTED
4444
{"createWeapon", CLuaFunctionDefs::CreateWeapon}, {"fireWeapon", CLuaFunctionDefs::FireWeapon},
4545
{"setWeaponState", CLuaFunctionDefs::SetWeaponState}, {"getWeaponState", CLuaFunctionDefs::GetWeaponState},
4646
{"setWeaponTarget", CLuaFunctionDefs::SetWeaponTarget}, {"getWeaponTarget", CLuaFunctionDefs::GetWeaponTarget},

0 commit comments

Comments
 (0)