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

fix random ztele feature: exception and no zombie when there are no spawnpoints found

Browse Source 
which was caused by maps using renamed logic entities for spawnpoints (also fixed detecting those)

removed deprecated cvar flag
This commit is contained in:
BotoX 2016-08-18 06:50:29 +02:00
parent 37a7224d6c
commit f987a534f2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zr/cvars.inc
View File

@ -214,10 +214,10 @@ CvarsInit()
// Create public cvar for tracking. // Create public cvar for tracking.
decl String:description[64]; decl String:description[64];
Format(description, sizeof(description), "%s Current version of this plugin", TRANSLATION_PHRASE_PREFIX); Format(description, sizeof(description), "%s Current version of this plugin", TRANSLATION_PHRASE_PREFIX);
CreateConVar("gs_zombiereloaded_version", VERSION, description, FCVAR_PLUGIN|FCVAR_SPONLY|FCVAR_UNLOGGED|FCVAR_DONTRECORD|FCVAR_REPLICATED|FCVAR_NOTIFY); CreateConVar("gs_zombiereloaded_version", VERSION, description, FCVAR_SPONLY|FCVAR_UNLOGGED|FCVAR_DONTRECORD|FCVAR_REPLICATED|FCVAR_NOTIFY);
#if defined ADD_VERSION_INFO #if defined ADD_VERSION_INFO
CreateConVar("zombiereloaded_revision", ZR_VER_REVISION, "Revision number for this plugin in source code repository.", FCVAR_PLUGIN|FCVAR_SPONLY|FCVAR_UNLOGGED|FCVAR_DONTRECORD|FCVAR_REPLICATED|FCVAR_NOTIFY); CreateConVar("zombiereloaded_revision", ZR_VER_REVISION, "Revision number for this plugin in source code repository.", FCVAR_SPONLY|FCVAR_UNLOGGED|FCVAR_DONTRECORD|FCVAR_REPLICATED|FCVAR_NOTIFY);
#endif #endif
// Forward event to modules. // Forward event to modules.

14
src/zr/ztele/ztele.inc
View File

@ -85,18 +85,18 @@ void ZTeleOnRoundStart()
continue; continue;
} }
if (g_iZTeleSpawnPointsCount >= MAX_PLAYER_SPAWNS) GetEntityClassname(i, classname, sizeof(classname));
{
break;
}
GetEdictClassname(i, classname, sizeof(classname));
if (StrEqual(classname, "info_player_terrorist", true) || StrEqual(classname, "info_player_counterterrorist", true)) if (StrEqual(classname, "info_player_terrorist", true) || StrEqual(classname, "info_player_counterterrorist", true))
{ {
GetEntPropVector(i, Prop_Send, "m_vecOrigin", g_vecZTeleSpawnPoints[g_iZTeleSpawnPointsCount]); GetEntPropVector(i, Prop_Send, "m_vecOrigin", g_vecZTeleSpawnPoints[g_iZTeleSpawnPointsCount]);
g_iZTeleSpawnPointsCount++; g_iZTeleSpawnPointsCount++;
if (g_iZTeleSpawnPointsCount >= MAX_PLAYER_SPAWNS)
{
break;
}
} }
} }
} }
@ -250,7 +250,7 @@ bool ZTeleClient(int client, bool force = false)
void ZTele_TeleportClient(int client) void ZTele_TeleportClient(int client)
{ {
// Teleport client. // Teleport client.
if (ZTele_IsRandomSpawnEnabled()) if (ZTele_IsRandomSpawnEnabled() && g_iZTeleSpawnPointsCount)
{ {
int select = Math_GetRandomInt(0, g_iZTeleSpawnPointsCount - 1); int select = Math_GetRandomInt(0, g_iZTeleSpawnPointsCount - 1);
TeleportEntity(client, g_vecZTeleSpawnPoints[select], NULL_VECTOR, view_as<float>({0.0, 0.0, 0.0})); TeleportEntity(client, g_vecZTeleSpawnPoints[select], NULL_VECTOR, view_as<float>({0.0, 0.0, 0.0}));