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

@ -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();

View File

@ -107,8 +107,8 @@ NapalmOnWeaponFire(client, const String:weapon[])
return;
}
// Wait .1 seconds.
CreateTimer(0.1, NapalmIgniteGrenade);
// Wait .15 seconds.
CreateTimer(0.15, NapalmIgniteGrenade);
}
/**

View File

@ -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);
}