From 2af178229dae4a7f91d424b47ddeaf3730314288 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 14 May 2007 04:48:03 +0000 Subject: [PATCH] fixed linux build for menu natives --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40797 --- core/Makefile | 2 +- core/MenuStyle_Base.h | 2 +- core/smn_menus.cpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index a25efdd0..fc8ed470 100644 --- a/core/Makefile +++ b/core/Makefile @@ -28,7 +28,7 @@ OBJECTS += smn_admin.cpp smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \ smn_datapacks.cpp smn_entities.cpp smn_events.cpp smn_fakenatives.cpp \ smn_filesystem.cpp smn_float.cpp smn_functions.cpp smn_gameconfigs.cpp smn_halflife.cpp smn_handles.cpp smn_keyvalues.cpp \ smn_lang.cpp smn_player.cpp smn_string.cpp smn_sorting.cpp smn_textparse.cpp smn_timers.cpp \ - smn_usermsgs.cpp + smn_usermsgs.cpp smn_menus.cpp OBJECTS += systems/ExtensionSys.cpp systems/ForwardSys.cpp systems/HandleSys.cpp \ systems/LibrarySys.cpp systems/PluginInfoDatabase.cpp systems/PluginSys.cpp \ systems/ShareSys.cpp vm/sp_vm_basecontext.cpp vm/sp_vm_engine.cpp \ diff --git a/core/MenuStyle_Base.h b/core/MenuStyle_Base.h index 49707ebd..fe5f7b11 100644 --- a/core/MenuStyle_Base.h +++ b/core/MenuStyle_Base.h @@ -122,9 +122,9 @@ protected: bool m_ExitButton; bool m_bShouldDelete; bool m_bCancelling; + IdentityToken_t *m_pOwner; bool m_bDeleting; bool m_bWillFreeHandle; - IdentityToken_t *m_pOwner; Handle_t m_hHandle; IMenuHandler *m_pHandler; }; diff --git a/core/smn_menus.cpp b/core/smn_menus.cpp index b0c6b17b..5f174d56 100644 --- a/core/smn_menus.cpp +++ b/core/smn_menus.cpp @@ -124,7 +124,6 @@ public: */ virtual void OnPluginUnloaded(IPlugin *plugin) { - IPluginContext *pContext = plugin->GetBaseContext(); for (size_t i = 0; i < m_PanelHandlers.size(); i++) { if (m_PanelHandlers[i]->m_pPlugin == plugin)