Merged heads.
This commit is contained in:
commit
9e34734c65
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: zombiereloaded.sp
|
||||
* Type: Base
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: account.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: antistick.inc
|
||||
* Type: Module
|
||||
|
@ -316,14 +316,14 @@ public Action:AntiStickSolidifyTimer(Handle:timer, any:client)
|
|||
// Loop through all client's and check if client is stuck in them.
|
||||
for (new x = 1; x <= MaxClients; x++)
|
||||
{
|
||||
// Don't compare the same clients.
|
||||
if (client == x)
|
||||
// If client isn't in-game, then stop.
|
||||
if (!IsClientInGame(x))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// If client isn't in-game, then stop.
|
||||
if (!IsClientInGame(x))
|
||||
// Don't compare the same clients.
|
||||
if (client == x)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
@ -409,14 +409,14 @@ stock AntiStickBuildModelBox(client, Float:boundaries[AntiStickBoxBound][3], Flo
|
|||
new Float:eyeloc[3];
|
||||
GetClientEyePosition(client, eyeloc);
|
||||
|
||||
boundaries[BoxBound_FUR][2] = eyeloc[2] / 1.1; // Scale box down a bit to prevent weird false triggers.
|
||||
boundaries[BoxBound_FUL][2] = eyeloc[2] / 1.1;
|
||||
boundaries[BoxBound_FDR][2] = clientloc[2] + 3.0; // Raise this a hair up to be safe.
|
||||
boundaries[BoxBound_FDL][2] = clientloc[2] + 3.0;
|
||||
boundaries[BoxBound_BUR][2] = eyeloc[2] / 1.1;
|
||||
boundaries[BoxBound_BUL][2] = eyeloc[2] / 1.1;
|
||||
boundaries[BoxBound_BDR][2] = clientloc[2] + 3.0;
|
||||
boundaries[BoxBound_BDL][2] = clientloc[2] + 3.0;
|
||||
boundaries[BoxBound_FUR][2] = eyeloc[2];
|
||||
boundaries[BoxBound_FUL][2] = eyeloc[2];
|
||||
boundaries[BoxBound_FDR][2] = clientloc[2] + 15.0;
|
||||
boundaries[BoxBound_FDL][2] = clientloc[2] + 15.0;
|
||||
boundaries[BoxBound_BUR][2] = eyeloc[2];
|
||||
boundaries[BoxBound_BUL][2] = eyeloc[2];
|
||||
boundaries[BoxBound_BDR][2] = clientloc[2] + 15.0;
|
||||
boundaries[BoxBound_BDL][2] = clientloc[2] + 15.0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -635,6 +635,9 @@ public Action:AntiStickSetWidthCommand(client, argc)
|
|||
// Set hull width.
|
||||
AntiStickSetModelHullWidth(0, model, hull_width);
|
||||
|
||||
// Tell client it was successful.
|
||||
TranslationReplyToCommand(client, "AntiStick command set width successful", model, hull_width);
|
||||
|
||||
// Save data.
|
||||
AntiStickSaveData();
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: commands.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: config.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: cookies.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: cvars.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: damage.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: downloads.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: event.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: global.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: hitgroup.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: infect.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: jumpboost.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: knockback.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: log.h.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: log.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: menu.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: models.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: napalm.inc
|
||||
* Type: Module
|
||||
|
@ -107,8 +107,8 @@ NapalmOnWeaponFire(client, const String:weapon[])
|
|||
return;
|
||||
}
|
||||
|
||||
// Wait .1 seconds.
|
||||
CreateTimer(0.1, NapalmIgniteGrenade);
|
||||
// Wait .15 seconds.
|
||||
CreateTimer(0.15, NapalmIgniteGrenade);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: overlays.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: apply.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: attributes.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: classcommands.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: classevents.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: classmenus.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: clientalpha.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: clientoverlays.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: filtertools.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: healthregen.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: playerclasses.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: respawn.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: roundend.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: roundstart.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: sayhooks.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: ambientsounds.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: soundeffects.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: zombiesounds.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: spawnprotect.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: steamidcache.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: tools.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: tools_functions.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: translation.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: ragdoll.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: visualambience.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: visualeffects.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: menu_weapons.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: restrict.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: weaponalpha.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: weaponammo.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: weapons.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: zmarket.inc
|
||||
* Type: Module
|
||||
|
@ -1003,6 +1003,12 @@ stock ZMarketSetRebuyCookie(client, WeaponsSlot:slot, const String:value[])
|
|||
|
||||
// Find cookie handle, and retrieve its value.
|
||||
new Handle:rebuycookie = FindClientCookie(rebuycookiename);
|
||||
if (rebuycookie == INVALID_HANDLE)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Set weapon to cookie.
|
||||
SetClientCookie(client, rebuycookie, value);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: zadmin.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: zcookies.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: zhp.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: zombiereloaded.inc
|
||||
* Type: Core
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: zspawn.inc
|
||||
* Type: Module
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* ============================================================================
|
||||
*
|
||||
* Zombie:Reloaded
|
||||
* Zombie:Reloaded
|
||||
*
|
||||
* File: ztele.inc
|
||||
* Type: Module
|
||||
|
|
Loading…
Reference in New Issue
Block a user