1.1 --- a/core/MenuStyle_Base.h	Sat Aug 31 11:50:11 2013 -0700
     1.2 +++ b/core/MenuStyle_Base.h	Sat Aug 31 11:50:28 2013 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * vim: set ts=4 :
     1.6 + * vim: set ts=4 sw=4 tw=99 noet :
     1.7   * =============================================================================
     1.8   * SourceMod
     1.9   * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
    1.10 @@ -34,27 +34,32 @@
    1.11  
    1.12  #include <IMenuManager.h>
    1.13  #include <IPlayerHelpers.h>
    1.14 -#include <sh_string.h>
    1.15 -#include <sh_vector.h>
    1.16 -#include "sm_memtable.h"
    1.17 +#include <am-string.h>
    1.18 +#include <am-vector.h>
    1.19  #include "sm_fastlink.h"
    1.20  
    1.21  using namespace SourceMod;
    1.22 -using namespace SourceHook;
    1.23  
    1.24  class CItem
    1.25  {
    1.26  public:
    1.27  	CItem()
    1.28  	{
    1.29 -		infoString = -1;
    1.30 -		displayString = -1;
    1.31 +		info.setVoid();
    1.32 +		display.setVoid();
    1.33  		style = 0;
    1.34  		access = 0;
    1.35  	}
    1.36 +	CItem(ke::Moveable<CItem> other)
    1.37 +	: info(ke::Move(other->info)),
    1.38 +	  display(ke::Move(other->display))
    1.39 +	{
    1.40 +		style = other->style;
    1.41 +		access = other->access;
    1.42 +	}
    1.43  public:
    1.44 -	int infoString;
    1.45 -	int displayString;
    1.46 +	ke::AString info;
    1.47 +	ke::AString display;
    1.48  	unsigned int style;
    1.49  	unsigned int access;
    1.50  };
    1.51 @@ -139,11 +144,10 @@
    1.52  private:
    1.53  	void InternalDelete();
    1.54  protected:
    1.55 -	String m_Title;
    1.56 +	ke::AString m_Title;
    1.57  	IMenuStyle *m_pStyle;
    1.58 -	BaseStringTable m_Strings;
    1.59  	unsigned int m_Pagination;
    1.60 -	CVector<CItem> m_items;
    1.61 +	ke::Vector<CItem> m_items;
    1.62  	bool m_bShouldDelete;
    1.63  	bool m_bCancelling;
    1.64  	IdentityToken_t *m_pOwner;