diff -r f1f4eb1d9274 -r 34b8688e3bec core/MenuStyle_Base.h --- a/core/MenuStyle_Base.h Sat Aug 31 11:50:11 2013 -0700 +++ b/core/MenuStyle_Base.h Sat Aug 31 11:50:28 2013 -0700 @@ -1,5 +1,5 @@ /** - * vim: set ts=4 : + * vim: set ts=4 sw=4 tw=99 noet : * ============================================================================= * SourceMod * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. @@ -34,27 +34,32 @@ #include #include -#include -#include -#include "sm_memtable.h" +#include +#include #include "sm_fastlink.h" using namespace SourceMod; -using namespace SourceHook; class CItem { public: CItem() { - infoString = -1; - displayString = -1; + info.setVoid(); + display.setVoid(); style = 0; access = 0; } + CItem(ke::Moveable other) + : info(ke::Move(other->info)), + display(ke::Move(other->display)) + { + style = other->style; + access = other->access; + } public: - int infoString; - int displayString; + ke::AString info; + ke::AString display; unsigned int style; unsigned int access; }; @@ -139,11 +144,10 @@ private: void InternalDelete(); protected: - String m_Title; + ke::AString m_Title; IMenuStyle *m_pStyle; - BaseStringTable m_Strings; unsigned int m_Pagination; - CVector m_items; + ke::Vector m_items; bool m_bShouldDelete; bool m_bCancelling; IdentityToken_t *m_pOwner;