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

cleaned up last commit

Browse Source 
removed unnecessary dos2unix from make all
This commit is contained in:
BotoX 2016-06-12 14:07:44 +02:00
parent 266896491c
commit f177f78fe7
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -27,7 +27,7 @@ vpath %.smx $(BUILDDIR)
SOURCEFILES=$(SOURCEDIR)/*.sp
OBJECTS=$(patsubst %.sp, %.smx, $(notdir $(wildcard $(SOURCEFILES))))
all: prepare $(OBJECTS)
all: prepare_builddir $(OBJECTS)
prepare: prepare_newlines prepare_builddir

4
cstrike/cfg/sourcemod/zombiereloaded/zombiereloaded.cfg
View File

@ -769,6 +769,10 @@ zr_ztele_autocancel "1"
// Default: "20"
zr_ztele_autocancel_distance "20"
// Teleport player to a random spawn point instead of the players initial one, when using ztele.
// Default: "0"
zr_ztele_random_spawn "0"
// ----------------------------------------------------------------------------
// ZHP (module)

2
src/zr/overlays.inc
View File

@ -148,13 +148,13 @@ OverlaysOnRoundStart()
if (tOverlays != INVALID_HANDLE)
{
KillTimer(tOverlays);
tOverlays = INVALID_HANDLE;
}
// If antistick is disabled, then stop.
new Float:overlaysupdate = GetConVarFloat(g_hCvarsList[CVAR_OVERLAYS_UPDATE_TIME]);
if (overlaysupdate <= 0.0)
{
tOverlays = INVALID_HANDLE;
return;
}

3
src/zr/respawn.inc
View File

@ -93,12 +93,12 @@ RespawnOnClientDeath(client, attacker, const String:weapon[])
if (tRespawn[client] != INVALID_HANDLE)
{
KillTimer(tRespawn[client]);
tRespawn[client] = INVALID_HANDLE;
}
// If player was infected, then stop.
if (StrEqual(weapon, "zombie_claws_of_death", false))
{
tRespawn[client] = INVALID_HANDLE;
return;
}
@ -106,7 +106,6 @@ RespawnOnClientDeath(client, attacker, const String:weapon[])
new bool:respawn = GetConVarBool(g_hCvarsList[CVAR_RESPAWN]);
if (!respawn)
{
tRespawn[client] = INVALID_HANDLE;
return;
}

8
src/zr/ztele/cvars.inc
View File

@ -34,7 +34,7 @@ Handle ZTeleCvar_MaxZombie;
Handle ZTeleCvar_MaxHuman;
Handle ZTeleCvar_AutoCancel;
Handle ZTeleCvar_AutoCancelDistance;
Handle ZTeleCvar_RandomPosition;
Handle ZTeleCvar_RandomSpawn;
void ZTele_OnCvarsCreate()
{
@ -47,7 +47,7 @@ void ZTele_OnCvarsCreate()
ZTeleCvar_MaxHuman = CreateConVar("zr_ztele_max_human", "1", "Max number of times a human is allowed to use ZTele per round. [Dependency: zr_ztele_human_(before)/(after)]");
ZTeleCvar_AutoCancel = CreateConVar("zr_ztele_autocancel", "1", "Automatically cancel ZTele if player moves out of a set boundary. [Dependency: zr_ztele_(zombie)/(human)[_(before)/(after)]]");
ZTeleCvar_AutoCancelDistance = CreateConVar("zr_ztele_autocancel_distance", "20", "Maximum distance, in feet, player is allowed to travel before teleport is cancelled. [Dependency: zr_ztele_autocancel]");
ZTeleCvar_RandomPosition = CreateConVar("zr_ztele_random_position", "0", "Teleport player to the random spawn position, not only his own one.");
ZTeleCvar_RandomSpawn = CreateConVar("zr_ztele_random_spawn", "0", "Teleport player to a random spawn point instead of the players initial one, when using ztele.");
}
bool ZTele_ZombieCanTeleport()
@ -95,7 +95,7 @@ float ZTele_GetAutoCancelDistance()
return GetConVarFloat(ZTeleCvar_AutoCancelDistance);
}
bool ZTele_IsRandomPositionEnabled()
bool ZTele_IsRandomSpawnEnabled()
{
return GetConVarBool(ZTeleCvar_RandomPosition);
return GetConVarBool(ZTeleCvar_RandomSpawn);
}

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

@ -250,7 +250,7 @@ bool ZTeleClient(int client, bool force = false)
void ZTele_TeleportClient(int client)
{
// Teleport client.
if (ZTele_IsRandomPositionEnabled())
if (ZTele_IsRandomSpawnEnabled())
{
int select = Math_GetRandomInt(0, g_iZTeleSpawnPointsCount - 1);
TeleportEntity(client, g_vecZTeleSpawnPoints[select], NULL_VECTOR, view_as<float>({0.0, 0.0, 0.0}));