1.1 --- a/core/smn_events.cpp Fri Mar 29 12:28:02 2013 -0400
1.2 +++ b/core/smn_events.cpp Fri Mar 29 11:37:29 2013 -0700
1.3 @@ -31,8 +31,8 @@
1.4
1.5 #include "sm_globals.h"
1.6 #include "sourcemm_api.h"
1.7 -#include "HandleSys.h"
1.8 #include "EventManager.h"
1.9 +#include "logic_bridge.h"
1.10
1.11 static cell_t sm_HookEvent(IPluginContext *pContext, const cell_t *params)
1.12 {
1.13 @@ -113,7 +113,7 @@
1.14
1.15 if (pInfo)
1.16 {
1.17 - return g_HandleSys.CreateHandle(g_EventManager.GetHandleType(), pInfo, pContext->GetIdentity(), g_pCoreIdent, NULL);
1.18 + return handlesys->CreateHandle(g_EventManager.GetHandleType(), pInfo, pContext->GetIdentity(), g_pCoreIdent, NULL);
1.19 }
1.20
1.21 return BAD_HANDLE;
1.22 @@ -125,7 +125,7 @@
1.23 HandleError err;
1.24 EventInfo *pInfo;
1.25
1.26 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.27 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.28 != HandleError_None)
1.29 {
1.30 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.31 @@ -141,7 +141,7 @@
1.32
1.33 /* Free handle on game event */
1.34 HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.35 - g_HandleSys.FreeHandle(hndl, &sec);
1.36 + handlesys->FreeHandle(hndl, &sec);
1.37
1.38 return 1;
1.39 }
1.40 @@ -152,7 +152,7 @@
1.41 HandleError err;
1.42 EventInfo *pInfo;
1.43
1.44 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.45 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.46 != HandleError_None)
1.47 {
1.48 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.49 @@ -168,7 +168,7 @@
1.50
1.51 /* Free handle on game event */
1.52 HandleSecurity sec(pContext->GetIdentity(), g_pCoreIdent);
1.53 - g_HandleSys.FreeHandle(hndl, &sec);
1.54 + handlesys->FreeHandle(hndl, &sec);
1.55
1.56 return 1;
1.57 }
1.58 @@ -179,7 +179,7 @@
1.59 HandleError err;
1.60 EventInfo *pInfo;
1.61
1.62 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.63 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.64 != HandleError_None)
1.65 {
1.66 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.67 @@ -196,7 +196,7 @@
1.68 HandleError err;
1.69 EventInfo *pInfo;
1.70
1.71 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.72 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.73 != HandleError_None)
1.74 {
1.75 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.76 @@ -214,7 +214,7 @@
1.77 HandleError err;
1.78 EventInfo *pInfo;
1.79
1.80 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.81 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.82 != HandleError_None)
1.83 {
1.84 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.85 @@ -232,7 +232,7 @@
1.86 HandleError err;
1.87 EventInfo *pInfo;
1.88
1.89 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.90 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.91 != HandleError_None)
1.92 {
1.93 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.94 @@ -252,7 +252,7 @@
1.95 HandleError err;
1.96 EventInfo *pInfo;
1.97
1.98 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.99 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.100 != HandleError_None)
1.101 {
1.102 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.103 @@ -272,7 +272,7 @@
1.104 HandleError err;
1.105 EventInfo *pInfo;
1.106
1.107 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.108 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.109 != HandleError_None)
1.110 {
1.111 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.112 @@ -292,7 +292,7 @@
1.113 HandleError err;
1.114 EventInfo *pInfo;
1.115
1.116 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.117 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.118 != HandleError_None)
1.119 {
1.120 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.121 @@ -312,7 +312,7 @@
1.122 HandleError err;
1.123 EventInfo *pInfo;
1.124
1.125 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.126 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.127 != HandleError_None)
1.128 {
1.129 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.130 @@ -333,7 +333,7 @@
1.131 HandleError err;
1.132 EventInfo *pInfo;
1.133
1.134 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.135 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.136 != HandleError_None)
1.137 {
1.138 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
1.139 @@ -354,7 +354,7 @@
1.140 HandleError err;
1.141 EventInfo *pInfo;
1.142
1.143 - if ((err=g_HandleSys.ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.144 + if ((err=handlesys->ReadHandle(hndl, g_EventManager.GetHandleType(), NULL, (void **)&pInfo))
1.145 != HandleError_None)
1.146 {
1.147 return pContext->ThrowNativeError("Invalid game event handle %x (error %d)", hndl, err);
