CSSZombieEscape/sm-zombiereloaded-3
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify pre-check logic in ZTeleClient.

Browse Source
This commit is contained in:
Richard Helgeby
2015-03-22 18:52:31 +01:00
parent f323ca2768
commit 387f59e2cb
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/zr/ztele.inc
View File

@@ -129,30 +129,6 @@ bool:ZTeleClient(client, bool:force = false)
return false;
}
new bool:infected = InfectIsClientInfected(client);
if (!force && ZTeleMustBeHuman(client))
{
// Tell client they must be human to use this feature.
TranslationPrintToChat(client, "Must be human");
return false;
}
if (!force && !infected && !ZTeleCanHumanTeleport())
{
// Tell client that feature is restricted at this time.
TranslationPrintToChat(client, "ZTele restricted human");
return false;
}
if (!force && ZTeleHasReachedLimit(client))
{
// Tell client that they have already reached their limit.
int maxTeleports = ZTeleGetClientLimit(client);
TranslationPrintToChat(client, "ZTele max", maxTeleports);
return false;
}
// If teleport is already in progress, then stop.
if (tZTele[client] != INVALID_HANDLE)
{
@@ -164,15 +140,38 @@ bool:ZTeleClient(client, bool:force = false)
return false;
}
// If we are forcing, then teleport now and stop.
if (force)
{
// Teleport client to spawn.
// Forcing teleport.
ZTeleTeleportClient(client);
// Skip everything else.
return true;
}
if (ZTeleMustBeHuman(client))
{
// Tell client they must be human to use this feature.
TranslationPrintToChat(client, "Must be human");
return false;
}
new bool:infected = InfectIsClientInfected(client);
if (!infected && !ZTeleCanHumanTeleport())
{
// Tell client that feature is restricted at this time.
TranslationPrintToChat(client, "ZTele restricted human");
return false;
}
if (ZTeleHasReachedLimit(client))
{
// Tell client that they have already reached their limit.
int maxTeleports = ZTeleGetClientLimit(client);
TranslationPrintToChat(client, "ZTele max", maxTeleports);
return false;
}
// Get current location.
GetClientAbsOrigin(client, g_vecZTeleOrigin[client]);