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

Extract function ZTeleHasReachedLimit.

Browse Source
This commit is contained in:
Richard Helgeby 2015-03-22 18:39:45 +01:00
parent fcb4fdcab6
commit 5b59f20858
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/zr/ztele.inc
View File

@ -145,12 +145,11 @@ bool:ZTeleClient(client, bool:force = false)
return false; return false;
} }
// If the tele limit has been reached, then stop. if (!force && ZTeleHasReachedLimit(client))
new ztelemax = infected ? GetConVarInt(g_hCvarsList[CVAR_ZTELE_MAX_ZOMBIE]) : GetConVarInt(g_hCvarsList[CVAR_ZTELE_MAX_HUMAN]);
if (!force && g_iZTeleCount[client] >= ztelemax)
{ {
// Tell client that they have already reached their limit. // Tell client that they have already reached their limit.
TranslationPrintToChat(client, "ZTele max", ztelemax); int maxTeleports = ZTeleGetClientLimit(client);
TranslationPrintToChat(client, "ZTele max", maxTeleports);
return false; return false;
} }
@ -197,7 +196,8 @@ bool:ZTeleClient(client, bool:force = false)
// If we're forcing the ZTele, then don't increment the count or print how many teleports they have used. // If we're forcing the ZTele, then don't increment the count or print how many teleports they have used.
// Tell client they've been teleported. // Tell client they've been teleported.
TranslationPrintCenterText(client, "ZTele countdown end", g_iZTeleCount[client], ztelemax); int maxTeleports = ZTeleGetClientLimit(client);
TranslationPrintCenterText(client, "ZTele countdown end", g_iZTeleCount[client], maxTeleports);
} }
return true; return true;
@ -462,3 +462,30 @@ ZTeleCanHumanTeleport()
// after zombies have spawned. // after zombies have spawned.
return InfectHasZombieSpawned() ? GetConVarBool(g_hCvarsList[CVAR_ZTELE_HUMAN_AFTER]) : GetConVarBool(g_hCvarsList[CVAR_ZTELE_HUMAN_BEFORE]); return InfectHasZombieSpawned() ? GetConVarBool(g_hCvarsList[CVAR_ZTELE_HUMAN_AFTER]) : GetConVarBool(g_hCvarsList[CVAR_ZTELE_HUMAN_BEFORE]);
} }
int ZTeleGetZombieLimit()
{
return GetConVarInt(g_hCvarsList[CVAR_ZTELE_MAX_ZOMBIE]);
}
int ZTeleGetHumanLimit()
{
return GetConVarInt(g_hCvarsList[CVAR_ZTELE_MAX_HUMAN]);
}
int ZTeleGetTeleportCount(int client)
{
return g_iZTeleCount[client];
}
int ZTeleGetClientLimit(int client)
{
return InfectIsClientInfected(client) ? ZTeleGetZombieLimit() : ZTeleGetHumanLimit();
}
bool ZTeleHasReachedLimit(int client)
{
int teleportCount = ZTeleGetTeleportCount(client);
int maxTeleports = ZTeleGetClientLimit(client);
return teleportCount >= maxTeleports;
}