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

Merge from sourcemod-1.1.

Browse Source
This commit is contained in:
David Anderson 2009-02-08 00:02:58 -05:00
commit e276223b61
4 changed files with 255 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core/EventManager.cpp
View File

@ -193,6 +193,9 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
pHook->pPostHook->AddFunction(pFunction); pHook->pPostHook->AddFunction(pFunction);
} }
/* Cache the name for post hooks */
pHook->name = strdup(name);
/* Increase reference count */ /* Increase reference count */
pHook->refCount++; pHook->refCount++;
@ -296,6 +299,9 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
/* Delete entry in trie */ /* Delete entry in trie */
sm_trie_delete(m_EventHooks, name); sm_trie_delete(m_EventHooks, name);
/* Free the cached name */
free(pHook->name);
/* And finally free structure memory */ /* And finally free structure memory */
delete pHook; delete pHook;
} }
@ -365,14 +371,17 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
{ {
RETURN_META_VALUE(MRES_IGNORED, false); RETURN_META_VALUE(MRES_IGNORED, false);
} }
/* Get the event name, we're going to need this for passing to post hooks */
name = pEvent->GetName(); name = pEvent->GetName();
m_EventNames.push(name);
if (sm_trie_retrieve(m_EventHooks, name, reinterpret_cast<void **>(&pHook))) if (sm_trie_retrieve(m_EventHooks, name, reinterpret_cast<void **>(&pHook)))
{ {
/* Push the event onto the event stack. The reference count is increased to make sure
* the structure is not garbage collected in between now and the post hook.
*/
pHook->refCount++;
m_EventStack.push(pHook);
pForward = pHook->pPreHook; pForward = pHook->pPreHook;
if (pForward) if (pForward)
@ -400,6 +409,10 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
RETURN_META_VALUE(MRES_SUPERCEDE, false); RETURN_META_VALUE(MRES_SUPERCEDE, false);
} }
} }
else
{
m_EventStack.push(NULL);
}
RETURN_META_VALUE(MRES_IGNORED, true); RETURN_META_VALUE(MRES_IGNORED, true);
} }
@ -410,7 +423,6 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
EventHook *pHook; EventHook *pHook;
EventInfo info; EventInfo info;
IChangeableForward *pForward; IChangeableForward *pForward;
const char *name;
Handle_t hndl = 0; Handle_t hndl = 0;
/* The engine accepts NULL without crashing, so to prevent a crash in SM we ignore these */ /* The engine accepts NULL without crashing, so to prevent a crash in SM we ignore these */
@ -419,9 +431,9 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
RETURN_META_VALUE(MRES_IGNORED, false); RETURN_META_VALUE(MRES_IGNORED, false);
} }
name = m_EventNames.front(); pHook = m_EventStack.front();
if (sm_trie_retrieve(m_EventHooks, name, reinterpret_cast<void **>(&pHook))) if (pHook != NULL)
{ {
pForward = pHook->pPostHook; pForward = pHook->pPostHook;
@ -438,7 +450,7 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
pForward->PushCell(BAD_HANDLE); pForward->PushCell(BAD_HANDLE);
} }
pForward->PushString(name); pForward->PushString(pHook->name);
pForward->PushCell(bDontBroadcast); pForward->PushCell(bDontBroadcast);
pForward->Execute(NULL); pForward->Execute(NULL);
@ -453,9 +465,19 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
m_EventCopies.pop(); m_EventCopies.pop();
} }
} }
/* Decrement reference count, check if a delayed delete is needed */
if (--pHook->refCount == 0)
{
assert(pHook->pPostHook == NULL);
assert(pHook->pPreHook == NULL);
sm_trie_delete(m_EventHooks, pHook->name);
free(pHook->name);
delete pHook;
}
} }
m_EventNames.pop(); m_EventStack.pop();
RETURN_META_VALUE(MRES_IGNORED, true); RETURN_META_VALUE(MRES_IGNORED, true);
} }

3
core/EventManager.h
View File

@ -68,6 +68,7 @@ struct EventHook
IChangeableForward *pPostHook; IChangeableForward *pPostHook;
bool postCopy; bool postCopy;
unsigned int refCount; unsigned int refCount;
char *name;
}; };
enum EventHookMode enum EventHookMode
@ -124,7 +125,7 @@ private:
HandleType_t m_EventType; HandleType_t m_EventType;
Trie *m_EventHooks; Trie *m_EventHooks;
CStack<EventInfo *> m_FreeEvents; CStack<EventInfo *> m_FreeEvents;
CStack<const char *> m_EventNames; CStack<EventHook *> m_EventStack;
CStack<IGameEvent *> m_EventCopies; CStack<IGameEvent *> m_EventCopies;
}; };

4
plugins/adminmenu/dynamicmenu.sp
View File

@ -170,7 +170,7 @@ BuildDynamicMenu()
new count = 1; new count = 1;
decl String:countBuffer[10] = "1"; decl String:countBuffer[10] = "1";
decl String:inputBuffer[32]; decl String:inputBuffer[48];
while (KvJumpToKey(kvMenu, countBuffer)) while (KvJumpToKey(kvMenu, countBuffer))
{ {
@ -718,4 +718,4 @@ stock bool:UnQuoteString(String:input[], String:output[], maxlen, String:quotech
output[count] = 0; output[count] = 0;
return true; return true;
} }

438
plugins/include/tf2_stocks.inc
View File

@ -1,219 +1,219 @@
/** /**
* vim: set ts=4 : * vim: set ts=4 :
* ============================================================================= * =============================================================================
* SourceMod (C)2004-2008 AlliedModders LLC. All rights reserved. * SourceMod (C)2004-2008 AlliedModders LLC. All rights reserved.
* ============================================================================= * =============================================================================
* *
* This file is part of the SourceMod/SourcePawn SDK. * This file is part of the SourceMod/SourcePawn SDK.
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, version 3.0, as published by the * the terms of the GNU General Public License, version 3.0, as published by the
* Free Software Foundation. * Free Software Foundation.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
* *
* As a special exception, AlliedModders LLC gives you permission to link the * As a special exception, AlliedModders LLC gives you permission to link the
* code of this program (as well as its derivative works) to "Half-Life 2," the * code of this program (as well as its derivative works) to "Half-Life 2," the
* "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
* by the Valve Corporation. You must obey the GNU General Public License in * by the Valve Corporation. You must obey the GNU General Public License in
* all respects for all other code used. Additionally, AlliedModders LLC grants * all respects for all other code used. Additionally, AlliedModders LLC grants
* this exception to all derivative works. AlliedModders LLC defines further * this exception to all derivative works. AlliedModders LLC defines further
* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007), * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
* or <http://www.sourcemod.net/license.php>. * or <http://www.sourcemod.net/license.php>.
* *
* Version: $Id$ * Version: $Id$
*/ */
#if defined _tf2_stocks_included #if defined _tf2_stocks_included
#endinput #endinput
#endif #endif
#define _tf2_stocks_included #define _tf2_stocks_included
#include <tf2> #include <tf2>
#include <sdktools> #include <sdktools>
enum TFResourceType enum TFResourceType
{ {
TFResource_Ping, TFResource_Ping,
TFResource_Score, TFResource_Score,
TFResource_Deaths, TFResource_Deaths,
TFResource_TotalScore, TFResource_TotalScore,
TFResource_Captures, TFResource_Captures,
TFResource_Defenses, TFResource_Defenses,
TFResource_Dominations, TFResource_Dominations,
TFResource_Revenge, TFResource_Revenge,
TFResource_BuildingsDestroyed, TFResource_BuildingsDestroyed,
TFResource_Headshots, TFResource_Headshots,
TFResource_Backstabs, TFResource_Backstabs,
TFResource_HealPoints, TFResource_HealPoints,
TFResource_Invulns, TFResource_Invulns,
TFResource_Teleports, TFResource_Teleports,
TFResource_ResupplyPoints, TFResource_ResupplyPoints,
TFResource_KillAssists, TFResource_KillAssists,
TFResource_MaxHealth, TFResource_MaxHealth,
TFResource_PlayerClass TFResource_PlayerClass
}; };
static const String:TFResourceNames[TFResourceType][] = static const String:TFResourceNames[TFResourceType][] =
{ {
"m_iPing", "m_iPing",
"m_iScore", "m_iScore",
"m_iDeaths", "m_iDeaths",
"m_iTotalScore", "m_iTotalScore",
"m_iCaptures", "m_iCaptures",
"m_iDefenses", "m_iDefenses",
"m_iDominations", "m_iDominations",
"m_iRevenge", "m_iRevenge",
"m_iBuildingsDestroyed", "m_iBuildingsDestroyed",
"m_iHeadshots", "m_iHeadshots",
"m_iBackstabs", "m_iBackstabs",
"m_iHealPoints", "m_iHealPoints",
"m_iInvulns", "m_iInvulns",
"m_iTeleports", "m_iTeleports",
"m_iResupplyPoints", "m_iResupplyPoints",
"m_iKillAssists", "m_iKillAssists",
"m_iMaxHealth", "m_iMaxHealth",
"m_iPlayerClass" "m_iPlayerClass"
}; };
/** /**
* Get's a Clients current class. * Get's a Clients current class.
* *
* @param client Player's index. * @param client Player's index.
* @param class TFClassType to change to. * @return Current TFClassType of player.
* @noreturn * @error Invalid client index.
* @error Invalid client index. */
*/ stock TFClassType:TF2_GetPlayerClass(client)
stock TFClassType:TF2_GetPlayerClass(client) {
{ return TFClassType:GetEntProp(client, Prop_Send, "m_iClass");
return TFClassType:GetEntProp(client, Prop_Send, "m_iClass"); }
}
/**
/** * Set's a Clients class.
* Set's a Clients class. *
* * Note: If setting player class in a player spawn hook weapons should be set to false.
* Note: If setting player class in a player spawn hook weapons should be set to false. *
* * @param client Player's index.
* @param client Player's index. * @param class TFClassType class symbol.
* @param class TFClassType class symbol. * @param weapons This paramater is ignored.
* @param weapons This paramater is ignored. * @param persistant If true changes the players desired class so the change stays after death.
* @param persistant If true changes the players desired class so the change stays after death. * @noreturn
* @noreturn * @error Invalid client index.
* @error Invalid client index. */
*/ stock TF2_SetPlayerClass(client, TFClassType:class, bool:weapons=true, bool:persistant=true)
stock TF2_SetPlayerClass(client, TFClassType:class, bool:weapons=true, bool:persistant=true) {
{ SetEntProp(client, Prop_Send, "m_iClass", _:class);
SetEntProp(client, Prop_Send, "m_iClass", _:class);
if (persistant)
if (persistant) {
{ SetEntProp(client, Prop_Send, "m_iDesiredPlayerClass", _:class);
SetEntProp(client, Prop_Send, "m_iDesiredPlayerClass", _:class); }
} }
}
/**
/** * Retrieves client data from the resource entity
* Retrieves client data from the resource entity *
* * @param client Player's index.
* @param client Player's index. * @param type ResourceType constant
* @param type ResourceType constant * @return Value or -1 on failure.
* @return Value or -1 on failure. * @error Invalid client index, client not in game or failed to find resource entity.
* @error Invalid client index, client not in game or failed to find resource entity. */
*/ stock TF2_GetPlayerResourceData(client, TFResourceType:type)
stock TF2_GetPlayerResourceData(client, TFResourceType:type) {
{ if (!IsClientConnected(client))
if (!IsClientConnected(client)) {
{ return -1;
return -1; }
}
new offset = FindSendPropInfo("CTFPlayerResource", TFResourceNames[type]);
new offset = FindSendPropInfo("CTFPlayerResource", TFResourceNames[type]);
if (offset < 1)
if (offset < 1) {
{ return -1;
return -1; }
}
new entity = TF2_GetResourceEntity();
new entity = TF2_GetResourceEntity();
if (entity == -1)
if (entity == -1) {
{ return -1;
return -1; }
}
return GetEntData(entity, offset + (client*4));
return GetEntData(entity, offset + (client*4)); }
}
/**
/** * Sets client data in the resource entity
* Sets client data in the resource entity *
* * Note: The game overwrites these values every frame, so changing them will have very little effect.
* Note: The game overwrites these values every frame, so changing them will have very little effect. *
* * @param client Player's index.
* @param client Player's index. * @param type ResourceType constant
* @param type ResourceType constant * @param value Value to set.
* @param value Value to set. * @return Value or -1 on failure.
* @return Value or -1 on failure. * @error Invalid client index, client not in game or failed to find resource entity.
* @error Invalid client index, client not in game or failed to find resource entity. */
*/ stock bool:TF2_SetPlayerResourceData(client, TFResourceType:type, any:value)
stock bool:TF2_SetPlayerResourceData(client, TFResourceType:type, any:value) {
{ if (!IsClientConnected(client))
if (!IsClientConnected(client)) {
{ return false;
return false; }
}
new offset = FindSendPropInfo("CTFPlayerResource", TFResourceNames[type]);
new offset = FindSendPropInfo("CTFPlayerResource", TFResourceNames[type]);
if (offset < 1)
if (offset < 1) {
{ return false;
return false; }
}
new entity = TF2_GetResourceEntity();
new entity = TF2_GetResourceEntity();
if (entity == -1)
if (entity == -1) {
{ return false;
return false; }
}
SetEntData(entity, offset + (client*4), value);
SetEntData(entity, offset + (client*4), value);
return true;
return true; }
}
/**
/** * Removes all weapons from a client's weapon slot
* Removes all weapons from a client's weapon slot *
* * @param client Player's index.
* @param client Player's index. * @param slot Slot index (0-5)
* @param slot Slot index (0-5) * @noreturn
* @noreturn * @error Invalid client, invalid slot or lack of mod support
* @error Invalid client, invalid slot or lack of mod support */
*/ stock TF2_RemoveWeaponSlot(client, slot)
stock TF2_RemoveWeaponSlot(client, slot) {
{ new weaponIndex;
new weaponIndex; while ((weaponIndex = GetPlayerWeaponSlot(client, slot)) != -1)
while ((weaponIndex = GetPlayerWeaponSlot(client, slot)) != -1) {
{ RemovePlayerItem(client, weaponIndex);
RemovePlayerItem(client, weaponIndex); RemoveEdict(weaponIndex);
RemoveEdict(weaponIndex); }
} }
}
/**
/** * Removes all weapons from a client
* Removes all weapons from a client *
* * @param client Player's index.
* @param client Player's index. * @noreturn
* @noreturn */
*/ stock TF2_RemoveAllWeapons(client)
stock TF2_RemoveAllWeapons(client) {
{ for (new i = 0; i <= 5; i++)
for (new i = 0; i <= 5; i++) {
{ TF2_RemoveWeaponSlot(client, i);
TF2_RemoveWeaponSlot(client, i); }
} }
}