UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed TF2 identifiers and condition stocks (bug 4974, r=me).

Browse Source
This commit is contained in:
Nicholas Hastings 2011-06-24 19:45:16 -04:00
parent b1098d6287
commit 7037723993
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/include/tf2_stocks.inc
View File

@ -125,7 +125,7 @@ enum {
TF_CUSTOM_STICKBOMB_EXPLOSION, TF_CUSTOM_STICKBOMB_EXPLOSION,
TF_CUSTOM_AEGIS_ROUND, TF_CUSTOM_AEGIS_ROUND,
TF_CUSTOM_FLARE_EXPLOSION, TF_CUSTOM_FLARE_EXPLOSION,
TF_CUSTOM_BOOTS_STOP, TF_CUSTOM_BOOTS_STOMP,
}; };
// Weapon codes as used in some events, such as player_death // Weapon codes as used in some events, such as player_death
@ -432,10 +432,10 @@ stock TF2_GetPlayerConditionFlags(client)
*/ */
stock bool:TF2_IsPlayerInCondition(client, TFCond:cond) stock bool:TF2_IsPlayerInCondition(client, TFCond:cond)
{ {
// Conditions are stored in a uint64 now. We need to check each 32-bit segment. // Conditions are stored across two netprops now, one for each 32-bit segment.
if (_:cond < 32) if (_:cond < 32)
{ {
new bit = (1 << (_:cond - 32)); new bit = 1 << _:cond;
if ((GetEntProp(client, Prop_Send, "m_nPlayerCond") & bit) == bit) if ((GetEntProp(client, Prop_Send, "m_nPlayerCond") & bit) == bit)
{ {
return true; return true;
@ -448,15 +448,8 @@ stock bool:TF2_IsPlayerInCondition(client, TFCond:cond)
} }
else else
{ {
new bit = 1 << _:cond; new bit = (1 << (_:cond - 32));
new offset = FindSendPropInfo("CTFPlayer", "m_nPlayerCond"); if ((GetEntProp(client, Prop_Send, "m_nPlayerCondEx") & bit) == bit)
if (offset <= 0)
{
ThrowError("Could not find m_nPlayerCond offset from CTFPlayer");
}
if ((GetEntData(client, (offset+4)) & bit) == bit)
{ {
return true; return true;
} }