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

fixed a regression where valve-style menus stopped working

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401611
This commit is contained in:
David Anderson 2007-10-18 01:08:48 +00:00
parent 7d7dafaa92
commit 0b66a6acee
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/MenuStyle_Valve.cpp
View File

@ -41,7 +41,6 @@ SH_DECL_HOOK4_void(IServerPluginHelpers, CreateMessage, SH_NOATTRIB, false, edic
ValveMenuStyle g_ValveMenuStyle; ValveMenuStyle g_ValveMenuStyle;
extern const char *g_OptionNumTable[]; extern const char *g_OptionNumTable[];
extern const char *g_OptionCmdTable[]; extern const char *g_OptionCmdTable[];
IServerPluginCallbacks *g_pVSPHandle = NULL;
CallClass<IServerPluginHelpers> *g_pSPHCC = NULL; CallClass<IServerPluginHelpers> *g_pSPHCC = NULL;
ValveMenuStyle::ValveMenuStyle() : m_players(new CValveMenuPlayer[256+1]) ValveMenuStyle::ValveMenuStyle() : m_players(new CValveMenuPlayer[256+1])
@ -114,11 +113,6 @@ void ValveMenuStyle::HookCreateMessage(edict_t *pEdict,
} }
} }
void ValveMenuStyle::OnSourceModVSPReceived(IServerPluginCallbacks *iface)
{
g_pVSPHandle = iface;
}
IMenuPanel *ValveMenuStyle::CreatePanel() IMenuPanel *ValveMenuStyle::CreatePanel()
{ {
return new CValveMenuDisplay(); return new CValveMenuDisplay();
@ -148,7 +142,7 @@ void ValveMenuStyle::SendDisplay(int client, IMenuPanel *display)
bool ValveMenuStyle::DoClientMenu(int client, IMenuPanel *menu, IMenuHandler *mh, unsigned int time) bool ValveMenuStyle::DoClientMenu(int client, IMenuPanel *menu, IMenuHandler *mh, unsigned int time)
{ {
if (!g_pVSPHandle) if (vsp_interface == NULL)
{ {
return false; return false;
} }
@ -158,7 +152,7 @@ bool ValveMenuStyle::DoClientMenu(int client, IMenuPanel *menu, IMenuHandler *mh
bool ValveMenuStyle::DoClientMenu(int client, CBaseMenu *menu, unsigned int first_item, IMenuHandler *mh, unsigned int time) bool ValveMenuStyle::DoClientMenu(int client, CBaseMenu *menu, unsigned int first_item, IMenuHandler *mh, unsigned int time)
{ {
if (!g_pVSPHandle) if (vsp_interface == NULL)
{ {
mh->OnMenuStart(menu); mh->OnMenuStart(menu);
mh->OnMenuCancel(menu, client, MenuCancel_NoDisplay); mh->OnMenuCancel(menu, client, MenuCancel_NoDisplay);
@ -329,7 +323,7 @@ void CValveMenuDisplay::SendRawDisplay(int client, int priority, unsigned int ti
engine->PEntityOfEntIndex(client), engine->PEntityOfEntIndex(client),
DIALOG_MENU, DIALOG_MENU,
m_pKv, m_pKv,
g_pVSPHandle); vsp_interface);
} }
bool CValveMenuDisplay::SendDisplay(int client, IMenuHandler *handler, unsigned int time) bool CValveMenuDisplay::SendDisplay(int client, IMenuHandler *handler, unsigned int time)

1
core/MenuStyle_Valve.h
View File

@ -69,7 +69,6 @@ public: //BaseMenuStyle
public: //SMGlobalClass public: //SMGlobalClass
void OnSourceModAllInitialized(); void OnSourceModAllInitialized();
void OnSourceModShutdown(); void OnSourceModShutdown();
void OnSourceModVSPReceived(IServerPluginCallbacks *iface);
public: //IMenuStyle public: //IMenuStyle
const char *GetStyleName(); const char *GetStyleName();
IMenuPanel *CreatePanel(); IMenuPanel *CreatePanel();