diff -r 4c2e6bd4d2e8 -r 2365240861a2 core/sourcehook/sourcehook_impl.h --- a/core/sourcehook/sourcehook_impl.h Thu Oct 14 18:14:45 2010 -0500 +++ b/core/sourcehook/sourcehook_impl.h Sat Oct 16 23:21:58 2010 -0700 @@ -1,5 +1,5 @@ /* ======== SourceHook ======== -* Copyright (C) 2004-2008 Metamod:Source Development Team +* Copyright (C) 2004-2010 Metamod:Source Development Team * No warranties of any kind * * License: zlib/libpng @@ -189,6 +189,10 @@ { struct CHookContext : IHookContext { + CHookContext() : m_CleanupTask(NULL) + { + } + enum State { State_Born, @@ -224,6 +228,8 @@ bool m_CallOrig; + ICleanupTask *m_CleanupTask; + void SkipPaused(List::iterator &iter, List &list) { while (iter != list.end() && iter->IsPaused()) @@ -238,12 +244,13 @@ void *GetOverrideRetPtr(); const void *GetOrigRetPtr(); bool ShouldCallOrig(); + void DoCleanupTaskAndDeleteIt(); }; class CVfnPtrList : public List { public: - CVfnPtr &GetVfnPtr(void *p); + CVfnPtr *GetVfnPtr(void *p); }; typedef CStack HookContextStack; @@ -259,6 +266,7 @@ bool SetHookPaused(int hookid, bool paused); CHookManList::iterator RemoveHookManager(CHookManList::iterator iter); + List::iterator RevertAndRemoveVfnPtr(List::iterator vfnptr_iter); public: CSourceHookImpl(); virtual ~CSourceHookImpl(); @@ -308,7 +316,7 @@ void DoRecall(); - IHookContext *SetupHookLoop(IHookManagerInfo *hi, void *vfnptr, void *thisptr, void **origentry, META_RES *statusPtr, + IHookContext *SetupHookLoop(IHookManagerInfo *hi, void *vfnptr, void *thisptr, void **origCallAddr, META_RES *statusPtr, META_RES *prevResPtr, META_RES *curResPtr, const void *origRetPtr, void *overrideRetPtr); void EndContext(IHookContext *pCtx);