Merged heads.

This commit is contained in:
richard 2009-07-06 00:18:16 +02:00
commit 9e34734c65
58 changed files with 81 additions and 72 deletions

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: zombiereloaded.sp * File: zombiereloaded.sp
* Type: Base * Type: Base

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: account.inc * File: account.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: antistick.inc * File: antistick.inc
* Type: Module * 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. // Loop through all client's and check if client is stuck in them.
for (new x = 1; x <= MaxClients; x++) for (new x = 1; x <= MaxClients; x++)
{ {
// Don't compare the same clients. // If client isn't in-game, then stop.
if (client == x) if (!IsClientInGame(x))
{ {
continue; continue;
} }
// If client isn't in-game, then stop. // Don't compare the same clients.
if (!IsClientInGame(x)) if (client == x)
{ {
continue; continue;
} }
@ -409,14 +409,14 @@ stock AntiStickBuildModelBox(client, Float:boundaries[AntiStickBoxBound][3], Flo
new Float:eyeloc[3]; new Float:eyeloc[3];
GetClientEyePosition(client, eyeloc); GetClientEyePosition(client, eyeloc);
boundaries[BoxBound_FUR][2] = eyeloc[2] / 1.1; // Scale box down a bit to prevent weird false triggers. boundaries[BoxBound_FUR][2] = eyeloc[2];
boundaries[BoxBound_FUL][2] = eyeloc[2] / 1.1; boundaries[BoxBound_FUL][2] = eyeloc[2];
boundaries[BoxBound_FDR][2] = clientloc[2] + 3.0; // Raise this a hair up to be safe. boundaries[BoxBound_FDR][2] = clientloc[2] + 15.0;
boundaries[BoxBound_FDL][2] = clientloc[2] + 3.0; boundaries[BoxBound_FDL][2] = clientloc[2] + 15.0;
boundaries[BoxBound_BUR][2] = eyeloc[2] / 1.1; boundaries[BoxBound_BUR][2] = eyeloc[2];
boundaries[BoxBound_BUL][2] = eyeloc[2] / 1.1; boundaries[BoxBound_BUL][2] = eyeloc[2];
boundaries[BoxBound_BDR][2] = clientloc[2] + 3.0; boundaries[BoxBound_BDR][2] = clientloc[2] + 15.0;
boundaries[BoxBound_BDL][2] = clientloc[2] + 3.0; boundaries[BoxBound_BDL][2] = clientloc[2] + 15.0;
} }
/** /**
@ -635,6 +635,9 @@ public Action:AntiStickSetWidthCommand(client, argc)
// Set hull width. // Set hull width.
AntiStickSetModelHullWidth(0, model, hull_width); AntiStickSetModelHullWidth(0, model, hull_width);
// Tell client it was successful.
TranslationReplyToCommand(client, "AntiStick command set width successful", model, hull_width);
// Save data. // Save data.
AntiStickSaveData(); AntiStickSaveData();

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: commands.inc * File: commands.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: config.inc * File: config.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: cookies.inc * File: cookies.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: cvars.inc * File: cvars.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: damage.inc * File: damage.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: downloads.inc * File: downloads.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: event.inc * File: event.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: global.inc * File: global.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: hitgroup.inc * File: hitgroup.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: infect.inc * File: infect.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: jumpboost.inc * File: jumpboost.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: knockback.inc * File: knockback.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: log.h.inc * File: log.h.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: log.inc * File: log.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: menu.inc * File: menu.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: models.inc * File: models.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: napalm.inc * File: napalm.inc
* Type: Module * Type: Module
@ -107,8 +107,8 @@ NapalmOnWeaponFire(client, const String:weapon[])
return; return;
} }
// Wait .1 seconds. // Wait .15 seconds.
CreateTimer(0.1, NapalmIgniteGrenade); CreateTimer(0.15, NapalmIgniteGrenade);
} }
/** /**

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: overlays.inc * File: overlays.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: apply.inc * File: apply.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: attributes.inc * File: attributes.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: classcommands.inc * File: classcommands.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: classevents.inc * File: classevents.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: classmenus.inc * File: classmenus.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: clientalpha.inc * File: clientalpha.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: clientoverlays.inc * File: clientoverlays.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: filtertools.inc * File: filtertools.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: healthregen.inc * File: healthregen.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: playerclasses.inc * File: playerclasses.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: respawn.inc * File: respawn.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: roundend.inc * File: roundend.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: roundstart.inc * File: roundstart.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: sayhooks.inc * File: sayhooks.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: ambientsounds.inc * File: ambientsounds.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: soundeffects.inc * File: soundeffects.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: zombiesounds.inc * File: zombiesounds.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: spawnprotect.inc * File: spawnprotect.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: steamidcache.inc * File: steamidcache.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: tools.inc * File: tools.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: tools_functions.inc * File: tools_functions.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: translation.inc * File: translation.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: ragdoll.inc * File: ragdoll.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: visualambience.inc * File: visualambience.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: visualeffects.inc * File: visualeffects.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: menu_weapons.inc * File: menu_weapons.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: restrict.inc * File: restrict.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: weaponalpha.inc * File: weaponalpha.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: weaponammo.inc * File: weaponammo.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: weapons.inc * File: weapons.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: zmarket.inc * File: zmarket.inc
* Type: Module * Type: Module
@ -1003,6 +1003,12 @@ stock ZMarketSetRebuyCookie(client, WeaponsSlot:slot, const String:value[])
// Find cookie handle, and retrieve its value. // Find cookie handle, and retrieve its value.
new Handle:rebuycookie = FindClientCookie(rebuycookiename); new Handle:rebuycookie = FindClientCookie(rebuycookiename);
if (rebuycookie == INVALID_HANDLE)
{
return;
}
// Set weapon to cookie.
SetClientCookie(client, rebuycookie, value); SetClientCookie(client, rebuycookie, value);
} }

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: zadmin.inc * File: zadmin.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: zcookies.inc * File: zcookies.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: zhp.inc * File: zhp.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: zombiereloaded.inc * File: zombiereloaded.inc
* Type: Core * Type: Core

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: zspawn.inc * File: zspawn.inc
* Type: Module * Type: Module

View File

@ -1,7 +1,7 @@
/* /*
* ============================================================================ * ============================================================================
* *
* Zombie:Reloaded * Zombie:Reloaded
* *
* File: ztele.inc * File: ztele.inc
* Type: Module * Type: Module