diff --git a/SpyCustom/AnalogCode.h b/SpyCustom/AnalogCode.h
deleted file mode 100644
index 9251081..0000000
--- a/SpyCustom/AnalogCode.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef ANALOGCODE_H
-#define ANALOGCODE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "InputEnums.h"
-
-
-#define JOYSTICK_AXIS_INTERNAL( _joystick, _axis ) ( JOYSTICK_FIRST_AXIS + ((_joystick) * MAX_JOYSTICK_AXES) + (_axis) )
-#define JOYSTICK_AXIS( _joystick, _axis ) ( (AnalogCode_t)JOYSTICK_AXIS_INTERNAL( _joystick, _axis ) )
-
-
-enum AnalogCode_t
-{
-	ANALOG_CODE_INVALID = -1,
-	MOUSE_X = 0,
-	MOUSE_Y,
-	MOUSE_XY,		       
-	MOUSE_WHEEL,
-
-	JOYSTICK_FIRST_AXIS,
-	JOYSTICK_LAST_AXIS = JOYSTICK_AXIS_INTERNAL(MAX_JOYSTICKS - 1, MAX_JOYSTICK_AXES - 1),
-
-	ANALOG_CODE_LAST,
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/BuildGroup.h b/SpyCustom/BuildGroup.h
deleted file mode 100644
index cd821eb..0000000
--- a/SpyCustom/BuildGroup.h
+++ /dev/null
@@ -1,143 +0,0 @@
-#ifndef VGUI_BUILDGROUP_H
-#define VGUI_BUILDGROUP_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-#include "utlsymbol.h"
-#include "vgui.h"
-#include "Dar.h"
-#include "Cursor.h"
-#include "IScheme.h"
-#include "Controls.h"
-#include "PHandle.h"
-#include "utlhandletable.h"
-
-class KeyValues;
-
-namespace vgui
-{
-
-	class BuildGroup
-	{
-		DECLARE_HANDLES(BuildGroup, 20);
-
-	public:
-		BuildGroup(Panel* parentPanel, Panel* contextPanel);
-		~BuildGroup();
-
-		virtual void SetEnabled(bool state);
-
-		virtual bool IsEnabled();
-
-		virtual Panel* GetCurrentPanel();
-
-		virtual void LoadControlSettings(const char* controlResourceName, const char* pathID = NULL, KeyValues* pPreloadedKeyValues = NULL, KeyValues* pConditions = NULL);
-
-		void ReloadControlSettings();
-
-		void ChangeControlSettingsFile(const char* controlResourceName);
-
-		virtual bool SaveControlSettings();
-
-		virtual void ApplySettings(KeyValues* resourceData);
-
-		virtual void GetSettings(KeyValues* resourceData);
-
-		virtual void RemoveSettings();
-
-		void GetNewFieldName(char* newFieldName, int newFieldNameSize, Panel* newPanel);
-
-		Panel* FieldNameTaken(const char* fieldName);
-
-		Panel* NewControl(KeyValues* controlKeys, int x = 0, int y = 0);
-		Panel* NewControl(const char* name, int x = 0, int y = 0);
-
-		virtual void SetContextPanel(Panel* contextPanel);
-
-		virtual Panel* GetContextPanel();
-
-		CUtlVector<PHandle>* GetPanelList();
-
-		virtual const char* GetResourceName(void) { return m_pResourceName; }
-
-		void PanelAdded(Panel* panel);
-		void PanelRemoved(Panel* panel);
-
-		virtual bool MousePressed(MouseCode code, Panel* panel);
-		virtual bool MouseReleased(MouseCode code, Panel* panel);
-
-		virtual CUtlVector<PHandle>* GetControlGroup();
-
-		virtual void ToggleRulerDisplay();
-
-		virtual void SetRulerLabelsVisible(bool state);
-
-		virtual bool HasRulersOn();
-
-		virtual void DrawRulers();
-
-		void RegisterControlSettingsFile(const char* controlResourceName, const char* pathID = NULL);
-
-		int GetRegisteredControlSettingsFileCount();
-		const char* GetRegisteredControlSettingsFileByIndex(int index);
-
-		KeyValues* GetDialogVariables();
-
-		void ProcessConditionalKeys(KeyValues* pDat, KeyValues* pConditions);
-
-	protected:
-		virtual bool CursorMoved(int x, int y, Panel* panel);
-		virtual bool MouseDoublePressed(MouseCode code, Panel* panel);
-		virtual bool KeyCodeTyped(KeyCode code, Panel* panel);
-		virtual bool KeyCodeReleased(KeyCode code, Panel* panel);
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-		virtual bool KeyTyped(wchar_t unichar, Panel* panel);
-
-		virtual HCursor GetCursor(Panel* panel);
-
-	private:
-		void ApplySnap(Panel* panel);
-		Panel* CreateBuildDialog();
-		void ActivateBuildDialog();
-		void DeleteAllControlsCreatedByControlSettingsFile();
-
-		bool      _enabled;
-		int       _snapX;
-		int       _snapY;
-		HCursor   _cursor_sizenwse;
-		HCursor   _cursor_sizenesw;
-		HCursor   _cursor_sizewe;
-		HCursor   _cursor_sizens;
-		HCursor   _cursor_sizeall;
-		bool      _dragging;
-		MouseCode _dragMouseCode;
-		int       _dragStartPanelPos[2];
-		int       _dragStartCursorPos[2];
-		int		  _dragStartPanelSize[2];
-		Panel* _currentPanel;
-		CUtlVector<PHandle> _panelDar;
-		char* m_pResourceName;
-		char* m_pResourcePathID;
-		PHandle	 m_hBuildDialog;
-		Panel* m_pBuildContext;               
-		Panel* m_pParentPanel;         
-		CUtlVector<PHandle> _controlGroup;   
-		CUtlVector<int> _groupDeltaX;	             
-		CUtlVector<int> _groupDeltaY;	             
-		Label* _rulerNumber[4];        
-		bool	_showRulers;	      
-		CUtlVector<CUtlSymbol> m_RegisteredControlSettingsFiles;
-
-		friend class Panel;
-	};
-
-
-	typedef CUtlHandle<BuildGroup> HBuildGroup;
-
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Button.h b/SpyCustom/Button.h
deleted file mode 100644
index abd454d..0000000
--- a/SpyCustom/Button.h
+++ /dev/null
@@ -1,185 +0,0 @@
-#ifndef BUTTON_H
-#define BUTTON_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "Dar.h"
-#include "Color.h"
-#include "Label.h"
-#include "MouseCode.h"
-
-namespace vgui
-{
-
-	class Button : public Label
-	{
-		DECLARE_CLASS_SIMPLE(Button, Label);
-
-	public:
-		Button(Panel* parent, const char* panelName, const char* text, Panel* pActionSignalTarget = NULL, const char* pCmd = NULL);
-		Button(Panel* parent, const char* panelName, const wchar_t* text, Panel* pActionSignalTarget = NULL, const char* pCmd = NULL);
-		~Button();
-	private:
-		void Init();
-	public:
-		virtual void SetArmed(bool state);
-		virtual bool IsArmed(void);
-
-		virtual bool IsDepressed();
-		virtual void ForceDepressed(bool state);
-		virtual void RecalculateDepressedState(void);
-
-		virtual void SetSelected(bool state);
-		virtual bool IsSelected(void);
-
-		virtual void SetBlink(bool state);
-		virtual bool IsBlinking(void);
-
-		virtual void SetUseCaptureMouse(bool state);
-		virtual bool IsUseCaptureMouseEnabled(void);
-
-		MESSAGE_FUNC(DoClick, "PressButton");
-		MESSAGE_FUNC(OnHotkey, "Hotkey")
-		{
-			DoClick();
-		}
-
-		virtual void SetMouseClickEnabled(MouseCode code, bool state);
-		virtual bool IsMouseClickEnabled(MouseCode code);
-		enum ActivationType_t
-		{
-			ACTIVATE_ONPRESSEDANDRELEASED,	   
-			ACTIVATE_ONPRESSED,				    
-			ACTIVATE_ONRELEASED,			  
-		};
-		virtual void SetButtonActivationType(ActivationType_t activationType);
-
-		virtual void FireActionSignal(void);
-		virtual void PerformLayout();
-
-		virtual bool RequestInfo(KeyValues* data);
-
-		virtual bool CanBeDefaultButton(void);
-
-		MESSAGE_FUNC_INT(SetAsDefaultButton, "SetAsDefaultButton", state);
-		MESSAGE_FUNC_INT(SetAsCurrentDefaultButton, "SetAsCurrentDefaultButton", state);
-
-		virtual void OnSetFocus();
-		virtual void OnKillFocus();
-
-		virtual void SetButtonBorderEnabled(bool state);
-
-		virtual void SetDefaultColor(Color fgColor, Color bgColor);
-		virtual void SetArmedColor(Color fgColor, Color bgColor);
-		virtual void SetSelectedColor(Color fgColor, Color bgColor);
-		virtual void SetDepressedColor(Color fgColor, Color bgColor);
-		virtual void SetBlinkColor(Color fgColor);
-
-		virtual Color GetButtonFgColor();
-		virtual Color GetButtonBgColor();
-
-		Color		  GetButtonDefaultFgColor() { return _defaultFgColor; }
-		Color		  GetButtonDefaultBgColor() { return _defaultBgColor; }
-
-		Color		  GetButtonArmedFgColor() { return _armedFgColor; }
-		Color		  GetButtonArmedBgColor() { return _armedBgColor; }
-
-		Color		  GetButtonSelectedFgColor() { return _selectedFgColor; }
-		Color		  GetButtonSelectedBgColor() { return _selectedBgColor; }
-
-		Color		  GetButtonDepressedFgColor() { return _depressedFgColor; }
-		Color		  GetButtonDepressedBgColor() { return _depressedBgColor; }
-
-		virtual void SetDefaultBorder(IBorder* border);
-		virtual void SetDepressedBorder(IBorder* border);
-		virtual void SetKeyFocusBorder(IBorder* border);
-
-		virtual void SetCommand(const char* command);
-		virtual void SetCommand(KeyValues* message);
-
-		void SetArmedSound(const char* sound);
-		void SetDepressedSound(const char* sound);
-		void SetReleasedSound(const char* sound);
-
-		virtual void OnCursorEntered();
-		virtual void OnCursorExited();
-		virtual void SizeToContents();
-
-		virtual KeyValues* GetCommand();
-
-		bool IsDrawingFocusBox();
-		void DrawFocusBox(bool bEnable);
-
-		bool ShouldPaint() { return _paint; }
-		void SetShouldPaint(bool paint) { _paint = paint; }
-
-		virtual void ApplySettings(KeyValues* inResourceData);
-		virtual void NavigateTo();
-		virtual void NavigateFrom();
-
-	protected:
-		virtual void DrawFocusBorder(int tx0, int ty0, int tx1, int ty1);
-
-		virtual void Paint(void);
-		virtual IBorder* GetBorder(bool depressed, bool armed, bool selected, bool keyfocus);
-
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-		MESSAGE_FUNC_INT(OnSetState, "SetState", state);
-
-		virtual void OnMousePressed(MouseCode code);
-		virtual void OnMouseDoublePressed(MouseCode code);
-		virtual void OnMouseReleased(MouseCode code);
-		virtual void OnKeyCodePressed(KeyCode code);
-		virtual void OnKeyCodeReleased(KeyCode code);
-
-		virtual void GetSettings(KeyValues* outResourceData);
-		virtual const char* GetDescription(void);
-
-		KeyValues* GetActionMessage();
-		void PlayButtonReleasedSound();
-
-	protected:
-		enum ButtonFlags_t
-		{
-			ARMED = 0x0001,
-			DEPRESSED = 0x0002,
-			FORCE_DEPRESSED = 0x0004,
-			BUTTON_BORDER_ENABLED = 0x0008,
-			USE_CAPTURE_MOUSE = 0x0010,
-			BUTTON_KEY_DOWN = 0x0020,
-			DEFAULT_BUTTON = 0x0040,
-			SELECTED = 0x0080,
-			DRAW_FOCUS_BOX = 0x0100,
-			BLINK = 0x0200,
-			ALL_FLAGS = 0xFFFF,
-		};
-
-		CUtlFlags< unsigned short > _buttonFlags;	  
-		int                _mouseClickMask;
-		KeyValues* _actionMessage;
-		ActivationType_t   _activationType;
-
-		IBorder* _defaultBorder;
-		IBorder* _depressedBorder;
-		IBorder* _keyFocusBorder;
-
-		Color			   _defaultFgColor, _defaultBgColor;
-		Color			   _armedFgColor, _armedBgColor;
-		Color			   _selectedFgColor, _selectedBgColor;
-		Color              _depressedFgColor, _depressedBgColor;
-		Color              _keyboardFocusColor;
-		Color			   _blinkFgColor;
-
-		bool				_paint;
-
-		unsigned short	   m_sArmedSoundName, m_sDepressedSoundName, m_sReleasedSoundName;
-		bool m_bSelectionStateSaved;
-		bool m_bStaySelectedOnClick;
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ButtonCode.h b/SpyCustom/ButtonCode.h
deleted file mode 100644
index 0441a26..0000000
--- a/SpyCustom/ButtonCode.h
+++ /dev/null
@@ -1,364 +0,0 @@
-#ifndef BUTTONCODE_H
-#define BUTTONCODE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "InputEnums.h"
-#include "mathlib.h"
-
-enum
-{
-	JOYSTICK_MAX_BUTTON_COUNT = 32,
-	JOYSTICK_POV_BUTTON_COUNT = 4,
-	JOYSTICK_AXIS_BUTTON_COUNT = MAX_JOYSTICK_AXES * 2,
-};
-
-#define JOYSTICK_BUTTON_INTERNAL( _joystick, _button ) ( JOYSTICK_FIRST_BUTTON + ((_joystick) * JOYSTICK_MAX_BUTTON_COUNT) + (_button) )
-#define JOYSTICK_POV_BUTTON_INTERNAL( _joystick, _button ) ( JOYSTICK_FIRST_POV_BUTTON + ((_joystick) * JOYSTICK_POV_BUTTON_COUNT) + (_button) )
-#define JOYSTICK_AXIS_BUTTON_INTERNAL( _joystick, _button ) ( JOYSTICK_FIRST_AXIS_BUTTON + ((_joystick) * JOYSTICK_AXIS_BUTTON_COUNT) + (_button) )
-
-#define JOYSTICK_BUTTON( _joystick, _button ) ( (ButtonCode_t)JOYSTICK_BUTTON_INTERNAL( _joystick, _button ) )
-#define JOYSTICK_POV_BUTTON( _joystick, _button ) ( (ButtonCode_t)JOYSTICK_POV_BUTTON_INTERNAL( _joystick, _button ) )
-#define JOYSTICK_AXIS_BUTTON( _joystick, _button ) ( (ButtonCode_t)JOYSTICK_AXIS_BUTTON_INTERNAL( _joystick, _button ) )
-
-enum ButtonCode_t
-{
-	BUTTON_CODE_INVALID = -1,
-	BUTTON_CODE_NONE = 0,
-
-	KEY_FIRST = 0,
-
-	KEY_NONE = KEY_FIRST,
-	KEY_0,
-	KEY_1,
-	KEY_2,
-	KEY_3,
-	KEY_4,
-	KEY_5,
-	KEY_6,
-	KEY_7,
-	KEY_8,
-	KEY_9,
-	KEY_A,
-	KEY_B,
-	KEY_C,
-	KEY_D,
-	KEY_E,
-	KEY_F,
-	KEY_G,
-	KEY_H,
-	KEY_I,
-	KEY_J,
-	KEY_K,
-	KEY_L,
-	KEY_M,
-	KEY_N,
-	KEY_O,
-	KEY_P,
-	KEY_Q,
-	KEY_R,
-	KEY_S,
-	KEY_T,
-	KEY_U,
-	KEY_V,
-	KEY_W,
-	KEY_X,
-	KEY_Y,
-	KEY_Z,
-	KEY_PAD_0,
-	KEY_PAD_1,
-	KEY_PAD_2,
-	KEY_PAD_3,
-	KEY_PAD_4,
-	KEY_PAD_5,
-	KEY_PAD_6,
-	KEY_PAD_7,
-	KEY_PAD_8,
-	KEY_PAD_9,
-	KEY_PAD_DIVIDE,
-	KEY_PAD_MULTIPLY,
-	KEY_PAD_MINUS,
-	KEY_PAD_PLUS,
-	KEY_PAD_ENTER,
-	KEY_PAD_DECIMAL,
-	KEY_LBRACKET,
-	KEY_RBRACKET,
-	KEY_SEMICOLON,
-	KEY_APOSTROPHE,
-	KEY_BACKQUOTE,
-	KEY_COMMA,
-	KEY_PERIOD,
-	KEY_SLASH,
-	KEY_BACKSLASH,
-	KEY_MINUS,
-	KEY_EQUAL,
-	KEY_ENTER,
-	KEY_SPACE,
-	KEY_BACKSPACE,
-	KEY_TAB,
-	KEY_CAPSLOCK,
-	KEY_NUMLOCK,
-	KEY_ESCAPE,
-	KEY_SCROLLLOCK,
-	KEY_INSERT,
-	KEY_DELETE,
-	KEY_HOME,
-	KEY_END,
-	KEY_PAGEUP,
-	KEY_PAGEDOWN,
-	KEY_BREAK,
-	KEY_LSHIFT,
-	KEY_RSHIFT,
-	KEY_LALT,
-	KEY_RALT,
-	KEY_LCONTROL,
-	KEY_RCONTROL,
-	KEY_LWIN,
-	KEY_RWIN,
-	KEY_APP,
-	KEY_UP,
-	KEY_LEFT,
-	KEY_DOWN,
-	KEY_RIGHT,
-	KEY_F1,
-	KEY_F2,
-	KEY_F3,
-	KEY_F4,
-	KEY_F5,
-	KEY_F6,
-	KEY_F7,
-	KEY_F8,
-	KEY_F9,
-	KEY_F10,
-	KEY_F11,
-	KEY_F12,
-	KEY_CAPSLOCKTOGGLE,
-	KEY_NUMLOCKTOGGLE,
-	KEY_SCROLLLOCKTOGGLE,
-
-	KEY_LAST = KEY_SCROLLLOCKTOGGLE,
-	KEY_COUNT = KEY_LAST - KEY_FIRST + 1,
-
-	MOUSE_FIRST = KEY_LAST + 1,
-
-	MOUSE_LEFT = MOUSE_FIRST,
-	MOUSE_RIGHT,
-	MOUSE_MIDDLE,
-	MOUSE_4,
-	MOUSE_5,
-	MOUSE_WHEEL_UP,		               
-	MOUSE_WHEEL_DOWN,	              
-
-	MOUSE_LAST = MOUSE_WHEEL_DOWN,
-	MOUSE_COUNT = MOUSE_LAST - MOUSE_FIRST + 1,
-
-	JOYSTICK_FIRST = MOUSE_LAST + 1,
-
-	JOYSTICK_FIRST_BUTTON = JOYSTICK_FIRST,
-	JOYSTICK_LAST_BUTTON = JOYSTICK_BUTTON_INTERNAL(MAX_JOYSTICKS - 1, JOYSTICK_MAX_BUTTON_COUNT - 1),
-	JOYSTICK_FIRST_POV_BUTTON,
-	JOYSTICK_LAST_POV_BUTTON = JOYSTICK_POV_BUTTON_INTERNAL(MAX_JOYSTICKS - 1, JOYSTICK_POV_BUTTON_COUNT - 1),
-	JOYSTICK_FIRST_AXIS_BUTTON,
-	JOYSTICK_LAST_AXIS_BUTTON = JOYSTICK_AXIS_BUTTON_INTERNAL(MAX_JOYSTICKS - 1, JOYSTICK_AXIS_BUTTON_COUNT - 1),
-
-	JOYSTICK_LAST = JOYSTICK_LAST_AXIS_BUTTON,
-
-#if !defined ( _X360 )
-	NOVINT_FIRST = JOYSTICK_LAST + 2,              
-
-	NOVINT_LOGO_0 = NOVINT_FIRST,
-	NOVINT_TRIANGLE_0,
-	NOVINT_BOLT_0,
-	NOVINT_PLUS_0,
-	NOVINT_LOGO_1,
-	NOVINT_TRIANGLE_1,
-	NOVINT_BOLT_1,
-	NOVINT_PLUS_1,
-
-	NOVINT_LAST = NOVINT_PLUS_1,
-#endif
-
-	BUTTON_CODE_LAST,
-	BUTTON_CODE_COUNT = BUTTON_CODE_LAST - KEY_FIRST + 1,
-
-	KEY_XBUTTON_UP = JOYSTICK_FIRST_POV_BUTTON,	  
-	KEY_XBUTTON_RIGHT,
-	KEY_XBUTTON_DOWN,
-	KEY_XBUTTON_LEFT,
-
-	KEY_XBUTTON_A = JOYSTICK_FIRST_BUTTON,		 
-	KEY_XBUTTON_B,
-	KEY_XBUTTON_X,
-	KEY_XBUTTON_Y,
-	KEY_XBUTTON_LEFT_SHOULDER,
-	KEY_XBUTTON_RIGHT_SHOULDER,
-	KEY_XBUTTON_BACK,
-	KEY_XBUTTON_START,
-	KEY_XBUTTON_STICK1,
-	KEY_XBUTTON_STICK2,
-
-	KEY_XSTICK1_RIGHT = JOYSTICK_FIRST_AXIS_BUTTON,	  
-	KEY_XSTICK1_LEFT,							  
-	KEY_XSTICK1_DOWN,							  
-	KEY_XSTICK1_UP,								  
-	KEY_XBUTTON_LTRIGGER,						  
-	KEY_XBUTTON_RTRIGGER,						  
-	KEY_XSTICK2_RIGHT,							  
-	KEY_XSTICK2_LEFT,							  
-	KEY_XSTICK2_DOWN,							  
-	KEY_XSTICK2_UP,								  
-};
-
-inline bool IsAlpha(ButtonCode_t code)
-{
-	return (code >= KEY_A) && (code <= KEY_Z);
-}
-
-inline bool IsAlphaNumeric(ButtonCode_t code)
-{
-	return (code >= KEY_0) && (code <= KEY_Z);
-}
-
-inline bool IsSpace(ButtonCode_t code)
-{
-	return (code == KEY_ENTER) || (code == KEY_TAB) || (code == KEY_SPACE);
-}
-
-inline bool IsKeypad(ButtonCode_t code)
-{
-	return (code >= MOUSE_FIRST) && (code <= KEY_PAD_DECIMAL);
-}
-
-inline bool IsPunctuation(ButtonCode_t code)
-{
-	return (code >= KEY_0) && (code <= KEY_SPACE) && !IsAlphaNumeric(code) && !IsSpace(code) && !IsKeypad(code);
-}
-
-inline bool IsKeyCode(ButtonCode_t code)
-{
-	return (code >= KEY_FIRST) && (code <= KEY_LAST);
-}
-
-inline bool IsMouseCode(ButtonCode_t code)
-{
-	return (code >= MOUSE_FIRST) && (code <= MOUSE_LAST);
-}
-
-inline bool IsNovintCode(ButtonCode_t code)
-{
-#if !defined ( _X360 )
-	return ((code >= NOVINT_FIRST) && (code <= NOVINT_LAST));
-#else
-	return false;
-#endif
-}
-
-inline bool IsNovintButtonCode(ButtonCode_t code)
-{
-#if !defined ( _X360 )
-	return IsNovintCode(code);
-#else
-	return false;
-#endif
-}
-
-inline bool IsJoystickCode(ButtonCode_t code)
-{
-	return (((code >= JOYSTICK_FIRST) && (code <= JOYSTICK_LAST)) || IsNovintCode(code));
-}
-
-inline bool IsJoystickButtonCode(ButtonCode_t code)
-{
-	return (((code >= JOYSTICK_FIRST_BUTTON) && (code <= JOYSTICK_LAST_BUTTON)) || IsNovintButtonCode(code));
-}
-
-inline bool IsJoystickPOVCode(ButtonCode_t code)
-{
-	return (code >= JOYSTICK_FIRST_POV_BUTTON) && (code <= JOYSTICK_LAST_POV_BUTTON);
-}
-
-inline bool IsJoystickAxisCode(ButtonCode_t code)
-{
-	return (code >= JOYSTICK_FIRST_AXIS_BUTTON) && (code <= JOYSTICK_LAST_AXIS_BUTTON);
-}
-
-inline ButtonCode_t GetBaseButtonCode(ButtonCode_t code)
-{
-	if (IsJoystickButtonCode(code))
-	{
-		int offset = (code - JOYSTICK_FIRST_BUTTON) % JOYSTICK_MAX_BUTTON_COUNT;
-		return (ButtonCode_t)(JOYSTICK_FIRST_BUTTON + offset);
-	}
-
-	if (IsJoystickPOVCode(code))
-	{
-		int offset = (code - JOYSTICK_FIRST_POV_BUTTON) % JOYSTICK_POV_BUTTON_COUNT;
-		return (ButtonCode_t)(JOYSTICK_FIRST_POV_BUTTON + offset);
-	}
-
-	if (IsJoystickAxisCode(code))
-	{
-		int offset = (code - JOYSTICK_FIRST_AXIS_BUTTON) % JOYSTICK_AXIS_BUTTON_COUNT;
-		return (ButtonCode_t)(JOYSTICK_FIRST_AXIS_BUTTON + offset);
-	}
-
-	return code;
-}
-
-inline int GetJoystickForCode(ButtonCode_t code)
-{
-	if (!IsJoystickCode(code))
-		return 0;
-
-	if (IsJoystickButtonCode(code))
-	{
-		int offset = (code - JOYSTICK_FIRST_BUTTON) / JOYSTICK_MAX_BUTTON_COUNT;
-		return offset;
-	}
-	if (IsJoystickPOVCode(code))
-	{
-		int offset = (code - JOYSTICK_FIRST_POV_BUTTON) / JOYSTICK_POV_BUTTON_COUNT;
-		return offset;
-	}
-	if (IsJoystickAxisCode(code))
-	{
-		int offset = (code - JOYSTICK_FIRST_AXIS_BUTTON) / JOYSTICK_AXIS_BUTTON_COUNT;
-		return offset;
-	}
-
-	return 0;
-}
-
-inline ButtonCode_t ButtonCodeToJoystickButtonCode(ButtonCode_t code, int nDesiredJoystick)
-{
-	if (!IsJoystickCode(code) || nDesiredJoystick == 0)
-		return code;
-
-	nDesiredJoystick = ::clamp<int>(nDesiredJoystick, 0, MAX_JOYSTICKS - 1);
-
-	code = GetBaseButtonCode(code);
-
-	if (IsJoystickButtonCode(code))
-	{
-		int nOffset = code - JOYSTICK_FIRST_BUTTON;
-		return JOYSTICK_BUTTON(nDesiredJoystick, nOffset);
-	}
-
-	if (IsJoystickPOVCode(code))
-	{
-		int nOffset = code - JOYSTICK_FIRST_POV_BUTTON;
-		return JOYSTICK_POV_BUTTON(nDesiredJoystick, nOffset);
-	}
-
-	if (IsJoystickAxisCode(code))
-	{
-		int nOffset = code - JOYSTICK_FIRST_AXIS_BUTTON;
-		return JOYSTICK_AXIS_BUTTON(nDesiredJoystick, nOffset);
-	}
-
-	return code;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/CGameUI.h b/SpyCustom/CGameUI.h
deleted file mode 100644
index d12b2c9..0000000
--- a/SpyCustom/CGameUI.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-class ECommandMsgBoxSlot;
-class KeyValues;
-class IPanel;
-
-class CGameUI {
-public:
-	virtual void Initialize(void* (*)(char const*, int*)) = 0;
-	virtual void PostInit(void) = 0;
-	virtual void Connect(void* (*)(char const*, int*)) = 0;
-	virtual void Start(void) = 0;
-	virtual void Shutdown(void) = 0;
-	virtual void RunFrame(void) = 0;
-	virtual void OnGameUIActivated(void) = 0;
-	virtual void OnGameUIHidden(void) = 0;
-	virtual void OLD_OnConnectToServer(char const*, int, int) = 0;
-	virtual void OnDisconnectFromServer_OLD(unsigned char, char const*) = 0;
-	virtual void OnLevelLoadingStarted(char const*, bool) = 0;
-	virtual void OnLevelLoadingFinished(bool, char const*, char const*) = 0;
-	virtual void StartLoadingScreenForCommand(char const*) = 0;
-	virtual void StartLoadingScreenForKeyValues(KeyValues*) = 0;
-	virtual void UpdateProgressBar(float, char const*, bool) = 0;
-	virtual void SetShowProgressText(bool) = 0;
-	virtual void UpdateSecondaryProgressBar(float, wchar_t const*) = 0;
-	virtual void SetProgressLevelName(char const*) = 0;
-	virtual void ShowMessageDialog(unsigned int, IPanel*) = 0;
-	virtual void ShowMessageDialog(char const*, char const*) = 0;
-	virtual void CreateCommandMsgBox(char const*, char const*, bool, bool, char const*, char const*, char const*, char const*, char const*) = 0;
-	virtual void CreateCommandMsgBoxInSlot(ECommandMsgBoxSlot, char const*, char const*, bool, bool, char const*, char const*, char const*, char const*) = 0;
-	virtual void SetLoadingBackgroundDialog(unsigned long long) = 0;
-	virtual void OnConnectToServer2(char const*, int, int, int) = 0;
-	virtual void SetProgressOnStart(void) = 0;
-	virtual void OnDisconnectFromServer(unsigned char) = 0;
-	virtual void NeedConnectionProblemWaitScreen(void) = 0;
-	virtual void ShowPasswordUI(char const*) = 0;
-	virtual void LoadingProgressWantsIsolatedRender(bool) = 0;
-	virtual bool IsPlayingFullScreenVideo(void) = 0;
-	virtual bool IsTransitionEffectEnabled(void) = 0;
-	virtual bool IsInLevel(void) = 0;
-	virtual void RestoreTopLevelMenu(void) = 0;
-	virtual void StartProgressBar(void) = 0;
-	virtual void ContinueProgressBar(float, bool) = 0;
-	virtual void StopProgressBar(bool, char const*, char const*) = 0;
-	virtual void SetProgressBarStatusText(char const*, bool) = 0;
-	virtual void SetSecondaryProgressBar(float) = 0;
-	virtual void SetSecondaryProgressBarText(wchar_t const*) = 0;
-};
\ No newline at end of file
diff --git a/SpyCustom/CheckButton.h b/SpyCustom/CheckButton.h
deleted file mode 100644
index 12397f1..0000000
--- a/SpyCustom/CheckButton.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef CHECKBUTTON_H
-#define CHECKBUTTON_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "ToggleButton.h"
-#include "TextImage.h"
-
-namespace vgui
-{
-
-	class TextImage;
-
-	class CheckImage : public TextImage
-	{
-	public:
-		CheckImage(CheckButton* CheckButton) : TextImage("g")
-		{
-			_CheckButton = CheckButton;
-
-			SetSize(20, 13);
-		}
-
-		virtual void Paint();
-
-		virtual void SetColor(Color color)
-		{
-			_borderColor1 = color;
-			_borderColor2 = color;
-			_checkColor = color;
-		}
-
-		Color _borderColor1;
-		Color _borderColor2;
-		Color _checkColor;
-
-		Color _bgColor;
-
-	private:
-		CheckButton* _CheckButton;
-	};
-
-	class CheckButton : public ToggleButton
-	{
-		DECLARE_CLASS_SIMPLE(CheckButton, ToggleButton);
-
-	public:
-		CheckButton(Panel* parent, const char* panelName, const char* text);
-		~CheckButton();
-
-		virtual void SetSelected(bool state);
-
-		virtual void SetCheckButtonCheckable(bool state);
-		virtual bool IsCheckButtonCheckable() const { return m_bCheckButtonCheckable; }
-
-		Color GetDisabledFgColor() { return _disabledFgColor; }
-		Color GetDisabledBgColor() { return _disabledBgColor; }
-
-		CheckImage* GetCheckImage() { return _checkBoxImage; }
-
-		virtual void SetHighlightColor(Color fgColor);
-
-	protected:
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-		MESSAGE_FUNC_PTR(OnCheckButtonChecked, "CheckButtonChecked", panel);
-		virtual Color GetButtonFgColor();
-
-		virtual IBorder* GetBorder(bool depressed, bool armed, bool selected, bool keyfocus);
-
-
-	private:
-		enum { CHECK_INSET = 6 };
-		bool m_bCheckButtonCheckable;
-		CheckImage* _checkBoxImage;
-		Color _disabledFgColor;
-		Color _disabledBgColor;
-		Color _highlightFgColor;
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Color.h b/SpyCustom/Color.h
deleted file mode 100644
index 38f0746..0000000
--- a/SpyCustom/Color.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef COLOR_H
-#define COLOR_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-class Color
-{
-public:
-	Color()
-	{
-		*((int*)this) = 0;
-	}
-	Color(int _r, int _g, int _b)
-	{
-		SetColor(_r, _g, _b, 0);
-	}
-	Color(int _r, int _g, int _b, int _a)
-	{
-		SetColor(_r, _g, _b, _a);
-	}
-
-	void SetColor(int _r, int _g, int _b, int _a = 0)
-	{
-		_color[0] = (unsigned char)_r;
-		_color[1] = (unsigned char)_g;
-		_color[2] = (unsigned char)_b;
-		_color[3] = (unsigned char)_a;
-	}
-
-	void GetColor(int& _r, int& _g, int& _b, int& _a) const
-	{
-		_r = _color[0];
-		_g = _color[1];
-		_b = _color[2];
-		_a = _color[3];
-	}
-
-	void SetRawColor(int color32)
-	{
-		*((int*)this) = color32;
-	}
-
-	int GetRawColor() const
-	{
-		return *((int*)this);
-	}
-
-	inline int r() const { return _color[0]; }
-	inline int g() const { return _color[1]; }
-	inline int b() const { return _color[2]; }
-	inline int a() const { return _color[3]; }
-
-	unsigned char& operator[](int index)
-	{
-		return _color[index];
-	}
-
-	const unsigned char& operator[](int index) const
-	{
-		return _color[index];
-	}
-
-	bool operator == (const Color& rhs) const
-	{
-		return (*((int*)this) == *((int*)&rhs));
-	}
-
-	bool operator != (const Color& rhs) const
-	{
-		return !(operator==(rhs));
-	}
-
-	Color& operator=(const Color& rhs)
-	{
-		SetRawColor(rhs.GetRawColor());
-		return *this;
-	}
-
-	unsigned char _color[4];
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ConVars.cpp b/SpyCustom/ConVars.cpp
deleted file mode 100644
index 740ffdc..0000000
--- a/SpyCustom/ConVars.cpp
+++ /dev/null
@@ -1,1295 +0,0 @@
-#include "convar.h"
-#include <string>
-
-#include "Interfaces.hpp"
-
-//extern auto iff.g_pCVar;
-//typedef void(__cdecl* CONMSGPROC)(const char*, ...);
-//extern auto iff.myConMsg;
-
-
-static void V_strncpy(char* pDest, char const* pSrc, int maxLen)
-{
-	strncpy(pDest, pSrc, maxLen);
-	if (maxLen > 0)
-	{
-		pDest[maxLen - 1] = 0;
-	}
-}
-
-static int V_snprintf(char* pDest, int maxLen, const char* pFormat, ...)
-{
-	va_list marker;
-
-	va_start(marker, pFormat);
-#ifdef _WIN32
-	int len = _vsnprintf(pDest, maxLen, pFormat, marker);
-#elif POSIX
-	int len = vsnprintf(pDest, maxLen, pFormat, marker);
-#else
-#error "define vsnprintf type."
-#endif
-	va_end(marker);
-
-	// Len < 0 represents an overflow
-	if (len < 0)
-	{
-		len = maxLen;
-		pDest[maxLen - 1] = 0;
-	}
-
-	return len;
-}
-
-//-----------------------------------------------------------------------------
-// Base class, containing simple memory management
-//-----------------------------------------------------------------------------
-CUtlBinaryBlock::CUtlBinaryBlock(int growSize, int initSize)
-{
-	MEM_ALLOC_CREDIT();
-	m_Memory.Init(growSize, initSize);
-
-	m_nActualLength = 0;
-}
-
-CUtlBinaryBlock::CUtlBinaryBlock(void* pMemory, int nSizeInBytes, int nInitialLength) : m_Memory((unsigned char*)pMemory, nSizeInBytes)
-{
-	m_nActualLength = nInitialLength;
-}
-
-CUtlBinaryBlock::CUtlBinaryBlock(const void* pMemory, int nSizeInBytes) : m_Memory((const unsigned char*)pMemory, nSizeInBytes)
-{
-	m_nActualLength = nSizeInBytes;
-}
-
-CUtlBinaryBlock::CUtlBinaryBlock(const CUtlBinaryBlock& src)
-{
-	Set(src.Get(), src.Length());
-}
-
-void CUtlBinaryBlock::SetLength(int nLength)
-{
-	MEM_ALLOC_CREDIT();
-	Assert(!m_Memory.IsReadOnly());
-
-	m_nActualLength = nLength;
-	if (nLength > m_Memory.NumAllocated())
-	{
-		int nOverFlow = nLength - m_Memory.NumAllocated();
-		m_Memory.Grow(nOverFlow);
-
-		// If the reallocation failed, clamp length
-		if (nLength > m_Memory.NumAllocated())
-		{
-			m_nActualLength = m_Memory.NumAllocated();
-		}
-	}
-
-#ifdef _DEBUG
-	if (m_Memory.NumAllocated() > m_nActualLength)
-	{
-		memset(((char*)m_Memory.Base()) + m_nActualLength, 0xEB, m_Memory.NumAllocated() - m_nActualLength);
-	}
-#endif
-}
-
-void CUtlBinaryBlock::Set(const void* pValue, int nLen)
-{
-	Assert(!m_Memory.IsReadOnly());
-
-	if (!pValue)
-	{
-		nLen = 0;
-	}
-
-	SetLength(nLen);
-
-	if (m_nActualLength)
-	{
-		if (((const char*)m_Memory.Base()) >= ((const char*)pValue) + nLen ||
-			((const char*)m_Memory.Base()) + m_nActualLength <= ((const char*)pValue))
-		{
-			memcpy(m_Memory.Base(), pValue, m_nActualLength);
-		}
-		else
-		{
-			memmove(m_Memory.Base(), pValue, m_nActualLength);
-		}
-	}
-}
-
-// Simple string class. 
-//-----------------------------------------------------------------------------
-CUtlString::CUtlString()
-{
-}
-
-CUtlString::CUtlString(const char* pString)
-{
-	Set(pString);
-}
-
-CUtlString::CUtlString(const CUtlString& string)
-{
-	Set(string.Get());
-}
-
-// Attaches the string to external memory. Useful for avoiding a copy
-CUtlString::CUtlString(void* pMemory, int nSizeInBytes, int nInitialLength) : m_Storage(pMemory, nSizeInBytes, nInitialLength)
-{
-}
-
-CUtlString::CUtlString(const void* pMemory, int nSizeInBytes) : m_Storage(pMemory, nSizeInBytes)
-{
-}
-
-void CUtlString::Set(const char* pValue)
-{
-	Assert(!m_Storage.IsReadOnly());
-	int nLen = pValue ? Q_strlen(pValue) + 1 : 0;
-	m_Storage.Set(pValue, nLen);
-}
-
-const char* CUtlString::Get() const
-{
-	if (m_Storage.Length() == 0)
-	{
-		return "";
-	}
-
-	return reinterpret_cast<const char*>(m_Storage.Get());
-}
-
-//-----------------------------------------------------------------------------
-// Statically constructed list of ConCommandBases, 
-// used for registering them with the ICVar interface
-//-----------------------------------------------------------------------------
-ConCommandBase* ConCommandBase::s_pConCommandBases = NULL;
-IConCommandBaseAccessor* ConCommandBase::s_pAccessor = NULL;
-static int s_nCVarFlag = 0;
-static int s_nDLLIdentifier = -1;	// A unique identifier indicating which DLL this convar came from
-static bool s_bRegistered = false;
-
-class CDefaultAccessor : public IConCommandBaseAccessor
-{
-public:
-	virtual bool RegisterConCommandBase(ConCommandBase* pVar)
-	{
-		// Link to engine's list instead
-		iff.g_pCVar->RegisterConCommand(pVar);
-		return true;
-	}
-};
-
-static CDefaultAccessor s_DefaultAccessor;
-
-//-----------------------------------------------------------------------------
-// Called by the framework to register ConCommandBases with the ICVar
-//-----------------------------------------------------------------------------
-void ConVar_Register(int nCVarFlag, IConCommandBaseAccessor* pAccessor)
-{
-	if (!iff.g_pCVar || s_bRegistered)
-		return;
-
-	Assert(s_nDLLIdentifier < 0);
-	s_bRegistered = true;
-	s_nCVarFlag = nCVarFlag;
-	s_nDLLIdentifier = iff.g_pCVar->AllocateDLLIdentifier();
-
-	ConCommandBase* pCur, * pNext;
-
-	ConCommandBase::s_pAccessor = pAccessor ? pAccessor : &s_DefaultAccessor;
-	pCur = ConCommandBase::s_pConCommandBases;
-	while (pCur)
-	{
-		pNext = pCur->m_pNext;
-		pCur->AddFlags(s_nCVarFlag);
-		pCur->Init();
-		pCur = pNext;
-	}
-
-	//3//g_pCVar->ProcessQueuedMaterialThreadConVarSets();
-	ConCommandBase::s_pConCommandBases = NULL;
-}
-
-void ConVar_Unregister()
-{
-	if (!iff.g_pCVar || !s_bRegistered)
-		return;
-
-	Assert(s_nDLLIdentifier >= 0);
-	iff.g_pCVar->UnregisterConCommands(s_nDLLIdentifier);
-	s_nDLLIdentifier = -1;
-	s_bRegistered = false;
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Default constructor
-//-----------------------------------------------------------------------------
-ConCommandBase::ConCommandBase(void)
-{
-	m_bRegistered = false;
-	m_pszName = NULL;
-	m_pszHelpString = NULL;
-
-	m_nFlags = 0;
-	m_pNext = NULL;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: The base console invoked command/cvar interface
-// Input  : *pName - name of variable/command
-//			*pHelpString - help text
-//			flags - flags
-//-----------------------------------------------------------------------------
-ConCommandBase::ConCommandBase(const char* pName, const char* pHelpString /*=0*/, int flags /*= 0*/)
-{
-	Create(pName, pHelpString, flags);
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-//-----------------------------------------------------------------------------
-ConCommandBase::~ConCommandBase(void)
-{
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Output : Returns true on success, false on failure.
-//-----------------------------------------------------------------------------
-bool ConCommandBase::IsCommand(void) const
-{
-	//	Assert( 0 ); This can't assert. . causes a recursive assert in Sys_Printf, etc.
-	return true;
-}
-
-
-//-----------------------------------------------------------------------------
-// Returns the DLL identifier
-//-----------------------------------------------------------------------------
-CVarDLLIdentifier_t ConCommandBase::GetDLLIdentifier() const
-{
-	return s_nDLLIdentifier;
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : *pName - 
-//			callback - 
-//			*pHelpString - 
-//			flags - 
-//-----------------------------------------------------------------------------
-void ConCommandBase::Create(const char* pName, const char* pHelpString /*= 0*/, int flags /*= 0*/)
-{
-	static char* empty_string = (char*)"";
-
-	m_bRegistered = false;
-
-	// Name should be static data
-	Assert(pName);
-	m_pszName = pName;
-	m_pszHelpString = pHelpString ? pHelpString : empty_string;
-
-	m_nFlags = flags;
-
-#ifdef ALLOW_DEVELOPMENT_CVARS
-	m_nFlags &= ~FCVAR_DEVELOPMENTONLY;
-#endif
-
-	if (!(m_nFlags & FCVAR_UNREGISTERED))
-	{
-		m_pNext = s_pConCommandBases;
-		s_pConCommandBases = this;
-	}
-	else
-	{
-		// It's unregistered
-		m_pNext = NULL;
-	}
-
-	// If s_pAccessor is already set (this ConVar is not a global variable),
-	//  register it.
-	if (s_pAccessor)
-	{
-		Init();
-	}
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Used internally by OneTimeInit to initialize.
-//-----------------------------------------------------------------------------
-void ConCommandBase::Init()
-{
-	if (s_pAccessor)
-	{
-		s_pAccessor->RegisterConCommandBase(this);
-	}
-}
-
-void ConCommandBase::Shutdown()
-{
-	if (iff.g_pCVar)
-	{
-		iff.g_pCVar->UnregisterConCommand(this);
-	}
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Return name of the command/var
-// Output : const char
-//-----------------------------------------------------------------------------
-const char* ConCommandBase::GetName(void) const
-{
-	return m_pszName;
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : flag - 
-// Output : Returns true on success, false on failure.
-//-----------------------------------------------------------------------------
-bool ConCommandBase::IsFlagSet(int flag) const
-{
-	return (flag & m_nFlags) ? true : false;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : flags - 
-//-----------------------------------------------------------------------------
-void ConCommandBase::AddFlags(int flags)
-{
-	m_nFlags |= flags;
-
-#ifdef ALLOW_DEVELOPMENT_CVARS
-	m_nFlags &= ~FCVAR_DEVELOPMENTONLY;
-#endif
-}
-
-void ConCommandBase::RemoveFlags(int flags)
-{
-	m_nFlags &= ~flags;
-}
-
-
-int ConCommandBase::GetFlags(void) const
-{
-	return m_nFlags;
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Output : const ConCommandBase
-//-----------------------------------------------------------------------------
-const ConCommandBase* ConCommandBase::GetNext(void) const
-{
-	return m_pNext;
-}
-
-ConCommandBase* ConCommandBase::GetNext(void)
-{
-	return m_pNext;
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Copies string using local new/delete operators
-// Input  : *from - 
-// Output : char
-//-----------------------------------------------------------------------------
-char* ConCommandBase::CopyString(const char* from)
-{
-	int		len;
-	char* to;
-
-	len = V_strlen(from);
-	if (len <= 0)
-	{
-		to = new char[1];
-		to[0] = 0;
-	}
-	else
-	{
-		to = new char[len + 1];
-		Q_strncpy(to, from, len + 1);
-	}
-	return to;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Output : const char
-//-----------------------------------------------------------------------------
-const char* ConCommandBase::GetHelpText(void) const
-{
-	return m_pszHelpString;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: Has this cvar been registered
-// Output : Returns true on success, false on failure.
-//-----------------------------------------------------------------------------
-bool ConCommandBase::IsRegistered(void) const
-{
-	return m_bRegistered;
-}
-
-
-//-----------------------------------------------------------------------------
-//
-// Con Commands start here
-//
-//-----------------------------------------------------------------------------
-
-struct characterset_t
-{
-	char set[256];
-};
-
-//-----------------------------------------------------------------------------
-// Global methods
-//-----------------------------------------------------------------------------
-static characterset_t s_BreakSet;
-static bool s_bBuiltBreakSet = false;
-
-
-//-----------------------------------------------------------------------------
-// Tokenizer class
-//-----------------------------------------------------------------------------
-
-
-void CCommand::Reset()
-{
-	m_nArgc = 0;
-	m_nArgv0Size = 0;
-	m_pArgSBuffer[0] = 0;
-}
-
-characterset_t* CCommand::DefaultBreakSet()
-{
-	return &s_BreakSet;
-}
-
-//-----------------------------------------------------------------------------
-// Default console command autocompletion function 
-//-----------------------------------------------------------------------------
-int DefaultCompletionFunc(const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])
-{
-	return 0;
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Constructs a console command
-//-----------------------------------------------------------------------------
-//ConCommand::ConCommand()
-//{
-//	m_bIsNewConCommand = true;
-//}
-
-ConCommand::ConCommand(const char* pName, FnCommandCallbackVoid_t callback, const char* pHelpString /*= 0*/, int flags /*= 0*/, FnCommandCompletionCallback completionFunc /*= 0*/)
-{
-	// Set the callback
-	m_fnCommandCallbackV1 = callback;
-	m_bUsingNewCommandCallback = false;
-	m_bUsingCommandCallbackInterface = false;
-	m_fnCompletionCallback = completionFunc ? completionFunc : DefaultCompletionFunc;
-	m_bHasCompletionCallback = completionFunc != 0 ? true : false;
-
-	// Setup the rest
-	BaseClass::Create(pName, pHelpString, flags);
-}
-
-ConCommand::ConCommand(const char* pName, FnCommandCallback_t callback, const char* pHelpString /*= 0*/, int flags /*= 0*/, FnCommandCompletionCallback completionFunc /*= 0*/)
-{
-	// Set the callback
-	m_fnCommandCallback = callback;
-	m_bUsingNewCommandCallback = true;
-	m_fnCompletionCallback = completionFunc ? completionFunc : DefaultCompletionFunc;
-	m_bHasCompletionCallback = completionFunc != 0 ? true : false;
-	m_bUsingCommandCallbackInterface = false;
-
-	// Setup the rest
-	BaseClass::Create(pName, pHelpString, flags);
-}
-
-ConCommand::ConCommand(const char* pName, ICommandCallback* pCallback, const char* pHelpString /*= 0*/, int flags /*= 0*/, ICommandCompletionCallback* pCompletionCallback /*= 0*/)
-{
-	// Set the callback
-	m_pCommandCallback = pCallback;
-	m_bUsingNewCommandCallback = false;
-	m_pCommandCompletionCallback = pCompletionCallback;
-	m_bHasCompletionCallback = (pCompletionCallback != 0);
-	m_bUsingCommandCallbackInterface = true;
-
-	// Setup the rest
-	BaseClass::Create(pName, pHelpString, flags);
-}
-
-//-----------------------------------------------------------------------------
-// Destructor
-//-----------------------------------------------------------------------------
-ConCommand::~ConCommand(void)
-{
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Returns true if this is a command 
-//-----------------------------------------------------------------------------
-bool ConCommand::IsCommand(void) const
-{
-	return true;
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Invoke the function if there is one
-//-----------------------------------------------------------------------------
-void ConCommand::Dispatch(const CCommand& command)
-{
-	if (m_bUsingNewCommandCallback)
-	{
-		if (m_fnCommandCallback)
-		{
-			(*m_fnCommandCallback)(command);
-			return;
-		}
-	}
-	else if (m_bUsingCommandCallbackInterface)
-	{
-		if (m_pCommandCallback)
-		{
-			m_pCommandCallback->CommandCallback(command);
-			return;
-		}
-	}
-	else
-	{
-		if (m_fnCommandCallbackV1)
-		{
-			(*m_fnCommandCallbackV1)();
-			return;
-		}
-	}
-
-	// Command without callback!!!
-	AssertMsg(0, ("Encountered ConCommand '%s' without a callback!\n", GetName()));
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Calls the autocompletion method to get autocompletion suggestions
-//-----------------------------------------------------------------------------
-int	ConCommand::AutoCompleteSuggest(const char* partial, CUtlVector< CUtlString >& commands)
-{
-	if (m_bUsingCommandCallbackInterface)
-	{
-		if (!m_pCommandCompletionCallback)
-			return 0;
-		return m_pCommandCompletionCallback->CommandCompletionCallback(partial, commands);
-	}
-
-	Assert(m_fnCompletionCallback);
-	if (!m_fnCompletionCallback)
-		return 0;
-
-	char rgpchCommands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH];
-	int iret = (m_fnCompletionCallback)(partial, rgpchCommands);
-	for (int i = 0; i < iret; ++i)
-	{
-		CUtlString str = rgpchCommands[i];
-		commands.AddToTail(str);
-	}
-	return iret;
-}
-
-
-//-----------------------------------------------------------------------------
-// Returns true if the console command can autocomplete 
-//-----------------------------------------------------------------------------
-bool ConCommand::CanAutoComplete(void)
-{
-	return m_bHasCompletionCallback;
-}
-
-
-
-//-----------------------------------------------------------------------------
-//
-// Console Variables
-//
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// Various constructors
-//-----------------------------------------------------------------------------
-ConVar::ConVar(const char* pName, const char* pDefaultValue, int flags /* = 0 */)
-{
-	Create(pName, pDefaultValue, flags);
-}
-
-ConVar::ConVar(const char* pName, const char* pDefaultValue, int flags, const char* pHelpString)
-{
-	Create(pName, pDefaultValue, flags, pHelpString);
-}
-
-ConVar::ConVar(const char* pName, const char* pDefaultValue, int flags, const char* pHelpString, bool bMin, float fMin, bool bMax, float fMax)
-{
-	Create(pName, pDefaultValue, flags, pHelpString, bMin, fMin, bMax, fMax);
-}
-
-ConVar::ConVar(const char* pName, const char* pDefaultValue, int flags, const char* pHelpString, FnChangeCallback_t callback)
-{
-	Create(pName, pDefaultValue, flags, pHelpString, false, 0.0, false, 0.0, callback);
-}
-
-ConVar::ConVar(const char* pName, const char* pDefaultValue, int flags, const char* pHelpString, bool bMin, float fMin, bool bMax, float fMax, FnChangeCallback_t callback)
-{
-	Create(pName, pDefaultValue, flags, pHelpString, bMin, fMin, bMax, fMax, callback);
-}
-
-
-//-----------------------------------------------------------------------------
-// Destructor
-//-----------------------------------------------------------------------------
-ConVar::~ConVar(void)
-{
-	//if(IsRegistered())
-	//    convar->UnregisterConCommand(this);
-	if (m_Value.m_pszString) {
-		delete[] m_Value.m_pszString;
-		m_Value.m_pszString = NULL;
-	}
-}
-
-
-//-----------------------------------------------------------------------------
-// Install a change callback (there shouldn't already be one....)
-//-----------------------------------------------------------------------------
-void ConVar::InstallChangeCallback(FnChangeCallback_t callback, bool bInvoke)
-{
-	if (callback) {
-		if (m_fnChangeCallbacks.GetOffset(callback) != -1) {
-			m_fnChangeCallbacks.AddToTail(callback);
-			if (bInvoke)
-				callback(this, m_Value.m_pszString, m_Value.m_fValue);
-		}
-		else {
-			//Warning("InstallChangeCallback ignoring duplicate change callback!!!\n");
-		}
-	}
-	else {
-		//Warning("InstallChangeCallback called with NULL callback, ignoring!!!\n");
-	}
-}
-
-bool ConVar::IsFlagSet(int flag) const
-{
-	return (flag & m_pParent->m_nFlags) ? true : false;
-}
-
-const char* ConVar::GetHelpText(void) const
-{
-	return m_pParent->m_pszHelpString;
-}
-
-void ConVar::AddFlags(int flags)
-{
-	m_pParent->m_nFlags |= flags;
-
-#ifdef ALLOW_DEVELOPMENT_CVARS
-	m_pParent->m_nFlags &= ~FCVAR_DEVELOPMENTONLY;
-#endif
-}
-
-bool ConVar::IsRegistered(void) const
-{
-	return m_pParent->m_bRegistered;
-}
-
-const char* ConVar::GetName(void) const
-{
-	//printf("getname called\n");
-	return m_pParent->m_pszName;
-}
-
-//void ConVar::convarplaceholder(){}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Output : Returns true on success, false on failure.
-//-----------------------------------------------------------------------------
-bool ConVar::IsCommand(void) const
-{
-	return false;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : 
-//-----------------------------------------------------------------------------
-void ConVar::Init()
-{
-	BaseClass::Init();
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : *value - 
-//-----------------------------------------------------------------------------
-void ConVar::InternalSetValue(const char* value)
-{
-	printf("Executed ConVar::InternalSetValue to %s\n", value);
-
-	float fNewValue;
-	char  tempVal[32];
-	char* val;
-
-	auto temp = *(uint32_t*)&m_Value.m_fValue ^ (uint32_t)this;
-	float flOldValue = *(float*)(&temp);
-
-	val = (char*)value;
-	fNewValue = (float)atof(value);
-
-	if (ClampValue(fNewValue)) {
-		snprintf(tempVal, sizeof(tempVal), "%f", fNewValue);
-		val = tempVal;
-	}
-
-
-	// Redetermine value
-	*(uint32_t*)&m_Value.m_fValue = *(uint32_t*)&fNewValue ^ (uint32_t)this;
-	*(uint32_t*)&m_Value.m_nValue = (uint32_t)fNewValue ^ (uint32_t)this;
-
-	if (!(m_nFlags & FCVAR_NEVER_AS_STRING)) {
-		ChangeStringValue(val, flOldValue);
-	}
-}
-
-/*
-void ConVar::InternalSetValue(const char* value)
-{
-	if (IsFlagSet(FCVAR_MATERIAL_THREAD_MASK))
-	{
-		if (g_pCVar && !g_pCVar->IsMaterialThreadSetAllowed())
-		{
-			g_pCVar->QueueMaterialThreadSetValue(this, value);
-			return;
-		}
-	}
-
-	float fNewValue;
-	char  tempVal[32];
-	char* val;
-
-	Assert(m_pParent == this); // Only valid for root convars.
-
-	float flOldValue = m_fValue;
-
-	val = (char*)value;
-	if (!value)
-		fNewValue = 0.0f;
-	else
-		fNewValue = (float)atof(value);
-
-	if (ClampValue(fNewValue))
-	{
-		Q_snprintf(tempVal, sizeof(tempVal), "%f", fNewValue);
-		val = tempVal;
-	}
-
-	// Redetermine value
-	m_fValue = fNewValue;
-	m_nValue = (int)(m_fValue);
-
-	if (!(m_nFlags & FCVAR_NEVER_AS_STRING))
-	{
-		ChangeStringValue(val, flOldValue);
-	}
-}
-*/
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : *tempVal - 
-//-----------------------------------------------------------------------------
-
-void ConVar::ChangeStringValue(const char* tempVal, float flOldValue)
-{
-	printf("Executed ConVar::ChangeStringValue (tempVal %s; flOldValue %f)\n", tempVal, flOldValue);
-
-	char* pszOldValue = (char*)stackalloc(m_Value.m_StringLength);
-	memcpy(pszOldValue, m_Value.m_pszString, m_Value.m_StringLength);
-
-	int len = strlen(tempVal) + 1;
-
-	if (len > m_Value.m_StringLength) {
-		if (m_Value.m_pszString) {
-			delete[] m_Value.m_pszString;
-		}
-
-		m_Value.m_pszString = new char[len];
-		m_Value.m_StringLength = len;
-	}
-
-	memcpy(m_Value.m_pszString, std::to_string(this->GetFloat()).c_str(), len);
-
-	// Invoke any necessary callback function
-	for (int i = 0; i < m_fnChangeCallbacks.Count(); i++) {
-		m_fnChangeCallbacks[i](this, pszOldValue, flOldValue);
-	}
-
-	if (iff.g_pCVar)
-		iff.g_pCVar->CallGlobalChangeCallbacks(this, pszOldValue, flOldValue);
-}
-
-void ConVar::InternalSetColorValue(Color cValue)
-{
-	int color = (int)cValue.GetRawColor();
-	InternalSetIntValue(color);
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: Check whether to clamp and then perform clamp
-// Input  : value - 
-// Output : Returns true if value changed
-//-----------------------------------------------------------------------------
-bool ConVar::ClampValue(float& value)
-{
-	if (m_bHasMin && (value < m_fMinVal))
-	{
-		value = m_fMinVal;
-		return true;
-	}
-
-	if (m_bHasMax && (value > m_fMaxVal))
-	{
-		value = m_fMaxVal;
-		return true;
-	}
-
-	return false;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : *value - 
-//-----------------------------------------------------------------------------
-
-/*
-void ConVar::InternalSetFloatValue(float fNewValue)
-{
-	if (fNewValue == m_fValue)
-		return;
-
-	if (IsFlagSet(FCVAR_MATERIAL_THREAD_MASK))
-	{
-		if (g_pCVar && !g_pCVar->IsMaterialThreadSetAllowed())
-		{
-			g_pCVar->QueueMaterialThreadSetValue(this, fNewValue);
-			return;
-		}
-	}
-
-	Assert(m_pParent == this); // Only valid for root convars.
-
-	// Check bounds
-	ClampValue(fNewValue);
-
-	// Redetermine value
-	float flOldValue = m_fValue;
-	m_fValue = fNewValue;
-	m_nValue = (int)m_fValue;
-
-	if (!(m_nFlags & FCVAR_NEVER_AS_STRING))
-	{
-		char tempVal[32];
-		Q_snprintf(tempVal, sizeof(tempVal), "%f", m_fValue);
-		ChangeStringValue(tempVal, flOldValue);
-	}
-	else
-	{
-		Assert(!m_fnChangeCallback);
-	}
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : *value - 
-//-----------------------------------------------------------------------------
-void ConVar::InternalSetIntValue(int nValue)
-{
-	if (nValue == m_nValue)
-		return;
-
-	if (IsFlagSet(FCVAR_MATERIAL_THREAD_MASK))
-	{
-		if (g_pCVar && !g_pCVar->IsMaterialThreadSetAllowed())
-		{
-			g_pCVar->QueueMaterialThreadSetValue(this, nValue);
-			return;
-		}
-	}
-
-	Assert(m_pParent == this); // Only valid for root convars.
-
-	float fValue = (float)nValue;
-	if (ClampValue(fValue))
-	{
-		nValue = (int)(fValue);
-	}
-
-	// Redetermine value
-	float flOldValue = m_fValue;
-	m_fValue = fValue;
-	m_nValue = nValue;
-
-	if (!(m_nFlags & FCVAR_NEVER_AS_STRING))
-	{
-		char tempVal[32];
-		Q_snprintf(tempVal, sizeof(tempVal), "%d", m_nValue);
-		ChangeStringValue(tempVal, flOldValue);
-	}
-	else
-	{
-		Assert(!m_fnChangeCallback);
-	}
-}
-*/
-
-
-void ConVar::InternalSetFloatValue(float fNewValue)
-{
-	printf("Executed ConVar::InternalSetFloatValue to %f\n",fNewValue);
-
-	if (fNewValue == m_Value.m_fValue)
-		return;
-
-	ClampValue(fNewValue);
-
-	// Redetermine value
-	float flOldValue = m_Value.m_fValue;
-	*(uint32_t*)&m_Value.m_fValue = *(uint32_t*)&fNewValue ^ (uint32_t)this;
-	*(uint32_t*)&m_Value.m_nValue = (uint32_t)fNewValue ^ (uint32_t)this;
-
-	if (!(m_nFlags & FCVAR_NEVER_AS_STRING)) {
-		char tempVal[32];
-		snprintf(tempVal, sizeof(tempVal), "%f", m_Value.m_fValue);
-		ChangeStringValue(tempVal, flOldValue);
-	}
-	else {
-		//assert(m_fnChangeCallbacks.Count() == 0);
-	}
-}
-
-void ConVar::InternalSetIntValue(int nValue)
-{
-	printf("Executed ConVar::InternalSetIntValue to %d\n",nValue);
-
-	if (nValue == ((int)m_Value.m_nValue ^ (int)this))
-		return;
-
-	float fValue = (float)nValue;
-	if (ClampValue(fValue)) {
-		nValue = (int)(fValue);
-	}
-
-	// Redetermine value
-	float flOldValue = m_Value.m_fValue;
-	*(uint32_t*)&m_Value.m_fValue = *(uint32_t*)&fValue ^ (uint32_t)this;
-	*(uint32_t*)&m_Value.m_nValue = *(uint32_t*)&nValue ^ (uint32_t)this;
-
-	if (!(m_nFlags & FCVAR_NEVER_AS_STRING)) {
-		char tempVal[32];
-		snprintf(tempVal, sizeof(tempVal), "%d", m_Value.m_nValue);
-		ChangeStringValue(tempVal, flOldValue);
-	}
-	else {
-		//assert(m_fnChangeCallbacks.Count() == 0);
-	}
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: Private creation
-//-----------------------------------------------------------------------------
-
-void ConVar::Create(const char* pName, const char* pDefaultValue, int flags /*= 0*/,
-	const char* pHelpString /*= NULL*/, bool bMin /*= false*/, float fMin /*= 0.0*/,
-	bool bMax /*= false*/, float fMax /*= false*/, FnChangeCallback_t callback /*= NULL*/)
-{
-	static const char* empty_string = "";
-
-	m_pParent = this;
-
-	// Name should be static data
-	m_pszDefaultValue = pDefaultValue ? pDefaultValue : empty_string;
-
-	m_Value.m_StringLength = strlen(m_pszDefaultValue) + 1;
-	m_Value.m_pszString = new char[m_Value.m_StringLength];
-	memcpy(m_Value.m_pszString, m_pszDefaultValue, m_Value.m_StringLength);
-
-	m_bHasMin = bMin;
-	m_fMinVal = fMin;
-	m_bHasMax = bMax;
-	m_fMaxVal = fMax;
-
-	if (callback)
-		m_fnChangeCallbacks.AddToTail(callback);
-
-	float value = (float)atof(m_Value.m_pszString);
-
-	*(uint32_t*)&m_Value.m_fValue = *(uint32_t*)&value ^ (uint32_t)this;
-	*(uint32_t*)&m_Value.m_nValue = *(uint32_t*)&value ^ (uint32_t)this;
-
-	BaseClass::Create(pName, pHelpString, flags);
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : *value - 
-//-----------------------------------------------------------------------------
-void ConVar::SetValue(const char* value)
-{
-	printf("Executed ConVar::SetValue to %s\n",value);
-	ConVar* var = (ConVar*)m_pParent;
-	var->InternalSetValue(value);
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : value - 
-//-----------------------------------------------------------------------------
-void ConVar::SetValue(float value)
-{
-	printf("Executed ConVar::SetValue to %f\n", value);
-	ConVar* var = (ConVar*)m_pParent;
-	var->InternalSetFloatValue(value);
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : value - 
-//-----------------------------------------------------------------------------
-void ConVar::SetValue(int value)
-{
-	printf("Executed ConVar::SetValue to %d\n", value);
-	ConVar* var = (ConVar*)m_pParent;
-	var->InternalSetIntValue(value);
-}
-
-void ConVar::SetValue(Color value)
-{
-	ConVar* var = (ConVar*)m_pParent;
-	var->InternalSetColorValue(value);
-}
-
-
-///
-
-int ConVar::GetFlags(void) const
-{
-	return m_pParent->m_nFlags;
-}
-
-int ConVar::GetSplitScreenPlayerSlot(void) const
-{
-	return 0;
-}
-
-const char* ConVar::GetBaseName(void) const
-{
-	return m_pParent->m_pszName;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: Reset to default value
-//-----------------------------------------------------------------------------
-void ConVar::Revert(void)
-{
-	// Force default value again
-	ConVar* var = (ConVar*)m_pParent;
-	var->SetValue(var->m_pszDefaultValue);
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : minVal - 
-// Output : true if there is a min set
-//-----------------------------------------------------------------------------
-bool ConVar::GetMin(float& minVal) const
-{
-	minVal = m_pParent->m_fMinVal;
-	return m_pParent->m_bHasMin;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Input  : maxVal - 
-//-----------------------------------------------------------------------------
-bool ConVar::GetMax(float& maxVal) const
-{
-	maxVal = m_pParent->m_fMaxVal;
-	return m_pParent->m_bHasMax;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-// Output : const char
-//-----------------------------------------------------------------------------
-const char* ConVar::GetDefault(void) const
-{
-	return m_pParent->m_pszDefaultValue;
-}
-
-/*
-void ConVar::SetDefault(const char* pszDefault)
-{
-	static char* empty_string = (char*)"";
-	m_pszDefaultValue = pszDefault ? pszDefault : empty_string;
-	Assert(m_pszDefaultValue);
-}
-*/
-
-//-----------------------------------------------------------------------------
-// This version is simply used to make reading convars simpler.
-// Writing convars isn't allowed in this mode
-//-----------------------------------------------------------------------------
-class CEmptyConVar : public ConVar
-{
-public:
-	CEmptyConVar() : ConVar("", "0") {}
-	// Used for optimal read access
-	virtual void SetValue(const char* pValue) {}
-	virtual void SetValue(float flValue) {}
-	virtual void SetValue(int nValue) {}
-	virtual const char* GetName(void) const { return ""; }
-	virtual bool IsFlagSet(int nFlags) const { return false; }
-};
-
-static CEmptyConVar s_EmptyConVar;
-
-ConVarRef::ConVarRef(const char* pName)
-{
-	Init(pName, false);
-}
-
-ConVarRef::ConVarRef(const char* pName, bool bIgnoreMissing)
-{
-	Init(pName, bIgnoreMissing);
-}
-
-void ConVarRef::Init(const char* pName, bool bIgnoreMissing)
-{
-	m_pConVar = iff.g_pCVar ? iff.g_pCVar->FindVar(pName) : &s_EmptyConVar;
-	if (!m_pConVar)
-	{
-		m_pConVar = &s_EmptyConVar;
-	}
-	m_pConVarState = static_cast<ConVar*>(m_pConVar);
-	if (!IsValid())
-	{
-		static bool bFirst = true;
-		if (iff.g_pCVar || bFirst)
-		{
-			if (!bIgnoreMissing)
-			{
-				printf("ConVarRef %s doesn't point to an existing ConVar\n", pName);
-			}
-			bFirst = false;
-		}
-	}
-}
-
-ConVarRef::ConVarRef(IConVar* pConVar)
-{
-	m_pConVar = pConVar ? pConVar : &s_EmptyConVar;
-	m_pConVarState = static_cast<ConVar*>(m_pConVar);
-}
-
-bool ConVarRef::IsValid() const
-{
-	return m_pConVar != &s_EmptyConVar;
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-//-----------------------------------------------------------------------------
-void ConVar_PrintFlags(const ConCommandBase* var)
-{
-	bool any = false;
-	if (var->IsFlagSet(FCVAR_GAMEDLL))
-	{
-		iff.myConMsg(" game");
-		any = true;
-	}
-
-	if (var->IsFlagSet(FCVAR_CLIENTDLL))
-	{
-		iff.myConMsg(" client");
-		any = true;
-	}
-
-	if (var->IsFlagSet(FCVAR_ARCHIVE))
-	{
-		iff.myConMsg(" archive");
-		any = true;
-	}
-
-	if (var->IsFlagSet(FCVAR_NOTIFY))
-	{
-		iff.myConMsg(" notify");
-		any = true;
-	}
-
-	if (var->IsFlagSet(FCVAR_SPONLY))
-	{
-		iff.myConMsg(" singleplayer");
-		any = true;
-	}
-
-	if (var->IsFlagSet(FCVAR_NOT_CONNECTED))
-	{
-		iff.myConMsg(" notconnected");
-		any = true;
-	}
-
-	if (var->IsFlagSet(FCVAR_CHEAT))
-	{
-		iff.myConMsg(" cheat");
-		any = true;
-	}
-
-	if (var->IsFlagSet(FCVAR_REPLICATED))
-	{
-		iff.myConMsg(" replicated");
-		any = true;
-	}
-
-	if (var->IsFlagSet(FCVAR_SERVER_CAN_EXECUTE))
-	{
-		iff.myConMsg(" server_can_execute");
-		any = true;
-	}
-
-	if (var->IsFlagSet(FCVAR_CLIENTCMD_CAN_EXECUTE))
-	{
-		iff.myConMsg(" clientcmd_can_execute");
-		any = true;
-	}
-
-	if (any)
-	{
-		iff.myConMsg("\n");
-	}
-}
-
diff --git a/SpyCustom/Config.hpp b/SpyCustom/Config.hpp
deleted file mode 100644
index f352412..0000000
--- a/SpyCustom/Config.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef CONFIG
-#define CONFIG
-#pragma once
-
-#include "Options.hpp"
-#include "Singleton.hpp"
-
-#include <fstream>
-#include <sstream>
-
-std::vector<char> HexToBytes(const std::string& hex) {
-    std::vector<char> res;
-
-    for (auto i = 0u; i < hex.length(); i += 2) {
-        std::string byteString = hex.substr(i, 2);
-        char byte = (char)strtol(byteString.c_str(), NULL, 16);
-        res.push_back(byte);
-    }
-
-    return res;
-}
-std::string BytesToString(unsigned char* data, int len) {
-    constexpr char hexmap[] = { '0', '1', '2', '3', '4', '5', '6', '7',
-                                '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-    std::string res(len * 2, ' ');
-    for (int i = 0; i < len; ++i) {
-        res[2 * i] = hexmap[(data[i] & 0xF0) >> 4];
-        res[2 * i + 1] = hexmap[data[i] & 0x0F];
-    }
-    return res;
-}
-std::vector<std::string> Split(const std::string& str, const char* delim) {
-    std::vector<std::string> res;
-    char* pTempStr = _strdup(str.c_str());
-    char* context = NULL;
-    char* pWord = strtok_s(pTempStr, delim, &context);
-    while (pWord != NULL) {
-        res.push_back(pWord);
-        pWord = strtok_s(NULL, delim, &context);
-    }
-
-    free(pTempStr);
-
-    return res;
-}
-
-
-class Config : public Singleton<Config> {
-public:
-    void Save() {
-        std::ofstream fout("seaside210616.cfg", std::ios::binary);
-        const auto sz = sizeof(Options);
-        const auto var_sz = sizeof(Var<bool>);
-        const auto cnt = sz / var_sz;
-        for (auto i = 0; i < cnt; i++) {
-            const auto el = &(*(Var<int>*)(&g_Options)) + i;
-            auto name = el->name;
-            auto val = el->value;
-            auto sizeof_val = el->size;
-            fout << name << "\t" << BytesToString((unsigned char*)*(int*)&val, sizeof_val) << std::endl;
-        }
-        fout.close();
-    }
-
-    bool file_exists(std::string filename) {
-        std::ifstream ifile(filename);
-        return (bool)ifile;
-    }
-
-    void Load() {
-
-        opt.loading = 1;
-         
-        if (file_exists("seaside210616.cfg") ) {
-            std::ifstream fin("seaside210616.cfg", std::ios::binary);
-            std::stringstream ss;
-            ss << fin.rdbuf();
-
-
-            auto lines = Split(ss.str(), "\n");
-
-            for (auto line : lines) {
-                auto data = Split(line, "\t");
-                const auto sz = sizeof(Options);
-                const auto var_sz = sizeof(Var<bool>);
-                const auto cnt = sz / var_sz;
-                for (auto i = 0; i < cnt; i++) {
-                    const auto& el = &(*(Var<bool>*)(&g_Options)) + i;
-                    if (data[0] == el->name) {
-                        auto bytes = HexToBytes(data[1]);
-                        memcpy(*(void**)&el->value, bytes.data(), el->size);
-                    }
-                }
-            }
-            fin.close();
-
-            OnLoadCfg();
-        }
-        else iff.g_pGameUI->CreateCommandMsgBox("Seaside Error", "Unable to find configuration file!", true, false, "", "", "", "", "");
-
-    }
-};
-
-
-
-
-#endif
diff --git a/SpyCustom/Controls.h b/SpyCustom/Controls.h
deleted file mode 100644
index 7998fda..0000000
--- a/SpyCustom/Controls.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef CONTROLS_H
-#define CONTROLS_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "IPanel.h"
-#include "IKeyValuesSystem.h"
-
-#include "interface.h"
-#include "MouseCode.h"
-#include "KeyCode.h"
-#include "tier3.h"
-
-
-namespace vgui
-{
-
-	bool VGui_InitInterfacesList(const char* moduleName, CreateInterfaceFn* factoryList, int numFactories);
-
-	const char* GetControlsModuleName();
-
-	class IPanel;
-	class IInput;
-	class ISchemeManager;
-	class ISurface;
-	class ISystem;
-	class IVGui;
-
-	class AnalogBar;
-	class AnimatingImagePanel;
-	class AnimationController;
-	class BuildModeDialog;
-	class Button;
-	class CheckButton;
-	class CheckButtonList;
-	class CircularProgressBar;
-	template< class T >class CvarToggleCheckButton;
-	class ComboBox;
-	class DirectorySelectDialog;
-	class Divider;
-	class EditablePanel;
-	class FileOpenDialog;
-	class Frame;
-	class GraphPanel;
-	class HTML;
-	class ImagePanel;
-	class Label;
-	class ListPanel;
-	class ListViewPanel;
-	class Menu;
-	class MenuBar;
-	class MenuButton;
-	class MenuItem;
-	class MessageBox;
-	class Panel;
-	class PanelListPanel;
-	class ProgressBar;
-	class ProgressBox;
-	class PropertyDialog;
-	class PropertyPage;
-	class PropertySheet;
-	class QueryBox;
-	class RadioButton;
-	class RichText;
-	class ScalableImagePanel;
-	class ScrollBar;
-	class ScrollBarSlider;
-	class SectionedListPanel;
-	class Slider;
-	class Splitter;
-	class TextEntry;
-	class ToggleButton;
-	class BaseTooltip;
-	class TextTooltip;
-	class TreeView;
-	class CTreeViewListControl;
-	class URLLabel;
-	class WizardPanel;
-	class WizardSubPanel;
-
-	class BuildGroup;
-	class FocusNavGroup;
-	class IBorder;
-	class IImage;
-	class Image;
-	class ImageList;
-	class TextImage;
-
-}   
-
-#define VGUI_HOTKEYS_ENABLED
-#define USING_BUILD_FACTORY( className )				\
-	extern className *g_##className##LinkerHack;		\
-	className *g_##className##PullInModule = g_##className##LinkerHack;
-
-#define USING_BUILD_FACTORY_ALIAS( className, factoryName )				\
-	extern className *g_##factoryName##LinkerHack;		\
-	className *g_##factoryName##PullInModule = g_##factoryName##LinkerHack;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Cursor.h b/SpyCustom/Cursor.h
deleted file mode 100644
index 7244d81..0000000
--- a/SpyCustom/Cursor.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef CURSOR_H
-#define CURSOR_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-
-namespace vgui
-{
-
-	enum CursorCode
-	{
-		dc_user,
-		dc_none,
-		dc_arrow,
-		dc_ibeam,
-		dc_hourglass,
-		dc_waitarrow,
-		dc_crosshair,
-		dc_up,
-		dc_sizenwse,
-		dc_sizenesw,
-		dc_sizewe,
-		dc_sizens,
-		dc_sizeall,
-		dc_no,
-		dc_hand,
-		dc_blank,                
-		dc_last,
-		dc_alwaysvisible_push,
-		dc_alwaysvisible_pop,
-	};
-
-	typedef unsigned long HCursor;
-
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Dar.h b/SpyCustom/Dar.h
deleted file mode 100644
index 7fcbab5..0000000
--- a/SpyCustom/Dar.h
+++ /dev/null
@@ -1,121 +0,0 @@
-#ifndef DAR_H
-#define DAR_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include "VGUI.h"
-#include "utlvector.h"
-
-#include "memdbgon.h"
-
-namespace vgui
-{
-
-	template<class ELEMTYPE> class Dar : public CUtlVector< ELEMTYPE >
-	{
-		typedef CUtlVector< ELEMTYPE > BaseClass;
-
-	public:
-		Dar()
-		{
-		}
-		Dar(int initialCapacity) :
-			BaseClass(0, initialCapacity)
-		{
-		}
-
-	public:
-		void SetCount(int count)
-		{
-			this->EnsureCount(count);
-		}
-		int GetCount()
-		{
-			return this->Count();
-		}
-		int AddElement(ELEMTYPE elem)
-		{
-			return this->AddToTail(elem);
-		}
-		void MoveElementToEnd(ELEMTYPE elem)
-		{
-			if (this->Count() == 0)
-				return;
-
-			if (this->Element(this->Count() - 1) == elem)
-				return;
-
-			int idx = this->GetOffset(elem);
-			if (idx == this->InvalidIndex())
-				return;
-
-			this->Remove(idx);
-			this->AddToTail(elem);
-		}
-		int FindElement(ELEMTYPE elem)
-		{
-			return this->GetOffset(elem);
-		}
-		bool HasElement(ELEMTYPE elem)
-		{
-			if (this->FindElement(elem) != this->InvalidIndex())
-			{
-				return true;
-			}
-			return false;
-		}
-		int PutElement(ELEMTYPE elem)
-		{
-			int index = this->FindElement(elem);
-			if (index >= 0)
-			{
-				return index;
-			}
-			return this->AddElement(elem);
-		}
-		void InsertElementAt(ELEMTYPE elem, int index)
-		{
-			this->InsertBefore(index, elem);
-		}
-		void SetElementAt(ELEMTYPE elem, int index)
-		{
-			this->EnsureCount(index + 1);
-			this->Element(index) = elem;
-		}
-		void RemoveElementAt(int index)
-		{
-			this->Remove(index);
-		}
-
-		void RemoveElementsBefore(int index)
-		{
-			if (index <= 0)
-				return;
-			this->RemoveMultiple(0, index - 1);
-		}
-
-		void RemoveElement(ELEMTYPE elem)
-		{
-			this->FindAndRemove(elem);
-		}
-
-		void* GetBaseData()
-		{
-			return this->Base();
-		}
-
-		void CopyFrom(Dar<ELEMTYPE>& dar)
-		{
-			this->CopyArray(dar.Base(), dar.Count());
-		}
-	};
-
-}
-
-#include "memdbgoff.h"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/EditablePanel.h b/SpyCustom/EditablePanel.h
deleted file mode 100644
index 3efd145..0000000
--- a/SpyCustom/EditablePanel.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef EDITABLEPANEL_H
-#define EDITABLEPANEL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "Panel.h"
-#include "FocusNavGroup.h"
-
-namespace vgui
-{
-
-	class EditablePanel : public Panel
-	{
-		DECLARE_CLASS_SIMPLE(EditablePanel, Panel);
-
-	public:
-		EditablePanel(Panel* parent, const char* panelName);
-		EditablePanel(Panel* parent, const char* panelName, HScheme hScheme);
-
-		virtual ~EditablePanel();
-
-		virtual void LoadControlSettings(const char* dialogResourceName, const char* pathID = NULL, KeyValues* pPreloadedKeyValues = NULL, KeyValues* pConditions = NULL);
-		virtual void ApplySettings(KeyValues* inResourceData);
-
-		virtual void LoadUserConfig(const char* configName, int dialogID = 0);
-		virtual void SaveUserConfig();
-
-		virtual void LoadControlSettingsAndUserConfig(const char* dialogResourceName, int dialogID = 0);
-
-		virtual void ActivateBuildMode();
-
-		virtual BuildGroup* GetBuildGroup();
-
-		virtual Panel* CreateControlByName(const char* controlName);
-
-		virtual void SetControlString(const char* controlName, const char* string);
-		virtual void SetControlString(const char* controlName, const wchar_t* string);
-		virtual void SetControlInt(const char* controlName, int state);
-		virtual int GetControlInt(const char* controlName, int defaultState);
-		virtual const char* GetControlString(const char* controlName, const char* defaultString = "");
-		virtual void GetControlString(const char* controlName, char* buf, int bufSize, const char* defaultString = "");
-		virtual void SetControlEnabled(const char* controlName, bool enabled);
-		virtual void SetControlVisible(const char* controlName, bool visible);
-
-		virtual void SetDialogVariable(const char* varName, const char* value);
-		virtual void SetDialogVariable(const char* varName, const wchar_t* value);
-		virtual void SetDialogVariable(const char* varName, int value);
-		virtual void SetDialogVariable(const char* varName, float value);
-
-		virtual void RequestFocus(int direction = 0);
-		virtual bool RequestFocusNext(VPANEL panel);
-		virtual bool RequestFocusPrev(VPANEL panel);
-		virtual void OnSetFocus();
-		virtual void OnRequestFocus(VPANEL subFocus, VPANEL defaultPanel);
-		virtual VPANEL GetCurrentKeyFocus();
-		virtual Panel* HasHotkey(wchar_t key);
-
-		virtual void OnKeyCodePressed(KeyCode code);
-
-		virtual bool RequestInfo(KeyValues* data);
-		virtual void RegisterControlSettingsFile(const char* dialogResourceName, const char* pathID = NULL);
-
-		KeyValues* GetDialogVariables();
-
-	protected:
-		virtual void PaintBackground();
-
-		virtual FocusNavGroup& GetFocusNavGroup();
-
-		MESSAGE_FUNC_HANDLE(OnDefaultButtonSet, "DefaultButtonSet", button);
-		MESSAGE_FUNC_HANDLE(OnCurrentDefaultButtonSet, "CurrentDefaultButtonSet", button);
-		MESSAGE_FUNC(OnFindDefaultButton, "FindDefaultButton");
-
-		virtual void OnChildAdded(VPANEL child);
-		virtual void OnSizeChanged(int wide, int tall);
-		virtual void OnClose();
-
-		virtual void ApplyUserConfigSettings(KeyValues* userConfig);
-
-		virtual void GetUserConfigSettings(KeyValues* userConfig);
-
-	private:
-		void ForceSubPanelsToUpdateWithNewDialogVariables();
-
-		BuildGroup* _buildGroup;
-		FocusNavGroup m_NavGroup;
-		KeyValues* m_pDialogVariables;
-
-		char* m_pszConfigName;
-		int m_iConfigID;
-		bool m_bShouldSkipAutoResize;
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/EventListener.hpp b/SpyCustom/EventListener.hpp
deleted file mode 100644
index 14f58a8..0000000
--- a/SpyCustom/EventListener.hpp
+++ /dev/null
@@ -1,407 +0,0 @@
-#ifndef EVENTLISTEN
-#define EVENTLISTEN
-#pragma once
-
-#pragma comment( lib, "Winmm.lib" )
-
-#include "Interfaces.hpp"
-#include "c_baseentity.h"
-#include "Options.hpp"
-
-
-struct bullet
-{
-    bullet(int userID, Vector pos, int dmg, bool hs, float curtime)
-    {
-        this->userid = userid;
-        this->hs = hs;
-        this->curtime = curtime;
-        this->time = curtime + 0.0f;
-        this->pos = pos;
-        this->dmg = dmg;
-    }
-    int userid;
-    bool hs;
-    float time;
-    float curtime;
-    Vector pos;
-    int dmg;
-};
-std::vector<bullet> bulletdata;
-
-#define PI 3.14159265
-
-class EventListener : public IGameEventListener2
-{
-public:
-    EventListener()
-    {
-        if (!iff.g_pGameEvents->AddListener(this, "bullet_impact", false))
-        {
-#ifdef DEBUG
-            std::cout << "Can't add listener bullet_impact\n";
-#endif
-        }
-        
-
-        if (!iff.g_pGameEvents->AddListener(this, "player_hurt", false))
-        {
-#ifdef DEBUG
-            std::cout << "Can't add listener player_hurt\n";
-#endif
-        }
-       
-
-        if (!iff.g_pGameEvents->AddListener(this, "vote_cast", false))
-        {
-#ifdef DEBUG
-            std::cout << "Can't add listener vote_cast\n";
-#endif
-        }
-        
-
-        if (!iff.g_pGameEvents->AddListener(this, "game_newmap", false))
-        {
-#ifdef DEBUG
-            std::cout << "Can't add listener game_newmap\n";
-#endif
-        }
-       
-
-#ifdef DEBUG
-        std::cout << "Event Listener created\n";
-#endif
-
-    }
-
-    ~EventListener()
-    {
-        iff.g_pGameEvents->RemoveListener(this);
-    }
-
-    int GetEventDebugID() override
-    {
-        return EVENT_DEBUG_ID_INIT;
-    }
-
-    virtual void FireGameEvent(IGameEvent* event)
-    {
-
-        if (*g_Options.hitmarker || *g_Options.hitsound) {
-            if (!strcmp(event->GetName(), "player_hurt"))
-            {
-                short hitgroup = event->GetInt("hitgroup");
-                short attacker = event->GetInt("attacker");
-                short userid = event->GetInt("userid");
-                short dmg_health = event->GetInt("dmg_health");
-
-                if (iff.g_pEngineClient->GetPlayerForUserID(attacker) == iff.g_pEngineClient->GetLocalPlayer()) {
-
-                    int pid = iff.g_pEngineClient->GetPlayerForUserID(userid);
-                    C_BasePlayer* pEntity = (C_BasePlayer*)iff.g_pEntityList->GetClientEntity(pid);
-                    Vector pos = pEntity->GetBonePosition(8); 
-
-                    if (hitgroup == 1)
-                    {
-                        bool badInput = false;
-                        int i_dec = 0;
-
-                        if (*g_Options.hitsound) {
-                            try
-                            {
-                                i_dec = std::stoi(g_Options.hspath.value->mystring);
-                            }
-                            catch (...)
-                            {
-                                badInput = true;
-                                PlaySoundA(g_Options.hspath.value->mystring, NULL, SND_ASYNC);
-                            }
-
-                            if (!badInput && FindResource(opt.hModuleGlobal, MAKEINTRESOURCE(i_dec), "WAVE")) {
-                                PlaySoundA((char*)i_dec, opt.hModuleGlobal, SND_RESOURCE | SND_ASYNC);
-                            }
-
-                        }
-
-
-                        if (*g_Options.hitmarker) 
-                            bulletdata.push_back(bullet(userid, pos, dmg_health, 1, iff.g_pGlobals->curtime));
-                    }
-                    else
-                    { 
-                        bool badInput = false;
-                        int i_dec = 0;
-
-                        if (*g_Options.hitsound) {
-                            try
-                            {
-                                i_dec = std::stoi(g_Options.obpath.value->mystring);
-                            }
-                            catch (...)
-                            {
-                                badInput = true;
-                                PlaySoundA(g_Options.obpath.value->mystring, NULL, SND_ASYNC);
-                            }
-
-                            if (!badInput && FindResource(opt.hModuleGlobal, MAKEINTRESOURCE(i_dec), "WAVE")) {
-                                PlaySoundA((char*)i_dec, opt.hModuleGlobal, SND_RESOURCE | SND_ASYNC);
-                            }
-
-                        }
-
-
-                        if (*g_Options.hitmarker)
-                            bulletdata.push_back(bullet(userid, pos, dmg_health, 0, iff.g_pGlobals->curtime));
-                    }
-
-
-                }
-            }
-        }
-        
-        
-        if (!strcmp(event->GetName(), "bullet_impact"))
-        {
-            
-            short userid = event->GetInt("userid");
-            int localplayer = iff.g_pEngineClient->GetLocalPlayer();
-
-
-            if (iff.g_pEngineClient->GetPlayerForUserID(userid) == localplayer) {
-
-
-                float x = event->GetFloat("x");
-                float y = event->GetFloat("y");
-                float z = event->GetFloat("z");
-
-                C_BasePlayer* pEntity = (C_BasePlayer*)iff.g_pEntityList->GetClientEntity(localplayer);
-                Vector src = pEntity->GetOrigin() + pEntity->GetViewOffset(); 
-                Vector dst = { x,y,z };
-
-                Vector ang = pEntity->GetAngles();
-
-                ang.x -= 90.0f; ang.y -= 90.0f; 
-                
-                static float margin = 3.0f;
-                static float coeff = 1.5f;
-                src.x += cos(ang.x * PI / 180) * margin * sin(ang.y * PI / 180) + cos(ang.y * PI / 180) * margin * coeff;
-                src.y += -cos(ang.x * PI / 180) * margin * cos(ang.y * PI / 180) + sin(ang.y * PI / 180) * margin * coeff;
-                src.z += sin(ang.x * PI / 180) * margin;
-
-                
-                if (*g_Options.beamtrace) {
-
-                    BeamInfo_t beamInfo;
-                    beamInfo.m_nType = *g_Options.beamtype; 
-                    beamInfo.m_pszModelName = g_Options.beampath.value->mystring;
-
-                    beamInfo.m_nModelIndex = -1;
-                    beamInfo.m_flHaloScale = 0.0f;
-                    beamInfo.m_pStartEnt = pEntity; 
-                    beamInfo.m_pEndEnt = NULL; 
-
-                    beamInfo.m_vecEnd = dst;
-                    beamInfo.m_vecStart = src;   
-                    beamInfo.m_flLife = *g_Options.beamlife;  
-                    beamInfo.m_flFadeLength = *g_Options.beamfadelength;  
-                    beamInfo.m_flAmplitude = *g_Options.beamamplitude; 
-                    beamInfo.m_nSegments = *g_Options.beamsegments;    
-                    beamInfo.m_bRenderable = true;
-           
-                    beamInfo.m_flSpeed = *g_Options.beamspeed;
-                    beamInfo.m_nStartFrame = *g_Options.beamstartframe;
-                    beamInfo.m_flFrameRate = *g_Options.beamframerate; 
-                    beamInfo.m_flWidth = *g_Options.beamwidth;
-                    beamInfo.m_flEndWidth = *g_Options.beamwidth;
-
-                    beamInfo.m_flBlue = g_Options.beamcolor.value->b * 255.0f;
-                    beamInfo.m_flGreen = g_Options.beamcolor.value->g * 255.0f;
-                    beamInfo.m_flRed = g_Options.beamcolor.value->r * 255.0f;
-                    beamInfo.m_flBrightness = g_Options.beamcolor.value->a * 255.0f;
-
-                    beamInfo.m_nFlags = *g_Options.beamflags;     
-                    Beam_t* myBeam = iff.g_pViewRenderBeams->CreateBeamPoints(beamInfo);
-                    if (myBeam) iff.g_pViewRenderBeams->DrawBeam(myBeam);
-                    else
-                    {
-                    }
-                }
-                 
-                 
-                if (*g_Options.attacheffects) {
-
-                    switch (g_Options.effects.value->type) {
-
-                    case 0:
-                    {
-                        switch (g_Options.effects.value->selectedc)
-                        {
-                        case 0:
-                        {
-                            iff.g_pEffects->Smoke(dst, -1, g_Options.effects.value->fx_fsize, g_Options.effects.value->fx_fspeed);
-                            break;
-                        }
-                        case 2: 
-                        {
-                            iff.g_pEffects->Dust(dst, Vector(0.0f, 0.0f, 1.0f), g_Options.effects.value->fx_fsize, g_Options.effects.value->fx_fspeed);
-                            break;
-                        }
-                        case 1:
-                        {
-                            iff.g_pEffects->Sparks(dst, g_Options.effects.value->fx_magnitude, g_Options.effects.value->fx_traillength);
-                            break;
-                        }
-                        case 3:
-                        {
-                            iff.g_pEffects->MuzzleFlash(dst, CalcAngle(dst, src), g_Options.effects.value->fx_fsize, g_Options.effects.value->fx_itype);
-                            break;
-                        }
-                        case 4: 
-                        {
-                            iff.g_pEffects->MetalSparks(dst, Vector( 0.0f, 0.0f, 0.0f ) );
-                            break;
-                        }
-                        case 6:
-                        {
-                            iff.g_pEffects->Ricochet(dst, Vector(0.0f, 0.0f, 1.0f));
-                            break;
-                        }
-                        case 5:
-                        {
-                            iff.g_pEffects->EnergySplash(dst, src, g_Options.effects.value->fx_bexplosive);
-                            break;
-                        }
-
-                        }      
-                        break;
-                    }    
-
-                    case 1:
-                    {
-                        CEffectData asscock;
-                        asscock.m_fFlags = g_Options.effects.value->fflags;
-                        asscock.m_vOrigin = dst;
-                        asscock.m_vStart = src;
-                        asscock.m_vNormal.Init(0.0f, 0.0f, 1.0f);
-                        asscock.m_flScale = g_Options.effects.value->fscale;
-                        asscock.m_nColor = g_Options.effects.value->icolors;
-                        asscock.m_flMagnitude = g_Options.effects.value->fmagtinude;
-                        asscock.m_flRadius = g_Options.effects.value->fradius;
-                        iff.DispatchEffect(opt.DispatchEffect.at(g_Options.effects.value->selectedc).c_str(), asscock);
-
-                        break;
-                    }    
-
-
-
-                    case 2:
-                    {
-                        switch (g_Options.effects.value->selectedc)
-                        {
-                        case 0: 
-                        {
-                            CTeslaInfo teslaInfo;
-                            teslaInfo.m_flBeamWidth = g_Options.effects.value->fbeamwidth;
-                            teslaInfo.m_flRadius = g_Options.effects.value->teslaradius;
-                            teslaInfo.m_nEntIndex = -1;
-                            teslaInfo.m_vColor.Init(g_Options.effects.value->teslacolor[0], g_Options.effects.value->teslacolor[1], g_Options.effects.value->teslacolor[2]);       
-                            teslaInfo.m_vPos = dst;          
-                            teslaInfo.m_flTimeVisible = g_Options.effects.value->fltimevisible;
-                            teslaInfo.m_nBeams = g_Options.effects.value->ibeams;
-                            teslaInfo.m_pszSpriteName = g_Options.effects.value->szSpriteName;
-                            iff.FX_Tesla(teslaInfo);
-
-                            break;
-                        }
-
-                         
-
-                        case 1:   
-                        { 
-                                
-                            dlight_t* pDlight = iff.g_pEfx->CL_AllocDlight(1);
-                            pDlight->origin = dst;
-                            pDlight->radius = g_Options.effects.value->frad; 
-                            pDlight->color.r = g_Options.effects.value->dlightcolor[0]*255.0f;
-                            pDlight->color.g = g_Options.effects.value->dlightcolor[1] * 255.0f;
-                            pDlight->color.b = g_Options.effects.value->dlightcolor[2] * 255.0f;
-
-                            pDlight->color.exponent = 5;
-                            pDlight->die = iff.g_pGlobals->curtime + g_Options.effects.value->fdie;
-                            pDlight->decay = 0; 
-                            pDlight->key = g_Options.effects.value->key;
-                            pDlight->style = g_Options.effects.value->style;
-                            
-
-
-                            break;
-                        }
-
-                        
-                        
-
-                        }
-                        break;
-                    }    
-
-
-
-
-
-
-
-                    }
-
-                }
-
-                
-            }
-        
-        }
-         
-
-
-
-        if (*g_Options.votereveal) {
-            if (!strcmp(event->GetName(), "vote_cast"))
-            {
-                int vote = event->GetInt("vote_option");
-                int id = event->GetInt("entityid");
-                if (iff.g_pChatElement)
-                {
-                    player_info_t pinfo;
-                    iff.g_pEngineClient->GetPlayerInfo(id, &pinfo);
-
-                    if (pinfo.name) {
-#ifdef DEBUG
-                        printf("%s voted %d\n", pinfo.name, vote);
-#endif
-                        iff.g_pChatElement->ChatPrintf2(0, 0, std::string("").
-                            append(" \x06").
-                            append(pinfo.name).
-                            append(" \x01").  
-                            append("voted").
-                            append((vote == 0 ? std::string(" \x04").append("YES") : std::string(" \x02").append("NO"))).c_str());
-                    }
-                }
-            }
-        }
-
-        if (!strcmp(event->GetName(), "game_newmap"))
-        {
-#ifdef DEBUG
-            printf("game_newmap\n");
-#endif
-            OnLevelInit();
-        }
-
-
-
-
-
-    }
-};
-
-
-
-#endif 
\ No newline at end of file
diff --git a/SpyCustom/FocusNavGroup.h b/SpyCustom/FocusNavGroup.h
deleted file mode 100644
index eb28ffc..0000000
--- a/SpyCustom/FocusNavGroup.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef FOCUSNAVGROUP_H
-#define FOCUSNAVGROUP_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "PHandle.h"
-
-namespace vgui
-{
-
-	class Panel;
-
-	class FocusNavGroup
-	{
-	public:
-		FocusNavGroup(Panel* panel);
-		~FocusNavGroup();
-		virtual Panel* GetDefaultPanel();	          
-
-		virtual void SetDefaultButton(Panel* panel);	          
-		virtual VPANEL GetDefaultButton();				                    
-		virtual VPANEL GetCurrentDefaultButton();			        
-		virtual Panel* FindPanelByHotkey(wchar_t key);		          
-		virtual bool RequestFocusPrev(VPANEL panel = NULL);                  
-		virtual bool RequestFocusNext(VPANEL panel = NULL);
-
-		virtual Panel* GetCurrentFocus();
-		virtual VPANEL SetCurrentFocus(VPANEL panel, VPANEL defaultPanel);      
-
-		virtual void SetFocusTopLevel(bool state);
-
-		virtual void SetCurrentDefaultButton(VPANEL panel, bool sendCurrentDefaultButtonMessage = true);
-	private:
-		bool CanButtonBeDefault(VPANEL panel);
-
-		VPanelHandle _defaultButton;
-		VPanelHandle _currentDefaultButton;
-		VPanelHandle _currentFocus;
-
-		Panel* _mainPanel;
-		bool _topLevelFocus;
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Frame.h b/SpyCustom/Frame.h
deleted file mode 100644
index ed36079..0000000
--- a/SpyCustom/Frame.h
+++ /dev/null
@@ -1,198 +0,0 @@
-#ifndef VGUI_FRAME_H
-#define VGUI_FRAME_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vgui.h"
-#include "Dar.h"
-#include "Panel.h"
-#include "EditablePanel.h"
-#include "FocusNavGroup.h"
-
-namespace vgui
-{
-
-	class FrameButton;
-	class FrameSystemButton;
-
-	class Frame : public EditablePanel
-	{
-		DECLARE_CLASS_SIMPLE(Frame, EditablePanel);
-
-	public:
-		Frame(Panel* parent, const char* panelName, bool showTaskbarIcon = true, bool bPopup = true);
-		virtual ~Frame();
-
-		virtual void SetTitle(const char* title, bool surfaceTitle);
-		virtual void SetTitle(const wchar_t* title, bool surfaceTitle);
-
-		virtual void Activate();
-
-		virtual void ActivateMinimized();
-
-		MESSAGE_FUNC(Close, "Close");
-		MESSAGE_FUNC(CloseModal, "CloseModal");
-
-		virtual void SetDeleteSelfOnClose(bool state);
-
-		virtual void MoveToCenterOfScreen();
-
-		virtual void SetMoveable(bool state);
-		virtual bool IsMoveable();
-
-		virtual void SetSizeable(bool state);
-		virtual bool IsSizeable();
-		virtual void SetMenuButtonVisible(bool state);
-		void SetMenuButtonResponsive(bool state);
-
-		virtual void SetMinimizeButtonVisible(bool state);
-		virtual void SetMaximizeButtonVisible(bool state);
-		virtual void SetMinimizeToSysTrayButtonVisible(bool state);
-
-		virtual void SetCloseButtonVisible(bool state);
-
-		virtual bool IsMinimized();
-		virtual void FlashWindow();
-		virtual void FlashWindowStop();
-		virtual void OnCommand(const char* command);
-
-		virtual Menu* GetSysMenu();
-		virtual void SetSysMenu(Menu* menu);
-
-		void SetImages(const char* pEnabledImage, const char* pDisabledImage = NULL);
-
-		virtual void SetTitleBarVisible(bool state);
-
-		virtual void SetClipToParent(bool state);
-		virtual bool GetClipToParent() const;
-
-		virtual void SetSmallCaption(bool state);
-		virtual bool IsSmallCaption() const;
-
-		virtual int GetDraggerSize();
-		virtual int GetCornerSize();
-		virtual int GetBottomRightSize();
-		virtual int GetCaptionHeight();
-
-		virtual void LoadControlSettings(const char* dialogResourceName, const char* pathID = NULL, KeyValues* pPreloadedKeyValues = NULL, KeyValues* pConditions = NULL);
-
-		void SetChainKeysToParent(bool state);
-		bool CanChainKeysToParent() const;
-
-		virtual void DoModal();
-
-		void PlaceUnderCursor();
-
-		void DisableFadeEffect(void);
-
-		void SetFadeEffectDisableOverride(bool disabled);
-
-		virtual void OnGripPanelMoved(int nNewX, int nNewY, int nNewW, int nNewH);
-		virtual void OnGripPanelMoveFinished() {}
-
-	protected:
-		virtual void OnMousePressed(MouseCode code);
-		virtual void OnKeyCodeTyped(KeyCode code);
-		virtual void OnKeyTyped(wchar_t unichar);
-		virtual void OnKeyCodeReleased(KeyCode code);
-		virtual void OnKeyFocusTicked();
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-		virtual void PerformLayout();
-		virtual void OnClose();
-		virtual void OnFinishedClose();
-		MESSAGE_FUNC(OnMinimize, "Minimize");
-		virtual void OnMinimizeToSysTray();
-		MESSAGE_FUNC(OnCloseFrameButtonPressed, "CloseFrameButtonPressed");
-		virtual void OnChildAdded(VPANEL child);
-		virtual void ApplySettings(KeyValues* inResourceData);
-		virtual void GetSettings(KeyValues* outResourceData);
-		virtual const char* GetDescription(void);
-
-		virtual bool GetDefaultScreenPosition(int& x, int& y, int& wide, int& tall);
-
-		virtual void PaintBackground();
-
-		virtual void OnThink();
-
-		virtual void OnScreenSizeChanged(int iOldWide, int iOldTall);
-
-		virtual void GetClientArea(int& x, int& y, int& wide, int& tall);
-
-		virtual void ApplyUserConfigSettings(KeyValues* userConfig);
-
-		virtual void GetUserConfigSettings(KeyValues* userConfig);
-
-		virtual bool HasUserConfigSettings();
-
-		virtual void GetSizerClientArea(int& x, int& y, int& wide, int& tall);
-
-	private:
-		MESSAGE_FUNC_CHARPTR(InternalSetTitle, "SetTitle", text);
-		MESSAGE_FUNC(InternalFlashWindow, "FlashWindow");
-		MESSAGE_FUNC_PARAMS(OnDialogVariablesChanged, "DialogVariables", dialogVariables);
-
-		void SetupResizeCursors();
-		void LayoutProportional(FrameButton* bt);
-		void FinishClose();
-		void OnFrameFocusChanged(bool bHasFocus);
-
-		Color		_titleBarBgColor;
-		Color		_titleBarDisabledBgColor;
-		Color		_titleBarFgColor;
-		Color		_titleBarDisabledFgColor;
-		Color		m_InFocusBgColor;
-		Color		m_OutOfFocusBgColor;
-		TextImage* _title;
-
-#if !defined( _GAMECONSOLE )
-		Panel* _topGrip;
-		Panel* _bottomGrip;
-		Panel* _leftGrip;
-		Panel* _rightGrip;
-		Panel* _topLeftGrip;
-		Panel* _topRightGrip;
-		Panel* _bottomLeftGrip;
-		Panel* _bottomRightGrip;
-		Panel* _captionGrip;
-		FrameButton* _minimizeButton;
-		FrameButton* _maximizeButton;
-		FrameButton* _minimizeToSysTrayButton;
-		FrameButton* _closeButton;
-		FrameSystemButton* _menuButton;
-		Menu* _sysMenu;
-#endif
-
-		float	m_flTransitionEffectTime;
-		float	 m_flFocusTransitionEffectTime;
-		int		m_iClientInsetX;
-		int		m_iClientInsetY;
-		int		m_iTitleTextInsetX;
-		int		m_nGripperWidth;
-		VPANEL	m_hPreviousModal;
-		HFont	m_hCustomTitleFont;
-
-		bool	_sizeable : 1;
-		bool	_moveable : 1;
-		bool	 m_bHasFocus : 1;
-		bool	_flashWindow : 1;
-		bool	_nextFlashState : 1;
-		bool	_drawTitleBar : 1;
-		bool	m_bPreviouslyVisible : 1;
-		bool	m_bFadingOut : 1;
-		bool	m_bDeleteSelfOnClose : 1;
-		bool	m_bDisableFadeEffect : 1;
-		bool	m_bClipToParent : 1;
-		bool	m_bSmallCaption : 1;
-		bool	m_bChainKeysToParent : 1;
-		bool	m_bPrimed : 1;
-		bool	m_iClientInsetXOverridden : 1;
-
-		CPanelAnimationVarAliasType(int, m_iTitleTextInsetXOverride, "titletextinsetX", "0", "proportional_int");
-		CPanelAnimationVarAliasType(int, m_iTitleTextInsetYOverride, "titletextinsetY", "0", "proportional_int");
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/GameEventListener.h b/SpyCustom/GameEventListener.h
deleted file mode 100644
index 7366d70..0000000
--- a/SpyCustom/GameEventListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef GAME_EVENT_LISTENER_H
-#define GAME_EVENT_LISTENER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "igameevents.h"
-extern IGameEventManager2* gameeventmanager;
-
-class CGameEventListener : public IGameEventListener2
-{
-public:
-	CGameEventListener() : m_bRegisteredForEvents(false)
-	{
-	}
-
-	~CGameEventListener()
-	{
-		StopListeningForAllEvents();
-	}
-
-	void ListenForGameEvent(const char* name)
-	{
-		m_bRegisteredForEvents = true;
-
-#ifdef CLIENT_DLL
-		bool bServerSide = false;
-#else
-		bool bServerSide = true;
-#endif
-		if (gameeventmanager)
-			gameeventmanager->AddListener(this, name, bServerSide);
-	}
-
-	void StopListeningForAllEvents()
-	{
-		if (m_bRegisteredForEvents)
-		{
-			if (gameeventmanager)
-				gameeventmanager->RemoveListener(this);
-			m_bRegisteredForEvents = false;
-		}
-	}
-
-	virtual void FireGameEvent(IGameEvent* event) = 0;
-
-private:
-
-	bool m_bRegisteredForEvents;
-};
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/GameEventManager.h b/SpyCustom/GameEventManager.h
deleted file mode 100644
index e0a2fde..0000000
--- a/SpyCustom/GameEventManager.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#if !defined ( GAMEEVENTMANAGER_H )
-#define GAMEEVENTMANAGER_H
-
-#ifdef _WIN32
-#pragma once
-#endif 
-
-#include "igameevents.h"
-#include "utlvector.h"
-#include "KeyValues.h"
-#include "networkstringtabledefs.h"
-#include "utlsymbol.h"
-
-#include "bitbuf.h" 
-
-class SVC_GameEventList;
-class CLC_ListenEvents;
-
-class CGameEventCallback
-{
-public:
-	void* m_pCallback;		  
-	int					m_nListenerType;	     
-};
-
-class CGameEventDescriptor
-{
-public:
-	CGameEventDescriptor()
-	{
-		name[0] = 0;
-		eventid = -1;
-		keys = NULL;
-		local = false;
-		reliable = true;
-	}
-
-public:
-	char		name[MAX_EVENT_NAME_LENGTH];	    
-	int			eventid;	       
-	KeyValues* keys;		         
-	bool		local;		       
-	bool		reliable;	      
-	CUtlVector<CGameEventCallback*>	listeners;	  
-};
-
-class CGameEvent : public IGameEvent
-{
-public:
-
-	CGameEvent(CGameEventDescriptor* descriptor);
-	virtual ~CGameEvent();
-
-	const char* GetName() const;
-	bool  IsEmpty(const char* keyName = NULL);
-	bool  IsLocal() const;
-	bool  IsReliable() const;
-
-	bool  GetBool(const char* keyName = NULL, bool defaultValue = false);
-	int   GetInt(const char* keyName = NULL, int defaultValue = 0);
-	float GetFloat(const char* keyName = NULL, float defaultValue = 0.0f);
-	const char* GetString(const char* keyName = NULL, const char* defaultValue = "");
-
-	void SetBool(const char* keyName, bool value);
-	void SetInt(const char* keyName, int value);
-	void SetFloat(const char* keyName, float value);
-	void SetString(const char* keyName, const char* value);
-
-	CGameEventDescriptor* m_pDescriptor;
-	KeyValues* m_pDataKeys;
-};
-
-class CGameEventManager : public IGameEventManager2
-{
-	friend class CGameEventManagerOld;
-
-public:	  
-
-	enum
-	{
-		SERVERSIDE = 0,		         
-		CLIENTSIDE,			         
-		CLIENTSTUB,			              
-		SERVERSIDE_OLD,		       
-		CLIENTSIDE_OLD,		       
-	};
-
-	enum
-	{
-		TYPE_LOCAL = 0,	  
-		TYPE_STRING,	    
-		TYPE_FLOAT,		   
-		TYPE_LONG,		    
-		TYPE_SHORT,		    
-		TYPE_BYTE,		    
-		TYPE_BOOL		    
-	};
-
-	CGameEventManager();
-	virtual ~CGameEventManager();
-
-	int	 LoadEventsFromFile(const char* filename);
-	void Reset();
-
-	bool AddListener(IGameEventListener2* listener, const char* name, bool bServerSide);
-	bool FindListener(IGameEventListener2* listener, const char* name);
-	void RemoveListener(IGameEventListener2* listener);
-
-	IGameEvent* CreateEvent(const char* name, bool bForce = false);
-	IGameEvent* DuplicateEvent(IGameEvent* event);
-	bool FireEvent(IGameEvent* event, bool bDontBroadcast = false);
-	bool FireEventClientSide(IGameEvent* event);
-	void FreeEvent(IGameEvent* event);
-
-	bool SerializeEvent(IGameEvent* event, bf_write* buf);
-	IGameEvent* UnserializeEvent(bf_read* buf);
-
-public:
-	bool Init();
-	void Shutdown();
-	void ReloadEventDefinitions();	      
-	bool AddListener(void* listener, CGameEventDescriptor* descriptor, int nListenerType);
-
-	CGameEventDescriptor* GetEventDescriptor(const char* name);
-	CGameEventDescriptor* GetEventDescriptor(IGameEvent* event);
-	CGameEventDescriptor* GetEventDescriptor(int eventid);
-
-	void WriteEventList(SVC_GameEventList* msg);
-	bool ParseEventList(SVC_GameEventList* msg);
-
-	void WriteListenEventList(CLC_ListenEvents* msg);
-	bool HasClientListenersChanged(bool bReset = true);
-	void ConPrintEvent(IGameEvent* event);
-
-	bool AddListenerAll(void* listener, int nListenerType);
-	void RemoveListenerOld(void* listener);
-
-
-protected:
-
-	IGameEvent* CreateEvent(CGameEventDescriptor* descriptor);
-	bool RegisterEvent(KeyValues* keys);
-	void UnregisterEvent(int index);
-	bool FireEventIntern(IGameEvent* event, bool bServerSide, bool bClientOnly);
-	CGameEventCallback* FindEventListener(void* listener);
-
-	CUtlVector<CGameEventDescriptor>	m_GameEvents;	     
-	CUtlVector<CGameEventCallback*>		m_Listeners;	     
-	CUtlSymbolTable						m_EventFiles;	      
-	CUtlVector<CUtlSymbol>				m_EventFileNames;
-
-	bool	m_bClientListenersChanged;	      
-};
-
-extern CGameEventManager& g_GameEventManager;
-
-#endif 
\ No newline at end of file
diff --git a/SpyCustom/GetVfunc.hpp b/SpyCustom/GetVfunc.hpp
deleted file mode 100644
index f6e2a5b..0000000
--- a/SpyCustom/GetVfunc.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef GETVFUNC
-#define GETVFUNC
-
-#pragma once
-
-inline void**& getvtable(void* inst, size_t offset = 0)
-{
-    return *reinterpret_cast<void***>((size_t)inst + offset);
-}
-
-inline const void** getvtable(const void* inst, size_t offset = 0)
-{
-    return *reinterpret_cast<const void***>((size_t)inst + offset);
-}
-
-template<typename Fn>
-inline Fn getvfunc(const void* inst, size_t index, size_t offset = 0)
-{
-    return reinterpret_cast<Fn>(getvtable(inst, offset)[index]);
-}
-
-
-template <typename Fn = void*>
-Fn get_vfunc(void* class_base, const size_t index)
-{
-    return (*reinterpret_cast<Fn**>(class_base))[index];
-}
-
-#include <string>
-#include <memory>
-inline char* MakeControlChars(char str[1024]) {
-    char name[1024];
-    strcpy(name, str);
-    for (int i = 0; i < 1024; i++)
-    {
-        if (name[i] == 0x5C && name[i + 1] == 0x78) 
-        {
-            char controlchar[3]; controlchar[0] = name[i + 2]; controlchar[1] = name[i + 3]; controlchar[2] = 0x0;
-            short x = std::stoul(controlchar, nullptr, 16);
-            name[i] = x; 
-            for (int j = i + 4; j < 1024; j++)
-            {
-                name[j - 3] = name[j];
-                if (name[j] == 0x0)
-                    break;
-            }
-        }
-        if (name[i] == 0x0)
-            break;
-    }
-    return name;
-}
-
-
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/Hooks.hpp b/SpyCustom/Hooks.hpp
deleted file mode 100644
index dd3893c..0000000
--- a/SpyCustom/Hooks.hpp
+++ /dev/null
@@ -1,201 +0,0 @@
-#pragma once
-
-
-VMTHook* SoundHook = nullptr;
-void __fastcall hkEmitSound1(void* _this, int edx, IRecipientFilter& filter, int iEntIndex, int iChannel, char* pSoundEntry, unsigned int nSoundEntryHash, const char* pSample, float flVolume, int nSeed, float flAttenuation, int iFlags, int iPitch, const Vector* pOrigin, const Vector* pDirection, void* pUtlVecOrigins, bool bUpdatePositions, float soundtime, int speakerentity, int unk) {
-    static auto ofunc = SoundHook->GetOriginal<decltype(&hkEmitSound1)>(5);
-
-    if (*g_Options.soundhook_count) {
-        soundlist vv = GetCfgWavpathBySoundHash(nSoundEntryHash);
-
-        if (vv.cfgindex != -1)
-        {
-            Sounds ff = g_Options.models.value->arr[vv.cfgindex].sounds[vv.sndindex];
-            return ofunc(iff.g_pEngineSound, edx, filter, iEntIndex, iChannel, pSoundEntry, -1, ff.wavpath, ff.volume, nSeed, flAttenuation, 0, ff.pitch, pOrigin, pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity, unk);
-        }
-    }
-
-    return ofunc(iff.g_pEngineSound, edx, filter, iEntIndex, iChannel, pSoundEntry, nSoundEntryHash, pSample, flVolume, nSeed, flAttenuation, iFlags, iPitch, pOrigin, pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity, unk);
-
-}
-
- 
-
-VMTHook* DMEHook = nullptr;
-
-void replacemat(int d)
-{
-    IMaterial* material;
-
-    if (g_Options.materials.value->arr[d].customtextureselected != -1)
-        if (g_Options.customtextures.value->arr[g_Options.materials.value->arr[d].customtextureselected].texturelink != nullptr)
-            material = (IMaterial*)g_Options.customtextures.value->arr[g_Options.materials.value->arr[d].customtextureselected].texturelink;
-        else material = iff.g_pMaterialSystem->FindMaterial("__err", TEXTURE_GROUP_MODEL);
-    else
-        material = iff.g_pMaterialSystem->FindMaterial(g_Options.materials.value->arr[d].texture, TEXTURE_GROUP_MODEL);
-    material->SetMaterialVarFlag(MATERIAL_VAR_WIREFRAME, g_Options.materials.value->arr[d].wireframe);
-    material->SetMaterialVarFlag(MATERIAL_VAR_FLAT, g_Options.materials.value->arr[d].flat);
-    material->SetMaterialVarFlag(MATERIAL_VAR_NO_DRAW, g_Options.materials.value->arr[d].nodraw);
-    material->ColorModulate(g_Options.materials.value->arr[d].coloralpha.x, g_Options.materials.value->arr[d].coloralpha.y, g_Options.materials.value->arr[d].coloralpha.z);
-    material->AlphaModulate(g_Options.materials.value->arr[d].coloralpha.w);
-    iff.g_pMdlRender->ForcedMaterialOverride(material);
-}
-
-void __stdcall DrawModelExecute(IMatRenderContext* ctx, const DrawModelState_t& state, const ModelRenderInfo_t& pInfo, matrix3x4_t* pCustomBoneToWorld)
-{
-    static auto ofunc = DMEHook->GetOriginal<void(__thiscall*)(IVModelRender*, IMatRenderContext*, const DrawModelState_t&, const ModelRenderInfo_t&, matrix3x4_t*)>(21);
-
-    if (iff.g_pMdlRender->IsForcedMaterialOverride() || opt.loading || !*g_Options.dmeloop_count)
-        return ofunc(iff.g_pMdlRender, ctx, state, pInfo, pCustomBoneToWorld);
-
-
-    const char* szName = iff.g_pMdlInfo->GetModelName(pInfo.pModel);
-
-    if (g_Options.materials.value->arr[3].active)
-        if (strstr(szName, "player/legacy/t") != nullptr)
-            replacemat(3);
-
-    if (g_Options.materials.value->arr[4].active)
-        if (strstr(szName, "player/legacy/ct") != nullptr)
-            replacemat(4);
-
-    if (strstr(szName, "weapons/v_")) {
-        int namehash = fnv2::hashRuntime(szName);
-
-
-        bool is_arm = strstr(szName, "arms") != nullptr;
-        bool is_sleeve = strstr(szName, "sleeve") != nullptr;
-        bool is_wep = !is_arm && !is_sleeve;
-
-
-        for (int d = 0; d < g_Options.materials.value->itemcount; d++)
-        {
-
-            if (d == 1 && !is_arm) continue;
-            if (d == 2 && !is_sleeve) continue;
-            if (d == 0 && !is_wep) continue;
-
-            if (d == 3 || d == 4) continue;
-            if ((d > 2 && d != 5) && namehash != g_Options.materials.value->arr[d].model_hash) continue;
-
-            if (d == 5 && !strstr(szName, "knife")) continue;
-
-            if (g_Options.materials.value->arr[d].active) {
-                replacemat(d);
-            }
-        }
-    }
-
-    ofunc(iff.g_pMdlRender, ctx, state, pInfo, pCustomBoneToWorld);
-
-    iff.g_pMdlRender->ForcedMaterialOverride(nullptr);
-}
-
-
-
-VMTHook* CacheHook = nullptr;
-MDLHandle_t __fastcall hkFindMDL(void* ecx, void* edx, char* FilePath)
-{
-    static auto oFindMDL = CacheHook->GetOriginal<MDLHandle_t(__thiscall*)(void*, char*)>(10);
-
-
-    if (g_Options.models.value->arr[2].active && strstr(FilePath, "models/weapons/v_models/arms") && !strstr(FilePath, "gloves"))
-    {
-#ifdef DEBUG
-        printf("Replacing %s with %s\n", FilePath, g_Options.models.value->arr[2].vmodel_repl);
-#endif
-        sprintf(FilePath, g_Options.models.value->arr[2].vmodel_repl);
-    }
-
-    if (g_Options.models.value->arr[3].active && strstr(FilePath, "models/weapons/v_knife"))
-    {
-#ifdef DEBUG
-        printf("Replacing %s with %s\n", FilePath, g_Options.models.value->arr[3].vmodel_repl);
-#endif
-        sprintf(FilePath, g_Options.models.value->arr[3].vmodel_repl);
-    }
-
-    for (int i = 4; i < g_Options.models.value->itemcount; i++)
-    {
-        if (g_Options.models.value->arr[i].active && g_Options.models.value->arr[i].findMDLmethode && strstr(FilePath, g_Options.models.value->arr[i].vmodel_orig))
-        {
-#ifdef DEBUG
-            printf("Replacing %s with %s\n", FilePath, g_Options.models.value->arr[i].vmodel_repl);
-#endif
-            sprintf(FilePath, g_Options.models.value->arr[i].vmodel_repl);
-        }
-    }
-
-
-    return oFindMDL(ecx, FilePath);
-}
-
- 
-
-VMTHook* ClientModeHook = nullptr;
-static void __stdcall hkdoPostScreenEffects(void* param) noexcept
-{
-    static auto ofunc = ClientModeHook->GetOriginal<void(__thiscall*)(IClientMode*, void*)>(44);
-
-    if (*g_Options.entityloop_count) {
-        if (iff.g_pEngineClient->IsInGame())
-        {
-            int localplayer_index = iff.g_pEngineClient->GetLocalPlayer();
-            C_BasePlayer* localplayer = static_cast<C_BasePlayer*>(iff.g_pEntityList->GetClientEntity(localplayer_index));
-
-            for (int i = iff.g_pEngineClient->GetMaxClients() + 1; i <= iff.g_pEntityList->GetHighestEntityIndex(); ++i)
-            {
-                C_BasePlayer* pEntity = (C_BasePlayer*)iff.g_pEntityList->GetClientEntity(i);
-
-                if (!pEntity)
-                    continue;
-
-                bool bDormant = pEntity->IsDormant();
-
-                if (bDormant)
-                    continue;
-
-                int cfgindex = GetCfgIndexByClassId(fnv2::hashRuntime(pEntity->GetClientClass()->GetName()));
-
-                if (cfgindex != -1)
-                {
-                    if (g_Options.models.value->arr[cfgindex].active_scale)
-                        pEntity->GetModelScale() = g_Options.models.value->arr[cfgindex].scale;
-
-                    if (g_Options.models.value->arr[cfgindex].active_w)
-                    {
-                        char* model = g_Options.models.value->arr[cfgindex].wmodel_repl;
-                        pEntity->SetModelIndex(iff.g_pMdlInfo->GetModelIndex(model));
-                        if (const auto modelprecache = iff.g_pNetworkStringTableContainer->FindTable("modelprecache"))
-                            modelprecache->AddString(false, model);
-                    }
-                }
-            }
-        }
-    }
-
-    ofunc(iff.g_ClientMode, param);
-}
-
-
-VMTHook* VGUISurfHook = nullptr;
-void __fastcall hkLockCursor(void* _this)
-{
-    static auto ofunc = VGUISurfHook->GetOriginal<decltype(&hkLockCursor)>(67);
-
-    if (opt.show) {
-        iff.g_pVGuiSurface->UnlockCursor();
-        iff.g_pInputSystem->ResetInputState();
-        return;
-    }
-
-    ofunc(iff.g_pVGuiSurface);
-}
-
-
-VMTHook* FileSystemHook = nullptr;
-
-int __stdcall hkGetUnverifiedFileHashes(void* _this, void* someclass, int nMaxFiles)
-{
-    return 0;
-}
\ No newline at end of file
diff --git a/SpyCustom/IAppSystem.h b/SpyCustom/IAppSystem.h
deleted file mode 100644
index 4c620c7..0000000
--- a/SpyCustom/IAppSystem.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef IAPPSYSTEM_H
-#define IAPPSYSTEM_H
-
-#ifdef COMPILER_MSVC
-#pragma once
-#endif
-
-#include "interface.h"
-
-
-
-struct AppSystemInfo_t
-{
-	const char* m_pModuleName;
-	const char* m_pInterfaceName;
-};
-
-
-enum InitReturnVal_t
-{
-	INIT_FAILED = 0,
-	INIT_OK,
-
-	INIT_LAST_VAL,
-};
-
-enum AppSystemTier_t
-{
-	APP_SYSTEM_TIER0 = 0,
-	APP_SYSTEM_TIER1,
-	APP_SYSTEM_TIER2,
-	APP_SYSTEM_TIER3,
-
-	APP_SYSTEM_TIER_OTHER,
-};
-
-
-abstract_class IAppSystem
-{
-public:
-	virtual bool Connect(CreateInterfaceFn factory) = 0;		
-	virtual void Disconnect() = 0;								
-
-	virtual void* QueryInterface(const char* pInterfaceName) = 0;
-
-	virtual InitReturnVal_t Init() = 0;								
-	virtual void Shutdown() = 0;								
-
-	virtual const AppSystemInfo_t* GetDependencies() { return NULL; }
-
-	virtual AppSystemTier_t GetTier() { return APP_SYSTEM_TIER_OTHER; }								
-
-	virtual void Reconnect(CreateInterfaceFn factory, const char* pInterfaceName) {}								
-	virtual bool IsSingleton() { return true; }								
-};
-
-
-template< class IInterface >
-class CBaseAppSystem : public IInterface
-{
-public:
-	virtual bool Connect(CreateInterfaceFn factory) { return true; }
-	virtual void Disconnect() {}
-
-	virtual void* QueryInterface(const char* pInterfaceName) { return NULL; }
-
-	virtual InitReturnVal_t Init() { return INIT_OK; }
-	virtual void Shutdown() {}
-
-	virtual const AppSystemInfo_t* GetDependencies() { return NULL; }
-	virtual AppSystemTier_t GetTier() { return APP_SYSTEM_TIER_OTHER; }
-
-	virtual void Reconnect(CreateInterfaceFn factory, const char* pInterfaceName);
-};
-
-
-template< class IInterface >
-class CTier0AppSystem : public CBaseAppSystem< IInterface >
-{
-};
-
-
-#endif  
-
diff --git a/SpyCustom/IBorder.h b/SpyCustom/IBorder.h
deleted file mode 100644
index cd64c84..0000000
--- a/SpyCustom/IBorder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef IBORDER_H
-#define IBORDER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-
-class KeyValues;
-
-namespace vgui
-{
-
-	class IScheme;
-
-	class IBorder
-	{
-	public:
-		IBorder() {}
-		virtual ~IBorder() {}
-
-		virtual void Paint(VPANEL panel) = 0;
-		virtual void Paint(int x0, int y0, int x1, int y1) = 0;
-		virtual void Paint(int x0, int y0, int x1, int y1, int breakSide, int breakStart, int breakStop) = 0;
-		virtual void SetInset(int left, int top, int right, int bottom) = 0;
-		virtual void GetInset(int& left, int& top, int& right, int& bottom) = 0;
-		virtual void ApplySchemeSettings(IScheme* pScheme, KeyValues* inResourceData) = 0;
-		virtual const char* GetName() = 0;
-		virtual void SetName(const char* name) = 0;
-
-		enum backgroundtype_e
-		{
-			BACKGROUND_FILLED,
-			BACKGROUND_TEXTURED,
-			BACKGROUND_ROUNDEDCORNERS,
-		};
-		virtual backgroundtype_e GetBackgroundType() = 0;
-
-		enum sides_e
-		{
-			SIDE_LEFT = 0,
-			SIDE_TOP = 1,
-			SIDE_RIGHT = 2,
-			SIDE_BOTTOM = 3
-		};
-
-		virtual bool PaintFirst(void) = 0;
-	};
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IClientLeafSystem.h b/SpyCustom/IClientLeafSystem.h
deleted file mode 100644
index 8a3477f..0000000
--- a/SpyCustom/IClientLeafSystem.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#if !defined( ICLIENTLEAFSYSTEM_H )
-#define ICLIENTLEAFSYSTEM_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "platform.h"
-#include "client_render_handle.h"
-#include "ivmodelinfo.h"
-
-
-#define CLIENTLEAFSYSTEM_INTERFACE_VERSION	"ClientLeafSystem002"
-
-
-enum RenderableModelType_t
-{
-	RENDERABLE_MODEL_UNKNOWN_TYPE = -1,
-	RENDERABLE_MODEL_ENTITY = 0,
-	RENDERABLE_MODEL_STUDIOMDL,
-	RENDERABLE_MODEL_STATIC_PROP,
-	RENDERABLE_MODEL_BRUSH,
-};
-
-enum RenderGroup_t
-{
-	RENDER_GROUP_OPAQUE = 0,
-	RENDER_GROUP_TRANSLUCENT,
-	RENDER_GROUP_TRANSLUCENT_IGNOREZ,
-	RENDER_GROUP_COUNT,             
-};
-
-
-abstract_class IClientLeafSystemEngine
-{
-public:
-	virtual void CreateRenderableHandle(IClientRenderable* pRenderable, bool bRenderWithViewModels, RenderableTranslucencyType_t nType, RenderableModelType_t nModelType, UINT32 nSplitscreenEnabled = 0xFFFFFFFF) = 0;      
-	virtual void RemoveRenderable(ClientRenderHandle_t handle) = 0;
-	virtual void AddRenderableToLeaves(ClientRenderHandle_t renderable, int nLeafCount, unsigned short* pLeaves) = 0;
-	virtual void SetTranslucencyType(ClientRenderHandle_t handle, RenderableTranslucencyType_t nType) = 0;
-
-};
-
-
-#endif	 
-
-
-
-
-
-
-
diff --git a/SpyCustom/IClientPanel.h b/SpyCustom/IClientPanel.h
deleted file mode 100644
index 8146330..0000000
--- a/SpyCustom/IClientPanel.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef ICLIENTPANEL_H
-#define ICLIENTPANEL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
-
-class KeyValues;
-
-namespace vgui
-{
-
-	class Panel;
-	class SurfaceBase;
-
-	enum EInterfaceID
-	{
-		ICLIENTPANEL_STANDARD_INTERFACE = 0,
-	};
-
-	class IClientPanel
-	{
-	public:
-		virtual VPANEL GetVPanel() = 0;
-
-		virtual void Think() = 0;
-		virtual void PerformApplySchemeSettings() = 0;
-		virtual void PaintTraverse(bool forceRepaint, bool allowForce) = 0;
-		virtual void Repaint() = 0;
-		virtual VPANEL IsWithinTraverse(int x, int y, bool traversePopups) = 0;
-		virtual void GetInset(int& top, int& left, int& right, int& bottom) = 0;
-		virtual void GetClipRect(int& x0, int& y0, int& x1, int& y1) = 0;
-		virtual void OnChildAdded(VPANEL child) = 0;
-		virtual void OnSizeChanged(int newWide, int newTall) = 0;
-
-		virtual void InternalFocusChanged(bool lost) = 0;
-		virtual bool RequestInfo(KeyValues* outputData) = 0;
-		virtual void RequestFocus(int direction) = 0;
-		virtual bool RequestFocusPrev(VPANEL existingPanel) = 0;
-		virtual bool RequestFocusNext(VPANEL existingPanel) = 0;
-		virtual void OnMessage(const KeyValues* params, VPANEL ifromPanel) = 0;
-		virtual VPANEL GetCurrentKeyFocus() = 0;
-		virtual int GetTabPosition() = 0;
-
-		virtual const char* GetName() = 0;
-		virtual const char* GetClassName() = 0;
-
-		virtual HScheme GetScheme() = 0;
-		virtual bool IsProportional() = 0;
-		virtual bool IsAutoDeleteSet() = 0;
-		virtual void DeletePanel() = 0;
-
-		virtual void* QueryInterface(EInterfaceID id) = 0;
-
-		virtual Panel* GetPanel() = 0;
-
-		virtual const char* GetModuleName() = 0;
-
-		virtual void OnTick() = 0;
-	};
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ICollideable.h b/SpyCustom/ICollideable.h
deleted file mode 100644
index 6076418..0000000
--- a/SpyCustom/ICollideable.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef ENGINE_ICOLLIDEABLE_H
-#define ENGINE_ICOLLIDEABLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-enum SolidType_t;
-class IHandleEntity;
-struct Ray_t;
-struct model_t;
-class Vector;
-class QAngle;
-class CGameTrace;
-typedef CGameTrace trace_t;
-class IClientUnknown;
-
-
-abstract_class ICollideable
-{
-public:
-	virtual IHandleEntity * GetEntityHandle() = 0;
-
-	virtual const Vector& OBBMinsPreScaled() const = 0;
-	virtual const Vector& OBBMaxsPreScaled() const = 0;
-	virtual const Vector& OBBMins() const = 0;
-	virtual const Vector& OBBMaxs() const = 0;
-
-	virtual void			WorldSpaceTriggerBounds(Vector* pVecWorldMins, Vector* pVecWorldMaxs) const = 0;
-
-	virtual bool			TestCollision(const Ray_t& ray, unsigned int fContentsMask, trace_t& tr) = 0;
-
-	virtual bool			TestHitboxes(const Ray_t& ray, unsigned int fContentsMask, trace_t& tr) = 0;
-
-	virtual int				GetCollisionModelIndex() = 0;
-
-	virtual const model_t* GetCollisionModel() = 0;
-
-	virtual const Vector& GetCollisionOrigin() const = 0;
-	virtual const QAngle& GetCollisionAngles() const = 0;
-	virtual const matrix3x4_t& CollisionToWorldTransform() const = 0;
-
-	virtual SolidType_t		GetSolid() const = 0;
-	virtual int				GetSolidFlags() const = 0;
-
-	virtual IClientUnknown* GetIClientUnknown() = 0;
-
-	virtual int				GetCollisionGroup() const = 0;
-
-	virtual void			WorldSpaceSurroundingBounds(Vector* pVecMins, Vector* pVecMaxs) = 0;
-
-	virtual bool			ShouldTouchTrigger(int triggerSolidFlags) const = 0;
-
-	virtual const matrix3x4_t* GetRootParentToWorldTransform() const = 0;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IColorCorrection.h b/SpyCustom/IColorCorrection.h
deleted file mode 100644
index 3035101..0000000
--- a/SpyCustom/IColorCorrection.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef ICOLORCORRECTION_H
-#define ICOLORCORRECTION_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "imageformat.h"
-
-typedef unsigned int ColorCorrectionHandle_t;
-struct ShaderColorCorrectionInfo_t;
-
-#define COLORCORRECTION_INTERFACE_VERSION "COLORCORRECTION_VERSION_1"
-
-abstract_class IColorCorrectionSystem
-{
-public:
-	virtual void Init() = 0;
-	virtual void Shutdown() = 0;
-
-	virtual ColorCorrectionHandle_t AddLookup(const char* pName) = 0;
-	virtual bool RemoveLookup(ColorCorrectionHandle_t handle) = 0;
-
-	virtual void  SetLookupWeight(ColorCorrectionHandle_t handle, float flWeight) = 0;
-	virtual float GetLookupWeight(ColorCorrectionHandle_t handle) = 0;
-	virtual float GetLookupWeight(int i) = 0;
-
-	virtual void LockLookup() = 0;
-	virtual void LockLookup(ColorCorrectionHandle_t handle) = 0;
-
-	virtual void UnlockLookup() = 0;
-	virtual void UnlockLookup(ColorCorrectionHandle_t handle) = 0;
-
-	virtual void SetLookup(RGBX5551_t inColor, color24 outColor) = 0;
-	virtual void SetLookup(ColorCorrectionHandle_t handle, RGBX5551_t inColor, color24 outColor) = 0;
-
-	virtual color24 GetLookup(RGBX5551_t inColor) = 0;
-	virtual color24 GetLookup(ColorCorrectionHandle_t handle, RGBX5551_t inColor) = 0;
-
-	virtual void LoadLookup(const char* pLookupName) = 0;
-	virtual void LoadLookup(ColorCorrectionHandle_t handle, const char* pLookupName) = 0;
-
-	virtual void CopyLookup(const color24* pSrcColorCorrection) = 0;
-	virtual void CopyLookup(ColorCorrectionHandle_t handle, const color24* pSrcColorCorrection) = 0;
-
-	virtual void ResetLookup(ColorCorrectionHandle_t handle) = 0;
-	virtual void ResetLookup() = 0;
-
-	virtual void ReleaseTextures() = 0;
-	virtual void RestoreTextures() = 0;
-
-	virtual void ResetLookupWeights() = 0;
-
-	virtual int GetNumLookups() = 0;
-
-	virtual color24 ConvertToColor24(RGBX5551_t inColor) = 0;
-
-	virtual void SetResetable(ColorCorrectionHandle_t handle, bool bResetable) = 0;
-
-	virtual void EnableColorCorrection(bool bEnable) = 0;
-
-	virtual void GetCurrentColorCorrection(ShaderColorCorrectionInfo_t* pInfo) = 0;
-};
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/IEffects.h b/SpyCustom/IEffects.h
deleted file mode 100644
index d1e65eb..0000000
--- a/SpyCustom/IEffects.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef IEFFECTS_H
-#define IEFFECTS_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "basetypes.h"
-#include "vector.h"
-#include "interface.h"
-#include "ipredictionsystem.h"
-
-enum ShakeCommand_t;
-class Vector;
-class CGameTrace;
-typedef CGameTrace trace_t;
-
-
-#define IEFFECTS_INTERFACE_VERSION	"IEffects001"
-abstract_class IEffects : public IPredictionSystem
-{
-public:
-	virtual ~IEffects() {};
-	virtual void Beam(const Vector & Start, const Vector & End, int nModelIndex,
-		int nHaloIndex, unsigned char frameStart, unsigned char frameRate,
-		float flLife, unsigned char width, unsigned char endWidth, unsigned char fadeLength,
-		unsigned char noise, unsigned char red, unsigned char green,
-		unsigned char blue, unsigned char brightness, unsigned char speed) = 0;
-
-	virtual void Smoke(const Vector& origin, int modelIndex, float scale, float framerate) = 0;
-
-	virtual void Sparks(const Vector& position, int nMagnitude = 1, int nTrailLength = 1, const Vector* pvecDir = NULL) = 0;
-
-	virtual void Dust(const Vector& pos, const Vector& dir, float size, float speed) = 0;
-
-	virtual void MuzzleFlash(const Vector& vecOrigin, const Vector& vecAngles, float flScale, int iType) = 0; 
-
-	virtual void MetalSparks(const Vector& position, const Vector& direction) = 0;
-
-	virtual void EnergySplash(const Vector& position, const Vector& direction, bool bExplosive = false) = 0;
-
-	virtual void Ricochet(const Vector& position, const Vector& direction) = 0;
-
-	virtual float Time() = 0;
-	virtual bool IsServer() = 0;
-
-	virtual void SuppressEffectsSounds(bool bSuppress) = 0;
-};
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IEngineSound.h b/SpyCustom/IEngineSound.h
deleted file mode 100644
index f95fc9b..0000000
--- a/SpyCustom/IEngineSound.h
+++ /dev/null
@@ -1,123 +0,0 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose: Client-server neutral sound interface
-//
-// $NoKeywords: $
-//=============================================================================//
-
-#ifndef IENGINESOUND_H
-#define IENGINESOUND_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "basetypes.h"
-#include "interface.h"
-#include "soundflags.h"
-#include "irecipientfilter.h"
-#include "utlvector.h"
-#include "SndInfo.h"
-
-//-----------------------------------------------------------------------------
-// forward declaration
-//-----------------------------------------------------------------------------
-class Vector;
-
-// Handy defines for EmitSound
-#define SOUND_FROM_UI_PANEL			-2		// Sound being played inside a UI panel on the client
-#define SOUND_FROM_LOCAL_PLAYER		-1
-#define SOUND_FROM_WORLD			0
-
-
-
-// These are used to feed a soundlevel to the sound system and have it use
-// goldsrc-type attenuation. We should use this as little as possible and 
-// phase it out as soon as possible.
-
-// Take a regular sndlevel and convert it to compatibility mode.
-#define SNDLEVEL_TO_COMPATIBILITY_MODE( x )		((soundlevel_t)(int)( (x) + 256 ))
-
-// Take a compatibility-mode sndlevel and get the REAL sndlevel out of it.
-#define SNDLEVEL_FROM_COMPATIBILITY_MODE( x )	((soundlevel_t)(int)( (x) - 256 ))
-
-// Tells if the given sndlevel is marked as compatibility mode.
-#define SNDLEVEL_IS_COMPATIBILITY_MODE( x )		( (x) >= soundlevel_t(256) )
-
-
-
-//-----------------------------------------------------------------------------
-// Client-server neutral effects interface
-//-----------------------------------------------------------------------------
-#define IENGINESOUND_CLIENT_INTERFACE_VERSION	"IEngineSoundClient003"
-#define IENGINESOUND_SERVER_INTERFACE_VERSION	"IEngineSoundServer003"
-
-abstract_class IEngineSound
-{
-public:
-	// Precache a particular sample
-	virtual bool PrecacheSound(const char* pSample, bool bPreload = false, bool bIsUISound = false) = 0;
-	virtual bool IsSoundPrecached(const char* pSample) = 0;
-	virtual void PrefetchSound(const char* pSample) = 0;
-
-	// Just loads the file header and checks for duration (not hooked up for .mp3's yet)
-	// Is accessible to server and client though
-	virtual float GetSoundDuration(const char* pSample) = 0;
-
-	// Pitch of 100 is no pitch shift.  Pitch > 100 up to 255 is a higher pitch, pitch < 100
-	// down to 1 is a lower pitch.   150 to 70 is the realistic range.
-	// EmitSound with pitch != 100 should be used sparingly, as it's not quite as
-	// fast (the pitchshift mixer is not native coded).
-
-	// NOTE: setting iEntIndex to -1 will cause the sound to be emitted from the local
-	// player (client-side only)
-	virtual void EmitSound(IRecipientFilter& filter, int iEntIndex, int iChannel, const char* pSample,
-		float flVolume, float flAttenuation, int iFlags = 0, int iPitch = PITCH_NORM, int iSpecialDSP = 0,
-		const Vector* pOrigin = NULL, const Vector* pDirection = NULL, CUtlVector< Vector >* pUtlVecOrigins = NULL, bool bUpdatePositions = true, float soundtime = 0.0f, int speakerentity = -1) = 0;
-
-	virtual void EmitSound(IRecipientFilter& filter, int iEntIndex, int iChannel, const char* pSample,
-		float flVolume, soundlevel_t iSoundlevel, int iFlags = 0, int iPitch = PITCH_NORM, int iSpecialDSP = 0,
-		const Vector* pOrigin = NULL, const Vector* pDirection = NULL, CUtlVector< Vector >* pUtlVecOrigins = NULL, bool bUpdatePositions = true, float soundtime = 0.0f, int speakerentity = -1) = 0;
-
-	virtual void EmitSentenceByIndex(IRecipientFilter& filter, int iEntIndex, int iChannel, int iSentenceIndex,
-		float flVolume, soundlevel_t iSoundlevel, int iFlags = 0, int iPitch = PITCH_NORM,int iSpecialDSP = 0,
-		const Vector* pOrigin = NULL, const Vector* pDirection = NULL, CUtlVector< Vector >* pUtlVecOrigins = NULL, bool bUpdatePositions = true, float soundtime = 0.0f, int speakerentity = -1) = 0;
-
-	virtual void StopSound(int iEntIndex, int iChannel, const char* pSample) = 0;
-
-	// stop all active sounds (client only)
-	virtual void StopAllSounds(bool bClearBuffers) = 0;
-
-	// Set the room type for a player (client only)
-	virtual void SetRoomType(IRecipientFilter& filter, int roomType) = 0;
-
-	// Set the dsp preset for a player (client only)
-	virtual void SetPlayerDSP(IRecipientFilter& filter, int dspType, bool fastReset) = 0;
-
-	// emit an "ambient" sound that isn't spatialized
-	// only available on the client, assert on server
-	virtual void EmitAmbientSound(const char* pSample, float flVolume, int iPitch = PITCH_NORM, int flags = 0, float soundtime = 0.0f) = 0;
-
-
-	//	virtual EntChannel_t	CreateEntChannel() = 0;
-
-		virtual float GetDistGainFromSoundLevel(soundlevel_t soundlevel, float dist) = 0;
-
-		// Client .dll only functions
-		virtual int		GetGuidForLastSoundEmitted() = 0;
-		virtual bool	IsSoundStillPlaying(int guid) = 0;
-		virtual void	StopSoundByGuid(int guid) = 0;
-		// Set's master volume (0.0->1.0)
-		virtual void	SetVolumeByGuid(int guid, float fvol) = 0;
-
-		// Retrieves list of all active sounds
-		virtual void	GetActiveSounds(CUtlVector< SndInfo_t >& sndlist) = 0;
-
-		virtual void	PrecacheSentenceGroup(const char* pGroupName) = 0;
-		virtual void	NotifyBeginMoviePlayback() = 0;
-		virtual void	NotifyEndMoviePlayback() = 0;
-};
-
-
-#endif // IENGINESOUND_H
\ No newline at end of file
diff --git a/SpyCustom/IEngineVgui.h b/SpyCustom/IEngineVgui.h
deleted file mode 100644
index 171d069..0000000
--- a/SpyCustom/IEngineVgui.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#if !defined( IENGINEVGUI_H )
-#define IENGINEVGUI_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "VGUI.h"
-
-namespace vgui
-{
-	class Panel;
-};
-
-enum VGuiPanel_t
-{
-	PANEL_ROOT = 0,
-	PANEL_GAMEUIDLL,
-	PANEL_CLIENTDLL,
-	PANEL_TOOLS,
-	PANEL_INGAMESCREENS,
-	PANEL_GAMEDLL,
-	PANEL_CLIENTDLL_TOOLS
-};
-
-enum PaintMode_t
-{
-	PAINT_UIPANELS = (1 << 0),
-	PAINT_INGAMEPANELS = (1 << 1),
-	PAINT_CURSOR = (1 << 2),     
-};
-
-abstract_class IEngineVGui
-{
-public:
-	virtual					~IEngineVGui(void) { }
-
-	virtual vgui::VPANEL	GetPanel(VGuiPanel_t type) = 0;
-
-	virtual bool			IsGameUIVisible() = 0;
-};
-
-#define VENGINE_VGUI_VERSION	"VEngineVGui001"
-
-#if defined(_STATIC_LINKED) && defined(CLIENT_DLL)
-namespace Client
-{
-	extern IEngineVGui* enginevgui;
-}
-#else
-extern IEngineVGui* g_pEnginevgui;
-#endif
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IGameSystem.h b/SpyCustom/IGameSystem.h
deleted file mode 100644
index 05f1777..0000000
--- a/SpyCustom/IGameSystem.h
+++ /dev/null
@@ -1,186 +0,0 @@
-#ifndef IGAMESYSTEM_H
-#define IGAMESYSTEM_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-class IGameSystem
-{
-public:
-	virtual char const* Name() = 0;
-
-	virtual bool Init() = 0;
-	virtual void PostInit() = 0;
-	virtual void Shutdown() = 0;
-
-	virtual void LevelInitPreEntity() = 0;
-	virtual void LevelInitPostEntity() = 0;
-
-	virtual void LevelShutdownPreClearSteamAPIContext() {};
-	virtual void LevelShutdownPreEntity() = 0;
-	virtual void LevelShutdownPostEntity() = 0;
-	virtual void OnSave() = 0;
-
-	virtual void OnRestore() = 0;
-
-	virtual void SafeRemoveIfDesired() = 0;
-
-	virtual bool	IsPerFrame() = 0;
-
-	virtual ~IGameSystem();
-
-	static char const* MapName();
-
-	static void Add(IGameSystem* pSys);
-	static void Remove(IGameSystem* pSys);
-	static void RemoveAll();
-
-	static bool InitAllSystems();
-	static void PostInitAllSystems();
-	static void ShutdownAllSystems();
-	static void LevelInitPreEntityAllSystems(char const* pMapName);
-	static void LevelInitPostEntityAllSystems();
-	static void LevelShutdownPreClearSteamAPIContextAllSystems();     
-	static void LevelShutdownPreEntityAllSystems();
-	static void LevelShutdownPostEntityAllSystems();
-
-	static void OnSaveAllSystems();
-	static void OnRestoreAllSystems();
-
-	static void SafeRemoveIfDesiredAllSystems();
-
-#ifdef CLIENT_DLL
-	static void PreRenderAllSystems();
-	static void UpdateAllSystems(float frametime);
-	static void PostRenderAllSystems();
-#else
-	static void FrameUpdatePreEntityThinkAllSystems();
-	static void FrameUpdatePostEntityThinkAllSystems();
-	static void PreClientUpdateAllSystems();
-
-	static CBasePlayer* RunCommandPlayer();
-	static CUserCmd* RunCommandUserCmd();
-#endif
-};
-
-class IGameSystemPerFrame : public IGameSystem
-{
-public:
-	virtual ~IGameSystemPerFrame();
-
-#ifdef CLIENT_DLL
-	virtual void PreRender() = 0;
-
-	virtual void Update(float frametime) = 0;
-
-	virtual void PostRender() = 0;
-#else
-	virtual void FrameUpdatePreEntityThink() = 0;
-	virtual void FrameUpdatePostEntityThink() = 0;
-	virtual void PreClientUpdate() = 0;
-#endif
-};
-
-class CBaseGameSystem : public IGameSystem
-{
-public:
-
-	virtual char const* Name() { return "unnamed"; }
-
-	virtual bool Init() { return true; }
-	virtual void PostInit() {}
-	virtual void Shutdown() {}
-
-	virtual void LevelInitPreEntity() {}
-	virtual void LevelInitPostEntity() {}
-	virtual void LevelShutdownPreClearSteamAPIContext() {}
-	virtual void LevelShutdownPreEntity() {}
-	virtual void LevelShutdownPostEntity() {}
-
-	virtual void OnSave() {}
-	virtual void OnRestore() {}
-	virtual void SafeRemoveIfDesired() {}
-
-	virtual bool	IsPerFrame() { return false; }
-private:
-
-#ifdef CLIENT_DLL
-	virtual void PreRender() {}
-
-	virtual void Update(float frametime) {}
-
-	virtual void PostRender() {}
-#else
-	virtual void FrameUpdatePreEntityThink() {}
-	virtual void FrameUpdatePostEntityThink() {}
-	virtual void PreClientUpdate() {}
-#endif
-};
-
-class CBaseGameSystemPerFrame : public IGameSystemPerFrame
-{
-public:
-	virtual char const* Name() { return "unnamed"; }
-
-	virtual bool Init() { return true; }
-	virtual void PostInit() {}
-	virtual void Shutdown() {}
-
-	virtual void LevelInitPreEntity() {}
-	virtual void LevelInitPostEntity() {}
-	virtual void LevelShutdownPreClearSteamAPIContext() {}
-	virtual void LevelShutdownPreEntity() {}
-	virtual void LevelShutdownPostEntity() {}
-
-	virtual void OnSave() {}
-	virtual void OnRestore() {}
-	virtual void SafeRemoveIfDesired() {}
-
-	virtual bool	IsPerFrame() { return true; }
-
-#ifdef CLIENT_DLL
-	virtual void PreRender() { }
-
-	virtual void Update(float frametime) { }
-
-	virtual void PostRender() { }
-#else
-	virtual void FrameUpdatePreEntityThink() { }
-	virtual void FrameUpdatePostEntityThink() { }
-	virtual void PreClientUpdate() { }
-#endif
-};
-
-class CAutoGameSystem : public CBaseGameSystem
-{
-public:
-	CAutoGameSystem(char const* name = NULL);	         
-	CAutoGameSystem* m_pNext;
-
-	virtual char const* Name() { return m_pszName ? m_pszName : "unnamed"; }
-
-private:
-	char const* m_pszName;
-};
-
-class CAutoGameSystemPerFrame : public CBaseGameSystemPerFrame
-{
-public:
-	CAutoGameSystemPerFrame(char const* name = NULL);
-	CAutoGameSystemPerFrame* m_pNext;
-
-	virtual char const* Name() { return m_pszName ? m_pszName : "unnamed"; }
-
-private:
-	char const* m_pszName;
-};
-
-
-class IToolFrameworkServer
-{
-public:
-	virtual void PreSetupVisibility() = 0;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IGameUI.h b/SpyCustom/IGameUI.h
deleted file mode 100644
index c156532..0000000
--- a/SpyCustom/IGameUI.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef IGAMEUI_H
-#define IGAMEUI_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "IPanel.h"
-
-#if !defined( _X360 )
-#include "xboxstubs.h"
-#endif
-
-enum ESteamLoginFailure
-{
-	STEAMLOGINFAILURE_NONE,
-	STEAMLOGINFAILURE_BADTICKET,
-	STEAMLOGINFAILURE_NOSTEAMLOGIN,
-	STEAMLOGINFAILURE_VACBANNED,
-	STEAMLOGINFAILURE_LOGGED_IN_ELSEWHERE
-};
-
-enum ESystemNotify
-{
-	SYSTEMNOTIFY_STORAGEDEVICES_CHANGED,
-	SYSTEMNOTIFY_USER_SIGNEDIN,
-	SYSTEMNOTIFY_USER_SIGNEDOUT,
-	SYSTEMNOTIFY_XUIOPENING,
-	SYSTEMNOTIFY_XUICLOSED,
-	SYSTEMNOTIFY_INVITE_SHUTDOWN,	       
-};
-
-abstract_class IGameUI
-{
-public:
-	virtual void Initialize(CreateInterfaceFn appFactory) = 0;
-	virtual void PostInit() = 0;
-
-	virtual void Connect(CreateInterfaceFn gameFactory) = 0;
-
-	virtual void Start() = 0;
-	virtual void Shutdown() = 0;
-	virtual void RunFrame() = 0;
-
-	virtual void OnGameUIActivated() = 0;
-	virtual void OnGameUIHidden() = 0;
-
-	virtual void OLD_OnConnectToServer(const char* game, int IP, int port) = 0;
-
-	virtual void OnDisconnectFromServer_OLD(uint8 eSteamLoginFailure, const char* username) = 0;
-	virtual void OnLevelLoadingStarted(bool bShowProgressDialog) = 0;
-	virtual void OnLevelLoadingFinished(bool bError, const char* failureReason, const char* extendedReason) = 0;
-
-	virtual bool UpdateProgressBar(float progress, const char* statusText) = 0;
-	virtual bool SetShowProgressText(bool show) = 0;
-
-	virtual void ShowNewGameDialog(int chapter) = 0;
-
-	virtual void SessionNotification(const int notification, const int param = 0) = 0;
-	virtual void SystemNotification(const int notification) = 0;
-	virtual void ShowMessageDialog(const uint nType, vgui::Panel* pOwner) = 0;
-	virtual void UpdatePlayerInfo(uint64 nPlayerId, const char* pName, int nTeam, byte cVoiceState, int nPlayersNeeded, bool bHost) = 0;
-	virtual void SessionSearchResult(int searchIdx, void* pHostData, XSESSION_SEARCHRESULT* pResult, int ping) = 0;
-	virtual void OnCreditsFinished(void) = 0;
-
-	virtual void SetLoadingBackgroundDialog(vgui::VPANEL panel) = 0;
-
-	virtual void BonusMapUnlock(const char* pchFileName = NULL, const char* pchMapName = NULL) = 0;
-	virtual void BonusMapComplete(const char* pchFileName = NULL, const char* pchMapName = NULL) = 0;
-	virtual void BonusMapChallengeUpdate(const char* pchFileName, const char* pchMapName, const char* pchChallengeName, int iBest) = 0;
-	virtual void BonusMapChallengeNames(char* pchFileName, char* pchMapName, char* pchChallengeName) = 0;
-	virtual void BonusMapChallengeObjectives(int& iBronze, int& iSilver, int& iGold) = 0;
-	virtual void BonusMapDatabaseSave(void) = 0;
-	virtual int BonusMapNumAdvancedCompleted(void) = 0;
-	virtual void BonusMapNumMedals(int piNumMedals[3]) = 0;
-
-	virtual void OnConnectToServer2(const char* game, int IP, int connectionPort, int queryPort) = 0;
-
-	virtual bool ValidateStorageDevice(int* pStorageDeviceValidated) = 0;
-
-	virtual void SetProgressOnStart() = 0;
-	virtual void OnDisconnectFromServer(uint8 eSteamLoginFailure) = 0;
-
-	virtual void OnConfirmQuit(void) = 0;
-
-	virtual bool IsMainMenuVisible(void) = 0;
-
-	virtual void SetMainMenuOverride(vgui::VPANEL panel) = 0;
-	virtual void SendMainMenuCommand(const char* pszCommand) = 0;
-};
-
-#define GAMEUI_INTERFACE_VERSION "GameUI011"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IHTML.h b/SpyCustom/IHTML.h
deleted file mode 100644
index 8bbf4f1..0000000
--- a/SpyCustom/IHTML.h
+++ /dev/null
@@ -1,151 +0,0 @@
-#ifndef IHTML_H
-#define IHTML_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "MouseCode.h"
-#include "KeyCode.h"
-#include "Cursor.h"
-#include "IImage.h"
-
-namespace vgui
-{
-
-	class IHTML
-	{
-	public:
-		virtual void OpenURL(const char*) = 0;
-
-		virtual bool StopLoading() = 0;
-
-		virtual bool Refresh() = 0;
-
-		virtual bool Show(bool shown) = 0;
-
-		virtual const char* GetOpenedPage() = 0;
-
-		virtual void Obsolete_OnSize(int x, int y, int w, int h) = 0;
-
-		virtual void GetHTMLSize(int& wide, int& tall) = 0;
-
-
-		virtual void Clear() = 0;
-
-		virtual void AddText(const char* text) = 0;
-
-		enum MOUSE_STATE { UP, DOWN, MOVE, DBLCLICK };
-		virtual void Obsolete_OnMouse(MouseCode code, MOUSE_STATE s, int x, int y) = 0;
-		virtual void Obsolete_OnChar(wchar_t unichar) = 0;
-		virtual void Obsolete_OnKeyDown(KeyCode code) = 0;
-
-		virtual vgui::IImage* GetBitmap() = 0;
-		virtual void SetVisible(bool state) = 0;
-
-
-		virtual void SetSize(int wide, int tall) = 0;
-
-		virtual void OnMouse(MouseCode code, MOUSE_STATE s, int x, int y, bool bPopupMenuMenu) = 0;
-		virtual void OnChar(wchar_t unichar, bool bPopupMenu) = 0;
-		virtual void OnKeyDown(KeyCode code, bool bPopupMenu) = 0;
-
-		virtual void ScrollV(int nPixels) = 0;
-		virtual void ScrollH(int nPixels) = 0;
-		virtual void OnMouseWheeled(int delta, bool bPopupMenu) = 0;
-
-		virtual void OnKeyUp(KeyCode code, bool bPopupMenu) = 0;
-
-
-		virtual void PostURL(const char* pchURL, const char* pchPostData) = 0;
-
-		virtual void RunJavascript(const char* pchScript) = 0;
-
-		virtual void SetMousePosition(int x, int y, bool bPopupMenu) = 0;
-
-		virtual void SetUserAgentInfo(const wchar_t* pwchUserAgent) = 0;
-
-		virtual void AddHeader(const char* pchHeader, const char* pchValue) = 0;
-
-		virtual void SetFileDialogChoice(const char* pchFileName) = 0;
-
-		virtual void HidePopup() = 0;
-		virtual void SetHTMLFocus() = 0;
-		virtual void KillHTMLFocus() = 0;
-		virtual void HorizontalScrollBarSize(int& x, int& y, int& wide, int& tall) = 0;
-		virtual void VerticalScrollBarSize(int& x, int& y, int& wide, int& tall) = 0;
-		virtual int HorizontalScroll() = 0;
-		virtual int VerticalScroll() = 0;
-		virtual int HorizontalScrollMax() = 0;
-		virtual int VerticalScrollMax() = 0;
-		virtual bool IsHorizontalScrollBarVisible() = 0;
-		virtual bool IsVeritcalScrollBarVisible() = 0;
-		virtual void SetHorizontalScroll(int scroll) = 0;
-		virtual void SetVerticalScroll(int scroll) = 0;
-		virtual void ViewSource() = 0;
-		virtual void Copy() = 0;
-		virtual void Paste() = 0;
-
-		virtual bool IsIERender() = 0;
-		virtual void GetIDispatchPtr(void** pIDispatch) = 0;
-		virtual void GetHTMLScroll(int& top, int& left) = 0;
-	};
-
-
-	enum EWebPageLoadError
-	{
-		eLoadErrorNone = 0,
-		eMimeTypeNotSupported,         
-		eCacheMiss,                
-		eBadURL,        
-		eConnectionProblem,           
-		eProxyConnectionProblem,            
-
-		eLoadErrorUnknown,                   
-	};
-
-
-	class IHTMLEvents
-	{
-	public:
-		virtual bool Obsolete_OnStartURL(const char* url, const char* target, bool first) = 0;
-		virtual void Obsolete_OnFinishURL(const char* url) = 0;
-		virtual void Obsolete_OnProgressURL(long current, long maximum) = 0;
-		virtual void Obsolete_OnSetStatusText(const char* text) = 0;
-		virtual void Obsolete_OnUpdate() = 0;
-		virtual void Obsolete_OnLink() = 0;
-		virtual void Obsolete_OffLink() = 0;
-
-		virtual void OnURLChanged(const char* url, const char* pchPostData, bool bIsRedirect) = 0;
-		virtual void OnFinishRequest(const char* url, const char* pageTitle) = 0;
-
-		virtual bool OnStartRequestInternal(const char* url, const char* target, const char* pchPostData, bool bIsRedirect) = 0;
-
-		virtual void ShowPopup(int x, int y, int wide, int tall) = 0;
-		virtual void HidePopup() = 0;
-		virtual bool OnPopupHTMLWindow(const char* pchURL, int x, int y, int wide, int tall) = 0;
-		virtual void SetHTMLTitle(const char* pchTitle) = 0;
-		virtual void OnLoadingResource(const char* pchURL) = 0;
-		virtual void OnSetStatusText(const char* text) = 0;
-		virtual void OnSetCursor(vgui::CursorCode cursor) = 0;
-		virtual void OnFileLoadDialog(const char* pchTitle, const char* pchInitialFile) = 0;
-		virtual void OnShowToolTip(const char* pchText) = 0;
-		virtual void OnUpdateToolTip(const char* pchText) = 0;
-		virtual void OnHideToolTip() = 0;
-
-
-		virtual bool BOnCreateNewWindow(void** ppDispatch) = 0;
-		virtual void OnLink() = 0;
-		virtual void OffLink() = 0;
-		virtual void OnCloseWindow() = 0;
-		virtual void OnUpdate() = 0;
-		virtual void OnProgressRequest(long current, long maximum) = 0;
-
-		virtual bool OnOpenNewTab(const char* pchURL, bool bForeground) = 0;
-	};
-
-
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IImage.h b/SpyCustom/IImage.h
deleted file mode 100644
index 789fc43..0000000
--- a/SpyCustom/IImage.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef IIMAGE_H
-#define IIMAGE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-
-class Color;
-
-namespace vgui
-{
-
-	typedef unsigned long HTexture;
-
-	enum iimage_rotation_t
-	{
-		ROTATED_UNROTATED = 0,
-		ROTATED_CLOCKWISE_90,
-		ROTATED_ANTICLOCKWISE_90,
-		ROTATED_FLIPPED,
-	};
-
-	class IImage
-	{
-	public:
-		virtual void Paint() = 0;
-
-		virtual void SetPos(int x, int y) = 0;
-
-		virtual void GetContentSize(int& wide, int& tall) = 0;
-
-		virtual void GetSize(int& wide, int& tall) = 0;
-
-		virtual void SetSize(int wide, int tall) = 0;
-
-		virtual void SetColor(Color col) = 0;
-
-		virtual ~IImage() {}
-
-		virtual bool Evict() = 0;
-
-		virtual int GetNumFrames() = 0;
-		virtual void SetFrame(int nFrame) = 0;
-		virtual HTexture GetID() = 0;
-
-		virtual void SetRotation(int iRotation) = 0;
-	};
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IInput.h b/SpyCustom/IInput.h
deleted file mode 100644
index 462146f..0000000
--- a/SpyCustom/IInput.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#ifndef VGUI_IINPUT_H
-#define VGUI_IINPUT_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "interface.h"
-#include "MouseCode.h"
-#include "KeyCode.h"
-
-namespace vgui
-{
-
-	class Cursor;
-	typedef unsigned long HCursor;
-
-#define VGUI_GCS_COMPREADSTR                 0x0001
-#define VGUI_GCS_COMPREADATTR                0x0002
-#define VGUI_GCS_COMPREADCLAUSE              0x0004
-#define VGUI_GCS_COMPSTR                     0x0008
-#define VGUI_GCS_COMPATTR                    0x0010
-#define VGUI_GCS_COMPCLAUSE                  0x0020
-#define VGUI_GCS_CURSORPOS                   0x0080
-#define VGUI_GCS_DELTASTART                  0x0100
-#define VGUI_GCS_RESULTREADSTR               0x0200
-#define VGUI_GCS_RESULTREADCLAUSE            0x0400
-#define VGUI_GCS_RESULTSTR                   0x0800
-#define VGUI_GCS_RESULTCLAUSE                0x1000
-#define VGUI_CS_INSERTCHAR                   0x2000
-#define VGUI_CS_NOMOVECARET                  0x4000
-
-#define MESSAGE_CURSOR_POS -1
-#define MESSAGE_CURRENT_KEYFOCUS -2
-
-
-	class IInput : public IBaseInterface
-	{
-	public:
-		virtual void SetMouseFocus(VPANEL newMouseFocus) = 0;
-		virtual void SetMouseCapture(VPANEL panel) = 0;
-
-		virtual void GetKeyCodeText(KeyCode code, OUT_Z_BYTECAP(buflen) char* buf, int buflen) = 0;
-
-		virtual VPANEL GetFocus() = 0;
-		virtual VPANEL GetCalculatedFocus() = 0;          
-		virtual VPANEL GetMouseOver() = 0;		           
-
-		virtual void SetCursorPos(int x, int y) = 0;
-		virtual void GetCursorPos(int& x, int& y) = 0;
-		virtual bool WasMousePressed(MouseCode code) = 0;
-		virtual bool WasMouseDoublePressed(MouseCode code) = 0;
-		virtual bool IsMouseDown(MouseCode code) = 0;
-
-		virtual void SetCursorOveride(HCursor cursor) = 0;
-		virtual HCursor GetCursorOveride() = 0;
-
-		virtual bool WasMouseReleased(MouseCode code) = 0;
-		virtual bool WasKeyPressed(KeyCode code) = 0;
-		virtual bool IsKeyDown(KeyCode code) = 0;
-		virtual bool WasKeyTyped(KeyCode code) = 0;
-		virtual bool WasKeyReleased(KeyCode code) = 0;
-
-		virtual VPANEL GetAppModalSurface() = 0;
-		virtual void SetAppModalSurface(VPANEL panel) = 0;
-		virtual void ReleaseAppModalSurface() = 0;
-
-		virtual void GetCursorPosition(int& x, int& y) = 0;
-
-		virtual void SetIMEWindow(void* hwnd) = 0;
-		virtual void* GetIMEWindow() = 0;
-
-		virtual void OnChangeIME(bool forward) = 0;
-		virtual int  GetCurrentIMEHandle() = 0;
-		virtual int  GetEnglishIMEHandle() = 0;
-
-		virtual void GetIMELanguageName(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) wchar_t* buf, int unicodeBufferSizeInBytes) = 0;
-		virtual void GetIMELanguageShortCode(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) wchar_t* buf, int unicodeBufferSizeInBytes) = 0;
-
-		struct LanguageItem
-		{
-			wchar_t		shortname[4];
-			wchar_t		menuname[128];
-			int			handleValue;
-			bool		active;        
-		};
-
-		struct ConversionModeItem
-		{
-			wchar_t		menuname[128];
-			int			handleValue;
-			bool		active;         
-		};
-
-		struct SentenceModeItem
-		{
-			wchar_t		menuname[128];
-			int			handleValue;
-			bool		active;         
-		};
-
-		virtual int	 GetIMELanguageList(LanguageItem* dest, int destcount) = 0;
-		virtual int	 GetIMEConversionModes(ConversionModeItem* dest, int destcount) = 0;
-		virtual int	 GetIMESentenceModes(SentenceModeItem* dest, int destcount) = 0;
-
-		virtual void OnChangeIMEByHandle(int handleValue) = 0;
-		virtual void OnChangeIMEConversionModeByHandle(int handleValue) = 0;
-		virtual void OnChangeIMESentenceModeByHandle(int handleValue) = 0;
-
-		virtual void OnInputLanguageChanged() = 0;
-		virtual void OnIMEStartComposition() = 0;
-		virtual void OnIMEComposition(int flags) = 0;
-		virtual void OnIMEEndComposition() = 0;
-
-		virtual void OnIMEShowCandidates() = 0;
-		virtual void OnIMEChangeCandidates() = 0;
-		virtual void OnIMECloseCandidates() = 0;
-		virtual void OnIMERecomputeModes() = 0;
-
-		virtual int  GetCandidateListCount() = 0;
-		virtual void GetCandidate(int num, OUT_Z_BYTECAP(destSizeBytes) wchar_t* dest, int destSizeBytes) = 0;
-		virtual int  GetCandidateListSelectedItem() = 0;
-		virtual int  GetCandidateListPageSize() = 0;
-		virtual int  GetCandidateListPageStart() = 0;
-
-		virtual void SetCandidateWindowPos(int x, int y) = 0;
-
-		virtual bool GetShouldInvertCompositionString() = 0;
-		virtual bool CandidateListStartsAtOne() = 0;
-
-		virtual void SetCandidateListPageStart(int start) = 0;
-
-		virtual void SetMouseCaptureEx(VPANEL panel, MouseCode captureStartMouseCode) = 0;
-
-		virtual void RegisterKeyCodeUnhandledListener(VPANEL panel) = 0;
-		virtual void UnregisterKeyCodeUnhandledListener(VPANEL panel) = 0;
-
-		virtual void OnKeyCodeUnhandled(int keyCode) = 0;
-
-		virtual void	SetModalSubTree(VPANEL subTree, VPANEL unhandledMouseClickListener, bool restrictMessagesToSubTree = true) = 0;
-		virtual void	ReleaseModalSubTree() = 0;
-		virtual VPANEL	GetModalSubTree() = 0;
-
-		virtual void	SetModalSubTreeReceiveMessages(bool state) = 0;
-		virtual bool	ShouldModalSubTreeReceiveMessages() const = 0;
-
-		virtual VPANEL 	GetMouseCapture() = 0;
-	};
-
-#define VGUI_INPUT_INTERFACE_VERSION "VGUI_Input005"
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IKeyValuesSystem.h b/SpyCustom/IKeyValuesSystem.h
deleted file mode 100644
index c274bfc..0000000
--- a/SpyCustom/IKeyValuesSystem.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef VSTDLIB_IKEYVALUESSYSTEM_H
-#define VSTDLIB_IKEYVALUESSYSTEM_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vstdlib.h"
-
-typedef int HKeySymbol;
-#define INVALID_KEY_SYMBOL (-1)
-
-class IKeyValuesSystem
-{
-public:
-    virtual void RegisterSizeofKeyValues(int size) = 0;
-
-    virtual void* AllocKeyValuesMemory(int size) = 0;
-    virtual void FreeKeyValuesMemory(void* pMem) = 0;
-
-    virtual HKeySymbol GetSymbolForString(const char* name, bool bCreate = true) = 0;
-    virtual const char* GetStringForSymbol(HKeySymbol symbol) = 0;
-
-    virtual void AddKeyValuesToMemoryLeakList(void* pMem, HKeySymbol name) = 0;
-    virtual void RemoveKeyValuesFromMemoryLeakList(void* pMem) = 0;
-
-    virtual void SetKeyValuesExpressionSymbol(const char* name, bool bValue) = 0;
-    virtual bool GetKeyValuesExpressionSymbol(const char* name) = 0;
-
-    virtual HKeySymbol GetSymbolForStringCaseSensitive(HKeySymbol& hCaseInsensitiveSymbol, const char* name, bool bCreate = true) = 0;
-};
-
-VSTDLIB_INTERFACE IKeyValuesSystem* KeyValuesSystem();
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ILocalize.h b/SpyCustom/ILocalize.h
deleted file mode 100644
index dac0b38..0000000
--- a/SpyCustom/ILocalize.h
+++ /dev/null
@@ -1,371 +0,0 @@
-#ifndef ILOCALIZE_H
-#define ILOCALIZE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "IAppSystem.h"
-#include "KeyValues.h"
-
-#if !defined(_WCHAR_T_DEFINED) && !defined(GNUC)
-typedef unsigned short wchar_t;
-#define _WCHAR_T_DEFINED
-#endif
-
-
-typedef unsigned long StringIndex_t;
-const unsigned long INVALID_LOCALIZE_STRING_INDEX = (StringIndex_t)-1;
-
-abstract_class ILocalize
-{
-public:
-	virtual bool AddFile(const char* fileName, const char* pPathID = NULL, bool bIncludeFallbackSearchPaths = false) = 0;
-
-	virtual void RemoveAll() = 0;
-
-	virtual wchar_t* Find(char const* tokenName) = 0;
-
-	virtual StringIndex_t FindIndex(const char* tokenName) = 0;
-
-	virtual const char* GetNameByIndex(StringIndex_t index) = 0;
-	virtual wchar_t* GetValueByIndex(StringIndex_t index) = 0;
-
-	virtual StringIndex_t GetFirstStringIndex() = 0;
-	virtual StringIndex_t GetNextStringIndex(StringIndex_t index) = 0;
-
-	virtual void AddString(const char* tokenName, wchar_t* unicodeString, const char* fileName) = 0;
-
-	virtual void SetValueByIndex(StringIndex_t index, wchar_t* newValue) = 0;
-
-	virtual bool SaveToFile(const char* fileName) = 0;
-
-	virtual int GetLocalizationFileCount() = 0;
-	virtual const char* GetLocalizationFileName(int index) = 0;
-
-	virtual const char* GetFileNameByIndex(StringIndex_t index) = 0;
-
-	virtual void ReloadLocalizationFiles() = 0;
-
-	virtual const char* FindAsUTF8(const char* pchTokenName) = 0;
-
-	virtual void ConstructString(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) wchar_t* unicodeOutput, int unicodeBufferSizeInBytes, const char* tokenName, KeyValues* localizationVariables) = 0;
-	virtual void ConstructString(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) wchar_t* unicodeOutput, int unicodeBufferSizeInBytes, StringIndex_t unlocalizedTextSymbol, KeyValues* localizationVariables) = 0;
-
-	static int ConvertANSIToUnicode(const char* ansi, OUT_Z_BYTECAP(unicodeBufferSizeInBytes) wchar_t* unicode, int unicodeBufferSizeInBytes);
-
-	static int ConvertUnicodeToANSI(const wchar_t* unicode, OUT_Z_BYTECAP(ansiBufferSize) char* ansi, int ansiBufferSize);
-
-	template < typename T >
-	static void ConstructString(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) T* unicodeOuput, int unicodeBufferSizeInBytes, const T* formatString, int numFormatParameters, ...)
-	{
-		va_list argList;
-		va_start(argList, numFormatParameters);
-
-		ConstructStringVArgsInternal(unicodeOuput, unicodeBufferSizeInBytes, formatString, numFormatParameters, argList);
-
-		va_end(argList);
-	}
-
-	template < typename T >
-	static void ConstructStringVArgs(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) T* unicodeOuput, int unicodeBufferSizeInBytes, const T* formatString, int numFormatParameters, va_list argList)
-	{
-		ConstructStringVArgsInternal(unicodeOuput, unicodeBufferSizeInBytes, formatString, numFormatParameters, argList);
-	}
-
-	template < typename T >
-	static void ConstructString(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) T* unicodeOutput, int unicodeBufferSizeInBytes, const T* formatString, KeyValues* localizationVariables)
-	{
-		ConstructStringKeyValuesInternal(unicodeOutput, unicodeBufferSizeInBytes, formatString, localizationVariables);
-	}
-
-private:
-	static void ConstructStringVArgsInternal(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) char* unicodeOutput, int unicodeBufferSizeInBytes, const char* formatString, int numFormatParameters, va_list argList);
-	static void ConstructStringVArgsInternal(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) wchar_t* unicodeOutput, int unicodeBufferSizeInBytes, const wchar_t* formatString, int numFormatParameters, va_list argList);
-
-	static void ConstructStringKeyValuesInternal(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) char* unicodeOutput, int unicodeBufferSizeInBytes, const char* formatString, KeyValues* localizationVariables);
-	static void ConstructStringKeyValuesInternal(OUT_Z_BYTECAP(unicodeBufferSizeInBytes) wchar_t* unicodeOutput, int unicodeBufferSizeInBytes, const wchar_t* formatString, KeyValues* localizationVariables);
-};
-
-#ifdef GC
-
-typedef char locchar_t;
-
-#define loc_snprintf	Q_snprintf
-#define loc_sprintf_safe V_sprintf_safe
-#define loc_sncat		Q_strncat
-#define loc_scat_safe	V_strcat_safe
-#define loc_sncpy		Q_strncpy
-#define loc_scpy_safe	V_strcpy_safe
-#define loc_strlen		Q_strlen
-#define LOCCHAR( x )	x
-
-#else
-
-typedef wchar_t locchar_t;
-
-#define loc_snprintf	V_snwprintf
-#define loc_sprintf_safe V_swprintf_safe
-#define loc_sncat		V_wcsncat
-#define loc_scat_safe	V_wcscat_safe
-#define loc_sncpy		Q_wcsncpy
-#define loc_scpy_safe	V_wcscpy_safe
-#define loc_strlen		Q_wcslen
-#define LOCCHAR(x)		L ## x
-
-#endif
-
-template < typename T >
-class TypedKeyValuesStringHelper
-{
-public:
-	static const T* Read(KeyValues* pKeyValues, const char* pKeyName, const T* pDefaultValue);
-	static void	Write(KeyValues* pKeyValues, const char* pKeyName, const T* pValue);
-};
-
-template < >
-class TypedKeyValuesStringHelper<char>
-{
-public:
-	static const char* Read(KeyValues* pKeyValues, const char* pKeyName, const char* pDefaultValue) { return pKeyValues->GetString(pKeyName, pDefaultValue); }
-	static void Write(KeyValues* pKeyValues, const char* pKeyName, const char* pValue) { pKeyValues->SetString(pKeyName, pValue); }
-};
-
-template < >
-class TypedKeyValuesStringHelper<wchar_t>
-{
-public:
-	static const wchar_t* Read(KeyValues* pKeyValues, const char* pKeyName, const wchar_t* pDefaultValue) { return pKeyValues->GetWString(pKeyName, pDefaultValue); }
-	static void Write(KeyValues* pKeyValues, const char* pKeyName, const wchar_t* pValue) { pKeyValues->SetWString(pKeyName, pValue); }
-};
-
-template < typename T >
-class CLocalizedStringArg;
-
-template < typename T >
-class CLocalizedStringArgStringImpl
-{
-public:
-	enum { kIsValid = true };
-
-	CLocalizedStringArgStringImpl(const locchar_t* pStr) : m_pStr(pStr) { }
-
-	const locchar_t* GetLocArg() const { Assert(m_pStr); return m_pStr; }
-
-private:
-	const locchar_t* m_pStr;
-};
-
-template < typename T >
-class CLocalizedStringArg<T*> : public CLocalizedStringArgStringImpl<T>
-{
-public:
-	CLocalizedStringArg(const locchar_t* pStr) : CLocalizedStringArgStringImpl<T>(pStr) { }
-};
-
-template < typename T >
-class CLocalizedStringArgPrintfImpl
-{
-public:
-	enum { kIsValid = true };
-
-	CLocalizedStringArgPrintfImpl(T value, const locchar_t* loc_Format) { loc_snprintf(m_cBuffer, kBufferSize, loc_Format, value); }
-
-	const locchar_t* GetLocArg() const { return m_cBuffer; }
-
-private:
-	enum { kBufferSize = 128, };
-	locchar_t m_cBuffer[kBufferSize];
-};
-
-template < >
-class CLocalizedStringArg<uint16> : public CLocalizedStringArgPrintfImpl<uint16>
-{
-public:
-	CLocalizedStringArg(uint16 unValue) : CLocalizedStringArgPrintfImpl<uint16>(unValue, LOCCHAR("%u")) { }
-};
-
-template < >
-class CLocalizedStringArg<uint32> : public CLocalizedStringArgPrintfImpl<uint32>
-{
-public:
-	CLocalizedStringArg(uint32 unValue) : CLocalizedStringArgPrintfImpl<uint32>(unValue, LOCCHAR("%u")) { }
-};
-
-template < >
-class CLocalizedStringArg<uint64> : public CLocalizedStringArgPrintfImpl<uint64>
-{
-public:
-	CLocalizedStringArg(uint64 unValue) : CLocalizedStringArgPrintfImpl<uint64>(unValue, LOCCHAR("%llu")) { }
-};
-
-template < >
-class CLocalizedStringArg<float> : public CLocalizedStringArgPrintfImpl<float>
-{
-public:
-	CLocalizedStringArg(float fValue)
-		: CLocalizedStringArgPrintfImpl<float>(fValue,
-			fabsf(fValue) <= FLT_EPSILON || fabsf(fValue) >= 1.0f ? LOCCHAR("%.0f") : LOCCHAR("%.1f"))
-	{
-	}
-};
-
-class CConstructLocalizedString
-{
-public:
-	template < typename T >
-	CConstructLocalizedString(const locchar_t* loc_Format, T arg0)
-	{
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<T>::kIsValid);
-
-		m_loc_Buffer[0] = '\0';
-
-		if (loc_Format)
-		{
-			::ILocalize::ConstructString(m_loc_Buffer, sizeof(m_loc_Buffer), loc_Format, 1, CLocalizedStringArg<T>(arg0).GetLocArg());
-		}
-	}
-
-	template < typename T, typename U >
-	CConstructLocalizedString(const locchar_t* loc_Format, T arg0, U arg1)
-	{
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<T>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<U>::kIsValid);
-
-		m_loc_Buffer[0] = '\0';
-
-		if (loc_Format)
-		{
-			::ILocalize::ConstructString(m_loc_Buffer, sizeof(m_loc_Buffer), loc_Format, 2, CLocalizedStringArg<T>(arg0).GetLocArg(), CLocalizedStringArg<U>(arg1).GetLocArg());
-		}
-	}
-
-	template < typename T, typename U, typename V >
-	CConstructLocalizedString(const locchar_t* loc_Format, T arg0, U arg1, V arg2)
-	{
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<T>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<U>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<V>::kIsValid);
-
-		m_loc_Buffer[0] = '\0';
-
-		if (loc_Format)
-		{
-			::ILocalize::ConstructString(m_loc_Buffer,
-				sizeof(m_loc_Buffer),
-				loc_Format,
-				3,
-				CLocalizedStringArg<T>(arg0).GetLocArg(),
-				CLocalizedStringArg<U>(arg1).GetLocArg(),
-				CLocalizedStringArg<V>(arg2).GetLocArg());
-		}
-	}
-
-	template < typename T, typename U, typename V, typename W >
-	CConstructLocalizedString(const locchar_t* loc_Format, T arg0, U arg1, V arg2, W arg3)
-	{
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<T>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<U>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<V>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<W>::kIsValid);
-
-		m_loc_Buffer[0] = '\0';
-
-		if (loc_Format)
-		{
-			::ILocalize::ConstructString(m_loc_Buffer,
-				sizeof(m_loc_Buffer),
-				loc_Format,
-				4,
-				CLocalizedStringArg<T>(arg0).GetLocArg(),
-				CLocalizedStringArg<U>(arg1).GetLocArg(),
-				CLocalizedStringArg<V>(arg2).GetLocArg(),
-				CLocalizedStringArg<W>(arg3).GetLocArg());
-		}
-	}
-
-	template < typename T, typename U, typename V, typename W, typename X, typename Y >
-	CConstructLocalizedString(const locchar_t* loc_Format, T arg0, U arg1, V arg2, W arg3, X arg4, Y arg5)
-	{
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<T>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<U>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<V>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<W>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<X>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<Y>::kIsValid);
-
-		m_loc_Buffer[0] = '\0';
-
-		if (loc_Format)
-		{
-			::ILocalize::ConstructString(m_loc_Buffer,
-				sizeof(m_loc_Buffer),
-				loc_Format,
-				6,
-				CLocalizedStringArg<T>(arg0).GetLocArg(),
-				CLocalizedStringArg<U>(arg1).GetLocArg(),
-				CLocalizedStringArg<V>(arg2).GetLocArg(),
-				CLocalizedStringArg<W>(arg3).GetLocArg(),
-				CLocalizedStringArg<X>(arg4).GetLocArg(),
-				CLocalizedStringArg<Y>(arg5).GetLocArg());
-		}
-	}
-
-	template < typename T, typename U, typename V, typename W, typename X, typename Y, typename Z >
-	CConstructLocalizedString(const locchar_t* loc_Format, T arg0, U arg1, V arg2, W arg3, X arg4, Y arg5, Z arg6)
-	{
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<T>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<U>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<V>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<W>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<X>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<Y>::kIsValid);
-		COMPILE_TIME_ASSERT(CLocalizedStringArg<Z>::kIsValid);
-
-		m_loc_Buffer[0] = '\0';
-
-		if (loc_Format)
-		{
-			::ILocalize::ConstructString(m_loc_Buffer,
-				sizeof(m_loc_Buffer),
-				loc_Format,
-				7,
-				CLocalizedStringArg<T>(arg0).GetLocArg(),
-				CLocalizedStringArg<U>(arg1).GetLocArg(),
-				CLocalizedStringArg<V>(arg2).GetLocArg(),
-				CLocalizedStringArg<W>(arg3).GetLocArg(),
-				CLocalizedStringArg<X>(arg4).GetLocArg(),
-				CLocalizedStringArg<Y>(arg5).GetLocArg(),
-				CLocalizedStringArg<Z>(arg6).GetLocArg());
-		}
-	}
-
-	CConstructLocalizedString(const locchar_t* loc_Format, KeyValues* pKeyValues)
-	{
-		m_loc_Buffer[0] = '\0';
-
-		if (loc_Format && pKeyValues)
-		{
-			::ILocalize::ConstructString(m_loc_Buffer, sizeof(m_loc_Buffer), loc_Format, pKeyValues);
-		}
-	}
-
-	operator const locchar_t* () const
-	{
-		return m_loc_Buffer;
-	}
-
-private:
-	enum { kBufferSize = 512, };
-	locchar_t m_loc_Buffer[kBufferSize];
-};
-namespace vgui
-{
-	class ILocalize : public ::ILocalize { };		     
-}
-
-#define VGUI_LOCALIZE_INTERFACE_VERSION "VGUI_Localize005"
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IMesh.h b/SpyCustom/IMesh.h
deleted file mode 100644
index a4d43d2..0000000
--- a/SpyCustom/IMesh.h
+++ /dev/null
@@ -1,3353 +0,0 @@
-#ifndef IMESH_H
-#define IMESH_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "imaterial.h"
-#include <float.h>
-#include <string.h>
-#include "dbg.h"
-#include "meshutils.h"
-
-#include "imaterialsystem.h" 
-
-#ifdef OSX
-#endif
-
-class IMaterial;
-class CMeshBuilder;
-class IMaterialVar;
-typedef uint64 VertexFormat_t;
-struct ShaderStencilState_t;
-
-
-#ifdef _DEBUG
-#endif
-
-
-enum
-{
-	VERTEX_MAX_TEXTURE_COORDINATES = 8,
-	BONE_MATRIX_INDEX_INVALID = 255
-};
-
-enum
-{
-	INDEX_BUFFER_SIZE = 32768,
-	DYNAMIC_VERTEX_BUFFER_MEMORY = (1024 + 512) * 1024,
-	DYNAMIC_VERTEX_BUFFER_MEMORY_SMALL = 384 * 1024,        
-};
-
-enum WriteCombineOrdering_t
-{
-	MB_FIELD_NONE = -1,
-	MB_FIELD_POSITION = 0,
-	MB_FIELD_BONE_WEIGHTS,
-	MB_FIELD_BONE_INDEX,
-	MB_FIELD_NORMAL,
-	MB_FIELD_COLOR,
-	MB_FIELD_SPECULAR,
-	MB_FIELD_TEXCOORD_FIRST,
-	MB_FIELD_TEXCOORD_LAST = MB_FIELD_TEXCOORD_FIRST + VERTEX_MAX_TEXTURE_COORDINATES - 1,
-	MB_FIELD_TANGENT_S,
-	MB_FIELD_TANGENT_T,
-	MB_FIELD_USERDATA,
-};
-
-#define MB_FIELD_TEXCOORD( nStage ) ( MB_FIELD_TEXCOORD_FIRST + ( nStage ) )
-
-struct VertexDesc_t
-{
-	int	m_VertexSize_Position;
-	int m_VertexSize_BoneWeight;
-	int m_VertexSize_BoneMatrixIndex;
-	int	m_VertexSize_Normal;
-	int	m_VertexSize_Color;
-	int	m_VertexSize_Specular;
-	int m_VertexSize_TexCoord[VERTEX_MAX_TEXTURE_COORDINATES];
-	int m_VertexSize_TangentS;
-	int m_VertexSize_TangentT;
-	int m_VertexSize_Wrinkle;
-
-	int m_VertexSize_UserData;
-
-	int m_ActualVertexSize;	          
-	VertexCompressionType_t m_CompressionType;
-
-	int m_NumBoneWeights;
-
-	float* m_pPosition;
-
-	float* m_pBoneWeight;
-
-#ifndef NEW_SKINNING
-	unsigned char* m_pBoneMatrixIndex;
-#else
-	float* m_pBoneMatrixIndex;
-#endif
-
-	float* m_pNormal;
-
-	unsigned char* m_pColor;
-	unsigned char* m_pSpecular;
-	float* m_pTexCoord[VERTEX_MAX_TEXTURE_COORDINATES];
-
-	float* m_pTangentS;
-	float* m_pTangentT;
-
-	float* m_pWrinkle;
-
-	float* m_pUserData;
-
-	int	m_nFirstVertex;
-
-	unsigned int	m_nOffset;
-
-#ifdef DEBUG_WRITE_COMBINE
-	int m_nLastWrittenField;
-	unsigned char* m_pLastWrittenAddress;
-#endif
-};
-
-struct IndexDesc_t
-{
-	unsigned short* m_pIndices;
-
-	unsigned int	m_nOffset;
-
-	unsigned int	m_nFirstIndex;
-
-	unsigned int	m_nIndexSize;
-};
-
-
-struct MeshDesc_t : public VertexDesc_t, public IndexDesc_t
-{
-};
-
-
-struct ModelVertexDX8_t
-{
-	Vector			m_vecPosition;
-	Vector			m_vecNormal;
-	Vector2D		m_vecTexCoord;
-	Vector4D		m_vecUserData;
-};
-
-struct QuadTessVertex_t
-{
-	Vector4D	m_vTangent;		        
-	Vector4D	m_vUV01;		           
-	Vector4D	m_vUV23;		           
-};
-
-struct MeshBoneRemap_t     
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int m_nActualBoneIndex;
-	int m_nSrcBoneIndex;
-};
-
-struct MeshInstanceData_t
-{
-	int						m_nIndexOffset;
-	int						m_nIndexCount;
-	int						m_nBoneCount;
-	MeshBoneRemap_t* m_pBoneRemap;		            
-	matrix3x4_t* m_pPoseToWorld;	                
-	const ITexture* m_pEnvCubemap;
-	MaterialLightingState_t* m_pLightingState;
-	MaterialPrimitiveType_t m_nPrimType;
-	const IVertexBuffer* m_pVertexBuffer;
-	int						m_nVertexOffsetInBytes;
-	const IIndexBuffer* m_pIndexBuffer;
-	const IVertexBuffer* m_pColorBuffer;
-	int						m_nColorVertexOffsetInBytes;
-	ShaderStencilState_t* m_pStencilState;
-	Vector4D				m_DiffuseModulation;
-};
-
-struct MeshBuffersAllocationSettings_t
-{
-	uint32 m_uiIbUsageFlags;
-};
-
-inline float* OffsetFloatPointer(float* pBufferPointer, int nVertexCount, int vertexSize)
-{
-	return reinterpret_cast<float*>(
-		reinterpret_cast<unsigned char*>(pBufferPointer) +
-		nVertexCount * vertexSize);
-}
-
-inline const float* OffsetFloatPointer(const float* pBufferPointer, int nVertexCount, int vertexSize)
-{
-	return reinterpret_cast<const float*>(
-		reinterpret_cast<unsigned char const*>(pBufferPointer) +
-		nVertexCount * vertexSize);
-}
-
-inline void IncrementFloatPointer(float*& pBufferPointer, int vertexSize)
-{
-	pBufferPointer = reinterpret_cast<float*>(reinterpret_cast<unsigned char*>(pBufferPointer) + vertexSize);
-}
-
-
-class CPrimList
-{
-public:
-	CPrimList();
-	CPrimList(int nFirstIndex, int nIndexCount);
-
-	int			m_FirstIndex;
-	int			m_NumIndices;
-};
-
-inline CPrimList::CPrimList()
-{
-}
-
-inline CPrimList::CPrimList(int nFirstIndex, int nIndexCount)
-{
-	m_FirstIndex = nFirstIndex;
-	m_NumIndices = nIndexCount;
-}
-
-abstract_class IVertexBuffer
-{
-public:
-	virtual int VertexCount() const = 0;
-	virtual VertexFormat_t GetVertexFormat() const = 0;
-
-	virtual bool IsDynamic() const = 0;
-
-	virtual void BeginCastBuffer(VertexFormat_t format) = 0;
-	virtual void EndCastBuffer() = 0;
-
-	virtual int GetRoomRemaining() const = 0;
-
-	virtual bool Lock(int nVertexCount, bool bAppend, VertexDesc_t& desc) = 0;
-	virtual void Unlock(int nVertexCount, VertexDesc_t& desc) = 0;
-
-	virtual void Spew(int nVertexCount, const VertexDesc_t& desc) = 0;
-
-	virtual void ValidateData(int nVertexCount, const VertexDesc_t& desc) = 0;
-};
-
-abstract_class IIndexBuffer
-{
-public:
-	virtual int IndexCount() const = 0;
-	virtual MaterialIndexFormat_t IndexFormat() const = 0;
-
-	virtual bool IsDynamic() const = 0;
-
-	virtual void BeginCastBuffer(MaterialIndexFormat_t format) = 0;
-	virtual void EndCastBuffer() = 0;
-
-	virtual int GetRoomRemaining() const = 0;
-
-	virtual bool Lock(int nMaxIndexCount, bool bAppend, IndexDesc_t& desc) = 0;
-	virtual void Unlock(int nWrittenIndexCount, IndexDesc_t& desc) = 0;
-
-	virtual void ModifyBegin(bool bReadOnly, int nFirstIndex, int nIndexCount, IndexDesc_t& desc) = 0;
-	virtual void ModifyEnd(IndexDesc_t& desc) = 0;
-
-	virtual void Spew(int nIndexCount, const IndexDesc_t& desc) = 0;
-
-	virtual void ValidateData(int nIndexCount, const IndexDesc_t& desc) = 0;
-
-	virtual IMesh* GetMesh() = 0;
-};
-
-abstract_class ICachedPerFrameMeshData
-{
-public:
-	virtual void Free() = 0;
-};
-
-abstract_class IMesh : public IVertexBuffer, public IIndexBuffer
-{
-public:
-	virtual void SetPrimitiveType(MaterialPrimitiveType_t type) = 0;
-
-	virtual void Draw(int firstIndex = -1, int numIndices = 0) = 0;
-
-	virtual void SetColorMesh(IMesh* pColorMesh, int nVertexOffset) = 0;
-
-	virtual void Draw(CPrimList* pLists, int nLists) = 0;
-
-	virtual void CopyToMeshBuilder(
-		int iStartVert,		    
-		int nVerts,
-		int iStartIndex,	    
-		int nIndices,
-		int indexOffset,	      
-		CMeshBuilder& builder) = 0;
-
-	virtual void Spew(int numVerts, int numIndices, const MeshDesc_t& desc) = 0;
-
-	virtual void ValidateData(int numVerts, int numIndices, const MeshDesc_t& desc) = 0;
-
-	virtual void LockMesh(int numVerts, int numIndices, MeshDesc_t& desc, MeshBuffersAllocationSettings_t* pSettings) = 0;
-	virtual void ModifyBegin(int firstVertex, int numVerts, int firstIndex, int numIndices, MeshDesc_t& desc) = 0;
-	virtual void ModifyEnd(MeshDesc_t& desc) = 0;
-	virtual void UnlockMesh(int numVerts, int numIndices, MeshDesc_t& desc) = 0;
-
-	virtual void ModifyBeginEx(bool bReadOnly, int firstVertex, int numVerts, int firstIndex, int numIndices, MeshDesc_t& desc) = 0;
-
-	virtual void SetFlexMesh(IMesh* pMesh, int nVertexOffset) = 0;
-
-	virtual void DisableFlexMesh() = 0;
-
-	virtual void MarkAsDrawn() = 0;
-
-	virtual void DrawModulated(const Vector4D& vecDiffuseModulation, int firstIndex = -1, int numIndices = 0) = 0;
-
-	virtual unsigned int ComputeMemoryUsed() = 0;
-
-	virtual void* AccessRawHardwareDataStream(uint8 nRawStreamIndex, uint32 numBytes, uint32 uiFlags, void* pvContext) = 0;
-
-	virtual ICachedPerFrameMeshData* GetCachedPerFrameMeshData() = 0;
-	virtual void ReconstructFromCachedPerFrameMeshData(ICachedPerFrameMeshData* pData) = 0;
-};
-
-
-#include "meshreader.h"
-
-#define INVALID_BUFFER_OFFSET 0xFFFFFFFFUL
-
-#define VTX_HAVEPOS 1
-#define VTX_HAVENORMAL 2
-#define VTX_HAVECOLOR 4
-#define VTX_HAVEALL ( VTX_HAVEPOS | VTX_HAVENORMAL | VTX_HAVECOLOR )
-
-
-class CVertexBuilder : private VertexDesc_t
-{
-public:
-	CVertexBuilder();
-	CVertexBuilder(IVertexBuffer* pVertexBuffer, VertexFormat_t fmt = 0);
-	~CVertexBuilder();
-
-	bool Lock(int nMaxIndexCount, bool bAppend = false);
-	void Unlock();
-
-	void SpewData();
-
-	int GetRoomRemaining() const;
-
-	void Bind(IMatRenderContext* pContext, int nStreamID, VertexFormat_t usage = 0);
-
-	int Offset() const;
-
-	void SetCompressionType(VertexCompressionType_t compressionType);
-	void ValidateCompressionType();
-
-	void Begin(IVertexBuffer* pVertexBuffer, int nVertexCount, int* nFirstVertex);
-	void Begin(IVertexBuffer* pVertexBuffer, int nVertexCount);
-
-	void End(bool bSpewData = false);
-
-	void BeginModify(IVertexBuffer* pVertexBuffer, int nFirstVertex = 0, int nVertexCount = -1);
-	void EndModify(bool bSpewData = false);
-
-	int VertexCount() const;
-
-	int TotalVertexCount() const;
-
-	void Reset();
-
-	int VertexSize() { return m_ActualVertexSize; }
-
-	int TextureCoordinateSize(int nTexCoordNumber) { return m_VertexSize_TexCoord[nTexCoordNumber]; }
-
-	void* BaseVertexData();
-
-	void SelectVertex(int idx);
-
-	void AdvanceVertex(void);
-	template<int nFlags, int nNumTexCoords> void AdvanceVertexF(void);
-	void AdvanceVertices(int nVerts);
-
-	int GetCurrentVertex() const;
-	int GetFirstVertex() const;
-
-	const float* Position() const;
-
-	const float* Normal() const;
-
-	unsigned int Color() const;
-
-	unsigned char* Specular() const;
-
-	const float* TexCoord(int stage) const;
-
-	const float* TangentS() const;
-	const float* TangentT() const;
-
-	const float* BoneWeight() const;
-	float Wrinkle() const;
-
-	int NumBoneWeights() const;
-#ifndef NEW_SKINNING
-	unsigned char* BoneMatrix() const;
-#else
-	float* BoneMatrix() const;
-#endif
-
-	void Position3f(float x, float y, float z);
-	void Position3fv(const float* v);
-
-	void Normal3f(float nx, float ny, float nz);
-	void Normal3fv(const float* n);
-	void NormalDelta3fv(const float* n);
-	void NormalDelta3f(float nx, float ny, float nz);
-	template <VertexCompressionType_t T> void CompressedNormal3f(float nx, float ny, float nz);
-	template <VertexCompressionType_t T> void CompressedNormal3fv(const float* n);
-
-	void Color3f(float r, float g, float b);
-	void Color3fv(const float* rgb);
-	void Color4f(float r, float g, float b, float a);
-	void Color4fv(const float* rgba);
-
-	void Color3ub(unsigned char r, unsigned char g, unsigned char b);
-	void Color3ubv(unsigned char const* rgb);
-	void Color4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-	void Color4ubv(unsigned char const* rgba);
-	void Color4Packed(int packedColor);
-	int PackColor4(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-
-	void Specular3f(float r, float g, float b);
-	void Specular3fv(const float* rgb);
-	void Specular4f(float r, float g, float b, float a);
-	void Specular4fv(const float* rgba);
-
-	void Specular3ub(unsigned char r, unsigned char g, unsigned char b);
-	void Specular3ubv(unsigned char const* c);
-	void Specular4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-	void Specular4ubv(unsigned char const* c);
-
-	void TexCoord1f(int stage, float s);
-	void TexCoord2f(int stage, float s, float t);
-	void TexCoord2fv(int stage, const float* st);
-	void TexCoord3f(int stage, float s, float t, float u);
-	void TexCoord3fv(int stage, const float* stu);
-	void TexCoord4f(int stage, float s, float t, float u, float w);
-	void TexCoord4fv(int stage, const float* stuv);
-
-	void TexCoordSubRect2f(int stage, float s, float t, float offsetS, float offsetT, float scaleS, float scaleT);
-	void TexCoordSubRect2fv(int stage, const float* st, const float* offset, const float* scale);
-
-	void TangentS3f(float sx, float sy, float sz);
-	void TangentS3fv(const float* s);
-
-	void TangentT3f(float tx, float ty, float tz);
-	void TangentT3fv(const float* t);
-
-	void Wrinkle1f(float flWrinkle);
-
-	void BoneWeight(int idx, float weight);
-	void BoneWeights2(float weight1, float weight2);
-
-	template <VertexCompressionType_t T> void CompressedBoneWeight3fv(const float* pWeights);
-
-	void BoneMatrix(int idx, int matrixIndex);
-	void BoneMatrices4(int matrixIdx0, int matrixIdx1, int matrixIdx2, int matrixIdx3);
-
-	void UserData(const float* pData);
-	template <VertexCompressionType_t T> void CompressedUserData(const float* pData);
-
-	void FastVertex(const ModelVertexDX8_t& vertex);
-	void FastVertexSSE(const ModelVertexDX8_t& vertex);
-	void FastQuadVertexSSE(const QuadTessVertex_t& vertex);
-
-	void FastAdvanceNVertices(int n);
-
-#if defined( _X360 )
-	void VertexDX8ToX360(const ModelVertexDX8_t& vertex);
-#endif
-
-	void AttachBegin(IMesh* pMesh, int nMaxVertexCount, const MeshDesc_t& desc);
-	void AttachEnd();
-	void AttachBeginModify(IMesh* pMesh, int nFirstVertex, int nVertexCount, const MeshDesc_t& desc);
-	void AttachEndModify();
-
-private:
-	IVertexBuffer* m_pVertexBuffer;
-
-	bool m_bModify;
-
-	int m_nMaxVertexCount;
-
-	int m_nVertexCount;
-
-	mutable int m_nCurrentVertex;
-
-	mutable float* m_pCurrPosition;
-	mutable float* m_pCurrNormal;
-	mutable unsigned char* m_pCurrColor;
-	mutable float* m_pCurrTexCoord[VERTEX_MAX_TEXTURE_COORDINATES];
-
-	int m_nTotalVertexCount;
-
-	unsigned int m_nBufferOffset;
-	unsigned int m_nBufferFirstVertex;
-
-#if ( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4 )
-	bool m_bWrittenNormal : 1;
-	bool m_bWrittenUserData : 1;
-#endif
-
-	friend class CMeshBuilder;
-};
-
-
-inline CVertexBuilder::CVertexBuilder()
-{
-	m_pVertexBuffer = NULL;
-	m_nBufferOffset = INVALID_BUFFER_OFFSET;
-	m_nBufferFirstVertex = 0;
-	m_nVertexCount = 0;
-	m_nCurrentVertex = 0;
-	m_nMaxVertexCount = 0;
-	m_nTotalVertexCount = 0;
-	m_CompressionType = VERTEX_COMPRESSION_INVALID;
-
-#ifdef _DEBUG
-	m_pCurrPosition = NULL;
-	m_pCurrNormal = NULL;
-	m_pCurrColor = NULL;
-	memset(m_pCurrTexCoord, 0, sizeof(m_pCurrTexCoord));
-	m_bModify = false;
-#endif
-}
-
-inline CVertexBuilder::CVertexBuilder(IVertexBuffer* pVertexBuffer, VertexFormat_t fmt)
-{
-	m_pVertexBuffer = pVertexBuffer;
-	m_nBufferOffset = INVALID_BUFFER_OFFSET;
-	m_nBufferFirstVertex = 0;
-	m_nVertexCount = 0;
-	m_nCurrentVertex = 0;
-	m_nMaxVertexCount = 0;
-	m_nTotalVertexCount = 0;
-	m_CompressionType = VERTEX_COMPRESSION_INVALID;
-
-	if (m_pVertexBuffer->IsDynamic())
-	{
-		m_pVertexBuffer->BeginCastBuffer(fmt);
-	}
-	else
-	{
-		Assert(m_pVertexBuffer->GetVertexFormat() == fmt);
-	}
-
-#ifdef _DEBUG
-	m_pCurrPosition = NULL;
-	m_pCurrNormal = NULL;
-	m_pCurrColor = NULL;
-	memset(m_pCurrTexCoord, 0, sizeof(m_pCurrTexCoord));
-	m_bModify = false;
-#endif
-}
-
-inline CVertexBuilder::~CVertexBuilder()
-{
-	if (m_pVertexBuffer && m_pVertexBuffer->IsDynamic())
-	{
-		m_pVertexBuffer->EndCastBuffer();
-	}
-}
-
-inline bool CVertexBuilder::Lock(int nMaxVertexCount, bool bAppend)
-{
-	Assert(m_pVertexBuffer);
-	m_bModify = false;
-	m_nMaxVertexCount = nMaxVertexCount;
-	bool bFirstLock = (m_nBufferOffset == INVALID_BUFFER_OFFSET);
-	if (bFirstLock)
-	{
-		bAppend = false;
-	}
-	if (!bAppend)
-	{
-		m_nTotalVertexCount = 0;
-	}
-
-	if (!m_pVertexBuffer->Lock(m_nMaxVertexCount, bAppend, *this))
-	{
-		m_nMaxVertexCount = 0;
-		return false;
-	}
-
-	Reset();
-
-	if (bFirstLock)
-	{
-		m_nBufferOffset = m_nOffset;
-		m_nBufferFirstVertex = m_nFirstVertex;
-	}
-
-	return true;
-}
-
-inline void CVertexBuilder::Unlock()
-{
-	Assert(!m_bModify && m_pVertexBuffer);
-
-#ifdef _DEBUG
-	m_pVertexBuffer->ValidateData(m_nVertexCount, *this);
-#endif
-
-	m_pVertexBuffer->Unlock(m_nVertexCount, *this);
-	m_nTotalVertexCount += m_nVertexCount;
-
-	m_nMaxVertexCount = 0;
-
-#ifdef _DEBUG
-	m_pCurrPosition = NULL;
-	m_pCurrNormal = NULL;
-	m_pCurrColor = NULL;
-	memset(m_pCurrTexCoord, 0, sizeof(m_pCurrTexCoord));
-	memset(static_cast<VertexDesc_t*>(this), 0, sizeof(VertexDesc_t));
-#endif
-}
-
-inline void CVertexBuilder::SpewData()
-{
-	m_pVertexBuffer->Spew(m_nVertexCount, *this);
-}
-
-
-inline void CVertexBuilder::Bind(IMatRenderContext* pContext, int nStreamID, VertexFormat_t usage)
-{
-	if (m_pVertexBuffer && (m_nBufferOffset != INVALID_BUFFER_OFFSET))
-	{
-		pContext->BindVertexBuffer(nStreamID, m_pVertexBuffer, m_nBufferOffset,
-			m_nFirstVertex, m_nTotalVertexCount, usage ? usage : m_pVertexBuffer->GetVertexFormat());
-	}
-	else
-	{
-		pContext->BindVertexBuffer(nStreamID, NULL, 0, 0, 0, 0);
-	}
-}
-
-
-inline int CVertexBuilder::Offset() const
-{
-	return m_nBufferOffset;
-}
-
-inline int CVertexBuilder::GetFirstVertex() const
-{
-	return m_nBufferFirstVertex;
-}
-
-inline void CVertexBuilder::SetCompressionType(VertexCompressionType_t compressionType)
-{
-	m_CompressionType = compressionType;
-}
-
-inline void CVertexBuilder::ValidateCompressionType()
-{
-#ifdef _DEBUG
-	VertexCompressionType_t vbCompressionType = CompressionType(m_pVertexBuffer->GetVertexFormat());
-	if (vbCompressionType != VERTEX_COMPRESSION_NONE)
-	{
-		Assert(m_CompressionType == vbCompressionType);
-		if (m_CompressionType != vbCompressionType)
-		{
-			Warning("ERROR: CVertexBuilder::SetCompressionType() must be called to specify the same vertex compression type (%s) as the vertex buffer being modified."
-				"Junk vertices will be rendered, or there will be a crash in CVertexBuilder!\n",
-				vbCompressionType == VERTEX_COMPRESSION_ON ? "VERTEX_COMPRESSION_ON" : "VERTEX_COMPRESSION_NONE");
-		}
-		Assert(!m_pVertexBuffer->IsDynamic());
-	}
-#endif
-}
-
-inline void CVertexBuilder::Begin(IVertexBuffer* pVertexBuffer, int nVertexCount)
-{
-	Assert(pVertexBuffer && (!m_pVertexBuffer));
-
-	m_pVertexBuffer = pVertexBuffer;
-	m_bModify = false;
-
-	m_nMaxVertexCount = nVertexCount;
-	m_nVertexCount = 0;
-
-	ValidateCompressionType();
-
-	m_pVertexBuffer->Lock(m_nMaxVertexCount, false, *this);
-
-	Reset();
-}
-
-
-inline void CVertexBuilder::End(bool bSpewData)
-{
-	Assert(!m_bModify);
-
-	if (bSpewData)
-	{
-		m_pVertexBuffer->Spew(m_nVertexCount, *this);
-	}
-
-#ifdef _DEBUG
-	m_pVertexBuffer->ValidateData(m_nVertexCount, *this);
-#endif
-
-	m_pVertexBuffer->Unlock(m_nVertexCount, *this);
-
-	m_pVertexBuffer = 0;
-	m_nMaxVertexCount = 0;
-
-	m_CompressionType = VERTEX_COMPRESSION_INVALID;
-
-#ifdef _DEBUG
-	m_pCurrPosition = NULL;
-	m_pCurrNormal = NULL;
-	m_pCurrColor = NULL;
-	memset(m_pCurrTexCoord, 0, sizeof(m_pCurrTexCoord));
-	memset(static_cast<VertexDesc_t*>(this), 0, sizeof(VertexDesc_t));
-#endif
-}
-
-
-inline void CVertexBuilder::AttachBegin(IMesh* pMesh, int nMaxVertexCount, const MeshDesc_t& desc)
-{
-	m_pVertexBuffer = pMesh;
-	memcpy(static_cast<VertexDesc_t*>(this), static_cast<const VertexDesc_t*>(&desc), sizeof(VertexDesc_t));
-	m_nMaxVertexCount = nMaxVertexCount;
-	m_NumBoneWeights = m_NumBoneWeights == 0 ? 0 : 2;	    
-	m_nVertexCount = 0;
-	m_bModify = false;
-
-	ValidateCompressionType();
-
-	if (m_nBufferOffset == INVALID_BUFFER_OFFSET)
-	{
-		m_nTotalVertexCount = 0;
-		m_nBufferOffset = static_cast<const VertexDesc_t*>(&desc)->m_nOffset;
-		m_nBufferFirstVertex = desc.m_nFirstVertex;
-	}
-}
-
-inline void CVertexBuilder::AttachEnd()
-{
-	Assert(!m_bModify);
-
-	m_nMaxVertexCount = 0;
-	m_pVertexBuffer = NULL;
-
-	m_CompressionType = VERTEX_COMPRESSION_INVALID;
-
-#ifdef _DEBUG
-	m_pCurrPosition = NULL;
-	m_pCurrNormal = NULL;
-	m_pCurrColor = NULL;
-	memset(m_pCurrTexCoord, 0, sizeof(m_pCurrTexCoord));
-	memset(static_cast<VertexDesc_t*>(this), 0, sizeof(VertexDesc_t));
-#endif
-}
-
-inline void CVertexBuilder::AttachBeginModify(IMesh* pMesh, int nFirstVertex, int nVertexCount, const MeshDesc_t& desc)
-{
-	Assert(pMesh && (!m_pVertexBuffer));
-
-	m_pVertexBuffer = pMesh;
-	memcpy(static_cast<VertexDesc_t*>(this), static_cast<const VertexDesc_t*>(&desc), sizeof(VertexDesc_t));
-	m_nMaxVertexCount = m_nVertexCount = nVertexCount;
-	m_NumBoneWeights = m_NumBoneWeights == 0 ? 0 : 2;	    
-	m_bModify = true;
-
-	ValidateCompressionType();
-}
-
-inline void CVertexBuilder::AttachEndModify()
-{
-	Assert(m_pVertexBuffer);
-	Assert(m_bModify);	     
-
-	m_pVertexBuffer = 0;
-	m_nMaxVertexCount = 0;
-
-	m_CompressionType = VERTEX_COMPRESSION_INVALID;
-
-#ifdef _DEBUG
-	m_pCurrPosition = NULL;
-	m_pCurrNormal = NULL;
-	m_pCurrColor = NULL;
-	memset(m_pCurrTexCoord, 0, sizeof(m_pCurrTexCoord));
-	memset(static_cast<VertexDesc_t*>(this), 0, sizeof(VertexDesc_t));
-#endif
-}
-
-
-inline unsigned char* FindMinAddress(void* pAddress1, void* pAddress2, int nAddress2Size)
-{
-	if (nAddress2Size == 0)
-		return (unsigned char*)pAddress1;
-	if (!pAddress1)
-		return (unsigned char*)pAddress2;
-	return (pAddress1 < pAddress2) ? (unsigned char*)pAddress1 : (unsigned char*)pAddress2;
-}
-
-inline void CVertexBuilder::Reset()
-{
-	m_nCurrentVertex = 0;
-
-	m_pCurrPosition = m_pPosition;
-	m_pCurrNormal = m_pNormal;
-	for (size_t i = 0; i < NELEMS(m_pCurrTexCoord); i++)
-	{
-		m_pCurrTexCoord[i] = m_pTexCoord[i];
-	}
-	m_pCurrColor = m_pColor;
-
-#if ( defined( _DEBUG ) && ( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4 ) )
-	m_bWrittenNormal = false;
-	m_bWrittenUserData = false;
-#endif
-
-#ifdef DEBUG_WRITE_COMBINE
-	m_nLastWrittenField = MB_FIELD_NONE;
-	m_pLastWrittenAddress = NULL;
-	m_pLastWrittenAddress = FindMinAddress(m_pLastWrittenAddress, m_pPosition, m_VertexSize_Position);
-	m_pLastWrittenAddress = FindMinAddress(m_pLastWrittenAddress, m_pBoneWeight, m_VertexSize_BoneWeight);
-	m_pLastWrittenAddress = FindMinAddress(m_pLastWrittenAddress, m_pBoneMatrixIndex, m_VertexSize_BoneMatrixIndex);
-	m_pLastWrittenAddress = FindMinAddress(m_pLastWrittenAddress, m_pNormal, m_VertexSize_Normal);
-	m_pLastWrittenAddress = FindMinAddress(m_pLastWrittenAddress, m_pColor, m_VertexSize_Color);
-	m_pLastWrittenAddress = FindMinAddress(m_pLastWrittenAddress, m_pSpecular, m_VertexSize_Specular);
-	for (int i = 0; i < VERTEX_MAX_TEXTURE_COORDINATES; ++i)
-	{
-		m_pLastWrittenAddress = FindMinAddress(m_pLastWrittenAddress, m_pTexCoord[i], m_VertexSize_TexCoord[i]);
-	}
-	m_pLastWrittenAddress = FindMinAddress(m_pLastWrittenAddress, m_pTangentS, m_VertexSize_TangentS);
-	m_pLastWrittenAddress = FindMinAddress(m_pLastWrittenAddress, m_pTangentT, m_VertexSize_TangentT);
-	m_pLastWrittenAddress = FindMinAddress(m_pLastWrittenAddress, m_pUserData, m_VertexSize_UserData);
-#endif
-}
-
-
-inline int CVertexBuilder::VertexCount() const
-{
-	return m_nVertexCount;
-}
-
-
-inline int CVertexBuilder::TotalVertexCount() const
-{
-	return m_nTotalVertexCount;
-}
-
-
-inline void* CVertexBuilder::BaseVertexData()
-{
-	Assert(m_pPosition);
-	return m_pPosition;
-}
-
-
-inline void CVertexBuilder::SelectVertex(int nIndex)
-{
-	Assert((nIndex >= 0) && (nIndex < m_nMaxVertexCount));
-	m_nCurrentVertex = nIndex;
-
-	m_pCurrPosition = OffsetFloatPointer(m_pPosition, m_nCurrentVertex, m_VertexSize_Position);
-	m_pCurrNormal = OffsetFloatPointer(m_pNormal, m_nCurrentVertex, m_VertexSize_Normal);
-
-	COMPILE_TIME_ASSERT(VERTEX_MAX_TEXTURE_COORDINATES == 8);
-	m_pCurrTexCoord[0] = OffsetFloatPointer(m_pTexCoord[0], m_nCurrentVertex, m_VertexSize_TexCoord[0]);
-	m_pCurrTexCoord[1] = OffsetFloatPointer(m_pTexCoord[1], m_nCurrentVertex, m_VertexSize_TexCoord[1]);
-	m_pCurrTexCoord[2] = OffsetFloatPointer(m_pTexCoord[2], m_nCurrentVertex, m_VertexSize_TexCoord[2]);
-	m_pCurrTexCoord[3] = OffsetFloatPointer(m_pTexCoord[3], m_nCurrentVertex, m_VertexSize_TexCoord[3]);
-	m_pCurrTexCoord[4] = OffsetFloatPointer(m_pTexCoord[4], m_nCurrentVertex, m_VertexSize_TexCoord[4]);
-	m_pCurrTexCoord[5] = OffsetFloatPointer(m_pTexCoord[5], m_nCurrentVertex, m_VertexSize_TexCoord[5]);
-	m_pCurrTexCoord[6] = OffsetFloatPointer(m_pTexCoord[6], m_nCurrentVertex, m_VertexSize_TexCoord[6]);
-	m_pCurrTexCoord[7] = OffsetFloatPointer(m_pTexCoord[7], m_nCurrentVertex, m_VertexSize_TexCoord[7]);
-	m_pCurrColor = m_pColor + m_nCurrentVertex * m_VertexSize_Color;
-
-#if ( defined( _DEBUG ) && ( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4 ) )
-	m_bWrittenNormal = false;
-	m_bWrittenUserData = false;
-#endif
-}
-
-
-template<int nFlags, int nNumTexCoords> FORCEINLINE void CVertexBuilder::AdvanceVertexF()
-{
-	if (++m_nCurrentVertex > m_nVertexCount)
-	{
-		m_nVertexCount = m_nCurrentVertex;
-	}
-
-	if (nFlags & VTX_HAVEPOS)
-		IncrementFloatPointer(m_pCurrPosition, m_VertexSize_Position);
-	if (nFlags & VTX_HAVENORMAL)
-		IncrementFloatPointer(m_pCurrNormal, m_VertexSize_Normal);
-	if (nFlags & VTX_HAVECOLOR)
-		m_pCurrColor += m_VertexSize_Color;
-
-	COMPILE_TIME_ASSERT(VERTEX_MAX_TEXTURE_COORDINATES == 8);
-	if (nNumTexCoords > 0)
-		IncrementFloatPointer(m_pCurrTexCoord[0], m_VertexSize_TexCoord[0]);
-	if (nNumTexCoords > 1)
-		IncrementFloatPointer(m_pCurrTexCoord[1], m_VertexSize_TexCoord[1]);
-	if (nNumTexCoords > 2)
-		IncrementFloatPointer(m_pCurrTexCoord[2], m_VertexSize_TexCoord[2]);
-	if (nNumTexCoords > 3)
-		IncrementFloatPointer(m_pCurrTexCoord[3], m_VertexSize_TexCoord[3]);
-	if (nNumTexCoords > 4)
-		IncrementFloatPointer(m_pCurrTexCoord[4], m_VertexSize_TexCoord[4]);
-	if (nNumTexCoords > 5)
-		IncrementFloatPointer(m_pCurrTexCoord[5], m_VertexSize_TexCoord[5]);
-	if (nNumTexCoords > 6)
-		IncrementFloatPointer(m_pCurrTexCoord[6], m_VertexSize_TexCoord[6]);
-	if (nNumTexCoords > 7)
-		IncrementFloatPointer(m_pCurrTexCoord[7], m_VertexSize_TexCoord[7]);
-
-#if ( defined( _DEBUG ) && ( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4 ) )
-	m_bWrittenNormal = false;
-	m_bWrittenUserData = false;
-#endif
-}
-
-inline void CVertexBuilder::AdvanceVertex()
-{
-	AdvanceVertexF<VTX_HAVEALL, 8>();
-}
-
-
-inline void CVertexBuilder::AdvanceVertices(int nVerts)
-{
-	m_nCurrentVertex += nVerts;
-	if (m_nCurrentVertex > m_nVertexCount)
-	{
-		m_nVertexCount = m_nCurrentVertex;
-	}
-
-	IncrementFloatPointer(m_pCurrPosition, m_VertexSize_Position * nVerts);
-	IncrementFloatPointer(m_pCurrNormal, m_VertexSize_Normal * nVerts);
-
-	COMPILE_TIME_ASSERT(VERTEX_MAX_TEXTURE_COORDINATES == 8);
-	IncrementFloatPointer(m_pCurrTexCoord[0], m_VertexSize_TexCoord[0] * nVerts);
-	IncrementFloatPointer(m_pCurrTexCoord[1], m_VertexSize_TexCoord[1] * nVerts);
-	IncrementFloatPointer(m_pCurrTexCoord[2], m_VertexSize_TexCoord[2] * nVerts);
-	IncrementFloatPointer(m_pCurrTexCoord[3], m_VertexSize_TexCoord[3] * nVerts);
-	IncrementFloatPointer(m_pCurrTexCoord[4], m_VertexSize_TexCoord[4] * nVerts);
-	IncrementFloatPointer(m_pCurrTexCoord[5], m_VertexSize_TexCoord[5] * nVerts);
-	IncrementFloatPointer(m_pCurrTexCoord[6], m_VertexSize_TexCoord[6] * nVerts);
-	IncrementFloatPointer(m_pCurrTexCoord[7], m_VertexSize_TexCoord[7] * nVerts);
-	m_pCurrColor += m_VertexSize_Color * nVerts;
-
-#if ( defined( _DEBUG ) && ( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4 ) )
-	m_bWrittenNormal = false;
-	m_bWrittenUserData = false;
-#endif
-}
-
-
-inline void CVertexBuilder::FastAdvanceNVertices(int n)
-{
-	m_nCurrentVertex += n;
-	m_nVertexCount = m_nCurrentVertex;
-}
-
-inline void CVertexBuilder::FastVertex(const ModelVertexDX8_t& vertex)
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);       
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-
-#if defined( _WIN32 ) && !defined( _X360 )
-	const void* pRead = &vertex;
-	void* pCurrPos = m_pCurrPosition;
-	__asm
-	{
-		mov esi, pRead
-		mov edi, pCurrPos
-
-		movq mm0, [esi + 0]
-		movq mm1, [esi + 8]
-		movq mm2, [esi + 16]
-		movq mm3, [esi + 24]
-		movq mm4, [esi + 32]
-		movq mm5, [esi + 40]
-
-		movntq[edi + 0], mm0
-		movntq[edi + 8], mm1
-		movntq[edi + 16], mm2
-		movntq[edi + 24], mm3
-		movntq[edi + 32], mm4
-		movntq[edi + 40], mm5
-
-		emms
-	}
-#elif defined(GNUC)
-	const void* pRead = &vertex;
-	void* pCurrPos = m_pCurrPosition;
-	__asm__ __volatile__(
-		"movq (%0), %%mm0\n"
-		"movq 8(%0), %%mm1\n"
-		"movq 16(%0), %%mm2\n"
-		"movq 24(%0), %%mm3\n"
-		"movq 32(%0), %%mm4\n"
-		"movq 40(%0), %%mm5\n"
-		"movq 48(%0), %%mm6\n"
-		"movq 56(%0), %%mm7\n"
-		"movntq %%mm0, (%1)\n"
-		"movntq %%mm1, 8(%1)\n"
-		"movntq %%mm2, 16(%1)\n"
-		"movntq %%mm3, 24(%1)\n"
-		"movntq %%mm4, 32(%1)\n"
-		"movntq %%mm5, 40(%1)\n"
-		"movntq %%mm6, 48(%1)\n"
-		"movntq %%mm7, 56(%1)\n"
-		"emms\n"
-		:: "r" (pRead), "r" (pCurrPos) : "memory");
-#else
-	Error("Implement CMeshBuilder::FastVertex(dx8)");
-#endif
-
-	IncrementFloatPointer(m_pCurrPosition, m_VertexSize_Position);
-#if ( defined( _DEBUG ) && ( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4 ) )
-	m_bWrittenNormal = false;
-	m_bWrittenUserData = false;
-#endif
-}
-
-inline void CVertexBuilder::FastVertexSSE(const ModelVertexDX8_t& vertex)
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);       
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-
-#if defined( _WIN32 ) && !defined( _X360 )
-	const void* pRead = &vertex;
-	void* pCurrPos = m_pCurrPosition;
-	__asm
-	{
-		mov esi, pRead
-		mov edi, pCurrPos
-
-		movaps xmm0, [esi + 0]
-		movaps xmm1, [esi + 16]
-		movaps xmm2, [esi + 32]
-
-		movntps[edi + 0], xmm0
-		movntps[edi + 16], xmm1
-		movntps[edi + 32], xmm2
-	}
-#elif defined(GNUC)
-	const void* pRead = &vertex;
-	void* pCurrPos = m_pCurrPosition;
-	__asm__ __volatile__(
-		"movaps (%0), %%xmm0\n"
-		"movaps 16(%0), %%xmm1\n"
-		"movaps 32(%0), %%xmm2\n"
-		"movaps 48(%0), %%xmm3\n"
-		"movntps %%xmm0, (%1)\n"
-		"movntps %%xmm1, 16(%1)\n"
-		"movntps %%xmm2, 32(%1)\n"
-		"movntps %%xmm3, 48(%1)\n"
-		:: "r" (pRead), "r" (pCurrPos) : "memory");
-#else
-	Error("Implement CMeshBuilder::FastVertexSSE((dx8)");
-#endif
-
-	IncrementFloatPointer(m_pCurrPosition, m_VertexSize_Position);
-#if ( defined( _DEBUG ) && ( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4 ) )
-	m_bWrittenNormal = false;
-	m_bWrittenUserData = false;
-#endif
-}
-
-
-inline void CVertexBuilder::FastQuadVertexSSE(const QuadTessVertex_t& vertex)
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);       
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-
-#if defined( _WIN32 ) && !defined( _X360 )
-	const void* pRead = &vertex;
-	void* pCurrPos = m_pCurrPosition;
-	__asm
-	{
-		mov esi, pRead
-		mov edi, pCurrPos
-
-		movaps xmm0, [esi + 0]
-		movaps xmm1, [esi + 16]
-		movaps xmm2, [esi + 32]
-
-		movntps[edi + 0], xmm0
-		movntps[edi + 16], xmm1
-		movntps[edi + 32], xmm2
-	}
-#endif
-
-	IncrementFloatPointer(m_pCurrPosition, m_VertexSize_Position);
-#if ( defined( _DEBUG ) && ( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4 ) )
-	m_bWrittenNormal = false;
-	m_bWrittenUserData = false;
-#endif
-}
-
-
-
-inline int CVertexBuilder::GetCurrentVertex() const
-{
-	return m_nCurrentVertex;
-}
-
-
-#if defined( _X360 )
-inline void CVertexBuilder::VertexDX8ToX360(const ModelVertexDX8_t& vertex)
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);       
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-
-	unsigned char* pDst = (unsigned char*)m_pCurrPosition;
-
-	Assert(m_VertexSize_Position > 0);      
-	Assert(GetVertexElementSize(VERTEX_ELEMENT_POSITION, VERTEX_COMPRESSION_NONE) == sizeof(vertex.m_vecPosition));
-	memcpy(pDst, vertex.m_vecPosition.Base(), sizeof(vertex.m_vecPosition));
-	pDst += sizeof(vertex.m_vecPosition);
-
-	if (m_VertexSize_Normal)
-	{
-		Assert(GetVertexElementSize(VERTEX_ELEMENT_NORMAL, VERTEX_COMPRESSION_NONE) == sizeof(vertex.m_vecNormal));
-		memcpy(pDst, vertex.m_vecNormal.Base(), sizeof(vertex.m_vecNormal));
-		pDst += sizeof(vertex.m_vecNormal);
-	}
-
-	if (m_VertexSize_TexCoord[0])
-	{
-		Assert(GetVertexElementSize(VERTEX_ELEMENT_TEXCOORD2D_0, VERTEX_COMPRESSION_NONE) == sizeof(vertex.m_vecTexCoord));
-		memcpy(pDst, vertex.m_vecTexCoord.Base(), sizeof(vertex.m_vecTexCoord));
-		pDst += sizeof(vertex.m_vecTexCoord);
-	}
-
-	if (m_VertexSize_UserData)
-	{
-		Assert(GetVertexElementSize(VERTEX_ELEMENT_USERDATA4, VERTEX_COMPRESSION_NONE) == sizeof(vertex.m_vecUserData));
-		memcpy(pDst, vertex.m_vecUserData.Base(), sizeof(vertex.m_vecUserData));
-		pDst += sizeof(vertex.m_vecUserData);
-	}
-
-	Assert(pDst - (unsigned char*)m_pCurrPosition == m_VertexSize_Position);
-
-	IncrementFloatPointer(m_pCurrPosition, m_VertexSize_Position);
-
-#if ( defined( _DEBUG ) && ( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4 ) )
-	m_bWrittenNormal = false;
-	m_bWrittenUserData = false;
-#endif
-}
-#endif
-
-
-inline const float* CVertexBuilder::Position() const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	return m_pCurrPosition;
-}
-
-inline const float* CVertexBuilder::Normal() const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	return m_pCurrNormal;
-}
-
-inline unsigned int CVertexBuilder::Color() const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	unsigned int color;
-	if (IsPC() || !IsX360())
-	{
-		color = (m_pCurrColor[3] << 24) | (m_pCurrColor[0] << 16) | (m_pCurrColor[1] << 8) | (m_pCurrColor[2]);
-	}
-	else
-	{
-		color = (m_pCurrColor[1] << 24) | (m_pCurrColor[2] << 16) | (m_pCurrColor[3] << 8) | (m_pCurrColor[0]);
-	}
-	return color;
-}
-
-inline unsigned char* CVertexBuilder::Specular() const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	return m_pSpecular + m_nCurrentVertex * m_VertexSize_Specular;
-}
-
-inline const float* CVertexBuilder::TexCoord(int stage) const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	return m_pCurrTexCoord[stage];
-}
-
-inline const float* CVertexBuilder::TangentS() const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	return OffsetFloatPointer(m_pTangentS, m_nCurrentVertex, m_VertexSize_TangentS);
-}
-
-inline const float* CVertexBuilder::TangentT() const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	return OffsetFloatPointer(m_pTangentT, m_nCurrentVertex, m_VertexSize_TangentT);
-}
-
-inline float CVertexBuilder::Wrinkle() const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	return *OffsetFloatPointer(m_pWrinkle, m_nCurrentVertex, m_VertexSize_Wrinkle);
-}
-
-inline const float* CVertexBuilder::BoneWeight() const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	return OffsetFloatPointer(m_pBoneWeight, m_nCurrentVertex, m_VertexSize_BoneWeight);
-}
-
-inline int CVertexBuilder::NumBoneWeights() const
-{
-	return m_NumBoneWeights;
-}
-
-#ifndef NEW_SKINNING
-inline unsigned char* CVertexBuilder::BoneMatrix() const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	return m_pBoneMatrixIndex + m_nCurrentVertex * m_VertexSize_BoneMatrixIndex;
-}
-#else
-inline float* CVertexBuilder::BoneMatrix() const
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);
-	Assert(m_nCurrentVertex < m_nMaxVertexCount);
-	return m_pBoneMatrixIndex + m_nCurrentVertex * m_VertexSize_BoneMatrixIndex;
-}
-#endif
-
-
-inline void	CVertexBuilder::Position3f(float x, float y, float z)
-{
-	Assert(m_pPosition && m_pCurrPosition);
-	Assert(IsFinite(x) && IsFinite(y) && IsFinite(z));
-	float* pDst = m_pCurrPosition;
-	*pDst++ = x;
-	*pDst++ = y;
-	*pDst = z;
-}
-
-inline void	CVertexBuilder::Position3fv(const float* v)
-{
-	Assert(v);
-	Assert(m_pPosition && m_pCurrPosition);
-
-	float* pDst = m_pCurrPosition;
-	*pDst++ = *v++;
-	*pDst++ = *v++;
-	*pDst = *v;
-}
-
-
-inline void	CVertexBuilder::Normal3f(float nx, float ny, float nz)
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);           
-	Assert(m_pNormal);
-	Assert(IsFinite(nx) && IsFinite(ny) && IsFinite(nz));
-	Assert(nx >= -1.05f && nx <= 1.05f);
-	Assert(ny >= -1.05f && ny <= 1.05f);
-	Assert(nz >= -1.05f && nz <= 1.05f);
-
-	float* pDst = m_pCurrNormal;
-	*pDst++ = nx;
-	*pDst++ = ny;
-	*pDst = nz;
-}
-
-inline void	CVertexBuilder::Normal3fv(const float* n)
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);           
-	Assert(n);
-	Assert(m_pNormal && m_pCurrNormal);
-	Assert(IsFinite(n[0]) && IsFinite(n[1]) && IsFinite(n[2]));
-	Assert(n[0] >= -1.05f && n[0] <= 1.05f);
-	Assert(n[1] >= -1.05f && n[1] <= 1.05f);
-	Assert(n[2] >= -1.05f && n[2] <= 1.05f);
-
-	float* pDst = m_pCurrNormal;
-	*pDst++ = *n++;
-	*pDst++ = *n++;
-	*pDst = *n;
-}
-
-inline void	CVertexBuilder::NormalDelta3f(float nx, float ny, float nz)
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);           
-	Assert(m_pNormal);
-	Assert(IsFinite(nx) && IsFinite(ny) && IsFinite(nz));
-
-	float* pDst = m_pCurrNormal;
-	*pDst++ = nx;
-	*pDst++ = ny;
-	*pDst = nz;
-}
-
-inline void	CVertexBuilder::NormalDelta3fv(const float* n)
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);           
-	Assert(n);
-	Assert(m_pNormal && m_pCurrNormal);
-	Assert(IsFinite(n[0]) && IsFinite(n[1]) && IsFinite(n[2]));
-
-	float* pDst = m_pCurrNormal;
-	*pDst++ = *n++;
-	*pDst++ = *n++;
-	*pDst = *n;
-}
-
-template <VertexCompressionType_t T> inline void CVertexBuilder::CompressedNormal3f(float nx, float ny, float nz)
-{
-	Assert(T == m_CompressionType);
-	Assert(m_pNormal && m_pCurrNormal);
-	Assert(IsFinite(nx) && IsFinite(ny) && IsFinite(nz));
-	Assert(nx >= -1.05f && nx <= 1.05f);
-	Assert(ny >= -1.05f && ny <= 1.05f);
-	Assert(nz >= -1.05f && nz <= 1.05f);
-	if (T == VERTEX_COMPRESSION_ON)
-	{
-#if		( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_SEPARATETANGENTS_SHORT2 )
-		PackNormal_SHORT2(nx, ny, nz, (unsigned int*)m_pCurrNormal);
-
-#else     
-#ifdef _DEBUG
-		Assert(m_bWrittenUserData == false);
-		m_bWrittenNormal = true;
-#endif
-		PackNormal_UBYTE4(nx, ny, nz, (unsigned int*)m_pCurrNormal);
-#endif
-	}
-	else
-	{
-		float* pDst = m_pCurrNormal;
-		*pDst++ = nx;
-		*pDst++ = ny;
-		*pDst = nz;
-	}
-}
-
-template <VertexCompressionType_t T> inline void CVertexBuilder::CompressedNormal3fv(const float* n)
-{
-	Assert(n);
-	CompressedNormal3f<T>(n[0], n[1], n[2]);
-}
-
-
-inline void	CVertexBuilder::Color3f(float r, float g, float b)
-{
-	Assert(m_pColor && m_pCurrColor);
-	Assert(IsFinite(r) && IsFinite(g) && IsFinite(b));
-	Assert((r >= 0.0) && (g >= 0.0) && (b >= 0.0));
-	Assert((r <= 1.0) && (g <= 1.0) && (b <= 1.0));
-
-	int col = (FastFToC(b)) | (FastFToC(g) << 8) | (FastFToC(r) << 16) | 0xFF000000;
-	*(int*)m_pCurrColor = col;
-}
-
-inline void	CVertexBuilder::Color3fv(const float* rgb)
-{
-	Assert(rgb);
-	Assert(m_pColor && m_pCurrColor);
-	Assert(IsFinite(rgb[0]) && IsFinite(rgb[1]) && IsFinite(rgb[2]));
-	Assert((rgb[0] >= 0.0) && (rgb[1] >= 0.0) && (rgb[2] >= 0.0));
-	Assert((rgb[0] <= 1.0) && (rgb[1] <= 1.0) && (rgb[2] <= 1.0));
-
-	int col = (FastFToC(rgb[2])) | (FastFToC(rgb[1]) << 8) | (FastFToC(rgb[0]) << 16) | 0xFF000000;
-	*(int*)m_pCurrColor = col;
-}
-
-inline void	CVertexBuilder::Color4f(float r, float g, float b, float a)
-{
-	Assert(m_pColor && m_pCurrColor);
-	Assert(IsFinite(r) && IsFinite(g) && IsFinite(b) && IsFinite(a));
-	Assert((r >= 0.0) && (g >= 0.0) && (b >= 0.0) && (a >= 0.0));
-	Assert((r <= 1.0) && (g <= 1.0) && (b <= 1.0) && (a <= 1.0));
-
-	int col = (FastFToC(b)) | (FastFToC(g) << 8) | (FastFToC(r) << 16) | (FastFToC(a) << 24);
-	*(int*)m_pCurrColor = col;
-}
-
-inline void	CVertexBuilder::Color4fv(const float* rgba)
-{
-	Assert(rgba);
-	Assert(m_pColor && m_pCurrColor);
-	Assert(IsFinite(rgba[0]) && IsFinite(rgba[1]) && IsFinite(rgba[2]) && IsFinite(rgba[3]));
-	Assert((rgba[0] >= 0.0) && (rgba[1] >= 0.0) && (rgba[2] >= 0.0) && (rgba[3] >= 0.0));
-	Assert((rgba[0] <= 1.0) && (rgba[1] <= 1.0) && (rgba[2] <= 1.0) && (rgba[3] <= 1.0));
-
-	int col = (FastFToC(rgba[2])) | (FastFToC(rgba[1]) << 8) | (FastFToC(rgba[0]) << 16) | (FastFToC(rgba[3]) << 24);
-	*(int*)m_pCurrColor = col;
-}
-
-
-inline void CVertexBuilder::Color3ub(unsigned char r, unsigned char g, unsigned char b)
-{
-	Assert(m_pColor && m_pCurrColor);
-#ifdef OPENGL_SWAP_COLORS
-	int col = r | (g << 8) | (b << 16) | 0xFF000000;	      
-#else
-	int col = b | (g << 8) | (r << 16) | 0xFF000000;
-#endif
-
-	* (int*)m_pCurrColor = col;
-}
-
-inline void CVertexBuilder::Color3ubv(unsigned char const* rgb)
-{
-	Assert(rgb);
-	Assert(m_pColor && m_pCurrColor);
-#ifdef OPENGL_SWAP_COLORS
-	int col = rgb[0] | (rgb[1] << 8) | (rgb[2] << 16) | 0xFF000000;	      
-#else
-	int col = rgb[2] | (rgb[1] << 8) | (rgb[0] << 16) | 0xFF000000;
-#endif
-
-	* (int*)m_pCurrColor = col;
-}
-
-inline void CVertexBuilder::Color4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-{
-	Assert(m_pColor && m_pCurrColor);
-#ifdef OPENGL_SWAP_COLORS
-	int col = r | (g << 8) | (b << 16) | (a << 24);	      
-#else
-	int col = b | (g << 8) | (r << 16) | (a << 24);
-#endif
-
-	* (int*)m_pCurrColor = col;
-}
-
-inline void CVertexBuilder::Color4ubv(unsigned char const* rgba)
-{
-	Assert(rgba);
-	Assert(m_pColor && m_pCurrColor);
-#ifdef OPENGL_SWAP_COLORS
-	int col = rgba[0] | (rgba[1] << 8) | (rgba[2] << 16) | (rgba[3] << 24);	      
-#else
-	int col = rgba[2] | (rgba[1] << 8) | (rgba[0] << 16) | (rgba[3] << 24);
-#endif
-	* (int*)m_pCurrColor = col;
-}
-
-FORCEINLINE void CVertexBuilder::Color4Packed(int packedColor)
-{
-	*(int*)m_pCurrColor = packedColor;
-}
-
-FORCEINLINE int CVertexBuilder::PackColor4(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-{
-	return b | (g << 8) | (r << 16) | (a << 24);
-}
-
-
-inline void	CVertexBuilder::Specular3f(float r, float g, float b)
-{
-	Assert(m_pSpecular);
-	Assert(IsFinite(r) && IsFinite(g) && IsFinite(b));
-	Assert((r >= 0.0) && (g >= 0.0) && (b >= 0.0));
-	Assert((r <= 1.0) && (g <= 1.0) && (b <= 1.0));
-
-	unsigned char* pSpecular = &m_pSpecular[m_nCurrentVertex * m_VertexSize_Specular];
-	int col = (FastFToC(b)) | (FastFToC(g) << 8) | (FastFToC(r) << 16) | 0xFF000000;
-	*(int*)pSpecular = col;
-}
-
-inline void	CVertexBuilder::Specular3fv(const float* rgb)
-{
-	Assert(rgb);
-	Assert(m_pSpecular);
-	Assert(IsFinite(rgb[0]) && IsFinite(rgb[1]) && IsFinite(rgb[2]));
-	Assert((rgb[0] >= 0.0) && (rgb[1] >= 0.0) && (rgb[2] >= 0.0));
-	Assert((rgb[0] <= 1.0) && (rgb[1] <= 1.0) && (rgb[2] <= 1.0));
-
-	unsigned char* pSpecular = &m_pSpecular[m_nCurrentVertex * m_VertexSize_Specular];
-	int col = (FastFToC(rgb[2])) | (FastFToC(rgb[1]) << 8) | (FastFToC(rgb[0]) << 16) | 0xFF000000;
-	*(int*)pSpecular = col;
-}
-
-inline void	CVertexBuilder::Specular4f(float r, float g, float b, float a)
-{
-	Assert(m_pSpecular);
-	Assert(IsFinite(r) && IsFinite(g) && IsFinite(b) && IsFinite(a));
-	Assert((r >= 0.0) && (g >= 0.0) && (b >= 0.0) && (a >= 0.0));
-	Assert((r <= 1.0) && (g <= 1.0) && (b <= 1.0) && (a <= 1.0f));
-
-	unsigned char* pSpecular = &m_pSpecular[m_nCurrentVertex * m_VertexSize_Specular];
-	int col = (FastFToC(b)) | (FastFToC(g) << 8) | (FastFToC(r) << 16) | (FastFToC(a) << 24);
-	*(int*)pSpecular = col;
-}
-
-inline void	CVertexBuilder::Specular4fv(const float* rgb)
-{
-	Assert(rgb);
-	Assert(m_pSpecular);
-	Assert(IsFinite(rgb[0]) && IsFinite(rgb[1]) && IsFinite(rgb[2]) && IsFinite(rgb[3]));
-	Assert((rgb[0] >= 0.0) && (rgb[1] >= 0.0) && (rgb[2] >= 0.0) && (rgb[3] >= 0.0));
-	Assert((rgb[0] <= 1.0) && (rgb[1] <= 1.0) && (rgb[2] <= 1.0) && (rgb[3] <= 1.0));
-
-	unsigned char* pSpecular = &m_pSpecular[m_nCurrentVertex * m_VertexSize_Specular];
-	int col = (FastFToC(rgb[2])) | (FastFToC(rgb[1]) << 8) | (FastFToC(rgb[0]) << 16) | (FastFToC(rgb[3]) << 24);
-	*(int*)pSpecular = col;
-}
-
-inline void CVertexBuilder::Specular3ub(unsigned char r, unsigned char g, unsigned char b)
-{
-	Assert(m_pSpecular);
-	unsigned char* pSpecular = &m_pSpecular[m_nCurrentVertex * m_VertexSize_Specular];
-
-#ifdef OPENGL_SWAP_COLORS
-	int col = r | (g << 8) | (b << 16) | 0xFF000000;	      
-#else
-	int col = b | (g << 8) | (r << 16) | 0xFF000000;
-#endif
-
-	* (int*)pSpecular = col;
-}
-
-inline void CVertexBuilder::Specular3ubv(unsigned char const* c)
-{
-	Assert(m_pSpecular);
-	unsigned char* pSpecular = &m_pSpecular[m_nCurrentVertex * m_VertexSize_Specular];
-
-#ifdef OPENGL_SWAP_COLORS
-	int col = c[0] | (c[1] << 8) | (c[2] << 16) | 0xFF000000;	      
-#else
-	int col = c[2] | (c[1] << 8) | (c[0] << 16) | 0xFF000000;
-#endif
-
-	* (int*)pSpecular = col;
-}
-
-inline void CVertexBuilder::Specular4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-{
-	Assert(m_pSpecular);
-	unsigned char* pSpecular = &m_pSpecular[m_nCurrentVertex * m_VertexSize_Specular];
-
-#ifdef OPENGL_SWAP_COLORS
-	int col = r | (g << 8) | (b << 16) | (a << 24);	      
-#else
-	int col = b | (g << 8) | (r << 16) | (a << 24);
-#endif
-
-	* (int*)pSpecular = col;
-}
-
-inline void CVertexBuilder::Specular4ubv(unsigned char const* c)
-{
-	Assert(m_pSpecular);
-	unsigned char* pSpecular = &m_pSpecular[m_nCurrentVertex * m_VertexSize_Specular];
-
-#ifdef OPENGL_SWAP_COLORS
-	int col = c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24);
-#else
-	int col = c[2] | (c[1] << 8) | (c[0] << 16) | (c[3] << 24);
-#endif
-
-	* (int*)pSpecular = col;
-}
-
-
-inline void CVertexBuilder::TexCoord1f(int nStage, float s)
-{
-	Assert(m_pTexCoord[nStage] && m_pCurrTexCoord[nStage]);
-	Assert(IsFinite(s));
-
-	float* pDst = m_pCurrTexCoord[nStage];
-	*pDst = s;
-}
-
-inline void	CVertexBuilder::TexCoord2f(int nStage, float s, float t)
-{
-	Assert(m_pTexCoord[nStage] && m_pCurrTexCoord[nStage]);
-	Assert(IsFinite(s) && IsFinite(t));
-
-	float* pDst = m_pCurrTexCoord[nStage];
-	*pDst++ = s;
-	*pDst = t;
-}
-
-inline void	CVertexBuilder::TexCoord2fv(int nStage, const float* st)
-{
-	Assert(st);
-	Assert(m_pTexCoord[nStage] && m_pCurrTexCoord[nStage]);
-	Assert(IsFinite(st[0]) && IsFinite(st[1]));
-
-	float* pDst = m_pCurrTexCoord[nStage];
-	*pDst++ = *st++;
-	*pDst = *st;
-}
-
-inline void	CVertexBuilder::TexCoord3f(int stage, float s, float t, float u)
-{
-	Assert(m_pTexCoord[stage] && m_pCurrTexCoord[stage]);
-	Assert(IsFinite(s) && IsFinite(t) && IsFinite(u));
-	float* pDst = m_pCurrTexCoord[stage];
-	*pDst++ = s;
-	*pDst++ = t;
-	*pDst = u;
-}
-
-inline void	CVertexBuilder::TexCoord3fv(int stage, const float* stu)
-{
-	Assert(stu);
-	Assert(m_pTexCoord[stage] && m_pCurrTexCoord[stage]);
-	Assert(IsFinite(stu[0]) && IsFinite(stu[1]) && IsFinite(stu[2]));
-
-	float* pDst = m_pCurrTexCoord[stage];
-	*pDst++ = *stu++;
-	*pDst++ = *stu++;
-	*pDst = *stu;
-}
-
-inline void	CVertexBuilder::TexCoord4f(int stage, float s, float t, float u, float v)
-{
-	Assert(m_pTexCoord[stage] && m_pCurrTexCoord[stage]);
-	Assert(IsFinite(s) && IsFinite(t) && IsFinite(u));
-	float* pDst = m_pCurrTexCoord[stage];
-	*pDst++ = s;
-	*pDst++ = t;
-	*pDst++ = u;
-	*pDst = v;
-}
-
-inline void	CVertexBuilder::TexCoord4fv(int stage, const float* stuv)
-{
-	Assert(stuv);
-	Assert(m_pTexCoord[stage] && m_pCurrTexCoord[stage]);
-	Assert(IsFinite(stuv[0]) && IsFinite(stuv[1]) && IsFinite(stuv[2]));
-
-	float* pDst = m_pCurrTexCoord[stage];
-	*pDst++ = *stuv++;
-	*pDst++ = *stuv++;
-	*pDst++ = *stuv++;
-	*pDst = *stuv;
-}
-
-
-inline void CVertexBuilder::TexCoordSubRect2f(int stage, float s, float t, float offsetS, float offsetT, float scaleS, float scaleT)
-{
-	Assert(m_pTexCoord[stage] && m_pCurrTexCoord[stage]);
-	Assert(IsFinite(s) && IsFinite(t));
-
-	float* pDst = m_pCurrTexCoord[stage];
-	*pDst++ = (s * scaleS) + offsetS;
-	*pDst = (t * scaleT) + offsetT;
-}
-
-inline void CVertexBuilder::TexCoordSubRect2fv(int stage, const float* st, const float* offset, const float* scale)
-{
-	Assert(st);
-	Assert(m_pTexCoord[stage] && m_pCurrTexCoord[stage]);
-	Assert(IsFinite(st[0]) && IsFinite(st[1]));
-
-	float* pDst = m_pCurrTexCoord[stage];
-	*pDst++ = (*st++ * *scale++) + *offset++;
-	*pDst = (*st * *scale) + *offset;
-}
-
-
-inline void CVertexBuilder::TangentS3f(float sx, float sy, float sz)
-{
-	Assert(m_pTangentS);
-	Assert(IsFinite(sx) && IsFinite(sy) && IsFinite(sz));
-
-	float* pTangentS = OffsetFloatPointer(m_pTangentS, m_nCurrentVertex, m_VertexSize_TangentS);
-	*pTangentS++ = sx;
-	*pTangentS++ = sy;
-	*pTangentS = sz;
-}
-
-inline void CVertexBuilder::TangentS3fv(const float* s)
-{
-	Assert(s);
-	Assert(m_pTangentS);
-	Assert(IsFinite(s[0]) && IsFinite(s[1]) && IsFinite(s[2]));
-
-	float* pTangentS = OffsetFloatPointer(m_pTangentS, m_nCurrentVertex, m_VertexSize_TangentS);
-	*pTangentS++ = *s++;
-	*pTangentS++ = *s++;
-	*pTangentS = *s;
-}
-
-inline void CVertexBuilder::TangentT3f(float tx, float ty, float tz)
-{
-	Assert(m_pTangentT);
-	Assert(IsFinite(tx) && IsFinite(ty) && IsFinite(tz));
-
-	float* pTangentT = OffsetFloatPointer(m_pTangentT, m_nCurrentVertex, m_VertexSize_TangentT);
-	*pTangentT++ = tx;
-	*pTangentT++ = ty;
-	*pTangentT = tz;
-}
-
-inline void CVertexBuilder::TangentT3fv(const float* t)
-{
-	Assert(t);
-	Assert(m_pTangentT);
-	Assert(IsFinite(t[0]) && IsFinite(t[1]) && IsFinite(t[2]));
-
-	float* pTangentT = OffsetFloatPointer(m_pTangentT, m_nCurrentVertex, m_VertexSize_TangentT);
-	*pTangentT++ = *t++;
-	*pTangentT++ = *t++;
-	*pTangentT = *t;
-}
-
-
-inline void CVertexBuilder::Wrinkle1f(float flWrinkle)
-{
-	Assert(m_pWrinkle);
-	Assert(IsFinite(flWrinkle));
-
-	float* pWrinkle = OffsetFloatPointer(m_pWrinkle, m_nCurrentVertex, m_VertexSize_Wrinkle);
-	*pWrinkle = flWrinkle;
-}
-
-
-inline void CVertexBuilder::BoneWeight(int idx, float weight)
-{
-	Assert(m_pBoneWeight);
-	Assert(IsFinite(weight));
-	Assert(idx >= 0);
-	Assert(m_NumBoneWeights == 2);
-
-	if (idx < m_NumBoneWeights)
-	{
-		float* pBoneWeight = OffsetFloatPointer(m_pBoneWeight, m_nCurrentVertex, m_VertexSize_BoneWeight);
-		pBoneWeight[idx] = weight;
-	}
-}
-
-inline void CVertexBuilder::BoneWeights2(float weight1, float weight2)
-{
-	Assert(m_pBoneWeight);
-	Assert(IsFinite(weight1) && IsFinite(weight2));
-	AssertOnce(m_NumBoneWeights == 2);
-
-	float* pBoneWeight = OffsetFloatPointer(m_pBoneWeight, m_nCurrentVertex, m_VertexSize_BoneWeight);
-	pBoneWeight[0] = weight1;
-	pBoneWeight[1] = weight2;
-}
-
-inline void CVertexBuilder::BoneMatrix(int idx, int matrixIdx)
-{
-	Assert(m_pBoneMatrixIndex);
-	Assert(idx >= 0);
-	Assert(idx < 4);
-
-	if (matrixIdx == BONE_MATRIX_INDEX_INVALID)
-	{
-		matrixIdx = 0;
-	}
-	Assert((matrixIdx >= 0) && (matrixIdx < 53));
-
-#ifndef NEW_SKINNING
-	unsigned char* pBoneMatrix = &m_pBoneMatrixIndex[m_nCurrentVertex * m_VertexSize_BoneMatrixIndex];
-	if (IsX360())
-	{
-		idx = 3 - idx;
-	}
-	pBoneMatrix[idx] = (unsigned char)matrixIdx;
-#else
-	float* pBoneMatrix = &m_pBoneMatrixIndex[m_nCurrentVertex * m_VertexSize_BoneMatrixIndex];
-	pBoneMatrix[idx] = matrixIdx;
-#endif
-}
-
-inline void CVertexBuilder::BoneMatrices4(int matrixIdx0, int matrixIdx1, int matrixIdx2, int matrixIdx3)
-{
-	Assert(m_pBoneMatrixIndex);
-
-	Assert(matrixIdx0 != BONE_MATRIX_INDEX_INVALID);
-	Assert(matrixIdx1 != BONE_MATRIX_INDEX_INVALID);
-	Assert(matrixIdx2 != BONE_MATRIX_INDEX_INVALID);
-	Assert(matrixIdx3 != BONE_MATRIX_INDEX_INVALID);
-
-#ifndef NEW_SKINNING
-	int nVal;
-	if (IsX360())
-	{
-		nVal = matrixIdx3 | (matrixIdx2 << 8) | (matrixIdx1 << 16) | (matrixIdx0 << 24);
-	}
-	else
-	{
-		nVal = matrixIdx0 | (matrixIdx1 << 8) | (matrixIdx2 << 16) | (matrixIdx3 << 24);
-	}
-	int* pBoneMatrix = (int*)(&m_pBoneMatrixIndex[m_nCurrentVertex * m_VertexSize_BoneMatrixIndex]);
-	*pBoneMatrix = nVal;
-#else
-	float* pBoneMatrix = &m_pBoneMatrixIndex[m_nCurrentVertex * m_VertexSize_BoneMatrixIndex];
-	pBoneMatrix[0] = matrixIdx0;
-	pBoneMatrix[1] = matrixIdx1;
-	pBoneMatrix[2] = matrixIdx2;
-	pBoneMatrix[3] = matrixIdx3;
-#endif
-}
-
-template <VertexCompressionType_t T> inline void CVertexBuilder::CompressedBoneWeight3fv(const float* pWeights)
-{
-	Assert(T == m_CompressionType);
-	Assert(m_pBoneWeight);
-	Assert(pWeights);
-
-	float* pDestWeights = OffsetFloatPointer(m_pBoneWeight, m_nCurrentVertex, m_VertexSize_BoneWeight);
-
-	if (T == VERTEX_COMPRESSION_ON)
-	{
-		Assert(m_NumBoneWeights <= 2);
-
-		const int WEIGHT0_SHIFT = IsX360() ? 16 : 0;
-		const int WEIGHT1_SHIFT = IsX360() ? 0 : 16;
-		unsigned int* weights = (unsigned int*)pDestWeights;
-
-		Assert(IsFinite(pWeights[0]) && (pWeights[0] >= 0.0f) && (pWeights[0] <= 1.0f));
-		unsigned int weight0 = Float2Int(pWeights[0] * 32768.0f);
-		*weights = (0x0000FFFF & (weight0 - 1)) << WEIGHT0_SHIFT;
-
-#ifdef DEBUG
-		if (m_NumBoneWeights == 1)
-		{
-			Assert(IsFinite(pWeights[1]) && (pWeights[1] >= 0.0f) && (pWeights[1] <= 1.0f));
-			unsigned int weight1 = Float2Int(pWeights[1] * 32768.0f);
-			Assert((weight0 + weight1) <= 32768);
-		}
-#endif
-
-		if (m_NumBoneWeights > 1)
-		{
-			Assert(m_NumBoneWeights == 2);
-			Assert(IsFinite(pWeights[1]) && (pWeights[1] >= 0.0f) && (pWeights[1] <= 1.0f));
-			Assert(IsFinite(pWeights[2]) && (pWeights[2] >= 0.0f) && (pWeights[2] <= 1.0f));
-			unsigned int weight1 = Float2Int(pWeights[1] * 32768.0f);
-			unsigned int weight2 = Float2Int(pWeights[2] * 32768.0f);
-			Assert((weight0 + weight1 + weight2) <= 32768);
-			unsigned int residual = 32768 - (weight0 + weight1 + weight2);
-			weight1 += residual;  
-			*weights |= (0x0000FFFF & (weight1 - 1)) << WEIGHT1_SHIFT;
-		}
-	}
-	else	  
-	{
-		pDestWeights[0] = pWeights[0];
-		pDestWeights[1] = pWeights[1];
-	}
-}
-
-inline void CVertexBuilder::UserData(const float* pData)
-{
-	Assert(m_CompressionType == VERTEX_COMPRESSION_NONE);           
-	Assert(pData);
-
-	int userDataSize = 4;  
-	float* pUserData = OffsetFloatPointer(m_pUserData, m_nCurrentVertex, m_VertexSize_UserData);
-	memcpy(pUserData, pData, sizeof(float) * userDataSize);
-}
-
-template <VertexCompressionType_t T> inline void CVertexBuilder::CompressedUserData(const float* pData)
-{
-	Assert(T == m_CompressionType);
-	Assert(pData);
-	Assert(IsFinite(pData[0]) && IsFinite(pData[1]) && IsFinite(pData[2]));
-	Assert(pData[0] >= -1.05f && pData[0] <= 1.05f);
-	Assert(pData[1] >= -1.05f && pData[1] <= 1.05f);
-	Assert(pData[2] >= -1.05f && pData[2] <= 1.05f);
-	Assert(pData[3] == +1.0f || pData[3] == -1.0f);
-	if (T == VERTEX_COMPRESSION_ON)
-	{
-		float binormalSign = pData[3];
-
-#if		( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_SEPARATETANGENTS_SHORT2 )
-		float* pUserData = OffsetFloatPointer(m_pUserData, m_nCurrentVertex, m_VertexSize_UserData);
-		PackNormal_SHORT2(pData, (unsigned int*)pUserData, binormalSign);
-#else      
-		unsigned int existingNormalData = *(unsigned int*)m_pCurrNormal;
-		Assert((existingNormalData & 0xFFFF0000) == 0);
-#ifdef _DEBUG
-		Assert(m_bWrittenNormal == true);
-		m_bWrittenUserData = true;
-#endif
-		bool bIsTangent = true;
-		unsigned int tangentData = 0;
-		PackNormal_UBYTE4(pData, &tangentData, bIsTangent, binormalSign);
-		*(unsigned int*)m_pCurrNormal = existingNormalData | tangentData;
-#endif
-	}
-	else
-	{
-		int userDataSize = 4;  
-		float* pUserData = OffsetFloatPointer(m_pUserData, m_nCurrentVertex, m_VertexSize_UserData);
-		memcpy(pUserData, pData, sizeof(float) * userDataSize);
-	}
-}
-
-
-class CIndexBuilder : private IndexDesc_t
-{
-public:
-	CIndexBuilder();
-	CIndexBuilder(IIndexBuffer* pIndexBuffer, MaterialIndexFormat_t fmt = MATERIAL_INDEX_FORMAT_UNKNOWN);
-	~CIndexBuilder();
-
-	bool Lock(int nMaxIndexCount, int nIndexOffset, bool bAppend = false);
-	void Unlock();
-
-	void SpewData();
-
-	int GetRoomRemaining() const;
-
-	void Bind(IMatRenderContext* pContext);
-
-	int Offset() const;
-
-	void Begin(IIndexBuffer* pIndexBuffer, int nMaxIndexCount, int nIndexOffset = 0);
-	void End(bool bSpewData = false);
-
-	void BeginModify(IIndexBuffer* pIndexBuffer, int firstIndex = 0, int numIndices = 0, int nIndexOffset = 0);
-	void EndModify(bool bSpewData = false);
-
-	int	IndexCount() const;
-
-	int TotalIndexCount() const;
-
-	void Reset();
-
-	void SelectIndex(int nBufferIndex);
-
-	void AdvanceIndex();
-	void AdvanceIndices(int numIndices);
-
-	int GetCurrentIndex();
-	int GetFirstIndex() const;
-
-	unsigned short const* Index() const;
-
-	void Index(unsigned short nIndex);
-
-	void FastIndex(unsigned short nIndex);
-
-	void FastIndex2(unsigned short nIndex1, unsigned short nIndex2);
-
-	void GenerateIndices(MaterialPrimitiveType_t primitiveType, int numIndices);
-
-	void AttachBegin(IMesh* pMesh, int nMaxIndexCount, const MeshDesc_t& desc);
-	void AttachEnd();
-	void AttachBeginModify(IMesh* pMesh, int firstIndex, int numIndices, const MeshDesc_t& desc);
-	void AttachEndModify();
-
-	void FastTriangle(int startVert);
-	void FastQuad(int startVert);
-	void FastPolygon(int startVert, int numTriangles);
-	void FastPolygonList(int startVert, int* pVertexCount, int polygonCount);
-	void FastIndexList(const unsigned short* pIndexList, int startVert, int indexCount);
-
-private:
-	IIndexBuffer* m_pIndexBuffer;
-
-	int				m_nMaxIndexCount;
-
-	int				m_nIndexCount;
-
-	int				m_nIndexOffset;
-
-	mutable int		m_nCurrentIndex;
-
-	int				m_nTotalIndexCount;
-
-	unsigned int	m_nBufferOffset;
-	unsigned int	m_nBufferFirstIndex;
-
-	bool			m_bModify;
-};
-
-
-inline CIndexBuilder::CIndexBuilder() : m_pIndexBuffer(0), m_nMaxIndexCount(0),
-m_nIndexCount(0), m_nCurrentIndex(0)
-{
-	m_nTotalIndexCount = 0;
-	m_nBufferOffset = INVALID_BUFFER_OFFSET;
-	m_nBufferFirstIndex = 0;
-#ifdef _DEBUG
-	m_bModify = false;
-#endif
-}
-
-inline CIndexBuilder::CIndexBuilder(IIndexBuffer* pIndexBuffer, MaterialIndexFormat_t fmt)
-{
-	m_pIndexBuffer = pIndexBuffer;
-	m_nBufferOffset = INVALID_BUFFER_OFFSET;
-	m_nBufferFirstIndex = 0;
-	m_nIndexCount = 0;
-	m_nCurrentIndex = 0;
-	m_nMaxIndexCount = 0;
-	m_nTotalIndexCount = 0;
-	if (m_pIndexBuffer->IsDynamic())
-	{
-		m_pIndexBuffer->BeginCastBuffer(fmt);
-	}
-	else
-	{
-		Assert(m_pIndexBuffer->IndexFormat() == fmt);
-	}
-#ifdef _DEBUG
-	m_bModify = false;
-#endif
-}
-
-inline CIndexBuilder::~CIndexBuilder()
-{
-	if (m_pIndexBuffer && m_pIndexBuffer->IsDynamic())
-	{
-		m_pIndexBuffer->EndCastBuffer();
-	}
-}
-
-
-inline bool CIndexBuilder::Lock(int nMaxIndexCount, int nIndexOffset, bool bAppend)
-{
-	Assert(m_pIndexBuffer);
-	m_bModify = false;
-	m_nIndexOffset = nIndexOffset;
-	m_nMaxIndexCount = nMaxIndexCount;
-	m_nIndexCount = 0;
-	bool bFirstLock = (m_nBufferOffset == INVALID_BUFFER_OFFSET);
-	if (bFirstLock)
-	{
-		bAppend = false;
-	}
-	if (!bAppend)
-	{
-		m_nTotalIndexCount = 0;
-	}
-	Reset();
-
-	if (!m_pIndexBuffer->Lock(m_nMaxIndexCount, bAppend, *this))
-	{
-		m_nMaxIndexCount = 0;
-		return false;
-	}
-
-	if (bFirstLock)
-	{
-		m_nBufferOffset = m_nOffset;
-		m_nBufferFirstIndex = m_nFirstIndex;
-	}
-
-	return true;
-}
-
-inline void CIndexBuilder::Unlock()
-{
-	Assert(!m_bModify && m_pIndexBuffer);
-
-	m_pIndexBuffer->Unlock(m_nIndexCount, *this);
-	m_nTotalIndexCount += m_nIndexCount;
-
-	m_nMaxIndexCount = 0;
-
-#ifdef _DEBUG
-	memset((IndexDesc_t*)this, 0, sizeof(IndexDesc_t));
-#endif
-}
-
-inline void CIndexBuilder::SpewData()
-{
-	m_pIndexBuffer->Spew(m_nIndexCount, *this);
-}
-
-
-inline void CIndexBuilder::Bind(IMatRenderContext* pContext)
-{
-	if (m_pIndexBuffer && (m_nBufferOffset != INVALID_BUFFER_OFFSET))
-	{
-		pContext->BindIndexBuffer(m_pIndexBuffer, m_nBufferOffset);
-	}
-	else
-	{
-		pContext->BindIndexBuffer(NULL, 0);
-	}
-}
-
-
-inline int CIndexBuilder::Offset() const
-{
-	return m_nBufferOffset;
-}
-
-inline int CIndexBuilder::GetFirstIndex() const
-{
-	return m_nBufferFirstIndex;
-}
-
-
-inline void CIndexBuilder::Begin(IIndexBuffer* pIndexBuffer, int nMaxIndexCount, int nIndexOffset)
-{
-	Assert(pIndexBuffer && (!m_pIndexBuffer));
-
-	m_pIndexBuffer = pIndexBuffer;
-	m_nIndexCount = 0;
-	m_nMaxIndexCount = nMaxIndexCount;
-	m_nIndexOffset = nIndexOffset;
-
-	m_bModify = false;
-
-	m_pIndexBuffer->Lock(m_nMaxIndexCount, false, *this);
-
-	Reset();
-}
-
-inline void CIndexBuilder::End(bool bSpewData)
-{
-	Assert(!m_bModify);
-
-	if (bSpewData)
-	{
-		m_pIndexBuffer->Spew(m_nIndexCount, *this);
-	}
-
-	m_pIndexBuffer->Unlock(m_nIndexCount, *this);
-
-	m_pIndexBuffer = 0;
-	m_nMaxIndexCount = 0;
-
-#ifdef _DEBUG
-	memset((IndexDesc_t*)this, 0, sizeof(IndexDesc_t));
-#endif
-}
-
-
-inline void CIndexBuilder::BeginModify(IIndexBuffer* pIndexBuffer, int nFirstIndex, int nIndexCount, int nIndexOffset)
-{
-	m_pIndexBuffer = pIndexBuffer;
-	m_nIndexCount = nIndexCount;
-	m_nMaxIndexCount = nIndexCount;
-	m_nIndexOffset = nIndexOffset;
-	m_bModify = true;
-
-	m_pIndexBuffer->ModifyBegin(false, nFirstIndex, nIndexCount, *this);
-
-	Reset();
-}
-
-inline void CIndexBuilder::EndModify(bool bSpewData)
-{
-	Assert(m_pIndexBuffer);
-	Assert(m_bModify);	     
-
-	if (bSpewData)
-	{
-		m_pIndexBuffer->Spew(m_nIndexCount, *this);
-	}
-
-	m_pIndexBuffer->ModifyEnd(*this);
-
-	m_pIndexBuffer = 0;
-	m_nMaxIndexCount = 0;
-
-#ifdef _DEBUG
-	memset((IndexDesc_t*)this, 0, sizeof(IndexDesc_t));
-#endif
-}
-
-
-inline void CIndexBuilder::AttachBegin(IMesh* pMesh, int nMaxIndexCount, const MeshDesc_t& desc)
-{
-	m_pIndexBuffer = pMesh;
-	m_nIndexCount = 0;
-	m_nMaxIndexCount = nMaxIndexCount;
-
-	m_bModify = false;
-
-	m_nIndexOffset = desc.m_nFirstVertex;
-	m_pIndices = desc.m_pIndices;
-	m_nIndexSize = desc.m_nIndexSize;
-
-	Reset();
-}
-
-inline void CIndexBuilder::AttachEnd()
-{
-	Assert(m_pIndexBuffer);
-	Assert(!m_bModify);	     
-
-	m_pIndexBuffer = 0;
-	m_nMaxIndexCount = 0;
-
-#ifdef _DEBUG
-	memset((IndexDesc_t*)this, 0, sizeof(IndexDesc_t));
-#endif
-}
-
-inline void CIndexBuilder::AttachBeginModify(IMesh* pMesh, int nFirstIndex, int nIndexCount, const MeshDesc_t& desc)
-{
-	m_pIndexBuffer = pMesh;
-	m_nIndexCount = nIndexCount;
-	m_nMaxIndexCount = nIndexCount;
-	m_bModify = true;
-
-	m_nIndexOffset = desc.m_nFirstVertex;
-	m_pIndices = desc.m_pIndices;
-	m_nIndexSize = desc.m_nIndexSize;
-
-	Reset();
-}
-
-inline void CIndexBuilder::AttachEndModify()
-{
-	Assert(m_pIndexBuffer);
-	Assert(m_bModify);	     
-
-	m_pIndexBuffer = 0;
-	m_nMaxIndexCount = 0;
-
-#ifdef _DEBUG
-	memset((IndexDesc_t*)this, 0, sizeof(IndexDesc_t));
-#endif
-}
-
-
-inline void CIndexBuilder::Reset()
-{
-	m_nCurrentIndex = 0;
-}
-
-
-inline int CIndexBuilder::IndexCount() const
-{
-	return m_nIndexCount;
-}
-
-
-inline int CIndexBuilder::TotalIndexCount() const
-{
-	return m_nTotalIndexCount;
-}
-
-
-inline void CIndexBuilder::AdvanceIndex()
-{
-	m_nCurrentIndex += m_nIndexSize;
-	if (m_nCurrentIndex > m_nIndexCount)
-	{
-		m_nIndexCount = m_nCurrentIndex;
-	}
-}
-
-inline void CIndexBuilder::AdvanceIndices(int nIndices)
-{
-	m_nCurrentIndex += nIndices * m_nIndexSize;
-	if (m_nCurrentIndex > m_nIndexCount)
-	{
-		m_nIndexCount = m_nCurrentIndex;
-	}
-}
-
-
-inline int CIndexBuilder::GetCurrentIndex()
-{
-	return m_nCurrentIndex;
-}
-
-inline unsigned short const* CIndexBuilder::Index() const
-{
-	Assert(m_nCurrentIndex < m_nMaxIndexCount);
-	return &m_pIndices[m_nCurrentIndex];
-}
-
-inline void CIndexBuilder::SelectIndex(int nIndex)
-{
-	Assert((nIndex >= 0) && (nIndex < m_nIndexCount));
-	m_nCurrentIndex = nIndex * m_nIndexSize;
-}
-
-
-inline void CIndexBuilder::Index(unsigned short nIndex)
-{
-	Assert(m_pIndices);
-	Assert(m_nCurrentIndex < m_nMaxIndexCount);
-	m_pIndices[m_nCurrentIndex] = (unsigned short)(m_nIndexOffset + nIndex);
-}
-
-inline void CIndexBuilder::FastIndex(unsigned short nIndex)
-{
-	Assert(m_pIndices);
-	Assert(m_nCurrentIndex < m_nMaxIndexCount);
-	m_pIndices[m_nCurrentIndex] = (unsigned short)(m_nIndexOffset + nIndex);
-	m_nCurrentIndex += m_nIndexSize;
-	m_nIndexCount = m_nCurrentIndex;
-}
-
-FORCEINLINE void CIndexBuilder::FastTriangle(int startVert)
-{
-	startVert += m_nIndexOffset;
-	unsigned short* pIndices = &m_pIndices[m_nCurrentIndex];
-	*pIndices++ = startVert++;
-	*pIndices++ = startVert++;
-	*pIndices++ = startVert;
-	AdvanceIndices(3);
-}
-
-FORCEINLINE void CIndexBuilder::FastQuad(int startVert)
-{
-	startVert += m_nIndexOffset;
-	unsigned short* pIndices = &m_pIndices[m_nCurrentIndex];
-	*pIndices++ = startVert++;
-	*pIndices++ = startVert++;
-	*pIndices++ = startVert;
-
-	*pIndices++ = startVert - 2;
-	*pIndices++ = startVert++;
-	*pIndices++ = startVert;
-	AdvanceIndices(6);
-}
-
-inline void CIndexBuilder::FastPolygon(int startVert, int triangleCount)
-{
-	unsigned short* pIndex = &m_pIndices[m_nCurrentIndex];
-	startVert += m_nIndexOffset;
-	if (!IsX360())
-	{
-		Assert(m_nIndexSize == 0 || m_nIndexSize == 1);
-		triangleCount *= m_nIndexSize;
-	}
-	for (int v = 0; v < triangleCount; ++v)
-	{
-		*pIndex++ = startVert;
-		*pIndex++ = startVert + v + 1;
-		*pIndex++ = startVert + v + 2;
-	}
-	AdvanceIndices(triangleCount * 3);
-}
-
-inline void CIndexBuilder::FastPolygonList(int startVert, int* pVertexCount, int polygonCount)
-{
-	unsigned short* pIndex = &m_pIndices[m_nCurrentIndex];
-	startVert += m_nIndexOffset;
-	int indexOut = 0;
-
-	if (!IsX360())
-	{
-		Assert(m_nIndexSize == 0 || m_nIndexSize == 1);
-		polygonCount *= m_nIndexSize;
-	}
-
-	for (int i = 0; i < polygonCount; i++)
-	{
-		int vertexCount = pVertexCount[i];
-		int triangleCount = vertexCount - 2;
-		for (int v = 0; v < triangleCount; ++v)
-		{
-			*pIndex++ = startVert;
-			*pIndex++ = startVert + v + 1;
-			*pIndex++ = startVert + v + 2;
-		}
-		startVert += vertexCount;
-		indexOut += triangleCount * 3;
-	}
-	AdvanceIndices(indexOut);
-}
-
-inline void CIndexBuilder::FastIndexList(const unsigned short* pIndexList, int startVert, int indexCount)
-{
-	unsigned short* pIndexOut = &m_pIndices[m_nCurrentIndex];
-	startVert += m_nIndexOffset;
-	if (!IsX360())
-	{
-		Assert(m_nIndexSize == 0 || m_nIndexSize == 1);
-		indexCount *= m_nIndexSize;
-	}
-	for (int i = 0; i < indexCount; ++i)
-	{
-		pIndexOut[i] = startVert + pIndexList[i];
-	}
-	AdvanceIndices(indexCount);
-}
-
-
-inline void CIndexBuilder::FastIndex2(unsigned short nIndex1, unsigned short nIndex2)
-{
-	Assert(m_pIndices);
-	Assert(m_nCurrentIndex < m_nMaxIndexCount - 1);
-#ifndef _X360
-	unsigned int nIndices = ((unsigned int)nIndex1 + m_nIndexOffset) | (((unsigned int)nIndex2 + m_nIndexOffset) << 16);
-#else
-	unsigned int nIndices = ((unsigned int)nIndex2 + m_nIndexOffset) | (((unsigned int)nIndex1 + m_nIndexOffset) << 16);
-#endif
-
-	* (int*)(&m_pIndices[m_nCurrentIndex]) = nIndices;
-	m_nCurrentIndex += m_nIndexSize + m_nIndexSize;
-	m_nIndexCount = m_nCurrentIndex;
-}
-
-
-inline void CIndexBuilder::GenerateIndices(MaterialPrimitiveType_t primitiveType, int nIndexCount)
-{
-	if (m_nIndexSize == 0)
-		return;
-
-	int nMaxIndices = m_nMaxIndexCount - m_nCurrentIndex;
-	nIndexCount = MIN(nMaxIndices, nIndexCount);
-	if (nIndexCount == 0)
-		return;
-
-	unsigned short* pIndices = &m_pIndices[m_nCurrentIndex];
-
-	switch (primitiveType)
-	{
-	case MATERIAL_INSTANCED_QUADS:
-		Assert(0);        
-		break;
-	case MATERIAL_QUADS:
-		GenerateQuadIndexBuffer(pIndices, nIndexCount, m_nIndexOffset);
-		break;
-	case MATERIAL_POLYGON:
-		GeneratePolygonIndexBuffer(pIndices, nIndexCount, m_nIndexOffset);
-		break;
-	case MATERIAL_LINE_STRIP:
-		GenerateLineStripIndexBuffer(pIndices, nIndexCount, m_nIndexOffset);
-		break;
-	case MATERIAL_LINE_LOOP:
-		GenerateLineLoopIndexBuffer(pIndices, nIndexCount, m_nIndexOffset);
-		break;
-	case MATERIAL_POINTS:
-		Assert(0);        
-		break;
-	case MATERIAL_SUBD_QUADS_EXTRA:
-	case MATERIAL_SUBD_QUADS_REG:
-	default:
-		GenerateSequentialIndexBuffer(pIndices, nIndexCount, m_nIndexOffset);
-		break;
-	}
-
-	AdvanceIndices(nIndexCount);
-}
-
-
-class CMeshBuilder : public MeshDesc_t
-{
-public:
-	CMeshBuilder();
-	~CMeshBuilder() { Assert(!m_pMesh); }		          
-
-	operator CIndexBuilder& () { return m_IndexBuilder; }
-
-	void SetCompressionType(VertexCompressionType_t compressionType);
-
-	void Begin(IMesh* pMesh, MaterialPrimitiveType_t type, int numPrimitives);
-
-	void Begin(IMesh* pMesh, MaterialPrimitiveType_t type, int nVertexCount, int nIndexCount, int* nFirstVertex);
-	void Begin(IMesh* pMesh, MaterialPrimitiveType_t type, int nVertexCount, int nIndexCount);
-
-	void Begin(IVertexBuffer* pVertexBuffer, MaterialPrimitiveType_t type, int numPrimitives);
-	void Begin(IVertexBuffer* pVertexBuffer, IIndexBuffer* pIndexBuffer, MaterialPrimitiveType_t type, int nVertexCount, int nIndexCount, int* nFirstVertex);
-	void Begin(IVertexBuffer* pVertexBuffer, IIndexBuffer* pIndexBuffer, MaterialPrimitiveType_t type, int nVertexCount, int nIndexCount);
-
-	void End(bool bSpewData = false, bool bDraw = false);
-
-	void BeginModify(IMesh* pMesh, int nFirstVertex = 0, int nVertexCount = -1, int nFirstIndex = 0, int nIndexCount = 0);
-	void EndModify(bool bSpewData = false);
-
-	void DrawQuad(IMesh* pMesh, const float* v1, const float* v2,
-		const float* v3, const float* v4, unsigned char const* pColor, bool wireframe = false);
-
-	int VertexCount() const;
-	int	IndexCount() const;
-
-	void Reset();
-
-	int VertexSize() { return m_ActualVertexSize; }
-
-	int TextureCoordinateSize(int nTexCoordNumber) { return m_VertexSize_TexCoord[nTexCoordNumber]; }
-
-	void* BaseVertexData();
-
-	void SelectVertex(int idx);
-	void SelectIndex(int idx);
-
-	void SelectVertexFromIndex(int idx);
-
-	void AdvanceVertex();
-	template<int nFlags, int nNumTexCoords> void AdvanceVertexF();
-	void AdvanceVertices(int nVerts);
-	void AdvanceIndex();
-	void AdvanceIndices(int nIndices);
-
-	int GetCurrentVertex();
-	int GetCurrentIndex();
-
-	const float* Position() const;
-
-	const float* Normal() const;
-
-	unsigned int Color() const;
-
-	unsigned char* Specular() const;
-
-	const float* TexCoord(int stage) const;
-
-	const float* TangentS() const;
-	const float* TangentT() const;
-
-	const float* BoneWeight() const;
-	float Wrinkle() const;
-
-	int NumBoneWeights() const;
-#ifndef NEW_SKINNING
-	unsigned char* BoneMatrix() const;
-#else
-	float* BoneMatrix() const;
-#endif
-	unsigned short const* Index() const;
-
-	void Position3f(float x, float y, float z);
-	void Position3fv(const float* v);
-
-	void Normal3f(float nx, float ny, float nz);
-	void Normal3fv(const float* n);
-	void NormalDelta3fv(const float* n);
-	void NormalDelta3f(float nx, float ny, float nz);
-
-	template <VertexCompressionType_t T> void CompressedNormal3f(float nx, float ny, float nz);
-	template <VertexCompressionType_t T> void CompressedNormal3fv(const float* n);
-
-	void Color3f(float r, float g, float b);
-	void Color3fv(const float* rgb);
-	void Color4f(float r, float g, float b, float a);
-	void Color4fv(const float* rgba);
-
-	void Color3ub(unsigned char r, unsigned char g, unsigned char b);
-	void Color3ubv(unsigned char const* rgb);
-	void Color4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-	void Color4ubv(unsigned char const* rgba);
-	void Color4Packed(int packedColor);
-	int PackColor4(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-
-	void Specular3f(float r, float g, float b);
-	void Specular3fv(const float* rgb);
-	void Specular4f(float r, float g, float b, float a);
-	void Specular4fv(const float* rgba);
-
-	void Specular3ub(unsigned char r, unsigned char g, unsigned char b);
-	void Specular3ubv(unsigned char const* c);
-	void Specular4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-	void Specular4ubv(unsigned char const* c);
-
-	void TexCoord1f(int stage, float s);
-	void TexCoord2f(int stage, float s, float t);
-	void TexCoord2fv(int stage, const float* st);
-	void TexCoord3f(int stage, float s, float t, float u);
-	void TexCoord3fv(int stage, const float* stu);
-	void TexCoord4f(int stage, float s, float t, float u, float w);
-	void TexCoord4fv(int stage, const float* stuv);
-
-	void TexCoordSubRect2f(int stage, float s, float t, float offsetS, float offsetT, float scaleS, float scaleT);
-	void TexCoordSubRect2fv(int stage, const float* st, const float* offset, const float* scale);
-
-	void TangentS3f(float sx, float sy, float sz);
-	void TangentS3fv(const float* s);
-
-	void TangentT3f(float tx, float ty, float tz);
-	void TangentT3fv(const float* t);
-
-	void Wrinkle1f(float flWrinkle);
-
-	void BoneWeight(int idx, float weight);
-	void BoneWeights2(float weight1, float weight2);
-
-	template <VertexCompressionType_t T> void CompressedBoneWeight3fv(const float* pWeights);
-
-	void BoneMatrix(int idx, int matrixIndex);
-	void BoneMatrices4(int matrixIdx0, int matrixIdx1, int matrixIdx2, int matrixIdx3);
-
-	void UserData(const float* pData);
-	template <VertexCompressionType_t T> void CompressedUserData(const float* pData);
-
-	void Index(unsigned short index);
-
-	void FastIndex2(unsigned short nIndex1, unsigned short nIndex2);
-
-	void FastIndex(unsigned short index);
-	void FastQuad(int index);
-
-	void FastVertex(const ModelVertexDX8_t& vertex);
-	void FastVertexSSE(const ModelVertexDX8_t& vertex);
-	void FastQuadVertexSSE(const QuadTessVertex_t& vertex);
-
-	void FastAdvanceNVertices(int n);
-
-#if defined( _X360 )
-	void VertexDX8ToX360(const ModelVertexDX8_t& vertex);
-#endif
-
-	FORCEINLINE void* GetVertexDataPtr(int nWhatSizeIThinkItIs)
-	{
-		if (m_VertexBuilder.m_VertexSize_Position != nWhatSizeIThinkItIs)
-			return NULL;
-		return m_VertexBuilder.m_pCurrPosition;
-	}
-
-
-private:
-	void ComputeNumVertsAndIndices(int* pMaxVertices, int* pMaxIndices,
-		MaterialPrimitiveType_t type, int nPrimitiveCount);
-	int IndicesFromVertices(MaterialPrimitiveType_t type, int nVertexCount);
-
-	IMesh* m_pMesh;
-
-	MaterialPrimitiveType_t m_Type;
-
-	bool m_bGenerateIndices;
-
-	CIndexBuilder	m_IndexBuilder;
-	CVertexBuilder	m_VertexBuilder;
-};
-
-
-inline void CMeshBuilder::Begin(IVertexBuffer* pVertexBuffer, MaterialPrimitiveType_t type, int numPrimitives)
-{
-	Assert(0);
-}
-
-inline void CMeshBuilder::Begin(IVertexBuffer* pVertexBuffer, IIndexBuffer* pIndexBuffer, MaterialPrimitiveType_t type, int nVertexCount, int nIndexCount, int* nFirstVertex)
-{
-	Assert(0);
-}
-
-inline void CMeshBuilder::Begin(IVertexBuffer* pVertexBuffer, IIndexBuffer* pIndexBuffer, MaterialPrimitiveType_t type, int nVertexCount, int nIndexCount)
-{
-	Assert(0);
-}
-
-
-inline CMeshBuilder::CMeshBuilder() : m_pMesh(0), m_bGenerateIndices(false)
-{
-}
-
-
-inline void CMeshBuilder::ComputeNumVertsAndIndices(int* pMaxVertices, int* pMaxIndices,
-	MaterialPrimitiveType_t type, int nPrimitiveCount)
-{
-	switch (type)
-	{
-	case MATERIAL_POINTS:
-		*pMaxVertices = *pMaxIndices = nPrimitiveCount;
-		break;
-
-	case MATERIAL_LINES:
-		*pMaxVertices = *pMaxIndices = nPrimitiveCount * 2;
-		break;
-
-	case MATERIAL_LINE_STRIP:
-		*pMaxVertices = nPrimitiveCount + 1;
-		*pMaxIndices = nPrimitiveCount * 2;
-		break;
-
-	case MATERIAL_LINE_LOOP:
-		*pMaxVertices = nPrimitiveCount;
-		*pMaxIndices = nPrimitiveCount * 2;
-		break;
-
-	case MATERIAL_TRIANGLES:
-		*pMaxVertices = *pMaxIndices = nPrimitiveCount * 3;
-		break;
-
-	case MATERIAL_TRIANGLE_STRIP:
-		*pMaxVertices = *pMaxIndices = nPrimitiveCount + 2;
-		break;
-
-	case MATERIAL_QUADS:
-		*pMaxVertices = nPrimitiveCount * 4;
-		*pMaxIndices = nPrimitiveCount * 6;
-		break;
-
-	case MATERIAL_INSTANCED_QUADS:
-		*pMaxVertices = nPrimitiveCount;
-		*pMaxIndices = 0;     
-		break;
-
-	case MATERIAL_POLYGON:
-		*pMaxVertices = nPrimitiveCount;
-		*pMaxIndices = (nPrimitiveCount - 2) * 3;
-		break;
-
-	default:
-		Assert(0);
-	}
-
-	Assert(*pMaxVertices <= 32768);
-	Assert(*pMaxIndices <= 32768);
-}
-
-
-inline int CMeshBuilder::IndicesFromVertices(MaterialPrimitiveType_t type, int nVertexCount)
-{
-	switch (type)
-	{
-	case MATERIAL_QUADS:
-		Assert((nVertexCount & 0x3) == 0);
-		return (nVertexCount * 6) / 4;
-
-	case MATERIAL_INSTANCED_QUADS:
-		return 0;
-
-	case MATERIAL_POLYGON:
-		Assert(nVertexCount >= 3);
-		return (nVertexCount - 2) * 3;
-
-	case MATERIAL_LINE_STRIP:
-		Assert(nVertexCount >= 2);
-		return (nVertexCount - 1) * 2;
-
-	case MATERIAL_LINE_LOOP:
-		Assert(nVertexCount >= 3);
-		return nVertexCount * 2;
-
-	default:
-		return nVertexCount;
-	}
-}
-
-inline void CMeshBuilder::SetCompressionType(VertexCompressionType_t vertexCompressionType)
-{
-	m_CompressionType = vertexCompressionType;
-	m_VertexBuilder.SetCompressionType(vertexCompressionType);
-}
-
-inline void CMeshBuilder::Begin(IMesh* pMesh, MaterialPrimitiveType_t type, int numPrimitives)
-{
-	Assert(pMesh && (!m_pMesh));
-	Assert(type != MATERIAL_HETEROGENOUS);
-
-	m_pMesh = pMesh;
-	m_bGenerateIndices = true;
-	m_Type = type;
-
-	int nMaxVertexCount, nMaxIndexCount;
-	ComputeNumVertsAndIndices(&nMaxVertexCount, &nMaxIndexCount, type, numPrimitives);
-
-	switch (type)
-	{
-	case MATERIAL_INSTANCED_QUADS:
-		m_pMesh->SetPrimitiveType(MATERIAL_INSTANCED_QUADS);
-		break;
-
-	case MATERIAL_QUADS:
-	case MATERIAL_POLYGON:
-		m_pMesh->SetPrimitiveType(MATERIAL_TRIANGLES);
-		break;
-
-	case MATERIAL_LINE_STRIP:
-	case MATERIAL_LINE_LOOP:
-		m_pMesh->SetPrimitiveType(MATERIAL_LINES);
-		break;
-
-	default:
-		m_pMesh->SetPrimitiveType(type);
-	}
-
-	m_pMesh->LockMesh(nMaxVertexCount, nMaxIndexCount, *this, NULL);
-
-	m_IndexBuilder.AttachBegin(pMesh, nMaxIndexCount, *this);
-	m_VertexBuilder.AttachBegin(pMesh, nMaxVertexCount, *this);
-
-	Reset();
-}
-
-inline void CMeshBuilder::Begin(IMesh* pMesh, MaterialPrimitiveType_t type, int nVertexCount, int nIndexCount, int* nFirstVertex)
-{
-	Begin(pMesh, type, nVertexCount, nIndexCount);
-
-	*nFirstVertex = m_VertexBuilder.m_nFirstVertex * m_VertexBuilder.VertexSize();
-}
-
-inline void CMeshBuilder::Begin(IMesh* pMesh, MaterialPrimitiveType_t type, int nVertexCount, int nIndexCount)
-{
-	Assert(pMesh && (!m_pMesh));
-
-	Assert((type != MATERIAL_QUADS) && (type != MATERIAL_INSTANCED_QUADS) && (type != MATERIAL_POLYGON) &&
-		(type != MATERIAL_LINE_STRIP) && (type != MATERIAL_LINE_LOOP));
-
-	Assert(type != MATERIAL_POINTS);
-
-	m_pMesh = pMesh;
-	m_bGenerateIndices = false;
-	m_Type = type;
-
-	m_pMesh->SetPrimitiveType(type);
-
-	m_pMesh->LockMesh(nVertexCount, nIndexCount, *this, NULL);
-
-	m_IndexBuilder.AttachBegin(pMesh, nIndexCount, *this);
-	m_VertexBuilder.AttachBegin(pMesh, nVertexCount, *this);
-
-	Reset();
-}
-
-
-inline void CMeshBuilder::End(bool bSpewData, bool bDraw)
-{
-	if (m_bGenerateIndices)
-	{
-		int nIndexCount = IndicesFromVertices(m_Type, m_VertexBuilder.VertexCount());
-		m_IndexBuilder.GenerateIndices(m_Type, nIndexCount);
-	}
-
-	if (bSpewData)
-	{
-		m_pMesh->Spew(m_VertexBuilder.VertexCount(), m_IndexBuilder.IndexCount(), *this);
-	}
-
-#ifdef _DEBUG
-	m_pMesh->ValidateData(m_VertexBuilder.VertexCount(), m_IndexBuilder.IndexCount(), *this);
-#endif
-
-	m_pMesh->UnlockMesh(m_VertexBuilder.VertexCount(), m_IndexBuilder.IndexCount(), *this);
-
-	m_IndexBuilder.AttachEnd();
-	m_VertexBuilder.AttachEnd();
-
-	if (bDraw)
-	{
-		m_pMesh->Draw();
-	}
-
-	m_pMesh = 0;
-
-#ifdef _DEBUG
-	memset((MeshDesc_t*)this, 0, sizeof(MeshDesc_t));
-#endif
-}
-
-
-inline void CMeshBuilder::BeginModify(IMesh* pMesh, int nFirstVertex, int nVertexCount, int nFirstIndex, int nIndexCount)
-{
-	Assert(pMesh && (!m_pMesh));
-
-	if (nVertexCount < 0)
-	{
-		nVertexCount = pMesh->VertexCount();
-	}
-
-	m_pMesh = pMesh;
-	m_bGenerateIndices = false;
-
-	pMesh->ModifyBeginEx(false, nFirstVertex, nVertexCount, nFirstIndex, nIndexCount, *this);
-
-	m_IndexBuilder.AttachBeginModify(pMesh, nFirstIndex, nIndexCount, *this);
-	m_VertexBuilder.AttachBeginModify(pMesh, nFirstVertex, nVertexCount, *this);
-
-	Reset();
-}
-
-inline void CMeshBuilder::EndModify(bool bSpewData)
-{
-	Assert(m_pMesh);
-
-	if (bSpewData)
-	{
-		m_pMesh->Spew(m_VertexBuilder.VertexCount(), m_IndexBuilder.IndexCount(), *this);
-	}
-#ifdef _DEBUG
-	m_pMesh->ValidateData(m_VertexBuilder.VertexCount(), m_IndexBuilder.IndexCount(), *this);
-#endif
-
-	m_pMesh->ModifyEnd(*this);
-	m_pMesh = 0;
-
-	m_IndexBuilder.AttachEndModify();
-	m_VertexBuilder.AttachEndModify();
-
-#ifdef _DEBUG
-	memset((MeshDesc_t*)this, 0, sizeof(MeshDesc_t));
-#endif
-}
-
-
-inline void CMeshBuilder::Reset()
-{
-	m_IndexBuilder.Reset();
-	m_VertexBuilder.Reset();
-}
-
-
-FORCEINLINE void CMeshBuilder::SelectVertex(int nIndex)
-{
-	m_VertexBuilder.SelectVertex(nIndex);
-}
-
-inline void CMeshBuilder::SelectVertexFromIndex(int idx)
-{
-	int vertIdx = idx - m_nFirstVertex;
-	SelectVertex(vertIdx);
-}
-
-FORCEINLINE void CMeshBuilder::SelectIndex(int idx)
-{
-	m_IndexBuilder.SelectIndex(idx);
-}
-
-
-template<int nFlags, int nNumTexCoords> FORCEINLINE void CMeshBuilder::AdvanceVertexF()
-{
-	m_VertexBuilder.AdvanceVertexF<nFlags, nNumTexCoords>();
-}
-FORCEINLINE void CMeshBuilder::AdvanceVertex()
-{
-	m_VertexBuilder.AdvanceVertex();
-}
-
-FORCEINLINE void CMeshBuilder::AdvanceVertices(int nVertexCount)
-{
-	m_VertexBuilder.AdvanceVertices(nVertexCount);
-}
-
-FORCEINLINE void CMeshBuilder::AdvanceIndex()
-{
-	m_IndexBuilder.AdvanceIndex();
-}
-
-FORCEINLINE void CMeshBuilder::AdvanceIndices(int nIndices)
-{
-	m_IndexBuilder.AdvanceIndices(nIndices);
-}
-
-FORCEINLINE int CMeshBuilder::GetCurrentVertex()
-{
-	return m_VertexBuilder.GetCurrentVertex();
-}
-
-FORCEINLINE int CMeshBuilder::GetCurrentIndex()
-{
-	return m_IndexBuilder.GetCurrentIndex();
-}
-
-
-inline void CMeshBuilder::DrawQuad(IMesh* pMesh, const float* v1, const float* v2,
-	const float* v3, const float* v4, unsigned char const* pColor, bool wireframe)
-{
-	if (!wireframe)
-	{
-		Begin(pMesh, MATERIAL_TRIANGLE_STRIP, 2);
-
-		Position3fv(v1);
-		Color4ubv(pColor);
-		AdvanceVertexF<VTX_HAVEPOS | VTX_HAVECOLOR, 0>();
-
-		Position3fv(v2);
-		Color4ubv(pColor);
-		AdvanceVertexF<VTX_HAVEPOS | VTX_HAVECOLOR, 0>();
-
-		Position3fv(v4);
-		Color4ubv(pColor);
-		AdvanceVertexF<VTX_HAVEPOS | VTX_HAVECOLOR, 0>();
-
-		Position3fv(v3);
-		Color4ubv(pColor);
-		AdvanceVertexF<VTX_HAVEPOS | VTX_HAVECOLOR, 0>();
-	}
-	else
-	{
-		Begin(pMesh, MATERIAL_LINE_LOOP, 4);
-		Position3fv(v1);
-		Color4ubv(pColor);
-		AdvanceVertexF<VTX_HAVEPOS | VTX_HAVECOLOR, 0>();
-
-		Position3fv(v2);
-		Color4ubv(pColor);
-		AdvanceVertexF<VTX_HAVEPOS | VTX_HAVECOLOR, 0>();
-
-		Position3fv(v3);
-		Color4ubv(pColor);
-		AdvanceVertexF<VTX_HAVEPOS | VTX_HAVECOLOR, 0>();
-
-		Position3fv(v4);
-		Color4ubv(pColor);
-		AdvanceVertexF<VTX_HAVEPOS | VTX_HAVECOLOR, 0>();
-	}
-
-	End();
-	pMesh->Draw();
-}
-
-
-FORCEINLINE int CMeshBuilder::VertexCount() const
-{
-	return m_VertexBuilder.VertexCount();
-}
-
-FORCEINLINE int CMeshBuilder::IndexCount() const
-{
-	return m_IndexBuilder.IndexCount();
-}
-
-
-FORCEINLINE void* CMeshBuilder::BaseVertexData()
-{
-	return m_VertexBuilder.BaseVertexData();
-}
-
-FORCEINLINE const float* CMeshBuilder::Position() const
-{
-	return m_VertexBuilder.Position();
-}
-
-FORCEINLINE const float* CMeshBuilder::Normal()	const
-{
-	return m_VertexBuilder.Normal();
-}
-
-FORCEINLINE unsigned int CMeshBuilder::Color() const
-{
-	return m_VertexBuilder.Color();
-}
-
-FORCEINLINE unsigned char* CMeshBuilder::Specular() const
-{
-	return m_VertexBuilder.Specular();
-}
-
-FORCEINLINE const float* CMeshBuilder::TexCoord(int nStage) const
-{
-	return m_VertexBuilder.TexCoord(nStage);
-}
-
-FORCEINLINE const float* CMeshBuilder::TangentS() const
-{
-	return m_VertexBuilder.TangentS();
-}
-
-FORCEINLINE const float* CMeshBuilder::TangentT() const
-{
-	return m_VertexBuilder.TangentT();
-}
-
-FORCEINLINE float CMeshBuilder::Wrinkle() const
-{
-	return m_VertexBuilder.Wrinkle();
-}
-
-FORCEINLINE const float* CMeshBuilder::BoneWeight() const
-{
-	return m_VertexBuilder.BoneWeight();
-}
-
-FORCEINLINE int CMeshBuilder::NumBoneWeights() const
-{
-	return m_VertexBuilder.NumBoneWeights();
-}
-
-FORCEINLINE unsigned short const* CMeshBuilder::Index() const
-{
-	return m_IndexBuilder.Index();
-}
-
-
-FORCEINLINE void CMeshBuilder::Index(unsigned short idx)
-{
-	m_IndexBuilder.Index(idx);
-}
-
-
-FORCEINLINE void CMeshBuilder::FastIndex(unsigned short idx)
-{
-	m_IndexBuilder.FastIndex(idx);
-}
-
-FORCEINLINE void CMeshBuilder::FastIndex2(unsigned short nIndex1, unsigned short nIndex2)
-{
-	m_IndexBuilder.FastIndex2(nIndex1, nIndex2);
-}
-
-FORCEINLINE void CMeshBuilder::FastQuad(int nIndex)
-{
-	m_IndexBuilder.FastQuad(nIndex);
-}
-
-FORCEINLINE void CMeshBuilder::FastAdvanceNVertices(int nVertexCount)
-{
-	m_VertexBuilder.FastAdvanceNVertices(nVertexCount);
-}
-
-
-FORCEINLINE void CMeshBuilder::FastVertex(const ModelVertexDX8_t& vertex)
-{
-	m_VertexBuilder.FastVertex(vertex);
-}
-
-FORCEINLINE void CMeshBuilder::FastVertexSSE(const ModelVertexDX8_t& vertex)
-{
-	m_VertexBuilder.FastVertexSSE(vertex);
-}
-
-FORCEINLINE void CMeshBuilder::FastQuadVertexSSE(const QuadTessVertex_t& vertex)
-{
-	m_VertexBuilder.FastQuadVertexSSE(vertex);
-}
-
-
-#if defined( _X360 )
-inline void CMeshBuilder::VertexDX8ToX360(const ModelVertexDX8_t& vertex)
-{
-	m_VertexBuilder.VertexDX8ToX360(vertex);
-}
-#endif
-
-FORCEINLINE void CMeshBuilder::Position3f(float x, float y, float z)
-{
-	m_VertexBuilder.Position3f(x, y, z);
-}
-
-FORCEINLINE void CMeshBuilder::Position3fv(const float* v)
-{
-	m_VertexBuilder.Position3fv(v);
-}
-
-FORCEINLINE void CMeshBuilder::Normal3f(float nx, float ny, float nz)
-{
-	m_VertexBuilder.Normal3f(nx, ny, nz);
-}
-
-FORCEINLINE void CMeshBuilder::Normal3fv(const float* n)
-{
-	m_VertexBuilder.Normal3fv(n);
-}
-
-FORCEINLINE void CMeshBuilder::NormalDelta3f(float nx, float ny, float nz)
-{
-	m_VertexBuilder.NormalDelta3f(nx, ny, nz);
-}
-
-FORCEINLINE void CMeshBuilder::NormalDelta3fv(const float* n)
-{
-	m_VertexBuilder.NormalDelta3fv(n);
-}
-
-FORCEINLINE void CMeshBuilder::Color3f(float r, float g, float b)
-{
-	m_VertexBuilder.Color3f(r, g, b);
-}
-
-FORCEINLINE void CMeshBuilder::Color3fv(const float* rgb)
-{
-	m_VertexBuilder.Color3fv(rgb);
-}
-
-FORCEINLINE void CMeshBuilder::Color4f(float r, float g, float b, float a)
-{
-	m_VertexBuilder.Color4f(r, g, b, a);
-}
-
-FORCEINLINE void CMeshBuilder::Color4fv(const float* rgba)
-{
-	m_VertexBuilder.Color4fv(rgba);
-}
-
-FORCEINLINE void CMeshBuilder::Color3ub(unsigned char r, unsigned char g, unsigned char b)
-{
-	m_VertexBuilder.Color3ub(r, g, b);
-}
-
-FORCEINLINE void CMeshBuilder::Color3ubv(unsigned char const* rgb)
-{
-	m_VertexBuilder.Color3ubv(rgb);
-}
-
-FORCEINLINE void CMeshBuilder::Color4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-{
-	m_VertexBuilder.Color4ub(r, g, b, a);
-}
-
-FORCEINLINE void CMeshBuilder::Color4ubv(unsigned char const* rgba)
-{
-	m_VertexBuilder.Color4ubv(rgba);
-}
-
-FORCEINLINE void CMeshBuilder::Color4Packed(int packedColor)
-{
-	m_VertexBuilder.Color4Packed(packedColor);
-}
-
-FORCEINLINE int CMeshBuilder::PackColor4(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-{
-	return m_VertexBuilder.PackColor4(r, g, b, a);
-}
-
-FORCEINLINE void CMeshBuilder::Specular3f(float r, float g, float b)
-{
-	m_VertexBuilder.Specular3f(r, g, b);
-}
-
-FORCEINLINE void CMeshBuilder::Specular3fv(const float* rgb)
-{
-	m_VertexBuilder.Specular3fv(rgb);
-}
-
-FORCEINLINE void CMeshBuilder::Specular4f(float r, float g, float b, float a)
-{
-	m_VertexBuilder.Specular4f(r, g, b, a);
-}
-
-FORCEINLINE void CMeshBuilder::Specular4fv(const float* rgba)
-{
-	m_VertexBuilder.Specular4fv(rgba);
-}
-
-FORCEINLINE void CMeshBuilder::Specular3ub(unsigned char r, unsigned char g, unsigned char b)
-{
-	m_VertexBuilder.Specular3ub(r, g, b);
-}
-
-FORCEINLINE void CMeshBuilder::Specular3ubv(unsigned char const* c)
-{
-	m_VertexBuilder.Specular3ubv(c);
-}
-
-FORCEINLINE void CMeshBuilder::Specular4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-{
-	m_VertexBuilder.Specular4ub(r, g, b, a);
-}
-
-FORCEINLINE void CMeshBuilder::Specular4ubv(unsigned char const* c)
-{
-	m_VertexBuilder.Specular4ubv(c);
-}
-
-FORCEINLINE void CMeshBuilder::TexCoord1f(int nStage, float s)
-{
-	m_VertexBuilder.TexCoord1f(nStage, s);
-}
-
-FORCEINLINE void CMeshBuilder::TexCoord2f(int nStage, float s, float t)
-{
-	m_VertexBuilder.TexCoord2f(nStage, s, t);
-}
-
-FORCEINLINE void CMeshBuilder::TexCoord2fv(int nStage, const float* st)
-{
-	m_VertexBuilder.TexCoord2fv(nStage, st);
-}
-
-FORCEINLINE void CMeshBuilder::TexCoord3f(int nStage, float s, float t, float u)
-{
-	m_VertexBuilder.TexCoord3f(nStage, s, t, u);
-}
-
-FORCEINLINE void CMeshBuilder::TexCoord3fv(int nStage, const float* stu)
-{
-	m_VertexBuilder.TexCoord3fv(nStage, stu);
-}
-
-FORCEINLINE void CMeshBuilder::TexCoord4f(int nStage, float s, float t, float u, float v)
-{
-	m_VertexBuilder.TexCoord4f(nStage, s, t, u, v);
-}
-
-FORCEINLINE void CMeshBuilder::TexCoord4fv(int nStage, const float* stuv)
-{
-	m_VertexBuilder.TexCoord4fv(nStage, stuv);
-}
-
-FORCEINLINE void CMeshBuilder::TexCoordSubRect2f(int nStage, float s, float t, float offsetS, float offsetT, float scaleS, float scaleT)
-{
-	m_VertexBuilder.TexCoordSubRect2f(nStage, s, t, offsetS, offsetT, scaleS, scaleT);
-}
-
-FORCEINLINE void CMeshBuilder::TexCoordSubRect2fv(int nStage, const float* st, const float* offset, const float* scale)
-{
-	m_VertexBuilder.TexCoordSubRect2fv(nStage, st, offset, scale);
-}
-
-FORCEINLINE void CMeshBuilder::TangentS3f(float sx, float sy, float sz)
-{
-	m_VertexBuilder.TangentS3f(sx, sy, sz);
-}
-
-FORCEINLINE void CMeshBuilder::TangentS3fv(const float* s)
-{
-	m_VertexBuilder.TangentS3fv(s);
-}
-
-FORCEINLINE void CMeshBuilder::TangentT3f(float tx, float ty, float tz)
-{
-	m_VertexBuilder.TangentT3f(tx, ty, tz);
-}
-
-FORCEINLINE void CMeshBuilder::TangentT3fv(const float* t)
-{
-	m_VertexBuilder.TangentT3fv(t);
-}
-
-FORCEINLINE void CMeshBuilder::Wrinkle1f(float flWrinkle)
-{
-	m_VertexBuilder.Wrinkle1f(flWrinkle);
-}
-
-FORCEINLINE void CMeshBuilder::BoneWeight(int nIndex, float flWeight)
-{
-	m_VertexBuilder.BoneWeight(nIndex, flWeight);
-}
-
-FORCEINLINE void CMeshBuilder::BoneWeights2(float weight1, float weight2)
-{
-	m_VertexBuilder.BoneWeights2(weight1, weight2);
-}
-
-template <VertexCompressionType_t T> FORCEINLINE void CMeshBuilder::CompressedBoneWeight3fv(const float* pWeights)
-{
-	m_VertexBuilder.CompressedBoneWeight3fv<T>(pWeights);
-}
-
-FORCEINLINE void CMeshBuilder::BoneMatrix(int nIndex, int nMatrixIdx)
-{
-	m_VertexBuilder.BoneMatrix(nIndex, nMatrixIdx);
-}
-
-FORCEINLINE void CMeshBuilder::BoneMatrices4(int matrixIdx0, int matrixIdx1, int matrixIdx2, int matrixIdx3)
-{
-	m_VertexBuilder.BoneMatrices4(matrixIdx0, matrixIdx1, matrixIdx2, matrixIdx3);
-}
-
-FORCEINLINE void CMeshBuilder::UserData(const float* pData)
-{
-	m_VertexBuilder.UserData(pData);
-}
-
-template <VertexCompressionType_t T> FORCEINLINE void CMeshBuilder::CompressedUserData(const float* pData)
-{
-	m_VertexBuilder.CompressedUserData<T>(pData);
-}
-
-template <VertexCompressionType_t T> FORCEINLINE void CMeshBuilder::CompressedNormal3f(float nx, float ny, float nz)
-{
-	m_VertexBuilder.CompressedNormal3f<T>(nx, ny, nz);
-}
-
-template <VertexCompressionType_t T> FORCEINLINE void CMeshBuilder::CompressedNormal3fv(const float* n)
-{
-	m_VertexBuilder.CompressedNormal3fv<T>(n);
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IPanel.h b/SpyCustom/IPanel.h
deleted file mode 100644
index 09a7f20..0000000
--- a/SpyCustom/IPanel.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef IPANEL_H
-#define IPANEL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vgui.h"
-#include "interface.h"
-#include "utlvector.h"
-
-#ifdef SendMessage
-#undef SendMessage
-#endif
-
-class KeyValues;
-struct DmxElementUnpackStructure_t;
-class CDmxElement;
-
-namespace vgui
-{
-
-	class SurfacePlat;
-	class IClientPanel;
-
-	class Panel;
-
-	class IPanel : public IBaseInterface
-	{
-	public:
-		virtual void Init(VPANEL vguiPanel, IClientPanel* panel) = 0;
-
-		virtual void SetPos(VPANEL vguiPanel, int x, int y) = 0;
-		virtual void GetPos(VPANEL vguiPanel, int& x, int& y) = 0;
-		virtual void SetSize(VPANEL vguiPanel, int wide, int tall) = 0;
-		virtual void GetSize(VPANEL vguiPanel, int& wide, int& tall) = 0;
-		virtual void SetMinimumSize(VPANEL vguiPanel, int wide, int tall) = 0;
-		virtual void GetMinimumSize(VPANEL vguiPanel, int& wide, int& tall) = 0;
-		virtual void SetZPos(VPANEL vguiPanel, int z) = 0;
-		virtual int  GetZPos(VPANEL vguiPanel) = 0;
-
-		virtual void GetAbsPos(VPANEL vguiPanel, int& x, int& y) = 0;
-		virtual void GetClipRect(VPANEL vguiPanel, int& x0, int& y0, int& x1, int& y1) = 0;
-		virtual void SetInset(VPANEL vguiPanel, int left, int top, int right, int bottom) = 0;
-		virtual void GetInset(VPANEL vguiPanel, int& left, int& top, int& right, int& bottom) = 0;
-
-		virtual void SetVisible(VPANEL vguiPanel, bool state) = 0;
-		virtual bool IsVisible(VPANEL vguiPanel) = 0;
-		virtual void SetParent(VPANEL vguiPanel, VPANEL newParent) = 0;
-		virtual int GetChildCount(VPANEL vguiPanel) = 0;
-		virtual VPANEL GetChild(VPANEL vguiPanel, int index) = 0;
-		virtual CUtlVector< VPANEL >& GetChildren(VPANEL vguiPanel) = 0;
-		virtual VPANEL GetParent(VPANEL vguiPanel) = 0;
-		virtual void MoveToFront(VPANEL vguiPanel) = 0;
-		virtual void MoveToBack(VPANEL vguiPanel) = 0;
-		virtual bool HasParent(VPANEL vguiPanel, VPANEL potentialParent) = 0;
-		virtual bool IsPopup(VPANEL vguiPanel) = 0;
-		virtual void SetPopup(VPANEL vguiPanel, bool state) = 0;
-		virtual bool IsFullyVisible(VPANEL vguiPanel) = 0;
-
-		virtual HScheme GetScheme(VPANEL vguiPanel) = 0;
-		virtual bool IsProportional(VPANEL vguiPanel) = 0;
-		virtual bool IsAutoDeleteSet(VPANEL vguiPanel) = 0;
-		virtual void DeletePanel(VPANEL vguiPanel) = 0;
-
-		virtual void SetKeyBoardInputEnabled(VPANEL vguiPanel, bool state) = 0;
-		virtual void SetMouseInputEnabled(VPANEL vguiPanel, bool state) = 0;
-		virtual bool IsKeyBoardInputEnabled(VPANEL vguiPanel) = 0;
-		virtual bool IsMouseInputEnabled(VPANEL vguiPanel) = 0;
-
-		virtual void Solve(VPANEL vguiPanel) = 0;
-
-		virtual const char* GetName(VPANEL vguiPanel) = 0;
-		virtual const char* GetClassName(VPANEL vguiPanel) = 0;
-
-		virtual void SendMessage(VPANEL vguiPanel, KeyValues* params, VPANEL ifromPanel) = 0;
-
-		virtual void Think(VPANEL vguiPanel) = 0;
-		virtual void PerformApplySchemeSettings(VPANEL vguiPanel) = 0;
-		virtual void PaintTraverse(VPANEL vguiPanel, bool forceRepaint, bool allowForce = true) = 0;
-		virtual void Repaint(VPANEL vguiPanel) = 0;
-		virtual VPANEL IsWithinTraverse(VPANEL vguiPanel, int x, int y, bool traversePopups) = 0;
-		virtual void OnChildAdded(VPANEL vguiPanel, VPANEL child) = 0;
-		virtual void OnSizeChanged(VPANEL vguiPanel, int newWide, int newTall) = 0;
-
-		virtual void InternalFocusChanged(VPANEL vguiPanel, bool lost) = 0;
-		virtual bool RequestInfo(VPANEL vguiPanel, KeyValues* outputData) = 0;
-		virtual void RequestFocus(VPANEL vguiPanel, int direction = 0) = 0;
-		virtual bool RequestFocusPrev(VPANEL vguiPanel, VPANEL existingPanel) = 0;
-		virtual bool RequestFocusNext(VPANEL vguiPanel, VPANEL existingPanel) = 0;
-		virtual VPANEL GetCurrentKeyFocus(VPANEL vguiPanel) = 0;
-		virtual int GetTabPosition(VPANEL vguiPanel) = 0;
-
-		virtual SurfacePlat* Plat(VPANEL vguiPanel) = 0;
-		virtual void SetPlat(VPANEL vguiPanel, SurfacePlat* Plat) = 0;
-
-		virtual Panel* GetPanel(VPANEL vguiPanel, const char* destinationModule) = 0;
-
-		virtual bool IsEnabled(VPANEL vguiPanel) = 0;
-		virtual void SetEnabled(VPANEL vguiPanel, bool state) = 0;
-
-		virtual bool IsTopmostPopup(VPANEL vguiPanel) = 0;
-		virtual void SetTopmostPopup(VPANEL vguiPanel, bool state) = 0;
-
-		virtual void SetMessageContextId(VPANEL vguiPanel, int nContextId) = 0;
-		virtual int GetMessageContextId(VPANEL vguiPanel) = 0;
-
-		virtual const DmxElementUnpackStructure_t* GetUnpackStructure(VPANEL vguiPanel) const = 0;
-		virtual void OnUnserialized(VPANEL vguiPanel, CDmxElement* pElement) = 0;
-
-		virtual void SetSiblingPin(VPANEL vguiPanel, VPANEL newSibling, byte iMyCornerToPin = 0, byte iSiblingCornerToPinTo = 0) = 0;
-	};
-
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IScheme.h b/SpyCustom/IScheme.h
deleted file mode 100644
index 29fa437..0000000
--- a/SpyCustom/IScheme.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef ISCHEME_H
-#define ISCHEME_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "interface.h"
-
-class Color;
-class KeyValues;
-
-namespace vgui
-{
-
-	typedef unsigned long HScheme;
-	typedef unsigned long HTexture;
-
-	class IBorder;
-	class IImage;
-
-	class IScheme : public IBaseInterface
-	{
-	public:
-		virtual const char* GetResourceString(const char* stringName) = 0;
-
-		virtual IBorder* GetBorder(const char* borderName) = 0;
-
-		virtual HFont GetFont(const char* fontName, bool proportional = false) = 0;
-
-		virtual char const* GetFontName(const HFont& font) = 0;
-
-		virtual Color GetColor(const char* colorName, Color defaultColor) = 0;
-
-		virtual int GetBorderCount() const = 0;
-
-		virtual IBorder* GetBorderAtIndex(int iIndex) = 0;
-
-		virtual int GetFontCount() const = 0;
-
-		virtual HFont GetFontAtIndex(int iIndex) = 0;
-
-		virtual const KeyValues* GetColorData() const = 0;
-	};
-
-
-
-	class ISchemeManager : public IBaseInterface
-	{
-	public:
-		virtual HScheme LoadSchemeFromFile(const char* fileName, const char* tag) = 0;
-
-		virtual void ReloadSchemes() = 0;
-
-		virtual void ReloadFonts() = 0;
-
-		virtual HScheme GetDefaultScheme() = 0;
-
-		virtual HScheme GetScheme(const char* tag) = 0;
-
-		virtual IImage* GetImage(const char* imageName, bool hardwareFiltered) = 0;
-		virtual HTexture GetImageID(const char* imageName, bool hardwareFiltered) = 0;
-
-		virtual IScheme* GetIScheme(HScheme scheme) = 0;
-
-		virtual void Shutdown(bool full = true) = 0;
-
-		virtual int GetProportionalScaledValue(int normalizedValue) = 0;
-		virtual int GetProportionalNormalizedValue(int scaledValue) = 0;
-
-		virtual HScheme LoadSchemeFromFileEx(VPANEL sizingPanel, const char* fileName, const char* tag) = 0;
-		virtual int GetProportionalScaledValueEx(HScheme scheme, int normalizedValue) = 0;
-		virtual int GetProportionalNormalizedValueEx(HScheme scheme, int scaledValue) = 0;
-
-		virtual bool DeleteImage(const char* pImageName) = 0;
-	};
-
-#define VGUI_SCHEME_INTERFACE_VERSION "VGUI_Scheme010"
-
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ISurface.h b/SpyCustom/ISurface.h
deleted file mode 100644
index 5d4a391..0000000
--- a/SpyCustom/ISurface.h
+++ /dev/null
@@ -1,378 +0,0 @@
-#ifndef ISURFACE_H
-#define ISURFACE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "IHTML.h"    
-#include "interface.h"
-#include "imageformat.h"
-
-#include "IAppSystem.h"
-#include "vector2d.h"        
-#include "ichromehtmlwrapper.h"
-
-#include "IVguiMatInfo.h"
-
-#ifdef CreateFont
-#undef CreateFont
-#endif
-
-#ifdef PlaySound
-#undef PlaySound
-#endif
-
-class Color;
-class ITexture;
-
-namespace vgui
-{
-
-	class IImage;
-	class Image;
-	class Point;
-
-	typedef unsigned long HCursor;
-	typedef unsigned long HTexture;
-	typedef unsigned long HFont;
-
-
-
-	struct Vertex_t
-	{
-		Vertex_t() {}
-		Vertex_t(const Vector2D& pos, const Vector2D& coord = Vector2D(0, 0))
-		{
-			m_Position = pos;
-			m_TexCoord = coord;
-		}
-		void Init(const Vector2D& pos, const Vector2D& coord = Vector2D(0, 0))
-		{
-			m_Position = pos;
-			m_TexCoord = coord;
-		}
-
-		Vector2D	m_Position;
-		Vector2D	m_TexCoord;
-	};
-
-
-	enum FontDrawType_t
-	{
-		FONT_DRAW_DEFAULT = 0,
-
-		FONT_DRAW_NONADDITIVE,
-		FONT_DRAW_ADDITIVE,
-
-		FONT_DRAW_TYPE_COUNT = 2,
-	};
-
-
-	struct CharRenderInfo
-	{
-		int				x, y;
-		Vertex_t* verts;
-		int				textureId;
-		int				abcA;
-		int				abcB;
-		int				abcC;
-		int				fontTall;
-		HFont			currentFont;
-		FontDrawType_t	drawType;
-		wchar_t			ch;
-
-		bool			valid;
-		bool			shouldclip;
-	};
-
-
-	struct IntRect
-	{
-		int x0;
-		int y0;
-		int x1;
-		int y1;
-	};
-
-
-
-	struct DrawTexturedRectParms_t
-	{
-		DrawTexturedRectParms_t()
-		{
-			s0 = t0 = 0;
-			s1 = t1 = 1.0f;
-			alpha_ul = alpha_ur = alpha_lr = alpha_ll = 255;
-			angle = 0;
-		}
-
-		int x0;
-		int	y0;
-		int x1;
-		int y1;
-
-		float s0;
-		float t0;
-		float s1;
-		float t1;
-
-		unsigned char alpha_ul;
-		unsigned char alpha_ur;
-		unsigned char alpha_lr;
-		unsigned char alpha_ll;
-
-		float angle;
-	};
-
-
-	class ISurface : public IAppSystem
-	{
-	public:
-		virtual void Shutdown() = 0;
-
-		virtual void RunFrame() = 0;
-
-		virtual VPANEL GetEmbeddedPanel() = 0;
-		virtual void SetEmbeddedPanel(VPANEL pPanel) = 0;
-
-		virtual void PushMakeCurrent(VPANEL panel, bool useInsets) = 0;
-		virtual void PopMakeCurrent(VPANEL panel) = 0;
-
-		virtual void DrawSetColor(int r, int g, int b, int a) = 0;
-		virtual void DrawSetColor(Color col) = 0;
-
-		virtual void DrawFilledRect(int x0, int y0, int x1, int y1) = 0;
-		virtual void DrawFilledRectArray(IntRect* pRects, int numRects) = 0;
-		virtual void DrawOutlinedRect(int x0, int y0, int x1, int y1) = 0;
-
-		virtual void DrawLine(int x0, int y0, int x1, int y1) = 0;
-		virtual void DrawPolyLine(int* px, int* py, int numPoints) = 0;
-
-		virtual void DrawSetApparentDepth(float depth) = 0; 
-		virtual void DrawClearApparentDepth() = 0; 
-
-		virtual void DrawSetTextFont(HFont font) = 0;
-		virtual void DrawSetTextColor(int r, int g, int b, int a) = 0;
-		virtual void DrawSetTextColor(Color col) = 0;
-		virtual void DrawSetTextPos(int x, int y) = 0;
-		virtual void DrawGetTextPos(int& x, int& y) = 0;
-		virtual void DrawPrintText(const wchar_t* text, int textLen, FontDrawType_t drawType = FONT_DRAW_DEFAULT) = 0;
-		virtual void DrawUnicodeChar(wchar_t wch, FontDrawType_t drawType = FONT_DRAW_DEFAULT) = 0;
-
-		virtual void DrawFlushText() = 0;		       
-		virtual IHTML* CreateHTMLWindow(vgui::IHTMLEvents* events, VPANEL context) = 0;
-		virtual void PaintHTMLWindow(vgui::IHTML* htmlwin) = 0;
-		virtual void DeleteHTMLWindow(IHTML* htmlwin) = 0;
-
-		enum ETextureFormat
-		{
-			eTextureFormat_RGBA,
-			eTextureFormat_BGRA,
-			eTextureFormat_BGRA_Opaque,                      
-		};
-
-		virtual int	 DrawGetTextureId(char const* filename) = 0;
-		virtual bool DrawGetTextureFile(int id, char* filename, int maxlen) = 0;
-		virtual void DrawSetTextureFile(int id, const char* filename, int hardwareFilter, bool forceReload) = 0;
-		virtual void DrawSetTextureRGBA(int id, const unsigned char* rgba, int wide, int tall, int hardwareFilter, bool forceReload) = 0;
-		virtual void DrawSetTexture(int id) = 0;
-		virtual bool DeleteTextureByID(int id) = 0;
-
-		virtual void DrawGetTextureSize(int id, int& wide, int& tall) = 0; 
-		virtual void DrawTexturedRect(int x0, int y0, int x1, int y1) = 0; 
-		virtual bool IsTextureIDValid(int id) = 0; 
-
-		virtual int CreateNewTextureID(bool procedural = false) = 0;
-
-		virtual void GetScreenSize(int& wide, int& tall) = 0;
-		virtual void SetAsTopMost(VPANEL panel, bool state) = 0;
-		virtual void BringToFront(VPANEL panel) = 0;
-		virtual void SetForegroundWindow(VPANEL panel) = 0;
-		virtual void SetPanelVisible(VPANEL panel, bool state) = 0;
-		virtual void SetMinimized(VPANEL panel, bool state) = 0;
-		virtual bool IsMinimized(VPANEL panel) = 0;
-		virtual void FlashWindow(VPANEL panel, bool state) = 0;
-		virtual void SetTitle(VPANEL panel, const wchar_t* title) = 0;
-		virtual void SetAsToolBar(VPANEL panel, bool state) = 0;		          
-
-		virtual void CreatePopup(VPANEL panel, bool minimised, bool showTaskbarIcon = true, bool disabled = false, bool mouseInput = true, bool kbInput = true) = 0;
-		virtual void SwapBuffers(VPANEL panel) = 0;
-		virtual void Invalidate(VPANEL panel) = 0;
-		virtual void SetCursor(HCursor cursor) = 0;
-		virtual bool IsCursorVisible() = 0;
-		virtual void ApplyChanges() = 0;
-		virtual bool IsWithin(int x, int y) = 0;
-		virtual bool HasFocus() = 0;
-
-		enum SurfaceFeature_e
-		{
-			ANTIALIASED_FONTS = 1,
-			DROPSHADOW_FONTS = 2,
-			ESCAPE_KEY = 3,
-			OPENING_NEW_HTML_WINDOWS = 4,
-			FRAME_MINIMIZE_MAXIMIZE = 5,
-			OUTLINE_FONTS = 6,
-			DIRECT_HWND_RENDER = 7,
-		};
-		virtual bool SupportsFeature(SurfaceFeature_e feature) = 0;
-
-		virtual void RestrictPaintToSinglePanel(VPANEL panel) = 0;
-
-		virtual void SetModalPanel(VPANEL) = 0;
-		virtual VPANEL GetModalPanel() = 0;
-
-		virtual void UnlockCursor() = 0;
-		virtual void LockCursor() = 0;
-		virtual void SetTranslateExtendedKeys(bool state) = 0;
-		virtual VPANEL GetTopmostPopup() = 0;
-
-		virtual void SetTopLevelFocus(VPANEL panel) = 0;
-
-		virtual HFont CreateFont() = 0;
-
-		enum EFontFlags
-		{
-			FONTFLAG_NONE,
-			FONTFLAG_ITALIC = 0x001,
-			FONTFLAG_UNDERLINE = 0x002,
-			FONTFLAG_STRIKEOUT = 0x004,
-			FONTFLAG_SYMBOL = 0x008,
-			FONTFLAG_ANTIALIAS = 0x010,
-			FONTFLAG_GAUSSIANBLUR = 0x020,
-			FONTFLAG_ROTARY = 0x040,
-			FONTFLAG_DROPSHADOW = 0x080,
-			FONTFLAG_ADDITIVE = 0x100,
-			FONTFLAG_OUTLINE = 0x200,
-			FONTFLAG_CUSTOM = 0x400,		           
-			FONTFLAG_BITMAP = 0x800,		      
-		};
-
-		virtual bool SetFontGlyphSet(HFont font, const char* windowsFontName, int tall, int weight, int blur, int scanlines, int flags, int nRangeMin = 0, int nRangeMax = 0) = 0;
-
-		virtual bool AddCustomFontFile(const char* fontName, const char* fontFileName) = 0;
-
-		virtual int GetFontTall(HFont font) = 0;
-		virtual int GetFontAscent(HFont font, wchar_t wch) = 0;
-		virtual bool IsFontAdditive(HFont font) = 0;
-		virtual void GetCharABCwide(HFont font, int ch, int& a, int& b, int& c) = 0;
-		virtual int GetCharacterWidth(HFont font, int ch) = 0;
-		virtual void GetTextSize(HFont font, const wchar_t* text, int& wide, int& tall) = 0;
-
-		virtual VPANEL GetNotifyPanel() = 0;
-		virtual void SetNotifyIcon(VPANEL context, HTexture icon, VPANEL panelToReceiveMessages, const char* text) = 0;
-
-		virtual void PlaySound(const char* fileName) = 0;
-
-		virtual int GetPopupCount() = 0;
-		virtual VPANEL GetPopup(int index) = 0;
-		virtual bool ShouldPaintChildPanel(VPANEL childPanel) = 0;
-		virtual bool RecreateContext(VPANEL panel) = 0;
-		virtual void AddPanel(VPANEL panel) = 0;
-		virtual void ReleasePanel(VPANEL panel) = 0;
-		virtual void MovePopupToFront(VPANEL panel) = 0;
-		virtual void MovePopupToBack(VPANEL panel) = 0;
-
-		virtual void SolveTraverse(VPANEL panel, bool forceApplySchemeSettings = false) = 0;
-		virtual void PaintTraverse(VPANEL panel) = 0;
-
-		virtual void EnableMouseCapture(VPANEL panel, bool state) = 0;
-
-		virtual void GetWorkspaceBounds(int& x, int& y, int& wide, int& tall) = 0;
-
-		virtual void GetAbsoluteWindowBounds(int& x, int& y, int& wide, int& tall) = 0;
-
-		virtual void GetProportionalBase(int& width, int& height) = 0;
-
-		virtual void CalculateMouseVisible() = 0;
-		virtual bool NeedKBInput() = 0;
-
-		virtual bool HasCursorPosFunctions() = 0;
-		virtual void SurfaceGetCursorPos(int& x, int& y) = 0;
-		virtual void SurfaceSetCursorPos(int x, int y) = 0;
-
-		virtual void DrawTexturedLine(const Vertex_t& a, const Vertex_t& b) = 0;
-		virtual void DrawOutlinedCircle(int x, int y, int radius, int segments) = 0;
-		virtual void DrawTexturedPolyLine(const Vertex_t* p, int n) = 0;         
-		virtual void DrawTexturedSubRect(int x0, int y0, int x1, int y1, float texs0, float text0, float texs1, float text1) = 0;
-		virtual void DrawTexturedPolygon(int n, Vertex_t* pVertice, bool bClipVertices = true) = 0;
-		virtual const wchar_t* GetTitle(VPANEL panel) = 0;
-		virtual bool IsCursorLocked(void) const = 0;
-		virtual void SetWorkspaceInsets(int left, int top, int right, int bottom) = 0;
-
-		virtual void DrawWordBubble(int x0, int y0, int x1, int y1, int nBorderThickness, Color rgbaBackground, Color rgbaBorder,
-			bool bPointer = false, int nPointerX = 0, int nPointerY = 0, int nPointerBaseThickness = 16) = 0; 
-
-
-		virtual bool DrawGetUnicodeCharRenderInfo(wchar_t ch, CharRenderInfo& info) = 0;
-		virtual void DrawRenderCharFromInfo(const CharRenderInfo& info) = 0;
-
-		virtual void DrawSetAlphaMultiplier(float alpha   ) = 0;
-		virtual float DrawGetAlphaMultiplier() = 0;
-
-		virtual void SetAllowHTMLJavaScript(bool state) = 0;
-
-		virtual void OnScreenSizeChanged(int nOldWidth, int nOldHeight) = 0;
-
-		virtual vgui::HCursor CreateCursorFromFile(char const* curOrAniFile, char const* pPathID = 0) = 0;
-
-		virtual IVguiMatInfo* DrawGetTextureMatInfoFactory(int id) = 0;
-
-		virtual void PaintTraverseEx(VPANEL panel, bool paintPopups = false) = 0;
-
-		virtual float GetZPos() const = 0;
-
-		virtual void SetPanelForInput(VPANEL vpanel) = 0;
-		virtual void DrawFilledRectFastFade(int x0, int y0, int x1, int y1, int fadeStartPt, int fadeEndPt, unsigned int alpha0, unsigned int alpha1, bool bHorizontal) = 0;
-		virtual void DrawFilledRectFade(int x0, int y0, int x1, int y1, unsigned int alpha0, unsigned int alpha1, bool bHorizontal) = 0;
-		virtual void DrawSetTextureRGBAEx(int id, const unsigned char* rgba, int wide, int tall, ImageFormat imageFormat) = 0;
-		virtual void DrawSetTextScale(float sx, float sy) = 0;
-		virtual bool SetBitmapFontGlyphSet(HFont font, const char* windowsFontName, float scalex, float scaley, int flags) = 0;
-		virtual bool AddBitmapFontFile(const char* fontFileName) = 0;
-		virtual void SetBitmapFontName(const char* pName, const char* pFontFilename) = 0;
-		virtual const char* GetBitmapFontName(const char* pName) = 0;
-		virtual void ClearTemporaryFontCache(void) = 0;
-
-		virtual IImage* GetIconImageForFullPath(char const* pFullPath) = 0;
-		virtual void DrawUnicodeString(const wchar_t* pwString, FontDrawType_t drawType = FONT_DRAW_DEFAULT) = 0;
-		virtual void PrecacheFontCharacters(HFont font, const wchar_t* pCharacters) = 0;
-		virtual const char* GetFontName(HFont font) = 0;
-		virtual bool ForceScreenSizeOverride(bool bState, int wide, int tall) = 0;
-		virtual bool ForceScreenPosOffset(bool bState, int x, int y) = 0;
-		virtual void OffsetAbsPos(int& x, int& y) = 0;
-
-		virtual void SetAbsPosForContext(int id, int x, int y) = 0; 
-		virtual void GetAbsPosForContext(int id, int& x, int& y) = 0; 
-
-		virtual void ResetFontCaches() = 0;
-
-		virtual bool IsScreenSizeOverrideActive(void) = 0;
-		virtual bool IsScreenPosOverrideActive(void) = 0;
-
-		virtual void DestroyTextureID(int id) = 0;
-
-		virtual int GetTextureNumFrames(int id) = 0;
-		virtual void DrawSetTextureFrame(int id, int nFrame, unsigned int* pFrameCache) = 0;
-
-		virtual void GetClipRect(int& x0, int& y0, int& x1, int& y1) = 0;
-		virtual void SetClipRect(int x0, int y0, int x1, int y1) = 0;
-
-		virtual void DrawTexturedRectEx(DrawTexturedRectParms_t* pDrawParms) = 0;
-
-		virtual void GetKernedCharWidth(HFont font, wchar_t ch, wchar_t chBefore, wchar_t chAfter, float& wide, float& abcA, float& abcC) = 0;
-		virtual void DrawUpdateRegionTextureRGBA(int nTextureID, int x, int y, const unsigned char* pchData, int wide, int tall, ImageFormat imageFormat) = 0;
-		virtual bool BHTMLWindowNeedsPaint(IHTML* htmlwin) = 0;
-
-		virtual void DrawSetTextureRGBALinear(int id, const unsigned char* rgba, int wide, int tall) = 0; 
-
-		virtual const char* GetWebkitHTMLUserAgentString() = 0;
-
-		virtual void* Deprecated_AccessChromeHTMLController() = 0;
-	};
-
-}
-
-#define VGUI_SURFACE_INTERFACE_VERSION "VGUI_Surface030"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ISystem.h b/SpyCustom/ISystem.h
deleted file mode 100644
index e94d8b2..0000000
--- a/SpyCustom/ISystem.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef ISYSTEM_H
-#define ISYSTEM_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "VGUI.h"
-#include "KeyCode.h"
-
-#ifdef PlaySound
-#undef PlaySound
-#endif
-
-class KeyValues;
-
-namespace vgui
-{
-
-	class ISystem : public IBaseInterface
-	{
-	public:
-		virtual void Shutdown() = 0;
-
-		virtual void RunFrame() = 0;
-
-		virtual void ShellExecute(const char* command, const char* file) = 0;
-
-		virtual double GetFrameTime() = 0;
-
-		virtual double GetCurrentTime() = 0;
-
-		virtual long GetTimeMillis() = 0;
-
-		virtual int GetClipboardTextCount() = 0;
-		virtual void SetClipboardText(const char* text, int textLen) = 0;
-		virtual void SetClipboardText(const wchar_t* text, int textLen) = 0;
-		virtual int GetClipboardText(int offset, char* buf, int bufLen) = 0;
-		virtual int GetClipboardText(int offset, wchar_t* buf, int bufLen) = 0;
-
-		virtual bool SetRegistryString(const char* key, const char* value) = 0;
-		virtual bool GetRegistryString(const char* key, char* value, int valueLen) = 0;
-		virtual bool SetRegistryInteger(const char* key, int value) = 0;
-		virtual bool GetRegistryInteger(const char* key, int& value) = 0;
-
-		virtual KeyValues* GetUserConfigFileData(const char* dialogName, int dialogID) = 0;
-		virtual void SetUserConfigFile(const char* fileName, const char* pathName) = 0;
-		virtual void SaveUserConfigFile() = 0;
-
-		virtual bool SetWatchForComputerUse(bool state) = 0;
-		virtual double GetTimeSinceLastUse() = 0;
-
-		virtual int GetAvailableDrives(char* buf, int bufLen) = 0;
-
-		virtual bool CommandLineParamExists(const char* paramName) = 0;
-
-		virtual const char* GetFullCommandLine() = 0;
-
-		virtual KeyCode KeyCode_VirtualKeyToVGUI(int keyCode) = 0;
-
-		virtual bool GetCurrentTimeAndDate(int* year, int* month, int* dayOfWeek, int* day, int* hour, int* minute, int* second) = 0;
-
-		virtual double GetFreeDiskSpace(const char* path) = 0;
-
-		virtual bool CreateShortcut(const char* linkFileName, const char* targetPath, const char* arguments, const char* workingDirectory, const char* iconFile) = 0;
-		virtual bool GetShortcutTarget(const char* linkFileName, char* targetPath, char* arguments, int destBufferSizes) = 0;
-		virtual bool ModifyShortcutTarget(const char* linkFileName, const char* targetPath, const char* arguments, const char* workingDirectory) = 0;
-
-		virtual bool GetCommandLineParamValue(const char* paramName, char* value, int valueBufferSize) = 0;
-
-		virtual bool DeleteRegistryKey(const char* keyName) = 0;
-
-		virtual const char* GetDesktopFolderPath() = 0;
-
-		virtual void ShellExecuteEx(const char* command, const char* file, const char* pParams) = 0;
-
-		virtual void SetClipboardImage(void* pWnd, int x1, int y1, int x2, int y2) = 0;
-	};
-
-}
-
-#define VGUI_SYSTEM_INTERFACE_VERSION "VGUI_System010"
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IVGUI.h b/SpyCustom/IVGUI.h
deleted file mode 100644
index 5eef332..0000000
--- a/SpyCustom/IVGUI.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef IVGUI_H
-#define IVGUI_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "VGUI.h"
-
-#include "IAppSystem.h"
-
-class KeyValues;
-
-namespace vgui
-{
-
-	typedef unsigned long HPanel;
-	typedef int HContext;
-
-	enum
-	{
-		DEFAULT_VGUI_CONTEXT = ((vgui::HContext)~0)
-	};
-
-	typedef unsigned long HPanel;
-
-	class IVGui : public IAppSystem
-	{
-	public:
-		virtual void Start() = 0;
-
-		virtual void Stop() = 0;
-
-		virtual bool IsRunning() = 0;
-
-		virtual void RunFrame() = 0;
-
-		virtual void ShutdownMessage(unsigned int shutdownID) = 0;
-
-		virtual VPANEL AllocPanel() = 0;
-		virtual void FreePanel(VPANEL panel) = 0;
-
-		virtual void DPrintf(PRINTF_FORMAT_STRING const char* format, ...) = 0;
-		virtual void DPrintf2(PRINTF_FORMAT_STRING const char* format, ...) = 0;
-		virtual void SpewAllActivePanelNames() = 0;
-
-		virtual HPanel PanelToHandle(VPANEL panel) = 0;
-		virtual VPANEL HandleToPanel(HPanel index) = 0;
-		virtual void MarkPanelForDeletion(VPANEL panel) = 0;
-
-		virtual void AddTickSignal(VPANEL panel, int intervalMilliseconds = 0) = 0;
-		virtual void RemoveTickSignal(VPANEL panel) = 0;
-
-		virtual void PostMessage(VPANEL target, KeyValues* params, VPANEL from, float delaySeconds = 0.0f) = 0;
-
-		virtual HContext CreateContext() = 0;
-		virtual void DestroyContext(HContext context) = 0;
-
-		virtual void AssociatePanelWithContext(HContext context, VPANEL pRoot) = 0;
-
-		virtual void ActivateContext(HContext context) = 0;
-
-		virtual void SetSleep(bool state) = 0;
-
-		virtual bool GetShouldVGuiControlSleep() = 0;
-
-		virtual void SetVRMode(bool bVRMode) = 0;
-		virtual bool GetVRMode() = 0;
-
-		virtual void AddTickSignalToHead(VPANEL panel, int intervalMilliseconds = 0) = 0;
-	};
-
-#define VGUI_IVGUI_INTERFACE_VERSION "VGUI_ivgui008"
-
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/IVguiMatInfo.h b/SpyCustom/IVguiMatInfo.h
deleted file mode 100644
index 1278a27..0000000
--- a/SpyCustom/IVguiMatInfo.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef IVGUIMATINFO_H
-#define IVGUIMATINFO_H
-
-#include "IVguiMatInfoVar.h"
-
-class IVguiMatInfo
-{
-public:
-	virtual ~IVguiMatInfo() {}
-
-	virtual IVguiMatInfoVar* FindVarFactory(const char* varName, bool* found) = 0;
-
-	virtual int GetNumAnimationFrames() = 0;
-
-};
-
-#endif 
\ No newline at end of file
diff --git a/SpyCustom/IVguiMatInfoVar.h b/SpyCustom/IVguiMatInfoVar.h
deleted file mode 100644
index 806b0b2..0000000
--- a/SpyCustom/IVguiMatInfoVar.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef IVGUIMATINFOVAR_H
-#define IVGUIMATINFOVAR_H
-
-
-class IVguiMatInfoVar
-{
-public:
-	virtual ~IVguiMatInfoVar() {}
-
-	virtual int GetIntValue(void) const = 0;
-	virtual void SetIntValue(int val) = 0;
-
-};
-
-#endif 
\ No newline at end of file
diff --git a/SpyCustom/Image.h b/SpyCustom/Image.h
deleted file mode 100644
index 878e692..0000000
--- a/SpyCustom/Image.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef IMAGE_H
-#define IMAGE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "Color.h"
-#include "IImage.h"
-
-namespace vgui
-{
-
-	class Panel;
-
-	class Image : public IImage
-	{
-	public:
-		Image();
-		virtual ~Image();
-
-		virtual void SetPos(int x, int y);
-		virtual void GetPos(int& x, int& y);
-		virtual void GetSize(int& wide, int& tall);
-		virtual void GetContentSize(int& wide, int& tall);
-		virtual void SetColor(Color color);
-		virtual void SetBkColor(Color color) { DrawSetColor(color); }
-		virtual Color GetColor();
-		virtual bool Evict();
-		virtual int GetNumFrames();
-		virtual void SetFrame(int nFrame);
-		virtual HTexture GetID();
-		virtual void SetRotation(int iRotation) { return; };
-
-	protected:
-		virtual void SetSize(int wide, int tall);
-		virtual void DrawSetColor(Color color);
-		virtual void DrawSetColor(int r, int g, int b, int a);
-		virtual void DrawFilledRect(int x0, int y0, int x1, int y1);
-		virtual void DrawOutlinedRect(int x0, int y0, int x1, int y1);
-		virtual void DrawLine(int x0, int y0, int x1, int y1);
-		virtual void DrawPolyLine(int* px, int* py, int numPoints);
-		virtual void DrawSetTextFont(HFont font);
-		virtual void DrawSetTextColor(Color color);
-		virtual void DrawSetTextColor(int r, int g, int b, int a);
-		virtual void DrawSetTextPos(int x, int y);
-		virtual void DrawPrintText(const wchar_t* str, int strlen);
-		virtual void DrawPrintText(int x, int y, const wchar_t* str, int strlen);
-		virtual void DrawPrintChar(wchar_t ch);
-		virtual void DrawPrintChar(int x, int y, wchar_t ch);
-		virtual void DrawSetTexture(int id);
-		virtual void DrawTexturedRect(int x0, int y0, int x1, int y1);
-		virtual void Paint() = 0;
-
-	private:
-		int _pos[2];
-		int _size[2];
-		Color _color;
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/InputEnums.h b/SpyCustom/InputEnums.h
deleted file mode 100644
index cb53db1..0000000
--- a/SpyCustom/InputEnums.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef INPUTENUMS_H
-#define INPUTENUMS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define MAX_BUTTONSAMPLE			32768
-
-#if !defined( _X360 )
-#define INVALID_USER_ID		-1
-#else
-#define INVALID_USER_ID		XBX_INVALID_USER_ID
-#endif
-
-enum
-{
-	MAX_JOYSTICKS = 1,
-	MOUSE_BUTTON_COUNT = 5,
-	MAX_NOVINT_DEVICES = 2,
-};
-
-#if defined( LINUX )
-enum JoystickAxis_t
-{
-	JOY_AXIS_X = 0,
-	JOY_AXIS_Y,
-	JOY_AXIS_Z,
-	JOY_AXIS_U,
-	JOY_AXIS_R,
-	JOY_AXIS_V,
-	MAX_JOYSTICK_AXES,
-};
-#else
-enum JoystickAxis_t
-{
-	JOY_AXIS_X = 0,
-	JOY_AXIS_Y,
-	JOY_AXIS_Z,
-	JOY_AXIS_R,
-	JOY_AXIS_U,
-	JOY_AXIS_V,
-	MAX_JOYSTICK_AXES,
-};
-#endif
-
-
-
-enum
-{
-	MS_WM_XBUTTONDOWN = 0x020B,
-	MS_WM_XBUTTONUP = 0x020C,
-	MS_WM_XBUTTONDBLCLK = 0x020D,
-	MS_MK_BUTTON4 = 0x0020,
-	MS_MK_BUTTON5 = 0x0040,
-};
-
-enum InputEventType_t
-{
-	IE_ButtonPressed = 0,	    
-	IE_ButtonReleased,		    
-	IE_ButtonDoubleClicked,	    
-	IE_AnalogValueChanged,	        
-
-	IE_FirstSystemEvent = 100,
-	IE_Quit = IE_FirstSystemEvent,
-	IE_ControllerInserted,	     
-	IE_ControllerUnplugged,	     
-
-	IE_FirstVguiEvent = 1000,	          
-	IE_FirstAppEvent = 2000,
-};
-
-struct InputEvent_t
-{
-	int m_nType;				      
-	int m_nTick;				      
-	int m_nData;				          
-	int m_nData2;				          
-	int m_nData3;				          
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Interfaces.cpp b/SpyCustom/Interfaces.cpp
deleted file mode 100644
index 688f846..0000000
--- a/SpyCustom/Interfaces.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-#include "Interfaces.hpp"
-#include "PatternScan.hpp"
-
-IF iff;
-
-void* IF::GetInterface(const char* dllname, const char* interfacename)
-{
-    tCreateInterface CreateInterface = (tCreateInterface)GetProcAddress(GetModuleHandleA(dllname), "CreateInterface");
-    int returnCode = 0;
-    void* ointerface = CreateInterface(interfacename, &returnCode);
-#ifdef DEBUG
-    printf("%s = %x\n", interfacename, ointerface);
-#endif
-    return ointerface;
-}
-
-PVOID FindHudElement(const char* name)
-{
-    void* pointer1 = (void*)(FindPatternV2("client.dll", "B9 ? ? ? ? E8 ? ? ? ? 8B 5D 08") + 1);
-    static void* pThis = *reinterpret_cast<DWORD**>(pointer1);
-    void* pointer2 = (void*)(FindPatternV2("client.dll", "55 8B EC 53 8B 5D 08 56 57 8B F9 33 F6 39 77 28"));
-    static auto find_hud_element
-        = reinterpret_cast<DWORD(__thiscall*)(void*, const char*)>(
-            pointer2
-            );
-    return (void*)find_hud_element(pThis, name);
-}
-
-
-#define VTBL(classptr) (*(DWORD*)classptr)
-#define PVFN_(classptr, offset) (VTBL(classptr) + offset)
-#define VFN_(classptr, offset) *(DWORD*)PVFN_(classptr, offset)
-#define VFN(classptr, offset) VFN_(classptr, (offset * sizeof(void*)))
-
-
-void IF::Init()
-{ 
-    g_pEntityList = (IClientEntityList*)GetInterface("client.dll", "VClientEntityList003");
-    g_pGameUI = (CGameUI*)GetInterface("client.dll", "GameUI011");
-    g_pVGuiPanel = (vgui::IPanel*)GetInterface("vgui2.dll", "VGUI_Panel009");
-    g_pGameEvents = (CGameEventManager*)GetInterface("engine.dll", "GAMEEVENTSMANAGER002");
-    g_pEngineClient = (IVEngineClient*)GetInterface("engine.dll", "VEngineClient014");
-    g_pEnginetrace = (IEngineTrace*)GetInterface("engine.dll", "EngineTraceClient004");
-    g_pEnginevgui = (IEngineVGui*)GetInterface("engine.dll", "VEngineVGui001");
-    g_pVGui = (vgui::IVGui*)GetInterface("vgui2.dll", "VGUI_ivgui008");
-    g_pClient = (IBaseClientDLL*)GetInterface("client.dll", "VClient018");
-    g_pMdlInfo = (IVModelInfoClient*)GetInterface("engine.dll", "VModelInfoClient004");
-    g_pMdlRender = (IVModelRender*)GetInterface("engine.dll", "VEngineModel016");
-    g_pMaterialSystem = (IMaterialSystem*)GetInterface("materialsystem.dll", "VMaterialSystem080");
-    g_pCVar = (ICvar*)GetInterface("vstdlib.dll", "VEngineCvar007");
-    g_pVGuiSystem = (vgui::ISystem*)GetInterface("vgui2.dll", "VGUI_System010");
-    g_pVGuiSchemeManager = (vgui::ISchemeManager*)GetInterface("vgui2.dll", "VGUI_Scheme010");
-    g_pVGuiInput = (vgui::IInput*)GetInterface("vgui2.dll", "VGUI_Input005");
-    g_pFullFileSystem = (IFileSystem*)GetInterface("filesystem_stdio.dll", "VFileSystem017");
-    g_pGameConsole = (IGameConsole*)GetInterface("client.dll", "GameConsole004");
-    g_pEfx = (IVEfx*)GetInterface("engine.dll", "VEngineEffects001"); 
-    g_pPhysProps = (IPhysicsSurfaceProps*)GetInterface("vphysics.dll", "VPhysicsSurfaceProps001");
-    g_pRenderView = (IVRenderView*)GetInterface("engine.dll", "VEngineRenderView014");
-    g_pDebugOverlay = (IVDebugOverlay*)GetInterface("engine.dll", "VDebugOverlay004");
-    g_pEffects = (IEffects*)GetInterface("client.dll", "IEffects001");
-    g_pStudioRender = (IStudioRender*)GetInterface("studiorender.dll", "VStudioRender026");
-
-    typedef PVOID(__cdecl* oKeyValuesSystem)();
-    oKeyValuesSystem pkeyValuesSystem = (oKeyValuesSystem)GetProcAddress(GetModuleHandleA("vstdlib.dll"), "KeyValuesSystem");
-    keyValuesSystem = (IKeyValuesSystem*)pkeyValuesSystem();
-#ifdef DEBUG
-    printf("KeyValuesSystem = %x\n", keyValuesSystem);
-#endif
-    myConMsg = (CONMSGPROC)GetProcAddress(GetModuleHandleA("tier0.dll"), "?ConMsg@@YAXPBDZZ");
-    myConColorMsg = (CONCOLORMSGPROC)GetProcAddress(GetModuleHandleA("tier0.dll"), "?ConColorMsg@@YAXABVColor@@PBDZZ");
-
-    g_pGlobals = **(CGlobalVarsBase***)(FindPatternV2("client.dll", "A1 ? ? ? ? 5E 8B 40 10") + 1);
-    g_pInput = *(CInput**)(FindPatternV2("client.dll", "B9 ? ? ? ? F3 0F 11 04 24 FF 50 10") + 1);
-    g_pViewRenderBeams = *(IViewRenderBeams**)(FindPatternV2("client.dll", "B9 ?? ?? ?? ?? A1 ?? ?? ?? ?? FF 10 A1 ?? ?? ?? ?? B9") + 0x1);
-#ifdef DEBUG
-    printf("g_pGlobals = %x\n", g_pGlobals);
-    printf("g_pInput = %x\n", g_pInput);
-    printf("g_pViewRenderBeams = %x\n", g_pViewRenderBeams);
-#endif
-    FX_Tesla = (FX_TeslaFn)FindPatternV2("client.dll", "55 8B EC 81 EC ? ? ? ? 56 57 8B F9 8B 47 18");
-#ifdef DEBUG
-    printf("FX_TeslaFn %x\n", FX_Tesla);
-#endif
-    BloodSprayFn = (FX_BloodSprayFn)FindPatternV2("client.dll", "55 8B EC 8B 4D 08 F3 0F 10 51 ? 8D");
-#ifdef DEBUG
-    printf("FX_BloodSprayFn %x\n", BloodSprayFn);
-#endif
-    DispatchEffect = (FXDispatchEffect)FindPatternV2("client.dll", "55 8B EC 83 E4 F8 83 EC 20 56 57 8B F9 C7 44 24");
-#ifdef DEBUG
-    printf("DispatchEffect %x\n", DispatchEffect);
-#endif
-    g_pChatElement = (CHudChat*)FindHudElement("CHudChat");
-#ifdef DEBUG
-    printf("Chat element %x\n", g_pChatElement);
-#endif
-
-    LoadFromFile = (void*)FindPatternV2("client.dll", "55 8B EC 83 EC 0C 53 8B 5D 08 56 8B F1 3B"); 
-#ifdef DEBUG
-    printf("LoadFromFile %x\n", LoadFromFile);
-#endif
-    g_pD3DDevice9 = **(IDirect3DDevice9***)(FindPatternV2("shaderapidx9.dll", "A1 ? ? ? ? 50 8B 08 FF 51 0C") + 1);
-#ifdef DEBUG
-    printf("g_pD3DDevice9 %x\n", g_pD3DDevice9);
-#endif
-    g_pMemAlloc = *(IMemAlloc**)(GetProcAddress(GetModuleHandle("tier0.dll"), "g_pMemAlloc"));
-#ifdef DEBUG
-    printf("g_pMemAlloc %x\n", g_pMemAlloc);
-#endif
-
-    g_pClientState = **reinterpret_cast<CClientState***>(getvfunc<uintptr_t>(g_pEngineClient, 12) + 0x10); 
-#ifdef DEBUG
-    printf("g_pClientState %x\n", g_pClientState);
-#endif
-
-    CHudElement* g_pHudElement = (CHudElement*)FindHudElement("CCSGO_HudDeathNotice");  
-#ifdef DEBUG
-    printf("Hud element %x\n", g_pHudElement);
-#endif
-
-    auto SteamClient = ((ISteamClient * (__cdecl*)(void))GetProcAddress(GetModuleHandleA("steam_api.dll"), "SteamClient"))();
-    g_SteamGameCoordinator = (ISteamGameCoordinator*)SteamClient->GetISteamGenericInterface((void*)1, (void*)1, "SteamGameCoordinator001");
-    g_SteamUser = SteamClient->GetISteamUser((void*)1, (void*)1, "SteamUser019");
-#ifdef DEBUG
-    printf("SteamClient %X\n", SteamClient);
-    printf("g_SteamGameCoordinator %X\n", g_SteamGameCoordinator);
-    printf("g_SteamUser %X\n", g_SteamUser);
-#endif
-    
-    g_pClientLeafSystem = (IClientLeafSystem*)GetInterface("client.dll", "ClientLeafSystem002");
-#ifdef DEBUG
-    printf("g_pClientLeafSystem %x\n", g_pClientLeafSystem);
-#endif
-    g_pNetworkStringTableContainer = (INetworkStringTableContainer*)GetInterface("engine.dll", "VEngineClientStringTable001");
-#ifdef DEBUG
-    printf("g_pNetworkStringTableContainer %x\n", g_pNetworkStringTableContainer);
-#endif
-
-    getPlayerViewmodelArmConfigForPlayerModel = relativeToAbsolute<decltype(getPlayerViewmodelArmConfigForPlayerModel)>(FindPatternV2("client.dll", "E8 ? ? ? ? 89 87 ? ? ? ? 6A") + 1);
-
-    g_pMdlCache = (IMDLCache*)GetInterface("datacache.dll", "MDLCache004");
-    g_pEngineSound = (IEngineSound*)GetInterface("engine.dll", "IEngineSoundClient003");
-
-    g_pClientShadowMgr = *(IClientShadowMgr**)(FindPatternV2("client.dll", "A1 ? ? ? ? FF 90 ? ? ? ? 6A 00 6A 00") + 1);
-#ifdef DEBUG
-    printf("g_pClientShadowMgr %x\n", g_pClientShadowMgr);
-#endif
-    g_ViewRender = *(CCSViewRender**)(FindPatternV2("client.dll", "A1 ? ? ? ? B9 ? ? ? ? C7 05 ? ? ? ? ? ? ? ? FF 10") + 1); 
-#ifdef DEBUG
-    printf("g_ViewRender %x\n", g_ViewRender);
-#endif
-    g_ClientMode = **(IClientMode***)((*(DWORD**)g_pClient)[10] + 0x5);
-#ifdef DEBUG
-    printf("g_ClientMode %x\n", g_ClientMode);
-#endif
-
-    g_pInputSystem = (IInputSystem*)GetInterface("inputsystem.dll", "InputSystemVersion001");
-    g_pVGuiSurface = (vgui::ISurface*)GetInterface("vguimatsurface.dll", "VGUI_Surface031");  
-
-    prime = (uint8_t*)FindPatternV2("client.dll", "A1 ? ? ? ? 85 C0 75 07 83 F8 05 0F 94 C0 C3");
-#ifdef DEBUG
-    printf("Prime found at %x\n", prime);
-#endif
-}
-
-
-auto is_code_ptr(void* ptr) -> bool
-{
-    constexpr const DWORD protect_flags = PAGE_EXECUTE | PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY;
-
-    MEMORY_BASIC_INFORMATION out;
-    VirtualQuery(ptr, &out, sizeof out);
-
-    return out.Type
-        && !(out.Protect & (PAGE_GUARD | PAGE_NOACCESS))
-        && out.Protect & protect_flags;
-}
-
-
-
-
diff --git a/SpyCustom/Interfaces.hpp b/SpyCustom/Interfaces.hpp
deleted file mode 100644
index 2a4e9d0..0000000
--- a/SpyCustom/Interfaces.hpp
+++ /dev/null
@@ -1,326 +0,0 @@
-#ifndef INTERFACES
-#define INTERFACES
-#pragma once
-
-#define DEBUG
-
-#define CLIENT_DLL 
-
-#include "GetVfunc.hpp"
-
-#include <iostream>
-#include <windows.h>
-#include "icliententitylist.h"
-#include "CGameUI.h"
-#include "GameEventManager.h"
-#include "cdll_int.h"
-#include "ISurface.h"
-#include "IEngineVgui.h"
-#include "ivmodelinfo.h"
-#include "idatacache.h"
-#include "ILocalize.h"
-#include "IGameUI.h"
-#include "dt_recv.h"
-#include "client_class.h"
-#include "enginetrace.h"
-#include "gameconsole.h"
-#include "ivrenderview.h"
-#include "ivdebugoverlay.h"
-#include "vphysics_interface.h"
-#include "iefx.h"
-#include "c_input.h"
-#include "IEffects.h"
-#include "iviewrender_beams.h"
-#include "sdk_hud_chat.h"
-#include "fx.h" 
-#include "globalvars_base.h"
-#include "IInput.h"
-#include "icliententity.h"
-#include "iclient.h"
-#include "cdll_int.h"
-#include "baseclientstate.h"
-#include "imgui/imgui_impl_dx9.h"
-#include "flashlighteffect.h"
-#include "inetchannel.h"
-#include "steam.h"
-#include "animationlayer.h" 
-#include "clientleafsystem.h"
-#include "filesystem.h"
-#include "modelloader.h"
-#include "IEngineSound.h"
-#include "iclientshadowmgr.h"
-#include "cs_view_scene.h"
-#include "iclientmode.h"
-#include "itexture.h"
-#include "precipitation_shared.h"
-#include "iinputsystem.h"
-#include "vpkparser.h"
-#include "itempents.h" 
-#include "c_te_legacytempents.h"
-
-#include "XorStr.hpp"
-
-PVOID FindHudElement(const char* name);
-
-auto is_code_ptr(void* ptr) -> bool;
-
-#include "resource.h"
-
-class IF {
-public:
-	IClientEntityList* g_pEntityList = nullptr;
-	CGameUI* g_pGameUI = nullptr;
-	vgui::IPanel* g_pVGuiPanel = nullptr;
-	CGameEventManager* g_pGameEvents = nullptr;
-	IVEngineClient* g_pEngineClient = nullptr;
-	vgui::ISurface* g_pVGuiSurface = nullptr;
-	IEngineVGui* g_pEnginevgui = nullptr;
-	vgui::IVGui* g_pVGui = nullptr;
-	IBaseClientDLL* g_pClient = nullptr;
-	IVModelInfoClient* g_pMdlInfo = nullptr;
-	IVModelRender* g_pMdlRender = nullptr;
-	IMaterialSystem* g_pMaterialSystem = nullptr;
-	IKeyValuesSystem* keyValuesSystem = nullptr;
-	ICvar* g_pCVar = nullptr;
-	vgui::ISystem* g_pVGuiSystem = nullptr;
-	vgui::ISchemeManager* g_pVGuiSchemeManager = nullptr;
-	vgui::IInput* g_pVGuiInput = nullptr;
-	IFileSystem* g_pFullFileSystem = nullptr;
-	vgui::ILocalize* g_pVGuiLocalize = nullptr;
-	IEngineTrace* g_pEnginetrace = nullptr;
-	IVEfx* g_pEfx = nullptr;
-	IGameConsole* g_pGameConsole = nullptr;
-	IPhysicsSurfaceProps* g_pPhysProps = nullptr;
-	IVRenderView* g_pRenderView = nullptr;
-	IVDebugOverlay* g_pDebugOverlay = nullptr;
-	CGlobalVarsBase* g_pGlobals = nullptr;
-	CInput* g_pInput = nullptr;
-	IEffects* g_pEffects = nullptr;
-	IViewRenderBeams* g_pViewRenderBeams = nullptr;
-	IStudioRender* g_pStudioRender = nullptr;
-	CHudChat* g_pChatElement = nullptr;
-	using FX_TeslaFn = void(__thiscall*)(CTeslaInfo&);
-	FX_TeslaFn FX_Tesla = nullptr;
-	using FX_BloodSprayFn = bool(__cdecl*)(const CEffectData&);
-	FX_BloodSprayFn BloodSprayFn = nullptr;
-	using FXDispatchEffect = int(__fastcall*)(const char* name, const CEffectData&);
-	FXDispatchEffect DispatchEffect = nullptr;
-	void Init();
-	void* GetInterface(const char* dllname, const char* interfacename);
-	typedef void(__cdecl* CONMSGPROC)(const char*, ...);
-	CONMSGPROC myConMsg = nullptr;
-	typedef void(__cdecl* CONCOLORMSGPROC)(Color& clr, const char*, ...);
-	CONCOLORMSGPROC myConColorMsg = nullptr;
-	PVOID LoadFromFile = nullptr;
-	IDirect3DDevice9* g_pD3DDevice9 = nullptr;
-	IMemAlloc* g_pMemAlloc = nullptr;
-	ISteamGameCoordinator* g_SteamGameCoordinator = nullptr;
-	ISteamUser* g_SteamUser = nullptr;
-	CClientState* g_pClientState = nullptr;
-	CHudElement* g_pHudElement = nullptr;
-	IClientLeafSystem* g_pClientLeafSystem = nullptr;
-	INetworkStringTableContainer* g_pNetworkStringTableContainer = nullptr;
-	std::add_pointer_t<const char** __fastcall(const char* playerModelName)> getPlayerViewmodelArmConfigForPlayerModel;
-	IMDLCache* g_pMdlCache = nullptr;
-	IModelLoader* g_ModelLoader = nullptr;
-	IEngineSound* g_pEngineSound = nullptr;
-	IClientShadowMgr* g_pClientShadowMgr = nullptr;
-	CCSViewRender* g_ViewRender = nullptr;
-	IClientMode* g_ClientMode = nullptr;
-	CGlobalVarsBase* g_Globals = nullptr;
-	IInputSystem* g_pInputSystem = nullptr;
-	ITempEnts* g_pTempEnts = nullptr; 
-	uint8_t* prime;
-	char oldprime[5];
-};
-
-extern IF iff;
-
-typedef void* (__cdecl* tCreateInterface)(const char* name, int* returnCode);
-
-template <typename T>
-static constexpr auto relativeToAbsolute(uintptr_t address) noexcept
-{
-	return (T)(address + 4 + *reinterpret_cast<std::int32_t*>(address));
-}
-
-
-namespace vgui {
-	inline vgui::IInput* input()
-	{
-		return iff.g_pVGuiInput;
-	}
-
-	inline vgui::ISchemeManager* scheme()
-	{
-		return iff.g_pVGuiSchemeManager;
-	}
-
-	inline vgui::ISurface* surface()
-	{
-		return iff.g_pVGuiSurface;
-	}
-
-	inline vgui::ISystem* system()
-	{
-		return iff.g_pVGuiSystem;
-	}
-
-	inline vgui::IVGui* ivgui()
-	{
-		return iff.g_pVGui;
-	}
-
-	inline vgui::IPanel* ipanel()
-	{
-		return iff.g_pVGuiPanel;
-	}
-}
-
-
-class ICvar2 : public ICvar
-{
-public:
-	ConVar* FindVar2(const char* var)
-	{
-		printf("Trying to find var %s\n", var);
-		typedef ConVar* (*oFindVar)(void*, const char*);
-		return getvfunc<oFindVar>(this, 16)(this, var);
-	}
-
-	template <typename... Values>
-	void ConsoleColorPrintf2(const Color& MsgColor, const char* szMsgFormat, Values... Parameters)
-	{
-		printf("Trying to print %s\n", szMsgFormat);
-		typedef void(*oConsoleColorPrintf)(void*, const Color&, const char*, ...);
-		return getvfunc<oConsoleColorPrintf>(this, 25)(this, MsgColor, szMsgFormat, Parameters...);
-	}
-};
-
-struct model_t
-{
-	void* fnHandle;                
-	char    szName[260];             
-	__int32 nLoadFlags;              
-	__int32 nServerCount;            
-	__int32 type;                    
-	__int32 flags;                   
-	Vector  vecMins;                 
-	Vector  vecMaxs;                 
-	float   radius;                  
-	char    pad[0x1C];              
-};
-
-
-void AngleVectors(const Vector& angles, Vector* forward, Vector* right, Vector* up);
-
-enum ItemDefinitionIndex
-{
-	ITEM_NONE = 0,
-	WEAPON_DEAGLE = 1,
-	WEAPON_ELITE = 2,
-	WEAPON_FIVESEVEN = 3,
-	WEAPON_GLOCK = 4,
-	WEAPON_AK47 = 7,
-	WEAPON_AUG = 8,
-	WEAPON_AWP = 9,
-	WEAPON_FAMAS = 10,
-	WEAPON_G3SG1 = 11,
-	WEAPON_GALILAR = 13,
-	WEAPON_M249 = 14,
-	WEAPON_M4A1 = 16,
-	WEAPON_MAC10 = 17,
-	WEAPON_P90 = 19,
-	WEAPON_UMP45 = 24,
-	WEAPON_XM1014 = 25,
-	WEAPON_BIZON = 26,
-	WEAPON_MAG7 = 27,
-	WEAPON_NEGEV = 28,
-	WEAPON_SAWEDOFF = 29,
-	WEAPON_TEC9 = 30,
-	WEAPON_TASER = 31,
-	WEAPON_HKP2000 = 32,
-	WEAPON_MP7 = 33,
-	WEAPON_MP9 = 34,
-	WEAPON_NOVA = 35,
-	WEAPON_P250 = 36,
-	WEAPON_SCAR20 = 38,
-	WEAPON_SG553 = 39,
-	WEAPON_SSG08 = 40,
-	WEAPON_KNIFE_GOLD = 41,
-	WEAPON_KNIFE = 42,
-	WEAPON_FLASHBANG = 43,
-	WEAPON_HEGRENADE = 44,
-	WEAPON_SMOKEGRENADE = 45,
-	WEAPON_MOLOTOV = 46,
-	WEAPON_DECOY = 47,
-	WEAPON_INCGRENADE = 48,
-	WEAPON_C4 = 49,
-	WEAPON_KNIFE_T = 59,
-	WEAPON_M4A1_SILENCER = 60,
-	WEAPON_USP_SILENCER = 61,
-	WEAPON_CZ75A = 63,
-	WEAPON_REVOLVER = 64,
-	WEAPON_KNIFE_BAYONET = 500,
-	WEAPON_KNIFE_FLIP = 505,
-	WEAPON_KNIFE_GUT = 506,
-	WEAPON_KNIFE_KARAMBIT = 507,
-	WEAPON_KNIFE_M9_BAYONET = 508,
-	WEAPON_KNIFE_TACTICAL = 509,
-	WEAPON_KNIFE_FALCHION = 512,
-	WEAPON_KNIFE_SURVIVAL_BOWIE = 514,
-	WEAPON_KNIFE_BUTTERFLY = 515,
-	WEAPON_KNIFE_PUSH = 516,
-	GLOVE_STUDDED_BLOODHOUND = 5027,
-	GLOVE_T_SIDE = 5028,
-	GLOVE_CT_SIDE = 5029,
-	GLOVE_SPORTY = 5030,
-	GLOVE_SLICK = 5031,
-	GLOVE_LEATHER_WRAP = 5032,
-	GLOVE_MOTORCYCLE = 5033,
-	GLOVE_SPECIALIST = 5034,
-	MAX_ITEMDEFINITIONINDEX
-};
-
-
-static int random(int min, int max) noexcept
-{
-	return rand() % (max - min + 1) + min;
-}
-
-
-enum Sequence
-{
-	SEQUENCE_DEFAULT_DRAW = 0,
-	SEQUENCE_DEFAULT_IDLE1 = 1,
-	SEQUENCE_DEFAULT_IDLE2 = 2,
-	SEQUENCE_DEFAULT_LIGHT_MISS1 = 3,
-	SEQUENCE_DEFAULT_LIGHT_MISS2 = 4,
-	SEQUENCE_DEFAULT_HEAVY_MISS1 = 9,
-	SEQUENCE_DEFAULT_HEAVY_HIT1 = 10,
-	SEQUENCE_DEFAULT_HEAVY_BACKSTAB = 11,
-	SEQUENCE_DEFAULT_LOOKAT01 = 12,
-
-	SEQUENCE_BUTTERFLY_DRAW = 0,
-	SEQUENCE_BUTTERFLY_DRAW2 = 1,
-	SEQUENCE_BUTTERFLY_LOOKAT01 = 13,
-	SEQUENCE_BUTTERFLY_LOOKAT03 = 15,
-
-	SEQUENCE_FALCHION_IDLE1 = 1,
-	SEQUENCE_FALCHION_HEAVY_MISS1 = 8,
-	SEQUENCE_FALCHION_HEAVY_MISS1_NOFLIP = 9,
-	SEQUENCE_FALCHION_LOOKAT01 = 12,
-	SEQUENCE_FALCHION_LOOKAT02 = 13,
-
-	SEQUENCE_DAGGERS_IDLE1 = 1,
-	SEQUENCE_DAGGERS_LIGHT_MISS1 = 2,
-	SEQUENCE_DAGGERS_LIGHT_MISS5 = 6,
-	SEQUENCE_DAGGERS_HEAVY_MISS2 = 11,
-	SEQUENCE_DAGGERS_HEAVY_MISS1 = 12,
-
-	SEQUENCE_BOWIE_IDLE1 = 1,
-};
-
-
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/KeyBindingMap.h b/SpyCustom/KeyBindingMap.h
deleted file mode 100644
index 1fc0d95..0000000
--- a/SpyCustom/KeyBindingMap.h
+++ /dev/null
@@ -1,206 +0,0 @@
-#ifndef KEYBINDINGMAP_H
-#define KEYBINDINGMAP_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-
-namespace vgui
-{
-
-	class Panel;
-
-	enum
-	{
-		MODIFIER_SHIFT = (1 << 0),
-		MODIFIER_CONTROL = (1 << 1),
-		MODIFIER_ALT = (1 << 2),
-	};
-
-	struct BoundKey_t
-	{
-		BoundKey_t();
-		BoundKey_t(const BoundKey_t& src);
-		~BoundKey_t();
-		BoundKey_t& operator =(const BoundKey_t& src);
-
-		bool				isbuiltin;		             
-		char const* bindingname;     
-		int					keycode;	  
-		int					modifiers;    
-	};
-
-	struct KeyBindingMap_t
-	{
-		KeyBindingMap_t();
-		KeyBindingMap_t(const KeyBindingMap_t& src);
-		~KeyBindingMap_t();
-
-		char const* bindingname;     
-		ALIGN16 MessageFunc_t	func;
-		char const* helpstring;   
-		char const* docstring;    
-		bool					passive;      
-	};
-
-#define DECLARE_KEYBINDINGMAP( className )												\
-	static void KB_AddToMap																\
-	(																					\
-		char const			*bindingname,												\
-		vgui::KeyCode		defaultcode,												\
-		int					default_modifiers,											\
-		vgui::MessageFunc_t function,													\
-		char const			*helpstring,												\
-		char const			*docstring,													\
-		bool				passive														\
-	) 																					\
-	{																					\
-		vgui::PanelKeyBindingMap *map = vgui::FindOrAddPanelKeyBindingMap( GetPanelClassName() ); \
-																						\
-		vgui::KeyBindingMap_t entry;													\
-		entry.bindingname = bindingname;												\
-																						\
-		entry.func = function;															\
-																						\
-		entry.helpstring = helpstring;													\
-		entry.docstring = docstring;													\
-																						\
-		entry.passive = passive;														\
-																						\
-		map->entries.AddToTail( entry );												\
-																						\
-		vgui::BoundKey_t kb;															\
-		kb.isbuiltin = true;															\
-		kb.bindingname = bindingname;													\
-		kb.keycode = defaultcode;														\
-		kb.modifiers = default_modifiers;												\
-		map->defaultkeys.AddToTail( kb );													\
-		map->boundkeys.AddToTail( kb );													\
-	}																					\
-																						\
-	static void KB_ChainToMap( void )													\
-	{																					\
-		static bool chained = false;													\
-		if ( chained )																	\
-			return;																		\
-		chained = true;																	\
-		vgui::PanelKeyBindingMap *map = vgui::FindOrAddPanelKeyBindingMap( GetPanelClassName() );	\
-		map->pfnClassName = &GetPanelClassName;											\
-		if ( map && GetPanelBaseClassName() && GetPanelBaseClassName()[0] )				\
-		{																				\
-			map->baseMap = vgui::FindOrAddPanelKeyBindingMap( GetPanelBaseClassName() );	\
-		}																				\
-	}																					\
-																						\
-	static void KB_AddBoundKey															\
-	(																					\
-		char const			*bindingname,												\
-		int					keycode,													\
-		int					modifiers													\
-	)																					\
-	{																					\
-		vgui::PanelKeyBindingMap *map = vgui::FindOrAddPanelKeyBindingMap( GetPanelClassName() );	\
-		vgui::BoundKey_t kb;															\
-		kb.isbuiltin = true;															\
-		kb.bindingname = bindingname;													\
-		kb.keycode = keycode;															\
-		kb.modifiers = modifiers;														\
-		map->defaultkeys.AddToTail( kb );													\
-		map->boundkeys.AddToTail( kb );													\
-	}																					\
-																						\
-	class className##_RegisterKBMap;													\
-	friend class className##_RegisterKBMap;												\
-	class className##_RegisterKBMap														\
-	{																					\
-	public:																				\
-		className##_RegisterKBMap()														\
-		{																				\
-			className::KB_ChainToMap();													\
-		}																				\
-	};																					\
-	className##_RegisterKBMap m_RegisterClassKB;										\
-																						\
-	virtual vgui::PanelKeyBindingMap *GetKBMap()										\
-	{																					\
-		static vgui::PanelKeyBindingMap *s_pMap = vgui::FindOrAddPanelKeyBindingMap( GetPanelClassName() );	\
-		return s_pMap;																	\
-	}
-
-#define _KBMapFuncCommonFunc( name, keycode, modifiers, function, help, doc, passive )	\
-	class PanelKBMapFunc_##name; \
-	friend class PanelKBMapFunc_##name; \
-	class PanelKBMapFunc_##name \
-	{ \
-	public: \
-		static void InitVar() \
-		{ \
-			static bool bAdded = false; \
-			if ( !bAdded ) \
-			{ \
-				bAdded = true; \
-				KB_AddToMap( #name, keycode, modifiers, (vgui::MessageFunc_t)&ThisClass::function, help, doc, passive ); \
-			}											\
-		}												\
-		PanelKBMapFunc_##name()							\
-		{												\
-			PanelKBMapFunc_##name::InitVar();			\
-		}												\
-	};													\
-	PanelKBMapFunc_##name m_##name##_register;		
-
-#define _KBBindKeyCommon( name, keycode, modifiers, _classname )	\
-	class PanelKBBindFunc_##_classname; \
-	friend class PanelKBBindFunc_##_classname; \
-	class PanelKBBindFunc_##_classname \
-	{ \
-	public: \
-		static void InitVar() \
-		{ \
-			static bool bAdded = false; \
-			if ( !bAdded ) \
-			{ \
-				bAdded = true; \
-				KB_AddBoundKey( #name, keycode, modifiers ); \
-			}											\
-		}												\
-		PanelKBBindFunc_##_classname()					\
-		{												\
-			PanelKBBindFunc_##_classname::InitVar();	\
-		}												\
-	};													\
-	PanelKBBindFunc_##_classname m_##_classname##_bindkey_register;	
-
-#define KEYBINDING_FUNC( name, keycode, modifiers, function, help, doc )				_KBMapFuncCommonFunc( name, keycode, modifiers, function, help, doc, false ); virtual void function()
-#define KEYBINDING_FUNC_NODECLARE( name, keycode, modifiers, function, help, doc )		_KBMapFuncCommonFunc( name, keycode, modifiers, function, help, doc, false );
-#define KEYBINDING_FUNC_PASSIVE( name, keycode, modifiers, function, help, doc )		_KBMapFuncCommonFunc( name, keycode, modifiers, function, help, doc, true );	virtual void function()
-#define KEYBINDING_FUNC_PASSIVE_NODECLARE( name, keycode, modifiers, function, help, doc )		_KBMapFuncCommonFunc( name, keycode, modifiers, function, help, doc, true );
-
-#define KEYBINDING_ADDBINDING( name, keycode, modifiers )									_KBBindKeyCommon( name, keycode, modifiers, name );
-#define KEYBINDING_ADDBINDING_MULTIPLE( name, keycode, modifiers, _classname )				_KBBindKeyCommon( name, keycode, modifiers, _classname );
-
-	struct PanelKeyBindingMap
-	{
-		PanelKeyBindingMap()
-		{
-			baseMap = NULL;
-			pfnClassName = NULL;
-			processed = false;
-		}
-
-		CUtlVector< KeyBindingMap_t > entries;
-		bool processed;
-		PanelKeyBindingMap* baseMap;
-		CUtlVector< BoundKey_t > defaultkeys;
-		CUtlVector< BoundKey_t > boundkeys;
-		char const* (*pfnClassName)(void);
-	};
-
-	PanelKeyBindingMap* FindPanelKeyBindingMap(char const* className);
-	PanelKeyBindingMap* FindOrAddPanelKeyBindingMap(char const* className);
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/KeyCode.h b/SpyCustom/KeyCode.h
deleted file mode 100644
index dc23cc4..0000000
--- a/SpyCustom/KeyCode.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef KEYCODE_H
-#define KEYCODE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "ButtonCode.h"
-
-namespace vgui
-{
-	typedef ButtonCode_t KeyCode;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/KeyValues.cpp b/SpyCustom/KeyValues.cpp
deleted file mode 100644
index 053b268..0000000
--- a/SpyCustom/KeyValues.cpp
+++ /dev/null
@@ -1,1830 +0,0 @@
-#include "keyvalues.h"
-#include "IKeyValuesSystem.h"
-
-#include "Interfaces.hpp"
-
-void V_strncpy(char* pDest, char const* pSrc, int maxLen)
-{
-    strncpy(pDest, pSrc, maxLen);
-    if (maxLen > 0)
-    {
-        pDest[maxLen - 1] = 0;
-    }
-}
-
-char* V_strncat(char* pDest, const char* pSrc, size_t destBufferSize, int max_chars_to_copy)
-{
-	size_t charstocopy = (size_t)0;
-
-	size_t len = strlen(pDest);
-	size_t srclen = strlen(pSrc);
-	if (max_chars_to_copy <= COPY_ALL_CHARACTERS) 
-		charstocopy = srclen; 
-	else 
-		charstocopy = (size_t)min(max_chars_to_copy, (int)srclen); 
-
-	if (len + charstocopy >= destBufferSize) 
-		charstocopy = destBufferSize - len - 1; 
-
-	if ((int)charstocopy <= 0) 
-		return pDest; 
-
-	ANALYZE_SUPPRESS(6059);                        
-	char* pOut = strncat(pDest, pSrc, charstocopy);
-	return pOut;
-}
-
-
-int _V_strcmp(const char* file, int line, const char* s1, const char* s2)
-{  
-	return strcmp(s1, s2);
-}
-
-int V_strncmp(const char* s1, const char* s2, int count)
-{
-	while (count > 0)
-	{
-		if (*s1 != *s2)
-			return (unsigned char)*s1 < (unsigned char)*s2 ? -1 : 1;   
-		if (*s1 == '\0')
-			return 0;        
-		s1++;
-		s2++;
-		count--;
-	}
-
-	return 0;      
-}
-
-int V_stricmp(const char* str1, const char* str2)
-{
-	if (str1 == str2)
-	{
-		return 0;
-	}
-	const unsigned char* s1 = (const unsigned char*)str1;
-	const unsigned char* s2 = (const unsigned char*)str2;
-	for (; *s1; ++s1, ++s2)
-	{
-		if (*s1 != *s2)
-		{
-			unsigned char c1 = *s1 | 0x20;
-			unsigned char c2 = *s2 | 0x20;
-			if (c1 != c2 || (unsigned char)(c1 - 'a') > ('z' - 'a'))
-			{
-				if ((c1 | c2) >= 0x80) return stricmp((const char*)s1, (const char*)s2);
-				if ((unsigned char)(c1 - 'a') > ('z' - 'a')) c1 = *s1;
-				if ((unsigned char)(c2 - 'a') > ('z' - 'a')) c2 = *s2;
-				return c1 > c2 ? 1 : -1;
-			}
-		}
-	}
-	return *s2 ? -1 : 0;
-}
-
-class CLeakTrack
-{
-public:
-    CLeakTrack()
-    {
-    }
-    ~CLeakTrack()
-    {
-        if (keys.Count() != 0)
-        {
-            Assert(0);
-        }
-    }
-
-    struct kve
-    {
-        KeyValues* kv;
-        char		name[256];
-    };
-
-    void AddKv(KeyValues* kv, char const* name)
-    {
-        kve k;
-        V_strncpy(k.name, name ? name : "NULL", sizeof(k.name));
-        k.kv = kv;
-
-        keys.AddToTail(k);
-    }
-
-    void RemoveKv(KeyValues* kv)
-    {
-        int c = keys.Count();
-        for (int i = 0; i < c; i++)
-        {
-            if (keys[i].kv == kv)
-            {
-                keys.Remove(i);
-                break;
-            }
-        }
-    }
-
-    CUtlVector< kve > keys;
-};
-
-
-static CLeakTrack track;
-
-void KeyValues::Init()
-{
-    m_iKeyName = 0;
-    m_iKeyNameCaseSensitive1 = 0;
-    m_iKeyNameCaseSensitive2 = 0;
-    m_iDataType = TYPE_NONE;
-
-    m_pSub = NULL;
-    m_pPeer = NULL;
-    m_pChain = NULL;
-
-    m_sValue = NULL;
-    m_wsValue = NULL;
-    m_pValue = NULL;
-
-    m_bHasEscapeSequences = 0;
-}
-
-void KeyValues::SetName(const char* setName)
-{
-    HKeySymbol hCaseSensitiveKeyName = INVALID_KEY_SYMBOL, hCaseInsensitiveKeyName = INVALID_KEY_SYMBOL;
-    hCaseSensitiveKeyName = iff.keyValuesSystem->GetSymbolForStringCaseSensitive(hCaseInsensitiveKeyName, setName);
-
-    m_iKeyName = hCaseInsensitiveKeyName;
-    SPLIT_3_BYTES_INTO_1_AND_2(m_iKeyNameCaseSensitive1, m_iKeyNameCaseSensitive2, hCaseSensitiveKeyName);
-}
-
-KeyValues::KeyValues(const char* setName)
-{
-    TRACK_KV_ADD(this, setName);
-    Init();
-    SetName(setName);
-}
-
-void* KeyValues::operator new(size_t iAllocSize)
-{
-    MEM_ALLOC_CREDIT();
-    return iff.keyValuesSystem->AllocKeyValuesMemory(iAllocSize);
-}
-
-void KeyValues::operator delete(void* pMem)
-{
-	iff.keyValuesSystem->FreeKeyValuesMemory((KeyValues*)pMem);
-}
-
-#define TRACK_KV_ADD( ptr, name )	track.AddKv( ptr, name )
-#define TRACK_KV_REMOVE( ptr )		track.RemoveKv( ptr )
-
-
-KeyValues::~KeyValues()
-{
-	TRACK_KV_REMOVE(this);
-	RemoveEverything();
-}
-
-void KeyValues::RemoveEverything()
-{
-	KeyValues* dat;
-	KeyValues* datNext = NULL;
-	for (dat = m_pSub; dat != NULL; dat = datNext)
-	{
-		datNext = dat->m_pPeer;
-		dat->m_pPeer = NULL;
-		delete dat;
-	}
-
-	for (dat = m_pPeer; dat && dat != this; dat = datNext)
-	{
-		datNext = dat->m_pPeer;
-		dat->m_pPeer = NULL;
-		delete dat;
-	}
-
-	delete[] m_sValue;
-	m_sValue = NULL;
-	delete[] m_wsValue;
-	m_wsValue = NULL;
-}
-
-char CUtlCharConversion::FindConversion(const char* pString, int* pLength)
-{
-	for (int i = 0; i < m_nCount; ++i)
-	{
-		if (!Q_strcmp(pString, m_pReplacements[(unsigned char)m_pList[i]].m_pReplacementString))
-		{
-			*pLength = m_pReplacements[(unsigned char)m_pList[i]].m_nLength;
-			return m_pList[i];
-		}
-	}
-
-	*pLength = 0;
-	return '\0';
-}
-
-CUtlCharConversion::CUtlCharConversion(char nEscapeChar, const char* pDelimiter, int nCount, ConversionArray_t* pArray)
-{
-	m_nEscapeChar = nEscapeChar;
-	m_pDelimiter = pDelimiter;
-	m_nCount = nCount;
-	m_nDelimiterLength = Q_strlen(pDelimiter);
-	m_nMaxConversionLength = 0;
-
-	memset(m_pReplacements, 0, sizeof(m_pReplacements));
-
-	for (int i = 0; i < nCount; ++i)
-	{
-		m_pList[i] = pArray[i].m_nActualChar;
-		ConversionInfo_t& info = m_pReplacements[(unsigned char)m_pList[i]];
-		Assert(info.m_pReplacementString == 0);
-		info.m_pReplacementString = pArray[i].m_pReplacementString;
-		info.m_nLength = Q_strlen(info.m_pReplacementString);
-		if (info.m_nLength > m_nMaxConversionLength)
-		{
-			m_nMaxConversionLength = info.m_nLength;
-		}
-	}
-}
-
-bool CUtlBuffer::OnGetOverflow(int nSize)
-{
-	return (this->*m_GetOverflowFunc)(nSize);
-}
-
-
-class CUtlCStringConversion : public CUtlCharConversion
-{
-public:
-	CUtlCStringConversion(char nEscapeChar, const char* pDelimiter, int nCount, ConversionArray_t* pArray);
-
-	virtual char FindConversion(const char* pString, int* pLength);
-
-private:
-	char m_pConversion[256];
-};
-
-CUtlCStringConversion::CUtlCStringConversion(char nEscapeChar, const char* pDelimiter, int nCount, ConversionArray_t* pArray) :
-	CUtlCharConversion(nEscapeChar, pDelimiter, nCount, pArray)
-{
-	memset(m_pConversion, 0x0, sizeof(m_pConversion));
-	for (int i = 0; i < nCount; ++i)
-	{
-		m_pConversion[(unsigned char)pArray[i].m_pReplacementString[0]] = pArray[i].m_nActualChar;
-	}
-}
-
-char CUtlCStringConversion::FindConversion(const char* pString, int* pLength)
-{
-	char c = m_pConversion[(unsigned char)pString[0]];
-	*pLength = (c != '\0') ? 1 : 0;
-	return c;
-}
-
-bool CUtlBuffer::OnPutOverflow(int nSize)
-{
-	return (this->*m_PutOverflowFunc)(nSize);
-}
-
-void CUtlBuffer::SetOverflowFuncs(UtlBufferOverflowFunc_t getFunc, UtlBufferOverflowFunc_t putFunc)
-{
-	m_GetOverflowFunc = getFunc;
-	m_PutOverflowFunc = putFunc;
-}
-
-void CUtlBuffer::Get(void* pMem, int size)
-{
-	if (size > 0 && CheckGet(size))
-	{
-		int Index = m_Get - m_nOffset;
-		Assert(m_Memory.IsIdxValid(Index) && m_Memory.IsIdxValid(Index + size - 1));
-
-		memcpy(pMem, &m_Memory[Index], size);
-		m_Get += size;
-	}
-}
-
-void CUtlBuffer::GetString(char* pString, int nMaxChars)
-{
-	if (!IsValid())
-	{
-		*pString = 0;
-		return;
-	}
-
-	if (nMaxChars == 0)
-	{
-		nMaxChars = INT_MAX;
-	}
-
-	int nLen = PeekStringLength();
-
-	if (IsText())
-	{
-		EatWhiteSpace();
-	}
-
-	if (nLen == 0)
-	{
-		*pString = 0;
-		m_Error |= GET_OVERFLOW;
-		return;
-	}
-
-	if (nLen <= nMaxChars)
-	{
-		Get(pString, nLen - 1);
-		pString[nLen - 1] = 0;
-	}
-	else
-	{
-		Get(pString, nMaxChars - 1);
-		pString[nMaxChars - 1] = 0;
-		SeekGet(SEEK_CURRENT, nLen - 1 - nMaxChars);
-	}
-
-	if (!IsText())
-	{
-		VerifyEquals(GetChar(), 0);
-	}
-}
-
-
-bool CUtlBuffer::CheckPut(int nSize)
-{
-	if ((m_Error & PUT_OVERFLOW) || IsReadOnly())
-		return false;
-
-	if ((m_Put < m_nOffset) || (m_Memory.NumAllocated() < m_Put - m_nOffset + nSize))
-	{
-		if (!OnPutOverflow(nSize))
-		{
-			m_Error |= PUT_OVERFLOW;
-			return false;
-		}
-	}
-	return true;
-}
-
-char CUtlCharConversion::GetEscapeChar() const
-{
-	return m_nEscapeChar;
-}
-
-int CUtlCharConversion::MaxConversionLength() const
-{
-	return m_nMaxConversionLength;
-}
-
-
-char CUtlBuffer::GetDelimitedCharInternal(CUtlCharConversion* pConv)
-{
-	char c = GetChar();
-	if (c == pConv->GetEscapeChar())
-	{
-		int nLength = pConv->MaxConversionLength();
-		if (!CheckArbitraryPeekGet(0, nLength))
-			return '\0';
-
-		c = pConv->FindConversion((const char*)PeekGet(), &nLength);
-		SeekGet(SEEK_CURRENT, nLength);
-	}
-
-	return c;
-}
-
-bool CUtlBuffer::PutOverflow(int nSize)
-{
-	MEM_ALLOC_CREDIT();
-
-	if (m_Memory.IsExternallyAllocated())
-	{
-		if (!IsGrowable())
-			return false;
-
-		m_Memory.ConvertToGrowableMemory(0);
-	}
-
-	while (Size() < m_Put - m_nOffset + nSize)
-	{
-		m_Memory.Grow();
-	}
-
-	return true;
-}
-
-bool CUtlBuffer::GetOverflow(int nSize)
-{
-	return false;
-}
-
-bool CUtlBuffer::PeekStringMatch(int nOffset, const char* pString, int nLen)
-{
-	if (!CheckPeekGet(nOffset, nLen))
-		return false;
-	return !Q_strncmp((const char*)PeekGet(nOffset), pString, nLen);
-}
-
-int CUtlBuffer::PeekWhiteSpace(int nOffset)
-{
-	if (!IsText() || !IsValid())
-		return 0;
-
-	while (CheckPeekGet(nOffset, sizeof(char)))
-	{
-		if (!isspace(*(unsigned char*)PeekGet(nOffset)))
-			break;
-		nOffset += sizeof(char);
-	}
-
-	return nOffset;
-}
-
-bool CUtlBuffer::CheckArbitraryPeekGet(int nOffset, int& nIncrement)
-{
-	if (TellGet() + nOffset >= TellMaxPut())
-	{
-		nIncrement = 0;
-		return false;
-	}
-
-	if (TellGet() + nOffset + nIncrement > TellMaxPut())
-	{
-		nIncrement = TellMaxPut() - TellGet() - nOffset;
-	}
-
-	CheckPeekGet(nOffset, nIncrement);
-	int nMaxGet = TellMaxPut() - TellGet();
-	if (nMaxGet < nIncrement)
-	{
-		nIncrement = nMaxGet;
-	}
-	return (nIncrement != 0);
-}
-
-
-
-int	CUtlBuffer::PeekStringLength()
-{
-	if (!IsValid())
-		return 0;
-
-	int nOffset = 0;
-	if (IsText())
-	{
-		nOffset = PeekWhiteSpace(nOffset);
-	}
-
-	int nStartingOffset = nOffset;
-
-	do
-	{
-		int nPeekAmount = 128;
-
-		if (!CheckArbitraryPeekGet(nOffset, nPeekAmount))
-		{
-			if (nOffset == nStartingOffset)
-				return 0;
-			return nOffset - nStartingOffset + 1;
-		}
-
-		const char* pTest = (const char*)PeekGet(nOffset);
-
-		if (!IsText())
-		{
-			for (int i = 0; i < nPeekAmount; ++i)
-			{
-				if (pTest[i] == 0)
-					return (i + nOffset - nStartingOffset + 1);
-			}
-		}
-		else
-		{
-			for (int i = 0; i < nPeekAmount; ++i)
-			{
-				if (isspace((unsigned char)pTest[i]) || (pTest[i] == 0))
-					return (i + nOffset - nStartingOffset + 1);
-			}
-		}
-
-		nOffset += nPeekAmount;
-
-	} while (true);
-}
-
-
-class CUtlNoEscConversion : public CUtlCharConversion
-{
-public:
-	CUtlNoEscConversion(char nEscapeChar, const char* pDelimiter, int nCount, ConversionArray_t* pArray) :
-		CUtlCharConversion(nEscapeChar, pDelimiter, nCount, pArray) {}
-
-	virtual char FindConversion(const char* pString, int* pLength) { *pLength = 0; return 0; }
-};
-
-BEGIN_CUSTOM_CHAR_CONVERSION(CUtlCStringConversion, s_StringCharConversion, (char*)"\"", '\\')
-	{ '\n', (char*)"n" },
-	{ '\t', (char*)"t" },
-	{ '\v', (char*)"v" },
-	{ '\b', (char*)"b" },
-	{ '\r', (char*)"r" },
-	{ '\f', (char*)"f" },
-	{ '\a', (char*)"a" },
-	{ '\\', (char*)"\\" },
-	{ '\?', (char*)"\?" },
-	{ '\'', (char*)"\'" },
-	{ '\"', (char*)"\"" },
-END_CUSTOM_CHAR_CONVERSION(CUtlCStringConversion, s_StringCharConversion, (char*)"\"", '\\')
-
-CUtlCharConversion* GetCStringCharConversion()
-{
-		return &s_StringCharConversion;
-}
-
-BEGIN_CUSTOM_CHAR_CONVERSION(CUtlNoEscConversion, s_NoEscConversion, (char*)"\"", 0x7F)
-	{
-		0x7F, (char*)""
-	},
-END_CUSTOM_CHAR_CONVERSION(CUtlNoEscConversion, s_NoEscConversion, (char*)"\"", 0x7F)
-
-CUtlCharConversion* GetNoEscCharConversion()
-{
-	return &s_NoEscConversion;
-}
-
-
-const char* CUtlCharConversion::GetDelimiter() const
-{
-	return m_pDelimiter;
-}
-
-int CUtlCharConversion::GetDelimiterLength() const
-{
-	return m_nDelimiterLength;
-}
-
-void CUtlBuffer::AddNullTermination(int m)
-{
-	if (m_Put > m_nMaxPut)
-	{
-		if (!IsReadOnly() && ((m_Error & PUT_OVERFLOW) == 0))
-		{
-			if (CheckPut(1))
-			{
-				int Index = m_Put - m_nOffset;
-				Assert(m_Memory.IsIdxValid(Index));
-				if (Index >= 0)
-				{
-					m_Memory[Index] = 0;
-				}
-			}
-			else
-			{
-				m_Error &= ~PUT_OVERFLOW;
-			}
-		}
-		m_nMaxPut = m_Put;
-	}
-}
-
-CUtlBuffer::CUtlBuffer(int growSize, int initSize, int nFlags) :
-	m_Error(0)
-{
-	MEM_ALLOC_CREDIT();
-	m_Memory.Init(growSize, initSize);
-	m_Get = 0;
-	m_Put = 0;
-	m_nTab = 0;
-	m_nOffset = 0;
-	m_Flags = nFlags;
-	if ((initSize != 0) && !IsReadOnly())
-	{
-		m_nMaxPut = -1;
-		AddNullTermination(0);
-	}
-	else
-	{
-		m_nMaxPut = 0;
-	}
-	SetOverflowFuncs(&CUtlBuffer::GetOverflow, &CUtlBuffer::PutOverflow);
-}
-
-CUtlBuffer::CUtlBuffer(const void* pBuffer, int nSize, int nFlags) :
-	m_Memory((unsigned char*)pBuffer, nSize), m_Error(0)
-{
-	Assert(nSize != 0);
-
-	m_Get = 0;
-	m_Put = 0;
-	m_nTab = 0;
-	m_nOffset = 0;
-	m_Flags = nFlags;
-	if (IsReadOnly())
-	{
-		m_nMaxPut = nSize;
-	}
-	else
-	{
-		m_nMaxPut = -1;
-		AddNullTermination(0);
-	}
-	SetOverflowFuncs(&CUtlBuffer::GetOverflow, &CUtlBuffer::PutOverflow);
-}
-
-
-void CUtlBuffer::GetDelimitedString(CUtlCharConversion* pConv, char* pString, int nMaxChars)
-{
-	if (!IsText() || !pConv)
-	{
-		GetString(pString, nMaxChars);
-		return;
-	}
-
-	if (!IsValid())
-	{
-		*pString = 0;
-		return;
-	}
-
-	if (nMaxChars == 0)
-	{
-		nMaxChars = INT_MAX;
-	}
-
-	EatWhiteSpace();
-	if (!PeekStringMatch(0, pConv->GetDelimiter(), pConv->GetDelimiterLength()))
-		return;
-
-	SeekGet(SEEK_CURRENT, pConv->GetDelimiterLength());
-
-	int nRead = 0;
-	while (IsValid())
-	{
-		if (PeekStringMatch(0, pConv->GetDelimiter(), pConv->GetDelimiterLength()))
-		{
-			SeekGet(SEEK_CURRENT, pConv->GetDelimiterLength());
-			break;
-		}
-
-		char c = GetDelimitedCharInternal(pConv);
-
-		if (nRead < nMaxChars)
-		{
-			pString[nRead] = c;
-			++nRead;
-		}
-	}
-
-	if (nRead >= nMaxChars)
-	{
-		nRead = nMaxChars - 1;
-	}
-	pString[nRead] = '\0';
-}
-
-void CUtlBuffer::EatWhiteSpace()
-{
-	if (IsText() && IsValid())
-	{
-		while (CheckGet(sizeof(char)))
-		{
-			if (!isspace(*(const unsigned char*)PeekGet()))
-				break;
-			m_Get += sizeof(char);
-		}
-	}
-}
-bool CUtlBuffer::EatCPPComment()
-{
-	if (IsText() && IsValid())
-	{
-		const char* pPeek = (const char*)PeekGet(2 * sizeof(char), 0);
-		if (!pPeek || (pPeek[0] != '/') || (pPeek[1] != '/'))
-			return false;
-
-		m_Get += 2;
-
-		for (char c = GetChar(); IsValid(); c = GetChar())
-		{
-			if (c == '\n')
-				break;
-		}
-		return true;
-	}
-	return false;
-}
-
-bool CUtlBuffer::CheckGet(int nSize)
-{
-	if (m_Error & GET_OVERFLOW)
-		return false;
-
-	if (TellMaxPut() < m_Get + nSize)
-	{
-		m_Error |= GET_OVERFLOW;
-		return false;
-	}
-
-	if ((m_Get < m_nOffset) || (m_Memory.NumAllocated() < m_Get - m_nOffset + nSize))
-	{
-		if (!OnGetOverflow(nSize))
-		{
-			m_Error |= GET_OVERFLOW;
-			return false;
-		}
-	}
-
-	return true;
-}
-
-
-bool CUtlBuffer::CheckPeekGet(int nOffset, int nSize)
-{
-	if (m_Error & GET_OVERFLOW)
-		return false;
-
-	bool bOk = CheckGet(nOffset + nSize);
-	m_Error &= ~GET_OVERFLOW;
-	return bOk;
-}
-
-const void* CUtlBuffer::PeekGet(int nMaxSize, int nOffset)
-{
-	if (!CheckPeekGet(nOffset, nMaxSize))
-		return NULL;
-
-	int Index = m_Get + nOffset - m_nOffset;
-	Assert(m_Memory.IsIdxValid(Index) && m_Memory.IsIdxValid(Index + nMaxSize - 1));
-
-	return &m_Memory[Index];
-}
-
-void CUtlBuffer::SeekGet(SeekType_t type, int offset)
-{
-	switch (type)
-	{
-	case SEEK_HEAD:
-		m_Get = offset;
-		break;
-
-	case SEEK_CURRENT:
-		m_Get += offset;
-		break;
-
-	case SEEK_TAIL:
-		m_Get = m_nMaxPut - offset;
-		break;
-	}
-
-	if (m_Get > m_nMaxPut)
-	{
-		m_Error |= GET_OVERFLOW;
-	}
-	else
-	{
-		m_Error &= ~GET_OVERFLOW;
-		if (m_Get < m_nOffset || m_Get >= m_nOffset + Size())
-		{
-			OnGetOverflow(-1);
-		}
-	}
-}
-
-
-
-void KeyValues::Clear(void)
-{
-	delete m_pSub;
-	m_pSub = NULL;
-	m_iDataType = TYPE_NONE;
-}
-
-void KeyValues::deleteThis()
-{
-	delete this;
-}
-
-
-KeyValues* KeyValues::CreateKey(const char* keyName)
-{
-	KeyValues* dat = new KeyValues(keyName);
-	dat->UsesEscapeSequences(m_bHasEscapeSequences != 0);       
-	AddSubKey(dat);
-	return dat;
-}
-
-
-void KeyValues::AddSubKey(KeyValues* pSubkey)
-{
-	Assert(pSubkey->m_pPeer == NULL);
-
-	if (m_pSub == NULL)
-	{
-		m_pSub = pSubkey;
-	}
-	else
-	{
-		KeyValues* pTempDat = m_pSub;
-		while (pTempDat->GetNextKey() != NULL)
-		{
-			pTempDat = pTempDat->GetNextKey();
-		}
-
-		pTempDat->SetNextKey(pSubkey);
-	}
-}
-
-
-void KeyValues::RemoveSubKey(KeyValues* subKey)
-{
-	if (!subKey)
-		return;
-
-	if (m_pSub == subKey)
-	{
-		m_pSub = subKey->m_pPeer;
-	}
-	else
-	{
-		KeyValues* kv = m_pSub;
-		while (kv->m_pPeer)
-		{
-			if (kv->m_pPeer == subKey)
-			{
-				kv->m_pPeer = subKey->m_pPeer;
-				break;
-			}
-
-			kv = kv->m_pPeer;
-		}
-	}
-
-	subKey->m_pPeer = NULL;
-}
-
-static char* s_LastFileLoadingFrom = ( char*)"unknown";      
-
-
-void KeyValues::UsesEscapeSequences(bool state)
-{
-	m_bHasEscapeSequences = state;
-}
-
-
-int V_snprintf(char* pDest, int maxLen, char const* pFormat, ...)
-{
-	Assert(maxLen >= 0);
-	AssertValidWritePtr(pDest, maxLen);
-	va_list marker;
-
-	va_start(marker, pFormat);
-#ifdef _WIN32
-	int len = _vsnprintf(pDest, maxLen, pFormat, marker);
-#elif defined _LINUX || defined __APPLE__
-	int len = vsnprintf(pDest, maxLen, pFormat, marker);
-#else
-#error "define vsnprintf type."
-#endif
-	va_end(marker);
-
-	if (len < 0)
-	{
-		len = maxLen;
-		pDest[maxLen - 1] = 0;
-	}
-
-	return len;
-}
-
-
-int V_vsnprintf(char* pDest, int maxLen, char const* pFormat, va_list params)
-{
-	Assert(maxLen > 0);
-	AssertValidWritePtr(pDest, maxLen);
-	int len = _vsnprintf(pDest, maxLen, pFormat, params);
-
-	if (len < 0)
-	{
-		len = maxLen;
-		pDest[maxLen - 1] = 0;
-	}
-
-	return len;
-}
-
-KeyValues* KeyValues::FindKey(int keySymbol) const
-{
-	for (KeyValues* dat = m_pSub; dat != NULL; dat = dat->m_pPeer)
-	{
-		if (dat->m_iKeyName == keySymbol)
-			return dat;
-	}
-
-	return NULL;
-}
-
-
-int (*KeyValues::s_pfGetSymbolForString)(const char* name, bool bCreate) = &KeyValues::GetSymbolForStringClassic;
-const char* (*KeyValues::s_pfGetStringForSymbol)(int symbol) = &KeyValues::GetStringForSymbolClassic;
-CKeyValuesGrowableStringTable* KeyValues::s_pGrowableStringTable = NULL;
-
-int KeyValues::GetSymbolForStringClassic(const char* name, bool bCreate)
-{
-	return iff.keyValuesSystem->GetSymbolForString(name, bCreate);
-}
-
-const char* KeyValues::GetStringForSymbolClassic(int symbol)
-{
-	return iff.keyValuesSystem->GetStringForSymbol(symbol);
-}
-
-KeyValues* KeyValues::GetNextTrueSubKey()
-{
-	KeyValues* pRet = m_pPeer;
-	while (pRet && pRet->m_iDataType != TYPE_NONE)
-		pRet = pRet->m_pPeer;
-
-	return pRet;
-}
-
-
-KeyValues* KeyValues::FindKey(const char* keyName, bool bCreate)
-{
-	if (!keyName || !keyName[0])
-		return this;
-
-	char szBuf[256];
-	const char* subStr = strchr(keyName, '/');
-	const char* searchStr = keyName;
-
-	if (subStr)
-	{
-		int size = subStr - keyName;
-		Q_memcpy(szBuf, keyName, size);
-		szBuf[size] = 0;
-		searchStr = szBuf;
-	}
-
-	HKeySymbol iSearchStr = s_pfGetSymbolForString(searchStr, bCreate);
-
-	if (iSearchStr == INVALID_KEY_SYMBOL)
-	{
-		return NULL;
-	}
-
-	KeyValues* lastItem = NULL;
-	KeyValues* dat;
-	for (dat = m_pSub; dat != NULL; dat = dat->m_pPeer)
-	{
-		lastItem = dat;	                  
-
-		if (dat->m_iKeyName == iSearchStr)
-		{
-			break;
-		}
-	}
-
-	if (!dat && m_pChain)
-	{
-		dat = m_pChain->FindKey(keyName, false);
-	}
-
-	if (!dat)
-	{
-		if (bCreate)
-		{
-			dat = new KeyValues(searchStr);
-			dat->UsesEscapeSequences(m_bHasEscapeSequences != 0);	     
-			if (lastItem)
-			{
-				lastItem->m_pPeer = dat;
-			}
-			else
-			{
-				m_pSub = dat;
-			}
-			dat->m_pPeer = NULL;
-
-			m_iDataType = TYPE_NONE;
-		}
-		else
-		{
-			return NULL;
-		}
-	}
-
-	if (subStr)
-	{
-		return dat->FindKey(subStr + 1, bCreate);
-	}
-
-	return dat;
-}
-
-void KeyValues::SetString(const char* keyName, const char* value)
-{
-	KeyValues* dat = FindKey(keyName, true);
-
-	if (dat)
-	{
-		if (dat->m_iDataType == TYPE_STRING && dat->m_sValue == value)
-		{
-			return;
-		}
-
-		delete[] dat->m_sValue;
-		delete[] dat->m_wsValue;
-		dat->m_wsValue = NULL;
-
-		if (!value)
-		{
-			value = "";
-		}
-
-		int len = Q_strlen(value);
-		dat->m_sValue = new char[len + 1];
-		Q_memcpy(dat->m_sValue, value, len + 1);
-
-		dat->m_iDataType = TYPE_STRING;
-	}
-}
-
-
-const char* KeyValues::GetString(const char* keyName, const char* defaultValue)
-{
-	KeyValues* dat = FindKey(keyName, false);
-	if (dat)
-	{
-		char buf[64];
-		switch (dat->m_iDataType)
-		{
-		case TYPE_FLOAT:
-			Q_snprintf(buf, sizeof(buf), "%f", dat->m_flValue);
-			SetString(keyName, buf);
-			break;
-		case TYPE_INT:
-		case TYPE_PTR:
-			Q_snprintf(buf, sizeof(buf), "%d", dat->m_iValue);
-			SetString(keyName, buf);
-			break;
-		case TYPE_UINT64:
-			Q_snprintf(buf, sizeof(buf), "%lld", *((uint64*)(dat->m_sValue)));
-			SetString(keyName, buf);
-			break;
-
-		case TYPE_WSTRING:
-		{
-			char wideBuf[512];
-			int result = Q_UnicodeToUTF8(dat->m_wsValue, wideBuf, 512);
-			if (result)
-			{
-				SetString(keyName, wideBuf);
-			}
-			else
-			{
-				return defaultValue;
-			}
-			break;
-		}
-		case TYPE_STRING:
-			break;
-		default:
-			return defaultValue;
-		};
-
-		return dat->m_sValue;
-	}
-	return defaultValue;
-}
-
-
-const char* KeyValues::GetName(void) const
-{
-	return iff.keyValuesSystem->GetStringForSymbol(m_iKeyName);
-}
-
-int KeyValues::GetNameSymbol() const
-{
-	return m_iKeyName;
-}
-
-bool KeyValues::LoadFromFile(IBaseFileSystem* filesystem, const char* resourceName, const char* pathID)
-{
-	Assert(filesystem);
-	Assert(IsX360() || (IsPC() && _heapchk() == _HEAPOK));
-
-	FileHandle_t f = iff.g_pFullFileSystem->Open(resourceName, "rb", pathID);
-	if (!f)
-		return false;
-
-	s_LastFileLoadingFrom = (char*)resourceName;
-
-	int fileSize = filesystem->Size(f);
-	unsigned bufSize = ((IFileSystem*)filesystem)->GetOptimalReadSize(f, fileSize + 1);
-
-	char* buffer = (char*)((IFileSystem*)filesystem)->AllocOptimalReadBuffer(f, bufSize);
-	Assert(buffer);
-
-	bool bRetOK = (((IFileSystem*)filesystem)->ReadEx(buffer, bufSize, fileSize, f) != 0);
-
-	filesystem->Close(f);	    
-
-	if (bRetOK)
-	{
-		buffer[fileSize] = 0;      
-		bRetOK = LoadFromBuffer(resourceName, buffer, filesystem);
-	}
-
-	((IFileSystem*)filesystem)->FreeOptimalReadBuffer(buffer);
-
-	return bRetOK;
-}
-
-void KeyValues::SetNextKey(KeyValues* pDat)
-{
-	m_pPeer = pDat;
-}
-
-void KeyValues::CopySubkeys(KeyValues* pParent) const
-{
-	KeyValues* pPrev = NULL;
-	for (KeyValues* sub = m_pSub; sub != NULL; sub = sub->m_pPeer)
-	{
-		KeyValues* dat = sub->MakeCopy();
-
-		if (pPrev)
-			pPrev->m_pPeer = dat;
-		else
-			pParent->m_pSub = dat;
-		dat->m_pPeer = NULL;
-		pPrev = dat;
-	}
-}
-
-KeyValues* KeyValues::MakeCopy(void) const
-{
-	KeyValues* newKeyValue = new KeyValues(GetName());
-
-	newKeyValue->m_iDataType = m_iDataType;
-	switch (m_iDataType)
-	{
-	case TYPE_STRING:
-	{
-		if (m_sValue)
-		{
-			int len = Q_strlen(m_sValue);
-			Assert(!newKeyValue->m_sValue);
-			newKeyValue->m_sValue = new char[len + 1];
-			Q_memcpy(newKeyValue->m_sValue, m_sValue, len + 1);
-		}
-	}
-	break;
-	case TYPE_WSTRING:
-	{
-		if (m_wsValue)
-		{
-			int len = wcslen(m_wsValue);
-			newKeyValue->m_wsValue = new wchar_t[len + 1];
-			Q_memcpy(newKeyValue->m_wsValue, m_wsValue, (len + 1) * sizeof(wchar_t));
-		}
-	}
-	break;
-
-	case TYPE_INT:
-		newKeyValue->m_iValue = m_iValue;
-		break;
-
-	case TYPE_FLOAT:
-		newKeyValue->m_flValue = m_flValue;
-		break;
-
-	case TYPE_PTR:
-		newKeyValue->m_pValue = m_pValue;
-		break;
-
-	case TYPE_COLOR:
-		newKeyValue->m_Color[0] = m_Color[0];
-		newKeyValue->m_Color[1] = m_Color[1];
-		newKeyValue->m_Color[2] = m_Color[2];
-		newKeyValue->m_Color[3] = m_Color[3];
-		break;
-
-	case TYPE_UINT64:
-		newKeyValue->m_sValue = new char[sizeof(uint64)];
-		Q_memcpy(newKeyValue->m_sValue, m_sValue, sizeof(uint64));
-		break;
-	};
-
-	CopySubkeys(newKeyValue);
-	return newKeyValue;
-}
-
-
-
-const int MAX_ERROR_STACK = 64;
-class CKeyValuesErrorStack
-{
-public:
-	CKeyValuesErrorStack() : m_pFilename("NULL"), m_errorIndex(0), m_maxErrorIndex(0) {}
-
-	void SetFilename(const char* pFilename)
-	{
-		m_pFilename = pFilename;
-		m_maxErrorIndex = 0;
-	}
-
-	int Push(int symName)
-	{
-		if (m_errorIndex < MAX_ERROR_STACK)
-		{
-			m_errorStack[m_errorIndex] = symName;
-		}
-		m_errorIndex++;
-		m_maxErrorIndex = max(m_maxErrorIndex, (m_errorIndex - 1));
-		return m_errorIndex - 1;
-	}
-
-	void Pop()
-	{
-		m_errorIndex--;
-		Assert(m_errorIndex >= 0);
-	}
-
-	void Reset(int stackLevel, int symName)
-	{
-		Assert(stackLevel >= 0 && stackLevel < m_errorIndex);
-		m_errorStack[stackLevel] = symName;
-	}
-
-	void ReportError(const char* pError)
-	{
-		printf("KeyValues Error: %s in file %s\n", pError, m_pFilename);
-		for (int i = 0; i < m_maxErrorIndex; i++)
-		{
-			if (m_errorStack[i] != INVALID_KEY_SYMBOL)
-			{
-				if (i < m_errorIndex)
-				{
-					printf("%s, ", iff.keyValuesSystem->GetStringForSymbol(m_errorStack[i]));
-				}
-				else
-				{
-					printf("(*%s*), ", iff.keyValuesSystem->GetStringForSymbol(m_errorStack[i]));
-				}
-			}
-		}
-		printf("\n");
-	}
-
-private:
-	int		m_errorStack[MAX_ERROR_STACK];
-	const char* m_pFilename;
-	int		m_errorIndex;
-	int		m_maxErrorIndex;
-} g_KeyValuesErrorStack;
-
-
-class CKeyErrorContext
-{
-public:
-	CKeyErrorContext(KeyValues* pKv)
-	{
-		Init(pKv->GetNameSymbol());
-	}
-
-	~CKeyErrorContext()
-	{
-		g_KeyValuesErrorStack.Pop();
-	}
-	CKeyErrorContext(int symName)
-	{
-		Init(symName);
-	}
-	void Reset(int symName)
-	{
-		g_KeyValuesErrorStack.Reset(m_stackLevel, symName);
-	}
-private:
-	void Init(int symName)
-	{
-		m_stackLevel = g_KeyValuesErrorStack.Push(symName);
-	}
-
-	int m_stackLevel;
-};
-
-
-void KeyValues::RecursiveLoadFromBuffer(char const* resourceName, CUtlBuffer& buf)
-{
-	CKeyErrorContext errorReport(this);
-	bool wasQuoted;
-	bool wasConditional;
-	CKeyErrorContext errorKey(INVALID_KEY_SYMBOL);
-	while (1)
-	{
-		bool bAccepted = true;
-
-		const char* name = ReadToken(buf, wasQuoted, wasConditional);
-
-		if (!name)	   
-		{
-			g_KeyValuesErrorStack.ReportError("RecursiveLoadFromBuffer:  got EOF instead of keyname");
-			break;
-		}
-
-		if (!*name)       
-		{
-			g_KeyValuesErrorStack.ReportError("RecursiveLoadFromBuffer:  got empty keyname");
-			break;
-		}
-
-		if (*name == '}' && !wasQuoted)	     
-			break;
-
-		KeyValues* dat = CreateKey(name);
-
-		errorKey.Reset(dat->GetNameSymbol());
-
-		const char* value = ReadToken(buf, wasQuoted, wasConditional);
-
-		if (wasConditional && value)
-		{
-			bAccepted = EvaluateConditional(value);
-
-			value = ReadToken(buf, wasQuoted, wasConditional);
-		}
-
-		if (!value)
-		{
-			g_KeyValuesErrorStack.ReportError("RecursiveLoadFromBuffer:  got NULL key");
-			break;
-		}
-
-		if (*value == '}' && !wasQuoted)
-		{
-			g_KeyValuesErrorStack.ReportError("RecursiveLoadFromBuffer:  got } in key");
-			break;
-		}
-
-		if (*value == '{' && !wasQuoted)
-		{
-			errorKey.Reset(INVALID_KEY_SYMBOL);
-			dat->RecursiveLoadFromBuffer(resourceName, buf);
-		}
-		else
-		{
-			if (wasConditional)
-			{
-				g_KeyValuesErrorStack.ReportError("RecursiveLoadFromBuffer:  got conditional between key and value");
-				break;
-			}
-
-			if (dat->m_sValue)
-			{
-				delete[] dat->m_sValue;
-				dat->m_sValue = NULL;
-			}
-
-			int len = Q_strlen(value);
-
-			char* pIEnd;	     
-			char* pFEnd;	     
-			const char* pSEnd = value + len;     
-
-			int ival = strtol(value, &pIEnd, 10);
-			float fval = (float)strtod(value, &pFEnd);
-
-			if (*value == 0)
-			{
-				dat->m_iDataType = TYPE_STRING;
-			}
-			else if ((18 == len) && (value[0] == '0') && (value[1] == 'x'))
-			{
-				int64 retVal = 0;
-				for (int i = 2; i < 2 + 16; i++)
-				{
-					char digit = value[i];
-					if (digit >= 'a')
-						digit -= 'a' - ('9' + 1);
-					else
-						if (digit >= 'A')
-							digit -= 'A' - ('9' + 1);
-					retVal = (retVal * 16) + (digit - '0');
-				}
-				dat->m_sValue = new char[sizeof(uint64)];
-				*((uint64*)dat->m_sValue) = retVal;
-				dat->m_iDataType = TYPE_UINT64;
-			}
-			else if ((pFEnd > pIEnd) && (pFEnd == pSEnd))
-			{
-				dat->m_flValue = fval;
-				dat->m_iDataType = TYPE_FLOAT;
-			}
-			else if (pIEnd == pSEnd)
-			{
-				dat->m_iValue = ival;
-				dat->m_iDataType = TYPE_INT;
-			}
-			else
-			{
-				dat->m_iDataType = TYPE_STRING;
-			}
-
-			if (dat->m_iDataType == TYPE_STRING)
-			{
-				dat->m_sValue = new char[len + 1];
-				Q_memcpy(dat->m_sValue, value, len + 1);
-			}
-
-			int prevPos = buf.TellGet();
-			const char* peek = ReadToken(buf, wasQuoted, wasConditional);
-			if (wasConditional)
-			{
-				bAccepted = EvaluateConditional(peek);
-			}
-			else
-			{
-				buf.SeekGet(CUtlBuffer::SEEK_HEAD, prevPos);
-			}
-		}
-
-		if (!bAccepted)
-		{
-			this->RemoveSubKey(dat);
-			dat->deleteThis();
-			dat = NULL;
-		}
-	}
-}
-
-
-void KeyValues::AppendIncludedKeys(CUtlVector< KeyValues* >& includedKeys)
-{
-	int includeCount = includedKeys.Count();
-	int i;
-	for (i = 0; i < includeCount; i++)
-	{
-		KeyValues* kv = includedKeys[i];
-		Assert(kv);
-
-		KeyValues* insertSpot = this;
-		while (insertSpot->GetNextKey())
-		{
-			insertSpot = insertSpot->GetNextKey();
-		}
-
-		insertSpot->SetNextKey(kv);
-	}
-}
-
-void KeyValues::RecursiveMergeKeyValues(KeyValues* baseKV)
-{
-	for (KeyValues* baseChild = baseKV->m_pSub; baseChild != NULL; baseChild = baseChild->m_pPeer)
-	{
-		bool bFoundMatch = false;
-
-		for (KeyValues* newChild = m_pSub; newChild != NULL; newChild = newChild->m_pPeer)
-		{
-			if (!Q_strcmp(baseChild->GetName(), newChild->GetName()))
-			{
-				newChild->RecursiveMergeKeyValues(baseChild);
-				bFoundMatch = true;
-				break;
-			}
-		}
-
-		if (!bFoundMatch)
-		{
-			KeyValues* dat = baseChild->MakeCopy();
-			Assert(dat);
-			AddSubKey(dat);
-		}
-	}
-}
-
-bool KeyValues::EvaluateConditional(const char* str)
-{
-	bool bResult = false;
-	bool bXboxUI = IsX360();
-
-	if (bXboxUI)
-	{
-		bResult = !Q_stricmp("[$X360]", str);
-	}
-	else
-	{
-		bResult = !Q_stricmp("[$WIN32]", str);
-	}
-
-	return bResult;
-}
-
-void KeyValues::MergeBaseKeys(CUtlVector< KeyValues* >& baseKeys)
-{
-	int includeCount = baseKeys.Count();
-	int i;
-	for (i = 0; i < includeCount; i++)
-	{
-		KeyValues* kv = baseKeys[i];
-		Assert(kv);
-
-		RecursiveMergeKeyValues(kv);
-	}
-}
-
-
-void KeyValues::ParseIncludedKeys(char const* resourceName, const char* filetoinclude,
-	IBaseFileSystem* pFileSystem, const char* pPathID, CUtlVector< KeyValues* >& includedKeys)
-{
-	Assert(resourceName);
-	Assert(filetoinclude);
-	Assert(pFileSystem);
-	if (!pFileSystem)
-	{
-		return;
-	}
-	char fullpath[512];
-	Q_strncpy(fullpath, resourceName, sizeof(fullpath));
-	bool done = false;
-	int len = Q_strlen(fullpath);
-	while (!done)
-	{
-		if (len <= 0)
-		{
-			break;
-		}
-
-		if (fullpath[len - 1] == '\\' ||
-			fullpath[len - 1] == '/')
-		{
-			break;
-		}
-
-		fullpath[len - 1] = 0;
-		--len;
-	}
-
-	Q_strncat(fullpath, filetoinclude, sizeof(fullpath), COPY_ALL_CHARACTERS);
-
-	KeyValues* newKV = new KeyValues(fullpath);
-
-	newKV->UsesEscapeSequences(m_bHasEscapeSequences != 0);	     
-
-	if (newKV->LoadFromFile(pFileSystem, fullpath, pPathID))
-	{
-		includedKeys.AddToTail(newKV);
-	}
-	else
-	{
-		printf("KeyValues::ParseIncludedKeys: Couldn't load included keyvalue file %s\n", fullpath);
-		newKV->deleteThis();
-	}
-
-}
-
-
-
-
-
-
-	int V_UnicodeToUTF8(const wchar_t* pUnicode, char* pUTF8, int cubDestSizeInBytes)
-	{
-		AssertValidReadPtr(pUnicode);
-
-		if (cubDestSizeInBytes > 0)
-		{
-			pUTF8[0] = 0;
-		}
-
-#ifdef _WIN32
-		int cchResult = WideCharToMultiByte(CP_UTF8, 0, pUnicode, -1, pUTF8, cubDestSizeInBytes, NULL, NULL);
-#elif POSIX
-		int cchResult = 0;
-		if (pUnicode && pUTF8)
-			cchResult = wcstombs(pUTF8, pUnicode, cubDestSizeInBytes) + 1;
-#endif
-
-		if (cubDestSizeInBytes > 0)
-		{
-			pUTF8[cubDestSizeInBytes - 1] = 0;
-		}
-
-		return cchResult;
-	}
-
-
-
-#define KEYVALUES_TOKEN_SIZE	1024
-static char s_pTokenBuf[KEYVALUES_TOKEN_SIZE];
-
-#pragma warning (disable:4706)
-const char* KeyValues::ReadToken(CUtlBuffer& buf, bool& wasQuoted, bool& wasConditional)
-{
-	wasQuoted = false;
-	wasConditional = false;
-
-	if (!buf.IsValid())
-		return NULL;
-
-	while (true)
-	{
-		buf.EatWhiteSpace();
-		if (!buf.IsValid())
-			return NULL;	     
-
-		if (!buf.EatCPPComment())
-			break;
-	}
-
-	const char* c = (const char*)buf.PeekGet(sizeof(char), 0);
-	if (!c)
-		return NULL;
-
-	if (*c == '\"')
-	{
-		wasQuoted = true;
-		buf.GetDelimitedString(m_bHasEscapeSequences ? GetCStringCharConversion() : GetNoEscCharConversion(),
-			s_pTokenBuf, KEYVALUES_TOKEN_SIZE);
-		return s_pTokenBuf;
-	}
-
-	if (*c == '{' || *c == '}')
-	{
-		s_pTokenBuf[0] = *c;
-		s_pTokenBuf[1] = 0;
-		buf.SeekGet(CUtlBuffer::SEEK_CURRENT, 1);
-		return s_pTokenBuf;
-	}
-
-	bool bReportedError = false;
-	bool bConditionalStart = false;
-	int nCount = 0;
-	while (c = (const char*)buf.PeekGet(sizeof(char), 0))
-	{
-		if (*c == 0)
-			break;
-
-		if (*c == '"' || *c == '{' || *c == '}')
-			break;
-
-		if (*c == '[')
-			bConditionalStart = true;
-
-		if (*c == ']' && bConditionalStart)
-		{
-			wasConditional = true;
-		}
-
-		if (isspace(*c))
-			break;
-
-		if (nCount < (KEYVALUES_TOKEN_SIZE - 1))
-		{
-			s_pTokenBuf[nCount++] = *c;	    
-		}
-		else if (!bReportedError)
-		{
-			bReportedError = true;
-			g_KeyValuesErrorStack.ReportError(" ReadToken overflow");
-		}
-
-		buf.SeekGet(CUtlBuffer::SEEK_CURRENT, 1);
-	}
-	s_pTokenBuf[nCount] = 0;
-	return s_pTokenBuf;
-}
-#pragma warning (default:4706)
-
-
-bool KeyValues::LoadFromBuffer(char const* resourceName, CUtlBuffer& buf, IBaseFileSystem* pFileSystem, const char* pPathID)
-{
-	KeyValues* pPreviousKey = NULL;
-	KeyValues* pCurrentKey = this;
-	CUtlVector< KeyValues* > includedKeys;
-	CUtlVector< KeyValues* > baseKeys;
-	bool wasQuoted;
-	bool wasConditional;
-	g_KeyValuesErrorStack.SetFilename(resourceName);
-	do
-	{
-		bool bAccepted = true;
-
-		const char* s = ReadToken(buf, wasQuoted, wasConditional);
-		if (!buf.IsValid() || !s || *s == 0)
-			break;
-
-		if (!Q_stricmp(s, "#include"))	       
-		{
-			s = ReadToken(buf, wasQuoted, wasConditional);
-			if (!s || *s == 0)
-			{
-				g_KeyValuesErrorStack.ReportError("#include is NULL ");
-			}
-			else
-			{
-				ParseIncludedKeys(resourceName, s, pFileSystem, pPathID, includedKeys);
-			}
-
-			continue;
-		}
-		else if (!Q_stricmp(s, "#base"))
-		{
-			s = ReadToken(buf, wasQuoted, wasConditional);
-			if (!s || *s == 0)
-			{
-				g_KeyValuesErrorStack.ReportError("#base is NULL ");
-			}
-			else
-			{
-				ParseIncludedKeys(resourceName, s, pFileSystem, pPathID, baseKeys);
-			}
-
-			continue;
-		}
-
-		if (!pCurrentKey)
-		{
-			pCurrentKey = new KeyValues(s);
-			Assert(pCurrentKey);
-
-			pCurrentKey->UsesEscapeSequences(m_bHasEscapeSequences != 0);      
-
-			if (pPreviousKey)
-			{
-				pPreviousKey->SetNextKey(pCurrentKey);
-			}
-		}
-		else
-		{
-			pCurrentKey->SetName(s);
-		}
-
-		s = ReadToken(buf, wasQuoted, wasConditional);
-
-		if (wasConditional)
-		{
-			bAccepted = EvaluateConditional(s);
-
-			s = ReadToken(buf, wasQuoted, wasConditional);
-		}
-
-		if (s && *s == '{' && !wasQuoted)
-		{
-			pCurrentKey->RecursiveLoadFromBuffer(resourceName, buf);
-		}
-		else
-		{
-			g_KeyValuesErrorStack.ReportError("LoadFromBuffer: missing {");
-		}
-
-		if (!bAccepted)
-		{
-			if (pPreviousKey)
-			{
-				pPreviousKey->SetNextKey(NULL);
-			}
-			pCurrentKey->Clear();
-		}
-		else
-		{
-			pPreviousKey = pCurrentKey;
-			pCurrentKey = NULL;
-		}
-	} while (buf.IsValid());
-
-	AppendIncludedKeys(includedKeys);
-	{
-		int i;
-		for (i = includedKeys.Count() - 1; i > 0; i--)
-		{
-			KeyValues* kv = includedKeys[i];
-			kv->deleteThis();
-		}
-	}
-
-	MergeBaseKeys(baseKeys);
-	{
-		int i;
-		for (i = baseKeys.Count() - 1; i >= 0; i--)
-		{
-			KeyValues* kv = baseKeys[i];
-			kv->deleteThis();
-		}
-	}
-
-	g_KeyValuesErrorStack.SetFilename("");
-
-	return true;
-}
-
-
-bool KeyValues::LoadFromBuffer(char const* resourceName, const char* pBuffer, IBaseFileSystem* pFileSystem, const char* pPathID)
-{
-	if (!pBuffer)
-		return true;
-
-	int nLen = Q_strlen(pBuffer);
-	CUtlBuffer buf(pBuffer, nLen, CUtlBuffer::READ_ONLY | CUtlBuffer::TEXT_BUFFER);
-	return LoadFromBuffer(resourceName, buf, pFileSystem, pPathID);
-}
\ No newline at end of file
diff --git a/SpyCustom/Label.h b/SpyCustom/Label.h
deleted file mode 100644
index 028c62d..0000000
--- a/SpyCustom/Label.h
+++ /dev/null
@@ -1,167 +0,0 @@
-#ifndef LABEL_H
-#define LABEL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-#include "VGUI.h"
-#include "Panel.h"
-#include "PHandle.h"
-
-namespace vgui
-{
-
-	class Label : public Panel
-	{
-		DECLARE_CLASS_SIMPLE(Label, Panel);
-
-	public:
-		Label(Panel* parent, const char* panelName, const char* text);
-		Label(Panel* parent, const char* panelName, const wchar_t* wszText);
-		~Label();
-
-	public:
-		virtual void SetText(const char* tokenName);
-
-		virtual void SetText(const wchar_t* unicodeString, bool bClearUnlocalizedSymbol = false);
-
-		virtual void GetText(OUT_Z_BYTECAP(bufferLen) char* textOut, int bufferLen);
-		virtual void GetText(OUT_Z_BYTECAP(bufLenInBytes) wchar_t* textOut, int bufLenInBytes);
-
-		virtual void GetContentSize(int& wide, int& tall);
-
-		enum Alignment
-		{
-			a_northwest = 0,
-			a_north,
-			a_northeast,
-			a_west,
-			a_center,
-			a_east,
-			a_southwest,
-			a_south,
-			a_southeast,
-		};
-
-		virtual void SetContentAlignment(Alignment alignment);
-		virtual void SetEnabled(bool state);
-		virtual void SetTextInset(int xInset, int yInset);
-		virtual void GetTextInset(int* xInset, int* yInset);
-
-		virtual void SetFgColor(Color color);
-		virtual Color GetFgColor();
-
-		virtual void SetDisabledFgColor1(Color color);
-		virtual void SetDisabledFgColor2(Color color);
-		virtual Color GetDisabledFgColor1();
-		virtual Color GetDisabledFgColor2();
-
-		enum EColorState
-		{
-			CS_NORMAL,
-			CS_DULL,
-			CS_BRIGHT,
-		};
-		virtual void SetTextColorState(EColorState state);
-
-		virtual void SetFont(HFont font);
-		virtual HFont GetFont();
-
-		virtual Panel* HasHotkey(wchar_t key);
-		virtual void SetHotkey(wchar_t key);
-		virtual wchar_t GetHotKey();
-
-		virtual void SetAssociatedControl(Panel* control);
-
-		virtual int AddImage(IImage* image, int preOffset);          
-		virtual void SetImageAtIndex(int index, IImage* image, int preOffset);
-		virtual void SetImagePreOffset(int index, int preOffset);          
-		virtual IImage* GetImageAtIndex(int index);
-		virtual int GetImageCount();
-		virtual void ClearImages();
-		virtual void ResetToSimpleTextImage();
-		virtual void SetImageBounds(int index, int x, int width);
-
-		virtual TextImage* GetTextImage();
-
-		virtual int SetTextImageIndex(int newIndex);
-
-		virtual bool RequestInfo(KeyValues* outputData);
-		virtual void SizeToContents();
-
-		enum Padding
-		{
-			Content = 8,
-		};
-
-		void SetWrap(bool bWrap);
-		void SetCenterWrap(bool bWrap);
-
-		void SetAllCaps(bool bAllCaps);
-
-	protected:
-		virtual void PerformLayout();
-		virtual wchar_t CalculateHotkey(const char* text);
-		virtual wchar_t CalculateHotkey(const wchar_t* text);
-		virtual void ComputeAlignment(int& tx0, int& ty0, int& tx1, int& ty1);
-		virtual void Paint();
-		MESSAGE_FUNC_PARAMS(OnSetText, "SetText", params);
-		virtual void DrawDashedLine(int x0, int y0, int x1, int y1, int dashLen, int gapLen);
-		virtual void OnRequestFocus(VPANEL subFocus, VPANEL defaultPanel);
-		MESSAGE_FUNC(OnHotkeyPressed, "Hotkey");
-		virtual void OnMousePressed(MouseCode code);
-		virtual void OnSizeChanged(int wide, int tall);
-
-		virtual void EnsureImageCapacity(int maxIndex);
-
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-		virtual void GetSettings(KeyValues* outResourceData);
-		virtual void ApplySettings(KeyValues* inResourceData);
-		virtual const char* GetDescription(void);
-
-		MESSAGE_FUNC_PARAMS(OnDialogVariablesChanged, "DialogVariables", dialogVariables);
-
-		void HandleAutoSizing(void);
-
-	private:
-		void Init();
-
-		Alignment  _contentAlignment;
-		TextImage* _textImage;           
-		struct TImageInfo
-		{
-			IImage* image;
-			short offset;
-			short xpos;
-			short width;
-		};
-		CUtlVector<TImageInfo> _imageDar;
-
-		int		   _textInset[2];
-		Color      _disabledFgColor1;
-		Color      _disabledFgColor2;
-		Color	   _associateColor;
-		int		   _textImageIndex;	          
-		EColorState _textColorState;
-
-		PHandle		_associate;
-		char* _associateName;
-
-		char* _fontOverrideName;
-
-		wchar_t	   _hotkey;		      
-
-		bool	m_bWrap;
-		bool	m_bCenterWrap;
-		bool	m_bAllCaps;
-		bool	m_bAutoWideToContents;
-		bool	m_bAutoWideDirty;
-		bool	m_bUseProportionalInsets;
-
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ListPanel.h b/SpyCustom/ListPanel.h
deleted file mode 100644
index f4b7ca8..0000000
--- a/SpyCustom/ListPanel.h
+++ /dev/null
@@ -1,304 +0,0 @@
-#ifndef LISTPANEL_H
-#define LISTPANEL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utllinkedlist.h"
-#include "utlvector.h"
-#include "utlrbtree.h"
-#include "VGUI.h"
-#include "Panel.h"
-
-class KeyValues;
-
-namespace vgui
-{
-
-	class ScrollBar;
-	class TextImage;
-	class ImagePanel;
-	class Label;
-	class Button;
-	class IDraggerEvent;
-	class FastSortListPanelItem;
-
-	class ListPanelItem
-	{
-	public:
-		ListPanelItem() :
-			kv(0),
-			userData(0),
-			m_pDragData(0),
-			m_bImage(false),
-			m_nImageIndex(-1),
-			m_nImageIndexSelected(-1),
-			m_pIcon(0)
-		{
-		}
-
-		KeyValues* kv;
-		unsigned int 	userData;
-		KeyValues* m_pDragData;
-		bool			m_bImage;
-		int				m_nImageIndex;
-		int				m_nImageIndexSelected;
-		IImage* m_pIcon;
-	};
-
-	typedef int __cdecl SortFunc(
-		ListPanel* pPanel,
-		const ListPanelItem& item1,
-		const ListPanelItem& item2);
-
-	class ListPanel : public Panel
-	{
-		DECLARE_CLASS_SIMPLE(ListPanel, Panel);
-
-	public:
-		ListPanel(Panel* parent, const char* panelName);
-		~ListPanel();
-
-		enum ColumnFlags_e
-		{
-			COLUMN_FIXEDSIZE = 0x01,          
-			COLUMN_RESIZEWITHWINDOW = 0x02,            
-			COLUMN_IMAGE = 0x04,	                 
-			COLUMN_HIDDEN = 0x08,	     
-			COLUMN_UNHIDABLE = 0x10,	   
-		};
-
-		virtual void AddColumnHeader(int index, const char* columnName, const char* columnText, int startingWidth, int minWidth, int maxWidth, int columnFlags = 0);
-		virtual void AddColumnHeader(int index, const char* columnName, const char* columnText, int width, int columnFlags = 0);
-
-		virtual void RemoveColumn(int column);	   
-		virtual int  FindColumn(const char* columnName);
-		virtual void SetColumnHeaderHeight(int height);
-		virtual void SetColumnHeaderText(int column, const char* text);
-		virtual void SetColumnHeaderText(int column, wchar_t* text);
-		virtual void SetColumnHeaderImage(int column, int imageListIndex);
-		virtual void SetColumnHeaderTooltip(int column, const char* tooltipText);
-		virtual void SetColumnTextAlignment(int column, int align);
-
-		virtual int GetNumColumnHeaders() const;
-		virtual bool GetColumnHeaderText(int index, char* pOut, int maxLen);
-
-		virtual void SetSortFunc(int column, SortFunc* func);
-		virtual void SetSortColumn(int column);
-		virtual void SortList(void);
-		virtual void SetColumnSortable(int column, bool sortable);
-		virtual void SetColumnVisible(int column, bool visible);
-		int GetSortColumn() const;
-
-		virtual void SetAllowUserModificationOfColumns(bool allowed);
-
-		virtual int AddItem(const KeyValues* data, unsigned int userData, bool bScrollToItem, bool bSortOnAdd);                   
-		void SetItemDragData(int itemID, const KeyValues* data);                          
-		virtual int	GetItemCount(void);			      
-		virtual int GetItem(const char* itemName);	          
-		virtual KeyValues* GetItem(int itemID);        
-		virtual int GetItemCurrentRow(int itemID);		         
-		virtual int GetItemIDFromRow(int currentRow);			     
-		virtual unsigned int GetItemUserData(int itemID);
-		virtual ListPanelItem* GetItemData(int itemID);
-		virtual void SetUserData(int itemID, unsigned int userData);
-		virtual int GetItemIDFromUserData(unsigned int userData);
-		virtual void ApplyItemChanges(int itemID);               
-		virtual void RemoveItem(int itemID);              
-		virtual void RereadAllItems();        
-
-		virtual void RemoveAll();		           
-		virtual void DeleteAllItems();	   
-
-		virtual void GetCellText(int itemID, int column, OUT_Z_BYTECAP(bufferSizeInBytes) wchar_t* buffer, int bufferSizeInBytes);         
-		virtual IImage* GetCellImage(int itemID, int column);            
-
-		virtual int FirstItem() const;
-		virtual int NextItem(int iItem) const;
-
-		virtual int InvalidItemID() const;
-		virtual bool IsValidItemID(int itemID);
-
-		virtual void SetItemVisible(int itemID, bool state);
-		virtual void SetItemDisabled(int itemID, bool state);
-		bool IsItemVisible(int itemID);
-
-		virtual void SetFont(HFont font);
-
-		virtual void SetImageList(ImageList* imageList, bool deleteImageListWhenDone);
-
-		virtual int GetSelectedItemsCount();
-
-		virtual int GetSelectedItem(int selectionIndex);
-
-		virtual void ClearSelectedItems();
-
-		virtual bool IsItemSelected(int itemID);
-
-		virtual void AddSelectedItem(int itemID);
-
-		virtual void SetSingleSelectedItem(int itemID);
-
-		virtual int GetSelectedColumn();
-
-		virtual void SetSelectIndividualCells(bool state);
-
-		void SetMultiselectEnabled(bool bState);
-		bool IsMultiselectEnabled() const;
-
-		virtual void SetSelectedCell(int row, int column);
-
-		virtual bool GetCellAtPos(int x, int y, int& row, int& column);	                 
-		virtual bool GetCellBounds(int row, int column, int& x, int& y, int& wide, int& tall);
-
-		virtual void SetEmptyListText(const char* text);
-		virtual void SetEmptyListText(const wchar_t* text);
-
-		void ResetScrollBar();
-
-		virtual void OnCreateDragData(KeyValues* msg);
-
-		void		SetIgnoreDoubleClick(bool state);
-
-		virtual void EnterEditMode(int itemID, int column, vgui::Panel* editPanel);
-
-		virtual void LeaveEditMode();
-
-		virtual bool IsInEditMode();
-
-		MESSAGE_FUNC_INT(ResizeColumnToContents, "ResizeColumnToContents", column);
-
-#ifdef _X360
-		virtual void NavigateTo();
-#endif
-		int m_nUserConfigFileVersion;
-
-	protected:
-		virtual Panel* GetCellRenderer(int row, int column);
-
-		virtual void OnMouseWheeled(int delta);
-		virtual void OnSizeChanged(int wide, int tall);
-		virtual void PerformLayout();
-		virtual void Paint();
-		virtual void PaintBackground();
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-		virtual void OnMousePressed(MouseCode code);
-		virtual void OnMouseDoublePressed(MouseCode code);
-#ifdef _X360
-		virtual void OnKeyCodePressed(KeyCode code);
-#else
-		virtual void OnKeyCodePressed(KeyCode code);
-#endif
-		MESSAGE_FUNC(OnSliderMoved, "ScrollBarSliderMoved");
-		MESSAGE_FUNC_INT_INT(OnColumnResized, "ColumnResized", column, delta);
-		MESSAGE_FUNC_INT(OnSetSortColumn, "SetSortColumn", column);
-		MESSAGE_FUNC(OpenColumnChoiceMenu, "OpenColumnChoiceMenu");
-		MESSAGE_FUNC_INT(OnToggleColumnVisible, "ToggleColumnVisible", col);
-		virtual float GetRowsPerPage();
-		virtual int GetStartItem();
-
-		virtual void ApplyUserConfigSettings(KeyValues* userConfig);
-		virtual void GetUserConfigSettings(KeyValues* userConfig);
-		virtual bool HasUserConfigSettings();
-
-	public:
-		virtual void SetSortColumnEx(int iPrimarySortColumn, int iSecondarySortColumn, bool bSortAscending);
-		void GetSortColumnEx(int& iPrimarySortColumn, int& iSecondarySortColumn, bool& bSortAscending) const;
-
-	private:
-		void CleanupItem(FastSortListPanelItem* data);
-
-		void IndexItem(int itemID);
-
-		void UpdateSelection(vgui::MouseCode code, int x, int y, int row, int column);
-
-		void HandleMultiSelection(int itemID, int row, int column);
-
-		void HandleAddSelection(int itemID, int row, int column);
-
-		struct IndexItem_t
-		{
-			ListPanelItem* dataItem;
-			int duplicateIndex;
-		};
-		typedef CUtlRBTree<IndexItem_t, int> IndexRBTree_t;
-
-		struct column_t
-		{
-			Button* m_pHeader;
-			int	m_iMinWidth;
-			int	m_iMaxWidth;
-			bool m_bResizesWithWindow;
-			Panel* m_pResizer;
-			SortFunc* m_pSortFunc;
-			bool m_bTypeIsText;
-			bool m_bHidden;
-			bool m_bUnhidable;
-			IndexRBTree_t m_SortedTree;
-			int m_nContentAlignment;
-		};
-
-		CUtlLinkedList<column_t, unsigned char> 		m_ColumnsData;
-
-		CUtlVector<unsigned char>						m_ColumnsHistory;
-
-		CUtlVector<unsigned char>						m_CurrentColumns;
-
-		int				    m_iColumnDraggerMoved;         
-		int					m_lastBarWidth;
-
-		CUtlLinkedList<FastSortListPanelItem*, int>		m_DataItems;
-		CUtlVector<int>									m_VisibleItems;
-
-		int 				m_iSortColumn;
-		int 				m_iSortColumnSecondary;
-
-		void 				ResortColumnRBTree(int col);
-		static bool 		RBTreeLessFunc(vgui::ListPanel::IndexItem_t& item1, vgui::ListPanel::IndexItem_t& item2);
-
-		TextImage* m_pTextImage;    
-		ImagePanel* m_pImagePanel;    
-		Label* m_pLabel;	     
-		ScrollBar* m_hbar;
-		ScrollBar* m_vbar;
-
-		int				m_iSelectedColumn;
-
-		bool 			m_bNeedsSort : 1;
-		bool 			m_bSortAscending : 1;
-		bool 			m_bSortAscendingSecondary : 1;
-		bool			m_bCanSelectIndividualCells : 1;
-		bool			m_bShiftHeldDown : 1;
-		bool			m_bMultiselectEnabled : 1;
-		bool			m_bAllowUserAddDeleteColumns : 1;
-		bool 			m_bDeleteImageListWhenDone : 1;
-		bool			m_bIgnoreDoubleClick : 1;
-
-		int				m_iHeaderHeight;
-		int 			m_iRowHeight;
-
-		CUtlVector<int> 	m_SelectedItems;		    
-		int					m_LastItemSelected;	         
-
-		int 		m_iTableStartX;
-		int	 		m_iTableStartY;
-
-		Color 		m_LabelFgColor;
-		Color		m_DisabledColor;
-		Color 		m_SelectionFgColor;
-		Color		m_DisabledSelectionFgColor;
-
-		ImageList* m_pImageList;
-		TextImage* m_pEmptyListText;
-
-		PHandle		m_hEditModePanel;
-		int			m_iEditModeItemID;
-		int			m_iEditModeColumn;
-
-		void ResetColumnHeaderCommands();
-	};
-
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/MaterialSystemUtil.h b/SpyCustom/MaterialSystemUtil.h
deleted file mode 100644
index bb2e8ca..0000000
--- a/SpyCustom/MaterialSystemUtil.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef MATERIALSYSTEMUTIL_H
-#define MATERIALSYSTEMUTIL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "imageformat.h"   
-#include "imaterialsystem.h"      
-
-class IMaterial;
-class ITexture;
-class KeyValues;
-
-class KeyValues;
-
-
-class CMaterialReference
-{
-public:
-	CMaterialReference(char const* pMaterialName = 0, const char* pTextureGroupName = 0, bool bComplain = true);
-	~CMaterialReference();
-
-	void Init(const char* pMaterialName, const char* pTextureGroupName, bool bComplain = true);
-	void Init(const char* pMaterialName, KeyValues* pVMTKeyValues);
-	void Init(IMaterial* pMaterial);
-	void Init(CMaterialReference& ref);
-	void Init(const char* pMaterialName, const char* pTextureGroupName, KeyValues* pVMTKeyValues);
-
-	void Shutdown();
-	bool IsValid() { return m_pMaterial != 0; }
-
-	operator IMaterial* () { return m_pMaterial; }
-	operator IMaterial* () const { return m_pMaterial; }
-	operator IMaterial const* () const { return m_pMaterial; }
-	IMaterial* operator->() { return m_pMaterial; }
-
-private:
-	IMaterial* m_pMaterial;
-};
-
-class CTextureReference
-{
-public:
-	CTextureReference();
-	CTextureReference(const CTextureReference& ref);
-	~CTextureReference();
-
-	void Init(char const* pTexture, const char* pTextureGroupName, bool bComplain = true);
-	void InitProceduralTexture(const char* pTextureName, const char* pTextureGroupName, int w, int h, ImageFormat fmt, int nFlags);
-	void InitRenderTarget(int w, int h, RenderTargetSizeMode_t sizeMode, ImageFormat fmt, MaterialRenderTargetDepth_t depth, bool bHDR, char* pStrOptionalName = NULL);
-#if defined( _X360 )
-	void InitRenderTargetTexture(int width, int height, RenderTargetSizeMode_t sizeMode, ImageFormat fmt, MaterialRenderTargetDepth_t depth, bool bHDR, char* pStrOptionalName = NULL);
-	void InitRenderTargetSurface(int width, int height, ImageFormat fmt, bool bSameAsTexture);
-#endif
-	void Init(ITexture* pTexture);
-
-	void Shutdown(bool bDeleteIfUnReferenced = false);
-	bool IsValid() { return m_pTexture != 0; }
-
-	operator ITexture* () { return m_pTexture; }
-	operator ITexture const* () const { return m_pTexture; }
-	ITexture* operator->() { return m_pTexture; }
-
-	void operator=(CTextureReference& ref);
-
-private:
-	ITexture* m_pTexture;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Menu.h b/SpyCustom/Menu.h
deleted file mode 100644
index 6f51fa4..0000000
--- a/SpyCustom/Menu.h
+++ /dev/null
@@ -1,262 +0,0 @@
-#ifndef MENU_H
-#define MENU_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "Panel.h"
-#include "Label.h"
-#include "utllinkedlist.h"
-#include "utlvector.h"
-
-namespace vgui
-{
-
-	class MenuItem;
-	class ScrollBar;
-	class MenuSeparator;
-
-	class Menu : public Panel
-	{
-		DECLARE_CLASS_SIMPLE(Menu, Panel);
-		friend class MenuItem;
-	public:
-		enum MenuDirection_e
-		{
-			LEFT,
-			RIGHT,
-			UP,
-			DOWN,
-			CURSOR,	        
-			ALIGN_WITH_PARENT,        
-		};
-
-		Menu(Panel* parent, const char* panelName);
-		~Menu();
-
-		static void PlaceContextMenu(Panel* parent, Menu* menu);
-		static void OnInternalMousePressed(Panel* other, MouseCode code);
-
-		virtual void PositionRelativeToPanel(Panel* reference, MenuDirection_e direction, int nAdditionalYOffset = 0, bool showMenu = false);
-
-		virtual int AddMenuItem(const char* itemName, const char* itemText, const char* command, Panel* target, const KeyValues* userData = NULL);
-		virtual int AddMenuItem(const char* itemName, const wchar_t* wszItemText, const char* command, Panel* target, const KeyValues* userData = NULL);
-
-		virtual int AddMenuItem(const char* itemName, const char* itemText, KeyValues* message, Panel* target, const KeyValues* userData = NULL);
-		virtual int AddMenuItem(const char* itemName, const wchar_t* wszItemText, KeyValues* message, Panel* target, const KeyValues* userData = NULL);
-
-		virtual int AddMenuItem(const char* itemText, const char* command, Panel* target, const KeyValues* userData = NULL);
-		virtual int AddMenuItem(const char* itemText, KeyValues* message, Panel* target, const KeyValues* userData = NULL);
-		virtual int AddMenuItem(const char* itemText, Panel* target, const KeyValues* userData = NULL);
-
-		virtual int AddCheckableMenuItem(const char* itemName, const char* itemText, const char* command, Panel* target, const KeyValues* userData = NULL);
-		virtual int AddCheckableMenuItem(const char* itemName, const wchar_t* wszItemText, const char* command, Panel* target, const KeyValues* userData = NULL);
-
-		virtual int AddCheckableMenuItem(const char* itemName, const char* itemText, KeyValues* message, Panel* target, const KeyValues* userData = NULL);
-		virtual int AddCheckableMenuItem(const char* itemName, const wchar_t* wszItemText, KeyValues* message, Panel* target, const KeyValues* userData = NULL);
-
-		virtual int AddCheckableMenuItem(const char* itemText, const char* command, Panel* target, const KeyValues* userData = NULL);
-		virtual int AddCheckableMenuItem(const char* itemText, KeyValues* message, Panel* target, const KeyValues* userData = NULL);
-		virtual int AddCheckableMenuItem(const char* itemText, Panel* target, const KeyValues* userData = NULL);
-
-		virtual int AddCascadingMenuItem(const char* itemName, const char* itemText, const char* command, Panel* target, Menu* cascadeMenu, const KeyValues* userData = NULL);
-		virtual int AddCascadingMenuItem(const char* itemName, const wchar_t* wszItemText, const char* command, Panel* target, Menu* cascadeMenu, const KeyValues* userData = NULL);
-
-		virtual int AddCascadingMenuItem(const char* itemName, const char* itemText, KeyValues* message, Panel* target, Menu* cascadeMenu, const KeyValues* userData = NULL);
-		virtual int AddCascadingMenuItem(const char* itemName, const wchar_t* wszItemText, KeyValues* message, Panel* target, Menu* cascadeMenu, const KeyValues* userData = NULL);
-
-		virtual int AddCascadingMenuItem(const char* itemText, const char* command, Panel* target, Menu* cascadeMenu, const KeyValues* userData = NULL);
-		virtual int AddCascadingMenuItem(const char* itemText, KeyValues* message, Panel* target, Menu* cascadeMenu, const KeyValues* userData = NULL);
-		virtual int AddCascadingMenuItem(const char* itemText, Panel* target, Menu* cascadeMenu, const KeyValues* userData = NULL);
-
-		virtual int AddMenuItem(MenuItem* panel);
-
-		virtual void AddSeparator();
-		virtual void AddSeparatorAfterItem(int itemID);
-
-		virtual void UpdateMenuItem(int itemID, const char* itemText, KeyValues* message, const KeyValues* userData = NULL);
-		virtual void UpdateMenuItem(int itemID, const wchar_t* wszItemText, KeyValues* message, const KeyValues* userData = NULL);
-
-		virtual void MoveMenuItem(int itemID, int moveBeforeThisItemID);
-
-		virtual bool IsValidMenuID(int itemID);
-		virtual int GetInvalidMenuID();
-
-		KeyValues* GetItemUserData(int itemID);
-		void GetItemText(int itemID, wchar_t* text, int bufLenInBytes);
-		void GetItemText(int itemID, char* text, int bufLenInBytes);
-
-		virtual void SetItemEnabled(const char* itemName, bool state);
-		virtual void SetItemEnabled(int itemID, bool state);
-		virtual void SetItemVisible(const char* itemName, bool visible);
-		virtual void SetItemVisible(int itemID, bool visible);
-
-		void DeleteItem(int itemID);
-
-		void DeleteAllItems();
-
-		virtual void SetFixedWidth(int width);
-
-		void SetContentAlignment(Label::Alignment alignment);
-
-		virtual void SetMenuItemHeight(int itemHeight);
-		virtual int  GetMenuItemHeight() const;
-
-		virtual void SetNumberOfVisibleItems(int numItems);
-
-		void EnableUseMenuManager(bool bUseMenuManager);
-
-		virtual void PerformLayout(void);
-
-		virtual void SetBorder(class IBorder* border);
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-
-		enum MenuTypeAheadMode
-		{
-			COMPAT_MODE = 0,
-			HOT_KEY_MODE,
-			TYPE_AHEAD_MODE,
-		};
-		virtual void SetTypeAheadMode(MenuTypeAheadMode mode);
-		virtual int GetTypeAheadMode();
-
-		virtual void OnKeyTyped(wchar_t unichar);
-		virtual void OnKeyCodeTyped(KeyCode code);
-
-		virtual void SetVisible(bool state);
-
-		virtual void ActivateItem(int itemID);
-		virtual void SilentActivateItem(int itemID);         
-		virtual void ActivateItemByRow(int row);
-		virtual int GetActiveItem();		          
-
-		virtual int GetItemCount();
-
-		virtual int GetMenuID(int index);
-
-		int GetCurrentlyVisibleItemsCount();
-
-		MenuItem* GetMenuItem(int itemID);
-		void CloseOtherMenus(MenuItem* item);
-		virtual void OnKillFocus();
-
-		int GetMenuMode();
-		enum MenuMode
-		{
-			MOUSE = 0,
-			KEYBOARD,
-		};
-
-		void SetCurrentlyHighlightedItem(int itemID);
-		int GetCurrentlyHighlightedItem();
-		void ClearCurrentlyHighlightedItem();
-
-		void SetMenuItemChecked(int itemID, bool state);
-		bool IsChecked(int index);      
-
-
-		void SetMinimumWidth(int width);
-		int  GetMinimumWidth();
-
-		virtual void SetFgColor(Color newColor);
-		virtual void SetBgColor(Color newColor);
-
-		virtual void SetFont(HFont font);
-
-		void SetCurrentKeyBinding(int itemID, char const* hotkey);
-
-		void ForceCalculateWidth();
-
-		void SetUseFallbackFont(bool bState, HFont hFallback);
-
-	protected:
-		int AddMenuItemCharCommand(MenuItem* item, const char* command, Panel* target, const KeyValues* userData);
-		int AddMenuItemKeyValuesCommand(MenuItem* item, KeyValues* message, Panel* target, const KeyValues* userData);
-
-		virtual void OnCommand(const char* command);
-		MESSAGE_FUNC_PTR(OnMenuItemSelected, "MenuItemSelected", panel);
-		virtual void AddScrollBar();
-		virtual void RemoveScrollBar();
-		MESSAGE_FUNC(OnSliderMoved, "ScrollBarSliderMoved");
-		virtual void Paint();
-		virtual void LayoutMenuBorder();
-		virtual void MakeItemsVisibleInScrollRange(int maxVisibleItems, int nNumPixelsAvailable);
-		virtual void OnMouseWheeled(int delta);
-		virtual void OnHotKey(wchar_t unichar);
-		virtual void OnTypeAhead(wchar_t unichar);
-
-		int	CountVisibleItems();
-		void ComputeWorkspaceSize(int& workWide, int& workTall);
-		int ComputeFullMenuHeightWithInsets();
-
-		void CalculateWidth();
-
-		void LayoutScrollBar();
-		void PositionCascadingMenu();
-		void SizeMenuItems();
-		void OnCursorMoved(int x, int y);
-		void OnKeyCodePressed(KeyCode code);
-		void OnMenuClose();
-		MESSAGE_FUNC(OnKeyModeSet, "KeyModeSet");
-
-		void SetCurrentlySelectedItem(MenuItem* item);
-		void SetCurrentlySelectedItem(int itemID);
-		MESSAGE_FUNC_INT(OnCursorEnteredMenuItem, "CursorEnteredMenuItem", VPanel);
-		MESSAGE_FUNC_INT(OnCursorExitedMenuItem, "CursorExitedMenuItem", VPanel);
-
-		void MoveAlongMenuItemList(int direction, int loopCount);
-
-		enum
-		{
-			DEFAULT_MENU_ITEM_HEIGHT = 22,       
-			MENU_UP = -1,            
-			MENU_DOWN = 1
-		};
-
-#ifdef DBGFLAG_VALIDATE
-		virtual void Validate(CValidator& validator, char* pchName);
-#endif  
-
-	private:
-		MenuItem* GetParentMenuItem();
-
-		int 			m_iMenuItemHeight;
-		int 			m_iFixedWidth;
-		int 			m_iMinimumWidth;               
-		int 			m_iNumVisibleLines;	          
-		ScrollBar* m_pScroller;
-
-		CUtlLinkedList<MenuItem*, int> 	m_MenuItems;
-
-		CUtlVector<int>					m_VisibleSortedItems;
-		CUtlVector<int>					m_SortedItems;		    
-		CUtlVector<int>					m_Separators;                 
-		CUtlVector<MenuSeparator*>		m_SeparatorPanels;
-
-		bool 			_sizedForScrollBar : 1;          
-		bool			m_bUseFallbackFont : 1;
-		bool 			_recalculateWidth : 1;
-		bool			m_bUseMenuManager : 1;
-
-		int 			_menuWide;
-		int 			m_iCurrentlySelectedItemID;
-		int 			m_iInputMode;
-		int 			m_iCheckImageWidth;            
-		int 			m_iProportionalScrollBarSize;
-		Label::Alignment	m_Alignment;
-		Color 			_borderDark;
-		int 			m_iActivatedItem;
-		HFont			m_hItemFont;
-		HFont			m_hFallbackItemFont;
-
-#define			TYPEAHEAD_BUFSIZE 256
-		MenuTypeAheadMode m_eTypeAheadMode;
-		wchar_t			m_szTypeAheadBuf[TYPEAHEAD_BUFSIZE];
-		int				m_iNumTypeAheadChars;
-		double			m_fLastTypeAheadTime;
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Menu.hpp b/SpyCustom/Menu.hpp
deleted file mode 100644
index 61aaa10..0000000
--- a/SpyCustom/Menu.hpp
+++ /dev/null
@@ -1,1949 +0,0 @@
-#pragma once
-
-
-
-IMaterial* CreateMaterial(std::string matname, std::string mat_data = "")
-{
-    KeyValues* keyValues = new KeyValues(matname.c_str());
-    keyValues->Init();
-    keyValues->LoadFromBuffer(matname.c_str(), mat_data.c_str());
-    IMaterial* newmat = iff.g_pMaterialSystem->CreateMaterial(matname.c_str(), keyValues);
-#ifdef DEBUG
-    printf("Material %s created\n", matname.c_str());
-#endif
-    return newmat;
-}
-
-
-
-void colorWorld(bool on = 1) noexcept
-{
-    if (on) {
-        if (!*g_Options.worldcoloractive) return;
-
-        iff.g_pCVar->FindVar("r_drawspecificstaticprop")->SetValue(false);
-
-        for (MaterialHandle_t h = iff.g_pMaterialSystem->FirstMaterial(); h != iff.g_pMaterialSystem->InvalidMaterial(); h = iff.g_pMaterialSystem->NextMaterial(h)) {
-            IMaterial* pMaterial = iff.g_pMaterialSystem->GetMaterial(h);
-            if (!pMaterial || !pMaterial->IsPrecached())
-                continue;
-            const char* textureGroup = pMaterial->GetTextureGroupName();
-            if (strstr(textureGroup, "World textures"))
-                pMaterial->ColorModulate(g_Options.worldcolor.value->r, g_Options.worldcolor.value->g, g_Options.worldcolor.value->b);
-            if (strstr(textureGroup, "StaticProp"))
-                pMaterial->ColorModulate(g_Options.staticpropcolor.value->r, g_Options.staticpropcolor.value->g, g_Options.staticpropcolor.value->b);
-            if (strstr(textureGroup, "Model"))
-                pMaterial->ColorModulate(g_Options.modelcolor.value->r, g_Options.modelcolor.value->g, g_Options.modelcolor.value->b);
-        }
-    }
-    else
-    {
-        iff.g_pCVar->FindVar("r_drawspecificstaticprop")->SetValue(true);
-
-        for (MaterialHandle_t h = iff.g_pMaterialSystem->FirstMaterial(); h != iff.g_pMaterialSystem->InvalidMaterial(); h = iff.g_pMaterialSystem->NextMaterial(h)) {
-            IMaterial* pMaterial = iff.g_pMaterialSystem->GetMaterial(h);
-            if (!pMaterial || !pMaterial->IsPrecached())
-                continue;
-            const char* textureGroup = pMaterial->GetTextureGroupName();
-            if (strstr(textureGroup, "World textures"))
-                pMaterial->ColorModulate(1.0f, 1.0f, 1.0f);
-            if (strstr(textureGroup, "StaticProp"))
-                pMaterial->ColorModulate(1.0f, 1.0f, 1.0f);
-            if (strstr(textureGroup, "Model"))
-                pMaterial->ColorModulate(1.0f, 1.0f, 1.0f);
-        }
-    }
-}
-
-
-void RefreshThread(int* skinid)
-{
-    int localskinid = *skinid;
-    *skinid = 0;
-    iff.g_pClientState->ForceFullUpdate();
-    Sleep(350);
-
-    *skinid = localskinid;
-    iff.g_pClientState->ForceFullUpdate();
-    opt.needupdate = 1;
-    ProtoFeatures.SendClientHello();
-    ProtoFeatures.SendMatchmakingClient2GCHello();
-}
-
-struct float3 colorConverter(int hexValue)
-{
-    float3 rgbColor;
-    rgbColor.b = ((hexValue >> 16) & 0xFF) / 255.0;
-    rgbColor.g = ((hexValue >> 8) & 0xFF) / 255.0;
-    rgbColor.r = ((hexValue) & 0xFF) / 255.0;
-    return rgbColor;
-}
-
-extern LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-WNDPROC oWndProc;
-static HWND window = NULL;
-LRESULT __stdcall WndProc(const HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-    if (true && ImGui_ImplWin32_WndProcHandler(hWnd, uMsg, wParam, lParam))
-        return true;
-    return CallWindowProc(oWndProc, hWnd, uMsg, wParam, lParam);
-}
-
-#include "imgui/imgui_internal.h"
-
-ImFont* ifont; ImFont* ifontBD; ImFont* ifontmini;
-void InitImGui(LPDIRECT3DDEVICE9 pDevice)
-{
-    ImGui::CreateContext();
-    ImGuiIO& io = ImGui::GetIO();
-    io.ConfigFlags = ImGuiConfigFlags_NoMouseCursorChange;
-    auto a = ImFontConfig();
-    a.FontBuilderFlags = 1 << 7 | 1 << 4 | 1 << 5;
-    ifontBD = io.Fonts->AddFontFromFileTTF("C:\\Windows\\Fonts\\segoeuib.ttf", 14);
-    ifont = io.Fonts->AddFontFromFileTTF("C:\\Windows\\Fonts\\arial.ttf", 14);
-    ifontmini = io.Fonts->AddFontFromFileTTF("C:\\Windows\\Fonts\\arial.ttf", 12);
-    ImGuiStyle* style = &ImGui::GetStyle();
-    style->WindowMenuButtonPosition = 2;
-    style->WindowTitleAlign = ImVec2(0.00f, 1.2f);
-    style->WindowRounding = 6;
-    style->Colors[ImGuiCol_FrameBg] = ImVec4(0.463f, 0.463f, 0.463f, 1.0f);
-    style->Colors[ImGuiCol_TitleBgActive] = ImVec4(0.635f, 0.635f, 0.635f, 1.0f);
-    style->Colors[ImGuiCol_TitleBg] = ImVec4(0.635f, 0.635f, 0.635f, 1.0f);
-    style->Colors[ImGuiCol_WindowBg] = ImVec4(0.635f, 0.635f, 0.635f, 1.0f);
-    style->Colors[ImGuiCol_MenuBarBg] = ImVec4(0.635f, 0.635f, 0.635f, 1.0f);
-    style->Colors[ImGuiCol_Button] = ImVec4(0.635f, 0.635f, 0.635f, 1.0f);
-    style->ButtonTextAlign = ImVec2(0.1f, 0.5f);
-    style->TabRounding = 0;
-    style->TabBorderSize = 1;
-    style->Colors[ImGuiCol_Tab] = ImVec4(0.635f, 0.635f, 0.635f, 1.0f);
-    style->WindowPadding = ImVec2(20.0f, 20.0f);
-    style->ItemSpacing = ImVec2(7.0f, 15.0f);
-    style->Colors[ImGuiCol_Border] = ImVec4(0.757f, 0.757f, 0.757f, 1.0f);
-    style->Colors[ImGuiCol_CheckMark] = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
-    style->Colors[ImGuiCol_FrameBgHovered] = ImVec4(0.757f, 0.757f, 0.757f, 1.0f);
-    style->Colors[ImGuiCol_FrameBgActive] = ImVec4(0.757f, 0.757f, 0.757f, 1.0f);
-    style->Colors[ImGuiCol_HeaderHovered] = ImVec4(1.0f, 0.612f, 0, 1.0f);
-    style->Colors[ImGuiCol_HeaderActive] = ImVec4(1.0f, 0.612f, 0, 1.0f);
-    style->Colors[ImGuiCol_Header] = ImVec4(1.0f, 0.612f, 0, 1.0f);
-    style->Colors[ImGuiCol_SliderGrabActive] = ImVec4(0.424f, 0.424f, 0.424f, 1.0f);
-    style->Colors[ImGuiCol_SliderGrab] = ImVec4(0.424f, 0.424f, 0.424f, 1.0f);
-    style->Colors[ImGuiCol_PopupBg] = ImVec4(0.635f, 0.635f, 0.635f, 1.0f);
-    style->ScrollbarRounding = 0;
-    style->SelectableTextAlign = ImVec2(0, 0);
-
-    ImGui_ImplWin32_Init(window);
-    ImGui_ImplDX9_Init(pDevice);
-#ifdef DEBUG
-    printf("Imgui initiated\n");
-#endif
-}
-bool init = false;
-
- 
-
-ID3DXFont* font;
-VMTHook* D3DHook = nullptr;
-
-
-void DisableElements(bool check, bool dis)
-{
-    if (!check) {
-        if (dis)
-        {
-            ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
-            ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * 0.5f);
-        }
-
-        if (!dis)
-        {
-            ImGui::PopItemFlag();
-            ImGui::PopStyleVar();
-        }
-    }
-}
-
-long __stdcall hkEndScene(IDirect3DDevice9* pDevice)
-{
-    static auto oEndScene = D3DHook->GetOriginal<long(__stdcall*)(IDirect3DDevice9*)>(42);
-
-
-    if (!init)
-    {
-        D3DDEVICE_CREATION_PARAMETERS params;
-        pDevice->GetCreationParameters(&params);
-        window = params.hFocusWindow;
-        oWndProc = (WNDPROC)SetWindowLongPtr(window, GWL_WNDPROC, (LONG_PTR)WndProc);
-#ifdef DEBUG
-        cout << "oWndProc " << oWndProc << endl;
-#endif
-        InitImGui(pDevice);
-        init = true;
-    }
-
-
-    if (opt.show) {
-
-        ImGui_ImplDX9_NewFrame();
-        ImGui_ImplWin32_NewFrame();
-        ImGui::NewFrame();
-
-        ImGuiStyle* style = &ImGui::GetStyle();
-
-        ImGui::PushFont(ifontBD);
-
-        ImGui::SetNextWindowSize(ImVec2{ 650, 455 });
-
-        ImGui::Begin(XorStr("Spy's Seaside"), 0, ImGuiWindowFlags_NoResize);
-
-
-        ImGui::PushFont(ifont);
-        ImGui::BeginTabBar("1");
-
-        if (ImGui::BeginTabItem("Effects"))
-        {
-
-            style->ChildBorderSize = 0; style->WindowPadding = ImVec2(20.0f, 5.0f);
-            if (ImGui::BeginChild("ChildTab", ImVec2(665, 350), true, ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysUseWindowPadding)) {
-                style->ChildBorderSize = 1; style->WindowPadding = ImVec2(20.0f, 20.0f);
-
-                ImGui::Columns(2, nullptr, false);
-
-                ImGui::Checkbox("Bullet trace beam", g_Options.beamtrace);
-
-                DisableElements(*g_Options.beamtrace, 1);
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 20.0f);
-                if (ImGui::BeginTable("ssplit", 2, ImGuiTableFlags_NoSavedSettings))
-                {
-                    ImGui::TableNextRow(); ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-
-                    ImGui::TextInputComboBox("Path to .vmt", g_Options.beampath.value->mystring, 255, opt.spriteslist, 0);
-                    ImGui::InputInt("Beam type", g_Options.beamtype, 0, 0);
-                    ImGui::InputFloat("Width", g_Options.beamwidth, 0, 0);
-                    ImGui::InputFloat("Amplitude", g_Options.beamamplitude, 0, 0);
-                    ImGui::InputFloat("Halo scale", g_Options.beamhaloscale, 0, 0);
-                    ImGui::InputFloat("Start frame", g_Options.beamstartframe, 0, 0);
-                    ImGui::InputInt("Segments", g_Options.beamsegments, 0, 0);
-
-                    ImGui::TableNextColumn();
-
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 20.0f);
-                    ImGui::ColorEdit4("##BeamColor", (float*)g_Options.beamcolor.value.get(), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf | ImGuiColorEditFlags_AlphaBar);
-                    ImGui::SameLine();
-                    ImGui::Text("Color/Alpha");
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-                    ImGui::InputFloat("Life##beam", g_Options.beamlife, 0, 0);
-                    ImGui::InputFloat("End width", g_Options.beamendwidth, 0, 0);
-                    ImGui::InputFloat("Speed##beam", g_Options.beamspeed, 0, 0);
-                    ImGui::InputFloat("Fade length", g_Options.beamfadelength, 0, 0);
-                    ImGui::InputFloat("Framerate", g_Options.beamframerate, 0, 0);
-                    ImGui::InputInt("Flags", g_Options.beamflags, 0, 0, ImGuiInputTextFlags_CharsHexadecimal);
-
-                    ImGui::EndTable();
-                }
-
-                DisableElements(*g_Options.beamtrace, 0);
-
-                ImGui::NextColumn();
-
-                ImGui::Checkbox("Bullet impact effect", g_Options.attacheffects);
-
-                DisableElements(g_Options.attacheffects, 1);
-
-                if (ImGui::BeginTable("split", 2, ImGuiTableFlags_NoSavedSettings))
-                {
-                    ImGui::TableNextRow(); ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-
-                    style->WindowPadding = ImVec2(5.0f, 5.0f);
-                    if (ImGui::BeginCombo("Interface", opt.EffTypes.at(g_Options.effects.value->type).c_str()))
-                    {
-                        ImGui::PushFont(ifontmini);
-                        style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                        for (int n = 0; n < opt.EffTypes.size(); n++)
-                        {
-                            bool selected = (g_Options.effects.value->type == n);
-                            if (ImGui::Selectable(opt.EffTypes.at(n).c_str(), selected, 0, ImVec2(0, 0), false))
-                            {
-                                g_Options.effects.value->type = n;
-                                g_Options.effects.value->selectedc = 0;
-                            }
-                            if (selected)
-                                ImGui::SetItemDefaultFocus();
-                        }
-
-                        style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                        ImGui::PushFont(ifont);
-                        ImGui::EndCombo();
-                    }
-
-                    if (ImGui::BeginCombo("Name", opt.Map.at(opt.EffTypes.at(g_Options.effects.value->type)).at(g_Options.effects.value->selectedc).c_str()))
-                    {
-                        ImGui::PushFont(ifontmini);
-                        style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                        for (int n = 0; n < opt.Map.at(opt.EffTypes.at(g_Options.effects.value->type)).size(); n++)
-                        {
-                            bool selected = (g_Options.effects.value->selectedc == n);
-                            if (ImGui::Selectable(opt.Map.at(opt.EffTypes.at(g_Options.effects.value->type)).at(n).c_str(), selected, 0, ImVec2(0, 0), false))
-                                g_Options.effects.value->selectedc = n;
-                            if (selected)
-                                ImGui::SetItemDefaultFocus();
-                        }
-
-                        style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                        ImGui::PushFont(ifont);
-                        ImGui::EndCombo();
-                    }
-                    style->WindowPadding = ImVec2(20.f, 20.0f);
-
-
-                    ImGui::TableNextColumn();
-
-
-                    ImGui::SetCursorPos(ImVec2(ImGui::GetCursorPosX() - 25.0f, ImGui::GetCursorPosY() - 20.0f));
-                    ImGuiWindowFlags window_flags = ImGuiWindowFlags_None;
-                    style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                    if (ImGui::BeginChild("ChildR", ImVec2(135, 100), true, window_flags | ImGuiWindowFlags_AlwaysUseWindowPadding)) {
-
-                        ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-                        switch (g_Options.effects.value->type)
-                        {
-                        case (0):
-                        {
-                            switch (g_Options.effects.value->selectedc)
-                            {
-                            case 0:
-                            case 2:
-                            {
-                                ImGui::InputFloat("Size", &g_Options.effects.value->fx_fsize, 0, 0);
-                                ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-                                ImGui::InputFloat("Speed", &g_Options.effects.value->fx_fspeed, 0, 0);
-                                break;
-                            }
-                            case 1:
-                            {
-                                ImGui::InputInt("Magnitude", &g_Options.effects.value->fx_magnitude, 0, 0);
-                                ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-                                ImGui::InputInt("Trail length", &g_Options.effects.value->fx_traillength, 0, 0);
-                                break;
-                            }
-                            case 3:
-                            {
-                                ImGui::InputFloat("Scale", &g_Options.effects.value->fx_fsize, 0, 0);
-                                ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-                                ImGui::InputInt("Type", &g_Options.effects.value->fx_itype, 0, 0);
-                                break;
-                            }
-                            case 4:
-                            case 6:
-                            {
-                                break;
-                            }
-                            case 5:
-                            {
-                                ImGui::Checkbox("Explosive", &g_Options.effects.value->fx_bexplosive);
-                                break;
-                            }
-
-                            }
-                            break;
-                        }
-
-                        case (1):
-                        {
-                            ImGui::InputInt("Colors", &g_Options.effects.value->icolors, 0, 0); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                            ImGui::InputFloat("Magnitude", &g_Options.effects.value->fmagtinude, 0, 0); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                            ImGui::InputFloat("Scale##de", &g_Options.effects.value->fscale, 0, 0);
-
-                            ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-                            ImGui::InputInt("Flags##de", &g_Options.effects.value->fflags, 0, 0, ImGuiInputTextFlags_CharsHexadecimal); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                            ImGui::InputFloat("Radius", &g_Options.effects.value->fradius, 0, 0);
-
-                            break;
-                        }
-
-                        case (2):
-                        {
-                            switch (g_Options.effects.value->selectedc)
-                            {
-                            case (0):
-                            {
-                                ImGui::InputFloat("Beam width", &g_Options.effects.value->fbeamwidth, 0, 0); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                                ImGui::InputFloat("Time visible", &g_Options.effects.value->fltimevisible, 0, 0); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 10.0f);
-                                ImGui::ColorEdit3("##teslacolor", (float*)g_Options.effects.value->teslacolor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf);
-                                ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-                                ImGui::InputFloat("Radius##tesla", &g_Options.effects.value->teslaradius, 0, 0); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                                ImGui::InputInt("Beams", &g_Options.effects.value->ibeams, 0, 0); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                                ImGui::InputText("Sprite name", g_Options.effects.value->szSpriteName, 256);
-                                break;
-                            }
-                            case (1):
-                            {
-                                ImGui::InputFloat("Die", &g_Options.effects.value->fdie, 0, 0); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                                ImGui::InputInt("Style", &g_Options.effects.value->style, 0, 0); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 10.0f);
-                                ImGui::ColorEdit3("##dlightcolor", (float*)g_Options.effects.value->dlightcolor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf);
-                                ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-                                ImGui::InputFloat("Radius##dlight", &g_Options.effects.value->frad, 0, 0); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                                ImGui::InputInt("Key", &g_Options.effects.value->key, 0, 0); ImGui::InvisibleButton("##ib", ImVec2(0, 10.0f));
-                                ImGui::InputFloat("Decay", &g_Options.effects.value->decay, 0, 0);
-
-                                break;
-                            }
-
-                            }
-
-                            break;
-                        }
-
-                        }
-
-
-                        ImGui::EndChild();
-                    }
-                    DisableElements(g_Options.attacheffects, 0);
-
-                    ImGui::EndTable();
-                }
-
-
-
-
-                if (ImGui::BeginTable("sssplit", 2, ImGuiTableFlags_NoSavedSettings))
-                {
-                    ImGui::TableNextRow(); ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-
-                    ImGui::Checkbox("Hit sound", g_Options.hitsound);
-                    DisableElements(*g_Options.hitsound, 1);
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 7.0f);
-                    ImGui::TextInputComboBox("Head shot", g_Options.hspath.value->mystring, 255, opt.soundslist, 0);
-                    DisableElements(*g_Options.hitsound, 0);
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 13.0f);
-                    ImGui::Checkbox("Flashlight (L)", g_Options.flashlightON);
-                    DisableElements(*g_Options.flashlightON, 1);
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 20.0f);
-                    ImGui::TextInputComboBox("Path to .vmt ", g_Options.flashlightTexture.value->mystring, 255, opt.flashlightlist, 0);
-                    DisableElements(*g_Options.flashlightON, 0);
-                    ImGui::Checkbox("Nightvision (N)", g_Options.nvgsON);
-
-                    ImGui::TableNextColumn();
-
-                    ImGui::Checkbox("Hit marker", g_Options.hitmarker);
-                    DisableElements(*g_Options.hitsound, 1);
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 20.0f);
-                    ImGui::TextInputComboBox("Other bone", g_Options.obpath.value->mystring, 255, opt.soundslist, 0);
-                    DisableElements(*g_Options.hitsound, 0);
-                    DisableElements(*g_Options.flashlightON, 1);
-                    ImGui::Checkbox("Cast shadows", g_Options.flashlightShadows);
-                    ImGui::InputFloat("FOV", g_Options.flashlightFOV, 0, 0);
-                    DisableElements(*g_Options.flashlightON, 0);
-
-                    ImGui::EndTable();
-                }
-
-
-                ImGui::Columns(1, nullptr, false);
-
-                ImGui::EndChild();
-            }
-
-            ImGui::EndTabItem();
-        }
-
-        if (ImGui::BeginTabItem("World"))
-        {
-
-            style->ChildBorderSize = 0; style->WindowPadding = ImVec2(20.0f, 5.0f);
-            if (ImGui::BeginChild("ChildTab", ImVec2(665, 350), true, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysUseWindowPadding)) {
-                style->ChildBorderSize = 1; style->WindowPadding = ImVec2(20.0f, 20.0f);
-
-
-                ImGui::Columns(2, nullptr, false);
-
-
-                if (ImGui::Checkbox("Skybox", g_Options.skyboxactive))
-                {
-                    if (g_Options.skyboxactive)
-                    {
-                        iff.g_pCVar->FindVar("sv_skyname")->SetValue((char*)g_Options.skyboxtemp.value.get());
-                        iff.g_pCVar->FindVar("r_3dsky")->SetValue(false);
-                    }
-                    else iff.g_pCVar->FindVar("r_3dsky")->SetValue(true);
-                }
-
-                DisableElements(*g_Options.skyboxactive, 1);
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 10.0f);
-                ImGui::PushItemWidth(170.0f);
-                ImGui::TextInputComboBox("##W1", (char*)g_Options.skyboxtemp.value.get(), 255, opt.skyboxitems, 0);
-                ImGui::PopItemWidth();
-                ImGui::SameLine();
-                if (ImGui::Button("Apply##W1", ImVec2(70, 22)))
-                {
-                    iff.g_pCVar->FindVar("sv_skyname")->SetValue((char*)g_Options.skyboxtemp.value.get());
-                }
-
-                DisableElements(*g_Options.skyboxactive, 0);
-
-                if (ImGui::Checkbox("Weather", g_Options.weatheractive))
-                {
-                    if (!*g_Options.weatheractive) iff.g_pClientState->ForceFullUpdate();
-
-                    iff.g_pCVar->FindVar("r_rainlength")->SetValue(*g_Options.rainlength);
-                    iff.g_pCVar->FindVar("r_rainspeed")->SetValue(*g_Options.rainspeed);
-                    iff.g_pCVar->FindVar("r_rainradius")->SetValue(*g_Options.rainradius);
-                    iff.g_pCVar->FindVar("cl_windspeed")->SetValue(*g_Options.windspeed);
-                    iff.g_pCVar->FindVar("r_rainwidth")->SetValue(*g_Options.rainwidth);
-                    iff.g_pCVar->FindVar("r_RainSideVel")->SetValue(*g_Options.rainsidevel);
-                    iff.g_pCVar->FindVar("r_rainalpha")->SetValue(*g_Options.rainalpha);
-                }
-
-                DisableElements(*g_Options.weatheractive, 1);
-
-                if (ImGui::BeginTable("##Weather", 2, ImGuiTableFlags_NoSavedSettings))
-                {
-                    ImGui::TableNextRow(); ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-
-                    ImGui::InputInt("Precipitation type", g_Options.weathertype, 0, 0);
-
-                    if (ImGui::InputFloat("Length", g_Options.rainlength, 0, 0))
-                        iff.g_pCVar->FindVar("r_rainlength")->SetValue(*g_Options.rainlength);
-                    if (ImGui::InputFloat("Speed", g_Options.rainspeed, 0, 0))
-                        iff.g_pCVar->FindVar("r_rainspeed")->SetValue(*g_Options.rainspeed);
-                    if (ImGui::InputFloat("Radius", g_Options.rainradius, 0, 0))
-                        iff.g_pCVar->FindVar("r_rainradius")->SetValue(*g_Options.rainradius);
-
-                    ImGui::TableNextColumn();
-
-                    if (ImGui::InputFloat("Wind speed", g_Options.windspeed, 0, 0))
-                        iff.g_pCVar->FindVar("cl_windspeed")->SetValue(*g_Options.windspeed);
-                    if (ImGui::InputFloat("Width", g_Options.rainwidth, 0, 0))
-                        iff.g_pCVar->FindVar("r_rainwidth")->SetValue(*g_Options.rainwidth);
-                    if (ImGui::InputFloat("Side velocity", g_Options.rainsidevel, 0, 0))
-                        iff.g_pCVar->FindVar("r_RainSideVel")->SetValue(*g_Options.rainsidevel);
-                    if (ImGui::InputFloat("Alpha", g_Options.rainalpha, 0, 0))
-                        iff.g_pCVar->FindVar("r_rainalpha")->SetValue(*g_Options.rainalpha);
-
-                    ImGui::EndTable();
-                }
-
-                DisableElements(*g_Options.weatheractive, 0);
-
-                ImGui::NextColumn();
-
-
-
-
-                if (ImGui::BeginTable("##Fog", 4, ImGuiTableFlags_NoSavedSettings))
-                {
-                    ImGui::TableNextColumn();
-
-                    if (ImGui::Checkbox("Fog", g_Options.fogactive))
-                    {
-                        if (g_Options.fogactive)
-                        {
-                            iff.g_pCVar->FindVar("fog_override")->SetValue(true);
-                            iff.g_pCVar->FindVar("fog_color")->SetValue(
-                                std::string("").
-                                append(to_string(g_Options.fogcolor.value->r * 255)).
-                                append(" ").
-                                append(to_string(g_Options.fogcolor.value->g * 255)).
-                                append(" ").
-                                append(to_string(g_Options.fogcolor.value->b * 255)).
-                                append(" ").c_str()
-                            );
-                            iff.g_pCVar->FindVar("fog_colorskybox")->SetValue(
-                                std::string("").
-                                append(std::to_string(g_Options.fogcolor.value->r * 255)).
-                                append(" ").
-                                append(std::to_string(g_Options.fogcolor.value->g * 255)).
-                                append(" ").
-                                append(std::to_string(g_Options.fogcolor.value->b * 255)).
-                                append(" ").c_str()
-                            );
-                            iff.g_pCVar->FindVar("fog_maxdensity")->SetValue(g_Options.fogdensity);
-                            iff.g_pCVar->FindVar("fog_maxdensityskybox")->SetValue(g_Options.fogdensity);
-                            iff.g_pCVar->FindVar("fog_start")->SetValue(g_Options.fogstart);
-                            iff.g_pCVar->FindVar("fog_startskybox")->SetValue(g_Options.fogstart);
-                            iff.g_pCVar->FindVar("fog_end")->SetValue(g_Options.fogend);
-                            iff.g_pCVar->FindVar("fog_endskybox")->SetValue(g_Options.fogend);
-                        }
-                        else iff.g_pCVar->FindVar("fog_override")->SetValue(false);
-                    }
-
-                    ImGui::TableNextColumn();
-
-                    DisableElements(*g_Options.fogactive, 1);
-
-                    if (ImGui::ColorEdit3("##MyColor##W1", (float*)g_Options.fogcolor.value.get(), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf))
-                    {
-                        iff.g_pCVar->FindVar("fog_color")->SetValue(
-                            std::string("").
-                            append(std::to_string(g_Options.fogcolor.value->r * 255)).
-                            append(" ").
-                            append(std::to_string(g_Options.fogcolor.value->g * 255)).
-                            append(" ").
-                            append(std::to_string(g_Options.fogcolor.value->b * 255)).
-                            append(" ").c_str()
-                        );
-
-                        iff.g_pCVar->FindVar("fog_colorskybox")->SetValue(
-                            std::string("").
-                            append(std::to_string(g_Options.fogcolor.value->r * 255)).
-                            append(" ").
-                            append(std::to_string(g_Options.fogcolor.value->g * 255)).
-                            append(" ").
-                            append(std::to_string(g_Options.fogcolor.value->b * 255)).
-                            append(" ").c_str()
-                        );
-
-                    }
-
-                    ImGui::EndTable();
-                }
-
-
-                ImGui::PushItemWidth(252.0f);
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 10.0f);
-
-                if (ImGui::SliderFloat("Max density", g_Options.fogdensity, 0.0f, 1.0f))
-                {
-                    iff.g_pCVar->FindVar("fog_maxdensity")->SetValue(g_Options.fogdensity);
-                    iff.g_pCVar->FindVar("fog_maxdensityskybox")->SetValue(g_Options.fogdensity);
-                }
-
-                if (ImGui::SliderFloat("Start", g_Options.fogstart, 0.0f, 5000.0f))
-                {
-                    iff.g_pCVar->FindVar("fog_start")->SetValue(g_Options.fogstart);
-                    iff.g_pCVar->FindVar("fog_startskybox")->SetValue(g_Options.fogstart);
-                }
-                if (ImGui::SliderFloat("End", g_Options.fogend, 0.0f, 5000.0f))
-                {
-                    iff.g_pCVar->FindVar("fog_end")->SetValue(g_Options.fogend);
-                    iff.g_pCVar->FindVar("fog_endskybox")->SetValue(g_Options.fogend);
-                }
-
-                DisableElements(*g_Options.fogactive, 0);
-
-                ImGui::InvisibleButton("##W4", ImVec2(0, 0.0f));
-
-                if (ImGui::SliderFloat("Tonemap scale", g_Options.tonemapscale, 0.001f, 1.0f))
-                    iff.g_pCVar->FindVar("mat_force_tonemap_scale")->SetValue(g_Options.tonemapscale);
-                ImGui::PopItemWidth();
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-                if (ImGui::Checkbox("Colorize map textures         ", g_Options.worldcoloractive))
-                {
-                    if (*g_Options.worldcoloractive) colorWorld();
-                    else colorWorld(0);
-                }
-
-                DisableElements(*g_Options.worldcoloractive, 1);
-
-                ImGui::SameLine();
-                if (ImGui::Button("Modulate", ImVec2(70, 22)))
-                    colorWorld();
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 20.0f);
-                if (ImGui::BeginTable("##Colorworld", 3, ImGuiTableFlags_NoSavedSettings))
-                {
-                    ImGui::TableNextColumn();
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 3.0f);
-                    ImGui::Text("World");
-                    ImGui::ColorEdit3("##W1", (float*)g_Options.worldcolor.value.get(), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf);
-
-                    ImGui::TableNextColumn();
-                    ImGui::Text("StaticProp");
-                    ImGui::ColorEdit3("##W2", (float*)g_Options.staticpropcolor.value.get(), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf);
-
-                    ImGui::TableNextColumn();
-                    ImGui::Text("Model");
-                    ImGui::ColorEdit3("##W3", (float*)g_Options.modelcolor.value.get(), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf);
-
-
-                    ImGui::EndTable();
-                }
-
-                DisableElements(*g_Options.worldcoloractive, 0);
-
-
-
-
-                ImGui::Columns(1, nullptr, false);
-
-                ImGui::EndChild();
-            }
-
-            ImGui::EndTabItem();
-        }
-        if (ImGui::BeginTabItem("Models"))
-        {
-            style->ChildBorderSize = 0; style->WindowPadding = ImVec2(20.0f, 5.0f);
-            if (ImGui::BeginChild("ChildTab", ImVec2(665, 350), true, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysUseWindowPadding)) {
-                style->ChildBorderSize = 1; style->WindowPadding = ImVec2(20.0f, 20.0f);
-
-                static int selectedwep = 0;
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 5.0f);
-
-                if (ImGui::BeginTable("##Models", 2, ImGuiTableFlags_NoSavedSettings))
-                {
-                    ImGui::TableNextRow();
-                    ImGui::TableNextRow();
-
-                    ImGui::TableNextColumn();
-
-
-                    ImGui::PushItemWidth(170.0f);
-                    style->WindowPadding = ImVec2(5.0f, 5.0f);
-                    if (ImGui::BeginCombo("Item", g_Options.models.value->arr[selectedwep].name))
-                    {
-                        ImGui::PushFont(ifontmini);
-                        style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                        for (int n = 0; n < g_Options.models.value->itemcount; n++)
-                        {
-                            g_Options.models.value->arr[n].isSelected = (selectedwep == n);
-                            if (ImGui::Selectable(g_Options.models.value->arr[n].name, g_Options.models.value->arr[n].isSelected, 0, ImVec2(0, 0), false))
-                                selectedwep = n;
-                            if (g_Options.models.value->arr[n].isSelected)
-                                ImGui::SetItemDefaultFocus();
-                        }
-
-                        style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                        ImGui::PushFont(ifont);
-                        ImGui::EndCombo();
-                    }
-                    style->WindowPadding = ImVec2(20.f, 20.0f);
-                    ImGui::PopItemWidth();
-
-                    ImGui::SameLine();
-
-                    if (ImGui::Button("Update", ImVec2(70, 22)))
-                        iff.g_pClientState->ForceFullUpdate();
-
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 6.0f);
-
-                    if (ImGui::Checkbox("Set viewmodel     ", &g_Options.models.value->arr[selectedwep].active))
-                    {
-                        if (!g_Options.models.value->arr[selectedwep].active) {
-                            g_Options.models.value->arr[selectedwep].vmodel_hash = fnv2::hash(g_Options.models.value->arr[selectedwep].vmodel_orig);
-                        }
-
-                        if (g_Options.models.value->arr[selectedwep].active) {
-                            g_Options.models.value->arr[selectedwep].vmodel_hash = fnv2::hash(g_Options.models.value->arr[selectedwep].vmodel_repl);
-                        }
-
-                        if (selectedwep < 2)
-                        {
-
-                            if (g_Options.models.value->arr[selectedwep].active)
-                                *g_Options.playerloop_count += 1;
-                            else *g_Options.playerloop_count -= 1;
-
-#ifdef DEBUG
-                            printf("pl count %d\n", *g_Options.playerloop_count);
-#endif
-                        }
-
-
-                    }
-                    ImGui::SameLine();
-                    DisableElements(selectedwep > 2 ? true : false, 1);
-                    ImGui::Checkbox("Via FindMDL hook", &g_Options.models.value->arr[selectedwep].findMDLmethode);
-                    DisableElements(selectedwep > 2 ? true : false, 0);
-                    ImGui::PushItemWidth(170.0f);
-                    ImGui::InputText("Path to .mdl##viewmodel", g_Options.models.value->arr[selectedwep].vmodel_repl_temp, 256);
-                    ImGui::PopItemWidth();
-
-                    ImGui::SameLine();
-                    if (ImGui::Button("Apply##viewmodel", ImVec2(70, 22)))
-                    {
-                        if (const auto modelprecache = iff.g_pNetworkStringTableContainer->FindTable("modelprecache"))
-                            modelprecache->AddString(false, g_Options.models.value->arr[selectedwep].vmodel_repl_temp);
-
-                        if (selectedwep > 2) {
-                            for (int i = 0; i < 20; i++)
-                                strcpy(g_Options.models.value->arr[selectedwep].seqs[i].seq_orig_def, "");
-
-                            opt.needtogetseqact = selectedwep;
-                        }
-
-                        strcpy(g_Options.models.value->arr[selectedwep].vmodel_repl, g_Options.models.value->arr[selectedwep].vmodel_repl_temp);
-                        g_Options.models.value->arr[selectedwep].vmodel_hash = fnv2::hashRuntime(g_Options.models.value->arr[selectedwep].vmodel_repl);
-                    }
-
-
-                    ImGui::TableNextColumn();
-
-                    DisableElements(selectedwep == 2 ? false : true, 1);
-
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 10.0f);
-
-                    if (ImGui::Checkbox("Set scale", &g_Options.models.value->arr[selectedwep].active_scale))
-                    {
-                        if (g_Options.models.value->arr[selectedwep].active_scale)
-                            *g_Options.entityloop_count += 1;
-                        else *g_Options.entityloop_count -= 1;
-
-#ifdef DEBUG
-                        printf("el count %d\n", *g_Options.entityloop_count);
-#endif
-                    }
-
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 30.0f);
-
-                    DisableElements(g_Options.models.value->arr[selectedwep].active_scale, 1);
-                    ImGui::PushItemWidth(252.0f);
-                    ImGui::SliderFloat("##scale", &g_Options.models.value->arr[selectedwep].scale, 0.0f, 10.0f);
-                    ImGui::PopItemWidth();
-                    DisableElements(g_Options.models.value->arr[selectedwep].active_scale, 0);
-
-                    DisableElements(selectedwep == 2 ? false : true, 0);
-
-                    DisableElements(selectedwep > 2 ? true : false, 1);
-
-                    if (ImGui::Checkbox("Set worldmodel", &g_Options.models.value->arr[selectedwep].active_w))
-                    {
-
-                        if (g_Options.models.value->arr[selectedwep].active_w)
-                            *g_Options.entityloop_count += 1;
-                        else *g_Options.entityloop_count -= 1;
-
-#ifdef DEBUG
-                        printf("el count %d\n", *g_Options.entityloop_count);
-#endif
-
-                    }
-
-                    ImGui::PushItemWidth(170.0f);
-                    ImGui::InputText("Path to .mdl##worldmodel", g_Options.models.value->arr[selectedwep].wmodel_repl_temp, 256);
-                    ImGui::PopItemWidth();
-
-                    ImGui::SameLine();
-                    if (ImGui::Button("Apply##worldmodel", ImVec2(70, 22)))
-                    {
-                        strcpy(g_Options.models.value->arr[selectedwep].wmodel_repl, g_Options.models.value->arr[selectedwep].wmodel_repl_temp);
-                        g_Options.models.value->arr[selectedwep].wmodel_hash = fnv2::hashRuntime(g_Options.models.value->arr[selectedwep].wmodel_repl);
-                    }
-
-                    DisableElements(selectedwep > 2 ? true : false, 0);
-
-
-
-                    ImGui::EndTable();
-                }
-
-
-
-                ImGui::Columns(2, nullptr, false);
-
-                DisableElements(selectedwep > 2 ? true : false, 1);
-                if (ImGui::Checkbox("Set animations", &g_Options.models.value->arr[selectedwep].seq_active))
-                    opt.needtogetseqact = selectedwep;
-                DisableElements(selectedwep > 2 ? true : false, 0);
-
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 20.0f);
-
-                DisableElements(g_Options.models.value->arr[selectedwep].seq_active, 1);
-
-                static char ccc[20][5] = { "##0","##1","##2","##3","##4","##5","##6","##7","##8","##9","##10","##11","##12","##13","##14","##15","##16","##17","##18","##19" };
-
-                static ImGuiTableFlags flags = ImGuiTableFlags_None;
-
-                static ImGuiWindowFlags window_flags = ImGuiWindowFlags_None;
-
-                style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                if (ImGui::BeginChild("ChildR", ImVec2(252, 150), true, window_flags | ImGuiWindowFlags_AlwaysUseWindowPadding)) {
-                    ImGui::SetCursorPos(ImVec2(ImGui::GetCursorPosX() - 10.0f, ImGui::GetCursorPosY() - 10.0f));
-                    if (ImGui::BeginTable("split", 2, flags | ImGuiTableFlags_NoSavedSettings))
-                    {
-                        for (int i = 0; i < 20; i++)
-                        {
-                            char buf[32];
-                            sprintf(buf, "%01d:", i);
-                            ImGui::TableNextColumn();
-                            ImGui::Text(buf);
-                            ImGui::SameLine();
-                            ImGui::Text(g_Options.models.value->arr[selectedwep].seqs[i].seq_orig_def);
-
-                            ImGui::TableNextColumn();
-
-                            ImGui::PushItemWidth(100.0f);
-
-                            style->WindowPadding = ImVec2(5.0f, 5.0f);
-                            if (ImGui::BeginCombo(ccc[i], g_Options.models.value->arr[selectedwep].seqs[g_Options.models.value->arr[selectedwep].seqs[i].seq_repl].seq_repl_def_preview))
-                            {
-                                ImGui::PushFont(ifontmini);
-                                style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                                for (int n = 0; n < 20; n++)
-                                {
-                                    g_Options.models.value->arr[selectedwep].seqs[i].isSelected[n] = (g_Options.models.value->arr[selectedwep].seqs[i].seq_repl == n);
-                                    if (ImGui::Selectable(g_Options.models.value->arr[selectedwep].seqs[n].seq_repl_def_preview, g_Options.models.value->arr[selectedwep].seqs[i].isSelected[n], 0, ImVec2(0, 0), false))
-                                        g_Options.models.value->arr[selectedwep].seqs[i].seq_repl = n;
-                                    if (g_Options.models.value->arr[selectedwep].seqs[i].isSelected[n])
-                                        ImGui::SetItemDefaultFocus();
-                                }
-
-                                style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                                ImGui::PushFont(ifont);
-                                ImGui::EndCombo();
-                            }
-                            style->WindowPadding = ImVec2(20.f, 20.0f);
-
-                            ImGui::PopItemWidth();
-
-                        }
-                        ImGui::EndTable();
-                    }
-
-                    ImGui::EndChild();
-                }
-
-                DisableElements(g_Options.models.value->arr[selectedwep].seq_active, 0);
-
-                style->ItemSpacing = ImVec2(7.0f, 15.0f);
-
-
-                ImGui::NextColumn();
-
-
-
-                static const char sss[20][6] = { "##0s","##1s","##2s","##3s","##4s","##5s","##6s","##7s","##8s","##9s","##10s",
-                    "##11s","##12s","##13s","##14s","##15s","##16s","##17s","##18s","##19s" };
-
-                static const char sss1[5][6] = { "##0v","##1v","##2v","##3v","##4v" };
-                static const char sss2[5][6] = { "##0p","##1p","##2p","##3p","##4p" };
-
-                DisableElements(selectedwep > 3 ? true : false, 1);
-                if (ImGui::Checkbox("Set sounds", &g_Options.models.value->arr[selectedwep].sound_active))
-                {
-                    if (g_Options.models.value->arr[selectedwep].sound_active)
-                        *g_Options.soundhook_count += 1;
-                    else *g_Options.soundhook_count -= 1;
-#ifdef DEBUG
-                    printf("sh count %d\n", *g_Options.soundhook_count);
-#endif
-
-                }
-                DisableElements(selectedwep > 3 ? true : false, 0);
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 20.0f);
-
-                DisableElements(g_Options.models.value->arr[selectedwep].sound_active, 1);
-
-
-
-                style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                if (ImGui::BeginChild("ChildS", ImVec2(252, 150), true, ImGuiWindowFlags_AlwaysUseWindowPadding | ImGuiWindowFlags_NoScrollbar)) {
-                    ImGui::SetCursorPos(ImVec2(ImGui::GetCursorPosX() - 10.0f, ImGui::GetCursorPosY() - 10.0f));
-                    if (ImGui::BeginTable("splits", 2, ImGuiTableFlags_NoSavedSettings))
-                    {
-                        for (int i = 0; i < g_Options.models.value->arr[selectedwep].soundcount; i++)
-                        {
-
-                            ImGui::TableNextColumn();
-
-
-                            ImGui::Text(g_Options.models.value->arr[selectedwep].sounds[i].name);
-
-                            ImGui::InvisibleButton("##xz", ImVec2(0, 14.0f));
-                            ImGui::Text("Pitch");
-                            ImGui::SameLine();
-                            ImGui::InputInt((char*)sss2[i], &g_Options.models.value->arr[selectedwep].sounds[i].pitch, 0, 0);
-
-
-                            ImGui::TableNextColumn();
-
-                            ImGui::PushItemWidth(106.0f);
-                            ImGui::InputText((char*)sss[i], g_Options.models.value->arr[selectedwep].sounds[i].wavpath, 255);
-                            ImGui::PopItemWidth();
-
-                            ImGui::Text("Volume");
-                            ImGui::SameLine();
-
-                            ImGui::PushItemWidth(56.0f);
-                            ImGui::InputFloat((char*)sss1[i], &g_Options.models.value->arr[selectedwep].sounds[i].volume, 0, 0);
-
-
-                            ImGui::PopItemWidth();
-
-                        }
-                        ImGui::EndTable();
-                    }
-
-                    ImGui::EndChild();
-                }
-
-                style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                DisableElements(g_Options.models.value->arr[selectedwep].sound_active, 0);
-
-
-                ImGui::Columns(1, nullptr, false);
-
-                ImGui::EndChild();
-            }
-
-            ImGui::EndTabItem();
-        }
-        if (ImGui::BeginTabItem("Materials"))
-        {
-            style->ChildBorderSize = 0; style->WindowPadding = ImVec2(20.0f, 5.0f);
-            if (ImGui::BeginChild("ChildTab", ImVec2(665, 350), true, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysUseWindowPadding)) {
-                style->ChildBorderSize = 1; style->WindowPadding = ImVec2(20.0f, 20.0f);
-
-
-                ImGui::Columns(2, nullptr, false);
-                static int selectedwep = 0;
-
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-
-                ImGui::PushItemWidth(170.0f);
-
-                style->WindowPadding = ImVec2(5.0f, 5.0f);
-                if (ImGui::BeginCombo("Item", g_Options.materials.value->arr[selectedwep].name))
-                {
-                    ImGui::PushFont(ifontmini);
-                    style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                    for (int n = 0; n < g_Options.materials.value->itemcount; n++)
-                    {
-                        g_Options.materials.value->arr[n].isSelected = (selectedwep == n);
-                        if (ImGui::Selectable(g_Options.materials.value->arr[n].name, g_Options.materials.value->arr[n].isSelected, 0, ImVec2(0, 0), false))
-                            selectedwep = n;
-                        if (g_Options.materials.value->arr[n].isSelected)
-                            ImGui::SetItemDefaultFocus();
-                    }
-
-                    style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                    ImGui::PushFont(ifont);
-                    ImGui::EndCombo();
-                }
-                style->WindowPadding = ImVec2(20.f, 20.0f);
-
-                ImGui::PopItemWidth();
-
-                ImGui::SameLine();
-
-                if (ImGui::Checkbox("Active##S1", &g_Options.materials.value->arr[selectedwep].active))
-                {
-                    if (g_Options.materials.value->arr[selectedwep].active)
-                        *g_Options.dmeloop_count += 1;
-                    else *g_Options.dmeloop_count -= 1;
-#ifdef DEBUG
-                    printf("dl count %d\n", *g_Options.dmeloop_count);
-#endif
-                }
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 20.0f);
-
-                DisableElements(g_Options.materials.value->arr[selectedwep].active, 1);
-
-                ImGui::PushItemWidth(170.0f);
-                ImGui::TextInputComboBox("Texture", g_Options.materials.value->arr[selectedwep].texture_temp, 255, opt.dmeitems, 0);
-                ImGui::PopItemWidth();
-
-                ImGui::SameLine();
-
-                if (ImGui::Button("Apply", ImVec2(70, 22)))
-                {
-                    if (strstr(g_Options.materials.value->arr[selectedwep].texture_temp, "(0)"))
-                        g_Options.materials.value->arr[selectedwep].customtextureselected = 0;
-                    else if (strstr(g_Options.materials.value->arr[selectedwep].texture_temp, "(1)"))
-                        g_Options.materials.value->arr[selectedwep].customtextureselected = 1;
-                    else if (strstr(g_Options.materials.value->arr[selectedwep].texture_temp, "(2)"))
-                        g_Options.materials.value->arr[selectedwep].customtextureselected = 2;
-                    else if (strstr(g_Options.materials.value->arr[selectedwep].texture_temp, "(3)"))
-                        g_Options.materials.value->arr[selectedwep].customtextureselected = 3;
-                    else if (strstr(g_Options.materials.value->arr[selectedwep].texture_temp, "(4)"))
-                        g_Options.materials.value->arr[selectedwep].customtextureselected = 4;
-                    else g_Options.materials.value->arr[selectedwep].customtextureselected = -1;
-#ifdef DEBUG
-                    printf("Custom texture selected? %d\n", g_Options.materials.value->arr[selectedwep].customtextureselected);
-#endif
-                    strcpy(g_Options.materials.value->arr[selectedwep].texture, g_Options.materials.value->arr[selectedwep].texture_temp);
-                }
-
-
-                ImGui::NextColumn();
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 5.0f);
-
-                if (ImGui::BeginTable("##tablexz", 2))
-                {
-                    ImGui::TableNextRow();
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-                    ImGui::Checkbox("Wireframe", &g_Options.materials.value->arr[selectedwep].wireframe);
-                    ImGui::Checkbox("Flat", &g_Options.materials.value->arr[selectedwep].flat);
-                    ImGui::TableNextColumn();
-                    ImGui::Checkbox("No draw", &g_Options.materials.value->arr[selectedwep].nodraw);
-                    ImGui::ColorEdit4("MyColor##0", (float*)&g_Options.materials.value->arr[selectedwep].coloralpha, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf | ImGuiColorEditFlags_AlphaBar);
-                    ImGui::SameLine();
-                    ImGui::Text("Color/Alpha");
-
-                    ImGui::EndTable();
-                }
-
-                DisableElements(g_Options.materials.value->arr[selectedwep].active, 0);
-
-                ImGui::Columns(1, nullptr, false);
-                ImGui::Separator();
-
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
-
-                static int item_current_idx = 0;
-
-                ImGui::InputTextMultiline("KeyValue", g_Options.customtextures.value->arr[item_current_idx].keyvalue, 0x1000, ImVec2(467, 200), ImGuiInputTextFlags_AllowTabInput);
-
-                ImGui::SameLine();
-
-                ImVec2 savepos = ImGui::GetCursorPos();
-
-
-                style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                if (ImGui::BeginListBox("Custom textures", ImVec2(98, 100)))
-                {
-                    ImGui::PushFont(ifontmini);
-                    for (int n = 0; n < 5; n++)
-                    {
-                        g_Options.customtextures.value->arr[n].IsSelected = (item_current_idx == n);
-                        if (ImGui::Selectable(g_Options.customtextures.value->arr[n].Preview, g_Options.customtextures.value->arr[n].IsSelected, 0, ImVec2(0, 0), true))
-                            item_current_idx = n;
-
-                        if (g_Options.customtextures.value->arr[n].IsSelected)
-                            ImGui::SetItemDefaultFocus();
-                    }
-                    ImGui::EndListBox();
-                    ImGui::PushFont(ifont);
-                }
-                style->ItemSpacing = ImVec2(7.0f, 15.0f);
-
-                savepos.y += 130.0f;
-                ImGui::SetCursorPos(savepos);
-
-                ImGui::PushItemWidth(100.0f);
-                ImGui::InputText("Name", g_Options.customtextures.value->arr[item_current_idx].Name, 256);
-                ImGui::PopItemWidth();
-
-                savepos.y += 40.0f;
-                ImGui::SetCursorPos(savepos);
-
-                if (ImGui::Button("Apply##refresh", ImVec2(70, 22)))
-                {
-                    if (g_Options.customtextures.value->arr[item_current_idx].Name[0] == 0x0 && g_Options.customtextures.value->arr[item_current_idx].keyvalue[0] == 0x0)
-                    {
-                        char newpreview[256] = "(";
-                        strcat_s(newpreview, to_string(item_current_idx).c_str());
-                        strcat_s(newpreview, ") null");
-                        strcpy(g_Options.customtextures.value->arr[item_current_idx].Preview, newpreview);
-                        g_Options.customtextures.value->arr[item_current_idx].texturelink = nullptr;
-                    }
-                    else
-                    {
-                        char newpreview[256] = "(";
-                        strcat_s(newpreview, to_string(item_current_idx).c_str());
-                        strcat_s(newpreview, ") ");
-                        strcat_s(newpreview, g_Options.customtextures.value->arr[item_current_idx].Name);
-                        strcpy(g_Options.customtextures.value->arr[item_current_idx].Preview, newpreview);
-
-                        g_Options.customtextures.value->arr[item_current_idx].texturelink = CreateMaterial(
-                            string(g_Options.customtextures.value->arr[item_current_idx].Name),
-                            string(g_Options.customtextures.value->arr[item_current_idx].keyvalue));
-                    }
-
-                    opt.dmeitems.at(item_current_idx) = g_Options.customtextures.value->arr[item_current_idx].Preview;
-
-
-                }
-
-                ImGui::EndChild();
-            }
-
-            ImGui::EndTabItem();
-        }
-
-
-        if (ImGui::BeginTabItem("Inventory"))
-        {
-
-            style->ChildBorderSize = 0; style->WindowPadding = ImVec2(20.0f, 5.0f);
-            if (ImGui::BeginChild("ChildTab", ImVec2(665, 350), true, ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysUseWindowPadding)) {
-                style->ChildBorderSize = 1; style->WindowPadding = ImVec2(20.0f, 20.0f);
-
-
-                static int selectedwep = 0;
-                ImGui::Text("Item");
-                ImGui::SameLine();
-                ImGui::PushItemWidth(390.0f);
-                style->WindowPadding = ImVec2(5.0f, 5.0f);
-                if (ImGui::BeginCombo("##label1", g_Options.weapons.value->arr[selectedwep].name))
-                {
-                    ImGui::PushFont(ifontmini);
-                    style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                    for (int n = 0; n < g_Options.weapons.value->weaponzcount; n++)
-                    {
-                        g_Options.weapons.value->arr[n].isSelected = (selectedwep == n);
-                        if (ImGui::Selectable(g_Options.weapons.value->arr[n].name, g_Options.weapons.value->arr[n].isSelected, 0, ImVec2(0, 0), false))
-                            selectedwep = n;
-                        if (g_Options.weapons.value->arr[n].isSelected)
-                            ImGui::SetItemDefaultFocus();
-                    }
-
-                    style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                    ImGui::PushFont(ifont);
-                    ImGui::EndCombo();
-                }
-                style->WindowPadding = ImVec2(20.f, 20.0f);
-                ImGui::SameLine();
-
-                ImGui::Checkbox("Active##S1", &g_Options.weapons.value->arr[selectedwep].active);
-
-                ImGui::SameLine();
-                if (ImGui::Button("Update", ImVec2(70, 22))) {
-                    CreateThread(nullptr, 0, (LPTHREAD_START_ROUTINE)RefreshThread, &g_Options.weapons.value->arr[selectedwep].skinid, 0, 0);
-                }
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 10.0f);
-
-                DisableElements(g_Options.weapons.value->arr[selectedwep].active, 1);
-
-                ImGui::Columns(2, nullptr, false);
-
-                style->WindowPadding = ImVec2(5.0f, 5.0f);
-                ImGui::PushItemWidth(252.0f);
-                if (ImGui::BeginCombo("Paint kit ID", opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].Preview.c_str()))
-                {
-                    ImGui::PushFont(ifontmini);
-                    style->ItemSpacing = ImVec2(7.0f, 2.0f);
-
-                    for (int n = 0; n < opt.sc_skins.size(); n++)
-                    {
-                        opt.sc_skins[n].isSelected = (g_Options.weapons.value->arr[selectedwep].skinidc == n);
-                        if (ImGui::Selectable(opt.sc_skins[n].Preview.c_str(), opt.sc_skins[n].isSelected, 0, ImVec2(0, 0), false))
-                        {
-                            g_Options.weapons.value->arr[selectedwep].skinidc = n;
-                            g_Options.weapons.value->arr[selectedwep].skinid = opt.sc_skins[n].id;
-
-
-                            g_Options.weapons.value->arr[selectedwep].rarity = opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].rarity;
-                            g_Options.weapons.value->arr[selectedwep].pearl = opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].pearl;
-                            g_Options.weapons.value->arr[selectedwep].color1 = opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color1;
-                            g_Options.weapons.value->arr[selectedwep].color2 = opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color2;
-                            g_Options.weapons.value->arr[selectedwep].color3 = opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color3;
-                            g_Options.weapons.value->arr[selectedwep].color4 = opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color4;
-                        }
-
-                        if (opt.sc_skins[n].isSelected)
-                            ImGui::SetItemDefaultFocus();
-
-                    }
-
-                    style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                    ImGui::PushFont(ifont);
-
-                    ImGui::EndCombo();
-                }
-                style->WindowPadding = ImVec2(20.f, 20.0f);
-                ImGui::PopItemWidth();
-
-
-
-                if (ImGui::BeginTable("##table1", 2))
-                {
-                    ImGui::TableNextRow();
-
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-
-                    ImGui::InputInt("Seed", &g_Options.weapons.value->arr[selectedwep].seed, 0);
-                    ImGui::InputInt("StatTrak(tm)", &g_Options.weapons.value->arr[selectedwep].stattrak, 0);
-                    style->WindowPadding = ImVec2(5.0f, 5.0f);
-                    if (ImGui::BeginCombo("Quality", qualities[g_Options.weapons.value->arr[selectedwep].qualityc].name.c_str()))
-                    {
-                        ImGui::PushFont(ifontmini);
-                        style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                        for (int n = 0; n < qualities.size(); n++)
-                        {
-                            qualities[n].isSelected = (g_Options.weapons.value->arr[selectedwep].quality == qualities[n].defindex);
-                            if (ImGui::Selectable(qualities[n].name.c_str(), qualities[n].isSelected, 0, ImVec2(0, 0), false))
-                            {
-                                g_Options.weapons.value->arr[selectedwep].qualityc = n;
-                                g_Options.weapons.value->arr[selectedwep].quality = qualities[n].defindex;
-                            }
-
-                            if (qualities[n].isSelected)
-                            {
-                                ImGui::SetItemDefaultFocus();
-                            }
-                        }
-                        style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                        ImGui::PushFont(ifont);
-                        ImGui::EndCombo();
-                    }
-                    style->WindowPadding = ImVec2(20.f, 20.0f);
-
-
-                    ImGui::TableNextColumn();
-
-                    float thisy = ImGui::GetCursorPosY();
-                    ImGui::SetCursorPosY(thisy - 20.0f);
-                    ImGui::Text("Custom colors");
-                    ImGui::SetCursorPosY(thisy);
-
-                    float3 color1 = colorConverter(opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color1);
-                    if (ImGui::ColorEdit3("##Custom colors", (float*)&color1, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf))
-                    {
-                        int color1int = 0xFF000000 + ((int)(color1.b * 255) << 16) | ((int)(color1.g * 255) << 8) | (int)(color1.r * 255);
-                        opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color1 = color1int;
-                        CPaintKit* pk = (CPaintKit*)opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].link;
-                        pk->color1 = color1int;
-                        g_Options.weapons.value->arr[selectedwep].color1 = color1int;
-                    }
-                    ImGui::SameLine();
-                    float3 color2 = colorConverter(opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color2);
-                    if (ImGui::ColorEdit3("##Color2", (float*)&color2, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf))
-                    {
-                        int color2int = 0xFF000000 + ((int)(color2.b * 255) << 16) | ((int)(color2.g * 255) << 8) | (int)(color2.r * 255);
-                        opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color2 = color2int;
-                        CPaintKit* pk = (CPaintKit*)opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].link;
-                        pk->color2 = color2int;
-                        g_Options.weapons.value->arr[selectedwep].color2 = color2int;
-                    }
-                    ImGui::SameLine();
-                    float3 color3 = colorConverter(opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color3);
-                    if (ImGui::ColorEdit3("##Color3", (float*)&color3, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf))
-                    {
-                        int color3int = 0xFF000000 + ((int)(color3.b * 255) << 16) | ((int)(color3.g * 255) << 8) | (int)(color3.r * 255);
-                        opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color3 = color3int;
-                        CPaintKit* pk = (CPaintKit*)opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].link;
-                        pk->color3 = color3int;
-                        g_Options.weapons.value->arr[selectedwep].color3 = color3int;
-                    }
-                    ImGui::SameLine();
-                    float3 color4 = colorConverter(opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color4);
-                    if (ImGui::ColorEdit3("##Color4", (float*)&color4, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf))
-                    {
-                        int color4int = 0xFF000000 + ((int)(color4.b * 255) << 16) | ((int)(color4.g * 255) << 8) | (int)(color4.r * 255);
-                        opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].color4 = color4int;
-                        CPaintKit* pk = (CPaintKit*)opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].link;
-                        pk->color4 = color4int;
-                        g_Options.weapons.value->arr[selectedwep].color4 = color4int;
-                    }
-                    ImGui::Checkbox("Freeze count", &g_Options.weapons.value->arr[selectedwep].ownerunk);
-                    style->WindowPadding = ImVec2(5.0f, 5.0f);
-                    if (ImGui::BeginCombo("Rarity", rarities[opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].rarity].name.c_str()))
-                    {
-                        ImGui::PushFont(ifontmini);
-                        style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                        for (int n = 0; n < rarities.size(); n++)
-                        {
-                            rarities[n].isSelected = (opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].rarity == rarities[n].defindex);
-                            if (ImGui::Selectable(rarities[n].name.c_str(), rarities[n].isSelected, 0, ImVec2(0, 0), false))
-                            {
-                                opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].rarity = rarities[n].defindex;
-                                CPaintKit* pk = (CPaintKit*)opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].link;
-                                pk->rarity = rarities[n].defindex;
-                                g_Options.weapons.value->arr[selectedwep].rarity = rarities[n].defindex;
-                            }
-
-                            if (rarities[n].isSelected)
-                                ImGui::SetItemDefaultFocus();
-                        }
-                        style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                        ImGui::PushFont(ifont);
-                        ImGui::EndCombo();
-                    }
-                    style->WindowPadding = ImVec2(20.f, 20.0f);
-
-
-
-                    ImGui::EndTable();
-
-                }
-
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 5.0f);
-
-                ImGui::PushItemWidth(252.0f);
-                ImGui::SliderFloat("Wear", &g_Options.weapons.value->arr[selectedwep].wear, 0.0f, 1.0f);
-                if (ImGui::SliderFloat("Pearlescent", &opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].pearl, 0.0f, 255.0f))
-                {
-                    CPaintKit* pk = (CPaintKit*)opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].link;
-                    pk->pearlescent = opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].pearl;
-                    g_Options.weapons.value->arr[selectedwep].pearl = opt.sc_skins[g_Options.weapons.value->arr[selectedwep].skinidc].pearl;
-                }
-                ImGui::PopItemWidth();
-
-
-                if (ImGui::BeginTable("##table3", 2))
-                {
-                    ImGui::TableNextRow();
-
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-
-                    style->WindowPadding = ImVec2(5.0f, 5.0f);
-
-                    bool disabledDefIndex = (selectedwep > 5) && (selectedwep < (g_Options.weapons.value->weaponzcount - 1)) ? false : true;
-                    bool disabledKFIcon = ((selectedwep > 0) && (selectedwep < 6)) || (selectedwep == g_Options.weapons.value->weaponzcount - 1) ? false : true;
-
-                    DisableElements(disabledDefIndex, 1);
-
-
-                    if (selectedwep == 0) {
-                        if (ImGui::BeginCombo("Definition", knives[g_Options.weapons.value->arr[selectedwep].modelcount].Preview.c_str()))
-                        {
-                            ImGui::PushFont(ifontmini);
-                            style->ItemSpacing = ImVec2(7.0f, 2.0f);
-
-                            for (int n = 0; n < knives.size(); n++)
-                            {
-                                knives[n].isSelected = (g_Options.weapons.value->arr[selectedwep].modelcount == n);
-                                if (ImGui::Selectable(knives[n].Preview.c_str(), knives[n].isSelected, 0, ImVec2(0, 0), false))
-                                {
-                                    g_Options.weapons.value->arr[selectedwep].modelcount = n;
-                                    g_Options.weapons.value->arr[selectedwep].modeldefindex = knives[n].defindex;
-                                    strcpy(g_Options.weapons.value->arr[selectedwep].model, knives[n].viewmodel.c_str());
-                                    strcpy(g_Options.weapons.value->arr[selectedwep].worldmodel, knives[n].worldmodel.c_str());
-
-                                }
-
-                                if (knives[n].isSelected)
-                                    ImGui::SetItemDefaultFocus();
-                            }
-
-                            style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                            ImGui::PushFont(ifont);
-                            ImGui::EndCombo();
-                        }
-                    }
-                    else if (selectedwep == 1)
-                    {
-                        if (ImGui::BeginCombo("Definition", gloves[g_Options.weapons.value->arr[selectedwep].modelcount].Preview.c_str()))
-                        {
-                            ImGui::PushFont(ifontmini);
-                            style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                            for (int n = 0; n < gloves.size(); n++)
-                            {
-                                gloves[n].isSelected = (g_Options.weapons.value->arr[selectedwep].modelcount == n);
-                                if (ImGui::Selectable(gloves[n].Preview.c_str(), gloves[n].isSelected, 0, ImVec2(0, 0), false))
-                                {
-                                    g_Options.weapons.value->arr[selectedwep].modelcount = n;
-                                    g_Options.weapons.value->arr[selectedwep].modeldefindex = gloves[n].defindex;
-                                    strcpy(g_Options.weapons.value->arr[selectedwep].model, gloves[n].viewmodel.c_str());
-                                    strcpy(g_Options.weapons.value->arr[selectedwep].worldmodel, gloves[n].worldmodel.c_str());
-                                }
-                                if (gloves[n].isSelected)
-                                    ImGui::SetItemDefaultFocus();
-                            }
-                            style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                            ImGui::PushFont(ifont);
-                            ImGui::EndCombo();
-                        }
-                    }
-                    else if (selectedwep == 2 || selectedwep == 3)
-                    {
-                        if (ImGui::BeginCombo("Definition", agents[g_Options.weapons.value->arr[selectedwep].modelcount].Preview.c_str()))
-                        {
-                            ImGui::PushFont(ifontmini);
-                            style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                            for (int n = 0; n < agents.size(); n++)
-                            {
-                                agents[n].isSelected = (g_Options.weapons.value->arr[selectedwep].modelcount == n);
-                                if (ImGui::Selectable(agents[n].Preview.c_str(), agents[n].isSelected, 0, ImVec2(0, 0), false))
-                                {
-                                    g_Options.weapons.value->arr[selectedwep].modelcount = n;
-                                    g_Options.weapons.value->arr[selectedwep].modeldefindex = agents[n].defindex;
-                                    strcpy(g_Options.weapons.value->arr[selectedwep].model, agents[n].viewmodel.c_str());
-
-                                }
-                                if (agents[n].isSelected)
-                                    ImGui::SetItemDefaultFocus();
-                            }
-                            style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                            ImGui::PushFont(ifont);
-                            ImGui::EndCombo();
-                        }
-                    }
-
-                    else if (selectedwep == 4)
-                    {
-                        if (ImGui::BeginCombo("Definition", medals[g_Options.weapons.value->arr[selectedwep].modelcount].Preview.c_str()))
-                        {
-                            ImGui::PushFont(ifontmini);
-                            style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                            for (int n = 0; n < medals.size(); n++)
-                            {
-                                medals[n].isSelected = (g_Options.weapons.value->arr[selectedwep].modelcount == n);
-                                if (ImGui::Selectable(medals[n].Preview.c_str(), medals[n].isSelected, 0, ImVec2(0, 0), false))
-                                {
-                                    g_Options.weapons.value->arr[selectedwep].modelcount = n;
-                                    g_Options.weapons.value->arr[selectedwep].modeldefindex = medals[n].defindex;
-                                }
-                                if (medals[n].isSelected)
-                                    ImGui::SetItemDefaultFocus();
-                            }
-                            style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                            ImGui::PushFont(ifont);
-                            ImGui::EndCombo();
-                        }
-                    }
-                    else if (selectedwep == 5)
-                    {
-                        if (ImGui::BeginCombo("Definition", musickits[g_Options.weapons.value->arr[selectedwep].modelcount].Preview.c_str()))
-                        {
-                            ImGui::PushFont(ifontmini);
-                            style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                            for (int n = 0; n < musickits.size(); n++)
-                            {
-                                musickits[n].isSelected = (g_Options.weapons.value->arr[selectedwep].modelcount == n);
-                                if (ImGui::Selectable(musickits[n].Preview.c_str(), musickits[n].isSelected, 0, ImVec2(0, 0), false))
-                                {
-                                    g_Options.weapons.value->arr[selectedwep].modelcount = n;
-                                    g_Options.weapons.value->arr[selectedwep].modeldefindex = musickits[n].defindex;
-
-                                }
-                                if (musickits[n].isSelected)
-                                    ImGui::SetItemDefaultFocus();
-                            }
-                            style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                            ImGui::PushFont(ifont);
-                            ImGui::EndCombo();
-                        }
-                    }
-                    else if (selectedwep == (g_Options.weapons.value->weaponzcount - 1))
-                    {
-                        if (ImGui::InputInt("Definition", &g_Options.weapons.value->arr[selectedwep].defindex, 0, 0))
-                            g_Options.weapons.value->arr[selectedwep].modeldefindex = g_Options.weapons.value->arr[selectedwep].defindex;
-                    }
-                    else
-                    {
-                        ImGui::BeginCombo("Definition", "Disabled");
-                        ImGui::EndCombo;
-                    }
-
-                    style->WindowPadding = ImVec2(20.f, 20.0f);
-
-                    DisableElements(disabledDefIndex, 0);
-
-
-                    ImGui::TableNextColumn();
-
-
-                    DisableElements(disabledKFIcon, 1);
-
-
-
-                    style->WindowPadding = ImVec2(5.0f, 5.0f);
-                    if (ImGui::BeginCombo("Killfeed icon", g_Options.weapons.value->arr[selectedwep].killfeediconreplace))
-                    {
-                        ImGui::PushFont(ifontmini);
-                        style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                        for (int n = 0; n < opt.killfeedicons.size(); n++)
-                        {
-                            if (ImGui::Selectable(opt.killfeedicons[n].c_str(), false, 0, ImVec2(0, 0), false))
-                            {
-                                strcpy(g_Options.weapons.value->arr[selectedwep].killfeediconreplace, opt.killfeedicons[n].c_str());
-                                if (n > 0)
-                                    g_Options.weapons.value->arr[selectedwep].killfeediconactive = 1;
-                                else
-                                    g_Options.weapons.value->arr[selectedwep].killfeediconactive = 0;
-                            }
-                        }
-                        style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                        ImGui::PushFont(ifont);
-                        ImGui::EndCombo();
-                    }
-                    style->WindowPadding = ImVec2(20.f, 20.0f);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                    DisableElements(disabledKFIcon, 0);
-
-                    ImGui::EndTable();
-                }
-
-
-                ImGui::NextColumn();
-
-
-                static int stickerselected = 0;
-                style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                if (ImGui::BeginListBox("Stickers##lb", ImVec2(251.0f, 5 * ImGui::GetTextLineHeightWithSpacing())))
-                {
-                    ImGui::PushFont(ifontmini);
-                    for (int n = 0; n < 5; n++)
-                    {
-                        g_Options.weapons.value->arr[selectedwep].stickers[n].isselected = (stickerselected == n);
-                        if (ImGui::Selectable(g_Options.weapons.value->arr[selectedwep].stickers[n].name,
-                            g_Options.weapons.value->arr[selectedwep].stickers[n].isselected, 0, ImVec2(0, 0), true)) {
-                            stickerselected = n;
-                        }
-
-                        if (g_Options.weapons.value->arr[selectedwep].stickers[n].isselected)
-                            ImGui::SetItemDefaultFocus();
-                    }
-                    ImGui::PushFont(ifont);
-                    ImGui::EndListBox();
-                }
-                style->ItemSpacing = ImVec2(7.0f, 15.0f);
-
-                ImGui::InvisibleButton("##invisfuckyou", ImVec2(0, 10.0f));
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 5.0f);
-
-                style->WindowPadding = ImVec2(5.0f, 5.0f);
-                ImGui::PushItemWidth(252.0f);
-
-                if (ImGui::BeginCombo("Sticker ID", opt.sc_stickers[g_Options.weapons.value->arr[selectedwep].stickers[stickerselected].stickerc].Preview.c_str()))
-                {
-                    ImGui::PushFont(ifontmini);
-                    style->ItemSpacing = ImVec2(7.0f, 2.0f);
-
-                    for (int n = 0; n < opt.sc_stickers.size(); n++)
-                    {
-                        opt.sc_stickers[n].isSelected = (g_Options.weapons.value->arr[selectedwep].stickers[stickerselected].stickerc == n);
-                        if (ImGui::Selectable(opt.sc_stickers[n].Preview.c_str(), opt.sc_stickers[n].isSelected, 0, ImVec2(0, 0), false))
-                        {
-                            g_Options.weapons.value->arr[selectedwep].stickers[stickerselected].stickerc = n;
-                            g_Options.weapons.value->arr[selectedwep].stickers[stickerselected].stickerid = opt.sc_stickers[n].id;
-
-                            char newname[64] = "(";
-                            strcat_s(newname, to_string(stickerselected).c_str());
-                            strcat_s(newname, ") ");
-                            strcat_s(newname, opt.sc_stickers[g_Options.weapons.value->arr[selectedwep].stickers[stickerselected].stickerc].Name.c_str());
-
-                            strcpy(g_Options.weapons.value->arr[selectedwep].stickers[stickerselected].name,
-                                newname);
-                        }
-                        if (opt.sc_stickers[n].isSelected)
-                            ImGui::SetItemDefaultFocus();
-
-                    }
-                    style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                    ImGui::PushFont(ifont);
-
-                    ImGui::EndCombo();
-                }
-                style->WindowPadding = ImVec2(20.f, 20.0f);
-                ImGui::PopItemWidth();
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 7.0f);
-
-
-                ImGui::PushItemWidth(252.0f);
-                ImGui::SliderFloat("Wear##st", &g_Options.weapons.value->arr[selectedwep].stickers[stickerselected].wear, 0, 1.0f);
-                ImGui::SliderFloat("Scale##st", &g_Options.weapons.value->arr[selectedwep].stickers[stickerselected].scale, 2.0f, 0.0f);
-                ImGui::SliderFloat("Rotation##st", &g_Options.weapons.value->arr[selectedwep].stickers[stickerselected].rotation, 0, 360.0f);
-                ImGui::PopItemWidth();
-
-                if (ImGui::BeginTable("##table5", 2))
-                {
-                    ImGui::TableNextRow();
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-                    ImGui::InputText("Name tag", g_Options.weapons.value->arr[selectedwep].nametag, 32);
-                    ImGui::TableNextColumn();
-                    ImGui::InputText("Desc tag", g_Options.weapons.value->arr[selectedwep].desctag, 32);
-
-                    ImGui::EndTable();
-                }
-
-                ImGui::Columns(1, nullptr, false);
-
-                DisableElements(g_Options.weapons.value->arr[selectedwep].active, 0);
-
-                ImGui::EndChild();
-            }
-
-            ImGui::EndTabItem();
-        }
-
-        if (ImGui::BeginTabItem("Profile"))
-        {
-            style->ChildBorderSize = 0; style->WindowPadding = ImVec2(20.0f, 5.0f);
-            if (ImGui::BeginChild("ChildTab", ImVec2(665, 350), true, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysUseWindowPadding)) {
-                style->ChildBorderSize = 1; style->WindowPadding = ImVec2(20.0f, 20.0f);
-
-
-                if (ImGui::BeginTable("##tablexz", 4))
-                {
-                    ImGui::TableNextRow(); ImGui::TableNextRow();
-
-                    ImGui::TableNextRow(); ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-                    ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 20.0f);
-                    ImGui::TextInputComboBox("Name", g_Options.playername.value->mystring, 1024, opt.names, 0);
-                    ImGui::InputText("Clan tag", g_Options.playerclan.value->mystring, 1024);
-
-                    DisableElements(*g_Options.discmsg_active, 1);
-                    ImGui::InputText("Disconnect msg", g_Options.discmsg.value->mystring, 1024);
-                    DisableElements(*g_Options.discmsg_active, 0);
-
-                    ImGui::TableNextColumn();
-                    if (ImGui::Button("Apply##name", ImVec2(70, 22)))
-                    {
-                        ConVar* nameConvar = iff.g_pCVar->FindVar("name");
-                        *(int*)((DWORD)&nameConvar->m_fnChangeCallbacks + 0xC) = 0;
-                        nameConvar->SetValue(MakeControlChars(g_Options.playername.value->mystring));
-                    }
-
-                    if (ImGui::Button("Apply##clan", ImVec2(70, 22)))
-                    {
-                        char* newclan = MakeControlChars(g_Options.playerclan.value->mystring);
-                        static auto fnClantagChanged = (int(__fastcall*)(const char*, const char*))FindPatternV2("engine.dll", "53 56 57 8B DA 8B F9 FF 15");
-                        fnClantagChanged(newclan, newclan);
-                    }
-
-                    ImGui::Checkbox("Active##discmsg", g_Options.discmsg_active);
-
-                    ImGui::TableNextColumn();
-
-                    ImGui::Checkbox("Set score", g_Options.fakescore);
-
-
-                    DisableElements(g_Options.fakescore, 1);
-
-                    ImGui::InputInt("Score", g_Options.score, 0);
-                    ImGui::InputInt("MVPs", g_Options.MVPs, 0);
-
-                    ImGui::TableNextColumn();
-
-                    ImGui::InputInt("Kills", g_Options.kills, 0);
-                    ImGui::InputInt("Assists", g_Options.assists, 0);
-                    ImGui::InputInt("Deaths", g_Options.deaths, 0);
-
-                    DisableElements(g_Options.fakescore, 0);
-
-                    ImGui::EndTable();
-                }
-
-
-
-                ImGui::Separator();
-
-
-                if (ImGui::BeginTable("##tablexz", 4))
-                {
-                    ImGui::TableNextRow();
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-                    ImGui::Checkbox("Set MM info", g_Options.profile_active);
-                    ImGui::TableNextColumn();
-                    if (ImGui::Button("Update##ranks", ImVec2(70, 22)))
-                    {
-                        g_Options.rankz.value->selectedrank = 2;
-                        ProtoFeatures.SendMatchmakingClient2GCHello();
-                        ProtoFeatures.SendClientGcRankUpdate();
-                    }
-                    ImGui::EndTable();
-                }
-
-                DisableElements(g_Options.profile_active, 1);
-
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 10.0f);
-
-                if (ImGui::BeginTable("##tablexz", 4))
-                {
-                    ImGui::TableNextRow();
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-
-                    static int selectedrank_this = 0;
-                    style->WindowPadding = ImVec2(5.0f, 5.0f);
-                    if (ImGui::BeginCombo("Rank Type", g_Options.rankz.value->arr[selectedrank_this].Name))
-                    {
-                        ImGui::PushFont(ifontmini);
-                        style->ItemSpacing = ImVec2(7.0f, 2.0f);
-                        for (int n = 0; n < 3; n++)
-                        {
-                            if (ImGui::Selectable(g_Options.rankz.value->arr[n].Name, g_Options.rankz.value->arr[n].isselected, 0, ImVec2(0, 0), false))
-                                selectedrank_this = n;
-
-                            if (g_Options.rankz.value->arr[n].isselected)
-                                ImGui::SetItemDefaultFocus();
-                        }
-                        style->ItemSpacing = ImVec2(7.0f, 15.0f);
-                        ImGui::PushFont(ifont);
-                        ImGui::EndCombo();
-                    }
-                    style->WindowPadding = ImVec2(20.f, 20.0f);
-
-                    ImGui::InputInt("Rank", &g_Options.rankz.value->arr[selectedrank_this].rank, 0);
-                    ImGui::InputInt("Wins", &g_Options.rankz.value->arr[selectedrank_this].wins, 0);
-
-                    ImGui::TableNextColumn();
-
-                    DisableElements(0, 1);
-                    if (ImGui::Checkbox("Prime (unavailable)", g_Options.prime))
-                    {
-                        if (g_Options.prime)
-                        {
-                            DWORD old_protect;
-                            VirtualProtect(iff.prime, 5, PAGE_EXECUTE_READWRITE, &old_protect);
-                            char patch[] = { 0x31, 0xC0, 0xFE, 0xC0, 0xC3 };
-                            memcpy(iff.prime, patch, 5);
-                            VirtualProtect(iff.prime, 5, old_protect, nullptr);
-                        }
-                        else
-                        {
-                            DWORD old_protect;
-                            VirtualProtect(iff.prime, 5, PAGE_EXECUTE_READWRITE, &old_protect);
-                            memcpy(iff.prime, iff.oldprime, 5);
-                            VirtualProtect(iff.prime, 5, old_protect, nullptr);
-                        }
-                    }
-                    DisableElements(0, 0);
-
-                    ImGui::InputInt("level", g_Options.level, 0);
-                    ImGui::InputInt("XP", g_Options.xp, 0);
-
-                    ImGui::TableNextColumn();
-
-                    ImGui::InputInt("Leader", g_Options.comleader, 0);
-                    ImGui::InputInt("Teacher", g_Options.comteacher, 0);
-                    ImGui::InputInt("Friendly", g_Options.comfriendly, 0);
-
-                    ImGui::TableNextColumn();
-
-                    ImGui::Checkbox("VAC ban", g_Options.vacban);
-                    ImGui::InputInt("Ban reason", g_Options.banreason, 0);
-                    ImGui::InputInt("Ban duration", g_Options.banduration, 0);
-
-                    DisableElements(g_Options.profile_active, 0);
-                    ImGui::EndTable();
-                }
-
-
-                ImGui::EndChild();
-            }
-
-            ImGui::EndTabItem();
-
-        }
-
-        if (ImGui::BeginTabItem("About"))
-        {
-            static ImVec4 colwhite = { 0.8f, 0.8f, 0.8f, 1.0f };
-
-            style->ChildBorderSize = 0; style->WindowPadding = ImVec2(20.0f, 5.0f);
-            if (ImGui::BeginChild("ChildTab", ImVec2(665, 350), true, ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysUseWindowPadding)) {
-                style->ChildBorderSize = 1; style->WindowPadding = ImVec2(20.0f, 20.0f);
-
-                ImGui::Columns(2, nullptr, false);
-
-                ImGui::TextColored(colwhite, XorStr("Seaside"));
-                ImGui::Text(XorStr("Build 21/06/16"));
-                ImGui::InvisibleButton("##inv", ImVec2(0, 0));
-                ImGui::TextColored(colwhite, XorStr("Developer"));
-                ImGui::Text(XorStr("0TheSpy"));
-                ImGui::InvisibleButton("##inv", ImVec2(0, 0));
-                ImGui::TextColored(colwhite, XorStr("Check for updates"));
-                ImGui::Text(XorStr("unknowncheats.me"));
-
-
-                ImGui::NextColumn();
-
-                if (ImGui::BeginTable("##tablexz", 2))
-                {
-                    ImGui::TableNextRow();
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-
-                    if (ImGui::Button("Save", ImVec2(70, 22)))
-                        Config::Get().Save();
-
-                    if (ImGui::Checkbox("Load config on startup", &opt.autoload))
-                    {
-                        if (opt.autoload)
-                        {
-                            ofstream autoload;
-                            autoload.open("seaside_autoload");
-                            autoload.close();
-                        }
-                        else
-                        {
-                            if (remove("seaside_autoload") != 0)
-                                perror("Error deleting file");
-                            else
-                                puts("File successfully deleted");
-                        }
-                    }
-
-                    ImGui::TableNextColumn();
-
-                    if (ImGui::Button("Load", ImVec2(70, 22)))
-                        Config::Get().Load();
-
-                    if (ImGui::Button("Unhook", ImVec2(70, 22)))
-                        opt.unhook = true;
-
-                    ImGui::EndTable();
-                }
-                ImGui::Columns(1, nullptr, false);
-
-                ImGui::InvisibleButton("##inv", ImVec2(0, 30.0f));
-                ImGui::TextColored(colwhite, "                      Author does not take any responsibility for bans caused by this software");
-                ImGui::TextColored(colwhite, "                                         Please use VAC Bypass for better protection");
-
-                ImGui::EndChild();
-            }
-
-
-            ImGui::EndTabItem();
-        }
-
-        ImGui::EndTabBar();
-
-
-        ImGui::End();
-
-        ImGui::EndFrame();
-        ImGui::Render();
-        ImGui_ImplDX9_RenderDrawData(ImGui::GetDrawData());
-    }
-
-
-
-    if (*g_Options.hitmarker && iff.g_pEngineClient->IsInGame()) {
-        iff.g_pDebugOverlay->ClearAllOverlays();
-        for (int i = 0; i < bulletdata.size(); i++) {
-            Vector pos = bulletdata[i].pos;
-            float delta = bulletdata[i].time - bulletdata[i].curtime;
-            pos.z += delta * 35;
-            int alpha = 255;
-            if (bulletdata[i].time >= bulletdata[i].curtime + 0.70f)
-                alpha = int(850.0f * (-(delta - 1.0f)));
-            if (alpha < 0) alpha = 0;
-            if (!bulletdata[i].hs)
-                iff.g_pDebugOverlay->AddTextOverlayRGB(pos, 0, 0.09, 255, 50, 50, alpha, std::to_string(bulletdata[i].dmg).c_str());
-            else
-                iff.g_pDebugOverlay->AddTextOverlayRGB(pos, 0, 0.09, 0, 255, 0, alpha, std::to_string(bulletdata[i].dmg).c_str());
-            if (delta >= 1.000f)
-                bulletdata.erase(bulletdata.begin() + i);
-            bulletdata[i].time += iff.g_pGlobals->curtime - bulletdata[i].time;
-        }
-    }
-
-
-
-
-    return oEndScene(pDevice);
-}
diff --git a/SpyCustom/MenuItem.h b/SpyCustom/MenuItem.h
deleted file mode 100644
index aef2cbb..0000000
--- a/SpyCustom/MenuItem.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef MENUITEM_H
-#define MENUITEM_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "Button.h"
-#include "Menu.h"
-
-namespace vgui
-{
-
-	class IBorder;
-	class TextImage;
-	class Menu;
-	class Image;
-
-	class MenuItem : public Button
-	{
-		DECLARE_CLASS_SIMPLE(MenuItem, Button);
-
-	public:
-		MenuItem(Menu* parent, const char* panelName, const char* text, Menu* cascadeMenu = NULL, bool checkable = false);
-		MenuItem(Menu* parent, const char* panelName, const wchar_t* wszText, Menu* cascadeMenu = NULL, bool checkable = false);
-		~MenuItem();
-
-		virtual void Paint();
-
-		virtual void FireActionSignal();
-
-		virtual bool CanBeDefaultButton(void);
-
-		void OnCursorEntered();
-		void OnCursorExited();
-
-		void CloseCascadeMenu();
-
-		MESSAGE_FUNC(OnKillFocus, "MenuClose");
-
-		bool HasMenu();
-
-		void SetTextImageSize(int wide, int tall);
-
-		void GetTextImageSize(int& wide, int& tall);
-
-		void GetArrowImageSize(int& wide, int& tall);
-
-		void GetCheckImageSize(int& wide, int& tall);
-
-		Menu* GetMenu();
-
-		virtual void PerformLayout();
-
-		void OnCursorMoved(int x, int y);
-
-		MESSAGE_FUNC(ArmItem, "ArmItem");
-		MESSAGE_FUNC(DisarmItem, "DisarmItem");
-
-		bool IsItemArmed();
-
-		void OpenCascadeMenu();
-
-		bool IsCheckable();
-		bool IsChecked();
-
-		void SetChecked(bool state);
-
-		KeyValues* GetUserData();
-		void SetUserData(const KeyValues* kv);
-
-		int GetActiveItem() { if (m_pCascadeMenu) { return m_pCascadeMenu->GetActiveItem(); } else { return 0; } }
-
-		Menu* GetParentMenu();
-
-		void SetCurrentKeyBinding(char const* keyName);
-
-		virtual void GetContentSize(int& cw, int& ch);
-
-	protected:
-		void OnKeyCodeReleased(KeyCode code);
-		void OnMenuClose();
-		MESSAGE_FUNC(OnKeyModeSet, "KeyModeSet");
-
-		virtual void Init(void);
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-		virtual IBorder* GetBorder(bool depressed, bool armed, bool selected, bool keyfocus);
-
-	private:
-		enum { CHECK_INSET = 6 };
-		Menu* m_pCascadeMenu;           
-		bool m_bCheckable;                      
-		bool m_bChecked;             
-		TextImage* m_pCascadeArrow;              
-		Image* m_pCheck;             
-		TextImage* m_pBlankCheck;                
-
-		TextImage* m_pCurrentKeyBinding;             
-
-		KeyValues* m_pUserData;
-
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/MessageMap.h b/SpyCustom/MessageMap.h
deleted file mode 100644
index 9555f56..0000000
--- a/SpyCustom/MessageMap.h
+++ /dev/null
@@ -1,327 +0,0 @@
-#ifndef MESSAGEMAP_H
-#define MESSAGEMAP_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dmxelement.h"
-
-#pragma pointers_to_members( full_generality, virtual_inheritance )
-
-namespace vgui
-{
-
-
-#ifndef ARRAYSIZE
-#define ARRAYSIZE(p)	(sizeof(p)/sizeof(p[0]))
-#endif
-
-
-	enum DataType_t
-	{
-		DATATYPE_VOID,
-		DATATYPE_CONSTCHARPTR,
-		DATATYPE_INT,
-		DATATYPE_FLOAT,
-		DATATYPE_PTR,
-		DATATYPE_BOOL,
-		DATATYPE_KEYVALUES,
-		DATATYPE_CONSTWCHARPTR,
-		DATATYPE_UINT64,
-		DATATYPE_HANDLE,      
-	};
-
-	class Panel;
-	typedef uintp VPANEL;
-
-	typedef void (Panel::* MessageFunc_t)(void);
-
-#pragma warning(disable:4121)
-	struct MessageMapItem_t
-	{
-		const char* name;
-		ALIGN16 MessageFunc_t func;
-
-		int numParams;
-
-		DataType_t firstParamType;
-		const char* firstParamName;
-
-		DataType_t secondParamType;
-		const char* secondParamName;
-
-		int nameSymbol;
-		int firstParamSymbol;
-		int secondParamSymbol;
-	};
-
-#define DECLARE_PANELMESSAGEMAP( className )												\
-	static void AddToMap( char const *scriptname, vgui::MessageFunc_t function, int paramCount, int p1type, const char *p1name, int p2type, const char *p2name ) 	\
-	{																					\
-		vgui::PanelMessageMap *map = vgui::FindOrAddPanelMessageMap( GetPanelClassName() );			\
-																						\
-		vgui::MessageMapItem_t entry;															\
-		entry.name = scriptname;														\
-		entry.func = function;															\
-		entry.numParams = paramCount;													\
-		entry.firstParamType = (vgui::DataType_t)p1type;								\
-		entry.firstParamName = p1name;													\
-		entry.secondParamType = (vgui::DataType_t)p2type;								\
-		entry.secondParamName = p2name;													\
-		entry.nameSymbol = 0;															\
-		entry.firstParamSymbol = 0;														\
-		entry.secondParamSymbol = 0;													\
-																						\
-		map->entries.AddToTail( entry );												\
-	}																					\
-																						\
-	static void ChainToMap( void )														\
-	{																					\
-		static bool chained = false;													\
-		if ( chained )																	\
-			return;																		\
-		chained = true;																	\
-		vgui::PanelMessageMap *map = vgui::FindOrAddPanelMessageMap( GetPanelClassName() );			\
-		map->pfnClassName = &GetPanelClassName;											\
-		if ( map && GetPanelBaseClassName() && GetPanelBaseClassName()[0] )				\
-		{																				\
-			map->baseMap = vgui::FindOrAddPanelMessageMap( GetPanelBaseClassName() );			\
-		}																				\
-	}																					\
-																						\
-	class className##_RegisterMap;															\
-	friend class className##_RegisterMap;													\
-	class className##_RegisterMap															\
-	{																					\
-	public:																				\
-		className##_RegisterMap()															\
-		{																				\
-			className::ChainToMap();													\
-		}																				\
-	};																					\
-	className##_RegisterMap m_RegisterClass;												\
-																						\
-	virtual vgui::PanelMessageMap *GetMessageMap()											\
-	{																					\
-		static vgui::PanelMessageMap *s_pMap = vgui::FindOrAddPanelMessageMap( GetPanelClassName() );	\
-		return s_pMap;																	\
-	}
-
-#define VGUI_USEKEYBINDINGMAPS	1
-
-#if defined( VGUI_USEKEYBINDINGMAPS )
-
-#define DECLARE_CLASS_SIMPLE( className, baseClassName ) \
-	typedef baseClassName BaseClass; \
-	typedef className ThisClass;	\
-public:								\
-	DECLARE_PANELMESSAGEMAP( className ); \
-	DECLARE_PANELANIMATION( className ); \
-	DECLARE_KEYBINDINGMAP( className ); \
-	static char const *GetPanelClassName() { return #className; } \
-	static char const *GetPanelBaseClassName() { return #baseClassName; }
-
-#define DECLARE_CLASS_SIMPLE_NOBASE( className ) \
-	typedef className ThisClass;	\
-public:							\
-	DECLARE_PANELMESSAGEMAP( className ); \
-	DECLARE_PANELANIMATION( className ); \
-	DECLARE_KEYBINDINGMAP( className ); \
-	static char const *GetPanelClassName() { return #className; } \
-	static char const *GetPanelBaseClassName() { return NULL; }
-
-#else    
-
-#define DECLARE_CLASS_SIMPLE( className, baseClassName ) \
-	typedef baseClassName BaseClass; \
-	typedef className ThisClass;	\
-public:								\
-	DECLARE_PANELMESSAGEMAP( className ); \
-	DECLARE_PANELANIMATION( className ); \
-	static char const *GetPanelClassName() { return #className; } \
-	static char const *GetPanelBaseClassName() { return #baseClassName; }
-
-#define DECLARE_CLASS_SIMPLE_NOBASE( className ) \
-	typedef className ThisClass;	\
-public:							\
-	DECLARE_PANELMESSAGEMAP( className ); \
-	DECLARE_PANELANIMATION( className ); \
-	static char const *GetPanelClassName() { return #className; } \
-	static char const *GetPanelBaseClassName() { return NULL; }
-
-#endif  
-
-#define _MessageFuncCommon( name, scriptname, paramCount, p1type, p1name, p2type, p2name )	\
-	class PanelMessageFunc_##name; \
-	friend class PanelMessageFunc_##name; \
-	class PanelMessageFunc_##name \
-	{ \
-	public: \
-		static void InitVar() \
-		{ \
-			static bool bAdded = false; \
-			if ( !bAdded ) \
-			{ \
-				bAdded = true; \
-				AddToMap( scriptname, (vgui::MessageFunc_t)&ThisClass::name, paramCount, p1type, p1name, p2type, p2name ); \
-			} \
-		}												\
-		PanelMessageFunc_##name()						\
-		{												\
-			PanelMessageFunc_##name::InitVar();			\
-		}												\
-	};													\
-	PanelMessageFunc_##name m_##name##_register;		\
-
-#define MESSAGE_FUNC( name, scriptname )			_MessageFuncCommon( name, scriptname, 0, 0, 0, 0, 0 );	virtual void name( void )
-
-#define MESSAGE_FUNC_INT( name, scriptname, p1 )	_MessageFuncCommon( name, scriptname, 1, vgui::DATATYPE_INT, #p1, 0, 0 );	virtual void name( int p1 )
-#define MESSAGE_FUNC_UINT64( name, scriptname, p1 )	_MessageFuncCommon( name, scriptname, 1, vgui::DATATYPE_UINT64, #p1, 0, 0 );	virtual void name( uint64 p1 )
-#define MESSAGE_FUNC_PTR( name, scriptname, p1 )	_MessageFuncCommon( name, scriptname, 1, vgui::DATATYPE_PTR, #p1, 0, 0 );	virtual void name( vgui::Panel *p1 )
-#define MESSAGE_FUNC_HANDLE( name, scriptname, p1 )	_MessageFuncCommon( name, scriptname, 1, vgui::DATATYPE_HANDLE, #p1, 0, 0 );	virtual void name( vgui::VPANEL p1 )
-#define MESSAGE_FUNC_FLOAT( name, scriptname, p1 )	_MessageFuncCommon( name, scriptname, 1, vgui::DATATYPE_FLOAT, #p1, 0, 0 );	virtual void name( float p1 )
-#define MESSAGE_FUNC_CHARPTR( name, scriptname, p1 )	_MessageFuncCommon( name, scriptname, 1, vgui::DATATYPE_CONSTCHARPTR, #p1, 0, 0 );	virtual void name( const char *p1 )
-#define MESSAGE_FUNC_WCHARPTR( name, scriptname, p1 )	_MessageFuncCommon( name, scriptname, 1, vgui::DATATYPE_CONSTWCHARPTR, #p1, 0, 0 ); virtual void name( const wchar_t *p1 )
-
-#define MESSAGE_FUNC_INT_INT( name, scriptname, p1, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_INT, #p1, vgui::DATATYPE_INT, #p2 );	virtual void name( int p1, int p2 )
-#define MESSAGE_FUNC_PTR_INT( name, scriptname, p1, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_PTR, #p1, vgui::DATATYPE_INT, #p2 );	virtual void name( vgui::Panel *p1, int p2 )
-#define MESSAGE_FUNC_HANDLE_INT( name, scriptname, p1, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_HANDLE, #p1, vgui::DATATYPE_INT, #p2 );	virtual void name( vgui::VPANEL p1, int p2 )
-#define MESSAGE_FUNC_ENUM_ENUM( name, scriptname, t1, p1, t2, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_PTR, #p1, vgui::DATATYPE_PTR, #p2 );	virtual void name( t1 p1, t2 p2 )
-#define MESSAGE_FUNC_INT_CHARPTR( name, scriptname, p1, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_INT, #p1, vgui::DATATYPE_CONSTCHARPTR, #p2 );	virtual void name( int p1, const char *p2 )
-#define MESSAGE_FUNC_PTR_CHARPTR( name, scriptname, p1, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_PTR, #p1, vgui::DATATYPE_CONSTCHARPTR, #p2 );	virtual void name( vgui::Panel *p1, const char *p2 )
-#define MESSAGE_FUNC_HANDLE_CHARPTR( name, scriptname, p1, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_HANDLE, #p1, vgui::DATATYPE_CONSTCHARPTR, #p2 );	virtual void name( vgui::VPANEL p1, const char *p2 )
-#define MESSAGE_FUNC_PTR_WCHARPTR( name, scriptname, p1, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_PTR, #p1, vgui::DATATYPE_CONSTWCHARPTR, #p2 );	virtual void name( vgui::Panel *p1, const wchar_t *p2 )
-#define MESSAGE_FUNC_HANDLE_WCHARPTR( name, scriptname, p1, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_HANDLE, #p1, vgui::DATATYPE_CONSTWCHARPTR, #p2 );	virtual void name( vgui::VPANEL p1, const wchar_t *p2 )
-#define MESSAGE_FUNC_CHARPTR_CHARPTR( name, scriptname, p1, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_CONSTCHARPTR, #p1, vgui::DATATYPE_CONSTCHARPTR, #p2 );	virtual void name( const char *p1, const char *p2 )
-
-#define MESSAGE_FUNC_PARAMS( name, scriptname, p1 )	_MessageFuncCommon( name, scriptname, 1, vgui::DATATYPE_KEYVALUES, NULL, 0, 0 );	virtual void name( KeyValues *p1 )
-
-#define MESSAGE_FUNC_NV( name, scriptname )			_MessageFuncCommon( name, scriptname, 0, 0, 0, 0, 0 );	void name( void )
-#define MESSAGE_FUNC_NV_INT( name, scriptname, p1 )	_MessageFuncCommon( name, scriptname, 1, vgui::DATATYPE_INT, #p1, 0, 0 );	void name( int p1 )
-#define MESSAGE_FUNC_NV_INT_INT( name, scriptname, p1, p2 )	_MessageFuncCommon( name, scriptname, 2, vgui::DATATYPE_INT, #p1, vgui::DATATYPE_INT, #p2 );	void name( int p1, int p2 )
-
-
-	struct PanelMessageMap
-	{
-		PanelMessageMap()
-		{
-			baseMap = NULL;
-			pfnClassName = NULL;
-			processed = false;
-		}
-
-		CUtlVector< MessageMapItem_t > entries;
-		bool processed;
-		PanelMessageMap* baseMap;
-		char const* (*pfnClassName)(void);
-	};
-
-	PanelMessageMap* FindPanelMessageMap(char const* className);
-	PanelMessageMap* FindOrAddPanelMessageMap(char const* className);
-
-
-
-#define MAP_MESSAGE( type, name, func )						{ name, (vgui::MessageFunc_t)(&type::func), 0 }
-
-#define MAP_MESSAGE_PARAMS( type, name, func )				{ name, (vgui::MessageFunc_t)(&type::func), 1, vgui::DATATYPE_KEYVALUES, NULL }
-
-#define MAP_MESSAGE_PTR( type, name, func, param1 )			{ name, (vgui::MessageFunc_t)(&type::func), 1, vgui::DATATYPE_PTR, param1 }
-#define MAP_MESSAGE_INT( type, name, func, param1 )			{ name, (vgui::MessageFunc_t)(&type::func), 1, vgui::DATATYPE_INT, param1 }
-#define MAP_MESSAGE_BOOL( type, name, func, param1 )		{ name, (vgui::MessageFunc_t)(&type::func), 1, vgui::DATATYPE_BOOL, param1 }
-#define MAP_MESSAGE_FLOAT( type, name, func, param1 )		{ name, (vgui::MessageFunc_t)(&type::func), 1, vgui::DATATYPE_FLOAT, param1 }
-#define MAP_MESSAGE_PTR( type, name, func, param1 )			{ name, (vgui::MessageFunc_t)(&type::func), 1, vgui::DATATYPE_PTR, param1 }
-#define MAP_MESSAGE_CONSTCHARPTR( type, name, func, param1) { name, (vgui::MessageFunc_t)(&type::func), 1, vgui::DATATYPE_CONSTCHARPTR, param1 }
-#define MAP_MESSAGE_CONSTWCHARPTR( type, name, func, param1) { name, (vgui::MessageFunc_t)(&type::func), 1, vgui::DATATYPE_CONSTWCHARPTR, param1 }
-
-#define MAP_MESSAGE_INT_INT( type, name, func, param1, param2 ) { name, (vgui::MessageFunc_t)&type::func, 2, vgui::DATATYPE_INT, param1, vgui::DATATYPE_INT, param2 }
-#define MAP_MESSAGE_PTR_INT( type, name, func, param1, param2 ) { name, (vgui::MessageFunc_t)&type::func, 2, vgui::DATATYPE_PTR, param1, vgui::DATATYPE_INT, param2 }
-#define MAP_MESSAGE_INT_CONSTCHARPTR( type, name, func, param1, param2 ) { name, (vgui::MessageFunc_t)&type::func, 2, vgui::DATATYPE_INT, param1, vgui::DATATYPE_CONSTCHARPTR, param2 }
-#define MAP_MESSAGE_PTR_CONSTCHARPTR( type, name, func, param1, param2 ) { name, (vgui::MessageFunc_t)&type::func, 2, vgui::DATATYPE_PTR, param1, vgui::DATATYPE_CONSTCHARPTR, param2 }
-#define MAP_MESSAGE_PTR_CONSTWCHARPTR( type, name, func, param1, param2 ) { name, (vgui::MessageFunc_t)&type::func, 2, vgui::DATATYPE_PTR, param1, vgui::DATATYPE_CONSTWCHARPTR, param2 }
-#define MAP_MESSAGE_CONSTCHARPTR_CONSTCHARPTR( type, name, func, param1, param2 ) { name, (vgui::MessageFunc_t)&type::func, 2, vgui::DATATYPE_CONSTCHARPTR, param1, vgui::DATATYPE_CONSTCHARPTR, param2 }
-
-
-	struct PanelMap_t
-	{
-		MessageMapItem_t* dataDesc;
-		int dataNumFields;
-		const char* dataClassName;
-		PanelMap_t* baseMap;
-		int processed;
-	};
-
-#define DECLARE_PANELMAP() \
-	static vgui::PanelMap_t m_PanelMap; \
-	static vgui::MessageMapItem_t m_MessageMap[]; \
-	virtual vgui::PanelMap_t *GetPanelMap( void );
-
-#define IMPLEMENT_PANELMAP( derivedClass, baseClass ) \
-	vgui::PanelMap_t derivedClass::m_PanelMap = { derivedClass::m_MessageMap, ARRAYSIZE(derivedClass::m_MessageMap), #derivedClass, &baseClass::m_PanelMap }; \
-	vgui::PanelMap_t *derivedClass::GetPanelMap( void ) { return &m_PanelMap; }
-
-	typedef vgui::Panel* (*PANELCREATEFUNC)(void);
-
-	class CBuildFactoryHelper
-	{
-	public:
-		static CBuildFactoryHelper* m_sHelpers;
-
-	public:
-		CBuildFactoryHelper(char const* className, PANELCREATEFUNC func);
-
-		CBuildFactoryHelper* GetNext(void);
-
-		char const* GetClassName() const;
-
-		vgui::Panel* CreatePanel();
-
-		static vgui::Panel* InstancePanel(char const* className);
-		static void GetFactoryNames(CUtlVector< char const* >& list);
-
-		static CDmxElement* CreatePanelDmxElement(vgui::Panel* pPanel);
-		static Panel* UnserializeDmxElementPanel(CDmxElement* pElement);
-
-		static bool Serialize(CUtlBuffer& buf, vgui::Panel* pPanel);
-		static bool Unserialize(Panel** ppPanel, CUtlBuffer& buf, const char* pFileName = NULL);
-
-
-	private:
-
-		static bool HasFactory(char const* className);
-
-		CBuildFactoryHelper* m_pNext;
-
-		int					m_Type;
-		PANELCREATEFUNC		m_CreateFunc;
-		char const* m_pClassName;
-	};
-
-#define DECLARE_BUILD_FACTORY( className )										\
-	static vgui::Panel *Create_##className( void )							\
-		{																		\
-			return new className( NULL, NULL );									\
-		};																		\
-		static vgui::CBuildFactoryHelper g_##className##_Helper( #className, Create_##className );\
-	className *g_##className##LinkerHack = NULL;
-
-#define DECLARE_BUILD_FACTORY_DEFAULT_TEXT( className, defaultText )			\
-	static vgui::Panel *Create_##className( void )							\
-		{																		\
-			return new className( NULL, NULL, #defaultText );					\
-		};																		\
-	static vgui::CBuildFactoryHelper g_##className##_Helper( #className, Create_##className );\
-	className *g_##className##LinkerHack = NULL;
-
-#define DECLARE_BUILD_FACTORY_CUSTOM( className, createFunc )					\
-	static vgui::CBuildFactoryHelper g_##className##_Helper( #className, createFunc );\
-	className *g_##className##LinkerHack = NULL;
-
-#define DECLARE_BUILD_FACTORY_CUSTOM_ALIAS( className, factoryName, createFunc )					\
-	static vgui::CBuildFactoryHelper g_##factoryName##_Helper( #factoryName, createFunc );\
-	className *g_##factoryName##LinkerHack = NULL;
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/MouseCode.h b/SpyCustom/MouseCode.h
deleted file mode 100644
index feb02ac..0000000
--- a/SpyCustom/MouseCode.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef MOUSECODE_H
-#define MOUSECODE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "ButtonCode.h"
-
-namespace vgui
-{
-	typedef ButtonCode_t MouseCode;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/NetVarManager.cpp b/SpyCustom/NetVarManager.cpp
deleted file mode 100644
index 49ce527..0000000
--- a/SpyCustom/NetVarManager.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "NetVarManager.hpp"
-#include <cctype>
-
-#ifdef DUMP_NETVARS
-#define IF_DUMPING(...) __VA_ARGS__
-#else
-#define IF_DUMPING(...)
-#endif
-
-IF_DUMPING(static FILE* s_fp;)
-
-netvar_manager::netvar_manager()
-{
-	IF_DUMPING(fopen_s(&s_fp, "netvar_dump.txt", "w");)
-		for (auto clazz = iff.g_pClient->GetAllClasses(); clazz; clazz = clazz->m_pNext)
-			if (clazz->m_pRecvTable)
-				dump_recursive(clazz->m_pNetworkName, clazz->m_pRecvTable, 0);
-	IF_DUMPING(fclose(s_fp);)
-}
-
-auto netvar_manager::dump_recursive(const char* base_class, RecvTable* table, const std::uint16_t offset) -> void
-{
-	for (auto i = 0; i < table->m_nProps; ++i)
-	{
-		const auto prop_ptr = &table->m_pProps[i];
-
-		if (!prop_ptr || isdigit(prop_ptr->m_pVarName[0]))
-			continue;
-
-		if (fnv::hash_runtime(prop_ptr->m_pVarName) == FNV("baseclass"))
-			continue;
-
-		if (prop_ptr->m_RecvType == DPT_DataTable &&
-			prop_ptr->m_pDataTable != nullptr &&
-			prop_ptr->m_pDataTable->m_pNetTableName[0] == 'D')    
-		{
-			dump_recursive(base_class, prop_ptr->m_pDataTable, std::uint16_t(offset + prop_ptr->m_Offset));
-		}
-
-		char hash_name[256];
-
-		strcpy_s(hash_name, base_class);
-		strcat_s(hash_name, "->");
-		strcat_s(hash_name, prop_ptr->m_pVarName);
-
-		const auto hash = fnv::hash_runtime(hash_name);
-		const auto total_offset = std::uint16_t(offset + prop_ptr->m_Offset);
-
-		IF_DUMPING(fprintf(s_fp, "%s\t0x%04X\t%s\n", base_class, total_offset, prop_ptr->m_pVarName);)
-
-			m_props[hash] =
-		{
-			prop_ptr,
-			total_offset
-		};
-	}
-}
\ No newline at end of file
diff --git a/SpyCustom/NetVarManager.hpp b/SpyCustom/NetVarManager.hpp
deleted file mode 100644
index b721950..0000000
--- a/SpyCustom/NetVarManager.hpp
+++ /dev/null
@@ -1,217 +0,0 @@
-#ifndef NETVARMGR
-#define NETVARMGR
-#pragma once
-
-#include "cdll_int.h"
-#include "dt_recv.h"
-#include "client_class.h"
-#include <vector>
-
-#include "Interfaces.hpp"
-
-
-#include <cstdlib>
-
-namespace detail
-{
-	template <typename Type, Type OffsetBasis, Type Prime>
-	struct size_dependant_data
-	{
-		using type = Type;
-		constexpr static auto k_offset_basis = OffsetBasis;
-		constexpr static auto k_prime = Prime;
-	};
-
-	template <size_t Bits>
-	struct size_selector;
-
-	template <>
-	struct size_selector<32>
-	{
-		using type = size_dependant_data<std::uint32_t, 0x811c9dc5ul, 16777619ul>;
-	};
-
-	template <>
-	struct size_selector<64>
-	{
-		using type = size_dependant_data<std::uint64_t, 0xcbf29ce484222325ull, 1099511628211ull>;
-	};
-
-	template <std::size_t Size>
-	class fnv_hash
-	{
-	private:
-		using data_t = typename size_selector<Size>::type;
-
-	public:
-		using hash = typename data_t::type;
-
-	private:
-		constexpr static auto k_offset_basis = data_t::k_offset_basis;
-		constexpr static auto k_prime = data_t::k_prime;
-
-	public:
-		template <std::size_t N>
-		static __forceinline constexpr auto hash_constexpr(const char(&str)[N], const std::size_t size = N) -> hash
-		{
-			return static_cast<hash>(1ull * (size == 1
-				? (k_offset_basis ^ str[0])
-				: (hash_constexpr(str, size - 1) ^ str[size - 1])) * k_prime);
-		}
-
-		static auto __forceinline hash_runtime(const char* str) -> hash
-		{
-			auto result = k_offset_basis;
-			do
-			{
-				result ^= *str++;
-				result *= k_prime;
-			} while (*(str - 1) != '\0');
-
-			return result;
-		}
-	};
-}
-
-namespace fnv2 {
-	constexpr uint32_t offsetBasis = 0x811c9dc5;
-	constexpr uint32_t prime = 0x1000193;
-
-	constexpr uint32_t hash(const char* str, const uint32_t value = offsetBasis) noexcept
-	{
-		return *str ? hash(str + 1, (value ^ *str) * static_cast<unsigned long long>(prime)) : value;
-	}
-
-	constexpr uint32_t hashRuntime(const char* str) noexcept
-	{
-		auto value = offsetBasis;
-
-		while (*str) {
-			value ^= *str++;
-			value *= prime;
-		}
-		return value;
-	}
-}
-
-using fnv = ::detail::fnv_hash<sizeof(void*) * 8>;
-
-#define FNV(str) (std::integral_constant<fnv::hash, fnv::hash_constexpr(str)>::value)
-
-
-#include <map>
-#include <type_traits>
-
-class netvar_manager
-{
-private:
-	struct stored_data
-	{
-		RecvProp* prop_ptr;
-		std::uint16_t class_relative_offset;
-	};
-
-public:
-	static auto get() -> const netvar_manager&
-	{
-		static netvar_manager instance;
-		return instance;
-	}
-
-	auto get_offset(const fnv::hash hash) const -> std::uint16_t
-	{
-		return m_props.at(hash).class_relative_offset;
-	}
-
-	auto get_prop(const fnv::hash hash) const -> RecvProp*
-	{
-		return m_props.at(hash).prop_ptr;
-	}
-
-	__declspec(noinline) static auto get_offset_by_hash(const fnv::hash hash) -> std::uint16_t
-	{
-		return get().get_offset(hash);
-	}
-
-	template<fnv::hash Hash>
-	static auto get_offset_by_hash_cached() -> std::uint16_t
-	{
-		static auto offset = std::uint16_t(0);
-		if (!offset)
-			offset = get_offset_by_hash(Hash);
-		return offset;
-	}
-
-private:
-	netvar_manager();
-	auto dump_recursive(const char* base_class, RecvTable* table, std::uint16_t offset) -> void;
-
-private:
-	std::map<fnv::hash, stored_data> m_props;
-};
-
-
-#define PNETVAR_OFFSET(funcname, class_name, var_name, offset, ...) \
-auto funcname() -> std::add_pointer_t<__VA_ARGS__> \
-{ \
-	constexpr auto hash = fnv::hash_constexpr(class_name "->" var_name); \
-	const auto addr = std::uintptr_t(this) + offset + netvar_manager::get_offset_by_hash_cached<hash>(); \
-	return reinterpret_cast<std::add_pointer_t<__VA_ARGS__>>(addr); \
-}
-
-#define PNETVAR(funcname, class_name, var_name, ...) \
-	PNETVAR_OFFSET(funcname, class_name, var_name, 0, __VA_ARGS__)
-
-#define NETVAR_OFFSET(funcname, class_name, var_name, offset, ...) \
-auto funcname() -> std::add_lvalue_reference_t<__VA_ARGS__> \
-{ \
-	constexpr auto hash = fnv::hash_constexpr(class_name "->" var_name); \
-	const auto addr = std::uintptr_t(this) + offset + netvar_manager::get_offset_by_hash_cached<hash>(); \
-	return *reinterpret_cast<std::add_pointer_t<__VA_ARGS__>>(addr); \
-}
-
-#define NETVAR(funcname, class_name, var_name, ...) \
-	NETVAR_OFFSET(funcname, class_name, var_name, 0, __VA_ARGS__)
-
-#define NETPROP(funcname, class_name, var_name) \
-static auto funcname() ->  RecvProp* \
-{ \
-	constexpr auto hash = fnv::hash_constexpr(class_name "->" var_name); \
-	static RecvProp* prop_ptr; \
-	if(!prop_ptr) prop_ptr = netvar_manager::get().get_prop(hash); \
-	return prop_ptr; \
-}
-
-class recv_prop_hook
-{
-public:
-	recv_prop_hook(RecvProp* prop, const RecvVarProxyFn proxy_fn) :
-		m_property(prop),
-		m_original_proxy_fn(prop->m_ProxyFn)
-	{
-		set_proxy_function(proxy_fn);
-	}
-
-	~recv_prop_hook()
-	{
-		m_property->m_ProxyFn = m_original_proxy_fn;
-	}
-
-	auto get_original_function() const -> RecvVarProxyFn
-	{
-		return m_original_proxy_fn;
-	}
-
-	auto set_proxy_function(const RecvVarProxyFn proxy_fn) const -> void
-	{
-		m_property->m_ProxyFn = proxy_fn;
-	}
-
-private:
-	RecvProp* m_property;
-	RecvVarProxyFn m_original_proxy_fn;
-};
-
-
-
-#endif
diff --git a/SpyCustom/Options.hpp b/SpyCustom/Options.hpp
deleted file mode 100644
index 5afaf73..0000000
--- a/SpyCustom/Options.hpp
+++ /dev/null
@@ -1,1102 +0,0 @@
-#ifndef OPTIONS
-#define OPTIONS
-#pragma once
-
-#include <string>
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
-#define A( s ) #s
-#define OPTION(type, var, val) Var<type> var = {A(var), val}
-
-
-template <typename T = bool>
-class Var {
-public:
-    std::string name;
-    std::shared_ptr<T> value;
-    int32_t size;
-    Var(std::string name, T v) : name(name) {
-        value = std::make_shared<T>(v);
-        size = sizeof(T);
-    }
-    operator T() { return *value; }
-    operator T* () { return &*value; }
-    operator T() const { return *value; }
-};
-
-
-#include "resource.h" 
-
-class float3 
-{
-public:
-    float3() { r = 1.0f; g = 1.0f; b = 1.0f; a = 1.0f; }
-    float3(float r, float g, float b)
-    {
-        this->r = r;
-        this->g = g;
-        this->b = b;
-    }
-    float3(float r, float g, float b, float a)
-    {
-        this->r = r;
-        this->g = g;
-        this->b = b;
-        this->a = a;
-    }
-    float r = 1.0f;
-    float g = 1.0f;
-    float b = 1.0f;
-    float a = 1.0f;
-};
-
-class char256
-{
-public:
-    char256(std::string s)
-    {
-        strcpy(mystring, s.c_str());
-    }
-    char mystring[256];
-};
-
-class char1024
-{
-public:
-    char1024(std::string s)
-    {
-        strcpy(mystring, s.c_str());
-    }
-    char mystring[1024];
-};
-
-class sticker
-{
-public:
-    bool isselected = 1;
-    char name[256] = "null";
-    int stickerid = 0;
-    float wear = 0;
-    float rotation = 0;
-    float scale = 1.0f;
-    int stickerc = 0;
-    
-};
-
-
-class weapon
-{
-public:
-    weapon() {};
-    weapon(char name1[256], int defindex1, char killfeedicon1[256])
-    {
-        strcpy(name, name1);
-        strcpy(killfeedicon, killfeedicon1);
-        defindex = defindex1;
-        strcpy(killfeediconreplace, killfeedicon1);
-
-        strcpy(stickers[0].name, "(0) null");
-        strcpy(stickers[1].name, "(1) null");
-        strcpy(stickers[2].name, "(2) null");
-        strcpy(stickers[3].name, "(3) null");
-        strcpy(stickers[4].name, "(4) null");
-        modeldefindex = defindex;
-    }
-    char name[256] = "";
-    int defindex = 0;
-    char killfeedicon[256] = "";
-
-    bool active = 0;
-    int skinid = 0;
-    int skinidc = 0;
-    int seed = 0;
-    int stattrak = -1;
-    bool ownerunk = 0;
-    float wear = 0;
-    int quality = 0;
-    int qualityc = 0;
-    char nametag[256] = "";
-    char desctag[256] = "";
-    char model[256] = "";
-    char worldmodel[256] = "";
-    int modeldefindex = 0;
-    bool modelactive = 0;
-    int modelcount = 0;
-    char killfeediconreplace[256] = "";
-    bool killfeediconactive = 0;
-
-    int rarity = 0;
-    int color1 = 0;
-    int color2 = 0;
-    int color3 = 0;
-    int color4 = 0;
-    float pearl = 0;
-    DWORD link = 0;
-
-    sticker stickers[5];
-    
-
-    int isSelected = 0;
-};
-
-
-
-class weaponz
-{
-public:
-    weaponz() 
-    {
-        int i = 0;
-        arr[i] = weapon((char*)"Knife", WEAPON_KNIFE_T, (char*)"knife_t"); i++;
-        arr[i] = weapon((char*)"Glove", GLOVE_STUDDED_BLOODHOUND, (char*)"not_available"); i++;
-        arr[i] = weapon((char*)"Agent T", 5036, (char*)"not_available"); i++;
-        arr[i] = weapon((char*)"Agent CT", 5037, (char*)"not_available"); i++;
-        arr[i] = weapon((char*)"Medal", 1331, (char*)"not_available"); i++;
-        arr[i] = weapon((char*)"Music Kit", 1314, (char*)"not_available"); i++;
-
-        arr[i] = weapon((char*)"AK-47", WEAPON_AK47, (char*)"ak47"); i++;
-        arr[i] = weapon((char*)"C4 Explosive", WEAPON_C4, (char*)"c4"); i++;
-
-        arr[i] = weapon((char*)"Desert Eagle", WEAPON_DEAGLE, (char*)"deagle"); i++;
-        arr[i] = weapon((char*)"Dual Berettas", WEAPON_ELITE, (char*)"elite"); i++;
-        arr[i] = weapon((char*)"Five-SeveN", WEAPON_FIVESEVEN, (char*)"fiveseven"); i++;
-        arr[i] = weapon((char*)"Glock-18", WEAPON_GLOCK, (char*)"glock"); i++;
-        arr[i] = weapon((char*)"AUG", WEAPON_AUG, (char*)"aug"); i++;
-        arr[i] = weapon((char*)"AWP", WEAPON_AWP, (char*)"awp"); i++;
-        arr[i] = weapon((char*)"FAMAS", WEAPON_FAMAS, (char*)"famas"); i++;
-        arr[i] = weapon((char*)"G3SG1", WEAPON_G3SG1, (char*)"g3sg1"); i++;
-        arr[i] = weapon((char*)"Galil AR", WEAPON_GALILAR, (char*)"galilar"); i++;
-        arr[i] = weapon((char*)"M249", WEAPON_M249, (char*)"m249"); i++;
-
-        arr[i] = weapon((char*)"M4A4", WEAPON_M4A1, (char*)"m4a1"); i++;
-        arr[i] = weapon((char*)"MAC-10", WEAPON_MAC10, (char*)"mac10"); i++;
-        arr[i] = weapon((char*)"P90", WEAPON_P90, (char*)"p90"); i++;
-        arr[i] = weapon((char*)"UMP-45", WEAPON_UMP45, (char*)"ump45"); i++;
-        arr[i] = weapon((char*)"XM1014", WEAPON_XM1014, (char*)"xm1014"); i++;
-        arr[i] = weapon((char*)"PP-Bizon", WEAPON_BIZON, (char*)"bizon"); i++;
-        arr[i] = weapon((char*)"MAG-7", WEAPON_MAG7, (char*)"mag7"); i++;
-        arr[i] = weapon((char*)"Negev", WEAPON_NEGEV, (char*)"negev"); i++;
-        arr[i] = weapon((char*)"Sawed-Off", WEAPON_SAWEDOFF, (char*)"sawedoff"); i++;
-
-        arr[i] = weapon((char*)"Tec-9", WEAPON_TEC9, (char*)"tec9"); i++;
-        arr[i] = weapon((char*)"P2000", WEAPON_HKP2000, (char*)"hkp2000"); i++; 
-        arr[i] = weapon((char*)"MP7", WEAPON_MP7, (char*)"mp7"); i++;
-        arr[i] = weapon((char*)"MP9", WEAPON_MP9, (char*)"mp9"); i++;
-        arr[i] = weapon((char*)"Nova", WEAPON_NOVA, (char*)"nova"); i++;
-        arr[i] = weapon((char*)"P250", WEAPON_P250, (char*)"p250"); i++;
-        arr[i] = weapon((char*)"SCAR-20", WEAPON_SCAR20, (char*)"scar20"); i++;
-        arr[i] = weapon((char*)"SG 553", WEAPON_SG553, (char*)"sg556"); i++;
-        arr[i] = weapon((char*)"SSG 08", WEAPON_SSG08, (char*)"ssg08"); i++;
-
-        arr[i] = weapon((char*)"M4A1-S", WEAPON_M4A1_SILENCER, (char*)"m4a1_silencer"); i++;
-        arr[i] = weapon((char*)"USP-S", WEAPON_USP_SILENCER, (char*)"usp_silencer"); i++;
-
-        arr[i] = weapon((char*)"CZ75-Auto", WEAPON_CZ75A, (char*)"cz75a"); i++;
-        arr[i] = weapon((char*)"RB Revolver", WEAPON_REVOLVER, (char*)"revolver"); i++;
-
-        arr[i] = weapon((char*)"Custom item", 0, (char*)"not_available"); i++;
-
-        weaponzcount = i;
-    }
-
-
-    weapon arr[64];
-    int weaponzcount;
-};
-
-
-class Rank
-{
-public:
-    Rank() {};
-    Rank(char Name1[256]) 
-    {
-       strcpy(Name, Name1);
-    }
-    char Name[256] = "";
-    int rank = 0;
-    int wins = 0;
-    int isselected = 0;
-};
-
-class Rankz
-{
-public:
-    Rankz()
-    {
-        arr[0] = Rank((char*)"Competitive MM");
-        arr[1] = Rank((char*)"Wingman");
-        arr[2] = Rank((char*)"Danger Zone");
-    }
-    Rank arr[3];
-    int selectedrank = 0;
-};
-
-
-#include "NetVarManager.hpp"  
-
-class DME
-{
-public:
-    DME() 
-    {
-    };
-    DME(char name1[256], int cust1 = -1)
-    {
-        strcpy(name, name1);
-        customtextureselected = cust1;
-    }
-    DME(char name1[256], char texture1[256], char model[256], int cust1 = -1)
-    {
-        strcpy(name, name1);
-        strcpy(texture, texture1);
-        strcpy(texture_temp, texture1); 
-        model_hash = fnv2::hashRuntime(model); 
-        customtextureselected = cust1;
-    }
-
-    DME(char name[256], char prefab[32], int cust1 = -1)
-    {
-        strcpy(this->name, name);
-        strcpy(this->prefab, prefab);
-        customtextureselected = cust1;
-    }
-
-    char texture_temp[256] = "";
-    char texture[256] = ""; 
-    char prefab[32];
-    int model_hash = 0;
-    char name[256] = "";
-    bool active = 0;
-    bool wireframe = 0;
-    bool nodraw = 0;
-    bool flat = 0;
-    ImVec4 coloralpha = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
-    bool isSelected = 0;
-    int customtextureselected = -1;
-};
-
-class DMEs
-{
-public:
-    DMEs() 
-    {
-        int i = 0;
-        arr[i] = DME((char*)"Weapons", (char*)"(0) water", (char*)"", 0); i++;
-        arr[i] = DME((char*)"Glove", (char*)"(0) water", (char*)"", 0); i++;
-        arr[i] = DME((char*)"Sleeve", (char*)"(0) water", (char*)"", 0); i++;
-        arr[i] = DME((char*)"Agent T", (char*)"(0) water", (char*)"", 0); i++;
-        arr[i] = DME((char*)"Agent CT", (char*)"(0) water", (char*)"", 0); i++;
-        arr[i] = DME((char*)"Knife", (char*)"(0) water", (char*)"", 0); i++;
-
-        arr[i] = DME((char*)"AK-47"); i++;
-        arr[i] = DME((char*)"C4 Explosive"); i++;
-        arr[i] = DME((char*)"Desert Eagle"); i++;
-        arr[i] = DME((char*)"Dual Berettas"); i++;
-        arr[i] = DME((char*)"Five-SeveN"); i++;
-        arr[i] = DME((char*)"Glock-18"); i++;
-        arr[i] = DME((char*)"AUG"); i++;
-        arr[i] = DME((char*)"AWP"); i++;
-        arr[i] = DME((char*)"FAMAS"); i++;
-        arr[i] = DME((char*)"G3SG1"); i++;
-        arr[i] = DME((char*)"Galil AR"); i++;
-        arr[i] = DME((char*)"M249"); i++;
-        arr[i] = DME((char*)"M4A4"); i++;
-        arr[i] = DME((char*)"MAC-10"); i++;
-        arr[i] = DME((char*)"P-90"); i++;
-        arr[i] = DME((char*)"UMP-45"); i++;
-        arr[i] = DME((char*)"XM1014"); i++;
-        arr[i] = DME((char*)"PP-Bizon"); i++;
-        arr[i] = DME((char*)"MAG-7"); i++;
-        arr[i] = DME((char*)"Negev"); i++;
-        arr[i] = DME((char*)"Sawed-Off"); i++;
-        arr[i] = DME((char*)"Tec-9"); i++;
-        arr[i] = DME((char*)"P2000"); i++;
-        arr[i] = DME((char*)"MP7"); i++;
-        arr[i] = DME((char*)"MP9"); i++;
-        arr[i] = DME((char*)"Nova"); i++;
-        arr[i] = DME((char*)"P250"); i++;
-        arr[i] = DME((char*)"SCAR-20"); i++;
-        arr[i] = DME((char*)"SG 553"); i++;
-        arr[i] = DME((char*)"SSG 08"); i++;
-         
-        itemcount = i;
-    };
-
-    int itemcount = 0;
-    DME arr[64];
-};
-
-
-class Customtexture
-{
-public:
-    Customtexture() {};
-    Customtexture(int id)
-    {
-        char preview1[64] = "(";
-        strcat_s(preview1, std::to_string(id).c_str());
-        strcat_s(preview1, ") ");
-        strcat_s(preview1, "null");
-        strcpy(Preview, preview1);
-    }
-    Customtexture(char name1[256], char keyvalue1[0x1000], int id)
-    {
-        strcpy(Name, name1); 
-        char preview1[64] = "(";
-        strcat_s(preview1, std::to_string(id).c_str());
-        strcat_s(preview1, ") ");
-        strcat_s(preview1, name1 );
-        strcpy(Preview, preview1); 
-        strcpy(keyvalue, keyvalue1);
-    }
-    char keyvalue[0x1000] = "";
-    char Name[256] = "";
-    char Preview[256] = "";
-    bool IsSelected = 0;
-
-    void* texturelink = nullptr;
-};
-
-class Customtextures
-{
-public:
-    Customtextures()
-    {
-        int i = 0;
-        char buf[0x1000] = "\"Refract\"\n{\n\t\"$model\" 1\n\t\"$refractamount\" \"2.0\"\n\t\"$refracttint\" \"[0 1 1 100]\"\n\t\"$dudvmap\" \"dev/water_dudv\"\n\t\"$normalmap\" \"dev/water_normal\"\n\t\"$surfaceprop\" \"water\"\n\t\"$bumpframe\" \"0\"\n\t\"Proxies\"\n\t{\n\t\t\"AnimatedTexture\"\n\t\t{\n\t\t\t\"animatedtexturevar\" \"$normalmap\"\n\t\t\t\"animatedtextureframenumvar\" \"$bumpframe\"\n\t\t\t\"animatedtextureframerate\" 30.00\n\t\t}\n\t\t\"TextureScroll\"\n\t\t{\n\t\t\t\"texturescrollvar\" \"$bumptransform\"\n\t\t\t\"texturescrollrate\" .05\n\t\t\t\"texturescrollangle\" 45.00\n\t\t}\n\t}\n}";
-        arr[i] = Customtexture((char*)"water", buf, i); i++;
-        arr[i] = Customtexture(i); i++;
-        arr[i] = Customtexture(i); i++;
-        arr[i] = Customtexture(i); i++;
-        arr[i] = Customtexture(i); i++;
-        count = i;
-    }
-    Customtexture arr[5];
-    int count = 0;
-};
-
-
-class Seqs
-{
-public:
-    Seqs() {};
-    int seq_orig = 0;
-    char seq_orig_def[32] = "";
-    int seq_repl = 0;
-    char seq_repl_def[32] = "";
-
-    char seq_repl_def_preview[32] = "";
-
-    bool isSelected[20] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
-};
-
-class Sounds
-{
-public:
-    Sounds() {};
-    char name[32] = "";
-    int hash = 0;
-    char wavpath[256] = "ui/beep07.wav";
-    int pitch = 100;
-    float volume = 1.0f;
-};
-
-class Model
-{
-public:
-    Model() {};
-
-    Model(char name[32])
-    {
-        strcpy(this->name, name);
-    };
-
-    Model(char name[32], int defindex, char classid[32], char prefab[32])
-    {
-        this->defindex = defindex;
-        strcpy(this->name, name);
-        strcpy(this->classid, classid);
-        strcpy(this->prefab, prefab);
-    };
-
-    Model(char name[32], int defindex, char classid[256], char vmodel_orig[32], bool s)
-    {
-        this->defindex = defindex;
-        strcpy(this->name, name);
-          strcpy(this->vmodel_orig, vmodel_orig);
-          strcpy(vmodel_repl_temp, vmodel_orig);
-          strcpy(vmodel_repl, vmodel_orig);
-        strcpy(this->classid, classid);
-    };
-
-    bool findMDLmethode = false;
-
-    char name[32] = "";
-
-    char vmodel_orig[256] = "";
-    
-    char vmodel_repl_temp[256] = "";
-    char wmodel_repl_temp[256] = "";
-    
-    char vmodel_repl[256] = "";
-    char wmodel_repl[256] = "";
-
-    int vmodel_hash = 0;
-    int wmodel_hash = 0;
-
-    int defindex = 0;
-    bool active = 0;
-    bool active_w = 0;
-    bool active_scale = 0;
-    float scale = 1.0f;
-
-    bool seq_active = 0;
-    Seqs seqs[20];
-
-    char classid[32] = "";
-
-    char prefab[32] = "";
-    Sounds sounds[5];
-    int soundcount = 0;
-    bool sound_active = 0;
-
-    bool isSelected = 0;
-};
-
-class Models
-{
-public:
-    Models() {   
-        int i = 0;
-
-        arr[i] = Model((char*)"Agent T"); i++;
-        arr[i] = Model((char*)"Agent CT"); i++;
-        arr[i] = Model((char*)"Arms"); i++;
-
-        arr[i] = Model((char*)"Knife", WEAPON_KNIFE_T, (char*)"CKnife", (char*)"models/weapons/v_knife_default_t.mdl", 1); i++; 
-
-        arr[i] = Model((char*)"AK-47", WEAPON_AK47, (char*)"CAK47", (char*)"weapon_ak47_prefab"); i++; 
-        arr[i] = Model((char*)"C4 Explosive", WEAPON_C4, (char*)"CC4", (char*)"c4"); i++; 
-        arr[i] = Model((char*)"Desert Eagle", WEAPON_DEAGLE, (char*)"CWeaponDeagle", (char*)"weapon_deagle_prefab"); i++;
-        arr[i] = Model((char*)"Dual Berettas", WEAPON_ELITE, (char*)"CWeaponElite", (char*)"weapon_elite_prefab"); i++;
-        arr[i] = Model((char*)"Five-SeveN", WEAPON_FIVESEVEN, (char*)"CWeaponFiveSeven", (char*)"weapon_fiveseven_prefab"); i++;
-        arr[i] = Model((char*)"Glock-18", WEAPON_GLOCK, (char*)"CWeaponGlock", (char*)"weapon_glock_prefab"); i++; 
-        arr[i] = Model((char*)"AUG", WEAPON_AUG, (char*)"CWeaponAug", (char*)"weapon_aug_prefab"); i++;
-        arr[i] = Model((char*)"AWP", WEAPON_AWP, (char*)"CWeaponAWP", (char*)"weapon_awp_prefab"); i++;
-        arr[i] = Model((char*)"FAMAS", WEAPON_FAMAS, (char*)"CWeaponFamas", (char*)"weapon_famas_prefab"); i++;
-        arr[i] = Model((char*)"G3SG1", WEAPON_G3SG1, (char*)"CWeaponG3SG1", (char*)"weapon_g3sg1_prefab"); i++;
-        arr[i] = Model((char*)"Galil AR", WEAPON_GALILAR, (char*)"CWeaponGalilAR", (char*)"weapon_galilar_prefab"); i++;
-        arr[i] = Model((char*)"M249", WEAPON_M249, (char*)"CWeaponM249", (char*)"weapon_m249_prefab"); i++;
-        arr[i] = Model((char*)"M4A4", WEAPON_M4A1, (char*)"CWeaponM4A1", (char*)"weapon_m4a1_prefab"); i++;
-        arr[i] = Model((char*)"MAC-10", WEAPON_MAC10, (char*)"CWeaponMAC10", (char*)"weapon_mac10_prefab"); i++;
-        arr[i] = Model((char*)"P-90", WEAPON_P90, (char*)"CWeaponP90", (char*)"weapon_p90_prefab"); i++;
-        arr[i] = Model((char*)"UMP-45", WEAPON_UMP45, (char*)"CWeaponUMP45", (char*)"weapon_ump45_prefab"); i++;
-        arr[i] = Model((char*)"XM1014", WEAPON_XM1014, (char*)"CWeaponXM1014", (char*)"weapon_xm1014_prefab"); i++;
-        arr[i] = Model((char*)"PP-Bizon", WEAPON_BIZON, (char*)"CWeaponBizon", (char*)"weapon_bizon_prefab"); i++;
-        arr[i] = Model((char*)"MAG-7", WEAPON_MAG7, (char*)"CWeaponMag7", (char*)"weapon_mag7_prefab"); i++;
-        arr[i] = Model((char*)"Negev", WEAPON_NEGEV, (char*)"CWeaponNegev", (char*)"weapon_negev_prefab"); i++;
-        arr[i] = Model((char*)"Sawed-Off", WEAPON_SAWEDOFF, (char*)"CWeaponSawedoff", (char*)"weapon_sawedoff_prefab"); i++;
-        arr[i] = Model((char*)"Tec-9", WEAPON_TEC9, (char*)"CWeaponTec9", (char*)"weapon_tec9_prefab"); i++;
-        arr[i] = Model((char*)"P2000", WEAPON_HKP2000, (char*)"CWeaponHKP2000", (char*)"weapon_hkp2000_prefab"); i++;
-        arr[i] = Model((char*)"MP7", WEAPON_MP7, (char*)"CWeaponMP7", (char*)"weapon_mp7_prefab"); i++;
-        arr[i] = Model((char*)"MP9", WEAPON_MP9, (char*)"CWeaponMP9", (char*)"weapon_mp9_prefab"); i++;
-        arr[i] = Model((char*)"Nova", WEAPON_NOVA, (char*)"CWeaponNOVA", (char*)"weapon_nova_prefab"); i++;
-        arr[i] = Model((char*)"P250", WEAPON_P250, (char*)"CWeaponP250", (char*)"weapon_p250_prefab"); i++;
-        arr[i] = Model((char*)"SCAR-20", WEAPON_SCAR20, (char*)"CWeaponSCAR20", (char*)"weapon_scar20_prefab"); i++;
-        arr[i] = Model((char*)"SG 553", WEAPON_SG553, (char*)"CWeaponSG556", (char*)"weapon_sg556_prefab"); i++;
-        arr[i] = Model((char*)"SSG 08", WEAPON_SSG08, (char*)"CWeaponSSG08", (char*)"weapon_ssg08_prefab"); i++; 
-
-         
-
-
-        itemcount = i;
-    }
-    Model arr[64];
-    int itemcount = 0;
-};
-
-
-class Effects 
-{
-public:
-    Effects() {};
-    int type = 2; 
-    int selectedc = 0;
-
-    int fx_magnitude = 1;
-    int fx_traillength = 1;
-    float fx_fsize = 5.0f; 
-    float fx_fspeed = 1.0f; 
-    int fx_itype = 1;
-    bool fx_bexplosive = false;
-
-    int icolors = 0;
-    int fflags = 0;
-    float fscale = 1.0f;
-    float fmagtinude = 1.0f;
-    float fradius = 1.0f;
-
-    float fbeamwidth = 1.0f;
-    float teslaradius = 5.0f;
-    float teslacolor[3] = { 1.0f,0,0 };
-    float fltimevisible = 0.75f;
-    int ibeams = 3;
-    char szSpriteName[256] = "sprites/physbeam.vmt";
-    float dlightcolor[3] = { 1.0f,0,0 };
-    float fdie = 0.1f;
-    float frad = 500.0f;
-    int style = 1;  
-    int key = 1;
-    float decay = 0.0f;
-};
-
-
-inline Vector CalcAngle(register const Vector& src, register const Vector& dst)
-{
-    Vector angles; 
-    Vector delta = src - dst; 
-    float hyp = sqrt(delta.x * delta.x + delta.y * delta.y);  
-    angles.x = atan(delta.z / hyp) * (180.0f / 3.14);  
-    angles.y = atanf(delta.y / delta.x) * (180.0f / 3.14) + !((*(DWORD*)&delta.x) >> 31 & 1) * 180.0f;  
-    angles.z = 0.0f;  
-    return angles;
-}
-
-class Options
-{
-public:
-    OPTION(bool, attacheffects, false);
-    OPTION(Effects, effects, Effects());
-    OPTION(bool, beamtrace, false);
-
-    OPTION(int, beamtype, 0); 
-    OPTION(float3, beamcolor, float3(0.95f, 0.20f, 0.0f, 1.0f));
-
-    OPTION(char256, beampath, char256("sprites/purplelaser1.vmt"));
-    OPTION(float, beamlife, 1.0f); 
-
-    OPTION(float, beamwidth, 2.5f);
-    OPTION(float, beamendwidth, 2.5f);
-
-    OPTION(float, beamhaloscale, 0.0f);
-    OPTION(float, beamfadelength, 0.3f); 
-
-    OPTION(float, beamamplitude, 5.0f); 
-    OPTION(float, beamstartframe, 0.0f);
-
-    OPTION(float, beamspeed, 0.3f); 
-    OPTION(float, beamframerate, 1.0f); 
-
-    OPTION(int, beamsegments, 2);
-    OPTION(int, beamflags, 0x8300); 
-
-    OPTION(bool, hitsound, false);
-    OPTION(char256, hspath, char256("102")); 
-    OPTION(char256, obpath, char256("101")); 
-
-    OPTION(bool, hitmarker, false);
-
-    OPTION(bool, flashlightON, false);
-    OPTION(bool, flashlightShadows, false);
-    OPTION(float, flashlightFOV, 45.0f);
-    OPTION(float, flashlightLinearAtten, 1000.0f);
-    OPTION(float, flashlightFarZ, 1000.0f);
-    OPTION(char256, flashlightTexture, char256("effects/flashlight001"));
-    OPTION(bool, nvgsON, false);
-    OPTION(bool, fogactive, false);
-    OPTION(float3, fogcolor, float3(0,0,0) ); 
-    OPTION(float, fogdensity, 0);
-    OPTION(float, fogstart, 0);
-    OPTION(float, fogend, 0);
-    OPTION(float, tonemapscale, 1.0f);
-    OPTION(bool, skyboxactive, false);
-    OPTION(char256, skyboxtemp, char256("sky_day02_05"));
-
-    OPTION(bool, weatheractive, false);
-    OPTION(int, weathertype, 1);
-    OPTION(float, windspeed, 0);
-    OPTION(float, rainalpha, 0.4f);
-    OPTION(float, rainlength, 0.1f);
-    OPTION(float, rainwidth, 0.5f);
-    OPTION(float, rainsidevel, 130.0f);
-    OPTION(float, rainradius, 1500.0f);
-    OPTION(float, rainspeed, 600.0f);
-
-    OPTION(bool, worldcoloractive, false); 
-    OPTION(float3, worldcolor, float3(1.0f, 1.0f, 1.0f));
-    OPTION(float3, staticpropcolor, float3(1.0f, 1.0f, 1.0f));
-    OPTION(float3, modelcolor, float3(1.0f, 1.0f, 1.0f));
-    OPTION(Models, models, Models());
-    OPTION(int, soundhook_count, 0);
-    OPTION(int, entityloop_count, 0);
-    OPTION(int, playerloop_count, 0);
-    OPTION(DMEs, materials, DMEs());
-    OPTION(Customtextures, customtextures, Customtextures());
-    OPTION(bool, dme_gettextures, false);
-    OPTION(int, dmeloop_count, 0);
-    OPTION(weaponz, weapons, weaponz());
-    OPTION(char1024, playername, char1024("ur name"));
-    OPTION(char1024, playerclan, char1024("ur tag"));
-
-    OPTION(bool, discmsg_active, false);
-    OPTION(char1024, discmsg, char1024("SFUI_QMM_ERROR_VacBanned")); 
-
-    OPTION(bool, profile_active, false);
-    OPTION(bool, prime, false);
-
-    OPTION(Rankz, rankz, Rankz());
-
-    OPTION(int, level, 0);
-    OPTION(int, xp, 0);
-
-    OPTION(int, comleader, 0);
-    OPTION(int, comteacher, 0);
-    OPTION(int, comfriendly, 0);
-
-    OPTION(bool, fakescore, 0);
-    OPTION(int, MVPs, 0);
-    OPTION(int, score, 0);
-    OPTION(int, kills, 0);
-    OPTION(int, assists, 0);
-    OPTION(int, deaths, 0);
-
-    OPTION(bool, vacban, 0);
-    OPTION(int, banreason, 0);
-    OPTION(int, banduration, 0);
-
-    OPTION(bool, votereveal, 0);
-      
-};
-
-inline Options g_Options;
-inline bool   g_Unload;
-
-
-
-
-struct skin
-{
-    skin(bool active1, int skinid1, int seed1, int stattrak1, bool ownerunk1, float wear1, int quality1, char nametag1[256])
-    {
-        active = active1;
-        skinid = skinid1;
-        seed = seed1;
-        stattrak = stattrak1;
-        ownerunk = ownerunk1;
-        wear = wear1;
-        quality = quality1;
-        strcpy(nametag, nametag1);
-    };
-
-    bool active = 0;
-    int skinid = 0;
-    int skinidc = 0;
-    int seed = 0;
-    int stattrak = -1;
-    bool ownerunk = 0;
-    float wear = 0;
-    int quality = 0;
-    int qualityc = 0;
-    char nametag[256] = "";
-    char model[256] = "";
-    char worldmodel[256] = "";
-    int modeldefindex = 0;
-    bool modelactive = 0;
-    int modelcount = 0;
-    char killfeedicon[256] = "";
-    char killfeediconorigin[256] = "";
-    bool killfeediconactive = 0;
-};
-
-
-
-
-class Options_my
-{
-public:
-
-    std::vector<std::string> IEffects = {
-        "Smoke", 
-        "Sparks", 
-        "Dust", 
-        "MuzzleFlash", 
-        "MetalSparks", 
-        "EnergySplash", 
-        "Ricochet" 
-    };
-
-    std::vector<std::string> DispatchEffect = {
-        "Explosion",
-        "WaterSurfaceExplosion",
-        "HelicopterMegaBomb",
-        "CS_HolidayLight",
-        "ManhackSparks",
-        "watersplash",
-        "watersplashquiet",
-        "gunshotsplash",
-        "HunterDamage",
-        "MuzzleFlash",
-        "Smoke",
-        "GunshipImpact",
-        "BoltImpact",
-        "csblood",
-        "GlassImpact",
-        "RPGShotDown",
-        "WheelDust",
-        "Error"
-    };
-
-    std::vector<std::string> OtherEff = {
-      "Tesla", 
-      "DLight" 
-    };
-
-    std::vector<std::string> EffTypes = {
-      "CEffectsClient",
-      "CTEEffectDispatch",
-      "Other"
-    };
-
-    std::map<std::string, std::vector<std::string>> Map = { 
-        {"CEffectsClient", IEffects},
-        {"CTEEffectDispatch", DispatchEffect},
-        {"Other", OtherEff}, 
-    };
-
-
-
-
-    HMODULE hModuleGlobal = NULL;
-
-    int needtogetseqact = 0;
-    bool netchannedlhooked = 0;
-
-    bool disconnected = 0;
-    bool needupdate = 0;
-    bool loading = 0;
-    bool autoload = 0;
-    bool unhook = 0;
-
-    std::vector<std::string> names = {
-        "\\x10\\xAD\\xAD\\xAD"
-    };
-
-    std::vector<std::string> skyboxitems = {
-        "sky_day02_05",
-        "cs_baggage_skybox_",
-        "cs_tibet",
-        "vietnam",
-        "sky_lunacy",
-        "embassy",
-        "italy",
-        "jungle",
-        "office",
-        "sky_cs15_daylight01_hdr",
-        "sky_cs15_daylight02_hdr",
-        "nukeblank",
-        "dustblank",
-        "sky_venice",
-        "sky_cs15_daylight03_hdr",
-        "sky_cs15_daylight04_hdr",
-        "sky_csgo_cloudy01",
-        "sky_csgo_night02",
-        "sky_csgo_night02b",
-        "vertigo",
-        "vertigoblue_hdr",
-        "sky_dust",
-        "sky_hr_aztec",
-        "sky_l4d_rural02_ldr", 
-        "vertigo_hdr",
-        "sky_csgo_night_flat"
-    };
-
-    std::vector<std::string> soundslist = {
-    "101",
-    "102",
-    };
-
-
-    std::vector<std::string> spriteslist = {
-         "sprites/purplelaser1.vmt",
-         "sprites/physbeam.vmt",
-         "sprites/purpleglow1.vmt",
-         "sprites/blueglow1.vmt",
-         "sprites/white.vmt",
-         "sprites/radio.vmt",
-         "sprites/gunsmoke.vmt",
-         "sprites/bubble.vmt"  
-    };
-
-
-    std::vector<std::string> flashlightlist = {
-         "effects/flashlight_border",
-         "effects/flashlight_freezecam",
-         "effects/flashlight_inspect",
-         "effects/flashlight_security001",
-         "effects/flashlight001",
-         "effects/flashlight001_improved",
-         "effects/flashlight001_intro",
-         "effects/flashlight002",
-         "effects/autumn_access_denied_color",
-         "effects/coopphoenixloadingscreen",
-         "effects/combinemuzzle1",
-         "sprites/purpleglow1",
-    };
-
-    std::vector<std::string> dmeitems = {
-        "(0) water",
-        "(1) null",
-        "(2) null",
-        "(3) null",
-        "(4) null",
-    "models/extras/speech_info",
-    "models/gibs/glass/glass",
-    "models/inventory_items/cologne_prediction/cologne_prediction_glass",
-    "models/inventory_items/contributor_map_tokens/contributor_charset_color",
-    "models/inventory_items/dogtags/dogtags",
-    "models/inventory_items/dogtags/dogtags_lightray",
-    "models/inventory_items/dogtags/dogtags_outline",
-    "models/inventory_items/dreamhack_trophies/dreamhack_star_blur",
-    "models/inventory_items/hydra_crystal/hydra_crystal",
-    "models/inventory_items/hydra_crystal/hydra_crystal_detail",
-    "models/inventory_items/music_kit/darude_01/mp3_detail",
-    "models/inventory_items/payback_gold_01/payback_gold_01",
-    "models/inventory_items/phoenix_gold_01/phoenix_gold_01",
-    "models/inventory_items/service_medal_2015/glass",
-    "models/inventory_items/service_medal_2016/glass_lvl4",
-    "models/inventory_items/sticker_inspect/sticker_backing",
-    "models/inventory_items/trophy_majors/crystal_blue",
-    "models/inventory_items/trophy_majors/crystal_clear",
-    "models/inventory_items/trophy_majors/gloss",
-    "models/inventory_items/trophy_majors/gold",
-    "models/inventory_items/trophy_majors/gold_dust",
-    "models/inventory_items/trophy_majors/silver_winners",
-    "models/inventory_items/vanguard_gold/vanguard_gold_detail",
-    "models/inventory_items/wildfire_gold/wildfire_gold_detail",
-    "models/player/ct_fbi/ct_fbi_glass",
-    "models/player/t_guerilla/t_guerilla",
-    "models/props_foliage/urban_tree03_branches",
-    "models/props_shacks/fishing_net01",
-    "models/weapons/customization/stickers/cologne2014/esl_c"
-    };
-
-
-
-    std::vector<std::string> killfeedicons = {
-        "Default"
-    };
-
-
-
-    char sc_selectedweapon[256];
-    bool sc_active1 = false;
-    int sc_seed1 = 0;
-    int sc_stattrak1 = 0;
-    bool sc_unk1 = false;
-    char sc_selectedskin[256];
-
-    struct stickerstruct
-    {
-        stickerstruct(int id1, std::string Name1, int count1)
-        {
-            id = id1;
-            Name = Name1;
-            count = count1;
-            Preview = std::to_string(id).append(": ").append(Name1);
-        }
-        int id;
-        std::string Name;
-        int count;
-        bool isSelected;
-        std::string Preview;
-    };
-
-    std::vector<stickerstruct> sc_stickers =
-    {
-
-    };
-
-    struct skinstruct
-    {
-        skinstruct(int id1, std::string Name1, int count1, int rarity1, int color11, int color21, int color31, int color41, float pearl1, DWORD link1)
-        {
-            id = id1;
-            Name = Name1;
-            isSelected = 0;
-            count = count1;
-            Preview = std::to_string(id).append(": ").append(Name1);
-            rarity = rarity1;
-            color1 = color11;
-            color2 = color21;
-            color3 = color31;
-            color4 = color41;
-            pearl = pearl1;
-            link = link1;
-        }
-        int id;
-        std::string Name;
-        bool isSelected;
-        int count;
-        std::string Preview;
-        int rarity;
-        int color1;
-        int color2;
-        int color3;
-        int color4;
-        float pearl;
-        DWORD link;
-    };
-
-    std::vector<skinstruct> sc_skins =
-    {
-
-    };
-    
-    struct selectedweapon
-    {
-        selectedweapon(std::string Name1, std::string icon1)
-        {
-            Name = Name1;
-            isSelected = 0;
-            icon = icon1;
-        }; 
-        std::string Name;
-        std::string icon;
-        bool isSelected;
-    };
-
-
-    bool show = false;
-
-};
-
-inline Options_my opt; 
-
-
-#define SOUND_ENTRY_HASH_SEED 0x444F5441
-
-inline uint32 GenerateSoundEntryHash(char const* pSoundEntry)
-{
-    int nSoundEntryLength = strlen(pSoundEntry);
-    char* pSoundEntryLowerCase = (char*)stackalloc(nSoundEntryLength + 1);
-
-    for (int nIndex = 0; nIndex < nSoundEntryLength; nIndex++)
-        pSoundEntryLowerCase[nIndex] = tolower(pSoundEntry[nIndex]);
-
-    const uint32 nMagicNumber = 0x5bd1e995;
-
-    uint32 nSoundHash = SOUND_ENTRY_HASH_SEED ^ nSoundEntryLength;
-
-    unsigned char* pData = (unsigned char*)pSoundEntryLowerCase;
-
-    while (nSoundEntryLength >= 4)
-    {
-        uint32 nLittleDWord = LittleDWord(*(uint32*)pData);
-
-        nLittleDWord *= nMagicNumber;
-        nLittleDWord ^= nLittleDWord >> 24;
-        nLittleDWord *= nMagicNumber;
-
-        nSoundHash *= nMagicNumber;
-        nSoundHash ^= nLittleDWord;
-
-        pData += 4;
-        nSoundEntryLength -= 4;
-    }
-
-    switch (nSoundEntryLength)
-    {
-    case 3: nSoundHash ^= pData[2] << 16;
-    case 2: nSoundHash ^= pData[1] << 8;
-    case 1: nSoundHash ^= pData[0];
-        nSoundHash *= nMagicNumber;
-    };
-
-    nSoundHash ^= nSoundHash >> 13;
-    nSoundHash *= nMagicNumber;
-    nSoundHash ^= nSoundHash >> 15;
-
-    return nSoundHash;
-}
- 
-
-inline int GetCfgIndexByClassId(int ClassID) {
-    for (int i = 0; i < g_Options.models.value->itemcount; i++)
-    {
-        if (fnv2::hash(g_Options.models.value->arr[i].classid) == ClassID)
-            return i;
-    }
-    return -1;
-}
-
-
-inline int GetCfgIndexByPrefab(int Prefab) {
-    for (int i = 4; i < g_Options.models.value->itemcount; i++)
-    {
-        if (fnv2::hash(g_Options.models.value->arr[i].prefab) == Prefab)
-            return i;
-    }
-    return -1;
-}
-
-
-inline int GetCfgIndex(int item_definition_index)
-{
-    for (int i = 0; i < g_Options.weapons.value->weaponzcount; i++)
-    {
-        if (g_Options.weapons.value->arr[i].defindex == item_definition_index)
-            return i;
-    }
-    return -1;
-}
-
-inline int GetCfgIndex2(int item_definition_index)
-{
-    for (int i = 2; i < g_Options.models.value->itemcount; i++)
-    {
-        if (g_Options.models.value->arr[i].defindex == item_definition_index)
-            return i;
-    }
-    return -1;
-}
-
-
-struct soundlist
-{
-    soundlist(int cfgindex = 0, int sndindex = 0)
-    {
-        this->cfgindex = cfgindex;
-        this->sndindex = sndindex;
-    }
-    int cfgindex = 0;
-    int sndindex = 0; 
-};
-
-inline soundlist GetCfgWavpathBySoundHash(int Hash) {
-    for (int i = 3; i < g_Options.models.value->itemcount; i++)
-    {
-        for (int j = 0; j < g_Options.models.value->arr[i].soundcount; j++)
-            if (g_Options.models.value->arr[i].sounds[j].hash == Hash)
-                if (g_Options.models.value->arr[i].sound_active)
-                    return soundlist(i, j);
-                else return soundlist(-1, 0);
-    }
-    return soundlist(-1, 0);
-}
-
-
-
-void OnLoadCfg();
-void OnLevelInit();
-
-
-
-
-
-
-
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/Other.cpp b/SpyCustom/Other.cpp
deleted file mode 100644
index 8698c05..0000000
--- a/SpyCustom/Other.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-#include "Other.hpp"
-#include "PatternScan.hpp"
-
-
-
-void UpdateFlashLight(CFlashlightEffect* pFlashLight, const Vector& vecPos, const Vector& vecForward, const Vector& vecRight, const Vector& vecUp)
-{ 
-    typedef void(__thiscall* UpdateLight_t)(void*, int, const Vector&, const Vector&, const Vector&, const Vector&, float, float, float, bool, const char*);
-
-    static UpdateLight_t oUpdateLight = NULL;
-
-    if (!oUpdateLight)
-    {
-        DWORD callInstruction = FindPatternV2("client.dll", "E8 ? ?? ? ? 8B 06 F3 0F 10 46");     
-        DWORD relativeAddress = *(DWORD*)(callInstruction + 1);    
-        DWORD nextInstruction = callInstruction + 5;       
-        oUpdateLight = (UpdateLight_t)(nextInstruction + relativeAddress);         
-    }
-
-    oUpdateLight(pFlashLight, pFlashLight->m_nEntIndex, vecPos, vecForward, vecRight, vecUp,
-        pFlashLight->m_flFov, pFlashLight->m_flFarZ, pFlashLight->m_flLinearAtten, pFlashLight->m_bCastsShadows,
-        pFlashLight->m_textureName);
-}
-
-
-CFlashlightEffect* CreateFlashLight(int nEntIndex, const char* pszTextureName, float flFov, float flFarZ, float flLinearAtten)
-{
-  
-    CFlashlightEffect* pFlashLight = reinterpret_cast<CFlashlightEffect*>(iff.g_pMemAlloc->Alloc(sizeof(CFlashlightEffect)));
-
-    if (!pFlashLight)
-        return NULL;
-
-      static DWORD oConstructor = FindPatternV2("client.dll", "55 8B EC F3 0F 10 45 ? B8");
-
-    __asm
-    {
-        movss xmm3, flFov
-        mov ecx, pFlashLight
-        push flLinearAtten
-        push flFarZ
-        push pszTextureName
-        push nEntIndex
-        call oConstructor
-    }
-    pFlashLight->m_bIsOn = true;
-
-
-    return pFlashLight;
-}
-
-void DestroyFlashLight(CFlashlightEffect* pFlashLight)
-{
-    static DWORD oDestructor = FindPatternV2("client.dll", "56 8B F1 E8 ? ? ? ? 8B 4E 28");
-
-    __asm
-    {
-        mov ecx, pFlashLight
-        push ecx
-        call oDestructor
-    }
-
-}
-
-void AngleVectors(const Vector& angles, Vector* forward, Vector* right, Vector* up)
-{
-    float sr, sp, sy, cr, cp, cy;
-
-    SinCos(DEG2RAD(angles[1]), &sy, &cy);
-    SinCos(DEG2RAD(angles[0]), &sp, &cp);
-    SinCos(DEG2RAD(angles[2]), &sr, &cr);
-
-    if (forward)
-    {
-        forward->x = cp * cy;
-        forward->y = cp * sy;
-        forward->z = -sp;
-    }
-
-    if (right)
-    {
-        right->x = (-1 * sr * sp * cy + -1 * cr * -sy);
-        right->y = (-1 * sr * sp * sy + -1 * cr * cy);
-        right->z = -1 * sr * cp;
-    }
-
-    if (up)
-    {
-        up->x = (cr * sp * cy + -sr * -sy);
-        up->y = (cr * sp * sy + -sr * cy);
-        up->z = cr * cp;
-    }
-}
-
-
-static bool ToggleButton(ButtonCode_t code)
-{
-    static int buttonPressedTick = 0;
-    if (iff.g_pInputSystem->IsButtonDown(code) && (GetTickCount64() - buttonPressedTick) > 300)
-    {
-        buttonPressedTick = GetTickCount64();
-        return true;
-    }
-    return false;
-}
-
-void FlashlightRun(C_BasePlayer* local)
-{
-    static CFlashlightEffect* pFlashLight = NULL;
-
-    if (opt.disconnected)
-    {
-#ifdef DEBUG
-        printf("nullify pFlashlight bc disconnected\n");
-#endif
-        pFlashLight = NULL;
-        opt.disconnected = 0;
-    }
-
-    if (ToggleButton(KEY_L))
-    {
-        if (!pFlashLight)
-        {
-#ifdef DEBUG
-            printf("creating fl\n");
-#endif
-            pFlashLight = CreateFlashLight(local->GetIndex(), g_Options.flashlightTexture.value->mystring, *g_Options.flashlightFOV, *g_Options.flashlightFarZ, *g_Options.flashlightLinearAtten); 
-            iff.g_pEngineClient->ExecuteClientCmd("play items/flashlight1.wav");
-        }
-        else
-        {
-#ifdef DEBUG
-            printf("destroying fl\n");
-#endif
-            DestroyFlashLight(pFlashLight);
-            pFlashLight = NULL;
-            iff.g_pEngineClient->ExecuteClientCmd("play items/flashlight1.wav");
-        }
-    }
-
-    if (pFlashLight)
-    { 
-        Vector f, r, u;
-        Vector viewAngles;
-
-        iff.g_pEngineClient->GetViewAngles(viewAngles);
-        AngleVectors(viewAngles, &f, &r, &u);
-
-        pFlashLight->m_bIsOn =  true;
-        pFlashLight->m_bCastsShadows = *g_Options.flashlightShadows;
-        pFlashLight->m_flFov = *g_Options.flashlightFOV;       
-
-        UpdateFlashLight(pFlashLight, local->GetOrigin() + local->GetViewOffset(), f, r, u);
-         
-    }
-}
-
-
-#define DRAW_SCREEN_EFFECT(material) \
-{ \
-    const auto drawFunction = relativeToAbsolute<uintptr_t>(FindPatternV2("client.dll", "E8 ? ? ? ? 83 C4 0C 8D 4D F8") + 1); \
-    int w, h; \
-    iff.g_pVGuiSurface->GetScreenSize(w, h); \
-    __asm { \
-        __asm push h \
-        __asm push w \
-        __asm push 0 \
-        __asm xor edx, edx \
-        __asm mov ecx, material \
-        __asm call drawFunction \
-        __asm add esp, 12 \
-    } \
-}
-
-void NightvisionRun(C_BasePlayer* local) {
-     
-    static int m_flNightVisionAlpha = NetvarSys::Get().GetOffset("DT_CSPlayer", "m_flFlashDuration") - 0x1C;
-  
-    if (ToggleButton(KEY_N) )
-    {
-        if (!local->GetNightvision())
-        {
-            local->GetNightvision() = true;
-            *(float*)(uintptr_t(local) + m_flNightVisionAlpha) = 1.0f;
-            iff.g_pEngineClient->ExecuteClientCmd("play items/nvg_on.wav");
-
-        }
-        else
-        {
-            local->GetNightvision() = false;
-            *(float*)(uintptr_t(local) + m_flNightVisionAlpha) = 0;
-            iff.g_pEngineClient->ExecuteClientCmd("play items/nvg_off.wav");
-        }
-    }
-}
-
-
-void do_precipitation() {
-    static void* rain_networkable = nullptr; 
-    C_Precipitation* rain_ent = (C_Precipitation*)iff.g_pEntityList->GetClientEntity(MAX_EDICTS - 1);
-    static ClientClass* precipitation_client_class = nullptr;
-
-
-
-
-    if (!iff.g_pEngineClient->IsInGame() || !iff.g_pEngineClient->IsConnected()) {
-        rain_networkable = rain_ent = nullptr;
-        return;
-    }
-
-    int localplayer_index = iff.g_pEngineClient->GetLocalPlayer();
-    C_BasePlayer* localplayer = static_cast<C_BasePlayer*>(iff.g_pEntityList->GetClientEntity(localplayer_index));
-    if (!localplayer) return;
-
-    if (!(localplayer->GetLifeState() == LIFE_ALIVE && localplayer->GetHealth() > 0))
-        return;
-
-    
-
-    if (!precipitation_client_class) {
-        for (auto pclass = iff.g_pClient->GetAllClasses(); pclass && !precipitation_client_class; pclass = pclass->m_pNext)
-            if (strstr(pclass->GetName(), "CPrecipitation"))  
-            {
-#ifdef DEBUG
-                printf("class found %x\n", pclass);
-#endif
-                precipitation_client_class = pclass;
-            }
-
-    }
-   
-
-    else {
-        if (!rain_ent && precipitation_client_class && precipitation_client_class->m_pCreateFn) {
-
-#ifdef DEBUG
-            printf("Creating precipitation\n");
-#endif
-
-            rain_networkable = ((void* (*)(int, int))precipitation_client_class->m_pCreateFn)(MAX_EDICTS - 1, 0);
-
-            if (rain_networkable) {
-                rain_ent = (C_Precipitation*)iff.g_pEntityList->GetClientEntity(MAX_EDICTS - 1);
-
-                rain_ent->GetPrecipitationType() = (PrecipitationType_t)*g_Options.weathertype; 
-
-                rain_ent->PreDataUpdate(DataUpdateType_t::DATA_UPDATE_CREATED);
-                rain_ent->OnPreDataChanged(DataUpdateType_t::DATA_UPDATE_CREATED);
-
-                rain_ent->GetMins() = Vector(-32767.0f, -32767.0f, -32767.0f);
-                rain_ent->GetMaxs() = Vector(32767.0f, 32767.0f, 32767.0f);
-
-                rain_ent->OnDataChanged(DataUpdateType_t::DATA_UPDATE_CREATED);
-                rain_ent->PostDataUpdate(DataUpdateType_t::DATA_UPDATE_CREATED);
-
-#ifdef DEBUG
-                printf("Created precipitation %x\n", rain_ent);
-#endif
-            }
-        }
-    }
-
-}
-
-
diff --git a/SpyCustom/Other.hpp b/SpyCustom/Other.hpp
deleted file mode 100644
index 6ba09d3..0000000
--- a/SpyCustom/Other.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef OTHER
-#define OTHER
-#pragma once
-
-#include "Interfaces.hpp"
-#include "Options.hpp"
-
-#include "c_baseentity.h"
-
-void FlashlightRun(C_BasePlayer* local);
-void NightvisionRun(C_BasePlayer* local);
-
-void do_precipitation();
-
-#endif OTHER
\ No newline at end of file
diff --git a/SpyCustom/PHandle.h b/SpyCustom/PHandle.h
deleted file mode 100644
index ff606db..0000000
--- a/SpyCustom/PHandle.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef PHANDLE_H
-#define PHANDLE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-
-namespace vgui
-{
-
-	class Panel;
-
-	class PHandle
-	{
-	public:
-		PHandle() : m_iPanelID(INVALID_PANEL) {}   
-
-		Panel* Get();
-		Panel* Set(Panel* pPanel);
-		Panel* Set(HPanel hPanel);
-
-		operator Panel* () { return Get(); }
-		Panel* operator ->() { return Get(); }
-		Panel* operator = (Panel* pPanel) { return Set(pPanel); }
-
-		bool operator == (Panel* pPanel) { return (Get() == pPanel); }
-		operator bool() { return Get() != 0; }
-
-	private:
-		HPanel m_iPanelID;
-	};
-
-	class VPanelHandle
-	{
-	public:
-		VPanelHandle() : m_iPanelID(INVALID_PANEL) {}
-
-		VPANEL Get();
-		VPANEL Set(VPANEL pPanel);
-
-		operator VPANEL () { return Get(); }
-		VPANEL operator = (VPANEL pPanel) { return Set(pPanel); }
-
-		bool operator == (VPANEL pPanel) { return (Get() == pPanel); }
-		operator bool() { return Get() != 0; }
-
-	private:
-		HPanel m_iPanelID;
-	};
-
-	template< class PanelType >
-	class DHANDLE : public PHandle
-	{
-	public:
-		PanelType* Get() { return (PanelType*)PHandle::Get(); }
-		PanelType* Set(PanelType* pPanel) { return (PanelType*)PHandle::Set(pPanel); }
-		PanelType* Set(HPanel hPanel) { return (PanelType*)PHandle::Set(hPanel); }
-
-		operator PanelType* () { return (PanelType*)PHandle::Get(); }
-		PanelType* operator ->() { return (PanelType*)PHandle::Get(); }
-		PanelType* operator = (PanelType* pPanel) { return (PanelType*)PHandle::Set(pPanel); }
-		bool operator == (Panel* pPanel) { return (PHandle::Get() == pPanel); }
-		operator bool() { return PHandle::Get() != NULL; }
-	};
-
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Panel.h b/SpyCustom/Panel.h
deleted file mode 100644
index 6d48b3a..0000000
--- a/SpyCustom/Panel.h
+++ /dev/null
@@ -1,962 +0,0 @@
-#ifndef PANEL_H
-#define PANEL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlflags.h"
-#include "vgui.h"
-#include "Dar.h"
-#include "MessageMap.h"
-#if defined( VGUI_USEKEYBINDINGMAPS )
-#include "KeyBindingMap.h"
-#endif
-#include "IClientPanel.h"
-#include "IScheme.h"
-#include "Controls.h"
-#include "PHandle.h"
-#include "PanelAnimationVar.h"
-#include "color.h"
-#include "keyvalues.h"
-#include "ikeyvaluessystem.h"
-#include "utlsymbol.h"
-#include "BuildGroup.h"
-#include "dmxelement.h"
-
-#ifdef PostMessage
-#undef PostMessage
-#endif
-
-#ifdef SetCursor
-#undef SetCursor
-#endif
-
-
-class CUtlBuffer;
-struct DmxElementUnpackStructure_t;
-
-namespace vgui
-{
-
-#if !defined( _GAMECONSOLE )
-#define VGUI_USEDRAGDROP 1
-#endif
-
-#if defined( VGUI_USEKEYBINDINGMAPS )
-	struct PanelKeyBindingMap;
-#endif
-	template< class T >
-	inline T* SETUP_PANEL(T* panel)
-	{
-		panel->MakeReadyForUse();
-		return panel;
-	}
-
-#define CREATE_PANEL(type, parent, name) (SETUP_PANEL(new type(parent, name)))
-
-#if defined( VGUI_USEDRAGDROP )
-	struct DragDrop_t;
-	class Menu;
-#endif
-
-
-
-	class Panel;
-
-	struct SizerAddArgs_t
-	{
-		SizerAddArgs_t()
-		{
-			m_flExpandFactor = 0.0f;
-			m_nPadding = 5;
-			m_bMinorExpand = true;
-			m_nMinX = -1;
-			m_nMinY = -1;
-			m_bIgnoreMemberMin = false;
-		}
-
-		SizerAddArgs_t& Expand(float flExpandFactor) { m_flExpandFactor = flExpandFactor; return *this; }
-		SizerAddArgs_t& Padding(int nPadding) { m_nPadding = nPadding; return *this; }
-		SizerAddArgs_t& MinorExpand(bool bMinorExpand) { m_bMinorExpand = bMinorExpand; return *this; }
-		SizerAddArgs_t& MinSize(int nMinX, int nMinY) { m_nMinX = nMinX; m_nMinY = nMinY; return *this; }
-		SizerAddArgs_t& MinX(int nMinX) { m_nMinX = nMinX; return *this; }
-		SizerAddArgs_t& MinY(int nMinY) { m_nMinY = nMinY; return *this; }
-
-		SizerAddArgs_t& IgnoreMemberMin(bool bIgnoreMemberMin = true) { m_bIgnoreMemberMin = bIgnoreMemberMin; return *this; }
-
-		SizerAddArgs_t& FixedSize(int nX, int nY)
-		{
-			IgnoreMemberMin(true);
-			MinSize(nX, nY);
-			Expand(0.f);
-			MinorExpand(false);
-			return *this;
-		}
-
-		float m_flExpandFactor;
-		int m_nPadding;
-		bool m_bMinorExpand;
-		int m_nMinX;
-		int m_nMinY;
-		bool m_bIgnoreMemberMin;
-	};
-
-
-	enum SizerLayoutDirection_t
-	{
-		ESLD_HORIZONTAL,     
-		ESLD_VERTICAL	     
-	};
-
-	enum SizerElementType_t
-	{
-		ESET_SIZER,
-		ESET_PANEL,
-		ESET_SPACER,
-	};
-
-	class CSizerBase
-	{
-	public:
-		CSizerBase();
-		virtual ~CSizerBase();
-
-		int GetElementCount() { return m_Members.Count(); }
-		SizerElementType_t GetElementType(int i);
-		Panel* GetPanel(int i);
-
-		void SetElementArgs(int nIndex, const SizerAddArgs_t& args) { m_Members[nIndex].Fill(args); }
-
-		void InsertPanel(int nIndex, Panel* pPanel, const SizerAddArgs_t& args);
-		void InsertSizer(int nIndex, CSizerBase* pSizer, const SizerAddArgs_t& args);
-		void InsertSpacer(int nIndex, const SizerAddArgs_t& args);
-
-		void AddPanel(Panel* pPanel, const SizerAddArgs_t& args) { InsertPanel(GetElementCount(), pPanel, args); }
-		void AddSizer(CSizerBase* pSizer, const SizerAddArgs_t& args) { InsertSizer(GetElementCount(), pSizer, args); }
-		void AddSpacer(const SizerAddArgs_t& args) { InsertSpacer(GetElementCount(), args); }
-
-		void RemoveElement(int i, bool bDelete);
-		void RemoveAllMembers(bool bDelete);
-
-		void GetMinSize(int& OutX, int& OutY);
-
-		void RecursiveInvalidateCachedSize();
-
-		virtual void DoLayout(int BaseX, int BaseY, int SizeX, int SizeY) = 0;
-		virtual void CalculateSize() = 0;
-
-	protected:
-		class CSizerMember
-		{
-			friend class CSizerBase;         
-
-		public:
-			SizerElementType_t GetElementType() const;
-			Panel* GetPanel() const;
-
-			void GetMemberMinSize(int& OutX, int& OutY);
-			void RecursiveInvalidateCachedSize();
-			void Place(int BaseX, int BaseY, int SizeX, int SizeY);
-
-			float GetExpandFactor() { return m_flExpandFactor; }
-			bool GetMinorExpand() { return m_bMinorExpand; }
-
-			void DiscardOwnedSizer();
-
-			bool IsVisible();
-
-			void Fill(const SizerAddArgs_t& args);
-
-		private:
-			void RecursiveRemove(bool bDelete);
-
-			Panel* m_pPanel;
-			CSizerBase* m_pSizer;
-
-			int m_nPadding;              
-			float m_flExpandFactor;
-			bool m_bMinorExpand;
-			bool m_bIgnoreMemberMin;
-			int m_nMinX;
-			int m_nMinY;
-		};
-
-		CUtlVector<CSizerMember> m_Members;
-		int m_nMinXSize;
-		int m_nMinYSize;
-	};
-
-	inline int SizerMajorAxis(SizerLayoutDirection_t Dir, int X, int Y) { return (Dir == ESLD_HORIZONTAL) ? X : Y; }
-	inline int SizerMinorAxis(SizerLayoutDirection_t Dir, int X, int Y) { return (Dir == ESLD_VERTICAL) ? X : Y; }
-	inline int SizerXAxis(SizerLayoutDirection_t Dir, int MajorAxis, int MinorAxis) { return (Dir == ESLD_HORIZONTAL) ? MajorAxis : MinorAxis; }
-	inline int SizerYAxis(SizerLayoutDirection_t Dir, int MajorAxis, int MinorAxis) { return (Dir == ESLD_VERTICAL) ? MajorAxis : MinorAxis; }
-
-	class CBoxSizer : public CSizerBase
-	{
-	public:
-		CBoxSizer(SizerLayoutDirection_t LayoutDirection);
-
-		virtual void CalculateSize();
-		virtual void DoLayout(int BaseX, int BaseY, int SizeX, int SizeY);
-
-	protected:
-		SizerLayoutDirection_t m_LayoutDirection;
-	};
-
-
-	struct OverridableColorEntry
-	{
-		char const* name() { return m_pszScriptName; }
-
-		char const* m_pszScriptName;
-		Color* m_pColor;
-		Color		m_colFromScript;
-		UtlSymId_t	m_sColorNameFromScript;
-		bool		m_bOverridden;
-	};
-
-#define REGISTER_COLOR_AS_OVERRIDABLE( name, scriptname )			\
-	AddToOverridableColors( &name, scriptname );
-
-
-#define DECLARE_VGUI_UNPACK()	\
-	DECLARE_DMXELEMENT_UNPACK()	\
-	private: \
-		static DmxElementUnpackStructure_t *s_pUnpackParams; \
-	public:	 \
-		virtual const DmxElementUnpackStructure_t* GetUnpackStructure() const { return s_pUnpackParams; }
-
-#define DECLARE_VGUI_UNPACK_NAMESPACE( _namespace ) \
-	template <typename T> friend DmxElementUnpackStructure_t *DmxElementUnpackInit##_namespace(T *); \
-	private: \
-		static DmxElementUnpackStructure_t *s_pUnpackParams; \
-	public:	 \
-		virtual const DmxElementUnpackStructure_t* GetUnpackStructure() const { return s_pUnpackParams; }
-
-#define BEGIN_VGUI_UNPACK( _structName ) BEGIN_DMXELEMENT_UNPACK( _structName )
-#define END_VGUI_UNPACK( _structName ) \
-	END_DMXELEMENT_UNPACK( _structName, s_pUnpackParams ) \
- 	DmxElementUnpackStructure_t *_structName::s_pUnpackParams = _structName##_UnpackInit::s_pUnpack; 
-
-#define BEGIN_VGUI_UNPACK_NAMESPACE( _nameSpace, _structName ) BEGIN_DMXELEMENT_UNPACK_NAMESPACE( _nameSpace, _structName )
-#define END_VGUI_UNPACK_NAMESPACE( _nameSpace, _structName ) \
-	END_DMXELEMENT_UNPACK_NAMESPACE( _nameSpace, _structName, s_pUnpackParams ) \
- 	DmxElementUnpackStructure_t *_structName::s_pUnpackParams = _namespace##_structName##_UnpackInit::s_pUnpack; 
-
-
-	class IPanelAnimationPropertyConverter
-	{
-	public:
-		virtual void GetData(Panel* panel, KeyValues* kv, PanelAnimationMapEntry* entry) = 0;
-		virtual void SetData(Panel* panel, KeyValues* kv, PanelAnimationMapEntry* entry) = 0;
-		virtual void InitFromDefault(Panel* panel, PanelAnimationMapEntry* entry) = 0;
-	};
-
-#if defined( VGUI_USEKEYBINDINGMAPS )
-	enum KeyBindingContextHandle_t
-	{
-		INVALID_KEYBINDINGCONTEXT_HANDLE = 0xffffffff,
-	};
-#endif
-
-#define PANEL_ROUND_CORNER_TOP_LEFT		(1 << 0)
-#define PANEL_ROUND_CORNER_TOP_RIGHT	(1 << 1)
-#define PANEL_ROUND_CORNER_BOTTOM_LEFT	(1 << 2)
-#define PANEL_ROUND_CORNER_BOTTOM_RIGHT (1 << 3)
-#define PANEL_ROUND_CORNER_ALL			PANEL_ROUND_CORNER_TOP_LEFT | PANEL_ROUND_CORNER_TOP_RIGHT | PANEL_ROUND_CORNER_BOTTOM_LEFT | PANEL_ROUND_CORNER_BOTTOM_RIGHT
-	class Panel : public IClientPanel
-	{
-		DECLARE_CLASS_SIMPLE_NOBASE(Panel);
-		DECLARE_DMXELEMENT_UNPACK_NAMESPACE(vgui);
-
-	public:
-		static void InitPropertyConverters(void);
-		static void AddPropertyConverter(char const* typeName, IPanelAnimationPropertyConverter* converter);
-
-		Panel();
-		Panel(Panel* parent);
-		Panel(Panel* parent, const char* panelName);
-		Panel(Panel* parent, const char* panelName, HScheme scheme);
-
-		virtual ~Panel();
-
-		virtual VPANEL GetVPanel() { return _vpanel; }
-		HPanel ToHandle() const;
-
-
-		void SetName(const char* panelName);             
-		const char* GetName();		        
-		const char* GetClassName();             
-
-		void MakeReadyForUse();                      
-
-		void SetPos(int x, int y);		            
-		void GetPos(int& x, int& y);		     
-		void SetSize(int wide, int tall);	    
-		void GetSize(int& wide, int& tall);	    
-		void SetBounds(int x, int y, int wide, int tall);		   
-		void GetBounds(int& x, int& y, int& wide, int& tall);	   
-		int  GetWide();	    
-		void SetWide(int wide);	    
-		int  GetTall();	    
-		void SetTall(int tall);	    
-		void SetMinimumSize(int wide, int tall);		        
-		void GetMinimumSize(int& wide, int& tall);	    
-		bool IsBuildModeEditable();	      
-		void SetBuildModeEditable(bool state);     
-		bool IsBuildModeDeletable();      
-		void SetBuildModeDeletable(bool state);	   
-		bool IsBuildModeActive();	       
-		void SetZPos(int z);	           
-		int  GetZPos(void);
-		void SetAlpha(int alpha);	          
-		int GetAlpha();	    
-
-		virtual void SetVisible(bool state);
-		virtual bool IsVisible();
-		virtual bool IsFullyVisible();		      
-
-		virtual VPANEL IsWithinTraverse(int x, int y, bool traversePopups);	          
-		MESSAGE_FUNC(Repaint, "Repaint");							        
-		virtual void PostMessage(VPANEL target, KeyValues* message, float delaySeconds = 0.0f);
-
-		bool IsWithin(int x, int y);   
-		void LocalToScreen(int& x, int& y);
-		void ScreenToLocal(int& x, int& y);
-		void ParentLocalToScreen(int& x, int& y);
-		void MakePopup(bool showTaskbarIcon = true, bool disabled = false);		               
-		virtual void OnMove();
-
-		virtual Panel* GetParent();
-		virtual VPANEL GetVParent();
-		virtual void SetParent(Panel* newParent);
-		virtual void SetParent(VPANEL newParent);
-		virtual bool HasParent(VPANEL potentialParent);
-
-		int GetChildCount();
-		Panel* GetChild(int index);
-		int FindChildIndexByName(const char* childName);
-		Panel* FindChildByName(const char* childName, bool recurseDown = false);
-		Panel* FindSiblingByName(const char* siblingName);
-		void CallParentFunction(KeyValues* message);
-
-		virtual bool LookupElementBounds(const char* elementName, int& x, int& y, int& wide, int& tall) { return false; }
-
-		virtual void SetAutoDelete(bool state);		            
-		virtual bool IsAutoDeleteSet();
-		virtual void DeletePanel();				        
-
-		virtual void AddActionSignalTarget(Panel* messageTarget);
-		virtual void AddActionSignalTarget(VPANEL messageTarget);
-		virtual void RemoveActionSignalTarget(Panel* oldTarget);
-		virtual void PostActionSignal(KeyValues* message);			       
-		virtual bool RequestInfoFromChild(const char* childName, KeyValues* outputData);
-		virtual void PostMessageToChild(const char* childName, KeyValues* messsage);
-		virtual void PostMessage(Panel* target, KeyValues* message, float delaySeconds = 0.0f);
-		virtual bool RequestInfo(KeyValues* outputData);				                       
-		virtual bool SetInfo(KeyValues* inputData);						            
-		virtual void SetSilentMode(bool bSilent);						              
-
-		virtual void InstallMouseHandler(Panel* pHandler);	            
-
-		virtual void   SetEnabled(bool state);
-		virtual bool   IsEnabled();
-		virtual bool   IsPopup();	         
-		virtual void   GetClipRect(int& x0, int& y0, int& x1, int& y1);
-		virtual void   MoveToFront();
-
-		enum PinCorner_e
-		{
-			PIN_TOPLEFT = 0,
-			PIN_TOPRIGHT,
-			PIN_BOTTOMLEFT,
-			PIN_BOTTOMRIGHT,
-			PIN_NO,
-
-			PIN_CENTER_TOP,
-			PIN_CENTER_RIGHT,
-			PIN_CENTER_BOTTOM,
-			PIN_CENTER_LEFT,
-		};
-
-		enum AutoResize_e
-		{
-			AUTORESIZE_NO = 0,
-			AUTORESIZE_RIGHT,
-			AUTORESIZE_DOWN,
-			AUTORESIZE_DOWNANDRIGHT,
-		};
-
-		void SetPinCorner(PinCorner_e pinCorner, int nOffsetX, int nOffsetY);
-
-		void SetAutoResize(PinCorner_e pinCorner, AutoResize_e resizeDir, int nPinOffsetX, int nPinOffsetY, int nUnpinnedCornerOffsetX, int nUnpinnedCornerOffsetY);
-
-		AutoResize_e GetAutoResize();
-		PinCorner_e GetPinCorner();
-
-		void GetPinOffset(int& dx, int& dy);
-		void GetResizeOffset(int& dx, int& dy);
-
-		void PinToSibling(const char* pszSibling, PinCorner_e pinOurCorner, PinCorner_e pinSibling);
-		void UpdateSiblingPin(void);
-
-		virtual void SetBgColor(Color color);
-		virtual void SetFgColor(Color color);
-		virtual Color GetBgColor();
-		virtual Color GetFgColor();
-
-		virtual void SetCursor(HCursor cursor);
-		virtual HCursor GetCursor();
-		virtual void RequestFocus(int direction = 0);
-		virtual bool HasFocus();
-		virtual void InvalidateLayout(bool layoutNow = false, bool reloadScheme = false);
-		virtual bool RequestFocusPrev(VPANEL panel = NULL);
-		virtual bool RequestFocusNext(VPANEL panel = NULL);
-		virtual void   SetTabPosition(int position);
-		virtual int    GetTabPosition();
-		virtual void SetBorder(IBorder* border);
-		virtual IBorder* GetBorder();
-		virtual void SetPaintBorderEnabled(bool state);
-		virtual void SetPaintBackgroundEnabled(bool state);
-		virtual void SetPaintEnabled(bool state);
-		virtual void SetPostChildPaintEnabled(bool state);
-		virtual void SetPaintBackgroundType(int type);                    
-		virtual void GetInset(int& left, int& top, int& right, int& bottom);
-		virtual void GetPaintSize(int& wide, int& tall);
-		virtual void SetBuildGroup(BuildGroup* buildGroup);
-		virtual bool IsBuildGroupEnabled();
-		virtual bool IsCursorNone();
-		virtual bool IsCursorOver();		          
-		virtual void MarkForDeletion();		       
-		virtual bool IsLayoutInvalid();		       
-		virtual Panel* HasHotkey(wchar_t key);			       
-		virtual bool IsOpaque();
-		bool IsRightAligned();		             
-		bool IsBottomAligned();		             
-		bool IsPercentage();		           
-
-		virtual HScheme GetScheme();
-		virtual void SetScheme(const char* tag);
-		virtual void SetScheme(HScheme scheme);
-		virtual Color GetSchemeColor(const char* keyName, IScheme* pScheme);
-		virtual Color GetSchemeColor(const char* keyName, Color defaultColor, IScheme* pScheme);
-
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-
-		virtual void ApplySettings(KeyValues* inResourceData);
-		virtual void OnUnserialized(CDmxElement* pElement);
-
-		virtual void GetSettings(KeyValues* outResourceData);
-
-		virtual const char* GetDescription();
-
-		virtual const char* GetModuleName();
-
-		virtual void ApplyUserConfigSettings(KeyValues* userConfig);
-
-		virtual void GetUserConfigSettings(KeyValues* userConfig);
-
-		virtual bool HasUserConfigSettings();
-
-		virtual void OnMessage(const KeyValues* params, VPANEL fromPanel);	        
-		MESSAGE_FUNC_CHARPTR(OnCommand, "Command", command);	       
-		MESSAGE_FUNC(OnMouseCaptureLost, "MouseCaptureLost");	       
-		MESSAGE_FUNC(OnSetFocus, "SetFocus");			        
-		MESSAGE_FUNC(OnKillFocus, "KillFocus");		        
-		MESSAGE_FUNC(OnDelete, "Delete");				            
-		virtual void OnThink();							           
-		virtual void OnChildAdded(VPANEL child);		          
-		virtual void OnSizeChanged(int newWide, int newTall);	          
-
-		virtual void OnTick();
-
-		MESSAGE_FUNC_INT_INT(OnCursorMoved, "OnCursorMoved", x, y);
-		virtual void OnCursorEntered();
-		virtual void OnCursorExited();
-		virtual void OnMousePressed(MouseCode code);
-		virtual void OnMouseDoublePressed(MouseCode code);
-		virtual void OnMouseReleased(MouseCode code);
-		virtual void OnMouseWheeled(int delta);
-
-		virtual void SetTriplePressAllowed(bool state);
-		virtual bool IsTriplePressAllowed() const;
-		virtual void OnMouseTriplePressed(MouseCode code);
-
-		static char const* KeyCodeToString(KeyCode code);
-		static wchar_t const* KeyCodeToDisplayString(KeyCode code);
-		static wchar_t const* KeyCodeModifiersToDisplayString(KeyCode code, int modifiers);  
-
-		static KeyCode		StringToKeyCode(char const* str);
-#if defined( VGUI_USEKEYBINDINGMAPS )
-		static KeyBindingContextHandle_t   CreateKeyBindingsContext(char const* filename, char const* pathID = 0);
-		virtual void		SetKeyBindingsContext(KeyBindingContextHandle_t handle);
-		virtual KeyBindingContextHandle_t	GetKeyBindingsContext() const;
-		virtual bool		IsValidKeyBindingsContext() const;
-
-		static int			GetPanelsWithKeyBindingsCount(KeyBindingContextHandle_t handle);
-		static Panel* GetPanelWithKeyBindings(KeyBindingContextHandle_t handle, int index);
-
-		static void			RevertKeyBindings(KeyBindingContextHandle_t handle);
-
-		static void			ReloadKeyBindings(KeyBindingContextHandle_t handle);
-		static void			SaveKeyBindings(KeyBindingContextHandle_t handle);
-		static void			SaveKeyBindingsToFile(KeyBindingContextHandle_t handle, char const* filename, char const* pathID = 0);
-		static void			LoadKeyBindings(KeyBindingContextHandle_t handle);
-		static void			LoadKeyBindingsForOnePanel(KeyBindingContextHandle_t handle, Panel* panelOfInterest);
-
-		virtual bool		IsKeyRebound(KeyCode code, int modifiers);
-		virtual bool		IsKeyOverridden(KeyCode code, int modifiers);
-
-		virtual void		AddKeyBinding(char const* bindingName, int keycode, int modifiers);
-
-		KeyBindingMap_t* LookupBinding(char const* bindingName);
-		KeyBindingMap_t* LookupBindingByKeyCode(KeyCode code, int modifiers);
-		void				LookupBoundKeys(char const* bindingName, CUtlVector< BoundKey_t* >& list);
-		BoundKey_t* LookupDefaultKey(char const* bindingName);
-		PanelKeyBindingMap* LookupMapForBinding(char const* bindingName);
-
-		int				GetKeyMappingCount();
-
-		void			RevertKeyBindingsToDefault();
-		void			RemoveAllKeyBindings();
-		void			ReloadKeyBindings();
-		virtual void	EditKeyBindings();
-
-		void			SaveKeyBindingsToBuffer(int level, CUtlBuffer& buf);
-		bool			ParseKeyBindings(KeyValues* kv);
-
-		virtual char const* GetKeyBindingsFile() const;
-		virtual char const* GetKeyBindingsFilePathID() const;
-
-		void			SetAllowKeyBindingChainToParent(bool state);
-		bool			IsKeyBindingChainToParentAllowed() const;
-#endif  
-
-		virtual void OnKeyCodePressed(KeyCode code);
-		virtual void OnKeyCodeTyped(KeyCode code);
-		virtual void OnKeyTyped(wchar_t unichar);
-		virtual void OnKeyCodeReleased(KeyCode code);
-		virtual void OnKeyFocusTicked();       
-
-		MESSAGE_FUNC(OnMouseFocusTicked, "OnMouseFocusTicked");
-
-		virtual void PaintBackground();
-		virtual void Paint();
-		virtual void PaintBorder();
-		virtual void PaintBuildOverlay();		        
-		virtual void PostChildPaint();
-		virtual void PerformLayout();
-
-		DECLARE_PANELMAP();
-
-		virtual VPANEL GetCurrentKeyFocus();
-
-		BaseTooltip* GetTooltip();
-		void	SetTooltip(BaseTooltip* pToolTip, const char* pszText);
-
-		virtual bool IsProportional() { return _flags.IsFlagSet(IS_PROPORTIONAL); }
-		virtual void SetProportional(bool state);
-
-		virtual void SetMouseInputEnabled(bool state);
-		virtual void SetKeyBoardInputEnabled(bool state);
-		virtual bool IsMouseInputEnabled();
-		virtual bool IsKeyBoardInputEnabled();
-
-		void		DisableMouseInputForThisPanel(bool bDisable);
-		bool		IsMouseInputDisabledForThisPanel() const;
-
-		virtual void DrawTexturedBox(int x, int y, int wide, int tall, Color color, float normalizedAlpha);
-		virtual void DrawBox(int x, int y, int wide, int tall, Color color, float normalizedAlpha, bool hollow = false);
-		virtual void DrawBoxFade(int x, int y, int wide, int tall, Color color, float normalizedAlpha, unsigned int alpha0, unsigned int alpha1, bool bHorizontal, bool hollow = false);
-		virtual void DrawHollowBox(int x, int y, int wide, int tall, Color color, float normalizedAlpha);
-		virtual void DrawHollowBox(int x, int y, int wide, int tall, Color color, float normalizedAlpha, int cornerWide, int cornerTall);
-
-		unsigned char GetRoundedCorners() { return m_roundedCorners; }
-		void SetRoundedCorners(unsigned char cornerFlags) { m_roundedCorners = cornerFlags; }
-		bool ShouldDrawTopLeftCornerRounded() { return 0 != (m_roundedCorners & PANEL_ROUND_CORNER_TOP_LEFT); }
-		bool ShouldDrawTopRightCornerRounded() { return 0 != (m_roundedCorners & PANEL_ROUND_CORNER_TOP_RIGHT); }
-		bool ShouldDrawBottomLeftCornerRounded() { return 0 != (m_roundedCorners & PANEL_ROUND_CORNER_BOTTOM_LEFT); }
-		bool ShouldDrawBottomRightCornerRounded() { return 0 != (m_roundedCorners & PANEL_ROUND_CORNER_BOTTOM_RIGHT); }
-
-		virtual void SetDragEnabled(bool enabled);
-		virtual bool IsDragEnabled() const;
-
-		virtual void SetShowDragHelper(bool enabled);
-
-		virtual void OnDragFailed(CUtlVector< KeyValues* >& msglist);
-
-		virtual void SetBlockDragChaining(bool block);
-		virtual bool IsBlockingDragChaining() const;
-
-		virtual int GetDragStartTolerance() const;
-		virtual void SetDragSTartTolerance(int nTolerance);
-
-		virtual void SetDropEnabled(bool enabled, float m_flHoverContextTime = 0.0f);
-		virtual bool IsDropEnabled() const;
-
-		virtual bool GetDropContextMenu(Menu* menu, CUtlVector< KeyValues* >& msglist);
-		virtual void OnDropContextHoverShow(CUtlVector< KeyValues* >& msglist);
-		virtual void OnDropContextHoverHide(CUtlVector< KeyValues* >& msglist);
-
-#if defined( VGUI_USEDRAGDROP )
-		virtual DragDrop_t* GetDragDropInfo();
-#endif
-		virtual void OnGetAdditionalDragPanels(CUtlVector< Panel* >& dragabbles);
-
-		virtual void OnCreateDragData(KeyValues* msg);
-		virtual bool IsDroppable(CUtlVector< KeyValues* >& msglist);
-
-		virtual void OnDraggablePanelPaint();
-		virtual void OnDroppablePanelPaint(CUtlVector< KeyValues* >& msglist, CUtlVector< Panel* >& dragPanels);
-
-		virtual void OnPanelDropped(CUtlVector< KeyValues* >& msglist);
-
-		virtual void OnPanelEnteredDroppablePanel(CUtlVector< KeyValues* >& msglist);
-		virtual void OnPanelExitedDroppablePanel(CUtlVector< KeyValues* >& msglist);
-
-		virtual Panel* GetDropTarget(CUtlVector< KeyValues* >& msglist);
-		virtual Panel* GetDragPanel();
-		virtual bool	IsBeingDragged();
-		virtual HCursor GetDropCursor(CUtlVector< KeyValues* >& msglist);
-		virtual HCursor GetDragFailCursor(CUtlVector< KeyValues* >& msglist) { return dc_no; }
-
-		Color GetDropFrameColor();
-		Color GetDragFrameColor();
-
-		virtual bool	CanStartDragging(int startx, int starty, int mx, int my);
-
-		virtual void FillRectSkippingPanel(const Color clr, int x, int y, int w, int h, Panel* skipPanel);
-
-		virtual int	GetPaintBackgroundType();
-		virtual void GetCornerTextureSize(int& w, int& h);
-
-		bool		IsChildOfModalSubTree();
-		bool		IsChildOfSurfaceModalPanel();
-
-		bool		ShouldHandleInputMessage();
-
-		virtual void SetSkipChildDuringPainting(Panel* child);
-
-		void		SetStartDragWhenMouseExitsPanel(bool state);
-		bool		IsStartDragWhenMouseExitsPanel() const;
-
-		void		SetMessageContextId_R(int nContextID);
-
-		void		PostMessageToAllSiblings(KeyValues* msg, float delaySeconds = 0.0f);
-		template< class S >
-		void		PostMessageToAllSiblingsOfType(KeyValues* msg, float delaySeconds = 0.0f);
-
-		void		SetConsoleStylePanel(bool bConsoleStyle);
-		bool		IsConsoleStylePanel() const;
-
-		enum NAV_DIRECTION { ND_UP, ND_DOWN, ND_LEFT, ND_RIGHT, ND_BACK, ND_NONE };
-		virtual Panel* NavigateUp();
-		virtual Panel* NavigateDown();
-		virtual Panel* NavigateLeft();
-		virtual Panel* NavigateRight();
-		virtual void NavigateTo();
-		virtual void NavigateFrom();
-		virtual void NavigateToChild(Panel* pNavigateTo);  
-
-		Panel* SetNavUp(Panel* navUp);
-		Panel* SetNavDown(Panel* navDown);
-		Panel* SetNavLeft(Panel* navLeft);
-		Panel* SetNavRight(Panel* navRight);
-		NAV_DIRECTION GetLastNavDirection();
-		MESSAGE_FUNC_CHARPTR(OnNavigateTo, "OnNavigateTo", panelName);
-		MESSAGE_FUNC_CHARPTR(OnNavigateFrom, "OnNavigateFrom", panelName);
-
-	protected:
-
-		virtual void OnStartDragging();
-		virtual void OnContinueDragging();
-		virtual void OnFinishDragging(bool mousereleased, MouseCode code, bool aborted = false);
-
-		virtual void DragDropStartDragging();
-
-		virtual void GetDragData(CUtlVector< KeyValues* >& list);
-		virtual void CreateDragData();
-
-		virtual void PaintTraverse(bool Repaint, bool allowForce = true);
-
-	protected:
-		MESSAGE_FUNC_ENUM_ENUM(OnRequestFocus, "OnRequestFocus", VPANEL, subFocus, VPANEL, defaultPanel);
-		MESSAGE_FUNC_INT_INT(OnScreenSizeChanged, "OnScreenSizeChanged", oldwide, oldtall);
-		virtual void* QueryInterface(EInterfaceID id);
-
-		void AddToOverridableColors(Color* pColor, char const* scriptname)
-		{
-			int iIdx = m_OverridableColorEntries.AddToTail();
-			m_OverridableColorEntries[iIdx].m_pszScriptName = scriptname;
-			m_OverridableColorEntries[iIdx].m_pColor = pColor;
-			m_OverridableColorEntries[iIdx].m_bOverridden = false;
-		}
-
-		void ApplyOverridableColors(IScheme* pScheme);
-		void SetOverridableColor(Color* pColor, const Color& newColor);
-
-	protected:
-		void SetNavUp(const char* controlName);
-		void SetNavDown(const char* controlName);
-		void SetNavLeft(const char* controlName);
-		void SetNavRight(const char* controlName);
-
-	public:
-		Panel* GetNavUp(Panel* first = NULL);
-		Panel* GetNavDown(Panel* first = NULL);
-		Panel* GetNavLeft(Panel* first = NULL);
-		Panel* GetNavRight(Panel* first = NULL);
-
-		inline void SetWorldPositionCurrentFrame(bool bWorldPositionCurrentFrame) { m_bWorldPositionCurrentFrame = bWorldPositionCurrentFrame; }
-		inline bool GetWorldPositionCurrentFrame() { return m_bWorldPositionCurrentFrame; }
-
-	protected:
-		Panel* GetNavUpPanel();
-		Panel* GetNavDownPanel();
-		Panel* GetNavLeftPanel();
-		Panel* GetNavRightPanel();
-
-		bool m_PassUnhandledInput;
-		NAV_DIRECTION m_LastNavDirection;
-
-		void InternalInitDefaultValues(PanelAnimationMap* map);
-
-
-	private:
-		enum BuildModeFlags_t
-		{
-			BUILDMODE_EDITABLE = 0x01,
-			BUILDMODE_DELETABLE = 0x02,
-			BUILDMODE_SAVE_XPOS_RIGHTALIGNED = 0x04,
-			BUILDMODE_SAVE_XPOS_CENTERALIGNED = 0x08,
-			BUILDMODE_SAVE_YPOS_BOTTOMALIGNED = 0x10,
-			BUILDMODE_SAVE_YPOS_CENTERALIGNED = 0x20,
-			BUILDMODE_SAVE_WIDE_FULL = 0x40,
-			BUILDMODE_SAVE_TALL_FULL = 0x80,
-			BUILDMODE_SAVE_PROPORTIONAL_TO_PARENT = 0x100,
-			BUILDMODE_SAVE_PERCENTAGE = 0x200,
-		};
-
-		enum PanelFlags_t
-		{
-			MARKED_FOR_DELETION = 0x0001,
-			NEEDS_REPAINT = 0x0002,
-			PAINT_BORDER_ENABLED = 0x0004,
-			PAINT_BACKGROUND_ENABLED = 0x0008,
-			PAINT_ENABLED = 0x0010,
-			POST_CHILD_PAINT_ENABLED = 0x0020,
-			AUTODELETE_ENABLED = 0x0040,
-			NEEDS_LAYOUT = 0x0080,
-			NEEDS_SCHEME_UPDATE = 0x0100,
-			NEEDS_DEFAULT_SETTINGS_APPLIED = 0x0200,
-#if defined( VGUI_USEKEYBINDINGMAPS )
-			ALLOW_CHAIN_KEYBINDING_TO_PARENT = 0x0400,
-#endif
-			IN_PERFORM_LAYOUT = 0x0800,
-			IS_PROPORTIONAL = 0x1000,
-			TRIPLE_PRESS_ALLOWED = 0x2000,
-			DRAG_REQUIRES_PANEL_EXIT = 0x4000,
-			IS_MOUSE_DISABLED_FOR_THIS_PANEL_ONLY = 0x8000,
-			ALL_FLAGS = 0xFFFF,
-		};
-
-		virtual Panel* GetPanel() { return this; }
-
-		void Think();
-		void PerformApplySchemeSettings();
-
-		void InternalPerformLayout();
-		void InternalSetCursor();
-
-		MESSAGE_FUNC_INT_INT(InternalCursorMoved, "CursorMoved", xpos, ypos);
-		MESSAGE_FUNC(InternalCursorEntered, "CursorEntered");
-		MESSAGE_FUNC(InternalCursorExited, "CursorExited");
-
-		MESSAGE_FUNC_INT(InternalMousePressed, "MousePressed", code);
-		MESSAGE_FUNC_INT(InternalMouseDoublePressed, "MouseDoublePressed", code);
-		MESSAGE_FUNC_INT(InternalMouseTriplePressed, "MouseTriplePressed", code);
-		MESSAGE_FUNC_INT(InternalMouseReleased, "MouseReleased", code);
-		MESSAGE_FUNC_INT(InternalMouseWheeled, "MouseWheeled", delta);
-		MESSAGE_FUNC_INT(InternalKeyCodePressed, "KeyCodePressed", code);
-		MESSAGE_FUNC_INT(InternalKeyCodeTyped, "KeyCodeTyped", code);
-		MESSAGE_FUNC_INT(InternalKeyTyped, "KeyTyped", unichar);
-		MESSAGE_FUNC_INT(InternalKeyCodeReleased, "KeyCodeReleased", code);
-
-		MESSAGE_FUNC(InternalKeyFocusTicked, "KeyFocusTicked");
-		MESSAGE_FUNC(InternalMouseFocusTicked, "MouseFocusTicked");
-
-		MESSAGE_FUNC(InternalInvalidateLayout, "Invalidate");
-
-		MESSAGE_FUNC(InternalMove, "Move");
-		virtual void InternalFocusChanged(bool lost);	      
-
-		void Init(int x, int y, int wide, int tall);
-		void PreparePanelMap(PanelMap_t* panelMap);
-
-		bool InternalRequestInfo(PanelAnimationMap* map, KeyValues* outputData);
-		bool InternalSetInfo(PanelAnimationMap* map, KeyValues* inputData);
-
-		PanelAnimationMapEntry* FindPanelAnimationEntry(char const* scriptname, PanelAnimationMap* map);
-
-		void InternalApplySettings(PanelAnimationMap* map, KeyValues* inResourceData);
-
-		void ApplyAutoResizeSettings(KeyValues* inResourceData);
-
-		void FindDropTargetPanel_R(CUtlVector< VPANEL >& panelList, int x, int y, VPANEL check);
-		Panel* FindDropTargetPanel();
-
-		int GetProportionalScaledValue(int rootTall, int normalizedValue);
-
-#if defined( VGUI_USEDRAGDROP )
-		DragDrop_t* m_pDragDrop;
-		Color			m_clrDragFrame;
-		Color			m_clrDropFrame;
-#endif
-
-		BaseTooltip* m_pTooltips;
-		bool			m_bToolTipOverridden;
-
-		PHandle			m_SkipChild;
-		long			m_lLastDoublePressTime;
-		HFont			m_infoFont;	         
-
-#if defined( VGUI_USEKEYBINDINGMAPS )
-		KeyBindingContextHandle_t m_hKeyBindingsContext;
-#endif
-
-		VPANEL			_vpanel;	     
-		CUtlString		_panelName;		            
-		IBorder* _border;
-
-		CUtlFlags< unsigned short > _flags;	  
-		Dar<HPanel>		_actionSignalTargetDar;	          
-
-		CUtlVector<OverridableColorEntry>	m_OverridableColorEntries;
-
-		Color			_fgColor;		  
-		Color			_bgColor;		  
-
-		HBuildGroup		_buildGroup;
-
-		short			m_nPinDeltaX;		         
-		short			m_nPinDeltaY;
-		short			m_nResizeDeltaX;	         
-		short			m_nResizeDeltaY;
-
-		HCursor			_cursor;
-		unsigned short	_buildModeFlags;            
-
-		byte			_pinCorner : 4;	          
-		byte			_autoResizeDirection : 4;          
-
-		GCC_DIAG_PUSH_OFF(overflow)
-
-			DECLARE_DMXELEMENT_BITFIELD(_pinCorner, byte, Panel)
-		DECLARE_DMXELEMENT_BITFIELD(_autoResizeDirection, byte, Panel)
-
-		GCC_DIAG_POP()
-
-			unsigned char	_tabPosition;		       
-		HScheme			 m_iScheme;       
-
-		bool			m_bIsDMXSerialized : 1;      
-		bool			m_bUseSchemeColors : 1;        
-		bool			m_bIsSilent : 1;     
-		bool			m_bIsConsoleStylePanel : 1;
-
-		DECLARE_DMXELEMENT_BITFIELD(m_bUseSchemeColors, bool, Panel)
-		DECLARE_DMXELEMENT_BITFIELD(m_bIsSilent, bool, Panel)
-
-		char* _pinToSibling;				         
-		byte			_pinToSiblingCorner;		         
-		byte			_pinCornerToSibling;		           
-		PHandle			m_pinSibling;
-
-		char* _tooltipText;		            
-
-		PHandle			m_hMouseEventHandler;
-
-		bool			m_bWorldPositionCurrentFrame;		                           
-		CUtlSymbol		m_sBorderName;
-
-	protected:
-		CUtlString	m_sNavUpName;
-		PHandle		m_NavUp;
-
-		CUtlString m_sNavDownName;
-		PHandle m_NavDown;
-
-		CUtlString m_sNavLeftName;
-		PHandle m_NavLeft;
-
-		CUtlString m_sNavRightName;
-		PHandle m_NavRight;
-	protected:
-		static int s_NavLock;
-
-	private:
-
-		CPanelAnimationVar(float, m_flAlpha, "alpha", "255");
-
-		CPanelAnimationVar(int, m_nPaintBackgroundType, "PaintBackgroundType", "0");
-		CPanelAnimationVarAliasType(int, m_nBgTextureId1, "Texture1", "vgui/hud/800corner1", "textureid");
-		CPanelAnimationVarAliasType(int, m_nBgTextureId2, "Texture2", "vgui/hud/800corner2", "textureid");
-		CPanelAnimationVarAliasType(int, m_nBgTextureId3, "Texture3", "vgui/hud/800corner3", "textureid");
-		CPanelAnimationVarAliasType(int, m_nBgTextureId4, "Texture4", "vgui/hud/800corner4", "textureid");
-
-		unsigned char m_roundedCorners;
-		friend class BuildGroup;
-		friend class BuildModeDialog;
-		friend class PHandle;
-
-		void OnOldMessage(KeyValues* params, VPANEL ifromPanel);
-
-	public:
-
-		virtual void GetSizerMinimumSize(int& wide, int& tall);
-		virtual void GetSizerClientArea(int& x, int& y, int& wide, int& tall);
-		CSizerBase* GetSizer();
-		void SetSizer(CSizerBase* pSizer);
-
-	protected:
-
-		CSizerBase* m_pSizer;
-	};
-
-	inline void Panel::DisableMouseInputForThisPanel(bool bDisable)
-	{
-		_flags.SetFlag(IS_MOUSE_DISABLED_FOR_THIS_PANEL_ONLY, bDisable);
-	}
-
-	inline bool	Panel::IsMouseInputDisabledForThisPanel() const
-	{
-		return _flags.IsFlagSet(IS_MOUSE_DISABLED_FOR_THIS_PANEL_ONLY);
-	}
-
-	template< class S >
-	inline void Panel::PostMessageToAllSiblingsOfType(KeyValues* msg, float delaySeconds  )
-	{
-		Panel* parent = GetParent();
-		if (parent)
-		{
-			int nChildCount = parent->GetChildCount();
-			for (int i = 0; i < nChildCount; ++i)
-			{
-				Panel* sibling = parent->GetChild(i);
-				if (sibling == this)
-					continue;
-				if (dynamic_cast<S*>(sibling))
-				{
-					PostMessage(sibling->GetVPanel(), msg->MakeCopy(), delaySeconds);
-				}
-			}
-		}
-
-		msg->deleteThis();
-	}
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/PanelAnimationVar.h b/SpyCustom/PanelAnimationVar.h
deleted file mode 100644
index 8b84555..0000000
--- a/SpyCustom/PanelAnimationVar.h
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifndef PANELANIMATIONVAR_H
-#define PANELANIMATIONVAR_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-#include "Panel.h"
-
-#define DECLARE_PANELANIMATION( className )												\
-	static void AddToAnimationMap( char const *scriptname, char const *type, char const *var,	\
-		char const *defaultvalue, bool array, PANELLOOKUPFUNC func )					\
-	{																					\
-		PanelAnimationMap *map = FindOrAddPanelAnimationMap( GetPanelClassName() );		\
-																						\
-		PanelAnimationMapEntry entry;													\
-		entry.m_pszScriptName = scriptname;												\
-		entry.m_pszVariable = var;														\
-		entry.m_pszType = type;															\
-		entry.m_pszDefaultValue = defaultvalue;											\
-		entry.m_pfnLookup = func;														\
-		entry.m_bArray = array;															\
-																						\
-		map->entries.AddToTail( entry );												\
-	}																					\
-																						\
-	static void ChainToAnimationMap( void )														\
-	{																					\
-		static bool chained = false;													\
-		if ( chained )																	\
-			return;																		\
-		chained = true;																	\
-		PanelAnimationMap *map = FindOrAddPanelAnimationMap( GetPanelClassName() );		\
-		map->pfnClassName = GetPanelClassName;											\
-		if ( map && GetPanelBaseClassName() && GetPanelBaseClassName()[0] )				\
-		{																				\
-			map->baseMap = FindOrAddPanelAnimationMap( GetPanelBaseClassName() );		\
-		}																				\
-	}																					\
-																						\
-	class className##_Register;															\
-	friend class className##_Register;													\
-	class className##_Register															\
-	{																					\
-	public:																				\
-		className##_Register()															\
-		{																				\
-			className::ChainToAnimationMap();													\
-		}																				\
-	};																					\
-	className##_Register m_RegisterAnimationClass;												\
-																						\
-	virtual PanelAnimationMap *GetAnimMap()												\
-	{																					\
-		return FindOrAddPanelAnimationMap( GetPanelClassName() );						\
-	}
-
-typedef void* (*PANELLOOKUPFUNC)(vgui::Panel* panel);
-
-#define CPanelAnimationVarAliasType( type, name, scriptname, defaultvalue, typealias ) \
-	class PanelAnimationVar_##name; \
-	friend class PanelAnimationVar_##name; \
-	static void *GetVar_##name( vgui::Panel *panel ) \
-	{								\
-		return &(( ThisClass *)panel)->name;	\
-	}								\
-	class PanelAnimationVar_##name \
-	{ \
-	public: \
-		static void InitVar() \
-		{ \
-			static bool bAdded = false; \
-			if ( !bAdded ) \
-			{ \
-				bAdded = true; \
-				AddToAnimationMap( scriptname, typealias, #name, defaultvalue, false, ThisClass::GetVar_##name ); \
-			} \
-		}												\
-		PanelAnimationVar_##name()						\
-		{												\
-			PanelAnimationVar_##name::InitVar();		\
-		}												\
-	};													\
-	PanelAnimationVar_##name m_##name##_register;		\
-	type name;
-
-#define CPanelAnimationVar( type, name, scriptname, defaultvalue )	\
-	CPanelAnimationVarAliasType( type, name, scriptname, defaultvalue, #type )
-
-#define CPanelAnimationStringVarAliasType( count, name, scriptname, defaultvalue, typealias ) \
-	class PanelAnimationVar_##name; \
-	friend class PanelAnimationVar_##name; \
-	static void *GetVar_##name( vgui::Panel *panel ) \
-	{								\
-		return &(( ThisClass *)panel)->name;	\
-	}								\
-	class PanelAnimationVar_##name \
-	{ \
-	public: \
-		static void InitVar() \
-		{ \
-			static bool bAdded = false; \
-			if ( !bAdded ) \
-			{ \
-				bAdded = true; \
-				AddToAnimationMap( scriptname, typealias, #name, defaultvalue, true, ThisClass::GetVar_##name ); \
-			} \
-		}												\
-		PanelAnimationVar_##name()						\
-		{												\
-			PanelAnimationVar_##name::InitVar();		\
-		}												\
-	};													\
-	PanelAnimationVar_##name m_##name##_register;		\
-	char name[ count ];
-
-#define CPanelAnimationStringVar( count, name, scriptname, defaultvalue )	\
-	CPanelAnimationStringVarAliasType( count, name, scriptname, defaultvalue, "string" )
-
-struct PanelAnimationMapEntry
-{
-	char const* name() { return m_pszScriptName; }
-	char const* type() { return m_pszType; }
-	char const* defaultvalue() { return m_pszDefaultValue; }
-	bool		isarray() { return m_bArray; }
-
-	char const* m_pszScriptName;
-	char const* m_pszVariable;
-	char const* m_pszType;
-	char const* m_pszDefaultValue;
-	bool		m_bArray;
-
-	PANELLOOKUPFUNC	m_pfnLookup;
-};
-
-struct PanelAnimationMap
-{
-	PanelAnimationMap()
-	{
-		baseMap = NULL;
-		pfnClassName = NULL;
-	}
-
-	CUtlVector< PanelAnimationMapEntry > entries;
-	PanelAnimationMap* baseMap;
-	char const* (*pfnClassName)(void);
-};
-
-PanelAnimationMap* FindPanelAnimationMap(char const* className);
-PanelAnimationMap* FindOrAddPanelAnimationMap(char const* className);
-void PanelAnimationDumpVars(char const* className);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ParticleSphereRenderer.h b/SpyCustom/ParticleSphereRenderer.h
deleted file mode 100644
index ac7316a..0000000
--- a/SpyCustom/ParticleSphereRenderer.h
+++ /dev/null
@@ -1,210 +0,0 @@
-#ifndef PARTICLESPHERERENDERER_H
-#define PARTICLESPHERERENDERER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "particlemgr.h"
-#include "particle_util.h"
-
-
-class CParticleSphereRenderer
-{
-public:
-
-	CParticleSphereRenderer();
-
-	void		Init(CParticleMgr* pParticleMgr, IMaterial* pMaterial);
-
-	void		StartRender(VMatrix& effectMatrix);
-
-	void		RenderParticle(
-		ParticleDraw* pDraw,
-		const Vector& vOriginalPos,
-		const Vector& vTransformedPos,
-		float flAlpha,			    
-		float flParticleSize,
-		float flAngle = 0.0f);
-
-	void		RenderParticle_AddColor(
-		ParticleDraw* pDraw,
-		const Vector& vOriginalPos,
-		const Vector& vTransformedPos,
-		float flAlpha,				    
-		float flParticleSize,
-		const Vector& vToAdd0to1	       
-	);
-
-
-	const Vector& GetBaseColor() const;			   
-	void SetBaseColor(const Vector& vColor);
-
-	const CParticleLightInfo& GetAmbientLight() const;
-	void SetAmbientLight(const CParticleLightInfo& info);
-
-	const CParticleLightInfo& GetDirectionalLight() const;
-	void SetDirectionalLight(const CParticleLightInfo& info);
-
-
-private:
-
-	void		AddLightColor(
-		Vector const* pPos,
-		Vector const* pLightPos,
-		Vector const* pLightColor,
-		float flLightIntensity,
-		Vector* pOutColor);
-
-	inline void	ClampColor(Vector& vColor);
-
-
-private:
-
-	int m_iLastTickStartRenderCalled;	   
-
-	CParticleMgr* m_pParticleMgr;
-
-	Vector			m_vBaseColor;
-	CParticleLightInfo m_AmbientLight;
-	CParticleLightInfo m_DirectionalLight;
-	bool			m_bUsingPixelShaders;
-};
-
-
-inline void CParticleSphereRenderer::AddLightColor(
-	Vector const* pPos,
-	Vector const* pLightPos,
-	Vector const* pLightColor,
-	float flLightIntensity,
-	Vector* pOutColor)
-{
-	if (flLightIntensity)
-	{
-		float fDist = pPos->DistToSqr(*pLightPos);
-		float fAmt;
-		if (fDist > 0.0001f)
-			fAmt = flLightIntensity / fDist;
-		else
-			fAmt = 1000.f;
-
-		*pOutColor += *pLightColor * fAmt;
-	}
-}
-
-
-inline void CParticleSphereRenderer::ClampColor(Vector& vColor)
-{
-	float flMax = MAX(vColor.x, MAX(vColor.y, vColor.z));
-	if (flMax > 1)
-	{
-		vColor *= 255.0f / flMax;
-	}
-	else
-	{
-		vColor *= 255.0;
-	}
-}
-
-
-inline const Vector& CParticleSphereRenderer::GetBaseColor() const
-{
-	return m_vBaseColor;
-}
-
-inline void CParticleSphereRenderer::SetBaseColor(const Vector& vColor)
-{
-	m_vBaseColor = vColor;
-}
-
-inline const CParticleLightInfo& CParticleSphereRenderer::GetAmbientLight() const
-{
-	return m_AmbientLight;
-}
-
-inline void CParticleSphereRenderer::SetAmbientLight(const CParticleLightInfo& info)
-{
-	m_AmbientLight = info;
-}
-
-inline const CParticleLightInfo& CParticleSphereRenderer::GetDirectionalLight() const
-{
-	return m_DirectionalLight;
-}
-
-inline void CParticleSphereRenderer::SetDirectionalLight(const CParticleLightInfo& info)
-{
-	m_DirectionalLight = info;
-}
-
-inline void CParticleSphereRenderer::RenderParticle(
-	ParticleDraw* pDraw,
-	const Vector& vOriginalPos,
-	const Vector& vTransformedPos,
-	float flAlpha,
-	float flParticleSize,
-	float flAngle)
-{
-#ifdef _DEBUG
-	if (pDraw->GetMeshBuilder())
-	{
-		Assert(m_iLastTickStartRenderCalled == gpGlobals->tickcount);
-	}
-#endif
-
-	Vector vColor = m_vBaseColor;
-	AddLightColor(&vOriginalPos, &m_AmbientLight.m_vPos, &m_AmbientLight.m_vColor, m_AmbientLight.m_flIntensity, &vColor);
-
-	if (!m_bUsingPixelShaders)
-	{
-		AddLightColor(&vOriginalPos, &m_DirectionalLight.m_vPos, &m_DirectionalLight.m_vColor, m_DirectionalLight.m_flIntensity, &vColor);
-	}
-
-	ClampColor(vColor);
-
-	RenderParticle_Color255SizeNormalAngle(
-		pDraw,
-		vTransformedPos,
-		vColor,			  
-		flAlpha,		 
-		flParticleSize,
-		vec3_origin,
-		flAngle);
-}
-
-inline void CParticleSphereRenderer::RenderParticle_AddColor(
-	ParticleDraw* pDraw,
-	const Vector& vOriginalPos,
-	const Vector& vTransformedPos,
-	float flAlpha,
-	float flParticleSize,
-	const Vector& vToAdd0to1
-)
-{
-#ifdef _DEBUG
-	if (pDraw->GetMeshBuilder())
-	{
-		Assert(m_iLastTickStartRenderCalled == gpGlobals->tickcount);
-	}
-#endif
-
-	Vector vColor = m_vBaseColor + vToAdd0to1;
-	AddLightColor(&vOriginalPos, &m_AmbientLight.m_vPos, &m_AmbientLight.m_vColor, m_AmbientLight.m_flIntensity, &vColor);
-
-	if (!m_bUsingPixelShaders)
-	{
-		AddLightColor(&vOriginalPos, &m_DirectionalLight.m_vPos, &m_DirectionalLight.m_vColor, m_DirectionalLight.m_flIntensity, &vColor);
-	}
-
-	ClampColor(vColor);
-
-	RenderParticle_Color255Size(
-		pDraw,
-		vTransformedPos,
-		vColor,			  
-		flAlpha,		 
-		flParticleSize);
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/PatternScan.cpp b/SpyCustom/PatternScan.cpp
deleted file mode 100644
index febaa17..0000000
--- a/SpyCustom/PatternScan.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "PatternScan.hpp"
-
-
-DWORD WaitOnModuleHandle(std::string moduleName)
-{
-    DWORD ModuleHandle = NULL;
-    while (!ModuleHandle)
-    {
-        ModuleHandle = (DWORD)GetModuleHandle(moduleName.c_str());
-        if (!ModuleHandle)
-            Sleep(50);
-    }
-    return ModuleHandle;
-}
-
-DWORD FindPatternV2(std::string moduleName, std::string pattern)
-{
-    const char* pat = pattern.c_str();
-    DWORD firstMatch = 0;
-    DWORD rangeStart = (DWORD)GetModuleHandleA(moduleName.c_str());
-    MODULEINFO miModInfo; GetModuleInformation(GetCurrentProcess(), (HMODULE)rangeStart, &miModInfo, sizeof(MODULEINFO));
-    DWORD rangeEnd = rangeStart + miModInfo.SizeOfImage;
-    for (DWORD pCur = rangeStart; pCur < rangeEnd; pCur++)
-    {
-        if (!*pat)
-            return firstMatch;
-
-        if (*(PBYTE)pat == '\?' || *(BYTE*)pCur == getByte(pat))
-        {
-            if (!firstMatch)
-                firstMatch = pCur;
-
-            if (!pat[2])
-                return firstMatch;
-
-            if (*(PWORD)pat == '\?\?' || *(PBYTE)pat != '\?')
-                pat += 3;
-
-            else
-                pat += 2;     
-        }
-        else
-        {
-            pat = pattern.c_str();
-            firstMatch = 0;
-        }
-    }
-    return NULL;
-}
-
-bool bCompare(const BYTE* Data, const BYTE* Mask, const char* szMask)
-{
-    for (; *szMask; ++szMask, ++Mask, ++Data)
-    {
-        if (*szMask == 'x' && *Mask != *Data)
-        {
-            return false;
-        }
-    }
-    return (*szMask) == 0;
-}
-
-DWORD FindPattern(std::string moduleName, BYTE* Mask, char* szMask)
-{
-    DWORD Address = WaitOnModuleHandle(moduleName.c_str());
-    MODULEINFO ModInfo; GetModuleInformation(GetCurrentProcess(), (HMODULE)Address, &ModInfo, sizeof(MODULEINFO));
-    DWORD Length = ModInfo.SizeOfImage;
-    for (DWORD c = 0; c < Length; c += 1)
-    {
-        if (bCompare((BYTE*)(Address + c), Mask, szMask))
-        {
-            return (DWORD)(Address + c);
-        }
-    }
-    return 0;
-}
\ No newline at end of file
diff --git a/SpyCustom/PatternScan.hpp b/SpyCustom/PatternScan.hpp
deleted file mode 100644
index bd07ada..0000000
--- a/SpyCustom/PatternScan.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef PATTERNSCAN
-#define PATTERNSCAN
-#pragma once
-
-#include <Windows.h>
-#include <Psapi.h>
-#include <string> 
-#define INRANGE(x,a,b)    (x >= a && x <= b) 
-#define getBits( x )    (INRANGE((x&(~0x20)),'A','F') ? ((x&(~0x20)) - 'A' + 0xa) : (INRANGE(x,'0','9') ? x - '0' : 0))
-#define getByte( x )    (getBits(x[0]) << 4 | getBits(x[1]))
-
-DWORD WaitOnModuleHandle(std::string moduleName);
-DWORD FindPatternV2(std::string moduleName, std::string pattern);
-bool bCompare(const BYTE* Data, const BYTE* Mask, const char* szMask);
-DWORD FindPattern(std::string moduleName, BYTE* Mask, char* szMask);
-
-
-
-#endif
-
diff --git a/SpyCustom/PlayerInventory.cpp b/SpyCustom/PlayerInventory.cpp
deleted file mode 100644
index 2a1634a..0000000
--- a/SpyCustom/PlayerInventory.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-#include "PlayerInventory.hpp"
-
-
-void CSharedObjectTypeCache::AddObject(void* obj)
-{
-    typedef void(__thiscall* tOriginal)(void*, void*);
-    getvfunc<tOriginal>(this, 1)(this, obj);
-}
-
-void CSharedObjectTypeCache::RemoveObject(void* obj)
-{
-    typedef void(__thiscall* tOriginal)(void*, void*);
-    getvfunc<tOriginal>(this, 3)(this, obj);
-}
-
-std::vector<CEconItem*> CSharedObjectTypeCache::GetEconItems()
-{
-    std::vector<CEconItem*> ret;
-
-    auto size = *reinterpret_cast<size_t*>(this + 0x18);
-
-    auto data = *reinterpret_cast<uintptr_t**>(this + 0x4);
-
-    for (size_t i = 0; i < size; i++)
-        ret.push_back(reinterpret_cast<CEconItem*>(data[i]));
-
-    return ret;
-}
-
-
-template<typename TYPE>
-void CEconItem::SetAttributeValue(int index, TYPE val)
-{
-    auto v15 = (DWORD*)GetItemSchema();
-    auto v16 = *(DWORD*)(v15[72] + 4 * index);
-
-    static auto fnSetDynamicAttributeValue
-        = reinterpret_cast<int(__thiscall*)(CEconItem*, DWORD, void*)>(
-            FindPatternV2("client.dll", "55 8B EC 83 E4 F8 83 EC 3C 53 8B 5D 08 56 57 6A 00")
-            );
-
-    fnSetDynamicAttributeValue(this, v16, &val);
-}
-
-
-
-
-int C_EconItemDefinition::get_equipped_position()
-{
-    return *reinterpret_cast<int*>(reinterpret_cast<uintptr_t>(this) + 0x24C);
-}
-
-const char* C_EconItemDefinition::get_world_model_name()
-{
-    return *reinterpret_cast<const char**>(uintptr_t(this) + 0x9C);
-}
-
-
-
-
-
-uint32_t* CEconItem::GetAccountID()
-{
-    return reinterpret_cast<uint32_t*>(this + 0x1C);
-}
-uint64_t* CEconItem::GetItemID()
-{
-    return reinterpret_cast<uint64_t*>(this + 0x8);
-}
-
-uint64_t* CEconItem::GetOriginalID()
-{
-    return reinterpret_cast<uint64_t*>(this + 0x10);
-}
-
-uint16_t* CEconItem::GetDefIndex()
-{
-    return reinterpret_cast<uint16_t*>(this + 0x24);
-}
-
-uint32_t* CEconItem::GetInventory()
-{
-    return reinterpret_cast<uint32_t*>(this + 0x20);
-}
-
-unsigned char* CEconItem::GetFlags()
-{
-    return reinterpret_cast<unsigned char*>(this + 0x30);
-}
-
-unsigned short* CEconItem::GetEconItemData()
-{
-    return reinterpret_cast<unsigned short*>(this + 0x26);
-}
-
-
-
-C_EconItemDefinition* C_EconItemView::get_static_data()
-{
-    static auto fn = reinterpret_cast<C_EconItemDefinition * (__thiscall*)(void*)>(FindPatternV2("client.dll", "55 8B EC 51 53 8B D9 8B ? ? ? ? ? 56 57 8B ? ? ? ? ? 85 FF 74 16"));
-
-    return fn(this);
-}
-
-
-CEconItem* C_EconItemView::get_soc_data()
-{
-    static auto fn = reinterpret_cast<CEconItem * (__thiscall*)(C_EconItemView*)>(FindPatternV2("client.dll", "55 8B EC 83 E4 F0 83 EC 18 56 8B F1 57 8B 86"));
-
-    return fn(this);
-}
-
-
-
-void CPlayerInventory::RemoveItem(uint64_t ID)
-{
-    static auto fnRemoveItem
-        = reinterpret_cast<int(__thiscall*)(void*, int64_t)>(
-            FindPatternV2("client.dll", "55 8B EC 83 E4 F8 56 57 FF 75 0C 8B F1")
-            );
-
-    fnRemoveItem(this, ID);
-}
-
-CSharedObjectTypeCache* CPlayerInventory::GetBaseTypeCache()
-{
-    static auto fnGCSDK_CGCClient_FindSOCache
-        = reinterpret_cast<uintptr_t(__thiscall*)(uintptr_t, uint64_t, uint64_t, bool)>(
-            FindPatternV2("client.dll", "55 8B EC 83 E4 F8 83 EC 1C 0F 10 45 08")
-            );
-
-    static auto fnGCSDK_CSharedObjectCache_CreateBaseTypeCache
-        = reinterpret_cast<CSharedObjectTypeCache * (__thiscall*)(uintptr_t, int)>(
-            FindPatternV2("client.dll", "55 8B EC 51 53 56 8B D9 8D 45 08")
-            );
-
-    static auto g_GCClientSystem = **reinterpret_cast<uintptr_t**>(FindPatternV2("client.dll", "8B 0D ? ? ? ? 6A 00 83 EC 10") + 0x2);
-    auto SOCahce = fnGCSDK_CGCClient_FindSOCache(g_GCClientSystem + 0x60, *reinterpret_cast<uint64_t*>(this + 0x8), *reinterpret_cast<uint64_t*>(this + 0x10), 0);
-
-    return fnGCSDK_CSharedObjectCache_CreateBaseTypeCache(SOCahce, 1);
-}
-
-void CPlayerInventory::RemoveItem(CEconItem* item)
-{
-    RemoveItem(*item->GetItemID());
-    GetBaseTypeCache()->RemoveObject(item);
-}
-
-void CPlayerInventory::ClearInventory()
-{
-    auto BaseTypeCache = this->GetBaseTypeCache();
-    auto items = BaseTypeCache->GetEconItems();
-    for (auto item : items)
-    {
-        RemoveItem(*item->GetItemID());
-        BaseTypeCache->RemoveObject(item);
-    }
-}
-
-uint32_t CPlayerInventory::GetSteamID()
-{
-    return *reinterpret_cast<uint32_t*>(this + 0x8);
-}
-
-CUtlVector< C_EconItemView* >* CPlayerInventory::GetInventoryItems()
-{
-    return reinterpret_cast<CUtlVector<C_EconItemView*>*>(this + 0x2C);
-}
-
-bool CPlayerInventory::AddEconItem(CEconItem* item, int a3, int a4, char a5)
-{
-    static auto fnAddEconItem
-        = reinterpret_cast<C_EconItemView * (__thiscall*)(void*, CEconItem*, int, int, char)>(
-            FindPatternV2("client.dll", "55 8B EC 83 E4 F8 A1 ? ? ? ? 83 EC 14 53 56 57 8B F9 8B 08")
-            );
-
-    GetBaseTypeCache()->AddObject(item);
-
-
-    auto ret = fnAddEconItem(this, item, a3, a4, a5);
-
-    return ret;
-}
-
-
-CPlayerInventory* CSInventoryManager::GetLocalPlayerInventory()  
-{
-    static auto local_inventory_offset = *reinterpret_cast<uintptr_t*>(FindPatternV2("client.dll", "8B 8B ? ? ? ? E8 ? ? ? ? 89 44 24 18") + 0x2);
-    return *reinterpret_cast<CPlayerInventory**>(this + local_inventory_offset);
-}
-
-CEconItem* CreateEconItem()
-{
-    static auto fnCreateSharedObjectSubclass_EconItem_
-        = reinterpret_cast<CEconItem * (__stdcall*)()>(
-            *reinterpret_cast<uintptr_t*>(FindPatternV2("client.dll", "C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? E8 ? ? ? ? 83 F8 FF 75 09 8D 45 E4 50 E8 ? ? ? ? 8D 45 E4 C7 45 ? ? ? ? ? 50 C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? E8 ? ? ? ? 83 F8 FF 75 09 8D 45 E4 50 E8 ? ? ? ? 8D 45 E4 C7 45 ? ? ? ? ? 50 C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? E8 ? ? ? ? 83 F8 FF 75 09 8D 45 E4 50 E8 ? ? ? ? 8D 45 E4 C7 45 ? ? ? ? ? 50 C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? E8 ? ? ? ? 83 F8 FF 75 09 8D 45 E4 50 E8 ? ? ? ? 8D 45 E4") + 3)
-            );
-    return fnCreateSharedObjectSubclass_EconItem_();
-}
-uintptr_t GetItemSchema()
-{
-    static auto fnGetItemSchema
-        = reinterpret_cast<uintptr_t(__stdcall*)()>(
-            FindPatternV2("client.dll", "A1 ? ? ? ? 85 C0 75 53")
-            );
-    return fnGetItemSchema();
-}
diff --git a/SpyCustom/PlayerInventory.hpp b/SpyCustom/PlayerInventory.hpp
deleted file mode 100644
index e36667b..0000000
--- a/SpyCustom/PlayerInventory.hpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#ifndef PLAYERINV
-#define PLAYERINV
-#pragma once
-
-#include "PatternScan.hpp"
-#include "Interfaces.hpp"
-
-#include "utlvector.h"
-#include "stdint.h" 
-#include <vector>
-
-#include "icliententity.h" 
-
-
-
-enum ItemQuality
-{
-    ITEM_QUALITY_DEFAULT,
-    ITEM_QUALITY_GENUINE,
-    ITEM_QUALITY_VINTAGE,
-    ITEM_QUALITY_UNUSUAL,
-    ITEM_QUALITY_SKIN,
-    ITEM_QUALITY_COMMUNITY,
-    ITEM_QUALITY_DEVELOPER,
-    ITEM_QUALITY_SELFMADE,
-    ITEM_QUALITY_CUSTOMIZED,
-    ITEM_QUALITY_STRANGE,
-    ITEM_QUALITY_COMPLETED,
-    ITEM_QUALITY_UNK2,
-    ITEM_QUALITY_TOURNAMENT
-};
-
-enum ItemRarity
-{
-    ITEM_RARITY_DEFAULT,
-    ITEM_RARITY_COMMON,
-    ITEM_RARITY_UNCOMMON,
-    ITEM_RARITY_RARE,
-    ITEM_RARITY_MYTHICAL,
-    ITEM_RARITY_LEGENDARY,
-    ITEM_RARITY_ANCIENT,
-    ITEM_RARITY_IMMORTAL
-};
-
-class CEconItem
-{
-    unsigned short* GetEconItemData();
-    void UpdateEquippedState(unsigned int state);
-public:
-    uint32_t* GetInventory();
-    uint32_t* GetAccountID();
-    uint16_t* GetDefIndex();
-    uint64_t* GetItemID();
-    uint64_t* GetOriginalID();
-    unsigned char* GetFlags();
-    void SetQuality(ItemQuality quality);
-    void SetRarity(ItemRarity rarity);
-    void SetOrigin(int origin);
-    void SetLevel(int level);
-    void SetInUse(bool in_use);
-    void SetCustomName(const char* name);
-    void SetCustomDesc(const char* name);
-    void SetPaintSeed(float seed);
-    void SetPaintKit(float kit);
-    void SetPaintWear(float wear);
-    void SetStatTrak(int val);
-    void AddSticker(int index, int kit, float wear, float scale, float rotation);
-
-    template<typename TYPE>
-    void SetAttributeValue(int index, TYPE val);
-    
-};
-
-class C_EconItemDefinition
-{
-public:
-    int get_equipped_position();
-    const char* get_world_model_name();
-};
-
-class C_EconItemView
-{
-private:
-    using str_32 = char[32];
-public:
-    int32_t m_bInitialized;
-    int16_t m_iItemDefinitionIndex;
-    int32_t m_iEntityLevel;
-    int32_t m_iAccountID;
-    int32_t m_iItemIDLow;
-    int32_t m_iItemIDHigh;
-    int32_t m_iEntityQuality;
-    str_32 m_iCustomName;
-
-    CUtlVector<IRefCounted*>& m_CustomMaterials();
-    CUtlVector<IRefCounted*>& m_VisualsDataProcessors();
-
-    C_EconItemDefinition* get_static_data();
-    CEconItem* get_soc_data();
-};
-
-
-class CSharedObjectTypeCache
-{
-public:
-    void AddObject(void* obj);
-    void RemoveObject(void* obj);
-    std::vector<CEconItem*> GetEconItems();
-};
-
-
-class CPlayerInventory
-{
-public:
-    void RemoveItem(uint64_t ID);
-    void RemoveItem(CEconItem* item);
-    void ClearInventory();
-    CSharedObjectTypeCache* GetBaseTypeCache();
-    uint32_t GetSteamID();
-    CUtlVector<C_EconItemView*>* GetInventoryItems();
-    bool AddEconItem(CEconItem* item, int a3, int a4, char a5);
-};
-
-
-class CSInventoryManager
-{
-public:
-    CPlayerInventory* GetLocalPlayerInventory();
-};
-
-
-uintptr_t GetItemSchema();
-CEconItem* CreateEconItem();
-
-
-
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/ProtoParse.h b/SpyCustom/ProtoParse.h
deleted file mode 100644
index c18f0b8..0000000
--- a/SpyCustom/ProtoParse.h
+++ /dev/null
@@ -1,581 +0,0 @@
-#pragma once
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#define MAKE_TAG(FIELD_NUMBER, TYPE) static_cast<uint32_t>(((FIELD_NUMBER) << kTagTypeBits) | (TYPE))
-
-#define make_struct(_name_, _size_) \
-	struct _name_ : ProtoWriter { \
-		constexpr static size_t MAX_FIELD = _size_; \
-		_name_()						: ProtoWriter(MAX_FIELD) {} \
-		_name_(void* data, size_t size) : ProtoWriter(data, size, MAX_FIELD) {} \
-		_name_(std::string data)        : ProtoWriter(data, MAX_FIELD) {}
-
-#define make_field(_name_, _id_, _type_) \
-	constexpr static Tag _name_ = { _id_, _type_ }; \
-	void clear_##_name_() { this->clear(_name_); } \
-	bool has_##_name_() { return this->has(_name_); } \
-	Field get_##_name_() { return this->get(_name_); } \
-	std::vector<Field> getAll_##_name_() { return this->getAll(_name_); } \
-	\
-	void add_##_name_(std::string v) { this->add(_name_, v); } \
-	template<typename T> void add_##_name_(T v) { this->add(_name_, v); } \
-	void replace_##_name_(std::string v) { this->replace(_name_, v); } \
-	void replace_##_name_(std::string v, uint32_t index) { this->replace(_name_, v, index); } \
-	template<typename T> void replace_##_name_(T v) { this->replace(_name_, v); } \
-	template<typename T> void replace_##_name_(T v, uint32_t index) { this->replace(_name_, v, index); } \
-	template<class T> T get_##_name_() { return std::move( T(this->get(_name_).String()) ); }
-
-
-struct Tag
-{
-	unsigned field;
-	unsigned type;
-};
-
-enum FieldType {
-	TYPE_DOUBLE = 1,
-	TYPE_FLOAT = 2,
-	TYPE_INT64 = 3,
-	TYPE_UINT64 = 4,
-	TYPE_INT32 = 5,
-	TYPE_FIXED64 = 6,
-	TYPE_FIXED32 = 7,
-	TYPE_BOOL = 8,
-	TYPE_STRING = 9,
-	TYPE_GROUP = 10,
-	TYPE_MESSAGE = 11,
-	TYPE_BYTES = 12,
-	TYPE_UINT32 = 13,
-	TYPE_ENUM = 14,
-	TYPE_SFIXED32 = 15,
-	TYPE_SFIXED64 = 16,
-	TYPE_SINT32 = 17,
-	TYPE_SINT64 = 18,
-	MAX_FIELD_TYPE = 18,
-};
-
-struct Field
-{
-	friend class ProtoWriter;
-public:
-	inline Field& operator=(const Field& f);
-
-	Field() : tag({ 0,0 }), value(""), full("") { }
-	Field(unsigned field, unsigned type, std::string value, std::string full);
-
-	Field(Tag tag, std::string value);
-	Field(unsigned field, unsigned type, std::string value);
-
-	template<typename T>
-	Field(Tag tag, T value);
-
-	template<typename T>
-	Field(unsigned field, unsigned type, T value);
-
-public:
-	static Field ReadField(void* data, size_t& bytesRead);
-
-public:
-	inline float Float();
-	inline double Double();
-	inline int32_t Int32();
-	inline int64_t Int64();
-	inline uint32_t UInt32();
-	inline uint64_t UInt64();
-	inline uint32_t Fixed32();
-	inline uint64_t Fixed64();
-	inline int32_t SFixed32();
-	inline int64_t SFixed64();
-	inline bool Bool();
-	inline std::string String();
-
-private:
-	Tag tag;
-	std::string value;
-	std::string full;
-
-	static std::string getBytesVarint32(uint32_t value);
-	static std::string getBytesVarint64(uint64_t value);
-	static uint32_t readVarUint32(void* data, size_t& bytesRead);
-	static uint64_t readVarUint64(void* data, size_t& bytesRead);
-
-	enum WireType {
-		WIRETYPE_VARINT = 0,
-		WIRETYPE_FIXED64 = 1,
-		WIRETYPE_LENGTH_DELIMITED = 2,
-		WIRETYPE_START_GROUP = 3,
-		WIRETYPE_END_GROUP = 4,
-		WIRETYPE_FIXED32 = 5,
-	};
-
-	constexpr static WireType kWireTypeForFieldType[MAX_FIELD_TYPE + 1] = {
-		static_cast<WireType>(-1),   
-		WIRETYPE_FIXED64,            
-		WIRETYPE_FIXED32,            
-		WIRETYPE_VARINT,             
-		WIRETYPE_VARINT,             
-		WIRETYPE_VARINT,             
-		WIRETYPE_FIXED64,            
-		WIRETYPE_FIXED32,            
-		WIRETYPE_VARINT,             
-		WIRETYPE_LENGTH_DELIMITED,   
-		WIRETYPE_START_GROUP,        
-		WIRETYPE_LENGTH_DELIMITED,   
-		WIRETYPE_LENGTH_DELIMITED,   
-		WIRETYPE_VARINT,             
-		WIRETYPE_VARINT,             
-		WIRETYPE_FIXED32,            
-		WIRETYPE_FIXED64,            
-		WIRETYPE_VARINT,             
-		WIRETYPE_VARINT,             
-	};
-
-	constexpr static int kTagTypeBits = 3;
-	constexpr static uint32_t kTagTypeMask = (1 << kTagTypeBits) - 1;
-	constexpr static int kMaxVarintBytes = 10;
-	constexpr static int kMaxVarint32Bytes = 5;
-};
-
-class ProtoWriter
-{
-public:
-	inline ProtoWriter();
-	inline ProtoWriter(size_t maxFields);
-	inline ProtoWriter(void* data, size_t size, size_t maxFields);
-	inline ProtoWriter(std::string dataStr, size_t maxFields);
-
-public:
-	inline void add(Field field);
-	inline void replace(Field field);
-	inline void replace(Field field, uint32_t index);
-	inline void clear(unsigned fieldId);
-	inline bool has(unsigned fieldId);
-	inline Field get(unsigned fieldId);
-	inline std::vector<Field> getAll(unsigned fieldId);
-
-public:
-	inline void add(Tag tag, std::string value);
-	inline void replace(Tag tag, std::string value);
-	inline void replace(Tag tag, std::string value, uint32_t index);
-	inline void clear(Tag tag);
-	inline bool has(Tag tag);
-	inline Field get(Tag tag);
-	inline std::vector<Field> getAll(Tag tag);
-
-	template<typename T>
-	inline void add(Tag tag, T value);
-
-	template<typename T>
-	inline void replace(Tag tag, T value);
-
-	template<typename T>
-	inline void replace(Tag tag, T value, uint32_t index);
-
-
-	std::string serialize();
-	void print();
-
-private:
-	std::vector<std::vector<Field>> fields;
-};
-
-#pragma region Helper Functions
-std::string Field::getBytesVarint32(uint32_t value)
-{
-	uint8_t bytes[kMaxVarint32Bytes];
-	int size = 0;
-	while (value > 0x7F) {
-		bytes[size++] = (static_cast<uint8_t>(value) & 0x7F) | 0x80;
-		value >>= 7;
-	}
-	bytes[size++] = static_cast<uint8_t>(value) & 0x7F;
-	return std::string{ reinterpret_cast<const char*>(&bytes[0]), (size_t)size };
-}
-
-std::string Field::getBytesVarint64(uint64_t value)
-{
-	uint8_t bytes[kMaxVarintBytes];
-	int size = 0;
-	while (value > 0x7F) {
-		bytes[size++] = (static_cast<uint8_t>(value) & 0x7F) | 0x80;
-		value >>= 7;
-	}
-	bytes[size++] = static_cast<uint8_t>(value) & 0x7F;
-	return std::string{ reinterpret_cast<const char*>(&bytes[0]), (size_t)size };
-}
-
-uint32_t Field::readVarUint32(void* data, size_t& bytesRead)
-{
-	auto ptr = reinterpret_cast<const uint8_t*>(data);
-	auto value = 0u;
-	auto bytes = 0u;
-
-	do {
-		value |= static_cast<uint32_t>(*ptr & 0x7f) << (7 * bytes);
-		bytes++;
-	} while (*(ptr++) & 0x80 && bytes <= 5);
-
-	bytesRead = bytes;
-	return value;
-}
-
-uint64_t Field::readVarUint64(void* data, size_t& bytesRead)
-{
-	auto ptr = reinterpret_cast<const uint8_t*>(data);
-	auto value = 0ull;
-	auto bytes = 0u;
-
-	do
-	{
-		value |= static_cast<uint64_t>(*ptr & 0x7f) << (7 * bytes);
-		bytes++;
-	} while (*(ptr++) & 0x80 && bytes <= 10);
-
-	bytesRead = bytes;
-
-	return value;
-}
-
-Field Field::ReadField(void* data, size_t& bytesRead)
-{
-	unsigned field = *reinterpret_cast<uint16_t*>(data);
-	unsigned type = field & kTagTypeMask;
-
-	if (field == 0xffff) {
-		bytesRead = 0;
-		return Field();
-	}
-
-	if (field & 0x80) {
-		field = ((field & 0x7f) | ((field & 0xff00) >> 1)) >> kTagTypeBits;
-		bytesRead = 2;
-	}
-	else {
-		field = (field & 0xff) >> kTagTypeBits;
-		bytesRead = 1;
-	}
-
-	size_t length, sizeDelimited;
-	std::string value, full;
-	switch (type)
-	{
-	case WIRETYPE_VARINT:
-		readVarUint64((void*)((ptrdiff_t)data + bytesRead), length);
-		value = std::string{ reinterpret_cast<const char*>((void*)((ptrdiff_t)data + bytesRead)), length };
-		full = std::string{ reinterpret_cast<const char*>(data), bytesRead + length };
-		bytesRead += length;
-		break;
-	case WIRETYPE_FIXED64:
-		value = std::string{ reinterpret_cast<const char*>((void*)((ptrdiff_t)data + bytesRead)), 8 };
-		full = std::string{ reinterpret_cast<const char*>(data), bytesRead + 8 };
-		bytesRead += 8;
-		break;
-	case WIRETYPE_LENGTH_DELIMITED:
-		sizeDelimited = readVarUint32((void*)((ptrdiff_t)data + bytesRead), length);
-		value = std::string{ reinterpret_cast<const char*>((void*)((ptrdiff_t)data + bytesRead)), length + sizeDelimited };
-		full = std::string{ reinterpret_cast<const char*>(data), bytesRead + length + sizeDelimited };
-		bytesRead += length + sizeDelimited;
-		break;
-	case WIRETYPE_START_GROUP:
-		throw("WIRETYPE_START_GROUP unrealised");
-		break;
-	case WIRETYPE_END_GROUP:
-		throw("WIRETYPE_END_GROUP unrealised");
-		break;
-	case WIRETYPE_FIXED32:
-		value = std::string{ reinterpret_cast<const char*>((void*)((ptrdiff_t)data + bytesRead)), 4 };
-		full = std::string{ reinterpret_cast<const char*>(data), bytesRead + 4 };
-		bytesRead += 4;
-		break;
-	default:
-		throw("Unknown type %i", type);
-		break;
-	}
-
-
-	return Field(field, type, value, full);
-}
-
-#pragma endregion 
-
-#pragma region Field Definition
-Field& Field::operator=(const Field& f) {
-	this->tag = f.tag;
-	this->value = f.value;
-	this->full = f.full;
-	return *this;
-}
-
-Field::Field(unsigned field, unsigned type, std::string value, std::string full) {
-	this->tag = { field, type };
-	this->value = value;
-	this->full = full;
-}
-
-template<typename T>
-Field::Field(Tag tag, T value) {
-	auto wireType = kWireTypeForFieldType[tag.type];
-	full = getBytesVarint32(MAKE_TAG(tag.field, wireType));
-
-	switch (wireType) {
-	case WIRETYPE_VARINT:
-		full += getBytesVarint64(static_cast<uint64_t>(value));
-		break;
-	case WIRETYPE_FIXED32:
-		full += std::string{ reinterpret_cast<const char*>(&value), 4 };
-		break;
-	case WIRETYPE_FIXED64:
-		full += std::string{ reinterpret_cast<const char*>(&value), 8 };
-		break;
-	}
-}
-
-template<typename T>
-Field::Field(unsigned field, unsigned type, T value) {
-	auto wireType = kWireTypeForFieldType[type];
-	tag = { field, (unsigned)wireType };
-	full = getBytesVarint32(MAKE_TAG(field, wireType));
-
-	switch (wireType) {
-	case WIRETYPE_VARINT:
-		full += getBytesVarint64(static_cast<uint64_t>(value));
-		break;
-	case WIRETYPE_FIXED32:
-		full += std::string{ reinterpret_cast<const char*>(&value), 4 };
-		break;
-	case WIRETYPE_FIXED64:
-		full += std::string{ reinterpret_cast<const char*>(&value), 8 };
-		break;
-	}
-}
-
-Field::Field(Tag tag, std::string value) {
-	auto wireType = kWireTypeForFieldType[tag.type];
-	full = getBytesVarint32(MAKE_TAG(tag.field, wireType));
-	full += getBytesVarint32(value.size());
-	full += value;
-}
-
-Field::Field(unsigned field, unsigned type, std::string value) {
-	auto wireType = kWireTypeForFieldType[type];
-	tag = { field, (unsigned)wireType };
-	full = getBytesVarint32(MAKE_TAG(field, wireType));
-	full += getBytesVarint32(value.size());
-	full += value;
-}
-
-
-float Field::Float() {
-	return *reinterpret_cast<float*>((void*)value.data());
-}
-double Field::Double() {
-	return *reinterpret_cast<double*>((void*)value.data());
-}
-int32_t Field::Int32() {
-	size_t bytesRead;
-	return static_cast<int32_t>(readVarUint64((void*)value.data(), bytesRead));
-}
-int64_t Field::Int64() {
-	size_t bytesRead;
-	return readVarUint64((void*)value.data(), bytesRead);
-}
-uint32_t Field::UInt32() {
-	size_t bytesRead;
-	return readVarUint32((void*)value.data(), bytesRead);
-}
-uint64_t Field::UInt64() {
-	size_t bytesRead;
-	return readVarUint64((void*)value.data(), bytesRead);
-}
-uint32_t Field::Fixed32() {
-	return *reinterpret_cast<uint32_t*>((void*)value.data());
-}
-uint64_t Field::Fixed64() {
-	return *reinterpret_cast<uint64_t*>((void*)value.data());
-}
-int32_t Field::SFixed32() {
-	return *reinterpret_cast<int32_t*>((void*)value.data());
-}
-int64_t Field::SFixed64() {
-	return *reinterpret_cast<int64_t*>((void*)value.data());
-}
-bool Field::Bool() {
-	size_t bytesRead;
-	return !!readVarUint32((void*)value.data(), bytesRead);
-}
-
-std::string Field::String()
-{
-	size_t bytesRead;
-	void* data = (void*)value.data();
-	auto length = readVarUint32((void*)value.data(), bytesRead);
-	auto value = std::string{ reinterpret_cast<const char*>((void*)((ptrdiff_t)data + bytesRead)), length };
-	return value;
-}
-
-#pragma endregion
-
-#pragma region ProtoWriter Definition
-ProtoWriter::ProtoWriter()
-{
-
-}
-
-ProtoWriter::ProtoWriter(size_t maxFields)
-{
-	size_t vector_size = maxFields + 1;
-	fields.resize(vector_size);
-	fields.reserve(vector_size);
-}
-
-ProtoWriter::ProtoWriter(void* data, size_t size, size_t maxFields) : ProtoWriter(maxFields)
-{
-	size_t vector_size = maxFields + 1,
-		pos = 0,
-		bytesRead;
-
-	if (data == nullptr)
-		return;
-	while (pos < size) {
-		auto field = Field::ReadField((void*)((ptrdiff_t)data + pos), bytesRead);
-		if (!bytesRead) break;
-
-		auto index = field.tag.field;
-		if (index >= vector_size) throw("fields range error: field[%i]", index);
-		fields[index].push_back(field);
-		pos += bytesRead;
-	}
-}
-
-ProtoWriter::ProtoWriter(std::string dataStr, size_t maxFields) : ProtoWriter((void*)dataStr.data(), dataStr.size(), maxFields)
-{
-
-}
-
-std::string ProtoWriter::serialize()
-{
-	std::string result;
-	for (auto& f0 : fields) {
-		for (auto& f1 : f0) {
-			result += f1.full;
-		}
-	}
-	return result;
-}
-
-void ProtoWriter::print()
-{
-	auto data = serialize();
-	void* mem = (void*)data.data();
-	size_t size = data.size();
-	int j = 0;
-	for (size_t i = 0; i <= size; ++i) {
-		printf("%.2X ", *(unsigned char*)((uintptr_t)mem + i));
-		j++;
-		if (j == 16)
-		{
-			j = 0;
-			printf("\n");
-		}
-	}
-	printf("\n");
-}
-
-void ProtoWriter::add(Field field)
-{
-	fields[field.tag.field].push_back(field);
-}
-
-void ProtoWriter::replace(Field field)
-{
-	fields[field.tag.field].clear();
-	fields[field.tag.field].push_back(field);
-}
-
-void ProtoWriter::replace(Field field, uint32_t index)
-{
-	fields[field.tag.field][index] = field;
-}
-
-void ProtoWriter::clear(unsigned fieldId)
-{
-	return fields[fieldId].clear();
-}
-
-bool ProtoWriter::has(unsigned fieldId)
-{
-	return fields[fieldId].size() > 0;
-}
-
-Field ProtoWriter::get(unsigned fieldId)
-{
-	if (fields[fieldId].empty())
-		return Field();
-	return fields[fieldId][0];
-}
-
-std::vector<Field> ProtoWriter::getAll(unsigned fieldId)
-{
-	return fields[fieldId];
-}
-
-template<typename T>
-void ProtoWriter::add(Tag tag, T value)
-{
-	fields[tag.field].push_back(Field(tag, value));
-}
-
-template<typename T>
-void ProtoWriter::replace(Tag tag, T value)
-{
-	fields[tag.field].clear();
-	fields[tag.field].push_back(Field(tag, value));
-}
-
-template<typename T>
-void ProtoWriter::replace(Tag tag, T value, uint32_t index)
-{
-	fields[tag.field][index] = Field(tag, value);
-}
-
-void ProtoWriter::add(Tag tag, std::string value)
-{
-	fields[tag.field].push_back(Field(tag, value));
-}
-
-void ProtoWriter::replace(Tag tag, std::string value)
-{
-	fields[tag.field].clear();
-	fields[tag.field].push_back(Field(tag, value));
-}
-
-void ProtoWriter::replace(Tag tag, std::string value, uint32_t index)
-{
-	fields[tag.field][index] = Field(tag, value);
-}
-
-void ProtoWriter::clear(Tag tag)
-{
-	return fields[tag.field].clear();
-}
-
-bool ProtoWriter::has(Tag tag)
-{
-	return fields[tag.field].size() > 0;
-}
-
-Field ProtoWriter::get(Tag tag)
-{
-	if (fields[tag.field].empty())
-		return Field();
-	return fields[tag.field][0];
-}
-
-std::vector<Field> ProtoWriter::getAll(Tag tag)
-{
-	return fields[tag.field];
-}
-
-#pragma endregion
\ No newline at end of file
diff --git a/SpyCustom/ProtobuffMessages.h b/SpyCustom/ProtobuffMessages.h
deleted file mode 100644
index 5eb7868..0000000
--- a/SpyCustom/ProtobuffMessages.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#pragma once
-#include "pbwrap.hpp"
-
-#define k_EMsgGCCStrike15_v2_MatchmakingGC2ClientReserve 9107
-#define k_EMsgGCClientWelcome 4004
-#define k_EMsgGCClientHello 4006
-#define k_EMsgGCAdjustItemEquippedState 1059
-#define k_EMsgGCCStrike15_v2_MatchmakingClient2GCHello 9109
-#define k_EMsgGCCStrike15_v2_MatchmakingGC2ClientHello 9110
-#define k_EMsgGCCStrike15_v2_ClientGCRankUpdate  9194
-
-using namespace pbwrap;
-
-struct CMsgClientHello : pbmsg<8> {
-    PBMSG_CTOR;
-    PBFIELD(3, types::Uint32, client_session_need);
-};
-
-struct MatchmakingGC2ClientHello : pbmsg<20> {
-    struct PlayerRankingInfo : pbmsg<6> {
-        PBMSG_CTOR;
-        PBFIELD(1, types::Uint32, account_id);
-        PBFIELD(2, types::Uint32, rank_id);
-        PBFIELD(3, types::Uint32, wins);
-        PBFIELD(6, types::Uint32, rank_type_id);
-    };
-    struct PlayerCommendationInfo : pbmsg<4> {
-        PBMSG_CTOR;
-        PBFIELD(1, types::Uint32, cmd_friendly);
-        PBFIELD(2, types::Uint32, cmd_teaching);
-        PBFIELD(4, types::Uint32, cmd_leader);
-    };
-
-    PBMSG_CTOR;
-    PBFIELD(7, PlayerRankingInfo, ranking);
-    PBFIELD(8, PlayerCommendationInfo, commendation);
-    PBFIELD(17, types::Int32, player_level);
-    PBFIELD(18, types::Int32, player_cur_xp);
-    PBFIELD(4, types::Uint32, penalty_seconds);
-    PBFIELD(5, types::Uint32, penalty_reason);
-    PBFIELD(6, types::Int32, vac_banned);
-};
-
-struct CMsgGCCStrike15_v2_ClientGCRankUpdate : pbmsg<1> {
-    PBMSG_CTOR;
-    PBFIELD(1, MatchmakingGC2ClientHello::PlayerRankingInfo, ranking);
-};
-
-struct CSOEconItemEquipped : pbmsg<2> {
-    PBMSG_CTOR;
-    PBFIELD(1, types::Int32, new_class);
-    PBFIELD(2, types::Int32, new_slot);
-};
-
-struct CSOEconItemAttribute : pbmsg<3> {
-    PBMSG_CTOR;
-    PBFIELD(1, types::Uint32, def_index);
-    PBFIELD(2, types::Uint32, value);
-    PBFIELD(3, types::Bytes, value_bytes);
-};
-
-struct CSOEconItem : pbmsg<19> {
-    PBMSG_CTOR;
-    PBFIELD(1, types::Uint64, id);
-    PBFIELD(2, types::Uint32, account_id);
-    PBFIELD(3, types::Uint32, inventory);
-    PBFIELD(4, types::Int32, def_index);
-    PBFIELD(5, types::Uint32, quantity);
-    PBFIELD(6, types::Uint32, level);
-    PBFIELD(7, types::Uint32, quality);
-    PBFIELD(8, types::Uint32, flags);
-    PBFIELD(9, types::Uint32, origin);
-    PBFIELD(10, types::String, custom_name);
-    PBFIELD(11, types::String, custom_desc);
-    PBFIELD(12, CSOEconItemAttribute, attribute); 
-    PBFIELD(14, types::Bool, in_use);
-    PBFIELD(15, types::Uint32, style);
-    PBFIELD(16, types::Uint64, original_id);
-    PBFIELD(18, CSOEconItemEquipped, equipped_state);
-    PBFIELD(19, types::Uint32, rarity);
-};
-
-struct CMsgClientWelcome : pbmsg<11> {
-    struct SubscribedType : pbmsg<2> {
-        PBMSG_CTOR;
-        PBFIELD(1, types::Int32, type_id);
-        PBFIELD(2, CSOEconItem, object_data);
-    };
-
-    struct CMsgSOCacheSubscribed : pbmsg<4> {
-        PBMSG_CTOR;
-        PBFIELD(2, SubscribedType, objects);
-    };
-
-    PBMSG_CTOR;
-    PBFIELD(3, CMsgSOCacheSubscribed, outofdate_subscribed_caches);
-};
-
-struct CMsgAdjustItemEquippedState : pbmsg<4> {
-    PBMSG_CTOR;
-    PBFIELD(1, types::Uint64, item_id);
-    PBFIELD(2, types::Uint32, new_class);
-    PBFIELD(3, types::Uint32, new_slot);
-    PBFIELD(4, types::Bool, swap);
-};
\ No newline at end of file
diff --git a/SpyCustom/RichText.h b/SpyCustom/RichText.h
deleted file mode 100644
index ffc2397..0000000
--- a/SpyCustom/RichText.h
+++ /dev/null
@@ -1,234 +0,0 @@
-#ifndef RICHTEXT_H
-#define RICHTEXT_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "Panel.h"
-#include "utlvector.h"
-
-namespace vgui
-{
-
-	class ClickPanel;
-
-	class RichText : public Panel
-	{
-		DECLARE_CLASS_SIMPLE(RichText, Panel);
-
-	public:
-		RichText(Panel* parent, const char* panelName);
-		~RichText();
-
-		virtual void SetText(const char* text);
-		virtual void SetText(const wchar_t* text);
-		void GetText(int offset, OUT_Z_BYTECAP(bufLenInBytes) wchar_t* buf, int bufLenInBytes);
-		void GetText(int offset, OUT_Z_BYTECAP(bufLenInBytes) char* pch, int bufLenInBytes);
-
-		void SetFont(HFont font);
-
-		void InsertChar(wchar_t ch);
-		void InsertString(const char* text);
-		void InsertString(const wchar_t* wszText);
-
-		void SelectNone();
-		void SelectAllText();
-		void SelectNoText();
-		MESSAGE_FUNC(CutSelected, "DoCutSelected");
-		MESSAGE_FUNC(CopySelected, "DoCopySelected");
-
-		void SetPanelInteractive(bool bInteractive) { m_bInteractive = bInteractive; }
-
-		void SetUnusedScrollbarInvisible(bool bInvis) { m_bUnusedScrollbarInvis = bInvis; }
-
-		void GotoTextStart();	      
-		void GotoTextEnd();	      
-
-		void SetVerticalScrollbar(bool state);
-		void SetMaximumCharCount(int maxChars);
-
-		void InsertColorChange(Color col);
-		void InsertIndentChange(int pixelsIndent);
-		void InsertClickableTextStart(const char* pchClickAction = NULL);
-		void InsertClickableTextEnd();
-		void InsertPossibleURLString(const char* text, Color URLTextColor, Color normalTextColor);
-
-		void InsertFade(float flSustain, float flLength);
-
-		void ResetAllFades(bool bHold, bool bOnlyExpired = false, float flNewSustain = -1.0f);
-
-		void SetToFullHeight();
-		int GetNumLines();
-
-
-		virtual bool RequestInfo(KeyValues* outputData);
-		virtual void SetFgColor(Color color);
-		virtual void SetDrawOffsets(int ofsx, int ofsy);
-		bool IsScrollbarVisible();
-
-		void SetURLClickedHandler(Panel* pPanelToHandleClickMsg);
-
-		void SetUnderlineFont(HFont font);
-
-		bool IsAllTextAlphaZero() const;
-		bool HasText() const;
-
-		void SetDrawTextOnly();
-
-	protected:
-		virtual void OnThink();
-		virtual void PerformLayout();        
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-		virtual void Paint();
-
-		virtual void ApplySettings(KeyValues* inResourceData);
-		virtual void GetSettings(KeyValues* outResourceData);
-		virtual const char* GetDescription(void);
-		MESSAGE_FUNC_WCHARPTR(OnSetText, "SetText", text);
-		MESSAGE_FUNC(OnSliderMoved, "ScrollBarSliderMoved");      
-		virtual void OnKillFocus();
-		virtual void OnMouseWheeled(int delta);	     
-		virtual void OnKeyCodeTyped(KeyCode code);	   
-
-		MESSAGE_FUNC_INT(OnClickPanel, "ClickPanel", index);
-
-		virtual void OnCursorMoved(int x, int y);           
-		virtual void OnMousePressed(MouseCode code);      
-		virtual void OnMouseDoublePressed(MouseCode code);
-		virtual void OnMouseReleased(MouseCode code);	     
-
-		virtual void OnMouseFocusTicked();       
-		virtual void OnCursorEntered();	     
-		virtual void OnCursorExited();	     
-
-		virtual void OnMouseCaptureLost();
-		virtual void OnSizeChanged(int newWide, int newTall);
-		virtual void OnSetFocus();
-
-		int ParseTextStringForUrls(const char* text, int startPos, char* pchURLText, int cchURLText, char* pchURL, int cchURL, bool& clickable);
-		virtual void OnTextClicked(const wchar_t* text);
-
-#ifdef DBGFLAG_VALIDATE
-		virtual void Validate(CValidator& validator, char* pchName);
-#endif  
-
-	protected:
-		ScrollBar* _vertScrollBar;	       
-
-	private:
-		int GetLineHeight();
-		HFont GetDefaultFont();
-
-		const wchar_t* ResolveLocalizedTextAndVariables(char const* pchLookup, OUT_Z_BYTECAP(outbufsizeinbytes) wchar_t* outbuf, size_t outbufsizeinbytes);
-		void CheckRecalcLineBreaks();
-
-		void GotoWordRight();	       
-		void GotoWordLeft();	       
-
-		void TruncateTextStream();
-		bool GetSelectedRange(int& cx0, int& cx1);
-		void CursorToPixelSpace(int cursorPos, int& cx, int& cy);
-		int PixelToCursorSpace(int cx, int cy);
-		void AddAnotherLine(int& cx, int& cy);
-		void RecalculateDefaultState(int startIndex);
-
-		void LayoutVerticalScrollBarSlider();
-		void OpenEditMenu();
-		void FinishingURL(int x, int y);
-		int GetStartDrawIndex(int& lineBreakIndexIndex);
-		int GetCursorLine();
-		int GetClickableTextIndexStart(int startIndex);
-		void CreateEditMenu();    
-
-		MESSAGE_FUNC_INT(MoveScrollBar, "MoveScrollBar", delta);
-		MESSAGE_FUNC_INT(MoveScrollBarDirect, "MoveScrollBarDirect", delta);
-
-		void InvalidateLineBreakStream();
-		void RecalculateLineBreaks();
-
-		struct TFade
-		{
-			float flFadeStartTime;
-			float flFadeLength;
-			float flFadeSustain;
-			int  iOriginalAlpha;
-		};
-
-		struct TFormatStream
-		{
-			Color color;
-			int pixelsIndent;
-			bool textClickable;
-			CUtlSymbol m_sClickableTextAction;
-
-			TFade fade;
-
-			int textStreamIndex;
-		};
-
-		bool m_bResetFades;
-		bool m_bInteractive;
-		bool m_bUnusedScrollbarInvis;
-		bool m_bAllTextAlphaIsZero;
-
-		CUtlVector<wchar_t>   m_TextStream;		           
-		CUtlVector<int>	   m_LineBreaks;		             
-		CUtlVector<TFormatStream> m_FormatStream;	    
-
-		bool m_bRecalcLineBreaks;
-
-		int	_recalculateBreaksIndex;			         	
-		bool			   _invalidateVerticalScrollbarSlider;
-		int                _cursorPos;			          
-		bool			   _mouseSelection;		         
-		bool			   _mouseDragSelection;	              
-		int                _select[2];			             
-		int				   _pixelsIndent;
-		int				   _maxCharCount;		           
-		HFont              _font;				       
-		HFont			   m_hFontUnderline;
-		Color			   _selectionColor;
-		Color			   _selectionTextColor;	     
-		bool			   _currentTextClickable;
-		CUtlVector<ClickPanel*>  _clickableTextPanels;
-		int				   _clickableTextIndex;
-		Color				_defaultTextColor;
-		int					_drawOffsetX;
-		int					_drawOffsetY;
-
-		Panel* m_pInterior;
-		PHandle				m_hPanelToHandleClickingURLs;
-
-
-		Menu* m_pEditMenu;		  
-
-		char* m_pszInitialText;	  
-
-		bool _recalcSavedRenderState;
-
-		struct TRenderState
-		{
-			int x, y;
-
-			Color textColor;
-			int pixelsIndent;
-			bool textClickable;
-
-			int formatStreamIndex;
-		};
-		TRenderState m_CachedRenderState;	        
-
-		bool UpdateRenderState(int textStreamPos, TRenderState& renderState);
-		void CalculateFade(TRenderState& renderState);
-
-		void GenerateRenderStateForTextStreamIndex(int textStreamIndex, TRenderState& renderState);
-		int FindFormatStreamIndexForTextStreamPos(int textStreamIndex);
-
-		int DrawString(int iFirst, int iLast, TRenderState& renderState, HFont font);
-	};
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Singleton.hpp b/SpyCustom/Singleton.hpp
deleted file mode 100644
index de2db9f..0000000
--- a/SpyCustom/Singleton.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef SINGLETON
-#define SINGLETON
-#pragma once
-
-
-template<typename T>
-class Singleton
-{
-protected:
-    Singleton() {}
-    ~Singleton() {}
-
-    Singleton(const Singleton&) = delete;
-    Singleton& operator=(const Singleton&) = delete;
-
-    Singleton(Singleton&&) = delete;
-    Singleton& operator=(Singleton&&) = delete;
-
-public:
-    static T& Get()
-    {
-        static T inst{};
-        return inst;
-    }
-};
-
-
-#endif
diff --git a/SpyCustom/SkinChanger.hpp b/SpyCustom/SkinChanger.hpp
deleted file mode 100644
index 2558927..0000000
--- a/SpyCustom/SkinChanger.hpp
+++ /dev/null
@@ -1,427 +0,0 @@
-#ifndef SKINCHANGER
-#define SKINCHANGER
-#pragma once
-
-#include <vector>
-#include <string>
-
-#include "GameEventManager.h"
-#include "VMT.hpp"
-#include "Interfaces.hpp"
-#include "Options.hpp" 
-#include "c_baseentity.h"
-#include "PatternScan.hpp"
-
-extern VMTHook* GameEventManagerHook;
-extern  VMTHook* ClientHook;
-
-#include "NetVarManager.hpp"  
-
-extern bool needupdate;
-
-#include "vmt_smart_hook.hpp"
-
-
-struct iitem
-{
-    iitem(int defindex1, std::string name1, std::string viewmodel1, std::string worldmodel1)
-    {
-        defindex = defindex1;
-        name = name1;
-        viewmodel = viewmodel1;
-        worldmodel = worldmodel1;
-        Preview = std::to_string(defindex1).append(": ").append(name1);
-    }
-    int defindex;
-    std::string name;
-    std::string viewmodel;
-    std::string worldmodel;
-    std::string Preview;
-    bool isSelected;
-};
-
-
-
-
-struct hud_weapons_t
-{
-    std::int32_t* get_weapon_count()
-    {
-        return reinterpret_cast<std::int32_t*>(std::uintptr_t(this) + 0x80);
-    }
-};
-
-
-struct String_t
-{
-    char* szBuffer;	 
-    int nCapacity;	 
-    int _unknown;	 
-    int nLength;	 
-}; 
-
-class CEconItemRarityDefinition
-{
-public:
-    int id;
-    int color;
-    String_t name;
-    String_t loc_key;
-    String_t loc_key_weapon;
-    String_t loot_list;
-    String_t recycle_list;
-    String_t drop_sound;
-    String_t endmatchitemrevealrarity;
-    String_t pointertosomething3;
-    void* pointertosomething4;
-    void* pointertosomething5;
-    char dumb10[8];
-};
- 
-class CStickerKit
-{
-public:
-    int id;
-    int item_rarity;
-    String_t name;
-    String_t description;
-    String_t item_name;
-    String_t material_name;
-    String_t image_inventory;
-    int tournament_event_id;
-    int tournament_team_id;
-    int tournament_player_id;
-    bool is_custom_sticker_material;
-    float rotate_end;
-    float rotate_start;
-    float scale_min;
-    float scale_max;
-    float wear_min;
-    float wear_max;
-    String_t image_inventory2;
-    String_t image_inventory_large;
-    std::uint32_t pad0[4];
-};
-
-
-class CPaintKit
-{
-public:
-    int nID;                        
-    String_t sName;                 
-    String_t sDescriptionString;    
-    String_t sDescriptionTag;       
-    String_t pad;                   
-    String_t pattern;               
-    String_t pad1;                  
-    String_t sLogoMaterial;         
-    int bBaseDiffuseOverride;                   
-    int rarity;                     
-    int nStyle;                     
-    int color1;
-    int color2;
-    int color3;
-    int color4;
-    int logoColor1;
-    int logoColor2;
-    int logoColor3;
-    int logoColor4;
-    float flWearDefault;
-    float flWearRemapMin;
-    float flWearRemapMax;
-    char nFixedSeed;
-    char uchPhongExponent;
-    char uchPhongAlbedoBoost;
-    char uchPhongIntensity; 
-    float flPatternScale;
-    float flPatternOffsetXStart;
-    float flPatternOffsetXEnd;
-    float flPatternOffsetYStart;
-    float flPatternOffsetYEnd;
-    float flPatternRotateStart;
-    float flPatternRotateEnd;
-    float flLogoScale;
-    float flLogoOffsetX;
-    float flLogoOffsetY;
-    float flLogoRotation;
-    int bIgnoreWeaponSizeScale;
-    int nViewModelExponentOverrideSize;
-    int bOnlyFirstMaterial;
-    float pearlescent;
-    int sVmtPath[4];
-    int kvVmtOverrides;
-};  
-
-
-
-
-struct EconItemQualityDefinition {
-    int id;
-    const char* name;
-    unsigned weight;
-    bool explicitMatchesOnly;
-    bool canSupportSet;
-    const char* hexColor;
-};
-
-extern std::vector<iitem> rarities;
-extern std::vector<iitem> knives;
-extern std::vector<iitem> gloves;
-extern std::vector<iitem> agents;
-extern std::vector<iitem> medals;
-extern std::vector<iitem> musickits;
-extern std::vector <iitem> qualities;
-
-static inline auto is_knife(const int di) -> bool
-{
-    for (short i = 0; i < knives.size(); i++)
-        if (knives[i].defindex == di) return true;
-    return false;
-}
-
-bool __fastcall hkFireEventClientSide(void* thisptr, void* edx, IGameEvent* event);
-void __fastcall hkFrameStageNotify(IBaseClientDLL* thisptr, void* edx, ClientFrameStage_t stage);
-
-
-
-
-class CCStrike15ItemSchema;
-class CCStrike15ItemSystem
-{
-public:
-    virtual CCStrike15ItemSchema* GetItemSchemaInterface() = 0;
-};
-
-
-template <typename Key, typename Value>
-struct Node_t
-{
-    int nPreviousId;		
-    int nNextId;			
-    void* parent;		
-    int type;			
-    Key iPaintKitId;		
-    Value value;			
-};
-
-template <typename Key, typename Value>
-struct Head_t
-{
-    Node_t<Key, Value>* pMemory;		
-    int nAllocationCount;			
-    int nGrowSize;					
-    int nStartElement;				
-    int nNextAvailable;				
-    int _unknown;					
-    int nLastElement;				
-}; 
-
-
-class CEconItemDefinition
-{
-public:
-
-
-    VIRTUAL_METHOD(int, getWeaponId, 0, (), (this))
-    VIRTUAL_METHOD(const char*, getItemBaseName, 2, (), (this))
-    VIRTUAL_METHOD(const char*, getItemTypeName, 3, (), (this))
-    VIRTUAL_METHOD(const char*, getPlayerDisplayModel, 6, (), (this))
-    VIRTUAL_METHOD(const char*, getWorldDisplayModel, 7, (), (this))
-    VIRTUAL_METHOD(std::uint8_t, getRarity, 12, (), (this))
-
-    char pad_0x0000[0x8]; 
-    int32_t m_iItemDefinitionIndex;  
-    char pad_0x000C[0x40]; 
-    char* m_szHudName;  
-    char pad_0x0050[0x4]; 
-    char* m_szWeaponType;  
-    char pad_0x0058[0x4]; 
-    char* m_szWeaponDescription;  
-    char pad_0x0060[0x34]; 
-    char* m_szViewModel;  
-    char pad_0x0098[0x4]; 
-    char* m_szWorldModel;  
-    char* m_szWorldModelDropped;  
-    char pad_0x001[0x58];
-    char* stickersdecalmdl;
-    char pad_0x002[0x0C];
-    char* stickersdecalmdl1;
-    char* inventoryicon;
-    char pad_0x003[0xA4]; 
-    char* m_szWeaponName1;
-    char pad_0x004[0x14];
-    char* m_szWeaponName;
-    char pad_0x005[0x8];
-    char* m_szWeaponName3;
-    char pad_0x01C4[0x27C];
-};
-
-
-void InitSkinChanger();
-
- 
-
-
-template <typename T>
-struct UtlMemory {
-    T& operator[](int i) const noexcept { return memory[i]; };
-
-    T* memory;
-    int allocationCount;
-    int growSize;
-};
-
-template <typename Key, typename Value>
-struct UtlMap {
-    auto begin() const noexcept { return memory.memory; }
-    auto end() const noexcept { return memory.memory + numElements; }
-
-    int find(Key key) const noexcept
-    {
-        auto curr = root;
-
-        while (curr != -1) {
-            const auto el = memory[curr];
-
-            if (el.iPaintKitId < key)
-                curr = el.nNextId;
-            else if (el.iPaintKitId > key)
-                curr = el.nPreviousId;
-            else
-                break;
-        }
-        return curr;
-    }
-    void* lessFunc;
-    UtlMemory<Node_t<Key, Value>> memory;
-    int root;
-    int numElements;
-    int firstFree;
-    int lastAlloc;
-    Node_t<Key, Value>* elements;
-};
-
-struct AlternateIconData {
-    String_t simpleName;
-    String_t largeSimpleName;
-    String_t iconURLSmall;
-    String_t iconURLLarge;
-    PAD(28)
-};
-
-
-
-template <typename T>
-class UtlVector {
-public:
-    constexpr T& operator[](int i) noexcept { return memory[i]; };
-    constexpr const T& operator[](int i) const noexcept { return memory[i]; };
-
-    T* memory; 
-    int allocationCount;
-    int growSize;
-    int size;
-    T* elements;
-};
-
-
-struct ItemListEntry {
-    int itemDef;
-    int paintKit;
-    PAD(20)
-
-    auto weaponId() const noexcept
-    {
-        return itemDef;
-    }
-};
-
-class EconLootListDefinition {
-public:
-    VIRTUAL_METHOD(const char*, getName, 0, (), (this))
-    VIRTUAL_METHOD(const UtlVector<ItemListEntry>&, getLootListContents, 1, (), (this))
-};
-
-class EconItemSetDefinition {
-public:
-    VIRTUAL_METHOD(const char*, getLocKey, 1, (), (this))
-    VIRTUAL_METHOD(int, getItemCount, 4, (), (this))
-    VIRTUAL_METHOD(int, getItemDef, 5, (int index), (this, index))
-    VIRTUAL_METHOD(int, getItemPaintKit, 6, (int index), (this, index))
-};
-
-
-
-
-class CEconColorDefinition
-{
-public:
-    int xz;
-    int xz2;
-};
-
-class CEconGraffitiTintDefinition
-{
-public:
-    int xz;
-    int xz2;
-};
-
-class CEconMusicDefinition
-{
-public:
-    int id;
-    char* name;
-    char* desc;
-    char* model;
-    char* music;
-};
-
-template <typename T>
-class MusicVector {
-public:
-    constexpr T& operator[](int i) noexcept { return memory[i]; };
-    constexpr const T& operator[](int i) const noexcept { return memory[i]; };
-
-    T* memory;
-    PAD(0xC)
-    int itemcount;
-};
-
-class ItemSchema { 
-public:
-    PAD(0x64) 
-        UtlMap<int, CEconItemRarityDefinition> rars;
-        UtlMap<int, EconItemQualityDefinition> qualities;
-    PAD(0x48)
-        UtlMap<int, CEconItemDefinition*> itemsSorted;
-    PAD(0x104)
-        UtlMap<std::uint64_t, AlternateIconData> alternateIcons;
-    PAD(0x48)
-    UtlMap<int, CPaintKit*> paintKits;
-    UtlMap<int, CStickerKit*> stickerKits;
-    UtlMap<const char*, CStickerKit*> sticker_kits_namekey;
-    int32_t pad6[24];
-    UtlMap<const char*, KeyValues*> prefabs;
-    UtlVector<CEconColorDefinition*> colors;
-    UtlVector<CEconGraffitiTintDefinition*> graffiti_tints;
-    int32_t pad7[20];
-    MusicVector<CEconMusicDefinition*> music_definitions;
-
-    VIRTUAL_METHOD(CEconItemDefinition*, getItemDefinitionInterface, 4, (int id), (this, id))
-        VIRTUAL_METHOD(int, getItemSetCount, 28, (), (this))
-        VIRTUAL_METHOD(EconItemSetDefinition*, getItemSet, 29, (int index), (this, index))
-        VIRTUAL_METHOD(EconLootListDefinition*, getLootList, 32, (int index), (this, index))
-        VIRTUAL_METHOD(int, getLootListCount, 34, (), (this))
-        VIRTUAL_METHOD(CEconItemDefinition*, getItemDefinitionByName, 42, (const char* name), (this, name))
-};
-
-
-class ItemSystem {
-public:
-    VIRTUAL_METHOD(ItemSchema*, getItemSchema, 0, (), (this))
-};
- 
-extern std::add_pointer_t<ItemSystem* __cdecl()> itemSystem;
-
-#endif
diff --git a/SpyCustom/Skinchanger.cpp b/SpyCustom/Skinchanger.cpp
deleted file mode 100644
index 92c5994..0000000
--- a/SpyCustom/Skinchanger.cpp
+++ /dev/null
@@ -1,678 +0,0 @@
-#include "SkinChanger.hpp"
-#include "Other.hpp"
-
-VMTHook* GameEventManagerHook = nullptr;
-VMTHook* ClientHook = nullptr;
-std::vector<iitem> rarities;
-std::vector<iitem> knives;
-std::vector<iitem> gloves;
-std::vector<iitem> agents;
-std::vector<iitem> medals;
-std::vector<iitem> musickits;
-std::vector <iitem> qualities;
- 
-std::add_pointer_t<ItemSystem* __cdecl()> itemSystem;
-
-
-
-
-enum class EStickerAttributeType
-{
-    Index,
-    Wear,
-    Scale,
-    Rotation
-};
-
-static auto s_econ_item_interface_wrapper_offset = std::uint16_t(0);
-
-struct GetStickerAttributeBySlotIndexFloat
-{
-    static auto __fastcall hooked(void* thisptr, void*, const int slot,
-        const EStickerAttributeType attribute, const float unknown) -> float
-    {
-        auto item = reinterpret_cast<C_BaseAttributableItem*>(std::uintptr_t(thisptr) - s_econ_item_interface_wrapper_offset);
-
-        const auto defindex = item->GetItemDefinitionIndex();
-         
-        int config = GetCfgIndex(defindex);
-
-        if (config != -1)
-        {
-            switch (attribute)
-            {
-            case EStickerAttributeType::Wear:
-                return g_Options.weapons.value->arr[config].stickers[slot].wear;
-            case EStickerAttributeType::Scale:
-                return g_Options.weapons.value->arr[config].stickers[slot].scale;
-            case EStickerAttributeType::Rotation:
-                return g_Options.weapons.value->arr[config].stickers[slot].rotation;
-            default:
-                break;
-            }
-        }
-
-        return m_original(thisptr, nullptr, slot, attribute, unknown);
-    }
-
-    static decltype(&hooked) m_original;
-};
-
-decltype(GetStickerAttributeBySlotIndexFloat::m_original) GetStickerAttributeBySlotIndexFloat::m_original;
-
-struct GetStickerAttributeBySlotIndexInt
-{
-    static auto __fastcall hooked(void* thisptr, void*, const int slot,
-        const EStickerAttributeType attribute, const int unknown) -> int
-    {
-        auto item = reinterpret_cast<C_BaseAttributableItem*>(std::uintptr_t(thisptr) - s_econ_item_interface_wrapper_offset);
-
-        if (attribute == EStickerAttributeType::Index)
-        {
-            const auto defindex = item->GetItemDefinitionIndex();
-
-            int config = GetCfgIndex(defindex);
-
-            if (config != -1)
-                return g_Options.weapons.value->arr[config].stickers[slot].stickerid;
-        }
-
-        return m_original(thisptr, nullptr, slot, attribute, unknown);
-    }
-
-    static decltype(&hooked) m_original;
-};
-
-decltype(GetStickerAttributeBySlotIndexInt::m_original) GetStickerAttributeBySlotIndexInt::m_original;
-
-
-void ApplyStickers(C_BaseAttributableItem* item)
-{
-    if (!s_econ_item_interface_wrapper_offset)
-        s_econ_item_interface_wrapper_offset = netvar_manager::get().get_offset(FNV("CBaseAttributableItem->m_Item")) + 0xC;
-
-    static vmt_multi_hook hook;
-
-    const auto econ_item_interface_wrapper = std::uintptr_t(item) + s_econ_item_interface_wrapper_offset;
-
-    if (hook.initialize_and_hook_instance(reinterpret_cast<void*>(econ_item_interface_wrapper)))
-    {
-        hook.apply_hook<GetStickerAttributeBySlotIndexFloat>(4);
-        hook.apply_hook<GetStickerAttributeBySlotIndexInt>(5);
-    }
-}
-
-
-bool __fastcall hkFireEventClientSide(void* thisptr, void* edx, IGameEvent* event)
-{
-    static auto ofunc = GameEventManagerHook->GetOriginal<bool(__fastcall*)(void*, void*, IGameEvent*)>(9);
-    if (event) {
-        if (!strcmp(event->GetName(), "player_death") && iff.g_pEngineClient->GetPlayerForUserID(event->GetInt("attacker")) == iff.g_pEngineClient->GetLocalPlayer())
-        {
-#ifdef DEBUG
-            printf("BE playerdeath with %s\n", event->GetString("weapon"));
-#endif
-            for (int i = 0; i < g_Options.weapons.value->weaponzcount; i++)  
-            {
-                if (_tcsstr(g_Options.weapons.value->arr[i].killfeedicon, event->GetString("weapon")))
-                {
-                    if (g_Options.weapons.value->arr[i].active && g_Options.weapons.value->arr[i].killfeediconactive)  
-                        event->SetString("weapon", g_Options.weapons.value->arr[i].killfeediconreplace);
-
-                    if (!g_Options.weapons.value->arr[i].ownerunk && g_Options.weapons.value->arr[i].stattrak != -1)
-                        g_Options.weapons.value->arr[i].stattrak += 1;
-
-
-                }
-            }
-
-        }
-    }
-
-    return ofunc(thisptr, edx, event);
-
-}
-
-
-
-C_CS_PlayerResource** g_player_resource;
- 
-#include <array>
-bool Changer()
-{
-    static bool initinterface = 0;
-    if (!initinterface) {
-        const auto team_arr_prop = C_CS_PlayerResource::GetTeamProp();
-        const auto team_prop = team_arr_prop->m_pDataTable->m_pProps;
-        const auto proxy_addr = std::uintptr_t(team_prop->m_ProxyFn);
-        g_player_resource = *reinterpret_cast<C_CS_PlayerResource***>(proxy_addr + 0x10);
-#ifdef DEBUG
-        printf("g_player_resource initiated %x\n", g_player_resource);
-#endif
-        initinterface = 1;
-    }
-
-    if (!iff.g_pEngineClient->IsConnected()) {
-        return 0;
-    }
-
-    int localplayer_index = iff.g_pEngineClient->GetLocalPlayer();
-    C_BasePlayer* localplayer = static_cast<C_BasePlayer*>(iff.g_pEntityList->GetClientEntity(localplayer_index));
-
-    if (!localplayer)
-        return 0;
-      
-
-    auto player_resource = *g_player_resource;
-
-    if (g_Options.weapons.value->arr[4].active)
-        player_resource->GetCoins()[localplayer_index] = g_Options.weapons.value->arr[4].modeldefindex; 
-
-    if (g_Options.weapons.value->arr[5].active)
-        player_resource->GetMusicKits()[localplayer_index] = g_Options.weapons.value->arr[5].modeldefindex; 
-     
-    if (g_Options.profile_active)
-    { 
-        int ranktype = player_resource->GetRankType()[localplayer_index];
-        int selectedrank = 0;
-        if (ranktype == 7) selectedrank = 1;
-        if (ranktype == 10) selectedrank = 2;
-
-        player_resource->GetRanks()[localplayer_index] = g_Options.rankz.value->arr[selectedrank].rank;
-        player_resource->GetWins()[localplayer_index] = g_Options.rankz.value->arr[selectedrank].wins;
-
-        player_resource->GetLevel()[localplayer_index] = g_Options.level;
-        player_resource->GetComLeader()[localplayer_index] = g_Options.comleader;
-        player_resource->GetComTeacher()[localplayer_index] = g_Options.comteacher;
-        player_resource->GetComFriendly()[localplayer_index] = g_Options.comfriendly; 
-    }
-
-    if (g_Options.fakescore)
-    { 
-        player_resource->GetMVPs()[localplayer_index] = g_Options.MVPs;
-        player_resource->GetScore()[localplayer_index] = g_Options.score;
-        player_resource->GetKills()[localplayer_index] = g_Options.kills;
-        player_resource->GetAssists()[localplayer_index] = g_Options.assists;
-        player_resource->GetDeaths()[localplayer_index] = g_Options.deaths; 
-    }
-
-
-    int team = localplayer->GetTeam(); char* model = 0;
-    if (team == TEAM_TERRORIST && g_Options.weapons.value->arr[2].active && g_Options.weapons.value->arr[2].modelactive)
-        model = g_Options.weapons.value->arr[2].model;
-    if (team == TEAM_CT && g_Options.weapons.value->arr[3].active && g_Options.weapons.value->arr[3].modelactive)
-        model = g_Options.weapons.value->arr[3].model;
-
-    
-    if (model != 0) {
-        localplayer->GetModelIndex() = iff.g_pMdlInfo->GetModelIndex(model);
-        if (const auto modelprecache = iff.g_pNetworkStringTableContainer->FindTable("modelprecache")) 
-        {
-            modelprecache->AddString(false, model);
-            const auto viewmodelArmConfig = iff.getPlayerViewmodelArmConfigForPlayerModel(model);
-            modelprecache->AddString(false, viewmodelArmConfig[2]);
-            modelprecache->AddString(false, viewmodelArmConfig[3]);
-             
-          
-        }
-
-        
-
-        const auto m_hRagdoll = (C_BaseEntity*)iff.g_pEntityList->GetClientEntityFromHandle(localplayer->Ragdoll());
-        if (m_hRagdoll)
-            m_hRagdoll->GetModelIndex() = iff.g_pMdlInfo->GetModelIndex(model);
-        
-    }
-
-
-    if (localplayer->GetLifeState() != LIFE_ALIVE)
-    {
-        if (g_Options.weapons.value->arr[1].active && g_Options.weapons.value->arr[1].modelactive) {
-            auto destroyglove = iff.g_pEntityList->GetClientEntityFromHandle(localplayer->GetWearables()[0]);
-            if (destroyglove) {
-                destroyglove->GetClientNetworkable()->SetDestroyedOnRecreateEntities();
-                destroyglove->GetClientNetworkable()->Release();
-#ifdef DEBUG
-                printf("destroyed glove\n");
-#endif
-            }
-        }
-        return 0;
-    }
-
-    player_info_t localplayer_info;
-    if (!iff.g_pEngineClient->GetPlayerInfo(localplayer_index, &localplayer_info))
-        return 0;
-
-    CBaseHandle viewmodelHandle = localplayer->GetViewModel();
-    C_BaseViewModel* pViewModel = (C_BaseViewModel*)iff.g_pEntityList->GetClientEntityFromHandle(viewmodelHandle);
-    const auto view_model_weapon = (C_BaseAttributableItem*)iff.g_pEntityList->GetClientEntityFromHandle(pViewModel->GetWeapon());
-
-    int idi = view_model_weapon->GetItemDefinitionIndex();
-    if (idi == WEAPON_KNIFE) idi = WEAPON_KNIFE_T;
-
-    int modelcfgindex = GetCfgIndex2(idi);
-    if (modelcfgindex != -1 && g_Options.models.value->arr[modelcfgindex].active)
-    {
-        char* model = g_Options.models.value->arr[modelcfgindex].vmodel_repl;
-        const auto override_model_index = iff.g_pMdlInfo->GetModelIndex(model);
-        view_model_weapon->SetModelIndex(override_model_index)  ;
-        pViewModel->SetModelIndex(override_model_index)  ;
-        if (const auto modelprecache = iff.g_pNetworkStringTableContainer->FindTable("modelprecache"))
-        {
-            modelprecache->AddString(false, model);
-        }
-    }
-    
-    int seqact = opt.needtogetseqact;
-    if (seqact)
-    {
-        int oldmodelindex = pViewModel->GetModelIndex(); 
-        pViewModel->SetModelIndex(iff.g_pMdlInfo->GetModelIndex(g_Options.models.value->arr[seqact].vmodel_orig));
-        for (int i = 0; i < 20; i++)
-            strcpy(g_Options.models.value->arr[seqact].seqs[i].seq_orig_def, (char*)pViewModel->GetSequenceActivity(i)); 
-        pViewModel->SetModelIndex(iff.g_pMdlInfo->GetModelIndex(g_Options.models.value->arr[seqact].vmodel_repl));
-        for (int i = 0; i < 20; i++)
-        {
-            strcpy(g_Options.models.value->arr[seqact].seqs[i].seq_repl_def, (char*)pViewModel->GetSequenceActivity(i));
-
-            char newpreview[32] = "";
-            strcat_s(newpreview, std::to_string(i).c_str());
-            strcat_s(newpreview, ": ");
-            strcat_s(newpreview, g_Options.models.value->arr[seqact].seqs[i].seq_repl_def);
-            strcpy(g_Options.models.value->arr[seqact].seqs[i].seq_repl_def_preview, newpreview);
-        }
-        pViewModel->SetModelIndex(oldmodelindex);
-        opt.needtogetseqact = 0;
-    }
-    
-    if (g_Options.weapons.value->arr[1].active && g_Options.weapons.value->arr[1].modelactive) 
-    {
-        auto hWearables = localplayer->GetWearables();
-
-        static int glove_handle;
-        C_BaseAttributableItem* glove = (C_BaseAttributableItem*)iff.g_pEntityList->GetClientEntityFromHandle(hWearables[0] );
-
-        if (!glove)     
-        {
-            C_BaseAttributableItem* our_glove = (C_BaseAttributableItem*)iff.g_pEntityList->GetClientEntityFromHandle(glove_handle);
-
-            if (our_glove)     
-            {
-                hWearables[0] = glove_handle;
-                glove = our_glove;
-            }
-        }
-
-        if (!glove)
-        {
-            static std::add_pointer_t<C_BaseEntity* __cdecl(int, int)> createWearable = nullptr;
-             
-            if (!createWearable) {
-                createWearable = []() -> decltype(createWearable)
-                {
-                    for (auto clientClass = iff.g_pClient->GetAllClasses(); clientClass; clientClass = clientClass->m_pNext)
-                        if (clientClass->m_ClassID == 54) 
-                            return (std::add_pointer_t<C_BaseEntity* __cdecl(int, int)>)clientClass->m_pCreateFn;
-                    return nullptr;
-                }();
-            }
-
-            const auto serial = rand() % 0x1000;
-            auto entry = iff.g_pEntityList->GetHighestEntityIndex() + 1;
-            for (int i = 65; i < iff.g_pEntityList->GetHighestEntityIndex(); i++)
-            {
-                auto pEntity = iff.g_pEntityList->GetClientEntity(i);
-                if (pEntity && pEntity->GetClientClass()->m_ClassID == 70)           
-                {
-                    entry = i;
-                    break;
-                }
-            }
-
-            createWearable(entry, serial);
-            glove = (C_BaseAttributableItem*)iff.g_pEntityList->GetClientEntity(entry);
-            glove->initialized() = true;
-            hWearables[0] = entry | serial << 16;
-
-            static int(__thiscall * equipWearable)(void* wearable, void* player) = reinterpret_cast<decltype(equipWearable)>(FindPatternV2("client.dll", "55 8B EC 83 EC 10 53 8B 5D 08 57 8B F9"));
-            equipWearable(glove, localplayer);
-            localplayer->body() = 1;        
-            glove->SetModelIndex(iff.g_pMdlInfo->GetModelIndex(g_Options.weapons.value->arr[1].worldmodel));
-            iff.g_pClientState->ForceFullUpdate();
-        }
-
-        if (glove)
-        {
-            glove->GetItemDefinitionIndex() = g_Options.weapons.value->arr[1].modeldefindex;
-            glove->GetItemIDHigh() = -1;
-            glove->GetAccountID() = localplayer_info.xuidlow;
-            glove->GetFallbackPaintKit() = g_Options.weapons.value->arr[1].skinid;
-            glove->GetFallbackSeed() = g_Options.weapons.value->arr[1].seed;
-            glove->GetFallbackWear() = g_Options.weapons.value->arr[1].wear;
-
-        }
-    }
-
-     
-    if (g_Options.weapons.value->arr[0].active && g_Options.weapons.value->arr[0].modelactive) 
-    {
-
-        static int lastmdlindex = -1;
-        int curmdlindex = pViewModel->GetModelIndex();
-        if (lastmdlindex != curmdlindex)  
-        {
-            lastmdlindex = curmdlindex;
-            int defindex = view_model_weapon->GetItemDefinitionIndex();
-
-            if (!is_knife(defindex)) {
-                for (int i = 0; i < 20; i++)    
-                    if (_tcsstr(pViewModel->GetSequenceActivity(i), "draw"))
-                    {
-                        pViewModel->SendViewModelMatchingSequence(i); break;
-                    }
-            }
-        }
-
-        if (view_model_weapon && is_knife(view_model_weapon->GetItemDefinitionIndex())) 
-        {
-            const auto override_model_index = iff.g_pMdlInfo->GetModelIndex(g_Options.weapons.value->arr[0].model);
-            pViewModel->GetModelIndex() = override_model_index; 
-
-        }
-    }
-
-
-
-
- 
-    auto& weapons = localplayer->GetWeapons();
-
-    for (auto weapon_handle : weapons)
-    {
-        if (weapon_handle == INVALID_EHANDLE_INDEX)
-            break;
-
-        C_BaseAttributableItem* weapon = static_cast<C_BaseAttributableItem*>(iff.g_pEntityList->GetClientEntityFromHandle(weapon_handle));
-
-        if (!weapon)
-            continue;
-
-        short item_definition_index = weapon->GetItemDefinitionIndex();
-
-        if (item_definition_index == WEAPON_C4 && g_Options.weapons.value->arr[GetCfgIndex(item_definition_index)].active)
-            weapon->body() = 2; 
-        
-        if (item_definition_index == 42) item_definition_index = 59;
-
-         
-
-        int configindex = GetCfgIndex(item_definition_index); 
-        if (configindex == -1) continue; 
-
-        if (g_Options.weapons.value->arr[configindex].active)
-        {
-            if (is_knife(item_definition_index) && g_Options.weapons.value->arr[0].modelactive)
-            {
-                weapon->GetItemDefinitionIndex() = g_Options.weapons.value->arr[0].modeldefindex;
-                short mdlindex = iff.g_pMdlInfo->GetModelIndex(g_Options.weapons.value->arr[0].model);
-                weapon->GetModelIndex() = mdlindex;
-                auto m_pWorld = (C_BaseEntity*)iff.g_pEntityList->GetClientEntityFromHandle(weapon->GetWeaponWorldModel());
-                m_pWorld->GetModelIndex() = mdlindex+1;
-            }
-            weapon->GetItemIDHigh() = -1;
-
-            if (!g_Options.weapons.value->arr[configindex].ownerunk)
-                weapon->GetAccountID() = localplayer_info.xuidlow;
-            weapon->GetEntityQuality() = g_Options.weapons.value->arr[configindex].quality;
-            snprintf(weapon->GetCustomName(), 32, "%s", g_Options.weapons.value->arr[configindex].nametag);
-
-            weapon->GetFallbackPaintKit() = g_Options.weapons.value->arr[configindex].skinid;
-            weapon->GetFallbackSeed() = g_Options.weapons.value->arr[configindex].seed;
-            weapon->GetFallbackWear() = g_Options.weapons.value->arr[configindex].wear;
-            weapon->GetFallbackStatTrak() = g_Options.weapons.value->arr[configindex].stattrak;
-
-            ApplyStickers(weapon);
-
-             
-
-        }
-    }
-
-
-    
-
-    if (*g_Options.nvgsON)
-        NightvisionRun(localplayer);
-   
-    if (*g_Options.flashlightON)
-        FlashlightRun(localplayer);
-
-    if (*g_Options.weatheractive)
-        do_precipitation();
-
-    return 1;
-}
-
-
-
-
-void __fastcall hkFrameStageNotify(IBaseClientDLL* thisptr, void* edx, ClientFrameStage_t stage)
-{
-    static auto oFrameStageNotify = ClientHook->GetOriginal<void(__thiscall*)(IBaseClientDLL*, ClientFrameStage_t stage)>(37);
-    
-    if ( (*g_Options.playerloop_count || *g_Options.entityloop_count) && stage == ClientFrameStage_t::FRAME_NET_UPDATE_POSTDATAUPDATE_END)
-    {
-        for (int i = 1; i < 65; i++)
-        {
-            C_BasePlayer* pEntity = (C_BasePlayer*)iff.g_pEntityList->GetClientEntity(i);
-
-            if (i == iff.g_pEngineClient->GetLocalPlayer()) continue;
-
-            if (!pEntity || pEntity->IsDormant())  
-                continue;
-
-            int team = pEntity->GetTeam();
-            if ((team < 2) | (team > 3)) continue;
-            team -= 2;
-
-            if (g_Options.models.value->arr[team].active) {
-
-                char* model = g_Options.models.value->arr[team].vmodel_repl;
-
-                pEntity->GetModelIndex() = iff.g_pMdlInfo->GetModelIndex(model);
-                if (const auto modelprecache = iff.g_pNetworkStringTableContainer->FindTable("modelprecache"))
-                {
-                    modelprecache->AddString(false, model);
-                    const auto viewmodelArmConfig = iff.getPlayerViewmodelArmConfigForPlayerModel(model);
-                    modelprecache->AddString(false, viewmodelArmConfig[2]);
-                    modelprecache->AddString(false, viewmodelArmConfig[3]);
-                }
-
-                const auto m_hRagdoll = (C_BaseEntity*)iff.g_pEntityList->GetClientEntityFromHandle(pEntity->Ragdoll());
-                if (m_hRagdoll)
-                    m_hRagdoll->SetModelIndex(iff.g_pMdlInfo->GetModelIndex(model));
-            }
-
-            if (g_Options.models.value->arr[team].active_scale)
-                pEntity->GetModelScale() = g_Options.models.value->arr[team].scale;
-
-        }
-    }
-
-    if (stage == ClientFrameStage_t::FRAME_NET_UPDATE_POSTDATAUPDATE_START) {
-
-            Changer();
-            
-
-
-
-        if (opt.needupdate) {
-            static auto clear_hud_weapon_icon_ptr = FindPatternV2("client.dll", "55 8B EC 51 53 56 8B 75 08 8B D9 57 6B FE 2C");
-            static auto clearHudWeapon = reinterpret_cast<std::int32_t(__thiscall*)(void*, std::int32_t)>(clear_hud_weapon_icon_ptr);
-            auto element = FindHudElement("CCSGO_HudWeaponSelection");
-            auto hud_weapons = reinterpret_cast<hud_weapons_t*>(std::uintptr_t(element) - 0xA0);
-
-            if (hud_weapons && *hud_weapons->get_weapon_count() > 0)
-                for (std::int32_t i = 0; i < *hud_weapons->get_weapon_count(); i++)
-                    i = clearHudWeapon(hud_weapons, i);
-
-            opt.needupdate = 0;
-        }
-    }
-
-    oFrameStageNotify(thisptr, stage);
-}
-
-
-
-
-void InitSkinChanger()
-{
-    itemSystem = relativeToAbsolute<decltype(itemSystem)>(FindPatternV2("client.dll", "E8 ? ? ? ? 0F B7 0F") + 1);
-
-#ifdef DEBUG
-    printf("itemschema2 %x\n", itemSystem()->getItemSchema());
-#endif
-
-    for (const auto& node : itemSystem()->getItemSchema()->itemsSorted) {           
-        const auto item = node.value;
-
-        if (std::strcmp(item->m_szWeaponType, "#CSGO_Type_Knife") == 0)
-            if (item->m_szWorldModel)
-                knives.push_back(iitem(item->m_iItemDefinitionIndex, item->m_szWeaponName3, item->m_szViewModel, item->m_szWorldModel));
-            else knives.push_back(iitem(item->m_iItemDefinitionIndex, item->m_szWeaponName3, item->m_szViewModel, ""));
-
-        if (std::strcmp(item->m_szWeaponType, "#CSGO_Type_Collectible") == 0)
-            medals.push_back(iitem(item->m_iItemDefinitionIndex, item->m_szWeaponName3, "", ""));
-
-        if (std::strcmp(item->m_szWeaponType, "#Type_Hands") == 0)
-            if (item->m_szWorldModel)
-                gloves.push_back(iitem(item->m_iItemDefinitionIndex, item->m_szWeaponName3, item->m_szViewModel, item->m_szWorldModel));
-            else gloves.push_back(iitem(item->m_iItemDefinitionIndex, item->m_szWeaponName3, item->m_szViewModel, ""));
-
-        if (std::strcmp(item->m_szWeaponType, "#Type_CustomPlayer") == 0)
-            if (item->m_szWorldModel)
-                agents.push_back(iitem(item->m_iItemDefinitionIndex, item->m_szWeaponName3, item->m_szViewModel, item->m_szWorldModel));
-            else agents.push_back(iitem(item->m_iItemDefinitionIndex, item->m_szWeaponName3, item->m_szViewModel, ""));
-
-    }
-
-    for (const auto& node : itemSystem()->getItemSchema()->qualities) {   
-        const auto item = node.value;
-        qualities.push_back(iitem(item.id, item.name, "", ""));
-    }
-
-    for (const auto& node : itemSystem()->getItemSchema()->rars) {  
-        const auto item = node.value;
-        rarities.push_back(iitem(item.id, item.name.szBuffer, "", ""));
-    }
-
-    auto musickitsS = itemSystem()->getItemSchema()->music_definitions;
-#ifdef DEBUG
-    std::cout << musickitsS.memory << " " << musickitsS.itemcount << std::endl;
-#endif
-    for (int i = (int)musickitsS.memory; i < (int)musickitsS.memory + musickitsS.itemcount * 0x18; i += 0x18)
-    {
-        CEconMusicDefinition* music = *(CEconMusicDefinition**)(i + 0x14);
-        musickits.push_back(iitem(music->id, music->name, "", ""));
-    }
-
-    const auto& paintkitMap = itemSystem()->getItemSchema()->paintKits;
-    int paintkitcount = 0;
-    for (const auto& node : paintkitMap) {
-        const auto pKit = node.value;
-        opt.sc_skins.push_back(Options_my::skinstruct(pKit->nID, pKit->sName.szBuffer, paintkitcount, pKit->rarity, pKit->color1, pKit->color2, pKit->color3, pKit->color4, pKit->pearlescent, (DWORD)&pKit->nID));
-        paintkitcount++;
-    }
-
-    const auto& stickerMap = itemSystem()->getItemSchema()->stickerKits;
-    int stickercount = 0;
-    for (const auto& node : stickerMap) { 
-        const auto stickerKit = node.value; 
-        opt.sc_stickers.push_back(Options_my::stickerstruct(stickerKit->id, stickerKit->name.szBuffer, stickercount));
-        stickercount++; 
-    }
-
-#ifdef DEBUG
-    printf("counts %d %d %d %d %d %d %d\n", 
-        knives.size(), gloves.size(), agents.size(), medals.size(), musickits.size(), opt.sc_skins.size(), opt.sc_stickers.size());
-#endif
-
-    const auto& prefabMap = itemSystem()->getItemSchema()->prefabs;
-    for (const auto& node : prefabMap) {
-        KeyValues* kv = node.value; 
-        int cfgindex = GetCfgIndexByPrefab(fnv2::hash(kv->GetName()));
-        if (cfgindex == -1) continue;
-        int soundcount = 0;
-        const char* vmodel_orig = kv->GetString("model_player");
-        strcpy(g_Options.models.value->arr[cfgindex].vmodel_orig, vmodel_orig);
-        strcpy(g_Options.models.value->arr[cfgindex].vmodel_repl_temp, vmodel_orig);
-        strcpy(g_Options.models.value->arr[cfgindex].vmodel_repl, vmodel_orig);
-
-        g_Options.materials.value->arr[cfgindex + 2].model_hash = fnv2::hash(vmodel_orig);
-       
-
-        kv = kv->FindKey("visuals");
-        if (kv) {
-            char* sound_single_shot = (char*)kv->GetString("sound_single_shot");
-            if (sound_single_shot[0] != 0x0) {
-                strcpy(g_Options.models.value->arr[cfgindex].sounds[soundcount].name, sound_single_shot);
-                g_Options.models.value->arr[cfgindex].sounds[soundcount].hash = GenerateSoundEntryHash(sound_single_shot);
-                soundcount++;
-            }
-
-            char* sound_single_shot_accurate = (char*)kv->GetString("sound_single_shot_accurate");
-            if (sound_single_shot_accurate[0] != 0x0) {
-                strcpy(g_Options.models.value->arr[cfgindex].sounds[soundcount].name, sound_single_shot);
-                g_Options.models.value->arr[cfgindex].sounds[soundcount].hash = GenerateSoundEntryHash(sound_single_shot);
-                soundcount++;
-            }
-
-            char* sound_special1 = (char*)kv->GetString("sound_special1");
-            if (sound_special1[0] != 0x0) {
-                strcpy(g_Options.models.value->arr[cfgindex].sounds[soundcount].name, sound_special1);
-                g_Options.models.value->arr[cfgindex].sounds[soundcount].hash = GenerateSoundEntryHash(sound_special1);
-                soundcount++;
-            }
-        }
-        g_Options.models.value->arr[cfgindex].soundcount = soundcount;
-    }
-
-
-
-    c_vpk_archive pak01_archive;
-    if (pak01_archive.load("csgo/pak01_dir.vpk"))
-        for (auto const& pair : pak01_archive.files) 
-            if (!pair.first.find("materials/panorama/images/icons/equipment"))
-                opt.killfeedicons.push_back(pair.first.substr(42, pair.first.length() - 46));
-        
-
-    g_Options.weapons.value->arr[0].modeldefindex = knives[0].defindex;
-    strcpy(g_Options.weapons.value->arr[0].model, knives[0].viewmodel.c_str());
-    strcpy(g_Options.weapons.value->arr[0].worldmodel, knives[0].worldmodel.c_str());
-    g_Options.weapons.value->arr[0].modelactive = 1;
-
-    g_Options.weapons.value->arr[1].modeldefindex = gloves[0].defindex;
-    strcpy(g_Options.weapons.value->arr[1].model, gloves[0].viewmodel.c_str());
-    strcpy(g_Options.weapons.value->arr[1].worldmodel, gloves[0].worldmodel.c_str());
-    g_Options.weapons.value->arr[1].modelactive = 1;
-
-    g_Options.weapons.value->arr[2].modeldefindex = agents[0].defindex;
-    strcpy(g_Options.weapons.value->arr[2].model, agents[0].viewmodel.c_str()); 
-    g_Options.weapons.value->arr[2].modelactive = 1;
-
-    g_Options.weapons.value->arr[3].modelcount = 1;
-    g_Options.weapons.value->arr[3].modeldefindex = agents[1].defindex;
-    strcpy(g_Options.weapons.value->arr[3].model, agents[1].viewmodel.c_str()); 
-    g_Options.weapons.value->arr[3].modelactive = 1;
-
-    g_Options.weapons.value->arr[4].modeldefindex = medals[0].defindex;
-    g_Options.weapons.value->arr[4].modelactive = 1;
-
-    g_Options.weapons.value->arr[5].modeldefindex = musickits[0].defindex;
-    g_Options.weapons.value->arr[5].modelactive = 1;
-
-    g_Options.models.value->arr[2].findMDLmethode = 1;
-
-}
\ No newline at end of file
diff --git a/SpyCustom/SndInfo.h b/SpyCustom/SndInfo.h
deleted file mode 100644
index 6eed2e8..0000000
--- a/SpyCustom/SndInfo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose: 
-//
-//=============================================================================
-
-#ifndef SNDINFO_H
-#define SNDINFO_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class Vector;
-#include "utlsymbol.h"
-
-//-----------------------------------------------------------------------------
-// Purpose:  Client side only 
-//-----------------------------------------------------------------------------
-struct SndInfo_t
-{
-	// Sound Guid
-	int			m_nGuid;
-	FileNameHandle_t m_filenameHandle;		// filesystem filename handle - call IFilesystem to conver this to a string
-	int			m_nSoundSource;
-	int			m_nChannel;
-	// If a sound is being played through a speaker entity (e.g., on a monitor,), this is the
-	//  entity upon which to show the lips moving, if the sound has sentence data
-	int			m_nSpeakerEntity;
-	float		m_flVolume;
-	float		m_flLastSpatializedVolume;
-	// Radius of this sound effect (spatialization is different within the radius)
-	float		m_flRadius;
-	int			m_nPitch;
-	Vector* m_pOrigin;
-	Vector* m_pDirection;
-
-	// if true, assume sound source can move and update according to entity
-	bool		m_bUpdatePositions;
-	// true if playing linked sentence
-	bool		m_bIsSentence;
-	// if true, bypass all dsp processing for this sound (ie: music)	
-	bool		m_bDryMix;
-	// true if sound is playing through in-game speaker entity.
-	bool		m_bSpeaker;
-	// true if sound is playing with special DSP effect
-	bool		m_bSpecialDSP;
-	// for snd_show, networked sounds get colored differently than local sounds
-	bool		m_bFromServer;
-};
-
-#endif // SNDINFO_H
\ No newline at end of file
diff --git a/SpyCustom/SpyCustom.aps b/SpyCustom/SpyCustom.aps
deleted file mode 100644
index f5460a9..0000000
Binary files a/SpyCustom/SpyCustom.aps and /dev/null differ
diff --git a/SpyCustom/SpyCustom.rc b/SpyCustom/SpyCustom.rc
deleted file mode 100644
index 26f312b..0000000
--- a/SpyCustom/SpyCustom.rc
+++ /dev/null
@@ -1,80 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian (Russia) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian (Russia) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// WAVE
-//
-
-IDR_WAVE1               WAVE                    "cod.wav"
-IDR_WAVE2               WAVE                    "crit.wav"
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/SpyCustom/SpyCustom.vcxproj b/SpyCustom/SpyCustom.vcxproj
deleted file mode 100644
index 9f58748..0000000
--- a/SpyCustom/SpyCustom.vcxproj
+++ /dev/null
@@ -1,560 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{bde23281-b75d-4fb2-9b8e-08e1ae0a9bbd}</ProjectGuid>
-    <RootNamespace>SpyCustom</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>Seaside</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>C:\Program Files (x86)\GnuWin32\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Program Files (x86)\GnuWin32\lib;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;SPYCUSTOM_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;SPYCUSTOM_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-      <AdditionalLibraryDirectories>Winmm.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;SPYCUSTOM_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;SPYCUSTOM_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="ai_activity.h" />
-    <ClInclude Include="AnalogCode.h" />
-    <ClInclude Include="animationlayer.h" />
-    <ClInclude Include="annotations.h" />
-    <ClInclude Include="baseclientstate.h" />
-    <ClInclude Include="baseentity.h" />
-    <ClInclude Include="baseentity_shared.h" />
-    <ClInclude Include="basehandle.h" />
-    <ClInclude Include="basetypes.h" />
-    <ClInclude Include="beam_flags.h" />
-    <ClInclude Include="bitbuf.h" />
-    <ClInclude Include="bittools.h" />
-    <ClInclude Include="bitvec.h" />
-    <ClInclude Include="bone_accessor.h" />
-    <ClInclude Include="bone_merge_cache.h" />
-    <ClInclude Include="bspfile.h" />
-    <ClInclude Include="bspflags.h" />
-    <ClInclude Include="BuildGroup.h" />
-    <ClInclude Include="bumpvects.h" />
-    <ClInclude Include="Button.h" />
-    <ClInclude Include="ButtonCode.h" />
-    <ClInclude Include="byteswap.h" />
-    <ClInclude Include="cdll_client_int.h" />
-    <ClInclude Include="cdll_int.h" />
-    <ClInclude Include="cdll_util.h" />
-    <ClInclude Include="CGameUI.h" />
-    <ClInclude Include="CheckButton.h" />
-    <ClInclude Include="checksum_crc.h" />
-    <ClInclude Include="checksum_md5.h" />
-    <ClInclude Include="cliententitylist.h" />
-    <ClInclude Include="clientleafsystem.h" />
-    <ClInclude Include="client_class.h" />
-    <ClInclude Include="client_render_handle.h" />
-    <ClInclude Include="client_thinklist.h" />
-    <ClInclude Include="client_virtualreality.h" />
-    <ClInclude Include="cmodel.h" />
-    <ClInclude Include="collisionproperty.h" />
-    <ClInclude Include="Color.h" />
-    <ClInclude Include="commonmacros.h" />
-    <ClInclude Include="compressed_light_cube.h" />
-    <ClInclude Include="compressed_vector.h" />
-    <ClInclude Include="Config.hpp" />
-    <ClInclude Include="const.h" />
-    <ClInclude Include="Controls.h" />
-    <ClInclude Include="convar.h" />
-    <ClInclude Include="csgosdk.h" />
-    <ClInclude Include="cs_achievementdefs.h" />
-    <ClInclude Include="cs_shareddefs.h" />
-    <ClInclude Include="cs_view_scene.h" />
-    <ClInclude Include="Cursor.h" />
-    <ClInclude Include="c_baseanimating.h" />
-    <ClInclude Include="c_baseanimatingoverlay.h" />
-    <ClInclude Include="c_basecombatcharacter.h" />
-    <ClInclude Include="c_baseentity.h" />
-    <ClInclude Include="c_baseflex.h" />
-    <ClInclude Include="c_baseplayer.h" />
-    <ClInclude Include="c_basetempentity.h" />
-    <ClInclude Include="c_input.h" />
-    <ClInclude Include="c_pixel_visibility.h" />
-    <ClInclude Include="c_playerlocaldata.h" />
-    <ClInclude Include="c_recipientfilter.h" />
-    <ClInclude Include="c_te_legacytempents.h" />
-    <ClInclude Include="Dar.h" />
-    <ClInclude Include="datamap.h" />
-    <ClInclude Include="dbg.h" />
-    <ClInclude Include="dbgflag.h" />
-    <ClInclude Include="deformations.h" />
-    <ClInclude Include="detours.h" />
-    <ClInclude Include="dlight.h" />
-    <ClInclude Include="dmattributetypes.h" />
-    <ClInclude Include="dmelementhandle.h" />
-    <ClInclude Include="dmxattribute.h" />
-    <ClInclude Include="dmxelement.h" />
-    <ClInclude Include="dmxloader.h" />
-    <ClInclude Include="dt_common.h" />
-    <ClInclude Include="dt_recv.h" />
-    <ClInclude Include="dt_send.h" />
-    <ClInclude Include="econ_item_constants.h" />
-    <ClInclude Include="econ_item_interface.h" />
-    <ClInclude Include="econ_item_schema.h" />
-    <ClInclude Include="econ_item_view.h" />
-    <ClInclude Include="edict.h" />
-    <ClInclude Include="EditablePanel.h" />
-    <ClInclude Include="ehandle.h" />
-    <ClInclude Include="eiface.h" />
-    <ClInclude Include="enginetrace.h" />
-    <ClInclude Include="entitylist.h" />
-    <ClInclude Include="entitylist_base.h" />
-    <ClInclude Include="EventListener.hpp" />
-    <ClInclude Include="expressioncalculator.h" />
-    <ClInclude Include="exprevaluator.h" />
-    <ClInclude Include="fasttimer.h" />
-    <ClInclude Include="filesystem.h" />
-    <ClInclude Include="filesystem_passthru.h" />
-    <ClInclude Include="flashlighteffect.h" />
-    <ClInclude Include="fltx4.h" />
-    <ClInclude Include="FocusNavGroup.h" />
-    <ClInclude Include="Frame.h" />
-    <ClInclude Include="functors.h" />
-    <ClInclude Include="fx.h" />
-    <ClInclude Include="gameconsole.h" />
-    <ClInclude Include="GameEventListener.h" />
-    <ClInclude Include="GameEventManager.h" />
-    <ClInclude Include="gamestringpool.h" />
-    <ClInclude Include="gametrace.h" />
-    <ClInclude Include="game_item_schema.h" />
-    <ClInclude Include="generichash.h" />
-    <ClInclude Include="GetVfunc.hpp" />
-    <ClInclude Include="globalvars_base.h" />
-    <ClInclude Include="groundlink.h" />
-    <ClInclude Include="Hooks.hpp" />
-    <ClInclude Include="htmlmessages.h" />
-    <ClInclude Include="hud.h" />
-    <ClInclude Include="hudelement.h" />
-    <ClInclude Include="hudtexturehandle.h" />
-    <ClInclude Include="hud_basechat.h" />
-    <ClInclude Include="hud_element_helper.h" />
-    <ClInclude Include="IAppSystem.h" />
-    <ClInclude Include="IBorder.h" />
-    <ClInclude Include="ichromehtmlwrapper.h" />
-    <ClInclude Include="iclassmap.h" />
-    <ClInclude Include="iclient.h" />
-    <ClInclude Include="icliententity.h" />
-    <ClInclude Include="icliententityinternal.h" />
-    <ClInclude Include="icliententitylist.h" />
-    <ClInclude Include="IClientLeafSystem.h" />
-    <ClInclude Include="iclientmode.h" />
-    <ClInclude Include="iclientnetworkable.h" />
-    <ClInclude Include="IClientPanel.h" />
-    <ClInclude Include="iclientrenderable.h" />
-    <ClInclude Include="iclientshadowmgr.h" />
-    <ClInclude Include="iclientthinkable.h" />
-    <ClInclude Include="iclientunknown.h" />
-    <ClInclude Include="iclientvirtualreality.h" />
-    <ClInclude Include="ICollideable.h" />
-    <ClInclude Include="IColorCorrection.h" />
-    <ClInclude Include="icommandline.h" />
-    <ClInclude Include="iconvar.h" />
-    <ClInclude Include="icvar.h" />
-    <ClInclude Include="idatacache.h" />
-    <ClInclude Include="IEffects.h" />
-    <ClInclude Include="iefx.h" />
-    <ClInclude Include="ienginetrace.h" />
-    <ClInclude Include="IEngineVgui.h" />
-    <ClInclude Include="ifilelist.h" />
-    <ClInclude Include="igameconsole.h" />
-    <ClInclude Include="igameevents.h" />
-    <ClInclude Include="IGameSystem.h" />
-    <ClInclude Include="IGameUI.h" />
-    <ClInclude Include="ihandleentity.h" />
-    <ClInclude Include="IHTML.h" />
-    <ClInclude Include="IImage.h" />
-    <ClInclude Include="IInput.h" />
-    <ClInclude Include="iinputsystem.h" />
-    <ClInclude Include="IKeyValuesSystem.h" />
-    <ClInclude Include="ILocalize.h" />
-    <ClInclude Include="Image.h" />
-    <ClInclude Include="imageformat.h" />
-    <ClInclude Include="imaterial.h" />
-    <ClInclude Include="imaterialsystem.h" />
-    <ClInclude Include="imaterialsystemhardwareconfig.h" />
-    <ClInclude Include="imdlcache.h" />
-    <ClInclude Include="IMesh.h" />
-    <ClInclude Include="imgui\imconfig.h" />
-    <ClInclude Include="imgui\imgui.h" />
-    <ClInclude Include="imgui\imgui_impl_dx9.h" />
-    <ClInclude Include="imgui\imgui_impl_win32.h" />
-    <ClInclude Include="imgui\imgui_internal.h" />
-    <ClInclude Include="imgui\imstb_rectpack.h" />
-    <ClInclude Include="imgui\imstb_textedit.h" />
-    <ClInclude Include="imgui\imstb_truetype.h" />
-    <ClInclude Include="imovehelper.h" />
-    <ClInclude Include="inetchannel.h" />
-    <ClInclude Include="inetchannelinfo.h" />
-    <ClInclude Include="inetmessage.h" />
-    <ClInclude Include="inetmsghandler.h" />
-    <ClInclude Include="InputEnums.h" />
-    <ClInclude Include="interface.h" />
-    <ClInclude Include="Interfaces.hpp" />
-    <ClInclude Include="interpolatedvar.h" />
-    <ClInclude Include="inventory_changer.h" />
-    <ClInclude Include="IPanel.h" />
-    <ClInclude Include="ipredictionsystem.h" />
-    <ClInclude Include="iscenetokenprocessor.h" />
-    <ClInclude Include="IScheme.h" />
-    <ClInclude Include="iserverentity.h" />
-    <ClInclude Include="iservernetworkable.h" />
-    <ClInclude Include="iserverplugin.h" />
-    <ClInclude Include="iserverunknown.h" />
-    <ClInclude Include="ishadowmgr.h" />
-    <ClInclude Include="ispatialpartition.h" />
-    <ClInclude Include="istudiorender.h" />
-    <ClInclude Include="ISurface.h" />
-    <ClInclude Include="ISystem.h" />
-    <ClInclude Include="itempents.h" />
-    <ClInclude Include="item_selection_criteria.h" />
-    <ClInclude Include="itexture.h" />
-    <ClInclude Include="itoolentity.h" />
-    <ClInclude Include="ivdebugoverlay.h" />
-    <ClInclude Include="IVGUI.h" />
-    <ClInclude Include="IVguiMatInfo.h" />
-    <ClInclude Include="IVguiMatInfoVar.h" />
-    <ClInclude Include="iviewrender.h" />
-    <ClInclude Include="iviewrender_beams.h" />
-    <ClInclude Include="ivmodelinfo.h" />
-    <ClInclude Include="ivmodelrender.h" />
-    <ClInclude Include="ivrenderview.h" />
-    <ClInclude Include="jobthread.h" />
-    <ClInclude Include="KeyBindingMap.h" />
-    <ClInclude Include="KeyCode.h" />
-    <ClInclude Include="keyvalues.h" />
-    <ClInclude Include="l2cache.h" />
-    <ClInclude Include="Label.h" />
-    <ClInclude Include="lerp_functions.h" />
-    <ClInclude Include="lightdesc.h" />
-    <ClInclude Include="ListPanel.h" />
-    <ClInclude Include="localflexcontroller.h" />
-    <ClInclude Include="logging.h" />
-    <ClInclude Include="MaterialSystemUtil.h" />
-    <ClInclude Include="mathlib.h" />
-    <ClInclude Include="math_pfns.h" />
-    <ClInclude Include="mem.h" />
-    <ClInclude Include="memalloc.h" />
-    <ClInclude Include="memdbgoff.h" />
-    <ClInclude Include="memdbgon.h" />
-    <ClInclude Include="mempool.h" />
-    <ClInclude Include="Menu.h" />
-    <ClInclude Include="Menu.hpp" />
-    <ClInclude Include="MenuItem.h" />
-    <ClInclude Include="meshreader.h" />
-    <ClInclude Include="meshutils.h" />
-    <ClInclude Include="messagebox.h" />
-    <ClInclude Include="MessageMap.h" />
-    <ClInclude Include="minidump.h" />
-    <ClInclude Include="modelloader.h" />
-    <ClInclude Include="modes.h" />
-    <ClInclude Include="MouseCode.h" />
-    <ClInclude Include="mouthinfo.h" />
-    <ClInclude Include="netchannel.hpp" />
-    <ClInclude Include="NetVarManager.hpp" />
-    <ClInclude Include="netvars.hpp" />
-    <ClInclude Include="networkvar.h" />
-    <ClInclude Include="Options.hpp" />
-    <ClInclude Include="Other.hpp" />
-    <ClInclude Include="particledraw.h" />
-    <ClInclude Include="particlemgr.h" />
-    <ClInclude Include="particles.h" />
-    <ClInclude Include="ParticleSphereRenderer.h" />
-    <ClInclude Include="particles_new.h" />
-    <ClInclude Include="particles_simple.h" />
-    <ClInclude Include="particle_iterators.h" />
-    <ClInclude Include="particle_parse.h" />
-    <ClInclude Include="particle_property.h" />
-    <ClInclude Include="particle_property_inlines.h" />
-    <ClInclude Include="particle_util.h" />
-    <ClInclude Include="PatternScan.hpp" />
-    <ClInclude Include="pbwrap.hpp" />
-    <ClInclude Include="PlayerInventory.hpp" />
-    <ClInclude Include="playernet_vars.h" />
-    <ClInclude Include="precipitation_shared.h" />
-    <ClInclude Include="predictableid.h" />
-    <ClInclude Include="predictable_entity.h" />
-    <ClInclude Include="predictioncopy.h" />
-    <ClInclude Include="ProtobuffMessages.h" />
-    <ClInclude Include="protobuffs.hpp" />
-    <ClInclude Include="ProtoParse.h" />
-    <ClInclude Include="proxies.hpp" />
-    <ClInclude Include="ragdoll.h" />
-    <ClInclude Include="ragdoll_shared.h" />
-    <ClInclude Include="rangecheckedvar.h" />
-    <ClInclude Include="recvproxy.h" />
-    <ClInclude Include="refcount.h" />
-    <ClInclude Include="networkstringtabledefs.h" />
-    <ClInclude Include="Panel.h" />
-    <ClInclude Include="PanelAnimationVar.h" />
-    <ClInclude Include="PHandle.h" />
-    <ClInclude Include="platform.h" />
-    <ClInclude Include="random.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="RichText.h" />
-    <ClInclude Include="sceneentity_shared.h" />
-    <ClInclude Include="sdk_hud_chat.h" />
-    <ClInclude Include="seemath.h" />
-    <ClInclude Include="sendproxy.h" />
-    <ClInclude Include="sequence_Transitioner.h" />
-    <ClInclude Include="shake.h" />
-    <ClInclude Include="shareddefs.h" />
-    <ClInclude Include="shared_classnames.h" />
-    <ClInclude Include="shattersurfacetypes.h" />
-    <ClInclude Include="Singleton.hpp" />
-    <ClInclude Include="SkinChanger.hpp" />
-    <ClInclude Include="smartptr.h" />
-    <ClInclude Include="ssemath.h" />
-    <ClInclude Include="steam.h" />
-    <ClInclude Include="SteamCommon.h" />
-    <ClInclude Include="steamtypes.h" />
-    <ClInclude Include="stringpool.h" />
-    <ClInclude Include="string_t.h" />
-    <ClInclude Include="strtools.h" />
-    <ClInclude Include="studio.h" />
-    <ClInclude Include="tempentity.h" />
-    <ClInclude Include="TextEntry.h" />
-    <ClInclude Include="TextImage.h" />
-    <ClInclude Include="texture_group_names.h" />
-    <ClInclude Include="threadtools.h" />
-    <ClInclude Include="tier1.h" />
-    <ClInclude Include="tier2.h" />
-    <ClInclude Include="tier2_logging.h" />
-    <ClInclude Include="tier3.h" />
-    <ClInclude Include="timedevent.h" />
-    <ClInclude Include="timeutils.h" />
-    <ClInclude Include="ToggleButton.h" />
-    <ClInclude Include="Tooltip.h" />
-    <ClInclude Include="touchlink.h" />
-    <ClInclude Include="trace.h" />
-    <ClInclude Include="tslist.h" />
-    <ClInclude Include="uniqueid.h" />
-    <ClInclude Include="usercmd.h" />
-    <ClInclude Include="userid.h" />
-    <ClInclude Include="utlblockmemory.h" />
-    <ClInclude Include="utlbuffer.h" />
-    <ClInclude Include="utldict.h" />
-    <ClInclude Include="utlenvelope.h" />
-    <ClInclude Include="utlfixedmemory.h" />
-    <ClInclude Include="utlflags.h" />
-    <ClInclude Include="utlhandletable.h" />
-    <ClInclude Include="utlhash.h" />
-    <ClInclude Include="utlintrusivelist.h" />
-    <ClInclude Include="utllinkedlist.h" />
-    <ClInclude Include="utlmap.h" />
-    <ClInclude Include="utlmemory.h" />
-    <ClInclude Include="utlobjectreference.h" />
-    <ClInclude Include="utlpriorityqueue.h" />
-    <ClInclude Include="utlqueue.h" />
-    <ClInclude Include="utlrbtree.h" />
-    <ClInclude Include="utlsoacontainer.h" />
-    <ClInclude Include="utlstack.h" />
-    <ClInclude Include="UtlStringMap.h" />
-    <ClInclude Include="utltshash.h" />
-    <ClInclude Include="UtlSortVector.h" />
-    <ClInclude Include="utlstring.h" />
-    <ClInclude Include="utlsymbol.h" />
-    <ClInclude Include="utlsymbollarge.h" />
-    <ClInclude Include="utlvector.h" />
-    <ClInclude Include="valve_minmax_on.h" />
-    <ClInclude Include="valve_off.h" />
-    <ClInclude Include="valve_on.h" />
-    <ClInclude Include="vcollide.h" />
-    <ClInclude Include="vcrmode.h" />
-    <ClInclude Include="vector.h" />
-    <ClInclude Include="vector2d.h" />
-    <ClInclude Include="vector4d.h" />
-    <ClInclude Include="vertexcolor.h" />
-    <ClInclude Include="VGUI.h" />
-    <ClInclude Include="vgui_basepanel.h" />
-    <ClInclude Include="viewrender.h" />
-    <ClInclude Include="view_shared.h" />
-    <ClInclude Include="vmatrix.h" />
-    <ClInclude Include="VMT.hpp" />
-    <ClInclude Include="vmt_smart_hook.hpp" />
-    <ClInclude Include="volumeculler.h" />
-    <ClInclude Include="vphysics_interface.h" />
-    <ClInclude Include="vpkparser.h" />
-    <ClInclude Include="vplane.h" />
-    <ClInclude Include="vprof.h" />
-    <ClInclude Include="vprof_sn.h" />
-    <ClInclude Include="vprof_telemetry.h" />
-    <ClInclude Include="vstdlib.h" />
-    <ClInclude Include="vtf.h" />
-    <ClInclude Include="wchartypes.h" />
-    <ClInclude Include="weapon_parse.h" />
-    <ClInclude Include="win32consoleio.h" />
-    <ClInclude Include="xboxstubs.h" />
-    <ClInclude Include="XorStr.hpp" />
-    <ClInclude Include="zip_uncompressed.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ConVars.cpp" />
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="imgui\imgui.cpp" />
-    <ClCompile Include="imgui\imgui_demo.cpp" />
-    <ClCompile Include="imgui\imgui_draw.cpp" />
-    <ClCompile Include="imgui\imgui_impl_dx9.cpp" />
-    <ClCompile Include="imgui\imgui_impl_win32.cpp" />
-    <ClCompile Include="imgui\imgui_tables.cpp" />
-    <ClCompile Include="imgui\imgui_widgets.cpp" />
-    <ClCompile Include="Interfaces.cpp" />
-    <ClCompile Include="KeyValues.cpp" />
-    <ClCompile Include="NetVarManager.cpp" />
-    <ClCompile Include="netvars.cpp" />
-    <ClCompile Include="Other.cpp" />
-    <ClCompile Include="PatternScan.cpp" />
-    <ClCompile Include="PlayerInventory.cpp" />
-    <ClCompile Include="protobuffs.cpp" />
-    <ClCompile Include="Skinchanger.cpp" />
-    <ClCompile Include="textinputcombobox.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="SpyCustom.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Media Include="cod.wav">
-      <DeploymentContent>true</DeploymentContent>
-    </Media>
-    <Media Include="crit.wav">
-      <DeploymentContent>true</DeploymentContent>
-    </Media>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/SpyCustom/SpyCustom.vcxproj.filters b/SpyCustom/SpyCustom.vcxproj.filters
deleted file mode 100644
index a89ec70..0000000
--- a/SpyCustom/SpyCustom.vcxproj.filters
+++ /dev/null
@@ -1,1225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Header Files\sdk">
-      <UniqueIdentifier>{99d6dc10-ba05-4949-84fb-2b274bb90ee8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\imgui">
-      <UniqueIdentifier>{cc8ba9e4-8d47-413e-8f49-530c07a99955}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Protobuffs">
-      <UniqueIdentifier>{2d181d74-7735-45bf-841d-c3a395221030}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="csgosdk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="icliententitylist.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="interface.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="CGameUI.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IPanel.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="VGUI.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlvector.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="GameEventManager.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="keyvalues.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="igameevents.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlsymbol.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="bitbuf.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="mathlib.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vector.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="basetypes.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vector2d.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="math_pfns.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="wchartypes.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="commonmacros.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="networkstringtabledefs.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Color.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="steamtypes.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="threadtools.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="platform.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlrbtree.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlmemory.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="strtools.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="memalloc.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="mem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="dbg.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="annotations.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vcrmode.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlbuffer.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="byteswap.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="datamap.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="memdbgon.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="memdbgoff.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlblockmemory.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="random.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vstdlib.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlfixedmemory.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="cdll_int.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="const.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="modes.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ButtonCode.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="InputEnums.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="checksum_crc.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="xboxstubs.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ISurface.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IHTML.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="MouseCode.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="KeyCode.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IImage.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Cursor.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="imageformat.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IAppSystem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ichromehtmlwrapper.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="htmlmessages.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IVguiMatInfo.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IVguiMatInfoVar.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="EditablePanel.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Panel.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="KeyBindingMap.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Controls.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IKeyValuesSystem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="tier3.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="tier2.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="tier1.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="convar.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iconvar.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlstring.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="icvar.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlflags.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Dar.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IClientPanel.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IScheme.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="PHandle.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="PanelAnimationVar.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="BuildGroup.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlhandletable.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlqueue.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="FocusNavGroup.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IEngineVgui.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Label.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IGameUI.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="EventListener.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MessageMap.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="filesystem_passthru.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IVGUI.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ILocalize.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="filesystem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="checksum_md5.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="refcount.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ISystem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="NetVarManager.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dt_recv.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="dt_common.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="client_class.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iclientnetworkable.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iclientunknown.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ihandleentity.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iclientrenderable.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ivmodelrender.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="istudiorender.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vector4d.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="imaterial.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="imaterialsystem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="deformations.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="imaterialsystemhardwareconfig.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IColorCorrection.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vmatrix.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vplane.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="texture_group_names.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vtf.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="studio.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="compressed_vector.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlhash.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utllinkedlist.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="generichash.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="localflexcontroller.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="imdlcache.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="client_render_handle.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="lightdesc.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ssemath.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="valve_off.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="valve_minmax_on.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="fasttimer.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="valve_on.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="usercmd.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="imovehelper.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_input.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ivmodelinfo.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="idatacache.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="PatternScan.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VMT.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vprof.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="l2cache.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vprof_sn.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vprof_telemetry.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="exprevaluator.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="dbgflag.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="logging.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="win32consoleio.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="icommandline.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utldict.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlmap.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="mempool.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="tslist.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IInput.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IBorder.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Tooltip.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Menu.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="MenuItem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Button.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="UtlSortVector.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="minidump.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="dmxelement.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="dmxattribute.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="dmxloader.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="dmattributetypes.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="dmelementhandle.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="uniqueid.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlsymbollarge.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utltshash.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="stringpool.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="timeutils.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="functors.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlenvelope.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Interfaces.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="enginetrace.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ienginetrace.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="basehandle.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="gameconsole.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="igameconsole.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ivrenderview.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ivdebugoverlay.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vphysics_interface.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vcollide.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iefx.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="dlight.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="icliententity.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iclient.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iclientthinkable.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="string_t.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="userid.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="SteamCommon.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="inetmsghandler.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="inetmessage.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="globalvars_base.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="cmodel.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="trace.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="gametrace.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="bspflags.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ispatialpartition.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="messagebox.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Frame.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IEffects.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ipredictionsystem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="predictable_entity.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="predictioncopy.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ehandle.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="entitylist_base.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="shared_classnames.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="sendproxy.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="dt_send.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="bitvec.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iviewrender_beams.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="beam_flags.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="tempentity.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="fx.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="particles_simple.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="particlemgr.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="clientleafsystem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ParticleSphereRenderer.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="particle_util.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="particledraw.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="cdll_client_int.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="timedevent.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IMesh.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="meshutils.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IGameSystem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="IClientLeafSystem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="shareddefs.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="tier2_logging.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="eiface.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="edict.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iserverentity.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iserverunknown.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iservernetworkable.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="bspfile.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="bumpvects.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="compressed_light_cube.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ICollideable.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iserverplugin.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="smartptr.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlintrusivelist.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlobjectreference.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="zip_uncompressed.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="particle_iterators.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="meshreader.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_pixel_visibility.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_baseplayer.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_playerlocaldata.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_basecombatcharacter.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_baseflex.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_baseanimating.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_baseentity.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="icliententityinternal.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iclientshadowmgr.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="itoolentity.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ishadowmgr.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="client_thinklist.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="cliententitylist.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="cdll_util.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="shake.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="predictableid.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="networkvar.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="interpolatedvar.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="rangecheckedvar.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="lerp_functions.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="animationlayer.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="collisionproperty.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="particle_property.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="particles_new.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="particles.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="UtlStringMap.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="MaterialSystemUtil.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlsoacontainer.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="particle_parse.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ifilelist.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="particle_property_inlines.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="touchlink.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="groundlink.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ragdoll.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ragdoll_shared.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="bone_accessor.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="mouthinfo.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ai_activity.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="sequence_Transitioner.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="bone_merge_cache.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_baseanimatingoverlay.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="sceneentity_shared.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iscenetokenprocessor.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="baseentity_shared.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="baseentity.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="entitylist.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="playernet_vars.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="bittools.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="sdk_hud_chat.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="hud_basechat.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="hudelement.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlpriorityqueue.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="hud.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="hudtexturehandle.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="hud_element_helper.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="GameEventListener.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vgui_basepanel.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="RichText.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="TextEntry.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ListPanel.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="CheckButton.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="ToggleButton.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="TextImage.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Image.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="PlayerInventory.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GetVfunc.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="imgui\imconfig.h">
-      <Filter>Header Files\imgui</Filter>
-    </ClInclude>
-    <ClInclude Include="imgui\imgui.h">
-      <Filter>Header Files\imgui</Filter>
-    </ClInclude>
-    <ClInclude Include="imgui\imgui_impl_dx9.h">
-      <Filter>Header Files\imgui</Filter>
-    </ClInclude>
-    <ClInclude Include="imgui\imgui_impl_win32.h">
-      <Filter>Header Files\imgui</Filter>
-    </ClInclude>
-    <ClInclude Include="imgui\imgui_internal.h">
-      <Filter>Header Files\imgui</Filter>
-    </ClInclude>
-    <ClInclude Include="imgui\imstb_rectpack.h">
-      <Filter>Header Files\imgui</Filter>
-    </ClInclude>
-    <ClInclude Include="imgui\imstb_textedit.h">
-      <Filter>Header Files\imgui</Filter>
-    </ClInclude>
-    <ClInclude Include="imgui\imstb_truetype.h">
-      <Filter>Header Files\imgui</Filter>
-    </ClInclude>
-    <ClInclude Include="flashlighteffect.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Other.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Options.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="baseclientstate.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="Config.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Singleton.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vmt_smart_hook.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SkinChanger.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inetchannel.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="inetchannelinfo.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="steam.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="protobuffs.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inventory_changer.h">
-      <Filter>Header Files\Protobuffs</Filter>
-    </ClInclude>
-    <ClInclude Include="ProtoParse.h">
-      <Filter>Header Files\Protobuffs</Filter>
-    </ClInclude>
-    <ClInclude Include="ProtobuffMessages.h">
-      <Filter>Header Files\Protobuffs</Filter>
-    </ClInclude>
-    <ClInclude Include="pbwrap.hpp">
-      <Filter>Header Files\Protobuffs</Filter>
-    </ClInclude>
-    <ClInclude Include="proxies.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="iclassmap.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="recvproxy.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="cs_shareddefs.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="cs_achievementdefs.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="econ_item_view.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="game_item_schema.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="econ_item_schema.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="econ_item_constants.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="item_selection_criteria.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="econ_item_interface.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="expressioncalculator.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="utlstack.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="weapon_parse.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="gamestringpool.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="netvars.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="detours.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="netchannel.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="modelloader.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="cs_view_scene.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="viewrender.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iviewrender.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="view_shared.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="volumeculler.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="jobthread.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="seemath.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="fltx4.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vertexcolor.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iclientmode.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="client_virtualreality.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iclientvirtualreality.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="itexture.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="precipitation_shared.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="iinputsystem.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="AnalogCode.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="vpkparser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="itempents.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="shattersurfacetypes.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_te_legacytempents.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_basetempentity.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="c_recipientfilter.h">
-      <Filter>Header Files\sdk</Filter>
-    </ClInclude>
-    <ClInclude Include="XorStr.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Hooks.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Menu.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="KeyValues.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ConVars.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="NetVarManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PlayerInventory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PatternScan.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Interfaces.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="imgui\imgui.cpp">
-      <Filter>Header Files\imgui</Filter>
-    </ClCompile>
-    <ClCompile Include="imgui\imgui_demo.cpp">
-      <Filter>Header Files\imgui</Filter>
-    </ClCompile>
-    <ClCompile Include="imgui\imgui_draw.cpp">
-      <Filter>Header Files\imgui</Filter>
-    </ClCompile>
-    <ClCompile Include="imgui\imgui_impl_dx9.cpp">
-      <Filter>Header Files\imgui</Filter>
-    </ClCompile>
-    <ClCompile Include="imgui\imgui_impl_win32.cpp">
-      <Filter>Header Files\imgui</Filter>
-    </ClCompile>
-    <ClCompile Include="imgui\imgui_tables.cpp">
-      <Filter>Header Files\imgui</Filter>
-    </ClCompile>
-    <ClCompile Include="imgui\imgui_widgets.cpp">
-      <Filter>Header Files\imgui</Filter>
-    </ClCompile>
-    <ClCompile Include="textinputcombobox.cpp">
-      <Filter>Header Files\imgui</Filter>
-    </ClCompile>
-    <ClCompile Include="Other.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Skinchanger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="protobuffs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="netvars.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="SpyCustom.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Media Include="cod.wav">
-      <Filter>Resource Files</Filter>
-    </Media>
-    <Media Include="crit.wav">
-      <Filter>Resource Files</Filter>
-    </Media>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/SpyCustom/SpyCustom.vcxproj.user b/SpyCustom/SpyCustom.vcxproj.user
deleted file mode 100644
index 0f14913..0000000
--- a/SpyCustom/SpyCustom.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file
diff --git a/SpyCustom/SteamCommon.h b/SpyCustom/SteamCommon.h
deleted file mode 100644
index bbc6e38..0000000
--- a/SpyCustom/SteamCommon.h
+++ /dev/null
@@ -1,623 +0,0 @@
-
-#ifndef INCLUDED_STEAM2_USERID_STRUCTS
-#define INCLUDED_STEAM2_USERID_STRUCTS
-
-#if defined(_MSC_VER) && (_MSC_VER > 1000)
-#pragma once
-#endif
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#if defined ( _WIN32 )
-
-#ifdef STEAM_EXPORTS
-#define STEAM_API __declspec(dllexport)
-#else
-#define STEAM_API __declspec(dllimport)
-#endif
-
-#define STEAM_CALL __cdecl
-
-#else
-
-#define STEAM_API  
-#define STEAM_CALL  
-
-#endif
-
-	typedef void (STEAM_CALL* KeyValueIteratorCallback_t)(const char* Key, const char* Val, void* pvParam);
-
-
-#define STEAM_USING_FILESYSTEM							(0x00000001)
-#define STEAM_USING_LOGGING								(0x00000002)
-#define STEAM_USING_USERID								(0x00000004)
-#define STEAM_USING_ACCOUNT								(0x00000008)
-#define STEAM_USING_ALL									(0x0000000f)
-#define STEAM_MAX_PATH									(255)
-#define STEAM_QUESTION_MAXLEN							(255)
-#define STEAM_SALT_SIZE									(8)
-#define STEAM_PROGRESS_PERCENT_SCALE					(0x00001000)
-
-#define STEAM_CARD_NUMBER_SIZE							(17)
-#define STEAM_CARD_HOLDERNAME_SIZE						(100)
-#define STEAM_CARD_EXPYEAR_SIZE							(4)
-#define STEAM_CARD_EXPMONTH_SIZE						(2)
-#define STEAM_CARD_CVV2_SIZE							(5)
-#define STEAM_BILLING_ADDRESS1_SIZE						(128)
-#define STEAM_BILLING_ADDRESS2_SIZE						(128)
-#define STEAM_BILLING_CITY_SIZE							(50)
-#define STEAM_BILLING_ZIP_SIZE							(16)
-#define STEAM_BILLING_STATE_SIZE						(32)
-#define STEAM_BILLING_COUNTRY_SIZE						(32)
-#define STEAM_BILLING_PHONE_SIZE						(20)
-#define STEAM_BILLING_EMAIL_ADDRESS_SIZE				(100)
-#define STEAM_TYPE_OF_PROOF_OF_PURCHASE_SIZE			(20)
-#define STEAM_PROOF_OF_PURCHASE_TOKEN_SIZE				(200)
-#define STEAM_EXTERNAL_ACCOUNTNAME_SIZE					(100)
-#define STEAM_EXTERNAL_ACCOUNTPASSWORD_SIZE				(80)
-#define STEAM_BILLING_CONFIRMATION_CODE_SIZE			(22)
-#define STEAM_BILLING_CARD_APPROVAL_CODE_SIZE			(100)
-#define STEAM_BILLING_TRANS_DATE_SIZE					(9)  
-#define STEAM_BILLING_TRANS_TIME_SIZE					(9)  
-
-
-	typedef unsigned int SteamHandle_t;
-
-	typedef void* SteamUserIDTicketValidationHandle_t;
-
-	typedef unsigned int SteamCallHandle_t;
-
-#if defined(_MSC_VER)
-	typedef unsigned __int64	SteamUnsigned64_t;
-#else
-	typedef unsigned long long	SteamUnsigned64_t;
-#endif
-
-	typedef enum
-	{
-		eSteamSeekMethodSet = 0,
-		eSteamSeekMethodCur = 1,
-		eSteamSeekMethodEnd = 2
-	} ESteamSeekMethod;
-
-	typedef enum
-	{
-		eSteamBufferMethodFBF = 0,
-		eSteamBufferMethodNBF = 1
-	} ESteamBufferMethod;
-
-	typedef enum
-	{
-		eSteamErrorNone = 0,
-		eSteamErrorUnknown = 1,
-		eSteamErrorLibraryNotInitialized = 2,
-		eSteamErrorLibraryAlreadyInitialized = 3,
-		eSteamErrorConfig = 4,
-		eSteamErrorContentServerConnect = 5,
-		eSteamErrorBadHandle = 6,
-		eSteamErrorHandlesExhausted = 7,
-		eSteamErrorBadArg = 8,
-		eSteamErrorNotFound = 9,
-		eSteamErrorRead = 10,
-		eSteamErrorEOF = 11,
-		eSteamErrorSeek = 12,
-		eSteamErrorCannotWriteNonUserConfigFile = 13,
-		eSteamErrorCacheOpen = 14,
-		eSteamErrorCacheRead = 15,
-		eSteamErrorCacheCorrupted = 16,
-		eSteamErrorCacheWrite = 17,
-		eSteamErrorCacheSession = 18,
-		eSteamErrorCacheInternal = 19,
-		eSteamErrorCacheBadApp = 20,
-		eSteamErrorCacheVersion = 21,
-		eSteamErrorCacheBadFingerPrint = 22,
-
-		eSteamErrorNotFinishedProcessing = 23,
-		eSteamErrorNothingToDo = 24,
-		eSteamErrorCorruptEncryptedUserIDTicket = 25,
-		eSteamErrorSocketLibraryNotInitialized = 26,
-		eSteamErrorFailedToConnectToUserIDTicketValidationServer = 27,
-		eSteamErrorBadProtocolVersion = 28,
-		eSteamErrorReplayedUserIDTicketFromClient = 29,
-		eSteamErrorReceiveResultBufferTooSmall = 30,
-		eSteamErrorSendFailed = 31,
-		eSteamErrorReceiveFailed = 32,
-		eSteamErrorReplayedReplyFromUserIDTicketValidationServer = 33,
-		eSteamErrorBadSignatureFromUserIDTicketValidationServer = 34,
-		eSteamErrorValidationStalledSoAborted = 35,
-		eSteamErrorInvalidUserIDTicket = 36,
-		eSteamErrorClientLoginRateTooHigh = 37,
-		eSteamErrorClientWasNeverValidated = 38,
-		eSteamErrorInternalSendBufferTooSmall = 39,
-		eSteamErrorInternalReceiveBufferTooSmall = 40,
-		eSteamErrorUserTicketExpired = 41,
-		eSteamErrorCDKeyAlreadyInUseOnAnotherClient = 42,
-
-		eSteamErrorNotLoggedIn = 101,
-		eSteamErrorAlreadyExists = 102,
-		eSteamErrorAlreadySubscribed = 103,
-		eSteamErrorNotSubscribed = 104,
-		eSteamErrorAccessDenied = 105,
-		eSteamErrorFailedToCreateCacheFile = 106,
-		eSteamErrorCallStalledSoAborted = 107,
-		eSteamErrorEngineNotRunning = 108,
-		eSteamErrorEngineConnectionLost = 109,
-		eSteamErrorLoginFailed = 110,
-		eSteamErrorAccountPending = 111,
-		eSteamErrorCacheWasMissingRetry = 112,
-		eSteamErrorLocalTimeIncorrect = 113,
-		eSteamErrorCacheNeedsDecryption = 114,
-		eSteamErrorAccountDisabled = 115,
-		eSteamErrorCacheNeedsRepair = 116,
-		eSteamErrorRebootRequired = 117,
-
-		eSteamErrorNetwork = 200,
-		eSteamErrorOffline = 201
-
-
-	} ESteamError;
-
-
-	typedef enum
-	{
-		eNoDetailedErrorAvailable,
-		eStandardCerrno,
-		eWin32LastError,
-		eWinSockLastError,
-		eDetailedPlatformErrorCount
-	} EDetailedPlatformErrorType;
-
-	typedef enum						      
-	{
-		eSteamFindLocalOnly,			      
-		eSteamFindRemoteOnly,			      
-		eSteamFindAll					       
-	} ESteamFindFilter;
-
-
-
-	typedef struct
-	{
-		ESteamError eSteamError;
-		EDetailedPlatformErrorType eDetailedErrorType;
-		int nDetailedErrorCode;
-		char szDesc[STEAM_MAX_PATH];
-	} TSteamError;
-
-
-
-	typedef struct
-	{
-		int bIsDir;						             
-		unsigned int uSizeOrCount;		             
-		int bIsLocal;					            
-		char cszName[STEAM_MAX_PATH];	      
-		long lLastAccessTime;			           
-		long lLastModificationTime;		           
-		long lCreationTime;				          
-	} TSteamElemInfo;
-
-
-	typedef struct
-	{
-		unsigned int uNumSubscriptions;
-		unsigned int uMaxNameChars;
-		unsigned int uMaxApps;
-
-	} TSteamSubscriptionStats;
-
-
-	typedef struct
-	{
-		unsigned int uNumApps;
-		unsigned int uMaxNameChars;
-		unsigned int uMaxInstallDirNameChars;
-		unsigned int uMaxVersionLabelChars;
-		unsigned int uMaxLaunchOptions;
-		unsigned int uMaxLaunchOptionDescChars;
-		unsigned int uMaxLaunchOptionCmdLineChars;
-		unsigned int uMaxNumIcons;
-		unsigned int uMaxIconSize;
-		unsigned int uMaxDependencies;
-
-	} TSteamAppStats;
-
-	typedef struct
-	{
-		char* szLabel;
-		unsigned int uMaxLabelChars;
-		unsigned int uVersionId;
-		int bIsNotAvailable;
-	} TSteamAppVersion;
-
-	typedef struct
-	{
-		char* szDesc;
-		unsigned int uMaxDescChars;
-		char* szCmdLine;
-		unsigned int uMaxCmdLineChars;
-		unsigned int uIndex;
-		unsigned int uIconIndex;
-		int bNoDesktopShortcut;
-		int bNoStartMenuShortcut;
-		int bIsLongRunningUnattended;
-
-	} TSteamAppLaunchOption;
-
-
-	typedef struct
-	{
-		char* szName;
-		unsigned int uMaxNameChars;
-		char* szLatestVersionLabel;
-		unsigned int uMaxLatestVersionLabelChars;
-		char* szCurrentVersionLabel;
-		unsigned int uMaxCurrentVersionLabelChars;
-		char* szInstallDirName;
-		unsigned int uMaxInstallDirNameChars;
-		unsigned int uId;
-		unsigned int uLatestVersionId;
-		unsigned int uCurrentVersionId;
-		unsigned int uMinCacheFileSizeMB;
-		unsigned int uMaxCacheFileSizeMB;
-		unsigned int uNumLaunchOptions;
-		unsigned int uNumIcons;
-		unsigned int uNumVersions;
-		unsigned int uNumDependencies;
-
-	} TSteamApp;
-
-	typedef enum
-	{
-		eNoCost = 0,
-		eBillOnceOnly = 1,
-		eBillMonthly = 2,
-		eProofOfPrepurchaseOnly = 3,
-		eGuestPass = 4,
-		eHardwarePromo = 5,
-		eNumBillingTypes,
-	} EBillingType;
-
-	typedef struct
-	{
-		char* szName;
-		unsigned int uMaxNameChars;
-		unsigned int* puAppIds;
-		unsigned int uMaxAppIds;
-		unsigned int uId;
-		unsigned int uNumApps;
-		EBillingType eBillingType;
-		unsigned int uCostInCents;
-		unsigned int uNumDiscounts;
-		int bIsPreorder;
-		int bRequiresShippingAddress;
-		unsigned int uDomesticShippingCostInCents;
-		unsigned int uInternationalShippingCostInCents;
-		bool bIsCyberCafeSubscription;
-		unsigned int uGameCode;
-		char szGameCodeDesc[STEAM_MAX_PATH];
-		bool bIsDisabled;
-		bool bRequiresCD;
-		unsigned int uTerritoryCode;
-		bool bIsSteam3Subscription;
-
-	} TSteamSubscription;
-
-	typedef struct
-	{
-		char szName[STEAM_MAX_PATH];
-		unsigned int uDiscountInCents;
-		unsigned int uNumQualifiers;
-
-	} TSteamSubscriptionDiscount;
-
-	typedef struct
-	{
-		char szName[STEAM_MAX_PATH];
-		unsigned int uRequiredSubscription;
-		int bIsDisqualifier;
-
-	} TSteamDiscountQualifier;
-
-	typedef struct TSteamProgress
-	{
-		int bValid;                             
-		unsigned int uPercentDone;               
-		char szProgress[STEAM_MAX_PATH];     
-	} TSteamProgress;
-
-	typedef enum
-	{
-		eSteamNotifyTicketsWillExpire,
-		eSteamNotifyAccountInfoChanged,
-		eSteamNotifyContentDescriptionChanged,
-		eSteamNotifyPleaseShutdown,
-		eSteamNotifyNewContentServer,
-		eSteamNotifySubscriptionStatusChanged,
-		eSteamNotifyContentServerConnectionLost,
-		eSteamNotifyCacheLoadingCompleted,
-		eSteamNotifyCacheNeedsDecryption,
-		eSteamNotifyCacheNeedsRepair
-	} ESteamNotificationCallbackEvent;
-
-
-	typedef void(*SteamNotificationCallback_t)(ESteamNotificationCallbackEvent eEvent, unsigned int nData);
-
-
-	typedef char SteamPersonalQuestion_t[STEAM_QUESTION_MAXLEN + 1];
-
-	typedef struct
-	{
-		unsigned char uchSalt[STEAM_SALT_SIZE];
-	} SteamSalt_t;
-
-	typedef enum
-	{
-		eVisa = 1,
-		eMaster = 2,
-		eAmericanExpress = 3,
-		eDiscover = 4,
-		eDinnersClub = 5,
-		eJCB = 6
-	} ESteamPaymentCardType;
-
-	typedef struct
-	{
-		ESteamPaymentCardType eCardType;
-		char szCardNumber[STEAM_CARD_NUMBER_SIZE + 1];
-		char szCardHolderName[STEAM_CARD_HOLDERNAME_SIZE + 1];
-		char szCardExpYear[STEAM_CARD_EXPYEAR_SIZE + 1];
-		char szCardExpMonth[STEAM_CARD_EXPMONTH_SIZE + 1];
-		char szCardCVV2[STEAM_CARD_CVV2_SIZE + 1];
-		char szBillingAddress1[STEAM_BILLING_ADDRESS1_SIZE + 1];
-		char szBillingAddress2[STEAM_BILLING_ADDRESS2_SIZE + 1];
-		char szBillingCity[STEAM_BILLING_CITY_SIZE + 1];
-		char szBillingZip[STEAM_BILLING_ZIP_SIZE + 1];
-		char szBillingState[STEAM_BILLING_STATE_SIZE + 1];
-		char szBillingCountry[STEAM_BILLING_COUNTRY_SIZE + 1];
-		char szBillingPhone[STEAM_BILLING_PHONE_SIZE + 1];
-		char szBillingEmailAddress[STEAM_BILLING_EMAIL_ADDRESS_SIZE + 1];
-		unsigned int uExpectedCostInCents;
-		unsigned int uExpectedTaxInCents;
-		char szShippingName[STEAM_CARD_HOLDERNAME_SIZE + 1];
-		char szShippingAddress1[STEAM_BILLING_ADDRESS1_SIZE + 1];
-		char szShippingAddress2[STEAM_BILLING_ADDRESS2_SIZE + 1];
-		char szShippingCity[STEAM_BILLING_CITY_SIZE + 1];
-		char szShippingZip[STEAM_BILLING_ZIP_SIZE + 1];
-		char szShippingState[STEAM_BILLING_STATE_SIZE + 1];
-		char szShippingCountry[STEAM_BILLING_COUNTRY_SIZE + 1];
-		char szShippingPhone[STEAM_BILLING_PHONE_SIZE + 1];
-		unsigned int uExpectedShippingCostInCents;
-
-	} TSteamPaymentCardInfo;
-
-	typedef struct
-	{
-		char					szTypeOfProofOfPurchase[STEAM_TYPE_OF_PROOF_OF_PURCHASE_SIZE + 1];
-
-		unsigned int			uLengthOfBinaryProofOfPurchaseToken;
-		char					cBinaryProofOfPurchaseToken[STEAM_PROOF_OF_PURCHASE_TOKEN_SIZE + 1];
-	} TSteamPrepurchaseInfo;
-
-	typedef struct
-	{
-		char szAccountName[STEAM_EXTERNAL_ACCOUNTNAME_SIZE + 1];
-		char szPassword[STEAM_EXTERNAL_ACCOUNTPASSWORD_SIZE + 1];
-	} TSteamExternalBillingInfo;
-
-	typedef enum
-	{
-		ePaymentCardInfo = 1,
-		ePrepurchasedInfo = 2,
-		eAccountBillingInfo = 3,
-		eExternalBillingInfo = 4,		         
-		ePaymentCardReceipt = 5,
-		ePrepurchaseReceipt = 6,
-		eEmptyReceipt = 7
-	} ESteamSubscriptionBillingInfoType;
-
-	typedef struct
-	{
-		ESteamSubscriptionBillingInfoType	eBillingInfoType;
-		union {
-			TSteamPaymentCardInfo			PaymentCardInfo;
-			TSteamPrepurchaseInfo			PrepurchaseInfo;
-			TSteamExternalBillingInfo		ExternalBillingInfo;
-			char							bUseAccountBillingInfo;
-		};
-
-	} TSteamSubscriptionBillingInfo;
-
-	typedef enum
-	{
-		eSteamSubscriptionOK = 0,	  
-		eSteamSubscriptionPending = 1,	 		 
-		eSteamSubscriptionPreorder = 2,	  	  
-		eSteamSubscriptionPrepurchaseTransferred = 3,	     
-		eSteamSubscriptionPrepurchaseInvalid = 4,	   
-		eSteamSubscriptionPrepurchaseRejected = 5,	       
-		eSteamSubscriptionPrepurchaseRevoked = 6,	      
-		eSteamSubscriptionPaymentCardDeclined = 7,	    
-		eSteamSubscriptionCancelledByUser = 8,	  	 
-		eSteamSubscriptionCancelledByVendor = 9,	    
-		eSteamSubscriptionPaymentCardUseLimit = 10,	        
-		eSteamSubscriptionPaymentCardAlert = 11,	           
-		eSteamSubscriptionFailed = 12,	         
-		eSteamSubscriptionPaymentCardAVSFailure = 13,	      
-		eSteamSubscriptionPaymentCardInsufficientFunds = 14,	       
-		eSteamSubscriptionRestrictedCountry = 15	          
-
-	} ESteamSubscriptionStatus;
-
-	typedef struct
-	{
-		ESteamPaymentCardType	eCardType;
-		char szCardLastFourDigits[4 + 1];
-		char szCardHolderName[STEAM_CARD_HOLDERNAME_SIZE + 1];
-		char szBillingAddress1[STEAM_BILLING_ADDRESS1_SIZE + 1];
-		char szBillingAddress2[STEAM_BILLING_ADDRESS2_SIZE + 1];
-		char szBillingCity[STEAM_BILLING_CITY_SIZE + 1];
-		char szBillingZip[STEAM_BILLING_ZIP_SIZE + 1];
-		char szBillingState[STEAM_BILLING_STATE_SIZE + 1];
-		char szBillingCountry[STEAM_BILLING_COUNTRY_SIZE + 1];
-
-		char szCardApprovalCode[STEAM_BILLING_CARD_APPROVAL_CODE_SIZE + 1];
-		char szTransDate[STEAM_BILLING_TRANS_DATE_SIZE + 1];	  
-		char szTransTime[STEAM_BILLING_TRANS_TIME_SIZE + 1];	  
-		unsigned int uPriceWithoutTax;
-		unsigned int uTaxAmount;
-		unsigned int uShippingCost;
-
-	} TSteamPaymentCardReceiptInfo;
-
-	typedef struct
-	{
-		char szTypeOfProofOfPurchase[STEAM_TYPE_OF_PROOF_OF_PURCHASE_SIZE + 1];
-	} TSteamPrepurchaseReceiptInfo;
-
-	typedef struct
-	{
-		ESteamSubscriptionStatus			eStatus;
-		ESteamSubscriptionStatus			ePreviousStatus;
-		ESteamSubscriptionBillingInfoType	eReceiptInfoType;
-		char szConfirmationCode[STEAM_BILLING_CONFIRMATION_CODE_SIZE + 1];
-		union {
-			TSteamPaymentCardReceiptInfo	PaymentCardReceiptInfo;
-			TSteamPrepurchaseReceiptInfo	PrepurchaseReceiptInfo;
-		};
-
-	} TSteamSubscriptionReceipt;
-
-	typedef enum
-	{
-		ePhysicalBytesReceivedThisSession = 1,
-		eAppReadyToLaunchStatus = 2,
-		eAppPreloadStatus = 3,
-		eAppEntireDepot = 4,
-		eCacheBytesPresent = 5
-	} ESteamAppUpdateStatsQueryType;
-
-	typedef struct
-	{
-		SteamUnsigned64_t uBytesTotal;
-		SteamUnsigned64_t uBytesPresent;
-	} TSteamUpdateStats;
-
-	typedef enum
-	{
-		eSteamUserAdministrator = 0x00000001,      
-		eSteamUserDeveloper = 0x00000002,      
-		eSteamUserCyberCafe = 0x00000004            
-	} ESteamUserTypeFlags;
-
-	typedef enum
-	{
-		eSteamAccountStatusDefault = 0x00000000,
-		eSteamAccountStatusEmailVerified = 0x00000001,
-		eSteamAccountDisabled = 0x00000004
-	} ESteamAccountStatusBitFields;
-
-
-	typedef enum
-	{
-		eSteamBootstrapperError = -1,
-		eSteamBootstrapperDontCheckForUpdate = 0,
-		eSteamBootstrapperCheckForUpdateAndRerun = 7
-
-	} ESteamBootStrapperClientAppResult;
-
-	typedef enum
-	{
-		eSteamOnline = 0,
-		eSteamOffline = 1,
-		eSteamNoAuthMode = 2,
-		eSteamBillingOffline = 3
-	} eSteamOfflineStatus;
-
-	typedef struct
-	{
-		int eOfflineNow;
-		int eOfflineNextSession;
-	} TSteamOfflineStatus;
-
-	typedef struct
-	{
-		unsigned int uAppId;
-		int bIsSystemDefined;
-		char szMountPath[STEAM_MAX_PATH];
-	} TSteamAppDependencyInfo;
-
-	typedef enum
-	{
-		eSteamOpenFileRegular = 0x0,
-		eSteamOpenFileIgnoreLocal = 0x1,
-		eSteamOpenFileChecksumReads = 0x2
-	} ESteamOpenFileFlags;
-
-	typedef enum
-	{
-		eSteamValveCDKeyValidationServer = 0,
-		eSteamHalfLifeMasterServer = 1,
-		eSteamFriendsServer = 2,
-		eSteamCSERServer = 3,
-		eSteamHalfLife2MasterServer = 4,
-		eSteamRDKFMasterServer = 5,
-		eMaxServerTypes = 6
-	} ESteamServerType;
-
-
-#ifdef __cplusplus
-
-	const SteamHandle_t										STEAM_INVALID_HANDLE = 0;
-	const SteamCallHandle_t									STEAM_INVALID_CALL_HANDLE = 0;
-	const SteamUserIDTicketValidationHandle_t				STEAM_INACTIVE_USERIDTICKET_VALIDATION_HANDLE = 0;
-	const unsigned int										STEAM_USE_LATEST_VERSION = 0xFFFFFFFF;
-
-#else
-
-#define STEAM_INVALID_HANDLE							((SteamHandle_t)(0))
-#define STEAM_INVALID_CALL_HANDLE						((SteamCallHandle_t)(0))
-#define	STEAM_INACTIVE_USERIDTICKET_VALIDATION_HANDLE	((SteamUserIDTicketValidationHandle_t)(0))
-#define STEAM_USE_LATEST_VERSION						(0xFFFFFFFFu);
-
-#endif
-
-
-	typedef	unsigned short		SteamInstanceID_t;		    
-
-
-#if defined ( _WIN32 )
-	typedef	unsigned __int64	SteamLocalUserID_t;		    
-#else
-	typedef	unsigned long long	SteamLocalUserID_t;		    
-#endif
-
-	typedef struct
-	{
-		unsigned int	Low32bits;
-		unsigned int	High32bits;
-	}	TSteamSplitLocalUserID;
-
-	typedef struct
-	{
-		SteamInstanceID_t		m_SteamInstanceID;
-
-		union
-		{
-			SteamLocalUserID_t		As64bits;
-			TSteamSplitLocalUserID	Split;
-		}						m_SteamLocalUserID;
-
-	} TSteamGlobalUserID;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/SpyCustom/TextEntry.h b/SpyCustom/TextEntry.h
deleted file mode 100644
index 5b2311a..0000000
--- a/SpyCustom/TextEntry.h
+++ /dev/null
@@ -1,280 +0,0 @@
-#ifndef TEXTENTRY_H
-#define TEXTENTRY_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "Color.h"
-#include "Panel.h"
-#include "Label.h"
-#include "ListPanel.h"
-
-#include "utlvector.h"
-
-namespace vgui
-{
-
-	class TextEntry : public Panel
-	{
-		DECLARE_CLASS_SIMPLE(TextEntry, Panel);
-
-	public:
-		TextEntry(Panel* parent, const char* panelName);
-		virtual ~TextEntry();
-
-		virtual void SetText(const wchar_t* wszText);
-		virtual void SetText(const char* text);
-		virtual void GetText(OUT_Z_BYTECAP(bufLenInBytes) char* buf, int bufLenInBytes);
-		virtual void GetText(OUT_Z_BYTECAP(bufLenInBytes) wchar_t* buf, int bufLenInBytes);
-		virtual int GetTextLength() const;
-		virtual bool IsTextFullySelected() const;
-
-		virtual void GotoLeft();		     
-		virtual void GotoRight();		     
-		virtual void GotoUp();			     
-		virtual void GotoDown();		     
-		virtual void GotoWordRight();	       
-		virtual void GotoWordLeft();	       
-		virtual void GotoFirstOfLine();	        
-		virtual void GotoEndOfLine();	        
-		virtual void GotoTextStart();	      
-		virtual void GotoTextEnd();		      
-
-		virtual void InsertChar(wchar_t ch);
-		virtual void InsertString(const char* text);
-		virtual void InsertString(const wchar_t* wszText);
-		virtual void Backspace();
-		virtual void Delete();
-		virtual void SelectNone();
-		virtual void OpenEditMenu();
-		MESSAGE_FUNC(CutSelected, "DoCutSelected");
-		MESSAGE_FUNC(CopySelected, "DoCopySelected");
-		MESSAGE_FUNC(Paste, "DoPaste");
-
-		MESSAGE_FUNC_INT(LanguageChanged, "DoLanguageChanged", handle);
-		MESSAGE_FUNC_INT(ConversionModeChanged, "DoConversionModeChanged", handle);
-		MESSAGE_FUNC_INT(SentenceModeChanged, "DoSentenceModeChanged", handle);
-
-		MESSAGE_FUNC_WCHARPTR(CompositionString, "DoCompositionString", string);
-
-		MESSAGE_FUNC(ShowIMECandidates, "DoShowIMECandidates");
-		MESSAGE_FUNC(HideIMECandidates, "DoHideIMECandidates");
-		MESSAGE_FUNC(UpdateIMECandidates, "DoUpdateIMECandidates");
-
-		virtual void DeleteSelected();
-		virtual void Undo();
-		virtual void SaveUndoState();
-		virtual void SetFont(HFont font);
-		virtual void SetTextHidden(bool bHideText);
-		virtual void SetEditable(bool state);
-		virtual bool IsEditable();
-		virtual void SetEnabled(bool state);
-		virtual void MoveCursor(int line, int pixelsAcross);
-
-		virtual void SetDisabledBgColor(Color col);
-
-		virtual void SetMultiline(bool state);
-		virtual bool IsMultiline();
-
-		virtual void SetVerticalScrollbar(bool state);
-
-		virtual void SetCatchEnterKey(bool state);
-
-		virtual void SendNewLine(bool send);
-
-		virtual void SetMaximumCharCount(int maxChars);
-		virtual int GetMaximumCharCount();
-		virtual void SetAutoProgressOnHittingCharLimit(bool state);
-
-		virtual void SetWrap(bool wrap);
-
-		virtual void RecalculateLineBreaks();
-		virtual void LayoutVerticalScrollBarSlider();
-
-		virtual bool RequestInfo(KeyValues* outputData);
-
-		void SetToFullHeight();
-
-		void SetToFullWidth();
-
-		int GetNumLines();
-
-		void SelectAllText(bool bResetCursorPos);
-		void SelectNoText();
-		void SelectAllOnFirstFocus(bool status);
-		void SetDrawWidth(int width);            
-		int GetDrawWidth();
-		void SetHorizontalScrolling(bool status);       
-
-		void SetAllowNonAsciiCharacters(bool state);
-
-		void SetAllowNumericInputOnly(bool state);
-
-		void SetDrawLanguageIDAtLeft(bool state);
-
-		virtual bool GetDropContextMenu(Menu* menu, CUtlVector< KeyValues* >& data);
-		virtual bool IsDroppable(CUtlVector< KeyValues* >& data);
-		virtual void OnPanelDropped(CUtlVector< KeyValues* >& data);
-		virtual Panel* GetDragPanel();
-		virtual void OnCreateDragData(KeyValues* msg);
-
-		void SelectAllOnFocusAlways(bool status);
-		void SetSelectionTextColor(const Color& clr);
-		void SetSelectionBgColor(const Color& clr);
-		void SetSelectionUnfocusedBgColor(const Color& clr);
-
-		void SetUseFallbackFont(bool bState, HFont hFallback);
-
-	protected:
-		virtual void ResetCursorBlink();
-		virtual void PerformLayout();        
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-		virtual void PaintBackground();
-		virtual int  DrawChar(wchar_t ch, HFont font, int index, int x, int y);
-		virtual bool DrawCursor(int x, int y);
-
-		virtual void SetCharAt(wchar_t ch, int index);           
-		virtual void ApplySettings(KeyValues* inResourceData);
-		virtual void GetSettings(KeyValues* outResourceData);
-		virtual const char* GetDescription(void);
-		virtual void FireActionSignal();
-		virtual bool GetSelectedRange(int& cx0, int& cx1);
-		virtual void CursorToPixelSpace(int cursorPos, int& cx, int& cy);
-		virtual int  PixelToCursorSpace(int cx, int cy);
-		virtual void AddAnotherLine(int& cx, int& cy);
-		virtual int  GetYStart();        
-
-		virtual bool SelectCheck(bool fromMouse = false);	         
-		MESSAGE_FUNC_WCHARPTR(OnSetText, "SetText", text);
-		MESSAGE_FUNC(OnSliderMoved, "ScrollBarSliderMoved");      
-		virtual void OnKillFocus();
-		virtual void OnMouseWheeled(int delta);	     
-		virtual void OnKeyCodePressed(KeyCode code);    
-		virtual void OnKeyCodeTyped(KeyCode code);	   
-		virtual	void OnKeyTyped(wchar_t unichar);	   
-
-		virtual void OnCursorMoved(int x, int y);           
-		virtual void OnMousePressed(MouseCode code);      
-		virtual void OnMouseDoublePressed(MouseCode code);
-		virtual void OnMouseTriplePressed(MouseCode code);
-		virtual void OnMouseReleased(MouseCode code);	     
-
-		virtual void OnKeyFocusTicked();       
-		virtual void OnMouseFocusTicked();       
-		virtual void OnCursorEntered();	     
-		virtual void OnCursorExited();	     
-
-		virtual void OnMouseCaptureLost();
-		virtual void OnSizeChanged(int newWide, int newTall);
-
-		virtual int GetStartDrawIndex(int& lineBreakIndexIndex);
-
-	public:
-		virtual float GetValueAsFloat();
-		virtual int GetValueAsInt();
-
-	protected:
-		void ScrollRight();        
-		void ScrollLeft();      
-		bool IsCursorOffRightSideOfWindow(int cursorPos);          
-		bool IsCursorOffLeftSideOfWindow(int cursorPos);          
-		void ScrollLeftForResize();
-
-		void OnSetFocus();
-		void OnChangeIME(bool forward);
-
-		bool NeedsEllipses(HFont font, int* pIndex);
-
-	private:
-		MESSAGE_FUNC_INT(OnSetState, "SetState", state);
-		int GetCurrentLineStart();
-		int GetCurrentLineEnd();
-		bool IsLineBreak(int index);
-		int GetCursorLine();
-		void MoveScrollBar(int delta);
-		void CalcBreakIndex();   
-		void CreateEditMenu();    
-
-	public:
-		Menu* GetEditMenu();    
-
-	private:
-		void	FlipToLastIME();
-
-	public:
-		virtual void GetTextRange(wchar_t* buf, int from, int numchars);	            
-		virtual void GetTextRange(char* buf, int from, int numchars);	            
-
-	private:
-
-		CUtlVector<wchar_t> m_TextStream;		           
-		CUtlVector<wchar_t> m_UndoTextStream;	         
-		CUtlVector<int>		m_LineBreaks;		             
-
-		int                _cursorPos;		          
-		bool               _cursorIsAtEnd;
-		bool               _putCursorAtEnd;
-		int				   _undoCursorPos;	         
-		bool               _cursorBlink;	      
-		bool               _hideText;		        
-		bool			   _editable;		      
-		bool			   _mouseSelection;	         
-		bool			   _mouseDragSelection;               
-		int				   _mouseSelectCursorStart;	         
-		long               _cursorNextBlinkTime;       
-		int                _cursorBlinkRate;	      
-		int                _select[2];	             
-		int				   _pixelsIndent;
-		int				   _charCount;
-		int				   _maxCharCount;             
-		HFont              _font;		          
-		HFont			   _smallfont;
-		bool			   _dataChanged;          
-		bool			   _multiline;	            
-		bool			   _verticalScrollbar;        
-		ScrollBar* _vertScrollBar;		         
-		Color			   _cursorColor;	       
-		Color			   _disabledFgColor;
-		Color			   _disabledBgColor;
-		Color			   _selectionColor;
-		Color			   _selectionTextColor;	      
-		Color			   _defaultSelectionBG2Color;
-		int				   _currentStartLine;        
-		int				   _currentStartIndex;       
-		bool			   _horizScrollingAllowed;	       
-		Color			   _focusEdgeColor;
-		bool		       _catchEnterKey;
-		bool			   _wrap;
-		bool			   _sendNewLines;
-		int				   _drawWidth;
-
-		Menu* m_pEditMenu;  
-
-		int				   _recalculateBreaksIndex;          	
-		bool			   _selectAllOnFirstFocus : 1;          
-		bool				_selectAllOnFocusAlways : 1;
-		bool			   _firstFocusStatus;           
-		bool				m_bAllowNumericInputOnly;
-		bool				m_bAllowNonAsciiCharacters;
-		bool				m_bAutoProgressOnHittingCharLimit;
-
-		enum
-		{
-			MAX_COMPOSITION_STRING = 256,
-		};
-
-		wchar_t				m_szComposition[MAX_COMPOSITION_STRING];
-		Menu* m_pIMECandidates;
-		int					m_hPreviousIME;
-		bool				m_bDrawLanguageIDAtLeft;
-		int					m_nLangInset;
-
-		bool				m_bUseFallbackFont : 1;
-		HFont				m_hFallbackFont;
-	};
-
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/TextImage.h b/SpyCustom/TextImage.h
deleted file mode 100644
index 91aaf4a..0000000
--- a/SpyCustom/TextImage.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef TEXTIMAGE_H
-#define TEXTIMAGE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "ILocalize.h"
-#include "Image.h"
-
-#include "utlvector.h"
-#include "UtlSortVector.h"
-
-class KeyValues;
-
-namespace vgui
-{
-
-	struct label_colorchange_t
-	{
-		Color	color;
-		int		textStreamIndex;
-	};
-
-	class CColorChangeListLess
-	{
-	public:
-		bool Less(const label_colorchange_t& src1, const label_colorchange_t& src2, void* pCtx)
-		{
-			if (src1.textStreamIndex < src2.textStreamIndex)
-				return true;
-
-			return false;
-		}
-	};
-
-	class TextImage : public Image
-	{
-	public:
-		TextImage(const char* text);
-		TextImage(const wchar_t* wszText);
-		~TextImage();
-
-	public:
-		virtual void SetText(const char* text);
-		virtual void SetText(const wchar_t* text, bool bClearUnlocalizedSymbol = false);
-		virtual void GetText(char* buffer, int bufferSize);
-		virtual void GetText(wchar_t* buffer, int bufferLength);
-		virtual void GetUnlocalizedText(char* buffer, int bufferSize);
-		virtual StringIndex_t GetUnlocalizedTextSymbol();
-
-		virtual void SetFont(vgui::HFont font);
-		virtual vgui::HFont GetFont();
-
-		void SetDrawWidth(int width);
-		void GetDrawWidth(int& width);
-
-		void ResizeImageToContent();
-		void ResizeImageToContentMaxWidth(int nMaxWidth);
-
-		virtual void SetSize(int wide, int tall);
-
-		virtual void GetContentSize(int& wide, int& tall);
-
-		virtual void Paint();
-
-		void SetWrap(bool bWrap);
-		void RecalculateNewLinePositions();
-
-		void SetUseFallbackFont(bool bState, HFont hFallback);
-
-		void SetAllCaps(bool bAllCaps);
-
-		void SetCenterWrap(bool bWrap);
-		void RecalculateCenterWrapIndents();
-
-		const wchar_t* GetUText(void) { return _utext; }
-
-		void AddColorChange(Color col, int iTextStreamIndex);
-		void SetColorChangeStream(CUtlSortVector<label_colorchange_t, CColorChangeListLess>* pUtlVecStream);
-		void ClearColorChangeStream(void) { m_ColorChangeStream.Purge(); }
-
-		const wchar_t* GetEllipsesPosition(void) const { return m_pwszEllipsesPosition; }
-		bool IsWrapping() const { return m_LineBreaks.Count() != 0; }
-
-	protected:
-		void SizeText(wchar_t* tempText, int stringLength);
-		virtual void GetTextSize(int& wide, int& tall);
-
-	private:
-		void RecalculateEllipsesPosition();
-
-		wchar_t* _utext;	     
-		short _textBufferLen;	     
-		short _textLen;		     
-		vgui::HFont _font;	     
-		vgui::HFont _fallbackFont;
-		int _drawWidth;		            
-		StringIndex_t _unlocalizedTextSymbol;	         
-		wchar_t* m_pwszEllipsesPosition;
-
-		bool m_bRecalculateTruncation : 1;
-		bool m_bWrap : 1;
-		bool m_bUseFallbackFont : 1;
-		bool m_bRenderUsingFallbackFont : 1;
-		bool m_bAllCaps : 1;
-		CUtlVector<wchar_t*>		m_LineBreaks;		             
-
-		bool m_bWrapCenter;								          
-		CUtlVector<int>				m_LineXIndent;		          
-
-		CUtlSortVector<label_colorchange_t, CColorChangeListLess>		m_ColorChangeStream;
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ToggleButton.h b/SpyCustom/ToggleButton.h
deleted file mode 100644
index 031338c..0000000
--- a/SpyCustom/ToggleButton.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef TOGGLEBUTTON_H
-#define TOGGLEBUTTON_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "Button.h"
-
-namespace vgui
-{
-
-	class ToggleButton : public Button
-	{
-		DECLARE_CLASS_SIMPLE(ToggleButton, Button);
-
-	public:
-		ToggleButton(Panel* parent, const char* panelName, const char* text);
-
-		virtual void DoClick();
-
-	protected:
-		virtual void OnMouseDoublePressed(MouseCode code);
-
-		virtual Color GetButtonFgColor();
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-
-		virtual bool CanBeDefaultButton(void);
-		virtual void OnKeyCodePressed(KeyCode code);
-
-	private:
-		Color _selectedColor;
-	};
-
-}   
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/Tooltip.h b/SpyCustom/Tooltip.h
deleted file mode 100644
index a0ecc08..0000000
--- a/SpyCustom/Tooltip.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef TOOLTIP_H
-#define TOOLTIP_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "VGUI.h"
-#include "Controls.h"
-#include "utlvector.h"
-
-namespace vgui
-{
-
-	class BaseTooltip
-	{
-	public:
-		BaseTooltip(Panel* parent, const char* text = NULL);
-
-		virtual void SetText(const char* text);
-		virtual const char* GetText();
-
-		virtual void ShowTooltip(Panel* currentPanel);
-		virtual void HideTooltip();
-
-		bool		 ShouldLayout(void);
-		virtual void PerformLayout() { return; }
-		virtual void PositionWindow(Panel* pTipPanel);
-
-		void ResetDelay();
-		void SetTooltipFormatToSingleLine();
-		void SetTooltipFormatToMultiLine();
-		void SetTooltipDelay(int tooltipDelayMilliseconds);
-		int GetTooltipDelay();
-		void SetEnabled(bool bState);
-
-	private:
-		Panel* m_pParent;
-		virtual void ApplySchemeSettings(IScheme* pScheme) {};
-	protected:
-		CUtlVector<char> m_Text;
-		int _delay;			    
-		int _tooltipDelay;	     
-		bool _makeVisible : 1;
-		bool _displayOnOneLine : 1;
-		bool _isDirty : 1;
-		bool _enabled : 1;
-	};
-
-	class TextTooltip : public BaseTooltip
-	{
-	public:
-		TextTooltip(Panel* parent, const char* text = NULL);
-		~TextTooltip();
-
-		virtual void SetText(const char* text);
-		virtual void ShowTooltip(Panel* currentPanel);
-		virtual void HideTooltip();
-		virtual void SizeTextWindow();
-		virtual void PerformLayout();
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-	};
-
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/UtlSortVector.h b/SpyCustom/UtlSortVector.h
deleted file mode 100644
index b8ef3b4..0000000
--- a/SpyCustom/UtlSortVector.h
+++ /dev/null
@@ -1,316 +0,0 @@
-#ifndef UTLSORTVECTOR_H
-#define UTLSORTVECTOR_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-
-
-#ifndef _WIN32
-extern void* g_pUtlSortVectorQSortContext;
-#endif
-
-template <class T>
-class CUtlSortVectorDefaultLess
-{
-public:
-	bool Less(const T& lhs, const T& rhs, void*)
-	{
-		return lhs < rhs;
-	}
-};
-
-template <class T, class LessFunc = CUtlSortVectorDefaultLess<T>, class BaseVector = CUtlVector<T> >
-class CUtlSortVector : public BaseVector
-{
-	typedef BaseVector BaseClass;
-public:
-	CUtlSortVector(int nGrowSize = 0, int initSize = 0);
-	CUtlSortVector(T* pMemory, int numElements);
-
-	int		Insert(const T& src);
-
-	int		InsertIfNotFound(const T& src);
-
-	template< typename TKey >
-	int		Find(const TKey& search) const;
-	template< typename TKey >
-	int		FindLessOrEqual(const TKey& search) const;
-	template< typename TKey >
-	int		FindLess(const TKey& search) const;
-
-	void	Remove(const T& search);
-	void	Remove(int i);
-
-	void	SetLessContext(void* pCtx);
-
-	int		InsertNoSort(const T& src);
-	void	RedoSort(bool bForceSort = false);
-
-	int		InsertAfter(int nElemIndex, const T& src);
-
-	template< typename TKey >
-	int		FindUnsorted(const TKey& src) const;
-
-protected:
-	CUtlSortVector(const CUtlSortVector<T, LessFunc>&);
-
-	int AddToHead();
-	int AddToTail();
-	int InsertBefore(int elem);
-	int InsertAfter(int elem);
-	int	InsertBefore(int elem, const T& src);
-	int AddToHead(const T& src);
-	int AddToTail(const T& src);
-	int AddMultipleToHead(int num);
-	int AddMultipleToTail(int num, const T* pToCopy = NULL);
-	int InsertMultipleBefore(int elem, int num, const T* pToCopy = NULL);
-	int InsertMultipleAfter(int elem, int num);
-	int AddVectorToTail(CUtlVector<T> const& src);
-
-	struct QSortContext_t
-	{
-		void* m_pLessContext;
-		LessFunc* m_pLessFunc;
-	};
-
-#ifdef _WIN32
-	static int CompareHelper(void* context, const T* lhs, const T* rhs)
-	{
-		QSortContext_t* ctx = reinterpret_cast<QSortContext_t*>(context);
-		if (ctx->m_pLessFunc->Less(*lhs, *rhs, ctx->m_pLessContext))
-			return -1;
-		if (ctx->m_pLessFunc->Less(*rhs, *lhs, ctx->m_pLessContext))
-			return 1;
-		return 0;
-	}
-#else
-	static int CompareHelper(const T* lhs, const T* rhs)
-	{
-		QSortContext_t* ctx = reinterpret_cast<QSortContext_t*>(g_pUtlSortVectorQSortContext);
-		if (ctx->m_pLessFunc->Less(*lhs, *rhs, ctx->m_pLessContext))
-			return -1;
-		if (ctx->m_pLessFunc->Less(*rhs, *lhs, ctx->m_pLessContext))
-			return 1;
-		return 0;
-	}
-#endif
-
-	void* m_pLessContext;
-	bool	m_bNeedsSort;
-
-private:
-private:
-	template< typename TKey >
-	int	FindLessOrEqual(const TKey& search, bool* pFound) const;
-
-	void QuickSort(LessFunc& less, int X, int I);
-};
-
-
-template <class T, class LessFunc, class BaseVector>
-CUtlSortVector<T, LessFunc, BaseVector>::CUtlSortVector(int nGrowSize, int initSize) :
-	m_pLessContext(NULL), BaseVector(nGrowSize, initSize), m_bNeedsSort(false)
-{
-}
-
-template <class T, class LessFunc, class BaseVector>
-CUtlSortVector<T, LessFunc, BaseVector>::CUtlSortVector(T* pMemory, int numElements) :
-	m_pLessContext(NULL), BaseVector(pMemory, numElements), m_bNeedsSort(false)
-{
-}
-
-template <class T, class LessFunc, class BaseVector>
-void CUtlSortVector<T, LessFunc, BaseVector>::SetLessContext(void* pCtx)
-{
-	m_pLessContext = pCtx;
-}
-
-template <class T, class LessFunc, class BaseVector>
-int CUtlSortVector<T, LessFunc, BaseVector>::Insert(const T& src)
-{
-	AssertFatal(!m_bNeedsSort);
-
-	int pos = FindLessOrEqual(src) + 1;
-	this->GrowVector();
-	this->ShiftElementsRight(pos);
-	CopyConstruct<T>(&this->Element(pos), src);
-	return pos;
-}
-
-template <class T, class LessFunc, class BaseVector>
-int CUtlSortVector<T, LessFunc, BaseVector>::InsertNoSort(const T& src)
-{
-	m_bNeedsSort = true;
-	int lastElement = BaseVector::m_Size;
-	this->GrowVector();
-	this->ShiftElementsRight(lastElement);
-	CopyConstruct(&this->Element(lastElement), src);
-	return lastElement;
-}
-
-template <class T, class LessFunc, class BaseVector>
-int CUtlSortVector<T, LessFunc, BaseVector>::InsertIfNotFound(const T& src)
-{
-	AssertFatal(!m_bNeedsSort);
-	bool bFound;
-	int pos = FindLessOrEqual(src, &bFound);
-	if (bFound)
-		return pos;
-
-	++pos;
-	this->GrowVector();
-	this->ShiftElementsRight(pos);
-	CopyConstruct<T>(&this->Element(pos), src);
-	return pos;
-}
-
-template <class T, class LessFunc, class BaseVector>
-int CUtlSortVector<T, LessFunc, BaseVector>::InsertAfter(int nIndex, const T& src)
-{
-	int nInsertedIndex = this->BaseClass::InsertAfter(nIndex, src);
-
-#ifdef DEBUG
-	LessFunc less;
-	if (nInsertedIndex > 0)
-	{
-		Assert(less.Less(this->Element(nInsertedIndex - 1), src, m_pLessContext));
-	}
-	if (nInsertedIndex < BaseClass::Count() - 1)
-	{
-		Assert(less.Less(src, this->Element(nInsertedIndex + 1), m_pLessContext));
-	}
-#endif
-	return nInsertedIndex;
-}
-
-template <class T, class LessFunc, class BaseVector>
-template < typename TKey >
-int CUtlSortVector<T, LessFunc, BaseVector>::Find(const TKey& src) const
-{
-	AssertFatal(!m_bNeedsSort);
-
-	LessFunc less;
-
-	int start = 0, end = this->Count() - 1;
-	while (start <= end)
-	{
-		int mid = (start + end) >> 1;
-		if (less.Less(this->Element(mid), src, m_pLessContext))
-		{
-			start = mid + 1;
-		}
-		else if (less.Less(src, this->Element(mid), m_pLessContext))
-		{
-			end = mid - 1;
-		}
-		else
-		{
-			return mid;
-		}
-	}
-	return -1;
-}
-
-
-template< class T, class LessFunc, class BaseVector >
-template < typename TKey >
-int CUtlSortVector<T, LessFunc, BaseVector>::FindUnsorted(const TKey& src) const
-{
-	LessFunc less;
-	int nCount = this->Count();
-	for (int i = 0; i < nCount; ++i)
-	{
-		if (less.Less(this->Element(i), src, m_pLessContext))
-			continue;
-		if (less.Less(src, this->Element(i), m_pLessContext))
-			continue;
-		return i;
-	}
-	return -1;
-}
-
-
-template <class T, class LessFunc, class BaseVector>
-template < typename TKey >
-int CUtlSortVector<T, LessFunc, BaseVector>::FindLessOrEqual(const TKey& src, bool* pFound) const
-{
-	AssertFatal(!m_bNeedsSort);
-
-	LessFunc less;
-	int start = 0, end = this->Count() - 1;
-	while (start <= end)
-	{
-		int mid = (start + end) >> 1;
-		if (less.Less(this->Element(mid), src, m_pLessContext))
-		{
-			start = mid + 1;
-		}
-		else if (less.Less(src, this->Element(mid), m_pLessContext))
-		{
-			end = mid - 1;
-		}
-		else
-		{
-			*pFound = true;
-			return mid;
-		}
-	}
-
-	*pFound = false;
-	return end;
-}
-
-template <class T, class LessFunc, class BaseVector>
-template < typename TKey >
-int CUtlSortVector<T, LessFunc, BaseVector>::FindLessOrEqual(const TKey& src) const
-{
-	bool bFound;
-	return FindLessOrEqual(src, &bFound);
-}
-
-template <class T, class LessFunc, class BaseVector>
-template < typename TKey >
-int CUtlSortVector<T, LessFunc, BaseVector>::FindLess(const TKey& src) const
-{
-	AssertFatal(!m_bNeedsSort);
-
-	LessFunc less;
-	int start = 0, end = this->Count() - 1;
-	while (start <= end)
-	{
-		int mid = (start + end) >> 1;
-		if (less.Less(this->Element(mid), src, m_pLessContext))
-		{
-			start = mid + 1;
-		}
-		else
-		{
-			end = mid - 1;
-		}
-	}
-	return end;
-}
-
-
-template <class T, class LessFunc, class BaseVector>
-void CUtlSortVector<T, LessFunc, BaseVector>::Remove(const T& search)
-{
-	AssertFatal(!m_bNeedsSort);
-
-	int pos = Find(search);
-	if (pos != -1)
-	{
-		BaseVector::Remove(pos);
-	}
-}
-
-template <class T, class LessFunc, class BaseVector>
-void CUtlSortVector<T, LessFunc, BaseVector>::Remove(int i)
-{
-	BaseVector::Remove(i);
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/UtlStringMap.h b/SpyCustom/UtlStringMap.h
deleted file mode 100644
index efe9545..0000000
--- a/SpyCustom/UtlStringMap.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef UTLSTRINGMAP_H
-#define UTLSTRINGMAP_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlsymbol.h"
-
-template <class T>
-class CUtlStringMap
-{
-public:
-	CUtlStringMap(bool caseInsensitive = true) : m_SymbolTable(0, 32, caseInsensitive)
-	{
-	}
-
-	T& operator[](const char* pString)
-	{
-		CUtlSymbol symbol = m_SymbolTable.AddString(pString);
-		int index = (int)(UtlSymId_t)symbol;
-		if (m_Vector.Count() <= index)
-		{
-			m_Vector.EnsureCount(index + 1);
-		}
-		return m_Vector[index];
-	}
-
-	T& operator[](UtlSymId_t n)
-	{
-		Assert(n >= 0 && n <= m_Vector.Count());
-		return m_Vector[n];
-	}
-
-	const T& operator[](UtlSymId_t n) const
-	{
-		Assert(n >= 0 && n <= m_Vector.Count());
-		return m_Vector[n];
-	}
-
-	bool Defined(const char* pString) const
-	{
-		return m_SymbolTable.Find(pString) != UTL_INVAL_SYMBOL;
-	}
-
-	UtlSymId_t Find(const char* pString) const
-	{
-		return m_SymbolTable.Find(pString);
-	}
-
-	static UtlSymId_t InvalidIndex()
-	{
-		return UTL_INVAL_SYMBOL;
-	}
-
-	int GetNumStrings(void) const
-	{
-		return m_SymbolTable.GetNumStrings();
-	}
-
-	const char* String(int n)	const
-	{
-		return m_SymbolTable.String(n);
-	}
-
-	void Clear()
-	{
-		m_Vector.RemoveAll();
-		m_SymbolTable.RemoveAll();
-	}
-
-	void Purge()
-	{
-		m_Vector.Purge();
-		m_SymbolTable.RemoveAll();
-	}
-
-	void PurgeAndDeleteElements()
-	{
-		m_Vector.PurgeAndDeleteElements();
-		m_SymbolTable.RemoveAll();
-	}
-
-
-
-private:
-	CUtlVector<T> m_Vector;
-	CUtlSymbolTable m_SymbolTable;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/VGUI.h b/SpyCustom/VGUI.h
deleted file mode 100644
index e137dc6..0000000
--- a/SpyCustom/VGUI.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef VGUI_H
-#define VGUI_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define null 0L
-
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL    0
-#else
-#define NULL    ((void *)0)
-#endif
-#endif
-
-#pragma warning( disable: 4800 )	       
-#pragma warning( disable: 4786 )	       
-#pragma warning( disable: 4355 )	         
-#pragma warning( disable: 4097 )	         
-#pragma warning( disable: 4514 )	          
-#pragma warning( disable: 4100 )	       
-#pragma warning( disable: 4127 )	      
-
-typedef unsigned char  uchar;
-typedef unsigned short ushort;
-typedef unsigned int   uint;
-typedef unsigned long  ulong;
-
-#ifndef _WCHAR_T_DEFINED
-#if !defined( __x86_64__ ) && !defined( __WCHAR_TYPE__  )
-typedef unsigned short wchar_t;
-#define _WCHAR_T_DEFINED
-#endif
-#endif
-
-namespace vgui
-{
-	typedef unsigned int VPANEL;
-
-	typedef unsigned long HScheme;
-	typedef unsigned long HTexture;
-	typedef unsigned long HCursor;
-	typedef unsigned long HPanel;
-	const HPanel INVALID_PANEL = 0xffffffff;
-	typedef unsigned long HFont;
-	const HFont INVALID_FONT = 0;        
-}
-
-#include "strtools.h"
-
-#if 0         
-#define USE_GETKERNEDCHARWIDTH 1
-#else
-#define USE_GETKERNEDCHARWIDTH 0
-#endif
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/VMT.hpp b/SpyCustom/VMT.hpp
deleted file mode 100644
index 3f5eacc..0000000
--- a/SpyCustom/VMT.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <Windows.h>
-
-#include <iostream>
-
-class VMTHook
-{
-public:
-    VMTHook(void* classptr)
-    {
-        this->class_pointer = reinterpret_cast<uintptr_t**>(classptr);
-
-        int table_size = 0;
-        while (reinterpret_cast<uintptr_t*>(*this->class_pointer)[table_size])
-            table_size++;
-
-        original_pointer = *this->class_pointer;
-
-        new_table_pointer = new uintptr_t[sizeof(uintptr_t) * table_size];
-        memcpy(new_table_pointer, original_pointer, sizeof(uintptr_t) * table_size);
-    }
-
-    ~VMTHook()
-    {
-        RestoreOldTable();
-        delete original_pointer;
-        delete new_table_pointer;
-    }
-
-    void SwapPointer(size_t index, void* new_function)
-    {
-#ifdef DEBUG
-        printf("Swapping pointer 0x%X to 0x%X\n", new_table_pointer[index], reinterpret_cast<uintptr_t>(new_function));
-#endif
-        new_table_pointer[index] = reinterpret_cast<uintptr_t>(new_function);
-#ifdef DEBUG
-        printf("Swapped pointer!\n");
-#endif
-    }
-
-    void ApplyNewTable()
-    {
-#ifdef DEBUG
-        printf("Applying new table... (0x%X to 0x%X)\n", reinterpret_cast<uintptr_t>(*class_pointer), reinterpret_cast<uintptr_t>(new_table_pointer));
-#endif
-        *class_pointer = new_table_pointer;
-#ifdef DEBUG
-        printf("New table applyed!\n");
-#endif
-    }
-
-    void RestoreOldTable()
-    {
-#ifdef DEBUG
-        printf("Restoring old table... (0x%X to 0x%X)\n", reinterpret_cast<uintptr_t>(*class_pointer), reinterpret_cast<uintptr_t>(original_pointer));
-#endif
-        *class_pointer = original_pointer;
-#ifdef DEBUG
-        printf("Old table restored!\n");
-#endif
-    }
-
-    template<typename T>
-    T GetOriginal(size_t index)
-    {
-        return reinterpret_cast<T>(original_pointer[index]);
-    }
-
-private:
-    uintptr_t** class_pointer = nullptr;
-    uintptr_t* original_pointer = nullptr;
-    uintptr_t* new_table_pointer = nullptr;
-};
\ No newline at end of file
diff --git a/SpyCustom/XorStr.hpp b/SpyCustom/XorStr.hpp
deleted file mode 100644
index e66a1aa..0000000
--- a/SpyCustom/XorStr.hpp
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-#include <string>
-#include <array>
-#include <cstdarg>
-
-#define BEGIN_NAMESPACE( x ) namespace x {
-#define END_NAMESPACE }
-
-BEGIN_NAMESPACE(XorCompileTime)
-
-constexpr auto time = __TIME__;
-constexpr auto seed = static_cast<int>(time[7]) + static_cast<int>(time[6]) * 10 + static_cast<int>(time[4]) * 60 + static_cast<int>(time[3]) * 600 + static_cast<int>(time[1]) * 3600 + static_cast<int>(time[0]) * 36000;
-
-template < int N >
-struct RandomGenerator {
-private:
-	static constexpr unsigned a = 16807;  
-	static constexpr unsigned m = 2147483647;    
-
-	static constexpr unsigned s = RandomGenerator< N - 1 >::value;
-	static constexpr unsigned lo = a * (s & 0xFFFF);       
-	static constexpr unsigned hi = a * (s >> 16);       
-	static constexpr unsigned lo2 = lo + ((hi & 0x7FFF) << 16);           
-	static constexpr unsigned hi2 = hi >> 15;       
-	static constexpr unsigned lo3 = lo2 + hi;
-
-public:
-	static constexpr unsigned max = m;
-	static constexpr unsigned value = lo3 > m ? lo3 - m : lo3;
-};
-
-template <>
-struct RandomGenerator< 0 > {
-	static constexpr unsigned value = seed;
-};
-
-template < int N, int M >
-struct RandomInt {
-	static constexpr auto value = RandomGenerator< N + 1 >::value % M;
-};
-
-template < int N >
-struct RandomChar {
-	static const char value = static_cast<char>(1 + RandomInt< N, 0x7F - 1 >::value);
-};
-
-template < size_t N, int K >
-struct XorString {
-private:
-	const char _key;
-	std::array< char, N + 1 > _encrypted;
-
-	constexpr char enc(char c) const {
-		return c ^ _key;
-	}
-
-	char dec(char c) const {
-		return c ^ _key;
-	}
-
-public:
-	template < size_t... Is >
-	constexpr __forceinline XorString(const char* str, std::index_sequence< Is... >) : _key(RandomChar< K >::value), _encrypted{ enc(str[Is])... } {
-	}
-
-	__forceinline decltype(auto) decrypt(void) {
-		for (size_t i = 0; i < N; ++i) {
-			_encrypted[i] = dec(_encrypted[i]);
-		}
-		_encrypted[N] = '\0';
-		return _encrypted.data();
-	}
-};
-
-static auto w_printf = [](const char* fmt, ...) {
-	va_list args;
-	va_start(args, fmt);
-	vprintf_s(fmt, args);
-	va_end(args);
-};
-
-static auto w_printf_s = [](const char* fmt, ...) {
-	va_list args;
-	va_start(args, fmt);
-	vprintf_s(fmt, args);
-	va_end(args);
-};
-
-static auto w_sprintf = [](char* buf, const char* fmt, ...) {
-	va_list args;
-	va_start(args, fmt);
-	vsprintf(buf, fmt, args);
-	va_end(args);
-};
-
-static auto w_sprintf_s = [](char* buf, size_t buf_size, const char* fmt, ...) {
-	va_list args;
-	va_start(args, fmt);
-	vsprintf_s(buf, buf_size, fmt, args);
-	va_end(args);
-};
-
-#ifdef NDEBUG
-#define XorStr( s ) ( XorCompileTime::XorString< sizeof( s ) - 1, __COUNTER__ >( s, std::make_index_sequence< sizeof( s ) - 1>() ).decrypt() )
-#else
-#define XorStr( s ) ( s )
-#endif
-
-END_NAMESPACE
\ No newline at end of file
diff --git a/SpyCustom/ai_activity.h b/SpyCustom/ai_activity.h
deleted file mode 100644
index 0952ff9..0000000
--- a/SpyCustom/ai_activity.h
+++ /dev/null
@@ -1,2072 +0,0 @@
-#ifndef AI_ACTIVITY_H
-#define AI_ACTIVITY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define ACTIVITY_NOT_AVAILABLE		-1
-
-typedef enum
-{
-	ACT_INVALID = -1,			           
-	ACT_RESET = 0,				            
-	ACT_IDLE,
-	ACT_TRANSITION,
-	ACT_COVER,					     
-	ACT_COVER_MED,				  
-	ACT_COVER_LOW,				   
-	ACT_WALK,
-	ACT_WALK_AIM,
-	ACT_WALK_CROUCH,
-	ACT_WALK_CROUCH_AIM,
-	ACT_RUN,
-	ACT_RUN_AIM,
-	ACT_RUN_CROUCH,
-	ACT_RUN_CROUCH_AIM,
-	ACT_RUN_PROTECTED,
-	ACT_SCRIPT_CUSTOM_MOVE,
-	ACT_RANGE_ATTACK1,
-	ACT_RANGE_ATTACK2,
-	ACT_RANGE_ATTACK1_LOW,		          
-	ACT_RANGE_ATTACK2_LOW,		          
-	ACT_DIESIMPLE,
-	ACT_DIEBACKWARD,
-	ACT_DIEFORWARD,
-	ACT_DIEVIOLENT,
-	ACT_DIERAGDOLL,
-	ACT_FLY,				     
-	ACT_HOVER,
-	ACT_GLIDE,
-	ACT_SWIM,
-	ACT_JUMP,
-	ACT_HOP,				  
-	ACT_LEAP,				   
-	ACT_LAND,
-	ACT_CLIMB_UP,
-	ACT_CLIMB_DOWN,
-	ACT_CLIMB_DISMOUNT,
-	ACT_SHIPLADDER_UP,
-	ACT_SHIPLADDER_DOWN,
-	ACT_STRAFE_LEFT,
-	ACT_STRAFE_RIGHT,
-	ACT_ROLL_LEFT,			    
-	ACT_ROLL_RIGHT,			    
-	ACT_TURN_LEFT,			    
-	ACT_TURN_RIGHT,			    
-	ACT_CROUCH,				               
-	ACT_CROUCHIDLE,			            
-	ACT_STAND,				             
-	ACT_USE,
-	ACT_SIGNAL1,
-	ACT_SIGNAL2,
-	ACT_SIGNAL3,
-
-	ACT_SIGNAL_ADVANCE,		   
-	ACT_SIGNAL_FORWARD,
-	ACT_SIGNAL_GROUP,
-	ACT_SIGNAL_HALT,
-	ACT_SIGNAL_LEFT,
-	ACT_SIGNAL_RIGHT,
-	ACT_SIGNAL_TAKECOVER,
-
-	ACT_LOOKBACK_RIGHT,		       
-	ACT_LOOKBACK_LEFT,
-	ACT_COWER,				         
-	ACT_SMALL_FLINCH,		        
-	ACT_BIG_FLINCH,
-	ACT_MELEE_ATTACK1,
-	ACT_MELEE_ATTACK2,
-	ACT_RELOAD,
-	ACT_RELOAD_START,
-	ACT_RELOAD_FINISH,
-	ACT_RELOAD_LOW,
-	ACT_ARM,				     
-	ACT_DISARM,				  
-	ACT_DROP_WEAPON,
-	ACT_DROP_WEAPON_SHOTGUN,
-	ACT_PICKUP_GROUND,		          
-	ACT_PICKUP_RACK,		            
-	ACT_IDLE_ANGRY,			                    
-
-	ACT_IDLE_RELAXED,
-	ACT_IDLE_STIMULATED,
-	ACT_IDLE_AGITATED,
-	ACT_IDLE_STEALTH,
-	ACT_IDLE_HURT,
-
-	ACT_WALK_RELAXED,
-	ACT_WALK_STIMULATED,
-	ACT_WALK_AGITATED,
-	ACT_WALK_STEALTH,
-
-	ACT_RUN_RELAXED,
-	ACT_RUN_STIMULATED,
-	ACT_RUN_AGITATED,
-	ACT_RUN_STEALTH,
-
-	ACT_IDLE_AIM_RELAXED,
-	ACT_IDLE_AIM_STIMULATED,
-	ACT_IDLE_AIM_AGITATED,
-	ACT_IDLE_AIM_STEALTH,
-
-	ACT_WALK_AIM_RELAXED,
-	ACT_WALK_AIM_STIMULATED,
-	ACT_WALK_AIM_AGITATED,
-	ACT_WALK_AIM_STEALTH,
-
-	ACT_RUN_AIM_RELAXED,
-	ACT_RUN_AIM_STIMULATED,
-	ACT_RUN_AIM_AGITATED,
-	ACT_RUN_AIM_STEALTH,
-
-	ACT_CROUCHIDLE_STIMULATED,
-	ACT_CROUCHIDLE_AIM_STIMULATED,
-	ACT_CROUCHIDLE_AGITATED,
-
-	ACT_WALK_HURT,			   
-	ACT_RUN_HURT,			   
-	ACT_SPECIAL_ATTACK1,	     
-	ACT_SPECIAL_ATTACK2,
-	ACT_COMBAT_IDLE,		     
-	ACT_WALK_SCARED,
-	ACT_RUN_SCARED,
-	ACT_VICTORY_DANCE,		       
-	ACT_DIE_HEADSHOT,		     
-	ACT_DIE_CHESTSHOT,		    
-	ACT_DIE_GUTSHOT,		    
-	ACT_DIE_BACKSHOT,		    
-	ACT_FLINCH_HEAD,
-	ACT_FLINCH_CHEST,
-	ACT_FLINCH_STOMACH,
-	ACT_FLINCH_LEFTARM,
-	ACT_FLINCH_RIGHTARM,
-	ACT_FLINCH_LEFTLEG,
-	ACT_FLINCH_RIGHTLEG,
-	ACT_FLINCH_PHYSICS,
-
-	ACT_IDLE_ON_FIRE,		   
-	ACT_WALK_ON_FIRE,
-	ACT_RUN_ON_FIRE,
-
-	ACT_RAPPEL_LOOP,		    
-
-	ACT_180_LEFT,			    
-	ACT_180_RIGHT,
-
-	ACT_90_LEFT,			   
-	ACT_90_RIGHT,
-
-	ACT_STEP_LEFT,			  
-	ACT_STEP_RIGHT,
-	ACT_STEP_BACK,
-	ACT_STEP_FORE,
-
-	ACT_GESTURE_RANGE_ATTACK1,
-	ACT_GESTURE_RANGE_ATTACK2,
-	ACT_GESTURE_MELEE_ATTACK1,
-	ACT_GESTURE_MELEE_ATTACK2,
-	ACT_GESTURE_RANGE_ATTACK1_LOW,	          
-	ACT_GESTURE_RANGE_ATTACK2_LOW,	          
-
-	ACT_MELEE_ATTACK_SWING_GESTURE,
-
-	ACT_GESTURE_SMALL_FLINCH,
-	ACT_GESTURE_BIG_FLINCH,
-	ACT_GESTURE_FLINCH_BLAST,			    
-	ACT_GESTURE_FLINCH_BLAST_SHOTGUN,
-	ACT_GESTURE_FLINCH_BLAST_DAMAGED,	    
-	ACT_GESTURE_FLINCH_BLAST_DAMAGED_SHOTGUN,
-	ACT_GESTURE_FLINCH_HEAD,
-	ACT_GESTURE_FLINCH_CHEST,
-	ACT_GESTURE_FLINCH_STOMACH,
-	ACT_GESTURE_FLINCH_LEFTARM,
-	ACT_GESTURE_FLINCH_RIGHTARM,
-	ACT_GESTURE_FLINCH_LEFTLEG,
-	ACT_GESTURE_FLINCH_RIGHTLEG,
-
-	ACT_GESTURE_TURN_LEFT,
-	ACT_GESTURE_TURN_RIGHT,
-	ACT_GESTURE_TURN_LEFT45,
-	ACT_GESTURE_TURN_RIGHT45,
-	ACT_GESTURE_TURN_LEFT90,
-	ACT_GESTURE_TURN_RIGHT90,
-	ACT_GESTURE_TURN_LEFT45_FLAT,
-	ACT_GESTURE_TURN_RIGHT45_FLAT,
-	ACT_GESTURE_TURN_LEFT90_FLAT,
-	ACT_GESTURE_TURN_RIGHT90_FLAT,
-
-	ACT_BARNACLE_HIT,		     
-	ACT_BARNACLE_PULL,		        
-	ACT_BARNACLE_CHOMP,		      
-	ACT_BARNACLE_CHEW,		           
-
-	ACT_DO_NOT_DISTURB,
-
-	ACT_VM_DRAW,
-	ACT_VM_HOLSTER,
-	ACT_VM_IDLE,
-	ACT_VM_FIDGET,
-	ACT_VM_PULLBACK,
-	ACT_VM_PULLBACK_HIGH,
-	ACT_VM_PULLBACK_LOW,
-	ACT_VM_THROW,
-	ACT_VM_PULLPIN,
-	ACT_VM_PRIMARYATTACK,		 
-	ACT_VM_SECONDARYATTACK,		  
-	ACT_VM_RELOAD,
-	ACT_VM_RELOAD_START,
-	ACT_VM_RELOAD_FINISH,
-	ACT_VM_DRYFIRE,				     
-	ACT_VM_HITLEFT,				        
-	ACT_VM_HITLEFT2,			        
-	ACT_VM_HITRIGHT,			        
-	ACT_VM_HITRIGHT2,			        
-	ACT_VM_HITCENTER,			       
-	ACT_VM_HITCENTER2,			       
-	ACT_VM_MISSLEFT,			        
-	ACT_VM_MISSLEFT2,			        
-	ACT_VM_MISSRIGHT,			        
-	ACT_VM_MISSRIGHT2,			        
-	ACT_VM_MISSCENTER,			       
-	ACT_VM_MISSCENTER2,			       
-	ACT_VM_HAULBACK,			           
-	ACT_VM_SWINGHARD,			       
-	ACT_VM_SWINGMISS,
-	ACT_VM_SWINGHIT,
-	ACT_VM_IDLE_TO_LOWERED,
-	ACT_VM_IDLE_LOWERED,
-	ACT_VM_LOWERED_TO_IDLE,
-	ACT_VM_RECOIL1,
-	ACT_VM_RECOIL2,
-	ACT_VM_RECOIL3,
-	ACT_VM_PICKUP,
-	ACT_VM_RELEASE,
-
-	ACT_VM_ATTACH_SILENCER,
-	ACT_VM_DETACH_SILENCER,
-
-	ACT_VM_DRAW_SPECIAL,
-	ACT_VM_HOLSTER_SPECIAL,
-	ACT_VM_IDLE_SPECIAL,
-	ACT_VM_PULLBACK_SPECIAL,
-	ACT_VM_PRIMARYATTACK_SPECIAL,
-	ACT_VM_SECONDARYATTACK_SPECIAL,
-	ACT_VM_HITCENTER_SPECIAL,
-	ACT_VM_SWINGHARD_SPECIAL,
-	ACT_VM_IDLE_TO_LOWERED_SPECIAL,
-	ACT_VM_IDLE_LOWERED_SPECIAL,
-	ACT_VM_LOWERED_TO_IDLE_SPECIAL,
-
-	ACT_FISTS_VM_HITLEFT,
-	ACT_FISTS_VM_HITRIGHT,
-	ACT_FISTS_VM_SWINGHARD,
-	ACT_FISTS_VM_IDLE,
-	ACT_FISTS_VM_DRAW,
-
-		ACT_SLAM_STICKWALL_IDLE,
-		ACT_SLAM_STICKWALL_ND_IDLE,
-		ACT_SLAM_STICKWALL_ATTACH,
-		ACT_SLAM_STICKWALL_ATTACH2,
-		ACT_SLAM_STICKWALL_ND_ATTACH,
-		ACT_SLAM_STICKWALL_ND_ATTACH2,
-		ACT_SLAM_STICKWALL_DETONATE,
-		ACT_SLAM_STICKWALL_DETONATOR_HOLSTER,
-		ACT_SLAM_STICKWALL_DRAW,
-		ACT_SLAM_STICKWALL_ND_DRAW,
-		ACT_SLAM_STICKWALL_TO_THROW,
-		ACT_SLAM_STICKWALL_TO_THROW_ND,
-		ACT_SLAM_STICKWALL_TO_TRIPMINE_ND,
-		ACT_SLAM_THROW_IDLE,
-		ACT_SLAM_THROW_ND_IDLE,
-		ACT_SLAM_THROW_THROW,
-		ACT_SLAM_THROW_THROW2,
-		ACT_SLAM_THROW_THROW_ND,
-		ACT_SLAM_THROW_THROW_ND2,
-		ACT_SLAM_THROW_DRAW,
-		ACT_SLAM_THROW_ND_DRAW,
-		ACT_SLAM_THROW_TO_STICKWALL,
-		ACT_SLAM_THROW_TO_STICKWALL_ND,
-		ACT_SLAM_THROW_DETONATE,
-		ACT_SLAM_THROW_DETONATOR_HOLSTER,
-		ACT_SLAM_THROW_TO_TRIPMINE_ND,
-		ACT_SLAM_TRIPMINE_IDLE,
-		ACT_SLAM_TRIPMINE_DRAW,
-		ACT_SLAM_TRIPMINE_ATTACH,
-		ACT_SLAM_TRIPMINE_ATTACH2,
-		ACT_SLAM_TRIPMINE_TO_STICKWALL_ND,
-		ACT_SLAM_TRIPMINE_TO_THROW_ND,
-		ACT_SLAM_DETONATOR_IDLE,
-		ACT_SLAM_DETONATOR_DRAW,
-		ACT_SLAM_DETONATOR_DETONATE,
-		ACT_SLAM_DETONATOR_HOLSTER,
-		ACT_SLAM_DETONATOR_STICKWALL_DRAW,
-		ACT_SLAM_DETONATOR_THROW_DRAW,
-
-		ACT_SHOTGUN_RELOAD_START,
-		ACT_SHOTGUN_RELOAD_FINISH,
-		ACT_SHOTGUN_PUMP,
-
-		ACT_SMG2_IDLE2,
-		ACT_SMG2_FIRE2,
-		ACT_SMG2_DRAW2,
-		ACT_SMG2_RELOAD2,
-		ACT_SMG2_DRYFIRE2,
-		ACT_SMG2_TOAUTO,
-		ACT_SMG2_TOBURST,
-
-		ACT_PHYSCANNON_UPGRADE,
-
-		ACT_RANGE_ATTACK_AR1,
-		ACT_RANGE_ATTACK_AR2,
-		ACT_RANGE_ATTACK_AR2_LOW,
-		ACT_RANGE_ATTACK_AR2_GRENADE,
-		ACT_RANGE_ATTACK_HMG1,
-		ACT_RANGE_ATTACK_ML,
-		ACT_RANGE_ATTACK_SMG1,
-		ACT_RANGE_ATTACK_SMG1_LOW,
-		ACT_RANGE_ATTACK_SMG2,
-		ACT_RANGE_ATTACK_SHOTGUN,
-		ACT_RANGE_ATTACK_SHOTGUN_LOW,
-		ACT_RANGE_ATTACK_PISTOL,
-		ACT_RANGE_ATTACK_PISTOL_LOW,
-		ACT_RANGE_ATTACK_SLAM,
-		ACT_RANGE_ATTACK_TRIPWIRE,
-		ACT_RANGE_ATTACK_THROW,
-		ACT_RANGE_ATTACK_SNIPER_RIFLE,
-		ACT_RANGE_ATTACK_RPG,
-		ACT_MELEE_ATTACK_SWING,
-
-		ACT_RANGE_AIM_LOW,
-		ACT_RANGE_AIM_SMG1_LOW,
-		ACT_RANGE_AIM_PISTOL_LOW,
-		ACT_RANGE_AIM_AR2_LOW,
-
-		ACT_COVER_PISTOL_LOW,
-		ACT_COVER_SMG1_LOW,
-
-		ACT_GESTURE_RANGE_ATTACK_AR1,
-		ACT_GESTURE_RANGE_ATTACK_AR2,
-		ACT_GESTURE_RANGE_ATTACK_AR2_GRENADE,
-		ACT_GESTURE_RANGE_ATTACK_HMG1,
-		ACT_GESTURE_RANGE_ATTACK_ML,
-		ACT_GESTURE_RANGE_ATTACK_SMG1,
-		ACT_GESTURE_RANGE_ATTACK_SMG1_LOW,
-		ACT_GESTURE_RANGE_ATTACK_SMG2,
-		ACT_GESTURE_RANGE_ATTACK_SHOTGUN,
-		ACT_GESTURE_RANGE_ATTACK_PISTOL,
-		ACT_GESTURE_RANGE_ATTACK_PISTOL_LOW,
-		ACT_GESTURE_RANGE_ATTACK_SLAM,
-		ACT_GESTURE_RANGE_ATTACK_TRIPWIRE,
-		ACT_GESTURE_RANGE_ATTACK_THROW,
-		ACT_GESTURE_RANGE_ATTACK_SNIPER_RIFLE,
-		ACT_GESTURE_MELEE_ATTACK_SWING,
-
-		ACT_IDLE_RIFLE,
-		ACT_IDLE_SMG1,
-		ACT_IDLE_ANGRY_SMG1,
-		ACT_IDLE_PISTOL,
-		ACT_IDLE_ANGRY_PISTOL,
-		ACT_IDLE_ANGRY_SHOTGUN,
-		ACT_IDLE_STEALTH_PISTOL,
-
-		ACT_IDLE_PACKAGE,
-		ACT_WALK_PACKAGE,
-		ACT_IDLE_SUITCASE,
-		ACT_WALK_SUITCASE,
-
-		ACT_IDLE_SMG1_RELAXED,
-		ACT_IDLE_SMG1_STIMULATED,
-		ACT_WALK_RIFLE_RELAXED,
-		ACT_RUN_RIFLE_RELAXED,
-		ACT_WALK_RIFLE_STIMULATED,
-		ACT_RUN_RIFLE_STIMULATED,
-
-		ACT_IDLE_AIM_RIFLE_STIMULATED,
-		ACT_WALK_AIM_RIFLE_STIMULATED,
-		ACT_RUN_AIM_RIFLE_STIMULATED,
-
-		ACT_IDLE_SHOTGUN_RELAXED,
-		ACT_IDLE_SHOTGUN_STIMULATED,
-		ACT_IDLE_SHOTGUN_AGITATED,
-
-		ACT_WALK_ANGRY,
-		ACT_POLICE_HARASS1,
-		ACT_POLICE_HARASS2,
-
-		ACT_IDLE_MANNEDGUN,
-
-		ACT_IDLE_MELEE,
-		ACT_IDLE_ANGRY_MELEE,
-
-		ACT_IDLE_RPG_RELAXED,
-		ACT_IDLE_RPG,
-		ACT_IDLE_ANGRY_RPG,
-		ACT_COVER_LOW_RPG,
-		ACT_WALK_RPG,
-		ACT_RUN_RPG,
-		ACT_WALK_CROUCH_RPG,
-		ACT_RUN_CROUCH_RPG,
-		ACT_WALK_RPG_RELAXED,
-		ACT_RUN_RPG_RELAXED,
-
-		ACT_WALK_RIFLE,
-		ACT_WALK_AIM_RIFLE,
-		ACT_WALK_CROUCH_RIFLE,
-		ACT_WALK_CROUCH_AIM_RIFLE,
-		ACT_RUN_RIFLE,
-		ACT_RUN_AIM_RIFLE,
-		ACT_RUN_CROUCH_RIFLE,
-		ACT_RUN_CROUCH_AIM_RIFLE,
-		ACT_RUN_STEALTH_PISTOL,
-
-		ACT_WALK_AIM_SHOTGUN,
-		ACT_RUN_AIM_SHOTGUN,
-
-		ACT_WALK_PISTOL,
-		ACT_RUN_PISTOL,
-		ACT_WALK_AIM_PISTOL,
-		ACT_RUN_AIM_PISTOL,
-		ACT_WALK_STEALTH_PISTOL,
-		ACT_WALK_AIM_STEALTH_PISTOL,
-		ACT_RUN_AIM_STEALTH_PISTOL,
-
-		ACT_RELOAD_PISTOL,
-		ACT_RELOAD_PISTOL_LOW,
-		ACT_RELOAD_SMG1,
-		ACT_RELOAD_SMG1_LOW,
-		ACT_RELOAD_SHOTGUN,
-		ACT_RELOAD_SHOTGUN_LOW,
-
-		ACT_GESTURE_RELOAD,
-		ACT_GESTURE_RELOAD_PISTOL,
-		ACT_GESTURE_RELOAD_SMG1,
-		ACT_GESTURE_RELOAD_SHOTGUN,
-
-		ACT_BUSY_LEAN_LEFT,
-		ACT_BUSY_LEAN_LEFT_ENTRY,
-		ACT_BUSY_LEAN_LEFT_EXIT,
-		ACT_BUSY_LEAN_BACK,
-		ACT_BUSY_LEAN_BACK_ENTRY,
-		ACT_BUSY_LEAN_BACK_EXIT,
-		ACT_BUSY_SIT_GROUND,
-		ACT_BUSY_SIT_GROUND_ENTRY,
-		ACT_BUSY_SIT_GROUND_EXIT,
-		ACT_BUSY_SIT_CHAIR,
-		ACT_BUSY_SIT_CHAIR_ENTRY,
-		ACT_BUSY_SIT_CHAIR_EXIT,
-		ACT_BUSY_STAND,
-		ACT_BUSY_QUEUE,
-
-		ACT_DUCK_DODGE,
-
-		ACT_DIE_BARNACLE_SWALLOW,
-		ACT_GESTURE_BARNACLE_STRANGLE,
-
-		ACT_PHYSCANNON_DETACH,	             
-		ACT_PHYSCANNON_ANIMATE,                     
-		ACT_PHYSCANNON_ANIMATE_PRE,	                  
-		ACT_PHYSCANNON_ANIMATE_POST,                  
-
-		ACT_DIE_FRONTSIDE,
-		ACT_DIE_RIGHTSIDE,
-		ACT_DIE_BACKSIDE,
-		ACT_DIE_LEFTSIDE,
-
-		ACT_OPEN_DOOR,
-
-		ACT_DI_ALYX_ZOMBIE_MELEE,
-		ACT_DI_ALYX_ZOMBIE_TORSO_MELEE,
-		ACT_DI_ALYX_HEADCRAB_MELEE,
-		ACT_DI_ALYX_ANTLION,
-
-		ACT_DI_ALYX_ZOMBIE_SHOTGUN64,
-		ACT_DI_ALYX_ZOMBIE_SHOTGUN26,
-
-		ACT_READINESS_RELAXED_TO_STIMULATED,
-		ACT_READINESS_RELAXED_TO_STIMULATED_WALK,
-		ACT_READINESS_AGITATED_TO_STIMULATED,
-		ACT_READINESS_STIMULATED_TO_RELAXED,
-
-		ACT_READINESS_PISTOL_RELAXED_TO_STIMULATED,
-		ACT_READINESS_PISTOL_RELAXED_TO_STIMULATED_WALK,
-		ACT_READINESS_PISTOL_AGITATED_TO_STIMULATED,
-		ACT_READINESS_PISTOL_STIMULATED_TO_RELAXED,
-
-		ACT_IDLE_CARRY,
-		ACT_WALK_CARRY,
-
-		ACT_STARTDYING,
-		ACT_DYINGLOOP,
-		ACT_DYINGTODEAD,
-
-		ACT_RIDE_MANNED_GUN,
-
-		ACT_VM_SPRINT_ENTER,
-		ACT_VM_SPRINT_IDLE,
-		ACT_VM_SPRINT_LEAVE,
-
-		ACT_FIRE_START,
-		ACT_FIRE_LOOP,
-		ACT_FIRE_END,
-
-		ACT_CROUCHING_GRENADEIDLE,
-		ACT_CROUCHING_GRENADEREADY,
-		ACT_CROUCHING_PRIMARYATTACK,
-		ACT_OVERLAY_GRENADEIDLE,
-		ACT_OVERLAY_GRENADEREADY,
-		ACT_OVERLAY_PRIMARYATTACK,
-		ACT_OVERLAY_SHIELD_UP,
-		ACT_OVERLAY_SHIELD_DOWN,
-		ACT_OVERLAY_SHIELD_UP_IDLE,
-		ACT_OVERLAY_SHIELD_ATTACK,
-		ACT_OVERLAY_SHIELD_KNOCKBACK,
-		ACT_SHIELD_UP,
-		ACT_SHIELD_DOWN,
-		ACT_SHIELD_UP_IDLE,
-		ACT_SHIELD_ATTACK,
-		ACT_SHIELD_KNOCKBACK,
-		ACT_CROUCHING_SHIELD_UP,
-		ACT_CROUCHING_SHIELD_DOWN,
-		ACT_CROUCHING_SHIELD_UP_IDLE,
-		ACT_CROUCHING_SHIELD_ATTACK,
-		ACT_CROUCHING_SHIELD_KNOCKBACK,
-
-		ACT_TURNRIGHT45,
-		ACT_TURNLEFT45,
-
-		ACT_TURN,
-
-		ACT_OBJ_ASSEMBLING,
-		ACT_OBJ_DISMANTLING,
-		ACT_OBJ_STARTUP,
-		ACT_OBJ_RUNNING,
-		ACT_OBJ_IDLE,
-		ACT_OBJ_PLACING,
-		ACT_OBJ_DETERIORATING,
-		ACT_OBJ_UPGRADING,
-
-		ACT_DEPLOY,
-		ACT_DEPLOY_IDLE,
-		ACT_UNDEPLOY,
-
-			ACT_GRENADE_ROLL,
-			ACT_GRENADE_TOSS,
-
-			ACT_HANDGRENADE_THROW1,
-			ACT_HANDGRENADE_THROW2,
-			ACT_HANDGRENADE_THROW3,
-
-			ACT_SHOTGUN_IDLE_DEEP,
-			ACT_SHOTGUN_IDLE4,
-
-			ACT_GLOCK_SHOOTEMPTY,
-			ACT_GLOCK_SHOOT_RELOAD,
-
-			ACT_RPG_DRAW_UNLOADED,
-			ACT_RPG_HOLSTER_UNLOADED,
-			ACT_RPG_IDLE_UNLOADED,
-			ACT_RPG_FIDGET_UNLOADED,
-
-			ACT_CROSSBOW_DRAW_UNLOADED,
-			ACT_CROSSBOW_IDLE_UNLOADED,
-			ACT_CROSSBOW_FIDGET_UNLOADED,
-
-			ACT_GAUSS_SPINUP,
-			ACT_GAUSS_SPINCYCLE,
-
-			ACT_TRIPMINE_GROUND,
-			ACT_TRIPMINE_WORLD,
-
-			ACT_VM_PRIMARYATTACK_SILENCED,		 
-			ACT_VM_RELOAD_SILENCED,
-			ACT_VM_DRYFIRE_SILENCED,				     
-			ACT_VM_IDLE_SILENCED,
-			ACT_VM_DRAW_SILENCED,
-			ACT_VM_IDLE_EMPTY_LEFT,
-			ACT_VM_DRYFIRE_LEFT,
-
-			ACT_PLAYER_IDLE_FIRE,
-			ACT_PLAYER_CROUCH_FIRE,
-			ACT_PLAYER_CROUCH_WALK_FIRE,
-			ACT_PLAYER_WALK_FIRE,
-			ACT_PLAYER_RUN_FIRE,
-
-			ACT_IDLETORUN,
-			ACT_RUNTOIDLE,
-
-
-			ACT_SPRINT,
-
-			ACT_GET_DOWN_STAND,
-			ACT_GET_UP_STAND,
-			ACT_GET_DOWN_CROUCH,
-			ACT_GET_UP_CROUCH,
-			ACT_PRONE_FORWARD,
-			ACT_PRONE_IDLE,
-
-			ACT_DEEPIDLE1,
-			ACT_DEEPIDLE2,
-			ACT_DEEPIDLE3,
-			ACT_DEEPIDLE4,
-
-			ACT_VM_RELOAD_DEPLOYED,
-			ACT_VM_RELOAD_IDLE,
-
-			ACT_VM_DRAW_DEPLOYED,
-
-			ACT_VM_DRAW_EMPTY,
-			ACT_VM_PRIMARYATTACK_EMPTY,
-			ACT_VM_RELOAD_EMPTY,
-			ACT_VM_IDLE_EMPTY,
-			ACT_VM_IDLE_DEPLOYED_EMPTY,
-
-			ACT_VM_IDLE_8,
-			ACT_VM_IDLE_7,
-			ACT_VM_IDLE_6,
-			ACT_VM_IDLE_5,
-			ACT_VM_IDLE_4,
-			ACT_VM_IDLE_3,
-			ACT_VM_IDLE_2,
-			ACT_VM_IDLE_1,
-
-			ACT_VM_IDLE_DEPLOYED,
-			ACT_VM_IDLE_DEPLOYED_8,
-			ACT_VM_IDLE_DEPLOYED_7,
-			ACT_VM_IDLE_DEPLOYED_6,
-			ACT_VM_IDLE_DEPLOYED_5,
-			ACT_VM_IDLE_DEPLOYED_4,
-			ACT_VM_IDLE_DEPLOYED_3,
-			ACT_VM_IDLE_DEPLOYED_2,
-			ACT_VM_IDLE_DEPLOYED_1,
-
-			ACT_VM_UNDEPLOY,
-			ACT_VM_UNDEPLOY_8,
-			ACT_VM_UNDEPLOY_7,
-			ACT_VM_UNDEPLOY_6,
-			ACT_VM_UNDEPLOY_5,
-			ACT_VM_UNDEPLOY_4,
-			ACT_VM_UNDEPLOY_3,
-			ACT_VM_UNDEPLOY_2,
-			ACT_VM_UNDEPLOY_1,
-			ACT_VM_UNDEPLOY_EMPTY,
-
-			ACT_VM_DEPLOY,
-			ACT_VM_DEPLOY_8,
-			ACT_VM_DEPLOY_7,
-			ACT_VM_DEPLOY_6,
-			ACT_VM_DEPLOY_5,
-			ACT_VM_DEPLOY_4,
-			ACT_VM_DEPLOY_3,
-			ACT_VM_DEPLOY_2,
-			ACT_VM_DEPLOY_1,
-			ACT_VM_DEPLOY_EMPTY,
-
-			ACT_VM_PRIMARYATTACK_8,
-			ACT_VM_PRIMARYATTACK_7,
-			ACT_VM_PRIMARYATTACK_6,
-			ACT_VM_PRIMARYATTACK_5,
-			ACT_VM_PRIMARYATTACK_4,
-			ACT_VM_PRIMARYATTACK_3,
-			ACT_VM_PRIMARYATTACK_2,
-			ACT_VM_PRIMARYATTACK_1,
-
-			ACT_VM_PRIMARYATTACK_DEPLOYED,
-			ACT_VM_PRIMARYATTACK_DEPLOYED_8,
-			ACT_VM_PRIMARYATTACK_DEPLOYED_7,
-			ACT_VM_PRIMARYATTACK_DEPLOYED_6,
-			ACT_VM_PRIMARYATTACK_DEPLOYED_5,
-			ACT_VM_PRIMARYATTACK_DEPLOYED_4,
-			ACT_VM_PRIMARYATTACK_DEPLOYED_3,
-			ACT_VM_PRIMARYATTACK_DEPLOYED_2,
-			ACT_VM_PRIMARYATTACK_DEPLOYED_1,
-			ACT_VM_PRIMARYATTACK_DEPLOYED_EMPTY,
-
-			ACT_DOD_DEPLOYED,
-			ACT_DOD_PRONE_DEPLOYED,
-			ACT_DOD_IDLE_ZOOMED,
-			ACT_DOD_WALK_ZOOMED,
-			ACT_DOD_CROUCH_ZOOMED,
-			ACT_DOD_CROUCHWALK_ZOOMED,
-			ACT_DOD_PRONE_ZOOMED,
-			ACT_DOD_PRONE_FORWARD_ZOOMED,
-			ACT_DOD_PRIMARYATTACK_DEPLOYED,
-			ACT_DOD_PRIMARYATTACK_PRONE_DEPLOYED,
-			ACT_DOD_RELOAD_DEPLOYED,
-			ACT_DOD_RELOAD_PRONE_DEPLOYED,
-			ACT_DOD_PRIMARYATTACK_PRONE,
-			ACT_DOD_SECONDARYATTACK_PRONE,
-			ACT_DOD_RELOAD_CROUCH,
-			ACT_DOD_RELOAD_PRONE,
-			ACT_DOD_STAND_IDLE,
-			ACT_DOD_STAND_AIM,
-			ACT_DOD_CROUCH_IDLE,
-			ACT_DOD_CROUCH_AIM,
-			ACT_DOD_CROUCHWALK_IDLE,
-			ACT_DOD_CROUCHWALK_AIM,
-			ACT_DOD_WALK_IDLE,
-			ACT_DOD_WALK_AIM,
-			ACT_DOD_RUN_IDLE,
-			ACT_DOD_RUN_AIM,
-
-			ACT_DOD_STAND_AIM_PISTOL,
-			ACT_DOD_CROUCH_AIM_PISTOL,
-			ACT_DOD_CROUCHWALK_AIM_PISTOL,
-			ACT_DOD_WALK_AIM_PISTOL,
-			ACT_DOD_RUN_AIM_PISTOL,
-			ACT_DOD_PRONE_AIM_PISTOL,
-			ACT_DOD_STAND_IDLE_PISTOL,
-			ACT_DOD_CROUCH_IDLE_PISTOL,
-			ACT_DOD_CROUCHWALK_IDLE_PISTOL,
-			ACT_DOD_WALK_IDLE_PISTOL,
-			ACT_DOD_RUN_IDLE_PISTOL,
-			ACT_DOD_SPRINT_IDLE_PISTOL,
-			ACT_DOD_PRONEWALK_IDLE_PISTOL,
-
-			ACT_DOD_STAND_AIM_C96,
-			ACT_DOD_CROUCH_AIM_C96,
-			ACT_DOD_CROUCHWALK_AIM_C96,
-			ACT_DOD_WALK_AIM_C96,
-			ACT_DOD_RUN_AIM_C96,
-			ACT_DOD_PRONE_AIM_C96,
-			ACT_DOD_STAND_IDLE_C96,
-			ACT_DOD_CROUCH_IDLE_C96,
-			ACT_DOD_CROUCHWALK_IDLE_C96,
-			ACT_DOD_WALK_IDLE_C96,
-			ACT_DOD_RUN_IDLE_C96,
-			ACT_DOD_SPRINT_IDLE_C96,
-			ACT_DOD_PRONEWALK_IDLE_C96,
-
-			ACT_DOD_STAND_AIM_RIFLE,
-			ACT_DOD_CROUCH_AIM_RIFLE,
-			ACT_DOD_CROUCHWALK_AIM_RIFLE,
-			ACT_DOD_WALK_AIM_RIFLE,
-			ACT_DOD_RUN_AIM_RIFLE,
-			ACT_DOD_PRONE_AIM_RIFLE,
-			ACT_DOD_STAND_IDLE_RIFLE,
-			ACT_DOD_CROUCH_IDLE_RIFLE,
-			ACT_DOD_CROUCHWALK_IDLE_RIFLE,
-			ACT_DOD_WALK_IDLE_RIFLE,
-			ACT_DOD_RUN_IDLE_RIFLE,
-			ACT_DOD_SPRINT_IDLE_RIFLE,
-			ACT_DOD_PRONEWALK_IDLE_RIFLE,
-
-			ACT_DOD_STAND_AIM_BOLT,
-			ACT_DOD_CROUCH_AIM_BOLT,
-			ACT_DOD_CROUCHWALK_AIM_BOLT,
-			ACT_DOD_WALK_AIM_BOLT,
-			ACT_DOD_RUN_AIM_BOLT,
-			ACT_DOD_PRONE_AIM_BOLT,
-			ACT_DOD_STAND_IDLE_BOLT,
-			ACT_DOD_CROUCH_IDLE_BOLT,
-			ACT_DOD_CROUCHWALK_IDLE_BOLT,
-			ACT_DOD_WALK_IDLE_BOLT,
-			ACT_DOD_RUN_IDLE_BOLT,
-			ACT_DOD_SPRINT_IDLE_BOLT,
-			ACT_DOD_PRONEWALK_IDLE_BOLT,
-
-			ACT_DOD_STAND_AIM_TOMMY,
-			ACT_DOD_CROUCH_AIM_TOMMY,
-			ACT_DOD_CROUCHWALK_AIM_TOMMY,
-			ACT_DOD_WALK_AIM_TOMMY,
-			ACT_DOD_RUN_AIM_TOMMY,
-			ACT_DOD_PRONE_AIM_TOMMY,
-			ACT_DOD_STAND_IDLE_TOMMY,
-			ACT_DOD_CROUCH_IDLE_TOMMY,
-			ACT_DOD_CROUCHWALK_IDLE_TOMMY,
-			ACT_DOD_WALK_IDLE_TOMMY,
-			ACT_DOD_RUN_IDLE_TOMMY,
-			ACT_DOD_SPRINT_IDLE_TOMMY,
-			ACT_DOD_PRONEWALK_IDLE_TOMMY,
-
-			ACT_DOD_STAND_AIM_MP40,
-			ACT_DOD_CROUCH_AIM_MP40,
-			ACT_DOD_CROUCHWALK_AIM_MP40,
-			ACT_DOD_WALK_AIM_MP40,
-			ACT_DOD_RUN_AIM_MP40,
-			ACT_DOD_PRONE_AIM_MP40,
-			ACT_DOD_STAND_IDLE_MP40,
-			ACT_DOD_CROUCH_IDLE_MP40,
-			ACT_DOD_CROUCHWALK_IDLE_MP40,
-			ACT_DOD_WALK_IDLE_MP40,
-			ACT_DOD_RUN_IDLE_MP40,
-			ACT_DOD_SPRINT_IDLE_MP40,
-			ACT_DOD_PRONEWALK_IDLE_MP40,
-
-			ACT_DOD_STAND_AIM_MP44,
-			ACT_DOD_CROUCH_AIM_MP44,
-			ACT_DOD_CROUCHWALK_AIM_MP44,
-			ACT_DOD_WALK_AIM_MP44,
-			ACT_DOD_RUN_AIM_MP44,
-			ACT_DOD_PRONE_AIM_MP44,
-			ACT_DOD_STAND_IDLE_MP44,
-			ACT_DOD_CROUCH_IDLE_MP44,
-			ACT_DOD_CROUCHWALK_IDLE_MP44,
-			ACT_DOD_WALK_IDLE_MP44,
-			ACT_DOD_RUN_IDLE_MP44,
-			ACT_DOD_SPRINT_IDLE_MP44,
-			ACT_DOD_PRONEWALK_IDLE_MP44,
-
-			ACT_DOD_STAND_AIM_GREASE,
-			ACT_DOD_CROUCH_AIM_GREASE,
-			ACT_DOD_CROUCHWALK_AIM_GREASE,
-			ACT_DOD_WALK_AIM_GREASE,
-			ACT_DOD_RUN_AIM_GREASE,
-			ACT_DOD_PRONE_AIM_GREASE,
-			ACT_DOD_STAND_IDLE_GREASE,
-			ACT_DOD_CROUCH_IDLE_GREASE,
-			ACT_DOD_CROUCHWALK_IDLE_GREASE,
-			ACT_DOD_WALK_IDLE_GREASE,
-			ACT_DOD_RUN_IDLE_GREASE,
-			ACT_DOD_SPRINT_IDLE_GREASE,
-			ACT_DOD_PRONEWALK_IDLE_GREASE,
-
-			ACT_DOD_STAND_AIM_MG,
-			ACT_DOD_CROUCH_AIM_MG,
-			ACT_DOD_CROUCHWALK_AIM_MG,
-			ACT_DOD_WALK_AIM_MG,
-			ACT_DOD_RUN_AIM_MG,
-			ACT_DOD_PRONE_AIM_MG,
-			ACT_DOD_STAND_IDLE_MG,
-			ACT_DOD_CROUCH_IDLE_MG,
-			ACT_DOD_CROUCHWALK_IDLE_MG,
-			ACT_DOD_WALK_IDLE_MG,
-			ACT_DOD_RUN_IDLE_MG,
-			ACT_DOD_SPRINT_IDLE_MG,
-			ACT_DOD_PRONEWALK_IDLE_MG,
-
-			ACT_DOD_STAND_AIM_30CAL,
-			ACT_DOD_CROUCH_AIM_30CAL,
-			ACT_DOD_CROUCHWALK_AIM_30CAL,
-			ACT_DOD_WALK_AIM_30CAL,
-			ACT_DOD_RUN_AIM_30CAL,
-			ACT_DOD_PRONE_AIM_30CAL,
-			ACT_DOD_STAND_IDLE_30CAL,
-			ACT_DOD_CROUCH_IDLE_30CAL,
-			ACT_DOD_CROUCHWALK_IDLE_30CAL,
-			ACT_DOD_WALK_IDLE_30CAL,
-			ACT_DOD_RUN_IDLE_30CAL,
-			ACT_DOD_SPRINT_IDLE_30CAL,
-			ACT_DOD_PRONEWALK_IDLE_30CAL,
-
-			ACT_DOD_STAND_AIM_GREN_FRAG,
-			ACT_DOD_CROUCH_AIM_GREN_FRAG,
-			ACT_DOD_CROUCHWALK_AIM_GREN_FRAG,
-			ACT_DOD_WALK_AIM_GREN_FRAG,
-			ACT_DOD_RUN_AIM_GREN_FRAG,
-			ACT_DOD_PRONE_AIM_GREN_FRAG,
-			ACT_DOD_SPRINT_AIM_GREN_FRAG,
-			ACT_DOD_PRONEWALK_AIM_GREN_FRAG,
-			ACT_DOD_STAND_AIM_GREN_STICK,
-			ACT_DOD_CROUCH_AIM_GREN_STICK,
-			ACT_DOD_CROUCHWALK_AIM_GREN_STICK,
-			ACT_DOD_WALK_AIM_GREN_STICK,
-			ACT_DOD_RUN_AIM_GREN_STICK,
-			ACT_DOD_PRONE_AIM_GREN_STICK,
-			ACT_DOD_SPRINT_AIM_GREN_STICK,
-			ACT_DOD_PRONEWALK_AIM_GREN_STICK,
-
-			ACT_DOD_STAND_AIM_KNIFE,
-			ACT_DOD_CROUCH_AIM_KNIFE,
-			ACT_DOD_CROUCHWALK_AIM_KNIFE,
-			ACT_DOD_WALK_AIM_KNIFE,
-			ACT_DOD_RUN_AIM_KNIFE,
-			ACT_DOD_PRONE_AIM_KNIFE,
-			ACT_DOD_SPRINT_AIM_KNIFE,
-			ACT_DOD_PRONEWALK_AIM_KNIFE,
-
-			ACT_DOD_STAND_AIM_SPADE,
-			ACT_DOD_CROUCH_AIM_SPADE,
-			ACT_DOD_CROUCHWALK_AIM_SPADE,
-			ACT_DOD_WALK_AIM_SPADE,
-			ACT_DOD_RUN_AIM_SPADE,
-			ACT_DOD_PRONE_AIM_SPADE,
-			ACT_DOD_SPRINT_AIM_SPADE,
-			ACT_DOD_PRONEWALK_AIM_SPADE,
-
-			ACT_DOD_STAND_AIM_BAZOOKA,
-			ACT_DOD_CROUCH_AIM_BAZOOKA,
-			ACT_DOD_CROUCHWALK_AIM_BAZOOKA,
-			ACT_DOD_WALK_AIM_BAZOOKA,
-			ACT_DOD_RUN_AIM_BAZOOKA,
-			ACT_DOD_PRONE_AIM_BAZOOKA,
-			ACT_DOD_STAND_IDLE_BAZOOKA,
-			ACT_DOD_CROUCH_IDLE_BAZOOKA,
-			ACT_DOD_CROUCHWALK_IDLE_BAZOOKA,
-			ACT_DOD_WALK_IDLE_BAZOOKA,
-			ACT_DOD_RUN_IDLE_BAZOOKA,
-			ACT_DOD_SPRINT_IDLE_BAZOOKA,
-			ACT_DOD_PRONEWALK_IDLE_BAZOOKA,
-
-			ACT_DOD_STAND_AIM_PSCHRECK,
-			ACT_DOD_CROUCH_AIM_PSCHRECK,
-			ACT_DOD_CROUCHWALK_AIM_PSCHRECK,
-			ACT_DOD_WALK_AIM_PSCHRECK,
-			ACT_DOD_RUN_AIM_PSCHRECK,
-			ACT_DOD_PRONE_AIM_PSCHRECK,
-			ACT_DOD_STAND_IDLE_PSCHRECK,
-			ACT_DOD_CROUCH_IDLE_PSCHRECK,
-			ACT_DOD_CROUCHWALK_IDLE_PSCHRECK,
-			ACT_DOD_WALK_IDLE_PSCHRECK,
-			ACT_DOD_RUN_IDLE_PSCHRECK,
-			ACT_DOD_SPRINT_IDLE_PSCHRECK,
-			ACT_DOD_PRONEWALK_IDLE_PSCHRECK,
-
-			ACT_DOD_STAND_AIM_BAR,
-			ACT_DOD_CROUCH_AIM_BAR,
-			ACT_DOD_CROUCHWALK_AIM_BAR,
-			ACT_DOD_WALK_AIM_BAR,
-			ACT_DOD_RUN_AIM_BAR,
-			ACT_DOD_PRONE_AIM_BAR,
-			ACT_DOD_STAND_IDLE_BAR,
-			ACT_DOD_CROUCH_IDLE_BAR,
-			ACT_DOD_CROUCHWALK_IDLE_BAR,
-			ACT_DOD_WALK_IDLE_BAR,
-			ACT_DOD_RUN_IDLE_BAR,
-			ACT_DOD_SPRINT_IDLE_BAR,
-			ACT_DOD_PRONEWALK_IDLE_BAR,
-
-			ACT_DOD_STAND_ZOOM_RIFLE,
-			ACT_DOD_CROUCH_ZOOM_RIFLE,
-			ACT_DOD_CROUCHWALK_ZOOM_RIFLE,
-			ACT_DOD_WALK_ZOOM_RIFLE,
-			ACT_DOD_RUN_ZOOM_RIFLE,
-			ACT_DOD_PRONE_ZOOM_RIFLE,
-
-			ACT_DOD_STAND_ZOOM_BOLT,
-			ACT_DOD_CROUCH_ZOOM_BOLT,
-			ACT_DOD_CROUCHWALK_ZOOM_BOLT,
-			ACT_DOD_WALK_ZOOM_BOLT,
-			ACT_DOD_RUN_ZOOM_BOLT,
-			ACT_DOD_PRONE_ZOOM_BOLT,
-
-			ACT_DOD_STAND_ZOOM_BAZOOKA,
-			ACT_DOD_CROUCH_ZOOM_BAZOOKA,
-			ACT_DOD_CROUCHWALK_ZOOM_BAZOOKA,
-			ACT_DOD_WALK_ZOOM_BAZOOKA,
-			ACT_DOD_RUN_ZOOM_BAZOOKA,
-			ACT_DOD_PRONE_ZOOM_BAZOOKA,
-
-			ACT_DOD_STAND_ZOOM_PSCHRECK,
-			ACT_DOD_CROUCH_ZOOM_PSCHRECK,
-			ACT_DOD_CROUCHWALK_ZOOM_PSCHRECK,
-			ACT_DOD_WALK_ZOOM_PSCHRECK,
-			ACT_DOD_RUN_ZOOM_PSCHRECK,
-			ACT_DOD_PRONE_ZOOM_PSCHRECK,
-
-			ACT_DOD_DEPLOY_RIFLE,
-			ACT_DOD_DEPLOY_TOMMY,
-			ACT_DOD_DEPLOY_MG,
-			ACT_DOD_DEPLOY_30CAL,
-
-			ACT_DOD_PRONE_DEPLOY_RIFLE,
-			ACT_DOD_PRONE_DEPLOY_TOMMY,
-			ACT_DOD_PRONE_DEPLOY_MG,
-			ACT_DOD_PRONE_DEPLOY_30CAL,
-
-			ACT_DOD_PRIMARYATTACK_RIFLE,
-			ACT_DOD_SECONDARYATTACK_RIFLE,
-			ACT_DOD_PRIMARYATTACK_PRONE_RIFLE,
-			ACT_DOD_SECONDARYATTACK_PRONE_RIFLE,
-			ACT_DOD_PRIMARYATTACK_PRONE_DEPLOYED_RIFLE,
-			ACT_DOD_PRIMARYATTACK_DEPLOYED_RIFLE,
-
-			ACT_DOD_PRIMARYATTACK_BOLT,
-			ACT_DOD_SECONDARYATTACK_BOLT,
-			ACT_DOD_PRIMARYATTACK_PRONE_BOLT,
-			ACT_DOD_SECONDARYATTACK_PRONE_BOLT,
-
-			ACT_DOD_PRIMARYATTACK_TOMMY,
-			ACT_DOD_PRIMARYATTACK_PRONE_TOMMY,
-			ACT_DOD_SECONDARYATTACK_TOMMY,
-			ACT_DOD_SECONDARYATTACK_PRONE_TOMMY,
-
-			ACT_DOD_PRIMARYATTACK_MP40,
-			ACT_DOD_PRIMARYATTACK_PRONE_MP40,
-			ACT_DOD_SECONDARYATTACK_MP40,
-			ACT_DOD_SECONDARYATTACK_PRONE_MP40,
-
-			ACT_DOD_PRIMARYATTACK_MP44,
-			ACT_DOD_PRIMARYATTACK_PRONE_MP44,
-
-			ACT_DOD_PRIMARYATTACK_GREASE,
-			ACT_DOD_PRIMARYATTACK_PRONE_GREASE,
-
-			ACT_DOD_PRIMARYATTACK_PISTOL,
-			ACT_DOD_PRIMARYATTACK_PRONE_PISTOL,
-			ACT_DOD_PRIMARYATTACK_C96,
-			ACT_DOD_PRIMARYATTACK_PRONE_C96,
-
-			ACT_DOD_PRIMARYATTACK_MG,
-			ACT_DOD_PRIMARYATTACK_PRONE_MG,
-			ACT_DOD_PRIMARYATTACK_PRONE_DEPLOYED_MG,
-			ACT_DOD_PRIMARYATTACK_DEPLOYED_MG,
-
-			ACT_DOD_PRIMARYATTACK_30CAL,
-			ACT_DOD_PRIMARYATTACK_PRONE_30CAL,
-			ACT_DOD_PRIMARYATTACK_DEPLOYED_30CAL,
-			ACT_DOD_PRIMARYATTACK_PRONE_DEPLOYED_30CAL,
-
-			ACT_DOD_PRIMARYATTACK_GREN_FRAG,
-			ACT_DOD_PRIMARYATTACK_PRONE_GREN_FRAG,
-			ACT_DOD_PRIMARYATTACK_GREN_STICK,
-			ACT_DOD_PRIMARYATTACK_PRONE_GREN_STICK,
-
-			ACT_DOD_PRIMARYATTACK_KNIFE,
-			ACT_DOD_PRIMARYATTACK_PRONE_KNIFE,
-
-			ACT_DOD_PRIMARYATTACK_SPADE,
-			ACT_DOD_PRIMARYATTACK_PRONE_SPADE,
-
-			ACT_DOD_PRIMARYATTACK_BAZOOKA,
-			ACT_DOD_PRIMARYATTACK_PRONE_BAZOOKA,
-
-			ACT_DOD_PRIMARYATTACK_PSCHRECK,
-			ACT_DOD_PRIMARYATTACK_PRONE_PSCHRECK,
-
-			ACT_DOD_PRIMARYATTACK_BAR,
-			ACT_DOD_PRIMARYATTACK_PRONE_BAR,
-
-			ACT_DOD_RELOAD_GARAND,
-			ACT_DOD_RELOAD_K43,
-			ACT_DOD_RELOAD_BAR,
-			ACT_DOD_RELOAD_MP40,
-			ACT_DOD_RELOAD_MP44,
-			ACT_DOD_RELOAD_BOLT,
-			ACT_DOD_RELOAD_M1CARBINE,
-			ACT_DOD_RELOAD_TOMMY,
-			ACT_DOD_RELOAD_GREASEGUN,
-			ACT_DOD_RELOAD_PISTOL,
-			ACT_DOD_RELOAD_FG42,
-			ACT_DOD_RELOAD_RIFLE,
-			ACT_DOD_RELOAD_RIFLEGRENADE,
-			ACT_DOD_RELOAD_C96,
-
-			ACT_DOD_RELOAD_CROUCH_BAR,
-			ACT_DOD_RELOAD_CROUCH_RIFLE,
-			ACT_DOD_RELOAD_CROUCH_RIFLEGRENADE,
-			ACT_DOD_RELOAD_CROUCH_BOLT,
-			ACT_DOD_RELOAD_CROUCH_MP44,
-			ACT_DOD_RELOAD_CROUCH_MP40,
-			ACT_DOD_RELOAD_CROUCH_TOMMY,
-			ACT_DOD_RELOAD_CROUCH_BAZOOKA,
-			ACT_DOD_RELOAD_CROUCH_PSCHRECK,
-			ACT_DOD_RELOAD_CROUCH_PISTOL,
-			ACT_DOD_RELOAD_CROUCH_M1CARBINE,
-			ACT_DOD_RELOAD_CROUCH_C96,
-
-			ACT_DOD_RELOAD_BAZOOKA,
-			ACT_DOD_ZOOMLOAD_BAZOOKA,
-			ACT_DOD_RELOAD_PSCHRECK,
-			ACT_DOD_ZOOMLOAD_PSCHRECK,
-
-			ACT_DOD_RELOAD_DEPLOYED_FG42,
-			ACT_DOD_RELOAD_DEPLOYED_30CAL,
-			ACT_DOD_RELOAD_DEPLOYED_MG,
-			ACT_DOD_RELOAD_DEPLOYED_MG34,
-			ACT_DOD_RELOAD_DEPLOYED_BAR,
-
-			ACT_DOD_RELOAD_PRONE_PISTOL,
-			ACT_DOD_RELOAD_PRONE_GARAND,
-			ACT_DOD_RELOAD_PRONE_M1CARBINE,
-			ACT_DOD_RELOAD_PRONE_BOLT,
-			ACT_DOD_RELOAD_PRONE_K43,
-			ACT_DOD_RELOAD_PRONE_MP40,
-			ACT_DOD_RELOAD_PRONE_MP44,
-			ACT_DOD_RELOAD_PRONE_BAR,
-			ACT_DOD_RELOAD_PRONE_GREASEGUN,
-			ACT_DOD_RELOAD_PRONE_TOMMY,
-			ACT_DOD_RELOAD_PRONE_FG42,
-			ACT_DOD_RELOAD_PRONE_RIFLE,
-			ACT_DOD_RELOAD_PRONE_RIFLEGRENADE,
-			ACT_DOD_RELOAD_PRONE_C96,
-
-			ACT_DOD_RELOAD_PRONE_BAZOOKA,
-			ACT_DOD_ZOOMLOAD_PRONE_BAZOOKA,
-			ACT_DOD_RELOAD_PRONE_PSCHRECK,
-			ACT_DOD_ZOOMLOAD_PRONE_PSCHRECK,
-
-			ACT_DOD_RELOAD_PRONE_DEPLOYED_BAR,
-			ACT_DOD_RELOAD_PRONE_DEPLOYED_FG42,
-			ACT_DOD_RELOAD_PRONE_DEPLOYED_30CAL,
-			ACT_DOD_RELOAD_PRONE_DEPLOYED_MG,
-			ACT_DOD_RELOAD_PRONE_DEPLOYED_MG34,
-
-			ACT_DOD_PRONE_ZOOM_FORWARD_RIFLE,
-			ACT_DOD_PRONE_ZOOM_FORWARD_BOLT,
-			ACT_DOD_PRONE_ZOOM_FORWARD_BAZOOKA,
-			ACT_DOD_PRONE_ZOOM_FORWARD_PSCHRECK,
-
-			ACT_DOD_PRIMARYATTACK_CROUCH,
-			ACT_DOD_PRIMARYATTACK_CROUCH_SPADE,
-			ACT_DOD_PRIMARYATTACK_CROUCH_KNIFE,
-			ACT_DOD_PRIMARYATTACK_CROUCH_GREN_FRAG,
-			ACT_DOD_PRIMARYATTACK_CROUCH_GREN_STICK,
-			ACT_DOD_SECONDARYATTACK_CROUCH,
-			ACT_DOD_SECONDARYATTACK_CROUCH_TOMMY,
-			ACT_DOD_SECONDARYATTACK_CROUCH_MP40,
-
-			ACT_DOD_HS_IDLE,
-			ACT_DOD_HS_CROUCH,
-			ACT_DOD_HS_IDLE_30CAL,
-			ACT_DOD_HS_IDLE_BAZOOKA,
-			ACT_DOD_HS_IDLE_PSCHRECK,
-			ACT_DOD_HS_IDLE_KNIFE,
-			ACT_DOD_HS_IDLE_MG42,
-			ACT_DOD_HS_IDLE_PISTOL,
-			ACT_DOD_HS_IDLE_STICKGRENADE,
-			ACT_DOD_HS_IDLE_TOMMY,
-			ACT_DOD_HS_IDLE_MP44,
-			ACT_DOD_HS_IDLE_K98,
-			ACT_DOD_HS_CROUCH_30CAL,
-			ACT_DOD_HS_CROUCH_BAZOOKA,
-			ACT_DOD_HS_CROUCH_PSCHRECK,
-			ACT_DOD_HS_CROUCH_KNIFE,
-			ACT_DOD_HS_CROUCH_MG42,
-			ACT_DOD_HS_CROUCH_PISTOL,
-			ACT_DOD_HS_CROUCH_STICKGRENADE,
-			ACT_DOD_HS_CROUCH_TOMMY,
-			ACT_DOD_HS_CROUCH_MP44,
-			ACT_DOD_HS_CROUCH_K98,
-
-			ACT_DOD_STAND_IDLE_TNT,
-			ACT_DOD_CROUCH_IDLE_TNT,
-			ACT_DOD_CROUCHWALK_IDLE_TNT,
-			ACT_DOD_WALK_IDLE_TNT,
-			ACT_DOD_RUN_IDLE_TNT,
-			ACT_DOD_SPRINT_IDLE_TNT,
-			ACT_DOD_PRONEWALK_IDLE_TNT,
-
-			ACT_DOD_PLANT_TNT,
-			ACT_DOD_DEFUSE_TNT,
-
-			ACT_HL2MP_IDLE,
-			ACT_HL2MP_RUN,
-			ACT_HL2MP_IDLE_CROUCH,
-			ACT_HL2MP_WALK_CROUCH,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK,
-			ACT_HL2MP_GESTURE_RELOAD,
-			ACT_HL2MP_JUMP,
-
-			ACT_HL2MP_IDLE_PISTOL,
-			ACT_HL2MP_RUN_PISTOL,
-			ACT_HL2MP_IDLE_CROUCH_PISTOL,
-			ACT_HL2MP_WALK_CROUCH_PISTOL,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK_PISTOL,
-			ACT_HL2MP_GESTURE_RELOAD_PISTOL,
-			ACT_HL2MP_JUMP_PISTOL,
-
-			ACT_HL2MP_IDLE_SMG1,
-			ACT_HL2MP_RUN_SMG1,
-			ACT_HL2MP_IDLE_CROUCH_SMG1,
-			ACT_HL2MP_WALK_CROUCH_SMG1,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK_SMG1,
-			ACT_HL2MP_GESTURE_RELOAD_SMG1,
-			ACT_HL2MP_JUMP_SMG1,
-
-			ACT_HL2MP_IDLE_AR2,
-			ACT_HL2MP_RUN_AR2,
-			ACT_HL2MP_IDLE_CROUCH_AR2,
-			ACT_HL2MP_WALK_CROUCH_AR2,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK_AR2,
-			ACT_HL2MP_GESTURE_RELOAD_AR2,
-			ACT_HL2MP_JUMP_AR2,
-
-			ACT_HL2MP_IDLE_SHOTGUN,
-			ACT_HL2MP_RUN_SHOTGUN,
-			ACT_HL2MP_IDLE_CROUCH_SHOTGUN,
-			ACT_HL2MP_WALK_CROUCH_SHOTGUN,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK_SHOTGUN,
-			ACT_HL2MP_GESTURE_RELOAD_SHOTGUN,
-			ACT_HL2MP_JUMP_SHOTGUN,
-
-			ACT_HL2MP_IDLE_RPG,
-			ACT_HL2MP_RUN_RPG,
-			ACT_HL2MP_IDLE_CROUCH_RPG,
-			ACT_HL2MP_WALK_CROUCH_RPG,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK_RPG,
-			ACT_HL2MP_GESTURE_RELOAD_RPG,
-			ACT_HL2MP_JUMP_RPG,
-
-			ACT_HL2MP_IDLE_GRENADE,
-			ACT_HL2MP_RUN_GRENADE,
-			ACT_HL2MP_IDLE_CROUCH_GRENADE,
-			ACT_HL2MP_WALK_CROUCH_GRENADE,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK_GRENADE,
-			ACT_HL2MP_GESTURE_RELOAD_GRENADE,
-			ACT_HL2MP_JUMP_GRENADE,
-
-			ACT_HL2MP_IDLE_PHYSGUN,
-			ACT_HL2MP_RUN_PHYSGUN,
-			ACT_HL2MP_IDLE_CROUCH_PHYSGUN,
-			ACT_HL2MP_WALK_CROUCH_PHYSGUN,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK_PHYSGUN,
-			ACT_HL2MP_GESTURE_RELOAD_PHYSGUN,
-			ACT_HL2MP_JUMP_PHYSGUN,
-
-			ACT_HL2MP_IDLE_CROSSBOW,
-			ACT_HL2MP_RUN_CROSSBOW,
-			ACT_HL2MP_IDLE_CROUCH_CROSSBOW,
-			ACT_HL2MP_WALK_CROUCH_CROSSBOW,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK_CROSSBOW,
-			ACT_HL2MP_GESTURE_RELOAD_CROSSBOW,
-			ACT_HL2MP_JUMP_CROSSBOW,
-
-			ACT_HL2MP_IDLE_MELEE,
-			ACT_HL2MP_RUN_MELEE,
-			ACT_HL2MP_IDLE_CROUCH_MELEE,
-			ACT_HL2MP_WALK_CROUCH_MELEE,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK_MELEE,
-			ACT_HL2MP_GESTURE_RELOAD_MELEE,
-			ACT_HL2MP_JUMP_MELEE,
-
-			ACT_HL2MP_IDLE_SLAM,
-			ACT_HL2MP_RUN_SLAM,
-			ACT_HL2MP_IDLE_CROUCH_SLAM,
-			ACT_HL2MP_WALK_CROUCH_SLAM,
-			ACT_HL2MP_GESTURE_RANGE_ATTACK_SLAM,
-			ACT_HL2MP_GESTURE_RELOAD_SLAM,
-			ACT_HL2MP_JUMP_SLAM,
-
-			ACT_VM_FIZZLE,
-
-			ACT_MP_STAND_IDLE,
-			ACT_MP_CROUCH_IDLE,
-			ACT_MP_CROUCH_DEPLOYED_IDLE,
-			ACT_MP_CROUCH_DEPLOYED,
-			ACT_MP_CROUCHWALK_DEPLOYED,
-			ACT_MP_DEPLOYED_IDLE,
-			ACT_MP_RUN,
-			ACT_MP_WALK,
-			ACT_MP_AIRWALK,
-			ACT_MP_CROUCHWALK,
-			ACT_MP_SPRINT,
-			ACT_MP_JUMP,
-			ACT_MP_JUMP_START,
-			ACT_MP_JUMP_FLOAT,
-			ACT_MP_JUMP_LAND,
-			ACT_MP_DOUBLEJUMP,
-			ACT_MP_SWIM,
-			ACT_MP_DEPLOYED,
-			ACT_MP_SWIM_DEPLOYED,
-			ACT_MP_VCD,
-
-			ACT_MP_ATTACK_STAND_PRIMARYFIRE,
-			ACT_MP_ATTACK_STAND_PRIMARYFIRE_DEPLOYED,
-			ACT_MP_ATTACK_STAND_SECONDARYFIRE,
-			ACT_MP_ATTACK_STAND_GRENADE,
-			ACT_MP_ATTACK_CROUCH_PRIMARYFIRE,
-			ACT_MP_ATTACK_CROUCH_PRIMARYFIRE_DEPLOYED,
-			ACT_MP_ATTACK_CROUCH_SECONDARYFIRE,
-			ACT_MP_ATTACK_CROUCH_GRENADE,
-			ACT_MP_ATTACK_SWIM_PRIMARYFIRE,
-			ACT_MP_ATTACK_SWIM_SECONDARYFIRE,
-			ACT_MP_ATTACK_SWIM_GRENADE,
-			ACT_MP_ATTACK_AIRWALK_PRIMARYFIRE,
-			ACT_MP_ATTACK_AIRWALK_SECONDARYFIRE,
-			ACT_MP_ATTACK_AIRWALK_GRENADE,
-			ACT_MP_RELOAD_STAND,
-			ACT_MP_RELOAD_STAND_LOOP,
-			ACT_MP_RELOAD_STAND_END,
-			ACT_MP_RELOAD_CROUCH,
-			ACT_MP_RELOAD_CROUCH_LOOP,
-			ACT_MP_RELOAD_CROUCH_END,
-			ACT_MP_RELOAD_SWIM,
-			ACT_MP_RELOAD_SWIM_LOOP,
-			ACT_MP_RELOAD_SWIM_END,
-			ACT_MP_RELOAD_AIRWALK,
-			ACT_MP_RELOAD_AIRWALK_LOOP,
-			ACT_MP_RELOAD_AIRWALK_END,
-			ACT_MP_ATTACK_STAND_PREFIRE,
-			ACT_MP_ATTACK_STAND_POSTFIRE,
-			ACT_MP_ATTACK_STAND_STARTFIRE,
-			ACT_MP_ATTACK_CROUCH_PREFIRE,
-			ACT_MP_ATTACK_CROUCH_POSTFIRE,
-			ACT_MP_ATTACK_SWIM_PREFIRE,
-			ACT_MP_ATTACK_SWIM_POSTFIRE,
-
-			ACT_MP_STAND_PRIMARY,
-			ACT_MP_CROUCH_PRIMARY,
-			ACT_MP_RUN_PRIMARY,
-			ACT_MP_WALK_PRIMARY,
-			ACT_MP_AIRWALK_PRIMARY,
-			ACT_MP_CROUCHWALK_PRIMARY,
-			ACT_MP_JUMP_PRIMARY,
-			ACT_MP_JUMP_START_PRIMARY,
-			ACT_MP_JUMP_FLOAT_PRIMARY,
-			ACT_MP_JUMP_LAND_PRIMARY,
-			ACT_MP_SWIM_PRIMARY,
-			ACT_MP_DEPLOYED_PRIMARY,
-			ACT_MP_SWIM_DEPLOYED_PRIMARY,
-			ACT_MP_CROUCHWALK_DEPLOYED_PRIMARY,
-			ACT_MP_CROUCH_DEPLOYED_IDLE_PRIMARY,
-
-			ACT_MP_ATTACK_STAND_PRIMARY,		  
-			ACT_MP_ATTACK_STAND_PRIMARY_DEPLOYED,
-			ACT_MP_ATTACK_CROUCH_PRIMARY,		 
-			ACT_MP_ATTACK_CROUCH_PRIMARY_DEPLOYED,
-			ACT_MP_ATTACK_SWIM_PRIMARY,
-			ACT_MP_ATTACK_AIRWALK_PRIMARY,
-
-			ACT_MP_RELOAD_STAND_PRIMARY,		  
-			ACT_MP_RELOAD_STAND_PRIMARY_LOOP,
-			ACT_MP_RELOAD_STAND_PRIMARY_END,
-			ACT_MP_RELOAD_CROUCH_PRIMARY,		 
-			ACT_MP_RELOAD_CROUCH_PRIMARY_LOOP,
-			ACT_MP_RELOAD_CROUCH_PRIMARY_END,
-			ACT_MP_RELOAD_SWIM_PRIMARY,
-			ACT_MP_RELOAD_SWIM_PRIMARY_LOOP,
-			ACT_MP_RELOAD_SWIM_PRIMARY_END,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY_LOOP,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY_END,
-
-			ACT_MP_RELOAD_STAND_PRIMARY_2,
-			ACT_MP_RELOAD_STAND_PRIMARY_LOOP_2,
-			ACT_MP_RELOAD_STAND_PRIMARY_END_2,
-			ACT_MP_RELOAD_CROUCH_PRIMARY_2,
-			ACT_MP_RELOAD_CROUCH_PRIMARY_LOOP_2,
-			ACT_MP_RELOAD_CROUCH_PRIMARY_END_2,
-			ACT_MP_RELOAD_SWIM_PRIMARY_2,
-			ACT_MP_RELOAD_SWIM_PRIMARY_LOOP_2,
-			ACT_MP_RELOAD_SWIM_PRIMARY_END_2,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY_2,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY_LOOP_2,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY_END_2,
-
-			ACT_MP_ATTACK_STAND_PRIMARY_ALT,
-			ACT_MP_ATTACK_CROUCH_PRIMARY_ALT,
-			ACT_MP_ATTACK_SWIM_PRIMARY_ALT,
-			ACT_MP_RELOAD_STAND_PRIMARY_ALT,
-			ACT_MP_RELOAD_CROUCH_PRIMARY_ALT,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY_ALT,
-			ACT_MP_RELOAD_STAND_PRIMARY_LOOP_ALT,
-			ACT_MP_RELOAD_CROUCH_PRIMARY_LOOP_ALT,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY_LOOP_ALT,
-			ACT_MP_RELOAD_STAND_PRIMARY_END_ALT,
-			ACT_MP_RELOAD_CROUCH_PRIMARY_END_ALT,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY_END_ALT,
-			ACT_MP_RELOAD_SWIM_PRIMARY_ALT,
-			ACT_MP_ATTACK_STAND_PRIMARY_SUPER,
-			ACT_MP_ATTACK_CROUCH_PRIMARY_SUPER,
-			ACT_MP_ATTACK_SWIM_PRIMARY_SUPER,
-
-			ACT_MP_ATTACK_STAND_GRENADE_PRIMARY,		  
-			ACT_MP_ATTACK_CROUCH_GRENADE_PRIMARY,		 
-			ACT_MP_ATTACK_SWIM_GRENADE_PRIMARY,
-			ACT_MP_ATTACK_AIRWALK_GRENADE_PRIMARY,
-
-			ACT_MP_STAND_SECONDARY,
-			ACT_MP_CROUCH_SECONDARY,
-			ACT_MP_RUN_SECONDARY,
-			ACT_MP_WALK_SECONDARY,
-			ACT_MP_AIRWALK_SECONDARY,
-			ACT_MP_CROUCHWALK_SECONDARY,
-			ACT_MP_JUMP_SECONDARY,
-			ACT_MP_JUMP_START_SECONDARY,
-			ACT_MP_JUMP_FLOAT_SECONDARY,
-			ACT_MP_JUMP_LAND_SECONDARY,
-			ACT_MP_SWIM_SECONDARY,
-
-			ACT_MP_ATTACK_STAND_SECONDARY,		  
-			ACT_MP_ATTACK_CROUCH_SECONDARY,		 
-			ACT_MP_ATTACK_SWIM_SECONDARY,
-			ACT_MP_ATTACK_AIRWALK_SECONDARY,
-
-			ACT_MP_RELOAD_STAND_SECONDARY,		  
-			ACT_MP_RELOAD_STAND_SECONDARY_LOOP,
-			ACT_MP_RELOAD_STAND_SECONDARY_END,
-			ACT_MP_RELOAD_CROUCH_SECONDARY,		 
-			ACT_MP_RELOAD_CROUCH_SECONDARY_LOOP,
-			ACT_MP_RELOAD_CROUCH_SECONDARY_END,
-			ACT_MP_RELOAD_SWIM_SECONDARY,
-			ACT_MP_RELOAD_SWIM_SECONDARY_LOOP,
-			ACT_MP_RELOAD_SWIM_SECONDARY_END,
-			ACT_MP_RELOAD_AIRWALK_SECONDARY,
-			ACT_MP_RELOAD_AIRWALK_SECONDARY_LOOP,
-			ACT_MP_RELOAD_AIRWALK_SECONDARY_END,
-
-			ACT_MP_RELOAD_STAND_SECONDARY_2,
-			ACT_MP_RELOAD_CROUCH_SECONDARY_2,
-			ACT_MP_RELOAD_SWIM_SECONDARY_2,
-			ACT_MP_RELOAD_AIRWALK_SECONDARY_2,
-
-			ACT_MP_ATTACK_STAND_GRENADE_SECONDARY,		  
-			ACT_MP_ATTACK_CROUCH_GRENADE_SECONDARY,		 
-			ACT_MP_ATTACK_SWIM_GRENADE_SECONDARY,
-			ACT_MP_ATTACK_AIRWALK_GRENADE_SECONDARY,
-
-			ACT_MP_STAND_SECONDARY2,
-			ACT_MP_CROUCH_SECONDARY2,
-			ACT_MP_RUN_SECONDARY2,
-			ACT_MP_WALK_SECONDARY2,
-			ACT_MP_AIRWALK_SECONDARY2,
-			ACT_MP_CROUCHWALK_SECONDARY2,
-			ACT_MP_JUMP_SECONDARY2,
-			ACT_MP_JUMP_START_SECONDARY2,
-			ACT_MP_JUMP_FLOAT_SECONDARY2,
-			ACT_MP_JUMP_LAND_SECONDARY2,
-			ACT_MP_SWIM_SECONDARY2,
-
-			ACT_MP_ATTACK_STAND_SECONDARY2,		  
-			ACT_MP_ATTACK_CROUCH_SECONDARY2,		 
-			ACT_MP_ATTACK_SWIM_SECONDARY2,
-			ACT_MP_ATTACK_AIRWALK_SECONDARY2,
-
-			ACT_MP_RELOAD_STAND_SECONDARY2,		  
-			ACT_MP_RELOAD_STAND_SECONDARY2_LOOP,
-			ACT_MP_RELOAD_STAND_SECONDARY2_END,
-			ACT_MP_RELOAD_CROUCH_SECONDARY2,		 
-			ACT_MP_RELOAD_CROUCH_SECONDARY2_LOOP,
-			ACT_MP_RELOAD_CROUCH_SECONDARY2_END,
-			ACT_MP_RELOAD_SWIM_SECONDARY2,
-			ACT_MP_RELOAD_SWIM_SECONDARY2_LOOP,
-			ACT_MP_RELOAD_SWIM_SECONDARY2_END,
-			ACT_MP_RELOAD_AIRWALK_SECONDARY2,
-			ACT_MP_RELOAD_AIRWALK_SECONDARY2_LOOP,
-			ACT_MP_RELOAD_AIRWALK_SECONDARY2_END,
-
-			ACT_MP_STAND_MELEE,
-			ACT_MP_CROUCH_MELEE,
-			ACT_MP_RUN_MELEE,
-			ACT_MP_WALK_MELEE,
-			ACT_MP_AIRWALK_MELEE,
-			ACT_MP_CROUCHWALK_MELEE,
-			ACT_MP_JUMP_MELEE,
-			ACT_MP_JUMP_START_MELEE,
-			ACT_MP_JUMP_FLOAT_MELEE,
-			ACT_MP_JUMP_LAND_MELEE,
-			ACT_MP_SWIM_MELEE,
-
-			ACT_MP_ATTACK_STAND_MELEE,		  
-			ACT_MP_ATTACK_STAND_MELEE_SECONDARY,
-			ACT_MP_ATTACK_CROUCH_MELEE,		 
-			ACT_MP_ATTACK_CROUCH_MELEE_SECONDARY,
-			ACT_MP_ATTACK_SWIM_MELEE,
-			ACT_MP_ATTACK_AIRWALK_MELEE,
-
-			ACT_MP_ATTACK_STAND_GRENADE_MELEE,		  
-			ACT_MP_ATTACK_CROUCH_GRENADE_MELEE,		 
-			ACT_MP_ATTACK_SWIM_GRENADE_MELEE,
-			ACT_MP_ATTACK_AIRWALK_GRENADE_MELEE,
-
-			ACT_MP_STAND_ITEM1,
-			ACT_MP_CROUCH_ITEM1,
-			ACT_MP_RUN_ITEM1,
-			ACT_MP_WALK_ITEM1,
-			ACT_MP_AIRWALK_ITEM1,
-			ACT_MP_CROUCHWALK_ITEM1,
-			ACT_MP_JUMP_ITEM1,
-			ACT_MP_JUMP_START_ITEM1,
-			ACT_MP_JUMP_FLOAT_ITEM1,
-			ACT_MP_JUMP_LAND_ITEM1,
-			ACT_MP_SWIM_ITEM1,
-
-			ACT_MP_ATTACK_STAND_ITEM1,		  
-			ACT_MP_ATTACK_STAND_ITEM1_SECONDARY,
-			ACT_MP_ATTACK_CROUCH_ITEM1,		 
-			ACT_MP_ATTACK_CROUCH_ITEM1_SECONDARY,
-			ACT_MP_ATTACK_SWIM_ITEM1,
-			ACT_MP_ATTACK_AIRWALK_ITEM1,
-
-			ACT_MP_DEPLOYED_ITEM1,
-			ACT_MP_DEPLOYED_IDLE_ITEM1,
-			ACT_MP_CROUCHWALK_DEPLOYED_ITEM1,
-			ACT_MP_CROUCH_DEPLOYED_IDLE_ITEM1,
-			ACT_MP_ATTACK_STAND_PRIMARY_DEPLOYED_ITEM1,
-			ACT_MP_ATTACK_CROUCH_PRIMARY_DEPLOYED_ITEM1,
-
-			ACT_MP_STAND_ITEM2,
-			ACT_MP_CROUCH_ITEM2,
-			ACT_MP_RUN_ITEM2,
-			ACT_MP_WALK_ITEM2,
-			ACT_MP_AIRWALK_ITEM2,
-			ACT_MP_CROUCHWALK_ITEM2,
-			ACT_MP_JUMP_ITEM2,
-			ACT_MP_JUMP_START_ITEM2,
-			ACT_MP_JUMP_FLOAT_ITEM2,
-			ACT_MP_JUMP_LAND_ITEM2,
-			ACT_MP_SWIM_ITEM2,
-
-			ACT_MP_ATTACK_STAND_ITEM2,		  
-			ACT_MP_ATTACK_STAND_ITEM2_SECONDARY,
-			ACT_MP_ATTACK_CROUCH_ITEM2,		 
-			ACT_MP_ATTACK_CROUCH_ITEM2_SECONDARY,
-			ACT_MP_ATTACK_SWIM_ITEM2,
-			ACT_MP_ATTACK_AIRWALK_ITEM2,
-
-			ACT_MP_ATTACK_STAND_HARD_ITEM2,
-			ACT_MP_ATTACK_CROUCH_HARD_ITEM2,
-			ACT_MP_ATTACK_SWIM_HARD_ITEM2,
-
-			ACT_MP_DEPLOYED_ITEM2,
-			ACT_MP_DEPLOYED_IDLE_ITEM2,
-			ACT_MP_CROUCHWALK_DEPLOYED_ITEM2,
-			ACT_MP_CROUCH_DEPLOYED_IDLE_ITEM2,
-			ACT_MP_ATTACK_STAND_PRIMARY_DEPLOYED_ITEM2,
-			ACT_MP_ATTACK_CROUCH_PRIMARY_DEPLOYED_ITEM2,
-
-			ACT_MP_RELOAD_STAND_ITEM2,		  
-			ACT_MP_RELOAD_STAND_ITEM2_LOOP,
-			ACT_MP_RELOAD_STAND_ITEM2_END,
-			ACT_MP_RELOAD_CROUCH_ITEM2,		 
-			ACT_MP_RELOAD_CROUCH_ITEM2_LOOP,
-			ACT_MP_RELOAD_CROUCH_ITEM2_END,
-			ACT_MP_RELOAD_SWIM_ITEM2,
-			ACT_MP_RELOAD_SWIM_ITEM2_LOOP,
-			ACT_MP_RELOAD_SWIM_ITEM2_END,
-			ACT_MP_RELOAD_AIRWALK_ITEM2,
-			ACT_MP_RELOAD_AIRWALK_ITEM2_LOOP,
-			ACT_MP_RELOAD_AIRWALK_ITEM2_END,
-			ACT_MP_RELOAD_NO_AMMO_ITEM2,
-
-			ACT_MP_ATTACK_STAND_GRENADE_ITEM2,		  
-			ACT_MP_ATTACK_CROUCH_GRENADE_ITEM2,		 
-			ACT_MP_ATTACK_SWIM_GRENADE_ITEM2,
-			ACT_MP_ATTACK_AIRWALK_GRENADE_ITEM2,
-
-			ACT_MP_STAND_PASSTIME,
-			ACT_MP_RUN_PASSTIME,
-			ACT_MP_CROUCHWALK_PASSTIME,
-
-			ACT_MP_GESTURE_FLINCH,
-			ACT_MP_GESTURE_FLINCH_PRIMARY,
-			ACT_MP_GESTURE_FLINCH_SECONDARY,
-			ACT_MP_GESTURE_FLINCH_MELEE,
-			ACT_MP_GESTURE_FLINCH_ITEM1,
-			ACT_MP_GESTURE_FLINCH_ITEM2,
-
-			ACT_MP_GESTURE_FLINCH_HEAD,
-			ACT_MP_GESTURE_FLINCH_CHEST,
-			ACT_MP_GESTURE_FLINCH_STOMACH,
-			ACT_MP_GESTURE_FLINCH_LEFTARM,
-			ACT_MP_GESTURE_FLINCH_RIGHTARM,
-			ACT_MP_GESTURE_FLINCH_LEFTLEG,
-			ACT_MP_GESTURE_FLINCH_RIGHTLEG,
-
-			ACT_MP_GRENADE1_DRAW,
-			ACT_MP_GRENADE1_IDLE,
-			ACT_MP_GRENADE1_ATTACK,
-			ACT_MP_GRENADE2_DRAW,
-			ACT_MP_GRENADE2_IDLE,
-			ACT_MP_GRENADE2_ATTACK,
-
-			ACT_MP_PRIMARY_GRENADE1_DRAW,
-			ACT_MP_PRIMARY_GRENADE1_IDLE,
-			ACT_MP_PRIMARY_GRENADE1_ATTACK,
-			ACT_MP_PRIMARY_GRENADE2_DRAW,
-			ACT_MP_PRIMARY_GRENADE2_IDLE,
-			ACT_MP_PRIMARY_GRENADE2_ATTACK,
-
-			ACT_MP_SECONDARY_GRENADE1_DRAW,
-			ACT_MP_SECONDARY_GRENADE1_IDLE,
-			ACT_MP_SECONDARY_GRENADE1_ATTACK,
-			ACT_MP_SECONDARY_GRENADE2_DRAW,
-			ACT_MP_SECONDARY_GRENADE2_IDLE,
-			ACT_MP_SECONDARY_GRENADE2_ATTACK,
-
-			ACT_MP_MELEE_GRENADE1_DRAW,
-			ACT_MP_MELEE_GRENADE1_IDLE,
-			ACT_MP_MELEE_GRENADE1_ATTACK,
-			ACT_MP_MELEE_GRENADE2_DRAW,
-			ACT_MP_MELEE_GRENADE2_IDLE,
-			ACT_MP_MELEE_GRENADE2_ATTACK,
-
-			ACT_MP_ITEM1_GRENADE1_DRAW,
-			ACT_MP_ITEM1_GRENADE1_IDLE,
-			ACT_MP_ITEM1_GRENADE1_ATTACK,
-			ACT_MP_ITEM1_GRENADE2_DRAW,
-			ACT_MP_ITEM1_GRENADE2_IDLE,
-			ACT_MP_ITEM1_GRENADE2_ATTACK,
-
-			ACT_MP_ITEM2_GRENADE1_DRAW,
-			ACT_MP_ITEM2_GRENADE1_IDLE,
-			ACT_MP_ITEM2_GRENADE1_ATTACK,
-			ACT_MP_ITEM2_GRENADE2_DRAW,
-			ACT_MP_ITEM2_GRENADE2_IDLE,
-			ACT_MP_ITEM2_GRENADE2_ATTACK,
-
-			ACT_MP_STAND_BUILDING,
-			ACT_MP_CROUCH_BUILDING,
-			ACT_MP_RUN_BUILDING,
-			ACT_MP_WALK_BUILDING,
-			ACT_MP_AIRWALK_BUILDING,
-			ACT_MP_CROUCHWALK_BUILDING,
-			ACT_MP_JUMP_BUILDING,
-			ACT_MP_JUMP_START_BUILDING,
-			ACT_MP_JUMP_FLOAT_BUILDING,
-			ACT_MP_JUMP_LAND_BUILDING,
-			ACT_MP_SWIM_BUILDING,
-
-			ACT_MP_ATTACK_STAND_BUILDING,		  
-			ACT_MP_ATTACK_CROUCH_BUILDING,		 
-			ACT_MP_ATTACK_SWIM_BUILDING,
-			ACT_MP_ATTACK_AIRWALK_BUILDING,
-
-			ACT_MP_ATTACK_STAND_GRENADE_BUILDING,		  
-			ACT_MP_ATTACK_CROUCH_GRENADE_BUILDING,		 
-			ACT_MP_ATTACK_SWIM_GRENADE_BUILDING,
-			ACT_MP_ATTACK_AIRWALK_GRENADE_BUILDING,
-
-			ACT_MP_STAND_BUILDING_DEPLOYED,
-			ACT_MP_CROUCH_BUILDING_DEPLOYED,
-			ACT_MP_RUN_BUILDING_DEPLOYED,
-			ACT_MP_WALK_BUILDING_DEPLOYED,
-			ACT_MP_AIRWALK_BUILDING_DEPLOYED,
-			ACT_MP_CROUCHWALK_BUILDING_DEPLOYED,
-			ACT_MP_JUMP_BUILDING_DEPLOYED,
-			ACT_MP_JUMP_START_BUILDING_DEPLOYED,
-			ACT_MP_JUMP_FLOAT_BUILDING_DEPLOYED,
-			ACT_MP_JUMP_LAND_BUILDING_DEPLOYED,
-			ACT_MP_SWIM_BUILDING_DEPLOYED,
-
-			ACT_MP_ATTACK_STAND_BUILDING_DEPLOYED,		  
-			ACT_MP_ATTACK_CROUCH_BUILDING_DEPLOYED,		 
-			ACT_MP_ATTACK_SWIM_BUILDING_DEPLOYED,
-			ACT_MP_ATTACK_AIRWALK_BUILDING_DEPLOYED,
-
-			ACT_MP_ATTACK_STAND_GRENADE_BUILDING_DEPLOYED,		  
-			ACT_MP_ATTACK_CROUCH_GRENADE_BUILDING_DEPLOYED,		 
-			ACT_MP_ATTACK_SWIM_GRENADE_BUILDING_DEPLOYED,
-			ACT_MP_ATTACK_AIRWALK_GRENADE_BUILDING_DEPLOYED,
-
-			ACT_MP_STAND_PDA,
-			ACT_MP_CROUCH_PDA,
-			ACT_MP_RUN_PDA,
-			ACT_MP_WALK_PDA,
-			ACT_MP_AIRWALK_PDA,
-			ACT_MP_CROUCHWALK_PDA,
-			ACT_MP_JUMP_PDA,
-			ACT_MP_JUMP_START_PDA,
-			ACT_MP_JUMP_FLOAT_PDA,
-			ACT_MP_JUMP_LAND_PDA,
-			ACT_MP_SWIM_PDA,
-
-			ACT_MP_ATTACK_STAND_PDA,
-			ACT_MP_ATTACK_SWIM_PDA,
-
-			ACT_MP_STAND_LOSERSTATE,
-			ACT_MP_CROUCH_LOSERSTATE,
-			ACT_MP_RUN_LOSERSTATE,
-			ACT_MP_WALK_LOSERSTATE,
-			ACT_MP_AIRWALK_LOSERSTATE,
-			ACT_MP_CROUCHWALK_LOSERSTATE,
-			ACT_MP_JUMP_LOSERSTATE,
-			ACT_MP_JUMP_START_LOSERSTATE,
-			ACT_MP_JUMP_FLOAT_LOSERSTATE,
-			ACT_MP_JUMP_LAND_LOSERSTATE,
-			ACT_MP_SWIM_LOSERSTATE,
-			ACT_MP_DOUBLEJUMP_LOSERSTATE,
-
-			ACT_MP_DOUBLEJUMP_CROUCH,
-			ACT_MP_DOUBLEJUMP_CROUCH_PRIMARY,
-			ACT_MP_DOUBLEJUMP_CROUCH_SECONDARY,
-			ACT_MP_DOUBLEJUMP_CROUCH_MELEE,
-			ACT_MP_DOUBLEJUMP_CROUCH_ITEM1,
-			ACT_MP_DOUBLEJUMP_CROUCH_ITEM2,
-			ACT_MP_DOUBLEJUMP_CROUCH_LOSERSTATE,
-			ACT_MP_DOUBLEJUMP_CROUCH_PASSTIME,
-
-			ACT_MP_GESTURE_VC_HANDMOUTH,
-			ACT_MP_GESTURE_VC_FINGERPOINT,
-			ACT_MP_GESTURE_VC_FISTPUMP,
-			ACT_MP_GESTURE_VC_THUMBSUP,
-			ACT_MP_GESTURE_VC_NODYES,
-			ACT_MP_GESTURE_VC_NODNO,
-
-			ACT_MP_GESTURE_VC_HANDMOUTH_PRIMARY,
-			ACT_MP_GESTURE_VC_FINGERPOINT_PRIMARY,
-			ACT_MP_GESTURE_VC_FISTPUMP_PRIMARY,
-			ACT_MP_GESTURE_VC_THUMBSUP_PRIMARY,
-			ACT_MP_GESTURE_VC_NODYES_PRIMARY,
-			ACT_MP_GESTURE_VC_NODNO_PRIMARY,
-
-			ACT_MP_GESTURE_VC_HANDMOUTH_SECONDARY,
-			ACT_MP_GESTURE_VC_FINGERPOINT_SECONDARY,
-			ACT_MP_GESTURE_VC_FISTPUMP_SECONDARY,
-			ACT_MP_GESTURE_VC_THUMBSUP_SECONDARY,
-			ACT_MP_GESTURE_VC_NODYES_SECONDARY,
-			ACT_MP_GESTURE_VC_NODNO_SECONDARY,
-
-			ACT_MP_GESTURE_VC_HANDMOUTH_MELEE,
-			ACT_MP_GESTURE_VC_FINGERPOINT_MELEE,
-			ACT_MP_GESTURE_VC_FISTPUMP_MELEE,
-			ACT_MP_GESTURE_VC_THUMBSUP_MELEE,
-			ACT_MP_GESTURE_VC_NODYES_MELEE,
-			ACT_MP_GESTURE_VC_NODNO_MELEE,
-
-			ACT_MP_GESTURE_VC_HANDMOUTH_ITEM1,
-			ACT_MP_GESTURE_VC_FINGERPOINT_ITEM1,
-			ACT_MP_GESTURE_VC_FISTPUMP_ITEM1,
-			ACT_MP_GESTURE_VC_THUMBSUP_ITEM1,
-			ACT_MP_GESTURE_VC_NODYES_ITEM1,
-			ACT_MP_GESTURE_VC_NODNO_ITEM1,
-
-			ACT_MP_GESTURE_VC_HANDMOUTH_ITEM2,
-			ACT_MP_GESTURE_VC_FINGERPOINT_ITEM2,
-			ACT_MP_GESTURE_VC_FISTPUMP_ITEM2,
-			ACT_MP_GESTURE_VC_THUMBSUP_ITEM2,
-			ACT_MP_GESTURE_VC_NODYES_ITEM2,
-			ACT_MP_GESTURE_VC_NODNO_ITEM2,
-
-			ACT_MP_GESTURE_VC_HANDMOUTH_BUILDING,
-			ACT_MP_GESTURE_VC_FINGERPOINT_BUILDING,
-			ACT_MP_GESTURE_VC_FISTPUMP_BUILDING,
-			ACT_MP_GESTURE_VC_THUMBSUP_BUILDING,
-			ACT_MP_GESTURE_VC_NODYES_BUILDING,
-			ACT_MP_GESTURE_VC_NODNO_BUILDING,
-
-			ACT_MP_GESTURE_VC_HANDMOUTH_PDA,
-			ACT_MP_GESTURE_VC_FINGERPOINT_PDA,
-			ACT_MP_GESTURE_VC_FISTPUMP_PDA,
-			ACT_MP_GESTURE_VC_THUMBSUP_PDA,
-			ACT_MP_GESTURE_VC_NODYES_PDA,
-			ACT_MP_GESTURE_VC_NODNO_PDA,
-
-			ACT_MP_STUN_BEGIN,
-			ACT_MP_STUN_MIDDLE,
-			ACT_MP_STUN_END,
-
-			ACT_MP_PASSTIME_THROW_BEGIN,
-			ACT_MP_PASSTIME_THROW_MIDDLE,
-			ACT_MP_PASSTIME_THROW_END,
-			ACT_MP_PASSTIME_THROW_CANCEL,
-
-			ACT_VM_UNUSABLE,
-			ACT_VM_UNUSABLE_TO_USABLE,
-			ACT_VM_USABLE_TO_UNUSABLE,
-
-			ACT_PRIMARY_VM_DRAW,
-			ACT_PRIMARY_VM_HOLSTER,
-			ACT_PRIMARY_VM_IDLE,
-			ACT_PRIMARY_VM_PULLBACK,
-			ACT_PRIMARY_VM_PRIMARYATTACK,
-			ACT_PRIMARY_VM_SECONDARYATTACK,
-			ACT_PRIMARY_VM_RELOAD,
-			ACT_PRIMARY_RELOAD_START,
-			ACT_PRIMARY_RELOAD_FINISH,
-			ACT_PRIMARY_VM_DRYFIRE,
-			ACT_PRIMARY_VM_IDLE_TO_LOWERED,
-			ACT_PRIMARY_VM_IDLE_LOWERED,
-			ACT_PRIMARY_VM_LOWERED_TO_IDLE,
-			ACT_PRIMARY_VM_RELOAD_2,
-			ACT_PRIMARY_RELOAD_START_2,
-			ACT_PRIMARY_RELOAD_FINISH_2,
-			ACT_PRIMARY_VM_RELOAD_3,
-			ACT_PRIMARY_RELOAD_START_3,
-			ACT_PRIMARY_RELOAD_FINISH_3,
-			ACT_PRIMARY_VM_PRIMARYATTACK_3,
-
-			ACT_SECONDARY_VM_DRAW,
-			ACT_SECONDARY_VM_HOLSTER,
-			ACT_SECONDARY_VM_IDLE,
-			ACT_SECONDARY_VM_PULLBACK,
-			ACT_SECONDARY_VM_PRIMARYATTACK,
-			ACT_SECONDARY_VM_SECONDARYATTACK,
-			ACT_SECONDARY_VM_RELOAD,
-			ACT_SECONDARY_RELOAD_START,
-			ACT_SECONDARY_RELOAD_FINISH,
-			ACT_SECONDARY_VM_RELOAD2,
-			ACT_SECONDARY_VM_DRYFIRE,
-			ACT_SECONDARY_VM_IDLE_TO_LOWERED,
-			ACT_SECONDARY_VM_IDLE_LOWERED,
-			ACT_SECONDARY_VM_LOWERED_TO_IDLE,
-
-			ACT_SECONDARY_VM_DRAW_2,
-			ACT_SECONDARY_VM_IDLE_2,
-			ACT_SECONDARY_VM_PRIMARYATTACK_2,
-			ACT_SECONDARY_VM_RELOAD_2,
-
-			ACT_MELEE_VM_DRAW,
-			ACT_MELEE_VM_HOLSTER,
-			ACT_MELEE_VM_IDLE,
-			ACT_MELEE_VM_PULLBACK,
-			ACT_MELEE_VM_PRIMARYATTACK,
-			ACT_MELEE_VM_SECONDARYATTACK,
-			ACT_MELEE_VM_RELOAD,
-			ACT_MELEE_VM_DRYFIRE,
-			ACT_MELEE_VM_IDLE_TO_LOWERED,
-			ACT_MELEE_VM_IDLE_LOWERED,
-			ACT_MELEE_VM_LOWERED_TO_IDLE,
-			ACT_MELEE_VM_STUN,
-			ACT_MELEE_VM_HITCENTER,
-			ACT_MELEE_VM_SWINGHARD,
-
-			ACT_PDA_VM_DRAW,
-			ACT_PDA_VM_HOLSTER,
-			ACT_PDA_VM_IDLE,
-			ACT_PDA_VM_PULLBACK,
-			ACT_PDA_VM_PRIMARYATTACK,
-			ACT_PDA_VM_SECONDARYATTACK,
-			ACT_PDA_VM_RELOAD,
-			ACT_PDA_VM_DRYFIRE,
-			ACT_PDA_VM_IDLE_TO_LOWERED,
-			ACT_PDA_VM_IDLE_LOWERED,
-			ACT_PDA_VM_LOWERED_TO_IDLE,
-
-			ACT_ENGINEER_PDA1_VM_DRAW,
-			ACT_ENGINEER_PDA2_VM_DRAW,
-			ACT_ENGINEER_BLD_VM_DRAW,
-			ACT_ENGINEER_PDA1_VM_IDLE,
-			ACT_ENGINEER_PDA2_VM_IDLE,
-			ACT_ENGINEER_BLD_VM_IDLE,
-
-			ACT_ITEM1_VM_DRAW,
-			ACT_ITEM1_VM_HOLSTER,
-			ACT_ITEM1_VM_IDLE,
-			ACT_ITEM1_VM_IDLE_2,
-			ACT_ITEM1_VM_PULLBACK,
-			ACT_ITEM1_VM_PRIMARYATTACK,
-			ACT_ITEM1_VM_SECONDARYATTACK,
-			ACT_ITEM1_VM_RELOAD,
-			ACT_ITEM1_VM_DRYFIRE,
-			ACT_ITEM1_VM_IDLE_TO_LOWERED,
-			ACT_ITEM1_VM_IDLE_LOWERED,
-			ACT_ITEM1_VM_LOWERED_TO_IDLE,
-			ACT_ITEM1_RELOAD_START,
-			ACT_ITEM1_RELOAD_FINISH,
-			ACT_ITEM1_VM_HITCENTER,
-			ACT_ITEM1_VM_SWINGHARD,
-			ACT_ITEM1_BACKSTAB_VM_UP,
-			ACT_ITEM1_BACKSTAB_VM_DOWN,
-			ACT_ITEM1_BACKSTAB_VM_IDLE,
-			ACT_MELEE_VM_ITEM1_STUN,
-
-			ACT_ITEM2_VM_DRAW,
-			ACT_ITEM2_VM_HOLSTER,
-			ACT_ITEM2_VM_IDLE,
-			ACT_ITEM2_VM_PULLBACK,
-			ACT_ITEM2_VM_PRIMARYATTACK,
-			ACT_ITEM2_VM_SECONDARYATTACK,
-			ACT_ITEM2_VM_RELOAD,
-			ACT_ITEM2_VM_DRYFIRE,
-			ACT_ITEM2_VM_IDLE_TO_LOWERED,
-			ACT_ITEM2_VM_IDLE_LOWERED,
-			ACT_ITEM2_VM_LOWERED_TO_IDLE,
-			ACT_ITEM2_VM_CHARGE,
-			ACT_ITEM2_VM_IDLE_2,
-			ACT_ITEM2_VM_IDLE_3,
-			ACT_ITEM2_VM_CHARGE_IDLE_3,
-			ACT_ITEM2_VM_HITCENTER,
-			ACT_ITEM2_VM_SWINGHARD,
-			ACT_ITEM2_BACKSTAB_VM_UP,
-			ACT_ITEM2_BACKSTAB_VM_DOWN,
-			ACT_ITEM2_BACKSTAB_VM_IDLE,
-			ACT_MELEE_VM_ITEM2_STUN,
-
-			ACT_ITEM3_VM_DRAW,
-			ACT_ITEM3_VM_HOLSTER,
-			ACT_ITEM3_VM_IDLE,
-			ACT_ITEM3_VM_PULLBACK,
-			ACT_ITEM3_VM_PRIMARYATTACK,
-			ACT_ITEM3_VM_SECONDARYATTACK,
-			ACT_ITEM3_VM_RELOAD,
-			ACT_ITEM3_VM_DRYFIRE,
-			ACT_ITEM3_VM_IDLE_TO_LOWERED,
-			ACT_ITEM3_VM_IDLE_LOWERED,
-			ACT_ITEM3_VM_LOWERED_TO_IDLE,
-			ACT_ITEM3_VM_CHARGE,
-			ACT_ITEM3_VM_IDLE_2,
-			ACT_ITEM3_VM_IDLE_3,
-			ACT_ITEM3_VM_CHARGE_IDLE_3,
-			ACT_ITEM3_VM_HITCENTER,
-			ACT_ITEM3_VM_SWINGHARD,
-
-			ACT_SECONDARY2_VM_DRAW,
-			ACT_SECONDARY2_VM_HOLSTER,
-			ACT_SECONDARY2_VM_IDLE,
-			ACT_SECONDARY2_VM_PULLBACK,
-			ACT_SECONDARY2_VM_PRIMARYATTACK,
-			ACT_SECONDARY2_VM_SECONDARY2ATTACK,
-			ACT_SECONDARY2_VM_RELOAD,
-			ACT_SECONDARY2_RELOAD_START,
-			ACT_SECONDARY2_RELOAD_FINISH,
-			ACT_SECONDARY2_VM_RELOAD2,
-			ACT_SECONDARY2_VM_DRYFIRE,
-			ACT_SECONDARY2_VM_IDLE_TO_LOWERED,
-			ACT_SECONDARY2_VM_IDLE_LOWERED,
-			ACT_SECONDARY2_VM_LOWERED_TO_IDLE,
-
-			ACT_BACKSTAB_VM_UP,
-			ACT_BACKSTAB_VM_DOWN,
-			ACT_BACKSTAB_VM_IDLE,
-
-			ACT_PRIMARY_ATTACK_STAND_PREFIRE,
-			ACT_PRIMARY_ATTACK_STAND_POSTFIRE,
-			ACT_PRIMARY_ATTACK_STAND_STARTFIRE,
-			ACT_PRIMARY_ATTACK_CROUCH_PREFIRE,
-			ACT_PRIMARY_ATTACK_CROUCH_POSTFIRE,
-			ACT_PRIMARY_ATTACK_SWIM_PREFIRE,
-			ACT_PRIMARY_ATTACK_SWIM_POSTFIRE,
-
-			ACT_SECONDARY_ATTACK_STAND_PREFIRE,
-			ACT_SECONDARY_ATTACK_STAND_POSTFIRE,
-			ACT_SECONDARY_ATTACK_STAND_STARTFIRE,
-			ACT_SECONDARY_ATTACK_CROUCH_PREFIRE,
-			ACT_SECONDARY_ATTACK_CROUCH_POSTFIRE,
-			ACT_SECONDARY_ATTACK_SWIM_PREFIRE,
-			ACT_SECONDARY_ATTACK_SWIM_POSTFIRE,
-
-			ACT_MELEE_ATTACK_STAND_PREFIRE,
-			ACT_MELEE_ATTACK_STAND_POSTFIRE,
-			ACT_MELEE_ATTACK_STAND_STARTFIRE,
-			ACT_MELEE_ATTACK_CROUCH_PREFIRE,
-			ACT_MELEE_ATTACK_CROUCH_POSTFIRE,
-			ACT_MELEE_ATTACK_SWIM_PREFIRE,
-			ACT_MELEE_ATTACK_SWIM_POSTFIRE,
-
-			ACT_ITEM1_ATTACK_STAND_PREFIRE,
-			ACT_ITEM1_ATTACK_STAND_POSTFIRE,
-			ACT_ITEM1_ATTACK_STAND_STARTFIRE,
-			ACT_ITEM1_ATTACK_CROUCH_PREFIRE,
-			ACT_ITEM1_ATTACK_CROUCH_POSTFIRE,
-			ACT_ITEM1_ATTACK_SWIM_PREFIRE,
-			ACT_ITEM1_ATTACK_SWIM_POSTFIRE,
-
-			ACT_ITEM2_ATTACK_STAND_PREFIRE,
-			ACT_ITEM2_ATTACK_STAND_POSTFIRE,
-			ACT_ITEM2_ATTACK_STAND_STARTFIRE,
-			ACT_ITEM2_ATTACK_CROUCH_PREFIRE,
-			ACT_ITEM2_ATTACK_CROUCH_POSTFIRE,
-			ACT_ITEM2_ATTACK_SWIM_PREFIRE,
-			ACT_ITEM2_ATTACK_SWIM_POSTFIRE,
-
-			ACT_MP_STAND_MELEE_ALLCLASS,
-			ACT_MP_CROUCH_MELEE_ALLCLASS,
-			ACT_MP_RUN_MELEE_ALLCLASS,
-			ACT_MP_WALK_MELEE_ALLCLASS,
-			ACT_MP_AIRWALK_MELEE_ALLCLASS,
-			ACT_MP_CROUCHWALK_MELEE_ALLCLASS,
-			ACT_MP_JUMP_MELEE_ALLCLASS,
-			ACT_MP_JUMP_START_MELEE_ALLCLASS,
-			ACT_MP_JUMP_FLOAT_MELEE_ALLCLASS,
-			ACT_MP_JUMP_LAND_MELEE_ALLCLASS,
-			ACT_MP_SWIM_MELEE_ALLCLASS,
-
-			ACT_MP_ATTACK_STAND_MELEE_ALLCLASS,		  
-			ACT_MP_ATTACK_STAND_MELEE_SECONDARY_ALLCLASS,
-			ACT_MP_ATTACK_CROUCH_MELEE_ALLCLASS,		 
-			ACT_MP_ATTACK_CROUCH_MELEE_SECONDARY_ALLCLASS,
-			ACT_MP_ATTACK_SWIM_MELEE_ALLCLASS,
-			ACT_MP_ATTACK_AIRWALK_MELEE_ALLCLASS,
-
-			ACT_MELEE_ALLCLASS_VM_DRAW,
-			ACT_MELEE_ALLCLASS_VM_HOLSTER,
-			ACT_MELEE_ALLCLASS_VM_IDLE,
-			ACT_MELEE_ALLCLASS_VM_PULLBACK,
-			ACT_MELEE_ALLCLASS_VM_PRIMARYATTACK,
-			ACT_MELEE_ALLCLASS_VM_SECONDARYATTACK,
-			ACT_MELEE_ALLCLASS_VM_RELOAD,
-			ACT_MELEE_ALLCLASS_VM_DRYFIRE,
-			ACT_MELEE_ALLCLASS_VM_IDLE_TO_LOWERED,
-			ACT_MELEE_ALLCLASS_VM_IDLE_LOWERED,
-			ACT_MELEE_ALLCLASS_VM_LOWERED_TO_IDLE,
-			ACT_MELEE_ALLCLASS_VM_STUN,
-			ACT_MELEE_ALLCLASS_VM_HITCENTER,
-			ACT_MELEE_ALLCLASS_VM_SWINGHARD,
-
-			ACT_MP_STAND_BOMB,
-			ACT_MP_JUMP_START_BOMB,
-			ACT_MP_JUMP_FLOAT_BOMB,
-			ACT_MP_JUMP_LAND_BOMB,
-			ACT_MP_RUN_BOMB,
-			ACT_MP_SWIM_BOMB,
-
-			ACT_VM_DRAW_QRL,
-			ACT_VM_IDLE_QRL,
-			ACT_VM_PULLBACK_QRL,
-			ACT_VM_PRIMARYATTACK_QRL,
-			ACT_VM_RELOAD_QRL,
-			ACT_VM_RELOAD_START_QRL,
-			ACT_VM_RELOAD_FINISH_QRL,
-
-			ACT_MP_RELOAD_STAND_PRIMARY3,
-			ACT_MP_RELOAD_CROUCH_PRIMARY3,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY3,
-			ACT_MP_RELOAD_STAND_PRIMARY3_LOOP,
-			ACT_MP_RELOAD_CROUCH_PRIMARY3_LOOP,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY3_LOOP,
-			ACT_MP_RELOAD_STAND_PRIMARY3_END,
-			ACT_MP_RELOAD_CROUCH_PRIMARY3_END,
-			ACT_MP_RELOAD_AIRWALK_PRIMARY3_END,
-			ACT_MP_RELOAD_SWIM_PRIMARY3,
-
-			ACT_MP_THROW,
-			ACT_THROWABLE_VM_DRAW,
-			ACT_THROWABLE_VM_IDLE,
-			ACT_THROWABLE_VM_FIRE,
-
-			ACT_SPELL_VM_DRAW,
-			ACT_SPELL_VM_IDLE,
-			ACT_SPELL_VM_ARM,
-			ACT_SPELL_VM_FIRE,
-
-			ACT_BREADSAPPER_VM_DRAW,
-			ACT_BREADSAPPER_VM_IDLE,
-
-			ACT_BREADGLOVES_VM_HITLEFT,
-			ACT_BREADGLOVES_VM_HITRIGHT,
-			ACT_BREADGLOVES_VM_SWINGHARD,
-			ACT_BREADGLOVES_VM_IDLE,
-			ACT_BREADGLOVES_VM_DRAW,
-
-			ACT_BREADMONSTER_GLOVES_IDLE,
-			ACT_BREADMONSTER_GLOVES_HITRIGHT,
-			ACT_BREADMONSTER_GLOVES_HITUP,
-
-			ACT_BREADMONSTER_VM_DRAW,
-			ACT_BREADMONSTER_VM_IDLE,
-			ACT_BREADMONSTER_VM_PRIMARYATTACK,
-
-			ACT_PARACHUTE_DEPLOY,
-			ACT_PARACHUTE_DEPLOY_IDLE,
-			ACT_PARACHUTE_RETRACT,
-			ACT_PARACHUTE_RETRACT_IDLE,
-
-			ACT_BOT_SPAWN,
-			ACT_BOT_PANIC,
-			ACT_BOT_PRIMARY_MOVEMENT,
-			ACT_BOT_GESTURE_FLINCH,
-			ACT_BOT_PANIC_START,
-			ACT_BOT_PANIC_END,
-
-			ACT_ENGINEER_REVOLVER_DRAW,
-			ACT_ENGINEER_REVOLVER_IDLE,
-			ACT_ENGINEER_REVOLVER_PRIMARYATTACK,
-			ACT_ENGINEER_REVOLVER_RELOAD,
-
-			ACT_KART_IDLE,
-			ACT_KART_ACTION_SHOOT,
-			ACT_KART_ACTION_DASH,
-			ACT_KART_JUMP_START,
-			ACT_KART_JUMP_FLOAT,
-			ACT_KART_JUMP_LAND,
-			ACT_KART_IMPACT,
-			ACT_KART_IMPACT_BIG,
-			ACT_KART_GESTURE_POSITIVE,
-			ACT_KART_GESTURE_NEGATIVE,
-
-			ACT_GRAPPLE_DRAW,
-			ACT_GRAPPLE_IDLE,
-			ACT_GRAPPLE_FIRE_START,
-			ACT_GRAPPLE_FIRE_IDLE,
-			ACT_GRAPPLE_PULL_START,
-			ACT_GRAPPLE_PULL_IDLE,
-			ACT_GRAPPLE_PULL_END,
-
-			ACT_PRIMARY_VM_INSPECT_START,
-			ACT_PRIMARY_VM_INSPECT_IDLE,
-			ACT_PRIMARY_VM_INSPECT_END,
-
-			ACT_SECONDARY_VM_INSPECT_START,
-			ACT_SECONDARY_VM_INSPECT_IDLE,
-			ACT_SECONDARY_VM_INSPECT_END,
-
-			ACT_MELEE_VM_INSPECT_START,
-			ACT_MELEE_VM_INSPECT_IDLE,
-			ACT_MELEE_VM_INSPECT_END,
-
-			LAST_SHARED_ACTIVITY,
-} Activity;
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/animationlayer.h b/SpyCustom/animationlayer.h
deleted file mode 100644
index e074f08..0000000
--- a/SpyCustom/animationlayer.h
+++ /dev/null
@@ -1,335 +0,0 @@
-#ifndef ANIMATIONLAYER_H
-#define ANIMATIONLAYER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "rangecheckedvar.h"
-#include "lerp_functions.h"
-
-#include "shareddefs.h" 
-#include "cs_shareddefs.h" 
-
-#ifdef CLIENT_DLL
-class C_BaseAnimatingOverlay;
-#endif
-
-class C_AnimationLayer
-{
-public:
-
-	ALLOW_DATATABLES_PRIVATE_ACCESS();
-
-	C_AnimationLayer();
-	void Reset();
-
-#ifdef CLIENT_DLL
-	void SetOwner(C_BaseAnimatingOverlay* pOverlay);
-	C_BaseAnimatingOverlay* GetOwner() const;
-#endif
-
-	void SetOrder(int order);
-	bool IsActive(void);
-	float GetFadeout(float flCurTime);
-
-	void SetSequence(int nSequence);
-	void SetCycle(float flCycle);
-	void SetPrevCycle(float flCycle);
-	void SetPlaybackRate(float flPlaybackRate);
-	void SetWeight(float flWeight);
-	void SetWeightDeltaRate(float flDelta);
-
-	int   GetOrder() const;
-	int   GetSequence() const;
-	float GetCycle() const;
-	float GetPrevCycle() const;
-	float GetPlaybackRate() const;
-	float GetWeight() const;
-	float GetWeightDeltaRate() const;
-
-#ifdef CLIENT_DLL
-	int GetInvalidatePhysicsBits() const;
-	void SetInvalidatePhysicsBits(int iBit) { m_nInvalidatePhysicsBits = iBit; }
-#endif
-
-public:
-	float	m_flLayerAnimtime;
-	float	m_flLayerFadeOuttime;
-
-	CStudioHdr* m_pDispatchedStudioHdr;
-	int		m_nDispatchedSrc;
-	int		m_nDispatchedDst;
-
-private:
-	int		m_nOrder;
-	CRangeCheckedVar<int, -1, 65535, 0>		m_nSequence;
-	CRangeCheckedVar<float, -2, 2, 0>		m_flPrevCycle;
-	CRangeCheckedVar<float, -5, 5, 0>		m_flWeight;
-	CRangeCheckedVar<float, -5, 5, 0>		m_flWeightDeltaRate;
-
-	CRangeCheckedVar<float, -50, 50, 1>		m_flPlaybackRate;
-	CRangeCheckedVar<float, -2, 2, 0>		m_flCycle;
-
-#ifdef CLIENT_DLL
-	C_BaseAnimatingOverlay* m_pOwner;
-	int					m_nInvalidatePhysicsBits;
-#endif
-
-	friend class C_BaseAnimatingOverlay;
-	friend C_AnimationLayer LoopingLerp(float flPercent, C_AnimationLayer& from, C_AnimationLayer& to);
-	friend C_AnimationLayer Lerp(float flPercent, const C_AnimationLayer& from, const C_AnimationLayer& to);
-	friend C_AnimationLayer LoopingLerp_Hermite(const C_AnimationLayer& current, float flPercent, C_AnimationLayer& prev, C_AnimationLayer& from, C_AnimationLayer& to);
-	friend C_AnimationLayer Lerp_Hermite(const C_AnimationLayer& current, float flPercent, const C_AnimationLayer& prev, const C_AnimationLayer& from, const C_AnimationLayer& to);
-	friend void Lerp_Clamp(C_AnimationLayer& val);
-	friend int CheckForSequenceBoxChanges(const C_AnimationLayer& newLayer, const C_AnimationLayer& oldLayer);
-};
-
-#ifdef CLIENT_DLL
-#define CAnimationLayer C_AnimationLayer
-#endif
-
-
-inline C_AnimationLayer::C_AnimationLayer()
-{
-#ifdef CLIENT_DLL
-	m_pOwner = NULL;
-	m_nInvalidatePhysicsBits = 0;
-#endif
-	m_pDispatchedStudioHdr = NULL;
-	m_nDispatchedSrc = 0; 
-	m_nDispatchedDst = 0; 
-
-	Reset();
-}
-
-#ifdef GAME_DLL
-
-inline void C_AnimationLayer::SetSequence(int nSequence)
-{
-	m_nSequence = nSequence;
-}
-
-inline void C_AnimationLayer::SetCycle(float flCycle)
-{
-	m_flCycle = flCycle;
-}
-
-inline void C_AnimationLayer::SetWeight(float flWeight)
-{
-	m_flWeight = flWeight;
-}
-
-#endif  
-
-FORCEINLINE void C_AnimationLayer::SetPrevCycle(float flPrevCycle)
-{
-	m_flPrevCycle = flPrevCycle;
-}
-
-FORCEINLINE void C_AnimationLayer::SetPlaybackRate(float flPlaybackRate)
-{
-	m_flPlaybackRate = flPlaybackRate;
-}
-
-FORCEINLINE void C_AnimationLayer::SetWeightDeltaRate(float flDelta)
-{
-	m_flWeightDeltaRate = flDelta;
-}
-
-FORCEINLINE int	C_AnimationLayer::GetSequence() const
-{
-	return m_nSequence;
-}
-
-FORCEINLINE float C_AnimationLayer::GetCycle() const
-{
-	return m_flCycle;
-}
-
-FORCEINLINE float C_AnimationLayer::GetPrevCycle() const
-{
-	return m_flPrevCycle;
-}
-
-FORCEINLINE float C_AnimationLayer::GetPlaybackRate() const
-{
-	return m_flPlaybackRate;
-}
-
-FORCEINLINE float C_AnimationLayer::GetWeight() const
-{
-	return m_flWeight;
-}
-
-FORCEINLINE float C_AnimationLayer::GetWeightDeltaRate() const
-{
-	return m_flWeightDeltaRate;
-}
-
-FORCEINLINE int C_AnimationLayer::GetOrder() const
-{
-	return m_nOrder;
-}
-
-inline float C_AnimationLayer::GetFadeout(float flCurTime)
-{
-	float s;
-
-	if (m_flLayerFadeOuttime <= 0.0f)
-	{
-		s = 0;
-	}
-	else
-	{
-		s = 1.0 - (flCurTime - m_flLayerAnimtime) / m_flLayerFadeOuttime;
-		if (s > 0 && s <= 1.0)
-		{
-			s = 3 * s * s - 2 * s * s * s;
-		}
-		else if (s > 1.0f)
-		{
-			s = 1.0f;
-		}
-	}
-	return s;
-}
-
-#ifdef CLIENT_DLL
-FORCEINLINE int C_AnimationLayer::GetInvalidatePhysicsBits() const
-{
-	return m_nInvalidatePhysicsBits;
-}
-#endif
-
-inline C_AnimationLayer LoopingLerp(float flPercent, C_AnimationLayer& from, C_AnimationLayer& to)
-{
-#ifdef CLIENT_DLL
-	Assert(from.GetOwner() == to.GetOwner());
-#endif
-
-	C_AnimationLayer output;
-
-	output.m_nSequence = to.m_nSequence;
-	output.m_flCycle = LoopingLerp(flPercent, (float)from.m_flCycle, (float)to.m_flCycle);
-	output.m_flPrevCycle = to.m_flPrevCycle;
-	output.m_flWeight = Lerp(flPercent, from.m_flWeight, to.m_flWeight);
-	output.m_nOrder = to.m_nOrder;
-
-	output.m_flLayerAnimtime = to.m_flLayerAnimtime;
-	output.m_flLayerFadeOuttime = to.m_flLayerFadeOuttime;
-#ifdef CLIENT_DLL
-	output.SetOwner(to.GetOwner());
-#endif
-	return output;
-}
-
-inline C_AnimationLayer Lerp(float flPercent, const C_AnimationLayer& from, const C_AnimationLayer& to)
-{
-#ifdef CLIENT_DLL
-	Assert(from.GetOwner() == to.GetOwner());
-#endif
-
-	C_AnimationLayer output;
-
-	output.m_nSequence = to.m_nSequence;
-	output.m_flCycle = Lerp(flPercent, from.m_flCycle, to.m_flCycle);
-	output.m_flPrevCycle = to.m_flPrevCycle;
-	output.m_flWeight = Lerp(flPercent, from.m_flWeight, to.m_flWeight);
-	output.m_nOrder = to.m_nOrder;
-
-	output.m_flLayerAnimtime = to.m_flLayerAnimtime;
-	output.m_flLayerFadeOuttime = to.m_flLayerFadeOuttime;
-#ifdef CLIENT_DLL
-	output.SetOwner(to.GetOwner());
-#endif
-	return output;
-}
-
-inline int CheckForSequenceBoxChanges(const C_AnimationLayer& newLayer, const C_AnimationLayer& oldLayer)
-{
-	int nChangeFlags = 0;
-
-	bool bOldIsZero = (oldLayer.GetWeight() == 0.0f);
-	bool bNewIsZero = (newLayer.GetWeight() == 0.0f);
-
-	if ((newLayer.GetSequence() != oldLayer.GetSequence()) ||
-		(bNewIsZero != bOldIsZero))
-	{
-		nChangeFlags |= SEQUENCE_CHANGED | BOUNDS_CHANGED;
-	}
-
-	if (newLayer.GetCycle() != oldLayer.GetCycle())
-	{
-		nChangeFlags |= ANIMATION_CHANGED;
-	}
-
-	if (newLayer.GetOrder() != oldLayer.GetOrder())
-	{
-		nChangeFlags |= BOUNDS_CHANGED;
-	}
-
-	return nChangeFlags;
-}
-
-inline C_AnimationLayer LoopingLerp_Hermite(const C_AnimationLayer& current, float flPercent, C_AnimationLayer& prev, C_AnimationLayer& from, C_AnimationLayer& to)
-{
-#ifdef CLIENT_DLL
-	Assert(prev.GetOwner() == from.GetOwner());
-	Assert(from.GetOwner() == to.GetOwner());
-#endif
-
-	C_AnimationLayer output;
-
-	output.m_nSequence = to.m_nSequence;
-	output.m_flCycle = LoopingLerp_Hermite((float)current.m_flCycle, flPercent, (float)prev.m_flCycle, (float)from.m_flCycle, (float)to.m_flCycle);
-	output.m_flPrevCycle = to.m_flPrevCycle;
-	output.m_flWeight = Lerp(flPercent, from.m_flWeight, to.m_flWeight);
-	output.m_nOrder = to.m_nOrder;
-
-	output.m_flLayerAnimtime = to.m_flLayerAnimtime;
-	output.m_flLayerFadeOuttime = to.m_flLayerFadeOuttime;
-
-#ifdef CLIENT_DLL
-	output.SetOwner(to.GetOwner());
-	output.m_nInvalidatePhysicsBits = CheckForSequenceBoxChanges(output, current);
-#endif
-	return output;
-}
-
-inline C_AnimationLayer Lerp_Hermite(const C_AnimationLayer& current, float flPercent, const C_AnimationLayer& prev, const C_AnimationLayer& from, const C_AnimationLayer& to)
-{
-#ifdef CLIENT_DLL
-	Assert(prev.GetOwner() == from.GetOwner());
-	Assert(from.GetOwner() == to.GetOwner());
-#endif
-
-	C_AnimationLayer output;
-
-	output.m_nSequence = to.m_nSequence;
-	output.m_flCycle = Lerp_Hermite((float)current.m_flCycle, flPercent, (float)prev.m_flCycle, (float)from.m_flCycle, (float)to.m_flCycle);
-	output.m_flPrevCycle = to.m_flPrevCycle;
-	output.m_flWeight = Lerp(flPercent, from.m_flWeight, to.m_flWeight);
-	output.m_nOrder = to.m_nOrder;
-
-	output.m_flLayerAnimtime = to.m_flLayerAnimtime;
-	output.m_flLayerFadeOuttime = to.m_flLayerFadeOuttime;
-#ifdef CLIENT_DLL
-	output.SetOwner(to.GetOwner());
-	output.m_nInvalidatePhysicsBits = CheckForSequenceBoxChanges(output, current);
-#endif
-	return output;
-}
-
-inline void Lerp_Clamp(C_AnimationLayer& val)
-{
-	Lerp_Clamp(val.m_nSequence);
-	Lerp_Clamp(val.m_flCycle);
-	Lerp_Clamp(val.m_flPrevCycle);
-	Lerp_Clamp(val.m_flWeight);
-	Lerp_Clamp(val.m_nOrder);
-	Lerp_Clamp(val.m_flLayerAnimtime);
-	Lerp_Clamp(val.m_flLayerFadeOuttime);
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/annotations.h b/SpyCustom/annotations.h
deleted file mode 100644
index c20b06e..0000000
--- a/SpyCustom/annotations.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef ANALYSIS_ANNOTATIONS_H
-#define ANALYSIS_ANNOTATIONS_H
-
-#if _MSC_VER >= 1600     
-#pragma warning(error : 4789 )          
-
-#ifdef _PREFAST_
-#include <sal.h>
-
-#define ANALYZE_SUPPRESS(wnum) __pragma(warning(suppress: wnum))
-#define ANALYZE_SUPPRESS2(wnum1, wnum2) __pragma(warning(supress: wnum1  wnum2))
-#define ANALYZE_SUPPRESS3(wnum1, wnum2, wnum3) __pragma(warning(suppress: wnum1 wnum2 wnum3))
-#define ANALYZE_SUPPRESS4(wnum1, wnum2, wnum3, wnum4) __pragma(warning(suppress: wnum1 wnum2 wnum3 wnum4))
-
-#define PRINTF_FORMAT_STRING _Printf_format_string_
-#define SCANF_FORMAT_STRING _Scanf_format_string_impl_
-#define IN_Z _In_z_
-#define IN_CAP(x) _In_count_(x)
-#define IN_BYTECAP(x) _In_bytecount_(x)
-#define OUT_Z_CAP(x) _Out_z_cap_(x)
-#define OUT_CAP(x) _Out_cap_(x)
-#define OUT_CAP_C(x) _Out_cap_c_(x)         
-#define OUT_BYTECAP(x) _Out_bytecap_(x)
-#define OUT_Z_BYTECAP(x) _Out_z_bytecap_(x)
-#define INOUT_BYTECAP(x) _Inout_bytecap_(x)
-#define INOUT_Z_CAP(x) _Inout_z_cap_(x)
-#define INOUT_Z_BYTECAP(x) _Inout_z_bytecap_(x)
-#if _MSC_VER >= 1700
-#define IN_Z_ARRAY _Pre_z_
-#define OUT_Z_ARRAY _Post_z_
-#define INOUT_Z_ARRAY _Prepost_z_
-#else
-#define IN_Z_ARRAY _Deref_pre_z_
-#define OUT_Z_ARRAY _Deref_post_z_
-#define INOUT_Z_ARRAY _Deref_prepost_z_
-#endif    
-#define MUST_CHECK_RETURN _Check_return_
-#endif  
-#endif         
-
-#ifndef ANALYZE_SUPPRESS
-#define ANALYZE_SUPPRESS(wnum)
-#define ANALYZE_SUPPRESS2(wnum1, wnum2)
-#define ANALYZE_SUPPRESS3(wnum1, wnum2, wnum3)
-#define ANALYZE_SUPPRESS4(wnum1, wnum2, wnum3, wnum4)
-#define PRINTF_FORMAT_STRING
-#define SCANF_FORMAT_STRING
-#define IN_Z
-#define IN_CAP(x)
-#define IN_BYTECAP(x)
-#define OUT_Z_CAP(x)
-#define OUT_CAP(x)
-#define OUT_CAP_C(x)
-#define OUT_BYTECAP(x)
-#define OUT_Z_BYTECAP(x)
-#define INOUT_BYTECAP(x)
-#define INOUT_Z_CAP(x)
-#define INOUT_Z_BYTECAP(x)
-#define OUT_Z_ARRAY
-#define INOUT_Z_ARRAY
-#define MUST_CHECK_RETURN
-#endif
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/baseclientstate.h b/SpyCustom/baseclientstate.h
deleted file mode 100644
index cc89a78..0000000
--- a/SpyCustom/baseclientstate.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef BASECLIENTSTATE_H
-#define BASECLIENTSTATE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-
-
-
-
-
-class CBaseClientState
-{
-public:
-	char _pad0[0x20C];
-	int m_nDeltaTick;
-	bool m_bPaused;
-	char _pad1[0x3];
-	int m_nViewEntity;
-	char _pad2[0x8];
-	char m_szLevelName[260];
-	char m_szLevelNameShort[40];
-};
-
-class CClockDriftMgr
-{
-public:
-	float m_ClockOffsets[16];   
-	uint32_t m_iCurClockOffset; 
-	uint32_t m_nServerTick;     
-	uint32_t m_nClientTick;     
-};  
-
-class CEventInfo
-{
-public:
-	enum
-	{
-		EVENT_INDEX_BITS = 8,
-		EVENT_DATA_LEN_BITS = 11,
-		MAX_EVENT_DATA = 192,             
-	};
-
-	inline CEventInfo()
-	{
-		classID = 0;
-		fire_delay = 0.0f;
-		flags = 0;
-		pSendTable = NULL;
-		pClientClass = NULL;
-		m_Packed = 0;
-	}
-
-	short classID;
-	short pad;
-	float fire_delay;
-	const void* pSendTable;
-	const ClientClass* pClientClass;
-	int m_Packed;
-	int		flags;
-	int filter[8];
-	CEventInfo* next;
-};
-
-class CClientState
-{
-public:
-	void ForceFullUpdate()
-	{
-		m_nDeltaTick = -1;
-	}
-
-	char pad_0000[156];
-	INetChannel* m_NetChannel;
-	int m_nChallengeNr;
-	char pad_00A4[100];
-	int m_nSignonState;
-	int signon_pads[2];
-	float m_flNextCmdTime;
-	int m_nServerCount;
-	int m_nCurrentSequence;
-	int musor_pads[2];
-	CClockDriftMgr m_ClockDriftMgr;
-	int m_nDeltaTick;
-	bool m_bPaused;
-	char paused_align[3];
-	int m_nViewEntity;
-	int m_nPlayerSlot;
-	int bruh;
-	char m_szLevelName[260];
-	char m_szLevelNameShort[80];
-	char m_szGroupName[80];
-	char pad_032[92];
-	int m_nMaxClients;
-	char pad_0314[18828];
-	float m_nLastServerTickTime;
-	bool m_bInSimulation;
-	char pad_4C9D[3];
-	int m_nOldTickCount;
-	float m_flTickReminder;
-	float m_flFrametime;
-	int m_nLastOutgoingCommand;
-	int m_nChokedCommands;
-	int m_nLastCommandAck;
-	int m_nPacketEndTickUpdate;
-	int m_nCommandAck;
-	int m_nSoundSequence;
-	char pad_4CCD[76];
-	QAngle viewangles;
-	int pads[54];
-	CEventInfo* m_pEvents;
-};
-
-
-
-#endif  
-#pragma once
diff --git a/SpyCustom/baseentity.h b/SpyCustom/baseentity.h
deleted file mode 100644
index 85e36c0..0000000
--- a/SpyCustom/baseentity.h
+++ /dev/null
@@ -1,352 +0,0 @@
-#ifndef ENTITYLIST_H
-#define ENTITYLIST_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-class CBaseEntity;
-class IEntityListener;
-
-class CBaseEntityClassList
-{
-public:
-	CBaseEntityClassList();
-	~CBaseEntityClassList();
-	virtual void LevelShutdownPostEntity() = 0;
-
-	CBaseEntityClassList* m_pNextClassList;
-};
-
-template< class T >
-class CEntityClassList : public CBaseEntityClassList
-{
-public:
-	virtual void LevelShutdownPostEntity() { m_pClassList = NULL; }
-
-	void Insert(T* pEntity)
-	{
-		pEntity->m_pNext = m_pClassList;
-		m_pClassList = pEntity;
-	}
-
-	void Remove(T* pEntity)
-	{
-		T** pPrev = &m_pClassList;
-		T* pCur = *pPrev;
-		while (pCur)
-		{
-			if (pCur == pEntity)
-			{
-				*pPrev = pCur->m_pNext;
-				return;
-			}
-			pPrev = &pCur->m_pNext;
-			pCur = *pPrev;
-		}
-	}
-
-	static T* m_pClassList;
-};
-
-abstract_class IEntityFindFilter
-{
-public:
-	virtual bool ShouldFindEntity(CBaseEntity * pEntity) = 0;
-	virtual CBaseEntity* GetFilterResult(void) = 0;
-};
-
-class CGlobalEntityList : public CBaseEntityList
-{
-public:
-private:
-	int m_iHighestEnt;      
-	int m_iNumEnts;
-	int m_iNumEdicts;
-
-	bool m_bClearingEntities;
-	CUtlVector<IEntityListener*>	m_entityListeners;
-
-public:
-	CBaseHandle AddNetworkableEntity(IHandleEntity* pEnt, int index, int iForcedSerialNum = -1);
-	CBaseHandle AddNonNetworkableEntity(IHandleEntity* pEnt);
-
-	void UpdateName(IHandleEntity* pEnt, CBaseHandle hEnt);
-	void UpdateName(IHandleEntity* pEnt);
-
-	IServerNetworkable* GetServerNetworkable(CBaseHandle hEnt) const;
-	CBaseNetworkable* GetBaseNetworkable(CBaseHandle hEnt) const;
-	CBaseEntity* GetBaseEntity(CBaseHandle hEnt) const;
-	edict_t* GetEdict(CBaseHandle hEnt) const;
-
-	int NumberOfEntities(void);
-	int NumberOfEdicts(void);
-
-	void AddToDeleteList(IServerNetworkable* ent);
-	void CleanupDeleteList(void);
-	int ResetDeleteList(void);
-
-	void Clear(void);
-
-	bool	IsClearingEntities() { return m_bClearingEntities; }
-
-	void AddListenerEntity(IEntityListener* pListener);
-	void RemoveListenerEntity(IEntityListener* pListener);
-
-	void ReportEntityFlagsChanged(CBaseEntity* pEntity, unsigned int flagsOld, unsigned int flagsNow);
-	void AddPostClientMessageEntity(CBaseEntity* pEntity);
-	void PostClientMessagesSent();
-
-	void NotifyCreateEntity(CBaseEntity* pEnt);
-	void NotifySpawn(CBaseEntity* pEnt);
-	void NotifyRemoveEntity(CBaseEntity* pEnt);
-	CBaseEntity* NextEnt(CBaseEntity* pCurrentEnt);
-	CBaseEntity* FirstEnt() { return NextEnt(NULL); }
-
-	template< class T >
-	T* NextEntByClass(T* start)
-	{
-		for (CBaseEntity* x = NextEnt(start); x; x = NextEnt(x))
-		{
-			start = dynamic_cast<T*>(x);
-			if (start)
-				return start;
-		}
-		return NULL;
-	}
-
-	bool		 IsEntityPtr(void* pTest);
-	CBaseEntity* FindEntityByClassname(CBaseEntity* pStartEntity, const char* szName);
-	CBaseEntity* FindEntityByName(CBaseEntity* pStartEntity, const char* szName, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL, IEntityFindFilter* pFilter = NULL);
-	CBaseEntity* FindEntityByName(CBaseEntity* pStartEntity, string_t iszName, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL, IEntityFindFilter* pFilter = NULL)
-	{
-		return FindEntityByName(pStartEntity, STRING(iszName), pSearchingEntity, pActivator, pCaller, pFilter);
-	}
-	CBaseEntity* FindEntityInSphere(CBaseEntity* pStartEntity, const Vector& vecCenter, float flRadius);
-	CBaseEntity* FindEntityByTarget(CBaseEntity* pStartEntity, const char* szName);
-	CBaseEntity* FindEntityByModel(CBaseEntity* pStartEntity, const char* szModelName);
-	CBaseEntity* FindEntityByOutputTarget(CBaseEntity* pStartEntity, string_t iTarget);
-
-	CBaseEntity* FindEntityByNameNearest(const char* szName, const Vector& vecSrc, float flRadius, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-	CBaseEntity* FindEntityByNameWithin(CBaseEntity* pStartEntity, const char* szName, const Vector& vecSrc, float flRadius, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-	CBaseEntity* FindEntityByClassnameNearest(const char* szName, const Vector& vecSrc, float flRadius);
-	CBaseEntity* FindEntityByClassnameNearest2D(const char* szName, const Vector& vecSrc, float flRadius);
-	CBaseEntity* FindEntityByClassnameWithin(CBaseEntity* pStartEntity, const char* szName, const Vector& vecSrc, float flRadius);
-	CBaseEntity* FindEntityByClassnameWithin(CBaseEntity* pStartEntity, const char* szName, const Vector& vecMins, const Vector& vecMaxs);
-
-	CBaseEntity* FindEntityGeneric(CBaseEntity* pStartEntity, const char* szName, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-	CBaseEntity* FindEntityGenericWithin(CBaseEntity* pStartEntity, const char* szName, const Vector& vecSrc, float flRadius, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-	CBaseEntity* FindEntityGenericNearest(const char* szName, const Vector& vecSrc, float flRadius, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-
-	CBaseEntity* FindEntityNearestFacing(const Vector& origin, const Vector& facing, float threshold);
-	CBaseEntity* FindEntityClassNearestFacing(const Vector& origin, const Vector& facing, float threshold, char* classname);
-	CBaseEntity* FindEntityByNetname(CBaseEntity* pStartEntity, const char* szModelName);
-
-	CBaseEntity* FindEntityProcedural(const char* szName, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-
-	CBaseEntity* FindEntityByClassnameFast(CBaseEntity* pStartEntity, string_t iszClassname);
-	CBaseEntity* FindEntityByClassnameNearestFast(string_t iszClassname, const Vector& vecSrc, float flRadius);
-	CBaseEntity* FindEntityByNameFast(CBaseEntity* pStartEntity, string_t iszName);
-
-	CGlobalEntityList();
-
-protected:
-
-	virtual void OnAddEntity(IHandleEntity* pEnt, CBaseHandle handle);
-	virtual void OnRemoveEntity(IHandleEntity* pEnt, CBaseHandle handle);
-
-};
-
-extern CGlobalEntityList gEntList;
-
-
-inline CBaseHandle CGlobalEntityList::AddNetworkableEntity(IHandleEntity* pEnt, int index, int iForcedSerialNum)
-{
-	CBaseHandle h = CBaseEntityList::AddNetworkableEntity(pEnt, index, iForcedSerialNum);
-	UpdateName(pEnt, h);
-	return h;
-}
-
-inline CBaseHandle CGlobalEntityList::AddNonNetworkableEntity(IHandleEntity* pEnt)
-{
-	CBaseHandle h = CBaseEntityList::AddNonNetworkableEntity(pEnt);
-	UpdateName(pEnt, h);
-	return h;
-}
-
-inline edict_t* CGlobalEntityList::GetEdict(CBaseHandle hEnt) const
-{
-	IServerUnknown* pUnk = static_cast<IServerUnknown*>(LookupEntity(hEnt));
-	if (pUnk)
-		return pUnk->GetNetworkable()->GetEdict();
-	else
-		return NULL;
-}
-
-inline CBaseNetworkable* CGlobalEntityList::GetBaseNetworkable(CBaseHandle hEnt) const
-{
-	IServerUnknown* pUnk = static_cast<IServerUnknown*>(LookupEntity(hEnt));
-	if (pUnk)
-		return pUnk->GetNetworkable()->GetBaseNetworkable();
-	else
-		return NULL;
-}
-
-inline IServerNetworkable* CGlobalEntityList::GetServerNetworkable(CBaseHandle hEnt) const
-{
-	IServerUnknown* pUnk = static_cast<IServerUnknown*>(LookupEntity(hEnt));
-	if (pUnk)
-		return pUnk->GetNetworkable();
-	else
-		return NULL;
-}
-
-inline CBaseEntity* CGlobalEntityList::GetBaseEntity(CBaseHandle hEnt) const
-{
-	IServerUnknown* pUnk = static_cast<IServerUnknown*>(LookupEntity(hEnt));
-	if (pUnk)
-		return pUnk->GetBaseEntity();
-	else
-		return NULL;
-}
-
-
-#if 0
-
-template <class ENT_TYPE>
-inline bool FindEntityByName(const char* pszName, ENT_TYPE** ppResult)
-{
-	CBaseEntity* pBaseEntity = gEntList.FindEntityByName(NULL, pszName);
-
-	if (pBaseEntity)
-		*ppResult = dynamic_cast<ENT_TYPE*>(pBaseEntity);
-	else
-		*ppResult = NULL;
-
-	return (*ppResult != NULL);
-}
-
-template <>
-inline bool FindEntityByName<CBaseEntity>(const char* pszName, CBaseEntity** ppResult)
-{
-	*ppResult = gEntList.FindEntityByName(NULL, pszName);
-	return (*ppResult != NULL);
-}
-
-template <>
-inline bool FindEntityByName<CAI_BaseNPC>(const char* pszName, CAI_BaseNPC** ppResult)
-{
-	CBaseEntity* pBaseEntity = gEntList.FindEntityByName(NULL, pszName);
-
-	if (pBaseEntity)
-		*ppResult = pBaseEntity->MyNPCPointer();
-	else
-		*ppResult = NULL;
-
-	return (*ppResult != NULL);
-}
-#endif
-struct entitem_t
-{
-	EHANDLE hEnt;
-	struct entitem_t* pNext;
-
-	static void* operator new(size_t stAllocateBlock);
-	static void* operator new(size_t stAllocateBlock, int nBlockUse, const char* pFileName, int nLine);
-	static void operator delete(void* pMem);
-	static void operator delete(void* pMem, int nBlockUse, const char* pFileName, int nLine) { operator delete(pMem); }
-};
-
-class CEntityList
-{
-public:
-	CEntityList();
-	~CEntityList();
-
-	int m_iNumItems;
-	entitem_t* m_pItemList;	    
-
-	void AddEntity(CBaseEntity*);
-	void DeleteEntity(CBaseEntity*);
-};
-
-enum notify_system_event_t
-{
-	NOTIFY_EVENT_TELEPORT = 0,
-	NOTIFY_EVENT_DESTROY,
-};
-
-struct notify_teleport_params_t
-{
-	Vector prevOrigin;
-	QAngle prevAngles;
-	bool physicsRotate;
-};
-
-struct notify_destroy_params_t
-{
-};
-
-struct notify_system_event_params_t
-{
-	union
-	{
-		const notify_teleport_params_t* pTeleport;
-		const notify_destroy_params_t* pDestroy;
-	};
-	notify_system_event_params_t(const notify_teleport_params_t* pInTeleport) { pTeleport = pInTeleport; }
-	notify_system_event_params_t(const notify_destroy_params_t* pInDestroy) { pDestroy = pInDestroy; }
-};
-
-
-abstract_class INotify
-{
-public:
-	virtual void AddEntity(CBaseEntity * pNotify, CBaseEntity * pWatched) = 0;
-
-	virtual void RemoveEntity(CBaseEntity* pNotify, CBaseEntity* pWatched) = 0;
-
-	virtual void ReportNamedEvent(CBaseEntity* pEntity, const char* pEventName) = 0;
-
-	virtual void ReportSystemEvent(CBaseEntity* pEntity, notify_system_event_t eventType, const notify_system_event_params_t& params) = 0;
-
-	inline void ReportDestroyEvent(CBaseEntity* pEntity)
-	{
-		notify_destroy_params_t destroy;
-		ReportSystemEvent(pEntity, NOTIFY_EVENT_DESTROY, notify_system_event_params_t(&destroy));
-	}
-
-	inline void ReportTeleportEvent(CBaseEntity* pEntity, const Vector& prevOrigin, const QAngle& prevAngles, bool physicsRotate)
-	{
-		notify_teleport_params_t teleport;
-		teleport.prevOrigin = prevOrigin;
-		teleport.prevAngles = prevAngles;
-		teleport.physicsRotate = physicsRotate;
-		ReportSystemEvent(pEntity, NOTIFY_EVENT_TELEPORT, notify_system_event_params_t(&teleport));
-	}
-
-	virtual void ClearEntity(CBaseEntity* pNotify) = 0;
-};
-
-class IEntityListener
-{
-public:
-	virtual void OnEntityCreated(CBaseEntity* pEntity) {};
-	virtual void OnEntitySpawned(CBaseEntity* pEntity) {};
-	virtual void OnEntityDeleted(CBaseEntity* pEntity) {};
-};
-
-extern INotify* g_pNotify;
-
-void EntityTouch_Add(CBaseEntity* pEntity);
-void EntityTouch_Remove(CBaseEntity* pEntity);
-int AimTarget_ListCount();
-int AimTarget_ListCopy(CBaseEntity* pList[], int listMax);
-CBaseEntity* AimTarget_ListElement(int iIndex);
-void AimTarget_ForceRepopulateList();
-
-void SimThink_EntityChanged(CBaseEntity* pEntity);
-int SimThink_ListCount();
-int SimThink_ListCopy(CBaseEntity* pList[], int listMax);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/baseentity_shared.h b/SpyCustom/baseentity_shared.h
deleted file mode 100644
index 0519cdb..0000000
--- a/SpyCustom/baseentity_shared.h
+++ /dev/null
@@ -1,277 +0,0 @@
-#ifndef BASEENTITY_SHARED_H
-#define BASEENTITY_SHARED_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#define		FCAP_MUST_SPAWN				0x00000001		   
-#define		FCAP_ACROSS_TRANSITION		0x00000002		     
-#define		FCAP_FORCE_TRANSITION		0x00000004		    
-#define		FCAP_NOTIFY_ON_TRANSITION	0x00000008		          
-
-#define		FCAP_IMPULSE_USE			0x00000010		      
-#define		FCAP_CONTINUOUS_USE			0x00000020		      
-#define		FCAP_ONOFF_USE				0x00000040		      
-#define		FCAP_DIRECTIONAL_USE		0x00000080		         
-#define		FCAP_USE_ONGROUND			0x00000100
-#define		FCAP_USE_IN_RADIUS			0x00000200
-#define		FCAP_SAVE_NON_NETWORKABLE	0x00000400
-
-#define		FCAP_MASTER					0x10000000		         
-#define		FCAP_WCEDIT_POSITION		0x40000000		         
-#define		FCAP_DONT_SAVE				0x80000000		   
-
-
-#define NUM_PARENTATTACHMENT_BITS	6
-
-#define VPHYSICS_MAX_OBJECT_LIST_COUNT	1024
-
-enum InvalidatePhysicsBits_t
-{
-	POSITION_CHANGED = 0x1,
-	ANGLES_CHANGED = 0x2,
-	VELOCITY_CHANGED = 0x4,
-	ANIMATION_CHANGED = 0x8,
-};
-
-
-#if defined( CLIENT_DLL )
-#include "c_baseentity.h"
-#include "c_baseanimating.h"
-#else
-#include "baseentity.h"
-
-#ifdef HL2_EPISODIC
-#include "info_darknessmode_lightsource.h"
-#endif  
-
-#endif
-
-#if !defined( NO_ENTITY_PREDICTION )
-inline bool CBaseEntity::IsPlayerSimulated(void) const
-{
-	return m_bIsPlayerSimulated;
-}
-
-inline CBasePlayer* CBaseEntity::GetSimulatingPlayer(void)
-{
-	return m_hPlayerSimulationOwner;
-}
-#endif
-
-inline MoveType_t CBaseEntity::GetMoveType() const
-{
-	return (MoveType_t)(unsigned char)m_MoveType;
-}
-
-inline MoveCollide_t CBaseEntity::GetMoveCollide() const
-{
-	return (MoveCollide_t)(unsigned char)m_MoveCollide;
-}
-
-inline int CBaseEntity::GetCollisionGroup() const
-{
-	return m_CollisionGroup;
-}
-
-inline int	CBaseEntity::GetFlags(void) const
-{
-	return m_fFlags;
-}
-
-inline bool CBaseEntity::IsAlive(void)
-{
-	return m_lifeState == LIFE_ALIVE;
-}
-
-inline CBaseEntity* CBaseEntity::GetOwnerEntity() const
-{
-	return m_hOwnerEntity.Get();
-}
-
-inline CBaseEntity* CBaseEntity::GetEffectEntity() const
-{
-	return m_hEffectEntity.Get();
-}
-
-inline int CBaseEntity::GetPredictionRandomSeed(void)
-{
-	return m_nPredictionRandomSeed;
-}
-
-inline CBasePlayer* CBaseEntity::GetPredictionPlayer(void)
-{
-	return m_pPredictionPlayer;
-}
-
-inline void CBaseEntity::SetPredictionPlayer(CBasePlayer* player)
-{
-	m_pPredictionPlayer = player;
-}
-
-
-inline bool CBaseEntity::IsSimulatedEveryTick() const
-{
-	return m_bSimulatedEveryTick;
-}
-
-inline bool CBaseEntity::IsAnimatedEveryTick() const
-{
-	return m_bAnimatedEveryTick;
-}
-
-inline void CBaseEntity::SetSimulatedEveryTick(bool sim)
-{
-	if (m_bSimulatedEveryTick != sim)
-	{
-		m_bSimulatedEveryTick = sim;
-#ifdef CLIENT_DLL
-		Interp_UpdateInterpolationAmounts(GetVarMapping());
-#endif
-	}
-}
-
-inline void CBaseEntity::SetAnimatedEveryTick(bool anim)
-{
-	if (m_bAnimatedEveryTick != anim)
-	{
-		m_bAnimatedEveryTick = anim;
-#ifdef CLIENT_DLL
-		Interp_UpdateInterpolationAmounts(GetVarMapping());
-#endif
-	}
-}
-
-inline float CBaseEntity::GetAnimTime() const
-{
-	return m_flAnimTime;
-}
-
-inline float CBaseEntity::GetSimulationTime() const
-{
-	return m_flSimulationTime;
-}
-
-inline void CBaseEntity::SetAnimTime(float at)
-{
-	m_flAnimTime = at;
-}
-
-inline void CBaseEntity::SetSimulationTime(float st)
-{
-	m_flSimulationTime = st;
-}
-
-inline int CBaseEntity::GetEffects(void) const
-{
-	return m_fEffects;
-}
-
-inline void CBaseEntity::RemoveEffects(int nEffects)
-{
-#if !defined( CLIENT_DLL )
-#ifdef HL2_EPISODIC
-	if (nEffects & (EF_BRIGHTLIGHT | EF_DIMLIGHT))
-	{
-		if (!IsPlayer())
-		{
-			RemoveEntityFromDarknessCheck(this);
-		}
-	}
-#endif  
-#endif  
-
-	m_fEffects &= ~nEffects;
-	if (nEffects & EF_NODRAW)
-	{
-#ifndef CLIENT_DLL
-		NetworkProp()->MarkPVSInformationDirty();
-		DispatchUpdateTransmitState();
-#else
-		UpdateVisibility();
-#endif
-	}
-}
-
-inline void CBaseEntity::ClearEffects(void)
-{
-#if !defined( CLIENT_DLL )
-#ifdef HL2_EPISODIC
-	if (m_fEffects & (EF_BRIGHTLIGHT | EF_DIMLIGHT))
-	{
-		if (!IsPlayer())
-		{
-			RemoveEntityFromDarknessCheck(this);
-		}
-	}
-#endif  
-#endif  
-
-	m_fEffects = 0;
-#ifndef CLIENT_DLL
-	DispatchUpdateTransmitState();
-#else
-	UpdateVisibility();
-#endif
-}
-
-inline bool CBaseEntity::IsEffectActive(int nEffects) const
-{
-	return (m_fEffects & nEffects) != 0;
-}
-
-#define BASEENTITY_MSG_REMOVE_DECALS	1
-
-extern float k_flMaxEntityPosCoord;
-extern float k_flMaxEntityEulerAngle;
-extern float k_flMaxEntitySpeed;
-extern float k_flMaxEntitySpinRate;
-
-inline bool IsEntityCoordinateReasonable(const vec_t c)
-{
-	float r = k_flMaxEntityPosCoord;
-	return c > -r && c < r;
-}
-
-inline bool IsEntityPositionReasonable(const Vector& v)
-{
-	float r = k_flMaxEntityPosCoord;
-	return
-		v.x > -r && v.x < r&&
-		v.y > -r && v.y < r&&
-		v.z > -r && v.z < r;
-}
-
-extern int CheckEntityVelocity(Vector& v);
-
-inline bool IsEntityQAngleReasonable(const QAngle& q)
-{
-	float r = k_flMaxEntityEulerAngle;
-	return
-		q.x > -r && q.x < r&&
-		q.y > -r && q.y < r&&
-		q.z > -r && q.z < r;
-}
-
-inline bool IsEntityAngularVelocityReasonable(const Vector& q)
-{
-	float r = k_flMaxEntitySpinRate;
-	return
-		q.x > -r && q.x < r&&
-		q.y > -r && q.y < r&&
-		q.z > -r && q.z < r;
-}
-
-inline bool IsEntityQAngleVelReasonable(const QAngle& q)
-{
-	float r = k_flMaxEntitySpinRate;
-	return
-		q.x > -r && q.x < r&&
-		q.y > -r && q.y < r&&
-		q.z > -r && q.z < r;
-}
-
-extern bool CheckEmitReasonablePhysicsSpew();
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/basehandle.h b/SpyCustom/basehandle.h
deleted file mode 100644
index 393ec83..0000000
--- a/SpyCustom/basehandle.h
+++ /dev/null
@@ -1,160 +0,0 @@
-#ifndef BASEHANDLE_H
-#define BASEHANDLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "const.h"
-#include "dbg.h"
-
-
-class IHandleEntity;
-
-
-class CBaseHandle
-{
-	friend class CBaseEntityList;
-
-public:
-
-	CBaseHandle();
-	CBaseHandle(const CBaseHandle& other);
-	CBaseHandle(unsigned long value);
-	CBaseHandle(int iEntry, int iSerialNumber);
-
-	void Init(int iEntry, int iSerialNumber);
-	void Term();
-
-	bool IsValid() const;
-
-	int GetEntryIndex() const;
-	int GetSerialNumber() const;
-
-	int ToInt() const;
-	bool operator !=(const CBaseHandle& other) const;
-	bool operator ==(const CBaseHandle& other) const;
-	bool operator ==(const IHandleEntity* pEnt) const;
-	bool operator !=(const IHandleEntity* pEnt) const;
-	bool operator <(const CBaseHandle& other) const;
-	bool operator <(const IHandleEntity* pEnt) const;
-
-	const CBaseHandle& operator=(const IHandleEntity* pEntity);
-	const CBaseHandle& Set(const IHandleEntity* pEntity);
-
-	IHandleEntity* Get() const;
-
-
-protected:
-	unsigned long	m_Index;
-};
-
-
-#include "ihandleentity.h"
-
-
-inline CBaseHandle::CBaseHandle()
-{
-	m_Index = INVALID_EHANDLE_INDEX;
-}
-
-inline CBaseHandle::CBaseHandle(const CBaseHandle& other)
-{
-	m_Index = other.m_Index;
-}
-
-inline CBaseHandle::CBaseHandle(unsigned long value)
-{
-	m_Index = value;
-}
-
-inline CBaseHandle::CBaseHandle(int iEntry, int iSerialNumber)
-{
-	Init(iEntry, iSerialNumber);
-}
-
-inline void CBaseHandle::Init(int iEntry, int iSerialNumber)
-{
-	Assert(iEntry >= 0 && iEntry < NUM_ENT_ENTRIES);
-	Assert(iSerialNumber >= 0 && iSerialNumber < (1 << NUM_SERIAL_NUM_BITS));
-
-	m_Index = iEntry | (iSerialNumber << NUM_ENT_ENTRY_BITS);
-}
-
-inline void CBaseHandle::Term()
-{
-	m_Index = INVALID_EHANDLE_INDEX;
-}
-
-inline bool CBaseHandle::IsValid() const
-{
-	return m_Index != INVALID_EHANDLE_INDEX;
-}
-
-inline int CBaseHandle::GetEntryIndex() const
-{
-	return m_Index & ENT_ENTRY_MASK;
-}
-
-inline int CBaseHandle::GetSerialNumber() const
-{
-	return m_Index >> NUM_ENT_ENTRY_BITS;
-}
-
-inline int CBaseHandle::ToInt() const
-{
-	return (int)m_Index;
-}
-
-inline bool CBaseHandle::operator !=(const CBaseHandle& other) const
-{
-	return m_Index != other.m_Index;
-}
-
-inline bool CBaseHandle::operator ==(const CBaseHandle& other) const
-{
-	return m_Index == other.m_Index;
-}
-
-inline bool CBaseHandle::operator ==(const IHandleEntity* pEnt) const
-{
-	return Get() == pEnt;
-}
-
-inline bool CBaseHandle::operator !=(const IHandleEntity* pEnt) const
-{
-	return Get() != pEnt;
-}
-
-inline bool CBaseHandle::operator <(const CBaseHandle& other) const
-{
-	return m_Index < other.m_Index;
-}
-
-inline bool CBaseHandle::operator <(const IHandleEntity* pEntity) const
-{
-	unsigned long otherIndex = (pEntity) ? pEntity->GetRefEHandle().m_Index : INVALID_EHANDLE_INDEX;
-	return m_Index < otherIndex;
-}
-
-inline const CBaseHandle& CBaseHandle::operator=(const IHandleEntity* pEntity)
-{
-	return Set(pEntity);
-}
-
-inline const CBaseHandle& CBaseHandle::Set(const IHandleEntity* pEntity)
-{
-	if (pEntity)
-	{
-		*this = pEntity->GetRefEHandle();
-	}
-	else
-	{
-		m_Index = INVALID_EHANDLE_INDEX;
-	}
-
-	return *this;
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/basetypes.h b/SpyCustom/basetypes.h
deleted file mode 100644
index acbb225..0000000
--- a/SpyCustom/basetypes.h
+++ /dev/null
@@ -1,341 +0,0 @@
-#ifndef BASETYPES_H
-#define BASETYPES_H
-
-#include "commonmacros.h"  
-#include "wchartypes.h"  
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-
-
-#define DLLExtTokenPaste(x) #x
-#define DLLExtTokenPaste2(x) DLLExtTokenPaste(x)
-#define DLL_EXT_STRING DLLExtTokenPaste2( _DLL_EXT )
-
-
-
-#ifdef IN_XBOX_CODELINE
-#define XBOX_CODELINE_ONLY()
-#else
-#define XBOX_CODELINE_ONLY() Error_Compiling_Code_Only_Valid_in_Xbox_Codeline
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-
-#ifdef POSIX
-#include <stdint.h>
-#endif
-
-#define ExecuteNTimes( nTimes, x )	\
-	{								\
-		static int __executeCount=0;\
-		if ( __executeCount < nTimes )\
-		{							\
-			x;						\
-			++__executeCount;		\
-		}							\
-	}
-
-
-#define ExecuteOnce( x )			ExecuteNTimes( 1, x )
-
-
-template <typename T>
-inline T AlignValue(T val, uintptr_t alignment)
-{
-	return (T)(((uintptr_t)val + alignment - 1) & ~(alignment - 1));
-}
-
-
-#define PAD_NUMBER(number, boundary) \
-	( ((number) + ((boundary)-1)) / (boundary) ) * (boundary)
-
-#if !defined(M_PI) && !defined(HAVE_M_PI)
-#define M_PI			3.14159265358979323846
-#endif
-
-#define COMPILETIME_MIN( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
-#define COMPILETIME_MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-#ifndef MIN
-#define MIN( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
-#endif
-
-#ifndef MAX
-#define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-#endif
-
-#ifdef __cplusplus
-
-template< class T >
-T Clamp(T const& val, T const& minVal, T const& maxVal)
-{
-	if (val < minVal)
-		return minVal;
-	else if (val > maxVal)
-		return maxVal;
-	else
-		return val;
-}
-
-template< class T >
-T Min(T const& val1, T const& val2)
-{
-	return val1 < val2 ? val1 : val2;
-}
-
-template< class T >
-T Max(T const& val1, T const& val2)
-{
-	return val1 > val2 ? val1 : val2;
-}
-
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#define TRUE (!FALSE)
-#endif
-
-
-#ifndef DONT_DEFINE_BOOL       
-typedef int BOOL;
-#endif
-
-typedef int qboolean;
-typedef unsigned long ULONG;
-typedef unsigned char BYTE;
-typedef unsigned char byte;
-typedef unsigned short word;
-#ifdef _WIN32
-typedef wchar_t ucs2;      
-#else
-typedef unsigned short ucs2;
-#endif
-
-enum ThreeState_t
-{
-	TRS_FALSE,
-	TRS_TRUE,
-	TRS_NONE,
-};
-
-typedef float vec_t;
-
-#if defined(__GNUC__)
-#define fpmin __builtin_fminf
-#define fpmax __builtin_fmaxf
-#elif !defined(_X360)
-#define fpmin min
-#define fpmax max
-#endif
-
-
-
-inline unsigned long& FloatBits(vec_t& f)
-{
-	return *reinterpret_cast<unsigned long*>(&f);
-}
-
-inline unsigned long const& FloatBits(vec_t const& f)
-{
-	return *reinterpret_cast<unsigned long const*>(&f);
-}
-
-inline vec_t BitsToFloat(unsigned long i)
-{
-	return *reinterpret_cast<vec_t*>(&i);
-}
-
-inline bool IsFinite(vec_t f)
-{
-	return ((FloatBits(f) & 0x7F800000) != 0x7F800000);
-}
-
-inline unsigned long FloatAbsBits(vec_t f)
-{
-	return FloatBits(f) & 0x7FFFFFFF;
-}
-
-#ifdef _MSC_VER
-#ifndef _In_
-#define _In_
-#endif
-extern "C" float fabsf(_In_ float);
-#else
-#include <math.h>
-#endif
-
-inline float FloatMakeNegative(vec_t f)
-{
-	return -fabsf(f);
-}
-
-inline float FloatMakePositive(vec_t f)
-{
-	return fabsf(f);
-}
-
-inline float FloatNegate(vec_t f)
-{
-	return -f;
-}
-
-
-#define FLOAT32_NAN_BITS     (unsigned long)0x7FC00000	   
-#define FLOAT32_NAN          BitsToFloat( FLOAT32_NAN_BITS )
-
-#define VEC_T_NAN FLOAT32_NAN
-
-
-
-struct color24
-{
-	byte r, g, b;
-};
-
-typedef struct color32_s
-{
-	bool operator!=(const struct color32_s& other) const;
-
-	byte r, g, b, a;
-} color32;
-
-inline bool color32::operator!=(const color32& other) const
-{
-	return r != other.r || g != other.g || b != other.b || a != other.a;
-}
-
-struct colorVec
-{
-	unsigned r, g, b, a;
-};
-
-
-#ifndef NOTE_UNUSED
-#define NOTE_UNUSED(x)	(void)(x)	      
-#endif
-
-struct vrect_t
-{
-	int				x, y, width, height;
-	vrect_t* pnext;
-};
-
-
-struct Rect_t
-{
-	int x, y;
-	int width, height;
-};
-
-
-struct interval_t
-{
-	float start;
-	float range;
-};
-
-
-template< class HandleType >
-class CBaseIntHandle
-{
-public:
-
-	inline bool			operator==(const CBaseIntHandle& other) { return m_Handle == other.m_Handle; }
-	inline bool			operator!=(const CBaseIntHandle& other) { return m_Handle != other.m_Handle; }
-
-	inline HandleType	GetHandleValue() { return m_Handle; }
-	inline void			SetHandleValue(HandleType val) { m_Handle = val; }
-
-	typedef HandleType	HANDLE_TYPE;
-
-protected:
-
-	HandleType	m_Handle;
-};
-
-template< class DummyType >
-class CIntHandle16 : public CBaseIntHandle< unsigned short >
-{
-public:
-	inline			CIntHandle16() {}
-
-	static inline	CIntHandle16<DummyType> MakeHandle(HANDLE_TYPE val)
-	{
-		return CIntHandle16<DummyType>(val);
-	}
-
-protected:
-	inline			CIntHandle16(HANDLE_TYPE val)
-	{
-		m_Handle = val;
-	}
-};
-
-
-template< class DummyType >
-class CIntHandle32 : public CBaseIntHandle< unsigned long >
-{
-public:
-	inline			CIntHandle32() {}
-
-	static inline	CIntHandle32<DummyType> MakeHandle(HANDLE_TYPE val)
-	{
-		return CIntHandle32<DummyType>(val);
-	}
-
-protected:
-	inline			CIntHandle32(HANDLE_TYPE val)
-	{
-		m_Handle = val;
-	}
-};
-
-
-#define DECLARE_HANDLE_16BIT(name)	typedef CIntHandle16< struct name##__handle * > name;
-#define DECLARE_HANDLE_32BIT(name)	typedef CIntHandle32< struct name##__handle * > name;
-
-#define DECLARE_POINTER_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name
-#define FORWARD_DECLARE_HANDLE(name) typedef struct name##__ *name
-
-#if !defined(_STATIC_LINKED) && !defined(PUBLISH_DLL_SUBSYSTEM)
-#define PUBLISH_DLL_SUBSYSTEM()
-#endif
-
-#define UID_PREFIX generated_id_
-#define UID_CAT1(a,c) a ## c
-#define UID_CAT2(a,c) UID_CAT1(a,c)
-#define EXPAND_CONCAT(a,c) UID_CAT1(a,c)
-#ifdef _MSC_VER
-#define UNIQUE_ID UID_CAT2(UID_PREFIX,__COUNTER__)
-#else
-#define UNIQUE_ID UID_CAT2(UID_PREFIX,__LINE__)
-#endif
-
-#define DEFINE_ENUM_BITWISE_OPERATORS( Type ) \
-	inline Type  operator|  ( Type  a, Type b ) { return Type( int( a ) | int( b ) ); } \
-	inline Type  operator&  ( Type  a, Type b ) { return Type( int( a ) & int( b ) ); } \
-	inline Type  operator^  ( Type  a, Type b ) { return Type( int( a ) ^ int( b ) ); } \
-	inline Type  operator<< ( Type  a, int  b ) { return Type( int( a ) << b ); } \
-	inline Type  operator>> ( Type  a, int  b ) { return Type( int( a ) >> b ); } \
-	inline Type &operator|= ( Type &a, Type b ) { return a = a |  b; } \
-	inline Type &operator&= ( Type &a, Type b ) { return a = a &  b; } \
-	inline Type &operator^= ( Type &a, Type b ) { return a = a ^  b; } \
-	inline Type &operator<<=( Type &a, int  b ) { return a = a << b; } \
-	inline Type &operator>>=( Type &a, int  b ) { return a = a >> b; } \
-	inline Type  operator~( Type a ) { return Type( ~int( a ) ); }
-
-#define DEFINE_ENUM_INCREMENT_OPERATORS( Type ) \
-	inline Type &operator++( Type &a      ) { return a = Type( int( a ) + 1 ); } \
-	inline Type &operator--( Type &a      ) { return a = Type( int( a ) - 1 ); } \
-	inline Type  operator++( Type &a, int ) { Type t = a; ++a; return t; } \
-	inline Type  operator--( Type &a, int ) { Type t = a; --a; return t; }
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/beam_flags.h b/SpyCustom/beam_flags.h
deleted file mode 100644
index e978875..0000000
--- a/SpyCustom/beam_flags.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#if !defined( BEAM_FLAGS_H )
-#define BEAM_FLAGS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-enum
-{
-    FBEAM_STARTENTITY = 0x00000001,
-    FBEAM_ENDENTITY = 0x00000002,
-    FBEAM_FADEIN = 0x00000004,
-    FBEAM_FADEOUT = 0x00000008,
-    FBEAM_SINENOISE = 0x00000010,
-    FBEAM_SOLID = 0x00000020,
-    FBEAM_SHADEIN = 0x00000040,
-    FBEAM_SHADEOUT = 0x00000080,
-    FBEAM_ONLYNOISEONCE = 0x00000100,            
-    FBEAM_NOTILE = 0x00000200,
-    FBEAM_USE_HITBOXES = 0x00000400,                 
-    FBEAM_STARTVISIBLE = 0x00000800,                 
-    FBEAM_ENDVISIBLE = 0x00001000,                 
-    FBEAM_ISACTIVE = 0x00002000,
-    FBEAM_FOREVER = 0x00004000,
-    FBEAM_HALOBEAM = 0x00008000,                    
-    FBEAM_REVERSED = 0x00010000,
-    NUM_BEAM_FLAGS = 17    
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/bitbuf.h b/SpyCustom/bitbuf.h
deleted file mode 100644
index ce8aa81..0000000
--- a/SpyCustom/bitbuf.h
+++ /dev/null
@@ -1,624 +0,0 @@
-#ifndef BITBUF_H
-#define BITBUF_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "mathlib.h"
-#include "vector.h"
-#include "basetypes.h"
-
-#if _DEBUG
-#define BITBUF_INLINE inline
-#else
-#define BITBUF_INLINE FORCEINLINE
-#endif
-
-class Vector;
-class QAngle;
-
-typedef enum
-{
-	BITBUFERROR_VALUE_OUT_OF_RANGE = 0,		         
-	BITBUFERROR_BUFFER_OVERRUN,				      
-
-	BITBUFERROR_NUM_ERRORS
-} BitBufErrorType;
-
-
-typedef void (*BitBufErrorHandler)(BitBufErrorType errorType, const char* pDebugName);
-
-
-#if defined( _DEBUG )
-extern void InternalBitBufErrorHandler(BitBufErrorType errorType, const char* pDebugName);
-#define CallErrorHandler( errorType, pDebugName ) InternalBitBufErrorHandler( errorType, pDebugName );
-#else
-#define CallErrorHandler( errorType, pDebugName )
-#endif
-
-
-void SetBitBufErrorHandler(BitBufErrorHandler fn);
-
-
-inline int BitByte(int bits)
-{
-	return (bits + 7) >> 3;
-}
-
-namespace bitbuf
-{
-	inline uint32 ZigZagEncode32(int32 n)
-	{
-		return(n << 1) ^ (n >> 31);
-	}
-
-	inline int32 ZigZagDecode32(uint32 n)
-	{
-		return(n >> 1) ^ -static_cast<int32>(n & 1);
-	}
-
-	inline uint64 ZigZagEncode64(int64 n)
-	{
-		return(n << 1) ^ (n >> 63);
-	}
-
-	inline int64 ZigZagDecode64(uint64 n)
-	{
-		return(n >> 1) ^ -static_cast<int64>(n & 1);
-	}
-
-	const int kMaxVarintBytes = 10;
-	const int kMaxVarint32Bytes = 5;
-}
-
-class bf_write
-{
-public:
-	bf_write();
-
-	bf_write(void* pData, int nBytes, int nMaxBits = -1);
-	bf_write(const char* pDebugName, void* pData, int nBytes, int nMaxBits = -1);
-
-	void			StartWriting(void* pData, int nBytes, int iStartBit = 0, int nMaxBits = -1);
-
-	void			Reset();
-
-	unsigned char* GetBasePointer() { return (unsigned char*)m_pData; }
-
-	void			SetAssertOnOverflow(bool bAssert);
-
-	const char* GetDebugName();
-	void			SetDebugName(const char* pDebugName);
-
-
-public:
-
-	void			SeekToBit(int bitPos);
-
-
-public:
-
-	void			WriteOneBit(int nValue);
-	void			WriteOneBitNoCheck(int nValue);
-	void			WriteOneBitAt(int iBit, int nValue);
-
-	void			WriteUBitLong(unsigned int data, int numbits, bool bCheckRange = true);
-	void			WriteSBitLong(int data, int numbits);
-
-	void			WriteBitLong(unsigned int data, int numbits, bool bSigned);
-
-	bool			WriteBits(const void* pIn, int nBits);
-
-	void			WriteUBitVar(unsigned int data);
-
-	void			WriteVarInt32(uint32 data);
-	void			WriteVarInt64(uint64 data);
-	void			WriteSignedVarInt32(int32 data);
-	void			WriteSignedVarInt64(int64 data);
-	int				ByteSizeVarInt32(uint32 data);
-	int				ByteSizeVarInt64(uint64 data);
-	int				ByteSizeSignedVarInt32(int32 data);
-	int				ByteSizeSignedVarInt64(int64 data);
-
-	bool			WriteBitsFromBuffer(class bf_read* pIn, int nBits);
-
-	void			WriteBitAngle(float fAngle, int numbits);
-	void			WriteBitCoord(const float f);
-	void			WriteBitCoordMP(const float f, bool bIntegral, bool bLowPrecision);
-	void			WriteBitFloat(float val);
-	void			WriteBitVec3Coord(const Vector& fa);
-	void			WriteBitNormal(float f);
-	void			WriteBitVec3Normal(const Vector& fa);
-	void			WriteBitAngles(const QAngle& fa);
-
-
-public:
-
-	void			WriteChar(int val);
-	void			WriteByte(int val);
-	void			WriteShort(int val);
-	void			WriteWord(int val);
-	void			WriteLong(long val);
-	void			WriteLongLong(int64 val);
-	void			WriteFloat(float val);
-	bool			WriteBytes(const void* pBuf, int nBytes);
-
-	bool			WriteString(const char* pStr);
-
-
-public:
-
-	int				GetNumBytesWritten() const;
-	int				GetNumBitsWritten() const;
-	int				GetMaxNumBits();
-	int				GetNumBitsLeft();
-	int				GetNumBytesLeft();
-	unsigned char* GetData();
-	const unsigned char* GetData() const;
-
-	bool			CheckForOverflow(int nBits);
-	inline bool		IsOverflowed() const { return m_bOverflow; }
-
-	void			SetOverflowFlag();
-
-
-public:
-	unsigned long* RESTRICT m_pData;
-	int				m_nDataBytes;
-	int				m_nDataBits;
-
-	int				m_iCurBit;
-
-private:
-
-	bool			m_bOverflow;
-
-	bool			m_bAssertOnOverflow;
-	const char* m_pDebugName;
-};
-
-
-inline int bf_write::GetNumBytesWritten() const
-{
-	return BitByte(m_iCurBit);
-}
-
-inline int bf_write::GetNumBitsWritten() const
-{
-	return m_iCurBit;
-}
-
-inline int bf_write::GetMaxNumBits()
-{
-	return m_nDataBits;
-}
-
-inline int bf_write::GetNumBitsLeft()
-{
-	return m_nDataBits - m_iCurBit;
-}
-
-inline int bf_write::GetNumBytesLeft()
-{
-	return GetNumBitsLeft() >> 3;
-}
-
-inline unsigned char* bf_write::GetData()
-{
-	return (unsigned char*)m_pData;
-}
-
-inline const unsigned char* bf_write::GetData()	const
-{
-	return (unsigned char*)m_pData;
-}
-
-BITBUF_INLINE bool bf_write::CheckForOverflow(int nBits)
-{
-	if (m_iCurBit + nBits > m_nDataBits)
-	{
-		SetOverflowFlag();
-		CallErrorHandler(BITBUFERROR_BUFFER_OVERRUN, GetDebugName());
-	}
-
-	return m_bOverflow;
-}
-
-BITBUF_INLINE void bf_write::SetOverflowFlag()
-{
-#ifdef DBGFLAG_ASSERT
-	if (m_bAssertOnOverflow)
-	{
-		Assert(false);
-	}
-#endif
-	m_bOverflow = true;
-}
-
-BITBUF_INLINE void bf_write::WriteOneBitNoCheck(int nValue)
-{
-#if __i386__
-	if (nValue)
-		m_pData[m_iCurBit >> 5] |= 1u << (m_iCurBit & 31);
-	else
-		m_pData[m_iCurBit >> 5] &= ~(1u << (m_iCurBit & 31));
-#else
-	extern unsigned long g_LittleBits[32];
-	if (nValue)
-		m_pData[m_iCurBit >> 5] |= g_LittleBits[m_iCurBit & 31];
-	else
-		m_pData[m_iCurBit >> 5] &= ~g_LittleBits[m_iCurBit & 31];
-#endif
-
-	++m_iCurBit;
-}
-
-inline void bf_write::WriteOneBit(int nValue)
-{
-	if (m_iCurBit >= m_nDataBits)
-	{
-		SetOverflowFlag();
-		CallErrorHandler(BITBUFERROR_BUFFER_OVERRUN, GetDebugName());
-		return;
-	}
-	WriteOneBitNoCheck(nValue);
-}
-
-
-inline void	bf_write::WriteOneBitAt(int iBit, int nValue)
-{
-	if (iBit >= m_nDataBits)
-	{
-		SetOverflowFlag();
-		CallErrorHandler(BITBUFERROR_BUFFER_OVERRUN, GetDebugName());
-		return;
-	}
-
-#if __i386__
-	if (nValue)
-		m_pData[iBit >> 5] |= 1u << (iBit & 31);
-	else
-		m_pData[iBit >> 5] &= ~(1u << (iBit & 31));
-#else
-	extern unsigned long g_LittleBits[32];
-	if (nValue)
-		m_pData[iBit >> 5] |= g_LittleBits[iBit & 31];
-	else
-		m_pData[iBit >> 5] &= ~g_LittleBits[iBit & 31];
-#endif
-}
-
-BITBUF_INLINE void bf_write::WriteUBitLong(unsigned int curData, int numbits, bool bCheckRange) RESTRICT
-{
-#ifdef _DEBUG
-	if (bCheckRange && numbits < 32)
-	{
-		if (curData >= (unsigned long)(1 << numbits))
-		{
-			CallErrorHandler(BITBUFERROR_VALUE_OUT_OF_RANGE, GetDebugName());
-		}
-	}
-	Assert(numbits >= 0 && numbits <= 32);
-#endif
-
-	if (GetNumBitsLeft() < numbits)
-	{
-		m_iCurBit = m_nDataBits;
-		SetOverflowFlag();
-		CallErrorHandler(BITBUFERROR_BUFFER_OVERRUN, GetDebugName());
-		return;
-	}
-
-	int iCurBitMasked = m_iCurBit & 31;
-	int iDWord = m_iCurBit >> 5;
-	m_iCurBit += numbits;
-
-	Assert((iDWord * 4 + sizeof(long)) <= (unsigned int)m_nDataBytes);
-	unsigned long* RESTRICT pOut = &m_pData[iDWord];
-
-	curData = (curData << iCurBitMasked) | (curData >> (32 - iCurBitMasked));
-
-	unsigned int temp = 1 << (numbits - 1);
-	unsigned int mask1 = (temp * 2 - 1) << iCurBitMasked;
-	unsigned int mask2 = (temp - 1) >> (31 - iCurBitMasked);
-
-	int i = mask2 & 1;
-	unsigned long dword1 = LoadLittleDWord(pOut, 0);
-	unsigned long dword2 = LoadLittleDWord(pOut, i);
-
-	dword1 ^= (mask1 & (curData ^ dword1));
-	dword2 ^= (mask2 & (curData ^ dword2));
-
-	StoreLittleDWord(pOut, i, dword2);
-	StoreLittleDWord(pOut, 0, dword1);
-}
-
-BITBUF_INLINE void bf_write::WriteUBitVar(unsigned int data)
-{
-	int n = (data < 0x10u ? -1 : 0) + (data < 0x100u ? -1 : 0) + (data < 0x1000u ? -1 : 0);
-	WriteUBitLong(data * 4 + n + 3, 6 + n * 4 + 12);
-	if (data >= 0x1000u)
-	{
-		WriteUBitLong(data >> 16, 16);
-	}
-}
-
-BITBUF_INLINE void bf_write::WriteBitFloat(float val)
-{
-	long intVal;
-
-	Assert(sizeof(long) == sizeof(float));
-	Assert(sizeof(float) == 4);
-
-	intVal = *((long*)&val);
-	WriteUBitLong(intVal, 32);
-}
-
-template<int SIZE>
-class old_bf_write_static : public bf_write
-{
-public:
-	inline old_bf_write_static() : bf_write(m_StaticData, SIZE) {}
-
-	char	m_StaticData[SIZE];
-};
-
-
-
-class bf_read
-{
-public:
-	bf_read();
-
-	bf_read(const void* pData, int nBytes, int nBits = -1);
-	bf_read(const char* pDebugName, const void* pData, int nBytes, int nBits = -1);
-
-	void			StartReading(const void* pData, int nBytes, int iStartBit = 0, int nBits = -1);
-
-	void			Reset();
-
-	void			SetAssertOnOverflow(bool bAssert);
-
-	const char* GetDebugName() const { return m_pDebugName; }
-	void			SetDebugName(const char* pName);
-
-	void			ExciseBits(int startbit, int bitstoremove);
-
-
-public:
-
-	int				ReadOneBit();
-
-
-protected:
-
-	unsigned int	CheckReadUBitLong(int numbits);		  
-	int				ReadOneBitNoCheck();				        
-	bool			CheckForOverflow(int nBits);
-
-
-public:
-
-	const unsigned char* GetBasePointer() { return m_pData; }
-
-	BITBUF_INLINE int TotalBytesAvailable(void) const
-	{
-		return m_nDataBytes;
-	}
-
-	void            ReadBits(void* pOut, int nBits);
-	int             ReadBitsClamped_ptr(void* pOut, size_t outSizeBytes, size_t nBits);
-	template <typename T, size_t N>
-	int             ReadBitsClamped(T(&pOut)[N], size_t nBits)
-	{
-		return ReadBitsClamped_ptr(pOut, N * sizeof(T), nBits);
-	}
-
-	float			ReadBitAngle(int numbits);
-
-	unsigned int	ReadUBitLong(int numbits) RESTRICT;
-	unsigned int	ReadUBitLongNoInline(int numbits) RESTRICT;
-	unsigned int	PeekUBitLong(int numbits);
-	int				ReadSBitLong(int numbits);
-
-	unsigned int	ReadUBitVar();
-	unsigned int	ReadUBitVarInternal(int encodingType);
-
-	uint32			ReadVarInt32();
-	uint64			ReadVarInt64();
-	int32			ReadSignedVarInt32();
-	int64			ReadSignedVarInt64();
-
-	unsigned int	ReadBitLong(int numbits, bool bSigned);
-
-	float			ReadBitCoord();
-	float			ReadBitCoordMP(bool bIntegral, bool bLowPrecision);
-	float			ReadBitFloat();
-	float			ReadBitNormal();
-	void			ReadBitVec3Coord(Vector& fa);
-	void			ReadBitVec3Normal(Vector& fa);
-	void			ReadBitAngles(QAngle& fa);
-
-	unsigned int	ReadBitCoordBits();
-	unsigned int	ReadBitCoordMPBits(bool bIntegral, bool bLowPrecision);
-
-public:
-
-	BITBUF_INLINE int	ReadChar() { return (char)ReadUBitLong(8); }
-	BITBUF_INLINE int	ReadByte() { return ReadUBitLong(8); }
-	BITBUF_INLINE int	ReadShort() { return (short)ReadUBitLong(16); }
-	BITBUF_INLINE int	ReadWord() { return ReadUBitLong(16); }
-	BITBUF_INLINE long ReadLong() { return ReadUBitLong(32); }
-	int64			ReadLongLong();
-	float			ReadFloat();
-	bool			ReadBytes(void* pOut, int nBytes);
-
-	bool			ReadString(char* pStr, int bufLen, bool bLine = false, int* pOutNumChars = NULL);
-
-	char* ReadAndAllocateString(bool* pOverflow = 0);
-
-	int				CompareBits(bf_read* RESTRICT other, int bits) RESTRICT;
-	int				CompareBitsAt(int offset, bf_read* RESTRICT other, int otherOffset, int bits) RESTRICT;
-
-public:
-	int				GetNumBytesLeft();
-	int				GetNumBytesRead();
-	int				GetNumBitsLeft();
-	int				GetNumBitsRead() const;
-
-	inline bool		IsOverflowed() const { return m_bOverflow; }
-
-	inline bool		Seek(int iBit);					     
-	inline bool		SeekRelative(int iBitDelta);	        
-
-	void			SetOverflowFlag();
-
-
-public:
-
-	const unsigned char* RESTRICT m_pData;
-	int						m_nDataBytes;
-	int						m_nDataBits;
-
-	int				m_iCurBit;
-
-
-private:
-	bool			m_bOverflow;
-
-	bool			m_bAssertOnOverflow;
-
-	const char* m_pDebugName;
-};
-
-inline int bf_read::GetNumBytesRead()
-{
-	return BitByte(m_iCurBit);
-}
-
-inline int bf_read::GetNumBitsLeft()
-{
-	return m_nDataBits - m_iCurBit;
-}
-
-inline int bf_read::GetNumBytesLeft()
-{
-	return GetNumBitsLeft() >> 3;
-}
-
-inline int bf_read::GetNumBitsRead() const
-{
-	return m_iCurBit;
-}
-
-inline bool bf_read::Seek(int iBit)
-{
-	if (iBit < 0 || iBit > m_nDataBits)
-	{
-		SetOverflowFlag();
-		m_iCurBit = m_nDataBits;
-		return false;
-	}
-	else
-	{
-		m_iCurBit = iBit;
-		return true;
-	}
-}
-
-inline bool	bf_read::SeekRelative(int iBitDelta)
-{
-	return Seek(m_iCurBit + iBitDelta);
-}
-
-inline bool bf_read::CheckForOverflow(int nBits)
-{
-	if (m_iCurBit + nBits > m_nDataBits)
-	{
-		SetOverflowFlag();
-		CallErrorHandler(BITBUFERROR_BUFFER_OVERRUN, GetDebugName());
-	}
-
-	return m_bOverflow;
-}
-
-inline int bf_read::ReadOneBitNoCheck()
-{
-#if VALVE_LITTLE_ENDIAN
-	unsigned int value = ((unsigned long* RESTRICT)m_pData)[m_iCurBit >> 5] >> (m_iCurBit & 31);
-#else
-	unsigned char value = m_pData[m_iCurBit >> 3] >> (m_iCurBit & 7);
-#endif
-	++m_iCurBit;
-	return value & 1;
-}
-
-inline int bf_read::ReadOneBit()
-{
-	if (GetNumBitsLeft() <= 0)
-	{
-		SetOverflowFlag();
-		CallErrorHandler(BITBUFERROR_BUFFER_OVERRUN, GetDebugName());
-		return 0;
-	}
-	return ReadOneBitNoCheck();
-}
-
-inline float bf_read::ReadBitFloat()
-{
-	union { uint32 u; float f; } c = { ReadUBitLong(32) };
-	return c.f;
-}
-
-BITBUF_INLINE unsigned int bf_read::ReadUBitVar()
-{
-	unsigned int sixbits = ReadUBitLong(6);
-	unsigned int encoding = sixbits & 3;
-	if (encoding)
-	{
-		return ReadUBitVarInternal(encoding);
-	}
-	return sixbits >> 2;
-}
-
-BITBUF_INLINE unsigned int bf_read::ReadUBitLong(int numbits) RESTRICT
-{
-	Assert(numbits > 0 && numbits <= 32);
-
-	if (GetNumBitsLeft() < numbits)
-	{
-		m_iCurBit = m_nDataBits;
-		SetOverflowFlag();
-		CallErrorHandler(BITBUFERROR_BUFFER_OVERRUN, GetDebugName());
-		return 0;
-	}
-
-	unsigned int iStartBit = m_iCurBit & 31u;
-	int iLastBit = m_iCurBit + numbits - 1;
-	unsigned int iWordOffset1 = m_iCurBit >> 5;
-	unsigned int iWordOffset2 = iLastBit >> 5;
-	m_iCurBit += numbits;
-
-#if __i386__
-	unsigned int bitmask = (2 << (numbits - 1)) - 1;
-#else
-	extern unsigned long g_ExtraMasks[33];
-	unsigned int bitmask = g_ExtraMasks[numbits];
-#endif
-
-	unsigned int dw1 = LoadLittleDWord((unsigned long* RESTRICT)m_pData, iWordOffset1) >> iStartBit;
-	unsigned int dw2 = LoadLittleDWord((unsigned long* RESTRICT)m_pData, iWordOffset2) << (32 - iStartBit);
-
-	return (dw1 | dw2) & bitmask;
-}
-
-BITBUF_INLINE int bf_read::CompareBits(bf_read* RESTRICT other, int numbits) RESTRICT
-{
-	return (ReadUBitLong(numbits) != other->ReadUBitLong(numbits));
-}
-
-
-#endif
-
diff --git a/SpyCustom/bittools.h b/SpyCustom/bittools.h
deleted file mode 100644
index 90503d5..0000000
--- a/SpyCustom/bittools.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef BITTOOLS_H
-#define BITTOOLS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-namespace bittools
-{
-    template<int N, int C = 0>
-    struct RecurseBit
-    {
-        enum { result = RecurseBit<N / 2, C + 1>::result };
-    };
-
-    template<int C>
-    struct RecurseBit<0, C>
-    {
-        enum { result = C };
-    };
-
-    template<int N, int C = 1>
-    struct RecursePow2
-    {
-        enum { result = RecursePow2<N / 2, C * 2>::result };
-    };
-
-    template<int C>
-    struct RecursePow2<0, C>
-    {
-        enum { result = C };
-    };
-
-}
-
-#define ROUND_TO_POWER_OF_2( n ) ( bittools::RecursePow2< (n) - 1 >::result )
-#define MINIMUM_BITS_NEEDED( n ) ( bittools::RecurseBit< (n) - 1 >::result )
-
-#endif 
\ No newline at end of file
diff --git a/SpyCustom/bitvec.h b/SpyCustom/bitvec.h
deleted file mode 100644
index 46d6ed6..0000000
--- a/SpyCustom/bitvec.h
+++ /dev/null
@@ -1,1239 +0,0 @@
-#ifndef BITVEC_H
-#define BITVEC_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <limits.h>
-#include "dbg.h"
-#include "basetypes.h"
-
-
-class CBitVecAccessor
-{
-public:
-	CBitVecAccessor(uint32* pDWords, int iBit);
-
-	void		operator=(int val);
-	operator uint32();
-
-private:
-	uint32* m_pDWords;
-	int	m_iBit;
-};
-
-
-#define LOG2_BITS_PER_INT	5
-#define BITS_PER_INT		32
-
-#if _WIN32 && !defined(_X360)
-#include <intrin.h>
-#pragma intrinsic(_BitScanForward)
-#endif
-
-inline int FirstBitInWord(unsigned int elem, int offset)
-{
-#if _WIN32
-	if (!elem)
-		return -1;
-#if defined( _X360 )
-	unsigned int mask = elem - 1;
-	unsigned int comp = ~elem;
-	elem = mask & comp;
-	return (32 - _CountLeadingZeros(elem)) + offset;
-#else
-	unsigned long out;
-	_BitScanForward(&out, elem);
-	return out + offset;
-#endif
-
-#else
-	static unsigned firstBitLUT[256] =
-	{
-		0,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,
-		3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
-		4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,
-		3,0,1,0,2,0,1,0,7,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
-		5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,0,1,0,2,0,1,0,
-		3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
-		4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-	};
-	unsigned elemByte;
-
-	elemByte = (elem & 0xFF);
-	if (elemByte)
-		return offset + firstBitLUT[elemByte];
-
-	elem >>= 8;
-	offset += 8;
-	elemByte = (elem & 0xFF);
-	if (elemByte)
-		return offset + firstBitLUT[elemByte];
-
-	elem >>= 8;
-	offset += 8;
-	elemByte = (elem & 0xFF);
-	if (elemByte)
-		return offset + firstBitLUT[elemByte];
-
-	elem >>= 8;
-	offset += 8;
-	elemByte = (elem & 0xFF);
-	if (elemByte)
-		return offset + firstBitLUT[elemByte];
-
-	return -1;
-#endif
-}
-
-inline unsigned GetEndMask(int numBits)
-{
-	static unsigned bitStringEndMasks[] =
-	{
-		0xffffffff,
-		0x00000001,
-		0x00000003,
-		0x00000007,
-		0x0000000f,
-		0x0000001f,
-		0x0000003f,
-		0x0000007f,
-		0x000000ff,
-		0x000001ff,
-		0x000003ff,
-		0x000007ff,
-		0x00000fff,
-		0x00001fff,
-		0x00003fff,
-		0x00007fff,
-		0x0000ffff,
-		0x0001ffff,
-		0x0003ffff,
-		0x0007ffff,
-		0x000fffff,
-		0x001fffff,
-		0x003fffff,
-		0x007fffff,
-		0x00ffffff,
-		0x01ffffff,
-		0x03ffffff,
-		0x07ffffff,
-		0x0fffffff,
-		0x1fffffff,
-		0x3fffffff,
-		0x7fffffff,
-	};
-
-	return bitStringEndMasks[numBits % BITS_PER_INT];
-}
-
-
-inline int GetBitForBitnum(int bitNum)
-{
-	static int bitsForBitnum[] =
-	{
-		(1 << 0),
-		(1 << 1),
-		(1 << 2),
-		(1 << 3),
-		(1 << 4),
-		(1 << 5),
-		(1 << 6),
-		(1 << 7),
-		(1 << 8),
-		(1 << 9),
-		(1 << 10),
-		(1 << 11),
-		(1 << 12),
-		(1 << 13),
-		(1 << 14),
-		(1 << 15),
-		(1 << 16),
-		(1 << 17),
-		(1 << 18),
-		(1 << 19),
-		(1 << 20),
-		(1 << 21),
-		(1 << 22),
-		(1 << 23),
-		(1 << 24),
-		(1 << 25),
-		(1 << 26),
-		(1 << 27),
-		(1 << 28),
-		(1 << 29),
-		(1 << 30),
-		(1 << 31),
-	};
-
-	return bitsForBitnum[(bitNum) & (BITS_PER_INT - 1)];
-}
-
-inline int GetBitForBitnumByte(int bitNum)
-{
-	static int bitsForBitnum[] =
-	{
-		(1 << 0),
-		(1 << 1),
-		(1 << 2),
-		(1 << 3),
-		(1 << 4),
-		(1 << 5),
-		(1 << 6),
-		(1 << 7),
-	};
-
-	return bitsForBitnum[bitNum & 7];
-}
-
-inline int CalcNumIntsForBits(int numBits) { return (numBits + (BITS_PER_INT - 1)) / BITS_PER_INT; }
-
-#ifdef _X360
-#define BitVec_Bit( bitNum ) GetBitForBitnum( bitNum )
-#define BitVec_BitInByte( bitNum ) GetBitForBitnumByte( bitNum )
-#else
-#define BitVec_Bit( bitNum ) ( 1 << ( (bitNum) & (BITS_PER_INT-1) ) )
-#define BitVec_BitInByte( bitNum ) ( 1 << ( (bitNum) & 7 ) )
-#endif
-#define BitVec_Int( bitNum ) ( (bitNum) >> LOG2_BITS_PER_INT )
-
-
-template <class BASE_OPS>
-class CBitVecT : public BASE_OPS
-{
-public:
-	CBitVecT();
-	CBitVecT(int numBits);			        
-
-	void	Init(int val = 0);
-
-	CBitVecAccessor	operator[](int i);
-
-	void	And(const CBitVecT& andStr, CBitVecT* out) const;
-	void	Or(const CBitVecT& orStr, CBitVecT* out) const;
-	void	Xor(const CBitVecT& orStr, CBitVecT* out) const;
-
-	void	Not(CBitVecT* out) const;
-
-	void	CopyTo(CBitVecT* out) const;
-	void	Copy(const CBitVecT<BASE_OPS>& other, int nBits = -1);
-	bool	Compare(const CBitVecT<BASE_OPS>& other, int nBits = -1) const;
-
-	bool	IsAllClear(void) const;		    
-	bool	IsAllSet(void) const;		    
-
-	uint32	Get(uint32 bitNum) const;
-	bool 	IsBitSet(int bitNum) const;
-	void 	Set(int bitNum);
-	void 	Set(int bitNum, bool bNewVal);
-	void 	Clear(int bitNum);
-
-	bool	TestAndSet(int bitNum);
-
-	void 	Set(uint32 offset, uint32 mask);
-	void 	Clear(uint32 offset, uint32 mask);
-	uint32	Get(uint32 offset, uint32 mask);
-
-	void	SetAll(void);			   
-	void	ClearAll(void);			   
-
-	uint32	GetDWord(int i) const;
-	void	SetDWord(int i, uint32 val);
-
-	CBitVecT<BASE_OPS>& operator=(const CBitVecT<BASE_OPS>& other) { other.CopyTo(this); return *this; }
-	bool			operator==(const CBitVecT<BASE_OPS>& other) { return Compare(other); }
-	bool			operator!=(const CBitVecT<BASE_OPS>& other) { return !operator==(other); }
-
-	static void GetOffsetMaskForBit(uint32 bitNum, uint32* pOffset, uint32* pMask) { *pOffset = BitVec_Int(bitNum); *pMask = BitVec_Bit(bitNum); }
-};
-
-template <typename BITCOUNTTYPE>
-class CVarBitVecBase
-{
-public:
-	bool	IsFixedSize() const { return false; }
-	int		GetNumBits(void) const { return m_numBits; }
-	void	Resize(int numBits, bool bClearAll = false);		   
-
-	int 	GetNumDWords() const { return m_numInts; }
-	uint32* Base() { return m_pInt; }
-	const uint32* Base() const { return m_pInt; }
-
-	void Attach(uint32* pBits, int numBits);
-	bool Detach(uint32** ppBits, int* pNumBits);
-
-	int		FindNextSetBit(int iStartBit) const;         
-
-protected:
-	CVarBitVecBase();
-	CVarBitVecBase(int numBits);
-	CVarBitVecBase(const CVarBitVecBase<BITCOUNTTYPE>& from);
-	CVarBitVecBase& operator=(const CVarBitVecBase<BITCOUNTTYPE>& from);
-	~CVarBitVecBase(void);
-
-	void 		ValidateOperand(const CVarBitVecBase<BITCOUNTTYPE>& operand) const { Assert(GetNumBits() == operand.GetNumBits()); }
-
-	unsigned	GetEndMask() const { return ::GetEndMask(GetNumBits()); }
-
-private:
-
-	BITCOUNTTYPE	m_numBits;					      
-	BITCOUNTTYPE	m_numInts;					        
-	uint32			m_iBitStringStorage;		           
-	uint32* m_pInt;					      
-
-	void	AllocInts(int numInts);	    
-	void	ReallocInts(int numInts);
-	void	FreeInts(void);			    
-};
-
-template <int bits> struct BitCountToEndMask_t { };
-template <> struct BitCountToEndMask_t< 0> { enum { MASK = 0xffffffff }; };
-template <> struct BitCountToEndMask_t< 1> { enum { MASK = 0x00000001 }; };
-template <> struct BitCountToEndMask_t< 2> { enum { MASK = 0x00000003 }; };
-template <> struct BitCountToEndMask_t< 3> { enum { MASK = 0x00000007 }; };
-template <> struct BitCountToEndMask_t< 4> { enum { MASK = 0x0000000f }; };
-template <> struct BitCountToEndMask_t< 5> { enum { MASK = 0x0000001f }; };
-template <> struct BitCountToEndMask_t< 6> { enum { MASK = 0x0000003f }; };
-template <> struct BitCountToEndMask_t< 7> { enum { MASK = 0x0000007f }; };
-template <> struct BitCountToEndMask_t< 8> { enum { MASK = 0x000000ff }; };
-template <> struct BitCountToEndMask_t< 9> { enum { MASK = 0x000001ff }; };
-template <> struct BitCountToEndMask_t<10> { enum { MASK = 0x000003ff }; };
-template <> struct BitCountToEndMask_t<11> { enum { MASK = 0x000007ff }; };
-template <> struct BitCountToEndMask_t<12> { enum { MASK = 0x00000fff }; };
-template <> struct BitCountToEndMask_t<13> { enum { MASK = 0x00001fff }; };
-template <> struct BitCountToEndMask_t<14> { enum { MASK = 0x00003fff }; };
-template <> struct BitCountToEndMask_t<15> { enum { MASK = 0x00007fff }; };
-template <> struct BitCountToEndMask_t<16> { enum { MASK = 0x0000ffff }; };
-template <> struct BitCountToEndMask_t<17> { enum { MASK = 0x0001ffff }; };
-template <> struct BitCountToEndMask_t<18> { enum { MASK = 0x0003ffff }; };
-template <> struct BitCountToEndMask_t<19> { enum { MASK = 0x0007ffff }; };
-template <> struct BitCountToEndMask_t<20> { enum { MASK = 0x000fffff }; };
-template <> struct BitCountToEndMask_t<21> { enum { MASK = 0x001fffff }; };
-template <> struct BitCountToEndMask_t<22> { enum { MASK = 0x003fffff }; };
-template <> struct BitCountToEndMask_t<23> { enum { MASK = 0x007fffff }; };
-template <> struct BitCountToEndMask_t<24> { enum { MASK = 0x00ffffff }; };
-template <> struct BitCountToEndMask_t<25> { enum { MASK = 0x01ffffff }; };
-template <> struct BitCountToEndMask_t<26> { enum { MASK = 0x03ffffff }; };
-template <> struct BitCountToEndMask_t<27> { enum { MASK = 0x07ffffff }; };
-template <> struct BitCountToEndMask_t<28> { enum { MASK = 0x0fffffff }; };
-template <> struct BitCountToEndMask_t<29> { enum { MASK = 0x1fffffff }; };
-template <> struct BitCountToEndMask_t<30> { enum { MASK = 0x3fffffff }; };
-template <> struct BitCountToEndMask_t<31> { enum { MASK = 0x7fffffff }; };
-
-template <int NUM_BITS>
-class CFixedBitVecBase
-{
-public:
-	bool	IsFixedSize() const { return true; }
-	int		GetNumBits(void) const { return NUM_BITS; }
-	void	Resize(int numBits, bool bClearAll = false) { Assert(numBits == NUM_BITS); if (bClearAll) Plat_FastMemset(m_Ints, 0, NUM_INTS * sizeof(uint32)); }       
-
-	int 			GetNumDWords() const { return NUM_INTS; }
-	uint32* Base() { return m_Ints; }
-	const uint32* Base() const { return m_Ints; }
-
-	int		FindNextSetBit(int iStartBit) const;         
-
-protected:
-	CFixedBitVecBase() {}
-	CFixedBitVecBase(int numBits) { Assert(numBits == NUM_BITS); }                
-
-	void 		ValidateOperand(const CFixedBitVecBase<NUM_BITS>& operand) const { }       
-
-public:    
-	unsigned	GetEndMask() const { return static_cast<unsigned>(BitCountToEndMask_t<NUM_BITS% BITS_PER_INT>::MASK); }
-
-private:
-	enum
-	{
-		NUM_INTS = (NUM_BITS + (BITS_PER_INT - 1)) / BITS_PER_INT
-	};
-
-	uint32 m_Ints[(NUM_BITS + (BITS_PER_INT - 1)) / BITS_PER_INT];
-};
-
-class CVarBitVec : public CBitVecT< CVarBitVecBase<unsigned short> >
-{
-public:
-	CVarBitVec()
-	{
-	}
-
-	CVarBitVec(int numBits)
-		: CBitVecT< CVarBitVecBase<unsigned short> >(numBits)
-	{
-	}
-};
-
-class CLargeVarBitVec : public CBitVecT< CVarBitVecBase<int> >
-{
-public:
-	CLargeVarBitVec()
-	{
-	}
-
-	CLargeVarBitVec(int numBits)
-		: CBitVecT< CVarBitVecBase<int> >(numBits)
-	{
-	}
-};
-
-template < int NUM_BITS >
-class CBitVec : public CBitVecT< CFixedBitVecBase<NUM_BITS> >
-{
-public:
-	CBitVec()
-	{
-	}
-
-	CBitVec(int numBits)
-		: CBitVecT< CFixedBitVecBase<NUM_BITS> >(numBits)
-	{
-	}
-};
-
-
-typedef CBitVec<32> CDWordBitVec;
-
-template <typename BITCOUNTTYPE>
-inline CVarBitVecBase<BITCOUNTTYPE>::CVarBitVecBase()
-{
-	Plat_FastMemset(this, 0, sizeof(*this));
-}
-
-template <typename BITCOUNTTYPE>
-inline CVarBitVecBase<BITCOUNTTYPE>::CVarBitVecBase(int numBits)
-{
-	Assert(numBits);
-	m_numBits = numBits;
-
-	m_numInts = CalcNumIntsForBits(numBits);
-	m_pInt = NULL;
-	AllocInts(m_numInts);
-}
-
-template <typename BITCOUNTTYPE>
-inline CVarBitVecBase<BITCOUNTTYPE>::CVarBitVecBase(const CVarBitVecBase<BITCOUNTTYPE>& from)
-{
-	if (from.m_numInts)
-	{
-		m_numBits = from.m_numBits;
-		m_numInts = from.m_numInts;
-		m_pInt = NULL;
-		AllocInts(m_numInts);
-		memcpy(m_pInt, from.m_pInt, m_numInts * sizeof(int));
-	}
-	else
-		memset(this, 0, sizeof(*this));
-}
-
-template <typename BITCOUNTTYPE>
-inline CVarBitVecBase<BITCOUNTTYPE>& CVarBitVecBase<BITCOUNTTYPE>::operator=(const CVarBitVecBase<BITCOUNTTYPE>& from)
-{
-	Resize(from.GetNumBits());
-	if (m_pInt)
-		memcpy(m_pInt, from.m_pInt, m_numInts * sizeof(int));
-	return (*this);
-}
-
-template <typename BITCOUNTTYPE>
-inline CVarBitVecBase<BITCOUNTTYPE>::~CVarBitVecBase(void)
-{
-	FreeInts();
-}
-
-template <typename BITCOUNTTYPE>
-inline void CVarBitVecBase<BITCOUNTTYPE>::Attach(uint32* pBits, int numBits)
-{
-	FreeInts();
-	m_numBits = numBits;
-	m_numInts = CalcNumIntsForBits(numBits);
-	if (m_numInts > 1)
-	{
-		m_pInt = pBits;
-	}
-	else
-	{
-		m_iBitStringStorage = *pBits;
-		m_pInt = &m_iBitStringStorage;
-		free(pBits);
-	}
-}
-
-template <typename BITCOUNTTYPE>
-inline bool CVarBitVecBase<BITCOUNTTYPE>::Detach(uint32** ppBits, int* pNumBits)
-{
-	if (!m_numBits)
-	{
-		return false;
-	}
-
-	*pNumBits = m_numBits;
-	if (m_numInts > 1)
-	{
-		*ppBits = m_pInt;
-	}
-	else
-	{
-		*ppBits = (uint32*)malloc(sizeof(uint32));
-		**ppBits = m_iBitStringStorage;
-		free(m_pInt);
-	}
-
-	memset(this, 0, sizeof(*this));
-	return true;
-}
-
-template <class BASE_OPS>
-inline CBitVecT<BASE_OPS>::CBitVecT()
-{
-	COMPILE_TIME_ASSERT(sizeof(int) == 4);
-
-	ClearAll();
-}
-
-template <class BASE_OPS>
-inline CBitVecT<BASE_OPS>::CBitVecT(int numBits)
-	: BASE_OPS(numBits)
-{
-	COMPILE_TIME_ASSERT(sizeof(int) == 4);
-
-	ClearAll();
-}
-
-template <class BASE_OPS>
-inline CBitVecAccessor CBitVecT<BASE_OPS>::operator[](int i)
-{
-	Assert(i >= 0 && i < this->GetNumBits());
-	return CBitVecAccessor(this->Base(), i);
-}
-
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::Init(int val)
-{
-	if (this->Base())
-		Plat_FastMemset(this->Base(), (val) ? 0xff : 0, this->GetNumDWords() * sizeof(int));
-}
-
-template <class BASE_OPS>
-inline uint32 CBitVecT<BASE_OPS>::Get(uint32 bitNum) const
-{
-	Assert(bitNum < (uint32)this->GetNumBits());
-	const uint32* pInt = this->Base() + BitVec_Int(bitNum);
-	return (*pInt & BitVec_Bit(bitNum));
-}
-
-template <class BASE_OPS>
-inline bool CBitVecT<BASE_OPS>::IsBitSet(int bitNum) const
-{
-	Assert(bitNum >= 0 && bitNum < this->GetNumBits());
-	const uint32* pInt = this->Base() + BitVec_Int(bitNum);
-	return ((*pInt & BitVec_Bit(bitNum)) != 0);
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::Set(int bitNum)
-{
-	Assert(bitNum >= 0 && bitNum < this->GetNumBits());
-	uint32* pInt = this->Base() + BitVec_Int(bitNum);
-	*pInt |= BitVec_Bit(bitNum);
-}
-
-template <class BASE_OPS>
-inline bool CBitVecT<BASE_OPS>::TestAndSet(int bitNum)
-{
-	Assert(bitNum >= 0 && bitNum < this->GetNumBits());
-	uint32 bitVecBit = BitVec_Bit(bitNum);
-	uint32* pInt = this->Base() + BitVec_Int(bitNum);
-	bool bResult = ((*pInt & bitVecBit) != 0);
-	*pInt |= bitVecBit;
-	return bResult;
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::Clear(int bitNum)
-{
-	Assert(bitNum >= 0 && bitNum < this->GetNumBits());
-	uint32* pInt = this->Base() + BitVec_Int(bitNum);
-	*pInt &= ~BitVec_Bit(bitNum);
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::Set(int bitNum, bool bNewVal)
-{
-	uint32* pInt = this->Base() + BitVec_Int(bitNum);
-	uint32 bitMask = BitVec_Bit(bitNum);
-	if (bNewVal)
-	{
-		*pInt |= bitMask;
-	}
-	else
-	{
-		*pInt &= ~bitMask;
-	}
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::Set(uint32 offset, uint32 mask)
-{
-	uint32* pInt = this->Base() + offset;
-	*pInt |= mask;
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::Clear(uint32 offset, uint32 mask)
-{
-	uint32* pInt = this->Base() + offset;
-	*pInt &= ~mask;
-}
-
-template <class BASE_OPS>
-inline uint32 CBitVecT<BASE_OPS>::Get(uint32 offset, uint32 mask)
-{
-	uint32* pInt = this->Base() + offset;
-	return (*pInt & mask);
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::And(const CBitVecT& addStr, CBitVecT* out) const
-{
-	this->ValidateOperand(addStr);
-	this->ValidateOperand(*out);
-
-	uint32* pDest = out->Base();
-	const uint32* pOperand1 = this->Base();
-	const uint32* pOperand2 = addStr.Base();
-
-	for (int i = this->GetNumDWords() - 1; i >= 0; --i)
-	{
-		pDest[i] = pOperand1[i] & pOperand2[i];
-	}
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::Or(const CBitVecT& orStr, CBitVecT* out) const
-{
-	this->ValidateOperand(orStr);
-	this->ValidateOperand(*out);
-
-	uint32* pDest = out->Base();
-	const uint32* pOperand1 = this->Base();
-	const uint32* pOperand2 = orStr.Base();
-
-	for (int i = this->GetNumDWords() - 1; i >= 0; --i)
-	{
-		pDest[i] = pOperand1[i] | pOperand2[i];
-	}
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::Xor(const CBitVecT& xorStr, CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pOperand1 = this->Base();
-	const uint32* pOperand2 = xorStr.Base();
-
-	for (int i = this->GetNumDWords() - 1; i >= 0; --i)
-	{
-		pDest[i] = pOperand1[i] ^ pOperand2[i];
-	}
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::Not(CBitVecT* out) const
-{
-	this->ValidateOperand(*out);
-
-	uint32* pDest = out->Base();
-	const uint32* pOperand = this->Base();
-
-	for (int i = this->GetNumDWords() - 1; i >= 0; --i)
-	{
-		pDest[i] = ~(pOperand[i]);
-	}
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::CopyTo(CBitVecT* out) const
-{
-	out->Resize(this->GetNumBits());
-
-	this->ValidateOperand(*out);
-	Assert(out != this);
-
-	memcpy(out->Base(), this->Base(), this->GetNumDWords() * sizeof(int));
-}
-
-template <class BASE_OPS>
-inline bool CBitVecT<BASE_OPS>::IsAllClear(void) const
-{
-	(const_cast<CBitVecT*>(this))->Base()[this->GetNumDWords() - 1] &= CBitVecT<BASE_OPS>::GetEndMask();      
-
-	for (int i = this->GetNumDWords() - 1; i >= 0; --i)
-	{
-		if (this->Base()[i] != 0)
-		{
-			return false;
-		}
-	}
-	return true;
-}
-
-template <class BASE_OPS>
-inline bool CBitVecT<BASE_OPS>::IsAllSet(void) const
-{
-	(const_cast<CBitVecT*>(this))->Base()[this->GetNumDWords() - 1] |= ~CBitVecT<BASE_OPS>::GetEndMask();       
-
-	for (int i = this->GetNumDWords() - 1; i >= 0; --i)
-	{
-		if (this->Base()[i] != ~0)
-		{
-			return false;
-		}
-	}
-	return true;
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::SetAll(void)
-{
-	if (this->Base())
-		Plat_FastMemset(this->Base(), 0xff, this->GetNumDWords() * sizeof(int));
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::ClearAll(void)
-{
-	if (this->Base())
-		Plat_FastMemset(this->Base(), 0, this->GetNumDWords() * sizeof(int));
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::Copy(const CBitVecT<BASE_OPS>& other, int nBits)
-{
-	if (nBits == -1)
-	{
-		nBits = other.GetNumBits();
-	}
-
-	this->Resize(nBits);
-
-	this->ValidateOperand(other);
-	Assert(&other != this);
-
-	memcpy(this->Base(), other.Base(), this->GetNumDWords() * sizeof(uint32));
-}
-
-template <class BASE_OPS>
-inline bool CBitVecT<BASE_OPS>::Compare(const CBitVecT<BASE_OPS>& other, int nBits) const
-{
-	if (nBits == -1)
-	{
-		if (other.GetNumBits() != this->GetNumBits())
-		{
-			return false;
-		}
-
-		nBits = other.GetNumBits();
-	}
-
-	if (nBits > other.GetNumBits() || nBits > this->GetNumBits())
-	{
-		return false;
-	}
-
-	(const_cast<CBitVecT*>(this))->Base()[this->GetNumDWords() - 1] &= CBitVecT<BASE_OPS>::GetEndMask();      
-	(const_cast<CBitVecT*>(&other))->Base()[this->GetNumDWords() - 1] &= other.CBitVecT<BASE_OPS>::GetEndMask();      
-
-	int nBytes = PAD_NUMBER(nBits, 8) >> 3;
-
-	return (memcmp(this->Base(), other.Base(), nBytes) == 0);
-}
-
-template <class BASE_OPS>
-inline uint32 CBitVecT<BASE_OPS>::GetDWord(int i) const
-{
-	Assert(i >= 0 && i < this->GetNumDWords());
-	return this->Base()[i];
-}
-
-template <class BASE_OPS>
-inline void CBitVecT<BASE_OPS>::SetDWord(int i, uint32 val)
-{
-	Assert(i >= 0 && i < this->GetNumDWords());
-	this->Base()[i] = val;
-}
-
-inline unsigned GetStartBitMask(int startBit)
-{
-	static unsigned int g_StartMask[32] =
-	{
-		0xffffffff,
-		0xfffffffe,
-		0xfffffffc,
-		0xfffffff8,
-		0xfffffff0,
-		0xffffffe0,
-		0xffffffc0,
-		0xffffff80,
-		0xffffff00,
-		0xfffffe00,
-		0xfffffc00,
-		0xfffff800,
-		0xfffff000,
-		0xffffe000,
-		0xffffc000,
-		0xffff8000,
-		0xffff0000,
-		0xfffe0000,
-		0xfffc0000,
-		0xfff80000,
-		0xfff00000,
-		0xffe00000,
-		0xffc00000,
-		0xff800000,
-		0xff000000,
-		0xfe000000,
-		0xfc000000,
-		0xf8000000,
-		0xf0000000,
-		0xe0000000,
-		0xc0000000,
-		0x80000000,
-	};
-
-	return g_StartMask[startBit & 31];
-}
-
-template <typename BITCOUNTTYPE>
-inline int CVarBitVecBase<BITCOUNTTYPE>::FindNextSetBit(int startBit) const
-{
-	if (startBit < GetNumBits())
-	{
-		int wordIndex = BitVec_Int(startBit);
-		unsigned int startMask = GetStartBitMask(startBit);
-		int lastWord = GetNumDWords() - 1;
-
-		if ((GetNumBits() % BITS_PER_INT) != 0)
-		{
-			unsigned int elem = Base()[wordIndex];
-			elem &= startMask;
-			if (wordIndex == lastWord)
-			{
-				elem &= (GetEndMask());
-				if (elem)
-					return FirstBitInWord(elem, wordIndex << 5);
-			}
-			else
-			{
-				if (elem)
-					return FirstBitInWord(elem, wordIndex << 5);
-
-				for (int i = wordIndex + 1; i < lastWord; i++)
-				{
-					elem = Base()[i];
-					if (elem)
-						return FirstBitInWord(elem, i << 5);
-				}
-				elem = Base()[lastWord] & GetEndMask();
-				if (elem)
-					return FirstBitInWord(elem, lastWord << 5);
-			}
-		}
-		else
-		{
-			const uint32* RESTRICT pCurElem = Base() + wordIndex;
-			unsigned int elem = *pCurElem;
-			elem &= startMask;
-			do
-			{
-				if (elem)
-					return FirstBitInWord(elem, wordIndex << 5);
-				++pCurElem;
-				elem = *pCurElem;
-				++wordIndex;
-			} while (wordIndex <= lastWord);
-		}
-
-	}
-
-	return -1;
-}
-
-template <int NUM_BITS>
-inline int CFixedBitVecBase<NUM_BITS>::FindNextSetBit(int startBit) const
-{
-	if (startBit < NUM_BITS)
-	{
-		int wordIndex = BitVec_Int(startBit);
-		unsigned int startMask = GetStartBitMask(startBit);
-
-		if ((NUM_BITS % BITS_PER_INT) != 0)
-		{
-			unsigned int elem = Base()[wordIndex];
-			elem &= startMask;
-			if (wordIndex == NUM_INTS - 1)
-			{
-				elem &= (GetEndMask());
-				if (elem)
-					return FirstBitInWord(elem, wordIndex << 5);
-			}
-			else
-			{
-				if (elem)
-					return FirstBitInWord(elem, wordIndex << 5);
-
-				for (int i = wordIndex + 1; i < NUM_INTS - 1; i++)
-				{
-					elem = Base()[i];
-					if (elem)
-						return FirstBitInWord(elem, i << 5);
-				}
-				elem = Base()[NUM_INTS - 1] & GetEndMask();
-				if (elem)
-					return FirstBitInWord(elem, (NUM_INTS - 1) << 5);
-			}
-		}
-		else
-		{
-			const uint32* RESTRICT pCurElem = Base() + wordIndex;
-			unsigned int elem = *pCurElem;
-			elem &= startMask;
-			do
-			{
-				if (elem)
-					return FirstBitInWord(elem, wordIndex << 5);
-				++pCurElem;
-				elem = *pCurElem;
-				++wordIndex;
-			} while (wordIndex <= NUM_INTS - 1);
-		}
-
-	}
-
-	return -1;
-}
-
-template<>
-FORCEINLINE_TEMPLATE void CBitVecT< CFixedBitVecBase<256> >::And(const CBitVecT& addStr, CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pOperand1 = Base();
-	const uint32* pOperand2 = addStr.Base();
-
-	pDest[0] = pOperand1[0] & pOperand2[0];
-	pDest[1] = pOperand1[1] & pOperand2[1];
-	pDest[2] = pOperand1[2] & pOperand2[2];
-	pDest[3] = pOperand1[3] & pOperand2[3];
-	pDest[4] = pOperand1[4] & pOperand2[4];
-	pDest[5] = pOperand1[5] & pOperand2[5];
-	pDest[6] = pOperand1[6] & pOperand2[6];
-	pDest[7] = pOperand1[7] & pOperand2[7];
-}
-
-template<>
-FORCEINLINE_TEMPLATE  bool CBitVecT< CFixedBitVecBase<256> >::IsAllClear(void) const
-{
-	const uint32* pInts = Base();
-	return (pInts[0] == 0 && pInts[1] == 0 && pInts[2] == 0 && pInts[3] == 0 && pInts[4] == 0 && pInts[5] == 0 && pInts[6] == 0 && pInts[7] == 0);
-}
-
-template<>
-FORCEINLINE_TEMPLATE  void CBitVecT< CFixedBitVecBase<256> >::CopyTo(CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pInts = Base();
-
-	pDest[0] = pInts[0];
-	pDest[1] = pInts[1];
-	pDest[2] = pInts[2];
-	pDest[3] = pInts[3];
-	pDest[4] = pInts[4];
-	pDest[5] = pInts[5];
-	pDest[6] = pInts[6];
-	pDest[7] = pInts[7];
-}
-
-template<>
-FORCEINLINE_TEMPLATE  void CBitVecT< CFixedBitVecBase<128> >::And(const CBitVecT& addStr, CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pOperand1 = Base();
-	const uint32* pOperand2 = addStr.Base();
-
-	pDest[0] = pOperand1[0] & pOperand2[0];
-	pDest[1] = pOperand1[1] & pOperand2[1];
-	pDest[2] = pOperand1[2] & pOperand2[2];
-	pDest[3] = pOperand1[3] & pOperand2[3];
-}
-
-template<>
-FORCEINLINE_TEMPLATE  bool CBitVecT< CFixedBitVecBase<128> >::IsAllClear(void) const
-{
-	const uint32* pInts = Base();
-	return (pInts[0] == 0 && pInts[1] == 0 && pInts[2] == 0 && pInts[3] == 0);
-}
-
-template<>
-FORCEINLINE_TEMPLATE  void CBitVecT< CFixedBitVecBase<128> >::CopyTo(CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pInts = Base();
-
-	pDest[0] = pInts[0];
-	pDest[1] = pInts[1];
-	pDest[2] = pInts[2];
-	pDest[3] = pInts[3];
-}
-
-template<>
-inline void CBitVecT< CFixedBitVecBase<96> >::And(const CBitVecT& addStr, CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pOperand1 = Base();
-	const uint32* pOperand2 = addStr.Base();
-
-	pDest[0] = pOperand1[0] & pOperand2[0];
-	pDest[1] = pOperand1[1] & pOperand2[1];
-	pDest[2] = pOperand1[2] & pOperand2[2];
-}
-
-template<>
-inline bool CBitVecT< CFixedBitVecBase<96> >::IsAllClear(void) const
-{
-	const uint32* pInts = Base();
-	return (pInts[0] == 0 && pInts[1] == 0 && pInts[2] == 0);
-}
-
-template<>
-inline void CBitVecT< CFixedBitVecBase<96> >::CopyTo(CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pInts = Base();
-
-	pDest[0] = pInts[0];
-	pDest[1] = pInts[1];
-	pDest[2] = pInts[2];
-}
-
-template<>
-inline void CBitVecT< CFixedBitVecBase<64> >::And(const CBitVecT& addStr, CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pOperand1 = Base();
-	const uint32* pOperand2 = addStr.Base();
-
-	pDest[0] = pOperand1[0] & pOperand2[0];
-	pDest[1] = pOperand1[1] & pOperand2[1];
-}
-
-template<>
-inline bool CBitVecT< CFixedBitVecBase<64> >::IsAllClear(void) const
-{
-	const uint32* pInts = Base();
-	return (pInts[0] == 0 && pInts[1] == 0);
-}
-
-template<>
-inline void CBitVecT< CFixedBitVecBase<64> >::CopyTo(CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pInts = Base();
-
-	pDest[0] = pInts[0];
-	pDest[1] = pInts[1];
-}
-
-template<>
-inline void CBitVecT< CFixedBitVecBase<32> >::And(const CBitVecT& addStr, CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pOperand1 = Base();
-	const uint32* pOperand2 = addStr.Base();
-
-	pDest[0] = pOperand1[0] & pOperand2[0];
-}
-
-template<>
-inline bool CBitVecT< CFixedBitVecBase<32> >::IsAllClear(void) const
-{
-	const uint32* pInts = Base();
-
-	return (pInts[0] == 0);
-}
-
-template<>
-inline void CBitVecT< CFixedBitVecBase<32> >::CopyTo(CBitVecT* out) const
-{
-	uint32* pDest = out->Base();
-	const uint32* pInts = Base();
-
-	pDest[0] = pInts[0];
-}
-
-template <>
-inline uint32 CBitVecT< CFixedBitVecBase<32> >::Get(uint32 bitNum) const
-{
-	return (*Base() & BitVec_Bit(bitNum));
-}
-
-template <>
-inline bool CBitVecT< CFixedBitVecBase<32> >::IsBitSet(int bitNum) const
-{
-	return ((*Base() & BitVec_Bit(bitNum)) != 0);
-}
-
-template <>
-inline void CBitVecT< CFixedBitVecBase<32> >::Set(int bitNum)
-{
-	*Base() |= BitVec_Bit(bitNum);
-}
-
-template <>
-inline void CBitVecT< CFixedBitVecBase<32> >::Clear(int bitNum)
-{
-	*Base() &= ~BitVec_Bit(bitNum);
-}
-
-template <>
-inline void CBitVecT< CFixedBitVecBase<32> >::Set(int bitNum, bool bNewVal)
-{
-	uint32 bitMask = BitVec_Bit(bitNum);
-	if (bNewVal)
-	{
-		*Base() |= bitMask;
-	}
-	else
-	{
-		*Base() &= ~bitMask;
-	}
-}
-
-
-#include "memdbgon.h"
-
-template <typename BITCOUNTTYPE>
-inline void CVarBitVecBase<BITCOUNTTYPE>::Resize(int resizeNumBits, bool bClearAll)
-{
-	Assert(resizeNumBits >= 0 && ((BITCOUNTTYPE)resizeNumBits == resizeNumBits));
-
-	int newIntCount = CalcNumIntsForBits(resizeNumBits);
-	if (newIntCount != GetNumDWords())
-	{
-		if (Base())
-		{
-			ReallocInts(newIntCount);
-			if (!bClearAll && resizeNumBits >= GetNumBits())
-			{
-				Base()[GetNumDWords() - 1] &= GetEndMask();
-				Plat_FastMemset(Base() + GetNumDWords(), 0, (newIntCount - GetNumDWords()) * sizeof(int));
-			}
-		}
-		else
-		{
-			AllocInts(newIntCount);
-			bClearAll = true;
-		}
-
-		m_numInts = newIntCount;
-	}
-	else if (!bClearAll && resizeNumBits >= GetNumBits() && Base())
-	{
-		Base()[GetNumDWords() - 1] &= GetEndMask();
-	}
-
-	if (bClearAll && Base())
-	{
-		Plat_FastMemset(Base(), 0, newIntCount * sizeof(int));
-	}
-
-	m_numBits = resizeNumBits;
-}
-
-template <typename BITCOUNTTYPE>
-inline void CVarBitVecBase<BITCOUNTTYPE>::AllocInts(int numInts)
-{
-	Assert(!m_pInt);
-
-	if (numInts == 0)
-		return;
-
-	if (numInts == 1)
-	{
-		m_pInt = &m_iBitStringStorage;
-		return;
-	}
-
-	m_pInt = (uint32*)malloc(numInts * sizeof(int));
-}
-
-
-template <typename BITCOUNTTYPE>
-inline void CVarBitVecBase<BITCOUNTTYPE>::ReallocInts(int numInts)
-{
-	Assert(Base());
-	if (numInts == 0)
-	{
-		FreeInts();
-		return;
-	}
-
-	if (m_pInt == &m_iBitStringStorage)
-	{
-		if (numInts != 1)
-		{
-			m_pInt = ((uint32*)malloc(numInts * sizeof(int)));
-			*m_pInt = m_iBitStringStorage;
-		}
-
-		return;
-	}
-
-	if (numInts == 1)
-	{
-		m_iBitStringStorage = *m_pInt;
-		free(m_pInt);
-		m_pInt = &m_iBitStringStorage;
-		return;
-	}
-
-	m_pInt = (uint32*)realloc(m_pInt, numInts * sizeof(int));
-}
-
-
-template <typename BITCOUNTTYPE>
-inline void CVarBitVecBase<BITCOUNTTYPE>::FreeInts(void)
-{
-	if (m_numInts > 1)
-	{
-		free(m_pInt);
-	}
-	m_pInt = NULL;
-}
-
-#include "memdbgoff.h"
-
-inline CBitVecAccessor::CBitVecAccessor(uint32* pDWords, int iBit)
-{
-	m_pDWords = pDWords;
-	m_iBit = iBit;
-}
-
-
-inline void CBitVecAccessor::operator=(int val)
-{
-	if (val)
-		m_pDWords[m_iBit >> 5] |= (1 << (m_iBit & 31));
-	else
-		m_pDWords[m_iBit >> 5] &= ~(unsigned long)(1 << (m_iBit & 31));
-}
-
-inline CBitVecAccessor::operator uint32()
-{
-	return m_pDWords[m_iBit >> 5] & (1 << (m_iBit & 31));
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/bone_accessor.h b/SpyCustom/bone_accessor.h
deleted file mode 100644
index 04159e0..0000000
--- a/SpyCustom/bone_accessor.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#ifndef BONE_ACCESSOR_H
-#define BONE_ACCESSOR_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "studio.h"
-
-
-class C_BaseAnimating;
-
-
-class CBoneAccessor
-{
-public:
-
-	CBoneAccessor();
-	CBoneAccessor(matrix3x4_t* pBones);           
-
-#if defined( CLIENT_DLL )
-	void Init(const C_BaseAnimating* pAnimating, matrix3x4_t* pBones);
-#endif
-
-	int GetReadableBones();
-	void SetReadableBones(int flags);
-
-	int GetWritableBones();
-	void SetWritableBones(int flags);
-
-	const matrix3x4_t& GetBone(int iBone) const;
-	const matrix3x4_t& operator[](int iBone) const;
-	matrix3x4_t& GetBoneForWrite(int iBone);
-
-	matrix3x4_t* GetBoneArrayForWrite() const;
-
-private:
-
-#if defined( CLIENT_DLL ) && defined( _DEBUG )
-	void SanityCheckBone(int iBone, bool bReadable) const;
-#endif
-
-	const C_BaseAnimating* m_pAnimating;
-
-	matrix3x4_t* m_pBones;
-
-	int m_ReadableBones;		     
-	int m_WritableBones;		     
-};
-
-
-inline CBoneAccessor::CBoneAccessor()
-{
-	m_pAnimating = NULL;
-	m_pBones = NULL;
-	m_ReadableBones = m_WritableBones = 0;
-}
-
-inline CBoneAccessor::CBoneAccessor(matrix3x4_t* pBones)
-{
-	m_pAnimating = NULL;
-	m_pBones = pBones;
-}
-
-#if defined( CLIENT_DLL )
-inline void CBoneAccessor::Init(const C_BaseAnimating* pAnimating, matrix3x4_t* pBones)
-{
-	m_pAnimating = pAnimating;
-	m_pBones = pBones;
-}
-#endif
-
-inline int CBoneAccessor::GetReadableBones()
-{
-	return m_ReadableBones;
-}
-
-inline void CBoneAccessor::SetReadableBones(int flags)
-{
-	m_ReadableBones = flags;
-}
-
-inline int CBoneAccessor::GetWritableBones()
-{
-	return m_WritableBones;
-}
-
-inline void CBoneAccessor::SetWritableBones(int flags)
-{
-	m_WritableBones = flags;
-}
-
-inline const matrix3x4_t& CBoneAccessor::GetBone(int iBone) const
-{
-#if defined( CLIENT_DLL ) && defined( _DEBUG )
-	SanityCheckBone(iBone, true);
-#endif
-	return m_pBones[iBone];
-}
-
-inline const matrix3x4_t& CBoneAccessor::operator[](int iBone) const
-{
-#if defined( CLIENT_DLL ) && defined( _DEBUG )
-	SanityCheckBone(iBone, true);
-#endif
-	return m_pBones[iBone];
-}
-
-inline matrix3x4_t& CBoneAccessor::GetBoneForWrite(int iBone)
-{
-#if defined( CLIENT_DLL ) && defined( _DEBUG )
-	SanityCheckBone(iBone, false);
-#endif
-	return m_pBones[iBone];
-}
-
-inline matrix3x4_t* CBoneAccessor::GetBoneArrayForWrite(void) const
-{
-	return m_pBones;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/bone_merge_cache.h b/SpyCustom/bone_merge_cache.h
deleted file mode 100644
index ada89ac..0000000
--- a/SpyCustom/bone_merge_cache.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef BONE_MERGE_CACHE_H
-#define BONE_MERGE_CACHE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-class C_BaseAnimating;
-class CStudioHdr;
-
-
-#include "vector.h"
-
-
-class CBoneMergeCache
-{
-public:
-
-	CBoneMergeCache();
-
-	void Init(C_BaseAnimating* pOwner);
-
-	void UpdateCache();
-
-	void MergeMatchingBones(int boneMask);
-
-	void CopyParentToChild(const Vector parentPos[], const Quaternion parentQ[], Vector childPos[], Quaternion childQ[], int boneMask);
-	void CopyChildToParent(const Vector childPos[], const Quaternion childQ[], Vector parentPos[], Quaternion parentQ[], int boneMask);
-
-	int IsBoneMerged(int iBone) const;
-
-	bool GetAimEntOrigin(Vector* pAbsOrigin, QAngle* pAbsAngles);
-
-	bool GetRootBone(matrix3x4_t& rootBone);
-
-private:
-
-	C_BaseAnimating* m_pOwner;
-
-	C_BaseAnimating* m_pFollow;
-	CStudioHdr* m_pFollowHdr;
-	const studiohdr_t* m_pFollowRenderHdr;
-	CStudioHdr* m_pOwnerHdr;
-
-	int				m_nFollowBoneSetupMask;
-
-	class CMergedBone
-	{
-	public:
-		unsigned short m_iMyBone;
-		unsigned short m_iParentBone;
-	};
-
-	CUtlVector<CMergedBone> m_MergedBones;
-	CUtlVector<unsigned char> m_BoneMergeBits;	              
-};
-
-
-inline int CBoneMergeCache::IsBoneMerged(int iBone) const
-{
-	if (m_pOwnerHdr)
-		return m_BoneMergeBits[iBone >> 3] & (1 << (iBone & 7));
-	else
-		return 0;
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/bspfile.h b/SpyCustom/bspfile.h
deleted file mode 100644
index 246d2ce..0000000
--- a/SpyCustom/bspfile.h
+++ /dev/null
@@ -1,1067 +0,0 @@
-#ifndef BSPFILE_H
-#define BSPFILE_H
-#pragma once
-
-#ifndef MATHLIB_H
-#include "mathlib.h"
-#endif
-
-#include "vector4d.h"
-#include "datamap.h"
-#include "bumpvects.h"
-#include "compressed_light_cube.h"
-
-#define IDBSPHEADER	(('P'<<24)+('S'<<16)+('B'<<8)+'V')		
-
-#define MINBSPVERSION 19
-#define BSPVERSION 21
-
-
-#define MAX_BRUSH_LIGHTMAP_DIM_WITHOUT_BORDER 32
-#define MAX_BRUSH_LIGHTMAP_DIM_INCLUDING_BORDER	35
-
-#define MAX_DISP_LIGHTMAP_DIM_WITHOUT_BORDER	125
-#define MAX_DISP_LIGHTMAP_DIM_INCLUDING_BORDER	128
-
-
-#define MAX_LIGHTMAP_DIM_WITHOUT_BORDER		MAX_DISP_LIGHTMAP_DIM_WITHOUT_BORDER
-#define MAX_LIGHTMAP_DIM_INCLUDING_BORDER	MAX_DISP_LIGHTMAP_DIM_INCLUDING_BORDER
-
-#define	MAX_LIGHTSTYLES	64
-
-
-#define MIN_MAP_DISP_POWER		2	        
-#define MAX_MAP_DISP_POWER		4	
-
-#define MAX_DISP_CORNER_NEIGHBORS	4
-
-#define NUM_DISP_POWER_VERTS(power)	( ((1 << (power)) + 1) * ((1 << (power)) + 1) )
-#define NUM_DISP_POWER_TRIS(power)	( (1 << (power)) * (1 << (power)) * 2 )
-
-#if !defined( BSP_USE_LESS_MEMORY )
-#define	MAX_MAP_MODELS					1024
-#define	MAX_MAP_BRUSHES					8192
-#define	MAX_MAP_ENTITIES				16384
-#define	MAX_MAP_TEXINFO					12288
-#define MAX_MAP_TEXDATA					2048
-#define MAX_MAP_DISPINFO				2048
-#define MAX_MAP_DISP_VERTS				( MAX_MAP_DISPINFO * ((1<<MAX_MAP_DISP_POWER)+1) * ((1<<MAX_MAP_DISP_POWER)+1) )
-#define MAX_MAP_DISP_TRIS				( (1 << MAX_MAP_DISP_POWER) * (1 << MAX_MAP_DISP_POWER) * 2 )
-#define MAX_DISPVERTS					NUM_DISP_POWER_VERTS( MAX_MAP_DISP_POWER )
-#define MAX_DISPTRIS					NUM_DISP_POWER_TRIS( MAX_MAP_DISP_POWER )
-#define	MAX_MAP_AREAS					256
-#define MAX_MAP_AREA_BYTES				(MAX_MAP_AREAS/8)
-#define	MAX_MAP_AREAPORTALS				1024
-#define	MAX_MAP_PLANES					65536
-#define	MAX_MAP_NODES					65536
-#define	MAX_MAP_BRUSHSIDES				65536
-#define	MAX_MAP_LEAFS					65536
-#define	MAX_MAP_VERTS					65536
-#define MAX_MAP_VERTNORMALS				256000
-#define MAX_MAP_VERTNORMALINDICES		256000
-#define	MAX_MAP_FACES					65536
-#define	MAX_MAP_LEAFFACES				65536
-#define	MAX_MAP_LEAFBRUSHES 			65536
-#define	MAX_MAP_PORTALS					65536
-#define MAX_MAP_CLUSTERS				65536
-#define MAX_MAP_LEAFWATERDATA			32768
-#define MAX_MAP_PORTALVERTS				128000
-#define	MAX_MAP_EDGES					256000
-#define	MAX_MAP_SURFEDGES				512000
-#define	MAX_MAP_LIGHTING				0x1000000
-#define	MAX_MAP_VISIBILITY				0x1000000			   
-#define	MAX_MAP_TEXTURES				1024
-#define MAX_MAP_WORLDLIGHTS				8192
-#define MAX_MAP_CUBEMAPSAMPLES			1024
-#define MAX_MAP_OVERLAYS				512 
-#define MAX_MAP_WATEROVERLAYS			16384
-#define MAX_MAP_TEXDATA_STRING_DATA		256000
-#define MAX_MAP_TEXDATA_STRING_TABLE	65536
-#define MAX_MAP_PRIMITIVES				32768
-#define MAX_MAP_PRIMVERTS				65536
-#define MAX_MAP_PRIMINDICES				65536
-
-#else
-
-#define	MAX_MAP_MODELS					2
-#define	MAX_MAP_BRUSHES					2
-#define	MAX_MAP_ENTITIES				2
-#define	MAX_MAP_TEXINFO					2
-#define MAX_MAP_TEXDATA					2
-#define MAX_MAP_DISPINFO				2
-#define MAX_MAP_DISP_VERTS				( MAX_MAP_DISPINFO * ((1<<MAX_MAP_DISP_POWER)+1) * ((1<<MAX_MAP_DISP_POWER)+1) )
-#define MAX_MAP_DISP_TRIS				( (1 << MAX_MAP_DISP_POWER) * (1 << MAX_MAP_DISP_POWER) * 2 )
-#define MAX_DISPVERTS					NUM_DISP_POWER_VERTS( MAX_MAP_DISP_POWER )
-#define MAX_DISPTRIS					NUM_DISP_POWER_TRIS( MAX_MAP_DISP_POWER )
-#define	MAX_MAP_AREAS					2
-#define MAX_MAP_AREA_BYTES				2
-#define	MAX_MAP_AREAPORTALS				2
-#define	MAX_MAP_PLANES					2
-#define	MAX_MAP_NODES					2
-#define	MAX_MAP_BRUSHSIDES				2
-#define	MAX_MAP_LEAFS					2
-#define	MAX_MAP_VERTS					2
-#define MAX_MAP_VERTNORMALS				2
-#define MAX_MAP_VERTNORMALINDICES		2
-#define	MAX_MAP_FACES					2
-#define	MAX_MAP_LEAFFACES				2
-#define	MAX_MAP_LEAFBRUSHES				2
-#define	MAX_MAP_PORTALS					2
-#define MAX_MAP_CLUSTERS				2
-#define MAX_MAP_LEAFWATERDATA			2
-#define MAX_MAP_PORTALVERTS				2
-#define	MAX_MAP_EDGES					2
-#define	MAX_MAP_SURFEDGES				2
-#define	MAX_MAP_LIGHTING				2
-#define	MAX_MAP_VISIBILITY				2
-#define	MAX_MAP_TEXTURES				2
-#define MAX_MAP_WORLDLIGHTS				2
-#define MAX_MAP_CUBEMAPSAMPLES			2
-#define MAX_MAP_OVERLAYS				2 
-#define MAX_MAP_WATEROVERLAYS			2
-#define MAX_MAP_TEXDATA_STRING_DATA		2
-#define MAX_MAP_TEXDATA_STRING_TABLE	2
-#define MAX_MAP_PRIMITIVES				2
-#define MAX_MAP_PRIMVERTS				2
-#define MAX_MAP_PRIMINDICES				2
-
-#endif  
-
-#define	MAX_KEY		32
-#define	MAX_VALUE	1024
-
-
-enum
-{
-	CHILDNODE_UPPER_RIGHT = 0,
-	CHILDNODE_UPPER_LEFT = 1,
-	CHILDNODE_LOWER_LEFT = 2,
-	CHILDNODE_LOWER_RIGHT = 3
-};
-
-
-enum
-{
-	CORNER_LOWER_LEFT = 0,
-	CORNER_UPPER_LEFT = 1,
-	CORNER_UPPER_RIGHT = 2,
-	CORNER_LOWER_RIGHT = 3
-};
-
-
-enum
-{
-	NEIGHBOREDGE_LEFT = 0,
-	NEIGHBOREDGE_TOP = 1,
-	NEIGHBOREDGE_RIGHT = 2,
-	NEIGHBOREDGE_BOTTOM = 3
-};
-
-
-typedef enum
-{
-	CORNER_TO_CORNER = 0,
-	CORNER_TO_MIDPOINT = 1,
-	MIDPOINT_TO_CORNER = 2
-} NeighborSpan;
-
-
-typedef enum
-{
-	ORIENTATION_CCW_0 = 0,
-	ORIENTATION_CCW_90 = 1,
-	ORIENTATION_CCW_180 = 2,
-	ORIENTATION_CCW_270 = 3
-} NeighborOrientation;
-
-
-enum
-{
-	LUMP_ENTITIES = 0,	 
-	LUMP_PLANES = 1,	 
-	LUMP_TEXDATA = 2,	 
-	LUMP_VERTEXES = 3,	 
-	LUMP_VISIBILITY = 4,	 
-	LUMP_NODES = 5,	 
-	LUMP_TEXINFO = 6,	 
-	LUMP_FACES = 7,	 
-	LUMP_LIGHTING = 8,	 
-	LUMP_OCCLUSION = 9,
-	LUMP_LEAFS = 10,	 
-	LUMP_FACEIDS = 11,
-	LUMP_EDGES = 12,	 
-	LUMP_SURFEDGES = 13,	 
-	LUMP_MODELS = 14,	 
-	LUMP_WORLDLIGHTS = 15,	 
-	LUMP_LEAFFACES = 16,	 
-	LUMP_LEAFBRUSHES = 17,	 
-	LUMP_BRUSHES = 18,	 
-	LUMP_BRUSHSIDES = 19,	 
-	LUMP_AREAS = 20,	 
-	LUMP_AREAPORTALS = 21,	 
-	LUMP_PROPCOLLISION = 22,	     
-	LUMP_PROPHULLS = 23,	    
-	LUMP_PROPHULLVERTS = 24,	    
-	LUMP_PROPTRIS = 25,	       
-
-	LUMP_DISPINFO = 26,
-	LUMP_ORIGINALFACES = 27,
-	LUMP_PHYSDISP = 28,
-	LUMP_PHYSCOLLIDE = 29,
-	LUMP_VERTNORMALS = 30,
-	LUMP_VERTNORMALINDICES = 31,
-	LUMP_DISP_LIGHTMAP_ALPHAS = 32,
-	LUMP_DISP_VERTS = 33,		 
-	LUMP_DISP_LIGHTMAP_SAMPLE_POSITIONS = 34,	   
-	LUMP_GAME_LUMP = 35,
-	LUMP_LEAFWATERDATA = 36,
-	LUMP_PRIMITIVES = 37,
-	LUMP_PRIMVERTS = 38,
-	LUMP_PRIMINDICES = 39,
-	LUMP_PAKFILE = 40,
-	LUMP_CLIPPORTALVERTS = 41,
-	LUMP_CUBEMAPS = 42,
-	LUMP_TEXDATA_STRING_DATA = 43,
-	LUMP_TEXDATA_STRING_TABLE = 44,
-	LUMP_OVERLAYS = 45,
-	LUMP_LEAFMINDISTTOWATER = 46,
-	LUMP_FACE_MACRO_TEXTURE_INFO = 47,
-	LUMP_DISP_TRIS = 48,
-	LUMP_PROP_BLOB = 49,	      
-	LUMP_WATEROVERLAYS = 50,
-	LUMP_LEAF_AMBIENT_INDEX_HDR = 51,	   
-	LUMP_LEAF_AMBIENT_INDEX = 52,	   
-
-	LUMP_LIGHTING_HDR = 53,
-	LUMP_WORLDLIGHTS_HDR = 54,
-	LUMP_LEAF_AMBIENT_LIGHTING_HDR = 55,	           
-	LUMP_LEAF_AMBIENT_LIGHTING = 56,	           
-
-	LUMP_XZIPPAKFILE = 57,           
-	LUMP_FACES_HDR = 58,	       
-	LUMP_MAP_FLAGS = 59,           
-	LUMP_OVERLAY_FADES = 60,	    
-	LUMP_OVERLAY_SYSTEM_LEVELS = 61,	            
-	LUMP_PHYSLEVEL = 62,
-	LUMP_DISP_MULTIBLEND = 63,	   
-};
-
-
-enum
-{
-	LUMP_LIGHTING_VERSION = 1,
-	LUMP_FACES_VERSION = 1,
-	LUMP_OCCLUSION_VERSION = 2,
-	LUMP_LEAFS_VERSION = 1,
-	LUMP_LEAF_AMBIENT_LIGHTING_VERSION = 1,
-	LUMP_WORLDLIGHTS_VERSION = 1
-};
-
-
-#define	HEADER_LUMPS		64
-
-#include "zip_uncompressed.h"
-
-struct lump_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int		fileofs, filelen;
-	int		version;		   
-	char	fourCC[4];		              
-};
-
-struct BSPHeader_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int			ident;
-	int			m_nVersion;
-	lump_t		lumps[HEADER_LUMPS];
-	int			mapRevision;				         
-};
-
-#define LVLFLAGS_BAKED_STATIC_PROP_LIGHTING_NONHDR 0x00000001	         
-#define LVLFLAGS_BAKED_STATIC_PROP_LIGHTING_HDR    0x00000002           
-
-struct dflagslump_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	uint32 m_LevelFlags;						 
-};
-
-struct lumpfileheader_t
-{
-	int				lumpOffset;
-	int				lumpID;
-	int				lumpVersion;
-	int				lumpLength;
-	int				mapRevision;				         
-};
-
-struct dgamelumpheader_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int lumpCount;
-
-};
-
-typedef int GameLumpId_t;
-
-#define GAMELUMPFLAG_COMPRESSED	0x0001
-
-struct dgamelump_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	GameLumpId_t	id;
-	unsigned short	flags;
-	unsigned short	version;
-	int				fileofs;
-	int				filelen;
-};
-
-extern int g_MapRevision;
-
-struct dmodel_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	Vector		mins, maxs;
-	Vector		origin;					    
-	int			headnode;
-	int			firstface, numfaces;	         
-};
-
-struct dphysmodel_t
-{
-	DECLARE_BYTESWAP_DATADESC()
-	int			modelIndex;
-	int			dataSize;
-	int			keydataSize;
-	int			solidCount;
-};
-
-
-struct dphyslevelpolytope_t
-{
-	DECLARE_BYTESWAP_DATADESC()
-
-};
-
-
-struct DiskPhysics2Polytope_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int32 offsetPolytope;            
-	int32 offsetInertia;
-};
-
-
-struct dphysdisp_t
-{
-	DECLARE_BYTESWAP_DATADESC()
-	unsigned short numDisplacements;
-};
-
-struct dprophull_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int m_nVertCount;
-	int m_nVertStart;
-	int m_nSurfaceProp;
-	unsigned int m_nContents;
-};
-
-struct dprophulltris_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int m_nIndexStart;
-	int m_nIndexCount;
-};
-
-struct dpropcollision_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int m_nHullCount;
-	int m_nHullStart;
-};
-
-struct dvertex_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	Vector	point;
-};
-
-struct dplane_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	Vector	normal;
-	float	dist;
-	int		type;		       
-};
-
-#ifndef BSPFLAGS_H
-#include "bspflags.h"
-#endif
-
-struct dnode_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int			planenum;
-	int			children[2];	      
-	short		mins[3];		   
-	short		maxs[3];
-	unsigned short	firstface;
-	unsigned short	numfaces;	   
-	short			area;		            
-};
-
-typedef struct texinfo_s
-{
-	DECLARE_BYTESWAP_DATADESC();
-	float		textureVecsTexelsPerWorldUnits[2][4];			  
-	float		lightmapVecsLuxelsPerWorldUnits[2][4];			         
-	int			flags;				    
-	int			texdata;			      
-} texinfo_t;
-
-#define TEXTURE_NAME_LENGTH	 128			     
-
-struct dtexdata_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	Vector		reflectivity;
-	int			nameStringTableID;				       
-	int			width, height;					  
-	int			view_width, view_height;		
-};
-
-
-enum
-{
-	OCCLUDER_FLAGS_INACTIVE = 0x1,
-};
-
-struct doccluderdata_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int			flags;
-	int			firstpoly;				   
-	int			polycount;
-	Vector		mins;
-	Vector		maxs;
-	int			area;
-};
-
-struct doccluderdataV1_t
-{
-	int			flags;
-	int			firstpoly;				   
-	int			polycount;
-	Vector		mins;
-	Vector		maxs;
-};
-
-struct doccluderpolydata_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int			firstvertexindex;		   
-	int			vertexcount;
-	int			planenum;
-};
-
-
-struct CDispSubNeighbor
-{
-public:
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short		GetNeighborIndex() const { return m_iNeighbor; }
-	NeighborSpan		GetSpan() const { return (NeighborSpan)m_Span; }
-	NeighborSpan		GetNeighborSpan() const { return (NeighborSpan)m_NeighborSpan; }
-	NeighborOrientation	GetNeighborOrientation() const { return (NeighborOrientation)m_NeighborOrientation; }
-
-	bool				IsValid() const { return m_iNeighbor != 0xFFFF; }
-	void				SetInvalid() { m_iNeighbor = 0xFFFF; }
-
-
-public:
-	unsigned short		m_iNeighbor;		    
-	unsigned char		m_NeighborOrientation;		        
-
-	unsigned char		m_Span;						          
-	unsigned char		m_NeighborSpan;				      
-};
-
-
-class CDispNeighbor
-{
-public:
-	DECLARE_BYTESWAP_DATADESC();
-	void				SetInvalid() { m_SubNeighbors[0].SetInvalid(); m_SubNeighbors[1].SetInvalid(); }
-
-	bool				IsValid() { return m_SubNeighbors[0].IsValid() || m_SubNeighbors[1].IsValid(); }
-
-
-public:
-	CDispSubNeighbor	m_SubNeighbors[2];
-};
-
-
-class CDispCornerNeighbors
-{
-public:
-	DECLARE_BYTESWAP_DATADESC();
-	void			SetInvalid() { m_nNeighbors = 0; }
-
-
-public:
-	unsigned short	m_Neighbors[MAX_DISP_CORNER_NEIGHBORS];	   
-	unsigned char	m_nNeighbors;
-};
-
-
-class CDispVert
-{
-public:
-	DECLARE_BYTESWAP_DATADESC();
-	Vector		m_vVector;		     
-	float		m_flDist;		  
-	float		m_flAlpha;		    
-};
-
-#define DISPTRI_TAG_SURFACE			(1<<0)
-#define DISPTRI_TAG_WALKABLE		(1<<1)
-#define DISPTRI_TAG_BUILDABLE		(1<<2)
-#define DISPTRI_FLAG_SURFPROP1		(1<<3)
-#define DISPTRI_FLAG_SURFPROP2		(1<<4)
-
-class CDispTri
-{
-public:
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short m_uiTags;		   
-};
-
-#define MAX_MULTIBLEND_CHANNELS		4
-
-class CDispMultiBlend
-{
-public:
-	DECLARE_BYTESWAP_DATADESC();
-
-	Vector4D	m_vMultiBlend;
-	Vector4D	m_vAlphaBlend;
-	Vector		m_vMultiBlendColors[MAX_MULTIBLEND_CHANNELS];
-};
-
-#define DISP_INFO_FLAG_HAS_MULTIBLEND	0x40000000
-#define DISP_INFO_FLAG_MAGIC			0x80000000
-
-class ddispinfo_t
-{
-public:
-	DECLARE_BYTESWAP_DATADESC();
-	int			NumVerts() const { return NUM_DISP_POWER_VERTS(power); }
-	int			NumTris() const { return NUM_DISP_POWER_TRIS(power); }
-
-public:
-	Vector		startPosition;						         
-	int			m_iDispVertStart;					   
-	int			m_iDispTriStart;					   
-
-	int         power;                                       
-	int         minTess;                               
-	float       smoothingAngle;                        
-	int         contents;                             
-
-	unsigned short	m_iMapFace;						       
-
-	int			m_iLightmapAlphaStart;				   
-	int			m_iLightmapSamplePositionStart;		   
-
-	CDispNeighbor			m_EdgeNeighbors[4];		    
-	CDispCornerNeighbors	m_CornerNeighbors[4];	    
-
-	enum unnamed { ALLOWEDVERTS_SIZE = PAD_NUMBER(MAX_DISPVERTS, 32) / 32 };
-	unsigned long	m_AllowedVerts[ALLOWEDVERTS_SIZE];	            
-};
-
-
-struct dedge_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short	v[2];		  
-};
-
-#define	MAXLIGHTMAPS	4
-
-enum dprimitive_type
-{
-	PRIM_TRILIST = 0,
-	PRIM_TRISTRIP = 1,
-};
-
-struct dprimitive_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned char type;
-	unsigned short	firstIndex;
-	unsigned short	indexCount;
-	unsigned short	firstVert;
-	unsigned short	vertCount;
-};
-
-struct dprimvert_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	Vector		pos;
-};
-
-struct dface_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short	planenum;
-	byte		side;	       
-	byte		onNode;         
-
-	int			firstedge;		      
-	short		numedges;
-	short		texinfo;
-	short       dispinfo;
-	short		surfaceFogVolumeID;
-	byte		styles[MAXLIGHTMAPS];
-	int			lightofs;		    
-	float       area;
-
-	int			m_LightmapTextureMinsInLuxels[2];
-	int			m_LightmapTextureSizeInLuxels[2];
-
-	int origFace;				         
-
-
-public:
-
-	unsigned short GetNumPrims() const;
-	void SetNumPrims(unsigned short nPrims);
-	bool AreDynamicShadowsEnabled();
-	void SetDynamicShadowsEnabled(bool bEnabled);
-
-private:
-	unsigned short m_NumPrims;	               
-
-public:
-	unsigned short	firstPrimID;
-
-	unsigned int	smoothingGroups;
-};
-
-
-inline unsigned short dface_t::GetNumPrims() const
-{
-	return m_NumPrims & 0x7FFF;
-}
-
-inline void dface_t::SetNumPrims(unsigned short nPrims)
-{
-	Assert((nPrims & 0x8000) == 0);
-	m_NumPrims &= ~0x7FFF;
-	m_NumPrims |= (nPrims & 0x7FFF);
-}
-
-inline bool dface_t::AreDynamicShadowsEnabled()
-{
-	return (m_NumPrims & 0x8000) == 0;
-}
-
-inline void dface_t::SetDynamicShadowsEnabled(bool bEnabled)
-{
-	if (bEnabled)
-		m_NumPrims &= ~0x8000;
-	else
-		m_NumPrims |= 0x8000;
-}
-
-struct dfaceid_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short	hammerfaceid;
-};
-
-
-#define LEAF_FLAGS_SKY			0x01		        
-#define LEAF_FLAGS_RADIAL		0x02		          
-#define LEAF_FLAGS_SKY2D		0x04		        
-#define LEAF_FLAGS_CONTAINS_DETAILOBJECTS 0x08				             
-
-#if defined( _X360 )
-#pragma bitfield_order( push, lsb_to_msb )
-#endif
-#ifdef _MSC_VER
-#pragma warning( disable:4201 )	      
-#endif
-struct dleaf_version_0_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int				contents;			      
-
-	short			cluster;
-
-	BEGIN_BITFIELD(bf);
-	short			area : 9;
-	short			flags : 7;			   
-	END_BITFIELD();
-
-	short			mins[3];			   
-	short			maxs[3];
-
-	unsigned short	firstleafface;
-	unsigned short	numleaffaces;
-
-	unsigned short	firstleafbrush;
-	unsigned short	numleafbrushes;
-	short			leafWaterDataID;      
-
-	CompressedLightCube m_AmbientLighting;
-};
-
-struct dleaf_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int				contents;			      
-
-	short			cluster;
-
-	BEGIN_BITFIELD(bf);
-	short			area : 9;
-	short			flags : 7;			   
-	END_BITFIELD();
-
-	short			mins[3];			   
-	short			maxs[3];
-
-	unsigned short	firstleafface;
-	unsigned short	numleaffaces;
-
-	unsigned short	firstleafbrush;
-	unsigned short	numleafbrushes;
-	short			leafWaterDataID;      
-
-};
-#ifdef _MSC_VER
-#pragma warning( default:4201 )	      
-#endif
-#if defined( _X360 )
-#pragma bitfield_order( pop )
-#endif
-
-struct dleafambientlighting_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	CompressedLightCube	cube;
-	byte x;		      
-	byte y;		      
-	byte z;		      
-	byte pad;	 
-};
-
-struct dleafambientindex_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	unsigned short ambientSampleCount;
-	unsigned short firstAmbientSample;
-};
-
-struct dbrushside_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short	planenum;		     
-	short			texinfo;
-	short			dispinfo;		    
-	byte			bevel;			        
-	byte			thin;			    
-};
-
-struct dbrush_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int			firstside;
-	int			numsides;
-	int			contents;
-};
-
-#define	ANGLE_UP	-1
-#define	ANGLE_DOWN	-2
-
-
-#define	DVIS_PVS	0
-#define	DVIS_PAS	1
-struct dvis_t
-{
-	int			numclusters;
-	int			bitofs[8][2];	 
-};
-
-struct dareaportal_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short	m_PortalKey;		           
-	unsigned short	otherarea;		      
-
-	unsigned short	m_FirstClipPortalVert;	  
-	unsigned short	m_nClipPortalVerts;
-
-	int				planenum;
-};
-
-
-struct darea_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int		numareaportals;
-	int		firstareaportal;
-};
-
-struct dleafwaterdata_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	float	surfaceZ;
-	float	minZ;
-	short	surfaceTexInfoID;
-};
-
-class CFaceMacroTextureInfo
-{
-public:
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short m_MacroTextureNameID;
-};
-
-enum emittype_t
-{
-	emit_surface,		   
-	emit_point,			    
-	emit_spotlight,		   
-	emit_skylight,		           
-	emit_quakelight,	   
-	emit_skyambient,	            
-};
-
-
-#define DWL_FLAGS_INAMBIENTCUBE		0x0001	            
-#define DWL_FLAGS_CASTENTITYSHADOWS	0x0002	          
-
-struct dworldlight_version0_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	Vector		origin;
-	Vector		intensity;
-	Vector		normal;			    
-	int			cluster;
-	emittype_t	type;
-	int			style;
-	float		stopdot;		     
-	float		stopdot2;		     
-	float		exponent;		 
-	float		radius;			  
-	float		constant_attn;
-	float		linear_attn;
-	float		quadratic_attn;
-	int			flags;			       
-	int			texinfo;		 
-	int			owner;			       
-};
-
-struct dworldlight_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	Vector		origin;
-	Vector		intensity;
-	Vector		normal;			    
-	Vector		shadow_cast_offset;	                     
-	int			cluster;
-	emittype_t	type;
-	int			style;
-	float		stopdot;		     
-	float		stopdot2;		     
-	float		exponent;		 
-	float		radius;			  
-	float		constant_attn;
-	float		linear_attn;
-	float		quadratic_attn;
-	int			flags;			       
-	int			texinfo;		 
-	int			owner;			       
-};
-
-struct dcubemapsample_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int			origin[3];			        
-	unsigned char size;				   
-};
-
-#define OVERLAY_BSP_FACE_COUNT	64
-
-#define OVERLAY_NUM_RENDER_ORDERS		(1<<OVERLAY_RENDER_ORDER_NUM_BITS)
-#define OVERLAY_RENDER_ORDER_NUM_BITS	2
-#define OVERLAY_RENDER_ORDER_MASK		0xC000	    
-
-struct doverlay_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int			nId;
-	short		nTexInfo;
-
-	void			SetFaceCount(unsigned short count);
-	unsigned short	GetFaceCount() const;
-
-	void			SetRenderOrder(unsigned short order);
-	unsigned short	GetRenderOrder() const;
-
-private:
-	unsigned short	m_nFaceCountAndRenderOrder;
-
-public:
-	int			aFaces[OVERLAY_BSP_FACE_COUNT];
-	float		flU[2];
-	float		flV[2];
-	Vector		vecUVPoints[4];
-	Vector		vecOrigin;
-	Vector		vecBasisNormal;
-};
-
-
-inline void doverlay_t::SetFaceCount(unsigned short count)
-{
-	Assert((count & OVERLAY_RENDER_ORDER_MASK) == 0);
-	m_nFaceCountAndRenderOrder &= OVERLAY_RENDER_ORDER_MASK;
-	m_nFaceCountAndRenderOrder |= (count & ~OVERLAY_RENDER_ORDER_MASK);
-}
-
-inline unsigned short doverlay_t::GetFaceCount() const
-{
-	return m_nFaceCountAndRenderOrder & ~OVERLAY_RENDER_ORDER_MASK;
-}
-
-inline void doverlay_t::SetRenderOrder(unsigned short order)
-{
-	Assert(order < OVERLAY_NUM_RENDER_ORDERS);
-	m_nFaceCountAndRenderOrder &= ~OVERLAY_RENDER_ORDER_MASK;
-	m_nFaceCountAndRenderOrder |= (order << (16 - OVERLAY_RENDER_ORDER_NUM_BITS));	      
-}
-
-inline unsigned short doverlay_t::GetRenderOrder() const
-{
-	return (m_nFaceCountAndRenderOrder >> (16 - OVERLAY_RENDER_ORDER_NUM_BITS));
-}
-
-
-struct doverlayfade_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	float flFadeDistMinSq;
-	float flFadeDistMaxSq;
-};
-
-
-struct doverlaysystemlevel_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	unsigned char nMinCPULevel;
-	unsigned char nMaxCPULevel;
-	unsigned char nMinGPULevel;
-	unsigned char nMaxGPULevel;
-};
-
-
-#define WATEROVERLAY_BSP_FACE_COUNT				256
-#define WATEROVERLAY_RENDER_ORDER_NUM_BITS		2
-#define WATEROVERLAY_NUM_RENDER_ORDERS			(1<<WATEROVERLAY_RENDER_ORDER_NUM_BITS)
-#define WATEROVERLAY_RENDER_ORDER_MASK			0xC000	    
-struct dwateroverlay_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int				nId;
-	short			nTexInfo;
-
-	void			SetFaceCount(unsigned short count);
-	unsigned short	GetFaceCount() const;
-	void			SetRenderOrder(unsigned short order);
-	unsigned short	GetRenderOrder() const;
-
-private:
-
-	unsigned short	m_nFaceCountAndRenderOrder;
-
-public:
-
-	int				aFaces[WATEROVERLAY_BSP_FACE_COUNT];
-	float			flU[2];
-	float			flV[2];
-	Vector			vecUVPoints[4];
-	Vector			vecOrigin;
-	Vector			vecBasisNormal;
-};
-
-inline void dwateroverlay_t::SetFaceCount(unsigned short count)
-{
-	Assert((count & WATEROVERLAY_RENDER_ORDER_MASK) == 0);
-	m_nFaceCountAndRenderOrder &= WATEROVERLAY_RENDER_ORDER_MASK;
-	m_nFaceCountAndRenderOrder |= (count & ~WATEROVERLAY_RENDER_ORDER_MASK);
-}
-
-inline unsigned short dwateroverlay_t::GetFaceCount() const
-{
-	return m_nFaceCountAndRenderOrder & ~WATEROVERLAY_RENDER_ORDER_MASK;
-}
-
-inline void dwateroverlay_t::SetRenderOrder(unsigned short order)
-{
-	Assert(order < WATEROVERLAY_NUM_RENDER_ORDERS);
-	m_nFaceCountAndRenderOrder &= ~WATEROVERLAY_RENDER_ORDER_MASK;
-	m_nFaceCountAndRenderOrder |= (order << (16 - WATEROVERLAY_RENDER_ORDER_NUM_BITS));	      
-}
-
-inline unsigned short dwateroverlay_t::GetRenderOrder() const
-{
-	return (m_nFaceCountAndRenderOrder >> (16 - WATEROVERLAY_RENDER_ORDER_NUM_BITS));
-}
-
-#ifndef _DEF_BYTE_
-#define _DEF_BYTE_
-typedef unsigned char	byte;
-typedef unsigned short	word;
-#endif
-
-
-#define	ANGLE_UP	-1
-#define	ANGLE_DOWN	-2
-
-
-
-struct epair_t
-{
-	epair_t* next;
-	char* key;
-	char* value;
-};
-
-#define MAX_LIGHTMAPPAGE_WIDTH	256
-#define MAX_LIGHTMAPPAGE_HEIGHT	128
-typedef struct nameForDatadesc_dlightmappage_t        
-{
-	DECLARE_BYTESWAP_DATADESC();
-	byte	data[MAX_LIGHTMAPPAGE_WIDTH * MAX_LIGHTMAPPAGE_HEIGHT];
-	byte	palette[256 * 4];
-} dlightmappage_t;
-
-typedef struct nameForDatadesc_dlightmappageinfo_t        
-{
-	DECLARE_BYTESWAP_DATADESC();
-	byte			page;			   
-	byte			offset[2];		    
-	byte			pad;			 
-	ColorRGBExp32	avgColor;		      
-} dlightmappageinfo_t;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/bspflags.h b/SpyCustom/bspflags.h
deleted file mode 100644
index 472c314..0000000
--- a/SpyCustom/bspflags.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef BSPFLAGS_H
-#define BSPFLAGS_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define	CONTENTS_EMPTY			0		  
-
-#define	CONTENTS_SOLID			0x1		        
-#define	CONTENTS_WINDOW			0x2		     
-#define	CONTENTS_AUX			0x4
-#define	CONTENTS_GRATE			0x8		          
-#define	CONTENTS_SLIME			0x10
-#define	CONTENTS_WATER			0x20
-#define	CONTENTS_BLOCKLOS		0x40	     
-#define CONTENTS_OPAQUE			0x80	          
-#define	LAST_VISIBLE_CONTENTS	0x80
-
-#define ALL_VISIBLE_CONTENTS (LAST_VISIBLE_CONTENTS | (LAST_VISIBLE_CONTENTS-1))
-
-#define CONTENTS_TESTFOGVOLUME	0x100
-#define CONTENTS_UNUSED			0x200	
-
-#define CONTENTS_UNUSED6		0x400
-
-#define CONTENTS_TEAM1			0x800	        
-#define CONTENTS_TEAM2			0x1000	       
-
-#define CONTENTS_IGNORE_NODRAW_OPAQUE	0x2000
-
-#define CONTENTS_MOVEABLE		0x4000
-
-#define	CONTENTS_AREAPORTAL		0x8000
-
-#define	CONTENTS_PLAYERCLIP		0x10000
-#define	CONTENTS_MONSTERCLIP	0x20000
-
-#define	CONTENTS_CURRENT_0		0x40000
-#define	CONTENTS_CURRENT_90		0x80000
-#define	CONTENTS_CURRENT_180	0x100000
-#define	CONTENTS_CURRENT_270	0x200000
-#define	CONTENTS_CURRENT_UP		0x400000
-#define	CONTENTS_CURRENT_DOWN	0x800000
-
-#define	CONTENTS_ORIGIN			0x1000000	     
-
-#define	CONTENTS_MONSTER		0x2000000	         
-#define	CONTENTS_DEBRIS			0x4000000
-#define	CONTENTS_DETAIL			0x8000000	       
-#define	CONTENTS_TRANSLUCENT	0x10000000	       
-#define	CONTENTS_LADDER			0x20000000
-#define CONTENTS_HITBOX			0x40000000	     
-
-
-#define	SURF_LIGHT		0x0001		      
-#define	SURF_SKY2D		0x0002		                
-#define	SURF_SKY		0x0004		      
-#define	SURF_WARP		0x0008		   
-#define	SURF_TRANS		0x0010
-#define SURF_NOPORTAL	0x0020	          
-#define	SURF_TRIGGER	0x0040	                
-#define	SURF_NODRAW		0x0080	     
-
-#define	SURF_HINT		0x0100	     
-
-#define	SURF_SKIP		0x0200	     
-#define SURF_NOLIGHT	0x0400	   
-#define SURF_BUMPLIGHT	0x0800	        
-#define SURF_NOSHADOWS	0x1000	   
-#define SURF_NODECALS	0x2000	   
-#define SURF_NOCHOP		0x4000	       
-#define SURF_HITBOX		0x8000	      
-
-
-
-#define	MASK_ALL					(0xFFFFFFFF)
-#define	MASK_SOLID					(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_WINDOW|CONTENTS_MONSTER|CONTENTS_GRATE)
-#define	MASK_PLAYERSOLID			(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_PLAYERCLIP|CONTENTS_WINDOW|CONTENTS_MONSTER|CONTENTS_GRATE)
-#define	MASK_NPCSOLID				(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_MONSTERCLIP|CONTENTS_WINDOW|CONTENTS_MONSTER|CONTENTS_GRATE)
-#define	MASK_WATER					(CONTENTS_WATER|CONTENTS_MOVEABLE|CONTENTS_SLIME)
-#define	MASK_OPAQUE					(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_OPAQUE)
-#define MASK_OPAQUE_AND_NPCS		(MASK_OPAQUE|CONTENTS_MONSTER)
-#define MASK_BLOCKLOS				(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_BLOCKLOS)
-#define MASK_BLOCKLOS_AND_NPCS		(MASK_BLOCKLOS|CONTENTS_MONSTER)
-#define	MASK_VISIBLE					(MASK_OPAQUE|CONTENTS_IGNORE_NODRAW_OPAQUE)
-#define MASK_VISIBLE_AND_NPCS		(MASK_OPAQUE_AND_NPCS|CONTENTS_IGNORE_NODRAW_OPAQUE)
-#define	MASK_SHOT					(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_MONSTER|CONTENTS_WINDOW|CONTENTS_DEBRIS|CONTENTS_HITBOX)
-#define MASK_SHOT_HULL				(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_MONSTER|CONTENTS_WINDOW|CONTENTS_DEBRIS|CONTENTS_GRATE)
-#define MASK_SHOT_PORTAL			(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_WINDOW|CONTENTS_MONSTER)
-#define MASK_SOLID_BRUSHONLY		(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_WINDOW|CONTENTS_GRATE)
-#define MASK_PLAYERSOLID_BRUSHONLY	(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_WINDOW|CONTENTS_PLAYERCLIP|CONTENTS_GRATE)
-#define MASK_NPCSOLID_BRUSHONLY		(CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_WINDOW|CONTENTS_MONSTERCLIP|CONTENTS_GRATE)
-#define MASK_NPCWORLDSTATIC			(CONTENTS_SOLID|CONTENTS_WINDOW|CONTENTS_MONSTERCLIP|CONTENTS_GRATE)
-#define MASK_SPLITAREAPORTAL		(CONTENTS_WATER|CONTENTS_SLIME)
-
-#define MASK_CURRENT				(CONTENTS_CURRENT_0|CONTENTS_CURRENT_90|CONTENTS_CURRENT_180|CONTENTS_CURRENT_270|CONTENTS_CURRENT_UP|CONTENTS_CURRENT_DOWN)
-
-#define	MASK_DEADSOLID				(CONTENTS_SOLID|CONTENTS_PLAYERCLIP|CONTENTS_WINDOW|CONTENTS_GRATE)
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/bumpvects.h b/SpyCustom/bumpvects.h
deleted file mode 100644
index 0dd7d9c..0000000
--- a/SpyCustom/bumpvects.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef BUMPVECTS_H
-#define BUMPVECTS_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "mathlib.h"
-
-#define OO_SQRT_2 0.70710676908493042f
-#define OO_SQRT_3 0.57735025882720947f
-#define OO_SQRT_6 0.40824821591377258f
-#define OO_SQRT_2_OVER_3 0.81649661064147949f
-
-#define NUM_BUMP_VECTS 3
-
-const TableVector g_localBumpBasis[NUM_BUMP_VECTS] =
-{
-	{	OO_SQRT_2_OVER_3, 0.0f, OO_SQRT_3 },
-	{  -OO_SQRT_6, OO_SQRT_2, OO_SQRT_3 },
-	{  -OO_SQRT_6, -OO_SQRT_2, OO_SQRT_3 }
-};
-
-void GetBumpNormals(const Vector& sVect, const Vector& tVect, const Vector& flatNormal,
-	const Vector& phongNormal, Vector bumpNormals[NUM_BUMP_VECTS]);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/byteswap.h b/SpyCustom/byteswap.h
deleted file mode 100644
index c588ed1..0000000
--- a/SpyCustom/byteswap.h
+++ /dev/null
@@ -1,170 +0,0 @@
-#ifndef BYTESWAP_H
-#define BYTESWAP_H
-#if defined(_WIN32)
-#pragma once
-#endif
-
-#include "datamap.h"	          
-
-class CByteswap
-{
-public:
-	CByteswap()
-	{
-		SetTargetBigEndian(IsMachineBigEndian());
-	}
-
-	void SwapFieldToTargetEndian(void* pOutputBuffer, void* pData, typedescription_t* pField);
-
-	void SwapFieldsToTargetEndian(void* pOutputBuffer, void* pBaseData, datamap_t* pDataMap);
-
-	template<typename T> inline void SwapFieldsToTargetEndian(T* pOutputBuffer, void* pBaseData, unsigned int objectCount = 1)
-	{
-		for (unsigned int i = 0; i < objectCount; ++i, ++pOutputBuffer)
-		{
-			SwapFieldsToTargetEndian((void*)pOutputBuffer, pBaseData, &T::m_DataMap);
-			pBaseData = (byte*)pBaseData + sizeof(T);
-		}
-	}
-
-	template<typename T> inline void SwapFieldsToTargetEndian(T* pOutputBuffer, unsigned int objectCount = 1)
-	{
-		SwapFieldsToTargetEndian<T>(pOutputBuffer, (void*)pOutputBuffer, objectCount);
-	}
-
-	static bool IsMachineBigEndian()
-	{
-		short nIsBigEndian = 1;
-
-		return (bool)(0 == *(char*)&nIsBigEndian);
-	}
-
-	inline void SetTargetBigEndian(bool bigEndian)
-	{
-		m_bBigEndian = bigEndian;
-		m_bSwapBytes = IsMachineBigEndian() != bigEndian;
-	}
-
-	inline void FlipTargetEndian(void)
-	{
-		m_bSwapBytes = !m_bSwapBytes;
-		m_bBigEndian = !m_bBigEndian;
-	}
-
-	inline void ActivateByteSwapping(bool bActivate)
-	{
-		SetTargetBigEndian(IsMachineBigEndian() != bActivate);
-	}
-
-	inline bool IsSwappingBytes(void)	    
-	{
-		return m_bSwapBytes;
-	}
-
-	inline bool IsTargetBigEndian(void)	      
-	{
-		return m_bBigEndian;
-	}
-
-	template<typename T> inline int SourceIsNativeEndian(T input, T nativeConstant)
-	{
-		if (input == nativeConstant)
-			return 1;
-
-		int output;
-		LowLevelByteSwap<T>(&output, &input);
-		if (output == nativeConstant)
-			return 0;
-
-		assert(0);		              
-		return -1;
-	}
-
-	template<typename T> inline void SwapBuffer(T* outputBuffer, T* inputBuffer = NULL, int count = 1)
-	{
-		assert(count >= 0);
-		assert(outputBuffer);
-
-		if (count <= 0 || !outputBuffer)
-			return;
-
-		if (inputBuffer == NULL)
-		{
-			inputBuffer = outputBuffer;
-		}
-
-		for (int i = 0; i < count; i++)
-		{
-			LowLevelByteSwap<T>(&outputBuffer[i], &inputBuffer[i]);
-		}
-	}
-
-	template<typename T> inline void SwapBufferToTargetEndian(T* outputBuffer, T* inputBuffer = NULL, int count = 1)
-	{
-		assert(count >= 0);
-		assert(outputBuffer);
-
-		if (count <= 0 || !outputBuffer)
-			return;
-
-		if (inputBuffer == NULL)
-		{
-			inputBuffer = outputBuffer;
-		}
-
-		if (!m_bSwapBytes || (sizeof(T) == 1))
-		{
-			if (!inputBuffer)
-				return;
-
-			memcpy(outputBuffer, inputBuffer, count * sizeof(T));
-			return;
-
-		}
-
-		for (int i = 0; i < count; i++)
-		{
-			LowLevelByteSwap<T>(&outputBuffer[i], &inputBuffer[i]);
-		}
-	}
-
-private:
-	template<typename T> static void LowLevelByteSwap(T* output, T* input)
-	{
-		T temp = *output;
-#if defined( _X360 )
-		DWORD* word = (DWORD*)input;
-		switch (sizeof(T))
-		{
-		case 8:
-		{
-			__storewordbytereverse(*word, 0, &temp);
-			__storewordbytereverse(*(word + 1), 4, &temp);
-		}
-		break;
-
-		case 4:
-			__storewordbytereverse(*word, 0, &temp);
-			break;
-
-		case 2:
-			__storeshortbytereverse(*input, 0, &temp);
-			break;
-
-		default:
-			Assert("Invalid size in CByteswap::LowLevelByteSwap" && 0);
-		}
-#else
-		for (int i = 0; i < sizeof(T); i++)
-		{
-			((unsigned char*)&temp)[i] = ((unsigned char*)input)[sizeof(T) - (i + 1)];
-		}
-#endif
-		Q_memcpy(output, &temp, sizeof(T));
-	}
-
-	unsigned int m_bSwapBytes : 1;
-	unsigned int m_bBigEndian : 1;
-};
-
-#endif   
\ No newline at end of file
diff --git a/SpyCustom/c_baseanimating.h b/SpyCustom/c_baseanimating.h
deleted file mode 100644
index f7cdc27..0000000
--- a/SpyCustom/c_baseanimating.h
+++ /dev/null
@@ -1,696 +0,0 @@
-#ifndef C_BASEANIMATING_H
-#define C_BASEANIMATING_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "c_baseentity.h"
-#include "studio.h"
-#include "utlvector.h"
-#include "ragdoll.h"
-#include "mouthinfo.h"
-#include "ai_activity.h"
-#include "animationlayer.h"
-#include "sequence_Transitioner.h"
-#include "bone_accessor.h"
-#include "bone_merge_cache.h"
-#include "ragdoll_shared.h"
-#include "threadtools.h"
-#include "idatacache.h"
-
-#include "baseentity_shared.h" 
-
-#define LIPSYNC_POSEPARAM_NAME "mouth"
-#define NUM_HITBOX_FIRES	10
-
-class IRagdoll;
-class CIKContext;
-class CIKState;
-class ConVar;
-class C_RopeKeyframe;
-class CBoneBitList;
-class CBoneList;
-class KeyValues;
-class CJiggleBones;
-class IBoneSetup;
-FORWARD_DECLARE_HANDLE(memhandle_t);
-typedef unsigned short MDLHandle_t;
-
-extern ConVar vcollide_wireframe;
-
-
-struct ClientModelRenderInfo_t : public ModelRenderInfo_t
-{
-	matrix3x4_t lightingOffset;
-
-	matrix3x4_t modelToWorld;
-};
-
-struct RagdollInfo_t
-{
-	bool		m_bActive;
-	float		m_flSaveTime;
-	int			m_nNumBones;
-	Vector		m_rgBonePos[MAXSTUDIOBONES];
-	Quaternion	m_rgBoneQuaternion[MAXSTUDIOBONES];
-};
-
-
-class CAttachmentData
-{
-public:
-	matrix3x4_t	m_AttachmentToWorld;
-	QAngle	m_angRotation;
-	Vector	m_vOriginVelocity;
-	int		m_nLastFramecount : 31;
-	int		m_bAnglesComputed : 1;
-};
-
-
-typedef unsigned int			ClientSideAnimationListHandle_t;
-
-#define		INVALID_CLIENTSIDEANIMATION_LIST_HANDLE	(ClientSideAnimationListHandle_t)~0
-
-
-class C_BaseAnimating : public C_BaseEntity, private IModelLoadCallback
-{
-public:
-	DECLARE_CLASS(C_BaseAnimating, C_BaseEntity);
-	DECLARE_CLIENTCLASS();
-	DECLARE_PREDICTABLE();
-	DECLARE_INTERPOLATION();
-
-	enum
-	{
-		NUM_POSEPAREMETERS = 24,
-		NUM_BONECTRLS = 4
-	};
-
-	C_BaseAnimating();
-	~C_BaseAnimating();
-
-	virtual C_BaseAnimating* GetBaseAnimating() { return this; }
-
-	bool UsesPowerOfTwoFrameBufferTexture(void);
-
-	virtual bool	Interpolate(float currentTime);
-	virtual void	Simulate();
-	virtual void	Release();
-
-	float	GetAnimTimeInterval(void) const;
-
-	virtual unsigned char	GetClientSideFade(void);
-
-	virtual void	GetBoneControllers(float controllers[MAXSTUDIOBONECTRLS]);
-	virtual float	SetBoneController(int iController, float flValue);
-
-	LocalFlexController_t GetNumFlexControllers(void);
-	const char* GetFlexDescFacs(int iFlexDesc);
-	const char* GetFlexControllerName(LocalFlexController_t iFlexController);
-	const char* GetFlexControllerType(LocalFlexController_t iFlexController);
-
-	virtual void	GetAimEntOrigin(IClientEntity* pAttachedTo, Vector* pAbsOrigin, QAngle* pAbsAngles);
-
-	bool ComputeHitboxSurroundingBox(Vector* pVecWorldMins, Vector* pVecWorldMaxs);
-	bool ComputeEntitySpaceHitboxSurroundingBox(Vector* pVecWorldMins, Vector* pVecWorldMaxs);
-
-	bool HitboxToWorldTransforms(matrix3x4_t* pHitboxToWorld[MAXSTUDIOBONES]);
-
-	float		  ClampCycle(float cycle, bool isLooping);
-	virtual void GetPoseParameters(CStudioHdr* pStudioHdr, float poseParameter[MAXSTUDIOPOSEPARAM]);
-	virtual void BuildTransformations(CStudioHdr* pStudioHdr, Vector* pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList& boneComputed);
-	virtual void ApplyBoneMatrixTransform(matrix3x4_t& transform);
-	virtual int	VPhysicsGetObjectList(IPhysicsObject** pList, int listMax);
-
-	virtual bool SetupBones(matrix3x4_t* pBoneToWorldOut, int nMaxBones, int boneMask, float currentTime);
-	virtual void UpdateIKLocks(float currentTime);
-	virtual void CalculateIKLocks(float currentTime);
-	virtual bool ShouldDraw();
-	virtual int DrawModel(int flags);
-	virtual int	InternalDrawModel(int flags);
-	virtual bool OnInternalDrawModel(ClientModelRenderInfo_t* pInfo);
-	virtual bool OnPostInternalDrawModel(ClientModelRenderInfo_t* pInfo);
-	void		DoInternalDrawModel(ClientModelRenderInfo_t* pInfo, DrawModelState_t* pState, matrix3x4_t* pBoneToWorldArray = NULL);
-
-	virtual CMouthInfo* GetMouth();
-	virtual void	ControlMouth(CStudioHdr* pStudioHdr);
-
-	virtual void DoAnimationEvents(CStudioHdr* pStudio);
-	virtual void FireEvent(const Vector& origin, const QAngle& angles, int event, const char* options);
-	virtual void FireObsoleteEvent(const Vector& origin, const QAngle& angles, int event, const char* options);
-	virtual const char* ModifyEventParticles(const char* token) { return token; }
-
-	virtual bool DispatchMuzzleEffect(const char* options, bool isFirstPerson);
-
-	virtual void ValidateModelIndex(void);
-	virtual CStudioHdr* OnNewModel(void);
-	CStudioHdr* GetModelPtr() const;
-	void InvalidateMdlCache();
-
-	virtual void SetPredictable(bool state);
-	void UseClientSideAnimation();
-
-	virtual	void StandardBlendingRules(CStudioHdr* pStudioHdr, Vector pos[], Quaternion q[], float currentTime, int boneMask);
-	void UnragdollBlend(CStudioHdr* hdr, Vector pos[], Quaternion q[], float currentTime);
-
-	void MaintainSequenceTransitions(IBoneSetup& boneSetup, float flCycle, Vector pos[], Quaternion q[]);
-	virtual void AccumulateLayers(IBoneSetup& boneSetup, Vector pos[], Quaternion q[], float currentTime);
-
-	virtual void ChildLayerBlend(Vector pos[], Quaternion q[], float currentTime, int boneMask);
-
-	int		LookupAttachment(const char* pAttachmentName);
-	int		LookupRandomAttachment(const char* pAttachmentNameSubstring);
-
-	int		LookupPoseParameter(CStudioHdr* pStudioHdr, const char* szName);
-	inline int LookupPoseParameter(const char* szName) { return LookupPoseParameter(GetModelPtr(), szName); }
-
-	float	SetPoseParameter(CStudioHdr* pStudioHdr, const char* szName, float flValue);
-	inline float SetPoseParameter(const char* szName, float flValue) { return SetPoseParameter(GetModelPtr(), szName, flValue); }
-	float	SetPoseParameter(CStudioHdr* pStudioHdr, int iParameter, float flValue);
-	inline float SetPoseParameter(int iParameter, float flValue) { return SetPoseParameter(GetModelPtr(), iParameter, flValue); }
-
-	float	GetPoseParameter(int iPoseParameter);
-
-	bool	GetPoseParameterRange(int iPoseParameter, float& minValue, float& maxValue);
-
-	int		LookupBone(const char* szName);
-	void	GetBonePosition(int iBone, Vector& origin, QAngle& angles);
-	void	GetBoneTransform(int iBone, matrix3x4_t& pBoneToWorld);
-
-	int		GetHitboxBone(int hitboxIndex);
-
-	virtual void		AttachEntityToBone(C_BaseAnimating* attachTarget, int boneIndexAttached = -1, Vector bonePosition = Vector(0, 0, 0), QAngle boneAngles = QAngle(0, 0, 0));
-	void				AddBoneAttachment(C_BaseAnimating* newBoneAttachment);
-	void				RemoveBoneAttachment(C_BaseAnimating* boneAttachment);
-	void				RemoveBoneAttachments();
-	void				DestroyBoneAttachments();
-	void				MoveBoneAttachments(C_BaseAnimating* attachTarget);
-	int					GetNumBoneAttachments();
-	C_BaseAnimating* GetBoneAttachment(int i);
-	virtual void		NotifyBoneAttached(C_BaseAnimating* attachTarget);
-	virtual void		UpdateBoneAttachments(void);
-
-	virtual void					PreDataUpdate(DataUpdateType_t updateType);
-	virtual void					PostDataUpdate(DataUpdateType_t updateType);
-	virtual int						RestoreData(const char* context, int slot, int type);
-
-	virtual void					NotifyShouldTransmit(ShouldTransmitState_t state);
-	virtual void					OnPreDataChanged(DataUpdateType_t updateType);
-	virtual void					OnDataChanged(DataUpdateType_t updateType);
-	virtual void					AddEntity(void);
-
-	void							ForceClientSideAnimationOn();
-
-	void							AddToClientSideAnimationList();
-	void							RemoveFromClientSideAnimationList();
-
-	virtual bool					IsSelfAnimating();
-	virtual void					ResetLatched();
-
-	virtual void					GetRenderBounds(Vector& theMins, Vector& theMaxs);
-	virtual const Vector& GetRenderOrigin(void);
-	virtual const QAngle& GetRenderAngles(void);
-
-	virtual bool					GetSoundSpatialization(SpatializationInfo_t& info);
-
-	bool							GetAttachment(const char* szName, Vector& absOrigin);
-	bool							GetAttachment(const char* szName, Vector& absOrigin, QAngle& absAngles);
-
-	virtual bool					GetAttachment(int number, Vector& origin);
-	virtual bool					GetAttachment(int number, Vector& origin, QAngle& angles);
-	virtual bool					GetAttachment(int number, matrix3x4_t& matrix);
-	virtual bool					GetAttachmentVelocity(int number, Vector& originVel, Quaternion& angleVel);
-
-	bool							GetAttachmentLocal(int iAttachment, matrix3x4_t& attachmentToLocal);
-	bool							GetAttachmentLocal(int iAttachment, Vector& origin, QAngle& angles);
-	bool                            GetAttachmentLocal(int iAttachment, Vector& origin);
-
-	bool							GetRootBone(matrix3x4_t& rootBone);
-
-	virtual ShadowType_t			ShadowCastType();
-
-	virtual CollideType_t			GetCollideType(void);
-
-	virtual bool					TestCollision(const Ray_t& ray, unsigned int fContentsMask, trace_t& tr);
-	virtual bool					TestHitboxes(const Ray_t& ray, unsigned int fContentsMask, trace_t& tr);
-
-	bool							IsRagdoll() const;
-	bool							IsAboutToRagdoll() const;
-	virtual C_BaseAnimating* BecomeRagdollOnClient();
-	C_BaseAnimating* CreateRagdollCopy();
-	bool							InitAsClientRagdoll(const matrix3x4_t* pDeltaBones0, const matrix3x4_t* pDeltaBones1, const matrix3x4_t* pCurrentBonePosition, float boneDt, bool bFixedConstraints = false);
-	void							IgniteRagdoll(C_BaseAnimating* pSource);
-	void							TransferDissolveFrom(C_BaseAnimating* pSource);
-	virtual void					SaveRagdollInfo(int numbones, const matrix3x4_t& cameraTransform, CBoneAccessor& pBoneToWorld);
-	virtual bool					RetrieveRagdollInfo(Vector* pos, Quaternion* q);
-	virtual void					Clear(void);
-	void							ClearRagdoll();
-	void							CreateUnragdollInfo(C_BaseAnimating* pRagdoll);
-	void							ForceSetupBonesAtTime(matrix3x4_t* pBonesOut, float flTime);
-	virtual void					GetRagdollInitBoneArrays(matrix3x4_t* pDeltaBones0, matrix3x4_t* pDeltaBones1, matrix3x4_t* pCurrentBones, float boneDt);
-
-	virtual int GetBody() { return m_nBody; }
-	virtual int GetSkin() { return m_nSkin; }
-
-	bool IsOnFire() { return ((GetFlags() & FL_ONFIRE) != 0); }
-
-	inline float					GetPlaybackRate();
-	inline void						SetPlaybackRate(float rate);
-
-	void							SetModelScale(float scale, float change_duration = 0.0f);
-	float							GetModelScale() const { return m_flModelScale; }
-	inline bool						IsModelScaleFractional() const;                      
-	inline bool						IsModelScaled() const;
-	void							UpdateModelScale(void);
-	virtual	void					RefreshCollisionBounds(void);
-
-	int								GetSequence();
-	virtual void					SetSequence(int nSequence);
-	inline void						ResetSequence(int nSequence);
-	float							GetSequenceGroundSpeed(CStudioHdr* pStudioHdr, int iSequence);
-	inline float					GetSequenceGroundSpeed(int iSequence) { return GetSequenceGroundSpeed(GetModelPtr(), iSequence); }
-	bool							IsSequenceLooping(CStudioHdr* pStudioHdr, int iSequence);
-	inline bool						IsSequenceLooping(int iSequence) { return IsSequenceLooping(GetModelPtr(), iSequence); }
-	float							GetSequenceMoveDist(CStudioHdr* pStudioHdr, int iSequence);
-	void							GetSequenceLinearMotion(int iSequence, Vector* pVec);
-	void							GetBlendedLinearVelocity(Vector* pVec);
-	int								LookupSequence(const char* label);
-	int								LookupActivity(const char* label);
-	char const* GetSequenceName(int iSequence);
-	char const* GetSequenceActivityName(int iSequence);
-	Activity						GetSequenceActivity(int iSequence);
-	KeyValues* GetSequenceKeyValues(int iSequence);
-	virtual void					StudioFrameAdvance();          
-
-	virtual float					FrameAdvance(float flInterval = 0.0f);
-	virtual float					GetSequenceCycleRate(CStudioHdr* pStudioHdr, int iSequence);
-	virtual void					UpdateClientSideAnimation();
-	void							ClientSideAnimationChanged();
-	virtual unsigned int			ComputeClientSideAnimationFlags();
-
-	virtual void ResetClientsideFrame(void) { SetCycle(0); }
-
-	void SetCycle(float flCycle);
-	float GetCycle() const;
-
-	void SetBodygroup(int iGroup, int iValue);
-	int GetBodygroup(int iGroup);
-
-	const char* GetBodygroupName(int iGroup);
-	int FindBodygroupByName(const char* name);
-	int GetBodygroupCount(int iGroup);
-	int GetNumBodyGroups(void);
-
-	class CBoneCache* GetBoneCache(CStudioHdr* pStudioHdr);
-	void							SetHitboxSet(int setnum);
-	void							SetHitboxSetByName(const char* setname);
-	int								GetHitboxSet(void);
-	char const* GetHitboxSetName(void);
-	int								GetHitboxSetCount(void);
-	void							DrawClientHitboxes(float duration = 0.0f, bool monocolor = false);
-
-	C_BaseAnimating* FindFollowedEntity();
-
-	virtual bool					IsActivityFinished(void) { return m_bSequenceFinished; }
-	inline bool						IsSequenceFinished(void);
-	inline bool						SequenceLoops(void) { return m_bSequenceLoops; }
-
-	virtual void					UncorrectViewModelAttachment(Vector& vOrigin) {}
-
-	void							InvalidateBoneCache();
-	bool							IsBoneCacheValid() const;	            
-	void							GetCachedBoneMatrix(int boneIndex, matrix3x4_t& out);
-
-	const matrix3x4_t& GetBone(int iBone) const;
-	matrix3x4_t& GetBoneForWrite(int iBone);
-
-	struct AutoAllowBoneAccess
-	{
-		AutoAllowBoneAccess(bool bAllowForNormalModels, bool bAllowForViewModels);
-		~AutoAllowBoneAccess(void);
-	};
-	static void						PushAllowBoneAccess(bool bAllowForNormalModels, bool bAllowForViewModels, char const* tagPush);
-	static void						PopBoneAccess(char const* tagPop);
-	static void						ThreadedBoneSetup();
-	static void						InitBoneSetupThreadPool();
-	static void						ShutdownBoneSetupThreadPool();
-
-	static void						InvalidateBoneCaches();
-
-	virtual void					VPhysicsUpdate(IPhysicsObject* pPhysics);
-
-	void DisableMuzzleFlash();		             
-	virtual void DoMuzzleFlash();	            
-	bool ShouldMuzzleFlash() const;	      
-
-	virtual void ProcessMuzzleFlashEvent();
-
-	static void UpdateClientSideAnimations();
-
-	void InitModelEffects(void);
-
-	virtual void SetServerIntendedCycle(float intended) { (void)intended; }
-	virtual float GetServerIntendedCycle(void) { return -1.0f; }
-
-	int								SelectWeightedSequence(int activity);
-	void							ResetSequenceInfo(void);
-	float							SequenceDuration(void);
-	float							SequenceDuration(CStudioHdr* pStudioHdr, int iSequence);
-	inline float					SequenceDuration(int iSequence) { return SequenceDuration(GetModelPtr(), iSequence); }
-	int								FindTransitionSequence(int iCurrentSequence, int iGoalSequence, int* piDir);
-
-	void							RagdollMoved(void);
-
-	virtual void					GetToolRecordingState(KeyValues* msg);
-	virtual void					CleanupToolRecordingState(KeyValues* msg);
-
-	void							SetReceivedSequence(void);
-	virtual bool					ShouldResetSequenceOnNewModel(void);
-
-	virtual bool					IsViewModel() const;
-
-protected:
-	virtual void					FormatViewModelAttachment(int nAttachment, matrix3x4_t& attachmentToWorld) {}
-
-	bool							IsBoneAccessAllowed() const;
-	CMouthInfo& MouthInfo();
-
-	virtual bool					IsMenuModel() const;
-
-	virtual int						GetStudioBody(void) { return m_nBody; }
-
-	virtual bool					CalcAttachments();
-
-private:
-	virtual float					LastBoneChangedTime() { return FLT_MAX; }
-
-	CBoneList* RecordBones(CStudioHdr* hdr, matrix3x4_t* pBoneState);
-
-	bool							PutAttachment(int number, const matrix3x4_t& attachmentToWorld);
-	void							TermRopes();
-
-	void							DelayedInitModelEffects(void);
-
-	void							UpdateRelevantInterpolatedVars();
-	void							AddBaseAnimatingInterpolatedVars();
-	void							RemoveBaseAnimatingInterpolatedVars();
-
-public:
-	CRagdoll* m_pRagdoll;
-
-	int								m_nSkin;
-
-	int								m_nBody;
-
-	int								m_nHitboxSet;
-
-	CSequenceTransitioner			m_SequenceTransitioner;
-
-protected:
-	CIKContext* m_pIk;
-
-	int								m_iEyeAttachment;
-
-	float							m_flPlaybackRate;
-
-	bool							m_bStoreRagdollInfo;
-	RagdollInfo_t* m_pRagdollInfo;
-	Vector							m_vecForce;
-	int								m_nForceBone;
-
-	unsigned long					m_iMostRecentModelBoneCounter;
-	unsigned long					m_iMostRecentBoneSetupRequest;
-	int								m_iPrevBoneMask;
-	int								m_iAccumulatedBoneMask;
-
-	CBoneAccessor					m_BoneAccessor;
-	CThreadFastMutex				m_BoneSetupLock;
-
-	ClientSideAnimationListHandle_t	m_ClientSideAnimationListHandle;
-
-	bool							m_bClientSideFrameReset;
-
-	CUtlVector<CHandle<C_BaseAnimating> > m_BoneAttachments;
-	int								m_boneIndexAttached;
-	Vector							m_bonePosition;
-	QAngle							m_boneAngles;
-	CHandle<C_BaseAnimating>		m_pAttachedTo;
-
-protected:
-
-	float							m_fadeMinDist;
-	float							m_fadeMaxDist;
-	float							m_flFadeScale;
-
-private:
-
-	float							m_flGroundSpeed;	       
-	float							m_flLastEventCheck;	        
-	bool							m_bSequenceFinished;         
-	bool							m_bSequenceLoops;	     
-
-	CMouthInfo						m_mouth;
-
-	CNetworkVar(float, m_flModelScale);
-
-	float							m_flPoseParameter[MAXSTUDIOPOSEPARAM];
-	CInterpolatedVarArray< float, MAXSTUDIOPOSEPARAM >		m_iv_flPoseParameter;
-	float							m_flOldPoseParameters[MAXSTUDIOPOSEPARAM];
-
-	int								m_nPrevSequence;
-	int								m_nRestoreSequence;
-
-	CUtlLinkedList<C_RopeKeyframe*, unsigned short> m_Ropes;
-
-	float							m_flPrevEventCycle;
-	int								m_nEventSequence;
-
-	float							m_flEncodedController[MAXSTUDIOBONECTRLS];
-	CInterpolatedVarArray< float, MAXSTUDIOBONECTRLS >		m_iv_flEncodedController;
-	float							m_flOldEncodedController[MAXSTUDIOBONECTRLS];
-
-	bool							m_bClientSideAnimation;
-	bool							m_bLastClientSideFrameReset;
-
-	int								m_nNewSequenceParity;
-	int								m_nResetEventsParity;
-
-	int								m_nPrevNewSequenceParity;
-	int								m_nPrevResetEventsParity;
-
-	bool							m_builtRagdoll;
-	Vector							m_vecPreRagdollMins;
-	Vector							m_vecPreRagdollMaxs;
-
-	int								m_nSequence;
-	bool							m_bReceivedSequence;
-
-protected:
-	float							m_flCycle;
-	CInterpolatedVar< float >		m_iv_flCycle;
-	float							m_flOldCycle;
-	bool							m_bNoModelParticles;
-
-private:
-	float							m_flOldModelScale;
-	int								m_nOldSequence;
-	CBoneMergeCache* m_pBoneMergeCache;	          
-	CUtlVector< matrix3x4_t >		m_CachedBoneData;       
-	memhandle_t						m_hitboxBoneCacheHandle;
-	float							m_flLastBoneSetupTime;
-	CJiggleBones* m_pJiggleBones;
-
-	CUtlVector<CAttachmentData>		m_Attachments;
-
-	void							SetupBones_AttachmentHelper(CStudioHdr* pStudioHdr);
-
-	EHANDLE							m_hLightingOrigin;
-	EHANDLE							m_hLightingOriginRelative;
-
-	CNetworkVar(unsigned char, m_nMuzzleFlashParity);
-	unsigned char m_nOldMuzzleFlashParity;
-
-	bool							m_bInitModelEffects;
-
-	bool							m_bDynamicModelAllowed;
-	bool							m_bDynamicModelPending;
-	bool							m_bResetSequenceInfoOnLoad;
-	CRefCountedModelIndex			m_AutoRefModelIndex;
-public:
-	void							EnableDynamicModels() { m_bDynamicModelAllowed = true; }
-	bool							IsDynamicModelLoading() const { return m_bDynamicModelPending; }
-private:
-	virtual void					OnModelLoadComplete(const model_t* pModel);
-
-private:
-	void							LockStudioHdr();
-	void							UnlockStudioHdr();
-	mutable CStudioHdr* m_pStudioHdr;
-	mutable MDLHandle_t				m_hStudioHdr;
-	CThreadFastMutex				m_StudioHdrInitLock;
-};
-
-enum
-{
-	RAGDOLL_FRICTION_OFF = -2,
-	RAGDOLL_FRICTION_NONE,
-	RAGDOLL_FRICTION_IN,
-	RAGDOLL_FRICTION_HOLD,
-	RAGDOLL_FRICTION_OUT,
-};
-
-class C_ClientRagdoll : public C_BaseAnimating, public IPVSNotify
-{
-
-public:
-	C_ClientRagdoll(bool bRestoring = true);
-	DECLARE_CLASS(C_ClientRagdoll, C_BaseAnimating);
-	DECLARE_DATADESC();
-
-	virtual void OnPVSStatusChanged(bool bInPVS);
-
-	virtual void Release(void);
-	virtual void SetupWeights(const matrix3x4_t* pBoneToWorld, int nFlexWeightCount, float* pFlexWeights, float* pFlexDelayedWeights);
-	virtual void ImpactTrace(trace_t* pTrace, int iDamageType, const char* pCustomImpactName);
-	void ClientThink(void);
-	void ReleaseRagdoll(void) { m_bReleaseRagdoll = true; }
-	bool ShouldSavePhysics(void) { return true; }
-	virtual void	OnSave();
-	virtual void	OnRestore();
-	virtual int ObjectCaps(void) { return BaseClass::ObjectCaps() | FCAP_SAVE_NON_NETWORKABLE; }
-	virtual IPVSNotify* GetPVSNotifyInterface() { return this; }
-
-	void	HandleAnimatedFriction(void);
-	virtual void SUB_Remove(void);
-
-	void	FadeOut(void);
-	virtual float LastBoneChangedTime();
-
-	bool m_bFadeOut;
-	bool m_bImportant;
-	float m_flEffectTime;
-
-private:
-	int m_iCurrentFriction;
-	int m_iMinFriction;
-	int m_iMaxFriction;
-	float m_flFrictionModTime;
-	float m_flFrictionTime;
-
-	int  m_iFrictionAnimState;
-	bool m_bReleaseRagdoll;
-
-	bool m_bFadingOut;
-
-	float m_flScaleEnd[NUM_HITBOX_FIRES];
-	float m_flScaleTimeStart[NUM_HITBOX_FIRES];
-	float m_flScaleTimeEnd[NUM_HITBOX_FIRES];
-};
-
-inline void C_BaseAnimating::ResetSequence(int nSequence)
-{
-	SetSequence(nSequence);
-	ResetSequenceInfo();
-}
-
-inline float C_BaseAnimating::GetPlaybackRate()
-{
-	return m_flPlaybackRate;
-}
-
-inline void C_BaseAnimating::SetPlaybackRate(float rate)
-{
-	m_flPlaybackRate = rate;
-}
-
-inline const matrix3x4_t& C_BaseAnimating::GetBone(int iBone) const
-{
-	return m_BoneAccessor.GetBone(iBone);
-}
-
-inline matrix3x4_t& C_BaseAnimating::GetBoneForWrite(int iBone)
-{
-	return m_BoneAccessor.GetBoneForWrite(iBone);
-}
-
-
-inline bool C_BaseAnimating::ShouldMuzzleFlash() const
-{
-	return m_nOldMuzzleFlashParity != m_nMuzzleFlashParity;
-}
-
-inline float C_BaseAnimating::GetCycle() const
-{
-	return m_flCycle;
-}
-
-inline CStudioHdr* C_BaseAnimating::GetModelPtr() const
-{
-	if (IsDynamicModelLoading())
-		return NULL;
-
-#ifdef _DEBUG
-#endif
-	if (!m_pStudioHdr)
-	{
-		const_cast<C_BaseAnimating*>(this)->LockStudioHdr();
-	}
-	Assert(m_pStudioHdr ? m_pStudioHdr->GetRenderHdr() == mdlcache->GetStudioHdr(m_hStudioHdr) : m_hStudioHdr == MDLHANDLE_INVALID);
-	return m_pStudioHdr;
-}
-
-
-inline void C_BaseAnimating::InvalidateMdlCache()
-{
-	if (m_pStudioHdr)
-	{
-		UnlockStudioHdr();
-		delete m_pStudioHdr;
-		m_pStudioHdr = NULL;
-	}
-}
-
-
-inline bool C_BaseAnimating::IsModelScaleFractional() const               
-{
-	COMPILE_TIME_ASSERT(sizeof(m_flModelScale) == sizeof(int));
-	return *((const int*)&m_flModelScale) < 0x3f800000;
-}
-
-inline bool C_BaseAnimating::IsModelScaled() const
-{
-	return (m_flModelScale > 1.0f + FLT_EPSILON || m_flModelScale < 1.0f - FLT_EPSILON);
-}
-
-inline int C_BaseAnimating::GetSequence()
-{
-	return m_nSequence;
-}
-
-inline bool C_BaseAnimating::IsSequenceFinished(void)
-{
-	return m_bSequenceFinished;
-}
-
-inline float C_BaseAnimating::SequenceDuration(void)
-{
-	return SequenceDuration(GetSequence());
-}
-
-
-inline CMouthInfo& C_BaseAnimating::MouthInfo()
-{
-	return m_mouth;
-}
-
-
-void GetColumn(matrix3x4_t& src, int column, Vector& dest);
-void SetColumn(Vector& src, int column, matrix3x4_t& dest);
-
-EXTERN_RECV_TABLE(DT_BaseAnimating);
-
-
-extern void DevMsgRT(PRINTF_FORMAT_STRING char const* pMsg, ...);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/c_baseanimatingoverlay.h b/SpyCustom/c_baseanimatingoverlay.h
deleted file mode 100644
index 9681dc1..0000000
--- a/SpyCustom/c_baseanimatingoverlay.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef C_BASEANIMATINGOVERLAY_H
-#define C_BASEANIMATINGOVERLAY_H
-#pragma once
-
-#include "c_baseanimating.h"
-
-#define CBaseAnimatingOverlay C_BaseAnimatingOverlay
-
-
-class C_BaseAnimatingOverlay : public C_BaseAnimating
-{
-public:
-	DECLARE_CLASS(C_BaseAnimatingOverlay, C_BaseAnimating);
-	DECLARE_CLIENTCLASS();
-	DECLARE_PREDICTABLE();
-	DECLARE_INTERPOLATION();
-
-
-	C_BaseAnimatingOverlay();
-
-	virtual CStudioHdr* OnNewModel();
-
-	C_AnimationLayer* GetAnimOverlay(int i);
-	void SetNumAnimOverlays(int num);	           
-	int GetNumAnimOverlays() const;
-
-	virtual void	GetRenderBounds(Vector& theMins, Vector& theMaxs);
-
-	void			CheckForLayerChanges(CStudioHdr* hdr, float currentTime);
-
-	virtual void	AccumulateLayers(IBoneSetup& boneSetup, Vector pos[], Quaternion q[], float currentTime);
-	virtual void DoAnimationEvents(CStudioHdr* pStudioHdr);
-
-	enum
-	{
-		MAX_OVERLAYS = 15,
-	};
-
-	CUtlVector < C_AnimationLayer >	m_AnimOverlay;
-
-	CUtlVector < CInterpolatedVar< C_AnimationLayer > >	m_iv_AnimOverlay;
-
-	float m_flOverlayPrevEventCycle[MAX_OVERLAYS];
-
-private:
-	C_BaseAnimatingOverlay(const C_BaseAnimatingOverlay&);     
-};
-
-
-EXTERN_RECV_TABLE(DT_BaseAnimatingOverlay);
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/c_basecombatcharacter.h b/SpyCustom/c_basecombatcharacter.h
deleted file mode 100644
index 56f3b8d..0000000
--- a/SpyCustom/c_basecombatcharacter.h
+++ /dev/null
@@ -1,168 +0,0 @@
-#ifndef C_BASECOMBATCHARACTER_H
-#define C_BASECOMBATCHARACTER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "shareddefs.h"
-#include "c_baseflex.h"
-#ifdef GLOWS_ENABLE
-#include "glow_outline_effect.h"
-#endif  
-
-class C_BaseCombatWeapon;
-class C_WeaponCombatShield;
-
-#define BCC_DEFAULT_LOOK_TOWARDS_TOLERANCE 0.9f
-
-class C_BaseCombatCharacter : public C_BaseFlex
-{
-	DECLARE_CLASS(C_BaseCombatCharacter, C_BaseFlex);
-public:
-	DECLARE_CLIENTCLASS();
-	DECLARE_PREDICTABLE();
-
-	C_BaseCombatCharacter(void);
-	virtual			~C_BaseCombatCharacter(void);
-
-	virtual void	OnPreDataChanged(DataUpdateType_t updateType);
-	virtual void	OnDataChanged(DataUpdateType_t updateType);
-
-	virtual bool	IsBaseCombatCharacter(void) { return true; };
-	virtual C_BaseCombatCharacter* MyCombatCharacterPointer(void) { return this; }
-
-	enum FieldOfViewCheckType { USE_FOV, DISREGARD_FOV };
-	bool IsAbleToSee(const CBaseEntity* entity, FieldOfViewCheckType checkFOV);	                 
-	bool IsAbleToSee(C_BaseCombatCharacter* pBCC, FieldOfViewCheckType checkFOV);	                 
-
-	virtual bool IsLookingTowards(const CBaseEntity* target, float cosTolerance = BCC_DEFAULT_LOOK_TOWARDS_TOLERANCE) const;	                         
-	virtual bool IsLookingTowards(const Vector& target, float cosTolerance = BCC_DEFAULT_LOOK_TOWARDS_TOLERANCE) const;	                         
-
-	virtual bool IsInFieldOfView(CBaseEntity* entity) const;	          
-	virtual bool IsInFieldOfView(const Vector& pos) const;
-
-	enum LineOfSightCheckType
-	{
-		IGNORE_NOTHING,
-		IGNORE_ACTORS
-	};
-	virtual bool IsLineOfSightClear(CBaseEntity* entity, LineOfSightCheckType checkType = IGNORE_NOTHING) const;       
-	virtual bool IsLineOfSightClear(const Vector& pos, LineOfSightCheckType checkType = IGNORE_NOTHING, CBaseEntity* entityToIgnore = NULL) const;
-
-
-	void				RemoveAmmo(int iCount, int iAmmoIndex);
-	void				RemoveAmmo(int iCount, const char* szName);
-	void				RemoveAllAmmo();
-	int					GetAmmoCount(int iAmmoIndex) const;
-	int					GetAmmoCount(char* szName) const;
-
-	C_BaseCombatWeapon* Weapon_OwnsThisType(const char* pszWeapon, int iSubType = 0) const;           
-	virtual	bool		Weapon_Switch(C_BaseCombatWeapon* pWeapon, int viewmodelindex = 0);
-	virtual bool		Weapon_CanSwitchTo(C_BaseCombatWeapon* pWeapon);
-
-	bool SwitchToNextBestWeapon(C_BaseCombatWeapon* pCurrent);
-
-	virtual C_BaseCombatWeapon* GetActiveWeapon(void) const;
-	int					WeaponCount() const;
-	C_BaseCombatWeapon* GetWeapon(int i) const;
-
-	void SetAmmoCount(int iCount, int iAmmoIndex);
-
-	float				GetNextAttack() const { return m_flNextAttack; }
-	void				SetNextAttack(float flWait) { m_flNextAttack = flWait; }
-
-	virtual int			BloodColor();
-
-	void SetBloodColor(int nBloodColor);
-
-	virtual void		DoMuzzleFlash();
-
-#ifdef GLOWS_ENABLE
-	CGlowObject* GetGlowObject(void) { return m_pGlowEffect; }
-	virtual void		GetGlowEffectColor(float* r, float* g, float* b);
-#endif  
-
-public:
-
-	float			m_flNextAttack;
-
-protected:
-
-#ifdef GLOWS_ENABLE	
-	virtual void		UpdateGlowEffect(void);
-	virtual void		DestroyGlowEffect(void);
-#endif  
-
-	int			m_bloodColor;			    
-
-private:
-	bool				ComputeLOS(const Vector& vecEyePosition, const Vector& vecTarget) const;
-
-	CNetworkArray(int, m_iAmmo, MAX_AMMO_TYPES);
-
-	CHandle<C_BaseCombatWeapon>		m_hMyWeapons[MAX_WEAPONS];
-	CHandle< C_BaseCombatWeapon > m_hActiveWeapon;
-
-#ifdef GLOWS_ENABLE
-	bool				m_bGlowEnabled;
-	bool				m_bOldGlowEnabled;
-	CGlowObject* m_pGlowEffect;
-#endif  
-
-private:
-	C_BaseCombatCharacter(const C_BaseCombatCharacter&);     
-
-
-#ifdef INVASION_CLIENT_DLL
-public:
-	virtual void	Release(void);
-	virtual void	SetDormant(bool bDormant);
-	virtual void	OnPreDataChanged(DataUpdateType_t updateType);
-	virtual void	OnDataChanged(DataUpdateType_t updateType);
-	virtual void	ClientThink(void);
-
-	virtual bool	CanBePoweredUp(void) { return true; }
-	bool			HasPowerup(int iPowerup) { return (m_iPowerups & (1 << iPowerup)) != 0; };
-	virtual void	PowerupStart(int iPowerup, bool bInitial);
-	virtual void	PowerupEnd(int iPowerup);
-	void			RemoveAllPowerups(void);
-
-	void			AddEMPEffect(float flSize);
-	void			AddBuffEffect(float flSize);
-
-	C_WeaponCombatShield* GetShield(void);
-
-public:
-	int				m_iPowerups;
-	int				m_iPrevPowerups;
-#endif
-
-};
-
-inline C_BaseCombatCharacter* ToBaseCombatCharacter(C_BaseEntity* pEntity)
-{
-	if (!pEntity || !pEntity->IsBaseCombatCharacter())
-		return NULL;
-
-#if _DEBUG
-	return dynamic_cast<C_BaseCombatCharacter*>(pEntity);
-#else
-	return static_cast<C_BaseCombatCharacter*>(pEntity);
-#endif
-}
-
-inline int	C_BaseCombatCharacter::WeaponCount() const
-{
-	return MAX_WEAPONS;
-}
-
-inline C_BaseCombatWeapon* C_BaseCombatCharacter::GetWeapon(int i) const
-{
-	Assert((i >= 0) && (i < MAX_WEAPONS));
-	return m_hMyWeapons[i].Get();
-}
-
-EXTERN_RECV_TABLE(DT_BaseCombatCharacter);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/c_baseentity.h b/SpyCustom/c_baseentity.h
deleted file mode 100644
index b80b767..0000000
--- a/SpyCustom/c_baseentity.h
+++ /dev/null
@@ -1,192 +0,0 @@
-#ifndef CBASEENT
-#define CBASEENT
-
-#pragma once
-
-#include "icliententity.h"
-#include "NetVarManager.hpp"
-#include "PatternScan.hpp"
-#include "netvars.hpp"
-
-
-namespace VirtualMethod
-{
-	template <typename T, std::size_t Idx, typename ...Args>
-	constexpr T call(void* classBase, Args... args) noexcept
-	{
-		return (*reinterpret_cast<T(__thiscall***)(void*, Args...)>(classBase))[Idx](classBase, args...);
-	}
-}
-
-#define VIRTUAL_METHOD(returnType, name, idx, args, argsRaw) \
-returnType name args noexcept \
-{ \
-    return VirtualMethod::call<returnType, idx>argsRaw; \
-}
-
-#define CONCAT(a, b) a##b
-#define PAD_NAME(n) CONCAT(pad, n)
-#define PAD(size) \
-private: \
-    std::byte PAD_NAME(__COUNTER__) [size]; \
-public:
-
-
-	class C_BaseEntity : public IClientEntity
-	{
-	public:
-
-		NETVAR_OFFSET(GetIndex, "CBaseEntity", "m_bIsAutoaimTarget", +0x4, int);
-		NETVAR(GetModelIndex, "CBaseEntity", "m_nModelIndex", unsigned);
-
-		NETVAR(Ragdoll, "CCSPlayer", "m_hRagdoll", int);  
-
-		NETVAR2(GetViewmodelArmConfig, "DT_CSPlayer", "m_pViewmodelArmConfig", PlayerViewmodelArmConfig*);
-		NETVAR2(GetArmsModel, "DT_CSPlayer", "m_szArmsModel", char*); 
-
-		
-
-		void SetModelIndex(const int index)
-		{
-			getvfunc<void(__thiscall*)(C_BaseEntity*, int)>(this, 75)(this, index);
-		}
-
-		NETVAR_OFFSET(m_dwBoneMatrix, "CBaseAnimating", "m_nForceBone", +0x1C, uintptr_t); 
-
-		Vector GetBonePosition(int iBone) {
-			uintptr_t bm = m_dwBoneMatrix();
-			matrix3x4_t boneMatrix =  *(matrix3x4_t*) (bm +iBone * sizeof(matrix3x4_t)) ;
-			return Vector(boneMatrix[0][3], boneMatrix[1][3], boneMatrix[2][3]);
-		}
-
-		NETVAR(body, "CBaseAnimating", "m_nBody", int);
-		NETVAR(GetModelScale, "CBaseAnimating", "m_flModelScale", float);
-		NETVAR(GetScaleType, "CBaseAnimating", "m_ScaleType", float);
-		NETVAR(GetFrozen, "CBaseAnimating", "m_flFrozen", float);
-		 
-		NETVAR(GetMins, "CBaseEntity", "m_vecMins", Vector); 
-		NETVAR(GetMaxs, "CBaseEntity", "m_vecMaxs", Vector);  
-
-		int GetSequenceActivity(int sequence, studiohdr_t* hdr)
-		{
-			static auto getSequenceActivity = (DWORD)(FindPatternV2("client.dll", "55 8B EC 53 8B 5D 08 56 8B F1 83"));            
-			static auto GetSequenceActivity = reinterpret_cast<int(__fastcall*)(void*, studiohdr_t*, int)>(getSequenceActivity);
-			return GetSequenceActivity(this, hdr, sequence);
-		}
-
-		char* GetSequenceActivity(int sequence)
-		{
-			static auto getSequenceActivity = (DWORD)(FindPatternV2("client.dll", "55 8B EC 83 7D 08 FF 56 8B F1"));
-			static auto GetSequenceActivity = reinterpret_cast<char* (__fastcall*)(void*, studiohdr_t*, int)>(getSequenceActivity);
-			return GetSequenceActivity(this, 0, sequence);
-		}
-
-		void SendViewModelMatchingSequence(int sequence)
-		{
-			printf("Set new sequence %d\n",sequence);
-			typedef  void(__thiscall* OriginalFn)(void*, int);
-			return getvfunc<OriginalFn>(this, 246)(this, sequence);
-		}
-
-	};
-
-	class C_BaseCombatCharacter : public C_BaseEntity
-	{
-	public:
-		NETVAR(GetWeapons, "CBaseCombatCharacter", "m_hMyWeapons", std::array<CBaseHandle, MAX_WEAPONS>);
-		PNETVAR(GetWearables, "CBaseCombatCharacter", "m_hMyWearables", CBaseHandle); 
-	};
-
-	class C_BasePlayer : public C_BaseCombatCharacter
-	{
-	public:
-		NETVAR(GetLifeState, "CBasePlayer", "m_lifeState", int);
-		NETVAR(GetViewModel, "CBasePlayer", "m_hViewModel[0]", CBaseHandle);
-
-		NETVAR(GetOrigin, "CBaseEntity", "m_vecOrigin", Vector);
-		NETVAR(GetAngles, "CBaseEntity", "m_angRotation", Vector);
-		NETVAR(GetHealth, "CBasePlayer", "m_iHealth", int);
-		NETVAR(GetViewOffset, "CBasePlayer", "m_vecViewOffset[0]", Vector);
-		NETVAR(GetTeam, "CBaseEntity", "m_iTeamNum", int);
-
-		NETVAR2(GetNightvision, "DT_CSPlayer", "m_bNightVisionOn", bool);
-		NETVAR2(GetNightvisionAlpha, "DT_CSPlayer", "m_flNightVisionAlpha", float);
-	}; 
-
-	class C_BaseCombatWeapon : public C_BaseEntity
-	{
-	public:
-		NETVAR(GetViewModelIndex, "CBaseCombatWeapon", "m_iViewModelIndex", int);
-		NETVAR(GetWorldModelIndex, "CBaseCombatWeapon", "m_iWorldModelIndex", int);
-		NETVAR(GetWorldDroppedModelIndex, "CBaseCombatWeapon", "m_iWorldDroppedModelIndex", int);
-		NETVAR(GetWeaponWorldModel, "CBaseCombatWeapon", "m_hWeaponWorldModel", CBaseHandle);
-	};
-
-	class C_BaseAttributableItem : public C_BaseCombatWeapon
-	{
-	public:
-		NETVAR(GetAccountID, "CBaseAttributableItem", "m_iAccountID", int);
-		NETVAR(GetItemDefinitionIndex, "CBaseAttributableItem", "m_iItemDefinitionIndex", short);
-		NETVAR(GetItemIDHigh, "CBaseAttributableItem", "m_iItemIDHigh", int);
-		NETVAR(GetEntityQuality, "CBaseAttributableItem", "m_iEntityQuality", int);
-		NETVAR(GetCustomName, "CBaseAttributableItem", "m_szCustomName", char[32]);
-		NETVAR(GetFallbackPaintKit, "CBaseAttributableItem", "m_nFallbackPaintKit", unsigned);
-		NETVAR(GetFallbackSeed, "CBaseAttributableItem", "m_nFallbackSeed", unsigned);
-		NETVAR(GetFallbackWear, "CBaseAttributableItem", "m_flFallbackWear", float);
-		NETVAR(GetFallbackStatTrak, "CBaseAttributableItem", "m_nFallbackStatTrak", unsigned);
-		NETVAR(initialized, "CBaseAttributableItem", "m_bInitialized", bool)
-	};
-
-	class C_BaseViewModel : public C_BaseEntity
-	{
-	public:
-		NETVAR(GetOwner, "CBaseViewModel", "m_hOwner", CBaseHandle);
-		NETVAR(GetWeapon, "CBaseViewModel", "m_hWeapon", CBaseHandle);
-		NETPROP(GetSequenceProp, "CBaseViewModel", "m_nSequence");
-
-		NETVAR(GetSequence, "CBaseViewModel", "m_nSequence", int);
-	};
-
-	class C_PlayerResource
-	{
-	public:
-		NETPROP(GetTeamProp, "CPlayerResource", "m_iTeam");
-	};
-
-	class C_CS_PlayerResource : public C_PlayerResource
-	{
-	public:
-		NETVAR(GetRanks, "CCSPlayerResource", "m_iCompetitiveRanking", int[MAX_PLAYERS]);
-		NETVAR(GetRankType, "CCSPlayerResource", "m_iCompetitiveRankType", int[MAX_PLAYERS]);
-		NETVAR(GetWins, "CCSPlayerResource", "m_iCompetitiveWins", int[MAX_PLAYERS]);
-		NETVAR(GetLevel, "CCSPlayerResource", "m_nPersonaDataPublicLevel", int[MAX_PLAYERS]);
-		NETVAR(GetComLeader, "CCSPlayerResource", "m_nPersonaDataPublicCommendsLeader", int[MAX_PLAYERS]);
-		NETVAR(GetComTeacher, "CCSPlayerResource", "m_nPersonaDataPublicCommendsTeacher", int[MAX_PLAYERS]);
-		NETVAR(GetComFriendly, "CCSPlayerResource", "m_nPersonaDataPublicCommendsFriendly", int[MAX_PLAYERS]);
-
-		NETVAR(GetClanTags, "CCSPlayerResource", "m_szClan", char[MAX_PLAYERS][32]);
-		NETVAR(GetCoins, "CCSPlayerResource", "m_nActiveCoinRank", unsigned[MAX_PLAYERS]);
-		NETVAR(GetMusicKits, "CCSPlayerResource", "m_nMusicID", unsigned[MAX_PLAYERS]);
-
-		NETVAR2(GetKills, "DT_CSPlayerResource", "m_iKills", unsigned[MAX_PLAYERS]);
-		NETVAR2(GetAssists, "DT_CSPlayerResource", "m_iAssists", unsigned[MAX_PLAYERS]);
-		NETVAR2(GetDeaths, "DT_CSPlayerResource", "m_iDeaths", unsigned[MAX_PLAYERS]);
-
-		NETVAR(GetMVPs, "CCSPlayerResource", "m_iMVPs", int[MAX_PLAYERS]);
-		NETVAR(GetScore, "CCSPlayerResource", "m_iScore", int[MAX_PLAYERS]);
-
-		NETVAR(IsVIP, "CCSPlayerResource", "m_iPlayerVIP", int[MAX_PLAYERS]);
-
-	};
-
-	class CBaseWeaponWorldModel : public C_BaseEntity
-	{
-	};
-	
-	class C_Precipitation : public C_BaseEntity
-	{ 
-	public:
-		NETVAR2(GetPrecipitationType, "DT_Precipitation", "m_nPrecipType", PrecipitationType_t); 
-	};
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/c_baseflex.h b/SpyCustom/c_baseflex.h
deleted file mode 100644
index 086b719..0000000
--- a/SpyCustom/c_baseflex.h
+++ /dev/null
@@ -1,284 +0,0 @@
-#ifndef C_STUDIOFLEX_H
-#define C_STUDIOFLEX_H
-#pragma once
-
-
-#include "c_baseanimating.h"
-#include "c_baseanimatingoverlay.h"
-#include "sceneentity_shared.h"
-
-#include "utlvector.h"
-
-class CFlexSceneFile
-{
-public:
-	enum
-	{
-		MAX_FLEX_FILENAME = 128,
-	};
-
-	char			filename[MAX_FLEX_FILENAME];
-	void* buffer;
-};
-
-struct Emphasized_Phoneme;
-class CSentence;
-
-enum
-{
-	PHONEME_CLASS_WEAK = 0,
-	PHONEME_CLASS_NORMAL,
-	PHONEME_CLASS_STRONG,
-
-	NUM_PHONEME_CLASSES
-};
-
-struct FS_LocalToGlobal_t
-{
-	explicit FS_LocalToGlobal_t() :
-		m_Key(0),
-		m_nCount(0),
-		m_Mapping(0)
-	{
-	}
-
-	explicit FS_LocalToGlobal_t(const flexsettinghdr_t* key) :
-		m_Key(key),
-		m_nCount(0),
-		m_Mapping(0)
-	{
-	}
-
-	void SetCount(int count)
-	{
-		Assert(!m_Mapping);
-		Assert(count > 0);
-		m_nCount = count;
-		m_Mapping = new int[m_nCount];
-		Q_memset(m_Mapping, 0, m_nCount * sizeof(int));
-	}
-
-	FS_LocalToGlobal_t(const FS_LocalToGlobal_t& src)
-	{
-		m_Key = src.m_Key;
-		delete m_Mapping;
-		m_Mapping = new int[src.m_nCount];
-		Q_memcpy(m_Mapping, src.m_Mapping, src.m_nCount * sizeof(int));
-
-		m_nCount = src.m_nCount;
-	}
-
-	~FS_LocalToGlobal_t()
-	{
-		delete m_Mapping;
-		m_nCount = 0;
-		m_Mapping = 0;
-	}
-
-	const flexsettinghdr_t* m_Key;
-	int						m_nCount;
-	int* m_Mapping;
-};
-
-bool FlexSettingLessFunc(const FS_LocalToGlobal_t& lhs, const FS_LocalToGlobal_t& rhs);
-
-class IHasLocalToGlobalFlexSettings
-{
-public:
-	virtual void		EnsureTranslations(const flexsettinghdr_t* pSettinghdr) = 0;
-};
-
-struct Emphasized_Phoneme
-{
-	char			classname[64];
-	bool			required;
-	bool			basechecked;
-	const flexsettinghdr_t* base;
-	const flexsetting_t* exp;
-
-	bool			valid;
-	float			amount;
-};
-
-class C_BaseFlex : public C_BaseAnimatingOverlay, public IHasLocalToGlobalFlexSettings
-{
-	DECLARE_CLASS(C_BaseFlex, C_BaseAnimatingOverlay);
-public:
-	DECLARE_CLIENTCLASS();
-	DECLARE_PREDICTABLE();
-	DECLARE_INTERPOLATION();
-
-	C_BaseFlex();
-	virtual			~C_BaseFlex();
-
-	virtual void Spawn();
-
-	virtual void InitPhonemeMappings();
-
-	void		SetupMappings(char const* pchFileRoot);
-
-	virtual CStudioHdr* OnNewModel(void);
-
-	virtual void	StandardBlendingRules(CStudioHdr* hdr, Vector pos[], Quaternion q[], float currentTime, int boneMask);
-
-	virtual void OnThreadedDrawSetup();
-
-	virtual void BuildTransformations(CStudioHdr* pStudioHdr, Vector* pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList& boneComputed);
-	static void		LinkToGlobalFlexControllers(CStudioHdr* hdr);
-	virtual	void	SetupWeights(const matrix3x4_t* pBoneToWorld, int nFlexWeightCount, float* pFlexWeights, float* pFlexDelayedWeights);
-	virtual	bool	SetupGlobalWeights(const matrix3x4_t* pBoneToWorld, int nFlexWeightCount, float* pFlexWeights, float* pFlexDelayedWeights);
-	static void		RunFlexDelay(int nFlexWeightCount, float* pFlexWeights, float* pFlexDelayedWeights, float& flFlexDelayTime);
-	virtual	void	SetupLocalWeights(const matrix3x4_t* pBoneToWorld, int nFlexWeightCount, float* pFlexWeights, float* pFlexDelayedWeights);
-	virtual bool	UsesFlexDelayedWeights();
-
-	static	void	RunFlexRules(CStudioHdr* pStudioHdr, float* dest);
-
-	virtual Vector	SetViewTarget(CStudioHdr* pStudioHdr);
-
-	virtual bool	GetSoundSpatialization(SpatializationInfo_t& info);
-
-	virtual void	GetToolRecordingState(KeyValues* msg);
-
-	void				AddFlexAnimation(CSceneEventInfo* info);
-
-	void			SetFlexWeight(LocalFlexController_t index, float value);
-	float			GetFlexWeight(LocalFlexController_t index);
-
-	LocalFlexController_t				FindFlexController(const char* szName);
-
-public:
-	Vector			m_viewtarget;
-	CInterpolatedVar< Vector >	m_iv_viewtarget;
-	float			m_flexWeight[MAXSTUDIOFLEXCTRL];
-	CInterpolatedVarArray< float, MAXSTUDIOFLEXCTRL >	m_iv_flexWeight;
-
-	int				m_blinktoggle;
-
-	static int		AddGlobalFlexController(const char* szName);
-	static char const* GetGlobalFlexControllerName(int idx);
-
-public:
-
-	void				StartChoreoScene(CChoreoScene* scene);
-	void				RemoveChoreoScene(CChoreoScene* scene);
-
-	virtual bool		StartSceneEvent(CSceneEventInfo* info, CChoreoScene* scene, CChoreoEvent* event, CChoreoActor* actor, C_BaseEntity* pTarget);
-
-	virtual void		ProcessSceneEvents(bool bFlexEvents);
-
-	virtual	bool		ProcessSceneEvent(bool bFlexEvents, CSceneEventInfo* info, CChoreoScene* scene, CChoreoEvent* event);
-
-	virtual bool		ProcessSequenceSceneEvent(CSceneEventInfo* info, CChoreoScene* scene, CChoreoEvent* event);
-
-	void				ClearSceneEvents(CChoreoScene* scene, bool canceled);
-
-	virtual	bool		ClearSceneEvent(CSceneEventInfo* info, bool fastKill, bool canceled);
-
-	void				AddSceneEvent(CChoreoScene* scene, CChoreoEvent* event, C_BaseEntity* pTarget = NULL, bool bClientSide = false);
-
-	void				RemoveSceneEvent(CChoreoScene* scene, CChoreoEvent* event, bool fastKill);
-
-	bool				CheckSceneEvent(float currenttime, CChoreoScene* scene, CChoreoEvent* event);
-
-	virtual bool		CheckSceneEventCompletion(CSceneEventInfo* info, float currenttime, CChoreoScene* scene, CChoreoEvent* event);
-
-	int					FlexControllerLocalToGlobal(const flexsettinghdr_t* pSettinghdr, int key);
-
-	virtual void		EnsureTranslations(const flexsettinghdr_t* pSettinghdr);
-
-	void* FindSceneFile(const char* filename);
-
-private:
-
-	bool RequestStartSequenceSceneEvent(CSceneEventInfo* info, CChoreoScene* scene, CChoreoEvent* event, CChoreoActor* actor, CBaseEntity* pTarget);
-
-	bool ProcessFlexAnimationSceneEvent(CSceneEventInfo* info, CChoreoScene* scene, CChoreoEvent* event);
-	bool ProcessFlexSettingSceneEvent(CSceneEventInfo* info, CChoreoScene* scene, CChoreoEvent* event);
-	void AddFlexSetting(const char* expr, float scale,
-		const flexsettinghdr_t* pSettinghdr, bool newexpression);
-
-	CUtlVector < CSceneEventInfo >		m_SceneEvents;
-	CUtlVector < CChoreoScene* >		m_ActiveChoreoScenes;
-
-	bool				HasSceneEvents() const;
-
-private:
-	CUtlRBTree< FS_LocalToGlobal_t, unsigned short > m_LocalToGlobal;
-
-	float			m_blinktime;
-	int				m_prevblinktoggle;
-
-	int				m_iBlink;
-	LocalFlexController_t				m_iEyeUpdown;
-	LocalFlexController_t				m_iEyeRightleft;
-	bool			m_bSearchedForEyeFlexes;
-	int				m_iMouthAttachment;
-
-	float			m_flFlexDelayTime;
-	float* m_flFlexDelayedWeight;
-	int				m_cFlexDelayedWeight;
-
-	static int		g_numflexcontrollers;
-	static char* g_flexcontroller[MAXSTUDIOFLEXCTRL * 4];       
-	static float	g_flexweight[MAXSTUDIOFLEXDESC];
-
-protected:
-
-	Emphasized_Phoneme m_PhonemeClasses[NUM_PHONEME_CLASSES];
-
-private:
-
-	C_BaseFlex(const C_BaseFlex&);     
-
-	const flexsetting_t* FindNamedSetting(const flexsettinghdr_t* pSettinghdr, const char* expr);
-
-	void			ProcessVisemes(Emphasized_Phoneme* classes);
-	void			AddVisemesForSentence(Emphasized_Phoneme* classes, float emphasis_intensity, CSentence* sentence, float t, float dt, bool juststarted);
-	void			AddViseme(Emphasized_Phoneme* classes, float emphasis_intensity, int phoneme, float scale, bool newexpression);
-	bool			SetupEmphasisBlend(Emphasized_Phoneme* classes, int phoneme);
-	void			ComputeBlendedSetting(Emphasized_Phoneme* classes, float emphasis_intensity);
-
-#ifdef HL2_CLIENT_DLL
-public:
-
-	Vector			m_vecLean;
-	CInterpolatedVar< Vector >	m_iv_vecLean;
-	Vector			m_vecShift;
-	CInterpolatedVar< Vector >	m_iv_vecShift;
-#endif
-};
-
-
-class CFlexSceneFileManager : CAutoGameSystem
-{
-public:
-
-	CFlexSceneFileManager() : CAutoGameSystem("CFlexSceneFileManager")
-	{
-	}
-
-	virtual bool Init();
-	virtual void Shutdown();
-
-	void EnsureTranslations(IHasLocalToGlobalFlexSettings* instance, const flexsettinghdr_t* pSettinghdr);
-	void* FindSceneFile(IHasLocalToGlobalFlexSettings* instance, const char* filename, bool allowBlockingIO);
-
-private:
-	void DeleteSceneFiles();
-
-	CUtlVector< CFlexSceneFile* > m_FileList;
-};
-
-
-inline bool C_BaseFlex::HasSceneEvents() const
-{
-	return m_SceneEvents.Count() != 0;
-}
-
-
-EXTERN_RECV_TABLE(DT_BaseFlex);
-
-float* GetVisemeWeights(int phoneme);
-
-
-#endif  
diff --git a/SpyCustom/c_baseplayer.h b/SpyCustom/c_baseplayer.h
deleted file mode 100644
index 5e0c111..0000000
--- a/SpyCustom/c_baseplayer.h
+++ /dev/null
@@ -1,619 +0,0 @@
-#ifndef C_BASEPLAYER_H
-#define C_BASEPLAYER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "c_playerlocaldata.h"
-#include "c_basecombatcharacter.h"
-
-#include "usercmd.h"
-#include "shareddefs.h"
-#include "timedevent.h"
-#include "smartptr.h"
-
-#include "igameevents.h"
-#include "GameEventListener.h"
-
-#if defined USES_ECON_ITEMS
-#include "econ_item.h"
-#include "game_item_schema.h"
-#include "econ_item_view.h"
-#endif
-
-class C_BaseCombatWeapon;
-class C_BaseViewModel;
-class C_FuncLadder;
-class CFlashlightEffect;
-class C_EconWearable;
-
-extern int g_nKillCamMode;
-extern int g_nKillCamTarget1;
-extern int g_nKillCamTarget2;
-
-class C_CommandContext
-{
-public:
-	bool			needsprocessing;
-
-	CUserCmd		cmd;
-	int				command_number;
-};
-
-class C_PredictionError
-{
-public:
-	float	time;
-	Vector	error;
-};
-
-#define CHASE_CAM_DISTANCE_MIN	16.0f
-#define CHASE_CAM_DISTANCE_MAX	96.0f
-#define WALL_OFFSET				6.0f
-
-
-bool IsInFreezeCam(void);
-
-class C_BasePlayer : public C_BaseCombatCharacter, public CGameEventListener
-{
-public:
-	DECLARE_CLASS(C_BasePlayer, C_BaseCombatCharacter);
-	DECLARE_CLIENTCLASS();
-	DECLARE_PREDICTABLE();
-	DECLARE_INTERPOLATION();
-
-	C_BasePlayer();
-	virtual			~C_BasePlayer();
-
-	virtual void	Spawn(void);
-	virtual void	SharedSpawn();      
-	virtual bool	GetSteamID(CSteamID* pID);
-
-	virtual void	OnPreDataChanged(DataUpdateType_t updateType);
-	virtual void	OnDataChanged(DataUpdateType_t updateType);
-
-	virtual void	PreDataUpdate(DataUpdateType_t updateType);
-	virtual void	PostDataUpdate(DataUpdateType_t updateType);
-
-	virtual void	ReceiveMessage(int classID, bf_read& msg);
-
-	virtual void	OnRestore();
-
-	virtual void	AddEntity(void);
-
-	virtual void	MakeTracer(const Vector& vecTracerSrc, const trace_t& tr, int iTracerType);
-
-	virtual void	GetToolRecordingState(KeyValues* msg);
-
-	virtual float GetPlayerMaxSpeed();
-
-	void	SetAnimationExtension(const char* pExtension);
-
-	C_BaseViewModel* GetViewModel(int viewmodelindex = 0, bool bObserverOK = true);
-	C_BaseCombatWeapon* GetActiveWeapon(void) const;
-	const char* GetTracerType(void);
-
-	virtual void		CalcView(Vector& eyeOrigin, QAngle& eyeAngles, float& zNear, float& zFar, float& fov);
-	virtual void		CalcViewModelView(const Vector& eyeOrigin, const QAngle& eyeAngles);
-
-
-	void				SmoothViewOnStairs(Vector& eyeOrigin);
-	virtual float		CalcRoll(const QAngle& angles, const Vector& velocity, float rollangle, float rollspeed);
-	void				CalcViewRoll(QAngle& eyeAngles);
-	void				CreateWaterEffects(void);
-
-	virtual void			SetPlayerUnderwater(bool state);
-	void					UpdateUnderwaterState(void);
-	bool					IsPlayerUnderwater(void) { return m_bPlayerUnderwater; }
-
-	virtual Vector			Weapon_ShootPosition();
-	virtual void			Weapon_DropPrimary(void) {}
-
-	virtual Vector			GetAutoaimVector(float flScale);
-	void					SetSuitUpdate(const char* name, int fgroup, int iNoRepeat);
-
-	virtual bool	CreateMove(float flInputSampleTime, CUserCmd* pCmd);
-	virtual void	AvoidPhysicsProps(CUserCmd* pCmd);
-
-	virtual void	PlayerUse(void);
-	CBaseEntity* FindUseEntity(void);
-	virtual bool	IsUseableEntity(CBaseEntity* pEntity, unsigned int requiredCaps);
-
-	virtual bool	IsPlayer(void) const { return true; }
-	virtual int		GetHealth() const { return m_iHealth; }
-
-	int		GetBonusProgress() const { return m_iBonusProgress; }
-	int		GetBonusChallenge() const { return m_iBonusChallenge; }
-
-	virtual int			GetObserverMode() const;
-	void				SetObserverMode(int iNewMode);
-	virtual CBaseEntity* GetObserverTarget() const;
-	void			SetObserverTarget(EHANDLE hObserverTarget);
-
-	bool			AudioStateIsUnderwater(Vector vecMainViewOrigin);
-
-	bool IsObserver() const;
-	bool IsHLTV() const;
-	bool IsReplay() const;
-	void ResetObserverMode();
-	bool IsBot(void) const { return false; }
-
-	virtual Vector		 EyePosition();
-	virtual const QAngle& EyeAngles();		   
-	void				 EyePositionAndVectors(Vector* pPosition, Vector* pForward, Vector* pRight, Vector* pUp);
-	virtual const QAngle& LocalEyeAngles();		   
-
-	virtual IRagdoll* GetRepresentativeRagdoll() const;
-
-	virtual void GetRagdollInitBoneArrays(matrix3x4_t* pDeltaBones0, matrix3x4_t* pDeltaBones1, matrix3x4_t* pCurrentBones, float boneDt);
-
-	void			EyeVectors(Vector* pForward, Vector* pRight = NULL, Vector* pUp = NULL);
-	void			CacheVehicleView(void);	           
-
-
-	bool			IsSuitEquipped(void) { return m_Local.m_bWearingSuit; };
-
-	virtual void	TeamChange(int iNewTeam);
-
-	void	Flashlight(void);
-	void	UpdateFlashlight(void);
-
-	virtual bool				IsAllowedToSwitchWeapons(void) { return !IsObserver(); }
-	virtual C_BaseCombatWeapon* GetActiveWeaponForSelection(void);
-
-	virtual C_BaseAnimating* GetRenderedWeaponModel();
-
-	virtual bool				IsOverridingViewmodel(void) { return false; };
-	virtual int					DrawOverriddenViewmodel(C_BaseViewModel* pViewmodel, int flags) { return 0; };
-
-	virtual float				GetDefaultAnimSpeed(void) { return 1.0; }
-
-	void						SetMaxSpeed(float flMaxSpeed) { m_flMaxspeed = flMaxSpeed; }
-	float						MaxSpeed() const { return m_flMaxspeed; }
-
-	virtual ShadowType_t		ShadowCastType() { return SHADOWS_NONE; }
-
-	virtual bool				ShouldReceiveProjectedTextures(int flags)
-	{
-		return false;
-	}
-
-
-	bool						IsLocalPlayer(void) const;
-
-	virtual void				ThirdPersonSwitch(bool bThirdperson);
-	static bool					LocalPlayerInFirstPersonView();
-	static bool					ShouldDrawLocalPlayer();
-	static C_BasePlayer* GetLocalPlayer(void);
-	int							GetUserID(void);
-	virtual bool				CanSetSoundMixer(void);
-	virtual int					GetVisionFilterFlags(bool bWeaponsCheck = false) { return 0x00; }
-	bool						HasVisionFilterFlags(int nFlags, bool bWeaponsCheck = false) { return (GetVisionFilterFlags(bWeaponsCheck) & nFlags) == nFlags; }
-	virtual void				CalculateVisionUsingCurrentFlags(void) {}
-	void						BuildFirstPersonMeathookTransformations(CStudioHdr* hdr, Vector* pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList& boneComputed, const char* pchHeadBoneName);
-
-	bool						InFirstPersonView();
-	bool						ShouldDrawThisPlayer();
-
-	virtual bool				ViewModel_IsTransparent(void);
-	virtual bool				ViewModel_IsUsingFBTexture(void);
-
-#if !defined( NO_ENTITY_PREDICTION )
-	void						AddToPlayerSimulationList(C_BaseEntity* other);
-	void						SimulatePlayerSimulatedEntities(void);
-	void						RemoveFromPlayerSimulationList(C_BaseEntity* ent);
-	void						ClearPlayerSimulationList(void);
-#endif
-
-	virtual void				PhysicsSimulate(void);
-	virtual unsigned int	PhysicsSolidMaskForEntity(void) const { return MASK_PLAYERSOLID; }
-
-	virtual bool				ShouldPredict(void);
-
-	virtual void				PreThink(void);
-	virtual void				PostThink(void);
-
-	virtual void				ItemPreFrame(void);
-	virtual void				ItemPostFrame(void);
-	virtual void				AbortReload(void);
-
-	virtual void				SelectLastItem(void);
-	virtual void				Weapon_SetLast(C_BaseCombatWeapon* pWeapon);
-	virtual bool				Weapon_ShouldSetLast(C_BaseCombatWeapon* pOldWeapon, C_BaseCombatWeapon* pNewWeapon) { return true; }
-	virtual bool				Weapon_ShouldSelectItem(C_BaseCombatWeapon* pWeapon);
-	virtual	bool				Weapon_Switch(C_BaseCombatWeapon* pWeapon, int viewmodelindex = 0);		          
-	virtual C_BaseCombatWeapon* GetLastWeapon(void) { return m_hLastWeapon.Get(); }
-	void						ResetAutoaim(void);
-	virtual void 				SelectItem(const char* pstr, int iSubType = 0);
-
-	virtual void				UpdateClientData(void);
-
-	virtual float				GetFOV(void);
-	int							GetDefaultFOV(void) const;
-	virtual bool				IsZoomed(void) { return false; }
-	bool						SetFOV(CBaseEntity* pRequester, int FOV, float zoomRate = 0.0f, int iZoomStart = 0);
-	void						ClearZoomOwner(void);
-
-	float						GetFOVDistanceAdjustFactor();
-
-	virtual void				ViewPunch(const QAngle& angleOffset);
-	void						ViewPunchReset(float tolerance = 0);
-
-	void						UpdateButtonState(int nUserCmdButtonMask);
-	int							GetImpulse(void) const;
-
-	virtual void				Simulate();
-
-	virtual bool				ShouldInterpolate();
-
-	virtual bool				ShouldDraw();
-	virtual int					DrawModel(int flags);
-
-	virtual void				OverrideView(CViewSetup* pSetup);
-
-	const char* GetPlayerName();
-	virtual const Vector		GetPlayerMins(void) const;    
-	virtual const Vector		GetPlayerMaxs(void) const;    
-
-	bool				IsPlayerDead();
-	bool				IsPoisoned(void) { return m_Local.m_bPoisoned; }
-
-	C_BaseEntity* GetUseEntity();
-
-	IClientVehicle* GetVehicle();
-
-	bool			IsInAVehicle() const { return (NULL != m_hVehicle.Get()) ? true : false; }
-	virtual void	SetVehicleRole(int nRole);
-	void					LeaveVehicle(void);
-
-	bool					UsingStandardWeaponsInVehicle(void);
-
-	virtual void			SetAnimation(PLAYER_ANIM playerAnim);
-
-	float					GetTimeBase(void) const;
-	float					GetFinalPredictedTime() const;
-
-	bool					IsInVGuiInputMode() const;
-	bool					IsInViewModelVGuiInputMode() const;
-
-	C_CommandContext* GetCommandContext();
-
-	int CurrentCommandNumber() const;
-	const CUserCmd* GetCurrentUserCommand() const;
-
-	const QAngle& GetPunchAngle();
-	void SetPunchAngle(const QAngle& angle);
-
-	float					GetWaterJumpTime() const;
-	void					SetWaterJumpTime(float flWaterJumpTime);
-	float					GetSwimSoundTime(void) const;
-	void					SetSwimSoundTime(float flSwimSoundTime);
-
-	float					GetDeathTime(void) { return m_flDeathTime; }
-
-	void		SetPreviouslyPredictedOrigin(const Vector& vecAbsOrigin);
-	const Vector& GetPreviouslyPredictedOrigin() const;
-
-	virtual float GetMinFOV() const;
-
-	virtual void DoMuzzleFlash();
-	virtual void PlayPlayerJingle();
-
-	virtual void UpdateStepSound(surfacedata_t* psurface, const Vector& vecOrigin, const Vector& vecVelocity);
-	virtual void PlayStepSound(Vector& vecOrigin, surfacedata_t* psurface, float fvol, bool force);
-	virtual surfacedata_t* GetFootstepSurface(const Vector& origin, const char* surfaceName);
-	virtual void GetStepSoundVelocities(float* velwalk, float* velrun);
-	virtual void SetStepSoundTime(stepsoundtimes_t iStepSoundTime, bool bWalking);
-	virtual const char* GetOverrideStepSound(const char* pszBaseStepSoundName) { return pszBaseStepSoundName; }
-
-	virtual void OnEmitFootstepSound(const CSoundParameters& params, const Vector& vecOrigin, float fVolume) {}
-
-	void NotePredictionError(const Vector& vDelta);
-
-	void GetPredictionErrorSmoothingVector(Vector& vOffset);
-
-	virtual void ExitLadder() {}
-	surfacedata_t* GetLadderSurface(const Vector& origin);
-
-	surfacedata_t* GetSurfaceData(void) { return m_pSurfaceData; }
-
-	void SetLadderNormal(Vector vecLadderNormal) { m_vecLadderNormal = vecLadderNormal; }
-
-	virtual CHintSystem* Hints(void) { return NULL; }
-	bool					ShouldShowHints(void) { return Hints() ? Hints()->ShouldShowHints() : false; }
-	bool 					HintMessage(int hint, bool bForce = false, bool bOnlyIfClear = false) { return Hints() ? Hints()->HintMessage(hint, bForce, bOnlyIfClear) : false; }
-	void 					HintMessage(const char* pMessage) { if (Hints()) Hints()->HintMessage(pMessage); }
-
-	virtual	IMaterial* GetHeadLabelMaterial(void);
-
-	fogparams_t* GetFogParams(void) { return &m_CurrentFog; }
-	void					FogControllerChanged(bool bSnap);
-	void					UpdateFogController(void);
-	void					UpdateFogBlend(void);
-
-	float					GetFOVTime(void) { return m_flFOVTime; }
-
-	virtual void			OnAchievementAchieved(int iAchievement) {}
-
-	bool					ShouldAnnounceAchievement(void) { return m_flNextAchievementAnnounceTime < gpGlobals->curtime; }
-	void					SetNextAchievementAnnounceTime(float flTime) { m_flNextAchievementAnnounceTime = flTime; }
-
-#if defined USES_ECON_ITEMS
-	void					UpdateWearables();
-	C_EconWearable* GetWearable(int i) { return m_hMyWearables[i]; }
-	int						GetNumWearables(void) { return m_hMyWearables.Count(); }
-#endif
-
-	bool					HasFiredWeapon(void) { return m_bFiredWeapon; }
-	void					SetFiredWeapon(bool bFlag) { m_bFiredWeapon = bFlag; }
-
-	virtual bool			CanUseFirstPersonCommand(void) { return true; }
-
-protected:
-	fogparams_t				m_CurrentFog;
-	EHANDLE					m_hOldFogController;
-
-public:
-	int m_StuckLast;
-
-	CNetworkVarEmbedded(CPlayerLocalData, m_Local);
-
-#if defined USES_ECON_ITEMS
-	CNetworkVarEmbedded(CAttributeList, m_AttributeList);
-#endif
-
-	CPlayerState			pl;
-
-	int						m_iFOV;				   
-	int						m_iFOVStart;		          
-	float					m_flFOVTime;		      
-	int						m_iDefaultFOV;		        
-	EHANDLE					m_hZoomOwner;		            
-	bool			m_fOnTarget;		     
-
-	char			m_szAnimExtension[32];
-
-	int				m_afButtonLast;
-	int				m_afButtonPressed;
-	int				m_afButtonReleased;
-
-	int				m_nButtons;
-
-	CUserCmd* m_pCurrentCommand;
-
-	EHANDLE			m_hConstraintEntity;
-	Vector			m_vecConstraintCenter;
-	float			m_flConstraintRadius;
-	float			m_flConstraintWidth;
-	float			m_flConstraintSpeedFactor;
-
-protected:
-
-	void				CalcPlayerView(Vector& eyeOrigin, QAngle& eyeAngles, float& fov);
-	void				CalcVehicleView(IClientVehicle* pVehicle, Vector& eyeOrigin, QAngle& eyeAngles,
-		float& zNear, float& zFar, float& fov);
-	virtual void		CalcObserverView(Vector& eyeOrigin, QAngle& eyeAngles, float& fov);
-	virtual Vector		GetChaseCamViewOffset(CBaseEntity* target);
-	void				CalcChaseCamView(Vector& eyeOrigin, QAngle& eyeAngles, float& fov);
-	virtual void		CalcInEyeCamView(Vector& eyeOrigin, QAngle& eyeAngles, float& fov);
-
-	virtual float		GetDeathCamInterpolationTime();
-
-	virtual void		CalcDeathCamView(Vector& eyeOrigin, QAngle& eyeAngles, float& fov);
-	void				CalcRoamingView(Vector& eyeOrigin, QAngle& eyeAngles, float& fov);
-	virtual void		CalcFreezeCamView(Vector& eyeOrigin, QAngle& eyeAngles, float& fov);
-
-	void DetermineVguiInputMode(CUserCmd* pCmd);
-
-	virtual void SetLocalViewAngles(const QAngle& viewAngles);
-	virtual void SetViewAngles(const QAngle& ang);
-
-	surfacedata_t* GetGroundSurface();
-
-	virtual void	FireGameEvent(IGameEvent* event);
-
-protected:
-	bool			JustEnteredVehicle();
-
-	int				m_iObserverMode;	      
-	EHANDLE			m_hObserverTarget;	   
-	float			m_flObserverChaseDistance;      
-	Vector			m_vecFreezeFrameStart;
-	float			m_flFreezeFrameStartTime;	         
-	float			m_flFreezeFrameDistance;
-	bool			m_bWasFreezeFraming;
-	float			m_flDeathTime;		    
-
-	float			m_flStepSoundTime;
-	bool			m_IsFootprintOnLeft;
-
-private:
-	C_BasePlayer& operator=(const C_BasePlayer& src);
-	C_BasePlayer(const C_BasePlayer&);     
-
-	EHANDLE			m_hVehicle;
-	EHANDLE			m_hOldVehicle;
-	EHANDLE			m_hUseEntity;
-
-	float			m_flMaxspeed;
-
-	int				m_iBonusProgress;
-	int				m_iBonusChallenge;
-
-	CInterpolatedVar< Vector >	m_iv_vecViewOffset;
-
-	Vector			m_vecWaterJumpVel;
-	float			m_flWaterJumpTime;       
-	int				m_nImpulse;
-
-	float			m_flSwimSoundTime;
-	Vector			m_vecLadderNormal;
-
-	QAngle			m_vecOldViewAngles;
-
-	bool			m_bWasFrozen;
-	int				m_flPhysics;
-
-	int				m_nTickBase;
-	int				m_nFinalPredictedTick;
-
-	EHANDLE			m_pCurrentVguiScreen;
-
-	bool			m_bFiredWeapon;
-
-
-	CFlashlightEffect* m_pFlashlight;
-
-	typedef CHandle<C_BaseCombatWeapon> CBaseCombatWeaponHandle;
-	CNetworkVar(CBaseCombatWeaponHandle, m_hLastWeapon);
-
-#if !defined( NO_ENTITY_PREDICTION )
-	CUtlVector< CHandle< C_BaseEntity > > m_SimulatedByThisPlayer;
-#endif
-
-	CHandle< C_BaseViewModel >	m_hViewModel[MAX_VIEWMODELS];
-
-	float					m_flOldPlayerZ;
-	float					m_flOldPlayerViewOffsetZ;
-
-	Vector	m_vecVehicleViewOrigin;		              
-	QAngle	m_vecVehicleViewAngles;		  
-	float	m_flVehicleViewFOV;
-	int		m_nVehicleViewSavedFrame;	              
-
-	int				m_iOldAmmo[MAX_AMMO_TYPES];
-
-	C_CommandContext		m_CommandContext;
-
-	float							m_flWaterSurfaceZ;
-	bool							m_bResampleWaterSurface;
-	TimedEvent						m_tWaterParticleTimer;
-	CSmartPtr<WaterDebrisEffect>	m_pWaterEmitter;
-
-	bool							m_bPlayerUnderwater;
-
-	friend class CPrediction;
-
-	friend class CTFGameMovementRecon;
-	friend class CGameMovement;
-	friend class CTFGameMovement;
-	friend class CHL1GameMovement;
-	friend class CCSGameMovement;
-	friend class CHL2GameMovement;
-	friend class CDODGameMovement;
-	friend class CPortalGameMovement;
-
-	float GetStepSize(void) const { return m_Local.m_flStepSize; }
-
-	float m_flNextAvoidanceTime;
-	float m_flAvoidanceRight;
-	float m_flAvoidanceForward;
-	float m_flAvoidanceDotForward;
-	float m_flAvoidanceDotRight;
-
-protected:
-	virtual bool IsDucked(void) const { return m_Local.m_bDucked; }
-	virtual bool IsDucking(void) const { return m_Local.m_bDucking; }
-	virtual float GetFallVelocity(void) { return m_Local.m_flFallVelocity; }
-	void ForceSetupBonesAtTimeFakeInterpolation(matrix3x4_t* pBonesOut, float curtimeOffset);
-
-	float m_flLaggedMovementValue;
-
-	Vector m_vecPredictionError;
-	float m_flPredictionErrorTime;
-
-	Vector m_vecPreviouslyPredictedOrigin;               
-
-	char m_szLastPlaceName[MAX_PLACE_NAME_LENGTH];	    
-
-	int				m_surfaceProps;
-	surfacedata_t* m_pSurfaceData;
-	float			m_surfaceFriction;
-	char			m_chTextureType;
-
-	bool			m_bSentFreezeFrame;
-	float			m_flFreezeZOffset;
-
-	float			m_flNextAchievementAnnounceTime;
-
-	int				m_nForceVisionFilterFlags;         
-
-#if defined USES_ECON_ITEMS
-	CUtlVector<CHandle<C_EconWearable > >	m_hMyWearables;
-#endif
-
-private:
-
-	struct StepSoundCache_t
-	{
-		StepSoundCache_t() : m_usSoundNameIndex(0) {}
-		CSoundParameters	m_SoundParameters;
-		unsigned short		m_usSoundNameIndex;
-	};
-	StepSoundCache_t		m_StepSoundCache[2];
-
-public:
-
-	const char* GetLastKnownPlaceName(void) const { return m_szLastPlaceName; }	         
-
-	float GetLaggedMovementValue(void) { return m_flLaggedMovementValue; }
-	bool  ShouldGoSouth(Vector vNPCForward, Vector vNPCRight);    
-
-	void SetOldPlayerZ(float flOld) { m_flOldPlayerZ = flOld; }
-};
-
-EXTERN_RECV_TABLE(DT_BasePlayer);
-
-inline C_BasePlayer* ToBasePlayer(C_BaseEntity* pEntity)
-{
-	if (!pEntity || !pEntity->IsPlayer())
-		return NULL;
-
-#if _DEBUG
-	Assert(dynamic_cast<C_BasePlayer*>(pEntity) != NULL);
-#endif
-
-	return static_cast<C_BasePlayer*>(pEntity);
-}
-
-inline C_BaseEntity* C_BasePlayer::GetUseEntity()
-{
-	return m_hUseEntity;
-}
-
-
-inline IClientVehicle* C_BasePlayer::GetVehicle()
-{
-	C_BaseEntity* pVehicleEnt = m_hVehicle.Get();
-	return pVehicleEnt ? pVehicleEnt->GetClientVehicle() : NULL;
-}
-
-inline bool C_BasePlayer::IsObserver() const
-{
-	return (GetObserverMode() != OBS_MODE_NONE);
-}
-
-inline int C_BasePlayer::GetImpulse(void) const
-{
-	return m_nImpulse;
-}
-
-
-inline C_CommandContext* C_BasePlayer::GetCommandContext()
-{
-	return &m_CommandContext;
-}
-
-inline int CBasePlayer::CurrentCommandNumber() const
-{
-	Assert(m_pCurrentCommand);
-	return m_pCurrentCommand->command_number;
-}
-
-inline const CUserCmd* CBasePlayer::GetCurrentUserCommand() const
-{
-	Assert(m_pCurrentCommand);
-	return m_pCurrentCommand;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/c_basetempentity.h b/SpyCustom/c_basetempentity.h
deleted file mode 100644
index bc0a6b5..0000000
--- a/SpyCustom/c_basetempentity.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef C_BASETEMPENTITY_H
-#define C_BASETEMPENTITY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "client_class.h"
-#include "iclientnetworkable.h"
-#include "c_recipientfilter.h"
-
-
-class C_BaseTempEntity : public IClientUnknown, public IClientNetworkable
-
-{
-public:
-	DECLARE_CLASS_NOBASE(C_BaseTempEntity);
-	DECLARE_CLIENTCLASS();
-
-	C_BaseTempEntity(void);
-	virtual							~C_BaseTempEntity(void);
-
-
-public:
-
-	virtual void SetRefEHandle(const CBaseHandle& handle) { Assert(false); }
-	virtual const CBaseHandle& GetRefEHandle() const { return *((CBaseHandle*)0); }
-
-	virtual IClientUnknown* GetIClientUnknown() { return this; }
-	virtual ICollideable* GetCollideable() { return 0; }
-	virtual IClientNetworkable* GetClientNetworkable() { return this; }
-	virtual IClientRenderable* GetClientRenderable() { return 0; }
-	virtual IClientEntity* GetIClientEntity() { return 0; }
-	virtual C_BaseEntity* GetBaseEntity() { return 0; }
-	virtual IClientThinkable* GetClientThinkable() { return 0; }
-	virtual IClientModelRenderable* GetClientModelRenderable() { return 0; }
-	virtual IClientAlphaProperty* GetClientAlphaProperty() { return 0; }
-
-public:
-
-	virtual void					Release();
-	virtual void					NotifyShouldTransmit(ShouldTransmitState_t state);
-	virtual void					PreDataUpdate(DataUpdateType_t updateType);
-	virtual void					PostDataUpdate(DataUpdateType_t updateType);
-	virtual void					OnPreDataChanged(DataUpdateType_t updateType);
-	virtual void					OnDataChanged(DataUpdateType_t updateType);
-	virtual void					SetDormant(bool bDormant);
-	virtual bool					IsDormant(void);
-	virtual int						entindex(void) const;
-	virtual void					ReceiveMessage(int classID, bf_read& msg);
-	virtual void* GetDataTableBasePtr();
-	virtual void					SetDestroyedOnRecreateEntities(void);
-
-public:
-
-	void NetworkStateChanged() {}
-	void NetworkStateChanged(void* pVar) {}
-
-	virtual bool					Init(int entnum, int iSerialNum);
-
-	virtual void					Precache(void);
-
-	virtual bool					ShouldDestroy(void) { return false; };
-
-	C_BaseTempEntity* GetNext(void);
-
-	static C_BaseTempEntity* GetList(void);
-
-	C_BaseTempEntity* GetNextDynamic(void);
-
-	void	GetColorModulation(float* color)
-	{
-		assert(color);
-		color[0] = color[1] = color[2] = 1.0f;
-	}
-
-	virtual bool	ShouldReceiveProjectedTextures(int flags) { return false; }
-
-public:
-	static C_BaseTempEntity* GetDynamicList();
-
-	static void						PrecacheTempEnts(void);
-
-	static void						ClearDynamicTempEnts(void);
-
-	static void						CheckDynamicTempEnts(void);
-
-private:
-
-	C_BaseTempEntity* m_pNext;
-	C_BaseTempEntity* m_pNextDynamic;
-
-	static C_BaseTempEntity* s_pTempEntities;
-	static C_BaseTempEntity* s_pDynamicEntities;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/c_input.h b/SpyCustom/c_input.h
deleted file mode 100644
index 27d05ea..0000000
--- a/SpyCustom/c_input.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#pragma once
-
-#include "usercmd.h"
-#define MULTIPLAYER_BACKUP 150
-
-class bf_write;
-class bf_read;
-
-class CVerifiedUserCmd
-{
-public:
-	CUserCmd	m_cmd;
-	CRC32_t		m_crc;
-};
-
-class CInput
-{
-public:
-	virtual void  Init_All(void);
-	virtual void  Shutdown_All(void);
-	virtual int   GetButtonBits(int);
-	virtual void  CreateMove(int sequence_number, float input_sample_frametime, bool active);
-	virtual void  ExtraMouseSample(float frametime, bool active);
-	virtual bool  WriteUsercmdDeltaToBuffer(bf_write* buf, int from, int to, bool isnewcommand);
-	virtual void  EncodeUserCmdToBuffer(bf_write& buf, int slot);
-	virtual void  DecodeUserCmdFromBuffer(bf_read& buf, int slot);
-
-
-	inline CUserCmd* GetUserCmd(int sequence_number);
-	inline CVerifiedUserCmd* GetVerifiedCmd(int sequence_number);
-
-	bool                m_fTrackIRAvailable;            
-	bool                m_fMouseInitialized;            
-	bool                m_fMouseActive;                 
-	bool                m_fJoystickAdvancedInit;        
-	char                pad_0x08[0x2C];                 
-	void* m_pKeys;                        
-	char                pad_0x38[0x6C];                 
-	bool                m_fCameraInterceptingMouse;     
-	bool                m_fCameraInThirdPerson;         
-	bool                m_fCameraMovingWithMouse;       
-	Vector              m_vecCameraOffset;              
-	bool                m_fCameraDistanceMove;          
-	int                 m_nCameraOldX;                  
-	int                 m_nCameraOldY;                  
-	int                 m_nCameraX;                     
-	int                 m_nCameraY;                     
-	bool                m_CameraIsOrthographic;         
-	QAngle              m_angPreviousViewAngles;        
-	QAngle              m_angPreviousViewAnglesTilt;    
-	float               m_flLastForwardMove;            
-	int                 m_nClearInputState;             
-	CUserCmd* m_pCommands;                    
-	CVerifiedUserCmd* m_pVerifiedCommands;            
-};
-
-CUserCmd* CInput::GetUserCmd(int sequence_number)
-{
-	return &m_pCommands[sequence_number % MULTIPLAYER_BACKUP];
-}
-
-CVerifiedUserCmd* CInput::GetVerifiedCmd(int sequence_number)
-{
-	return &m_pVerifiedCommands[sequence_number % MULTIPLAYER_BACKUP];
-}
-
-
-#define IN_ATTACK  (1 << 0)
-#define IN_JUMP   (1 << 1)
-#define IN_DUCK   (1 << 2)
-#define IN_FORWARD  (1 << 3)
-#define IN_BACK   (1 << 4)
-#define IN_USE   (1 << 5)
-#define IN_CANCEL  (1 << 6)
-#define IN_LEFT   (1 << 7)
-#define IN_RIGHT  (1 << 8)
-#define IN_MOVELEFT  (1 << 9)
-#define IN_MOVERIGHT (1 << 10)
-#define IN_ATTACK2  (1 << 11)
-#define IN_RUN   (1 << 12)
-#define IN_RELOAD  (1 << 13)
-#define IN_ALT1   (1 << 14)
-#define IN_ALT2   (1 << 15)
-#define IN_SCORE  (1 << 16)            
-#define IN_SPEED  (1 << 17)       
-#define IN_WALK   (1 << 18)     
-#define IN_ZOOM   (1 << 19)      
-#define IN_WEAPON1  (1 << 20)     
-#define IN_WEAPON2  (1 << 21)     
-#define IN_BULLRUSH  (1 << 22)
-#define IN_GRENADE1  (1 << 23)   
-#define IN_GRENADE2  (1 << 24)   
-#define IN_LOOKSPIN  (1 << 25)
\ No newline at end of file
diff --git a/SpyCustom/c_pixel_visibility.h b/SpyCustom/c_pixel_visibility.h
deleted file mode 100644
index be835ac..0000000
--- a/SpyCustom/c_pixel_visibility.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef C_PIXEL_VISIBILITY_H
-#define C_PIXEL_VISIBILITY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-const float PIXELVIS_DEFAULT_PROXY_SIZE = 2.0f;
-const float PIXELVIS_DEFAULT_FADE_TIME = 0.0625f;
-
-typedef int pixelvis_handle_t;
-struct pixelvis_queryparams_t
-{
-	pixelvis_queryparams_t()
-	{
-		bSetup = false;
-	}
-
-	void Init(const Vector& origin, float proxySizeIn = PIXELVIS_DEFAULT_PROXY_SIZE, float proxyAspectIn = 1.0f, float fadeTimeIn = PIXELVIS_DEFAULT_FADE_TIME)
-	{
-		position = origin;
-		proxySize = proxySizeIn;
-		proxyAspect = proxyAspectIn;
-		fadeTime = fadeTimeIn;
-		bSetup = true;
-		bSizeInScreenspace = false;
-	}
-
-	Vector		position;
-	float		proxySize;
-	float		proxyAspect;
-	float		fadeTime;
-	bool		bSetup;
-	bool		bSizeInScreenspace;
-};
-
-float PixelVisibility_FractionVisible(const pixelvis_queryparams_t& params, pixelvis_handle_t* queryHandle);
-float StandardGlowBlend(const pixelvis_queryparams_t& params, pixelvis_handle_t* queryHandle, int rendermode, int renderfx, int alpha, float* pscale);
-
-void PixelVisibility_ShiftVisibilityViews(int iSourceViewID, int iDestViewID);               
-
-void PixelVisibility_EndCurrentView();
-void PixelVisibility_EndScene();
-float GlowSightDistance(const Vector& glowOrigin, bool bShouldTrace);
-
-bool PixelVisibility_IsAvailable();
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/c_playerlocaldata.h b/SpyCustom/c_playerlocaldata.h
deleted file mode 100644
index 8108efa..0000000
--- a/SpyCustom/c_playerlocaldata.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef C_PLAYERLOCALDATA_H
-#define C_PLAYERLOCALDATA_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "basetypes.h"
-#include "vector.h"
-#include "playernet_vars.h"
-#include "interpolatedvar.h" 
-#include "predictable_entity.h" 
-
-class CPlayerLocalData
-{
-public:
-	DECLARE_PREDICTABLE();
-	DECLARE_CLASS_NOBASE(CPlayerLocalData);
-	DECLARE_EMBEDDED_NETWORKVAR();
-
-	CPlayerLocalData() :
-		m_iv_vecPunchAngle("CPlayerLocalData::m_iv_vecPunchAngle"),
-		m_iv_vecPunchAngleVel("CPlayerLocalData::m_iv_vecPunchAngleVel")
-	{
-		m_iv_vecPunchAngle.Setup(&m_vecPunchAngle.m_Value, LATCH_SIMULATION_VAR);
-		m_iv_vecPunchAngleVel.Setup(&m_vecPunchAngleVel.m_Value, LATCH_SIMULATION_VAR);
-		m_flFOVRate = 0;
-	}
-
-	unsigned char			m_chAreaBits[MAX_AREA_STATE_BYTES];				   
-	unsigned char			m_chAreaPortalBits[MAX_AREA_PORTAL_STATE_BYTES];    
-
-	int						m_iHideHUD;			        
-
-	float					m_flFOVRate;		      
-
-
-	bool					m_bDucked;
-	bool					m_bDucking;
-	bool					m_bInDuckJump;
-	float					m_flDucktime;
-	float					m_flDuckJumpTime;
-	float					m_flJumpTime;
-	int						m_nStepside;
-	float					m_flFallVelocity;
-	int						m_nOldButtons;
-	Vector					m_vecClientBaseVelocity;
-	CNetworkQAngle(m_vecPunchAngle);		    
-	CInterpolatedVar< QAngle >	m_iv_vecPunchAngle;
-
-	CNetworkQAngle(m_vecPunchAngleVel);		      
-	CInterpolatedVar< QAngle >	m_iv_vecPunchAngleVel;
-	bool					m_bDrawViewmodel;
-	bool					m_bWearingSuit;
-	bool					m_bPoisoned;
-	float					m_flStepSize;
-	bool					m_bAllowAutoMovement;
-
-	sky3dparams_t			m_skybox3d;
-	fogplayerparams_t		m_PlayerFog;
-	audioparams_t			m_audio;
-
-	bool					m_bSlowMovement;
-
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/c_recipientfilter.h b/SpyCustom/c_recipientfilter.h
deleted file mode 100644
index 44d30c6..0000000
--- a/SpyCustom/c_recipientfilter.h
+++ /dev/null
@@ -1,149 +0,0 @@
-#ifndef C_RECIPIENTFILTER_H
-#define C_RECIPIENTFILTER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "irecipientfilter.h"
-#include "utlvector.h"
-#include "c_baseentity.h"
-#include "soundflags.h"
-#include "bitvec.h"
-
-class C_BasePlayer;
-class C_Team;
-
-class C_RecipientFilter : public IRecipientFilter
-{
-public:
-	C_RecipientFilter();
-	virtual			~C_RecipientFilter();
-
-	virtual bool	IsReliable(void) const;
-
-	virtual int		GetRecipientCount(void) const;
-	virtual int		GetRecipientIndex(int slot) const;
-
-	virtual bool	IsInitMessage(void) const { return false; };
-
-public:
-
-	void			CopyFrom(const C_RecipientFilter& src);
-
-	void			Reset(void);
-
-	void			MakeReliable(void);
-
-	void			AddAllPlayers(void);
-	void			AddRecipientsByPVS(const Vector& origin);
-	void			AddRecipientsByPAS(const Vector& origin);
-	void			AddRecipient(C_BasePlayer* player);
-	void			RemoveRecipient(C_BasePlayer* player);
-	void			AddRecipientsByTeam(C_Team* team);
-	void			RemoveRecipientsByTeam(C_Team* team);
-
-	void			UsePredictionRules(void);
-	bool			IsUsingPredictionRules(void) const;
-
-	bool			IgnorePredictionCull(void) const;
-	void			SetIgnorePredictionCull(bool ignore);
-
-	void			AddPlayersFromBitMask(CPlayerBitVec& playerbits);
-
-	void			RemoveSplitScreenPlayers();
-
-private:
-
-	bool				m_bReliable;
-	bool				m_bInitMessage;
-	CUtlVector< int >	m_Recipients;
-	bool				m_bUsingPredictionRules;
-	bool				m_bIgnorePredictionCull;
-};
-
-class CSingleUserRecipientFilter : public C_RecipientFilter
-{
-public:
-	CSingleUserRecipientFilter(C_BasePlayer* player)
-	{
-		AddRecipient(player);
-	}
-};
-
-class CBroadcastRecipientFilter : public C_RecipientFilter
-{
-public:
-	CBroadcastRecipientFilter(void)
-	{
-		AddAllPlayers();
-	}
-};
-
-class CReliableBroadcastRecipientFilter : public CBroadcastRecipientFilter
-{
-public:
-	CReliableBroadcastRecipientFilter(void)
-	{
-		MakeReliable();
-	}
-};
-
-class CPASFilter : public C_RecipientFilter
-{
-public:
-	CPASFilter(const Vector& origin)
-	{
-		AddRecipientsByPAS(origin);
-	}
-};
-
-class CPASAttenuationFilter : public CPASFilter
-{
-public:
-	CPASAttenuationFilter(C_BaseEntity* entity, float attenuation = ATTN_NORM) :
-		CPASFilter(entity->GetAbsOrigin())
-	{
-	}
-
-	CPASAttenuationFilter(const Vector& origin, float attenuation = ATTN_NORM) :
-		CPASFilter(origin)
-	{
-	}
-
-	CPASAttenuationFilter(C_BaseEntity* entity, const char* lookupSound) :
-		CPASFilter(entity->GetAbsOrigin())
-	{
-	}
-
-	CPASAttenuationFilter(const Vector& origin, const char* lookupSound) :
-		CPASFilter(origin)
-	{
-	}
-
-	CPASAttenuationFilter(C_BaseEntity* entity, const char* lookupSound, HSOUNDSCRIPTHANDLE& handle) :
-		CPASFilter(entity->GetAbsOrigin())
-	{
-	}
-
-	CPASAttenuationFilter(const Vector& origin, const char* lookupSound, HSOUNDSCRIPTHANDLE& handle) :
-		CPASFilter(origin)
-	{
-	}
-};
-
-class CPVSFilter : public C_RecipientFilter
-{
-public:
-	CPVSFilter(const Vector& origin)
-	{
-		AddRecipientsByPVS(origin);
-	}
-};
-
-class CLocalPlayerFilter : public C_RecipientFilter
-{
-public:
-	CLocalPlayerFilter(void);
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/c_te_legacytempents.h b/SpyCustom/c_te_legacytempents.h
deleted file mode 100644
index aa755a2..0000000
--- a/SpyCustom/c_te_legacytempents.h
+++ /dev/null
@@ -1,178 +0,0 @@
-#if !defined( C_TE_LEGACYTEMPENTS_H )
-#define C_TE_LEGACYTEMPENTS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class C_BaseEntity;
-class C_LocalTempEntity;
-struct model_t;
-
-#include "mempool.h"
-#include "UtlLinkedList.h"
-
-#include "particlemgr.h"
-typedef CParticleSubTexture* PMaterialHandle;
-#include "cliententitylist.h"
-
-#if defined( SDK_DLL )
-enum
-{
-	CS_SHELL_9MM = 0,
-	CS_SHELL_57,
-	CS_SHELL_12GAUGE,
-	CS_SHELL_556,
-	CS_SHELL_762NATO,
-	CS_SHELL_338MAG,
-};
-#endif
-
-abstract_class ITempEnts
-{
-public:
-	virtual						~ITempEnts() {}
-
-	virtual void				Init(void) = 0;
-	virtual void				Shutdown(void) = 0;
-	virtual void				LevelInit() = 0;
-	virtual void				LevelShutdown() = 0;
-
-	virtual void				Update(void) = 0;
-	virtual void				Clear(void) = 0;
-
-	virtual void				BloodSprite(const Vector& org, int r, int g, int b, int a, int modelIndex, int modelIndex2, float size) = 0;
-	virtual void				RicochetSprite(const Vector& pos, model_t* pmodel, float duration, float scale) = 0;
-	virtual void				MuzzleFlash(int type, ClientEntityHandle_t hEntity, int attachmentIndex, bool firstPerson) = 0;
-	virtual void				MuzzleFlash(const Vector& pos1, const QAngle& angles, int type, ClientEntityHandle_t hEntity, bool firstPerson) = 0;
-	virtual C_LocalTempEntity* SpawnTempModel(model_t* pModel, const Vector& vecOrigin, const QAngle& vecAngles, const Vector& vecVelocity, float flLifeTime, int iFlags) = 0;
-	virtual void				BreakModel(const Vector& pos, const QAngle& angles, const Vector& size, const Vector& dir, float random, float life, int count, int modelIndex, char flags) = 0;
-	virtual void				Bubbles(const Vector& mins, const Vector& maxs, float height, int modelIndex, int count, float speed) = 0;
-	virtual void				BubbleTrail(const Vector& start, const Vector& end, float flWaterZ, int modelIndex, int count, float speed) = 0;
-	virtual void				Sprite_Explode(C_LocalTempEntity* pTemp, float scale, int flags) = 0;
-	virtual void				FizzEffect(C_BaseEntity* pent, int modelIndex, int density, int current) = 0;
-	virtual C_LocalTempEntity* DefaultSprite(const Vector& pos, int spriteIndex, float framerate) = 0;
-	virtual void				Sprite_Smoke(C_LocalTempEntity* pTemp, float scale) = 0;
-	virtual C_LocalTempEntity* TempSprite(const Vector& pos, const Vector& dir, float scale, int modelIndex, int rendermode, int renderfx, float a, float life, int flags, const Vector& normal = vec3_origin) = 0;
-	virtual void				AttachTentToPlayer(int client, int modelIndex, float zoffset, float life) = 0;
-	virtual void				KillAttachedTents(int client) = 0;
-	virtual void				Sprite_Spray(const Vector& pos, const Vector& dir, int modelIndex, int count, int speed, int iRand) = 0;
-	virtual void				Sprite_Trail(const Vector& vecStart, const Vector& vecEnd, int modelIndex, int nCount, float flLife, float flSize, float flAmplitude, int nRenderamt, float flSpeed) = 0;
-	virtual void				RocketFlare(const Vector& pos) = 0;
-	virtual void				PlaySound(C_LocalTempEntity* pTemp, float damp) = 0;
-	virtual void				PhysicsProp(int modelindex, int skin, const Vector& pos, const QAngle& angles, const Vector& vel, int flags, int effects = 0) = 0;
-	virtual C_LocalTempEntity* ClientProjectile(const Vector& vecOrigin, const Vector& vecVelocity, const Vector& vecAccel, int modelindex, int lifetime, CBaseEntity* pOwner, const char* pszImpactEffect = NULL, const char* pszParticleEffect = NULL) = 0;
-};
-
-
-class CTempEnts : public ITempEnts
-{
-public:
-	CTempEnts(void);
-	virtual					~CTempEnts(void);
-public:
-	virtual void			Init(void);
-	virtual void			Shutdown(void);
-
-	virtual void			LevelInit();
-
-	virtual void			LevelShutdown();
-
-	virtual void			Update(void);
-	virtual void			Clear(void);
-
-	virtual void			BloodSprite(const Vector& org, int r, int g, int b, int a, int modelIndex, int modelIndex2, float size);
-	virtual void			RicochetSprite(const Vector& pos, model_t* pmodel, float duration, float scale);
-
-	virtual void			MuzzleFlash(int type, ClientEntityHandle_t hEntity, int attachmentIndex, bool firstPerson);
-	virtual void			MuzzleFlash(const Vector& pos1, const QAngle& angles, int type, ClientEntityHandle_t hEntity, bool firstPerson = false);
-
-	virtual void			BreakModel(const Vector& pos, const QAngle& angles, const Vector& size, const Vector& dir, float random, float life, int count, int modelIndex, char flags);
-	virtual void			Bubbles(const Vector& mins, const Vector& maxs, float height, int modelIndex, int count, float speed);
-	virtual void			BubbleTrail(const Vector& start, const Vector& end, float height, int modelIndex, int count, float speed);
-	virtual void			Sprite_Explode(C_LocalTempEntity* pTemp, float scale, int flags);
-	virtual void			FizzEffect(C_BaseEntity* pent, int modelIndex, int density, int current);
-	virtual C_LocalTempEntity* DefaultSprite(const Vector& pos, int spriteIndex, float framerate);
-	virtual void			Sprite_Smoke(C_LocalTempEntity* pTemp, float scale);
-	virtual C_LocalTempEntity* TempSprite(const Vector& pos, const Vector& dir, float scale, int modelIndex, int rendermode, int renderfx, float a, float life, int flags, const Vector& normal = vec3_origin);
-	virtual void			AttachTentToPlayer(int client, int modelIndex, float zoffset, float life);
-	virtual void			KillAttachedTents(int client);
-	virtual void			Sprite_Spray(const Vector& pos, const Vector& dir, int modelIndex, int count, int speed, int iRand);
-	void					Sprite_Trail(const Vector& vecStart, const Vector& vecEnd, int modelIndex, int nCount, float flLife, float flSize, float flAmplitude, int nRenderamt, float flSpeed);
-
-	virtual void			PlaySound(C_LocalTempEntity* pTemp, float damp);
-	virtual C_LocalTempEntity* SpawnTempModel(model_t* pModel, const Vector& vecOrigin, const QAngle& vecAngles, const Vector& vecVelocity, float flLifeTime, int iFlags);
-	void					RocketFlare(const Vector& pos);
-	void					PhysicsProp(int modelindex, int skin, const Vector& pos, const QAngle& angles, const Vector& vel, int flags, int effects = 0);
-	C_LocalTempEntity* ClientProjectile(const Vector& vecOrigin, const Vector& vecVelocity, const Vector& vecAcceleration, int modelindex, int lifetime, CBaseEntity* pOwner, const char* pszImpactEffect = NULL, const char* pszParticleEffect = NULL);
-
-private:
-	enum
-	{
-		MAX_TEMP_ENTITIES = 500,
-		MAX_TEMP_ENTITY_SPRITES = 200,
-		MAX_TEMP_ENTITY_STUDIOMODEL = 50,
-	};
-
-	CClassMemoryPool< C_LocalTempEntity >	m_TempEntsPool;
-	CUtlLinkedList< C_LocalTempEntity*, unsigned short >	m_TempEnts;
-
-	struct model_t* m_pSpriteMuzzleFlash[10];
-	struct model_t* m_pSpriteAR2Flash[4];
-	struct model_t* m_pShells[3];
-	struct model_t* m_pSpriteCombineFlash[2];
-
-#if defined ( SDK_DLL )
-	struct model_t* m_pCS_9MMShell;
-	struct model_t* m_pCS_57Shell;
-	struct model_t* m_pCS_12GaugeShell;
-	struct model_t* m_pCS_556Shell;
-	struct model_t* m_pCS_762NATOShell;
-	struct model_t* m_pCS_338MAGShell;
-#endif
-
-protected:
-	C_LocalTempEntity* TempEntAlloc(const Vector& org, model_t* model);
-	C_LocalTempEntity* TempEntAllocHigh(const Vector& org, model_t* model);
-
-private:
-
-	inline void				CacheMuzzleFlashes(void);
-	PMaterialHandle			m_Material_MuzzleFlash_Player[4];
-	PMaterialHandle			m_Material_MuzzleFlash_NPC[4];
-	PMaterialHandle			m_Material_Combine_MuzzleFlash_Player[2];
-	PMaterialHandle			m_Material_Combine_MuzzleFlash_NPC[2];
-
-private:
-	CTempEnts(const CTempEnts&);
-
-	void					TempEntFree(int index);
-	C_LocalTempEntity* TempEntAlloc();
-	bool					FreeLowPriorityTempEnt();
-
-	int						AddVisibleTempEntity(C_LocalTempEntity* pEntity);
-
-	void					MuzzleFlash_AR2_Player(const Vector& origin, const QAngle& angles, ClientEntityHandle_t hEntity);
-	void					MuzzleFlash_AR2_NPC(const Vector& origin, const QAngle& angles, ClientEntityHandle_t hEntity);
-
-	void					MuzzleFlash_SMG1_Player(ClientEntityHandle_t hEntity, int attachmentIndex);
-	void					MuzzleFlash_SMG1_NPC(ClientEntityHandle_t hEntity, int attachmentIndex);
-
-	void					MuzzleFlash_Shotgun_Player(ClientEntityHandle_t hEntity, int attachmentIndex);
-	void					MuzzleFlash_Shotgun_NPC(ClientEntityHandle_t hEntity, int attachmentIndex);
-
-	void					MuzzleFlash_Pistol_Player(ClientEntityHandle_t hEntity, int attachmentIndex);
-	void					MuzzleFlash_Pistol_NPC(ClientEntityHandle_t hEntity, int attachmentIndex);
-
-	void					MuzzleFlash_Combine_Player(ClientEntityHandle_t hEntity, int attachmentIndex);
-	void					MuzzleFlash_Combine_NPC(ClientEntityHandle_t hEntity, int attachmentIndex);
-
-	void					MuzzleFlash_357_Player(ClientEntityHandle_t hEntity, int attachmentIndex);
-
-	void					MuzzleFlash_RPG_NPC(ClientEntityHandle_t hEntity, int attachmentIndex);
-};
-
-
-extern ITempEnts* tempents;
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/cdll_client_int.h b/SpyCustom/cdll_client_int.h
deleted file mode 100644
index c697a01..0000000
--- a/SpyCustom/cdll_client_int.h
+++ /dev/null
@@ -1,271 +0,0 @@
-#ifndef CDLL_CLIENT_INT_H
-#define CDLL_CLIENT_INT_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "iclientnetworkable.h"
-#include "utllinkedlist.h"
-#include "cdll_int.h"
-#include "shareddefs.h"
-#include "eiface.h"
-#include "tier3.h"
-#include "tier2_logging.h"
-
-#include "shareddefs.h" 
-
-
-class IVModelRender;
-class IVEngineClient;
-class IVModelRender;
-class IVEfx;
-class IVRenderView;
-class IVDebugOverlay;
-class IMaterialSystem;
-class IMaterialSystemStub;
-class IDataCache;
-class IMDLCache;
-class IVModelInfoClient;
-class IEngineVGui;
-class ISpatialPartition;
-class IBaseClientDLL;
-class ISpatialPartition;
-class IFileSystem;
-class IStaticPropMgrClient;
-class IShadowMgr;
-class IEngineSound;
-class IMatSystemSurface;
-class IMaterialSystemHardwareConfig;
-class ISharedGameRules;
-class IEngineTrace;
-class IGameUIFuncs;
-class IGameEventManager2;
-class IPhysicsGameTrace;
-class CGlobalVarsBase;
-class IClientTools;
-class C_BaseAnimating;
-class IColorCorrectionSystem;
-class IInputSystem;
-class ISceneFileCache;
-class IXboxSystem;	   
-class IAvi;
-class IBik;
-class CSteamAPIContext;
-class IReplayHistoryManager;
-class ISoundEmitterSystemBase;
-enum CPULevel_t;
-enum GPULevel_t;
-
-extern IVModelRender* modelrender;
-extern IVEngineClient* engine;
-extern IVModelRender* modelrender;
-extern IVEfx* effects;
-extern IVRenderView* render;
-extern IVDebugOverlay* debugoverlay;
-extern IMaterialSystemStub* materials_stub;
-extern IVModelInfoClient* modelinfo;
-extern IEngineVGui* enginevgui;
-extern ISpatialPartition* partition;
-extern IBaseClientDLL* clientdll;
-extern IFileSystem* filesystem;
-extern IStaticPropMgrClient* staticpropmgr;
-extern IShadowMgr* shadowmgr;
-extern IEngineSound* enginesound;
-extern IEngineTrace* enginetrace;
-extern IFileLoggingListener* filelogginglistener;
-extern IGameUIFuncs* gameuifuncs;
-extern IGameEventManager2* gameeventmanager;
-extern IPhysicsGameTrace* physgametrace;
-extern CGlobalVarsBase* gpGlobals;
-extern IClientTools* clienttools;
-extern IInputSystem* inputsystem;
-extern ISceneFileCache* scenefilecache;
-extern IXboxSystem* xboxsystem;	   
-extern IAvi* avi;
-extern IBik* bik;
-extern IUploadGameStats* gamestatsuploader;
-extern CSteamAPIContext* steamapicontext;
-extern ISoundEmitterSystemBase* soundemitterbase;
-
-#ifdef INFESTED_DLL
-class IASW_Mission_Chooser;
-extern IASW_Mission_Chooser* missionchooser;
-#endif
-#if defined( REPLAY_ENABLED )
-extern IReplayHistoryManager* g_pReplayHistoryManager;
-#endif
-
-CPULevel_t GetCPULevel();
-CPULevel_t GetActualCPULevel();
-GPULevel_t GetGPULevel();
-void ConfigureCurrentSystemLevel();
-
-extern bool	g_bLevelInitialized;
-extern bool g_bTextMode;
-extern bool g_bEngineIsHLTV;
-
-bool AddDataChangeEvent(IClientNetworkable* ent, DataUpdateType_t updateType, int* pStoredEvent);
-
-void ClearDataChangedEvent(int iStoredEvent);
-
-void PrecacheMaterial(const char* pMaterialName);
-
-int GetMaterialIndex(const char* pMaterialName);
-
-const char* GetMaterialNameFromIndex(int nIndex);
-
-int PrecacheParticleSystem(const char* pParticleSystemName);
-int GetParticleSystemIndex(const char* pParticleSystemName);
-const char* GetParticleSystemNameFromIndex(int nIndex);
-
-
-void PrecacheEffect(const char* pEffectName);
-
-
-void TrackBoneSetupEnt(C_BaseAnimating* pEnt);
-
-bool IsEngineThreaded();
-
-class CVGuiScreenSizeSplitScreenPlayerGuard
-{
-public:
-	CVGuiScreenSizeSplitScreenPlayerGuard(bool bActive, int slot, int nOldSlot);
-	CVGuiScreenSizeSplitScreenPlayerGuard(bool bActive, C_BaseEntity* pEntity, int nOldSlot);
-	~CVGuiScreenSizeSplitScreenPlayerGuard();
-private:
-
-	bool m_bNoRestore;
-	bool m_bOldSetting;
-	int m_nOldSize[2];
-};
-
-class CSetActiveSplitScreenPlayerGuard : public CVGuiScreenSizeSplitScreenPlayerGuard
-{
-public:
-	CSetActiveSplitScreenPlayerGuard(char const* pchContext, int nLine, int slot, int nOldSlot, bool bSetVguiScreenSize);
-	CSetActiveSplitScreenPlayerGuard(char const* pchContext, int nLine, C_BaseEntity* pEntity, int nOldSlot, bool bSetVguiScreenSize);
-	~CSetActiveSplitScreenPlayerGuard();
-private:
-	bool	m_bChanged;
-	char const* m_pchContext;
-	int m_nLine;
-	int	 m_nSaveSlot;
-	bool m_bSaveGetLocalPlayerAllowed;
-};
-
-class CHackForGetLocalPlayerAccessAllowedGuard
-{
-public:
-	CHackForGetLocalPlayerAccessAllowedGuard(char const* pszContext, bool bOldSlot);
-	~CHackForGetLocalPlayerAccessAllowedGuard();
-private:
-	bool m_bChanged;
-	char const* m_pszContext;
-	bool m_bSaveGetLocalPlayerAllowed;
-};
-
-class CVGuiAbsPosSplitScreenPlayerGuard
-{
-public:
-	CVGuiAbsPosSplitScreenPlayerGuard(int slot, int nOldSlot, bool bInvert = false);
-	~CVGuiAbsPosSplitScreenPlayerGuard();
-private:
-	bool m_bNoRestore;
-};
-
-int FirstValidSplitScreenSlot();
-int NextValidSplitScreenSlot(int i);
-bool IsValidSplitScreenSlot(int i);
-void IterateRemoteSplitScreenViewSlots_Push(bool bSet);               
-void IterateRemoteSplitScreenViewSlots_Pop(void);
-class C_BasePlayer;
-void AddRemoteSplitScreenViewPlayer(C_BasePlayer* pPlayer);              
-void RemoveRemoteSplitScreenViewPlayer(C_BasePlayer* pPlayer);        
-C_BasePlayer* GetSplitScreenViewPlayer(int nSlot);         
-bool IsLocalSplitScreenPlayer(int nSlot);               
-
-#if defined( SPLIT_SCREEN_STUBS )
-
-#define VGUI_SCREENSIZE_SPLITSCREEN_GUARD( slot ) 
-#define ACTIVE_SPLITSCREEN_PLAYER_GUARD( slot )
-#define ACTIVE_SPLITSCREEN_PLAYER_GUARD_ENT( entity )
-
-#define ACTIVE_SPLITSCREEN_PLAYER_GUARD_VGUI( slot )
-#define ACTIVE_SPLITSCREEN_PLAYER_GUARD_ENT_VGUI( entity )
-
-#define HACK_GETLOCALPLAYER_GUARD( desc )
-#define VGUI_ABSPOS_SPLITSCREEN_GUARD( slot )
-#define VGUI_ABSPOS_SPLITSCREEN_GUARD_INVERT( slot )
-
-#define FOR_EACH_VALID_SPLITSCREEN_PLAYER( iteratorName ) for ( int iteratorName = 0; iteratorName == 0; ++iteratorName )
-
-#define ASSERT_LOCAL_PLAYER_RESOLVABLE()
-#define ASSERT_LOCAL_PLAYER_NOT_RESOLVABLE() 
-#define GET_ACTIVE_SPLITSCREEN_SLOT() ( 0 )
-
-FORCEINLINE uint32 ComputeSplitscreenRenderingFlags(IClientRenderable* pRenderable)
-{
-	return 0xFFFFFFFF;
-}
-
-#else
-
-#define VGUI_SCREENSIZE_SPLITSCREEN_GUARD( slot ) CVGuiScreenSizeSplitScreenPlayerGuard s_VGuiSSGuard( slot, engine->GetActiveSplitScreenPlayerSlot() );
-#define ACTIVE_SPLITSCREEN_PLAYER_GUARD( slot )	CSetActiveSplitScreenPlayerGuard g_SSGuard( __FILE__, __LINE__, slot, engine->GetActiveSplitScreenPlayerSlot(), false );
-#define ACTIVE_SPLITSCREEN_PLAYER_GUARD_ENT( entity )	CSetActiveSplitScreenPlayerGuard g_SSEGuard( __FILE__, __LINE__, entity, engine->GetActiveSplitScreenPlayerSlot(), false );
-
-#define ACTIVE_SPLITSCREEN_PLAYER_GUARD_VGUI( slot )	CSetActiveSplitScreenPlayerGuard g_SSGuardNoVgui( __FILE__, __LINE__, slot, engine->GetActiveSplitScreenPlayerSlot(), true );
-#define ACTIVE_SPLITSCREEN_PLAYER_GUARD_ENT_VGUI( entity )	CSetActiveSplitScreenPlayerGuard g_SSEGuardNoVgui( __FILE__, __LINE__, entity, engine->GetActiveSplitScreenPlayerSlot(), true );
-
-
-#define HACK_GETLOCALPLAYER_GUARD( desc )	CHackForGetLocalPlayerAccessAllowedGuard g_HackGLPGuard( desc, engine->IsLocalPlayerResolvable() );
-#define VGUI_ABSPOS_SPLITSCREEN_GUARD( slot ) CVGuiAbsPosSplitScreenPlayerGuard s_VGuiAbsPosGuard( slot, engine->GetActiveSplitScreenPlayerSlot() );
-#define VGUI_ABSPOS_SPLITSCREEN_GUARD_INVERT( slot ) CVGuiAbsPosSplitScreenPlayerGuard s_VGuiAbsPosGuard( slot, engine->GetActiveSplitScreenPlayerSlot(), true );
-
-#define FOR_EACH_VALID_SPLITSCREEN_PLAYER( iteratorName )						\
-	for ( int iteratorName = FirstValidSplitScreenSlot();				\
-				iteratorName != -1;												\
-				iteratorName = NextValidSplitScreenSlot( iteratorName ) )	
-
-#if defined( SS_SHIPPING_ASSERTS )
-#define ASSERT_LOCAL_PLAYER_RESOLVABLE() _AssertMsg( engine->IsLocalPlayerResolvable(), _T("Assertion Failed: ") _T("engine->IsLocalPlayerResolvable()"), ((void)0), false )
-#else
-#define ASSERT_LOCAL_PLAYER_RESOLVABLE() Assert( engine->IsLocalPlayerResolvable() );
-#endif
-
-#if defined( SS_SHIPPING_ASSERTS )
-#define ASSERT_LOCAL_PLAYER_NOT_RESOLVABLE() _AssertMsg( !engine->IsLocalPlayerResolvable(), _T("Assertion Failed: ") _T("!engine->IsLocalPlayerResolvable()"), ((void)0), false )
-#else
-#define ASSERT_LOCAL_PLAYER_NOT_RESOLVABLE() Assert( !engine->IsLocalPlayerResolvable() );
-#endif
-
-#define GET_ACTIVE_SPLITSCREEN_SLOT() engine->GetActiveSplitScreenPlayerSlot()
-
-FORCEINLINE uint32 ComputeSplitscreenRenderingFlags(IClientRenderable* pRenderable)
-{
-	if (IsSplitScreenSupported())
-	{
-		int nFlags = 0;
-		for (int i = 0; i < MAX_SPLITSCREEN_PLAYERS; ++i)
-		{
-			if (pRenderable->ShouldDrawForSplitScreenUser(i))
-			{
-				nFlags |= 1 << i;
-			}
-		}
-		return nFlags;
-	}
-
-	return 0xFFFFFFFF;
-}
-
-#endif
-
-inline C_BasePlayer* GetSplitScreenViewPlayer(void) { return GetSplitScreenViewPlayer(GET_ACTIVE_SPLITSCREEN_SLOT()); };
-inline bool IsLocalSplitScreenPlayer(void) { return IsLocalSplitScreenPlayer(GET_ACTIVE_SPLITSCREEN_SLOT()); };
-
-int XBX_GetActiveUserId();
-
-#define XBX_GetPrimaryUserId() _Use_XBX_GetActiveUserId_Instead
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/cdll_int.h b/SpyCustom/cdll_int.h
deleted file mode 100644
index 8d4b4eb..0000000
--- a/SpyCustom/cdll_int.h
+++ /dev/null
@@ -1,632 +0,0 @@
-#ifndef CDLL_INT_H
-#define CDLL_INT_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "basetypes.h"
-#include "interface.h"
-#include "mathlib.h"
-#include "const.h"
-#include "checksum_crc.h"
-#include "datamap.h"
-#include "bitbuf.h"
-#include "ButtonCode.h"
-#include "modes.h"
-
-#if !defined( _X360 )
-#include "xboxstubs.h"
-#endif
-
-#include "jobthread.h" 
-#include "VGUI.h"
-
-struct SpatializationInfo_t;
-class IClientEntity;
-
-class ClientClass;
-struct model_t;
-class CSentence;
-struct vrect_t;
-struct cmodel_t;
-class IMaterial;
-class CAudioSource;
-class CMeasureSection;
-class SurfInfo;
-class ISpatialQuery;
-struct cache_user_t;
-class IMaterialSystem;
-class VMatrix;
-struct ScreenFade_t;
-struct ScreenShake_t;
-class CViewSetup;
-class CEngineSprite;
-class CGlobalVarsBase;
-class CPhysCollide;
-class CSaveRestoreData;
-class INetChannelInfo;
-struct datamap_t;
-struct typedescription_t;
-class CStandardRecvProxies;
-struct client_textmessage_t;
-class IAchievementMgr;
-class CGamestatsData;
-class KeyValues;
-class IFileList;
-class CRenamedRecvTableInfo;
-class CMouthInfo;
-class IConVar;
-
-struct player_info_t
-{
-public:
-	char __pad0[0x8];
-	union {
-		long long xuid;
-		struct {
-			int xuidlow;
-			int xuidhigh;
-		};
-	};
-	char name[128];
-	int userid;
-	char guid[33];
-	unsigned int friendsid;
-	char friendsname[128];
-	bool fakeplayer;
-	bool ishltv;
-	unsigned int customfiles[4];
-	unsigned char filesdownloaded;
-};
-
-struct AudioState_t
-{
-	Vector m_Origin;
-	QAngle m_Angles;
-	bool m_bIsUnderwater;
-};
-
-
-enum SkyboxVisibility_t
-{
-	SKYBOX_NOT_VISIBLE = 0,
-	SKYBOX_3DSKYBOX_VISIBLE,
-	SKYBOX_2DSKYBOX_VISIBLE,
-};
-
-struct SkyBoxMaterials_t
-{
-	IMaterial* material[6];
-};
-
-enum ClientFrameStage_t
-{
-	FRAME_UNDEFINED = -1,			     
-	FRAME_START,
-
-	FRAME_NET_UPDATE_START,
-	FRAME_NET_UPDATE_POSTDATAUPDATE_START,
-	FRAME_NET_UPDATE_POSTDATAUPDATE_END,
-	FRAME_NET_UPDATE_END,
-
-	FRAME_RENDER_START,
-	FRAME_RENDER_END
-};
-
-enum RenderViewInfo_t
-{
-	RENDERVIEW_UNSPECIFIED = 0,
-	RENDERVIEW_DRAWVIEWMODEL = (1 << 0),
-	RENDERVIEW_DRAWHUD = (1 << 1),
-	RENDERVIEW_SUPPRESSMONITORRENDERING = (1 << 2),
-};
-
-DECLARE_POINTER_HANDLE(LightCacheHandle_t);
-
-
-struct OcclusionParams_t
-{
-	float	m_flMaxOccludeeArea;
-	float	m_flMinOccluderArea;
-};
-
-
-#define VENGINE_CLIENT_RANDOM_INTERFACE_VERSION	"VEngineRandom001"
-
-#define VENGINE_CLIENT_INTERFACE_VERSION		"VEngineClient014"
-#define VENGINE_CLIENT_INTERFACE_VERSION_13		"VEngineClient013"
-
-abstract_class IVEngineClient013
-{
-public:
-	virtual int					GetIntersectingSurfaces(
-									const model_t * model,
-									const Vector & vCenter,
-									const float radius,
-									const bool bOnlyVisibleSurfaces,	      
-									SurfInfo * pInfos,
-									const int nMaxInfos) = 0;
-
-	virtual Vector				GetLightForPoint(const Vector& pos, bool bClamp) = 0;
-
-	virtual IMaterial* TraceLineMaterialAndLighting(const Vector& start, const Vector& end,
-									Vector& diffuseLightColor, Vector& baseColor) = 0;
-
-	virtual const char* ParseFile(const char* data, char* token, int maxlen) = 0;
-	virtual bool				CopyLocalFile(const char* source, const char* destination) = 0;
-
-	virtual void				GetScreenSize(int& width, int& height) = 0;
-
-	virtual void				ServerCmd(const char* szCmdString, bool bReliable = true) = 0;
-	virtual void				ClientCmd(const char* szCmdString) = 0;
-
-	virtual bool				GetPlayerInfo(int ent_num, player_info_t* pinfo) = 0;
-
-	virtual int					GetPlayerForUserID(int userID) = 0;
-
-	virtual client_textmessage_t* TextMessageGet(const char* pName) = 0;
-
-	virtual bool				Con_IsVisible(void) = 0;
-
-	virtual int					GetLocalPlayer(void) = 0;
-
-	virtual const model_t* LoadModel(const char* pName, bool bProp = false) = 0;
-
-	virtual float				GetLastTimeStamp(void) = 0;
-
-	virtual CSentence* GetSentence(CAudioSource* pAudioSource) = 0;
-	virtual float				GetSentenceLength(CAudioSource* pAudioSource) = 0;
-	virtual bool				IsStreaming(CAudioSource* pAudioSource) const = 0;
-
-	virtual void				GetViewAngles(Vector& va) = 0;
-	virtual void				SetViewAngles(QAngle& va) = 0;
-
-	virtual int					GetMaxClients(void) = 0;
-
-	virtual	const char* Key_LookupBinding(const char* pBinding) = 0;
-
-	virtual const char* Key_BindingForKey(ButtonCode_t code) = 0;
-
-	virtual	void				Key_SetBinding(ButtonCode_t code, const char* pBinding) = 0; 
-
-	virtual void				StartKeyTrapMode(void) = 0;
-	virtual bool				CheckDoneKeyTrapping(ButtonCode_t& code) = 0;
-
-	virtual bool				IsInGame(void) = 0;
-	virtual bool				IsConnected(void) = 0;
-	virtual bool				IsDrawingLoadingImage(void) = 0;
-
-	virtual void				HideLoadingPlaque(void) = 0; 
-
-	virtual void				Con_NPrintf(int pos, PRINTF_FORMAT_STRING const char* fmt, ...) = 0;
-	virtual void				Con_NXPrintf(const struct con_nprint_s* info, PRINTF_FORMAT_STRING const char* fmt, ...) = 0;
-
-	virtual int					IsBoxVisible(const Vector& mins, const Vector& maxs) = 0;
-
-	virtual int					IsBoxInViewCluster(const Vector& mins, const Vector& maxs) = 0;
-
-	virtual bool				CullBox(const Vector& mins, const Vector& maxs) = 0;
-
-	virtual void				Sound_ExtraUpdate(void) = 0;
-
-#if defined(_PS3)
-	virtual void				Sound_ServerUpdateSoundsPS3(void) = 0; 
-#endif
-
-	virtual const char* GetGameDirectory(void) = 0;
-
-	virtual const VMatrix& WorldToScreenMatrix() = 0;
-
-	virtual const VMatrix& WorldToViewMatrix() = 0;
-
-	virtual int					GameLumpVersion(int lumpId) const = 0;
-	virtual int					GameLumpSize(int lumpId) const = 0;
-	virtual bool				LoadGameLump(int lumpId, void* pBuffer, int size) = 0;
-
-	virtual int					LevelLeafCount() const = 0;
-
-	virtual ISpatialQuery* GetBSPTreeQuery() = 0;
-
-	virtual void		LinearToGamma(float* linear, float* gamma) = 0;
-
-	virtual float		LightStyleValue(int style) = 0;
-
-	virtual void		ComputeDynamicLighting(const Vector& pt, const Vector* pNormal, Vector& color) = 0;
-
-	virtual void		GetAmbientLightColor(Vector& color) = 0;
-
-	virtual int			GetDXSupportLevel() = 0;
-
-	virtual bool        SupportsHDR() = 0;
-
-	virtual void		Mat_Stub(IMaterialSystem* pMatSys) = 0;
-
-	virtual void GetChapterName(char* pchBuff, int iMaxLength) = 0;
-	virtual char const* GetLevelName(void) = 0;
-	virtual char const* GetLevelNameShort(void) = 0; 
-	virtual char const* GetMapGroupName(void) = 0; 
-#if !defined( NO_VOICE )
-	virtual struct IVoiceTweak_s* GetVoiceTweakAPI(void) = 0;
-	virtual void SetVoiceCasterID(uint32 casterID) = 0; 
-#endif
-	virtual void		EngineStats_BeginFrame(void) = 0;
-	virtual void		EngineStats_EndFrame(void) = 0;
-
-	virtual void		FireEvents() = 0;
-
-	virtual int			GetLeavesArea(int* pLeaves, int nLeaves) = 0;
-
-	virtual bool		DoesBoxTouchAreaFrustum(const Vector& mins, const Vector& maxs, int iArea) = 0;
-	virtual int			GetFrustumList(Frustum_t** pList, int listMax) = 0; 
-	virtual bool		ShouldUseAreaFrustum(int area) = 0; 
-
-	virtual void		SetAudioState(const AudioState_t& state) = 0;
-
-	virtual int			SentenceGroupPick(int groupIndex, char* name, int nameBufLen) = 0;
-	virtual int			SentenceGroupPickSequential(int groupIndex, char* name, int nameBufLen, int sentenceIndex, int reset) = 0;
-	virtual int			SentenceIndexFromName(const char* pSentenceName) = 0;
-	virtual const char* SentenceNameFromIndex(int sentenceIndex) = 0;
-	virtual int			SentenceGroupIndexFromName(const char* pGroupName) = 0;
-	virtual const char* SentenceGroupNameFromIndex(int groupIndex) = 0;
-	virtual float		SentenceLength(int sentenceIndex) = 0;
-
-	virtual void		ComputeLighting(const Vector& pt, const Vector* pNormal, bool bClamp, Vector& color, Vector* pBoxColors = NULL) = 0;
-
-	virtual void		ActivateOccluder(int nOccluderIndex, bool bActive) = 0;
-	virtual bool		IsOccluded(const Vector& vecAbsMins, const Vector& vecAbsMaxs) = 0;
-	virtual int			GetOcclusionViewId() const = 0; 
-
-	virtual void* SaveAllocMemory(size_t num, size_t size) = 0;
-	virtual void		SaveFreeMemory(void* pSaveMem) = 0;
-
-	virtual INetChannelInfo* GetNetChannelInfo(void) = 0;
-
-	virtual void		DebugDrawPhysCollide(const CPhysCollide* pCollide, IMaterial* pMaterial, matrix3x4_t& transform, const color32& color) = 0;
-	virtual void		CheckPoint(const char* pName) = 0;
-	virtual void		DrawPortals() = 0;
-	virtual bool		IsPlayingDemo(void) = 0;
-	virtual bool		IsRecordingDemo(void) = 0;
-	virtual bool		IsPlayingTimeDemo(void) = 0;
-	virtual int			GetDemoRecordingTick(void) = 0;
-	virtual int			GetDemoPlaybackTick(void) = 0;
-	virtual int			GetDemoPlaybackStartTick(void) = 0;
-	virtual float		GetDemoPlaybackTimeScale(void) = 0;
-	virtual int			GetDemoPlaybackTotalTicks(void) = 0;
-	virtual bool		IsPaused(void) = 0;
-	virtual float GetTimescale(void) const = 0; 
-	virtual bool		IsTakingScreenshot(void) = 0;
-	virtual bool		IsHLTV(void) = 0;
-	virtual bool		IsLevelMainMenuBackground(void) = 0;
-	virtual void		GetMainMenuBackgroundName(char* dest, int destlen) = 0;
-
-	virtual void		SetOcclusionParameters(const OcclusionParams_t& params) = 0;
-
-	virtual void		GetUILanguage(char* dest, int destlen) = 0;
-
-	virtual SkyboxVisibility_t IsSkyboxVisibleFromPoint(const Vector& vecPoint) = 0;
-
-	virtual const char* GetMapEntitiesString() = 0;
-
-	virtual bool		IsInEditMode(void) = 0;
-
-	virtual float		GetScreenAspectRatio() = 0;
-
-	virtual bool		REMOVED_SteamRefreshLogin(const char* password, bool isSecure) = 0;
-	virtual bool		REMOVED_SteamProcessCall(bool& finished) = 0;
-
-	virtual unsigned int	GetEngineBuildNumber() = 0;   
-	virtual const char* GetProductVersionString() = 0;     
-
-	virtual void			GrabPreColorCorrectedFrame(int x, int y, int width, int height) = 0;
-
-	virtual bool			IsHammerRunning() const = 0;
-
-	virtual void			ExecuteClientCmd(const char* szCmdString) = 0;
-
-	virtual bool MapHasHDRLighting(void) = 0;
-	virtual bool MapHasLightMapAlphaData(void) = 0; 
-
-	virtual int	GetAppID() = 0;
-
-	virtual Vector			GetLightForPointFast(const Vector& pos, bool bClamp) = 0;
-
-	virtual void			ClientCmd_Unrestricted(const char* szCmdString, bool fromConsoleOrKeybind = false) = 0;
-	virtual void			ClientCmd_Unrestricted(const char* szCmdString, bool fromConsoleOrKeybind, int nUserSlot, bool bCheckValidSlot = true) = 0; 
-	 
-	virtual void			SetRestrictServerCommands(bool bRestrict) = 0;
-
-	virtual void			SetRestrictClientCommands(bool bRestrict) = 0;
-
-	virtual void			SetOverlayBindProxy(int iOverlayID, void* pBindProxy) = 0;
-
-	virtual bool			CopyFrameBufferToMaterial(const char* pMaterialName) = 0;
-
-	virtual void			ChangeTeam(const char* pTeamName) = 0;
-
-	virtual void			ReadConfiguration(const bool readDefault = false) = 0;
-
-	virtual void SetAchievementMgr(IAchievementMgr* pAchievementMgr) = 0;
-	virtual IAchievementMgr* GetAchievementMgr() = 0;
-
-	virtual bool			MapLoadFailed(void) = 0;
-	virtual void			SetMapLoadFailed(bool bState) = 0;
-
-	virtual bool			IsLowViolence() = 0;
-	virtual const char* GetMostRecentSaveGame(void) = 0;
-	virtual void			SetMostRecentSaveGame(const char* lpszFilename) = 0;
-
-	virtual void			StartXboxExitingProcess() = 0;
-	virtual bool			IsSaveInProgress() = 0;
-	virtual uint			OnStorageDeviceAttached(void) = 0;
-	virtual void			OnStorageDeviceDetached(void) = 0;
-
-	virtual void			ResetDemoInterpolation(void) = 0;
-
-	virtual void SetGamestatsData(CGamestatsData* pGamestatsData) = 0;
-	virtual CGamestatsData* GetGamestatsData() = 0;
-
-#if defined( USE_SDL )
-	virtual void GetMouseDelta(int& x, int& y, bool bIgnoreNextMouseDelta = false) = 0;
-#endif
-
-	virtual void ServerCmdKeyValues(KeyValues* pKeyValues) = 0;
-
-	virtual bool IsSkippingPlayback(void) = 0;
-	virtual bool IsLoadingDemo(void) = 0;
-
-	virtual bool IsPlayingDemoALocallyRecordedDemo() = 0;
-
-	virtual	const char* Key_LookupBindingExact(const char* pBinding) = 0;
-
-	virtual void				AddPhonemeFile(const char* pszPhonemeFile) = 0;
-
-};
-
-abstract_class IVEngineClient : public IVEngineClient013
-{
-public:
-	virtual uint GetProtocolVersion() = 0;
-	virtual bool IsWindowedMode() = 0;
-
-	virtual void	FlashWindow() = 0;
-
-	virtual int GetClientVersion() const = 0;   
-
-	virtual bool IsActiveApp() = 0;
-
-	virtual void DisconnectInternal() = 0;
-
-	virtual int GetInstancesRunningCount() = 0;
-};
-
-
-abstract_class IBaseClientDLL
-{
-public:
-	virtual int				Connect(CreateInterfaceFn appSystemFactory, CGlobalVarsBase * pGlobals) = 0;
-	virtual void            Disconnect() = 0;
-
-	virtual int				Init(CreateInterfaceFn appSystemFactory, CGlobalVarsBase* pGlobals) = 0;
-
-	virtual void			PostInit() = 0;
-
-	virtual void			Shutdown(void) = 0;
-
-	virtual void			LevelInitPreEntity(char const* pMapName) = 0;
-	virtual void			LevelInitPostEntity() = 0;
-	virtual void			LevelShutdown(void) = 0;
-
-	virtual ClientClass* GetAllClasses(void) = 0;
-
-	virtual int				HudVidInit(void) = 0;
-	virtual void			HudProcessInput(bool bActive) = 0;
-	virtual void			HudUpdate(bool bActive) = 0;
-	virtual void			HudReset(void) = 0;
-	virtual void			HudText(const char* message) = 0;
-
-	virtual bool			ShouldDrawDropdownConsole() = 0;
-
-	virtual void			IN_ActivateMouse(void) = 0;
-	virtual void			IN_DeactivateMouse(void) = 0;
-	virtual void			IN_Accumulate(void) = 0;
-	virtual void			IN_ClearStates(void) = 0;
-	virtual bool			IN_IsKeyDown(const char* name, bool& isdown) = 0;
-	virtual int				IN_KeyEvent(int eventcode, ButtonCode_t keynum, const char* pszCurrentBinding) = 0;
-
-	virtual void			CreateMove(
-								int sequence_number,			    
-								float input_sample_frametime,	     
-								bool active) = 0;				        
-
-	virtual void			ExtraMouseSample(float frametime, bool active) = 0;
-
-	virtual bool			WriteUsercmdDeltaToBuffer(int nSlot, bf_write* buf, int from, int to, bool isnewcommand) = 0;
-	virtual void			EncodeUserCmdToBuffer(int nSlot, bf_write& buf, int slot) = 0;
-	virtual void			DecodeUserCmdFromBuffer(int nSlot, bf_read& buf, int slot) = 0;
-
-	virtual void			View_Render(vrect_t* rect) = 0;
-
-	virtual void			RenderView(const CViewSetup& view, int nClearFlags, int whatToDraw) = 0;
-
-	virtual void			View_Fade(ScreenFade_t* pSF) = 0;
-
-	virtual void			SetCrosshairAngle(const QAngle& angle) = 0;
-
-	virtual void			InitSprite(CEngineSprite* pSprite, const char* loadname) = 0;
-	virtual void			ShutdownSprite(CEngineSprite* pSprite) = 0;
-	virtual int				GetSpriteSize(void) const = 0;
-
-	virtual void			VoiceStatus(int entindex, int iSsSlot, qboolean bTalking) = 0;
-
-	virtual bool			PlayerAudible(int iPlayerIndex) = 0;
-
-	virtual void			InstallStringTableCallback(char const* tableName) = 0;
-
-	virtual void			FrameStageNotify(ClientFrameStage_t curStage) = 0; 
-
-	virtual bool			DispatchUserMessage(int msg_type, int32 nFlags, int size, const void* msg) = 0;	   
-
-	virtual CSaveRestoreData* SaveInit(int size) = 0;
-	virtual void			SaveWriteFields(CSaveRestoreData*, const char*, void*, datamap_t*, typedescription_t*, int) = 0;
-	virtual void			SaveReadFields(CSaveRestoreData*, const char*, void*, datamap_t*, typedescription_t*, int) = 0;
-	virtual void			PreSave(CSaveRestoreData*) = 0;
-	virtual void			Save(CSaveRestoreData*) = 0;
-	virtual void			WriteSaveHeaders(CSaveRestoreData*) = 0;
-	virtual void			ReadRestoreHeaders(CSaveRestoreData*) = 0;
-	virtual void			Restore(CSaveRestoreData*, bool) = 0;
-	virtual void			DispatchOnRestore() = 0;
-
-	virtual CStandardRecvProxies* GetStandardRecvProxies() = 0;
-
-	virtual void			WriteSaveGameScreenshot(const char* pFilename) = 0;
-
-	virtual void			EmitSentenceCloseCaption(char const* tokenstream) = 0;
-	virtual void			EmitCloseCaption(char const* captionname, float duration) = 0;
-
-	virtual bool			CanRecordDemo(char* errorMsg, int length) const = 0;
-
-	virtual void			OnDemoRecordStart(char const* pDemoBaseName) = 0;
-	virtual void			OnDemoRecordStop() = 0;
-	virtual void			OnDemoPlaybackStart(char const* pDemoBaseName) = 0;
-	virtual void			OnDemoPlaybackRestart() = 0;
-	virtual void			OnDemoPlaybackStop() = 0;
-	virtual void			SetDemoPlaybackHighlightXuid(uint64 xuid, bool bLowlights) = 0;
-	virtual void			ShowHighlightSkippingMessage(bool bState, int nCurrentTick = 0, int nTickStart = 0, int nTickStop = 0) = 0;
-
-	virtual void			RecordDemoPolishUserInput(int nCmdIndex) = 0;
-
-	virtual bool			CacheReplayRagdolls(const char* pFilename, int nStartTick) = 0;
-
-	virtual void			ReplayUI_SendMessage(KeyValues* pMsg) = 0;
-
-	virtual void* GetReplayFactory() = 0;
-
-	virtual void			ClearLocalPlayerReplayPtr() = 0;
-
-	virtual void unk();
-
-	virtual int				GetScreenWidth() = 0;
-	virtual int				GetScreenHeight() = 0;
-
-	virtual void			WriteSaveGameScreenshotOfSize(const char* pFilename, int width, int height, bool bCreatePowerOf2Padded = false, bool bWriteVTF = false) = 0;
-
-	virtual void			WriteReplayScreenshot(void* params) = 0;
-
-	virtual void			UpdateReplayScreenshotCache() = 0;
-	  
-	virtual bool			GetPlayerView(CViewSetup& playerView) = 0;
-
-	virtual bool			ShouldHideLoadingPlaque(void) = 0;
-
-	virtual void			InvalidateMdlCache() = 0;
-
-	virtual void			IN_SetSampleTime(float frametime) = 0;
-
-	virtual void			OnActiveSplitscreenPlayerChanged(int nNewSlot) = 0;
-	virtual void			OnSplitScreenStateChanged() = 0;
-
-	virtual int				GetSpectatorTarget(void* pObserverMode) = 0;
-
-	virtual void			CenterStringOff() = 0;
-
-	virtual void			OnScreenSizeChanged(int nOldWidth, int nOldHeight) = 0;
-
-	virtual void* InstantiateMaterialProxy(const char* proxyName) = 0;
-
-	virtual vgui::VPANEL	GetFullscreenClientDLLVPanel(void) = 0;
-
-	virtual void			MarkEntitiesAsTouching(IClientEntity* e1, IClientEntity* e2) = 0;
-
-	virtual void			OnKeyBindingChanged(ButtonCode_t buttonCode, char const* pchKeyName, char const* pchNewBinding) = 0;
-
-	virtual void			SetBlurFade(float scale) = 0;
-
-	virtual void			ResetHudCloseCaption() = 0;
-
-	virtual bool			HandleGameUIEvent(const InputEvent_t& event) = 0;
-
-	virtual bool			GetSoundSpatialization(SpatializationInfo_t& info) = 0;
-
-	virtual void			Hud_SaveStarted() = 0;
-
-	virtual void			ShutdownMovies() = 0;
-
-	virtual void			GetStatus(char* buffer, int bufsize) = 0;
-
-#if defined ( CSTRIKE15 )
-	virtual bool			IsChatRaised(void) = 0;
-	virtual bool			IsRadioPanelRaised(void) = 0;
-	virtual bool			IsBindMenuRaised(void) = 0;
-	virtual bool			IsTeamMenuRaised(void) = 0;
-	virtual bool			IsLoadingScreenRaised(void) = 0;
-
-#endif
-
-#if defined(_PS3)
-	virtual int				GetDrawFlags(void) = 0;
-	virtual int				GetBuildViewID(void) = 0;
-	virtual bool			IsSPUBuildWRJobsOn(void) = 0;
-	virtual void			CacheFrustumData(Frustum_t* pFrustum, Frustum_t* pAreaFrustum, void* pRenderAreaBits, int numArea, bool bViewerInSolidSpace) = 0;
-	virtual void* GetBuildViewVolumeCuller(void) = 0;
-	virtual Frustum_t* GetBuildViewFrustum(void) = 0;
-	virtual Frustum_t* GetBuildViewAreaFrustum(void) = 0;
-	virtual unsigned char* GetBuildViewRenderAreaBits(void) = 0;
-#else
-	virtual bool			IsBuildWRThreaded(void) = 0;
-	virtual void			QueueBuildWorldListJob(CJob* pJob) = 0;
-	virtual void			CacheFrustumData(const Frustum_t& frustum, const CUtlVector< Frustum_t, CUtlMemoryAligned< Frustum_t,16 > >& aeraFrustums) = 0;
-	virtual const Frustum_t* GetBuildViewFrustum(void) const = 0;
-	virtual const CUtlVector< Frustum_t, CUtlMemoryAligned< Frustum_t,16 > >* GetBuildViewAeraFrustums(void) const = 0;
-#endif
-
-	virtual bool IsSubscribedMap(const char* pchMapName, bool bOnlyOnDisk) = 0;
-	virtual bool IsFeaturedMap(const char* pchMapName, bool bOnlyOnDisk) = 0;
-
-	virtual void DownloadCommunityMapFile(int id) = 0;
-
-	virtual float GetUGCFileDownloadProgress(int id) = 0;
-
-	virtual void RecordUIEvent(const char* szEvent) = 0;
-
-	virtual float FindInventoryItemWithMaxAttributeValue(char const* szItemType, char const* szAttrClass) = 0;
-
-	virtual void DetermineSubscriptionKvToAdvertise(KeyValues* kvLocalPlayer) = 0;
-
-	virtual bool ValidateSignedEvidenceHeader(char const* szKey, void const* pvHeader, void* pPlaybackParameters) = 0;
-	virtual void PrepareSignedEvidenceData(void* pvData, int numBytes, int const* pPlaybackParameters) = 0;
-	virtual bool ShouldSkipEvidencePlayback(int const* pPlaybackParameters) = 0;
-
-	virtual void* GetScaleformSlotInitController() = 0;
-
-	virtual bool IsConnectedUserInfoChangeAllowed(IConVar* pCvar) = 0;
-
-	virtual char const* GetRichPresenceStatusString() = 0;
-
-	virtual bool			CanStopRecordDemo(char* errorMsg, int length) const = 0;
-
-	virtual void OnHltvReplay(const int& msg) = 0;
-	virtual void OnHltvReplayTick() = 0;
-	virtual int GetHltvReplayDelay() = 0;
-
-	virtual void OnDemoPlaybackTimeJump() = 0;
-	virtual void OnCommandDuringPlayback(char const* cmd) = 0;
-
-	virtual void RetireAllPlayerDecals(bool bRenderContextValid) = 0;
-	virtual void EngineGotvSyncPacket(const void* pPkt) = 0;        
-	virtual int GetInEyeEntity() const = 0;
-	virtual void OnTickPre(int tickcount) = 0;
-};
-
-#define CLIENT_DLL_INTERFACE_VERSION		"VClient018"
-
-abstract_class IClientDLLSharedAppSystems
-{
-public:
-	virtual int	Count() = 0;
-	virtual char const* GetDllName(int idx) = 0;
-	virtual char const* GetInterfaceName(int idx) = 0;
-};
-
-#define CLIENT_DLL_SHARED_APPSYSTEMS		"VClientDllSharedAppSystems001"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/cdll_util.h b/SpyCustom/cdll_util.h
deleted file mode 100644
index d943a41..0000000
--- a/SpyCustom/cdll_util.h
+++ /dev/null
@@ -1,149 +0,0 @@
-#if !defined( UTIL_H )
-#define UTIL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "soundflags.h"
-#include "vector.h"
-#include "shareddefs.h"
-
-#include "shake.h"
-#include "imageformat.h"
-#include "ispatialpartition.h"
-#include "MaterialSystemUtil.h"
-
-class Vector;
-class QAngle;
-class IMaterial;
-class ITexture;
-class IClientEntity;
-class CHudTexture;
-class CGameTrace;
-class C_BaseEntity;
-
-struct Ray_t;
-struct client_textmessage_t;
-typedef CGameTrace trace_t;
-
-namespace vgui
-{
-	typedef unsigned long HFont;
-};
-
-
-
-extern bool g_MakingDevShots;
-
-int		ScreenHeight(void);
-int		ScreenWidth(void);
-
-#define XRES(x)	( x  * ( ( float )ScreenWidth() / 640.0 ) )
-#define YRES(y)	( y  * ( ( float )ScreenHeight() / 480.0 ) )
-
-int		UTIL_ComputeStringWidth(vgui::HFont& font, const char* str);
-int		UTIL_ComputeStringWidth(vgui::HFont& font, const wchar_t* str);
-float	UTIL_AngleDiff(float destAngle, float srcAngle);
-void	UTIL_Bubbles(const Vector& mins, const Vector& maxs, int count);
-void	UTIL_Smoke(const Vector& origin, const float scale, const float framerate);
-void	UTIL_ImpactTrace(trace_t* pTrace, int iDamageType, const char* pCustomImpactName = NULL);
-int		UTIL_PrecacheDecal(const char* name, bool preload = false);
-void	UTIL_EmitAmbientSound(C_BaseEntity* entity, const Vector& vecOrigin, const char* samp, float vol, soundlevel_t soundlevel, int fFlags, int pitch);
-void	UTIL_SetOrigin(C_BaseEntity* entity, const Vector& vecOrigin);
-void	UTIL_ScreenShake(const Vector& center, float amplitude, float frequency, float duration, float radius, ShakeCommand_t eCommand, bool bAirShake = false);
-byte* UTIL_LoadFileForMe(const char* filename, int* pLength);
-void	UTIL_FreeFile(byte* buffer);
-void	UTIL_MakeSafeName(const char* oldName, OUT_Z_CAP(newNameBufSize) char* newName, int newNameBufSize);	                  
-const char* UTIL_SafeName(const char* oldName);	       
-void	UTIL_ReplaceKeyBindings(const wchar_t* inbuf, int inbufsizebytes, OUT_Z_BYTECAP(outbufsizebytes) wchar_t* outbuf, int outbufsizebytes);
-
-unsigned char UTIL_ComputeEntityFade(C_BaseEntity* pEntity, float flMinDist, float flMaxDist, float flFadeScale);
-
-client_textmessage_t* TextMessageGet(const char* pName);
-
-char* VarArgs(PRINTF_FORMAT_STRING const char* format, ...);
-
-
-int		GetSpectatorTarget();
-int		GetSpectatorMode(void);
-bool	IsPlayerIndex(int index);
-int		GetLocalPlayerIndex(void);
-int		GetLocalPlayerVisionFilterFlags(bool bWeaponsCheck = false);
-bool	IsLocalPlayerUsingVisionFilterFlags(int nFlags, bool bWeaponsCheck = false);
-int		GetLocalPlayerTeam(void);
-bool	IsLocalPlayerSpectator(void);
-void	NormalizeAngles(QAngle& angles);
-void	InterpolateAngles(const QAngle& start, const QAngle& end, QAngle& output, float frac);
-void	InterpolateVector(float frac, const Vector& src, const Vector& dest, Vector& output);
-
-const char* nexttoken(char* token, const char* str, char sep);
-
-enum
-{
-	LIGHT_INDEX_TE_DYNAMIC = 0x10000000,
-	LIGHT_INDEX_PLAYER_BRIGHT = 0x20000000,
-	LIGHT_INDEX_MUZZLEFLASH = 0x40000000,
-};
-
-void UTIL_PrecacheOther(const char* szClassname);
-
-void UTIL_SetTrace(trace_t& tr, const Ray_t& ray, C_BaseEntity* edict, float fraction, int hitgroup, unsigned int contents, const Vector& normal, float intercept);
-
-bool GetVectorInScreenSpace(Vector pos, int& iX, int& iY, Vector* vecOffset = NULL);
-bool GetVectorInHudSpace(Vector pos, int& iX, int& iY, Vector* vecOffset = NULL);
-bool GetTargetInScreenSpace(C_BaseEntity* pTargetEntity, int& iX, int& iY, Vector* vecOffset = NULL);
-bool GetTargetInHudSpace(C_BaseEntity* pTargetEntity, int& iX, int& iY, Vector* vecOffset = NULL);
-
-class C_BasePlayer;
-void ClientPrint(C_BasePlayer* player, int msg_dest, const char* msg_name, const char* param1 = NULL, const char* param2 = NULL, const char* param3 = NULL, const char* param4 = NULL);
-
-int			UTIL_EntitiesInBox(C_BaseEntity** pList, int listMax, const Vector& mins, const Vector& maxs, int flagMask, int partitionMask = PARTITION_CLIENT_NON_STATIC_EDICTS);
-int			UTIL_EntitiesInSphere(C_BaseEntity** pList, int listMax, const Vector& center, float radius, int flagMask, int partitionMask = PARTITION_CLIENT_NON_STATIC_EDICTS);
-int			UTIL_EntitiesAlongRay(C_BaseEntity** pList, int listMax, const Ray_t& ray, int flagMask, int partitionMask = PARTITION_CLIENT_NON_STATIC_EDICTS);
-
-#define MAX_SPHERE_QUERY	256
-class CEntitySphereQuery
-{
-public:
-	CEntitySphereQuery(const Vector& center, float radius, int flagMask = 0, int partitionMask = PARTITION_CLIENT_NON_STATIC_EDICTS);
-	C_BaseEntity* GetCurrentEntity();
-	inline void NextEntity() { m_listIndex++; }
-
-private:
-	int			m_listIndex;
-	int			m_listCount;
-	C_BaseEntity* m_pList[MAX_SPHERE_QUERY];
-};
-
-C_BaseEntity* CreateEntityByName(const char* className);
-template< class T >
-T* _CreateEntity(T* newClass, const char* className)
-{
-	T* newEnt = dynamic_cast<T*>(CreateEntityByName(className));
-	if (!newEnt)
-	{
-		Warning("classname %s used to create wrong class type\n", className);
-		Assert(0);
-	}
-
-	return newEnt;
-}
-
-#define CREATE_ENTITY( newClass, className ) _CreateEntity( (newClass*)NULL, className )
-#define CREATE_UNSAVED_ENTITY( newClass, className ) _CreateEntityTemplate( (newClass*)NULL, className )
-
-inline bool FStrEq(const char* sz1, const char* sz2)
-{
-	return (sz1 == sz2 || V_stricmp(sz1, sz2) == 0);
-}
-
-void UTIL_BoundToWorldSize(Vector* pVecPos);
-
-void UTIL_IncrementMapKey(const char* pszCustomKey);
-
-int UTIL_GetMapKeyCount(const char* pszCustomKey);
-
-bool UTIL_HasLoadedAnyMap();
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/cheat1.aps b/SpyCustom/cheat1.aps
deleted file mode 100644
index 502c064..0000000
Binary files a/SpyCustom/cheat1.aps and /dev/null differ
diff --git a/SpyCustom/checksum_crc.h b/SpyCustom/checksum_crc.h
deleted file mode 100644
index b4875c3..0000000
--- a/SpyCustom/checksum_crc.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef CHECKSUM_CRC_H
-#define CHECKSUM_CRC_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-typedef unsigned int CRC32_t;
-
-void CRC32_Init(CRC32_t* pulCRC);
-void CRC32_ProcessBuffer(CRC32_t* pulCRC, const void* p, int len);
-void CRC32_Final(CRC32_t* pulCRC);
-CRC32_t	CRC32_GetTableEntry(unsigned int slot);
-
-inline CRC32_t CRC32_ProcessSingleBuffer(const void* p, int len)
-{
-	CRC32_t crc;
-
-	CRC32_Init(&crc);
-	CRC32_ProcessBuffer(&crc, p, len);
-	CRC32_Final(&crc);
-
-	return crc;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/checksum_md5.h b/SpyCustom/checksum_md5.h
deleted file mode 100644
index 1179656..0000000
--- a/SpyCustom/checksum_md5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef CHECKSUM_MD5_H
-#define CHECKSUM_MD5_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define MD5_DIGEST_LENGTH 16  
-#define MD5_BIT_LENGTH ( MD5_DIGEST_LENGTH * sizeof(unsigned char) )
-struct MD5Value_t
-{
-	unsigned char bits[MD5_DIGEST_LENGTH];
-
-	void Zero();
-	bool IsZero() const;
-
-	bool operator==(const MD5Value_t& src) const;
-	bool operator!=(const MD5Value_t& src) const;
-
-};
-
-typedef struct
-{
-	unsigned int	buf[4];
-	unsigned int	bits[2];
-	unsigned char	in[64];
-} MD5Context_t;
-
-void MD5Init(MD5Context_t* context);
-void MD5Update(MD5Context_t* context, unsigned char const* buf, unsigned int len);
-void MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], MD5Context_t* context);
-
-char* MD5_Print(unsigned char* digest, int hashlen);
-
-void MD5_ProcessSingleBuffer(const void* p, int len, MD5Value_t& md5Result);
-
-unsigned int MD5_PseudoRandom(unsigned int nSeed);
-
-bool MD5_Compare(const MD5Value_t& data, const MD5Value_t& compare);
-
-inline bool MD5Value_t::operator==(const MD5Value_t& src) const
-{
-	return MD5_Compare(*this, src);
-}
-
-inline bool MD5Value_t::operator!=(const MD5Value_t& src) const
-{
-	return !MD5_Compare(*this, src);
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/client_class.h b/SpyCustom/client_class.h
deleted file mode 100644
index 7d84b69..0000000
--- a/SpyCustom/client_class.h
+++ /dev/null
@@ -1,140 +0,0 @@
-#if !defined( CLIENT_CLASS_H )
-#define CLIENT_CLASS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "dt_recv.h"
-
-class Vector;
-class CMouthInfo;
-
-
-#include "iclientrenderable.h"
-#include "iclientnetworkable.h"
-
-
-class ClientClass;
-extern ClientClass* g_pClientClassHead;
-
-typedef IClientNetworkable* (*CreateClientClassFn)(int entnum, int serialNum);
-typedef IClientNetworkable* (*CreateEventFn)();
-
-class ClientClass
-{
-public:
-	ClientClass(const char* pNetworkName, CreateClientClassFn createFn, CreateEventFn createEventFn, RecvTable* pRecvTable)
-	{
-		m_pNetworkName = pNetworkName;
-		m_pCreateFn = createFn;
-		m_pCreateEventFn = createEventFn;
-		m_pRecvTable = pRecvTable;
-
-		m_pNext = g_pClientClassHead;
-		g_pClientClassHead = this;
-	}
-
-	const char* GetName()
-	{
-		return m_pNetworkName;
-	}
-
-public:
-	CreateClientClassFn		m_pCreateFn;
-	CreateEventFn			m_pCreateEventFn;	     
-	const char* m_pNetworkName;
-	RecvTable* m_pRecvTable;
-	ClientClass* m_pNext;
-	int						m_ClassID;	    
-};
-
-#define DECLARE_CLIENTCLASS() \
-	virtual int YouForgotToImplementOrDeclareClientClass();\
-	virtual ClientClass* GetClientClass();\
-	static RecvTable *m_pClassRecvTable; \
-	DECLARE_CLIENTCLASS_NOBASE()
-
-
-#define ALLOW_DATATABLES_PRIVATE_ACCESS() \
-	template <typename T> friend int ClientClassInit(T *);
-
-
-#define DECLARE_CLIENTCLASS_NOBASE ALLOW_DATATABLES_PRIVATE_ACCESS
-
-#define IMPLEMENT_CLIENTCLASS(clientClassName, dataTable, serverClassName) \
-	INTERNAL_IMPLEMENT_CLIENTCLASS_PROLOGUE(clientClassName, dataTable, serverClassName) \
-	static IClientNetworkable* _##clientClassName##_CreateObject( int entnum, int serialNum ) \
-	{ \
-		clientClassName *pRet = new clientClassName; \
-		if ( !pRet ) \
-			return 0; \
-		pRet->Init( entnum, serialNum ); \
-		return pRet; \
-	} \
-	ClientClass __g_##clientClassName##ClientClass(#serverClassName, \
-													_##clientClassName##_CreateObject, \
-													NULL,\
-													&dataTable::g_RecvTable);
-
-#define IMPLEMENT_CLIENTCLASS_FACTORY(clientClassName, dataTable, serverClassName, factory) \
-	INTERNAL_IMPLEMENT_CLIENTCLASS_PROLOGUE(clientClassName, dataTable, serverClassName) \
-	ClientClass __g_##clientClassName##ClientClass(#serverClassName, \
-													factory, \
-													NULL,\
-													&dataTable::g_RecvTable);
-
-#define IMPLEMENT_CLIENTCLASS_DT(clientClassName, dataTable, serverClassName)\
-	IMPLEMENT_CLIENTCLASS(clientClassName, dataTable, serverClassName)\
-	BEGIN_RECV_TABLE(clientClassName, dataTable)
-
-#define IMPLEMENT_CLIENTCLASS_DT_NOBASE(clientClassName, dataTable, serverClassName)\
-	IMPLEMENT_CLIENTCLASS(clientClassName, dataTable, serverClassName)\
-	BEGIN_RECV_TABLE_NOBASE(clientClassName, dataTable)
-
-
-#define IMPLEMENT_CLIENTCLASS_EVENT(clientClassName, dataTable, serverClassName)\
-	INTERNAL_IMPLEMENT_CLIENTCLASS_PROLOGUE(clientClassName, dataTable, serverClassName)\
-	static clientClassName __g_##clientClassName; \
-	static IClientNetworkable* _##clientClassName##_CreateObject() {return &__g_##clientClassName;}\
-	ClientClass __g_##clientClassName##ClientClass(#serverClassName, \
-													NULL,\
-													_##clientClassName##_CreateObject, \
-													&dataTable::g_RecvTable);
-
-#define IMPLEMENT_CLIENTCLASS_EVENT_DT(clientClassName, dataTable, serverClassName)\
-	namespace dataTable {extern RecvTable g_RecvTable;}\
-	IMPLEMENT_CLIENTCLASS_EVENT(clientClassName, dataTable, serverClassName)\
-	BEGIN_RECV_TABLE(clientClassName, dataTable)
-
-
-#define IMPLEMENT_CLIENTCLASS_EVENT_POINTER(clientClassName, dataTable, serverClassName, ptr)\
-	INTERNAL_IMPLEMENT_CLIENTCLASS_PROLOGUE(clientClassName, dataTable, serverClassName)\
-	static IClientNetworkable* _##clientClassName##_CreateObject() {return ptr;}\
-	ClientClass __g_##clientClassName##ClientClass(#serverClassName, \
-													NULL,\
-													_##clientClassName##_CreateObject, \
-													&dataTable::g_RecvTable);
-
-#define IMPLEMENT_CLIENTCLASS_EVENT_NONSINGLETON(clientClassName, dataTable, serverClassName)\
-	static IClientNetworkable* _##clientClassName##_CreateObject() \
-	{ \
-		clientClassName *p = new clientClassName; \
-		if ( p ) \
-			p->Init( -1, 0 ); \
-		return p; \
-	} \
-	ClientClass __g_##clientClassName##ClientClass(#serverClassName, \
-													NULL,\
-													_##clientClassName##_CreateObject, \
-													&dataTable::g_RecvTable);
-
-
-#define INTERNAL_IMPLEMENT_CLIENTCLASS_PROLOGUE(clientClassName, dataTable, serverClassName) \
-	namespace dataTable {extern RecvTable g_RecvTable;}\
-	extern ClientClass __g_##clientClassName##ClientClass;\
-	RecvTable*		clientClassName::m_pClassRecvTable = &dataTable::g_RecvTable;\
-	int				clientClassName::YouForgotToImplementOrDeclareClientClass() {return 0;}\
-	ClientClass*	clientClassName::GetClientClass() {return &__g_##clientClassName##ClientClass;}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/client_render_handle.h b/SpyCustom/client_render_handle.h
deleted file mode 100644
index f2c0970..0000000
--- a/SpyCustom/client_render_handle.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef CLIENT_RENDER_HANDLE_H
-#define CLIENT_RENDER_HANDLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-class IClientRenderable;
-
-
-typedef unsigned short ClientRenderHandle_t;
-
-enum
-{
-	INVALID_CLIENT_RENDER_HANDLE = (ClientRenderHandle_t)0xffff,
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/client_thinklist.h b/SpyCustom/client_thinklist.h
deleted file mode 100644
index 542be13..0000000
--- a/SpyCustom/client_thinklist.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifndef CLIENT_THINKLIST_H
-#define CLIENT_THINKLIST_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "igamesystem.h"
-#include "utllinkedlist.h"
-#include "cliententitylist.h"
-#include "iclientthinkable.h"
-#include "utlrbtree.h"
-
-
-#define CLIENT_THINK_ALWAYS	-1293
-#define CLIENT_THINK_NEVER	-1
-
-
-#define INVALID_THINK_HANDLE ClientThinkList()->GetInvalidThinkHandle()
-
-
-class CClientThinkList : public IGameSystemPerFrame
-{
-public:
-
-	CClientThinkList();
-	virtual					~CClientThinkList();
-
-	virtual char const* Name() { return "CClientThinkList"; }
-	virtual bool			IsPerFrame() { return true; }
-
-	void					SetNextClientThink(ClientEntityHandle_t hEnt, float nextTime);
-
-	void					RemoveThinkable(ClientEntityHandle_t hEnt);
-
-	ClientThinkHandle_t		GetInvalidThinkHandle();
-
-	void					PerformThinkFunctions();
-
-	void					AddToDeleteList(ClientEntityHandle_t hEnt);
-	void					RemoveFromDeleteList(ClientEntityHandle_t hEnt);
-
-public:
-
-	virtual bool Init();
-	virtual void PostInit() {};
-	virtual void Shutdown();
-	virtual void LevelInitPreEntity();
-	virtual void LevelInitPostEntity() {}
-	virtual void LevelShutdownPreEntity();
-	virtual void LevelShutdownPostEntity();
-	virtual void PreRender();
-	virtual void PostRender() { }
-	virtual void Update(float frametime);
-	virtual void OnSave() {}
-	virtual void OnRestore() {}
-	virtual void SafeRemoveIfDesired() {}
-
-private:
-	struct ThinkEntry_t
-	{
-		ClientEntityHandle_t	m_hEnt;
-		float					m_flNextClientThink;
-		float					m_flLastClientThink;
-		int						m_nIterEnum;
-	};
-
-	struct ThinkListChanges_t
-	{
-		ClientEntityHandle_t	m_hEnt;
-		ClientThinkHandle_t		m_hThink;
-		float					m_flNextTime;
-	};
-
-private:
-	void			SetNextClientThink(ClientThinkHandle_t hThink, float nextTime);
-	void			RemoveThinkable(ClientThinkHandle_t hThink);
-	void			PerformThinkFunction(ThinkEntry_t* pEntry, float curtime);
-	ThinkEntry_t* GetThinkEntry(ClientThinkHandle_t hThink);
-	void			CleanUpDeleteList();
-
-	void			AddEntityToFrameThinkList(ThinkEntry_t* pEntry, bool bAlwaysChain, int& nCount, ThinkEntry_t** ppFrameThinkList);
-
-private:
-	CUtlLinkedList<ThinkEntry_t, unsigned short>	m_ThinkEntries;
-
-	CUtlVector<ClientEntityHandle_t>	m_aDeleteList;
-	CUtlVector<ThinkListChanges_t>		m_aChangeList;
-
-	int m_nIterEnum;
-	bool m_bInThinkLoop;
-};
-
-
-inline ClientThinkHandle_t CClientThinkList::GetInvalidThinkHandle()
-{
-	return (ClientThinkHandle_t)(uintp)m_ThinkEntries.InvalidIndex();
-}
-
-
-inline CClientThinkList::ThinkEntry_t* CClientThinkList::GetThinkEntry(ClientThinkHandle_t hThink)
-{
-	return &m_ThinkEntries[(unsigned long)hThink];
-}
-
-
-inline CClientThinkList* ClientThinkList()
-{
-	extern CClientThinkList g_ClientThinkList;
-	return &g_ClientThinkList;
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/client_virtualreality.h b/SpyCustom/client_virtualreality.h
deleted file mode 100644
index 3df62be..0000000
--- a/SpyCustom/client_virtualreality.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef CLIENTVIRTUALREALITY_H
-#define CLIENTVIRTUALREALITY_H
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-#include "tier3.h"
-#include "iclientvirtualreality.h"
-#include "view_shared.h"
-
-enum HeadtrackMovementMode_t
-{
-	HMM_SHOOTFACE_MOVEFACE = 0,		        
-	HMM_SHOOTFACE_MOVETORSO,		           
-	HMM_SHOOTMOUSE_MOVEFACE,		              
-	HMM_SHOOTBOUNDEDMOUSE_LOOKFACE_MOVEFACE,	               
-	HMM_SHOOTBOUNDEDMOUSE_LOOKFACE_MOVEMOUSE,	                 
-
-	HMM_SHOOTMOVELOOKMOUSEFACE,		                    
-	HMM_SHOOTMOVEMOUSE_LOOKFACE,	              
-	HMM_SHOOTMOVELOOKMOUSE,			              
-
-	HMM_LAST,
-
-	HMM_NOOVERRIDE = HMM_LAST		          
-};
-
-
-
-class CClientVirtualReality : public CTier3AppSystem< IClientVirtualReality >
-{
-	typedef CTier3AppSystem< IClientVirtualReality > BaseClass;
-
-public:
-
-	CClientVirtualReality();
-	~CClientVirtualReality();
-
-	virtual bool							Connect(CreateInterfaceFn factory);
-	virtual void							Disconnect();
-	virtual void* QueryInterface(const char* pInterfaceName);
-
-	virtual InitReturnVal_t					Init();
-	virtual void							Shutdown();
-
-	void StartupComplete();
-
-	virtual void DrawMainMenu() OVERRIDE;
-
-
-	bool OverrideView(CViewSetup* pViewMiddle, Vector* pViewModelOrigin, QAngle* pViewModelAngles, HeadtrackMovementMode_t hmmMovementOverride);
-	bool OverrideStereoView(CViewSetup* pViewMiddle, CViewSetup* pViewLeft, CViewSetup* pViewRight);
-	bool OverridePlayerMotion(float flInputSampleFrametime, const QAngle& oldAngles, const QAngle& curAngles, const Vector& curMotion, QAngle* pNewAngles, Vector* pNewMotion);
-	bool OverrideWeaponHudAimVectors(Vector* pAimOrigin, Vector* pAimDirection);
-	bool CurrentlyZoomed();
-	void OverrideTorsoTransform(const Vector& position, const QAngle& angles);
-	void CancelTorsoTransformOverride();
-	bool CanOverlayHudQuad();
-	void GetHUDBounds(Vector* pViewer, Vector* pUL, Vector* pUR, Vector* pLL, Vector* pLR);
-	void RenderHUDQuad(bool bBlackout, bool bTranslucent);
-	float GetZoomedModeMagnification();
-	bool ProcessCurrentTrackingState(float fGameFOV);
-	const VMatrix& GetHudProjectionFromWorld();
-	void GetTorsoRelativeAim(Vector* pPosition, QAngle* pAngles);
-	float GetHUDDistance();
-	bool ShouldRenderHUDInWorld();
-	const VMatrix& GetWorldFromMidEye() const { return m_WorldFromMidEyeNoDebugCam; }
-	void OverrideViewModelTransform(Vector& vmorigin, QAngle& vmangles, bool bUseLargeOverride);
-	void AlignTorsoAndViewToWeapon();
-	void PostProcessFrame(StereoEye_t eEye);
-	void OverlayHUDQuadWithUndistort(const CViewSetup& view, bool bDoUndistort, bool bBlackout, bool bTranslucent);
-
-	void Activate();
-	void Deactivate();
-
-private:
-	HeadtrackMovementMode_t m_hmmMovementActual;
-
-	VMatrix			m_WorldFromMidEye;
-
-	float			m_fHudHorizontalFov;
-	VMatrix			m_WorldFromHud;
-	VMatrix			m_HudProjectionFromWorld;
-	float			m_fHudHalfWidth;
-	float			m_fHudHalfHeight;
-
-	VMatrix			m_TorsoFromMideye;
-
-	VMatrix			m_WorldFromMidEyeNoDebugCam;
-
-	VMatrix			m_WorldFromWeapon;
-
-	QAngle			m_PlayerTorsoAngle;
-	Vector			m_PlayerTorsoOrigin;
-	Vector			m_PlayerLastMovement;
-
-	QAngle			m_PlayerViewAngle;
-	Vector			m_PlayerViewOrigin;
-
-	float			m_WorldZoomScale;
-
-	QAngle			m_OverrideTorsoAngle;
-	QAngle			m_OverrideTorsoOffset;
-	bool			m_bOverrideTorsoAngle;
-
-	int				m_iAlignTorsoAndViewToWeaponCountdown;
-
-	bool			m_bMotionUpdated;
-
-	RTime32			m_rtLastMotionSample;
-
-	bool m_bNonVRWindowed;
-	int m_nNonVRWidth;
-	int m_nNonVRHeight;
-#if defined( USE_SDL )
-	int m_nNonVRSDLDisplayIndex;
-#endif
-	bool m_bNonVRRawInput;
-};
-
-extern CClientVirtualReality g_ClientVirtualReality;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/cliententitylist.h b/SpyCustom/cliententitylist.h
deleted file mode 100644
index 2e448c6..0000000
--- a/SpyCustom/cliententitylist.h
+++ /dev/null
@@ -1,252 +0,0 @@
-#if !defined( CLIENTENTITYLIST_H )
-#define CLIENTENTITYLIST_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dbg.h"
-#include "icliententitylist.h"
-#include "iclientunknown.h"
-#include "utllinkedlist.h"
-#include "utlvector.h"
-#include "icliententityinternal.h"
-#include "ispatialpartition.h"
-#include "cdll_util.h"
-#include "entitylist_base.h"
-#include "utlmap.h"
-
-class C_Beam;
-class C_BaseViewModel;
-class C_BaseEntity;
-
-
-#define INPVS_YES			0x0001		       
-#define INPVS_THISFRAME		0x0002		                
-#define INPVS_NEEDSNOTIFY	0x0004		       
-
-class IClientEntityListener;
-
-abstract_class C_BaseEntityClassList
-{
-public:
-	C_BaseEntityClassList();
-	~C_BaseEntityClassList();
-	virtual void LevelShutdown() = 0;
-
-	C_BaseEntityClassList* m_pNextClassList;
-};
-
-template< class T >
-class C_EntityClassList : public C_BaseEntityClassList
-{
-public:
-	virtual void LevelShutdown() { m_pClassList = NULL; }
-
-	void Insert(T* pEntity)
-	{
-		pEntity->m_pNext = m_pClassList;
-		m_pClassList = pEntity;
-	}
-
-	void Remove(T* pEntity)
-	{
-		T** pPrev = &m_pClassList;
-		T* pCur = *pPrev;
-		while (pCur)
-		{
-			if (pCur == pEntity)
-			{
-				*pPrev = pCur->m_pNext;
-				return;
-			}
-			pPrev = &pCur->m_pNext;
-			pCur = *pPrev;
-		}
-	}
-
-	static T* m_pClassList;
-};
-
-
-#define INVALID_CLIENTENTITY_HANDLE CBaseHandle( INVALID_EHANDLE_INDEX )
-
-
-class CClientEntityList : public CBaseEntityList, public IClientEntityList
-{
-	friend class C_BaseEntityIterator;
-	friend class C_AllBaseEntityIterator;
-
-public:
-	CClientEntityList(void);
-	virtual 					~CClientEntityList(void);
-
-	void						Release();		     
-
-
-public:
-
-	virtual IClientNetworkable* GetClientNetworkable(int entnum);
-	virtual IClientEntity* GetClientEntity(int entnum);
-
-	virtual int					NumberOfEntities(bool bIncludeNonNetworkable = false);
-
-	virtual IClientUnknown* GetClientUnknownFromHandle(ClientEntityHandle_t hEnt);
-	virtual IClientNetworkable* GetClientNetworkableFromHandle(ClientEntityHandle_t hEnt);
-	virtual IClientEntity* GetClientEntityFromHandle(ClientEntityHandle_t hEnt);
-
-	virtual int					GetHighestEntityIndex(void);
-
-	virtual void				SetMaxEntities(int maxents);
-	virtual int					GetMaxEntities();
-
-
-protected:
-
-	virtual void OnAddEntity(IHandleEntity* pEnt, CBaseHandle handle);
-	virtual void OnRemoveEntity(IHandleEntity* pEnt, CBaseHandle handle);
-
-
-public:
-
-	IClientUnknown* GetListedEntity(int entnum);
-
-	C_BaseEntity* GetBaseEntity(int entnum);
-	ICollideable* GetCollideable(int entnum);
-
-	IClientRenderable* GetClientRenderableFromHandle(ClientEntityHandle_t hEnt);
-	C_BaseEntity* GetBaseEntityFromHandle(ClientEntityHandle_t hEnt);
-	ICollideable* GetCollideableFromHandle(ClientEntityHandle_t hEnt);
-	IClientThinkable* GetClientThinkableFromHandle(ClientEntityHandle_t hEnt);
-
-	ClientEntityHandle_t	EntIndexToHandle(int entnum);
-	int						HandleToEntIndex(ClientEntityHandle_t handle);
-
-	bool					IsHandleValid(ClientEntityHandle_t handle) const;
-
-	C_BaseEntity* GetEnt(int entnum) { return GetBaseEntity(entnum); }
-
-	void					RecomputeHighestEntityUsed(void);
-
-
-	C_BaseEntity* FirstBaseEntity() const;
-	C_BaseEntity* NextBaseEntity(C_BaseEntity* pEnt) const;
-
-	class CPVSNotifyInfo
-	{
-	public:
-		IPVSNotify* m_pNotify;
-		IClientRenderable* m_pRenderable;
-		unsigned char m_InPVSStatus;				     
-		unsigned short m_PVSNotifiersLink;			  
-	};
-
-	CUtlLinkedList<CPVSNotifyInfo, unsigned short>& GetPVSNotifiers();
-
-	CUtlVector<IClientEntityListener*>	m_entityListeners;
-
-	void AddListenerEntity(IClientEntityListener* pListener);
-	void RemoveListenerEntity(IClientEntityListener* pListener);
-
-	void NotifyCreateEntity(C_BaseEntity* pEnt);
-	void NotifyRemoveEntity(C_BaseEntity* pEnt);
-
-private:
-
-	struct EntityCacheInfo_t
-	{
-		IClientNetworkable* m_pNetworkable;
-		unsigned short m_BaseEntitiesIndex;	       
-	};
-
-	int					m_iNumServerEnts;
-	int					m_iMaxServerEnts;
-
-	int					m_iNumClientNonNetworkable;
-
-	int					m_iMaxUsedServerIndex;
-
-	EntityCacheInfo_t	m_EntityCacheInfo[NUM_ENT_ENTRIES];
-
-	CUtlLinkedList<C_BaseEntity*, unsigned short> m_BaseEntities;
-
-
-private:
-
-	void AddPVSNotifier(IClientUnknown* pUnknown);
-	void RemovePVSNotifier(IClientUnknown* pUnknown);
-
-	CUtlLinkedList<CPVSNotifyInfo, unsigned short> m_PVSNotifyInfos;
-	CUtlMap<IClientUnknown*, unsigned short, unsigned short> m_PVSNotifierMap;	      
-};
-
-
-class C_AllBaseEntityIterator
-{
-public:
-	C_AllBaseEntityIterator();
-
-	void Restart();
-	C_BaseEntity* Next();	       
-
-private:
-	unsigned short m_CurBaseEntity;
-};
-
-class C_BaseEntityIterator
-{
-public:
-	C_BaseEntityIterator();
-
-	void Restart();
-	C_BaseEntity* Next();	       
-
-private:
-	unsigned short m_CurBaseEntity;
-};
-
-inline bool	CClientEntityList::IsHandleValid(ClientEntityHandle_t handle) const
-{
-	return handle.Get() != 0;
-}
-
-inline IClientUnknown* CClientEntityList::GetListedEntity(int entnum)
-{
-	return (IClientUnknown*)LookupEntityByNetworkIndex(entnum);
-}
-
-inline IClientUnknown* CClientEntityList::GetClientUnknownFromHandle(ClientEntityHandle_t hEnt)
-{
-	return (IClientUnknown*)LookupEntity(hEnt);
-}
-
-inline CUtlLinkedList<CClientEntityList::CPVSNotifyInfo, unsigned short>& CClientEntityList::GetPVSNotifiers()
-{
-	return m_PVSNotifyInfos;
-}
-
-
-inline ClientEntityHandle_t CClientEntityList::EntIndexToHandle(int entnum)
-{
-	if (entnum < -1)
-		return INVALID_EHANDLE_INDEX;
-	IClientUnknown* pUnk = GetListedEntity(entnum);
-	return pUnk ? pUnk->GetRefEHandle() : INVALID_EHANDLE_INDEX;
-}
-
-
-extern CClientEntityList* cl_entitylist;
-
-inline CClientEntityList& ClientEntityList()
-{
-	return *cl_entitylist;
-}
-
-class IClientEntityListener
-{
-public:
-	virtual void OnEntityCreated(C_BaseEntity* pEntity) {};
-	virtual void OnEntityDeleted(C_BaseEntity* pEntity) {};
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/clientleafsystem.h b/SpyCustom/clientleafsystem.h
deleted file mode 100644
index 998bef1..0000000
--- a/SpyCustom/clientleafsystem.h
+++ /dev/null
@@ -1,223 +0,0 @@
-#if !defined( CLIENTLEAFSYSTEM_H )
-#define CLIENTLEAFSYSTEM_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "IGameSystem.h"
-#include "IClientLeafSystem.h"
-#include "IVRenderView.h"
-#include "mempool.h"
-#include "refcount.h"
-
-#include "ivrenderview.h" 
-
-struct WorldListInfo_t;
-class IClientRenderable;
-class Vector;
-class CGameTrace;
-typedef CGameTrace trace_t;
-struct Ray_t;
-class Vector2D;
-class CStaticProp;
-
-
-
-
-
-enum
-{
-	DETAIL_PROP_RENDER_HANDLE = (ClientRenderHandle_t)0xfffe
-};
-
-
-struct DistanceFadeInfo_t
-{
-	float m_flMaxDistSqr;		       
-	float m_flMinDistSqr;		      
-	float m_flFalloffFactor;	       
-};
-
-
-class CClientRenderablesList : public CRefCounted<>
-{
-	DECLARE_FIXEDSIZE_ALLOCATOR(CClientRenderablesList);
-
-public:
-	enum
-	{
-		MAX_GROUP_ENTITIES = 4096,
-		MAX_BONE_SETUP_DEPENDENCY = 64,
-	};
-
-	struct CEntry
-	{
-		IClientRenderable* m_pRenderable;
-		unsigned short		m_iWorldListInfoLeaf;       
-		RenderableInstance_t m_InstanceData;
-		uint8				m_nModelType : 7;		  
-		uint8				m_TwoPass : 1;
-	};
-
-	DistanceFadeInfo_t	m_DetailFade;
-	CEntry				m_RenderGroups[RENDER_GROUP_COUNT][MAX_GROUP_ENTITIES];
-	int					m_RenderGroupCounts[RENDER_GROUP_COUNT];
-	int					m_nBoneSetupDependencyCount;
-	IClientRenderable* m_pBoneSetupDependency[MAX_BONE_SETUP_DEPENDENCY];
-};
-
-
-class CViewModelRenderablesList
-{
-public:
-	enum
-	{
-		VM_GROUP_OPAQUE = 0,
-		VM_GROUP_TRANSLUCENT,
-		VM_GROUP_COUNT,
-	};
-
-	struct CEntry
-	{
-		IClientRenderable* m_pRenderable;
-		RenderableInstance_t m_InstanceData;
-	};
-
-	typedef CUtlVectorFixedGrowable< CEntry, 32 > RenderGroups_t;
-
-	RenderGroups_t	m_RenderGroups[VM_GROUP_COUNT];
-};
-
-
-struct SetupRenderInfo_t
-{
-	WorldListInfo_t* m_pWorldListInfo;
-	CClientRenderablesList* m_pRenderList;
-	Vector m_vecRenderOrigin;
-	Vector m_vecRenderForward;
-	int m_nRenderFrame;
-	int m_nDetailBuildFrame;	      
-	float m_flRenderDistSq;
-	int m_nViewID;
-	bool m_bDrawDetailObjects : 1;
-	bool m_bDrawTranslucentObjects : 1;
-
-	SetupRenderInfo_t()
-	{
-		m_bDrawDetailObjects = true;
-		m_bDrawTranslucentObjects = true;
-	}
-};
-
-
-struct ScreenSizeComputeInfo_t
-{
-	VMatrix m_matViewProj;
-	Vector m_vecViewUp;
-	int m_nViewportHeight;
-};
-
-void ComputeScreenSizeInfo(ScreenSizeComputeInfo_t* pInfo);
-float ComputeScreenSize(const Vector& vecOrigin, float flRadius, const ScreenSizeComputeInfo_t& info);
-
-
-typedef unsigned short ClientLeafShadowHandle_t;
-enum
-{
-	CLIENT_LEAF_SHADOW_INVALID_HANDLE = (ClientLeafShadowHandle_t)~0
-};
-
-
-abstract_class IClientLeafShadowEnum
-{
-public:
-	virtual void EnumShadow(ClientShadowHandle_t userId) = 0;
-};
-
-
-class CClientLeafSubSystemData
-{
-public:
-	virtual ~CClientLeafSubSystemData(void)
-	{
-	}
-};
-
-
-#define CLSUBSYSTEM_DETAILOBJECTS 0
-#define N_CLSUBSYSTEMS 1
-
-
-
-abstract_class IClientLeafSystem : public IClientLeafSystemEngine, public IGameSystemPerFrame
-{
-public:
-	virtual void AddRenderable(IClientRenderable * pRenderable, bool bRenderWithViewModels, RenderableTranslucencyType_t nType, RenderableModelType_t nModelType, uint32 nSplitscreenEnabled = 0xFFFFFFFF) = 0;
-
-	virtual bool IsRenderableInPVS(IClientRenderable* pRenderable) = 0;
-
-	virtual void SetSubSystemDataInLeaf(int leaf, int nSubSystemIdx, CClientLeafSubSystemData* pData) = 0;
-	virtual CClientLeafSubSystemData* GetSubSystemDataInLeaf(int leaf, int nSubSystemIdx) = 0;
-
-	virtual void SetDetailObjectsInLeaf(int leaf, int firstDetailObject, int detailObjectCount) = 0;
-	virtual void GetDetailObjectsInLeaf(int leaf, int& firstDetailObject, int& detailObjectCount) = 0;
-
-	virtual void DrawDetailObjectsInLeaf(int leaf, int frameNumber, int& firstDetailObject, int& detailObjectCount) = 0;
-
-	virtual bool ShouldDrawDetailObjectsInLeaf(int leaf, int frameNumber) = 0;
-
-	virtual void RenderableChanged(ClientRenderHandle_t handle) = 0;
-
-	virtual void BuildRenderablesList(const SetupRenderInfo_t& info) = 0;
-
-	virtual void CollateViewModelRenderables(CViewModelRenderablesList* pList) = 0;
-
-	virtual void DrawStaticProps(bool enable) = 0;
-
-	virtual void DrawSmallEntities(bool enable) = 0;
-
-	virtual ClientLeafShadowHandle_t AddShadow(ClientShadowHandle_t userId, unsigned short flags) = 0;
-	virtual void RemoveShadow(ClientLeafShadowHandle_t h) = 0;
-
-	virtual void ProjectShadow(ClientLeafShadowHandle_t handle, int nLeafCount, const int* pLeafList) = 0;
-
-	virtual void ProjectFlashlight(ClientLeafShadowHandle_t handle, int nLeafCount, const int* pLeafList) = 0;
-
-	virtual void EnumerateShadowsInLeaves(int leafCount, WorldListLeafData_t* pLeaves, IClientLeafShadowEnum* pEnum) = 0;
-
-	virtual int GetRenderableLeaves(ClientRenderHandle_t handle, int leaves[128]) = 0;
-
-	virtual bool GetRenderableLeaf(ClientRenderHandle_t handle, int* pOutLeaf, const int* pInIterator = 0, int* pOutIterator = 0) = 0;
-
-	virtual void EnableAlternateSorting(ClientRenderHandle_t handle, bool bEnable) = 0;
-
-	virtual void RenderWithViewModels(ClientRenderHandle_t handle, bool bEnable) = 0;
-	virtual bool IsRenderingWithViewModels(ClientRenderHandle_t handle) const = 0;
-
-	virtual void SetTranslucencyType(ClientRenderHandle_t handle, RenderableTranslucencyType_t nType) = 0;
-	virtual RenderableTranslucencyType_t GetTranslucencyType(ClientRenderHandle_t handle) const = 0;
-	virtual void SetModelType(ClientRenderHandle_t handle, RenderableModelType_t nType = RENDERABLE_MODEL_UNKNOWN_TYPE) = 0;
-	virtual void EnableSplitscreenRendering(ClientRenderHandle_t handle, uint32 nFlags) = 0;
-
-	virtual void EnableRendering(ClientRenderHandle_t handle, bool bEnable) = 0;
-
-	virtual void EnableBloatedBounds(ClientRenderHandle_t handle, bool bEnable) = 0;
-
-	virtual void DisableCachedRenderBounds(ClientRenderHandle_t handle, bool bDisable) = 0;
-
-	virtual void RecomputeRenderableLeaves() = 0;
-
-	virtual void DisableLeafReinsertion(bool bDisable) = 0;
-
-	virtual RenderGroup_t GenerateRenderListEntry(IClientRenderable* pRenderable, CClientRenderablesList::CEntry& entryOut) = 0;
-};
-
-
-extern IClientLeafSystem* g_pClientLeafSystem;
-inline IClientLeafSystem* ClientLeafSystem()
-{
-	return g_pClientLeafSystem;
-}
-
-
-#endif	 
diff --git a/SpyCustom/cmodel.h b/SpyCustom/cmodel.h
deleted file mode 100644
index 564da94..0000000
--- a/SpyCustom/cmodel.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef CMODEL_H
-#define CMODEL_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "trace.h"
-#include "dbg.h"
-#include "basehandle.h"
-
-struct edict_t;
-struct model_t;
-
-#include "bspflags.h"
-#define	AREA_SOLID		1
-#define	AREA_TRIGGERS	2
-
-#include "vcollide.h"
-
-struct cmodel_t
-{
-	Vector		mins, maxs;
-	Vector		origin;		    
-	int			headnode;
-
-	vcollide_t	vcollisionData;
-};
-
-struct csurface_t
-{
-	const char* name;
-	short		surfaceProps;
-	unsigned short	flags;		               
-};
-
-struct Ray_t
-{
-	VectorAligned  m_Start;	      
-	VectorAligned  m_Delta;	      
-	VectorAligned  m_StartOffset;	          
-	VectorAligned  m_Extents;	         
-	const matrix3x4_t* m_pWorldAxisTransform;
-	bool	m_IsRay;	    
-	bool	m_IsSwept;	    
-
-	Ray_t() : m_pWorldAxisTransform(NULL) {}
-
-	void Init(Vector const& start, Vector const& end)
-	{
-		m_Delta = end - start;
-
-		m_IsSwept = (m_Delta.LengthSqr() != 0);
-
-		m_Extents.Init();
-
-		m_pWorldAxisTransform = NULL;
-		m_IsRay = true;
-
-		m_StartOffset.Init();
-		m_Start = start;
-	}
-
-	Vector InvDelta() const
-	{
-		Vector vecInvDelta;
-		for (int iAxis = 0; iAxis < 3; ++iAxis)
-		{
-			if (m_Delta[iAxis] != 0.0f)
-			{
-				vecInvDelta[iAxis] = 1.0f / m_Delta[iAxis];
-			}
-			else
-			{
-				vecInvDelta[iAxis] = FLT_MAX;
-			}
-		}
-		return vecInvDelta;
-	}
-
-private:
-};
-
-
-#endif  
-
-
-#include "gametrace.h"
\ No newline at end of file
diff --git a/SpyCustom/cod.wav b/SpyCustom/cod.wav
deleted file mode 100644
index 1ae4bda..0000000
Binary files a/SpyCustom/cod.wav and /dev/null differ
diff --git a/SpyCustom/collisionproperty.h b/SpyCustom/collisionproperty.h
deleted file mode 100644
index 0f92d26..0000000
--- a/SpyCustom/collisionproperty.h
+++ /dev/null
@@ -1,380 +0,0 @@
-#ifndef COLLISIONPROPERTY_H
-#define COLLISIONPROPERTY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "networkvar.h"
-#include "ICollideable.h"
-#include "vector.h"
-#include "ispatialpartition.h"
-
-
-class CBaseEntity;
-class IHandleEntity;
-class QAngle;
-class Vector;
-struct Ray_t;
-class IPhysicsObject;
-
-
-void UpdateDirtySpatialPartitionEntities();
-
-
-enum SurroundingBoundsType_t
-{
-	USE_OBB_COLLISION_BOUNDS = 0,
-	USE_BEST_COLLISION_BOUNDS,		       
-	USE_HITBOXES,
-	USE_SPECIFIED_BOUNDS,
-	USE_GAME_CODE,
-	USE_ROTATION_EXPANDED_BOUNDS,
-	USE_COLLISION_BOUNDS_NEVER_VPHYSICS,
-
-	SURROUNDING_TYPE_BIT_COUNT = 3
-};
-
-
-class CCollisionProperty : public ICollideable
-{
-	DECLARE_CLASS_NOBASE(CCollisionProperty);
-	DECLARE_EMBEDDED_NETWORKVAR();
-	DECLARE_PREDICTABLE();
-
-#ifdef GAME_DLL
-	DECLARE_DATADESC();
-#endif
-
-public:
-	CCollisionProperty();
-	~CCollisionProperty();
-
-	void Init(CBaseEntity* pEntity);
-
-	virtual IHandleEntity* GetEntityHandle();
-	virtual const Vector& OBBMinsPreScaled() const { return m_vecMinsPreScaled.Get(); }
-	virtual const Vector& OBBMaxsPreScaled() const { return m_vecMaxsPreScaled.Get(); }
-	virtual const Vector& OBBMins() const { return m_vecMins.Get(); }
-	virtual const Vector& OBBMaxs() const { return m_vecMaxs.Get(); }
-	virtual void			WorldSpaceTriggerBounds(Vector* pVecWorldMins, Vector* pVecWorldMaxs) const;
-	virtual bool			TestCollision(const Ray_t& ray, unsigned int fContentsMask, trace_t& tr);
-	virtual bool			TestHitboxes(const Ray_t& ray, unsigned int fContentsMask, trace_t& tr);
-	virtual int				GetCollisionModelIndex();
-	virtual const model_t* GetCollisionModel();
-	virtual const Vector& GetCollisionOrigin() const;
-	virtual const QAngle& GetCollisionAngles() const;
-	virtual const matrix3x4_t& CollisionToWorldTransform() const;
-	virtual SolidType_t		GetSolid() const;
-	virtual int				GetSolidFlags() const;
-	virtual IClientUnknown* GetIClientUnknown();
-	virtual int				GetCollisionGroup() const;
-	virtual void			WorldSpaceSurroundingBounds(Vector* pVecMins, Vector* pVecMaxs);
-	virtual bool			ShouldTouchTrigger(int triggerSolidFlags) const;
-	virtual const matrix3x4_t* GetRootParentToWorldTransform() const;
-
-public:
-	void			CreatePartitionHandle();
-	void			DestroyPartitionHandle();
-	unsigned short	GetPartitionHandle() const;
-
-	void			MarkPartitionHandleDirty();
-
-	void			SetCollisionBounds(const Vector& mins, const Vector& maxs);
-
-	void			RefreshScaledCollisionBounds(void);
-
-	void			UseTriggerBounds(bool bEnable, float flBloat = 0.0f);
-
-	void			SetSurroundingBoundsType(SurroundingBoundsType_t type, const Vector* pMins = NULL, const Vector* pMaxs = NULL);
-
-	void			SetSolid(SolidType_t val);
-
-	const Vector& OBBSize() const;
-
-	float			BoundingRadius() const;
-	float			BoundingRadius2D() const;
-
-	const Vector& OBBCenter() const;
-
-	const Vector& WorldSpaceCenter() const;
-
-	void			ClearSolidFlags(void);
-	void			RemoveSolidFlags(int flags);
-	void			AddSolidFlags(int flags);
-	bool			IsSolidFlagSet(int flagMask) const;
-	void		 	SetSolidFlags(int flags);
-	bool			IsSolid() const;
-
-	void			UpdatePartition();
-
-	bool			IsBoundsDefinedInEntitySpace() const;
-
-	const Vector& CollisionToWorldSpace(const Vector& in, Vector* pResult) const;
-
-	const Vector& WorldToCollisionSpace(const Vector& in, Vector* pResult) const;
-
-	const Vector& WorldDirectionToCollisionSpace(const Vector& in, Vector* pResult) const;
-
-	void			RandomPointInBounds(const Vector& vecNormalizedMins, const Vector& vecNormalizedMaxs, Vector* pPoint) const;
-
-	bool			IsPointInBounds(const Vector& vecWorldPt) const;
-
-	void			WorldSpaceAABB(Vector* pWorldMins, Vector* pWorldMaxs) const;
-
-	const Vector& CollisionSpaceMins(void) const;
-
-	const Vector& CollisionSpaceMaxs(void) const;
-
-	const Vector& NormalizedToCollisionSpace(const Vector& in, Vector* pResult) const;
-
-	const Vector& NormalizedToWorldSpace(const Vector& in, Vector* pResult) const;
-
-	const Vector& WorldToNormalizedSpace(const Vector& in, Vector* pResult) const;
-
-	const Vector& CollisionToNormalizedSpace(const Vector& in, Vector* pResult) const;
-
-	void			CalcNearestPoint(const Vector& vecWorldPt, Vector* pVecNearestWorldPt) const;
-
-	float			CalcDistanceFromPoint(const Vector& vecWorldPt) const;
-
-	bool			DoesRotationInvalidateSurroundingBox() const;
-
-	bool			DoesVPhysicsInvalidateSurroundingBox() const;
-
-	void			MarkSurroundingBoundsDirty();
-
-	float			ComputeSupportMap(const Vector& vecDirection) const;
-
-private:
-	void CollisionAABBToWorldAABB(const Vector& entityMins, const Vector& entityMaxs, Vector* pWorldMins, Vector* pWorldMaxs) const;
-
-	void ComputeVPhysicsSurroundingBox(Vector* pVecWorldMins, Vector* pVecWorldMaxs);
-
-	bool ComputeHitboxSurroundingBox(Vector* pVecWorldMins, Vector* pVecWorldMaxs);
-	bool ComputeEntitySpaceHitboxSurroundingBox(Vector* pVecWorldMins, Vector* pVecWorldMaxs);
-
-	void ComputeCollisionSurroundingBox(bool bUseVPhysics, Vector* pVecWorldMins, Vector* pVecWorldMaxs);
-
-	void ComputeRotationExpandedBounds(Vector* pVecWorldMins, Vector* pVecWorldMaxs);
-
-	void ComputeSurroundingBox(Vector* pVecWorldMins, Vector* pVecWorldMaxs);
-
-	void CheckForUntouch();
-
-	void UpdateServerPartitionMask();
-
-	CBaseEntity* GetOuter();
-	const CBaseEntity* GetOuter() const;
-
-private:
-	CBaseEntity* m_pOuter;
-
-	CNetworkVector(m_vecMinsPreScaled);
-	CNetworkVector(m_vecMaxsPreScaled);
-	CNetworkVector(m_vecMins);
-	CNetworkVector(m_vecMaxs);
-	float m_flRadius;
-
-	CNetworkVar(unsigned short, m_usSolidFlags);
-
-	SpatialPartitionHandle_t m_Partition;
-	CNetworkVar(unsigned char, m_nSurroundType);
-
-	CNetworkVar(unsigned char, m_nSolidType);
-	CNetworkVar(unsigned char, m_triggerBloat);
-
-	CNetworkVector(m_vecSpecifiedSurroundingMinsPreScaled);
-	CNetworkVector(m_vecSpecifiedSurroundingMaxsPreScaled);
-	CNetworkVector(m_vecSpecifiedSurroundingMins);
-	CNetworkVector(m_vecSpecifiedSurroundingMaxs);
-
-#if 0
-	short	m_surroundingMins[3];
-	short	m_surroundingMaxs[3];
-#else
-	Vector	m_vecSurroundingMins;
-	Vector	m_vecSurroundingMaxs;
-#endif
-
-	friend class CBaseEntity;
-};
-
-
-#ifdef CLIENT_DLL
-EXTERN_RECV_TABLE(DT_CollisionProperty);
-#else
-EXTERN_SEND_TABLE(DT_CollisionProperty);
-#endif
-
-
-inline CBaseEntity* CCollisionProperty::GetOuter()
-{
-	return m_pOuter;
-}
-
-inline const CBaseEntity* CCollisionProperty::GetOuter() const
-{
-	return m_pOuter;
-}
-
-
-inline unsigned short CCollisionProperty::GetPartitionHandle() const
-{
-	return m_Partition;
-}
-
-
-inline const Vector& CCollisionProperty::OBBSize() const
-{
-	Vector& temp = AllocTempVector();
-	VectorSubtract(m_vecMaxs, m_vecMins, temp);
-	return temp;
-}
-
-
-inline float CCollisionProperty::BoundingRadius() const
-{
-	return m_flRadius;
-}
-
-
-inline bool CCollisionProperty::IsBoundsDefinedInEntitySpace() const
-{
-	return ((m_usSolidFlags & FSOLID_FORCE_WORLD_ALIGNED) == 0) &&
-		(m_nSolidType != SOLID_BBOX) && (m_nSolidType != SOLID_NONE);
-}
-
-inline void CCollisionProperty::ClearSolidFlags(void)
-{
-	SetSolidFlags(0);
-}
-
-inline void CCollisionProperty::RemoveSolidFlags(int flags)
-{
-	SetSolidFlags(m_usSolidFlags & ~flags);
-}
-
-inline void CCollisionProperty::AddSolidFlags(int flags)
-{
-	SetSolidFlags(m_usSolidFlags | flags);
-}
-
-inline int CCollisionProperty::GetSolidFlags(void) const
-{
-	return m_usSolidFlags;
-}
-
-inline bool CCollisionProperty::IsSolidFlagSet(int flagMask) const
-{
-	return (m_usSolidFlags & flagMask) != 0;
-}
-
-inline bool CCollisionProperty::IsSolid() const
-{
-	return ::IsSolid((SolidType_t)(unsigned char)m_nSolidType, m_usSolidFlags);
-}
-
-
-inline const Vector& CCollisionProperty::OBBCenter() const
-{
-	Vector& vecResult = AllocTempVector();
-	VectorLerp(m_vecMins, m_vecMaxs, 0.5f, vecResult);
-	return vecResult;
-}
-
-
-inline const Vector& CCollisionProperty::WorldSpaceCenter() const
-{
-	Vector& vecResult = AllocTempVector();
-	CollisionToWorldSpace(OBBCenter(), &vecResult);
-	return vecResult;
-}
-
-
-inline const Vector& CCollisionProperty::CollisionToWorldSpace(const Vector& in, Vector* pResult) const
-{
-	if (!IsBoundsDefinedInEntitySpace() || (GetCollisionAngles() == vec3_angle))
-	{
-		VectorAdd(in, GetCollisionOrigin(), *pResult);
-	}
-	else
-	{
-		VectorTransform(in, CollisionToWorldTransform(), *pResult);
-	}
-	return *pResult;
-}
-
-
-inline const Vector& CCollisionProperty::WorldToCollisionSpace(const Vector& in, Vector* pResult) const
-{
-	if (!IsBoundsDefinedInEntitySpace() || (GetCollisionAngles() == vec3_angle))
-	{
-		VectorSubtract(in, GetCollisionOrigin(), *pResult);
-	}
-	else
-	{
-		VectorITransform(in, CollisionToWorldTransform(), *pResult);
-	}
-	return *pResult;
-}
-
-
-inline const Vector& CCollisionProperty::WorldDirectionToCollisionSpace(const Vector& in, Vector* pResult) const
-{
-	if (!IsBoundsDefinedInEntitySpace() || (GetCollisionAngles() == vec3_angle))
-	{
-		*pResult = in;
-	}
-	else
-	{
-		VectorIRotate(in, CollisionToWorldTransform(), *pResult);
-	}
-	return *pResult;
-}
-
-
-inline void CCollisionProperty::WorldSpaceAABB(Vector* pWorldMins, Vector* pWorldMaxs) const
-{
-	CollisionAABBToWorldAABB(m_vecMins, m_vecMaxs, pWorldMins, pWorldMaxs);
-}
-
-
-inline const Vector& CCollisionProperty::CollisionSpaceMins(void) const
-{
-	return m_vecMins;
-}
-
-inline const Vector& CCollisionProperty::CollisionSpaceMaxs(void) const
-{
-	return m_vecMaxs;
-}
-
-
-inline bool CCollisionProperty::DoesRotationInvalidateSurroundingBox() const
-{
-	if (IsSolidFlagSet(FSOLID_ROOT_PARENT_ALIGNED))
-		return true;
-
-	switch (m_nSurroundType)
-	{
-	case USE_COLLISION_BOUNDS_NEVER_VPHYSICS:
-	case USE_OBB_COLLISION_BOUNDS:
-	case USE_BEST_COLLISION_BOUNDS:
-		return IsBoundsDefinedInEntitySpace();
-
-	case USE_HITBOXES:
-	case USE_GAME_CODE:
-		return true;
-
-	case USE_ROTATION_EXPANDED_BOUNDS:
-	case USE_SPECIFIED_BOUNDS:
-		return false;
-
-	default:
-		Assert(0);
-		return true;
-	}
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/commonmacros.h b/SpyCustom/commonmacros.h
deleted file mode 100644
index 73ade7a..0000000
--- a/SpyCustom/commonmacros.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef COMMONMACROS_H
-#define COMMONMACROS_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define MAKEID(d,c,b,a)					( ((int)(a) << 24) | ((int)(b) << 16) | ((int)(c) << 8) | ((int)(d)) )
-
-#define STRING_MATCHES_ID( p, id )		( (*((int *)(p)) == (id) ) ? true : false )
-#define ID_TO_STRING( id, p )			( (p)[3] = (((id)>>24) & 0xFF), (p)[2] = (((id)>>16) & 0xFF), (p)[1] = (((id)>>8) & 0xFF), (p)[0] = (((id)>>0) & 0xFF) )
-
-#define SETBITS(iBitVector, bits)		((iBitVector) |= (bits))
-#define CLEARBITS(iBitVector, bits)		((iBitVector) &= ~(bits))
-#define FBitSet(iBitVector, bits)		((iBitVector) & (bits))
-
-template <typename T>
-inline bool IsPowerOfTwo(T value)
-{
-	return (value & (value - (T)1)) == (T)0;
-}
-
-#ifndef REFERENCE
-#define REFERENCE(arg) ((void)arg)
-#endif
-
-#define CONST_INTEGER_AS_STRING(x) #x             
-#define __HACK_LINE_AS_STRING__(x) CONST_INTEGER_AS_STRING(x)                   
-#define __LINE__AS_STRING __HACK_LINE_AS_STRING__(__LINE__)         
-
-#ifdef ARRAYSIZE
-#undef ARRAYSIZE
-#endif
-
-#define RTL_NUMBER_OF_V1(A) (sizeof(A)/sizeof((A)[0]))
-
-#if defined(__cplusplus) && \
-    !defined(MIDL_PASS) && \
-    !defined(RC_INVOKED) && \
-    (_MSC_FULL_VER >= 13009466) && \
-    !defined(SORTPP_PASS)
-
-#if !defined(UNALIGNED)
-#if defined(_M_IA64) || defined(_M_AMD64)
-#define UNALIGNED __unaligned
-#else
-#define UNALIGNED
-#endif
-#endif
-
-extern "C++"         
-template <typename T, size_t N>
-char(*RtlpNumberOf(UNALIGNED T(&)[N]))[N];
-
-#ifdef _PREFAST_
-#define RTL_NUMBER_OF_V2(A) (sizeof(*RtlpNumberOf(A))+0)
-#else
-#define RTL_NUMBER_OF_V2(A) (sizeof(*RtlpNumberOf(A)))
-#endif
-
-#else
-#define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A)
-#endif
-
-#define ARRAYSIZE(A)    RTL_NUMBER_OF_V2(A)
-#define _ARRAYSIZE(A)   RTL_NUMBER_OF_V1(A)
-
-#define Q_ARRAYSIZE(p)		ARRAYSIZE(p)
-
-template< typename IndexType, typename T, unsigned int N >
-IndexType ClampedArrayIndex(const T(&buffer)[N], IndexType index)
-{
-	NOTE_UNUSED(buffer);
-	return clamp(index, 0, (IndexType)N - 1);
-}
-
-template< typename T, unsigned int N >
-T ClampedArrayElement(const T(&buffer)[N], unsigned int uIndex)
-{
-	if (uIndex >= N)
-		uIndex = N - 1;
-	return buffer[uIndex];
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/compressed_light_cube.h b/SpyCustom/compressed_light_cube.h
deleted file mode 100644
index ef4f269..0000000
--- a/SpyCustom/compressed_light_cube.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef COMPRESSED_LIGHT_CUBE_H
-#define COMPRESSED_LIGHT_CUBE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "mathlib.h"
-
-
-struct CompressedLightCube
-{
-	DECLARE_BYTESWAP_DATADESC();
-	ColorRGBExp32 m_Color[6];
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/compressed_vector.h b/SpyCustom/compressed_vector.h
deleted file mode 100644
index 5823ba3..0000000
--- a/SpyCustom/compressed_vector.h
+++ /dev/null
@@ -1,519 +0,0 @@
-#ifndef COMPRESSED_VECTOR_H
-#define COMPRESSED_VECTOR_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <math.h>
-#include <float.h>
-
-#include "basetypes.h"
-
-#include <stdlib.h>
-
-#include "dbg.h"
-#include "vector.h"
-
-#include "mathlib.h"
-
-#if defined( _X360 )
-#pragma bitfield_order( push, lsb_to_msb )
-#endif
-class Vector32
-{
-public:
-	Vector32(void);
-	Vector32(vec_t X, vec_t Y, vec_t Z);
-
-	Vector32& operator=(const Vector& vOther);
-	operator Vector ();
-
-private:
-	unsigned short x : 10;
-	unsigned short y : 10;
-	unsigned short z : 10;
-	unsigned short exp : 2;
-};
-
-inline Vector32& Vector32::operator=(const Vector& vOther)
-{
-	CHECK_VALID(vOther);
-
-	static float expScale[4] = { 4.0f, 16.0f, 32.f, 64.f };
-
-	float fmax = Max(fabs(vOther.x), fabs(vOther.y));
-	fmax = Max(fmax, (float)fabs(vOther.z));
-
-	for (exp = 0; exp < 3; exp++)
-	{
-		if (fmax < expScale[exp])
-			break;
-	}
-	Assert(fmax < expScale[exp]);
-
-	float fexp = 512.0f / expScale[exp];
-
-	x = Clamp((int)(vOther.x * fexp) + 512, 0, 1023);
-	y = Clamp((int)(vOther.y * fexp) + 512, 0, 1023);
-	z = Clamp((int)(vOther.z * fexp) + 512, 0, 1023);
-	return *this;
-}
-
-
-inline Vector32::operator Vector ()
-{
-	Vector tmp;
-
-	static float expScale[4] = { 4.0f, 16.0f, 32.f, 64.f };
-
-	float fexp = expScale[exp] / 512.0f;
-
-	tmp.x = (((int)x) - 512) * fexp;
-	tmp.y = (((int)y) - 512) * fexp;
-	tmp.z = (((int)z) - 512) * fexp;
-	return tmp;
-}
-
-
-class Normal32
-{
-public:
-	Normal32(void);
-	Normal32(vec_t X, vec_t Y, vec_t Z);
-
-	Normal32& operator=(const Vector& vOther);
-	operator Vector ();
-
-private:
-	unsigned short x : 15;
-	unsigned short y : 15;
-	unsigned short zneg : 1;
-};
-
-
-inline Normal32& Normal32::operator=(const Vector& vOther)
-{
-	CHECK_VALID(vOther);
-
-	x = Clamp((int)(vOther.x * 16384) + 16384, 0, 32767);
-	y = Clamp((int)(vOther.y * 16384) + 16384, 0, 32767);
-	zneg = (vOther.z < 0);
-	return *this;
-}
-
-
-inline Normal32::operator Vector ()
-{
-	Vector tmp;
-
-	tmp.x = ((int)x - 16384) * (1 / 16384.0);
-	tmp.y = ((int)y - 16384) * (1 / 16384.0);
-	tmp.z = sqrt(1 - tmp.x * tmp.x - tmp.y * tmp.y);
-	if (zneg)
-		tmp.z = -tmp.z;
-	return tmp;
-}
-
-
-class Quaternion64
-{
-public:
-	Quaternion64(void);
-	Quaternion64(vec_t X, vec_t Y, vec_t Z);
-
-	Quaternion64& operator=(const Quaternion& vOther);
-	operator Quaternion ();
-private:
-	uint64 x : 21;
-	uint64 y : 21;
-	uint64 z : 21;
-	uint64 wneg : 1;
-};
-
-
-inline Quaternion64::operator Quaternion ()
-{
-	Quaternion tmp;
-
-	tmp.x = ((int)x - 1048576) * (1 / 1048576.5f);
-	tmp.y = ((int)y - 1048576) * (1 / 1048576.5f);
-	tmp.z = ((int)z - 1048576) * (1 / 1048576.5f);
-	tmp.w = sqrt(1 - tmp.x * tmp.x - tmp.y * tmp.y - tmp.z * tmp.z);
-	if (wneg)
-		tmp.w = -tmp.w;
-	return tmp;
-}
-
-inline Quaternion64& Quaternion64::operator=(const Quaternion& vOther)
-{
-	CHECK_VALID(vOther);
-
-	x = Clamp((int)(vOther.x * 1048576) + 1048576, 0, 2097151);
-	y = Clamp((int)(vOther.y * 1048576) + 1048576, 0, 2097151);
-	z = Clamp((int)(vOther.z * 1048576) + 1048576, 0, 2097151);
-	wneg = (vOther.w < 0);
-	return *this;
-}
-
-class Quaternion48
-{
-public:
-	Quaternion48(void);
-	Quaternion48(vec_t X, vec_t Y, vec_t Z);
-
-	Quaternion48& operator=(const Quaternion& vOther);
-	operator Quaternion ();
-private:
-	unsigned short x : 16;
-	unsigned short y : 16;
-	unsigned short z : 15;
-	unsigned short wneg : 1;
-};
-
-
-inline Quaternion48::operator Quaternion ()
-{
-	Quaternion tmp;
-
-	tmp.x = ((int)x - 32768) * (1 / 32768.0);
-	tmp.y = ((int)y - 32768) * (1 / 32768.0);
-	tmp.z = ((int)z - 16384) * (1 / 16384.0);
-	tmp.w = sqrt(1 - tmp.x * tmp.x - tmp.y * tmp.y - tmp.z * tmp.z);
-	if (wneg)
-		tmp.w = -tmp.w;
-	return tmp;
-}
-
-inline Quaternion48& Quaternion48::operator=(const Quaternion& vOther)
-{
-	CHECK_VALID(vOther);
-
-	x = Clamp((int)(vOther.x * 32768) + 32768, 0, 65535);
-	y = Clamp((int)(vOther.y * 32768) + 32768, 0, 65535);
-	z = Clamp((int)(vOther.z * 16384) + 16384, 0, 32767);
-	wneg = (vOther.w < 0);
-	return *this;
-}
-
-class Quaternion32
-{
-public:
-	Quaternion32(void);
-	Quaternion32(vec_t X, vec_t Y, vec_t Z);
-
-	Quaternion32& operator=(const Quaternion& vOther);
-	operator Quaternion ();
-private:
-	unsigned int x : 11;
-	unsigned int y : 10;
-	unsigned int z : 10;
-	unsigned int wneg : 1;
-};
-
-
-inline Quaternion32::operator Quaternion ()
-{
-	Quaternion tmp;
-
-	tmp.x = ((int)x - 1024) * (1 / 1024.0);
-	tmp.y = ((int)y - 512) * (1 / 512.0);
-	tmp.z = ((int)z - 512) * (1 / 512.0);
-	tmp.w = sqrt(1 - tmp.x * tmp.x - tmp.y * tmp.y - tmp.z * tmp.z);
-	if (wneg)
-		tmp.w = -tmp.w;
-	return tmp;
-}
-
-inline Quaternion32& Quaternion32::operator=(const Quaternion& vOther)
-{
-	CHECK_VALID(vOther);
-
-	x = Clamp((int)(vOther.x * 1024) + 1024, 0, 2047);
-	y = Clamp((int)(vOther.y * 512) + 512, 0, 1023);
-	z = Clamp((int)(vOther.z * 512) + 512, 0, 1023);
-	wneg = (vOther.w < 0);
-	return *this;
-}
-
-
-const int float32bias = 127;
-const int float16bias = 15;
-
-const float maxfloat16bits = 65504.0f;
-
-class float16
-{
-public:
-	void Init() { m_storage.rawWord = 0; }
-	unsigned short GetBits() const
-	{
-		return m_storage.rawWord;
-	}
-	float GetFloat() const
-	{
-		return Convert16bitFloatTo32bits(m_storage.rawWord);
-	}
-	void SetFloat(float in)
-	{
-		m_storage.rawWord = ConvertFloatTo16bits(in);
-	}
-
-	bool IsInfinity() const
-	{
-		return m_storage.bits.biased_exponent == 31 && m_storage.bits.mantissa == 0;
-	}
-	bool IsNaN() const
-	{
-		return m_storage.bits.biased_exponent == 31 && m_storage.bits.mantissa != 0;
-	}
-
-	bool operator==(const float16 other) const { return m_storage.rawWord == other.m_storage.rawWord; }
-	bool operator!=(const float16 other) const { return m_storage.rawWord != other.m_storage.rawWord; }
-
-protected:
-	union float32bits
-	{
-		float rawFloat;
-		struct
-		{
-			unsigned int mantissa : 23;
-			unsigned int biased_exponent : 8;
-			unsigned int sign : 1;
-		} bits;
-	};
-
-	union float16bits
-	{
-		unsigned short rawWord;
-		struct
-		{
-			unsigned short mantissa : 10;
-			unsigned short biased_exponent : 5;
-			unsigned short sign : 1;
-		} bits;
-	};
-
-	static bool IsNaN(float16bits in)
-	{
-		return in.bits.biased_exponent == 31 && in.bits.mantissa != 0;
-	}
-	static bool IsInfinity(float16bits in)
-	{
-		return in.bits.biased_exponent == 31 && in.bits.mantissa == 0;
-	}
-
-	static unsigned short ConvertFloatTo16bits(float input)
-	{
-		if (input > maxfloat16bits)
-			input = maxfloat16bits;
-		else if (input < -maxfloat16bits)
-			input = -maxfloat16bits;
-
-		float16bits output;
-		float32bits inFloat;
-
-		inFloat.rawFloat = input;
-
-		output.bits.sign = inFloat.bits.sign;
-
-		if ((inFloat.bits.biased_exponent == 0) && (inFloat.bits.mantissa == 0))
-		{
-			output.bits.mantissa = 0;
-			output.bits.biased_exponent = 0;
-		}
-		else if ((inFloat.bits.biased_exponent == 0) && (inFloat.bits.mantissa != 0))
-		{
-			output.bits.mantissa = 0;
-			output.bits.biased_exponent = 0;
-		}
-		else if ((inFloat.bits.biased_exponent == 0xff) && (inFloat.bits.mantissa == 0))
-		{
-#if 0
-			output.bits.mantissa = 0;
-			output.bits.biased_exponent = 31;
-#else
-			output.bits.mantissa = 0x3ff;
-			output.bits.biased_exponent = 0x1e;
-#endif
-		}
-		else if ((inFloat.bits.biased_exponent == 0xff) && (inFloat.bits.mantissa != 0))
-		{
-#if 0
-			output.bits.mantissa = 1;
-			output.bits.biased_exponent = 31;
-#else
-			output.bits.mantissa = 0;
-			output.bits.biased_exponent = 0;
-#endif
-		}
-		else
-		{
-			int new_exp = inFloat.bits.biased_exponent - 127;
-
-			if (new_exp < -24)
-			{
-				output.bits.mantissa = 0;
-				output.bits.biased_exponent = 0;
-			}
-
-			if (new_exp < -14)
-			{
-				output.bits.biased_exponent = 0;
-				unsigned int exp_val = (unsigned int)(-14 - (inFloat.bits.biased_exponent - float32bias));
-				if (exp_val > 0 && exp_val < 11)
-				{
-					output.bits.mantissa = (1 << (10 - exp_val)) + (inFloat.bits.mantissa >> (13 + exp_val));
-				}
-			}
-			else if (new_exp > 15)
-			{
-#if 0
-				output.bits.mantissa = 0;
-				output.bits.biased_exponent = 31;
-#else
-				output.bits.mantissa = 0x3ff;
-				output.bits.biased_exponent = 0x1e;
-#endif
-			}
-			else
-			{
-				output.bits.biased_exponent = new_exp + 15;
-				output.bits.mantissa = (inFloat.bits.mantissa >> 13);
-			}
-		}
-		return output.rawWord;
-	}
-
-	static float Convert16bitFloatTo32bits(unsigned short input)
-	{
-		float32bits output;
-		const float16bits& inFloat = *((float16bits*)&input);
-
-		if (IsInfinity(inFloat))
-		{
-			return maxfloat16bits * ((inFloat.bits.sign == 1) ? -1.0f : 1.0f);
-		}
-		if (IsNaN(inFloat))
-		{
-			return 0.0;
-		}
-		if (inFloat.bits.biased_exponent == 0 && inFloat.bits.mantissa != 0)
-		{
-			const float half_denorm = (1.0f / 16384.0f);  
-			float mantissa = ((float)(inFloat.bits.mantissa)) / 1024.0f;
-			float sgn = (inFloat.bits.sign) ? -1.0f : 1.0f;
-			output.rawFloat = sgn * mantissa * half_denorm;
-		}
-		else
-		{
-			unsigned mantissa = inFloat.bits.mantissa;
-			unsigned biased_exponent = inFloat.bits.biased_exponent;
-			unsigned sign = ((unsigned)inFloat.bits.sign) << 31;
-			biased_exponent = ((biased_exponent - float16bias + float32bias) * (biased_exponent != 0)) << 23;
-			mantissa <<= (23 - 10);
-
-			*((unsigned*)&output) = (mantissa | biased_exponent | sign);
-		}
-
-		return output.rawFloat;
-	}
-
-
-	float16bits m_storage;
-};
-
-class float16_with_assign : public float16
-{
-public:
-	float16_with_assign() {}
-	float16_with_assign(float f) { m_storage.rawWord = ConvertFloatTo16bits(f); }
-
-	float16& operator=(const float16& other) { m_storage.rawWord = ((float16_with_assign&)other).m_storage.rawWord; return *this; }
-	float16& operator=(const float& other) { m_storage.rawWord = ConvertFloatTo16bits(other); return *this; }
-	operator float() const { return Convert16bitFloatTo32bits(m_storage.rawWord); }
-};
-
-class Vector48
-{
-public:
-	Vector48(void) {}
-	Vector48(vec_t X, vec_t Y, vec_t Z) { x.SetFloat(X); y.SetFloat(Y); z.SetFloat(Z); }
-
-	Vector48& operator=(const Vector& vOther);
-	operator Vector ();
-
-	const float operator[](int i) const { return (((float16*)this)[i]).GetFloat(); }
-
-	float16 x;
-	float16 y;
-	float16 z;
-};
-
-inline Vector48& Vector48::operator=(const Vector& vOther)
-{
-	CHECK_VALID(vOther);
-
-	x.SetFloat(vOther.x);
-	y.SetFloat(vOther.y);
-	z.SetFloat(vOther.z);
-	return *this;
-}
-
-
-inline Vector48::operator Vector ()
-{
-	Vector tmp;
-
-	tmp.x = x.GetFloat();
-	tmp.y = y.GetFloat();
-	tmp.z = z.GetFloat();
-
-	return tmp;
-}
-
-class Vector2d32
-{
-public:
-	Vector2d32(void) {}
-	Vector2d32(vec_t X, vec_t Y) { x.SetFloat(X); y.SetFloat(Y); }
-
-	Vector2d32& operator=(const Vector& vOther);
-	Vector2d32& operator=(const Vector2D& vOther);
-
-	operator Vector2D ();
-
-	void Init(vec_t ix = 0.f, vec_t iy = 0.f);
-
-	float16_with_assign x;
-	float16_with_assign y;
-};
-
-inline Vector2d32& Vector2d32::operator=(const Vector2D& vOther)
-{
-	x.SetFloat(vOther.x);
-	y.SetFloat(vOther.y);
-	return *this;
-}
-
-inline Vector2d32::operator Vector2D ()
-{
-	Vector2D tmp;
-
-	tmp.x = x.GetFloat();
-	tmp.y = y.GetFloat();
-
-	return tmp;
-}
-
-inline void Vector2d32::Init(vec_t ix, vec_t iy)
-{
-	x.SetFloat(ix);
-	y.SetFloat(iy);
-}
-
-#if defined( _X360 )
-#pragma bitfield_order( pop )
-#endif
-
-#endif
diff --git a/SpyCustom/const.h b/SpyCustom/const.h
deleted file mode 100644
index 80cb384..0000000
--- a/SpyCustom/const.h
+++ /dev/null
@@ -1,364 +0,0 @@
-#ifndef CONST_H
-#define CONST_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define STEAM_PARM					"-steam"
-#define AUTO_RESTART "-autoupdate"
-
-#define INVALID_STEAM_TICKET "Invalid STEAM UserID Ticket\n"
-#define INVALID_STEAM_VACBANSTATE "VAC banned from secure server\n"
-#define INVALID_STEAM_LOGGED_IN_ELSEWHERE "This Steam account is being used in another location\n"
-#define INVALID_STEAM_LOGON_NOT_CONNECTED "Client not connected to Steam\n"
-#define INVALID_STEAM_LOGON_TICKET_CANCELED "Client left game (Steam auth ticket has been canceled)\n"
-
-#define CLIENTNAME_TIMED_OUT "%s timed out"
-
-#define DEFAULT_TICK_INTERVAL	(0.015)				     
-#define MINIMUM_TICK_INTERVAL   (0.001)
-#define MAXIMUM_TICK_INTERVAL	(0.1)
-
-#define ABSOLUTE_PLAYER_LIMIT 255              
-#define ABSOLUTE_PLAYER_LIMIT_DW	( (ABSOLUTE_PLAYER_LIMIT/32) + 1 )
-
-#define MAX_PLAYER_NAME_LENGTH		32
-
-#ifdef _X360
-#define MAX_PLAYERS_PER_CLIENT		XUSER_MAX_COUNT	       
-#else
-#define MAX_PLAYERS_PER_CLIENT		1	    
-#endif
-
-#define MAX_MAP_NAME				96
-
-#define MAX_MAP_NAME_SAVE			32
-
-#define MAX_DISPLAY_MAP_NAME		32
-
-#define	MAX_NETWORKID_LENGTH		64          
-
-#define SP_MODEL_INDEX_BITS			13
-
-#define	MAX_EDICT_BITS				11			        
-#define	MAX_EDICTS					(1<<MAX_EDICT_BITS)
-
-#define MAX_SERVER_CLASS_BITS		9
-#define MAX_SERVER_CLASSES			(1<<MAX_SERVER_CLASS_BITS)
-
-#define SIGNED_GUID_LEN 32            
-
-#define NUM_ENT_ENTRY_BITS		(MAX_EDICT_BITS + 1)
-#define NUM_ENT_ENTRIES			(1 << NUM_ENT_ENTRY_BITS)
-#define ENT_ENTRY_MASK			(NUM_ENT_ENTRIES - 1)
-#define INVALID_EHANDLE_INDEX	0xFFFFFFFF
-
-#define NUM_SERIAL_NUM_BITS		(32 - NUM_ENT_ENTRY_BITS)
-
-
-#define NUM_NETWORKED_EHANDLE_SERIAL_NUMBER_BITS	10
-#define NUM_NETWORKED_EHANDLE_BITS					(MAX_EDICT_BITS + NUM_NETWORKED_EHANDLE_SERIAL_NUMBER_BITS)
-#define INVALID_NETWORKED_EHANDLE_VALUE				((1 << NUM_NETWORKED_EHANDLE_BITS) - 1)
-
-#define MAX_PACKEDENTITY_DATA	(16384)
-
-#define MAX_PACKEDENTITY_PROPS	(4096)
-
-#define MAX_CUSTOM_FILES		4		   
-#define MAX_CUSTOM_FILE_SIZE	524288	   
-
-#if !defined( HL2MP ) && ( defined( PORTAL ) || defined( HL2_EPISODIC ) || defined ( HL2_DLL ) || defined( HL2_LOSTCOAST ) )
-#define	FL_ONGROUND				(1<<0)	      
-#define FL_DUCKING				(1<<1)	       
-#define	FL_WATERJUMP			(1<<2)	     
-#define FL_ONTRAIN				(1<<3)                
-#define FL_INRAIN				(1<<4)	       
-#define FL_FROZEN				(1<<5)        
-#define FL_ATCONTROLS			(1<<6)            
-#define	FL_CLIENT				(1<<7)	   
-#define FL_FAKECLIENT			(1<<8)	           
-#define	FL_INWATER				(1<<9)	  
-
-#define PLAYER_FLAG_BITS		10
-
-#define	FL_FLY					(1<<10)	           
-#define	FL_SWIM					(1<<11)	               
-#define	FL_CONVEYOR				(1<<12)
-#define	FL_NPC					(1<<13)
-#define	FL_GODMODE				(1<<14)
-#define	FL_NOTARGET				(1<<15)
-#define	FL_AIMTARGET			(1<<16)	          
-#define	FL_PARTIALGROUND		(1<<17)	     
-#define FL_STATICPROP			(1<<18)	   		
-#define FL_GRAPHED				(1<<19)            
-#define FL_GRENADE				(1<<20)
-#define FL_STEPMOVEMENT			(1<<21)	         
-#define FL_DONTTOUCH			(1<<22)	                
-#define FL_BASEVELOCITY			(1<<23)	              
-#define FL_WORLDBRUSH			(1<<24)	                  
-#define FL_OBJECT				(1<<25)              
-#define FL_KILLME				(1<<26)	             
-#define FL_ONFIRE				(1<<27)	  
-#define FL_DISSOLVING			(1<<28)   
-#define FL_TRANSRAGDOLL			(1<<29)           
-#define FL_UNBLOCKABLE_BY_PLAYER (1<<30)         
-#else
-#define	FL_ONGROUND				(1<<0)	      
-#define FL_DUCKING				(1<<1)	       
-#define FL_ANIMDUCKING			(1<<2)	                 
-#define	FL_WATERJUMP			(1<<3)	     
-#define FL_ONTRAIN				(1<<4)                
-#define FL_INRAIN				(1<<5)	       
-#define FL_FROZEN				(1<<6)        
-#define FL_ATCONTROLS			(1<<7)            
-#define	FL_CLIENT				(1<<8)	   
-#define FL_FAKECLIENT			(1<<9)	           
-#define	FL_INWATER				(1<<10)	  
-
-#define PLAYER_FLAG_BITS		11
-
-#define	FL_FLY					(1<<11)	           
-#define	FL_SWIM					(1<<12)	               
-#define	FL_CONVEYOR				(1<<13)
-#define	FL_NPC					(1<<14)
-#define	FL_GODMODE				(1<<15)
-#define	FL_NOTARGET				(1<<16)
-#define	FL_AIMTARGET			(1<<17)	          
-#define	FL_PARTIALGROUND		(1<<18)	     
-#define FL_STATICPROP			(1<<19)	   		
-#define FL_GRAPHED				(1<<20)            
-#define FL_GRENADE				(1<<21)
-#define FL_STEPMOVEMENT			(1<<22)	         
-#define FL_DONTTOUCH			(1<<23)	                
-#define FL_BASEVELOCITY			(1<<24)	              
-#define FL_WORLDBRUSH			(1<<25)	                  
-#define FL_OBJECT				(1<<26)              
-#define FL_KILLME				(1<<27)	             
-#define FL_ONFIRE				(1<<28)	  
-#define FL_DISSOLVING			(1<<29)   
-#define FL_TRANSRAGDOLL			(1<<30)           
-#define FL_UNBLOCKABLE_BY_PLAYER (1<<31)         
-#endif
-
-enum MoveType_t
-{
-	MOVETYPE_NONE = 0,	  
-	MOVETYPE_ISOMETRIC,			        
-	MOVETYPE_WALK,				       
-	MOVETYPE_STEP,				        
-	MOVETYPE_FLY,				       
-	MOVETYPE_FLYGRAVITY,		         
-	MOVETYPE_VPHYSICS,			    
-	MOVETYPE_PUSH,				       
-	MOVETYPE_NOCLIP,			       
-	MOVETYPE_LADDER,			         
-	MOVETYPE_OBSERVER,			       
-	MOVETYPE_CUSTOM,			        
-
-	MOVETYPE_LAST = MOVETYPE_CUSTOM,
-
-	MOVETYPE_MAX_BITS = 4
-};
-
-enum MoveCollide_t
-{
-	MOVECOLLIDE_DEFAULT = 0,
-
-	MOVECOLLIDE_FLY_BOUNCE,	              
-	MOVECOLLIDE_FLY_CUSTOM,	        
-	MOVECOLLIDE_FLY_SLIDE,            
-
-	MOVECOLLIDE_COUNT,		    
-
-	MOVECOLLIDE_MAX_BITS = 3
-};
-
-enum SolidType_t
-{
-	SOLID_NONE = 0,	   
-	SOLID_BSP = 1,	   
-	SOLID_BBOX = 2,	  
-	SOLID_OBB = 3,	     
-	SOLID_OBB_YAW = 4,	         
-	SOLID_CUSTOM = 5,	       
-	SOLID_VPHYSICS = 6,	            
-	SOLID_LAST,
-};
-
-enum SolidFlags_t
-{
-	FSOLID_CUSTOMRAYTEST = 0x0001,	            
-	FSOLID_CUSTOMBOXTEST = 0x0002,	             
-	FSOLID_NOT_SOLID = 0x0004,	     
-	FSOLID_TRIGGER = 0x0008,	          
-											FSOLID_NOT_STANDABLE = 0x0010,	     
-											FSOLID_VOLUME_CONTENTS = 0x0020,	     
-											FSOLID_FORCE_WORLD_ALIGNED = 0x0040,	             
-											FSOLID_USE_TRIGGER_BOUNDS = 0x0080,	          
-											FSOLID_ROOT_PARENT_ALIGNED = 0x0100,	         
-											FSOLID_TRIGGER_TOUCH_DEBRIS = 0x0200,	      
-
-											FSOLID_MAX_BITS = 10
-};
-
-inline bool IsSolid(SolidType_t solidType, int nSolidFlags)
-{
-	return (solidType != SOLID_NONE) && ((nSolidFlags & FSOLID_NOT_SOLID) == 0);
-}
-
-
-#define	LIFE_ALIVE				0  
-#define	LIFE_DYING				1               
-#define	LIFE_DEAD				2    
-#define LIFE_RESPAWNABLE		3
-#define LIFE_DISCARDBODY		4
-
-enum
-{
-	EF_BONEMERGE = 0x001,	      
-	EF_BRIGHTLIGHT = 0x002,	     
-	EF_DIMLIGHT = 0x004,	  
-	EF_NOINTERP = 0x008,	     
-	EF_NOSHADOW = 0x010,	    
-	EF_NODRAW = 0x020,	   
-	EF_NORECEIVESHADOW = 0x040,	    
-	EF_BONEMERGE_FASTCULL = 0x080,	                
-										EF_ITEM_BLINK = 0x100,	         
-										EF_PARENT_ANIMATES = 0x200,	        
-										EF_MAX_BITS = 10
-};
-
-#define EF_PARITY_BITS	3
-#define EF_PARITY_MASK  ((1<<EF_PARITY_BITS)-1)
-
-#define EF_MUZZLEFLASH_BITS 2
-
-#define	PLAT_LOW_TRIGGER	1
-
-#define	SF_TRAIN_WAIT_RETRIGGER	1
-#define SF_TRAIN_PASSABLE		8		          
-
-#define FIXANGLE_NONE			0
-#define FIXANGLE_ABSOLUTE		1
-#define FIXANGLE_RELATIVE		2
-
-#define BREAK_GLASS		0x01
-#define BREAK_METAL		0x02
-#define BREAK_FLESH		0x04
-#define BREAK_WOOD		0x08
-
-#define BREAK_SMOKE		0x10
-#define BREAK_TRANS		0x20
-#define BREAK_CONCRETE	0x40
-
-#define BREAK_SLAVE		0x80
-
-#define BOUNCE_GLASS	BREAK_GLASS
-#define	BOUNCE_METAL	BREAK_METAL
-#define BOUNCE_FLESH	BREAK_FLESH
-#define BOUNCE_WOOD		BREAK_WOOD
-#define BOUNCE_SHRAP	0x10
-#define BOUNCE_SHELL	0x20
-#define	BOUNCE_CONCRETE BREAK_CONCRETE
-#define BOUNCE_SHOTSHELL 0x80
-
-#define TE_BOUNCE_NULL		0
-#define TE_BOUNCE_SHELL		1
-#define TE_BOUNCE_SHOTSHELL	2
-
-enum RenderMode_t
-{
-	kRenderNormal = 0,		 
-	kRenderTransColor,		 
-	kRenderTransTexture,	 
-	kRenderGlow,			            
-	kRenderTransAlpha,		 
-	kRenderTransAdd,		 
-	kRenderEnvironmental,	      
-	kRenderTransAddFrameBlend,           
-	kRenderTransAlphaAdd,	   
-	kRenderWorldGlow,		          
-	kRenderNone,			  
-
-	kRenderModeCount,		   
-};
-
-enum RenderFx_t
-{
-	kRenderFxNone = 0,
-	kRenderFxPulseSlow,
-	kRenderFxPulseFast,
-	kRenderFxPulseSlowWide,
-	kRenderFxPulseFastWide,
-	kRenderFxFadeSlow,
-	kRenderFxFadeFast,
-	kRenderFxSolidSlow,
-	kRenderFxSolidFast,
-	kRenderFxStrobeSlow,
-	kRenderFxStrobeFast,
-	kRenderFxStrobeFaster,
-	kRenderFxFlickerSlow,
-	kRenderFxFlickerFast,
-	kRenderFxNoDissipation,
-	kRenderFxDistort,			  
-	kRenderFxHologram,			    
-	kRenderFxExplode,			    
-	kRenderFxGlowShell,			  
-	kRenderFxClampMinScale,		         
-	kRenderFxEnvRain,			     
-	kRenderFxEnvSnow,			                            
-	kRenderFxSpotlight,			     
-	kRenderFxRagdoll,			          
-	kRenderFxPulseFastWider,
-	kRenderFxMax
-};
-
-enum Collision_Group_t
-{
-	COLLISION_GROUP_NONE = 0,
-	COLLISION_GROUP_DEBRIS,			        
-	COLLISION_GROUP_DEBRIS_TRIGGER,       
-	COLLISION_GROUP_INTERACTIVE_DEBRIS,	         
-	COLLISION_GROUP_INTERACTIVE,	        
-	COLLISION_GROUP_PLAYER,
-	COLLISION_GROUP_BREAKABLE_GLASS,
-	COLLISION_GROUP_VEHICLE,
-	COLLISION_GROUP_PLAYER_MOVEMENT,        
-										COLLISION_GROUP_NPC,			   
-										COLLISION_GROUP_IN_VEHICLE,		      
-										COLLISION_GROUP_WEAPON,			       
-										COLLISION_GROUP_VEHICLE_CLIP,	       
-										COLLISION_GROUP_PROJECTILE,		 
-										COLLISION_GROUP_DOOR_BLOCKER,	         
-										COLLISION_GROUP_PASSABLE_DOOR,	       
-										COLLISION_GROUP_DISSOLVING,		        
-										COLLISION_GROUP_PUSHAWAY,		         
-
-										COLLISION_GROUP_NPC_ACTOR,		        
-										COLLISION_GROUP_NPC_SCRIPTED,	            
-
-										LAST_SHARED_COLLISION_GROUP
-};
-
-#include "basetypes.h"
-
-#define SOUND_NORMAL_CLIP_DIST	1000.0f
-
-#define MAX_CONCURRENT_BUILDVIEWS 10
-#define MAX_AREA_STATE_BYTES		32
-#define MAX_AREA_PORTAL_STATE_BYTES 24
-
-#define MAX_USER_MSG_DATA 255
-#define MAX_ENTITY_MSG_DATA 255
-
-#define SOURCE_MT
-#ifdef SOURCE_MT
-class CThreadMutex;
-typedef CThreadMutex CSourceMutex;
-#else
-class CThreadNullMutex;
-typedef CThreadNullMutex CSourceMutex;
-#endif
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/convar.h b/SpyCustom/convar.h
deleted file mode 100644
index 51a118d..0000000
--- a/SpyCustom/convar.h
+++ /dev/null
@@ -1,541 +0,0 @@
-#ifndef CONVAR_H
-#define CONVAR_H
-
-#if _WIN32
-#pragma once
-#endif
-
-#include "dbg.h"
-#include "iconvar.h"
-#include "utlvector.h"
-#include "utlstring.h"
-#include "icvar.h"
-
-#ifdef _WIN32
-#define FORCEINLINE_CVAR FORCEINLINE
-#elif POSIX
-#define FORCEINLINE_CVAR inline
-#else
-#error "implement me"
-#endif
-
-typedef unsigned int       uint32_t;
-
-class ConVar;
-class CCommand;
-class ConCommand;
-class ConCommandBase;
-struct characterset_t;
-
-
-
-class IConCommandBaseAccessor
-{
-public:
-	virtual bool RegisterConCommandBase(ConCommandBase* pVar) = 0;
-};
-
-
-#if defined( _X360 ) && !defined( _RETAIL )
-void ConVar_PublishToVXConsole();
-#endif
-
-
-typedef void (*FnCommandCallbackVoid_t)(void);
-typedef void (*FnCommandCallback_t)(const CCommand& command);
-
-#define COMMAND_COMPLETION_MAXITEMS		64
-#define COMMAND_COMPLETION_ITEM_LENGTH	64
-
-typedef int  (*FnCommandCompletionCallback)(const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]);
-
-
-class ICommandCallback
-{
-public:
-	virtual void CommandCallback(const CCommand& command) = 0;
-};
-
-class ICommandCompletionCallback
-{
-public:
-	virtual int  CommandCompletionCallback(const char* pPartial, CUtlVector< CUtlString >& commands) = 0;
-};
-
-class ConCommandBase
-{
-	friend class CCvar;
-	friend class ConVar;
-	friend class ConCommand;
-	friend void ConVar_Register(int nCVarFlag, IConCommandBaseAccessor* pAccessor);
-	friend class CDefaultCvar;
-
-public:
-	ConCommandBase(void);
-	ConCommandBase(const char* pName, const char* pHelpString = 0,
-		int flags = 0);
-
-	virtual						~ConCommandBase(void);
-
-	virtual	bool				IsCommand(void) const;
-
-	virtual bool				IsFlagSet(int flag) const;
-	virtual void				AddFlags(int flags);
-	virtual void                RemoveFlags(int flags); 
-	virtual int                 GetFlags() const;
-	virtual const char* GetName(void) const;
-
-	virtual const char* GetHelpText(void) const;
-
-	const ConCommandBase* GetNext(void) const;
-	ConCommandBase* GetNext(void);
-
-	virtual bool				IsRegistered(void) const;
-
-	virtual CVarDLLIdentifier_t	GetDLLIdentifier() const;
-
-	virtual void				Create(const char* pName, const char* pHelpString = 0,
-		int flags = 0);
-
-	virtual void				Init();
-	void						Shutdown();
-
-	char* CopyString(const char* from);
-
-	ConCommandBase* m_pNext;
-
-	bool						m_bRegistered;
-
-	const char* m_pszName;
-	const char* m_pszHelpString;
-
-	int							m_nFlags;
-
-protected:
-	static ConCommandBase* s_pConCommandBases;
-
-	static IConCommandBaseAccessor* s_pAccessor;
-};
-
-
-class CCommand
-{
-public:
-	CCommand();
-	CCommand(int nArgC, const char** ppArgV);
-	bool Tokenize(const char* pCommand, characterset_t* pBreakSet = NULL);
-	void Reset();
-
-	int ArgC() const;
-	const char** ArgV() const;
-	const char* ArgS() const;					           
-	const char* GetCommandString() const;		          
-	const char* operator[](int nIndex) const;	   
-	const char* Arg(int nIndex) const;		   
-
-	const char* FindArg(const char* pName) const;
-	int FindArgInt(const char* pName, int nDefaultVal) const;
-
-	static int MaxCommandLength();
-	static characterset_t* DefaultBreakSet();
-
-private:
-	enum
-	{
-		COMMAND_MAX_ARGC = 64,
-		COMMAND_MAX_LENGTH = 512,
-	};
-
-	int		m_nArgc;
-	int		m_nArgv0Size;
-	char	m_pArgSBuffer[COMMAND_MAX_LENGTH];
-	char	m_pArgvBuffer[COMMAND_MAX_LENGTH];
-	const char* m_ppArgv[COMMAND_MAX_ARGC];
-};
-
-inline int CCommand::MaxCommandLength()
-{
-	return COMMAND_MAX_LENGTH - 1;
-}
-
-inline int CCommand::ArgC() const
-{
-	return m_nArgc;
-}
-
-inline const char** CCommand::ArgV() const
-{
-	return m_nArgc ? (const char**)m_ppArgv : NULL;
-}
-
-inline const char* CCommand::ArgS() const
-{
-	return m_nArgv0Size ? &m_pArgSBuffer[m_nArgv0Size] : "";
-}
-
-inline const char* CCommand::GetCommandString() const
-{
-	return m_nArgc ? m_pArgSBuffer : "";
-}
-
-inline const char* CCommand::Arg(int nIndex) const
-{
-	if (nIndex < 0 || nIndex >= m_nArgc)
-		return "";
-	return m_ppArgv[nIndex];
-}
-
-inline const char* CCommand::operator[](int nIndex) const
-{
-	return Arg(nIndex);
-}
-
-
-class ConCommand : public ConCommandBase
-{
-	friend class CCvar;
-
-public:
-	typedef ConCommandBase BaseClass;
-
-	ConCommand(const char* pName, FnCommandCallbackVoid_t callback,
-		const char* pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0);
-	ConCommand(const char* pName, FnCommandCallback_t callback,
-		const char* pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0);
-	ConCommand(const char* pName, ICommandCallback* pCallback,
-		const char* pHelpString = 0, int flags = 0, ICommandCompletionCallback* pCommandCompletionCallback = 0);
-
-	virtual ~ConCommand(void);
-
-	virtual	bool IsCommand(void) const;
-
-	virtual int AutoCompleteSuggest(const char* partial, CUtlVector< CUtlString >& commands);
-
-	virtual bool CanAutoComplete(void);
-
-	virtual void Dispatch(const CCommand& command);
-
-private:
-	union
-	{
-		FnCommandCallbackVoid_t m_fnCommandCallbackV1;
-		FnCommandCallback_t m_fnCommandCallback;
-		ICommandCallback* m_pCommandCallback;
-	};
-
-	union
-	{
-		FnCommandCompletionCallback	m_fnCompletionCallback;
-		ICommandCompletionCallback* m_pCommandCompletionCallback;
-	};
-
-	bool m_bHasCompletionCallback : 1;
-	bool m_bUsingNewCommandCallback : 1;
-	bool m_bUsingCommandCallbackInterface : 1;
-};
-
-
-class ConVar : public ConCommandBase, public IConVar
-{
-	friend class CCvar;
-	friend class ConVarRef;
-
-public:
-	typedef ConCommandBase BaseClass;
-
-	ConVar(const char* pName, const char* pDefaultValue, int flags = 0);
-
-	ConVar(const char* pName, const char* pDefaultValue, int flags,
-		const char* pHelpString);
-	ConVar(const char* pName, const char* pDefaultValue, int flags,
-		const char* pHelpString, bool bMin, float fMin, bool bMax, float fMax);
-	ConVar(const char* pName, const char* pDefaultValue, int flags,
-		const char* pHelpString, FnChangeCallback_t callback);
-	ConVar(const char* pName, const char* pDefaultValue, int flags,
-		const char* pHelpString, bool bMin, float fMin, bool bMax, float fMax,
-		FnChangeCallback_t callback);
-
-	virtual						~ConVar(void);
-	
-	virtual bool				IsFlagSet(int flag) const;
-	virtual const char* GetHelpText(void) const;
-	virtual bool				IsRegistered(void) const;
-	virtual const char* GetName(void) const;
-	virtual const char* GetBaseName(void) const; 
-	virtual int                 GetSplitScreenPlayerSlot() const; 
-	virtual void				AddFlags(int flags);
-	virtual int                 GetFlags() const;
-	virtual	bool				IsCommand(void) const;
-	
-	void InstallChangeCallback(FnChangeCallback_t callback, bool bInvoke = true);
-
-	void RemoveChangeCallback(FnChangeCallback_t callbackToRemove); 
-
-	int GetChangeCallbackCount() const { return m_pParent->m_fnChangeCallbacks.Count(); } 
-	FnChangeCallback_t GetChangeCallback(int slot) const { return m_pParent->m_fnChangeCallbacks[slot]; } 
-
-
-	FORCEINLINE_CVAR float			GetFloat(void) const;
-	FORCEINLINE_CVAR int			GetInt(void) const;
-	FORCEINLINE_CVAR Color          GetColor(void) const; 
-	FORCEINLINE_CVAR bool			GetBool() const { return !!GetInt(); }
-	FORCEINLINE_CVAR char const* GetString(void) const;
-
-	template <typename T> T Get(void) const;
-	template <typename T> T Get(T*) const;
-
-	virtual void				SetValue(const char* value);
-	virtual void				SetValue(float value);
-	virtual void				SetValue(int value);
-	virtual void                    SetValue(Color value); 
-
-	void						Revert(void);
-	bool                            HasMin() const; 
-	bool                            HasMax() const; 
-
-	struct CVValue_t
-	{
-		char* m_pszString;
-		int     m_StringLength;
-		float   m_fValue;
-		int     m_nValue;
-	};
-
-	bool						GetMin(float& minVal) const;
-	bool						GetMax(float& maxVal) const;
-	float                           GetMinValue() const; 
-	float                           GetMaxValue() const; 
-	const char* GetDefault(void) const;
-	FORCEINLINE_CVAR CVValue_t& GetRawValue()
-	{
-		return m_Value;
-	}
-	FORCEINLINE_CVAR const CVValue_t& GetRawValue() const
-	{
-		return m_Value;
-	}
-
-	bool                        InternalSetColorFromString(const char* value); 
-	virtual void				InternalSetValue(const char* value);
-	virtual void				InternalSetFloatValue(float fNewValue);
-	virtual void				InternalSetIntValue(int nValue);
-	virtual void                InternalSetColorValue(Color value);
-	virtual bool				ClampValue(float& value);
-	virtual void				ChangeStringValue(const char* tempVal, float flOldValue);
-
-	virtual void				Create(const char* pName, const char* pDefaultValue, int flags = 0,
-		const char* pHelpString = 0, bool bMin = false, float fMin = 0.0,
-		bool bMax = false, float fMax = false, FnChangeCallback_t callback = 0);
-
-	virtual void				Init();
-	int GetFlags() { return m_pParent->m_nFlags; }
-public:
-
-	ConVar* m_pParent;
-
-	const char* m_pszDefaultValue;
-
-	CVValue_t                   m_Value; 
-	bool						m_bHasMin;
-	float						m_fMinVal;
-	bool						m_bHasMax;
-	float						m_fMaxVal;
-
-	CUtlVector<FnChangeCallback_t> m_fnChangeCallbacks;
-};
-
-
-FORCEINLINE_CVAR float ConVar::GetFloat(void) const
-{
-	uint32_t xored = *(uint32_t*)&m_pParent->m_Value.m_fValue ^ (uint32_t)this;
-	return *(float*)&xored;
-}
-
-FORCEINLINE_CVAR int ConVar::GetInt(void) const
-{
-	return (int)(m_pParent->m_Value.m_nValue ^ (int)this);
-}
-
-
-FORCEINLINE_CVAR const char* ConVar::GetString(void) const
-{
-	if (m_nFlags & FCVAR_NEVER_AS_STRING)
-		return "FCVAR_NEVER_AS_STRING";
-	char const* str = m_pParent->m_Value.m_pszString;
-	return str ? str : "";
-}
-
-class ConVarRef
-{
-public:
-	ConVarRef(const char* pName);
-	ConVarRef(const char* pName, bool bIgnoreMissing);
-	ConVarRef(IConVar* pConVar);
-
-	void Init(const char* pName, bool bIgnoreMissing);
-	bool IsValid() const;
-	bool IsFlagSet(int nFlags) const;
-	IConVar* GetLinkedConVar();
-
-	float GetFloat(void) const;
-	int GetInt(void) const;
-	bool GetBool() const { return !!GetInt(); }
-	const char* GetString(void) const;
-
-	void SetValue(const char* pValue);
-	void SetValue(float flValue);
-	void SetValue(int nValue);
-	void SetValue(bool bValue);
-
-	const char* GetName() const;
-
-	const char* GetDefault() const;
-
-private:
-	IConVar* m_pConVar;
-	ConVar* m_pConVarState;
-};
-
-
-FORCEINLINE_CVAR bool ConVarRef::IsFlagSet(int nFlags) const
-{
-	return (m_pConVar->IsFlagSet(nFlags) != 0);
-}
-
-FORCEINLINE_CVAR IConVar* ConVarRef::GetLinkedConVar()
-{
-	return m_pConVar;
-}
-
-FORCEINLINE_CVAR const char* ConVarRef::GetName() const
-{
-	return m_pConVar->GetName();
-}
-
-FORCEINLINE_CVAR void ConVarRef::SetValue(const char* pValue)
-{
-	m_pConVar->SetValue(pValue);
-}
-
-FORCEINLINE_CVAR void ConVarRef::SetValue(float flValue)
-{
-	m_pConVar->SetValue(flValue);
-}
-
-FORCEINLINE_CVAR void ConVarRef::SetValue(int nValue)
-{
-	m_pConVar->SetValue(nValue);
-}
-
-FORCEINLINE_CVAR void ConVarRef::SetValue(bool bValue)
-{
-	m_pConVar->SetValue(bValue ? 1 : 0);
-}
-
-FORCEINLINE_CVAR const char* ConVarRef::GetDefault() const
-{
-	return m_pConVarState->m_pszDefaultValue;
-}
-
-
-void ConVar_Register(int nCVarFlag = 0, IConCommandBaseAccessor* pAccessor = NULL);
-void ConVar_Unregister();
-
-
-void ConVar_PrintFlags(const ConCommandBase* var);
-void ConVar_PrintDescription(const ConCommandBase* pVar);
-
-
-#pragma warning (disable : 4355 )
-
-template< class T >
-class CConCommandMemberAccessor : public ConCommand, public ICommandCallback, public ICommandCompletionCallback
-{
-	typedef ConCommand BaseClass;
-	typedef void (T::* FnMemberCommandCallback_t)(const CCommand& command);
-	typedef int  (T::* FnMemberCommandCompletionCallback_t)(const char* pPartial, CUtlVector< CUtlString >& commands);
-
-public:
-	CConCommandMemberAccessor(T* pOwner, const char* pName, FnMemberCommandCallback_t callback, const char* pHelpString = 0,
-		int flags = 0, FnMemberCommandCompletionCallback_t completionFunc = 0) :
-		BaseClass(pName, this, pHelpString, flags, (completionFunc != 0) ? this : NULL)
-	{
-		m_pOwner = pOwner;
-		m_Func = callback;
-		m_CompletionFunc = completionFunc;
-	}
-
-	~CConCommandMemberAccessor()
-	{
-		Shutdown();
-	}
-
-	void SetOwner(T* pOwner)
-	{
-		m_pOwner = pOwner;
-	}
-
-	virtual void CommandCallback(const CCommand& command)
-	{
-		Assert(m_pOwner && m_Func);
-		(m_pOwner->*m_Func)(command);
-	}
-
-	virtual int  CommandCompletionCallback(const char* pPartial, CUtlVector< CUtlString >& commands)
-	{
-		Assert(m_pOwner && m_CompletionFunc);
-		return (m_pOwner->*m_CompletionFunc)(pPartial, commands);
-	}
-
-private:
-	T* m_pOwner;
-	FnMemberCommandCallback_t m_Func;
-	FnMemberCommandCompletionCallback_t m_CompletionFunc;
-};
-
-#pragma warning ( default : 4355 )
-
-
-#define CON_COMMAND( name, description ) \
-   static void name( const CCommand &args ); \
-   static ConCommand name##_command( #name, name, description ); \
-   static void name( const CCommand &args )
-
-#define CON_COMMAND_F( name, description, flags ) \
-   static void name( const CCommand &args ); \
-   static ConCommand name##_command( #name, name, description, flags ); \
-   static void name( const CCommand &args )
-
-#define CON_COMMAND_F_COMPLETION( name, description, flags, completion ) \
-	static void name( const CCommand &args ); \
-	static ConCommand name##_command( #name, name, description, flags, completion ); \
-	static void name( const CCommand &args )
-
-#define CON_COMMAND_EXTERN( name, _funcname, description ) \
-	void _funcname( const CCommand &args ); \
-	static ConCommand name##_command( #name, _funcname, description ); \
-	void _funcname( const CCommand &args )
-
-#define CON_COMMAND_EXTERN_F( name, _funcname, description, flags ) \
-	void _funcname( const CCommand &args ); \
-	static ConCommand name##_command( #name, _funcname, description, flags ); \
-	void _funcname( const CCommand &args )
-
-#define CON_COMMAND_MEMBER_F( _thisclass, name, _funcname, description, flags ) \
-	void _funcname( const CCommand &args );						\
-	friend class CCommandMemberInitializer_##_funcname;			\
-	class CCommandMemberInitializer_##_funcname					\
-	{															\
-	public:														\
-		CCommandMemberInitializer_##_funcname() : m_ConCommandAccessor( NULL, name, &_thisclass::_funcname, description, flags )	\
-		{														\
-			m_ConCommandAccessor.SetOwner( GET_OUTER( _thisclass, m_##_funcname##_register ) );	\
-		}														\
-	private:													\
-		CConCommandMemberAccessor< _thisclass > m_ConCommandAccessor;	\
-	};															\
-																\
-	CCommandMemberInitializer_##_funcname m_##_funcname##_register;		\
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/crit.wav b/SpyCustom/crit.wav
deleted file mode 100644
index 4fadee0..0000000
Binary files a/SpyCustom/crit.wav and /dev/null differ
diff --git a/SpyCustom/cs_achievementdefs.h b/SpyCustom/cs_achievementdefs.h
deleted file mode 100644
index dd8ab1b..0000000
--- a/SpyCustom/cs_achievementdefs.h
+++ /dev/null
@@ -1,261 +0,0 @@
-#ifndef CS_ACHIEVEMENTDEFS_H
-#define CS_ACHIEVEMENTDEFS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-
-#define ALL_WEARING_SAME_UNIFORM_ACHIEVEMENT 0
-
-typedef enum
-{
-	CSInvalidAchievement = -1,
-
-	CSBombAchievementsStart = 1000,           
-
-	CSWinBombPlant,
-	CSWinBombDefuse,
-	CSDefuseAndNeededKit,
-	CSBombDefuseCloseCall,
-	CSKilledDefuser,
-	CSPlantBombWithin25Seconds,
-	CSKillBombPickup,
-	CSBombMultikill,
-	CSGooseChase,
-	CSWinBombPlantAfterRecovery,
-	CSDefuseDefense,
-	CSPlantBombsLow,
-	CSDefuseBombsLow,
-	CSPlantBombsTRLow,
-	CSDefuseBombsTRLow,
-
-	CSBombAchievementsEnd,                        
-
-
-	CSHostageAchievementsStart = 2000,         
-
-	CSRescueAllHostagesInARound,
-	CSKilledRescuer,
-	CSFastHostageRescue,
-	CSRescueHostagesLow,
-	CSRescueHostagesMid,
-
-	CSHostageAchievmentEnd,                       
-
-	CSKillAchievementsStart = 3000,            
-
-	CSEnemyKillsLow,
-	CSEnemyKillsMed,
-	CSEnemyKillsHigh,
-	CSSurvivedHeadshotDueToHelmet,
-	CSKillEnemyReloading,
-	CSKillingSpree,
-	CSKillsWithMultipleGuns,
-	CSHeadshots,
-	CSAvengeFriend,
-	CSSurviveGrenade,
-	CSDominationsLow,
-	CSDominationsHigh,
-	CSRevengesLow,
-	CSRevengesHigh,
-	CSDominationOverkillsLow,
-	CSDominationOverkillsHigh,
-	CSDominationOverkillsMatch,
-	CSExtendedDomination,
-	CSConcurrentDominations,
-	CSKillEnemyBlinded,
-	CSKillEnemiesWhileBlind,
-	CSKillEnemiesWhileBlindHard,
-	CSKillsEnemyWeapon,
-	CSKillWithEveryWeapon,
-	CSWinKnifeFightsLow,
-	CSWinKnifeFightsHigh,
-	CSKilledDefuserWithGrenade,
-	CSKillSniperWithSniper,
-	CSKillSniperWithKnife,
-	CSHipShot,
-	CSKillSnipers,
-	CSKillWhenAtLowHealth,
-	CSPistolRoundKnifeKill,
-	CSWinDualDuel,
-	CSGrenadeMultikill,
-	CSKillWhileInAir,
-	CSKillEnemyInAir,
-	CSKillerAndEnemyInAir,
-	CSKillEnemyWithFormerGun,
-	CSKillTwoWithOneShot,
-	CSProgressiveGameKills,
-	CSSelectGameKills,
-	CSBombGameKills,
-	CSGunGameKillKnifer,
-	CSGunGameKnifeSuicide,
-	CSGunGameKnifeKillKnifer,
-	CSGunGameSMGKillKnifer,
-	CSFirstBulletKills,
-	CSSpawnCamper,
-	CSBornReady,
-
-	CSKillAchievementEnd,                         
-
-	CSWeaponAchievementsStart = 4000,          
-
-	CSEnemyKillsDeagle,
-	CSEnemyKillsUSP,
-	CSEnemyKillsGlock,
-	CSEnemyKillsP228,
-	CSEnemyKillsElite,
-	CSEnemyKillsFiveSeven,
-	CSEnemyKillsBizon,
-	CSEnemyKillsTec9,
-	CSEnemyKillsTaser,
-	CSEnemyKillsHKP2000,
-	CSEnemyKillsP250,
-	CSEnemyKillsAWP,
-	CSEnemyKillsAK47,
-	CSEnemyKillsM4A1,
-	CSEnemyKillsAUG,
-	CSEnemyKillsSG552,
-	CSEnemyKillsSG550,
-	CSEnemyKillsGALIL,
-	CSEnemyKillsGALILAR,
-	CSEnemyKillsFAMAS,
-	CSEnemyKillsScout,
-	CSEnemyKillsG3SG1,
-	CSEnemyKillsSCAR17,
-	CSEnemyKillsSCAR20,
-	CSEnemyKillsSG556,
-	CSEnemyKillsSSG08,
-	CSEnemyKillsP90,
-	CSEnemyKillsMP5NAVY,
-	CSEnemyKillsTMP,
-	CSEnemyKillsMAC10,
-	CSEnemyKillsUMP45,
-	CSEnemyKillsMP7,
-	CSEnemyKillsMP9,
-	CSEnemyKillsM3,
-	CSEnemyKillsXM1014,
-	CSEnemyKillsMag7,
-	CSEnemyKillsSawedoff,
-	CSEnemyKillsNova,
-	CSEnemyKillsM249,
-	CSEnemyKillsNegev,
-	CSEnemyKillsKnife,
-	CSEnemyKillsHEGrenade,
-	CSEnemyKillsMolotov,
-	CSMetaPistol,
-	CSMetaRifle,
-	CSMetaSMG,
-	CSMetaShotgun,
-	CSMetaWeaponMaster,
-
-	CSWeaponAchievementsEnd,                      
-
-	CSGeneralAchievementsStart = 5000,         
-
-	CSWinRoundsLow,
-	CSWinRoundsMed,
-	CSWinRoundsHigh,
-	CSGGWinRoundsLow,
-	CSGGWinRoundsMed,
-	CSGGWinRoundsHigh,
-	CSGGWinRoundsExtreme,
-	CSGGWinRoundsUltimate,
-	CSGGRoundsLow,
-	CSGGRoundsMed,
-	CSGGRoundsHigh,
-	CSMoneyEarnedLow,
-	CSMoneyEarnedMed,
-	CSMoneyEarnedHigh,
-	CSGiveDamageLow,
-	CSGiveDamageMed,
-	CSGiveDamageHigh,
-	CSPosthumousGrenadeKill,
-	CSKillEnemyTeam,
-	CSLastPlayerAlive,
-	CSKillEnemyLastBullet,
-	CSKillingSpreeEnder,
-	CSDamageNoKill,
-	CSKillLowDamage,
-	CSSurviveManyAttacks,
-	CSLosslessExtermination,
-	CSFlawlessVictory,
-	CSDecalSprays,
-	CSBreakWindows,
-	CSBreakProps,
-	CSUnstoppableForce,
-	CSImmovableObject,
-	CSHeadshotsInRound,
-	CSWinPistolRoundsLow,
-	CSWinPistolRoundsMed,
-	CSWinPistolRoundsHigh,
-	CSFastRoundWin,
-	CSNightvisionDamage,
-	CSSilentWin,
-	CSBloodlessVictory,
-	CSDonateWeapons,
-	CSWinRoundsWithoutBuying,
-#if(ALL_WEARING_SAME_UNIFORM_ACHIEVEMENT)
-	CSSameUniform,
-#endif
-	CSFriendsSameUniform,
-	CSCauseFriendlyFireWithFlashbang,
-
-	CSGeneralAchievementsEnd,                     
-
-	CSWinMapAchievementsStart = 6000,
-
-	CSWinMapCS_ASSAULT,
-	CSWinMapCS_COMPOUND,
-	CSWinMapCS_HAVANA,
-	CSWinMapCS_ITALY,
-	CSWinMapCS_MILITIA,
-	CSWinMapCS_OFFICE,
-	CSWinMapDE_AZTEC,
-	CSWinMapDE_CBBLE,
-	CSWinMapDE_CHATEAU,
-	CSWinMapDE_DUST,
-	CSWinMapDE_DUST2,
-	CSWinMapDE_INFERNO,
-	CSWinMapDE_NUKE,
-	CSWinMapDE_PIRANESI,
-	CSWinMapDE_PORT,
-	CSWinMapDE_PRODIGY,
-	CSWinMapDE_TIDES,
-	CSWinMapDE_TRAIN,
-
-	CSWinMatchDE_SHORTTRAIN,
-	CSWinMatchDE_LAKE,
-	CSWinMatchDE_SAFEHOUSE,
-	CSWinMatchDE_SUGARCANE,
-	CSWinMatchDE_STMARC,
-	CSWinMatchDE_BANK,
-	CSWinMatchDE_EMBASSY,
-	CSWinMatchDE_DEPOT,
-	CSWinMatchDE_VERTIGO,
-	CSWinMatchDE_BALKAN,
-	CSWinMatchAR_MONASTERY,
-	CSWinMatchAR_SHOOTS,
-	CSWinMatchAR_BAGGAGE,
-	CSWinEveryGGMap,
-	CSPlayEveryGGMap,
-	CSGunGameProgressiveRampage,
-	CSGunGameFirstKill,
-	CSKillEnemyTerrTeamBeforeBombPlant,
-	CSKillEnemyCTTeamBeforeBombPlant,
-	CSGunGameConservationist,
-	CSStillAlive,
-	CSMedalist,
-
-	CSWinMapAchievementsEnd,                      
-
-	CSSeason1_Start = 6200,
-	CSSeason1_Bronze,
-	CSSeason1_Silver,
-	CSSeason1_Gold,
-	CSSeason1_End                      
-
-} eCSAchievementType;
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/cs_shareddefs.h b/SpyCustom/cs_shareddefs.h
deleted file mode 100644
index 7674dba..0000000
--- a/SpyCustom/cs_shareddefs.h
+++ /dev/null
@@ -1,391 +0,0 @@
-#ifndef CS_SHAREDDEFS_H
-#define CS_SHAREDDEFS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#if !defined (_GAMECONSOLE) && !defined( GC_DLL )
-#endif
-
-#include "cs_achievementdefs.h"
-
-#define PANEL_CHOOSE_CLASS			"choose_class"
-
-#define CSTRIKE_VISUALS_DATA_BYTES 96
-
-#define MAX_HOSTAGES				12
-#define MAX_HOSTAGE_RESCUES			4
-#define HOSTAGE_RULE_CAN_PICKUP		1
-
-#define MAX_MATCH_STATS_ROUNDS 30
-#define MATCH_STATS_TEAM_SWAP_ROUND	15
-
-#define IRONSIGHT     
-#define GRENADE_UNDERHAND_FEATURE_ENABLED     
-#define GRENADE_DEFAULT_SIZE 2.0
-
-#define CS_CONTROLLABLE_BOTS_ENABLED 1
-
-#if !defined( CSTRIKE_DEMO_PRESSBUILD )
-#define CSTRIKE_DEMO_PRESSBUILD		0
-#endif
-
-#if !defined( CSTRIKE_E3_BUILD )
-#define CSTRIKE_E3_BUILD		0
-#endif
-
-#define CSTRIKE_DEFAULT_AVATAR		"avatar_default_64"
-#define CSTRIKE_DEFAULT_T_AVATAR "avatar_default-t_64"
-#define CSTRIKE_DEFAULT_CT_AVATAR "avatar_default_64"
-extern const float CS_PLAYER_SPEED_RUN;
-extern const float CS_PLAYER_SPEED_VIP;
-extern const float CS_PLAYER_SPEED_SHIELD;
-extern const float CS_PLAYER_SPEED_STOPPED;
-extern const float CS_PLAYER_SPEED_HAS_HOSTAGE;
-extern const float CS_PLAYER_SPEED_OBSERVER;
-
-extern const float CS_PLAYER_SPEED_DUCK_MODIFIER;
-extern const float CS_PLAYER_SPEED_WALK_MODIFIER;
-extern const float CS_PLAYER_SPEED_CLIMB_MODIFIER;
-extern const float CS_PLAYER_HEAVYARMOR_FLINCH_MODIFIER;
-
-extern const float CS_PLAYER_DUCK_SPEED_IDEAL;
-
-#ifdef CSTRIKE15
-#ifdef CLIENT_DLL
-#define OLD_CROUCH_PROTOCOL_INDEX 13546
-inline bool IsPreCrouchUpdateDemo(void) { return (engine->IsHLTV() || engine->IsPlayingDemo()) && engine->GetConnectionDataProtocol() <= OLD_CROUCH_PROTOCOL_INDEX; }
-#endif
-#endif
-
-template< class T >
-class CUtlVectorInitialized : public CUtlVector< T >
-{
-public:
-	CUtlVectorInitialized(T* pMemory, int numElements) : CUtlVector< T >(pMemory, numElements)
-	{
-		CUtlVector< T >::SetSize(numElements);
-	}
-};
-
-namespace TeamJoinFailedReason
-{
-	enum Type
-	{
-		CHANGED_TOO_OFTEN,
-		BOTH_TEAMS_FULL,
-		TERRORISTS_FULL,
-		CTS_FULL,
-		CANT_JOIN_SPECTATOR,
-		HUMANS_CAN_ONLY_JOIN_TS,
-		HUMANS_CAN_ONLY_JOIN_CTS,
-		TOO_MANY_TS,
-		TOO_MANY_CTS,
-	};
-};
-
-#define CS_HOSTAGE_TRANSTIME_PICKUP		0.1
-#define CS_HOSTAGE_TRANSTIME_DROP		0.25
-#define CS_HOSTAGE_TRANSTIME_RESCUE		4.0
-
-enum EHostageStates_t
-{
-	k_EHostageStates_Idle = 0,
-	k_EHostageStates_BeingUntied,
-	k_EHostageStates_GettingPickedUp,
-	k_EHostageStates_BeingCarried,
-	k_EHostageStates_FollowingPlayer,
-	k_EHostageStates_GettingDropped,
-	k_EHostageStates_Rescued,
-	k_EHostageStates_Dead,
-};
-
-#define CONSTANT_UNITS_SMOKEGRENADERADIUS 166
-#define CONSTANT_UNITS_GENERICGRENADERADIUS 115
-
-const float SmokeGrenadeRadius = CONSTANT_UNITS_SMOKEGRENADERADIUS;
-const float FlashbangGrenadeRadius = CONSTANT_UNITS_GENERICGRENADERADIUS;
-const float HEGrenadeRadius = CONSTANT_UNITS_GENERICGRENADERADIUS;
-const float MolotovGrenadeRadius = CONSTANT_UNITS_GENERICGRENADERADIUS;
-const float DecoyGrenadeRadius = CONSTANT_UNITS_GENERICGRENADERADIUS;
-
-
-#define ADDON_FLASHBANG_1		0x0001
-#define ADDON_FLASHBANG_2		0x0002
-#define ADDON_HE_GRENADE		0x0004
-#define ADDON_SMOKE_GRENADE		0x0008
-#define ADDON_C4				0x0010
-#define ADDON_DEFUSEKIT			0x0020
-#define ADDON_PRIMARY			0x0040
-#define ADDON_PISTOL			0x0080
-#define ADDON_PISTOL2			0x0100
-#define ADDON_DECOY				0x0200
-#define ADDON_KNIFE				0x0400
-#define ADDON_MASK				0x0800
-#define ADDON_TAGRENADE			0x1000
-#define NUM_ADDON_BITS			13
-
-#define ADDON_CLIENTSIDE_HOLIDAY_HAT			( 0x1 << NUM_ADDON_BITS )
-#define ADDON_CLIENTSIDE_GHOST					( 0x2 << NUM_ADDON_BITS )
-#define ADDON_CLIENTSIDE_ASSASSINATION_TARGET	( 0x4 << NUM_ADDON_BITS )
-#define NUM_CLIENTSIDE_ADDON_BITS 3
-
-
-#define WEAPON_SLOT_RIFLE		0	  
-#define WEAPON_SLOT_PISTOL		1	  
-#define WEAPON_SLOT_KNIFE		2
-#define WEAPON_SLOT_GRENADES	3
-#define WEAPON_SLOT_C4			4
-
-#define WEAPON_SLOT_FIRST		0
-#define WEAPON_SLOT_LAST		4
-
-
-#define TEAM_TERRORIST			2
-#define	TEAM_CT					3
-#define TEAM_MAXCOUNT			4	        
-
-#define TEAM_TERRORIST_BASE0	TEAM_TERRORIST - 2
-#define TEAM_CT_BASE0			TEAM_CT - 2
-
-#define CS_DEATH_ANIMATION_TIME			0.5
-
-#define CS_KILLS_FOR_DOMINATION			4
-
-#define CS_DEATH_DOMINATION				0x0001	    
-#define CS_DEATH_REVENGE				0x0002	     
-
-
-#define DMG_HEADSHOT		(DMG_LASTGENERICFLAG<<1)
-
-
-struct PlayerViewmodelArmConfig
-{
-	const char* szPlayerModelSearchSubStr;
-	const char* szSkintoneIndex;
-	const char* szAssociatedGloveModel;
-	const char* szAssociatedSleeveModel;
-	const char* szAssociatedSleeveModelEconOverride;
-};
-
-enum CSPlayerState
-{
-	STATE_ACTIVE = 0,
-
-	STATE_WELCOME,			     
-
-	STATE_PICKINGTEAM,			  
-	STATE_PICKINGCLASS,			  
-
-	STATE_DEATH_ANIM,			        
-	STATE_DEATH_WAIT_FOR_KEY,	            
-	STATE_OBSERVER_MODE,		     
-
-	STATE_GUNGAME_RESPAWN,		       
-	STATE_DORMANT,				     
-
-	NUM_PLAYER_STATES
-};
-
-
-enum e_RoundEndReason
-{
-	Invalid_Round_End_Reason = -1,
-	RoundEndReason_StillInProgress = 0,
-	Target_Bombed = 1,
-	VIP_Escaped = 2,
-	VIP_Assassinated = 3,
-	Terrorists_Escaped = 4,
-	CTs_PreventEscape = 5,
-	Escaping_Terrorists_Neutralized = 6,
-	Bomb_Defused = 7,
-	CTs_Win = 8,
-	Terrorists_Win = 9,
-	Round_Draw = 10,
-	All_Hostages_Rescued = 11,
-	Target_Saved = 12,
-	Hostages_Not_Rescued = 13,
-	Terrorists_Not_Escaped = 14,
-	VIP_Not_Escaped = 15,
-	Game_Commencing = 16,
-	Terrorists_Surrender = 17,
-	CTs_Surrender = 18,
-	Terrorists_Planted = 19,
-	CTs_ReachedHostage = 20,
-	RoundEndReason_Count = 21,
-};
-
-enum GamePhase
-{
-	GAMEPHASE_WARMUP_ROUND,
-	GAMEPHASE_PLAYING_STANDARD,
-	GAMEPHASE_PLAYING_FIRST_HALF,
-	GAMEPHASE_PLAYING_SECOND_HALF,
-	GAMEPHASE_HALFTIME,
-	GAMEPHASE_MATCH_ENDED,
-	GAMEPHASE_MAX
-};
-
-enum GrenadeType_t
-{
-	GRENADE_TYPE_EXPLOSIVE,
-	GRENADE_TYPE_FLASH,
-	GRENADE_TYPE_FIRE,
-	GRENADE_TYPE_DECOY,
-	GRENADE_TYPE_SMOKE,
-	GRENADE_TYPE_SENSOR,
-
-	GRENADE_TYPE_TOTAL,
-};
-
-#define PUSHAWAY_THINK_INTERVAL		(1.0f / 20.0f)
-#define GLOWUPDATE_DEFAULT_THINK_INTERVAL		0.2f
-
-#define CS_MAX_PLAYER_MODELS 10
-#define MAX_MODEL_STRING_SIZE 256
-
-#define CS_CLASS_NONE 0
-
-#define MAX_ENDMATCH_VOTE_PANELS 10
-const PlayerViewmodelArmConfig* GetPlayerViewmodelArmConfigForPlayerModel(const char* szPlayerModel);
-
-class PlayerModelInfo
-{
-public:
-	PlayerModelInfo();
-
-#if !defined( CLIENT_DLL )
-
-	bool IsTClass(int classID);
-	bool IsCTClass(int classID);
-
-	int GetFirstTClass(void) const { return 1; }
-	int GetFirstCTClass(void) const { return m_NumTModels + 1; }
-	int GetFirstClass(void) const { return GetFirstTClass(); }
-
-	int GetLastTClass(void) const { return m_NumTModels; }
-	int GetLastCTClass(void) const { return m_NumTModels + m_NumCTModels; }
-	int GetLastClass(void) const { return GetLastCTClass(); }
-
-	int GetNextClassForTeam(int team);
-
-	const char* GetClassName(int classID);
-	const char* GetClassModelPath(int classID);
-
-	int GetNumTModels(void) const { return m_NumTModels; }
-	int GetNumCTModels(void) const { return m_NumCTModels; }
-
-	void InitializeForCurrentMap(void);
-
-private:
-	void AddModel(const char* modelName);
-	void SetTViewModelArms(const char* modelName);
-	void SetCTViewModelArms(const char* modelName);
-
-#endif  
-
-public:
-	static const char* g_customizationModelCT;
-	static const char* g_customizationModelT;
-	static const char* g_defaultTModel;
-	static const char* g_defaultCTModel;
-
-	static PlayerModelInfo* GetPtr(void) { return &s_PlayerModelInfo; }
-
-private:
-	static PlayerModelInfo s_PlayerModelInfo;
-
-#if !defined( CLIENT_DLL )
-	char m_ClassModelPaths[CS_MAX_PLAYER_MODELS][MAX_MODEL_STRING_SIZE];
-	char m_ClassNames[CS_MAX_PLAYER_MODELS][MAX_MODEL_STRING_SIZE];
-	char m_mapName[MAX_MODEL_STRING_SIZE];
-
-	int m_NumTModels;
-	int m_NumCTModels;
-	int m_NumModels;
-	int m_nNextClassT;
-	int m_nNextClassCT;
-#endif  
-};
-
-enum CSMvpReason_t
-{
-	CSMVP_UNDEFINED = 0,
-	CSMVP_ELIMINATION,
-	CSMVP_BOMBPLANT,
-	CSMVP_BOMBDEFUSE,
-	CSMVP_HOSTAGERESCUE,
-
-	CSMVP_GUNGAMEWINNER,
-};
-
-#define CS_MUZZLEFLASH_NONE -1
-#define CS_MUZZLEFLASH_NORM	0
-#define CS_MUZZLEFLASH_X	1
-
-extern const char* pszWinPanelCategoryHeaders[];
-
-namespace AcquireResult
-{
-	enum Type
-	{
-		Allowed,
-		InvalidItem,
-		AlreadyOwned,
-		AlreadyPurchased,
-		ReachedGrenadeTypeLimit,
-		ReachedGrenadeTotalLimit,
-		NotAllowedByTeam,
-		NotAllowedByMap,
-		NotAllowedByMode,
-		NotAllowedForPurchase,
-		NotAllowedByProhibition,
-	};
-}
-
-namespace AcquireMethod
-{
-	enum Type
-	{
-		PickUp,
-		Buy,
-	};
-}
-
-namespace QuestProgress
-{
-	enum Reason
-	{
-		QUEST_NONINITIALIZED,
-
-		QUEST_OK,
-
-		QUEST_NOT_ENOUGH_PLAYERS,
-
-		QUEST_WARMUP,
-
-		QUEST_NOT_CONNECTED_TO_STEAM,
-
-		QUEST_NONOFFICIAL_SERVER,
-
-		QUEST_NO_ENTITLEMENT,
-
-		QUEST_NO_QUEST,
-
-		QUEST_PLAYER_IS_BOT,
-
-		QUEST_WRONG_MAP,
-		QUEST_WRONG_MODE,
-
-		QUEST_NOT_SYNCED_WITH_SERVER,
-
-		QUEST_REASON_MAX,
-	};
-
-	const int QuestReasonBits = 4;
-	COMPILE_TIME_ASSERT(QUEST_REASON_MAX <= (1 << QuestReasonBits));
-
-	const char* ReasonString(Reason reason);              
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/cs_view_scene.h b/SpyCustom/cs_view_scene.h
deleted file mode 100644
index 42c6661..0000000
--- a/SpyCustom/cs_view_scene.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef CS_VIEW_SCENE_H
-#define CS_VIEW_SCENE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "viewrender.h"
-
-class CCSViewRender : public CViewRender
-{
-public:
-	CCSViewRender();
-
-	virtual void Init(void);
-
-	virtual void GetScreenFadeDistances(float* min, float* max);
-
-	virtual void Render2DEffectsPreHUD(const CViewSetup& view);
-	virtual void Render2DEffectsPostHUD(const CViewSetup& view);
-	virtual void RenderPlayerSprites(void);
-
-	void PerformFlashbangEffect(const CViewSetup& view);
-	void PerformNightVisionEffect(const CViewSetup& view);
-
-	ITexture* m_pFlashTexture;
-};
-
-#endif 
\ No newline at end of file
diff --git a/SpyCustom/csgosdk.h b/SpyCustom/csgosdk.h
deleted file mode 100644
index c21c763..0000000
--- a/SpyCustom/csgosdk.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-
-#include <iostream>
-#include <windows.h>
-#include <string>
-#include "icliententitylist.h"
-#include "CGameUI.h"
-#include "GameEventManager.h"
-#include "cdll_int.h"
-#include "ISurface.h"
-#include "IEngineVgui.h"
-#include "ivmodelinfo.h"
-#include "idatacache.h"
-#include "ILocalize.h"
-
-#include "Panel.h"
-#include "IGameUI.h"
-
-#include "dt_recv.h"
-#include "client_class.h"
-
-#include "enginetrace.h"
-
-#include "gameconsole.h"
-#include "ivrenderview.h"
-#include "ivdebugoverlay.h"
-#include "vphysics_interface.h"
-#include "iefx.h"
-
-#include "iclient.h"
-#include "icliententity.h"
-#include "globalvars_base.h"
-#include "cmodel.h"
-#include "IInput.h"
-#include "IEffects.h"
-#include "iviewrender_beams.h"
-#include "sdk_hud_chat.h"
-#include "fx.h" 
-#include "c_input.h"
-#include "EventListener.hpp"
-
-#include "VMT.hpp"
-#include "PatternScan.hpp"
-#include "RenderPanel.hpp"
-
-#include "PlayerInventory.hpp" 
-
-
-
-
-
-
-
-
-
-
diff --git a/SpyCustom/datamap.h b/SpyCustom/datamap.h
deleted file mode 100644
index 582b094..0000000
--- a/SpyCustom/datamap.h
+++ /dev/null
@@ -1,397 +0,0 @@
-#ifndef DATAMAP_H
-#define DATAMAP_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#ifndef VECTOR_H
-#include "vector.h"
-#endif
-
-#include "utlvector.h"
-
-#include "memdbgon.h"
-
-class SINGLE_INHERITANCE CBaseEntity;
-struct inputdata_t;
-
-#define INVALID_TIME (FLT_MAX * -1.0)       
-
-typedef enum _fieldtypes
-{
-	FIELD_VOID = 0,			    
-	FIELD_FLOAT,			    
-	FIELD_STRING,			      
-	FIELD_VECTOR,			     
-	FIELD_QUATERNION,		  
-	FIELD_INTEGER,			    
-	FIELD_BOOLEAN,			              
-	FIELD_SHORT,			   
-	FIELD_CHARACTER,		  
-	FIELD_COLOR32,			      
-	FIELD_EMBEDDED,			                
-	FIELD_CUSTOM,			          
-
-	FIELD_CLASSPTR,			  
-	FIELD_EHANDLE,			  
-	FIELD_EDICT,			  
-
-	FIELD_POSITION_VECTOR,	           
-	FIELD_TIME,				          
-	FIELD_TICK,				         
-	FIELD_MODELNAME,		         
-	FIELD_SOUNDNAME,		         
-
-	FIELD_INPUT,			          
-	FIELD_FUNCTION,			       
-
-	FIELD_VMATRIX,			       
-
-	FIELD_VMATRIX_WORLDSPACE,                 
-	FIELD_MATRIX3X4_WORLDSPACE,	                
-
-	FIELD_INTERVAL,			               
-	FIELD_MODELINDEX,		   
-	FIELD_MATERIALINDEX,	         
-
-	FIELD_VECTOR2D,			  
-
-	FIELD_TYPECOUNT,		   
-} fieldtype_t;
-
-
-template <int FIELD_TYPE>
-class CDatamapFieldSizeDeducer
-{
-public:
-	enum
-	{
-		SIZE = 0
-	};
-
-	static int FieldSize()
-	{
-		return 0;
-	}
-};
-
-#define DECLARE_FIELD_SIZE( _fieldType, _fieldSize )	\
-	template< > class CDatamapFieldSizeDeducer<_fieldType> { public: enum { SIZE = _fieldSize }; static int FieldSize() { return _fieldSize; } };
-#define FIELD_SIZE( _fieldType )	CDatamapFieldSizeDeducer<_fieldType>::SIZE
-#define FIELD_BITS( _fieldType )	(FIELD_SIZE( _fieldType ) * 8)
-
-DECLARE_FIELD_SIZE(FIELD_FLOAT, sizeof(float))
-DECLARE_FIELD_SIZE(FIELD_STRING, sizeof(int))
-DECLARE_FIELD_SIZE(FIELD_VECTOR, 3 * sizeof(float))
-DECLARE_FIELD_SIZE(FIELD_VECTOR2D, 2 * sizeof(float))
-DECLARE_FIELD_SIZE(FIELD_QUATERNION, 4 * sizeof(float))
-DECLARE_FIELD_SIZE(FIELD_INTEGER, sizeof(int))
-DECLARE_FIELD_SIZE(FIELD_BOOLEAN, sizeof(char))
-DECLARE_FIELD_SIZE(FIELD_SHORT, sizeof(short))
-DECLARE_FIELD_SIZE(FIELD_CHARACTER, sizeof(char))
-DECLARE_FIELD_SIZE(FIELD_COLOR32, sizeof(int))
-DECLARE_FIELD_SIZE(FIELD_CLASSPTR, sizeof(int))
-DECLARE_FIELD_SIZE(FIELD_EHANDLE, sizeof(int))
-DECLARE_FIELD_SIZE(FIELD_EDICT, sizeof(int))
-DECLARE_FIELD_SIZE(FIELD_POSITION_VECTOR, 3 * sizeof(float))
-DECLARE_FIELD_SIZE(FIELD_TIME, sizeof(float))
-DECLARE_FIELD_SIZE(FIELD_TICK, sizeof(int))
-DECLARE_FIELD_SIZE(FIELD_MODELNAME, sizeof(int))
-DECLARE_FIELD_SIZE(FIELD_SOUNDNAME, sizeof(int))
-DECLARE_FIELD_SIZE(FIELD_INPUT, sizeof(int))
-#ifdef POSIX
-DECLARE_FIELD_SIZE(FIELD_FUNCTION, sizeof(uint64))
-#else
-DECLARE_FIELD_SIZE(FIELD_FUNCTION, sizeof(int*))
-#endif
-DECLARE_FIELD_SIZE(FIELD_VMATRIX, 16 * sizeof(float))
-DECLARE_FIELD_SIZE(FIELD_VMATRIX_WORLDSPACE, 16 * sizeof(float))
-DECLARE_FIELD_SIZE(FIELD_MATRIX3X4_WORLDSPACE, 12 * sizeof(float))
-DECLARE_FIELD_SIZE(FIELD_INTERVAL, 2 * sizeof(float))        
-DECLARE_FIELD_SIZE(FIELD_MODELINDEX, sizeof(int))
-DECLARE_FIELD_SIZE(FIELD_MATERIALINDEX, sizeof(int))
-
-
-#define ARRAYSIZE2D(p)		(sizeof(p)/sizeof(p[0][0]))
-#define SIZE_OF_ARRAY(p)	_ARRAYSIZE(p)
-
-#define _FIELD(name,fieldtype,count,flags,mapname,tolerance)		{ fieldtype, #name, { offsetof(classNameTypedef, name), 0 }, count, flags, mapname, NULL, NULL, NULL, sizeof( ((classNameTypedef *)0)->name ), NULL, 0, tolerance }
-#define DEFINE_FIELD_NULL	{ FIELD_VOID,0, {0,0},0,0,0,0,0,0}
-#define DEFINE_FIELD(name,fieldtype)			_FIELD(name, fieldtype, 1,  FTYPEDESC_SAVE, NULL, 0 )
-#define DEFINE_KEYFIELD(name,fieldtype, mapname) _FIELD(name, fieldtype, 1,  FTYPEDESC_KEY | FTYPEDESC_SAVE, mapname, 0 )
-#define DEFINE_KEYFIELD_NOT_SAVED(name,fieldtype, mapname)_FIELD(name, fieldtype, 1,  FTYPEDESC_KEY, mapname, 0 )
-#define DEFINE_AUTO_ARRAY(name,fieldtype)		_FIELD(name, fieldtype, SIZE_OF_ARRAY(((classNameTypedef *)0)->name), FTYPEDESC_SAVE, NULL, 0 )
-#define DEFINE_AUTO_ARRAY_KEYFIELD(name,fieldtype,mapname)		_FIELD(name, fieldtype, SIZE_OF_ARRAY(((classNameTypedef *)0)->name), FTYPEDESC_SAVE, mapname, 0 )
-#define DEFINE_ARRAY(name,fieldtype, count)		_FIELD(name, fieldtype, count, FTYPEDESC_SAVE, NULL, 0 )
-#define DEFINE_ENTITY_FIELD(name,fieldtype)			_FIELD(edict_t, name, fieldtype, 1,  FTYPEDESC_KEY | FTYPEDESC_SAVE, #name, 0 )
-#define DEFINE_ENTITY_GLOBAL_FIELD(name,fieldtype)	_FIELD(edict_t, name, fieldtype, 1,  FTYPEDESC_KEY | FTYPEDESC_SAVE | FTYPEDESC_GLOBAL, #name, 0 )
-#define DEFINE_GLOBAL_FIELD(name,fieldtype)	_FIELD(name, fieldtype, 1,  FTYPEDESC_GLOBAL | FTYPEDESC_SAVE, NULL, 0 )
-#define DEFINE_GLOBAL_KEYFIELD(name,fieldtype, mapname)	_FIELD(name, fieldtype, 1,  FTYPEDESC_GLOBAL | FTYPEDESC_KEY | FTYPEDESC_SAVE, mapname, 0 )
-#define DEFINE_CUSTOM_FIELD(name,datafuncs)	{ FIELD_CUSTOM, #name, { offsetof(classNameTypedef, name), 0 }, 1, FTYPEDESC_SAVE, NULL, datafuncs, NULL }
-#define DEFINE_CUSTOM_KEYFIELD(name,datafuncs,mapname)	{ FIELD_CUSTOM, #name, { offsetof(classNameTypedef, name), 0 }, 1, FTYPEDESC_SAVE | FTYPEDESC_KEY, mapname, datafuncs, NULL }
-#define DEFINE_AUTO_ARRAY2D(name,fieldtype)		_FIELD(name, fieldtype, ARRAYSIZE2D(((classNameTypedef *)0)->name), FTYPEDESC_SAVE, NULL, 0 )
-#define DEFINE_BITFIELD(name,fieldtype,bitcount)	DEFINE_ARRAY(name,fieldtype,((bitcount+FIELD_BITS(fieldtype)-1)&~(FIELD_BITS(fieldtype)-1)) / FIELD_BITS(fieldtype) )
-#define DEFINE_INDEX(name,fieldtype)			_FIELD(name, fieldtype, 1,  FTYPEDESC_INDEX, NULL, 0 )
-
-#define DEFINE_EMBEDDED( name )						\
-	{ FIELD_EMBEDDED, #name, { offsetof(classNameTypedef, name), 0 }, 1, FTYPEDESC_SAVE, NULL, NULL, NULL, &(((classNameTypedef *)0)->name.m_DataMap), sizeof( ((classNameTypedef *)0)->name ), NULL, 0, 0.0f }
-
-#define DEFINE_EMBEDDED_OVERRIDE( name, overridetype )	\
-	{ FIELD_EMBEDDED, #name, { offsetof(classNameTypedef, name), 0 }, 1, FTYPEDESC_SAVE, NULL, NULL, NULL, &((overridetype *)0)->m_DataMap, sizeof( ((classNameTypedef *)0)->name ), NULL, 0, 0.0f }
-
-#define DEFINE_EMBEDDEDBYREF( name )					\
-	{ FIELD_EMBEDDED, #name, { offsetof(classNameTypedef, name), 0 }, 1, FTYPEDESC_SAVE | FTYPEDESC_PTR, NULL, NULL, NULL, &(((classNameTypedef *)0)->name->m_DataMap), sizeof( *(((classNameTypedef *)0)->name) ), NULL, 0, 0.0f }
-
-#define DEFINE_EMBEDDED_ARRAY( name, count )			\
-	{ FIELD_EMBEDDED, #name, { offsetof(classNameTypedef, name), 0 }, count, FTYPEDESC_SAVE, NULL, NULL, NULL, &(((classNameTypedef *)0)->name->m_DataMap), sizeof( ((classNameTypedef *)0)->name[0] ), NULL, 0, 0.0f  }
-
-#define DEFINE_EMBEDDED_AUTO_ARRAY( name )			\
-	{ FIELD_EMBEDDED, #name, { offsetof(classNameTypedef, name), 0 }, SIZE_OF_ARRAY( ((classNameTypedef *)0)->name ), FTYPEDESC_SAVE, NULL, NULL, NULL, &(((classNameTypedef *)0)->name->m_DataMap), sizeof( ((classNameTypedef *)0)->name[0] ), NULL, 0, 0.0f  }
-
-#ifndef NO_ENTITY_PREDICTION
-
-#define DEFINE_PRED_TYPEDESCRIPTION( name, fieldtype )						\
-	{ FIELD_EMBEDDED, #name, { offsetof(classNameTypedef, name), 0 }, 1, FTYPEDESC_SAVE, NULL, NULL, NULL, &fieldtype::m_PredMap }
-
-#define DEFINE_PRED_TYPEDESCRIPTION_PTR( name, fieldtype )						\
-	{ FIELD_EMBEDDED, #name, { offsetof(classNameTypedef, name), 0 }, 1, FTYPEDESC_SAVE | FTYPEDESC_PTR, NULL, NULL, NULL, &fieldtype::m_PredMap }
-
-#else
-
-#define DEFINE_PRED_TYPEDESCRIPTION( name, fieldtype )		DEFINE_FIELD_NULL
-#define DEFINE_PRED_TYPEDESCRIPTION_PTR( name, fieldtype )	DEFINE_FIELD_NULL
-
-#endif
-
-#define DEFINE_PRED_FIELD(name,fieldtype, flags)			_FIELD(name, fieldtype, 1,  flags, NULL, 0.0f )
-#define DEFINE_PRED_ARRAY(name,fieldtype, count,flags)		_FIELD(name, fieldtype, count, flags, NULL, 0.0f )
-#define DEFINE_FIELD_NAME(localname,netname,fieldtype)		_FIELD(localname, fieldtype, 1,  0, #netname, 0.0f )
-#define DEFINE_PRED_FIELD_TOL(name,fieldtype, flags,tolerance)			_FIELD(name, fieldtype, 1,  flags, NULL, tolerance )
-#define DEFINE_PRED_ARRAY_TOL(name,fieldtype, count,flags,tolerance)		_FIELD(name, fieldtype, count, flags, NULL, tolerance)
-#define DEFINE_FIELD_NAME_TOL(localname,netname,fieldtolerance)		_FIELD(localname, fieldtype, 1,  0, #netname, tolerance )
-
-#define DEFINE_INPUT( name, fieldtype, inputname ) { fieldtype, #name, { offsetof(classNameTypedef, name), 0 }, 1, FTYPEDESC_INPUT | FTYPEDESC_SAVE | FTYPEDESC_KEY,	inputname, NULL, NULL, NULL, sizeof( ((classNameTypedef *)0)->name ) }
-#define DEFINE_INPUTFUNC( fieldtype, inputname, inputfunc ) { fieldtype, #inputfunc, { NULL, NULL }, 1, FTYPEDESC_INPUT, inputname, NULL, static_cast <inputfunc_t> (&classNameTypedef::inputfunc) }
-
-class ISaveRestoreOps;
-extern ISaveRestoreOps* eventFuncs;
-#define DEFINE_OUTPUT( name, outputname )	{ FIELD_CUSTOM, #name, { offsetof(classNameTypedef, name), 0 }, 1, FTYPEDESC_OUTPUT | FTYPEDESC_SAVE | FTYPEDESC_KEY, outputname, eventFuncs }
-
-#define DEFINE_FUNCTION_RAW( function, func_type )			{ FIELD_VOID, nameHolder.GenerateName(#function), { NULL, NULL }, 1, FTYPEDESC_FUNCTIONTABLE, NULL, NULL, (inputfunc_t)((func_type)(&classNameTypedef::function)) }
-#define DEFINE_FUNCTION( function )			DEFINE_FUNCTION_RAW( function, inputfunc_t )
-
-
-#define FTYPEDESC_GLOBAL			0x0001		        
-#define FTYPEDESC_SAVE				0x0002		      
-#define FTYPEDESC_KEY				0x0004		              
-#define FTYPEDESC_INPUT				0x0008		                
-#define FTYPEDESC_OUTPUT			0x0010		           
-#define FTYPEDESC_FUNCTIONTABLE		0x0020		          
-#define FTYPEDESC_PTR				0x0040		         
-#define FTYPEDESC_OVERRIDE			0x0080		                  
-
-#define FTYPEDESC_INSENDTABLE		0x0100		        
-#define FTYPEDESC_PRIVATE			0x0200		                    
-#define FTYPEDESC_NOERRORCHECK		0x0400		                
-
-#define FTYPEDESC_MODELINDEX		0x0800		          
-
-#define FTYPEDESC_INDEX				0x1000		            
-
-#define FTYPEDESC_VIEW_OTHER_PLAYER		0x2000		             
-#define FTYPEDESC_VIEW_OWN_TEAM			0x4000		                
-#define FTYPEDESC_VIEW_NEVER			0x8000		           
-
-#define TD_MSECTOLERANCE		0.001f		                 
-
-struct typedescription_t;
-
-
-class ISaveRestoreOps;
-
-typedef void (CBaseEntity::* inputfunc_t)(inputdata_t& data);
-
-struct datamap_t;
-struct typedescription_t;
-
-enum
-{
-	TD_OFFSET_NORMAL = 0,
-	TD_OFFSET_PACKED = 1,
-
-	TD_OFFSET_COUNT,
-};
-
-struct typedescription_t
-{
-	fieldtype_t			fieldType;
-	const char* fieldName;
-	int					fieldOffset[TD_OFFSET_COUNT];        
-	unsigned short		fieldSize;
-	short				flags;
-	const char* externalName;
-	ISaveRestoreOps* pSaveRestoreOps;
-	inputfunc_t			inputFunc;
-	datamap_t* td;
-
-	int					fieldSizeInBytes;
-
-	struct typedescription_t* override_field;
-
-	int					override_count;
-
-	float				fieldTolerance;
-};
-
-
-struct datamap_t
-{
-	typedescription_t* dataDesc;
-	int					dataNumFields;
-	char const* dataClassName;
-	datamap_t* baseMap;
-
-	bool				chains_validated;
-	bool				packed_offsets_computed;
-	int					packed_size;
-
-#if defined( _DEBUG )
-	bool				bValidityChecked;
-#endif  
-};
-
-
-#define DECLARE_SIMPLE_DATADESC() \
-	static datamap_t m_DataMap; \
-	static datamap_t *GetBaseMap(); \
-	template <typename T> friend void DataMapAccess(T *, datamap_t **p); \
-	template <typename T> friend datamap_t *DataMapInit(T *);
-
-#define	DECLARE_DATADESC() \
-	DECLARE_SIMPLE_DATADESC() \
-	virtual datamap_t *GetDataDescMap( void );
-
-#define BEGIN_DATADESC( className ) \
-	datamap_t className::m_DataMap = { 0, 0, #className, NULL }; \
-	datamap_t *className::GetDataDescMap( void ) { return &m_DataMap; } \
-	datamap_t *className::GetBaseMap() { datamap_t *pResult; DataMapAccess((BaseClass *)NULL, &pResult); return pResult; } \
-	BEGIN_DATADESC_GUTS( className )
-
-#define BEGIN_DATADESC_NO_BASE( className ) \
-	datamap_t className::m_DataMap = { 0, 0, #className, NULL }; \
-	datamap_t *className::GetDataDescMap( void ) { return &m_DataMap; } \
-	datamap_t *className::GetBaseMap() { return NULL; } \
-	BEGIN_DATADESC_GUTS( className )
-
-#define BEGIN_SIMPLE_DATADESC( className ) \
-	datamap_t className::m_DataMap = { 0, 0, #className, NULL }; \
-	datamap_t *className::GetBaseMap() { return NULL; } \
-	BEGIN_DATADESC_GUTS( className )
-
-#define BEGIN_SIMPLE_DATADESC_( className, BaseClass ) \
-	datamap_t className::m_DataMap = { 0, 0, #className, NULL }; \
-	datamap_t *className::GetBaseMap() { datamap_t *pResult; DataMapAccess((BaseClass *)NULL, &pResult); return pResult; } \
-	BEGIN_DATADESC_GUTS( className )
-
-#define BEGIN_DATADESC_GUTS( className ) \
-	template <typename T> datamap_t *DataMapInit(T *); \
-	template <> datamap_t *DataMapInit<className>( className * ); \
-	namespace className##_DataDescInit \
-	{ \
-		datamap_t *g_DataMapHolder = DataMapInit( (className *)NULL );             \
-	} \
-	\
-	template <> datamap_t *DataMapInit<className>( className * ) \
-	{ \
-		typedef className classNameTypedef; \
-		static CDatadescGeneratedNameHolder nameHolder(#className); \
-		className::m_DataMap.baseMap = className::GetBaseMap(); \
-		static typedescription_t dataDesc[] = \
-		{ \
-		{ FIELD_VOID,0, {0,0},0,0,0,0,0,0},        
-
-#define END_DATADESC() \
-		}; \
-		\
-		if ( sizeof( dataDesc ) > sizeof( dataDesc[0] ) ) \
-		{ \
-			classNameTypedef::m_DataMap.dataNumFields = SIZE_OF_ARRAY( dataDesc ) - 1; \
-			classNameTypedef::m_DataMap.dataDesc 	  = &dataDesc[1]; \
-		} \
-		else \
-		{ \
-			classNameTypedef::m_DataMap.dataNumFields = 1; \
-			classNameTypedef::m_DataMap.dataDesc 	  = dataDesc; \
-		} \
-		return &classNameTypedef::m_DataMap; \
-	}
-
-#define IMPLEMENT_NULL_SIMPLE_DATADESC( derivedClass ) \
-	BEGIN_SIMPLE_DATADESC( derivedClass ) \
-	END_DATADESC()
-
-#define IMPLEMENT_NULL_SIMPLE_DATADESC_( derivedClass, baseClass ) \
-	BEGIN_SIMPLE_DATADESC_( derivedClass, baseClass ) \
-	END_DATADESC()
-
-#define IMPLEMENT_NULL_DATADESC( derivedClass ) \
-	BEGIN_DATADESC( derivedClass ) \
-	END_DATADESC()
-
-#define BEGIN_BITFIELD( name ) \
-	union \
-	{ \
-		char name; \
-		struct \
-		{
-
-#define END_BITFIELD() \
-		}; \
-	};
-
-#define DECLARE_BYTESWAP_DATADESC() DECLARE_SIMPLE_DATADESC()
-#define BEGIN_BYTESWAP_DATADESC(name) BEGIN_SIMPLE_DATADESC(name) 
-#define BEGIN_BYTESWAP_DATADESC_(name,base) BEGIN_SIMPLE_DATADESC_(name,base) 
-#define END_BYTESWAP_DATADESC() END_DATADESC()
-
-template <typename T>
-inline void DataMapAccess(T* ignored, datamap_t** p)
-{
-	*p = &T::m_DataMap;
-}
-
-class CDatadescGeneratedNameHolder
-{
-public:
-	CDatadescGeneratedNameHolder(const char* pszBase)
-		: m_pszBase(pszBase)
-	{
-		m_nLenBase = strlen(m_pszBase);
-	}
-
-	~CDatadescGeneratedNameHolder()
-	{
-		for (int i = 0; i < m_Names.Count(); i++)
-		{
-			delete m_Names[i];
-		}
-	}
-
-	const char* GenerateName(const char* pszIdentifier)
-	{
-		char* pBuf = new char[m_nLenBase + strlen(pszIdentifier) + 1];
-		strcpy(pBuf, m_pszBase);
-		strcat(pBuf, pszIdentifier);
-		m_Names.AddToTail(pBuf);
-		return pBuf;
-	}
-
-private:
-	const char* m_pszBase;
-	size_t m_nLenBase;
-	CUtlVector<char*> m_Names;
-};
-
-#include "memdbgoff.h"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/dbg.h b/SpyCustom/dbg.h
deleted file mode 100644
index 35f2911..0000000
--- a/SpyCustom/dbg.h
+++ /dev/null
@@ -1,700 +0,0 @@
-#ifndef DBG_H
-#define DBG_H
-
-#if !defined(__SPU__)
-
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-#include "basetypes.h"
-#include "dbgflag.h"
-#include "logging.h"
-#include <math.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#ifdef TIER0_DLL_EXPORT
-#define DBG_INTERFACE	DLL_EXPORT
-#define DBG_OVERLOAD	DLL_GLOBAL_EXPORT
-#define DBG_CLASS		DLL_CLASS_EXPORT
-#else
-#define DBG_INTERFACE	DLL_IMPORT
-#define DBG_OVERLOAD	DLL_GLOBAL_IMPORT
-#define DBG_CLASS		DLL_CLASS_IMPORT
-#endif
-
-class Color;
-
-
-PLATFORM_INTERFACE void _ExitOnFatalAssert(const tchar* pFile, int line);
-
-#if defined( DBGFLAG_STRINGS_STRIP )
-#define DbgFlagMacro_ExitOnFatalAssert( pFile, line ) _ExitOnFatalAssert( "", 0 )
-#else
-#define DbgFlagMacro_ExitOnFatalAssert( pFile, line ) _ExitOnFatalAssert( pFile, line )
-#endif
-
-PLATFORM_INTERFACE bool ShouldUseNewAssertDialog();
-
-PLATFORM_INTERFACE bool SetupWin32ConsoleIO();
-
-PLATFORM_INTERFACE bool DoNewAssertDialog(const tchar* pFile, int line, const tchar* pExpression);
-
-#if defined( DBGFLAG_STRINGS_STRIP )
-#define DbgFlagMacro_DoNewAssertDialog( pFile, line, pExpression ) DoNewAssertDialog( "", 0, "" )
-#else
-#define DbgFlagMacro_DoNewAssertDialog( pFile, line, pExpression ) DoNewAssertDialog( pFile, line, pExpression )
-#endif
-
-PLATFORM_INTERFACE bool AreAllAssertsDisabled();
-PLATFORM_INTERFACE void SetAllAssertsDisabled(bool bAssertsEnabled);
-
-PLATFORM_INTERFACE bool IsAssertDialogDisabled();
-PLATFORM_INTERFACE void SetAssertDialogDisabled(bool bAssertDialogDisabled);
-
-typedef void (*AssertFailedNotifyFunc_t)(const char* pchFile, int nLine, const char* pchMessage);
-PLATFORM_INTERFACE void SetAssertFailedNotifyFunc(AssertFailedNotifyFunc_t func);
-PLATFORM_INTERFACE void CallAssertFailedNotifyFunc(const char* pchFile, int nLine, const char* pchMessage);
-
-#if defined( LINUX )
-PLATFORM_INTERFACE void SetAssertDialogParent(struct SDL_Window* window);
-PLATFORM_INTERFACE struct SDL_Window* GetAssertDialogParent();
-#endif
-
-#ifdef _PREFAST_
-#define _AssertMsg( _exp, _msg, _executeExp, _bFatal ) do { __analysis_assume( !!(_exp) ); _msg; } while (0)
-#define  _AssertMsgOnce( _exp, _msg, _bFatal ) do { __analysis_assume( !!(_exp) ); _msg; } while (0)
-#define DBGFLAG_ASSERT
-#define DBGFLAG_ASSERTFATAL
-#define DBGFLAG_ASSERTDEBUG
-
-#define  Q_ASSERT( _exp )           							_AssertMsg( _exp, _T("Assertion Failed: ") _T(#_exp), ((void)0), false )
-#else
-#define  _AssertMsg( _exp, _msg, _executeExp, _bFatal )	\
-		do {																\
-			if (!(_exp)) 													\
-			{ 																\
-				LoggingResponse_t ret = Log_Assert( "%s (%d) : %s\n", __TFILE__, __LINE__, static_cast<const char*>( _msg ) );	\
-				CallAssertFailedNotifyFunc( __TFILE__, __LINE__, _msg );								\
-				_executeExp; 												\
-				if ( ret == LR_DEBUGGER )									\
-				{															\
-					if ( ShouldUseNewAssertDialog() )                       \
-					{                                                       \
-						if ( DbgFlagMacro_DoNewAssertDialog( __TFILE__, __LINE__, _msg ) ) \
-							DebuggerBreak();									\
-					}                                                       \
-					if ( _bFatal )											\
-						DbgFlagMacro_ExitOnFatalAssert( __TFILE__, __LINE__ );			\
-				}															\
-			}																\
-		} while (0)
-
-#define  _AssertMsgOnce( _exp, _msg, _bFatal ) \
-	do {																\
-		static bool fAsserted;											\
-		if (!fAsserted )												\
-		{ 																\
-			_AssertMsg( _exp, _msg, (fAsserted = true), _bFatal );		\
-		}																\
-	} while (0)
-#endif
-
-#ifdef DBGFLAG_ASSERTFATAL
-
-#define  AssertFatal( _exp )									_AssertMsg( _exp, _T("Assertion Failed: ") _T(#_exp), ((void)0), true )
-#define  AssertFatalOnce( _exp )								_AssertMsgOnce( _exp, _T("Assertion Failed: ") _T(#_exp), true )
-#define  AssertFatalMsg( _exp, _msg )							_AssertMsg( _exp, _msg, ((void)0), true )
-#define  AssertFatalMsgOnce( _exp, _msg )						_AssertMsgOnce( _exp, _msg, true )
-#define  AssertFatalFunc( _exp, _f )							_AssertMsg( _exp, _T("Assertion Failed: " _T(#_exp), _f, true )
-#define  AssertFatalEquals( _exp, _expectedValue )				AssertFatalMsg2( (_exp) == (_expectedValue), _T("Expected %d but got %d!"), (_expectedValue), (_exp) ) 
-#define  AssertFatalFloatEquals( _exp, _expectedValue, _tol )   AssertFatalMsg2( fabs((_exp) - (_expectedValue)) <= (_tol), _T("Expected %f but got %f!"), (_expectedValue), (_exp) )
-#define  VerifyFatal( _exp )									AssertFatal( _exp )
-#define  VerifyEqualsFatal( _exp, _expectedValue )				AssertFatalEquals( _exp, _expectedValue )
-#define  DbgVerifyFatal( _exp )									AssertFatal( _exp )
-
-#define  AssertFatalMsg1( _exp, _msg, a1 )									AssertFatalMsg( _exp, (const tchar *)(CDbgFmtMsg( _msg, a1 )))
-#define  AssertFatalMsg2( _exp, _msg, a1, a2 )								AssertFatalMsg( _exp, (const tchar *)(CDbgFmtMsg( _msg, a1, a2 )))
-#define  AssertFatalMsg3( _exp, _msg, a1, a2, a3 )							AssertFatalMsg( _exp, (const tchar *)(CDbgFmtMsg( _msg, a1, a2, a3 )))
-#define  AssertFatalMsg4( _exp, _msg, a1, a2, a3, a4 )						AssertFatalMsg( _exp, (const tchar *)(CDbgFmtMsg( _msg, a1, a2, a3, a4 )))
-#define  AssertFatalMsg5( _exp, _msg, a1, a2, a3, a4, a5 )					AssertFatalMsg( _exp, (const tchar *)(CDbgFmtMsg( _msg, a1, a2, a3, a4, a5 )))
-#define  AssertFatalMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				AssertFatalMsg( _exp, (const tchar *)(CDbgFmtMsg( _msg, a1, a2, a3, a4, a5, a6 )))
-#define  AssertFatalMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				AssertFatalMsg( _exp, (const tchar *)(CDbgFmtMsg( _msg, a1, a2, a3, a4, a5, a6 )))
-#define  AssertFatalMsg7( _exp, _msg, a1, a2, a3, a4, a5, a6, a7 )			AssertFatalMsg( _exp, (const tchar *)(CDbgFmtMsg( _msg, a1, a2, a3, a4, a5, a6, a7 )))
-#define  AssertFatalMsg8( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8 )		AssertFatalMsg( _exp, (const tchar *)(CDbgFmtMsg( _msg, a1, a2, a3, a4, a5, a6, a7, a8 )))
-#define  AssertFatalMsg9( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8, a9 )	AssertFatalMsg( _exp, (const tchar *)(CDbgFmtMsg( _msg, a1, a2, a3, a4, a5, a6, a7, a8, a9 )))
-
-#else  
-
-#define  AssertFatal( _exp )									((void)0)
-#define  AssertFatalOnce( _exp )								((void)0)
-#define  AssertFatalMsg( _exp, _msg )							((void)0)
-#define  AssertFatalMsgOnce( _exp, _msg )						((void)0)
-#define  AssertFatalFunc( _exp, _f )							((void)0)
-#define  AssertFatalEquals( _exp, _expectedValue )				((void)0)
-#define  AssertFatalFloatEquals( _exp, _expectedValue, _tol )	((void)0)
-#define  VerifyFatal( _exp )									(_exp)
-#define  VerifyEqualsFatal( _exp, _expectedValue )				(_exp)
-#define  DbgVerifyFatal( _exp )									(_exp)
-
-#define  AssertFatalMsg1( _exp, _msg, a1 )									((void)0)
-#define  AssertFatalMsg2( _exp, _msg, a1, a2 )								((void)0)
-#define  AssertFatalMsg3( _exp, _msg, a1, a2, a3 )							((void)0)
-#define  AssertFatalMsg4( _exp, _msg, a1, a2, a3, a4 )						((void)0)
-#define  AssertFatalMsg5( _exp, _msg, a1, a2, a3, a4, a5 )					((void)0)
-#define  AssertFatalMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				((void)0)
-#define  AssertFatalMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				((void)0)
-#define  AssertFatalMsg7( _exp, _msg, a1, a2, a3, a4, a5, a6, a7 )			((void)0)
-#define  AssertFatalMsg8( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8 )		((void)0)
-#define  AssertFatalMsg9( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8, a9 )	((void)0)
-
-#endif  
-
-#if defined(_CERT) || defined(_RETAIL) 
-#define AssertAligned(PTR)
-#define AssertAlignedWidth(PTR, width)
-#define AssertAlignedConsole(PTR)
-#else
-#  if defined( _X360 )
-#	 define AssertAlignedWidth( PTR, width ) __twnei( intp(PTR) & ( width - 1 ), 0 )             
-#    define AssertAligned( PTR ) AssertAlignedWidth( PTR, 16 )       
-#    define AssertAlignedConsole( PTR ) AssertAlignedWidth( PTR, 4 )           
-#  elif defined( DBGFLAG_ASSERT )
-#	 define  AssertAlignedWidth( adr, width )  Assert( ( ( ( intp ) ( adr ) ) & ( width - 1 ) ) == 0 )
-#    define  AssertAligned( adr )           AssertAlignedWidth( adr, 16 )
-#    define AssertAlignedConsole(adr)         
-#  else
-#  define AssertAlignedWidth(PTR, width)
-#  define AssertAligned(PTR) 
-#  define AssertAlignedConsole(PTR)
-#  endif
-#endif
-
-#ifdef DBGFLAG_ASSERT
-
-#define  Assert( _exp )           							_AssertMsg( _exp, _T("Assertion Failed: ") _T(#_exp), ((void)0), false )
-#define  AssertMsg_( _exp, _msg )  							_AssertMsg( _exp, _msg, ((void)0), false )
-#define  AssertOnce( _exp )       							_AssertMsgOnce( _exp, _T("Assertion Failed: ") _T(#_exp), false )
-#define  AssertMsgOnce( _exp, _msg )  						_AssertMsgOnce( _exp, _msg, false )
-#define  AssertFunc( _exp, _f )   							_AssertMsg( _exp, _T("Assertion Failed: ") _T(#_exp), _f, false )
-#define  AssertEquals( _exp, _expectedValue )              	AssertMsg2( (_exp) == (_expectedValue), _T("Expected %d but got %d!"), (_expectedValue), (_exp) ) 
-#define  AssertFloatEquals( _exp, _expectedValue, _tol )  	AssertMsg2( fabs((_exp) - (_expectedValue)) <= (_tol), _T("Expected %f but got %f!"), (_expectedValue), (_exp) )
-#define  Verify( _exp )           							( _exp )
-#define  VerifyEquals( _exp, _expectedValue )           	AssertEquals( _exp, _expectedValue )
-#ifndef DbgVerify
-#define  DbgVerify( _exp )           						Assert( _exp )
-#endif
-
-#ifdef _DEBUG
-#define DbgAssert( _exp )	Assert( _exp )
-#else
-#define DbgAssert( _exp )	((void)0)
-#endif
-
-#ifdef _DEBUG
-#define DbgAssert( _exp )	Assert( _exp )
-#else
-#define DbgAssert( _exp )	((void)0)
-#endif
-
-#define  AssertMsg(  _exp, _msg )  										AssertMsg_( _exp, _T( _msg ) )
-#define  AssertMsg1( _exp, _msg, a1 )									AssertMsg_( _exp, (const tchar *)(CDbgFmtMsg( _T( _msg ), a1 )) )
-#define  AssertMsg2( _exp, _msg, a1, a2 )								AssertMsg_( _exp, (const tchar *)(CDbgFmtMsg( _T( _msg ), a1, a2 )) )
-#define  AssertMsg3( _exp, _msg, a1, a2, a3 )							AssertMsg_( _exp, (const tchar *)(CDbgFmtMsg( _T( _msg ), a1, a2, a3 )) )
-#define  AssertMsg4( _exp, _msg, a1, a2, a3, a4 )						AssertMsg_( _exp, (const tchar *)(CDbgFmtMsg( _T( _msg ), a1, a2, a3, a4 )) )
-#define  AssertMsg5( _exp, _msg, a1, a2, a3, a4, a5 )					AssertMsg_( _exp, (const tchar *)(CDbgFmtMsg( _T( _msg ), a1, a2, a3, a4, a5 )) )
-#define  AssertMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				AssertMsg_( _exp, (const tchar *)(CDbgFmtMsg( _T( _msg ), a1, a2, a3, a4, a5, a6 )) )
-#define  AssertMsg7( _exp, _msg, a1, a2, a3, a4, a5, a6, a7 )			AssertMsg_( _exp, (const tchar *)(CDbgFmtMsg( _T( _msg ), a1, a2, a3, a4, a5, a6, a7 )) )
-#define  AssertMsg8( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8 )		AssertMsg_( _exp, (const tchar *)(CDbgFmtMsg( _T( _msg ), a1, a2, a3, a4, a5, a6, a7, a8 )) )
-#define  AssertMsg9( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8, a9 )	AssertMsg_( _exp, (const tchar *)(CDbgFmtMsg( _T( _msg ), a1, a2, a3, a4, a5, a6, a7, a8, a9 )) )
-
-#else  
-
-#define  Assert( _exp )										((void)0)
-#define  AssertOnce( _exp )									((void)0)
-#define  AssertMsg( _exp, _msg )							((void)0)
-#define  AssertMsgOnce( _exp, _msg )						((void)0)
-#define  AssertFunc( _exp, _f )								((void)0)
-#define  AssertEquals( _exp, _expectedValue )				((void)0)
-#define  AssertFloatEquals( _exp, _expectedValue, _tol )	((void)0)
-#define  Verify( _exp )										(_exp)
-#define  VerifyEquals( _exp, _expectedValue )           	(_exp)
-#ifndef DbgVerify
-#define  DbgVerify( _exp )			  (_exp)
-#endif
-#define	 DbgAssert( _exp )									((void)0)
-
-#define  AssertMsg1( _exp, _msg, a1 )									((void)0)
-#define  AssertMsg2( _exp, _msg, a1, a2 )								((void)0)
-#define  AssertMsg3( _exp, _msg, a1, a2, a3 )							((void)0)
-#define  AssertMsg4( _exp, _msg, a1, a2, a3, a4 )						((void)0)
-#define  AssertMsg5( _exp, _msg, a1, a2, a3, a4, a5 )					((void)0)
-#define  AssertMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				((void)0)
-#define  AssertMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				((void)0)
-#define  AssertMsg7( _exp, _msg, a1, a2, a3, a4, a5, a6, a7 )			((void)0)
-#define  AssertMsg8( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8 )		((void)0)
-#define  AssertMsg9( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8, a9 )	((void)0)
-
-#endif  
-
-#define AssertDbg( X ) DbgAssert( X )
-
-
-#define AssertAnalyze( _exp )								Assert( _exp )
-#define STRINGIFY_INTERNAL(x) #x
-#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
-
-#define  AssertAlways( _exp )           							_AssertMsg( _exp, _T("Assertion Failed: ") _T(#_exp), ((void)0), false )
-#define  AssertMsgAlways( _exp, _msg )  							_AssertMsg( _exp, _msg, ((void)0), false )
-
-
-#define FILE_LINE_FUNCTION_STRING __FILE__ "(" STRINGIFY(__LINE__) "):" __FUNCTION__ ":"
-#define FILE_LINE_STRING __FILE__ "(" STRINGIFY(__LINE__) "):"
-#define FUNCTION_LINE_STRING __FUNCTION__ "(" STRINGIFY(__LINE__) "): "
-
-
-#define MESSAGE(msg) message(__FILE__ "(" FUNCTION_LINE_TOSTRING(__LINE__) "): " msg)
-
-PLATFORM_INTERFACE LoggingChannelID_t LOG_GENERAL;
-
-DECLARE_LOGGING_CHANNEL(LOG_ASSERT);
-DECLARE_LOGGING_CHANNEL(LOG_CONSOLE);
-DECLARE_LOGGING_CHANNEL(LOG_DEVELOPER);
-DECLARE_LOGGING_CHANNEL(LOG_DEVELOPER_CONSOLE);
-DECLARE_LOGGING_CHANNEL(LOG_DEVELOPER_VERBOSE);
-
-PLATFORM_INTERFACE void Error(PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(1, 2);
-PLATFORM_INTERFACE void Error_SpewCallStack(int iMaxCallStackLength, PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(2, 3);
-#define Plat_FatalError( ... ) do { Log_Error( LOG_GENERAL, ##__VA_ARGS__ ); Plat_ExitProcess( EXIT_FAILURE ); } while( 0 )
-
-#if defined( DBGFLAG_STRINGS_STRIP )
-
-#define Msg( ... ) ((void)0)
-#define Warning( ... ) ((void)0)
-#define Warning_SpewCallStack( ... ) ((void)0)
-#define DevMsg( ... ) ((void)0)
-#define DevWarning( ... ) ((void)0)
-#define ConColorMsg( ... ) ((void)0)
-#define ConMsg( ... ) ((void)0)
-#define ConDMsg( ... ) ((void)0)
-#define COM_TimestampedLog( ... ) ((void)0)
-
-#else  
-
-PLATFORM_INTERFACE void Msg(PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(1, 2);
-PLATFORM_INTERFACE void Warning(PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(1, 2);
-PLATFORM_INTERFACE void Warning_SpewCallStack(int iMaxCallStackLength, PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(2, 3);
-
-#ifdef _PS3
-
-PLATFORM_OVERLOAD void DevMsg(int level, PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(2, 3);
-PLATFORM_OVERLOAD void DevWarning(int level, PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(2, 3);
-
-PLATFORM_INTERFACE void DevMsg(PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(1, 2);
-PLATFORM_INTERFACE void DevWarning(PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(1, 2);
-
-PLATFORM_INTERFACE void ConColorMsg(const Color& clr, PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(2, 3);
-PLATFORM_INTERFACE void ConMsg(PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(1, 2);
-
-#else  
-
-PLATFORM_INTERFACE void DevMsg(int level, PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(2, 3);
-PLATFORM_INTERFACE void DevWarning(int level, PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(2, 3);
-
-PLATFORM_OVERLOAD void DevMsg(PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(1, 2);
-PLATFORM_OVERLOAD void DevWarning(PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(1, 2);
-
-PLATFORM_OVERLOAD void ConColorMsg(const Color& clr, PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(2, 3);
-PLATFORM_OVERLOAD void ConMsg(PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(1, 2);
-
-#endif  
-
-PLATFORM_INTERFACE void ConDMsg(PRINTF_FORMAT_STRING const tchar* pMsg, ...) FMTFUNCTION(1, 2);
-
-PLATFORM_INTERFACE void COM_TimestampedLog(PRINTF_FORMAT_STRING char const* fmt, ...) FMTFUNCTION(1, 2);
-
-#endif  
-
-#define ErrorIfNot( condition, msg ) \
-	if ( (condition) )		\
-		;					\
-	else 					\
-	{						\
-		Error msg;			\
-	}
-
-#ifdef _DEBUG
-#define DebugMsg(...)  DevMsg(__VA_ARGS__)
-#else
-#define DebugMsg(...)
-#endif
-
-PLATFORM_INTERFACE void _Warning_AlwaysSpewCallStack_Enable(bool bEnable);
-PLATFORM_INTERFACE void _Warning_AlwaysSpewCallStack_Length(int iMaxCallStackLength);
-
-PLATFORM_INTERFACE void _Error_AlwaysSpewCallStack_Enable(bool bEnable);
-PLATFORM_INTERFACE void _Error_AlwaysSpewCallStack_Length(int iMaxCallStackLength);
-
-
-#ifdef _DEBUG
-
-#define DBG_CODE( _code )            if (0) ; else { _code }
-#define DBG_CODE_NOSCOPE( _code )	 _code
-#define DBG_DCODE( _g, _l, _code )   if (IsSpewActive( _g, _l )) { _code } else {}
-#define DBG_BREAK()                  DebuggerBreak()	     
-
-#else    
-
-#define DBG_CODE( _code )            ((void)0)
-#define DBG_CODE_NOSCOPE( _code )	 
-#define DBG_DCODE( _g, _l, _code )   ((void)0)
-#define DBG_BREAK()                  ((void)0)
-
-#endif   
-
-
-#ifdef _DEBUG
-template<typename DEST_POINTER_TYPE, typename SOURCE_POINTER_TYPE>
-inline DEST_POINTER_TYPE assert_cast(SOURCE_POINTER_TYPE* pSource)
-{
-	Assert(static_cast<DEST_POINTER_TYPE>(pSource) == dynamic_cast<DEST_POINTER_TYPE>(pSource));
-	return static_cast<DEST_POINTER_TYPE>(pSource);
-}
-#else
-#define assert_cast static_cast
-#endif
-
-PLATFORM_INTERFACE void _AssertValidReadPtr(void* ptr, int count = 1);
-PLATFORM_INTERFACE void _AssertValidWritePtr(void* ptr, int count = 1);
-PLATFORM_INTERFACE void _AssertValidReadWritePtr(void* ptr, int count = 1);
-PLATFORM_INTERFACE void _AssertValidStringPtr(const tchar* ptr, int maxchar);
-
-#ifdef DBGFLAG_ASSERT
-inline void AssertValidStringPtr(const tchar* ptr, int maxchar = 0xFFFFFF) { _AssertValidStringPtr(ptr, maxchar); }
-template<class T> inline void AssertValidReadPtr(T* ptr, int count = 1) { _AssertValidReadPtr((void*)ptr, count); }
-template<class T> inline void AssertValidWritePtr(T* ptr, int count = 1) { _AssertValidWritePtr((void*)ptr, count); }
-template<class T> inline void AssertValidReadWritePtr(T* ptr, int count = 1) { _AssertValidReadWritePtr((void*)ptr, count); }
-#define AssertValidThis() AssertValidReadWritePtr(this,sizeof(*this))
-
-#else
-
-inline void AssertValidStringPtr(const tchar* ptr, int maxchar = 0xFFFFFF) {	}
-template<class T> inline void AssertValidReadPtr(T* ptr, int count = 1) {  }
-template<class T> inline void AssertValidWritePtr(T* ptr, int count = 1) {  }
-template<class T> inline void AssertValidReadWritePtr(T* ptr, int count = 1) {  }
-#define AssertValidThis() 
-#endif
-
-#ifdef _DEBUG
-class CReentryGuard
-{
-public:
-	CReentryGuard(int* pSemaphore)
-		: m_pSemaphore(pSemaphore)
-	{
-		++(*m_pSemaphore);
-	}
-
-	~CReentryGuard()
-	{
-		--(*m_pSemaphore);
-	}
-
-private:
-	int* m_pSemaphore;
-};
-
-#define ASSERT_NO_REENTRY() \
-	static int fSemaphore##__LINE__; \
-	Assert( !fSemaphore##__LINE__ ); \
-	CReentryGuard ReentryGuard##__LINE__( &fSemaphore##__LINE__ )
-#else
-#define ASSERT_NO_REENTRY()
-#endif
-
-#ifdef POSIX
-#define Tier0Internal_sntprintf  snprintf
-#define Tier0Internal_vsntprintf vsnprintf
-#define Tier0Internal_vsnprintf  vsnprintf
-#else
-#define Tier0Internal_sntprintf  _sntprintf
-#define Tier0Internal_vsntprintf _vsntprintf
-#define Tier0Internal_vsnprintf  _vsnprintf
-#endif
-
-#include "valve_off.h"
-class CDbgFmtMsg
-{
-public:
-	CDbgFmtMsg(PRINTF_FORMAT_STRING const tchar* pszFormat, ...)
-	{
-		va_list arg_ptr;
-
-		va_start(arg_ptr, pszFormat);
-		Tier0Internal_vsntprintf(m_szBuf, sizeof(m_szBuf) - 1, pszFormat, arg_ptr);
-		va_end(arg_ptr);
-
-		m_szBuf[sizeof(m_szBuf) - 1] = 0;
-	}
-
-	operator const tchar* () const
-	{
-		return m_szBuf;
-	}
-
-private:
-	tchar m_szBuf[256];
-};
-#include "valve_on.h"
-
-#if defined( _WIN32 ) && !defined( _X360 )
-
-#ifdef _DEBUG
-#pragma comment(compiler)
-#endif
-
-#endif
-
-#ifdef _DEBUG
-
-template< class Type >
-class CDataWatcher
-{
-public:
-	const Type& operator=(const Type& val)
-	{
-		return Set(val);
-	}
-
-	const Type& operator=(const CDataWatcher<Type>& val)
-	{
-		return Set(val.m_Value);
-	}
-
-	const Type& Set(const Type& val)
-	{
-		m_Value = val;
-		return m_Value;
-	}
-
-	Type& GetForModify()
-	{
-		return m_Value;
-	}
-
-	const Type& operator+=(const Type& val)
-	{
-		return Set(m_Value + val);
-	}
-
-	const Type& operator-=(const Type& val)
-	{
-		return Set(m_Value - val);
-	}
-
-	const Type& operator/=(const Type& val)
-	{
-		return Set(m_Value / val);
-	}
-
-	const Type& operator*=(const Type& val)
-	{
-		return Set(m_Value * val);
-	}
-
-	const Type& operator^=(const Type& val)
-	{
-		return Set(m_Value ^ val);
-	}
-
-	const Type& operator|=(const Type& val)
-	{
-		return Set(m_Value | val);
-	}
-
-	const Type& operator++()
-	{
-		return (*this += 1);
-	}
-
-	Type operator--()
-	{
-		return (*this -= 1);
-	}
-
-	Type operator++(int)   
-	{
-		Type val = m_Value;
-		(*this += 1);
-		return val;
-	}
-
-	Type operator--(int)   
-	{
-		Type val = m_Value;
-		(*this -= 1);
-		return val;
-	}
-
-	template< class C >
-	const Type& operator&=(C val)
-	{
-		return Set(m_Value & val);
-	}
-
-	operator const Type& () const
-	{
-		return m_Value;
-	}
-
-	const Type& Get() const
-	{
-		return m_Value;
-	}
-
-	const Type* operator->() const
-	{
-		return &m_Value;
-	}
-
-	Type m_Value;
-
-};
-
-#else
-
-template< class Type >
-class CDataWatcher
-{
-private:
-	CDataWatcher();       
-};
-
-#endif
-
-#ifdef IS_WINDOWS_PC
-
-typedef void* HardwareBreakpointHandle_t;
-
-enum EHardwareBreakpointType
-{
-	BREAKPOINT_EXECUTE = 0,
-	BREAKPOINT_WRITE,
-	BREAKPOINT_READWRITE,
-};
-
-enum EHardwareBreakpointSize
-{
-	BREAKPOINT_SIZE_1 = 1,
-	BREAKPOINT_SIZE_2 = 2,
-	BREAKPOINT_SIZE_4 = 4,
-	BREAKPOINT_SIZE_8 = 8,
-};
-
-PLATFORM_INTERFACE HardwareBreakpointHandle_t SetHardwareBreakpoint(EHardwareBreakpointType eType, EHardwareBreakpointSize eSize, const void* pvLocation);
-PLATFORM_INTERFACE bool ClearHardwareBreakpoint(HardwareBreakpointHandle_t handle);
-
-class CHardwareBreakPointScopeGuard
-{
-public:
-	CHardwareBreakPointScopeGuard(const void* pvLocation, size_t nLocationSize, EHardwareBreakpointType eType = BREAKPOINT_WRITE)
-	{
-		EHardwareBreakpointSize eSize = BREAKPOINT_SIZE_4;
-		switch (nLocationSize)
-		{
-		case 1:
-			eSize = BREAKPOINT_SIZE_1;
-			break;
-		case 2:
-			eSize = BREAKPOINT_SIZE_2;
-			break;
-		case 4:
-			eSize = BREAKPOINT_SIZE_4;
-			break;
-		case 8:
-			eSize = BREAKPOINT_SIZE_8;
-			break;
-		default:
-			Warning(_T("SetHardwareBreakpoint can only work with 1, 2, 4 or 8 byte data fields."));
-			break;
-		}
-
-		m_hBreakPoint = SetHardwareBreakpoint(eType, eSize, pvLocation);
-		m_bActive = m_hBreakPoint != (HardwareBreakpointHandle_t)0;
-	}
-
-	~CHardwareBreakPointScopeGuard()
-	{
-		Release();
-	}
-
-	void Release()
-	{
-		if (!m_bActive)
-			return;
-		ClearHardwareBreakpoint(m_hBreakPoint);
-	}
-
-private:
-	bool						m_bActive;
-	HardwareBreakpointHandle_t	m_hBreakPoint;
-};
-
-#endif  
-
-#else  
-
-#define  Assert( _exp )										((void)0)
-#define  AssertOnce( _exp )									((void)0)
-#define  AssertMsg( _exp, _msg )							((void)0)
-#define  AssertMsgOnce( _exp, _msg )						((void)0)
-#define  AssertFunc( _exp, _f )								((void)0)
-#define  AssertEquals( _exp, _expectedValue )				((void)0)
-#define  AssertFloatEquals( _exp, _expectedValue, _tol )	((void)0)
-#define  Verify( _exp )										(_exp)
-#define  VerifyEquals( _exp, _expectedValue )           	(_exp)
-
-#define  AssertMsg1( _exp, _msg, a1 )									((void)0)
-#define  AssertMsg2( _exp, _msg, a1, a2 )								((void)0)
-#define  AssertMsg3( _exp, _msg, a1, a2, a3 )							((void)0)
-#define  AssertMsg4( _exp, _msg, a1, a2, a3, a4 )						((void)0)
-#define  AssertMsg5( _exp, _msg, a1, a2, a3, a4, a5 )					((void)0)
-#define  AssertMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				((void)0)
-#define  AssertMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				((void)0)
-#define  AssertMsg7( _exp, _msg, a1, a2, a3, a4, a5, a6, a7 )			((void)0)
-#define  AssertMsg8( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8 )		((void)0)
-#define  AssertMsg9( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8, a9 )	((void)0)
-
-#define COMPILE_TIME_ASSERT( pred )
-#define ASSERT_INVARIANT( pred )
-
-#define  AssertFatal( _exp )									((void)0)
-#define  AssertFatalOnce( _exp )								((void)0)
-#define  AssertFatalMsg( _exp, _msg )							((void)0)
-#define  AssertFatalMsgOnce( _exp, _msg )						((void)0)
-#define  AssertFatalFunc( _exp, _f )							((void)0)
-#define  AssertFatalEquals( _exp, _expectedValue )				((void)0)
-#define  AssertFatalFloatEquals( _exp, _expectedValue, _tol )	((void)0)
-#define  VerifyFatal( _exp )									(_exp)
-#define  VerifyEqualsFatal( _exp, _expectedValue )				(_exp)
-
-#define  AssertFatalMsg1( _exp, _msg, a1 )									((void)0)
-#define  AssertFatalMsg2( _exp, _msg, a1, a2 )								((void)0)
-#define  AssertFatalMsg3( _exp, _msg, a1, a2, a3 )							((void)0)
-#define  AssertFatalMsg4( _exp, _msg, a1, a2, a3, a4 )						((void)0)
-#define  AssertFatalMsg5( _exp, _msg, a1, a2, a3, a4, a5 )					((void)0)
-#define  AssertFatalMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				((void)0)
-#define  AssertFatalMsg6( _exp, _msg, a1, a2, a3, a4, a5, a6 )				((void)0)
-#define  AssertFatalMsg7( _exp, _msg, a1, a2, a3, a4, a5, a6, a7 )			((void)0)
-#define  AssertFatalMsg8( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8 )		((void)0)
-#define  AssertFatalMsg9( _exp, _msg, a1, a2, a3, a4, a5, a6, a7, a8, a9 )	((void)0)
-
-#define AssertAligned(PTR)
-
-#endif
-
-
-#endif   
\ No newline at end of file
diff --git a/SpyCustom/dbgflag.h b/SpyCustom/dbgflag.h
deleted file mode 100644
index 97df078..0000000
--- a/SpyCustom/dbgflag.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef DBGFLAG_H
-#define DBGFLAG_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#undef DBGFLAG_MEMORY
-#undef DBGFLAG_MEMORY_NEWDEL
-#undef DBGFLAG_VALIDATE
-#undef DBGFLAG_ASSERT
-#undef DBGFLAG_ASSERTFATAL
-#undef DBGFLAG_ASSERTDLG
-#undef DBGFLAG_STRINGS
-
-#if defined( _DEBUG ) && !defined( PS3MEMOVERRIDEWRAP )
-
-#define DBGFLAG_MEMORY
-#ifdef _SERVER	                 
-#define DBGFLAG_MEMORY_NEWDEL	
-#endif
-#ifdef STEAM
-#define DBGFLAG_VALIDATE
-#endif
-#define DBGFLAG_ASSERT
-#define DBGFLAG_ASSERTFATAL
-#define DBGFLAG_ASSERTDLG
-#define DBGFLAG_STRINGS
-
-
-#else  
-#ifdef STEAM
-#define DBGFLAG_ASSERT
-#endif
-#define DBGFLAG_ASSERTFATAL		        
-#define DBGFLAG_ASSERTDLG
-
-#endif  
-
-#if defined( _CERT )
-#define DBGFLAG_STRINGS_STRIP
-#endif
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/deformations.h b/SpyCustom/deformations.h
deleted file mode 100644
index 65598e8..0000000
--- a/SpyCustom/deformations.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef DEFORMATIONS_H
-#define DEFORMATIONS_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-
-enum DeformationType_t
-{
-	DEFORMATION_CLAMP_TO_BOX_IN_WORLDSPACE = 1,							   
-};
-
-
-struct DeformationBase_t										     
-{
-	DeformationType_t m_eType;
-};
-
-
-struct BoxDeformation_t : DeformationBase_t
-{
-	Vector m_SourceMins;									    
-	float m_flPad0;
-	Vector m_SourceMaxes;
-	float m_flPad1;
-
-	Vector m_ClampMins;
-	float m_flPad2;
-	Vector m_ClampMaxes;
-	float m_flPad3;
-
-	FORCEINLINE BoxDeformation_t(void)
-	{
-		m_eType = DEFORMATION_CLAMP_TO_BOX_IN_WORLDSPACE;
-		m_SourceMins.Init(0, 0, 0);
-		m_SourceMaxes.Init(-1, -1, -1);
-
-		m_ClampMins.Init(-FLT_MAX, -FLT_MAX, -FLT_MAX);
-		m_ClampMaxes.Init(FLT_MAX, FLT_MAX, FLT_MAX);
-	}
-
-};
-
-
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/detours.h b/SpyCustom/detours.h
deleted file mode 100644
index b3e602e..0000000
--- a/SpyCustom/detours.h
+++ /dev/null
@@ -1,561 +0,0 @@
-#pragma once
-#ifndef _DETOURS_H_
-#define _DETOURS_H_
-
-#pragma comment(lib, "detours")
-
-#ifndef GUID_DEFINED
-#define GUID_DEFINED
-typedef struct  _GUID
-{
-    DWORD Data1;
-    WORD Data2;
-    WORD Data3;
-    BYTE Data4[ 8 ];
-} GUID;
-#endif  
-
-#if defined(__cplusplus)
-#ifndef _REFGUID_DEFINED
-#define _REFGUID_DEFINED
-#define REFGUID             const GUID &
-#endif  
-#else  
-#ifndef _REFGUID_DEFINED
-#define _REFGUID_DEFINED
-#define REFGUID             const GUID * const
-#endif  
-#endif  
-#ifdef __cplusplus
-extern "C" {
-#endif  
-
-#define DETOUR_INSTRUCTION_TARGET_NONE          ((PBYTE)0)
-#define DETOUR_INSTRUCTION_TARGET_DYNAMIC       ((PBYTE)~0ul)
-
-#define DETOUR_TRAMPOLINE_SIZE          32
-#define DETOUR_SECTION_HEADER_SIGNATURE 0x00727444    
-
-#define DETOUR_TRAMPOLINE(trampoline,target) \
-static PVOID __fastcall _Detours_GetVA_##target(VOID) \
-{ \
-    return &target; \
-} \
-\
-__declspec(naked) trampoline \
-{ \
-    __asm { nop };\
-    __asm { nop };\
-    __asm { call _Detours_GetVA_##target };\
-    __asm { jmp eax };\
-    __asm { ret };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-}
-
-#define DETOUR_TRAMPOLINE_EMPTY(trampoline) \
-__declspec(naked) trampoline \
-{ \
-    __asm { nop };\
-    __asm { nop };\
-    __asm { xor eax, eax };\
-    __asm { mov eax, [eax] };\
-    __asm { ret };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-    __asm { nop };\
-}
-
-#pragma pack(push, 8)
-typedef struct _DETOUR_SECTION_HEADER
-{
-    DWORD       cbHeaderSize;
-    DWORD       nSignature;
-    DWORD       nDataOffset;
-    DWORD       cbDataSize;
-    
-    DWORD       nOriginalImportVirtualAddress;
-    DWORD       nOriginalImportSize;
-    DWORD       nOriginalBoundImportVirtualAddress;
-    DWORD       nOriginalBoundImportSize;
-    
-    DWORD       nOriginalIatVirtualAddress;
-    DWORD       nOriginalIatSize;
-    DWORD       nOriginalSizeOfImage;
-    DWORD       nReserve;
-} DETOUR_SECTION_HEADER, *PDETOUR_SECTION_HEADER;
-
-typedef struct _DETOUR_SECTION_RECORD
-{
-    DWORD       cbBytes;
-    DWORD       nReserved;
-    GUID        guid;
-} DETOUR_SECTION_RECORD, *PDETOUR_SECTION_RECORD;
-#pragma pack(pop)
-
-#define DETOUR_SECTION_HEADER_DECLARE(cbSectionSize) \
-{ \
-      sizeof(DETOUR_SECTION_HEADER),\
-      DETOUR_SECTION_HEADER_SIGNATURE,\
-      sizeof(DETOUR_SECTION_HEADER),\
-      (cbSectionSize),\
-      \
-      0,\
-      0,\
-      0,\
-      0,\
-      \
-      0,\
-      0,\
-      0,\
-      0,\
-}
-
-typedef BOOL (CALLBACK *PF_DETOUR_BINARY_BYWAY_CALLBACK)(PVOID pContext,
-                                                         PCHAR pszFile,
-                                                         PCHAR *ppszOutFile);
-typedef BOOL (CALLBACK *PF_DETOUR_BINARY_FILE_CALLBACK)(PVOID pContext,
-                                                        PCHAR pszOrigFile,
-                                                        PCHAR pszFile,
-                                                        PCHAR *ppszOutFile);
-typedef BOOL (CALLBACK *PF_DETOUR_BINARY_SYMBOL_CALLBACK)(PVOID pContext,
-                                                          DWORD nOrdinal,
-                                                          PCHAR pszOrigSymbol,
-                                                          PCHAR pszSymbol,
-                                                          PCHAR *ppszOutSymbol);
-typedef BOOL (CALLBACK *PF_DETOUR_BINARY_FINAL_CALLBACK)(PVOID pContext);
-typedef BOOL (CALLBACK *PF_DETOUR_BINARY_EXPORT_CALLBACK)(PVOID pContext,
-                                                          DWORD nOrdinal,
-                                                          PCHAR pszName,
-                                                          PBYTE pbCode);
-
-typedef VOID * PDETOUR_BINARY;
-typedef VOID * PDETOUR_LOADED_BINARY;
-
-PBYTE WINAPI DetourFunction(PBYTE pbTargetFunction,
-                            PBYTE pbDetourFunction);
-
-BOOL WINAPI DetourFunctionWithEmptyTrampoline(PBYTE pbTrampoline,
-                                              PBYTE pbTarget,
-                                              PBYTE pbDetour);
-
-BOOL WINAPI DetourFunctionWithEmptyTrampolineEx(PBYTE pbTrampoline,
-                                                PBYTE pbTarget,
-                                                PBYTE pbDetour,
-                                                PBYTE *ppbRealTrampoline,
-                                                PBYTE *ppbRealTarget,
-                                                PBYTE *ppbRealDetour);
-
-BOOL  WINAPI DetourFunctionWithTrampoline(PBYTE pbTrampoline,
-                                          PBYTE pbDetour);
-
-BOOL  WINAPI DetourFunctionWithTrampolineEx(PBYTE pbTrampoline,
-                                            PBYTE pbDetour,
-                                            PBYTE *ppbRealTrampoline,
-                                            PBYTE *ppbRealTarget);
-
-BOOL  WINAPI DetourRemove(PBYTE pbTrampoline, PBYTE pbDetour);
-
-PBYTE WINAPI DetourFindFunction(PCHAR pszModule, PCHAR pszFunction);
-PBYTE WINAPI DetourGetFinalCode(PBYTE pbCode, BOOL fSkipJmp);
-
-PBYTE WINAPI DetourCopyInstruction(PBYTE pbDst, PBYTE pbSrc, PBYTE *ppbTarget);
-PBYTE WINAPI DetourCopyInstructionEx(PBYTE pbDst,
-                                     PBYTE pbSrc,
-                                     PBYTE *ppbTarget,
-                                     LONG *plExtra);
-
-HMODULE WINAPI DetourEnumerateModules(HMODULE hModuleLast);
-PBYTE WINAPI DetourGetEntryPoint(HMODULE hModule);
-BOOL WINAPI DetourEnumerateExports(HMODULE hModule,
-                                   PVOID pContext,
-                                   PF_DETOUR_BINARY_EXPORT_CALLBACK pfExport);
-
-PBYTE WINAPI DetourFindPayload(HMODULE hModule, REFGUID rguid, DWORD *pcbData);
-DWORD WINAPI DetourGetSizeOfPayloads(HMODULE hModule);
-
-BOOL WINAPI DetourBinaryBindA(PCHAR pszFile, PCHAR pszDll, PCHAR pszPath);
-BOOL WINAPI DetourBinaryBindW(PWCHAR pwzFile, PWCHAR pwzDll, PWCHAR pwzPath);
-#ifdef UNICODE
-#define DetourBinaryBind  DetourBinaryBindW
-#else
-#define DetourBinaryBind  DetourBinaryBindA
-#endif  
-
-PDETOUR_BINARY WINAPI DetourBinaryOpen(HANDLE hFile);
-PBYTE WINAPI DetourBinaryEnumeratePayloads(PDETOUR_BINARY pBinary,
-                                           GUID *pGuid,
-                                           DWORD *pcbData,
-                                           DWORD *pnIterator);
-PBYTE WINAPI DetourBinaryFindPayload(PDETOUR_BINARY pBinary,
-                                     REFGUID rguid,
-                                     DWORD *pcbData);
-PBYTE WINAPI DetourBinarySetPayload(PDETOUR_BINARY pBinary,
-                                    REFGUID rguid,
-                                    PBYTE pbData,
-                                    DWORD cbData);
-BOOL WINAPI DetourBinaryDeletePayload(PDETOUR_BINARY pBinary, REFGUID rguid);
-BOOL WINAPI DetourBinaryPurgePayloads(PDETOUR_BINARY pBinary);
-BOOL WINAPI DetourBinaryResetImports(PDETOUR_BINARY pBinary);
-BOOL WINAPI DetourBinaryEditImports(PDETOUR_BINARY pBinary,
-                                    PVOID pContext,
-                                    PF_DETOUR_BINARY_BYWAY_CALLBACK pfByway,
-                                    PF_DETOUR_BINARY_FILE_CALLBACK pfFile,
-                                    PF_DETOUR_BINARY_SYMBOL_CALLBACK pfSymbol,
-                                    PF_DETOUR_BINARY_FINAL_CALLBACK pfFinal);
-BOOL WINAPI DetourBinaryWrite(PDETOUR_BINARY pBinary, HANDLE hFile);
-BOOL WINAPI DetourBinaryClose(PDETOUR_BINARY pBinary);
-
-LPTOP_LEVEL_EXCEPTION_FILTER WINAPI
-DetourFirstChanceExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelFilter);
-
-typedef BOOL (WINAPI *PDETOUR_CREATE_PROCESS_ROUTINEA)
-    (LPCSTR lpApplicationName,
-     LPSTR lpCommandLine,
-     LPSECURITY_ATTRIBUTES lpProcessAttributes,
-     LPSECURITY_ATTRIBUTES lpThreadAttributes,
-     BOOL bInheritHandles,
-     DWORD dwCreationFlags,
-     LPVOID lpEnvironment,
-     LPCSTR lpCurrentDirectory,
-     LPSTARTUPINFOA lpStartupInfo,
-     LPPROCESS_INFORMATION lpProcessInformation);
-
-typedef BOOL (WINAPI *PDETOUR_CREATE_PROCESS_ROUTINEW)
-    (LPCWSTR lpApplicationName,
-     LPWSTR lpCommandLine,
-     LPSECURITY_ATTRIBUTES lpProcessAttributes,
-     LPSECURITY_ATTRIBUTES lpThreadAttributes,
-     BOOL bInheritHandles,
-     DWORD dwCreationFlags,
-     LPVOID lpEnvironment,
-     LPCWSTR lpCurrentDirectory,
-     LPSTARTUPINFOW lpStartupInfo,
-     LPPROCESS_INFORMATION lpProcessInformation);
-                                  
-BOOL WINAPI DetourCreateProcessWithDllA(LPCSTR lpApplicationName,
-                                        LPSTR lpCommandLine,
-                                        LPSECURITY_ATTRIBUTES lpProcessAttributes,
-                                        LPSECURITY_ATTRIBUTES lpThreadAttributes,
-                                        BOOL bInheritHandles,
-                                        DWORD dwCreationFlags,
-                                        LPVOID lpEnvironment,
-                                        LPCSTR lpCurrentDirectory,
-                                        LPSTARTUPINFOA lpStartupInfo,
-                                        LPPROCESS_INFORMATION lpProcessInformation,
-                                        LPCSTR lpDllName,
-                                        PDETOUR_CREATE_PROCESS_ROUTINEA
-                                        pfCreateProcessA);
-
-BOOL WINAPI DetourCreateProcessWithDllW(LPCWSTR lpApplicationName,
-                                        LPWSTR lpCommandLine,
-                                        LPSECURITY_ATTRIBUTES lpProcessAttributes,
-                                        LPSECURITY_ATTRIBUTES lpThreadAttributes,
-                                        BOOL bInheritHandles,
-                                        DWORD dwCreationFlags,
-                                        LPVOID lpEnvironment,
-                                        LPCWSTR lpCurrentDirectory,
-                                        LPSTARTUPINFOW lpStartupInfo,
-                                        LPPROCESS_INFORMATION lpProcessInformation,
-                                        LPCWSTR lpDllName,
-                                        PDETOUR_CREATE_PROCESS_ROUTINEW
-                                        pfCreateProcessW);
-                  
-#ifdef UNICODE
-#define DetourCreateProcessWithDll  DetourCreateProcessWithDllW
-#define PDETOUR_CREATE_PROCESS_ROUTINE     PDETOUR_CREATE_PROCESS_ROUTINEW
-#else
-#define DetourCreateProcessWithDll  DetourCreateProcessWithDllA
-#define PDETOUR_CREATE_PROCESS_ROUTINE     PDETOUR_CREATE_PROCESS_ROUTINEA
-#endif  
-
-BOOL WINAPI DetourContinueProcessWithDllA(HANDLE hProcess, LPCSTR lpDllName);
-BOOL WINAPI DetourContinueProcessWithDllW(HANDLE hProcess, LPCWSTR lpDllName);
-
-#ifdef UNICODE
-#define DetourContinueProcessWithDll    DetourContinueProcessWithDllW
-#else
-#define DetourContinueProcessWithDll    DetourContinueProcessWithDllA
-#endif  
-#ifdef __cplusplus
-}
-#endif  
-
-#define ContinueProcessWithDll            DetourContinueProcessWithDll 
-#define ContinueProcessWithDllA           DetourContinueProcessWithDllA
-#define ContinueProcessWithDllW           DetourContinueProcessWithDllW
-#define CreateProcessWithDll              DetourCreateProcessWithDll 
-#define CreateProcessWithDllA             DetourCreateProcessWithDllA
-#define CreateProcessWithDllW             DetourCreateProcessWithDllW
-#define DETOUR_TRAMPOLINE_WO_TARGET       DETOUR_TRAMPOLINE_EMPTY
-#define DetourBinaryPurgePayload          DetourBinaryPurgePayloads
-#define DetourEnumerateExportsForInstance DetourEnumerateExports
-#define DetourEnumerateInstances          DetourEnumerateModules
-#define DetourFindEntryPointForInstance   DetourGetEntryPoint
-#define DetourFindFinalCode               DetourGetFinalCode
-#define DetourFindPayloadInBinary         DetourFindPayload
-#define DetourGetSizeOfBinary             DetourGetSizeOfPayloads
-#define DetourRemoveWithTrampoline        DetourRemove
-#define PCREATE_PROCESS_ROUTINE           PDETOUR_CREATE_PROCESS_ROUTINE
-#define PCREATE_PROCESS_ROUTINEA          PDETOUR_CREATE_PROCESS_ROUTINEA
-#define PCREATE_PROCESS_ROUTINEW          PDETOUR_CREATE_PROCESS_ROUTINEW
-#ifdef __cplusplus
-#ifdef DETOURS_INTERNAL
-
-#ifdef IMAGEAPI    
-typedef LPAPI_VERSION (NTAPI *PF_ImagehlpApiVersionEx)(LPAPI_VERSION AppVersion);
-
-typedef BOOL (NTAPI *PF_SymInitialize)(IN HANDLE hProcess,
-                                       IN LPSTR UserSearchPath,
-                                       IN BOOL fInvadeProcess);
-typedef DWORD (NTAPI *PF_SymSetOptions)(IN DWORD SymOptions);
-typedef DWORD (NTAPI *PF_SymGetOptions)(VOID);
-typedef BOOL (NTAPI *PF_SymLoadModule)(IN HANDLE hProcess,
-                                       IN HANDLE hFile,
-                                       IN PSTR ImageName,
-                                       IN PSTR ModuleName,
-                                       IN DWORD BaseOfDll,
-                                       IN DWORD SizeOfDll);
-typedef BOOL (NTAPI *PF_SymGetModuleInfo)(IN HANDLE hProcess,
-                                          IN DWORD dwAddr,
-                                          OUT PIMAGEHLP_MODULE ModuleInfo);
-typedef BOOL (NTAPI *PF_SymGetSymFromName)(IN HANDLE hProcess,
-                                           IN LPSTR Name,
-                                           OUT PIMAGEHLP_SYMBOL Symbol);
-typedef BOOL (NTAPI *PF_BindImage)(IN LPSTR pszImageName,
-                                   IN LPSTR pszDllPath,
-                                   IN LPSTR pszSymbolPath);
-
-typedef struct _DETOUR_SYM_INFO
-{
-    HANDLE                   hProcess;
-    HMODULE                  hImageHlp;
-    PF_ImagehlpApiVersionEx  pfImagehlpApiVersionEx;
-    PF_SymInitialize         pfSymInitialize;
-    PF_SymSetOptions         pfSymSetOptions;
-    PF_SymGetOptions         pfSymGetOptions;
-    PF_SymLoadModule         pfSymLoadModule;
-    PF_SymGetModuleInfo      pfSymGetModuleInfo;
-    PF_SymGetSymFromName     pfSymGetSymFromName;
-    PF_BindImage             pfBindImage;
-} DETOUR_SYM_INFO, *PDETOUR_SYM_INFO;
-
-PDETOUR_SYM_INFO DetourLoadImageHlp(VOID);
-
-#endif  
-
-class CDetourEnableWriteOnCodePage
-{
-public:
-    CDetourEnableWriteOnCodePage(PBYTE pbCode, LONG cbCode = DETOUR_TRAMPOLINE_SIZE)
-    {
-        m_pbCode = pbCode;
-        m_cbCode = cbCode;
-        m_dwOldPerm = 0;
-        m_hProcess = GetCurrentProcess();
-
-        if (m_pbCode && m_cbCode) {
-            if (!FlushInstructionCache(m_hProcess, pbCode, cbCode)) {
-                return;
-            }
-            if (!VirtualProtect(pbCode,
-                                cbCode,
-                                PAGE_EXECUTE_READWRITE,
-                                &m_dwOldPerm)) {
-                return;
-            }
-        }
-    }
-
-    ~CDetourEnableWriteOnCodePage()
-    {
-        if (m_dwOldPerm && m_pbCode && m_cbCode) {
-            DWORD dwTemp = 0;
-            if (!FlushInstructionCache(m_hProcess, m_pbCode, m_cbCode)) {
-                return;
-            }
-            if (!VirtualProtect(m_pbCode, m_cbCode, m_dwOldPerm, &dwTemp)) {
-                return;
-            }
-        }
-    }
-
-    BOOL SetPermission(DWORD dwPerms)
-    {
-        if (m_dwOldPerm && m_pbCode && m_cbCode) {
-            m_dwOldPerm = dwPerms;
-            return TRUE;
-        }
-        return FALSE;
-    }
-
-    BOOL IsValid(VOID)
-    {
-        return m_pbCode && m_cbCode && m_dwOldPerm;
-    }
-
-private:
-    HANDLE  m_hProcess;
-    PBYTE   m_pbCode;
-    LONG    m_cbCode;
-    DWORD   m_dwOldPerm;
-};
-
-inline PBYTE DetourGenMovEax(PBYTE pbCode, UINT32 nValue)
-{
-    *pbCode++ = 0xB8;
-    *((UINT32*&)pbCode)++ = nValue;
-    return pbCode;
-}
-
-inline PBYTE DetourGenMovEbx(PBYTE pbCode, UINT32 nValue)
-{
-    *pbCode++ = 0xBB;
-    *((UINT32*&)pbCode)++ = nValue;
-    return pbCode;
-}
-
-inline PBYTE DetourGenMovEcx(PBYTE pbCode, UINT32 nValue)
-{
-    *pbCode++ = 0xB9;
-    *((UINT32*&)pbCode)++ = nValue;
-    return pbCode;
-}
-
-inline PBYTE DetourGenMovEdx(PBYTE pbCode, UINT32 nValue)
-{
-    *pbCode++ = 0xBA;
-    *((UINT32*&)pbCode)++ = nValue;
-    return pbCode;
-}
-
-inline PBYTE DetourGenMovEsi(PBYTE pbCode, UINT32 nValue)
-{
-    *pbCode++ = 0xBE;
-    *((UINT32*&)pbCode)++ = nValue;
-    return pbCode;
-}
-
-inline PBYTE DetourGenMovEdi(PBYTE pbCode, UINT32 nValue)
-{
-    *pbCode++ = 0xBF;
-    *((UINT32*&)pbCode)++ = nValue;
-    return pbCode;
-}
-
-inline PBYTE DetourGenMovEbp(PBYTE pbCode, UINT32 nValue)
-{
-    *pbCode++ = 0xBD;
-    *((UINT32*&)pbCode)++ = nValue;
-    return pbCode;
-}
-
-inline PBYTE DetourGenMovEsp(PBYTE pbCode, UINT32 nValue)
-{
-    *pbCode++ = 0xBC;
-    *((UINT32*&)pbCode)++ = nValue;
-    return pbCode;
-}
-
-inline PBYTE DetourGenPush(PBYTE pbCode, UINT32 nValue)
-{
-    *pbCode++ = 0x68;
-    *((UINT32*&)pbCode)++ = nValue;
-    return pbCode;
-}
-
-inline PBYTE DetourGenPushad(PBYTE pbCode)
-{
-    *pbCode++ = 0x60;
-    return pbCode;
-}
-
-inline PBYTE DetourGenPopad(PBYTE pbCode)
-{
-    *pbCode++ = 0x61;
-    return pbCode;
-}
-
-inline PBYTE DetourGenJmp(PBYTE pbCode, PBYTE pbJmpDst, PBYTE pbJmpSrc = 0)
-{
-    if (pbJmpSrc == 0) {
-        pbJmpSrc = pbCode;
-    }
-    *pbCode++ = 0xE9;
-    *((INT32*&)pbCode)++ = pbJmpDst - (pbJmpSrc + 5);
-    return pbCode;
-}
-
-inline PBYTE DetourGenCall(PBYTE pbCode, PBYTE pbJmpDst, PBYTE pbJmpSrc = 0)
-{
-    if (pbJmpSrc == 0) {
-        pbJmpSrc = pbCode;
-    }
-    *pbCode++ = 0xE8;
-    *((INT32*&)pbCode)++ = pbJmpDst - (pbJmpSrc + 5);
-    return pbCode;
-}
-
-inline PBYTE DetourGenBreak(PBYTE pbCode)
-{
-    *pbCode++ = 0xcc;
-    return pbCode;
-}
-
-inline PBYTE DetourGenRet(PBYTE pbCode)
-{
-    *pbCode++ = 0xc3;
-    return pbCode;
-}
-
-inline PBYTE DetourGenNop(PBYTE pbCode)
-{
-    *pbCode++ = 0x90;
-    return pbCode;
-}
-#endif DETOURS_INTERAL
-#endif  
-
-#endif  
diff --git a/SpyCustom/detours.lib b/SpyCustom/detours.lib
deleted file mode 100644
index 56c6a8d..0000000
Binary files a/SpyCustom/detours.lib and /dev/null differ
diff --git a/SpyCustom/dlight.h b/SpyCustom/dlight.h
deleted file mode 100644
index 6f9127e..0000000
--- a/SpyCustom/dlight.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#if !defined ( DLIGHTH )
-#define DLIGHTH
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vector.h"
-
-enum
-{
-    DLIGHT_NO_WORLD_ILLUMINATION = 0x1,
-    DLIGHT_NO_MODEL_ILLUMINATION = 0x2,
-
-    DLIGHT_ADD_DISPLACEMENT_ALPHA = 0x4,
-    DLIGHT_SUBTRACT_DISPLACEMENT_ALPHA = 0x8,
-    DLIGHT_DISPLACEMENT_MASK = (DLIGHT_ADD_DISPLACEMENT_ALPHA | DLIGHT_SUBTRACT_DISPLACEMENT_ALPHA),
-};
-
-struct dlight_t
-{
-    int     flags;
-    Vector  origin;
-    float   radius;
-    ColorRGBExp32	   color;           
-    float   die;                     
-    float   decay;                  
-    float   minlight;                
-    int     key;
-    int     style;               
-
-    Vector  m_Direction;             
-    float   m_InnerAngle;
-    float   m_OuterAngle;
-
-    float GetRadius() const
-    {
-        return radius;
-    }
-
-    float GetRadiusSquared() const
-    {
-        return radius * radius;
-    }
-
-    float IsRadiusGreaterThanZero() const
-    {
-        return radius > 0.0f;
-    }
-};
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/dllmain.cpp b/SpyCustom/dllmain.cpp
deleted file mode 100644
index ca64288..0000000
--- a/SpyCustom/dllmain.cpp
+++ /dev/null
@@ -1,389 +0,0 @@
-#pragma once
-#include <iostream>
-#include "Interfaces.hpp"
-#include "NetVarManager.hpp"
-#include "VMT.hpp"
-#include "EventListener.hpp"
-#include <string>
-#include "detours.h"
-#pragma comment(lib, "detours.lib")
-#include "imgui/imgui.h"
-#include "imgui/imgui_impl_dx9.h"
-#include "imgui/imgui_impl_win32.h"
-#include <d3d9.h>
-#include <d3dx9.h>
-#pragma comment(lib, "d3d9.lib")
-#pragma comment(lib, "d3dx9.lib")
-#include "Other.hpp"
-#include "c_baseentity.h" 
-#include "PatternScan.hpp"
-#include "SkinChanger.hpp"
-#include "Config.hpp"
-#include "protobuffs.hpp"
-using namespace std;
-#include "proxies.hpp"
-#include "netchannel.hpp"
-#include "Hooks.hpp"
-#include "Menu.hpp"
-#include "SkinChanger.hpp"
- 
-
-void OnLevelInit()
-{
-    if (g_Options.skyboxactive)
-    {
-        iff.g_pCVar->FindVar("sv_skyname")->SetValue((char*)g_Options.skyboxtemp.value.get());
-        iff.g_pCVar->FindVar("r_3dsky")->SetValue(false);
-    }
-
-    if (g_Options.fogactive)
-    {
-        iff.g_pCVar->FindVar("fog_override")->SetValue(true);
-        iff.g_pCVar->FindVar("fog_color")->SetValue(
-            std::string("").
-            append(std::to_string(g_Options.fogcolor.value->r * 255)).
-            append(" ").
-            append(std::to_string(g_Options.fogcolor.value->g * 255)).
-            append(" ").
-            append(std::to_string(g_Options.fogcolor.value->b * 255)).
-            append(" ").c_str()
-        );
-        iff.g_pCVar->FindVar("fog_colorskybox")->SetValue(
-            std::string("").
-            append(std::to_string(g_Options.fogcolor.value->r * 255)).
-            append(" ").
-            append(std::to_string(g_Options.fogcolor.value->g * 255)).
-            append(" ").
-            append(std::to_string(g_Options.fogcolor.value->b * 255)).
-            append(" ").c_str()
-        ); 
-        iff.g_pCVar->FindVar("fog_maxdensity")->SetValue(g_Options.fogdensity); 
-        iff.g_pCVar->FindVar("fog_maxdensityskybox")->SetValue(g_Options.fogdensity);
-        iff.g_pCVar->FindVar("fog_start")->SetValue(g_Options.fogstart); 
-        iff.g_pCVar->FindVar("fog_startskybox")->SetValue(g_Options.fogstart);
-        iff.g_pCVar->FindVar("fog_end")->SetValue(g_Options.fogend);
-        iff.g_pCVar->FindVar("fog_endskybox")->SetValue(g_Options.fogend);
-    }
-
-    iff.g_pCVar->FindVar("r_rainlength")->SetValue(*g_Options.rainlength);
-    iff.g_pCVar->FindVar("r_rainspeed")->SetValue(*g_Options.rainspeed);
-    iff.g_pCVar->FindVar("r_rainradius")->SetValue(*g_Options.rainradius);
-    iff.g_pCVar->FindVar("cl_windspeed")->SetValue(*g_Options.windspeed);
-    iff.g_pCVar->FindVar("r_rainwidth")->SetValue(*g_Options.rainwidth);
-    iff.g_pCVar->FindVar("r_RainSideVel")->SetValue(*g_Options.rainsidevel);
-    iff.g_pCVar->FindVar("r_rainalpha")->SetValue(*g_Options.rainalpha);
-
-    iff.g_pCVar->FindVar("mat_force_tonemap_scale")->SetValue(g_Options.tonemapscale);
-
-    colorWorld();
-
-    if (g_Options.prime)
-    {
-        DWORD old_protect;
-        VirtualProtect(iff.prime, 5, PAGE_EXECUTE_READWRITE, &old_protect);
-        char patch[] = { 0x31, 0xC0, 0xFE, 0xC0, 0xC3 };
-        memcpy(iff.prime, patch, 5);
-        VirtualProtect(iff.prime, 5, old_protect, nullptr);
-    }
-
-}
- 
-
-void OnLoadCfg()
-{
-    for (int i = 0; i < 5; i++)
-    {
-        if (g_Options.customtextures.value->arr[i].texturelink) {
-            g_Options.customtextures.value->arr[i].texturelink = CreateMaterial(
-                string(g_Options.customtextures.value->arr[i].Name),
-                string(g_Options.customtextures.value->arr[i].keyvalue)); 
-            opt.dmeitems.at(i) = g_Options.customtextures.value->arr[i].Preview;
-        }
-    }
-
-    OnLevelInit();
-
-    const auto& paintkitMap = itemSystem()->getItemSchema()->paintKits;
-
-    for (int n = 0; n < g_Options.weapons.value->weaponzcount; n++)
-    {
-        CPaintKit* pk = (CPaintKit*)paintkitMap.memory[g_Options.weapons.value->arr[n].skinidc].value;
-        opt.sc_skins[g_Options.weapons.value->arr[n].skinidc].link = (DWORD)pk;
-        pk->rarity = g_Options.weapons.value->arr[n].rarity;
-        opt.sc_skins[g_Options.weapons.value->arr[n].skinidc].rarity =  g_Options.weapons.value->arr[n].rarity;
-        pk->pearlescent = g_Options.weapons.value->arr[n].pearl;
-        opt.sc_skins[g_Options.weapons.value->arr[n].skinidc].pearl =  g_Options.weapons.value->arr[n].pearl;
-        pk->color1 = g_Options.weapons.value->arr[n].color1;
-        opt.sc_skins[g_Options.weapons.value->arr[n].skinidc].color1 = g_Options.weapons.value->arr[n].color1;
-        pk->color2 = g_Options.weapons.value->arr[n].color2;
-        opt.sc_skins[g_Options.weapons.value->arr[n].skinidc].color2 = g_Options.weapons.value->arr[n].color2;
-        pk->color3 = g_Options.weapons.value->arr[n].color3;
-        opt.sc_skins[g_Options.weapons.value->arr[n].skinidc].color3 = g_Options.weapons.value->arr[n].color3;
-        pk->color4 = g_Options.weapons.value->arr[n].color4;
-        opt.sc_skins[g_Options.weapons.value->arr[n].skinidc].color4 = g_Options.weapons.value->arr[n].color4;
-
-    }
-    
-    iff.g_pClientState->ForceFullUpdate();
-    opt.needupdate = 1;
-    ProtoFeatures.SendClientHello();
-    ProtoFeatures.SendMatchmakingClient2GCHello();
-    
-    opt.loading = 0;
-}
-
-  
-DWORD WINAPI HackThread(HMODULE hModule)
-{
-
-    while (!GetModuleHandleA("serverbrowser.dll"))
-        Sleep(1000);
-
-#ifdef DEBUG
-    AllocConsole();
-    FILE* f;
-    freopen_s(&f, "CONOUT$", "w", stdout);
-    printf("Cheat launched\n");
-#endif
-
-    iff.Init();
-
-    opt.hModuleGlobal = hModule;
-
-    NetvarSys::Get().Initialize();
-
-    DMEHook = new VMTHook(iff.g_pMdlRender);
-    DMEHook->SwapPointer(21, reinterpret_cast<void*>(DrawModelExecute));
-    DMEHook->ApplyNewTable();
-    
-    D3DHook = new VMTHook(iff.g_pD3DDevice9);
-    D3DHook->SwapPointer(42, reinterpret_cast<void*>(hkEndScene));
-    D3DHook->ApplyNewTable();
-
-    GameEventManagerHook = new VMTHook(iff.g_pGameEvents);
-    GameEventManagerHook->SwapPointer(9, reinterpret_cast<void*>(hkFireEventClientSide));
-    GameEventManagerHook->ApplyNewTable();
-     
-    ProtoHook = new VMTHook(iff.g_SteamGameCoordinator);
-    ProtoHook->SwapPointer(0, reinterpret_cast<void*>(hkGCSendMessage));
-    ProtoHook->SwapPointer(2, reinterpret_cast<void*>(hkGCRetrieveMessage));
-    ProtoHook->ApplyNewTable();
-
-    CacheHook = new VMTHook(iff.g_pMdlCache);
-    CacheHook->SwapPointer(10, reinterpret_cast<void*>(hkFindMDL));
-    CacheHook->ApplyNewTable();
-
-    SoundHook = new VMTHook(iff.g_pEngineSound);
-    SoundHook->SwapPointer(5, reinterpret_cast<void*>(hkEmitSound1));
-    SoundHook->ApplyNewTable();
-
-    
-    VGUISurfHook = new VMTHook(iff.g_pVGuiSurface);
-    VGUISurfHook->SwapPointer(67, reinterpret_cast<void*>(hkLockCursor));
-    VGUISurfHook->ApplyNewTable();
-    
-    ClientModeHook = new VMTHook(iff.g_ClientMode);
-    ClientModeHook->SwapPointer(44, reinterpret_cast<void*>(hkdoPostScreenEffects));
-    ClientModeHook->ApplyNewTable();
-
-    FileSystemHook = new VMTHook(iff.g_pFullFileSystem);
-    FileSystemHook->SwapPointer(101, reinterpret_cast<void*>(hkGetUnverifiedFileHashes));
-    FileSystemHook->ApplyNewTable();
-
-    InitSkinChanger();
-
-    Sleep(1000);
-    
-    ClientHook = new VMTHook(iff.g_pClient);
-    ClientHook->SwapPointer(37, reinterpret_cast<void*>(hkFrameStageNotify));
-    ClientHook->ApplyNewTable();
-
-    iff.g_pGameConsole->Clear();
-
-	EventListener* eventListener = new EventListener();
-
-    Color color = { 255,255,0,255 }; 
-    iff.g_pCVar->ConsoleColorPrintf(color, "zdarova\n"); 
-     
-    ConVar* sv_skyname = iff.g_pCVar->FindVar("sv_skyname");
-
-     
-    int proxyindex = 0;
-    for (ClientClass* pClass = iff.g_pClient->GetAllClasses(); pClass; pClass = pClass->m_pNext) {
-        if (!strcmp(pClass->m_pNetworkName, "CBaseViewModel")) {
-            RecvTable* pClassTable = pClass->m_pRecvTable;
-            for (int nIndex = 0; nIndex < pClassTable->m_nProps; nIndex++) {
-                RecvProp* pProp = &pClassTable->m_pProps[nIndex];
-                if (!pProp || strcmp(pProp->m_pVarName, "m_nSequence"))
-                    continue;
-                proxyindex = nIndex;
-                fnSequenceProxyFn = pProp->m_ProxyFn;
-                pProp->m_ProxyFn = (RecvVarProxyFn)SetViewModelSequence;
-                break;
-            }
-            break;
-        }
-    }
-      
-    ifstream loadcfg("seaside_autoload");
-    if (loadcfg.is_open())
-    {
-#ifdef DEBUG
-        printf("autoload found\n"); 
-#endif
-        opt.autoload = true;
-        Sleep(1000);
-        Config::Get().Load();
-        loadcfg.close();
-    }
-    else
-    {
-#ifdef DEBUG
-        printf("autoload NOT found, creatin mat\n");
-#endif
-        opt.autoload = false;
-
-        g_Options.customtextures.value->arr[0].texturelink = CreateMaterial(
-            string(g_Options.customtextures.value->arr[0].Name),
-            string(g_Options.customtextures.value->arr[0].keyvalue));
-    }
-
-
-    while (!opt.unhook)
-    {
-
-        if (GetAsyncKeyState(VK_INSERT) & 1)
-        {
-            opt.show = !opt.show;
-#ifdef DEBUG
-            cout << "Show " << opt.show << endl;
-#endif
-            if (!opt.show)
-                iff.g_pInputSystem->EnableInput(1);
-            else
-                iff.g_pInputSystem->EnableInput(0);
-        }
-
-        if (!opt.netchannedlhooked && iff.g_pEngineClient->IsConnected())
-            HookNetchannel();
-
-        if (iff.g_pEngineClient->IsInGame()) {
-            if (!*g_Options.dme_gettextures)
-            {
-                IMaterial* mats[1];
-                for (int i = 5; i < g_Options.materials.value->itemcount; i++) {
-                    int mdlindex = iff.g_pMdlInfo->GetModelIndex(g_Options.models.value->arr[i - 2].vmodel_orig);
-                    if (mdlindex != -1) {
-                        model_t* pModel = (model_t*)iff.g_pMdlInfo->GetModel(mdlindex);
-                        iff.g_pMdlInfo->GetModelMaterials(pModel, 1, mats);
-                        const char* matname = mats[0]->GetName();
-                        if (g_Options.materials.value->arr[i].texture[0] == 0x0)
-                            strcpy(g_Options.materials.value->arr[i].texture, matname);
-                        if (g_Options.materials.value->arr[i].texture_temp[0] == 0x0)
-                            strcpy(g_Options.materials.value->arr[i].texture_temp, matname);
-                    }
-                }
-#ifdef DEBUG
-                printf("Model materials dumped\n");
-#endif
-                *g_Options.dme_gettextures = true;
-            }
-        }
-        else
-        {
-            opt.disconnected = 1;
-        }
-
-
-
-        Sleep(20); 
-    }
-    opt.show = false;
-
-    
-    for (ClientClass* pClass = iff.g_pClient->GetAllClasses(); pClass; pClass = pClass->m_pNext) {
-        if (!strcmp(pClass->m_pNetworkName, "CBaseViewModel")) {
-            RecvTable* pClassTable = pClass->m_pRecvTable;
-            RecvProp* pProp = &pClassTable->m_pProps[proxyindex];
-            pProp->m_ProxyFn = fnSequenceProxyFn;
-        }
-    }
-    
-
-    if (iff.g_pEngineClient->IsConnected()) {
-        iff.g_pClientState->ForceFullUpdate();
-    }
-
-    iff.g_pInputSystem->EnableInput(1);
-
-    iff.g_pCVar->FindVar("r_3dsky")->SetValue(true);
-
-    sv_skyname->m_nFlags &= FCVAR_CHEAT;
-    sv_skyname->SetValue("sky_urb01");
-
-    iff.g_pCVar->FindVar("fog_override")->SetValue(0);
-    iff.g_pCVar->FindVar("mat_force_tonemap_scale")->SetValue(0.0f);
-
-    DMEHook->RestoreOldTable(); 
-    D3DHook->RestoreOldTable();
-    ClientHook->RestoreOldTable();
-    GameEventManagerHook->RestoreOldTable();
-    ProtoHook->RestoreOldTable();
-    CacheHook->RestoreOldTable();
-    SoundHook->RestoreOldTable();
-    VGUISurfHook->RestoreOldTable();
-    ClientModeHook->RestoreOldTable();
-    FileSystemHook->RestoreOldTable();
-
-    if (opt.netchannedlhooked)
-        DetourRemove(reinterpret_cast<BYTE*>(oShutdown), reinterpret_cast<BYTE*>(hkShutdown));
-
-
-    ImGui_ImplDX9_Shutdown();
-    ImGui_ImplWin32_Shutdown();
-    ImGui::DestroyContext();
-
-    SetWindowLongPtr(window, GWL_WNDPROC, (LONG_PTR)oWndProc);
-
-	delete eventListener;
-
-    ProtoFeatures.SendClientHello();
-    ProtoFeatures.SendMatchmakingClient2GCHello();
-    ProtoFeatures.SendClientGcRankUpdate();
-
-    if (g_Options.prime)
-    {
-        DWORD old_protect;
-        VirtualProtect(iff.prime, 5, PAGE_EXECUTE_READWRITE, &old_protect);
-        memcpy(iff.prime, iff.oldprime, 5);
-        VirtualProtect(iff.prime, 5, old_protect, nullptr);
-    }
-
-    Sleep(1000);
-    
-#ifdef DEBUG
-    if (f) fclose(f);
-    FreeConsole();
-#endif
-    FreeLibraryAndExitThread(hModule, 0);
-    return 0;
-}
-
-BOOL APIENTRY DllMain( HMODULE hModule,  DWORD  ul_reason_for_call, LPVOID lpReserved    )
-{
-    switch (ul_reason_for_call)
-    {
-    case DLL_PROCESS_ATTACH:
-    {
-        HANDLE hdl = CreateThread(nullptr, 0, (LPTHREAD_START_ROUTINE)HackThread, hModule, 0, nullptr);
-        if (hdl) CloseHandle(hdl);
-        break;
-    }
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}
-
diff --git a/SpyCustom/dmattributetypes.h b/SpyCustom/dmattributetypes.h
deleted file mode 100644
index fb89808..0000000
--- a/SpyCustom/dmattributetypes.h
+++ /dev/null
@@ -1,329 +0,0 @@
-#ifndef DMATTRIBUTETYPES_H
-#define DMATTRIBUTETYPES_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-#include "utlstring.h"
-#include "uniqueid.h"
-#include "color.h"
-#include "vector2d.h"
-#include "vector.h"
-#include "vector4d.h"
-#include "vmatrix.h"
-#include "dmelementhandle.h"
-#include "utlsymbollarge.h"
-#include "timeutils.h"
-
-
-typedef UniqueId_t DmObjectId_t;
-
-
-struct DmUnknownAttribute_t
-{
-	bool operator==(const DmUnknownAttribute_t& src) const { return true; }
-};
-
-
-struct DmElementAttribute_t
-{
-	DmElementAttribute_t() : m_ElementType(UTL_INVAL_SYMBOL_LARGE) {}
-
-	operator DmElementHandle_t& () { return m_Handle; }
-	operator const DmElementHandle_t& () const { return m_Handle; }
-
-	DmElementHandle_t m_Handle;
-	CUtlSymbolLarge m_ElementType;
-};
-
-struct DmElementArray_t : public CUtlVector< DmElementHandle_t >
-{
-	DmElementArray_t() : m_ElementType(UTL_INVAL_SYMBOL_LARGE) {}
-
-	CUtlSymbolLarge m_ElementType;
-};
-
-
-enum DmAttributeType_t
-{
-	AT_UNKNOWN = 0,
-
-	AT_FIRST_VALUE_TYPE,
-
-	AT_ELEMENT = AT_FIRST_VALUE_TYPE,
-	AT_INT,
-	AT_FLOAT,
-	AT_BOOL,
-	AT_STRING,
-	AT_VOID,
-	AT_TIME,
-	AT_COLOR, 
-	AT_VECTOR2,
-	AT_VECTOR3,
-	AT_VECTOR4,
-	AT_QANGLE,
-	AT_QUATERNION,
-	AT_VMATRIX,
-
-	AT_FIRST_ARRAY_TYPE,
-
-	AT_ELEMENT_ARRAY = AT_FIRST_ARRAY_TYPE,
-	AT_INT_ARRAY,
-	AT_FLOAT_ARRAY,
-	AT_BOOL_ARRAY,
-	AT_STRING_ARRAY,
-	AT_VOID_ARRAY,
-	AT_TIME_ARRAY,
-	AT_COLOR_ARRAY,
-	AT_VECTOR2_ARRAY,
-	AT_VECTOR3_ARRAY,
-	AT_VECTOR4_ARRAY,
-	AT_QANGLE_ARRAY,
-	AT_QUATERNION_ARRAY,
-	AT_VMATRIX_ARRAY,
-	AT_TYPE_COUNT,
-
-	AT_TYPE_INVALID,
-};
-
-const char* GetTypeString(DmAttributeType_t type);
-
-inline bool IsValueType(DmAttributeType_t type)
-{
-	return type >= AT_FIRST_VALUE_TYPE && type < AT_FIRST_ARRAY_TYPE;
-}
-
-inline bool IsArrayType(DmAttributeType_t type)
-{
-	return type >= AT_FIRST_ARRAY_TYPE && type < AT_TYPE_COUNT;
-}
-
-inline bool IsTopological(DmAttributeType_t type)
-{
-	return type == AT_ELEMENT || type == AT_ELEMENT_ARRAY;
-}
-
-inline DmAttributeType_t ValueTypeToArrayType(DmAttributeType_t type)
-{
-	Assert(IsValueType(type));
-	return (DmAttributeType_t)((type - AT_FIRST_VALUE_TYPE) + AT_FIRST_ARRAY_TYPE);
-}
-
-inline DmAttributeType_t ArrayTypeToValueType(DmAttributeType_t type)
-{
-	Assert(IsArrayType(type));
-	return (DmAttributeType_t)((type - AT_FIRST_ARRAY_TYPE) + AT_FIRST_VALUE_TYPE);
-}
-
-inline int NumComponents(DmAttributeType_t type)
-{
-	switch (type)
-	{
-	case AT_BOOL:
-	case AT_INT:
-	case AT_FLOAT:
-	case AT_TIME:
-		return 1;
-
-	case AT_VECTOR2:
-		return 2;
-
-	case AT_VECTOR3:
-	case AT_QANGLE:
-		return 3;
-
-	case AT_COLOR: 
-	case AT_VECTOR4:
-	case AT_QUATERNION:
-		return 4;
-
-	case AT_VMATRIX:
-		return 16;
-
-	case AT_ELEMENT:
-	case AT_STRING:
-	case AT_VOID:
-	default:
-		return 0;
-	}
-}
-
-template< typename T >
-inline float GetComponent(const T& value, int i)
-{
-	Assert(0);
-	return 0.0f;
-}
-
-template <> inline float GetComponent(const bool& value, int i)
-{
-	Assert(i == 0);
-	return value ? 1.0f : 0.0f;
-}
-
-template <> inline float GetComponent(const int& value, int i)
-{
-	Assert(i == 0);
-	return float(value);
-}
-
-template <> inline float GetComponent(const float& value, int i)
-{
-	Assert(i == 0);
-	return value;
-}
-
-template <> inline float GetComponent(const DmeTime_t& value, int i)
-{
-	Assert(i == 0);
-	return value.GetSeconds();
-}
-
-template <> inline float GetComponent(const Vector2D& value, int i)
-{
-	return value[i];
-}
-
-template <> inline float GetComponent(const Vector& value, int i)
-{
-	return value[i];
-}
-
-template <> inline float GetComponent(const QAngle& value, int i)
-{
-	return value[i];
-}
-
-template <> inline float GetComponent(const Color& value, int i)
-{
-	return value[i];
-}
-
-template <> inline float GetComponent(const Vector4D& value, int i)
-{
-	return value[i];
-}
-
-template <> inline float GetComponent(const Quaternion& value, int i)
-{
-	return value[i];
-}
-
-template <> inline float GetComponent(const VMatrix& value, int i)
-{
-	return value.Base()[i];
-}
-
-
-template <typename T>
-class CDmAttributeInfo
-{
-private:
-	enum { ATTRIBUTE_TYPE = AT_TYPE_INVALID };
-
-	typedef T StorageType_t;
-	friend class CDmxAttribute;
-
-	static DmAttributeType_t AttributeType()
-	{
-		return AT_TYPE_INVALID;
-	}
-
-	static const char* AttributeTypeName()
-	{
-		return "invalid";
-	}
-
-	static void SetDefaultValue(T& value)
-	{
-		Assert(0);
-	}
-};
-
-
-template <>
-class CDmAttributeInfo< DmUnknownAttribute_t >
-{
-public:
-	enum { ATTRIBUTE_TYPE = AT_UNKNOWN };
-
-	typedef DmUnknownAttribute_t StorageType_t;
-
-	static DmAttributeType_t AttributeType()
-	{
-		return AT_UNKNOWN;
-	}
-
-	static const char* AttributeTypeName()
-	{
-		return "unknown";
-	}
-
-	static void SetDefaultValue(DmUnknownAttribute_t& value)
-	{
-		Assert(0);
-	}
-};
-
-
-#define DECLARE_ATTRIBUTE_TYPE_INTERNAL( _className, _storageType, _attributeType, _attributeName, _defaultSetStatement ) \
-	template< > class CDmAttributeInfo< _className >						\
-	{																		\
-	public:																	\
-		enum { ATTRIBUTE_TYPE = _attributeType };							\
-		typedef _storageType StorageType_t;									\
-		static DmAttributeType_t AttributeType() { return _attributeType; }	\
-		static const char *AttributeTypeName() { return _attributeName; }	\
-		static void SetDefaultValue( _className& value ) { _defaultSetStatement }	\
-	};																		\
-
-#define DECLARE_ATTRIBUTE_ARRAY_TYPE_INTERNAL( _className, _storageType, _attributeType, _attributeName ) \
-	template< > class CDmAttributeInfo< CUtlVector<_className> >				\
-	{																			\
-	public:																		\
-		enum { ATTRIBUTE_TYPE = _attributeType };								\
-		typedef _storageType StorageType_t;										\
-		static DmAttributeType_t AttributeType() { return _attributeType; }		\
-		static const char *AttributeTypeName() { return _attributeName; }		\
-		static void SetDefaultValue( CUtlVector< _className >& value ) { value.RemoveAll(); }	\
-	};																			\
-
-#define DECLARE_ATTRIBUTE_TYPE( _className, _attributeType, _attributeName, _defaultSetStatement ) \
-	DECLARE_ATTRIBUTE_TYPE_INTERNAL( _className, _className, _attributeType, _attributeName, _defaultSetStatement )
-
-#define DECLARE_ATTRIBUTE_ARRAY_TYPE( _className, _attributeType, _attributeName )\
-	DECLARE_ATTRIBUTE_ARRAY_TYPE_INTERNAL( _className, CUtlVector< _className >, _attributeType, _attributeName )
-
-DECLARE_ATTRIBUTE_TYPE(int, AT_INT, "int", value = 0; )
-DECLARE_ATTRIBUTE_TYPE(float, AT_FLOAT, "float", value = 0.0f; )
-DECLARE_ATTRIBUTE_TYPE(bool, AT_BOOL, "bool", value = false; )
-DECLARE_ATTRIBUTE_TYPE(Color, AT_COLOR, "color", value.SetColor(0, 0, 0, 255); )
-DECLARE_ATTRIBUTE_TYPE(Vector2D, AT_VECTOR2, "vector2", value.Init(0.0f, 0.0f); )
-DECLARE_ATTRIBUTE_TYPE(Vector, AT_VECTOR3, "vector3", value.Init(0.0f, 0.0f, 0.0f); )
-DECLARE_ATTRIBUTE_TYPE(Vector4D, AT_VECTOR4, "vector4", value.Init(0.0f, 0.0f, 0.0f, 0.0f); )
-DECLARE_ATTRIBUTE_TYPE(QAngle, AT_QANGLE, "qangle", value.Init(0.0f, 0.0f, 0.0f); )
-DECLARE_ATTRIBUTE_TYPE(Quaternion, AT_QUATERNION, "quaternion", value.Init(0.0f, 0.0f, 0.0f, 1.0f); )
-DECLARE_ATTRIBUTE_TYPE(VMatrix, AT_VMATRIX, "matrix", MatrixSetIdentity(value); )
-DECLARE_ATTRIBUTE_TYPE(CUtlSymbolLarge, AT_STRING, "string", value = UTL_INVAL_SYMBOL_LARGE; )
-DECLARE_ATTRIBUTE_TYPE(CUtlBinaryBlock, AT_VOID, "binary", value.Set(NULL, 0); )
-DECLARE_ATTRIBUTE_TYPE(DmeTime_t, AT_TIME, "time", value.SetTenthsOfMS(0); )
-DECLARE_ATTRIBUTE_TYPE_INTERNAL(DmElementHandle_t, DmElementAttribute_t, AT_ELEMENT, "element", value = DMELEMENT_HANDLE_INVALID; )
-
-DECLARE_ATTRIBUTE_ARRAY_TYPE(int, AT_INT_ARRAY, "int_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(float, AT_FLOAT_ARRAY, "float_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(bool, AT_BOOL_ARRAY, "bool_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(Color, AT_COLOR_ARRAY, "color_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(Vector2D, AT_VECTOR2_ARRAY, "vector2_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(Vector, AT_VECTOR3_ARRAY, "vector3_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(Vector4D, AT_VECTOR4_ARRAY, "vector4_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(QAngle, AT_QANGLE_ARRAY, "qangle_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(Quaternion, AT_QUATERNION_ARRAY, "quaternion_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(VMatrix, AT_VMATRIX_ARRAY, "matrix_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(CUtlSymbolLarge, AT_STRING_ARRAY, "string_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(CUtlBinaryBlock, AT_VOID_ARRAY, "binary_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE(DmeTime_t, AT_TIME_ARRAY, "time_array")
-DECLARE_ATTRIBUTE_ARRAY_TYPE_INTERNAL(DmElementHandle_t, DmElementArray_t, AT_ELEMENT_ARRAY, "element_array")
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/dmelementhandle.h b/SpyCustom/dmelementhandle.h
deleted file mode 100644
index 78b8844..0000000
--- a/SpyCustom/dmelementhandle.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef DMELEMENTHANDLE_H
-#define DMELEMENTHANDLE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#define PERFORM_HANDLE_TYPECHECKING 0
-#if PERFORM_HANDLE_TYPECHECKING
-
-struct DmElementHandle_t
-{
-	DmElementHandle_t() : handle(0xffffffff) {}
-	explicit DmElementHandle_t(int h) : handle(h) {}
-	inline bool operator==(const DmElementHandle_t& h) const { return handle == h.handle; }
-	inline bool operator!=(const DmElementHandle_t& h) const { return handle != h.handle; }
-	inline bool operator<(const DmElementHandle_t& h) const { return handle < h.handle; }
-	int handle;
-};
-const DmElementHandle_t DMELEMENT_HANDLE_INVALID;
-
-#else  
-
-enum DmElementHandle_t
-{
-	DMELEMENT_HANDLE_INVALID = 0xffffffff
-};
-
-#endif  
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/dmxattribute.h b/SpyCustom/dmxattribute.h
deleted file mode 100644
index c946bb1..0000000
--- a/SpyCustom/dmxattribute.h
+++ /dev/null
@@ -1,210 +0,0 @@
-#ifndef DMXATTRIBUTE_H
-#define DMXATTRIBUTE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dmattributetypes.h"
-#include "utlvector.h"
-#include "utlrbtree.h"
-#include "utlsymbol.h"
-#include "mempool.h"
-#include "dmxloader.h"
-
-
-class CDmxElement;
-
-
-
-
-
-#define DECLARE_DMX_ATTRIBUTE_TYPE_INTERNAL( _className, _storageType, _attributeType, _attributeName, _defaultSetStatement ) \
-	template< > class CDmAttributeInfo< _className >						\
-	{																		\
-	private:																\
-		enum { ATTRIBUTE_TYPE = _attributeType };							\
-		typedef _storageType StorageType_t;									\
-		static DmAttributeType_t AttributeType() { return _attributeType; }	\
-		static const char *AttributeTypeName() { return _attributeName; }	\
-		static void SetDefaultValue( _className& value ) { _defaultSetStatement }	\
-		friend class CDmxAttribute;											\
-		friend class CDmxElement;											\
-	};																		\
-
-#define DECLARE_DMX_ATTRIBUTE_ARRAY_TYPE_INTERNAL( _className, _storageType, _attributeType, _attributeName ) \
-	template< > class CDmAttributeInfo< CUtlVector<_className> >				\
-	{																			\
-	private:																	\
-		enum { ATTRIBUTE_TYPE = _attributeType };								\
-		typedef _storageType StorageType_t;										\
-		static DmAttributeType_t AttributeType() { return _attributeType; }		\
-		static const char *AttributeTypeName() { return _attributeName; }		\
-		static void SetDefaultValue( CUtlVector< _className >& value ) { value.RemoveAll(); }	\
-		friend class CDmxAttribute;												\
-		friend class CDmxElement;												\
-	};																			\
-
-#define DECLARE_DMX_ATTRIBUTE_TYPE( _className, _attributeType, _attributeName, _defaultSetStatement ) \
-	DECLARE_DMX_ATTRIBUTE_TYPE_INTERNAL( _className, _className, _attributeType, _attributeName, _defaultSetStatement )
-
-#define DECLARE_DMX_ATTRIBUTE_ARRAY_TYPE( _className, _attributeType, _attributeName )\
-	DECLARE_DMX_ATTRIBUTE_ARRAY_TYPE_INTERNAL( _className, CUtlVector< _className >, _attributeType, _attributeName )
-
-
-
-DECLARE_DMX_ATTRIBUTE_TYPE(CDmxElement*, AT_ELEMENT, "element", value = 0; )
-DECLARE_DMX_ATTRIBUTE_ARRAY_TYPE(CDmxElement*, AT_ELEMENT_ARRAY, "element_array")
-
-DECLARE_DMX_ATTRIBUTE_TYPE(CUtlString, AT_STRING, "string", value.Set(NULL); )
-DECLARE_DMX_ATTRIBUTE_ARRAY_TYPE(CUtlString, AT_STRING_ARRAY, "string_array")
-
-
-class CDmxAttribute
-{
-	DECLARE_DMX_ALLOCATOR();
-
-public:
-	DmAttributeType_t GetType() const;
-	const char* GetTypeString() const;
-	template< class T > bool IsA() const;
-
-	const char* GetName() const;
-	CUtlSymbolLarge GetNameSymbol() const;
-	void SetName(const char* pName);
-
-	template< class T >	const T& GetValue() const;
-	template< class T > const CUtlVector< T >& GetArray() const;
-	const char* GetValueString() const;
-
-	template< class T > void SetValue(const T& value);
-	void SetValue(const char* pString);
-	void SetValue(char* pString);
-	void SetValue(const void* pBuffer, size_t nLen);
-	void SetValue(const CDmxAttribute* pAttribute);
-
-	template< class T > CUtlVector< T >& GetArrayForEdit();
-
-	void	SetToDefaultValue();
-
-	void SetValueFromString(const char* pValue);
-	const char* GetValueAsString(char* pBuffer, size_t nBufLen) const;
-
-	int GetArrayCount() const;
-
-	bool Unserialize(DmAttributeType_t type, CUtlBuffer& buf);
-	bool UnserializeElement(DmAttributeType_t type, CUtlBuffer& buf);
-	bool Serialize(CUtlBuffer& buf) const;
-	bool SerializeElement(int nIndex, CUtlBuffer& buf) const;
-	bool SerializesOnMultipleLines() const;
-
-	static int AttributeDataSize(DmAttributeType_t type);
-	static DmAttributeType_t ArrayAttributeBasicType(DmAttributeType_t type);
-
-private:
-	CDmxAttribute(const char* pAttributeName);
-	CDmxAttribute(CUtlSymbolLarge attributeName);
-	~CDmxAttribute();
-
-	void AllocateDataMemory(DmAttributeType_t type);
-	void AllocateDataMemory_AndConstruct(DmAttributeType_t type);
-	void FreeDataMemory();
-
-
-	void SetValue(DmAttributeType_t type, const void* pSrc, int nLen);
-	void SetArrayValue(DmAttributeType_t type, const void* pSrc, int nDataTypeSize, int nArrayLength, int nSrcStride);
-	void GetArrayValue(DmAttributeType_t type, void* pDest, int nDataTypeSize, int nArrayLength, const char* pDefaultString = NULL) const;
-	void SetArrayCount(int nArrayCount);
-	const void* GetArrayBase(void) const;
-
-	template < class VT, class T > void ConstructDataMemory(void);
-	template < class VT, class T > void DestructDataMemory(void);
-	template < class VT, class T > void SetArrayCount(int nArrayCount);
-	template < class VT, class T > void GetArrayCount(int& nArrayCount) const;
-	template < class VT, class T > void GetArrayBase(const void*& pBasePtr) const;
-	template < class VT, class T > void SerializesOnMultipleLines(bool& bResult) const;
-	template < class VT, class T > void SerializeType(bool& bSuccess, CUtlBuffer& buf) const;
-	template < class VT, class T > void SerializeTypedElement(bool& bSuccess, int nIndex, CUtlBuffer& buf) const;
-	template < class VT, class T > void UnserializeType(bool& bSuccess, CUtlBuffer& buf);
-	template < class VT, class T > void UnserializeTypedElement(bool& bSuccess, CUtlBuffer& buf);
-	template < class VT, class T > void SetDefaultValue(void);
-
-
-	DmAttributeType_t m_Type;
-	CUtlSymbolLarge m_Name;
-	void* m_pData;
-
-	static CUtlSymbolTableLargeMT s_AttributeNameSymbols;
-
-	friend class CDmxElement;
-
-public:
-
-	static const char* s_pAttributeTypeName[AT_TYPE_COUNT];
-
-};
-
-
-inline DmAttributeType_t CDmxAttribute::GetType() const
-{
-	return m_Type;
-}
-
-template< class T > inline bool CDmxAttribute::IsA() const
-{
-	return GetType() == CDmAttributeInfo< T >::ATTRIBUTE_TYPE;
-}
-
-inline CUtlSymbolLarge CDmxAttribute::GetNameSymbol() const
-{
-	return m_Name;
-}
-
-
-template< class T > void CDmxAttribute::SetValue(const T& value)
-{
-	AllocateDataMemory(CDmAttributeInfo<T>::AttributeType());
-	CopyConstruct((T*)m_pData, value);
-}
-
-
-inline const char* CDmxAttribute::GetValueString() const
-{
-	if (m_Type == AT_STRING)
-		return *(CUtlString*)m_pData;
-	return "";
-}
-
-template< class T >
-inline const T& CDmxAttribute::GetValue() const
-{
-	if (CDmAttributeInfo<T>::AttributeType() == m_Type)
-		return *(T*)m_pData;
-
-	static T defaultValue;
-	CDmAttributeInfo<T>::SetDefaultValue(defaultValue);
-	return defaultValue;
-}
-
-template< class T >
-inline const CUtlVector< T >& CDmxAttribute::GetArray() const
-{
-	if (CDmAttributeInfo< CUtlVector< T > >::AttributeType() == m_Type)
-		return *(CUtlVector< T >*)m_pData;
-
-	static CUtlVector<T> defaultArray;
-	return defaultArray;
-}
-
-template< class T >
-inline CUtlVector< T >& CDmxAttribute::GetArrayForEdit()
-{
-	if (CDmAttributeInfo< CUtlVector< T > >::AttributeType() == m_Type)
-		return *(CUtlVector< T >*)m_pData;
-
-	AllocateDataMemory(CDmAttributeInfo< CUtlVector< T > >::AttributeType());
-	Construct((CUtlVector<T>*)m_pData);
-	return *(CUtlVector< T >*)m_pData;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/dmxelement.h b/SpyCustom/dmxelement.h
deleted file mode 100644
index 7f40432..0000000
--- a/SpyCustom/dmxelement.h
+++ /dev/null
@@ -1,472 +0,0 @@
-#ifndef DMXELEMENT_H
-#define DMXELEMENT_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dmattributetypes.h"
-#include "utlvector.h"
-#include "utlrbtree.h"
-#include "utlsymbol.h"
-#include "mempool.h"
-#include "utlsortvector.h"
-#include "dmxattribute.h"
-
-
-class CDmxAttributeLess
-{
-public:
-	bool Less(const CDmxAttribute* pAttribute1, const CDmxAttribute* pAttribute2, void* pContext)
-	{
-		return (pAttribute1 ? pAttribute1->GetNameSymbol() : CUtlSymbolLarge(UTL_INVAL_SYMBOL_LARGE)) < (pAttribute2 ? pAttribute2->GetNameSymbol() : CUtlSymbolLarge(UTL_INVAL_SYMBOL_LARGE));
-	}
-};
-
-
-enum BitfieldType_t
-{
-	BITFIELD_TYPE_NONE,
-	BITFIELD_TYPE_BOOL,
-	BITFIELD_TYPE_CHAR,
-	BITFIELD_TYPE_UNSIGNED_CHAR,
-	BITFIELD_TYPE_BYTE = BITFIELD_TYPE_UNSIGNED_CHAR,
-	BITFIELD_TYPE_SHORT,
-	BITFIELD_TYPE_UNSIGNED_SHORT,
-	BITFIELD_TYPE_INT,
-	BITFIELD_TYPE_UNSIGNED_INT,
-};
-
-struct DmxElementUnpackStructure_t
-{
-	const char* m_pAttributeName;
-	const char* m_pDefaultString;
-	DmAttributeType_t m_AttributeType;
-	int m_nOffset;
-	int m_nSize;				                  
-	int m_nBitOffset;			                  
-	BitfieldType_t m_BitfieldType;          
-	const void* m_pUserData;	           
-
-	const char* m_pTypeName;
-	const DmxElementUnpackStructure_t* m_pSub;
-
-	int m_nArrayLength;			                            
-};
-
-#define NO_BIT_OFFSET	-1
-#define UTL_STRING_SIZE	-1
-#define NO_USER_DATA	NULL
-#define NO_EMBEDDED_TYPENAME	NULL
-#define NO_EMBEDDED_STRUCT_PTR	NULL
-#define NOT_A_BITFIELD	BITFIELD_TYPE_NONE
-#define NOT_AN_ARRAY 0
-
-#define DECLARE_DMXELEMENT_UNPACK() \
-	template <typename T> friend DmxElementUnpackStructure_t *DmxElementUnpackInit(T *);
-
-#define BEGIN_DMXELEMENT_UNPACK( _structName )				\
-	template <typename T> DmxElementUnpackStructure_t *DmxElementUnpackInit(T *); \
-	template <> DmxElementUnpackStructure_t *DmxElementUnpackInit<_structName>( _structName * ); \
-	namespace _structName##_UnpackInit \
-	{ \
-		static DmxElementUnpackStructure_t *s_pUnpack = DmxElementUnpackInit( (_structName *)NULL ); \
-	} \
-	\
-	template <> DmxElementUnpackStructure_t *DmxElementUnpackInit<_structName>( _structName * ) \
-	{ \
-		typedef _structName DestStructType_t; \
-		static DmxElementUnpackStructure_t unpack[] = \
-		{ \
-
-#define DMXELEMENT_UNPACK_FLTX4( _attributeName, _defaultString, _varName )	\
-	{ _attributeName, _defaultString, CDmAttributeInfo<float>::AttributeType(), offsetof( DestStructType_t, _varName ), sizeof( fltx4 ), NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, NOT_AN_ARRAY },
-
-#define DMXELEMENT_UNPACK_EMBEDDED( _typeName, _attributeName, _varName, _embeddedUnpackStructure ) \
-	{ _attributeName, "", AT_TYPE_COUNT, offsetof( DestStructType_t, _varName ), sizeof( ((DestStructType_t *)0)->_varName), NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, _typeName, _embeddedUnpackStructure, NOT_AN_ARRAY },
-
-#define DMXELEMENT_UNPACK_BASECLASS( _structName, _baseClass ) \
-	{ "Baseclass unpack", "", AT_TYPE_COUNT, size_cast< int >((intp) static_cast< _baseClass * >( (_structName*)0)), 0, NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, #_baseClass, DmxElementUnpackInit<_baseClass>( (_baseClass *)0 ), NOT_AN_ARRAY },
-
-#define DMXELEMENT_UNPACK_BASECLASS_NAMESPACE( _namespace, _structName, _baseClass ) \
-	{ "Baseclass unpack", "", AT_TYPE_COUNT, size_cast< int >((intp) static_cast< _baseClass * >( (_structName*)0)), 0, NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, #_baseClass, DmxElementUnpackInit##_namespace<_baseClass>( (_baseClass *)0 ), NOT_AN_ARRAY },
-
-#define VGUI_UNPACK_BASEPANEL() \
-	DMXELEMENT_UNPACK_BASECLASS_NAMESPACE( vgui, DestStructType_t, DestStructType_t::BaseClass ) \
-
-#define DMXELEMENT_UNPACK_FIELD( _attributeName, _defaultString, _type, _varName )	\
-	{ _attributeName, _defaultString, CDmAttributeInfo<_type>::AttributeType(), offsetof( DestStructType_t, _varName ), sizeof( ((DestStructType_t *)0)->_varName), NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, NOT_AN_ARRAY },
-#define DMXELEMENT_UNPACK_FIELD_STRING( _attributeName, _defaultString, _varName )	\
-	{ _attributeName, _defaultString, AT_STRING, offsetof( DestStructType_t, _varName ), sizeof( ((DestStructType_t *)0)->_varName), NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, NOT_AN_ARRAY },
-#define DMXELEMENT_UNPACK_FIELD_UTLSTRING( _attributeName, _defaultString, _varName )	\
-	{ _attributeName, _defaultString, AT_STRING, offsetof( DestStructType_t, _varName ), UTL_STRING_SIZE, NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, NOT_AN_ARRAY },
-#define DMXELEMENT_UNPACK_SHORT( _attributeName, _defaultString, _varName )   \
-	{ _attributeName, _defaultString, AT_INT, offsetof( DestStructType_t, _varName ), sizeof( short ), NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, NOT_AN_ARRAY },
-#define DMXELEMENT_UNPACK_CHAR( _attributeName, _defaultString, _varName )    \
-	{ _attributeName, _defaultString, AT_INT, offsetof( DestStructType_t, _varName ), sizeof( char ), NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, NOT_AN_ARRAY },
-#define DMXELEMENT_UNPACK_BITFIELD( _attributeName, _defaultString, _bitfieldType, _varName ) \
-	{ _attributeName, _defaultString, CDmAttributeInfo<int>::AttributeType(), DestStructType_t::Get##_varName##ByteOffset(), DestStructType_t::Get##_varName##BitCount(), DestStructType_t::Get##_varName##BitOffset(), _bitfieldType, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, NOT_AN_ARRAY },
-
-#define DMXELEMENT_UNPACK_FIELD_ARRAY( _attributeName, _defaultString, _type, _varName )	\
-	{ _attributeName, _defaultString, CDmAttributeInfo< CUtlVector< _type > >::AttributeType(), offsetof( DestStructType_t, _varName ), sizeof( ((DestStructType_t *)0)->_varName[0]), NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, ARRAYSIZE( ((DestStructType_t *)0)->_varName ) },
-
-
-#define DMXELEMENT_UNPACK_FIELD_USERDATA( _attributeName, _defaultString, _type, _varName, _userData )	\
-	{ _attributeName, _defaultString, CDmAttributeInfo<_type>::AttributeType(), offsetof( DestStructType_t, _varName ), sizeof( ((DestStructType_t *)0)->_varName), NO_BIT_OFFSET, NOT_A_BITFIELD, _userData, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, NOT_AN_ARRAY },
-#define DMXELEMENT_UNPACK_FIELD_STRING_USERDATA( _attributeName, _defaultString, _varName, _userData )	\
-	{ _attributeName, _defaultString, AT_STRING, offsetof( DestStructType_t, _varName ), sizeof( ((DestStructType_t *)0)->_varName), NO_BIT_OFFSET, NOT_A_BITFIELD, _userData, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, NOT_AN_ARRAY },
-#define DMXELEMENT_UNPACK_FIELD_UTLSTRING_USERDATA( _attributeName, _defaultString, _varName, _userData )	\
-	{ _attributeName, _defaultString, AT_STRING, offsetof( DestStructType_t, _varName ), UTL_STRING_SIZE, NO_BIT_OFFSET, NOT_A_BITFIELD, _userData, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR, NOT_AN_ARRAY },
-
-#define END_DMXELEMENT_UNPACK( _structName, _varName )			\
-			{ NULL, NULL, AT_UNKNOWN, 0, 0, NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR }				\
-		};														\
-		return unpack;											\
-	}															\
-	DmxElementUnpackStructure_t *_varName = _structName##_UnpackInit::s_pUnpack;
-
-#define END_DMXELEMENT_UNPACK_TEMPLATE( _structName, _varName )			\
-			{ NULL, NULL, AT_UNKNOWN, 0, 0, NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR }				\
-		};														\
-		return unpack;											\
-	}															\
-	 template<> DmxElementUnpackStructure_t *_varName = _structName##_UnpackInit::s_pUnpack;
-
-#define BEGIN_DMXELEMENT_NAMESPACE_UNPACK( _nameSpace, _structName )				\
-	template <typename T> DmxElementUnpackStructure_t *DmxElementUnpackInit(T *); \
-	template <> DmxElementUnpackStructure_t *_nameSpace::DmxElementUnpackInit<_nameSpace::_structName>( _nameSpace::_structName * ); \
-	namespace _structName##_UnpackInit \
-	{ \
-		static DmxElementUnpackStructure_t *s_pUnpack = _nameSpace::DmxElementUnpackInit( (_nameSpace::_structName *)NULL ); \
-	} \
-	\
-	template <> DmxElementUnpackStructure_t *_nameSpace::DmxElementUnpackInit<_nameSpace::_structName>( _nameSpace::_structName * ) \
-	{ \
-		typedef _nameSpace::_structName DestStructType_t; \
-		static DmxElementUnpackStructure_t unpack[] = \
-	{ \
-
-#if defined( _PS3 ) && defined( __GCC__ )
-#define DECLARE_DMXELEMENT_UNPACK_NAMESPACE( _namespace ) \
-	template <typename T> friend DmxElementUnpackStructure_t *_namespace::DmxElementUnpackInit##_namespace(T *); \
-	private: \
-		static DmxElementUnpackStructure_t *s_pUnpackParams; \
-	public:	 \
-		virtual const DmxElementUnpackStructure_t* GetUnpackStructure() const { return s_pUnpackParams; }
-#else
-#define DECLARE_DMXELEMENT_UNPACK_NAMESPACE( _namespace ) \
-	template <typename T> friend DmxElementUnpackStructure_t *DmxElementUnpackInit##_namespace(T *); \
-	private: \
-		static DmxElementUnpackStructure_t *s_pUnpackParams; \
-	public:	 \
-		virtual const DmxElementUnpackStructure_t* GetUnpackStructure() const { return s_pUnpackParams; }
-#endif
-
-#define BEGIN_DMXELEMENT_UNPACK_NAMESPACE_SIMPLE( _namespace, _structName ) \
-	BEGIN_DMXELEMENT_UNPACK_NAMESPACE( _namespace, _structName )  \
-	VGUI_UNPACK_BASEPANEL() \
-
-#define BEGIN_DMXELEMENT_UNPACK_NAMESPACE_SIMPLE_NO_BASE( _namespace, _structName ) \
-	BEGIN_DMXELEMENT_UNPACK_NAMESPACE( _namespace, _structName )  \
-
-#define BEGIN_DMXELEMENT_UNPACK_NAMESPACE( _namespace, _structName )                      \
-	namespace _namespace { \
-	template <typename T> DmxElementUnpackStructure_t *DmxElementUnpackInit##_namespace(T *); \
-	template <> DmxElementUnpackStructure_t *DmxElementUnpackInit##_namespace<_structName>( _namespace::_structName * ); \
-	namespace _namespace##_structName##_UnpackInit \
-	{ \
-		static DmxElementUnpackStructure_t *s_pUnpack = _namespace::DmxElementUnpackInit##_namespace( (_namespace::_structName *)NULL ); \
-	} \
-	\
-	template <> DmxElementUnpackStructure_t *DmxElementUnpackInit##_namespace<_structName>( _namespace::_structName * ) \
-	{ \
-		typedef _structName DestStructType_t;			\
-		static DmxElementUnpackStructure_t unpack[] =	\
-	{ \
-
-#define END_DMXELEMENT_UNPACK_NAMESPACE( _namespace, _structName, _varName )			\
-			{ NULL, NULL, AT_UNKNOWN, 0, 0, NO_BIT_OFFSET, NOT_A_BITFIELD, NO_USER_DATA, NO_EMBEDDED_TYPENAME, NO_EMBEDDED_STRUCT_PTR }				\
-		};													\
-		return unpack;										\
-	}														\
-	DmxElementUnpackStructure_t *_structName::_varName = _namespace##_structName##_UnpackInit::s_pUnpack; \
-	} \
-
-template <typename T> inline T GetAllOnesNumber()
-{
-	T temp = 0;	       
-	return (T)~temp;
-}
-
-template <> inline bool GetAllOnesNumber<bool>()
-{
-	return true;
-}
-
-#define DECLARE_DMXELEMENT_BITFIELD( _fieldName, _type, _structName )								\
-	class CBitFieldInfo_##_fieldName 											\
-	{																			\
-	public:																		\
-		CBitFieldInfo_##_fieldName ()											\
-		{																		\
-			const int nSize = ( sizeof(_structName) + 3 ) & ~0x3;				\
-			unsigned char pBuf[nSize] = {};										\
-			(( _structName * )pBuf)->_fieldName = GetAllOnesNumber<_type>();	\
-			_type *pTest = (_type *)pBuf;										\
-			for ( int i = 0; i < sizeof(_structName); ++i )						\
-			{																	\
-				if ( pTest[i] == 0 )											\
-					continue;													\
-																				\
-				for ( int j = 0; j < 8*sizeof(_type); ++j )						\
-				{																\
-					unsigned int temp = ((unsigned int)pTest[i]) & ( 1 << j ) ;	\
-					if ( temp == 0 )											\
-						continue;												\
-																				\
-					m_nByteOffset = i*sizeof(_type) + j / 8;					\
-					m_nBitOffset = j & 0x7;										\
-																				\
-					int k;														\
-					for ( k = j+1; k < 8*sizeof(_type); ++k )					\
-					{															\
-						unsigned int temp = ((unsigned int)pTest[i]) & ( 1 << k ) ;		\
-						if ( temp != 0 )										\
-							continue;											\
-						break;													\
-					}															\
-					m_nBitCount = k - j;										\
-					break;														\
-				}																\
-				break;															\
-			}																	\
-		}																		\
-																				\
-		int GetByteOffset() const												\
-		{																		\
-			return m_nByteOffset;												\
-		}																		\
-																				\
-		int GetBitCount() const													\
-		{																		\
-			return m_nBitCount;													\
-		}																		\
-																				\
-		int GetBitOffset() const												\
-		{																		\
-			return m_nBitOffset;												\
-		}																		\
-																				\
-	private:																	\
-		int m_nByteOffset;														\
-		int m_nBitCount;														\
-		int m_nBitOffset;													    \
-	};																			\
-																				\
-	static int Get##_fieldName##BitCount()										\
-	{																			\
-		CBitFieldInfo_##_fieldName info;										\
-		return info.GetBitCount();												\
-	}																			\
-																				\
-	static int Get##_fieldName##ByteOffset()									\
-	{																			\
-		CBitFieldInfo_##_fieldName info;										\
-		return info.GetByteOffset();											\
-	}																			\
-																				\
-	static int Get##_fieldName##BitOffset()										\
-	{																			\
-		CBitFieldInfo_##_fieldName info;										\
-		return info.GetBitOffset();												\
-	}																			\
-	friend class CBitFieldInfo_##_fieldName; 									\
-
-
-extern CUtlSymbolTableLargeMT g_DmxAttributeStrings;
-
-class CDmxElement
-{
-	DECLARE_DMX_ALLOCATOR();
-
-public:
-	bool				HasAttribute(const char* pAttributeName) const;
-	CDmxAttribute* GetAttribute(const char* pAttributeName);
-	const CDmxAttribute* GetAttribute(const char* pAttributeName) const;
-	int					AttributeCount() const;
-	CDmxAttribute* GetAttribute(int nIndex);
-	const CDmxAttribute* GetAttribute(int nIndex) const;
-	CUtlSymbolLarge			GetType() const;
-	const char* GetTypeString() const;
-	const char* GetName() const;
-	const DmObjectId_t& GetId() const;
-
-	void				LockForChanges(bool bLock);
-	CDmxAttribute* AddAttribute(const char* pAttributeName);
-	void				RemoveAttribute(const char* pAttributeName);
-	void				RemoveAttributeByPtr(CDmxAttribute* pAttribute);
-	void				RemoveAllAttributes();
-	void				RenameAttribute(const char* pAttributeName, const char* pNewName);
-
-	const char* GetValueString(const char* pAttributeName) const;
-	template< class T > const T& GetValue(const char* pAttributeName) const;
-	template< class T > const T& GetValue(const char* pAttributeName, const T& defaultValue) const;
-
-	template< class T > const CUtlVector<T>& GetArray(const char* pAttributeName) const;
-	template< class T > const CUtlVector<T>& GetArray(const char* pAttributeName, const CUtlVector<T>& defaultValue) const;
-
-	void SetName(const char* pName);
-	CDmxAttribute* SetValue(const char* pAttributeName, const char* pString);
-	CDmxAttribute* SetValue(const char* pAttributeName, void* pBuffer, int nLen);
-	template< class T > CDmxAttribute* SetValue(const char* pAttributeName, const T& value);
-
-	void UnpackIntoStructure(void* pData, const DmxElementUnpackStructure_t* pUnpack) const;
-
-	void AddAttributesFromStructure(const void* pData, const DmxElementUnpackStructure_t* pUnpack);
-
-private:
-	typedef CUtlSortVector< CDmxAttribute*, CDmxAttributeLess > AttributeList_t;
-
-	CDmxElement(const char* pType);
-	~CDmxElement();
-
-	void RemoveAllElementsRecursive();
-
-	void AddElementsToDelete(CUtlVector< CDmxElement* >& elementsToDelete);
-
-	void Resort() const;
-
-	int FindAttribute(const char* pAttributeName) const;
-	int FindAttribute(CUtlSymbolLarge attributeName) const;
-
-	void SetId(const DmObjectId_t& id);
-
-	bool IsLocked() const;
-
-	template <typename T> void UnpackBitfield(T* pDest2, const DmxElementUnpackStructure_t* pUnpack, const CDmxAttribute* pAttribute) const;
-
-	AttributeList_t m_Attributes;
-	DmObjectId_t m_Id;	        
-	CUtlSymbolLarge m_Type;
-	char m_nLockCount;
-	mutable bool m_bResortNeeded : 1;
-	bool m_bIsMarkedForDeletion : 1;
-
-	static CUtlSymbolTableLargeMT s_TypeSymbols;
-
-	friend class CDmxSerializer;
-	friend class CDmxSerializerKeyValues2;
-	friend void CleanupDMX(CDmxElement* pElement);
-	friend CDmxElement* CreateDmxElement(const char* pType);
-};
-
-
-inline bool CDmxElement::IsLocked() const
-{
-	return m_nLockCount > 0;
-}
-
-inline const char* CDmxElement::GetValueString(const char* pAttributeName) const
-{
-	const CDmxAttribute* pAttribute = GetAttribute(pAttributeName);
-	if (pAttribute)
-		return pAttribute->GetValueString();
-	return "";
-}
-
-template< class T >
-inline const T& CDmxElement::GetValue(const char* pAttributeName) const
-{
-	const CDmxAttribute* pAttribute = GetAttribute(pAttributeName);
-	if (pAttribute)
-		return pAttribute->GetValue<T>();
-
-	static T defaultValue;
-	CDmAttributeInfo<T>::SetDefaultValue(defaultValue);
-	return defaultValue;
-}
-
-template< class T >
-inline const T& CDmxElement::GetValue(const char* pAttributeName, const T& defaultValue) const
-{
-	const CDmxAttribute* pAttribute = GetAttribute(pAttributeName);
-	if (pAttribute)
-		return pAttribute->GetValue<T>();
-	return defaultValue;
-}
-
-template< class T >
-inline const CUtlVector<T>& CDmxElement::GetArray(const char* pAttributeName) const
-{
-	const CDmxAttribute* pAttribute = GetAttribute(pAttributeName);
-	if (pAttribute)
-		return pAttribute->GetArray<T>();
-
-	static CUtlVector<T> defaultValue;
-	return defaultValue;
-}
-
-template< class T >
-inline const CUtlVector<T>& CDmxElement::GetArray(const char* pAttributeName, const CUtlVector<T>& defaultValue) const
-{
-	const CDmxAttribute* pAttribute = GetAttribute(pAttributeName);
-	if (pAttribute)
-		return pAttribute->GetArray<T>();
-	return defaultValue;
-}
-
-
-CDmxElement* CreateDmxElement(const char* pType);
-
-
-class CDmxElementModifyScope
-{
-public:
-	CDmxElementModifyScope(CDmxElement* pElement) : m_pElement(pElement)
-	{
-		m_pElement->LockForChanges(true);
-	}
-	~CDmxElementModifyScope()
-	{
-		Release();
-	}
-	void Release()
-	{
-		if (m_pElement)
-		{
-			m_pElement->LockForChanges(false);
-			m_pElement = NULL;
-		}
-	}
-private:
-	CDmxElement* m_pElement;
-};
-
-
-inline CDmxAttribute* CDmxElement::SetValue(const char* pAttributeName, const char* pString)
-{
-	CDmxElementModifyScope modify(this);
-	CDmxAttribute* pAttribute = AddAttribute(pAttributeName);
-	pAttribute->SetValue(pString);
-	return pAttribute;
-}
-
-inline CDmxAttribute* CDmxElement::SetValue(const char* pAttributeName, void* pBuffer, int nLen)
-{
-	CDmxElementModifyScope modify(this);
-	CDmxAttribute* pAttribute = AddAttribute(pAttributeName);
-	pAttribute->SetValue(pBuffer, nLen);
-	return pAttribute;
-}
-
-template< class T >
-inline CDmxAttribute* CDmxElement::SetValue(const char* pAttributeName, const T& value)
-{
-	CDmxElementModifyScope modify(this);
-	CDmxAttribute* pAttribute = AddAttribute(pAttributeName);
-	pAttribute->SetValue(value);
-	return pAttribute;
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/dmxloader.h b/SpyCustom/dmxloader.h
deleted file mode 100644
index 293723d..0000000
--- a/SpyCustom/dmxloader.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef DMXLOADER_H
-#define DMXLOADER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-class CUtlBuffer;
-class CDmxElement;
-
-
-bool SerializeDMX(CUtlBuffer& buf, CDmxElement* pRoot, const char* pFileName = NULL);
-bool SerializeDMX(const char* pFileName, const char* pPathID, bool bTextMode, CDmxElement* pRoot);
-
-bool UnserializeDMX(CUtlBuffer& buf, CDmxElement** ppRoot, const char* pFileName = NULL);
-bool UnserializeDMX(const char* pFileName, const char* pPathID, bool bTextMode, CDmxElement** ppRoot);
-
-void BeginDMXContext();
-void EndDMXContext(bool bDecommitMemory);
-void DecommitDMXMemory();
-
-
-class CDMXContextHelper
-{
-public:
-	CDMXContextHelper(bool bDecommitMemory) { m_bDecommitMemory = bDecommitMemory; BeginDMXContext(); }
-	~CDMXContextHelper() { EndDMXContext(m_bDecommitMemory); }
-
-private:
-	bool m_bDecommitMemory;
-};
-
-#define DECLARE_DMX_CONTEXT( )	CDMXContextHelper __dmxContextHelper( true );
-#define DECLARE_DMX_CONTEXT_NODECOMMIT( )	CDMXContextHelper __dmxContextHelper( false );
-#define DECLARE_DMX_CONTEXT_DECOMMIT( _decommit )	CDMXContextHelper __dmxContextHelper( _decommit );
-
-
-void* DMXAlloc(size_t size);
-
-
-#define DECLARE_DMX_ALLOCATOR( )												\
-	public:																		\
-		inline void* operator new( size_t size ) { MEM_ALLOC_CREDIT_( "DMXAlloc" ); return DMXAlloc(size); }   \
-		inline void* operator new( size_t size, int nBlockUse, const char *pFileName, int nLine ) { MEM_ALLOC_CREDIT_( "DMXAlloc" ); return DMXAlloc(size); }   \
-		inline void  operator delete( void* p ) { }		\
-		inline void  operator delete( void* p, int nBlockUse, const char *pFileName, int nLine ) { }   \
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/dt_common.h b/SpyCustom/dt_common.h
deleted file mode 100644
index 277fba5..0000000
--- a/SpyCustom/dt_common.h
+++ /dev/null
@@ -1,191 +0,0 @@
-#ifndef DATATABLE_COMMON_H
-#define DATATABLE_COMMON_H
-
-#ifdef _WIN32
-#pragma once
-#endif	
-
-#include "basetypes.h"
-#include "dbg.h"
-#include "strtools.h"
-#include <stddef.h>
-
-#ifdef LINUX
-#undef offsetof
-#define offsetof(s,m)	(size_t)&(((s *)0)->m)
-#endif
-
-#define MAX_DATATABLES		1024	      
-#define MAX_DATATABLE_PROPS	4096
-
-#define MAX_ARRAY_ELEMENTS	2048		         
-
-#define HIGH_DEFAULT		-121121.121121f
-
-#define BITS_FULLRES	-1	         
-#define BITS_WORLDCOORD	-2	     
-
-#define DT_MAX_STRING_BITS			9
-#define DT_MAX_STRING_BUFFERSIZE	(1<<DT_MAX_STRING_BITS)	         
-
-#define STRINGBUFSIZE(className, varName)	sizeof( ((className*)0)->varName )
-
-#define PROPSIZEOF(className, varName)		sizeof(((className*)0)->varName)
-
-
-#define SPROP_UNSIGNED			(1<<0)	   
-
-#define SPROP_COORD				(1<<1)	            
-#define SPROP_NOSCALE			(1<<2)	            
-
-#define SPROP_ROUNDDOWN			(1<<3)	            
-
-#define SPROP_ROUNDUP			(1<<4)	            
-
-#define SPROP_NORMAL			(1<<5)	               
-
-#define SPROP_EXCLUDE			(1<<6)	                
-
-#define SPROP_XYZE				(1<<7)	     
-
-#define SPROP_INSIDEARRAY		(1<<8)	                 
-#define SPROP_PROXY_ALWAYS_YES	(1<<9)	            
-#define SPROP_CHANGES_OFTEN		(1<<10)	                 
-
-#define SPROP_IS_A_VECTOR_ELEM	(1<<11)	      
-
-#define SPROP_COLLAPSIBLE		(1<<12)	                
-#define SPROP_COORD_MP					(1<<13)         
-#define SPROP_COORD_MP_LOWPRECISION 	(1<<14)                     
-#define SPROP_COORD_MP_INTEGRAL			(1<<15)         
-
-#define SPROP_VARINT					SPROP_NORMAL	                   
-
-#define SPROP_NUMFLAGBITS_NETWORKED		16
-
-#define SPROP_ENCODED_AGAINST_TICKCOUNT	(1<<16)
-
-#define SPROP_NUMFLAGBITS				17
-
-#define SIZEOF_IGNORE		-1
-
-
-#define EXTERN_SEND_TABLE(tableName)	namespace tableName {extern SendTable g_SendTable;}
-#define EXTERN_RECV_TABLE(tableName)	namespace tableName {extern RecvTable g_RecvTable;}
-
-#define REFERENCE_SEND_TABLE(tableName)	tableName::g_SendTable
-#define REFERENCE_RECV_TABLE(tableName)	tableName::g_RecvTable
-
-
-class SendProp;
-
-typedef enum
-{
-	DPT_Int = 0,
-	DPT_Float,
-	DPT_Vector,
-	DPT_VectorXY,          
-	DPT_String,
-	DPT_Array,	          
-	DPT_DataTable,
-#if 0                       
-	DPT_Quaternion,
-#endif
-
-#ifdef SUPPORTS_INT64
-	DPT_Int64,
-#endif
-
-	DPT_NUMSendPropTypes
-
-} SendPropType;
-
-
-class DVariant
-{
-public:
-	DVariant() { m_Type = DPT_Float; }
-	DVariant(float val) { m_Type = DPT_Float; m_Float = val; }
-
-	const char* ToString()
-	{
-		static char text[128];
-
-		switch (m_Type)
-		{
-		case DPT_Int:
-			Q_snprintf(text, sizeof(text), "%i", m_Int);
-			break;
-		case DPT_Float:
-			Q_snprintf(text, sizeof(text), "%.3f", m_Float);
-			break;
-		case DPT_Vector:
-			Q_snprintf(text, sizeof(text), "(%.3f,%.3f,%.3f)",
-				m_Vector[0], m_Vector[1], m_Vector[2]);
-			break;
-		case DPT_VectorXY:
-			Q_snprintf(text, sizeof(text), "(%.3f,%.3f)",
-				m_Vector[0], m_Vector[1]);
-			break;
-#if 0                       
-		case DPT_Quaternion:
-			Q_snprintf(text, sizeof(text), "(%.3f,%.3f,%.3f %.3f)",
-				m_Vector[0], m_Vector[1], m_Vector[2], m_Vector[3]);
-			break;
-#endif
-		case DPT_String:
-			if (m_pString)
-				return m_pString;
-			else
-				return "NULL";
-			break;
-		case DPT_Array:
-			Q_snprintf(text, sizeof(text), "Array");
-			break;
-		case DPT_DataTable:
-			Q_snprintf(text, sizeof(text), "DataTable");
-			break;
-#ifdef SUPPORTS_INT64
-		case DPT_Int64:
-			Q_snprintf(text, sizeof(text), "%I64d", m_Int64);
-			break;
-#endif
-		default:
-			Q_snprintf(text, sizeof(text), "DVariant type %i unknown", m_Type);
-			break;
-		}
-
-		return text;
-	}
-
-	union
-	{
-		float	m_Float;
-		int		m_Int;
-		const char* m_pString;
-		void* m_pData;	  
-#if 0                       
-		float	m_Vector[4];
-#else
-		float	m_Vector[3];
-#endif
-
-		int64	m_Int64;
-	};
-	SendPropType	m_Type;
-};
-
-
-inline int NumBitsForCount(int nMaxElements)
-{
-	int nBits = 0;
-	while (nMaxElements > 0)
-	{
-		++nBits;
-		nMaxElements >>= 1;
-	}
-	return nBits;
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/dt_recv.h b/SpyCustom/dt_recv.h
deleted file mode 100644
index d5f3f46..0000000
--- a/SpyCustom/dt_recv.h
+++ /dev/null
@@ -1,505 +0,0 @@
-#ifndef DATATABLE_RECV_H
-#define DATATABLE_RECV_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dt_common.h"
-#include "dbg.h"
-
-
-#define ADDRESSPROXY_NONE	-1
-
-
-class RecvTable;
-class RecvProp;
-
-
-class CRecvProxyData
-{
-public:
-	const RecvProp* m_pRecvProp;		    
-
-	DVariant		m_Value;			       
-
-	int				m_iElement;			     
-
-	int				m_ObjectID;			     
-};
-
-
-typedef void (*RecvVarProxyFn)(const CRecvProxyData* pData, void* pStruct, void* pOut);
-
-typedef void (*ArrayLengthRecvProxyFn)(void* pStruct, int objectID, int currentArrayLength);
-
-
-typedef void (*DataTableRecvVarProxyFn)(const RecvProp* pProp, void** pOut, void* pData, int objectID);
-
-
-class CStandardRecvProxies
-{
-public:
-	CStandardRecvProxies();
-
-	RecvVarProxyFn m_Int32ToInt8;
-	RecvVarProxyFn m_Int32ToInt16;
-	RecvVarProxyFn m_Int32ToInt32;
-	RecvVarProxyFn m_FloatToFloat;
-	RecvVarProxyFn m_VectorToVector;
-#ifdef SUPPORTS_INT64
-	RecvVarProxyFn m_Int64ToInt64;
-#endif
-};
-extern CStandardRecvProxies g_StandardRecvProxies;
-
-
-class CRecvDecoder;
-
-
-class RecvProp
-{
-public:
-	RecvProp();
-
-	void					InitArray(int nElements, int elementStride);
-
-	int						GetNumElements() const;
-	void					SetNumElements(int nElements);
-
-	int						GetElementStride() const;
-	void					SetElementStride(int stride);
-
-	int						GetFlags() const;
-
-	const char* GetName() const;
-	SendPropType			GetType() const;
-
-	RecvTable* GetDataTable() const;
-	void					SetDataTable(RecvTable* pTable);
-
-	RecvVarProxyFn			GetProxyFn() const;
-	void					SetProxyFn(RecvVarProxyFn fn);
-
-	DataTableRecvVarProxyFn	GetDataTableProxyFn() const;
-	void					SetDataTableProxyFn(DataTableRecvVarProxyFn fn);
-
-	int						GetOffset() const;
-	void					SetOffset(int o);
-
-	RecvProp* GetArrayProp() const;
-	void					SetArrayProp(RecvProp* pProp);
-
-	void					SetArrayLengthProxy(ArrayLengthRecvProxyFn proxy);
-	ArrayLengthRecvProxyFn	GetArrayLengthProxy() const;
-
-	bool					IsInsideArray() const;
-	void					SetInsideArray();
-
-	const void* GetExtraData() const;
-	void				SetExtraData(const void* pData);
-
-	const char* GetParentArrayPropName();
-	void				SetParentArrayPropName(const char* pArrayPropName);
-
-public:
-
-	const char* m_pVarName;
-	SendPropType			m_RecvType;
-	int						m_Flags;
-	int						m_StringBufferSize;
-
-
-	bool					m_bInsideArray;		             
-
-	const void* m_pExtraData;
-
-	RecvProp* m_pArrayProp;
-	ArrayLengthRecvProxyFn	m_ArrayLengthProxy;
-
-	RecvVarProxyFn			m_ProxyFn;
-	DataTableRecvVarProxyFn	m_DataTableProxyFn;	  
-
-	RecvTable* m_pDataTable;		  
-	int						m_Offset;
-
-	int						m_ElementStride;
-	int						m_nElements;
-
-	const char* m_pParentArrayPropName;
-};
-
-
-class RecvTable
-{
-public:
-
-	typedef RecvProp	PropType;
-
-	RecvTable();
-	RecvTable(RecvProp* pProps, int nProps, const char* pNetTableName);
-	~RecvTable();
-
-	void		Construct(RecvProp* pProps, int nProps, const char* pNetTableName);
-
-	int			GetNumProps();
-	RecvProp* GetProp(int i);
-
-	const char* GetName();
-
-	void		SetInitialized(bool bInitialized);
-	bool		IsInitialized() const;
-
-	void		SetInMainList(bool bInList);
-	bool		IsInMainList() const;
-
-
-public:
-
-	RecvProp* m_pProps;
-	int				m_nProps;
-
-	CRecvDecoder* m_pDecoder;
-
-	const char* m_pNetTableName;	       
-
-
-	bool			m_bInitialized;
-	bool			m_bInMainList;
-};
-
-
-inline int RecvTable::GetNumProps()
-{
-	return m_nProps;
-}
-
-inline RecvProp* RecvTable::GetProp(int i)
-{
-	Assert(i >= 0 && i < m_nProps);
-	return &m_pProps[i];
-}
-
-inline const char* RecvTable::GetName()
-{
-	return m_pNetTableName;
-}
-
-inline void RecvTable::SetInitialized(bool bInitialized)
-{
-	m_bInitialized = bInitialized;
-}
-
-inline bool RecvTable::IsInitialized() const
-{
-	return m_bInitialized;
-}
-
-inline void RecvTable::SetInMainList(bool bInList)
-{
-	m_bInMainList = bInList;
-}
-
-inline bool RecvTable::IsInMainList() const
-{
-	return m_bInMainList;
-}
-
-
-#define BEGIN_RECV_TABLE(className, tableName) \
-	BEGIN_RECV_TABLE_NOBASE(className, tableName) \
-		RecvPropDataTable("baseclass", 0, 0, className::BaseClass::m_pClassRecvTable, DataTableRecvProxy_StaticDataTable),
-
-#define BEGIN_RECV_TABLE_NOBASE(className, tableName) \
-	template <typename T> int ClientClassInit(T *); \
-	namespace tableName { \
-		struct ignored; \
-	} \
-	template <> int ClientClassInit<tableName::ignored>(tableName::ignored *); \
-	namespace tableName {	\
-		RecvTable g_RecvTable; \
-		int g_RecvTableInit = ClientClassInit((tableName::ignored *)NULL); \
-	} \
-	template <> int ClientClassInit<tableName::ignored>(tableName::ignored *) \
-	{ \
-		typedef className currentRecvDTClass; \
-		const char *pRecvTableName = #tableName; \
-		RecvTable &RecvTable = tableName::g_RecvTable; \
-		static RecvProp RecvProps[] = { \
-			RecvPropInt("should_never_see_this", 0, sizeof(int)),		              
-
-#define END_RECV_TABLE() \
-			}; \
-		RecvTable.Construct(RecvProps+1, sizeof(RecvProps) / sizeof(RecvProp) - 1, pRecvTableName); \
-		return 1; \
-	}
-
-
-#define RECVINFO(varName)						#varName, offsetof(currentRecvDTClass, varName), sizeof(((currentRecvDTClass*)0)->varName)
-#define RECVINFO_NAME(varName, remoteVarName)	#remoteVarName, offsetof(currentRecvDTClass, varName), sizeof(((currentRecvDTClass*)0)->varName)
-#define RECVINFO_STRING(varName)				#varName, offsetof(currentRecvDTClass, varName), STRINGBUFSIZE(currentRecvDTClass, varName)
-#define RECVINFO_BASECLASS(tableName)			RecvPropDataTable("this", 0, 0, &REFERENCE_RECV_TABLE(tableName))
-#define RECVINFO_ARRAY(varName)					#varName, offsetof(currentRecvDTClass, varName), sizeof(((currentRecvDTClass*)0)->varName[0]), sizeof(((currentRecvDTClass*)0)->varName)/sizeof(((currentRecvDTClass*)0)->varName[0])
-
-#define RECVINFO_NOSIZE(varName)				#varName, offsetof(currentRecvDTClass, varName)
-#define RECVINFO_DT(varName)					RECVINFO_NOSIZE(varName)
-#define RECVINFO_DTNAME(varName,remoteVarName)	#remoteVarName, offsetof(currentRecvDTClass, varName)
-
-
-void RecvProxy_FloatToFloat(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_VectorToVector(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_VectorXYToVectorXY(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_QuaternionToQuaternion(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_Int32ToInt8(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_Int32ToInt16(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_StringToString(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_Int32ToInt32(const CRecvProxyData* pData, void* pStruct, void* pOut);
-#ifdef SUPPORTS_INT64
-void RecvProxy_Int64ToInt64(const CRecvProxyData* pData, void* pStruct, void* pOut);
-#endif
-
-void DataTableRecvProxy_StaticDataTable(const RecvProp* pProp, void** pOut, void* pData, int objectID);
-
-void DataTableRecvProxy_PointerDataTable(const RecvProp* pProp, void** pOut, void* pData, int objectID);
-
-
-RecvProp RecvPropFloat(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,	              
-	int flags = 0,
-	RecvVarProxyFn varProxy = RecvProxy_FloatToFloat
-);
-
-RecvProp RecvPropVector(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,	              
-	int flags = 0,
-	RecvVarProxyFn varProxy = RecvProxy_VectorToVector
-);
-
-RecvProp RecvPropVectorXY(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,	              
-	int flags = 0,
-	RecvVarProxyFn varProxy = RecvProxy_VectorXYToVectorXY
-);
-
-#define RecvPropQAngles RecvPropVector
-
-#if 0                       
-
-RecvProp RecvPropQuaternion(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,	              
-	int flags = 0,
-	RecvVarProxyFn varProxy = RecvProxy_QuaternionToQuaternion
-);
-#endif
-
-RecvProp RecvPropInt(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,	              
-	int flags = 0,
-	RecvVarProxyFn varProxy = 0
-);
-
-RecvProp RecvPropString(
-	const char* pVarName,
-	int offset,
-	int bufferSize,
-	int flags = 0,
-	RecvVarProxyFn varProxy = RecvProxy_StringToString
-);
-
-RecvProp RecvPropDataTable(
-	const char* pVarName,
-	int offset,
-	int flags,
-	RecvTable* pTable,
-	DataTableRecvVarProxyFn varProxy = DataTableRecvProxy_StaticDataTable
-);
-
-RecvProp RecvPropArray3(
-	const char* pVarName,
-	int offset,
-	int sizeofVar,
-	int elements,
-	RecvProp pArrayProp,
-	DataTableRecvVarProxyFn varProxy = DataTableRecvProxy_StaticDataTable
-);
-
-RecvProp InternalRecvPropArray(
-	const int elementCount,
-	const int elementStride,
-	const char* pName,
-	ArrayLengthRecvProxyFn proxy
-);
-
-
-#define RecvPropVirtualArray( arrayLengthProxy, maxArrayLength, varTemplate, propertyName ) \
-	varTemplate, \
-	InternalRecvPropArray( \
-		maxArrayLength, \
-		0, \
-		#propertyName, \
-		arrayLengthProxy \
-		)
-
-
-#define RecvPropVariableLengthArray( arrayLengthProxy, varTemplate, arrayName )			\
-	varTemplate,										\
-	InternalRecvPropArray(								\
-		sizeof(((currentRecvDTClass*)0)->arrayName) / PROPSIZEOF(currentRecvDTClass, arrayName[0]), \
-		PROPSIZEOF(currentRecvDTClass, arrayName[0]),	\
-		#arrayName,										\
-		arrayLengthProxy								\
-		)
-
-
-#define RecvPropArray( varTemplate, arrayName )			\
-	RecvPropVariableLengthArray( 0, varTemplate, arrayName )
-
-
-#define RecvPropArray2( arrayLengthProxy, varTemplate, elementCount, elementStride, arrayName )		\
-	varTemplate,																	\
-	InternalRecvPropArray( elementCount, elementStride, #arrayName, arrayLengthProxy )
-
-
-inline void RecvProp::InitArray(int nElements, int elementStride)
-{
-	m_RecvType = DPT_Array;
-	m_nElements = nElements;
-	m_ElementStride = elementStride;
-}
-
-inline int RecvProp::GetNumElements() const
-{
-	return m_nElements;
-}
-
-inline void RecvProp::SetNumElements(int nElements)
-{
-	m_nElements = nElements;
-}
-
-inline int RecvProp::GetElementStride() const
-{
-	return m_ElementStride;
-}
-
-inline void RecvProp::SetElementStride(int stride)
-{
-	m_ElementStride = stride;
-}
-
-inline int RecvProp::GetFlags() const
-{
-	return m_Flags;
-}
-
-inline const char* RecvProp::GetName() const
-{
-	return m_pVarName;
-}
-
-inline SendPropType RecvProp::GetType() const
-{
-	return m_RecvType;
-}
-
-inline RecvTable* RecvProp::GetDataTable() const
-{
-	return m_pDataTable;
-}
-
-inline void RecvProp::SetDataTable(RecvTable* pTable)
-{
-	m_pDataTable = pTable;
-}
-
-inline RecvVarProxyFn RecvProp::GetProxyFn() const
-{
-	return m_ProxyFn;
-}
-
-inline void RecvProp::SetProxyFn(RecvVarProxyFn fn)
-{
-	m_ProxyFn = fn;
-}
-
-inline DataTableRecvVarProxyFn RecvProp::GetDataTableProxyFn() const
-{
-	return m_DataTableProxyFn;
-}
-
-inline void RecvProp::SetDataTableProxyFn(DataTableRecvVarProxyFn fn)
-{
-	m_DataTableProxyFn = fn;
-}
-
-inline int RecvProp::GetOffset() const
-{
-	return m_Offset;
-}
-
-inline void RecvProp::SetOffset(int o)
-{
-	m_Offset = o;
-}
-
-inline RecvProp* RecvProp::GetArrayProp() const
-{
-	return m_pArrayProp;
-}
-
-inline void RecvProp::SetArrayProp(RecvProp* pProp)
-{
-	m_pArrayProp = pProp;
-}
-
-inline void RecvProp::SetArrayLengthProxy(ArrayLengthRecvProxyFn proxy)
-{
-	m_ArrayLengthProxy = proxy;
-}
-
-inline ArrayLengthRecvProxyFn RecvProp::GetArrayLengthProxy() const
-{
-	return m_ArrayLengthProxy;
-}
-
-inline bool RecvProp::IsInsideArray() const
-{
-	return m_bInsideArray;
-}
-
-inline void RecvProp::SetInsideArray()
-{
-	m_bInsideArray = true;
-}
-
-inline const void* RecvProp::GetExtraData() const
-{
-	return m_pExtraData;
-}
-
-inline void RecvProp::SetExtraData(const void* pData)
-{
-	m_pExtraData = pData;
-}
-
-inline const char* RecvProp::GetParentArrayPropName()
-{
-	return m_pParentArrayPropName;
-}
-
-inline void	RecvProp::SetParentArrayPropName(const char* pArrayPropName)
-{
-	m_pParentArrayPropName = pArrayPropName;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/dt_send.h b/SpyCustom/dt_send.h
deleted file mode 100644
index 6bd148e..0000000
--- a/SpyCustom/dt_send.h
+++ /dev/null
@@ -1,686 +0,0 @@
-#ifndef DATATABLE_SEND_H
-#define DATATABLE_SEND_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dt_common.h"
-#include "dbg.h"
-#include "const.h"
-#include "bitvec.h"
-
-
-typedef void (*SendVarProxyFn)(const SendProp* pProp, const void* pStructBase, const void* pData, DVariant* pOut, int iElement, int objectID);
-
-class CSendProxyRecipients;
-
-typedef void* (*SendTableProxyFn)(
-	const SendProp* pProp,
-	const void* pStructBase,
-	const void* pData,
-	CSendProxyRecipients* pRecipients,
-	int objectID);
-
-
-class CNonModifiedPointerProxy
-{
-public:
-	CNonModifiedPointerProxy(SendTableProxyFn fn);
-
-public:
-
-	SendTableProxyFn m_Fn;
-	CNonModifiedPointerProxy* m_pNext;
-};
-
-
-#define REGISTER_SEND_PROXY_NON_MODIFIED_POINTER( sendProxyFn ) static CNonModifiedPointerProxy __proxy_##sendProxyFn( sendProxyFn );
-
-
-class CStandardSendProxiesV1
-{
-public:
-	CStandardSendProxiesV1();
-
-	SendVarProxyFn m_Int8ToInt32;
-	SendVarProxyFn m_Int16ToInt32;
-	SendVarProxyFn m_Int32ToInt32;
-
-	SendVarProxyFn m_UInt8ToInt32;
-	SendVarProxyFn m_UInt16ToInt32;
-	SendVarProxyFn m_UInt32ToInt32;
-
-	SendVarProxyFn m_FloatToFloat;
-	SendVarProxyFn m_VectorToVector;
-
-#ifdef SUPPORTS_INT64
-	SendVarProxyFn m_Int64ToInt64;
-	SendVarProxyFn m_UInt64ToInt64;
-#endif
-};
-
-class CStandardSendProxies : public CStandardSendProxiesV1
-{
-public:
-	CStandardSendProxies();
-
-	SendTableProxyFn m_DataTableToDataTable;
-	SendTableProxyFn m_SendLocalDataTable;
-	CNonModifiedPointerProxy** m_ppNonModifiedPointerProxies;
-};
-
-extern CStandardSendProxies g_StandardSendProxies;
-
-
-#define MAX_DATATABLE_PROXIES	32
-
-class CSendProxyRecipients
-{
-public:
-	void	SetAllRecipients();					            
-	void	ClearAllRecipients();
-
-	void	SetRecipient(int iClient);		               
-	void	ClearRecipient(int iClient);
-
-	void	SetOnly(int iClient);
-
-public:
-	CBitVec< ABSOLUTE_PLAYER_LIMIT >	m_Bits;
-};
-
-inline void CSendProxyRecipients::SetAllRecipients()
-{
-	m_Bits.SetAll();
-}
-
-inline void CSendProxyRecipients::ClearAllRecipients()
-{
-	m_Bits.ClearAll();
-}
-
-inline void CSendProxyRecipients::SetRecipient(int iClient)
-{
-	m_Bits.Set(iClient);
-}
-
-inline void	CSendProxyRecipients::ClearRecipient(int iClient)
-{
-	m_Bits.Clear(iClient);
-}
-
-inline void CSendProxyRecipients::SetOnly(int iClient)
-{
-	m_Bits.ClearAll();
-	m_Bits.Set(iClient);
-}
-
-
-
-typedef int (*ArrayLengthSendProxyFn)(const void* pStruct, int objectID);
-
-
-
-class RecvProp;
-class SendTable;
-class CSendTablePrecalc;
-
-
-#define DATATABLE_PROXY_INDEX_NOPROXY	255
-#define DATATABLE_PROXY_INDEX_INVALID	254
-
-class SendProp
-{
-public:
-	SendProp();
-	virtual				~SendProp();
-
-	void				Clear();
-
-	int					GetOffset() const;
-	void				SetOffset(int i);
-
-	SendVarProxyFn		GetProxyFn() const;
-	void				SetProxyFn(SendVarProxyFn f);
-
-	SendTableProxyFn	GetDataTableProxyFn() const;
-	void				SetDataTableProxyFn(SendTableProxyFn f);
-
-	SendTable* GetDataTable() const;
-	void				SetDataTable(SendTable* pTable);
-
-	char const* GetExcludeDTName() const;
-
-	const char* GetParentArrayPropName() const;
-	void				SetParentArrayPropName(char* pArrayPropName);
-
-	const char* GetName() const;
-
-	bool				IsSigned() const;
-
-	bool				IsExcludeProp() const;
-
-	bool				IsInsideArray() const;	      
-	void				SetInsideArray();
-
-	void				SetArrayProp(SendProp* pProp);
-	SendProp* GetArrayProp() const;
-
-	void					SetArrayLengthProxy(ArrayLengthSendProxyFn fn);
-	ArrayLengthSendProxyFn	GetArrayLengthProxy() const;
-
-	int					GetNumElements() const;
-	void				SetNumElements(int nElements);
-
-	int					GetNumArrayLengthBits() const;
-
-	int					GetElementStride() const;
-
-	SendPropType		GetType() const;
-
-	int					GetFlags() const;
-	void				SetFlags(int flags);
-
-	const void* GetExtraData() const;
-	void				SetExtraData(const void* pData);
-
-public:
-
-	RecvProp* m_pMatchingRecvProp;	        
-	SendPropType	m_Type;
-	int				m_nBits;
-	float			m_fLowValue;
-	float			m_fHighValue;
-
-	SendProp* m_pArrayProp;					              
-	ArrayLengthSendProxyFn	m_ArrayLengthProxy;	      
-
-	int				m_nElements;		             
-	int				m_ElementStride;	     
-
-	const char* m_pExcludeDTName;			                   
-	const char* m_pParentArrayPropName;
-
-	const char* m_pVarName;
-	float			m_fHighLowMul;
-
-private:
-
-	int					m_Flags;				  
-
-	SendVarProxyFn		m_ProxyFn;				   
-	SendTableProxyFn	m_DataTableProxyFn;		   
-
-	SendTable* m_pDataTable;
-
-	int					m_Offset;
-
-	const void* m_pExtraData;
-};
-
-
-inline int SendProp::GetOffset() const
-{
-	return m_Offset;
-}
-
-inline void SendProp::SetOffset(int i)
-{
-	m_Offset = i;
-}
-
-inline SendVarProxyFn SendProp::GetProxyFn() const
-{
-	Assert(m_Type != DPT_DataTable);
-	return m_ProxyFn;
-}
-
-inline void SendProp::SetProxyFn(SendVarProxyFn f)
-{
-	m_ProxyFn = f;
-}
-
-inline SendTableProxyFn SendProp::GetDataTableProxyFn() const
-{
-	Assert(m_Type == DPT_DataTable);
-	return m_DataTableProxyFn;
-}
-
-inline void SendProp::SetDataTableProxyFn(SendTableProxyFn f)
-{
-	m_DataTableProxyFn = f;
-}
-
-inline SendTable* SendProp::GetDataTable() const
-{
-	return m_pDataTable;
-}
-
-inline void SendProp::SetDataTable(SendTable* pTable)
-{
-	m_pDataTable = pTable;
-}
-
-inline char const* SendProp::GetExcludeDTName() const
-{
-	return m_pExcludeDTName;
-}
-
-inline const char* SendProp::GetParentArrayPropName() const
-{
-	return m_pParentArrayPropName;
-}
-
-inline void	SendProp::SetParentArrayPropName(char* pArrayPropName)
-{
-	Assert(!m_pParentArrayPropName);
-	m_pParentArrayPropName = pArrayPropName;
-}
-
-inline const char* SendProp::GetName() const
-{
-	return m_pVarName;
-}
-
-
-inline bool SendProp::IsSigned() const
-{
-	return !(m_Flags & SPROP_UNSIGNED);
-}
-
-inline bool SendProp::IsExcludeProp() const
-{
-	return (m_Flags & SPROP_EXCLUDE) != 0;
-}
-
-inline bool	SendProp::IsInsideArray() const
-{
-	return (m_Flags & SPROP_INSIDEARRAY) != 0;
-}
-
-inline void SendProp::SetInsideArray()
-{
-	m_Flags |= SPROP_INSIDEARRAY;
-}
-
-inline void SendProp::SetArrayProp(SendProp* pProp)
-{
-	m_pArrayProp = pProp;
-}
-
-inline SendProp* SendProp::GetArrayProp() const
-{
-	return m_pArrayProp;
-}
-
-inline void SendProp::SetArrayLengthProxy(ArrayLengthSendProxyFn fn)
-{
-	m_ArrayLengthProxy = fn;
-}
-
-inline ArrayLengthSendProxyFn SendProp::GetArrayLengthProxy() const
-{
-	return m_ArrayLengthProxy;
-}
-
-inline int SendProp::GetNumElements() const
-{
-	return m_nElements;
-}
-
-inline void SendProp::SetNumElements(int nElements)
-{
-	m_nElements = nElements;
-}
-
-inline int SendProp::GetElementStride() const
-{
-	return m_ElementStride;
-}
-
-inline SendPropType SendProp::GetType() const
-{
-	return m_Type;
-}
-
-inline int SendProp::GetFlags() const
-{
-	return m_Flags;
-}
-
-inline void SendProp::SetFlags(int flags)
-{
-	Assert(!(flags & ~((1 << SPROP_NUMFLAGBITS) - 1)));
-	m_Flags = flags;
-}
-
-inline const void* SendProp::GetExtraData() const
-{
-	return m_pExtraData;
-}
-
-inline void SendProp::SetExtraData(const void* pData)
-{
-	m_pExtraData = pData;
-}
-
-
-class SendTable
-{
-public:
-
-	typedef SendProp PropType;
-
-	SendTable();
-	SendTable(SendProp* pProps, int nProps, const char* pNetTableName);
-	~SendTable();
-
-	void		Construct(SendProp* pProps, int nProps, const char* pNetTableName);
-
-	const char* GetName() const;
-
-	int			GetNumProps() const;
-	SendProp* GetProp(int i);
-
-	bool		IsInitialized() const;
-	void		SetInitialized(bool bInitialized);
-
-	void		SetWriteFlag(bool bHasBeenWritten);
-	bool		GetWriteFlag() const;
-
-	bool		HasPropsEncodedAgainstTickCount() const;
-	void		SetHasPropsEncodedAgainstTickcount(bool bState);
-
-public:
-
-	SendProp* m_pProps;
-	int			m_nProps;
-
-	const char* m_pNetTableName;	       
-
-	CSendTablePrecalc* m_pPrecalc;
-
-
-protected:
-	bool		m_bInitialized : 1;
-	bool		m_bHasBeenWritten : 1;
-	bool		m_bHasPropsEncodedAgainstCurrentTickCount : 1;     
-};
-
-
-inline const char* SendTable::GetName() const
-{
-	return m_pNetTableName;
-}
-
-
-inline int SendTable::GetNumProps() const
-{
-	return m_nProps;
-}
-
-
-inline SendProp* SendTable::GetProp(int i)
-{
-	Assert(i >= 0 && i < m_nProps);
-	return &m_pProps[i];
-}
-
-
-inline bool SendTable::IsInitialized() const
-{
-	return m_bInitialized;
-}
-
-
-inline void SendTable::SetInitialized(bool bInitialized)
-{
-	m_bInitialized = bInitialized;
-}
-
-
-inline bool SendTable::GetWriteFlag() const
-{
-	return m_bHasBeenWritten;
-}
-
-
-inline void SendTable::SetWriteFlag(bool bHasBeenWritten)
-{
-	m_bHasBeenWritten = bHasBeenWritten;
-}
-
-inline bool SendTable::HasPropsEncodedAgainstTickCount() const
-{
-	return m_bHasPropsEncodedAgainstCurrentTickCount;
-}
-
-inline void SendTable::SetHasPropsEncodedAgainstTickcount(bool bState)
-{
-	m_bHasPropsEncodedAgainstCurrentTickCount = bState;
-}
-
-#define BEGIN_SEND_TABLE(className, tableName) \
-	BEGIN_SEND_TABLE_NOBASE(className, tableName) \
-		SendPropDataTable("baseclass", 0, className::BaseClass::m_pClassSendTable, SendProxy_DataTableToDataTable),
-
-#define BEGIN_SEND_TABLE_NOBASE(className, tableName) \
-	template <typename T> int ServerClassInit(T *); \
-	namespace tableName { \
-		struct ignored; \
-	} \
-	template <> int ServerClassInit<tableName::ignored>(tableName::ignored *); \
-	namespace tableName { \
-		SendTable g_SendTable;\
-		int g_SendTableInit = ServerClassInit((tableName::ignored *)NULL); \
-	} \
-	template <> int ServerClassInit<tableName::ignored>(tableName::ignored *) \
-	{ \
-		typedef className currentSendDTClass; \
-		static const char *g_pSendTableName = #tableName; \
-		SendTable &sendTable = tableName::g_SendTable; \
-		static SendProp g_SendProps[] = { \
-			SendPropInt("should_never_see_this", 0, sizeof(int)),		              
-
-#define END_SEND_TABLE() \
-		};\
-		sendTable.Construct(g_SendProps+1, sizeof(g_SendProps) / sizeof(SendProp) - 1, g_pSendTableName);\
-		return 1; \
-	} 
-
-
-#define SENDINFO(varName)					#varName, offsetof(currentSendDTClass::MakeANetworkVar_##varName, varName), sizeof(((currentSendDTClass*)0)->varName)
-#define SENDINFO_ARRAY(varName)				#varName, offsetof(currentSendDTClass::MakeANetworkVar_##varName, varName), sizeof(((currentSendDTClass*)0)->varName[0])
-#define SENDINFO_ARRAY3(varName)			#varName, offsetof(currentSendDTClass::MakeANetworkVar_##varName, varName), sizeof(((currentSendDTClass*)0)->varName[0]), sizeof(((currentSendDTClass*)0)->varName)/sizeof(((currentSendDTClass*)0)->varName[0])
-#define SENDINFO_ARRAYELEM(varName, i)		#varName "[" #i "]", offsetof(currentSendDTClass::MakeANetworkVar_##varName, varName[i]), sizeof(((currentSendDTClass*)0)->varName[0])
-#define SENDINFO_NETWORKARRAYELEM(varName, i)#varName "[" #i "]", offsetof(currentSendDTClass::MakeANetworkVar_##varName, varName.m_Value[i]), sizeof(((currentSendDTClass*)0)->varName.m_Value[0])
-
-#define SENDINFO_VECTORELEM(varName, i)		#varName "[" #i "]", -(int)offsetof(currentSendDTClass::MakeANetworkVar_##varName, varName.m_Value[i]), sizeof(((currentSendDTClass*)0)->varName.m_Value[0])
-
-#define SENDINFO_STRUCTELEM(varName)		#varName, offsetof(currentSendDTClass, varName), sizeof(((currentSendDTClass*)0)->varName.m_Value)
-#define SENDINFO_STRUCTARRAYELEM(varName, i)#varName "[" #i "]", offsetof(currentSendDTClass, varName.m_Value[i]), sizeof(((currentSendDTClass*)0)->varName.m_Value[0])
-
-#define SENDINFO_NOCHECK(varName)						#varName, offsetof(currentSendDTClass, varName), sizeof(((currentSendDTClass*)0)->varName)
-#define SENDINFO_STRING_NOCHECK(varName)				#varName, offsetof(currentSendDTClass, varName)
-#define SENDINFO_DT(varName)							#varName, offsetof(currentSendDTClass, varName)
-#define SENDINFO_DT_NAME(varName, remoteVarName)		#remoteVarName, offsetof(currentSendDTClass, varName)
-#define SENDINFO_NAME(varName,remoteVarName)			#remoteVarName, offsetof(currentSendDTClass, varName), sizeof(((currentSendDTClass*)0)->varName)
-
-
-
-
-void SendProxy_QAngles(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-void SendProxy_AngleToFloat(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-void SendProxy_FloatToFloat(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-void SendProxy_VectorToVector(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-void SendProxy_VectorXYToVectorXY(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-#if 0                       
-void SendProxy_QuaternionToQuaternion(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-#endif
-
-void SendProxy_Int8ToInt32(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-void SendProxy_Int16ToInt32(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-void SendProxy_Int32ToInt32(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-#ifdef SUPPORTS_INT64
-void SendProxy_Int64ToInt64(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-#endif
-void SendProxy_StringToString(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-
-void* SendProxy_DataTableToDataTable(const SendProp* pProp, const void* pStructBase, const void* pData, CSendProxyRecipients* pRecipients, int objectID);
-
-void* SendProxy_DataTablePtrToDataTable(const SendProp* pProp, const void* pStructBase, const void* pData, CSendProxyRecipients* pRecipients, int objectID);
-
-void* SendProxy_SendLocalDataTable(const SendProp* pProp, const void* pStruct, const void* pVarData, CSendProxyRecipients* pRecipients, int objectID);
-
-
-SendProp SendPropFloat(
-	const char* pVarName,		  
-	int offset,					    
-	int sizeofVar = SIZEOF_IGNORE,
-	int nBits = 32,				       
-	int flags = 0,
-	float fLowValue = 0.0f,			       
-	float fHighValue = HIGH_DEFAULT,	      
-	SendVarProxyFn varProxy = SendProxy_FloatToFloat
-);
-
-SendProp SendPropVector(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,
-	int nBits = 32,					           
-	int flags = SPROP_NOSCALE,
-	float fLowValue = 0.0f,			       
-	float fHighValue = HIGH_DEFAULT,	      
-	SendVarProxyFn varProxy = SendProxy_VectorToVector
-);
-
-SendProp SendPropVectorXY(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,
-	int nBits = 32,					           
-	int flags = SPROP_NOSCALE,
-	float fLowValue = 0.0f,			       
-	float fHighValue = HIGH_DEFAULT,	      
-	SendVarProxyFn varProxy = SendProxy_VectorXYToVectorXY
-);
-
-#if 0                       
-SendProp SendPropQuaternion(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,
-	int nBits = 32,					           
-	int flags = SPROP_NOSCALE,
-	float fLowValue = 0.0f,			       
-	float fHighValue = HIGH_DEFAULT,	      
-	SendVarProxyFn varProxy = SendProxy_QuaternionToQuaternion
-);
-#endif
-
-SendProp SendPropAngle(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,
-	int nBits = 32,
-	int flags = 0,
-	SendVarProxyFn varProxy = SendProxy_AngleToFloat
-);
-
-SendProp SendPropQAngles(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,
-	int nBits = 32,
-	int flags = 0,
-	SendVarProxyFn varProxy = SendProxy_QAngles
-);
-
-SendProp SendPropInt(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,	    
-	int nBits = -1,					               
-	int flags = 0,
-	SendVarProxyFn varProxy = 0
-);
-
-inline SendProp SendPropModelIndex(const char* pVarName, int offset, int sizeofVar = SIZEOF_IGNORE)
-{
-	return SendPropInt(pVarName, offset, sizeofVar, SP_MODEL_INDEX_BITS, 0);
-}
-
-SendProp SendPropString(
-	const char* pVarName,
-	int offset,
-	int bufferLen,
-	int flags = 0,
-	SendVarProxyFn varProxy = SendProxy_StringToString);
-
-SendProp SendPropDataTable(
-	const char* pVarName,
-	int offset,
-	SendTable* pTable,
-	SendTableProxyFn varProxy = SendProxy_DataTableToDataTable
-);
-
-SendProp SendPropArray3(
-	const char* pVarName,
-	int offset,
-	int sizeofVar,
-	int elements,
-	SendProp pArrayProp,
-	SendTableProxyFn varProxy = SendProxy_DataTableToDataTable
-);
-
-
-
-SendProp InternalSendPropArray(
-	const int elementCount,
-	const int elementStride,
-	const char* pName,
-	ArrayLengthSendProxyFn proxy
-);
-
-
-#define SendPropArray( varTemplate, arrayName )			\
-	SendPropVariableLengthArray(						\
-		0,												\
-		varTemplate,									\
-		arrayName )
-
-#define SendPropVirtualArray( arrayLengthSendProxy, maxArrayLength, varTemplate, propertyName )	\
-	varTemplate,										\
-	InternalSendPropArray(								\
-		maxArrayLength,									\
-		0,												\
-		#propertyName,									\
-		arrayLengthSendProxy							\
-		)
-
-
-#define SendPropVariableLengthArray( arrayLengthSendProxy, varTemplate, arrayName )	\
-	varTemplate,										\
-	InternalSendPropArray(								\
-		sizeof(((currentSendDTClass*)0)->arrayName) / PROPSIZEOF(currentSendDTClass, arrayName[0]), \
-		PROPSIZEOF(currentSendDTClass, arrayName[0]),	\
-		#arrayName,										\
-		arrayLengthSendProxy							\
-		)
-
-#define SendPropArray2( arrayLengthSendProxy, varTemplate, elementCount, elementStride, arrayName )		\
-	varTemplate,																	\
-	InternalSendPropArray( elementCount, elementStride, #arrayName, arrayLengthSendProxy )
-
-
-
-
-SendProp SendPropExclude(
-	const char* pDataTableName,	        
-	const char* pPropName		      
-);
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/econ_item_constants.h b/SpyCustom/econ_item_constants.h
deleted file mode 100644
index 030c897..0000000
--- a/SpyCustom/econ_item_constants.h
+++ /dev/null
@@ -1,550 +0,0 @@
-#ifndef ACTUAL_ECON_ITEM_CONSTANTS_H		     
-#define ACTUAL_ECON_ITEM_CONSTANTS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-typedef	uint32		item_price_t;						                     
-typedef uint8		item_transaction_quantity_t;
-
-class CLocalizationProvider;
-
-#define TESTITEM_DEFINITIONS_BEGIN_AT		32000
-#define TESTITEM_DEFINITIONS_COUNT			16
-
-enum EEconTypeID
-{
-	k_EEconTypeItem = 1,
-	k_EEconTypePersonaDataPublic = 2,
-	k_EEconTypeGameAccountClient = 7,
-	k_EEconTypeGameAccount = 8,
-	k_EEconTypeEquipInstance = 31,
-	k_EEconTypeDefaultEquippedDefinitionInstance = 42,
-	k_EEconTypeDefaultEquippedDefinitionInstanceClient = 43,
-	k_EEconTypeCoupon = 45,
-	k_EEconTypeQuest = 46,
-};
-
-enum EItemAction
-{
-	k_EItemActionInvalid = -1,
-	k_EItemActionGSCreate = 0,
-	k_EItemActionUnpurchase = 1,
-	k_EItemActionDelete = 2,
-	k_EItemActionAwardAchievement = 3,
-	k_EItemActionBanned = 4,
-	k_EItemActionQuantityChanged = 5,
-	k_EItemActionRestored = 6,
-	k_EItemActionAwardTime = 7,
-	k_EItemActionManualCreate = 8,
-	k_EItemActionDrop = 9,
-	k_EItemActionPickUp = 10,
-	k_EItemActionCraftDestroy = 11,
-	k_EItemActionCraftCreate = 12,
-	k_EItemActionLimitExceeded = 13,
-	k_EItemActionPurchase = 14,
-	k_EItemActionNameChanged_Add = 15,
-	k_EItemActionUnlockCrate_Add = 16,
-	k_EItemActionPaintItem_Add = 17,
-	k_EItemActionAutoGrantItem = 18,
-	k_EItemActionCrossGameAchievement = 19,
-	k_EItemActionAddItemToSocket_Add = 20,
-	k_EItemActionAddSocketToItem_Add = 21,
-	k_EItemActionRemoveSocketItem_Add = 22,
-	k_EItemActionCustomizeItemTexture_Add = 23,
-	k_EItemActionItemTraded_Add = 24,
-	k_EItemActionUseItem = 25,
-	k_EItemActionAwardGift_Receiver = 26,
-	k_EItemActionNameChanged_Remove = 27,
-	k_EItemActionUnlockCrate_Remove = 28,
-	k_EItemActionPaintItem_Remove = 29,
-	k_EItemActionAddItemToSocket_Remove = 30,
-	k_EItemActionAddSocketToItem_Remove = 31,
-	k_EItemActionRemoveSocketItem_Remove = 32,
-	k_EItemActionCustomizeItemTexture_Remove = 33,
-	k_EItemActionItemTraded_Remove = 34,
-	k_EItemActionUnpackItemBundle = 35,
-	k_EItemActionCreateItemFromBundle = 36,
-	k_EItemActionAwardStorePromotionItem = 37,
-	k_EItemActionConvertItem = 38,
-	k_EItemActionEarnedItem = 39,
-	k_EItemActionAwardGift_Giver = 40,
-	k_EItemActionRefundedItem = 41,
-	k_EItemActionAwardThirdPartyPromo = 42,
-	k_EItemActionRemoveItemName_Remove = 43,
-	k_EItemActionRemoveItemName_Add = 44,
-	k_EItemActionRemoveItemPaint_Remove = 45,
-	k_EItemActionRemoveItemPaint_Add = 46,
-	k_EItemActionHalloweenDrop = 47,
-	k_EItemActionSteamWorkshopContributor = 48,
-
-	k_EItemActionSupportDelete = 50,
-	k_EItemActionSupportCreatedByUndo = 51,
-	k_EItemActionSupportDeletedByUndo = 52,
-	k_EItemActionSupportQuantityChangedByUndo = 53,
-	k_EItemActionSupportRename_Add = 54,
-	k_EItemActionSupportRename_Remove = 55,
-	k_EItemActionSupportDescribe_Add = 56,
-	k_EItemActionSupportDescribe_Remove = 57,
-
-	k_EItemActionPeriodicScoreReward_Add = 58,
-	k_EItemActionPeriodicScoreReward_Remove = 59,
-	k_EItemActionStrangePartApply_Add = 60,
-	k_EItemActionStrangePartApply_Remove = 61,
-
-	k_EItemActionPennantUpgradeApply_Add = 62,
-	k_EItemActionPennantUpgradeApply_Remove = 63,
-
-	k_EItemActionPaintKitItem_Add = 64,
-	k_EItemActionPaintKitItem_Remove = 65,
-
-	k_EItemActionUpgradeChallengeCoin_Add = 66,
-	k_EItemActionUpgradeChallengeCoin_Remove = 67,
-
-	k_EItemActionStickerApply_Add = 68,
-	k_EItemActionStickerApply_Remove = 69,
-	k_EItemActionStickerRemove_Add = 70,
-	k_EItemActionStickerRemove_Remove = 71,
-
-	k_EItemActionGrantQuestReward_Add = 72,
-	k_EItemActionGrantQuestReward_Remove = 73,
-	k_EItemActionApplyQuestProgress_Add = 74,
-	k_EItemActionApplyQuestProgress_Remove = 75,
-
-	k_EItemActionPurchaseUnlockCrate_Add = 76,
-	k_EItemActionPurchaseUnlockCrate_Remove = 77,
-
-	k_EItemActionSwapStatTrak_Add = 78,
-	k_EItemActionSwapStatTrak_Remove = 79,
-
-	k_EItemActionPurchaseConsumedAsNonItem = 80,
-
-	k_EItemActionDev_ClientLootListRoll = 90,
-
-	k_EItemActionGiftWrap_Add = 100,
-	k_EItemActionGiftWrap_Remove = 101,
-	k_EItemActionGiftDelivery_Add = 102,
-	k_EItemActionGiftDelivery_Remove = 103,
-	k_EItemActionGiftUnwrap_Add = 104,
-	k_EItemActionGiftUnwrap_Remove = 105,
-	k_EItemActionPackageItem = 106,
-	k_EItemActionPackageItem_Revoked = 107,
-	k_EItemActionHandleMapToken = 108,
-	k_EItemActionCafeOrSchoolItem_Remove = 109,
-	k_EItemActionVACBanned_Remove = 110,
-	k_EItemActionUpgradeThirdPartyPromo = 111,
-	k_EItemActionExpired = 112,
-	k_EItemActionTradeRollback_Add = 113,
-	k_EItemActionTradeRollback_Remove = 114,
-	k_EItemActionCDKeyGrant = 115,
-	k_EItemActionCDKeyRevoke = 116,
-	k_EItemActionWeddingRing_Add = 117,
-	k_EItemActionWeddingRing_Remove = 118,
-	k_EItemActionWeddingRing_AddPartner = 119,
-	k_EItemActionEconSetUnowned = 120,
-	k_EItemActionEconSetOwned = 121,
-
-	k_EItemActionRemoveItemCraftIndex_Remove = 150,
-	k_EItemActionRemoveItemCraftIndex_Add = 151,
-	k_EItemActionRemoveItemMakersMark_Remove = 152,				           
-	k_EItemActionRemoveItemMakersMark_Add = 153,				                 
-
-	k_EItemActionCollectItem_CollectedItem = 154,
-	k_EItemActionCollectItem_UpdateCollection = 155,
-	k_EItemActionCollectItem_RemoveCollection = 156,
-	k_EItemActionCollectItem_RedeemCollectionReward = 157,
-
-	k_EItemActionPreviewItem_BeginPreviewPeriod = 158,
-	k_EItemActionPreviewItem_EndPreviewPeriodExpired = 159,
-	k_EItemActionPreviewItem_EndPreviewPeriodItemBought = 160,
-
-	k_EItemActionRecycling = 161,
-	k_EItemActionAwardXP = 162,
-	k_EItemActionTournamentDrop = 163,
-	k_EItemDiretideReward = 164,
-
-
-	k_EItemDiretideEggAddOnModify = 165,
-	k_EItemDiretideEssenceRemove = 166,
-	k_EItemDiretideEggRemoveOnModify = 167,
-
-	k_EItemActionUnpackItems = 168,
-
-	k_EItemActionUnlockStyle = 169,
-	k_EItemActionUnlockStyle_Remove = 170,
-
-	k_EItemActionTutorialDrop = 171,
-
-	k_EItemActionAutographAdd = 172,
-	k_EItemActionAutographRemove = 173,
-
-	k_EItemActionApplyIntermediateStickerWear = 174,
-	k_EItemActionTemplateItemGrant = 175,
-
-	k_EItemActionCoinCampaignProgress = 176,
-
-	k_EItemActionMarket_Add = 177,
-	k_EItemActionMarket_Remove = 178,
-};
-extern const char* PchNameFromEItemAction(EItemAction eAction);
-extern const char* PchNameFromEItemActionUnsafe(EItemAction eAction);
-
-extern bool BIsActionCreative(EItemAction);
-extern bool BIsActionDestructive(EItemAction);
-
-enum EItemActionMissingBehavior { kEItemAction_FriendlyNameLookup_ReturnNULLIfMissing, kEItemAction_FriendlyNameLookup_ReturnDummyStringIfMissing };
-extern const char* PchFriendlyNameFromEItemAction(EItemAction eAction, EItemActionMissingBehavior eMissingBehavior);
-extern const char* PchLocalizedNameFromEItemAction(EItemAction eAction, CLocalizationProvider& localizationProvider);
-
-
-enum EEconOwnershipAction
-{
-	k_EEconOwnershipAction_Invalid = 0,
-
-	k_EEconOwnershipAction_TradeBase = 100,
-	k_EEconOwnershipAction_TradeCommit = 101,		           
-	k_EEconOwnershipAction_TradeRollback = 102,		           
-};
-
-enum eEconItemFlags_Deprecated
-{
-	kDeprecated_EconItemFlag_AchievementGrantedItem = 1 << 0,
-	kDeprecated_EconItemFlag_CannotTrade = 1 << 1,
-	kDeprecated_EconItemFlag_Purchased = 1 << 2,
-	kDeprecated_EconItemFlag_CannotBeUsedInCrafting = 1 << 3,
-	kDeprecated_EconItemFlag_Promotion = 1 << 4,
-};
-
-enum eEconItemFlags
-{
-	kEconItemFlag_CannotTrade = 1 << 0,
-	kEconItemFlag_CannotBeUsedInCrafting = 1 << 1,
-	kEconItemFlag_CanBeTradedByFreeAccounts = 1 << 2,
-	kEconItemFlag_NonEconomy = 1 << 3,		                    
-
-#ifdef CLIENT_DLL
-#ifdef TF_CLIENT_DLL
-	kEconItemFlagClient_ForceBlueTeam = 1 << 5,
-#endif  
-	kEconItemFlagClient_StoreItem = 1 << 6,
-	kEconItemFlagClient_Preview = 1 << 7,		           
-#endif  
-
-	kEconItemFlags_CheckFlags_CannotTrade = kEconItemFlag_CannotTrade,
-	kEconItemFlags_CheckFlags_NotUsableInCrafting = kEconItemFlag_CannotBeUsedInCrafting,
-
-	kEconItemFlags_CheckFlags_AllGCFlags = kEconItemFlags_CheckFlags_CannotTrade | kEconItemFlags_CheckFlags_NotUsableInCrafting,
-};
-
-enum eEconItemOrigin
-{
-	kEconItemOrigin_Invalid = -1,				               
-
-	kEconItemOrigin_Drop = 0,
-	kEconItemOrigin_Achievement,
-	kEconItemOrigin_Purchased,
-	kEconItemOrigin_Traded,
-	kEconItemOrigin_Crafted,
-	kEconItemOrigin_StorePromotion,
-	kEconItemOrigin_Gifted,
-	kEconItemOrigin_SupportGranted,
-	kEconItemOrigin_FoundInCrate,
-	kEconItemOrigin_Earned,
-	kEconItemOrigin_ThirdPartyPromotion,
-	kEconItemOrigin_GiftWrapped,
-	kEconItemOrigin_HalloweenDrop,
-	kEconItemOrigin_PackageItem,
-	kEconItemOrigin_Foreign,
-	kEconItemOrigin_CDKey,
-	kEconItemOrigin_CollectionReward,
-	kEconItemOrigin_PreviewItem,
-	kEconItemOrigin_SteamWorkshopContribution,
-	kEconItemOrigin_PeriodicScoreReward,
-	kEconItemOrigin_Recycling,
-	kEconItemOrigin_TournamentDrop,
-	kEconItemOrigin_StockItem,
-	KEconItemOrigin_QuestReward,
-	KEconItemOrigin_LevelUpReward,
-
-	kEconItemOrigin_Max,
-};
-extern const char* PchNameFromeEconItemOrigin(eEconItemOrigin eOrigin);
-
-typedef uint64	itemid_t;
-typedef uint16	item_definition_index_t;
-typedef uint16	attrib_definition_index_t;
-typedef uint32	attrib_value_t;
-
-typedef uint32	equip_region_mask_t;
-typedef uint8	style_index_t;
-
-const uint64 INVALID_ITEM_ID = (itemid_t)-1;
-const item_definition_index_t INVALID_ITEM_DEF_INDEX = ((item_definition_index_t)-1);
-const attrib_definition_index_t INVALID_ATTRIB_DEF_INDEX = ((attrib_definition_index_t)-1);
-
-#define DEFAULT_NUM_BACKPACK_SLOTS_PER_PAGE				100
-#define DEFAULT_NUM_BACKPACK_SLOTS						1000
-#define DEFAULT_NUM_BACKPACK_SLOTS_FREE_TRIAL_ACCOUNT	100
-#define MAX_NUM_BACKPACK_SLOTS							2000
-
-#define MIN_ITEM_LEVEL					0
-#define MAX_ITEM_LEVEL					100
-
-#define MAX_ATTRIBUTES_PER_ITEM					32
-#define MAX_ATTRIBUTE_DESCRIPTION_LENGTH		( 256 / sizeof( locchar_t ) )
-
-#define MAX_ITEM_NAME_LENGTH					128
-#define MAX_ITEM_DESC_LENGTH					256
-#define MAX_ITEM_LONG_DESC_LENGTH				2048
-#define MAX_ITEM_CUSTOM_NAME_LENGTH				40
-#define MAX_ITEM_CUSTOM_NAME_DATABASE_SIZE		((4 * MAX_ITEM_CUSTOM_NAME_LENGTH) + 1)	     
-#define MAX_ITEM_CUSTOM_DESC_LENGTH				80
-#define MAX_ITEM_CUSTOM_DESC_DATABASE_SIZE		((4 * MAX_ITEM_CUSTOM_DESC_LENGTH) + 1)
-
-#define MAX_CLAIM_CODE_LENGTH					128	
-
-#define MAX_ITEMS_BEFORE_YIELD					50
-
-#define RGB_INT_RED  12073019
-#define RGB_INT_BLUE 5801378
-
-const int k_nCustomImageSize = 256;
-const int k_nMaxCustomImageFileSize = k_nCustomImageSize * k_nCustomImageSize * 4 + 4 * 1024;     
-
-typedef int32 entityquality_t;
-enum EEconItemQuality
-{
-	AE_UNDEFINED = -1,
-
-	AE_NORMAL = 0,
-	AE_GENUINE = 1,
-	AE_VINTAGE,
-	AE_UNUSUAL,
-	AE_UNIQUE,
-	AE_COMMUNITY,
-	AE_DEVELOPER,
-	AE_SELFMADE,
-	AE_CUSTOMIZED,
-	AE_STRANGE,
-	AE_COMPLETED,
-	AE_HAUNTED,
-	AE_TOURNAMENT,
-	AE_FAVORED,
-
-	AE_MAX_TYPES,
-};
-
-
-enum attrib_colors_t
-{
-	ATTRIB_COL_LEVEL = 0,
-	ATTRIB_COL_NEUTRAL,
-	ATTRIB_COL_POSITIVE,
-	ATTRIB_COL_NEGATIVE,
-	ATTRIB_COL_ITEMSET_NAME,
-	ATTRIB_COL_ITEMSET_EQUIPPED,
-	ATTRIB_COL_ITEMSET_MISSING,
-	ATTRIB_COL_BUNDLE_ITEM,
-	ATTRIB_COL_LIMITED_USE,
-	ATTRIB_COL_ITEM_FLAGS,
-	ATTRIB_COL_RARITY_DEFAULT,
-	ATTRIB_COL_RARITY_COMMON,
-	ATTRIB_COL_RARITY_UNCOMMON,
-	ATTRIB_COL_RARITY_RARE,
-	ATTRIB_COL_RARITY_MYTHICAL,
-	ATTRIB_COL_RARITY_LEGENDARY,
-	ATTRIB_COL_RARITY_ANCIENT,
-	ATTRIB_COL_RARITY_IMMORTAL,
-	ATTRIB_COL_RARITY_ARCANA,
-	ATTRIB_COL_STRANGE,
-	ATTRIB_COL_UNUSUAL,
-
-	NUM_ATTRIB_COLORS,
-};
-
-
-#define AE_USE_SCRIPT_VALUE			9999		           
-
-const char* EconQuality_GetQualityString(EEconItemQuality eQuality);
-const char* EconQuality_GetColorString(EEconItemQuality eQuality);
-const char* EconQuality_GetLocalizationString(EEconItemQuality eQuality);
-
-int EconQuality_GetRarityScore(EEconItemQuality eQuality);
-
-int EconRarity_CombinedItemAndPaintRarity(int nItemDefRarity, int nPaintRarity);
-
-int EconWear_ToIntCategory(float flWear);
-float EconWear_FromIntCategory(int nWearCategory);
-
-int EconMinutes_ToRoundMinHrsCategory(float flMinutes);
-float EconMinutes_FromRoundMinHrsCategory(int nRoundMinHrsCategory);
-
-int EconTintID_ToRoundCategory(uint32 unTintID);
-uint32 EconTintID_FromRoundCategory(int nRoundCategory);
-
-extern attrib_colors_t GetAttribColorIndexForName(const char* pszName);
-
-extern const char* GetColorNameForAttribColor(attrib_colors_t unAttribColor);
-extern const char* GetHexColorForAttribColor(attrib_colors_t unAttribColor);
-
-entityquality_t GetItemQualityFromString(const char* sQuality);
-
-enum recipecategories_t
-{
-	RECIPE_CATEGORY_CRAFTINGITEMS = 0,
-	RECIPE_CATEGORY_COMMONITEMS,
-	RECIPE_CATEGORY_RAREITEMS,
-	RECIPE_CATEGORY_SPECIAL,
-
-	NUM_RECIPE_CATEGORIES
-};
-extern const char* g_szRecipeCategoryStrings[NUM_RECIPE_CATEGORIES];
-
-enum kill_eater_event_t
-{
-	kKillEaterEvent_PlayerKill = 0,
-	kKillEaterEvent_MVPs,
-
-
-};
-
-bool EventRequiresVictim(kill_eater_event_t ke_event);
-
-#define KILL_EATER_RANK_LEVEL_BLOCK_NAME		"KillEaterRank"
-
-int GetKillEaterAttrPairCount();
-const class CEconItemAttributeDefinition* GetKillEaterAttrPair_Score(int i);
-const class CEconItemAttributeDefinition* GetKillEaterAttrPair_Type(int i);
-bool GetKillEaterAttrPair_IsUserCustomizable(int i);
-
-
-enum unacknowledged_item_inventory_positions_t
-{
-	UNACK_ITEM_DROPPED = 1,
-	UNACK_ITEM_CRAFTED,
-	UNACK_ITEM_TRADED,
-	UNACK_ITEM_PURCHASED,
-	UNACK_ITEM_FOUND_IN_CRATE,
-	UNACK_ITEM_GIFTED,
-	UNACK_ITEM_SUPPORT,
-	UNACK_ITEM_PROMOTION,
-	UNACK_ITEM_EARNED,
-	UNACK_ITEM_REFUNDED,
-	UNACK_ITEM_GIFT_WRAPPED,
-	UNACK_ITEM_FOREIGN,
-	UNACK_ITEM_COLLECTION_REWARD,
-	UNACK_ITEM_PREVIEW_ITEM,
-	UNACK_ITEM_PREVIEW_ITEM_PURCHASED,
-	UNACK_ITEM_PERIODIC_SCORE_REWARD,
-	UNACK_ITEM_RECYCLING,
-	UNACK_ITEM_TOURNAMENT_DROP,
-	UNACK_ITEM_QUEST_REWARD,
-	UNACK_ITEM_LEVEL_UP_REWARD,
-#ifdef ENABLE_STORE_RENTAL_BACKEND
-	UNACK_ITEM_RENTAL_PURCHASE,
-#endif
-
-	UNACK_NUM_METHODS,
-};
-
-extern const char* g_pszItemPickupMethodStrings[UNACK_NUM_METHODS];
-extern const char* g_pszItemPickupMethodStringsUnloc[UNACK_NUM_METHODS];
-extern const char* g_pszItemFoundMethodStrings[UNACK_NUM_METHODS];
-
-enum
-{
-	kGCItemSort_NoSort = 0,			             
-
-	kGCItemSort_SortByName = 1,
-	kGCItemSort_SortByDefIndex = 2,
-	kGCItemSort_SortByRarity = 3,
-	kGCItemSort_SortByType = 4,
-	kGCItemSort_SortByQuality = 5,
-
-	kGCItemSort_GameSpecificBase = 100,
-};
-
-enum
-{
-	kTFGCItemSort_SortByClass = kGCItemSort_GameSpecificBase + 1,
-	kTFGCItemSort_SortBySlot = kGCItemSort_GameSpecificBase + 2,
-	kDOTAGCItemSort_SortByHero = kGCItemSort_GameSpecificBase + 3,
-};
-
-enum
-{
-	kBackendPosition_Unacked = 1 << 30,
-	kBackendPosition_Reserved = 1 << 31,
-
-	kBackendPositionMask_Position = 0x0000ffff,
-	kBackendPositionMask_FormatFlags = (kBackendPosition_Unacked | kBackendPosition_Reserved),
-};
-
-inline void SetBackpackPosition(uint32* pPosition, uint32 iPackPosition)
-{
-	(*pPosition) = iPackPosition;
-
-	(*pPosition) &= ~kBackendPosition_Unacked;
-}
-
-inline bool IsUnacknowledged(uint32 iBackendPosition)
-{
-	return (iBackendPosition == 0 || (iBackendPosition & kBackendPosition_Unacked) != 0);
-}
-
-inline int ExtractBackpackPositionFromBackend(uint32 iBackendPosition)
-{
-	if (IsUnacknowledged(iBackendPosition))
-		return 0;
-
-	return iBackendPosition & kBackendPositionMask_Position;
-}
-
-inline unacknowledged_item_inventory_positions_t GetUnacknowledgedReason(uint32 iBackendPosition)
-{
-	return (unacknowledged_item_inventory_positions_t)(iBackendPosition &= ~kBackendPositionMask_FormatFlags);
-}
-
-inline uint32 GetUnacknowledgedPositionFor(unacknowledged_item_inventory_positions_t iMethod)
-{
-	return (iMethod | kBackendPosition_Unacked | kBackendPosition_Reserved);
-}
-
-enum EEconItemPreviewEventIDs
-{
-	k_EEconItemPreview_Start = 1,
-	k_EEconItemPreview_Expired = 2,
-	k_EEconItemPreview_ItemPurchased = 3,
-};
-
-enum EHoliday
-{
-	kHoliday_None = 0,		       
-	kHoliday_Halloween,
-	kHoliday_Christmas,
-	kHoliday_FullMoon,
-	kHoliday_HalloweenOrFullMoon,
-	kHoliday_Easter,
-
-	kHolidayCount,
-};
-
-enum ECartItemType
-{
-	kCartItem_Purchase,				          
-	kCartItem_TryOutUpgrade,		    
-	kCartItem_Rental_1Day,
-	kCartItem_Rental_3Day,
-	kCartItem_Rental_7Day,
-};
-
-void GetHexStringFromPaintColor(float flPaint, char* pszRGB);
-inline bool IsRentalCartItemType(ECartItemType eCartType)
-{
-	return eCartType == kCartItem_Rental_1Day
-		|| eCartType == kCartItem_Rental_3Day
-		|| eCartType == kCartItem_Rental_7Day;
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/econ_item_interface.h b/SpyCustom/econ_item_interface.h
deleted file mode 100644
index 98143ec..0000000
--- a/SpyCustom/econ_item_interface.h
+++ /dev/null
@@ -1,287 +0,0 @@
-#ifndef ECONITEMINTERFACE_H
-#define ECONITEMINTERFACE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "game_item_schema.h"			   
-
-class CAttribute_String;
-
-template < typename T >
-struct StripConstIfPresent { typedef T ResultType; };
-
-template < typename T > struct StripConstIfPresent<const T> { typedef T ResultType; };
-
-template < typename T, typename U >
-struct AreTypesIdentical { enum { kValue = false }; };
-
-template < typename T > struct AreTypesIdentical<T, T> { enum { kValue = true }; };
-
-template < typename T>
-struct IsValidAttributeValueTypeImpl { enum { kValue = false }; };
-
-template < > struct IsValidAttributeValueTypeImpl<attrib_value_t> { enum { kValue = true }; };
-template < > struct IsValidAttributeValueTypeImpl<float> { enum { kValue = true }; };
-template < > struct IsValidAttributeValueTypeImpl<CAttribute_String> { enum { kValue = true }; };
-template < > struct IsValidAttributeValueTypeImpl<Vector> { enum { kValue = true }; };
-
-template < typename T >
-struct IsValidAttributeValueType : public IsValidAttributeValueTypeImpl< typename StripConstIfPresent<T>::ResultType > { };
-
-class IEconItemAttributeIterator
-{
-public:
-	virtual ~IEconItemAttributeIterator() { }
-
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, attrib_value_t value) = 0;
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, float value) = 0;
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, const CAttribute_String& value) = 0;
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, const Vector& value) = 0;
-};
-
-class CEconItemSpecificAttributeIterator : public IEconItemAttributeIterator
-{
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, attrib_value_t value) { return true; }
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, const CAttribute_String& value) { return true; }
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, const Vector& value) { return true; }
-};
-
-
-class IEconItemUntypedAttributeIterator : public IEconItemAttributeIterator
-{
-public:
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, attrib_value_t) OVERRIDE
-	{
-		return OnIterateAttributeValueUntyped(pAttrDef);
-	}
-
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, float) OVERRIDE
-	{
-		return OnIterateAttributeValueUntyped(pAttrDef);
-	}
-
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, const CAttribute_String&) OVERRIDE
-	{
-		return OnIterateAttributeValueUntyped(pAttrDef);
-	}
-
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, const Vector&) OVERRIDE
-	{
-		return OnIterateAttributeValueUntyped(pAttrDef);
-	}
-
-private:
-	virtual bool OnIterateAttributeValueUntyped(const CEconItemAttributeDefinition* pAttrDef) = 0;
-};
-
-class CAttributeIterator_HasAttribute : public IEconItemUntypedAttributeIterator
-{
-public:
-	CAttributeIterator_HasAttribute(const CEconItemAttributeDefinition* pAttrDef)
-		: m_pAttrDef(pAttrDef)
-		, m_bFound(false)
-	{
-		Assert(m_pAttrDef);
-	}
-
-	bool WasFound() const
-	{
-		return m_bFound;
-	}
-
-private:
-	bool OnIterateAttributeValueUntyped(const CEconItemAttributeDefinition* pAttrDef) OVERRIDE
-	{
-		if (m_pAttrDef == pAttrDef)
-		{
-			m_bFound = true;
-		}
-
-		return !m_bFound;
-	}
-
-private:
-	const CEconItemAttributeDefinition* m_pAttrDef;
-	bool m_bFound;
-};
-
-template < typename TActualTypeInMemory, typename TTreatAsThisType = TActualTypeInMemory >
-class CAttributeIterator_GetTypedAttributeValue : public IEconItemAttributeIterator
-{
-public:
-	CAttributeIterator_GetTypedAttributeValue(const CEconItemAttributeDefinition* pAttrDef, TTreatAsThisType* outpValue)
-		: m_pAttrDef(pAttrDef)
-		, m_outpValue(outpValue)
-		, m_bFound(false)
-	{
-		COMPILE_TIME_ASSERT(IsValidAttributeValueType<TActualTypeInMemory>::kValue);
-
-		COMPILE_TIME_ASSERT(((AreTypesIdentical<TActualTypeInMemory, attrib_value_t>::kValue && AreTypesIdentical<TTreatAsThisType, float>::kValue) ||
-			(AreTypesIdentical<TActualTypeInMemory, CAttribute_String>::kValue && AreTypesIdentical<TTreatAsThisType, const char*>::kValue) ||
-			AreTypesIdentical<TActualTypeInMemory, TTreatAsThisType>::kValue));
-
-		Assert(m_pAttrDef);
-		Assert(outpValue);
-	}
-
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, attrib_value_t value) OVERRIDE
-	{
-		return OnIterateAttributeValueTyped(pAttrDef, value);
-	}
-
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, float value) OVERRIDE
-	{
-		return OnIterateAttributeValueTyped(pAttrDef, value);
-	}
-
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, const CAttribute_String& value) OVERRIDE
-	{
-		return OnIterateAttributeValueTyped(pAttrDef, value);
-	}
-
-	virtual bool OnIterateAttributeValue(const CEconItemAttributeDefinition* pAttrDef, const Vector& value) OVERRIDE
-	{
-		return OnIterateAttributeValueTyped(pAttrDef, value);
-	}
-
-	bool WasFound() const
-	{
-		return m_bFound;
-	}
-
-private:
-	template < typename TAnyOtherType >
-	bool OnIterateAttributeValueTyped(const CEconItemAttributeDefinition* pAttrDef, const TAnyOtherType& value)
-	{
-		COMPILE_TIME_ASSERT(IsValidAttributeValueType<TAnyOtherType>::kValue);
-
-		AssertMsg(m_pAttrDef != pAttrDef, "Incorrect type found for attribute during iteration.");
-
-		return true;
-	}
-
-	bool OnIterateAttributeValueTyped(const CEconItemAttributeDefinition* pAttrDef, const TActualTypeInMemory& value)
-	{
-		if (m_pAttrDef == pAttrDef)
-		{
-			m_bFound = true;
-			CopyAttributeValueToOutput(&value, reinterpret_cast<TTreatAsThisType*>(m_outpValue));
-		}
-
-		return !m_bFound;
-	}
-
-private:
-	static void CopyAttributeValueToOutput(const TActualTypeInMemory* pValue, TTreatAsThisType* out_pValue)
-	{
-		COMPILE_TIME_ASSERT(sizeof(TActualTypeInMemory) == sizeof(TTreatAsThisType));
-
-		Assert(pValue);
-		Assert(out_pValue);
-
-		*out_pValue = *reinterpret_cast<const TTreatAsThisType*>(pValue);
-	}
-
-private:
-	const CEconItemAttributeDefinition* m_pAttrDef;
-	TTreatAsThisType* m_outpValue;
-	bool m_bFound;
-};
-
-void CopyStringAttributeValueToCharPointerOutput(const CAttribute_String* pValue, const char** out_pValue);
-
-template < >
-inline void CAttributeIterator_GetTypedAttributeValue<CAttribute_String, const char*>::CopyAttributeValueToOutput(const CAttribute_String* pValue, const char** out_pValue)
-{
-	CopyStringAttributeValueToCharPointerOutput(pValue, out_pValue);
-}
-
-template < typename TAttributeContainerType >
-bool FindAttribute(const TAttributeContainerType* pSomethingThatHasAnIterateAttributesFunction, const CEconItemAttributeDefinition* pAttrDef)
-{
-	if (!pAttrDef)
-		return false;
-
-	CAttributeIterator_HasAttribute it(pAttrDef);
-	pSomethingThatHasAnIterateAttributesFunction->IterateAttributes(&it);
-	return it.WasFound();
-}
-
-template < typename TActualTypeInMemory, typename TTreatAsThisType, typename TAttributeContainerType >
-bool FindAttribute_UnsafeBitwiseCast(const TAttributeContainerType* pSomethingThatHasAnIterateAttributesFunction, const CEconItemAttributeDefinition* pAttrDef, TTreatAsThisType* out_pValue)
-{
-	if (!pAttrDef)
-		return false;
-
-	CAttributeIterator_GetTypedAttributeValue<TActualTypeInMemory, TTreatAsThisType> it(pAttrDef, out_pValue);
-	pSomethingThatHasAnIterateAttributesFunction->IterateAttributes(&it);
-	return it.WasFound();
-}
-
-template < typename TAttributeContainerType, typename T >
-bool FindAttribute(const TAttributeContainerType* pSomethingThatHasAnIterateAttributesFunction, const CEconItemAttributeDefinition* pAttrDef, T* out_pValue)
-{
-	return FindAttribute_UnsafeBitwiseCast<T, T, TAttributeContainerType>(pSomethingThatHasAnIterateAttributesFunction, pAttrDef, out_pValue);
-}
-
-class IEconItemInterface
-{
-public:
-	virtual ~IEconItemInterface() { }
-
-	bool FindAttribute(const CEconItemAttributeDefinition* pAttrDef) const
-	{
-		return ::FindAttribute(this, pAttrDef);
-	}
-
-	template < typename T >
-	bool FindAttribute(const CEconItemAttributeDefinition* pAttrDef, T* out_pValue) const
-	{
-		return ::FindAttribute(this, pAttrDef, out_pValue);
-	}
-
-	virtual int GetCustomPaintKitIndex(void) const;
-	virtual int GetCustomPaintKitSeed(void) const;
-	virtual float GetCustomPaintKitWear(float flWearDefault = 0.0f) const;
-
-	virtual float GetStickerAttributeBySlotIndexFloat(int nSlotIndex, EStickerAttributeType type, float flDefault) const;
-	virtual uint32 GetStickerAttributeBySlotIndexInt(int nSlotIndex, EStickerAttributeType type, uint32 uiDefault) const;
-
-	virtual bool IsTradable() const;
-	virtual bool IsMarketable() const;
-	virtual bool IsCommodity() const;
-	virtual bool IsUsableInCrafting() const;
-	virtual bool IsHiddenFromDropList() const;
-
-	virtual RTime32 GetExpirationDate() const;
-
-	virtual const GameItemDefinition_t* GetItemDefinition() const = 0;
-
-	virtual uint32			GetAccountID() const = 0;
-	virtual uint64			GetItemID() const = 0;
-	virtual int32			GetQuality() const = 0;
-	virtual int32			GetRarity() const = 0;
-	virtual uint8			GetFlags() const = 0;
-	virtual eEconItemOrigin GetOrigin() const = 0;
-	virtual uint16			GetQuantity() const = 0;
-	virtual uint32			GetItemLevel() const = 0;
-	virtual bool			GetInUse() const = 0;			            
-
-	virtual const char* GetCustomName() const = 0;		            
-	virtual const char* GetCustomDesc() const = 0;		             
-
-	virtual int				GetItemSetIndex() const = 0;
-
-	virtual void IterateAttributes(IEconItemAttributeIterator* pIterator) const = 0;
-
-	bool IsPotentiallyTradable() const;
-
-	RTime32 GetCacheRefreshDateTime() const;
-
-	RTime32 GetTradableAfterDateTime() const;
-	RTime32 GetUseAfterDateTime() const;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/econ_item_schema.h b/SpyCustom/econ_item_schema.h
deleted file mode 100644
index 972c919..0000000
--- a/SpyCustom/econ_item_schema.h
+++ /dev/null
@@ -1,3522 +0,0 @@
-#ifndef ECONITEMSCHEMA_H
-#define ECONITEMSCHEMA_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#ifdef min
-#undef min
-#endif
-
-#ifdef max
-#undef max
-#endif
-
-#include <string>
-#include "steamtypes.h"				   
-#include "keyvalues.h"
-#include "utldict.h"
-#include "econ_item_constants.h"
-#include "UtlStringMap.h"
-
-#include "item_selection_criteria.h"
-#include "bitvec.h"
-#include "smartptr.h"
-#include "random.h"
-#include "imaterialsystem.h"
-
-#include "expressioncalculator.h"
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-#include "weapon_parse.h"
-#include "ivmodelinfo.h"
-#include "ivmodelrender.h"
-#endif
-
-class CEconItem;
-#ifdef SOURCE1
-#include "gamestringpool.h"
-#endif
-
-class CEconItemSchema;
-class CEconSharedObjectCache;
-class CSOItemRecipe;
-class CStickerList;
-
-class CTimedItemRewardDefinition;
-void Helper_TemporaryBuildCopyOfLootlistForQuestDrop(CTimedItemRewardDefinition& build, const CTimedItemRewardDefinition* pDescReward, char const* szGameModeExclude);
-
-#define MAX_PAINT_DATA_NAME 128
-
-#define MAX_STICKER_DATA_PATH 128
-
-#define DEFAULT_EMBROIDER_NCOLORS 10
-#define DEFAULT_EMBROIDER_GAMMA 0.8
-
-enum CraftFilter_t
-{
-	CRAFT_FILTER_TRADEUP = -3,
-	CRAFT_FILTER_COLLECT = -2,
-};
-
-enum EQuestVar_t
-{
-	k_EQuestVar_First,
-	k_EQuestVar_Last
-};
-
-class CEconItemRarityDefinition
-{
-public:
-	CEconItemRarityDefinition(void);
-	CEconItemRarityDefinition(const CEconItemRarityDefinition& that);
-	CEconItemRarityDefinition& operator=(const CEconItemRarityDefinition& rhs);
-
-	~CEconItemRarityDefinition(void) { }
-
-	bool		BInitFromKV(KeyValues* pKVItem, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	int32		GetDBValue(void) const { return m_nValue; }
-	const char* GetName(void) const { return !m_strName.IsEmpty() ? m_strName.String() : "unknown"; }
-	const char* GetLocKey(void) const { return m_strLocKey.String(); }
-	const char* GetWepLocKey(void) const { return m_strWepLocKey.String(); }
-	const char* GetLootList(void) const { return m_strLootList.String(); }
-	const char* GetRecycleLootList(void) const { return m_strRecycleLootList.String(); }
-	const char* GetDropSound(void) const { return m_strDropSound.String(); }
-	attrib_colors_t		GetAttribColor(void) const { return m_iAttribColor; }
-	const char* GetNextRarity(void) const { return m_strNextRarity.String(); }
-	int			GetWhiteCount(void) const { return m_iWhiteCount; }
-	int			GetBlackCount(void) const { return m_iBlackCount; }
-	float		GetWeight(void) const { return m_flWeight; }
-
-private:
-
-	int32		m_nValue;
-
-	attrib_colors_t		m_iAttribColor;
-
-	CUtlString	m_strName;
-
-	CUtlString  m_strLocKey;
-	CUtlString  m_strWepLocKey;
-
-	CUtlString  m_strLootList;
-	CUtlString  m_strRecycleLootList;
-	CUtlString  m_strDropSound;
-
-	CUtlString  m_strNextRarity;
-
-	int			m_iWhiteCount;
-	int			m_iBlackCount;
-
-	float		m_flWeight;
-};
-
-typedef int		econ_tag_handle_t;
-typedef	uint16	equipped_class_t;
-typedef uint16	equipped_slot_t;
-typedef uint8	equipped_preset_t;
-
-#define INVALID_ECON_TAG_HANDLE	((econ_tag_handle_t)-1)
-#define INVALID_EQUIPPED_SLOT	((equipped_slot_t)-1)
-#define INVALID_EQUIPPED_SLOT_BITPACKED 0x3F
-#define INVALID_STYLE_INDEX		((style_index_t)-1)
-#define INVALID_PRESET_INDEX	((equipped_preset_t)-1)
-
-union attribute_data_union_t
-{
-	float asFloat;
-	uint32 asUint32;
-	byte* asBlobPointer;
-};
-
-struct static_attrib_t
-{
-	static_attrib_t()
-	{
-		iDefIndex = 0;
-		m_value.asBlobPointer = NULL;
-		m_bForceGCToGenerate = false;
-
-	}
-
-	attrib_definition_index_t	iDefIndex;
-	attribute_data_union_t m_value;
-	bool	m_bForceGCToGenerate;
-
-	bool BInitFromKV_MultiLine(const char* pszContext, KeyValues* pKVAttribute, CUtlVector<CUtlString>* pVecErrors);
-
-	bool BInitFromKV_SingleLine(const char* pszContext, KeyValues* pKVAttribute, CUtlVector<CUtlString>* pVecErrors);
-
-	const class CEconItemAttributeDefinition* GetAttributeDefinition() const;
-};
-
-enum EWebResourceStatus
-{
-	kWebResource_InvalidName,
-	kWebResource_NotLoaded,
-	kWebResource_Loading,
-	kWebResource_Loaded,
-};
-
-struct WeaponPaintableMaterial_t
-{
-	char m_szName[MAX_PAINT_DATA_NAME];
-	char m_szOriginalMaterialName[MAX_PAINT_DATA_NAME];
-	char m_szFolderName[MAX_PAINT_DATA_NAME];
-	int m_nViewModelSize;						  
-	int m_nWorldModelSize;						  
-	float m_flWeaponLength;
-	float m_flUVScale;
-	bool m_bBaseTextureOverride;
-	bool m_bMirrorPattern;
-};
-
-struct InventoryImageData_t
-{
-	QAngle* m_pCameraAngles;
-	Vector* m_pCameraOffset;
-	float m_cameraFOV;
-	LightDesc_t* m_pLightDesc[MATERIAL_MAX_LIGHT_COUNT];
-	bool m_bOverrideDefaultLight;
-};
-
-struct StickerData_t
-{
-	char	m_szStickerModelPath[MAX_STICKER_DATA_PATH];
-	char	m_szStickerMaterialPath[MAX_STICKER_DATA_PATH];
-	Vector	m_vWorldModelProjectionStart;
-	Vector	m_vWorldModelProjectionEnd;
-	char	m_szStickerBoneParentName[32];
-};
-
-class CEconItemQualityDefinition
-{
-public:
-	CEconItemQualityDefinition(void);
-	CEconItemQualityDefinition(const CEconItemQualityDefinition& that);
-	CEconItemQualityDefinition& operator=(const CEconItemQualityDefinition& rhs);
-
-	~CEconItemQualityDefinition(void) { }
-
-	bool		BInitFromKV(KeyValues* pKVItem, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-
-	int32		GetDBValue(void) const { return m_nValue; }
-	const char* GetName(void) const { return !m_strName.IsEmpty() ? m_strName.Get() : "unknown"; }
-	uint32		GetWeight(void) const { return m_unWeight; }
-	bool		GetRequiresExplicitMatches(void) const { return m_bExplicitMatchesOnly; }
-	bool		CanSupportSet(void) const { return m_bCanSupportSet; }
-	const char* GetHexColor(void) const { return !m_strHexColor.IsEmpty() ? m_strHexColor.Get() : "B2B2B2"; }
-
-private:
-
-	int32			m_nValue;
-
-	CUtlConstString	m_strName;
-
-	uint32		m_unWeight;
-
-	bool		m_bExplicitMatchesOnly;
-
-	bool			m_bCanSupportSet;
-
-	CUtlConstString	m_strHexColor;
-};
-
-class CEconColorDefinition
-{
-public:
-	bool		BInitFromKV(KeyValues* pKVColor, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	const char* GetName(void) const { return m_strName.Get(); }
-	const char* GetColorName(void) const { return m_strColorName.Get(); }		       
-	const char* GetHexColor(void) const { return m_strHexColor.Get(); }
-
-private:
-	CUtlConstString m_strName;
-
-	CUtlConstString m_strColorName;
-
-	CUtlConstString m_strHexColor;
-};
-
-class CEconGraffitiTintDefinition
-{
-public:
-	bool		BInitFromKV(KeyValues* pKVColor, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	int GetID(void) const { return m_nID; }
-	const char* GetColorName(void) const { return m_strColorName.Get(); }		       
-	const char* GetHexColor(void) const { return m_strHexColor.Get(); }
-	uint32 GetHexColorRGB(void) const { return m_unHexColorRGB; }
-
-private:
-	int m_nID;
-
-	CUtlConstString m_strColorName;
-
-	CUtlConstString m_strHexColor;
-	uint32 m_unHexColorRGB;
-};
-
-class CEconMusicDefinition
-{
-public:
-	bool		BInitFromKV(KeyValues* pKVMusicDef, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	uint32		GetID(void) const { return nID; }
-	const char* GetName(void) const { return m_strName.Get(); }
-	const char* GetNameLocToken(void) const { return m_strNameLocToken.Get(); }
-	const char* GetDescription(void) const { return m_strLocDescription.Get(); }
-	const char* GetInventoryImage(void) const { return m_strInventoryImage.Get(); }
-	const char* GetPedestalDisplayModel(void) const { return m_strPedestalDisplayModel.Get(); }
-
-	const char* GetIconURLSmall() const { return m_sIconURLSmall; }
-	const char* GetIconURLLarge() const { return m_sIconURLLarge; }
-	void	SetIconURLSmall(const char* szURL) { m_sIconURLSmall = szURL; }
-	void	SetIconURLLarge(const char* szURL) { m_sIconURLLarge = szURL; }
-
-private:
-
-	int				nID;
-	CUtlConstString m_strName;
-	CUtlConstString m_strNameLocToken;
-	CUtlConstString	m_strLocDescription;
-	CUtlConstString m_strPedestalDisplayModel;
-	CUtlConstString	m_strInventoryImage;
-
-	CUtlConstString	m_sIconURLSmall;
-	CUtlConstString	m_sIconURLLarge;
-};
-
-
-class CEconQuestDefinition;
-
-struct quest_event_t
-{
-	quest_event_t(int nStartDay, const char* pchHHMM, int nDurationInMinutes, const char* strTimeZone, CEconQuestDefinition* pQuestDef, RTime32 start, RTime32 end) : m_strHHMM(pchHHMM),
-		m_rtEventStart(start),
-		m_rtEventEnd(end),
-		m_nStartDay(nStartDay),
-		m_nDurationInMinutes(nDurationInMinutes),
-		m_pQuestDef(pQuestDef),
-		m_strTimeZone(strTimeZone) {}
-	RTime32						m_rtEventStart;
-	RTime32						m_rtEventEnd;
-	int							m_nDurationInMinutes;
-	int							m_nStartDay;
-	CEconQuestDefinition* m_pQuestDef;
-	CUtlConstString				m_strHHMM;
-	CUtlConstString				m_strTimeZone;
-
-
-};
-
-typedef CUtlVector<quest_event_t*> QuestEvents_t;
-typedef CUtlMap< RTime32, quest_event_t*, int, CDefLess< RTime32 > > QuestEventsSchedule_t;	               
-
-
-class CEconQuestDefinition
-{
-public:
-	bool		BInitFromKV(KeyValues* pKVQuestDef, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	uint32									GetID(void) const { return nID; }
-	const char* GetName(void) const { return m_strName.Get(); }
-
-	const char* GetGameMode(void) const { return m_strGameMode.Get(); }
-	const char* GetMapGroup(void) const { return m_strMapGroup.Get(); }
-	const char* GetMap(void) const { return m_strMap.Get(); }
-	const char* GetRewardLootList(void) const { return m_strRewardLootList.Get(); }
-
-	const char* GetQuestExpression(void) const { return m_strExpr; }
-	const char* GetQuestBonusExpression(void) const { return m_strBonusExpr; }
-
-	const uint32							GetDifficulty(void) const { return m_nDifficulty; }
-	const uint32							GetOperationalPoints(void) const { return m_nOperationalPoints; }
-	const uint32							GetXPReward(void) const { return m_nXPReward; }
-	const uint32							GetTargetTeam(void) const { return m_nTargetTeam; }
-
-	const uint32							GetXPBonusPercent(void) const { return m_nXPBonusPercent; }
-
-	const CCopyableUtlVector< uint32 >& GetQuestPoints(void) const { return m_vecQuestPoints; }
-
-	const char* GetQuestConVars(void) const { return m_strQuestConVars.Get(); }
-	const bool								IsAnEvent(void) const { return m_bIsAnEvent; }
-
-	static void								TokenizeQuestExpression(const char* szExpression, KeyValues* pKVExpressionTokens);
-	static bool								IsQuestExpressionValid(const char* pszQuestExpr);
-	static void								ZeroOutQuestExpressionVariables(CExpressionCalculator& expQuest);
-	static void								SetQuestExpressionVariable(CExpressionCalculator& expQuest, EQuestVar_t questVar, float flValue);
-
-private:
-
-	int				nID;
-	CUtlConstString m_strName;
-
-	CUtlConstString	m_strMapGroup;
-	CUtlConstString m_strMap;
-	CUtlConstString	m_strGameMode;
-	CUtlConstString m_strRewardLootList;
-
-	CUtlConstString m_strExpr;
-	CUtlConstString m_strBonusExpr;
-
-	CCopyableUtlVector< uint32 > m_vecQuestPoints;		           
-	bool								m_bIsAnEvent;				     
-
-	uint32								m_nDifficulty;				     
-	uint32								m_nOperationalPoints;		    
-	uint32								m_nXPReward;				      
-
-	uint32								m_nXPBonusPercent;			          
-	uint32								m_nTargetTeam;				          
-
-	CUtlConstString						m_strQuestConVars;			            
-
-#ifdef CLIENT_DLL 
-
-public:
-	const char* GetNameLocToken(void) const { return m_strNameLocToken.Get(); }
-	const char* GetShortNameLocToken(void) const { return m_strShortNameLocToken.Get(); }
-	const char* GetDescriptionLocToken(void) const { return m_strDescriptionLocToken.Get(); }
-	const char* GetHudDesscriptionLocToken(void) const { return m_strHudDescriptionLocToken.Get(); }
-	const char* GetBonusLocToken(void) const { return m_strLocBonus.Get(); }
-	KeyValues* GetStringTokens(void) const { return m_kvStringTokens; }
-	const char* GetIcon(void) const { return m_strIcon; }
-
-	static void PopulateQuestStringTokens(CEconQuestDefinition& questDef, KeyValues& kvExpressionTokens, KeyValues& kvStringTokens, bool bBonus = false);
-
-private:
-	CUtlConstString m_strNameLocToken;
-	CUtlConstString m_strShortNameLocToken;
-	CUtlConstString	m_strDescriptionLocToken;
-	CUtlConstString	m_strHudDescriptionLocToken;
-	KeyValues* m_kvStringTokens;
-	CUtlConstString m_strLocBonus;
-	CUtlConstString m_strIcon;
-
-#endif
-
-};
-
-
-
-class CEconCampaignDefinition
-{
-public:
-
-	class CEconCampaignNodeDefinition
-	{
-	public:
-
-#ifdef CLIENT_DLL
-		class CEconCampaignNodeStoryBlockDefinition
-		{
-		public:
-			bool		BInitFromKV(int nCampaignIndex, int nNodeID, KeyValues* pKVCampaignNodeStoryBlockDef, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-			const char* GetContentFile(void) const { return m_strContentFile.Get(); }
-			const char* GetCharacterName(void) const { return m_strCharacterName.Get(); }
-			const char* GetStoryBlockExpression(void) const { return m_strExpr.Get(); }
-			const char* GetDescription(void) const { return m_strDescription.Get(); }
-
-			float							EvaluateStoryBlockExpression(CEconItemView* pCampaignCoin) const;
-
-		private:
-			CUtlConstString			m_strContentFile;			         
-			CUtlConstString			m_strCharacterName;			     
-			CUtlConstString			m_strExpr;					           
-			CUtlConstString			m_strDescription;			     
-		};
-
-		const CUtlVector< CEconCampaignNodeStoryBlockDefinition* >& GetStoryBlocks(void) const { return m_vecStoryBlocks; }
-
-		CEconCampaignNodeStoryBlockDefinition* GetBestScoringStoryBlock(CEconItemView* pCampaignCoin) const;
-
-	private:
-		CUtlVector< CEconCampaignNodeStoryBlockDefinition* >	m_vecStoryBlocks;			    
-	public:
-#endif
-
-		bool		BInitFromKV(int nCampaignIndex, KeyValues* pKVCampaignNodeDef, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-		const uint32					GetID(void) const { return m_nID; }
-		const uint32					GetQuestIndex(void) const { return m_nQuestIndex; }
-		const CUtlVector< uint32 >& GetNextNodes(void) const { return m_vecNextNodes; }
-		const uint32					GetCampaignID(void) const { return m_CampaignID; }
-
-
-
-	private:
-
-		uint32					m_nID;						    
-		uint32					m_nQuestIndex;				    
-		uint32					m_CampaignID;
-		CUtlVector< uint32 >	m_vecNextNodes;				         
-
-
-
-	};
-
-	typedef CUtlMap<int, CEconCampaignNodeDefinition*, int, CDefLess<int> >	CampaignNodeDefinitionsList_t;
-
-	bool		BInitFromKV(KeyValues* pKVCampaignDef, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	const uint32							GetID(void) const { return m_nID; }
-	const char* GetNameLocToken(void) const { return m_strNameLocToken.Get(); }
-	const char* GetDescription(void) const { return m_strLocDescription.Get(); }
-	const CampaignNodeDefinitionsList_t& GetStartNodes(void) const { return m_mapStartNodes; }
-	const CampaignNodeDefinitionsList_t& GetCampaignNodes(void) const { return m_mapCampaignNodes; }
-	uint32									GetSeasonNumber() const { return m_nSeasonNumber; }
-
-	void								GetAccessibleCampaignNodes(const uint32 unCampaignCompletionBitfield, CUtlVector< CEconCampaignNodeDefinition* >& vecAccessibleNodes);
-	void								Helper_RecursiveGetAccessibleCampaignNodes(const uint32 unCampaignCompletionBitfield, const CEconCampaignNodeDefinition* pNode, CUtlVector< CEconCampaignNodeDefinition* >& vecAccessibleNodes);
-
-
-private:
-
-	int								m_nID;
-	CUtlConstString					m_strName;
-	CUtlConstString					m_strNameLocToken;
-	CUtlConstString					m_strLocDescription;
-	CampaignNodeDefinitionsList_t	m_mapCampaignNodes;
-	CampaignNodeDefinitionsList_t	m_mapStartNodes;
-	uint32							m_nSeasonNumber;			      
-
-};
-
-bool ResolveQuestIdToCampaignAndIndex(uint16 unQuestID, uint32& unCampaignID, uint32& unCamapaignNodeID);
-void TokenizeCalculatorExpression(const char* szExpression, KeyValues* pKVExpressionTokens);
-
-struct item_list_entry_t
-{
-	item_list_entry_t()
-	{
-		memset(this, 0, sizeof(*this));
-		m_nPaintKitSeed = -2;
-		m_flPaintKitWear = -2;
-	}
-
-	bool operator==(const item_list_entry_t other) const
-	{
-		return (
-			(m_nItemDef == other.m_nItemDef) &&
-			(m_nPaintKit == other.m_nPaintKit) &&
-			(m_nPaintKitSeed == other.m_nPaintKitSeed) &&
-			(m_flPaintKitWear == other.m_flPaintKitWear) &&
-			(m_nStickerKit == other.m_nStickerKit) &&
-			(m_nMusicKit == other.m_nMusicKit) &&
-			(m_bIsNestedList == other.m_bIsNestedList) &&
-			(m_bIsUnusualList == other.m_bIsUnusualList) &&
-			(m_bAlreadyUsedInRecursiveCreation == m_bAlreadyUsedInRecursiveCreation)
-			);
-	}
-
-	bool InitFromName(const char* pchName);
-
-	int m_nItemDef;
-
-	int m_nPaintKit;
-	int m_nPaintKitSeed;
-	float m_flPaintKitWear;
-
-	uint32 m_nStickerKit;
-
-	uint32 m_nMusicKit;
-
-	bool m_bIsNestedList;
-	bool m_bIsUnusualList;
-	mutable bool m_bAlreadyUsedInRecursiveCreation;
-};
-
-class CEconItemSetDefinition : public IEconItemSetDefinition
-{
-public:
-	CEconItemSetDefinition(void);
-	CEconItemSetDefinition(const CEconItemSetDefinition& that);
-	CEconItemSetDefinition& operator=(const CEconItemSetDefinition& rhs);
-
-	~CEconItemSetDefinition(void) {}
-
-	virtual bool BInitFromKV(KeyValues* pKVItemSet, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	virtual const char* GetName(void)	const { return m_pszName; }
-	virtual const char* GetLocKey(void) const { return m_pszLocalizedName; }
-	virtual const char* GetUnlocalizedName(void) const { return m_pszUnlocalizedName; }
-	virtual int			GetBundle(void) const { return m_iBundleItemDef; }
-	virtual int			GetItemCount(void) const { return m_ItemEntries.Count(); }
-	virtual int			GetItemDef(int iIndex) const { return m_ItemEntries[iIndex].m_nItemDef; }
-	virtual int			GetItemPaintKit(int iIndex) const { return m_ItemEntries[iIndex].m_nPaintKit; }
-	virtual int			GetItemRarity(int iIndex) const;
-	virtual int			GetHighestItemRarityValue(void) const;
-	virtual item_definition_index_t GetCraftReward(void) const { return m_nCraftReward; }
-
-public:
-
-	const char* m_pszName;		 
-	const char* m_pszLocalizedName;
-	const char* m_pszUnlocalizedName;
-	const char* m_pszLocalizedDescription;
-	CUtlVector<item_list_entry_t> m_ItemEntries;
-	int					m_iBundleItemDef;	           
-	bool				m_bIsCollection;
-	bool				m_bIsHiddenSet;		                 
-	item_definition_index_t	m_nCraftReward;
-
-	struct itemset_attrib_t
-	{
-		int		m_iAttribDefIndex;
-		attrib_value_t	m_valValue;
-	};
-	CUtlVector<itemset_attrib_t>	m_iAttributes;
-};
-
-struct favored_lootlist_t
-{
-	favored_lootlist_t()
-	{
-		iHeroID = 0;
-		iBonus = 0;
-	}
-
-	favored_lootlist_t& operator=(const favored_lootlist_t& rhs)
-	{
-		iHeroID = rhs.iHeroID;
-		iBonus = rhs.iBonus;
-		return *this;
-	}
-
-	uint iHeroID;
-	uint iBonus;
-};
-
-class CEconLootListDefinition : public IEconLootListDefinition
-{
-public:
-	CEconLootListDefinition(void);
-	CEconLootListDefinition(const CEconLootListDefinition& that);
-	CEconLootListDefinition& operator=(const CEconLootListDefinition& rhs);
-
-	~CEconLootListDefinition(void);
-
-	bool AddRandomAtrributes(KeyValues* pRandomAttributesKV, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-	bool	BInitFromKV(KeyValues* pKVLootList, KeyValues* pKVRandomAttributeTemplates, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL, bool bServerList = false);
-	virtual const char* GetName() const { return m_pszName; }
-	const CUtlVector<item_list_entry_t>& GetLootListContents() const { return m_ItemEntries; }
-	virtual float GetWeight(int iIdx) const { return m_flWeights[iIdx]; }
-	virtual KeyValues* GenerateKeyValues() const;
-	virtual bool IsServerList() const { return m_bServerList; }
-	virtual bool HasUnusualLoot() const;
-	virtual int GetAdditionalDropCount(void) const { return m_AdditionalDrops.Count(); }
-	virtual bool GetAdditionalDrop(int iIndex, CUtlString& strLootList, float& flChance) const;
-
-	virtual int GetRandomAttributeGroupCount(void) const { return m_RandomAttribs.Count(); }
-	virtual bool GetRandomAttributeGroup(int iIndex, float& flChance, float& flTotalWeight) const;
-	virtual int GetRandomAttributeCount(int iGroup) const;
-	virtual bool GetRandomAttribute(int iGroup, int iIndex, float& flWeight, int& iValue, int& iDefIndex) const;
-
-	virtual void PurgeItems(void);
-
-	bool GetPublicListContents() const
-	{
-		return true;
-	}
-
-	struct loot_list_additional_drop_t
-	{
-		float		m_fChance;
-		bool		m_bPremiumOnly;
-		const char* m_pszLootListDefName;
-	};
-	CUtlVector<loot_list_additional_drop_t>	m_AdditionalDrops;
-
-protected:
-	const char* m_pszName;
-
-	CUtlVector<item_list_entry_t> m_ItemEntries;
-	uint32				 m_unHeroID;
-
-	bool				m_bPublicListContents;	               
-#ifndef GC_DLL
-	bool				m_bWillProduceStatTrak;	   
-#endif
-	float				m_flTotalWeight;
-	CUtlVector<float>	m_flWeights;
-
-	struct lootlist_attrib_t
-	{
-		static_attrib_t	m_staticAttrib;
-		float	m_flWeight;
-		float	m_flRangeMin;
-		float	m_flRangeMax;
-
-		CCopyableUtlVector< uint32 > m_vecValues;
-
-		bool BInitFromKV(const char* pszContext, KeyValues* pKVKey, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors);
-	};
-
-	struct random_attrib_t
-	{
-		float				m_flChanceOfRandomAttribute;
-		float				m_flTotalAttributeWeight;
-		bool				m_bPickAllAttributes;
-		CUtlVector<lootlist_attrib_t> m_RandomAttributes;
-	};
-
-	CUtlVector<random_attrib_t*>			m_RandomAttribs;
-	bool				m_bServerList;
-};
-
-class CEconCraftingRecipeDefinition
-{
-public:
-	CEconCraftingRecipeDefinition(void);
-	virtual ~CEconCraftingRecipeDefinition(void) { }
-
-	bool		BInitFromKV(KeyValues* pKVItem, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-	bool		BInitFromSet(const IEconItemSetDefinition* pSet, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	virtual void CopyPolymorphic(const CEconCraftingRecipeDefinition* pSourceDef) { *this = *pSourceDef; }
-
-	void		SetDefinitionIndex(uint32 iIndex) { m_nDefIndex = iIndex; }
-	int32		GetDefinitionIndex(void) const { return m_nDefIndex; }
-	const char* GetName(void) const { return !m_strName.IsEmpty() ? m_strName.String() : "unknown"; }
-	const char* GetName_A(void) const { return !m_strN_A.IsEmpty() ? m_strN_A.String() : "unknown"; }
-	const char* GetDescInputs(void) const { return !m_strDescInputs.IsEmpty() ? m_strDescInputs.String() : "unknown"; }
-	const char* GetDescOutputs(void) const { return !m_strDescOutputs.IsEmpty() ? m_strDescOutputs.String() : "unknown"; }
-
-	const char* GetDescI_A(void) const { return !m_strDI_A.IsEmpty() ? m_strDI_A.String() : "unknown"; }
-	const char* GetDescI_B(void) const { return !m_strDI_B.IsEmpty() ? m_strDI_B.String() : "unknown"; }
-	const char* GetDescI_C(void) const { return !m_strDI_C.IsEmpty() ? m_strDI_C.String() : "unknown"; }
-	const char* GetDescO_A(void) const { return !m_strDO_A.IsEmpty() ? m_strDO_A.String() : "unknown"; }
-	const char* GetDescO_B(void) const { return !m_strDO_B.IsEmpty() ? m_strDO_B.String() : "unknown"; }
-	const char* GetDescO_C(void) const { return !m_strDO_C.IsEmpty() ? m_strDO_C.String() : "unknown"; }
-
-	const wchar_t* GetLocName(void) const { return m_wszName; }
-	const wchar_t* GetLocDescription(void) const { return m_wszDesc; }
-
-	void		SetDisabled(bool bDisabled) { m_bDisabled = bDisabled; }
-	bool		IsDisabled(void) const { return m_bDisabled; }
-	bool		RequiresAllSameClass(void) { return m_bRequiresAllSameClass; }
-	bool		RequiresAllSameSlot(void) { return m_bRequiresAllSameSlot; }
-	bool		IsAlwaysKnown(void) const { return m_bAlwaysKnown; }
-	bool		IsPremiumAccountOnly(void) const { return m_bPremiumAccountOnly; }
-	recipecategories_t	GetCategory(void) const { return m_iCategory; }
-	int			GetFilter(void) const { return m_iFilter; }
-	void		SetFilter(int nFilter) { m_iFilter = nFilter; }
-	int			GetTotalInputItemsRequired(void) const;
-	int			GetTotalOutputItems(void) const { return m_OutputItemsCriteria.Count(); }
-
-	virtual bool ItemListMatchesInputs(const CUtlVector< CEconItem* >& vecCraftingItems, bool bAllowPartialMatch = false) const;
-
-	const CUtlVector<CItemSelectionCriteria>* GetInputItems(void) const { return &m_InputItemsCriteria; }
-	const CUtlVector<uint8>& GetInputItemDupeCounts(void) const { return m_InputItemDupeCounts; }
-	const CUtlVector<CItemSelectionCriteria>& GetOutputItems(void) const { return m_OutputItemsCriteria; }
-
-	bool		BSerializeToMsg(CSOItemRecipe& msg) const;
-	bool		BDeserializeFromMsg(const CSOItemRecipe& msg);
-
-private:
-	void GenerateLocStrings(void);
-
-protected:
-	int32		m_nDefIndex;
-
-	CUtlString	m_strName;
-	CUtlString	m_strN_A;
-	CUtlString	m_strDescInputs;
-	CUtlString	m_strDescOutputs;
-	CUtlString	m_strDI_A;
-	CUtlString	m_strDI_B;
-	CUtlString	m_strDI_C;
-	CUtlString	m_strDO_A;
-	CUtlString	m_strDO_B;
-	CUtlString	m_strDO_C;
-
-	wchar_t		m_wszName[64];
-	wchar_t		m_wszDesc[512];
-
-	bool		m_bDisabled;
-	bool		m_bRequiresAllSameClass;
-	bool		m_bRequiresAllSameSlot;
-	int			m_iCacheClassUsageForOutputFromItem;
-	int			m_iCacheSlotUsageForOutputFromItem;
-	int			m_iCacheSetForOutputFromItem;
-	bool		m_bAlwaysKnown;
-	bool		m_bPremiumAccountOnly;
-	recipecategories_t	m_iCategory;
-	int			m_iFilter;
-
-	CUtlVector<CItemSelectionCriteria>	m_InputItemsCriteria;
-	CUtlVector<uint8>					m_InputItemDupeCounts;
-
-	CUtlVector<CItemSelectionCriteria>	m_OutputItemsCriteria;
-};
-
-enum
-{
-	ATTDESCFORM_VALUE_IS_PERCENTAGE,			  	
-	ATTDESCFORM_VALUE_IS_INVERTED_PERCENTAGE,	  	          
-	ATTDESCFORM_VALUE_IS_ADDITIVE,				  	
-	ATTDESCFORM_VALUE_IS_ADDITIVE_PERCENTAGE,	  	
-	ATTDESCFORM_VALUE_IS_OR,					            
-	ATTDESCFORM_VALUE_IS_DATE,					    
-	ATTDESCFORM_VALUE_IS_ACCOUNT_ID,			     
-	ATTDESCFORM_VALUE_IS_PARTICLE_INDEX,		     
-	ATTDESCFORM_VALUE_IS_ITEM_DEF,				    
-	ATTDESCFORM_VALUE_IS_COLOR,					     
-	ATTDESCFORM_VALUE_IS_GAME_TIME,				  	
-	ATTDESCFORM_VALUE_IS_MINS_AS_HOURS,			            
-	ATTDESCFORM_VALUE_IS_REPLACE,				    
-};
-
-enum attrib_effect_types_t
-{
-	ATTRIB_EFFECT_NEUTRAL = 0,
-	ATTRIB_EFFECT_POSITIVE,
-	ATTRIB_EFFECT_NEGATIVE,
-
-	NUM_EFFECT_TYPES,
-};
-
-enum EAssetClassAttrExportRule_t
-{
-	k_EAssetClassAttrExportRule_Default = 0,
-	k_EAssetClassAttrExportRule_Bucketed = (1 << 0),	       
-	k_EAssetClassAttrExportRule_Skip = (1 << 1),	        
-	k_EAssetClassAttrExportRule_GCOnly = (1 << 2),	            
-};
-
-class CEconItemAttributeDefinition : public IEconItemAttributeDefinition
-{
-public:
-	CEconItemAttributeDefinition(void);
-	CEconItemAttributeDefinition(const CEconItemAttributeDefinition& that);
-	CEconItemAttributeDefinition& operator=(const CEconItemAttributeDefinition& rhs);
-
-	~CEconItemAttributeDefinition(void);
-
-	bool	BInitFromKV(KeyValues* pKVAttribute, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	virtual attrib_definition_index_t GetDefinitionIndex(void) const { return m_nDefIndex; }
-	virtual const char* GetDefinitionName(void) const { return m_pszDefinitionName; }
-
-	virtual KeyValues* GetRawDefinition(void) const { return m_pKVAttribute; }
-
-	bool		IsHidden(void) const { return m_bHidden; }
-	bool		BForceWebSchemaOutput(void) const { return m_bWebSchemaOutputForced; }
-	bool		IsStoredAsInteger(void) const { return m_bStoredAsInteger; }
-	bool		IsStoredAsFloat(void) const { return !m_bStoredAsInteger; }
-	bool		IsInstanceData() const { return m_bInstanceData; }
-	EAssetClassAttrExportRule_t GetAssetClassAttrExportRule() const { return m_eAssetClassAttrExportRule; }
-	uint32		GetAssetClassBucket() const { return m_unAssetClassBucket; }
-	int			GetDescriptionFormat(void) const { return m_iDescriptionFormat; }
-	int			GetScore(void) const { return m_iScore; }
-	virtual const char* GetDescriptionString(void) const { return m_pszDescriptionString; }
-	const char* GetArmoryDescString(void) const { return m_pszArmoryDesc; }
-	virtual const char* GetAttributeClass(void) const { return m_pszAttributeClass; }
-	attrib_effect_types_t GetEffectType(void) const { return m_iEffectType; }
-
-	const class ISchemaAttributeType* GetAttributeType(void) const { return m_pAttrType; }
-
-#ifndef GC_DLL
-	void		ClearStringCache(void) const { m_iszAttributeClass = NULL_STRING; }
-	string_t	GetCachedClass(void) const
-	{
-		if (m_iszAttributeClass == NULL_STRING && m_pszAttributeClass)
-		{
-			m_iszAttributeClass = AllocPooledString(m_pszAttributeClass);
-		}
-		return m_iszAttributeClass;
-	}
-#endif
-
-private:
-	KeyValues* m_pKVAttribute;
-
-	attrib_definition_index_t	m_nDefIndex;
-
-	const class ISchemaAttributeType* m_pAttrType;
-
-	bool		m_bHidden;
-
-	bool		m_bWebSchemaOutputForced;
-
-	bool		m_bStoredAsInteger;
-
-	bool		m_bInstanceData;
-	EAssetClassAttrExportRule_t	m_eAssetClassAttrExportRule;			             
-	uint32		m_unAssetClassBucket;		              
-
-	attrib_effect_types_t m_iEffectType;
-
-	int			m_iDescriptionFormat;
-	const char* m_pszDescriptionString;
-
-	const char* m_pszDescriptionTag;
-
-	const char* m_pszArmoryDesc;
-	int			m_iScore;
-
-	const char* m_pszDefinitionName;
-
-	const char* m_pszAttributeClass;
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL) || defined(GC)
-	mutable string_t	m_iszAttributeClass;	            
-#endif
-
-};
-
-class CEconSoundMaterialDefinition
-{
-public:
-	CEconSoundMaterialDefinition(void);
-	CEconSoundMaterialDefinition(const CEconSoundMaterialDefinition& that);
-	CEconSoundMaterialDefinition& operator=(const CEconSoundMaterialDefinition& rhs);
-
-	~CEconSoundMaterialDefinition(void) { }
-
-	bool		BInitFromKV(KeyValues* pKVItem, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	int32		GetID(void) const { return m_nID; }
-	const char* GetName(void) const { return !m_strName.IsEmpty() ? m_strName.String() : "unknown"; }
-
-	const char* GetStartDragSound(void) const { return m_strStartDragSound.Get(); }
-	const char* GetEndDragSound(void) const { return m_strEndDragSound.Get(); }
-	const char* GetEquipSound(void) const { return m_strEquipSound.Get(); }
-
-private:
-
-	int32		m_nID;
-
-	CUtlString	m_strName;
-
-	CUtlString  m_strStartDragSound;
-	CUtlString  m_strEndDragSound;
-
-	CUtlString  m_strEquipSound;
-};
-
-
-#define MAX_VISUALS_CUSTOM_SOUNDS		10
-
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-enum
-{
-	kAttachedModelDisplayFlag_WorldModel = 0x01,
-	kAttachedModelDisplayFlag_ViewModel = 0x02,
-
-	kAttachedModelDisplayFlag_MaskAll = kAttachedModelDisplayFlag_WorldModel | kAttachedModelDisplayFlag_ViewModel,
-};
-
-struct attachedmodel_t
-{
-	const char* m_pszModelName;
-	int m_iModelDisplayFlags;
-};
-
-struct attachedparticle_t
-{
-	int m_iParticleIndex;
-	int m_nStyle;
-};
-
-enum wearableanimplayback_t
-{
-	WAP_ON_SPAWN,				        
-	WAP_START_BUILDING,			                
-	WAP_STOP_BUILDING,			                
-
-	NUM_WAP_TYPES,
-};
-
-struct animation_on_wearable_t
-{
-	int						iActivity;
-	const char* pszActivity;
-	wearableanimplayback_t	iPlayback;
-	const char* pszReplacement;
-	int						iReplacement;            
-	const char* pszSequence;
-	const char* pszRequiredItem;
-	const char* pszScene;
-	float					flFrequency;
-};
-
-struct sound_on_wearable_t
-{
-	const char* pszSound;
-	const char* pszReplacement;
-};
-
-struct particle_on_wearable_t
-{
-	const char* pszParticle;
-	const char* pszReplacement;
-	bool					bFlyingCourierEffect;
-};
-
-struct particlesnapshot_on_wearable_t
-{
-	const char* pszParticleSnapshot;
-	const char* pszReplacement;
-};
-
-struct particle_control_point_on_wearable_t
-{
-	const char* pszParticle;
-	int						nParticleControlPoint;
-	Vector					vecCPValue;
-};
-
-struct codecontrolledbodygroupdata_t
-{
-	const char* pFuncName;
-	void* pFunc;
-};
-
-#endif    
-
-struct style_unlock_info
-{
-	const char* pszItemName;
-	int iPrice;
-	int iStylePreReq;
-	const char* pszAttrib;
-	uint32 iAttribValue;
-
-	bool IsLockable() const
-	{
-		return pszItemName || pszAttrib;
-	}
-
-	bool HasUnlockPrice() const
-	{
-		return iPrice && pszItemName;
-	}
-
-	bool HasUnlockAttrib() const
-	{
-		return iAttribValue && pszAttrib;
-	}
-};
-
-class CEconStyleInfo
-{
-public:
-	CEconStyleInfo()
-	{
-		m_iIndex = 0;
-		m_iSkin = 0;
-		m_iIcon = 0;
-		m_pszName = NULL;
-		m_pszBasePlayerModel = NULL;
-		m_UnlockInfo.pszItemName = NULL;
-		m_UnlockInfo.iPrice = 0;
-		m_UnlockInfo.iStylePreReq = 0;
-		m_UnlockInfo.pszAttrib = NULL;
-		m_UnlockInfo.iAttribValue = 0;
-	}
-
-	virtual ~CEconStyleInfo()
-	{
-	}
-
-	virtual void BInitFromKV(KeyValues* pKVItem, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors);
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-	virtual void GeneratePrecacheModelStringsForStyle(CUtlVector<const char*>* out_pVecModelStrings) const;
-#endif
-
-	int GetSkin() const
-	{
-		return m_iSkin;
-	}
-
-	int GetIndex() const { return m_iIndex; }
-	const char* GetName() const { return m_pszName; }
-	const char* GetBasePlayerDisplayModel() const { return m_pszBasePlayerModel; }
-	const CUtlVector<const char*>& GetAdditionalHideBodygroups() const { return m_vecAdditionalHideBodygroups; }
-	int GetIcon() const { return m_iIcon; }
-	const style_unlock_info* GetUnlockInfo() const { return &m_UnlockInfo; }
-
-protected:
-	int m_iIndex;
-	int m_iSkin;
-	int m_iIcon;
-	const char* m_pszName;
-	const char* m_pszBasePlayerModel;
-	CUtlVector<const char*> m_vecAdditionalHideBodygroups;
-	style_unlock_info m_UnlockInfo;
-};
-
-struct courier_t
-{
-	const char* m_pszModelName;
-	int m_iTeam;
-};
-
-struct announcer_preview_t
-{
-	CUtlString m_strFileName;
-	CUtlString m_strCaption;
-};
-
-struct ability_icon_replacement_t
-{
-	CUtlString m_strAbilityName;
-	CUtlString m_strReplacement;
-};
-
-enum EAssetModifier
-{
-	AM_Invalid = -1,
-	AM_Activity,
-	AM_Announcer,
-	AM_AnnouncerPreview,
-	AM_HudSkin,
-	AM_AbilityName,
-	AM_Sound,
-	AM_Speech,
-	AM_Particle,
-	AM_ParticleSnapshot,
-	AM_ParticleControlPoint,
-	AM_EntityModel,
-	AM_ViewModel,
-	AM_EntityScale,
-	AM_Icon,
-	AM_AbilityIcon,
-	AM_Courier,
-	AM_CourierFlying,
-	AM_HeroModelChange,
-	AM_MAX
-};
-
-struct AssetModifier
-{
-	EAssetModifier	m_Type;
-	CUtlString		m_strAsset;
-	CUtlString		m_strModifier;
-	float			m_flModifier;
-	float			m_flFrequency;
-	int				m_iStyle;
-};
-
-struct AssetInfo
-{
-	AssetInfo()
-	{
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-		iHideParentBodyGroup = -1;
-
-		m_ModifiedBodyGroupNames.SetLessFunc(StringLessThan);
-		m_CodeControlledBodyGroupNames.SetLessFunc(StringLessThan);
-
-		iSkin = 0;
-		bUsePerClassBodygroups = false;
-		m_pszMaterialOverride = NULL;
-		m_pszParticleEffect = NULL;
-		m_pszParticleSnapshot = NULL;
-		for (int i = 0; i < MAX_VISUALS_CUSTOM_SOUNDS; i++)
-		{
-			m_pszCustomSounds[i] = NULL;
-		}
-
-		for (int i = 0; i < NUM_SHOOT_SOUND_TYPES; i++)
-		{
-			m_pszWeaponSoundReplacements[i] = NULL;
-		}
-
-		m_iViewModelBodyGroupOverride = -1;
-		m_iViewModelBodyGroupStateOverride = -1;
-		m_iWorldModelBodyGroupOverride = -1;
-		m_iWorldModelBodyGroupStateOverride = -1;
-
-		m_pszSpeechConcept = NULL;
-		m_pszChatMessage = NULL;
-		m_pszAnnouncerName.Clear();
-		m_pszAnnouncerResource.Clear();
-		m_pszEntityModel = NULL;
-		m_pszViewModel = NULL;
-		m_pszEntityClass = NULL;
-		m_flScaleSize = 1.f;
-		m_pszScaleClass = NULL;
-		m_bSkipModelCombine = false;
-
-		m_pszPrimaryAmmo = NULL;
-		m_pszWeaponTypeString = NULL;
-		m_pszAddonLocation = NULL;
-		m_pszEjectBrassEffect = NULL;
-		m_pszTracerEffect = NULL;
-		m_pszMuzzleFlashEffect1stPerson = NULL;
-		m_pszMuzzleFlashEffect1stPersonAlt = NULL;
-		m_pszMuzzleFlashEffect3rdPerson = NULL;
-		m_pszMuzzleFlashEffect3rdPersonAlt = NULL;
-		m_pszHeatEffect = NULL;
-		m_pszPlayerAnimationExtension = NULL;
-
-		m_pszOriginalIcon = NULL;
-		m_pszNewIcon = NULL;
-
-		m_mapAssetModifiers.SetLessFunc(DefLessFunc(int));
-
-
-#endif    
-	}
-
-	~AssetInfo()
-	{
-		m_Styles.PurgeAndDeleteElements();
-	}
-
-	void AddAssetModifier(AssetModifier* newMod);
-	CUtlVector<AssetModifier*>* GetAssetModifiers(EAssetModifier type);
-	const char* GetModifierByAsset(EAssetModifier type, const char* pszAsset, int iStyle = -1);
-	const char* GetAssetByModifier(EAssetModifier type, const char* pszModifier, int iStyle = -1);
-
-	CUtlMap< int, CUtlVector<AssetModifier*>* >	m_mapAssetModifiers;
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)	
-	int iHideParentBodyGroup;
-	CUtlMap<const char*, int> m_ModifiedBodyGroupNames;         
-	CUtlMap<const char*, codecontrolledbodygroupdata_t> m_CodeControlledBodyGroupNames;
-	int			iSkin;
-	bool		bUsePerClassBodygroups;
-	CUtlVector<attachedmodel_t>	m_AttachedModels;
-	CUtlVector<attachedparticle_t>	m_AttachedParticles;
-	CUtlVector<animation_on_wearable_t> m_Animations;
-	CUtlVector<sound_on_wearable_t> m_Sounds;
-	CUtlVector<particle_on_wearable_t> m_Particles;
-	CUtlVector<particlesnapshot_on_wearable_t> m_ParticleSnapshots;
-	CUtlVector<particle_control_point_on_wearable_t> m_ParticleControlPoints;
-	const char* m_pszCustomSounds[MAX_VISUALS_CUSTOM_SOUNDS];
-	const char* m_pszMaterialOverride;
-	const char* m_pszMuzzleFlash;
-	const char* m_pszTracerEffect;
-	const char* m_pszParticleEffect;
-	const char* m_pszParticleSnapshot;
-	const char* m_pszWeaponSoundReplacements[NUM_SHOOT_SOUND_TYPES];
-
-	const char* m_pszPrimaryAmmo;
-	const char* m_pszWeaponTypeString;
-	const char* m_pszAddonLocation;
-	const char* m_pszEjectBrassEffect;
-	const char* m_pszMuzzleFlashEffect1stPerson;
-	const char* m_pszMuzzleFlashEffect1stPersonAlt;
-	const char* m_pszMuzzleFlashEffect3rdPerson;
-	const char* m_pszMuzzleFlashEffect3rdPersonAlt;
-	const char* m_pszHeatEffect;
-	const char* m_pszPlayerAnimationExtension;
-
-	int m_iViewModelBodyGroupOverride;
-	int m_iViewModelBodyGroupStateOverride;
-	int m_iWorldModelBodyGroupOverride;
-	int m_iWorldModelBodyGroupStateOverride;
-	bool m_bSkipModelCombine;
-	CUtlVector<const char*>								m_vecAnimationModifiers;
-
-	const char* m_pszSpeechConcept;
-	const char* m_pszChatMessage;
-
-	CUtlString m_pszAnnouncerName;
-	CUtlString m_pszAnnouncerResource;
-	CUtlVector< announcer_preview_t > m_vecAnnouncerPreview;
-
-	CUtlString m_pszHudSkinName;
-
-	CUtlString m_pszAbilityName;
-
-	const char* m_pszEntityModel;
-	const char* m_pszViewModel;
-	const char* m_pszEntityClass;
-
-	float		m_flScaleSize;
-	const char* m_pszScaleClass;
-
-	const char* m_pszOriginalIcon;
-	const char* m_pszNewIcon;
-
-	CUtlVector< ability_icon_replacement_t > m_vecAbilityIconReplacements;
-
-
-#endif    
-
-	CUtlVector<CEconStyleInfo*> m_Styles;
-};
-
-enum item_capabilities_t
-{
-	ITEM_CAP_NONE = 0,
-	ITEM_CAP_PAINTABLE = 1 << 0,		            
-	ITEM_CAP_NAMEABLE = 1 << 1,		            
-	ITEM_CAP_DECODABLE = 1 << 2,		       
-	ITEM_CAP_CAN_DELETE = 1 << 3,		       
-	ITEM_CAP_CAN_CUSTOMIZE_TEXTURE = 1 << 4,	  
-	ITEM_CAP_USABLE = 1 << 5,	  
-	ITEM_CAP_USABLE_GC = 1 << 6,		            
-	ITEM_CAP_CAN_GIFT_WRAP = 1 << 7,	  
-	ITEM_CAP_USABLE_OUT_OF_GAME = 1 << 8,		            
-	ITEM_CAP_CAN_COLLECT = 1 << 9,	  
-	ITEM_CAP_CAN_CRAFT_COUNT = 1 << 10,	  
-	ITEM_CAP_CAN_CRAFT_MARK = 1 << 11,	  
-	ITEM_CAP_PAINTABLE_TEAM_COLORS = 1 << 12,	  
-	ITEM_CAP_CAN_BE_RESTORED = 1 << 13,	  
-	ITEM_CAP_CAN_USE_STRANGE_PARTS = 1 << 14,	  
-	ITEM_CAP_PAINTABLE_UNUSUAL = 1 << 15,	  
-	ITEM_CAP_CAN_INCREMENT = 1 << 16,	  
-	ITEM_CAP_USES_ESSENCE = 1 << 17,	  
-	ITEM_CAP_AUTOGRAPH = 1 << 18,	  
-	ITEM_CAP_RECIPE = 1 << 19,	  
-	ITEM_CAP_CAN_STICKER = 1 << 20,		          
-	ITEM_CAP_STATTRACK_SWAP = 1 << 21,		      
-	NUM_ITEM_CAPS = 22,
-};
-
-enum { ITEM_CAP_DEFAULT = ITEM_CAP_NONE };         
-enum { ITEM_CAP_TOOL_DEFAULT = ITEM_CAP_NONE };	        
-
-struct bundleinfo_t
-{
-	CUtlVector <item_list_entry_t > vecItemEntries;
-};
-
-#ifdef CLIENT_DLL
-namespace vgui
-{
-	class Panel;
-}
-#endif  
-
-class IEconConsumable
-{
-
-};
-
-class IEconItemInterface;
-
-class IEconTool
-{
-	friend class CEconSharedToolSupport;
-
-public:
-	IEconTool(const char* pszTypeName, const char* pszUseString, const char* pszUsageRestriction, item_capabilities_t unCapabilities, KeyValues* pUsageKV)
-		: m_pszTypeName(pszTypeName)
-		, m_pszUseString(pszUseString)
-		, m_pszUsageRestriction(pszUsageRestriction)
-		, m_unCapabilities(unCapabilities)
-	{
-		if (pUsageKV)
-		{
-			KeyValues* pBonusItemDefs = pUsageKV->FindKey("bonus_itemdefs");
-			if (pBonusItemDefs)
-			{
-				FOR_EACH_SUBKEY(pBonusItemDefs, pBonusItemDef)
-				{
-					m_vecBonusItemDef.AddToTail(atoi(pBonusItemDef->GetName()));
-				}
-			}
-		}
-	}
-
-	virtual ~IEconTool() { }
-
-	const char* GetUsageRestriction() const { return m_pszUsageRestriction; }
-	item_capabilities_t GetCapabilities() const { return m_unCapabilities; }
-
-	virtual bool CanApplyTo(const IEconItemInterface* pTool, const IEconItemInterface* pToolSubject) const { Assert(pTool); Assert(pToolSubject); return true; }
-	virtual bool ShouldDisplayQuantity(const IEconItemInterface* pTool) const;
-	virtual bool RequiresToolEscrowPeriod() const { return false; }
-
-	virtual bool IsValid() const { return true; }
-
-	const char* GetTypeName() const { return m_pszTypeName; }		                       
-	const char* GetUseString() const { return m_pszUseString; }
-
-	int GetBonusItemDefCount(void) const { return m_vecBonusItemDef.Count(); }
-	int GetBonusItemDef(int i) const { return m_vecBonusItemDef[i]; }
-
-	virtual IEconConsumable* CreateEconConsumable() const
-	{
-		Assert(!"IEconTool::CreateEconConsumable(): unimplemented call!");
-		return NULL;
-	}
-
-#ifdef CLIENT_DLL
-	virtual bool ShouldShowContainedItemPanel(const IEconItemInterface* pItem) const { Assert(!"IEconTool::ShouldShowContainedItemPanel(): we don't expect this to be called on anything besides gifts!"); return false; }
-	virtual const char* GetUseCommandLocalizationToken(const IEconItemInterface* pItem, const char* pszDefault = "#ApplyOnItem") const;
-
-	virtual void OnClientUseConsumable(class C_EconItemView* pItem) const
-	{
-		Assert(!"IEconTool::OnClientUseConsumable(): unimplemented call!");
-	}
-
-	virtual void OnClientApplyTool(class C_EconItemView* pTool, class C_EconItemView* pSubject) const
-	{
-		Assert(!"IEconTool::OnClientApplyTool(): unimplemented call!");
-	}
-	virtual void OnClientApplyCommit(class C_EconItemView* pTool, class C_EconItemView* pSubject) const
-	{
-		Assert(!"IEconTool::OnClientApplyCommit(): unimplemented call!");
-	}
-#endif  
-
-private:
-	const char* m_pszTypeName;
-	const char* m_pszUseString;
-	const char* m_pszUsageRestriction;
-	item_capabilities_t m_unCapabilities;
-	CUtlVector<int>	m_vecBonusItemDef;
-};
-
-enum EItemType
-{
-	k_EItemTypeNone,
-	k_EItemTypeCoupon,
-	k_EItemTypeCampaign,
-	k_EItemTypeSelfOpeningPurchase,
-	k_EItemTypeOperationCoin,
-	k_EItemTypePrestigeCoin,
-	k_EItemTypeTool,
-};
-const char* PchNameFromEItemType(EItemType eType);
-
-enum EItemSlot
-{
-	k_EItemSlotNone,
-	k_EItemSlotMelee,
-	k_EItemSlotSecondary,
-	k_EItemSlotSMG,
-	k_EItemSlotRifle,
-	k_EItemSlotHeavy,
-	k_EItemSlotFlair,
-	k_EItemSlotMusicKit,
-};
-const char* PchNameFromEItemSlot(EItemSlot eSlot);
-EItemSlot EItemSlotFromName(const char* pchName);
-
-class CEconItemDefinition : public IEconItemDefinition
-{
-public:
-	CEconItemDefinition(void);
-	virtual ~CEconItemDefinition(void);
-
-	void PurgeStaticAttributes(void);
-
-public:
-	virtual bool	BInitFromKV(KeyValues* pKVItem, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-	virtual bool	BInitFromTestItemKVs(int iNewDefIndex, KeyValues* pKVItem, CEconItemSchema& pschema);
-	virtual void	GeneratePrecacheModelStrings(bool bDynamicLoad, CUtlVector<const char*>* out_pVecModelStrings) const;
-	virtual void	GeneratePrecacheSoundStrings(CUtlVector<const char*>* out_pVecSoundStrings) const;
-	virtual void	GeneratePrecacheEffectStrings(CUtlVector<const char*>* out_pVecEffectStrings) const;
-#endif
-	virtual void	CopyPolymorphic(const CEconItemDefinition* pSourceDef) { *this = *pSourceDef; }
-
-	bool		BInitItemMappings(CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors);
-
-	virtual void BInitVisualBlockFromKV(KeyValues* pKVItem, IEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-	void		BInitStylesBlockFromKV(KeyValues* pKVStyles, CEconItemSchema& pschema, AssetInfo* pAssetInfo, CUtlVector<CUtlString>* pVecErrors);
-	bool		BInitAlternateIconsFromKV(KeyValues* pKVAlternateIcons, CEconItemSchema& pschema, AssetInfo* pAssetInfo, CUtlVector<CUtlString>* pVecErrors);
-
-	virtual item_definition_index_t	GetDefinitionIndex(void) const { return m_nDefIndex; }
-	const CUtlVector<item_definition_index_t>& GetAssociatedItemsDefIndexes() const { return m_nAssociatedItemsDefIndexes; }
-	virtual const char* GetPrefabName(void) const { return m_szPrefab; }
-	bool		BEnabled(void) const { return m_bEnabled; }
-	bool		BLoadOnDemand(void) const { return m_bLoadOnDemand; }
-	bool		BHasBeenLoaded(void) const { return m_bHasBeenLoaded; }
-	const char* GetDefinitionName(void) const { return m_pszDefinitionName; }
-	const char* GetItemClass(void) const { return m_pszItemClassname; }
-	virtual const char* GetItemBaseName(void) const { return m_pszItemBaseName; }
-	const char* GetBrassModelOverride(void) const { return m_pszBrassModelOverride; }
-	virtual const char* GetItemTypeName(void) const { return m_pszItemTypeName; }
-	virtual uint32 GetItemTypeID(void) const { return m_unItemTypeID; }
-	uint8		GetMinLevel(void) const { return m_unMinItemLevel; }
-	uint8		GetMaxLevel(void) const { return m_unMaxItemLevel; }
-	virtual uint8	GetRarity(void) const { return m_nItemRarity; }
-	uint8		GetQuality(void) const { return m_nItemQuality; }
-	uint8		GetForcedQuality(void) const { return m_nForcedItemQuality; }
-	uint8		GetDefaultDropQuality(void) const { return m_nDefaultDropItemQuality; }
-	uint8		GetDefaultDropQuantity(void) const { return m_nDefaultDropQuantity; }
-	KeyValues* GetRawDefinition(void) const { return m_pKVItem; }
-	const CUtlVector<static_attrib_t>& GetStaticAttributes(void) const { return m_vecStaticAttributes; }
-	uint32		GetNumConcreteItems() const { return m_unNumConcreteItems; }
-	int			GetSoundMaterialID() const { return m_nSoundMaterialID; }
-
-	bool		IsHidden(void) const { return m_bHidden; }
-	bool		IsImported(void) const { return m_bImported; }
-	bool		IsOnePerAccountCDKEY(void) const { return m_bOnePerAccountCDKEY; }
-	bool		IsAllowedInMatch(void) const { return m_bAllowedInThisMatch; }
-	virtual bool IsBaseItem(void) const { return m_bBaseItem; }
-	virtual bool IsDefaultSlotItem(void) const { return m_bDefaultSlotItem; }
-	virtual bool IsBundle(void) const { return m_BundleInfo != NULL; }
-	bool		HasProperName(void) const { return m_bProperName; }
-	const char* GetClassToken(void) const { return m_pszClassToken; }
-	const char* GetSlotToken(void) const { return m_pszSlotToken; }
-	bool		ShouldAttachToHands(void) const { return m_bAttachToHands; }
-	bool		ShouldAttachToHandsVMOnly(void) const { return m_bAttachToHandsVMOnly; }
-	bool		ShouldFlipViewmodels(void) const { return m_bFlipViewModel; }
-	int			GetInventoryImagePosition(int iIndex) const { Assert(iIndex >= 0 && iIndex < 2); return m_iInventoryImagePosition[iIndex]; }
-	int			GetInventoryImageSize(int iIndex) const { Assert(iIndex >= 0 && iIndex < 2); return m_iInventoryImageSize[iIndex]; }
-	int			GetDropType(void) const { return m_iDropType; }
-	const char* GetHolidayRestriction(void) const { return m_pszHolidayRestriction; }
-	int			GetSubType(void) const { return m_iSubType; }
-	item_capabilities_t GetCapabilities(void) const { return m_iCapabilities; }
-	void		AddItemSet(int nIndex);
-	const CUtlVector< int >& GetItemSets(void) const;
-	int			GetArmoryRemap(void) const { return m_iArmoryRemap; }
-	int			GetStoreRemap(void) const { return m_iStoreRemap; }
-	virtual int	GetLoadoutSlot(void) const { return 0; }
-	virtual int	GetHeroID(void) const { return 0; }
-	KeyValues* GetPortraitsKV(void) const { return m_pPortraitsKV; }
-	KeyValues* GetPortraitKVForModel(const char* pszModelName) const;
-
-	AssetInfo* GetAssetInfo() const { return m_pAssetInfo; }
-
-	bool IsTool() const { return m_pTool != NULL; }
-	bool IsToolAndNotACrate() const { return (IsTool() && GetEconTool() && V_strcmp(GetEconTool()->GetTypeName(), "supply_crate") != 0); }
-	const IEconTool* GetEconTool() const { return m_pTool; }
-	template < class T >
-	const T* GetTypedEconTool() const { return dynamic_cast<const T*>(GetEconTool()); }
-
-	virtual bool IsPreviewableInStore() const { return true; }
-
-	const bundleinfo_t* GetBundleInfo(void) const { return m_BundleInfo; }
-	virtual int GetBundleItemCount(void) const { return m_BundleInfo ? m_BundleInfo->vecItemEntries.Count() : 0; }
-	virtual int GetBundleItem(int iIndex) const { return m_BundleInfo ? m_BundleInfo->vecItemEntries[iIndex].m_nItemDef : -1; }
-	virtual int GetBundleItemPaintKitID(int iIndex) const { return m_BundleInfo ? m_BundleInfo->vecItemEntries[iIndex].m_nPaintKit : -1; }
-
-	const CUtlVector< const CEconItemDefinition* >& GetContainingBundles() const { return m_vecContainingBundleItemDefs; }
-	uint32 GetContainingBundleCount() const { return m_vecContainingBundleItemDefs.Count(); }
-
-	typedef CUtlVector< uint32 > WorkshopContributorList_t;
-
-	void AddSteamWorkshopContributor(uint32 unAccountID) { if (m_vecSteamWorkshopContributors.InvalidIndex() == m_vecSteamWorkshopContributors.Find(unAccountID)) { m_vecSteamWorkshopContributors.AddToTail(unAccountID); } }
-	const WorkshopContributorList_t& GetSteamWorkshopContributors() const { return m_vecSteamWorkshopContributors; }
-	bool BIsSteamWorkshopItem() const { return m_vecSteamWorkshopContributors.Count() > 0; }
-
-	const char* GetIconClassname(void) const { return m_pszItemIconClassname; }
-	const char* GetLogClassname(void) const { return m_pszItemLogClassname; }
-	const char* GetInventoryModel(void) const { return m_pszInventoryModel; }
-	virtual const char* GetInventoryImage(void) const { return m_pszInventoryImage; }
-	const char* GetInventoryOverlayImage(int idx) const { if (m_pszInventoryOverlayImages.IsValidIndex(idx)) return m_pszInventoryOverlayImages[idx]; else return NULL; }
-	int			GetInventoryOverlayImageCount(void) const { return m_pszInventoryOverlayImages.Count(); }
-	const char* GetIconURLSmall() const { return m_sIconURLSmall; }
-	const char* GetIconURLLarge() const { return m_sIconURLLarge; }
-	void	SetIconURLSmall(const char* szURL) { m_sIconURLSmall = szURL; }
-	void	SetIconURLLarge(const char* szURL) { m_sIconURLLarge = szURL; }
-	virtual const char* GetBasePlayerDisplayModel() const { return m_pszBaseDisplayModel; }
-	virtual const char* GetWorldDisplayModel()	const { return m_pszWorldDisplayModel; }
-	virtual const char* GetWorldDroppedModel()	const { return m_pszWorldDroppedModel; }
-
-	virtual const char* GetIconDisplayModel()	const;
-	virtual const char* GetBuyMenuDisplayModel()	const;
-	virtual const char* GetPedestalDisplayModel()	const;
-	virtual const char* GetMagazineModel()	const;
-	virtual const char* GetScopeLensMaskModel()	const;
-	virtual const char* GetUidModel() const;
-	virtual const char* GetStatTrakModelByType(uint32 nType) const;
-
-	virtual const int	 GetNumSupportedStickerSlots() const;
-	virtual const char* GetStickerSlotModelBySlotIndex(uint32 nIndex) const;
-	virtual const Vector& GetStickerSlotWorldProjectionStartBySlotIndex(uint32 nIndex) const;
-	virtual const Vector& GetStickerSlotWorldProjectionEndBySlotIndex(uint32 nIndex) const;
-	virtual const char* GetStickerWorldModelBoneParentNameBySlotIndex(uint32 nIndex) const;
-	virtual const char* GetStickerSlotMaterialBySlotIndex(uint32 nIndex) const;
-	virtual const char* GetIconDefaultImage() const { return m_pszIconDefaultImage; }
-	virtual const char* GetExtraWearableModel(void) const { return m_pszWorldExtraWearableModel; }
-	virtual const char* GetParticleFile(void) const { return m_pszParticleFile; }
-	virtual const char* GetParticleSnapshotFile(void) const { return m_pszParticleSnapshotFile; }
-	const CUtlVector< WeaponPaintableMaterial_t >* GetPaintData(void) const { return &m_PaintData; }
-	const InventoryImageData_t* GetInventoryImageData(void) const { return m_pInventoryImageData; }
-	virtual const char* GetItemDesc(void) const { return m_pszItemDesc; }
-	const char* GetArmoryDescString(void) const { return m_pszArmoryDesc; }
-	RTime32		GetExpirationDate(void) const { return m_rtExpiration; }
-	RTime32		GetDefCreationDate(void) const { return m_rtDefCreation; }
-	bool		ShouldShowInArmory(void) const { return m_bShouldShowInArmory; }
-	bool		IsActingAsAWearable(void) const { return m_bActAsWearable; }
-	bool		GetHideBodyGroupsDeployedOnly(void) const { return m_bHideBodyGroupsDeployedOnly; }
-	virtual bool	IsPackBundle(void) const { return m_bIsPackBundle; }
-	virtual bool	IsPackItem(void) const { return NULL != m_pOwningPackBundle; }
-	CEconItemDefinition* GetOwningPackBundle() { return m_pOwningPackBundle; }
-	const CEconItemDefinition* GetOwningPackBundle() const { return m_pOwningPackBundle; }
-#if ECONITEM_DATABASE_AUDIT_TABLES_FEATURE
-	const char* GetDatabaseAuditTableName(void) const { return m_pszDatabaseAuditTable; }
-#endif
-	const char* GetAlternateIcon(int iAlternateIcon) const;
-
-	equip_region_mask_t GetEquipRegionMask(void) const { return m_unEquipRegionMask; }
-	equip_region_mask_t GetEquipRegionConflictMask(void) const { return m_unEquipRegionConflictMask; }
-
-	void		SetAllowedInMatch(bool bAllowed) { m_bAllowedInThisMatch = bAllowed; }
-	void		SetHasBeenLoaded(bool bLoaded) { m_bHasBeenLoaded = bLoaded; }
-
-	bool		BRandomProxy(void) const { return NULL != m_pProxyCriteria; }
-	CItemSelectionCriteria* PProxyCriteria(void) const { return m_pProxyCriteria; }
-
-	uint32		RollItemLevel(void) const;
-
-	const char* GetFirstSaleDate(void) const;
-
-	virtual bool	IsRecent(void) const { return false; }
-
-	void		IterateAttributes(class IEconItemAttributeIterator* pIterator) const;
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-	int						GetNumAttachedModels() const;
-	attachedmodel_t* GetAttachedModelData(int iIdx) const;
-	int						GetNumAttachedParticles() const;
-	attachedparticlesystem_t* GetAttachedParticleData(int iIdx) const;
-	bool					IsAttachedParticleDataValidForStyle(int iIdx, int nStyle) const;
-	int						GetNumAnimations() const;
-	animation_on_wearable_t* GetAnimationData(int iIdx) const;
-	int						GetNumAnimationModifiers() const;
-	const char* GetAnimationModifier(int iIdx) const;
-
-	Activity				GetActivityOverride(Activity baseAct) const;
-	const char* GetReplacementForActivityOverride(Activity baseAct) const;
-	int						GetNumSounds() const;
-	sound_on_wearable_t* GetSoundData(int iIdx) const;
-	const char* GetReplacementSound(const char* pszSoundName) const;
-	int						GetNumParticles() const;
-	particle_on_wearable_t* GetParticleData(int iIdx) const;
-	const char* GetReplacementParticleEffect(const char* pszParticleName) const;
-	int						GetNumParticleSnapshots() const;
-	particlesnapshot_on_wearable_t* GetParticleSnapshotData(int iIdx) const;
-	const char* GetReplacementParticleSnapshot(const char* pszParticleSnapshotName) const;
-
-	int						GetNumParticleControlPoints() const;
-	particle_control_point_on_wearable_t* GetParticleControlPointData(int iIdx) const;
-
-	bool					GetReplacementControlPoint(int nIndex, const char* pszParticleName, int& nOutputCP, Vector& nCPValue) const;
-
-	virtual bool			IsContentStreamable() const;
-
-	const char* GetAnnouncerName() const;
-	const char* GetAnnouncerResource() const;
-
-	const char* GetEntityOverrideModel() const;
-	const char* GetViewOverrideModel() const;
-	const char* GetEntityOverrideClass() const;
-
-	const char* GetHeroModelChangeModel() const;
-
-	const char* GetUIOverrideIcon() const;
-	const char* GetUIOverrideOriginalIcon() const;
-
-	const char* GetUIOverrideAbilityIcon(const char* pszAbilityName) const;
-
-	const char* GetScaleOverrideClass() const;
-	float					GetScaleOverrideSize() const;
-
-	bool					SkipModelCombine(void) const;
-
-	const char* GetMuzzleFlash() const;
-	const char* GetTracerEffect() const;
-	const char* GetParticleEffect() const;
-	const char* GetParticleSnapshot() const;
-	const char* GetMaterialOverride() const;
-	const char* GetCustomSound(int iSound) const;
-	const char* GetWeaponReplacementSound(  int iSound) const;
-
-	const char* GetPrimaryAmmo(void) const;
-	const char* GetWeaponTypeString(void) const;
-	const char* GetAddonLocation(void) const;
-	const char* GetEjectBrassEffect(void) const;
-	const char* GetMuzzleFlashEffect1stPerson(void) const;
-	const char* GetMuzzleFlashEffect1stPersonAlt(void) const;
-	const char* GetMuzzleFlashEffect3rdPerson(void) const;
-	const char* GetMuzzleFlashEffect3rdPersonAlt(void) const;
-	const char* GetHeatEffect(void) const;
-	const char* GetPlayerAnimationExtension(void) const;
-
-	int						GetHiddenParentBodygroup() const;
-	int						GetNumModifiedBodyGroups() const;
-	const char* GetModifiedBodyGroup(int i, int& body) const;
-	bool					UsesPerClassBodygroups() const;
-	int						GetNumCodeControlledBodyGroups() const;
-	const char* GetCodeControlledBodyGroup(int i, struct codecontrolledbodygroupdata_t& ccbgd) const;
-
-	int						GetViewmodelBodygroupOverride() const;
-	int						GetViewmodelBodygroupStateOverride() const;
-	int						GetWorldmodelBodygroupOverride() const;
-	int						GetWorldmodelBodygroupStateOverride() const;
-
-#endif    
-
-	style_index_t			GetNumStyles() const;
-	const CEconStyleInfo* GetStyleInfo(style_index_t unStyle) const;
-
-
-	int						GetPopularitySeed() const { return m_nPopularitySeed; }
-
-	bool					HasEconTag(econ_tag_handle_t tag) const { return m_vecTags.IsValidIndex(m_vecTags.Find(tag)); }
-
-	bool					ShoulDisableStyleSelector(void) const { return m_bDisableStyleSelection; }
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-	int						GetStyleSkin(style_index_t unStyle) const;
-#endif    
-
-	virtual bool			IsPublicItem(void) const { return m_bPublicItem; }
-	virtual bool			IgnoreInCollectionView(void) const { return m_bIgnoreInCollectionView; }
-
-	const char* GetLootListName(void) const { return m_pszLootListName; }
-
-
-	EItemType GetItemType() const { return m_eItemType; }
-	bool GetAllowPurchaseStandalone() const { return m_bAllowPurchaseStandalone; }
-
-private:
-	KeyValues* m_pKVItem;
-
-	item_definition_index_t	m_nDefIndex;
-
-	CUtlVector< item_definition_index_t > m_nAssociatedItemsDefIndexes;
-
-	bool		m_bEnabled;
-
-	const char* m_szPrefab;
-
-	uint8		m_unMinItemLevel;
-	uint8		m_unMaxItemLevel;
-
-	uint8		m_nItemRarity;
-
-	uint8		m_nItemQuality;
-	uint8		m_nForcedItemQuality;
-	uint8		m_nDefaultDropItemQuality;
-
-	uint8		m_nDefaultDropQuantity;
-
-	CUtlVector<static_attrib_t> m_vecStaticAttributes;
-
-	uint8		m_nPopularitySeed;
-
-	KeyValues* m_pPortraitsKV;
-
-	const char* m_pszItemBaseName;
-	bool			m_bProperName;		                
-	const char* m_pszItemTypeName;
-
-	uint32			m_unItemTypeID;
-
-	const char* m_pszItemDesc;
-
-	RTime32			m_rtExpiration;
-
-	RTime32			m_rtDefCreation;
-
-	const char* m_pszInventoryModel;
-	const char* m_pszInventoryImage;
-	CUtlVector<const char*>	m_pszInventoryOverlayImages;
-	int				m_iInventoryImagePosition[2];
-	int				m_iInventoryImageSize[2];
-
-	const char* m_pszBaseDisplayModel;
-	bool			m_bLoadOnDemand;
-	bool			m_bHasBeenLoaded;
-
-	bool			m_bHideBodyGroupsDeployedOnly;
-
-	const char* m_pszWorldDisplayModel;
-	const char* m_pszWorldExtraWearableModel;		          
-
-	const char* m_pszWorldDroppedModel;
-	char m_szWorldDroppedModel[80];
-
-	CUtlVector<StickerData_t>  m_vStickerModels;
-
-	const char* m_pszIconDefaultImage;
-
-	bool			m_bAttachToHands;
-	bool			m_bAttachToHandsVMOnly;
-
-	bool			m_bFlipViewModel;
-
-	bool			m_bActAsWearable;
-
-	mutable CUtlVector< int > m_iItemSets;
-
-	AssetInfo* m_pAssetInfo;
-
-	EItemType		m_eItemType;
-	bool			m_bAllowPurchaseStandalone;
-
-	const char* m_pszBrassModelOverride;
-
-	IEconTool* m_pTool;
-	bundleinfo_t* m_BundleInfo;
-	item_capabilities_t m_iCapabilities;
-
-	uint32			m_unNumConcreteItems;		                                      
-
-	int				m_nSoundMaterialID;
-
-	bool			m_bDisableStyleSelection;
-
-	CUtlString		m_sIconURLSmall;
-	CUtlString		m_sIconURLLarge;
-
-	const char* m_pszParticleFile;				         
-	const char* m_pszParticleSnapshotFile;		          
-
-	const char* m_pszLootListName;				               
-
-	CUtlVector<int> m_nCharacterPaintKitIndices;
-
-protected:
-	CUtlVector< WeaponPaintableMaterial_t > m_PaintData;
-	InventoryImageData_t* m_pInventoryImageData;
-
-private:
-
-	const char* m_pszItemClassname;
-
-	const char* m_pszItemLogClassname;
-
-	const char* m_pszItemIconClassname;
-
-	const char* m_pszDefinitionName;
-
-#if ECONITEM_DATABASE_AUDIT_TABLES_FEATURE
-	const char* m_pszDatabaseAuditTable;
-#endif
-
-	bool			m_bHidden;
-	bool			m_bShouldShowInArmory;
-	bool			m_bBaseItem;
-	bool			m_bDefaultSlotItem;
-	bool			m_bImported;
-	bool			m_bOnePerAccountCDKEY;
-
-	bool			m_bIsPackBundle;
-
-	CEconItemDefinition* m_pOwningPackBundle;
-
-	const char* m_pszArmoryDesc;
-
-	int				m_iArmoryRemap;
-	int				m_iStoreRemap;
-	const char* m_pszArmoryRemap;
-	const char* m_pszStoreRemap;
-
-	const char* m_pszClassToken;
-	const char* m_pszSlotToken;
-
-	int				m_iDropType;
-
-	const char* m_pszHolidayRestriction;
-
-	int				m_iSubType;
-
-	bool			m_bAllowedInThisMatch;
-
-	CItemSelectionCriteria* m_pProxyCriteria;
-
-	equip_region_mask_t	m_unEquipRegionMask;			        
-	equip_region_mask_t m_unEquipRegionConflictMask;	             
-
-	CUtlMap<uint32, const char*>* m_pMapAlternateIcons;
-
-	CUtlVector<econ_tag_handle_t>	m_vecTags;
-	CUtlVector<const CEconItemDefinition*> m_vecContainingBundleItemDefs;	          
-	WorkshopContributorList_t m_vecSteamWorkshopContributors;
-
-	friend class CEconItemSchema;
-	bool			m_bPublicItem;
-	bool			m_bIgnoreInCollectionView;
-};
-
-inline style_index_t CEconItemDefinition::GetNumStyles() const
-{
-	const AssetInfo* pAssetInfo = GetAssetInfo();
-
-	if (!pAssetInfo)
-		return 0;
-
-	return pAssetInfo->m_Styles.Count();
-}
-
-inline const CEconStyleInfo* CEconItemDefinition::GetStyleInfo(style_index_t unStyle) const
-{
-	const AssetInfo* pAssetInfo = GetAssetInfo();
-	if (!pAssetInfo || !pAssetInfo->m_Styles.IsValidIndex(unStyle))
-		return NULL;
-
-	return pAssetInfo->m_Styles[unStyle];
-}
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-inline int CEconItemDefinition::GetNumAttachedModels() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_AttachedModels.Count();
-}
-
-inline attachedmodel_t* CEconItemDefinition::GetAttachedModelData(int iIdx) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	Assert(iIdx < GetAssetInfo()->m_AttachedModels.Count());
-	if (iIdx >= GetAssetInfo()->m_AttachedModels.Count())
-		return NULL;
-
-	return &GetAssetInfo()->m_AttachedModels[iIdx];
-}
-
-inline int CEconItemDefinition::GetNumAnimations() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_Animations.Count();
-}
-
-inline animation_on_wearable_t* CEconItemDefinition::GetAnimationData(int iIdx) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	Assert(iIdx < GetAssetInfo()->m_Animations.Count());
-	if (iIdx < 0 || iIdx >= GetAssetInfo()->m_Animations.Count())
-		return NULL;
-
-	return &GetAssetInfo()->m_Animations[iIdx];
-}
-
-inline int CEconItemDefinition::GetNumAnimationModifiers() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_vecAnimationModifiers.Count();
-}
-
-inline const char* CEconItemDefinition::GetAnimationModifier(int iIdx) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	if (iIdx < 0 || iIdx >= GetAssetInfo()->m_vecAnimationModifiers.Count())
-		return NULL;
-
-	return GetAssetInfo()->m_vecAnimationModifiers[iIdx];
-}
-
-inline const char* CEconItemDefinition::GetAnnouncerName() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszAnnouncerName;
-}
-
-inline const char* CEconItemDefinition::GetAnnouncerResource() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszAnnouncerResource;
-}
-
-inline const char* CEconItemDefinition::GetUIOverrideIcon() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszNewIcon;
-}
-
-inline const char* CEconItemDefinition::GetUIOverrideOriginalIcon() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszOriginalIcon;
-}
-
-inline const char* CEconItemDefinition::GetUIOverrideAbilityIcon(const char* pszAbilityName) const
-{
-	if (!pszAbilityName)
-		return NULL;
-
-	if (!GetAssetInfo())
-		return NULL;
-
-	FOR_EACH_VEC(GetAssetInfo()->m_vecAbilityIconReplacements, i)
-	{
-		ability_icon_replacement_t* pszAbilityReplacement = &GetAssetInfo()->m_vecAbilityIconReplacements.Element(i);
-		if (pszAbilityReplacement)
-		{
-			if (!Q_strcmp(pszAbilityName, pszAbilityReplacement->m_strAbilityName))
-			{
-				return pszAbilityReplacement->m_strReplacement;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-inline const char* CEconItemDefinition::GetEntityOverrideModel() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	CUtlVector<AssetModifier*>* pAssetModifierList = GetAssetInfo()->GetAssetModifiers(AM_EntityModel);
-	if (pAssetModifierList && pAssetModifierList->Count() > 0)
-		return pAssetModifierList->Element(0)->m_strModifier.String();
-
-	return NULL;
-}
-
-inline const char* CEconItemDefinition::GetViewOverrideModel() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	CUtlVector<AssetModifier*>* pAssetModifierList = GetAssetInfo()->GetAssetModifiers(AM_ViewModel);
-	if (pAssetModifierList && pAssetModifierList->Count() > 0)
-		return pAssetModifierList->Element(0)->m_strModifier.String();
-
-	return NULL;
-}
-
-inline const char* CEconItemDefinition::GetEntityOverrideClass() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	CUtlVector<AssetModifier*>* pAssetModifierList = GetAssetInfo()->GetAssetModifiers(AM_EntityModel);
-	if (pAssetModifierList && pAssetModifierList->Count() > 0)
-		return pAssetModifierList->Element(0)->m_strAsset.String();
-
-	return NULL;
-}
-
-inline const char* CEconItemDefinition::GetScaleOverrideClass() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszScaleClass;
-}
-
-inline const char* CEconItemDefinition::GetHeroModelChangeModel() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	CUtlVector<AssetModifier*>* pAssetModifierList = GetAssetInfo()->GetAssetModifiers(AM_HeroModelChange);
-	if (pAssetModifierList && pAssetModifierList->Count() > 0)
-		return pAssetModifierList->Element(0)->m_strModifier.String();
-
-	return NULL;
-}
-
-inline float CEconItemDefinition::GetScaleOverrideSize() const
-{
-	if (!GetAssetInfo())
-		return 0.0f;
-
-	return GetAssetInfo()->m_flScaleSize;
-}
-
-inline bool CEconItemDefinition::SkipModelCombine(void) const
-{
-	if (!GetAssetInfo())
-		return false;
-
-	return GetAssetInfo()->m_bSkipModelCombine;
-}
-
-inline int CEconItemDefinition::GetNumSounds() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_Sounds.Count();
-}
-
-inline sound_on_wearable_t* CEconItemDefinition::GetSoundData(int iIdx) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	Assert(iIdx < GetAssetInfo()->m_Sounds.Count());
-	if (iIdx >= GetAssetInfo()->m_Sounds.Count())
-		return NULL;
-
-	return &GetAssetInfo()->m_Sounds[iIdx];
-}
-
-inline int CEconItemDefinition::GetNumParticles() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_Particles.Count();
-}
-
-inline particle_on_wearable_t* CEconItemDefinition::GetParticleData(int iIdx) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	Assert(iIdx < GetAssetInfo()->m_Particles.Count());
-	if (iIdx >= GetAssetInfo()->m_Particles.Count())
-		return NULL;
-
-	return &GetAssetInfo()->m_Particles[iIdx];
-}
-
-inline int CEconItemDefinition::GetNumParticleSnapshots() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_ParticleSnapshots.Count();
-}
-
-inline particlesnapshot_on_wearable_t* CEconItemDefinition::GetParticleSnapshotData(int iIdx) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	Assert(iIdx < GetAssetInfo()->m_ParticleSnapshots.Count());
-	if (iIdx >= GetAssetInfo()->m_ParticleSnapshots.Count())
-		return NULL;
-
-	return &GetAssetInfo()->m_ParticleSnapshots[iIdx];
-}
-
-inline int CEconItemDefinition::GetNumParticleControlPoints() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_ParticleControlPoints.Count();
-}
-
-inline particle_control_point_on_wearable_t* CEconItemDefinition::GetParticleControlPointData(int iIdx) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	Assert(iIdx < GetAssetInfo()->m_ParticleControlPoints.Count());
-	if (iIdx >= GetAssetInfo()->m_ParticleControlPoints.Count())
-		return NULL;
-
-	return &GetAssetInfo()->m_ParticleControlPoints[iIdx];
-}
-
-inline int CEconItemDefinition::GetNumAttachedParticles() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_AttachedParticles.Count();
-}
-
-inline const char* CEconItemDefinition::GetMaterialOverride() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszMaterialOverride;
-}
-
-
-inline const char* CEconItemDefinition::GetMuzzleFlash() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszMuzzleFlash;
-}
-
-inline const char* CEconItemDefinition::GetTracerEffect() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszTracerEffect;
-}
-
-inline const char* CEconItemDefinition::GetParticleEffect() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszParticleEffect;
-}
-
-inline const char* CEconItemDefinition::GetParticleSnapshot() const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszParticleSnapshot;
-}
-
-inline int CEconItemDefinition::GetHiddenParentBodygroup() const
-{
-	if (!GetAssetInfo())
-		return -1;
-
-	return GetAssetInfo()->iHideParentBodyGroup;
-}
-
-inline int CEconItemDefinition::GetNumModifiedBodyGroups() const
-{
-	if (!GetAssetInfo())
-		return -1;
-
-	return GetAssetInfo()->m_ModifiedBodyGroupNames.Count();
-}
-
-inline const char* CEconItemDefinition::GetModifiedBodyGroup(int i, int& body) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	body = GetAssetInfo()->m_ModifiedBodyGroupNames[i];
-	return GetAssetInfo()->m_ModifiedBodyGroupNames.Key(i);
-}
-
-inline int CEconItemDefinition::GetNumCodeControlledBodyGroups() const
-{
-	if (!GetAssetInfo())
-		return -1;
-
-	return GetAssetInfo()->m_CodeControlledBodyGroupNames.Count();
-}
-
-inline const char* CEconItemDefinition::GetCodeControlledBodyGroup(int i, codecontrolledbodygroupdata_t& ccbgd) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	ccbgd = GetAssetInfo()->m_CodeControlledBodyGroupNames[i];
-	return GetAssetInfo()->m_CodeControlledBodyGroupNames.Key(i);
-}
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-inline int CEconItemDefinition::GetStyleSkin(style_index_t unStyle) const
-{
-	const CEconStyleInfo* pStyle = GetStyleInfo(unStyle);
-
-	return pStyle
-		? pStyle->GetSkin()
-		: -1;
-}
-#endif    
-
-inline int CEconItemDefinition::GetViewmodelBodygroupOverride() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_iViewModelBodyGroupOverride;
-}
-
-inline int CEconItemDefinition::GetViewmodelBodygroupStateOverride() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_iViewModelBodyGroupStateOverride;
-}
-
-inline int CEconItemDefinition::GetWorldmodelBodygroupOverride() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_iWorldModelBodyGroupOverride;
-}
-
-inline int CEconItemDefinition::GetWorldmodelBodygroupStateOverride() const
-{
-	if (!GetAssetInfo())
-		return 0;
-
-	return GetAssetInfo()->m_iWorldModelBodyGroupStateOverride;
-}
-
-inline bool CEconItemDefinition::UsesPerClassBodygroups() const
-{
-	if (!GetAssetInfo())
-		return false;
-
-	return GetAssetInfo()->bUsePerClassBodygroups;
-}
-
-inline const char* CEconItemDefinition::GetCustomSound(int iSound) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-	if (iSound < 0 || iSound >= MAX_VISUALS_CUSTOM_SOUNDS)
-		return NULL;
-	return GetAssetInfo()->m_pszCustomSounds[iSound];
-}
-
-inline const char* CEconItemDefinition::GetWeaponReplacementSound(    int iSound) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-	if (iSound < 0 || iSound >= NUM_SHOOT_SOUND_TYPES)
-		return NULL;
-	return GetAssetInfo()->m_pszWeaponSoundReplacements[iSound];
-}
-
-inline const char* CEconItemDefinition::GetPrimaryAmmo(void) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszPrimaryAmmo;
-}
-
-inline const char* CEconItemDefinition::GetWeaponTypeString(void) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszWeaponTypeString;
-}
-
-inline const char* CEconItemDefinition::GetAddonLocation(void) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszAddonLocation;
-}
-
-inline const char* CEconItemDefinition::GetEjectBrassEffect(void) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszEjectBrassEffect;
-}
-
-inline const char* CEconItemDefinition::GetMuzzleFlashEffect1stPerson(void) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszMuzzleFlashEffect1stPerson;
-}
-
-inline const char* CEconItemDefinition::GetMuzzleFlashEffect1stPersonAlt(void) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszMuzzleFlashEffect1stPersonAlt;
-}
-
-inline const char* CEconItemDefinition::GetMuzzleFlashEffect3rdPerson(void) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszMuzzleFlashEffect3rdPerson;
-}
-
-inline const char* CEconItemDefinition::GetMuzzleFlashEffect3rdPersonAlt(void) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszMuzzleFlashEffect3rdPersonAlt;
-}
-
-inline const char* CEconItemDefinition::GetHeatEffect(void) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszHeatEffect;
-}
-
-inline const char* CEconItemDefinition::GetPlayerAnimationExtension(void) const
-{
-	if (!GetAssetInfo())
-		return NULL;
-
-	return GetAssetInfo()->m_pszPlayerAnimationExtension;
-}
-
-#endif    
-
-class CTimedItemRewardDefinition
-{
-public:
-	CTimedItemRewardDefinition(void);
-	CTimedItemRewardDefinition(const CTimedItemRewardDefinition& that);
-	CTimedItemRewardDefinition& operator=(const CTimedItemRewardDefinition& rhs);
-
-	~CTimedItemRewardDefinition(void);
-
-	bool		BInitFromKV(KeyValues* pKVTimedReward, CEconItemSchema& pschema, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	uint32		GetRandomFrequency(void) const { return RandomFloat(m_unMinFreq, m_unMaxFreq); }
-	uint32		GetMinFrequency(void) const { return m_unMinFreq; }
-	uint32		GetMaxFrequency(void) const { return m_unMaxFreq; }
-
-	float		GetChance(void) const;
-	RTime32		GetForcedBaselineAdjustmentTime(void) const { return m_rtForcedBaselineAdjustment; }
-	RTime32		GetForcedLastDropAdjustmentTime(void) const { return m_rtForcedLastDropTimeAdjustment; }
-	uint32		GetHoursInRewardPeriod(void) const { return m_unHoursInRewardPeriod; }
-	uint32		GetHoursBetweenDropsRealtime(void) const { return m_unHoursBetweenDropsRealtime; }
-	uint32		GetTotalPointsForPeriod(float flHoursOfPlaytimeInPeriod) const
-	{
-		float flHours = flHoursOfPlaytimeInPeriod;
-		if (flHours <= 0.0f)
-			return 0;
-
-		uint32 unPoints = 0;
-		uint32 numPointsToProrate = 0;
-		uint32 nHoursPlayed = (uint32)flHours;   
-		if (!nHoursPlayed)
-		{	         
-			numPointsToProrate = (m_arrTotalPointsBasedOnHoursPlayed.Count()) ? m_arrTotalPointsBasedOnHoursPlayed.Head() : m_unPointsPerHourOverplayed;
-		}
-		else if (uint32 numHoursToCreditFromTable = MIN(nHoursPlayed, (uint32)m_arrTotalPointsBasedOnHoursPlayed.Count()))
-		{	             
-			nHoursPlayed -= numHoursToCreditFromTable;
-			flHours -= numHoursToCreditFromTable;
-			unPoints += m_arrTotalPointsBasedOnHoursPlayed[numHoursToCreditFromTable - 1];
-			numPointsToProrate = (numHoursToCreditFromTable < (uint32)m_arrTotalPointsBasedOnHoursPlayed.Count())
-				? (m_arrTotalPointsBasedOnHoursPlayed[numHoursToCreditFromTable] - m_arrTotalPointsBasedOnHoursPlayed[numHoursToCreditFromTable - 1])
-				: m_unPointsPerHourOverplayed;
-		}
-
-		if (nHoursPlayed)
-		{	             
-			unPoints += nHoursPlayed * m_unPointsPerHourOverplayed;
-			numPointsToProrate = m_unPointsPerHourOverplayed;
-			flHours -= nHoursPlayed;
-		}
-
-		unPoints += flHours * numPointsToProrate;
-		return unPoints;
-	}
-	uint32		GetPointsPerPeriodRollover(void) const { return m_unPointsPerPeriodRollover; }
-
-	const CItemSelectionCriteria& GetCriteria(void) const { return m_criteria; }
-	int GetLootListCount(void) const { return m_arrLootLists.Count(); }
-	const CEconLootListDefinition* GetLootList(int iLootListIdx = 0) const { return m_arrLootLists.IsValidIndex(iLootListIdx) ? m_arrLootLists[iLootListIdx] : NULL; }
-private:
-	uint32		m_unMinFreq;
-	uint32		m_unMaxFreq;
-
-	RTime32		m_rtForcedBaselineAdjustment;	                  
-	RTime32		m_rtForcedLastDropTimeAdjustment;	                   
-	uint32		m_unHoursInRewardPeriod;		          
-	uint32		m_unHoursBetweenDropsRealtime;	            
-	CUtlVector< uint32 > m_arrTotalPointsBasedOnHoursPlayed;	                
-	uint32		m_unPointsPerHourOverplayed;	              
-	uint32		m_unPointsPerPeriodRollover;	      
-
-	float		m_flChance;
-
-
-	CItemSelectionCriteria m_criteria;
-	CUtlVector< const CEconLootListDefinition* > m_arrLootLists;
-
-	CUtlVector< const CEconLootListDefinition* > m_arrDynamicLootLists;
-};
-
-class CItemLevelingDefinition
-{
-public:
-	CItemLevelingDefinition(void);
-	CItemLevelingDefinition(const CItemLevelingDefinition& that);
-	CItemLevelingDefinition& operator=(const CItemLevelingDefinition& rhs);
-
-	~CItemLevelingDefinition(void);
-
-	bool		BInitFromKV(KeyValues* pKVItemLevel, CEconItemSchema& pschema, const char* pszLevelBlockName, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	uint32		GetLevel(void) const { return m_unLevel; }
-	uint32		GetRequiredScore(void) const { return m_unRequiredScore; }
-	const char* GetNameLocalizationKey(void) const { return m_pszLocalizedName_LocalStorage; }
-
-private:
-	uint32		m_unLevel;
-	uint32		m_unRequiredScore;
-	char* m_pszLocalizedName_LocalStorage;
-};
-
-struct AchievementAward_t
-{
-	AchievementAward_t(const AchievementAward_t& rhs)
-		: m_sNativeName(rhs.m_sNativeName),
-		m_unSourceAppId(rhs.m_unSourceAppId),
-		m_unAuditData(rhs.m_unAuditData)
-	{
-		m_vecDefIndex.CopyArray(rhs.m_vecDefIndex.Base(), rhs.m_vecDefIndex.Count());
-	}
-	AchievementAward_t() {}
-
-	CUtlString m_sNativeName;
-	AppId_t m_unSourceAppId;
-	uint32 m_unAuditData;
-	CUtlVector<uint16> m_vecDefIndex;
-};
-
-enum eTimedRewardType
-{
-	kTimedRewards_Reward,
-	kTimedRewards_PremiumTimedDrop,
-	kTimedRewards_Crate,
-	kTimedRewards_Operation,
-	kTimedRewards_Capsule,
-	kTimedRewards_Quest,
-	kTimedRewards_FreeSprayDropsOct2016,
-	kNumTimedRewards
-};
-
-struct kill_eater_score_type_t
-{
-	int32		m_nValue;
-	const char* m_pszTypeString;
-	const char* m_pszModelAttributeString;
-	const char* m_pszLevelBlockName;
-	bool		m_bUseLevelBlock;
-};
-
-class CWebResource
-{
-public:
-	CWebResource() : m_bOnDemand(false), m_pKeyValues(NULL), m_fnLoadCallback(NULL) {}
-	CWebResource(const CWebResource& other)
-	{
-		m_strName = other.m_strName;
-		m_strURL = other.m_strURL;
-		m_bOnDemand = other.m_bOnDemand;
-		m_pKeyValues = other.m_pKeyValues->MakeCopy();
-		m_fnLoadCallback = other.m_fnLoadCallback;
-	}
-	~CWebResource() { m_pKeyValues->deleteThis(); }
-
-	CUtlString	m_strName;
-	CUtlString	m_strURL;
-	bool		m_bOnDemand;
-	KeyValues* m_pKeyValues;
-	void (*m_fnLoadCallback)(const char*, KeyValues*);
-
-	static		bool	s_Initialized;
-};
-
-class CForeignAppImports
-{
-public:
-	CForeignAppImports() : m_mapDefinitions(DefLessFunc(uint16)) {}
-
-	void AddMapping(uint16 unForeignDefIndex, const CEconItemDefinition* pDefn);
-	const CEconItemDefinition* FindMapping(uint16 unForeignDefIndex) const;
-
-private:
-	CUtlMap< uint16, const CEconItemDefinition*> m_mapDefinitions;
-};
-
-class ISchemaAttributeType
-{
-public:
-	virtual ~ISchemaAttributeType() { }
-
-	virtual unsigned int GetTypeUniqueIdentifier() const = 0;
-
-	virtual void LoadEconAttributeValue(CEconItem* pTargetItem, const CEconItemAttributeDefinition* pAttrDef, const union attribute_data_union_t& value) const = 0;
-
-	virtual void ConvertEconAttributeValueToByteStream(const union attribute_data_union_t& value, std::string* out_psBytes) const = 0;
-
-	virtual bool BConvertStringToEconAttributeValue(const CEconItemAttributeDefinition* pAttrDef, const char* pszValue, union attribute_data_union_t* out_pValue) const = 0;
-
-	virtual void ConvertEconAttributeValueToString(const CEconItemAttributeDefinition* pAttrDef, const attribute_data_union_t& value, std::string* out_ps) const = 0;
-
-	virtual void LoadByteStreamToEconAttributeValue(CEconItem* pTargetItem, const CEconItemAttributeDefinition* pAttrDef, const std::string& sBytes) const = 0;
-
-	virtual void InitializeNewEconAttributeValue(attribute_data_union_t* out_pValue) const = 0;
-
-	virtual void UnloadEconAttributeValue(union attribute_data_union_t* out_pValue) const = 0;
-
-	virtual bool OnIterateAttributeValue(class IEconItemAttributeIterator* pIterator, const CEconItemAttributeDefinition* pAttrDef, const attribute_data_union_t& value) const = 0;
-
-	virtual bool BSupportsGameplayModificationAndNetworking() const { return false; }
-};
-
-
-
-
-struct CAppliedStickerInfo_t
-{
-	int nID;
-	float flWearMin;
-	float flWearMax;
-	float flScale;
-	float flRotate;
-};
-
-class CStickerKit
-{
-public:
-
-	CStickerKit(const CStickerKit& rhs)
-		: sName(rhs.sName),
-		sDescriptionString(rhs.sDescriptionString),
-		sItemName(rhs.sItemName),
-		sMaterialPath(rhs.sMaterialPath),
-		m_strInventoryImage(rhs.m_strInventoryImage)
-	{
-		nID = rhs.nID;
-		nRarity = rhs.nRarity;
-		flRotateStart = rhs.flRotateStart;
-		flRotateEnd = rhs.flRotateEnd;
-		flScaleMin = rhs.flScaleMin;
-		flScaleMax = rhs.flScaleMax;
-		flWearMin = rhs.flWearMin;
-		flWearMax = rhs.flWearMax;
-		bMaterialPathIsAbsolute = rhs.bMaterialPathIsAbsolute;
-
-		m_nEventID = rhs.m_nEventID;
-		m_nEventTeamID = rhs.m_nEventTeamID;
-		m_nPlayerID = rhs.m_nPlayerID;
-
-		m_pKVItem = rhs.m_pKVItem ? rhs.m_pKVItem->MakeCopy() : NULL;
-	}
-
-	CStickerKit(void)
-	{
-		nID = 0;
-		nRarity = 1;
-		flRotateStart = 0.0f;
-		flRotateEnd = 0.0f;
-		flScaleMax = flScaleMin = 1.0f;
-		flWearMin = 0.0f;
-		flWearMax = 1.0f;
-		bMaterialPathIsAbsolute = false;
-
-		m_nEventID = 0;
-		m_nEventTeamID = 0;
-		m_nPlayerID = 0;
-
-		m_pKVItem = NULL;
-	}
-
-	~CStickerKit()
-	{
-		if (m_pKVItem)
-			m_pKVItem->deleteThis();
-		m_pKVItem = NULL;
-	}
-
-	bool InitFromKeyValues(KeyValues* pKVEntry, const CStickerKit* pDefault, CUtlVector<CUtlString>* pVecErrors = NULL);
-	bool GenerateStickerApplicationInfo(CAppliedStickerInfo_t* pInfo) const;
-
-	int nID;
-	int nRarity;
-	CUtlString sName;
-	CUtlString sDescriptionString;
-	CUtlString sItemName;
-	CUtlString sMaterialPath;
-	CUtlString sMaterialPathNoDrips;
-	CUtlString m_strInventoryImage;
-
-	int m_nEventID;
-	int m_nEventTeamID;
-	int m_nPlayerID;
-
-	bool bMaterialPathIsAbsolute;
-
-	float flRotateStart;
-	float flRotateEnd;
-
-	float flScaleMin;
-	float flScaleMax;
-
-	float flWearMin;
-	float flWearMax;
-
-	const char* GetInventoryImage(void) const { return m_strInventoryImage; }
-
-	const char* GetIconURLSmall() const { return m_sIconURLSmall; }
-	const char* GetIconURLLarge() const { return m_sIconURLLarge; }
-	void	SetIconURLSmall(const char* szURL) { m_sIconURLSmall = szURL; }
-	void	SetIconURLLarge(const char* szURL) { m_sIconURLLarge = szURL; }
-
-	KeyValues* GetRawDefinition(void) const { return m_pKVItem; }
-
-private:
-	CUtlString m_sIconURLSmall;
-	CUtlString m_sIconURLLarge;
-	KeyValues* m_pKVItem;
-};
-
-class CStickerList
-{
-public:
-	CStickerList(const CStickerList& rhs)
-	{
-		flWearMin = rhs.flWearMin;
-		flWearMax = rhs.flWearMax;
-
-		flTotalWeight = rhs.flTotalWeight;
-		arrElements.AddMultipleToTail(rhs.arrElements.Count(), rhs.arrElements.Base());
-	}
-	CStickerList()
-	{
-		flWearMin = 0.0f;
-		flWearMax = 1.0f;
-
-		flTotalWeight = 0.0f;
-	}
-
-	bool InitFromKeyValues(KeyValues* pKVEntry, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	bool GenerateStickerApplicationInfo(CAppliedStickerInfo_t* pInfo) const;
-
-	struct sticker_list_entry_t
-	{
-		const CStickerList* pList;
-		const CStickerKit* pKit;
-		float flWeight;
-	};
-	CUtlVector< sticker_list_entry_t > arrElements;
-	float flTotalWeight;
-
-	float flWearMin;
-	float flWearMax;
-};
-
-class CPaintKit
-{
-public:
-	enum { NUM_COLORS = 4 };
-
-	CPaintKit(const CPaintKit& rhs)
-		: sName(rhs.sName),
-		sDescriptionString(rhs.sDescriptionString),
-		sDescriptionTag(rhs.sDescriptionTag),
-		sVmtPath(rhs.sVmtPath),
-		sPattern(rhs.sPattern),
-		sLogoMaterial(rhs.sLogoMaterial)
-	{
-		nID = rhs.nID;
-
-		kvVmtOverrides = rhs.kvVmtOverrides->MakeCopy();
-
-		bBaseDiffuseOverride = rhs.bBaseDiffuseOverride;
-		nRarity = rhs.nRarity;
-		nStyle = rhs.nStyle;
-		flWearDefault = rhs.flWearDefault;
-		flWearRemapMin = rhs.flWearRemapMin;
-		flWearRemapMax = rhs.flWearRemapMax;
-		nFixedSeed = rhs.nFixedSeed;
-		uchPhongExponent = rhs.uchPhongExponent;
-		uchPhongAlbedoBoost = rhs.uchPhongAlbedoBoost;
-		uchPhongIntensity = rhs.uchPhongIntensity;
-		flPatternScale = rhs.flPatternScale;
-		flPatternOffsetXStart = rhs.flPatternOffsetXStart;
-		flPatternOffsetXEnd = rhs.flPatternOffsetXEnd;
-		flPatternOffsetYStart = rhs.flPatternOffsetYStart;
-		flPatternOffsetYEnd = rhs.flPatternOffsetYEnd;
-		flPatternRotateStart = rhs.flPatternRotateStart;
-		flPatternRotateEnd = rhs.flPatternRotateEnd;
-		flLogoScale = rhs.flLogoScale;
-		flLogoOffsetX = rhs.flLogoOffsetX;
-		flLogoOffsetY = rhs.flLogoOffsetY;
-		flLogoRotation = rhs.flLogoRotation;
-		bIgnoreWeaponSizeScale = rhs.bIgnoreWeaponSizeScale;
-		nViewModelExponentOverrideSize = rhs.nViewModelExponentOverrideSize;
-		bOnlyFirstMaterial = rhs.bOnlyFirstMaterial;
-
-		memcpy(rgbaLogoColor, rhs.rgbaLogoColor, sizeof(rgbaLogoColor));
-		memcpy(rgbaLogoColor, rhs.rgbaLogoColor, sizeof(rgbaLogoColor));
-	}
-
-	CPaintKit(void)
-	{
-		nID = 0;
-
-		kvVmtOverrides = nullptr;
-
-		bBaseDiffuseOverride = false;
-		nRarity = 1;
-		nStyle = 0;
-		flWearDefault = 0.5f;
-		flWearRemapMin = 0.0f;
-		flWearRemapMax = 1.0f;
-		nFixedSeed = 0;
-		uchPhongExponent = 16;
-		uchPhongAlbedoBoost = 0;
-		uchPhongIntensity = 255;
-		flPatternScale = 0.5f;
-		flPatternOffsetXStart = 0.0f;
-		flPatternOffsetXEnd = 0.0f;
-		flPatternOffsetYStart = 0.0f;
-		flPatternOffsetYEnd = 0.0f;
-		flPatternRotateStart = 0.0f;
-		flPatternRotateEnd = 0.0f;
-		flLogoScale = 1.8f;
-		flLogoOffsetX = 1.0f;
-		flLogoOffsetY = 2.0f;
-		flLogoRotation = 0.0f;
-		bIgnoreWeaponSizeScale = false;
-		nViewModelExponentOverrideSize = 256;
-		bOnlyFirstMaterial = false;
-
-		memset(rgbaColor, 128, sizeof(rgbaColor));
-		memset(rgbaLogoColor, 128, sizeof(rgbaLogoColor));
-	}
-
-	~CPaintKit()
-	{
-		if (kvVmtOverrides)
-		{
-			kvVmtOverrides->deleteThis();
-			kvVmtOverrides = nullptr;
-		}
-	}
-
-	bool InitFromKeyValues(KeyValues* pKVEntry, const CPaintKit* pDefault, bool bHandleAbsolutePaths = false);
-	void FillKeyValuesForWorkshop(KeyValues* pKVToFill) const;
-
-	int nID;
-	CUtlString sName;
-	CUtlString sDescriptionString;
-	CUtlString sDescriptionTag;
-
-	CUtlString sPattern;
-	CUtlString sLogoMaterial;
-	bool bBaseDiffuseOverride;
-	int nRarity;
-	int nStyle;
-	Color rgbaColor[NUM_COLORS];
-	Color rgbaLogoColor[NUM_COLORS];
-	float flWearDefault;
-	float flWearRemapMin;
-	float flWearRemapMax;
-	unsigned char nFixedSeed;
-	unsigned char uchPhongExponent;
-	unsigned char uchPhongAlbedoBoost;
-	unsigned char uchPhongIntensity;
-	float flPatternScale;
-	float flPatternOffsetXStart;
-	float flPatternOffsetXEnd;
-	float flPatternOffsetYStart;
-	float flPatternOffsetYEnd;
-	float flPatternRotateStart;
-	float flPatternRotateEnd;
-	float flLogoScale;
-	float flLogoOffsetX;
-	float flLogoOffsetY;
-	float flLogoRotation;
-	bool bIgnoreWeaponSizeScale;
-	int nViewModelExponentOverrideSize;
-	bool bOnlyFirstMaterial;
-
-	CUtlString sVmtPath;
-	KeyValues* kvVmtOverrides;
-};
-
-class AlternateIconData_t
-{
-public:
-	AlternateIconData_t()
-	{
-	}
-
-	const char* GetInventoryImage(void) const { return sSimpleName; }
-
-	const char* GetIconURLSmall() const { return m_sIconURLSmall; }
-	const char* GetIconURLLarge() const { return m_sIconURLLarge; }
-	void	SetIconURLSmall(const char* szURL) { m_sIconURLSmall = szURL; }
-	void	SetIconURLLarge(const char* szURL) { m_sIconURLLarge = szURL; }
-
-	CUtlString sSimpleName;
-	CUtlString sLargeSimpleName;
-
-private:
-	CUtlString m_sIconURLSmall;
-	CUtlString m_sIconURLLarge;
-};
-
-class CProPlayerData
-{
-public:
-
-	CProPlayerData(const CProPlayerData& rhs)
-	{
-		m_nAccountID = rhs.m_nAccountID;
-		m_sName = rhs.m_sName;
-		m_sCode = rhs.m_sCode;
-		m_rtDOB = rhs.m_rtDOB;
-		m_sGeo = rhs.m_sGeo;
-
-		m_pKVItem = rhs.m_pKVItem ? rhs.m_pKVItem->MakeCopy() : NULL;
-	}
-
-	CProPlayerData(void)
-	{
-		m_nAccountID = 0;
-		m_rtDOB = 0;
-		m_pKVItem = NULL;
-	}
-
-	~CProPlayerData()
-	{
-		if (m_pKVItem)
-			m_pKVItem->deleteThis();
-		m_pKVItem = NULL;
-	}
-
-	bool BInitFromKeyValues(KeyValues* pDef, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	KeyValues* GetRawDefinition(void) const { return m_pKVItem; }
-	uint32 GetAccountID() const { return m_nAccountID; }
-	char const* GetName() const { return m_sName; }
-	char const* GetCode() const { return m_sCode; }
-	RTime32 GetDOB() const { return m_rtDOB; }
-	char const* GetGeo() const { return m_sGeo; }
-
-private:
-	KeyValues* m_pKVItem;
-	uint32 m_nAccountID;
-	CUtlString m_sName;
-	CUtlString m_sCode;
-	RTime32 m_rtDOB;
-	CUtlString m_sGeo;
-};
-
-typedef CUtlDict<CUtlConstString, int> ArmoryStringDict_t;
-typedef CUtlDict< CUtlVector<CItemLevelingDefinition>* > LevelBlockDict_t;
-typedef CUtlMap<unsigned int, kill_eater_score_type_t>	KillEaterScoreMap_t;
-
-struct attr_type_t
-{
-	CUtlConstString m_sName;
-	const ISchemaAttributeType* m_pAttrType;
-
-	attr_type_t(const char* pszName, const ISchemaAttributeType* pAttrType)
-		: m_sName(pszName)
-		, m_pAttrType(pAttrType)
-	{
-	}
-};
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-class IDelayedSchemaData
-{
-public:
-	virtual ~IDelayedSchemaData() {}
-	virtual bool InitializeSchema(CEconItemSchema* pItemSchema) = 0;
-
-protected:
-	bool InitializeSchemaInternal(CEconItemSchema* pItemSchema, CUtlBuffer& bufRawData, bool bInitAsBinary, uint32 nExpectedVersion);
-};
-#endif    
-
-class CEconStorePriceSheet;
-
-class CEconItemSchema : public IEconItemSchema
-{
-public:
-	CEconItemSchema();
-
-private:
-	CEconItemSchema(const CEconItemSchema& rhs);
-	CEconItemSchema& operator=(CEconItemSchema& rhs);
-
-public:
-	virtual ~CEconItemSchema(void) { Reset(); };
-
-	virtual bool BInit(const char* fileName, const char* pathID, CUtlVector<CUtlString>* pVecErrors = NULL);
-	bool		BInitBinaryBuffer(CUtlBuffer& buffer, CUtlVector<CUtlString>* pVecErrors = NULL);
-	bool		BInitTextBuffer(CUtlBuffer& buffer, CUtlVector<CUtlString>* pVecErrors = NULL);
-
-	uint32		GetVersion() const { return m_unVersion; }
-	uint32		GetResetCount() const { return m_unResetCount; }
-
-	static CUniformRandomStream& GetRandomStream() { return m_RandomStream; }
-
-	static uint32 CalculateKeyValuesVersion(KeyValues* pKV);
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-	void		MaybeInitFromBuffer(IDelayedSchemaData* pDelayedSchemaData);
-
-	bool		BInitFromDelayedBuffer();
-#endif    
-
-	equipped_class_t	GetFirstValidClass() const { return m_unFirstValidClass; }
-	equipped_class_t	GetLastValidClass() const { return m_unLastValidClass; }
-	bool				IsValidClass(equipped_class_t unClass) { return unClass >= m_unFirstValidClass && unClass <= m_unLastValidClass; }
-	equipped_slot_t		GetFirstValidItemSlot() const { return m_unFirstValidItemSlot; }
-	equipped_slot_t		GetLastValidItemSlot() const { return m_unLastValidItemSlot; }
-	bool				IsValidItemSlot(equipped_slot_t unSlot) { return unSlot >= m_unFirstValidItemSlot && unSlot <= m_unLastValidItemSlot; }
-	uint32				GetNumAllowedItemPresets() const { return m_unNumItemPresets; }
-	bool				IsValidPreset(equipped_preset_t unPreset) const { return unPreset <= m_unNumItemPresets; }
-	uint32				GetMinLevel() const { return m_unMinLevel; }
-	uint32				GetMaxLevel() const { return m_unMaxLevel; }
-	uint32				GetSumQualityWeights() const { return m_unSumQualityWeights; }
-
-	typedef CUtlHashMapLarge<int, CEconItemDefinition*>	ItemDefinitionMap_t;
-	const ItemDefinitionMap_t& GetItemDefinitionMap() const { return m_mapItems; }
-
-	typedef CUtlMap<int, CEconItemDefinition*, int, CDefLess<int> >	SortedItemDefinitionMap_t;
-	const SortedItemDefinitionMap_t& GetSortedItemDefinitionMap() const { return m_mapItemsSorted; }
-
-	typedef CUtlDict<CEconLootListDefinition> LootListDefinitionDict_t;
-	const LootListDefinitionDict_t& GetLootLists() const { return m_dictLootLists; }
-
-	typedef CUtlMap<int, const char*, int, CDefLess<int> > RevolvingLootListDefinitionMap_t;
-	const RevolvingLootListDefinitionMap_t& GetRevolvingLootLists() const { return m_mapRevolvingLootLists; }
-	const RevolvingLootListDefinitionMap_t& GetQuestRewardLootLists() const { return m_mapQuestRewardLootLists; }
-
-	typedef CUtlMap<const char*, int> BodygroupStateMap_t;
-	const BodygroupStateMap_t& GetDefaultBodygroupStateMap() const { return m_mapDefaultBodygroupState; }
-
-	typedef CUtlVector<CEconColorDefinition*>	ColorDefinitionsList_t;
-
-	typedef CUtlMap<int, CEconMusicDefinition*, int, CDefLess<int> >	MusicDefinitionsList_t;
-	typedef CUtlMap<int, CEconQuestDefinition*, int, CDefLess<int> >	QuestDefinitionsList_t;
-	typedef CUtlMap<int, CEconCampaignDefinition*, int, CDefLess<int> >	CampaignDefinitionsList_t;
-
-
-	const MusicDefinitionsList_t& GetMusicDefinitionMap() const { return m_mapMusicDefs; }
-
-	const CEconItemDefinition* GetDefaultItemDefinition() const { return m_pDefaultItemDefinition; }
-	IEconItemDefinition* GetDefaultItemDefinitionInterface() { return m_pDefaultItemDefinition; }
-
-	const CUtlMap<int, CEconItemQualityDefinition, int, CDefLess<int> >& GetQualityDefinitionMap() const { return m_mapQualities; }
-
-	typedef CUtlVector< CEconItemAttributeDefinition* > EconAttrDefsContainer_t;
-	EconAttrDefsContainer_t& GetAttributeDefinitionContainer() { return m_mapAttributesContainer; }
-	const EconAttrDefsContainer_t& GetAttributeDefinitionContainer() const { return m_mapAttributesContainer; }
-
-	typedef CUtlMap<int, CEconCraftingRecipeDefinition*, int, CDefLess<int> > RecipeDefinitionMap_t;
-	const RecipeDefinitionMap_t& GetRecipeDefinitionMap() const { return m_mapRecipes; }
-	const CUtlMap<const char*, CEconItemSetDefinition, int >& GetItemSets() const { return m_mapItemSets; }
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-	const ArmoryStringDict_t& GetArmoryDataItemClasses() const { return m_dictArmoryItemClassesDataStrings; }
-	const ArmoryStringDict_t& GetArmoryDataItemTypes() const { return m_dictArmoryItemTypesDataStrings; }
-	const ArmoryStringDict_t& GetArmoryDataItems() const { return m_dictArmoryItemDataStrings; }
-	const ArmoryStringDict_t& GetArmoryDataAttributes() const { return m_dictArmoryAttributeDataStrings; }
-#endif
-
-	const CTimedItemRewardDefinition* GetTimedReward(eTimedRewardType type) const;
-
-	const CEconLootListDefinition* GetLootListByName(const char* pListName, int* out_piIndex = NULL) const;
-	const CEconLootListDefinition* GetLootListByIndex(int iIdx) const { return m_dictLootLists.IsValidIndex(iIdx) ? &(m_dictLootLists[iIdx]) : NULL; }
-
-	virtual void PurgeLootLists(void) { m_dictLootLists.Purge(); }
-	virtual const IEconLootListDefinition* GetLootListInterfaceByName(const char* pListName, int* out_piIndex = NULL) { return GetLootListByName(pListName, out_piIndex); }
-	virtual const IEconLootListDefinition* GetLootListInterfaceByIndex(int iIdx) const { return GetLootListByIndex(iIdx); }
-	virtual const int GetLootListIndex(const char* pListName) { return m_dictLootLists.Find(pListName); }
-	virtual const int GetLootListInterfaceCount(void) const { return m_dictLootLists.Count(); }
-
-	const CEconItemSetDefinition* GetItemSet(const char* pSetName, int* piIndex = NULL) const;
-	const CEconItemSetDefinition* GetItemSetByIndex(int iIdx) const { return m_mapItemSets.IsValidIndex(iIdx) ? &(m_mapItemSets[iIdx]) : NULL; }
-
-	uint8 GetDefaultQuality() const { return AE_UNIQUE; }
-
-	virtual int GetItemSetCount(void) const { return m_mapItemSets.Count(); }
-	virtual const IEconItemSetDefinition* GetItemSet(int iIndex) const;
-
-	void AssignDefaultBodygroupState(const char* pszBodygroupName, int iValue);
-
-	equip_region_mask_t GetEquipRegionMaskByName(const char* pRegionName) const;
-
-	struct EquipRegion
-	{
-		CUtlConstString		m_sName;
-		unsigned int		m_unBitIndex;		                       
-		equip_region_mask_t m_unMask;			    
-	};
-
-	typedef CUtlVector<EquipRegion>		EquipRegionsList_t;
-	const EquipRegionsList_t& GetEquipRegionsList() const { return m_vecEquipRegionsList; }
-
-	virtual KeyValues* FindDefinitionPrefabByName(const char* pszPrefabName) const;
-
-	equip_region_mask_t GetEquipRegionBitMaskByName(const char* pRegionName) const;
-
-	CUtlVector< CEconItemDefinition* >& GetBundles() { return m_vecBundles; }	       
-
-private:
-	void SetEquipRegionConflict(int iRegion, unsigned int unBit);
-	int GetEquipRegionIndexByName(const char* pRegionName) const;
-
-public:
-	bool BGetItemQualityFromName(const char* pchName, uint8* nQuality) const;
-	const CEconItemQualityDefinition* GetQualityDefinition(int nQuality) const;
-	const CEconItemQualityDefinition* GetQualityDefinitionByName(const char* pszDefName) const;
-	virtual int GetQualityDefinitionCount(void) { return m_mapQualities.Count(); }
-	virtual const char* GetQualityName(uint8 iQuality);
-	virtual int GetQualityIndex(const char* pszQuality);
-	bool BGetItemRarityFromName(const char* pchName, uint8* nRarity) const;
-	const CEconItemRarityDefinition* GetRarityDefinitionByMapIndex(int nRarityIndex) const;
-	const CEconItemRarityDefinition* GetRarityDefinition(int nRarity) const;
-	const CEconItemRarityDefinition* GetRarityDefinitionByName(const char* pszDefName) const;
-	virtual int GetRarityDefinitionCount(void) const { return m_mapRarities.Count(); }
-	virtual const char* GetRarityName(uint8 iRarity);
-	virtual const char* GetRarityLocKey(uint8 iRarity);
-	virtual const char* GetRarityColor(uint8 iRarity);
-	virtual const char* GetRarityLootList(uint8 iRarity);
-	virtual int GetRarityIndex(const char* pszRarity);
-	CEconItemDefinition* GetItemDefinitionMutable(int iItemIndex, bool bNoDefault = false);
-	const CEconItemDefinition* GetItemDefinition(int iItemIndex, bool bNoDefault = false) const;
-	const CEconItemDefinition* GetItemDefinitionByMapIndex(int iMapIndex) const;
-	const CEconItemAttributeDefinition* GetAttributeDefinition(int iAttribIndex) const;
-	virtual const IEconItemAttributeDefinition* GetAttributeDefinitionInterface(int iAttribIndex) const { return GetAttributeDefinition(iAttribIndex); }
-	const CEconItemAttributeDefinition* GetAttributeDefinitionByName(const char* pszDefName) const;
-	const CEconCraftingRecipeDefinition* GetRecipeDefinition(int iRecipeIndex) const;
-	int GetPaintKitDefinitionCount(void) const { return m_mapPaintKits.Count(); }
-	void AddPaintKitDefinition(int iPaintKitID, CPaintKit* pPaintKit);
-	void RemovePaintKitDefinition(int iPaintKitID);
-	const unsigned int GetPaintKitCount() const;
-	const CPaintKit* GetPaintKitDefinition(int iPaintKitID) const;
-	const CPaintKit* GetPaintKitDefinitionByMapIndex(int iMapIndex);
-	const CPaintKit* GetPaintKitDefinitionByName(const char* pchName) const;
-
-	int GetStickerKitDefinitionCount(void) const { return m_mapStickerKits.Count(); }
-	void AddStickerKitDefinition(int iStickerKitID, CStickerKit* pStickerKit);
-	void RemoveStickerKitDefinition(int iStickerKitID);
-	const CStickerKit* GetStickerKitDefinition(int iStickerKitID) const;
-	const CStickerKit* GetStickerKitDefinitionByMapIndex(int iMapIndex);
-	const CStickerKit* GetStickerKitDefinitionByName(const char* pchName) const;
-	const CStickerList* GetStickerListDefinitionByName(const char* pchName) const;
-	const CEconMusicDefinition* GetMusicKitDefinitionByName(const char* pchName) const;
-
-	const CEconColorDefinition* GetColorDefinitionByName(const char* pszDefName) const;
-
-	int GetGraffitiTintMaxValidDefID() const { return m_nMaxValidGraffitiTintDefID; }
-	const CEconGraffitiTintDefinition* GetGraffitiTintDefinitionByID(int nID) const;
-	const CEconGraffitiTintDefinition* GetGraffitiTintDefinitionByName(const char* pszDefName) const;
-
-	const CEconMusicDefinition* GetMusicDefinition(uint32 unMusicID) const;
-
-	CEconQuestDefinition* GetQuestDefinition(uint32 unQuestID) const;
-	const QuestDefinitionsList_t& GetQuestDefinitionMap(void) const { return m_mapQuestDefs; }
-
-	const QuestEventsSchedule_t& GetAndUpdateQuestEventsSchedule(void);
-	const QuestEvents_t& GetQuestEvents(void) const { return m_vecQuestEvents; }
-
-	CEconCampaignDefinition* GetCampaignDefinition(uint32 unCampaignID) const;
-	const CampaignDefinitionsList_t& GetCampaignDefinitionMap(void) const { return m_mapCampaignDefs; }
-
-	virtual int GetToolType(const char* pszToolType) const { return -1; }
-	virtual int GetNumPrefabs(void) { return m_mapDefinitionPrefabs.Count(); }
-	virtual const char* GetPrefabName(int idx) { return m_mapDefinitionPrefabs.Key(idx); }
-
-	const CEconSoundMaterialDefinition* GetSoundMaterialDefinitionByID(int nSoundMaterialID) const;
-	const CEconSoundMaterialDefinition* GetSoundMaterialDefinitionByName(const char* pszSoundMaterialName) const;
-	virtual const char* GetSoundMaterialNameByID(int nSoundMaterialID);
-	virtual int GetSoundMaterialID(const char* pszSoundMaterial);
-
-	virtual int GetSoundMaterialCount(void) { return m_mapSoundMaterials.Count(); }
-	virtual int GetSoundMaterialIDByIndex(int nIndex);
-
-#ifdef CLIENT_DLL
-	EWebResourceStatus LoadWebResource(CUtlString pszName, void (*fnCallback)(const char*, KeyValues*), bool bForceReload = false);
-	void SetWebResource(CUtlString strName, KeyValues* pResourceKV);
-#endif
-
-	const CProPlayerData* GetProPlayerDataByAccountID(uint32 unAccountID) const;
-	const CUtlVector< const CProPlayerData* >* GetProPlayersDataForEventIDTeamID(int nEventID, int nTeamID) const;
-
-	virtual uint32 GetHeroID(const char* pszHeroName) { return 0; }
-
-	bool BCanGSCreateItems(uint32 unIP) const;
-	const AchievementAward_t* GetAchievementRewardByDefIndex(uint16 usDefIndex) const;
-	bool BHasAchievementRewards(void) const { return (m_dictAchievementRewards.Count() > 0); }
-
-	static CUtlString ComputeAchievementName(AppId_t unAppID, const char* pchNativeAchievementName);
-
-	CEconItemDefinition* GetItemDefinitionByName(const char* pszDefName);
-	const CEconItemDefinition* GetItemDefinitionByName(const char* pszDefName) const;
-
-	attachedparticlesystem_t* GetAttributeControlledParticleSystem(int id);
-	attachedparticlesystem_t* GetAttributeControlledParticleSystemByIndex(int id);
-	attachedparticlesystem_t* FindAttributeControlledParticleSystem(const char* pchSystemName, int* outID = NULL);
-	typedef CUtlMap<int, attachedparticlesystem_t, int, CDefLess<int> > ParticleDefinitionMap_t;
-	const ParticleDefinitionMap_t& GetAttributeControlledParticleSystems() const { return m_mapAttributeControlledParticleSystems; }
-	virtual int GetNumAttributeControlledParticleSystems() const { return GetAttributeControlledParticleSystems().Count(); }
-
-	const KillEaterScoreMap_t& GetKillEaterScoreTypes() const { return m_mapKillEaterScoreTypes; }
-
-	const kill_eater_score_type_t* FindKillEaterScoreType(uint32 unScoreType) const;
-
-	const CUtlVector<attr_type_t>& GetAttributeTypes() const { return m_vecAttributeTypes; }
-	const ISchemaAttributeType* GetAttributeType(const char* pszAttrTypeName) const;
-
-	const LevelBlockDict_t& GetItemLevelingDataDict() const { return m_vecItemLevelingData; }
-
-	const CUtlVector<CItemLevelingDefinition>* GetItemLevelingData(const char* pszLevelBlockName) const
-	{
-		LevelBlockDict_t::IndexType_t i = m_vecItemLevelingData.Find(pszLevelBlockName);
-		if (i == LevelBlockDict_t::InvalidIndex())
-			return NULL;
-
-		return m_vecItemLevelingData[i];
-	}
-
-	const CItemLevelingDefinition* GetItemLevelForScore(const char* pszLevelBlockName, uint32 unScore) const;
-	const char* GetKillEaterScoreTypeLocString(uint32 unScoreType) const;
-	bool GetKillEaterScoreTypeUseLevelData(uint32 unScoreType) const;
-	const char* GetKillEaterScoreTypeLevelingDataName(uint32 unScoreType) const;
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-	virtual void ItemTesting_CreateTestDefinition(int iCloneFromItemDef, int iNewDef, KeyValues* pNewKV);
-	virtual void ItemTesting_DiscardTestDefinition(int iDef);
-#endif
-
-	econ_tag_handle_t GetHandleForTag(const char* pszTagName);			         
-
-	typedef CUtlDict<econ_tag_handle_t> EconTagDict_t;
-
-public:
-	virtual CEconItemDefinition* CreateEconItemDefinition() { return new CEconItemDefinition; }
-	virtual CEconCraftingRecipeDefinition* CreateCraftingRecipeDefinition() { return new CEconCraftingRecipeDefinition; }
-	virtual CEconStyleInfo* CreateEconStyleInfo() { return new CEconStyleInfo; }
-
-	virtual IEconTool* CreateEconToolImpl(const char* pszToolType, const char* pszUseString, const char* pszUsageRestriction, item_capabilities_t unCapabilities, KeyValues* pUsageKV);
-	virtual int GetItemDefinitionCount() { return m_mapItems.Count(); }
-
-	AlternateIconData_t* GetAlternateIcon(uint64 ullAlternateIcon);
-
-	typedef CUtlMap< uint64, AlternateIconData_t, int, CDefLess<uint64> >	AlternateIconsMap_t;
-	AlternateIconsMap_t& GetAlternateIconsMap() { return m_mapAlternateIcons; }
-
-
-protected:
-	virtual void Reset(void);
-
-	virtual KeyValues* GetRawDefinition(void) const { return m_pKVRawDefinition; }
-	virtual IEconItemDefinition* GetItemDefinitionInterface(int iDefIndex) { return GetItemDefinitionMutable(iDefIndex, true); }
-	virtual int GetLoadoutSlotCount() { return 0; }
-	virtual const char* GetLoadoutSlotName(int iSlot) { return NULL; }
-	virtual int GetLoadoutSlot(const char* pszSlotName) { return 0; }
-	virtual int GetCharacterSlotType(int iCharacter, int iSlot) { return 0; }
-	virtual int GetCharacterID(const char* pszCharacterName) { return 0; }
-	virtual bool DeleteItemDefinition(int iDefIndex);
-	virtual int GetCharacterCount(void) { return 0; }
-	virtual const char* GetCharacterName(int iCharacter) { return NULL; }
-	virtual const char* GetCharacterModel(int iCharacter) { return NULL; }
-
-	virtual int CalculateNumberOfConcreteItems(const CEconItemDefinition* pItemDef);	       
-
-	virtual bool BInitItems(KeyValues* pKVItems, CUtlVector<CUtlString>* pVecErrors);
-	virtual bool BInitItemMappings(CUtlVector<CUtlString>* pVecErrors);
-	virtual bool BInitBundles(CUtlVector<CUtlString>* pVecErrors);
-	virtual bool BInitPaymentRules(CUtlVector<CUtlString>* pVecErrors);
-	virtual bool BInitItemSets(KeyValues* pKVItemSets, CUtlVector<CUtlString>* pVecErrors);
-
-private:
-	bool BInitGameInfo(KeyValues* pKVGameInfo, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitAttributeTypes(CUtlVector<CUtlString>* pVecErrors);
-	bool BInitDefinitionPrefabs(KeyValues* pKVPrefabs, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitRarities(KeyValues* pKVRarities, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitQualities(KeyValues* pKVAttributes, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitColors(KeyValues* pKVColors, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitGraffitiTints(KeyValues* pKVColors, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitAttributes(KeyValues* pKVAttributes, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitEquipRegions(KeyValues* pKVEquipRegions, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitEquipRegionConflicts(KeyValues* pKVEquipRegions, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitTimedRewards(KeyValues* pKVTimeRewards, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitAchievementRewards(KeyValues* pKVTimeRewards, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitRecipes(KeyValues* pKVRecipes, CUtlVector<CUtlString>* pVecErrors);
-	virtual bool BInitLootLists(KeyValues* pKVLootLists, KeyValues* pKVRandomAttributeTemplates, CUtlVector<CUtlString>* pVecErrors, bool bServerLists);
-	bool BInitRevolvingLootLists(KeyValues* pKVRevolvingLootLists, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitQuestRewardLootLists(KeyValues* pKVQuestRewardLootLists, CUtlVector<CUtlString>* pVecErrors);
-#ifdef TF_CLIENT_DLL
-	bool BInitConcreteItemCounts(CUtlVector<CUtlString>* pVecErrors);
-#endif
-	bool BInitItemLevels(KeyValues* pKVItemLevels, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitKillEaterScoreTypes(KeyValues* pKVItemLevels, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitAlternateIcons(KeyValues* pKVAlternateIcons, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitAlternateIcon(uint64 ullAltIconKey, char const* szSimpleName, KeyValues* pKVAlternateIcon, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitStickerKits(KeyValues* pKVStickerKits, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitSoundMaterials(KeyValues* pKVSoundMaterials, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitStickerLists(KeyValues* pKVStickerKits, CUtlVector<CUtlString>* pVecErrors);
-
-	bool BInitPaintKits(KeyValues* pKVPaintKits, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitPaintKitsRarity(KeyValues* pKVPaintKitsRarity, CUtlVector<CUtlString>* pVecErrors);
-
-	bool BInitMusicDefs(KeyValues* pKVMusicDefs, CUtlVector<CUtlString>* pVecErrors);
-
-	bool BInitQuestDefs(KeyValues* pKVQuestDefs, CUtlVector<CUtlString>* pVecErrors);
-
-	bool BInitQuestEvents(KeyValues* pKVQuestEvents, CUtlVector<CUtlString>* pVecErrors);
-
-	bool BInitCampaignDefs(KeyValues* pKVCampaignDefs, CUtlVector<CUtlString>* pVecErrors);
-
-	bool BInitProPlayers(KeyValues* pKVData, CUtlVector<CUtlString>* pVecErrors);
-
-#ifdef CLIENT_DLL
-	bool BInitWebResources(KeyValues* pKVWebResources, CUtlVector<CUtlString>* pVecErrors);
-#endif
-
-	bool BPostSchemaInitStartupChecks(CUtlVector<CUtlString>* pVecErrors);
-
-	virtual attachedparticlesystem_t GetAttachedParticleSystemInfo(KeyValues* pParticleSystemKV, int32 nItemIndex) const;
-	virtual bool BInitAttributeControlledParticleSystems(KeyValues* pKVParticleSystems, CUtlVector<CUtlString>* pVecErrors);
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-	bool BInitArmoryData(KeyValues* pKVArmoryData, CUtlVector<CUtlString>* pVecErrors);
-#else
-	bool BInitExperiements(KeyValues* pKVExperiments, CUtlVector<CUtlString>* pVecErrors);
-	bool BInitForeignImports(CUtlVector<CUtlString>* pVecErrors);
-
-	CForeignAppImports* FindOrAddAppImports(AppId_t unAppID);
-#endif
-
-protected:
-	virtual bool BInitSchema(KeyValues* pKVRawDefinition, CUtlVector<CUtlString>* pVecErrors = NULL);
-private:
-	bool			m_bSchemaUpdatesEnabled;
-
-	uint32			m_unResetCount;
-
-	KeyValues* m_pKVRawDefinition;
-	uint32			m_unVersion;
-
-	equipped_class_t	m_unFirstValidClass;
-	equipped_class_t	m_unLastValidClass;
-
-	equipped_slot_t		m_unFirstValidItemSlot;
-	equipped_slot_t		m_unLastValidItemSlot;
-
-	uint32			m_unNumItemPresets;
-
-	uint32			m_unMinLevel;
-	uint32			m_unMaxLevel;
-
-	uint32			m_unSumQualityWeights;
-
-	CUtlVector<attr_type_t>								m_vecAttributeTypes;
-
-	CUtlMap<int, CEconItemRarityDefinition, int, CDefLess<int> >		m_mapRarities;
-
-	CUtlMap<int, CEconItemQualityDefinition, int, CDefLess<int> >		m_mapQualities;
-
-	ItemDefinitionMap_t									m_mapItems;
-
-	SortedItemDefinitionMap_t							m_mapItemsSorted;
-
-	CEconItemDefinition* m_pDefaultItemDefinition;
-
-	EconAttrDefsContainer_t								m_mapAttributesContainer;
-
-	RecipeDefinitionMap_t								m_mapRecipes;
-
-	CUtlMap<const char*, CEconItemSetDefinition, int >	m_mapItemSets;
-
-	CUtlMap<int, const char*, int, CDefLess<int> >	m_mapRevolvingLootLists;
-
-	CUtlMap<int, const char*, int, CDefLess<int> >	m_mapQuestRewardLootLists;
-
-	LootListDefinitionDict_t							m_dictLootLists;
-
-	CUtlVector<CTimedItemRewardDefinition>				m_vecTimedRewards;
-
-	CUtlDict<CWebResource*, int>						m_dictWebResources;
-
-	AlternateIconsMap_t	m_mapAlternateIcons;
-
-	CUtlDict< AchievementAward_t*, int >				m_dictAchievementRewards;
-	CUtlMap< uint32, AchievementAward_t*, int, CDefLess<uint32> >				m_mapAchievementRewardsByData;
-
-	CUtlMap<int, CPaintKit*, int, CDefLess<int> >						m_mapPaintKits;
-
-	CUtlMap<int, CStickerKit*, int, CDefLess<int> >					m_mapStickerKits;
-	CUtlDict< CStickerKit*, int >						m_dictStickerKits;
-
-	CUtlDict< CStickerList*, int >						m_dictStickerLists;
-
-	CUtlMap<int, attachedparticlesystem_t, int, CDefLess<int> >				m_mapAttributeControlledParticleSystems;
-
-	EquipRegionsList_t									m_vecEquipRegionsList;
-
-	CUtlMap<const char*, KeyValues*, int>			m_mapDefinitionPrefabs;
-
-	ColorDefinitionsList_t								m_vecColorDefs;
-	CUtlVector< CEconGraffitiTintDefinition* >			m_vecGraffitiTintDefs;
-	CUtlStringMap< CEconGraffitiTintDefinition* >		m_mapGraffitiTintByName;
-	int													m_nMaxValidGraffitiTintDefID;
-
-	MusicDefinitionsList_t								m_mapMusicDefs;
-
-	QuestDefinitionsList_t								m_mapQuestDefs;
-
-	CampaignDefinitionsList_t							m_mapCampaignDefs;
-
-	QuestEvents_t										m_vecQuestEvents;
-	QuestEventsSchedule_t								m_mapQuestEventsSchedule;
-
-	typedef CUtlMap< uint32, CProPlayerData*, int, CDefLess< uint32 > > MapProPlayersByAccountID_t;
-	typedef CUtlStringMap< CProPlayerData* > MapProPlayersByName_t;
-	typedef CUtlMap< uint64, CUtlVector< const CProPlayerData* >*, int, CDefLess< uint64 > > MapProPlayersByEventIDTeamID_t;
-	MapProPlayersByAccountID_t m_mapProPlayersByAccountID;
-	MapProPlayersByName_t m_mapProPlayersByCode;
-	MapProPlayersByEventIDTeamID_t m_mapProPlayersByEventIDTeamID;
-
-	CUtlMap<int, CEconSoundMaterialDefinition, int, CDefLess<int> >	m_mapSoundMaterials;
-
-	BodygroupStateMap_t									m_mapDefaultBodygroupState;
-
-	EconTagDict_t										m_dictTags;
-
-	KillEaterScoreMap_t									m_mapKillEaterScoreTypes;
-
-	LevelBlockDict_t m_vecItemLevelingData;
-
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-	ArmoryStringDict_t m_dictArmoryItemTypesDataStrings;
-	ArmoryStringDict_t m_dictArmoryItemClassesDataStrings;
-	ArmoryStringDict_t m_dictArmoryAttributeDataStrings;
-	ArmoryStringDict_t m_dictArmoryItemDataStrings;
-
-	IDelayedSchemaData* m_pDelayedSchemaData;
-#endif
-
-	CUtlVector< CEconItemDefinition* > m_vecBundles;	      
-
-	static CUniformRandomStream m_RandomStream;      
-
-	bool m_bSchemaParsingItems;
-};
-
-extern CEconItemSchema& GEconItemSchema();
-
-template < class T >
-class CSchemaFieldHandle
-{
-public:
-	explicit CSchemaFieldHandle(const char* szName)
-		: m_szName(szName)
-	{
-		m_pRef = GetTypedRef();
-		m_unSchemaGeneration = GEconItemSchema().GetResetCount();
-#if _DEBUG
-		m_unVersion_Debug = GEconItemSchema().GetVersion();
-#endif
-	}
-
-	operator const T* (void) const
-	{
-		uint32 unSchemaGeneration = GEconItemSchema().GetResetCount();
-		if (m_unSchemaGeneration != unSchemaGeneration)
-		{
-			m_pRef = GetTypedRef();
-			m_unSchemaGeneration = unSchemaGeneration;
-#if _DEBUG
-			m_unVersion_Debug = GEconItemSchema().GetVersion();
-#endif
-		}
-
-#if _DEBUG
-		Assert(m_unVersion_Debug == GEconItemSchema().GetVersion());
-#endif
-		return m_pRef;
-	}
-
-	const T* operator->(void) const
-	{
-		return static_cast<const T*>(*this);
-	}
-
-	const char* GetName(void) const
-	{
-		return m_szName;
-	}
-
-private:
-	const T* GetTypedRef() const;
-
-private:
-	const char* m_szName;
-
-	mutable const T* m_pRef;
-	mutable uint32 m_unSchemaGeneration;
-#if _DEBUG
-	mutable uint32 m_unVersion_Debug;
-#endif
-};
-
-template < >
-inline const CEconColorDefinition* CSchemaFieldHandle<CEconColorDefinition>::GetTypedRef(void) const
-{
-	return GEconItemSchema().GetColorDefinitionByName(m_szName);
-}
-
-template < >
-inline const CEconItemAttributeDefinition* CSchemaFieldHandle<CEconItemAttributeDefinition>::GetTypedRef(void) const
-{
-	return GEconItemSchema().GetAttributeDefinitionByName(m_szName);
-}
-
-template < >
-inline const CEconItemDefinition* CSchemaFieldHandle<CEconItemDefinition>::GetTypedRef(void) const
-{
-	return GEconItemSchema().GetItemDefinitionByName(m_szName);
-}
-
-template < >
-inline const CEconLootListDefinition* CSchemaFieldHandle<CEconLootListDefinition>::GetTypedRef(void) const
-{
-	return GEconItemSchema().GetLootListByName(m_szName);
-}
-
-typedef CSchemaFieldHandle<CEconColorDefinition>			CSchemaColorDefHandle;
-typedef CSchemaFieldHandle<CEconMusicDefinition>			CSchemaMusicDefHandle;
-typedef CSchemaFieldHandle<CEconItemAttributeDefinition>	CSchemaAttributeDefHandle;
-typedef CSchemaFieldHandle<CEconItemDefinition>				CSchemaItemDefHandle;
-typedef CSchemaFieldHandle<CEconLootListDefinition>			CSchemaLootListDefHandle;
-
-inline const CEconItemAttributeDefinition* static_attrib_t::GetAttributeDefinition() const
-{
-	return GEconItemSchema().GetAttributeDefinition(iDefIndex);
-}
-
-int StringFieldToInt(const char* szValue, const char** pValueStrings, int iNumStrings, bool bDontAssert = false);
-int StringFieldToInt(const char* szValue, const CUtlVector<const char*>& vecValueStrings, bool bDontAssert = false);
-
-enum EStickerAttributeType
-{
-	k_EStickerAttribute_ID,
-	k_EStickerAttribute_Wear,
-	k_EStickerAttribute_Scale,
-	k_EStickerAttribute_Rotation,
-	k_EStickerAttribute_Count,
-};
-const int g_nNumStickerAttrs = 6;
-const CSchemaAttributeDefHandle& GetStickerAttributeDefHandle(int attrNum, EStickerAttributeType type);
-
-enum ECampaignAttributeType
-{
-	k_ECampaignAttribute_CompletionBitfield,
-	k_ECampaignAttribute_LastCompletedQuest,
-
-};
-const int g_nNumCampaigns = 8;	         
-const CSchemaAttributeDefHandle& GetCampaignAttributeDefHandle(int nCampaignID, ECampaignAttributeType type);
-
-extern const uint32 g_unNumWearBuckets;
-uint64 Helper_GetAlternateIconKeyForWeaponPaintWearItem(item_definition_index_t nDefIdx, uint32 nPaintId, uint32 nWear);
-
-uint64 Helper_GetAlternateIconKeyForTintedStickerItem(uint32 nStickerKitID, uint32 unTintID);
-
-
-#endif 
\ No newline at end of file
diff --git a/SpyCustom/econ_item_view.h b/SpyCustom/econ_item_view.h
deleted file mode 100644
index fa8074c..0000000
--- a/SpyCustom/econ_item_view.h
+++ /dev/null
@@ -1,515 +0,0 @@
-#ifndef ECON_ITEM_CONSTANTS_H
-#define ECON_ITEM_CONSTANTS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "game_item_schema.h"
-#include "econ_item_constants.h"
-#include "localization_provider.h"
-#include "econ_item_interface.h"
-#include "econ_item.h"
-#include "utlhashtable.h"
-
-#if defined(CLIENT_DLL)
-#include "iclientrenderable.h"
-
-#if defined(CSTRIKE15)
-#include "custommaterialowner.h"
-#endif  
-
-#include "icompositetexturegenerator.h"
-
-#endif  
-
-#include "MaterialSystemUtil.h"
-
-#if defined(TF_DLL)
-#include "tf_item_schema.h"
-#endif  
-
-#if defined(CLIENT_DLL) 
-#define CEconItemView C_EconItemView
-
-#if defined(CSTRIKE15)
-typedef void (*ImageReadyCallback_t)(const CEconItemView* pItemView, CUtlBuffer& rawImageRgba, int nWidth, int nHeight, uint64 nItemID);
-struct RenderToRTData_t;
-class CMergedMDL;
-#endif  
-
-#endif  
-
-#include "econ_item_view_helpers.h"
-
-#define RGB_INT_RED  12073019
-#define RGB_INT_BLUE 5801378
-#define ECON_ITEM_GENERATED_ICON_WIDTH 512
-#define ECON_ITEM_GENERATED_ICON_HEIGHT 384
-#define ECON_ITEM_GENERATED_PINBOARD_ICON_WIDTH 512
-#define ECON_ITEM_GENERATED_PINBOARD_ICON_HEIGHT 384
-#define ECON_ITEM_GENERATED_ICON_DIR "resource/Flash/econ/weapons/cached/"
-
-#define SCHEMA_BASE_ITEM_MAX 499           
-
-class CEconItemAttribute;
-class CAttributeManager;
-
-#if defined(CSTRIKE_CLIENT_DLL)
-class IVisualsDataProcessor;
-#endif
-
-struct stickerMaterialReference_t
-{
-	CMaterialReference	m_pMaterialReferenceFirstPerson;
-	CMaterialReference	m_pMaterialReferenceThirdPerson;
-	int					m_nSlotIndex;
-};
-
-class CAttributeList
-{
-	friend class CEconItemView;
-	friend class CTFPlayer;
-
-	DECLARE_CLASS_NOBASE(CAttributeList);
-public:
-	DECLARE_EMBEDDED_NETWORKVAR();
-	DECLARE_DATADESC();
-
-	CAttributeList();
-	CAttributeList& operator=(const CAttributeList& src);
-
-	void					Init();
-	void					SetManager(CAttributeManager* pManager);
-
-	void					IterateAttributes(class IEconItemAttributeIterator* pIterator);
-
-	void					DestroyAllAttributes(void);
-
-private:
-	void					AddAttribute(CEconItemAttribute* pAttribute);
-	void					SetOrAddAttributeValueByName(const char* pszAttribDefName, float flValue);
-
-	void					RemoveAttribute(const char* pszAttribDefName);
-	void					RemoveAttributeByIndex(int iIndex);
-
-public:
-	CEconItemAttribute* GetAttributeByName(const char* pszAttribDefName);
-	const CEconItemAttribute* GetAttributeByName(const char* pszAttribDefName) const;
-
-	CEconItemAttribute* GetAttributeByClass(const char* szAttribClass);
-	const CEconItemAttribute* GetAttributeByClass(const char* szAttribClass) const;
-
-	CEconItemAttribute* GetAttributeByDefIndex(uint16 unAttrDefIndex);
-	const CEconItemAttribute* GetAttributeByDefIndex(uint16 unAttrDefIndex) const;
-
-
-	void					SetValue(CEconItemAttribute* pAttrib, float flValue);
-
-	void					UpdateManagerCache(void);
-
-private:
-	int						GetNumAttributes(void) const { return m_Attributes.Count(); }
-	CEconItemAttribute* GetAttribute(int iIndex) { Assert(iIndex >= 0 && iIndex < m_Attributes.Count()); return &m_Attributes[iIndex]; }
-	const CEconItemAttribute* GetAttribute(int iIndex) const { Assert(iIndex >= 0 && iIndex < m_Attributes.Count()); return &m_Attributes[iIndex]; }
-
-	CUtlVector<CEconItemAttribute>		m_Attributes;
-
-	CAttributeManager* m_pManager;
-};
-
-class CEconItemAttribute
-{
-	DECLARE_CLASS_NOBASE(CEconItemAttribute);
-public:
-	DECLARE_EMBEDDED_NETWORKVAR();
-
-	CEconItemAttribute(const attrib_definition_index_t iAttributeIndex, float flValue);
-	CEconItemAttribute(const attrib_definition_index_t iAttributeIndex, uint32 unValue);
-
-	CEconItemAttribute& operator=(const CEconItemAttribute& val);
-	attrib_definition_index_t			GetAttribIndex(void) const { return m_iAttributeDefinitionIndex; }
-	void			SetAttribIndex(attrib_definition_index_t iIndex) { m_iAttributeDefinitionIndex = iIndex; }
-
-	const CEconItemAttributeDefinition* GetStaticData(void) const;
-
-	float			GetValue(void) const;
-
-	uint32			GetIntValue(void) const;
-
-	float			GetInitialValue(void) const { return m_flInitialValue; }
-	int				GetRefundableCurrency(void) const { return m_nRefundableCurrency; }
-	void			AddRefundableCurrency(int nAdd) { m_nRefundableCurrency += nAdd; }
-	void			RemovedRefundableCurrency(int nSubtract) { m_nRefundableCurrency -= nSubtract; }
-
-	bool			GetSetBonus(void) { return m_bSetBonus; }
-	void			SetSetBonus(bool bBonus) { m_bSetBonus = bBonus; }
-
-private:
-	void			SetValue(float flValue);
-
-	void			SetIntValue(uint32 unValue);
-
-	friend class CAttributeList;
-	friend class CEconItemSystem;
-
-	void			Init(void);
-
-private:
-	CNetworkVar(attrib_definition_index_t, m_iAttributeDefinitionIndex);
-
-	CNetworkVar(float, m_flValue);
-
-	CNetworkVar(float, m_flInitialValue);
-	CNetworkVar(int, m_nRefundableCurrency);
-
-	CNetworkVar(bool, m_bSetBonus);         
-
-public:
-	CEconItemAttribute(void);
-};
-
-#if defined(CLIENT_DLL)
-class CEconItemView : public CDefaultClientRenderable, public IEconItemInterface, public CCustomMaterialOwner
-#else
-class CEconItemView : public IEconItemInterface
-#endif
-{
-#if defined(CLIENT_DLL) || defined(GAME_DLL)
-	DECLARE_CLASS_NOBASE(CEconItemView);
-public:
-	DECLARE_EMBEDDED_NETWORKVAR();
-	DECLARE_DATADESC();
-#endif
-
-public:
-	CEconItemView();
-	CEconItemView(const CEconItemView& src);
-	virtual ~CEconItemView();
-	CEconItemView& operator=(const CEconItemView& src);
-	bool 				operator==(const CEconItemView& other) const;
-	bool				operator!=(const CEconItemView& other) const { return !operator==(other); }
-
-	virtual const GameItemDefinition_t* GetItemDefinition() const
-	{
-		return GetStaticData();
-	}
-
-public:
-
-	virtual int32			GetQuality() const;
-	virtual int32			GetRarity() const;
-	virtual style_index_t	GetStyle() const;
-	virtual uint8			GetFlags() const;
-	virtual eEconItemOrigin GetOrigin() const;
-	virtual uint16				GetQuantity() const;
-
-	virtual const char* GetCustomName() const;
-	virtual const char* GetCustomDesc() const;
-
-	virtual int				GetItemSetIndex() const;
-
-	virtual bool			GetInUse() const { return GetSOCData() ? GetSOCData()->GetInUse() : false; }
-
-	virtual void			IterateAttributes(class IEconItemAttributeIterator* pIterator) const OVERRIDE;
-
-	bool					IsValid(void) const { return m_bInitialized; }
-	void					Invalidate(void);
-
-	void					Init(int iDefIndex, int iQuality, int iLevel, uint32 iAccountID = 0);
-	void					SetInitialized(bool bInit) { m_bInitialized = bInit; }
-	bool					Init(CEconItem* pItem);
-
-	const GameItemDefinition_t* GetStaticData(void) const;
-
-	void					SetNonSOEconItem(CEconItem* pItem) { m_pNonSOEconItem = pItem; }
-
-	void					MarkDescriptionDirty(void);
-
-	virtual bool			IsStyleUnlocked(int iStyle) const;
-
-private:
-	void					EnsureDescriptionIsBuilt(void) const;
-public:
-	void					SetGrayedOutReason(const char* pszGrayedOutReason);
-
-	void					SetItemIndex(item_definition_index_t iIndex) { m_iItemDefinitionIndex = iIndex; MarkDescriptionDirty(); }
-	item_definition_index_t	GetItemIndex(void) const { return m_iItemDefinitionIndex; }
-
-	void					SetItemQuality(int iQuality) { m_iEntityQuality = iQuality; MarkDescriptionDirty(); }
-	int						GetItemQuality(void) const { return m_iEntityQuality; }
-	void					SetItemLevel(uint32 unLevel) { m_iEntityLevel = unLevel; MarkDescriptionDirty(); }
-	uint32					GetItemLevel(void) const { return m_iEntityLevel; }
-
-	int						GetItemQuantity() const;
-#ifdef CLIENT_DLL
-	void					SetIsStoreItem(bool bIsStoreItem) { m_bIsStoreItem = bIsStoreItem; MarkDescriptionDirty(); }
-	void					SetIsTradeItem(bool bIsTradeItem) { m_bIsTradeItem = bIsTradeItem; MarkDescriptionDirty(); }
-	void					SetItemQuantity(int iQuantity) { m_iEntityQuantity = iQuantity; MarkDescriptionDirty(); }
-	void					SetClientItemFlags(uint8 unFlags);
-	void					SetItemRarityOverride(int iRarity) { m_iRarityOverride = iRarity; MarkDescriptionDirty(); }
-	void					SetItemQualityOverride(int iQuality) { m_iQualityOverride = iQuality; MarkDescriptionDirty(); }
-	void					SetItemStyleOverride(style_index_t unNewStyleOverride);
-#endif
-	style_index_t			GetItemStyle() const;
-
-	void					SetItemID(itemid_t iIdx) { m_iItemID = iIdx; m_iItemIDHigh = (m_iItemID >> 32); m_iItemIDLow = (m_iItemID & 0xFFFFFFFF); }
-#ifdef CLIENT_DLL
-	virtual itemid_t		GetItemID(void) const { uint64 iTmp = ((((int64)m_iItemIDHigh) << 32) | m_iItemIDLow); return (itemid_t)iTmp; }
-#else
-	itemid_t				GetItemID(void) const { return m_iItemID; }
-#endif
-	uint32					GetItemIDHigh(void) const { return m_iItemIDHigh; }
-	uint32					GetItemIDLow(void)  const { return m_iItemIDLow; }
-
-	itemid_t				GetFauxItemIDFromDefinitionIndex(void) const;
-
-	uint32					GetAccountID(void) const { return m_iAccountID; }
-
-	void					SetInventoryPosition(uint32 iPosition) { m_iInventoryPosition = iPosition; }
-	const uint32			GetInventoryPosition(void) const { return m_iInventoryPosition; }
-
-	const char* GetInventoryModel(void);
-	const char* GetInventoryImage(void) const;
-	bool					HasGeneratedInventoryImage(void) const;
-	bool					GetInventoryImageData(int* iPosition, int* iSize);
-	const char* GetInventoryOverlayImage(int idx);
-	int						GetInventoryOverlayImageCount(void);
-
-	IMaterial* GetToolStickerMaterial(void);
-	bool					IsStickerTool(void);
-
-	const char* GetPlayerDisplayModel(int iClass = 0) const;
-
-	const char* GetWorldDisplayModel();
-	const char* GetExtraWearableModel();
-	const char* GetIconDisplayModel();
-	const char* GetBuyMenuDisplayModel();
-	const char* GetWorldDroppedModel();
-	const char* GetPedestalDisplayModel();
-	const char* GetMagazineModel();
-
-	const char* GetScopeLensMaskModel();
-
-	const char* GetStatTrakModelByType(int nStatTrakType);
-
-	const char* GetUidModel();
-
-	int						GetAnimationSlot(void);
-
-	int						GetDropType(void);
-
-	void					DestroyAllAttributes(void);
-
-	void					AddAttribute(CEconItemAttribute* pAttribute);
-
-	void					SetOrAddAttributeValueByName(const char* pszAttribDefName, float flValue);
-
-	void					InitNetworkedDynamicAttributesForDemos(void);
-	void					UpdateNetworkedDynamicAttributesForDemos(attrib_definition_index_t nDef, float flNewValue);
-
-#if defined(CSTRIKE_CLIENT_DLL)
-	void					UpdateGeneratedMaterial(bool bIgnorePicMip = false, CompositeTextureSize_t diffuseTextureSize = COMPOSITE_TEXTURE_SIZE_512);
-#endif  
-
-	const char* GetStickerSlotModelBySlotIndex(int nIndex);
-	int						GetNumSupportedStickerSlots(void);
-	Vector					GetStickerSlotWorldProjectionStartBySlotIndex(int nIndex);
-	Vector					GetStickerSlotWorldProjectionEndBySlotIndex(int nIndex);
-	const char* GetStickerWorldModelBoneParentNameBySlotIndex(int nIndex);
-	const char* GetStickerSlotMaterialBySlotIndex(int nIndex);
-	IMaterial* GetStickerIMaterialBySlotIndex(int nIndex, bool bThirdPerson = false);
-	void					GenerateStickerMaterials(void);
-	bool					ItemHasAnyStickersApplied(void);
-	bool					ItemHasAnyFreeStickerSlots(void);
-	int						GetStickerSlotFirstFreeFromIndex(int nIndex = 0);
-
-
-	void					SetCustomNameOverride(const char* pszCustomName);
-
-	virtual void            GenerateKillEaterTypeVector(void);
-	virtual void            GetKillEaterTypes(CUtlSortVector<uint32>& types);
-	virtual int32           GetKillEaterValueByType(uint32 uKillEaterType);
-
-
-	bool                          m_bKillEaterTypesCached;
-	CUtlSortVector<uint32>        m_vCachedKillEaterTypes;
-	int                           m_nKillEaterValuesCacheFrame;
-	CUtlHashtable<uint32, int32>  m_vCachedKillEaterValues;
-
-private:
-	void					Cleanup(void);
-
-#if defined(CSTRIKE_CLIENT_DLL)
-	void					CreateCustomWeaponMaterials(int nWeaponId, bool bIgnorePicMip, CompositeTextureSize_t diffuseTextureSize = COMPOSITE_TEXTURE_SIZE_512);
-	void					CreateCustomClothingMaterials(const char* pchSkinIdent, int nSlotId, int nTeam, bool bIgnorePicMip, CompositeTextureSize_t diffuseTextureSize = COMPOSITE_TEXTURE_SIZE_512);
-
-public:
-	void					Update(void);
-	void					SaveInventoryImageAsPNG(int nWidth, int nHeight);
-	const CUtlBuffer* GetInventoryImageRgba(int nWidth, int nHeight, ImageReadyCallback_t pImageReadyCallback);
-	bool					CanGenerateInventoryImageRgba(void);
-	void					ClearInventoryImageRgba(void);
-	bool					LoadCachedInventoryImage(void);
-	void					SaveInventoryImage(CUtlBuffer& rawImageRgba);
-	void					GenerateCachedInventoryImageName();
-
-	static void				CleanInventoryImageCacheDir(void);
-
-	void					FinishLoadCachedInventoryImage(void* pData, int numReadBytes, FSAsyncStatus_t asyncStatus);
-
-	enum AsyncFixupState_t
-	{
-		AFS_Init,					      
-		AFS_LoadingInProgress,		      
-		AFS_LoadingDone,			          
-		AFS_FixupDone,				      
-	} m_asyncFixupState;
-
-	int						m_nNumAsyncReadBytes;
-	FSAsyncStatus_t			m_asyncStatus;
-	CUtlBuffer				m_inventoryImageRgba;
-
-private:
-	static bool				m_sbHasCleanedInventoryImageCacheDir;
-
-	bool					m_bInventoryImageRgbaRequested;
-	bool					m_bInventoryImageTriedCache;
-	ImageReadyCallback_t	m_pImageReadyCallback;
-	int						m_nInventoryImageRgbaWidth;
-	int						m_nInventoryImageRgbaHeight;
-
-	FSAsyncControl_t		m_hAsyncControl;
-
-	char					m_szCurrentLoadCachedFileName[MAX_PATH];
-
-	RenderToRTData_t* m_pRenderToRTData;
-	IVTFTexture* m_pScratchVTF;
-	CMergedMDL* m_pRenderToRTMDL;
-#endif  
-
-	CUtlVector< stickerMaterialReference_t > m_pStickerMaterials;
-
-
-
-
-	void					RemoveAttribute(const char* pszAttribDefName);
-
-public:
-
-	const bool				GetCombinedAttributeClassValue(float& flValue, string_t iszAttribClass) const;
-
-	CEconItemAttribute* GetAttributeByClass(const char* szAttribClass);
-	const CEconItemAttribute* GetAttributeByClass(const char* szAttribClass) const;
-	CEconItemAttribute* GetAttributeByDefIndex(int iAttributeDefIndex);
-	const CEconItemAttribute* GetAttributeByDefIndex(int iAttributeDefIndex) const;
-	CEconItemAttribute* GetAttributeByName(const char* pszAttribDefName);
-	const CEconItemAttribute* GetAttributeByName(const char* pszAttribDefName) const;
-
-	int						  GetNumAttributes(void) const { return m_AttributeList.GetNumAttributes(); }
-	CEconItemAttribute* GetAttribute(int iIndex) { return m_AttributeList.GetAttribute(iIndex); }
-	const CEconItemAttribute* GetAttribute(int iIndex) const { return m_AttributeList.GetAttribute(iIndex); }
-	CAttributeList* GetAttributeList(void) { return m_AttributeList.Get(); }
-	const CAttributeList* GetAttributeList(void) const { return m_AttributeList.Get(); }
-
-	int						GetModifiedRGBValue(bool bAltColor = false);
-	int						GetCustomPaintKitIndex(void) const;
-
-	const char* GetCustomPaintKitDbgName(void) const;
-
-	bool					CanCollect(CEconItemView& subject);
-
-	uint64					 GetCustomUserTextureID();
-	const CPaintKit* GetCustomPaintKit(void) const;
-
-	CEconItem* GetSOCData(void) const;
-
-	bool					IsEquipped(void) const { return GetSOCData() && GetSOCData()->IsEquipped(); }
-	bool					IsEquippedForClass(equipped_class_t unClass) const { return GetSOCData() && GetSOCData()->IsEquippedForClass(unClass); }
-	void					UpdateEquippedState(equipped_class_t unClass, equipped_slot_t unSlot) { if (GetSOCData()) { GetSOCData()->UpdateEquippedState(unClass, unSlot); } }
-	equipped_slot_t			GetEquippedPositionForClass(equipped_class_t unClass) const { return GetSOCData() ? GetSOCData()->GetEquippedPositionForClass(unClass) : INVALID_EQUIPPED_SLOT; }
-
-	EItemSlot				GetSlot(void) const { return EItemSlotFromName(GetItemDefinition()->GetRawDefinition()->GetString("item_slot")); }
-
-	int						GetQualityParticleType();
-
-	int						GetSkin() const;
-
-#if defined(CSTRIKE_CLIENT_DLL)
-	IVisualsDataProcessor* GetVisualsDataProcessor(int nIndex) { return (nIndex < m_ppVisualsDataProcessors.Count()) ? m_ppVisualsDataProcessors[nIndex] : NULL; }
-	IVisualsDataProcessor* GetVisualsDataProcessorByName(const char* szName) const;
-
-	static CEconItemView* FindOrCreateEconItemViewForItemID(uint64 uiItemId);
-#else
-	typedef CUtlMap< itemid_t, uint64, int, CDefLess< itemid_t > > UtlMapLookupByID_t;
-	static UtlMapLookupByID_t s_mapLookupByID;
-#endif
-
-#if defined ( GAME_DLL )
-	void UpdateNetworkedCustomName();
-#endif
-
-protected:
-	CNetworkVar(item_definition_index_t, m_iItemDefinitionIndex);
-
-	CNetworkVar(int, m_iEntityQuality);
-
-	CNetworkVar(uint32, m_iEntityLevel);
-
-	itemid_t			m_iItemID;
-	CNetworkVar(uint32, m_iItemIDHigh);
-	CNetworkVar(uint32, m_iItemIDLow);
-
-	CNetworkVar(uint32, m_iAccountID);
-
-	CNetworkVar(uint32, m_iInventoryPosition);
-
-	CEconItem* m_pNonSOEconItem;
-
-	CNetworkVar(bool, m_bInitialized);
-
-#if defined( CLIENT_DLL )
-	bool					m_bIsStoreItem;
-	bool					m_bIsTradeItem;
-	int						m_iEntityQuantity;
-	int						m_iRarityOverride;
-	int						m_iQualityOverride;
-	uint8					m_unClientFlags;
-
-	style_index_t			m_unOverrideStyle;
-
-public:
-	const wchar_t* GetItemName(bool bUncustomized = false) const;
-
-	const class CEconItemDescription* GetDescription() const { EnsureDescriptionIsBuilt(); return m_pDescription; }
-
-private:
-	mutable class CEconItemDescription* m_pDescription;
-	mutable char* m_pszGrayedOutReason;
-
-#endif
-#if defined(CSTRIKE_CLIENT_DLL)
-	CUtlVector< IVisualsDataProcessor* > m_ppVisualsDataProcessors;
-#endif
-
-protected:
-
-#if defined(CLIENT_DLL)
-	virtual const Vector& GetRenderOrigin(void) { return vec3_origin; }
-	virtual const QAngle& GetRenderAngles(void) { return vec3_angle; }
-	virtual bool			ShouldDraw(void) { return false; }
-	virtual bool			IsTransparent(void) { return false; }
-	virtual const matrix3x4_t& RenderableToWorldTransform() { static matrix3x4_t mat; SetIdentityMatrix(mat); return mat; }
-	virtual void			GetRenderBounds(Vector& mins, Vector& maxs) { return; }
-#endif
-
-private:
-	CNetworkVarEmbedded(CAttributeList, m_AttributeList);
-	CNetworkVarEmbedded(CAttributeList, m_NetworkedDynamicAttributesForDemos);
-
-	CNetworkString(m_szCustomName, MAX_ITEM_CUSTOM_NAME_DATABASE_SIZE);
-
-	char m_szCustomNameOverride[MAX_ITEM_CUSTOM_NAME_DATABASE_SIZE];
-	GCSDK::CAutoPtr< char > m_autoptrInventoryImageGeneratedPath;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/edict.h b/SpyCustom/edict.h
deleted file mode 100644
index 6f7d014..0000000
--- a/SpyCustom/edict.h
+++ /dev/null
@@ -1,370 +0,0 @@
-#ifndef EDICT_H
-#define EDICT_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vector.h"
-#include "cmodel.h"
-#include "const.h"
-#include "iserverentity.h"
-#include "globalvars_base.h"
-#include "ICollideable.h"
-#include "iservernetworkable.h"
-#include "bitvec.h"
-#include "convar.h"
-
-struct edict_t;
-
-
-enum MapLoadType_t
-{
-	MapLoad_NewGame = 0,
-	MapLoad_LoadGame,
-	MapLoad_Transition,
-	MapLoad_Background,
-};
-
-
-class CGlobalVars : public CGlobalVarsBase
-{
-public:
-
-	CGlobalVars(bool bIsClient);
-
-public:
-
-	string_t		mapname;
-	string_t		mapGroupName;
-	int				mapversion;
-	string_t		startspot;
-	MapLoadType_t	eLoadType;		      
-	bool			bMapLoadFailed;	              
-
-	bool			deathmatch;
-	bool			coop;
-	bool			teamplay;
-	int				maxEntities;
-
-	int				serverCount;
-	edict_t* pEdicts;
-};
-
-inline CGlobalVars::CGlobalVars(bool bIsClient) :
-	CGlobalVarsBase(bIsClient)
-{
-	serverCount = 0;
-}
-
-
-class CPlayerState;
-class IServerNetworkable;
-class IServerEntity;
-
-
-#define FL_EDICT_CHANGED	(1<<0)	         
-#define FL_EDICT_FREE		(1<<1)	      
-#define FL_EDICT_FULL		(1<<2)	      
-
-#define FL_EDICT_FULLCHECK	(0<<0)           
-#define FL_EDICT_ALWAYS		(1<<3)	    
-#define FL_EDICT_DONTSEND	(1<<4)	    
-#define FL_EDICT_PVSCHECK	(1<<5)	       
-
-#define FL_EDICT_PENDING_DORMANT_CHECK	(1<<6)
-
-#define FL_EDICT_DIRTY_PVS_INFORMATION	(1<<7)
-
-#define FL_FULL_EDICT_CHANGED			(1<<8)
-
-
-#define MAX_CHANGE_OFFSETS	19
-#define MAX_EDICT_CHANGE_INFOS	100
-
-
-class CEdictChangeInfo
-{
-public:
-	unsigned short m_ChangeOffsets[MAX_CHANGE_OFFSETS];
-	unsigned short m_nChangeOffsets;
-};
-
-class CSharedEdictChangeInfo
-{
-public:
-	CSharedEdictChangeInfo()
-	{
-		m_iSerialNumber = 1;
-	}
-
-	unsigned short m_iSerialNumber;
-
-#ifdef NETWORK_VARS_ENABLED
-	CEdictChangeInfo m_ChangeInfos[MAX_EDICT_CHANGE_INFOS];
-	unsigned short m_nChangeInfos;	       
-#endif
-};
-extern CSharedEdictChangeInfo* g_pSharedChangeInfo;
-
-class IChangeInfoAccessor
-{
-public:
-	inline void SetChangeInfo(unsigned short info)
-	{
-		m_iChangeInfo = info;
-	}
-
-	inline void SetChangeInfoSerialNumber(unsigned short sn)
-	{
-		m_iChangeInfoSerialNumber = sn;
-	}
-
-	inline unsigned short	 GetChangeInfo() const
-	{
-		return m_iChangeInfo;
-	}
-
-	inline unsigned short	 GetChangeInfoSerialNumber() const
-	{
-		return m_iChangeInfoSerialNumber;
-	}
-
-private:
-	unsigned short m_iChangeInfo;
-	unsigned short m_iChangeInfoSerialNumber;
-};
-
-class CBaseEdict
-{
-public:
-
-	IServerEntity* GetIServerEntity();
-	const IServerEntity* GetIServerEntity() const;
-
-	IServerNetworkable* GetNetworkable();
-	IServerUnknown* GetUnknown();
-
-	void				SetEdict(IServerUnknown* pUnk, bool bFullEdict);
-
-	int					AreaNum() const;
-	const char* GetClassName() const;
-
-	bool				IsFree() const;
-	void				SetFree();
-	void				ClearFree();
-
-	bool				HasStateChanged() const;
-	void				ClearStateChanged();
-	void				StateChanged();
-	void				StateChanged(unsigned short offset);
-
-	void				ClearTransmitState();
-
-	void SetChangeInfo(unsigned short info);
-	void SetChangeInfoSerialNumber(unsigned short sn);
-	unsigned short	 GetChangeInfo() const;
-	unsigned short	 GetChangeInfoSerialNumber() const;
-
-public:
-
-#ifdef _XBOX
-	unsigned short m_fStateFlags;
-#else
-	int	m_fStateFlags;
-#endif	
-
-	int m_NetworkSerialNumber;	             
-
-	IServerNetworkable* m_pNetworkable;
-
-protected:
-	IServerUnknown* m_pUnk;
-
-
-public:
-
-	IChangeInfoAccessor* GetChangeAccessor();           
-	const IChangeInfoAccessor* GetChangeAccessor() const;           
-	friend void InitializeEntityDLLFields(edict_t* pEdict);
-};
-
-
-inline IServerEntity* CBaseEdict::GetIServerEntity()
-{
-	if (m_fStateFlags & FL_EDICT_FULL)
-		return (IServerEntity*)m_pUnk;
-	else
-		return 0;
-}
-
-inline bool CBaseEdict::IsFree() const
-{
-	return (m_fStateFlags & FL_EDICT_FREE) != 0;
-}
-
-
-
-inline bool	CBaseEdict::HasStateChanged() const
-{
-	return (m_fStateFlags & FL_EDICT_CHANGED) != 0;
-}
-
-inline void	CBaseEdict::ClearStateChanged()
-{
-	m_fStateFlags &= ~(FL_EDICT_CHANGED | FL_FULL_EDICT_CHANGED);
-	SetChangeInfoSerialNumber(0);
-}
-
-inline void	CBaseEdict::StateChanged()
-{
-	m_fStateFlags |= (FL_EDICT_CHANGED | FL_FULL_EDICT_CHANGED);
-}
-
-inline void	CBaseEdict::StateChanged(unsigned short offset)
-{
-#ifdef NETWORK_VARS_ENABLED
-	if (m_fStateFlags & FL_FULL_EDICT_CHANGED)
-		return;
-
-	m_fStateFlags |= FL_EDICT_CHANGED;
-
-	IChangeInfoAccessor* accessor = GetChangeAccessor();
-
-	if (accessor->GetChangeInfoSerialNumber() == g_pSharedChangeInfo->m_iSerialNumber)
-	{
-		CEdictChangeInfo* p = &g_pSharedChangeInfo->m_ChangeInfos[accessor->GetChangeInfo()];
-
-		for (unsigned short i = 0; i < p->m_nChangeOffsets; i++)
-			if (p->m_ChangeOffsets[i] == offset)
-				return;
-
-		if (p->m_nChangeOffsets == MAX_CHANGE_OFFSETS)
-		{
-			accessor->SetChangeInfoSerialNumber(0);
-			m_fStateFlags |= FL_FULL_EDICT_CHANGED;        
-		}
-		else
-		{
-			p->m_ChangeOffsets[p->m_nChangeOffsets++] = offset;
-		}
-	}
-	else
-	{
-		if (g_pSharedChangeInfo->m_nChangeInfos == MAX_EDICT_CHANGE_INFOS)
-		{
-			accessor->SetChangeInfoSerialNumber(0);
-			m_fStateFlags |= FL_FULL_EDICT_CHANGED;
-		}
-		else
-		{
-			accessor->SetChangeInfo(g_pSharedChangeInfo->m_nChangeInfos);
-			g_pSharedChangeInfo->m_nChangeInfos++;
-
-			accessor->SetChangeInfoSerialNumber(g_pSharedChangeInfo->m_iSerialNumber);
-
-			CEdictChangeInfo* p = &g_pSharedChangeInfo->m_ChangeInfos[accessor->GetChangeInfo()];
-			p->m_ChangeOffsets[0] = offset;
-			p->m_nChangeOffsets = 1;
-		}
-	}
-#else
-	StateChanged();
-#endif
-}
-
-
-
-inline void CBaseEdict::SetFree()
-{
-	m_fStateFlags |= FL_EDICT_FREE;
-}
-
-inline void CBaseEdict::ClearFree()
-{
-	m_fStateFlags &= ~FL_EDICT_FREE;
-}
-
-inline void	CBaseEdict::ClearTransmitState()
-{
-	m_fStateFlags &= ~(FL_EDICT_ALWAYS | FL_EDICT_PVSCHECK | FL_EDICT_DONTSEND);
-}
-
-inline const IServerEntity* CBaseEdict::GetIServerEntity() const
-{
-	if (m_fStateFlags & FL_EDICT_FULL)
-		return (IServerEntity*)m_pUnk;
-	else
-		return 0;
-}
-
-inline IServerUnknown* CBaseEdict::GetUnknown()
-{
-	return m_pUnk;
-}
-
-inline IServerNetworkable* CBaseEdict::GetNetworkable()
-{
-	return m_pNetworkable;
-}
-
-inline void CBaseEdict::SetEdict(IServerUnknown* pUnk, bool bFullEdict)
-{
-	m_pUnk = pUnk;
-	if ((pUnk != NULL) && bFullEdict)
-	{
-		m_fStateFlags = FL_EDICT_FULL;
-	}
-	else
-	{
-		m_fStateFlags = 0;
-	}
-}
-
-inline int CBaseEdict::AreaNum() const
-{
-	if (!m_pUnk)
-		return 0;
-
-	return m_pNetworkable->AreaNum();
-}
-
-inline const char* CBaseEdict::GetClassName() const
-{
-	if (!m_pUnk)
-		return "";
-	return m_pNetworkable->GetClassName();
-}
-
-inline void CBaseEdict::SetChangeInfo(unsigned short info)
-{
-	GetChangeAccessor()->SetChangeInfo(info);
-}
-
-inline unsigned short CBaseEdict::GetChangeInfo() const
-{
-	return GetChangeAccessor()->GetChangeInfo();
-}
-
-inline unsigned short CBaseEdict::GetChangeInfoSerialNumber() const
-{
-	return GetChangeAccessor()->GetChangeInfoSerialNumber();
-}
-
-struct edict_t : public CBaseEdict
-{
-public:
-	ICollideable* GetCollideable();
-};
-
-inline ICollideable* edict_t::GetCollideable()
-{
-	IServerEntity* pEnt = GetIServerEntity();
-	if (pEnt)
-		return pEnt->GetCollideable();
-	else
-		return NULL;
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ehandle.h b/SpyCustom/ehandle.h
deleted file mode 100644
index 0b504c5..0000000
--- a/SpyCustom/ehandle.h
+++ /dev/null
@@ -1,150 +0,0 @@
-#ifndef EHANDLE_H
-#define EHANDLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#if defined( _DEBUG ) && defined( GAME_DLL )
-#include "tier0/dbg.h"
-#include "cbase.h"
-#endif
-
-
-#include "const.h"
-#include "basehandle.h"
-#include "entitylist_base.h"
-
-#include "icliententitylist.h"
-class IHandleEntity;
-
-
-inline IHandleEntity* CBaseHandle::Get() const
-{
-	extern IClientEntityList* g_pEntityList;
-	return ((CBaseEntityList*)g_pEntityList)->LookupEntity(*this);
-}
-
-
-template< class T >
-class CHandle : public CBaseHandle
-{
-public:
-
-	CHandle();
-	CHandle(int iEntry, int iSerialNumber);
-	CHandle(const CBaseHandle& handle);
-	CHandle(T* pVal);
-
-	static CHandle<T> FromIndex(int index);
-
-	T* Get() const;
-	void	Set(const T* pVal);
-
-	operator T* ();
-	operator T* () const;
-
-	bool	operator !() const;
-	bool	operator==(T* val) const;
-	bool	operator!=(T* val) const;
-	const CBaseHandle& operator=(const T* val);
-
-	T* operator->() const;
-};
-
-
-template<class T>
-CHandle<T>::CHandle()
-{
-}
-
-
-template<class T>
-CHandle<T>::CHandle(int iEntry, int iSerialNumber)
-{
-	Init(iEntry, iSerialNumber);
-}
-
-
-template<class T>
-CHandle<T>::CHandle(const CBaseHandle& handle)
-	: CBaseHandle(handle)
-{
-}
-
-
-template<class T>
-CHandle<T>::CHandle(T* pObj)
-{
-	Term();
-	Set(pObj);
-}
-
-
-template<class T>
-inline CHandle<T> CHandle<T>::FromIndex(int index)
-{
-	CHandle<T> ret;
-	ret.m_Index = index;
-	return ret;
-}
-
-
-template<class T>
-inline T* CHandle<T>::Get() const
-{
-	return (T*)CBaseHandle::Get();
-}
-
-
-template<class T>
-inline CHandle<T>::operator T* ()
-{
-	return Get();
-}
-
-template<class T>
-inline CHandle<T>::operator T* () const
-{
-	return Get();
-}
-
-
-template<class T>
-inline bool CHandle<T>::operator !() const
-{
-	return !Get();
-}
-
-template<class T>
-inline bool CHandle<T>::operator==(T* val) const
-{
-	return Get() == val;
-}
-
-template<class T>
-inline bool CHandle<T>::operator!=(T* val) const
-{
-	return Get() != val;
-}
-
-template<class T>
-void CHandle<T>::Set(const T* pVal)
-{
-	CBaseHandle::Set(reinterpret_cast<const IHandleEntity*>(pVal));
-}
-
-template<class T>
-inline const CBaseHandle& CHandle<T>::operator=(const T* val)
-{
-	Set(val);
-	return *this;
-}
-
-template<class T>
-T* CHandle<T>::operator -> () const
-{
-	return Get();
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/eiface.h b/SpyCustom/eiface.h
deleted file mode 100644
index 201290a..0000000
--- a/SpyCustom/eiface.h
+++ /dev/null
@@ -1,580 +0,0 @@
-#ifndef EIFACE_H
-#define EIFACE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "convar.h"
-#include "icvar.h"
-#include "edict.h"
-#include "vplane.h"
-#include "iserverentity.h"
-#include "ivmodelinfo.h"
-#include "soundflags.h"
-#include "bitvec.h"
-#include "iserverplugin.h"
-#include "bitbuf.h"
-#include "checksum_crc.h"
-#include "iclient.h"
-
-class	SendTable;
-class	ServerClass;
-class	IMoveHelper;
-struct  Ray_t;
-class	CGameTrace;
-typedef	CGameTrace trace_t;
-struct	typedescription_t;
-class	CSaveRestoreData;
-struct	datamap_t;
-class	SendTable;
-class	ServerClass;
-class	IMoveHelper;
-struct  Ray_t;
-struct	studiohdr_t;
-class	CBaseEntity;
-class	CRestore;
-class	CSave;
-class	variant_t;
-struct	vcollide_t;
-class	IRecipientFilter;
-class	CBaseEntity;
-class	ITraceFilter;
-struct	client_textmessage_t;
-class	INetChannelInfo;
-class	ISpatialPartition;
-class IScratchPad3D;
-class CStandardSendProxies;
-class IAchievementMgr;
-class CGamestatsData;
-class CSteamID;
-class ISPSharedMemory;
-class CGamestatsData;
-class CEngineHltvInfo_t;
-class INetMessage;
-class HltvReplayParams_t;
-
-namespace google
-{
-	namespace protobuf
-	{
-		class Message;
-	}
-}
-
-typedef struct player_info_s player_info_t;
-
-typedef uint64 PublishedFileId_t;
-
-#ifdef _WIN32
-#define DLLEXPORT __stdcall
-#else
-#define DLLEXPORT  
-#endif
-
-#define INTERFACEVERSION_VENGINESERVER	"VEngineServer023"
-
-struct bbox_t
-{
-	Vector mins;
-	Vector maxs;
-};
-
-abstract_class IVEngineServer
-{
-public:
-	virtual void		ChangeLevel(const char* s1, const char* s2) = 0;
-
-	virtual int			IsMapValid(const char* filename) = 0;
-
-	virtual bool		IsDedicatedServer(void) = 0;
-
-	virtual int			IsInEditMode(void) = 0;
-
-	virtual KeyValues* GetLaunchOptions(void) = 0;
-
-	virtual int			PrecacheModel(const char* s, bool preload = false) = 0;
-	virtual int			PrecacheSentenceFile(const char* s, bool preload = false) = 0;
-	virtual int			PrecacheDecal(const char* name, bool preload = false) = 0;
-	virtual int			PrecacheGeneric(const char* s, bool preload = false) = 0;
-
-	virtual bool		IsModelPrecached(char const* s) const = 0;
-	virtual bool		IsDecalPrecached(char const* s) const = 0;
-	virtual bool		IsGenericPrecached(char const* s) const = 0;
-
-	virtual int			GetClusterForOrigin(const Vector& org) = 0;
-	virtual int			GetPVSForCluster(int cluster, int outputpvslength, unsigned char* outputpvs) = 0;
-	virtual bool		CheckOriginInPVS(const Vector& org, const unsigned char* checkpvs, int checkpvssize) = 0;
-	virtual bool		CheckBoxInPVS(const Vector& mins, const Vector& maxs, const unsigned char* checkpvs, int checkpvssize) = 0;
-
-	virtual int			GetPlayerUserId(const edict_t* e) = 0;
-	virtual const char* GetPlayerNetworkIDString(const edict_t* e) = 0;
-	virtual bool		IsUserIDInUse(int userID) = 0;	    
-	virtual int			GetLoadingProgressForUserID(int userID) = 0;	    
-
-	virtual int			GetEntityCount(void) = 0;
-
-	virtual INetChannelInfo* GetPlayerNetInfo(int playerIndex) = 0;
-
-	virtual edict_t* CreateEdict(int iForceEdictIndex = -1) = 0;
-	virtual void		RemoveEdict(edict_t* e) = 0;
-
-	virtual void* PvAllocEntPrivateData(long cb) = 0;
-	virtual void		FreeEntPrivateData(void* pEntity) = 0;
-
-	virtual void* SaveAllocMemory(size_t num, size_t size) = 0;
-	virtual void		SaveFreeMemory(void* pSaveMem) = 0;
-
-	virtual void		EmitAmbientSound(int entindex, const Vector& pos, const char* samp, float vol, soundlevel_t soundlevel, int fFlags, int pitch, float delay = 0.0f) = 0;
-
-	virtual void        FadeClientVolume(const edict_t* pEdict, float fadePercent, float fadeOutSeconds, float holdTime, float fadeInSeconds) = 0;
-
-	virtual int			SentenceGroupPick(int groupIndex, char* name, int nameBufLen) = 0;
-	virtual int			SentenceGroupPickSequential(int groupIndex, char* name, int nameBufLen, int sentenceIndex, int reset) = 0;
-	virtual int			SentenceIndexFromName(const char* pSentenceName) = 0;
-	virtual const char* SentenceNameFromIndex(int sentenceIndex) = 0;
-	virtual int			SentenceGroupIndexFromName(const char* pGroupName) = 0;
-	virtual const char* SentenceGroupNameFromIndex(int groupIndex) = 0;
-	virtual float		SentenceLength(int sentenceIndex) = 0;
-
-	virtual void		ServerCommand(const char* str) = 0;
-	virtual void		ServerExecute(void) = 0;
-	virtual void		ClientCommand(edict_t* pEdict, const char* szFmt, ...) FMTFUNCTION(3, 4) = 0;
-
-	virtual void		LightStyle(int style, const char* val) = 0;
-
-	virtual void		StaticDecal(const Vector& originInEntitySpace, int decalIndex, int entityIndex, int modelIndex, bool lowpriority) = 0;
-
-	virtual void		Message_DetermineMulticastRecipients(bool usepas, const Vector& origin, CPlayerBitVec& playerbits) = 0;
-
-	virtual bf_write* EntityMessageBegin(int ent_index, ServerClass* ent_class, bool reliable) = 0;
-
-	virtual void		MessageEnd(void) = 0;
-
-	virtual void		SendUserMessage(IRecipientFilter& filter, int message, const google::protobuf::Message& msg) = 0;
-
-	virtual void		ClientPrintf(edict_t* pEdict, const char* szMsg) = 0;
-
-	virtual void		Con_NPrintf(int pos, const char* fmt, ...) = 0;
-	virtual void		Con_NXPrintf(const struct con_nprint_s* info, const char* fmt, ...) = 0;
-
-	virtual void		SetView(const edict_t* pClient, const edict_t* pViewent) = 0;
-
-	virtual void		CrosshairAngle(const edict_t* pClient, float pitch, float yaw) = 0;
-
-	virtual void        GetGameDir(char* szGetGameDir, int maxlength) = 0;
-
-	virtual int 		CompareFileTime(const char* filename1, const char* filename2, int* iCompare) = 0;
-
-	virtual bool		LockNetworkStringTables(bool lock) = 0;
-
-	virtual edict_t* CreateFakeClient(const char* netname) = 0;
-
-	virtual const char* GetClientConVarValue(int clientIndex, const char* name) = 0;
-
-	virtual const char* ParseFile(const char* data, char* token, int maxlen) = 0;
-	virtual bool		CopyFile(const char* source, const char* destination) = 0;
-
-	virtual void		ResetPVS(byte* pvs, int pvssize) = 0;
-	virtual void		AddOriginToPVS(const Vector& origin) = 0;
-
-	virtual void		SetAreaPortalState(int portalNumber, int isOpen) = 0;
-
-	virtual void		PlaybackTempEntity(IRecipientFilter& filter, float delay, const void* pSender, const SendTable* pST, int classID) = 0;
-	virtual int			CheckHeadnodeVisible(int nodenum, const byte* pvs, int vissize) = 0;
-	virtual int			CheckAreasConnected(int area1, int area2) = 0;
-	virtual int			GetArea(const Vector& origin) = 0;
-	virtual void		GetAreaBits(int area, unsigned char* bits, int buflen) = 0;
-	virtual bool		GetAreaPortalPlane(Vector const& vViewOrigin, int portalKey, VPlane* pPlane) = 0;
-
-	virtual bool		LoadGameState(char const* pMapName, bool createPlayers) = 0;
-	virtual void		LoadAdjacentEnts(const char* pOldLevel, const char* pLandmarkName) = 0;
-	virtual void		ClearSaveDir() = 0;
-
-	virtual const char* GetMapEntitiesString() = 0;
-
-	virtual client_textmessage_t* TextMessageGet(const char* pName) = 0;
-
-	virtual void		LogPrint(const char* msg) = 0;
-	virtual bool		IsLogEnabled() = 0;
-	virtual void		BuildEntityClusterList(edict_t* pEdict, PVSInfo_t* pPVSInfo) = 0;
-
-	virtual void SolidMoved(edict_t* pSolidEnt, ICollideable* pSolidCollide, const Vector* pPrevAbsOrigin, bool testSurroundingBoundsOnly) = 0;
-	virtual void TriggerMoved(edict_t* pTriggerEnt, bool testSurroundingBoundsOnly) = 0;
-
-	virtual ISpatialPartition* CreateSpatialPartition(const Vector& worldmin, const Vector& worldmax) = 0;
-	virtual void 		DestroySpatialPartition(ISpatialPartition*) = 0;
-
-	virtual void		DrawMapToScratchPad(IScratchPad3D* pPad, unsigned long iFlags) = 0;
-
-	virtual const CBitVec<MAX_EDICTS>* GetEntityTransmitBitsForClient(int iClientIndex) = 0;
-
-	virtual bool		IsPaused() = 0;
-
-	virtual float GetTimescale(void) const = 0;
-
-	virtual void		ForceExactFile(const char* s) = 0;
-	virtual void		ForceModelBounds(const char* s, const Vector& mins, const Vector& maxs) = 0;
-	virtual void		ClearSaveDirAfterClientLoad() = 0;
-
-	virtual void		SetFakeClientConVarValue(edict_t* pEntity, const char* cvar, const char* value) = 0;
-
-	virtual void		ForceSimpleMaterial(const char* s) = 0;
-
-	virtual int			IsInCommentaryMode(void) = 0;
-
-	virtual bool		IsLevelMainMenuBackground(void) = 0;
-
-	virtual void		SetAreaPortalStates(const int* portalNumbers, const int* isOpen, int nPortals) = 0;
-
-	virtual void		NotifyEdictFlagsChange(int iEdict) = 0;
-
-	virtual const CCheckTransmitInfo* GetPrevCheckTransmitInfo(edict_t* pPlayerEdict) = 0;
-
-	virtual CSharedEdictChangeInfo* GetSharedEdictChangeInfo() = 0;
-
-	virtual void			AllowImmediateEdictReuse() = 0;
-
-	virtual bool		IsInternalBuild(void) = 0;
-
-	virtual IChangeInfoAccessor* GetChangeAccessor(const edict_t* pEdict) = 0;
-
-	virtual char const* GetMostRecentlyLoadedFileName() = 0;
-	virtual char const* GetSaveFileName() = 0;
-
-	virtual void CleanUpEntityClusterList(PVSInfo_t* pPVSInfo) = 0;
-
-	virtual void SetAchievementMgr(IAchievementMgr*) = 0;
-	virtual IAchievementMgr* GetAchievementMgr() = 0;
-
-	virtual int	GetAppID() = 0;
-
-	virtual bool IsLowViolence() = 0;
-
-	virtual bool IsAnyClientLowViolence() = 0;
-
-	virtual QueryCvarCookie_t StartQueryCvarValue(edict_t* pPlayerEntity, const char* pName) = 0;
-
-	virtual void InsertServerCommand(const char* str) = 0;
-
-	virtual bool GetPlayerInfo(int ent_num, player_info_t* pinfo) = 0;
-
-	virtual bool IsClientFullyAuthenticated(edict_t* pEdict) = 0;
-
-	virtual void SetDedicatedServerBenchmarkMode(bool bBenchmarkMode) = 0;
-
-	virtual bool IsSplitScreenPlayer(int ent_num) = 0;
-	virtual edict_t* GetSplitScreenPlayerAttachToEdict(int ent_num) = 0;
-	virtual int	GetNumSplitScreenUsersAttachedToEdict(int ent_num) = 0;
-	virtual edict_t* GetSplitScreenPlayerForEdict(int ent_num, int nSlot) = 0;
-
-	virtual bool IsOverrideLoadGameEntsOn() = 0;
-
-	virtual void ForceFlushEntity(int iEntity) = 0;
-
-	virtual ISPSharedMemory* GetSinglePlayerSharedMemorySpace(const char* szName, int ent_num = MAX_EDICTS) = 0;
-
-	virtual void* AllocLevelStaticData(size_t bytes) = 0;
-
-	virtual int GetClusterCount() = 0;
-	virtual int GetAllClusterBounds(bbox_t* pBBoxList, int maxBBox) = 0;
-
-	virtual bool IsCreatingReslist() = 0;
-	virtual bool IsCreatingXboxReslist() = 0;
-	virtual bool IsDedicatedServerForXbox() = 0;
-	virtual bool IsDedicatedServerForPS3() = 0;
-
-	virtual void Pause(bool bPause, bool bForce = false) = 0;
-
-	virtual void SetTimescale(float flTimescale) = 0;
-
-	virtual void SetGamestatsData(CGamestatsData* pGamestatsData) = 0;
-	virtual CGamestatsData* GetGamestatsData() = 0;
-
-	virtual const CSteamID* GetClientSteamID(const edict_t* pPlayerEdict, bool bValidatedIDOnly = false) = 0;
-
-	virtual const CSteamID* GetGameServerSteamID() = 0;
-
-	virtual void HostValidateSession() = 0;
-
-	virtual void RefreshScreenIfNecessary() = 0;
-
-	virtual bool HasPaintmap() = 0;
-
-	virtual bool SpherePaintSurface(const model_t* pModel, const Vector&, unsigned char, float, float) = 0;
-
-	virtual void SphereTracePaintSurface(const model_t* pModel, const Vector&, const Vector&, float, CUtlVector<unsigned char>&) = 0;
-
-	virtual void RemoveAllPaint() = 0;
-
-	virtual void PaintAllSurfaces(unsigned char) = 0;
-	virtual void RemovePaint(const model_t* pModel) = 0;
-
-	virtual void ClientCommandKeyValues(edict_t* pEdict, KeyValues* pCommand) = 0;
-
-	virtual uint64 GetClientXUID(edict_t* pPlayerEdict) = 0;
-	virtual bool IsActiveApp() = 0;
-
-	virtual void SetNoClipEnabled(bool bEnabled) = 0;
-
-	virtual void GetPaintmapDataRLE(CUtlVector<unsigned int>& mapdata) = 0;
-	virtual void LoadPaintmapDataRLE(CUtlVector<unsigned int>& mapdata) = 0;
-	virtual void SendPaintmapDataToClient(edict_t* pEdict) = 0;
-
-	virtual float GetLatencyForChoreoSounds() = 0;
-
-	virtual CrossPlayPlatform_t GetClientCrossPlayPlatform(int ent_num) = 0;
-
-	virtual void EnsureInstanceBaseline(int ent_num) = 0;
-
-	virtual bool ReserveServerForQueuedGame(const char* szReservationPayload) = 0;
-
-	virtual bool GetEngineHltvInfo(CEngineHltvInfo_t& out) = 0;
-
-	virtual void AddHltvRelayProxyWhitelist(uint32 octet1, uint32 octet2, uint32 octet3, uint32 octet4, uint32 prefix) = 0;
-
-	virtual int GetServerVersion() const = 0;
-
-	virtual void UpdateHltvExternalViewers(uint32 totalSpectators, uint32 spectatorsLinkedToSteam) = 0;
-
-	virtual bool WasShutDownRequested(void) const = 0;
-	virtual void* StartClientHltvReplay(int client , const HltvReplayParams_t&) = 0;
-	virtual void* StopClientHltvReplay(int client) = 0;
-	virtual int GetClientHltvReplayDelay(int client) = 0;
-	virtual bool HasHltvReplay(void) = 0;
-	virtual bool ClientCanStartHltvReplay(int client) = 0;
-	virtual int ClientResetReplayRequestTime(int client) = 0;
-	virtual bool AnyClientsInHltvReplayMode(void) = 0;
-};
-
-#define INTERFACEVERSION_SERVERGAMEDLL				"ServerGameDLL005"
-
-abstract_class IServerGameDLL
-{
-public:
-	virtual bool			DLLInit(CreateInterfaceFn engineFactory,
-										CreateInterfaceFn physicsFactory,
-										CreateInterfaceFn fileSystemFactory,
-										CGlobalVars * pGlobals) = 0;
-
-	virtual bool			GameInit(void) = 0;
-
-	virtual bool			LevelInit(char const* pMapName,
-									char const* pMapEntities, char const* pOldLevel,
-									char const* pLandmarkName, bool loadGame, bool background) = 0;
-
-	virtual void			ServerActivate(edict_t* pEdictList, int edictCount, int clientMax) = 0;
-
-	virtual void			GameFrame(bool simulating) = 0;
-
-	virtual void			PreClientUpdate(bool simulating) = 0;
-
-	virtual void			LevelShutdown(void) = 0;
-	virtual void			GameShutdown(void) = 0;
-
-	virtual void			DLLShutdown(void) = 0;
-
-	virtual float			GetTickInterval(void) const = 0;
-
-	virtual ServerClass* GetAllServerClasses(void) = 0;
-
-	virtual const char* GetGameDescription(void) = 0;
-
-	virtual void			CreateNetworkStringTables(void) = 0;
-
-	virtual CSaveRestoreData* SaveInit(int size) = 0;
-	virtual void			SaveWriteFields(CSaveRestoreData*, const char*, void*, datamap_t*, typedescription_t*, int) = 0;
-	virtual void			SaveReadFields(CSaveRestoreData*, const char*, void*, datamap_t*, typedescription_t*, int) = 0;
-	virtual void			SaveGlobalState(CSaveRestoreData*) = 0;
-	virtual void			RestoreGlobalState(CSaveRestoreData*) = 0;
-	virtual void			PreSave(CSaveRestoreData*) = 0;
-	virtual void			Save(CSaveRestoreData*) = 0;
-	virtual void			GetSaveComment(char* comment, int maxlength, float flMinutes, float flSeconds, bool bNoTime = false) = 0;
-	virtual void			WriteSaveHeaders(CSaveRestoreData*) = 0;
-	virtual void			ReadRestoreHeaders(CSaveRestoreData*) = 0;
-	virtual void			Restore(CSaveRestoreData*, bool) = 0;
-	virtual bool			IsRestoring() = 0;
-	virtual bool			SupportsSaveRestore() = 0;
-
-	virtual int				CreateEntityTransitionList(CSaveRestoreData*, int) = 0;
-	virtual void			BuildAdjacentMapList(void) = 0;
-
-	virtual CStandardSendProxies* GetStandardSendProxies() = 0;
-
-	virtual void			PostInit() = 0;
-	virtual void			Think(bool finalTick) = 0;
-
-#ifdef _XBOX
-	virtual void			GetTitleName(const char* pMapName, char* pTitleBuff, int titleBuffSize) = 0;
-#endif
-
-	virtual void			PreSaveGameLoaded(char const* pSaveName, bool bCurrentlyInGame) = 0;
-
-	virtual bool			ShouldHideServer(void) = 0;
-
-	virtual void			InvalidateMdlCache() = 0;
-
-	virtual void			OnQueryCvarValueFinished(QueryCvarCookie_t iCookie, edict_t* pPlayerEntity, EQueryCvarValueStatus eStatus, const char* pCvarName, const char* pCvarValue) = 0;
-
-	virtual void			PostToolsInit() = 0;
-
-	virtual void			GameServerSteamAPIActivated(bool bActivated) = 0;
-
-	virtual void			ApplyGameSettings(KeyValues* pKV) = 0;
-
-	virtual void			GetMatchmakingTags(char* buf, size_t bufSize) = 0;
-
-	virtual void			ServerHibernationUpdate(bool bHibernating) = 0;
-
-	virtual bool			ShouldPreferSteamAuth() = 0;
-
-	virtual bool			ShouldAllowDirectConnect() = 0;
-	virtual bool			FriendsReqdForDirectConnect() = 0;
-	virtual bool			IsLoadTestServer() = 0;
-	virtual bool			IsValveDS() = 0;
-	virtual KeyValues* GetExtendedServerInfoForNewClient() = 0;
-	virtual void 			UpdateGCInformation() = 0;
-	virtual void 			ReportGCQueuedMatchStart(int32 iReservationStage, uint32* puiConfirmedAccounts, int numConfirmedAccounts) = 0;
-
-	virtual PublishedFileId_t	GetUGCMapFileID(const char* mapName) = 0;
-	virtual void			GetMatchmakingGameData(char* buf, size_t bufSize) = 0;
-	virtual bool			HasPendingMapDownloads() const = 0;
-	virtual void			UpdateUGCMap(PublishedFileId_t file) = 0;
-	virtual int				GetMessageEncryptionKey(INetMessage* msg) = 0;
-	virtual bool			ShouldHoldGameServerReservation(float flTime) = 0;
-	virtual bool			OnPureServerFileValidationFailure(edict_t* pPlayer, const char* pszPathID, const char* pszFileName,
-								CRC32_t crcIOSequence, int eFileHashType, int cbFileLen, int nPackFileNumber, int nPackFileID) = 0;
-	virtual void			PrecacheParticleSystemFile(const char* pszFilename) = 0;
-	virtual void			ClientConnectionValidatePreNetChan(bool, const char*, int, unsigned long long) = 0;
-	virtual void			OnEngineClientNetworkEvent(edict_t*, unsigned long long, int, void*) = 0;
-	virtual void			GetNewestSubscribedFiles() = 0;
-	virtual bool			ValidateAndAddActiveCaster(const CSteamID&) = 0;
-};
-
-#define VENGINE_SERVER_RANDOM_INTERFACE_VERSION	"VEngineRandom001"
-
-#define INTERFACEVERSION_SERVERGAMEENTS			"ServerGameEnts001"
-abstract_class IServerGameEnts
-{
-public:
-	virtual					~IServerGameEnts() {}
-
-	virtual void			MarkEntitiesAsTouching(edict_t * e1, edict_t * e2) = 0;
-
-	virtual void			FreeContainingEntity(edict_t*) = 0;
-
-	virtual edict_t* BaseEntityToEdict(CBaseEntity* pEnt) = 0;
-	virtual CBaseEntity* EdictToBaseEntity(edict_t* pEdict) = 0;
-
-	virtual void			CheckTransmit(CCheckTransmitInfo* pInfo, const unsigned short* pEdictIndices, int nEdicts) = 0;
-
-	virtual void			PrepareForFullUpdate(edict_t* pEdict) = 0;
-};
-
-#define INTERFACEVERSION_SERVERGAMECLIENTS		"ServerGameClients004"
-
-abstract_class IServerGameClients
-{
-public:
-	virtual void			GetPlayerLimits(int& minplayers, int& maxplayers, int& defaultMaxPlayers) const = 0;
-
-	virtual bool			ClientConnect(edict_t* pEntity, const char* pszName, const char* pszAddress, char* reject, int maxrejectlen) = 0;
-
-	virtual void			ClientActive(edict_t* pEntity, bool bLoadGame) = 0;
-
-	virtual void			ClientFullyConnect(edict_t* pEntity) = 0;
-
-	virtual void			ClientDisconnect(edict_t* pEntity) = 0;
-
-	virtual void			ClientPutInServer(edict_t* pEntity, char const* playername) = 0;
-
-	virtual void			ClientCommand(edict_t* pEntity, const CCommand& args) = 0;
-
-	virtual void			SetCommandClient(int index) = 0;
-
-	virtual void			ClientSettingsChanged(edict_t* pEdict) = 0;
-
-	virtual void			ClientSetupVisibility(edict_t* pViewEntity, edict_t* pClient, unsigned char* pvs, int pvssize) = 0;
-
-	virtual float			ProcessUsercmds(edict_t* player, bf_read* buf, int numcmds, int totalcmds,
-								int dropped_packets, bool ignore, bool paused) = 0;
-
-	virtual void			PostClientMessagesSent(void) = 0;
-
-	virtual CPlayerState* GetPlayerState(edict_t* player) = 0;
-
-	virtual void			ClientEarPosition(edict_t* pEntity, Vector* pEarOrigin) = 0;
-
-	virtual bool			ClientReplayEvent(edict_t* player, void* event    ) = 0;
-
-	virtual int				GetReplayDelay(edict_t* player, int& entity) = 0;
-
-	virtual void			GetBugReportInfo(char* buf, int buflen) = 0;
-
-	virtual void			ClientVoice(edict_t* pEdict) = 0;
-
-	virtual void			NetworkIDValidated(const char* pszUserName, const char* pszNetworkID, CSteamID steamID) = 0;
-
-	virtual int				GetMaxSplitscreenPlayers() = 0;
-
-	virtual int				GetMaxHumanPlayers() = 0;
-
-	virtual void			ClientCommandKeyValues(edict_t* pEntity, KeyValues* pKeyValues) = 0;
-
-	virtual void			ClientNameHandler(unsigned long long steamid, const char* name) = 0;
-};
-
-#define INTERFACEVERSION_UPLOADGAMESTATS		"ServerUploadGameStats001"
-
-abstract_class IUploadGameStats
-{
-public:
-	virtual bool UploadGameStats(
-		char const* mapname,				   
-		unsigned int blobversion,			      
-		unsigned int blobsize,				      
-		const void* pvBlobData) = 0;		     
-
-	virtual void InitConnection(void) = 0;
-
-	virtual void UpdateConnection(void) = 0;
-
-	virtual bool IsGameStatsLoggingEnabled() = 0;
-
-	virtual void GetPseudoUniqueId(char* buf, size_t bufsize) = 0;
-
-	virtual bool IsCyberCafeUser(void) = 0;
-
-	virtual bool IsHDREnabled(void) = 0;
-};
-
-#define INTERFACEVERSION_PLUGINHELPERSCHECK		"PluginHelpersCheck001"
-
-abstract_class IPluginHelpersCheck
-{
-public:
-	virtual bool CreateMessage(const char* plugin, edict_t * pEntity, DIALOG_TYPE type, KeyValues * data) = 0;
-};
-
-abstract_class IServerDLLSharedAppSystems
-{
-public:
-	virtual int	Count() = 0;
-	virtual char const* GetDllName(int idx) = 0;
-	virtual char const* GetInterfaceName(int idx) = 0;
-};
-
-#define SERVER_DLL_SHARED_APPSYSTEMS		"VServerDllSharedAppSystems001"
-
-#define INTERFACEVERSION_SERVERGAMETAGS		"ServerGameTags001"
-
-abstract_class IServerGameTags
-{
-public:
-	virtual void			GetTaggedConVarList(KeyValues * pCvarTagList) = 0;
-};
-
-extern IVEngineServer* g_pEngineServer;
-extern IServerGameDLL* g_pServerGameDLL;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/enginetrace.h b/SpyCustom/enginetrace.h
deleted file mode 100644
index 3d9e9f5..0000000
--- a/SpyCustom/enginetrace.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef ENGINETRACE_H
-#define ENGINETRACE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "IEngineTrace.h"
-
-extern IEngineTrace* g_pEngineTraceServer;
-extern IEngineTrace* g_pEngineTraceClient;
-
-
-void EngineTraceRenderRayCasts();
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/entitylist.h b/SpyCustom/entitylist.h
deleted file mode 100644
index 85e36c0..0000000
--- a/SpyCustom/entitylist.h
+++ /dev/null
@@ -1,352 +0,0 @@
-#ifndef ENTITYLIST_H
-#define ENTITYLIST_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-class CBaseEntity;
-class IEntityListener;
-
-class CBaseEntityClassList
-{
-public:
-	CBaseEntityClassList();
-	~CBaseEntityClassList();
-	virtual void LevelShutdownPostEntity() = 0;
-
-	CBaseEntityClassList* m_pNextClassList;
-};
-
-template< class T >
-class CEntityClassList : public CBaseEntityClassList
-{
-public:
-	virtual void LevelShutdownPostEntity() { m_pClassList = NULL; }
-
-	void Insert(T* pEntity)
-	{
-		pEntity->m_pNext = m_pClassList;
-		m_pClassList = pEntity;
-	}
-
-	void Remove(T* pEntity)
-	{
-		T** pPrev = &m_pClassList;
-		T* pCur = *pPrev;
-		while (pCur)
-		{
-			if (pCur == pEntity)
-			{
-				*pPrev = pCur->m_pNext;
-				return;
-			}
-			pPrev = &pCur->m_pNext;
-			pCur = *pPrev;
-		}
-	}
-
-	static T* m_pClassList;
-};
-
-abstract_class IEntityFindFilter
-{
-public:
-	virtual bool ShouldFindEntity(CBaseEntity * pEntity) = 0;
-	virtual CBaseEntity* GetFilterResult(void) = 0;
-};
-
-class CGlobalEntityList : public CBaseEntityList
-{
-public:
-private:
-	int m_iHighestEnt;      
-	int m_iNumEnts;
-	int m_iNumEdicts;
-
-	bool m_bClearingEntities;
-	CUtlVector<IEntityListener*>	m_entityListeners;
-
-public:
-	CBaseHandle AddNetworkableEntity(IHandleEntity* pEnt, int index, int iForcedSerialNum = -1);
-	CBaseHandle AddNonNetworkableEntity(IHandleEntity* pEnt);
-
-	void UpdateName(IHandleEntity* pEnt, CBaseHandle hEnt);
-	void UpdateName(IHandleEntity* pEnt);
-
-	IServerNetworkable* GetServerNetworkable(CBaseHandle hEnt) const;
-	CBaseNetworkable* GetBaseNetworkable(CBaseHandle hEnt) const;
-	CBaseEntity* GetBaseEntity(CBaseHandle hEnt) const;
-	edict_t* GetEdict(CBaseHandle hEnt) const;
-
-	int NumberOfEntities(void);
-	int NumberOfEdicts(void);
-
-	void AddToDeleteList(IServerNetworkable* ent);
-	void CleanupDeleteList(void);
-	int ResetDeleteList(void);
-
-	void Clear(void);
-
-	bool	IsClearingEntities() { return m_bClearingEntities; }
-
-	void AddListenerEntity(IEntityListener* pListener);
-	void RemoveListenerEntity(IEntityListener* pListener);
-
-	void ReportEntityFlagsChanged(CBaseEntity* pEntity, unsigned int flagsOld, unsigned int flagsNow);
-	void AddPostClientMessageEntity(CBaseEntity* pEntity);
-	void PostClientMessagesSent();
-
-	void NotifyCreateEntity(CBaseEntity* pEnt);
-	void NotifySpawn(CBaseEntity* pEnt);
-	void NotifyRemoveEntity(CBaseEntity* pEnt);
-	CBaseEntity* NextEnt(CBaseEntity* pCurrentEnt);
-	CBaseEntity* FirstEnt() { return NextEnt(NULL); }
-
-	template< class T >
-	T* NextEntByClass(T* start)
-	{
-		for (CBaseEntity* x = NextEnt(start); x; x = NextEnt(x))
-		{
-			start = dynamic_cast<T*>(x);
-			if (start)
-				return start;
-		}
-		return NULL;
-	}
-
-	bool		 IsEntityPtr(void* pTest);
-	CBaseEntity* FindEntityByClassname(CBaseEntity* pStartEntity, const char* szName);
-	CBaseEntity* FindEntityByName(CBaseEntity* pStartEntity, const char* szName, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL, IEntityFindFilter* pFilter = NULL);
-	CBaseEntity* FindEntityByName(CBaseEntity* pStartEntity, string_t iszName, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL, IEntityFindFilter* pFilter = NULL)
-	{
-		return FindEntityByName(pStartEntity, STRING(iszName), pSearchingEntity, pActivator, pCaller, pFilter);
-	}
-	CBaseEntity* FindEntityInSphere(CBaseEntity* pStartEntity, const Vector& vecCenter, float flRadius);
-	CBaseEntity* FindEntityByTarget(CBaseEntity* pStartEntity, const char* szName);
-	CBaseEntity* FindEntityByModel(CBaseEntity* pStartEntity, const char* szModelName);
-	CBaseEntity* FindEntityByOutputTarget(CBaseEntity* pStartEntity, string_t iTarget);
-
-	CBaseEntity* FindEntityByNameNearest(const char* szName, const Vector& vecSrc, float flRadius, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-	CBaseEntity* FindEntityByNameWithin(CBaseEntity* pStartEntity, const char* szName, const Vector& vecSrc, float flRadius, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-	CBaseEntity* FindEntityByClassnameNearest(const char* szName, const Vector& vecSrc, float flRadius);
-	CBaseEntity* FindEntityByClassnameNearest2D(const char* szName, const Vector& vecSrc, float flRadius);
-	CBaseEntity* FindEntityByClassnameWithin(CBaseEntity* pStartEntity, const char* szName, const Vector& vecSrc, float flRadius);
-	CBaseEntity* FindEntityByClassnameWithin(CBaseEntity* pStartEntity, const char* szName, const Vector& vecMins, const Vector& vecMaxs);
-
-	CBaseEntity* FindEntityGeneric(CBaseEntity* pStartEntity, const char* szName, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-	CBaseEntity* FindEntityGenericWithin(CBaseEntity* pStartEntity, const char* szName, const Vector& vecSrc, float flRadius, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-	CBaseEntity* FindEntityGenericNearest(const char* szName, const Vector& vecSrc, float flRadius, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-
-	CBaseEntity* FindEntityNearestFacing(const Vector& origin, const Vector& facing, float threshold);
-	CBaseEntity* FindEntityClassNearestFacing(const Vector& origin, const Vector& facing, float threshold, char* classname);
-	CBaseEntity* FindEntityByNetname(CBaseEntity* pStartEntity, const char* szModelName);
-
-	CBaseEntity* FindEntityProcedural(const char* szName, CBaseEntity* pSearchingEntity = NULL, CBaseEntity* pActivator = NULL, CBaseEntity* pCaller = NULL);
-
-	CBaseEntity* FindEntityByClassnameFast(CBaseEntity* pStartEntity, string_t iszClassname);
-	CBaseEntity* FindEntityByClassnameNearestFast(string_t iszClassname, const Vector& vecSrc, float flRadius);
-	CBaseEntity* FindEntityByNameFast(CBaseEntity* pStartEntity, string_t iszName);
-
-	CGlobalEntityList();
-
-protected:
-
-	virtual void OnAddEntity(IHandleEntity* pEnt, CBaseHandle handle);
-	virtual void OnRemoveEntity(IHandleEntity* pEnt, CBaseHandle handle);
-
-};
-
-extern CGlobalEntityList gEntList;
-
-
-inline CBaseHandle CGlobalEntityList::AddNetworkableEntity(IHandleEntity* pEnt, int index, int iForcedSerialNum)
-{
-	CBaseHandle h = CBaseEntityList::AddNetworkableEntity(pEnt, index, iForcedSerialNum);
-	UpdateName(pEnt, h);
-	return h;
-}
-
-inline CBaseHandle CGlobalEntityList::AddNonNetworkableEntity(IHandleEntity* pEnt)
-{
-	CBaseHandle h = CBaseEntityList::AddNonNetworkableEntity(pEnt);
-	UpdateName(pEnt, h);
-	return h;
-}
-
-inline edict_t* CGlobalEntityList::GetEdict(CBaseHandle hEnt) const
-{
-	IServerUnknown* pUnk = static_cast<IServerUnknown*>(LookupEntity(hEnt));
-	if (pUnk)
-		return pUnk->GetNetworkable()->GetEdict();
-	else
-		return NULL;
-}
-
-inline CBaseNetworkable* CGlobalEntityList::GetBaseNetworkable(CBaseHandle hEnt) const
-{
-	IServerUnknown* pUnk = static_cast<IServerUnknown*>(LookupEntity(hEnt));
-	if (pUnk)
-		return pUnk->GetNetworkable()->GetBaseNetworkable();
-	else
-		return NULL;
-}
-
-inline IServerNetworkable* CGlobalEntityList::GetServerNetworkable(CBaseHandle hEnt) const
-{
-	IServerUnknown* pUnk = static_cast<IServerUnknown*>(LookupEntity(hEnt));
-	if (pUnk)
-		return pUnk->GetNetworkable();
-	else
-		return NULL;
-}
-
-inline CBaseEntity* CGlobalEntityList::GetBaseEntity(CBaseHandle hEnt) const
-{
-	IServerUnknown* pUnk = static_cast<IServerUnknown*>(LookupEntity(hEnt));
-	if (pUnk)
-		return pUnk->GetBaseEntity();
-	else
-		return NULL;
-}
-
-
-#if 0
-
-template <class ENT_TYPE>
-inline bool FindEntityByName(const char* pszName, ENT_TYPE** ppResult)
-{
-	CBaseEntity* pBaseEntity = gEntList.FindEntityByName(NULL, pszName);
-
-	if (pBaseEntity)
-		*ppResult = dynamic_cast<ENT_TYPE*>(pBaseEntity);
-	else
-		*ppResult = NULL;
-
-	return (*ppResult != NULL);
-}
-
-template <>
-inline bool FindEntityByName<CBaseEntity>(const char* pszName, CBaseEntity** ppResult)
-{
-	*ppResult = gEntList.FindEntityByName(NULL, pszName);
-	return (*ppResult != NULL);
-}
-
-template <>
-inline bool FindEntityByName<CAI_BaseNPC>(const char* pszName, CAI_BaseNPC** ppResult)
-{
-	CBaseEntity* pBaseEntity = gEntList.FindEntityByName(NULL, pszName);
-
-	if (pBaseEntity)
-		*ppResult = pBaseEntity->MyNPCPointer();
-	else
-		*ppResult = NULL;
-
-	return (*ppResult != NULL);
-}
-#endif
-struct entitem_t
-{
-	EHANDLE hEnt;
-	struct entitem_t* pNext;
-
-	static void* operator new(size_t stAllocateBlock);
-	static void* operator new(size_t stAllocateBlock, int nBlockUse, const char* pFileName, int nLine);
-	static void operator delete(void* pMem);
-	static void operator delete(void* pMem, int nBlockUse, const char* pFileName, int nLine) { operator delete(pMem); }
-};
-
-class CEntityList
-{
-public:
-	CEntityList();
-	~CEntityList();
-
-	int m_iNumItems;
-	entitem_t* m_pItemList;	    
-
-	void AddEntity(CBaseEntity*);
-	void DeleteEntity(CBaseEntity*);
-};
-
-enum notify_system_event_t
-{
-	NOTIFY_EVENT_TELEPORT = 0,
-	NOTIFY_EVENT_DESTROY,
-};
-
-struct notify_teleport_params_t
-{
-	Vector prevOrigin;
-	QAngle prevAngles;
-	bool physicsRotate;
-};
-
-struct notify_destroy_params_t
-{
-};
-
-struct notify_system_event_params_t
-{
-	union
-	{
-		const notify_teleport_params_t* pTeleport;
-		const notify_destroy_params_t* pDestroy;
-	};
-	notify_system_event_params_t(const notify_teleport_params_t* pInTeleport) { pTeleport = pInTeleport; }
-	notify_system_event_params_t(const notify_destroy_params_t* pInDestroy) { pDestroy = pInDestroy; }
-};
-
-
-abstract_class INotify
-{
-public:
-	virtual void AddEntity(CBaseEntity * pNotify, CBaseEntity * pWatched) = 0;
-
-	virtual void RemoveEntity(CBaseEntity* pNotify, CBaseEntity* pWatched) = 0;
-
-	virtual void ReportNamedEvent(CBaseEntity* pEntity, const char* pEventName) = 0;
-
-	virtual void ReportSystemEvent(CBaseEntity* pEntity, notify_system_event_t eventType, const notify_system_event_params_t& params) = 0;
-
-	inline void ReportDestroyEvent(CBaseEntity* pEntity)
-	{
-		notify_destroy_params_t destroy;
-		ReportSystemEvent(pEntity, NOTIFY_EVENT_DESTROY, notify_system_event_params_t(&destroy));
-	}
-
-	inline void ReportTeleportEvent(CBaseEntity* pEntity, const Vector& prevOrigin, const QAngle& prevAngles, bool physicsRotate)
-	{
-		notify_teleport_params_t teleport;
-		teleport.prevOrigin = prevOrigin;
-		teleport.prevAngles = prevAngles;
-		teleport.physicsRotate = physicsRotate;
-		ReportSystemEvent(pEntity, NOTIFY_EVENT_TELEPORT, notify_system_event_params_t(&teleport));
-	}
-
-	virtual void ClearEntity(CBaseEntity* pNotify) = 0;
-};
-
-class IEntityListener
-{
-public:
-	virtual void OnEntityCreated(CBaseEntity* pEntity) {};
-	virtual void OnEntitySpawned(CBaseEntity* pEntity) {};
-	virtual void OnEntityDeleted(CBaseEntity* pEntity) {};
-};
-
-extern INotify* g_pNotify;
-
-void EntityTouch_Add(CBaseEntity* pEntity);
-void EntityTouch_Remove(CBaseEntity* pEntity);
-int AimTarget_ListCount();
-int AimTarget_ListCopy(CBaseEntity* pList[], int listMax);
-CBaseEntity* AimTarget_ListElement(int iIndex);
-void AimTarget_ForceRepopulateList();
-
-void SimThink_EntityChanged(CBaseEntity* pEntity);
-int SimThink_ListCount();
-int SimThink_ListCopy(CBaseEntity* pList[], int listMax);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/entitylist_base.h b/SpyCustom/entitylist_base.h
deleted file mode 100644
index 9402e40..0000000
--- a/SpyCustom/entitylist_base.h
+++ /dev/null
@@ -1,184 +0,0 @@
-#ifndef ENTITYLIST_BASE_H
-#define ENTITYLIST_BASE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "const.h"
-#include "basehandle.h"
-#include "utllinkedlist.h"
-#include "ihandleentity.h"
-
-
-class CEntInfo
-{
-public:
-	IHandleEntity* m_pEntity;
-	int				m_SerialNumber;
-	CEntInfo* m_pPrev;
-	CEntInfo* m_pNext;
-
-	void			ClearLinks();
-};
-
-
-class CBaseEntityList
-{
-public:
-	CBaseEntityList();
-	~CBaseEntityList();
-
-	CBaseHandle AddNetworkableEntity(IHandleEntity* pEnt, int index, int iForcedSerialNum = -1);
-	CBaseHandle AddNonNetworkableEntity(IHandleEntity* pEnt);
-	void RemoveEntity(CBaseHandle handle);
-
-	CBaseHandle GetNetworkableHandle(int iEntity) const;
-
-	IHandleEntity* LookupEntity(const CBaseHandle& handle) const;
-	IHandleEntity* LookupEntityByNetworkIndex(int edictIndex) const;
-
-	CBaseHandle FirstHandle() const;
-	CBaseHandle NextHandle(CBaseHandle hEnt) const;
-	static CBaseHandle InvalidHandle();
-
-	const CEntInfo* FirstEntInfo() const;
-	const CEntInfo* NextEntInfo(const CEntInfo* pInfo) const;
-	const CEntInfo* GetEntInfoPtr(const CBaseHandle& hEnt) const;
-	const CEntInfo* GetEntInfoPtrByIndex(int index) const;
-
-protected:
-
-	virtual void OnAddEntity(IHandleEntity* pEnt, CBaseHandle handle);
-
-	virtual void OnRemoveEntity(IHandleEntity* pEnt, CBaseHandle handle);
-
-
-private:
-
-	CBaseHandle AddEntityAtSlot(IHandleEntity* pEnt, int iSlot, int iForcedSerialNum);
-	void RemoveEntityAtSlot(int iSlot);
-
-
-private:
-
-	class CEntInfoList
-	{
-	public:
-		CEntInfoList();
-
-		const CEntInfo* Head() const { return m_pHead; }
-		const CEntInfo* Tail() const { return m_pTail; }
-		CEntInfo* Head() { return m_pHead; }
-		CEntInfo* Tail() { return m_pTail; }
-		void			AddToHead(CEntInfo* pElement) { LinkAfter(NULL, pElement); }
-		void			AddToTail(CEntInfo* pElement) { LinkBefore(NULL, pElement); }
-
-		void LinkBefore(CEntInfo* pBefore, CEntInfo* pElement);
-		void LinkAfter(CEntInfo* pBefore, CEntInfo* pElement);
-		void Unlink(CEntInfo* pElement);
-		bool IsInList(CEntInfo* pElement);
-
-	private:
-		CEntInfo* m_pHead;
-		CEntInfo* m_pTail;
-	};
-
-	int GetEntInfoIndex(const CEntInfo* pEntInfo) const;
-
-
-	CEntInfo m_EntPtrArray[NUM_ENT_ENTRIES];
-	CEntInfoList	m_activeList;
-	CEntInfoList	m_freeNonNetworkableList;
-};
-
-
-inline int CBaseEntityList::GetEntInfoIndex(const CEntInfo* pEntInfo) const
-{
-	Assert(pEntInfo);
-	int index = (int)(pEntInfo - m_EntPtrArray);
-	Assert(index >= 0 && index < NUM_ENT_ENTRIES);
-	return index;
-}
-
-inline CBaseHandle CBaseEntityList::GetNetworkableHandle(int iEntity) const
-{
-	Assert(iEntity >= 0 && iEntity < MAX_EDICTS);
-	if (m_EntPtrArray[iEntity].m_pEntity)
-		return CBaseHandle(iEntity, m_EntPtrArray[iEntity].m_SerialNumber);
-	else
-		return CBaseHandle();
-}
-
-
-inline IHandleEntity* CBaseEntityList::LookupEntity(const CBaseHandle& handle) const
-{
-	if (handle.m_Index == INVALID_EHANDLE_INDEX)
-		return NULL;
-
-	const CEntInfo* pInfo = &m_EntPtrArray[handle.GetEntryIndex()];
-	if (pInfo->m_SerialNumber == handle.GetSerialNumber())
-		return (IHandleEntity*)pInfo->m_pEntity;
-	else
-		return NULL;
-}
-
-
-inline IHandleEntity* CBaseEntityList::LookupEntityByNetworkIndex(int edictIndex) const
-{
-	if (edictIndex < 0)
-		return NULL;
-
-	Assert(edictIndex < NUM_ENT_ENTRIES);
-	return (IHandleEntity*)m_EntPtrArray[edictIndex].m_pEntity;
-}
-
-
-inline CBaseHandle CBaseEntityList::FirstHandle() const
-{
-	if (!m_activeList.Head())
-		return INVALID_EHANDLE_INDEX;
-
-	int index = GetEntInfoIndex(m_activeList.Head());
-	return CBaseHandle(index, m_EntPtrArray[index].m_SerialNumber);
-}
-
-inline CBaseHandle CBaseEntityList::NextHandle(CBaseHandle hEnt) const
-{
-	int iSlot = hEnt.GetEntryIndex();
-	CEntInfo* pNext = m_EntPtrArray[iSlot].m_pNext;
-	if (!pNext)
-		return INVALID_EHANDLE_INDEX;
-
-	int index = GetEntInfoIndex(pNext);
-
-	return CBaseHandle(index, m_EntPtrArray[index].m_SerialNumber);
-}
-
-inline CBaseHandle CBaseEntityList::InvalidHandle()
-{
-	return INVALID_EHANDLE_INDEX;
-}
-
-inline const CEntInfo* CBaseEntityList::FirstEntInfo() const
-{
-	return m_activeList.Head();
-}
-
-inline const CEntInfo* CBaseEntityList::NextEntInfo(const CEntInfo* pInfo) const
-{
-	return pInfo->m_pNext;
-}
-
-inline const CEntInfo* CBaseEntityList::GetEntInfoPtr(const CBaseHandle& hEnt) const
-{
-	int iSlot = hEnt.GetEntryIndex();
-	return &m_EntPtrArray[iSlot];
-}
-
-inline const CEntInfo* CBaseEntityList::GetEntInfoPtrByIndex(int index) const
-{
-	return &m_EntPtrArray[index];
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/expressioncalculator.h b/SpyCustom/expressioncalculator.h
deleted file mode 100644
index b7e27f8..0000000
--- a/SpyCustom/expressioncalculator.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef MATHLIB_EXPRESSION_CALCULATOR_H
-#define MATHLIB_EXPRESSION_CALCULATOR_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlstring.h"
-#include "utlstack.h"
-#include "utlvector.h"
-
-
-class CExpressionCalculator
-{
-public:
-	CExpressionCalculator(const char* expr = NULL) : m_expr(expr) {}
-
-	CExpressionCalculator(const CExpressionCalculator& x);
-	CExpressionCalculator& operator=(const CExpressionCalculator& x);
-
-public:
-	void SetExpression(const char* expr)
-	{
-		m_expr = expr;
-	}
-
-	void SetVariable(const char* var, float value);
-	void SetVariable(int nVariableIndex, float value);
-	void ModifyVariable(const char* var, float value);
-
-	int FindVariableIndex(const char* var);
-
-	bool Evaluate(float& value);
-
-	bool BuildVariableListFromExpression();
-
-	int VariableCount();
-	const char* VariableName(int nIndex);
-
-private:
-	bool ParseExpr(const char*& expr);
-	bool ParseConditional(const char*& expr);
-	bool ParseOr(const char*& expr);
-	bool ParseAnd(const char*& expr);
-	bool ParseEquality(const char*& expr);
-	bool ParseLessGreater(const char*& expr);
-	bool ParseAddSub(const char*& expr);
-	bool ParseDivMul(const char*& expr);
-	bool ParseUnary(const char*& expr);
-	bool ParsePrimary(const char*& expr);
-	bool Parse1ArgFunc(const char*& expr);
-	bool Parse2ArgFunc(const char*& expr);
-	bool Parse3ArgFunc(const char*& expr);
-	bool Parse5ArgFunc(const char*& expr);
-
-	CUtlString m_expr;
-	CUtlVector< CUtlString > m_varNames;
-	CUtlVector<float> m_varValues;
-	CUtlStack<float> m_stack;
-	bool m_bIsBuildingArgumentList;
-};
-
-float EvaluateExpression(char const* pExprString, float flValueToReturnIfFailure);
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/exprevaluator.h b/SpyCustom/exprevaluator.h
deleted file mode 100644
index 9d8c619..0000000
--- a/SpyCustom/exprevaluator.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef EXPREVALUATOR_H
-#define EXPREVALUATOR_H
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-static const char OR_OP = '|';
-static const char AND_OP = '&';
-static const char NOT_OP = '!';
-
-#define MAX_IDENTIFIER_LEN	128
-enum Kind { CONDITIONAL, NOT, LITERAL };
-
-struct ExprNode
-{
-	ExprNode* left;    
-	ExprNode* right;   
-	Kind kind;            
-	union
-	{
-		char cond;	  
-		bool value;	  
-	} data;
-};
-
-typedef ExprNode* ExprTree;
-
-typedef bool (*GetSymbolProc_t)(const char* pKey);
-typedef void (*SyntaxErrorProc_t)(const char* pReason);
-
-class CExpressionEvaluator
-{
-public:
-	CExpressionEvaluator();
-	~CExpressionEvaluator();
-	bool Evaluate(bool& result, const char* pInfixExpression, GetSymbolProc_t pGetSymbolProc = 0, SyntaxErrorProc_t pSyntaxErrorProc = 0);
-
-private:
-	CExpressionEvaluator(CExpressionEvaluator&);	     
-
-	char GetNextToken(void);
-	void FreeNode(ExprNode* pNode);
-	ExprNode* AllocateNode(void);
-	void FreeTree(ExprTree& node);
-	bool IsConditional(bool& bCondition, const char token);
-	bool IsNotOp(const char token);
-	bool IsIdentifierOrConstant(const char token);
-	bool MakeExprNode(ExprTree& tree, char token, Kind kind, ExprTree left, ExprTree right);
-	bool MakeFactor(ExprTree& tree);
-	bool MakeTerm(ExprTree& tree);
-	bool MakeExpression(ExprTree& tree);
-	bool BuildExpression(void);
-	bool SimplifyNode(ExprTree& node);
-
-	ExprTree			m_ExprTree;							     
-	char				m_CurToken;							       
-	const char* m_pExpression;						     
-	int					m_CurPosition;						      
-	char				m_Identifier[MAX_IDENTIFIER_LEN];	    
-	GetSymbolProc_t		m_pGetSymbolProc;
-	SyntaxErrorProc_t	m_pSyntaxErrorProc;
-	bool				m_bSetup;
-};
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/fasttimer.h b/SpyCustom/fasttimer.h
deleted file mode 100644
index 226f061..0000000
--- a/SpyCustom/fasttimer.h
+++ /dev/null
@@ -1,505 +0,0 @@
-#ifndef FASTTIMER_H
-#define FASTTIMER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#ifdef _WIN32
-#include <intrin.h>
-#endif
-
-#include <assert.h>
-#include "platform.h"
-
-PLATFORM_INTERFACE uint64 g_ClockSpeed;
-#if defined( _X360 ) && defined( _CERT )
-PLATFORM_INTERFACE unsigned long g_dwFakeFastCounter;
-#endif
-
-PLATFORM_INTERFACE double g_ClockSpeedMicrosecondsMultiplier;
-PLATFORM_INTERFACE double g_ClockSpeedMillisecondsMultiplier;
-PLATFORM_INTERFACE double g_ClockSpeedSecondsMultiplier;
-
-class CCycleCount
-{
-	friend class CFastTimer;
-
-public:
-	CCycleCount();
-	CCycleCount(uint64 cycles);
-
-	void			Sample();	                  
-
-	void			Init();		   
-	void			Init(float initTimeMsec);
-	void			Init(double initTimeMsec) { Init((float)initTimeMsec); }
-	void			Init(uint64 cycles);
-	bool			IsLessThan(CCycleCount const& other) const;					   
-
-	unsigned long	GetCycles()  const;
-	uint64			GetLongCycles() const;
-
-	unsigned long	GetMicroseconds() const;
-	uint64			GetUlMicroseconds() const;
-	double			GetMicrosecondsF() const;
-	void			SetMicroseconds(unsigned long nMicroseconds);
-
-	unsigned long	GetMilliseconds() const;
-	double			GetMillisecondsF() const;
-
-	double			GetSeconds() const;
-
-	CCycleCount& operator+=(CCycleCount const& other);
-
-	static void		Add(CCycleCount const& rSrc1, CCycleCount const& rSrc2, CCycleCount& dest);	    
-
-	static void		Sub(CCycleCount const& rSrc1, CCycleCount const& rSrc2, CCycleCount& dest);	    
-
-	static uint64	GetTimestamp();
-
-	uint64			m_Int64;
-};
-
-class PLATFORM_CLASS CClockSpeedInit
-{
-public:
-	CClockSpeedInit()
-	{
-		Init();
-	}
-
-	static void Init();
-};
-
-class CFastTimer
-{
-public:
-	void				Start();
-	void				End();
-
-	const CCycleCount& GetDuration() const;	         
-	CCycleCount 		GetDurationInProgress() const;       
-
-	static inline int64	GetClockSpeed();
-
-private:
-	CCycleCount	m_Duration;
-#ifdef DEBUG_FASTTIMER
-	bool m_bRunning;		    
-#endif
-};
-
-
-class CTimeScope
-{
-public:
-	CTimeScope(CFastTimer* pTimer);
-	~CTimeScope();
-
-private:
-	CFastTimer* m_pTimer;
-};
-
-inline CTimeScope::CTimeScope(CFastTimer* pTotal)
-{
-	m_pTimer = pTotal;
-	m_pTimer->Start();
-}
-
-inline CTimeScope::~CTimeScope()
-{
-	m_pTimer->End();
-}
-
-class CTimeAdder
-{
-public:
-	CTimeAdder(CCycleCount* pTotal);
-	~CTimeAdder();
-
-	void		End();
-
-private:
-	CCycleCount* m_pTotal;
-	CFastTimer	m_Timer;
-};
-
-inline CTimeAdder::CTimeAdder(CCycleCount* pTotal)
-{
-	m_pTotal = pTotal;
-	m_Timer.Start();
-}
-
-inline CTimeAdder::~CTimeAdder()
-{
-	End();
-}
-
-inline void CTimeAdder::End()
-{
-	if (m_pTotal)
-	{
-		m_Timer.End();
-		*m_pTotal += m_Timer.GetDuration();
-		m_pTotal = 0;
-	}
-}
-
-
-
-#define PROFILE_SCOPE(name) \
-	class C##name##ACC : public CAverageCycleCounter \
-	{ \
-	public: \
-		~C##name##ACC() \
-		{ \
-			Msg("%-48s: %6.3f avg (%8.1f total, %7.3f peak, %5d iters)\n",  \
-				#name, \
-				GetAverageMilliseconds(), \
-				GetTotalMilliseconds(), \
-				GetPeakMilliseconds(), \
-				GetIters() ); \
-		} \
-	}; \
-	static C##name##ACC name##_ACC; \
-	CAverageTimeMarker name##_ATM( &name##_ACC )
-
-#define TIME_SCOPE(name) \
-	class CTimeScopeMsg_##name \
-	{ \
-	public: \
-		CTimeScopeMsg_##name() { m_Timer.Start(); } \
-		~CTimeScopeMsg_##name() \
-		{ \
-			m_Timer.End(); \
-			Msg( #name "time: %.4fms\n", m_Timer.GetDuration().GetMillisecondsF() ); \
-		} \
-	private:	\
-		CFastTimer	m_Timer; \
-	} name##_TSM;
-
-
-class CAverageCycleCounter
-{
-public:
-	CAverageCycleCounter();
-
-	void Init();
-	void MarkIter(const CCycleCount& duration);
-
-	unsigned GetIters() const;
-
-	double GetAverageMilliseconds() const;
-	double GetTotalMilliseconds() const;
-	double GetPeakMilliseconds() const;
-
-private:
-	unsigned	m_nIters;
-	CCycleCount m_Total;
-	CCycleCount	m_Peak;
-};
-
-class CAverageTimeMarker
-{
-public:
-	CAverageTimeMarker(CAverageCycleCounter* pCounter);
-	~CAverageTimeMarker();
-
-private:
-	CAverageCycleCounter* m_pCounter;
-	CFastTimer	m_Timer;
-};
-
-
-inline CCycleCount::CCycleCount()
-{
-	Init((uint64)0);
-}
-
-inline CCycleCount::CCycleCount(uint64 cycles)
-{
-	Init(cycles);
-}
-
-inline void CCycleCount::Init()
-{
-	Init((uint64)0);
-}
-
-inline void CCycleCount::Init(float initTimeMsec)
-{
-	if (g_ClockSpeedMillisecondsMultiplier > 0)
-		Init((uint64)(initTimeMsec / g_ClockSpeedMillisecondsMultiplier));
-	else
-		Init((uint64)0);
-}
-
-inline void CCycleCount::Init(uint64 cycles)
-{
-	m_Int64 = cycles;
-}
-
-inline void CCycleCount::Sample()
-{
-	m_Int64 = Plat_Rdtsc();
-}
-
-inline CCycleCount& CCycleCount::operator+=(CCycleCount const& other)
-{
-	m_Int64 += other.m_Int64;
-	return *this;
-}
-
-
-inline void CCycleCount::Add(CCycleCount const& rSrc1, CCycleCount const& rSrc2, CCycleCount& dest)
-{
-	dest.m_Int64 = rSrc1.m_Int64 + rSrc2.m_Int64;
-}
-
-inline void CCycleCount::Sub(CCycleCount const& rSrc1, CCycleCount const& rSrc2, CCycleCount& dest)
-{
-	dest.m_Int64 = rSrc1.m_Int64 - rSrc2.m_Int64;
-}
-
-inline uint64 CCycleCount::GetTimestamp()
-{
-	CCycleCount c;
-	c.Sample();
-	return c.GetLongCycles();
-}
-
-inline bool CCycleCount::IsLessThan(CCycleCount const& other) const
-{
-	return m_Int64 < other.m_Int64;
-}
-
-
-inline unsigned long CCycleCount::GetCycles() const
-{
-	return (unsigned long)m_Int64;
-}
-
-inline uint64 CCycleCount::GetLongCycles() const
-{
-	return m_Int64;
-}
-
-inline unsigned long CCycleCount::GetMicroseconds() const
-{
-	return (unsigned long)((m_Int64 * 1000000) / g_ClockSpeed);
-}
-
-inline uint64 CCycleCount::GetUlMicroseconds() const
-{
-	return ((m_Int64 * 1000000) / g_ClockSpeed);
-}
-
-
-inline double CCycleCount::GetMicrosecondsF() const
-{
-	return (double)(m_Int64 * g_ClockSpeedMicrosecondsMultiplier);
-}
-
-
-inline void	CCycleCount::SetMicroseconds(unsigned long nMicroseconds)
-{
-	m_Int64 = ((uint64)nMicroseconds * g_ClockSpeed) / 1000000;
-}
-
-
-inline unsigned long CCycleCount::GetMilliseconds() const
-{
-	return (unsigned long)((m_Int64 * 1000) / g_ClockSpeed);
-}
-
-
-inline double CCycleCount::GetMillisecondsF() const
-{
-	return (double)(m_Int64 * g_ClockSpeedMillisecondsMultiplier);
-}
-
-
-inline double CCycleCount::GetSeconds() const
-{
-	return (double)(m_Int64 * g_ClockSpeedSecondsMultiplier);
-}
-
-
-inline void CFastTimer::Start()
-{
-	m_Duration.Sample();
-#ifdef DEBUG_FASTTIMER
-	m_bRunning = true;
-#endif
-}
-
-
-inline void CFastTimer::End()
-{
-	CCycleCount cnt;
-	cnt.Sample();
-	if (IsX360())
-	{
-		if ((uint64)cnt.m_Int64 <= (uint64)m_Duration.m_Int64)
-		{
-			cnt.m_Int64 += 0x100000000LL;
-		}
-	}
-
-	m_Duration.m_Int64 = cnt.m_Int64 - m_Duration.m_Int64;
-
-#ifdef DEBUG_FASTTIMER
-	m_bRunning = false;
-#endif
-}
-
-inline CCycleCount CFastTimer::GetDurationInProgress() const
-{
-	CCycleCount cnt;
-	cnt.Sample();
-	if (IsX360())
-	{
-		if ((uint64)cnt.m_Int64 <= (uint64)m_Duration.m_Int64)
-		{
-			cnt.m_Int64 += 0x100000000LL;
-		}
-	}
-
-	CCycleCount result;
-	result.m_Int64 = cnt.m_Int64 - m_Duration.m_Int64;
-
-	return result;
-}
-
-
-inline int64 CFastTimer::GetClockSpeed()
-{
-	return g_ClockSpeed;
-}
-
-
-inline CCycleCount const& CFastTimer::GetDuration() const
-{
-#ifdef DEBUG_FASTTIMER
-	assert(!m_bRunning);
-#endif
-	return m_Duration;
-}
-
-
-inline CAverageCycleCounter::CAverageCycleCounter()
-	: m_nIters(0)
-{
-}
-
-inline void CAverageCycleCounter::Init()
-{
-	m_Total.Init();
-	m_Peak.Init();
-	m_nIters = 0;
-}
-
-inline void CAverageCycleCounter::MarkIter(const CCycleCount& duration)
-{
-	++m_nIters;
-	m_Total += duration;
-	if (m_Peak.IsLessThan(duration))
-		m_Peak = duration;
-}
-
-inline unsigned CAverageCycleCounter::GetIters() const
-{
-	return m_nIters;
-}
-
-inline double CAverageCycleCounter::GetAverageMilliseconds() const
-{
-	if (m_nIters)
-		return (m_Total.GetMillisecondsF() / (double)m_nIters);
-	else
-		return 0;
-}
-
-inline double CAverageCycleCounter::GetTotalMilliseconds() const
-{
-	return m_Total.GetMillisecondsF();
-}
-
-inline double CAverageCycleCounter::GetPeakMilliseconds() const
-{
-	return m_Peak.GetMillisecondsF();
-}
-
-inline CAverageTimeMarker::CAverageTimeMarker(CAverageCycleCounter* pCounter)
-{
-	m_pCounter = pCounter;
-	m_Timer.Start();
-}
-
-inline CAverageTimeMarker::~CAverageTimeMarker()
-{
-	m_Timer.End();
-	m_pCounter->MarkIter(m_Timer.GetDuration());
-}
-
-
-class CLimitTimer
-{
-public:
-	CLimitTimer() {}
-	CLimitTimer(uint64 cMicroSecDuration) { SetLimit(cMicroSecDuration); }
-	void SetLimit(uint64 m_cMicroSecDuration);
-	bool BLimitReached() const;
-
-	int CMicroSecOverage() const;
-	uint64 CMicroSecLeft() const;
-
-private:
-	uint64 m_lCycleLimit;
-};
-
-
-inline void CLimitTimer::SetLimit(uint64 cMicroSecDuration)
-{
-	uint64 dlCycles = ((uint64)cMicroSecDuration * g_ClockSpeed) / (uint64)1000000L;
-	CCycleCount cycleCount;
-	cycleCount.Sample();
-	m_lCycleLimit = cycleCount.GetLongCycles() + dlCycles;
-}
-
-
-inline bool CLimitTimer::BLimitReached() const
-{
-	CCycleCount cycleCount;
-	cycleCount.Sample();
-	return (cycleCount.GetLongCycles() >= m_lCycleLimit);
-}
-
-
-inline int CLimitTimer::CMicroSecOverage() const
-{
-	CCycleCount cycleCount;
-	cycleCount.Sample();
-	uint64 lcCycles = cycleCount.GetLongCycles();
-
-	if (lcCycles < m_lCycleLimit)
-		return 0;
-
-	return((int)((lcCycles - m_lCycleLimit) * (uint64)1000000L / g_ClockSpeed));
-}
-
-
-inline uint64 CLimitTimer::CMicroSecLeft() const
-{
-	CCycleCount cycleCount;
-	cycleCount.Sample();
-	uint64 lcCycles = cycleCount.GetLongCycles();
-
-	if (lcCycles >= m_lCycleLimit)
-		return 0;
-
-	return((uint64)((m_lCycleLimit - lcCycles) * (uint64)1000000L / g_ClockSpeed));
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/filesystem.h b/SpyCustom/filesystem.h
deleted file mode 100644
index 567dd5f..0000000
--- a/SpyCustom/filesystem.h
+++ /dev/null
@@ -1,747 +0,0 @@
-#ifndef FILESYSTEM_H
-#define FILESYSTEM_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <limits.h>
-
-#include "threadtools.h"
-#include "memalloc.h"
-#include "tslist.h"
-#include "interface.h"
-#include "utlsymbol.h"
-#include "utlstring.h"
-#include "functors.h" 
-#include "checksum_crc.h"
-#include "checksum_md5.h"
-#include "utlqueue.h"
-#include "iappsystem.h"
-#include "tier2.h"
-#ifdef _PS3
-#include <sysutil/sysutil_syscache.h>
-#include <sysutil/sysutil_gamecontent.h>
-struct HddCacheFileStatus;
-extern char gSrcGameDataPath[];
-class CFileGroupSystem;
-#endif
-
-class CUtlBuffer;
-class KeyValues;
-class IFileList;
-
-typedef void* FileHandle_t;
-typedef int FileFindHandle_t;
-typedef void (*FileSystemLoggingFunc_t)(const char* fileName, const char* accessType);
-typedef int WaitForResourcesHandle_t;
-
-#ifdef _X360
-typedef void* HANDLE;
-#endif
-
-#define FILESYSTEM_MAX_SEARCH_PATHS 128
-
-enum FileSystemSeek_t
-{
-	FILESYSTEM_SEEK_HEAD = SEEK_SET,
-	FILESYSTEM_SEEK_CURRENT = SEEK_CUR,
-	FILESYSTEM_SEEK_TAIL = SEEK_END,
-};
-
-enum
-{
-	FILESYSTEM_INVALID_FIND_HANDLE = -1
-};
-
-enum FileWarningLevel_t
-{
-	FILESYSTEM_WARNING = -1,
-
-	FILESYSTEM_WARNING_QUIET = 0,
-
-	FILESYSTEM_WARNING_REPORTUNCLOSED,
-
-	FILESYSTEM_WARNING_REPORTUSAGE,
-
-	FILESYSTEM_WARNING_REPORTALLACCESSES,
-
-	FILESYSTEM_WARNING_REPORTALLACCESSES_READ,
-
-	FILESYSTEM_WARNING_REPORTALLACCESSES_READWRITE,
-
-	FILESYSTEM_WARNING_REPORTALLACCESSES_ASYNC,
-
-};
-
-enum PathTypeFilter_t
-{
-	FILTER_NONE = 0,	       
-	FILTER_CULLPACK = 1,	         
-	FILTER_CULLNONPACK = 2,	      
-	FILTER_CULLLOCALIZED = 3,	     
-	FILTER_CULLLOCALIZED_ANY = 4,	    
-};
-
-enum
-{
-	PATH_IS_NORMAL = 0x00,      
-	PATH_IS_PACKFILE = 0x01,      
-	PATH_IS_MAPPACKFILE = 0x02,       
-	PATH_IS_DVDDEV = 0x04,      
-};
-typedef uint32 PathTypeQuery_t;
-
-#define IS_PACKFILE( n ) ( n & ( PATH_IS_PACKFILE | PATH_IS_MAPPACKFILE ) )
-#define IS_DVDDEV( n )   ( n & PATH_IS_DVDDEV )
-
-enum DVDMode_t
-{
-	DVDMODE_OFF = 0,    
-	DVDMODE_STRICT = 1,    
-	DVDMODE_DEV = 2,      
-	DVDMODE_DEV_VISTA = 3,          
-};
-
-#ifdef _PS3
-
-enum FsState_t
-{
-	FS_STATE_INIT = 0,
-	FS_STATE_LEVEL_LOAD = 1,
-	FS_STATE_LEVEL_RUN = 2,
-	FS_STATE_LEVEL_RESTORE = 3,
-	FS_STATE_LEVEL_LOAD_END = 4,
-	FS_STATE_EXITING = 5
-};
-
-enum Ps3FileType_t
-{
-	PS3_FILETYPE_WAV,
-	PS3_FILETYPE_ANI,
-	PS3_FILETYPE_BSP,
-	PS3_FILETYPE_VMT,
-	PS3_FILETYPE_QPRE,
-	PS3_FILETYPE_OTHER,
-	PS3_FILETYPE_DIR,
-	PS3_FILETYPE_UNKNOWN
-};
-
-
-#endif
-
-#if defined( TRACK_BLOCKING_IO )
-enum FileBlockingWarning_t
-{
-	FILESYSTEM_BLOCKING_SYNCHRONOUS = 0,
-	FILESYSTEM_BLOCKING_ASYNCHRONOUS_BLOCK,
-	FILESYSTEM_BLOCKING_ASYNCHRONOUS,
-	FILESYSTEM_BLOCKING_CALLBACKTIMING,
-
-	FILESYSTEM_BLOCKING_NUMBINS,
-};
-
-#pragma pack(1)
-class FileBlockingItem
-{
-public:
-	enum
-	{
-		FB_ACCESS_OPEN = 1,
-		FB_ACCESS_CLOSE = 2,
-		FB_ACCESS_READ = 3,
-		FB_ACCESS_WRITE = 4,
-		FB_ACCESS_APPEND = 5,
-		FB_ACCESS_SIZE = 6
-	};
-
-	FileBlockingItem() :
-		m_ItemType((FileBlockingWarning_t)0),
-		m_flElapsed(0.0f),
-		m_nAccessType(0)
-	{
-		SetFileName(NULL);
-	}
-
-	FileBlockingItem(int type, char const* filename, float elapsed, int accessType) :
-		m_ItemType((FileBlockingWarning_t)type),
-		m_flElapsed(elapsed),
-		m_nAccessType(accessType)
-	{
-		SetFileName(filename);
-	}
-
-	void SetFileName(char const* filename)
-	{
-		if (!filename)
-		{
-			m_szFilename[0] = 0;
-			return;
-		}
-
-		int len = Q_strlen(filename);
-		if (len >= sizeof(m_szFilename))
-		{
-			Q_strncpy(m_szFilename, &filename[len - sizeof(m_szFilename) + 1], sizeof(m_szFilename));
-		}
-		else
-		{
-			Q_strncpy(m_szFilename, filename, sizeof(m_szFilename));
-		}
-	}
-
-	char const* GetFileName() const
-	{
-		return m_szFilename;
-	}
-
-	FileBlockingWarning_t	m_ItemType;
-	float					m_flElapsed;
-	byte					m_nAccessType;
-private:
-
-	char					m_szFilename[32];
-};
-#pragma pack()
-
-class IBlockingFileItemList
-{
-public:
-
-	virtual void	LockMutex() = 0;
-	virtual void	UnlockMutex() = 0;
-
-	virtual int		First() const = 0;
-	virtual int		Next(int i) const = 0;
-	virtual int		InvalidIndex() const = 0;
-
-	virtual const	FileBlockingItem& Get(int index) const = 0;
-
-	virtual void	Reset() = 0;
-};
-
-#endif  
-
-enum FilesystemMountRetval_t
-{
-	FILESYSTEM_MOUNT_OK = 0,
-	FILESYSTEM_MOUNT_FAILED,
-};
-
-enum SearchPathAdd_t
-{
-	PATH_ADD_TO_HEAD,			   
-	PATH_ADD_TO_TAIL,			   
-	PATH_ADD_TO_TAIL_ATINDEX,	   
-};
-
-enum FilesystemOpenExFlags_t
-{
-	FSOPEN_UNBUFFERED = (1 << 0),
-	FSOPEN_FORCE_TRACK_CRC = (1 << 1),		                 
-											FSOPEN_NEVERINPACK = (1 << 2),		               
-};
-
-#define FILESYSTEM_INVALID_HANDLE	( FileHandle_t )0
-
-struct FileSystemStatistics
-{
-	CInterlockedUInt	nReads,
-		nWrites,
-		nBytesRead,
-		nBytesWritten,
-		nSeeks;
-};
-
-typedef void* (*FSAllocFunc_t)(const char* pszFilename, unsigned nBytes);
-
-
-typedef void (*FSDirtyDiskReportFunc_t)();
-
-
-DECLARE_POINTER_HANDLE(FSAsyncControl_t);
-DECLARE_POINTER_HANDLE(FSAsyncFile_t);
-const FSAsyncFile_t FS_INVALID_ASYNC_FILE = (FSAsyncFile_t)(0x0000ffff);
-
-
-enum FSAsyncStatus_t
-{
-	FSASYNC_ERR_ALIGNMENT = -6,	      
-	FSASYNC_ERR_FAILURE = -5,	   
-	FSASYNC_ERR_READING = -4,	    
-	FSASYNC_ERR_NOMEMORY = -3,	      
-	FSASYNC_ERR_UNKNOWNID = -2,	      
-	FSASYNC_ERR_FILEOPEN = -1,	          
-	FSASYNC_OK = 0,	   
-	FSASYNC_STATUS_PENDING,			       
-	FSASYNC_STATUS_INPROGRESS,		    
-	FSASYNC_STATUS_ABORTED,			     
-	FSASYNC_STATUS_UNSERVICED,		     
-};
-
-enum FSAsyncFlags_t
-{
-	FSASYNC_FLAGS_ALLOCNOFREE = (1 << 0),	        
-	FSASYNC_FLAGS_FREEDATAPTR = (1 << 1),	        
-	FSASYNC_FLAGS_SYNC = (1 << 2),	           
-	FSASYNC_FLAGS_NULLTERMINATE = (1 << 3),	           
-};
-
-enum EFileCRCStatus
-{
-	k_eFileCRCStatus_CantOpenFile,		      
-	k_eFileCRCStatus_GotCRC,
-	k_eFileCRCStatus_FileInVPK,
-};
-
-enum ECacheCRCType
-{
-	k_eCacheCRCType_SingleFile,
-	k_eCacheCRCType_Directory,
-	k_eCacheCRCType_Directory_Recursive
-};
-
-struct FileAsyncRequest_t;
-typedef void (*FSAsyncCallbackFunc_t)(const FileAsyncRequest_t& request, int nBytesRead, FSAsyncStatus_t err);
-
-typedef void (*FSAsyncScanAddFunc_t)(void* pContext, char* pFoundPath, char* pFoundFile);
-typedef void (*FSAsyncScanCompleteFunc_t)(void* pContext, FSAsyncStatus_t err);
-
-struct FileAsyncRequest_t
-{
-	FileAsyncRequest_t() { memset(this, 0, sizeof(*this)); hSpecificAsyncFile = FS_INVALID_ASYNC_FILE; }
-	const char* pszFilename;		   
-	void* pData;				      
-	int						nOffset;			    
-	int						nBytes;				       
-	FSAsyncCallbackFunc_t	pfnCallback;		   
-	void* pContext;			    
-	int						priority;			    
-	unsigned				flags;				  
-	const char* pszPathID;			                
-	FSAsyncFile_t			hSpecificAsyncFile;      
-	FSAllocFunc_t			pfnAlloc;			         
-};
-
-
-struct FileHash_t
-{
-	enum EFileHashType_t
-	{
-		k_EFileHashTypeUnknown = 0,
-		k_EFileHashTypeEntireFile = 1,
-		k_EFileHashTypeIncompleteFile = 2,
-	};
-	FileHash_t()
-	{
-		m_eFileHashType = FileHash_t::k_EFileHashTypeUnknown;
-		m_cbFileLen = 0;
-		m_PackFileID = 0;
-		m_nPackFileNumber = 0;
-	}
-	int m_eFileHashType;
-	CRC32_t m_crcIOSequence;
-	MD5Value_t m_md5contents;
-	int m_cbFileLen;
-	int m_PackFileID;
-	int m_nPackFileNumber;
-
-	bool operator==(const FileHash_t& src) const
-	{
-		return m_crcIOSequence == src.m_crcIOSequence &&
-			m_md5contents == src.m_md5contents &&
-			m_eFileHashType == src.m_eFileHashType;
-	}
-	bool operator!=(const FileHash_t& src) const
-	{
-		return m_crcIOSequence != src.m_crcIOSequence ||
-			m_md5contents != src.m_md5contents ||
-			m_eFileHashType != src.m_eFileHashType;
-	}
-
-};
-
-class CUnverifiedFileHash
-{
-public:
-	char m_PathID[MAX_PATH];
-	char m_Filename[MAX_PATH];
-	int m_nFileFraction;
-	FileHash_t m_FileHash;
-};
-
-class CUnverifiedCRCFile
-{
-public:
-	char m_PathID[MAX_PATH];
-	char m_Filename[MAX_PATH];
-	CRC32_t m_CRC;
-};
-
-
-#define WHITELIST_SPEW_WHILE_LOADING		0x0001	          
-#define WHITELIST_SPEW_RELOAD_FILES			0x0002	          
-#define WHITELIST_SPEW_DONT_RELOAD_FILES	0x0004	           
-
-
-
-#define DLC_LICENSE_ID( x )				( ( ( (unsigned int)( x ) ) >> 24 ) & 0x000000FF )
-#define DLC_LICENSE_MINORVERSION( x )	( ( ( (unsigned int)( x ) ) >> 16 ) & 0x000000FF )
-#define DLC_LICENSE_FLAGS( x )			( ( ( (unsigned int)( x ) ) & 0x0000FFFF ) )
-
-#define DLCFLAGS_PRESENCE_ONLY			0x0001	     
-
-
-
-#define BASEFILESYSTEM_INTERFACE_VERSION		"VBaseFileSystem011"
-
-abstract_class IThreadedFileMD5Processor
-{
-public:
-	virtual int				SubmitThreadedMD5Request(uint8 * pubBuffer, int cubBuffer, int PackFileID, int nPackFileNumber, int nPackFileFraction) = 0;
-	virtual bool			BlockUntilMD5RequestComplete(int iRequest, MD5Value_t* pMd5ValueOut) = 0;
-	virtual bool			IsMD5RequestComplete(int iRequest, MD5Value_t* pMd5ValueOut) = 0;
-};
-
-abstract_class IBaseFileSystem
-{
-public:
-	virtual int				Read(void* pOutput, int size, FileHandle_t file) = 0;
-	virtual int				Write(void const* pInput, int size, FileHandle_t file) = 0;
-
-	virtual FileHandle_t	Open(const char* pFileName, const char* pOptions, const char* pathID = 0) = 0;
-	virtual void			Close(FileHandle_t file) = 0;
-
-
-	virtual void			Seek(FileHandle_t file, int pos, FileSystemSeek_t seekType) = 0;
-	virtual unsigned int	Tell(FileHandle_t file) = 0;
-	virtual unsigned int	Size(FileHandle_t file) = 0;
-	virtual unsigned int	Size(const char* pFileName, const char* pPathID = 0) = 0;
-
-	virtual void			Flush(FileHandle_t file) = 0;
-	virtual bool			Precache(const char* pFileName, const char* pPathID = 0) = 0;
-
-	virtual bool			FileExists(const char* pFileName, const char* pPathID = 0) = 0;
-	virtual bool			IsFileWritable(char const* pFileName, const char* pPathID = 0) = 0;
-	virtual bool			SetFileWritable(char const* pFileName, bool writable, const char* pPathID = 0) = 0;
-
-	virtual long			GetFileTime(const char* pFileName, const char* pPathID = 0) = 0;
-
-	virtual bool			ReadFile(const char* pFileName, const char* pPath, CUtlBuffer& buf, int nMaxBytes = 0, int nStartingByte = 0, FSAllocFunc_t pfnAlloc = NULL) = 0;
-	virtual bool			WriteFile(const char* pFileName, const char* pPath, CUtlBuffer& buf) = 0;
-	virtual bool			UnzipFile(const char* pFileName, const char* pPath, const char* pDestination) = 0;
-};
-
-abstract_class IIoStats
-{
-public:
-	virtual void OnFileSeek(int nTimeInMs) = 0;
-	virtual void OnFileRead(int nTimeInMs, int nBytesRead) = 0;
-	virtual void OnFileOpen(const char* pFileName) = 0;
-
-	virtual int GetNumberOfFileSeeks() = 0;
-	virtual int GetTimeInFileSeek() = 0;
-
-	virtual int GetNumberOfFileReads() = 0;
-	virtual int GetTimeInFileReads() = 0;
-	virtual int GetFileReadTotalSize() = 0;
-
-	virtual int GetNumberOfFileOpens() = 0;
-
-	virtual void Reset() = 0;
-
-protected:
-	virtual ~IIoStats()
-	{
-	}
-};
-
-abstract_class IFileSystem : public IAppSystem, public IBaseFileSystem
-{
-public:
-	virtual bool			IsSteam() const = 0;
-
-	virtual	FilesystemMountRetval_t MountSteamContent(int nExtraAppId = -1) = 0;
-
-	virtual void			AddSearchPath(const char* pPath, const char* pathID, SearchPathAdd_t addType = PATH_ADD_TO_TAIL) = 0;
-	virtual bool			RemoveSearchPath(const char* pPath, const char* pathID = 0) = 0;
-
-	virtual void			RemoveAllSearchPaths(void) = 0;
-
-	virtual void			RemoveSearchPaths(const char* szPathID) = 0;
-
-	virtual void			MarkPathIDByRequestOnly(const char* pPathID, bool bRequestOnly) = 0;
-
-	virtual bool			IsFileInReadOnlySearchPath(const char* pPath, const char* pathID = 0) = 0;
-
-	virtual const char* RelativePathToFullPath(const char* pFileName, const char* pPathID, char* pLocalPath, int localPathBufferSize, PathTypeFilter_t pathFilter = FILTER_NONE, PathTypeQuery_t* pPathType = NULL) = 0;
-#if IsGameConsole()
-	virtual bool            GetPackFileInfoFromRelativePath(const char* pFileName, const char* pPathID, char* pPackPath, int nPackPathBufferSize, int64& nPosition, int64& nLength) = 0;
-#endif
-	virtual int				GetSearchPath(const char* pathID, bool bGetPackFiles, char* pPath, int nMaxLen) = 0;
-
-	virtual bool			AddPackFile(const char* fullpath, const char* pathID) = 0;
-
-	virtual void			RemoveFile(char const* pRelativePath, const char* pathID = 0) = 0;
-
-	virtual bool			RenameFile(char const* pOldPath, char const* pNewPath, const char* pathID = 0) = 0;
-
-	virtual void			CreateDirHierarchy(const char* path, const char* pathID = 0) = 0;
-
-	virtual bool			IsDirectory(const char* pFileName, const char* pathID = 0) = 0;
-
-	virtual void			FileTimeToString(char* pStrip, int maxCharsIncludingTerminator, long fileTime) = 0;
-
-	virtual void			SetBufferSize(FileHandle_t file, unsigned nBytes) = 0;
-
-	virtual bool			IsOk(FileHandle_t file) = 0;
-
-	virtual bool			EndOfFile(FileHandle_t file) = 0;
-
-	virtual char* ReadLine(char* pOutput, int maxChars, FileHandle_t file) = 0;
-#if ! defined(SWIG)
-	virtual int				FPrintf(FileHandle_t file, PRINTF_FORMAT_STRING const char* pFormat, ...) FMTFUNCTION(3, 4) = 0;
-#else
-	virtual int				FPrintf(FileHandle_t file, const char* pFormat, ...) FMTFUNCTION(3, 4) = 0;
-#endif
-
-	virtual CSysModule* LoadModule(const char* pFileName, const char* pPathID = 0, bool bValidatedDllOnly = true) = 0;
-	virtual void			UnloadModule(CSysModule* pModule) = 0;
-
-	virtual const char* FindFirst(const char* pWildCard, FileFindHandle_t* pHandle) = 0;
-	virtual const char* FindNext(FileFindHandle_t handle) = 0;
-	virtual bool			FindIsDirectory(FileFindHandle_t handle) = 0;
-	virtual void			FindClose(FileFindHandle_t handle) = 0;
-
-	virtual const char* FindFirstEx(
-		const char* pWildCard,
-		const char* pPathID,
-		FileFindHandle_t* pHandle
-		) = 0;
-
-	virtual void			FindFileAbsoluteList(CUtlVector< CUtlString >& outAbsolutePathNames, const char* pWildCard, const char* pPathID) = 0;
-
-	virtual const char* GetLocalPath(const char* pFileName, char* pLocalPath, int localPathBufferSize) = 0;
-
-	virtual bool			FullPathToRelativePath(const char* pFullpath, char* pRelative, int maxlen) = 0;
-
-	virtual bool			GetCurrentDirectory(char* pDirectory, int maxlen) = 0;
-
-	virtual FileNameHandle_t	FindOrAddFileName(char const* pFileName) = 0;
-	virtual bool				String(const FileNameHandle_t& handle, char* buf, int buflen) = 0;
-
-			FSAsyncStatus_t	AsyncRead(const FileAsyncRequest_t& request, FSAsyncControl_t* phControl = NULL) { return AsyncReadMultiple(&request, 1, phControl); }
-	virtual FSAsyncStatus_t	AsyncReadMultiple(const FileAsyncRequest_t* pRequests, int nRequests,  FSAsyncControl_t* phControls = NULL) = 0;
-	virtual FSAsyncStatus_t	AsyncAppend(const char* pFileName, const void* pSrc, int nSrcBytes, bool bFreeMemory, FSAsyncControl_t* pControl = NULL) = 0;
-	virtual FSAsyncStatus_t	AsyncAppendFile(const char* pAppendToFileName, const char* pAppendFromFileName, FSAsyncControl_t* pControl = NULL) = 0;
-	virtual void			AsyncFinishAll(int iToPriority = 0) = 0;
-	virtual void			AsyncFinishAllWrites() = 0;
-	virtual FSAsyncStatus_t	AsyncFlush() = 0;
-	virtual bool			AsyncSuspend() = 0;
-	virtual bool			AsyncResume() = 0;
-
-	virtual FSAsyncStatus_t	AsyncBeginRead(const char* pszFile, FSAsyncFile_t* phFile) = 0;
-	virtual FSAsyncStatus_t	AsyncEndRead(FSAsyncFile_t hFile) = 0;
-
-	virtual FSAsyncStatus_t	AsyncFinish(FSAsyncControl_t hControl, bool wait = true) = 0;
-	virtual FSAsyncStatus_t	AsyncGetResult(FSAsyncControl_t hControl, void** ppData, int* pSize) = 0;
-	virtual FSAsyncStatus_t	AsyncAbort(FSAsyncControl_t hControl) = 0;
-	virtual FSAsyncStatus_t	AsyncStatus(FSAsyncControl_t hControl) = 0;
-	virtual FSAsyncStatus_t	AsyncSetPriority(FSAsyncControl_t hControl, int newPriority) = 0;
-	virtual void			AsyncAddRef(FSAsyncControl_t hControl) = 0;
-	virtual void			AsyncRelease(FSAsyncControl_t hControl) = 0;
-
-	virtual WaitForResourcesHandle_t WaitForResources(const char* resourcelist) = 0;
-	virtual bool			GetWaitForResourcesProgress(WaitForResourcesHandle_t handle, float* progress    , bool* complete   ) = 0;
-	virtual void			CancelWaitForResources(WaitForResourcesHandle_t handle) = 0;
-
-	virtual int				HintResourceNeed(const char* hintlist, int forgetEverything) = 0;
-	virtual bool			IsFileImmediatelyAvailable(const char* pFileName) = 0;
-
-	virtual void			GetLocalCopy(const char* pFileName) = 0;
-
-	virtual void			PrintOpenedFiles(void) = 0;
-	virtual void			PrintSearchPaths(void) = 0;
-
-	virtual void			SetWarningFunc(void (*pfnWarning)(const char* fmt, ...)) = 0;
-	virtual void			SetWarningLevel(FileWarningLevel_t level) = 0;
-	virtual void			AddLoggingFunc(void (*pfnLogFunc)(const char* fileName, const char* accessType)) = 0;
-	virtual void			RemoveLoggingFunc(FileSystemLoggingFunc_t logFunc) = 0;
-
-	virtual const FileSystemStatistics* GetFilesystemStatistics() = 0;
-
-#if defined( _PS3 )
-	virtual void LogFileAccess(const char* pFullFileName) = 0;
-
-	virtual bool PrefetchFile(const char* pFileName, int nPriority, bool bPersist) = 0;
-	virtual bool PrefetchFile(const char* pFileName, int nPriority, bool bPersist, int64 nOffset, int64 nSize) = 0;
-	virtual void FlushCache() = 0;
-	virtual void SuspendPrefetches(const char* pWhy) = 0;
-	virtual void ResumePrefetches(const char* pWhy) = 0;
-
-	virtual void OnSaveStateChanged(bool bSaving) = 0;
-
-	virtual bool IsPrefetchingDone() = 0;
-
-#endif 
-	virtual FileHandle_t	OpenEx(const char* pFileName, const char* pOptions, unsigned flags = 0, const char* pathID = 0, char** ppszResolvedFilename = NULL) = 0;
-
-	virtual int				ReadEx(void* pOutput, int sizeDest, int size, FileHandle_t file) = 0;
-	virtual int				ReadFileEx(const char* pFileName, const char* pPath, void** ppBuf, bool bNullTerminate = false, bool bOptimalAlloc = false, int nMaxBytes = 0, int nStartingByte = 0, FSAllocFunc_t pfnAlloc = NULL) = 0;
-
-	virtual FileNameHandle_t	FindFileName(char const* pFileName) = 0;
-
-#if defined( TRACK_BLOCKING_IO )
-	virtual void			EnableBlockingFileAccessTracking(bool state) = 0;
-	virtual bool			IsBlockingFileAccessEnabled() const = 0;
-
-	virtual IBlockingFileItemList* RetrieveBlockingFileAccessInfo() = 0;
-#endif
-
-	virtual void SetupPreloadData() = 0;
-	virtual void DiscardPreloadData() = 0;
-
-	enum KeyValuesPreloadType_t
-	{
-		TYPE_VMT,
-		TYPE_SOUNDEMITTER,
-		TYPE_SOUNDSCAPE,
-		TYPE_SOUNDOPERATORS,
-		NUM_PRELOAD_TYPES
-	};
-
-	virtual KeyValues* LoadKeyValues(KeyValuesPreloadType_t type, char const* filename, char const* pPathID = 0) = 0;
-	virtual bool		LoadKeyValues(KeyValues& head, KeyValuesPreloadType_t type, char const* filename, char const* pPathID = 0) = 0;
-
-	virtual FSAsyncStatus_t	AsyncWrite(const char* pFileName, const void* pSrc, int nSrcBytes, bool bFreeMemory, bool bAppend = false, FSAsyncControl_t* pControl = NULL) = 0;
-	virtual FSAsyncStatus_t	AsyncWriteFile(const char* pFileName, const CUtlBuffer* pSrc, int nSrcBytes, bool bFreeMemory, bool bAppend = false, FSAsyncControl_t* pControl = NULL) = 0;
-	FSAsyncStatus_t			AsyncReadCreditAlloc(const FileAsyncRequest_t& request, const char* pszFile, int line, FSAsyncControl_t* phControl = NULL) { return AsyncReadMultipleCreditAlloc(&request, 1, pszFile, line, phControl); }
-	virtual FSAsyncStatus_t	AsyncReadMultipleCreditAlloc(const FileAsyncRequest_t* pRequests, int nRequests, const char* pszFile, int line, FSAsyncControl_t* phControls = NULL) = 0;
-
-	virtual FSAsyncStatus_t AsyncDirectoryScan(const char* pSearchSpec, bool recurseFolders,  void* pContext, FSAsyncScanAddFunc_t pfnAdd, FSAsyncScanCompleteFunc_t pfnDone, FSAsyncControl_t* pControl = NULL) = 0;
-
-	virtual bool			GetFileTypeForFullPath(char const* pFullPath, wchar_t* buf, size_t bufSizeInBytes) = 0;
-
-	virtual bool		ReadToBuffer(FileHandle_t hFile, CUtlBuffer& buf, int nMaxBytes = 0, FSAllocFunc_t pfnAlloc = NULL) = 0;
-
-	virtual bool		GetOptimalIOConstraints(FileHandle_t hFile, unsigned* pOffsetAlign, unsigned* pSizeAlign, unsigned* pBufferAlign) = 0;
-	inline unsigned		GetOptimalReadSize(FileHandle_t hFile, unsigned nLogicalSize);
-	virtual void* AllocOptimalReadBuffer(FileHandle_t hFile, unsigned nSize = 0, unsigned nOffset = 0) = 0;
-	virtual void		FreeOptimalReadBuffer(void*) = 0;
-
-	virtual void		BeginMapAccess() = 0;
-	virtual void		EndMapAccess() = 0;
-
-	virtual bool		FullPathToRelativePathEx(const char* pFullpath, const char* pPathId, char* pRelative, int maxlen) = 0;
-
-	virtual int			GetPathIndex(const FileNameHandle_t& handle) = 0;
-	virtual long		GetPathTime(const char* pPath, const char* pPathID) = 0;
-
-	virtual DVDMode_t	GetDVDMode() = 0;
-
-	virtual void			EnableWhitelistFileTracking(bool bEnable, bool bCacheAllVPKHashes, bool bRecalculateAndCheckHashes) = 0;
-
-	virtual void			RegisterFileWhitelist(IFileList* pWantCRCList, IFileList* pAllowFromDiskList, IFileList** pFilesToReload) = 0;
-
-	virtual void			MarkAllCRCsUnverified() = 0;
-
-	virtual void			CacheFileCRCs(const char* pPathname, ECacheCRCType eType, IFileList* pFilter) = 0;
-	virtual EFileCRCStatus	CheckCachedFileHash(const char* pPathID, const char* pRelativeFilename, int nFileFraction, FileHash_t* pFileHash) = 0;
-
-	virtual int				GetUnverifiedFileHashes(CUnverifiedFileHash* pFiles, int nMaxFiles) = 0;
-
-	virtual int				GetWhitelistSpewFlags() = 0;
-	virtual void			SetWhitelistSpewFlags(int flags) = 0;
-
-	virtual void			InstallDirtyDiskReportFunc(FSDirtyDiskReportFunc_t func) = 0;
-
-	virtual bool			IsLaunchedFromXboxHDD() = 0;
-	virtual bool			IsInstalledToXboxHDDCache() = 0;
-	virtual bool			IsDVDHosted() = 0;
-	virtual bool			IsInstallAllowed() = 0;
-
-	virtual int				GetSearchPathID(char* pPath, int nMaxLen) = 0;
-	virtual bool			FixupSearchPathsAfterInstall() = 0;
-
-	virtual FSDirtyDiskReportFunc_t		GetDirtyDiskReportFunc() = 0;
-
-	virtual void AddVPKFile(char const* pszName, SearchPathAdd_t addType = PATH_ADD_TO_TAIL) = 0;
-	virtual void RemoveVPKFile(char const* pszName) = 0;
-	virtual void GetVPKFileNames(CUtlVector<CUtlString>& destVector) = 0;
-	virtual void			RemoveAllMapSearchPaths() = 0;
-	virtual void			SyncDvdDevCache() = 0;
-
-	virtual bool			GetStringFromKVPool(CRC32_t poolKey, unsigned int key, char* pOutBuff, int buflen) = 0;
-
-	virtual bool			DiscoverDLC(int iController) = 0;
-	virtual int				IsAnyDLCPresent(bool* pbDLCSearchPathMounted = NULL) = 0;
-	virtual bool			GetAnyDLCInfo(int iDLC, unsigned int* pLicenseMask, wchar_t* pTitleBuff, int nOutTitleSize) = 0;
-	virtual int				IsAnyCorruptDLC() = 0;
-	virtual bool			GetAnyCorruptDLCInfo(int iCorruptDLC, wchar_t* pTitleBuff, int nOutTitleSize) = 0;
-	virtual bool			AddDLCSearchPaths() = 0;
-	virtual bool			IsSpecificDLCPresent(unsigned int nDLCPackage) = 0;
-
-	virtual void            SetIODelayAlarm(float flThreshhold) = 0;
-
-	virtual bool			AddXLSPUpdateSearchPath(const void* pData, int nSize) = 0;
-
-	virtual IIoStats* GetIoStats() = 0;
-
-	virtual void			CacheAllVPKFileHashes(bool bCacheAllVPKHashes, bool bRecalculateAndCheckHashes) = 0;
-	virtual bool			CheckVPKFileHash(int PackFileID, int nPackFileNumber, int nFileFraction, MD5Value_t& md5Value) = 0;
-
-	virtual void			GetVPKFileStatisticsKV(KeyValues* pKV) = 0;
-
-};
-
-#if defined( _X360 ) && !defined( _CERT )
-extern char g_szXboxProfileLastFileOpened[MAX_PATH];
-#define SetLastProfileFileRead( s ) Q_strncpy( g_szXboxProfileLastFileOpened, sizeof( g_szXboxProfileLastFileOpened), pFileName )
-#define GetLastProfileFileRead() (&g_szXboxProfileLastFileOpened[0])
-#else
-#define SetLastProfileFileRead( s ) ((void)0)
-#define GetLastProfileFileRead() NULL
-#endif
-
-#if defined( _X360 ) && defined( _BASETSD_H_ )
-class CXboxDiskCacheSetter
-{
-public:
-	CXboxDiskCacheSetter(SIZE_T newSize)
-	{
-		m_oldSize = XGetFileCacheSize();
-		XSetFileCacheSize(newSize);
-	}
-
-	~CXboxDiskCacheSetter()
-	{
-		XSetFileCacheSize(m_oldSize);
-	}
-private:
-	SIZE_T m_oldSize;
-};
-#define DISK_INTENSIVE() CXboxDiskCacheSetter cacheSetter( 1024*1024 )
-#else
-#define DISK_INTENSIVE() ((void)0)
-#endif
-
-inline unsigned IFileSystem::GetOptimalReadSize(FileHandle_t hFile, unsigned nLogicalSize)
-{
-	unsigned align;
-	if (GetOptimalIOConstraints(hFile, &align, NULL, NULL))
-		return AlignValue(nLogicalSize, align);
-	else
-		return nLogicalSize;
-}
-
-#include "filesystem_passthru.h"
-
-#if (defined(_DEBUG) || defined(USE_MEM_DEBUG))
-#define AsyncRead( a, b ) AsyncReadCreditAlloc( a, __FILE__, __LINE__, b )
-#define AsyncReadMutiple( a, b, c ) AsyncReadMultipleCreditAlloc( a, b, __FILE__, __LINE__, c )
-#endif
-
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/filesystem_passthru.h b/SpyCustom/filesystem_passthru.h
deleted file mode 100644
index feed51a..0000000
--- a/SpyCustom/filesystem_passthru.h
+++ /dev/null
@@ -1,305 +0,0 @@
-#ifndef FILESYSTEM_PASSTHRU_H
-#define FILESYSTEM_PASSTHRU_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "filesystem.h"
-#include <stdio.h>
-#include <stdarg.h>
-
-#ifdef AsyncRead
-#undef AsyncRead
-#undef AsyncReadMutiple
-#endif
-
-template<class Base>
-class CInternalFileSystemPassThru : public Base
-{
-public:
-	CInternalFileSystemPassThru()
-	{
-		m_pBaseFileSystemPassThru = NULL;
-	}
-	virtual void InitPassThru(IBaseFileSystem* pBaseFileSystemPassThru)
-	{
-		m_pBaseFileSystemPassThru = pBaseFileSystemPassThru;
-	}
-	virtual int				Read(void* pOutput, int size, FileHandle_t file) { return m_pBaseFileSystemPassThru->Read(pOutput, size, file); }
-	virtual int				Write(void const* pInput, int size, FileHandle_t file) { return m_pBaseFileSystemPassThru->Write(pInput, size, file); }
-	virtual FileHandle_t	Open(const char* pFileName, const char* pOptions, const char* pathID) { return m_pBaseFileSystemPassThru->Open(pFileName, pOptions, pathID); }
-	virtual void			Close(FileHandle_t file) { m_pBaseFileSystemPassThru->Close(file); }
-	virtual void			Seek(FileHandle_t file, int pos, FileSystemSeek_t seekType) { m_pBaseFileSystemPassThru->Seek(file, pos, seekType); }
-	virtual unsigned int	Tell(FileHandle_t file) { return m_pBaseFileSystemPassThru->Tell(file); }
-	virtual unsigned int	Size(FileHandle_t file) { return m_pBaseFileSystemPassThru->Size(file); }
-	virtual unsigned int	Size(const char* pFileName, const char* pPathID) { return m_pBaseFileSystemPassThru->Size(pFileName, pPathID); }
-	virtual void			Flush(FileHandle_t file) { m_pBaseFileSystemPassThru->Flush(file); }
-	virtual bool			Precache(const char* pFileName, const char* pPathID) { return m_pBaseFileSystemPassThru->Precache(pFileName, pPathID); }
-	virtual bool			FileExists(const char* pFileName, const char* pPathID) { return m_pBaseFileSystemPassThru->FileExists(pFileName, pPathID); }
-	virtual bool			IsFileWritable(char const* pFileName, const char* pPathID) { return m_pBaseFileSystemPassThru->IsFileWritable(pFileName, pPathID); }
-	virtual bool			SetFileWritable(char const* pFileName, bool writable, const char* pPathID) { return m_pBaseFileSystemPassThru->SetFileWritable(pFileName, writable, pPathID); }
-	virtual long			GetFileTime(const char* pFileName, const char* pPathID) { return m_pBaseFileSystemPassThru->GetFileTime(pFileName, pPathID); }
-	virtual bool			ReadFile(const char* pFileName, const char* pPath, CUtlBuffer& buf, int nMaxBytes = 0, int nStartingByte = 0, FSAllocFunc_t pfnAlloc = NULL) { return m_pBaseFileSystemPassThru->ReadFile(pFileName, pPath, buf, nMaxBytes, nStartingByte, pfnAlloc); }
-	virtual bool			WriteFile(const char* pFileName, const char* pPath, CUtlBuffer& buf) { return m_pBaseFileSystemPassThru->WriteFile(pFileName, pPath, buf); }
-	virtual bool			UnzipFile(const char* pFileName, const char* pPath, const char* pDestination) { return m_pBaseFileSystemPassThru->UnzipFile(pFileName, pPath, pDestination); }
-
-protected:
-	IBaseFileSystem* m_pBaseFileSystemPassThru;
-};
-
-
-class CBaseFileSystemPassThru : public CInternalFileSystemPassThru<IBaseFileSystem>
-{
-public:
-};
-
-
-class CFileSystemPassThru : public CInternalFileSystemPassThru<IFileSystem>
-{
-public:
-	typedef CInternalFileSystemPassThru<IFileSystem> BaseClass;
-
-	CFileSystemPassThru()
-	{
-		m_pFileSystemPassThru = NULL;
-	}
-	virtual void InitPassThru(IFileSystem* pFileSystemPassThru, bool bBaseOnly)
-	{
-		if (!bBaseOnly)
-			m_pFileSystemPassThru = pFileSystemPassThru;
-
-		BaseClass::InitPassThru(pFileSystemPassThru);
-	}
-
-	virtual bool Connect(CreateInterfaceFn factory) { return m_pFileSystemPassThru->Connect(factory); }
-	virtual void Disconnect() { m_pFileSystemPassThru->Disconnect(); }
-	virtual void* QueryInterface(const char* pInterfaceName) { return m_pFileSystemPassThru->QueryInterface(pInterfaceName); }
-	virtual InitReturnVal_t Init() { return m_pFileSystemPassThru->Init(); }
-	virtual void Shutdown() { m_pFileSystemPassThru->Shutdown(); }
-	virtual const AppSystemInfo_t* GetDependencies() { return m_pFileSystemPassThru->GetDependencies(); } 
-	virtual AppSystemTier_t GetTier() { return m_pFileSystemPassThru->GetTier(); } 
-	virtual void Reconnect(CreateInterfaceFn factory, const char* pInterfaceName) { m_pFileSystemPassThru->Reconnect(factory, pInterfaceName); }
-
-	virtual void			RemoveAllSearchPaths(void) { m_pFileSystemPassThru->RemoveAllSearchPaths(); }
-	virtual void			AddSearchPath(const char* pPath, const char* pathID, SearchPathAdd_t addType) { m_pFileSystemPassThru->AddSearchPath(pPath, pathID, addType); }
-	virtual bool			RemoveSearchPath(const char* pPath, const char* pathID) { return m_pFileSystemPassThru->RemoveSearchPath(pPath, pathID); }
-	virtual void			RemoveFile(char const* pRelativePath, const char* pathID) { m_pFileSystemPassThru->RemoveFile(pRelativePath, pathID); }
-	virtual bool			RenameFile(char const* pOldPath, char const* pNewPath, const char* pathID) { return m_pFileSystemPassThru->RenameFile(pOldPath, pNewPath, pathID); }
-	virtual void			CreateDirHierarchy(const char* path, const char* pathID) { m_pFileSystemPassThru->CreateDirHierarchy(path, pathID); }
-	virtual bool			IsDirectory(const char* pFileName, const char* pathID) { return m_pFileSystemPassThru->IsDirectory(pFileName, pathID); }
-	virtual void			FileTimeToString(char* pStrip, int maxCharsIncludingTerminator, long fileTime) { m_pFileSystemPassThru->FileTimeToString(pStrip, maxCharsIncludingTerminator, fileTime); }
-	virtual void			SetBufferSize(FileHandle_t file, unsigned nBytes) { m_pFileSystemPassThru->SetBufferSize(file, nBytes); }
-	virtual bool			IsOk(FileHandle_t file) { return m_pFileSystemPassThru->IsOk(file); }
-	virtual bool			EndOfFile(FileHandle_t file) { return m_pFileSystemPassThru->EndOfFile(file); }
-	virtual char* ReadLine(char* pOutput, int maxChars, FileHandle_t file) { return m_pFileSystemPassThru->ReadLine(pOutput, maxChars, file); }
-	virtual int				FPrintf(FileHandle_t file, const char* pFormat, ...)
-	{
-		char str[8192];
-		va_list marker;
-		va_start(marker, pFormat);
-		_vsnprintf(str, sizeof(str), pFormat, marker);
-		va_end(marker);
-		return m_pFileSystemPassThru->FPrintf(file, "%s", str);
-	}
-	virtual CSysModule* LoadModule(const char* pFileName, const char* pPathID, bool bValidatedDllOnly) { return m_pFileSystemPassThru->LoadModule(pFileName, pPathID, bValidatedDllOnly); }
-	virtual void			UnloadModule(CSysModule* pModule) { m_pFileSystemPassThru->UnloadModule(pModule); }
-	virtual const char* FindFirst(const char* pWildCard, FileFindHandle_t* pHandle) { return m_pFileSystemPassThru->FindFirst(pWildCard, pHandle); }
-	virtual const char* FindNext(FileFindHandle_t handle) { return m_pFileSystemPassThru->FindNext(handle); }
-	virtual bool			FindIsDirectory(FileFindHandle_t handle) { return m_pFileSystemPassThru->FindIsDirectory(handle); }
-	virtual void			FindClose(FileFindHandle_t handle) { m_pFileSystemPassThru->FindClose(handle); }
-	virtual void			FindFileAbsoluteList(CUtlVector< CUtlString >& outAbsolutePathNames, const char* pWildCard, const char* pPathID) { m_pFileSystemPassThru->FindFileAbsoluteList(outAbsolutePathNames, pWildCard, pPathID); }
-	virtual const char* GetLocalPath(const char* pFileName, char* pLocalPath, int localPathBufferSize) { return m_pFileSystemPassThru->GetLocalPath(pFileName, pLocalPath, localPathBufferSize); }
-	virtual bool			FullPathToRelativePath(const char* pFullpath, char* pRelative, int maxlen) { return m_pFileSystemPassThru->FullPathToRelativePath(pFullpath, pRelative, maxlen); }
-	virtual bool			GetCurrentDirectory(char* pDirectory, int maxlen) { return m_pFileSystemPassThru->GetCurrentDirectory(pDirectory, maxlen); }
-	virtual void			PrintOpenedFiles(void) { m_pFileSystemPassThru->PrintOpenedFiles(); }
-	virtual void			PrintSearchPaths(void) { m_pFileSystemPassThru->PrintSearchPaths(); }
-	virtual void			SetWarningFunc(void (*pfnWarning)(const char* fmt, ...)) { m_pFileSystemPassThru->SetWarningFunc(pfnWarning); }
-	virtual void			SetWarningLevel(FileWarningLevel_t level) { m_pFileSystemPassThru->SetWarningLevel(level); }
-	virtual void			AddLoggingFunc(void (*pfnLogFunc)(const char* fileName, const char* accessType)) { m_pFileSystemPassThru->AddLoggingFunc(pfnLogFunc); }
-	virtual void			RemoveLoggingFunc(FileSystemLoggingFunc_t logFunc) { m_pFileSystemPassThru->RemoveLoggingFunc(logFunc); }
-	virtual FSAsyncStatus_t	AsyncReadMultiple(const FileAsyncRequest_t* pRequests, int nRequests, FSAsyncControl_t* pControls) { return m_pFileSystemPassThru->AsyncReadMultiple(pRequests, nRequests, pControls); }
-	virtual FSAsyncStatus_t	AsyncReadMultipleCreditAlloc(const FileAsyncRequest_t* pRequests, int nRequests, const char* pszFile, int line, FSAsyncControl_t* pControls) { return m_pFileSystemPassThru->AsyncReadMultipleCreditAlloc(pRequests, nRequests, pszFile, line, pControls); }
-	virtual FSAsyncStatus_t AsyncDirectoryScan(const char* pSearchSpec, bool recurseFolders, void* pContext, FSAsyncScanAddFunc_t pfnAdd, FSAsyncScanCompleteFunc_t pfnDone, FSAsyncControl_t* pControl = NULL) { return m_pFileSystemPassThru->AsyncDirectoryScan(pSearchSpec, recurseFolders, pContext, pfnAdd, pfnDone, pControl); }
-	virtual FSAsyncStatus_t	AsyncFinish(FSAsyncControl_t hControl, bool wait) { return m_pFileSystemPassThru->AsyncFinish(hControl, wait); }
-	virtual FSAsyncStatus_t	AsyncGetResult(FSAsyncControl_t hControl, void** ppData, int* pSize) { return m_pFileSystemPassThru->AsyncGetResult(hControl, ppData, pSize); }
-	virtual FSAsyncStatus_t	AsyncAbort(FSAsyncControl_t hControl) { return m_pFileSystemPassThru->AsyncAbort(hControl); }
-	virtual FSAsyncStatus_t	AsyncStatus(FSAsyncControl_t hControl) { return m_pFileSystemPassThru->AsyncStatus(hControl); }
-	virtual FSAsyncStatus_t	AsyncFlush() { return m_pFileSystemPassThru->AsyncFlush(); }
-	virtual void			AsyncAddRef(FSAsyncControl_t hControl) { m_pFileSystemPassThru->AsyncAddRef(hControl); }
-	virtual void			AsyncRelease(FSAsyncControl_t hControl) { m_pFileSystemPassThru->AsyncRelease(hControl); }
-	virtual FSAsyncStatus_t	AsyncBeginRead(const char* pszFile, FSAsyncFile_t* phFile) { return m_pFileSystemPassThru->AsyncBeginRead(pszFile, phFile); }
-	virtual FSAsyncStatus_t	AsyncEndRead(FSAsyncFile_t hFile) { return m_pFileSystemPassThru->AsyncEndRead(hFile); }
-	virtual const FileSystemStatistics* GetFilesystemStatistics() { return m_pFileSystemPassThru->GetFilesystemStatistics(); }
-
-
-#if defined( _PS3 )
-	virtual Ps3FileType_t GetPs3FileType(const char* path) { return PS3_FILETYPE_UNKNOWN; }
-	virtual void LogFileAccess(const char* pFullFileName) { }
-
-	virtual bool PrefetchFile(const char* pFileName, int nPriority, bool bPersist) { return m_pFileSystemPassThru->PrefetchFile(pFileName, nPriority, bPersist); }
-	virtual bool PrefetchFile(const char* pFileName, int nPriority, bool bPersist, int64 nOffset, int64 nSize) { return m_pFileSystemPassThru->PrefetchFile(pFileName, nPriority, bPersist, nOffset, nSize); }
-	virtual void FlushCache() { m_pFileSystemPassThru->FlushCache(); }
-	virtual void SuspendPrefetches(const char* pWhy) { m_pFileSystemPassThru->SuspendPrefetches(pWhy); }
-	virtual void ResumePrefetches(const char* pWhy) { m_pFileSystemPassThru->ResumePrefetches(pWhy); }
-	virtual void OnSaveStateChanged(bool bSaving) { m_pFileSystemPassThru->OnSaveStateChanged(bSaving); }
-	virtual bool IsPrefetchingDone() { return m_pFileSystemPassThru->IsPrefetchingDone(); }
-#endif 
-
-	virtual WaitForResourcesHandle_t WaitForResources(const char* resourcelist) { return m_pFileSystemPassThru->WaitForResources(resourcelist); }
-	virtual bool			GetWaitForResourcesProgress(WaitForResourcesHandle_t handle,
-		float* progress, bool* complete) {
-		return m_pFileSystemPassThru->GetWaitForResourcesProgress(handle, progress, complete);
-	}
-	virtual void			CancelWaitForResources(WaitForResourcesHandle_t handle) { m_pFileSystemPassThru->CancelWaitForResources(handle); }
-	virtual int				HintResourceNeed(const char* hintlist, int forgetEverything) { return m_pFileSystemPassThru->HintResourceNeed(hintlist, forgetEverything); }
-	virtual bool			IsFileImmediatelyAvailable(const char* pFileName) { return m_pFileSystemPassThru->IsFileImmediatelyAvailable(pFileName); }
-	virtual void			GetLocalCopy(const char* pFileName) { m_pFileSystemPassThru->GetLocalCopy(pFileName); }
-	virtual FileNameHandle_t	FindOrAddFileName(char const* pFileName) { return m_pFileSystemPassThru->FindOrAddFileName(pFileName); }
-	virtual FileNameHandle_t	FindFileName(char const* pFileName) { return m_pFileSystemPassThru->FindFileName(pFileName); }
-	virtual bool				String(const FileNameHandle_t& handle, char* buf, int buflen) { return m_pFileSystemPassThru->String(handle, buf, buflen); }
-	virtual bool			IsOk2(FileHandle_t file) { return IsOk(file); }
-	virtual void			RemoveSearchPaths(const char* szPathID) { m_pFileSystemPassThru->RemoveSearchPaths(szPathID); }
-	virtual bool			IsSteam() const { return m_pFileSystemPassThru->IsSteam(); }
-	virtual	FilesystemMountRetval_t MountSteamContent(int nExtraAppId = -1) { return m_pFileSystemPassThru->MountSteamContent(nExtraAppId); }
-
-	virtual const char* FindFirstEx(
-		const char* pWildCard,
-		const char* pPathID,
-		FileFindHandle_t* pHandle
-	) {
-		return m_pFileSystemPassThru->FindFirstEx(pWildCard, pPathID, pHandle);
-	}
-	virtual void			MarkPathIDByRequestOnly(const char* pPathID, bool bRequestOnly) { m_pFileSystemPassThru->MarkPathIDByRequestOnly(pPathID, bRequestOnly); }
-	virtual bool			IsFileInReadOnlySearchPath(const char* pPath, const char* pathID) { return m_pFileSystemPassThru->IsFileInReadOnlySearchPath(pPath, pathID); }
-
-	virtual bool			AddPackFile(const char* fullpath, const char* pathID) { return m_pFileSystemPassThru->AddPackFile(fullpath, pathID); }
-	virtual FSAsyncStatus_t	AsyncAppend(const char* pFileName, const void* pSrc, int nSrcBytes, bool bFreeMemory, FSAsyncControl_t* pControl) { return m_pFileSystemPassThru->AsyncAppend(pFileName, pSrc, nSrcBytes, bFreeMemory, pControl); }
-	virtual FSAsyncStatus_t	AsyncWrite(const char* pFileName, const void* pSrc, int nSrcBytes, bool bFreeMemory, bool bAppend, FSAsyncControl_t* pControl) { return m_pFileSystemPassThru->AsyncWrite(pFileName, pSrc, nSrcBytes, bFreeMemory, bAppend, pControl); }
-	virtual FSAsyncStatus_t	AsyncWriteFile(const char* pFileName, const CUtlBuffer* pSrc, int nSrcBytes, bool bFreeMemory, bool bAppend, FSAsyncControl_t* pControl) { return m_pFileSystemPassThru->AsyncWriteFile(pFileName, pSrc, nSrcBytes, bFreeMemory, bAppend, pControl); }
-	virtual FSAsyncStatus_t	AsyncAppendFile(const char* pDestFileName, const char* pSrcFileName, FSAsyncControl_t* pControl) { return m_pFileSystemPassThru->AsyncAppendFile(pDestFileName, pSrcFileName, pControl); }
-	virtual void			AsyncFinishAll(int iToPriority) { m_pFileSystemPassThru->AsyncFinishAll(iToPriority); }
-	virtual void			AsyncFinishAllWrites() { m_pFileSystemPassThru->AsyncFinishAllWrites(); }
-	virtual FSAsyncStatus_t	AsyncSetPriority(FSAsyncControl_t hControl, int newPriority) { return m_pFileSystemPassThru->AsyncSetPriority(hControl, newPriority); }
-	virtual bool			AsyncSuspend() { return m_pFileSystemPassThru->AsyncSuspend(); }
-	virtual bool			AsyncResume() { return m_pFileSystemPassThru->AsyncResume(); }
-	virtual const char* RelativePathToFullPath(const char* pFileName, const char* pPathID, char* pLocalPath, int localPathBufferSize, PathTypeFilter_t pathFilter = FILTER_NONE, PathTypeQuery_t* pPathType = NULL) { return m_pFileSystemPassThru->RelativePathToFullPath(pFileName, pPathID, pLocalPath, localPathBufferSize, pathFilter, pPathType); }
-#if IsGameConsole()
-	virtual bool            GetPackFileInfoFromRelativePath(const char* pFileName, const char* pPathID, char* pPackPath, int nPackPathBufferSize, int64& nPosition, int64& nLength) { return m_pFileSystemPassThru->GetPackFileInfoFromRelativePath(pFileName, pPathID, pPackPath, nPackPathBufferSize, nPosition, nLength); }
-#endif
-
-	virtual int				GetSearchPath(const char* pathID, bool bGetPackFiles, char* pPath, int nMaxLen) { return m_pFileSystemPassThru->GetSearchPath(pathID, bGetPackFiles, pPath, nMaxLen); }
-
-	virtual FileHandle_t	OpenEx(const char* pFileName, const char* pOptions, unsigned flags = 0, const char* pathID = 0, char** ppszResolvedFilename = NULL) { return m_pFileSystemPassThru->OpenEx(pFileName, pOptions, flags, pathID, ppszResolvedFilename); }
-	virtual int				ReadEx(void* pOutput, int destSize, int size, FileHandle_t file) { return m_pFileSystemPassThru->ReadEx(pOutput, destSize, size, file); }
-	virtual int				ReadFileEx(const char* pFileName, const char* pPath, void** ppBuf, bool bNullTerminate, bool bOptimalAlloc, int nMaxBytes = 0, int nStartingByte = 0, FSAllocFunc_t pfnAlloc = NULL) { return m_pFileSystemPassThru->ReadFileEx(pFileName, pPath, ppBuf, bNullTerminate, bOptimalAlloc, nMaxBytes, nStartingByte, pfnAlloc); }
-
-#if defined( TRACK_BLOCKING_IO )
-	virtual void			EnableBlockingFileAccessTracking(bool state) { m_pFileSystemPassThru->EnableBlockingFileAccessTracking(state); }
-	virtual bool			IsBlockingFileAccessEnabled() const { return m_pFileSystemPassThru->IsBlockingFileAccessEnabled(); }
-
-	virtual IBlockingFileItemList* RetrieveBlockingFileAccessInfo() { return m_pFileSystemPassThru->RetrieveBlockingFileAccessInfo(); }
-#endif
-	virtual void			SetupPreloadData() {}
-	virtual void			DiscardPreloadData() {}
-
-	virtual KeyValues* LoadKeyValues(KeyValuesPreloadType_t type, char const* filename, char const* pPathID = 0) { return m_pFileSystemPassThru->LoadKeyValues(type, filename, pPathID); }
-	virtual bool			LoadKeyValues(KeyValues& head, KeyValuesPreloadType_t type, char const* filename, char const* pPathID = 0) { return m_pFileSystemPassThru->LoadKeyValues(head, type, filename, pPathID); }
-
-	virtual bool			GetFileTypeForFullPath(char const* pFullPath, OUT_Z_BYTECAP(bufSizeInBytes) wchar_t* buf, size_t bufSizeInBytes) { return m_pFileSystemPassThru->GetFileTypeForFullPath(pFullPath, buf, bufSizeInBytes); }
-
-	virtual bool			GetOptimalIOConstraints(FileHandle_t hFile, unsigned* pOffsetAlign, unsigned* pSizeAlign, unsigned* pBufferAlign) { return m_pFileSystemPassThru->GetOptimalIOConstraints(hFile, pOffsetAlign, pSizeAlign, pBufferAlign); }
-	virtual void* AllocOptimalReadBuffer(FileHandle_t hFile, unsigned nSize, unsigned nOffset) { return m_pFileSystemPassThru->AllocOptimalReadBuffer(hFile, nOffset, nSize); }
-	virtual void			FreeOptimalReadBuffer(void* p) { m_pFileSystemPassThru->FreeOptimalReadBuffer(p); }
-
-	virtual void			BeginMapAccess() { m_pFileSystemPassThru->BeginMapAccess(); }
-	virtual void			EndMapAccess() { m_pFileSystemPassThru->EndMapAccess(); }
-
-	virtual bool			ReadToBuffer(FileHandle_t hFile, CUtlBuffer& buf, int nMaxBytes = 0, FSAllocFunc_t pfnAlloc = NULL) { return m_pFileSystemPassThru->ReadToBuffer(hFile, buf, nMaxBytes, pfnAlloc); }
-	virtual bool			FullPathToRelativePathEx(const char* pFullPath, const char* pPathId, char* pRelative, int nMaxLen) { return m_pFileSystemPassThru->FullPathToRelativePathEx(pFullPath, pPathId, pRelative, nMaxLen); }
-	virtual int				GetPathIndex(const FileNameHandle_t& handle) { return m_pFileSystemPassThru->GetPathIndex(handle); }
-	virtual long			GetPathTime(const char* pPath, const char* pPathID) { return m_pFileSystemPassThru->GetPathTime(pPath, pPathID); }
-
-	virtual DVDMode_t		GetDVDMode() { return m_pFileSystemPassThru->GetDVDMode(); }
-
-	virtual void EnableWhitelistFileTracking(bool bEnable, bool bCacheAllVPKHashes, bool bRecalculateAndCheckHashes)
-	{
-		m_pFileSystemPassThru->EnableWhitelistFileTracking(bEnable, bCacheAllVPKHashes, bRecalculateAndCheckHashes);
-	}
-
-	virtual void RegisterFileWhitelist(IFileList* pForceMatchList, IFileList* pAllowFromDiskList, IFileList** pFilesToReload)
-	{
-		m_pFileSystemPassThru->RegisterFileWhitelist(pForceMatchList, pAllowFromDiskList, pFilesToReload);
-	}
-	virtual void MarkAllCRCsUnverified()
-	{
-		m_pFileSystemPassThru->MarkAllCRCsUnverified();
-	}
-	virtual void CacheFileCRCs(const char* pPathname, ECacheCRCType eType, IFileList* pFilter)
-	{
-		return m_pFileSystemPassThru->CacheFileCRCs(pPathname, eType, pFilter);
-	}
-	virtual EFileCRCStatus CheckCachedFileHash(const char* pPathID, const char* pRelativeFilename, int nFileFraction, FileHash_t* pFileHash)
-	{
-		return m_pFileSystemPassThru->CheckCachedFileHash(pPathID, pRelativeFilename, nFileFraction, pFileHash);
-	}
-	virtual int GetUnverifiedFileHashes(CUnverifiedFileHash* pFiles, int nMaxFiles)
-	{
-		return m_pFileSystemPassThru->GetUnverifiedFileHashes(pFiles, nMaxFiles);
-	}
-	virtual int GetWhitelistSpewFlags()
-	{
-		return m_pFileSystemPassThru->GetWhitelistSpewFlags();
-	}
-	virtual void SetWhitelistSpewFlags(int spewFlags)
-	{
-		m_pFileSystemPassThru->SetWhitelistSpewFlags(spewFlags);
-	}
-	virtual void InstallDirtyDiskReportFunc(FSDirtyDiskReportFunc_t func) { m_pFileSystemPassThru->InstallDirtyDiskReportFunc(func); }
-
-	virtual bool			IsLaunchedFromXboxHDD() { return m_pFileSystemPassThru->IsLaunchedFromXboxHDD(); }
-	virtual bool			IsInstalledToXboxHDDCache() { return m_pFileSystemPassThru->IsInstalledToXboxHDDCache(); }
-	virtual bool			IsDVDHosted() { return m_pFileSystemPassThru->IsDVDHosted(); }
-	virtual bool			IsInstallAllowed() { return m_pFileSystemPassThru->IsInstallAllowed(); }
-	virtual int				GetSearchPathID(char* pPath, int nMaxLen) { return m_pFileSystemPassThru->GetSearchPathID(pPath, nMaxLen); }
-	virtual bool			FixupSearchPathsAfterInstall() { return m_pFileSystemPassThru->FixupSearchPathsAfterInstall(); }
-
-	virtual FSDirtyDiskReportFunc_t	GetDirtyDiskReportFunc() { return m_pFileSystemPassThru->GetDirtyDiskReportFunc(); }
-
-	virtual void AddVPKFile(char const* pPkName, SearchPathAdd_t addType = PATH_ADD_TO_TAIL) { m_pFileSystemPassThru->AddVPKFile(pPkName, addType); }
-	virtual void RemoveVPKFile(char const* pPkName) { m_pFileSystemPassThru->RemoveVPKFile(pPkName); }
-	virtual void GetVPKFileNames(CUtlVector<CUtlString>& destVector) { m_pFileSystemPassThru->GetVPKFileNames(destVector); }
-
-	virtual void			RemoveAllMapSearchPaths(void) { m_pFileSystemPassThru->RemoveAllMapSearchPaths(); }
-
-	virtual void			SyncDvdDevCache(void) { m_pFileSystemPassThru->SyncDvdDevCache(); }
-
-	virtual bool			GetStringFromKVPool(CRC32_t poolKey, unsigned int key, char* pOutBuff, int buflen) { return m_pFileSystemPassThru->GetStringFromKVPool(poolKey, key, pOutBuff, buflen); }
-
-	virtual bool			DiscoverDLC(int iController) { return m_pFileSystemPassThru->DiscoverDLC(iController); }
-	virtual int				IsAnyDLCPresent(bool* pbDLCSearchPathMounted = NULL) { return m_pFileSystemPassThru->IsAnyDLCPresent(pbDLCSearchPathMounted); }
-	virtual bool			GetAnyDLCInfo(int iDLC, unsigned int* pLicenseMask, wchar_t* pTitleBuff, int nOutTitleSize) { return m_pFileSystemPassThru->GetAnyDLCInfo(iDLC, pLicenseMask, pTitleBuff, nOutTitleSize); }
-	virtual int				IsAnyCorruptDLC() { return m_pFileSystemPassThru->IsAnyCorruptDLC(); }
-	virtual bool			GetAnyCorruptDLCInfo(int iCorruptDLC, wchar_t* pTitleBuff, int nOutTitleSize) { return m_pFileSystemPassThru->GetAnyCorruptDLCInfo(iCorruptDLC, pTitleBuff, nOutTitleSize); }
-	virtual bool			AddDLCSearchPaths() { return m_pFileSystemPassThru->AddDLCSearchPaths(); }
-	virtual bool			IsSpecificDLCPresent(unsigned int nDLCPackage) { return m_pFileSystemPassThru->IsSpecificDLCPresent(nDLCPackage); }
-	virtual void            SetIODelayAlarm(float flThreshhold) { m_pFileSystemPassThru->SetIODelayAlarm(flThreshhold); }
-	virtual bool			AddXLSPUpdateSearchPath(const void* pData, int nSize) { return m_pFileSystemPassThru->AddXLSPUpdateSearchPath(pData, nSize); }
-	virtual IIoStats* GetIoStats() { return m_pFileSystemPassThru->GetIoStats(); }
-
-	virtual void			CacheAllVPKFileHashes(bool bCacheAllVPKHashes, bool bRecalculateAndCheckHashes)
-	{
-		return m_pFileSystemPassThru->CacheAllVPKFileHashes(bCacheAllVPKHashes, bRecalculateAndCheckHashes);
-	}
-	virtual bool			CheckVPKFileHash(int PackFileID, int nPackFileNumber, int nFileFraction, MD5Value_t& md5Value)
-	{
-		return m_pFileSystemPassThru->CheckVPKFileHash(PackFileID, nPackFileNumber, nFileFraction, md5Value);
-	}
-	virtual void GetVPKFileStatisticsKV(KeyValues* pKV) { m_pFileSystemPassThru->GetVPKFileStatisticsKV(pKV); }
-
-protected:
-	IFileSystem* m_pFileSystemPassThru;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/flashlighteffect.h b/SpyCustom/flashlighteffect.h
deleted file mode 100644
index 895f552..0000000
--- a/SpyCustom/flashlighteffect.h
+++ /dev/null
@@ -1,319 +0,0 @@
-#ifndef FLASHLIGHTEFFECT_H
-#define FLASHLIGHTEFFECT_H
-#ifdef _WIN32
-#pragma once
-#endif
- 
-#include "MaterialSystemUtil.h" 
-
-
-class CountdownTimer
-{
-public:
-#ifdef CLIENT_DLL
-	DECLARE_PREDICTABLE();
-#endif
-	DECLARE_CLASS_NOBASE(CountdownTimer);
-	DECLARE_EMBEDDED_NETWORKVAR();
-
-	CountdownTimer(void);
-
-	void Reset(void)
-	{
-		m_timestamp = Now() + m_duration;
-	}
-
-	void Start(float duration)
-	{
-		m_timestamp = Now() + duration;
-		m_duration = duration;
-	}
-
-	void StartFromTime(float startTime, float duration)
-	{
-		m_timestamp = startTime + duration;
-		m_duration = duration;
-	}
-
-	void Invalidate(void)
-	{
-		m_timestamp = -1.0f;
-	}
-
-	bool HasStarted(void) const
-	{
-		return (m_timestamp > 0.0f);
-	}
-
-	bool IsElapsed(void) const
-	{
-		return (Now() > m_timestamp);
-	}
-
-	float GetElapsedTime(void) const
-	{
-		return Now() - m_timestamp + m_duration;
-	}
-
-	float GetRemainingTime(void) const
-	{
-		return (m_timestamp - Now());
-	}
-
-	float GetCountdownDuration(void) const
-	{
-		return (m_timestamp > 0.0f) ? m_duration : 0.0f;
-	}
-
-	float GetRemainingRatio(void) const
-	{
-		if (HasStarted())
-		{
-			float left = GetRemainingTime() / m_duration;
-			if (left < 0.0f)
-				return 0.0f;
-			if (left > 1.0f)
-				return 1.0f;
-			return left;
-		}
-
-		return 0.0f;
-	}
-
-private:
-	CNetworkVar(float, m_duration);
-	CNetworkVar(float, m_timestamp);
-	float Now(void) const;		        
-};
-
-struct dlight_t;
-
-
-
-
-class CFlashlightEffect
-{
-public:
-
-	CFlashlightEffect(int nEntIndex = 0, const char* pszTextureName = NULL, float flFov = 0.0f, float flFarZ = 0.0f, float flLinearAtten = 0.0f);
-	~CFlashlightEffect();
-
-	void UpdateLight(int nEntIdx, const Vector& vecPos, const Vector& vecDir, const Vector& vecRight, const Vector& vecUp, float flFov,
-		float flFarZ, float flLinearAtten, bool castsShadows, const char* pTextureName);
-	void UpdateLight(int nEntIdx, const Vector& vecPos, const Vector& vecDir, const Vector& vecRight, const Vector& vecUp, float flFov,
-		bool castsShadows, ITexture* pFlashlightTexture, const Vector& vecBrightness, bool bTracePlayers = true);
-
-	void TurnOn();
-	void TurnOff();
-	void SetMuzzleFlashEnabled(bool bEnabled, float flBrightness);
-	bool IsOn(void) { return m_bIsOn; }
-
-	ClientShadowHandle_t GetFlashlightHandle(void) { return m_FlashlightHandle; }
-	void SetFlashlightHandle(ClientShadowHandle_t Handle) { m_FlashlightHandle = Handle; }
-
-	const char* GetFlashlightTextureName(void) const
-	{
-		return m_textureName;
-	}
-
-	int GetEntIndex(void) const
-	{
-		return m_nEntIndex;
-	}
-
-	bool UpdateDefaultFlashlightState(FlashlightState_t& state, const Vector& vecPos, const Vector& vecDir, const Vector& vecRight,
-		const Vector& vecUp, bool castsShadows, bool bTracePlayers = true);
-	bool ComputeLightPosAndOrientation(const Vector& vecPos, const Vector& vecDir, const Vector& vecRight, const Vector& vecUp,
-		Vector& vecFinalPos, Quaternion& quatOrientation, bool bTracePlayers);
-	void LightOff();
-
-	void UpdateFlashlightTexture(const char* pTextureName);
-	void UpdateLightTopDown(const Vector& vecPos, const Vector& vecDir, const Vector& vecRight, const Vector& vecUp);
-
-	bool m_bIsOn;
-	int m_nEntIndex;
-	ClientShadowHandle_t m_FlashlightHandle;
-
-	bool m_bMuzzleFlashEnabled;
-	float m_flMuzzleFlashBrightness;
-
-	float m_flFov;
-	float m_flFarZ;
-	float m_flLinearAtten;
-	bool  m_bCastsShadows;
-
-	float m_flCurrentPullBackDist;
-
-	CTextureReference m_FlashlightTexture;
-
-	CTextureReference m_MuzzleFlashTexture;
-
-	char m_textureName[64];
-};
-
-class CHeadlightEffect : public CFlashlightEffect
-{
-public:
-
-	CHeadlightEffect();
-	~CHeadlightEffect();
-
-	virtual void UpdateLight(const Vector& vecPos, const Vector& vecDir, const Vector& vecRight, const Vector& vecUp, int nDistance);
-};
- 
- 
-
-class CFlashlightEffectManager
-{
-private:
-	CFlashlightEffect* m_pFlashlightEffect;
-	const char* m_pFlashlightTextureName;
-	int m_nFlashlightEntIndex;
-	float m_flFov;
-	float m_flFarZ;
-	float m_flLinearAtten;
-	int m_nMuzzleFlashFrameCountdown;
-	CountdownTimer m_muzzleFlashTimer;
-	float m_flMuzzleFlashBrightness;
-	bool m_bFlashlightOn;
-	int m_nFXComputeFrame;
-	bool m_bFlashlightOverride;
-
-public:
-	CFlashlightEffectManager() : m_pFlashlightEffect(NULL), m_pFlashlightTextureName(NULL), m_nFlashlightEntIndex(-1), m_flFov(0.0f),
-		m_flFarZ(0.0f), m_flLinearAtten(0.0f), m_nMuzzleFlashFrameCountdown(0), m_flMuzzleFlashBrightness(1.0f),
-		m_bFlashlightOn(false), m_nFXComputeFrame(-1), m_bFlashlightOverride(false) {}
-
-	void TurnOnFlashlight(int nEntIndex = 0, const char* pszTextureName = NULL, float flFov = 0.0f, float flFarZ = 0.0f, float flLinearAtten = 0.0f)
-	{
-		m_pFlashlightTextureName = pszTextureName;
-		m_nFlashlightEntIndex = nEntIndex;
-		m_flFov = flFov;
-		m_flFarZ = flFarZ;
-		m_flLinearAtten = flLinearAtten;
-		m_bFlashlightOn = true;
-
-		if (m_bFlashlightOverride)
-		{
-			return;
-		}
-
-		if (!m_pFlashlightEffect)
-		{
-			if (pszTextureName)
-			{
-				m_pFlashlightEffect = new CFlashlightEffect(m_nFlashlightEntIndex, pszTextureName, flFov, flFarZ, flLinearAtten);
-			}
-			else
-			{
-				m_pFlashlightEffect = new CFlashlightEffect(m_nFlashlightEntIndex);
-			}
-
-			if (!m_pFlashlightEffect)
-			{
-				return;
-			}
-		}
-
-		m_pFlashlightEffect->TurnOn();
-	}
-
-	void TurnOffFlashlight(bool bForce = false)
-	{
-		m_pFlashlightTextureName = NULL;
-		m_bFlashlightOn = false;
-
-		if (bForce)
-		{
-			m_bFlashlightOverride = false;
-			m_nMuzzleFlashFrameCountdown = 0;
-			m_muzzleFlashTimer.Invalidate();
-			delete m_pFlashlightEffect;
-			m_pFlashlightEffect = NULL;
-			return;
-		}
-
-		if (m_bFlashlightOverride)
-		{
-			return;
-		}
-
-		if (m_nMuzzleFlashFrameCountdown == 0 && m_muzzleFlashTimer.IsElapsed())
-		{
-			delete m_pFlashlightEffect;
-			m_pFlashlightEffect = NULL;
-		}
-	}
-
-	bool IsFlashlightOn() const { return m_bFlashlightOn; }
-
-	void UpdateFlashlight(const Vector& vecPos, const Vector& vecDir, const Vector& vecRight, const Vector& vecUp, float flFov, bool castsShadows,
-		float flFarZ, float flLinearAtten, const char* pTextureName = NULL);
-	void SetEntityIndex(int index)
-	{
-		m_nFlashlightEntIndex = index;
-	}
-
-	void TriggerMuzzleFlash()
-	{
-	}
-
-	const char* GetFlashlightTextureName(void) const
-	{
-		return m_pFlashlightTextureName;
-	}
-
-	int GetFlashlightEntIndex(void) const
-	{
-		return m_nFlashlightEntIndex;
-	}
-
-	void EnableFlashlightOverride(bool bEnable)
-	{
-		m_bFlashlightOverride = bEnable;
-
-		if (!m_bFlashlightOverride)
-		{
-			if (m_bFlashlightOn && m_pFlashlightEffect == NULL)
-			{
-				TurnOnFlashlight(m_nFlashlightEntIndex, m_pFlashlightTextureName, m_flFov, m_flFarZ, m_flLinearAtten);
-			}
-			else if (!m_bFlashlightOn && m_pFlashlightEffect)
-			{
-				delete m_pFlashlightEffect;
-				m_pFlashlightEffect = NULL;
-			}
-		}
-	}
-
-	void UpdateFlashlightOverride(bool bFlashlightOn, const Vector& vecPos, const Vector& vecDir, const Vector& vecRight, const Vector& vecUp,
-		float flFov, bool castsShadows, ITexture* pFlashlightTexture, const Vector& vecBrightness)
-	{
-		Assert(m_bFlashlightOverride);
-		if (!m_bFlashlightOverride)
-		{
-			return;
-		}
-
-		if (bFlashlightOn && !m_pFlashlightEffect)
-		{
-			m_pFlashlightEffect = new CFlashlightEffect(m_nFlashlightEntIndex);
-		}
-		else if (!bFlashlightOn && m_pFlashlightEffect)
-		{
-			delete m_pFlashlightEffect;
-			m_pFlashlightEffect = NULL;
-		}
-
-		if (m_pFlashlightEffect)
-		{
-			m_pFlashlightEffect->UpdateLight(m_nFlashlightEntIndex, vecPos, vecDir, vecRight, vecUp, flFov, castsShadows, pFlashlightTexture, vecBrightness, false);
-		}
-	}
-};
-
-
-
-
-
-#endif  
diff --git a/SpyCustom/fltx4.h b/SpyCustom/fltx4.h
deleted file mode 100644
index 99fd005..0000000
--- a/SpyCustom/fltx4.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef FLTX4_H
-#define FLTX4_H
-
-#if defined(GNUC)
-#define USE_STDC_FOR_SIMD 0
-#else
-#define USE_STDC_FOR_SIMD 0
-#endif
-
-#if (!defined(PLATFORM_PPC) && (USE_STDC_FOR_SIMD == 0))
-#define _SSE1 1
-#endif
-
-#if USE_STDC_FOR_SIMD
-#error "hello"
-typedef union
-{
-	float  m128_f32[4];
-	uint32 m128_u32[4];
-} fltx4;
-
-typedef fltx4 i32x4;
-typedef fltx4 u32x4;
-
-#ifdef _PS3
-typedef fltx4 u32x4;
-typedef fltx4 i32x4;
-#endif
-typedef fltx4 bi32x4;
-
-#elif ( defined( _PS3 ) )
-
-typedef union
-{
-	vec_float4	vmxf;
-	vec_int4	vmxi;
-	vec_uint4	vmxui;
-#if defined(__SPU__)
-	vec_uint4	vmxbi;
-#else
-	__vector bool vmxbi;
-#endif
-
-	struct
-	{
-		float x;
-		float y;
-		float z;
-		float w;
-	};
-
-	float		m128_f32[4];
-	uint32		m128_u32[4];
-	int32		m128_i32[4];
-
-} fltx4_union;
-
-typedef vec_float4 fltx4;
-typedef vec_uint4  u32x4;
-typedef vec_int4   i32x4;
-
-#if defined(__SPU__)
-typedef vec_uint4 bi32x4;
-#else
-typedef __vector bool bi32x4;
-#endif
-
-#define DIFFERENT_NATIVE_VECTOR_TYPES             
-
-#elif ( defined( _X360 ) )
-
-typedef union
-{
-	__vector4	vmx;
-	float		m128_f32[4];
-	uint32		m128_u32[4];
-} fltx4_union;
-
-typedef __vector4 fltx4;
-typedef __vector4 i32x4;                
-typedef __vector4 u32x4;                 
-typedef fltx4 bi32x4;
-#else
-
-typedef __m128 fltx4;
-typedef __m128 i32x4;
-typedef __m128 u32x4;
-typedef __m128i shortx8;
-typedef fltx4 bi32x4;
-
-#endif
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/functors.h b/SpyCustom/functors.h
deleted file mode 100644
index fa99d3d..0000000
--- a/SpyCustom/functors.h
+++ /dev/null
@@ -1,798 +0,0 @@
-#ifndef FUNCTORS_H
-#define FUNCTORS_H
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-#include "platform.h"
-#include "refcount.h"
-#include "utlenvelope.h"
-#include <typeinfo>
-
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_0
-#define	FUNC_TEMPLATE_ARG_PARAMS_0			
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_0		
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_0
-#define	FUNC_ARG_MEMBERS_0					
-#define	FUNC_ARG_FORMAL_PARAMS_0			
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_0			
-#define	FUNC_CALL_ARGS_INIT_0				
-#define	FUNC_SOLO_CALL_ARGS_INIT_0				
-#define	FUNC_CALL_MEMBER_ARGS_0				
-#define	FUNC_CALL_ARGS_0					
-#define	FUNC_CALL_DATA_ARGS_0( _var )
-#define	FUNC_FUNCTOR_CALL_ARGS_0			
-#define	FUNC_TEMPLATE_FUNC_PARAMS_0			
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_0	
-#define	FUNC_VALIDATION_STRING_0			Q_snprintf( pString, nBufLen, "method( void )" );
-#define FUNC_SEPARATOR_0
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_1		typename ARG_TYPE_1
-#define	FUNC_TEMPLATE_ARG_PARAMS_1			, typename ARG_TYPE_1
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_1		, ARG_TYPE_1
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_1		ARG_TYPE_1
-#define	FUNC_ARG_MEMBERS_1					ARG_TYPE_1 m_arg1
-#define	FUNC_ARG_FORMAL_PARAMS_1			, const ARG_TYPE_1 &arg1
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_1		const ARG_TYPE_1 &arg1
-#define	FUNC_CALL_ARGS_INIT_1				, m_arg1( arg1 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_1			: m_arg1( arg1 )	
-#define	FUNC_CALL_MEMBER_ARGS_1				m_arg1
-#define	FUNC_CALL_ARGS_1					arg1
-#define	FUNC_CALL_DATA_ARGS_1( _var )		_var->m_arg1
-#define	FUNC_FUNCTOR_CALL_ARGS_1			, arg1
-#define	FUNC_TEMPLATE_FUNC_PARAMS_1			, typename FUNC_ARG_TYPE_1
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_1	FUNC_ARG_TYPE_1
-#define	FUNC_VALIDATION_STRING_1			Q_snprintf( pString, nBufLen, "method( %s )", typeid( ARG_TYPE_1 ).name() );	
-#define FUNC_SEPARATOR_1					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_2		typename ARG_TYPE_1, typename ARG_TYPE_2
-#define	FUNC_TEMPLATE_ARG_PARAMS_2			, typename ARG_TYPE_1, typename ARG_TYPE_2
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_2		, ARG_TYPE_1, ARG_TYPE_2
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_2		ARG_TYPE_1, ARG_TYPE_2
-#define	FUNC_ARG_MEMBERS_2					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2
-#define	FUNC_ARG_FORMAL_PARAMS_2			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_2		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2
-#define	FUNC_CALL_ARGS_INIT_2				, m_arg1( arg1 ), m_arg2( arg2 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_2			: m_arg1( arg1 ), m_arg2( arg2 )
-#define	FUNC_CALL_MEMBER_ARGS_2				m_arg1, m_arg2
-#define	FUNC_CALL_ARGS_2					arg1, arg2
-#define	FUNC_CALL_DATA_ARGS_2( _var )		_var->m_arg1, _var->m_arg2
-#define	FUNC_FUNCTOR_CALL_ARGS_2			, arg1, arg2
-#define	FUNC_TEMPLATE_FUNC_PARAMS_2			, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_2	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2
-#define	FUNC_VALIDATION_STRING_2			Q_snprintf( pString, nBufLen, "method( %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name() );
-#define FUNC_SEPARATOR_2					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_3		typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3
-#define	FUNC_TEMPLATE_ARG_PARAMS_3			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_3		, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_3		ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3
-#define	FUNC_ARG_MEMBERS_3					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3
-#define	FUNC_ARG_FORMAL_PARAMS_3			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_3		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3
-#define	FUNC_CALL_ARGS_INIT_3				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_3			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 )
-#define	FUNC_CALL_MEMBER_ARGS_3				m_arg1, m_arg2, m_arg3
-#define	FUNC_CALL_ARGS_3					arg1, arg2, arg3
-#define	FUNC_CALL_DATA_ARGS_3( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3
-#define	FUNC_FUNCTOR_CALL_ARGS_3			, arg1, arg2, arg3
-#define	FUNC_TEMPLATE_FUNC_PARAMS_3			, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_3	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3
-#define	FUNC_VALIDATION_STRING_3			Q_snprintf( pString, nBufLen, "method( %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name() );
-#define FUNC_SEPARATOR_3					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_4		typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4
-#define	FUNC_TEMPLATE_ARG_PARAMS_4			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_4		, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_4		ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4
-#define	FUNC_ARG_MEMBERS_4					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4
-#define	FUNC_ARG_FORMAL_PARAMS_4			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_4		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4
-#define	FUNC_CALL_ARGS_INIT_4				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_4			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 )
-#define	FUNC_CALL_MEMBER_ARGS_4				m_arg1, m_arg2, m_arg3, m_arg4
-#define	FUNC_CALL_ARGS_4					arg1, arg2, arg3, arg4
-#define	FUNC_CALL_DATA_ARGS_4( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4
-#define	FUNC_FUNCTOR_CALL_ARGS_4			, arg1, arg2, arg3, arg4
-#define	FUNC_TEMPLATE_FUNC_PARAMS_4			, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_4	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4
-#define	FUNC_VALIDATION_STRING_4			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name() );
-#define FUNC_SEPARATOR_4					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_5		typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5
-#define	FUNC_TEMPLATE_ARG_PARAMS_5			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_5		, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_5		ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5
-#define	FUNC_ARG_MEMBERS_5					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4; ARG_TYPE_5 m_arg5
-#define	FUNC_ARG_FORMAL_PARAMS_5			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_5		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5
-#define	FUNC_CALL_ARGS_INIT_5				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_5			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 )
-#define	FUNC_CALL_MEMBER_ARGS_5				m_arg1, m_arg2, m_arg3, m_arg4, m_arg5
-#define	FUNC_CALL_ARGS_5					arg1, arg2, arg3, arg4, arg5
-#define	FUNC_CALL_DATA_ARGS_5( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4, _var->m_arg5
-#define	FUNC_FUNCTOR_CALL_ARGS_5			, arg1, arg2, arg3, arg4, arg5
-#define	FUNC_TEMPLATE_FUNC_PARAMS_5			, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4, typename FUNC_ARG_TYPE_5
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_5	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4, FUNC_ARG_TYPE_5
-#define	FUNC_VALIDATION_STRING_5			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name(), typeid( ARG_TYPE_5 ).name() );
-#define FUNC_SEPARATOR_5					,
-
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_6		typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6
-#define	FUNC_TEMPLATE_ARG_PARAMS_6			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_6		, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_6		ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6
-#define	FUNC_ARG_MEMBERS_6					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4; ARG_TYPE_5 m_arg5;	ARG_TYPE_6 m_arg6
-#define	FUNC_ARG_FORMAL_PARAMS_6			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_6		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6
-#define	FUNC_CALL_ARGS_INIT_6				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_6			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 )
-#define	FUNC_CALL_MEMBER_ARGS_6				m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6
-#define	FUNC_CALL_ARGS_6					arg1, arg2, arg3, arg4, arg5, arg6
-#define	FUNC_CALL_DATA_ARGS_6( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4, _var->m_arg5, _var->m_arg6
-#define	FUNC_FUNCTOR_CALL_ARGS_6			, arg1, arg2, arg3, arg4, arg5, arg6
-#define	FUNC_TEMPLATE_FUNC_PARAMS_6			, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4, typename FUNC_ARG_TYPE_5, typename	FUNC_ARG_TYPE_6
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_6	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4, FUNC_ARG_TYPE_5, FUNC_ARG_TYPE_6
-#define	FUNC_VALIDATION_STRING_6			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name(), typeid( ARG_TYPE_5 ).name(), typeid( ARG_TYPE_6 ).name() );
-#define FUNC_SEPARATOR_6					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_7		typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7
-#define	FUNC_TEMPLATE_ARG_PARAMS_7			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_7		, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_7		ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7
-#define	FUNC_ARG_MEMBERS_7					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4; ARG_TYPE_5 m_arg5;	ARG_TYPE_6 m_arg6;	ARG_TYPE_7 m_arg7;
-#define	FUNC_ARG_FORMAL_PARAMS_7			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_7		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7
-#define	FUNC_CALL_ARGS_INIT_7				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_7			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 )
-#define	FUNC_CALL_MEMBER_ARGS_7				m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7
-#define	FUNC_CALL_ARGS_7					arg1, arg2, arg3, arg4, arg5, arg6, arg7
-#define	FUNC_CALL_DATA_ARGS_7( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4, _var->m_arg5, _var->m_arg6, _var->m_arg7
-#define	FUNC_FUNCTOR_CALL_ARGS_7			, arg1, arg2, arg3, arg4, arg5, arg6, arg7
-#define	FUNC_TEMPLATE_FUNC_PARAMS_7			, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4, typename FUNC_ARG_TYPE_5, typename	FUNC_ARG_TYPE_6, typename FUNC_ARG_TYPE_7
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_7	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4, FUNC_ARG_TYPE_5, FUNC_ARG_TYPE_6, FUNC_ARG_TYPE_7
-#define	FUNC_VALIDATION_STRING_7			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name(), typeid( ARG_TYPE_5 ).name(), typeid( ARG_TYPE_6 ).name(), typeid( ARG_TYPE_7 ).name() );
-#define FUNC_SEPARATOR_7					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_8		typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8
-#define	FUNC_TEMPLATE_ARG_PARAMS_8			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_8		, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_8		ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8
-#define	FUNC_ARG_MEMBERS_8					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4; ARG_TYPE_5 m_arg5;	ARG_TYPE_6 m_arg6;	ARG_TYPE_7 m_arg7; ARG_TYPE_8 m_arg8;
-#define	FUNC_ARG_FORMAL_PARAMS_8			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_8		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8
-#define	FUNC_CALL_ARGS_INIT_8				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_8			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 )
-#define	FUNC_CALL_MEMBER_ARGS_8				m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8
-#define	FUNC_CALL_ARGS_8					arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
-#define	FUNC_CALL_DATA_ARGS_8( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4, _var->m_arg5, _var->m_arg6, _var->m_arg7, _var->m_arg8
-#define	FUNC_FUNCTOR_CALL_ARGS_8			, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
-#define	FUNC_TEMPLATE_FUNC_PARAMS_8			, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4, typename FUNC_ARG_TYPE_5, typename	FUNC_ARG_TYPE_6, typename FUNC_ARG_TYPE_7, typename FUNC_ARG_TYPE_8
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_8	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4, FUNC_ARG_TYPE_5, FUNC_ARG_TYPE_6, FUNC_ARG_TYPE_7, FUNC_ARG_TYPE_8
-#define	FUNC_VALIDATION_STRING_8			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s, %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name(), typeid( ARG_TYPE_5 ).name(), typeid( ARG_TYPE_6 ).name(), typeid( ARG_TYPE_7 ).name(), typeid( ARG_TYPE_8 ).name() );
-#define FUNC_SEPARATOR_8					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_9		typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9
-#define	FUNC_TEMPLATE_ARG_PARAMS_9			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_9		, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_9		ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9
-#define	FUNC_ARG_MEMBERS_9					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4; ARG_TYPE_5 m_arg5;	ARG_TYPE_6 m_arg6;	ARG_TYPE_7 m_arg7; ARG_TYPE_8 m_arg8; ARG_TYPE_9 m_arg9;
-#define	FUNC_ARG_FORMAL_PARAMS_9			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_9		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9
-#define	FUNC_CALL_ARGS_INIT_9				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_9			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 )
-#define	FUNC_CALL_MEMBER_ARGS_9				m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9
-#define	FUNC_CALL_ARGS_9					arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
-#define	FUNC_CALL_DATA_ARGS_9( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4, _var->m_arg5, _var->m_arg6, _var->m_arg7, _var->m_arg8, _var->m_arg9
-#define	FUNC_FUNCTOR_CALL_ARGS_9			, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
-#define	FUNC_TEMPLATE_FUNC_PARAMS_9			, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4, typename FUNC_ARG_TYPE_5, typename	FUNC_ARG_TYPE_6, typename FUNC_ARG_TYPE_7, typename FUNC_ARG_TYPE_8, typename	FUNC_ARG_TYPE_9
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_9	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4, FUNC_ARG_TYPE_5, FUNC_ARG_TYPE_6, FUNC_ARG_TYPE_7, FUNC_ARG_TYPE_8, FUNC_ARG_TYPE_9
-#define	FUNC_VALIDATION_STRING_9			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s, %s, %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name(), typeid( ARG_TYPE_5 ).name(), typeid( ARG_TYPE_6 ).name(), typeid( ARG_TYPE_7 ).name(), typeid( ARG_TYPE_8 ).name(), typeid( ARG_TYPE_9 ).name() );
-#define FUNC_SEPARATOR_9					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_10	typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9, typename ARG_TYPE_10
-#define	FUNC_TEMPLATE_ARG_PARAMS_10			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9, typename ARG_TYPE_10
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_10	, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9, ARG_TYPE_10
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_10	ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9, ARG_TYPE_10
-#define	FUNC_ARG_MEMBERS_10					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4; ARG_TYPE_5 m_arg5;	ARG_TYPE_6 m_arg6;	ARG_TYPE_7 m_arg7; ARG_TYPE_8 m_arg8; ARG_TYPE_9 m_arg9; ARG_TYPE_10 m_arg10;
-#define	FUNC_ARG_FORMAL_PARAMS_10			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9, const ARG_TYPE_10 &arg10
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_10		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9, const ARG_TYPE_10 &arg10
-#define	FUNC_CALL_ARGS_INIT_10				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 ), m_arg10( arg10 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_10			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 ), m_arg10( arg10 )
-#define	FUNC_CALL_MEMBER_ARGS_10			m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10
-#define	FUNC_CALL_ARGS_10					arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10
-#define	FUNC_CALL_DATA_ARGS_10( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4, _var->m_arg5, _var->m_arg6, _var->m_arg7, _var->m_arg8, _var->m_arg9, _var->m_arg10
-#define	FUNC_FUNCTOR_CALL_ARGS_10			, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10
-#define	FUNC_TEMPLATE_FUNC_PARAMS_10		, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4, typename FUNC_ARG_TYPE_5, typename	FUNC_ARG_TYPE_6, typename FUNC_ARG_TYPE_7, typename FUNC_ARG_TYPE_8, typename	FUNC_ARG_TYPE_9, typename FUNC_ARG_TYPE_10
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_10	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4, FUNC_ARG_TYPE_5, FUNC_ARG_TYPE_6, FUNC_ARG_TYPE_7, FUNC_ARG_TYPE_8, FUNC_ARG_TYPE_9, FUNC_ARG_TYPE_10
-#define	FUNC_VALIDATION_STRING_10			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s, %s, %s, %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name(), typeid( ARG_TYPE_5 ).name(), typeid( ARG_TYPE_6 ).name(), typeid( ARG_TYPE_7 ).name(), typeid( ARG_TYPE_8 ).name(), typeid( ARG_TYPE_9 ).name(), typeid( ARG_TYPE_10 ).name() );
-#define FUNC_SEPARATOR_10					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_11	typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9, typename ARG_TYPE_10, typename ARG_TYPE_11
-#define	FUNC_TEMPLATE_ARG_PARAMS_11			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9, typename ARG_TYPE_10, typename ARG_TYPE_11
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_11	, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9, ARG_TYPE_10, ARG_TYPE_11
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_11	ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9, ARG_TYPE_10, ARG_TYPE_11
-#define	FUNC_ARG_MEMBERS_11					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4; ARG_TYPE_5 m_arg5;	ARG_TYPE_6 m_arg6;	ARG_TYPE_7 m_arg7; ARG_TYPE_8 m_arg8; ARG_TYPE_9 m_arg9; ARG_TYPE_10 m_arg10;	ARG_TYPE_11 m_arg11
-#define	FUNC_ARG_FORMAL_PARAMS_11			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9, const ARG_TYPE_10 &arg10,	const ARG_TYPE_11 &arg11
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_11		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9, const ARG_TYPE_10 &arg10,	const ARG_TYPE_11 &arg11
-#define	FUNC_CALL_ARGS_INIT_11				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 ), m_arg10( arg10 ), m_arg11( arg11 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_11			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 ), m_arg10( arg10 ), m_arg11( arg11 )
-#define	FUNC_CALL_MEMBER_ARGS_11			m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11
-#define	FUNC_CALL_ARGS_11					arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11
-#define	FUNC_CALL_DATA_ARGS_11( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4, _var->m_arg5, _var->m_arg6, _var->m_arg7, _var->m_arg8, _var->m_arg9, _var->m_arg10, _var->m_arg11
-#define	FUNC_FUNCTOR_CALL_ARGS_11			, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11
-#define	FUNC_TEMPLATE_FUNC_PARAMS_11		, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4, typename FUNC_ARG_TYPE_5, typename	FUNC_ARG_TYPE_6, typename FUNC_ARG_TYPE_7, typename FUNC_ARG_TYPE_8, typename	FUNC_ARG_TYPE_9, typename FUNC_ARG_TYPE_10, typename FUNC_ARG_TYPE_11
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_11	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4, FUNC_ARG_TYPE_5, FUNC_ARG_TYPE_6, FUNC_ARG_TYPE_7, FUNC_ARG_TYPE_8, FUNC_ARG_TYPE_9, FUNC_ARG_TYPE_10, FUNC_ARG_TYPE_11
-#define	FUNC_VALIDATION_STRING_11			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name(), typeid( ARG_TYPE_5 ).name(), typeid( ARG_TYPE_6 ).name(), typeid( ARG_TYPE_7 ).name(), typeid( ARG_TYPE_8 ).name(), typeid( ARG_TYPE_9 ).name(), typeid( ARG_TYPE_10 ).name(), typeid( ARG_TYPE_11 ).name() );
-#define FUNC_SEPARATOR_11					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_12	typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9, typename ARG_TYPE_10, typename ARG_TYPE_11, typename ARG_TYPE_12
-#define	FUNC_TEMPLATE_ARG_PARAMS_12			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9, typename ARG_TYPE_10, typename ARG_TYPE_11, typename ARG_TYPE_12
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_12	, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9, ARG_TYPE_10, ARG_TYPE_11, ARG_TYPE_12
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_12	ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9, ARG_TYPE_10, ARG_TYPE_11, ARG_TYPE_12
-#define	FUNC_ARG_MEMBERS_12					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4; ARG_TYPE_5 m_arg5;	ARG_TYPE_6 m_arg6;	ARG_TYPE_7 m_arg7; ARG_TYPE_8 m_arg8; ARG_TYPE_9 m_arg9; ARG_TYPE_10 m_arg10; ARG_TYPE_11 m_arg11; ARG_TYPE_12 m_arg12
-#define	FUNC_ARG_FORMAL_PARAMS_12			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9, const ARG_TYPE_10 &arg10, const ARG_TYPE_11 &arg11, const ARG_TYPE_12 &arg12
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_12		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9, const ARG_TYPE_10 &arg10, const ARG_TYPE_11 &arg11, const ARG_TYPE_12 &arg12
-#define	FUNC_CALL_ARGS_INIT_12				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 ), m_arg10( arg10 ), m_arg11( arg11 ), m_arg12( arg12 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_12			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 ), m_arg10( arg10 ), m_arg11( arg11 ), m_arg12( arg12 )
-#define	FUNC_CALL_MEMBER_ARGS_12			m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12
-#define	FUNC_CALL_ARGS_12					arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12
-#define	FUNC_CALL_DATA_ARGS_12( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4, _var->m_arg5, _var->m_arg6, _var->m_arg7, _var->m_arg8, _var->m_arg9, _var->m_arg10, _var->m_arg11, _var->m_arg12
-#define	FUNC_FUNCTOR_CALL_ARGS_12			, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12
-#define	FUNC_TEMPLATE_FUNC_PARAMS_12		, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4, typename FUNC_ARG_TYPE_5, typename	FUNC_ARG_TYPE_6, typename FUNC_ARG_TYPE_7, typename FUNC_ARG_TYPE_8, typename	FUNC_ARG_TYPE_9, typename FUNC_ARG_TYPE_10, typename FUNC_ARG_TYPE_11, typename FUNC_ARG_TYPE_12
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_12	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4, FUNC_ARG_TYPE_5, FUNC_ARG_TYPE_6, FUNC_ARG_TYPE_7, FUNC_ARG_TYPE_8, FUNC_ARG_TYPE_9, FUNC_ARG_TYPE_10, FUNC_ARG_TYPE_11, FUNC_ARG_TYPE_12
-#define	FUNC_VALIDATION_STRING_12			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name(), typeid( ARG_TYPE_5 ).name(), typeid( ARG_TYPE_6 ).name(), typeid( ARG_TYPE_7 ).name(), typeid( ARG_TYPE_8 ).name(), typeid( ARG_TYPE_9 ).name(), typeid( ARG_TYPE_10 ).name(), typeid( ARG_TYPE_11 ).name(), typeid( ARG_TYPE_12 ).name() );
-#define FUNC_SEPARATOR_12					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_13	typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9, typename ARG_TYPE_10, typename ARG_TYPE_11, typename ARG_TYPE_12, typename ARG_TYPE_13
-#define	FUNC_TEMPLATE_ARG_PARAMS_13			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9, typename ARG_TYPE_10, typename ARG_TYPE_11, typename ARG_TYPE_12, typename ARG_TYPE_13
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_13	, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9, ARG_TYPE_10, ARG_TYPE_11, ARG_TYPE_12, ARG_TYPE_13
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_13	ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9, ARG_TYPE_10, ARG_TYPE_11, ARG_TYPE_12, ARG_TYPE_13
-#define	FUNC_ARG_MEMBERS_13					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4; ARG_TYPE_5 m_arg5;	ARG_TYPE_6 m_arg6;	ARG_TYPE_7 m_arg7; ARG_TYPE_8 m_arg8; ARG_TYPE_9 m_arg9; ARG_TYPE_10 m_arg10; ARG_TYPE_11 m_arg11; ARG_TYPE_12 m_arg12; ARG_TYPE_13 m_arg13
-#define	FUNC_ARG_FORMAL_PARAMS_13			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9, const ARG_TYPE_10 &arg10, const ARG_TYPE_11 &arg11, const ARG_TYPE_12 &arg12, const ARG_TYPE_13 &arg13
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_13		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9, const ARG_TYPE_10 &arg10, const ARG_TYPE_11 &arg11, const ARG_TYPE_12 &arg12, const ARG_TYPE_13 &arg13
-#define	FUNC_CALL_ARGS_INIT_13				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 ), m_arg10( arg10 ), m_arg11( arg11 ), m_arg12( arg12 ), m_arg13( arg13 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_13			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 ), m_arg10( arg10 ), m_arg11( arg11 ), m_arg12( arg12 ), m_arg13( arg13 )
-#define	FUNC_CALL_MEMBER_ARGS_13			m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12, m_arg13
-#define	FUNC_CALL_ARGS_13					arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13
-#define	FUNC_CALL_DATA_ARGS_13( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4, _var->m_arg5, _var->m_arg6, _var->m_arg7, _var->m_arg8, _var->m_arg9, _var->m_arg10, _var->m_arg11, _var->m_arg12, _var->m_arg13
-#define	FUNC_FUNCTOR_CALL_ARGS_13			, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13
-#define	FUNC_TEMPLATE_FUNC_PARAMS_13		, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4, typename FUNC_ARG_TYPE_5, typename	FUNC_ARG_TYPE_6, typename FUNC_ARG_TYPE_7, typename FUNC_ARG_TYPE_8, typename	FUNC_ARG_TYPE_9, typename FUNC_ARG_TYPE_10, typename FUNC_ARG_TYPE_11, typename FUNC_ARG_TYPE_12, typename FUNC_ARG_TYPE_13
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_13	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4, FUNC_ARG_TYPE_5, FUNC_ARG_TYPE_6, FUNC_ARG_TYPE_7, FUNC_ARG_TYPE_8, FUNC_ARG_TYPE_9, FUNC_ARG_TYPE_10, FUNC_ARG_TYPE_11, FUNC_ARG_TYPE_12, FUNC_ARG_TYPE_13
-#define	FUNC_VALIDATION_STRING_13			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name(), typeid( ARG_TYPE_5 ).name(), typeid( ARG_TYPE_6 ).name(), typeid( ARG_TYPE_7 ).name(), typeid( ARG_TYPE_8 ).name(), typeid( ARG_TYPE_9 ).name(), typeid( ARG_TYPE_10 ).name(), typeid( ARG_TYPE_11 ).name(), typeid( ARG_TYPE_12 ).name(), typeid( ARG_TYPE_13 ).name() );
-#define FUNC_SEPARATOR_13					,
-
-#define	FUNC_SOLO_TEMPLATE_ARG_PARAMS_14	typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9, typename ARG_TYPE_10, typename ARG_TYPE_11, typename ARG_TYPE_12, typename ARG_TYPE_13, typename ARG_TYPE_14
-#define	FUNC_TEMPLATE_ARG_PARAMS_14			, typename ARG_TYPE_1, typename ARG_TYPE_2, typename	ARG_TYPE_3,	typename ARG_TYPE_4, typename ARG_TYPE_5, typename ARG_TYPE_6, typename ARG_TYPE_7, typename ARG_TYPE_8, typename ARG_TYPE_9, typename ARG_TYPE_10, typename ARG_TYPE_11, typename ARG_TYPE_12, typename ARG_TYPE_13, typename ARG_TYPE_14
-#define	FUNC_BASE_TEMPLATE_ARG_PARAMS_14	, ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9, ARG_TYPE_10, ARG_TYPE_11, ARG_TYPE_12, ARG_TYPE_13, ARG_TYPE_14
-#define	FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_14	ARG_TYPE_1, ARG_TYPE_2, ARG_TYPE_3, ARG_TYPE_4, ARG_TYPE_5, ARG_TYPE_6, ARG_TYPE_7, ARG_TYPE_8, ARG_TYPE_9, ARG_TYPE_10, ARG_TYPE_11, ARG_TYPE_12, ARG_TYPE_13, ARG_TYPE_14
-#define	FUNC_ARG_MEMBERS_14					ARG_TYPE_1 m_arg1;	ARG_TYPE_2 m_arg2; ARG_TYPE_3 m_arg3; ARG_TYPE_4 m_arg4; ARG_TYPE_5 m_arg5;	ARG_TYPE_6 m_arg6;	ARG_TYPE_7 m_arg7; ARG_TYPE_8 m_arg8; ARG_TYPE_9 m_arg9; ARG_TYPE_10 m_arg10; ARG_TYPE_11 m_arg11; ARG_TYPE_12 m_arg12; ARG_TYPE_13 m_arg13; ARG_TYPE_14 m_arg14
-#define	FUNC_ARG_FORMAL_PARAMS_14			, const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9, const ARG_TYPE_10 &arg10, const ARG_TYPE_11 &arg11, const ARG_TYPE_12 &arg12, const ARG_TYPE_13 &arg13, const ARG_TYPE_14 &arg14
-#define	FUNC_PROXY_ARG_FORMAL_PARAMS_14		const ARG_TYPE_1 &arg1,	const ARG_TYPE_2 &arg2, const ARG_TYPE_3 &arg3, const ARG_TYPE_4 &arg4, const ARG_TYPE_5 &arg5,	const ARG_TYPE_6 &arg6,	const ARG_TYPE_7 &arg7, const ARG_TYPE_8 &arg8, const ARG_TYPE_9 &arg9, const ARG_TYPE_10 &arg10, const ARG_TYPE_11 &arg11, const ARG_TYPE_12 &arg12, const ARG_TYPE_13 &arg13, const ARG_TYPE_14 &arg14
-#define	FUNC_CALL_ARGS_INIT_14				, m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 ), m_arg10( arg10 ), m_arg11( arg11 ), m_arg12( arg12 ), m_arg13( arg13 ), m_arg14( arg14 )
-#define	FUNC_SOLO_CALL_ARGS_INIT_14			: m_arg1( arg1 ), m_arg2( arg2 ), m_arg3( arg3 ), m_arg4( arg4 ), m_arg5( arg5 ), m_arg6( arg6 ), m_arg7( arg7 ), m_arg8( arg8 ), m_arg9( arg9 ), m_arg10( arg10 ), m_arg11( arg11 ), m_arg12( arg12 ), m_arg13( arg13 ), m_arg14( arg14 )
-#define	FUNC_CALL_MEMBER_ARGS_14			m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12, m_arg13, m_arg14
-#define	FUNC_CALL_ARGS_14					arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14
-#define	FUNC_CALL_DATA_ARGS_14( _var )		_var->m_arg1, _var->m_arg2, _var->m_arg3, _var->m_arg4, _var->m_arg5, _var->m_arg6, _var->m_arg7, _var->m_arg8, _var->m_arg9, _var->m_arg10, _var->m_arg11, _var->m_arg12, _var->m_arg13, _var->m_arg14
-#define	FUNC_FUNCTOR_CALL_ARGS_14			, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14
-#define	FUNC_TEMPLATE_FUNC_PARAMS_14		, typename FUNC_ARG_TYPE_1, typename	FUNC_ARG_TYPE_2, typename FUNC_ARG_TYPE_3, typename	FUNC_ARG_TYPE_4, typename FUNC_ARG_TYPE_5, typename	FUNC_ARG_TYPE_6, typename FUNC_ARG_TYPE_7, typename FUNC_ARG_TYPE_8, typename	FUNC_ARG_TYPE_9, typename FUNC_ARG_TYPE_10, typename FUNC_ARG_TYPE_11, typename FUNC_ARG_TYPE_12, typename FUNC_ARG_TYPE_13, typename FUNC_ARG_TYPE_14
-#define	FUNC_BASE_TEMPLATE_FUNC_PARAMS_14	FUNC_ARG_TYPE_1, FUNC_ARG_TYPE_2, FUNC_ARG_TYPE_3,	FUNC_ARG_TYPE_4, FUNC_ARG_TYPE_5, FUNC_ARG_TYPE_6, FUNC_ARG_TYPE_7, FUNC_ARG_TYPE_8, FUNC_ARG_TYPE_9, FUNC_ARG_TYPE_10, FUNC_ARG_TYPE_11, FUNC_ARG_TYPE_12, FUNC_ARG_TYPE_13, FUNC_ARG_TYPE_14
-#define	FUNC_VALIDATION_STRING_14			Q_snprintf( pString, nBufLen, "method( %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s )", typeid( ARG_TYPE_1 ).name(), typeid( ARG_TYPE_2 ).name(), typeid( ARG_TYPE_3 ).name(), typeid( ARG_TYPE_4 ).name(), typeid( ARG_TYPE_5 ).name(), typeid( ARG_TYPE_6 ).name(), typeid( ARG_TYPE_7 ).name(), typeid( ARG_TYPE_8 ).name(), typeid( ARG_TYPE_9 ).name(), typeid( ARG_TYPE_10 ).name(), typeid( ARG_TYPE_11 ).name(), typeid( ARG_TYPE_12 ).name(), typeid( ARG_TYPE_13 ).name(), typeid( ARG_TYPE_14 ).name() );
-#define FUNC_SEPARATOR_14					,
-
-#define FUNC_GENERATE_ALL_BUT0( INNERMACRONAME ) \
-	INNERMACRONAME(1); \
-	INNERMACRONAME(2); \
-	INNERMACRONAME(3); \
-	INNERMACRONAME(4); \
-	INNERMACRONAME(5); \
-	INNERMACRONAME(6); \
-	INNERMACRONAME(7); \
-	INNERMACRONAME(8); \
-	INNERMACRONAME(9); \
-	INNERMACRONAME(10);\
-	INNERMACRONAME(11);\
-	INNERMACRONAME(12);\
-	INNERMACRONAME(13);\
-	INNERMACRONAME(14)
-
-#define FUNC_GENERATE_ALL( INNERMACRONAME ) \
-	INNERMACRONAME(0); \
-	FUNC_GENERATE_ALL_BUT0( INNERMACRONAME )
-
-
-abstract_class CFunctor : public IRefCounted
-{
-public:
-	CFunctor()
-	{
-#ifdef DEBUG
-		m_nUserID = 0;
-#endif
-	}
-	virtual ~CFunctor() {}
-	virtual void operator()() = 0;
-
-	unsigned m_nUserID;   
-};
-
-
-abstract_class CFunctorData : public IRefCounted
-{
-public:
-	virtual void ComputeValidationString(char* pString, size_t nBufLen) const = 0;
-};
-
-abstract_class CFunctorCallback : public IRefCounted
-{
-public:
-	virtual bool IsEqual(CFunctorCallback * pSrc) const = 0;
-	virtual void operator()(CFunctorData* pData) = 0;
-	virtual void ComputeValidationString(char* pString, size_t nBufLen) const = 0;
-	virtual const char* GetImplClassName() const = 0;
-	virtual const void* GetTarget() const = 0;
-};
-
-
-template <typename T>
-inline T RefToVal(const T& item)
-{
-	return item;
-}
-
-
-template <typename T>
-class CLateBoundPtr
-{
-public:
-	CLateBoundPtr(T** ppObject)
-		: m_ppObject(ppObject)
-	{
-	}
-
-	T* operator->() { return *m_ppObject; }
-	T& operator *() { return **m_ppObject; }
-	operator T* () const { return (T*)(*m_ppObject); }
-	operator void* () { return *m_ppObject; }
-
-private:
-	T** m_ppObject;
-};
-
-
-class CFuncMemPolicyNone
-{
-public:
-	static void OnAcquire(void* pObject) {}
-	static void OnRelease(void* pObject) {}
-};
-
-template <class OBJECT_TYPE_PTR = IRefCounted*>
-class CFuncMemPolicyRefCount
-{
-public:
-	static void OnAcquire(OBJECT_TYPE_PTR pObject) { pObject->AddRef(); }
-	static void OnRelease(OBJECT_TYPE_PTR pObject) { pObject->Release(); }
-};
-
-
-template <class OBJECT_TYPE_PTR, typename FUNCTION_TYPE, class MEM_POLICY = CFuncMemPolicyNone >
-class CMemberFuncProxyBase
-{
-public:
-	bool operator==(const CMemberFuncProxyBase& src) const
-	{
-		return m_pfnProxied == src.m_pfnProxied && m_pObject == src.m_pObject;
-	}
-
-	const void* GetTarget() const
-	{
-		return m_pObject;
-	}
-
-protected:
-	CMemberFuncProxyBase(OBJECT_TYPE_PTR pObject, FUNCTION_TYPE pfnProxied)
-		: m_pObject(pObject),
-		m_pfnProxied(pfnProxied)
-	{
-		MEM_POLICY::OnAcquire(m_pObject);
-	}
-
-	~CMemberFuncProxyBase()
-	{
-		MEM_POLICY::OnRelease(m_pObject);
-	}
-
-	void Set(OBJECT_TYPE_PTR pObject, FUNCTION_TYPE pfnProxied)
-	{
-		m_pfnProxied = pfnProxied;
-		m_pObject = pObject;
-	}
-
-	void OnCall()
-	{
-		Assert((void*)m_pObject != NULL);
-	}
-
-	FUNCTION_TYPE m_pfnProxied;
-	OBJECT_TYPE_PTR m_pObject;
-};
-
-
-#define DEFINE_MEMBER_FUNC_PROXY( N ) \
-	template <class OBJECT_TYPE_PTR, typename FUNCTION_TYPE FUNC_TEMPLATE_ARG_PARAMS_##N, class MEM_POLICY = CFuncMemPolicyNone> \
-	class CMemberFuncProxy##N : public CMemberFuncProxyBase<OBJECT_TYPE_PTR, FUNCTION_TYPE, MEM_POLICY> \
-	{ \
-	public: \
-		CMemberFuncProxy##N( OBJECT_TYPE_PTR pObject = NULL, FUNCTION_TYPE pfnProxied = NULL ) \
-		: CMemberFuncProxyBase<OBJECT_TYPE_PTR, FUNCTION_TYPE, MEM_POLICY >( pObject, pfnProxied ) \
-		{ \
-		} \
-	\
-		void operator()( FUNC_PROXY_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			this->OnCall(); \
-			((*this->m_pObject).*this->m_pfnProxied)( FUNC_CALL_ARGS_##N ); \
-		} \
-	}
-
-FUNC_GENERATE_ALL(DEFINE_MEMBER_FUNC_PROXY);
-
-
-#include "memdbgon.h"
-
-typedef CRefCounted1<CFunctor, CRefCountServiceMT> CFunctorBase;
-
-#define DEFINE_FUNCTOR_TEMPLATE(N) \
-	template <typename FUNC_TYPE FUNC_TEMPLATE_ARG_PARAMS_##N, class FUNCTOR_BASE = CFunctorBase> \
-	class CFunctor##N : public CFunctorBase \
-	{ \
-	public: \
-		CFunctor##N( FUNC_TYPE pfnProxied FUNC_ARG_FORMAL_PARAMS_##N ) : m_pfnProxied( pfnProxied ) FUNC_CALL_ARGS_INIT_##N {} \
-		void operator()() { m_pfnProxied(FUNC_CALL_MEMBER_ARGS_##N); } \
-	\
-	private: \
-		FUNC_TYPE m_pfnProxied; \
-		FUNC_ARG_MEMBERS_##N; \
-	}
-
-FUNC_GENERATE_ALL(DEFINE_FUNCTOR_TEMPLATE);
-
-#define DEFINE_MEMBER_FUNCTOR( N ) \
-	template <class OBJECT_TYPE_PTR, typename FUNCTION_TYPE FUNC_TEMPLATE_ARG_PARAMS_##N, class FUNCTOR_BASE = CFunctorBase, class MEM_POLICY = CFuncMemPolicyNone> \
-	class CMemberFunctor##N : public FUNCTOR_BASE \
-	{ \
-	public: \
-		CMemberFunctor##N( OBJECT_TYPE_PTR pObject, FUNCTION_TYPE pfnProxied FUNC_ARG_FORMAL_PARAMS_##N ) : m_Proxy( pObject, pfnProxied ) FUNC_CALL_ARGS_INIT_##N {} \
-		void operator()() { m_Proxy(FUNC_CALL_MEMBER_ARGS_##N); } \
-		\
-	private: \
-		CMemberFuncProxy##N<OBJECT_TYPE_PTR, FUNCTION_TYPE FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, MEM_POLICY> m_Proxy; \
-		FUNC_ARG_MEMBERS_##N; \
-	};
-
-
-FUNC_GENERATE_ALL(DEFINE_MEMBER_FUNCTOR);
-
-typedef CRefCounted1<CFunctorData, CRefCountServiceMT> CFunctorDataBase;
-class CFunctorCallbackBase : public CRefCounted1<CFunctorCallback, CRefCountServiceMT>
-{
-protected:
-	virtual void ValidateFunctorData(CFunctorData* pData)
-	{
-#ifdef _DEBUG
-		char pDataString[1024];
-		char pCallbackString[1024];
-		ComputeValidationString(pCallbackString, sizeof(pCallbackString));
-		pData->ComputeValidationString(pDataString, sizeof(pDataString));
-		bool bMatch = !Q_stricmp(pDataString, pCallbackString);
-		if (!bMatch)
-		{
-			Warning("Functor doesn't match data!\n\tExpected:\t%s\n\tEncountered:\t%s\n",
-				pCallbackString, pDataString);
-			Assert(0);
-		}
-#endif
-	}
-};
-
-#define DEFINE_FUNCTOR_DATA_TEMPLATE(N) \
-	template < FUNC_SOLO_TEMPLATE_ARG_PARAMS_##N > \
-	class CFunctorData##N : public CFunctorDataBase \
-	{ \
-	public: \
-		CFunctorData##N( FUNC_PROXY_ARG_FORMAL_PARAMS_##N ) FUNC_SOLO_CALL_ARGS_INIT_##N {} \
-		virtual void ComputeValidationString( char *pString, size_t nBufLen ) const { FUNC_VALIDATION_STRING_##N } \
-		FUNC_ARG_MEMBERS_##N; \
-	}
-
-class CFunctorData0 : public CFunctorDataBase
-{
-public:
-	CFunctorData0() {}
-	virtual void ComputeValidationString(char* pString, size_t nBufLen_) const { int nBufLen = (int)nBufLen_; FUNC_VALIDATION_STRING_0 }
-};
-
-FUNC_GENERATE_ALL_BUT0(DEFINE_FUNCTOR_DATA_TEMPLATE);
-
-#define DEFINE_FUNCTOR_CALLBACK_TEMPLATE(N) \
-	template < FUNC_SOLO_TEMPLATE_ARG_PARAMS_##N > \
-	class CFunctorCallback##N : public CFunctorCallbackBase \
-	{ \
-		typedef void (*Callback_t)( FUNC_PROXY_ARG_FORMAL_PARAMS_##N ); \
-	public: \
-		CFunctorCallback##N( Callback_t pfnProxied ) : m_pfnProxied( pfnProxied ) {} \
-		void operator()( CFunctorData *pFunctorDataBase ) \
-		{ \
-			ValidateFunctorData( pFunctorDataBase ); \
-			CFunctorData##N< FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_##N > *pFunctorData = static_cast< CFunctorData##N< FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_##N >* >( pFunctorDataBase ); \
-			m_pfnProxied( FUNC_CALL_DATA_ARGS_##N(pFunctorData) ); \
-		} \
-		virtual bool IsEqual( CFunctorCallback *pSrc ) const { return !Q_stricmp( GetImplClassName(), pSrc->GetImplClassName() ) && ( m_pfnProxied == static_cast< CFunctorCallback##N * >( pSrc )->m_pfnProxied ); } \
-		virtual void ComputeValidationString( char *pString, size_t nBufLen ) const { FUNC_VALIDATION_STRING_##N } \
-		virtual const char *GetImplClassName() const { return "CFunctorCallback" #N; } \
-		virtual const void *GetTarget() const { return m_pfnProxied; } \
-	private: \
-		Callback_t m_pfnProxied; \
-	}
-
-class CFunctorCallback0 : public CFunctorCallbackBase
-{
-	typedef void (*Callback_t)();
-public:
-	CFunctorCallback0(Callback_t pfnProxied) : m_pfnProxied(pfnProxied) {}
-	void operator()(CFunctorData* pFunctorDataBase)
-	{
-		ValidateFunctorData(pFunctorDataBase);
-		m_pfnProxied();
-	}
-	virtual void ComputeValidationString(char* pString, size_t nBufLen_) const { int nBufLen = (int)nBufLen_; FUNC_VALIDATION_STRING_0 }
-	virtual bool IsEqual(CFunctorCallback* pSrc) const
-	{
-		if (Q_stricmp(GetImplClassName(), pSrc->GetImplClassName()))
-			return false;
-		return m_pfnProxied == static_cast<CFunctorCallback0*>(pSrc)->m_pfnProxied;
-	}
-	virtual const char* GetImplClassName() const { return "CFunctorCallback0"; }
-	virtual const void* GetTarget() const { return (void*)m_pfnProxied; }
-private:
-	Callback_t m_pfnProxied;
-};
-
-FUNC_GENERATE_ALL_BUT0(DEFINE_FUNCTOR_CALLBACK_TEMPLATE);
-
-#define DEFINE_MEMBER_FUNCTOR_CALLBACK_TEMPLATE( N ) \
-	template < class FUNCTION_CLASS FUNC_TEMPLATE_ARG_PARAMS_##N, class MEM_POLICY = CFuncMemPolicyNone > \
-	class CMemberFunctorCallback##N : public CFunctorCallbackBase \
-	{ \
-		typedef void (FUNCTION_CLASS::*MemberCallback_t)( FUNC_PROXY_ARG_FORMAL_PARAMS_##N ); \
-	public: \
-		CMemberFunctorCallback##N( FUNCTION_CLASS *pObject, MemberCallback_t pfnProxied ) : m_Proxy( pObject, pfnProxied ) {} \
-		void operator()( CFunctorData *pFunctorDataBase ) \
-		{ \
-			ValidateFunctorData( pFunctorDataBase ); \
-			CFunctorData##N< FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_##N > *pFunctorData = static_cast< CFunctorData##N< FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_##N >* >( pFunctorDataBase ); \
-			m_Proxy( FUNC_CALL_DATA_ARGS_##N( pFunctorData ) ); \
-		} \
-		virtual void ComputeValidationString( char *pString, size_t nBufLen ) const { FUNC_VALIDATION_STRING_##N } \
-		virtual bool IsEqual( CFunctorCallback *pSrc ) const { return !Q_stricmp( GetImplClassName(), pSrc->GetImplClassName() ) && ( m_Proxy == static_cast< CMemberFunctorCallback##N* >( pSrc )->m_Proxy ); } \
-		virtual const char *GetImplClassName() const { return "CMemberFunctorCallback" #N; } \
-		virtual const void *GetTarget() const { return m_Proxy.GetTarget(); } \
-	private: \
-		CMemberFuncProxy##N< FUNCTION_CLASS *, MemberCallback_t FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, MEM_POLICY> m_Proxy; \
-	}
-
-template < class FUNCTION_CLASS, class MEM_POLICY = CFuncMemPolicyNone >
-class CMemberFunctorCallback0 : public CFunctorCallbackBase
-{
-	typedef void (FUNCTION_CLASS::* MemberCallback_t)();
-public:
-	CMemberFunctorCallback0(FUNCTION_CLASS* pObject, MemberCallback_t pfnProxied) : m_Proxy(pObject, pfnProxied) {}
-	void operator()(CFunctorData* pFunctorDataBase)
-	{
-		ValidateFunctorData(pFunctorDataBase);
-		m_Proxy();
-	}
-	virtual void ComputeValidationString(char* pString, size_t nBufLen) const { FUNC_VALIDATION_STRING_0 }
-	virtual bool IsEqual(CFunctorCallback* pSrc) const
-	{
-		if (Q_stricmp(GetImplClassName(), pSrc->GetImplClassName()))
-			return false;
-		return m_Proxy == static_cast<CMemberFunctorCallback0*>(pSrc)->m_Proxy;
-	}
-	virtual const char* GetImplClassName() const { return "CMemberFunctorCallback0"; }
-	virtual const void* GetTarget() const { return m_Proxy.GetTarget(); }
-private:
-	CMemberFuncProxy0< FUNCTION_CLASS*, MemberCallback_t, MEM_POLICY > m_Proxy;
-};
-
-FUNC_GENERATE_ALL_BUT0(DEFINE_MEMBER_FUNCTOR_CALLBACK_TEMPLATE);
-
-
-#define DEFINE_NONMEMBER_FUNCTOR_FACTORY(N) \
-	template <typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-	inline CFunctor *CreateFunctor(FUNCTION_RETTYPE (*pfnProxied)( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-	{ \
-		typedef FUNCTION_RETTYPE (*Func_t)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N); \
-		return new CFunctor##N<Func_t FUNC_BASE_TEMPLATE_ARG_PARAMS_##N>( pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ); \
-	}
-
-FUNC_GENERATE_ALL(DEFINE_NONMEMBER_FUNCTOR_FACTORY);
-
-#define DEFINE_MEMBER_FUNCTOR_FACTORY(N) \
-	template <typename OBJECT_TYPE_PTR, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-	inline CFunctor *CreateFunctor(OBJECT_TYPE_PTR pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-	{ \
-		return new CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) FUNC_BASE_TEMPLATE_ARG_PARAMS_##N>(pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N); \
-	}
-
-FUNC_GENERATE_ALL(DEFINE_MEMBER_FUNCTOR_FACTORY);
-
-#define DEFINE_CONST_MEMBER_FUNCTOR_FACTORY(N) \
-	template <typename OBJECT_TYPE_PTR, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-	inline CFunctor *CreateFunctor(OBJECT_TYPE_PTR pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) const FUNC_ARG_FORMAL_PARAMS_##N ) \
-	{ \
-		return new CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) const FUNC_BASE_TEMPLATE_ARG_PARAMS_##N>(pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N); \
-	}
-
-FUNC_GENERATE_ALL(DEFINE_CONST_MEMBER_FUNCTOR_FACTORY);
-
-#define DEFINE_REF_COUNTING_MEMBER_FUNCTOR_FACTORY(N) \
-	template <typename OBJECT_TYPE_PTR, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-	inline CFunctor *CreateRefCountingFunctor(OBJECT_TYPE_PTR pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-	{ \
-		return new CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CFuncMemPolicyRefCount<OBJECT_TYPE_PTR> >(pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N); \
-	}
-
-FUNC_GENERATE_ALL(DEFINE_REF_COUNTING_MEMBER_FUNCTOR_FACTORY);
-
-#define DEFINE_REF_COUNTING_CONST_MEMBER_FUNCTOR_FACTORY(N) \
-	template <typename OBJECT_TYPE_PTR, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-	inline CFunctor *CreateRefCountingFunctor(OBJECT_TYPE_PTR pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) const FUNC_ARG_FORMAL_PARAMS_##N ) \
-	{ \
-		return new CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) const FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CFuncMemPolicyRefCount<OBJECT_TYPE_PTR> >(pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N); \
-	}
-
-FUNC_GENERATE_ALL(DEFINE_REF_COUNTING_CONST_MEMBER_FUNCTOR_FACTORY);
-
-#define DEFINE_FUNCTOR_DATA_FACTORY(N) \
-	template < FUNC_SOLO_TEMPLATE_ARG_PARAMS_##N > \
-	inline CFunctorData *CreateFunctorData( FUNC_PROXY_ARG_FORMAL_PARAMS_##N ) \
-	{ \
-		return new CFunctorData##N< FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_##N >( FUNC_CALL_ARGS_##N ); \
-	}
-
-inline CFunctorData* CreateFunctorData()
-{
-	return new CFunctorData0();
-}
-
-FUNC_GENERATE_ALL_BUT0(DEFINE_FUNCTOR_DATA_FACTORY);
-
-#define DEFINE_FUNCTOR_CALLBACK_FACTORY(N) \
-	template < FUNC_SOLO_TEMPLATE_ARG_PARAMS_##N > \
-	inline CFunctorCallback *CreateFunctorCallback( void (*pfnProxied)( FUNC_PROXY_ARG_FORMAL_PARAMS_##N ) ) \
-	{ \
-		return new CFunctorCallback##N< FUNC_SOLO_BASE_TEMPLATE_ARG_PARAMS_##N >( pfnProxied ); \
-	}
-
-inline CFunctorCallback* CreateFunctorCallback(void (*pfnProxied)())
-{
-	return new CFunctorCallback0(pfnProxied);
-}
-
-FUNC_GENERATE_ALL_BUT0(DEFINE_FUNCTOR_CALLBACK_FACTORY);
-
-#define DEFINE_MEMBER_FUNCTOR_CALLBACK_FACTORY(N) \
-	template < typename FUNCTION_CLASS FUNC_TEMPLATE_ARG_PARAMS_##N > \
-	inline CFunctorCallback *CreateFunctorCallback( FUNCTION_CLASS *pObject, void ( FUNCTION_CLASS::*pfnProxied )( FUNC_PROXY_ARG_FORMAL_PARAMS_##N ) ) \
-	{ \
-		return new CMemberFunctorCallback##N< FUNCTION_CLASS FUNC_BASE_TEMPLATE_ARG_PARAMS_##N >( pObject, pfnProxied ); \
-	}
-
-FUNC_GENERATE_ALL(DEFINE_MEMBER_FUNCTOR_CALLBACK_FACTORY);
-
-
-#define DEFINE_NONMEMBER_FUNCTOR_DIRECT(N) \
-	template <typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-	inline void FunctorDirectCall(FUNCTION_RETTYPE (*pfnProxied)( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-{ \
-	(*pfnProxied)( FUNC_CALL_ARGS_##N ); \
-}
-
-FUNC_GENERATE_ALL(DEFINE_NONMEMBER_FUNCTOR_DIRECT);
-
-
-#define DEFINE_MEMBER_FUNCTOR_DIRECT(N) \
-	template <typename OBJECT_TYPE_PTR, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-	inline void FunctorDirectCall(OBJECT_TYPE_PTR pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-{ \
-	((*pObject).*pfnProxied)(FUNC_CALL_ARGS_##N); \
-}
-
-FUNC_GENERATE_ALL(DEFINE_MEMBER_FUNCTOR_DIRECT);
-
-#define DEFINE_CONST_MEMBER_FUNCTOR_DIRECT(N) \
-	template <typename OBJECT_TYPE_PTR, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-	inline void FunctorDirectCall(OBJECT_TYPE_PTR pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) const FUNC_ARG_FORMAL_PARAMS_##N ) \
-{ \
-	((*pObject).*pfnProxied)(FUNC_CALL_ARGS_##N); \
-}
-
-FUNC_GENERATE_ALL(DEFINE_CONST_MEMBER_FUNCTOR_DIRECT);
-
-#include "memdbgoff.h"
-
-class CDefaultFunctorFactory
-{
-public:
-	FUNC_GENERATE_ALL(DEFINE_NONMEMBER_FUNCTOR_FACTORY);
-	FUNC_GENERATE_ALL(DEFINE_MEMBER_FUNCTOR_FACTORY);
-	FUNC_GENERATE_ALL(DEFINE_CONST_MEMBER_FUNCTOR_FACTORY);
-	FUNC_GENERATE_ALL(DEFINE_REF_COUNTING_MEMBER_FUNCTOR_FACTORY);
-	FUNC_GENERATE_ALL(DEFINE_REF_COUNTING_CONST_MEMBER_FUNCTOR_FACTORY);
-};
-
-template <class CAllocator, class CCustomFunctorBase = CFunctorBase>
-class CCustomizedFunctorFactory
-{
-public:
-	void SetAllocator(CAllocator* pAllocator)
-	{
-		m_pAllocator = pAllocator;
-	}
-
-#define DEFINE_NONMEMBER_FUNCTOR_FACTORY_CUSTOM(N) \
-		template <typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		inline CFunctor *CreateFunctor( FUNCTION_RETTYPE (*pfnProxied)( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			typedef FUNCTION_RETTYPE (*Func_t)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N); \
-			return new (m_pAllocator->Alloc( sizeof(CFunctor##N<Func_t FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CCustomFunctorBase>) )) CFunctor##N<Func_t FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CCustomFunctorBase>( pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ); \
-		}
-
-	FUNC_GENERATE_ALL(DEFINE_NONMEMBER_FUNCTOR_FACTORY_CUSTOM);
-
-#define DEFINE_MEMBER_FUNCTOR_FACTORY_CUSTOM(N) \
-		template <typename OBJECT_TYPE_PTR, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		inline CFunctor *CreateFunctor(OBJECT_TYPE_PTR pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-		return new (m_pAllocator->Alloc( sizeof(CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CCustomFunctorBase>) )) CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CCustomFunctorBase>(pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N); \
-		}
-
-	FUNC_GENERATE_ALL(DEFINE_MEMBER_FUNCTOR_FACTORY_CUSTOM);
-
-#define DEFINE_CONST_MEMBER_FUNCTOR_FACTORY_CUSTOM(N) \
-		template <typename OBJECT_TYPE_PTR, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		inline CFunctor *CreateFunctor( OBJECT_TYPE_PTR pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) const FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			return new (m_pAllocator->Alloc( sizeof(CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) const FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CCustomFunctorBase>) )) CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) const FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CCustomFunctorBase>(pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N); \
-		}
-
-	FUNC_GENERATE_ALL(DEFINE_CONST_MEMBER_FUNCTOR_FACTORY_CUSTOM);
-
-#define DEFINE_REF_COUNTING_MEMBER_FUNCTOR_FACTORY_CUSTOM(N) \
-		template <typename OBJECT_TYPE_PTR, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		inline CFunctor *CreateRefCountingFunctor( OBJECT_TYPE_PTR pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			return new (m_pAllocator->Alloc( sizeof(CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CCustomFunctorBase, CFuncMemPolicyRefCount<OBJECT_TYPE_PTR> >) )) CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CCustomFunctorBase, CFuncMemPolicyRefCount<OBJECT_TYPE_PTR> >(pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N); \
-		}
-
-	FUNC_GENERATE_ALL(DEFINE_REF_COUNTING_MEMBER_FUNCTOR_FACTORY_CUSTOM);
-
-#define DEFINE_REF_COUNTING_CONST_MEMBER_FUNCTOR_FACTORY_CUSTOM(N) \
-		template <typename OBJECT_TYPE_PTR, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		inline CFunctor *CreateRefCountingFunctor( OBJECT_TYPE_PTR pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) const FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			return new (m_pAllocator->Alloc( sizeof(CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) const FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CCustomFunctorBase, CFuncMemPolicyRefCount<OBJECT_TYPE_PTR> >) )) CMemberFunctor##N<OBJECT_TYPE_PTR, FUNCTION_RETTYPE (FUNCTION_CLASS::*)(FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N) const FUNC_BASE_TEMPLATE_ARG_PARAMS_##N, CCustomFunctorBase, CFuncMemPolicyRefCount<OBJECT_TYPE_PTR> >(pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N); \
-		}
-
-	FUNC_GENERATE_ALL(DEFINE_REF_COUNTING_CONST_MEMBER_FUNCTOR_FACTORY_CUSTOM);
-
-private:
-	CAllocator* m_pAllocator;
-
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/fx.h b/SpyCustom/fx.h
deleted file mode 100644
index 4d15357..0000000
--- a/SpyCustom/fx.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#if !defined( FX_H )
-#define FX_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vector.h"
-#include "c_pixel_visibility.h"
-#include "mathlib.h" 
-typedef CBaseHandle ClientEntityHandle_t; 
-#include "smartptr.h" 
-
-class Vector;
-class CGameTrace;
-typedef CGameTrace trace_t;
-enum
-{
-	FX_ENERGYSPLASH_EXPLOSIVE = 0x1,
-	FX_ENERGYSPLASH_SMOKE = 0x2,
-	FX_ENERGYSPLASH_LITTLESPARKS = 0x4,
-	FX_ENERGYSPLASH_BIGSPARKS = 0x8,
-	FX_ENERGYSPLASH_BIGSPARKSCOLLIDE = 0x10,
-	FX_ENERGYSPLASH_ENERGYBALLS = 0x20,
-	FX_ENERGYSPLASH_DLIGHT = 0x40,
-
-	FX_ENERGYSPLASH_DEFAULT = ~FX_ENERGYSPLASH_EXPLOSIVE,
-	FX_ENERGYSPLASH_DEFAULT_EXPLOSIVE = ~0,
-};
-
-bool FX_GetAttachmentTransform(ClientEntityHandle_t hEntity, int attachmentIndex, matrix3x4_t& transform);
-bool FX_GetAttachmentTransform(ClientEntityHandle_t hEntity, int attachmentIndex, Vector* origin, QAngle* angles);
-
-void FX_RicochetSound(const Vector& pos);
-
-void FX_AntlionImpact(const Vector& pos, trace_t* tr);
-void FX_DebrisFlecks(const Vector& origin, trace_t* trace, char materialType, int iScale, bool bNoFlecks = false);
-void FX_Tracer(Vector& start, Vector& end, int velocity, bool makeWhiz = true);
-void FX_GunshipTracer(Vector& start, Vector& end, int velocity, bool makeWhiz = true);
-void FX_StriderTracer(Vector& start, Vector& end, int velocity, bool makeWhiz = true);
-void FX_HunterTracer(Vector& start, Vector& end, int velocity, bool makeWhiz = true);
-void FX_PlayerTracer(Vector& start, Vector& end);
-void FX_BulletPass(Vector& start, Vector& end);
-void FX_MetalSpark(const Vector& position, const Vector& direction, const Vector& surfaceNormal, int iScale = 1);
-void FX_MetalScrape(Vector& position, Vector& normal);
-void FX_Sparks(const Vector& pos, int nMagnitude, int nTrailLength, const Vector& vecDir, float flWidth, float flMinSpeed, float flMaxSpeed, char* pSparkMaterial = NULL);
-void FX_ElectricSpark(const Vector& pos, int nMagnitude, int nTrailLength, const Vector* vecDir);
-void FX_BugBlood(Vector& pos, Vector& dir, Vector& vWorldMins, Vector& vWorldMaxs);
-void FX_Blood(Vector& pos, Vector& dir, float r, float g, float b, float a);
-void FX_CreateImpactDust(Vector& origin, Vector& normal);
-void FX_EnergySplash(const Vector& pos, const Vector& normal, int nFlags = FX_ENERGYSPLASH_DEFAULT);
-void FX_MicroExplosion(Vector& position, Vector& normal);
-void FX_Explosion(Vector& origin, Vector& normal, char materialType);
-void FX_ConcussiveExplosion(Vector& origin, Vector& normal);
-void FX_DustImpact(const Vector& origin, trace_t* tr, int iScale);
-void FX_DustImpact(const Vector& origin, trace_t* tr, float flScale);
-void FX_MuzzleEffect(const Vector& origin, const QAngle& angles, float scale, ClientEntityHandle_t hEntity, unsigned char* pFlashColor = NULL, bool bOneFrame = false);
-void FX_MuzzleEffectAttached(float scale, ClientEntityHandle_t hEntity, int attachmentIndex, unsigned char* pFlashColor = NULL, bool bOneFrame = false);
-void FX_StriderMuzzleEffect(const Vector& origin, const QAngle& angles, float scale, ClientEntityHandle_t hEntity, unsigned char* pFlashColor = NULL);
-void FX_GunshipMuzzleEffect(const Vector& origin, const QAngle& angles, float scale, ClientEntityHandle_t hEntity, unsigned char* pFlashColor = NULL);
-void FX_Smoke(const Vector& origin, const Vector& velocity, float scale, int numParticles, float flDietime, unsigned char* pColor, int iAlpha, const char* pMaterial, float flRoll, float flRollDelta);
-
-void FX_Smoke(const Vector& origin, const QAngle& angles, float scale, int numParticles, unsigned char* pColor = NULL, int iAlpha = -1);
-void FX_Dust(const Vector& vecOrigin, const Vector& vecDirection, float flSize, float flSpeed);
-void FX_CreateGaussExplosion(const Vector& pos, const Vector& dir, int type);
-void FX_GaussTracer(Vector& start, Vector& end, int velocity, bool makeWhiz = true);
-void FX_TracerSound(const Vector& start, const Vector& end, int iTracerType);
-
-void UTIL_GetNormalizedColorTintAndLuminosity(const Vector& color, Vector* tint = NULL, float* luminosity = NULL);
-
-bool EffectOccluded(const Vector& pos, pixelvis_handle_t* queryHandle = 0);
-
-class CTeslaInfo
-{
-public:
-	Vector			m_vPos;
-	QAngle			m_vAngles;
-	int				m_nEntIndex;
-	char* m_pszSpriteName;
-	float			m_flBeamWidth;
-	int				m_nBeams;
-	Vector			m_vColor;
-	float			m_flTimeVisible;
-	float			m_flRadius;
-};
-
-void FX_Tesla(const CTeslaInfo& teslaInfo);
-
-#include "particle_parse.h"
-
-class CEffectData
-{
-public:
-	Vector m_vOrigin;
-	Vector m_vStart;
-	Vector m_vNormal;
-	QAngle m_vAngles;
-	int		m_fFlags;
-	int		m_nEntIndex;
-	float	m_flScale;
-	float	m_flMagnitude;
-	float	m_flRadius;
-	int		m_nAttachmentIndex;
-	short	m_nSurfaceProp;
-
-	int		m_nMaterial;
-	int		m_nDamageType;
-	int		m_nHitBox;
-
-	unsigned char	m_nColor;
-
-	bool							m_bCustomColors;
-	te_tf_particle_effects_colors_t	m_CustomColors;
-
-	bool									m_bControlPoint1;
-	te_tf_particle_effects_control_point_t	m_ControlPoint1;
-
-public:
-	CEffectData()
-	{
-		m_vOrigin.Init();
-		m_vStart.Init();
-		m_vNormal.Init();
-		m_vAngles.Init();
-
-		m_fFlags = 0;
-		m_nEntIndex = 0;
-		m_flScale = 1.f;
-		m_nAttachmentIndex = 0;
-		m_nSurfaceProp = 0;
-
-		m_flMagnitude = 0.0f;
-		m_flRadius = 0.0f;
-
-		m_nMaterial = 0;
-		m_nDamageType = 0;
-		m_nHitBox = 0;
-
-		m_nColor = 0;
-
-		m_bCustomColors = false;
-		m_CustomColors.m_vecColor1.Init(1.f, 1.f, 1.f);
-		m_CustomColors.m_vecColor2.Init(1.f, 1.f, 1.f);
-
-		m_bControlPoint1 = false;
-		m_ControlPoint1.m_eParticleAttachment = PATTACH_ABSORIGIN;
-		m_ControlPoint1.m_vecOffset.Init();
-	}
-
-	int GetEffectNameIndex() { return m_iEffectName; }
-
-private:
-	int m_iEffectName;	             
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/game_item_schema.h b/SpyCustom/game_item_schema.h
deleted file mode 100644
index 3ffb588..0000000
--- a/SpyCustom/game_item_schema.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef GAME_ITEM_SCHEMA_H
-#define GAME_ITEM_SCHEMA_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#if defined(TF_CLIENT_DLL) || defined(TF_DLL) || defined(TF_GC_DLL)
-class CTFItemSchema;
-class CTFItemDefinition;
-class CTFItemSystem;
-
-typedef CTFItemSchema		GameItemSchema_t;
-typedef CTFItemDefinition	GameItemDefinition_t;
-typedef CTFItemSystem		GameItemSystem_t;
-
-#include "tf_item_schema.h"
-#elif defined( DOTA_CLIENT_DLL ) || defined( DOTA_DLL ) || defined ( DOTA_GC_DLL ) 
-class CDOTAItemSchema;
-class CDOTAItemDefinition;
-class CDOTAItemSystem;
-
-typedef CDOTAItemSchema		GameItemSchema_t;
-typedef CDOTAItemDefinition	GameItemDefinition_t;
-typedef CDOTAItemSystem		GameItemSystem_t;
-
-#include "econ/dota_item_schema.h"
-#elif defined( PORTAL2 ) || defined( PORTAL2_GC_DLL )
-class CPortal2ItemSchema;
-class CPortal2ItemDefinition;
-class CPortal2ItemSystem;
-
-typedef CPortal2ItemSchema		GameItemSchema_t;
-typedef CPortal2ItemDefinition	GameItemDefinition_t;
-typedef CPortal2ItemSystem		GameItemSystem_t;
-
-#include "portal2_item_schema.h"	
-#elif defined( CSTRIKE15 ) || defined( CSTRIKE_GC_DLL )
-class CCStrike15ItemSchema;
-class CCStrike15ItemDefinition;
-class CCStrike15ItemSystem;
-
-typedef CCStrike15ItemSchema		GameItemSchema_t;
-typedef CCStrike15ItemDefinition	GameItemDefinition_t;
-typedef CCStrike15ItemSystem		GameItemSystem_t;
-
-#include "cstrike15_item_schema.h"
-#else
-class CEconItemSchema;
-class CEconItemDefinition;
-class CEconItemSystem;
-
-typedef CEconItemSchema		GameItemSchema_t;
-typedef CEconItemDefinition	GameItemDefinition_t;
-typedef CEconItemSystem		GameItemSystem_t;
-
-#include "econ_item_schema.h"
-#endif
-
-extern GameItemSchema_t* GetItemSchema();
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/gameconsole.h b/SpyCustom/gameconsole.h
deleted file mode 100644
index 907df43..0000000
--- a/SpyCustom/gameconsole.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef GAMECONSOLE_H
-#define GAMECONSOLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "IGameConsole.h"
-
-class CGameConsoleDialog;
-
-class CGameConsole : public IGameConsole
-{
-public:
-	CGameConsole();
-	~CGameConsole();
-
-	void Initialize();
-
-	virtual void Activate();
-	virtual void Hide();
-	virtual void Clear();
-
-	void HideImmediately(void);
-
-	virtual bool IsConsoleVisible();
-
-	void ActivateDelayed(float time);
-
-	void SetParent(int parent);
-
-	void Shutdown(void);
-
-	static void OnCmdCondump();
-private:
-
-	bool m_bInitialized;
-	CGameConsoleDialog* m_pConsole;
-};
-
-extern CGameConsole& GameConsole();
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/gamestringpool.h b/SpyCustom/gamestringpool.h
deleted file mode 100644
index 9d2696c..0000000
--- a/SpyCustom/gamestringpool.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef GAMESTRINGPOOL_H
-#define GAMESTRINGPOOL_H
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-#if !defined( GC )
-class IGameSystem;
-#endif
-
-string_t AllocPooledString(const char* pszValue);
-#define AllocPooledStringConstant( pszValue ) AllocPooledString( pszValue )
-string_t FindPooledString(const char* pszValue);
-void RemovePooledString(const char* pszValue);
-
-#define AssertIsValidString( s )	AssertMsg( s == NULL_STRING || s == FindPooledString( STRING(s) ), "Invalid string " #s );
-
-#if !defined( GC )
-IGameSystem* GameStringSystem();
-#endif
-
-class CGameString
-{
-public:
-	CGameString() :
-		m_iszString(NULL_STRING), m_pszString(NULL), m_iSerial(0)
-	{
-
-	}
-
-	CGameString(const char* pszString, bool bCopy = false) :
-		m_iszString(NULL_STRING), m_pszString(NULL), m_iSerial(0)
-	{
-		Set(pszString, bCopy);
-	}
-
-	~CGameString()
-	{
-		if (m_bCopy)
-			free((void*)m_pszString);
-	}
-
-	void Set(const char* pszString, bool bCopy = false)
-	{
-		if (m_bCopy && m_pszString)
-			free((void*)m_pszString);
-		m_iszString = NULL_STRING;
-		m_pszString = (!bCopy) ? pszString : strdup(pszString);
-	}
-
-	void SetFastNoCopy(string_t iszString)
-	{
-		m_iszString = iszString;
-		m_iSerial = gm_iSerialNumber;
-	}
-
-	bool IsSerialNumberOutOfDate(void) const
-	{
-		return m_iSerial != gm_iSerialNumber;
-	}
-
-	string_t Get() const
-	{
-		if (m_iszString == NULL_STRING || IsSerialNumberOutOfDate())
-		{
-			if (!m_pszString)
-				return NULL_STRING;
-
-			m_iszString = AllocPooledString(m_pszString);
-			m_iSerial = gm_iSerialNumber;
-		}
-
-		return m_iszString;
-	}
-
-	operator const char* () const
-	{
-		return (m_pszString) ? m_pszString : "";
-	}
-
-#ifndef NO_STRING_T
-	operator string_t() const
-	{
-		return Get();
-	}
-#endif
-
-	static void IncrementSerialNumber()
-	{
-		gm_iSerialNumber++;
-	}
-
-private:
-	mutable string_t m_iszString;
-	const char* m_pszString;
-	mutable int m_iSerial;
-	bool m_bCopy;
-
-
-	static int gm_iSerialNumber;
-
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/gametrace.h b/SpyCustom/gametrace.h
deleted file mode 100644
index 4a2192e..0000000
--- a/SpyCustom/gametrace.h
+++ /dev/null
@@ -1,147 +0,0 @@
-#ifndef GAMETRACE_H
-#define GAMETRACE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "cmodel.h"
-#include "utlvector.h"
-#include "ihandleentity.h"
-#include "ispatialpartition.h"
-
-#if defined( CLIENT_DLL )
-class C_BaseEntity;
-#else
-class CBaseEntity;
-#endif
-
-
-class CGameTrace : public CBaseTrace
-{
-public:
-
-	bool DidHitWorld() const;
-
-	bool DidHitNonWorldEntity() const;
-
-	int GetEntityIndex() const;
-
-	bool DidHit() const;
-
-	bool isVisible() const; 
-
-#if defined( ENGINE_DLL )
-	void SetEdict(edict_t* pEdict);
-	edict_t* GetEdict() const;
-#endif	
-
-
-public:
-
-	float		fractionleftsolid;		            
-	csurface_t	surface;				     
-	int			hitgroup;				        
-	short		physicsbone;			       
-
-#if defined( CLIENT_DLL )
-	C_BaseEntity* m_pEnt;
-#else
-	IClientEntity* m_pEnt;
-#endif
-	
-	int			hitbox;					      
-
-	CGameTrace() {}
-
-private:
-	CGameTrace(const CGameTrace& vOther);
-};
-
-
-inline bool CGameTrace::DidHit() const
-{
-	return fraction < 1 || allsolid || startsolid;
-}
-
-
-typedef CGameTrace trace_t;
-
-#define TLD_DEF_LEAF_MAX	256
-#define TLD_DEF_ENTITY_MAX	1024
-
-class CTraceListData : public IPartitionEnumerator
-{
-public:
-
-	CTraceListData(int nLeafMax = TLD_DEF_LEAF_MAX, int nEntityMax = TLD_DEF_ENTITY_MAX)
-	{
-		MEM_ALLOC_CREDIT();
-		m_nLeafCount = 0;
-		m_aLeafList.SetSize(nLeafMax);
-
-		m_nEntityCount = 0;
-		m_aEntityList.SetSize(nEntityMax);
-	}
-
-	~CTraceListData()
-	{
-		m_nLeafCount = 0;
-		m_aLeafList.RemoveAll();
-
-		m_nEntityCount = 0;
-		m_aEntityList.RemoveAll();
-	}
-
-	void Reset(void)
-	{
-		m_nLeafCount = 0;
-		m_nEntityCount = 0;
-	}
-
-	bool	IsEmpty(void) const { return (m_nLeafCount == 0 && m_nEntityCount == 0); }
-
-	int		LeafCount(void) const { return m_nLeafCount; }
-	int		LeafCountMax(void) const { return m_aLeafList.Count(); }
-	void    LeafCountReset(void) { m_nLeafCount = 0; }
-
-	int		EntityCount(void) const { return m_nEntityCount; }
-	int		EntityCountMax(void) const { return m_aEntityList.Count(); }
-	void	EntityCountReset(void) { m_nEntityCount = 0; }
-
-	void AddLeaf(int iLeaf)
-	{
-		if (m_nLeafCount >= m_aLeafList.Count())
-		{
-			DevMsg("CTraceListData: Max leaf count along ray exceeded!\n");
-			m_aLeafList.AddMultipleToTail(m_aLeafList.Count());
-		}
-
-		m_aLeafList[m_nLeafCount] = iLeaf;
-		m_nLeafCount++;
-	}
-
-	IterationRetval_t EnumElement(IHandleEntity* pHandleEntity)
-	{
-		if (m_nEntityCount >= m_aEntityList.Count())
-		{
-			DevMsg("CTraceListData: Max entity count along ray exceeded!\n");
-			m_aEntityList.AddMultipleToTail(m_aEntityList.Count());
-		}
-
-		m_aEntityList[m_nEntityCount] = pHandleEntity;
-		m_nEntityCount++;
-
-		return ITERATION_CONTINUE;
-	}
-
-public:
-
-	int							m_nLeafCount;
-	CUtlVector<int>				m_aLeafList;
-
-	int							m_nEntityCount;
-	CUtlVector<IHandleEntity*>	m_aEntityList;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/generichash.h b/SpyCustom/generichash.h
deleted file mode 100644
index f8380b8..0000000
--- a/SpyCustom/generichash.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef GENERICHASH_H
-#define GENERICHASH_H
-
-#if defined(_WIN32)
-#pragma once
-#endif
-
-unsigned FASTCALL HashString(const char* pszKey);
-unsigned FASTCALL HashStringCaseless(const char* pszKey);
-unsigned FASTCALL HashStringCaselessConventional(const char* pszKey);
-unsigned FASTCALL Hash4(const void* pKey);
-unsigned FASTCALL Hash8(const void* pKey);
-unsigned FASTCALL Hash12(const void* pKey);
-unsigned FASTCALL Hash16(const void* pKey);
-unsigned FASTCALL HashBlock(const void* pKey, unsigned size);
-
-unsigned FASTCALL HashInt(const int key);
-
-FORCEINLINE uint32 HashIntAlternate(uint32 n)
-{
-	n = (n + 0x7ed55d16) + (n << 12);
-	n = (n ^ 0xc761c23c) ^ (n >> 19);
-	n = (n + 0x165667b1) + (n << 5);
-	n = (n + 0xd3a2646c) ^ (n << 9);
-	n = (n + 0xfd7046c5) + (n << 3);
-	n = (n ^ 0xb55a4f09) ^ (n >> 16);
-	return n;
-}
-
-inline unsigned HashIntConventional(const int n)     
-{
-	unsigned hash = 0xAAAAAAAA + (n & 0xFF);
-	hash = (hash << 5) + hash + ((n >> 8) & 0xFF);
-	hash = (hash << 5) + hash + ((n >> 16) & 0xFF);
-	hash = (hash << 5) + hash + ((n >> 24) & 0xFF);
-
-	return hash;
-
-}
-
-template <typename T>
-inline unsigned HashItem(const T& item)
-{
-	if (sizeof(item) == 4)
-		return Hash4(&item);
-	else if (sizeof(item) == 8)
-		return Hash8(&item);
-	else if (sizeof(item) == 12)
-		return Hash12(&item);
-	else if (sizeof(item) == 16)
-		return Hash16(&item);
-	else
-		return HashBlock(&item, sizeof(item));
-}
-
-template <> inline unsigned HashItem<int>(const int& key)
-{
-	return HashInt(key);
-}
-
-template <> inline unsigned HashItem<unsigned>(const unsigned& key)
-{
-	return HashInt((int)key);
-}
-
-template<> inline unsigned HashItem<const char*>(const char* const& pszKey)
-{
-	return HashString(pszKey);
-}
-
-template<> inline unsigned HashItem<char*>(char* const& pszKey)
-{
-	return HashString(pszKey);
-}
-
-
-uint32 MurmurHash2(const void* key, int len, uint32 seed);
-
-uint32 MurmurHash2LowerCase(char const* pString, uint32 nSeed);
-
-uint64 MurmurHash64(const void* key, int len, uint32 seed);
-
-
-#endif   
\ No newline at end of file
diff --git a/SpyCustom/globalvars_base.h b/SpyCustom/globalvars_base.h
deleted file mode 100644
index 8820414..0000000
--- a/SpyCustom/globalvars_base.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef GLOBALVARS_BASE_H
-#define GLOBALVARS_BASE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-class CSaveRestoreData;
-
-class CGlobalVarsBase
-{
-public:
-
-	CGlobalVarsBase(bool bIsClient);
-
-	bool IsClient() const;
-
-	int GetNetworkBase(int nTick, int nEntity);
-
-public:
-
-	float			realtime;
-	int				framecount;
-	float			absoluteframetime;
-
-	float     absoluteframestarttimestddev;    
-
-	float			curtime;
-
-	float			frametime;
-	int				maxClients;
-
-	int				tickcount;
-
-	float			interval_per_tick;
-
-	float			interpolation_amount;
-	int				simTicksThisFrame;
-
-	int				network_protocol;
-
-	CSaveRestoreData* pSaveData;
-
-private:
-	bool			m_bClient;
-
-	bool      m_bRemoteClient;               
-
-	int				nTimestampNetworkingBase;
-	int				nTimestampRandomizeWindow;
-
-};
-
-inline int CGlobalVarsBase::GetNetworkBase(int nTick, int nEntity)
-{
-	int nEntityMod = nEntity % nTimestampRandomizeWindow;
-	int nBaseTick = nTimestampNetworkingBase * (int)((nTick - nEntityMod) / nTimestampNetworkingBase);
-	return nBaseTick;
-}
-
-inline CGlobalVarsBase::CGlobalVarsBase(bool bIsClient) :
-	m_bClient(bIsClient),
-	nTimestampNetworkingBase(100),
-	nTimestampRandomizeWindow(32)
-{
-}
-
-inline bool CGlobalVarsBase::IsClient() const
-{
-	return m_bClient;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/groundlink.h b/SpyCustom/groundlink.h
deleted file mode 100644
index 9851839..0000000
--- a/SpyCustom/groundlink.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef GROUNDLINK_H
-#define GROUNDLINK_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-struct groundlink_t
-{
-	EHANDLE					entity;
-	groundlink_t* nextLink;
-	groundlink_t* prevLink;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/htmlmessages.h b/SpyCustom/htmlmessages.h
deleted file mode 100644
index e633076..0000000
--- a/SpyCustom/htmlmessages.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef HTMLMESSAGES_H
-#define HTMLMESSAGES_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-enum EHTMLCommands
-{
-	eHTMLCommands_KeyUp,
-	eHTMLCommands_KeyDown,
-	eHTMLCommands_KeyChar,
-	eHTMLCommands_MouseDown,
-	eHTMLCommands_MouseUp,
-	eHTMLCommands_MouseDblClick,
-	eHTMLCommands_MouseWheel,
-	eHTMLCommands_MouseMove,
-	eHTMLCommands_MouseLeave,
-
-	eHTMLCommands_BrowserCreate,
-	eHTMLCommands_BrowserRemove,
-	eHTMLCommands_BrowserErrorStrings,
-	eHTMLCommands_BrowserSize,
-	eHTMLCommands_BrowserPosition,
-	eHTMLCommands_PostURL,
-	eHTMLCommands_StopLoad,
-	eHTMLCommands_Reload,
-	eHTMLCommands_GoForward,
-	eHTMLCommands_GoBack,
-	eHTMLCommands_Copy,
-	eHTMLCommands_Paste,
-	eHTMLCommands_ExecuteJavaScript,
-	eHTMLCommands_SetFocus,
-	eHTMLCommands_HorizontalScrollBarSize,
-	eHTMLCommands_VerticalScrollBarSize,
-	eHTMLCommands_Find,
-	eHTMLCommands_StopFind,
-	eHTMLCommands_SetHorizontalScroll,
-	eHTMLCommands_SetVerticalScroll,
-	eHTMLCommands_SetZoomLevel,
-	eHTMLCommands_ViewSource,
-	eHTMLCommands_NeedsPaintResponse,
-	eHTMLCommands_AddHeader,
-	eHTMLCommands_GetZoom,
-	eHTMLCommands_FileLoadDialogResponse,
-	eHTMLCommands_LinkAtPosition,
-	eHTMLCommands_ZoomToElementAtPosition,
-	eHTMLCommands_SavePageToJPEG,
-	eHTMLCommands_JSAlert,
-	eHTMLCommands_JSConfirm,
-	eHTMLCommands_CanGoBackandForward,
-	eHTMLCommands_OpenSteamURL,
-	eHTMLCommands_SizePopup,
-	eHTMLCommands_SetCookie,
-	eHTMLCommands_SetTargetFrameRate,
-	eHTMLCommands_FullRepaint,
-	eHTMLCommands_SetPageScale,
-	eHTMLCommands_RequestFullScreen,
-	eHTMLCommands_ExitFullScreen,
-	eHTMLCommands_GetCookiesForURL,
-	eHTMLCommands_ZoomToCurrentlyFocusedNode,
-	eHTMLCommands_CloseFullScreenFlashIfOpen,
-	eHTMLCommands_PauseFullScreenFlashMovieIfOpen,
-	eHTMLCommands_GetFocusedNodeValue,
-
-	eHTMLCommands_BrowserCreateResponse,
-	eHTMLCommands_BrowserReady,
-	eHTMLCommands_URLChanged,
-	eHTMLCommands_FinishedRequest,
-	eHTMLCommands_StartRequest,
-	eHTMLCommands_ShowPopup,
-	eHTMLCommands_HidePopup,
-	eHTMLCommands_OpenNewTab,
-	eHTMLCommands_PopupHTMLWindow,
-	eHTMLCommands_PopupHTMLWindowResponse,
-	eHTMLCommands_SetHTMLTitle,
-	eHTMLCommands_LoadingResource,
-	eHTMLCommands_StatusText,
-	eHTMLCommands_SetCursor,
-	eHTMLCommands_FileLoadDialog,
-	eHTMLCommands_ShowToolTip,
-	eHTMLCommands_UpdateToolTip,
-	eHTMLCommands_HideToolTip,
-	eHTMLCommands_SearchResults,
-	eHTMLCommands_Close,
-	eHTMLCommands_VerticalScrollBarSizeResponse,
-	eHTMLCommands_HorizontalScrollBarSizeResponse,
-	eHTMLCommands_GetZoomResponse,
-	eHTMLCommands_StartRequestResponse,
-	eHTMLCommands_NeedsPaint,
-	eHTMLCommands_LinkAtPositionResponse,
-	eHTMLCommands_ZoomToElementAtPositionResponse,
-	eHTMLCommands_JSDialogResponse,
-	eHTMLCommands_ScaleToValueResponse,
-	eHTMLCommands_RequestFullScreenResponse,
-	eHTMLCommands_GetCookiesForURLResponse,
-	eHTMLCommands_NodeGotFocus,
-	eHTMLCommands_SavePageToJPEGResponse,
-	eHTMLCommands_GetFocusedNodeValueResponse,
-
-	eHTMLCommands_None,
-
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/hud.h b/SpyCustom/hud.h
deleted file mode 100644
index 948c784..0000000
--- a/SpyCustom/hud.h
+++ /dev/null
@@ -1,171 +0,0 @@
-#ifndef HUD_H
-#define HUD_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-#include "utldict.h"
-#include "convar.h"
-#include "VGUI.h"
-#include "Color.h"
-#include "bitbuf.h"
-
-namespace vgui
-{
-	class IScheme;
-}
-
-typedef struct wrect_s
-{
-	int	left;
-	int right;
-	int top;
-	int bottom;
-} wrect_t;
-
-class CHudTexture
-{
-public:
-	CHudTexture();
-	CHudTexture& operator =(const CHudTexture& src);
-	virtual ~CHudTexture();
-
-	int Width() const
-	{
-		return rc.right - rc.left;
-	}
-
-	int Height() const
-	{
-		return rc.bottom - rc.top;
-	}
-
-	void Precache(void);
-
-	int EffectiveWidth(float flScale) const;
-	int EffectiveHeight(float flScale) const;
-
-	void DrawSelf(int x, int y, const Color& clr) const;
-	void DrawSelf(int x, int y, int w, int h, const Color& clr) const;
-	void DrawSelfCropped(int x, int y, int cropx, int cropy, int cropw, int croph, Color clr) const;
-	void DrawSelfCropped(int x, int y, int cropx, int cropy, int cropw, int croph, int finalWidth, int finalHeight, Color clr) const;
-
-	char		szShortName[64];
-	char		szTextureFile[64];
-
-	bool		bRenderUsingFont;
-	bool		bPrecached;
-	char		cCharacterInFont;
-	vgui::HFont hFont;
-
-	int			textureId;
-	float		texCoords[4];
-
-	wrect_t		rc;
-};
-
-#include "hudtexturehandle.h"
-
-class CHudElement;
-class CHudRenderGroup;
-
-class CHud
-{
-public:
-	static const int			HUDPB_HORIZONTAL;
-	static const int			HUDPB_VERTICAL;
-	static const int			HUDPB_HORIZONTAL_INV;
-
-public:
-	CHud();
-	~CHud();
-
-	void						Init(void);
-	void						VidInit(void);
-	void						Shutdown(void);
-	void						LevelInit(void);
-	void						LevelShutdown(void);
-
-	void						ResetHUD(void);
-
-	void						OnRestore();
-
-	void						Think();
-
-	void						ProcessInput(bool bActive);
-	void						UpdateHud(bool bActive);
-
-	void						InitColors(vgui::IScheme* pScheme);
-
-	void						AddHudElement(CHudElement* pHudElement);
-	void						RemoveHudElement(CHudElement* pHudElement);
-	CHudElement* FindElement(const char* pName);
-
-	bool						IsHidden(int iHudFlags);
-
-	float						GetSensitivity();
-	float						GetFOVSensitivityAdjust();
-
-	void						DrawProgressBar(int x, int y, int width, int height, float percentage, Color& clr, unsigned char type);
-	void						DrawIconProgressBar(int x, int y, CHudTexture* icon, CHudTexture* icon2, float percentage, Color& clr, int type);
-
-	CHudTexture* GetIcon(const char* szIcon);
-
-	CHudTexture* AddUnsearchableHudIconToList(CHudTexture& texture);
-	CHudTexture* AddSearchableHudIconToList(CHudTexture& texture);
-
-	void						RefreshHudTextures();
-
-	void						MsgFunc_ResetHUD(bf_read& msg);
-	void 						MsgFunc_SendAudio(bf_read& msg);
-
-	int							LookupRenderGroupIndexByName(const char* pszGroupName);
-	bool						LockRenderGroup(int iGroupIndex, CHudElement* pLocker = NULL);
-	bool						UnlockRenderGroup(int iGroupIndex, CHudElement* pLocker = NULL);
-	bool						IsRenderGroupLockedFor(CHudElement* pHudElement, int iGroupIndex);
-	int							RegisterForRenderGroup(const char* pszGroupName);
-	int							AddHudRenderGroup(const char* pszGroupName);
-	bool						DoesRenderGroupExist(int iGroupIndex);
-
-	void						SetScreenShotTime(float flTime) { m_flScreenShotTime = flTime; }
-
-public:
-
-	int							m_iKeyBits;
-#ifndef _XBOX
-	float						m_flMouseSensitivity;
-	float						m_flMouseSensitivityFactor;
-#endif
-	float						m_flFOVSensitivityAdjust;
-
-	Color						m_clrNormal;
-	Color						m_clrCaution;
-	Color						m_clrYellowish;
-
-	CUtlVector< CHudElement* >	m_HudList;
-
-private:
-	void						InitFonts();
-
-	void						SetupNewHudTexture(CHudTexture* t);
-
-	bool						m_bHudTexturesLoaded;
-
-	CUtlDict< CHudTexture*, int >		m_Icons;
-
-	CUtlVector< const char* >				m_RenderGroupNames;
-	CUtlMap< int, CHudRenderGroup* >		m_RenderGroups;
-
-	float						m_flScreenShotTime;      
-};
-
-extern CHud gHUD;
-
-extern vgui::HFont g_hFontTrebuchet24;
-
-void LoadHudTextures(CUtlDict< CHudTexture*, int >& list, const char* szFilenameWithoutExtension, const unsigned char* pICEKey);
-
-void GetHudSize(int& w, int& h);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/hud_basechat.h b/SpyCustom/hud_basechat.h
deleted file mode 100644
index 23fe063..0000000
--- a/SpyCustom/hud_basechat.h
+++ /dev/null
@@ -1,405 +0,0 @@
-#ifndef HUD_BASECHAT_H
-#define HUD_BASECHAT_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "hudelement.h"
-#include "Panel.h"
-#include "vgui_basepanel.h"
-#include "Frame.h"
-#include "TextEntry.h"
-#include "RichText.h"
-#include "Button.h"
-#include "CheckButton.h"
-
-class CBaseHudChatInputLine;
-class CBaseHudChatEntry;
-class CHudChatFilterPanel;
-
-namespace vgui
-{
-	class IScheme;
-};
-
-#define CHATLINE_NUM_FLASHES 8.0f
-#define CHATLINE_FLASH_TIME 5.0f
-#define CHATLINE_FADE_TIME 1.0f
-
-#define CHAT_HISTORY_FADE_TIME 0.25f
-#define CHAT_HISTORY_IDLE_TIME 15.0f
-#define CHAT_HISTORY_IDLE_FADE_TIME 2.5f
-#define CHAT_HISTORY_ALPHA 127
-
-extern Color g_ColorBlue;
-extern Color g_ColorRed;
-extern Color g_ColorGreen;
-extern Color g_ColorDarkGreen;
-extern Color g_ColorYellow;
-extern Color g_ColorGrey;
-
-extern ConVar cl_showtextmsg;
-
-enum ChatFilters
-{
-	CHAT_FILTER_NONE = 0,
-	CHAT_FILTER_JOINLEAVE = 0x000001,
-	CHAT_FILTER_NAMECHANGE = 0x000002,
-	CHAT_FILTER_PUBLICCHAT = 0x000004,
-	CHAT_FILTER_SERVERMSG = 0x000008,
-	CHAT_FILTER_TEAMCHANGE = 0x000010,
-	CHAT_FILTER_ACHIEVEMENT = 0x000020,
-
-};
-
-
-enum TextColor
-{
-	COLOR_NORMAL = 1,
-	COLOR_USEOLDCOLORS = 2,
-	COLOR_PLAYERNAME = 3,
-	COLOR_LOCATION = 4,
-	COLOR_ACHIEVEMENT = 5,
-	COLOR_CUSTOM = 6,		      
-	COLOR_HEXCODE = 7,		        
-	COLOR_HEXCODE_ALPHA = 8,          
-	COLOR_MAX
-};
-
-struct TextRange
-{
-	TextRange() { preserveAlpha = false; }
-	int start;
-	int end;
-	Color color;
-	bool preserveAlpha;
-};
-
-void StripEndNewlineFromString(char* str);
-void StripEndNewlineFromString(wchar_t* str);
-
-char* ConvertCRtoNL(char* str);
-wchar_t* ConvertCRtoNL(wchar_t* str);
-wchar_t* ReadLocalizedString(bf_read& msg, OUT_Z_BYTECAP(outSizeInBytes) wchar_t* pOut, int outSizeInBytes, bool bStripNewline, OUT_Z_CAP(originalSize) char* originalString = NULL, int originalSize = 0);
-wchar_t* ReadChatTextString(bf_read& msg, OUT_Z_BYTECAP(outSizeInBytes) wchar_t* pOut, int outSizeInBytes);
-char* RemoveColorMarkup(char* str);
-
-inline wchar_t* CloneWString(const wchar_t* str)
-{
-	const int nLen = V_wcslen(str) + 1;
-	wchar_t* cloneStr = new wchar_t[nLen];
-	const int nSize = nLen * sizeof(wchar_t);
-	V_wcsncpy(cloneStr, str, nSize);
-	return cloneStr;
-}
-
-class CBaseHudChatLine : public vgui::RichText
-{
-	typedef vgui::RichText BaseClass;
-
-public:
-	CBaseHudChatLine(vgui::Panel* parent, const char* panelName);
-	~CBaseHudChatLine();
-
-	void			SetExpireTime(void);
-
-	bool			IsReadyToExpire(void);
-
-	void			Expire(void);
-
-	float			GetStartTime(void);
-
-	int				GetCount(void);
-
-	virtual void	ApplySchemeSettings(vgui::IScheme* pScheme);
-
-	vgui::HFont		GetFont() { return m_hFont; }
-
-	Color			GetTextColor(void) { return m_clrText; }
-	void			SetNameLength(int iLength) { m_iNameLength = iLength; }
-	void			SetNameColor(Color cColor) { m_clrNameColor = cColor; }
-
-	virtual void	PerformFadeout(void);
-	virtual void	InsertAndColorizeText(wchar_t* buf, int clientIndex);
-	virtual			void Colorize(int alpha = 255);								           
-
-
-	void			SetNameStart(int iStart) { m_iNameStart = iStart; }
-
-protected:
-	int				m_iNameLength;
-	vgui::HFont		m_hFont;
-
-	Color			m_clrText;
-	Color			m_clrNameColor;
-
-	float			m_flExpireTime;
-
-	CUtlVector< TextRange > m_textRanges;
-	wchar_t* m_text;
-
-	int				m_iNameStart;
-
-private:
-	float			m_flStartTime;
-	int				m_nCount;
-
-	vgui::HFont		m_hFontMarlett;
-
-
-private:
-	CBaseHudChatLine(const CBaseHudChatLine&);     
-};
-
-
-class CHudChatHistory : public vgui::RichText
-{
-	DECLARE_CLASS_SIMPLE(CHudChatHistory, vgui::RichText);
-public:
-
-	CHudChatHistory(vgui::Panel* pParent, const char* panelName);
-
-	virtual void	ApplySchemeSettings(vgui::IScheme* pScheme);
-};
-
-class CHudChatFilterButton : public vgui::Button
-{
-	DECLARE_CLASS_SIMPLE(CHudChatFilterButton, vgui::Button);
-
-public:
-
-	CHudChatFilterButton(vgui::Panel* pParent, const char* pName, const char* pText);
-
-	virtual void DoClick(void);
-};
-
-class CHudChatFilterCheckButton : public vgui::CheckButton
-{
-	DECLARE_CLASS_SIMPLE(CHudChatFilterCheckButton, vgui::CheckButton);
-
-public:
-
-	CHudChatFilterCheckButton(vgui::Panel* pParent, const char* pName, const char* pText, int iFlag);
-
-	int		GetFilterFlag(void) { return m_iFlag; }
-
-private:
-
-	int m_iFlag;
-};
-
-
-class CBaseHudChat : public CHudElement, public vgui::EditablePanel
-{
-	DECLARE_CLASS_SIMPLE(CBaseHudChat, vgui::EditablePanel);
-public:
-	DECLARE_MULTIPLY_INHERITED();
-
-	enum
-	{
-		CHAT_INTERFACE_LINES = 6,
-		MAX_CHARS_PER_LINE = 128
-	};
-
-	CBaseHudChat(const char* pElementName);
-
-	virtual void	CreateChatInputLine(void);
-	virtual void	CreateChatLines(void);
-
-	virtual void	Init(void);
-
-	void			LevelInit(const char* newmap);
-	void			LevelShutdown(void);
-
-	void			MsgFunc_TextMsg(const char* pszName, int iSize, void* pbuf);
-
-	virtual void	Printf(int iFilter, PRINTF_FORMAT_STRING const char* fmt, ...);
-	virtual void	ChatPrintf(int iPlayerIndex, int iFilter, PRINTF_FORMAT_STRING const char* fmt, ...) FMTFUNCTION(4, 5);
-
-	virtual void	StartMessageMode(int iMessageModeType);
-	virtual void	StopMessageMode(void);
-	void			Send(void);
-
-	MESSAGE_FUNC(OnChatEntrySend, "ChatEntrySend");
-	MESSAGE_FUNC(OnChatEntryStopMessageMode, "ChatEntryStopMessageMode");
-
-	virtual void	ApplySchemeSettings(vgui::IScheme* pScheme);
-	virtual void	Paint(void);
-	virtual void	OnTick(void);
-	virtual void	Reset();
-#ifdef _XBOX
-	virtual bool	ShouldDraw();
-#endif
-	vgui::Panel* GetInputPanel(void);
-
-	static int		m_nLineCounter;
-
-	virtual int		GetChatInputOffset(void);
-
-	virtual void FireGameEvent(IGameEvent* event);
-
-	CHudChatHistory* GetChatHistory();
-
-	void					FadeChatHistory();
-	float					m_flHistoryFadeTime;
-	float					m_flHistoryIdleTime;
-
-	virtual void			MsgFunc_SayText(bf_read& msg);
-	virtual void			MsgFunc_SayText2(bf_read& msg);
-	virtual void			MsgFunc_TextMsg(bf_read& msg);
-	virtual void			MsgFunc_VoiceSubtitle(bf_read& msg);
-
-
-	CBaseHudChatInputLine* GetChatInput(void) { return m_pChatInput; }
-	CHudChatFilterPanel* GetChatFilterPanel(void);
-
-	virtual int				GetFilterFlags(void) { return m_iFilterFlags; }
-	void					SetFilterFlag(int iFilter);
-
-	virtual Color	GetDefaultTextColor(void);
-	virtual Color	GetTextColorForClient(TextColor colorNum, int clientIndex);
-	virtual Color	GetClientColor(int clientIndex);
-
-	virtual int		GetFilterForString(const char* pString);
-
-	virtual const char* GetDisplayedSubtitlePlayerName(int clientIndex);
-
-	bool			IsVoiceSubtitle(void) { return m_bEnteringVoice; }
-	void			SetVoiceSubtitleState(bool bState) { m_bEnteringVoice = bState; }
-	int				GetMessageMode(void) { return m_nMessageMode; }
-
-	void			SetCustomColor(Color colNew) { m_ColorCustom = colNew; }
-	void			SetCustomColor(const char* pszColorName);
-
-protected:
-	CBaseHudChatLine* FindUnusedChatLine(void);
-
-	CBaseHudChatInputLine* m_pChatInput;
-	CBaseHudChatLine* m_ChatLine;
-	int					m_iFontHeight;
-
-	CHudChatHistory* m_pChatHistory;
-
-	CHudChatFilterButton* m_pFiltersButton;
-	CHudChatFilterPanel* m_pFilterPanel;
-
-	Color			m_ColorCustom;
-
-private:
-	void			Clear(void);
-
-	int				ComputeBreakChar(int width, const char* text, int textlen);
-
-	int				m_nMessageMode;
-
-	int				m_nVisibleHeight;
-
-	vgui::HFont		m_hChatFont;
-
-	int				m_iFilterFlags;
-	bool			m_bEnteringVoice;
-
-};
-
-class CBaseHudChatEntry : public vgui::TextEntry
-{
-	typedef vgui::TextEntry BaseClass;
-public:
-	CBaseHudChatEntry(vgui::Panel* parent, char const* panelName, vgui::Panel* pChat)
-		: BaseClass(parent, panelName)
-	{
-		SetCatchEnterKey(true);
-		SetAllowNonAsciiCharacters(true);
-		SetDrawLanguageIDAtLeft(true);
-		m_pHudChat = pChat;
-	}
-
-	virtual void ApplySchemeSettings(vgui::IScheme* pScheme)
-	{
-		BaseClass::ApplySchemeSettings(pScheme);
-
-		SetPaintBorderEnabled(false);
-	}
-
-	virtual void OnKeyCodeTyped(vgui::KeyCode code)
-	{
-		if (code == KEY_ENTER || code == KEY_PAD_ENTER || code == KEY_ESCAPE)
-		{
-			if (code != KEY_ESCAPE)
-			{
-				if (m_pHudChat)
-				{
-					PostMessage(m_pHudChat, new KeyValues("ChatEntrySend"));
-				}
-			}
-
-			if (m_pHudChat)
-			{
-				PostMessage(m_pHudChat, new KeyValues("ChatEntryStopMessageMode"));
-			}
-		}
-		else if (code == KEY_TAB)
-		{
-			return;
-		}
-		else
-		{
-			BaseClass::OnKeyCodeTyped(code);
-		}
-	}
-
-private:
-	vgui::Panel* m_pHudChat;
-};
-
-class CBaseHudChatInputLine : public vgui::Panel
-{
-	typedef vgui::Panel BaseClass;
-
-public:
-	CBaseHudChatInputLine(vgui::Panel* parent, char const* panelName);
-
-	void			SetPrompt(const wchar_t* prompt);
-	void			ClearEntry(void);
-	void			SetEntry(const wchar_t* entry);
-	void			GetMessageText(OUT_Z_BYTECAP(buffersizebytes) wchar_t* buffer, int buffersizebytes);
-
-	virtual void	PerformLayout();
-	virtual void	ApplySchemeSettings(vgui::IScheme* pScheme);
-
-	vgui::Panel* GetInputPanel(void);
-	virtual vgui::VPANEL GetCurrentKeyFocus() { return m_pInput->GetVPanel(); }
-
-	virtual void Paint()
-	{
-		BaseClass::Paint();
-	}
-
-	vgui::Label* GetPrompt(void) { return m_pPrompt; }
-
-protected:
-	vgui::Label* m_pPrompt;
-	CBaseHudChatEntry* m_pInput;
-};
-
-
-class CHudChatFilterPanel : public vgui::EditablePanel
-{
-	DECLARE_CLASS_SIMPLE(CHudChatFilterPanel, vgui::EditablePanel);
-
-public:
-
-	CHudChatFilterPanel(vgui::Panel* pParent, const char* pName);
-
-	virtual void ApplySchemeSettings(vgui::IScheme* pScheme);
-	MESSAGE_FUNC_PTR(OnFilterButtonChecked, "CheckButtonChecked", panel);
-
-	CBaseHudChat* GetChatParent(void) { return dynamic_cast <CBaseHudChat*> (GetParent()); }
-
-	virtual void SetVisible(bool state);
-
-private:
-
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/hud_element_helper.h b/SpyCustom/hud_element_helper.h
deleted file mode 100644
index e1d8c7d..0000000
--- a/SpyCustom/hud_element_helper.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef HUD_ELEMENT_HELPER_H
-#define HUD_ELEMENT_HELPER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class CHudElement;
-
-class CHudElementHelper
-{
-public:
-	static CHudElementHelper* m_sHelpers;
-	static void CreateAllElements(void);
-
-public:
-	CHudElementHelper(CHudElement* (*pfnCreate)(void), int depth);
-
-	CHudElementHelper* GetNext(void);
-
-private:
-	CHudElementHelper* m_pNext;
-	CHudElement* (*m_pfnCreate)(void);
-
-	int					m_iDepth;
-};
-
-#define DECLARE_HUDELEMENT( className )											\
-	static CHudElement *Create_##className( void )							\
-		{																		\
-			return new className( #className );									\
-		};																		\
-	static CHudElementHelper g_##className##_Helper( Create_##className, 50 );
-
-#define DECLARE_HUDELEMENT_DEPTH( className, depth )											\
-	static CHudElement *Create_##className( void )							\
-		{																		\
-			return new className( #className );									\
-		};																		\
-	static CHudElementHelper g_##className##_Helper( Create_##className, depth );
-
-#define DECLARE_NAMED_HUDELEMENT( className, panelName )						\
-	static CHudElement *Create_##panelName( void )							\
-		{																		\
-			return new className( #panelName );									\
-		};																		\
-	static CHudElementHelper g_##panelName##_Helper( Create_##panelName, 50 );
-
-#define GET_HUDELEMENT( className )												\
-	( className *)gHUD.FindElement( #className )
-
-#define GET_NAMED_HUDELEMENT( className, panelName )							\
-	( className *)gHUD.FindElement( #panelName )
-
-
-#define DECLARE_MULTIPLY_INHERITED()							\
-    void *operator new( size_t stAllocateBlock )				\
-	{															\
-		return CHudElement::operator new ( stAllocateBlock );	\
-	}															\
-	void* operator new( size_t stAllocateBlock, int nBlockUse, const char *pFileName, int nLine )	\
-	{ 																								\
-		return CHudElement::operator new ( stAllocateBlock, nBlockUse, pFileName, nLine );	\
-	}															\
-	void operator delete( void *pMem )							\
-	{															\
-		CHudElement::operator delete ( pMem );					\
-	}															\
-	void operator delete( void *pMem, int nBlockUse, const char *pFileName, int nLine )	\
-	{															\
-		CHudElement::operator delete ( pMem, nBlockUse, pFileName, nLine );	\
-	}
-
-#define IMPLEMENT_OPERATORS_NEW_AND_DELETE			DECLARE_MULTIPLY_INHERITED
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/hudelement.h b/SpyCustom/hudelement.h
deleted file mode 100644
index 743a4b6..0000000
--- a/SpyCustom/hudelement.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#if !defined( HUDELEMENT_H )
-#define HUDELEMENT_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "hud.h"
-#include "hud_element_helper.h"
-#include "networkvar.h"
-#include "GameEventListener.h"
-#include "memdbgon.h"
-#undef new
-
-class CHudElement : public CGameEventListener
-{
-public:
-	DECLARE_CLASS_NOBASE(CHudElement);
-
-	CHudElement(const char* pElementName);
-	virtual						~CHudElement();
-
-	virtual void				Init(void) { return; }
-
-	virtual void				VidInit(void) { return; }
-
-	virtual void				LevelInit(void) { return; };
-	virtual void				LevelShutdown(void) { return; };
-
-	virtual void				Reset(void) { return; }
-
-	virtual void				ProcessInput(void) { return; }
-	virtual const char* GetName(void) const { return m_pElementName; };
-
-	virtual bool				ShouldDraw(void);
-
-	virtual bool				IsActive(void) { return m_bActive; };
-	virtual void				SetActive(bool bActive);
-
-	virtual void				SetHiddenBits(int iBits);
-
-	bool						IsParentedToClientDLLRootPanel() const;
-	void						SetParentedToClientDLLRootPanel(bool parented);
-
-	void* operator new(size_t stAllocateBlock)
-	{
-		Assert(stAllocateBlock != 0);
-		void* pMem = malloc(stAllocateBlock);
-		memset(pMem, 0, stAllocateBlock);
-		return pMem;
-	}
-
-	void* operator new(size_t stAllocateBlock, int nBlockUse, const char* pFileName, int nLine)
-	{
-		Assert(stAllocateBlock != 0);
-		void* pMem = MemAlloc_Alloc(stAllocateBlock, pFileName, nLine);
-		memset(pMem, 0, stAllocateBlock);
-		return pMem;
-	}
-
-	void operator delete(void* pMem)
-	{
-#if defined( _DEBUG )
-		int size = _msize(pMem);
-		memset(pMem, 0xcd, size);
-#endif
-		free(pMem);
-	}
-
-	void operator delete(void* pMem, int nBlockUse, const char* pFileName, int nLine)
-	{
-		operator delete(pMem);
-	}
-
-	void SetNeedsRemove(bool needsremove);
-
-	void RegisterForRenderGroup(const char* pszName);
-	void UnregisterForRenderGroup(const char* pszGroupName);
-	void HideLowerPriorityHudElementsInGroup(const char* pszGroupName);
-	void UnhideLowerPriorityHudElementsInGroup(const char* pszGroupName);
-
-	virtual int	GetRenderGroupPriority();
-
-public:   
-
-	virtual void FireGameEvent(IGameEvent* event) {}
-
-public:
-
-	bool						m_bActive;
-
-protected:
-	int							m_iHiddenBits;
-
-private:
-	const char* m_pElementName;
-	bool						m_bNeedsRemove;
-	bool						m_bIsParentedToClientDLLRootPanel;
-
-	CUtlVector< int >			m_HudRenderGroups;
-};
-
-#include "utlpriorityqueue.h"
-
-inline bool RenderGroupLessFunc(CHudElement* const& lhs, CHudElement* const& rhs)
-{
-	return (lhs->GetRenderGroupPriority() < rhs->GetRenderGroupPriority());
-}
-
-class CHudRenderGroup
-{
-public:
-	CHudRenderGroup()
-	{
-		m_pLockingElements.SetLessFunc(RenderGroupLessFunc);
-		bHidden = false;
-	}
-
-	bool bHidden;
-	CUtlPriorityQueue< CHudElement* >	m_pLockingElements;
-};
-
-#include "memdbgoff.h"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/hudtexturehandle.h b/SpyCustom/hudtexturehandle.h
deleted file mode 100644
index d07d1c7..0000000
--- a/SpyCustom/hudtexturehandle.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef HUDTEXTUREHANDLE_H
-#define HUDTEXTUREHANDLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class CHudTexture;
-
-class CHudTextureHandle
-{
-public:
-	CHudTextureHandle()
-	{
-		m_pValue = NULL;
-	}
-
-	const CHudTextureHandle& operator=(const CHudTexture* t)
-	{
-		m_pValue = (CHudTexture*)t;
-		return *this;
-	}
-
-	void Set(CHudTexture* t)
-	{
-		m_pValue = t;
-	}
-
-	CHudTexture* Get()
-	{
-		return m_pValue;
-	}
-
-	operator CHudTexture* ()
-	{
-		return m_pValue;
-	}
-
-	operator CHudTexture* () const
-	{
-		return m_pValue;
-	}
-
-	CHudTexture* operator->() const
-	{
-		return m_pValue;
-	}
-
-private:
-	CHudTexture* m_pValue;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ichromehtmlwrapper.h b/SpyCustom/ichromehtmlwrapper.h
deleted file mode 100644
index 1e66869..0000000
--- a/SpyCustom/ichromehtmlwrapper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef ICHROMEHTMLWRAPPER_H
-#define ICHROMEHTMLWRAPPER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "htmlmessages.h"
-
-class CUtlString;
-class IHTMLResponses;
-struct HTMLCommandBuffer_t;
-
-
-class IHTMLChromeController
-{
-public:
-	virtual ~IHTMLChromeController() {}
-
-	virtual bool Init(const char* pchHTMLCacheDir, const char* pchCookiePath) = 0;
-	virtual void Shutdown() = 0;
-	virtual bool RunFrame() = 0;
-
-
-	virtual void SetWebCookie(const char* pchHostname, const char* pchKey, const char* pchValue, const char* pchPath, RTime32 nExpires = 0) = 0;
-	virtual void GetWebCookiesForURL(CUtlString* pstrValue, const char* pchURL, const char* pchName) = 0;
-
-	virtual void SetClientBuildID(uint64 ulBuildID) = 0;
-
-	virtual bool BHasPendingMessages() = 0;
-
-	virtual void CreateBrowser(IHTMLResponses* pBrowser, bool bPopupWindow, const char* pchUserAgentIdentifier) = 0;
-	virtual void RemoveBrowser(IHTMLResponses* pBrowser) = 0;
-
-	virtual void WakeThread() = 0;
-	virtual HTMLCommandBuffer_t* GetFreeCommandBuffer(EHTMLCommands eCmd, int iBrowser) = 0;
-	virtual void PushCommand(HTMLCommandBuffer_t*) = 0;
-
-#ifdef DBGFLAG_VALIDATE
-	virtual void Validate(CValidator& validator, const char* pchName) = 0;
-
-	virtual bool ChromePrepareForValidate() = 0;
-	virtual bool ChromeResumeFromValidate() = 0;
-#endif
-
-	virtual void SetCefThreadTargetFrameRate(uint32 nFPS) = 0;
-};
-
-#define CHROMEHTML_CONTROLLER_INTERFACE_VERSION "ChromeHTML_Controller_001"
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iclassmap.h b/SpyCustom/iclassmap.h
deleted file mode 100644
index 071a0ed..0000000
--- a/SpyCustom/iclassmap.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef ICLASSMAP_H
-#define ICLASSMAP_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class C_BaseEntity;
-typedef C_BaseEntity* (*DISPATCHFUNCTION)(void);
-
-class IClassMap
-{
-public:
-	virtual					~IClassMap() {}
-
-	virtual void			Add(const char* mapname, const char* classname, int size, DISPATCHFUNCTION factory = 0) = 0;
-	virtual char const* Lookup(const char* classname) = 0;
-	virtual C_BaseEntity* CreateEntity(const char* mapname) = 0;
-	virtual int				GetClassSize(const char* classname) = 0;
-};
-
-extern IClassMap& GetClassMap();
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iclient.h b/SpyCustom/iclient.h
deleted file mode 100644
index 7334022..0000000
--- a/SpyCustom/iclient.h
+++ /dev/null
@@ -1,141 +0,0 @@
-#ifndef ICLIENT_H
-#define ICLIENT_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "inetmsghandler.h"
-#include "platform.h"
-#include "userid.h"
-#include "utlvector.h"
-
-class IServer;
-class INetMessage;
-struct NetMessageCvar_t;
-class CMsg_CVars;
-
-enum CrossPlayPlatform_t
-{
-	CROSSPLAYPLATFORM_UNKNOWN = 0,
-	CROSSPLAYPLATFORM_PC,
-	CROSSPLAYPLATFORM_X360,
-	CROSSPLAYPLATFORM_PS3,
-
-	CROSSPLAYPLATFORM_LAST = CROSSPLAYPLATFORM_PS3,
-};
-
-inline bool IsCrossPlayPlatformAConsole(CrossPlayPlatform_t platform)
-{
-	return (platform == CROSSPLAYPLATFORM_X360) || (platform == CROSSPLAYPLATFORM_PS3);
-}
-
-#if defined( _GAMECONSOLE )
-#	if defined( PLATFORM_X360 )
-#		define CROSSPLAYPLATFORM_THISPLATFORM CROSSPLAYPLATFORM_X360
-#	elif defined( PLATFORM_PS3 )
-#		define CROSSPLAYPLATFORM_THISPLATFORM CROSSPLAYPLATFORM_PS3
-#	else
-#pragma message( "Unknown console, please update this platform definition" )
-#		define CROSSPLAYPLATFORM_THISPLATFORM CROSSPLAYPLATFORM_UNKNOWN
-#	endif
-#else
-#	define CROSSPLAYPLATFORM_THISPLATFORM CROSSPLAYPLATFORM_PC
-#endif
-
-struct HltvReplayParams_t
-{
-	HltvReplayParams_t()
-	{
-		m_nPrimaryTargetEntIndex = 0;
-		m_flPlaybackSpeed = 1.0f;
-		m_flDelay = 10.0f;
-		m_flStopAt = 0.0f;
-		m_flSlowdownBeginAt = 0;
-		m_flSlowdownEndAt = 0;
-		m_flSlowdownRate = 1.0f;
-		m_bAbortCurrentReplay = false;
-	}
-	int m_nPrimaryTargetEntIndex;
-	float m_flDelay;
-	float m_flStopAt;
-	float m_flPlaybackSpeed;
-	float m_flSlowdownBeginAt;
-	float m_flSlowdownEndAt;
-	float m_flSlowdownRate;
-	bool m_bAbortCurrentReplay;                      
-};
-
-abstract_class IClient : public INetChannelHandler
-{
-public:
-	virtual	~IClient() {}
-
-	virtual void	Connect(const char* szName, int nUserID, INetChannel * pNetChannel, bool bFakePlayer, CrossPlayPlatform_t clientPlatform, const CMsg_CVars * pVecCvars = NULL) = 0;
-
-	virtual void	Inactivate(void) = 0;
-
-	virtual	void	Reconnect(void) = 0;				  
-
-	virtual void	Disconnect(const char* reason) = 0;
-
-	virtual bool	ChangeSplitscreenUser(int nSplitScreenUserSlot) = 0;
-
-	virtual int				GetPlayerSlot() const = 0;       
-	virtual int				GetUserID() const = 0;       
-	virtual const USERID_t	GetNetworkID() const = 0;    
-	virtual const char* GetClientName() const = 0;	   
-	virtual INetChannel* GetNetChannel() = 0;    
-	virtual IServer* GetServer() = 0;         
-	virtual const char* GetUserSetting(const char* cvar) const = 0;      
-	virtual const char* GetNetworkIDString() const = 0;          
-
-	virtual void	SetRate(int nRate, bool bForce) = 0;
-	virtual int		GetRate(void) const = 0;
-
-	virtual void	SetUpdateRate(float fUpdateRate, bool bForce) = 0;
-	virtual float	GetUpdateRate(void) const = 0;
-
-	virtual void	Clear(void) = 0;
-
-	virtual int		GetMaxAckTickCount() const = 0;
-
-	virtual bool	ExecuteStringCommand(const char* s) = 0;
-	virtual bool	SendNetMsg(INetMessage& msg, bool bForceReliable = false, bool bVoice = false) = 0;
-	virtual void	ClientPrintf(const char* fmt, ...) = 0;
-
-virtual bool	IsConnected(void) const = 0;
-virtual bool	IsSpawned(void) const = 0;
-virtual bool	IsActive(void) const = 0;
-virtual bool	IsFakeClient(void) const = 0;
-virtual bool	IsHLTV(void) const = 0;
-#if defined( REPLAY_ENABLED )
-virtual bool	IsReplay(void) const = 0;
-#endif
-virtual bool	IsHearingClient(int index) const = 0;
-virtual bool	IsProximityHearingClient(int index) const = 0;
-
-virtual void	SetMaxRoutablePayloadSize(int nMaxRoutablePayloadSize) = 0;
-
-virtual bool	IsSplitScreenUser(void) const = 0;
-
-virtual bool	CheckConnect(void) = 0;
-
-virtual	bool	IsLowViolenceClient(void) const = 0;
-
-virtual IClient* GetSplitScreenOwner() = 0;
-
-virtual int		GetNumPlayers() = 0;
-
-virtual bool	IsHumanPlayer() const = 0;
-
-virtual CrossPlayPlatform_t GetClientPlatform() const = 0;
-
-virtual bool StartHltvReplay(const HltvReplayParams_t& params) = 0;
-virtual void StopHltvReplay() = 0;
-virtual int GetHltvReplayDelay() = 0;
-virtual const char* GetHltvReplayStatus()const { return ""; }
-virtual bool CanStartHltvReplay() = 0;
-virtual void ResetReplayRequestTime() = 0;
-};
-
-#endif  
diff --git a/SpyCustom/icliententity.h b/SpyCustom/icliententity.h
deleted file mode 100644
index df91710..0000000
--- a/SpyCustom/icliententity.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef ICLIENTENTITY_H
-#define ICLIENTENTITY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "iclientrenderable.h"
-#include "iclientnetworkable.h"
-#include "iclientthinkable.h"
-#include "string_t.h"
-
-
-
-struct Ray_t;
-class CGameTrace;
-typedef CGameTrace trace_t;
-class CMouthInfo;
-class IClientEntityInternal;
-struct SpatializationInfo_t;
-
-
-
-abstract_class IClientEntity : public IClientUnknown, public IClientRenderable, public IClientNetworkable, public IClientThinkable
-{
-public:
-
-
-	virtual void			Release(void) = 0;
-	virtual void Unknown000(void) = 0; 
-	const Vector& GetAbsOrigin() 
-	{
-		typedef Vector& (__thiscall* GetAbsOriginFn)(void*);
-		return getvfunc<GetAbsOriginFn>(this, 10)(this);
-	}
-	
-	const Vector& GetAbsAngles(void)  
-	{
-		typedef Vector& (__thiscall* GetAbsAnglesFn)(void*);
-		return getvfunc<GetAbsAnglesFn>(this, 11)(this);
-	}
-
-	const void SetModelIndex(int index)  
-	{
-		typedef void (__thiscall* SetModelIndexFn)(void*, int);
-		return getvfunc<SetModelIndexFn>(this, 75)(this, index);
-	}
-
-	void preDataUpdate(int updateType)
-	{
-		typedef void(__thiscall* SetModelIndexFn)(void*, int);
-		return getvfunc<SetModelIndexFn>(this, 2)(this + sizeof(uintptr_t) * 2, updateType);
-	}
-
-	virtual CMouthInfo* GetMouth(void) = 0;
-
-	virtual bool			GetSoundSpatialization(SpatializationInfo_t& info) = 0;
-
-	virtual bool			IsBlurred(void) = 0;
-#if 0	
-	virtual string_t		GetModelName(void) const = 0;
-#endif
-
-	int GetIndex()
-	{
-		return *(int*)((uintptr_t)this + 0x64);
-	}
-
-
-};
-
-
-#endif  
diff --git a/SpyCustom/icliententityinternal.h b/SpyCustom/icliententityinternal.h
deleted file mode 100644
index 05ac3b1..0000000
--- a/SpyCustom/icliententityinternal.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef ICLIENTENTITYINTERNAL_H
-#define ICLIENTENTITYINTERNAL_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "icliententity.h"
-#include "clientleafsystem.h"
-
-class ClientClass;
-
-
-typedef CBaseHandle ClientEntityHandle_t;
-typedef unsigned short SpatialPartitionHandle_t;
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/icliententitylist.h b/SpyCustom/icliententitylist.h
deleted file mode 100644
index 4d3989b..0000000
--- a/SpyCustom/icliententitylist.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#if !defined( ICLIENTENTITYLIST_H )
-#define ICLIENTENTITYLIST_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-
-class IClientEntity;
-class ClientClass;
-class IClientNetworkable;
-class CBaseHandle;
-class IClientUnknown;
-
-
-class IClientEntityList
-{
-public:
-	virtual IClientNetworkable * GetClientNetworkable(int entnum) = 0;
-	virtual IClientNetworkable* GetClientNetworkableFromHandle(CBaseHandle hEnt) = 0;
-	virtual IClientUnknown* GetClientUnknownFromHandle(CBaseHandle hEnt) = 0;
-
-	virtual IClientEntity* GetClientEntity(int entnum) = 0;
-	virtual IClientEntity* GetClientEntityFromHandle(CBaseHandle hEnt) = 0;
-
-	virtual int					NumberOfEntities(bool bIncludeNonNetworkable) = 0;
-
-	virtual int					GetHighestEntityIndex(void) = 0;
-
-	virtual void				SetMaxEntities(int maxents) = 0;
-	virtual int					GetMaxEntities() = 0;
-};
-
-#define VCLIENTENTITYLIST_INTERFACE_VERSION	"VClientEntityList003"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iclientmode.h b/SpyCustom/iclientmode.h
deleted file mode 100644
index 886c5a2..0000000
--- a/SpyCustom/iclientmode.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef ICLIENTMODE_H
-#define ICLIENTMODE_H
-
-#include "VGUI.h"
-#include "client_virtualreality.h"
-
-class CViewSetup;
-class C_BaseEntity;
-class C_BasePlayer;
-class CUserCmd;
-
-namespace vgui
-{
-	class Panel;
-	class AnimationController;
-}
-
-enum
-{
-	MM_NONE = 0,
-	MM_SAY,
-	MM_SAY_TEAM,
-};
-
-abstract_class IClientMode
-{
-	public:
-
-		virtual			~IClientMode() {}
-
-		virtual void	InitViewport() = 0;
-
-		virtual void	Init() = 0;
-
-		virtual void	VGui_Shutdown() = 0;
-
-		virtual void	Shutdown() = 0;
-
-		virtual void	Enable() = 0;
-
-		virtual void	Disable() = 0;
-
-		virtual void	Layout() = 0;
-
-		virtual vgui::Panel* GetViewport() = 0;
-
-		virtual vgui::AnimationController* GetViewportAnimationController() = 0;
-
-		virtual void	ProcessInput(bool bActive) = 0;
-
-		virtual bool	ShouldDrawDetailObjects() = 0;
-		virtual bool	ShouldDrawEntity(C_BaseEntity* pEnt) = 0;
-		virtual bool	ShouldDrawLocalPlayer(C_BasePlayer* pPlayer) = 0;
-		virtual bool	ShouldDrawParticles() = 0;
-
-		virtual bool	ShouldDrawFog(void) = 0;
-
-		virtual void	OverrideView(CViewSetup* pSetup) = 0;
-		virtual int		KeyInput(int down, ButtonCode_t keynum, const char* pszCurrentBinding) = 0;
-		virtual void	StartMessageMode(int iMessageModeType) = 0;
-		virtual vgui::Panel* GetMessagePanel() = 0;
-		virtual void	OverrideMouseInput(float* x, float* y) = 0;
-		virtual bool	CreateMove(float flInputSampleTime, CUserCmd* cmd) = 0;
-
-		virtual void	LevelInit(const char* newmap) = 0;
-		virtual void	LevelShutdown(void) = 0;
-
-		virtual bool	ShouldDrawViewModel(void) = 0;
-		virtual bool	ShouldDrawCrosshair(void) = 0;
-
-		virtual void	AdjustEngineViewport(int& x, int& y, int& width, int& height) = 0;
-
-		virtual void	PreRender(CViewSetup* pSetup) = 0;
-
-		virtual void	PostRender(void) = 0;
-
-		virtual void	PostRenderVGui() = 0;
-
-		virtual void	ActivateInGameVGuiContext(vgui::Panel* pPanel) = 0;
-		virtual void	DeactivateInGameVGuiContext() = 0;
-		virtual float	GetViewModelFOV(void) = 0;
-
-		virtual bool	CanRecordDemo(char* errorMsg, int length) const = 0;
-
-		virtual void	ComputeVguiResConditions(KeyValues* pkvConditions) = 0;
-
-		virtual wchar_t* GetServerName() = 0;
-		virtual void SetServerName(wchar_t* name) = 0;
-		virtual wchar_t* GetMapName() = 0;
-		virtual void SetMapName(wchar_t* name) = 0;
-
-		virtual bool	DoPostScreenSpaceEffects(const CViewSetup* pSetup) = 0;
-
-		virtual void	DisplayReplayMessage(const char* pLocalizeName, float flDuration, bool bUrgent,
-											  const char* pSound, bool bDlg) = 0;
-
-		public:
-
-			virtual void	Update() = 0;
-
-			virtual bool	ShouldBlackoutAroundHUD() = 0;
-
-			virtual HeadtrackMovementMode_t ShouldOverrideHeadtrackControl() = 0;
-
-			virtual bool	IsInfoPanelAllowed() = 0;
-			virtual void	InfoPanelDisplayed() = 0;
-			virtual bool	IsHTMLInfoPanelAllowed() = 0;
-};
-
-extern IClientMode* g_pClientMode;
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/iclientnetworkable.h b/SpyCustom/iclientnetworkable.h
deleted file mode 100644
index a9261f6..0000000
--- a/SpyCustom/iclientnetworkable.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef ICLIENTNETWORKABLE_H
-#define ICLIENTNETWORKABLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "iclientunknown.h"
-#include "bitbuf.h"
-
-
-class IClientEntity;
-class ClientClass;
-
-
-enum ShouldTransmitState_t
-{
-	SHOULDTRANSMIT_START = 0,	            
-
-	SHOULDTRANSMIT_END		          
-};
-
-enum DataUpdateType_t
-{
-	DATA_UPDATE_CREATED = 0,	        
-DATA_UPDATE_DATATABLE_CHANGED,
-};
-
-abstract_class IClientNetworkable
-{
-public:
-	virtual IClientUnknown * GetIClientUnknown() = 0;
-
-	virtual void			Release() = 0;
-
-	virtual ClientClass* GetClientClass() = 0;
-
-	virtual void			NotifyShouldTransmit(ShouldTransmitState_t state) = 0;
-
-
-
-	virtual void			OnPreDataChanged(DataUpdateType_t updateType) = 0;
-	virtual void			OnDataChanged(DataUpdateType_t updateType) = 0;
-
-	virtual void			PreDataUpdate(DataUpdateType_t updateType) = 0;
-	virtual void			PostDataUpdate(DataUpdateType_t updateType) = 0;
-
-	virtual void             __unkn(void) = 0; 
-	virtual bool			IsDormant(void) = 0;
-
-	virtual int				entindex(void) const = 0;
-
-	virtual void			ReceiveMessage(int classID, bf_read& msg) = 0;
-
-	virtual void* GetDataTableBasePtr() = 0;
-
-	virtual void			SetDestroyedOnRecreateEntities(void) = 0;
-
-	virtual void			OnDataUnchangedInPVS() = 0;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iclientrenderable.h b/SpyCustom/iclientrenderable.h
deleted file mode 100644
index ccb2860..0000000
--- a/SpyCustom/iclientrenderable.h
+++ /dev/null
@@ -1,223 +0,0 @@
-#ifndef ICLIENTRENDERABLE_H
-#define ICLIENTRENDERABLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "mathlib.h"
-#include "interface.h"
-#include "iclientunknown.h"
-#include "client_render_handle.h"
-#include "ivmodelrender.h"
-
-struct model_t;
-struct matrix3x4_t;
-
-extern void DefaultRenderBoundsWorldspace(IClientRenderable* pRenderable, Vector& absMins, Vector& absMaxs);
-
-typedef unsigned short ClientShadowHandle_t;
-
-enum
-{
-	CLIENTSHADOW_INVALID_HANDLE = (ClientShadowHandle_t)~0
-};
-
-enum ShadowType_t
-{
-	SHADOWS_NONE = 0,
-	SHADOWS_SIMPLE,
-	SHADOWS_RENDER_TO_TEXTURE,
-	SHADOWS_RENDER_TO_TEXTURE_DYNAMIC,	      
-	SHADOWS_RENDER_TO_DEPTH_TEXTURE,
-};
-
-
-abstract_class IPVSNotify
-{
-public:
-	virtual void OnPVSStatusChanged(bool bInPVS) = 0;
-};
-
-struct RenderableInstance_t
-{
-	uint8 m_nAlpha;
-};
-
-abstract_class IClientRenderable
-{
-public:
-	virtual IClientUnknown * GetIClientUnknown() = 0;
-
-	virtual Vector const& GetRenderOrigin(void) = 0;
-	virtual QAngle const& GetRenderAngles(void) = 0;
-	virtual bool					ShouldDraw(void) = 0;
-	virtual bool					IsTransparent(void) = 0;
-	virtual bool					UsesPowerOfTwoFrameBufferTexture() = 0;
-	virtual bool					UsesFullFrameBufferTexture() = 0;
-
-	virtual ClientShadowHandle_t	GetShadowHandle() const = 0;
-
-	virtual ClientRenderHandle_t& RenderHandle() = 0;
-
-	virtual const model_t* GetModel() const = 0;
-	virtual int						DrawModel(int flags) = 0;
-
-	virtual int		GetBody() = 0;
-
-	virtual void	ComputeFxBlend() = 0;
-	virtual int		GetFxBlend(void) = 0;
-
-	virtual void	GetColorModulation(float* color) = 0;
-
-	virtual bool	LODTest() = 0;
-
-	virtual bool	SetupBones(matrix3x4_t* pBoneToWorldOut, int nMaxBones, int boneMask, float currentTime) = 0;
-
-	virtual void	SetupWeights(const matrix3x4_t* pBoneToWorld, int nFlexWeightCount, float* pFlexWeights, float* pFlexDelayedWeights) = 0;
-	virtual void	DoAnimationEvents(void) = 0;
-
-	virtual IPVSNotify* GetPVSNotifyInterface() = 0;
-
-	virtual void	GetRenderBounds(Vector& mins, Vector& maxs) = 0;
-
-	virtual void	GetRenderBoundsWorldspace(Vector& mins, Vector& maxs) = 0;
-
-	virtual void	GetShadowRenderBounds(Vector& mins, Vector& maxs, ShadowType_t shadowType) = 0;
-
-	virtual bool	ShouldReceiveProjectedTextures(int flags) = 0;
-
-	virtual bool	GetShadowCastDistance(float* pDist, ShadowType_t shadowType) const = 0;
-	virtual bool	GetShadowCastDirection(Vector* pDirection, ShadowType_t shadowType) const = 0;
-
-	virtual bool	IsShadowDirty() = 0;
-	virtual void	MarkShadowDirty(bool bDirty) = 0;
-
-	virtual IClientRenderable* GetShadowParent() = 0;
-	virtual IClientRenderable* FirstShadowChild() = 0;
-	virtual IClientRenderable* NextShadowPeer() = 0;
-
-	virtual ShadowType_t ShadowCastType() = 0;
-
-	virtual void CreateModelInstance() = 0;
-	virtual ModelInstanceHandle_t GetModelInstance() = 0;
-
-	virtual const matrix3x4_t& RenderableToWorldTransform() = 0;
-
-	virtual int LookupAttachment(const char* pAttachmentName) = 0;
-	virtual	bool GetAttachment(int number, Vector& origin, QAngle& angles) = 0;
-	virtual bool GetAttachment(int number, matrix3x4_t& matrix) = 0;
-
-	virtual float* GetRenderClipPlane(void) = 0;
-
-	virtual int		GetSkin() = 0;
-
-	virtual bool	IsTwoPass(void) = 0;
-
-	virtual void	OnThreadedDrawSetup() = 0;
-
-	virtual bool	UsesFlexDelayedWeights() = 0;
-
-	virtual void	RecordToolMessage() = 0;
-
-	virtual bool	IgnoresZBuffer(void) const = 0;
-};
-
-
-abstract_class CDefaultClientRenderable : public IClientUnknown, public IClientRenderable
-{
-public:
-	CDefaultClientRenderable()
-	{
-		m_hRenderHandle = INVALID_CLIENT_RENDER_HANDLE;
-	}
-
-	virtual const Vector & GetRenderOrigin(void) = 0;
-	virtual const QAngle& GetRenderAngles(void) = 0;
-	virtual const matrix3x4_t& RenderableToWorldTransform() = 0;
-	virtual bool					ShouldDraw(void) = 0;
-	virtual void					OnThreadedDrawSetup() {}
-	virtual int                     GetRenderFlags(void) { return 0; } 
-	virtual ClientShadowHandle_t	GetShadowHandle() const
-	{
-		return CLIENTSHADOW_INVALID_HANDLE;
-	}
-
-	virtual ClientRenderHandle_t& RenderHandle()
-	{
-		return m_hRenderHandle;
-	}
-
-	virtual int						GetBody() { return 0; }
-	virtual int						GetSkin() { return 0; }
-	virtual bool					UsesFlexDelayedWeights() { return false; }
-
-	virtual const model_t* GetModel() const { return NULL; }
-	virtual int						DrawModel(int flags) { return 0; }
-	virtual bool					LODTest() { return true; }
-	virtual bool					SetupBones(matrix3x4_t* pBoneToWorldOut, int nMaxBones, int boneMask, float currentTime) { return true; }
-	virtual void					SetupWeights(const matrix3x4_t* pBoneToWorld, int nFlexWeightCount, float* pFlexWeights, float* pFlexDelayedWeights) {}
-	virtual void					DoAnimationEvents(void) {}
-	virtual IPVSNotify* GetPVSNotifyInterface() { return NULL; }
-	virtual void					GetRenderBoundsWorldspace(Vector& absMins, Vector& absMaxs) { DefaultRenderBoundsWorldspace(this, absMins, absMaxs); }
-
-	virtual void	GetColorModulation(float* color)
-	{
-		Assert(color);
-		color[0] = color[1] = color[2] = 1.0f;
-	}
-
-	virtual bool	ShouldReceiveProjectedTextures(int flags)
-	{
-		return false;
-	}
-
-	virtual bool	GetShadowCastDistance(float* pDist, ShadowType_t shadowType) const { return false; }
-	virtual bool	GetShadowCastDirection(Vector* pDirection, ShadowType_t shadowType) const { return false; }
-
-	virtual void	GetShadowRenderBounds(Vector& mins, Vector& maxs, ShadowType_t shadowType)
-	{
-		GetRenderBounds(mins, maxs);
-	}
-
-	virtual bool IsShadowDirty() { return false; }
-	virtual void MarkShadowDirty(bool bDirty) {}
-	virtual IClientRenderable* GetShadowParent() { return NULL; }
-	virtual IClientRenderable* FirstShadowChild() { return NULL; }
-	virtual IClientRenderable* NextShadowPeer() { return NULL; }
-	virtual ShadowType_t ShadowCastType() { return SHADOWS_NONE; }
-	virtual void CreateModelInstance() {}
-	virtual ModelInstanceHandle_t GetModelInstance() { return MODEL_INSTANCE_INVALID; }
-
-	virtual int LookupAttachment(const char* pAttachmentName) { return -1; }
-	virtual	bool GetAttachment(int number, Vector& origin, QAngle& angles) { return false; }
-	virtual bool GetAttachment(int number, matrix3x4_t& matrix) { return false; }
-	virtual bool ComputeLightingOrigin(int nAttachmentIndex, Vector modelLightingCenter, const matrix3x4_t& matrix, Vector& transformedLightingCenter) { return false; } 
-
-	virtual float* GetRenderClipPlane() { return NULL; }
-
-	virtual void RecordToolMessage() {}
-	virtual bool	ShouldDrawForSplitScreenUser(int nSlot) { return true; } 
-	virtual uint8	OverrideAlphaModulation(uint8 nAlpha) { return nAlpha; } 
-	virtual uint8	OverrideShadowAlphaModulation(uint8 nAlpha) { return nAlpha; } 
-	virtual void* GetClientModelRenderable() { return 0; }  
-
-	public:
-		virtual void SetRefEHandle(const CBaseHandle& handle) { Assert(false); }
-		virtual const CBaseHandle& GetRefEHandle() const { Assert(false); return *((CBaseHandle*)0); }
-
-		virtual IClientUnknown* GetIClientUnknown() { return this; }
-		virtual ICollideable* GetCollideable() { return 0; }
-		virtual IClientRenderable* GetClientRenderable() { return this; }
-		virtual IClientNetworkable* GetClientNetworkable() { return 0; }
-		virtual IClientEntity* GetIClientEntity() { return 0; }
-		virtual C_BaseEntity* GetBaseEntity() { return 0; }
-		virtual IClientThinkable* GetClientThinkable() { return 0; }
-		virtual void* GetClientAlphaProperty() { return 0; }  
-
-
-	public:
-		ClientRenderHandle_t m_hRenderHandle;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iclientshadowmgr.h b/SpyCustom/iclientshadowmgr.h
deleted file mode 100644
index 2baad21..0000000
--- a/SpyCustom/iclientshadowmgr.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef ICLIENTSHADOWMGR_H
-#define ICLIENTSHADOWMGR_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "igamesystem.h"
-#include "icliententityinternal.h"
-#include "ishadowmgr.h"
-#include "ivrenderview.h"
-#include "itoolentity.h"
-
-#include "IGameSystem.h" 
-
-struct FlashlightState_t;
-
-
-enum ShadowReceiver_t
-{
-	SHADOW_RECEIVER_BRUSH_MODEL = 0,
-	SHADOW_RECEIVER_STATIC_PROP,
-	SHADOW_RECEIVER_STUDIO_MODEL,
-};
-
-
-class IClientShadowMgr : public IGameSystemPerFrame
-{
-public:
-	virtual ClientShadowHandle_t CreateShadow(ClientEntityHandle_t entity, int nEntIndex, int flags, void* pSplitScreenBits = 0) = 0;
-	virtual void DestroyShadow(ClientShadowHandle_t handle) = 0;
-
-	virtual ClientShadowHandle_t CreateFlashlight(const FlashlightState_t& lightState) = 0;
-	virtual void UpdateFlashlightState(ClientShadowHandle_t shadowHandle, const FlashlightState_t& lightState) = 0;
-	virtual void DestroyFlashlight(ClientShadowHandle_t handle) = 0;
-
-	virtual ClientShadowHandle_t CreateProjection(const FlashlightState_t& lightState) = 0;
-	virtual void UpdateProjectionState(ClientShadowHandle_t shadowHandle, const FlashlightState_t& lightState) = 0;
-	virtual void DestroyProjection(ClientShadowHandle_t handle) = 0;
-
-	virtual void UpdateProjectedTexture(ClientShadowHandle_t handle, bool force = false) = 0;
-
-	virtual void AddToDirtyShadowList(ClientShadowHandle_t handle, bool force = false) = 0;
-	virtual void AddToDirtyShadowList(IClientRenderable* pRenderable, bool force = false) = 0;
-
-	virtual void AddShadowToReceiver(ClientShadowHandle_t handle,
-		IClientRenderable* pRenderable, ShadowReceiver_t type) = 0;
-
-	virtual void RemoveAllShadowsFromReceiver(
-		IClientRenderable* pRenderable, ShadowReceiver_t type) = 0;
-
-	virtual void ComputeShadowTextures(const CViewSetup& view, int leafCount, WorldListLeafData_t* pLeafList) = 0;
-
-	virtual void UnlockAllShadowDepthTextures() = 0;
-
-	virtual void RenderShadowTexture(int w, int h) = 0;
-
-	virtual void SetShadowDirection(const Vector& dir) = 0;
-	virtual const Vector& GetShadowDirection() const = 0;
-
-	virtual void SetShadowColor(unsigned char r, unsigned char g, unsigned char b) = 0;
-	virtual void SetShadowDistance(float flMaxDistance) = 0;
-	virtual void SetShadowBlobbyCutoffArea(float flMinArea) = 0;
-	virtual void SetFalloffBias(ClientShadowHandle_t handle, unsigned char ucBias) = 0;
-
-	virtual void MarkRenderToTextureShadowDirty(ClientShadowHandle_t handle) = 0;
-
-	virtual void AdvanceFrame() = 0;
-
-	virtual void SetFlashlightTarget(ClientShadowHandle_t shadowHandle, EHANDLE targetEntity) = 0;
-
-	virtual void SetFlashlightLightWorld(ClientShadowHandle_t shadowHandle, bool bLightWorld) = 0;
-
-	virtual void SetShadowsDisabled(bool bDisabled) = 0;
-
-	virtual void ComputeShadowDepthTextures(const CViewSetup& pView, bool bSetup = false) = 0;
-
-	virtual void DrawVolumetrics(const CViewSetup& view) = 0;
-
-	virtual void SetShadowFromWorldLightsEnabled(bool bEnable) = 0;
-
-	virtual void DrawDeferredShadows(const CViewSetup& view, int leafCount, WorldListLeafData_t* pLeafList) = 0;
-
-	virtual void InitRenderTargets() = 0;
-
-	virtual void ReprojectShadows() = 0;
-
-	virtual void UpdateSplitscreenLocalPlayerShadowSkip() = 0;
-
-	virtual void GetFrustumExtents(ClientShadowHandle_t handle, Vector& vecMin, Vector& vecMax) = 0;
-
-	virtual void ShutdownRenderTargets(void) = 0;
-};
-
-
-
-extern IClientShadowMgr* g_pClientShadowMgr;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iclientthinkable.h b/SpyCustom/iclientthinkable.h
deleted file mode 100644
index 076614a..0000000
--- a/SpyCustom/iclientthinkable.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef ICLIENTTHINKABLE_H
-#define ICLIENTTHINKABLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "iclientunknown.h"
-
-
-class CClientThinkHandlePtr;
-typedef CClientThinkHandlePtr* ClientThinkHandle_t;
-
-
-abstract_class IClientThinkable
-{
-public:
-	virtual IClientUnknown * GetIClientUnknown() = 0;
-
-	virtual void				ClientThink() = 0;
-
-	virtual ClientThinkHandle_t	GetThinkHandle() = 0;
-	virtual void				SetThinkHandle(ClientThinkHandle_t hThink) = 0;
-
-	virtual void				Release() = 0;
-};
-
-
-#endif  
diff --git a/SpyCustom/iclientunknown.h b/SpyCustom/iclientunknown.h
deleted file mode 100644
index 1c8b84b..0000000
--- a/SpyCustom/iclientunknown.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef ICLIENTUNKNOWN_H
-#define ICLIENTUNKNOWN_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "platform.h"
-#include "ihandleentity.h"
-
-class IClientNetworkable;
-class C_BaseEntity;
-class IClientRenderable;
-class ICollideable;
-class IClientEntity;
-class IClientThinkable;
-
-
-
-abstract_class IClientUnknown : public IHandleEntity
-{
-public:
-	virtual ICollideable * GetCollideable() = 0;
-	virtual IClientNetworkable* GetClientNetworkable() = 0;
-	virtual IClientRenderable* GetClientRenderable() = 0;
-	virtual IClientEntity* GetIClientEntity() = 0;
-	virtual C_BaseEntity* GetBaseEntity() = 0;
-	virtual IClientThinkable* GetClientThinkable() = 0;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iclientvirtualreality.h b/SpyCustom/iclientvirtualreality.h
deleted file mode 100644
index 116ab04..0000000
--- a/SpyCustom/iclientvirtualreality.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef ICLIENTVIRTUALREALITY_H
-#define ICLIENTVIRTUALREALITY_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "refcount.h"
-#include "IAppSystem.h"
-
-#define CLIENTVIRTUALREALITY_INTERFACE_VERSION "ClientVirtualReality001"
-
-
-
-abstract_class IClientVirtualReality : public IAppSystem
-{
-public:
-	virtual ~IClientVirtualReality() {}
-
-	virtual bool Connect(CreateInterfaceFn factory) = 0;
-	virtual void Disconnect() = 0;
-	virtual void* QueryInterface(const char* pInterfaceName) = 0;
-	virtual InitReturnVal_t Init() = 0;
-	virtual void Shutdown() = 0;
-
-	virtual void DrawMainMenu() = 0;
-};
-
-
-
-extern IClientVirtualReality* g_pClientVR;
-
-
-#endif  
diff --git a/SpyCustom/icommandline.h b/SpyCustom/icommandline.h
deleted file mode 100644
index 8643bab..0000000
--- a/SpyCustom/icommandline.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef TIER0_ICOMMANDLINE_H
-#define TIER0_ICOMMANDLINE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-
-
-abstract_class ICommandLine
-{
-public:
-	virtual void		CreateCmdLine(const char* commandline) = 0;
-	virtual void		CreateCmdLine(int argc, char** argv) = 0;
-	virtual const char* GetCmdLine(void) const = 0;
-
-	virtual	const char* CheckParm(const char* psz, const char** ppszValue = 0) const = 0;
-	virtual bool		HasParm(const char* psz) const = 0;
-	virtual void		RemoveParm(const char* parm) = 0;
-	virtual void		AppendParm(const char* pszParm, const char* pszValues) = 0;
-
-	virtual const char* ParmValue(const char* psz, const char* pDefaultVal = 0) const = 0;
-	virtual int			ParmValue(const char* psz, int nDefaultVal) const = 0;
-	virtual float		ParmValue(const char* psz, float flDefaultVal) const = 0;
-
-	virtual int			ParmCount() const = 0;
-	virtual int			FindParm(const char* psz) const = 0;	     
-	virtual const char* GetParm(int nIndex) const = 0;
-
-	virtual void SetParm(int nIndex, char const* pNewParm) = 0;
-
-	virtual const char** GetParms() const = 0;
-};
-
-PLATFORM_INTERFACE ICommandLine* CommandLine();
-
-
-PLATFORM_INTERFACE const tchar* Plat_GetCommandLine();
-#ifndef _WIN32
-PLATFORM_INTERFACE void Plat_SetCommandLine(const char* cmdLine);
-#endif
-PLATFORM_INTERFACE const char* Plat_GetCommandLineA();
-
-
-#endif  
diff --git a/SpyCustom/iconvar.h b/SpyCustom/iconvar.h
deleted file mode 100644
index 473d8f6..0000000
--- a/SpyCustom/iconvar.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef ICONVAR_H
-#define ICONVAR_H
-
-#if _WIN32
-#pragma once
-#endif
-
-#include "dbg.h"
-#include "platform.h"
-#include "strtools.h"
-
-
-class IConVar;
-class CCommand;
-
-
-#define FCVAR_NONE				0 
-
-#define FCVAR_UNREGISTERED		(1<<0)	          
-#define FCVAR_DEVELOPMENTONLY	(1<<1)	            
-#define FCVAR_GAMEDLL			(1<<2)	     
-#define FCVAR_CLIENTDLL			(1<<3)       
-#define FCVAR_HIDDEN			(1<<4)	              
-
-#define FCVAR_PROTECTED			(1<<5)                            
-#define FCVAR_SPONLY			(1<<6)              
-#define	FCVAR_ARCHIVE			(1<<7)	         
-#define	FCVAR_NOTIFY			(1<<8)	    
-#define	FCVAR_USERINFO			(1<<9)	     
-#define FCVAR_CHEAT				(1<<14)           
-
-#define FCVAR_PRINTABLEONLY		(1<<10)                 
-#define FCVAR_UNLOGGED			(1<<11)                      
-#define FCVAR_NEVER_AS_STRING	(1<<12)        
-
-#define FCVAR_REPLICATED		(1<<13)	            
-#define FCVAR_DEMO				(1<<16)          
-#define FCVAR_DONTRECORD		(1<<17)        
-#define FCVAR_RELOAD_MATERIALS	(1<<20)	         
-#define FCVAR_RELOAD_TEXTURES	(1<<21)	         
-
-#define FCVAR_NOT_CONNECTED		(1<<22)	             
-#define FCVAR_MATERIAL_SYSTEM_THREAD (1<<23)	          
-#define FCVAR_ARCHIVE_XBOX		(1<<24)        
-
-#define FCVAR_ACCESSIBLE_FROM_THREADS	(1<<25)	            
-
-#define FCVAR_SERVER_CAN_EXECUTE	(1<<28)            
-#define FCVAR_SERVER_CANNOT_QUERY	(1<<29)                 
-#define FCVAR_CLIENTCMD_CAN_EXECUTE	(1<<30)	        
-#define FCVAR_MATERIAL_THREAD_MASK ( FCVAR_RELOAD_MATERIALS | FCVAR_RELOAD_TEXTURES | FCVAR_MATERIAL_SYSTEM_THREAD )	
-
-typedef void (*FnChangeCallback_t)(IConVar* var, const char* pOldValue, float flOldValue);
-
-
-abstract_class IConVar
-{
-public:
-	virtual void SetValue(const char* pValue) = 0;
-	virtual void SetValue(float flValue) = 0;
-	virtual void SetValue(int nValue) = 0;
-
-	virtual void SetValue(Color value) = 0;
-	virtual const char* GetName(void) const = 0;
-	virtual const char* GetBaseName(void) const = 0;
-	virtual bool IsFlagSet(int nFlag) const = 0;
-	virtual int GetSplitScreenPlayerSlot() const = 0;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/icvar.h b/SpyCustom/icvar.h
deleted file mode 100644
index 5c85e73..0000000
--- a/SpyCustom/icvar.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef ICVAR_H
-#define ICVAR_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "IAppSystem.h"
-#include "iconvar.h"
-
-class ConCommandBase;
-class ConCommand;
-class ConVar;
-class Color;
-
-
-typedef int CVarDLLIdentifier_t;
-
-
-abstract_class IConsoleDisplayFunc
-{
-public:
-	virtual void ColorPrint(const Color & clr, const char* pMessage) = 0;
-	virtual void Print(const char* pMessage) = 0;
-	virtual void DPrint(const char* pMessage) = 0;
-};
-
-
-#define CVAR_QUERY_INTERFACE_VERSION "VCvarQuery001"
-abstract_class ICvarQuery : public IAppSystem
-{
-public:
-	virtual bool AreConVarsLinkable(const ConVar * child, const ConVar * parent) = 0;
-};
-
-
-class ICvar : public IAppSystem
-{
-public:
-	virtual CVarDLLIdentifier_t        AllocateDLLIdentifier() = 0;  
-	virtual void                       RegisterConCommand(ConCommandBase* pCommandBase) = 0; 
-	virtual void                       UnregisterConCommand(ConCommandBase* pCommandBase) = 0;
-	virtual void                       UnregisterConCommands(CVarDLLIdentifier_t id) = 0;
-	virtual const char* GetCommandLineValue(const char* pVariableName) = 0;
-	virtual ConCommandBase* FindCommandBase(const char* name) = 0;
-	virtual const ConCommandBase* FindCommandBase(const char* name) const = 0;
-	virtual ConVar* FindVar(const char* var_name) = 0; 
-	virtual const ConVar* FindVar(const char* var_name) const = 0;
-	virtual ConCommand* FindCommand(const char* name) = 0;
-	virtual const ConCommand* FindCommand(const char* name) const = 0;
-	virtual void                       InstallGlobalChangeCallback(FnChangeCallback_t callback) = 0;
-	virtual void                       RemoveGlobalChangeCallback(FnChangeCallback_t callback) = 0;
-	virtual void                       CallGlobalChangeCallbacks(ConVar* var, const char* pOldString, float flOldValue) = 0;
-	virtual void                       InstallConsoleDisplayFunc(IConsoleDisplayFunc* pDisplayFunc) = 0;
-	virtual void                       RemoveConsoleDisplayFunc(IConsoleDisplayFunc* pDisplayFunc) = 0;
-	virtual void                       ConsoleColorPrintf(const Color& clr, const char* pFormat, ...) const = 0;
-	virtual void                       ConsolePrintf(const char* pFormat, ...) const = 0;
-	virtual void                       ConsoleDPrintf(const char* pFormat, ...) const = 0;
-	virtual void                       RevertFlaggedConVars(int nFlag) = 0;
-};
-
-#define CVAR_INTERFACE_VERSION "VEngineCvar004"
-
-
-extern ICvar* g_pCVar;
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/idatacache.h b/SpyCustom/idatacache.h
deleted file mode 100644
index 7ee9bb4..0000000
--- a/SpyCustom/idatacache.h
+++ /dev/null
@@ -1,363 +0,0 @@
-#ifndef IDATACACHE_H
-#define IDATACACHE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "dbg.h"
-#include "IAppSystem.h"
-
-class IDataCache;
-
-#define DATACACHE_INTERFACE_VERSION		"VDataCache003"
-
-typedef uint32 DataCacheClientID_t;
-
-
-FORWARD_DECLARE_HANDLE(memhandle_t);
-typedef memhandle_t DataCacheHandle_t;
-#define DC_INVALID_HANDLE ((DataCacheHandle_t)0)
-
-struct DataCacheLimits_t
-{
-	DataCacheLimits_t(unsigned _nMaxBytes = (unsigned)-1, unsigned _nMaxItems = (unsigned)-1, unsigned _nMinBytes = 0, unsigned _nMinItems = 0)
-		: nMaxBytes(_nMaxBytes),
-		nMaxItems(_nMaxItems),
-		nMinBytes(_nMinBytes),
-		nMinItems(_nMinItems)
-	{
-	}
-
-	unsigned nMaxBytes;
-	unsigned nMaxItems;
-
-	unsigned nMinBytes;
-	unsigned nMinItems;
-};
-
-struct DataCacheStatus_t
-{
-	unsigned nBytes;
-	unsigned nItems;
-
-	unsigned nBytesLocked;
-	unsigned nItemsLocked;
-
-	unsigned nFindRequests;
-	unsigned nFindHits;
-};
-
-enum DataCacheOptions_t
-{
-	DC_TRACE_ACTIVITY = (1 << 0),
-	DC_FORCE_RELOCATE = (1 << 1),
-	DC_ALWAYS_MISS = (1 << 2),
-	DC_VALIDATE = (1 << 3),
-};
-
-
-enum DataCacheReportType_t
-{
-	DC_SUMMARY_REPORT,
-	DC_DETAIL_REPORT,
-	DC_DETAIL_REPORT_LRU,
-};
-
-
-enum DataCacheNotificationType_t
-{
-	DC_NONE,
-
-	DC_AGE_DISCARD,
-
-	DC_FLUSH_DISCARD,
-
-	DC_REMOVED,
-
-	DC_RELOCATE,
-
-	DC_PRINT_INF0,
-};
-
-struct DataCacheNotification_t
-{
-	DataCacheNotificationType_t type;
-	const char* pszSectionName;
-	DataCacheClientID_t			clientId;
-	const void* pItemData;
-	unsigned					nItemSize;
-};
-
-const int DC_MAX_CLIENT_NAME = 15;
-const int DC_MAX_ITEM_NAME = 511;
-
-enum DataCacheRemoveResult_t
-{
-	DC_OK,
-	DC_NOT_FOUND,
-	DC_LOCKED,
-};
-
-enum DataCacheAddFlags_t
-{
-	DCAF_LOCK = (1 << 0),
-	DCAF_DEFAULT = 0,
-};
-
-
-
-abstract_class IDataCacheSection
-{
-public:
-	virtual IDataCache * GetSharedCache() = 0;
-	virtual const char* GetName() = 0;
-
-	virtual void SetLimits(const DataCacheLimits_t& limits) = 0;
-	virtual void SetOptions(unsigned options) = 0;
-
-
-	virtual void GetStatus(DataCacheStatus_t* pStatus, DataCacheLimits_t* pLimits = NULL) = 0;
-
-
-	virtual void EnsureCapacity(unsigned nBytes, unsigned nItems = 1) = 0;
-
-
-	virtual bool Add(DataCacheClientID_t clientId, const void* pItemData, unsigned size, DataCacheHandle_t* pHandle) = 0;
-
-	virtual DataCacheHandle_t Find(DataCacheClientID_t clientId) = 0;
-
-
-	virtual DataCacheRemoveResult_t Remove(DataCacheHandle_t handle, const void** ppItemData, unsigned* pItemSize = NULL, bool bNotify = false) = 0;
-	DataCacheRemoveResult_t Remove(DataCacheHandle_t handle, bool bNotify = false) { return Remove(handle, NULL, NULL, bNotify); }
-
-
-	virtual bool IsPresent(DataCacheHandle_t handle) = 0;
-
-
-	virtual void* Lock(DataCacheHandle_t handle) = 0;
-
-
-	virtual int Unlock(DataCacheHandle_t handle) = 0;
-
-
-	virtual void* Get(DataCacheHandle_t handle, bool bFrameLock = false) = 0;
-	virtual void* GetNoTouch(DataCacheHandle_t handle, bool bFrameLock = false) = 0;
-
-	virtual int BeginFrameLocking() = 0;
-	virtual bool IsFrameLocking() = 0;
-	virtual void* FrameLock(DataCacheHandle_t handle) = 0;
-	virtual int EndFrameLocking() = 0;
-	virtual int* GetFrameUnlockCounterPtr() = 0;
-
-
-	virtual int GetLockCount(DataCacheHandle_t handle) = 0;
-	virtual int BreakLock(DataCacheHandle_t handle) = 0;
-
-
-	virtual bool Touch(DataCacheHandle_t handle) = 0;
-
-
-	virtual bool Age(DataCacheHandle_t handle) = 0;
-
-
-	virtual unsigned Flush(bool bUnlockedOnly = true, bool bNotify = true) = 0;
-
-
-	virtual unsigned Purge(unsigned nBytes) = 0;
-
-
-	virtual void OutputReport(DataCacheReportType_t reportType = DC_SUMMARY_REPORT) = 0;
-
-	virtual void UpdateSize(DataCacheHandle_t handle, unsigned int nNewSize) = 0;
-
-
-	virtual void LockMutex() = 0;
-	virtual void UnlockMutex() = 0;
-
-	virtual bool AddEx(DataCacheClientID_t clientId, const void* pItemData, unsigned size, unsigned flags, DataCacheHandle_t* pHandle) = 0;
-};
-
-
-abstract_class IDataCacheClient
-{
-public:
-	virtual bool HandleCacheNotification(const DataCacheNotification_t & notification) = 0;
-
-
-	virtual bool GetItemName(DataCacheClientID_t clientId, const void* pItem, char* pDest, unsigned nMaxLen) = 0;
-};
-
-class CDefaultDataCacheClient : public IDataCacheClient
-{
-public:
-	virtual bool HandleCacheNotification(const DataCacheNotification_t& notification)
-	{
-		switch (notification.type)
-		{
-		case DC_AGE_DISCARD:
-		case DC_FLUSH_DISCARD:
-		case DC_REMOVED:
-		default:
-			Assert(0);
-			return false;
-		}
-		return false;
-	}
-
-	virtual bool GetItemName(DataCacheClientID_t clientId, const void* pItem, char* pDest, unsigned nMaxLen)
-	{
-		return false;
-	}
-};
-
-
-abstract_class IDataCache : public IAppSystem
-{
-public:
-	virtual void SetSize(int nMaxBytes) = 0;
-	virtual void SetOptions(unsigned options) = 0;
-	virtual void SetSectionLimits(const char* pszSectionName, const DataCacheLimits_t& limits) = 0;
-
-
-	virtual void GetStatus(DataCacheStatus_t* pStatus, DataCacheLimits_t* pLimits = NULL) = 0;
-
-
-	virtual IDataCacheSection* AddSection(IDataCacheClient* pClient, const char* pszSectionName, const DataCacheLimits_t& limits = DataCacheLimits_t(), bool bSupportFastFind = false) = 0;
-
-
-	virtual void RemoveSection(const char* pszClientName, bool bCallFlush = true) = 0;
-	void RemoveSection(IDataCacheSection* pSection, bool bCallFlush = true) { if (pSection) RemoveSection(pSection->GetName()); }
-
-
-	virtual IDataCacheSection* FindSection(const char* pszClientName) = 0;
-
-
-	virtual unsigned Purge(unsigned nBytes) = 0;
-
-
-	virtual unsigned Flush(bool bUnlockedOnly = true, bool bNotify = true) = 0;
-
-
-	virtual void OutputReport(DataCacheReportType_t reportType = DC_SUMMARY_REPORT, const char* pszSection = NULL) = 0;
-};
-
-template< class STORAGE_TYPE, class CREATE_PARAMS, class LOCK_TYPE = STORAGE_TYPE* >
-class CManagedDataCacheClient : public CDefaultDataCacheClient
-{
-public:
-	typedef CManagedDataCacheClient<STORAGE_TYPE, CREATE_PARAMS, LOCK_TYPE> CCacheClientBaseClass;
-
-	CManagedDataCacheClient()
-		: m_pCache(NULL)
-	{
-	}
-
-	void Init(IDataCache* pSharedCache, const char* pszSectionName, const DataCacheLimits_t& limits = DataCacheLimits_t(), bool bSupportFastFind = false)
-	{
-		if (!m_pCache)
-		{
-			m_pCache = pSharedCache->AddSection(this, pszSectionName, limits, bSupportFastFind);
-		}
-	}
-
-	void Shutdown()
-	{
-		if (m_pCache)
-		{
-			m_pCache->GetSharedCache()->RemoveSection(m_pCache);
-			m_pCache = NULL;
-		}
-	}
-
-	LOCK_TYPE CacheGet(DataCacheHandle_t handle, bool bFrameLock = true)
-	{
-		return (LOCK_TYPE)(((STORAGE_TYPE*)m_pCache->Get(handle, bFrameLock))->GetData());
-	}
-
-	LOCK_TYPE CacheGetNoTouch(DataCacheHandle_t handle)
-	{
-		return (LOCK_TYPE)(((STORAGE_TYPE*)m_pCache->GetNoTouch(handle))->GetData());
-	}
-
-	LOCK_TYPE CacheLock(DataCacheHandle_t handle)
-	{
-		return (LOCK_TYPE)(((STORAGE_TYPE*)m_pCache->Lock(handle))->GetData());
-	}
-
-	int CacheUnlock(DataCacheHandle_t handle)
-	{
-		return m_pCache->Unlock(handle);
-	}
-
-	void CacheTouch(DataCacheHandle_t handle)
-	{
-		m_pCache->Touch(handle);
-	}
-
-	void CacheRemove(DataCacheHandle_t handle, bool bNotify = true)
-	{
-		m_pCache->Remove(handle, bNotify);
-	}
-
-	void CacheFlush()
-	{
-		m_pCache->Flush();
-	}
-
-	DataCacheHandle_t CacheCreate(const CREATE_PARAMS& createParams, unsigned flags = DCAF_DEFAULT)
-	{
-		m_pCache->EnsureCapacity(STORAGE_TYPE::EstimatedSize(createParams));
-		STORAGE_TYPE* pStore = STORAGE_TYPE::CreateResource(createParams);
-		DataCacheHandle_t handle;
-		m_pCache->AddEx((DataCacheClientID_t)pStore, pStore, pStore->Size(), flags, &handle);
-		return handle;
-	}
-
-	void CacheLockMutex()
-	{
-		m_pCache->LockMutex();
-	}
-
-	void CacheUnlockMutex()
-	{
-		m_pCache->UnlockMutex();
-	}
-
-	bool HandleCacheNotification(const DataCacheNotification_t& notification)
-	{
-		switch (notification.type)
-		{
-		case DC_AGE_DISCARD:
-		case DC_FLUSH_DISCARD:
-		case DC_REMOVED:
-		{
-			STORAGE_TYPE* p = (STORAGE_TYPE*)notification.clientId;
-			p->DestroyResource();
-		}
-		return true;
-		default:
-			return CDefaultDataCacheClient::HandleCacheNotification(notification);
-		}
-	}
-
-
-protected:
-
-	~CManagedDataCacheClient()
-	{
-		Shutdown();
-	}
-
-	IDataCacheSection* GetCacheSection()
-	{
-		return m_pCache;
-	}
-
-private:
-	IDataCacheSection* m_pCache;
-
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iefx.h b/SpyCustom/iefx.h
deleted file mode 100644
index 9285f15..0000000
--- a/SpyCustom/iefx.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#if !defined( IEFX_H )
-#define IEFX_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "vector.h"
-#include "dlight.h" 
-
-struct model_t;
-struct dlight_t;
-class IMaterial;
-
-#define	MAX_DLIGHTS		32
-
-abstract_class IVEfx
-{
-public:
-	virtual	int				Draw_DecalIndexFromName(char* name) = 0;
-
-	virtual	void			DecalShoot(int textureIndex, int entity,
-		const model_t* model, const Vector& model_origin, const QAngle& model_angles,
-		const Vector& position, const Vector* saxis, int flags) = 0;
-
-	virtual	void			DecalColorShoot(int textureIndex, int entity,
-		const model_t* model, const Vector& model_origin, const QAngle& model_angles,
-		const Vector& position, const Vector* saxis, int flags, const color32& rgbaColor) = 0;
-
-	virtual void			PlayerDecalShoot(IMaterial* material, void* userdata, int entity, const model_t* model,
-		const Vector& model_origin, const Vector& model_angles,
-		const Vector& position, const Vector* saxis, int flags, const color32& rgbaColor) = 0;
-
-	virtual	dlight_t* CL_AllocDlight(int key) = 0;
-
-	virtual	dlight_t* CL_AllocElight(int key) = 0;
-
-	virtual int CL_GetActiveDLights(dlight_t* pList[MAX_DLIGHTS]) = 0;
-
-	virtual	const char* Draw_DecalNameFromIndex(int nIndex) = 0;
-
-	virtual dlight_t* GetElightByKey(int key) = 0;
-};
-
-#define VENGINE_EFFECTS_INTERFACE_VERSION "VEngineEffects001"
-
-extern IVEfx* effects;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ienginetrace.h b/SpyCustom/ienginetrace.h
deleted file mode 100644
index adea5ea..0000000
--- a/SpyCustom/ienginetrace.h
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef ENGINE_IENGINETRACE_H
-#define ENGINE_IENGINETRACE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "basehandle.h"
-#include "utlvector.h"    
-#include "vector4d.h"
-
-#include "bspflags.h"
-
-class Vector;
-class IHandleEntity;
-struct Ray_t;
-class CGameTrace;
-typedef CGameTrace trace_t;
-class ICollideable;
-class QAngle;
-class CTraceListData;
-class CPhysCollide;
-struct cplane_t;
-
-enum TraceType_t
-{
-	TRACE_EVERYTHING = 0,
-	TRACE_WORLD_ONLY,				       
-	TRACE_ENTITIES_ONLY,			        
-	TRACE_EVERYTHING_FILTER_PROPS,	                
-};
-
-abstract_class ITraceFilter
-{
-public:
-	virtual bool ShouldHitEntity(IHandleEntity * pEntity, int contentsMask) = 0;
-	virtual TraceType_t	GetTraceType() const = 0;
-};
-
-
-class CTraceFilter : public ITraceFilter
-{
-public:
-	bool ShouldHitEntity(IHandleEntity* pEntityHandle, int )
-	{
-		return !(pEntityHandle == pSkip);
-	}
-	virtual TraceType_t GetTraceType() const
-	{
-		return TRACE_EVERYTHING;
-	}
-	void* pSkip;
-};
-
-class CTraceFilterEntitiesOnly : public ITraceFilter
-{
-public:
-	virtual TraceType_t	GetTraceType() const
-	{
-		return TRACE_ENTITIES_ONLY;
-	}
-};
-
-
-class CTraceFilterWorldOnly : public ITraceFilter
-{
-public:
-	bool ShouldHitEntity(IHandleEntity* pServerEntity, int contentsMask)
-	{
-		return false;
-	}
-	virtual TraceType_t	GetTraceType() const
-	{
-		return TRACE_WORLD_ONLY;
-	}
-};
-
-class CTraceFilterWorldAndPropsOnly : public ITraceFilter
-{
-public:
-	bool ShouldHitEntity(IHandleEntity* pServerEntity, int contentsMask)
-	{
-		return false;
-	}
-	virtual TraceType_t	GetTraceType() const
-	{
-		return TRACE_EVERYTHING;
-	}
-};
-
-class CTraceFilterHitAll : public CTraceFilter
-{
-public:
-	virtual bool ShouldHitEntity(IHandleEntity* pServerEntity, int contentsMask)
-	{
-		return true;
-	}
-};
-
-
-abstract_class IEntityEnumerator
-{
-public:
-	virtual bool EnumEntity(IHandleEntity * pHandleEntity) = 0;
-};
-
-
-#define INTERFACEVERSION_ENGINETRACE_SERVER	"EngineTraceServer003"
-#define INTERFACEVERSION_ENGINETRACE_CLIENT	"EngineTraceClient003"
-abstract_class IEngineTrace
-{
-public:
-	virtual int   GetPointContents(const Vector& vecAbsPosition, int contentsMask = MASK_ALL, IHandleEntity** ppEntity = nullptr) = 0;
-
-
-	virtual int   GetPointContents_WorldOnly(const Vector& vecAbsPosition, int contentsMask = MASK_ALL) = 0; 
-
-	virtual int		GetPointContents_Collideable(ICollideable* pCollide, const Vector& vecAbsPosition) = 0;
-
-	virtual void	ClipRayToEntity(const Ray_t& ray, unsigned int fMask, IHandleEntity* pEnt, trace_t* pTrace) = 0;
-
-	virtual void	ClipRayToCollideable(const Ray_t& ray, unsigned int fMask, ICollideable* pCollide, trace_t* pTrace) = 0;
-
-	virtual void    TraceRay(const Ray_t& ray, unsigned int fMask, ITraceFilter* pTraceFilter, CGameTrace* pTrace) = 0;
-
-	virtual void	SetupLeafAndEntityListRay(const Ray_t& ray, CTraceListData& traceData) = 0;
-	virtual void    SetupLeafAndEntityListBox(const Vector& vecBoxMin, const Vector& vecBoxMax, CTraceListData& traceData) = 0;
-	virtual void	TraceRayAgainstLeafAndEntityList(const Ray_t& ray, CTraceListData& traceData, unsigned int fMask, ITraceFilter* pTraceFilter, trace_t* pTrace) = 0;
-
-	virtual void	SweepCollideable(ICollideable* pCollide, const Vector& vecAbsStart, const Vector& vecAbsEnd,
-		const QAngle& vecAngles, unsigned int fMask, ITraceFilter* pTraceFilter, trace_t* pTrace) = 0;
-
-	virtual void	EnumerateEntities(const Ray_t& ray, bool triggers, IEntityEnumerator* pEnumerator) = 0;
-
-	virtual void	EnumerateEntities(const Vector& vecAbsMins, const Vector& vecAbsMaxs, IEntityEnumerator* pEnumerator) = 0;
-
-	virtual ICollideable* GetCollideable(IHandleEntity* pEntity) = 0;
-
-	virtual int GetStatByIndex(int index, bool bClear) = 0;
-
-
-	virtual void GetBrushesInAABB(const Vector& vMins, const Vector& vMaxs, CUtlVector<int>* pOutput, int iContentsMask = 0xFFFFFFFF) = 0;
-
-	virtual CPhysCollide* GetCollidableFromDisplacementsInAABB(const Vector& vMins, const Vector& vMaxs) = 0;
-
-	virtual bool GetBrushInfo(int iBrush, CUtlVector<Vector4D>* pPlanesOut, int* pContentsOut) = 0;
-
-	virtual bool PointOutsideWorld(const Vector& ptTest) = 0;           
-
-	virtual int GetLeafContainingPoint(const Vector& ptTest) = 0;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ifilelist.h b/SpyCustom/ifilelist.h
deleted file mode 100644
index da73a83..0000000
--- a/SpyCustom/ifilelist.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef IFILELIST_H
-#define IFILELIST_H
-#ifdef _WIN32
-#endif
-
-
-class IFileList
-{
-public:
-	virtual bool	IsFileInList(const char* pFilename) = 0;
-	virtual void	Release() = 0;
-};
-
-
-#endif  
diff --git a/SpyCustom/igameconsole.h b/SpyCustom/igameconsole.h
deleted file mode 100644
index 7423bee..0000000
--- a/SpyCustom/igameconsole.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef IGAMECONSOLE_H
-#define IGAMECONSOLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-
-
-class IGameConsole : public IBaseInterface
-{
-public:
-	virtual void Activate() = 0;
-
-	virtual void Initialize() = 0;
-
-	virtual void Hide() = 0;
-
-	virtual void Clear() = 0;
-
-	virtual bool IsConsoleVisible() = 0;
-
-	virtual void SetParent(int parent) = 0;
-};
-
-#define GAMECONSOLE_INTERFACE_VERSION "GameConsole004"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/igameevents.h b/SpyCustom/igameevents.h
deleted file mode 100644
index a8c29cf..0000000
--- a/SpyCustom/igameevents.h
+++ /dev/null
@@ -1,131 +0,0 @@
-#if !defined( IGAMEEVENTS_H )
-#define IGAMEEVENTS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-
-
-#define INTERFACEVERSION_GAMEEVENTSMANAGER	"GAMEEVENTSMANAGER001"	       
-#define INTERFACEVERSION_GAMEEVENTSMANAGER2	"GAMEEVENTSMANAGER002"	    
-
-#include "bitbuf.h"
-#define NULL 0x0
-#define EVENT_DEBUG_ID_INIT 42
-#define EVENT_DEBUG_ID_SHUTDOWN 13
-
-
-#define MAX_EVENT_NAME_LENGTH	32		     
-#define MAX_EVENT_BITS			9		       
-#define MAX_EVENT_NUMBER		(1<<MAX_EVENT_BITS)		     
-#define MAX_EVENT_BYTES			1024	        
-
-class KeyValues;
-class CGameEvent;
-
-class IGameEvent
-{
-public:
-	virtual ~IGameEvent() {};
-	virtual const char* GetName() const = 0;	   
-
-	virtual bool  IsReliable() const = 0;     
-	virtual bool  IsLocal() const = 0;      
-	virtual bool  IsEmpty(const char* keyName = NULL) = 0;      
-
-	virtual bool  GetBool(const char* keyName = NULL, bool defaultValue = false) = 0;
-	virtual int   GetInt(const char* keyName = NULL, int defaultValue = 0) = 0;
-	virtual uint64_t        GetUint64(const char* keyName = nullptr, unsigned long defaultValue = 0) = 0; 
-	virtual float GetFloat(const char* keyName = NULL, float defaultValue = 0.0f) = 0;
-	virtual const char* GetString(const char* keyName = NULL, const char* defaultValue = "") = 0;
-	virtual const wchar_t* GetWString(char const* keyName = NULL, const wchar_t* defaultValue = L"") = 0; 
-
-	virtual void SetBool(const char* keyName, bool value) = 0;
-	virtual void SetInt(const char* keyName, int value) = 0;
-	virtual void            SetUint64(const char* keyName, unsigned long value) = 0; 
-	virtual void SetFloat(const char* keyName, float value) = 0;
-	virtual void test() = 0;
-	virtual void SetString(const char* keyName, const char* value) = 0;
-	virtual void            SetWString(const char* keyName, const wchar_t* value) = 0; 
-};
-
-
-class IGameEventListener2
-{
-public:
-	virtual	~IGameEventListener2(void) {};
-
-	virtual void FireGameEvent(IGameEvent* event) = 0;
-	virtual int GetEventDebugID(void) = 0;
-};
-
-class IGameEventManager2 : public IBaseInterface
-{
-public:
-	virtual	~IGameEventManager2(void) {};
-
-	virtual int LoadEventsFromFile(const char* filename) = 0;
-
-	virtual void  Reset() = 0;
-
-	virtual bool AddListener(IGameEventListener2* listener, const char* name, bool bServerSide) = 0;
-
-	virtual bool FindListener(IGameEventListener2* listener, const char* name) = 0;
-
-	virtual void RemoveListener(IGameEventListener2* listener) = 0;
-
-	virtual IGameEvent* CreateEvent(const char* name, bool bForce = false) = 0;
-
-	virtual bool FireEvent(IGameEvent* event, bool bDontBroadcast = false) = 0;
-
-	virtual bool FireEventClientSide(IGameEvent* event) = 0;
-
-	virtual IGameEvent* DuplicateEvent(IGameEvent* event) = 0;
-
-	virtual void FreeEvent(IGameEvent* event) = 0;
-
-	virtual bool SerializeEvent(IGameEvent* event, bf_write* buf) = 0;
-	virtual IGameEvent* UnserializeEvent(bf_read* buf) = 0;       
-
-	virtual KeyValues* GetEventDataTypes(IGameEvent* event) = 0;
-};
-
-class IGameEventListener
-{
-public:
-	virtual	~IGameEventListener(void) {};
-
-	virtual void FireGameEvent(KeyValues* event) = 0;
-};
-
-class IGameEventManager : public IBaseInterface
-{
-public:
-	virtual	~IGameEventManager(void) {};
-
-	virtual int LoadEventsFromFile(const char* filename) = 0;
-
-	virtual void  Reset() = 0;
-
-	virtual KeyValues* GetEvent(const char* name) = 0;     
-
-	virtual bool AddListener(IGameEventListener* listener, const char* event, bool bIsServerSide) = 0;
-	virtual bool AddListener(IGameEventListener* listener, bool bIsServerSide) = 0;
-
-	virtual void RemoveListener(IGameEventListener* listener) = 0;
-
-	virtual bool FireEvent(KeyValues* event) = 0;
-
-	virtual bool FireEventServerOnly(KeyValues* event) = 0;
-
-	virtual bool FireEventClientOnly(KeyValues* event) = 0;
-
-	virtual bool SerializeKeyValues(KeyValues* event, bf_write* buf, CGameEvent* eventtype = NULL) = 0;
-	virtual KeyValues* UnserializeKeyValue(bf_read* msg) = 0;       
-};
-
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ihandleentity.h b/SpyCustom/ihandleentity.h
deleted file mode 100644
index a63821b..0000000
--- a/SpyCustom/ihandleentity.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef IHANDLEENTITY_H
-#define IHANDLEENTITY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-class CBaseHandle;
-
-
-class IHandleEntity
-{
-public:
-	virtual ~IHandleEntity() {}
-	virtual void SetRefEHandle(const CBaseHandle& handle) = 0;
-	virtual const CBaseHandle& GetRefEHandle() const = 0;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iinputsystem.h b/SpyCustom/iinputsystem.h
deleted file mode 100644
index 39916a5..0000000
--- a/SpyCustom/iinputsystem.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef IINPUTSYSTEM_H
-#define IINPUTSYSTEM_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-#include "IAppSystem.h"
-
-#include "InputEnums.h"
-#include "ButtonCode.h"
-#include "AnalogCode.h"
-
-#define INPUTSYSTEM_INTERFACE_VERSION	"InputSystemVersion001"
-abstract_class IInputSystem : public IAppSystem
-{
-public:
-	virtual void AttachToWindow(void* hWnd) = 0;
-	virtual void DetachFromWindow() = 0;
-
-	virtual void EnableInput(bool bEnable) = 0;
-
-	virtual void EnableMessagePump(bool bEnable) = 0;
-
-	virtual void PollInputState() = 0;
-
-	virtual int GetPollTick() const = 0;
-
-	virtual bool IsButtonDown(ButtonCode_t code) const = 0;
-
-	virtual int GetButtonPressedTick(ButtonCode_t code) const = 0;
-	virtual int GetButtonReleasedTick(ButtonCode_t code) const = 0;
-
-	virtual int GetAnalogValue(AnalogCode_t code) const = 0;
-
-	virtual int GetAnalogDelta(AnalogCode_t code) const = 0;
-
-	virtual int GetEventCount() const = 0;
-	virtual const InputEvent_t* GetEventData() const = 0;
-
-	virtual void PostUserEvent(const InputEvent_t& event) = 0;
-
-	virtual int GetJoystickCount() const = 0;
-
-	virtual void EnableJoystickInput(int nJoystick, bool bEnable) = 0;
-
-	virtual void EnableJoystickDiagonalPOV(int nJoystick, bool bEnable) = 0;
-
-	virtual void SampleDevices(void) = 0;
-
-	virtual void SetRumble(float fLeftMotor, float fRightMotor, int userId = INVALID_USER_ID) = 0;
-	virtual void StopRumble(void) = 0;
-
-	virtual void ResetInputState() = 0;
-
-	virtual void SetPrimaryUserId(int userId) = 0;
-
-	virtual const char* ButtonCodeToString(ButtonCode_t code) const = 0;
-	virtual const char* AnalogCodeToString(AnalogCode_t code) const = 0;
-	virtual ButtonCode_t StringToButtonCode(const char* pString) const = 0;
-	virtual AnalogCode_t StringToAnalogCode(const char* pString) const = 0;
-
-	virtual void SleepUntilInput(int nMaxSleepTimeMS = -1) = 0;
-
-	virtual ButtonCode_t VirtualKeyToButtonCode(int nVirtualKey) const = 0;
-	virtual int ButtonCodeToVirtualKey(ButtonCode_t code) const = 0;
-	virtual ButtonCode_t ScanCodeToButtonCode(int lParam) const = 0;
-
-	virtual int GetPollCount() const = 0;
-
-	virtual void SetCursorPosition(int x, int y) = 0;
-
-	virtual void* GetHapticsInterfaceAddress() const = 0;
-
-	virtual void SetNovintPure(bool bPure) = 0;
-
-	virtual bool GetRawMouseAccumulators(int& accumX, int& accumY) = 0;
-
-	virtual void SetConsoleTextMode(bool bConsoleTextMode) = 0;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/imageformat.h b/SpyCustom/imageformat.h
deleted file mode 100644
index b1f3b4f..0000000
--- a/SpyCustom/imageformat.h
+++ /dev/null
@@ -1,439 +0,0 @@
-#ifndef IMAGEFORMAT_H
-#define IMAGEFORMAT_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <stdio.h>
-
-enum NormalDecodeMode_t
-{
-	NORMAL_DECODE_NONE = 0,
-	NORMAL_DECODE_ATI2N = 1,
-	NORMAL_DECODE_ATI2N_ALPHA = 2
-};
-
-#ifdef _WIN32
-typedef enum _D3DFORMAT D3DFORMAT;
-#endif
-
-#pragma warning(disable : 4514)
-
-enum ImageFormat
-{
-	IMAGE_FORMAT_UNKNOWN = -1,
-	IMAGE_FORMAT_RGBA8888 = 0,
-	IMAGE_FORMAT_ABGR8888,
-	IMAGE_FORMAT_RGB888,
-	IMAGE_FORMAT_BGR888,
-	IMAGE_FORMAT_RGB565,
-	IMAGE_FORMAT_I8,
-	IMAGE_FORMAT_IA88,
-	IMAGE_FORMAT_P8,
-	IMAGE_FORMAT_A8,
-	IMAGE_FORMAT_RGB888_BLUESCREEN,
-	IMAGE_FORMAT_BGR888_BLUESCREEN,
-	IMAGE_FORMAT_ARGB8888,
-	IMAGE_FORMAT_BGRA8888,
-	IMAGE_FORMAT_DXT1,
-	IMAGE_FORMAT_DXT3,
-	IMAGE_FORMAT_DXT5,
-	IMAGE_FORMAT_BGRX8888,
-	IMAGE_FORMAT_BGR565,
-	IMAGE_FORMAT_BGRX5551,
-	IMAGE_FORMAT_BGRA4444,
-	IMAGE_FORMAT_DXT1_ONEBITALPHA,
-	IMAGE_FORMAT_BGRA5551,
-	IMAGE_FORMAT_UV88,
-	IMAGE_FORMAT_UVWQ8888,
-	IMAGE_FORMAT_RGBA16161616F,
-	IMAGE_FORMAT_RGBA16161616,
-	IMAGE_FORMAT_UVLX8888,
-	IMAGE_FORMAT_R32F,			    
-	IMAGE_FORMAT_RGB323232F,
-	IMAGE_FORMAT_RGBA32323232F,
-
-	IMAGE_FORMAT_NV_DST16,		 
-	IMAGE_FORMAT_NV_DST24,		
-	IMAGE_FORMAT_NV_INTZ,		   
-	IMAGE_FORMAT_NV_RAWZ,		      
-	IMAGE_FORMAT_ATI_DST16,		 
-	IMAGE_FORMAT_ATI_DST24,		
-	IMAGE_FORMAT_NV_NULL,		       
-
-	IMAGE_FORMAT_ATI2N,			     
-	IMAGE_FORMAT_ATI1N,			   
-
-#if defined( _X360 )
-	IMAGE_FORMAT_X360_DST16,
-	IMAGE_FORMAT_X360_DST24,
-	IMAGE_FORMAT_X360_DST24F,
-	IMAGE_FORMAT_LINEAR_BGRX8888,
-	IMAGE_FORMAT_LINEAR_RGBA8888,
-	IMAGE_FORMAT_LINEAR_ABGR8888,
-	IMAGE_FORMAT_LINEAR_ARGB8888,
-	IMAGE_FORMAT_LINEAR_BGRA8888,
-	IMAGE_FORMAT_LINEAR_RGB888,
-	IMAGE_FORMAT_LINEAR_BGR888,
-	IMAGE_FORMAT_LINEAR_BGRX5551,
-	IMAGE_FORMAT_LINEAR_I8,
-	IMAGE_FORMAT_LINEAR_RGBA16161616,
-
-	IMAGE_FORMAT_LE_BGRX8888,
-	IMAGE_FORMAT_LE_BGRA8888,
-#endif
-
-	NUM_IMAGE_FORMATS
-};
-
-#if defined( POSIX  ) || defined( DX_TO_GL_ABSTRACTION )
-typedef enum _D3DFORMAT
-{
-	D3DFMT_INDEX16,
-	D3DFMT_D16,
-	D3DFMT_D24S8,
-	D3DFMT_A8R8G8B8,
-	D3DFMT_A4R4G4B4,
-	D3DFMT_X8R8G8B8,
-	D3DFMT_R5G6R5,
-	D3DFMT_X1R5G5B5,
-	D3DFMT_A1R5G5B5,
-	D3DFMT_L8,
-	D3DFMT_A8L8,
-	D3DFMT_A,
-	D3DFMT_DXT1,
-	D3DFMT_DXT3,
-	D3DFMT_DXT5,
-	D3DFMT_V8U8,
-	D3DFMT_Q8W8V8U8,
-	D3DFMT_X8L8V8U8,
-	D3DFMT_A16B16G16R16F,
-	D3DFMT_A16B16G16R16,
-	D3DFMT_R32F,
-	D3DFMT_A32B32G32R32F,
-	D3DFMT_R8G8B8,
-	D3DFMT_D24X4S4,
-	D3DFMT_A8,
-	D3DFMT_R5G6B5,
-	D3DFMT_D15S1,
-	D3DFMT_D24X8,
-	D3DFMT_VERTEXDATA,
-	D3DFMT_INDEX32,
-
-	D3DFMT_NV_INTZ = 0x5a544e49,	 
-	D3DFMT_NV_RAWZ = 0x5a574152,	 
-
-	D3DFMT_NV_NULL = 0x4c4c554e,	 
-
-	D3DFMT_ATI_D16 = 0x36314644,	 
-	D3DFMT_ATI_D24S8 = 0x34324644,	 
-
-	D3DFMT_ATI_2N = 0x32495441,	    
-	D3DFMT_ATI_1N = 0x31495441,	    
-
-	D3DFMT_UNKNOWN
-} D3DFORMAT;
-#endif
-
-struct BGRA8888_t
-{
-	unsigned char b;		         
-	unsigned char g;		         
-	unsigned char r;		        
-	unsigned char a;
-	inline BGRA8888_t& operator=(const BGRA8888_t& in)
-	{
-		*(unsigned int*)this = *(unsigned int*)&in;
-		return *this;
-	}
-};
-
-struct RGBA8888_t
-{
-	unsigned char r;		         
-	unsigned char g;		         
-	unsigned char b;		        
-	unsigned char a;
-	inline RGBA8888_t& operator=(const BGRA8888_t& in)
-	{
-		r = in.r;
-		g = in.g;
-		b = in.b;
-		a = in.a;
-		return *this;
-	}
-};
-
-struct RGB888_t
-{
-	unsigned char r;
-	unsigned char g;
-	unsigned char b;
-	inline RGB888_t& operator=(const BGRA8888_t& in)
-	{
-		r = in.r;
-		g = in.g;
-		b = in.b;
-		return *this;
-	}
-	inline bool operator==(const RGB888_t& in) const
-	{
-		return (r == in.r) && (g == in.g) && (b == in.b);
-	}
-	inline bool operator!=(const RGB888_t& in) const
-	{
-		return (r != in.r) || (g != in.g) || (b != in.b);
-	}
-};
-
-struct BGR888_t
-{
-	unsigned char b;
-	unsigned char g;
-	unsigned char r;
-	inline BGR888_t& operator=(const BGRA8888_t& in)
-	{
-		r = in.r;
-		g = in.g;
-		b = in.b;
-		return *this;
-	}
-};
-
-#if defined( _X360 )
-#pragma bitfield_order( push, lsb_to_msb )
-#endif
-struct BGR565_t
-{
-	unsigned short b : 5;		    
-	unsigned short g : 6;		        
-	unsigned short r : 5;
-	inline BGR565_t& operator=(const BGRA8888_t& in)
-	{
-		r = in.r >> 3;
-		g = in.g >> 2;
-		b = in.b >> 3;
-		return *this;
-	}
-	inline BGR565_t& Set(int red, int green, int blue)
-	{
-		r = red >> 3;
-		g = green >> 2;
-		b = blue >> 3;
-		return *this;
-	}
-};
-#if defined( _X360 )
-#pragma bitfield_order( pop )
-#endif
-
-struct BGRA5551_t
-{
-	unsigned short b : 5;		    
-	unsigned short g : 5;		        
-	unsigned short r : 5;
-	unsigned short a : 1;
-	inline BGRA5551_t& operator=(const BGRA8888_t& in)
-	{
-		r = in.r >> 3;
-		g = in.g >> 3;
-		b = in.b >> 3;
-		a = in.a >> 7;
-		return *this;
-	}
-};
-
-struct BGRA4444_t
-{
-	unsigned short b : 4;		    
-	unsigned short g : 4;		        
-	unsigned short r : 4;
-	unsigned short a : 4;
-	inline BGRA4444_t& operator=(const BGRA8888_t& in)
-	{
-		r = in.r >> 4;
-		g = in.g >> 4;
-		b = in.b >> 4;
-		a = in.a >> 4;
-		return *this;
-	}
-};
-
-struct RGBX5551_t
-{
-	unsigned short r : 5;
-	unsigned short g : 5;
-	unsigned short b : 5;
-	unsigned short x : 1;
-	inline RGBX5551_t& operator=(const BGRA8888_t& in)
-	{
-		r = in.r >> 3;
-		g = in.g >> 3;
-		b = in.b >> 3;
-		return *this;
-	}
-};
-
-#define ARTWORK_GAMMA ( 2.2f )
-#define IMAGE_MAX_DIM ( 2048 )
-
-
-struct ImageFormatInfo_t
-{
-	const char* m_pName;
-	int m_NumBytes;
-	int m_NumRedBits;
-	int m_NumGreeBits;
-	int m_NumBlueBits;
-	int m_NumAlphaBits;
-	bool m_IsCompressed;
-};
-
-
-namespace ImageLoader
-{
-
-	bool GetInfo(const char* fileName, int* width, int* height, enum ImageFormat* imageFormat, float* sourceGamma);
-	int  GetMemRequired(int width, int height, int depth, ImageFormat imageFormat, bool mipmap);
-	int  GetMipMapLevelByteOffset(int width, int height, enum ImageFormat imageFormat, int skipMipLevels);
-	void GetMipMapLevelDimensions(int* width, int* height, int skipMipLevels);
-	int  GetNumMipMapLevels(int width, int height, int depth = 1);
-	bool Load(unsigned char* imageData, const char* fileName, int width, int height, enum ImageFormat imageFormat, float targetGamma, bool mipmap);
-	bool Load(unsigned char* imageData, FILE* fp, int width, int height,
-		enum ImageFormat imageFormat, float targetGamma, bool mipmap);
-
-	bool ConvertImageFormat(const unsigned char* src, enum ImageFormat srcImageFormat,
-		unsigned char* dst, enum ImageFormat dstImageFormat,
-		int width, int height, int srcStride = 0, int dstStride = 0);
-
-	void PreConvertSwapImageData(unsigned char* pImageData, int nImageSize, ImageFormat imageFormat, int width = 0, int stride = 0);
-	void PostConvertSwapImageData(unsigned char* pImageData, int nImageSize, ImageFormat imageFormat, int width = 0, int stride = 0);
-	void ByteSwapImageData(unsigned char* pImageData, int nImageSize, ImageFormat imageFormat, int width = 0, int stride = 0);
-	bool IsFormatValidForConversion(ImageFormat fmt);
-
-	ImageFormat D3DFormatToImageFormat(D3DFORMAT format);
-	D3DFORMAT ImageFormatToD3DFormat(ImageFormat format);
-
-	enum
-	{
-		RESAMPLE_NORMALMAP = 0x1,
-		RESAMPLE_ALPHATEST = 0x2,
-		RESAMPLE_NICE_FILTER = 0x4,
-		RESAMPLE_CLAMPS = 0x8,
-		RESAMPLE_CLAMPT = 0x10,
-		RESAMPLE_CLAMPU = 0x20,
-	};
-
-	struct ResampleInfo_t
-	{
-
-		ResampleInfo_t() : m_nFlags(0), m_flAlphaThreshhold(0.4f), m_flAlphaHiFreqThreshhold(0.4f), m_nSrcDepth(1), m_nDestDepth(1)
-		{
-			m_flColorScale[0] = 1.0f, m_flColorScale[1] = 1.0f, m_flColorScale[2] = 1.0f, m_flColorScale[3] = 1.0f;
-			m_flColorGoal[0] = 0.0f, m_flColorGoal[1] = 0.0f, m_flColorGoal[2] = 0.0f, m_flColorGoal[3] = 0.0f;
-		}
-
-		unsigned char* m_pSrc;
-		unsigned char* m_pDest;
-
-		int m_nSrcWidth;
-		int m_nSrcHeight;
-		int m_nSrcDepth;
-
-		int m_nDestWidth;
-		int m_nDestHeight;
-		int m_nDestDepth;
-
-		float m_flSrcGamma;
-		float m_flDestGamma;
-
-		float m_flColorScale[4];	    
-		float m_flColorGoal[4];		    		        
-
-		float m_flAlphaThreshhold;
-		float m_flAlphaHiFreqThreshhold;
-
-		int m_nFlags;
-	};
-
-	bool ResampleRGBA8888(const ResampleInfo_t& info);
-	bool ResampleRGBA16161616(const ResampleInfo_t& info);
-	bool ResampleRGB323232F(const ResampleInfo_t& info);
-
-	void ConvertNormalMapRGBA8888ToDUDVMapUVLX8888(const unsigned char* src, int width, int height,
-		unsigned char* dst_);
-	void ConvertNormalMapRGBA8888ToDUDVMapUVWQ8888(const unsigned char* src, int width, int height,
-		unsigned char* dst_);
-	void ConvertNormalMapRGBA8888ToDUDVMapUV88(const unsigned char* src, int width, int height,
-		unsigned char* dst_);
-
-	void ConvertIA88ImageToNormalMapRGBA8888(const unsigned char* src, int width,
-		int height, unsigned char* dst,
-		float bumpScale);
-
-	void NormalizeNormalMapRGBA8888(unsigned char* src, int numTexels);
-
-
-	void GammaCorrectRGBA8888(unsigned char* src, unsigned char* dst,
-		int width, int height, int depth, float srcGamma, float dstGamma);
-
-
-	void ConstructGammaTable(unsigned char* pTable, float srcGamma, float dstGamma);
-
-
-	void GammaCorrectRGBA8888(unsigned char* pSrc, unsigned char* pDst,
-		int width, int height, int depth, unsigned char* pGammaTable);
-
-
-	void GenerateMipmapLevels(unsigned char* pSrc, unsigned char* pDst, int width,
-		int height, int depth, ImageFormat imageFormat, float srcGamma, float dstGamma,
-		int numLevels = 0);
-
-
-	bool RotateImageLeft(const unsigned char* src, unsigned char* dst,
-		int widthHeight, ImageFormat imageFormat);
-	bool RotateImage180(const unsigned char* src, unsigned char* dst,
-		int widthHeight, ImageFormat imageFormat);
-	bool FlipImageVertically(void* pSrc, void* pDst, int nWidth, int nHeight, ImageFormat imageFormat, int nDstStride = 0);
-	bool FlipImageHorizontally(void* pSrc, void* pDst, int nWidth, int nHeight, ImageFormat imageFormat, int nDstStride = 0);
-	bool SwapAxes(unsigned char* src,
-		int widthHeight, ImageFormat imageFormat);
-
-
-	ImageFormatInfo_t const& ImageFormatInfo(ImageFormat fmt);
-
-
-	inline char const* GetName(ImageFormat fmt)
-	{
-		return ImageFormatInfo(fmt).m_pName;
-	}
-
-
-	inline int SizeInBytes(ImageFormat fmt)
-	{
-		return ImageFormatInfo(fmt).m_NumBytes;
-	}
-
-	inline bool IsTransparent(ImageFormat fmt)
-	{
-		return ImageFormatInfo(fmt).m_NumAlphaBits > 0;
-	}
-
-
-	inline bool IsCompressed(ImageFormat fmt)
-	{
-		return ImageFormatInfo(fmt).m_IsCompressed;
-	}
-
-	inline bool HasChannelLargerThan8Bits(ImageFormat fmt)
-	{
-		ImageFormatInfo_t info = ImageFormatInfo(fmt);
-		return (info.m_NumRedBits > 8 || info.m_NumGreeBits > 8 || info.m_NumBlueBits > 8 || info.m_NumAlphaBits > 8);
-	}
-
-
-}    
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/imaterial.h b/SpyCustom/imaterial.h
deleted file mode 100644
index d031f41..0000000
--- a/SpyCustom/imaterial.h
+++ /dev/null
@@ -1,493 +0,0 @@
-#ifndef IMATERIAL_H
-#define IMATERIAL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "imageformat.h"
-#include "imaterialsystem.h"
-
-class IMaterialVar;
-class ITexture;
-class IMaterialProxy;
-class Vector;
-
-#define	VERTEX_POSITION					0x0001
-#define	VERTEX_NORMAL					0x0002
-#define	VERTEX_COLOR					0x0004
-#define	VERTEX_SPECULAR					0x0008
-
-#define	VERTEX_TANGENT_S				0x0010
-#define	VERTEX_TANGENT_T				0x0020
-#define	VERTEX_TANGENT_SPACE			( VERTEX_TANGENT_S | VERTEX_TANGENT_T )
-
-#define	VERTEX_WRINKLE					0x0040
-
-#define	VERTEX_BONE_INDEX				0x0080
-
-#define	VERTEX_FORMAT_VERTEX_SHADER		0x0100
-
-#define	VERTEX_FORMAT_USE_EXACT_FORMAT	0x0200
-
-#define	VERTEX_FORMAT_COMPRESSED		0x400
-
-#define	VERTEX_LAST_BIT					10
-
-#define	VERTEX_BONE_WEIGHT_BIT			(VERTEX_LAST_BIT + 1)
-#define	USER_DATA_SIZE_BIT				(VERTEX_LAST_BIT + 4)
-#define	TEX_COORD_SIZE_BIT				(VERTEX_LAST_BIT + 7)
-
-#define	VERTEX_BONE_WEIGHT_MASK			( 0x7 << VERTEX_BONE_WEIGHT_BIT )
-#define	USER_DATA_SIZE_MASK				( 0x7 << USER_DATA_SIZE_BIT )
-
-#define	VERTEX_FORMAT_FIELD_MASK		0x0FF
-
-#define	VERTEX_FORMAT_UNKNOWN			0
-
-
-
-#define VERTEX_BONEWEIGHT( _n )				((_n) << VERTEX_BONE_WEIGHT_BIT)
-#define VERTEX_USERDATA_SIZE( _n )			((_n) << USER_DATA_SIZE_BIT)
-#define VERTEX_TEXCOORD_MASK( _coord )		(( 0x7ULL ) << ( TEX_COORD_SIZE_BIT + 3 * (_coord) ))
-
-inline VertexFormat_t VERTEX_TEXCOORD_SIZE(int nIndex, int nNumCoords)
-{
-	uint64 n64 = nNumCoords;
-	uint64 nShift = TEX_COORD_SIZE_BIT + (3 * nIndex);
-	return n64 << nShift;
-}
-
-
-
-inline int VertexFlags(VertexFormat_t vertexFormat)
-{
-	return static_cast<int> (vertexFormat & ((1 << (VERTEX_LAST_BIT + 1)) - 1));
-}
-
-inline int NumBoneWeights(VertexFormat_t vertexFormat)
-{
-	return static_cast<int> ((vertexFormat >> VERTEX_BONE_WEIGHT_BIT) & 0x7);
-}
-
-inline int UserDataSize(VertexFormat_t vertexFormat)
-{
-	return static_cast<int> ((vertexFormat >> USER_DATA_SIZE_BIT) & 0x7);
-}
-
-inline int TexCoordSize(int nTexCoordIndex, VertexFormat_t vertexFormat)
-{
-	return static_cast<int> ((vertexFormat >> (TEX_COORD_SIZE_BIT + 3 * nTexCoordIndex)) & 0x7);
-}
-
-inline bool UsesVertexShader(VertexFormat_t vertexFormat)
-{
-	return (vertexFormat & VERTEX_FORMAT_VERTEX_SHADER) != 0;
-}
-
-inline VertexCompressionType_t CompressionType(VertexFormat_t vertexFormat)
-{
-	if (vertexFormat & VERTEX_FORMAT_COMPRESSED)
-		return VERTEX_COMPRESSION_ON;
-	else
-		return VERTEX_COMPRESSION_NONE;
-}
-
-
-enum VertexElement_t
-{
-	VERTEX_ELEMENT_NONE = -1,
-
-	VERTEX_ELEMENT_POSITION = 0,
-	VERTEX_ELEMENT_NORMAL = 1,
-	VERTEX_ELEMENT_COLOR = 2,
-	VERTEX_ELEMENT_SPECULAR = 3,
-	VERTEX_ELEMENT_TANGENT_S = 4,
-	VERTEX_ELEMENT_TANGENT_T = 5,
-	VERTEX_ELEMENT_WRINKLE = 6,
-	VERTEX_ELEMENT_BONEINDEX = 7,
-	VERTEX_ELEMENT_BONEWEIGHTS1 = 8,
-	VERTEX_ELEMENT_BONEWEIGHTS2 = 9,
-	VERTEX_ELEMENT_BONEWEIGHTS3 = 10,
-	VERTEX_ELEMENT_BONEWEIGHTS4 = 11,
-	VERTEX_ELEMENT_USERDATA1 = 12,
-	VERTEX_ELEMENT_USERDATA2 = 13,
-	VERTEX_ELEMENT_USERDATA3 = 14,
-	VERTEX_ELEMENT_USERDATA4 = 15,
-	VERTEX_ELEMENT_TEXCOORD1D_0 = 16,
-	VERTEX_ELEMENT_TEXCOORD1D_1 = 17,
-	VERTEX_ELEMENT_TEXCOORD1D_2 = 18,
-	VERTEX_ELEMENT_TEXCOORD1D_3 = 19,
-	VERTEX_ELEMENT_TEXCOORD1D_4 = 20,
-	VERTEX_ELEMENT_TEXCOORD1D_5 = 21,
-	VERTEX_ELEMENT_TEXCOORD1D_6 = 22,
-	VERTEX_ELEMENT_TEXCOORD1D_7 = 23,
-	VERTEX_ELEMENT_TEXCOORD2D_0 = 24,
-	VERTEX_ELEMENT_TEXCOORD2D_1 = 25,
-	VERTEX_ELEMENT_TEXCOORD2D_2 = 26,
-	VERTEX_ELEMENT_TEXCOORD2D_3 = 27,
-	VERTEX_ELEMENT_TEXCOORD2D_4 = 28,
-	VERTEX_ELEMENT_TEXCOORD2D_5 = 29,
-	VERTEX_ELEMENT_TEXCOORD2D_6 = 30,
-	VERTEX_ELEMENT_TEXCOORD2D_7 = 31,
-	VERTEX_ELEMENT_TEXCOORD3D_0 = 32,
-	VERTEX_ELEMENT_TEXCOORD3D_1 = 33,
-	VERTEX_ELEMENT_TEXCOORD3D_2 = 34,
-	VERTEX_ELEMENT_TEXCOORD3D_3 = 35,
-	VERTEX_ELEMENT_TEXCOORD3D_4 = 36,
-	VERTEX_ELEMENT_TEXCOORD3D_5 = 37,
-	VERTEX_ELEMENT_TEXCOORD3D_6 = 38,
-	VERTEX_ELEMENT_TEXCOORD3D_7 = 39,
-	VERTEX_ELEMENT_TEXCOORD4D_0 = 40,
-	VERTEX_ELEMENT_TEXCOORD4D_1 = 41,
-	VERTEX_ELEMENT_TEXCOORD4D_2 = 42,
-	VERTEX_ELEMENT_TEXCOORD4D_3 = 43,
-	VERTEX_ELEMENT_TEXCOORD4D_4 = 44,
-	VERTEX_ELEMENT_TEXCOORD4D_5 = 45,
-	VERTEX_ELEMENT_TEXCOORD4D_6 = 46,
-	VERTEX_ELEMENT_TEXCOORD4D_7 = 47,
-
-	VERTEX_ELEMENT_NUMELEMENTS = 48
-};
-
-inline void Detect_VertexElement_t_Changes(VertexElement_t element)       
-{
-	Assert(VERTEX_ELEMENT_NUMELEMENTS == 48);
-	switch (element)
-	{
-	case VERTEX_ELEMENT_POSITION:		Assert(VERTEX_ELEMENT_POSITION == 0); break;
-	case VERTEX_ELEMENT_NORMAL:			Assert(VERTEX_ELEMENT_NORMAL == 1); break;
-	case VERTEX_ELEMENT_COLOR:			Assert(VERTEX_ELEMENT_COLOR == 2); break;
-	case VERTEX_ELEMENT_SPECULAR:		Assert(VERTEX_ELEMENT_SPECULAR == 3); break;
-	case VERTEX_ELEMENT_TANGENT_S:		Assert(VERTEX_ELEMENT_TANGENT_S == 4); break;
-	case VERTEX_ELEMENT_TANGENT_T:		Assert(VERTEX_ELEMENT_TANGENT_T == 5); break;
-	case VERTEX_ELEMENT_WRINKLE:		Assert(VERTEX_ELEMENT_WRINKLE == 6); break;
-	case VERTEX_ELEMENT_BONEINDEX:		Assert(VERTEX_ELEMENT_BONEINDEX == 7); break;
-	case VERTEX_ELEMENT_BONEWEIGHTS1:	Assert(VERTEX_ELEMENT_BONEWEIGHTS1 == 8); break;
-	case VERTEX_ELEMENT_BONEWEIGHTS2:	Assert(VERTEX_ELEMENT_BONEWEIGHTS2 == 9); break;
-	case VERTEX_ELEMENT_BONEWEIGHTS3:	Assert(VERTEX_ELEMENT_BONEWEIGHTS3 == 10); break;
-	case VERTEX_ELEMENT_BONEWEIGHTS4:	Assert(VERTEX_ELEMENT_BONEWEIGHTS4 == 11); break;
-	case VERTEX_ELEMENT_USERDATA1:		Assert(VERTEX_ELEMENT_USERDATA1 == 12); break;
-	case VERTEX_ELEMENT_USERDATA2:		Assert(VERTEX_ELEMENT_USERDATA2 == 13); break;
-	case VERTEX_ELEMENT_USERDATA3:		Assert(VERTEX_ELEMENT_USERDATA3 == 14); break;
-	case VERTEX_ELEMENT_USERDATA4:		Assert(VERTEX_ELEMENT_USERDATA4 == 15); break;
-	case VERTEX_ELEMENT_TEXCOORD1D_0:	Assert(VERTEX_ELEMENT_TEXCOORD1D_0 == 16); break;
-	case VERTEX_ELEMENT_TEXCOORD1D_1:	Assert(VERTEX_ELEMENT_TEXCOORD1D_1 == 17); break;
-	case VERTEX_ELEMENT_TEXCOORD1D_2:	Assert(VERTEX_ELEMENT_TEXCOORD1D_2 == 18); break;
-	case VERTEX_ELEMENT_TEXCOORD1D_3:	Assert(VERTEX_ELEMENT_TEXCOORD1D_3 == 19); break;
-	case VERTEX_ELEMENT_TEXCOORD1D_4:	Assert(VERTEX_ELEMENT_TEXCOORD1D_4 == 20); break;
-	case VERTEX_ELEMENT_TEXCOORD1D_5:	Assert(VERTEX_ELEMENT_TEXCOORD1D_5 == 21); break;
-	case VERTEX_ELEMENT_TEXCOORD1D_6:	Assert(VERTEX_ELEMENT_TEXCOORD1D_6 == 22); break;
-	case VERTEX_ELEMENT_TEXCOORD1D_7:	Assert(VERTEX_ELEMENT_TEXCOORD1D_7 == 23); break;
-	case VERTEX_ELEMENT_TEXCOORD2D_0:	Assert(VERTEX_ELEMENT_TEXCOORD2D_0 == 24); break;
-	case VERTEX_ELEMENT_TEXCOORD2D_1:	Assert(VERTEX_ELEMENT_TEXCOORD2D_1 == 25); break;
-	case VERTEX_ELEMENT_TEXCOORD2D_2:	Assert(VERTEX_ELEMENT_TEXCOORD2D_2 == 26); break;
-	case VERTEX_ELEMENT_TEXCOORD2D_3:	Assert(VERTEX_ELEMENT_TEXCOORD2D_3 == 27); break;
-	case VERTEX_ELEMENT_TEXCOORD2D_4:	Assert(VERTEX_ELEMENT_TEXCOORD2D_4 == 28); break;
-	case VERTEX_ELEMENT_TEXCOORD2D_5:	Assert(VERTEX_ELEMENT_TEXCOORD2D_5 == 29); break;
-	case VERTEX_ELEMENT_TEXCOORD2D_6:	Assert(VERTEX_ELEMENT_TEXCOORD2D_6 == 30); break;
-	case VERTEX_ELEMENT_TEXCOORD2D_7:	Assert(VERTEX_ELEMENT_TEXCOORD2D_7 == 31); break;
-	case VERTEX_ELEMENT_TEXCOORD3D_0:	Assert(VERTEX_ELEMENT_TEXCOORD3D_0 == 32); break;
-	case VERTEX_ELEMENT_TEXCOORD3D_1:	Assert(VERTEX_ELEMENT_TEXCOORD3D_1 == 33); break;
-	case VERTEX_ELEMENT_TEXCOORD3D_2:	Assert(VERTEX_ELEMENT_TEXCOORD3D_2 == 34); break;
-	case VERTEX_ELEMENT_TEXCOORD3D_3:	Assert(VERTEX_ELEMENT_TEXCOORD3D_3 == 35); break;
-	case VERTEX_ELEMENT_TEXCOORD3D_4:	Assert(VERTEX_ELEMENT_TEXCOORD3D_4 == 36); break;
-	case VERTEX_ELEMENT_TEXCOORD3D_5:	Assert(VERTEX_ELEMENT_TEXCOORD3D_5 == 37); break;
-	case VERTEX_ELEMENT_TEXCOORD3D_6:	Assert(VERTEX_ELEMENT_TEXCOORD3D_6 == 38); break;
-	case VERTEX_ELEMENT_TEXCOORD3D_7:	Assert(VERTEX_ELEMENT_TEXCOORD3D_7 == 39); break;
-	case VERTEX_ELEMENT_TEXCOORD4D_0:	Assert(VERTEX_ELEMENT_TEXCOORD4D_0 == 40); break;
-	case VERTEX_ELEMENT_TEXCOORD4D_1:	Assert(VERTEX_ELEMENT_TEXCOORD4D_1 == 41); break;
-	case VERTEX_ELEMENT_TEXCOORD4D_2:	Assert(VERTEX_ELEMENT_TEXCOORD4D_2 == 42); break;
-	case VERTEX_ELEMENT_TEXCOORD4D_3:	Assert(VERTEX_ELEMENT_TEXCOORD4D_3 == 43); break;
-	case VERTEX_ELEMENT_TEXCOORD4D_4:	Assert(VERTEX_ELEMENT_TEXCOORD4D_4 == 44); break;
-	case VERTEX_ELEMENT_TEXCOORD4D_5:	Assert(VERTEX_ELEMENT_TEXCOORD4D_5 == 45); break;
-	case VERTEX_ELEMENT_TEXCOORD4D_6:	Assert(VERTEX_ELEMENT_TEXCOORD4D_6 == 46); break;
-	case VERTEX_ELEMENT_TEXCOORD4D_7:	Assert(VERTEX_ELEMENT_TEXCOORD4D_7 == 47); break;
-	default:
-		Assert(0);        
-		break;
-	}
-}
-
-#define COMPRESSED_NORMALS_SEPARATETANGENTS_SHORT2	0
-#define COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4	1
-#define COMPRESSED_NORMALS_TYPE						COMPRESSED_NORMALS_COMBINEDTANGENTS_UBYTE4
-
-inline int GetVertexElementSize(VertexElement_t element, VertexCompressionType_t compressionType)
-{
-	Detect_VertexElement_t_Changes(element);
-
-	if (compressionType == VERTEX_COMPRESSION_ON)
-	{
-		switch (element)
-		{
-#if		( COMPRESSED_NORMALS_TYPE == COMPRESSED_NORMALS_SEPARATETANGENTS_SHORT2 )
-		case VERTEX_ELEMENT_NORMAL:
-			return (2 * sizeof(short));
-		case VERTEX_ELEMENT_USERDATA4:
-			return (2 * sizeof(short));
-#else      
-		case VERTEX_ELEMENT_NORMAL:
-			return (4 * sizeof(unsigned char));
-		case VERTEX_ELEMENT_USERDATA4:
-			return (0);
-#endif
-		case VERTEX_ELEMENT_BONEWEIGHTS1:
-		case VERTEX_ELEMENT_BONEWEIGHTS2:
-			return (2 * sizeof(short));
-		default:
-			break;
-		}
-	}
-
-	switch (element)
-	{
-	case VERTEX_ELEMENT_POSITION:		return (3 * sizeof(float));
-	case VERTEX_ELEMENT_NORMAL:			return (3 * sizeof(float));
-	case VERTEX_ELEMENT_COLOR:			return (4 * sizeof(unsigned char));
-	case VERTEX_ELEMENT_SPECULAR:		return (4 * sizeof(unsigned char));
-	case VERTEX_ELEMENT_TANGENT_S:		return (3 * sizeof(float));
-	case VERTEX_ELEMENT_TANGENT_T:		return (3 * sizeof(float));
-	case VERTEX_ELEMENT_WRINKLE:		return (1 * sizeof(float));    
-	case VERTEX_ELEMENT_BONEINDEX:		return (4 * sizeof(unsigned char));
-	case VERTEX_ELEMENT_BONEWEIGHTS1:	return (1 * sizeof(float));
-	case VERTEX_ELEMENT_BONEWEIGHTS2:	return (2 * sizeof(float));
-	case VERTEX_ELEMENT_BONEWEIGHTS3:	return (3 * sizeof(float));
-	case VERTEX_ELEMENT_BONEWEIGHTS4:	return (4 * sizeof(float));
-	case VERTEX_ELEMENT_USERDATA1:		return (1 * sizeof(float));
-	case VERTEX_ELEMENT_USERDATA2:		return (2 * sizeof(float));
-	case VERTEX_ELEMENT_USERDATA3:		return (3 * sizeof(float));
-	case VERTEX_ELEMENT_USERDATA4:		return (4 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD1D_0:	return (1 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD1D_1:	return (1 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD1D_2:	return (1 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD1D_3:	return (1 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD1D_4:	return (1 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD1D_5:	return (1 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD1D_6:	return (1 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD1D_7:	return (1 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD2D_0:	return (2 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD2D_1:	return (2 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD2D_2:	return (2 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD2D_3:	return (2 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD2D_4:	return (2 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD2D_5:	return (2 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD2D_6:	return (2 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD2D_7:	return (2 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD3D_0:	return (3 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD3D_1:	return (3 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD3D_2:	return (3 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD3D_3:	return (3 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD3D_4:	return (3 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD3D_5:	return (3 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD3D_6:	return (3 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD3D_7:	return (3 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD4D_0:	return (4 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD4D_1:	return (4 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD4D_2:	return (4 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD4D_3:	return (4 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD4D_4:	return (4 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD4D_5:	return (4 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD4D_6:	return (4 * sizeof(float));
-	case VERTEX_ELEMENT_TEXCOORD4D_7:	return (4 * sizeof(float));
-	default:
-		Assert(0);
-		return 0;
-	};
-}
-
-
-enum MaterialVarFlags_t
-{
-	MATERIAL_VAR_DEBUG = (1 << 0),
-	MATERIAL_VAR_NO_DEBUG_OVERRIDE = (1 << 1),
-	MATERIAL_VAR_NO_DRAW = (1 << 2),
-	MATERIAL_VAR_USE_IN_FILLRATE_MODE = (1 << 3),
-
-	MATERIAL_VAR_VERTEXCOLOR = (1 << 4),
-	MATERIAL_VAR_VERTEXALPHA = (1 << 5),
-	MATERIAL_VAR_SELFILLUM = (1 << 6),
-	MATERIAL_VAR_ADDITIVE = (1 << 7),
-	MATERIAL_VAR_ALPHATEST = (1 << 8),
-	MATERIAL_VAR_MULTIPASS = (1 << 9),
-	MATERIAL_VAR_ZNEARER = (1 << 10),
-	MATERIAL_VAR_MODEL = (1 << 11),
-	MATERIAL_VAR_FLAT = (1 << 12),
-	MATERIAL_VAR_NOCULL = (1 << 13),
-	MATERIAL_VAR_NOFOG = (1 << 14),
-	MATERIAL_VAR_IGNOREZ = (1 << 15),
-	MATERIAL_VAR_DECAL = (1 << 16),
-	MATERIAL_VAR_ENVMAPSPHERE = (1 << 17),
-	MATERIAL_VAR_NOALPHAMOD = (1 << 18),
-	MATERIAL_VAR_ENVMAPCAMERASPACE = (1 << 19),
-	MATERIAL_VAR_BASEALPHAENVMAPMASK = (1 << 20),
-	MATERIAL_VAR_TRANSLUCENT = (1 << 21),
-	MATERIAL_VAR_NORMALMAPALPHAENVMAPMASK = (1 << 22),
-	MATERIAL_VAR_NEEDS_SOFTWARE_SKINNING = (1 << 23),
-	MATERIAL_VAR_OPAQUETEXTURE = (1 << 24),
-	MATERIAL_VAR_ENVMAPMODE = (1 << 25),
-	MATERIAL_VAR_SUPPRESS_DECALS = (1 << 26),
-	MATERIAL_VAR_HALFLAMBERT = (1 << 27),
-	MATERIAL_VAR_WIREFRAME = (1 << 28),
-	MATERIAL_VAR_ALLOWALPHATOCOVERAGE = (1 << 29),
-	MATERIAL_VAR_IGNORE_ALPHA_MODULATION = (1 << 30),
-
-};
-
-
-enum MaterialVarFlags2_t
-{
-	MATERIAL_VAR2_LIGHTING_UNLIT = 0,
-	MATERIAL_VAR2_LIGHTING_VERTEX_LIT = (1 << 1),
-	MATERIAL_VAR2_LIGHTING_LIGHTMAP = (1 << 2),
-	MATERIAL_VAR2_LIGHTING_BUMPED_LIGHTMAP = (1 << 3),
-	MATERIAL_VAR2_LIGHTING_MASK =
-	(MATERIAL_VAR2_LIGHTING_VERTEX_LIT |
-		MATERIAL_VAR2_LIGHTING_LIGHTMAP |
-		MATERIAL_VAR2_LIGHTING_BUMPED_LIGHTMAP),
-
-	MATERIAL_VAR2_DIFFUSE_BUMPMAPPED_MODEL = (1 << 4),
-	MATERIAL_VAR2_USES_ENV_CUBEMAP = (1 << 5),
-	MATERIAL_VAR2_NEEDS_TANGENT_SPACES = (1 << 6),
-	MATERIAL_VAR2_NEEDS_SOFTWARE_LIGHTING = (1 << 7),
-	MATERIAL_VAR2_BLEND_WITH_LIGHTMAP_ALPHA = (1 << 8),
-	MATERIAL_VAR2_NEEDS_BAKED_LIGHTING_SNAPSHOTS = (1 << 9),
-	MATERIAL_VAR2_USE_FLASHLIGHT = (1 << 10),
-	MATERIAL_VAR2_USE_FIXED_FUNCTION_BAKED_LIGHTING = (1 << 11),
-	MATERIAL_VAR2_NEEDS_FIXED_FUNCTION_FLASHLIGHT = (1 << 12),
-	MATERIAL_VAR2_USE_EDITOR = (1 << 13),
-	MATERIAL_VAR2_NEEDS_POWER_OF_TWO_FRAME_BUFFER_TEXTURE = (1 << 14),
-	MATERIAL_VAR2_NEEDS_FULL_FRAME_BUFFER_TEXTURE = (1 << 15),
-	MATERIAL_VAR2_IS_SPRITECARD = (1 << 16),
-	MATERIAL_VAR2_USES_VERTEXID = (1 << 17),
-	MATERIAL_VAR2_SUPPORTS_HW_SKINNING = (1 << 18),
-	MATERIAL_VAR2_SUPPORTS_FLASHLIGHT = (1 << 19),
-};
-
-
-enum PreviewImageRetVal_t
-{
-	MATERIAL_PREVIEW_IMAGE_BAD = 0,
-	MATERIAL_PREVIEW_IMAGE_OK,
-	MATERIAL_NO_PREVIEW_IMAGE,
-};
-
-
-abstract_class IMaterial
-{
-public:
-	virtual const char* GetName() const = 0;
-	virtual const char* GetTextureGroupName() const = 0;
-
-	virtual PreviewImageRetVal_t GetPreviewImageProperties(int* width, int* height,
-							ImageFormat* imageFormat, bool* isTranslucent) const = 0;
-
-	virtual PreviewImageRetVal_t GetPreviewImage(unsigned char* data,
-												 int width, int height,
-												 ImageFormat imageFormat) const = 0;
-	virtual int				GetMappingWidth() = 0;
-	virtual int				GetMappingHeight() = 0;
-
-	virtual int				GetNumAnimationFrames() = 0;
-
-	virtual bool			InMaterialPage(void) = 0;
-	virtual	void			GetMaterialOffset(float* pOffset) = 0;
-	virtual void			GetMaterialScale(float* pScale) = 0;
-	virtual IMaterial* GetMaterialPage(void) = 0;
-
-	virtual IMaterialVar* FindVar(const char* varName, bool* found, bool complain = true) = 0;
-
-	virtual void			IncrementReferenceCount(void) = 0;
-	virtual void			DecrementReferenceCount(void) = 0;
-
-	inline void AddRef() { IncrementReferenceCount(); }
-	inline void Release() { DecrementReferenceCount(); }
-
-	virtual int 			GetEnumerationID(void) const = 0;
-
-	virtual void			GetLowResColorSample(float s, float t, float* color) const = 0;
-
-	virtual void			RecomputeStateSnapshots() = 0;
-
-	virtual bool			IsTranslucent() = 0;
-
-	virtual bool			IsAlphaTested() = 0;
-
-	virtual bool			IsVertexLit() = 0;
-
-	virtual VertexFormat_t	GetVertexFormat() const = 0;
-
-	virtual bool			HasProxy(void) const = 0;
-
-	virtual bool			UsesEnvCubemap(void) = 0;
-
-	virtual bool			NeedsTangentSpace(void) = 0;
-
-	virtual bool			NeedsPowerOfTwoFrameBufferTexture(bool bCheckSpecificToThisFrame = true) = 0;
-	virtual bool			NeedsFullFrameBufferTexture(bool bCheckSpecificToThisFrame = true) = 0;
-
-	virtual bool			NeedsSoftwareSkinning(void) = 0;
-
-	virtual void			AlphaModulate(float alpha) = 0;
-	virtual void			ColorModulate(float r, float g, float b) = 0;
-
-	virtual void			SetMaterialVarFlag(MaterialVarFlags_t flag, bool on) = 0;
-	virtual bool			GetMaterialVarFlag(MaterialVarFlags_t flag) const = 0;
-
-	virtual void			GetReflectivity(Vector& reflect) = 0;
-
-	virtual bool			GetPropertyFlag(MaterialPropertyTypes_t type) = 0;
-
-	virtual bool			IsTwoSided() = 0;
-
-	virtual void			SetShader(const char* pShaderName) = 0;
-
-	virtual int				GetNumPasses(void) = 0;
-
-	virtual int				GetTextureMemoryBytes(void) = 0;
-
-	virtual void			Refresh() = 0;
-
-	virtual bool			NeedsLightmapBlendAlpha(void) = 0;
-
-	virtual bool			NeedsSoftwareLighting(void) = 0;
-
-	virtual int				ShaderParamCount() const = 0;
-	virtual IMaterialVar** GetShaderParams(void) = 0;
-
-	virtual bool			IsErrorMaterial() const = 0;
-
-	virtual void			SetUseFixedFunctionBakedLighting(bool bEnable) = 0;
-
-	virtual float			GetAlphaModulation() = 0;
-	virtual void			GetColorModulation(float* r, float* g, float* b) = 0;
-
-	virtual MorphFormat_t	GetMorphFormat() const = 0;
-
-	virtual IMaterialVar* FindVarFast(char const* pVarName, unsigned int* pToken) = 0;
-
-	virtual void			SetShaderAndParams(KeyValues* pKeyValues) = 0;
-	virtual const char* GetShaderName() const = 0;
-
-	virtual void			DeleteIfUnreferenced() = 0;
-
-	virtual bool			IsSpriteCard() = 0;
-
-	virtual void			CallBindProxy(void* proxyData) = 0;
-
-	virtual IMaterial* CheckProxyReplacement(void* proxyData) = 0;
-
-	virtual void			RefreshPreservingMaterialVars() = 0;
-
-	virtual bool			WasReloadedFromWhitelist() = 0;
-
-	virtual bool			IsPrecached() const = 0;
-};
-
-
-inline bool IsErrorMaterial(IMaterial* pMat)
-{
-	return !pMat || pMat->IsErrorMaterial();
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/imaterialsystem.h b/SpyCustom/imaterialsystem.h
deleted file mode 100644
index a672559..0000000
--- a/SpyCustom/imaterialsystem.h
+++ /dev/null
@@ -1,1632 +0,0 @@
-#ifndef IMATERIALSYSTEM_H
-#define IMATERIALSYSTEM_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define OVERBRIGHT 2.0f
-#define OO_OVERBRIGHT ( 1.0f / 2.0f )
-#define GAMMA 2.2f
-#define TEXGAMMA 2.2f
-
-#include "interface.h"
-#include "refcount.h"
-#include "vector.h"
-#include "vector4d.h"
-#include "vmatrix.h"
-#include "iappsystem.h"
-#include "imageformat.h"
-#include "texture_group_names.h"
-#include "vtf.h"
-#include "deformations.h"
-
-enum HDRType_t
-{
-	HDR_TYPE_NONE,
-	HDR_TYPE_INTEGER,
-	HDR_TYPE_FLOAT,
-};
-
-#include "imaterialsystemhardwareconfig.h"
-#include "IColorCorrection.h"
-
-#if !defined( _GAMECONSOLE )
-#endif
-
-#if defined(_PS3)
-typedef void* HPS3FONT;    
-class CPS3FontMetrics;
-class CPS3CharMetrics;
-
-enum GpuDataTransferCache_t
-{
-	PS3GPU_DATA_TRANSFER_CREATECACHELINK = 0x80000000,
-	PS3GPU_DATA_TRANSFER_CACHE2REAL = 0x01000000,
-	PS3GPU_DATA_TRANSFER_REAL2CACHE = 0x02000000,
-	PS3GPU_DATA_TRANSFER_MASK = 0xFF000000,
-};
-#endif
-
-class IMaterial;
-class IMesh;
-class IVertexBuffer;
-class IIndexBuffer;
-struct MaterialSystem_Config_t;
-class VMatrix;
-struct matrix3x4_t;
-class ITexture;
-struct MaterialSystemHardwareIdentifier_t;
-class KeyValues;
-class IShader;
-class IVertexTexture;
-class IMorph;
-class IMatRenderContext;
-class ICallQueue;
-struct MorphWeight_t;
-class IFileList;
-struct VertexStreamSpec_t;
-struct ShaderStencilState_t;
-struct MeshInstanceData_t;
-class IClientMaterialSystem;
-class CPaintMaterial;
-class IPaintmapDataManager;
-class IPaintmapTextureManager;
-struct GPUMemoryStats;
-class ICustomMaterialManager;
-class ICompositeTextureGenerator;
-
-typedef uint64 VertexFormat_t;
-
-enum ShaderParamType_t
-{
-	SHADER_PARAM_TYPE_TEXTURE,
-	SHADER_PARAM_TYPE_INTEGER,
-	SHADER_PARAM_TYPE_COLOR,
-	SHADER_PARAM_TYPE_VEC2,
-	SHADER_PARAM_TYPE_VEC3,
-	SHADER_PARAM_TYPE_VEC4,
-	SHADER_PARAM_TYPE_ENVMAP,	 
-	SHADER_PARAM_TYPE_FLOAT,
-	SHADER_PARAM_TYPE_BOOL,
-	SHADER_PARAM_TYPE_FOURCC,
-	SHADER_PARAM_TYPE_MATRIX,
-	SHADER_PARAM_TYPE_MATERIAL,
-	SHADER_PARAM_TYPE_STRING,
-};
-
-enum MaterialMatrixMode_t
-{
-	MATERIAL_VIEW = 0,
-	MATERIAL_PROJECTION,
-
-	MATERIAL_MATRIX_UNUSED0,
-	MATERIAL_MATRIX_UNUSED1,
-	MATERIAL_MATRIX_UNUSED2,
-	MATERIAL_MATRIX_UNUSED3,
-	MATERIAL_MATRIX_UNUSED4,
-	MATERIAL_MATRIX_UNUSED5,
-	MATERIAL_MATRIX_UNUSED6,
-	MATERIAL_MATRIX_UNUSED7,
-
-	MATERIAL_MODEL,
-
-	NUM_MATRIX_MODES = MATERIAL_MODEL + 1,
-};
-
-const int NUM_MODEL_TRANSFORMS = 53;
-const int MATERIAL_MODEL_MAX = MATERIAL_MODEL + NUM_MODEL_TRANSFORMS;
-
-enum MaterialPrimitiveType_t
-{
-	MATERIAL_POINTS = 0x0,
-	MATERIAL_LINES,
-	MATERIAL_TRIANGLES,
-	MATERIAL_TRIANGLE_STRIP,
-	MATERIAL_LINE_STRIP,
-	MATERIAL_LINE_LOOP,	    
-	MATERIAL_POLYGON,	     
-	MATERIAL_QUADS,
-	MATERIAL_SUBD_QUADS_EXTRA,    
-	MATERIAL_SUBD_QUADS_REG,      
-	MATERIAL_INSTANCED_QUADS,        
-
-	MATERIAL_HETEROGENOUS
-};
-
-enum TessellationMode_t
-{
-	TESSELLATION_MODE_DISABLED = 0,
-	TESSELLATION_MODE_ACC_PATCHES_EXTRA,
-	TESSELLATION_MODE_ACC_PATCHES_REG
-};
-
-enum MaterialPropertyTypes_t
-{
-	MATERIAL_PROPERTY_NEEDS_LIGHTMAP = 0,					 
-	MATERIAL_PROPERTY_OPACITY,								   
-	MATERIAL_PROPERTY_REFLECTIVITY,							 
-	MATERIAL_PROPERTY_NEEDS_BUMPED_LIGHTMAPS				 
-};
-
-enum MaterialPropertyOpacityTypes_t
-{
-	MATERIAL_ALPHATEST = 0,
-	MATERIAL_OPAQUE,
-	MATERIAL_TRANSLUCENT
-};
-
-enum MaterialBufferTypes_t
-{
-	MATERIAL_FRONT = 0,
-	MATERIAL_BACK
-};
-
-enum MaterialCullMode_t
-{
-	MATERIAL_CULLMODE_CCW,	      
-	MATERIAL_CULLMODE_CW,	      
-	MATERIAL_CULLMODE_NONE	  
-};
-
-enum MaterialIndexFormat_t
-{
-	MATERIAL_INDEX_FORMAT_UNKNOWN = -1,
-	MATERIAL_INDEX_FORMAT_16BIT = 0,
-	MATERIAL_INDEX_FORMAT_32BIT,
-};
-
-enum MaterialFogMode_t
-{
-	MATERIAL_FOG_NONE,
-	MATERIAL_FOG_LINEAR,
-	MATERIAL_FOG_LINEAR_BELOW_FOG_Z,
-};
-
-enum MaterialHeightClipMode_t
-{
-	MATERIAL_HEIGHTCLIPMODE_DISABLE,
-	MATERIAL_HEIGHTCLIPMODE_RENDER_ABOVE_HEIGHT,
-	MATERIAL_HEIGHTCLIPMODE_RENDER_BELOW_HEIGHT
-};
-
-enum MaterialNonInteractiveMode_t
-{
-	MATERIAL_NON_INTERACTIVE_MODE_NONE = -1,
-	MATERIAL_NON_INTERACTIVE_MODE_STARTUP = 0,
-	MATERIAL_NON_INTERACTIVE_MODE_LEVEL_LOAD,
-
-	MATERIAL_NON_INTERACTIVE_MODE_COUNT,
-};
-
-
-#define MATERIAL_MORPH_DECAL ( (IMorph*)1 )
-
-
-enum MaterialThreadMode_t
-{
-	MATERIAL_SINGLE_THREADED,
-	MATERIAL_QUEUED_SINGLE_THREADED,
-	MATERIAL_QUEUED_THREADED
-};
-
-enum MaterialContextType_t
-{
-	MATERIAL_HARDWARE_CONTEXT,
-	MATERIAL_QUEUED_CONTEXT,
-	MATERIAL_NULL_CONTEXT
-};
-
-
-#include "lightdesc.h"
-
-enum
-{
-	MATERIAL_MAX_LIGHT_COUNT = 4,
-};
-
-struct MaterialLightingState_t
-{
-	Vector			m_vecAmbientCube[6];		       
-	Vector			m_vecLightingOrigin;		        
-	int				m_nLocalLightCount;
-	LightDesc_t		m_pLocalLightDesc[MATERIAL_MAX_LIGHT_COUNT];
-
-	MaterialLightingState_t& operator=(const MaterialLightingState_t& src)
-	{
-		memcpy(this, &src, sizeof(MaterialLightingState_t) - MATERIAL_MAX_LIGHT_COUNT * sizeof(LightDesc_t));
-		size_t byteCount = src.m_nLocalLightCount * sizeof(LightDesc_t);
-		Assert(byteCount <= sizeof(m_pLocalLightDesc));
-		memcpy(m_pLocalLightDesc, &src.m_pLocalLightDesc, byteCount);
-		return *this;
-	}
-};
-
-
-
-#define CREATERENDERTARGETFLAGS_HDR				0x00000001
-#define CREATERENDERTARGETFLAGS_AUTOMIPMAP		0x00000002
-#define CREATERENDERTARGETFLAGS_UNFILTERABLE_OK 0x00000004
-#define CREATERENDERTARGETFLAGS_NOEDRAM			0x00000008      
-#define CREATERENDERTARGETFLAGS_TEMP			0x00000010           
-#define CREATERENDERTARGETFLAGS_ALIASCOLORANDDEPTHSURFACES 0x00000020                      
-
-
-struct MaterialBatchData_t
-{
-	IMaterial* m_pMaterial;
-	matrix3x4_t* m_pModelToWorld;
-	const ITexture* m_pEnvCubemap;
-	int						m_nLightmapPageId;
-	MaterialPrimitiveType_t m_nPrimType;
-	int						m_nIndexOffset;
-	int						m_nIndexCount;
-	int						m_nVertexOffsetInBytes;
-	const IIndexBuffer* m_pIndexBuffer;
-	const IVertexBuffer* m_pVertexBuffer;
-};
-
-
-enum MorphFormatFlags_t
-{
-	MORPH_POSITION = 0x0001,	 
-	MORPH_NORMAL = 0x0002,	 
-	MORPH_WRINKLE = 0x0004,	 
-	MORPH_SPEED = 0x0008,	 
-	MORPH_SIDE = 0x0010,	 
-};
-
-
-typedef unsigned int MorphFormat_t;
-
-
-enum StandardLightmap_t
-{
-	MATERIAL_SYSTEM_LIGHTMAP_PAGE_WHITE = -1,
-	MATERIAL_SYSTEM_LIGHTMAP_PAGE_WHITE_BUMP = -2,
-	MATERIAL_SYSTEM_LIGHTMAP_PAGE_USER_DEFINED = -3,
-	MATERIAL_SYSTEM_LIGHTMAP_PAGE_INVALID = -4,
-};
-
-
-struct MaterialSystem_SortInfo_t
-{
-	IMaterial* material;
-	int			lightmapPageID;
-};
-
-
-#define MAX_FB_TEXTURES 4
-
-enum
-{
-	MATERIAL_ADAPTER_NAME_LENGTH = 512
-};
-
-struct MaterialAdapterInfo_t
-{
-	char m_pDriverName[MATERIAL_ADAPTER_NAME_LENGTH];
-	unsigned int m_VendorID;
-	unsigned int m_DeviceID;
-	unsigned int m_SubSysID;
-	unsigned int m_Revision;
-	int m_nDXSupportLevel;			       
-	int m_nMinDXSupportLevel;
-	int m_nMaxDXSupportLevel;
-	unsigned int m_nDriverVersionHigh;
-	unsigned int m_nDriverVersionLow;
-};
-
-
-struct MaterialVideoMode_t
-{
-	int m_Width;			          
-	int m_Height;			       
-	ImageFormat m_Format;	      
-	int m_RefreshRate;		       
-};
-
-
-struct UberlightState_t
-{
-	UberlightState_t()
-	{
-		m_fNearEdge = 2.0f;
-		m_fFarEdge = 100.0f;
-		m_fCutOn = 10.0f;
-		m_fCutOff = 650.0f;
-		m_fShearx = 0.0f;
-		m_fSheary = 0.0f;
-		m_fWidth = 0.3f;
-		m_fWedge = 0.05f;
-		m_fHeight = 0.3f;
-		m_fHedge = 0.05f;
-		m_fRoundness = 0.8f;
-	}
-
-	float m_fNearEdge;
-	float m_fFarEdge;
-	float m_fCutOn;
-	float m_fCutOff;
-	float m_fShearx;
-	float m_fSheary;
-	float m_fWidth;
-	float m_fWedge;
-	float m_fHeight;
-	float m_fHedge;
-	float m_fRoundness;
-
-	IMPLEMENT_OPERATOR_EQUAL(UberlightState_t);
-};
-
-struct FlashlightState_t
-{
-	FlashlightState_t()
-	{
-		m_bEnableShadows = false;						        
-		m_bDrawShadowFrustum = false;
-		m_flShadowMapResolution = 1024.0f;
-		m_flShadowFilterSize = 3.0f;
-		m_flShadowSlopeScaleDepthBias = 16.0f;
-		m_flShadowDepthBias = 0.0005f;
-		m_flShadowJitterSeed = 0.0f;
-		m_flShadowAtten = 0.0f;
-		m_flAmbientOcclusion = 0.0f;
-		m_nShadowQuality = 0;
-		m_bShadowHighRes = false;
-
-		m_bScissor = false;
-		m_nLeft = -1;
-		m_nTop = -1;
-		m_nRight = -1;
-		m_nBottom = -1;
-
-		m_bUberlight = false;
-
-		m_bVolumetric = false;
-		m_flNoiseStrength = 0.8f;
-		m_flFlashlightTime = 0.0f;
-		m_nNumPlanes = 64;
-		m_flPlaneOffset = 0.0f;
-		m_flVolumetricIntensity = 1.0f;
-
-		m_bOrtho = false;
-		m_fOrthoLeft = -1.0f;
-		m_fOrthoRight = 1.0f;
-		m_fOrthoTop = -1.0f;
-		m_fOrthoBottom = 1.0f;
-
-		m_fBrightnessScale = 1.0f;
-		m_pSpotlightTexture = NULL;
-		m_pProjectedMaterial = NULL;
-		m_bShareBetweenSplitscreenPlayers = false;
-	}
-
-	Vector m_vecLightOrigin;
-	Quaternion m_quatOrientation;
-	float m_NearZ;
-	float m_FarZ;
-	float m_fHorizontalFOVDegrees;
-	float m_fVerticalFOVDegrees;
-	bool  m_bOrtho;
-	float m_fOrthoLeft;
-	float m_fOrthoRight;
-	float m_fOrthoTop;
-	float m_fOrthoBottom;
-	float m_fQuadraticAtten;
-	float m_fLinearAtten;
-	float m_fConstantAtten;
-	float m_FarZAtten;
-	float m_Color[4];
-	float m_fBrightnessScale;
-	ITexture* m_pSpotlightTexture;
-	IMaterial* m_pProjectedMaterial;
-	int m_nSpotlightTextureFrame;
-
-	bool  m_bEnableShadows;
-	bool  m_bDrawShadowFrustum;
-	float m_flShadowMapResolution;
-	float m_flShadowFilterSize;
-	float m_flShadowSlopeScaleDepthBias;
-	float m_flShadowDepthBias;
-	float m_flShadowJitterSeed;
-	float m_flShadowAtten;
-	float m_flAmbientOcclusion;
-	int   m_nShadowQuality;
-	bool  m_bShadowHighRes;
-
-	float m_flProjectionSize;
-	float m_flProjectionRotation;
-
-	bool m_bUberlight;
-	UberlightState_t m_uberlightState;
-
-	bool m_bVolumetric;
-	float m_flNoiseStrength;
-	float m_flFlashlightTime;
-	int m_nNumPlanes;
-	float m_flPlaneOffset;
-	float m_flVolumetricIntensity;
-	bool m_bShareBetweenSplitscreenPlayers;	          
-
-	bool DoScissor() const { return m_bScissor; }
-	int GetLeft()	 const { return m_nLeft; }
-	int GetTop()	 const { return m_nTop; }
-	int GetRight()	 const { return m_nRight; }
-	int GetBottom()	 const { return m_nBottom; }
-
-private:
-
-	friend class CShadowMgr;
-
-	bool m_bScissor;
-	int m_nLeft;
-	int m_nTop;
-	int m_nRight;
-	int m_nBottom;
-
-	IMPLEMENT_OPERATOR_EQUAL(FlashlightState_t);
-};
-
-#define MAX_CASCADED_SHADOW_MAPPING_CASCADES (4)
-
-#define CASCADED_SHADOW_MAPPING_CONSTANT_BUFFER_SIZE (26)
-
-struct CascadedShadowMappingState_t
-{
-	uint m_nNumCascades;
-	bool m_bIsRenderingViewModels;
-
-	Vector4D m_vLightColor;
-
-	Vector m_vLightDir;
-	float m_flPadding1;
-
-	struct
-	{
-		float m_flInvShadowTextureWidth;
-		float m_flInvShadowTextureHeight;
-		float m_flHalfInvShadowTextureWidth;
-		float m_flHalfInvShadowTextureHeight;
-	} m_TexParams;
-
-	struct
-	{
-		float m_flShadowTextureWidth;
-		float m_flShadowTextureHeight;
-		float m_flSplitLerpFactorBase;
-		float m_flSplitLerpFactorInvRange;
-	} m_TexParams2;
-
-	struct
-	{
-		float m_flDistLerpFactorBase;
-		float m_flDistLerpFactorInvRange;
-		float m_flUnused0;
-		float m_flUnused1;
-	} m_TexParams3;
-
-	VMatrix m_matWorldToShadowTexMatrices[MAX_CASCADED_SHADOW_MAPPING_CASCADES];
-	Vector4D m_vCascadeAtlasUVOffsets[MAX_CASCADED_SHADOW_MAPPING_CASCADES];
-
-	Vector4D m_vCamPosition;
-};
-
-enum MaterialInitFlags_t
-{
-	MATERIAL_INIT_ALLOCATE_FULLSCREEN_TEXTURE = 0x2,
-	MATERIAL_INIT_REFERENCE_RASTERIZER = 0x4,
-};
-
-enum MaterialRenderTargetDepth_t
-{
-	MATERIAL_RT_DEPTH_SHARED = 0x0,
-	MATERIAL_RT_DEPTH_SEPARATE = 0x1,
-	MATERIAL_RT_DEPTH_NONE = 0x2,
-	MATERIAL_RT_DEPTH_ONLY = 0x3,
-};
-
-enum RestoreChangeFlags_t
-{
-	MATERIAL_RESTORE_VERTEX_FORMAT_CHANGED = 0x1,
-	MATERIAL_RESTORE_RELEASE_MANAGED_RESOURCES = 0x2,
-};
-
-
-enum RenderTargetSizeMode_t
-{
-	RT_SIZE_NO_CHANGE = 0,			           
-	RT_SIZE_DEFAULT = 1,				                 
-	RT_SIZE_PICMIP = 2,				         
-	RT_SIZE_HDR = 3,					   
-	RT_SIZE_FULL_FRAME_BUFFER = 4,	                
-	RT_SIZE_OFFSCREEN = 5,			        
-	RT_SIZE_FULL_FRAME_BUFFER_ROUNDED_UP = 6                    
-};
-
-
-enum AntiAliasingHintEnum_t
-{
-	AA_HINT_MESHES,
-	AA_HINT_TEXT,
-	AA_HINT_DEBUG_TEXT,
-	AA_HINT_HEAVY_UI_OVERLAY,
-	AA_HINT_ALIASING_PUSH,
-	AA_HINT_ALIASING_POP,
-	AA_HINT_POSTPROCESS,
-	AA_HINT_MOVIE,
-	AA_HINT_MENU
-};
-
-typedef void (*MaterialBufferReleaseFunc_t)(int nChangeFlags);	  
-typedef void (*MaterialBufferRestoreFunc_t)(int nChangeFlags);	  
-typedef void (*ModeChangeCallbackFunc_t)(void);
-typedef void (*EndFrameCleanupFunc_t)(void);
-typedef void (*OnLevelShutdownFunc_t)(void* pUserData);
-typedef bool (*EndFramePriorToNextContextFunc_t)(void);
-
-typedef unsigned short MaterialHandle_t;
-
-DECLARE_POINTER_HANDLE(OcclusionQueryObjectHandle_t);
-#define INVALID_OCCLUSION_QUERY_OBJECT_HANDLE ( (OcclusionQueryObjectHandle_t)0 )
-
-class IMaterialProxyFactory;
-class ITexture;
-class IMaterialSystemHardwareConfig;
-class CShadowMgr;
-
-DECLARE_POINTER_HANDLE(MaterialLock_t);
-
-struct MaterialTextureInfo_t
-{
-	int iExcludeInformation;
-};
-
-struct ApplicationPerformanceCountersInfo_t
-{
-	float msMain;
-	float msMST;
-	float msGPU;
-	float msFlip;
-	float msTotal;
-};
-
-struct ApplicationInstantCountersInfo_t
-{
-	uint m_nCpuActivityMask;
-	uint m_nDeferredWordsAllocated;
-};
-
-
-struct WorldListIndicesInfo_t
-{
-	uint m_nTotalIndices;         
-	uint m_nMaxBatchIndices;          
-};
-
-struct AspectRatioInfo_t
-{
-	bool m_bIsWidescreen;
-	bool m_bIsHidef;
-	float m_flFrameBufferAspectRatio;        
-	float m_flPhysicalAspectRatio;           
-	float m_flFrameBuffertoPhysicalScalar;    
-	float m_flPhysicalToFrameBufferScalar;    
-	bool m_bInitialized;
-
-	AspectRatioInfo_t() :
-		m_bIsWidescreen(false),
-		m_bIsHidef(false),
-		m_flFrameBufferAspectRatio(4.0f / 3.0f),
-		m_flPhysicalAspectRatio(4.0f / 3.0f),
-		m_flFrameBuffertoPhysicalScalar(1.0f),
-		m_flPhysicalToFrameBufferScalar(1.0f),
-		m_bInitialized(false)
-	{
-	}
-};
-
-abstract_class IMaterialSystem : public IAppSystem
-{
-public:
-
-	virtual bool Connect(CreateInterfaceFn factory) = 0;								
-	virtual void Disconnect() = 0;								
-	virtual void* QueryInterface(const char* pInterfaceName) = 0;								
-	virtual InitReturnVal_t Init() = 0;								
-	virtual void Shutdown() = 0;								
-
-	virtual CreateInterfaceFn	Init(char const* pShaderAPIDLL,								
-		IMaterialProxyFactory* pMaterialProxyFactory,
-		CreateInterfaceFn fileSystemFactory,
-		CreateInterfaceFn cvarFactory = NULL) = 0;
-
-	virtual void				SetShaderAPI(char const* pShaderAPIDLL) = 0;								
-
-	virtual void				SetAdapter(int nAdapter, int nFlags) = 0;								
-
-	virtual void				ModInit() = 0;								
-	virtual void				ModShutdown() = 0;								
-
-	virtual void				SetThreadMode(MaterialThreadMode_t mode, int nServiceThread = -1) = 0;								
-	virtual MaterialThreadMode_t GetThreadMode() = 0;								
-	virtual bool				IsRenderThreadSafe() = 0;								
-	virtual void				ExecuteQueued() = 0;								
-	#ifdef _CERT
-		static
-	#else
-		virtual
-	#endif
-				void            OnDebugEvent(const char* pEvent = "") {}								
-
-		virtual IMaterialSystemHardwareConfig* GetHardwareConfig(const char* pVersion, int* returnCode) = 0;								
-
-
-		virtual bool				UpdateConfig(bool bForceUpdate) = 0;								
-
-		virtual bool				OverrideConfig(const MaterialSystem_Config_t& config, bool bForceUpdate) = 0;								
-
-		virtual const MaterialSystem_Config_t& GetCurrentConfigForVideoCard() const = 0;								
-
-		virtual bool				GetRecommendedConfigurationInfo(int nDXLevel, KeyValues* pKeyValues) = 0;								
-
-
-		virtual int					GetDisplayAdapterCount() const = 0;								
-
-		virtual int					GetCurrentAdapter() const = 0;								
-
-		virtual void				GetDisplayAdapterInfo(int adapter, MaterialAdapterInfo_t& info) const = 0;								
-
-		virtual int					GetModeCount(int adapter) const = 0;								
-
-		virtual void				GetModeInfo(int adapter, int mode, MaterialVideoMode_t& info) const = 0;								
-
-		virtual void				AddModeChangeCallBack(ModeChangeCallbackFunc_t func) = 0;								
-
-		virtual void				GetDisplayMode(MaterialVideoMode_t& mode) const = 0;								
-
-		virtual bool				SetMode(void* hwnd, const MaterialSystem_Config_t& config) = 0;								
-
-		virtual bool				SupportsMSAAMode(int nMSAAMode) = 0;								
-
-		virtual const MaterialSystemHardwareIdentifier_t& GetVideoCardIdentifier(void) const = 0;								
-
-		virtual void				SpewDriverInfo() const = 0;								
-
-		virtual void				GetBackBufferDimensions(int& width, int& height) const = 0;								
-		virtual ImageFormat			GetBackBufferFormat() const = 0;								
-		virtual const AspectRatioInfo_t& GetAspectRatioInfo() const = 0;								
-
-		virtual bool				SupportsHDRMode(HDRType_t nHDRModede) = 0;								
-
-
-		virtual bool				AddView(void* hwnd) = 0;								
-		virtual void				RemoveView(void* hwnd) = 0;								
-
-		virtual void				SetView(void* hwnd) = 0;								
-
-
-		virtual void				BeginFrame(float frameTime) = 0;								
-		virtual void				EndFrame() = 0;								
-		virtual void				Flush(bool flushHardware = false) = 0;								
-		virtual uint32				GetCurrentFrameCount() = 0;								
-
-		virtual void				SwapBuffers() = 0;								
-
-		virtual void				EvictManagedResources() = 0;								
-
-		virtual void				ReleaseResources(void) = 0;								
-		virtual void				ReacquireResources(void) = 0;								
-
-
-		virtual void				AddReleaseFunc(MaterialBufferReleaseFunc_t func) = 0;								
-		virtual void				RemoveReleaseFunc(MaterialBufferReleaseFunc_t func) = 0;								
-
-		virtual void				AddRestoreFunc(MaterialBufferRestoreFunc_t func) = 0;								
-		virtual void				RemoveRestoreFunc(MaterialBufferRestoreFunc_t func) = 0;								
-
-		virtual void				AddEndFrameCleanupFunc(EndFrameCleanupFunc_t func) = 0;								
-		virtual void				RemoveEndFrameCleanupFunc(EndFrameCleanupFunc_t func) = 0;								
-
-		virtual void				OnLevelShutdown() = 0;								
-		virtual bool				AddOnLevelShutdownFunc(OnLevelShutdownFunc_t func, void* pUserData) = 0;								
-		virtual bool				RemoveOnLevelShutdownFunc(OnLevelShutdownFunc_t func, void* pUserData) = 0;								
-
-		virtual void				OnLevelLoadingComplete() = 0;								
-
-		virtual void				ResetTempHWMemory(bool bExitingLevel = false) = 0;								
-
-		virtual void				HandleDeviceLost() = 0;								
-
-
-		virtual int					ShaderCount() const = 0;								
-		virtual int					GetShaders(int nFirstShader, int nMaxCount, IShader** ppShaderList) const = 0;								
-
-		virtual int					ShaderFlagCount() const = 0;								
-		virtual const char* ShaderFlagName(int nIndex) const = 0;								
-
-		virtual void				GetShaderFallback(const char* pShaderName, char* pFallbackShader, int nFallbackLength) = 0;								
-
-
-		virtual IMaterialProxyFactory* GetMaterialProxyFactory() = 0;								
-
-		virtual void				SetMaterialProxyFactory(IMaterialProxyFactory* pFactory) = 0;								
-
-
-		virtual void				EnableEditorMaterials() = 0;								
-		virtual void                EnableGBuffers() = 0;								
-
-		virtual void				SetInStubMode(bool bInStubMode) = 0;								
-
-
-		virtual void				DebugPrintUsedMaterials(const char* pSearchSubString, bool bVerbose) = 0;								
-		virtual void				DebugPrintUsedTextures(void) = 0;								
-
-		virtual void				ToggleSuppressMaterial(char const* pMaterialName) = 0;								
-		virtual void				ToggleDebugMaterial(char const* pMaterialName) = 0;								
-
-
-		virtual bool				UsingFastClipping(void) = 0;								
-
-		virtual int					StencilBufferBits(void) = 0;         								
-
-
-		virtual void				UncacheAllMaterials() = 0;								
-
-		virtual void				UncacheUnusedMaterials(bool bRecomputeStateSnapshots = false) = 0;								
-
-		virtual void				CacheUsedMaterials() = 0;								
-
-		virtual void				ReloadTextures() = 0;								
-
-		virtual void				ReloadMaterials(const char* pSubString = NULL) = 0;								
-
-		virtual IMaterial* CreateMaterial(const char* pMaterialName, KeyValues* pVMTKeyValues) = 0;								
-
-		virtual IMaterial* FindMaterial(char const* pMaterialName, const char* pTextureGroupName, bool complain = true, const char* pComplainPrefix = NULL) = 0;	
-
-		virtual bool				LoadKeyValuesFromVMTFile(KeyValues& vmtKeyValues, const char* pMaterialName, bool bUsesUNCFilename) = 0;						
-
-		virtual MaterialHandle_t	FirstMaterial() const = 0;							
-
-		virtual MaterialHandle_t	NextMaterial(MaterialHandle_t h) const = 0;							
-
-		virtual MaterialHandle_t	InvalidMaterial() const = 0;							
-
-		virtual IMaterial* GetMaterial(MaterialHandle_t h) const = 0;							
-
-		virtual int					GetNumMaterials() const = 0;							
-
-		virtual ITexture* FindTexture(char const* pTextureName, const char* pTextureGroupName, bool complain = true, int nAdditionalCreationFlags = 0) = 0;							
-
-		virtual bool				IsTextureLoaded(char const* pTextureName) const = 0;						
-
-		virtual ITexture* CreateProceduralTexture(const char* pTextureName,						
-			const char* pTextureGroupName,
-			int w,
-			int h,
-			ImageFormat fmt,
-			int nFlags) = 0;
-
-	#if defined( _X360 )
-
-		virtual ITexture* CreateGamerpicTexture(const char* pTextureName,
-			const char* pTextureGroupName,
-			int nFlags) = 0;
-
-		virtual bool				UpdateLocalGamerpicTexture(ITexture* pTexture, DWORD userIndex) = 0;
-
-		virtual bool				UpdateRemoteGamerpicTexture(ITexture* pTexture, XUID xuid) = 0;
-
-	#endif  
-
-		virtual void				BeginRenderTargetAllocation() = 0;						
-		virtual void				EndRenderTargetAllocation() = 0;             						
-
-		virtual ITexture* CreateRenderTargetTexture(int w,						
-			int h,
-			RenderTargetSizeMode_t sizeMode,	           
-			ImageFormat	format,
-			MaterialRenderTargetDepth_t depth = MATERIAL_RT_DEPTH_SHARED) = 0;
-
-		virtual ITexture* CreateNamedRenderTargetTextureEx(const char* pRTName,				         						
-			int w,
-			int h,
-			RenderTargetSizeMode_t sizeMode,	           
-			ImageFormat format,
-			MaterialRenderTargetDepth_t depth = MATERIAL_RT_DEPTH_SHARED,
-			unsigned int textureFlags = TEXTUREFLAGS_CLAMPS | TEXTUREFLAGS_CLAMPT,
-			unsigned int renderTargetFlags = 0) = 0;
-
-		virtual ITexture* CreateNamedRenderTargetTexture(const char* pRTName,						
-			int w,
-			int h,
-			RenderTargetSizeMode_t sizeMode,	           
-			ImageFormat format,
-			MaterialRenderTargetDepth_t depth = MATERIAL_RT_DEPTH_SHARED,
-			bool bClampTexCoords = true,
-			bool bAutoMipMap = false) = 0;
-
-		virtual ITexture* CreateNamedRenderTargetTextureEx2(const char* pRTName,				         						
-			int w,
-			int h,
-			RenderTargetSizeMode_t sizeMode,	           
-			ImageFormat format,
-			MaterialRenderTargetDepth_t depth = MATERIAL_RT_DEPTH_SHARED,
-			unsigned int textureFlags = TEXTUREFLAGS_CLAMPS | TEXTUREFLAGS_CLAMPT,
-			unsigned int renderTargetFlags = 0) = 0;
-
-		virtual void				BeginLightmapAllocation() = 0;						
-		virtual void				EndLightmapAllocation() = 0;						
-
-		virtual void				CleanupLightmaps() = 0;						
-
-		virtual int 				AllocateLightmap(int width, int height,						
-			int offsetIntoLightmapPage[2],
-			IMaterial* pMaterial) = 0;
-		virtual int					AllocateWhiteLightmap(IMaterial* pMaterial) = 0;						
-
-		virtual void				UpdateLightmap(int lightmapPageID, int lightmapSize[2],						
-			int offsetIntoLightmapPage[2],
-			float* pFloatImage, float* pFloatImageBump1,
-			float* pFloatImageBump2, float* pFloatImageBump3) = 0;
-
-		virtual int					GetNumSortIDs() = 0;						
-		virtual void				GetSortInfo(MaterialSystem_SortInfo_t* sortInfoArray) = 0;						
-
-		virtual void				GetLightmapPageSize(int lightmap, int* width, int* height) const = 0;						
-
-		virtual void				ResetMaterialLightmapPageInfo() = 0;						
-
-		virtual bool				IsStereoSupported() = 0;						
-		virtual bool				IsStereoActiveThisFrame() const = 0;						
-		virtual void				NVStereoUpdate() = 0;						
-
-		virtual void				ClearBuffers(bool bClearColor, bool bClearDepth, bool bClearStencil = false) = 0;						
-
-	#if defined( _X360 )
-		virtual void				ListUsedMaterials(void) = 0;
-		virtual HXUIFONT			OpenTrueTypeFont(const char* pFontname, int tall, int style) = 0;
-		virtual void				CloseTrueTypeFont(HXUIFONT hFont) = 0;
-		virtual bool				GetTrueTypeFontMetrics(HXUIFONT hFont, wchar_t wchFirst, wchar_t wchLast, XUIFontMetrics* pFontMetrics, XUICharMetrics* pCharMetrics) = 0;
-		virtual bool				GetTrueTypeGlyphs(HXUIFONT hFont, int numChars, wchar_t* pWch, int* pOffsetX, int* pOffsetY, int* pWidth, int* pHeight, unsigned char* pRGBA, int* pRGBAOffset) = 0;
-		virtual void				PersistDisplay() = 0;
-		virtual void* GetD3DDevice() = 0;
-		virtual bool				OwnGPUResources(bool bEnable) = 0;
-	#elif defined(_PS3)
-		virtual void				ListUsedMaterials(void) = 0;
-		virtual HPS3FONT			OpenTrueTypeFont(const char* pFontname, int tall, int style) = 0;
-		virtual void				CloseTrueTypeFont(HPS3FONT hFont) = 0;
-		virtual bool				GetTrueTypeFontMetrics(HPS3FONT hFont, int nFallbackTall, wchar_t wchFirst, wchar_t wchLast, CPS3FontMetrics* pFontMetrics, CPS3CharMetrics* pCharMetrics) = 0;
-		virtual bool				GetTrueTypeGlyphs(HPS3FONT hFont, int nFallbackTall, int numChars, wchar_t* pWch, int* pOffsetX, int* pOffsetY, int* pWidth, int* pHeight, unsigned char* pRGBA, int* pRGBAOffset) = 0;
-
-		virtual bool PS3InitFontLibrary(unsigned fontFileCacheSizeInBytes, unsigned maxNumFonts) { return false; };
-		virtual void PS3DumpFontLibrary() { return; }
-		virtual void* PS3GetFontLibPtr() { return NULL; }
-	#if 0               
-	  struct PS3FontLibraryRAII
-	  {
-		  PS3FontLibraryRAII(IMaterialSystem* imatsys,
-			  unsigned int fontFileCacheSizeInBytes = 256 * 1024, unsigned int maxNumFonts = 64) : m_pmatsys(imatsys)
-			  {
-   imatsys->PS3InitFontLibrary(fontFileCacheSizeInBytes, maxNumFonts);
-}
-~PS3FontLibraryRAII()
-	{
-m_pmatsys->PS3DumpFontLibrary();
-}
-
-IMaterialSystem* m_pmatsys;
-};
-#endif
-	  enum VRAMScreenShotInfoColorFormat_t
-	  {
-   kX8R8G8B8 = 0, kX8B8G8R8 = 1, kR16G16B16X16 = 2
-};
-virtual void TransmitScreenshotToVX() = 0;
-
-virtual void CompactRsxLocalMemory(char const* szReason) = 0;
-virtual void SetFlipPresentFrequency(int nNumVBlanks) = 0;
-#endif   
-
-	virtual void SpinPresent(uint nFrames) = 0;						
-
-	virtual IMatRenderContext* GetRenderContext() = 0;						
-
-	virtual void				BeginUpdateLightmaps(void) = 0;						
-	virtual void				EndUpdateLightmaps(void) = 0;						
-
-	virtual MaterialLock_t		Lock() = 0;						
-	virtual void				Unlock(MaterialLock_t) = 0;
-
-	virtual IMatRenderContext* CreateRenderContext(MaterialContextType_t type) = 0;
-
-	virtual IMatRenderContext* SetRenderContext(IMatRenderContext*) = 0;
-
-	virtual bool				SupportsCSAAMode(int nNumSamples, int nQualityLevel) = 0;
-
-	virtual void				RemoveModeChangeCallBack(ModeChangeCallbackFunc_t func) = 0;
-
-	virtual IMaterial* FindProceduralMaterial(const char* pMaterialName, const char* pTextureGroupName, KeyValues* pVMTKeyValues = NULL) = 0;
-
-	virtual void				AddTextureAlias(const char* pAlias, const char* pRealName) = 0;
-	virtual void				RemoveTextureAlias(const char* pAlias) = 0;
-
-	virtual int					AllocateDynamicLightmap(int lightmapSize[2], int* pOutOffsetIntoPage, int frameID) = 0;
-
-	virtual void				SetExcludedTextures(const char* pScriptName, bool bUsingWeaponModelCache) = 0;
-	virtual void				UpdateExcludedTextures(void) = 0;
-	virtual void				ClearForceExcludes(void) = 0;
-
-	virtual bool				IsInFrame() const = 0;
-
-	virtual void				CompactMemory() = 0;
-
-	virtual void				GetGPUMemoryStats(GPUMemoryStats& stats) = 0;
-
-	virtual void ReloadFilesInList(IFileList* pFilesToReload) = 0;
-
-	virtual bool				GetTextureInformation(char const* szTextureName, MaterialTextureInfo_t& info) const = 0;
-
-	virtual void FinishRenderTargetAllocation(void) = 0;
-
-	virtual void ReEnableRenderTargetAllocation_IRealizeIfICallThisAllTexturesWillBeUnloadedAndLoadTimeWillSufferHorribly(void) = 0;
-	virtual	bool				AllowThreading(bool bAllow, int nServiceThread) = 0;
-
-	virtual bool				GetRecommendedVideoConfig(KeyValues* pKeyValues) = 0;
-
-	virtual IClientMaterialSystem* GetClientMaterialSystemInterface() = 0;
-
-	virtual bool				CanDownloadTextures() const = 0;
-	virtual int					GetNumLightmapPages() const = 0;
-
-	virtual void RegisterPaintmapDataManager(IPaintmapDataManager* pDataManager) = 0;                    
-	virtual void BeginUpdatePaintmaps(void) = 0;
-	virtual void EndUpdatePaintmaps(void) = 0;
-	virtual void UpdatePaintmap(int paintmap, BYTE* pPaintData, int numRects, Rect_t* pRects) = 0;
-
-	virtual ITexture* CreateNamedMultiRenderTargetTexture(const char* pRTName,				         
-		int w,
-		int h,
-		RenderTargetSizeMode_t sizeMode,	           
-		ImageFormat format,
-		MaterialRenderTargetDepth_t depth = MATERIAL_RT_DEPTH_SHARED,
-		unsigned int textureFlags = TEXTUREFLAGS_CLAMPS | TEXTUREFLAGS_CLAMPT,
-		unsigned int renderTargetFlags = 0) = 0;
-
-	virtual void				RefreshFrontBufferNonInteractive() = 0;
-
-	virtual uint32 GetFrameTimestamps(ApplicationPerformanceCountersInfo_t& apci, ApplicationInstantCountersInfo_t& aici) = 0;
-
-#if defined( DX_TO_GL_ABSTRACTION ) && !defined( _GAMECONSOLE )
-	virtual void				DoStartupShaderPreloading(void) = 0;
-#endif	
-
-	virtual void				AddEndFramePriorToNextContextFunc(EndFramePriorToNextContextFunc_t func) = 0;
-	virtual void				RemoveEndFramePriorToNextContextFunc(EndFramePriorToNextContextFunc_t func) = 0;
-
-	virtual ICustomMaterialManager* GetCustomMaterialManager() = 0;
-	virtual ICompositeTextureGenerator* GetCompositeTextureGenerator() = 0;
-};
-
-
-abstract_class IMatRenderContext : public IRefCounted
-{
-public:
-	virtual void				BeginRender() = 0;
-	virtual void				EndRender() = 0;
-
-	virtual void				Flush(bool flushHardware = false) = 0;
-
-	virtual void				BindLocalCubemap(ITexture* pTexture) = 0;
-
-	virtual void				SetRenderTarget(ITexture* pTexture) = 0;
-	virtual ITexture* GetRenderTarget(void) = 0;
-
-	virtual void				GetRenderTargetDimensions(int& width, int& height) const = 0;
-
-	virtual void				Bind(IMaterial* material, void* proxyData = 0) = 0;
-	virtual void				BindLightmapPage(int lightmapPageID) = 0;
-
-	virtual void				DepthRange(float zNear, float zFar) = 0;
-
-	virtual void				ClearBuffers(bool bClearColor, bool bClearDepth, bool bClearStencil = false) = 0;
-
-	virtual void				ReadPixels(int x, int y, int width, int height, unsigned char* data, ImageFormat dstFormat, ITexture* pRenderTargetTexture = NULL) = 0;
-	virtual void				ReadPixelsAsync(int x, int y, int width, int height, unsigned char* data, ImageFormat dstFormat, ITexture* pRenderTargetTexture = NULL, CThreadEvent* pPixelsReadEvent = NULL) = 0;
-	virtual void				ReadPixelsAsyncGetResult(int x, int y, int width, int height, unsigned char* data, ImageFormat dstFormat, CThreadEvent* pGetResultEvent = NULL) = 0;
-
-	virtual void				SetLightingState(const MaterialLightingState_t& state) = 0;
-	virtual void				SetLights(int nCount, const LightDesc_t* pLights) = 0;
-
-	virtual void				SetAmbientLightCube(Vector4D cube[6]) = 0;
-
-	virtual void				CopyRenderTargetToTexture(ITexture* pTexture) = 0;
-
-	virtual void				SetFrameBufferCopyTexture(ITexture* pTexture, int textureIndex = 0) = 0;
-	virtual ITexture* GetFrameBufferCopyTexture(int textureIndex) = 0;
-
-	virtual void				MatrixMode(MaterialMatrixMode_t matrixMode) = 0;
-	virtual void				PushMatrix(void) = 0;
-	virtual void				PopMatrix(void) = 0;
-	virtual void				LoadMatrix(VMatrix const& matrix) = 0;
-	virtual void				LoadMatrix(matrix3x4_t const& matrix) = 0;
-	virtual void				MultMatrix(VMatrix const& matrix) = 0;
-	virtual void				MultMatrix(matrix3x4_t const& matrix) = 0;
-	virtual void				MultMatrixLocal(VMatrix const& matrix) = 0;
-	virtual void				MultMatrixLocal(matrix3x4_t const& matrix) = 0;
-	virtual void				GetMatrix(MaterialMatrixMode_t matrixMode, VMatrix* matrix) = 0;
-	virtual void				GetMatrix(MaterialMatrixMode_t matrixMode, matrix3x4_t* matrix) = 0;
-	virtual void				LoadIdentity(void) = 0;
-	virtual void				Ortho(double left, double top, double right, double bottom, double zNear, double zFar) = 0;
-	virtual void				PerspectiveX(double fovx, double aspect, double zNear, double zFar) = 0;
-	virtual void				PickMatrix(int x, int y, int width, int height) = 0;
-	virtual void				Rotate(float angle, float x, float y, float z) = 0;
-	virtual void				Translate(float x, float y, float z) = 0;
-	virtual void				Scale(float x, float y, float z) = 0;
-	virtual void				Viewport(int x, int y, int width, int height) = 0;
-	virtual void				GetViewport(int& x, int& y, int& width, int& height) const = 0;
-
-	virtual void				CullMode(MaterialCullMode_t cullMode) = 0;
-	virtual void				FlipCullMode(void) = 0;              
-
-	virtual void				BeginGeneratingCSMs() = 0;
-	virtual void				EndGeneratingCSMs() = 0;
-	virtual void				PerpareForCascadeDraw(int cascade, float fShadowSlopeScaleDepthBias, float fShadowDepthBias) = 0;
-
-	virtual void				SetHeightClipMode(MaterialHeightClipMode_t nHeightClipMode) = 0;
-	virtual void				SetHeightClipZ(float z) = 0;
-
-	virtual void				FogMode(MaterialFogMode_t fogMode) = 0;
-	virtual void				FogStart(float fStart) = 0;
-	virtual void				FogEnd(float fEnd) = 0;
-	virtual void				SetFogZ(float fogZ) = 0;
-	virtual MaterialFogMode_t	GetFogMode(void) = 0;
-
-	virtual void				FogColor3f(float r, float g, float b) = 0;
-	virtual void				FogColor3fv(float const* rgb) = 0;
-	virtual void				FogColor3ub(unsigned char r, unsigned char g, unsigned char b) = 0;
-	virtual void				FogColor3ubv(unsigned char const* rgb) = 0;
-
-	virtual void				GetFogColor(unsigned char* rgb) = 0;
-
-	virtual void				SetNumBoneWeights(int numBones) = 0;
-
-	virtual IMesh* CreateStaticMesh(VertexFormat_t fmt, const char* pTextureBudgetGroup, IMaterial* pMaterial = NULL, VertexStreamSpec_t* pStreamSpec = NULL) = 0;
-	virtual void DestroyStaticMesh(IMesh* mesh) = 0;
-
-	virtual IMesh* GetDynamicMesh(
-		bool buffered = true,
-		IMesh* pVertexOverride = 0,
-		IMesh* pIndexOverride = 0,
-		IMaterial* pAutoBind = 0) = 0;
-
-	virtual IVertexBuffer* CreateStaticVertexBuffer(VertexFormat_t fmt, int nVertexCount, const char* pTextureBudgetGroup) = 0;
-	virtual IIndexBuffer* CreateStaticIndexBuffer(MaterialIndexFormat_t fmt, int nIndexCount, const char* pTextureBudgetGroup) = 0;
-	virtual void DestroyVertexBuffer(IVertexBuffer*) = 0;
-	virtual void DestroyIndexBuffer(IIndexBuffer*) = 0;
-	virtual IVertexBuffer* GetDynamicVertexBuffer(int streamID, VertexFormat_t vertexFormat, bool bBuffered = true) = 0;
-	virtual IIndexBuffer* GetDynamicIndexBuffer() = 0;
-	virtual void BindVertexBuffer(int streamID, IVertexBuffer* pVertexBuffer, int nOffsetInBytes, int nFirstVertex, int nVertexCount, VertexFormat_t fmt, int nRepetitions = 1) = 0;
-	virtual void BindIndexBuffer(IIndexBuffer* pIndexBuffer, int nOffsetInBytes) = 0;
-	virtual void Draw(MaterialPrimitiveType_t primitiveType, int firstIndex, int numIndices) = 0;
-	virtual int  SelectionMode(bool selectionMode) = 0;
-	virtual void SelectionBuffer(unsigned int* pBuffer, int size) = 0;
-	virtual void ClearSelectionNames() = 0;
-	virtual void LoadSelectionName(int name) = 0;
-	virtual void PushSelectionName(int name) = 0;
-	virtual void PopSelectionName() = 0;
-
-	virtual void		ClearColor3ub(unsigned char r, unsigned char g, unsigned char b) = 0;
-	virtual void		ClearColor4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a) = 0;
-
-	virtual void	OverrideDepthEnable(bool bEnable, bool bDepthWriteEnable, bool bDepthTestEnable = true) = 0;
-
-	virtual void	DrawScreenSpaceQuad(IMaterial* pMaterial) = 0;
-
-	virtual void	SyncToken(const char* pToken) = 0;
-
-	virtual float	ComputePixelWidthOfSphere(const Vector& origin, float flRadius) = 0;
-
-	virtual OcclusionQueryObjectHandle_t CreateOcclusionQueryObject(void) = 0;
-	virtual void DestroyOcclusionQueryObject(OcclusionQueryObjectHandle_t) = 0;
-
-	virtual void BeginOcclusionQueryDrawing(OcclusionQueryObjectHandle_t) = 0;
-	virtual void EndOcclusionQueryDrawing(OcclusionQueryObjectHandle_t) = 0;
-
-	virtual int OcclusionQuery_GetNumPixelsRendered(OcclusionQueryObjectHandle_t) = 0;
-
-	virtual void SetFlashlightMode(bool bEnable) = 0;
-
-	virtual void SetFlashlightState(const FlashlightState_t& state, const VMatrix& worldToTexture) = 0;
-
-	virtual bool IsCascadedShadowMapping() const = 0;
-	virtual void SetCascadedShadowMapping(bool bEnable) = 0;
-	virtual void SetCascadedShadowMappingState(const CascadedShadowMappingState_t& state, ITexture* pDepthTextureAtlas) = 0;
-
-	virtual MaterialHeightClipMode_t GetHeightClipMode() = 0;
-
-	virtual float	ComputePixelDiameterOfSphere(const Vector& vecAbsOrigin, float flRadius) = 0;
-
-	virtual void	EnableUserClipTransformOverride(bool bEnable) = 0;
-	virtual void	UserClipTransform(const VMatrix& worldToView) = 0;
-
-	virtual bool GetFlashlightMode() const = 0;
-
-	virtual bool IsCullingEnabledForSinglePassFlashlight() const = 0;
-	virtual void EnableCullingForSinglePassFlashlight(bool bEnable) = 0;
-
-	virtual void ResetOcclusionQueryObject(OcclusionQueryObjectHandle_t) = 0;
-
-	virtual IMorph* CreateMorph(MorphFormat_t format, const char* pDebugName) = 0;
-	virtual void DestroyMorph(IMorph* pMorph) = 0;
-
-	virtual void BindMorph(IMorph* pMorph) = 0;
-
-	virtual void SetFlexWeights(int nFirstWeight, int nCount, const MorphWeight_t* pWeights) = 0;
-
-	virtual void* LockRenderData(int nSizeInBytes) = 0;
-	virtual void			UnlockRenderData(void* pData) = 0;
-
-	template< class E > E* LockRenderDataTyped(int nCount, const E* pSrcData = NULL);
-
-	virtual void			AddRefRenderData() = 0;
-	virtual void			ReleaseRenderData() = 0;
-
-	virtual bool			IsRenderData(const void* pData) const = 0;
-
-	virtual void ReadPixelsAndStretch(Rect_t* pSrcRect, Rect_t* pDstRect, unsigned char* pBuffer, ImageFormat dstFormat, int nDstStride) = 0;
-
-	virtual void GetWindowSize(int& width, int& height) const = 0;
-
-	virtual void DrawScreenSpaceRectangle(
-		IMaterial* pMaterial,
-		int destx, int desty,
-		int width, int height,
-		float src_texture_x0, float src_texture_y0,			       
-		float src_texture_x1, float src_texture_y1,			       
-		int src_texture_width, int src_texture_height,		   
-		void* pClientRenderable = NULL,
-		int nXDice = 1,
-		int nYDice = 1) = 0;
-
-	virtual void LoadBoneMatrix(int boneIndex, const matrix3x4_t& matrix) = 0;
-
-	virtual void PushRenderTargetAndViewport() = 0;
-
-	virtual void PushRenderTargetAndViewport(ITexture* pTexture) = 0;
-
-	virtual void PushRenderTargetAndViewport(ITexture* pTexture, int nViewX, int nViewY, int nViewW, int nViewH) = 0;
-
-	virtual void PushRenderTargetAndViewport(ITexture* pTexture, ITexture* pDepthTexture, int nViewX, int nViewY, int nViewW, int nViewH) = 0;
-
-	virtual void PopRenderTargetAndViewport(void) = 0;
-
-	virtual void BindLightmapTexture(ITexture* pLightmapTexture) = 0;
-
-	virtual void CopyRenderTargetToTextureEx(ITexture* pTexture, int nRenderTargetID, Rect_t* pSrcRect, Rect_t* pDstRect = NULL) = 0;
-	virtual void CopyTextureToRenderTargetEx(int nRenderTargetID, ITexture* pTexture, Rect_t* pSrcRect, Rect_t* pDstRect = NULL) = 0;
-
-	virtual void PerspectiveOffCenterX(double fovx, double aspect, double zNear, double zFar, double bottom, double top, double left, double right) = 0;
-
-	virtual void SetFloatRenderingParameter(int parm_number, float value) = 0;
-	virtual void SetIntRenderingParameter(int parm_number, int value) = 0;
-	virtual void SetVectorRenderingParameter(int parm_number, Vector const& value) = 0;
-
-	virtual void SetStencilState(const ShaderStencilState_t& state) = 0;
-	virtual void ClearStencilBufferRectangle(int xmin, int ymin, int xmax, int ymax,int value) = 0;
-
-	virtual void SetRenderTargetEx(int nRenderTargetID, ITexture* pTexture) = 0;
-
-	virtual void PushCustomClipPlane(const float* pPlane) = 0;
-	virtual void PopCustomClipPlane(void) = 0;
-
-	virtual void GetMaxToRender(IMesh* pMesh, bool bMaxUntilFlush, int* pMaxVerts, int* pMaxIndices) = 0;
-
-	virtual int GetMaxVerticesToRender(IMaterial* pMaterial) = 0;
-	virtual int GetMaxIndicesToRender() = 0;
-	virtual void DisableAllLocalLights() = 0;
-	virtual int CompareMaterialCombos(IMaterial* pMaterial1, IMaterial* pMaterial2, int lightMapID1, int lightMapID2) = 0;
-
-	virtual IMesh* GetFlexMesh() = 0;
-
-	virtual void SetFlashlightStateEx(const FlashlightState_t& state, const VMatrix& worldToTexture, ITexture* pFlashlightDepthTexture) = 0;
-
-	virtual ITexture* GetLocalCubemap() = 0;
-
-	virtual void ClearBuffersObeyStencil(bool bClearColor, bool bClearDepth) = 0;
-
-	virtual bool EnableClipping(bool bEnable) = 0;
-
-	virtual void GetFogDistances(float* fStart, float* fEnd, float* fFogZ) = 0;
-
-	virtual void BeginPIXEvent(unsigned long color, const char* szName) = 0;
-	virtual void EndPIXEvent() = 0;
-	virtual void SetPIXMarker(unsigned long color, const char* szName) = 0;
-
-	virtual void BeginBatch(IMesh* pIndices) = 0;
-	virtual void BindBatch(IMesh* pVertices, IMaterial* pAutoBind = NULL) = 0;
-	virtual void DrawBatch(MaterialPrimitiveType_t primType, int firstIndex, int numIndices) = 0;
-	virtual void EndBatch() = 0;
-
-	virtual ICallQueue* GetCallQueue() = 0;
-
-	virtual void GetWorldSpaceCameraPosition(Vector* pCameraPos) = 0;
-	virtual void GetWorldSpaceCameraVectors(Vector* pVecForward, Vector* pVecRight, Vector* pVecUp) = 0;
-
-	virtual void				SetToneMappingScaleLinear(const Vector& scale) = 0;
-	virtual Vector				GetToneMappingScaleLinear(void) = 0;
-
-	virtual void				SetShadowDepthBiasFactors(float fSlopeScaleDepthBias, float fDepthBias) = 0;
-
-	virtual void				PerformFullScreenStencilOperation(void) = 0;
-
-	virtual void				SetLightingOrigin(Vector vLightingOrigin) = 0;
-
-	virtual void				PushScissorRect(const int nLeft, const int nTop, const int nRight, const int nBottom) = 0;
-	virtual void				PopScissorRect() = 0;
-
-	virtual void				BeginMorphAccumulation() = 0;
-	virtual void				EndMorphAccumulation() = 0;
-	virtual void				AccumulateMorph(IMorph* pMorph, int nMorphCount, const MorphWeight_t* pWeights) = 0;
-
-	virtual void				PushDeformation(DeformationBase_t const* Deformation) = 0;
-	virtual void				PopDeformation() = 0;
-	virtual int					GetNumActiveDeformations() const = 0;
-
-	virtual bool				GetMorphAccumulatorTexCoord(Vector2D* pTexCoord, IMorph* pMorph, int nVertex) = 0;
-
-	virtual IMesh* GetDynamicMeshEx(VertexFormat_t vertexFormat, bool bBuffered = true,
-		IMesh* pVertexOverride = 0,	IMesh* pIndexOverride = 0, IMaterial* pAutoBind = 0) = 0;
-
-	virtual void				FogMaxDensity(float flMaxDensity) = 0;
-
-#if defined( _X360 )
-	virtual void				PushVertexShaderGPRAllocation(int iVertexShaderCount = 64) = 0;
-	virtual void				PopVertexShaderGPRAllocation(void) = 0;
-
-	virtual void				FlushHiStencil() = 0;
-
-#endif
-
-#if defined( _GAMECONSOLE )
-	virtual void                BeginConsoleZPass(const WorldListIndicesInfo_t& indicesInfo) = 0;
-	virtual void                BeginConsoleZPass2(int nSlack) = 0;
-	virtual void				EndConsoleZPass() = 0;
-#endif
-
-#if defined( _PS3 )
-	virtual void				FlushTextureCache() = 0;
-#endif
-	virtual void                AntiAliasingHint(int nHint) = 0;
-
-	virtual IMaterial* GetCurrentMaterial() = 0;
-	virtual int  GetCurrentNumBones() const = 0;
-	virtual void* GetCurrentProxy() = 0;
-
-	virtual void EnableColorCorrection(bool bEnable) = 0;
-	virtual ColorCorrectionHandle_t AddLookup(const char* pName) = 0;
-	virtual bool RemoveLookup(ColorCorrectionHandle_t handle) = 0;
-	virtual void LockLookup(ColorCorrectionHandle_t handle) = 0;
-	virtual void LoadLookup(ColorCorrectionHandle_t handle, const char* pLookupName) = 0;
-	virtual void UnlockLookup(ColorCorrectionHandle_t handle) = 0;
-	virtual void SetLookupWeight(ColorCorrectionHandle_t handle, float flWeight) = 0;
-	virtual void ResetLookupWeights() = 0;
-	virtual void SetResetable(ColorCorrectionHandle_t handle, bool bResetable) = 0;
-
-	virtual void SetFullScreenDepthTextureValidityFlag(bool bIsValid) = 0;
-
-	virtual void SetNonInteractiveLogoTexture(ITexture* pTexture, float flNormalizedX, float flNormalizedY, float flNormalizedW, float flNormalizedH) = 0;
-	virtual void SetNonInteractivePacifierTexture(ITexture* pTexture, float flNormalizedX, float flNormalizedY, float flNormalizedSize) = 0;
-	virtual void SetNonInteractiveTempFullscreenBuffer(ITexture* pTexture, MaterialNonInteractiveMode_t mode) = 0;
-	virtual void EnableNonInteractiveMode(MaterialNonInteractiveMode_t mode) = 0;
-	virtual void RefreshFrontBufferNonInteractive() = 0;
-
-	virtual void FlipCulling(bool bFlipCulling) = 0;
-
-	virtual void SetTextureRenderingParameter(int parm_number, ITexture* pTexture) = 0;
-
-	virtual void EnableSinglePassFlashlightMode(bool bEnable) = 0;
-
-	virtual bool SinglePassFlashlightModeEnabled() const = 0;
-
-	virtual void DrawInstances(int nInstanceCount, const MeshInstanceData_t* pInstance) = 0;
-
-	virtual void OverrideAlphaWriteEnable(bool bOverrideEnable, bool bAlphaWriteEnable) = 0;
-	virtual void OverrideColorWriteEnable(bool bOverrideEnable, bool bColorWriteEnable) = 0;
-
-	virtual void ClearBuffersObeyStencilEx(bool bClearColor, bool bClearAlpha, bool bClearDepth) = 0;
-
-	virtual int GetSubDBufferWidth() = 0;
-	virtual float* LockSubDBuffer(int nNumRows) = 0;
-	virtual void UnlockSubDBuffer() = 0;
-
-	virtual void UpdateGameTime(float flTime) = 0;
-
-	virtual void			PrintfVA(char* fmt, va_list vargs) = 0;
-	virtual void			Printf(char* fmt, ...) = 0;
-	virtual float			Knob(char* knobname, float* setvalue = NULL) = 0;
-
-#if defined( INCLUDE_SCALEFORM )
-	virtual void SetScaleformSlotViewport(int slot, int x, int y, int w, int h) = 0;
-	virtual void RenderScaleformSlot(int slot) = 0;
-	virtual void ForkRenderScaleformSlot(int slot) = 0;
-	virtual void JoinRenderScaleformSlot(int slot) = 0;
-
-	virtual void SetScaleformCursorViewport(int x, int y, int w, int h) = 0;
-	virtual void RenderScaleformCursor() = 0;
-
-	virtual void AdvanceAndRenderScaleformSlot(int slot) = 0;
-	virtual void AdvanceAndRenderScaleformCursor() = 0;
-#endif
-
-	virtual void SetRenderingPaint(bool bEnable) = 0;
-
-	virtual ColorCorrectionHandle_t FindLookup(const char* pName) = 0;
-};
-
-
-template< class E > inline E* IMatRenderContext::LockRenderDataTyped(int nCount, const E* pSrcData)
-{
-	int nSizeInBytes = nCount * sizeof(E);
-	E* pDstData = (E*)LockRenderData(nSizeInBytes);
-	if (pSrcData && pDstData)
-	{
-		memcpy(pDstData, pSrcData, nSizeInBytes);
-	}
-	return pDstData;
-}
-
-
-abstract_class IClientMaterialSystem
-{
-public:
-	virtual unsigned int GetCurrentRecordingEntity() = 0;
-	virtual void PostToolMessage(unsigned int hEntity, KeyValues* pMsg) = 0;
-	virtual void SetMaterialProxyData(void* pProxyData) = 0;
-};
-
-#define VCLIENTMATERIALSYSTEM_INTERFACE_VERSION "VCLIENTMATERIALSYSTEM001"
-
-
-class CMatRenderDataReference
-{
-public:
-	CMatRenderDataReference();
-	CMatRenderDataReference(IMatRenderContext* pRenderContext);
-	~CMatRenderDataReference();
-	void Lock(IMatRenderContext* pRenderContext);
-	void Release();
-
-private:
-	IMatRenderContext* m_pRenderContext;
-};
-
-
-inline CMatRenderDataReference::CMatRenderDataReference()
-{
-	m_pRenderContext = NULL;
-}
-
-inline CMatRenderDataReference::CMatRenderDataReference(IMatRenderContext* pRenderContext)
-{
-	m_pRenderContext = NULL;
-	Lock(pRenderContext);
-}
-
-inline CMatRenderDataReference::~CMatRenderDataReference()
-{
-	Release();
-}
-
-inline void CMatRenderDataReference::Lock(IMatRenderContext* pRenderContext)
-{
-	if (!m_pRenderContext)
-	{
-		m_pRenderContext = pRenderContext;
-		m_pRenderContext->AddRefRenderData();
-	}
-}
-
-inline void CMatRenderDataReference::Release()
-{
-	if (m_pRenderContext)
-	{
-		m_pRenderContext->ReleaseRenderData();
-		m_pRenderContext = NULL;
-	}
-}
-
-
-template< typename E >
-class CMatRenderData
-{
-public:
-	CMatRenderData(IMatRenderContext* pRenderContext);
-	CMatRenderData(IMatRenderContext* pRenderContext, int nCount, const E* pSrcData = NULL);
-	~CMatRenderData();
-	E* Lock(int nCount, const E* pSrcData = NULL);
-	void Release();
-	bool IsValid() const;
-	const E* Base() const;
-	E* Base();
-	const E& operator[](int i) const;
-	E& operator[](int i);
-
-private:
-	IMatRenderContext* m_pRenderContext;
-	E* m_pRenderData;
-	int m_nCount;
-	bool m_bNeedsUnlock;
-};
-
-template< typename E >
-inline CMatRenderData<E>::CMatRenderData(IMatRenderContext* pRenderContext)
-{
-	m_pRenderContext = pRenderContext;
-	m_nCount = 0;
-	m_pRenderData = 0;
-	m_bNeedsUnlock = false;
-}
-
-template< typename E >
-inline CMatRenderData<E>::CMatRenderData(IMatRenderContext* pRenderContext, int nCount, const E* pSrcData)
-{
-	m_pRenderContext = pRenderContext;
-	m_nCount = 0;
-	m_pRenderData = 0;
-	m_bNeedsUnlock = false;
-	Lock(nCount, pSrcData);
-}
-
-template< typename E >
-inline CMatRenderData<E>::~CMatRenderData()
-{
-	Release();
-}
-
-template< typename E >
-inline bool CMatRenderData<E>::IsValid() const
-{
-	return m_pRenderData != NULL;
-}
-
-template< typename E >
-inline E* CMatRenderData<E>::Lock(int nCount, const E* pSrcData)
-{
-	m_nCount = nCount;
-	if (pSrcData && m_pRenderContext->IsRenderData(pSrcData))
-	{
-		m_pRenderData = const_cast<E*>(pSrcData);
-		m_pRenderContext->AddRefRenderData();
-		m_bNeedsUnlock = false;
-		return m_pRenderData;
-	}
-	m_pRenderData = m_pRenderContext->LockRenderDataTyped<E>(nCount, pSrcData);
-	m_bNeedsUnlock = true;
-	return m_pRenderData;
-}
-
-template< typename E >
-inline void CMatRenderData<E>::Release()
-{
-	if (m_pRenderContext && m_pRenderData)
-	{
-		if (m_bNeedsUnlock)
-		{
-			m_pRenderContext->UnlockRenderData(m_pRenderData);
-		}
-		else
-		{
-			m_pRenderContext->ReleaseRenderData();
-		}
-	}
-	m_pRenderData = NULL;
-	m_nCount = 0;
-	m_bNeedsUnlock = false;
-}
-
-template< typename E >
-inline E* CMatRenderData<E>::Base()
-{
-	return m_pRenderData;
-}
-
-template< typename E >
-inline const E* CMatRenderData<E>::Base() const
-{
-	return m_pRenderData;
-}
-
-template< typename E >
-inline E& CMatRenderData<E>::operator[](int i)
-{
-	Assert((i >= 0) && (i < m_nCount));
-	return m_pRenderData[i];
-}
-
-template< typename E >
-inline const E& CMatRenderData<E>::operator[](int i) const
-{
-	Assert((i >= 0) && (i < m_nCount));
-	return m_pRenderData[i];
-}
-
-
-class CMatRenderContextPtr : public CRefPtr<IMatRenderContext>
-{
-	typedef CRefPtr<IMatRenderContext> BaseClass;
-public:
-	CMatRenderContextPtr() {}
-	CMatRenderContextPtr(IMatRenderContext* pInit) : BaseClass(pInit) { if (BaseClass::m_pObject) BaseClass::m_pObject->BeginRender(); }
-	CMatRenderContextPtr(IMaterialSystem* pFrom) : BaseClass(pFrom->GetRenderContext()) { if (BaseClass::m_pObject) BaseClass::m_pObject->BeginRender(); }
-	~CMatRenderContextPtr() { if (BaseClass::m_pObject) BaseClass::m_pObject->EndRender(); }
-
-	IMatRenderContext* operator=(IMatRenderContext* p) { if (p) p->BeginRender(); return BaseClass::operator=(p); }
-
-	void SafeRelease() { if (BaseClass::m_pObject) BaseClass::m_pObject->EndRender(); BaseClass::SafeRelease(); }
-	void AssignAddRef(IMatRenderContext* pFrom) { if (BaseClass::m_pObject) BaseClass::m_pObject->EndRender(); BaseClass::AssignAddRef(pFrom); BaseClass::m_pObject->BeginRender(); }
-
-	void GetFrom(IMaterialSystem* pFrom) { AssignAddRef(pFrom->GetRenderContext()); }
-
-
-private:
-	CMatRenderContextPtr(const CMatRenderContextPtr& from);
-	void operator=(const CMatRenderContextPtr& from);
-
-};
-
-#define PIX_VALVE_ORANGE	0xFFF5940F
-
-class PIXEvent
-{
-public:
-	PIXEvent(IMatRenderContext* pRenderContext, const char* szName, unsigned long color = PIX_VALVE_ORANGE)
-	{
-		m_pRenderContext = pRenderContext;
-		Assert(m_pRenderContext);
-		Assert(szName);
-		m_pRenderContext->BeginPIXEvent(color, szName);
-	}
-	~PIXEvent()
-	{
-		m_pRenderContext->EndPIXEvent();
-	}
-private:
-	IMatRenderContext* m_pRenderContext;
-};
-
-
-#if ( defined( _X360 ) && ( defined( PROFILE ) || defined( _DEBUG ) ) )
-#define PIX_ENABLE 1		              
-#else
-#define PIX_ENABLE 0
-#endif
-
-
-#if PIX_ENABLE
-#	define PIXEVENT PIXEvent _pixEvent
-#else
-#	define PIXEVENT 
-#endif
-
-#ifdef MATERIAL_SYSTEM_DEBUG_CALL_QUEUE
-#include "tier1/callqueue.h"
-#include "tier1/fmtstr.h"
-static void DoMatSysQueueMark(IMaterialSystem* pMaterialSystem, const char* psz)
-{
-	CMatRenderContextPtr pRenderContext(pMaterialSystem);
-	if (pRenderContext->GetCallQueue())
-		pRenderContext->GetCallQueue()->QueueCall(Plat_DebugString, CUtlEnvelope<const char*>(psz));
-}
-
-#define MatSysQueueMark( pMaterialSystem, ...) DoMatSysQueueMark( pMaterialSystem, CFmtStr( __VA_ARGS__ ) )
-#else
-#define MatSysQueueMark( msg, ...) ((void)0)
-#endif
-
-#ifdef _GAMECONSOLE
-#define MS_NO_DYNAMIC_BUFFER_COPY 1
-#endif
-
-#endif  
diff --git a/SpyCustom/imaterialsystemhardwareconfig.h b/SpyCustom/imaterialsystemhardwareconfig.h
deleted file mode 100644
index 6fb81b9..0000000
--- a/SpyCustom/imaterialsystemhardwareconfig.h
+++ /dev/null
@@ -1,200 +0,0 @@
-#ifndef IMATERIALSYSTEMHARDWARECONFIG_H
-#define IMATERIALSYSTEMHARDWARECONFIG_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#if defined( DX_TO_GL_ABSTRACTION )
-#define IsPlatformOpenGL() true
-#else
-#define IsPlatformOpenGL() false
-#endif
-
-#include "interface.h"
-#include "imageformat.h"
-#include "imaterialsystem.h"
-FORCEINLINE bool IsOpenGL(void)
-{
-	return IsPlatformOpenGL();
-}
-
-enum VertexCompressionType_t
-{
-	VERTEX_COMPRESSION_INVALID = 0xFFFFFFFF,
-
-	VERTEX_COMPRESSION_NONE = 0,
-
-	VERTEX_COMPRESSION_ON = 1
-};
-
-
-#ifdef _GAMECONSOLE
-#define DEFCONFIGMETHOD( ret_type, method, xbox_return_value )		\
-FORCEINLINE ret_type method const 									\
-{																	\
-	return xbox_return_value;										\
-}
-
-
-#else
-#define DEFCONFIGMETHOD( ret_type, method, xbox_return_value )	\
-virtual ret_type method const = 0;
-#endif
-
-enum ShadowFilterMode_t
-{
-	SHADOWFILTERMODE_DEFAULT = 0,
-
-	NVIDIA_PCF = 0,
-	ATI_NO_PCF_FETCH4 = 1,
-	NVIDIA_PCF_CHEAP = 2,
-	ATI_NOPCF = 3,
-
-	GAMECONSOLE_NINE_TAP_PCF = 0,
-	GAMECONSOLE_SINGLE_TAP_PCF = 1,
-
-#if defined( _GAMECONSOLE )
-	SHADOWFILTERMODE_FIRST_CHEAP_MODE = GAMECONSOLE_SINGLE_TAP_PCF,
-#else
-	SHADOWFILTERMODE_FIRST_CHEAP_MODE = NVIDIA_PCF_CHEAP,
-#endif
-};
-
-enum CSMQualityMode_t
-{
-	CSMQUALITY_VERY_LOW,
-	CSMQUALITY_LOW,
-	CSMQUALITY_MEDIUM,
-	CSMQUALITY_HIGH,
-
-	CSMQUALITY_TOTAL_MODES
-};
-
-enum CSMShaderMode_t
-{
-	CSMSHADERMODE_LOW_OR_VERY_LOW = 0,
-	CSMSHADERMODE_MEDIUM = 1,
-	CSMSHADERMODE_HIGH = 2,
-	CSMSHADERMODE_ATIFETCH4 = 3,
-
-	CSMSHADERMODE_TOTAL_MODES
-};
-
-class IMaterialSystemHardwareConfig
-{
-public:
-	virtual int	 GetFrameBufferColorDepth() const = 0;
-	virtual int  GetSamplerCount() const = 0;
-	virtual bool HasSetDeviceGammaRamp() const = 0;
-	DEFCONFIGMETHOD(bool, SupportsStaticControlFlow(), true);
-	virtual VertexCompressionType_t SupportsCompressedVertices() const = 0;
-	virtual int  MaximumAnisotropicLevel() const = 0;	     
-	virtual int  MaxTextureWidth() const = 0;
-	virtual int  MaxTextureHeight() const = 0;
-	virtual int	 TextureMemorySize() const = 0;
-	virtual bool SupportsMipmappedCubemaps() const = 0;
-
-	virtual int	 NumVertexShaderConstants() const = 0;
-	virtual int	 NumPixelShaderConstants() const = 0;
-	virtual int	 MaxNumLights() const = 0;
-	virtual int	 MaxTextureAspectRatio() const = 0;
-	virtual int	 MaxVertexShaderBlendMatrices() const = 0;
-	virtual int	 MaxUserClipPlanes() const = 0;
-	virtual bool UseFastClipping() const = 0;
-
-	DEFCONFIGMETHOD(int, GetDXSupportLevel(), 98);
-	virtual const char* GetShaderDLLName() const = 0;
-
-	virtual bool ReadPixelsFromFrontBuffer() const = 0;
-
-	virtual bool PreferDynamicTextures() const = 0;
-
-	DEFCONFIGMETHOD(bool, SupportsHDR(), true);
-
-	virtual bool NeedsAAClamp() const = 0;
-	virtual bool NeedsATICentroidHack() const = 0;
-
-	virtual int	 GetMaxDXSupportLevel() const = 0;
-
-	virtual bool SpecifiesFogColorInLinearSpace() const = 0;
-
-	DEFCONFIGMETHOD(bool, SupportsSRGB(), true);
-	DEFCONFIGMETHOD(bool, FakeSRGBWrite(), false);
-	DEFCONFIGMETHOD(bool, CanDoSRGBReadFromRTs(), true);
-
-	virtual bool SupportsGLMixedSizeTargets() const = 0;
-
-	virtual bool IsAAEnabled() const = 0;	    
-
-	virtual int GetVertexSamplerCount() const = 0;
-	virtual int GetMaxVertexTextureDimension() const = 0;
-
-	virtual int  MaxTextureDepth() const = 0;
-
-	virtual HDRType_t GetHDRType() const = 0;
-	virtual HDRType_t GetHardwareHDRType() const = 0;
-
-	virtual bool SupportsStreamOffset() const = 0;
-
-	virtual int StencilBufferBits() const = 0;
-	virtual int MaxViewports() const = 0;
-
-	virtual void OverrideStreamOffsetSupport(bool bOverrideEnabled, bool bEnableSupport) = 0;
-
-	virtual ShadowFilterMode_t GetShadowFilterMode(bool bForceLowQualityShadows, bool bPS30) const = 0;
-
-	virtual int NeedsShaderSRGBConversion() const = 0;
-
-	DEFCONFIGMETHOD(bool, UsesSRGBCorrectBlending(), IsX360());
-
-	virtual bool HasFastVertexTextures() const = 0;
-	virtual int MaxHWMorphBatchCount() const = 0;
-
-	virtual bool SupportsHDRMode(HDRType_t nHDRMode) const = 0;
-
-	virtual bool GetHDREnabled(void) const = 0;
-	virtual void SetHDREnabled(bool bEnable) = 0;
-
-	virtual bool SupportsBorderColor(void) const = 0;
-	virtual bool SupportsFetch4(void) const = 0;
-
-	virtual float GetShadowDepthBias() const = 0;
-	virtual float GetShadowSlopeScaleDepthBias() const = 0;
-
-	virtual bool PreferZPrepass() const = 0;
-
-	virtual bool SuppressPixelShaderCentroidHackFixup() const = 0;
-	virtual bool PreferTexturesInHWMemory() const = 0;
-	virtual bool PreferHardwareSync() const = 0;
-	virtual bool ActualHasFastVertexTextures() const = 0;
-
-	virtual bool SupportsShadowDepthTextures(void) const = 0;
-	virtual ImageFormat GetShadowDepthTextureFormat(void) const = 0;
-	virtual ImageFormat GetHighPrecisionShadowDepthTextureFormat(void) const = 0;
-	virtual ImageFormat GetNullTextureFormat(void) const = 0;
-	virtual int	GetMinDXSupportLevel() const = 0;
-	virtual bool IsUnsupported() const = 0;
-
-	virtual float GetLightMapScaleFactor() const = 0;
-
-	virtual bool SupportsCascadedShadowMapping() const = 0;
-	virtual CSMQualityMode_t GetCSMQuality() const = 0;
-	virtual bool SupportsBilinearPCFSampling() const = 0;
-	virtual CSMShaderMode_t GetCSMShaderMode(CSMQualityMode_t nQualityLevel) const = 0;
-	virtual bool GetCSMAccurateBlending(void) const = 0;
-	virtual void SetCSMAccurateBlending(bool bEnable) = 0;
-
-	virtual bool SupportsResolveDepth() const = 0;
-	virtual bool HasFullResolutionDepthTexture() const = 0;
-
-#if defined ( STDSHADER_DBG_DLL_EXPORT ) || defined( STDSHADER_DX9_DLL_EXPORT )
-	inline bool SupportsPixelShaders_2_b() const { return GetDXSupportLevel() >= 92; }
-	inline bool SupportsPixelShaders_3_0() const { return GetDXSupportLevel() >= 95; }
-#endif
-
-	inline bool ShouldAlwaysUseShaderModel2bShaders() const { return IsOpenGL(); }
-	inline bool PlatformRequiresNonNullPixelShaders() const { return IsOpenGL(); }
-};
-
-#endif  
diff --git a/SpyCustom/imdlcache.h b/SpyCustom/imdlcache.h
deleted file mode 100644
index b7e96ea..0000000
--- a/SpyCustom/imdlcache.h
+++ /dev/null
@@ -1,169 +0,0 @@
-#ifndef IMDLCACHE_H
-#define IMDLCACHE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "IAppSystem.h"
-
-struct studiohdr_t;
-struct studiohwdata_t;
-struct vcollide_t;
-struct virtualmodel_t;
-struct vertexFileHeader_t;
-
-namespace OptimizedModel
-{
-	struct FileHeader_t;
-}
-
-
-typedef unsigned short MDLHandle_t;
-
-enum
-{
-	MDLHANDLE_INVALID = (MDLHandle_t)~0
-};
-
-
-enum MDLCacheDataType_t
-{
-	MDLCACHE_STUDIOHDR = 0,
-	MDLCACHE_STUDIOHWDATA,
-	MDLCACHE_VCOLLIDE,
-
-	MDLCACHE_ANIMBLOCK,
-	MDLCACHE_VIRTUALMODEL,
-	MDLCACHE_VERTEXES,
-	MDLCACHE_DECODEDANIMBLOCK,
-};
-
-abstract_class IMDLCacheNotify
-{
-public:
-	virtual void OnDataLoaded(MDLCacheDataType_t type, MDLHandle_t handle) = 0;
-
-	virtual void OnDataUnloaded(MDLCacheDataType_t type, MDLHandle_t handle) = 0;
-};
-
-
-enum MDLCacheFlush_t
-{
-	MDLCACHE_FLUSH_STUDIOHDR = 0x01,
-	MDLCACHE_FLUSH_STUDIOHWDATA = 0x02,
-	MDLCACHE_FLUSH_VCOLLIDE = 0x04,
-	MDLCACHE_FLUSH_ANIMBLOCK = 0x08,
-	MDLCACHE_FLUSH_VIRTUALMODEL = 0x10,
-	MDLCACHE_FLUSH_AUTOPLAY = 0x20,
-	MDLCACHE_FLUSH_VERTEXES = 0x40,
-
-	MDLCACHE_FLUSH_IGNORELOCK = 0x80000000,
-	MDLCACHE_FLUSH_ALL = 0xFFFFFFFF
-};
-
-#define MDLCACHE_INTERFACE_VERSION "MDLCache004"
-
-abstract_class IMDLCache : public IAppSystem
-{
-public:
-	virtual void SetCacheNotify(IMDLCacheNotify * pNotify) = 0;
-
-	virtual MDLHandle_t FindMDL(const char* pMDLRelativePath) = 0;
-
-	virtual int AddRef(MDLHandle_t handle) = 0;
-	virtual int Release(MDLHandle_t handle) = 0;
-	virtual int GetRef(MDLHandle_t handle) = 0;
-
-	virtual studiohdr_t* GetStudioHdr(MDLHandle_t handle) = 0;
-	virtual studiohwdata_t* GetHardwareData(MDLHandle_t handle) = 0;
-	virtual vcollide_t* GetVCollide(MDLHandle_t handle) = 0;
-	virtual unsigned char* GetAnimBlock(MDLHandle_t handle, int nBlock) = 0;
-	virtual virtualmodel_t* GetVirtualModel(MDLHandle_t handle) = 0;
-	virtual int GetAutoplayList(MDLHandle_t handle, unsigned short** pOut) = 0;
-	virtual vertexFileHeader_t* GetVertexData(MDLHandle_t handle) = 0;
-
-	virtual void TouchAllData(MDLHandle_t handle) = 0;
-
-	virtual void SetUserData(MDLHandle_t handle, void* pData) = 0;
-	virtual void* GetUserData(MDLHandle_t handle) = 0;
-
-	virtual bool IsErrorModel(MDLHandle_t handle) = 0;
-
-	virtual void Flush(MDLCacheFlush_t nFlushFlags = MDLCACHE_FLUSH_ALL) = 0;
-
-	virtual void Flush(MDLHandle_t handle, int nFlushFlags = MDLCACHE_FLUSH_ALL) = 0;
-
-	virtual const char* GetModelName(MDLHandle_t handle) = 0;
-
-	virtual virtualmodel_t* GetVirtualModelFast(const studiohdr_t* pStudioHdr, MDLHandle_t handle) = 0;
-
-	virtual void BeginLock() = 0;
-
-	virtual void EndLock() = 0;
-
-	virtual int* GetFrameUnlockCounterPtrOLD() = 0;
-
-	virtual void FinishPendingLoads() = 0;
-
-	virtual vcollide_t* GetVCollideEx(MDLHandle_t handle, bool synchronousLoad = true) = 0;
-	virtual bool GetVCollideSize(MDLHandle_t handle, int* pVCollideSize) = 0;
-
-	virtual bool GetAsyncLoad(MDLCacheDataType_t type) = 0;
-	virtual bool SetAsyncLoad(MDLCacheDataType_t type, bool bAsync) = 0;
-
-	virtual void BeginMapLoad() = 0;
-	virtual void EndMapLoad() = 0;
-	virtual void MarkAsLoaded(MDLHandle_t handle) = 0;
-
-	virtual void InitPreloadData(bool rebuild) = 0;
-	virtual void ShutdownPreloadData() = 0;
-
-	virtual bool IsDataLoaded(MDLHandle_t handle, MDLCacheDataType_t type) = 0;
-
-	virtual int* GetFrameUnlockCounterPtr(MDLCacheDataType_t type) = 0;
-
-	virtual studiohdr_t* LockStudioHdr(MDLHandle_t handle) = 0;
-	virtual void UnlockStudioHdr(MDLHandle_t handle) = 0;
-
-	virtual bool PreloadModel(MDLHandle_t handle) = 0;
-
-	virtual void ResetErrorModelStatus(MDLHandle_t handle) = 0;
-
-	virtual void MarkFrame() = 0;
-};
-
-
-class CMDLCacheCriticalSection
-{
-public:
-	CMDLCacheCriticalSection(IMDLCache* pCache) : m_pCache(pCache)
-	{
-		m_pCache->BeginLock();
-	}
-
-	~CMDLCacheCriticalSection()
-	{
-		m_pCache->EndLock();
-	}
-
-private:
-	IMDLCache* m_pCache;
-};
-
-#define MDCACHE_FINE_GRAINED 1
-
-#if defined(MDCACHE_FINE_GRAINED)
-#define MDLCACHE_CRITICAL_SECTION_( pCache ) CMDLCacheCriticalSection cacheCriticalSection(pCache)
-#define MDLCACHE_COARSE_LOCK_( pCache ) ((void)(0))
-#elif defined(MDLCACHE_LEVEL_LOCKED)
-#define MDLCACHE_CRITICAL_SECTION_( pCache )  ((void)(0))
-#define MDLCACHE_COARSE_LOCK_( pCache ) ((void)(0))
-#else
-#define MDLCACHE_CRITICAL_SECTION_( pCache ) ((void)(0))
-#define MDLCACHE_COARSE_LOCK_( pCache ) CMDLCacheCriticalSection cacheCriticalSection(pCache)
-#endif
-#define MDLCACHE_CRITICAL_SECTION() MDLCACHE_CRITICAL_SECTION_(mdlcache)
-#define MDLCACHE_COARSE_LOCK() MDLCACHE_COARSE_LOCK_(mdlcache)
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/imgui/imconfig.h b/SpyCustom/imgui/imconfig.h
deleted file mode 100644
index c5e1650..0000000
--- a/SpyCustom/imgui/imconfig.h
+++ /dev/null
@@ -1,118 +0,0 @@
-//-----------------------------------------------------------------------------
-// COMPILE-TIME OPTIONS FOR DEAR IMGUI
-// Runtime options (clipboard callbacks, enabling various features, etc.) can generally be set via the ImGuiIO structure.
-// You can use ImGui::SetAllocatorFunctions() before calling ImGui::CreateContext() to rewire memory allocation functions.
-//-----------------------------------------------------------------------------
-// A) You may edit imconfig.h (and not overwrite it when updating Dear ImGui, or maintain a patch/rebased branch with your modifications to it)
-// B) or '#define IMGUI_USER_CONFIG "my_imgui_config.h"' in your project and then add directives in your own file without touching this template.
-//-----------------------------------------------------------------------------
-// You need to make sure that configuration settings are defined consistently _everywhere_ Dear ImGui is used, which include the imgui*.cpp
-// files but also _any_ of your code that uses Dear ImGui. This is because some compile-time options have an affect on data structures.
-// Defining those options in imconfig.h will ensure every compilation unit gets to see the same data structure layouts.
-// Call IMGUI_CHECKVERSION() from your .cpp files to verify that the data structures your files are using are matching the ones imgui.cpp is using.
-//-----------------------------------------------------------------------------
-
-#pragma once
-
-//---- Define assertion handler. Defaults to calling assert().
-// If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement.
-//#define IM_ASSERT(_EXPR)  MyAssert(_EXPR)
-//#define IM_ASSERT(_EXPR)  ((void)(_EXPR))     // Disable asserts
-
-//---- Define attributes of all API symbols declarations, e.g. for DLL under Windows
-// Using dear imgui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility.
-//#define IMGUI_API __declspec( dllexport )
-//#define IMGUI_API __declspec( dllimport )
-
-//---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names.
-//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-
-//---- Disable all of Dear ImGui or don't implement standard windows.
-// It is very strongly recommended to NOT disable the demo windows during development. Please read comments in imgui_demo.cpp.
-//#define IMGUI_DISABLE                                     // Disable everything: all headers and source files will be empty.
-//#define IMGUI_DISABLE_DEMO_WINDOWS                        // Disable demo windows: ShowDemoWindow()/ShowStyleEditor() will be empty. Not recommended.
-//#define IMGUI_DISABLE_METRICS_WINDOW                      // Disable metrics/debugger window: ShowMetricsWindow() will be empty.
-
-//---- Don't implement some functions to reduce linkage requirements.
-//#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS   // [Win32] Don't implement default clipboard handler. Won't use and link with OpenClipboard/GetClipboardData/CloseClipboard etc.
-//#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS         // [Win32] Don't implement default IME handler. Won't use and link with ImmGetContext/ImmSetCompositionWindow.
-//#define IMGUI_DISABLE_WIN32_FUNCTIONS                     // [Win32] Won't use and link with any Win32 function (clipboard, ime).
-//#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS      // [OSX] Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not the default).
-//#define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS            // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
-//#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS              // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself.
-//#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS              // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function.
-//#define IMGUI_DISABLE_DEFAULT_ALLOCATORS                  // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions().
-
-//---- Include imgui_user.h at the end of imgui.h as a convenience
-//#define IMGUI_INCLUDE_IMGUI_USER_H
-
-//---- Pack colors to BGRA8 instead of RGBA8 (to avoid converting from one to another)
-//#define IMGUI_USE_BGRA_PACKED_COLOR
-
-//---- Use 32-bit for ImWchar (default is 16-bit) to support unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...)
-//#define IMGUI_USE_WCHAR32
-
-//---- Avoid multiple STB libraries implementations, or redefine path/filenames to prioritize another version
-// By default the embedded implementations are declared static and not available outside of Dear ImGui sources files.
-//#define IMGUI_STB_TRUETYPE_FILENAME   "my_folder/stb_truetype.h"
-//#define IMGUI_STB_RECT_PACK_FILENAME  "my_folder/stb_rect_pack.h"
-//#define IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION
-//#define IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION
-
-//---- Use stb_printf's faster implementation of vsnprintf instead of the one from libc (unless IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS is defined)
-// Requires 'stb_sprintf.h' to be available in the include path. Compatibility checks of arguments and formats done by clang and GCC will be disabled in order to support the extra formats provided by STB sprintf.
-// #define IMGUI_USE_STB_SPRINTF
-
-//---- Use FreeType to build and rasterize the font atlas (instead of stb_truetype which is embedded by default in Dear ImGui)
-// Requires FreeType headers to be available in the include path. Requires program to be compiled with 'misc/freetype/imgui_freetype.cpp' (in this repository) + the FreeType library (not provided).
-// On Windows you may use vcpkg with 'vcpkg install freetype' + 'vcpkg integrate install'.
-//#define IMGUI_ENABLE_FREETYPE
-
-//---- Use stb_truetype to build and rasterize the font atlas (default)
-// The only purpose of this define is if you want force compilation of the stb_truetype backend ALONG with the FreeType backend.
-//#define IMGUI_ENABLE_STB_TRUETYPE
-
-//---- Define constructor and implicit cast operators to convert back<>forth between your math types and ImVec2/ImVec4.
-// This will be inlined as part of ImVec2 and ImVec4 class declarations.
-/*
-#define IM_VEC2_CLASS_EXTRA                                                 \
-        ImVec2(const MyVec2& f) { x = f.x; y = f.y; }                       \
-        operator MyVec2() const { return MyVec2(x,y); }
-
-#define IM_VEC4_CLASS_EXTRA                                                 \
-        ImVec4(const MyVec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; }     \
-        operator MyVec4() const { return MyVec4(x,y,z,w); }
-*/
-
-//---- Use 32-bit vertex indices (default is 16-bit) is one way to allow large meshes with more than 64K vertices.
-// Your renderer backend will need to support it (most example renderer backends support both 16/32-bit indices).
-// Another way to allow large meshes while keeping 16-bit indices is to handle ImDrawCmd::VtxOffset in your renderer.
-// Read about ImGuiBackendFlags_RendererHasVtxOffset for details.
-//#define ImDrawIdx unsigned int
-
-//---- Override ImDrawCallback signature (will need to modify renderer backends accordingly)
-//struct ImDrawList;
-//struct ImDrawCmd;
-//typedef void (*MyImDrawCallback)(const ImDrawList* draw_list, const ImDrawCmd* cmd, void* my_renderer_user_data);
-//#define ImDrawCallback MyImDrawCallback
-
-//---- Debug Tools: Macro to break in Debugger
-// (use 'Metrics->Tools->Item Picker' to pick widgets with the mouse and break into them for easy debugging.)
-//#define IM_DEBUG_BREAK  IM_ASSERT(0)
-//#define IM_DEBUG_BREAK  __debugbreak()
-
-//---- Debug Tools: Have the Item Picker break in the ItemAdd() function instead of ItemHoverable(),
-// (which comes earlier in the code, will catch a few extra items, allow picking items other than Hovered one.)
-// This adds a small runtime cost which is why it is not enabled by default.
-//#define IMGUI_DEBUG_TOOL_ITEM_PICKER_EX
-
-//---- Debug Tools: Enable slower asserts
-//#define IMGUI_DEBUG_PARANOID
-
-//---- Tip: You can add extra functions within the ImGui:: namespace, here or in your own headers files.
-/*
-namespace ImGui
-{
-    void MyFunction(const char* name, const MyMatrix44& v);
-}
-*/
diff --git a/SpyCustom/imgui/imgui.cpp b/SpyCustom/imgui/imgui.cpp
deleted file mode 100644
index fdc9dcf..0000000
--- a/SpyCustom/imgui/imgui.cpp
+++ /dev/null
@@ -1,9268 +0,0 @@
-
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "imgui.h"
-#ifndef IMGUI_DISABLE
-
-#ifndef IMGUI_DEFINE_MATH_OPERATORS
-#define IMGUI_DEFINE_MATH_OPERATORS
-#endif
-#include "imgui_internal.h"
-
-#include <ctype.h>       
-#include <stdio.h>         
-#if defined(_MSC_VER) && _MSC_VER <= 1500     
-#include <stddef.h>      
-#else
-#include <stdint.h>      
-#endif
-
-#if defined(_WIN32) && defined(IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS) && defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS) && defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS)
-#define IMGUI_DISABLE_WIN32_FUNCTIONS
-#endif
-#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#ifndef __MINGW32__
-#include <Windows.h>          
-#else
-#include <windows.h>
-#endif
-#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)       
-#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS
-#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS
-#endif
-#endif
-
-#if defined(__APPLE__)
-#include <TargetConditionals.h>
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (disable: 4127)                 
-#pragma warning (disable: 4996)                          
-#if defined(_MSC_VER) && _MSC_VER >= 1922        
-#pragma warning (disable: 5054)                     
-#endif
-#endif
-
-#if defined(__clang__)
-#if __has_warning("-Wunknown-warning-option")
-#pragma clang diagnostic ignored "-Wunknown-warning-option"                                                             
-#endif
-#pragma clang diagnostic ignored "-Wunknown-pragmas"                     
-#pragma clang diagnostic ignored "-Wold-style-cast"                                                       
-#pragma clang diagnostic ignored "-Wfloat-equal"                                         
-#pragma clang diagnostic ignored "-Wformat-nonliteral"                                                
-#pragma clang diagnostic ignored "-Wexit-time-destructors"                                               
-#pragma clang diagnostic ignored "-Wglobal-constructors"                                     
-#pragma clang diagnostic ignored "-Wsign-conversion"                     
-#pragma clang diagnostic ignored "-Wformat-pedantic"                                            
-#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast"                 
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"                                    
-#pragma clang diagnostic ignored "-Wdouble-promotion"                                            
-#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion"            
-#elif defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wpragmas"                          
-#pragma GCC diagnostic ignored "-Wunused-function"                
-#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"               
-#pragma GCC diagnostic ignored "-Wformat"                                 
-#pragma GCC diagnostic ignored "-Wdouble-promotion"                     
-#pragma GCC diagnostic ignored "-Wconversion"                         
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"                  
-#pragma GCC diagnostic ignored "-Wstrict-overflow"                            
-#pragma GCC diagnostic ignored "-Wclass-memaccess"                              
-#endif
-
-#define IMGUI_DEBUG_NAV_SCORING     0                  
-#define IMGUI_DEBUG_NAV_RECTS       0           
-#define IMGUI_DEBUG_INI_SETTINGS    0                 
-
-static const float NAV_WINDOWING_HIGHLIGHT_DELAY            = 0.20f;              
-static const float NAV_WINDOWING_LIST_APPEAR_DELAY          = 0.15f;            
-
-static const float WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS = 4.0f;            
-static const float WINDOWS_RESIZE_FROM_EDGES_FEEDBACK_TIMER = 0.04f;                
-static const float WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER    = 2.00f;                        
-
-static void             SetCurrentWindow(ImGuiWindow* window);
-static void             FindHoveredWindow();
-static ImGuiWindow*     CreateNewWindow(const char* name, ImGuiWindowFlags flags);
-static ImVec2           CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window);
-
-static void             AddDrawListToDrawData(ImVector<ImDrawList*>* out_list, ImDrawList* draw_list);
-static void             AddWindowToSortBuffer(ImVector<ImGuiWindow*>* out_sorted_windows, ImGuiWindow* window);
-
-static ImRect           GetViewportRect();
-
-static void             WindowSettingsHandler_ClearAll(ImGuiContext*, ImGuiSettingsHandler*);
-static void*            WindowSettingsHandler_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name);
-static void             WindowSettingsHandler_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line);
-static void             WindowSettingsHandler_ApplyAll(ImGuiContext*, ImGuiSettingsHandler*);
-static void             WindowSettingsHandler_WriteAll(ImGuiContext*, ImGuiSettingsHandler*, ImGuiTextBuffer* buf);
-
-static const char*      GetClipboardTextFn_DefaultImpl(void* user_data);
-static void             SetClipboardTextFn_DefaultImpl(void* user_data, const char* text);
-static void             ImeSetInputScreenPosFn_DefaultImpl(int x, int y);
-
-namespace ImGui
-{
-static void             NavUpdate();
-static void             NavUpdateWindowing();
-static void             NavUpdateWindowingOverlay();
-static void             NavUpdateMoveResult();
-static void             NavUpdateInitResult();
-static float            NavUpdatePageUpPageDown();
-static inline void      NavUpdateAnyRequestFlag();
-static void             NavEndFrame();
-static bool             NavScoreItem(ImGuiNavMoveResult* result, ImRect cand);
-static void             NavApplyItemToResult(ImGuiNavMoveResult* result, ImGuiWindow* window, ImGuiID id, const ImRect& nav_bb_rel);
-static void             NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, ImGuiID id);
-static ImVec2           NavCalcPreferredRefPos();
-static void             NavSaveLastChildNavWindowIntoParent(ImGuiWindow* nav_window);
-static ImGuiWindow*     NavRestoreLastChildNavWindow(ImGuiWindow* window);
-static int              FindWindowFocusIndex(ImGuiWindow* window);
-
-static void             ErrorCheckNewFrameSanityChecks();
-static void             ErrorCheckEndFrameSanityChecks();
-
-static void             UpdateSettings();
-static void             UpdateMouseInputs();
-static void             UpdateMouseWheel();
-static void             UpdateTabFocus();
-static void             UpdateDebugToolItemPicker();
-static bool             UpdateWindowManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4], const ImRect& visibility_rect);
-static void             RenderWindowOuterBorders(ImGuiWindow* window);
-static void             RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar_rect, bool title_bar_is_highlight, int resize_grip_count, const ImU32 resize_grip_col[4], float resize_grip_draw_size);
-static void             RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& title_bar_rect, const char* name, bool* p_open);
-
-}
-
-#ifndef GImGui
-ImGuiContext*   GImGui = NULL;
-#endif
-
-#ifndef IMGUI_DISABLE_DEFAULT_ALLOCATORS
-static void*   MallocWrapper(size_t size, void* user_data)    { IM_UNUSED(user_data); return malloc(size); }
-static void    FreeWrapper(void* ptr, void* user_data)        { IM_UNUSED(user_data); free(ptr); }
-#else
-static void*   MallocWrapper(size_t size, void* user_data)    { IM_UNUSED(user_data); IM_UNUSED(size); IM_ASSERT(0); return NULL; }
-static void    FreeWrapper(void* ptr, void* user_data)        { IM_UNUSED(user_data); IM_UNUSED(ptr); IM_ASSERT(0); }
-#endif
-
-static void*  (*GImAllocatorAllocFunc)(size_t size, void* user_data) = MallocWrapper;
-static void   (*GImAllocatorFreeFunc)(void* ptr, void* user_data) = FreeWrapper;
-static void*    GImAllocatorUserData = NULL;
-
-ImGuiStyle::ImGuiStyle()
-{
-    Alpha                   = 1.0f;                    
-    WindowPadding           = ImVec2(8,8);          
-    WindowRounding          = 0.0f;                                      
-    WindowBorderSize        = 1.0f;                             
-    WindowMinSize           = ImVec2(32,32);       
-    WindowTitleAlign        = ImVec2(0.0f,0.5f);     
-    WindowMenuButtonPosition= ImGuiDir_Left;                 
-    ChildRounding           = 0.0f;                           
-    ChildBorderSize         = 1.0f;                              
-    PopupRounding           = 0.0f;                           
-    PopupBorderSize         = 1.0f;                                
-    FramePadding            = ImVec2(4,3);               
-    FrameRounding           = 0.0f;                             
-    FrameBorderSize         = 0.0f;                             
-    ItemSpacing             = ImVec2(8,4);            
-    ItemInnerSpacing        = ImVec2(4,4);                       
-    CellPadding             = ImVec2(4,2);           
-    TouchExtraPadding       = ImVec2(0,0);                                           
-    IndentSpacing           = 21.0f;                         
-    ColumnsMinSpacing       = 6.0f;                        
-    ScrollbarSize           = 14.0f;                      
-    ScrollbarRounding       = 9.0f;                    
-    GrabMinSize             = 10.0f;                    
-    GrabRounding            = 0.0f;                          
-    LogSliderDeadzone       = 4.0f;                            
-    TabRounding             = 4.0f;                           
-    TabBorderSize           = 0.0f;                  
-    TabMinWidthForCloseButton = 0.0f;                                          
-    ColorButtonPosition     = ImGuiDir_Right;                
-    ButtonTextAlign         = ImVec2(0.5f,0.5f);          
-    SelectableTextAlign     = ImVec2(0.0f,0.0f);                            
-    DisplayWindowPadding    = ImVec2(19,19);                           
-    DisplaySafeAreaPadding  = ImVec2(3,3);                              
-    MouseCursorScale        = 1.0f;                          
-    AntiAliasedLines        = true;                        
-    AntiAliasedLinesUseTex  = true;                           
-    AntiAliasedFill         = true;                     
-    CurveTessellationTol    = 1.25f;                                    
-    CircleSegmentMaxError   = 1.60f;                                      
-
-    ImGui::StyleColorsDark(this);
-}
-
-void ImGuiStyle::ScaleAllSizes(float scale_factor)
-{
-    WindowPadding = ImFloor(WindowPadding * scale_factor);
-    WindowRounding = ImFloor(WindowRounding * scale_factor);
-    WindowMinSize = ImFloor(WindowMinSize * scale_factor);
-    ChildRounding = ImFloor(ChildRounding * scale_factor);
-    PopupRounding = ImFloor(PopupRounding * scale_factor);
-    FramePadding = ImFloor(FramePadding * scale_factor);
-    FrameRounding = ImFloor(FrameRounding * scale_factor);
-    ItemSpacing = ImFloor(ItemSpacing * scale_factor);
-    ItemInnerSpacing = ImFloor(ItemInnerSpacing * scale_factor);
-    CellPadding = ImFloor(CellPadding * scale_factor);
-    TouchExtraPadding = ImFloor(TouchExtraPadding * scale_factor);
-    IndentSpacing = ImFloor(IndentSpacing * scale_factor);
-    ColumnsMinSpacing = ImFloor(ColumnsMinSpacing * scale_factor);
-    ScrollbarSize = ImFloor(ScrollbarSize * scale_factor);
-    ScrollbarRounding = ImFloor(ScrollbarRounding * scale_factor);
-    GrabMinSize = ImFloor(GrabMinSize * scale_factor);
-    GrabRounding = ImFloor(GrabRounding * scale_factor);
-    LogSliderDeadzone = ImFloor(LogSliderDeadzone * scale_factor);
-    TabRounding = ImFloor(TabRounding * scale_factor);
-    TabMinWidthForCloseButton = (TabMinWidthForCloseButton != FLT_MAX) ? ImFloor(TabMinWidthForCloseButton * scale_factor) : FLT_MAX;
-    DisplayWindowPadding = ImFloor(DisplayWindowPadding * scale_factor);
-    DisplaySafeAreaPadding = ImFloor(DisplaySafeAreaPadding * scale_factor);
-    MouseCursorScale = ImFloor(MouseCursorScale * scale_factor);
-}
-
-ImGuiIO::ImGuiIO()
-{
-    memset(this, 0, sizeof(*this));
-    IM_ASSERT(IM_ARRAYSIZE(ImGuiIO::MouseDown) == ImGuiMouseButton_COUNT && IM_ARRAYSIZE(ImGuiIO::MouseClicked) == ImGuiMouseButton_COUNT);                
-
-    ConfigFlags = ImGuiConfigFlags_None;
-    BackendFlags = ImGuiBackendFlags_None;
-    DisplaySize = ImVec2(-1.0f, -1.0f);
-    DeltaTime = 1.0f / 60.0f;
-    IniSavingRate = 5.0f;
-    IniFilename = "imgui.ini";
-    LogFilename = "imgui_log.txt";
-    MouseDoubleClickTime = 0.30f;
-    MouseDoubleClickMaxDist = 6.0f;
-    for (int i = 0; i < ImGuiKey_COUNT; i++)
-        KeyMap[i] = -1;
-    KeyRepeatDelay = 0.275f;
-    KeyRepeatRate = 0.050f;
-    UserData = NULL;
-
-    Fonts = NULL;
-    FontGlobalScale = 1.0f;
-    FontDefault = NULL;
-    FontAllowUserScaling = false;
-    DisplayFramebufferScale = ImVec2(1.0f, 1.0f);
-
-    MouseDrawCursor = false;
-#ifdef __APPLE__
-    ConfigMacOSXBehaviors = true;              
-#else
-    ConfigMacOSXBehaviors = false;
-#endif
-    ConfigInputTextCursorBlink = true;
-    ConfigWindowsResizeFromEdges = true;
-    ConfigWindowsMoveFromTitleBarOnly = false;
-    ConfigMemoryCompactTimer = 60.0f;
-
-    BackendPlatformName = BackendRendererName = NULL;
-    BackendPlatformUserData = BackendRendererUserData = BackendLanguageUserData = NULL;
-    GetClipboardTextFn = GetClipboardTextFn_DefaultImpl;       
-    SetClipboardTextFn = SetClipboardTextFn_DefaultImpl;
-    ClipboardUserData = NULL;
-    ImeSetInputScreenPosFn = ImeSetInputScreenPosFn_DefaultImpl;
-    ImeWindowHandle = NULL;
-
-    MousePos = ImVec2(-FLT_MAX, -FLT_MAX);
-    MousePosPrev = ImVec2(-FLT_MAX, -FLT_MAX);
-    MouseDragThreshold = 6.0f;
-    for (int i = 0; i < IM_ARRAYSIZE(MouseDownDuration); i++) MouseDownDuration[i] = MouseDownDurationPrev[i] = -1.0f;
-    for (int i = 0; i < IM_ARRAYSIZE(KeysDownDuration); i++) KeysDownDuration[i]  = KeysDownDurationPrev[i] = -1.0f;
-    for (int i = 0; i < IM_ARRAYSIZE(NavInputsDownDuration); i++) NavInputsDownDuration[i] = -1.0f;
-}
-
-void ImGuiIO::AddInputCharacter(unsigned int c)
-{
-    if (c != 0)
-        InputQueueCharacters.push_back(c <= IM_UNICODE_CODEPOINT_MAX ? (ImWchar)c : IM_UNICODE_CODEPOINT_INVALID);
-}
-
-void ImGuiIO::AddInputCharacterUTF16(ImWchar16 c)
-{
-    if (c == 0 && InputQueueSurrogate == 0)
-        return;
-
-    if ((c & 0xFC00) == 0xD800)     
-    {
-        if (InputQueueSurrogate != 0)
-            InputQueueCharacters.push_back(IM_UNICODE_CODEPOINT_INVALID);
-        InputQueueSurrogate = c;
-        return;
-    }
-
-    ImWchar cp = c;
-    if (InputQueueSurrogate != 0)
-    {
-        if ((c & 0xFC00) != 0xDC00)    
-            InputQueueCharacters.push_back(IM_UNICODE_CODEPOINT_INVALID);
-        else if (IM_UNICODE_CODEPOINT_MAX == (0xFFFF))                
-            cp = IM_UNICODE_CODEPOINT_INVALID;
-        else
-            cp = (ImWchar)(((InputQueueSurrogate - 0xD800) << 10) + (c - 0xDC00) + 0x10000);
-        InputQueueSurrogate = 0;
-    }
-    InputQueueCharacters.push_back(cp);
-}
-
-void ImGuiIO::AddInputCharactersUTF8(const char* utf8_chars)
-{
-    while (*utf8_chars != 0)
-    {
-        unsigned int c = 0;
-        utf8_chars += ImTextCharFromUtf8(&c, utf8_chars, NULL);
-        if (c != 0)
-            InputQueueCharacters.push_back((ImWchar)c);
-    }
-}
-
-void ImGuiIO::ClearInputCharacters()
-{
-    InputQueueCharacters.resize(0);
-}
-
-ImVec2 ImBezierCubicClosestPoint(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, int num_segments)
-{
-    IM_ASSERT(num_segments > 0);   
-    ImVec2 p_last = p1;
-    ImVec2 p_closest;
-    float p_closest_dist2 = FLT_MAX;
-    float t_step = 1.0f / (float)num_segments;
-    for (int i_step = 1; i_step <= num_segments; i_step++)
-    {
-        ImVec2 p_current = ImBezierCubicCalc(p1, p2, p3, p4, t_step * i_step);
-        ImVec2 p_line = ImLineClosestPoint(p_last, p_current, p);
-        float dist2 = ImLengthSqr(p - p_line);
-        if (dist2 < p_closest_dist2)
-        {
-            p_closest = p_line;
-            p_closest_dist2 = dist2;
-        }
-        p_last = p_current;
-    }
-    return p_closest;
-}
-
-static void ImBezierCubicClosestPointCasteljauStep(const ImVec2& p, ImVec2& p_closest, ImVec2& p_last, float& p_closest_dist2, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, float tess_tol, int level)
-{
-    float dx = x4 - x1;
-    float dy = y4 - y1;
-    float d2 = ((x2 - x4) * dy - (y2 - y4) * dx);
-    float d3 = ((x3 - x4) * dy - (y3 - y4) * dx);
-    d2 = (d2 >= 0) ? d2 : -d2;
-    d3 = (d3 >= 0) ? d3 : -d3;
-    if ((d2 + d3) * (d2 + d3) < tess_tol * (dx * dx + dy * dy))
-    {
-        ImVec2 p_current(x4, y4);
-        ImVec2 p_line = ImLineClosestPoint(p_last, p_current, p);
-        float dist2 = ImLengthSqr(p - p_line);
-        if (dist2 < p_closest_dist2)
-        {
-            p_closest = p_line;
-            p_closest_dist2 = dist2;
-        }
-        p_last = p_current;
-    }
-    else if (level < 10)
-    {
-        float x12 = (x1 + x2)*0.5f,       y12 = (y1 + y2)*0.5f;
-        float x23 = (x2 + x3)*0.5f,       y23 = (y2 + y3)*0.5f;
-        float x34 = (x3 + x4)*0.5f,       y34 = (y3 + y4)*0.5f;
-        float x123 = (x12 + x23)*0.5f,    y123 = (y12 + y23)*0.5f;
-        float x234 = (x23 + x34)*0.5f,    y234 = (y23 + y34)*0.5f;
-        float x1234 = (x123 + x234)*0.5f, y1234 = (y123 + y234)*0.5f;
-        ImBezierCubicClosestPointCasteljauStep(p, p_closest, p_last, p_closest_dist2, x1, y1, x12, y12, x123, y123, x1234, y1234, tess_tol, level + 1);
-        ImBezierCubicClosestPointCasteljauStep(p, p_closest, p_last, p_closest_dist2, x1234, y1234, x234, y234, x34, y34, x4, y4, tess_tol, level + 1);
-    }
-}
-
-ImVec2 ImBezierCubicClosestPointCasteljau(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, float tess_tol)
-{
-    IM_ASSERT(tess_tol > 0.0f);
-    ImVec2 p_last = p1;
-    ImVec2 p_closest;
-    float p_closest_dist2 = FLT_MAX;
-    ImBezierCubicClosestPointCasteljauStep(p, p_closest, p_last, p_closest_dist2, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, tess_tol, 0);
-    return p_closest;
-}
-
-ImVec2 ImLineClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& p)
-{
-    ImVec2 ap = p - a;
-    ImVec2 ab_dir = b - a;
-    float dot = ap.x * ab_dir.x + ap.y * ab_dir.y;
-    if (dot < 0.0f)
-        return a;
-    float ab_len_sqr = ab_dir.x * ab_dir.x + ab_dir.y * ab_dir.y;
-    if (dot > ab_len_sqr)
-        return b;
-    return a + ab_dir * dot / ab_len_sqr;
-}
-
-bool ImTriangleContainsPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p)
-{
-    bool b1 = ((p.x - b.x) * (a.y - b.y) - (p.y - b.y) * (a.x - b.x)) < 0.0f;
-    bool b2 = ((p.x - c.x) * (b.y - c.y) - (p.y - c.y) * (b.x - c.x)) < 0.0f;
-    bool b3 = ((p.x - a.x) * (c.y - a.y) - (p.y - a.y) * (c.x - a.x)) < 0.0f;
-    return ((b1 == b2) && (b2 == b3));
-}
-
-void ImTriangleBarycentricCoords(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p, float& out_u, float& out_v, float& out_w)
-{
-    ImVec2 v0 = b - a;
-    ImVec2 v1 = c - a;
-    ImVec2 v2 = p - a;
-    const float denom = v0.x * v1.y - v1.x * v0.y;
-    out_v = (v2.x * v1.y - v1.x * v2.y) / denom;
-    out_w = (v0.x * v2.y - v2.x * v0.y) / denom;
-    out_u = 1.0f - out_v - out_w;
-}
-
-ImVec2 ImTriangleClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p)
-{
-    ImVec2 proj_ab = ImLineClosestPoint(a, b, p);
-    ImVec2 proj_bc = ImLineClosestPoint(b, c, p);
-    ImVec2 proj_ca = ImLineClosestPoint(c, a, p);
-    float dist2_ab = ImLengthSqr(p - proj_ab);
-    float dist2_bc = ImLengthSqr(p - proj_bc);
-    float dist2_ca = ImLengthSqr(p - proj_ca);
-    float m = ImMin(dist2_ab, ImMin(dist2_bc, dist2_ca));
-    if (m == dist2_ab)
-        return proj_ab;
-    if (m == dist2_bc)
-        return proj_bc;
-    return proj_ca;
-}
-
-int ImStricmp(const char* str1, const char* str2)
-{
-    int d;
-    while ((d = toupper(*str2) - toupper(*str1)) == 0 && *str1) { str1++; str2++; }
-    return d;
-}
-
-int ImStrnicmp(const char* str1, const char* str2, size_t count)
-{
-    int d = 0;
-    while (count > 0 && (d = toupper(*str2) - toupper(*str1)) == 0 && *str1) { str1++; str2++; count--; }
-    return d;
-}
-
-void ImStrncpy(char* dst, const char* src, size_t count)
-{
-    if (count < 1)
-        return;
-    if (count > 1)
-        strncpy(dst, src, count - 1);
-    dst[count - 1] = 0;
-}
-
-char* ImStrdup(const char* str)
-{
-    size_t len = strlen(str);
-    void* buf = IM_ALLOC(len + 1);
-    return (char*)memcpy(buf, (const void*)str, len + 1);
-}
-
-char* ImStrdupcpy(char* dst, size_t* p_dst_size, const char* src)
-{
-    size_t dst_buf_size = p_dst_size ? *p_dst_size : strlen(dst) + 1;
-    size_t src_size = strlen(src) + 1;
-    if (dst_buf_size < src_size)
-    {
-        IM_FREE(dst);
-        dst = (char*)IM_ALLOC(src_size);
-        if (p_dst_size)
-            *p_dst_size = src_size;
-    }
-    return (char*)memcpy(dst, (const void*)src, src_size);
-}
-
-const char* ImStrchrRange(const char* str, const char* str_end, char c)
-{
-    const char* p = (const char*)memchr(str, (int)c, str_end - str);
-    return p;
-}
-
-int ImStrlenW(const ImWchar* str)
-{
-    int n = 0;
-    while (*str++) n++;
-    return n;
-}
-
-const char* ImStreolRange(const char* str, const char* str_end)
-{
-    const char* p = (const char*)memchr(str, '\n', str_end - str);
-    return p ? p : str_end;
-}
-
-const ImWchar* ImStrbolW(const ImWchar* buf_mid_line, const ImWchar* buf_begin)   
-{
-    while (buf_mid_line > buf_begin && buf_mid_line[-1] != '\n')
-        buf_mid_line--;
-    return buf_mid_line;
-}
-
-const char* ImStristr(const char* haystack, const char* haystack_end, const char* needle, const char* needle_end)
-{
-    if (!needle_end)
-        needle_end = needle + strlen(needle);
-
-    const char un0 = (char)toupper(*needle);
-    while ((!haystack_end && *haystack) || (haystack_end && haystack < haystack_end))
-    {
-        if (toupper(*haystack) == un0)
-        {
-            const char* b = needle + 1;
-            for (const char* a = haystack + 1; b < needle_end; a++, b++)
-                if (toupper(*a) != toupper(*b))
-                    break;
-            if (b == needle_end)
-                return haystack;
-        }
-        haystack++;
-    }
-    return NULL;
-}
-
-void ImStrTrimBlanks(char* buf)
-{
-    char* p = buf;
-    while (p[0] == ' ' || p[0] == '\t')       
-        p++;
-    char* p_start = p;
-    while (*p != 0)                             
-        p++;
-    while (p > p_start && (p[-1] == ' ' || p[-1] == '\t'))    
-        p--;
-    if (p_start != buf)                            
-        memmove(buf, p_start, p - p_start);
-    buf[p - p_start] = 0;                     
-}
-
-const char* ImStrSkipBlank(const char* str)
-{
-    while (str[0] == ' ' || str[0] == '\t')
-        str++;
-    return str;
-}
-
-#ifndef IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS
-
-#ifdef IMGUI_USE_STB_SPRINTF
-#define STB_SPRINTF_IMPLEMENTATION
-#include "stb_sprintf.h"
-#endif
-
-#if defined(_MSC_VER) && !defined(vsnprintf)
-#define vsnprintf _vsnprintf
-#endif
-
-int ImFormatString(char* buf, size_t buf_size, const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-#ifdef IMGUI_USE_STB_SPRINTF
-    int w = stbsp_vsnprintf(buf, (int)buf_size, fmt, args);
-#else
-    int w = vsnprintf(buf, buf_size, fmt, args);
-#endif
-    va_end(args);
-    if (buf == NULL)
-        return w;
-    if (w == -1 || w >= (int)buf_size)
-        w = (int)buf_size - 1;
-    buf[w] = 0;
-    return w;
-}
-
-int ImFormatStringV(char* buf, size_t buf_size, const char* fmt, va_list args)
-{
-#ifdef IMGUI_USE_STB_SPRINTF
-    int w = stbsp_vsnprintf(buf, (int)buf_size, fmt, args);
-#else
-    int w = vsnprintf(buf, buf_size, fmt, args);
-#endif
-    if (buf == NULL)
-        return w;
-    if (w == -1 || w >= (int)buf_size)
-        w = (int)buf_size - 1;
-    buf[w] = 0;
-    return w;
-}
-#endif   
-
-static const ImU32 GCrc32LookupTable[256] =
-{
-    0x00000000,0x77073096,0xEE0E612C,0x990951BA,0x076DC419,0x706AF48F,0xE963A535,0x9E6495A3,0x0EDB8832,0x79DCB8A4,0xE0D5E91E,0x97D2D988,0x09B64C2B,0x7EB17CBD,0xE7B82D07,0x90BF1D91,
-    0x1DB71064,0x6AB020F2,0xF3B97148,0x84BE41DE,0x1ADAD47D,0x6DDDE4EB,0xF4D4B551,0x83D385C7,0x136C9856,0x646BA8C0,0xFD62F97A,0x8A65C9EC,0x14015C4F,0x63066CD9,0xFA0F3D63,0x8D080DF5,
-    0x3B6E20C8,0x4C69105E,0xD56041E4,0xA2677172,0x3C03E4D1,0x4B04D447,0xD20D85FD,0xA50AB56B,0x35B5A8FA,0x42B2986C,0xDBBBC9D6,0xACBCF940,0x32D86CE3,0x45DF5C75,0xDCD60DCF,0xABD13D59,
-    0x26D930AC,0x51DE003A,0xC8D75180,0xBFD06116,0x21B4F4B5,0x56B3C423,0xCFBA9599,0xB8BDA50F,0x2802B89E,0x5F058808,0xC60CD9B2,0xB10BE924,0x2F6F7C87,0x58684C11,0xC1611DAB,0xB6662D3D,
-    0x76DC4190,0x01DB7106,0x98D220BC,0xEFD5102A,0x71B18589,0x06B6B51F,0x9FBFE4A5,0xE8B8D433,0x7807C9A2,0x0F00F934,0x9609A88E,0xE10E9818,0x7F6A0DBB,0x086D3D2D,0x91646C97,0xE6635C01,
-    0x6B6B51F4,0x1C6C6162,0x856530D8,0xF262004E,0x6C0695ED,0x1B01A57B,0x8208F4C1,0xF50FC457,0x65B0D9C6,0x12B7E950,0x8BBEB8EA,0xFCB9887C,0x62DD1DDF,0x15DA2D49,0x8CD37CF3,0xFBD44C65,
-    0x4DB26158,0x3AB551CE,0xA3BC0074,0xD4BB30E2,0x4ADFA541,0x3DD895D7,0xA4D1C46D,0xD3D6F4FB,0x4369E96A,0x346ED9FC,0xAD678846,0xDA60B8D0,0x44042D73,0x33031DE5,0xAA0A4C5F,0xDD0D7CC9,
-    0x5005713C,0x270241AA,0xBE0B1010,0xC90C2086,0x5768B525,0x206F85B3,0xB966D409,0xCE61E49F,0x5EDEF90E,0x29D9C998,0xB0D09822,0xC7D7A8B4,0x59B33D17,0x2EB40D81,0xB7BD5C3B,0xC0BA6CAD,
-    0xEDB88320,0x9ABFB3B6,0x03B6E20C,0x74B1D29A,0xEAD54739,0x9DD277AF,0x04DB2615,0x73DC1683,0xE3630B12,0x94643B84,0x0D6D6A3E,0x7A6A5AA8,0xE40ECF0B,0x9309FF9D,0x0A00AE27,0x7D079EB1,
-    0xF00F9344,0x8708A3D2,0x1E01F268,0x6906C2FE,0xF762575D,0x806567CB,0x196C3671,0x6E6B06E7,0xFED41B76,0x89D32BE0,0x10DA7A5A,0x67DD4ACC,0xF9B9DF6F,0x8EBEEFF9,0x17B7BE43,0x60B08ED5,
-    0xD6D6A3E8,0xA1D1937E,0x38D8C2C4,0x4FDFF252,0xD1BB67F1,0xA6BC5767,0x3FB506DD,0x48B2364B,0xD80D2BDA,0xAF0A1B4C,0x36034AF6,0x41047A60,0xDF60EFC3,0xA867DF55,0x316E8EEF,0x4669BE79,
-    0xCB61B38C,0xBC66831A,0x256FD2A0,0x5268E236,0xCC0C7795,0xBB0B4703,0x220216B9,0x5505262F,0xC5BA3BBE,0xB2BD0B28,0x2BB45A92,0x5CB36A04,0xC2D7FFA7,0xB5D0CF31,0x2CD99E8B,0x5BDEAE1D,
-    0x9B64C2B0,0xEC63F226,0x756AA39C,0x026D930A,0x9C0906A9,0xEB0E363F,0x72076785,0x05005713,0x95BF4A82,0xE2B87A14,0x7BB12BAE,0x0CB61B38,0x92D28E9B,0xE5D5BE0D,0x7CDCEFB7,0x0BDBDF21,
-    0x86D3D2D4,0xF1D4E242,0x68DDB3F8,0x1FDA836E,0x81BE16CD,0xF6B9265B,0x6FB077E1,0x18B74777,0x88085AE6,0xFF0F6A70,0x66063BCA,0x11010B5C,0x8F659EFF,0xF862AE69,0x616BFFD3,0x166CCF45,
-    0xA00AE278,0xD70DD2EE,0x4E048354,0x3903B3C2,0xA7672661,0xD06016F7,0x4969474D,0x3E6E77DB,0xAED16A4A,0xD9D65ADC,0x40DF0B66,0x37D83BF0,0xA9BCAE53,0xDEBB9EC5,0x47B2CF7F,0x30B5FFE9,
-    0xBDBDF21C,0xCABAC28A,0x53B39330,0x24B4A3A6,0xBAD03605,0xCDD70693,0x54DE5729,0x23D967BF,0xB3667A2E,0xC4614AB8,0x5D681B02,0x2A6F2B94,0xB40BBE37,0xC30C8EA1,0x5A05DF1B,0x2D02EF8D,
-};
-
-ImGuiID ImHashData(const void* data_p, size_t data_size, ImU32 seed)
-{
-    ImU32 crc = ~seed;
-    const unsigned char* data = (const unsigned char*)data_p;
-    const ImU32* crc32_lut = GCrc32LookupTable;
-    while (data_size-- != 0)
-        crc = (crc >> 8) ^ crc32_lut[(crc & 0xFF) ^ *data++];
-    return ~crc;
-}
-
-ImGuiID ImHashStr(const char* data_p, size_t data_size, ImU32 seed)
-{
-    seed = ~seed;
-    ImU32 crc = seed;
-    const unsigned char* data = (const unsigned char*)data_p;
-    const ImU32* crc32_lut = GCrc32LookupTable;
-    if (data_size != 0)
-    {
-        while (data_size-- != 0)
-        {
-            unsigned char c = *data++;
-            if (c == '#' && data_size >= 2 && data[0] == '#' && data[1] == '#')
-                crc = seed;
-            crc = (crc >> 8) ^ crc32_lut[(crc & 0xFF) ^ c];
-        }
-    }
-    else
-    {
-        while (unsigned char c = *data++)
-        {
-            if (c == '#' && data[0] == '#' && data[1] == '#')
-                crc = seed;
-            crc = (crc >> 8) ^ crc32_lut[(crc & 0xFF) ^ c];
-        }
-    }
-    return ~crc;
-}
-
-#ifndef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS
-
-ImFileHandle ImFileOpen(const char* filename, const char* mode)
-{
-#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(__CYGWIN__) && !defined(__GNUC__)
-    const int filename_wsize = ::MultiByteToWideChar(CP_UTF8, 0, filename, -1, NULL, 0);
-    const int mode_wsize = ::MultiByteToWideChar(CP_UTF8, 0, mode, -1, NULL, 0);
-    ImVector<ImWchar> buf;
-    buf.resize(filename_wsize + mode_wsize);
-    ::MultiByteToWideChar(CP_UTF8, 0, filename, -1, (wchar_t*)&buf[0], filename_wsize);
-    ::MultiByteToWideChar(CP_UTF8, 0, mode, -1, (wchar_t*)&buf[filename_wsize], mode_wsize);
-    return ::_wfopen((const wchar_t*)&buf[0], (const wchar_t*)&buf[filename_wsize]);
-#else
-    return fopen(filename, mode);
-#endif
-}
-
-bool    ImFileClose(ImFileHandle f)     { return fclose(f) == 0; }
-ImU64   ImFileGetSize(ImFileHandle f)   { long off = 0, sz = 0; return ((off = ftell(f)) != -1 && !fseek(f, 0, SEEK_END) && (sz = ftell(f)) != -1 && !fseek(f, off, SEEK_SET)) ? (ImU64)sz : (ImU64)-1; }
-ImU64   ImFileRead(void* data, ImU64 sz, ImU64 count, ImFileHandle f)           { return fread(data, (size_t)sz, (size_t)count, f); }
-ImU64   ImFileWrite(const void* data, ImU64 sz, ImU64 count, ImFileHandle f)    { return fwrite(data, (size_t)sz, (size_t)count, f); }
-#endif   
-
-void*   ImFileLoadToMemory(const char* filename, const char* mode, size_t* out_file_size, int padding_bytes)
-{
-    IM_ASSERT(filename && mode);
-    if (out_file_size)
-        *out_file_size = 0;
-
-    ImFileHandle f;
-    if ((f = ImFileOpen(filename, mode)) == NULL)
-        return NULL;
-
-    size_t file_size = (size_t)ImFileGetSize(f);
-    if (file_size == (size_t)-1)
-    {
-        ImFileClose(f);
-        return NULL;
-    }
-
-    void* file_data = IM_ALLOC(file_size + padding_bytes);
-    if (file_data == NULL)
-    {
-        ImFileClose(f);
-        return NULL;
-    }
-    if (ImFileRead(file_data, 1, file_size, f) != file_size)
-    {
-        ImFileClose(f);
-        IM_FREE(file_data);
-        return NULL;
-    }
-    if (padding_bytes > 0)
-        memset((void*)(((char*)file_data) + file_size), 0, (size_t)padding_bytes);
-
-    ImFileClose(f);
-    if (out_file_size)
-        *out_file_size = file_size;
-
-    return file_data;
-}
-
-int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end)
-{
-    static const char lengths[32] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 3, 3, 4, 0 };
-    static const int masks[]  = { 0x00, 0x7f, 0x1f, 0x0f, 0x07 };
-    static const uint32_t mins[] = { 0x400000, 0, 0x80, 0x800, 0x10000 };
-    static const int shiftc[] = { 0, 18, 12, 6, 0 };
-    static const int shifte[] = { 0, 6, 4, 2, 0 };
-    int len = lengths[*(const unsigned char*)in_text >> 3];
-    int wanted = len + !len;
-
-    if (in_text_end == NULL)
-        in_text_end = in_text + wanted;         
-
-    unsigned char s[4];
-    s[0] = in_text + 0 < in_text_end ? in_text[0] : 0;
-    s[1] = in_text + 1 < in_text_end ? in_text[1] : 0;
-    s[2] = in_text + 2 < in_text_end ? in_text[2] : 0;
-    s[3] = in_text + 3 < in_text_end ? in_text[3] : 0;
-
-    *out_char  = (uint32_t)(s[0] & masks[len]) << 18;
-    *out_char |= (uint32_t)(s[1] & 0x3f) << 12;
-    *out_char |= (uint32_t)(s[2] & 0x3f) <<  6;
-    *out_char |= (uint32_t)(s[3] & 0x3f) <<  0;
-    *out_char >>= shiftc[len];
-
-    int e = 0;
-    e  = (*out_char < mins[len]) << 6;   
-    e |= ((*out_char >> 11) == 0x1b) << 7;    
-    e |= (*out_char > IM_UNICODE_CODEPOINT_MAX) << 8;     
-    e |= (s[1] & 0xc0) >> 2;
-    e |= (s[2] & 0xc0) >> 4;
-    e |= (s[3]       ) >> 6;
-    e ^= 0x2a;         
-    e >>= shifte[len];
-
-    if (e)
-    {
-        wanted = ImMin(wanted, !!s[0] + !!s[1] + !!s[2] + !!s[3]);
-        *out_char = IM_UNICODE_CODEPOINT_INVALID;
-    }
-
-    return wanted;
-}
-
-int ImTextStrFromUtf8(ImWchar* buf, int buf_size, const char* in_text, const char* in_text_end, const char** in_text_remaining)
-{
-    ImWchar* buf_out = buf;
-    ImWchar* buf_end = buf + buf_size;
-    while (buf_out < buf_end - 1 && (!in_text_end || in_text < in_text_end) && *in_text)
-    {
-        unsigned int c;
-        in_text += ImTextCharFromUtf8(&c, in_text, in_text_end);
-        if (c == 0)
-            break;
-        *buf_out++ = (ImWchar)c;
-    }
-    *buf_out = 0;
-    if (in_text_remaining)
-        *in_text_remaining = in_text;
-    return (int)(buf_out - buf);
-}
-
-int ImTextCountCharsFromUtf8(const char* in_text, const char* in_text_end)
-{
-    int char_count = 0;
-    while ((!in_text_end || in_text < in_text_end) && *in_text)
-    {
-        unsigned int c;
-        in_text += ImTextCharFromUtf8(&c, in_text, in_text_end);
-        if (c == 0)
-            break;
-        char_count++;
-    }
-    return char_count;
-}
-
-static inline int ImTextCharToUtf8(char* buf, int buf_size, unsigned int c)
-{
-    if (c < 0x80)
-    {
-        buf[0] = (char)c;
-        return 1;
-    }
-    if (c < 0x800)
-    {
-        if (buf_size < 2) return 0;
-        buf[0] = (char)(0xc0 + (c >> 6));
-        buf[1] = (char)(0x80 + (c & 0x3f));
-        return 2;
-    }
-    if (c < 0x10000)
-    {
-        if (buf_size < 3) return 0;
-        buf[0] = (char)(0xe0 + (c >> 12));
-        buf[1] = (char)(0x80 + ((c >> 6) & 0x3f));
-        buf[2] = (char)(0x80 + ((c ) & 0x3f));
-        return 3;
-    }
-    if (c <= 0x10FFFF)
-    {
-        if (buf_size < 4) return 0;
-        buf[0] = (char)(0xf0 + (c >> 18));
-        buf[1] = (char)(0x80 + ((c >> 12) & 0x3f));
-        buf[2] = (char)(0x80 + ((c >> 6) & 0x3f));
-        buf[3] = (char)(0x80 + ((c ) & 0x3f));
-        return 4;
-    }
-    return 0;
-}
-
-int ImTextCountUtf8BytesFromChar(const char* in_text, const char* in_text_end)
-{
-    unsigned int unused = 0;
-    return ImTextCharFromUtf8(&unused, in_text, in_text_end);
-}
-
-static inline int ImTextCountUtf8BytesFromChar(unsigned int c)
-{
-    if (c < 0x80) return 1;
-    if (c < 0x800) return 2;
-    if (c < 0x10000) return 3;
-    if (c <= 0x10FFFF) return 4;
-    return 3;
-}
-
-int ImTextStrToUtf8(char* buf, int buf_size, const ImWchar* in_text, const ImWchar* in_text_end)
-{
-    char* buf_out = buf;
-    const char* buf_end = buf + buf_size;
-    while (buf_out < buf_end - 1 && (!in_text_end || in_text < in_text_end) && *in_text)
-    {
-        unsigned int c = (unsigned int)(*in_text++);
-        if (c < 0x80)
-            *buf_out++ = (char)c;
-        else
-            buf_out += ImTextCharToUtf8(buf_out, (int)(buf_end - buf_out - 1), c);
-    }
-    *buf_out = 0;
-    return (int)(buf_out - buf);
-}
-
-int ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const ImWchar* in_text_end)
-{
-    int bytes_count = 0;
-    while ((!in_text_end || in_text < in_text_end) && *in_text)
-    {
-        unsigned int c = (unsigned int)(*in_text++);
-        if (c < 0x80)
-            bytes_count++;
-        else
-            bytes_count += ImTextCountUtf8BytesFromChar(c);
-    }
-    return bytes_count;
-}
-
-IMGUI_API ImU32 ImAlphaBlendColors(ImU32 col_a, ImU32 col_b)
-{
-    float t = ((col_b >> IM_COL32_A_SHIFT) & 0xFF) / 255.f;
-    int r = ImLerp((int)(col_a >> IM_COL32_R_SHIFT) & 0xFF, (int)(col_b >> IM_COL32_R_SHIFT) & 0xFF, t);
-    int g = ImLerp((int)(col_a >> IM_COL32_G_SHIFT) & 0xFF, (int)(col_b >> IM_COL32_G_SHIFT) & 0xFF, t);
-    int b = ImLerp((int)(col_a >> IM_COL32_B_SHIFT) & 0xFF, (int)(col_b >> IM_COL32_B_SHIFT) & 0xFF, t);
-    return IM_COL32(r, g, b, 0xFF);
-}
-
-ImVec4 ImGui::ColorConvertU32ToFloat4(ImU32 in)
-{
-    float s = 1.0f / 255.0f;
-    return ImVec4(
-        ((in >> IM_COL32_R_SHIFT) & 0xFF) * s,
-        ((in >> IM_COL32_G_SHIFT) & 0xFF) * s,
-        ((in >> IM_COL32_B_SHIFT) & 0xFF) * s,
-        ((in >> IM_COL32_A_SHIFT) & 0xFF) * s);
-}
-
-ImU32 ImGui::ColorConvertFloat4ToU32(const ImVec4& in)
-{
-    ImU32 out;
-    out  = ((ImU32)IM_F32_TO_INT8_SAT(in.x)) << IM_COL32_R_SHIFT;
-    out |= ((ImU32)IM_F32_TO_INT8_SAT(in.y)) << IM_COL32_G_SHIFT;
-    out |= ((ImU32)IM_F32_TO_INT8_SAT(in.z)) << IM_COL32_B_SHIFT;
-    out |= ((ImU32)IM_F32_TO_INT8_SAT(in.w)) << IM_COL32_A_SHIFT;
-    return out;
-}
-
-void ImGui::ColorConvertRGBtoHSV(float r, float g, float b, float& out_h, float& out_s, float& out_v)
-{
-    float K = 0.f;
-    if (g < b)
-    {
-        ImSwap(g, b);
-        K = -1.f;
-    }
-    if (r < g)
-    {
-        ImSwap(r, g);
-        K = -2.f / 6.f - K;
-    }
-
-    const float chroma = r - (g < b ? g : b);
-    out_h = ImFabs(K + (g - b) / (6.f * chroma + 1e-20f));
-    out_s = chroma / (r + 1e-20f);
-    out_v = r;
-}
-
-void ImGui::ColorConvertHSVtoRGB(float h, float s, float v, float& out_r, float& out_g, float& out_b)
-{
-    if (s == 0.0f)
-    {
-        out_r = out_g = out_b = v;
-        return;
-    }
-
-    h = ImFmod(h, 1.0f) / (60.0f / 360.0f);
-    int   i = (int)h;
-    float f = h - (float)i;
-    float p = v * (1.0f - s);
-    float q = v * (1.0f - s * f);
-    float t = v * (1.0f - s * (1.0f - f));
-
-    switch (i)
-    {
-    case 0: out_r = v; out_g = t; out_b = p; break;
-    case 1: out_r = q; out_g = v; out_b = p; break;
-    case 2: out_r = p; out_g = v; out_b = t; break;
-    case 3: out_r = p; out_g = q; out_b = v; break;
-    case 4: out_r = t; out_g = p; out_b = v; break;
-    case 5: default: out_r = v; out_g = p; out_b = q; break;
-    }
-}
-
-static ImGuiStorage::ImGuiStoragePair* LowerBound(ImVector<ImGuiStorage::ImGuiStoragePair>& data, ImGuiID key)
-{
-    ImGuiStorage::ImGuiStoragePair* first = data.Data;
-    ImGuiStorage::ImGuiStoragePair* last = data.Data + data.Size;
-    size_t count = (size_t)(last - first);
-    while (count > 0)
-    {
-        size_t count2 = count >> 1;
-        ImGuiStorage::ImGuiStoragePair* mid = first + count2;
-        if (mid->key < key)
-        {
-            first = ++mid;
-            count -= count2 + 1;
-        }
-        else
-        {
-            count = count2;
-        }
-    }
-    return first;
-}
-
-void ImGuiStorage::BuildSortByKey()
-{
-    struct StaticFunc
-    {
-        static int IMGUI_CDECL PairCompareByID(const void* lhs, const void* rhs)
-        {
-            if (((const ImGuiStoragePair*)lhs)->key > ((const ImGuiStoragePair*)rhs)->key) return +1;
-            if (((const ImGuiStoragePair*)lhs)->key < ((const ImGuiStoragePair*)rhs)->key) return -1;
-            return 0;
-        }
-    };
-    if (Data.Size > 1)
-        ImQsort(Data.Data, (size_t)Data.Size, sizeof(ImGuiStoragePair), StaticFunc::PairCompareByID);
-}
-
-int ImGuiStorage::GetInt(ImGuiID key, int default_val) const
-{
-    ImGuiStoragePair* it = LowerBound(const_cast<ImVector<ImGuiStoragePair>&>(Data), key);
-    if (it == Data.end() || it->key != key)
-        return default_val;
-    return it->val_i;
-}
-
-bool ImGuiStorage::GetBool(ImGuiID key, bool default_val) const
-{
-    return GetInt(key, default_val ? 1 : 0) != 0;
-}
-
-float ImGuiStorage::GetFloat(ImGuiID key, float default_val) const
-{
-    ImGuiStoragePair* it = LowerBound(const_cast<ImVector<ImGuiStoragePair>&>(Data), key);
-    if (it == Data.end() || it->key != key)
-        return default_val;
-    return it->val_f;
-}
-
-void* ImGuiStorage::GetVoidPtr(ImGuiID key) const
-{
-    ImGuiStoragePair* it = LowerBound(const_cast<ImVector<ImGuiStoragePair>&>(Data), key);
-    if (it == Data.end() || it->key != key)
-        return NULL;
-    return it->val_p;
-}
-
-int* ImGuiStorage::GetIntRef(ImGuiID key, int default_val)
-{
-    ImGuiStoragePair* it = LowerBound(Data, key);
-    if (it == Data.end() || it->key != key)
-        it = Data.insert(it, ImGuiStoragePair(key, default_val));
-    return &it->val_i;
-}
-
-bool* ImGuiStorage::GetBoolRef(ImGuiID key, bool default_val)
-{
-    return (bool*)GetIntRef(key, default_val ? 1 : 0);
-}
-
-float* ImGuiStorage::GetFloatRef(ImGuiID key, float default_val)
-{
-    ImGuiStoragePair* it = LowerBound(Data, key);
-    if (it == Data.end() || it->key != key)
-        it = Data.insert(it, ImGuiStoragePair(key, default_val));
-    return &it->val_f;
-}
-
-void** ImGuiStorage::GetVoidPtrRef(ImGuiID key, void* default_val)
-{
-    ImGuiStoragePair* it = LowerBound(Data, key);
-    if (it == Data.end() || it->key != key)
-        it = Data.insert(it, ImGuiStoragePair(key, default_val));
-    return &it->val_p;
-}
-
-void ImGuiStorage::SetInt(ImGuiID key, int val)
-{
-    ImGuiStoragePair* it = LowerBound(Data, key);
-    if (it == Data.end() || it->key != key)
-    {
-        Data.insert(it, ImGuiStoragePair(key, val));
-        return;
-    }
-    it->val_i = val;
-}
-
-void ImGuiStorage::SetBool(ImGuiID key, bool val)
-{
-    SetInt(key, val ? 1 : 0);
-}
-
-void ImGuiStorage::SetFloat(ImGuiID key, float val)
-{
-    ImGuiStoragePair* it = LowerBound(Data, key);
-    if (it == Data.end() || it->key != key)
-    {
-        Data.insert(it, ImGuiStoragePair(key, val));
-        return;
-    }
-    it->val_f = val;
-}
-
-void ImGuiStorage::SetVoidPtr(ImGuiID key, void* val)
-{
-    ImGuiStoragePair* it = LowerBound(Data, key);
-    if (it == Data.end() || it->key != key)
-    {
-        Data.insert(it, ImGuiStoragePair(key, val));
-        return;
-    }
-    it->val_p = val;
-}
-
-void ImGuiStorage::SetAllInt(int v)
-{
-    for (int i = 0; i < Data.Size; i++)
-        Data[i].val_i = v;
-}
-
-ImGuiTextFilter::ImGuiTextFilter(const char* default_filter)
-{
-    if (default_filter)
-    {
-        ImStrncpy(InputBuf, default_filter, IM_ARRAYSIZE(InputBuf));
-        Build();
-    }
-    else
-    {
-        InputBuf[0] = 0;
-        CountGrep = 0;
-    }
-}
-
-bool ImGuiTextFilter::Draw(const char* label, float width)
-{
-    if (width != 0.0f)
-        ImGui::SetNextItemWidth(width);
-    bool value_changed = ImGui::InputText(label, InputBuf, IM_ARRAYSIZE(InputBuf));
-    if (value_changed)
-        Build();
-    return value_changed;
-}
-
-void ImGuiTextFilter::ImGuiTextRange::split(char separator, ImVector<ImGuiTextRange>* out) const
-{
-    out->resize(0);
-    const char* wb = b;
-    const char* we = wb;
-    while (we < e)
-    {
-        if (*we == separator)
-        {
-            out->push_back(ImGuiTextRange(wb, we));
-            wb = we + 1;
-        }
-        we++;
-    }
-    if (wb != we)
-        out->push_back(ImGuiTextRange(wb, we));
-}
-
-void ImGuiTextFilter::Build()
-{
-    Filters.resize(0);
-    ImGuiTextRange input_range(InputBuf, InputBuf + strlen(InputBuf));
-    input_range.split(',', &Filters);
-
-    CountGrep = 0;
-    for (int i = 0; i != Filters.Size; i++)
-    {
-        ImGuiTextRange& f = Filters[i];
-        while (f.b < f.e && ImCharIsBlankA(f.b[0]))
-            f.b++;
-        while (f.e > f.b && ImCharIsBlankA(f.e[-1]))
-            f.e--;
-        if (f.empty())
-            continue;
-        if (Filters[i].b[0] != '-')
-            CountGrep += 1;
-    }
-}
-
-bool ImGuiTextFilter::PassFilter(const char* text, const char* text_end) const
-{
-    if (Filters.empty())
-        return true;
-
-    if (text == NULL)
-        text = "";
-
-    for (int i = 0; i != Filters.Size; i++)
-    {
-        const ImGuiTextRange& f = Filters[i];
-        if (f.empty())
-            continue;
-        if (f.b[0] == '-')
-        {
-            if (ImStristr(text, text_end, f.b + 1, f.e) != NULL)
-                return false;
-        }
-        else
-        {
-            if (ImStristr(text, text_end, f.b, f.e) != NULL)
-                return true;
-        }
-    }
-
-    if (CountGrep == 0)
-        return true;
-
-    return false;
-}
-
-#ifndef va_copy
-#if defined(__GNUC__) || defined(__clang__)
-#define va_copy(dest, src) __builtin_va_copy(dest, src)
-#else
-#define va_copy(dest, src) (dest = src)
-#endif
-#endif
-
-char ImGuiTextBuffer::EmptyString[1] = { 0 };
-
-void ImGuiTextBuffer::append(const char* str, const char* str_end)
-{
-    int len = str_end ? (int)(str_end - str) : (int)strlen(str);
-
-    const int write_off = (Buf.Size != 0) ? Buf.Size : 1;
-    const int needed_sz = write_off + len;
-    if (write_off + len >= Buf.Capacity)
-    {
-        int new_capacity = Buf.Capacity * 2;
-        Buf.reserve(needed_sz > new_capacity ? needed_sz : new_capacity);
-    }
-
-    Buf.resize(needed_sz);
-    memcpy(&Buf[write_off - 1], str, (size_t)len);
-    Buf[write_off - 1 + len] = 0;
-}
-
-void ImGuiTextBuffer::appendf(const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    appendfv(fmt, args);
-    va_end(args);
-}
-
-void ImGuiTextBuffer::appendfv(const char* fmt, va_list args)
-{
-    va_list args_copy;
-    va_copy(args_copy, args);
-
-    int len = ImFormatStringV(NULL, 0, fmt, args);                      
-    if (len <= 0)
-    {
-        va_end(args_copy);
-        return;
-    }
-
-    const int write_off = (Buf.Size != 0) ? Buf.Size : 1;
-    const int needed_sz = write_off + len;
-    if (write_off + len >= Buf.Capacity)
-    {
-        int new_capacity = Buf.Capacity * 2;
-        Buf.reserve(needed_sz > new_capacity ? needed_sz : new_capacity);
-    }
-
-    Buf.resize(needed_sz);
-    ImFormatStringV(&Buf[write_off - 1], (size_t)len + 1, fmt, args_copy);
-    va_end(args_copy);
-}
-
-static bool GetSkipItemForListClipping()
-{
-    ImGuiContext& g = *GImGui;
-    return (g.CurrentTable ? g.CurrentTable->HostSkipItems : g.CurrentWindow->SkipItems);
-}
-
-void ImGui::CalcListClipping(int items_count, float items_height, int* out_items_display_start, int* out_items_display_end)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (g.LogEnabled)
-    {
-        *out_items_display_start = 0;
-        *out_items_display_end = items_count;
-        return;
-    }
-    if (GetSkipItemForListClipping())
-    {
-        *out_items_display_start = *out_items_display_end = 0;
-        return;
-    }
-
-    ImRect unclipped_rect = window->ClipRect;
-    if (g.NavMoveRequest)
-        unclipped_rect.Add(g.NavScoringRect);
-    if (g.NavJustMovedToId && window->NavLastIds[0] == g.NavJustMovedToId)
-        unclipped_rect.Add(ImRect(window->Pos + window->NavRectRel[0].Min, window->Pos + window->NavRectRel[0].Max));
-
-    const ImVec2 pos = window->DC.CursorPos;
-    int start = (int)((unclipped_rect.Min.y - pos.y) / items_height);
-    int end = (int)((unclipped_rect.Max.y - pos.y) / items_height);
-
-    if (g.NavMoveRequest && g.NavMoveClipDir == ImGuiDir_Up)
-        start--;
-    if (g.NavMoveRequest && g.NavMoveClipDir == ImGuiDir_Down)
-        end++;
-
-    start = ImClamp(start, 0, items_count);
-    end = ImClamp(end + 1, start, items_count);
-    *out_items_display_start = start;
-    *out_items_display_end = end;
-}
-
-static void SetCursorPosYAndSetupForPrevLine(float pos_y, float line_height)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    float off_y = pos_y - window->DC.CursorPos.y;
-    window->DC.CursorPos.y = pos_y;
-    window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, pos_y);
-    window->DC.CursorPosPrevLine.y = window->DC.CursorPos.y - line_height;                  
-    window->DC.PrevLineSize.y = (line_height - g.Style.ItemSpacing.y);                                         
-    if (ImGuiOldColumns* columns = window->DC.CurrentColumns)
-        columns->LineMinY = window->DC.CursorPos.y;                                   
-    if (ImGuiTable* table = g.CurrentTable)
-    {
-        if (table->IsInsideRow)
-            ImGui::TableEndRow(table);
-        table->RowPosY2 = window->DC.CursorPos.y;
-        const int row_increase = (int)((off_y / line_height) + 0.5f);
-        table->RowBgColorCounter += row_increase;
-    }
-}
-
-ImGuiListClipper::ImGuiListClipper()
-{
-    memset(this, 0, sizeof(*this));
-    ItemsCount = -1;
-}
-
-ImGuiListClipper::~ImGuiListClipper()
-{
-    IM_ASSERT(ItemsCount == -1 && "Forgot to call End(), or to Step() until false?");
-}
-
-void ImGuiListClipper::Begin(int items_count, float items_height)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    if (ImGuiTable* table = g.CurrentTable)
-        if (table->IsInsideRow)
-            ImGui::TableEndRow(table);
-
-    StartPosY = window->DC.CursorPos.y;
-    ItemsHeight = items_height;
-    ItemsCount = items_count;
-    ItemsFrozen = 0;
-    StepNo = 0;
-    DisplayStart = -1;
-    DisplayEnd = 0;
-}
-
-void ImGuiListClipper::End()
-{
-    if (ItemsCount < 0)   
-        return;
-
-    if (ItemsCount < INT_MAX && DisplayStart >= 0)
-        SetCursorPosYAndSetupForPrevLine(StartPosY + (ItemsCount - ItemsFrozen) * ItemsHeight, ItemsHeight);
-    ItemsCount = -1;
-    StepNo = 3;
-}
-
-bool ImGuiListClipper::Step()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    ImGuiTable* table = g.CurrentTable;
-    if (table && table->IsInsideRow)
-        ImGui::TableEndRow(table);
-
-    if (ItemsCount == 0 || GetSkipItemForListClipping())
-    {
-        End();
-        return false;
-    }
-
-    if (StepNo == 0)
-    {
-        if (table != NULL && !table->IsUnfrozenRows)
-        {
-            DisplayStart = ItemsFrozen;
-            DisplayEnd = ItemsFrozen + 1;
-            ItemsFrozen++;
-            return true;
-        }
-
-        StartPosY = window->DC.CursorPos.y;
-        if (ItemsHeight <= 0.0f)
-        {
-            DisplayStart = ItemsFrozen;
-            DisplayEnd = ItemsFrozen + 1;
-            StepNo = 1;
-            return true;
-        }
-
-        DisplayStart = DisplayEnd;
-        StepNo = 2;
-    }
-
-    if (StepNo == 1)
-    {
-        IM_ASSERT(ItemsHeight <= 0.0f);
-        if (table)
-        {
-            const float pos_y1 = table->RowPosY1;               
-            const float pos_y2 = table->RowPosY2;              
-            ItemsHeight = pos_y2 - pos_y1;
-            window->DC.CursorPos.y = pos_y2;
-        }
-        else
-        {
-            ItemsHeight = window->DC.CursorPos.y - StartPosY;
-        }
-        IM_ASSERT(ItemsHeight > 0.0f && "Unable to calculate item height! First item hasn't moved the cursor vertically!");
-        StepNo = 2;
-    }
-
-    if (DisplayEnd >= ItemsCount)
-    {
-        End();
-        return false;
-    }
-
-    if (StepNo == 2)
-    {
-        IM_ASSERT(ItemsHeight > 0.0f);
-
-        int already_submitted = DisplayEnd;
-        ImGui::CalcListClipping(ItemsCount - already_submitted, ItemsHeight, &DisplayStart, &DisplayEnd);
-        DisplayStart += already_submitted;
-        DisplayEnd += already_submitted;
-
-        if (DisplayStart > already_submitted)
-            SetCursorPosYAndSetupForPrevLine(StartPosY + (DisplayStart - ItemsFrozen) * ItemsHeight, ItemsHeight);
-
-        StepNo = 3;
-        return true;
-    }
-
-    if (StepNo == 3)
-    {
-        if (ItemsCount < INT_MAX)
-            SetCursorPosYAndSetupForPrevLine(StartPosY + (ItemsCount - ItemsFrozen) * ItemsHeight, ItemsHeight);   
-        ItemsCount = -1;
-        return false;
-    }
-
-    IM_ASSERT(0);
-    return false;
-}
-
-ImGuiStyle& ImGui::GetStyle()
-{
-    IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
-    return GImGui->Style;
-}
-
-ImU32 ImGui::GetColorU32(ImGuiCol idx, float alpha_mul)
-{
-    ImGuiStyle& style = GImGui->Style;
-    ImVec4 c = style.Colors[idx];
-    c.w *= style.Alpha * alpha_mul;
-    return ColorConvertFloat4ToU32(c);
-}
-
-ImU32 ImGui::GetColorU32(const ImVec4& col)
-{
-    ImGuiStyle& style = GImGui->Style;
-    ImVec4 c = col;
-    c.w *= style.Alpha;
-    return ColorConvertFloat4ToU32(c);
-}
-
-const ImVec4& ImGui::GetStyleColorVec4(ImGuiCol idx)
-{
-    ImGuiStyle& style = GImGui->Style;
-    return style.Colors[idx];
-}
-
-ImU32 ImGui::GetColorU32(ImU32 col)
-{
-    ImGuiStyle& style = GImGui->Style;
-    if (style.Alpha >= 1.0f)
-        return col;
-    ImU32 a = (col & IM_COL32_A_MASK) >> IM_COL32_A_SHIFT;
-    a = (ImU32)(a * style.Alpha);             
-    return (col & ~IM_COL32_A_MASK) | (a << IM_COL32_A_SHIFT);
-}
-
-void ImGui::PushStyleColor(ImGuiCol idx, ImU32 col)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiColorMod backup;
-    backup.Col = idx;
-    backup.BackupValue = g.Style.Colors[idx];
-    g.ColorStack.push_back(backup);
-    g.Style.Colors[idx] = ColorConvertU32ToFloat4(col);
-}
-
-void ImGui::PushStyleColor(ImGuiCol idx, const ImVec4& col)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiColorMod backup;
-    backup.Col = idx;
-    backup.BackupValue = g.Style.Colors[idx];
-    g.ColorStack.push_back(backup);
-    g.Style.Colors[idx] = col;
-}
-
-void ImGui::PopStyleColor(int count)
-{
-    ImGuiContext& g = *GImGui;
-    while (count > 0)
-    {
-        ImGuiColorMod& backup = g.ColorStack.back();
-        g.Style.Colors[backup.Col] = backup.BackupValue;
-        g.ColorStack.pop_back();
-        count--;
-    }
-}
-
-struct ImGuiStyleVarInfo
-{
-    ImGuiDataType   Type;
-    ImU32           Count;
-    ImU32           Offset;
-    void*           GetVarPtr(ImGuiStyle* style) const { return (void*)((unsigned char*)style + Offset); }
-};
-
-static const ImGuiStyleVarInfo GStyleVarInfo[] =
-{
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, Alpha) },                
-    { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowPadding) },        
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowRounding) },       
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowBorderSize) },     
-    { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowMinSize) },        
-    { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowTitleAlign) },     
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ChildRounding) },        
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ChildBorderSize) },      
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, PopupRounding) },        
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, PopupBorderSize) },      
-    { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, FramePadding) },         
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, FrameRounding) },        
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, FrameBorderSize) },      
-    { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ItemSpacing) },          
-    { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ItemInnerSpacing) },     
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, IndentSpacing) },        
-    { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, CellPadding) },          
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ScrollbarSize) },        
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ScrollbarRounding) },    
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, GrabMinSize) },          
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, GrabRounding) },         
-    { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, TabRounding) },          
-    { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ButtonTextAlign) },      
-    { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, SelectableTextAlign) },  
-};
-
-static const ImGuiStyleVarInfo* GetStyleVarInfo(ImGuiStyleVar idx)
-{
-    IM_ASSERT(idx >= 0 && idx < ImGuiStyleVar_COUNT);
-    IM_ASSERT(IM_ARRAYSIZE(GStyleVarInfo) == ImGuiStyleVar_COUNT);
-    return &GStyleVarInfo[idx];
-}
-
-void ImGui::PushStyleVar(ImGuiStyleVar idx, float val)
-{
-    const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx);
-    if (var_info->Type == ImGuiDataType_Float && var_info->Count == 1)
-    {
-        ImGuiContext& g = *GImGui;
-        float* pvar = (float*)var_info->GetVarPtr(&g.Style);
-        g.StyleVarStack.push_back(ImGuiStyleMod(idx, *pvar));
-        *pvar = val;
-        return;
-    }
-    IM_ASSERT(0 && "Called PushStyleVar() float variant but variable is not a float!");
-}
-
-void ImGui::PushStyleVar(ImGuiStyleVar idx, const ImVec2& val)
-{
-    const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx);
-    if (var_info->Type == ImGuiDataType_Float && var_info->Count == 2)
-    {
-        ImGuiContext& g = *GImGui;
-        ImVec2* pvar = (ImVec2*)var_info->GetVarPtr(&g.Style);
-        g.StyleVarStack.push_back(ImGuiStyleMod(idx, *pvar));
-        *pvar = val;
-        return;
-    }
-    IM_ASSERT(0 && "Called PushStyleVar() ImVec2 variant but variable is not a ImVec2!");
-}
-
-void ImGui::PopStyleVar(int count)
-{
-    ImGuiContext& g = *GImGui;
-    while (count > 0)
-    {
-        ImGuiStyleMod& backup = g.StyleVarStack.back();
-        const ImGuiStyleVarInfo* info = GetStyleVarInfo(backup.VarIdx);
-        void* data = info->GetVarPtr(&g.Style);
-        if (info->Type == ImGuiDataType_Float && info->Count == 1)      { ((float*)data)[0] = backup.BackupFloat[0]; }
-        else if (info->Type == ImGuiDataType_Float && info->Count == 2) { ((float*)data)[0] = backup.BackupFloat[0]; ((float*)data)[1] = backup.BackupFloat[1]; }
-        g.StyleVarStack.pop_back();
-        count--;
-    }
-}
-
-const char* ImGui::GetStyleColorName(ImGuiCol idx)
-{
-    switch (idx)
-    {
-    case ImGuiCol_Text: return "Text";
-    case ImGuiCol_TextDisabled: return "TextDisabled";
-    case ImGuiCol_WindowBg: return "WindowBg";
-    case ImGuiCol_ChildBg: return "ChildBg";
-    case ImGuiCol_PopupBg: return "PopupBg";
-    case ImGuiCol_Border: return "Border";
-    case ImGuiCol_BorderShadow: return "BorderShadow";
-    case ImGuiCol_FrameBg: return "FrameBg";
-    case ImGuiCol_FrameBgHovered: return "FrameBgHovered";
-    case ImGuiCol_FrameBgActive: return "FrameBgActive";
-    case ImGuiCol_TitleBg: return "TitleBg";
-    case ImGuiCol_TitleBgActive: return "TitleBgActive";
-    case ImGuiCol_TitleBgCollapsed: return "TitleBgCollapsed";
-    case ImGuiCol_MenuBarBg: return "MenuBarBg";
-    case ImGuiCol_ScrollbarBg: return "ScrollbarBg";
-    case ImGuiCol_ScrollbarGrab: return "ScrollbarGrab";
-    case ImGuiCol_ScrollbarGrabHovered: return "ScrollbarGrabHovered";
-    case ImGuiCol_ScrollbarGrabActive: return "ScrollbarGrabActive";
-    case ImGuiCol_CheckMark: return "CheckMark";
-    case ImGuiCol_SliderGrab: return "SliderGrab";
-    case ImGuiCol_SliderGrabActive: return "SliderGrabActive";
-    case ImGuiCol_Button: return "Button";
-    case ImGuiCol_ButtonHovered: return "ButtonHovered";
-    case ImGuiCol_ButtonActive: return "ButtonActive";
-    case ImGuiCol_Header: return "Header";
-    case ImGuiCol_HeaderHovered: return "HeaderHovered";
-    case ImGuiCol_HeaderActive: return "HeaderActive";
-    case ImGuiCol_Separator: return "Separator";
-    case ImGuiCol_SeparatorHovered: return "SeparatorHovered";
-    case ImGuiCol_SeparatorActive: return "SeparatorActive";
-    case ImGuiCol_ResizeGrip: return "ResizeGrip";
-    case ImGuiCol_ResizeGripHovered: return "ResizeGripHovered";
-    case ImGuiCol_ResizeGripActive: return "ResizeGripActive";
-    case ImGuiCol_Tab: return "Tab";
-    case ImGuiCol_TabHovered: return "TabHovered";
-    case ImGuiCol_TabActive: return "TabActive";
-    case ImGuiCol_TabUnfocused: return "TabUnfocused";
-    case ImGuiCol_TabUnfocusedActive: return "TabUnfocusedActive";
-    case ImGuiCol_PlotLines: return "PlotLines";
-    case ImGuiCol_PlotLinesHovered: return "PlotLinesHovered";
-    case ImGuiCol_PlotHistogram: return "PlotHistogram";
-    case ImGuiCol_PlotHistogramHovered: return "PlotHistogramHovered";
-    case ImGuiCol_TableHeaderBg: return "TableHeaderBg";
-    case ImGuiCol_TableBorderStrong: return "TableBorderStrong";
-    case ImGuiCol_TableBorderLight: return "TableBorderLight";
-    case ImGuiCol_TableRowBg: return "TableRowBg";
-    case ImGuiCol_TableRowBgAlt: return "TableRowBgAlt";
-    case ImGuiCol_TextSelectedBg: return "TextSelectedBg";
-    case ImGuiCol_DragDropTarget: return "DragDropTarget";
-    case ImGuiCol_NavHighlight: return "NavHighlight";
-    case ImGuiCol_NavWindowingHighlight: return "NavWindowingHighlight";
-    case ImGuiCol_NavWindowingDimBg: return "NavWindowingDimBg";
-    case ImGuiCol_ModalWindowDimBg: return "ModalWindowDimBg";
-    }
-    IM_ASSERT(0);
-    return "Unknown";
-}
-
-
-const char* ImGui::FindRenderedTextEnd(const char* text, const char* text_end)
-{
-    const char* text_display_end = text;
-    if (!text_end)
-        text_end = (const char*)-1;
-
-    while (text_display_end < text_end && *text_display_end != '\0' && (text_display_end[0] != '#' || text_display_end[1] != '#'))
-        text_display_end++;
-    return text_display_end;
-}
-
-void ImGui::RenderText(ImVec2 pos, const char* text, const char* text_end, bool hide_text_after_hash, ImU32 customcol) 
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    const char* text_display_end;
-    if (hide_text_after_hash)
-    {
-        text_display_end = FindRenderedTextEnd(text, text_end);
-    }
-    else
-    {
-        if (!text_end)
-            text_end = text + strlen(text);  
-        text_display_end = text_end;
-    }
-
-    if (text != text_display_end)
-    {
-        if (!customcol) 
-            window->DrawList->AddText(g.Font, g.FontSize, pos, GetColorU32(ImGuiCol_Text), text, text_display_end);
-        else 
-            window->DrawList->AddText(g.Font, g.FontSize, pos, customcol, text, text_display_end);
-
-        if (g.LogEnabled)
-            LogRenderedText(&pos, text, text_display_end);
-    }
-}
-
-void ImGui::RenderTextWrapped(ImVec2 pos, const char* text, const char* text_end, float wrap_width)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    if (!text_end)
-        text_end = text + strlen(text);  
-
-    if (text != text_end)
-    {
-        window->DrawList->AddText(g.Font, g.FontSize, pos, GetColorU32(ImGuiCol_Text), text, text_end, wrap_width);
-        if (g.LogEnabled)
-            LogRenderedText(&pos, text, text_end);
-    }
-}
-
-void ImGui::RenderTextClippedEx(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_display_end, const ImVec2* text_size_if_known, const ImVec2& align, const ImRect* clip_rect, ImU32 customcol)
-{
-    ImVec2 pos = pos_min;
-    const ImVec2 text_size = text_size_if_known ? *text_size_if_known : CalcTextSize(text, text_display_end, false, 0.0f);
-
-    const ImVec2* clip_min = clip_rect ? &clip_rect->Min : &pos_min;
-    const ImVec2* clip_max = clip_rect ? &clip_rect->Max : &pos_max;
-    bool need_clipping = (pos.x + text_size.x >= clip_max->x) || (pos.y + text_size.y >= clip_max->y);
-    if (clip_rect)          
-        need_clipping |= (pos.x < clip_min->x) || (pos.y < clip_min->y);
-
-    if (align.x > 0.0f) pos.x = ImMax(pos.x, pos.x + (pos_max.x - pos.x - text_size.x) * align.x);
-    if (align.y > 0.0f) pos.y = ImMax(pos.y, pos.y + (pos_max.y - pos.y - text_size.y) * align.y);
-
-    if (need_clipping)
-    {
-        ImVec4 fine_clip_rect(clip_min->x, clip_min->y, clip_max->x, clip_max->y);
-
-        if (!customcol)
-            draw_list->AddText(NULL, 0.0f, pos, GetColorU32(ImGuiCol_Text), text, text_display_end, 0.0f, &fine_clip_rect);
-        else
-            draw_list->AddText(NULL, 0.0f, pos, customcol, text, text_display_end, 0.0f, &fine_clip_rect);
-    }
-    else
-    {
-
-        if (!customcol)
-            draw_list->AddText(NULL, 0.0f, pos, GetColorU32(ImGuiCol_Text), text, text_display_end, 0.0f, NULL);
-        else
-            draw_list->AddText(NULL, 0.0f, pos, customcol, text, text_display_end, 0.0f, NULL);
-    }
-}
-
-void ImGui::RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align, const ImRect* clip_rect)
-{
-    const char* text_display_end = FindRenderedTextEnd(text, text_end);
-    const int text_len = (int)(text_display_end - text);
-    if (text_len == 0)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    RenderTextClippedEx(window->DrawList, pos_min, pos_max, text, text_display_end, text_size_if_known, align, clip_rect);
-    if (g.LogEnabled)
-        LogRenderedText(&pos_min, text, text_display_end);
-}
-
-
-void ImGui::RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align, const ImRect* clip_rect, ImColor customcolor)
-{
-    const char* text_display_end = FindRenderedTextEnd(text, text_end);
-    const int text_len = (int)(text_display_end - text);
-    if (text_len == 0)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    RenderTextClippedEx(window->DrawList, pos_min, pos_max, text, text_display_end, text_size_if_known, align, clip_rect, customcolor);
-    if (g.LogEnabled)
-        LogRenderedText(&pos_min, text, text_display_end);
-}
-
-
-void ImGui::RenderTextEllipsis(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, float clip_max_x, float ellipsis_max_x, const char* text, const char* text_end_full, const ImVec2* text_size_if_known, ImU32 customcol)
-{
-    ImGuiContext& g = *GImGui;
-    if (text_end_full == NULL)
-        text_end_full = FindRenderedTextEnd(text);
-    const ImVec2 text_size = text_size_if_known ? *text_size_if_known : CalcTextSize(text, text_end_full, false, 0.0f);
-
-    if (text_size.x > pos_max.x - pos_min.x)
-    {
-        const ImFont* font = draw_list->_Data->Font;
-        const float font_size = draw_list->_Data->FontSize;
-        const char* text_end_ellipsis = NULL;
-
-        ImWchar ellipsis_char = font->EllipsisChar;
-        int ellipsis_char_count = 1;
-        if (ellipsis_char == (ImWchar)-1)
-        {
-            ellipsis_char = (ImWchar)'.';
-            ellipsis_char_count = 3;
-        }
-        const ImFontGlyph* glyph = font->FindGlyph(ellipsis_char);
-
-        float ellipsis_glyph_width = glyph->X1;                           
-        float ellipsis_total_width = ellipsis_glyph_width;           
-
-        if (ellipsis_char_count > 1)
-        {
-            const float spacing_between_dots = 1.0f * (draw_list->_Data->FontSize / font->FontSize);
-            ellipsis_glyph_width = glyph->X1 - glyph->X0 + spacing_between_dots;
-            ellipsis_total_width = ellipsis_glyph_width * (float)ellipsis_char_count - spacing_between_dots;
-        }
-
-        const float text_avail_width = ImMax((ImMax(pos_max.x, ellipsis_max_x) - ellipsis_total_width) - pos_min.x, 1.0f);
-        float text_size_clipped_x = font->CalcTextSizeA(font_size, text_avail_width, 0.0f, text, text_end_full, &text_end_ellipsis).x;
-        if (text == text_end_ellipsis && text_end_ellipsis < text_end_full)
-        {
-            text_end_ellipsis = text + ImTextCountUtf8BytesFromChar(text, text_end_full);
-            text_size_clipped_x = font->CalcTextSizeA(font_size, FLT_MAX, 0.0f, text, text_end_ellipsis).x;
-        }
-        while (text_end_ellipsis > text && ImCharIsBlankA(text_end_ellipsis[-1]))
-        {
-            text_end_ellipsis--;
-            text_size_clipped_x -= font->CalcTextSizeA(font_size, FLT_MAX, 0.0f, text_end_ellipsis, text_end_ellipsis + 1).x;       
-        }
-
-        RenderTextClippedEx(draw_list, pos_min, ImVec2(clip_max_x, pos_max.y), text, text_end_ellipsis, &text_size, ImVec2(0.0f, 0.0f));
-        float ellipsis_x = pos_min.x + text_size_clipped_x;
-        if (ellipsis_x + ellipsis_total_width <= ellipsis_max_x)
-            for (int i = 0; i < ellipsis_char_count; i++)
-            {
-                if (!customcol)
-                    font->RenderChar(draw_list, font_size, ImVec2(ellipsis_x, pos_min.y), GetColorU32(ImGuiCol_Text), ellipsis_char);
-                else
-                    font->RenderChar(draw_list, font_size, ImVec2(ellipsis_x, pos_min.y), customcol, ellipsis_char);
-
-                ellipsis_x += ellipsis_glyph_width;
-            }
-    }
-    else
-    {
-        RenderTextClippedEx(draw_list, pos_min, ImVec2(clip_max_x, pos_max.y), text, text_end_full, &text_size, ImVec2(0.0f, 0.0f), 0, customcol);
-    }
-
-    if (g.LogEnabled)
-        LogRenderedText(&pos_min, text, text_end_full);
-}
-
-void ImGui::RenderFrame(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, bool border, float rounding)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    window->DrawList->AddRectFilled(p_min, p_max, fill_col, rounding);
-    const float border_size = g.Style.FrameBorderSize;
-    if (border && border_size > 0.0f)
-    {
-        window->DrawList->AddRect(p_min + ImVec2(1, 1), p_max + ImVec2(1, 1), GetColorU32(ImGuiCol_BorderShadow), rounding, ImDrawCornerFlags_All, border_size);
-        window->DrawList->AddRect(p_min, p_max, GetColorU32(ImGuiCol_Border), rounding, ImDrawCornerFlags_All, border_size);
-    }
-}
-
-void ImGui::RenderFrameBorder(ImVec2 p_min, ImVec2 p_max, float rounding)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    const float border_size = g.Style.FrameBorderSize;
-    if (border_size > 0.0f)
-    {
-        window->DrawList->AddRect(p_min + ImVec2(1, 1), p_max + ImVec2(1, 1), GetColorU32(ImGuiCol_BorderShadow), rounding, ImDrawCornerFlags_All, border_size);
-        window->DrawList->AddRect(p_min, p_max, GetColorU32(ImGuiCol_Border), rounding, ImDrawCornerFlags_All, border_size);
-    }
-}
-
-void ImGui::RenderNavHighlight(const ImRect& bb, ImGuiID id, ImGuiNavHighlightFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    if (id != g.NavId)
-        return;
-    if (g.NavDisableHighlight && !(flags & ImGuiNavHighlightFlags_AlwaysDraw))
-        return;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->DC.NavHideHighlightOneFrame)
-        return;
-
-    float rounding = (flags & ImGuiNavHighlightFlags_NoRounding) ? 0.0f : g.Style.FrameRounding;
-    ImRect display_rect = bb;
-    display_rect.ClipWith(window->ClipRect);
-    if (flags & ImGuiNavHighlightFlags_TypeDefault)
-    {
-        const float THICKNESS = 2.0f;
-        const float DISTANCE = 3.0f + THICKNESS * 0.5f;
-        display_rect.Expand(ImVec2(DISTANCE, DISTANCE));
-        bool fully_visible = window->ClipRect.Contains(display_rect);
-        if (!fully_visible)
-            window->DrawList->PushClipRect(display_rect.Min, display_rect.Max);
-        window->DrawList->AddRect(display_rect.Min + ImVec2(THICKNESS * 0.5f, THICKNESS * 0.5f), display_rect.Max - ImVec2(THICKNESS * 0.5f, THICKNESS * 0.5f), GetColorU32(ImGuiCol_NavHighlight), rounding, ImDrawCornerFlags_All, THICKNESS);
-        if (!fully_visible)
-            window->DrawList->PopClipRect();
-    }
-    if (flags & ImGuiNavHighlightFlags_TypeThin)
-    {
-        window->DrawList->AddRect(display_rect.Min, display_rect.Max, GetColorU32(ImGuiCol_NavHighlight), rounding, ~0, 1.0f);
-    }
-}
-
-ImGuiWindow::ImGuiWindow(ImGuiContext* context, const char* name) : DrawListInst(NULL)
-{
-    memset(this, 0, sizeof(*this));
-    Name = ImStrdup(name);
-    NameBufLen = (int)strlen(name) + 1;
-    ID = ImHashStr(name);
-    IDStack.push_back(ID);
-    MoveId = GetID("#MOVE");
-    ScrollTarget = ImVec2(FLT_MAX, FLT_MAX);
-    ScrollTargetCenterRatio = ImVec2(0.5f, 0.5f);
-    AutoFitFramesX = AutoFitFramesY = -1;
-    AutoPosLastDirection = ImGuiDir_None;
-    SetWindowPosAllowFlags = SetWindowSizeAllowFlags = SetWindowCollapsedAllowFlags = ImGuiCond_Always | ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing;
-    SetWindowPosVal = SetWindowPosPivot = ImVec2(FLT_MAX, FLT_MAX);
-    LastFrameActive = -1;
-    LastTimeActive = -1.0f;
-    FontWindowScale = 1.0f;
-    SettingsOffset = -1;
-    DrawList = &DrawListInst;
-    DrawList->_Data = &context->DrawListSharedData;
-    DrawList->_OwnerName = Name;
-}
-
-ImGuiWindow::~ImGuiWindow()
-{
-    IM_ASSERT(DrawList == &DrawListInst);
-    IM_DELETE(Name);
-    for (int i = 0; i != ColumnsStorage.Size; i++)
-        ColumnsStorage[i].~ImGuiOldColumns();
-}
-
-ImGuiID ImGuiWindow::GetID(const char* str, const char* str_end)
-{
-    ImGuiID seed = IDStack.back();
-    ImGuiID id = ImHashStr(str, str_end ? (str_end - str) : 0, seed);
-    ImGui::KeepAliveID(id);
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    ImGuiContext& g = *GImGui;
-    IMGUI_TEST_ENGINE_ID_INFO2(id, ImGuiDataType_String, str, str_end);
-#endif
-    return id;
-}
-
-ImGuiID ImGuiWindow::GetID(const void* ptr)
-{
-    ImGuiID seed = IDStack.back();
-    ImGuiID id = ImHashData(&ptr, sizeof(void*), seed);
-    ImGui::KeepAliveID(id);
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    ImGuiContext& g = *GImGui;
-    IMGUI_TEST_ENGINE_ID_INFO(id, ImGuiDataType_Pointer, ptr);
-#endif
-    return id;
-}
-
-ImGuiID ImGuiWindow::GetID(int n)
-{
-    ImGuiID seed = IDStack.back();
-    ImGuiID id = ImHashData(&n, sizeof(n), seed);
-    ImGui::KeepAliveID(id);
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    ImGuiContext& g = *GImGui;
-    IMGUI_TEST_ENGINE_ID_INFO(id, ImGuiDataType_S32, (intptr_t)n);
-#endif
-    return id;
-}
-
-ImGuiID ImGuiWindow::GetIDNoKeepAlive(const char* str, const char* str_end)
-{
-    ImGuiID seed = IDStack.back();
-    ImGuiID id = ImHashStr(str, str_end ? (str_end - str) : 0, seed);
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    ImGuiContext& g = *GImGui;
-    IMGUI_TEST_ENGINE_ID_INFO2(id, ImGuiDataType_String, str, str_end);
-#endif
-    return id;
-}
-
-ImGuiID ImGuiWindow::GetIDNoKeepAlive(const void* ptr)
-{
-    ImGuiID seed = IDStack.back();
-    ImGuiID id = ImHashData(&ptr, sizeof(void*), seed);
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    ImGuiContext& g = *GImGui;
-    IMGUI_TEST_ENGINE_ID_INFO(id, ImGuiDataType_Pointer, ptr);
-#endif
-    return id;
-}
-
-ImGuiID ImGuiWindow::GetIDNoKeepAlive(int n)
-{
-    ImGuiID seed = IDStack.back();
-    ImGuiID id = ImHashData(&n, sizeof(n), seed);
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    ImGuiContext& g = *GImGui;
-    IMGUI_TEST_ENGINE_ID_INFO(id, ImGuiDataType_S32, (intptr_t)n);
-#endif
-    return id;
-}
-
-ImGuiID ImGuiWindow::GetIDFromRectangle(const ImRect& r_abs)
-{
-    ImGuiID seed = IDStack.back();
-    const int r_rel[4] = { (int)(r_abs.Min.x - Pos.x), (int)(r_abs.Min.y - Pos.y), (int)(r_abs.Max.x - Pos.x), (int)(r_abs.Max.y - Pos.y) };
-    ImGuiID id = ImHashData(&r_rel, sizeof(r_rel), seed);
-    ImGui::KeepAliveID(id);
-    return id;
-}
-
-static void SetCurrentWindow(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    g.CurrentWindow = window;
-    g.CurrentTable = window && window->DC.CurrentTableIdx != -1 ? g.Tables.GetByIndex(window->DC.CurrentTableIdx) : NULL;
-    if (window)
-        g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize();
-}
-
-void ImGui::GcCompactTransientMiscBuffers()
-{
-    ImGuiContext& g = *GImGui;
-    g.ItemFlagsStack.clear();
-    g.GroupStack.clear();
-    TableGcCompactSettings();
-}
-
-void ImGui::GcCompactTransientWindowBuffers(ImGuiWindow* window)
-{
-    window->MemoryCompacted = true;
-    window->MemoryDrawListIdxCapacity = window->DrawList->IdxBuffer.Capacity;
-    window->MemoryDrawListVtxCapacity = window->DrawList->VtxBuffer.Capacity;
-    window->IDStack.clear();
-    window->DrawList->_ClearFreeMemory();
-    window->DC.ChildWindows.clear();
-    window->DC.ItemWidthStack.clear();
-    window->DC.TextWrapPosStack.clear();
-}
-
-void ImGui::GcAwakeTransientWindowBuffers(ImGuiWindow* window)
-{
-    window->MemoryCompacted = false;
-    window->DrawList->IdxBuffer.reserve(window->MemoryDrawListIdxCapacity);
-    window->DrawList->VtxBuffer.reserve(window->MemoryDrawListVtxCapacity);
-    window->MemoryDrawListIdxCapacity = window->MemoryDrawListVtxCapacity = 0;
-}
-
-void ImGui::SetActiveID(ImGuiID id, ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    g.ActiveIdIsJustActivated = (g.ActiveId != id);
-    if (g.ActiveIdIsJustActivated)
-    {
-        g.ActiveIdTimer = 0.0f;
-        g.ActiveIdHasBeenPressedBefore = false;
-        g.ActiveIdHasBeenEditedBefore = false;
-        if (id != 0)
-        {
-            g.LastActiveId = id;
-            g.LastActiveIdTimer = 0.0f;
-        }
-    }
-    g.ActiveId = id;
-    g.ActiveIdAllowOverlap = false;
-    g.ActiveIdNoClearOnFocusLoss = false;
-    g.ActiveIdWindow = window;
-    g.ActiveIdHasBeenEditedThisFrame = false;
-    if (id)
-    {
-        g.ActiveIdIsAlive = id;
-        g.ActiveIdSource = (g.NavActivateId == id || g.NavInputId == id || g.NavJustTabbedId == id || g.NavJustMovedToId == id) ? ImGuiInputSource_Nav : ImGuiInputSource_Mouse;
-    }
-
-    g.ActiveIdUsingMouseWheel = false;
-    g.ActiveIdUsingNavDirMask = 0x00;
-    g.ActiveIdUsingNavInputMask = 0x00;
-    g.ActiveIdUsingKeyInputMask = 0x00;
-}
-
-void ImGui::ClearActiveID()
-{
-    SetActiveID(0, NULL);    
-}
-
-void ImGui::SetHoveredID(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    g.HoveredId = id;
-    g.HoveredIdAllowOverlap = false;
-    g.HoveredIdUsingMouseWheel = false;
-    if (id != 0 && g.HoveredIdPreviousFrame != id)
-        g.HoveredIdTimer = g.HoveredIdNotActiveTimer = 0.0f;
-}
-
-ImGuiID ImGui::GetHoveredID()
-{
-    ImGuiContext& g = *GImGui;
-    return g.HoveredId ? g.HoveredId : g.HoveredIdPreviousFrame;
-}
-
-void ImGui::KeepAliveID(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.ActiveId == id)
-        g.ActiveIdIsAlive = id;
-    if (g.ActiveIdPreviousFrame == id)
-        g.ActiveIdPreviousFrameIsAlive = true;
-}
-
-void ImGui::MarkItemEdited(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(g.ActiveId == id || g.ActiveId == 0 || g.DragDropActive);
-    IM_UNUSED(id);          
-    g.ActiveIdHasBeenEditedThisFrame = true;
-    g.ActiveIdHasBeenEditedBefore = true;
-    g.CurrentWindow->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_Edited;
-}
-
-static inline bool IsWindowContentHoverable(ImGuiWindow* window, ImGuiHoveredFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.NavWindow)
-        if (ImGuiWindow* focused_root_window = g.NavWindow->RootWindow)
-            if (focused_root_window->WasActive && focused_root_window != window->RootWindow)
-            {
-                if (focused_root_window->Flags & ImGuiWindowFlags_Modal)
-                    return false;
-                if ((focused_root_window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiHoveredFlags_AllowWhenBlockedByPopup))
-                    return false;
-            }
-    return true;
-}
-
-bool ImGui::IsItemHovered(ImGuiHoveredFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (g.NavDisableMouseHover && !g.NavDisableHighlight)
-        return IsItemFocused();
-
-    if (!(window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HoveredRect))
-        return false;
-    IM_ASSERT((flags & (ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows)) == 0);         
-
-    if (g.HoveredRootWindow != window->RootWindow && !(flags & ImGuiHoveredFlags_AllowWhenOverlapped))
-        return false;
-
-    if (!(flags & ImGuiHoveredFlags_AllowWhenBlockedByActiveItem))
-        if (g.ActiveId != 0 && g.ActiveId != window->DC.LastItemId && !g.ActiveIdAllowOverlap && g.ActiveId != window->MoveId)
-            return false;
-
-    if (!IsWindowContentHoverable(window, flags))
-        return false;
-
-    if ((window->DC.ItemFlags & ImGuiItemFlags_Disabled) && !(flags & ImGuiHoveredFlags_AllowWhenDisabled))
-        return false;
-
-    if (window->DC.LastItemId == window->MoveId && window->WriteAccessed)
-        return false;
-    return true;
-}
-
-bool ImGui::ItemHoverable(const ImRect& bb, ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.HoveredId != 0 && g.HoveredId != id && !g.HoveredIdAllowOverlap)
-        return false;
-
-    ImGuiWindow* window = g.CurrentWindow;
-    if (g.HoveredWindow != window)
-        return false;
-    if (g.ActiveId != 0 && g.ActiveId != id && !g.ActiveIdAllowOverlap)
-        return false;
-    if (!IsMouseHoveringRect(bb.Min, bb.Max))
-        return false;
-    if (g.NavDisableMouseHover)
-        return false;
-    if (!IsWindowContentHoverable(window, ImGuiHoveredFlags_None) || (window->DC.ItemFlags & ImGuiItemFlags_Disabled))
-    {
-        g.HoveredIdDisabled = true;
-        return false;
-    }
-
-    if (id != 0)
-    {
-        SetHoveredID(id);
-
-        if (g.DebugItemPickerActive && g.HoveredIdPreviousFrame == id)
-            GetForegroundDrawList()->AddRect(bb.Min, bb.Max, IM_COL32(255, 255, 0, 255));
-        if (g.DebugItemPickerBreakId == id)
-            IM_DEBUG_BREAK();
-    }
-
-    return true;
-}
-
-bool ImGui::IsClippedEx(const ImRect& bb, ImGuiID id, bool clip_even_when_logged)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (!bb.Overlaps(window->ClipRect))
-        if (id == 0 || (id != g.ActiveId && id != g.NavId))
-            if (clip_even_when_logged || !g.LogEnabled)
-                return true;
-    return false;
-}
-
-void ImGui::SetLastItemData(ImGuiWindow* window, ImGuiID item_id, ImGuiItemStatusFlags item_flags, const ImRect& item_rect)
-{
-    window->DC.LastItemId = item_id;
-    window->DC.LastItemStatusFlags = item_flags;
-    window->DC.LastItemRect = item_rect;
-}
-
-bool ImGui::FocusableItemRegister(ImGuiWindow* window, ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-
-    const bool is_tab_stop = (window->DC.ItemFlags & (ImGuiItemFlags_NoTabStop | ImGuiItemFlags_Disabled)) == 0;
-    window->DC.FocusCounterRegular++;
-    if (is_tab_stop)
-        window->DC.FocusCounterTabStop++;
-
-    if (g.ActiveId == id && g.FocusTabPressed && !IsActiveIdUsingKey(ImGuiKey_Tab) && g.FocusRequestNextWindow == NULL)
-    {
-        g.FocusRequestNextWindow = window;
-        g.FocusRequestNextCounterTabStop = window->DC.FocusCounterTabStop + (g.IO.KeyShift ? (is_tab_stop ? -1 : 0) : +1);                    
-    }
-
-    if (g.FocusRequestCurrWindow == window)
-    {
-        if (window->DC.FocusCounterRegular == g.FocusRequestCurrCounterRegular)
-            return true;
-        if (is_tab_stop && window->DC.FocusCounterTabStop == g.FocusRequestCurrCounterTabStop)
-        {
-            g.NavJustTabbedId = id;
-            return true;
-        }
-
-        if (g.ActiveId == id)
-            ClearActiveID();
-    }
-
-    return false;
-}
-
-void ImGui::FocusableItemUnregister(ImGuiWindow* window)
-{
-    window->DC.FocusCounterRegular--;
-    window->DC.FocusCounterTabStop--;
-}
-
-float ImGui::CalcWrapWidthForPos(const ImVec2& pos, float wrap_pos_x)
-{
-    if (wrap_pos_x < 0.0f)
-        return 0.0f;
-
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (wrap_pos_x == 0.0f)
-    {
-        wrap_pos_x = window->WorkRect.Max.x;
-    }
-    else if (wrap_pos_x > 0.0f)
-    {
-        wrap_pos_x += window->Pos.x - window->Scroll.x;        
-    }
-
-    return ImMax(wrap_pos_x - pos.x, 1.0f);
-}
-
-void* ImGui::MemAlloc(size_t size)
-{
-    if (ImGuiContext* ctx = GImGui)
-        ctx->IO.MetricsActiveAllocations++;
-    return GImAllocatorAllocFunc(size, GImAllocatorUserData);
-}
-
-void ImGui::MemFree(void* ptr)
-{
-    if (ptr)
-        if (ImGuiContext* ctx = GImGui)
-            ctx->IO.MetricsActiveAllocations--;
-    return GImAllocatorFreeFunc(ptr, GImAllocatorUserData);
-}
-
-const char* ImGui::GetClipboardText()
-{
-    ImGuiContext& g = *GImGui;
-    return g.IO.GetClipboardTextFn ? g.IO.GetClipboardTextFn(g.IO.ClipboardUserData) : "";
-}
-
-void ImGui::SetClipboardText(const char* text)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.IO.SetClipboardTextFn)
-        g.IO.SetClipboardTextFn(g.IO.ClipboardUserData, text);
-}
-
-const char* ImGui::GetVersion()
-{
-    return IMGUI_VERSION;
-}
-
-ImGuiContext* ImGui::GetCurrentContext()
-{
-    return GImGui;
-}
-
-void ImGui::SetCurrentContext(ImGuiContext* ctx)
-{
-#ifdef IMGUI_SET_CURRENT_CONTEXT_FUNC
-    IMGUI_SET_CURRENT_CONTEXT_FUNC(ctx);             
-#else
-    GImGui = ctx;
-#endif
-}
-
-void ImGui::SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data)
-{
-    GImAllocatorAllocFunc = alloc_func;
-    GImAllocatorFreeFunc = free_func;
-    GImAllocatorUserData = user_data;
-}
-
-ImGuiContext* ImGui::CreateContext(ImFontAtlas* shared_font_atlas)
-{
-    ImGuiContext* ctx = IM_NEW(ImGuiContext)(shared_font_atlas);
-    if (GImGui == NULL)
-        SetCurrentContext(ctx);
-    Initialize(ctx);
-    return ctx;
-}
-
-void ImGui::DestroyContext(ImGuiContext* ctx)
-{
-    if (ctx == NULL)
-        ctx = GImGui;
-    Shutdown(ctx);
-    if (GImGui == ctx)
-        SetCurrentContext(NULL);
-    IM_DELETE(ctx);
-}
-
-ImGuiID ImGui::AddContextHook(ImGuiContext* ctx, const ImGuiContextHook* hook)
-{
-    ImGuiContext& g = *ctx;
-    IM_ASSERT(hook->Callback != NULL && hook->HookId == 0 && hook->Type != ImGuiContextHookType_PendingRemoval_);
-    g.Hooks.push_back(*hook);
-    g.Hooks.back().HookId = ++g.HookIdNext;
-    return g.HookIdNext;
-}
-
-void ImGui::RemoveContextHook(ImGuiContext* ctx, ImGuiID hook_id)
-{
-    ImGuiContext& g = *ctx;
-    IM_ASSERT(hook_id != 0);
-    for (int n = 0; n < g.Hooks.Size; n++)
-        if (g.Hooks[n].HookId == hook_id)
-            g.Hooks[n].Type = ImGuiContextHookType_PendingRemoval_;
-}
-
-void ImGui::CallContextHooks(ImGuiContext* ctx, ImGuiContextHookType hook_type)
-{
-    ImGuiContext& g = *ctx;
-    for (int n = 0; n < g.Hooks.Size; n++)
-        if (g.Hooks[n].Type == hook_type)
-            g.Hooks[n].Callback(&g, &g.Hooks[n]);
-}
-
-ImGuiIO& ImGui::GetIO()
-{
-    IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
-    return GImGui->IO;
-}
-
-ImDrawData* ImGui::GetDrawData()
-{
-    ImGuiContext& g = *GImGui;
-    return g.DrawData.Valid ? &g.DrawData : NULL;
-}
-
-double ImGui::GetTime()
-{
-    return GImGui->Time;
-}
-
-int ImGui::GetFrameCount()
-{
-    return GImGui->FrameCount;
-}
-
-ImDrawList* ImGui::GetBackgroundDrawList()
-{
-    return &GImGui->BackgroundDrawList;
-}
-
-ImDrawList* ImGui::GetForegroundDrawList()
-{
-    return &GImGui->ForegroundDrawList;
-}
-
-ImDrawListSharedData* ImGui::GetDrawListSharedData()
-{
-    return &GImGui->DrawListSharedData;
-}
-
-void ImGui::StartMouseMovingWindow(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    FocusWindow(window);
-    SetActiveID(window->MoveId, window);
-    g.NavDisableHighlight = true;
-    g.ActiveIdNoClearOnFocusLoss = true;
-    g.ActiveIdClickOffset = g.IO.MousePos - window->RootWindow->Pos;
-
-    bool can_move_window = true;
-    if ((window->Flags & ImGuiWindowFlags_NoMove) || (window->RootWindow->Flags & ImGuiWindowFlags_NoMove))
-        can_move_window = false;
-    if (can_move_window)
-        g.MovingWindow = window;
-}
-
-void ImGui::UpdateMouseMovingWindowNewFrame()
-{
-    ImGuiContext& g = *GImGui;
-    if (g.MovingWindow != NULL)
-    {
-        KeepAliveID(g.ActiveId);
-        IM_ASSERT(g.MovingWindow && g.MovingWindow->RootWindow);
-        ImGuiWindow* moving_window = g.MovingWindow->RootWindow;
-        if (g.IO.MouseDown[0] && IsMousePosValid(&g.IO.MousePos))
-        {
-            ImVec2 pos = g.IO.MousePos - g.ActiveIdClickOffset;
-            if (moving_window->Pos.x != pos.x || moving_window->Pos.y != pos.y)
-            {
-                MarkIniSettingsDirty(moving_window);
-                SetWindowPos(moving_window, pos, ImGuiCond_Always);
-            }
-            FocusWindow(g.MovingWindow);
-        }
-        else
-        {
-            ClearActiveID();
-            g.MovingWindow = NULL;
-        }
-    }
-    else
-    {
-        if (g.ActiveIdWindow && g.ActiveIdWindow->MoveId == g.ActiveId)
-        {
-            KeepAliveID(g.ActiveId);
-            if (!g.IO.MouseDown[0])
-                ClearActiveID();
-        }
-    }
-}
-
-void ImGui::UpdateMouseMovingWindowEndFrame()
-{
-    ImGuiContext& g = *GImGui;
-    if (g.ActiveId != 0 || g.HoveredId != 0)
-        return;
-
-    if (g.NavWindow && g.NavWindow->Appearing)
-        return;
-
-    if (g.IO.MouseClicked[0])
-    {
-        ImGuiWindow* root_window = g.HoveredRootWindow;
-        const bool is_closed_popup = root_window && (root_window->Flags & ImGuiWindowFlags_Popup) && !IsPopupOpen(root_window->PopupId, ImGuiPopupFlags_AnyPopupLevel);
-
-        if (root_window != NULL && !is_closed_popup)
-        {
-            StartMouseMovingWindow(g.HoveredWindow); 
-
-            if (g.IO.ConfigWindowsMoveFromTitleBarOnly && !(root_window->Flags & ImGuiWindowFlags_NoTitleBar))
-                if (!root_window->TitleBarRect().Contains(g.IO.MouseClickedPos[0]))
-                    g.MovingWindow = NULL;
-
-            if (g.HoveredIdDisabled)
-                g.MovingWindow = NULL;
-        }
-        else if (root_window == NULL && g.NavWindow != NULL && GetTopMostPopupModal() == NULL)
-        {
-            FocusWindow(NULL);
-        }
-    }
-
-    if (g.IO.MouseClicked[1])
-    {
-        ImGuiWindow* modal = GetTopMostPopupModal();
-        bool hovered_window_above_modal = g.HoveredWindow && IsWindowAbove(g.HoveredWindow, modal);
-        ClosePopupsOverWindow(hovered_window_above_modal ? g.HoveredWindow : modal, true);
-    }
-}
-
-static bool IsWindowActiveAndVisible(ImGuiWindow* window)
-{
-    return (window->Active) && (!window->Hidden);
-}
-
-static void ImGui::UpdateMouseInputs()
-{
-    ImGuiContext& g = *GImGui;
-
-    if (IsMousePosValid(&g.IO.MousePos))
-        g.IO.MousePos = g.LastValidMousePos = ImFloor(g.IO.MousePos);
-
-    if (IsMousePosValid(&g.IO.MousePos) && IsMousePosValid(&g.IO.MousePosPrev))
-        g.IO.MouseDelta = g.IO.MousePos - g.IO.MousePosPrev;
-    else
-        g.IO.MouseDelta = ImVec2(0.0f, 0.0f);
-    if (g.IO.MouseDelta.x != 0.0f || g.IO.MouseDelta.y != 0.0f)
-        g.NavDisableMouseHover = false;
-
-    g.IO.MousePosPrev = g.IO.MousePos;
-    for (int i = 0; i < IM_ARRAYSIZE(g.IO.MouseDown); i++)
-    {
-        g.IO.MouseClicked[i] = g.IO.MouseDown[i] && g.IO.MouseDownDuration[i] < 0.0f;
-        g.IO.MouseReleased[i] = !g.IO.MouseDown[i] && g.IO.MouseDownDuration[i] >= 0.0f;
-        g.IO.MouseDownDurationPrev[i] = g.IO.MouseDownDuration[i];
-        g.IO.MouseDownDuration[i] = g.IO.MouseDown[i] ? (g.IO.MouseDownDuration[i] < 0.0f ? 0.0f : g.IO.MouseDownDuration[i] + g.IO.DeltaTime) : -1.0f;
-        g.IO.MouseDoubleClicked[i] = false;
-        if (g.IO.MouseClicked[i])
-        {
-            if ((float)(g.Time - g.IO.MouseClickedTime[i]) < g.IO.MouseDoubleClickTime)
-            {
-                ImVec2 delta_from_click_pos = IsMousePosValid(&g.IO.MousePos) ? (g.IO.MousePos - g.IO.MouseClickedPos[i]) : ImVec2(0.0f, 0.0f);
-                if (ImLengthSqr(delta_from_click_pos) < g.IO.MouseDoubleClickMaxDist * g.IO.MouseDoubleClickMaxDist)
-                    g.IO.MouseDoubleClicked[i] = true;
-                g.IO.MouseClickedTime[i] = -g.IO.MouseDoubleClickTime * 2.0f;              
-            }
-            else
-            {
-                g.IO.MouseClickedTime[i] = g.Time;
-            }
-            g.IO.MouseClickedPos[i] = g.IO.MousePos;
-            g.IO.MouseDownWasDoubleClick[i] = g.IO.MouseDoubleClicked[i];
-            g.IO.MouseDragMaxDistanceAbs[i] = ImVec2(0.0f, 0.0f);
-            g.IO.MouseDragMaxDistanceSqr[i] = 0.0f;
-        }
-        else if (g.IO.MouseDown[i])
-        {
-            ImVec2 delta_from_click_pos = IsMousePosValid(&g.IO.MousePos) ? (g.IO.MousePos - g.IO.MouseClickedPos[i]) : ImVec2(0.0f, 0.0f);
-            g.IO.MouseDragMaxDistanceSqr[i] = ImMax(g.IO.MouseDragMaxDistanceSqr[i], ImLengthSqr(delta_from_click_pos));
-            g.IO.MouseDragMaxDistanceAbs[i].x = ImMax(g.IO.MouseDragMaxDistanceAbs[i].x, delta_from_click_pos.x < 0.0f ? -delta_from_click_pos.x : delta_from_click_pos.x);
-            g.IO.MouseDragMaxDistanceAbs[i].y = ImMax(g.IO.MouseDragMaxDistanceAbs[i].y, delta_from_click_pos.y < 0.0f ? -delta_from_click_pos.y : delta_from_click_pos.y);
-        }
-        if (!g.IO.MouseDown[i] && !g.IO.MouseReleased[i])
-            g.IO.MouseDownWasDoubleClick[i] = false;
-        if (g.IO.MouseClicked[i])                
-            g.NavDisableMouseHover = false;
-    }
-}
-
-static void StartLockWheelingWindow(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.WheelingWindow == window)
-        return;
-    g.WheelingWindow = window;
-    g.WheelingWindowRefMousePos = g.IO.MousePos;
-    g.WheelingWindowTimer = WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER;
-}
-
-void ImGui::UpdateMouseWheel()
-{
-    ImGuiContext& g = *GImGui;
-
-    if (g.WheelingWindow != NULL)
-    {
-        g.WheelingWindowTimer -= g.IO.DeltaTime;
-        if (IsMousePosValid() && ImLengthSqr(g.IO.MousePos - g.WheelingWindowRefMousePos) > g.IO.MouseDragThreshold * g.IO.MouseDragThreshold)
-            g.WheelingWindowTimer = 0.0f;
-        if (g.WheelingWindowTimer <= 0.0f)
-        {
-            g.WheelingWindow = NULL;
-            g.WheelingWindowTimer = 0.0f;
-        }
-    }
-
-    if (g.IO.MouseWheel == 0.0f && g.IO.MouseWheelH == 0.0f)
-        return;
-
-    if ((g.ActiveId != 0 && g.ActiveIdUsingMouseWheel) || (g.HoveredIdPreviousFrame != 0 && g.HoveredIdPreviousFrameUsingMouseWheel))
-        return;
-
-    ImGuiWindow* window = g.WheelingWindow ? g.WheelingWindow : g.HoveredWindow;
-    if (!window || window->Collapsed)
-        return;
-
-    if (g.IO.MouseWheel != 0.0f && g.IO.KeyCtrl && g.IO.FontAllowUserScaling)
-    {
-        StartLockWheelingWindow(window);
-        const float new_font_scale = ImClamp(window->FontWindowScale + g.IO.MouseWheel * 0.10f, 0.50f, 2.50f);
-        const float scale = new_font_scale / window->FontWindowScale;
-        window->FontWindowScale = new_font_scale;
-        if (!(window->Flags & ImGuiWindowFlags_ChildWindow))
-        {
-            const ImVec2 offset = window->Size * (1.0f - scale) * (g.IO.MousePos - window->Pos) / window->Size;
-            SetWindowPos(window, window->Pos + offset, 0);
-            window->Size = ImFloor(window->Size * scale);
-            window->SizeFull = ImFloor(window->SizeFull * scale);
-        }
-        return;
-    }
-
-    const float wheel_y = (g.IO.MouseWheel != 0.0f && !g.IO.KeyShift) ? g.IO.MouseWheel : 0.0f;
-    if (wheel_y != 0.0f && !g.IO.KeyCtrl)
-    {
-        StartLockWheelingWindow(window);
-        while ((window->Flags & ImGuiWindowFlags_ChildWindow) && ((window->ScrollMax.y == 0.0f) || ((window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))))
-            window = window->ParentWindow;
-        if (!(window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))
-        {
-            float max_step = window->InnerRect.GetHeight() * 0.67f;
-            float scroll_step = ImFloor(ImMin(5 * window->CalcFontSize(), max_step));
-            SetScrollY(window, window->Scroll.y - wheel_y * scroll_step);
-        }
-    }
-
-    const float wheel_x = (g.IO.MouseWheelH != 0.0f && !g.IO.KeyShift) ? g.IO.MouseWheelH : (g.IO.MouseWheel != 0.0f && g.IO.KeyShift) ? g.IO.MouseWheel : 0.0f;
-    if (wheel_x != 0.0f && !g.IO.KeyCtrl)
-    {
-        StartLockWheelingWindow(window);
-        while ((window->Flags & ImGuiWindowFlags_ChildWindow) && ((window->ScrollMax.x == 0.0f) || ((window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))))
-            window = window->ParentWindow;
-        if (!(window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))
-        {
-            float max_step = window->InnerRect.GetWidth() * 0.67f;
-            float scroll_step = ImFloor(ImMin(2 * window->CalcFontSize(), max_step));
-            SetScrollX(window, window->Scroll.x - wheel_x * scroll_step);
-        }
-    }
-}
-
-void ImGui::UpdateTabFocus()
-{
-    ImGuiContext& g = *GImGui;
-
-    g.FocusTabPressed = (g.NavWindow && g.NavWindow->Active && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) && !g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_Tab));
-    if (g.ActiveId == 0 && g.FocusTabPressed)
-    {
-        g.FocusRequestNextWindow = g.NavWindow;
-        g.FocusRequestNextCounterRegular = INT_MAX;
-        if (g.NavId != 0 && g.NavIdTabCounter != INT_MAX)
-            g.FocusRequestNextCounterTabStop = g.NavIdTabCounter + 1 + (g.IO.KeyShift ? -1 : 1);
-        else
-            g.FocusRequestNextCounterTabStop = g.IO.KeyShift ? -1 : 0;
-    }
-
-    g.FocusRequestCurrWindow = NULL;
-    g.FocusRequestCurrCounterRegular = g.FocusRequestCurrCounterTabStop = INT_MAX;
-    if (g.FocusRequestNextWindow != NULL)
-    {
-        ImGuiWindow* window = g.FocusRequestNextWindow;
-        g.FocusRequestCurrWindow = window;
-        if (g.FocusRequestNextCounterRegular != INT_MAX && window->DC.FocusCounterRegular != -1)
-            g.FocusRequestCurrCounterRegular = ImModPositive(g.FocusRequestNextCounterRegular, window->DC.FocusCounterRegular + 1);
-        if (g.FocusRequestNextCounterTabStop != INT_MAX && window->DC.FocusCounterTabStop != -1)
-            g.FocusRequestCurrCounterTabStop = ImModPositive(g.FocusRequestNextCounterTabStop, window->DC.FocusCounterTabStop + 1);
-        g.FocusRequestNextWindow = NULL;
-        g.FocusRequestNextCounterRegular = g.FocusRequestNextCounterTabStop = INT_MAX;
-    }
-
-    g.NavIdTabCounter = INT_MAX;
-}
-
-void ImGui::UpdateHoveredWindowAndCaptureFlags()
-{
-    ImGuiContext& g = *GImGui;
-
-    bool clear_hovered_windows = false;
-    FindHoveredWindow();
-
-    ImGuiWindow* modal_window = GetTopMostPopupModal();
-    if (modal_window && g.HoveredRootWindow && !IsWindowChildOf(g.HoveredRootWindow, modal_window))
-        clear_hovered_windows = true;
-
-    if (g.IO.ConfigFlags & ImGuiConfigFlags_NoMouse)
-        clear_hovered_windows = true;
-
-    int mouse_earliest_button_down = -1;
-    bool mouse_any_down = false;
-    for (int i = 0; i < IM_ARRAYSIZE(g.IO.MouseDown); i++)
-    {
-        if (g.IO.MouseClicked[i])
-            g.IO.MouseDownOwned[i] = (g.HoveredWindow != NULL) || (g.OpenPopupStack.Size > 0);
-        mouse_any_down |= g.IO.MouseDown[i];
-        if (g.IO.MouseDown[i])
-            if (mouse_earliest_button_down == -1 || g.IO.MouseClickedTime[i] < g.IO.MouseClickedTime[mouse_earliest_button_down])
-                mouse_earliest_button_down = i;
-    }
-    const bool mouse_avail_to_imgui = (mouse_earliest_button_down == -1) || g.IO.MouseDownOwned[mouse_earliest_button_down];
-
-    const bool mouse_dragging_extern_payload = g.DragDropActive && (g.DragDropSourceFlags & ImGuiDragDropFlags_SourceExtern) != 0;
-    if (!mouse_avail_to_imgui && !mouse_dragging_extern_payload)
-        clear_hovered_windows = true;
-
-    if (clear_hovered_windows)
-        g.HoveredWindow = g.HoveredRootWindow = g.HoveredWindowUnderMovingWindow = NULL;
-
-    if (g.WantCaptureMouseNextFrame != -1)
-        g.IO.WantCaptureMouse = (g.WantCaptureMouseNextFrame != 0);
-    else
-        g.IO.WantCaptureMouse = (mouse_avail_to_imgui && (g.HoveredWindow != NULL || mouse_any_down)) || (g.OpenPopupStack.Size > 0);
-
-    if (g.WantCaptureKeyboardNextFrame != -1)
-        g.IO.WantCaptureKeyboard = (g.WantCaptureKeyboardNextFrame != 0);
-    else
-        g.IO.WantCaptureKeyboard = (g.ActiveId != 0) || (modal_window != NULL);
-    if (g.IO.NavActive && (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) && !(g.IO.ConfigFlags & ImGuiConfigFlags_NavNoCaptureKeyboard))
-        g.IO.WantCaptureKeyboard = true;
-
-    g.IO.WantTextInput = (g.WantTextInputNextFrame != -1) ? (g.WantTextInputNextFrame != 0) : false;
-}
-
-ImGuiKeyModFlags ImGui::GetMergedKeyModFlags()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiKeyModFlags key_mod_flags = ImGuiKeyModFlags_None;
-    if (g.IO.KeyCtrl)   { key_mod_flags |= ImGuiKeyModFlags_Ctrl; }
-    if (g.IO.KeyShift)  { key_mod_flags |= ImGuiKeyModFlags_Shift; }
-    if (g.IO.KeyAlt)    { key_mod_flags |= ImGuiKeyModFlags_Alt; }
-    if (g.IO.KeySuper)  { key_mod_flags |= ImGuiKeyModFlags_Super; }
-    return key_mod_flags;
-}
-
-void ImGui::NewFrame()
-{
-    IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
-    ImGuiContext& g = *GImGui;
-    
-    for (int n = g.Hooks.Size - 1; n >= 0; n--)
-        if (g.Hooks[n].Type == ImGuiContextHookType_PendingRemoval_)
-            g.Hooks.erase(&g.Hooks[n]);
-
-    CallContextHooks(&g, ImGuiContextHookType_NewFramePre);
-
-    ErrorCheckNewFrameSanityChecks();
-
-    UpdateSettings();
-
-    g.Time += g.IO.DeltaTime;
-    g.WithinFrameScope = true;
-    g.FrameCount += 1;
-    g.TooltipOverrideCount = 0;
-    g.WindowsActiveCount = 0;
-    g.MenusIdSubmittedThisFrame.resize(0);
-
-    g.FramerateSecPerFrameAccum += g.IO.DeltaTime - g.FramerateSecPerFrame[g.FramerateSecPerFrameIdx];
-    g.FramerateSecPerFrame[g.FramerateSecPerFrameIdx] = g.IO.DeltaTime;
-    g.FramerateSecPerFrameIdx = (g.FramerateSecPerFrameIdx + 1) % IM_ARRAYSIZE(g.FramerateSecPerFrame);
-    g.IO.Framerate = (g.FramerateSecPerFrameAccum > 0.0f) ? (1.0f / (g.FramerateSecPerFrameAccum / (float)IM_ARRAYSIZE(g.FramerateSecPerFrame))) : FLT_MAX;
-
-    g.IO.Fonts->Locked = true;
-    SetCurrentFont(GetDefaultFont());
-    IM_ASSERT(g.Font->IsLoaded());
-    g.DrawListSharedData.ClipRectFullscreen = ImVec4(0.0f, 0.0f, g.IO.DisplaySize.x, g.IO.DisplaySize.y);
-    g.DrawListSharedData.CurveTessellationTol = g.Style.CurveTessellationTol;
-    g.DrawListSharedData.SetCircleSegmentMaxError(g.Style.CircleSegmentMaxError);
-    g.DrawListSharedData.InitialFlags = ImDrawListFlags_None;
-    if (g.Style.AntiAliasedLines)
-        g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AntiAliasedLines;
-    if (g.Style.AntiAliasedLinesUseTex && !(g.Font->ContainerAtlas->Flags & ImFontAtlasFlags_NoBakedLines))
-        g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AntiAliasedLinesUseTex;
-    if (g.Style.AntiAliasedFill)
-        g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AntiAliasedFill;
-    if (g.IO.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset)
-        g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AllowVtxOffset;
-
-    g.BackgroundDrawList._ResetForNewFrame();
-    g.BackgroundDrawList.PushTextureID(g.IO.Fonts->TexID);
-    g.BackgroundDrawList.PushClipRectFullScreen();
-
-    g.ForegroundDrawList._ResetForNewFrame();
-    g.ForegroundDrawList.PushTextureID(g.IO.Fonts->TexID);
-    g.ForegroundDrawList.PushClipRectFullScreen();
-
-    g.DrawData.Clear();
-
-    if (g.DragDropActive && g.DragDropPayload.SourceId == g.ActiveId)
-        KeepAliveID(g.DragDropPayload.SourceId);
-
-    if (!g.HoveredIdPreviousFrame)
-        g.HoveredIdTimer = 0.0f;
-    if (!g.HoveredIdPreviousFrame || (g.HoveredId && g.ActiveId == g.HoveredId))
-        g.HoveredIdNotActiveTimer = 0.0f;
-    if (g.HoveredId)
-        g.HoveredIdTimer += g.IO.DeltaTime;
-    if (g.HoveredId && g.ActiveId != g.HoveredId)
-        g.HoveredIdNotActiveTimer += g.IO.DeltaTime;
-    g.HoveredIdPreviousFrame = g.HoveredId;
-    g.HoveredIdPreviousFrameUsingMouseWheel = g.HoveredIdUsingMouseWheel;
-    g.HoveredId = 0;
-    g.HoveredIdAllowOverlap = false;
-    g.HoveredIdUsingMouseWheel = false;
-    g.HoveredIdDisabled = false;
-
-    if (g.ActiveIdIsAlive != g.ActiveId && g.ActiveIdPreviousFrame == g.ActiveId && g.ActiveId != 0)
-        ClearActiveID();
-    if (g.ActiveId)
-        g.ActiveIdTimer += g.IO.DeltaTime;
-    g.LastActiveIdTimer += g.IO.DeltaTime;
-    g.ActiveIdPreviousFrame = g.ActiveId;
-    g.ActiveIdPreviousFrameWindow = g.ActiveIdWindow;
-    g.ActiveIdPreviousFrameHasBeenEditedBefore = g.ActiveIdHasBeenEditedBefore;
-    g.ActiveIdIsAlive = 0;
-    g.ActiveIdHasBeenEditedThisFrame = false;
-    g.ActiveIdPreviousFrameIsAlive = false;
-    g.ActiveIdIsJustActivated = false;
-    if (g.TempInputId != 0 && g.ActiveId != g.TempInputId)
-        g.TempInputId = 0;
-    if (g.ActiveId == 0)
-    {
-        g.ActiveIdUsingNavDirMask = 0x00;
-        g.ActiveIdUsingNavInputMask = 0x00;
-        g.ActiveIdUsingKeyInputMask = 0x00;
-    }
-
-    g.DragDropAcceptIdPrev = g.DragDropAcceptIdCurr;
-    g.DragDropAcceptIdCurr = 0;
-    g.DragDropAcceptIdCurrRectSurface = FLT_MAX;
-    g.DragDropWithinSource = false;
-    g.DragDropWithinTarget = false;
-    g.DragDropHoldJustPressedId = 0;
-
-    g.IO.KeyMods = GetMergedKeyModFlags();
-    memcpy(g.IO.KeysDownDurationPrev, g.IO.KeysDownDuration, sizeof(g.IO.KeysDownDuration));
-    for (int i = 0; i < IM_ARRAYSIZE(g.IO.KeysDown); i++)
-        g.IO.KeysDownDuration[i] = g.IO.KeysDown[i] ? (g.IO.KeysDownDuration[i] < 0.0f ? 0.0f : g.IO.KeysDownDuration[i] + g.IO.DeltaTime) : -1.0f;
-
-    NavUpdate();
-
-    UpdateMouseInputs();
-
-    UpdateHoveredWindowAndCaptureFlags();
-
-    UpdateMouseMovingWindowNewFrame();
-
-    if (GetTopMostPopupModal() != NULL || (g.NavWindowingTarget != NULL && g.NavWindowingHighlightAlpha > 0.0f))
-        g.DimBgRatio = ImMin(g.DimBgRatio + g.IO.DeltaTime * 6.0f, 1.0f);
-    else
-        g.DimBgRatio = ImMax(g.DimBgRatio - g.IO.DeltaTime * 10.0f, 0.0f);
-
-    g.MouseCursor = ImGuiMouseCursor_Arrow;
-    g.WantCaptureMouseNextFrame = g.WantCaptureKeyboardNextFrame = g.WantTextInputNextFrame = -1;
-    g.PlatformImePos = ImVec2(1.0f, 1.0f);             
-
-    UpdateMouseWheel();
-
-    UpdateTabFocus();
-
-    IM_ASSERT(g.WindowsFocusOrder.Size == g.Windows.Size);
-    const float memory_compact_start_time = (g.GcCompactAll || g.IO.ConfigMemoryCompactTimer < 0.0f) ? FLT_MAX : (float)g.Time - g.IO.ConfigMemoryCompactTimer;
-    for (int i = 0; i != g.Windows.Size; i++)
-    {
-        ImGuiWindow* window = g.Windows[i];
-        window->WasActive = window->Active;
-        window->BeginCount = 0;
-        window->Active = false;
-        window->WriteAccessed = false;
-
-        if (!window->WasActive && !window->MemoryCompacted && window->LastTimeActive < memory_compact_start_time)
-            GcCompactTransientWindowBuffers(window);
-    }
-
-    for (int i = 0; i < g.TablesLastTimeActive.Size; i++)
-        if (g.TablesLastTimeActive[i] >= 0.0f && g.TablesLastTimeActive[i] < memory_compact_start_time)
-            TableGcCompactTransientBuffers(g.Tables.GetByIndex(i));
-    if (g.GcCompactAll)
-        GcCompactTransientMiscBuffers();
-    g.GcCompactAll = false;
-
-    if (g.NavWindow && !g.NavWindow->WasActive)
-        FocusTopMostWindowUnderOne(NULL, NULL);
-
-    g.CurrentWindowStack.resize(0);
-    g.BeginPopupStack.resize(0);
-    g.ItemFlagsStack.resize(0);
-    g.ItemFlagsStack.push_back(ImGuiItemFlags_Default_);
-    g.GroupStack.resize(0);
-    ClosePopupsOverWindow(g.NavWindow, false);
-
-    UpdateDebugToolItemPicker();
-
-    g.WithinFrameScopeWithImplicitWindow = true;
-    SetNextWindowSize(ImVec2(400, 400), ImGuiCond_FirstUseEver);
-    Begin("Debug##Default");
-    IM_ASSERT(g.CurrentWindow->IsFallbackWindow == true);
-
-    CallContextHooks(&g, ImGuiContextHookType_NewFramePost);
-}
-
-void ImGui::UpdateDebugToolItemPicker()
-{
-    ImGuiContext& g = *GImGui;
-    g.DebugItemPickerBreakId = 0;
-    if (g.DebugItemPickerActive)
-    {
-        const ImGuiID hovered_id = g.HoveredIdPreviousFrame;
-        ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
-        if (ImGui::IsKeyPressedMap(ImGuiKey_Escape))
-            g.DebugItemPickerActive = false;
-        if (ImGui::IsMouseClicked(0) && hovered_id)
-        {
-            g.DebugItemPickerBreakId = hovered_id;
-            g.DebugItemPickerActive = false;
-        }
-        ImGui::SetNextWindowBgAlpha(0.60f);
-        ImGui::BeginTooltip();
-        ImGui::Text("HoveredId: 0x%08X", hovered_id);
-        ImGui::Text("Press ESC to abort picking.");
-        ImGui::TextColored(GetStyleColorVec4(hovered_id ? ImGuiCol_Text : ImGuiCol_TextDisabled), "Click to break in debugger!");
-        ImGui::EndTooltip();
-    }
-}
-
-void ImGui::Initialize(ImGuiContext* context)
-{
-    ImGuiContext& g = *context;
-    IM_ASSERT(!g.Initialized && !g.SettingsLoaded);
-
-    {
-        ImGuiSettingsHandler ini_handler;
-        ini_handler.TypeName = "Window";
-        ini_handler.TypeHash = ImHashStr("Window");
-        ini_handler.ClearAllFn = WindowSettingsHandler_ClearAll;
-        ini_handler.ReadOpenFn = WindowSettingsHandler_ReadOpen;
-        ini_handler.ReadLineFn = WindowSettingsHandler_ReadLine;
-        ini_handler.ApplyAllFn = WindowSettingsHandler_ApplyAll;
-        ini_handler.WriteAllFn = WindowSettingsHandler_WriteAll;
-        g.SettingsHandlers.push_back(ini_handler);
-    }
-
-#ifdef IMGUI_HAS_TABLE
-    TableSettingsInstallHandler(context);
-#endif   
-
-#ifdef IMGUI_HAS_DOCK
-#endif   
-
-    g.Initialized = true;
-}
-
-void ImGui::Shutdown(ImGuiContext* context)
-{
-    ImGuiContext& g = *context;
-    if (g.IO.Fonts && g.FontAtlasOwnedByContext)
-    {
-        g.IO.Fonts->Locked = false;
-        IM_DELETE(g.IO.Fonts);
-    }
-    g.IO.Fonts = NULL;
-
-    if (!g.Initialized)
-        return;
-
-    if (g.SettingsLoaded && g.IO.IniFilename != NULL)
-    {
-        ImGuiContext* backup_context = GImGui;
-        SetCurrentContext(&g);
-        SaveIniSettingsToDisk(g.IO.IniFilename);
-        SetCurrentContext(backup_context);
-    }
-
-    CallContextHooks(&g, ImGuiContextHookType_Shutdown);
-
-    for (int i = 0; i < g.Windows.Size; i++)
-        IM_DELETE(g.Windows[i]);
-    g.Windows.clear();
-    g.WindowsFocusOrder.clear();
-    g.WindowsTempSortBuffer.clear();
-    g.CurrentWindow = NULL;
-    g.CurrentWindowStack.clear();
-    g.WindowsById.Clear();
-    g.NavWindow = NULL;
-    g.HoveredWindow = g.HoveredRootWindow = g.HoveredWindowUnderMovingWindow = NULL;
-    g.ActiveIdWindow = g.ActiveIdPreviousFrameWindow = NULL;
-    g.MovingWindow = NULL;
-    g.ColorStack.clear();
-    g.StyleVarStack.clear();
-    g.FontStack.clear();
-    g.OpenPopupStack.clear();
-    g.BeginPopupStack.clear();
-    g.DrawDataBuilder.ClearFreeMemory();
-    g.BackgroundDrawList._ClearFreeMemory();
-    g.ForegroundDrawList._ClearFreeMemory();
-
-    g.TabBars.Clear();
-    g.CurrentTabBarStack.clear();
-    g.ShrinkWidthBuffer.clear();
-
-    g.Tables.Clear();
-    g.CurrentTableStack.clear();
-    g.DrawChannelsTempMergeBuffer.clear();
-
-    g.ClipboardHandlerData.clear();
-    g.MenusIdSubmittedThisFrame.clear();
-    g.InputTextState.ClearFreeMemory();
-
-    g.SettingsWindows.clear();
-    g.SettingsHandlers.clear();
-
-    if (g.LogFile)
-    {
-#ifndef IMGUI_DISABLE_TTY_FUNCTIONS
-        if (g.LogFile != stdout)
-#endif
-            ImFileClose(g.LogFile);
-        g.LogFile = NULL;
-    }
-    g.LogBuffer.clear();
-
-    g.Initialized = false;
-}
-
-static int IMGUI_CDECL ChildWindowComparer(const void* lhs, const void* rhs)
-{
-    const ImGuiWindow* const a = *(const ImGuiWindow* const *)lhs;
-    const ImGuiWindow* const b = *(const ImGuiWindow* const *)rhs;
-    if (int d = (a->Flags & ImGuiWindowFlags_Popup) - (b->Flags & ImGuiWindowFlags_Popup))
-        return d;
-    if (int d = (a->Flags & ImGuiWindowFlags_Tooltip) - (b->Flags & ImGuiWindowFlags_Tooltip))
-        return d;
-    return (a->BeginOrderWithinParent - b->BeginOrderWithinParent);
-}
-
-static void AddWindowToSortBuffer(ImVector<ImGuiWindow*>* out_sorted_windows, ImGuiWindow* window)
-{
-    out_sorted_windows->push_back(window);
-    if (window->Active)
-    {
-        int count = window->DC.ChildWindows.Size;
-        if (count > 1)
-            ImQsort(window->DC.ChildWindows.Data, (size_t)count, sizeof(ImGuiWindow*), ChildWindowComparer);
-        for (int i = 0; i < count; i++)
-        {
-            ImGuiWindow* child = window->DC.ChildWindows[i];
-            if (child->Active)
-                AddWindowToSortBuffer(out_sorted_windows, child);
-        }
-    }
-}
-
-static void AddDrawListToDrawData(ImVector<ImDrawList*>* out_list, ImDrawList* draw_list)
-{
-    draw_list->_PopUnusedDrawCmd();
-    if (draw_list->CmdBuffer.Size == 0)
-        return;
-
-    IM_ASSERT(draw_list->VtxBuffer.Size == 0 || draw_list->_VtxWritePtr == draw_list->VtxBuffer.Data + draw_list->VtxBuffer.Size);
-    IM_ASSERT(draw_list->IdxBuffer.Size == 0 || draw_list->_IdxWritePtr == draw_list->IdxBuffer.Data + draw_list->IdxBuffer.Size);
-    if (!(draw_list->Flags & ImDrawListFlags_AllowVtxOffset))
-        IM_ASSERT((int)draw_list->_VtxCurrentIdx == draw_list->VtxBuffer.Size);
-
-    if (sizeof(ImDrawIdx) == 2)
-        IM_ASSERT(draw_list->_VtxCurrentIdx < (1 << 16) && "Too many vertices in ImDrawList using 16-bit indices. Read comment above");
-
-    out_list->push_back(draw_list);
-}
-
-static void AddWindowToDrawData(ImVector<ImDrawList*>* out_render_list, ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    g.IO.MetricsRenderWindows++;
-    AddDrawListToDrawData(out_render_list, window->DrawList);
-    for (int i = 0; i < window->DC.ChildWindows.Size; i++)
-    {
-        ImGuiWindow* child = window->DC.ChildWindows[i];
-        if (IsWindowActiveAndVisible(child))         
-            AddWindowToDrawData(out_render_list, child);
-    }
-}
-
-static void AddRootWindowToDrawData(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    int layer = (window->Flags & ImGuiWindowFlags_Tooltip) ? 1 : 0;
-    AddWindowToDrawData(&g.DrawDataBuilder.Layers[layer], window);
-}
-
-void ImDrawDataBuilder::FlattenIntoSingleLayer()
-{
-    int n = Layers[0].Size;
-    int size = n;
-    for (int i = 1; i < IM_ARRAYSIZE(Layers); i++)
-        size += Layers[i].Size;
-    Layers[0].resize(size);
-    for (int layer_n = 1; layer_n < IM_ARRAYSIZE(Layers); layer_n++)
-    {
-        ImVector<ImDrawList*>& layer = Layers[layer_n];
-        if (layer.empty())
-            continue;
-        memcpy(&Layers[0][n], &layer[0], layer.Size * sizeof(ImDrawList*));
-        n += layer.Size;
-        layer.resize(0);
-    }
-}
-
-static void SetupDrawData(ImVector<ImDrawList*>* draw_lists, ImDrawData* draw_data)
-{
-    ImGuiIO& io = ImGui::GetIO();
-    draw_data->Valid = true;
-    draw_data->CmdLists = (draw_lists->Size > 0) ? draw_lists->Data : NULL;
-    draw_data->CmdListsCount = draw_lists->Size;
-    draw_data->TotalVtxCount = draw_data->TotalIdxCount = 0;
-    draw_data->DisplayPos = ImVec2(0.0f, 0.0f);
-    draw_data->DisplaySize = io.DisplaySize;
-    draw_data->FramebufferScale = io.DisplayFramebufferScale;
-    for (int n = 0; n < draw_lists->Size; n++)
-    {
-        draw_data->TotalVtxCount += draw_lists->Data[n]->VtxBuffer.Size;
-        draw_data->TotalIdxCount += draw_lists->Data[n]->IdxBuffer.Size;
-    }
-}
-
-void ImGui::PushClipRect(const ImVec2& clip_rect_min, const ImVec2& clip_rect_max, bool intersect_with_current_clip_rect)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DrawList->PushClipRect(clip_rect_min, clip_rect_max, intersect_with_current_clip_rect);
-    window->ClipRect = window->DrawList->_ClipRectStack.back();
-}
-
-void ImGui::PopClipRect()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DrawList->PopClipRect();
-    window->ClipRect = window->DrawList->_ClipRectStack.back();
-}
-
-void ImGui::EndFrame()
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(g.Initialized);
-
-    if (g.FrameCountEnded == g.FrameCount)
-        return;
-    IM_ASSERT(g.WithinFrameScope && "Forgot to call ImGui::NewFrame()?");
-
-    CallContextHooks(&g, ImGuiContextHookType_EndFramePre);
-
-    ErrorCheckEndFrameSanityChecks();
-
-    if (g.IO.ImeSetInputScreenPosFn && (g.PlatformImeLastPos.x == FLT_MAX || ImLengthSqr(g.PlatformImeLastPos - g.PlatformImePos) > 0.0001f))
-    {
-        g.IO.ImeSetInputScreenPosFn((int)g.PlatformImePos.x, (int)g.PlatformImePos.y);
-        g.PlatformImeLastPos = g.PlatformImePos;
-    }
-
-    g.WithinFrameScopeWithImplicitWindow = false;
-    if (g.CurrentWindow && !g.CurrentWindow->WriteAccessed)
-        g.CurrentWindow->Active = false;
-    End();
-
-    NavEndFrame();
-
-    if (g.DragDropActive)
-    {
-        bool is_delivered = g.DragDropPayload.Delivery;
-        bool is_elapsed = (g.DragDropPayload.DataFrameCount + 1 < g.FrameCount) && ((g.DragDropSourceFlags & ImGuiDragDropFlags_SourceAutoExpirePayload) || !IsMouseDown(g.DragDropMouseButton));
-        if (is_delivered || is_elapsed)
-            ClearDragDrop();
-    }
-
-    if (g.DragDropActive && g.DragDropSourceFrameCount < g.FrameCount && !(g.DragDropSourceFlags & ImGuiDragDropFlags_SourceNoPreviewTooltip))
-    {
-        g.DragDropWithinSource = true;
-        SetTooltip("...");
-        g.DragDropWithinSource = false;
-    }
-
-    g.WithinFrameScope = false;
-    g.FrameCountEnded = g.FrameCount;
-
-    UpdateMouseMovingWindowEndFrame();
-
-    g.WindowsTempSortBuffer.resize(0);
-    g.WindowsTempSortBuffer.reserve(g.Windows.Size);
-    for (int i = 0; i != g.Windows.Size; i++)
-    {
-        ImGuiWindow* window = g.Windows[i];
-        if (window->Active && (window->Flags & ImGuiWindowFlags_ChildWindow))                 
-            continue;
-        AddWindowToSortBuffer(&g.WindowsTempSortBuffer, window);
-    }
-
-    IM_ASSERT(g.Windows.Size == g.WindowsTempSortBuffer.Size);
-    g.Windows.swap(g.WindowsTempSortBuffer);
-    g.IO.MetricsActiveWindows = g.WindowsActiveCount;
-
-    g.IO.Fonts->Locked = false;
-
-    g.IO.MouseWheel = g.IO.MouseWheelH = 0.0f;
-    g.IO.InputQueueCharacters.resize(0);
-    memset(g.IO.NavInputs, 0, sizeof(g.IO.NavInputs));
-
-    CallContextHooks(&g, ImGuiContextHookType_EndFramePost);
-}
-
-void ImGui::Render()
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(g.Initialized);
-
-    if (g.FrameCountEnded != g.FrameCount)
-        EndFrame();
-    g.FrameCountRendered = g.FrameCount;
-    g.IO.MetricsRenderWindows = 0;
-    g.DrawDataBuilder.Clear();
-
-    CallContextHooks(&g, ImGuiContextHookType_RenderPre);
-
-    if (!g.BackgroundDrawList.VtxBuffer.empty())
-        AddDrawListToDrawData(&g.DrawDataBuilder.Layers[0], &g.BackgroundDrawList);
-
-    ImGuiWindow* windows_to_render_top_most[2];
-    windows_to_render_top_most[0] = (g.NavWindowingTarget && !(g.NavWindowingTarget->Flags & ImGuiWindowFlags_NoBringToFrontOnFocus)) ? g.NavWindowingTarget->RootWindow : NULL;
-    windows_to_render_top_most[1] = (g.NavWindowingTarget ? g.NavWindowingListWindow : NULL);
-    for (int n = 0; n != g.Windows.Size; n++)
-    {
-        ImGuiWindow* window = g.Windows[n];
-        if (IsWindowActiveAndVisible(window) && (window->Flags & ImGuiWindowFlags_ChildWindow) == 0 && window != windows_to_render_top_most[0] && window != windows_to_render_top_most[1])
-            AddRootWindowToDrawData(window);
-    }
-    for (int n = 0; n < IM_ARRAYSIZE(windows_to_render_top_most); n++)
-        if (windows_to_render_top_most[n] && IsWindowActiveAndVisible(windows_to_render_top_most[n]))          
-            AddRootWindowToDrawData(windows_to_render_top_most[n]);
-    g.DrawDataBuilder.FlattenIntoSingleLayer();
-
-    if (g.IO.MouseDrawCursor)
-        RenderMouseCursor(&g.ForegroundDrawList, g.IO.MousePos, g.Style.MouseCursorScale, g.MouseCursor, IM_COL32_WHITE, IM_COL32_BLACK, IM_COL32(0, 0, 0, 48));
-
-    if (!g.ForegroundDrawList.VtxBuffer.empty())
-        AddDrawListToDrawData(&g.DrawDataBuilder.Layers[0], &g.ForegroundDrawList);
-
-    SetupDrawData(&g.DrawDataBuilder.Layers[0], &g.DrawData);
-    g.IO.MetricsRenderVertices = g.DrawData.TotalVtxCount;
-    g.IO.MetricsRenderIndices = g.DrawData.TotalIdxCount;
-
-    CallContextHooks(&g, ImGuiContextHookType_RenderPost);
-}
-
-ImVec2 ImGui::CalcTextSize(const char* text, const char* text_end, bool hide_text_after_double_hash, float wrap_width)
-{
-    ImGuiContext& g = *GImGui;
-
-    const char* text_display_end;
-    if (hide_text_after_double_hash)
-        text_display_end = FindRenderedTextEnd(text, text_end);            
-    else
-        text_display_end = text_end;
-
-    ImFont* font = g.Font;
-    const float font_size = g.FontSize;
-    if (text == text_display_end)
-        return ImVec2(0.0f, font_size);
-    ImVec2 text_size = font->CalcTextSizeA(font_size, FLT_MAX, wrap_width, text, text_display_end, NULL);
-
-    text_size.x = IM_FLOOR(text_size.x + 0.99999f);
-
-    return text_size;
-}
-
-static void FindHoveredWindow()
-{
-    ImGuiContext& g = *GImGui;
-
-    ImGuiWindow* hovered_window = NULL;
-    ImGuiWindow* hovered_window_ignoring_moving_window = NULL;
-    if (g.MovingWindow && !(g.MovingWindow->Flags & ImGuiWindowFlags_NoMouseInputs))
-        hovered_window = g.MovingWindow;
-
-    ImVec2 padding_regular = g.Style.TouchExtraPadding;
-    ImVec2 padding_for_resize_from_edges = g.IO.ConfigWindowsResizeFromEdges ? ImMax(g.Style.TouchExtraPadding, ImVec2(WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS, WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS)) : padding_regular;
-    for (int i = g.Windows.Size - 1; i >= 0; i--)
-    {
-        ImGuiWindow* window = g.Windows[i];
-        if (!window->Active || window->Hidden)
-            continue;
-        if (window->Flags & ImGuiWindowFlags_NoMouseInputs)
-            continue;
-
-        ImRect bb(window->OuterRectClipped);
-        if (window->Flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize))
-            bb.Expand(padding_regular);
-        else
-            bb.Expand(padding_for_resize_from_edges);
-        if (!bb.Contains(g.IO.MousePos))
-            continue;
-
-        if (window->HitTestHoleSize.x != 0)
-        {
-            ImVec2 hole_pos(window->Pos.x + (float)window->HitTestHoleOffset.x, window->Pos.y + (float)window->HitTestHoleOffset.y);
-            ImVec2 hole_size((float)window->HitTestHoleSize.x, (float)window->HitTestHoleSize.y);
-            if (ImRect(hole_pos, hole_pos + hole_size).Contains(g.IO.MousePos))
-                continue;
-        }
-
-        if (hovered_window == NULL)
-            hovered_window = window;
-        if (hovered_window_ignoring_moving_window == NULL && (!g.MovingWindow || window->RootWindow != g.MovingWindow->RootWindow))
-            hovered_window_ignoring_moving_window = window;
-        if (hovered_window && hovered_window_ignoring_moving_window)
-            break;
-    }
-
-    g.HoveredWindow = hovered_window;
-    g.HoveredRootWindow = g.HoveredWindow ? g.HoveredWindow->RootWindow : NULL;
-    g.HoveredWindowUnderMovingWindow = hovered_window_ignoring_moving_window;
-}
-
-bool ImGui::IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool clip)
-{
-    ImGuiContext& g = *GImGui;
-
-    ImRect rect_clipped(r_min, r_max);
-    if (clip)
-        rect_clipped.ClipWith(g.CurrentWindow->ClipRect);
-
-    const ImRect rect_for_touch(rect_clipped.Min - g.Style.TouchExtraPadding, rect_clipped.Max + g.Style.TouchExtraPadding);
-    if (!rect_for_touch.Contains(g.IO.MousePos))
-        return false;
-    return true;
-}
-
-int ImGui::GetKeyIndex(ImGuiKey imgui_key)
-{
-    IM_ASSERT(imgui_key >= 0 && imgui_key < ImGuiKey_COUNT);
-    ImGuiContext& g = *GImGui;
-    return g.IO.KeyMap[imgui_key];
-}
-
-bool ImGui::IsKeyDown(int user_key_index)
-{
-    if (user_key_index < 0)
-        return false;
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(g.IO.KeysDown));
-    return g.IO.KeysDown[user_key_index];
-}
-
-int ImGui::CalcTypematicRepeatAmount(float t0, float t1, float repeat_delay, float repeat_rate)
-{
-    if (t1 == 0.0f)
-        return 1;
-    if (t0 >= t1)
-        return 0;
-    if (repeat_rate <= 0.0f)
-        return (t0 < repeat_delay) && (t1 >= repeat_delay);
-    const int count_t0 = (t0 < repeat_delay) ? -1 : (int)((t0 - repeat_delay) / repeat_rate);
-    const int count_t1 = (t1 < repeat_delay) ? -1 : (int)((t1 - repeat_delay) / repeat_rate);
-    const int count = count_t1 - count_t0;
-    return count;
-}
-
-int ImGui::GetKeyPressedAmount(int key_index, float repeat_delay, float repeat_rate)
-{
-    ImGuiContext& g = *GImGui;
-    if (key_index < 0)
-        return 0;
-    IM_ASSERT(key_index >= 0 && key_index < IM_ARRAYSIZE(g.IO.KeysDown));
-    const float t = g.IO.KeysDownDuration[key_index];
-    return CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, repeat_delay, repeat_rate);
-}
-
-bool ImGui::IsKeyPressed(int user_key_index, bool repeat)
-{
-    ImGuiContext& g = *GImGui;
-    if (user_key_index < 0)
-        return false;
-    IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(g.IO.KeysDown));
-    const float t = g.IO.KeysDownDuration[user_key_index];
-    if (t == 0.0f)
-        return true;
-    if (repeat && t > g.IO.KeyRepeatDelay)
-        return GetKeyPressedAmount(user_key_index, g.IO.KeyRepeatDelay, g.IO.KeyRepeatRate) > 0;
-    return false;
-}
-
-bool ImGui::IsKeyReleased(int user_key_index)
-{
-    ImGuiContext& g = *GImGui;
-    if (user_key_index < 0) return false;
-    IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(g.IO.KeysDown));
-    return g.IO.KeysDownDurationPrev[user_key_index] >= 0.0f && !g.IO.KeysDown[user_key_index];
-}
-
-bool ImGui::IsMouseDown(ImGuiMouseButton button)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
-    return g.IO.MouseDown[button];
-}
-
-bool ImGui::IsMouseClicked(ImGuiMouseButton button, bool repeat)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
-    const float t = g.IO.MouseDownDuration[button];
-    if (t == 0.0f)
-        return true;
-
-    if (repeat && t > g.IO.KeyRepeatDelay)
-    {
-        int amount = CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, g.IO.KeyRepeatDelay, g.IO.KeyRepeatRate * 0.50f);
-        if (amount > 0)
-            return true;
-    }
-    return false;
-}
-
-bool ImGui::IsMouseReleased(ImGuiMouseButton button)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
-    return g.IO.MouseReleased[button];
-}
-
-bool ImGui::IsMouseDoubleClicked(ImGuiMouseButton button)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
-    return g.IO.MouseDoubleClicked[button];
-}
-
-bool ImGui::IsMouseDragPastThreshold(ImGuiMouseButton button, float lock_threshold)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
-    if (lock_threshold < 0.0f)
-        lock_threshold = g.IO.MouseDragThreshold;
-    return g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold;
-}
-
-bool ImGui::IsMouseDragging(ImGuiMouseButton button, float lock_threshold)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
-    if (!g.IO.MouseDown[button])
-        return false;
-    return IsMouseDragPastThreshold(button, lock_threshold);
-}
-
-ImVec2 ImGui::GetMousePos()
-{
-    ImGuiContext& g = *GImGui;
-    return g.IO.MousePos;
-}
-
-ImVec2 ImGui::GetMousePosOnOpeningCurrentPopup()
-{
-    ImGuiContext& g = *GImGui;
-    if (g.BeginPopupStack.Size > 0)
-        return g.OpenPopupStack[g.BeginPopupStack.Size - 1].OpenMousePos;
-    return g.IO.MousePos;
-}
-
-bool ImGui::IsMousePosValid(const ImVec2* mouse_pos)
-{
-    IM_ASSERT(GImGui != NULL);
-    const float MOUSE_INVALID = -256000.0f;
-    ImVec2 p = mouse_pos ? *mouse_pos : GImGui->IO.MousePos;
-    return p.x >= MOUSE_INVALID && p.y >= MOUSE_INVALID;
-}
-
-bool ImGui::IsAnyMouseDown()
-{
-    ImGuiContext& g = *GImGui;
-    for (int n = 0; n < IM_ARRAYSIZE(g.IO.MouseDown); n++)
-        if (g.IO.MouseDown[n])
-            return true;
-    return false;
-}
-
-ImVec2 ImGui::GetMouseDragDelta(ImGuiMouseButton button, float lock_threshold)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
-    if (lock_threshold < 0.0f)
-        lock_threshold = g.IO.MouseDragThreshold;
-    if (g.IO.MouseDown[button] || g.IO.MouseReleased[button])
-        if (g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold)
-            if (IsMousePosValid(&g.IO.MousePos) && IsMousePosValid(&g.IO.MouseClickedPos[button]))
-                return g.IO.MousePos - g.IO.MouseClickedPos[button];
-    return ImVec2(0.0f, 0.0f);
-}
-
-void ImGui::ResetMouseDragDelta(ImGuiMouseButton button)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
-    g.IO.MouseClickedPos[button] = g.IO.MousePos;
-}
-
-ImGuiMouseCursor ImGui::GetMouseCursor()
-{
-    return GImGui->MouseCursor;
-}
-
-void ImGui::SetMouseCursor(ImGuiMouseCursor cursor_type)
-{
-    GImGui->MouseCursor = cursor_type;
-}
-
-void ImGui::CaptureKeyboardFromApp(bool capture)
-{
-    GImGui->WantCaptureKeyboardNextFrame = capture ? 1 : 0;
-}
-
-void ImGui::CaptureMouseFromApp(bool capture)
-{
-    GImGui->WantCaptureMouseNextFrame = capture ? 1 : 0;
-}
-
-bool ImGui::IsItemActive()
-{
-    ImGuiContext& g = *GImGui;
-    if (g.ActiveId)
-    {
-        ImGuiWindow* window = g.CurrentWindow;
-        return g.ActiveId == window->DC.LastItemId;
-    }
-    return false;
-}
-
-bool ImGui::IsItemActivated()
-{
-    ImGuiContext& g = *GImGui;
-    if (g.ActiveId)
-    {
-        ImGuiWindow* window = g.CurrentWindow;
-        if (g.ActiveId == window->DC.LastItemId && g.ActiveIdPreviousFrame != window->DC.LastItemId)
-            return true;
-    }
-    return false;
-}
-
-bool ImGui::IsItemDeactivated()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HasDeactivated)
-        return (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_Deactivated) != 0;
-    return (g.ActiveIdPreviousFrame == window->DC.LastItemId && g.ActiveIdPreviousFrame != 0 && g.ActiveId != window->DC.LastItemId);
-}
-
-bool ImGui::IsItemDeactivatedAfterEdit()
-{
-    ImGuiContext& g = *GImGui;
-    return IsItemDeactivated() && (g.ActiveIdPreviousFrameHasBeenEditedBefore || (g.ActiveId == 0 && g.ActiveIdHasBeenEditedBefore));
-}
-
-bool ImGui::IsItemFocused()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    if (g.NavId != window->DC.LastItemId || g.NavId == 0)
-        return false;
-    return true;
-}
-
-bool ImGui::IsItemClicked(ImGuiMouseButton mouse_button)
-{
-    return IsMouseClicked(mouse_button) && IsItemHovered(ImGuiHoveredFlags_None);
-}
-
-bool ImGui::IsItemToggledOpen()
-{
-    ImGuiContext& g = *GImGui;
-    return (g.CurrentWindow->DC.LastItemStatusFlags & ImGuiItemStatusFlags_ToggledOpen) ? true : false;
-}
-
-bool ImGui::IsItemToggledSelection()
-{
-    ImGuiContext& g = *GImGui;
-    return (g.CurrentWindow->DC.LastItemStatusFlags & ImGuiItemStatusFlags_ToggledSelection) ? true : false;
-}
-
-bool ImGui::IsAnyItemHovered()
-{
-    ImGuiContext& g = *GImGui;
-    return g.HoveredId != 0 || g.HoveredIdPreviousFrame != 0;
-}
-
-bool ImGui::IsAnyItemActive()
-{
-    ImGuiContext& g = *GImGui;
-    return g.ActiveId != 0;
-}
-
-bool ImGui::IsAnyItemFocused()
-{
-    ImGuiContext& g = *GImGui;
-    return g.NavId != 0 && !g.NavDisableHighlight;
-}
-
-bool ImGui::IsItemVisible()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->ClipRect.Overlaps(window->DC.LastItemRect);
-}
-
-bool ImGui::IsItemEdited()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_Edited) != 0;
-}
-
-void ImGui::SetItemAllowOverlap()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiID id = g.CurrentWindow->DC.LastItemId;
-    if (g.HoveredId == id)
-        g.HoveredIdAllowOverlap = true;
-    if (g.ActiveId == id)
-        g.ActiveIdAllowOverlap = true;
-}
-
-void ImGui::SetItemUsingMouseWheel()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiID id = g.CurrentWindow->DC.LastItemId;
-    if (g.HoveredId == id)
-        g.HoveredIdUsingMouseWheel = true;
-    if (g.ActiveId == id)
-        g.ActiveIdUsingMouseWheel = true;
-}
-
-ImVec2 ImGui::GetItemRectMin()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.LastItemRect.Min;
-}
-
-ImVec2 ImGui::GetItemRectMax()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.LastItemRect.Max;
-}
-
-ImVec2 ImGui::GetItemRectSize()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.LastItemRect.GetSize();
-}
-
-static ImRect GetViewportRect()
-{
-    ImGuiContext& g = *GImGui;
-    return ImRect(0.0f, 0.0f, g.IO.DisplaySize.x, g.IO.DisplaySize.y);
-}
-
-bool ImGui::BeginChildEx(const char* name, ImGuiID id, const ImVec2& size_arg, bool border, ImGuiWindowFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* parent_window = g.CurrentWindow;
-
-    flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_ChildWindow;
-    flags |= (parent_window->Flags & ImGuiWindowFlags_NoMove);      
-
-    const ImVec2 content_avail = GetContentRegionAvail();
-    ImVec2 size = ImFloor(size_arg);
-    const int auto_fit_axises = ((size.x == 0.0f) ? (1 << ImGuiAxis_X) : 0x00) | ((size.y == 0.0f) ? (1 << ImGuiAxis_Y) : 0x00);
-    if (size.x <= 0.0f)
-        size.x = ImMax(content_avail.x + size.x, 4.0f);          
-    if (size.y <= 0.0f)
-        size.y = ImMax(content_avail.y + size.y, 4.0f);
-    SetNextWindowSize(size);
-
-    if (name)
-        ImFormatString(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), "%s/%s_%08X", parent_window->Name, name, id);
-    else
-        ImFormatString(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), "%s/%08X", parent_window->Name, id);
-
-    const float backup_border_size = g.Style.ChildBorderSize;
-    if (!border)
-        g.Style.ChildBorderSize = 0.0f;
-    bool ret = Begin(g.TempBuffer, NULL, flags);
-    g.Style.ChildBorderSize = backup_border_size;
-
-
-    ImGuiWindow* child_window = g.CurrentWindow;
-    child_window->ChildId = id;
-    child_window->AutoFitChildAxises = (ImS8)auto_fit_axises;
-
-    if (child_window->BeginCount == 1)
-        parent_window->DC.CursorPos = child_window->Pos;
-
-    if (g.NavActivateId == id && !(flags & ImGuiWindowFlags_NavFlattened) && (child_window->DC.NavLayerActiveMask != 0 || child_window->DC.NavHasScroll))
-    {
-        FocusWindow(child_window);
-        NavInitWindow(child_window, false);
-        SetActiveID(id + 1, child_window);              
-        g.ActiveIdSource = ImGuiInputSource_Nav;
-    }
-
-
-
-
-    return ret;
-}
-
-bool ImGui::BeginChild(const char* str_id, const ImVec2& size_arg, bool border, ImGuiWindowFlags extra_flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    return BeginChildEx(str_id, window->GetID(str_id), size_arg, border, extra_flags);
-}
-
-bool ImGui::BeginChild(ImGuiID id, const ImVec2& size_arg, bool border, ImGuiWindowFlags extra_flags)
-{
-    IM_ASSERT(id != 0);
-    return BeginChildEx(NULL, id, size_arg, border, extra_flags);
-}
-
-void ImGui::EndChild()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    IM_ASSERT(g.WithinEndChild == false);
-    IM_ASSERT(window->Flags & ImGuiWindowFlags_ChildWindow);      
-
-    g.WithinEndChild = true;
-    if (window->BeginCount > 1)
-    {
-        End();
-    }
-    else
-    {
-        ImVec2 sz = window->Size;
-        if (window->AutoFitChildAxises & (1 << ImGuiAxis_X))              
-            sz.x = ImMax(4.0f, sz.x);
-        if (window->AutoFitChildAxises & (1 << ImGuiAxis_Y))
-            sz.y = ImMax(4.0f, sz.y);
-        End();
-
-        ImGuiWindow* parent_window = g.CurrentWindow;
-        ImRect bb(parent_window->DC.CursorPos, parent_window->DC.CursorPos + sz);
-        ItemSize(sz);
-        if ((window->DC.NavLayerActiveMask != 0 || window->DC.NavHasScroll) && !(window->Flags & ImGuiWindowFlags_NavFlattened))
-        {
-            ItemAdd(bb, window->ChildId);
-            RenderNavHighlight(bb, window->ChildId);
-
-            if (window->DC.NavLayerActiveMask == 0 && window == g.NavWindow)
-                RenderNavHighlight(ImRect(bb.Min - ImVec2(2, 2), bb.Max + ImVec2(2, 2)), g.NavId, ImGuiNavHighlightFlags_TypeThin);
-        }
-        else
-        {
-            ItemAdd(bb, 0);
-        }
-    }
-    g.WithinEndChild = false;
-    g.LogLinePosY = -FLT_MAX;      
-}
-
-bool ImGui::BeginChildFrame(ImGuiID id, const ImVec2& size, ImGuiWindowFlags extra_flags)
-{
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    PushStyleColor(ImGuiCol_ChildBg, style.Colors[ImGuiCol_FrameBg]);
-    PushStyleVar(ImGuiStyleVar_ChildRounding, style.FrameRounding);
-    PushStyleVar(ImGuiStyleVar_ChildBorderSize, style.FrameBorderSize);
-    PushStyleVar(ImGuiStyleVar_WindowPadding, style.FramePadding);
-    bool ret = BeginChild(id, size, true, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysUseWindowPadding | extra_flags);
-    PopStyleVar(3);
-    PopStyleColor();
-    return ret;
-}
-
-void ImGui::EndChildFrame()
-{
-    EndChild();
-}
-
-static void SetWindowConditionAllowFlags(ImGuiWindow* window, ImGuiCond flags, bool enabled)
-{
-    window->SetWindowPosAllowFlags       = enabled ? (window->SetWindowPosAllowFlags       | flags) : (window->SetWindowPosAllowFlags       & ~flags);
-    window->SetWindowSizeAllowFlags      = enabled ? (window->SetWindowSizeAllowFlags      | flags) : (window->SetWindowSizeAllowFlags      & ~flags);
-    window->SetWindowCollapsedAllowFlags = enabled ? (window->SetWindowCollapsedAllowFlags | flags) : (window->SetWindowCollapsedAllowFlags & ~flags);
-}
-
-ImGuiWindow* ImGui::FindWindowByID(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    return (ImGuiWindow*)g.WindowsById.GetVoidPtr(id);
-}
-
-ImGuiWindow* ImGui::FindWindowByName(const char* name)
-{
-    ImGuiID id = ImHashStr(name);
-    return FindWindowByID(id);
-}
-
-static void ApplyWindowSettings(ImGuiWindow* window, ImGuiWindowSettings* settings)
-{
-    window->Pos = ImFloor(ImVec2(settings->Pos.x, settings->Pos.y));
-    if (settings->Size.x > 0 && settings->Size.y > 0)
-        window->Size = window->SizeFull = ImFloor(ImVec2(settings->Size.x, settings->Size.y));
-    window->Collapsed = settings->Collapsed;
-}
-
-static ImGuiWindow* CreateNewWindow(const char* name, ImGuiWindowFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = IM_NEW(ImGuiWindow)(&g, name);
-    window->Flags = flags;
-    g.WindowsById.SetVoidPtr(window->ID, window);
-
-    window->Pos = ImVec2(60, 60);
-
-    if (!(flags & ImGuiWindowFlags_NoSavedSettings))
-        if (ImGuiWindowSettings* settings = ImGui::FindWindowSettings(window->ID))
-        {
-            window->SettingsOffset = g.SettingsWindows.offset_from_ptr(settings);
-            SetWindowConditionAllowFlags(window, ImGuiCond_FirstUseEver, false);
-            ApplyWindowSettings(window, settings);
-        }
-    window->DC.CursorStartPos = window->DC.CursorMaxPos = window->Pos;          
-
-    if ((flags & ImGuiWindowFlags_AlwaysAutoResize) != 0)
-    {
-        window->AutoFitFramesX = window->AutoFitFramesY = 2;
-        window->AutoFitOnlyGrows = false;
-    }
-    else
-    {
-        if (window->Size.x <= 0.0f)
-            window->AutoFitFramesX = 2;
-        if (window->Size.y <= 0.0f)
-            window->AutoFitFramesY = 2;
-        window->AutoFitOnlyGrows = (window->AutoFitFramesX > 0) || (window->AutoFitFramesY > 0);
-    }
-
-    g.WindowsFocusOrder.push_back(window);
-    if (flags & ImGuiWindowFlags_NoBringToFrontOnFocus)
-        g.Windows.push_front(window);        
-    else
-        g.Windows.push_back(window);
-    return window;
-}
-
-static ImVec2 CalcWindowSizeAfterConstraint(ImGuiWindow* window, ImVec2 new_size)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSizeConstraint)
-    {
-        ImRect cr = g.NextWindowData.SizeConstraintRect;
-        new_size.x = (cr.Min.x >= 0 && cr.Max.x >= 0) ? ImClamp(new_size.x, cr.Min.x, cr.Max.x) : window->SizeFull.x;
-        new_size.y = (cr.Min.y >= 0 && cr.Max.y >= 0) ? ImClamp(new_size.y, cr.Min.y, cr.Max.y) : window->SizeFull.y;
-        if (g.NextWindowData.SizeCallback)
-        {
-            ImGuiSizeCallbackData data;
-            data.UserData = g.NextWindowData.SizeCallbackUserData;
-            data.Pos = window->Pos;
-            data.CurrentSize = window->SizeFull;
-            data.DesiredSize = new_size;
-            g.NextWindowData.SizeCallback(&data);
-            new_size = data.DesiredSize;
-        }
-        new_size.x = IM_FLOOR(new_size.x);
-        new_size.y = IM_FLOOR(new_size.y);
-    }
-
-    if (!(window->Flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_AlwaysAutoResize)))
-    {
-        ImGuiWindow* window_for_height = window;
-        new_size = ImMax(new_size, g.Style.WindowMinSize);
-        new_size.y = ImMax(new_size.y, window_for_height->TitleBarHeight() + window_for_height->MenuBarHeight() + ImMax(0.0f, g.Style.WindowRounding - 1.0f));       
-    }
-    return new_size;
-}
-
-static void CalcWindowContentSizes(ImGuiWindow* window, ImVec2* content_size_current, ImVec2* content_size_ideal)
-{
-    bool preserve_old_content_sizes = false;
-    if (window->Collapsed && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0)
-        preserve_old_content_sizes = true;
-    else if (window->Hidden && window->HiddenFramesCannotSkipItems == 0 && window->HiddenFramesCanSkipItems > 0)
-        preserve_old_content_sizes = true;
-    if (preserve_old_content_sizes)
-    {
-        *content_size_current = window->ContentSize;
-        *content_size_ideal = window->ContentSizeIdeal;
-        return;
-    }
-
-    content_size_current->x = (window->ContentSizeExplicit.x != 0.0f) ? window->ContentSizeExplicit.x : IM_FLOOR(window->DC.CursorMaxPos.x - window->DC.CursorStartPos.x);
-    content_size_current->y = (window->ContentSizeExplicit.y != 0.0f) ? window->ContentSizeExplicit.y : IM_FLOOR(window->DC.CursorMaxPos.y - window->DC.CursorStartPos.y);
-    content_size_ideal->x = (window->ContentSizeExplicit.x != 0.0f) ? window->ContentSizeExplicit.x : IM_FLOOR(ImMax(window->DC.CursorMaxPos.x, window->DC.IdealMaxPos.x) - window->DC.CursorStartPos.x);
-    content_size_ideal->y = (window->ContentSizeExplicit.y != 0.0f) ? window->ContentSizeExplicit.y : IM_FLOOR(ImMax(window->DC.CursorMaxPos.y, window->DC.IdealMaxPos.y) - window->DC.CursorStartPos.y);
-}
-
-static ImVec2 CalcWindowAutoFitSize(ImGuiWindow* window, const ImVec2& size_contents)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiStyle& style = g.Style;
-    ImVec2 size_decorations = ImVec2(0.0f, window->TitleBarHeight() + window->MenuBarHeight());
-    ImVec2 size_pad = window->WindowPadding * 2.0f;
-    ImVec2 size_desired = size_contents + size_pad + size_decorations;
-    if (window->Flags & ImGuiWindowFlags_Tooltip)
-    {
-        return size_desired;
-    }
-    else
-    {
-        const bool is_popup = (window->Flags & ImGuiWindowFlags_Popup) != 0;
-        const bool is_menu = (window->Flags & ImGuiWindowFlags_ChildMenu) != 0;
-        ImVec2 size_min = style.WindowMinSize;
-        if (is_popup || is_menu)                        
-            size_min = ImMin(size_min, ImVec2(4.0f, 4.0f));
-        ImVec2 size_auto_fit = ImClamp(size_desired, size_min, ImMax(size_min, g.IO.DisplaySize - style.DisplaySafeAreaPadding * 2.0f));
-
-        ImVec2 size_auto_fit_after_constraint = CalcWindowSizeAfterConstraint(window, size_auto_fit);
-        bool will_have_scrollbar_x = (size_auto_fit_after_constraint.x - size_pad.x - size_decorations.x < size_contents.x && !(window->Flags & ImGuiWindowFlags_NoScrollbar) && (window->Flags & ImGuiWindowFlags_HorizontalScrollbar)) || (window->Flags & ImGuiWindowFlags_AlwaysHorizontalScrollbar);
-        bool will_have_scrollbar_y = (size_auto_fit_after_constraint.y - size_pad.y - size_decorations.y < size_contents.y && !(window->Flags & ImGuiWindowFlags_NoScrollbar)) || (window->Flags & ImGuiWindowFlags_AlwaysVerticalScrollbar);
-        if (will_have_scrollbar_x)
-            size_auto_fit.y += style.ScrollbarSize;
-        if (will_have_scrollbar_y)
-            size_auto_fit.x += style.ScrollbarSize;
-        return size_auto_fit;
-    }
-}
-
-ImVec2 ImGui::CalcWindowNextAutoFitSize(ImGuiWindow* window)
-{
-    ImVec2 size_contents_current;
-    ImVec2 size_contents_ideal;
-    CalcWindowContentSizes(window, &size_contents_current, &size_contents_ideal);
-    ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, size_contents_ideal);
-    ImVec2 size_final = CalcWindowSizeAfterConstraint(window, size_auto_fit);
-    return size_final;
-}
-
-static ImGuiCol GetWindowBgColorIdxFromFlags(ImGuiWindowFlags flags)
-{
-    if (flags & (ImGuiWindowFlags_Tooltip | ImGuiWindowFlags_Popup))
-        return ImGuiCol_PopupBg;
-    if (flags & ImGuiWindowFlags_ChildWindow)
-        return ImGuiCol_ChildBg;
-    return ImGuiCol_WindowBg;
-}
-
-static void CalcResizePosSizeFromAnyCorner(ImGuiWindow* window, const ImVec2& corner_target, const ImVec2& corner_norm, ImVec2* out_pos, ImVec2* out_size)
-{
-    ImVec2 pos_min = ImLerp(corner_target, window->Pos, corner_norm);                   
-    ImVec2 pos_max = ImLerp(window->Pos + window->Size, corner_target, corner_norm);    
-    ImVec2 size_expected = pos_max - pos_min;
-    ImVec2 size_constrained = CalcWindowSizeAfterConstraint(window, size_expected);
-    *out_pos = pos_min;
-    if (corner_norm.x == 0.0f)
-        out_pos->x -= (size_constrained.x - size_expected.x);
-    if (corner_norm.y == 0.0f)
-        out_pos->y -= (size_constrained.y - size_expected.y);
-    *out_size = size_constrained;
-}
-
-struct ImGuiResizeGripDef
-{
-    ImVec2  CornerPosN;
-    ImVec2  InnerDir;
-    int     AngleMin12, AngleMax12;
-};
-
-static const ImGuiResizeGripDef resize_grip_def[4] =
-{
-    { ImVec2(1, 1), ImVec2(-1, -1), 0, 3 },  
-    { ImVec2(0, 1), ImVec2(+1, -1), 3, 6 },  
-    { ImVec2(0, 0), ImVec2(+1, +1), 6, 9 },   
-    { ImVec2(1, 0), ImVec2(-1, +1), 9, 12 },   
-};
-
-struct ImGuiResizeBorderDef
-{
-    ImVec2 InnerDir;
-    ImVec2 CornerPosN1, CornerPosN2;
-    float  OuterAngle;
-};
-
-static const ImGuiResizeBorderDef resize_border_def[4] =
-{
-    { ImVec2(0, +1), ImVec2(0, 0), ImVec2(1, 0), IM_PI * 1.50f },  
-    { ImVec2(-1, 0), ImVec2(1, 0), ImVec2(1, 1), IM_PI * 0.00f },  
-    { ImVec2(0, -1), ImVec2(1, 1), ImVec2(0, 1), IM_PI * 0.50f },  
-    { ImVec2(+1, 0), ImVec2(0, 1), ImVec2(0, 0), IM_PI * 1.00f }  
-};
-
-static ImRect GetResizeBorderRect(ImGuiWindow* window, int border_n, float perp_padding, float thickness)
-{
-    ImRect rect = window->Rect();
-    if (thickness == 0.0f) rect.Max -= ImVec2(1, 1);
-    if (border_n == 0) { return ImRect(rect.Min.x + perp_padding, rect.Min.y - thickness,    rect.Max.x - perp_padding, rect.Min.y + thickness);    }  
-    if (border_n == 1) { return ImRect(rect.Max.x - thickness,    rect.Min.y + perp_padding, rect.Max.x + thickness,    rect.Max.y - perp_padding); }  
-    if (border_n == 2) { return ImRect(rect.Min.x + perp_padding, rect.Max.y - thickness,    rect.Max.x - perp_padding, rect.Max.y + thickness);    }  
-    if (border_n == 3) { return ImRect(rect.Min.x - thickness,    rect.Min.y + perp_padding, rect.Min.x + thickness,    rect.Max.y - perp_padding); }  
-    IM_ASSERT(0);
-    return ImRect();
-}
-
-ImGuiID ImGui::GetWindowResizeID(ImGuiWindow* window, int n)
-{
-    IM_ASSERT(n >= 0 && n <= 7);
-    ImGuiID id = window->ID;
-    id = ImHashStr("#RESIZE", 0, id);
-    id = ImHashData(&n, sizeof(int), id);
-    return id;
-}
-
-static bool ImGui::UpdateWindowManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4], const ImRect& visibility_rect)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindowFlags flags = window->Flags;
-
-    if ((flags & ImGuiWindowFlags_NoResize) || (flags & ImGuiWindowFlags_AlwaysAutoResize) || window->AutoFitFramesX > 0 || window->AutoFitFramesY > 0)
-        return false;
-    if (window->WasActive == false)               
-        return false;
-
-    bool ret_auto_fit = false;
-    const int resize_border_count = g.IO.ConfigWindowsResizeFromEdges ? 4 : 0;
-    const float grip_draw_size = IM_FLOOR(ImMax(g.FontSize * 1.35f, window->WindowRounding + 1.0f + g.FontSize * 0.2f));
-    const float grip_hover_inner_size = IM_FLOOR(grip_draw_size * 0.75f);
-    const float grip_hover_outer_size = g.IO.ConfigWindowsResizeFromEdges ? WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS : 0.0f;
-
-    ImVec2 pos_target(FLT_MAX, FLT_MAX);
-    ImVec2 size_target(FLT_MAX, FLT_MAX);
-
-    window->DC.NavLayerCurrent = ImGuiNavLayer_Menu;
-
-    PushID("#RESIZE");
-    for (int resize_grip_n = 0; resize_grip_n < resize_grip_count; resize_grip_n++)
-    {
-        const ImGuiResizeGripDef& grip = resize_grip_def[resize_grip_n];
-        const ImVec2 corner = ImLerp(window->Pos, window->Pos + window->Size, grip.CornerPosN);
-
-        ImRect resize_rect(corner - grip.InnerDir * grip_hover_outer_size, corner + grip.InnerDir * grip_hover_inner_size);
-        if (resize_rect.Min.x > resize_rect.Max.x) ImSwap(resize_rect.Min.x, resize_rect.Max.x);
-        if (resize_rect.Min.y > resize_rect.Max.y) ImSwap(resize_rect.Min.y, resize_rect.Max.y);
-        bool hovered, held;
-        ButtonBehavior(resize_rect, window->GetID(resize_grip_n), &hovered, &held, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_NoNavFocus);
-        if (hovered || held)
-            g.MouseCursor = (resize_grip_n & 1) ? ImGuiMouseCursor_ResizeNESW : ImGuiMouseCursor_ResizeNWSE;
-
-        if (held && g.IO.MouseDoubleClicked[0] && resize_grip_n == 0)
-        {
-            size_target = CalcWindowSizeAfterConstraint(window, size_auto_fit);
-            ret_auto_fit = true;
-            ClearActiveID();
-        }
-        else if (held)
-        {
-            ImVec2 corner_target = g.IO.MousePos - g.ActiveIdClickOffset + ImLerp(grip.InnerDir * grip_hover_outer_size, grip.InnerDir * -grip_hover_inner_size, grip.CornerPosN);          
-            ImVec2 clamp_min = ImVec2(grip.CornerPosN.x == 1.0f ? visibility_rect.Min.x : -FLT_MAX, grip.CornerPosN.y == 1.0f ? visibility_rect.Min.y : -FLT_MAX);
-            ImVec2 clamp_max = ImVec2(grip.CornerPosN.x == 0.0f ? visibility_rect.Max.x : +FLT_MAX, grip.CornerPosN.y == 0.0f ? visibility_rect.Max.y : +FLT_MAX);
-            corner_target = ImClamp(corner_target, clamp_min, clamp_max);
-            CalcResizePosSizeFromAnyCorner(window, corner_target, grip.CornerPosN, &pos_target, &size_target);
-        }
-        if (resize_grip_n == 0 || held || hovered)
-            resize_grip_col[resize_grip_n] = GetColorU32(held ? ImGuiCol_ResizeGripActive : hovered ? ImGuiCol_ResizeGripHovered : ImGuiCol_ResizeGrip);
-    }
-    for (int border_n = 0; border_n < resize_border_count; border_n++)
-    {
-        bool hovered, held;
-        ImRect border_rect = GetResizeBorderRect(window, border_n, grip_hover_inner_size, WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS);
-        ButtonBehavior(border_rect, window->GetID(border_n + 4), &hovered, &held, ImGuiButtonFlags_FlattenChildren);
-        if ((hovered && g.HoveredIdTimer > WINDOWS_RESIZE_FROM_EDGES_FEEDBACK_TIMER) || held)
-        {
-            g.MouseCursor = (border_n & 1) ? ImGuiMouseCursor_ResizeEW : ImGuiMouseCursor_ResizeNS;
-            if (held)
-                *border_held = border_n;
-        }
-        if (held)
-        {
-            ImVec2 border_target = window->Pos;
-            ImVec2 border_posn;
-            if (border_n == 0) { border_posn = ImVec2(0, 0); border_target.y = (g.IO.MousePos.y - g.ActiveIdClickOffset.y + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); }  
-            if (border_n == 1) { border_posn = ImVec2(1, 0); border_target.x = (g.IO.MousePos.x - g.ActiveIdClickOffset.x + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); }  
-            if (border_n == 2) { border_posn = ImVec2(0, 1); border_target.y = (g.IO.MousePos.y - g.ActiveIdClickOffset.y + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); }  
-            if (border_n == 3) { border_posn = ImVec2(0, 0); border_target.x = (g.IO.MousePos.x - g.ActiveIdClickOffset.x + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); }  
-            ImVec2 clamp_min = ImVec2(border_n == 1 ? visibility_rect.Min.x : -FLT_MAX, border_n == 2 ? visibility_rect.Min.y : -FLT_MAX);
-            ImVec2 clamp_max = ImVec2(border_n == 3 ? visibility_rect.Max.x : +FLT_MAX, border_n == 0 ? visibility_rect.Max.y : +FLT_MAX);
-            border_target = ImClamp(border_target, clamp_min, clamp_max);
-            CalcResizePosSizeFromAnyCorner(window, border_target, border_posn, &pos_target, &size_target);
-        }
-    }
-    PopID();
-
-    window->DC.NavLayerCurrent = ImGuiNavLayer_Main;
-
-    if (g.NavWindowingTarget && g.NavWindowingTarget->RootWindow == window)
-    {
-        ImVec2 nav_resize_delta;
-        if (g.NavInputSource == ImGuiInputSource_NavKeyboard && g.IO.KeyShift)
-            nav_resize_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_Keyboard, ImGuiInputReadMode_Down);
-        if (g.NavInputSource == ImGuiInputSource_NavGamepad)
-            nav_resize_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_PadDPad, ImGuiInputReadMode_Down);
-        if (nav_resize_delta.x != 0.0f || nav_resize_delta.y != 0.0f)
-        {
-            const float NAV_RESIZE_SPEED = 600.0f;
-            nav_resize_delta *= ImFloor(NAV_RESIZE_SPEED * g.IO.DeltaTime * ImMin(g.IO.DisplayFramebufferScale.x, g.IO.DisplayFramebufferScale.y));
-            nav_resize_delta = ImMax(nav_resize_delta, visibility_rect.Min - window->Pos - window->Size);
-            g.NavWindowingToggleLayer = false;
-            g.NavDisableMouseHover = true;
-            resize_grip_col[0] = GetColorU32(ImGuiCol_ResizeGripActive);
-            size_target = CalcWindowSizeAfterConstraint(window, window->SizeFull + nav_resize_delta);
-        }
-    }
-
-    if (size_target.x != FLT_MAX)
-    {
-        window->SizeFull = size_target;
-        MarkIniSettingsDirty(window);
-    }
-    if (pos_target.x != FLT_MAX)
-    {
-        window->Pos = ImFloor(pos_target);
-        MarkIniSettingsDirty(window);
-    }
-
-    window->Size = window->SizeFull;
-    return ret_auto_fit;
-}
-
-static inline void ClampWindowRect(ImGuiWindow* window, const ImRect& visibility_rect)
-{
-    ImGuiContext& g = *GImGui;
-    ImVec2 size_for_clamping = window->Size;
-    if (g.IO.ConfigWindowsMoveFromTitleBarOnly && !(window->Flags & ImGuiWindowFlags_NoTitleBar))
-        size_for_clamping.y = window->TitleBarHeight();
-    window->Pos = ImClamp(window->Pos, visibility_rect.Min - size_for_clamping, visibility_rect.Max);
-}
-
-static void ImGui::RenderWindowOuterBorders(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    float rounding = window->WindowRounding;
-    float border_size = window->WindowBorderSize;
-    if (border_size > 0.0f && !(window->Flags & ImGuiWindowFlags_NoBackground))
-        window->DrawList->AddRect(window->Pos, window->Pos + window->Size, GetColorU32(ImGuiCol_Border), rounding, ImDrawCornerFlags_All, border_size);
-
-    int border_held = window->ResizeBorderHeld;
-    if (border_held != -1)
-    {
-        const ImGuiResizeBorderDef& def = resize_border_def[border_held];
-        ImRect border_r = GetResizeBorderRect(window, border_held, rounding, 0.0f);
-        window->DrawList->PathArcTo(ImLerp(border_r.Min, border_r.Max, def.CornerPosN1) + ImVec2(0.5f, 0.5f) + def.InnerDir * rounding, rounding, def.OuterAngle - IM_PI * 0.25f, def.OuterAngle);
-        window->DrawList->PathArcTo(ImLerp(border_r.Min, border_r.Max, def.CornerPosN2) + ImVec2(0.5f, 0.5f) + def.InnerDir * rounding, rounding, def.OuterAngle, def.OuterAngle + IM_PI * 0.25f);
-        window->DrawList->PathStroke(GetColorU32(ImGuiCol_SeparatorActive), false, ImMax(2.0f, border_size));    
-    }
-    if (g.Style.FrameBorderSize > 0 && !(window->Flags & ImGuiWindowFlags_NoTitleBar))
-    {
-        float y = window->Pos.y + window->TitleBarHeight() - 1;
-        window->DrawList->AddLine(ImVec2(window->Pos.x + border_size, y), ImVec2(window->Pos.x + window->Size.x - border_size, y), GetColorU32(ImGuiCol_Border), g.Style.FrameBorderSize);
-    }
-}
- 
-
-void ImGui::RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar_rect, bool title_bar_is_highlight, int resize_grip_count, const ImU32 resize_grip_col[4], float resize_grip_draw_size)
-{
-    
-
-    ImGuiContext& g = *GImGui;
-    ImGuiStyle& style = g.Style;
-    ImGuiWindowFlags flags = window->Flags;
-
-    IM_ASSERT(window->BeginCount == 0);
-    window->SkipItems = false;
-
-    const float window_rounding = window->WindowRounding;
-    const float window_border_size = window->WindowBorderSize;
-    if (window->Collapsed)
-    {
-        float backup_border_size = style.FrameBorderSize;
-        g.Style.FrameBorderSize = window->WindowBorderSize;
-        ImU32 title_bar_col = GetColorU32((title_bar_is_highlight && !g.NavDisableHighlight) ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBgCollapsed); 
-        RenderFrame(title_bar_rect.Min, title_bar_rect.Max, title_bar_col, true, window_rounding);
-        g.Style.FrameBorderSize = backup_border_size;
-    }
-    else
-    {
-        if (!(flags & ImGuiWindowFlags_NoBackground))
-        {
-            ImU32 bg_col = GetColorU32(GetWindowBgColorIdxFromFlags(flags));
-            bool override_alpha = false;
-            float alpha = 1.0f;
-            if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasBgAlpha)
-            {
-                alpha = g.NextWindowData.BgAlphaVal;
-                override_alpha = true;
-            }
-            if (override_alpha)
-                bg_col = (bg_col & ~IM_COL32_A_MASK) | (IM_F32_TO_INT8_SAT(alpha) << IM_COL32_A_SHIFT);
-            window->DrawList->AddRectFilled(window->Pos + ImVec2(0, window->TitleBarHeight()), window->Pos + window->Size, bg_col, window_rounding, (flags & ImGuiWindowFlags_NoTitleBar) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Bot);
-        }
-
-        if (!(flags & ImGuiWindowFlags_NoTitleBar))
-        {
-            ImU32 title_bar_col = GetColorU32(title_bar_is_highlight ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBg);
-            window->DrawList->AddRectFilled(title_bar_rect.Min, title_bar_rect.Max, title_bar_col, window_rounding, ImDrawCornerFlags_Top);
-        }
-
-        if (flags & ImGuiWindowFlags_MenuBar)
-        {
-            ImRect menu_bar_rect = window->MenuBarRect();
-            menu_bar_rect.ClipWith(window->Rect());                      
-            window->DrawList->AddRectFilled(menu_bar_rect.Min + ImVec2(window_border_size, 0), menu_bar_rect.Max - ImVec2(window_border_size, 0), GetColorU32(ImGuiCol_MenuBarBg), (flags & ImGuiWindowFlags_NoTitleBar) ? window_rounding : 0.0f, ImDrawCornerFlags_Top);
-            
-            if (style.FrameBorderSize > 0.0f && menu_bar_rect.Max.y < window->Pos.y + window->Size.y)
-                window->DrawList->AddLine(menu_bar_rect.GetBL(), menu_bar_rect.GetBR(), GetColorU32(ImGuiCol_Border), style.FrameBorderSize);
-        }
-
-        if (window->ScrollbarX)
-            Scrollbar(ImGuiAxis_X);
-        if (window->ScrollbarY)
-            Scrollbar(ImGuiAxis_Y);
-            
-
-        if (!(flags & ImGuiWindowFlags_NoResize))
-        {
-            for (int resize_grip_n = 0; resize_grip_n < resize_grip_count; resize_grip_n++)
-            {
-                const ImGuiResizeGripDef& grip = resize_grip_def[resize_grip_n];
-                const ImVec2 corner = ImLerp(window->Pos, window->Pos + window->Size, grip.CornerPosN);
-                window->DrawList->PathLineTo(corner + grip.InnerDir * ((resize_grip_n & 1) ? ImVec2(window_border_size, resize_grip_draw_size) : ImVec2(resize_grip_draw_size, window_border_size)));
-                window->DrawList->PathLineTo(corner + grip.InnerDir * ((resize_grip_n & 1) ? ImVec2(resize_grip_draw_size, window_border_size) : ImVec2(window_border_size, resize_grip_draw_size)));
-                window->DrawList->PathArcToFast(ImVec2(corner.x + grip.InnerDir.x * (window_rounding + window_border_size), corner.y + grip.InnerDir.y * (window_rounding + window_border_size)), window_rounding, grip.AngleMin12, grip.AngleMax12);
-                window->DrawList->PathFillConvex(resize_grip_col[resize_grip_n]);
-            }
-        }
-
-        RenderWindowOuterBorders(window);
-    }
-}
-
-void ImGui::RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& title_bar_rect, const char* name, bool* p_open)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiStyle& style = g.Style;
-    ImGuiWindowFlags flags = window->Flags;
-
-    const bool has_close_button = (p_open != NULL);
-    const bool has_collapse_button = !(flags & ImGuiWindowFlags_NoCollapse) && (style.WindowMenuButtonPosition != ImGuiDir_None);
-
-    const ImGuiItemFlags item_flags_backup = window->DC.ItemFlags;
-    window->DC.ItemFlags |= ImGuiItemFlags_NoNavDefaultFocus;
-    window->DC.NavLayerCurrent = ImGuiNavLayer_Menu;
-
-    float pad_l = style.FramePadding.x;
-    float pad_r = style.FramePadding.x;
-    float button_sz = g.FontSize;
-    ImVec2 close_button_pos;
-    ImVec2 collapse_button_pos;
-    if (has_close_button)
-    {
-        pad_r += button_sz;
-        close_button_pos = ImVec2(title_bar_rect.Max.x - pad_r - style.FramePadding.x, title_bar_rect.Min.y);
-    }
-    if (has_collapse_button && style.WindowMenuButtonPosition == ImGuiDir_Right)
-    {
-        pad_r += button_sz;
-        collapse_button_pos = ImVec2(title_bar_rect.Max.x - pad_r - style.FramePadding.x, title_bar_rect.Min.y);
-    }
-    if (has_collapse_button && style.WindowMenuButtonPosition == ImGuiDir_Left)
-    {
-        collapse_button_pos = ImVec2(title_bar_rect.Min.x + pad_l - style.FramePadding.x, title_bar_rect.Min.y);
-        pad_l += button_sz;
-    }
-
-    if (has_collapse_button)
-        if (CollapseButton(window->GetID("#COLLAPSE"), collapse_button_pos))
-            window->WantCollapseToggle = true;                
-
-    if (has_close_button)
-        if (CloseButton(window->GetID("#CLOSE"), close_button_pos))
-            *p_open = false;
-
-    window->DC.NavLayerCurrent = ImGuiNavLayer_Main;
-    window->DC.ItemFlags = item_flags_backup;
-
-    const char* UNSAVED_DOCUMENT_MARKER = "*";
-    const float marker_size_x = (flags & ImGuiWindowFlags_UnsavedDocument) ? CalcTextSize(UNSAVED_DOCUMENT_MARKER, NULL, false).x : 0.0f;
-    const ImVec2 text_size = CalcTextSize(name, NULL, true) + ImVec2(marker_size_x, 0.0f);
-
-    if (pad_l > style.FramePadding.x)
-        pad_l += g.Style.ItemInnerSpacing.x;
-    if (pad_r > style.FramePadding.x)
-        pad_r += g.Style.ItemInnerSpacing.x;
-    if (style.WindowTitleAlign.x > 0.0f && style.WindowTitleAlign.x < 1.0f)
-    {
-        float centerness = ImSaturate(1.0f - ImFabs(style.WindowTitleAlign.x - 0.5f) * 2.0f);        
-        float pad_extend = ImMin(ImMax(pad_l, pad_r), title_bar_rect.GetWidth() - pad_l - pad_r - text_size.x);
-        pad_l = ImMax(pad_l, pad_extend * centerness);
-        pad_r = ImMax(pad_r, pad_extend * centerness);
-    }
-
-    pad_l += 10.0f; 
-
-    ImRect layout_r(title_bar_rect.Min.x + pad_l, title_bar_rect.Min.y, title_bar_rect.Max.x - pad_r, title_bar_rect.Max.y);
-    ImRect clip_r(layout_r.Min.x, layout_r.Min.y, ImMin(layout_r.Max.x + g.Style.ItemInnerSpacing.x, title_bar_rect.Max.x), layout_r.Max.y);
-    RenderTextClipped(layout_r.Min, layout_r.Max, name, NULL, &text_size, style.WindowTitleAlign, &clip_r);
-    if (flags & ImGuiWindowFlags_UnsavedDocument)
-    {
-        ImVec2 marker_pos = ImVec2(ImMax(layout_r.Min.x, layout_r.Min.x + (layout_r.GetWidth() - text_size.x) * style.WindowTitleAlign.x) + text_size.x, layout_r.Min.y) + ImVec2(2 - marker_size_x, 0.0f);
-        ImVec2 off = ImVec2(0.0f, IM_FLOOR(-g.FontSize * 0.25f));
-        RenderTextClipped(marker_pos + off, layout_r.Max + off, UNSAVED_DOCUMENT_MARKER, NULL, NULL, ImVec2(0, style.WindowTitleAlign.y), &clip_r);
-    }
-}
-
-void ImGui::UpdateWindowParentAndRootLinks(ImGuiWindow* window, ImGuiWindowFlags flags, ImGuiWindow* parent_window)
-{
-    window->ParentWindow = parent_window;
-    window->RootWindow = window->RootWindowForTitleBarHighlight = window->RootWindowForNav = window;
-    if (parent_window && (flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Tooltip))
-        window->RootWindow = parent_window->RootWindow;
-    if (parent_window && !(flags & ImGuiWindowFlags_Modal) && (flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup)))
-        window->RootWindowForTitleBarHighlight = parent_window->RootWindowForTitleBarHighlight;
-    while (window->RootWindowForNav->Flags & ImGuiWindowFlags_NavFlattened)
-    {
-        IM_ASSERT(window->RootWindowForNav->ParentWindow != NULL);
-        window->RootWindowForNav = window->RootWindowForNav->ParentWindow;
-    }
-}
-
-bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    IM_ASSERT(name != NULL && name[0] != '\0');        
-    IM_ASSERT(g.WithinFrameScope);                      
-    IM_ASSERT(g.FrameCountEnded != g.FrameCount);             
-
-    ImGuiWindow* window = FindWindowByName(name);
-
-    const bool window_just_created = (window == NULL);
-    if (window_just_created)
-        window = CreateNewWindow(name, flags);
-
-    if ((flags & ImGuiWindowFlags_NoInputs) == ImGuiWindowFlags_NoInputs)
-        flags |= ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
-
-    if (flags & ImGuiWindowFlags_NavFlattened)
-        IM_ASSERT(flags & ImGuiWindowFlags_ChildWindow);
-
-    const int current_frame = g.FrameCount;
-    const bool first_begin_of_the_frame = (window->LastFrameActive != current_frame);
-    window->IsFallbackWindow = (g.CurrentWindowStack.Size == 0 && g.WithinFrameScopeWithImplicitWindow);
-
-    bool window_just_activated_by_user = (window->LastFrameActive < current_frame - 1);               
-    const bool window_just_appearing_after_hidden_for_resize = (window->HiddenFramesCannotSkipItems > 0);
-    if (flags & ImGuiWindowFlags_Popup)
-    {
-        ImGuiPopupData& popup_ref = g.OpenPopupStack[g.BeginPopupStack.Size];
-        window_just_activated_by_user |= (window->PopupId != popup_ref.PopupId);             
-        window_just_activated_by_user |= (window != popup_ref.Window);
-    }
-    window->Appearing = (window_just_activated_by_user || window_just_appearing_after_hidden_for_resize);
-    if (window->Appearing)
-        SetWindowConditionAllowFlags(window, ImGuiCond_Appearing, true);
-
-    if (first_begin_of_the_frame)
-    {
-        window->Flags = (ImGuiWindowFlags)flags;
-        window->LastFrameActive = current_frame;
-        window->LastTimeActive = (float)g.Time;
-        window->BeginOrderWithinParent = 0;
-        window->BeginOrderWithinContext = (short)(g.WindowsActiveCount++);
-    }
-    else
-    {
-        flags = window->Flags;
-    }
-
-    ImGuiWindow* parent_window_in_stack = g.CurrentWindowStack.empty() ? NULL : g.CurrentWindowStack.back();
-    ImGuiWindow* parent_window = first_begin_of_the_frame ? ((flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup)) ? parent_window_in_stack : NULL) : window->ParentWindow;
-    IM_ASSERT(parent_window != NULL || !(flags & ImGuiWindowFlags_ChildWindow));
-
-    if (window->IDStack.Size == 0)
-        window->IDStack.push_back(window->ID);
-
-    g.CurrentWindowStack.push_back(window);
-    g.CurrentWindow = window;
-    window->DC.StackSizesOnBegin.SetToCurrentState();
-    g.CurrentWindow = NULL;
-
-    if (flags & ImGuiWindowFlags_Popup)
-    {
-        ImGuiPopupData& popup_ref = g.OpenPopupStack[g.BeginPopupStack.Size];
-        popup_ref.Window = window;
-        g.BeginPopupStack.push_back(popup_ref);
-        window->PopupId = popup_ref.PopupId;
-    }
-
-    if (window_just_appearing_after_hidden_for_resize && !(flags & ImGuiWindowFlags_ChildWindow))
-        window->NavLastIds[0] = 0;
-
-    if (first_begin_of_the_frame)
-        UpdateWindowParentAndRootLinks(window, flags, parent_window);
-
-    bool window_pos_set_by_api = false;
-    bool window_size_x_set_by_api = false, window_size_y_set_by_api = false;
-    if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasPos)
-    {
-        window_pos_set_by_api = (window->SetWindowPosAllowFlags & g.NextWindowData.PosCond) != 0;
-        if (window_pos_set_by_api && ImLengthSqr(g.NextWindowData.PosPivotVal) > 0.00001f)
-        {
-            window->SetWindowPosVal = g.NextWindowData.PosVal;
-            window->SetWindowPosPivot = g.NextWindowData.PosPivotVal;
-            window->SetWindowPosAllowFlags &= ~(ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing);
-        }
-        else
-        {
-            SetWindowPos(window, g.NextWindowData.PosVal, g.NextWindowData.PosCond);
-        }
-    }
-    if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSize)
-    {
-        window_size_x_set_by_api = (window->SetWindowSizeAllowFlags & g.NextWindowData.SizeCond) != 0 && (g.NextWindowData.SizeVal.x > 0.0f);
-        window_size_y_set_by_api = (window->SetWindowSizeAllowFlags & g.NextWindowData.SizeCond) != 0 && (g.NextWindowData.SizeVal.y > 0.0f);
-        SetWindowSize(window, g.NextWindowData.SizeVal, g.NextWindowData.SizeCond);
-    }
-    if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasScroll)
-    {
-        if (g.NextWindowData.ScrollVal.x >= 0.0f)
-        {
-            window->ScrollTarget.x = g.NextWindowData.ScrollVal.x;
-            window->ScrollTargetCenterRatio.x = 0.0f;
-        }
-        if (g.NextWindowData.ScrollVal.y >= 0.0f)
-        {
-            window->ScrollTarget.y = g.NextWindowData.ScrollVal.y;
-            window->ScrollTargetCenterRatio.y = 0.0f;
-        }
-    }
-    if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasContentSize)
-        window->ContentSizeExplicit = g.NextWindowData.ContentSizeVal;
-    else if (first_begin_of_the_frame)
-        window->ContentSizeExplicit = ImVec2(0.0f, 0.0f);
-    if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasCollapsed)
-        SetWindowCollapsed(window, g.NextWindowData.CollapsedVal, g.NextWindowData.CollapsedCond);
-    if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasFocus)
-        FocusWindow(window);
-    if (window->Appearing)
-        SetWindowConditionAllowFlags(window, ImGuiCond_Appearing, false);
-
-    if (first_begin_of_the_frame)
-    {
-        const bool window_is_child_tooltip = (flags & ImGuiWindowFlags_ChildWindow) && (flags & ImGuiWindowFlags_Tooltip);          
-        window->Active = true;
-        window->HasCloseButton = (p_open != NULL);
-        window->ClipRect = ImVec4(-FLT_MAX, -FLT_MAX, +FLT_MAX, +FLT_MAX);
-        window->IDStack.resize(1);
-        window->DrawList->_ResetForNewFrame();
-        window->DC.CurrentTableIdx = -1;
-
-        if (window->MemoryCompacted)
-            GcAwakeTransientWindowBuffers(window);
-
-        bool window_title_visible_elsewhere = false;
-        if (g.NavWindowingListWindow != NULL && (window->Flags & ImGuiWindowFlags_NoNavFocus) == 0)         
-            window_title_visible_elsewhere = true;
-        if (window_title_visible_elsewhere && !window_just_created && strcmp(name, window->Name) != 0)
-        {
-            size_t buf_len = (size_t)window->NameBufLen;
-            window->Name = ImStrdupcpy(window->Name, &buf_len, name);
-            window->NameBufLen = (int)buf_len;
-        }
-
-        CalcWindowContentSizes(window, &window->ContentSize, &window->ContentSizeIdeal);
-        if (window->HiddenFramesCanSkipItems > 0)
-            window->HiddenFramesCanSkipItems--;
-        if (window->HiddenFramesCannotSkipItems > 0)
-            window->HiddenFramesCannotSkipItems--;
-        if (window->HiddenFramesForRenderOnly > 0)
-            window->HiddenFramesForRenderOnly--;
-
-        if (window_just_created && (!window_size_x_set_by_api || !window_size_y_set_by_api))
-            window->HiddenFramesCannotSkipItems = 1;
-
-        if (window_just_activated_by_user && (flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_Tooltip)) != 0)
-        {
-            window->HiddenFramesCannotSkipItems = 1;
-            if (flags & ImGuiWindowFlags_AlwaysAutoResize)
-            {
-                if (!window_size_x_set_by_api)
-                    window->Size.x = window->SizeFull.x = 0.f;
-                if (!window_size_y_set_by_api)
-                    window->Size.y = window->SizeFull.y = 0.f;
-                window->ContentSize = window->ContentSizeIdeal = ImVec2(0.f, 0.f);
-            }
-        }
-
-        SetCurrentWindow(window);
-
-        if (flags & ImGuiWindowFlags_ChildWindow)
-            window->WindowBorderSize = style.ChildBorderSize;
-        else
-            window->WindowBorderSize = ((flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_Tooltip)) && !(flags & ImGuiWindowFlags_Modal)) ? style.PopupBorderSize : style.WindowBorderSize;
-        window->WindowPadding = style.WindowPadding;
-        if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & (ImGuiWindowFlags_AlwaysUseWindowPadding | ImGuiWindowFlags_Popup)) && window->WindowBorderSize == 0.0f)
-            window->WindowPadding = ImVec2(0.0f, (flags & ImGuiWindowFlags_MenuBar) ? style.WindowPadding.y : 0.0f);
-
-        window->DC.MenuBarOffset.x = ImMax(ImMax(window->WindowPadding.x, style.ItemSpacing.x), g.NextWindowData.MenuBarOffsetMinVal.x);
-        window->DC.MenuBarOffset.y = g.NextWindowData.MenuBarOffsetMinVal.y;
-
-        if (!(flags & ImGuiWindowFlags_NoTitleBar) && !(flags & ImGuiWindowFlags_NoCollapse))
-        {
-            ImRect title_bar_rect = window->TitleBarRect();
-            if (g.HoveredWindow == window && g.HoveredId == 0 && g.HoveredIdPreviousFrame == 0 && IsMouseHoveringRect(title_bar_rect.Min, title_bar_rect.Max) && g.IO.MouseDoubleClicked[0])
-                window->WantCollapseToggle = true;
-            if (window->WantCollapseToggle)
-            {
-                window->Collapsed = !window->Collapsed;
-                MarkIniSettingsDirty(window);
-                FocusWindow(window);
-            }
-        }
-        else
-        {
-            window->Collapsed = false;
-        }
-        window->WantCollapseToggle = false;
-
-        const ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, window->ContentSizeIdeal);
-        bool use_current_size_for_scrollbar_x = window_just_created;
-        bool use_current_size_for_scrollbar_y = window_just_created;
-        if ((flags & ImGuiWindowFlags_AlwaysAutoResize) && !window->Collapsed)
-        {
-            if (!window_size_x_set_by_api)
-            {
-                window->SizeFull.x = size_auto_fit.x;
-                use_current_size_for_scrollbar_x = true;
-            }
-            if (!window_size_y_set_by_api)
-            {
-                window->SizeFull.y = size_auto_fit.y;
-                use_current_size_for_scrollbar_y = true;
-            }
-        }
-        else if (window->AutoFitFramesX > 0 || window->AutoFitFramesY > 0)
-        {
-            if (!window_size_x_set_by_api && window->AutoFitFramesX > 0)
-            {
-                window->SizeFull.x = window->AutoFitOnlyGrows ? ImMax(window->SizeFull.x, size_auto_fit.x) : size_auto_fit.x;
-                use_current_size_for_scrollbar_x = true;
-            }
-            if (!window_size_y_set_by_api && window->AutoFitFramesY > 0)
-            {
-                window->SizeFull.y = window->AutoFitOnlyGrows ? ImMax(window->SizeFull.y, size_auto_fit.y) : size_auto_fit.y;
-                use_current_size_for_scrollbar_y = true;
-            }
-            if (!window->Collapsed)
-                MarkIniSettingsDirty(window);
-        }
-
-        window->SizeFull = CalcWindowSizeAfterConstraint(window, window->SizeFull);
-        window->Size = window->Collapsed && !(flags & ImGuiWindowFlags_ChildWindow) ? window->TitleBarRect().GetSize() : window->SizeFull;
-
-        const float decoration_up_height = window->TitleBarHeight() + window->MenuBarHeight();
-
-        if (window_just_activated_by_user)
-        {
-            window->AutoPosLastDirection = ImGuiDir_None;
-            if ((flags & ImGuiWindowFlags_Popup) != 0 && !(flags & ImGuiWindowFlags_Modal) && !window_pos_set_by_api)      
-                window->Pos = g.BeginPopupStack.back().OpenPopupPos;
-        }
-
-        if (flags & ImGuiWindowFlags_ChildWindow)
-        {
-            IM_ASSERT(parent_window && parent_window->Active);
-            window->BeginOrderWithinParent = (short)parent_window->DC.ChildWindows.Size;
-            parent_window->DC.ChildWindows.push_back(window);
-            if (!(flags & ImGuiWindowFlags_Popup) && !window_pos_set_by_api && !window_is_child_tooltip)
-                window->Pos = parent_window->DC.CursorPos;
-        }
-
-        const bool window_pos_with_pivot = (window->SetWindowPosVal.x != FLT_MAX && window->HiddenFramesCannotSkipItems == 0);
-        if (window_pos_with_pivot)
-            SetWindowPos(window, window->SetWindowPosVal - window->Size * window->SetWindowPosPivot, 0);        
-        else if ((flags & ImGuiWindowFlags_ChildMenu) != 0)
-            window->Pos = FindBestWindowPosForPopup(window);
-        else if ((flags & ImGuiWindowFlags_Popup) != 0 && !window_pos_set_by_api && window_just_appearing_after_hidden_for_resize)
-            window->Pos = FindBestWindowPosForPopup(window);
-        else if ((flags & ImGuiWindowFlags_Tooltip) != 0 && !window_pos_set_by_api && !window_is_child_tooltip)
-            window->Pos = FindBestWindowPosForPopup(window);
-
-        ImRect viewport_rect(GetViewportRect());
-
-        ImVec2 visibility_padding = ImMax(style.DisplayWindowPadding, style.DisplaySafeAreaPadding);
-        ImRect visibility_rect(viewport_rect.Min + visibility_padding, viewport_rect.Max - visibility_padding);
-
-        if (!window_pos_set_by_api && !(flags & ImGuiWindowFlags_ChildWindow) && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0)
-            if (viewport_rect.GetWidth() > 0.0f && viewport_rect.GetHeight() > 0.0f)
-                ClampWindowRect(window, visibility_rect);
-        window->Pos = ImFloor(window->Pos);
-
-        window->WindowRounding = (flags & ImGuiWindowFlags_ChildWindow) ? style.ChildRounding : ((flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiWindowFlags_Modal)) ? style.PopupRounding : style.WindowRounding;
-
-        bool want_focus = false;
-        if (window_just_activated_by_user && !(flags & ImGuiWindowFlags_NoFocusOnAppearing))
-        {
-            if (flags & ImGuiWindowFlags_Popup)
-                want_focus = true;
-            else if ((flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Tooltip)) == 0)
-                want_focus = true;
-        }
-
-        int border_held = -1;
-        ImU32 resize_grip_col[4] = {};
-        const int resize_grip_count = g.IO.ConfigWindowsResizeFromEdges ? 2 : 1;              
-        const float resize_grip_draw_size = IM_FLOOR(ImMax(g.FontSize * 1.10f, window->WindowRounding + 1.0f + g.FontSize * 0.2f));
-        if (!window->Collapsed)
-            if (UpdateWindowManualResize(window, size_auto_fit, &border_held, resize_grip_count, &resize_grip_col[0], visibility_rect))
-                use_current_size_for_scrollbar_x = use_current_size_for_scrollbar_y = true;
-        window->ResizeBorderHeld = (signed char)border_held;
-
-        if (!window->Collapsed)
-        {
-            ImVec2 avail_size_from_current_frame = ImVec2(window->SizeFull.x, window->SizeFull.y - decoration_up_height);
-            ImVec2 avail_size_from_last_frame = window->InnerRect.GetSize() + window->ScrollbarSizes;
-            ImVec2 needed_size_from_last_frame = window_just_created ? ImVec2(0, 0) : window->ContentSize + window->WindowPadding * 2.0f;
-            float size_x_for_scrollbars = use_current_size_for_scrollbar_x ? avail_size_from_current_frame.x : avail_size_from_last_frame.x;
-            float size_y_for_scrollbars = use_current_size_for_scrollbar_y ? avail_size_from_current_frame.y : avail_size_from_last_frame.y;
-            window->ScrollbarY = (flags & ImGuiWindowFlags_AlwaysVerticalScrollbar) || ((needed_size_from_last_frame.y > size_y_for_scrollbars) && !(flags & ImGuiWindowFlags_NoScrollbar));
-            window->ScrollbarX = (flags & ImGuiWindowFlags_AlwaysHorizontalScrollbar) || ((needed_size_from_last_frame.x > size_x_for_scrollbars - (window->ScrollbarY ? style.ScrollbarSize : 0.0f)) && !(flags & ImGuiWindowFlags_NoScrollbar) && (flags & ImGuiWindowFlags_HorizontalScrollbar));
-            if (window->ScrollbarX && !window->ScrollbarY)
-                window->ScrollbarY = (needed_size_from_last_frame.y > size_y_for_scrollbars) && !(flags & ImGuiWindowFlags_NoScrollbar);
-            window->ScrollbarSizes = ImVec2(window->ScrollbarY ? style.ScrollbarSize : 0.0f, window->ScrollbarX ? style.ScrollbarSize : 0.0f);
-        }
-
-        const ImRect host_rect = ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Popup) && !window_is_child_tooltip) ? parent_window->ClipRect : viewport_rect;
-        const ImRect outer_rect = window->Rect();
-        const ImRect title_bar_rect = window->TitleBarRect();
-        window->OuterRectClipped = outer_rect;
-        window->OuterRectClipped.ClipWith(host_rect);
-
-        window->InnerRect.Min.x = window->Pos.x;
-        window->InnerRect.Min.y = window->Pos.y + decoration_up_height;
-        window->InnerRect.Max.x = window->Pos.x + window->Size.x - window->ScrollbarSizes.x;
-        window->InnerRect.Max.y = window->Pos.y + window->Size.y - window->ScrollbarSizes.y;
-
-        float top_border_size = (((flags & ImGuiWindowFlags_MenuBar) || !(flags & ImGuiWindowFlags_NoTitleBar)) ? style.FrameBorderSize : window->WindowBorderSize);
-        window->InnerClipRect.Min.x = ImFloor(0.5f + window->InnerRect.Min.x + ImMax(ImFloor(window->WindowPadding.x * 0.5f), window->WindowBorderSize));
-        window->InnerClipRect.Min.y = ImFloor(0.5f + window->InnerRect.Min.y + top_border_size);
-        window->InnerClipRect.Max.x = ImFloor(0.5f + window->InnerRect.Max.x - ImMax(ImFloor(window->WindowPadding.x * 0.5f), window->WindowBorderSize));
-        window->InnerClipRect.Max.y = ImFloor(0.5f + window->InnerRect.Max.y - window->WindowBorderSize);
-        window->InnerClipRect.ClipWithFull(host_rect);
-
-        if (window->Size.x > 0.0f && !(flags & ImGuiWindowFlags_Tooltip) && !(flags & ImGuiWindowFlags_AlwaysAutoResize))
-            window->ItemWidthDefault = ImFloor(window->Size.x * 0.65f);
-        else
-            window->ItemWidthDefault = ImFloor(g.FontSize * 16.0f);
-
-        window->ScrollMax.x = ImMax(0.0f, window->ContentSize.x + window->WindowPadding.x * 2.0f - window->InnerRect.GetWidth());
-        window->ScrollMax.y = ImMax(0.0f, window->ContentSize.y + window->WindowPadding.y * 2.0f - window->InnerRect.GetHeight());
-
-        window->Scroll = CalcNextScrollFromScrollTargetAndClamp(window);
-        window->ScrollTarget = ImVec2(FLT_MAX, FLT_MAX);
-
-        IM_ASSERT(window->DrawList->CmdBuffer.Size == 1 && window->DrawList->CmdBuffer[0].ElemCount == 0);
-        window->DrawList->PushTextureID(g.Font->ContainerAtlas->TexID);
-        PushClipRect(host_rect.Min, host_rect.Max, false);
-
-        const bool dim_bg_for_modal = (flags & ImGuiWindowFlags_Modal) && window == GetTopMostPopupModal() && window->HiddenFramesCannotSkipItems <= 0;
-        const bool dim_bg_for_window_list = g.NavWindowingTargetAnim && (window == g.NavWindowingTargetAnim->RootWindow);
-        if (dim_bg_for_modal || dim_bg_for_window_list)
-        {
-            const ImU32 dim_bg_col = GetColorU32(dim_bg_for_modal ? ImGuiCol_ModalWindowDimBg : ImGuiCol_NavWindowingDimBg, g.DimBgRatio);
-            window->DrawList->AddRectFilled(viewport_rect.Min, viewport_rect.Max, dim_bg_col); 
-        }
-
-        if (dim_bg_for_window_list && window == g.NavWindowingTargetAnim)
-        {
-            ImRect bb = window->Rect();
-            bb.Expand(g.FontSize);
-            if (!bb.Contains(viewport_rect))            
-                window->DrawList->AddRectFilled(bb.Min, bb.Max, GetColorU32(ImGuiCol_NavWindowingHighlight, g.NavWindowingHighlightAlpha * 0.25f), g.Style.WindowRounding);
-        }
-
-        {
-            bool render_decorations_in_parent = false;
-            if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Popup) && !window_is_child_tooltip)
-                if (window->DrawList->CmdBuffer.back().ElemCount == 0 && parent_window->DrawList->VtxBuffer.Size > 0)
-                    render_decorations_in_parent = true;
-            if (render_decorations_in_parent)
-                window->DrawList = parent_window->DrawList;
-
-            const ImGuiWindow* window_to_highlight = g.NavWindowingTarget ? g.NavWindowingTarget : g.NavWindow;
-            const bool title_bar_is_highlight = want_focus || (window_to_highlight && window->RootWindowForTitleBarHighlight == window_to_highlight->RootWindowForTitleBarHighlight);
-            RenderWindowDecorations(window, title_bar_rect, title_bar_is_highlight, resize_grip_count, resize_grip_col, resize_grip_draw_size);
-
-            if (render_decorations_in_parent)
-                window->DrawList = &window->DrawListInst;
-        }
-
-        if (g.NavWindowingTargetAnim == window)
-        {
-            float rounding = ImMax(window->WindowRounding, g.Style.WindowRounding);
-            ImRect bb = window->Rect();
-            bb.Expand(g.FontSize);
-            if (bb.Contains(viewport_rect))            
-            {
-                bb.Expand(-g.FontSize - 1.0f);
-                rounding = window->WindowRounding;
-            }
-            window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_NavWindowingHighlight, g.NavWindowingHighlightAlpha), rounding, ~0, 3.0f);
-        }
-
-        const bool allow_scrollbar_x = !(flags & ImGuiWindowFlags_NoScrollbar) && (flags & ImGuiWindowFlags_HorizontalScrollbar);
-        const bool allow_scrollbar_y = !(flags & ImGuiWindowFlags_NoScrollbar);
-        const float work_rect_size_x = (window->ContentSizeExplicit.x != 0.0f ? window->ContentSizeExplicit.x : ImMax(allow_scrollbar_x ? window->ContentSize.x : 0.0f, window->Size.x - window->WindowPadding.x * 2.0f - window->ScrollbarSizes.x));
-        const float work_rect_size_y = (window->ContentSizeExplicit.y != 0.0f ? window->ContentSizeExplicit.y : ImMax(allow_scrollbar_y ? window->ContentSize.y : 0.0f, window->Size.y - window->WindowPadding.y * 2.0f - decoration_up_height - window->ScrollbarSizes.y));
-        window->WorkRect.Min.x = ImFloor(window->InnerRect.Min.x - window->Scroll.x + ImMax(window->WindowPadding.x, window->WindowBorderSize));
-        window->WorkRect.Min.y = ImFloor(window->InnerRect.Min.y - window->Scroll.y + ImMax(window->WindowPadding.y, window->WindowBorderSize));
-        window->WorkRect.Max.x = window->WorkRect.Min.x + work_rect_size_x;
-        window->WorkRect.Max.y = window->WorkRect.Min.y + work_rect_size_y;
-        window->ParentWorkRect = window->WorkRect;
-
-        window->ContentRegionRect.Min.x = window->Pos.x - window->Scroll.x + window->WindowPadding.x;
-        window->ContentRegionRect.Min.y = window->Pos.y - window->Scroll.y + window->WindowPadding.y + decoration_up_height;
-        window->ContentRegionRect.Max.x = window->ContentRegionRect.Min.x + (window->ContentSizeExplicit.x != 0.0f ? window->ContentSizeExplicit.x : (window->Size.x - window->WindowPadding.x * 2.0f - window->ScrollbarSizes.x));
-        window->ContentRegionRect.Max.y = window->ContentRegionRect.Min.y + (window->ContentSizeExplicit.y != 0.0f ? window->ContentSizeExplicit.y : (window->Size.y - window->WindowPadding.y * 2.0f - decoration_up_height - window->ScrollbarSizes.y));
-
-        window->DC.Indent.x = 0.0f + window->WindowPadding.x - window->Scroll.x;
-        window->DC.GroupOffset.x = 0.0f;
-        window->DC.ColumnsOffset.x = 0.0f;
-        window->DC.CursorStartPos = window->Pos + ImVec2(window->DC.Indent.x + window->DC.ColumnsOffset.x, decoration_up_height + window->WindowPadding.y - window->Scroll.y);
-        window->DC.CursorPos = window->DC.CursorStartPos;
-        window->DC.CursorPosPrevLine = window->DC.CursorPos;
-        window->DC.CursorMaxPos = window->DC.CursorStartPos;
-        window->DC.IdealMaxPos = window->DC.CursorStartPos;
-        window->DC.CurrLineSize = window->DC.PrevLineSize = ImVec2(0.0f, 0.0f);
-        window->DC.CurrLineTextBaseOffset = window->DC.PrevLineTextBaseOffset = 0.0f;
-
-        window->DC.NavLayerCurrent = ImGuiNavLayer_Main;
-        window->DC.NavLayerActiveMask = window->DC.NavLayerActiveMaskNext;
-        window->DC.NavLayerActiveMaskNext = 0x00;
-        window->DC.NavHideHighlightOneFrame = false;
-        window->DC.NavHasScroll = (window->ScrollMax.y > 0.0f);
-
-        window->DC.MenuBarAppending = false;
-        window->DC.MenuColumns.Update(3, style.ItemSpacing.x, window_just_activated_by_user);
-        window->DC.TreeDepth = 0;
-        window->DC.TreeJumpToParentOnPopMask = 0x00;
-        window->DC.ChildWindows.resize(0);
-        window->DC.StateStorage = &window->StateStorage;
-        window->DC.CurrentColumns = NULL;
-        window->DC.LayoutType = ImGuiLayoutType_Vertical;
-        window->DC.ParentLayoutType = parent_window ? parent_window->DC.LayoutType : ImGuiLayoutType_Vertical;
-        window->DC.FocusCounterRegular = window->DC.FocusCounterTabStop = -1;
-
-        window->DC.ItemWidth = window->ItemWidthDefault;
-        window->DC.TextWrapPos = -1.0f;  
-        window->DC.ItemWidthStack.resize(0);
-        window->DC.TextWrapPosStack.resize(0);
-
-        if (window->AutoFitFramesX > 0)
-            window->AutoFitFramesX--;
-        if (window->AutoFitFramesY > 0)
-            window->AutoFitFramesY--;
-
-        if (want_focus)
-        {
-            FocusWindow(window);
-            NavInitWindow(window, false);
-        }
-
-        if (!(flags & ImGuiWindowFlags_NoTitleBar))
-            RenderWindowTitleBarContents(window, ImRect(title_bar_rect.Min.x + window->WindowBorderSize, title_bar_rect.Min.y, title_bar_rect.Max.x - window->WindowBorderSize, title_bar_rect.Max.y), name, p_open);
-
-        window->HitTestHoleSize.x = window->HitTestHoleSize.y = 0;
-
-        SetLastItemData(window, window->MoveId, IsMouseHoveringRect(title_bar_rect.Min, title_bar_rect.Max, false) ? ImGuiItemStatusFlags_HoveredRect : 0, title_bar_rect);
-
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-        if (!(window->Flags & ImGuiWindowFlags_NoTitleBar))
-            IMGUI_TEST_ENGINE_ITEM_ADD(window->DC.LastItemRect, window->DC.LastItemId);
-#endif
-    }
-    else
-    {
-        SetCurrentWindow(window);
-    }
-
-    window->DC.ItemFlags = g.ItemFlagsStack.back();     
-    window->DC.NavFocusScopeIdCurrent = (flags & ImGuiWindowFlags_ChildWindow) ? parent_window->DC.NavFocusScopeIdCurrent : 0;       
-
-    PushClipRect(window->InnerClipRect.Min, window->InnerClipRect.Max, true);
-
-    window->WriteAccessed = false;
-    window->BeginCount++;
-    g.NextWindowData.ClearFlags();
-
-    if (first_begin_of_the_frame)
-    {
-        if (flags & ImGuiWindowFlags_ChildWindow)
-        {
-            IM_ASSERT((flags & ImGuiWindowFlags_NoTitleBar) != 0);
-            if (!(flags & ImGuiWindowFlags_AlwaysAutoResize) && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0)       
-                if (!g.LogEnabled)
-                    if (window->OuterRectClipped.Min.x >= window->OuterRectClipped.Max.x || window->OuterRectClipped.Min.y >= window->OuterRectClipped.Max.y)
-                        window->HiddenFramesCanSkipItems = 1;
-
-            if (parent_window && (parent_window->Collapsed || parent_window->HiddenFramesCanSkipItems > 0))
-                window->HiddenFramesCanSkipItems = 1;
-            if (parent_window && (parent_window->Collapsed || parent_window->HiddenFramesCannotSkipItems > 0))
-                window->HiddenFramesCannotSkipItems = 1;
-        }
-
-        if (style.Alpha <= 0.0f)
-            window->HiddenFramesCanSkipItems = 1;
-
-        window->Hidden = (window->HiddenFramesCanSkipItems > 0) || (window->HiddenFramesCannotSkipItems > 0) || (window->HiddenFramesForRenderOnly > 0);
-
-        bool skip_items = false;
-        if (window->Collapsed || !window->Active || window->Hidden)
-            if (window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0 && window->HiddenFramesCannotSkipItems <= 0)
-                skip_items = true;
-        window->SkipItems = skip_items;
-    }
-
-    return !window->SkipItems;
-}
-
-void ImGui::End()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    if (g.CurrentWindowStack.Size <= 1 && g.WithinFrameScopeWithImplicitWindow)
-    {
-        IM_ASSERT_USER_ERROR(g.CurrentWindowStack.Size > 1, "Calling End() too many times!");
-        return;
-    }
-    IM_ASSERT(g.CurrentWindowStack.Size > 0);
-
-    if (window->Flags & ImGuiWindowFlags_ChildWindow)
-        IM_ASSERT_USER_ERROR(g.WithinEndChild, "Must call EndChild() and not End()!");
-
-    if (window->DC.CurrentColumns)
-        EndColumns();
-    PopClipRect();       
-
-    if (!(window->Flags & ImGuiWindowFlags_ChildWindow))            
-        LogFinish();
-
-    g.CurrentWindowStack.pop_back();
-    if (window->Flags & ImGuiWindowFlags_Popup)
-        g.BeginPopupStack.pop_back();
-    window->DC.StackSizesOnBegin.CompareWithCurrentState();
-    SetCurrentWindow(g.CurrentWindowStack.empty() ? NULL : g.CurrentWindowStack.back());
-}
-
-void ImGui::BringWindowToFocusFront(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.WindowsFocusOrder.back() == window)
-        return;
-    for (int i = g.WindowsFocusOrder.Size - 2; i >= 0; i--)       
-        if (g.WindowsFocusOrder[i] == window)
-        {
-            memmove(&g.WindowsFocusOrder[i], &g.WindowsFocusOrder[i + 1], (size_t)(g.WindowsFocusOrder.Size - i - 1) * sizeof(ImGuiWindow*));
-            g.WindowsFocusOrder[g.WindowsFocusOrder.Size - 1] = window;
-            break;
-        }
-}
-
-void ImGui::BringWindowToDisplayFront(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* current_front_window = g.Windows.back();
-    if (current_front_window == window || current_front_window->RootWindow == window)       
-        return;
-    for (int i = g.Windows.Size - 2; i >= 0; i--)       
-        if (g.Windows[i] == window)
-        {
-            memmove(&g.Windows[i], &g.Windows[i + 1], (size_t)(g.Windows.Size - i - 1) * sizeof(ImGuiWindow*));
-            g.Windows[g.Windows.Size - 1] = window;
-            break;
-        }
-}
-
-void ImGui::BringWindowToDisplayBack(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.Windows[0] == window)
-        return;
-    for (int i = 0; i < g.Windows.Size; i++)
-        if (g.Windows[i] == window)
-        {
-            memmove(&g.Windows[1], &g.Windows[0], (size_t)i * sizeof(ImGuiWindow*));
-            g.Windows[0] = window;
-            break;
-        }
-}
-
-void ImGui::FocusWindow(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-
-    if (g.NavWindow != window)
-    {
-        g.NavWindow = window;
-        if (window && g.NavDisableMouseHover)
-            g.NavMousePosDirty = true;
-        g.NavInitRequest = false;
-        g.NavId = window ? window->NavLastIds[0] : 0;   
-        g.NavFocusScopeId = 0;
-        g.NavIdIsAlive = false;
-        g.NavLayer = ImGuiNavLayer_Main;
-    }
-
-    ClosePopupsOverWindow(window, false);
-
-    IM_ASSERT(window == NULL || window->RootWindow != NULL);
-    ImGuiWindow* focus_front_window = window ? window->RootWindow : NULL;        
-    ImGuiWindow* display_front_window = window ? window->RootWindow : NULL;
-
-    if (g.ActiveId != 0 && g.ActiveIdWindow && g.ActiveIdWindow->RootWindow != focus_front_window)
-        if (!g.ActiveIdNoClearOnFocusLoss)
-            ClearActiveID();
-
-    if (!window)
-        return;
-
-    BringWindowToFocusFront(focus_front_window);
-    if (((window->Flags | display_front_window->Flags) & ImGuiWindowFlags_NoBringToFrontOnFocus) == 0)
-        BringWindowToDisplayFront(display_front_window);
-}
-
-void ImGui::FocusTopMostWindowUnderOne(ImGuiWindow* under_this_window, ImGuiWindow* ignore_window)
-{
-    ImGuiContext& g = *GImGui;
-
-    int start_idx = g.WindowsFocusOrder.Size - 1;
-    if (under_this_window != NULL)
-    {
-        int under_this_window_idx = FindWindowFocusIndex(under_this_window);
-        if (under_this_window_idx != -1)
-            start_idx = under_this_window_idx - 1;
-    }
-    for (int i = start_idx; i >= 0; i--)
-    {
-        ImGuiWindow* window = g.WindowsFocusOrder[i];
-        if (window != ignore_window && window->WasActive && !(window->Flags & ImGuiWindowFlags_ChildWindow))
-            if ((window->Flags & (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs)) != (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs))
-            {
-                ImGuiWindow* focus_window = NavRestoreLastChildNavWindow(window);
-                FocusWindow(focus_window);
-                return;
-            }
-    }
-    FocusWindow(NULL);
-}
-
-void ImGui::SetCurrentFont(ImFont* font)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(font && font->IsLoaded());               
-    IM_ASSERT(font->Scale > 0.0f);
-    g.Font = font;
-    g.FontBaseSize = ImMax(1.0f, g.IO.FontGlobalScale * g.Font->FontSize * g.Font->Scale);
-    g.FontSize = g.CurrentWindow ? g.CurrentWindow->CalcFontSize() : 0.0f;
-
-    ImFontAtlas* atlas = g.Font->ContainerAtlas;
-    g.DrawListSharedData.TexUvWhitePixel = atlas->TexUvWhitePixel;
-    g.DrawListSharedData.TexUvLines = atlas->TexUvLines;
-    g.DrawListSharedData.Font = g.Font;
-    g.DrawListSharedData.FontSize = g.FontSize;
-}
-
-void ImGui::PushFont(ImFont* font)
-{
-    ImGuiContext& g = *GImGui;
-    if (!font)
-        font = GetDefaultFont();
-    SetCurrentFont(font);
-    g.FontStack.push_back(font);
-    g.CurrentWindow->DrawList->PushTextureID(font->ContainerAtlas->TexID);
-}
-
-void  ImGui::PopFont()
-{
-    ImGuiContext& g = *GImGui;
-    g.CurrentWindow->DrawList->PopTextureID();
-    g.FontStack.pop_back();
-    SetCurrentFont(g.FontStack.empty() ? GetDefaultFont() : g.FontStack.back());
-}
-
-void ImGui::PushItemFlag(ImGuiItemFlags option, bool enabled)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiItemFlags item_flags = window->DC.ItemFlags;
-    IM_ASSERT(item_flags == g.ItemFlagsStack.back());
-    if (enabled)
-        item_flags |= option;
-    else
-        item_flags &= ~option;
-    window->DC.ItemFlags = item_flags;
-    g.ItemFlagsStack.push_back(item_flags);
-}
-
-void ImGui::PopItemFlag()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    IM_ASSERT(g.ItemFlagsStack.Size > 1);                  
-    g.ItemFlagsStack.pop_back();
-    window->DC.ItemFlags = g.ItemFlagsStack.back();
-}
-
-void ImGui::PushAllowKeyboardFocus(bool allow_keyboard_focus)
-{
-    PushItemFlag(ImGuiItemFlags_NoTabStop, !allow_keyboard_focus);
-}
-
-void ImGui::PopAllowKeyboardFocus()
-{
-    PopItemFlag();
-}
-
-void ImGui::PushButtonRepeat(bool repeat)
-{
-    PushItemFlag(ImGuiItemFlags_ButtonRepeat, repeat);
-}
-
-void ImGui::PopButtonRepeat()
-{
-    PopItemFlag();
-}
-
-void ImGui::PushTextWrapPos(float wrap_pos_x)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DC.TextWrapPosStack.push_back(window->DC.TextWrapPos);
-    window->DC.TextWrapPos = wrap_pos_x;
-}
-
-void ImGui::PopTextWrapPos()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DC.TextWrapPos = window->DC.TextWrapPosStack.back();
-    window->DC.TextWrapPosStack.pop_back();
-}
-
-bool ImGui::IsWindowChildOf(ImGuiWindow* window, ImGuiWindow* potential_parent)
-{
-    if (window->RootWindow == potential_parent)
-        return true;
-    while (window != NULL)
-    {
-        if (window == potential_parent)
-            return true;
-        window = window->ParentWindow;
-    }
-    return false;
-}
-
-bool ImGui::IsWindowAbove(ImGuiWindow* potential_above, ImGuiWindow* potential_below)
-{
-    ImGuiContext& g = *GImGui;
-    for (int i = g.Windows.Size - 1; i >= 0; i--)
-    {
-        ImGuiWindow* candidate_window = g.Windows[i];
-        if (candidate_window == potential_above)
-            return true;
-        if (candidate_window == potential_below)
-            return false;
-    }
-    return false;
-}
-
-bool ImGui::IsWindowHovered(ImGuiHoveredFlags flags)
-{
-    IM_ASSERT((flags & ImGuiHoveredFlags_AllowWhenOverlapped) == 0);         
-    ImGuiContext& g = *GImGui;
-
-    if (flags & ImGuiHoveredFlags_AnyWindow)
-    {
-        if (g.HoveredWindow == NULL)
-            return false;
-    }
-    else
-    {
-        switch (flags & (ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows))
-        {
-        case ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows:
-            if (g.HoveredRootWindow != g.CurrentWindow->RootWindow)
-                return false;
-            break;
-        case ImGuiHoveredFlags_RootWindow:
-            if (g.HoveredWindow != g.CurrentWindow->RootWindow)
-                return false;
-            break;
-        case ImGuiHoveredFlags_ChildWindows:
-            if (g.HoveredWindow == NULL || !IsWindowChildOf(g.HoveredWindow, g.CurrentWindow))
-                return false;
-            break;
-        default:
-            if (g.HoveredWindow != g.CurrentWindow)
-                return false;
-            break;
-        }
-    }
-
-    if (!IsWindowContentHoverable(g.HoveredWindow, flags))
-        return false;
-    if (!(flags & ImGuiHoveredFlags_AllowWhenBlockedByActiveItem))
-        if (g.ActiveId != 0 && !g.ActiveIdAllowOverlap && g.ActiveId != g.HoveredWindow->MoveId)
-            return false;
-    return true;
-}
-
-bool ImGui::IsWindowFocused(ImGuiFocusedFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-
-    if (flags & ImGuiFocusedFlags_AnyWindow)
-        return g.NavWindow != NULL;
-
-    IM_ASSERT(g.CurrentWindow);         
-    switch (flags & (ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows))
-    {
-    case ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows:
-        return g.NavWindow && g.NavWindow->RootWindow == g.CurrentWindow->RootWindow;
-    case ImGuiFocusedFlags_RootWindow:
-        return g.NavWindow == g.CurrentWindow->RootWindow;
-    case ImGuiFocusedFlags_ChildWindows:
-        return g.NavWindow && IsWindowChildOf(g.NavWindow, g.CurrentWindow);
-    default:
-        return g.NavWindow == g.CurrentWindow;
-    }
-}
-
-bool ImGui::IsWindowNavFocusable(ImGuiWindow* window)
-{
-    return window->WasActive && window == window->RootWindow && !(window->Flags & ImGuiWindowFlags_NoNavFocus);
-}
-
-float ImGui::GetWindowWidth()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->Size.x;
-}
-
-float ImGui::GetWindowHeight()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->Size.y;
-}
-
-ImVec2 ImGui::GetWindowPos()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    return window->Pos;
-}
-
-void ImGui::SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond)
-{
-    if (cond && (window->SetWindowPosAllowFlags & cond) == 0)
-        return;
-
-    IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond));            
-    window->SetWindowPosAllowFlags &= ~(ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing);
-    window->SetWindowPosVal = ImVec2(FLT_MAX, FLT_MAX);
-
-    const ImVec2 old_pos = window->Pos;
-    window->Pos = ImFloor(pos);
-    ImVec2 offset = window->Pos - old_pos;
-    window->DC.CursorPos += offset;                                    
-    window->DC.CursorMaxPos += offset;                     
-    window->DC.IdealMaxPos += offset;
-    window->DC.CursorStartPos += offset;
-}
-
-void ImGui::SetWindowPos(const ImVec2& pos, ImGuiCond cond)
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    SetWindowPos(window, pos, cond);
-}
-
-void ImGui::SetWindowPos(const char* name, const ImVec2& pos, ImGuiCond cond)
-{
-    if (ImGuiWindow* window = FindWindowByName(name))
-        SetWindowPos(window, pos, cond);
-}
-
-ImVec2 ImGui::GetWindowSize()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->Size;
-}
-
-void ImGui::SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond)
-{
-    if (cond && (window->SetWindowSizeAllowFlags & cond) == 0)
-        return;
-
-    IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond));            
-    window->SetWindowSizeAllowFlags &= ~(ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing);
-
-    if (size.x > 0.0f)
-    {
-        window->AutoFitFramesX = 0;
-        window->SizeFull.x = IM_FLOOR(size.x);
-    }
-    else
-    {
-        window->AutoFitFramesX = 2;
-        window->AutoFitOnlyGrows = false;
-    }
-    if (size.y > 0.0f)
-    {
-        window->AutoFitFramesY = 0;
-        window->SizeFull.y = IM_FLOOR(size.y);
-    }
-    else
-    {
-        window->AutoFitFramesY = 2;
-        window->AutoFitOnlyGrows = false;
-    }
-}
-
-void ImGui::SetWindowSize(const ImVec2& size, ImGuiCond cond)
-{
-    SetWindowSize(GImGui->CurrentWindow, size, cond);
-}
-
-void ImGui::SetWindowSize(const char* name, const ImVec2& size, ImGuiCond cond)
-{
-    if (ImGuiWindow* window = FindWindowByName(name))
-        SetWindowSize(window, size, cond);
-}
-
-void ImGui::SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond)
-{
-    if (cond && (window->SetWindowCollapsedAllowFlags & cond) == 0)
-        return;
-    window->SetWindowCollapsedAllowFlags &= ~(ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing);
-
-    window->Collapsed = collapsed;
-}
-
-void ImGui::SetWindowHitTestHole(ImGuiWindow* window, const ImVec2& pos, const ImVec2& size)
-{
-    IM_ASSERT(window->HitTestHoleSize.x == 0);            
-    window->HitTestHoleSize = ImVec2ih(size);
-    window->HitTestHoleOffset = ImVec2ih(pos - window->Pos);
-}
-
-void ImGui::SetWindowCollapsed(bool collapsed, ImGuiCond cond)
-{
-    SetWindowCollapsed(GImGui->CurrentWindow, collapsed, cond);
-}
-
-bool ImGui::IsWindowCollapsed()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->Collapsed;
-}
-
-bool ImGui::IsWindowAppearing()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->Appearing;
-}
-
-void ImGui::SetWindowCollapsed(const char* name, bool collapsed, ImGuiCond cond)
-{
-    if (ImGuiWindow* window = FindWindowByName(name))
-        SetWindowCollapsed(window, collapsed, cond);
-}
-
-void ImGui::SetWindowFocus()
-{
-    FocusWindow(GImGui->CurrentWindow);
-}
-
-void ImGui::SetWindowFocus(const char* name)
-{
-    if (name)
-    {
-        if (ImGuiWindow* window = FindWindowByName(name))
-            FocusWindow(window);
-    }
-    else
-    {
-        FocusWindow(NULL);
-    }
-}
-
-void ImGui::SetNextWindowPos(const ImVec2& pos, ImGuiCond cond, const ImVec2& pivot)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond));            
-    g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasPos;
-    g.NextWindowData.PosVal = pos;
-    g.NextWindowData.PosPivotVal = pivot;
-    g.NextWindowData.PosCond = cond ? cond : ImGuiCond_Always;
-}
-
-void ImGui::SetNextWindowSize(const ImVec2& size, ImGuiCond cond)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond));            
-    g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasSize;
-    g.NextWindowData.SizeVal = size;
-    g.NextWindowData.SizeCond = cond ? cond : ImGuiCond_Always;
-}
-
-void ImGui::SetNextWindowSizeConstraints(const ImVec2& size_min, const ImVec2& size_max, ImGuiSizeCallback custom_callback, void* custom_callback_user_data)
-{
-    ImGuiContext& g = *GImGui;
-    g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasSizeConstraint;
-    g.NextWindowData.SizeConstraintRect = ImRect(size_min, size_max);
-    g.NextWindowData.SizeCallback = custom_callback;
-    g.NextWindowData.SizeCallbackUserData = custom_callback_user_data;
-}
-
-void ImGui::SetNextWindowContentSize(const ImVec2& size)
-{
-    ImGuiContext& g = *GImGui;
-    g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasContentSize;
-    g.NextWindowData.ContentSizeVal = ImFloor(size);
-}
-
-void ImGui::SetNextWindowScroll(const ImVec2& scroll)
-{
-    ImGuiContext& g = *GImGui;
-    g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasScroll;
-    g.NextWindowData.ScrollVal = scroll;
-}
-
-void ImGui::SetNextWindowCollapsed(bool collapsed, ImGuiCond cond)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond));            
-    g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasCollapsed;
-    g.NextWindowData.CollapsedVal = collapsed;
-    g.NextWindowData.CollapsedCond = cond ? cond : ImGuiCond_Always;
-}
-
-void ImGui::SetNextWindowFocus()
-{
-    ImGuiContext& g = *GImGui;
-    g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasFocus;
-}
-
-void ImGui::SetNextWindowBgAlpha(float alpha)
-{
-    ImGuiContext& g = *GImGui;
-    g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasBgAlpha;
-    g.NextWindowData.BgAlphaVal = alpha;
-}
-
-ImDrawList* ImGui::GetWindowDrawList()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    return window->DrawList;
-}
-
-ImFont* ImGui::GetFont()
-{
-    return GImGui->Font;
-}
-
-float ImGui::GetFontSize()
-{
-    return GImGui->FontSize;
-}
-
-ImVec2 ImGui::GetFontTexUvWhitePixel()
-{
-    return GImGui->DrawListSharedData.TexUvWhitePixel;
-}
-
-void ImGui::SetWindowFontScale(float scale)
-{
-    IM_ASSERT(scale > 0.0f);
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-    window->FontWindowScale = scale;
-    g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize();
-}
-
-void ImGui::ActivateItem(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    g.NavNextActivateId = id;
-}
-
-void ImGui::PushFocusScope(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    g.FocusScopeStack.push_back(window->DC.NavFocusScopeIdCurrent);
-    window->DC.NavFocusScopeIdCurrent = id;
-}
-
-void ImGui::PopFocusScope()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    IM_ASSERT(g.FocusScopeStack.Size > 0);     
-    window->DC.NavFocusScopeIdCurrent = g.FocusScopeStack.back();
-    g.FocusScopeStack.pop_back();
-}
-
-void ImGui::SetKeyboardFocusHere(int offset)
-{
-    IM_ASSERT(offset >= -1);          
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    g.FocusRequestNextWindow = window;
-    g.FocusRequestNextCounterRegular = window->DC.FocusCounterRegular + 1 + offset;
-    g.FocusRequestNextCounterTabStop = INT_MAX;
-}
-
-void ImGui::SetItemDefaultFocus()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (!window->Appearing)
-        return;
-    if (g.NavWindow == window->RootWindowForNav && (g.NavInitRequest || g.NavInitResultId != 0) && g.NavLayer == g.NavWindow->DC.NavLayerCurrent)
-    {
-        g.NavInitRequest = false;
-        g.NavInitResultId = g.NavWindow->DC.LastItemId;
-        g.NavInitResultRectRel = ImRect(g.NavWindow->DC.LastItemRect.Min - g.NavWindow->Pos, g.NavWindow->DC.LastItemRect.Max - g.NavWindow->Pos);
-        NavUpdateAnyRequestFlag();
-        if (!IsItemVisible())
-            SetScrollHereY();
-    }
-}
-
-void ImGui::SetStateStorage(ImGuiStorage* tree)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    window->DC.StateStorage = tree ? tree : &window->StateStorage;
-}
-
-ImGuiStorage* ImGui::GetStateStorage()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->DC.StateStorage;
-}
-
-void ImGui::PushID(const char* str_id)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiID id = window->GetIDNoKeepAlive(str_id);
-    window->IDStack.push_back(id);
-}
-
-void ImGui::PushID(const char* str_id_begin, const char* str_id_end)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiID id = window->GetIDNoKeepAlive(str_id_begin, str_id_end);
-    window->IDStack.push_back(id);
-}
-
-void ImGui::PushID(const void* ptr_id)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiID id = window->GetIDNoKeepAlive(ptr_id);
-    window->IDStack.push_back(id);
-}
-
-void ImGui::PushID(int int_id)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiID id = window->GetIDNoKeepAlive(int_id);
-    window->IDStack.push_back(id);
-}
-
-void ImGui::PushOverrideID(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    window->IDStack.push_back(id);
-}
-
-ImGuiID ImGui::GetIDWithSeed(const char* str, const char* str_end, ImGuiID seed)
-{
-    ImGuiID id = ImHashStr(str, str_end ? (str_end - str) : 0, seed);
-    ImGui::KeepAliveID(id);
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    ImGuiContext& g = *GImGui;
-    IMGUI_TEST_ENGINE_ID_INFO2(id, ImGuiDataType_String, str, str_end);
-#endif
-    return id;
-}
-
-void ImGui::PopID()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    IM_ASSERT(window->IDStack.Size > 1);            
-    window->IDStack.pop_back();
-}
-
-ImGuiID ImGui::GetID(const char* str_id)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->GetID(str_id);
-}
-
-ImGuiID ImGui::GetID(const char* str_id_begin, const char* str_id_end)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->GetID(str_id_begin, str_id_end);
-}
-
-ImGuiID ImGui::GetID(const void* ptr_id)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->GetID(ptr_id);
-}
-
-bool ImGui::IsRectVisible(const ImVec2& size)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ClipRect.Overlaps(ImRect(window->DC.CursorPos, window->DC.CursorPos + size));
-}
-
-bool ImGui::IsRectVisible(const ImVec2& rect_min, const ImVec2& rect_max)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ClipRect.Overlaps(ImRect(rect_min, rect_max));
-}
-
-
-bool ImGui::DebugCheckVersionAndDataLayout(const char* version, size_t sz_io, size_t sz_style, size_t sz_vec2, size_t sz_vec4, size_t sz_vert, size_t sz_idx)
-{
-    bool error = false;
-    if (strcmp(version, IMGUI_VERSION) != 0) { error = true; IM_ASSERT(strcmp(version, IMGUI_VERSION) == 0 && "Mismatched version string!"); }
-    if (sz_io != sizeof(ImGuiIO)) { error = true; IM_ASSERT(sz_io == sizeof(ImGuiIO) && "Mismatched struct layout!"); }
-    if (sz_style != sizeof(ImGuiStyle)) { error = true; IM_ASSERT(sz_style == sizeof(ImGuiStyle) && "Mismatched struct layout!"); }
-    if (sz_vec2 != sizeof(ImVec2)) { error = true; IM_ASSERT(sz_vec2 == sizeof(ImVec2) && "Mismatched struct layout!"); }
-    if (sz_vec4 != sizeof(ImVec4)) { error = true; IM_ASSERT(sz_vec4 == sizeof(ImVec4) && "Mismatched struct layout!"); }
-    if (sz_vert != sizeof(ImDrawVert)) { error = true; IM_ASSERT(sz_vert == sizeof(ImDrawVert) && "Mismatched struct layout!"); }
-    if (sz_idx != sizeof(ImDrawIdx)) { error = true; IM_ASSERT(sz_idx == sizeof(ImDrawIdx) && "Mismatched struct layout!"); }
-    return !error;
-}
-
-static void ImGui::ErrorCheckNewFrameSanityChecks()
-{
-    ImGuiContext& g = *GImGui;
-
-    if (true) IM_ASSERT(1); else IM_ASSERT(0);
-
-    IM_ASSERT(g.Initialized);
-    IM_ASSERT((g.IO.DeltaTime > 0.0f || g.FrameCount == 0)              && "Need a positive DeltaTime!");
-    IM_ASSERT((g.FrameCount == 0 || g.FrameCountEnded == g.FrameCount)  && "Forgot to call Render() or EndFrame() at the end of the previous frame?");
-    IM_ASSERT(g.IO.DisplaySize.x >= 0.0f && g.IO.DisplaySize.y >= 0.0f  && "Invalid DisplaySize value!");
-    IM_ASSERT(g.IO.Fonts->Fonts.Size > 0                                && "Font Atlas not built. Did you call io.Fonts->GetTexDataAsRGBA32() / GetTexDataAsAlpha8()?");
-    IM_ASSERT(g.IO.Fonts->Fonts[0]->IsLoaded()                          && "Font Atlas not built. Did you call io.Fonts->GetTexDataAsRGBA32() / GetTexDataAsAlpha8()?");
-    IM_ASSERT(g.Style.CurveTessellationTol > 0.0f                       && "Invalid style setting!");
-    IM_ASSERT(g.Style.CircleSegmentMaxError > 0.0f                      && "Invalid style setting!");
-    IM_ASSERT(g.Style.Alpha >= 0.0f && g.Style.Alpha <= 1.0f            && "Invalid style setting!");           
-    IM_ASSERT(g.Style.WindowMinSize.x >= 1.0f && g.Style.WindowMinSize.y >= 1.0f && "Invalid style setting.");
-    IM_ASSERT(g.Style.WindowMenuButtonPosition == ImGuiDir_None || g.Style.WindowMenuButtonPosition == ImGuiDir_Left || g.Style.WindowMenuButtonPosition == ImGuiDir_Right);
-    for (int n = 0; n < ImGuiKey_COUNT; n++)
-        IM_ASSERT(g.IO.KeyMap[n] >= -1 && g.IO.KeyMap[n] < IM_ARRAYSIZE(g.IO.KeysDown) && "io.KeyMap[] contains an out of bound value (need to be 0..512, or -1 for unmapped key)");
-
-    if (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard)
-        IM_ASSERT(g.IO.KeyMap[ImGuiKey_Space] != -1 && "ImGuiKey_Space is not mapped, required for keyboard navigation.");
-
-    if (g.IO.ConfigWindowsResizeFromEdges && !(g.IO.BackendFlags & ImGuiBackendFlags_HasMouseCursors))
-        g.IO.ConfigWindowsResizeFromEdges = false;
-}
-
-static void ImGui::ErrorCheckEndFrameSanityChecks()
-{
-    ImGuiContext& g = *GImGui;
-
-    const ImGuiKeyModFlags key_mod_flags = GetMergedKeyModFlags();
-    IM_ASSERT((key_mod_flags == 0 || g.IO.KeyMods == key_mod_flags) && "Mismatching io.KeyCtrl/io.KeyShift/io.KeyAlt/io.KeySuper vs io.KeyMods");
-    IM_UNUSED(key_mod_flags);
-
-    if (g.CurrentWindowStack.Size != 1)
-    {
-        if (g.CurrentWindowStack.Size > 1)
-        {
-            IM_ASSERT_USER_ERROR(g.CurrentWindowStack.Size == 1, "Mismatched Begin/BeginChild vs End/EndChild calls: did you forget to call End/EndChild?");
-            while (g.CurrentWindowStack.Size > 1)
-                End();
-        }
-        else
-        {
-            IM_ASSERT_USER_ERROR(g.CurrentWindowStack.Size == 1, "Mismatched Begin/BeginChild vs End/EndChild calls: did you call End/EndChild too much?");
-        }
-    }
-
-    IM_ASSERT_USER_ERROR(g.GroupStack.Size == 0, "Missing EndGroup call!");
-}
-
-void    ImGui::ErrorCheckEndFrameRecover(ImGuiErrorLogCallback log_callback, void* user_data)
-{
-    ImGuiContext& g = *GImGui;
-    while (g.CurrentWindowStack.Size > 0)
-    {
-#ifdef IMGUI_HAS_TABLE
-        while (g.CurrentTable && (g.CurrentTable->OuterWindow == g.CurrentWindow || g.CurrentTable->InnerWindow == g.CurrentWindow))
-        {
-            if (log_callback) log_callback(user_data, "Recovered from missing EndTable() in '%s'", g.CurrentTable->OuterWindow->Name);
-            EndTable();
-        }
-#endif
-        ImGuiWindow* window = g.CurrentWindow;
-        IM_ASSERT(window != NULL);
-        while (g.CurrentTabBar != NULL) 
-        {
-            if (log_callback) log_callback(user_data, "Recovered from missing EndTabBar() in '%s'", window->Name);
-            EndTabBar();
-        }
-        while (window->DC.TreeDepth > 0)
-        {
-            if (log_callback) log_callback(user_data, "Recovered from missing TreePop() in '%s'", window->Name);
-            TreePop();
-        }
-        while (g.GroupStack.Size > window->DC.StackSizesOnBegin.SizeOfGroupStack)
-        {
-            if (log_callback) log_callback(user_data, "Recovered from missing EndGroup() in '%s'", window->Name);
-            EndGroup();
-        }
-        while (window->IDStack.Size > 1)
-        {
-            if (log_callback) log_callback(user_data, "Recovered from missing PopID() in '%s'", window->Name);
-            PopID();
-        }
-        while (g.ColorStack.Size > window->DC.StackSizesOnBegin.SizeOfColorStack)
-        {
-            if (log_callback) log_callback(user_data, "Recovered from missing PopStyleColor() in '%s' for ImGuiCol_%s", window->Name, GetStyleColorName(g.ColorStack.back().Col));
-            PopStyleColor();
-        }
-        while (g.StyleVarStack.Size > window->DC.StackSizesOnBegin.SizeOfStyleVarStack)
-        {
-            if (log_callback) log_callback(user_data, "Recovered from missing PopStyleVar() in '%s'", window->Name);
-            PopStyleVar();
-        }
-        while (g.FocusScopeStack.Size > window->DC.StackSizesOnBegin.SizeOfFocusScopeStack)
-        {
-            if (log_callback) log_callback(user_data, "Recovered from missing PopFocusScope() in '%s'", window->Name);
-            PopFocusScope();
-        }
-        if (g.CurrentWindowStack.Size == 1)
-        {
-            IM_ASSERT(g.CurrentWindow->IsFallbackWindow);
-            break;
-        }
-        IM_ASSERT(window == g.CurrentWindow);
-        if (window->Flags & ImGuiWindowFlags_ChildWindow)
-        {
-            if (log_callback) log_callback(user_data, "Recovered from missing EndChild() for '%s'", window->Name);
-            EndChild();
-        }
-        else
-        {
-            if (log_callback) log_callback(user_data, "Recovered from missing End() for '%s'", window->Name);
-            End();
-        }
-    }
-}
-
-void ImGuiStackSizes::SetToCurrentState()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    SizeOfIDStack = (short)window->IDStack.Size;
-    SizeOfColorStack = (short)g.ColorStack.Size;
-    SizeOfStyleVarStack = (short)g.StyleVarStack.Size;
-    SizeOfFontStack = (short)g.FontStack.Size;
-    SizeOfFocusScopeStack = (short)g.FocusScopeStack.Size;
-    SizeOfGroupStack = (short)g.GroupStack.Size;
-    SizeOfBeginPopupStack = (short)g.BeginPopupStack.Size;
-}
-
-void ImGuiStackSizes::CompareWithCurrentState()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    IM_UNUSED(window);
-
-    IM_ASSERT(SizeOfIDStack         == window->IDStack.Size     && "PushID/PopID or TreeNode/TreePop Mismatch!");
-
-    IM_ASSERT(SizeOfGroupStack      == g.GroupStack.Size        && "BeginGroup/EndGroup Mismatch!");
-    IM_ASSERT(SizeOfBeginPopupStack == g.BeginPopupStack.Size   && "BeginPopup/EndPopup or BeginMenu/EndMenu Mismatch!");
-    IM_ASSERT(SizeOfColorStack      >= g.ColorStack.Size        && "PushStyleColor/PopStyleColor Mismatch!");
-    IM_ASSERT(SizeOfStyleVarStack   >= g.StyleVarStack.Size     && "PushStyleVar/PopStyleVar Mismatch!");
-    IM_ASSERT(SizeOfFontStack       >= g.FontStack.Size         && "PushFont/PopFont Mismatch!");
-    IM_ASSERT(SizeOfFocusScopeStack == g.FocusScopeStack.Size   && "PushFocusScope/PopFocusScope Mismatch!");
-}
-
-
-void ImGui::ItemSize(const ImVec2& size, float text_baseline_y)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return;
-
-    const float offset_to_match_baseline_y = (text_baseline_y >= 0) ? ImMax(0.0f, window->DC.CurrLineTextBaseOffset - text_baseline_y) : 0.0f;
-    const float line_height = ImMax(window->DC.CurrLineSize.y, size.y + offset_to_match_baseline_y);
-
-    window->DC.CursorPosPrevLine.x = window->DC.CursorPos.x + size.x;
-    window->DC.CursorPosPrevLine.y = window->DC.CursorPos.y;
-    window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);      
-    window->DC.CursorPos.y = IM_FLOOR(window->DC.CursorPos.y + line_height + g.Style.ItemSpacing.y);          
-    window->DC.CursorMaxPos.x = ImMax(window->DC.CursorMaxPos.x, window->DC.CursorPosPrevLine.x);
-    window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, window->DC.CursorPos.y - g.Style.ItemSpacing.y);
-    window->DC.PrevLineSize.y = line_height;
-    window->DC.CurrLineSize.y = 0.0f;
-    window->DC.PrevLineTextBaseOffset = ImMax(window->DC.CurrLineTextBaseOffset, text_baseline_y);
-    window->DC.CurrLineTextBaseOffset = 0.0f;
-
-    if (window->DC.LayoutType == ImGuiLayoutType_Horizontal)
-        SameLine();
-}
-
-void ImGui::ItemSize(const ImRect& bb, float text_baseline_y)
-{
-    ItemSize(bb.GetSize(), text_baseline_y);
-}
-
-bool ImGui::ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb_arg)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    if (id != 0)
-    {
-        window->DC.NavLayerActiveMaskNext |= (1 << window->DC.NavLayerCurrent);
-        if (g.NavId == id || g.NavAnyRequest)
-            if (g.NavWindow->RootWindowForNav == window->RootWindowForNav)
-                if (window == g.NavWindow || ((window->Flags | g.NavWindow->Flags) & ImGuiWindowFlags_NavFlattened))
-                    NavProcessItem(window, nav_bb_arg ? *nav_bb_arg : bb, id);
-
-#ifdef IMGUI_DEBUG_TOOL_ITEM_PICKER_EX
-        if (id == g.DebugItemPickerBreakId)
-        {
-            IM_DEBUG_BREAK();
-            g.DebugItemPickerBreakId = 0;
-        }
-#endif
-    }
-
-    window->DC.LastItemId = id;
-    window->DC.LastItemRect = bb;
-    window->DC.LastItemStatusFlags = ImGuiItemStatusFlags_None;
-    g.NextItemData.Flags = ImGuiNextItemDataFlags_None;
-
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    if (id != 0)
-        IMGUI_TEST_ENGINE_ITEM_ADD(nav_bb_arg ? *nav_bb_arg : bb, id);
-#endif
-
-    const bool is_clipped = IsClippedEx(bb, id, false);
-    if (is_clipped)
-        return false;
-    if (IsMouseHoveringRect(bb.Min, bb.Max))
-        window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_HoveredRect;
-    return true;
-}
-
-void ImGui::SameLine(float offset_from_start_x, float spacing_w)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    if (offset_from_start_x != 0.0f)
-    {
-        if (spacing_w < 0.0f) spacing_w = 0.0f;
-        window->DC.CursorPos.x = window->Pos.x - window->Scroll.x + offset_from_start_x + spacing_w + window->DC.GroupOffset.x + window->DC.ColumnsOffset.x;
-        window->DC.CursorPos.y = window->DC.CursorPosPrevLine.y;
-    }
-    else
-    {
-        if (spacing_w < 0.0f) spacing_w = g.Style.ItemSpacing.x;
-        window->DC.CursorPos.x = window->DC.CursorPosPrevLine.x + spacing_w;
-        window->DC.CursorPos.y = window->DC.CursorPosPrevLine.y;
-    }
-    window->DC.CurrLineSize = window->DC.PrevLineSize;
-    window->DC.CurrLineTextBaseOffset = window->DC.PrevLineTextBaseOffset;
-}
-
-ImVec2 ImGui::GetCursorScreenPos()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.CursorPos;
-}
-
-void ImGui::SetCursorScreenPos(const ImVec2& pos)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DC.CursorPos = pos;
-    window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, window->DC.CursorPos);
-}
-
-ImVec2 ImGui::GetCursorPos()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.CursorPos - window->Pos + window->Scroll;
-}
-
-float ImGui::GetCursorPosX()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.CursorPos.x - window->Pos.x + window->Scroll.x;
-}
-
-float ImGui::GetCursorPosY()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.CursorPos.y - window->Pos.y + window->Scroll.y;
-}
-
-void ImGui::SetCursorPos(const ImVec2& local_pos)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DC.CursorPos = window->Pos - window->Scroll + local_pos;
-    window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, window->DC.CursorPos);
-}
-
-void ImGui::SetCursorPosX(float x)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DC.CursorPos.x = window->Pos.x - window->Scroll.x + x;
-    window->DC.CursorMaxPos.x = ImMax(window->DC.CursorMaxPos.x, window->DC.CursorPos.x);
-}
-
-void ImGui::SetCursorPosY(float y)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DC.CursorPos.y = window->Pos.y - window->Scroll.y + y;
-    window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, window->DC.CursorPos.y);
-}
-
-ImVec2 ImGui::GetCursorStartPos()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.CursorStartPos - window->Pos;
-}
-
-void ImGui::Indent(float indent_w)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DC.Indent.x += (indent_w != 0.0f) ? indent_w : g.Style.IndentSpacing;
-    window->DC.CursorPos.x = window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x;
-}
-
-void ImGui::Unindent(float indent_w)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DC.Indent.x -= (indent_w != 0.0f) ? indent_w : g.Style.IndentSpacing;
-    window->DC.CursorPos.x = window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x;
-}
-
-void ImGui::SetNextItemWidth(float item_width)
-{
-    ImGuiContext& g = *GImGui;
-    g.NextItemData.Flags |= ImGuiNextItemDataFlags_HasWidth;
-    g.NextItemData.Width = item_width;
-}
-
-void ImGui::PushItemWidth(float item_width)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    window->DC.ItemWidthStack.push_back(window->DC.ItemWidth);    
-    window->DC.ItemWidth = (item_width == 0.0f ? window->ItemWidthDefault : item_width);
-    g.NextItemData.Flags &= ~ImGuiNextItemDataFlags_HasWidth;
-}
-
-void ImGui::PushMultiItemsWidths(int components, float w_full)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    const ImGuiStyle& style = g.Style;
-    const float w_item_one  = ImMax(1.0f, IM_FLOOR((w_full - (style.ItemInnerSpacing.x) * (components - 1)) / (float)components));
-    const float w_item_last = ImMax(1.0f, IM_FLOOR(w_full - (w_item_one + style.ItemInnerSpacing.x) * (components - 1)));
-    window->DC.ItemWidthStack.push_back(window->DC.ItemWidth);    
-    window->DC.ItemWidthStack.push_back(w_item_last);
-    for (int i = 0; i < components - 2; i++)
-        window->DC.ItemWidthStack.push_back(w_item_one);
-    window->DC.ItemWidth = (components == 1) ? w_item_last : w_item_one;
-    g.NextItemData.Flags &= ~ImGuiNextItemDataFlags_HasWidth;
-}
-
-void ImGui::PopItemWidth()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->DC.ItemWidth = window->DC.ItemWidthStack.back();
-    window->DC.ItemWidthStack.pop_back();
-}
-
-float ImGui::CalcItemWidth()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    float w;
-    if (g.NextItemData.Flags & ImGuiNextItemDataFlags_HasWidth)
-        w = g.NextItemData.Width;
-    else
-        w = window->DC.ItemWidth;
-    if (w < 0.0f)
-    {
-        float region_max_x = GetContentRegionMaxAbs().x;
-        w = ImMax(1.0f, region_max_x - window->DC.CursorPos.x + w);
-    }
-    w = IM_FLOOR(w);
-    return w;
-}
-
-ImVec2 ImGui::CalcItemSize(ImVec2 size, float default_w, float default_h)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-
-    ImVec2 region_max;
-    if (size.x < 0.0f || size.y < 0.0f)
-        region_max = GetContentRegionMaxAbs();
-
-    if (size.x == 0.0f)
-        size.x = default_w;
-    else if (size.x < 0.0f)
-        size.x = ImMax(4.0f, region_max.x - window->DC.CursorPos.x + size.x);
-
-    if (size.y == 0.0f)
-        size.y = default_h;
-    else if (size.y < 0.0f)
-        size.y = ImMax(4.0f, region_max.y - window->DC.CursorPos.y + size.y);
-
-    return size;
-}
-
-float ImGui::GetTextLineHeight()
-{
-    ImGuiContext& g = *GImGui;
-    return g.FontSize;
-}
-
-float ImGui::GetTextLineHeightWithSpacing()
-{
-    ImGuiContext& g = *GImGui;
-    return g.FontSize + g.Style.ItemSpacing.y;
-}
-
-float ImGui::GetFrameHeight()
-{
-    ImGuiContext& g = *GImGui;
-    return g.FontSize + g.Style.FramePadding.y * 2.0f;
-}
-
-float ImGui::GetFrameHeightWithSpacing()
-{
-    ImGuiContext& g = *GImGui;
-    return g.FontSize + g.Style.FramePadding.y * 2.0f + g.Style.ItemSpacing.y;
-}
-
-ImVec2 ImGui::GetContentRegionMax()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImVec2 mx = window->ContentRegionRect.Max - window->Pos;
-    if (window->DC.CurrentColumns || g.CurrentTable)
-        mx.x = window->WorkRect.Max.x - window->Pos.x;
-    return mx;
-}
-
-ImVec2 ImGui::GetContentRegionMaxAbs()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImVec2 mx = window->ContentRegionRect.Max;
-    if (window->DC.CurrentColumns || g.CurrentTable)
-        mx.x = window->WorkRect.Max.x;
-    return mx;
-}
-
-ImVec2 ImGui::GetContentRegionAvail()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return GetContentRegionMaxAbs() - window->DC.CursorPos;
-}
-
-ImVec2 ImGui::GetWindowContentRegionMin()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ContentRegionRect.Min - window->Pos;
-}
-
-ImVec2 ImGui::GetWindowContentRegionMax()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ContentRegionRect.Max - window->Pos;
-}
-
-float ImGui::GetWindowContentRegionWidth()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ContentRegionRect.GetWidth();
-}
-
-void ImGui::BeginGroup()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    g.GroupStack.resize(g.GroupStack.Size + 1);
-    ImGuiGroupData& group_data = g.GroupStack.back();
-    group_data.WindowID = window->ID;
-    group_data.BackupCursorPos = window->DC.CursorPos;
-    group_data.BackupCursorMaxPos = window->DC.CursorMaxPos;
-    group_data.BackupIndent = window->DC.Indent;
-    group_data.BackupGroupOffset = window->DC.GroupOffset;
-    group_data.BackupCurrLineSize = window->DC.CurrLineSize;
-    group_data.BackupCurrLineTextBaseOffset = window->DC.CurrLineTextBaseOffset;
-    group_data.BackupActiveIdIsAlive = g.ActiveIdIsAlive;
-    group_data.BackupActiveIdPreviousFrameIsAlive = g.ActiveIdPreviousFrameIsAlive;
-    group_data.EmitItem = true;
-     
-    window->DC.GroupOffset.x = window->DC.CursorPos.x - window->Pos.x - window->DC.ColumnsOffset.x;
-    window->DC.Indent = window->DC.GroupOffset;
-    window->DC.CursorMaxPos = window->DC.CursorPos;
-    window->DC.CurrLineSize = ImVec2(0.0f, 0.0f);
-    if (g.LogEnabled)
-        g.LogLinePosY = -FLT_MAX;      
-}
-
-void ImGui::EndGroup()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    IM_ASSERT(g.GroupStack.Size > 0);    
-
-    ImGuiGroupData& group_data = g.GroupStack.back();
-    IM_ASSERT(group_data.WindowID == window->ID);     
-
-    ImRect group_bb(group_data.BackupCursorPos, ImMax(window->DC.CursorMaxPos, group_data.BackupCursorPos));
-
-    window->DC.CursorPos = group_data.BackupCursorPos;
-    window->DC.CursorMaxPos = ImMax(group_data.BackupCursorMaxPos, window->DC.CursorMaxPos);
-    window->DC.Indent = group_data.BackupIndent;
-    window->DC.GroupOffset = group_data.BackupGroupOffset;
-    window->DC.CurrLineSize = group_data.BackupCurrLineSize;
-    window->DC.CurrLineTextBaseOffset = group_data.BackupCurrLineTextBaseOffset;
-    if (g.LogEnabled)
-        g.LogLinePosY = -FLT_MAX;      
-
-    if (!group_data.EmitItem)
-    {
-        g.GroupStack.pop_back();
-        return;
-    }
-
-    window->DC.CurrLineTextBaseOffset = ImMax(window->DC.PrevLineTextBaseOffset, group_data.BackupCurrLineTextBaseOffset);                            
-    ItemSize(group_bb.GetSize());
-    ItemAdd(group_bb, 0);
-
-    const bool group_contains_curr_active_id = (group_data.BackupActiveIdIsAlive != g.ActiveId) && (g.ActiveIdIsAlive == g.ActiveId) && g.ActiveId;
-    const bool group_contains_prev_active_id = (group_data.BackupActiveIdPreviousFrameIsAlive == false) && (g.ActiveIdPreviousFrameIsAlive == true);
-    if (group_contains_curr_active_id)
-        window->DC.LastItemId = g.ActiveId;
-    else if (group_contains_prev_active_id)
-        window->DC.LastItemId = g.ActiveIdPreviousFrame;
-    window->DC.LastItemRect = group_bb;
-
-    if (group_contains_curr_active_id && g.ActiveIdHasBeenEditedThisFrame)
-        window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_Edited;
-
-    window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_HasDeactivated;
-    if (group_contains_prev_active_id && g.ActiveId != g.ActiveIdPreviousFrame)
-        window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_Deactivated;
-
-    g.GroupStack.pop_back();
-}
-
-
-static float CalcScrollEdgeSnap(float target, float snap_min, float snap_max, float snap_threshold, float center_ratio)
-{
-    if (target <= snap_min + snap_threshold)
-        return ImLerp(snap_min, target, center_ratio);
-    if (target >= snap_max - snap_threshold)
-        return ImLerp(target, snap_max, center_ratio);
-    return target;
-}
-
-static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window)
-{
-    ImVec2 scroll = window->Scroll;
-    if (window->ScrollTarget.x < FLT_MAX)
-    {
-        float center_x_ratio = window->ScrollTargetCenterRatio.x;
-        float scroll_target_x = window->ScrollTarget.x;
-        float snap_x_min = 0.0f;
-        float snap_x_max = window->ScrollMax.x + window->Size.x;
-        if (window->ScrollTargetEdgeSnapDist.x > 0.0f)
-            scroll_target_x = CalcScrollEdgeSnap(scroll_target_x, snap_x_min, snap_x_max, window->ScrollTargetEdgeSnapDist.x, center_x_ratio);
-        scroll.x = scroll_target_x - center_x_ratio * (window->SizeFull.x - window->ScrollbarSizes.x);
-    }
-    if (window->ScrollTarget.y < FLT_MAX)
-    {
-        float decoration_up_height = window->TitleBarHeight() + window->MenuBarHeight();
-        float center_y_ratio = window->ScrollTargetCenterRatio.y;
-        float scroll_target_y = window->ScrollTarget.y;
-        float snap_y_min = 0.0f;
-        float snap_y_max = window->ScrollMax.y + window->Size.y - decoration_up_height;
-        if (window->ScrollTargetEdgeSnapDist.y > 0.0f)
-            scroll_target_y = CalcScrollEdgeSnap(scroll_target_y, snap_y_min, snap_y_max, window->ScrollTargetEdgeSnapDist.y, center_y_ratio);
-        scroll.y = scroll_target_y - center_y_ratio * (window->SizeFull.y - window->ScrollbarSizes.y - decoration_up_height);
-    }
-    scroll.x = IM_FLOOR(ImMax(scroll.x, 0.0f));
-    scroll.y = IM_FLOOR(ImMax(scroll.y, 0.0f));
-    if (!window->Collapsed && !window->SkipItems)
-    {
-        scroll.x = ImMin(scroll.x, window->ScrollMax.x);
-        scroll.y = ImMin(scroll.y, window->ScrollMax.y);
-    }
-    return scroll;
-}
-
-ImVec2 ImGui::ScrollToBringRectIntoView(ImGuiWindow* window, const ImRect& item_rect)
-{
-    ImGuiContext& g = *GImGui;
-    ImRect window_rect(window->InnerRect.Min - ImVec2(1, 1), window->InnerRect.Max + ImVec2(1, 1));
-    ImVec2 delta_scroll;
-    if (!window_rect.Contains(item_rect))
-    {
-        if (window->ScrollbarX && item_rect.Min.x < window_rect.Min.x)
-            SetScrollFromPosX(window, item_rect.Min.x - window->Pos.x - g.Style.ItemSpacing.x, 0.0f);
-        else if (window->ScrollbarX && item_rect.Max.x >= window_rect.Max.x)
-            SetScrollFromPosX(window, item_rect.Max.x - window->Pos.x + g.Style.ItemSpacing.x, 1.0f);
-        if (item_rect.Min.y < window_rect.Min.y)
-            SetScrollFromPosY(window, item_rect.Min.y - window->Pos.y - g.Style.ItemSpacing.y, 0.0f);
-        else if (item_rect.Max.y >= window_rect.Max.y)
-            SetScrollFromPosY(window, item_rect.Max.y - window->Pos.y + g.Style.ItemSpacing.y, 1.0f);
-
-        ImVec2 next_scroll = CalcNextScrollFromScrollTargetAndClamp(window);
-        delta_scroll = next_scroll - window->Scroll;
-    }
-
-    if (window->Flags & ImGuiWindowFlags_ChildWindow)
-        delta_scroll += ScrollToBringRectIntoView(window->ParentWindow, ImRect(item_rect.Min - delta_scroll, item_rect.Max - delta_scroll));
-
-    return delta_scroll;
-}
-
-float ImGui::GetScrollX()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->Scroll.x;
-}
-
-float ImGui::GetScrollY()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->Scroll.y;
-}
-
-float ImGui::GetScrollMaxX()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ScrollMax.x;
-}
-
-float ImGui::GetScrollMaxY()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ScrollMax.y;
-}
-
-void ImGui::SetScrollX(ImGuiWindow* window, float scroll_x)
-{
-    window->ScrollTarget.x = scroll_x;
-    window->ScrollTargetCenterRatio.x = 0.0f;
-    window->ScrollTargetEdgeSnapDist.x = 0.0f;
-}
-
-void ImGui::SetScrollY(ImGuiWindow* window, float scroll_y)
-{
-    window->ScrollTarget.y = scroll_y;
-    window->ScrollTargetCenterRatio.y = 0.0f;
-    window->ScrollTargetEdgeSnapDist.y = 0.0f;
-}
-
-void ImGui::SetScrollX(float scroll_x)
-{
-    ImGuiContext& g = *GImGui;
-    SetScrollX(g.CurrentWindow, scroll_x);
-}
-
-void ImGui::SetScrollY(float scroll_y)
-{
-    ImGuiContext& g = *GImGui;
-    SetScrollY(g.CurrentWindow, scroll_y);
-}
-
-void ImGui::SetScrollFromPosX(ImGuiWindow* window, float local_x, float center_x_ratio)
-{
-    IM_ASSERT(center_x_ratio >= 0.0f && center_x_ratio <= 1.0f);
-    window->ScrollTarget.x = IM_FLOOR(local_x + window->Scroll.x);       
-    window->ScrollTargetCenterRatio.x = center_x_ratio;
-    window->ScrollTargetEdgeSnapDist.x = 0.0f;
-}
-
-void ImGui::SetScrollFromPosY(ImGuiWindow* window, float local_y, float center_y_ratio)
-{
-    IM_ASSERT(center_y_ratio >= 0.0f && center_y_ratio <= 1.0f);
-    local_y -= window->TitleBarHeight() + window->MenuBarHeight();               
-    window->ScrollTarget.y = IM_FLOOR(local_y + window->Scroll.y);       
-    window->ScrollTargetCenterRatio.y = center_y_ratio;
-    window->ScrollTargetEdgeSnapDist.y = 0.0f;
-}
-
-void ImGui::SetScrollFromPosX(float local_x, float center_x_ratio)
-{
-    ImGuiContext& g = *GImGui;
-    SetScrollFromPosX(g.CurrentWindow, local_x, center_x_ratio);
-}
-
-void ImGui::SetScrollFromPosY(float local_y, float center_y_ratio)
-{
-    ImGuiContext& g = *GImGui;
-    SetScrollFromPosY(g.CurrentWindow, local_y, center_y_ratio);
-}
-
-void ImGui::SetScrollHereX(float center_x_ratio)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    float spacing_x = g.Style.ItemSpacing.x;
-    float target_pos_x = ImLerp(window->DC.LastItemRect.Min.x - spacing_x, window->DC.LastItemRect.Max.x + spacing_x, center_x_ratio);
-    SetScrollFromPosX(window, target_pos_x - window->Pos.x, center_x_ratio);       
-
-    window->ScrollTargetEdgeSnapDist.x = ImMax(0.0f, window->WindowPadding.x - spacing_x);
-}
-
-void ImGui::SetScrollHereY(float center_y_ratio)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    float spacing_y = g.Style.ItemSpacing.y;
-    float target_pos_y = ImLerp(window->DC.CursorPosPrevLine.y - spacing_y, window->DC.CursorPosPrevLine.y + window->DC.PrevLineSize.y + spacing_y, center_y_ratio);
-    SetScrollFromPosY(window, target_pos_y - window->Pos.y, center_y_ratio);       
-
-    window->ScrollTargetEdgeSnapDist.y = ImMax(0.0f, window->WindowPadding.y - spacing_y);
-}
-
-void ImGui::BeginTooltip()
-{
-    BeginTooltipEx(ImGuiWindowFlags_None, ImGuiTooltipFlags_None);
-}
-
-void ImGui::BeginTooltipEx(ImGuiWindowFlags extra_flags, ImGuiTooltipFlags tooltip_flags)
-{
-    ImGuiContext& g = *GImGui;
-
-    if (g.DragDropWithinSource || g.DragDropWithinTarget)
-    {
-        ImVec2 tooltip_pos = g.IO.MousePos + ImVec2(16 * g.Style.MouseCursorScale, 8 * g.Style.MouseCursorScale);
-        SetNextWindowPos(tooltip_pos);
-        SetNextWindowBgAlpha(g.Style.Colors[ImGuiCol_PopupBg].w * 0.60f);
-        tooltip_flags |= ImGuiTooltipFlags_OverridePreviousTooltip;
-    }
-
-    char window_name[16];
-    ImFormatString(window_name, IM_ARRAYSIZE(window_name), "##Tooltip_%02d", g.TooltipOverrideCount);
-    if (tooltip_flags & ImGuiTooltipFlags_OverridePreviousTooltip)
-        if (ImGuiWindow* window = FindWindowByName(window_name))
-            if (window->Active)
-            {
-                window->Hidden = true;
-                window->HiddenFramesCanSkipItems = 1;       
-                ImFormatString(window_name, IM_ARRAYSIZE(window_name), "##Tooltip_%02d", ++g.TooltipOverrideCount);
-            }
-    ImGuiWindowFlags flags = ImGuiWindowFlags_Tooltip | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_AlwaysAutoResize;
-    Begin(window_name, NULL, flags | extra_flags);
-}
-
-void ImGui::EndTooltip()
-{
-    IM_ASSERT(GetCurrentWindowRead()->Flags & ImGuiWindowFlags_Tooltip);      
-    End();
-}
-
-void ImGui::SetTooltipV(const char* fmt, va_list args)
-{
-    BeginTooltipEx(0, ImGuiTooltipFlags_OverridePreviousTooltip);
-    TextV(fmt, args);
-    EndTooltip();
-}
-
-void ImGui::SetTooltip(const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    SetTooltipV(fmt, args);
-    va_end(args);
-}
-
-bool ImGui::IsPopupOpen(ImGuiID id, ImGuiPopupFlags popup_flags)
-{
-    ImGuiContext& g = *GImGui;
-    if (popup_flags & ImGuiPopupFlags_AnyPopupId)
-    {
-        IM_ASSERT(id == 0);
-        if (popup_flags & ImGuiPopupFlags_AnyPopupLevel)
-            return g.OpenPopupStack.Size > 0;
-        else
-            return g.OpenPopupStack.Size > g.BeginPopupStack.Size;
-    }
-    else
-    {
-        if (popup_flags & ImGuiPopupFlags_AnyPopupLevel)
-        {
-            for (int n = 0; n < g.OpenPopupStack.Size; n++)
-                if (g.OpenPopupStack[n].PopupId == id)
-                    return true;
-            return false;
-        }
-        else
-        {
-            return g.OpenPopupStack.Size > g.BeginPopupStack.Size && g.OpenPopupStack[g.BeginPopupStack.Size].PopupId == id;
-        }
-    }
-}
-
-bool ImGui::IsPopupOpen(const char* str_id, ImGuiPopupFlags popup_flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiID id = (popup_flags & ImGuiPopupFlags_AnyPopupId) ? 0 : g.CurrentWindow->GetID(str_id);
-    if ((popup_flags & ImGuiPopupFlags_AnyPopupLevel) && id != 0)
-        IM_ASSERT(0 && "Cannot use IsPopupOpen() with a string id and ImGuiPopupFlags_AnyPopupLevel.");         
-    return IsPopupOpen(id, popup_flags);
-}
-
-ImGuiWindow* ImGui::GetTopMostPopupModal()
-{
-    ImGuiContext& g = *GImGui;
-    for (int n = g.OpenPopupStack.Size - 1; n >= 0; n--)
-        if (ImGuiWindow* popup = g.OpenPopupStack.Data[n].Window)
-            if (popup->Flags & ImGuiWindowFlags_Modal)
-                return popup;
-    return NULL;
-}
-
-void ImGui::OpenPopup(const char* str_id, ImGuiPopupFlags popup_flags)
-{
-    ImGuiContext& g = *GImGui;
-    OpenPopupEx(g.CurrentWindow->GetID(str_id), popup_flags);
-}
-
-void ImGui::OpenPopupEx(ImGuiID id, ImGuiPopupFlags popup_flags)
-{
-
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* parent_window = g.CurrentWindow;
-    const int current_stack_size = g.BeginPopupStack.Size;
-
-    if (popup_flags & ImGuiPopupFlags_NoOpenOverExistingPopup)
-        if (IsPopupOpen(0u, ImGuiPopupFlags_AnyPopupId))
-            return;
-
-    ImGuiPopupData popup_ref;                   
-    popup_ref.PopupId = id;
-    popup_ref.Window = NULL;
-    popup_ref.SourceWindow = g.NavWindow;
-    popup_ref.OpenFrameCount = g.FrameCount;
-    popup_ref.OpenParentId = parent_window->IDStack.back();
-    popup_ref.OpenPopupPos = NavCalcPreferredRefPos();
-    popup_ref.OpenMousePos = IsMousePosValid(&g.IO.MousePos) ? g.IO.MousePos : popup_ref.OpenPopupPos;
-
-    IMGUI_DEBUG_LOG_POPUP("OpenPopupEx(0x%08X)\n", id);
-    if (g.OpenPopupStack.Size < current_stack_size + 1)
-    {
-        g.OpenPopupStack.push_back(popup_ref);
-    }
-    else
-    {
-        if (g.OpenPopupStack[current_stack_size].PopupId == id && g.OpenPopupStack[current_stack_size].OpenFrameCount == g.FrameCount - 1)
-        {
-            g.OpenPopupStack[current_stack_size].OpenFrameCount = popup_ref.OpenFrameCount;
-        }
-        else
-        {
-            ClosePopupToLevel(current_stack_size, false);
-            g.OpenPopupStack.push_back(popup_ref);
-        }
-
-    }
-}
-
-void ImGui::ClosePopupsOverWindow(ImGuiWindow* ref_window, bool restore_focus_to_window_under_popup)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.OpenPopupStack.Size == 0)
-        return;
-
-    int popup_count_to_keep = 0;
-    if (ref_window)
-    {
-        for (; popup_count_to_keep < g.OpenPopupStack.Size; popup_count_to_keep++)
-        {
-            ImGuiPopupData& popup = g.OpenPopupStack[popup_count_to_keep];
-            if (!popup.Window)
-                continue;
-            IM_ASSERT((popup.Window->Flags & ImGuiWindowFlags_Popup) != 0);
-            if (popup.Window->Flags & ImGuiWindowFlags_ChildWindow)
-                continue;
-
-            bool ref_window_is_descendent_of_popup = false;
-            for (int n = popup_count_to_keep; n < g.OpenPopupStack.Size; n++)
-                if (ImGuiWindow* popup_window = g.OpenPopupStack[n].Window)
-                    if (popup_window->RootWindow == ref_window->RootWindow)
-                    {
-                        ref_window_is_descendent_of_popup = true;
-                        break;
-                    }
-            if (!ref_window_is_descendent_of_popup)
-                break;
-        }
-    }
-    if (popup_count_to_keep < g.OpenPopupStack.Size)                  
-    {
-        IMGUI_DEBUG_LOG_POPUP("ClosePopupsOverWindow(\"%s\") -> ClosePopupToLevel(%d)\n", ref_window->Name, popup_count_to_keep);
-        ClosePopupToLevel(popup_count_to_keep, restore_focus_to_window_under_popup);
-    }
-}
-
-void ImGui::ClosePopupToLevel(int remaining, bool restore_focus_to_window_under_popup)
-{
-    ImGuiContext& g = *GImGui;
-    IMGUI_DEBUG_LOG_POPUP("ClosePopupToLevel(%d), restore_focus_to_window_under_popup=%d\n", remaining, restore_focus_to_window_under_popup);
-    IM_ASSERT(remaining >= 0 && remaining < g.OpenPopupStack.Size);
-
-    ImGuiWindow* focus_window = g.OpenPopupStack[remaining].SourceWindow;
-    ImGuiWindow* popup_window = g.OpenPopupStack[remaining].Window;
-    g.OpenPopupStack.resize(remaining);
-
-    if (restore_focus_to_window_under_popup)
-    {
-        if (focus_window && !focus_window->WasActive && popup_window)
-        {
-            FocusTopMostWindowUnderOne(popup_window, NULL);
-        }
-        else
-        {
-            if (g.NavLayer == ImGuiNavLayer_Main && focus_window)
-                focus_window = NavRestoreLastChildNavWindow(focus_window);
-            FocusWindow(focus_window);
-        }
-    }
-}
-
-void ImGui::CloseCurrentPopup()
-{
-    ImGuiContext& g = *GImGui;
-    int popup_idx = g.BeginPopupStack.Size - 1;
-    if (popup_idx < 0 || popup_idx >= g.OpenPopupStack.Size || g.BeginPopupStack[popup_idx].PopupId != g.OpenPopupStack[popup_idx].PopupId)
-        return;
-
-    while (popup_idx > 0)
-    {
-        ImGuiWindow* popup_window = g.OpenPopupStack[popup_idx].Window;
-        ImGuiWindow* parent_popup_window = g.OpenPopupStack[popup_idx - 1].Window;
-        bool close_parent = false;
-        if (popup_window && (popup_window->Flags & ImGuiWindowFlags_ChildMenu))
-            if (parent_popup_window == NULL || !(parent_popup_window->Flags & ImGuiWindowFlags_Modal))
-                close_parent = true;
-        if (!close_parent)
-            break;
-        popup_idx--;
-    }
-    IMGUI_DEBUG_LOG_POPUP("CloseCurrentPopup %d -> %d\n", g.BeginPopupStack.Size - 1, popup_idx);
-    ClosePopupToLevel(popup_idx, true);
-
-    if (ImGuiWindow* window = g.NavWindow)
-        window->DC.NavHideHighlightOneFrame = true;
-}
-
-bool ImGui::BeginPopupEx(ImGuiID id, ImGuiWindowFlags flags)
-{
-    
-
-    ImGuiContext& g = *GImGui;
-    if (!IsPopupOpen(id, ImGuiPopupFlags_None))
-    {
-        g.NextWindowData.ClearFlags();           
-        return false;
-    }
-
-    char name[20];
-    if (flags & ImGuiWindowFlags_ChildMenu)
-        ImFormatString(name, IM_ARRAYSIZE(name), "##Menu_%02d", g.BeginPopupStack.Size);      
-    else
-        ImFormatString(name, IM_ARRAYSIZE(name), "##Popup_%08x", id);           
-
-    flags |= ImGuiWindowFlags_Popup;
-    bool is_open = Begin(name, NULL, flags);
-    if (!is_open)                
-        EndPopup();
-
-    return is_open;
-}
-
-bool ImGui::BeginPopup(const char* str_id, ImGuiWindowFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.OpenPopupStack.Size <= g.BeginPopupStack.Size)     
-    {
-        g.NextWindowData.ClearFlags();           
-        return false;
-    }
-    flags |= ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings;
-    return BeginPopupEx(g.CurrentWindow->GetID(str_id), flags);
-}
-
-bool ImGui::BeginPopupModal(const char* name, bool* p_open, ImGuiWindowFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    const ImGuiID id = window->GetID(name);
-    if (!IsPopupOpen(id, ImGuiPopupFlags_None))
-    {
-        g.NextWindowData.ClearFlags();           
-        return false;
-    }
-
-    if ((g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasPos) == 0)
-        SetNextWindowPos(g.IO.DisplaySize * 0.5f, ImGuiCond_FirstUseEver, ImVec2(0.5f, 0.5f));
-
-    flags |= ImGuiWindowFlags_Popup | ImGuiWindowFlags_Modal | ImGuiWindowFlags_NoCollapse;
-    const bool is_open = Begin(name, p_open, flags);
-    if (!is_open || (p_open && !*p_open))                
-    {
-        EndPopup();
-        if (is_open)
-            ClosePopupToLevel(g.BeginPopupStack.Size, true);
-        return false;
-    }
-    return is_open;
-}
-
-void ImGui::EndPopup()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    IM_ASSERT(window->Flags & ImGuiWindowFlags_Popup);     
-    IM_ASSERT(g.BeginPopupStack.Size > 0);
-
-    if (g.NavWindow == window)
-        NavMoveRequestTryWrapping(window, ImGuiNavMoveFlags_LoopY);
-
-    IM_ASSERT(g.WithinEndChild == false);
-    if (window->Flags & ImGuiWindowFlags_ChildWindow)
-        g.WithinEndChild = true;
-    End();
-    g.WithinEndChild = false;
-}
-
-void ImGui::OpenPopupOnItemClick(const char* str_id, ImGuiPopupFlags popup_flags)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    int mouse_button = (popup_flags & ImGuiPopupFlags_MouseButtonMask_);
-    if (IsMouseReleased(mouse_button) && IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup))
-    {
-        ImGuiID id = str_id ? window->GetID(str_id) : window->DC.LastItemId;                    
-        IM_ASSERT(id != 0);                                                                   
-        OpenPopupEx(id, popup_flags);
-    }
-}
-
-bool ImGui::BeginPopupContextItem(const char* str_id, ImGuiPopupFlags popup_flags)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    if (window->SkipItems)
-        return false;
-    ImGuiID id = str_id ? window->GetID(str_id) : window->DC.LastItemId;                    
-    IM_ASSERT(id != 0);                                                                   
-    int mouse_button = (popup_flags & ImGuiPopupFlags_MouseButtonMask_);
-    if (IsMouseReleased(mouse_button) && IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup))
-        OpenPopupEx(id, popup_flags);
-    return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings);
-}
-
-bool ImGui::BeginPopupContextWindow(const char* str_id, ImGuiPopupFlags popup_flags)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    if (!str_id)
-        str_id = "window_context";
-    ImGuiID id = window->GetID(str_id);
-    int mouse_button = (popup_flags & ImGuiPopupFlags_MouseButtonMask_);
-    if (IsMouseReleased(mouse_button) && IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup))
-        if (!(popup_flags & ImGuiPopupFlags_NoOpenOverItems) || !IsAnyItemHovered())
-            OpenPopupEx(id, popup_flags);
-    return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings);
-}
-
-bool ImGui::BeginPopupContextVoid(const char* str_id, ImGuiPopupFlags popup_flags)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    if (!str_id)
-        str_id = "void_context";
-    ImGuiID id = window->GetID(str_id);
-    int mouse_button = (popup_flags & ImGuiPopupFlags_MouseButtonMask_);
-    if (IsMouseReleased(mouse_button) && !IsWindowHovered(ImGuiHoveredFlags_AnyWindow))
-        if (GetTopMostPopupModal() == NULL)
-            OpenPopupEx(id, popup_flags);
-    return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings);
-}
-
-ImVec2 ImGui::FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& size, ImGuiDir* last_dir, const ImRect& r_outer, const ImRect& r_avoid, ImGuiPopupPositionPolicy policy)
-{
-    ImVec2 base_pos_clamped = ImClamp(ref_pos, r_outer.Min, r_outer.Max - size);
-    if (policy == ImGuiPopupPositionPolicy_ComboBox)
-    {
-        const ImGuiDir dir_prefered_order[ImGuiDir_COUNT] = { ImGuiDir_Down, ImGuiDir_Right, ImGuiDir_Left, ImGuiDir_Up };
-        for (int n = (*last_dir != ImGuiDir_None) ? -1 : 0; n < ImGuiDir_COUNT; n++)
-        {
-            const ImGuiDir dir = (n == -1) ? *last_dir : dir_prefered_order[n];
-            if (n != -1 && dir == *last_dir)     
-                continue;
-            ImVec2 pos;
-            if (dir == ImGuiDir_Down)  pos = ImVec2(r_avoid.Min.x, r_avoid.Max.y);              
-            if (dir == ImGuiDir_Right) pos = ImVec2(r_avoid.Min.x, r_avoid.Min.y - size.y);    
-            if (dir == ImGuiDir_Left)  pos = ImVec2(r_avoid.Max.x - size.x, r_avoid.Max.y);    
-            if (dir == ImGuiDir_Up)    pos = ImVec2(r_avoid.Max.x - size.x, r_avoid.Min.y - size.y);    
-            if (!r_outer.Contains(ImRect(pos, pos + size)))
-                continue;
-            *last_dir = dir;
-            return pos;
-        }
-    }
-
-    if (policy == ImGuiPopupPositionPolicy_Tooltip || policy == ImGuiPopupPositionPolicy_Default)
-    {
-        const ImGuiDir dir_prefered_order[ImGuiDir_COUNT] = { ImGuiDir_Right, ImGuiDir_Down, ImGuiDir_Up, ImGuiDir_Left };
-        for (int n = (*last_dir != ImGuiDir_None) ? -1 : 0; n < ImGuiDir_COUNT; n++)
-        {
-            const ImGuiDir dir = (n == -1) ? *last_dir : dir_prefered_order[n];
-            if (n != -1 && dir == *last_dir)     
-                continue;
-
-            const float avail_w = (dir == ImGuiDir_Left ? r_avoid.Min.x : r_outer.Max.x) - (dir == ImGuiDir_Right ? r_avoid.Max.x : r_outer.Min.x);
-            const float avail_h = (dir == ImGuiDir_Up ? r_avoid.Min.y : r_outer.Max.y) - (dir == ImGuiDir_Down ? r_avoid.Max.y : r_outer.Min.y);
-
-            if (avail_w < size.x && (dir == ImGuiDir_Left || dir == ImGuiDir_Right))
-                continue;
-            if (avail_h < size.y && (dir == ImGuiDir_Up || dir == ImGuiDir_Down))
-                continue;
-
-            ImVec2 pos;
-            pos.x = (dir == ImGuiDir_Left) ? r_avoid.Min.x - size.x : (dir == ImGuiDir_Right) ? r_avoid.Max.x : base_pos_clamped.x;
-            pos.y = (dir == ImGuiDir_Up) ? r_avoid.Min.y - size.y : (dir == ImGuiDir_Down) ? r_avoid.Max.y : base_pos_clamped.y;
-
-            pos.x = ImMax(pos.x, r_outer.Min.x);
-            pos.y = ImMax(pos.y, r_outer.Min.y);
-
-            *last_dir = dir;
-            return pos;
-        }
-    }
-
-    *last_dir = ImGuiDir_None;
-
-    if (policy == ImGuiPopupPositionPolicy_Tooltip)
-        return ref_pos + ImVec2(2, 2);
-
-    ImVec2 pos = ref_pos;
-    pos.x = ImMax(ImMin(pos.x + size.x, r_outer.Max.x) - size.x, r_outer.Min.x);
-    pos.y = ImMax(ImMin(pos.y + size.y, r_outer.Max.y) - size.y, r_outer.Min.y);
-    return pos;
-}
-
-ImRect ImGui::GetWindowAllowedExtentRect(ImGuiWindow* window)
-{
-    IM_UNUSED(window);
-    ImVec2 padding = GImGui->Style.DisplaySafeAreaPadding;
-    ImRect r_screen = GetViewportRect();
-    r_screen.Expand(ImVec2((r_screen.GetWidth() > padding.x * 2) ? -padding.x : 0.0f, (r_screen.GetHeight() > padding.y * 2) ? -padding.y : 0.0f));
-    return r_screen;
-}
-
-ImVec2 ImGui::FindBestWindowPosForPopup(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-
-    ImRect r_outer = GetWindowAllowedExtentRect(window);
-    if (window->Flags & ImGuiWindowFlags_ChildMenu)
-    {
-        IM_ASSERT(g.CurrentWindow == window);
-        ImGuiWindow* parent_window = g.CurrentWindowStack[g.CurrentWindowStack.Size - 2];
-        float horizontal_overlap = g.Style.ItemInnerSpacing.x;                      
-        ImRect r_avoid;
-        if (parent_window->DC.MenuBarAppending)
-            r_avoid = ImRect(-FLT_MAX, parent_window->ClipRect.Min.y, FLT_MAX, parent_window->ClipRect.Max.y);                       
-        else
-            r_avoid = ImRect(parent_window->Pos.x + horizontal_overlap, -FLT_MAX, parent_window->Pos.x + parent_window->Size.x - horizontal_overlap - parent_window->ScrollbarSizes.x, FLT_MAX);
-        return FindBestWindowPosForPopupEx(window->Pos, window->Size, &window->AutoPosLastDirection, r_outer, r_avoid, ImGuiPopupPositionPolicy_Default);
-    }
-    if (window->Flags & ImGuiWindowFlags_Popup)
-    {
-        ImRect r_avoid = ImRect(window->Pos.x - 1, window->Pos.y - 1, window->Pos.x + 1, window->Pos.y + 1);
-        return FindBestWindowPosForPopupEx(window->Pos, window->Size, &window->AutoPosLastDirection, r_outer, r_avoid, ImGuiPopupPositionPolicy_Default);
-    }
-    if (window->Flags & ImGuiWindowFlags_Tooltip)
-    {
-        float sc = g.Style.MouseCursorScale;
-        ImVec2 ref_pos = NavCalcPreferredRefPos();
-        ImRect r_avoid;
-        if (!g.NavDisableHighlight && g.NavDisableMouseHover && !(g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableSetMousePos))
-            r_avoid = ImRect(ref_pos.x - 16, ref_pos.y - 8, ref_pos.x + 16, ref_pos.y + 8);
-        else
-            r_avoid = ImRect(ref_pos.x - 16, ref_pos.y - 8, ref_pos.x + 24 * sc, ref_pos.y + 24 * sc);              
-        return FindBestWindowPosForPopupEx(ref_pos, window->Size, &window->AutoPosLastDirection, r_outer, r_avoid, ImGuiPopupPositionPolicy_Tooltip);
-    }
-    IM_ASSERT(0);
-    return window->Pos;
-}
-
-void ImGui::SetNavID(ImGuiID id, int nav_layer, ImGuiID focus_scope_id)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(g.NavWindow);
-    IM_ASSERT(nav_layer == 0 || nav_layer == 1);
-    g.NavId = id;
-    g.NavFocusScopeId = focus_scope_id;
-    g.NavWindow->NavLastIds[nav_layer] = id;
-}
-
-void ImGui::SetNavIDWithRectRel(ImGuiID id, int nav_layer, ImGuiID focus_scope_id, const ImRect& rect_rel)
-{
-    ImGuiContext& g = *GImGui;
-    SetNavID(id, nav_layer, focus_scope_id);
-    g.NavWindow->NavRectRel[nav_layer] = rect_rel;
-    g.NavMousePosDirty = true;
-    g.NavDisableHighlight = false;
-    g.NavDisableMouseHover = true;
-}
-
-void ImGui::SetFocusID(ImGuiID id, ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(id != 0);
-
-    const ImGuiNavLayer nav_layer = window->DC.NavLayerCurrent;
-    if (g.NavWindow != window)
-        g.NavInitRequest = false;
-    g.NavWindow = window;
-    g.NavId = id;
-    g.NavLayer = nav_layer;
-    g.NavFocusScopeId = window->DC.NavFocusScopeIdCurrent;
-    window->NavLastIds[nav_layer] = id;
-    if (window->DC.LastItemId == id)
-        window->NavRectRel[nav_layer] = ImRect(window->DC.LastItemRect.Min - window->Pos, window->DC.LastItemRect.Max - window->Pos);
-
-    if (g.ActiveIdSource == ImGuiInputSource_Nav)
-        g.NavDisableMouseHover = true;
-    else
-        g.NavDisableHighlight = true;
-}
-
-ImGuiDir ImGetDirQuadrantFromDelta(float dx, float dy)
-{
-    if (ImFabs(dx) > ImFabs(dy))
-        return (dx > 0.0f) ? ImGuiDir_Right : ImGuiDir_Left;
-    return (dy > 0.0f) ? ImGuiDir_Down : ImGuiDir_Up;
-}
-
-static float inline NavScoreItemDistInterval(float a0, float a1, float b0, float b1)
-{
-    if (a1 < b0)
-        return a1 - b0;
-    if (b1 < a0)
-        return a0 - b1;
-    return 0.0f;
-}
-
-static void inline NavClampRectToVisibleAreaForMoveDir(ImGuiDir move_dir, ImRect& r, const ImRect& clip_rect)
-{
-    if (move_dir == ImGuiDir_Left || move_dir == ImGuiDir_Right)
-    {
-        r.Min.y = ImClamp(r.Min.y, clip_rect.Min.y, clip_rect.Max.y);
-        r.Max.y = ImClamp(r.Max.y, clip_rect.Min.y, clip_rect.Max.y);
-    }
-    else
-    {
-        r.Min.x = ImClamp(r.Min.x, clip_rect.Min.x, clip_rect.Max.x);
-        r.Max.x = ImClamp(r.Max.x, clip_rect.Min.x, clip_rect.Max.x);
-    }
-}
-
-static bool ImGui::NavScoreItem(ImGuiNavMoveResult* result, ImRect cand)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (g.NavLayer != window->DC.NavLayerCurrent)
-        return false;
-
-    const ImRect& curr = g.NavScoringRect;                      
-    g.NavScoringCount++;
-
-    if (window->ParentWindow == g.NavWindow)
-    {
-        IM_ASSERT((window->Flags | g.NavWindow->Flags) & ImGuiWindowFlags_NavFlattened);
-        if (!window->ClipRect.Overlaps(cand))
-            return false;
-        cand.ClipWithFull(window->ClipRect);               
-    }
-
-    NavClampRectToVisibleAreaForMoveDir(g.NavMoveClipDir, cand, window->ClipRect);
-
-    float dbx = NavScoreItemDistInterval(cand.Min.x, cand.Max.x, curr.Min.x, curr.Max.x);
-    float dby = NavScoreItemDistInterval(ImLerp(cand.Min.y, cand.Max.y, 0.2f), ImLerp(cand.Min.y, cand.Max.y, 0.8f), ImLerp(curr.Min.y, curr.Max.y, 0.2f), ImLerp(curr.Min.y, curr.Max.y, 0.8f));             
-    if (dby != 0.0f && dbx != 0.0f)
-        dbx = (dbx / 1000.0f) + ((dbx > 0.0f) ? +1.0f : -1.0f);
-    float dist_box = ImFabs(dbx) + ImFabs(dby);
-
-    float dcx = (cand.Min.x + cand.Max.x) - (curr.Min.x + curr.Max.x);
-    float dcy = (cand.Min.y + cand.Max.y) - (curr.Min.y + curr.Max.y);
-    float dist_center = ImFabs(dcx) + ImFabs(dcy);         
-
-    ImGuiDir quadrant;
-    float dax = 0.0f, day = 0.0f, dist_axial = 0.0f;
-    if (dbx != 0.0f || dby != 0.0f)
-    {
-        dax = dbx;
-        day = dby;
-        dist_axial = dist_box;
-        quadrant = ImGetDirQuadrantFromDelta(dbx, dby);
-    }
-    else if (dcx != 0.0f || dcy != 0.0f)
-    {
-        dax = dcx;
-        day = dcy;
-        dist_axial = dist_center;
-        quadrant = ImGetDirQuadrantFromDelta(dcx, dcy);
-    }
-    else
-    {
-        quadrant = (window->DC.LastItemId < g.NavId) ? ImGuiDir_Left : ImGuiDir_Right;
-    }
-
-#if IMGUI_DEBUG_NAV_SCORING
-    char buf[128];
-    if (IsMouseHoveringRect(cand.Min, cand.Max))
-    {
-        ImFormatString(buf, IM_ARRAYSIZE(buf), "dbox (%.2f,%.2f->%.4f)\ndcen (%.2f,%.2f->%.4f)\nd (%.2f,%.2f->%.4f)\nnav %c, quadrant %c", dbx, dby, dist_box, dcx, dcy, dist_center, dax, day, dist_axial, "WENS"[g.NavMoveDir], "WENS"[quadrant]);
-        ImDrawList* draw_list = GetForegroundDrawList(window);
-        draw_list->AddRect(curr.Min, curr.Max, IM_COL32(255,200,0,100));
-        draw_list->AddRect(cand.Min, cand.Max, IM_COL32(255,255,0,200));
-        draw_list->AddRectFilled(cand.Max - ImVec2(4, 4), cand.Max + CalcTextSize(buf) + ImVec2(4, 4), IM_COL32(40,0,0,150));
-        draw_list->AddText(g.IO.FontDefault, 13.0f, cand.Max, ~0U, buf);
-    }
-    else if (g.IO.KeyCtrl)            
-    {
-        if (IsKeyPressedMap(ImGuiKey_C)) { g.NavMoveDirLast = (ImGuiDir)((g.NavMoveDirLast + 1) & 3); g.IO.KeysDownDuration[g.IO.KeyMap[ImGuiKey_C]] = 0.01f; }
-        if (quadrant == g.NavMoveDir)
-        {
-            ImFormatString(buf, IM_ARRAYSIZE(buf), "%.0f/%.0f", dist_box, dist_center);
-            ImDrawList* draw_list = GetForegroundDrawList(window);
-            draw_list->AddRectFilled(cand.Min, cand.Max, IM_COL32(255, 0, 0, 200));
-            draw_list->AddText(g.IO.FontDefault, 13.0f, cand.Min, IM_COL32(255, 255, 255, 255), buf);
-        }
-    }
-#endif
-
-    bool new_best = false;
-    if (quadrant == g.NavMoveDir)
-    {
-        if (dist_box < result->DistBox)
-        {
-            result->DistBox = dist_box;
-            result->DistCenter = dist_center;
-            return true;
-        }
-        if (dist_box == result->DistBox)
-        {
-            if (dist_center < result->DistCenter)
-            {
-                result->DistCenter = dist_center;
-                new_best = true;
-            }
-            else if (dist_center == result->DistCenter)
-            {
-                if (((g.NavMoveDir == ImGuiDir_Up || g.NavMoveDir == ImGuiDir_Down) ? dby : dbx) < 0.0f)        
-                    new_best = true;
-            }
-        }
-    }
-
-    if (result->DistBox == FLT_MAX && dist_axial < result->DistAxial)     
-        if (g.NavLayer == ImGuiNavLayer_Menu && !(g.NavWindow->Flags & ImGuiWindowFlags_ChildMenu))
-            if ((g.NavMoveDir == ImGuiDir_Left && dax < 0.0f) || (g.NavMoveDir == ImGuiDir_Right && dax > 0.0f) || (g.NavMoveDir == ImGuiDir_Up && day < 0.0f) || (g.NavMoveDir == ImGuiDir_Down && day > 0.0f))
-            {
-                result->DistAxial = dist_axial;
-                new_best = true;
-            }
-
-    return new_best;
-}
-
-static void ImGui::NavApplyItemToResult(ImGuiNavMoveResult* result, ImGuiWindow* window, ImGuiID id, const ImRect& nav_bb_rel)
-{
-    result->Window = window;
-    result->ID = id;
-    result->FocusScopeId = window->DC.NavFocusScopeIdCurrent;
-    result->RectRel = nav_bb_rel;
-}
-
-static void ImGui::NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, const ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    const ImGuiItemFlags item_flags = window->DC.ItemFlags;
-    const ImRect nav_bb_rel(nav_bb.Min - window->Pos, nav_bb.Max - window->Pos);
-
-    if (g.NavInitRequest && g.NavLayer == window->DC.NavLayerCurrent)
-    {
-        if (!(item_flags & ImGuiItemFlags_NoNavDefaultFocus) || g.NavInitResultId == 0)
-        {
-            g.NavInitResultId = id;
-            g.NavInitResultRectRel = nav_bb_rel;
-        }
-        if (!(item_flags & ImGuiItemFlags_NoNavDefaultFocus))
-        {
-            g.NavInitRequest = false;      
-            NavUpdateAnyRequestFlag();
-        }
-    }
-
-    if ((g.NavId != id || (g.NavMoveRequestFlags & ImGuiNavMoveFlags_AllowCurrentNavId)) && !(item_flags & (ImGuiItemFlags_Disabled | ImGuiItemFlags_NoNav)))
-    {
-        ImGuiNavMoveResult* result = (window == g.NavWindow) ? &g.NavMoveResultLocal : &g.NavMoveResultOther;
-#if IMGUI_DEBUG_NAV_SCORING
-        if (!g.NavMoveRequest)
-            g.NavMoveDir = g.NavMoveDirLast;
-        bool new_best = NavScoreItem(result, nav_bb) && g.NavMoveRequest;
-#else
-        bool new_best = g.NavMoveRequest && NavScoreItem(result, nav_bb);
-#endif
-        if (new_best)
-            NavApplyItemToResult(result, window, id, nav_bb_rel);
-
-        const float VISIBLE_RATIO = 0.70f;
-        if ((g.NavMoveRequestFlags & ImGuiNavMoveFlags_AlsoScoreVisibleSet) && window->ClipRect.Overlaps(nav_bb))
-            if (ImClamp(nav_bb.Max.y, window->ClipRect.Min.y, window->ClipRect.Max.y) - ImClamp(nav_bb.Min.y, window->ClipRect.Min.y, window->ClipRect.Max.y) >= (nav_bb.Max.y - nav_bb.Min.y) * VISIBLE_RATIO)
-                if (NavScoreItem(&g.NavMoveResultLocalVisibleSet, nav_bb))
-                    NavApplyItemToResult(&g.NavMoveResultLocalVisibleSet, window, id, nav_bb_rel);
-    }
-
-    if (g.NavId == id)
-    {
-        g.NavWindow = window;                                                        
-        g.NavLayer = window->DC.NavLayerCurrent;
-        g.NavFocusScopeId = window->DC.NavFocusScopeIdCurrent;
-        g.NavIdIsAlive = true;
-        g.NavIdTabCounter = window->DC.FocusCounterTabStop;
-        window->NavRectRel[window->DC.NavLayerCurrent] = nav_bb_rel;            
-    }
-}
-
-bool ImGui::NavMoveRequestButNoResultYet()
-{
-    ImGuiContext& g = *GImGui;
-    return g.NavMoveRequest && g.NavMoveResultLocal.ID == 0 && g.NavMoveResultOther.ID == 0;
-}
-
-void ImGui::NavMoveRequestCancel()
-{
-    ImGuiContext& g = *GImGui;
-    g.NavMoveRequest = false;
-    NavUpdateAnyRequestFlag();
-}
-
-void ImGui::NavMoveRequestForward(ImGuiDir move_dir, ImGuiDir clip_dir, const ImRect& bb_rel, ImGuiNavMoveFlags move_flags)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(g.NavMoveRequestForward == ImGuiNavForward_None);
-    NavMoveRequestCancel();
-    g.NavMoveDir = move_dir;
-    g.NavMoveClipDir = clip_dir;
-    g.NavMoveRequestForward = ImGuiNavForward_ForwardQueued;
-    g.NavMoveRequestFlags = move_flags;
-    g.NavWindow->NavRectRel[g.NavLayer] = bb_rel;
-}
-
-void ImGui::NavMoveRequestTryWrapping(ImGuiWindow* window, ImGuiNavMoveFlags move_flags)
-{
-    ImGuiContext& g = *GImGui;
-
-    g.NavWrapRequestWindow = window;
-    g.NavWrapRequestFlags = move_flags;
-}
-
-static void ImGui::NavSaveLastChildNavWindowIntoParent(ImGuiWindow* nav_window)
-{
-    ImGuiWindow* parent = nav_window;
-    while (parent && (parent->Flags & ImGuiWindowFlags_ChildWindow) != 0 && (parent->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu)) == 0)
-        parent = parent->ParentWindow;
-    if (parent && parent != nav_window)
-        parent->NavLastChildNavWindow = nav_window;
-}
-
-static ImGuiWindow* ImGui::NavRestoreLastChildNavWindow(ImGuiWindow* window)
-{
-    if (window->NavLastChildNavWindow && window->NavLastChildNavWindow->WasActive)
-        return window->NavLastChildNavWindow;
-    return window;
-}
-
-static void NavRestoreLayer(ImGuiNavLayer layer)
-{
-    ImGuiContext& g = *GImGui;
-    g.NavLayer = layer;
-    if (layer == 0)
-        g.NavWindow = ImGui::NavRestoreLastChildNavWindow(g.NavWindow);
-    ImGuiWindow* window = g.NavWindow;
-    if (layer == 0 && window->NavLastIds[0] != 0)
-        ImGui::SetNavIDWithRectRel(window->NavLastIds[0], layer, 0, window->NavRectRel[0]);
-    else
-        ImGui::NavInitWindow(window, true);
-}
-
-static inline void ImGui::NavUpdateAnyRequestFlag()
-{
-    ImGuiContext& g = *GImGui;
-    g.NavAnyRequest = g.NavMoveRequest || g.NavInitRequest || (IMGUI_DEBUG_NAV_SCORING && g.NavWindow != NULL);
-    if (g.NavAnyRequest)
-        IM_ASSERT(g.NavWindow != NULL);
-}
-
-void ImGui::NavInitWindow(ImGuiWindow* window, bool force_reinit)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(window == g.NavWindow);
-    bool init_for_nav = false;
-    if (!(window->Flags & ImGuiWindowFlags_NoNavInputs))
-        if (!(window->Flags & ImGuiWindowFlags_ChildWindow) || (window->Flags & ImGuiWindowFlags_Popup) || (window->NavLastIds[0] == 0) || force_reinit)
-            init_for_nav = true;
-    IMGUI_DEBUG_LOG_NAV("[nav] NavInitRequest: from NavInitWindow(), init_for_nav=%d, window=\"%s\", layer=%d\n", init_for_nav, window->Name, g.NavLayer);
-    if (init_for_nav)
-    {
-        SetNavID(0, g.NavLayer, 0);
-        g.NavInitRequest = true;
-        g.NavInitRequestFromMove = false;
-        g.NavInitResultId = 0;
-        g.NavInitResultRectRel = ImRect();
-        NavUpdateAnyRequestFlag();
-    }
-    else
-    {
-        g.NavId = window->NavLastIds[0];
-        g.NavFocusScopeId = 0;
-    }
-}
-
-static ImVec2 ImGui::NavCalcPreferredRefPos()
-{
-    ImGuiContext& g = *GImGui;
-    if (g.NavDisableHighlight || !g.NavDisableMouseHover || !g.NavWindow)
-    {
-        if (IsMousePosValid(&g.IO.MousePos))
-            return g.IO.MousePos;
-        return g.LastValidMousePos;
-    }
-    else
-    {
-        const ImRect& rect_rel = g.NavWindow->NavRectRel[g.NavLayer];
-        ImVec2 pos = g.NavWindow->Pos + ImVec2(rect_rel.Min.x + ImMin(g.Style.FramePadding.x * 4, rect_rel.GetWidth()), rect_rel.Max.y - ImMin(g.Style.FramePadding.y, rect_rel.GetHeight()));
-        ImRect visible_rect = GetViewportRect();
-        return ImFloor(ImClamp(pos, visible_rect.Min, visible_rect.Max));                      
-    }
-}
-
-float ImGui::GetNavInputAmount(ImGuiNavInput n, ImGuiInputReadMode mode)
-{
-    ImGuiContext& g = *GImGui;
-    if (mode == ImGuiInputReadMode_Down)
-        return g.IO.NavInputs[n];                                  
-
-    const float t = g.IO.NavInputsDownDuration[n];
-    if (t < 0.0f && mode == ImGuiInputReadMode_Released)            
-        return (g.IO.NavInputsDownDurationPrev[n] >= 0.0f ? 1.0f : 0.0f);
-    if (t < 0.0f)
-        return 0.0f;
-    if (mode == ImGuiInputReadMode_Pressed)                         
-        return (t == 0.0f) ? 1.0f : 0.0f;
-    if (mode == ImGuiInputReadMode_Repeat)
-        return (float)CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, g.IO.KeyRepeatDelay * 0.72f, g.IO.KeyRepeatRate * 0.80f);
-    if (mode == ImGuiInputReadMode_RepeatSlow)
-        return (float)CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, g.IO.KeyRepeatDelay * 1.25f, g.IO.KeyRepeatRate * 2.00f);
-    if (mode == ImGuiInputReadMode_RepeatFast)
-        return (float)CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, g.IO.KeyRepeatDelay * 0.72f, g.IO.KeyRepeatRate * 0.30f);
-    return 0.0f;
-}
-
-ImVec2 ImGui::GetNavInputAmount2d(ImGuiNavDirSourceFlags dir_sources, ImGuiInputReadMode mode, float slow_factor, float fast_factor)
-{
-    ImVec2 delta(0.0f, 0.0f);
-    if (dir_sources & ImGuiNavDirSourceFlags_Keyboard)
-        delta += ImVec2(GetNavInputAmount(ImGuiNavInput_KeyRight_, mode)   - GetNavInputAmount(ImGuiNavInput_KeyLeft_,   mode), GetNavInputAmount(ImGuiNavInput_KeyDown_,   mode) - GetNavInputAmount(ImGuiNavInput_KeyUp_,   mode));
-    if (dir_sources & ImGuiNavDirSourceFlags_PadDPad)
-        delta += ImVec2(GetNavInputAmount(ImGuiNavInput_DpadRight, mode)   - GetNavInputAmount(ImGuiNavInput_DpadLeft,   mode), GetNavInputAmount(ImGuiNavInput_DpadDown,   mode) - GetNavInputAmount(ImGuiNavInput_DpadUp,   mode));
-    if (dir_sources & ImGuiNavDirSourceFlags_PadLStick)
-        delta += ImVec2(GetNavInputAmount(ImGuiNavInput_LStickRight, mode) - GetNavInputAmount(ImGuiNavInput_LStickLeft, mode), GetNavInputAmount(ImGuiNavInput_LStickDown, mode) - GetNavInputAmount(ImGuiNavInput_LStickUp, mode));
-    if (slow_factor != 0.0f && IsNavInputDown(ImGuiNavInput_TweakSlow))
-        delta *= slow_factor;
-    if (fast_factor != 0.0f && IsNavInputDown(ImGuiNavInput_TweakFast))
-        delta *= fast_factor;
-    return delta;
-}
-
-static void ImGui::NavUpdate()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiIO& io = g.IO;
-
-    io.WantSetMousePos = false;
-    g.NavWrapRequestWindow = NULL;
-    g.NavWrapRequestFlags = ImGuiNavMoveFlags_None;
-#if 0
-    if (g.NavScoringCount > 0) IMGUI_DEBUG_LOG("NavScoringCount %d for '%s' layer %d (Init:%d, Move:%d)\n", g.FrameCount, g.NavScoringCount, g.NavWindow ? g.NavWindow->Name : "NULL", g.NavLayer, g.NavInitRequest || g.NavInitResultId != 0, g.NavMoveRequest);
-#endif
-
-    bool nav_keyboard_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0;
-    bool nav_gamepad_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) != 0 && (io.BackendFlags & ImGuiBackendFlags_HasGamepad) != 0;
-    if (nav_gamepad_active && g.NavInputSource != ImGuiInputSource_NavGamepad)
-    {
-        if (io.NavInputs[ImGuiNavInput_Activate] > 0.0f || io.NavInputs[ImGuiNavInput_Input] > 0.0f || io.NavInputs[ImGuiNavInput_Cancel] > 0.0f || io.NavInputs[ImGuiNavInput_Menu] > 0.0f
-            || io.NavInputs[ImGuiNavInput_DpadLeft] > 0.0f || io.NavInputs[ImGuiNavInput_DpadRight] > 0.0f || io.NavInputs[ImGuiNavInput_DpadUp] > 0.0f || io.NavInputs[ImGuiNavInput_DpadDown] > 0.0f)
-            g.NavInputSource = ImGuiInputSource_NavGamepad;
-    }
-
-    if (nav_keyboard_active)
-    {
-        #define NAV_MAP_KEY(_KEY, _NAV_INPUT)  do { if (IsKeyDown(io.KeyMap[_KEY])) { io.NavInputs[_NAV_INPUT] = 1.0f; g.NavInputSource = ImGuiInputSource_NavKeyboard; } } while (0)
-        NAV_MAP_KEY(ImGuiKey_Space,     ImGuiNavInput_Activate );
-        NAV_MAP_KEY(ImGuiKey_Enter,     ImGuiNavInput_Input    );
-        NAV_MAP_KEY(ImGuiKey_Escape,    ImGuiNavInput_Cancel   );
-        NAV_MAP_KEY(ImGuiKey_LeftArrow, ImGuiNavInput_KeyLeft_ );
-        NAV_MAP_KEY(ImGuiKey_RightArrow,ImGuiNavInput_KeyRight_);
-        NAV_MAP_KEY(ImGuiKey_UpArrow,   ImGuiNavInput_KeyUp_   );
-        NAV_MAP_KEY(ImGuiKey_DownArrow, ImGuiNavInput_KeyDown_ );
-        if (io.KeyCtrl)
-            io.NavInputs[ImGuiNavInput_TweakSlow] = 1.0f;
-        if (io.KeyShift)
-            io.NavInputs[ImGuiNavInput_TweakFast] = 1.0f;
-        if (io.KeyAlt && !io.KeyCtrl)                 
-            io.NavInputs[ImGuiNavInput_KeyMenu_]  = 1.0f;
-        #undef NAV_MAP_KEY
-    }
-    memcpy(io.NavInputsDownDurationPrev, io.NavInputsDownDuration, sizeof(io.NavInputsDownDuration));
-    for (int i = 0; i < IM_ARRAYSIZE(io.NavInputs); i++)
-        io.NavInputsDownDuration[i] = (io.NavInputs[i] > 0.0f) ? (io.NavInputsDownDuration[i] < 0.0f ? 0.0f : io.NavInputsDownDuration[i] + io.DeltaTime) : -1.0f;
-
-    if (g.NavInitResultId != 0 && (!g.NavDisableHighlight || g.NavInitRequestFromMove))
-        NavUpdateInitResult();
-    g.NavInitRequest = false;
-    g.NavInitRequestFromMove = false;
-    g.NavInitResultId = 0;
-    g.NavJustMovedToId = 0;
-
-    if (g.NavMoveRequest)
-        NavUpdateMoveResult();
-
-    if (g.NavMoveRequestForward == ImGuiNavForward_ForwardActive)
-    {
-        IM_ASSERT(g.NavMoveRequest);
-        if (g.NavMoveResultLocal.ID == 0 && g.NavMoveResultOther.ID == 0)
-            g.NavDisableHighlight = false;
-        g.NavMoveRequestForward = ImGuiNavForward_None;
-    }
-
-    if (g.NavMousePosDirty && g.NavIdIsAlive)
-    {
-        if ((io.ConfigFlags & ImGuiConfigFlags_NavEnableSetMousePos) && (io.BackendFlags & ImGuiBackendFlags_HasSetMousePos))
-        {
-            if (!g.NavDisableHighlight && g.NavDisableMouseHover && g.NavWindow)
-            {
-                io.MousePos = io.MousePosPrev = NavCalcPreferredRefPos();
-                io.WantSetMousePos = true;
-            }
-        }
-        g.NavMousePosDirty = false;
-    }
-    g.NavIdIsAlive = false;
-    g.NavJustTabbedId = 0;
-    IM_ASSERT(g.NavLayer == 0 || g.NavLayer == 1);
-
-    if (g.NavWindow)
-        NavSaveLastChildNavWindowIntoParent(g.NavWindow);
-    if (g.NavWindow && g.NavWindow->NavLastChildNavWindow != NULL && g.NavLayer == ImGuiNavLayer_Main)
-        g.NavWindow->NavLastChildNavWindow = NULL;
-
-    NavUpdateWindowing();
-
-    io.NavActive = (nav_keyboard_active || nav_gamepad_active) && g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs);
-    io.NavVisible = (io.NavActive && g.NavId != 0 && !g.NavDisableHighlight) || (g.NavWindowingTarget != NULL);
-
-    if (IsNavInputTest(ImGuiNavInput_Cancel, ImGuiInputReadMode_Pressed))
-    {
-        IMGUI_DEBUG_LOG_NAV("[nav] ImGuiNavInput_Cancel\n");
-        if (g.ActiveId != 0)
-        {
-            if (!IsActiveIdUsingNavInput(ImGuiNavInput_Cancel))
-                ClearActiveID();
-        }
-        else if (g.NavWindow && (g.NavWindow->Flags & ImGuiWindowFlags_ChildWindow) && !(g.NavWindow->Flags & ImGuiWindowFlags_Popup) && g.NavWindow->ParentWindow)
-        {
-            ImGuiWindow* child_window = g.NavWindow;
-            ImGuiWindow* parent_window = g.NavWindow->ParentWindow;
-            IM_ASSERT(child_window->ChildId != 0);
-            FocusWindow(parent_window);
-            SetNavID(child_window->ChildId, 0, 0);
-            g.NavIdIsAlive = false;      
-            if (g.NavDisableMouseHover)
-                g.NavMousePosDirty = true;
-        }
-        else if (g.OpenPopupStack.Size > 0)
-        {
-            if (!(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
-                ClosePopupToLevel(g.OpenPopupStack.Size - 1, true);
-        }
-        else if (g.NavLayer != ImGuiNavLayer_Main)
-        {
-            NavRestoreLayer(ImGuiNavLayer_Main);
-        }
-        else
-        {
-            if (g.NavWindow && ((g.NavWindow->Flags & ImGuiWindowFlags_Popup) || !(g.NavWindow->Flags & ImGuiWindowFlags_ChildWindow)))
-                g.NavWindow->NavLastIds[0] = 0;
-            g.NavId = g.NavFocusScopeId = 0;
-        }
-    }
-
-    g.NavActivateId = g.NavActivateDownId = g.NavActivatePressedId = g.NavInputId = 0;
-    if (g.NavId != 0 && !g.NavDisableHighlight && !g.NavWindowingTarget && g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs))
-    {
-        bool activate_down = IsNavInputDown(ImGuiNavInput_Activate);
-        bool activate_pressed = activate_down && IsNavInputTest(ImGuiNavInput_Activate, ImGuiInputReadMode_Pressed);
-        if (g.ActiveId == 0 && activate_pressed)
-            g.NavActivateId = g.NavId;
-        if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && activate_down)
-            g.NavActivateDownId = g.NavId;
-        if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && activate_pressed)
-            g.NavActivatePressedId = g.NavId;
-        if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && IsNavInputTest(ImGuiNavInput_Input, ImGuiInputReadMode_Pressed))
-            g.NavInputId = g.NavId;
-    }
-    if (g.NavWindow && (g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs))
-        g.NavDisableHighlight = true;
-    if (g.NavActivateId != 0)
-        IM_ASSERT(g.NavActivateDownId == g.NavActivateId);
-    g.NavMoveRequest = false;
-
-    if (g.NavNextActivateId != 0)
-        g.NavActivateId = g.NavActivateDownId = g.NavActivatePressedId = g.NavInputId = g.NavNextActivateId;
-    g.NavNextActivateId = 0;
-
-    if (g.NavMoveRequestForward == ImGuiNavForward_None)
-    {
-        g.NavMoveDir = ImGuiDir_None;
-        g.NavMoveRequestFlags = ImGuiNavMoveFlags_None;
-        if (g.NavWindow && !g.NavWindowingTarget && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs))
-        {
-            const ImGuiInputReadMode read_mode = ImGuiInputReadMode_Repeat;
-            if (!IsActiveIdUsingNavDir(ImGuiDir_Left)  && (IsNavInputTest(ImGuiNavInput_DpadLeft,  read_mode) || IsNavInputTest(ImGuiNavInput_KeyLeft_,  read_mode))) { g.NavMoveDir = ImGuiDir_Left; }
-            if (!IsActiveIdUsingNavDir(ImGuiDir_Right) && (IsNavInputTest(ImGuiNavInput_DpadRight, read_mode) || IsNavInputTest(ImGuiNavInput_KeyRight_, read_mode))) { g.NavMoveDir = ImGuiDir_Right; }
-            if (!IsActiveIdUsingNavDir(ImGuiDir_Up)    && (IsNavInputTest(ImGuiNavInput_DpadUp,    read_mode) || IsNavInputTest(ImGuiNavInput_KeyUp_,    read_mode))) { g.NavMoveDir = ImGuiDir_Up; }
-            if (!IsActiveIdUsingNavDir(ImGuiDir_Down)  && (IsNavInputTest(ImGuiNavInput_DpadDown,  read_mode) || IsNavInputTest(ImGuiNavInput_KeyDown_,  read_mode))) { g.NavMoveDir = ImGuiDir_Down; }
-        }
-        g.NavMoveClipDir = g.NavMoveDir;
-    }
-    else
-    {
-        IM_ASSERT(g.NavMoveDir != ImGuiDir_None && g.NavMoveClipDir != ImGuiDir_None);
-        IM_ASSERT(g.NavMoveRequestForward == ImGuiNavForward_ForwardQueued);
-        IMGUI_DEBUG_LOG_NAV("[nav] NavMoveRequestForward %d\n", g.NavMoveDir);
-        g.NavMoveRequestForward = ImGuiNavForward_ForwardActive;
-    }
-
-    float nav_scoring_rect_offset_y = 0.0f;
-    if (nav_keyboard_active)
-        nav_scoring_rect_offset_y = NavUpdatePageUpPageDown();
-
-    if (g.NavMoveDir != ImGuiDir_None)
-    {
-        g.NavMoveRequest = true;
-        g.NavMoveRequestKeyMods = io.KeyMods;
-        g.NavMoveDirLast = g.NavMoveDir;
-    }
-    if (g.NavMoveRequest && g.NavId == 0)
-    {
-        IMGUI_DEBUG_LOG_NAV("[nav] NavInitRequest: from move, window \"%s\", layer=%d\n", g.NavWindow->Name, g.NavLayer);
-        g.NavInitRequest = g.NavInitRequestFromMove = true;
-        g.NavInitResultId = 0;      
-        g.NavDisableHighlight = false;
-    }
-    NavUpdateAnyRequestFlag();
-
-    if (g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) && !g.NavWindowingTarget)
-    {
-        ImGuiWindow* window = g.NavWindow;
-        const float scroll_speed = IM_ROUND(window->CalcFontSize() * 100 * io.DeltaTime);             
-        if (window->DC.NavLayerActiveMask == 0x00 && window->DC.NavHasScroll && g.NavMoveRequest)
-        {
-            if (g.NavMoveDir == ImGuiDir_Left || g.NavMoveDir == ImGuiDir_Right)
-                SetScrollX(window, ImFloor(window->Scroll.x + ((g.NavMoveDir == ImGuiDir_Left) ? -1.0f : +1.0f) * scroll_speed));
-            if (g.NavMoveDir == ImGuiDir_Up || g.NavMoveDir == ImGuiDir_Down)
-                SetScrollY(window, ImFloor(window->Scroll.y + ((g.NavMoveDir == ImGuiDir_Up) ? -1.0f : +1.0f) * scroll_speed));
-        }
-
-        ImVec2 scroll_dir = GetNavInputAmount2d(ImGuiNavDirSourceFlags_PadLStick, ImGuiInputReadMode_Down, 1.0f / 10.0f, 10.0f);
-        if (scroll_dir.x != 0.0f && window->ScrollbarX)
-            SetScrollX(window, ImFloor(window->Scroll.x + scroll_dir.x * scroll_speed));
-        if (scroll_dir.y != 0.0f)
-            SetScrollY(window, ImFloor(window->Scroll.y + scroll_dir.y * scroll_speed));
-    }
-
-    g.NavMoveResultLocal.Clear();
-    g.NavMoveResultLocalVisibleSet.Clear();
-    g.NavMoveResultOther.Clear();
-
-    if (g.NavMoveRequest && g.NavInputSource == ImGuiInputSource_NavGamepad && g.NavLayer == ImGuiNavLayer_Main)
-    {
-        ImGuiWindow* window = g.NavWindow;
-        ImRect window_rect_rel(window->InnerRect.Min - window->Pos - ImVec2(1, 1), window->InnerRect.Max - window->Pos + ImVec2(1, 1));
-        if (!window_rect_rel.Contains(window->NavRectRel[g.NavLayer]))
-        {
-            IMGUI_DEBUG_LOG_NAV("[nav] NavMoveRequest: clamp NavRectRel\n");
-            float pad = window->CalcFontSize() * 0.5f;
-            window_rect_rel.Expand(ImVec2(-ImMin(window_rect_rel.GetWidth(), pad), -ImMin(window_rect_rel.GetHeight(), pad)));              
-            window->NavRectRel[g.NavLayer].ClipWithFull(window_rect_rel);
-            g.NavId = g.NavFocusScopeId = 0;
-        }
-    }
-
-    ImRect nav_rect_rel = g.NavWindow ? g.NavWindow->NavRectRel[g.NavLayer] : ImRect(0, 0, 0, 0);
-    g.NavScoringRect = g.NavWindow ? ImRect(g.NavWindow->Pos + nav_rect_rel.Min, g.NavWindow->Pos + nav_rect_rel.Max) : GetViewportRect();
-    g.NavScoringRect.TranslateY(nav_scoring_rect_offset_y);
-    g.NavScoringRect.Min.x = ImMin(g.NavScoringRect.Min.x + 1.0f, g.NavScoringRect.Max.x);
-    g.NavScoringRect.Max.x = g.NavScoringRect.Min.x;
-    IM_ASSERT(!g.NavScoringRect.IsInverted());                     
-    g.NavScoringCount = 0;
-#if IMGUI_DEBUG_NAV_RECTS
-    if (g.NavWindow)
-    {
-        ImDrawList* draw_list = GetForegroundDrawList(g.NavWindow);
-        if (1) { for (int layer = 0; layer < 2; layer++) draw_list->AddRect(g.NavWindow->Pos + g.NavWindow->NavRectRel[layer].Min, g.NavWindow->Pos + g.NavWindow->NavRectRel[layer].Max, IM_COL32(255,200,0,255)); }  
-        if (1) { ImU32 col = (!g.NavWindow->Hidden) ? IM_COL32(255,0,255,255) : IM_COL32(255,0,0,255); ImVec2 p = NavCalcPreferredRefPos(); char buf[32]; ImFormatString(buf, 32, "%d", g.NavLayer); draw_list->AddCircleFilled(p, 3.0f, col); draw_list->AddText(NULL, 13.0f, p + ImVec2(8,-4), col, buf); }
-    }
-#endif
-}
-
-static void ImGui::NavUpdateInitResult()
-{
-    ImGuiContext& g = *GImGui;
-    if (!g.NavWindow)
-        return;
-
-    IMGUI_DEBUG_LOG_NAV("[nav] NavInitRequest: result NavID 0x%08X in Layer %d Window \"%s\"\n", g.NavInitResultId, g.NavLayer, g.NavWindow->Name);
-    if (g.NavInitRequestFromMove)
-        SetNavIDWithRectRel(g.NavInitResultId, g.NavLayer, 0, g.NavInitResultRectRel);
-    else
-        SetNavID(g.NavInitResultId, g.NavLayer, 0);
-    g.NavWindow->NavRectRel[g.NavLayer] = g.NavInitResultRectRel;
-}
-
-static void ImGui::NavUpdateMoveResult()
-{
-    ImGuiContext& g = *GImGui;
-    if (g.NavMoveResultLocal.ID == 0 && g.NavMoveResultOther.ID == 0)
-    {
-        if (g.NavId != 0)
-        {
-            g.NavDisableHighlight = false;
-            g.NavDisableMouseHover = true;
-        }
-        return;
-    }
-
-    ImGuiNavMoveResult* result = (g.NavMoveResultLocal.ID != 0) ? &g.NavMoveResultLocal : &g.NavMoveResultOther;
-
-    if (g.NavMoveRequestFlags & ImGuiNavMoveFlags_AlsoScoreVisibleSet)
-        if (g.NavMoveResultLocalVisibleSet.ID != 0 && g.NavMoveResultLocalVisibleSet.ID != g.NavId)
-            result = &g.NavMoveResultLocalVisibleSet;
-
-    if (result != &g.NavMoveResultOther && g.NavMoveResultOther.ID != 0 && g.NavMoveResultOther.Window->ParentWindow == g.NavWindow)
-        if ((g.NavMoveResultOther.DistBox < result->DistBox) || (g.NavMoveResultOther.DistBox == result->DistBox && g.NavMoveResultOther.DistCenter < result->DistCenter))
-            result = &g.NavMoveResultOther;
-    IM_ASSERT(g.NavWindow && result->Window);
-
-    if (g.NavLayer == ImGuiNavLayer_Main)
-    {
-        ImVec2 delta_scroll;
-        if (g.NavMoveRequestFlags & ImGuiNavMoveFlags_ScrollToEdge)
-        {
-            float scroll_target = (g.NavMoveDir == ImGuiDir_Up) ? result->Window->ScrollMax.y : 0.0f;
-            delta_scroll.y = result->Window->Scroll.y - scroll_target;
-            SetScrollY(result->Window, scroll_target);
-        }
-        else
-        {
-            ImRect rect_abs = ImRect(result->RectRel.Min + result->Window->Pos, result->RectRel.Max + result->Window->Pos);
-            delta_scroll = ScrollToBringRectIntoView(result->Window, rect_abs);
-        }
-
-        result->RectRel.TranslateX(-delta_scroll.x);
-        result->RectRel.TranslateY(-delta_scroll.y);
-    }
-
-    ClearActiveID();
-    g.NavWindow = result->Window;
-    if (g.NavId != result->ID)
-    {
-        g.NavJustMovedToId = result->ID;
-        g.NavJustMovedToFocusScopeId = result->FocusScopeId;
-        g.NavJustMovedToKeyMods = g.NavMoveRequestKeyMods;
-    }
-    IMGUI_DEBUG_LOG_NAV("[nav] NavMoveRequest: result NavID 0x%08X in Layer %d Window \"%s\"\n", result->ID, g.NavLayer, g.NavWindow->Name);
-    SetNavIDWithRectRel(result->ID, g.NavLayer, result->FocusScopeId, result->RectRel);
-}
-
-static float ImGui::NavUpdatePageUpPageDown()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiIO& io = g.IO;
-
-    if (g.NavMoveDir != ImGuiDir_None || g.NavWindow == NULL)
-        return 0.0f;
-    if ((g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) || g.NavWindowingTarget != NULL || g.NavLayer != ImGuiNavLayer_Main)
-        return 0.0f;
-
-    ImGuiWindow* window = g.NavWindow;
-    const bool page_up_held = IsKeyDown(io.KeyMap[ImGuiKey_PageUp]) && !IsActiveIdUsingKey(ImGuiKey_PageUp);
-    const bool page_down_held = IsKeyDown(io.KeyMap[ImGuiKey_PageDown]) && !IsActiveIdUsingKey(ImGuiKey_PageDown);
-    const bool home_pressed = IsKeyPressed(io.KeyMap[ImGuiKey_Home]) && !IsActiveIdUsingKey(ImGuiKey_Home);
-    const bool end_pressed = IsKeyPressed(io.KeyMap[ImGuiKey_End]) && !IsActiveIdUsingKey(ImGuiKey_End);
-    if (page_up_held != page_down_held || home_pressed != end_pressed)       
-    {
-        if (window->DC.NavLayerActiveMask == 0x00 && window->DC.NavHasScroll)
-        {
-            if (IsKeyPressed(io.KeyMap[ImGuiKey_PageUp], true))
-                SetScrollY(window, window->Scroll.y - window->InnerRect.GetHeight());
-            else if (IsKeyPressed(io.KeyMap[ImGuiKey_PageDown], true))
-                SetScrollY(window, window->Scroll.y + window->InnerRect.GetHeight());
-            else if (home_pressed)
-                SetScrollY(window, 0.0f);
-            else if (end_pressed)
-                SetScrollY(window, window->ScrollMax.y);
-        }
-        else
-        {
-            ImRect& nav_rect_rel = window->NavRectRel[g.NavLayer];
-            const float page_offset_y = ImMax(0.0f, window->InnerRect.GetHeight() - window->CalcFontSize() * 1.0f + nav_rect_rel.GetHeight());
-            float nav_scoring_rect_offset_y = 0.0f;
-            if (IsKeyPressed(io.KeyMap[ImGuiKey_PageUp], true))
-            {
-                nav_scoring_rect_offset_y = -page_offset_y;
-                g.NavMoveDir = ImGuiDir_Down;                      
-                g.NavMoveClipDir = ImGuiDir_Up;
-                g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet;
-            }
-            else if (IsKeyPressed(io.KeyMap[ImGuiKey_PageDown], true))
-            {
-                nav_scoring_rect_offset_y = +page_offset_y;
-                g.NavMoveDir = ImGuiDir_Up;                      
-                g.NavMoveClipDir = ImGuiDir_Down;
-                g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet;
-            }
-            else if (home_pressed)
-            {
-                nav_rect_rel.Min.y = nav_rect_rel.Max.y = -window->Scroll.y;
-                if (nav_rect_rel.IsInverted())
-                    nav_rect_rel.Min.x = nav_rect_rel.Max.x = 0.0f;
-                g.NavMoveDir = ImGuiDir_Down;
-                g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_ScrollToEdge;
-            }
-            else if (end_pressed)
-            {
-                nav_rect_rel.Min.y = nav_rect_rel.Max.y = window->ScrollMax.y + window->SizeFull.y - window->Scroll.y;
-                if (nav_rect_rel.IsInverted())
-                    nav_rect_rel.Min.x = nav_rect_rel.Max.x = 0.0f;
-                g.NavMoveDir = ImGuiDir_Up;
-                g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_ScrollToEdge;
-            }
-            return nav_scoring_rect_offset_y;
-        }
-    }
-    return 0.0f;
-}
-
-static void ImGui::NavEndFrame()
-{
-    ImGuiContext& g = *GImGui;
-
-    if (g.NavWindowingTarget != NULL)
-        NavUpdateWindowingOverlay();
-
-    ImGuiWindow* window = g.NavWrapRequestWindow;
-    ImGuiNavMoveFlags move_flags = g.NavWrapRequestFlags;
-    if (window != NULL && g.NavWindow == window && NavMoveRequestButNoResultYet() && g.NavMoveRequestForward == ImGuiNavForward_None && g.NavLayer == ImGuiNavLayer_Main)
-    {
-        IM_ASSERT(move_flags != 0);        
-        ImRect bb_rel = window->NavRectRel[0];
-
-        ImGuiDir clip_dir = g.NavMoveDir;
-        if (g.NavMoveDir == ImGuiDir_Left && (move_flags & (ImGuiNavMoveFlags_WrapX | ImGuiNavMoveFlags_LoopX)))
-        {
-            bb_rel.Min.x = bb_rel.Max.x =
-                ImMax(window->SizeFull.x, window->ContentSize.x + window->WindowPadding.x * 2.0f) - window->Scroll.x;
-            if (move_flags & ImGuiNavMoveFlags_WrapX)
-            {
-                bb_rel.TranslateY(-bb_rel.GetHeight());
-                clip_dir = ImGuiDir_Up;
-            }
-            NavMoveRequestForward(g.NavMoveDir, clip_dir, bb_rel, move_flags);
-        }
-        if (g.NavMoveDir == ImGuiDir_Right && (move_flags & (ImGuiNavMoveFlags_WrapX | ImGuiNavMoveFlags_LoopX)))
-        {
-            bb_rel.Min.x = bb_rel.Max.x = -window->Scroll.x;
-            if (move_flags & ImGuiNavMoveFlags_WrapX)
-            {
-                bb_rel.TranslateY(+bb_rel.GetHeight());
-                clip_dir = ImGuiDir_Down;
-            }
-            NavMoveRequestForward(g.NavMoveDir, clip_dir, bb_rel, move_flags);
-        }
-        if (g.NavMoveDir == ImGuiDir_Up && (move_flags & (ImGuiNavMoveFlags_WrapY | ImGuiNavMoveFlags_LoopY)))
-        {
-            bb_rel.Min.y = bb_rel.Max.y =
-                ImMax(window->SizeFull.y, window->ContentSize.y + window->WindowPadding.y * 2.0f) - window->Scroll.y;
-            if (move_flags & ImGuiNavMoveFlags_WrapY)
-            {
-                bb_rel.TranslateX(-bb_rel.GetWidth());
-                clip_dir = ImGuiDir_Left;
-            }
-            NavMoveRequestForward(g.NavMoveDir, clip_dir, bb_rel, move_flags);
-        }
-        if (g.NavMoveDir == ImGuiDir_Down && (move_flags & (ImGuiNavMoveFlags_WrapY | ImGuiNavMoveFlags_LoopY)))
-        {
-            bb_rel.Min.y = bb_rel.Max.y = -window->Scroll.y;
-            if (move_flags & ImGuiNavMoveFlags_WrapY)
-            {
-                bb_rel.TranslateX(+bb_rel.GetWidth());
-                clip_dir = ImGuiDir_Right;
-            }
-            NavMoveRequestForward(g.NavMoveDir, clip_dir, bb_rel, move_flags);
-        }
-    }
-}
-
-static int ImGui::FindWindowFocusIndex(ImGuiWindow* window)   
-{
-    ImGuiContext& g = *GImGui;
-    for (int i = g.WindowsFocusOrder.Size - 1; i >= 0; i--)
-        if (g.WindowsFocusOrder[i] == window)
-            return i;
-    return -1;
-}
-
-static ImGuiWindow* FindWindowNavFocusable(int i_start, int i_stop, int dir)   
-{
-    ImGuiContext& g = *GImGui;
-    for (int i = i_start; i >= 0 && i < g.WindowsFocusOrder.Size && i != i_stop; i += dir)
-        if (ImGui::IsWindowNavFocusable(g.WindowsFocusOrder[i]))
-            return g.WindowsFocusOrder[i];
-    return NULL;
-}
-
-static void NavUpdateWindowingHighlightWindow(int focus_change_dir)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(g.NavWindowingTarget);
-    if (g.NavWindowingTarget->Flags & ImGuiWindowFlags_Modal)
-        return;
-
-    const int i_current = ImGui::FindWindowFocusIndex(g.NavWindowingTarget);
-    ImGuiWindow* window_target = FindWindowNavFocusable(i_current + focus_change_dir, -INT_MAX, focus_change_dir);
-    if (!window_target)
-        window_target = FindWindowNavFocusable((focus_change_dir < 0) ? (g.WindowsFocusOrder.Size - 1) : 0, i_current, focus_change_dir);
-    if (window_target)             
-        g.NavWindowingTarget = g.NavWindowingTargetAnim = window_target;
-    g.NavWindowingToggleLayer = false;
-}
-
-static void ImGui::NavUpdateWindowing()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* apply_focus_window = NULL;
-    bool apply_toggle_layer = false;
-
-    ImGuiWindow* modal_window = GetTopMostPopupModal();
-    bool allow_windowing = (modal_window == NULL);
-    if (!allow_windowing)
-        g.NavWindowingTarget = NULL;
-
-    if (g.NavWindowingTargetAnim && g.NavWindowingTarget == NULL)
-    {
-        g.NavWindowingHighlightAlpha = ImMax(g.NavWindowingHighlightAlpha - g.IO.DeltaTime * 10.0f, 0.0f);
-        if (g.DimBgRatio <= 0.0f && g.NavWindowingHighlightAlpha <= 0.0f)
-            g.NavWindowingTargetAnim = NULL;
-    }
-
-    bool start_windowing_with_gamepad = allow_windowing && !g.NavWindowingTarget && IsNavInputTest(ImGuiNavInput_Menu, ImGuiInputReadMode_Pressed);
-    bool start_windowing_with_keyboard = allow_windowing && !g.NavWindowingTarget && g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_Tab) && (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard);
-    if (start_windowing_with_gamepad || start_windowing_with_keyboard)
-        if (ImGuiWindow* window = g.NavWindow ? g.NavWindow : FindWindowNavFocusable(g.WindowsFocusOrder.Size - 1, -INT_MAX, -1))
-        {
-            g.NavWindowingTarget = g.NavWindowingTargetAnim = window->RootWindow;       
-            g.NavWindowingTimer = g.NavWindowingHighlightAlpha = 0.0f;
-            g.NavWindowingToggleLayer = start_windowing_with_keyboard ? false : true;
-            g.NavInputSource = start_windowing_with_keyboard ? ImGuiInputSource_NavKeyboard : ImGuiInputSource_NavGamepad;
-        }
-
-    g.NavWindowingTimer += g.IO.DeltaTime;
-    if (g.NavWindowingTarget && g.NavInputSource == ImGuiInputSource_NavGamepad)
-    {
-        g.NavWindowingHighlightAlpha = ImMax(g.NavWindowingHighlightAlpha, ImSaturate((g.NavWindowingTimer - NAV_WINDOWING_HIGHLIGHT_DELAY) / 0.05f));
-
-        const int focus_change_dir = (int)IsNavInputTest(ImGuiNavInput_FocusPrev, ImGuiInputReadMode_RepeatSlow) - (int)IsNavInputTest(ImGuiNavInput_FocusNext, ImGuiInputReadMode_RepeatSlow);
-        if (focus_change_dir != 0)
-        {
-            NavUpdateWindowingHighlightWindow(focus_change_dir);
-            g.NavWindowingHighlightAlpha = 1.0f;
-        }
-
-        if (!IsNavInputDown(ImGuiNavInput_Menu))
-        {
-            g.NavWindowingToggleLayer &= (g.NavWindowingHighlightAlpha < 1.0f);               
-            if (g.NavWindowingToggleLayer && g.NavWindow)
-                apply_toggle_layer = true;
-            else if (!g.NavWindowingToggleLayer)
-                apply_focus_window = g.NavWindowingTarget;
-            g.NavWindowingTarget = NULL;
-        }
-    }
-
-    if (g.NavWindowingTarget && g.NavInputSource == ImGuiInputSource_NavKeyboard)
-    {
-        g.NavWindowingHighlightAlpha = ImMax(g.NavWindowingHighlightAlpha, ImSaturate((g.NavWindowingTimer - NAV_WINDOWING_HIGHLIGHT_DELAY) / 0.05f));  
-        if (IsKeyPressedMap(ImGuiKey_Tab, true))
-            NavUpdateWindowingHighlightWindow(g.IO.KeyShift ? +1 : -1);
-        if (!g.IO.KeyCtrl)
-            apply_focus_window = g.NavWindowingTarget;
-    }
-
-    if (IsNavInputTest(ImGuiNavInput_KeyMenu_, ImGuiInputReadMode_Pressed))
-        g.NavWindowingToggleLayer = true;
-    if ((g.ActiveId == 0 || g.ActiveIdAllowOverlap) && g.NavWindowingToggleLayer && IsNavInputTest(ImGuiNavInput_KeyMenu_, ImGuiInputReadMode_Released))
-        if (IsMousePosValid(&g.IO.MousePos) == IsMousePosValid(&g.IO.MousePosPrev))
-            apply_toggle_layer = true;
-
-    if (g.NavWindowingTarget && !(g.NavWindowingTarget->Flags & ImGuiWindowFlags_NoMove))
-    {
-        ImVec2 move_delta;
-        if (g.NavInputSource == ImGuiInputSource_NavKeyboard && !g.IO.KeyShift)
-            move_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_Keyboard, ImGuiInputReadMode_Down);
-        if (g.NavInputSource == ImGuiInputSource_NavGamepad)
-            move_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_PadLStick, ImGuiInputReadMode_Down);
-        if (move_delta.x != 0.0f || move_delta.y != 0.0f)
-        {
-            const float NAV_MOVE_SPEED = 800.0f;
-            const float move_speed = ImFloor(NAV_MOVE_SPEED * g.IO.DeltaTime * ImMin(g.IO.DisplayFramebufferScale.x, g.IO.DisplayFramebufferScale.y));        
-            ImGuiWindow* moving_window = g.NavWindowingTarget->RootWindow;
-            SetWindowPos(moving_window, moving_window->Pos + move_delta * move_speed, ImGuiCond_Always);
-            MarkIniSettingsDirty(moving_window);
-            g.NavDisableMouseHover = true;
-        }
-    }
-
-    if (apply_focus_window && (g.NavWindow == NULL || apply_focus_window != g.NavWindow->RootWindow))
-    {
-        ClearActiveID();
-        g.NavDisableHighlight = false;
-        g.NavDisableMouseHover = true;
-        apply_focus_window = NavRestoreLastChildNavWindow(apply_focus_window);
-        ClosePopupsOverWindow(apply_focus_window, false);
-        FocusWindow(apply_focus_window);
-        if (apply_focus_window->NavLastIds[0] == 0)
-            NavInitWindow(apply_focus_window, false);
-
-        if (apply_focus_window->DC.NavLayerActiveMask == (1 << ImGuiNavLayer_Menu))
-            g.NavLayer = ImGuiNavLayer_Menu;
-    }
-    if (apply_focus_window)
-        g.NavWindowingTarget = NULL;
-
-    if (apply_toggle_layer && g.NavWindow)
-    {
-        ImGuiWindow* new_nav_window = g.NavWindow;
-        while (new_nav_window->ParentWindow
-            && (new_nav_window->DC.NavLayerActiveMask & (1 << ImGuiNavLayer_Menu)) == 0
-            && (new_nav_window->Flags & ImGuiWindowFlags_ChildWindow) != 0
-            && (new_nav_window->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu)) == 0)
-            new_nav_window = new_nav_window->ParentWindow;
-        if (new_nav_window != g.NavWindow)
-        {
-            ImGuiWindow* old_nav_window = g.NavWindow;
-            FocusWindow(new_nav_window);
-            new_nav_window->NavLastChildNavWindow = old_nav_window;
-        }
-        g.NavDisableHighlight = false;
-        g.NavDisableMouseHover = true;
-
-        const ImGuiNavLayer new_nav_layer = (g.NavWindow->DC.NavLayerActiveMask & (1 << ImGuiNavLayer_Menu)) ? (ImGuiNavLayer)((int)g.NavLayer ^ 1) : ImGuiNavLayer_Main;
-        NavRestoreLayer(new_nav_layer);
-    }
-}
-
-static const char* GetFallbackWindowNameForWindowingList(ImGuiWindow* window)
-{
-    if (window->Flags & ImGuiWindowFlags_Popup)
-        return "(Popup)";
-    if ((window->Flags & ImGuiWindowFlags_MenuBar) && strcmp(window->Name, "##MainMenuBar") == 0)
-        return "(Main menu bar)";
-    return "(Untitled)";
-}
-
-void ImGui::NavUpdateWindowingOverlay()
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(g.NavWindowingTarget != NULL);
-
-    if (g.NavWindowingTimer < NAV_WINDOWING_LIST_APPEAR_DELAY)
-        return;
-
-    if (g.NavWindowingListWindow == NULL)
-        g.NavWindowingListWindow = FindWindowByName("###NavWindowingList");
-    SetNextWindowSizeConstraints(ImVec2(g.IO.DisplaySize.x * 0.20f, g.IO.DisplaySize.y * 0.20f), ImVec2(FLT_MAX, FLT_MAX));
-    SetNextWindowPos(g.IO.DisplaySize * 0.5f, ImGuiCond_Always, ImVec2(0.5f, 0.5f));
-    PushStyleVar(ImGuiStyleVar_WindowPadding, g.Style.WindowPadding * 2.0f);
-    Begin("###NavWindowingList", NULL, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings);
-    for (int n = g.WindowsFocusOrder.Size - 1; n >= 0; n--)
-    {
-        ImGuiWindow* window = g.WindowsFocusOrder[n];
-        if (!IsWindowNavFocusable(window))
-            continue;
-        const char* label = window->Name;
-        if (label == FindRenderedTextEnd(label))
-            label = GetFallbackWindowNameForWindowingList(window);
-        Selectable(label, g.NavWindowingTarget == window);
-    }
-    End();
-    PopStyleVar();
-}
-
-
-void ImGui::ClearDragDrop()
-{
-    ImGuiContext& g = *GImGui;
-    g.DragDropActive = false;
-    g.DragDropPayload.Clear();
-    g.DragDropAcceptFlags = ImGuiDragDropFlags_None;
-    g.DragDropAcceptIdCurr = g.DragDropAcceptIdPrev = 0;
-    g.DragDropAcceptIdCurrRectSurface = FLT_MAX;
-    g.DragDropAcceptFrameCount = -1;
-
-    g.DragDropPayloadBufHeap.clear();
-    memset(&g.DragDropPayloadBufLocal, 0, sizeof(g.DragDropPayloadBufLocal));
-}
-
-bool ImGui::BeginDragDropSource(ImGuiDragDropFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    bool source_drag_active = false;
-    ImGuiID source_id = 0;
-    ImGuiID source_parent_id = 0;
-    ImGuiMouseButton mouse_button = ImGuiMouseButton_Left;
-    if (!(flags & ImGuiDragDropFlags_SourceExtern))
-    {
-        source_id = window->DC.LastItemId;
-        if (source_id != 0 && g.ActiveId != source_id)       
-            return false;
-        if (g.IO.MouseDown[mouse_button] == false)
-            return false;
-
-        if (source_id == 0)
-        {
-            if (!(flags & ImGuiDragDropFlags_SourceAllowNullID))
-            {
-                IM_ASSERT(0);
-                return false;
-            }
-
-            if ((window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HoveredRect) == 0 && (g.ActiveId == 0 || g.ActiveIdWindow != window))
-                return false;
-
-            source_id = window->DC.LastItemId = window->GetIDFromRectangle(window->DC.LastItemRect);
-            bool is_hovered = ItemHoverable(window->DC.LastItemRect, source_id);
-            if (is_hovered && g.IO.MouseClicked[mouse_button])
-            {
-                SetActiveID(source_id, window);
-                FocusWindow(window);
-            }
-            if (g.ActiveId == source_id)                   
-                g.ActiveIdAllowOverlap = is_hovered;
-        }
-        else
-        {
-            g.ActiveIdAllowOverlap = false;
-        }
-        if (g.ActiveId != source_id)
-            return false;
-        source_parent_id = window->IDStack.back();
-        source_drag_active = IsMouseDragging(mouse_button);
-
-        g.ActiveIdUsingNavDirMask = ~(ImU32)0;
-        g.ActiveIdUsingNavInputMask = ~(ImU32)0;
-        g.ActiveIdUsingKeyInputMask = ~(ImU64)0;
-    }
-    else
-    {
-        window = NULL;
-        source_id = ImHashStr("#SourceExtern");
-        source_drag_active = true;
-    }
-
-    if (source_drag_active)
-    {
-        if (!g.DragDropActive)
-        {
-            IM_ASSERT(source_id != 0);
-            ClearDragDrop();
-            ImGuiPayload& payload = g.DragDropPayload;
-            payload.SourceId = source_id;
-            payload.SourceParentId = source_parent_id;
-            g.DragDropActive = true;
-            g.DragDropSourceFlags = flags;
-            g.DragDropMouseButton = mouse_button;
-            if (payload.SourceId == g.ActiveId)
-                g.ActiveIdNoClearOnFocusLoss = true;
-        }
-        g.DragDropSourceFrameCount = g.FrameCount;
-        g.DragDropWithinSource = true;
-
-        if (!(flags & ImGuiDragDropFlags_SourceNoPreviewTooltip))
-        {
-            BeginTooltip();
-            if (g.DragDropAcceptIdPrev && (g.DragDropAcceptFlags & ImGuiDragDropFlags_AcceptNoPreviewTooltip))
-            {
-                ImGuiWindow* tooltip_window = g.CurrentWindow;
-                tooltip_window->SkipItems = true;
-                tooltip_window->HiddenFramesCanSkipItems = 1;
-            }
-        }
-
-        if (!(flags & ImGuiDragDropFlags_SourceNoDisableHover) && !(flags & ImGuiDragDropFlags_SourceExtern))
-            window->DC.LastItemStatusFlags &= ~ImGuiItemStatusFlags_HoveredRect;
-
-        return true;
-    }
-    return false;
-}
-
-void ImGui::EndDragDropSource()
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(g.DragDropActive);
-    IM_ASSERT(g.DragDropWithinSource && "Not after a BeginDragDropSource()?");
-
-    if (!(g.DragDropSourceFlags & ImGuiDragDropFlags_SourceNoPreviewTooltip))
-        EndTooltip();
-
-    if (g.DragDropPayload.DataFrameCount == -1)
-        ClearDragDrop();
-    g.DragDropWithinSource = false;
-}
-
-bool ImGui::SetDragDropPayload(const char* type, const void* data, size_t data_size, ImGuiCond cond)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiPayload& payload = g.DragDropPayload;
-    if (cond == 0)
-        cond = ImGuiCond_Always;
-
-    IM_ASSERT(type != NULL);
-    IM_ASSERT(strlen(type) < IM_ARRAYSIZE(payload.DataType) && "Payload type can be at most 32 characters long");
-    IM_ASSERT((data != NULL && data_size > 0) || (data == NULL && data_size == 0));
-    IM_ASSERT(cond == ImGuiCond_Always || cond == ImGuiCond_Once);
-    IM_ASSERT(payload.SourceId != 0);                                     
-
-    if (cond == ImGuiCond_Always || payload.DataFrameCount == -1)
-    {
-        ImStrncpy(payload.DataType, type, IM_ARRAYSIZE(payload.DataType));
-        g.DragDropPayloadBufHeap.resize(0);
-        if (data_size > sizeof(g.DragDropPayloadBufLocal))
-        {
-            g.DragDropPayloadBufHeap.resize((int)data_size);
-            payload.Data = g.DragDropPayloadBufHeap.Data;
-            memcpy(payload.Data, data, data_size);
-        }
-        else if (data_size > 0)
-        {
-            memset(&g.DragDropPayloadBufLocal, 0, sizeof(g.DragDropPayloadBufLocal));
-            payload.Data = g.DragDropPayloadBufLocal;
-            memcpy(payload.Data, data, data_size);
-        }
-        else
-        {
-            payload.Data = NULL;
-        }
-        payload.DataSize = (int)data_size;
-    }
-    payload.DataFrameCount = g.FrameCount;
-
-    return (g.DragDropAcceptFrameCount == g.FrameCount) || (g.DragDropAcceptFrameCount == g.FrameCount - 1);
-}
-
-bool ImGui::BeginDragDropTargetCustom(const ImRect& bb, ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    if (!g.DragDropActive)
-        return false;
-
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiWindow* hovered_window = g.HoveredWindowUnderMovingWindow;
-    if (hovered_window == NULL || window->RootWindow != hovered_window->RootWindow)
-        return false;
-    IM_ASSERT(id != 0);
-    if (!IsMouseHoveringRect(bb.Min, bb.Max) || (id == g.DragDropPayload.SourceId))
-        return false;
-    if (window->SkipItems)
-        return false;
-
-    IM_ASSERT(g.DragDropWithinTarget == false);
-    g.DragDropTargetRect = bb;
-    g.DragDropTargetId = id;
-    g.DragDropWithinTarget = true;
-    return true;
-}
-
-bool ImGui::BeginDragDropTarget()
-{
-    ImGuiContext& g = *GImGui;
-    if (!g.DragDropActive)
-        return false;
-
-    ImGuiWindow* window = g.CurrentWindow;
-    if (!(window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HoveredRect))
-        return false;
-    ImGuiWindow* hovered_window = g.HoveredWindowUnderMovingWindow;
-    if (hovered_window == NULL || window->RootWindow != hovered_window->RootWindow)
-        return false;
-
-    const ImRect& display_rect = (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HasDisplayRect) ? window->DC.LastItemDisplayRect : window->DC.LastItemRect;
-    ImGuiID id = window->DC.LastItemId;
-    if (id == 0)
-        id = window->GetIDFromRectangle(display_rect);
-    if (g.DragDropPayload.SourceId == id)
-        return false;
-
-    IM_ASSERT(g.DragDropWithinTarget == false);
-    g.DragDropTargetRect = display_rect;
-    g.DragDropTargetId = id;
-    g.DragDropWithinTarget = true;
-    return true;
-}
-
-bool ImGui::IsDragDropPayloadBeingAccepted()
-{
-    ImGuiContext& g = *GImGui;
-    return g.DragDropActive && g.DragDropAcceptIdPrev != 0;
-}
-
-const ImGuiPayload* ImGui::AcceptDragDropPayload(const char* type, ImGuiDragDropFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiPayload& payload = g.DragDropPayload;
-    IM_ASSERT(g.DragDropActive);                               
-    IM_ASSERT(payload.DataFrameCount != -1);                 
-    if (type != NULL && !payload.IsDataType(type))
-        return NULL;
-
-    const bool was_accepted_previously = (g.DragDropAcceptIdPrev == g.DragDropTargetId);
-    ImRect r = g.DragDropTargetRect;
-    float r_surface = r.GetWidth() * r.GetHeight();
-    if (r_surface <= g.DragDropAcceptIdCurrRectSurface)
-    {
-        g.DragDropAcceptFlags = flags;
-        g.DragDropAcceptIdCurr = g.DragDropTargetId;
-        g.DragDropAcceptIdCurrRectSurface = r_surface;
-    }
-
-    payload.Preview = was_accepted_previously;
-    flags |= (g.DragDropSourceFlags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect);                
-    if (!(flags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect) && payload.Preview)
-    {
-        r.Expand(3.5f);
-        bool push_clip_rect = !window->ClipRect.Contains(r);
-        if (push_clip_rect) window->DrawList->PushClipRect(r.Min - ImVec2(1, 1), r.Max + ImVec2(1, 1));
-        window->DrawList->AddRect(r.Min, r.Max, GetColorU32(ImGuiCol_DragDropTarget), 0.0f, ~0, 2.0f);
-        if (push_clip_rect) window->DrawList->PopClipRect();
-    }
-
-    g.DragDropAcceptFrameCount = g.FrameCount;
-    payload.Delivery = was_accepted_previously && !IsMouseDown(g.DragDropMouseButton);                  
-    if (!payload.Delivery && !(flags & ImGuiDragDropFlags_AcceptBeforeDelivery))
-        return NULL;
-
-    return &payload;
-}
-
-const ImGuiPayload* ImGui::GetDragDropPayload()
-{
-    ImGuiContext& g = *GImGui;
-    return g.DragDropActive ? &g.DragDropPayload : NULL;
-}
-
-void ImGui::EndDragDropTarget()
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(g.DragDropActive);
-    IM_ASSERT(g.DragDropWithinTarget);
-    g.DragDropWithinTarget = false;
-}
-
-void ImGui::LogText(const char* fmt, ...)
-{
-    ImGuiContext& g = *GImGui;
-    if (!g.LogEnabled)
-        return;
-
-    va_list args;
-    va_start(args, fmt);
-    if (g.LogFile)
-    {
-        g.LogBuffer.Buf.resize(0);
-        g.LogBuffer.appendfv(fmt, args);
-        ImFileWrite(g.LogBuffer.c_str(), sizeof(char), (ImU64)g.LogBuffer.size(), g.LogFile);
-    }
-    else
-    {
-        g.LogBuffer.appendfv(fmt, args);
-    }
-    va_end(args);
-}
-
-void ImGui::LogRenderedText(const ImVec2* ref_pos, const char* text, const char* text_end)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    const char* prefix = g.LogNextPrefix;
-    const char* suffix = g.LogNextSuffix;
-    g.LogNextPrefix = g.LogNextSuffix = NULL;
-
-    if (!text_end)
-        text_end = FindRenderedTextEnd(text, text_end);
-
-    const bool log_new_line = ref_pos && (ref_pos->y > g.LogLinePosY + g.Style.FramePadding.y + 1);
-    if (ref_pos)
-        g.LogLinePosY = ref_pos->y;
-    if (log_new_line)
-    {
-        LogText(IM_NEWLINE);
-        g.LogLineFirstItem = true;
-    }
-
-    if (prefix)
-        LogRenderedText(ref_pos, prefix, prefix + strlen(prefix));          
-
-    if (g.LogDepthRef > window->DC.TreeDepth)
-        g.LogDepthRef = window->DC.TreeDepth;
-    const int tree_depth = (window->DC.TreeDepth - g.LogDepthRef);
-
-    const char* text_remaining = text;
-    for (;;)
-    {
-        const char* line_start = text_remaining;
-        const char* line_end = ImStreolRange(line_start, text_end);
-        const bool is_last_line = (line_end == text_end);
-        if (line_start != line_end || !is_last_line)
-        {
-            const int line_length = (int)(line_end - line_start);
-            const int indentation = g.LogLineFirstItem ? tree_depth * 4 : 1;
-            LogText("%*s%.*s", indentation, "", line_length, line_start);
-            g.LogLineFirstItem = false;
-            if (*line_end == '\n')
-            {
-                LogText(IM_NEWLINE);
-                g.LogLineFirstItem = true;
-            }
-        }
-        if (is_last_line)
-            break;
-        text_remaining = line_end + 1;
-    }
-
-    if (suffix)
-        LogRenderedText(ref_pos, suffix, suffix + strlen(suffix));
-}
-
-void ImGui::LogBegin(ImGuiLogType type, int auto_open_depth)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    IM_ASSERT(g.LogEnabled == false);
-    IM_ASSERT(g.LogFile == NULL);
-    IM_ASSERT(g.LogBuffer.empty());
-    g.LogEnabled = true;
-    g.LogType = type;
-    g.LogNextPrefix = g.LogNextSuffix = NULL;
-    g.LogDepthRef = window->DC.TreeDepth;
-    g.LogDepthToExpand = ((auto_open_depth >= 0) ? auto_open_depth : g.LogDepthToExpandDefault);
-    g.LogLinePosY = FLT_MAX;
-    g.LogLineFirstItem = true;
-}
-
-void ImGui::LogSetNextTextDecoration(const char* prefix, const char* suffix)
-{
-    ImGuiContext& g = *GImGui;
-    g.LogNextPrefix = prefix;
-    g.LogNextSuffix = suffix;
-}
-
-void ImGui::LogToTTY(int auto_open_depth)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.LogEnabled)
-        return;
-    IM_UNUSED(auto_open_depth);
-#ifndef IMGUI_DISABLE_TTY_FUNCTIONS
-    LogBegin(ImGuiLogType_TTY, auto_open_depth);
-    g.LogFile = stdout;
-#endif
-}
-
-void ImGui::LogToFile(int auto_open_depth, const char* filename)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.LogEnabled)
-        return;
-
-    if (!filename)
-        filename = g.IO.LogFilename;
-    if (!filename || !filename[0])
-        return;
-    ImFileHandle f = ImFileOpen(filename, "ab");
-    if (!f)
-    {
-        IM_ASSERT(0);
-        return;
-    }
-
-    LogBegin(ImGuiLogType_File, auto_open_depth);
-    g.LogFile = f;
-}
-
-void ImGui::LogToClipboard(int auto_open_depth)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.LogEnabled)
-        return;
-    LogBegin(ImGuiLogType_Clipboard, auto_open_depth);
-}
-
-void ImGui::LogToBuffer(int auto_open_depth)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.LogEnabled)
-        return;
-    LogBegin(ImGuiLogType_Buffer, auto_open_depth);
-}
-
-void ImGui::LogFinish()
-{
-    ImGuiContext& g = *GImGui;
-    if (!g.LogEnabled)
-        return;
-
-    LogText(IM_NEWLINE);
-    switch (g.LogType)
-    {
-    case ImGuiLogType_TTY:
-#ifndef IMGUI_DISABLE_TTY_FUNCTIONS
-        fflush(g.LogFile);
-#endif
-        break;
-    case ImGuiLogType_File:
-        ImFileClose(g.LogFile);
-        break;
-    case ImGuiLogType_Buffer:
-        break;
-    case ImGuiLogType_Clipboard:
-        if (!g.LogBuffer.empty())
-            SetClipboardText(g.LogBuffer.begin());
-        break;
-    case ImGuiLogType_None:
-        IM_ASSERT(0);
-        break;
-    }
-
-    g.LogEnabled = false;
-    g.LogType = ImGuiLogType_None;
-    g.LogFile = NULL;
-    g.LogBuffer.clear();
-}
-
-void ImGui::LogButtons()
-{
-    ImGuiContext& g = *GImGui;
-
-    PushID("LogButtons");
-#ifndef IMGUI_DISABLE_TTY_FUNCTIONS
-    const bool log_to_tty = Button("Log To TTY"); SameLine();
-#else
-    const bool log_to_tty = false;
-#endif
-    const bool log_to_file = Button("Log To File"); SameLine();
-    const bool log_to_clipboard = Button("Log To Clipboard"); SameLine();
-    PushAllowKeyboardFocus(false);
-    SetNextItemWidth(80.0f);
-    SliderInt("Default Depth", &g.LogDepthToExpandDefault, 0, 9, NULL);
-    PopAllowKeyboardFocus();
-    PopID();
-
-    if (log_to_tty)
-        LogToTTY();
-    if (log_to_file)
-        LogToFile();
-    if (log_to_clipboard)
-        LogToClipboard();
-}
-
-
-void ImGui::UpdateSettings()
-{
-    ImGuiContext& g = *GImGui;
-    if (!g.SettingsLoaded)
-    {
-        IM_ASSERT(g.SettingsWindows.empty());
-        if (g.IO.IniFilename)
-            LoadIniSettingsFromDisk(g.IO.IniFilename);
-        g.SettingsLoaded = true;
-    }
-
-    if (g.SettingsDirtyTimer > 0.0f)
-    {
-        g.SettingsDirtyTimer -= g.IO.DeltaTime;
-        if (g.SettingsDirtyTimer <= 0.0f)
-        {
-            if (g.IO.IniFilename != NULL)
-                SaveIniSettingsToDisk(g.IO.IniFilename);
-            else
-                g.IO.WantSaveIniSettings = true;                
-            g.SettingsDirtyTimer = 0.0f;
-        }
-    }
-}
-
-void ImGui::MarkIniSettingsDirty()
-{
-    ImGuiContext& g = *GImGui;
-    if (g.SettingsDirtyTimer <= 0.0f)
-        g.SettingsDirtyTimer = g.IO.IniSavingRate;
-}
-
-void ImGui::MarkIniSettingsDirty(ImGuiWindow* window)
-{
-    ImGuiContext& g = *GImGui;
-    if (!(window->Flags & ImGuiWindowFlags_NoSavedSettings))
-        if (g.SettingsDirtyTimer <= 0.0f)
-            g.SettingsDirtyTimer = g.IO.IniSavingRate;
-}
-
-ImGuiWindowSettings* ImGui::CreateNewWindowSettings(const char* name)
-{
-    ImGuiContext& g = *GImGui;
-
-#if !IMGUI_DEBUG_INI_SETTINGS
-    if (const char* p = strstr(name, "###"))
-        name = p;
-#endif
-    const size_t name_len = strlen(name);
-
-    const size_t chunk_size = sizeof(ImGuiWindowSettings) + name_len + 1;
-    ImGuiWindowSettings* settings = g.SettingsWindows.alloc_chunk(chunk_size);
-    IM_PLACEMENT_NEW(settings) ImGuiWindowSettings();
-    settings->ID = ImHashStr(name, name_len);
-    memcpy(settings->GetName(), name, name_len + 1);       
-
-    return settings;
-}
-
-ImGuiWindowSettings* ImGui::FindWindowSettings(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings))
-        if (settings->ID == id)
-            return settings;
-    return NULL;
-}
-
-ImGuiWindowSettings* ImGui::FindOrCreateWindowSettings(const char* name)
-{
-    if (ImGuiWindowSettings* settings = FindWindowSettings(ImHashStr(name)))
-        return settings;
-    return CreateNewWindowSettings(name);
-}
-
-ImGuiSettingsHandler* ImGui::FindSettingsHandler(const char* type_name)
-{
-    ImGuiContext& g = *GImGui;
-    const ImGuiID type_hash = ImHashStr(type_name);
-    for (int handler_n = 0; handler_n < g.SettingsHandlers.Size; handler_n++)
-        if (g.SettingsHandlers[handler_n].TypeHash == type_hash)
-            return &g.SettingsHandlers[handler_n];
-    return NULL;
-}
-
-void ImGui::ClearIniSettings()
-{
-    ImGuiContext& g = *GImGui;
-    g.SettingsIniData.clear();
-    for (int handler_n = 0; handler_n < g.SettingsHandlers.Size; handler_n++)
-        if (g.SettingsHandlers[handler_n].ClearAllFn)
-            g.SettingsHandlers[handler_n].ClearAllFn(&g, &g.SettingsHandlers[handler_n]);
-}
-
-void ImGui::LoadIniSettingsFromDisk(const char* ini_filename)
-{
-    size_t file_data_size = 0;
-    char* file_data = (char*)ImFileLoadToMemory(ini_filename, "rb", &file_data_size);
-    if (!file_data)
-        return;
-    LoadIniSettingsFromMemory(file_data, (size_t)file_data_size);
-    IM_FREE(file_data);
-}
-
-void ImGui::LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(g.Initialized);
-    if (ini_size == 0)
-        ini_size = strlen(ini_data);
-    g.SettingsIniData.Buf.resize((int)ini_size + 1);
-    char* const buf = g.SettingsIniData.Buf.Data;
-    char* const buf_end = buf + ini_size;
-    memcpy(buf, ini_data, ini_size);
-    buf_end[0] = 0;
-
-    for (int handler_n = 0; handler_n < g.SettingsHandlers.Size; handler_n++)
-        if (g.SettingsHandlers[handler_n].ReadInitFn)
-            g.SettingsHandlers[handler_n].ReadInitFn(&g, &g.SettingsHandlers[handler_n]);
-
-    void* entry_data = NULL;
-    ImGuiSettingsHandler* entry_handler = NULL;
-
-    char* line_end = NULL;
-    for (char* line = buf; line < buf_end; line = line_end + 1)
-    {
-        while (*line == '\n' || *line == '\r')
-            line++;
-        line_end = line;
-        while (line_end < buf_end && *line_end != '\n' && *line_end != '\r')
-            line_end++;
-        line_end[0] = 0;
-        if (line[0] == ';')
-            continue;
-        if (line[0] == '[' && line_end > line && line_end[-1] == ']')
-        {
-            line_end[-1] = 0;
-            const char* name_end = line_end - 1;
-            const char* type_start = line + 1;
-            char* type_end = (char*)(void*)ImStrchrRange(type_start, name_end, ']');
-            const char* name_start = type_end ? ImStrchrRange(type_end + 1, name_end, '[') : NULL;
-            if (!type_end || !name_start)
-                continue;
-            *type_end = 0;    
-            name_start++;     
-            entry_handler = FindSettingsHandler(type_start);
-            entry_data = entry_handler ? entry_handler->ReadOpenFn(&g, entry_handler, name_start) : NULL;
-        }
-        else if (entry_handler != NULL && entry_data != NULL)
-        {
-            entry_handler->ReadLineFn(&g, entry_handler, entry_data, line);
-        }
-    }
-    g.SettingsLoaded = true;
-
-    memcpy(buf, ini_data, ini_size);
-
-    for (int handler_n = 0; handler_n < g.SettingsHandlers.Size; handler_n++)
-        if (g.SettingsHandlers[handler_n].ApplyAllFn)
-            g.SettingsHandlers[handler_n].ApplyAllFn(&g, &g.SettingsHandlers[handler_n]);
-}
-
-void ImGui::SaveIniSettingsToDisk(const char* ini_filename)
-{
-    ImGuiContext& g = *GImGui;
-    g.SettingsDirtyTimer = 0.0f;
-    if (!ini_filename)
-        return;
-
-    size_t ini_data_size = 0;
-    const char* ini_data = SaveIniSettingsToMemory(&ini_data_size);
-    ImFileHandle f = ImFileOpen(ini_filename, "wt");
-    if (!f)
-        return;
-    ImFileWrite(ini_data, sizeof(char), ini_data_size, f);
-    ImFileClose(f);
-}
-
-const char* ImGui::SaveIniSettingsToMemory(size_t* out_size)
-{
-    ImGuiContext& g = *GImGui;
-    g.SettingsDirtyTimer = 0.0f;
-    g.SettingsIniData.Buf.resize(0);
-    g.SettingsIniData.Buf.push_back(0);
-    for (int handler_n = 0; handler_n < g.SettingsHandlers.Size; handler_n++)
-    {
-        ImGuiSettingsHandler* handler = &g.SettingsHandlers[handler_n];
-        handler->WriteAllFn(&g, handler, &g.SettingsIniData);
-    }
-    if (out_size)
-        *out_size = (size_t)g.SettingsIniData.size();
-    return g.SettingsIniData.c_str();
-}
-
-static void WindowSettingsHandler_ClearAll(ImGuiContext* ctx, ImGuiSettingsHandler*)
-{
-    ImGuiContext& g = *ctx;
-    for (int i = 0; i != g.Windows.Size; i++)
-        g.Windows[i]->SettingsOffset = -1;
-    g.SettingsWindows.clear();
-}
-
-static void* WindowSettingsHandler_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name)
-{
-    ImGuiWindowSettings* settings = ImGui::FindOrCreateWindowSettings(name);
-    ImGuiID id = settings->ID;
-    *settings = ImGuiWindowSettings();       
-    settings->ID = id;
-    settings->WantApply = true;
-    return (void*)settings;
-}
-
-static void WindowSettingsHandler_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line)
-{
-    ImGuiWindowSettings* settings = (ImGuiWindowSettings*)entry;
-    int x, y;
-    int i;
-    if (sscanf(line, "Pos=%i,%i", &x, &y) == 2)         { settings->Pos = ImVec2ih((short)x, (short)y); }
-    else if (sscanf(line, "Size=%i,%i", &x, &y) == 2)   { settings->Size = ImVec2ih((short)x, (short)y); }
-    else if (sscanf(line, "Collapsed=%d", &i) == 1)     { settings->Collapsed = (i != 0); }
-}
-
-static void WindowSettingsHandler_ApplyAll(ImGuiContext* ctx, ImGuiSettingsHandler*)
-{
-    ImGuiContext& g = *ctx;
-    for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings))
-        if (settings->WantApply)
-        {
-            if (ImGuiWindow* window = ImGui::FindWindowByID(settings->ID))
-                ApplyWindowSettings(window, settings);
-            settings->WantApply = false;
-        }
-}
-
-static void WindowSettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf)
-{
-    ImGuiContext& g = *ctx;
-    for (int i = 0; i != g.Windows.Size; i++)
-    {
-        ImGuiWindow* window = g.Windows[i];
-        if (window->Flags & ImGuiWindowFlags_NoSavedSettings)
-            continue;
-
-        ImGuiWindowSettings* settings = (window->SettingsOffset != -1) ? g.SettingsWindows.ptr_from_offset(window->SettingsOffset) : ImGui::FindWindowSettings(window->ID);
-        if (!settings)
-        {
-            settings = ImGui::CreateNewWindowSettings(window->Name);
-            window->SettingsOffset = g.SettingsWindows.offset_from_ptr(settings);
-        }
-        IM_ASSERT(settings->ID == window->ID);
-        settings->Pos = ImVec2ih((short)window->Pos.x, (short)window->Pos.y);
-        settings->Size = ImVec2ih((short)window->SizeFull.x, (short)window->SizeFull.y);
-        settings->Collapsed = window->Collapsed;
-    }
-
-    buf->reserve(buf->size() + g.SettingsWindows.size() * 6);   
-    for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings))
-    {
-        const char* settings_name = settings->GetName();
-        buf->appendf("[%s][%s]\n", handler->TypeName, settings_name);
-        buf->appendf("Pos=%d,%d\n", settings->Pos.x, settings->Pos.y);
-        buf->appendf("Size=%d,%d\n", settings->Size.x, settings->Size.y);
-        buf->appendf("Collapsed=%d\n", settings->Collapsed);
-        buf->append("\n");
-    }
-}
-
-
-
-
-#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS)
-
-#ifdef _MSC_VER
-#pragma comment(lib, "user32")
-#pragma comment(lib, "kernel32")
-#endif
-
-static const char* GetClipboardTextFn_DefaultImpl(void*)
-{
-    ImGuiContext& g = *GImGui;
-    g.ClipboardHandlerData.clear();
-    if (!::OpenClipboard(NULL))
-        return NULL;
-    HANDLE wbuf_handle = ::GetClipboardData(CF_UNICODETEXT);
-    if (wbuf_handle == NULL)
-    {
-        ::CloseClipboard();
-        return NULL;
-    }
-    if (const WCHAR* wbuf_global = (const WCHAR*)::GlobalLock(wbuf_handle))
-    {
-        int buf_len = ::WideCharToMultiByte(CP_UTF8, 0, wbuf_global, -1, NULL, 0, NULL, NULL);
-        g.ClipboardHandlerData.resize(buf_len);
-        ::WideCharToMultiByte(CP_UTF8, 0, wbuf_global, -1, g.ClipboardHandlerData.Data, buf_len, NULL, NULL);
-    }
-    ::GlobalUnlock(wbuf_handle);
-    ::CloseClipboard();
-    return g.ClipboardHandlerData.Data;
-}
-
-static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
-{
-    if (!::OpenClipboard(NULL))
-        return;
-    const int wbuf_length = ::MultiByteToWideChar(CP_UTF8, 0, text, -1, NULL, 0);
-    HGLOBAL wbuf_handle = ::GlobalAlloc(GMEM_MOVEABLE, (SIZE_T)wbuf_length * sizeof(WCHAR));
-    if (wbuf_handle == NULL)
-    {
-        ::CloseClipboard();
-        return;
-    }
-    WCHAR* wbuf_global = (WCHAR*)::GlobalLock(wbuf_handle);
-    ::MultiByteToWideChar(CP_UTF8, 0, text, -1, wbuf_global, wbuf_length);
-    ::GlobalUnlock(wbuf_handle);
-    ::EmptyClipboard();
-    if (::SetClipboardData(CF_UNICODETEXT, wbuf_handle) == NULL)
-        ::GlobalFree(wbuf_handle);
-    ::CloseClipboard();
-}
-
-#elif defined(__APPLE__) && TARGET_OS_OSX && defined(IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS)
-
-#include <Carbon/Carbon.h>            
-static PasteboardRef main_clipboard = 0;
-
-static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
-{
-    if (!main_clipboard)
-        PasteboardCreate(kPasteboardClipboard, &main_clipboard);
-    PasteboardClear(main_clipboard);
-    CFDataRef cf_data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)text, strlen(text));
-    if (cf_data)
-    {
-        PasteboardPutItemFlavor(main_clipboard, (PasteboardItemID)1, CFSTR("public.utf8-plain-text"), cf_data, 0);
-        CFRelease(cf_data);
-    }
-}
-
-static const char* GetClipboardTextFn_DefaultImpl(void*)
-{
-    if (!main_clipboard)
-        PasteboardCreate(kPasteboardClipboard, &main_clipboard);
-    PasteboardSynchronize(main_clipboard);
-
-    ItemCount item_count = 0;
-    PasteboardGetItemCount(main_clipboard, &item_count);
-    for (ItemCount i = 0; i < item_count; i++)
-    {
-        PasteboardItemID item_id = 0;
-        PasteboardGetItemIdentifier(main_clipboard, i + 1, &item_id);
-        CFArrayRef flavor_type_array = 0;
-        PasteboardCopyItemFlavors(main_clipboard, item_id, &flavor_type_array);
-        for (CFIndex j = 0, nj = CFArrayGetCount(flavor_type_array); j < nj; j++)
-        {
-            CFDataRef cf_data;
-            if (PasteboardCopyItemFlavorData(main_clipboard, item_id, CFSTR("public.utf8-plain-text"), &cf_data) == noErr)
-            {
-                ImGuiContext& g = *GImGui;
-                g.ClipboardHandlerData.clear();
-                int length = (int)CFDataGetLength(cf_data);
-                g.ClipboardHandlerData.resize(length + 1);
-                CFDataGetBytes(cf_data, CFRangeMake(0, length), (UInt8*)g.ClipboardHandlerData.Data);
-                g.ClipboardHandlerData[length] = 0;
-                CFRelease(cf_data);
-                return g.ClipboardHandlerData.Data;
-            }
-        }
-    }
-    return NULL;
-}
-
-#else
-
-static const char* GetClipboardTextFn_DefaultImpl(void*)
-{
-    ImGuiContext& g = *GImGui;
-    return g.ClipboardHandlerData.empty() ? NULL : g.ClipboardHandlerData.begin();
-}
-
-static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
-{
-    ImGuiContext& g = *GImGui;
-    g.ClipboardHandlerData.clear();
-    const char* text_end = text + strlen(text);
-    g.ClipboardHandlerData.resize((int)(text_end - text) + 1);
-    memcpy(&g.ClipboardHandlerData[0], text, (size_t)(text_end - text));
-    g.ClipboardHandlerData[(int)(text_end - text)] = 0;
-}
-
-#endif
-
-#if defined(_WIN32) && !defined(__GNUC__) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS)
-
-#include <imm.h>
-#ifdef _MSC_VER
-#pragma comment(lib, "imm32")
-#endif
-
-static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y)
-{
-    ImGuiIO& io = ImGui::GetIO();
-    if (HWND hwnd = (HWND)io.ImeWindowHandle)
-        if (HIMC himc = ::ImmGetContext(hwnd))
-        {
-            COMPOSITIONFORM cf;
-            cf.ptCurrentPos.x = x;
-            cf.ptCurrentPos.y = y;
-            cf.dwStyle = CFS_FORCE_POSITION;
-            ::ImmSetCompositionWindow(himc, &cf);
-            ::ImmReleaseContext(hwnd, himc);
-        }
-}
-
-#else
-
-static void ImeSetInputScreenPosFn_DefaultImpl(int, int) {}
-
-#endif
-
-#ifndef IMGUI_DISABLE_METRICS_WINDOW
-
-static void MetricsHelpMarker(const char* desc)
-{
-    ImGui::TextDisabled("(?)");
-    if (ImGui::IsItemHovered())
-    {
-        ImGui::BeginTooltip();
-        ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f);
-        ImGui::TextUnformatted(desc);
-        ImGui::PopTextWrapPos();
-        ImGui::EndTooltip();
-    }
-}
-
-void ImGui::ShowMetricsWindow(bool* p_open)
-{
-    if (!Begin("Dear ImGui Metrics/Debugger", p_open))
-    {
-        End();
-        return;
-    }
-
-    ImGuiContext& g = *GImGui;
-    ImGuiIO& io = g.IO;
-    ImGuiMetricsConfig* cfg = &g.DebugMetricsConfig;
-
-    Text("Dear ImGui %s", ImGui::GetVersion());
-    Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
-    Text("%d vertices, %d indices (%d triangles)", io.MetricsRenderVertices, io.MetricsRenderIndices, io.MetricsRenderIndices / 3);
-    Text("%d active windows (%d visible)", io.MetricsActiveWindows, io.MetricsRenderWindows);
-    Text("%d active allocations", io.MetricsActiveAllocations);
-    Separator();
-
-    enum { WRT_OuterRect, WRT_OuterRectClipped, WRT_InnerRect, WRT_InnerClipRect, WRT_WorkRect, WRT_Content, WRT_ContentIdeal, WRT_ContentRegionRect, WRT_Count };    
-    const char* wrt_rects_names[WRT_Count] = { "OuterRect", "OuterRectClipped", "InnerRect", "InnerClipRect", "WorkRect", "Content", "ContentIdeal", "ContentRegionRect" };
-    enum { TRT_OuterRect, TRT_InnerRect, TRT_WorkRect, TRT_HostClipRect, TRT_InnerClipRect, TRT_BackgroundClipRect, TRT_ColumnsRect, TRT_ColumnsWorkRect, TRT_ColumnsClipRect, TRT_ColumnsContentHeadersUsed, TRT_ColumnsContentHeadersIdeal, TRT_ColumnsContentFrozen, TRT_ColumnsContentUnfrozen, TRT_Count };    
-    const char* trt_rects_names[TRT_Count] = { "OuterRect", "InnerRect", "WorkRect", "HostClipRect", "InnerClipRect", "BackgroundClipRect", "ColumnsRect", "ColumnsWorkRect", "ColumnsClipRect", "ColumnsContentHeadersUsed", "ColumnsContentHeadersIdeal", "ColumnsContentFrozen", "ColumnsContentUnfrozen" };
-    if (cfg->ShowWindowsRectsType < 0)
-        cfg->ShowWindowsRectsType = WRT_WorkRect;
-    if (cfg->ShowTablesRectsType < 0)
-        cfg->ShowTablesRectsType = TRT_WorkRect;
-
-    struct Funcs
-    {
-        static ImRect GetTableRect(ImGuiTable* table, int rect_type, int n)
-        {
-            if (rect_type == TRT_OuterRect)                     { return table->OuterRect; }
-            else if (rect_type == TRT_InnerRect)                { return table->InnerRect; }
-            else if (rect_type == TRT_WorkRect)                 { return table->WorkRect; }
-            else if (rect_type == TRT_HostClipRect)             { return table->HostClipRect; }
-            else if (rect_type == TRT_InnerClipRect)            { return table->InnerClipRect; }
-            else if (rect_type == TRT_BackgroundClipRect)       { return table->BgClipRect; }
-            else if (rect_type == TRT_ColumnsRect)              { ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->MinX, table->InnerClipRect.Min.y, c->MaxX, table->InnerClipRect.Min.y + table->LastOuterHeight); }
-            else if (rect_type == TRT_ColumnsWorkRect)          { ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->WorkMinX, table->WorkRect.Min.y, c->WorkMaxX, table->WorkRect.Max.y); }
-            else if (rect_type == TRT_ColumnsClipRect)          { ImGuiTableColumn* c = &table->Columns[n]; return c->ClipRect; }
-            else if (rect_type == TRT_ColumnsContentHeadersUsed){ ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->WorkMinX, table->InnerClipRect.Min.y, c->ContentMaxXHeadersUsed, table->InnerClipRect.Min.y + table->LastFirstRowHeight); }      
-            else if (rect_type == TRT_ColumnsContentHeadersIdeal){ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->WorkMinX, table->InnerClipRect.Min.y, c->ContentMaxXHeadersIdeal, table->InnerClipRect.Min.y + table->LastFirstRowHeight); }
-            else if (rect_type == TRT_ColumnsContentFrozen)     { ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->WorkMinX, table->InnerClipRect.Min.y, c->ContentMaxXFrozen, table->InnerClipRect.Min.y + table->LastFirstRowHeight); }
-            else if (rect_type == TRT_ColumnsContentUnfrozen)   { ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->WorkMinX, table->InnerClipRect.Min.y + table->LastFirstRowHeight, c->ContentMaxXUnfrozen, table->InnerClipRect.Max.y); }
-            IM_ASSERT(0);
-            return ImRect();
-        }
-
-        static ImRect GetWindowRect(ImGuiWindow* window, int rect_type)
-        {
-            if (rect_type == WRT_OuterRect)                 { return window->Rect(); }
-            else if (rect_type == WRT_OuterRectClipped)     { return window->OuterRectClipped; }
-            else if (rect_type == WRT_InnerRect)            { return window->InnerRect; }
-            else if (rect_type == WRT_InnerClipRect)        { return window->InnerClipRect; }
-            else if (rect_type == WRT_WorkRect)             { return window->WorkRect; }
-            else if (rect_type == WRT_Content)       { ImVec2 min = window->InnerRect.Min - window->Scroll + window->WindowPadding; return ImRect(min, min + window->ContentSize); }
-            else if (rect_type == WRT_ContentIdeal)         { ImVec2 min = window->InnerRect.Min - window->Scroll + window->WindowPadding; return ImRect(min, min + window->ContentSizeIdeal); }
-            else if (rect_type == WRT_ContentRegionRect)    { return window->ContentRegionRect; }
-            IM_ASSERT(0);
-            return ImRect();
-        }
-    };
-
-    if (TreeNode("Tools"))
-    {
-        if (Button("Item Picker.."))
-            DebugStartItemPicker();
-        SameLine();
-        MetricsHelpMarker("Will call the IM_DEBUG_BREAK() macro to break in debugger.\nWarning: If you don't have a debugger attached, this will probably crash.");
-
-        Checkbox("Show windows begin order", &cfg->ShowWindowsBeginOrder);
-        Checkbox("Show windows rectangles", &cfg->ShowWindowsRects);
-        SameLine();
-        SetNextItemWidth(GetFontSize() * 12);
-        cfg->ShowWindowsRects |= Combo("##show_windows_rect_type", &cfg->ShowWindowsRectsType, wrt_rects_names, WRT_Count, WRT_Count);
-        if (cfg->ShowWindowsRects && g.NavWindow != NULL)
-        {
-            BulletText("'%s':", g.NavWindow->Name);
-            Indent();
-            for (int rect_n = 0; rect_n < WRT_Count; rect_n++)
-            {
-                ImRect r = Funcs::GetWindowRect(g.NavWindow, rect_n);
-                Text("(%6.1f,%6.1f) (%6.1f,%6.1f) Size (%6.1f,%6.1f) %s", r.Min.x, r.Min.y, r.Max.x, r.Max.y, r.GetWidth(), r.GetHeight(), wrt_rects_names[rect_n]);
-            }
-            Unindent();
-        }
-        Checkbox("Show ImDrawCmd mesh when hovering", &cfg->ShowDrawCmdMesh);
-        Checkbox("Show ImDrawCmd bounding boxes when hovering", &cfg->ShowDrawCmdBoundingBoxes);
-
-        Checkbox("Show tables rectangles", &cfg->ShowTablesRects);
-        SameLine();
-        SetNextItemWidth(GetFontSize() * 12);
-        cfg->ShowTablesRects |= Combo("##show_table_rects_type", &cfg->ShowTablesRectsType, trt_rects_names, TRT_Count, TRT_Count);
-        if (cfg->ShowTablesRects && g.NavWindow != NULL)
-        {
-            for (int table_n = 0; table_n < g.Tables.GetSize(); table_n++)
-            {
-                ImGuiTable* table = g.Tables.GetByIndex(table_n);
-                if (table->LastFrameActive < g.FrameCount - 1 || (table->OuterWindow != g.NavWindow && table->InnerWindow != g.NavWindow))
-                    continue;
-
-                BulletText("Table 0x%08X (%d columns, in '%s')", table->ID, table->ColumnsCount, table->OuterWindow->Name);
-                if (IsItemHovered())
-                    GetForegroundDrawList()->AddRect(table->OuterRect.Min - ImVec2(1, 1), table->OuterRect.Max + ImVec2(1, 1), IM_COL32(255, 255, 0, 255), 0.0f, ~0, 2.0f);
-                Indent();
-                char buf[128];
-                for (int rect_n = 0; rect_n < TRT_Count; rect_n++)
-                {
-                    if (rect_n >= TRT_ColumnsRect)
-                    {
-                        if (rect_n != TRT_ColumnsRect && rect_n != TRT_ColumnsClipRect)
-                            continue;
-                        for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-                        {
-                            ImRect r = Funcs::GetTableRect(table, rect_n, column_n);
-                            ImFormatString(buf, IM_ARRAYSIZE(buf), "(%6.1f,%6.1f) (%6.1f,%6.1f) Size (%6.1f,%6.1f) Col %d %s", r.Min.x, r.Min.y, r.Max.x, r.Max.y, r.GetWidth(), r.GetHeight(), column_n, trt_rects_names[rect_n]);
-                            Selectable(buf);
-                            if (IsItemHovered())
-                                GetForegroundDrawList()->AddRect(r.Min - ImVec2(1, 1), r.Max + ImVec2(1, 1), IM_COL32(255, 255, 0, 255), 0.0f, ~0, 2.0f);
-                        }
-                    }
-                    else
-                    {
-                        ImRect r = Funcs::GetTableRect(table, rect_n, -1);
-                        ImFormatString(buf, IM_ARRAYSIZE(buf), "(%6.1f,%6.1f) (%6.1f,%6.1f) Size (%6.1f,%6.1f) %s", r.Min.x, r.Min.y, r.Max.x, r.Max.y, r.GetWidth(), r.GetHeight(), trt_rects_names[rect_n]);
-                        Selectable(buf);
-                        if (IsItemHovered())
-                            GetForegroundDrawList()->AddRect(r.Min - ImVec2(1, 1), r.Max + ImVec2(1, 1), IM_COL32(255, 255, 0, 255), 0.0f, ~0, 2.0f);
-                    }
-                }
-                Unindent();
-            }
-        }
-
-        TreePop();
-    }
-
-    DebugNodeWindowsList(&g.Windows, "Windows");
-    if (TreeNode("DrawLists", "Active DrawLists (%d)", g.DrawDataBuilder.Layers[0].Size))
-    {
-        for (int i = 0; i < g.DrawDataBuilder.Layers[0].Size; i++)
-            DebugNodeDrawList(NULL, g.DrawDataBuilder.Layers[0][i], "DrawList");
-        TreePop();
-    }
-
-    if (TreeNode("Popups", "Popups (%d)", g.OpenPopupStack.Size))
-    {
-        for (int i = 0; i < g.OpenPopupStack.Size; i++)
-        {
-            ImGuiWindow* window = g.OpenPopupStack[i].Window;
-            BulletText("PopupID: %08x, Window: '%s'%s%s", g.OpenPopupStack[i].PopupId, window ? window->Name : "NULL", window && (window->Flags & ImGuiWindowFlags_ChildWindow) ? " ChildWindow" : "", window && (window->Flags & ImGuiWindowFlags_ChildMenu) ? " ChildMenu" : "");
-        }
-        TreePop();
-    }
-
-    if (TreeNode("TabBars", "Tab Bars (%d)", g.TabBars.GetSize()))
-    {
-        for (int n = 0; n < g.TabBars.GetSize(); n++)
-            DebugNodeTabBar(g.TabBars.GetByIndex(n), "TabBar");
-        TreePop();
-    }
-
-#ifdef IMGUI_HAS_TABLE
-    if (TreeNode("Tables", "Tables (%d)", g.Tables.GetSize()))
-    {
-        for (int n = 0; n < g.Tables.GetSize(); n++)
-            DebugNodeTable(g.Tables.GetByIndex(n));
-        TreePop();
-    }
-#endif   
-
-#ifdef IMGUI_HAS_DOCK
-    if (TreeNode("Docking"))
-    {
-        TreePop();
-    }
-#endif   
-
-    if (TreeNode("Settings"))
-    {
-        if (SmallButton("Clear"))
-            ClearIniSettings();
-        SameLine();
-        if (SmallButton("Save to memory"))
-            SaveIniSettingsToMemory();
-        SameLine();
-        if (SmallButton("Save to disk"))
-            SaveIniSettingsToDisk(g.IO.IniFilename);
-        SameLine();
-        if (g.IO.IniFilename)
-            Text("\"%s\"", g.IO.IniFilename);
-        else
-            TextUnformatted("<NULL>");
-        Text("SettingsDirtyTimer %.2f", g.SettingsDirtyTimer);
-        if (TreeNode("SettingsHandlers", "Settings handlers: (%d)", g.SettingsHandlers.Size))
-        {
-            for (int n = 0; n < g.SettingsHandlers.Size; n++)
-                BulletText("%s", g.SettingsHandlers[n].TypeName);
-            TreePop();
-        }
-        if (TreeNode("SettingsWindows", "Settings packed data: Windows: %d bytes", g.SettingsWindows.size()))
-        {
-            for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings))
-                DebugNodeWindowSettings(settings);
-            TreePop();
-        }
-
-#ifdef IMGUI_HAS_TABLE
-        if (TreeNode("SettingsTables", "Settings packed data: Tables: %d bytes", g.SettingsTables.size()))
-        {
-            for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings))
-                DebugNodeTableSettings(settings);
-            TreePop();
-        }
-#endif   
-
-#ifdef IMGUI_HAS_DOCK
-#endif   
-
-        if (TreeNode("SettingsIniData", "Settings unpacked data (.ini): %d bytes", g.SettingsIniData.size()))
-        {
-            InputTextMultiline("##Ini", (char*)(void*)g.SettingsIniData.c_str(), g.SettingsIniData.Buf.Size, ImVec2(-FLT_MIN, GetTextLineHeight() * 20), ImGuiInputTextFlags_ReadOnly);
-            TreePop();
-        }
-        TreePop();
-    }
-
-    if (TreeNode("Internal state"))
-    {
-        const char* input_source_names[] = { "None", "Mouse", "Nav", "NavKeyboard", "NavGamepad" }; IM_ASSERT(IM_ARRAYSIZE(input_source_names) == ImGuiInputSource_COUNT);
-
-        Text("WINDOWING");
-        Indent();
-        Text("HoveredWindow: '%s'", g.HoveredWindow ? g.HoveredWindow->Name : "NULL");
-        Text("HoveredRootWindow: '%s'", g.HoveredRootWindow ? g.HoveredRootWindow->Name : "NULL");
-        Text("HoveredWindowUnderMovingWindow: '%s'", g.HoveredWindowUnderMovingWindow ? g.HoveredWindowUnderMovingWindow->Name : "NULL");
-        Text("MovingWindow: '%s'", g.MovingWindow ? g.MovingWindow->Name : "NULL");
-        Unindent();
-
-        Text("ITEMS");
-        Indent();
-        Text("ActiveId: 0x%08X/0x%08X (%.2f sec), AllowOverlap: %d, Source: %s", g.ActiveId, g.ActiveIdPreviousFrame, g.ActiveIdTimer, g.ActiveIdAllowOverlap, input_source_names[g.ActiveIdSource]);
-        Text("ActiveIdWindow: '%s'", g.ActiveIdWindow ? g.ActiveIdWindow->Name : "NULL");
-        Text("HoveredId: 0x%08X/0x%08X (%.2f sec), AllowOverlap: %d", g.HoveredId, g.HoveredIdPreviousFrame, g.HoveredIdTimer, g.HoveredIdAllowOverlap);                     
-        Text("DragDrop: %d, SourceId = 0x%08X, Payload \"%s\" (%d bytes)", g.DragDropActive, g.DragDropPayload.SourceId, g.DragDropPayload.DataType, g.DragDropPayload.DataSize);
-        Unindent();
-
-        Text("NAV,FOCUS");
-        Indent();
-        Text("NavWindow: '%s'", g.NavWindow ? g.NavWindow->Name : "NULL");
-        Text("NavId: 0x%08X, NavLayer: %d", g.NavId, g.NavLayer);
-        Text("NavInputSource: %s", input_source_names[g.NavInputSource]);
-        Text("NavActive: %d, NavVisible: %d", g.IO.NavActive, g.IO.NavVisible);
-        Text("NavActivateId: 0x%08X, NavInputId: 0x%08X", g.NavActivateId, g.NavInputId);
-        Text("NavDisableHighlight: %d, NavDisableMouseHover: %d", g.NavDisableHighlight, g.NavDisableMouseHover);
-        Text("NavFocusScopeId = 0x%08X", g.NavFocusScopeId);
-        Text("NavWindowingTarget: '%s'", g.NavWindowingTarget ? g.NavWindowingTarget->Name : "NULL");
-        Unindent();
-
-        TreePop();
-    }
-
-    if (cfg->ShowWindowsRects || cfg->ShowWindowsBeginOrder)
-    {
-        for (int n = 0; n < g.Windows.Size; n++)
-        {
-            ImGuiWindow* window = g.Windows[n];
-            if (!window->WasActive)
-                continue;
-            ImDrawList* draw_list = GetForegroundDrawList(window);
-            if (cfg->ShowWindowsRects)
-            {
-                ImRect r = Funcs::GetWindowRect(window, cfg->ShowWindowsRectsType);
-                draw_list->AddRect(r.Min, r.Max, IM_COL32(255, 0, 128, 255));
-            }
-            if (cfg->ShowWindowsBeginOrder && !(window->Flags & ImGuiWindowFlags_ChildWindow))
-            {
-                char buf[32];
-                ImFormatString(buf, IM_ARRAYSIZE(buf), "%d", window->BeginOrderWithinContext);
-                float font_size = GetFontSize();
-                draw_list->AddRectFilled(window->Pos, window->Pos + ImVec2(font_size, font_size), IM_COL32(200, 100, 100, 255));
-                draw_list->AddText(window->Pos, IM_COL32(255, 255, 255, 255), buf);
-            }
-        }
-    }
-
-#ifdef IMGUI_HAS_TABLE
-    if (cfg->ShowTablesRects)
-    {
-        for (int table_n = 0; table_n < g.Tables.GetSize(); table_n++)
-        {
-            ImGuiTable* table = g.Tables.GetByIndex(table_n);
-            if (table->LastFrameActive < g.FrameCount - 1)
-                continue;
-            ImDrawList* draw_list = GetForegroundDrawList(table->OuterWindow);
-            if (cfg->ShowTablesRectsType >= TRT_ColumnsRect)
-            {
-                for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-                {
-                    ImRect r = Funcs::GetTableRect(table, cfg->ShowTablesRectsType, column_n);
-                    ImU32 col = (table->HoveredColumnBody == column_n) ? IM_COL32(255, 255, 128, 255) : IM_COL32(255, 0, 128, 255);
-                    float thickness = (table->HoveredColumnBody == column_n) ? 3.0f : 1.0f;
-                    draw_list->AddRect(r.Min, r.Max, col, 0.0f, ~0, thickness);
-                }
-            }
-            else
-            {
-                ImRect r = Funcs::GetTableRect(table, cfg->ShowTablesRectsType, -1);
-                draw_list->AddRect(r.Min, r.Max, IM_COL32(255, 0, 128, 255));
-            }
-        }
-    }
-#endif   
-
-#ifdef IMGUI_HAS_DOCK
-    if (show_docking_nodes && g.IO.KeyCtrl)
-    {
-    }
-#endif   
-
-    End();
-}
-
-void ImGui::DebugNodeColumns(ImGuiOldColumns* columns)
-{
-    if (!TreeNode((void*)(uintptr_t)columns->ID, "Columns Id: 0x%08X, Count: %d, Flags: 0x%04X", columns->ID, columns->Count, columns->Flags))
-        return;
-    BulletText("Width: %.1f (MinX: %.1f, MaxX: %.1f)", columns->OffMaxX - columns->OffMinX, columns->OffMinX, columns->OffMaxX);
-    for (int column_n = 0; column_n < columns->Columns.Size; column_n++)
-        BulletText("Column %02d: OffsetNorm %.3f (= %.1f px)", column_n, columns->Columns[column_n].OffsetNorm, GetColumnOffsetFromNorm(columns, columns->Columns[column_n].OffsetNorm));
-    TreePop();
-}
-
-void ImGui::DebugNodeDrawList(ImGuiWindow* window, const ImDrawList* draw_list, const char* label)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiMetricsConfig* cfg = &g.DebugMetricsConfig;
-    int cmd_count = draw_list->CmdBuffer.Size;
-    if (cmd_count > 0 && draw_list->CmdBuffer.back().ElemCount == 0 && draw_list->CmdBuffer.back().UserCallback == NULL)
-        cmd_count--;
-    bool node_open = TreeNode(draw_list, "%s: '%s' %d vtx, %d indices, %d cmds", label, draw_list->_OwnerName ? draw_list->_OwnerName : "", draw_list->VtxBuffer.Size, draw_list->IdxBuffer.Size, cmd_count);
-    if (draw_list == GetWindowDrawList())
-    {
-        SameLine();
-        TextColored(ImVec4(1.0f, 0.4f, 0.4f, 1.0f), "CURRENTLY APPENDING");              
-        if (node_open)
-            TreePop();
-        return;
-    }
-
-    ImDrawList* fg_draw_list = GetForegroundDrawList(window);         
-    if (window && IsItemHovered())
-        fg_draw_list->AddRect(window->Pos, window->Pos + window->Size, IM_COL32(255, 255, 0, 255));
-    if (!node_open)
-        return;
-
-    if (window && !window->WasActive)
-        TextDisabled("Warning: owning Window is inactive. This DrawList is not being rendered!");
-
-    for (const ImDrawCmd* pcmd = draw_list->CmdBuffer.Data; pcmd < draw_list->CmdBuffer.Data + cmd_count; pcmd++)
-    {
-        if (pcmd->UserCallback)
-        {
-            BulletText("Callback %p, user_data %p", pcmd->UserCallback, pcmd->UserCallbackData);
-            continue;
-        }
-
-        char buf[300];
-        ImFormatString(buf, IM_ARRAYSIZE(buf), "DrawCmd:%5d tris, Tex 0x%p, ClipRect (%4.0f,%4.0f)-(%4.0f,%4.0f)",
-            pcmd->ElemCount / 3, (void*)(intptr_t)pcmd->TextureId,
-            pcmd->ClipRect.x, pcmd->ClipRect.y, pcmd->ClipRect.z, pcmd->ClipRect.w);
-        bool pcmd_node_open = TreeNode((void*)(pcmd - draw_list->CmdBuffer.begin()), "%s", buf);
-        if (IsItemHovered() && (cfg->ShowDrawCmdMesh || cfg->ShowDrawCmdBoundingBoxes) && fg_draw_list)
-            DebugNodeDrawCmdShowMeshAndBoundingBox(window, draw_list, pcmd, cfg->ShowDrawCmdMesh, cfg->ShowDrawCmdBoundingBoxes);
-        if (!pcmd_node_open)
-            continue;
-
-        const ImDrawIdx* idx_buffer = (draw_list->IdxBuffer.Size > 0) ? draw_list->IdxBuffer.Data : NULL;
-        const ImDrawVert* vtx_buffer = draw_list->VtxBuffer.Data + pcmd->VtxOffset;
-        float total_area = 0.0f;
-        for (unsigned int idx_n = pcmd->IdxOffset; idx_n < pcmd->IdxOffset + pcmd->ElemCount; )
-        {
-            ImVec2 triangle[3];
-            for (int n = 0; n < 3; n++, idx_n++)
-                triangle[n] = vtx_buffer[idx_buffer ? idx_buffer[idx_n] : idx_n].pos;
-            total_area += ImTriangleArea(triangle[0], triangle[1], triangle[2]);
-        }
-
-        ImFormatString(buf, IM_ARRAYSIZE(buf), "Mesh: ElemCount: %d, VtxOffset: +%d, IdxOffset: +%d, Area: ~%0.f px", pcmd->ElemCount, pcmd->VtxOffset, pcmd->IdxOffset, total_area);
-        Selectable(buf);
-        if (IsItemHovered() && fg_draw_list)
-            DebugNodeDrawCmdShowMeshAndBoundingBox(window, draw_list, pcmd, true, false);
-
-        ImGuiListClipper clipper;
-        clipper.Begin(pcmd->ElemCount / 3);                   
-        while (clipper.Step())
-            for (int prim = clipper.DisplayStart, idx_i = pcmd->IdxOffset + clipper.DisplayStart * 3; prim < clipper.DisplayEnd; prim++)
-            {
-                char* buf_p = buf, * buf_end = buf + IM_ARRAYSIZE(buf);
-                ImVec2 triangle[3];
-                for (int n = 0; n < 3; n++, idx_i++)
-                {
-                    const ImDrawVert& v = vtx_buffer[idx_buffer ? idx_buffer[idx_i] : idx_i];
-                    triangle[n] = v.pos;
-                    buf_p += ImFormatString(buf_p, buf_end - buf_p, "%s %04d: pos (%8.2f,%8.2f), uv (%.6f,%.6f), col %08X\n",
-                        (n == 0) ? "Vert:" : "     ", idx_i, v.pos.x, v.pos.y, v.uv.x, v.uv.y, v.col);
-                }
-
-                Selectable(buf, false);
-                if (fg_draw_list && IsItemHovered())
-                {
-                    ImDrawListFlags backup_flags = fg_draw_list->Flags;
-                    fg_draw_list->Flags &= ~ImDrawListFlags_AntiAliasedLines;               
-                    fg_draw_list->AddPolyline(triangle, 3, IM_COL32(255, 255, 0, 255), true, 1.0f);
-                    fg_draw_list->Flags = backup_flags;
-                }
-            }
-        TreePop();
-    }
-    TreePop();
-}
-
-void ImGui::DebugNodeDrawCmdShowMeshAndBoundingBox(ImGuiWindow* window, const ImDrawList* draw_list, const ImDrawCmd* draw_cmd, bool show_mesh, bool show_aabb)
-{
-    IM_ASSERT(show_mesh || show_aabb);
-    ImDrawList* fg_draw_list = GetForegroundDrawList(window);         
-    ImDrawIdx* idx_buffer = (draw_list->IdxBuffer.Size > 0) ? draw_list->IdxBuffer.Data : NULL;
-    ImDrawVert* vtx_buffer = draw_list->VtxBuffer.Data + draw_cmd->VtxOffset;
-
-    ImRect clip_rect = draw_cmd->ClipRect;
-    ImRect vtxs_rect(FLT_MAX, FLT_MAX, -FLT_MAX, -FLT_MAX);
-    ImDrawListFlags backup_flags = fg_draw_list->Flags;
-    fg_draw_list->Flags &= ~ImDrawListFlags_AntiAliasedLines;               
-    for (unsigned int idx_n = draw_cmd->IdxOffset; idx_n < draw_cmd->IdxOffset + draw_cmd->ElemCount; )
-    {
-        ImVec2 triangle[3];
-        for (int n = 0; n < 3; n++, idx_n++)
-            vtxs_rect.Add((triangle[n] = vtx_buffer[idx_buffer ? idx_buffer[idx_n] : idx_n].pos));
-        if (show_mesh)
-            fg_draw_list->AddPolyline(triangle, 3, IM_COL32(255, 255, 0, 255), true, 1.0f);     
-    }
-    if (show_aabb)
-    {
-        fg_draw_list->AddRect(ImFloor(clip_rect.Min), ImFloor(clip_rect.Max), IM_COL32(255, 0, 255, 255));        
-        fg_draw_list->AddRect(ImFloor(vtxs_rect.Min), ImFloor(vtxs_rect.Max), IM_COL32(0, 255, 255, 255));       
-    }
-    fg_draw_list->Flags = backup_flags;
-}
-
-void ImGui::DebugNodeStorage(ImGuiStorage* storage, const char* label)
-{
-    if (!TreeNode(label, "%s: %d entries, %d bytes", label, storage->Data.Size, storage->Data.size_in_bytes()))
-        return;
-    for (int n = 0; n < storage->Data.Size; n++)
-    {
-        const ImGuiStorage::ImGuiStoragePair& p = storage->Data[n];
-        BulletText("Key 0x%08X Value { i: %d }", p.key, p.val_i);              
-    }
-    TreePop();
-}
-
-void ImGui::DebugNodeTabBar(ImGuiTabBar* tab_bar, const char* label)
-{
-    char buf[256];
-    char* p = buf;
-    const char* buf_end = buf + IM_ARRAYSIZE(buf);
-    const bool is_active = (tab_bar->PrevFrameVisible >= GetFrameCount() - 2);
-    p += ImFormatString(p, buf_end - p, "%s 0x%08X (%d tabs)%s", label, tab_bar->ID, tab_bar->Tabs.Size, is_active ? "" : " *Inactive*");
-    IM_UNUSED(p);
-    if (!is_active) { PushStyleColor(ImGuiCol_Text, GetStyleColorVec4(ImGuiCol_TextDisabled)); }
-    bool open = TreeNode(tab_bar, "%s", buf);
-    if (!is_active) { PopStyleColor(); }
-    if (is_active && IsItemHovered())
-    {
-        ImDrawList* draw_list = GetForegroundDrawList();
-        draw_list->AddRect(tab_bar->BarRect.Min, tab_bar->BarRect.Max, IM_COL32(255, 255, 0, 255));
-        draw_list->AddLine(ImVec2(tab_bar->ScrollingRectMinX, tab_bar->BarRect.Min.y), ImVec2(tab_bar->ScrollingRectMinX, tab_bar->BarRect.Max.y), IM_COL32(0, 255, 0, 255));
-        draw_list->AddLine(ImVec2(tab_bar->ScrollingRectMaxX, tab_bar->BarRect.Min.y), ImVec2(tab_bar->ScrollingRectMaxX, tab_bar->BarRect.Max.y), IM_COL32(0, 255, 0, 255));
-    }
-    if (open)
-    {
-        for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++)
-        {
-            const ImGuiTabItem* tab = &tab_bar->Tabs[tab_n];
-            PushID(tab);
-            if (SmallButton("<")) { TabBarQueueReorder(tab_bar, tab, -1); } SameLine(0, 2);
-            if (SmallButton(">")) { TabBarQueueReorder(tab_bar, tab, +1); } SameLine();
-            Text("%02d%c Tab 0x%08X '%s' Offset: %.1f, Width: %.1f/%.1f",
-                tab_n, (tab->ID == tab_bar->SelectedTabId) ? '*' : ' ', tab->ID, (tab->NameOffset != -1) ? tab_bar->GetTabName(tab) : "", tab->Offset, tab->Width, tab->ContentWidth);
-            PopID();
-        }
-        TreePop();
-    }
-}
-
-void ImGui::DebugNodeWindow(ImGuiWindow* window, const char* label)
-{
-    if (window == NULL)
-    {
-        BulletText("%s: NULL", label);
-        return;
-    }
-
-    ImGuiContext& g = *GImGui;
-    const bool is_active = window->WasActive;
-    ImGuiTreeNodeFlags tree_node_flags = (window == g.NavWindow) ? ImGuiTreeNodeFlags_Selected : ImGuiTreeNodeFlags_None;
-    if (!is_active) { PushStyleColor(ImGuiCol_Text, GetStyleColorVec4(ImGuiCol_TextDisabled)); }
-    const bool open = TreeNodeEx(label, tree_node_flags, "%s '%s'%s", label, window->Name, is_active ? "" : " *Inactive*");
-    if (!is_active) { PopStyleColor(); }
-    if (IsItemHovered() && is_active)
-        GetForegroundDrawList(window)->AddRect(window->Pos, window->Pos + window->Size, IM_COL32(255, 255, 0, 255));
-    if (!open)
-        return;
-
-    if (window->MemoryCompacted)
-        TextDisabled("Note: some memory buffers have been compacted/freed.");
-
-    ImGuiWindowFlags flags = window->Flags;
-    DebugNodeDrawList(window, window->DrawList, "DrawList");
-    BulletText("Pos: (%.1f,%.1f), Size: (%.1f,%.1f), ContentSize (%.1f,%.1f) Ideal (%.1f,%.1f)", window->Pos.x, window->Pos.y, window->Size.x, window->Size.y, window->ContentSize.x, window->ContentSize.y, window->ContentSizeIdeal.x, window->ContentSizeIdeal.y);
-    BulletText("Flags: 0x%08X (%s%s%s%s%s%s%s%s%s..)", flags,
-        (flags & ImGuiWindowFlags_ChildWindow)  ? "Child " : "",      (flags & ImGuiWindowFlags_Tooltip)     ? "Tooltip "   : "",  (flags & ImGuiWindowFlags_Popup) ? "Popup " : "",
-        (flags & ImGuiWindowFlags_Modal)        ? "Modal " : "",      (flags & ImGuiWindowFlags_ChildMenu)   ? "ChildMenu " : "",  (flags & ImGuiWindowFlags_NoSavedSettings) ? "NoSavedSettings " : "",
-        (flags & ImGuiWindowFlags_NoMouseInputs)? "NoMouseInputs":"", (flags & ImGuiWindowFlags_NoNavInputs) ? "NoNavInputs" : "", (flags & ImGuiWindowFlags_AlwaysAutoResize) ? "AlwaysAutoResize" : "");
-    BulletText("Scroll: (%.2f/%.2f,%.2f/%.2f) Scrollbar:%s%s", window->Scroll.x, window->ScrollMax.x, window->Scroll.y, window->ScrollMax.y, window->ScrollbarX ? "X" : "", window->ScrollbarY ? "Y" : "");
-    BulletText("Active: %d/%d, WriteAccessed: %d, BeginOrderWithinContext: %d", window->Active, window->WasActive, window->WriteAccessed, (window->Active || window->WasActive) ? window->BeginOrderWithinContext : -1);
-    BulletText("Appearing: %d, Hidden: %d (CanSkip %d Cannot %d), SkipItems: %d", window->Appearing, window->Hidden, window->HiddenFramesCanSkipItems, window->HiddenFramesCannotSkipItems, window->SkipItems);
-    BulletText("NavLastIds: 0x%08X,0x%08X, NavLayerActiveMask: %X", window->NavLastIds[0], window->NavLastIds[1], window->DC.NavLayerActiveMask);
-    BulletText("NavLastChildNavWindow: %s", window->NavLastChildNavWindow ? window->NavLastChildNavWindow->Name : "NULL");
-    if (!window->NavRectRel[0].IsInverted())
-        BulletText("NavRectRel[0]: (%.1f,%.1f)(%.1f,%.1f)", window->NavRectRel[0].Min.x, window->NavRectRel[0].Min.y, window->NavRectRel[0].Max.x, window->NavRectRel[0].Max.y);
-    else
-        BulletText("NavRectRel[0]: <None>");
-    if (window->RootWindow != window)       { DebugNodeWindow(window->RootWindow, "RootWindow"); }
-    if (window->ParentWindow != NULL)       { DebugNodeWindow(window->ParentWindow, "ParentWindow"); }
-    if (window->DC.ChildWindows.Size > 0)   { DebugNodeWindowsList(&window->DC.ChildWindows, "ChildWindows"); }
-    if (window->ColumnsStorage.Size > 0 && TreeNode("Columns", "Columns sets (%d)", window->ColumnsStorage.Size))
-    {
-        for (int n = 0; n < window->ColumnsStorage.Size; n++)
-            DebugNodeColumns(&window->ColumnsStorage[n]);
-        TreePop();
-    }
-    DebugNodeStorage(&window->StateStorage, "Storage");
-    TreePop();
-}
-
-void ImGui::DebugNodeWindowSettings(ImGuiWindowSettings* settings)
-{
-    Text("0x%08X \"%s\" Pos (%d,%d) Size (%d,%d) Collapsed=%d",
-        settings->ID, settings->GetName(), settings->Pos.x, settings->Pos.y, settings->Size.x, settings->Size.y, settings->Collapsed);
-}
-
-
-void ImGui::DebugNodeWindowsList(ImVector<ImGuiWindow*>* windows, const char* label)
-{
-    if (!TreeNode(label, "%s (%d)", label, windows->Size))
-        return;
-    Text("(In front-to-back order:)");
-    for (int i = windows->Size - 1; i >= 0; i--)     
-    {
-        PushID((*windows)[i]);
-        DebugNodeWindow((*windows)[i], "Window");
-        PopID();
-    }
-    TreePop();
-}
-
-#else
-
-void ImGui::ShowMetricsWindow(bool*) {}
-void ImGui::DebugNodeColumns(ImGuiOldColumns*) {}
-void ImGui::DebugNodeDrawList(ImGuiWindow*, const ImDrawList*, const char*) {}
-void ImGui::DebugNodeDrawCmdShowMeshAndBoundingBox(ImGuiWindow*, const ImDrawList*, const ImDrawCmd*, bool, bool) {}
-void ImGui::DebugNodeStorage(ImGuiStorage*, const char*) {}
-void ImGui::DebugNodeTabBar(ImGuiTabBar*, const char*) {}
-void ImGui::DebugNodeWindow(ImGuiWindow*, const char*) {}
-void ImGui::DebugNodeWindowSettings(ImGuiWindowSettings*) {}
-void ImGui::DebugNodeWindowsList(ImVector<ImGuiWindow*>*, const char*) {}
-
-#endif
-
-#ifdef IMGUI_INCLUDE_IMGUI_USER_INL
-#include "imgui_user.inl"
-#endif
-
-#endif   
diff --git a/SpyCustom/imgui/imgui.h b/SpyCustom/imgui/imgui.h
deleted file mode 100644
index 7e804ea..0000000
--- a/SpyCustom/imgui/imgui.h
+++ /dev/null
@@ -1,2036 +0,0 @@
-#pragma once
-
-#ifdef IMGUI_USER_CONFIG
-#include IMGUI_USER_CONFIG
-#endif
-#if !defined(IMGUI_DISABLE_INCLUDE_IMCONFIG_H) || defined(IMGUI_INCLUDE_IMCONFIG_H)
-#include "imconfig.h"
-#endif
-
-#ifndef IMGUI_DISABLE
-
-#include <float.h>                    
-#include <stdarg.h>                    
-#include <stddef.h>                   
-#include <string.h>                        
-
-#include <vector> 
-#include <string>
-
-#define IMGUI_VERSION               "1.81 WIP"
-#define IMGUI_VERSION_NUM           18003
-#define IMGUI_CHECKVERSION()        ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
-#define IMGUI_HAS_TABLE
-
-#ifndef IMGUI_API
-#define IMGUI_API
-#endif
-#ifndef IMGUI_IMPL_API
-#define IMGUI_IMPL_API              IMGUI_API
-#endif
-
-#ifndef IM_ASSERT
-#include <assert.h>
-#define IM_ASSERT(_EXPR)            assert(_EXPR)                                         
-#endif
-#define IM_ARRAYSIZE(_ARR)          ((int)(sizeof(_ARR) / sizeof(*(_ARR))))               
-#define IM_UNUSED(_VAR)             ((void)(_VAR))                                               
-#if (__cplusplus >= 201100) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201100)
-#define IM_OFFSETOF(_TYPE,_MEMBER)  offsetof(_TYPE, _MEMBER)                              
-#else
-#define IM_OFFSETOF(_TYPE,_MEMBER)  ((size_t)&(((_TYPE*)0)->_MEMBER))                   
-#endif
-
-#if !defined(IMGUI_USE_STB_SPRINTF) && defined(__clang__)
-#define IM_FMTARGS(FMT)             __attribute__((format(printf, FMT, FMT+1)))
-#define IM_FMTLIST(FMT)             __attribute__((format(printf, FMT, 0)))
-#elif !defined(IMGUI_USE_STB_SPRINTF) && defined(__GNUC__) && defined(__MINGW32__)
-#define IM_FMTARGS(FMT)             __attribute__((format(gnu_printf, FMT, FMT+1)))
-#define IM_FMTLIST(FMT)             __attribute__((format(gnu_printf, FMT, 0)))
-#else
-#define IM_FMTARGS(FMT)
-#define IM_FMTLIST(FMT)
-#endif
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#if __has_warning("-Wzero-as-null-pointer-constant")
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"                  
-#pragma GCC diagnostic ignored "-Wclass-memaccess"                      
-#endif
-
-struct ImDrawChannel;                             
-struct ImDrawCmd;                                       
-struct ImDrawData;                                    
-struct ImDrawList;                                     
-struct ImDrawListSharedData;                          
-struct ImDrawListSplitter;                              
-struct ImDrawVert;                                   
-struct ImFont;                                
-struct ImFontAtlas;                                
-struct ImFontBuilderIO;                      
-struct ImFontConfig;                         
-struct ImFontGlyph;                              
-struct ImFontGlyphRangesBuilder;            
-struct ImColor;                                        
-struct ImGuiContext;                        
-struct ImGuiIO;                              
-struct ImGuiInputTextCallbackData;            
-struct ImGuiListClipper;                    
-struct ImGuiOnceUponAFrame;                          
-struct ImGuiPayload;                        
-struct ImGuiSizeCallbackData;              
-struct ImGuiStorage;                    
-struct ImGuiStyle;                      
-struct ImGuiTableSortSpecs;                        
-struct ImGuiTableColumnSortSpecs;           
-struct ImGuiTextBuffer;                        
-struct ImGuiTextFilter;                      
-
-typedef int ImGuiCol;                                     
-typedef int ImGuiCond;                                    
-typedef int ImGuiDataType;                          
-typedef int ImGuiDir;                                   
-typedef int ImGuiKey;                                     
-typedef int ImGuiNavInput;                           
-typedef int ImGuiMouseButton;                       
-typedef int ImGuiMouseCursor;                    
-typedef int ImGuiSortDirection;                  
-typedef int ImGuiStyleVar;                           
-typedef int ImGuiTableBgTarget;                 
-typedef int ImDrawCornerFlags;                  
-typedef int ImDrawListFlags;                    
-typedef int ImFontAtlasFlags;                   
-typedef int ImGuiBackendFlags;                
-typedef int ImGuiButtonFlags;                  
-typedef int ImGuiColorEditFlags;              
-typedef int ImGuiConfigFlags;                  
-typedef int ImGuiComboFlags;                    
-typedef int ImGuiDragDropFlags;               
-typedef int ImGuiFocusedFlags;                
-typedef int ImGuiHoveredFlags;                  
-typedef int ImGuiInputTextFlags;             
-typedef int ImGuiKeyModFlags;                   
-typedef int ImGuiPopupFlags;                      
-typedef int ImGuiSelectableFlags;          
-typedef int ImGuiSliderFlags;                      
-typedef int ImGuiTabBarFlags;                  
-typedef int ImGuiTabItemFlags;                
-typedef int ImGuiTableFlags;                    
-typedef int ImGuiTableColumnFlags;        
-typedef int ImGuiTableRowFlags;              
-typedef int ImGuiTreeNodeFlags;                
-typedef int ImGuiWindowFlags;                   
-
-#ifndef ImTextureID                           
-typedef void* ImTextureID;                                   
-#endif
-typedef unsigned int ImGuiID;                    
-typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData* data);        
-typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data);                 
-
-typedef unsigned short ImWchar16;                    
-typedef unsigned int ImWchar32;                      
-#ifdef IMGUI_USE_WCHAR32                          
-typedef ImWchar32 ImWchar;
-#else
-typedef ImWchar16 ImWchar;
-#endif
-
-typedef signed char         ImS8;      
-typedef unsigned char       ImU8;      
-typedef signed short        ImS16;     
-typedef unsigned short      ImU16;     
-typedef signed int          ImS32;       
-typedef unsigned int        ImU32;           
-#if defined(_MSC_VER) && !defined(__clang__)
-typedef signed   __int64    ImS64;            
-typedef unsigned __int64    ImU64;            
-#elif (defined(__clang__) || defined(__GNUC__)) && (__cplusplus < 201100)
-#include <stdint.h>
-typedef int64_t             ImS64;       
-typedef uint64_t            ImU64;       
-#else
-typedef signed   long long  ImS64;       
-typedef unsigned long long  ImU64;       
-#endif
-
-struct ImVec2
-{
-    float                                   x, y;
-    ImVec2()                                { x = y = 0.0f; }
-    ImVec2(float _x, float _y)              { x = _x; y = _y; }
-    float  operator[] (size_t idx) const    { IM_ASSERT(idx <= 1); return (&x)[idx]; }                
-    float& operator[] (size_t idx)          { IM_ASSERT(idx <= 1); return (&x)[idx]; }                
-#ifdef IM_VEC2_CLASS_EXTRA
-    IM_VEC2_CLASS_EXTRA                         
-#endif
-};
-
-struct ImVec4
-{
-    float                                           x, y, z, w;
-    ImVec4()                                        { x = y = z = w = 0.0f; }
-    ImVec4(float _x, float _y, float _z, float _w)  { x = _x; y = _y; z = _z; w = _w; }
-#ifdef IM_VEC4_CLASS_EXTRA
-    IM_VEC4_CLASS_EXTRA                         
-#endif
-};
-
-namespace ImGui
-{
-    IMGUI_API ImGuiContext* CreateContext(ImFontAtlas* shared_font_atlas = NULL);
-    IMGUI_API void          DestroyContext(ImGuiContext* ctx = NULL);        
-    IMGUI_API ImGuiContext* GetCurrentContext();
-    IMGUI_API void          SetCurrentContext(ImGuiContext* ctx);
-
-    IMGUI_API ImGuiIO&      GetIO();                                              
-    IMGUI_API ImGuiStyle&   GetStyle();                                               
-    IMGUI_API void          NewFrame();                                                 
-    IMGUI_API void          EndFrame();                                                                                 
-    IMGUI_API void          Render();                                                  
-    IMGUI_API ImDrawData*   GetDrawData();                                               
-
-    IMGUI_API void          ShowDemoWindow(bool* p_open = NULL);                               
-    IMGUI_API void          ShowMetricsWindow(bool* p_open = NULL);                   
-    IMGUI_API void          ShowAboutWindow(bool* p_open = NULL);                  
-    IMGUI_API void          ShowStyleEditor(ImGuiStyle* ref = NULL);                                 
-    IMGUI_API bool          ShowStyleSelector(const char* label);                     
-    IMGUI_API void          ShowFontSelector(const char* label);                      
-    IMGUI_API void          ShowUserGuide();                                            
-    IMGUI_API const char*   GetVersion();                                                  
-
-    IMGUI_API void          StyleColorsDark(ImGuiStyle* dst = NULL);        
-    IMGUI_API void          StyleColorsLight(ImGuiStyle* dst = NULL);            
-    IMGUI_API void          StyleColorsClassic(ImGuiStyle* dst = NULL);    
-
-    IMGUI_API bool          Begin(const char* name, bool* p_open = NULL, ImGuiWindowFlags flags = 0);
-    IMGUI_API void          End();
-
-    IMGUI_API bool          BeginChild(const char* str_id, const ImVec2& size = ImVec2(0, 0), bool border = false, ImGuiWindowFlags flags = 0);
-    IMGUI_API bool          BeginChild(ImGuiID id, const ImVec2& size = ImVec2(0, 0), bool border = false, ImGuiWindowFlags flags = 0);
-    IMGUI_API void          EndChild();
-
-    IMGUI_API bool          IsWindowAppearing();
-    IMGUI_API bool          IsWindowCollapsed();
-    IMGUI_API bool          IsWindowFocused(ImGuiFocusedFlags flags=0);               
-    IMGUI_API bool          IsWindowHovered(ImGuiHoveredFlags flags=0);                                               
-    IMGUI_API ImDrawList*   GetWindowDrawList();                                      
-    IMGUI_API ImVec2        GetWindowPos();                                                 
-    IMGUI_API ImVec2        GetWindowSize();                                
-    IMGUI_API float         GetWindowWidth();                                  
-    IMGUI_API float         GetWindowHeight();                                 
-
-    IMGUI_API void          SetNextWindowPos(const ImVec2& pos, ImGuiCond cond = 0, const ImVec2& pivot = ImVec2(0, 0));                
-    IMGUI_API void          SetNextWindowSize(const ImVec2& size, ImGuiCond cond = 0);                                    
-    IMGUI_API void          SetNextWindowSizeConstraints(const ImVec2& size_min, const ImVec2& size_max, ImGuiSizeCallback custom_callback = NULL, void* custom_callback_data = NULL);                             
-    IMGUI_API void          SetNextWindowContentSize(const ImVec2& size);                                                                     
-    IMGUI_API void          SetNextWindowCollapsed(bool collapsed, ImGuiCond cond = 0);                         
-    IMGUI_API void          SetNextWindowFocus();                                                                  
-    IMGUI_API void          SetNextWindowBgAlpha(float alpha);                                                              
-    IMGUI_API void          SetWindowPos(const ImVec2& pos, ImGuiCond cond = 0);                                            
-    IMGUI_API void          SetWindowSize(const ImVec2& size, ImGuiCond cond = 0);                                                   
-    IMGUI_API void          SetWindowCollapsed(bool collapsed, ImGuiCond cond = 0);                               
-    IMGUI_API void          SetWindowFocus();                                                                        
-    IMGUI_API void          SetWindowFontScale(float scale);                                                                          
-    IMGUI_API void          SetWindowPos(const char* name, const ImVec2& pos, ImGuiCond cond = 0);          
-    IMGUI_API void          SetWindowSize(const char* name, const ImVec2& size, ImGuiCond cond = 0);                   
-    IMGUI_API void          SetWindowCollapsed(const char* name, bool collapsed, ImGuiCond cond = 0);        
-    IMGUI_API void          SetWindowFocus(const char* name);                                                        
-
-    IMGUI_API ImVec2        GetContentRegionAvail();                                            
-    IMGUI_API ImVec2        GetContentRegionMax();                                                         
-    IMGUI_API ImVec2        GetWindowContentRegionMin();                                            
-    IMGUI_API ImVec2        GetWindowContentRegionMax();                                                   
-    IMGUI_API float         GetWindowContentRegionWidth();                                  
-
-    IMGUI_API float         GetScrollX();                                                         
-    IMGUI_API float         GetScrollY();                                                         
-    IMGUI_API void          SetScrollX(float scroll_x);                                           
-    IMGUI_API void          SetScrollY(float scroll_y);                                           
-    IMGUI_API float         GetScrollMaxX();                                                          
-    IMGUI_API float         GetScrollMaxY();                                                          
-    IMGUI_API void          SetScrollHereX(float center_x_ratio = 0.5f);                                               
-    IMGUI_API void          SetScrollHereY(float center_y_ratio = 0.5f);                                               
-    IMGUI_API void          SetScrollFromPosX(float local_x, float center_x_ratio = 0.5f);                   
-    IMGUI_API void          SetScrollFromPosY(float local_y, float center_y_ratio = 0.5f);                   
-
-    IMGUI_API void          PushFont(ImFont* font);                                                  
-    IMGUI_API void          PopFont();
-    IMGUI_API void          PushStyleColor(ImGuiCol idx, ImU32 col);                                      
-    IMGUI_API void          PushStyleColor(ImGuiCol idx, const ImVec4& col);
-    IMGUI_API void          PopStyleColor(int count = 1);
-    IMGUI_API void          PushStyleVar(ImGuiStyleVar idx, float val);                                    
-    IMGUI_API void          PushStyleVar(ImGuiStyleVar idx, const ImVec2& val);                            
-    IMGUI_API void          PopStyleVar(int count = 1);
-    IMGUI_API void          PushAllowKeyboardFocus(bool allow_keyboard_focus);                             
-    IMGUI_API void          PopAllowKeyboardFocus();
-    IMGUI_API void          PushButtonRepeat(bool repeat);                                                                     
-    IMGUI_API void          PopButtonRepeat();
-
-    IMGUI_API void          PushItemWidth(float item_width);                                                               
-    IMGUI_API void          PopItemWidth();
-    IMGUI_API void          SetNextItemWidth(float item_width);                                                            
-    IMGUI_API float         CalcItemWidth();                                                                     
-    IMGUI_API void          PushTextWrapPos(float wrap_local_pos_x = 0.0f);                                             
-    IMGUI_API void          PopTextWrapPos();
-
-    IMGUI_API ImFont*       GetFont();                                                         
-    IMGUI_API float         GetFontSize();                                                                 
-    IMGUI_API ImVec2        GetFontTexUvWhitePixel();                                                       
-    IMGUI_API ImU32         GetColorU32(ImGuiCol idx, float alpha_mul = 1.0f);                                   
-    IMGUI_API ImU32         GetColorU32(const ImVec4& col);                                                
-    IMGUI_API ImU32         GetColorU32(ImU32 col);                                                        
-    IMGUI_API const ImVec4& GetStyleColorVec4(ImGuiCol idx);                                                          
-
-    IMGUI_API void          Separator();                                                                     
-    IMGUI_API void          SameLine(float offset_from_start_x=0.0f, float spacing=-1.0f);                 
-    IMGUI_API void          NewLine();                                                                   
-    IMGUI_API void          Spacing();                                                         
-    IMGUI_API void          Dummy(const ImVec2& size);                                                         
-    IMGUI_API void          Indent(float indent_w = 0.0f);                                                
-    IMGUI_API void          Unindent(float indent_w = 0.0f);                                               
-    IMGUI_API void          BeginGroup();                                                       
-    IMGUI_API void          EndGroup();                                                                                  
-    IMGUI_API ImVec2        GetCursorPos();                                                          
-    IMGUI_API float         GetCursorPosX();                                                               
-    IMGUI_API float         GetCursorPosY();                                                            
-    IMGUI_API void          SetCursorPos(const ImVec2& local_pos);                                    
-    IMGUI_API void          SetCursorPosX(float local_x);                                            
-    IMGUI_API void          SetCursorPosY(float local_y);                                   
-    IMGUI_API ImVec2        GetCursorStartPos();                                                  
-    IMGUI_API ImVec2        GetCursorScreenPos();                                                        
-    IMGUI_API void          SetCursorScreenPos(const ImVec2& pos);                                 
-    IMGUI_API void          AlignTextToFramePadding();                                                                   
-    IMGUI_API float         GetTextLineHeight();                                              
-    IMGUI_API float         GetTextLineHeightWithSpacing();                                              
-    IMGUI_API float         GetFrameHeight();                                                     
-    IMGUI_API float         GetFrameHeightWithSpacing();                                                      
-
-    IMGUI_API void          PushID(const char* str_id);                                              
-    IMGUI_API void          PushID(const char* str_id_begin, const char* str_id_end);                
-    IMGUI_API void          PushID(const void* ptr_id);                                              
-    IMGUI_API void          PushID(int int_id);                                                      
-    IMGUI_API void          PopID();                                                             
-    IMGUI_API ImGuiID       GetID(const char* str_id);                                                          
-    IMGUI_API ImGuiID       GetID(const char* str_id_begin, const char* str_id_end);
-    IMGUI_API ImGuiID       GetID(const void* ptr_id);
-
-    IMGUI_API void          TextUnformatted(const char* text, const char* text_end = NULL);                                       
-    IMGUI_API void          Text(const char* fmt, ...)                                      IM_FMTARGS(1);   
-    IMGUI_API void          TextV(const char* fmt, va_list args)                            IM_FMTLIST(1);
-    IMGUI_API void          TextColored(const ImVec4& col, const char* fmt, ...)            IM_FMTARGS(2);        
-    IMGUI_API void          TextColoredV(const ImVec4& col, const char* fmt, va_list args)  IM_FMTLIST(2);
-    IMGUI_API void          TextDisabled(const char* fmt, ...)                              IM_FMTARGS(1);        
-    IMGUI_API void          TextDisabledV(const char* fmt, va_list args)                    IM_FMTLIST(1);
-    IMGUI_API void          TextWrapped(const char* fmt, ...)                               IM_FMTARGS(1);                                   
-    IMGUI_API void          TextWrappedV(const char* fmt, va_list args)                     IM_FMTLIST(1);
-    IMGUI_API void          LabelText(const char* label, const char* fmt, ...)              IM_FMTARGS(2);          
-    IMGUI_API void          LabelTextV(const char* label, const char* fmt, va_list args)    IM_FMTLIST(2);
-    IMGUI_API void          BulletText(const char* fmt, ...)                                IM_FMTARGS(1);    
-    IMGUI_API void          BulletTextV(const char* fmt, va_list args)                      IM_FMTLIST(1);
-
-    IMGUI_API bool          Button(const char* label, const ImVec2& size = ImVec2(0, 0));    
-    IMGUI_API bool          SmallButton(const char* label);                                         
-    IMGUI_API bool          InvisibleButton(const char* str_id, const ImVec2& size, ImGuiButtonFlags flags = 0);                      
-    IMGUI_API bool          ArrowButton(const char* str_id, ImGuiDir dir);                        
-    IMGUI_API void          Image(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1,1), const ImVec4& tint_col = ImVec4(1,1,1,1), const ImVec4& border_col = ImVec4(0,0,0,0));
-    IMGUI_API bool          ImageButton(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0, 0),  const ImVec2& uv1 = ImVec2(1,1), int frame_padding = -1, const ImVec4& bg_col = ImVec4(0,0,0,0), const ImVec4& tint_col = ImVec4(1,1,1,1));               
-    IMGUI_API bool          Checkbox(const char* label, bool* v);
-    IMGUI_API bool          CheckboxFlags(const char* label, int* flags, int flags_value);
-    IMGUI_API bool          CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value);
-    IMGUI_API bool          RadioButton(const char* label, bool active);                               
-    IMGUI_API bool          RadioButton(const char* label, int* v, int v_button);                      
-    IMGUI_API void          ProgressBar(float fraction, const ImVec2& size_arg = ImVec2(-FLT_MIN, 0), const char* overlay = NULL);
-    IMGUI_API void          Bullet();                                                                              
-
-    IMGUI_API bool          BeginCombo(const char* label, const char* preview_value, ImGuiComboFlags flags = 0);
-    IMGUI_API void          EndCombo();        
-    IMGUI_API bool          Combo(const char* label, int* current_item, const char* const items[], int items_count, int popup_max_height_in_items = -1);
-    IMGUI_API bool          Combo(const char* label, int* current_item, const char* items_separated_by_zeros, int popup_max_height_in_items = -1);                   
-    IMGUI_API bool          Combo(const char* label, int* current_item, bool(*items_getter)(void* data, int idx, const char** out_text), void* data, int items_count, int popup_max_height_in_items = -1);
-
-    IMGUI_API bool          DragFloat(const char* label, float* v, float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", ImGuiSliderFlags flags = 0);             
-    IMGUI_API bool          DragFloat2(const char* label, float v[2], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          DragFloat3(const char* label, float v[3], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          DragFloat4(const char* label, float v[4], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          DragFloatRange2(const char* label, float* v_current_min, float* v_current_max, float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", const char* format_max = NULL, ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          DragInt(const char* label, int* v, float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", ImGuiSliderFlags flags = 0);          
-    IMGUI_API bool          DragInt2(const char* label, int v[2], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          DragInt3(const char* label, int v[3], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          DragInt4(const char* label, int v[4], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          DragIntRange2(const char* label, int* v_current_min, int* v_current_max, float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", const char* format_max = NULL, ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          DragScalar(const char* label, ImGuiDataType data_type, void* p_data, float v_speed, const void* p_min = NULL, const void* p_max = NULL, const char* format = NULL, ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          DragScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, float v_speed, const void* p_min = NULL, const void* p_max = NULL, const char* format = NULL, ImGuiSliderFlags flags = 0);
-
-    IMGUI_API bool          SliderFloat(const char* label, float* v, float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0);                       
-    IMGUI_API bool          SliderFloat2(const char* label, float v[2], float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          SliderFloat3(const char* label, float v[3], float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          SliderFloat4(const char* label, float v[4], float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          SliderAngle(const char* label, float* v_rad, float v_degrees_min = -360.0f, float v_degrees_max = +360.0f, const char* format = "%.0f deg", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          SliderInt(const char* label, int* v, int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          SliderInt2(const char* label, int v[2], int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          SliderInt3(const char* label, int v[3], int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          SliderInt4(const char* label, int v[4], int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          SliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format = NULL, ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          SliderScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_min, const void* p_max, const char* format = NULL, ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          VSliderFloat(const char* label, const ImVec2& size, float* v, float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          VSliderInt(const char* label, const ImVec2& size, int* v, int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0);
-    IMGUI_API bool          VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format = NULL, ImGuiSliderFlags flags = 0);
-
-    IMGUI_API bool          TextInputComboBox(const char* id, char* buffer, size_t maxInputSize, const char* items[], size_t item_len, short showMaxItems);
-    IMGUI_API bool TextInputComboBox(const char* id, char* buffer, size_t maxInputSize, std::vector<std::string> items, short showMaxItems);
-    IMGUI_API bool          InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
-    IMGUI_API bool          InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
-    IMGUI_API bool          InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
-    IMGUI_API bool          InputFloat(const char* label, float* v, float step = 0.0f, float step_fast = 0.0f, const char* format = "%.3f", ImGuiInputTextFlags flags = 0);
-    IMGUI_API bool          InputFloat2(const char* label, float v[2], const char* format = "%.3f", ImGuiInputTextFlags flags = 0);
-    IMGUI_API bool          InputFloat3(const char* label, float v[3], const char* format = "%.3f", ImGuiInputTextFlags flags = 0);
-    IMGUI_API bool          InputFloat4(const char* label, float v[4], const char* format = "%.3f", ImGuiInputTextFlags flags = 0);
-    IMGUI_API bool          InputInt(const char* label, int* v, int step = 1, int step_fast = 100, ImGuiInputTextFlags flags = 0);
-    IMGUI_API bool          InputInt2(const char* label, int v[2], ImGuiInputTextFlags flags = 0);
-    IMGUI_API bool          InputInt3(const char* label, int v[3], ImGuiInputTextFlags flags = 0);
-    IMGUI_API bool          InputInt4(const char* label, int v[4], ImGuiInputTextFlags flags = 0);
-    IMGUI_API bool          InputDouble(const char* label, double* v, double step = 0.0, double step_fast = 0.0, const char* format = "%.6f", ImGuiInputTextFlags flags = 0);
-    IMGUI_API bool          InputScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_step = NULL, const void* p_step_fast = NULL, const char* format = NULL, ImGuiInputTextFlags flags = 0);
-    IMGUI_API bool          InputScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_step = NULL, const void* p_step_fast = NULL, const char* format = NULL, ImGuiInputTextFlags flags = 0);
-
-    IMGUI_API bool          ColorEdit3(const char* label, float col[3], ImGuiColorEditFlags flags = 0);
-    IMGUI_API bool          ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flags = 0);
-    IMGUI_API bool          ColorPicker3(const char* label, float col[3], ImGuiColorEditFlags flags = 0);
-    IMGUI_API bool          ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags flags = 0, const float* ref_col = NULL);
-    IMGUI_API bool          ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFlags flags = 0, ImVec2 size = ImVec2(0, 0));            
-    IMGUI_API void          SetColorEditOptions(ImGuiColorEditFlags flags);                                                        
-
-    IMGUI_API bool          TreeNode(const char* label);
-    IMGUI_API bool          TreeNode(const char* str_id, const char* fmt, ...) IM_FMTARGS(2);                                       
-    IMGUI_API bool          TreeNode(const void* ptr_id, const char* fmt, ...) IM_FMTARGS(2);    
-    IMGUI_API bool          TreeNodeV(const char* str_id, const char* fmt, va_list args) IM_FMTLIST(2);
-    IMGUI_API bool          TreeNodeV(const void* ptr_id, const char* fmt, va_list args) IM_FMTLIST(2);
-    IMGUI_API bool          TreeNodeEx(const char* label, ImGuiTreeNodeFlags flags = 0);
-    IMGUI_API bool          TreeNodeEx(const char* str_id, ImGuiTreeNodeFlags flags, const char* fmt, ...) IM_FMTARGS(3);
-    IMGUI_API bool          TreeNodeEx(const void* ptr_id, ImGuiTreeNodeFlags flags, const char* fmt, ...) IM_FMTARGS(3);
-    IMGUI_API bool          TreeNodeExV(const char* str_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args) IM_FMTLIST(3);
-    IMGUI_API bool          TreeNodeExV(const void* ptr_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args) IM_FMTLIST(3);
-    IMGUI_API void          TreePush(const char* str_id);                                                        
-    IMGUI_API void          TreePush(const void* ptr_id = NULL);                                 
-    IMGUI_API void          TreePop();                                                            
-    IMGUI_API float         GetTreeNodeToLabelSpacing();                                                          
-    IMGUI_API bool          CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags = 0);                      
-    IMGUI_API bool          CollapsingHeader(const char* label, bool* p_visible, ImGuiTreeNodeFlags flags = 0);                                  
-    IMGUI_API void          SetNextItemOpen(bool is_open, ImGuiCond cond = 0);                       
-
-    IMGUI_API bool          Selectable(const char* label, bool selected = false, ImGuiSelectableFlags flags = 0, const ImVec2& size = ImVec2(0, 0), bool ncolorhovered = 0);                                   
-    IMGUI_API bool          Selectable(const char* label, bool* p_selected, ImGuiSelectableFlags flags = 0, const ImVec2& size = ImVec2(0, 0));                  
-
-    IMGUI_API bool          BeginListBox(const char* label, const ImVec2& size = ImVec2(0, 0));      
-    IMGUI_API void          EndListBox();                                                              
-    IMGUI_API bool          ListBox(const char* label, int* current_item, const char* const items[], int items_count, int height_in_items = -1);
-    IMGUI_API bool          ListBox(const char* label, int* current_item, bool (*items_getter)(void* data, int idx, const char** out_text), void* data, int items_count, int height_in_items = -1);
-
-    IMGUI_API void          PlotLines(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
-    IMGUI_API void          PlotLines(const char* label, float(*values_getter)(void* data, int idx), void* data, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0));
-    IMGUI_API void          PlotHistogram(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
-    IMGUI_API void          PlotHistogram(const char* label, float(*values_getter)(void* data, int idx), void* data, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0));
-
-    IMGUI_API void          Value(const char* prefix, bool b);
-    IMGUI_API void          Value(const char* prefix, int v);
-    IMGUI_API void          Value(const char* prefix, unsigned int v);
-    IMGUI_API void          Value(const char* prefix, float v, const char* float_format = NULL);
-
-    IMGUI_API bool          BeginMenuBar();                                                                  
-    IMGUI_API void          EndMenuBar();                                                              
-    IMGUI_API bool          BeginMainMenuBar();                                                         
-    IMGUI_API void          EndMainMenuBar();                                                          
-    IMGUI_API bool          BeginMenu(const char* label, bool enabled = true);                             
-    IMGUI_API void          EndMenu();                                                                 
-    IMGUI_API bool          MenuItem(const char* label, const char* shortcut = NULL, bool selected = false, bool enabled = true);                   
-    IMGUI_API bool          MenuItem(const char* label, const char* shortcut, bool* p_selected, bool enabled = true);                         
-
-    IMGUI_API void          BeginTooltip();                                                                  
-    IMGUI_API void          EndTooltip();
-    IMGUI_API void          SetTooltip(const char* fmt, ...) IM_FMTARGS(1);                                   
-    IMGUI_API void          SetTooltipV(const char* fmt, va_list args) IM_FMTLIST(1);
-
-    IMGUI_API bool          BeginPopup(const char* str_id, ImGuiWindowFlags flags = 0);                                       
-    IMGUI_API bool          BeginPopupModal(const char* name, bool* p_open = NULL, ImGuiWindowFlags flags = 0);               
-    IMGUI_API void          EndPopup();                                                                                
-    IMGUI_API void          OpenPopup(const char* str_id, ImGuiPopupFlags popup_flags = 0);                               
-    IMGUI_API void          OpenPopupOnItemClick(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1);                               
-    IMGUI_API void          CloseCurrentPopup();                                                                        
-    IMGUI_API bool          BeginPopupContextItem(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1);                                                  
-    IMGUI_API bool          BeginPopupContextWindow(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1);       
-    IMGUI_API bool          BeginPopupContextVoid(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1);             
-    IMGUI_API bool          IsPopupOpen(const char* str_id, ImGuiPopupFlags flags = 0);                                
-
-    IMGUI_API bool          BeginTable(const char* str_id, int column, ImGuiTableFlags flags = 0, const ImVec2& outer_size = ImVec2(0.0f, 0.0f), float inner_width = 0.0f);
-    IMGUI_API void          EndTable();                                        
-    IMGUI_API void          TableNextRow(ImGuiTableRowFlags row_flags = 0, float min_row_height = 0.0f);          
-    IMGUI_API bool          TableNextColumn();                                                
-    IMGUI_API bool          TableSetColumnIndex(int column_n);                     
-    IMGUI_API void          TableSetupColumn(const char* label, ImGuiTableColumnFlags flags = 0, float init_width_or_weight = 0.0f, ImU32 user_id = 0);
-    IMGUI_API void          TableSetupScrollFreeze(int cols, int rows);         
-    IMGUI_API void          TableHeadersRow();                                        
-    IMGUI_API void          TableHeader(const char* label);                    
-    IMGUI_API ImGuiTableSortSpecs* TableGetSortSpecs();                                   
-    IMGUI_API int                   TableGetColumnCount();                              
-    IMGUI_API int                   TableGetColumnIndex();                          
-    IMGUI_API int                   TableGetRowIndex();                             
-    IMGUI_API const char*           TableGetColumnName(int column_n = -1);                       
-    IMGUI_API ImGuiTableColumnFlags TableGetColumnFlags(int column_n = -1);                      
-    IMGUI_API void                  TableSetBgColor(ImGuiTableBgTarget target, ImU32 color, int column_n = -1);                
-
-    IMGUI_API void          Columns(int count = 1, const char* id = NULL, bool border = true);
-    IMGUI_API void          NextColumn();                                                                      
-    IMGUI_API int           GetColumnIndex();                                                       
-    IMGUI_API float         GetColumnWidth(int column_index = -1);                                         
-    IMGUI_API void          SetColumnWidth(int column_index, float width);                                 
-    IMGUI_API float         GetColumnOffset(int column_index = -1);                                                          
-    IMGUI_API void          SetColumnOffset(int column_index, float offset_x);                                       
-    IMGUI_API int           GetColumnsCount();
-
-    IMGUI_API bool          BeginTabBar(const char* str_id, ImGuiTabBarFlags flags = 0);              
-    IMGUI_API void          EndTabBar();                                                               
-    IMGUI_API bool          BeginTabItem(const char* label, bool* p_open = NULL, ImGuiTabItemFlags flags = 0);           
-    IMGUI_API void          EndTabItem();                                                              
-    IMGUI_API bool          TabItemButton(const char* label, ImGuiTabItemFlags flags = 0);                        
-    IMGUI_API void          SetTabItemClosed(const char* tab_or_docked_window_label);                                             
-
-    IMGUI_API void          LogToTTY(int auto_open_depth = -1);                                      
-    IMGUI_API void          LogToFile(int auto_open_depth = -1, const char* filename = NULL);       
-    IMGUI_API void          LogToClipboard(int auto_open_depth = -1);                                
-    IMGUI_API void          LogFinish();                                                             
-    IMGUI_API void          LogButtons();                                                               
-    IMGUI_API void          LogText(const char* fmt, ...) IM_FMTARGS(1);                                 
-
-    IMGUI_API bool          BeginDragDropSource(ImGuiDragDropFlags flags = 0);                                                       
-    IMGUI_API bool          SetDragDropPayload(const char* type, const void* data, size_t sz, ImGuiCond cond = 0);                              
-    IMGUI_API void          EndDragDropSource();                                                                           
-    IMGUI_API bool                  BeginDragDropTarget();                                                                              
-    IMGUI_API const ImGuiPayload*   AcceptDragDropPayload(const char* type, ImGuiDragDropFlags flags = 0);                                
-    IMGUI_API void                  EndDragDropTarget();                                                                   
-    IMGUI_API const ImGuiPayload*   GetDragDropPayload();                                                                              
-
-    IMGUI_API void          PushClipRect(const ImVec2& clip_rect_min, const ImVec2& clip_rect_max, bool intersect_with_current_clip_rect);
-    IMGUI_API void          PopClipRect();
-
-    IMGUI_API void          SetItemDefaultFocus();                                                        
-    IMGUI_API void          SetKeyboardFocusHere(int offset = 0);                                                       
-
-    IMGUI_API bool          IsItemHovered(ImGuiHoveredFlags flags = 0);                                            
-    IMGUI_API bool          IsItemActive();                                                                                      
-    IMGUI_API bool          IsItemFocused();                                                            
-    IMGUI_API bool          IsItemClicked(ImGuiMouseButton mouse_button = 0);                                 
-    IMGUI_API bool          IsItemVisible();                                                                  
-    IMGUI_API bool          IsItemEdited();                                                                               
-    IMGUI_API bool          IsItemActivated();                                                             
-    IMGUI_API bool          IsItemDeactivated();                                                                     
-    IMGUI_API bool          IsItemDeactivatedAfterEdit();                                                                                          
-    IMGUI_API bool          IsItemToggledOpen();                                                          
-    IMGUI_API bool          IsAnyItemHovered();                                                     
-    IMGUI_API bool          IsAnyItemActive();                                                      
-    IMGUI_API bool          IsAnyItemFocused();                                                     
-    IMGUI_API ImVec2        GetItemRectMin();                                                             
-    IMGUI_API ImVec2        GetItemRectMax();                                                             
-    IMGUI_API ImVec2        GetItemRectSize();                                                       
-    IMGUI_API void          SetItemAllowOverlap();                                                                   
-
-    IMGUI_API bool          IsRectVisible(const ImVec2& size);                                                 
-    IMGUI_API bool          IsRectVisible(const ImVec2& rect_min, const ImVec2& rect_max);                        
-    IMGUI_API double        GetTime();                                                                   
-    IMGUI_API int           GetFrameCount();                                                              
-    IMGUI_API ImDrawList*   GetBackgroundDrawList();                                                              
-    IMGUI_API ImDrawList*   GetForegroundDrawList();                                                              
-    IMGUI_API ImDrawListSharedData* GetDrawListSharedData();                                              
-    IMGUI_API const char*   GetStyleColorName(ImGuiCol idx);                                                
-    IMGUI_API void          SetStateStorage(ImGuiStorage* storage);                                                
-    IMGUI_API ImGuiStorage* GetStateStorage();
-    IMGUI_API void          CalcListClipping(int items_count, float items_height, int* out_items_display_start, int* out_items_display_end);                       
-    IMGUI_API bool          BeginChildFrame(ImGuiID id, const ImVec2& size, ImGuiWindowFlags flags = 0);                 
-    IMGUI_API void          EndChildFrame();                                                                 
-
-    IMGUI_API ImVec2        CalcTextSize(const char* text, const char* text_end = NULL, bool hide_text_after_double_hash = false, float wrap_width = -1.0f);
-
-    IMGUI_API ImVec4        ColorConvertU32ToFloat4(ImU32 in);
-    IMGUI_API ImU32         ColorConvertFloat4ToU32(const ImVec4& in);
-    IMGUI_API void          ColorConvertRGBtoHSV(float r, float g, float b, float& out_h, float& out_s, float& out_v);
-    IMGUI_API void          ColorConvertHSVtoRGB(float h, float s, float v, float& out_r, float& out_g, float& out_b);
-
-    IMGUI_API int           GetKeyIndex(ImGuiKey imgui_key);                                             
-    IMGUI_API bool          IsKeyDown(int user_key_index);                                            
-    IMGUI_API bool          IsKeyPressed(int user_key_index, bool repeat = true);                             
-    IMGUI_API bool          IsKeyReleased(int user_key_index);                                          
-    IMGUI_API int           GetKeyPressedAmount(int key_index, float repeat_delay, float rate);                          
-    IMGUI_API void          CaptureKeyboardFromApp(bool want_capture_keyboard_value = true);                                              
-
-    IMGUI_API bool          IsMouseDown(ImGuiMouseButton button);                                   
-    IMGUI_API bool          IsMouseClicked(ImGuiMouseButton button, bool repeat = false);                
-    IMGUI_API bool          IsMouseReleased(ImGuiMouseButton button);                                    
-    IMGUI_API bool          IsMouseDoubleClicked(ImGuiMouseButton button);                                    
-    IMGUI_API bool          IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool clip = true);                      
-    IMGUI_API bool          IsMousePosValid(const ImVec2* mouse_pos = NULL);                                 
-    IMGUI_API bool          IsAnyMouseDown();                                                        
-    IMGUI_API ImVec2        GetMousePos();                                                                  
-    IMGUI_API ImVec2        GetMousePosOnOpeningCurrentPopup();                                                      
-    IMGUI_API bool          IsMouseDragging(ImGuiMouseButton button, float lock_threshold = -1.0f);                  
-    IMGUI_API ImVec2        GetMouseDragDelta(ImGuiMouseButton button = 0, float lock_threshold = -1.0f);                                            
-    IMGUI_API void          ResetMouseDragDelta(ImGuiMouseButton button = 0);                   
-    IMGUI_API ImGuiMouseCursor GetMouseCursor();                                                                              
-    IMGUI_API void          SetMouseCursor(ImGuiMouseCursor cursor_type);                           
-    IMGUI_API void          CaptureMouseFromApp(bool want_capture_mouse_value = true);                                          
-
-    IMGUI_API const char*   GetClipboardText();
-    IMGUI_API void          SetClipboardText(const char* text);
-
-    IMGUI_API void          LoadIniSettingsFromDisk(const char* ini_filename);                                
-    IMGUI_API void          LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size=0);                    
-    IMGUI_API void          SaveIniSettingsToDisk(const char* ini_filename);                                               
-    IMGUI_API const char*   SaveIniSettingsToMemory(size_t* out_ini_size = NULL);                                              
-
-    IMGUI_API bool          DebugCheckVersionAndDataLayout(const char* version_str, size_t sz_io, size_t sz_style, size_t sz_vec2, size_t sz_vec4, size_t sz_drawvert, size_t sz_drawidx);       
-
-    IMGUI_API void          SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data = NULL);
-    IMGUI_API void*         MemAlloc(size_t size);
-    IMGUI_API void          MemFree(void* ptr);
-
-}   
-
-enum ImGuiWindowFlags_
-{
-    ImGuiWindowFlags_None                   = 0,
-    ImGuiWindowFlags_NoTitleBar             = 1 << 0,     
-    ImGuiWindowFlags_NoResize               = 1 << 1,          
-    ImGuiWindowFlags_NoMove                 = 1 << 2,        
-    ImGuiWindowFlags_NoScrollbar            = 1 << 3,             
-    ImGuiWindowFlags_NoScrollWithMouse      = 1 << 4,                          
-    ImGuiWindowFlags_NoCollapse             = 1 << 5,           
-    ImGuiWindowFlags_AlwaysAutoResize       = 1 << 6,           
-    ImGuiWindowFlags_NoBackground           = 1 << 7,                
-    ImGuiWindowFlags_NoSavedSettings        = 1 << 8,         
-    ImGuiWindowFlags_NoMouseInputs          = 1 << 9,           
-    ImGuiWindowFlags_MenuBar                = 1 << 10,     
-    ImGuiWindowFlags_HorizontalScrollbar    = 1 << 11,                              
-    ImGuiWindowFlags_NoFocusOnAppearing     = 1 << 12,            
-    ImGuiWindowFlags_NoBringToFrontOnFocus  = 1 << 13,                   
-    ImGuiWindowFlags_AlwaysVerticalScrollbar= 1 << 14,           
-    ImGuiWindowFlags_AlwaysHorizontalScrollbar=1<< 15,           
-    ImGuiWindowFlags_AlwaysUseWindowPadding = 1 << 16,                   
-    ImGuiWindowFlags_NoNavInputs            = 1 << 18,        
-    ImGuiWindowFlags_NoNavFocus             = 1 << 19,              
-    ImGuiWindowFlags_UnsavedDocument        = 1 << 20,                                                   
-    ImGuiWindowFlags_NoNav                  = ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
-    ImGuiWindowFlags_NoDecoration           = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse,
-    ImGuiWindowFlags_NoInputs               = ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
-
-    ImGuiWindowFlags_NavFlattened           = 1 << 23,                      
-    ImGuiWindowFlags_ChildWindow            = 1 << 24,         
-    ImGuiWindowFlags_Tooltip                = 1 << 25,         
-    ImGuiWindowFlags_Popup                  = 1 << 26,         
-    ImGuiWindowFlags_Modal                  = 1 << 27,         
-    ImGuiWindowFlags_ChildMenu              = 1 << 28          
-
-};
-
-enum ImGuiInputTextFlags_
-{
-    ImGuiInputTextFlags_None                = 0,
-    ImGuiInputTextFlags_CharsDecimal        = 1 << 0,     
-    ImGuiInputTextFlags_CharsHexadecimal    = 1 << 1,     
-    ImGuiInputTextFlags_CharsUppercase      = 1 << 2,       
-    ImGuiInputTextFlags_CharsNoBlank        = 1 << 3,       
-    ImGuiInputTextFlags_AutoSelectAll       = 1 << 4,           
-    ImGuiInputTextFlags_EnterReturnsTrue    = 1 << 5,                        
-    ImGuiInputTextFlags_CallbackCompletion  = 1 << 6,          
-    ImGuiInputTextFlags_CallbackHistory     = 1 << 7,           
-    ImGuiInputTextFlags_CallbackAlways      = 1 << 8,                
-    ImGuiInputTextFlags_CallbackCharFilter  = 1 << 9,                         
-    ImGuiInputTextFlags_AllowTabInput       = 1 << 10,            
-    ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 11,                       
-    ImGuiInputTextFlags_NoHorizontalScroll  = 1 << 12,       
-    ImGuiInputTextFlags_AlwaysInsertMode    = 1 << 13,    
-    ImGuiInputTextFlags_ReadOnly            = 1 << 14,    
-    ImGuiInputTextFlags_Password            = 1 << 15,         
-    ImGuiInputTextFlags_NoUndoRedo          = 1 << 16,                             
-    ImGuiInputTextFlags_CharsScientific     = 1 << 17,       
-    ImGuiInputTextFlags_CallbackResize      = 1 << 18,                                                          
-    ImGuiInputTextFlags_CallbackEdit        = 1 << 19,                            
-    ImGuiInputTextFlags_Multiline           = 1 << 20,       
-    ImGuiInputTextFlags_NoMarkEdited        = 1 << 21             
-};
-
-enum ImGuiTreeNodeFlags_
-{
-    ImGuiTreeNodeFlags_None                 = 0,
-    ImGuiTreeNodeFlags_Selected             = 1 << 0,      
-    ImGuiTreeNodeFlags_Framed               = 1 << 1,          
-    ImGuiTreeNodeFlags_AllowItemOverlap     = 1 << 2,             
-    ImGuiTreeNodeFlags_NoTreePushOnOpen     = 1 << 3,                     
-    ImGuiTreeNodeFlags_NoAutoOpenOnLog      = 1 << 4,                     
-    ImGuiTreeNodeFlags_DefaultOpen          = 1 << 5,        
-    ImGuiTreeNodeFlags_OpenOnDoubleClick    = 1 << 6,        
-    ImGuiTreeNodeFlags_OpenOnArrow          = 1 << 7,                        
-    ImGuiTreeNodeFlags_Leaf                 = 1 << 8,              
-    ImGuiTreeNodeFlags_Bullet               = 1 << 9,         
-    ImGuiTreeNodeFlags_FramePadding         = 1 << 10,                       
-    ImGuiTreeNodeFlags_SpanAvailWidth       = 1 << 11,                                                   
-    ImGuiTreeNodeFlags_SpanFullWidth        = 1 << 12,               
-    ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13,                      
-    ImGuiTreeNodeFlags_CollapsingHeader     = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog
-};
-
-enum ImGuiPopupFlags_
-{
-    ImGuiPopupFlags_None                    = 0,
-    ImGuiPopupFlags_MouseButtonLeft         = 0,                        
-    ImGuiPopupFlags_MouseButtonRight        = 1,                        
-    ImGuiPopupFlags_MouseButtonMiddle       = 2,                        
-    ImGuiPopupFlags_MouseButtonMask_        = 0x1F,
-    ImGuiPopupFlags_MouseButtonDefault_     = 1,
-    ImGuiPopupFlags_NoOpenOverExistingPopup = 1 << 5,                     
-    ImGuiPopupFlags_NoOpenOverItems         = 1 << 6,                
-    ImGuiPopupFlags_AnyPopupId              = 1 << 7,              
-    ImGuiPopupFlags_AnyPopupLevel           = 1 << 8,                   
-    ImGuiPopupFlags_AnyPopup                = ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel
-};
-
-enum ImGuiSelectableFlags_
-{
-    ImGuiSelectableFlags_None               = 0,
-    ImGuiSelectableFlags_DontClosePopups    = 1 << 0,          
-    ImGuiSelectableFlags_SpanAllColumns     = 1 << 1,                
-    ImGuiSelectableFlags_AllowDoubleClick   = 1 << 2,          
-    ImGuiSelectableFlags_Disabled           = 1 << 3,          
-    ImGuiSelectableFlags_AllowItemOverlap   = 1 << 4               
-};
-
-enum ImGuiComboFlags_
-{
-    ImGuiComboFlags_None                    = 0,
-    ImGuiComboFlags_PopupAlignLeft          = 1 << 0,           
-    ImGuiComboFlags_HeightSmall             = 1 << 1,                           
-    ImGuiComboFlags_HeightRegular           = 1 << 2,        
-    ImGuiComboFlags_HeightLarge             = 1 << 3,       
-    ImGuiComboFlags_HeightLargest           = 1 << 4,         
-    ImGuiComboFlags_NoArrowButton           = 1 << 5,             
-    ImGuiComboFlags_NoPreview               = 1 << 6,         
-    ImGuiComboFlags_HeightMask_             = ImGuiComboFlags_HeightSmall | ImGuiComboFlags_HeightRegular | ImGuiComboFlags_HeightLarge | ImGuiComboFlags_HeightLargest
-};
-
-enum ImGuiTabBarFlags_
-{
-    ImGuiTabBarFlags_None                           = 0,
-    ImGuiTabBarFlags_Reorderable                    = 1 << 0,                    
-    ImGuiTabBarFlags_AutoSelectNewTabs              = 1 << 1,          
-    ImGuiTabBarFlags_TabListPopupButton             = 1 << 2,           
-    ImGuiTabBarFlags_NoCloseWithMiddleMouseButton   = 1 << 3,                                    
-    ImGuiTabBarFlags_NoTabListScrollingButtons      = 1 << 4,            
-    ImGuiTabBarFlags_NoTooltip                      = 1 << 5,         
-    ImGuiTabBarFlags_FittingPolicyResizeDown        = 1 << 6,         
-    ImGuiTabBarFlags_FittingPolicyScroll            = 1 << 7,          
-    ImGuiTabBarFlags_FittingPolicyMask_             = ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll,
-    ImGuiTabBarFlags_FittingPolicyDefault_          = ImGuiTabBarFlags_FittingPolicyResizeDown
-};
-
-enum ImGuiTabItemFlags_
-{
-    ImGuiTabItemFlags_None                          = 0,
-    ImGuiTabItemFlags_UnsavedDocument               = 1 << 0,                                         
-    ImGuiTabItemFlags_SetSelected                   = 1 << 1,              
-    ImGuiTabItemFlags_NoCloseWithMiddleMouseButton  = 1 << 2,                                    
-    ImGuiTabItemFlags_NoPushId                      = 1 << 3,        
-    ImGuiTabItemFlags_NoTooltip                     = 1 << 4,         
-    ImGuiTabItemFlags_NoReorder                     = 1 << 5,               
-    ImGuiTabItemFlags_Leading                       = 1 << 6,                    
-    ImGuiTabItemFlags_Trailing                      = 1 << 7                   
-};
-
-enum ImGuiTableFlags_
-{
-    ImGuiTableFlags_None                       = 0,
-    ImGuiTableFlags_Resizable                  = 1 << 0,      
-    ImGuiTableFlags_Reorderable                = 1 << 1,                 
-    ImGuiTableFlags_Hideable                   = 1 << 2,         
-    ImGuiTableFlags_Sortable                   = 1 << 3,                
-    ImGuiTableFlags_NoSavedSettings            = 1 << 4,               
-    ImGuiTableFlags_ContextMenuInBody          = 1 << 5,                   
-    ImGuiTableFlags_RowBg                      = 1 << 6,                     
-    ImGuiTableFlags_BordersInnerH              = 1 << 7,        
-    ImGuiTableFlags_BordersOuterH              = 1 << 8,           
-    ImGuiTableFlags_BordersInnerV              = 1 << 9,        
-    ImGuiTableFlags_BordersOuterV              = 1 << 10,           
-    ImGuiTableFlags_BordersH                   = ImGuiTableFlags_BordersInnerH | ImGuiTableFlags_BordersOuterH,    
-    ImGuiTableFlags_BordersV                   = ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_BordersOuterV,    
-    ImGuiTableFlags_BordersInner               = ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_BordersInnerH,    
-    ImGuiTableFlags_BordersOuter               = ImGuiTableFlags_BordersOuterV | ImGuiTableFlags_BordersOuterH,    
-    ImGuiTableFlags_Borders                    = ImGuiTableFlags_BordersInner | ImGuiTableFlags_BordersOuter,      
-    ImGuiTableFlags_NoBordersInBody            = 1 << 11,                    
-    ImGuiTableFlags_NoBordersInBodyUntilResize = 1 << 12,                        
-    ImGuiTableFlags_SizingFixedFit             = 1 << 13,                
-    ImGuiTableFlags_SizingFixedSame            = 2 << 13,                        
-    ImGuiTableFlags_SizingStretchProp          = 3 << 13,               
-    ImGuiTableFlags_SizingStretchSame          = 4 << 13,               
-    ImGuiTableFlags_NoHostExtendX              = 1 << 16,                       
-    ImGuiTableFlags_NoHostExtendY              = 1 << 17,                               
-    ImGuiTableFlags_NoKeepColumnsVisible       = 1 << 18,                       
-    ImGuiTableFlags_PreciseWidths              = 1 << 19,                                      
-    ImGuiTableFlags_NoClip                     = 1 << 20,                          
-    ImGuiTableFlags_PadOuterX                  = 1 << 21,                
-    ImGuiTableFlags_NoPadOuterX                = 1 << 22,          
-    ImGuiTableFlags_NoPadInnerX                = 1 << 23,                     
-    ImGuiTableFlags_ScrollX                    = 1 << 24,                                 
-    ImGuiTableFlags_ScrollY                    = 1 << 25,               
-    ImGuiTableFlags_SortMulti                  = 1 << 26,                    
-    ImGuiTableFlags_SortTristate               = 1 << 27,                
-
-    ImGuiTableFlags_SizingMask_                = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_SizingFixedSame | ImGuiTableFlags_SizingStretchProp | ImGuiTableFlags_SizingStretchSame
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-#endif
-};
-
-enum ImGuiTableColumnFlags_
-{
-    ImGuiTableColumnFlags_None                  = 0,
-    ImGuiTableColumnFlags_DefaultHide           = 1 << 0,        
-    ImGuiTableColumnFlags_DefaultSort           = 1 << 1,        
-    ImGuiTableColumnFlags_WidthStretch          = 1 << 2,                    
-    ImGuiTableColumnFlags_WidthFixed            = 1 << 3,                       
-    ImGuiTableColumnFlags_NoResize              = 1 << 4,      
-    ImGuiTableColumnFlags_NoReorder             = 1 << 5,                   
-    ImGuiTableColumnFlags_NoHide                = 1 << 6,         
-    ImGuiTableColumnFlags_NoClip                = 1 << 7,                  
-    ImGuiTableColumnFlags_NoSort                = 1 << 8,                  
-    ImGuiTableColumnFlags_NoSortAscending       = 1 << 9,           
-    ImGuiTableColumnFlags_NoSortDescending      = 1 << 10,          
-    ImGuiTableColumnFlags_NoHeaderWidth         = 1 << 11,           
-    ImGuiTableColumnFlags_PreferSortAscending   = 1 << 12,               
-    ImGuiTableColumnFlags_PreferSortDescending  = 1 << 13,              
-    ImGuiTableColumnFlags_IndentEnable          = 1 << 14,             
-    ImGuiTableColumnFlags_IndentDisable         = 1 << 15,                       
-
-    ImGuiTableColumnFlags_IsEnabled             = 1 << 20,                   
-    ImGuiTableColumnFlags_IsVisible             = 1 << 21,             
-    ImGuiTableColumnFlags_IsSorted              = 1 << 22,          
-    ImGuiTableColumnFlags_IsHovered             = 1 << 23,       
-
-    ImGuiTableColumnFlags_WidthMask_            = ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_WidthFixed,
-    ImGuiTableColumnFlags_IndentMask_           = ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_IndentDisable,
-    ImGuiTableColumnFlags_StatusMask_           = ImGuiTableColumnFlags_IsEnabled | ImGuiTableColumnFlags_IsVisible | ImGuiTableColumnFlags_IsSorted | ImGuiTableColumnFlags_IsHovered,
-    ImGuiTableColumnFlags_NoDirectResize_       = 1 << 30                    
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-#endif
-};
-
-enum ImGuiTableRowFlags_
-{
-    ImGuiTableRowFlags_None                         = 0,
-    ImGuiTableRowFlags_Headers                      = 1 << 0                      
-};
-
-enum ImGuiTableBgTarget_
-{
-    ImGuiTableBgTarget_None                         = 0,
-    ImGuiTableBgTarget_RowBg0                       = 1,                       
-    ImGuiTableBgTarget_RowBg1                       = 2,                  
-    ImGuiTableBgTarget_CellBg                       = 3               
-};
-
-enum ImGuiFocusedFlags_
-{
-    ImGuiFocusedFlags_None                          = 0,
-    ImGuiFocusedFlags_ChildWindows                  = 1 << 0,              
-    ImGuiFocusedFlags_RootWindow                    = 1 << 1,               
-    ImGuiFocusedFlags_AnyWindow                     = 1 << 2,                                   
-    ImGuiFocusedFlags_RootAndChildWindows           = ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows
-};
-
-enum ImGuiHoveredFlags_
-{
-    ImGuiHoveredFlags_None                          = 0,                                
-    ImGuiHoveredFlags_ChildWindows                  = 1 << 0,               
-    ImGuiHoveredFlags_RootWindow                    = 1 << 1,                
-    ImGuiHoveredFlags_AnyWindow                     = 1 << 2,            
-    ImGuiHoveredFlags_AllowWhenBlockedByPopup       = 1 << 3,                 
-    ImGuiHoveredFlags_AllowWhenBlockedByActiveItem  = 1 << 5,                      
-    ImGuiHoveredFlags_AllowWhenOverlapped           = 1 << 6,                
-    ImGuiHoveredFlags_AllowWhenDisabled             = 1 << 7,           
-    ImGuiHoveredFlags_RectOnly                      = ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem | ImGuiHoveredFlags_AllowWhenOverlapped,
-    ImGuiHoveredFlags_RootAndChildWindows           = ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows
-};
-
-enum ImGuiDragDropFlags_
-{
-    ImGuiDragDropFlags_None                         = 0,
-    ImGuiDragDropFlags_SourceNoPreviewTooltip       = 1 << 0,                              
-    ImGuiDragDropFlags_SourceNoDisableHover         = 1 << 1,                                      
-    ImGuiDragDropFlags_SourceNoHoldToOpenOthers     = 1 << 2,                        
-    ImGuiDragDropFlags_SourceAllowNullID            = 1 << 3,                                             
-    ImGuiDragDropFlags_SourceExtern                 = 1 << 4,                             
-    ImGuiDragDropFlags_SourceAutoExpirePayload      = 1 << 5,                     
-    ImGuiDragDropFlags_AcceptBeforeDelivery         = 1 << 10,                           
-    ImGuiDragDropFlags_AcceptNoDrawDefaultRect      = 1 << 11,             
-    ImGuiDragDropFlags_AcceptNoPreviewTooltip       = 1 << 12,           
-    ImGuiDragDropFlags_AcceptPeekOnly               = ImGuiDragDropFlags_AcceptBeforeDelivery | ImGuiDragDropFlags_AcceptNoDrawDefaultRect           
-};
-
-#define IMGUI_PAYLOAD_TYPE_COLOR_3F     "_COL3F"                 
-#define IMGUI_PAYLOAD_TYPE_COLOR_4F     "_COL4F"               
-
-enum ImGuiDataType_
-{
-    ImGuiDataType_S8,              
-    ImGuiDataType_U8,         
-    ImGuiDataType_S16,       
-    ImGuiDataType_U16,        
-    ImGuiDataType_S32,       
-    ImGuiDataType_U32,        
-    ImGuiDataType_S64,          
-    ImGuiDataType_U64,            
-    ImGuiDataType_Float,     
-    ImGuiDataType_Double,    
-    ImGuiDataType_COUNT
-};
-
-enum ImGuiDir_
-{
-    ImGuiDir_None    = -1,
-    ImGuiDir_Left    = 0,
-    ImGuiDir_Right   = 1,
-    ImGuiDir_Up      = 2,
-    ImGuiDir_Down    = 3,
-    ImGuiDir_COUNT
-};
-
-enum ImGuiSortDirection_
-{
-    ImGuiSortDirection_None         = 0,
-    ImGuiSortDirection_Ascending    = 1,         
-    ImGuiSortDirection_Descending   = 2          
-};
-
-enum ImGuiKey_
-{
-    ImGuiKey_Tab,
-    ImGuiKey_LeftArrow,
-    ImGuiKey_RightArrow,
-    ImGuiKey_UpArrow,
-    ImGuiKey_DownArrow,
-    ImGuiKey_PageUp,
-    ImGuiKey_PageDown,
-    ImGuiKey_Home,
-    ImGuiKey_End,
-    ImGuiKey_Insert,
-    ImGuiKey_Delete,
-    ImGuiKey_Backspace,
-    ImGuiKey_Space,
-    ImGuiKey_Enter,
-    ImGuiKey_Escape,
-    ImGuiKey_KeyPadEnter,
-    ImGuiKey_A,                       
-    ImGuiKey_C,                      
-    ImGuiKey_V,                      
-    ImGuiKey_X,                      
-    ImGuiKey_Y,                      
-    ImGuiKey_Z,                      
-    ImGuiKey_COUNT
-};
-
-enum ImGuiKeyModFlags_
-{
-    ImGuiKeyModFlags_None       = 0,
-    ImGuiKeyModFlags_Ctrl       = 1 << 0,
-    ImGuiKeyModFlags_Shift      = 1 << 1,
-    ImGuiKeyModFlags_Alt        = 1 << 2,
-    ImGuiKeyModFlags_Super      = 1 << 3
-};
-
-enum ImGuiNavInput_
-{
-    ImGuiNavInput_Activate,                               
-    ImGuiNavInput_Cancel,                                              
-    ImGuiNavInput_Input,                                    
-    ImGuiNavInput_Menu,                            
-    ImGuiNavInput_DpadLeft,                         
-    ImGuiNavInput_DpadRight,     
-    ImGuiNavInput_DpadUp,        
-    ImGuiNavInput_DpadDown,      
-    ImGuiNavInput_LStickLeft,                           
-    ImGuiNavInput_LStickRight,   
-    ImGuiNavInput_LStickUp,      
-    ImGuiNavInput_LStickDown,    
-    ImGuiNavInput_FocusPrev,                                           
-    ImGuiNavInput_FocusNext,                                           
-    ImGuiNavInput_TweakSlow,                                                    
-    ImGuiNavInput_TweakFast,                                                    
-
-    ImGuiNavInput_KeyMenu_,                                            
-    ImGuiNavInput_KeyLeft_,                                               
-    ImGuiNavInput_KeyRight_,       
-    ImGuiNavInput_KeyUp_,          
-    ImGuiNavInput_KeyDown_,        
-    ImGuiNavInput_COUNT,
-    ImGuiNavInput_InternalStart_ = ImGuiNavInput_KeyMenu_
-};
-
-enum ImGuiConfigFlags_
-{
-    ImGuiConfigFlags_None                   = 0,
-    ImGuiConfigFlags_NavEnableKeyboard      = 1 << 0,                
-    ImGuiConfigFlags_NavEnableGamepad       = 1 << 1,                         
-    ImGuiConfigFlags_NavEnableSetMousePos   = 1 << 2,                                                     
-    ImGuiConfigFlags_NavNoCaptureKeyboard   = 1 << 3,               
-    ImGuiConfigFlags_NoMouse                = 1 << 4,                     
-    ImGuiConfigFlags_NoMouseCursorChange    = 1 << 5,                                               
-
-    ImGuiConfigFlags_IsSRGB                 = 1 << 20,     
-    ImGuiConfigFlags_IsTouchScreen          = 1 << 21             
-};
-
-enum ImGuiBackendFlags_
-{
-    ImGuiBackendFlags_None                  = 0,
-    ImGuiBackendFlags_HasGamepad            = 1 << 0,            
-    ImGuiBackendFlags_HasMouseCursors       = 1 << 1,               
-    ImGuiBackendFlags_HasSetMousePos        = 1 << 2,                    
-    ImGuiBackendFlags_RendererHasVtxOffset  = 1 << 3                     
-};
-
-enum ImGuiCol_
-{
-    ImGuiCol_Text,
-    ImGuiCol_TextDisabled,
-    ImGuiCol_WindowBg,                  
-    ImGuiCol_ChildBg,                   
-    ImGuiCol_PopupBg,                     
-    ImGuiCol_Border,
-    ImGuiCol_BorderShadow,
-    ImGuiCol_FrameBg,                        
-    ImGuiCol_FrameBgHovered,
-    ImGuiCol_FrameBgActive,
-    ImGuiCol_TitleBg,
-    ImGuiCol_TitleBgActive,
-    ImGuiCol_TitleBgCollapsed,
-    ImGuiCol_MenuBarBg,
-    ImGuiCol_ScrollbarBg,
-    ImGuiCol_ScrollbarGrab,
-    ImGuiCol_ScrollbarGrabHovered,
-    ImGuiCol_ScrollbarGrabActive,
-    ImGuiCol_CheckMark,
-    ImGuiCol_SliderGrab,
-    ImGuiCol_SliderGrabActive,
-    ImGuiCol_Button,
-    ImGuiCol_ButtonHovered,
-    ImGuiCol_ButtonActive,
-    ImGuiCol_Header,                         
-    ImGuiCol_HeaderHovered,
-    ImGuiCol_HeaderActive,
-    ImGuiCol_Separator,
-    ImGuiCol_SeparatorHovered,
-    ImGuiCol_SeparatorActive,
-    ImGuiCol_ResizeGrip,
-    ImGuiCol_ResizeGripHovered,
-    ImGuiCol_ResizeGripActive,
-    ImGuiCol_Tab,
-    ImGuiCol_TabHovered,
-    ImGuiCol_TabActive,
-    ImGuiCol_TabUnfocused,
-    ImGuiCol_TabUnfocusedActive,
-    ImGuiCol_PlotLines,
-    ImGuiCol_PlotLinesHovered,
-    ImGuiCol_PlotHistogram,
-    ImGuiCol_PlotHistogramHovered,
-    ImGuiCol_TableHeaderBg,            
-    ImGuiCol_TableBorderStrong,              
-    ImGuiCol_TableBorderLight,             
-    ImGuiCol_TableRowBg,                 
-    ImGuiCol_TableRowBgAlt,              
-    ImGuiCol_TextSelectedBg,
-    ImGuiCol_DragDropTarget,
-    ImGuiCol_NavHighlight,              
-    ImGuiCol_NavWindowingHighlight,      
-    ImGuiCol_NavWindowingDimBg,               
-    ImGuiCol_ModalWindowDimBg,                 
-    ImGuiCol_COUNT
-};
-
-enum ImGuiStyleVar_
-{
-    ImGuiStyleVar_Alpha,                     
-    ImGuiStyleVar_WindowPadding,            
-    ImGuiStyleVar_WindowRounding,            
-    ImGuiStyleVar_WindowBorderSize,          
-    ImGuiStyleVar_WindowMinSize,            
-    ImGuiStyleVar_WindowTitleAlign,         
-    ImGuiStyleVar_ChildRounding,             
-    ImGuiStyleVar_ChildBorderSize,           
-    ImGuiStyleVar_PopupRounding,             
-    ImGuiStyleVar_PopupBorderSize,           
-    ImGuiStyleVar_FramePadding,             
-    ImGuiStyleVar_FrameRounding,             
-    ImGuiStyleVar_FrameBorderSize,           
-    ImGuiStyleVar_ItemSpacing,              
-    ImGuiStyleVar_ItemInnerSpacing,         
-    ImGuiStyleVar_IndentSpacing,             
-    ImGuiStyleVar_CellPadding,              
-    ImGuiStyleVar_ScrollbarSize,             
-    ImGuiStyleVar_ScrollbarRounding,         
-    ImGuiStyleVar_GrabMinSize,               
-    ImGuiStyleVar_GrabRounding,              
-    ImGuiStyleVar_TabRounding,               
-    ImGuiStyleVar_ButtonTextAlign,          
-    ImGuiStyleVar_SelectableTextAlign,      
-    ImGuiStyleVar_COUNT
-};
-
-enum ImGuiButtonFlags_
-{
-    ImGuiButtonFlags_None                   = 0,
-    ImGuiButtonFlags_MouseButtonLeft        = 1 << 0,         
-    ImGuiButtonFlags_MouseButtonRight       = 1 << 1,        
-    ImGuiButtonFlags_MouseButtonMiddle      = 1 << 2,        
-
-    ImGuiButtonFlags_MouseButtonMask_       = ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight | ImGuiButtonFlags_MouseButtonMiddle,
-    ImGuiButtonFlags_MouseButtonDefault_    = ImGuiButtonFlags_MouseButtonLeft
-};
-
-enum ImGuiColorEditFlags_
-{
-    ImGuiColorEditFlags_None            = 0,
-    ImGuiColorEditFlags_NoAlpha         = 1 << 1,                                
-    ImGuiColorEditFlags_NoPicker        = 1 << 2,                         
-    ImGuiColorEditFlags_NoOptions       = 1 << 3,                           
-    ImGuiColorEditFlags_NoSmallPreview  = 1 << 4,                                 
-    ImGuiColorEditFlags_NoInputs        = 1 << 5,                                
-    ImGuiColorEditFlags_NoTooltip       = 1 << 6,                          
-    ImGuiColorEditFlags_NoLabel         = 1 << 7,                                   
-    ImGuiColorEditFlags_NoSidePreview   = 1 << 8,                                  
-    ImGuiColorEditFlags_NoDragDrop      = 1 << 9,                             
-    ImGuiColorEditFlags_NoBorder        = 1 << 10,                        
-
-    ImGuiColorEditFlags_AlphaBar        = 1 << 16,                        
-    ImGuiColorEditFlags_AlphaPreview    = 1 << 17,                               
-    ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 18,                            
-    ImGuiColorEditFlags_HDR             = 1 << 19,                                    
-    ImGuiColorEditFlags_DisplayRGB      = 1 << 20,                       
-    ImGuiColorEditFlags_DisplayHSV      = 1 << 21,        
-    ImGuiColorEditFlags_DisplayHex      = 1 << 22,        
-    ImGuiColorEditFlags_Uint8           = 1 << 23,              
-    ImGuiColorEditFlags_Float           = 1 << 24,                         
-    ImGuiColorEditFlags_PickerHueBar    = 1 << 25,               
-    ImGuiColorEditFlags_PickerHueWheel  = 1 << 26,               
-    ImGuiColorEditFlags_InputRGB        = 1 << 27,                  
-    ImGuiColorEditFlags_InputHSV        = 1 << 28,                  
-
-    ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_PickerHueBar,
-
-    ImGuiColorEditFlags__DisplayMask    = ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_DisplayHex,
-    ImGuiColorEditFlags__DataTypeMask   = ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_Float,
-    ImGuiColorEditFlags__PickerMask     = ImGuiColorEditFlags_PickerHueWheel | ImGuiColorEditFlags_PickerHueBar,
-    ImGuiColorEditFlags__InputMask      = ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_InputHSV
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-    , ImGuiColorEditFlags_RGB = ImGuiColorEditFlags_DisplayRGB, ImGuiColorEditFlags_HSV = ImGuiColorEditFlags_DisplayHSV, ImGuiColorEditFlags_HEX = ImGuiColorEditFlags_DisplayHex     
-#endif
-};
-
-enum ImGuiSliderFlags_
-{
-    ImGuiSliderFlags_None                   = 0,
-    ImGuiSliderFlags_AlwaysClamp            = 1 << 4,                         
-    ImGuiSliderFlags_Logarithmic            = 1 << 5,                           
-    ImGuiSliderFlags_NoRoundToFormat        = 1 << 6,                            
-    ImGuiSliderFlags_NoInput                = 1 << 7,                    
-    ImGuiSliderFlags_InvalidMask_           = 0x7000000F                                   
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-    , ImGuiSliderFlags_ClampOnInput = ImGuiSliderFlags_AlwaysClamp    
-#endif
-};
-
-enum ImGuiMouseButton_
-{
-    ImGuiMouseButton_Left = 0,
-    ImGuiMouseButton_Right = 1,
-    ImGuiMouseButton_Middle = 2,
-    ImGuiMouseButton_COUNT = 5
-};
-
-enum ImGuiMouseCursor_
-{
-    ImGuiMouseCursor_None = -1,
-    ImGuiMouseCursor_Arrow = 0,
-    ImGuiMouseCursor_TextInput,              
-    ImGuiMouseCursor_ResizeAll,              
-    ImGuiMouseCursor_ResizeNS,                
-    ImGuiMouseCursor_ResizeEW,                   
-    ImGuiMouseCursor_ResizeNESW,                 
-    ImGuiMouseCursor_ResizeNWSE,                 
-    ImGuiMouseCursor_Hand,                       
-    ImGuiMouseCursor_NotAllowed,                  
-    ImGuiMouseCursor_COUNT
-};
-
-enum ImGuiCond_
-{
-    ImGuiCond_None          = 0,                 
-    ImGuiCond_Always        = 1 << 0,         
-    ImGuiCond_Once          = 1 << 1,                
-    ImGuiCond_FirstUseEver  = 1 << 2,                   
-    ImGuiCond_Appearing     = 1 << 3                   
-};
-
-struct ImNewWrapper {};
-inline void* operator new(size_t, ImNewWrapper, void* ptr) { return ptr; }
-inline void  operator delete(void*, ImNewWrapper, void*)   {}            
-#define IM_ALLOC(_SIZE)                     ImGui::MemAlloc(_SIZE)
-#define IM_FREE(_PTR)                       ImGui::MemFree(_PTR)
-#define IM_PLACEMENT_NEW(_PTR)              new(ImNewWrapper(), _PTR)
-#define IM_NEW(_TYPE)                       new(ImNewWrapper(), ImGui::MemAlloc(sizeof(_TYPE))) _TYPE
-template<typename T> void IM_DELETE(T* p)   { if (p) { p->~T(); ImGui::MemFree(p); } }
-
-template<typename T>
-struct ImVector
-{
-    int                 Size;
-    int                 Capacity;
-    T*                  Data;
-
-    typedef T                   value_type;
-    typedef value_type*         iterator;
-    typedef const value_type*   const_iterator;
-
-    inline ImVector()                                       { Size = Capacity = 0; Data = NULL; }
-    inline ImVector(const ImVector<T>& src)                 { Size = Capacity = 0; Data = NULL; operator=(src); }
-    inline ImVector<T>& operator=(const ImVector<T>& src)   { clear(); resize(src.Size); memcpy(Data, src.Data, (size_t)Size * sizeof(T)); return *this; }
-    inline ~ImVector()                                      { if (Data) IM_FREE(Data); }
-
-    inline bool         empty() const                       { return Size == 0; }
-    inline int          size() const                        { return Size; }
-    inline int          size_in_bytes() const               { return Size * (int)sizeof(T); }
-    inline int          max_size() const                    { return 0x7FFFFFFF / (int)sizeof(T); }
-    inline int          capacity() const                    { return Capacity; }
-    inline T&           operator[](int i)                   { IM_ASSERT(i >= 0 && i < Size); return Data[i]; }
-    inline const T&     operator[](int i) const             { IM_ASSERT(i >= 0 && i < Size); return Data[i]; }
-
-    inline void         clear()                             { if (Data) { Size = Capacity = 0; IM_FREE(Data); Data = NULL; } }
-    inline T*           begin()                             { return Data; }
-    inline const T*     begin() const                       { return Data; }
-    inline T*           end()                               { return Data + Size; }
-    inline const T*     end() const                         { return Data + Size; }
-    inline T&           front()                             { IM_ASSERT(Size > 0); return Data[0]; }
-    inline const T&     front() const                       { IM_ASSERT(Size > 0); return Data[0]; }
-    inline T&           back()                              { IM_ASSERT(Size > 0); return Data[Size - 1]; }
-    inline const T&     back() const                        { IM_ASSERT(Size > 0); return Data[Size - 1]; }
-    inline void         swap(ImVector<T>& rhs)              { int rhs_size = rhs.Size; rhs.Size = Size; Size = rhs_size; int rhs_cap = rhs.Capacity; rhs.Capacity = Capacity; Capacity = rhs_cap; T* rhs_data = rhs.Data; rhs.Data = Data; Data = rhs_data; }
-
-    inline int          _grow_capacity(int sz) const        { int new_capacity = Capacity ? (Capacity + Capacity / 2) : 8; return new_capacity > sz ? new_capacity : sz; }
-    inline void         resize(int new_size)                { if (new_size > Capacity) reserve(_grow_capacity(new_size)); Size = new_size; }
-    inline void         resize(int new_size, const T& v)    { if (new_size > Capacity) reserve(_grow_capacity(new_size)); if (new_size > Size) for (int n = Size; n < new_size; n++) memcpy(&Data[n], &v, sizeof(v)); Size = new_size; }
-    inline void         shrink(int new_size)                { IM_ASSERT(new_size <= Size); Size = new_size; }              
-    inline void         reserve(int new_capacity)           { if (new_capacity <= Capacity) return; T* new_data = (T*)IM_ALLOC((size_t)new_capacity * sizeof(T)); if (Data) { memcpy(new_data, Data, (size_t)Size * sizeof(T)); IM_FREE(Data); } Data = new_data; Capacity = new_capacity; }
-
-    inline void         push_back(const T& v)               { if (Size == Capacity) reserve(_grow_capacity(Size + 1)); memcpy(&Data[Size], &v, sizeof(v)); Size++; }
-    inline void         pop_back()                          { IM_ASSERT(Size > 0); Size--; }
-    inline void         push_front(const T& v)              { if (Size == 0) push_back(v); else insert(Data, v); }
-    inline T*           erase(const T* it)                  { IM_ASSERT(it >= Data && it < Data + Size); const ptrdiff_t off = it - Data; memmove(Data + off, Data + off + 1, ((size_t)Size - (size_t)off - 1) * sizeof(T)); Size--; return Data + off; }
-    inline T*           erase(const T* it, const T* it_last){ IM_ASSERT(it >= Data && it < Data + Size && it_last > it && it_last <= Data + Size); const ptrdiff_t count = it_last - it; const ptrdiff_t off = it - Data; memmove(Data + off, Data + off + count, ((size_t)Size - (size_t)off - count) * sizeof(T)); Size -= (int)count; return Data + off; }
-    inline T*           erase_unsorted(const T* it)         { IM_ASSERT(it >= Data && it < Data + Size);  const ptrdiff_t off = it - Data; if (it < Data + Size - 1) memcpy(Data + off, Data + Size - 1, sizeof(T)); Size--; return Data + off; }
-    inline T*           insert(const T* it, const T& v)     { IM_ASSERT(it >= Data && it <= Data + Size); const ptrdiff_t off = it - Data; if (Size == Capacity) reserve(_grow_capacity(Size + 1)); if (off < (int)Size) memmove(Data + off + 1, Data + off, ((size_t)Size - (size_t)off) * sizeof(T)); memcpy(&Data[off], &v, sizeof(v)); Size++; return Data + off; }
-    inline bool         contains(const T& v) const          { const T* data = Data;  const T* data_end = Data + Size; while (data < data_end) if (*data++ == v) return true; return false; }
-    inline T*           find(const T& v)                    { T* data = Data;  const T* data_end = Data + Size; while (data < data_end) if (*data == v) break; else ++data; return data; }
-    inline const T*     find(const T& v) const              { const T* data = Data;  const T* data_end = Data + Size; while (data < data_end) if (*data == v) break; else ++data; return data; }
-    inline bool         find_erase(const T& v)              { const T* it = find(v); if (it < Data + Size) { erase(it); return true; } return false; }
-    inline bool         find_erase_unsorted(const T& v)     { const T* it = find(v); if (it < Data + Size) { erase_unsorted(it); return true; } return false; }
-    inline int          index_from_ptr(const T* it) const   { IM_ASSERT(it >= Data && it < Data + Size); const ptrdiff_t off = it - Data; return (int)off; }
-};
-
-struct ImGuiStyle
-{
-    float       Alpha;                              
-    ImVec2      WindowPadding;                  
-    float       WindowRounding;                                      
-    float       WindowBorderSize;                                
-    ImVec2      WindowMinSize;                               
-    ImVec2      WindowTitleAlign;                      
-    ImGuiDir    WindowMenuButtonPosition;                
-    float       ChildRounding;                           
-    float       ChildBorderSize;                                  
-    float       PopupRounding;                          
-    float       PopupBorderSize;                                  
-    ImVec2      FramePadding;                        
-    float       FrameRounding;                              
-    float       FrameBorderSize;                                 
-    ImVec2      ItemSpacing;                      
-    ImVec2      ItemInnerSpacing;                            
-    ImVec2      CellPadding;                     
-    ImVec2      TouchExtraPadding;                                               
-    float       IndentSpacing;                           
-    float       ColumnsMinSpacing;                     
-    float       ScrollbarSize;                        
-    float       ScrollbarRounding;                
-    float       GrabMinSize;                        
-    float       GrabRounding;                            
-    float       LogSliderDeadzone;                         
-    float       TabRounding;                              
-    float       TabBorderSize;                   
-    float       TabMinWidthForCloseButton;                                 
-    ImGuiDir    ColorButtonPosition;                     
-    ImVec2      ButtonTextAlign;                           
-    ImVec2      SelectableTextAlign;                                    
-    ImVec2      DisplayWindowPadding;                              
-    ImVec2      DisplaySafeAreaPadding;                                     
-    float       MouseCursorScale;                        
-    bool        AntiAliasedLines;                                
-    bool        AntiAliasedLinesUseTex;                             
-    bool        AntiAliasedFill;                                        
-    float       CurveTessellationTol;                               
-    float       CircleSegmentMaxError;                                
-    ImVec4      Colors[ImGuiCol_COUNT];
-
-    IMGUI_API ImGuiStyle();
-    IMGUI_API void ScaleAllSizes(float scale_factor);
-};
-
-struct ImGuiIO
-{
-    ImGuiConfigFlags   ConfigFlags;                                       
-    ImGuiBackendFlags  BackendFlags;                                              
-    ImVec2      DisplaySize;                                    
-    float       DeltaTime;                                    
-    float       IniSavingRate;                                         
-    const char* IniFilename;                                              
-    const char* LogFilename;                                   
-    float       MouseDoubleClickTime;                             
-    float       MouseDoubleClickMaxDist;                                
-    float       MouseDragThreshold;                                 
-    int         KeyMap[ImGuiKey_COUNT];                                  
-    float       KeyRepeatDelay;                                             
-    float       KeyRepeatRate;                                        
-    void*       UserData;                                            
-
-    ImFontAtlas*Fonts;                                                    
-    float       FontGlobalScale;                                 
-    bool        FontAllowUserScaling;                                
-    ImFont*     FontDefault;                                           
-    ImVec2      DisplayFramebufferScale;                                        
-
-    bool        MouseDrawCursor;                                                             
-    bool        ConfigMacOSXBehaviors;                                                          
-    bool        ConfigInputTextCursorBlink;                              
-    bool        ConfigDragClickToInputText;                                       
-    bool        ConfigWindowsResizeFromEdges;                                               
-    bool        ConfigWindowsMoveFromTitleBarOnly;                               
-    float       ConfigMemoryCompactTimer;                                   
-
-    const char* BackendPlatformName;              
-    const char* BackendRendererName;              
-    void*       BackendPlatformUserData;                          
-    void*       BackendRendererUserData;                          
-    void*       BackendLanguageUserData;                             
-
-    const char* (*GetClipboardTextFn)(void* user_data);
-    void        (*SetClipboardTextFn)(void* user_data, const char* text);
-    void*       ClipboardUserData;
-
-    void        (*ImeSetInputScreenPosFn)(int x, int y);
-    void*       ImeWindowHandle;                                         
-
-    ImVec2      MousePos;                                       
-    bool        MouseDown[5];                                                              
-    float       MouseWheel;                               
-    float       MouseWheelH;                                        
-    bool        KeyCtrl;                            
-    bool        KeyShift;                           
-    bool        KeyAlt;                             
-    bool        KeySuper;                           
-    bool        KeysDown[512];                                             
-    float       NavInputs[ImGuiNavInput_COUNT];                    
-
-    IMGUI_API void  AddInputCharacter(unsigned int c);              
-    IMGUI_API void  AddInputCharacterUTF16(ImWchar16 c);                     
-    IMGUI_API void  AddInputCharactersUTF8(const char* str);            
-    IMGUI_API void  ClearInputCharacters();                           
-
-    bool        WantCaptureMouse;                                                               
-    bool        WantCaptureKeyboard;                                                     
-    bool        WantTextInput;                                                
-    bool        WantSetMousePos;                                    
-    bool        WantSaveIniSettings;                                           
-    bool        NavActive;                                           
-    bool        NavVisible;                               
-    float       Framerate;                                         
-    int         MetricsRenderVertices;                 
-    int         MetricsRenderIndices;                        
-    int         MetricsRenderWindows;               
-    int         MetricsActiveWindows;               
-    int         MetricsActiveAllocations;                           
-    ImVec2      MouseDelta;                                              
-
-    ImGuiKeyModFlags KeyMods;                                
-    ImVec2      MousePosPrev;                                    
-    ImVec2      MouseClickedPos[5];                  
-    double      MouseClickedTime[5];                     
-    bool        MouseClicked[5];                       
-    bool        MouseDoubleClicked[5];               
-    bool        MouseReleased[5];                      
-    bool        MouseDownOwned[5];                                      
-    bool        MouseDownWasDoubleClick[5];            
-    float       MouseDownDuration[5];                      
-    float       MouseDownDurationPrev[5];               
-    ImVec2      MouseDragMaxDistanceAbs[5];                     
-    float       MouseDragMaxDistanceSqr[5];                  
-    float       KeysDownDuration[512];                     
-    float       KeysDownDurationPrev[512];             
-    float       NavInputsDownDuration[ImGuiNavInput_COUNT];
-    float       NavInputsDownDurationPrev[ImGuiNavInput_COUNT];
-    float       PenPressure;                                        
-    ImWchar16   InputQueueSurrogate;              
-    ImVector<ImWchar> InputQueueCharacters;                 
-
-    IMGUI_API   ImGuiIO();
-};
-
-struct ImGuiInputTextCallbackData
-{
-    ImGuiInputTextFlags EventFlag;             
-    ImGuiInputTextFlags Flags;                      
-    void*               UserData;                   
-
-    ImWchar             EventChar;                                                     
-    ImGuiKey            EventKey;                            
-    char*               Buf;                                                            
-    int                 BufTextLen;                                         
-    int                 BufSize;                                  
-    bool                BufDirty;                          
-    int                 CursorPos;                                                 
-    int                 SelectionStart;                                                  
-    int                 SelectionEnd;                                              
-
-    IMGUI_API ImGuiInputTextCallbackData();
-    IMGUI_API void      DeleteChars(int pos, int bytes_count);
-    IMGUI_API void      InsertChars(int pos, const char* text, const char* text_end = NULL);
-    void                SelectAll()             { SelectionStart = 0; SelectionEnd = BufTextLen; }
-    void                ClearSelection()        { SelectionStart = SelectionEnd = BufTextLen; }
-    bool                HasSelection() const    { return SelectionStart != SelectionEnd; }
-};
-
-struct ImGuiSizeCallbackData
-{
-    void*   UserData;               
-    ImVec2  Pos;                   
-    ImVec2  CurrentSize;          
-    ImVec2  DesiredSize;                    
-};
-
-struct ImGuiPayload
-{
-    void*           Data;                      
-    int             DataSize;             
-
-    ImGuiID         SourceId;              
-    ImGuiID         SourceParentId;          
-    int             DataFrameCount;       
-    char            DataType[32 + 1];            
-    bool            Preview;                              
-    bool            Delivery;                         
-
-    ImGuiPayload()  { Clear(); }
-    void Clear()    { SourceId = SourceParentId = 0; Data = NULL; DataSize = 0; memset(DataType, 0, sizeof(DataType)); DataFrameCount = -1; Preview = Delivery = false; }
-    bool IsDataType(const char* type) const { return DataFrameCount != -1 && strcmp(type, DataType) == 0; }
-    bool IsPreview() const                  { return Preview; }
-    bool IsDelivery() const                 { return Delivery; }
-};
-
-struct ImGuiTableColumnSortSpecs
-{
-    ImGuiID                     ColumnUserID;                  
-    ImS16                       ColumnIndex;            
-    ImS16                       SortOrder;                                 
-    ImGuiSortDirection          SortDirection : 8;                   
-
-    ImGuiTableColumnSortSpecs() { memset(this, 0, sizeof(*this)); }
-};
-
-struct ImGuiTableSortSpecs
-{
-    const ImGuiTableColumnSortSpecs* Specs;          
-    int                         SpecsCount;                           
-    bool                        SpecsDirty;                        
-
-    ImGuiTableSortSpecs()       { memset(this, 0, sizeof(*this)); }
-};
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-namespace ImGui
-{
-    IMGUI_API bool      ListBoxHeader(const char* label, int items_count, int height_in_items = -1);         
-    static inline bool  ListBoxHeader(const char* label, const ImVec2& size = ImVec2(0, 0)) { return BeginListBox(label, size); }
-    static inline void  ListBoxFooter() { EndListBox(); }
-    static inline void  OpenPopupContextItem(const char* str_id = NULL, ImGuiMouseButton mb = 1) { OpenPopupOnItemClick(str_id, mb); }                  
-    IMGUI_API bool      DragScalar(const char* label, ImGuiDataType data_type, void* p_data, float v_speed, const void* p_min, const void* p_max, const char* format, float power);
-    IMGUI_API bool      DragScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, float v_speed, const void* p_min, const void* p_max, const char* format, float power);
-    static inline bool  DragFloat(const char* label, float* v, float v_speed, float v_min, float v_max, const char* format, float power)    { return DragScalar(label, ImGuiDataType_Float, v, v_speed, &v_min, &v_max, format, power); }
-    static inline bool  DragFloat2(const char* label, float v[2], float v_speed, float v_min, float v_max, const char* format, float power) { return DragScalarN(label, ImGuiDataType_Float, v, 2, v_speed, &v_min, &v_max, format, power); }
-    static inline bool  DragFloat3(const char* label, float v[3], float v_speed, float v_min, float v_max, const char* format, float power) { return DragScalarN(label, ImGuiDataType_Float, v, 3, v_speed, &v_min, &v_max, format, power); }
-    static inline bool  DragFloat4(const char* label, float v[4], float v_speed, float v_min, float v_max, const char* format, float power) { return DragScalarN(label, ImGuiDataType_Float, v, 4, v_speed, &v_min, &v_max, format, power); }
-    IMGUI_API bool      SliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format, float power);
-    IMGUI_API bool      SliderScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_min, const void* p_max, const char* format, float power);
-    static inline bool  SliderFloat(const char* label, float* v, float v_min, float v_max, const char* format, float power)                 { return SliderScalar(label, ImGuiDataType_Float, v, &v_min, &v_max, format, power); }
-    static inline bool  SliderFloat2(const char* label, float v[2], float v_min, float v_max, const char* format, float power)              { return SliderScalarN(label, ImGuiDataType_Float, v, 2, &v_min, &v_max, format, power); }
-    static inline bool  SliderFloat3(const char* label, float v[3], float v_min, float v_max, const char* format, float power)              { return SliderScalarN(label, ImGuiDataType_Float, v, 3, &v_min, &v_max, format, power); }
-    static inline bool  SliderFloat4(const char* label, float v[4], float v_min, float v_max, const char* format, float power)              { return SliderScalarN(label, ImGuiDataType_Float, v, 4, &v_min, &v_max, format, power); }
-    static inline bool  BeginPopupContextWindow(const char* str_id, ImGuiMouseButton mb, bool over_items) { return BeginPopupContextWindow(str_id, mb | (over_items ? 0 : ImGuiPopupFlags_NoOpenOverItems)); }
-    static inline void  TreeAdvanceToLabelPos()               { SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()); }
-    static inline void  SetNextTreeNodeOpen(bool open, ImGuiCond cond = 0) { SetNextItemOpen(open, cond); }
-    static inline float GetContentRegionAvailWidth()          { return GetContentRegionAvail().x; }
-    static inline ImDrawList* GetOverlayDrawList()            { return GetForegroundDrawList(); }
-    static inline void  SetScrollHere(float center_ratio=0.5f){ SetScrollHereY(center_ratio); }
-}
-#endif
-
-#define IM_UNICODE_CODEPOINT_INVALID 0xFFFD           
-#ifdef IMGUI_USE_WCHAR32
-#define IM_UNICODE_CODEPOINT_MAX     0x10FFFF           
-#else
-#define IM_UNICODE_CODEPOINT_MAX     0xFFFF             
-#endif
-
-struct ImGuiOnceUponAFrame
-{
-    ImGuiOnceUponAFrame() { RefFrame = -1; }
-    mutable int RefFrame;
-    operator bool() const { int current_frame = ImGui::GetFrameCount(); if (RefFrame == current_frame) return false; RefFrame = current_frame; return true; }
-};
-
-struct ImGuiTextFilter
-{
-    IMGUI_API           ImGuiTextFilter(const char* default_filter = "");
-    IMGUI_API bool      Draw(const char* label = "Filter (inc,-exc)", float width = 0.0f);     
-    IMGUI_API bool      PassFilter(const char* text, const char* text_end = NULL) const;
-    IMGUI_API void      Build();
-    void                Clear()          { InputBuf[0] = 0; Build(); }
-    bool                IsActive() const { return !Filters.empty(); }
-
-    struct ImGuiTextRange
-    {
-        const char*     b;
-        const char*     e;
-
-        ImGuiTextRange()                                { b = e = NULL; }
-        ImGuiTextRange(const char* _b, const char* _e)  { b = _b; e = _e; }
-        bool            empty() const                   { return b == e; }
-        IMGUI_API void  split(char separator, ImVector<ImGuiTextRange>* out) const;
-    };
-    char                    InputBuf[256];
-    ImVector<ImGuiTextRange>Filters;
-    int                     CountGrep;
-};
-
-struct ImGuiTextBuffer
-{
-    ImVector<char>      Buf;
-    IMGUI_API static char EmptyString[1];
-
-    ImGuiTextBuffer()   { }
-    inline char         operator[](int i) const { IM_ASSERT(Buf.Data != NULL); return Buf.Data[i]; }
-    const char*         begin() const           { return Buf.Data ? &Buf.front() : EmptyString; }
-    const char*         end() const             { return Buf.Data ? &Buf.back() : EmptyString; }             
-    int                 size() const            { return Buf.Size ? Buf.Size - 1 : 0; }
-    bool                empty() const           { return Buf.Size <= 1; }
-    void                clear()                 { Buf.clear(); }
-    void                reserve(int capacity)   { Buf.reserve(capacity); }
-    const char*         c_str() const           { return Buf.Data ? Buf.Data : EmptyString; }
-    IMGUI_API void      append(const char* str, const char* str_end = NULL);
-    IMGUI_API void      appendf(const char* fmt, ...) IM_FMTARGS(2);
-    IMGUI_API void      appendfv(const char* fmt, va_list args) IM_FMTLIST(2);
-};
-
-struct ImGuiStorage
-{
-    struct ImGuiStoragePair
-    {
-        ImGuiID key;
-        union { int val_i; float val_f; void* val_p; };
-        ImGuiStoragePair(ImGuiID _key, int _val_i)      { key = _key; val_i = _val_i; }
-        ImGuiStoragePair(ImGuiID _key, float _val_f)    { key = _key; val_f = _val_f; }
-        ImGuiStoragePair(ImGuiID _key, void* _val_p)    { key = _key; val_p = _val_p; }
-    };
-
-    ImVector<ImGuiStoragePair>      Data;
-
-    void                Clear() { Data.clear(); }
-    IMGUI_API int       GetInt(ImGuiID key, int default_val = 0) const;
-    IMGUI_API void      SetInt(ImGuiID key, int val);
-    IMGUI_API bool      GetBool(ImGuiID key, bool default_val = false) const;
-    IMGUI_API void      SetBool(ImGuiID key, bool val);
-    IMGUI_API float     GetFloat(ImGuiID key, float default_val = 0.0f) const;
-    IMGUI_API void      SetFloat(ImGuiID key, float val);
-    IMGUI_API void*     GetVoidPtr(ImGuiID key) const;    
-    IMGUI_API void      SetVoidPtr(ImGuiID key, void* val);
-
-    IMGUI_API int*      GetIntRef(ImGuiID key, int default_val = 0);
-    IMGUI_API bool*     GetBoolRef(ImGuiID key, bool default_val = false);
-    IMGUI_API float*    GetFloatRef(ImGuiID key, float default_val = 0.0f);
-    IMGUI_API void**    GetVoidPtrRef(ImGuiID key, void* default_val = NULL);
-
-    IMGUI_API void      SetAllInt(int val);
-
-    IMGUI_API void      BuildSortByKey();
-};
-
-struct ImGuiListClipper
-{
-    int     DisplayStart;
-    int     DisplayEnd;
-
-    int     ItemsCount;
-    int     StepNo;
-    int     ItemsFrozen;
-    float   ItemsHeight;
-    float   StartPosY;
-
-    IMGUI_API ImGuiListClipper();
-    IMGUI_API ~ImGuiListClipper();
-
-    IMGUI_API void Begin(int items_count, float items_height = -1.0f);                
-    IMGUI_API void End();                                                          
-    IMGUI_API bool Step();                                                               
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-    inline ImGuiListClipper(int items_count, float items_height = -1.0f) { memset(this, 0, sizeof(*this)); ItemsCount = -1; Begin(items_count, items_height); }    
-#endif
-};
-
-#ifdef IMGUI_USE_BGRA_PACKED_COLOR
-#define IM_COL32_R_SHIFT    16
-#define IM_COL32_G_SHIFT    8
-#define IM_COL32_B_SHIFT    0
-#define IM_COL32_A_SHIFT    24
-#define IM_COL32_A_MASK     0xFF000000
-#else
-#define IM_COL32_R_SHIFT    0
-#define IM_COL32_G_SHIFT    8
-#define IM_COL32_B_SHIFT    16
-#define IM_COL32_A_SHIFT    24
-#define IM_COL32_A_MASK     0xFF000000
-#endif
-#define IM_COL32(R,G,B,A)    (((ImU32)(A)<<IM_COL32_A_SHIFT) | ((ImU32)(B)<<IM_COL32_B_SHIFT) | ((ImU32)(G)<<IM_COL32_G_SHIFT) | ((ImU32)(R)<<IM_COL32_R_SHIFT))
-#define IM_COL32_WHITE       IM_COL32(255,255,255,255)      
-#define IM_COL32_BLACK       IM_COL32(0,0,0,255)          
-#define IM_COL32_BLACK_TRANS IM_COL32(0,0,0,0)              
-
-struct ImColor
-{
-    ImVec4              Value;
-
-    ImColor()                                                       { Value.x = Value.y = Value.z = Value.w = 0.0f; }
-    ImColor(int r, int g, int b, int a = 255)                       { float sc = 1.0f / 255.0f; Value.x = (float)r * sc; Value.y = (float)g * sc; Value.z = (float)b * sc; Value.w = (float)a * sc; }
-    ImColor(ImU32 rgba)                                             { float sc = 1.0f / 255.0f; Value.x = (float)((rgba >> IM_COL32_R_SHIFT) & 0xFF) * sc; Value.y = (float)((rgba >> IM_COL32_G_SHIFT) & 0xFF) * sc; Value.z = (float)((rgba >> IM_COL32_B_SHIFT) & 0xFF) * sc; Value.w = (float)((rgba >> IM_COL32_A_SHIFT) & 0xFF) * sc; }
-    ImColor(float r, float g, float b, float a = 1.0f)              { Value.x = r; Value.y = g; Value.z = b; Value.w = a; }
-    ImColor(const ImVec4& col)                                      { Value = col; }
-    inline operator ImU32() const                                   { return ImGui::ColorConvertFloat4ToU32(Value); }
-    inline operator ImVec4() const                                  { return Value; }
-
-    inline void    SetHSV(float h, float s, float v, float a = 1.0f){ ImGui::ColorConvertHSVtoRGB(h, s, v, Value.x, Value.y, Value.z); Value.w = a; }
-    static ImColor HSV(float h, float s, float v, float a = 1.0f)   { float r, g, b; ImGui::ColorConvertHSVtoRGB(h, s, v, r, g, b); return ImColor(r, g, b, a); }
-};
-
-#ifndef IM_DRAWLIST_TEX_LINES_WIDTH_MAX
-#define IM_DRAWLIST_TEX_LINES_WIDTH_MAX     (63)
-#endif
-
-#ifndef ImDrawCallback
-typedef void (*ImDrawCallback)(const ImDrawList* parent_list, const ImDrawCmd* cmd);
-#endif
-
-#define ImDrawCallback_ResetRenderState     (ImDrawCallback)(-1)
-
-struct ImDrawCmd
-{
-    ImVec4          ClipRect;                             
-    ImTextureID     TextureId;                                     
-    unsigned int    VtxOffset;                                     
-    unsigned int    IdxOffset;                             
-    unsigned int    ElemCount;                                      
-    ImDrawCallback  UserCallback;                            
-    void*           UserCallbackData;             
-
-    ImDrawCmd() { memset(this, 0, sizeof(*this)); }        
-};
-
-#ifndef ImDrawIdx
-typedef unsigned short ImDrawIdx;
-#endif
-
-#ifndef IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT
-struct ImDrawVert
-{
-    ImVec2  pos;
-    ImVec2  uv;
-    ImU32   col;
-};
-#else
-IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT;
-#endif
-
-struct ImDrawCmdHeader
-{
-    ImVec4          ClipRect;
-    ImTextureID     TextureId;
-    unsigned int    VtxOffset;
-};
-
-struct ImDrawChannel
-{
-    ImVector<ImDrawCmd>         _CmdBuffer;
-    ImVector<ImDrawIdx>         _IdxBuffer;
-};
-
-
-struct ImDrawListSplitter
-{
-    int                         _Current;        
-    int                         _Count;           
-    ImVector<ImDrawChannel>     _Channels;              
-
-    inline ImDrawListSplitter()  { memset(this, 0, sizeof(*this)); }
-    inline ~ImDrawListSplitter() { ClearFreeMemory(); }
-    inline void                 Clear() { _Current = 0; _Count = 1; }            
-    IMGUI_API void              ClearFreeMemory();
-    IMGUI_API void              Split(ImDrawList* draw_list, int count);
-    IMGUI_API void              Merge(ImDrawList* draw_list);
-    IMGUI_API void              SetCurrentChannel(ImDrawList* draw_list, int channel_idx);
-};
-
-enum ImDrawCornerFlags_
-{
-    ImDrawCornerFlags_None      = 0,
-    ImDrawCornerFlags_TopLeft   = 1 << 0,  
-    ImDrawCornerFlags_TopRight  = 1 << 1,  
-    ImDrawCornerFlags_BotLeft   = 1 << 2,  
-    ImDrawCornerFlags_BotRight  = 1 << 3,  
-    ImDrawCornerFlags_Top       = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight,    
-    ImDrawCornerFlags_Bot       = ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight,    
-    ImDrawCornerFlags_Left      = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft,     
-    ImDrawCornerFlags_Right     = ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight,   
-    ImDrawCornerFlags_All       = 0xF                       
-};
-
-enum ImDrawListFlags_
-{
-    ImDrawListFlags_None                    = 0,
-    ImDrawListFlags_AntiAliasedLines        = 1 << 0,                             
-    ImDrawListFlags_AntiAliasedLinesUseTex  = 1 << 1,                
-    ImDrawListFlags_AntiAliasedFill         = 1 << 2,           
-    ImDrawListFlags_AllowVtxOffset          = 1 << 3                 
-};
-
-struct ImDrawList
-{
-    ImVector<ImDrawCmd>     CmdBuffer;                          
-    ImVector<ImDrawIdx>     IdxBuffer;                  
-    ImVector<ImDrawVert>    VtxBuffer;            
-    ImDrawListFlags         Flags;                         
-
-    unsigned int            _VtxCurrentIdx;                       
-    const ImDrawListSharedData* _Data;                           
-    const char*             _OwnerName;                
-    ImDrawVert*             _VtxWritePtr;                       
-    ImDrawIdx*              _IdxWritePtr;                       
-    ImVector<ImVec4>        _ClipRectStack;      
-    ImVector<ImTextureID>   _TextureIdStack;     
-    ImVector<ImVec2>        _Path;                  
-    ImDrawCmdHeader         _CmdHeader;                    
-    ImDrawListSplitter      _Splitter;                       
-    float                   _FringeScale;                           
-
-    ImDrawList(const ImDrawListSharedData* shared_data) { memset(this, 0, sizeof(*this)); _Data = shared_data; }
-
-    ~ImDrawList() { _ClearFreeMemory(); }
-    IMGUI_API void  PushClipRect(ImVec2 clip_rect_min, ImVec2 clip_rect_max, bool intersect_with_current_clip_rect = false);                              
-    IMGUI_API void  PushClipRectFullScreen();
-    IMGUI_API void  PopClipRect();
-    IMGUI_API void  PushTextureID(ImTextureID texture_id);
-    IMGUI_API void  PopTextureID();
-    inline ImVec2   GetClipRectMin() const { const ImVec4& cr = _ClipRectStack.back(); return ImVec2(cr.x, cr.y); }
-    inline ImVec2   GetClipRectMax() const { const ImVec4& cr = _ClipRectStack.back(); return ImVec2(cr.z, cr.w); }
-
-    IMGUI_API void  AddLine(const ImVec2& p1, const ImVec2& p2, ImU32 col, float thickness = 1.0f);
-    IMGUI_API void  AddRect(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All, float thickness = 1.0f);                    
-    IMGUI_API void  AddRectFilled(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All);                             
-    IMGUI_API void  AddRectFilledMultiColor(const ImVec2& p_min, const ImVec2& p_max, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left);
-    IMGUI_API void  AddQuad(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness = 1.0f);
-    IMGUI_API void  AddQuadFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col);
-    IMGUI_API void  AddTriangle(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col, float thickness = 1.0f);
-    IMGUI_API void  AddTriangleFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col);
-    IMGUI_API void  AddCircle(const ImVec2& center, float radius, ImU32 col, int num_segments = 0, float thickness = 1.0f);
-    IMGUI_API void  AddCircleFilled(const ImVec2& center, float radius, ImU32 col, int num_segments = 0);
-    IMGUI_API void  AddNgon(const ImVec2& center, float radius, ImU32 col, int num_segments, float thickness = 1.0f);
-    IMGUI_API void  AddNgonFilled(const ImVec2& center, float radius, ImU32 col, int num_segments);
-    IMGUI_API void  AddText(const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end = NULL);
-    IMGUI_API void  AddText(const ImFont* font, float font_size, const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end = NULL, float wrap_width = 0.0f, const ImVec4* cpu_fine_clip_rect = NULL);
-    IMGUI_API void  AddPolyline(const ImVec2* points, int num_points, ImU32 col, bool closed, float thickness);
-    IMGUI_API void  AddConvexPolyFilled(const ImVec2* points, int num_points, ImU32 col);           
-    IMGUI_API void  AddBezierCubic(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness, int num_segments = 0);      
-    IMGUI_API void  AddBezierQuadratic(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col, float thickness, int num_segments = 0);                    
-
-    IMGUI_API void  AddImage(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min = ImVec2(0, 0), const ImVec2& uv_max = ImVec2(1, 1), ImU32 col = IM_COL32_WHITE);
-    IMGUI_API void  AddImageQuad(ImTextureID user_texture_id, const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& uv1 = ImVec2(0, 0), const ImVec2& uv2 = ImVec2(1, 0), const ImVec2& uv3 = ImVec2(1, 1), const ImVec2& uv4 = ImVec2(0, 1), ImU32 col = IM_COL32_WHITE);
-    IMGUI_API void  AddImageRounded(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All);
-
-    inline    void  PathClear()                                                 { _Path.Size = 0; }
-    inline    void  PathLineTo(const ImVec2& pos)                               { _Path.push_back(pos); }
-    inline    void  PathLineToMergeDuplicate(const ImVec2& pos)                 { if (_Path.Size == 0 || memcmp(&_Path.Data[_Path.Size - 1], &pos, 8) != 0) _Path.push_back(pos); }
-    inline    void  PathFillConvex(ImU32 col)                                   { AddConvexPolyFilled(_Path.Data, _Path.Size, col); _Path.Size = 0; }            
-    inline    void  PathStroke(ImU32 col, bool closed, float thickness = 1.0f)  { AddPolyline(_Path.Data, _Path.Size, col, closed, thickness); _Path.Size = 0; }
-    IMGUI_API void  PathArcTo(const ImVec2& center, float radius, float a_min, float a_max, int num_segments = 10);
-    IMGUI_API void  PathArcToFast(const ImVec2& center, float radius, int a_min_of_12, int a_max_of_12);                    
-    IMGUI_API void  PathBezierCubicCurveTo(const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, int num_segments = 0);       
-    IMGUI_API void  PathBezierQuadraticCurveTo(const ImVec2& p2, const ImVec2& p3, int num_segments = 0);                     
-    IMGUI_API void  PathRect(const ImVec2& rect_min, const ImVec2& rect_max, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All);
-
-    IMGUI_API void  AddCallback(ImDrawCallback callback, void* callback_data);                   
-    IMGUI_API void  AddDrawCmd();                                                                               
-    IMGUI_API ImDrawList* CloneOutput() const;                                        
-
-    inline void     ChannelsSplit(int count)    { _Splitter.Split(this, count); }
-    inline void     ChannelsMerge()             { _Splitter.Merge(this); }
-    inline void     ChannelsSetCurrent(int n)   { _Splitter.SetCurrentChannel(this, n); }
-
-    IMGUI_API void  PrimReserve(int idx_count, int vtx_count);
-    IMGUI_API void  PrimUnreserve(int idx_count, int vtx_count);
-    IMGUI_API void  PrimRect(const ImVec2& a, const ImVec2& b, ImU32 col);             
-    IMGUI_API void  PrimRectUV(const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, ImU32 col);
-    IMGUI_API void  PrimQuadUV(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, const ImVec2& uv_a, const ImVec2& uv_b, const ImVec2& uv_c, const ImVec2& uv_d, ImU32 col);
-    inline    void  PrimWriteVtx(const ImVec2& pos, const ImVec2& uv, ImU32 col)    { _VtxWritePtr->pos = pos; _VtxWritePtr->uv = uv; _VtxWritePtr->col = col; _VtxWritePtr++; _VtxCurrentIdx++; }
-    inline    void  PrimWriteIdx(ImDrawIdx idx)                                     { *_IdxWritePtr = idx; _IdxWritePtr++; }
-    inline    void  PrimVtx(const ImVec2& pos, const ImVec2& uv, ImU32 col)         { PrimWriteIdx((ImDrawIdx)_VtxCurrentIdx); PrimWriteVtx(pos, uv, col); }      
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-    inline    void  AddBezierCurve(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness, int num_segments = 0) { AddBezierCubic(p1, p2, p3, p4, col, thickness, num_segments); }
-    inline    void  PathBezierCurveTo(const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, int num_segments = 0) { PathBezierCubicCurveTo(p2, p3, p4, num_segments); }
-#endif
-
-    IMGUI_API void  _ResetForNewFrame();
-    IMGUI_API void  _ClearFreeMemory();
-    IMGUI_API void  _PopUnusedDrawCmd();
-    IMGUI_API void  _OnChangedClipRect();
-    IMGUI_API void  _OnChangedTextureID();
-    IMGUI_API void  _OnChangedVtxOffset();
-};
-
-struct ImDrawData
-{
-    bool            Valid;                               
-    ImDrawList**    CmdLists;                                
-    int             CmdListsCount;               
-    int             TotalIdxCount;                 
-    int             TotalVtxCount;                 
-    ImVec2          DisplayPos;                             
-    ImVec2          DisplaySize;                                    
-    ImVec2          FramebufferScale;                             
-
-    ImDrawData()    { Valid = false; Clear(); }
-    ~ImDrawData()   { Clear(); }
-    void Clear()    { Valid = false; CmdLists = NULL; CmdListsCount = TotalVtxCount = TotalIdxCount = 0; DisplayPos = DisplaySize = FramebufferScale = ImVec2(0.f, 0.f); }       
-    IMGUI_API void  DeIndexAllBuffers();                                                  
-    IMGUI_API void  ScaleClipRects(const ImVec2& fb_scale);                                      
-};
-
-struct ImFontConfig
-{
-    void*           FontData;                           
-    int             FontDataSize;                        
-    bool            FontDataOwnedByAtlas;                     
-    int             FontNo;                                
-    float           SizePixels;                                     
-    int             OversampleH;                                                   
-    int             OversampleV;                                           
-    bool            PixelSnapH;                                              
-    ImVec2          GlyphExtraSpacing;                          
-    ImVec2          GlyphOffset;                          
-    const ImWchar*  GlyphRanges;                                                
-    float           GlyphMinAdvanceX;                                 
-    float           GlyphMaxAdvanceX;              
-    bool            MergeMode;                                                     
-    unsigned int    FontBuilderFlags;                               
-    float           RasterizerMultiply;                               
-    ImWchar         EllipsisChar;                                     
-
-    char            Name[40];                    
-    ImFont*         DstFont;
-
-    IMGUI_API ImFontConfig();
-};
-
-struct ImFontGlyph
-{
-    unsigned int    Colored : 1;                                 
-    unsigned int    Visible : 1;                       
-    unsigned int    Codepoint : 30;      
-    float           AdvanceX;                       
-    float           X0, Y0, X1, Y1;       
-    float           U0, V0, U1, V1;       
-};
-
-struct ImFontGlyphRangesBuilder
-{
-    ImVector<ImU32> UsedChars;                    
-
-    ImFontGlyphRangesBuilder()              { Clear(); }
-    inline void     Clear()                 { int size_in_bytes = (IM_UNICODE_CODEPOINT_MAX + 1) / 8; UsedChars.resize(size_in_bytes / (int)sizeof(ImU32)); memset(UsedChars.Data, 0, (size_t)size_in_bytes); }
-    inline bool     GetBit(size_t n) const  { int off = (int)(n >> 5); ImU32 mask = 1u << (n & 31); return (UsedChars[off] & mask) != 0; }        
-    inline void     SetBit(size_t n)        { int off = (int)(n >> 5); ImU32 mask = 1u << (n & 31); UsedChars[off] |= mask; }                     
-    inline void     AddChar(ImWchar c)      { SetBit(c); }                        
-    IMGUI_API void  AddText(const char* text, const char* text_end = NULL);               
-    IMGUI_API void  AddRanges(const ImWchar* ranges);                                     
-    IMGUI_API void  BuildRanges(ImVector<ImWchar>* out_ranges);                    
-};
-
-struct ImFontAtlasCustomRect
-{
-    unsigned short  Width, Height;          
-    unsigned short  X, Y;                   
-    unsigned int    GlyphID;                     
-    float           GlyphAdvanceX;              
-    ImVec2          GlyphOffset;                 
-    ImFont*         Font;                       
-    ImFontAtlasCustomRect()         { Width = Height = 0; X = Y = 0xFFFF; GlyphID = 0; GlyphAdvanceX = 0.0f; GlyphOffset = ImVec2(0, 0); Font = NULL; }
-    bool IsPacked() const           { return X != 0xFFFF; }
-};
-
-enum ImFontAtlasFlags_
-{
-    ImFontAtlasFlags_None               = 0,
-    ImFontAtlasFlags_NoPowerOfTwoHeight = 1 << 0,            
-    ImFontAtlasFlags_NoMouseCursors     = 1 << 1,                
-    ImFontAtlasFlags_NoBakedLines       = 1 << 2                                 
-};
-
-struct ImFontAtlas
-{
-    IMGUI_API ImFontAtlas();
-    IMGUI_API ~ImFontAtlas();
-    IMGUI_API ImFont*           AddFont(const ImFontConfig* font_cfg);
-    IMGUI_API ImFont*           AddFontDefault(const ImFontConfig* font_cfg = NULL);
-    IMGUI_API ImFont*           AddFontFromFileTTF(const char* filename, float size_pixels, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL);
-    IMGUI_API ImFont*           AddFontFromMemoryTTF(void* font_data, int font_size, float size_pixels, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL);                             
-    IMGUI_API ImFont*           AddFontFromMemoryCompressedTTF(const void* compressed_font_data, int compressed_font_size, float size_pixels, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL);         
-    IMGUI_API ImFont*           AddFontFromMemoryCompressedBase85TTF(const char* compressed_font_data_base85, float size_pixels, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL);                         
-    IMGUI_API void              ClearInputData();                                   
-    IMGUI_API void              ClearTexData();                              
-    IMGUI_API void              ClearFonts();                       
-    IMGUI_API void              Clear();                         
-
-    IMGUI_API bool              Build();                                 
-    IMGUI_API void              GetTexDataAsAlpha8(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel = NULL);     
-    IMGUI_API void              GetTexDataAsRGBA32(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel = NULL);    
-    bool                        IsBuilt() const             { return Fonts.Size > 0 && (TexPixelsAlpha8 != NULL || TexPixelsRGBA32 != NULL); }
-    void                        SetTexID(ImTextureID id)    { TexID = id; }
-
-    IMGUI_API const ImWchar*    GetGlyphRangesDefault();                    
-    IMGUI_API const ImWchar*    GetGlyphRangesKorean();                     
-    IMGUI_API const ImWchar*    GetGlyphRangesJapanese();                        
-    IMGUI_API const ImWchar*    GetGlyphRangesChineseFull();                           
-    IMGUI_API const ImWchar*    GetGlyphRangesChineseSimplifiedCommon();                 
-    IMGUI_API const ImWchar*    GetGlyphRangesCyrillic();                     
-    IMGUI_API const ImWchar*    GetGlyphRangesThai();                       
-    IMGUI_API const ImWchar*    GetGlyphRangesVietnamese();                 
-
-    IMGUI_API int               AddCustomRectRegular(int width, int height);
-    IMGUI_API int               AddCustomRectFontGlyph(ImFont* font, ImWchar id, int width, int height, float advance_x, const ImVec2& offset = ImVec2(0, 0));
-    ImFontAtlasCustomRect*      GetCustomRectByIndex(int index) { IM_ASSERT(index >= 0); return &CustomRects[index]; }
-
-    IMGUI_API void              CalcCustomRectUV(const ImFontAtlasCustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max) const;
-    IMGUI_API bool              GetMouseCursorTexData(ImGuiMouseCursor cursor, ImVec2* out_offset, ImVec2* out_size, ImVec2 out_uv_border[2], ImVec2 out_uv_fill[2]);
-
-    bool                        Locked;                          
-    ImFontAtlasFlags            Flags;                  
-    ImTextureID                 TexID;                                          
-    int                         TexDesiredWidth;                                    
-    int                         TexGlyphPadding;                             
-
-    unsigned char*              TexPixelsAlpha8;                   
-    unsigned int*               TexPixelsRGBA32;                     
-    int                         TexWidth;                
-    int                         TexHeight;               
-    ImVec2                      TexUvScale;            
-    ImVec2                      TexUvWhitePixel;          
-    ImVector<ImFont*>           Fonts;                                    
-    ImVector<ImFontAtlasCustomRect> CustomRects;             
-    ImVector<ImFontConfig>      ConfigData;           
-    ImVec4                      TexUvLines[IM_DRAWLIST_TEX_LINES_WIDTH_MAX + 1];       
-
-    const ImFontBuilderIO*      FontBuilderIO;                        
-    unsigned int                FontBuilderFlags;                        
-
-    int                         PackIdMouseCursors;           
-    int                         PackIdLines;                
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-    typedef ImFontAtlasCustomRect    CustomRect;            
-    typedef ImFontGlyphRangesBuilder GlyphRangesBuilder;    
-#endif
-};
-
-struct ImFont
-{
-    ImVector<float>             IndexAdvanceX;                                             
-    float                       FallbackAdvanceX;             
-    float                       FontSize;                                          
-
-    ImVector<ImWchar>           IndexLookup;                              
-    ImVector<ImFontGlyph>       Glyphs;                               
-    const ImFontGlyph*          FallbackGlyph;              
-
-    ImFontAtlas*                ContainerAtlas;                             
-    const ImFontConfig*         ConfigData;                               
-    short                       ConfigDataCount;                                          
-    ImWchar                     FallbackChar;                                   
-    ImWchar                     EllipsisChar;                             
-    bool                        DirtyLookupTables;          
-    float                       Scale;                                              
-    float                       Ascent, Descent;                                
-    int                         MetricsTotalSurface;                                           
-    ImU8                        Used4kPagesMap[(IM_UNICODE_CODEPOINT_MAX+1)/4096/8];                                 
-
-    IMGUI_API ImFont();
-    IMGUI_API ~ImFont();
-    IMGUI_API const ImFontGlyph*FindGlyph(ImWchar c) const;
-    IMGUI_API const ImFontGlyph*FindGlyphNoFallback(ImWchar c) const;
-    float                       GetCharAdvance(ImWchar c) const     { return ((int)c < IndexAdvanceX.Size) ? IndexAdvanceX[(int)c] : FallbackAdvanceX; }
-    bool                        IsLoaded() const                    { return ContainerAtlas != NULL; }
-    const char*                 GetDebugName() const                { return ConfigData ? ConfigData->Name : "<unknown>"; }
-
-    IMGUI_API ImVec2            CalcTextSizeA(float size, float max_width, float wrap_width, const char* text_begin, const char* text_end = NULL, const char** remaining = NULL) const;  
-    IMGUI_API const char*       CalcWordWrapPositionA(float scale, const char* text, const char* text_end, float wrap_width) const;
-    IMGUI_API void              RenderChar(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, ImWchar c) const;
-    IMGUI_API void              RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, const ImVec4& clip_rect, const char* text_begin, const char* text_end, float wrap_width = 0.0f, bool cpu_fine_clip = false) const;
-
-    IMGUI_API void              BuildLookupTable();
-    IMGUI_API void              ClearOutputData();
-    IMGUI_API void              GrowIndex(int new_size);
-    IMGUI_API void              AddGlyph(const ImFontConfig* src_cfg, ImWchar c, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x);
-    IMGUI_API void              AddRemapChar(ImWchar dst, ImWchar src, bool overwrite_dst = true);                  
-    IMGUI_API void              SetGlyphVisible(ImWchar c, bool visible);
-    IMGUI_API void              SetFallbackChar(ImWchar c);
-    IMGUI_API bool              IsGlyphRangeUnused(unsigned int c_begin, unsigned int c_last);
-};
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef IMGUI_INCLUDE_IMGUI_USER_H
-#include "imgui_user.h"
-#endif
-
-#endif   
diff --git a/SpyCustom/imgui/imgui_demo.cpp b/SpyCustom/imgui/imgui_demo.cpp
deleted file mode 100644
index 0937e24..0000000
--- a/SpyCustom/imgui/imgui_demo.cpp
+++ /dev/null
@@ -1,6725 +0,0 @@
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "imgui.h"
-#ifndef IMGUI_DISABLE
-
-#include <ctype.h>           
-#include <limits.h>           
-#include <math.h>                 
-#include <stdio.h>             
-#include <stdlib.h>             
-#if defined(_MSC_VER) && _MSC_VER <= 1500     
-#include <stddef.h>          
-#else
-#include <stdint.h>          
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (disable: 4996)              
-#endif
-
-#if defined(__clang__)
-#if __has_warning("-Wunknown-warning-option")
-#pragma clang diagnostic ignored "-Wunknown-warning-option"                                                            
-#endif
-#pragma clang diagnostic ignored "-Wunknown-pragmas"                     
-#pragma clang diagnostic ignored "-Wold-style-cast"                                                      
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"                                  
-#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast"                
-#pragma clang diagnostic ignored "-Wformat-security"                        
-#pragma clang diagnostic ignored "-Wexit-time-destructors"                                              
-#pragma clang diagnostic ignored "-Wunused-macros"                                                                   
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"                                   
-#pragma clang diagnostic ignored "-Wdouble-promotion"                                            
-#pragma clang diagnostic ignored "-Wreserved-id-macro"                     
-#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion"            
-#elif defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wpragmas"                          
-#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"               
-#pragma GCC diagnostic ignored "-Wformat-security"                    
-#pragma GCC diagnostic ignored "-Wdouble-promotion"                     
-#pragma GCC diagnostic ignored "-Wconversion"                         
-#pragma GCC diagnostic ignored "-Wmisleading-indentation"                            
-#endif
-
-#ifdef _WIN32
-#define IM_NEWLINE  "\r\n"
-#else
-#define IM_NEWLINE  "\n"
-#endif
-
-#if defined(_MSC_VER) && !defined(snprintf)
-#define snprintf    _snprintf
-#endif
-#if defined(_MSC_VER) && !defined(vsnprintf)
-#define vsnprintf   _vsnprintf
-#endif
-
-#define IM_MIN(A, B)            (((A) < (B)) ? (A) : (B))
-#define IM_MAX(A, B)            (((A) >= (B)) ? (A) : (B))
-#define IM_CLAMP(V, MN, MX)     ((V) < (MN) ? (MN) : (V) > (MX) ? (MX) : (V))
-
-#ifndef IMGUI_CDECL
-#ifdef _MSC_VER
-#define IMGUI_CDECL __cdecl
-#else
-#define IMGUI_CDECL
-#endif
-#endif
-
-#if !defined(IMGUI_DISABLE_DEMO_WINDOWS)
-
-static void ShowExampleAppDocuments(bool* p_open);
-static void ShowExampleAppMainMenuBar();
-static void ShowExampleAppConsole(bool* p_open);
-static void ShowExampleAppLog(bool* p_open);
-static void ShowExampleAppLayout(bool* p_open);
-static void ShowExampleAppPropertyEditor(bool* p_open);
-static void ShowExampleAppLongText(bool* p_open);
-static void ShowExampleAppAutoResize(bool* p_open);
-static void ShowExampleAppConstrainedResize(bool* p_open);
-static void ShowExampleAppSimpleOverlay(bool* p_open);
-static void ShowExampleAppWindowTitles(bool* p_open);
-static void ShowExampleAppCustomRendering(bool* p_open);
-static void ShowExampleMenuFile();
-
-static void HelpMarker(const char* desc)
-{
-    ImGui::TextDisabled("(?)");
-    if (ImGui::IsItemHovered())
-    {
-        ImGui::BeginTooltip();
-        ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f);
-        ImGui::TextUnformatted(desc);
-        ImGui::PopTextWrapPos();
-        ImGui::EndTooltip();
-    }
-}
-
-void ImGui::ShowUserGuide()
-{
-    ImGuiIO& io = ImGui::GetIO();
-    ImGui::BulletText("Double-click on title bar to collapse window.");
-    ImGui::BulletText(
-        "Click and drag on lower corner to resize window\n"
-        "(double-click to auto fit window to its contents).");
-    ImGui::BulletText("CTRL+Click on a slider or drag box to input value as text.");
-    ImGui::BulletText("TAB/SHIFT+TAB to cycle through keyboard editable fields.");
-    if (io.FontAllowUserScaling)
-        ImGui::BulletText("CTRL+Mouse Wheel to zoom window contents.");
-    ImGui::BulletText("While inputing text:\n");
-    ImGui::Indent();
-    ImGui::BulletText("CTRL+Left/Right to word jump.");
-    ImGui::BulletText("CTRL+A or double-click to select all.");
-    ImGui::BulletText("CTRL+X/C/V to use clipboard cut/copy/paste.");
-    ImGui::BulletText("CTRL+Z,CTRL+Y to undo/redo.");
-    ImGui::BulletText("ESCAPE to revert.");
-    ImGui::BulletText("You can apply arithmetic operators +,*,/ on numerical values.\nUse +- to subtract.");
-    ImGui::Unindent();
-    ImGui::BulletText("With keyboard navigation enabled:");
-    ImGui::Indent();
-    ImGui::BulletText("Arrow keys to navigate.");
-    ImGui::BulletText("Space to activate a widget.");
-    ImGui::BulletText("Return to input text into a widget.");
-    ImGui::BulletText("Escape to deactivate a widget, close popup, exit child window.");
-    ImGui::BulletText("Alt to jump to the menu layer of a window.");
-    ImGui::BulletText("CTRL+Tab to select a window.");
-    ImGui::Unindent();
-}
-
-static void ShowDemoWindowWidgets();
-static void ShowDemoWindowLayout();
-static void ShowDemoWindowPopups();
-static void ShowDemoWindowTables();
-static void ShowDemoWindowColumns();
-static void ShowDemoWindowMisc();
-
-void ImGui::ShowDemoWindow(bool* p_open)
-{
-    IM_ASSERT(ImGui::GetCurrentContext() != NULL && "Missing dear imgui context. Refer to examples app!");
-
-    static bool show_app_main_menu_bar = false;
-    static bool show_app_documents = false;
-    static bool show_app_console = false;
-    static bool show_app_log = false;
-    static bool show_app_layout = false;
-    static bool show_app_property_editor = false;
-    static bool show_app_long_text = false;
-    static bool show_app_auto_resize = false;
-    static bool show_app_constrained_resize = false;
-    static bool show_app_simple_overlay = false;
-    static bool show_app_window_titles = false;
-    static bool show_app_custom_rendering = false;
-
-    if (show_app_main_menu_bar)       ShowExampleAppMainMenuBar();
-    if (show_app_documents)           ShowExampleAppDocuments(&show_app_documents);
-
-    if (show_app_console)             ShowExampleAppConsole(&show_app_console);
-    if (show_app_log)                 ShowExampleAppLog(&show_app_log);
-    if (show_app_layout)              ShowExampleAppLayout(&show_app_layout);
-    if (show_app_property_editor)     ShowExampleAppPropertyEditor(&show_app_property_editor);
-    if (show_app_long_text)           ShowExampleAppLongText(&show_app_long_text);
-    if (show_app_auto_resize)         ShowExampleAppAutoResize(&show_app_auto_resize);
-    if (show_app_constrained_resize)  ShowExampleAppConstrainedResize(&show_app_constrained_resize);
-    if (show_app_simple_overlay)      ShowExampleAppSimpleOverlay(&show_app_simple_overlay);
-    if (show_app_window_titles)       ShowExampleAppWindowTitles(&show_app_window_titles);
-    if (show_app_custom_rendering)    ShowExampleAppCustomRendering(&show_app_custom_rendering);
-
-    static bool show_app_metrics = false;
-    static bool show_app_style_editor = false;
-    static bool show_app_about = false;
-
-    if (show_app_metrics)       { ImGui::ShowMetricsWindow(&show_app_metrics); }
-    if (show_app_about)         { ImGui::ShowAboutWindow(&show_app_about); }
-    if (show_app_style_editor)
-    {
-        ImGui::Begin("Dear ImGui Style Editor", &show_app_style_editor);
-        ImGui::ShowStyleEditor();
-        ImGui::End();
-    }
-
-    static bool no_titlebar = false;
-    static bool no_scrollbar = false;
-    static bool no_menu = false;
-    static bool no_move = false;
-    static bool no_resize = false;
-    static bool no_collapse = false;
-    static bool no_close = false;
-    static bool no_nav = false;
-    static bool no_background = false;
-    static bool no_bring_to_front = false;
-
-    ImGuiWindowFlags window_flags = 0;
-    if (no_titlebar)        window_flags |= ImGuiWindowFlags_NoTitleBar;
-    if (no_scrollbar)       window_flags |= ImGuiWindowFlags_NoScrollbar;
-    if (!no_menu)           window_flags |= ImGuiWindowFlags_MenuBar;
-    if (no_move)            window_flags |= ImGuiWindowFlags_NoMove;
-    if (no_resize)          window_flags |= ImGuiWindowFlags_NoResize;
-    if (no_collapse)        window_flags |= ImGuiWindowFlags_NoCollapse;
-    if (no_nav)             window_flags |= ImGuiWindowFlags_NoNav;
-    if (no_background)      window_flags |= ImGuiWindowFlags_NoBackground;
-    if (no_bring_to_front)  window_flags |= ImGuiWindowFlags_NoBringToFrontOnFocus;
-    if (no_close)           p_open = NULL;       
-
-    ImGui::SetNextWindowPos(ImVec2(650, 20), ImGuiCond_FirstUseEver);
-    ImGui::SetNextWindowSize(ImVec2(550, 680), ImGuiCond_FirstUseEver);
-
-    if (!ImGui::Begin("Dear ImGui Demo", p_open, window_flags))
-    {
-        ImGui::End();
-        return;
-    }
-
-    ImGui::PushItemWidth(ImGui::GetFontSize() * -12);
-
-    if (ImGui::BeginMenuBar())
-    {
-        if (ImGui::BeginMenu("Menu"))
-        {
-            ShowExampleMenuFile();
-            ImGui::EndMenu();
-        }
-        if (ImGui::BeginMenu("Examples"))
-        {
-            ImGui::MenuItem("Main menu bar", NULL, &show_app_main_menu_bar);
-            ImGui::MenuItem("Console", NULL, &show_app_console);
-            ImGui::MenuItem("Log", NULL, &show_app_log);
-            ImGui::MenuItem("Simple layout", NULL, &show_app_layout);
-            ImGui::MenuItem("Property editor", NULL, &show_app_property_editor);
-            ImGui::MenuItem("Long text display", NULL, &show_app_long_text);
-            ImGui::MenuItem("Auto-resizing window", NULL, &show_app_auto_resize);
-            ImGui::MenuItem("Constrained-resizing window", NULL, &show_app_constrained_resize);
-            ImGui::MenuItem("Simple overlay", NULL, &show_app_simple_overlay);
-            ImGui::MenuItem("Manipulating window titles", NULL, &show_app_window_titles);
-            ImGui::MenuItem("Custom rendering", NULL, &show_app_custom_rendering);
-            ImGui::MenuItem("Documents", NULL, &show_app_documents);
-            ImGui::EndMenu();
-        }
-        if (ImGui::BeginMenu("Tools"))
-        {
-            ImGui::MenuItem("Metrics/Debugger", NULL, &show_app_metrics);
-            ImGui::MenuItem("Style Editor", NULL, &show_app_style_editor);
-            ImGui::MenuItem("About Dear ImGui", NULL, &show_app_about);
-            ImGui::EndMenu();
-        }
-        ImGui::EndMenuBar();
-    }
-
-    ImGui::Text("dear imgui says hello. (%s)", IMGUI_VERSION);
-    ImGui::Spacing();
-
-    if (ImGui::CollapsingHeader("Help"))
-    {
-        ImGui::Text("ABOUT THIS DEMO:");
-        ImGui::BulletText("Sections below are demonstrating many aspects of the library.");
-        ImGui::BulletText("The \"Examples\" menu above leads to more demo contents.");
-        ImGui::BulletText("The \"Tools\" menu above gives access to: About Box, Style Editor,\n"
-                          "and Metrics/Debugger (general purpose Dear ImGui debugging tool).");
-        ImGui::Separator();
-
-        ImGui::Text("PROGRAMMER GUIDE:");
-        ImGui::BulletText("See the ShowDemoWindow() code in imgui_demo.cpp. <- you are here!");
-        ImGui::BulletText("See comments in imgui.cpp.");
-        ImGui::BulletText("See example applications in the examples/ folder.");
-        ImGui::BulletText("Read the FAQ at http://www.dearimgui.org/faq/");
-        ImGui::BulletText("Set 'io.ConfigFlags |= NavEnableKeyboard' for keyboard controls.");
-        ImGui::BulletText("Set 'io.ConfigFlags |= NavEnableGamepad' for gamepad controls.");
-        ImGui::Separator();
-
-        ImGui::Text("USER GUIDE:");
-        ImGui::ShowUserGuide();
-    }
-
-    if (ImGui::CollapsingHeader("Configuration"))
-    {
-        ImGuiIO& io = ImGui::GetIO();
-
-        if (ImGui::TreeNode("Configuration##2"))
-        {
-            ImGui::CheckboxFlags("io.ConfigFlags: NavEnableKeyboard",    &io.ConfigFlags, ImGuiConfigFlags_NavEnableKeyboard);
-            ImGui::SameLine(); HelpMarker("Enable keyboard controls.");
-            ImGui::CheckboxFlags("io.ConfigFlags: NavEnableGamepad",     &io.ConfigFlags, ImGuiConfigFlags_NavEnableGamepad);
-            ImGui::SameLine(); HelpMarker("Enable gamepad controls. Require backend to set io.BackendFlags |= ImGuiBackendFlags_HasGamepad.\n\nRead instructions in imgui.cpp for details.");
-            ImGui::CheckboxFlags("io.ConfigFlags: NavEnableSetMousePos", &io.ConfigFlags, ImGuiConfigFlags_NavEnableSetMousePos);
-            ImGui::SameLine(); HelpMarker("Instruct navigation to move the mouse cursor. See comment for ImGuiConfigFlags_NavEnableSetMousePos.");
-            ImGui::CheckboxFlags("io.ConfigFlags: NoMouse",              &io.ConfigFlags, ImGuiConfigFlags_NoMouse);
-            if (io.ConfigFlags & ImGuiConfigFlags_NoMouse)
-            {
-                if (fmodf((float)ImGui::GetTime(), 0.40f) < 0.20f)
-                {
-                    ImGui::SameLine();
-                    ImGui::Text("<<PRESS SPACE TO DISABLE>>");
-                }
-                if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Space)))
-                    io.ConfigFlags &= ~ImGuiConfigFlags_NoMouse;
-            }
-            ImGui::CheckboxFlags("io.ConfigFlags: NoMouseCursorChange", &io.ConfigFlags, ImGuiConfigFlags_NoMouseCursorChange);
-            ImGui::SameLine(); HelpMarker("Instruct backend to not alter mouse cursor shape and visibility.");
-            ImGui::Checkbox("io.ConfigInputTextCursorBlink", &io.ConfigInputTextCursorBlink);
-            ImGui::SameLine(); HelpMarker("Enable blinking cursor (optional as some users consider it to be distracting)");
-            ImGui::Checkbox("io.ConfigDragClickToInputText", &io.ConfigDragClickToInputText);
-            ImGui::SameLine(); HelpMarker("Enable turning DragXXX widgets into text input with a simple mouse click-release (without moving).");
-            ImGui::Checkbox("io.ConfigWindowsResizeFromEdges", &io.ConfigWindowsResizeFromEdges);
-            ImGui::SameLine(); HelpMarker("Enable resizing of windows from their edges and from the lower-left corner.\nThis requires (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) because it needs mouse cursor feedback.");
-            ImGui::Checkbox("io.ConfigWindowsMoveFromTitleBarOnly", &io.ConfigWindowsMoveFromTitleBarOnly);
-            ImGui::Checkbox("io.MouseDrawCursor", &io.MouseDrawCursor);
-            ImGui::SameLine(); HelpMarker("Instruct Dear ImGui to render a mouse cursor itself. Note that a mouse cursor rendered via your application GPU rendering path will feel more laggy than hardware cursor, but will be more in sync with your other visuals.\n\nSome desktop applications may use both kinds of cursors (e.g. enable software cursor only when resizing/dragging something).");
-            ImGui::Text("Also see Style->Rendering for rendering options.");
-            ImGui::TreePop();
-            ImGui::Separator();
-        }
-
-        if (ImGui::TreeNode("Backend Flags"))
-        {
-            HelpMarker(
-                "Those flags are set by the backends (imgui_impl_xxx files) to specify their capabilities.\n"
-                "Here we expose then as read-only fields to avoid breaking interactions with your backend.");
-
-            ImGuiBackendFlags backend_flags = io.BackendFlags;
-            ImGui::CheckboxFlags("io.BackendFlags: HasGamepad",           &backend_flags, ImGuiBackendFlags_HasGamepad);
-            ImGui::CheckboxFlags("io.BackendFlags: HasMouseCursors",      &backend_flags, ImGuiBackendFlags_HasMouseCursors);
-            ImGui::CheckboxFlags("io.BackendFlags: HasSetMousePos",       &backend_flags, ImGuiBackendFlags_HasSetMousePos);
-            ImGui::CheckboxFlags("io.BackendFlags: RendererHasVtxOffset", &backend_flags, ImGuiBackendFlags_RendererHasVtxOffset);
-            ImGui::TreePop();
-            ImGui::Separator();
-        }
-
-        if (ImGui::TreeNode("Style"))
-        {
-            HelpMarker("The same contents can be accessed in 'Tools->Style Editor' or by calling the ShowStyleEditor() function.");
-            ImGui::ShowStyleEditor();
-            ImGui::TreePop();
-            ImGui::Separator();
-        }
-
-        if (ImGui::TreeNode("Capture/Logging"))
-        {
-            HelpMarker(
-                "The logging API redirects all text output so you can easily capture the content of "
-                "a window or a block. Tree nodes can be automatically expanded.\n"
-                "Try opening any of the contents below in this window and then click one of the \"Log To\" button.");
-            ImGui::LogButtons();
-
-            HelpMarker("You can also call ImGui::LogText() to output directly to the log without a visual output.");
-            if (ImGui::Button("Copy \"Hello, world!\" to clipboard"))
-            {
-                ImGui::LogToClipboard();
-                ImGui::LogText("Hello, world!");
-                ImGui::LogFinish();
-            }
-            ImGui::TreePop();
-        }
-    }
-
-    if (ImGui::CollapsingHeader("Window options"))
-    {
-        if (ImGui::BeginTable("split", 3))
-        {
-            ImGui::TableNextColumn(); ImGui::Checkbox("No titlebar", &no_titlebar);
-            ImGui::TableNextColumn(); ImGui::Checkbox("No scrollbar", &no_scrollbar);
-            ImGui::TableNextColumn(); ImGui::Checkbox("No menu", &no_menu);
-            ImGui::TableNextColumn(); ImGui::Checkbox("No move", &no_move);
-            ImGui::TableNextColumn(); ImGui::Checkbox("No resize", &no_resize);
-            ImGui::TableNextColumn(); ImGui::Checkbox("No collapse", &no_collapse);
-            ImGui::TableNextColumn(); ImGui::Checkbox("No close", &no_close);
-            ImGui::TableNextColumn(); ImGui::Checkbox("No nav", &no_nav);
-            ImGui::TableNextColumn(); ImGui::Checkbox("No background", &no_background);
-            ImGui::TableNextColumn(); ImGui::Checkbox("No bring to front", &no_bring_to_front);
-            ImGui::EndTable();
-        }
-    }
-
-    ShowDemoWindowWidgets();
-    ShowDemoWindowLayout();
-    ShowDemoWindowPopups();
-    ShowDemoWindowTables();
-    ShowDemoWindowMisc();
-
-    ImGui::PopItemWidth();
-    ImGui::End();
-}
-
-static void ShowDemoWindowWidgets()
-{
-    if (!ImGui::CollapsingHeader("Widgets"))
-        return;
-
-    if (ImGui::TreeNode("Basic"))
-    {
-        static int clicked = 0;
-        if (ImGui::Button("Button"))
-            clicked++;
-        if (clicked & 1)
-        {
-            ImGui::SameLine();
-            ImGui::Text("Thanks for clicking me!");
-        }
-
-        static bool check = true;
-        ImGui::Checkbox("checkbox", &check);
-
-        static int e = 0;
-        ImGui::RadioButton("radio a", &e, 0); ImGui::SameLine();
-        ImGui::RadioButton("radio b", &e, 1); ImGui::SameLine();
-        ImGui::RadioButton("radio c", &e, 2);
-
-        for (int i = 0; i < 7; i++)
-        {
-            if (i > 0)
-                ImGui::SameLine();
-            ImGui::PushID(i);
-            ImGui::PushStyleColor(ImGuiCol_Button, (ImVec4)ImColor::HSV(i / 7.0f, 0.6f, 0.6f));
-            ImGui::PushStyleColor(ImGuiCol_ButtonHovered, (ImVec4)ImColor::HSV(i / 7.0f, 0.7f, 0.7f));
-            ImGui::PushStyleColor(ImGuiCol_ButtonActive, (ImVec4)ImColor::HSV(i / 7.0f, 0.8f, 0.8f));
-            ImGui::Button("Click");
-            ImGui::PopStyleColor(3);
-            ImGui::PopID();
-        }
-
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Hold to repeat:");
-        ImGui::SameLine();
-
-        static int counter = 0;
-        float spacing = ImGui::GetStyle().ItemInnerSpacing.x;
-        ImGui::PushButtonRepeat(true);
-        if (ImGui::ArrowButton("##left", ImGuiDir_Left)) { counter--; }
-        ImGui::SameLine(0.0f, spacing);
-        if (ImGui::ArrowButton("##right", ImGuiDir_Right)) { counter++; }
-        ImGui::PopButtonRepeat();
-        ImGui::SameLine();
-        ImGui::Text("%d", counter);
-
-        ImGui::Text("Hover over me");
-        if (ImGui::IsItemHovered())
-            ImGui::SetTooltip("I am a tooltip");
-
-        ImGui::SameLine();
-        ImGui::Text("- or me");
-        if (ImGui::IsItemHovered())
-        {
-            ImGui::BeginTooltip();
-            ImGui::Text("I am a fancy tooltip");
-            static float arr[] = { 0.6f, 0.1f, 1.0f, 0.5f, 0.92f, 0.1f, 0.2f };
-            ImGui::PlotLines("Curve", arr, IM_ARRAYSIZE(arr));
-            ImGui::EndTooltip();
-        }
-
-        ImGui::Separator();
-
-        ImGui::LabelText("label", "Value");
-
-        {
-            const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD", "EEEE", "FFFF", "GGGG", "HHHH", "IIIIIII", "JJJJ", "KKKKKKK" };
-            static int item_current = 0;
-            ImGui::Combo("combo", &item_current, items, IM_ARRAYSIZE(items));
-            ImGui::SameLine(); HelpMarker(
-                "Using the simplified one-liner Combo API here.\nRefer to the \"Combo\" section below for an explanation of how to use the more flexible and general BeginCombo/EndCombo API.");
-        }
-
-        {
-            static char str0[128] = "Hello, world!";
-            ImGui::InputText("input text", str0, IM_ARRAYSIZE(str0));
-            ImGui::SameLine(); HelpMarker(
-                "USER:\n"
-                "Hold SHIFT or use mouse to select text.\n"
-                "CTRL+Left/Right to word jump.\n"
-                "CTRL+A or double-click to select all.\n"
-                "CTRL+X,CTRL+C,CTRL+V clipboard.\n"
-                "CTRL+Z,CTRL+Y undo/redo.\n"
-                "ESCAPE to revert.\n\n"
-                "PROGRAMMER:\n"
-                "You can use the ImGuiInputTextFlags_CallbackResize facility if you need to wire InputText() "
-                "to a dynamic string type. See misc/cpp/imgui_stdlib.h for an example (this is not demonstrated "
-                "in imgui_demo.cpp).");
-
-            static char str1[128] = "";
-            ImGui::InputTextWithHint("input text (w/ hint)", "enter text here", str1, IM_ARRAYSIZE(str1));
-
-            static int i0 = 123;
-            ImGui::InputInt("input int", &i0);
-            ImGui::SameLine(); HelpMarker(
-                "You can apply arithmetic operators +,*,/ on numerical values.\n"
-                "  e.g. [ 100 ], input \'*2\', result becomes [ 200 ]\n"
-                "Use +- to subtract.");
-
-            static float f0 = 0.001f;
-            ImGui::InputFloat("input float", &f0, 0.01f, 1.0f, "%.3f");
-
-            static double d0 = 999999.00000001;
-            ImGui::InputDouble("input double", &d0, 0.01f, 1.0f, "%.8f");
-
-            static float f1 = 1.e10f;
-            ImGui::InputFloat("input scientific", &f1, 0.0f, 0.0f, "%e");
-            ImGui::SameLine(); HelpMarker(
-                "You can input value using the scientific notation,\n"
-                "  e.g. \"1e+8\" becomes \"100000000\".");
-
-            static float vec4a[4] = { 0.10f, 0.20f, 0.30f, 0.44f };
-            ImGui::InputFloat3("input float3", vec4a);
-        }
-
-        {
-            static int i1 = 50, i2 = 42;
-            ImGui::DragInt("drag int", &i1, 1);
-            ImGui::SameLine(); HelpMarker(
-                "Click and drag to edit value.\n"
-                "Hold SHIFT/ALT for faster/slower edit.\n"
-                "Double-click or CTRL+click to input value.");
-
-            ImGui::DragInt("drag int 0..100", &i2, 1, 0, 100, "%d%%", ImGuiSliderFlags_AlwaysClamp);
-
-            static float f1 = 1.00f, f2 = 0.0067f;
-            ImGui::DragFloat("drag float", &f1, 0.005f);
-            ImGui::DragFloat("drag small float", &f2, 0.0001f, 0.0f, 0.0f, "%.06f ns");
-        }
-
-        {
-            static int i1 = 0;
-            ImGui::SliderInt("slider int", &i1, -1, 3);
-            ImGui::SameLine(); HelpMarker("CTRL+click to input value.");
-
-            static float f1 = 0.123f, f2 = 0.0f;
-            ImGui::SliderFloat("slider float", &f1, 0.0f, 1.0f, "ratio = %.3f");
-            ImGui::SliderFloat("slider float (log)", &f2, -10.0f, 10.0f, "%.4f", ImGuiSliderFlags_Logarithmic);
-
-            static float angle = 0.0f;
-            ImGui::SliderAngle("slider angle", &angle);
-
-            enum Element { Element_Fire, Element_Earth, Element_Air, Element_Water, Element_COUNT };
-            static int elem = Element_Fire;
-            const char* elems_names[Element_COUNT] = { "Fire", "Earth", "Air", "Water" };
-            const char* elem_name = (elem >= 0 && elem < Element_COUNT) ? elems_names[elem] : "Unknown";
-            ImGui::SliderInt("slider enum", &elem, 0, Element_COUNT - 1, elem_name);
-            ImGui::SameLine(); HelpMarker("Using the format string parameter to display a name instead of the underlying integer.");
-        }
-
-        {
-            static float col1[3] = { 1.0f, 0.0f, 0.2f };
-            static float col2[4] = { 0.4f, 0.7f, 0.0f, 0.5f };
-            ImGui::ColorEdit3("color 1", col1);
-            ImGui::SameLine(); HelpMarker(
-                "Click on the color square to open a color picker.\n"
-                "Click and hold to use drag and drop.\n"
-                "Right-click on the color square to show options.\n"
-                "CTRL+click on individual component to input value.\n");
-
-            ImGui::ColorEdit4("color 2", col2);
-        }
-
-        {
-            const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi", "Mango", "Orange", "Pineapple", "Strawberry", "Watermelon" };
-            static int item_current = 1;
-            ImGui::ListBox("listbox", &item_current, items, IM_ARRAYSIZE(items), 4);
-            ImGui::SameLine(); HelpMarker(
-                "Using the simplified one-liner ListBox API here.\nRefer to the \"List boxes\" section below for an explanation of how to use the more flexible and general BeginListBox/EndListBox API.");
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Trees"))
-    {
-        if (ImGui::TreeNode("Basic trees"))
-        {
-            for (int i = 0; i < 5; i++)
-            {
-                if (i == 0)
-                    ImGui::SetNextItemOpen(true, ImGuiCond_Once);
-
-                if (ImGui::TreeNode((void*)(intptr_t)i, "Child %d", i))
-                {
-                    ImGui::Text("blah blah");
-                    ImGui::SameLine();
-                    if (ImGui::SmallButton("button")) {}
-                    ImGui::TreePop();
-                }
-            }
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Advanced, with Selectable nodes"))
-        {
-            HelpMarker(
-                "This is a more typical looking tree with selectable nodes.\n"
-                "Click to select, CTRL+Click to toggle, click on arrows or double-click to open.");
-            static ImGuiTreeNodeFlags base_flags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_SpanAvailWidth;
-            static bool align_label_with_current_x_position = false;
-            static bool test_drag_and_drop = false;
-            ImGui::CheckboxFlags("ImGuiTreeNodeFlags_OpenOnArrow",       &base_flags, ImGuiTreeNodeFlags_OpenOnArrow);
-            ImGui::CheckboxFlags("ImGuiTreeNodeFlags_OpenOnDoubleClick", &base_flags, ImGuiTreeNodeFlags_OpenOnDoubleClick);
-            ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanAvailWidth",    &base_flags, ImGuiTreeNodeFlags_SpanAvailWidth); ImGui::SameLine(); HelpMarker("Extend hit area to all available width instead of allowing more items to be laid out after the node.");
-            ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanFullWidth",     &base_flags, ImGuiTreeNodeFlags_SpanFullWidth);
-            ImGui::Checkbox("Align label with current X position", &align_label_with_current_x_position);
-            ImGui::Checkbox("Test tree node as drag source", &test_drag_and_drop);
-            ImGui::Text("Hello!");
-            if (align_label_with_current_x_position)
-                ImGui::Unindent(ImGui::GetTreeNodeToLabelSpacing());
-
-            static int selection_mask = (1 << 2);
-            int node_clicked = -1;
-            for (int i = 0; i < 6; i++)
-            {
-                ImGuiTreeNodeFlags node_flags = base_flags;
-                const bool is_selected = (selection_mask & (1 << i)) != 0;
-                if (is_selected)
-                    node_flags |= ImGuiTreeNodeFlags_Selected;
-                if (i < 3)
-                {
-                    bool node_open = ImGui::TreeNodeEx((void*)(intptr_t)i, node_flags, "Selectable Node %d", i);
-                    if (ImGui::IsItemClicked())
-                        node_clicked = i;
-                    if (test_drag_and_drop && ImGui::BeginDragDropSource())
-                    {
-                        ImGui::SetDragDropPayload("_TREENODE", NULL, 0);
-                        ImGui::Text("This is a drag and drop source");
-                        ImGui::EndDragDropSource();
-                    }
-                    if (node_open)
-                    {
-                        ImGui::BulletText("Blah blah\nBlah Blah");
-                        ImGui::TreePop();
-                    }
-                }
-                else
-                {
-                    node_flags |= ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen;  
-                    ImGui::TreeNodeEx((void*)(intptr_t)i, node_flags, "Selectable Leaf %d", i);
-                    if (ImGui::IsItemClicked())
-                        node_clicked = i;
-                    if (test_drag_and_drop && ImGui::BeginDragDropSource())
-                    {
-                        ImGui::SetDragDropPayload("_TREENODE", NULL, 0);
-                        ImGui::Text("This is a drag and drop source");
-                        ImGui::EndDragDropSource();
-                    }
-                }
-            }
-            if (node_clicked != -1)
-            {
-                if (ImGui::GetIO().KeyCtrl)
-                    selection_mask ^= (1 << node_clicked);             
-                else                            
-                    selection_mask = (1 << node_clicked);              
-            }
-            if (align_label_with_current_x_position)
-                ImGui::Indent(ImGui::GetTreeNodeToLabelSpacing());
-            ImGui::TreePop();
-        }
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Collapsing Headers"))
-    {
-        static bool closable_group = true;
-        ImGui::Checkbox("Show 2nd header", &closable_group);
-        if (ImGui::CollapsingHeader("Header", ImGuiTreeNodeFlags_None))
-        {
-            ImGui::Text("IsItemHovered: %d", ImGui::IsItemHovered());
-            for (int i = 0; i < 5; i++)
-                ImGui::Text("Some content %d", i);
-        }
-        if (ImGui::CollapsingHeader("Header with a close button", &closable_group))
-        {
-            ImGui::Text("IsItemHovered: %d", ImGui::IsItemHovered());
-            for (int i = 0; i < 5; i++)
-                ImGui::Text("More content %d", i);
-        }
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Bullets"))
-    {
-        ImGui::BulletText("Bullet point 1");
-        ImGui::BulletText("Bullet point 2\nOn multiple lines");
-        if (ImGui::TreeNode("Tree node"))
-        {
-            ImGui::BulletText("Another bullet point");
-            ImGui::TreePop();
-        }
-        ImGui::Bullet(); ImGui::Text("Bullet point 3 (two calls)");
-        ImGui::Bullet(); ImGui::SmallButton("Button");
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Text"))
-    {
-        if (ImGui::TreeNode("Colorful Text"))
-        {
-            ImGui::TextColored(ImVec4(1.0f, 0.0f, 1.0f, 1.0f), "Pink");
-            ImGui::TextColored(ImVec4(1.0f, 1.0f, 0.0f, 1.0f), "Yellow");
-            ImGui::TextDisabled("Disabled");
-            ImGui::SameLine(); HelpMarker("The TextDisabled color is stored in ImGuiStyle.");
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Word Wrapping"))
-        {
-            ImGui::TextWrapped(
-                "This text should automatically wrap on the edge of the window. The current implementation "
-                "for text wrapping follows simple rules suitable for English and possibly other languages.");
-            ImGui::Spacing();
-
-            static float wrap_width = 200.0f;
-            ImGui::SliderFloat("Wrap width", &wrap_width, -20, 600, "%.0f");
-
-            ImDrawList* draw_list = ImGui::GetWindowDrawList();
-            for (int n = 0; n < 2; n++)
-            {
-                ImGui::Text("Test paragraph %d:", n);
-                ImVec2 pos = ImGui::GetCursorScreenPos();
-                ImVec2 marker_min = ImVec2(pos.x + wrap_width, pos.y);
-                ImVec2 marker_max = ImVec2(pos.x + wrap_width + 10, pos.y + ImGui::GetTextLineHeight());
-                ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + wrap_width);
-                if (n == 0)
-                    ImGui::Text("The lazy dog is a good dog. This paragraph should fit within %.0f pixels. Testing a 1 character word. The quick brown fox jumps over the lazy dog.", wrap_width);
-                else
-                    ImGui::Text("aaaaaaaa bbbbbbbb, c cccccccc,dddddddd. d eeeeeeee   ffffffff. gggggggg!hhhhhhhh");
-
-                draw_list->AddRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax(), IM_COL32(255, 255, 0, 255));
-                draw_list->AddRectFilled(marker_min, marker_max, IM_COL32(255, 0, 255, 255));
-                ImGui::PopTextWrapPos();
-            }
-
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("UTF-8 Text"))
-        {
-            ImGui::TextWrapped(
-                "CJK text will only appears if the font was loaded with the appropriate CJK character ranges. "
-                "Call io.Font->AddFontFromFileTTF() manually to load extra character ranges. "
-                "Read docs/FONTS.md for details.");
-            ImGui::Text("Hiragana: \xe3\x81\x8b\xe3\x81\x8d\xe3\x81\x8f\xe3\x81\x91\xe3\x81\x93 (kakikukeko)");               
-            ImGui::Text("Kanjis: \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e (nihongo)");
-            static char buf[32] = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e";
-            ImGui::InputText("UTF-8 input", buf, IM_ARRAYSIZE(buf));
-            ImGui::TreePop();
-        }
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Images"))
-    {
-        ImGuiIO& io = ImGui::GetIO();
-        ImGui::TextWrapped(
-            "Below we are displaying the font texture (which is the only texture we have access to in this demo). "
-            "Use the 'ImTextureID' type as storage to pass pointers or identifier to your own texture data. "
-            "Hover the texture for a zoomed view!");
-
-        ImTextureID my_tex_id = io.Fonts->TexID;
-        float my_tex_w = (float)io.Fonts->TexWidth;
-        float my_tex_h = (float)io.Fonts->TexHeight;
-        {
-            ImGui::Text("%.0fx%.0f", my_tex_w, my_tex_h);
-            ImVec2 pos = ImGui::GetCursorScreenPos();
-            ImVec2 uv_min = ImVec2(0.0f, 0.0f);                  
-            ImVec2 uv_max = ImVec2(1.0f, 1.0f);                  
-            ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);     
-            ImVec4 border_col = ImVec4(1.0f, 1.0f, 1.0f, 0.5f);    
-            ImGui::Image(my_tex_id, ImVec2(my_tex_w, my_tex_h), uv_min, uv_max, tint_col, border_col);
-            if (ImGui::IsItemHovered())
-            {
-                ImGui::BeginTooltip();
-                float region_sz = 32.0f;
-                float region_x = io.MousePos.x - pos.x - region_sz * 0.5f;
-                float region_y = io.MousePos.y - pos.y - region_sz * 0.5f;
-                float zoom = 4.0f;
-                if (region_x < 0.0f) { region_x = 0.0f; }
-                else if (region_x > my_tex_w - region_sz) { region_x = my_tex_w - region_sz; }
-                if (region_y < 0.0f) { region_y = 0.0f; }
-                else if (region_y > my_tex_h - region_sz) { region_y = my_tex_h - region_sz; }
-                ImGui::Text("Min: (%.2f, %.2f)", region_x, region_y);
-                ImGui::Text("Max: (%.2f, %.2f)", region_x + region_sz, region_y + region_sz);
-                ImVec2 uv0 = ImVec2((region_x) / my_tex_w, (region_y) / my_tex_h);
-                ImVec2 uv1 = ImVec2((region_x + region_sz) / my_tex_w, (region_y + region_sz) / my_tex_h);
-                ImGui::Image(my_tex_id, ImVec2(region_sz * zoom, region_sz * zoom), uv0, uv1, tint_col, border_col);
-                ImGui::EndTooltip();
-            }
-        }
-        ImGui::TextWrapped("And now some textured buttons..");
-        static int pressed_count = 0;
-        for (int i = 0; i < 8; i++)
-        {
-            ImGui::PushID(i);
-            int frame_padding = -1 + i;                                   
-            ImVec2 size = ImVec2(32.0f, 32.0f);                              
-            ImVec2 uv0 = ImVec2(0.0f, 0.0f);                            
-            ImVec2 uv1 = ImVec2(32.0f / my_tex_w, 32.0f / my_tex_h);       
-            ImVec4 bg_col = ImVec4(0.0f, 0.0f, 0.0f, 1.0f);           
-            ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);         
-            if (ImGui::ImageButton(my_tex_id, size, uv0, uv1, frame_padding, bg_col, tint_col))
-                pressed_count += 1;
-            ImGui::PopID();
-            ImGui::SameLine();
-        }
-        ImGui::NewLine();
-        ImGui::Text("Pressed %d times.", pressed_count);
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Combo"))
-    {
-        static ImGuiComboFlags flags = 0;
-        ImGui::CheckboxFlags("ImGuiComboFlags_PopupAlignLeft", &flags, ImGuiComboFlags_PopupAlignLeft);
-        ImGui::SameLine(); HelpMarker("Only makes a difference if the popup is larger than the combo");
-        if (ImGui::CheckboxFlags("ImGuiComboFlags_NoArrowButton", &flags, ImGuiComboFlags_NoArrowButton))
-            flags &= ~ImGuiComboFlags_NoPreview;              
-        if (ImGui::CheckboxFlags("ImGuiComboFlags_NoPreview", &flags, ImGuiComboFlags_NoPreview))
-            flags &= ~ImGuiComboFlags_NoArrowButton;          
-
-        const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD", "EEEE", "FFFF", "GGGG", "HHHH", "IIII", "JJJJ", "KKKK", "LLLLLLL", "MMMM", "OOOOOOO" };
-        static int item_current_idx = 0;          
-        const char* combo_label = items[item_current_idx];              
-        if (ImGui::BeginCombo("combo 1", combo_label, flags))
-        {
-            for (int n = 0; n < IM_ARRAYSIZE(items); n++)
-            {
-                const bool is_selected = (item_current_idx == n);
-                if (ImGui::Selectable(items[n], is_selected))
-                    item_current_idx = n;
-
-                if (is_selected)
-                    ImGui::SetItemDefaultFocus();
-            }
-            ImGui::EndCombo();
-        }
-
-        static int item_current_2 = 0;
-        ImGui::Combo("combo 2 (one-liner)", &item_current_2, "aaaa\0bbbb\0cccc\0dddd\0eeee\0\0");
-
-        static int item_current_3 = -1;            
-        ImGui::Combo("combo 3 (array)", &item_current_3, items, IM_ARRAYSIZE(items));
-
-        struct Funcs { static bool ItemGetter(void* data, int n, const char** out_str) { *out_str = ((const char**)data)[n]; return true; } };
-        static int item_current_4 = 0;
-        ImGui::Combo("combo 4 (function)", &item_current_4, &Funcs::ItemGetter, items, IM_ARRAYSIZE(items));
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("List boxes"))
-    {
-        const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD", "EEEE", "FFFF", "GGGG", "HHHH", "IIII", "JJJJ", "KKKK", "LLLLLLL", "MMMM", "OOOOOOO" };
-        static int item_current_idx = 0;          
-        if (ImGui::BeginListBox("listbox 1"))
-        {
-            for (int n = 0; n < IM_ARRAYSIZE(items); n++)
-            {
-                const bool is_selected = (item_current_idx == n);
-                if (ImGui::Selectable(items[n], is_selected))
-                    item_current_idx = n;
-
-                if (is_selected)
-                    ImGui::SetItemDefaultFocus();
-            }
-            ImGui::EndListBox();
-        }
-
-        ImGui::Text("Full-width:");
-        if (ImGui::BeginListBox("##listbox 2", ImVec2(-FLT_MIN, 5 * ImGui::GetTextLineHeightWithSpacing())))
-        {
-            for (int n = 0; n < IM_ARRAYSIZE(items); n++)
-            {
-                const bool is_selected = (item_current_idx == n);
-                if (ImGui::Selectable(items[n], is_selected))
-                    item_current_idx = n;
-
-                if (is_selected)
-                    ImGui::SetItemDefaultFocus();
-            }
-            ImGui::EndListBox();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Selectables"))
-    {
-        if (ImGui::TreeNode("Basic"))
-        {
-            static bool selection[5] = { false, true, false, false, false };
-            ImGui::Selectable("1. I am selectable", &selection[0]);
-            ImGui::Selectable("2. I am selectable", &selection[1]);
-            ImGui::Text("3. I am not selectable");
-            ImGui::Selectable("4. I am selectable", &selection[3]);
-            if (ImGui::Selectable("5. I am double clickable", selection[4], ImGuiSelectableFlags_AllowDoubleClick))
-                if (ImGui::IsMouseDoubleClicked(0))
-                    selection[4] = !selection[4];
-            ImGui::TreePop();
-        }
-        if (ImGui::TreeNode("Selection State: Single Selection"))
-        {
-            static int selected = -1;
-            for (int n = 0; n < 5; n++)
-            {
-                char buf[32];
-                sprintf(buf, "Object %d", n);
-                if (ImGui::Selectable(buf, selected == n))
-                    selected = n;
-            }
-            ImGui::TreePop();
-        }
-        if (ImGui::TreeNode("Selection State: Multiple Selection"))
-        {
-            HelpMarker("Hold CTRL and click to select multiple items.");
-            static bool selection[5] = { false, false, false, false, false };
-            for (int n = 0; n < 5; n++)
-            {
-                char buf[32];
-                sprintf(buf, "Object %d", n);
-                if (ImGui::Selectable(buf, selection[n]))
-                {
-                    if (!ImGui::GetIO().KeyCtrl)           
-                        memset(selection, 0, sizeof(selection));
-                    selection[n] ^= 1;
-                }
-            }
-            ImGui::TreePop();
-        }
-        if (ImGui::TreeNode("Rendering more text into the same line"))
-        {
-            static bool selected[3] = { false, false, false };
-            ImGui::Selectable("main.c",    &selected[0]); ImGui::SameLine(300); ImGui::Text(" 2,345 bytes");
-            ImGui::Selectable("Hello.cpp", &selected[1]); ImGui::SameLine(300); ImGui::Text("12,345 bytes");
-            ImGui::Selectable("Hello.h",   &selected[2]); ImGui::SameLine(300); ImGui::Text(" 2,345 bytes");
-            ImGui::TreePop();
-        }
-        if (ImGui::TreeNode("In columns"))
-        {
-            static bool selected[10] = {};
-
-            if (ImGui::BeginTable("split1", 3, ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings))
-            {
-                for (int i = 0; i < 10; i++)
-                {
-                    char label[32];
-                    sprintf(label, "Item %d", i);
-                    ImGui::TableNextColumn();
-                    ImGui::Selectable(label, &selected[i]);    
-                }
-                ImGui::EndTable();
-            }
-            ImGui::Separator();
-            if (ImGui::BeginTable("split2", 3, ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings))
-            {
-                for (int i = 0; i < 10; i++)
-                {
-                    char label[32];
-                    sprintf(label, "Item %d", i);
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-                    ImGui::Selectable(label, &selected[i], ImGuiSelectableFlags_SpanAllColumns);
-                    ImGui::TableNextColumn();
-                    ImGui::Text("Some other contents");
-                    ImGui::TableNextColumn();
-                    ImGui::Text("123456");
-                }
-                ImGui::EndTable();
-            }
-            ImGui::TreePop();
-        }
-        if (ImGui::TreeNode("Grid"))
-        {
-            static char selected[4][4] = { { 1, 0, 0, 0 }, { 0, 1, 0, 0 }, { 0, 0, 1, 0 }, { 0, 0, 0, 1 } };
-
-            const float time = (float)ImGui::GetTime();
-            const bool winning_state = memchr(selected, 0, sizeof(selected)) == NULL;      
-            if (winning_state)
-                ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, ImVec2(0.5f + 0.5f * cosf(time * 2.0f), 0.5f + 0.5f * sinf(time * 3.0f)));
-
-            for (int y = 0; y < 4; y++)
-                for (int x = 0; x < 4; x++)
-                {
-                    if (x > 0)
-                        ImGui::SameLine();
-                    ImGui::PushID(y * 4 + x);
-                    if (ImGui::Selectable("Sailor", selected[y][x] != 0, 0, ImVec2(50, 50)))
-                    {
-                        selected[y][x] ^= 1;
-                        if (x > 0) { selected[y][x - 1] ^= 1; }
-                        if (x < 3) { selected[y][x + 1] ^= 1; }
-                        if (y > 0) { selected[y - 1][x] ^= 1; }
-                        if (y < 3) { selected[y + 1][x] ^= 1; }
-                    }
-                    ImGui::PopID();
-                }
-
-            if (winning_state)
-                ImGui::PopStyleVar();
-            ImGui::TreePop();
-        }
-        if (ImGui::TreeNode("Alignment"))
-        {
-            HelpMarker(
-                "By default, Selectables uses style.SelectableTextAlign but it can be overridden on a per-item "
-                "basis using PushStyleVar(). You'll probably want to always keep your default situation to "
-                "left-align otherwise it becomes difficult to layout multiple items on a same line");
-            static bool selected[3 * 3] = { true, false, true, false, true, false, true, false, true };
-            for (int y = 0; y < 3; y++)
-            {
-                for (int x = 0; x < 3; x++)
-                {
-                    ImVec2 alignment = ImVec2((float)x / 2.0f, (float)y / 2.0f);
-                    char name[32];
-                    sprintf(name, "(%.1f,%.1f)", alignment.x, alignment.y);
-                    if (x > 0) ImGui::SameLine();
-                    ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, alignment);
-                    ImGui::Selectable(name, &selected[3 * y + x], ImGuiSelectableFlags_None, ImVec2(80, 80));
-                    ImGui::PopStyleVar();
-                }
-            }
-            ImGui::TreePop();
-        }
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Text Input"))
-    {
-        if (ImGui::TreeNode("Multi-line Text Input"))
-        {
-            static char text[1024 * 16] =
-                "/*\n"
-                " The Pentium F00F bug, shorthand for F0 0F C7 C8,\n"
-                " the hexadecimal encoding of one offending instruction,\n"
-                " more formally, the invalid operand with locked CMPXCHG8B\n"
-                " instruction bug, is a design flaw in the majority of\n"
-                " Intel Pentium, Pentium MMX, and Pentium OverDrive\n"
-                " processors (all in the P5 microarchitecture).\n"
-                "*/\n\n"
-                "label:\n"
-                "\tlock cmpxchg8b eax\n";
-
-            static ImGuiInputTextFlags flags = ImGuiInputTextFlags_AllowTabInput;
-            HelpMarker("You can use the ImGuiInputTextFlags_CallbackResize facility if you need to wire InputTextMultiline() to a dynamic string type. See misc/cpp/imgui_stdlib.h for an example. (This is not demonstrated in imgui_demo.cpp because we don't want to include <string> in here)");
-            ImGui::CheckboxFlags("ImGuiInputTextFlags_ReadOnly", &flags, ImGuiInputTextFlags_ReadOnly);
-            ImGui::CheckboxFlags("ImGuiInputTextFlags_AllowTabInput", &flags, ImGuiInputTextFlags_AllowTabInput);
-            ImGui::CheckboxFlags("ImGuiInputTextFlags_CtrlEnterForNewLine", &flags, ImGuiInputTextFlags_CtrlEnterForNewLine);
-            ImGui::InputTextMultiline("##source", text, IM_ARRAYSIZE(text), ImVec2(-FLT_MIN, ImGui::GetTextLineHeight() * 16), flags);
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Filtered Text Input"))
-        {
-            struct TextFilters
-            {
-                static int FilterImGuiLetters(ImGuiInputTextCallbackData* data)
-                {
-                    if (data->EventChar < 256 && strchr("imgui", (char)data->EventChar))
-                        return 0;
-                    return 1;
-                }
-            };
-
-            static char buf1[64] = ""; ImGui::InputText("default",     buf1, 64);
-            static char buf2[64] = ""; ImGui::InputText("decimal",     buf2, 64, ImGuiInputTextFlags_CharsDecimal);
-            static char buf3[64] = ""; ImGui::InputText("hexadecimal", buf3, 64, ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase);
-            static char buf4[64] = ""; ImGui::InputText("uppercase",   buf4, 64, ImGuiInputTextFlags_CharsUppercase);
-            static char buf5[64] = ""; ImGui::InputText("no blank",    buf5, 64, ImGuiInputTextFlags_CharsNoBlank);
-            static char buf6[64] = ""; ImGui::InputText("\"imgui\" letters", buf6, 64, ImGuiInputTextFlags_CallbackCharFilter, TextFilters::FilterImGuiLetters);
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Password Input"))
-        {
-            static char password[64] = "password123";
-            ImGui::InputText("password", password, IM_ARRAYSIZE(password), ImGuiInputTextFlags_Password);
-            ImGui::SameLine(); HelpMarker("Display all characters as '*'.\nDisable clipboard cut and copy.\nDisable logging.\n");
-            ImGui::InputTextWithHint("password (w/ hint)", "<password>", password, IM_ARRAYSIZE(password), ImGuiInputTextFlags_Password);
-            ImGui::InputText("password (clear)", password, IM_ARRAYSIZE(password));
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Completion, History, Edit Callbacks"))
-        {
-            struct Funcs
-            {
-                static int MyCallback(ImGuiInputTextCallbackData* data)
-                {
-                    if (data->EventFlag == ImGuiInputTextFlags_CallbackCompletion)
-                    {
-                        data->InsertChars(data->CursorPos, "..");
-                    }
-                    else if (data->EventFlag == ImGuiInputTextFlags_CallbackHistory)
-                    {
-                        if (data->EventKey == ImGuiKey_UpArrow)
-                        {
-                            data->DeleteChars(0, data->BufTextLen);
-                            data->InsertChars(0, "Pressed Up!");
-                            data->SelectAll();
-                        }
-                        else if (data->EventKey == ImGuiKey_DownArrow)
-                        {
-                            data->DeleteChars(0, data->BufTextLen);
-                            data->InsertChars(0, "Pressed Down!");
-                            data->SelectAll();
-                        }
-                    }
-                    else if (data->EventFlag == ImGuiInputTextFlags_CallbackEdit)
-                    {
-                        char c = data->Buf[0];
-                        if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) data->Buf[0] ^= 32;
-                        data->BufDirty = true;
-
-                        int* p_int = (int*)data->UserData;
-                        *p_int = *p_int + 1;
-                    }
-                    return 0;
-                }
-            };
-            static char buf1[64];
-            ImGui::InputText("Completion", buf1, 64, ImGuiInputTextFlags_CallbackCompletion, Funcs::MyCallback);
-            ImGui::SameLine(); HelpMarker("Here we append \"..\" each time Tab is pressed. See 'Examples>Console' for a more meaningful demonstration of using this callback.");
-
-            static char buf2[64];
-            ImGui::InputText("History", buf2, 64, ImGuiInputTextFlags_CallbackHistory, Funcs::MyCallback);
-            ImGui::SameLine(); HelpMarker("Here we replace and select text each time Up/Down are pressed. See 'Examples>Console' for a more meaningful demonstration of using this callback.");
-
-            static char buf3[64];
-            static int edit_count = 0;
-            ImGui::InputText("Edit", buf3, 64, ImGuiInputTextFlags_CallbackEdit, Funcs::MyCallback, (void*)&edit_count);
-            ImGui::SameLine(); HelpMarker("Here we toggle the casing of the first character on every edits + count edits.");
-            ImGui::SameLine(); ImGui::Text("(%d)", edit_count);
-
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Resize Callback"))
-        {
-            HelpMarker(
-                "Using ImGuiInputTextFlags_CallbackResize to wire your custom string type to InputText().\n\n"
-                "See misc/cpp/imgui_stdlib.h for an implementation of this for std::string.");
-            struct Funcs
-            {
-                static int MyResizeCallback(ImGuiInputTextCallbackData* data)
-                {
-                    if (data->EventFlag == ImGuiInputTextFlags_CallbackResize)
-                    {
-                        ImVector<char>* my_str = (ImVector<char>*)data->UserData;
-                        IM_ASSERT(my_str->begin() == data->Buf);
-                        my_str->resize(data->BufSize);           
-                        data->Buf = my_str->begin();
-                    }
-                    return 0;
-                }
-
-                static bool MyInputTextMultiline(const char* label, ImVector<char>* my_str, const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = 0)
-                {
-                    IM_ASSERT((flags & ImGuiInputTextFlags_CallbackResize) == 0);
-                    return ImGui::InputTextMultiline(label, my_str->begin(), (size_t)my_str->size(), size, flags | ImGuiInputTextFlags_CallbackResize, Funcs::MyResizeCallback, (void*)my_str);
-                }
-            };
-
-            static ImVector<char> my_str;
-            if (my_str.empty())
-                my_str.push_back(0);
-            Funcs::MyInputTextMultiline("##MyStr", &my_str, ImVec2(-FLT_MIN, ImGui::GetTextLineHeight() * 16));
-            ImGui::Text("Data: %p\nSize: %d\nCapacity: %d", (void*)my_str.begin(), my_str.size(), my_str.capacity());
-            ImGui::TreePop();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Tabs"))
-    {
-        if (ImGui::TreeNode("Basic"))
-        {
-            ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_None;
-            if (ImGui::BeginTabBar("MyTabBar", tab_bar_flags))
-            {
-                if (ImGui::BeginTabItem("Avocado"))
-                {
-                    ImGui::Text("This is the Avocado tab!\nblah blah blah blah blah");
-                    ImGui::EndTabItem();
-                }
-                if (ImGui::BeginTabItem("Broccoli"))
-                {
-                    ImGui::Text("This is the Broccoli tab!\nblah blah blah blah blah");
-                    ImGui::EndTabItem();
-                }
-                if (ImGui::BeginTabItem("Cucumber"))
-                {
-                    ImGui::Text("This is the Cucumber tab!\nblah blah blah blah blah");
-                    ImGui::EndTabItem();
-                }
-                ImGui::EndTabBar();
-            }
-            ImGui::Separator();
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Advanced & Close Button"))
-        {
-            static ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_Reorderable;
-            ImGui::CheckboxFlags("ImGuiTabBarFlags_Reorderable", &tab_bar_flags, ImGuiTabBarFlags_Reorderable);
-            ImGui::CheckboxFlags("ImGuiTabBarFlags_AutoSelectNewTabs", &tab_bar_flags, ImGuiTabBarFlags_AutoSelectNewTabs);
-            ImGui::CheckboxFlags("ImGuiTabBarFlags_TabListPopupButton", &tab_bar_flags, ImGuiTabBarFlags_TabListPopupButton);
-            ImGui::CheckboxFlags("ImGuiTabBarFlags_NoCloseWithMiddleMouseButton", &tab_bar_flags, ImGuiTabBarFlags_NoCloseWithMiddleMouseButton);
-            if ((tab_bar_flags & ImGuiTabBarFlags_FittingPolicyMask_) == 0)
-                tab_bar_flags |= ImGuiTabBarFlags_FittingPolicyDefault_;
-            if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyResizeDown", &tab_bar_flags, ImGuiTabBarFlags_FittingPolicyResizeDown))
-                tab_bar_flags &= ~(ImGuiTabBarFlags_FittingPolicyMask_ ^ ImGuiTabBarFlags_FittingPolicyResizeDown);
-            if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyScroll", &tab_bar_flags, ImGuiTabBarFlags_FittingPolicyScroll))
-                tab_bar_flags &= ~(ImGuiTabBarFlags_FittingPolicyMask_ ^ ImGuiTabBarFlags_FittingPolicyScroll);
-
-            const char* names[4] = { "Artichoke", "Beetroot", "Celery", "Daikon" };
-            static bool opened[4] = { true, true, true, true };    
-            for (int n = 0; n < IM_ARRAYSIZE(opened); n++)
-            {
-                if (n > 0) { ImGui::SameLine(); }
-                ImGui::Checkbox(names[n], &opened[n]);
-            }
-
-            if (ImGui::BeginTabBar("MyTabBar", tab_bar_flags))
-            {
-                for (int n = 0; n < IM_ARRAYSIZE(opened); n++)
-                    if (opened[n] && ImGui::BeginTabItem(names[n], &opened[n], ImGuiTabItemFlags_None))
-                    {
-                        ImGui::Text("This is the %s tab!", names[n]);
-                        if (n & 1)
-                            ImGui::Text("I am an odd tab.");
-                        ImGui::EndTabItem();
-                    }
-                ImGui::EndTabBar();
-            }
-            ImGui::Separator();
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("TabItemButton & Leading/Trailing flags"))
-        {
-            static ImVector<int> active_tabs;
-            static int next_tab_id = 0;
-            if (next_tab_id == 0)      
-                for (int i = 0; i < 3; i++)
-                    active_tabs.push_back(next_tab_id++);
-
-            static bool show_leading_button = true;
-            static bool show_trailing_button = true;
-            ImGui::Checkbox("Show Leading TabItemButton()", &show_leading_button);
-            ImGui::Checkbox("Show Trailing TabItemButton()", &show_trailing_button);
-
-            static ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_AutoSelectNewTabs | ImGuiTabBarFlags_Reorderable | ImGuiTabBarFlags_FittingPolicyResizeDown;
-            ImGui::CheckboxFlags("ImGuiTabBarFlags_TabListPopupButton", &tab_bar_flags, ImGuiTabBarFlags_TabListPopupButton);
-            if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyResizeDown", &tab_bar_flags, ImGuiTabBarFlags_FittingPolicyResizeDown))
-                tab_bar_flags &= ~(ImGuiTabBarFlags_FittingPolicyMask_ ^ ImGuiTabBarFlags_FittingPolicyResizeDown);
-            if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyScroll", &tab_bar_flags, ImGuiTabBarFlags_FittingPolicyScroll))
-                tab_bar_flags &= ~(ImGuiTabBarFlags_FittingPolicyMask_ ^ ImGuiTabBarFlags_FittingPolicyScroll);
-
-            if (ImGui::BeginTabBar("MyTabBar", tab_bar_flags))
-            {
-                if (show_leading_button)
-                    if (ImGui::TabItemButton("?", ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_NoTooltip))
-                        ImGui::OpenPopup("MyHelpMenu");
-                if (ImGui::BeginPopup("MyHelpMenu"))
-                {
-                    ImGui::Selectable("Hello!");
-                    ImGui::EndPopup();
-                }
-
-                if (show_trailing_button)
-                    if (ImGui::TabItemButton("+", ImGuiTabItemFlags_Trailing | ImGuiTabItemFlags_NoTooltip))
-                        active_tabs.push_back(next_tab_id++);    
-
-                for (int n = 0; n < active_tabs.Size; )
-                {
-                    bool open = true;
-                    char name[16];
-                    snprintf(name, IM_ARRAYSIZE(name), "%04d", active_tabs[n]);
-                    if (ImGui::BeginTabItem(name, &open, ImGuiTabItemFlags_None))
-                    {
-                        ImGui::Text("This is the %s tab!", name);
-                        ImGui::EndTabItem();
-                    }
-
-                    if (!open)
-                        active_tabs.erase(active_tabs.Data + n);
-                    else
-                        n++;
-                }
-
-                ImGui::EndTabBar();
-            }
-            ImGui::Separator();
-            ImGui::TreePop();
-        }
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Plots Widgets"))
-    {
-        static bool animate = true;
-        ImGui::Checkbox("Animate", &animate);
-
-        static float arr[] = { 0.6f, 0.1f, 1.0f, 0.5f, 0.92f, 0.1f, 0.2f };
-        ImGui::PlotLines("Frame Times", arr, IM_ARRAYSIZE(arr));
-
-        static float values[90] = {};
-        static int values_offset = 0;
-        static double refresh_time = 0.0;
-        if (!animate || refresh_time == 0.0)
-            refresh_time = ImGui::GetTime();
-        while (refresh_time < ImGui::GetTime())           
-        {
-            static float phase = 0.0f;
-            values[values_offset] = cosf(phase);
-            values_offset = (values_offset + 1) % IM_ARRAYSIZE(values);
-            phase += 0.10f * values_offset;
-            refresh_time += 1.0f / 60.0f;
-        }
-
-        {
-            float average = 0.0f;
-            for (int n = 0; n < IM_ARRAYSIZE(values); n++)
-                average += values[n];
-            average /= (float)IM_ARRAYSIZE(values);
-            char overlay[32];
-            sprintf(overlay, "avg %f", average);
-            ImGui::PlotLines("Lines", values, IM_ARRAYSIZE(values), values_offset, overlay, -1.0f, 1.0f, ImVec2(0, 80.0f));
-        }
-        ImGui::PlotHistogram("Histogram", arr, IM_ARRAYSIZE(arr), 0, NULL, 0.0f, 1.0f, ImVec2(0, 80.0f));
-
-        struct Funcs
-        {
-            static float Sin(void*, int i) { return sinf(i * 0.1f); }
-            static float Saw(void*, int i) { return (i & 1) ? 1.0f : -1.0f; }
-        };
-        static int func_type = 0, display_count = 70;
-        ImGui::Separator();
-        ImGui::SetNextItemWidth(100);
-        ImGui::Combo("func", &func_type, "Sin\0Saw\0");
-        ImGui::SameLine();
-        ImGui::SliderInt("Sample count", &display_count, 1, 400);
-        float (*func)(void*, int) = (func_type == 0) ? Funcs::Sin : Funcs::Saw;
-        ImGui::PlotLines("Lines", func, NULL, display_count, 0, NULL, -1.0f, 1.0f, ImVec2(0, 80));
-        ImGui::PlotHistogram("Histogram", func, NULL, display_count, 0, NULL, -1.0f, 1.0f, ImVec2(0, 80));
-        ImGui::Separator();
-
-        static float progress = 0.0f, progress_dir = 1.0f;
-        if (animate)
-        {
-            progress += progress_dir * 0.4f * ImGui::GetIO().DeltaTime;
-            if (progress >= +1.1f) { progress = +1.1f; progress_dir *= -1.0f; }
-            if (progress <= -0.1f) { progress = -0.1f; progress_dir *= -1.0f; }
-        }
-
-        ImGui::ProgressBar(progress, ImVec2(0.0f, 0.0f));
-        ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-        ImGui::Text("Progress Bar");
-
-        float progress_saturated = IM_CLAMP(progress, 0.0f, 1.0f);
-        char buf[32];
-        sprintf(buf, "%d/%d", (int)(progress_saturated * 1753), 1753);
-        ImGui::ProgressBar(progress, ImVec2(0.f, 0.f), buf);
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Color/Picker Widgets"))
-    {
-        static ImVec4 color = ImVec4(114.0f / 255.0f, 144.0f / 255.0f, 154.0f / 255.0f, 200.0f / 255.0f);
-
-        static bool alpha_preview = true;
-        static bool alpha_half_preview = false;
-        static bool drag_and_drop = true;
-        static bool options_menu = true;
-        static bool hdr = false;
-        ImGui::Checkbox("With Alpha Preview", &alpha_preview);
-        ImGui::Checkbox("With Half Alpha Preview", &alpha_half_preview);
-        ImGui::Checkbox("With Drag and Drop", &drag_and_drop);
-        ImGui::Checkbox("With Options Menu", &options_menu); ImGui::SameLine(); HelpMarker("Right-click on the individual color widget to show options.");
-        ImGui::Checkbox("With HDR", &hdr); ImGui::SameLine(); HelpMarker("Currently all this does is to lift the 0..1 limits on dragging widgets.");
-        ImGuiColorEditFlags misc_flags = (hdr ? ImGuiColorEditFlags_HDR : 0) | (drag_and_drop ? 0 : ImGuiColorEditFlags_NoDragDrop) | (alpha_half_preview ? ImGuiColorEditFlags_AlphaPreviewHalf : (alpha_preview ? ImGuiColorEditFlags_AlphaPreview : 0)) | (options_menu ? 0 : ImGuiColorEditFlags_NoOptions);
-
-        ImGui::Text("Color widget:");
-        ImGui::SameLine(); HelpMarker(
-            "Click on the color square to open a color picker.\n"
-            "CTRL+click on individual component to input value.\n");
-        ImGui::ColorEdit3("MyColor##1", (float*)&color, misc_flags);
-
-        ImGui::Text("Color widget HSV with Alpha:");
-        ImGui::ColorEdit4("MyColor##2", (float*)&color, ImGuiColorEditFlags_DisplayHSV | misc_flags);
-
-        ImGui::Text("Color widget with Float Display:");
-        ImGui::ColorEdit4("MyColor##2f", (float*)&color, ImGuiColorEditFlags_Float | misc_flags);
-
-        ImGui::Text("Color button with Picker:");
-        ImGui::SameLine(); HelpMarker(
-            "With the ImGuiColorEditFlags_NoInputs flag you can hide all the slider/text inputs.\n"
-            "With the ImGuiColorEditFlags_NoLabel flag you can pass a non-empty label which will only "
-            "be used for the tooltip and picker popup.");
-        ImGui::ColorEdit4("MyColor##3", (float*)&color, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | misc_flags);
-
-        ImGui::Text("Color button with Custom Picker Popup:");
-
-        static bool saved_palette_init = true;
-        static ImVec4 saved_palette[32] = {};
-        if (saved_palette_init)
-        {
-            for (int n = 0; n < IM_ARRAYSIZE(saved_palette); n++)
-            {
-                ImGui::ColorConvertHSVtoRGB(n / 31.0f, 0.8f, 0.8f,
-                    saved_palette[n].x, saved_palette[n].y, saved_palette[n].z);
-                saved_palette[n].w = 1.0f;  
-            }
-            saved_palette_init = false;
-        }
-
-        static ImVec4 backup_color;
-        bool open_popup = ImGui::ColorButton("MyColor##3b", color, misc_flags);
-        ImGui::SameLine(0, ImGui::GetStyle().ItemInnerSpacing.x);
-        open_popup |= ImGui::Button("Palette");
-        if (open_popup)
-        {
-            ImGui::OpenPopup("mypicker");
-            backup_color = color;
-        }
-        if (ImGui::BeginPopup("mypicker"))
-        {
-            ImGui::Text("MY CUSTOM COLOR PICKER WITH AN AMAZING PALETTE!");
-            ImGui::Separator();
-            ImGui::ColorPicker4("##picker", (float*)&color, misc_flags | ImGuiColorEditFlags_NoSidePreview | ImGuiColorEditFlags_NoSmallPreview);
-            ImGui::SameLine();
-
-            ImGui::BeginGroup();    
-            ImGui::Text("Current");
-            ImGui::ColorButton("##current", color, ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_AlphaPreviewHalf, ImVec2(60, 40));
-            ImGui::Text("Previous");
-            if (ImGui::ColorButton("##previous", backup_color, ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_AlphaPreviewHalf, ImVec2(60, 40)))
-                color = backup_color;
-            ImGui::Separator();
-            ImGui::Text("Palette");
-            for (int n = 0; n < IM_ARRAYSIZE(saved_palette); n++)
-            {
-                ImGui::PushID(n);
-                if ((n % 8) != 0)
-                    ImGui::SameLine(0.0f, ImGui::GetStyle().ItemSpacing.y);
-
-                ImGuiColorEditFlags palette_button_flags = ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_NoTooltip;
-                if (ImGui::ColorButton("##palette", saved_palette[n], palette_button_flags, ImVec2(20, 20)))
-                    color = ImVec4(saved_palette[n].x, saved_palette[n].y, saved_palette[n].z, color.w);   
-
-                if (ImGui::BeginDragDropTarget())
-                {
-                    if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_3F))
-                        memcpy((float*)&saved_palette[n], payload->Data, sizeof(float) * 3);
-                    if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_4F))
-                        memcpy((float*)&saved_palette[n], payload->Data, sizeof(float) * 4);
-                    ImGui::EndDragDropTarget();
-                }
-
-                ImGui::PopID();
-            }
-            ImGui::EndGroup();
-            ImGui::EndPopup();
-        }
-
-        ImGui::Text("Color button only:");
-        static bool no_border = false;
-        ImGui::Checkbox("ImGuiColorEditFlags_NoBorder", &no_border);
-        ImGui::ColorButton("MyColor##3c", *(ImVec4*)&color, misc_flags | (no_border ? ImGuiColorEditFlags_NoBorder : 0), ImVec2(80, 80));
-
-        ImGui::Text("Color picker:");
-        static bool alpha = true;
-        static bool alpha_bar = true;
-        static bool side_preview = true;
-        static bool ref_color = false;
-        static ImVec4 ref_color_v(1.0f, 0.0f, 1.0f, 0.5f);
-        static int display_mode = 0;
-        static int picker_mode = 0;
-        ImGui::Checkbox("With Alpha", &alpha);
-        ImGui::Checkbox("With Alpha Bar", &alpha_bar);
-        ImGui::Checkbox("With Side Preview", &side_preview);
-        if (side_preview)
-        {
-            ImGui::SameLine();
-            ImGui::Checkbox("With Ref Color", &ref_color);
-            if (ref_color)
-            {
-                ImGui::SameLine();
-                ImGui::ColorEdit4("##RefColor", &ref_color_v.x, ImGuiColorEditFlags_NoInputs | misc_flags);
-            }
-        }
-        ImGui::Combo("Display Mode", &display_mode, "Auto/Current\0None\0RGB Only\0HSV Only\0Hex Only\0");
-        ImGui::SameLine(); HelpMarker(
-            "ColorEdit defaults to displaying RGB inputs if you don't specify a display mode, "
-            "but the user can change it with a right-click.\n\nColorPicker defaults to displaying RGB+HSV+Hex "
-            "if you don't specify a display mode.\n\nYou can change the defaults using SetColorEditOptions().");
-        ImGui::Combo("Picker Mode", &picker_mode, "Auto/Current\0Hue bar + SV rect\0Hue wheel + SV triangle\0");
-        ImGui::SameLine(); HelpMarker("User can right-click the picker to change mode.");
-        ImGuiColorEditFlags flags = misc_flags;
-        if (!alpha)            flags |= ImGuiColorEditFlags_NoAlpha;                   
-        if (alpha_bar)         flags |= ImGuiColorEditFlags_AlphaBar;
-        if (!side_preview)     flags |= ImGuiColorEditFlags_NoSidePreview;
-        if (picker_mode == 1)  flags |= ImGuiColorEditFlags_PickerHueBar;
-        if (picker_mode == 2)  flags |= ImGuiColorEditFlags_PickerHueWheel;
-        if (display_mode == 1) flags |= ImGuiColorEditFlags_NoInputs;           
-        if (display_mode == 2) flags |= ImGuiColorEditFlags_DisplayRGB;        
-        if (display_mode == 3) flags |= ImGuiColorEditFlags_DisplayHSV;
-        if (display_mode == 4) flags |= ImGuiColorEditFlags_DisplayHex;
-        ImGui::ColorPicker4("MyColor##4", (float*)&color, flags, ref_color ? &ref_color_v.x : NULL);
-
-        ImGui::Text("Set defaults in code:");
-        ImGui::SameLine(); HelpMarker(
-            "SetColorEditOptions() is designed to allow you to set boot-time default.\n"
-            "We don't have Push/Pop functions because you can force options on a per-widget basis if needed,"
-            "and the user can change non-forced ones with the options menu.\nWe don't have a getter to avoid"
-            "encouraging you to persistently save values that aren't forward-compatible.");
-        if (ImGui::Button("Default: Uint8 + HSV + Hue Bar"))
-            ImGui::SetColorEditOptions(ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_PickerHueBar);
-        if (ImGui::Button("Default: Float + HDR + Hue Wheel"))
-            ImGui::SetColorEditOptions(ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_PickerHueWheel);
-
-        static ImVec4 color_hsv(0.23f, 1.0f, 1.0f, 1.0f);    
-        ImGui::Spacing();
-        ImGui::Text("HSV encoded colors");
-        ImGui::SameLine(); HelpMarker(
-            "By default, colors are given to ColorEdit and ColorPicker in RGB, but ImGuiColorEditFlags_InputHSV"
-            "allows you to store colors as HSV and pass them to ColorEdit and ColorPicker as HSV. This comes with the"
-            "added benefit that you can manipulate hue values with the picker even when saturation or value are zero.");
-        ImGui::Text("Color widget with InputHSV:");
-        ImGui::ColorEdit4("HSV shown as RGB##1", (float*)&color_hsv, ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_InputHSV | ImGuiColorEditFlags_Float);
-        ImGui::ColorEdit4("HSV shown as HSV##1", (float*)&color_hsv, ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_InputHSV | ImGuiColorEditFlags_Float);
-        ImGui::DragFloat4("Raw HSV values", (float*)&color_hsv, 0.01f, 0.0f, 1.0f);
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Drag/Slider Flags"))
-    {
-        static ImGuiSliderFlags flags = ImGuiSliderFlags_None;
-        ImGui::CheckboxFlags("ImGuiSliderFlags_AlwaysClamp", &flags, ImGuiSliderFlags_AlwaysClamp);
-        ImGui::SameLine(); HelpMarker("Always clamp value to min/max bounds (if any) when input manually with CTRL+Click.");
-        ImGui::CheckboxFlags("ImGuiSliderFlags_Logarithmic", &flags, ImGuiSliderFlags_Logarithmic);
-        ImGui::SameLine(); HelpMarker("Enable logarithmic editing (more precision for small values).");
-        ImGui::CheckboxFlags("ImGuiSliderFlags_NoRoundToFormat", &flags, ImGuiSliderFlags_NoRoundToFormat);
-        ImGui::SameLine(); HelpMarker("Disable rounding underlying value to match precision of the format string (e.g. %.3f values are rounded to those 3 digits).");
-        ImGui::CheckboxFlags("ImGuiSliderFlags_NoInput", &flags, ImGuiSliderFlags_NoInput);
-        ImGui::SameLine(); HelpMarker("Disable CTRL+Click or Enter key allowing to input text directly into the widget.");
-
-        static float drag_f = 0.5f;
-        static int drag_i = 50;
-        ImGui::Text("Underlying float value: %f", drag_f);
-        ImGui::DragFloat("DragFloat (0 -> 1)", &drag_f, 0.005f, 0.0f, 1.0f, "%.3f", flags);
-        ImGui::DragFloat("DragFloat (0 -> +inf)", &drag_f, 0.005f, 0.0f, FLT_MAX, "%.3f", flags);
-        ImGui::DragFloat("DragFloat (-inf -> 1)", &drag_f, 0.005f, -FLT_MAX, 1.0f, "%.3f", flags);
-        ImGui::DragFloat("DragFloat (-inf -> +inf)", &drag_f, 0.005f, -FLT_MAX, +FLT_MAX, "%.3f", flags);
-        ImGui::DragInt("DragInt (0 -> 100)", &drag_i, 0.5f, 0, 100, "%d", flags);
-
-        static float slider_f = 0.5f;
-        static int slider_i = 50;
-        ImGui::Text("Underlying float value: %f", slider_f);
-        ImGui::SliderFloat("SliderFloat (0 -> 1)", &slider_f, 0.0f, 1.0f, "%.3f", flags);
-        ImGui::SliderInt("SliderInt (0 -> 100)", &slider_i, 0, 100, "%d", flags);
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Range Widgets"))
-    {
-        static float begin = 10, end = 90;
-        static int begin_i = 100, end_i = 1000;
-        ImGui::DragFloatRange2("range float", &begin, &end, 0.25f, 0.0f, 100.0f, "Min: %.1f %%", "Max: %.1f %%", ImGuiSliderFlags_AlwaysClamp);
-        ImGui::DragIntRange2("range int", &begin_i, &end_i, 5, 0, 1000, "Min: %d units", "Max: %d units");
-        ImGui::DragIntRange2("range int (no bounds)", &begin_i, &end_i, 5, 0, 0, "Min: %d units", "Max: %d units");
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Data Types"))
-    {
-        #ifndef LLONG_MIN
-        ImS64 LLONG_MIN = -9223372036854775807LL - 1;
-        ImS64 LLONG_MAX = 9223372036854775807LL;
-        ImU64 ULLONG_MAX = (2ULL * 9223372036854775807LL + 1);
-        #endif
-        const char    s8_zero  = 0,   s8_one  = 1,   s8_fifty  = 50, s8_min  = -128,        s8_max = 127;
-        const ImU8    u8_zero  = 0,   u8_one  = 1,   u8_fifty  = 50, u8_min  = 0,           u8_max = 255;
-        const short   s16_zero = 0,   s16_one = 1,   s16_fifty = 50, s16_min = -32768,      s16_max = 32767;
-        const ImU16   u16_zero = 0,   u16_one = 1,   u16_fifty = 50, u16_min = 0,           u16_max = 65535;
-        const ImS32   s32_zero = 0,   s32_one = 1,   s32_fifty = 50, s32_min = INT_MIN/2,   s32_max = INT_MAX/2,    s32_hi_a = INT_MAX/2 - 100,    s32_hi_b = INT_MAX/2;
-        const ImU32   u32_zero = 0,   u32_one = 1,   u32_fifty = 50, u32_min = 0,           u32_max = UINT_MAX/2,   u32_hi_a = UINT_MAX/2 - 100,   u32_hi_b = UINT_MAX/2;
-        const ImS64   s64_zero = 0,   s64_one = 1,   s64_fifty = 50, s64_min = LLONG_MIN/2, s64_max = LLONG_MAX/2,  s64_hi_a = LLONG_MAX/2 - 100,  s64_hi_b = LLONG_MAX/2;
-        const ImU64   u64_zero = 0,   u64_one = 1,   u64_fifty = 50, u64_min = 0,           u64_max = ULLONG_MAX/2, u64_hi_a = ULLONG_MAX/2 - 100, u64_hi_b = ULLONG_MAX/2;
-        const float   f32_zero = 0.f, f32_one = 1.f, f32_lo_a = -10000000000.0f, f32_hi_a = +10000000000.0f;
-        const double  f64_zero = 0.,  f64_one = 1.,  f64_lo_a = -1000000000000000.0, f64_hi_a = +1000000000000000.0;
-
-        static char   s8_v  = 127;
-        static ImU8   u8_v  = 255;
-        static short  s16_v = 32767;
-        static ImU16  u16_v = 65535;
-        static ImS32  s32_v = -1;
-        static ImU32  u32_v = (ImU32)-1;
-        static ImS64  s64_v = -1;
-        static ImU64  u64_v = (ImU64)-1;
-        static float  f32_v = 0.123f;
-        static double f64_v = 90000.01234567890123456789;
-
-        const float drag_speed = 0.2f;
-        static bool drag_clamp = false;
-        ImGui::Text("Drags:");
-        ImGui::Checkbox("Clamp integers to 0..50", &drag_clamp);
-        ImGui::SameLine(); HelpMarker(
-            "As with every widgets in dear imgui, we never modify values unless there is a user interaction.\n"
-            "You can override the clamping limits by using CTRL+Click to input a value.");
-        ImGui::DragScalar("drag s8",        ImGuiDataType_S8,     &s8_v,  drag_speed, drag_clamp ? &s8_zero  : NULL, drag_clamp ? &s8_fifty  : NULL);
-        ImGui::DragScalar("drag u8",        ImGuiDataType_U8,     &u8_v,  drag_speed, drag_clamp ? &u8_zero  : NULL, drag_clamp ? &u8_fifty  : NULL, "%u ms");
-        ImGui::DragScalar("drag s16",       ImGuiDataType_S16,    &s16_v, drag_speed, drag_clamp ? &s16_zero : NULL, drag_clamp ? &s16_fifty : NULL);
-        ImGui::DragScalar("drag u16",       ImGuiDataType_U16,    &u16_v, drag_speed, drag_clamp ? &u16_zero : NULL, drag_clamp ? &u16_fifty : NULL, "%u ms");
-        ImGui::DragScalar("drag s32",       ImGuiDataType_S32,    &s32_v, drag_speed, drag_clamp ? &s32_zero : NULL, drag_clamp ? &s32_fifty : NULL);
-        ImGui::DragScalar("drag u32",       ImGuiDataType_U32,    &u32_v, drag_speed, drag_clamp ? &u32_zero : NULL, drag_clamp ? &u32_fifty : NULL, "%u ms");
-        ImGui::DragScalar("drag s64",       ImGuiDataType_S64,    &s64_v, drag_speed, drag_clamp ? &s64_zero : NULL, drag_clamp ? &s64_fifty : NULL);
-        ImGui::DragScalar("drag u64",       ImGuiDataType_U64,    &u64_v, drag_speed, drag_clamp ? &u64_zero : NULL, drag_clamp ? &u64_fifty : NULL);
-        ImGui::DragScalar("drag float",     ImGuiDataType_Float,  &f32_v, 0.005f,  &f32_zero, &f32_one, "%f");
-        ImGui::DragScalar("drag float log", ImGuiDataType_Float,  &f32_v, 0.005f,  &f32_zero, &f32_one, "%f", ImGuiSliderFlags_Logarithmic);
-        ImGui::DragScalar("drag double",    ImGuiDataType_Double, &f64_v, 0.0005f, &f64_zero, NULL,     "%.10f grams");
-        ImGui::DragScalar("drag double log",ImGuiDataType_Double, &f64_v, 0.0005f, &f64_zero, &f64_one, "0 < %.10f < 1", ImGuiSliderFlags_Logarithmic);
-
-        ImGui::Text("Sliders");
-        ImGui::SliderScalar("slider s8 full",       ImGuiDataType_S8,     &s8_v,  &s8_min,   &s8_max,   "%d");
-        ImGui::SliderScalar("slider u8 full",       ImGuiDataType_U8,     &u8_v,  &u8_min,   &u8_max,   "%u");
-        ImGui::SliderScalar("slider s16 full",      ImGuiDataType_S16,    &s16_v, &s16_min,  &s16_max,  "%d");
-        ImGui::SliderScalar("slider u16 full",      ImGuiDataType_U16,    &u16_v, &u16_min,  &u16_max,  "%u");
-        ImGui::SliderScalar("slider s32 low",       ImGuiDataType_S32,    &s32_v, &s32_zero, &s32_fifty,"%d");
-        ImGui::SliderScalar("slider s32 high",      ImGuiDataType_S32,    &s32_v, &s32_hi_a, &s32_hi_b, "%d");
-        ImGui::SliderScalar("slider s32 full",      ImGuiDataType_S32,    &s32_v, &s32_min,  &s32_max,  "%d");
-        ImGui::SliderScalar("slider u32 low",       ImGuiDataType_U32,    &u32_v, &u32_zero, &u32_fifty,"%u");
-        ImGui::SliderScalar("slider u32 high",      ImGuiDataType_U32,    &u32_v, &u32_hi_a, &u32_hi_b, "%u");
-        ImGui::SliderScalar("slider u32 full",      ImGuiDataType_U32,    &u32_v, &u32_min,  &u32_max,  "%u");
-        ImGui::SliderScalar("slider s64 low",       ImGuiDataType_S64,    &s64_v, &s64_zero, &s64_fifty,"%I64d");
-        ImGui::SliderScalar("slider s64 high",      ImGuiDataType_S64,    &s64_v, &s64_hi_a, &s64_hi_b, "%I64d");
-        ImGui::SliderScalar("slider s64 full",      ImGuiDataType_S64,    &s64_v, &s64_min,  &s64_max,  "%I64d");
-        ImGui::SliderScalar("slider u64 low",       ImGuiDataType_U64,    &u64_v, &u64_zero, &u64_fifty,"%I64u ms");
-        ImGui::SliderScalar("slider u64 high",      ImGuiDataType_U64,    &u64_v, &u64_hi_a, &u64_hi_b, "%I64u ms");
-        ImGui::SliderScalar("slider u64 full",      ImGuiDataType_U64,    &u64_v, &u64_min,  &u64_max,  "%I64u ms");
-        ImGui::SliderScalar("slider float low",     ImGuiDataType_Float,  &f32_v, &f32_zero, &f32_one);
-        ImGui::SliderScalar("slider float low log", ImGuiDataType_Float,  &f32_v, &f32_zero, &f32_one,  "%.10f", ImGuiSliderFlags_Logarithmic);
-        ImGui::SliderScalar("slider float high",    ImGuiDataType_Float,  &f32_v, &f32_lo_a, &f32_hi_a, "%e");
-        ImGui::SliderScalar("slider double low",    ImGuiDataType_Double, &f64_v, &f64_zero, &f64_one,  "%.10f grams");
-        ImGui::SliderScalar("slider double low log",ImGuiDataType_Double, &f64_v, &f64_zero, &f64_one,  "%.10f", ImGuiSliderFlags_Logarithmic);
-        ImGui::SliderScalar("slider double high",   ImGuiDataType_Double, &f64_v, &f64_lo_a, &f64_hi_a, "%e grams");
-
-        ImGui::Text("Sliders (reverse)");
-        ImGui::SliderScalar("slider s8 reverse",    ImGuiDataType_S8,   &s8_v,  &s8_max,    &s8_min, "%d");
-        ImGui::SliderScalar("slider u8 reverse",    ImGuiDataType_U8,   &u8_v,  &u8_max,    &u8_min, "%u");
-        ImGui::SliderScalar("slider s32 reverse",   ImGuiDataType_S32,  &s32_v, &s32_fifty, &s32_zero, "%d");
-        ImGui::SliderScalar("slider u32 reverse",   ImGuiDataType_U32,  &u32_v, &u32_fifty, &u32_zero, "%u");
-        ImGui::SliderScalar("slider s64 reverse",   ImGuiDataType_S64,  &s64_v, &s64_fifty, &s64_zero, "%I64d");
-        ImGui::SliderScalar("slider u64 reverse",   ImGuiDataType_U64,  &u64_v, &u64_fifty, &u64_zero, "%I64u ms");
-
-        static bool inputs_step = true;
-        ImGui::Text("Inputs");
-        ImGui::Checkbox("Show step buttons", &inputs_step);
-        ImGui::InputScalar("input s8",      ImGuiDataType_S8,     &s8_v,  inputs_step ? &s8_one  : NULL, NULL, "%d");
-        ImGui::InputScalar("input u8",      ImGuiDataType_U8,     &u8_v,  inputs_step ? &u8_one  : NULL, NULL, "%u");
-        ImGui::InputScalar("input s16",     ImGuiDataType_S16,    &s16_v, inputs_step ? &s16_one : NULL, NULL, "%d");
-        ImGui::InputScalar("input u16",     ImGuiDataType_U16,    &u16_v, inputs_step ? &u16_one : NULL, NULL, "%u");
-        ImGui::InputScalar("input s32",     ImGuiDataType_S32,    &s32_v, inputs_step ? &s32_one : NULL, NULL, "%d");
-        ImGui::InputScalar("input s32 hex", ImGuiDataType_S32,    &s32_v, inputs_step ? &s32_one : NULL, NULL, "%08X", ImGuiInputTextFlags_CharsHexadecimal);
-        ImGui::InputScalar("input u32",     ImGuiDataType_U32,    &u32_v, inputs_step ? &u32_one : NULL, NULL, "%u");
-        ImGui::InputScalar("input u32 hex", ImGuiDataType_U32,    &u32_v, inputs_step ? &u32_one : NULL, NULL, "%08X", ImGuiInputTextFlags_CharsHexadecimal);
-        ImGui::InputScalar("input s64",     ImGuiDataType_S64,    &s64_v, inputs_step ? &s64_one : NULL);
-        ImGui::InputScalar("input u64",     ImGuiDataType_U64,    &u64_v, inputs_step ? &u64_one : NULL);
-        ImGui::InputScalar("input float",   ImGuiDataType_Float,  &f32_v, inputs_step ? &f32_one : NULL);
-        ImGui::InputScalar("input double",  ImGuiDataType_Double, &f64_v, inputs_step ? &f64_one : NULL);
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Multi-component Widgets"))
-    {
-        static float vec4f[4] = { 0.10f, 0.20f, 0.30f, 0.44f };
-        static int vec4i[4] = { 1, 5, 100, 255 };
-
-        ImGui::InputFloat2("input float2", vec4f);
-        ImGui::DragFloat2("drag float2", vec4f, 0.01f, 0.0f, 1.0f);
-        ImGui::SliderFloat2("slider float2", vec4f, 0.0f, 1.0f);
-        ImGui::InputInt2("input int2", vec4i);
-        ImGui::DragInt2("drag int2", vec4i, 1, 0, 255);
-        ImGui::SliderInt2("slider int2", vec4i, 0, 255);
-        ImGui::Spacing();
-
-        ImGui::InputFloat3("input float3", vec4f);
-        ImGui::DragFloat3("drag float3", vec4f, 0.01f, 0.0f, 1.0f);
-        ImGui::SliderFloat3("slider float3", vec4f, 0.0f, 1.0f);
-        ImGui::InputInt3("input int3", vec4i);
-        ImGui::DragInt3("drag int3", vec4i, 1, 0, 255);
-        ImGui::SliderInt3("slider int3", vec4i, 0, 255);
-        ImGui::Spacing();
-
-        ImGui::InputFloat4("input float4", vec4f);
-        ImGui::DragFloat4("drag float4", vec4f, 0.01f, 0.0f, 1.0f);
-        ImGui::SliderFloat4("slider float4", vec4f, 0.0f, 1.0f);
-        ImGui::InputInt4("input int4", vec4i);
-        ImGui::DragInt4("drag int4", vec4i, 1, 0, 255);
-        ImGui::SliderInt4("slider int4", vec4i, 0, 255);
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Vertical Sliders"))
-    {
-        const float spacing = 4;
-        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(spacing, spacing));
-
-        static int int_value = 0;
-        ImGui::VSliderInt("##int", ImVec2(18, 160), &int_value, 0, 5);
-        ImGui::SameLine();
-
-        static float values[7] = { 0.0f, 0.60f, 0.35f, 0.9f, 0.70f, 0.20f, 0.0f };
-        ImGui::PushID("set1");
-        for (int i = 0; i < 7; i++)
-        {
-            if (i > 0) ImGui::SameLine();
-            ImGui::PushID(i);
-            ImGui::PushStyleColor(ImGuiCol_FrameBg, (ImVec4)ImColor::HSV(i / 7.0f, 0.5f, 0.5f));
-            ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, (ImVec4)ImColor::HSV(i / 7.0f, 0.6f, 0.5f));
-            ImGui::PushStyleColor(ImGuiCol_FrameBgActive, (ImVec4)ImColor::HSV(i / 7.0f, 0.7f, 0.5f));
-            ImGui::PushStyleColor(ImGuiCol_SliderGrab, (ImVec4)ImColor::HSV(i / 7.0f, 0.9f, 0.9f));
-            ImGui::VSliderFloat("##v", ImVec2(18, 160), &values[i], 0.0f, 1.0f, "");
-            if (ImGui::IsItemActive() || ImGui::IsItemHovered())
-                ImGui::SetTooltip("%.3f", values[i]);
-            ImGui::PopStyleColor(4);
-            ImGui::PopID();
-        }
-        ImGui::PopID();
-
-        ImGui::SameLine();
-        ImGui::PushID("set2");
-        static float values2[4] = { 0.20f, 0.80f, 0.40f, 0.25f };
-        const int rows = 3;
-        const ImVec2 small_slider_size(18, (float)(int)((160.0f - (rows - 1) * spacing) / rows));
-        for (int nx = 0; nx < 4; nx++)
-        {
-            if (nx > 0) ImGui::SameLine();
-            ImGui::BeginGroup();
-            for (int ny = 0; ny < rows; ny++)
-            {
-                ImGui::PushID(nx * rows + ny);
-                ImGui::VSliderFloat("##v", small_slider_size, &values2[nx], 0.0f, 1.0f, "");
-                if (ImGui::IsItemActive() || ImGui::IsItemHovered())
-                    ImGui::SetTooltip("%.3f", values2[nx]);
-                ImGui::PopID();
-            }
-            ImGui::EndGroup();
-        }
-        ImGui::PopID();
-
-        ImGui::SameLine();
-        ImGui::PushID("set3");
-        for (int i = 0; i < 4; i++)
-        {
-            if (i > 0) ImGui::SameLine();
-            ImGui::PushID(i);
-            ImGui::PushStyleVar(ImGuiStyleVar_GrabMinSize, 40);
-            ImGui::VSliderFloat("##v", ImVec2(40, 160), &values[i], 0.0f, 1.0f, "%.2f\nsec");
-            ImGui::PopStyleVar();
-            ImGui::PopID();
-        }
-        ImGui::PopID();
-        ImGui::PopStyleVar();
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Drag and Drop"))
-    {
-        if (ImGui::TreeNode("Drag and drop in standard widgets"))
-        {
-            HelpMarker("You can drag from the color squares.");
-            static float col1[3] = { 1.0f, 0.0f, 0.2f };
-            static float col2[4] = { 0.4f, 0.7f, 0.0f, 0.5f };
-            ImGui::ColorEdit3("color 1", col1);
-            ImGui::ColorEdit4("color 2", col2);
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Drag and drop to copy/swap items"))
-        {
-            enum Mode
-            {
-                Mode_Copy,
-                Mode_Move,
-                Mode_Swap
-            };
-            static int mode = 0;
-            if (ImGui::RadioButton("Copy", mode == Mode_Copy)) { mode = Mode_Copy; } ImGui::SameLine();
-            if (ImGui::RadioButton("Move", mode == Mode_Move)) { mode = Mode_Move; } ImGui::SameLine();
-            if (ImGui::RadioButton("Swap", mode == Mode_Swap)) { mode = Mode_Swap; }
-            static const char* names[9] =
-            {
-                "Bobby", "Beatrice", "Betty",
-                "Brianna", "Barry", "Bernard",
-                "Bibi", "Blaine", "Bryn"
-            };
-            for (int n = 0; n < IM_ARRAYSIZE(names); n++)
-            {
-                ImGui::PushID(n);
-                if ((n % 3) != 0)
-                    ImGui::SameLine();
-                ImGui::Button(names[n], ImVec2(60, 60));
-
-                if (ImGui::BeginDragDropSource(ImGuiDragDropFlags_None))
-                {
-                    ImGui::SetDragDropPayload("DND_DEMO_CELL", &n, sizeof(int));
-
-                    if (mode == Mode_Copy) { ImGui::Text("Copy %s", names[n]); }
-                    if (mode == Mode_Move) { ImGui::Text("Move %s", names[n]); }
-                    if (mode == Mode_Swap) { ImGui::Text("Swap %s", names[n]); }
-                    ImGui::EndDragDropSource();
-                }
-                if (ImGui::BeginDragDropTarget())
-                {
-                    if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("DND_DEMO_CELL"))
-                    {
-                        IM_ASSERT(payload->DataSize == sizeof(int));
-                        int payload_n = *(const int*)payload->Data;
-                        if (mode == Mode_Copy)
-                        {
-                            names[n] = names[payload_n];
-                        }
-                        if (mode == Mode_Move)
-                        {
-                            names[n] = names[payload_n];
-                            names[payload_n] = "";
-                        }
-                        if (mode == Mode_Swap)
-                        {
-                            const char* tmp = names[n];
-                            names[n] = names[payload_n];
-                            names[payload_n] = tmp;
-                        }
-                    }
-                    ImGui::EndDragDropTarget();
-                }
-                ImGui::PopID();
-            }
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Drag to reorder items (simple)"))
-        {
-            HelpMarker(
-                "We don't use the drag and drop api at all here! "
-                "Instead we query when the item is held but not hovered, and order items accordingly.");
-            static const char* item_names[] = { "Item One", "Item Two", "Item Three", "Item Four", "Item Five" };
-            for (int n = 0; n < IM_ARRAYSIZE(item_names); n++)
-            {
-                const char* item = item_names[n];
-                ImGui::Selectable(item);
-
-                if (ImGui::IsItemActive() && !ImGui::IsItemHovered())
-                {
-                    int n_next = n + (ImGui::GetMouseDragDelta(0).y < 0.f ? -1 : 1);
-                    if (n_next >= 0 && n_next < IM_ARRAYSIZE(item_names))
-                    {
-                        item_names[n] = item_names[n_next];
-                        item_names[n_next] = item;
-                        ImGui::ResetMouseDragDelta();
-                    }
-                }
-            }
-            ImGui::TreePop();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Querying Status (Edited/Active/Focused/Hovered etc.)"))
-    {
-        const char* item_names[] =
-        {
-            "Text", "Button", "Button (w/ repeat)", "Checkbox", "SliderFloat", "InputText", "InputFloat",
-            "InputFloat3", "ColorEdit4", "MenuItem", "TreeNode", "TreeNode (w/ double-click)", "Combo", "ListBox"
-        };
-        static int item_type = 1;
-        ImGui::Combo("Item Type", &item_type, item_names, IM_ARRAYSIZE(item_names), IM_ARRAYSIZE(item_names));
-        ImGui::SameLine();
-        HelpMarker("Testing how various types of items are interacting with the IsItemXXX functions. Note that the bool return value of most ImGui function is generally equivalent to calling ImGui::IsItemHovered().");
-
-        bool ret = false;
-        static bool b = false;
-        static float col4f[4] = { 1.0f, 0.5, 0.0f, 1.0f };
-        static char str[16] = {};
-        if (item_type == 0) { ImGui::Text("ITEM: Text"); }                                                    
-        if (item_type == 1) { ret = ImGui::Button("ITEM: Button"); }                                      
-        if (item_type == 2) { ImGui::PushButtonRepeat(true); ret = ImGui::Button("ITEM: Button"); ImGui::PopButtonRepeat(); }     
-        if (item_type == 3) { ret = ImGui::Checkbox("ITEM: Checkbox", &b); }                              
-        if (item_type == 4) { ret = ImGui::SliderFloat("ITEM: SliderFloat", &col4f[0], 0.0f, 1.0f); }      
-        if (item_type == 5) { ret = ImGui::InputText("ITEM: InputText", &str[0], IM_ARRAYSIZE(str)); }        
-        if (item_type == 6) { ret = ImGui::InputFloat("ITEM: InputFloat", col4f, 1.0f); }                     
-        if (item_type == 7) { ret = ImGui::InputFloat3("ITEM: InputFloat3", col4f); }                           
-        if (item_type == 8) { ret = ImGui::ColorEdit4("ITEM: ColorEdit4", col4f); }                             
-        if (item_type == 9) { ret = ImGui::MenuItem("ITEM: MenuItem"); }                                        
-        if (item_type == 10){ ret = ImGui::TreeNode("ITEM: TreeNode"); if (ret) ImGui::TreePop(); }        
-        if (item_type == 11){ ret = ImGui::TreeNodeEx("ITEM: TreeNode w/ ImGuiTreeNodeFlags_OpenOnDoubleClick", ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_NoTreePushOnOpen); }        
-        if (item_type == 12){ const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi" }; static int current = 1; ret = ImGui::Combo("ITEM: Combo", &current, items, IM_ARRAYSIZE(items)); }
-        if (item_type == 13){ const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi" }; static int current = 1; ret = ImGui::ListBox("ITEM: ListBox", &current, items, IM_ARRAYSIZE(items), IM_ARRAYSIZE(items)); }
-
-        ImGui::BulletText(
-            "Return value = %d\n"
-            "IsItemFocused() = %d\n"
-            "IsItemHovered() = %d\n"
-            "IsItemHovered(_AllowWhenBlockedByPopup) = %d\n"
-            "IsItemHovered(_AllowWhenBlockedByActiveItem) = %d\n"
-            "IsItemHovered(_AllowWhenOverlapped) = %d\n"
-            "IsItemHovered(_RectOnly) = %d\n"
-            "IsItemActive() = %d\n"
-            "IsItemEdited() = %d\n"
-            "IsItemActivated() = %d\n"
-            "IsItemDeactivated() = %d\n"
-            "IsItemDeactivatedAfterEdit() = %d\n"
-            "IsItemVisible() = %d\n"
-            "IsItemClicked() = %d\n"
-            "IsItemToggledOpen() = %d\n"
-            "GetItemRectMin() = (%.1f, %.1f)\n"
-            "GetItemRectMax() = (%.1f, %.1f)\n"
-            "GetItemRectSize() = (%.1f, %.1f)",
-            ret,
-            ImGui::IsItemFocused(),
-            ImGui::IsItemHovered(),
-            ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup),
-            ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem),
-            ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenOverlapped),
-            ImGui::IsItemHovered(ImGuiHoveredFlags_RectOnly),
-            ImGui::IsItemActive(),
-            ImGui::IsItemEdited(),
-            ImGui::IsItemActivated(),
-            ImGui::IsItemDeactivated(),
-            ImGui::IsItemDeactivatedAfterEdit(),
-            ImGui::IsItemVisible(),
-            ImGui::IsItemClicked(),
-            ImGui::IsItemToggledOpen(),
-            ImGui::GetItemRectMin().x, ImGui::GetItemRectMin().y,
-            ImGui::GetItemRectMax().x, ImGui::GetItemRectMax().y,
-            ImGui::GetItemRectSize().x, ImGui::GetItemRectSize().y
-        );
-
-        static bool embed_all_inside_a_child_window = false;
-        ImGui::Checkbox("Embed everything inside a child window (for additional testing)", &embed_all_inside_a_child_window);
-        if (embed_all_inside_a_child_window)
-            ImGui::BeginChild("outer_child", ImVec2(0, ImGui::GetFontSize() * 20.0f), true);
-
-        ImGui::BulletText(
-            "IsWindowFocused() = %d\n"
-            "IsWindowFocused(_ChildWindows) = %d\n"
-            "IsWindowFocused(_ChildWindows|_RootWindow) = %d\n"
-            "IsWindowFocused(_RootWindow) = %d\n"
-            "IsWindowFocused(_AnyWindow) = %d\n",
-            ImGui::IsWindowFocused(),
-            ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows),
-            ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows | ImGuiFocusedFlags_RootWindow),
-            ImGui::IsWindowFocused(ImGuiFocusedFlags_RootWindow),
-            ImGui::IsWindowFocused(ImGuiFocusedFlags_AnyWindow));
-
-        ImGui::BulletText(
-            "IsWindowHovered() = %d\n"
-            "IsWindowHovered(_AllowWhenBlockedByPopup) = %d\n"
-            "IsWindowHovered(_AllowWhenBlockedByActiveItem) = %d\n"
-            "IsWindowHovered(_ChildWindows) = %d\n"
-            "IsWindowHovered(_ChildWindows|_RootWindow) = %d\n"
-            "IsWindowHovered(_ChildWindows|_AllowWhenBlockedByPopup) = %d\n"
-            "IsWindowHovered(_RootWindow) = %d\n"
-            "IsWindowHovered(_AnyWindow) = %d\n",
-            ImGui::IsWindowHovered(),
-            ImGui::IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup),
-            ImGui::IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem),
-            ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows),
-            ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_RootWindow),
-            ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_AllowWhenBlockedByPopup),
-            ImGui::IsWindowHovered(ImGuiHoveredFlags_RootWindow),
-            ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow));
-
-        ImGui::BeginChild("child", ImVec2(0, 50), true);
-        ImGui::Text("This is another child window for testing the _ChildWindows flag.");
-        ImGui::EndChild();
-        if (embed_all_inside_a_child_window)
-            ImGui::EndChild();
-
-        static char unused_str[] = "This widget is only here to be able to tab-out of the widgets above.";
-        ImGui::InputText("unused", unused_str, IM_ARRAYSIZE(unused_str), ImGuiInputTextFlags_ReadOnly);
-
-        static bool test_window = false;
-        ImGui::Checkbox("Hovered/Active tests after Begin() for title bar testing", &test_window);
-        if (test_window)
-        {
-            ImGui::Begin("Title bar Hovered/Active tests", &test_window);
-            if (ImGui::BeginPopupContextItem())      
-            {
-                if (ImGui::MenuItem("Close")) { test_window = false; }
-                ImGui::EndPopup();
-            }
-            ImGui::Text(
-                "IsItemHovered() after begin = %d (== is title bar hovered)\n"
-                "IsItemActive() after begin = %d (== is window being clicked/moved)\n",
-                ImGui::IsItemHovered(), ImGui::IsItemActive());
-            ImGui::End();
-        }
-
-        ImGui::TreePop();
-    }
-}
-
-static void ShowDemoWindowLayout()
-{
-    if (!ImGui::CollapsingHeader("Layout & Scrolling"))
-        return;
-
-    if (ImGui::TreeNode("Child windows"))
-    {
-        HelpMarker("Use child windows to begin into a self-contained independent scrolling/clipping regions within a host window.");
-        static bool disable_mouse_wheel = false;
-        static bool disable_menu = false;
-        ImGui::Checkbox("Disable Mouse Wheel", &disable_mouse_wheel);
-        ImGui::Checkbox("Disable Menu", &disable_menu);
-
-        {
-            ImGuiWindowFlags window_flags = ImGuiWindowFlags_HorizontalScrollbar;
-            if (disable_mouse_wheel)
-                window_flags |= ImGuiWindowFlags_NoScrollWithMouse;
-            ImGui::BeginChild("ChildL", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.5f, 260), false, window_flags);
-            for (int i = 0; i < 100; i++)
-                ImGui::Text("%04d: scrollable region", i);
-            ImGui::EndChild();
-        }
-
-        ImGui::SameLine();
-
-        {
-            ImGuiWindowFlags window_flags = ImGuiWindowFlags_None;
-            if (disable_mouse_wheel)
-                window_flags |= ImGuiWindowFlags_NoScrollWithMouse;
-            if (!disable_menu)
-                window_flags |= ImGuiWindowFlags_MenuBar;
-            ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 5.0f);
-            ImGui::BeginChild("ChildR", ImVec2(0, 260), true, window_flags);
-            if (!disable_menu && ImGui::BeginMenuBar())
-            {
-                if (ImGui::BeginMenu("Menu"))
-                {
-                    ShowExampleMenuFile();
-                    ImGui::EndMenu();
-                }
-                ImGui::EndMenuBar();
-            }
-            if (ImGui::BeginTable("split", 2, ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings))
-            {
-                for (int i = 0; i < 100; i++)
-                {
-                    char buf[32];
-                    sprintf(buf, "%03d", i);
-                    ImGui::TableNextColumn();
-                    ImGui::Button(buf, ImVec2(-FLT_MIN, 0.0f));
-                }
-                ImGui::EndTable();
-            }
-            ImGui::EndChild();
-            ImGui::PopStyleVar();
-        }
-
-        ImGui::Separator();
-
-        {
-            static int offset_x = 0;
-            ImGui::SetNextItemWidth(100);
-            ImGui::DragInt("Offset X", &offset_x, 1.0f, -1000, 1000);
-
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() + (float)offset_x);
-            ImGui::PushStyleColor(ImGuiCol_ChildBg, IM_COL32(255, 0, 0, 100));
-            ImGui::BeginChild("Red", ImVec2(200, 100), true, ImGuiWindowFlags_None);
-            for (int n = 0; n < 50; n++)
-                ImGui::Text("Some test %d", n);
-            ImGui::EndChild();
-            bool child_is_hovered = ImGui::IsItemHovered();
-            ImVec2 child_rect_min = ImGui::GetItemRectMin();
-            ImVec2 child_rect_max = ImGui::GetItemRectMax();
-            ImGui::PopStyleColor();
-            ImGui::Text("Hovered: %d", child_is_hovered);
-            ImGui::Text("Rect of child window is: (%.0f,%.0f) (%.0f,%.0f)", child_rect_min.x, child_rect_min.y, child_rect_max.x, child_rect_max.y);
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Widgets Width"))
-    {
-        static float f = 0.0f;
-        static bool show_indented_items = true;
-        ImGui::Checkbox("Show indented items", &show_indented_items);
-
-        ImGui::Text("SetNextItemWidth/PushItemWidth(100)");
-        ImGui::SameLine(); HelpMarker("Fixed width.");
-        ImGui::PushItemWidth(100);
-        ImGui::DragFloat("float##1b", &f);
-        if (show_indented_items)
-        {
-            ImGui::Indent();
-            ImGui::DragFloat("float (indented)##1b", &f);
-            ImGui::Unindent();
-        }
-        ImGui::PopItemWidth();
-
-        ImGui::Text("SetNextItemWidth/PushItemWidth(-100)");
-        ImGui::SameLine(); HelpMarker("Align to right edge minus 100");
-        ImGui::PushItemWidth(-100);
-        ImGui::DragFloat("float##2a", &f);
-        if (show_indented_items)
-        {
-            ImGui::Indent();
-            ImGui::DragFloat("float (indented)##2b", &f);
-            ImGui::Unindent();
-        }
-        ImGui::PopItemWidth();
-
-        ImGui::Text("SetNextItemWidth/PushItemWidth(GetContentRegionAvail().x * 0.5f)");
-        ImGui::SameLine(); HelpMarker("Half of available width.\n(~ right-cursor_pos)\n(works within a column set)");
-        ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x * 0.5f);
-        ImGui::DragFloat("float##3a", &f);
-        if (show_indented_items)
-        {
-            ImGui::Indent();
-            ImGui::DragFloat("float (indented)##3b", &f);
-            ImGui::Unindent();
-        }
-        ImGui::PopItemWidth();
-
-        ImGui::Text("SetNextItemWidth/PushItemWidth(-GetContentRegionAvail().x * 0.5f)");
-        ImGui::SameLine(); HelpMarker("Align to right edge minus half");
-        ImGui::PushItemWidth(-ImGui::GetContentRegionAvail().x * 0.5f);
-        ImGui::DragFloat("float##4a", &f);
-        if (show_indented_items)
-        {
-            ImGui::Indent();
-            ImGui::DragFloat("float (indented)##4b", &f);
-            ImGui::Unindent();
-        }
-        ImGui::PopItemWidth();
-
-        ImGui::Text("SetNextItemWidth/PushItemWidth(-FLT_MIN)");
-        ImGui::SameLine(); HelpMarker("Align to right edge");
-        ImGui::PushItemWidth(-FLT_MIN);
-        ImGui::DragFloat("##float5a", &f);
-        if (show_indented_items)
-        {
-            ImGui::Indent();
-            ImGui::DragFloat("float (indented)##5b", &f);
-            ImGui::Unindent();
-        }
-        ImGui::PopItemWidth();
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Basic Horizontal Layout"))
-    {
-        ImGui::TextWrapped("(Use ImGui::SameLine() to keep adding items to the right of the preceding item)");
-
-        ImGui::Text("Two items: Hello"); ImGui::SameLine();
-        ImGui::TextColored(ImVec4(1,1,0,1), "Sailor");
-
-        ImGui::Text("More spacing: Hello"); ImGui::SameLine(0, 20);
-        ImGui::TextColored(ImVec4(1,1,0,1), "Sailor");
-
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Normal buttons"); ImGui::SameLine();
-        ImGui::Button("Banana"); ImGui::SameLine();
-        ImGui::Button("Apple"); ImGui::SameLine();
-        ImGui::Button("Corniflower");
-
-        ImGui::Text("Small buttons"); ImGui::SameLine();
-        ImGui::SmallButton("Like this one"); ImGui::SameLine();
-        ImGui::Text("can fit within a text block.");
-
-        ImGui::Text("Aligned");
-        ImGui::SameLine(150); ImGui::Text("x=150");
-        ImGui::SameLine(300); ImGui::Text("x=300");
-        ImGui::Text("Aligned");
-        ImGui::SameLine(150); ImGui::SmallButton("x=150");
-        ImGui::SameLine(300); ImGui::SmallButton("x=300");
-
-        static bool c1 = false, c2 = false, c3 = false, c4 = false;
-        ImGui::Checkbox("My", &c1); ImGui::SameLine();
-        ImGui::Checkbox("Tailor", &c2); ImGui::SameLine();
-        ImGui::Checkbox("Is", &c3); ImGui::SameLine();
-        ImGui::Checkbox("Rich", &c4);
-
-        static float f0 = 1.0f, f1 = 2.0f, f2 = 3.0f;
-        ImGui::PushItemWidth(80);
-        const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD" };
-        static int item = -1;
-        ImGui::Combo("Combo", &item, items, IM_ARRAYSIZE(items)); ImGui::SameLine();
-        ImGui::SliderFloat("X", &f0, 0.0f, 5.0f); ImGui::SameLine();
-        ImGui::SliderFloat("Y", &f1, 0.0f, 5.0f); ImGui::SameLine();
-        ImGui::SliderFloat("Z", &f2, 0.0f, 5.0f);
-        ImGui::PopItemWidth();
-
-        ImGui::PushItemWidth(80);
-        ImGui::Text("Lists:");
-        static int selection[4] = { 0, 1, 2, 3 };
-        for (int i = 0; i < 4; i++)
-        {
-            if (i > 0) ImGui::SameLine();
-            ImGui::PushID(i);
-            ImGui::ListBox("", &selection[i], items, IM_ARRAYSIZE(items));
-            ImGui::PopID();
-        }
-        ImGui::PopItemWidth();
-
-        ImVec2 button_sz(40, 40);
-        ImGui::Button("A", button_sz); ImGui::SameLine();
-        ImGui::Dummy(button_sz); ImGui::SameLine();
-        ImGui::Button("B", button_sz);
-
-        ImGui::Text("Manually wrapping:");
-        ImGuiStyle& style = ImGui::GetStyle();
-        int buttons_count = 20;
-        float window_visible_x2 = ImGui::GetWindowPos().x + ImGui::GetWindowContentRegionMax().x;
-        for (int n = 0; n < buttons_count; n++)
-        {
-            ImGui::PushID(n);
-            ImGui::Button("Box", button_sz);
-            float last_button_x2 = ImGui::GetItemRectMax().x;
-            float next_button_x2 = last_button_x2 + style.ItemSpacing.x + button_sz.x;          
-            if (n + 1 < buttons_count && next_button_x2 < window_visible_x2)
-                ImGui::SameLine();
-            ImGui::PopID();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Groups"))
-    {
-        HelpMarker(
-            "BeginGroup() basically locks the horizontal position for new line. "
-            "EndGroup() bundles the whole group so that you can use \"item\" functions such as "
-            "IsItemHovered()/IsItemActive() or SameLine() etc. on the whole group.");
-        ImGui::BeginGroup();
-        {
-            ImGui::BeginGroup();
-            ImGui::Button("AAA");
-            ImGui::SameLine();
-            ImGui::Button("BBB");
-            ImGui::SameLine();
-            ImGui::BeginGroup();
-            ImGui::Button("CCC");
-            ImGui::Button("DDD");
-            ImGui::EndGroup();
-            ImGui::SameLine();
-            ImGui::Button("EEE");
-            ImGui::EndGroup();
-            if (ImGui::IsItemHovered())
-                ImGui::SetTooltip("First group hovered");
-        }
-        ImVec2 size = ImGui::GetItemRectSize();
-        const float values[5] = { 0.5f, 0.20f, 0.80f, 0.60f, 0.25f };
-        ImGui::PlotHistogram("##values", values, IM_ARRAYSIZE(values), 0, NULL, 0.0f, 1.0f, size);
-
-        ImGui::Button("ACTION", ImVec2((size.x - ImGui::GetStyle().ItemSpacing.x) * 0.5f, size.y));
-        ImGui::SameLine();
-        ImGui::Button("REACTION", ImVec2((size.x - ImGui::GetStyle().ItemSpacing.x) * 0.5f, size.y));
-        ImGui::EndGroup();
-        ImGui::SameLine();
-
-        ImGui::Button("LEVERAGE\nBUZZWORD", size);
-        ImGui::SameLine();
-
-        if (ImGui::BeginListBox("List", size))
-        {
-            ImGui::Selectable("Selected", true);
-            ImGui::Selectable("Not Selected", false);
-            ImGui::EndListBox();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Text Baseline Alignment"))
-    {
-        {
-            ImGui::BulletText("Text baseline:");
-            ImGui::SameLine(); HelpMarker(
-                "This is testing the vertical alignment that gets applied on text to keep it aligned with widgets. "
-                "Lines only composed of text or \"small\" widgets use less vertical space than lines with framed widgets.");
-            ImGui::Indent();
-
-            ImGui::Text("KO Blahblah"); ImGui::SameLine();
-            ImGui::Button("Some framed item"); ImGui::SameLine();
-            HelpMarker("Baseline of button will look misaligned with text..");
-
-            ImGui::AlignTextToFramePadding();
-            ImGui::Text("OK Blahblah"); ImGui::SameLine();
-            ImGui::Button("Some framed item"); ImGui::SameLine();
-            HelpMarker("We call AlignTextToFramePadding() to vertically align the text baseline by +FramePadding.y");
-
-            ImGui::Button("TEST##1"); ImGui::SameLine();
-            ImGui::Text("TEST"); ImGui::SameLine();
-            ImGui::SmallButton("TEST##2");
-
-            ImGui::AlignTextToFramePadding();
-            ImGui::Text("Text aligned to framed item"); ImGui::SameLine();
-            ImGui::Button("Item##1"); ImGui::SameLine();
-            ImGui::Text("Item"); ImGui::SameLine();
-            ImGui::SmallButton("Item##2"); ImGui::SameLine();
-            ImGui::Button("Item##3");
-
-            ImGui::Unindent();
-        }
-
-        ImGui::Spacing();
-
-        {
-            ImGui::BulletText("Multi-line text:");
-            ImGui::Indent();
-            ImGui::Text("One\nTwo\nThree"); ImGui::SameLine();
-            ImGui::Text("Hello\nWorld"); ImGui::SameLine();
-            ImGui::Text("Banana");
-
-            ImGui::Text("Banana"); ImGui::SameLine();
-            ImGui::Text("Hello\nWorld"); ImGui::SameLine();
-            ImGui::Text("One\nTwo\nThree");
-
-            ImGui::Button("HOP##1"); ImGui::SameLine();
-            ImGui::Text("Banana"); ImGui::SameLine();
-            ImGui::Text("Hello\nWorld"); ImGui::SameLine();
-            ImGui::Text("Banana");
-
-            ImGui::Button("HOP##2"); ImGui::SameLine();
-            ImGui::Text("Hello\nWorld"); ImGui::SameLine();
-            ImGui::Text("Banana");
-            ImGui::Unindent();
-        }
-
-        ImGui::Spacing();
-
-        {
-            ImGui::BulletText("Misc items:");
-            ImGui::Indent();
-
-            ImGui::Button("80x80", ImVec2(80, 80));
-            ImGui::SameLine();
-            ImGui::Button("50x50", ImVec2(50, 50));
-            ImGui::SameLine();
-            ImGui::Button("Button()");
-            ImGui::SameLine();
-            ImGui::SmallButton("SmallButton()");
-
-            const float spacing = ImGui::GetStyle().ItemInnerSpacing.x;
-            ImGui::Button("Button##1");
-            ImGui::SameLine(0.0f, spacing);
-            if (ImGui::TreeNode("Node##1"))
-            {
-                for (int i = 0; i < 6; i++)
-                    ImGui::BulletText("Item %d..", i);
-                ImGui::TreePop();
-            }
-
-            ImGui::AlignTextToFramePadding();
-
-            bool node_open = ImGui::TreeNode("Node##2");
-            ImGui::SameLine(0.0f, spacing); ImGui::Button("Button##2");
-            if (node_open)
-            {
-                for (int i = 0; i < 6; i++)
-                    ImGui::BulletText("Item %d..", i);
-                ImGui::TreePop();
-            }
-
-            ImGui::Button("Button##3");
-            ImGui::SameLine(0.0f, spacing);
-            ImGui::BulletText("Bullet text");
-
-            ImGui::AlignTextToFramePadding();
-            ImGui::BulletText("Node");
-            ImGui::SameLine(0.0f, spacing); ImGui::Button("Button##4");
-            ImGui::Unindent();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Scrolling"))
-    {
-        HelpMarker("Use SetScrollHereY() or SetScrollFromPosY() to scroll to a given vertical position.");
-
-        static int track_item = 50;
-        static bool enable_track = true;
-        static bool enable_extra_decorations = false;
-        static float scroll_to_off_px = 0.0f;
-        static float scroll_to_pos_px = 200.0f;
-
-        ImGui::Checkbox("Decoration", &enable_extra_decorations);
-
-        ImGui::Checkbox("Track", &enable_track);
-        ImGui::PushItemWidth(100);
-        ImGui::SameLine(140); enable_track |= ImGui::DragInt("##item", &track_item, 0.25f, 0, 99, "Item = %d");
-
-        bool scroll_to_off = ImGui::Button("Scroll Offset");
-        ImGui::SameLine(140); scroll_to_off |= ImGui::DragFloat("##off", &scroll_to_off_px, 1.00f, 0, FLT_MAX, "+%.0f px");
-
-        bool scroll_to_pos = ImGui::Button("Scroll To Pos");
-        ImGui::SameLine(140); scroll_to_pos |= ImGui::DragFloat("##pos", &scroll_to_pos_px, 1.00f, -10, FLT_MAX, "X/Y = %.0f px");
-        ImGui::PopItemWidth();
-
-        if (scroll_to_off || scroll_to_pos)
-            enable_track = false;
-
-        ImGuiStyle& style = ImGui::GetStyle();
-        float child_w = (ImGui::GetContentRegionAvail().x - 4 * style.ItemSpacing.x) / 5;
-        if (child_w < 1.0f)
-            child_w = 1.0f;
-        ImGui::PushID("##VerticalScrolling");
-        for (int i = 0; i < 5; i++)
-        {
-            if (i > 0) ImGui::SameLine();
-            ImGui::BeginGroup();
-            const char* names[] = { "Top", "25%", "Center", "75%", "Bottom" };
-            ImGui::TextUnformatted(names[i]);
-
-            const ImGuiWindowFlags child_flags = enable_extra_decorations ? ImGuiWindowFlags_MenuBar : 0;
-            const ImGuiID child_id = ImGui::GetID((void*)(intptr_t)i);
-            const bool child_is_visible = ImGui::BeginChild(child_id, ImVec2(child_w, 200.0f), true, child_flags);
-            if (ImGui::BeginMenuBar())
-            {
-                ImGui::TextUnformatted("abc");
-                ImGui::EndMenuBar();
-            }
-            if (scroll_to_off)
-                ImGui::SetScrollY(scroll_to_off_px);
-            if (scroll_to_pos)
-                ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + scroll_to_pos_px, i * 0.25f);
-            if (child_is_visible)         
-            {
-                for (int item = 0; item < 100; item++)
-                {
-                    if (enable_track && item == track_item)
-                    {
-                        ImGui::TextColored(ImVec4(1, 1, 0, 1), "Item %d", item);
-                        ImGui::SetScrollHereY(i * 0.25f);    
-                    }
-                    else
-                    {
-                        ImGui::Text("Item %d", item);
-                    }
-                }
-            }
-            float scroll_y = ImGui::GetScrollY();
-            float scroll_max_y = ImGui::GetScrollMaxY();
-            ImGui::EndChild();
-            ImGui::Text("%.0f/%.0f", scroll_y, scroll_max_y);
-            ImGui::EndGroup();
-        }
-        ImGui::PopID();
-
-        ImGui::Spacing();
-        HelpMarker(
-            "Use SetScrollHereX() or SetScrollFromPosX() to scroll to a given horizontal position.\n\n"
-            "Because the clipping rectangle of most window hides half worth of WindowPadding on the "
-            "left/right, using SetScrollFromPosX(+1) will usually result in clipped text whereas the "
-            "equivalent SetScrollFromPosY(+1) wouldn't.");
-        ImGui::PushID("##HorizontalScrolling");
-        for (int i = 0; i < 5; i++)
-        {
-            float child_height = ImGui::GetTextLineHeight() + style.ScrollbarSize + style.WindowPadding.y * 2.0f;
-            ImGuiWindowFlags child_flags = ImGuiWindowFlags_HorizontalScrollbar | (enable_extra_decorations ? ImGuiWindowFlags_AlwaysVerticalScrollbar : 0);
-            ImGuiID child_id = ImGui::GetID((void*)(intptr_t)i);
-            bool child_is_visible = ImGui::BeginChild(child_id, ImVec2(-100, child_height), true, child_flags);
-            if (scroll_to_off)
-                ImGui::SetScrollX(scroll_to_off_px);
-            if (scroll_to_pos)
-                ImGui::SetScrollFromPosX(ImGui::GetCursorStartPos().x + scroll_to_pos_px, i * 0.25f);
-            if (child_is_visible)         
-            {
-                for (int item = 0; item < 100; item++)
-                {
-                    if (enable_track && item == track_item)
-                    {
-                        ImGui::TextColored(ImVec4(1, 1, 0, 1), "Item %d", item);
-                        ImGui::SetScrollHereX(i * 0.25f);    
-                    }
-                    else
-                    {
-                        ImGui::Text("Item %d", item);
-                    }
-                    ImGui::SameLine();
-                }
-            }
-            float scroll_x = ImGui::GetScrollX();
-            float scroll_max_x = ImGui::GetScrollMaxX();
-            ImGui::EndChild();
-            ImGui::SameLine();
-            const char* names[] = { "Left", "25%", "Center", "75%", "Right" };
-            ImGui::Text("%s\n%.0f/%.0f", names[i], scroll_x, scroll_max_x);
-            ImGui::Spacing();
-        }
-        ImGui::PopID();
-
-        HelpMarker(
-            "Horizontal scrolling for a window is enabled via the ImGuiWindowFlags_HorizontalScrollbar flag.\n\n"
-            "You may want to also explicitly specify content width by using SetNextWindowContentWidth() before Begin().");
-        static int lines = 7;
-        ImGui::SliderInt("Lines", &lines, 1, 15);
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2.0f, 1.0f));
-        ImVec2 scrolling_child_size = ImVec2(0, ImGui::GetFrameHeightWithSpacing() * 7 + 30);
-        ImGui::BeginChild("scrolling", scrolling_child_size, true, ImGuiWindowFlags_HorizontalScrollbar);
-        for (int line = 0; line < lines; line++)
-        {
-            int num_buttons = 10 + ((line & 1) ? line * 9 : line * 3);
-            for (int n = 0; n < num_buttons; n++)
-            {
-                if (n > 0) ImGui::SameLine();
-                ImGui::PushID(n + line * 1000);
-                char num_buf[16];
-                sprintf(num_buf, "%d", n);
-                const char* label = (!(n % 15)) ? "FizzBuzz" : (!(n % 3)) ? "Fizz" : (!(n % 5)) ? "Buzz" : num_buf;
-                float hue = n * 0.05f;
-                ImGui::PushStyleColor(ImGuiCol_Button, (ImVec4)ImColor::HSV(hue, 0.6f, 0.6f));
-                ImGui::PushStyleColor(ImGuiCol_ButtonHovered, (ImVec4)ImColor::HSV(hue, 0.7f, 0.7f));
-                ImGui::PushStyleColor(ImGuiCol_ButtonActive, (ImVec4)ImColor::HSV(hue, 0.8f, 0.8f));
-                ImGui::Button(label, ImVec2(40.0f + sinf((float)(line + n)) * 20.0f, 0.0f));
-                ImGui::PopStyleColor(3);
-                ImGui::PopID();
-            }
-        }
-        float scroll_x = ImGui::GetScrollX();
-        float scroll_max_x = ImGui::GetScrollMaxX();
-        ImGui::EndChild();
-        ImGui::PopStyleVar(2);
-        float scroll_x_delta = 0.0f;
-        ImGui::SmallButton("<<");
-        if (ImGui::IsItemActive())
-            scroll_x_delta = -ImGui::GetIO().DeltaTime * 1000.0f;
-        ImGui::SameLine();
-        ImGui::Text("Scroll from code"); ImGui::SameLine();
-        ImGui::SmallButton(">>");
-        if (ImGui::IsItemActive())
-            scroll_x_delta = +ImGui::GetIO().DeltaTime * 1000.0f;
-        ImGui::SameLine();
-        ImGui::Text("%.0f/%.0f", scroll_x, scroll_max_x);
-        if (scroll_x_delta != 0.0f)
-        {
-            ImGui::BeginChild("scrolling");
-            ImGui::SetScrollX(ImGui::GetScrollX() + scroll_x_delta);
-            ImGui::EndChild();
-        }
-        ImGui::Spacing();
-
-        static bool show_horizontal_contents_size_demo_window = false;
-        ImGui::Checkbox("Show Horizontal contents size demo window", &show_horizontal_contents_size_demo_window);
-
-        if (show_horizontal_contents_size_demo_window)
-        {
-            static bool show_h_scrollbar = true;
-            static bool show_button = true;
-            static bool show_tree_nodes = true;
-            static bool show_text_wrapped = false;
-            static bool show_columns = true;
-            static bool show_tab_bar = true;
-            static bool show_child = false;
-            static bool explicit_content_size = false;
-            static float contents_size_x = 300.0f;
-            if (explicit_content_size)
-                ImGui::SetNextWindowContentSize(ImVec2(contents_size_x, 0.0f));
-            ImGui::Begin("Horizontal contents size demo window", &show_horizontal_contents_size_demo_window, show_h_scrollbar ? ImGuiWindowFlags_HorizontalScrollbar : 0);
-            ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(2, 0));
-            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2, 0));
-            HelpMarker("Test of different widgets react and impact the work rectangle growing when horizontal scrolling is enabled.\n\nUse 'Metrics->Tools->Show windows rectangles' to visualize rectangles.");
-            ImGui::Checkbox("H-scrollbar", &show_h_scrollbar);
-            ImGui::Checkbox("Button", &show_button);                   
-            ImGui::Checkbox("Tree nodes", &show_tree_nodes);              
-            ImGui::Checkbox("Text wrapped", &show_text_wrapped);      
-            ImGui::Checkbox("Columns", &show_columns);              
-            ImGui::Checkbox("Tab bar", &show_tab_bar);              
-            ImGui::Checkbox("Child", &show_child);                    
-            ImGui::Checkbox("Explicit content size", &explicit_content_size);
-            ImGui::Text("Scroll %.1f/%.1f %.1f/%.1f", ImGui::GetScrollX(), ImGui::GetScrollMaxX(), ImGui::GetScrollY(), ImGui::GetScrollMaxY());
-            if (explicit_content_size)
-            {
-                ImGui::SameLine();
-                ImGui::SetNextItemWidth(100);
-                ImGui::DragFloat("##csx", &contents_size_x);
-                ImVec2 p = ImGui::GetCursorScreenPos();
-                ImGui::GetWindowDrawList()->AddRectFilled(p, ImVec2(p.x + 10, p.y + 10), IM_COL32_WHITE);
-                ImGui::GetWindowDrawList()->AddRectFilled(ImVec2(p.x + contents_size_x - 10, p.y), ImVec2(p.x + contents_size_x, p.y + 10), IM_COL32_WHITE);
-                ImGui::Dummy(ImVec2(0, 10));
-            }
-            ImGui::PopStyleVar(2);
-            ImGui::Separator();
-            if (show_button)
-            {
-                ImGui::Button("this is a 300-wide button", ImVec2(300, 0));
-            }
-            if (show_tree_nodes)
-            {
-                bool open = true;
-                if (ImGui::TreeNode("this is a tree node"))
-                {
-                    if (ImGui::TreeNode("another one of those tree node..."))
-                    {
-                        ImGui::Text("Some tree contents");
-                        ImGui::TreePop();
-                    }
-                    ImGui::TreePop();
-                }
-                ImGui::CollapsingHeader("CollapsingHeader", &open);
-            }
-            if (show_text_wrapped)
-            {
-                ImGui::TextWrapped("This text should automatically wrap on the edge of the work rectangle.");
-            }
-            if (show_columns)
-            {
-                ImGui::Text("Tables:");
-                if (ImGui::BeginTable("table", 4, ImGuiTableFlags_Borders))
-                {
-                    for (int n = 0; n < 4; n++)
-                    {
-                        ImGui::TableNextColumn();
-                        ImGui::Text("Width %.2f", ImGui::GetContentRegionAvail().x);
-                    }
-                    ImGui::EndTable();
-                }
-                ImGui::Text("Columns:");
-                ImGui::Columns(4);
-                for (int n = 0; n < 4; n++)
-                {
-                    ImGui::Text("Width %.2f", ImGui::GetColumnWidth());
-                    ImGui::NextColumn();
-                }
-                ImGui::Columns(1);
-            }
-            if (show_tab_bar && ImGui::BeginTabBar("Hello"))
-            {
-                if (ImGui::BeginTabItem("OneOneOne")) { ImGui::EndTabItem(); }
-                if (ImGui::BeginTabItem("TwoTwoTwo")) { ImGui::EndTabItem(); }
-                if (ImGui::BeginTabItem("ThreeThreeThree")) { ImGui::EndTabItem(); }
-                if (ImGui::BeginTabItem("FourFourFour")) { ImGui::EndTabItem(); }
-                ImGui::EndTabBar();
-            }
-            if (show_child)
-            {
-                ImGui::BeginChild("child", ImVec2(0, 0), true);
-                ImGui::EndChild();
-            }
-            ImGui::End();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Clipping"))
-    {
-        static ImVec2 size(100.0f, 100.0f);
-        static ImVec2 offset(30.0f, 30.0f);
-        ImGui::DragFloat2("size", (float*)&size, 0.5f, 1.0f, 200.0f, "%.0f");
-        ImGui::TextWrapped("(Click and drag to scroll)");
-
-        for (int n = 0; n < 3; n++)
-        {
-            if (n > 0)
-                ImGui::SameLine();
-            ImGui::PushID(n);
-            ImGui::BeginGroup();    
-
-            ImGui::InvisibleButton("##empty", size);
-            if (ImGui::IsItemActive() && ImGui::IsMouseDragging(ImGuiMouseButton_Left))
-            {
-                offset.x += ImGui::GetIO().MouseDelta.x;
-                offset.y += ImGui::GetIO().MouseDelta.y;
-            }
-            const ImVec2 p0 = ImGui::GetItemRectMin();
-            const ImVec2 p1 = ImGui::GetItemRectMax();
-            const char* text_str = "Line 1 hello\nLine 2 clip me!";
-            const ImVec2 text_pos = ImVec2(p0.x + offset.x, p0.y + offset.y);
-            ImDrawList* draw_list = ImGui::GetWindowDrawList();
-
-            switch (n)
-            {
-            case 0:
-                HelpMarker(
-                    "Using ImGui::PushClipRect():\n"
-                    "Will alter ImGui hit-testing logic + ImDrawList rendering.\n"
-                    "(use this if you want your clipping rectangle to affect interactions)");
-                ImGui::PushClipRect(p0, p1, true);
-                draw_list->AddRectFilled(p0, p1, IM_COL32(90, 90, 120, 255));
-                draw_list->AddText(text_pos, IM_COL32_WHITE, text_str);
-                ImGui::PopClipRect();
-                break;
-            case 1:
-                HelpMarker(
-                    "Using ImDrawList::PushClipRect():\n"
-                    "Will alter ImDrawList rendering only.\n"
-                    "(use this as a shortcut if you are only using ImDrawList calls)");
-                draw_list->PushClipRect(p0, p1, true);
-                draw_list->AddRectFilled(p0, p1, IM_COL32(90, 90, 120, 255));
-                draw_list->AddText(text_pos, IM_COL32_WHITE, text_str);
-                draw_list->PopClipRect();
-                break;
-            case 2:
-                HelpMarker(
-                    "Using ImDrawList::AddText() with a fine ClipRect:\n"
-                    "Will alter only this specific ImDrawList::AddText() rendering.\n"
-                    "(this is often used internally to avoid altering the clipping rectangle and minimize draw calls)");
-                ImVec4 clip_rect(p0.x, p0.y, p1.x, p1.y);         
-                draw_list->AddRectFilled(p0, p1, IM_COL32(90, 90, 120, 255));
-                draw_list->AddText(ImGui::GetFont(), ImGui::GetFontSize(), text_pos, IM_COL32_WHITE, text_str, NULL, 0.0f, &clip_rect);
-                break;
-            }
-            ImGui::EndGroup();
-            ImGui::PopID();
-        }
-
-        ImGui::TreePop();
-    }
-}
-
-static void ShowDemoWindowPopups()
-{
-    if (!ImGui::CollapsingHeader("Popups & Modal windows"))
-        return;
-
-    if (ImGui::TreeNode("Popups"))
-    {
-        ImGui::TextWrapped(
-            "When a popup is active, it inhibits interacting with windows that are behind the popup. "
-            "Clicking outside the popup closes it.");
-
-        static int selected_fish = -1;
-        const char* names[] = { "Bream", "Haddock", "Mackerel", "Pollock", "Tilefish" };
-        static bool toggles[] = { true, false, false, false, false };
-
-        if (ImGui::Button("Select.."))
-            ImGui::OpenPopup("my_select_popup");
-        ImGui::SameLine();
-        ImGui::TextUnformatted(selected_fish == -1 ? "<None>" : names[selected_fish]);
-        if (ImGui::BeginPopup("my_select_popup"))
-        {
-            ImGui::Text("Aquarium");
-            ImGui::Separator();
-            for (int i = 0; i < IM_ARRAYSIZE(names); i++)
-                if (ImGui::Selectable(names[i]))
-                    selected_fish = i;
-            ImGui::EndPopup();
-        }
-
-        if (ImGui::Button("Toggle.."))
-            ImGui::OpenPopup("my_toggle_popup");
-        if (ImGui::BeginPopup("my_toggle_popup"))
-        {
-            for (int i = 0; i < IM_ARRAYSIZE(names); i++)
-                ImGui::MenuItem(names[i], "", &toggles[i]);
-            if (ImGui::BeginMenu("Sub-menu"))
-            {
-                ImGui::MenuItem("Click me");
-                ImGui::EndMenu();
-            }
-
-            ImGui::Separator();
-            ImGui::Text("Tooltip here");
-            if (ImGui::IsItemHovered())
-                ImGui::SetTooltip("I am a tooltip over a popup");
-
-            if (ImGui::Button("Stacked Popup"))
-                ImGui::OpenPopup("another popup");
-            if (ImGui::BeginPopup("another popup"))
-            {
-                for (int i = 0; i < IM_ARRAYSIZE(names); i++)
-                    ImGui::MenuItem(names[i], "", &toggles[i]);
-                if (ImGui::BeginMenu("Sub-menu"))
-                {
-                    ImGui::MenuItem("Click me");
-                    if (ImGui::Button("Stacked Popup"))
-                        ImGui::OpenPopup("another popup");
-                    if (ImGui::BeginPopup("another popup"))
-                    {
-                        ImGui::Text("I am the last one here.");
-                        ImGui::EndPopup();
-                    }
-                    ImGui::EndMenu();
-                }
-                ImGui::EndPopup();
-            }
-            ImGui::EndPopup();
-        }
-
-        if (ImGui::Button("File Menu.."))
-            ImGui::OpenPopup("my_file_popup");
-        if (ImGui::BeginPopup("my_file_popup"))
-        {
-            ShowExampleMenuFile();
-            ImGui::EndPopup();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Context menus"))
-    {
-        static float value = 0.5f;
-        ImGui::Text("Value = %.3f (<-- right-click here)", value);
-        if (ImGui::BeginPopupContextItem("item context menu"))
-        {
-            if (ImGui::Selectable("Set to zero")) value = 0.0f;
-            if (ImGui::Selectable("Set to PI")) value = 3.1415f;
-            ImGui::SetNextItemWidth(-FLT_MIN);
-            ImGui::DragFloat("##Value", &value, 0.1f, 0.0f, 0.0f);
-            ImGui::EndPopup();
-        }
-
-        ImGui::Text("(You can also right-click me to open the same popup as above.)");
-        ImGui::OpenPopupOnItemClick("item context menu", 1);
-
-        static char name[32] = "Label1";
-        char buf[64];
-        sprintf(buf, "Button: %s###Button", name);         
-        ImGui::Button(buf);
-        if (ImGui::BeginPopupContextItem())
-        {
-            ImGui::Text("Edit name:");
-            ImGui::InputText("##edit", name, IM_ARRAYSIZE(name));
-            if (ImGui::Button("Close"))
-                ImGui::CloseCurrentPopup();
-            ImGui::EndPopup();
-        }
-        ImGui::SameLine(); ImGui::Text("(<-- right-click here)");
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Modals"))
-    {
-        ImGui::TextWrapped("Modal windows are like popups but the user cannot close them by clicking outside.");
-
-        if (ImGui::Button("Delete.."))
-            ImGui::OpenPopup("Delete?");
-
-        ImVec2 center(ImGui::GetIO().DisplaySize.x * 0.5f, ImGui::GetIO().DisplaySize.y * 0.5f);
-        ImGui::SetNextWindowPos(center, ImGuiCond_Appearing, ImVec2(0.5f, 0.5f));
-
-        if (ImGui::BeginPopupModal("Delete?", NULL, ImGuiWindowFlags_AlwaysAutoResize))
-        {
-            ImGui::Text("All those beautiful files will be deleted.\nThis operation cannot be undone!\n\n");
-            ImGui::Separator();
-
-            static bool dont_ask_me_next_time = false;
-            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-            ImGui::Checkbox("Don't ask me next time", &dont_ask_me_next_time);
-            ImGui::PopStyleVar();
-
-            if (ImGui::Button("OK", ImVec2(120, 0))) { ImGui::CloseCurrentPopup(); }
-            ImGui::SetItemDefaultFocus();
-            ImGui::SameLine();
-            if (ImGui::Button("Cancel", ImVec2(120, 0))) { ImGui::CloseCurrentPopup(); }
-            ImGui::EndPopup();
-        }
-
-        if (ImGui::Button("Stacked modals.."))
-            ImGui::OpenPopup("Stacked 1");
-        if (ImGui::BeginPopupModal("Stacked 1", NULL, ImGuiWindowFlags_MenuBar))
-        {
-            if (ImGui::BeginMenuBar())
-            {
-                if (ImGui::BeginMenu("File"))
-                {
-                    if (ImGui::MenuItem("Some menu item")) {}
-                    ImGui::EndMenu();
-                }
-                ImGui::EndMenuBar();
-            }
-            ImGui::Text("Hello from Stacked The First\nUsing style.Colors[ImGuiCol_ModalWindowDimBg] behind it.");
-
-            static int item = 1;
-            static float color[4] = { 0.4f, 0.7f, 0.0f, 0.5f };
-            ImGui::Combo("Combo", &item, "aaaa\0bbbb\0cccc\0dddd\0eeee\0\0");
-            ImGui::ColorEdit4("color", color);
-
-            if (ImGui::Button("Add another modal.."))
-                ImGui::OpenPopup("Stacked 2");
-
-            bool unused_open = true;
-            if (ImGui::BeginPopupModal("Stacked 2", &unused_open))
-            {
-                ImGui::Text("Hello from Stacked The Second!");
-                if (ImGui::Button("Close"))
-                    ImGui::CloseCurrentPopup();
-                ImGui::EndPopup();
-            }
-
-            if (ImGui::Button("Close"))
-                ImGui::CloseCurrentPopup();
-            ImGui::EndPopup();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Menus inside a regular window"))
-    {
-        ImGui::TextWrapped("Below we are testing adding menu items to a regular window. It's rather unusual but should work!");
-        ImGui::Separator();
-
-        ImGui::PushID("foo");
-        ImGui::MenuItem("Menu item", "CTRL+M");
-        if (ImGui::BeginMenu("Menu inside a regular window"))
-        {
-            ShowExampleMenuFile();
-            ImGui::EndMenu();
-        }
-        ImGui::PopID();
-        ImGui::Separator();
-        ImGui::TreePop();
-    }
-}
-
-namespace
-{
-enum MyItemColumnID
-{
-    MyItemColumnID_ID,
-    MyItemColumnID_Name,
-    MyItemColumnID_Action,
-    MyItemColumnID_Quantity,
-    MyItemColumnID_Description
-};
-
-struct MyItem
-{
-    int         ID;
-    const char* Name;
-    int         Quantity;
-
-    static const ImGuiTableSortSpecs* s_current_sort_specs;
-
-    static int IMGUI_CDECL CompareWithSortSpecs(const void* lhs, const void* rhs)
-    {
-        const MyItem* a = (const MyItem*)lhs;
-        const MyItem* b = (const MyItem*)rhs;
-        for (int n = 0; n < s_current_sort_specs->SpecsCount; n++)
-        {
-            const ImGuiTableColumnSortSpecs* sort_spec = &s_current_sort_specs->Specs[n];
-            int delta = 0;
-            switch (sort_spec->ColumnUserID)
-            {
-            case MyItemColumnID_ID:             delta = (a->ID - b->ID);                break;
-            case MyItemColumnID_Name:           delta = (strcmp(a->Name, b->Name));     break;
-            case MyItemColumnID_Quantity:       delta = (a->Quantity - b->Quantity);    break;
-            case MyItemColumnID_Description:    delta = (strcmp(a->Name, b->Name));     break;
-            default: IM_ASSERT(0); break;
-            }
-            if (delta > 0)
-                return (sort_spec->SortDirection == ImGuiSortDirection_Ascending) ? +1 : -1;
-            if (delta < 0)
-                return (sort_spec->SortDirection == ImGuiSortDirection_Ascending) ? -1 : +1;
-        }
-
-        return (a->ID - b->ID);
-    }
-};
-const ImGuiTableSortSpecs* MyItem::s_current_sort_specs = NULL;
-}
-
-static void PushStyleCompact()
-{
-    ImGuiStyle& style = ImGui::GetStyle();
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(style.FramePadding.x, (float)(int)(style.FramePadding.y * 0.60f)));
-    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(style.ItemSpacing.x, (float)(int)(style.ItemSpacing.y * 0.60f)));
-}
-
-static void PopStyleCompact()
-{
-    ImGui::PopStyleVar(2);
-}
-
-static void EditTableSizingFlags(ImGuiTableFlags* p_flags)
-{
-    struct EnumDesc { ImGuiTableFlags Value; const char* Name; const char* Tooltip; };
-    static const EnumDesc policies[] =
-    {
-        { ImGuiTableFlags_None,               "Default",                            "Use default sizing policy:\n- ImGuiTableFlags_SizingFixedFit if ScrollX is on or if host window has ImGuiWindowFlags_AlwaysAutoResize.\n- ImGuiTableFlags_SizingStretchSame otherwise." },
-        { ImGuiTableFlags_SizingFixedFit,     "ImGuiTableFlags_SizingFixedFit",     "Columns default to _WidthFixed (if resizable) or _WidthAuto (if not resizable), matching contents width." },
-        { ImGuiTableFlags_SizingFixedSame,    "ImGuiTableFlags_SizingFixedSame",    "Columns are all the same width, matching the maximum contents width.\nImplicitly disable ImGuiTableFlags_Resizable and enable ImGuiTableFlags_NoKeepColumnsVisible." },
-        { ImGuiTableFlags_SizingStretchProp,  "ImGuiTableFlags_SizingStretchProp",  "Columns default to _WidthStretch with weights proportional to their widths." },
-        { ImGuiTableFlags_SizingStretchSame,  "ImGuiTableFlags_SizingStretchSame",  "Columns default to _WidthStretch with same weights." }
-    };
-    int idx;
-    for (idx = 0; idx < IM_ARRAYSIZE(policies); idx++)
-        if (policies[idx].Value == (*p_flags & ImGuiTableFlags_SizingMask_))
-            break;
-    const char* preview_text = (idx < IM_ARRAYSIZE(policies)) ? policies[idx].Name + (idx > 0 ? strlen("ImGuiTableFlags") : 0) : "";
-    if (ImGui::BeginCombo("Sizing Policy", preview_text))
-    {
-        for (int n = 0; n < IM_ARRAYSIZE(policies); n++)
-            if (ImGui::Selectable(policies[n].Name, idx == n))
-                *p_flags = (*p_flags & ~ImGuiTableFlags_SizingMask_) | policies[n].Value;
-        ImGui::EndCombo();
-    }
-    ImGui::SameLine();
-    ImGui::TextDisabled("(?)");
-    if (ImGui::IsItemHovered())
-    {
-        ImGui::BeginTooltip();
-        ImGui::PushTextWrapPos(ImGui::GetFontSize() * 50.0f);
-        for (int m = 0; m < IM_ARRAYSIZE(policies); m++)
-        {
-            ImGui::Separator();
-            ImGui::Text("%s:", policies[m].Name);
-            ImGui::Separator();
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetStyle().IndentSpacing * 0.5f);
-            ImGui::TextUnformatted(policies[m].Tooltip);
-        }
-        ImGui::PopTextWrapPos();
-        ImGui::EndTooltip();
-    }
-}
-
-static void EditTableColumnsFlags(ImGuiTableColumnFlags* p_flags)
-{
-    ImGui::CheckboxFlags("_DefaultHide", p_flags, ImGuiTableColumnFlags_DefaultHide);
-    ImGui::CheckboxFlags("_DefaultSort", p_flags, ImGuiTableColumnFlags_DefaultSort);
-    if (ImGui::CheckboxFlags("_WidthStretch", p_flags, ImGuiTableColumnFlags_WidthStretch))
-        *p_flags &= ~(ImGuiTableColumnFlags_WidthMask_ ^ ImGuiTableColumnFlags_WidthStretch);
-    if (ImGui::CheckboxFlags("_WidthFixed", p_flags, ImGuiTableColumnFlags_WidthFixed))
-        *p_flags &= ~(ImGuiTableColumnFlags_WidthMask_ ^ ImGuiTableColumnFlags_WidthFixed);
-    ImGui::CheckboxFlags("_NoResize", p_flags, ImGuiTableColumnFlags_NoResize);
-    ImGui::CheckboxFlags("_NoReorder", p_flags, ImGuiTableColumnFlags_NoReorder);
-    ImGui::CheckboxFlags("_NoHide", p_flags, ImGuiTableColumnFlags_NoHide);
-    ImGui::CheckboxFlags("_NoClip", p_flags, ImGuiTableColumnFlags_NoClip);
-    ImGui::CheckboxFlags("_NoSort", p_flags, ImGuiTableColumnFlags_NoSort);
-    ImGui::CheckboxFlags("_NoSortAscending", p_flags, ImGuiTableColumnFlags_NoSortAscending);
-    ImGui::CheckboxFlags("_NoSortDescending", p_flags, ImGuiTableColumnFlags_NoSortDescending);
-    ImGui::CheckboxFlags("_NoHeaderWidth", p_flags, ImGuiTableColumnFlags_NoHeaderWidth);
-    ImGui::CheckboxFlags("_PreferSortAscending", p_flags, ImGuiTableColumnFlags_PreferSortAscending);
-    ImGui::CheckboxFlags("_PreferSortDescending", p_flags, ImGuiTableColumnFlags_PreferSortDescending);
-    ImGui::CheckboxFlags("_IndentEnable", p_flags, ImGuiTableColumnFlags_IndentEnable); ImGui::SameLine(); HelpMarker("Default for column 0");
-    ImGui::CheckboxFlags("_IndentDisable", p_flags, ImGuiTableColumnFlags_IndentDisable); ImGui::SameLine(); HelpMarker("Default for column >0");
-}
-
-static void ShowTableColumnsStatusFlags(ImGuiTableColumnFlags flags)
-{
-    ImGui::CheckboxFlags("_IsEnabled", &flags, ImGuiTableColumnFlags_IsEnabled);
-    ImGui::CheckboxFlags("_IsVisible", &flags, ImGuiTableColumnFlags_IsVisible);
-    ImGui::CheckboxFlags("_IsSorted", &flags, ImGuiTableColumnFlags_IsSorted);
-    ImGui::CheckboxFlags("_IsHovered", &flags, ImGuiTableColumnFlags_IsHovered);
-}
-
-static void ShowDemoWindowTables()
-{
-    if (!ImGui::CollapsingHeader("Tables & Columns"))
-        return;
-
-    const float TEXT_BASE_WIDTH = ImGui::CalcTextSize("A").x;
-    const float TEXT_BASE_HEIGHT = ImGui::GetTextLineHeightWithSpacing();
-
-    ImGui::PushID("Tables");
-
-    int open_action = -1;
-    if (ImGui::Button("Open all"))
-        open_action = 1;
-    ImGui::SameLine();
-    if (ImGui::Button("Close all"))
-        open_action = 0;
-    ImGui::SameLine();
-
-    static bool disable_indent = false;
-    ImGui::Checkbox("Disable tree indentation", &disable_indent);
-    ImGui::SameLine();
-    HelpMarker("Disable the indenting of tree nodes so demo tables can use the full window width.");
-    ImGui::Separator();
-    if (disable_indent)
-        ImGui::PushStyleVar(ImGuiStyleVar_IndentSpacing, 0.0f);
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Basic"))
-    {
-        HelpMarker("Using TableNextRow() + calling TableSetColumnIndex() _before_ each cell, in a loop.");
-        if (ImGui::BeginTable("table1", 3))
-        {
-            for (int row = 0; row < 4; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("Row %d Column %d", row, column);
-                }
-            }
-            ImGui::EndTable();
-        }
-
-        HelpMarker("Using TableNextRow() + calling TableNextColumn() _before_ each cell, manually.");
-        if (ImGui::BeginTable("table2", 3))
-        {
-            for (int row = 0; row < 4; row++)
-            {
-                ImGui::TableNextRow();
-                ImGui::TableNextColumn();
-                ImGui::Text("Row %d", row);
-                ImGui::TableNextColumn();
-                ImGui::Text("Some contents");
-                ImGui::TableNextColumn();
-                ImGui::Text("123.456");
-            }
-            ImGui::EndTable();
-        }
-
-        HelpMarker(
-            "Only using TableNextColumn(), which tends to be convenient for tables where every cells contains the same type of contents.\n"
-            "This is also more similar to the old NextColumn() function of the Columns API, and provided to facilitate the Columns->Tables API transition.");
-        if (ImGui::BeginTable("table3", 3))
-        {
-            for (int item = 0; item < 14; item++)
-            {
-                ImGui::TableNextColumn();
-                ImGui::Text("Item %d", item);
-            }
-            ImGui::EndTable();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Borders, background"))
-    {
-        enum ContentsType { CT_Text, CT_FillButton };
-        static ImGuiTableFlags flags = ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg;
-        static bool display_headers = false;
-        static int contents_type = CT_Text;
-
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_RowBg", &flags, ImGuiTableFlags_RowBg);
-        ImGui::CheckboxFlags("ImGuiTableFlags_Borders", &flags, ImGuiTableFlags_Borders);
-        ImGui::SameLine(); HelpMarker("ImGuiTableFlags_Borders\n = ImGuiTableFlags_BordersInnerV\n | ImGuiTableFlags_BordersOuterV\n | ImGuiTableFlags_BordersInnerV\n | ImGuiTableFlags_BordersOuterH");
-        ImGui::Indent();
-
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersH", &flags, ImGuiTableFlags_BordersH);
-        ImGui::Indent();
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterH", &flags, ImGuiTableFlags_BordersOuterH);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerH", &flags, ImGuiTableFlags_BordersInnerH);
-        ImGui::Unindent();
-
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersV", &flags, ImGuiTableFlags_BordersV);
-        ImGui::Indent();
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterV", &flags, ImGuiTableFlags_BordersOuterV);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerV", &flags, ImGuiTableFlags_BordersInnerV);
-        ImGui::Unindent();
-
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuter", &flags, ImGuiTableFlags_BordersOuter);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersInner", &flags, ImGuiTableFlags_BordersInner);
-        ImGui::Unindent();
-
-        ImGui::AlignTextToFramePadding(); ImGui::Text("Cell contents:");
-        ImGui::SameLine(); ImGui::RadioButton("Text", &contents_type, CT_Text);
-        ImGui::SameLine(); ImGui::RadioButton("FillButton", &contents_type, CT_FillButton);
-        ImGui::Checkbox("Display headers", &display_headers);
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBody", &flags, ImGuiTableFlags_NoBordersInBody); ImGui::SameLine(); HelpMarker("Disable vertical borders in columns Body (borders will always appears in Headers");
-        PopStyleCompact();
-
-        if (ImGui::BeginTable("table1", 3, flags))
-        {
-            if (display_headers)
-            {
-                ImGui::TableSetupColumn("One");
-                ImGui::TableSetupColumn("Two");
-                ImGui::TableSetupColumn("Three");
-                ImGui::TableHeadersRow();
-            }
-
-            for (int row = 0; row < 5; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    char buf[32];
-                    sprintf(buf, "Hello %d,%d", column, row);
-                    if (contents_type == CT_Text)
-                        ImGui::TextUnformatted(buf);
-                    else if (contents_type)
-                        ImGui::Button(buf, ImVec2(-FLT_MIN, 0.0f));
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Resizable, stretch"))
-    {
-        static ImGuiTableFlags flags = ImGuiTableFlags_SizingStretchSame | ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_ContextMenuInBody;
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersV", &flags, ImGuiTableFlags_BordersV);
-        ImGui::SameLine(); HelpMarker("Using the _Resizable flag automatically enables the _BordersInnerV flag as well, this is why the resize borders are still showing when unchecking this.");
-        PopStyleCompact();
-
-        if (ImGui::BeginTable("table1", 3, flags))
-        {
-            for (int row = 0; row < 5; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("Hello %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Resizable, fixed"))
-    {
-        HelpMarker(
-            "Using _Resizable + _SizingFixedFit flags.\n"
-            "Fixed-width columns generally makes more sense if you want to use horizontal scrolling.\n\n"
-            "Double-click a column border to auto-fit the column to its contents.");
-        PushStyleCompact();
-        static ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_ContextMenuInBody;
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendX", &flags, ImGuiTableFlags_NoHostExtendX);
-        PopStyleCompact();
-
-        if (ImGui::BeginTable("table1", 3, flags))
-        {
-            for (int row = 0; row < 5; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("Hello %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Resizable, mixed"))
-    {
-        HelpMarker(
-            "Using TableSetupColumn() to alter resizing policy on a per-column basis.\n\n"
-            "When combining Fixed and Stretch columns, generally you only want one, maybe two trailing columns to use _WidthStretch.");
-        static ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_RowBg | ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable;
-
-        if (ImGui::BeginTable("table1", 3, flags))
-        {
-            ImGui::TableSetupColumn("AAA", ImGuiTableColumnFlags_WidthFixed);
-            ImGui::TableSetupColumn("BBB", ImGuiTableColumnFlags_WidthFixed);
-            ImGui::TableSetupColumn("CCC", ImGuiTableColumnFlags_WidthStretch);
-            ImGui::TableHeadersRow();
-            for (int row = 0; row < 5; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("%s %d,%d", (column == 2) ? "Stretch" : "Fixed", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-        if (ImGui::BeginTable("table2", 6, flags))
-        {
-            ImGui::TableSetupColumn("AAA", ImGuiTableColumnFlags_WidthFixed);
-            ImGui::TableSetupColumn("BBB", ImGuiTableColumnFlags_WidthFixed);
-            ImGui::TableSetupColumn("CCC", ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_DefaultHide);
-            ImGui::TableSetupColumn("DDD", ImGuiTableColumnFlags_WidthStretch);
-            ImGui::TableSetupColumn("EEE", ImGuiTableColumnFlags_WidthStretch);
-            ImGui::TableSetupColumn("FFF", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_DefaultHide);
-            ImGui::TableHeadersRow();
-            for (int row = 0; row < 5; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 6; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("%s %d,%d", (column >= 3) ? "Stretch" : "Fixed", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Reorderable, hideable, with headers"))
-    {
-        HelpMarker(
-            "Click and drag column headers to reorder columns.\n\n"
-            "Right-click on a header to open a context menu.");
-        static ImGuiTableFlags flags = ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV;
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable);
-        ImGui::CheckboxFlags("ImGuiTableFlags_Reorderable", &flags, ImGuiTableFlags_Reorderable);
-        ImGui::CheckboxFlags("ImGuiTableFlags_Hideable", &flags, ImGuiTableFlags_Hideable);
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBody", &flags, ImGuiTableFlags_NoBordersInBody);
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBodyUntilResize", &flags, ImGuiTableFlags_NoBordersInBodyUntilResize); ImGui::SameLine(); HelpMarker("Disable vertical borders in columns Body until hovered for resize (borders will always appears in Headers)");
-        PopStyleCompact();
-
-        if (ImGui::BeginTable("table1", 3, flags))
-        {
-            ImGui::TableSetupColumn("One");
-            ImGui::TableSetupColumn("Two");
-            ImGui::TableSetupColumn("Three");
-            ImGui::TableHeadersRow();
-            for (int row = 0; row < 6; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("Hello %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-
-        if (ImGui::BeginTable("table2", 3, flags | ImGuiTableFlags_SizingFixedFit, ImVec2(0.0f, 0.0f)))
-        {
-            ImGui::TableSetupColumn("One");
-            ImGui::TableSetupColumn("Two");
-            ImGui::TableSetupColumn("Three");
-            ImGui::TableHeadersRow();
-            for (int row = 0; row < 6; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("Fixed %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Padding"))
-    {
-        HelpMarker(
-            "We often want outer padding activated when any using features which makes the edges of a column visible:\n"
-            "e.g.:\n"
-            "- BorderOuterV\n"
-            "- any form of row selection\n"
-            "Because of this, activating BorderOuterV sets the default to PadOuterX. Using PadOuterX or NoPadOuterX you can override the default.\n\n"
-            "Actual padding values are using style.CellPadding.\n\n"
-            "In this demo we don't show horizontal borders to emphasis how they don't affect default horizontal padding.");
-
-        static ImGuiTableFlags flags1 = ImGuiTableFlags_BordersV;
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_PadOuterX", &flags1, ImGuiTableFlags_PadOuterX);
-        ImGui::SameLine(); HelpMarker("Enable outer-most padding (default if ImGuiTableFlags_BordersOuterV is set)");
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoPadOuterX", &flags1, ImGuiTableFlags_NoPadOuterX);
-        ImGui::SameLine(); HelpMarker("Disable outer-most padding (default if ImGuiTableFlags_BordersOuterV is not set)");
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoPadInnerX", &flags1, ImGuiTableFlags_NoPadInnerX);
-        ImGui::SameLine(); HelpMarker("Disable inner padding between columns (double inner padding if BordersOuterV is on, single inner padding if BordersOuterV is off)");
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterV", &flags1, ImGuiTableFlags_BordersOuterV);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerV", &flags1, ImGuiTableFlags_BordersInnerV);
-        static bool show_headers = false;
-        ImGui::Checkbox("show_headers", &show_headers);
-        PopStyleCompact();
-
-        if (ImGui::BeginTable("table_padding", 3, flags1))
-        {
-            if (show_headers)
-            {
-                ImGui::TableSetupColumn("One");
-                ImGui::TableSetupColumn("Two");
-                ImGui::TableSetupColumn("Three");
-                ImGui::TableHeadersRow();
-            }
-
-            for (int row = 0; row < 5; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    if (row == 0)
-                    {
-                        ImGui::Text("Avail %.2f", ImGui::GetContentRegionAvail().x);
-                    }
-                    else
-                    {
-                        char buf[32];
-                        sprintf(buf, "Hello %d,%d", column, row);
-                        ImGui::Button(buf, ImVec2(-FLT_MIN, 0.0f));
-                    }
-                }
-            }
-            ImGui::EndTable();
-        }
-
-        HelpMarker("Setting style.CellPadding to (0,0) or a custom value.");
-        static ImGuiTableFlags flags2 = ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg;
-        static ImVec2 cell_padding(0.0f, 0.0f);
-        static bool show_widget_frame_bg = true;
-
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_Borders", &flags2, ImGuiTableFlags_Borders);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersH", &flags2, ImGuiTableFlags_BordersH);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersV", &flags2, ImGuiTableFlags_BordersV);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersInner", &flags2, ImGuiTableFlags_BordersInner);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuter", &flags2, ImGuiTableFlags_BordersOuter);
-        ImGui::CheckboxFlags("ImGuiTableFlags_RowBg", &flags2, ImGuiTableFlags_RowBg);
-        ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags2, ImGuiTableFlags_Resizable);
-        ImGui::Checkbox("show_widget_frame_bg", &show_widget_frame_bg);
-        ImGui::SliderFloat2("CellPadding", &cell_padding.x, 0.0f, 10.0f, "%.0f");
-        PopStyleCompact();
-
-        ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cell_padding);
-        if (ImGui::BeginTable("table_padding_2", 3, flags2))
-        {
-            static char text_bufs[3 * 5][16];       
-            static bool init = true;
-            if (!show_widget_frame_bg)
-                ImGui::PushStyleColor(ImGuiCol_FrameBg, 0);
-            for (int cell = 0; cell < 3 * 5; cell++)
-            {
-                ImGui::TableNextColumn();
-                if (init)
-                    strcpy(text_bufs[cell], "edit me");
-                ImGui::SetNextItemWidth(-FLT_MIN);
-                ImGui::PushID(cell);
-                ImGui::InputText("##cell", text_bufs[cell], IM_ARRAYSIZE(text_bufs[cell]));
-                ImGui::PopID();
-            }
-            if (!show_widget_frame_bg)
-                ImGui::PopStyleColor();
-            init = false;
-            ImGui::EndTable();
-        }
-        ImGui::PopStyleVar();
-
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Sizing policies"))
-    {
-        static ImGuiTableFlags flags1 = ImGuiTableFlags_BordersV | ImGuiTableFlags_BordersOuterH | ImGuiTableFlags_RowBg | ImGuiTableFlags_ContextMenuInBody;
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags1, ImGuiTableFlags_Resizable);
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendX", &flags1, ImGuiTableFlags_NoHostExtendX);
-        PopStyleCompact();
-
-        static ImGuiTableFlags sizing_policy_flags[4] = { ImGuiTableFlags_SizingFixedFit, ImGuiTableFlags_SizingFixedSame, ImGuiTableFlags_SizingStretchProp, ImGuiTableFlags_SizingStretchSame };
-        for (int table_n = 0; table_n < 4; table_n++)
-        {
-            ImGui::PushID(table_n);
-            ImGui::SetNextItemWidth(TEXT_BASE_WIDTH * 30);
-            EditTableSizingFlags(&sizing_policy_flags[table_n]);
-
-            if (ImGui::BeginTable("table1", 3, sizing_policy_flags[table_n] | flags1))
-            {
-                for (int row = 0; row < 3; row++)
-                {
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn(); ImGui::Text("Oh dear");
-                    ImGui::TableNextColumn(); ImGui::Text("Oh dear");
-                    ImGui::TableNextColumn(); ImGui::Text("Oh dear");
-                }
-                ImGui::EndTable();
-            }
-            if (ImGui::BeginTable("table2", 3, sizing_policy_flags[table_n] | flags1))
-            {
-                for (int row = 0; row < 3; row++)
-                {
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn(); ImGui::Text("AAAA");
-                    ImGui::TableNextColumn(); ImGui::Text("BBBBBBBB");
-                    ImGui::TableNextColumn(); ImGui::Text("CCCCCCCCCCCC");
-                }
-                ImGui::EndTable();
-            }
-            ImGui::PopID();
-        }
-
-        ImGui::Spacing();
-        ImGui::TextUnformatted("Advanced");
-        ImGui::SameLine();
-        HelpMarker("This section allows you to interact and see the effect of various sizing policies depending on whether Scroll is enabled and the contents of your columns.");
-
-        enum ContentsType { CT_ShowWidth, CT_ShortText, CT_LongText, CT_Button, CT_FillButton, CT_InputText };
-        static ImGuiTableFlags flags = ImGuiTableFlags_ScrollY | ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_Resizable;
-        static int contents_type = CT_ShowWidth;
-        static int column_count = 3;
-
-        PushStyleCompact();
-        ImGui::PushID("Advanced");
-        ImGui::PushItemWidth(TEXT_BASE_WIDTH * 30);
-        EditTableSizingFlags(&flags);
-        ImGui::Combo("Contents", &contents_type, "Show width\0Short Text\0Long Text\0Button\0Fill Button\0InputText\0");
-        if (contents_type == CT_FillButton)
-        {
-            ImGui::SameLine();
-            HelpMarker("Be mindful that using right-alignment (e.g. size.x = -FLT_MIN) creates a feedback loop where contents width can feed into auto-column width can feed into contents width.");
-        }
-        ImGui::DragInt("Columns", &column_count, 0.1f, 1, 64, "%d", ImGuiSliderFlags_AlwaysClamp);
-        ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable);
-        ImGui::CheckboxFlags("ImGuiTableFlags_PreciseWidths", &flags, ImGuiTableFlags_PreciseWidths);
-        ImGui::SameLine(); HelpMarker("Disable distributing remainder width to stretched columns (width allocation on a 100-wide table with 3 columns: Without this flag: 33,33,34. With this flag: 33,33,33). With larger number of columns, resizing will appear to be less smooth.");
-        ImGui::CheckboxFlags("ImGuiTableFlags_ScrollX", &flags, ImGuiTableFlags_ScrollX);
-        ImGui::CheckboxFlags("ImGuiTableFlags_ScrollY", &flags, ImGuiTableFlags_ScrollY);
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoClip", &flags, ImGuiTableFlags_NoClip);
-        ImGui::PopItemWidth();
-        ImGui::PopID();
-        PopStyleCompact();
-
-        if (ImGui::BeginTable("table2", column_count, flags, ImVec2(0.0f, TEXT_BASE_HEIGHT * 7)))
-        {
-            for (int cell = 0; cell < 10 * column_count; cell++)
-            {
-                ImGui::TableNextColumn();
-                int column = ImGui::TableGetColumnIndex();
-                int row = ImGui::TableGetRowIndex();
-
-                ImGui::PushID(cell);
-                char label[32];
-                static char text_buf[32] = "";
-                sprintf(label, "Hello %d,%d", column, row);
-                switch (contents_type)
-                {
-                case CT_ShortText:  ImGui::TextUnformatted(label); break;
-                case CT_LongText:   ImGui::Text("Some %s text %d,%d\nOver two lines..", column == 0 ? "long" : "longeeer", column, row); break;
-                case CT_ShowWidth:  ImGui::Text("W: %.1f", ImGui::GetContentRegionAvail().x); break;
-                case CT_Button:     ImGui::Button(label); break;
-                case CT_FillButton: ImGui::Button(label, ImVec2(-FLT_MIN, 0.0f)); break;
-                case CT_InputText:  ImGui::SetNextItemWidth(-FLT_MIN); ImGui::InputText("##", text_buf, IM_ARRAYSIZE(text_buf)); break;
-                }
-                ImGui::PopID();
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Vertical scrolling, with clipping"))
-    {
-        HelpMarker("Here we activate ScrollY, which will create a child window container to allow hosting scrollable contents.\n\nWe also demonstrate using ImGuiListClipper to virtualize the submission of many items.");
-        static ImGuiTableFlags flags = ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable;
-
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_ScrollY", &flags, ImGuiTableFlags_ScrollY);
-        PopStyleCompact();
-
-        ImVec2 outer_size = ImVec2(0.0f, TEXT_BASE_HEIGHT * 8);
-        if (ImGui::BeginTable("table_scrolly", 3, flags, outer_size))
-        {
-            ImGui::TableSetupScrollFreeze(0, 1);      
-            ImGui::TableSetupColumn("One", ImGuiTableColumnFlags_None);
-            ImGui::TableSetupColumn("Two", ImGuiTableColumnFlags_None);
-            ImGui::TableSetupColumn("Three", ImGuiTableColumnFlags_None);
-            ImGui::TableHeadersRow();
-
-            ImGuiListClipper clipper;
-            clipper.Begin(1000);
-            while (clipper.Step())
-            {
-                for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; row++)
-                {
-                    ImGui::TableNextRow();
-                    for (int column = 0; column < 3; column++)
-                    {
-                        ImGui::TableSetColumnIndex(column);
-                        ImGui::Text("Hello %d,%d", column, row);
-                    }
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Horizontal scrolling"))
-    {
-        HelpMarker(
-            "When ScrollX is enabled, the default sizing policy becomes ImGuiTableFlags_SizingFixedFit, "
-            "as automatically stretching columns doesn't make much sense with horizontal scrolling.\n\n"
-            "Also note that as of the current version, you will almost always want to enable ScrollY along with ScrollX,"
-            "because the container window won't automatically extend vertically to fix contents (this may be improved in future versions).");
-        static ImGuiTableFlags flags = ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable;
-        static int freeze_cols = 1;
-        static int freeze_rows = 1;
-
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable);
-        ImGui::CheckboxFlags("ImGuiTableFlags_ScrollX", &flags, ImGuiTableFlags_ScrollX);
-        ImGui::CheckboxFlags("ImGuiTableFlags_ScrollY", &flags, ImGuiTableFlags_ScrollY);
-        ImGui::SetNextItemWidth(ImGui::GetFrameHeight());
-        ImGui::DragInt("freeze_cols", &freeze_cols, 0.2f, 0, 9, NULL, ImGuiSliderFlags_NoInput);
-        ImGui::SetNextItemWidth(ImGui::GetFrameHeight());
-        ImGui::DragInt("freeze_rows", &freeze_rows, 0.2f, 0, 9, NULL, ImGuiSliderFlags_NoInput);
-        PopStyleCompact();
-
-        ImVec2 outer_size = ImVec2(0.0f, TEXT_BASE_HEIGHT * 8);
-        if (ImGui::BeginTable("table_scrollx", 7, flags, outer_size))
-        {
-            ImGui::TableSetupScrollFreeze(freeze_cols, freeze_rows);
-            ImGui::TableSetupColumn("Line #", ImGuiTableColumnFlags_NoHide);             
-            ImGui::TableSetupColumn("One");
-            ImGui::TableSetupColumn("Two");
-            ImGui::TableSetupColumn("Three");
-            ImGui::TableSetupColumn("Four");
-            ImGui::TableSetupColumn("Five");
-            ImGui::TableSetupColumn("Six");
-            ImGui::TableHeadersRow();
-            for (int row = 0; row < 20; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 7; column++)
-                {
-                    if (!ImGui::TableSetColumnIndex(column) && column > 0)
-                        continue;
-                    if (column == 0)
-                        ImGui::Text("Line %d", row);
-                    else
-                        ImGui::Text("Hello world %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-
-        ImGui::Spacing();
-        ImGui::TextUnformatted("Stretch + ScrollX");
-        ImGui::SameLine();
-        HelpMarker(
-            "Showcase using Stretch columns + ScrollX together: "
-            "this is rather unusual and only makes sense when specifying an 'inner_width' for the table!\n"
-            "Without an explicit value, inner_width is == outer_size.x and therefore using Stretch columns + ScrollX together doesn't make sense.");
-        static ImGuiTableFlags flags2 = ImGuiTableFlags_SizingStretchSame | ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_RowBg | ImGuiTableFlags_ContextMenuInBody;
-        static float inner_width = 1000.0f;
-        PushStyleCompact();
-        ImGui::PushID("flags3");
-        ImGui::PushItemWidth(TEXT_BASE_WIDTH * 30);
-        ImGui::CheckboxFlags("ImGuiTableFlags_ScrollX", &flags2, ImGuiTableFlags_ScrollX);
-        ImGui::DragFloat("inner_width", &inner_width, 1.0f, 0.0f, FLT_MAX, "%.1f");
-        ImGui::PopItemWidth();
-        ImGui::PopID();
-        PopStyleCompact();
-        if (ImGui::BeginTable("table2", 7, flags2, outer_size, inner_width))
-        {
-            for (int cell = 0; cell < 20 * 7; cell++)
-            {
-                ImGui::TableNextColumn();
-                ImGui::Text("Hello world %d,%d", ImGui::TableGetColumnIndex(), ImGui::TableGetRowIndex());
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Columns flags"))
-    {
-        const int column_count = 3;
-        const char* column_names[column_count] = { "One", "Two", "Three" };
-        static ImGuiTableColumnFlags column_flags[column_count] = { ImGuiTableColumnFlags_DefaultSort, ImGuiTableColumnFlags_None, ImGuiTableColumnFlags_DefaultHide };
-        static ImGuiTableColumnFlags column_flags_out[column_count] = { 0, 0, 0 };    
-
-        if (ImGui::BeginTable("table_columns_flags_checkboxes", column_count, ImGuiTableFlags_None))
-        {
-            PushStyleCompact();
-            for (int column = 0; column < column_count; column++)
-            {
-                ImGui::TableNextColumn();
-                ImGui::PushID(column);
-                ImGui::AlignTextToFramePadding();        
-                ImGui::Text("'%s'", column_names[column]);
-                ImGui::Spacing();
-                ImGui::Text("Input flags:");
-                EditTableColumnsFlags(&column_flags[column]);
-                ImGui::Spacing();
-                ImGui::Text("Output flags:");
-                ShowTableColumnsStatusFlags(column_flags_out[column]);
-                ImGui::PopID();
-            }
-            PopStyleCompact();
-            ImGui::EndTable();
-        }
-
-        const ImGuiTableFlags flags
-            = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY
-            | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV
-            | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Sortable;
-        ImVec2 outer_size = ImVec2(0.0f, TEXT_BASE_HEIGHT * 9);
-        if (ImGui::BeginTable("table_columns_flags", column_count, flags, outer_size))
-        {
-            for (int column = 0; column < column_count; column++)
-                ImGui::TableSetupColumn(column_names[column], column_flags[column]);
-            ImGui::TableHeadersRow();
-            for (int column = 0; column < column_count; column++)
-                column_flags_out[column] = ImGui::TableGetColumnFlags(column);
-            float indent_step = (float)((int)TEXT_BASE_WIDTH / 2);
-            for (int row = 0; row < 8; row++)
-            {
-                ImGui::Indent(indent_step);           
-                ImGui::TableNextRow();
-                for (int column = 0; column < column_count; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("%s %s", (column == 0) ? "Indented" : "Hello", ImGui::TableGetColumnName(column));
-                }
-            }
-            ImGui::Unindent(indent_step * 8.0f);
-
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Columns widths"))
-    {
-        HelpMarker("Using TableSetupColumn() to setup default width.");
-
-        static ImGuiTableFlags flags1 = ImGuiTableFlags_Borders | ImGuiTableFlags_NoBordersInBodyUntilResize;
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags1, ImGuiTableFlags_Resizable);
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBodyUntilResize", &flags1, ImGuiTableFlags_NoBordersInBodyUntilResize);
-        PopStyleCompact();
-        if (ImGui::BeginTable("table1", 3, flags1))
-        {
-            ImGui::TableSetupColumn("one", ImGuiTableColumnFlags_WidthFixed, 100.0f);    
-            ImGui::TableSetupColumn("two", ImGuiTableColumnFlags_WidthFixed, 200.0f);    
-            ImGui::TableSetupColumn("three", ImGuiTableColumnFlags_WidthFixed);          
-            ImGui::TableHeadersRow();
-            for (int row = 0; row < 4; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    if (row == 0)
-                        ImGui::Text("(w: %5.1f)", ImGui::GetContentRegionAvail().x);
-                    else
-                        ImGui::Text("Hello %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-
-        HelpMarker("Using TableSetupColumn() to setup explicit width.\n\nUnless _NoKeepColumnsVisible is set, fixed columns with set width may still be shrunk down if there's not enough space in the host.");
-
-        static ImGuiTableFlags flags2 = ImGuiTableFlags_None;
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoKeepColumnsVisible", &flags2, ImGuiTableFlags_NoKeepColumnsVisible);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerV", &flags2, ImGuiTableFlags_BordersInnerV);
-        ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterV", &flags2, ImGuiTableFlags_BordersOuterV);
-        PopStyleCompact();
-        if (ImGui::BeginTable("table2", 4, flags2))
-        {
-            ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, 100.0f);
-            ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, TEXT_BASE_WIDTH * 15.0f);
-            ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, TEXT_BASE_WIDTH * 30.0f);
-            ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, TEXT_BASE_WIDTH * 15.0f);
-            for (int row = 0; row < 5; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 4; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    if (row == 0)
-                        ImGui::Text("(w: %5.1f)", ImGui::GetContentRegionAvail().x);
-                    else
-                        ImGui::Text("Hello %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Nested tables"))
-    {
-        HelpMarker("This demonstrate embedding a table into another table cell.");
-
-        if (ImGui::BeginTable("table_nested1", 2, ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable))
-        {
-            ImGui::TableSetupColumn("A0");
-            ImGui::TableSetupColumn("A1");
-            ImGui::TableHeadersRow();
-
-            ImGui::TableNextColumn();
-            ImGui::Text("A0 Row 0");
-            {
-                float rows_height = TEXT_BASE_HEIGHT * 2;
-                if (ImGui::BeginTable("table_nested2", 2, ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable))
-                {
-                    ImGui::TableSetupColumn("B0");
-                    ImGui::TableSetupColumn("B1");
-                    ImGui::TableHeadersRow();
-
-                    ImGui::TableNextRow(ImGuiTableRowFlags_None, rows_height);
-                    ImGui::TableNextColumn();
-                    ImGui::Text("B0 Row 0");
-                    ImGui::TableNextColumn();
-                    ImGui::Text("B1 Row 0");
-                    ImGui::TableNextRow(ImGuiTableRowFlags_None, rows_height);
-                    ImGui::TableNextColumn();
-                    ImGui::Text("B0 Row 1");
-                    ImGui::TableNextColumn();
-                    ImGui::Text("B1 Row 1");
-
-                    ImGui::EndTable();
-                }
-            }
-            ImGui::TableNextColumn(); ImGui::Text("A1 Row 0");
-            ImGui::TableNextColumn(); ImGui::Text("A0 Row 1");
-            ImGui::TableNextColumn(); ImGui::Text("A1 Row 1");
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Row height"))
-    {
-        HelpMarker("You can pass a 'min_row_height' to TableNextRow().\n\nRows are padded with 'style.CellPadding.y' on top and bottom, so effectively the minimum row height will always be >= 'style.CellPadding.y * 2.0f'.\n\nWe cannot honor a _maximum_ row height as that would requires a unique clipping rectangle per row.");
-        if (ImGui::BeginTable("table_row_height", 1, ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersInnerV))
-        {
-            for (int row = 0; row < 10; row++)
-            {
-                float min_row_height = (float)(int)(TEXT_BASE_HEIGHT * 0.30f * row);
-                ImGui::TableNextRow(ImGuiTableRowFlags_None, min_row_height);
-                ImGui::TableNextColumn();
-                ImGui::Text("min_row_height = %.2f", min_row_height);
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Outer size"))
-    {
-        ImGui::Text("Using NoHostExtendX and NoHostExtendY:");
-        PushStyleCompact();
-        static ImGuiTableFlags flags = ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_ContextMenuInBody | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_NoHostExtendX;
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendX", &flags, ImGuiTableFlags_NoHostExtendX);
-        ImGui::SameLine(); HelpMarker("Make outer width auto-fit to columns, overriding outer_size.x value.\n\nOnly available when ScrollX/ScrollY are disabled and Stretch columns are not used.");
-        ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendY", &flags, ImGuiTableFlags_NoHostExtendY);
-        ImGui::SameLine(); HelpMarker("Make outer height stop exactly at outer_size.y (prevent auto-extending table past the limit).\n\nOnly available when ScrollX/ScrollY are disabled. Data below the limit will be clipped and not visible.");
-        PopStyleCompact();
-
-        ImVec2 outer_size = ImVec2(0.0f, TEXT_BASE_HEIGHT * 5.5f);
-        if (ImGui::BeginTable("table1", 3, flags, outer_size))
-        {
-            for (int row = 0; row < 10; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableNextColumn();
-                    ImGui::Text("Cell %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::SameLine();
-        ImGui::Text("Hello!");
-
-        ImGui::Spacing();
-
-        ImGui::Text("Using explicit size:");
-        if (ImGui::BeginTable("table2", 3, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg, ImVec2(TEXT_BASE_WIDTH * 30, 0.0f)))
-        {
-            for (int row = 0; row < 5; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableNextColumn();
-                    ImGui::Text("Cell %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::SameLine();
-        if (ImGui::BeginTable("table3", 3, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg, ImVec2(TEXT_BASE_WIDTH * 30, 0.0f)))
-        {
-            for (int row = 0; row < 3; row++)
-            {
-                ImGui::TableNextRow(0, TEXT_BASE_HEIGHT * 1.5f);
-                for (int column = 0; column < 3; column++)
-                {
-                    ImGui::TableNextColumn();
-                    ImGui::Text("Cell %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Background color"))
-    {
-        static ImGuiTableFlags flags = ImGuiTableFlags_RowBg;
-        static int row_bg_type = 1;
-        static int row_bg_target = 1;
-        static int cell_bg_type = 1;
-
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_Borders", &flags, ImGuiTableFlags_Borders);
-        ImGui::CheckboxFlags("ImGuiTableFlags_RowBg", &flags, ImGuiTableFlags_RowBg);
-        ImGui::SameLine(); HelpMarker("ImGuiTableFlags_RowBg automatically sets RowBg0 to alternative colors pulled from the Style.");
-        ImGui::Combo("row bg type", (int*)&row_bg_type, "None\0Red\0Gradient\0");
-        ImGui::Combo("row bg target", (int*)&row_bg_target, "RowBg0\0RowBg1\0"); ImGui::SameLine(); HelpMarker("Target RowBg0 to override the alternating odd/even colors,\nTarget RowBg1 to blend with them.");
-        ImGui::Combo("cell bg type", (int*)&cell_bg_type, "None\0Blue\0"); ImGui::SameLine(); HelpMarker("We are colorizing cells to B1->C2 here.");
-        IM_ASSERT(row_bg_type >= 0 && row_bg_type <= 2);
-        IM_ASSERT(row_bg_target >= 0 && row_bg_target <= 1);
-        IM_ASSERT(cell_bg_type >= 0 && cell_bg_type <= 1);
-        PopStyleCompact();
-
-        if (ImGui::BeginTable("table1", 5, flags))
-        {
-            for (int row = 0; row < 6; row++)
-            {
-                ImGui::TableNextRow();
-
-                if (row_bg_type != 0)
-                {
-                    ImU32 row_bg_color = ImGui::GetColorU32(row_bg_type == 1 ? ImVec4(0.7f, 0.3f, 0.3f, 0.65f) : ImVec4(0.2f + row * 0.1f, 0.2f, 0.2f, 0.65f));    
-                    ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0 + row_bg_target, row_bg_color);
-                }
-
-                for (int column = 0; column < 5; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("%c%c", 'A' + row, '0' + column);
-
-                    if (row >= 1 && row <= 2 && column >= 1 && column <= 2 && cell_bg_type == 1)
-                    {
-                        ImU32 cell_bg_color = ImGui::GetColorU32(ImVec4(0.3f, 0.3f, 0.7f, 0.65f));
-                        ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, cell_bg_color);
-                    }
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Tree view"))
-    {
-        static ImGuiTableFlags flags = ImGuiTableFlags_BordersV | ImGuiTableFlags_BordersOuterH | ImGuiTableFlags_Resizable | ImGuiTableFlags_RowBg | ImGuiTableFlags_NoBordersInBody;
-
-        if (ImGui::BeginTable("3ways", 3, flags))
-        {
-            ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_NoHide);
-            ImGui::TableSetupColumn("Size", ImGuiTableColumnFlags_WidthFixed, TEXT_BASE_WIDTH * 12.0f);
-            ImGui::TableSetupColumn("Type", ImGuiTableColumnFlags_WidthFixed, TEXT_BASE_WIDTH * 18.0f);
-            ImGui::TableHeadersRow();
-
-            struct MyTreeNode
-            {
-                const char*     Name;
-                const char*     Type;
-                int             Size;
-                int             ChildIdx;
-                int             ChildCount;
-                static void DisplayNode(const MyTreeNode* node, const MyTreeNode* all_nodes)
-                {
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-                    const bool is_folder = (node->ChildCount > 0);
-                    if (is_folder)
-                    {
-                        bool open = ImGui::TreeNodeEx(node->Name, ImGuiTreeNodeFlags_SpanFullWidth);
-                        ImGui::TableNextColumn();
-                        ImGui::TextDisabled("--");
-                        ImGui::TableNextColumn();
-                        ImGui::TextUnformatted(node->Type);
-                        if (open)
-                        {
-                            for (int child_n = 0; child_n < node->ChildCount; child_n++)
-                                DisplayNode(&all_nodes[node->ChildIdx + child_n], all_nodes);
-                            ImGui::TreePop();
-                        }
-                    }
-                    else
-                    {
-                        ImGui::TreeNodeEx(node->Name, ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_Bullet | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_SpanFullWidth);
-                        ImGui::TableNextColumn();
-                        ImGui::Text("%d", node->Size);
-                        ImGui::TableNextColumn();
-                        ImGui::TextUnformatted(node->Type);
-                    }
-                }
-            };
-            static const MyTreeNode nodes[] =
-            {
-                { "Root",                         "Folder",       -1,       1, 3    },  
-                { "Music",                        "Folder",       -1,       4, 2    },  
-                { "Textures",                     "Folder",       -1,       6, 3    },  
-                { "desktop.ini",                  "System file",  1024,    -1,-1    },  
-                { "File1_a.wav",                  "Audio file",   123000,  -1,-1    },  
-                { "File1_b.wav",                  "Audio file",   456000,  -1,-1    },  
-                { "Image001.png",                 "Image file",   203128,  -1,-1    },  
-                { "Copy of Image001.png",         "Image file",   203256,  -1,-1    },  
-                { "Copy of Image001 (Final2).png","Image file",   203512,  -1,-1    },  
-            };
-
-            MyTreeNode::DisplayNode(&nodes[0], nodes);
-
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Item width"))
-    {
-        HelpMarker(
-            "Showcase using PushItemWidth() and how it is preserved on a per-column basis.\n\n"
-            "Note that on auto-resizing non-resizable fixed columns, querying the content width for e.g. right-alignment doesn't make sense.");
-        if (ImGui::BeginTable("table_item_width", 3, ImGuiTableFlags_Borders))
-        {
-            ImGui::TableSetupColumn("small");
-            ImGui::TableSetupColumn("half");
-            ImGui::TableSetupColumn("right-align");
-            ImGui::TableHeadersRow();
-
-            for (int row = 0; row < 3; row++)
-            {
-                ImGui::TableNextRow();
-                if (row == 0)
-                {
-                    ImGui::TableSetColumnIndex(0);
-                    ImGui::PushItemWidth(TEXT_BASE_WIDTH * 3.0f);  
-                    ImGui::TableSetColumnIndex(1);
-                    ImGui::PushItemWidth(-ImGui::GetContentRegionAvail().x * 0.5f);
-                    ImGui::TableSetColumnIndex(2);
-                    ImGui::PushItemWidth(-FLT_MIN);  
-                }
-
-                static float dummy_f = 0.0f;
-                ImGui::PushID(row);
-                ImGui::TableSetColumnIndex(0);
-                ImGui::SliderFloat("float0", &dummy_f, 0.0f, 1.0f);
-                ImGui::TableSetColumnIndex(1);
-                ImGui::SliderFloat("float1", &dummy_f, 0.0f, 1.0f);
-                ImGui::TableSetColumnIndex(2);
-                ImGui::SliderFloat("float2", &dummy_f, 0.0f, 1.0f);
-                ImGui::PopID();
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Custom headers"))
-    {
-        const int COLUMNS_COUNT = 3;
-        if (ImGui::BeginTable("table_custom_headers", COLUMNS_COUNT, ImGuiTableFlags_Borders | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable))
-        {
-            ImGui::TableSetupColumn("Apricot");
-            ImGui::TableSetupColumn("Banana");
-            ImGui::TableSetupColumn("Cherry");
-
-            static bool column_selected[3] = {};
-
-            ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
-            for (int column = 0; column < COLUMNS_COUNT; column++)
-            {
-                ImGui::TableSetColumnIndex(column);
-                const char* column_name = ImGui::TableGetColumnName(column);      
-                ImGui::PushID(column);
-                ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-                ImGui::Checkbox("##checkall", &column_selected[column]);
-                ImGui::PopStyleVar();
-                ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-                ImGui::TableHeader(column_name);
-                ImGui::PopID();
-            }
-
-            for (int row = 0; row < 5; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < 3; column++)
-                {
-                    char buf[32];
-                    sprintf(buf, "Cell %d,%d", column, row);
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Selectable(buf, column_selected[column]);
-                }
-            }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Context menus"))
-    {
-        HelpMarker("By default, right-clicking over a TableHeadersRow()/TableHeader() line will open the default context-menu.\nUsing ImGuiTableFlags_ContextMenuInBody we also allow right-clicking over columns body.");
-        static ImGuiTableFlags flags1 = ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Borders | ImGuiTableFlags_ContextMenuInBody;
-
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_ContextMenuInBody", &flags1, ImGuiTableFlags_ContextMenuInBody);
-        PopStyleCompact();
-
-        const int COLUMNS_COUNT = 3;
-        if (ImGui::BeginTable("table_context_menu", COLUMNS_COUNT, flags1))
-        {
-            ImGui::TableSetupColumn("One");
-            ImGui::TableSetupColumn("Two");
-            ImGui::TableSetupColumn("Three");
-
-            ImGui::TableHeadersRow();
-
-            for (int row = 0; row < 4; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < COLUMNS_COUNT; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("Cell %d,%d", column, row);
-                }
-            }
-            ImGui::EndTable();
-        }
-
-        HelpMarker("Demonstrate mixing table context menu (over header), item context button (over button) and custom per-colum context menu (over column body).");
-        ImGuiTableFlags flags2 = ImGuiTableFlags_Resizable | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Borders;
-        if (ImGui::BeginTable("table_context_menu_2", COLUMNS_COUNT, flags2))
-        {
-            ImGui::TableSetupColumn("One");
-            ImGui::TableSetupColumn("Two");
-            ImGui::TableSetupColumn("Three");
-
-            ImGui::TableHeadersRow();
-            for (int row = 0; row < 4; row++)
-            {
-                ImGui::TableNextRow();
-                for (int column = 0; column < COLUMNS_COUNT; column++)
-                {
-                    ImGui::TableSetColumnIndex(column);
-                    ImGui::Text("Cell %d,%d", column, row);
-                    ImGui::SameLine();
-
-                    ImGui::PushID(row * COLUMNS_COUNT + column);
-                    ImGui::SmallButton("..");
-                    if (ImGui::BeginPopupContextItem())
-                    {
-                        ImGui::Text("This is the popup for Button(\"..\") in Cell %d,%d", column, row);
-                        if (ImGui::Button("Close"))
-                            ImGui::CloseCurrentPopup();
-                        ImGui::EndPopup();
-                    }
-                    ImGui::PopID();
-                }
-            }
-
-            int hovered_column = -1;
-            for (int column = 0; column < COLUMNS_COUNT + 1; column++)
-            {
-                ImGui::PushID(column);
-                if (ImGui::TableGetColumnFlags(column) & ImGuiTableColumnFlags_IsHovered)
-                    hovered_column = column;
-                if (hovered_column == column && !ImGui::IsAnyItemHovered() && ImGui::IsMouseReleased(1))
-                    ImGui::OpenPopup("MyPopup");
-                if (ImGui::BeginPopup("MyPopup"))
-                {
-                    if (column == COLUMNS_COUNT)
-                        ImGui::Text("This is a custom popup for unused space after the last column.");
-                    else
-                        ImGui::Text("This is a custom popup for Column %d", column);
-                    if (ImGui::Button("Close"))
-                        ImGui::CloseCurrentPopup();
-                    ImGui::EndPopup();
-                }
-                ImGui::PopID();
-            }
-
-            ImGui::EndTable();
-            ImGui::Text("Hovered column: %d", hovered_column);
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Synced instances"))
-    {
-        HelpMarker("Multiple tables with the same identifier will share their settings, width, visibility, order etc.");
-        for (int n = 0; n < 3; n++)
-        {
-            char buf[32];
-            sprintf(buf, "Synced Table %d", n);
-            bool open = ImGui::CollapsingHeader(buf, ImGuiTreeNodeFlags_DefaultOpen);
-            if (open && ImGui::BeginTable("Table", 3, ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Borders | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_NoSavedSettings))
-            {
-                ImGui::TableSetupColumn("One");
-                ImGui::TableSetupColumn("Two");
-                ImGui::TableSetupColumn("Three");
-                ImGui::TableHeadersRow();
-                for (int cell = 0; cell < 9; cell++)
-                {
-                    ImGui::TableNextColumn();
-                    ImGui::Text("this cell %d", cell);
-                }
-                ImGui::EndTable();
-            }
-        }
-        ImGui::TreePop();
-    }
-
-    static const char* template_items_names[] =
-    {
-        "Banana", "Apple", "Cherry", "Watermelon", "Grapefruit", "Strawberry", "Mango",
-        "Kiwi", "Orange", "Pineapple", "Blueberry", "Plum", "Coconut", "Pear", "Apricot"
-    };
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Sorting"))
-    {
-        static ImVector<MyItem> items;
-        if (items.Size == 0)
-        {
-            items.resize(50, MyItem());
-            for (int n = 0; n < items.Size; n++)
-            {
-                const int template_n = n % IM_ARRAYSIZE(template_items_names);
-                MyItem& item = items[n];
-                item.ID = n;
-                item.Name = template_items_names[template_n];
-                item.Quantity = (n * n - n) % 20;    
-            }
-        }
-
-        static ImGuiTableFlags flags =
-            ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Sortable | ImGuiTableFlags_SortMulti
-            | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_NoBordersInBody
-            | ImGuiTableFlags_ScrollY;
-        PushStyleCompact();
-        ImGui::CheckboxFlags("ImGuiTableFlags_SortMulti", &flags, ImGuiTableFlags_SortMulti);
-        ImGui::SameLine(); HelpMarker("When sorting is enabled: hold shift when clicking headers to sort on multiple column. TableGetSortSpecs() may return specs where (SpecsCount > 1).");
-        ImGui::CheckboxFlags("ImGuiTableFlags_SortTristate", &flags, ImGuiTableFlags_SortTristate);
-        ImGui::SameLine(); HelpMarker("When sorting is enabled: allow no sorting, disable default sorting. TableGetSortSpecs() may return specs where (SpecsCount == 0).");
-        PopStyleCompact();
-
-        if (ImGui::BeginTable("table_sorting", 4, flags, ImVec2(0.0f, TEXT_BASE_HEIGHT * 15), 0.0f))
-        {
-            ImGui::TableSetupColumn("ID",       ImGuiTableColumnFlags_DefaultSort          | ImGuiTableColumnFlags_WidthFixed,   0.0f, MyItemColumnID_ID);
-            ImGui::TableSetupColumn("Name",                                                  ImGuiTableColumnFlags_WidthFixed,   0.0f, MyItemColumnID_Name);
-            ImGui::TableSetupColumn("Action",   ImGuiTableColumnFlags_NoSort               | ImGuiTableColumnFlags_WidthFixed,   0.0f, MyItemColumnID_Action);
-            ImGui::TableSetupColumn("Quantity", ImGuiTableColumnFlags_PreferSortDescending | ImGuiTableColumnFlags_WidthStretch, 0.0f, MyItemColumnID_Quantity);
-            ImGui::TableSetupScrollFreeze(0, 1);     
-            ImGui::TableHeadersRow();
-
-            if (ImGuiTableSortSpecs* sorts_specs = ImGui::TableGetSortSpecs())
-                if (sorts_specs->SpecsDirty)
-                {
-                    MyItem::s_current_sort_specs = sorts_specs;         
-                    if (items.Size > 1)
-                        qsort(&items[0], (size_t)items.Size, sizeof(items[0]), MyItem::CompareWithSortSpecs);
-                    MyItem::s_current_sort_specs = NULL;
-                    sorts_specs->SpecsDirty = false;
-                }
-
-            ImGuiListClipper clipper;
-            clipper.Begin(items.Size);
-            while (clipper.Step())
-                for (int row_n = clipper.DisplayStart; row_n < clipper.DisplayEnd; row_n++)
-                {
-                    MyItem* item = &items[row_n];
-                    ImGui::PushID(item->ID);
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-                    ImGui::Text("%04d", item->ID);
-                    ImGui::TableNextColumn();
-                    ImGui::TextUnformatted(item->Name);
-                    ImGui::TableNextColumn();
-                    ImGui::SmallButton("None");
-                    ImGui::TableNextColumn();
-                    ImGui::Text("%d", item->Quantity);
-                    ImGui::PopID();
-                }
-            ImGui::EndTable();
-        }
-        ImGui::TreePop();
-    }
-
-    if (open_action != -1)
-        ImGui::SetNextItemOpen(open_action != 0);
-    if (ImGui::TreeNode("Advanced"))
-    {
-        static ImGuiTableFlags flags =
-            ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable
-            | ImGuiTableFlags_Sortable | ImGuiTableFlags_SortMulti
-            | ImGuiTableFlags_RowBg | ImGuiTableFlags_Borders | ImGuiTableFlags_NoBordersInBody
-            | ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY
-            | ImGuiTableFlags_SizingFixedFit;
-
-        enum ContentsType { CT_Text, CT_Button, CT_SmallButton, CT_FillButton, CT_Selectable, CT_SelectableSpanRow };
-        static int contents_type = CT_SelectableSpanRow;
-        const char* contents_type_names[] = { "Text", "Button", "SmallButton", "FillButton", "Selectable", "Selectable (span row)" };
-        static int freeze_cols = 1;
-        static int freeze_rows = 1;
-        static int items_count = IM_ARRAYSIZE(template_items_names) * 2;
-        static ImVec2 outer_size_value = ImVec2(0.0f, TEXT_BASE_HEIGHT * 12);
-        static float row_min_height = 0.0f;  
-        static float inner_width_with_scroll = 0.0f;  
-        static bool outer_size_enabled = true;
-        static bool show_headers = true;
-        static bool show_wrapped_text = false;
-        if (ImGui::TreeNode("Options"))
-        {
-            PushStyleCompact();
-            ImGui::PushItemWidth(TEXT_BASE_WIDTH * 28.0f);
-
-            if (ImGui::TreeNodeEx("Features:", ImGuiTreeNodeFlags_DefaultOpen))
-            {
-                ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable);
-                ImGui::CheckboxFlags("ImGuiTableFlags_Reorderable", &flags, ImGuiTableFlags_Reorderable);
-                ImGui::CheckboxFlags("ImGuiTableFlags_Hideable", &flags, ImGuiTableFlags_Hideable);
-                ImGui::CheckboxFlags("ImGuiTableFlags_Sortable", &flags, ImGuiTableFlags_Sortable);
-                ImGui::CheckboxFlags("ImGuiTableFlags_NoSavedSettings", &flags, ImGuiTableFlags_NoSavedSettings);
-                ImGui::CheckboxFlags("ImGuiTableFlags_ContextMenuInBody", &flags, ImGuiTableFlags_ContextMenuInBody);
-                ImGui::TreePop();
-            }
-
-            if (ImGui::TreeNodeEx("Decorations:", ImGuiTreeNodeFlags_DefaultOpen))
-            {
-                ImGui::CheckboxFlags("ImGuiTableFlags_RowBg", &flags, ImGuiTableFlags_RowBg);
-                ImGui::CheckboxFlags("ImGuiTableFlags_BordersV", &flags, ImGuiTableFlags_BordersV);
-                ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterV", &flags, ImGuiTableFlags_BordersOuterV);
-                ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerV", &flags, ImGuiTableFlags_BordersInnerV);
-                ImGui::CheckboxFlags("ImGuiTableFlags_BordersH", &flags, ImGuiTableFlags_BordersH);
-                ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterH", &flags, ImGuiTableFlags_BordersOuterH);
-                ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerH", &flags, ImGuiTableFlags_BordersInnerH);
-                ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBody", &flags, ImGuiTableFlags_NoBordersInBody); ImGui::SameLine(); HelpMarker("Disable vertical borders in columns Body (borders will always appears in Headers");
-                ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBodyUntilResize", &flags, ImGuiTableFlags_NoBordersInBodyUntilResize); ImGui::SameLine(); HelpMarker("Disable vertical borders in columns Body until hovered for resize (borders will always appears in Headers)");
-                ImGui::TreePop();
-            }
-
-            if (ImGui::TreeNodeEx("Sizing:", ImGuiTreeNodeFlags_DefaultOpen))
-            {
-                EditTableSizingFlags(&flags);
-                ImGui::SameLine(); HelpMarker("In the Advanced demo we override the policy of each column so those table-wide settings have less effect that typical.");
-                ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendX", &flags, ImGuiTableFlags_NoHostExtendX);
-                ImGui::SameLine(); HelpMarker("Make outer width auto-fit to columns, overriding outer_size.x value.\n\nOnly available when ScrollX/ScrollY are disabled and Stretch columns are not used.");
-                ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendY", &flags, ImGuiTableFlags_NoHostExtendY);
-                ImGui::SameLine(); HelpMarker("Make outer height stop exactly at outer_size.y (prevent auto-extending table past the limit).\n\nOnly available when ScrollX/ScrollY are disabled. Data below the limit will be clipped and not visible.");
-                ImGui::CheckboxFlags("ImGuiTableFlags_NoKeepColumnsVisible", &flags, ImGuiTableFlags_NoKeepColumnsVisible);
-                ImGui::SameLine(); HelpMarker("Only available if ScrollX is disabled.");
-                ImGui::CheckboxFlags("ImGuiTableFlags_PreciseWidths", &flags, ImGuiTableFlags_PreciseWidths);
-                ImGui::SameLine(); HelpMarker("Disable distributing remainder width to stretched columns (width allocation on a 100-wide table with 3 columns: Without this flag: 33,33,34. With this flag: 33,33,33). With larger number of columns, resizing will appear to be less smooth.");
-                ImGui::CheckboxFlags("ImGuiTableFlags_NoClip", &flags, ImGuiTableFlags_NoClip);
-                ImGui::SameLine(); HelpMarker("Disable clipping rectangle for every individual columns (reduce draw command count, items will be able to overflow into other columns). Generally incompatible with ScrollFreeze options.");
-                ImGui::TreePop();
-            }
-
-            if (ImGui::TreeNodeEx("Padding:", ImGuiTreeNodeFlags_DefaultOpen))
-            {
-                ImGui::CheckboxFlags("ImGuiTableFlags_PadOuterX", &flags, ImGuiTableFlags_PadOuterX);
-                ImGui::CheckboxFlags("ImGuiTableFlags_NoPadOuterX", &flags, ImGuiTableFlags_NoPadOuterX);
-                ImGui::CheckboxFlags("ImGuiTableFlags_NoPadInnerX", &flags, ImGuiTableFlags_NoPadInnerX);
-                ImGui::TreePop();
-            }
-
-            if (ImGui::TreeNodeEx("Scrolling:", ImGuiTreeNodeFlags_DefaultOpen))
-            {
-                ImGui::CheckboxFlags("ImGuiTableFlags_ScrollX", &flags, ImGuiTableFlags_ScrollX);
-                ImGui::SameLine();
-                ImGui::SetNextItemWidth(ImGui::GetFrameHeight());
-                ImGui::DragInt("freeze_cols", &freeze_cols, 0.2f, 0, 9, NULL, ImGuiSliderFlags_NoInput);
-                ImGui::CheckboxFlags("ImGuiTableFlags_ScrollY", &flags, ImGuiTableFlags_ScrollY);
-                ImGui::SameLine();
-                ImGui::SetNextItemWidth(ImGui::GetFrameHeight());
-                ImGui::DragInt("freeze_rows", &freeze_rows, 0.2f, 0, 9, NULL, ImGuiSliderFlags_NoInput);
-                ImGui::TreePop();
-            }
-
-            if (ImGui::TreeNodeEx("Sorting:", ImGuiTreeNodeFlags_DefaultOpen))
-            {
-                ImGui::CheckboxFlags("ImGuiTableFlags_SortMulti", &flags, ImGuiTableFlags_SortMulti);
-                ImGui::SameLine(); HelpMarker("When sorting is enabled: hold shift when clicking headers to sort on multiple column. TableGetSortSpecs() may return specs where (SpecsCount > 1).");
-                ImGui::CheckboxFlags("ImGuiTableFlags_SortTristate", &flags, ImGuiTableFlags_SortTristate);
-                ImGui::SameLine(); HelpMarker("When sorting is enabled: allow no sorting, disable default sorting. TableGetSortSpecs() may return specs where (SpecsCount == 0).");
-                ImGui::TreePop();
-            }
-
-            if (ImGui::TreeNodeEx("Other:", ImGuiTreeNodeFlags_DefaultOpen))
-            {
-                ImGui::Checkbox("show_headers", &show_headers);
-                ImGui::Checkbox("show_wrapped_text", &show_wrapped_text);
-
-                ImGui::DragFloat2("##OuterSize", &outer_size_value.x);
-                ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-                ImGui::Checkbox("outer_size", &outer_size_enabled);
-                ImGui::SameLine();
-                HelpMarker("If scrolling is disabled (ScrollX and ScrollY not set):\n"
-                    "- The table is output directly in the parent window.\n"
-                    "- OuterSize.x < 0.0f will right-align the table.\n"
-                    "- OuterSize.x = 0.0f will narrow fit the table unless there are any Stretch column.\n"
-                    "- OuterSize.y then becomes the minimum size for the table, which will extend vertically if there are more rows (unless NoHostExtendY is set).");
-
-                ImGui::DragFloat("inner_width (when ScrollX active)", &inner_width_with_scroll, 1.0f, 0.0f, FLT_MAX);
-
-                ImGui::DragFloat("row_min_height", &row_min_height, 1.0f, 0.0f, FLT_MAX);
-                ImGui::SameLine(); HelpMarker("Specify height of the Selectable item.");
-
-                ImGui::DragInt("items_count", &items_count, 0.1f, 0, 9999);
-                ImGui::Combo("items_type (first column)", &contents_type, contents_type_names, IM_ARRAYSIZE(contents_type_names));
-                ImGui::TreePop();
-            }
-
-            ImGui::PopItemWidth();
-            PopStyleCompact();
-            ImGui::Spacing();
-            ImGui::TreePop();
-        }
-
-        static ImVector<MyItem> items;
-        static ImVector<int> selection;
-        static bool items_need_sort = false;
-        if (items.Size != items_count)
-        {
-            items.resize(items_count, MyItem());
-            for (int n = 0; n < items_count; n++)
-            {
-                const int template_n = n % IM_ARRAYSIZE(template_items_names);
-                MyItem& item = items[n];
-                item.ID = n;
-                item.Name = template_items_names[template_n];
-                item.Quantity = (template_n == 3) ? 10 : (template_n == 4) ? 20 : 0;    
-            }
-        }
-
-        const ImDrawList* parent_draw_list = ImGui::GetWindowDrawList();
-        const int parent_draw_list_draw_cmd_count = parent_draw_list->CmdBuffer.Size;
-        ImVec2 table_scroll_cur, table_scroll_max;    
-        const ImDrawList* table_draw_list = NULL;   
-
-        const float inner_width_to_use = (flags & ImGuiTableFlags_ScrollX) ? inner_width_with_scroll : 0.0f;
-        if (ImGui::BeginTable("table_advanced", 6, flags, outer_size_enabled ? outer_size_value : ImVec2(0, 0), inner_width_to_use))
-        {
-            ImGui::TableSetupColumn("ID",           ImGuiTableColumnFlags_DefaultSort | ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoHide, 0.0f, MyItemColumnID_ID);
-            ImGui::TableSetupColumn("Name",         ImGuiTableColumnFlags_WidthFixed, 0.0f, MyItemColumnID_Name);
-            ImGui::TableSetupColumn("Action",       ImGuiTableColumnFlags_NoSort | ImGuiTableColumnFlags_WidthFixed, 0.0f, MyItemColumnID_Action);
-            ImGui::TableSetupColumn("Quantity",     ImGuiTableColumnFlags_PreferSortDescending, 0.0f, MyItemColumnID_Quantity);
-            ImGui::TableSetupColumn("Description",  (flags & ImGuiTableFlags_NoHostExtendX) ? 0 : ImGuiTableColumnFlags_WidthStretch, 0.0f, MyItemColumnID_Description);
-            ImGui::TableSetupColumn("Hidden",       ImGuiTableColumnFlags_DefaultHide | ImGuiTableColumnFlags_NoSort);
-            ImGui::TableSetupScrollFreeze(freeze_cols, freeze_rows);
-
-            ImGuiTableSortSpecs* sorts_specs = ImGui::TableGetSortSpecs();
-            if (sorts_specs && sorts_specs->SpecsDirty)
-                items_need_sort = true;
-            if (sorts_specs && items_need_sort && items.Size > 1)
-            {
-                MyItem::s_current_sort_specs = sorts_specs;         
-                qsort(&items[0], (size_t)items.Size, sizeof(items[0]), MyItem::CompareWithSortSpecs);
-                MyItem::s_current_sort_specs = NULL;
-                sorts_specs->SpecsDirty = false;
-            }
-            items_need_sort = false;
-
-            const bool sorts_specs_using_quantity = (ImGui::TableGetColumnFlags(3) & ImGuiTableColumnFlags_IsSorted) != 0;
-
-            if (show_headers)
-                ImGui::TableHeadersRow();
-
-            ImGui::PushButtonRepeat(true);
-#if 1
-            ImGuiListClipper clipper;
-            clipper.Begin(items.Size);
-            while (clipper.Step())
-            {
-                for (int row_n = clipper.DisplayStart; row_n < clipper.DisplayEnd; row_n++)
-#else
-            {
-                for (int row_n = 0; row_n < items.Size; row_n++)
-#endif
-                {
-                    MyItem* item = &items[row_n];
-                    const bool item_is_selected = selection.contains(item->ID);
-                    ImGui::PushID(item->ID);
-                    ImGui::TableNextRow(ImGuiTableRowFlags_None, row_min_height);
-                    ImGui::TableNextColumn();
-
-                    char label[32];
-                    sprintf(label, "%04d", item->ID);
-                    if (contents_type == CT_Text)
-                        ImGui::TextUnformatted(label);
-                    else if (contents_type == CT_Button)
-                        ImGui::Button(label);
-                    else if (contents_type == CT_SmallButton)
-                        ImGui::SmallButton(label);
-                    else if (contents_type == CT_FillButton)
-                        ImGui::Button(label, ImVec2(-FLT_MIN, 0.0f));
-                    else if (contents_type == CT_Selectable || contents_type == CT_SelectableSpanRow)
-                    {
-                        ImGuiSelectableFlags selectable_flags = (contents_type == CT_SelectableSpanRow) ? ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap : ImGuiSelectableFlags_None;
-                        if (ImGui::Selectable(label, item_is_selected, selectable_flags, ImVec2(0, row_min_height)))
-                        {
-                            if (ImGui::GetIO().KeyCtrl)
-                            {
-                                if (item_is_selected)
-                                    selection.find_erase_unsorted(item->ID);
-                                else
-                                    selection.push_back(item->ID);
-                            }
-                            else
-                            {
-                                selection.clear();
-                                selection.push_back(item->ID);
-                            }
-                        }
-                    }
-
-                    if (ImGui::TableNextColumn())
-                        ImGui::TextUnformatted(item->Name);
-
-                    if (ImGui::TableNextColumn())
-                    {
-                        if (ImGui::SmallButton("Chop")) { item->Quantity += 1; }
-                        if (sorts_specs_using_quantity && ImGui::IsItemDeactivated()) { items_need_sort = true; }
-                        ImGui::SameLine();
-                        if (ImGui::SmallButton("Eat")) { item->Quantity -= 1; }
-                        if (sorts_specs_using_quantity && ImGui::IsItemDeactivated()) { items_need_sort = true; }
-                    }
-
-                    if (ImGui::TableNextColumn())
-                        ImGui::Text("%d", item->Quantity);
-
-                    ImGui::TableNextColumn();
-                    if (show_wrapped_text)
-                        ImGui::TextWrapped("Lorem ipsum dolor sit amet");
-                    else
-                        ImGui::Text("Lorem ipsum dolor sit amet");
-
-                    if (ImGui::TableNextColumn())
-                        ImGui::Text("1234");
-
-                    ImGui::PopID();
-                }
-            }
-            ImGui::PopButtonRepeat();
-
-            table_scroll_cur = ImVec2(ImGui::GetScrollX(), ImGui::GetScrollY());
-            table_scroll_max = ImVec2(ImGui::GetScrollMaxX(), ImGui::GetScrollMaxY());
-            table_draw_list = ImGui::GetWindowDrawList();
-            ImGui::EndTable();
-        }
-        static bool show_debug_details = false;
-        ImGui::Checkbox("Debug details", &show_debug_details);
-        if (show_debug_details && table_draw_list)
-        {
-            ImGui::SameLine(0.0f, 0.0f);
-            const int table_draw_list_draw_cmd_count = table_draw_list->CmdBuffer.Size;
-            if (table_draw_list == parent_draw_list)
-                ImGui::Text(": DrawCmd: +%d (in same window)",
-                    table_draw_list_draw_cmd_count - parent_draw_list_draw_cmd_count);
-            else
-                ImGui::Text(": DrawCmd: +%d (in child window), Scroll: (%.f/%.f) (%.f/%.f)",
-                    table_draw_list_draw_cmd_count - 1, table_scroll_cur.x, table_scroll_max.x, table_scroll_cur.y, table_scroll_max.y);
-        }
-        ImGui::TreePop();
-    }
-
-    ImGui::PopID();
-
-    ShowDemoWindowColumns();
-
-    if (disable_indent)
-        ImGui::PopStyleVar();
-}
-
-static void ShowDemoWindowColumns()
-{
-    bool open = ImGui::TreeNode("Legacy Columns API");
-    ImGui::SameLine();
-    HelpMarker("Columns() is an old API! Prefer using the more flexible and powerful BeginTable() API!");
-    if (!open)
-        return;
-
-    if (ImGui::TreeNode("Basic"))
-    {
-        ImGui::Text("Without border:");
-        ImGui::Columns(3, "mycolumns3", false);     
-        ImGui::Separator();
-        for (int n = 0; n < 14; n++)
-        {
-            char label[32];
-            sprintf(label, "Item %d", n);
-            if (ImGui::Selectable(label)) {}
-            ImGui::NextColumn();
-        }
-        ImGui::Columns(1);
-        ImGui::Separator();
-
-        ImGui::Text("With border:");
-        ImGui::Columns(4, "mycolumns");    
-        ImGui::Separator();
-        ImGui::Text("ID"); ImGui::NextColumn();
-        ImGui::Text("Name"); ImGui::NextColumn();
-        ImGui::Text("Path"); ImGui::NextColumn();
-        ImGui::Text("Hovered"); ImGui::NextColumn();
-        ImGui::Separator();
-        const char* names[3] = { "One", "Two", "Three" };
-        const char* paths[3] = { "/path/one", "/path/two", "/path/three" };
-        static int selected = -1;
-        for (int i = 0; i < 3; i++)
-        {
-            char label[32];
-            sprintf(label, "%04d", i);
-            if (ImGui::Selectable(label, selected == i, ImGuiSelectableFlags_SpanAllColumns))
-                selected = i;
-            bool hovered = ImGui::IsItemHovered();
-            ImGui::NextColumn();
-            ImGui::Text(names[i]); ImGui::NextColumn();
-            ImGui::Text(paths[i]); ImGui::NextColumn();
-            ImGui::Text("%d", hovered); ImGui::NextColumn();
-        }
-        ImGui::Columns(1);
-        ImGui::Separator();
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Borders"))
-    {
-        static bool h_borders = true;
-        static bool v_borders = true;
-        static int columns_count = 4;
-        const int lines_count = 3;
-        ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8);
-        ImGui::DragInt("##columns_count", &columns_count, 0.1f, 2, 10, "%d columns");
-        if (columns_count < 2)
-            columns_count = 2;
-        ImGui::SameLine();
-        ImGui::Checkbox("horizontal", &h_borders);
-        ImGui::SameLine();
-        ImGui::Checkbox("vertical", &v_borders);
-        ImGui::Columns(columns_count, NULL, v_borders);
-        for (int i = 0; i < columns_count * lines_count; i++)
-        {
-            if (h_borders && ImGui::GetColumnIndex() == 0)
-                ImGui::Separator();
-            ImGui::Text("%c%c%c", 'a' + i, 'a' + i, 'a' + i);
-            ImGui::Text("Width %.2f", ImGui::GetColumnWidth());
-            ImGui::Text("Avail %.2f", ImGui::GetContentRegionAvail().x);
-            ImGui::Text("Offset %.2f", ImGui::GetColumnOffset());
-            ImGui::Text("Long text that is likely to clip");
-            ImGui::Button("Button", ImVec2(-FLT_MIN, 0.0f));
-            ImGui::NextColumn();
-        }
-        ImGui::Columns(1);
-        if (h_borders)
-            ImGui::Separator();
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Mixed items"))
-    {
-        ImGui::Columns(3, "mixed");
-        ImGui::Separator();
-
-        ImGui::Text("Hello");
-        ImGui::Button("Banana");
-        ImGui::NextColumn();
-
-        ImGui::Text("ImGui");
-        ImGui::Button("Apple");
-        static float foo = 1.0f;
-        ImGui::InputFloat("red", &foo, 0.05f, 0, "%.3f");
-        ImGui::Text("An extra line here.");
-        ImGui::NextColumn();
-
-        ImGui::Text("Sailor");
-        ImGui::Button("Corniflower");
-        static float bar = 1.0f;
-        ImGui::InputFloat("blue", &bar, 0.05f, 0, "%.3f");
-        ImGui::NextColumn();
-
-        if (ImGui::CollapsingHeader("Category A")) { ImGui::Text("Blah blah blah"); } ImGui::NextColumn();
-        if (ImGui::CollapsingHeader("Category B")) { ImGui::Text("Blah blah blah"); } ImGui::NextColumn();
-        if (ImGui::CollapsingHeader("Category C")) { ImGui::Text("Blah blah blah"); } ImGui::NextColumn();
-        ImGui::Columns(1);
-        ImGui::Separator();
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Word-wrapping"))
-    {
-        ImGui::Columns(2, "word-wrapping");
-        ImGui::Separator();
-        ImGui::TextWrapped("The quick brown fox jumps over the lazy dog.");
-        ImGui::TextWrapped("Hello Left");
-        ImGui::NextColumn();
-        ImGui::TextWrapped("The quick brown fox jumps over the lazy dog.");
-        ImGui::TextWrapped("Hello Right");
-        ImGui::Columns(1);
-        ImGui::Separator();
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Horizontal Scrolling"))
-    {
-        ImGui::SetNextWindowContentSize(ImVec2(1500.0f, 0.0f));
-        ImVec2 child_size = ImVec2(0, ImGui::GetFontSize() * 20.0f);
-        ImGui::BeginChild("##ScrollingRegion", child_size, false, ImGuiWindowFlags_HorizontalScrollbar);
-        ImGui::Columns(10);
-
-        int ITEMS_COUNT = 2000;
-        ImGuiListClipper clipper;
-        clipper.Begin(ITEMS_COUNT);
-        while (clipper.Step())
-        {
-            for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
-                for (int j = 0; j < 10; j++)
-                {
-                    ImGui::Text("Line %d Column %d...", i, j);
-                    ImGui::NextColumn();
-                }
-        }
-        ImGui::Columns(1);
-        ImGui::EndChild();
-        ImGui::TreePop();
-    }
-
-    if (ImGui::TreeNode("Tree"))
-    {
-        ImGui::Columns(2, "tree", true);
-        for (int x = 0; x < 3; x++)
-        {
-            bool open1 = ImGui::TreeNode((void*)(intptr_t)x, "Node%d", x);
-            ImGui::NextColumn();
-            ImGui::Text("Node contents");
-            ImGui::NextColumn();
-            if (open1)
-            {
-                for (int y = 0; y < 3; y++)
-                {
-                    bool open2 = ImGui::TreeNode((void*)(intptr_t)y, "Node%d.%d", x, y);
-                    ImGui::NextColumn();
-                    ImGui::Text("Node contents");
-                    if (open2)
-                    {
-                        ImGui::Text("Even more contents");
-                        if (ImGui::TreeNode("Tree in column"))
-                        {
-                            ImGui::Text("The quick brown fox jumps over the lazy dog");
-                            ImGui::TreePop();
-                        }
-                    }
-                    ImGui::NextColumn();
-                    if (open2)
-                        ImGui::TreePop();
-                }
-                ImGui::TreePop();
-            }
-        }
-        ImGui::Columns(1);
-        ImGui::TreePop();
-    }
-
-    ImGui::TreePop();
-}
-
-static void ShowDemoWindowMisc()
-{
-    if (ImGui::CollapsingHeader("Filtering"))
-    {
-        static ImGuiTextFilter filter;
-        ImGui::Text("Filter usage:\n"
-                    "  \"\"         display all lines\n"
-                    "  \"xxx\"      display lines containing \"xxx\"\n"
-                    "  \"xxx,yyy\"  display lines containing \"xxx\" or \"yyy\"\n"
-                    "  \"-xxx\"     hide lines containing \"xxx\"");
-        filter.Draw();
-        const char* lines[] = { "aaa1.c", "bbb1.c", "ccc1.c", "aaa2.cpp", "bbb2.cpp", "ccc2.cpp", "abc.h", "hello, world" };
-        for (int i = 0; i < IM_ARRAYSIZE(lines); i++)
-            if (filter.PassFilter(lines[i]))
-                ImGui::BulletText("%s", lines[i]);
-    }
-
-    if (ImGui::CollapsingHeader("Inputs, Navigation & Focus"))
-    {
-        ImGuiIO& io = ImGui::GetIO();
-
-        ImGui::Text("WantCaptureMouse: %d", io.WantCaptureMouse);
-        ImGui::Text("WantCaptureKeyboard: %d", io.WantCaptureKeyboard);
-        ImGui::Text("WantTextInput: %d", io.WantTextInput);
-        ImGui::Text("WantSetMousePos: %d", io.WantSetMousePos);
-        ImGui::Text("NavActive: %d, NavVisible: %d", io.NavActive, io.NavVisible);
-
-        if (ImGui::TreeNode("Keyboard, Mouse & Navigation State"))
-        {
-            if (ImGui::IsMousePosValid())
-                ImGui::Text("Mouse pos: (%g, %g)", io.MousePos.x, io.MousePos.y);
-            else
-                ImGui::Text("Mouse pos: <INVALID>");
-            ImGui::Text("Mouse delta: (%g, %g)", io.MouseDelta.x, io.MouseDelta.y);
-            ImGui::Text("Mouse down:");     for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (io.MouseDownDuration[i] >= 0.0f)   { ImGui::SameLine(); ImGui::Text("b%d (%.02f secs)", i, io.MouseDownDuration[i]); }
-            ImGui::Text("Mouse clicked:");  for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (ImGui::IsMouseClicked(i))          { ImGui::SameLine(); ImGui::Text("b%d", i); }
-            ImGui::Text("Mouse dblclick:"); for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (ImGui::IsMouseDoubleClicked(i))    { ImGui::SameLine(); ImGui::Text("b%d", i); }
-            ImGui::Text("Mouse released:"); for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (ImGui::IsMouseReleased(i))         { ImGui::SameLine(); ImGui::Text("b%d", i); }
-            ImGui::Text("Mouse wheel: %.1f", io.MouseWheel);
-
-            ImGui::Text("Keys down:");      for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (io.KeysDownDuration[i] >= 0.0f)     { ImGui::SameLine(); ImGui::Text("%d (0x%X) (%.02f secs)", i, i, io.KeysDownDuration[i]); }
-            ImGui::Text("Keys pressed:");   for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (ImGui::IsKeyPressed(i))             { ImGui::SameLine(); ImGui::Text("%d (0x%X)", i, i); }
-            ImGui::Text("Keys release:");   for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (ImGui::IsKeyReleased(i))            { ImGui::SameLine(); ImGui::Text("%d (0x%X)", i, i); }
-            ImGui::Text("Keys mods: %s%s%s%s", io.KeyCtrl ? "CTRL " : "", io.KeyShift ? "SHIFT " : "", io.KeyAlt ? "ALT " : "", io.KeySuper ? "SUPER " : "");
-            ImGui::Text("Chars queue:");    for (int i = 0; i < io.InputQueueCharacters.Size; i++) { ImWchar c = io.InputQueueCharacters[i]; ImGui::SameLine();  ImGui::Text("\'%c\' (0x%04X)", (c > ' ' && c <= 255) ? (char)c : '?', c); }               
-
-            ImGui::Text("NavInputs down:");     for (int i = 0; i < IM_ARRAYSIZE(io.NavInputs); i++) if (io.NavInputs[i] > 0.0f)              { ImGui::SameLine(); ImGui::Text("[%d] %.2f", i, io.NavInputs[i]); }
-            ImGui::Text("NavInputs pressed:");  for (int i = 0; i < IM_ARRAYSIZE(io.NavInputs); i++) if (io.NavInputsDownDuration[i] == 0.0f) { ImGui::SameLine(); ImGui::Text("[%d]", i); }
-            ImGui::Text("NavInputs duration:"); for (int i = 0; i < IM_ARRAYSIZE(io.NavInputs); i++) if (io.NavInputsDownDuration[i] >= 0.0f) { ImGui::SameLine(); ImGui::Text("[%d] %.2f", i, io.NavInputsDownDuration[i]); }
-
-            ImGui::Button("Hovering me sets the\nkeyboard capture flag");
-            if (ImGui::IsItemHovered())
-                ImGui::CaptureKeyboardFromApp(true);
-            ImGui::SameLine();
-            ImGui::Button("Holding me clears the\nthe keyboard capture flag");
-            if (ImGui::IsItemActive())
-                ImGui::CaptureKeyboardFromApp(false);
-
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Tabbing"))
-        {
-            ImGui::Text("Use TAB/SHIFT+TAB to cycle through keyboard editable fields.");
-            static char buf[32] = "hello";
-            ImGui::InputText("1", buf, IM_ARRAYSIZE(buf));
-            ImGui::InputText("2", buf, IM_ARRAYSIZE(buf));
-            ImGui::InputText("3", buf, IM_ARRAYSIZE(buf));
-            ImGui::PushAllowKeyboardFocus(false);
-            ImGui::InputText("4 (tab skip)", buf, IM_ARRAYSIZE(buf));
-            ImGui::PopAllowKeyboardFocus();
-            ImGui::InputText("5", buf, IM_ARRAYSIZE(buf));
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Focus from code"))
-        {
-            bool focus_1 = ImGui::Button("Focus on 1"); ImGui::SameLine();
-            bool focus_2 = ImGui::Button("Focus on 2"); ImGui::SameLine();
-            bool focus_3 = ImGui::Button("Focus on 3");
-            int has_focus = 0;
-            static char buf[128] = "click on a button to set focus";
-
-            if (focus_1) ImGui::SetKeyboardFocusHere();
-            ImGui::InputText("1", buf, IM_ARRAYSIZE(buf));
-            if (ImGui::IsItemActive()) has_focus = 1;
-
-            if (focus_2) ImGui::SetKeyboardFocusHere();
-            ImGui::InputText("2", buf, IM_ARRAYSIZE(buf));
-            if (ImGui::IsItemActive()) has_focus = 2;
-
-            ImGui::PushAllowKeyboardFocus(false);
-            if (focus_3) ImGui::SetKeyboardFocusHere();
-            ImGui::InputText("3 (tab skip)", buf, IM_ARRAYSIZE(buf));
-            if (ImGui::IsItemActive()) has_focus = 3;
-            ImGui::PopAllowKeyboardFocus();
-
-            if (has_focus)
-                ImGui::Text("Item with focus: %d", has_focus);
-            else
-                ImGui::Text("Item with focus: <none>");
-
-            static float f3[3] = { 0.0f, 0.0f, 0.0f };
-            int focus_ahead = -1;
-            if (ImGui::Button("Focus on X")) { focus_ahead = 0; } ImGui::SameLine();
-            if (ImGui::Button("Focus on Y")) { focus_ahead = 1; } ImGui::SameLine();
-            if (ImGui::Button("Focus on Z")) { focus_ahead = 2; }
-            if (focus_ahead != -1) ImGui::SetKeyboardFocusHere(focus_ahead);
-            ImGui::SliderFloat3("Float3", &f3[0], 0.0f, 1.0f);
-
-            ImGui::TextWrapped("NB: Cursor & selection are preserved when refocusing last used item in code.");
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Dragging"))
-        {
-            ImGui::TextWrapped("You can use ImGui::GetMouseDragDelta(0) to query for the dragged amount on any widget.");
-            for (int button = 0; button < 3; button++)
-            {
-                ImGui::Text("IsMouseDragging(%d):", button);
-                ImGui::Text("  w/ default threshold: %d,", ImGui::IsMouseDragging(button));
-                ImGui::Text("  w/ zero threshold: %d,", ImGui::IsMouseDragging(button, 0.0f));
-                ImGui::Text("  w/ large threshold: %d,", ImGui::IsMouseDragging(button, 20.0f));
-            }
-
-            ImGui::Button("Drag Me");
-            if (ImGui::IsItemActive())
-                ImGui::GetForegroundDrawList()->AddLine(io.MouseClickedPos[0], io.MousePos, ImGui::GetColorU32(ImGuiCol_Button), 4.0f);           
-
-            ImVec2 value_raw = ImGui::GetMouseDragDelta(0, 0.0f);
-            ImVec2 value_with_lock_threshold = ImGui::GetMouseDragDelta(0);
-            ImVec2 mouse_delta = io.MouseDelta;
-            ImGui::Text("GetMouseDragDelta(0):");
-            ImGui::Text("  w/ default threshold: (%.1f, %.1f)", value_with_lock_threshold.x, value_with_lock_threshold.y);
-            ImGui::Text("  w/ zero threshold: (%.1f, %.1f)", value_raw.x, value_raw.y);
-            ImGui::Text("io.MouseDelta: (%.1f, %.1f)", mouse_delta.x, mouse_delta.y);
-            ImGui::TreePop();
-        }
-
-        if (ImGui::TreeNode("Mouse cursors"))
-        {
-            const char* mouse_cursors_names[] = { "Arrow", "TextInput", "ResizeAll", "ResizeNS", "ResizeEW", "ResizeNESW", "ResizeNWSE", "Hand", "NotAllowed" };
-            IM_ASSERT(IM_ARRAYSIZE(mouse_cursors_names) == ImGuiMouseCursor_COUNT);
-
-            ImGuiMouseCursor current = ImGui::GetMouseCursor();
-            ImGui::Text("Current mouse cursor = %d: %s", current, mouse_cursors_names[current]);
-            ImGui::Text("Hover to see mouse cursors:");
-            ImGui::SameLine(); HelpMarker(
-                "Your application can render a different mouse cursor based on what ImGui::GetMouseCursor() returns. "
-                "If software cursor rendering (io.MouseDrawCursor) is set ImGui will draw the right cursor for you, "
-                "otherwise your backend needs to handle it.");
-            for (int i = 0; i < ImGuiMouseCursor_COUNT; i++)
-            {
-                char label[32];
-                sprintf(label, "Mouse cursor %d: %s", i, mouse_cursors_names[i]);
-                ImGui::Bullet(); ImGui::Selectable(label, false);
-                if (ImGui::IsItemHovered())
-                    ImGui::SetMouseCursor(i);
-            }
-            ImGui::TreePop();
-        }
-    }
-}
-
-void ImGui::ShowAboutWindow(bool* p_open)
-{
-    if (!ImGui::Begin("About Dear ImGui", p_open, ImGuiWindowFlags_AlwaysAutoResize))
-    {
-        ImGui::End();
-        return;
-    }
-    ImGui::Text("Dear ImGui %s", ImGui::GetVersion());
-    ImGui::Separator();
-    ImGui::Text("By Omar Cornut and all Dear ImGui contributors.");
-    ImGui::Text("Dear ImGui is licensed under the MIT License, see LICENSE for more information.");
-
-    static bool show_config_info = false;
-    ImGui::Checkbox("Config/Build Information", &show_config_info);
-    if (show_config_info)
-    {
-        ImGuiIO& io = ImGui::GetIO();
-        ImGuiStyle& style = ImGui::GetStyle();
-
-        bool copy_to_clipboard = ImGui::Button("Copy to clipboard");
-        ImVec2 child_size = ImVec2(0, ImGui::GetTextLineHeightWithSpacing() * 18);
-        ImGui::BeginChildFrame(ImGui::GetID("cfg_infos"), child_size, ImGuiWindowFlags_NoMove);
-        if (copy_to_clipboard)
-        {
-            ImGui::LogToClipboard();
-            ImGui::LogText("```\n");             
-        }
-
-        ImGui::Text("Dear ImGui %s (%d)", IMGUI_VERSION, IMGUI_VERSION_NUM);
-        ImGui::Separator();
-        ImGui::Text("sizeof(size_t): %d, sizeof(ImDrawIdx): %d, sizeof(ImDrawVert): %d", (int)sizeof(size_t), (int)sizeof(ImDrawIdx), (int)sizeof(ImDrawVert));
-        ImGui::Text("define: __cplusplus=%d", (int)__cplusplus);
-#ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-        ImGui::Text("define: IMGUI_DISABLE_OBSOLETE_FUNCTIONS");
-#endif
-#ifdef IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS
-        ImGui::Text("define: IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS");
-#endif
-#ifdef IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS
-        ImGui::Text("define: IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS");
-#endif
-#ifdef IMGUI_DISABLE_WIN32_FUNCTIONS
-        ImGui::Text("define: IMGUI_DISABLE_WIN32_FUNCTIONS");
-#endif
-#ifdef IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS
-        ImGui::Text("define: IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS");
-#endif
-#ifdef IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS
-        ImGui::Text("define: IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS");
-#endif
-#ifdef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS
-        ImGui::Text("define: IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS");
-#endif
-#ifdef IMGUI_DISABLE_FILE_FUNCTIONS
-        ImGui::Text("define: IMGUI_DISABLE_FILE_FUNCTIONS");
-#endif
-#ifdef IMGUI_DISABLE_DEFAULT_ALLOCATORS
-        ImGui::Text("define: IMGUI_DISABLE_DEFAULT_ALLOCATORS");
-#endif
-#ifdef IMGUI_USE_BGRA_PACKED_COLOR
-        ImGui::Text("define: IMGUI_USE_BGRA_PACKED_COLOR");
-#endif
-#ifdef _WIN32
-        ImGui::Text("define: _WIN32");
-#endif
-#ifdef _WIN64
-        ImGui::Text("define: _WIN64");
-#endif
-#ifdef __linux__
-        ImGui::Text("define: __linux__");
-#endif
-#ifdef __APPLE__
-        ImGui::Text("define: __APPLE__");
-#endif
-#ifdef _MSC_VER
-        ImGui::Text("define: _MSC_VER=%d", _MSC_VER);
-#endif
-#ifdef _MSVC_LANG
-        ImGui::Text("define: _MSVC_LANG=%d", (int)_MSVC_LANG);
-#endif
-#ifdef __MINGW32__
-        ImGui::Text("define: __MINGW32__");
-#endif
-#ifdef __MINGW64__
-        ImGui::Text("define: __MINGW64__");
-#endif
-#ifdef __GNUC__
-        ImGui::Text("define: __GNUC__=%d", (int)__GNUC__);
-#endif
-#ifdef __clang_version__
-        ImGui::Text("define: __clang_version__=%s", __clang_version__);
-#endif
-        ImGui::Separator();
-        ImGui::Text("io.BackendPlatformName: %s", io.BackendPlatformName ? io.BackendPlatformName : "NULL");
-        ImGui::Text("io.BackendRendererName: %s", io.BackendRendererName ? io.BackendRendererName : "NULL");
-        ImGui::Text("io.ConfigFlags: 0x%08X", io.ConfigFlags);
-        if (io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard)        ImGui::Text(" NavEnableKeyboard");
-        if (io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad)         ImGui::Text(" NavEnableGamepad");
-        if (io.ConfigFlags & ImGuiConfigFlags_NavEnableSetMousePos)     ImGui::Text(" NavEnableSetMousePos");
-        if (io.ConfigFlags & ImGuiConfigFlags_NavNoCaptureKeyboard)     ImGui::Text(" NavNoCaptureKeyboard");
-        if (io.ConfigFlags & ImGuiConfigFlags_NoMouse)                  ImGui::Text(" NoMouse");
-        if (io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange)      ImGui::Text(" NoMouseCursorChange");
-        if (io.MouseDrawCursor)                                         ImGui::Text("io.MouseDrawCursor");
-        if (io.ConfigMacOSXBehaviors)                                   ImGui::Text("io.ConfigMacOSXBehaviors");
-        if (io.ConfigInputTextCursorBlink)                              ImGui::Text("io.ConfigInputTextCursorBlink");
-        if (io.ConfigWindowsResizeFromEdges)                            ImGui::Text("io.ConfigWindowsResizeFromEdges");
-        if (io.ConfigWindowsMoveFromTitleBarOnly)                       ImGui::Text("io.ConfigWindowsMoveFromTitleBarOnly");
-        if (io.ConfigMemoryCompactTimer >= 0.0f)                        ImGui::Text("io.ConfigMemoryCompactTimer = %.1f", io.ConfigMemoryCompactTimer);
-        ImGui::Text("io.BackendFlags: 0x%08X", io.BackendFlags);
-        if (io.BackendFlags & ImGuiBackendFlags_HasGamepad)             ImGui::Text(" HasGamepad");
-        if (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors)        ImGui::Text(" HasMouseCursors");
-        if (io.BackendFlags & ImGuiBackendFlags_HasSetMousePos)         ImGui::Text(" HasSetMousePos");
-        if (io.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset)   ImGui::Text(" RendererHasVtxOffset");
-        ImGui::Separator();
-        ImGui::Text("io.Fonts: %d fonts, Flags: 0x%08X, TexSize: %d,%d", io.Fonts->Fonts.Size, io.Fonts->Flags, io.Fonts->TexWidth, io.Fonts->TexHeight);
-        ImGui::Text("io.DisplaySize: %.2f,%.2f", io.DisplaySize.x, io.DisplaySize.y);
-        ImGui::Text("io.DisplayFramebufferScale: %.2f,%.2f", io.DisplayFramebufferScale.x, io.DisplayFramebufferScale.y);
-        ImGui::Separator();
-        ImGui::Text("style.WindowPadding: %.2f,%.2f", style.WindowPadding.x, style.WindowPadding.y);
-        ImGui::Text("style.WindowBorderSize: %.2f", style.WindowBorderSize);
-        ImGui::Text("style.FramePadding: %.2f,%.2f", style.FramePadding.x, style.FramePadding.y);
-        ImGui::Text("style.FrameRounding: %.2f", style.FrameRounding);
-        ImGui::Text("style.FrameBorderSize: %.2f", style.FrameBorderSize);
-        ImGui::Text("style.ItemSpacing: %.2f,%.2f", style.ItemSpacing.x, style.ItemSpacing.y);
-        ImGui::Text("style.ItemInnerSpacing: %.2f,%.2f", style.ItemInnerSpacing.x, style.ItemInnerSpacing.y);
-
-        if (copy_to_clipboard)
-        {
-            ImGui::LogText("\n```\n");
-            ImGui::LogFinish();
-        }
-        ImGui::EndChildFrame();
-    }
-    ImGui::End();
-}
-
-bool ImGui::ShowStyleSelector(const char* label)
-{
-    static int style_idx = -1;
-    if (ImGui::Combo(label, &style_idx, "Dark\0Light\0Classic\0"))
-    {
-        switch (style_idx)
-        {
-        case 0: ImGui::StyleColorsDark(); break;
-        case 1: ImGui::StyleColorsLight(); break;
-        case 2: ImGui::StyleColorsClassic(); break;
-        }
-        return true;
-    }
-    return false;
-}
-
-void ImGui::ShowFontSelector(const char* label)
-{
-    ImGuiIO& io = ImGui::GetIO();
-    ImFont* font_current = ImGui::GetFont();
-    if (ImGui::BeginCombo(label, font_current->GetDebugName()))
-    {
-        for (int n = 0; n < io.Fonts->Fonts.Size; n++)
-        {
-            ImFont* font = io.Fonts->Fonts[n];
-            ImGui::PushID((void*)font);
-            if (ImGui::Selectable(font->GetDebugName(), font == font_current))
-                io.FontDefault = font;
-            ImGui::PopID();
-        }
-        ImGui::EndCombo();
-    }
-    ImGui::SameLine();
-    HelpMarker(
-        "- Load additional fonts with io.Fonts->AddFontFromFileTTF().\n"
-        "- The font atlas is built when calling io.Fonts->GetTexDataAsXXXX() or io.Fonts->Build().\n"
-        "- Read FAQ and docs/FONTS.md for more details.\n"
-        "- If you need to add/remove fonts at runtime (e.g. for DPI change), do it before calling NewFrame().");
-}
-
-static void NodeFont(ImFont* font)
-{
-    ImGuiIO& io = ImGui::GetIO();
-    ImGuiStyle& style = ImGui::GetStyle();
-    bool font_details_opened = ImGui::TreeNode(font, "Font: \"%s\"\n%.2f px, %d glyphs, %d file(s)",
-        font->ConfigData ? font->ConfigData[0].Name : "", font->FontSize, font->Glyphs.Size, font->ConfigDataCount);
-    ImGui::SameLine(); if (ImGui::SmallButton("Set as default")) { io.FontDefault = font; }
-    if (!font_details_opened)
-        return;
-
-    ImGui::PushFont(font);
-    ImGui::Text("The quick brown fox jumps over the lazy dog");
-    ImGui::PopFont();
-    ImGui::DragFloat("Font scale", &font->Scale, 0.005f, 0.3f, 2.0f, "%.1f");       
-    ImGui::SameLine(); HelpMarker(
-        "Note than the default embedded font is NOT meant to be scaled.\n\n"
-        "Font are currently rendered into bitmaps at a given size at the time of building the atlas. "
-        "You may oversample them to get some flexibility with scaling. "
-        "You can also render at multiple sizes and select which one to use at runtime.\n\n"
-        "(Glimmer of hope: the atlas system will be rewritten in the future to make scaling more flexible.)");
-    ImGui::Text("Ascent: %f, Descent: %f, Height: %f", font->Ascent, font->Descent, font->Ascent - font->Descent);
-    ImGui::Text("Fallback character: '%c' (U+%04X)", font->FallbackChar, font->FallbackChar);
-    ImGui::Text("Ellipsis character: '%c' (U+%04X)", font->EllipsisChar, font->EllipsisChar);
-    const int surface_sqrt = (int)sqrtf((float)font->MetricsTotalSurface);
-    ImGui::Text("Texture Area: about %d px ~%dx%d px", font->MetricsTotalSurface, surface_sqrt, surface_sqrt);
-    for (int config_i = 0; config_i < font->ConfigDataCount; config_i++)
-        if (font->ConfigData)
-            if (const ImFontConfig* cfg = &font->ConfigData[config_i])
-                ImGui::BulletText("Input %d: \'%s\', Oversample: (%d,%d), PixelSnapH: %d, Offset: (%.1f,%.1f)",
-                    config_i, cfg->Name, cfg->OversampleH, cfg->OversampleV, cfg->PixelSnapH, cfg->GlyphOffset.x, cfg->GlyphOffset.y);
-    if (ImGui::TreeNode("Glyphs", "Glyphs (%d)", font->Glyphs.Size))
-    {
-        const ImU32 glyph_col = ImGui::GetColorU32(ImGuiCol_Text);
-        for (unsigned int base = 0; base <= IM_UNICODE_CODEPOINT_MAX; base += 256)
-        {
-            if (!(base & 4095) && font->IsGlyphRangeUnused(base, base + 4095))
-            {
-                base += 4096 - 256;
-                continue;
-            }
-
-            int count = 0;
-            for (unsigned int n = 0; n < 256; n++)
-                if (font->FindGlyphNoFallback((ImWchar)(base + n)))
-                    count++;
-            if (count <= 0)
-                continue;
-            if (!ImGui::TreeNode((void*)(intptr_t)base, "U+%04X..U+%04X (%d %s)", base, base + 255, count, count > 1 ? "glyphs" : "glyph"))
-                continue;
-            float cell_size = font->FontSize * 1;
-            float cell_spacing = style.ItemSpacing.y;
-            ImVec2 base_pos = ImGui::GetCursorScreenPos();
-            ImDrawList* draw_list = ImGui::GetWindowDrawList();
-            for (unsigned int n = 0; n < 256; n++)
-            {
-                ImVec2 cell_p1(base_pos.x + (n % 16) * (cell_size + cell_spacing), base_pos.y + (n / 16) * (cell_size + cell_spacing));
-                ImVec2 cell_p2(cell_p1.x + cell_size, cell_p1.y + cell_size);
-                const ImFontGlyph* glyph = font->FindGlyphNoFallback((ImWchar)(base + n));
-                draw_list->AddRect(cell_p1, cell_p2, glyph ? IM_COL32(255, 255, 255, 100) : IM_COL32(255, 255, 255, 50));
-                if (glyph)
-                    font->RenderChar(draw_list, cell_size, cell_p1, glyph_col, (ImWchar)(base + n));
-                if (glyph && ImGui::IsMouseHoveringRect(cell_p1, cell_p2))
-                {
-                    ImGui::BeginTooltip();
-                    ImGui::Text("Codepoint: U+%04X", base + n);
-                    ImGui::Separator();
-                    ImGui::Text("Visible: %d", glyph->Visible);
-                    ImGui::Text("AdvanceX: %.1f", glyph->AdvanceX);
-                    ImGui::Text("Pos: (%.2f,%.2f)->(%.2f,%.2f)", glyph->X0, glyph->Y0, glyph->X1, glyph->Y1);
-                    ImGui::Text("UV: (%.3f,%.3f)->(%.3f,%.3f)", glyph->U0, glyph->V0, glyph->U1, glyph->V1);
-                    ImGui::EndTooltip();
-                }
-            }
-            ImGui::Dummy(ImVec2((cell_size + cell_spacing) * 16, (cell_size + cell_spacing) * 16));
-            ImGui::TreePop();
-        }
-        ImGui::TreePop();
-    }
-    ImGui::TreePop();
-}
-
-void ImGui::ShowStyleEditor(ImGuiStyle* ref)
-{
-    ImGuiStyle& style = ImGui::GetStyle();
-    static ImGuiStyle ref_saved_style;
-
-    static bool init = true;
-    if (init && ref == NULL)
-        ref_saved_style = style;
-    init = false;
-    if (ref == NULL)
-        ref = &ref_saved_style;
-
-    ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.50f);
-
-    if (ImGui::ShowStyleSelector("Colors##Selector"))
-        ref_saved_style = style;
-    ImGui::ShowFontSelector("Fonts##Selector");
-
-    if (ImGui::SliderFloat("FrameRounding", &style.FrameRounding, 0.0f, 12.0f, "%.0f"))
-        style.GrabRounding = style.FrameRounding;         
-    { bool border = (style.WindowBorderSize > 0.0f); if (ImGui::Checkbox("WindowBorder", &border)) { style.WindowBorderSize = border ? 1.0f : 0.0f; } }
-    ImGui::SameLine();
-    { bool border = (style.FrameBorderSize > 0.0f);  if (ImGui::Checkbox("FrameBorder",  &border)) { style.FrameBorderSize  = border ? 1.0f : 0.0f; } }
-    ImGui::SameLine();
-    { bool border = (style.PopupBorderSize > 0.0f);  if (ImGui::Checkbox("PopupBorder",  &border)) { style.PopupBorderSize  = border ? 1.0f : 0.0f; } }
-
-    if (ImGui::Button("Save Ref"))
-        *ref = ref_saved_style = style;
-    ImGui::SameLine();
-    if (ImGui::Button("Revert Ref"))
-        style = *ref;
-    ImGui::SameLine();
-    HelpMarker(
-        "Save/Revert in local non-persistent storage. Default Colors definition are not affected. "
-        "Use \"Export\" below to save them somewhere.");
-
-    ImGui::Separator();
-
-    if (ImGui::BeginTabBar("##tabs", ImGuiTabBarFlags_None))
-    {
-        if (ImGui::BeginTabItem("Sizes"))
-        {
-            ImGui::Text("Main");
-            ImGui::SliderFloat2("WindowPadding", (float*)&style.WindowPadding, 0.0f, 20.0f, "%.0f");
-            ImGui::SliderFloat2("FramePadding", (float*)&style.FramePadding, 0.0f, 20.0f, "%.0f");
-            ImGui::SliderFloat2("CellPadding", (float*)&style.CellPadding, 0.0f, 20.0f, "%.0f");
-            ImGui::SliderFloat2("ItemSpacing", (float*)&style.ItemSpacing, 0.0f, 20.0f, "%.0f");
-            ImGui::SliderFloat2("ItemInnerSpacing", (float*)&style.ItemInnerSpacing, 0.0f, 20.0f, "%.0f");
-            ImGui::SliderFloat2("TouchExtraPadding", (float*)&style.TouchExtraPadding, 0.0f, 10.0f, "%.0f");
-            ImGui::SliderFloat("IndentSpacing", &style.IndentSpacing, 0.0f, 30.0f, "%.0f");
-            ImGui::SliderFloat("ScrollbarSize", &style.ScrollbarSize, 1.0f, 20.0f, "%.0f");
-            ImGui::SliderFloat("GrabMinSize", &style.GrabMinSize, 1.0f, 20.0f, "%.0f");
-            ImGui::Text("Borders");
-            ImGui::SliderFloat("WindowBorderSize", &style.WindowBorderSize, 0.0f, 1.0f, "%.0f");
-            ImGui::SliderFloat("ChildBorderSize", &style.ChildBorderSize, 0.0f, 1.0f, "%.0f");
-            ImGui::SliderFloat("PopupBorderSize", &style.PopupBorderSize, 0.0f, 1.0f, "%.0f");
-            ImGui::SliderFloat("FrameBorderSize", &style.FrameBorderSize, 0.0f, 1.0f, "%.0f");
-            ImGui::SliderFloat("TabBorderSize", &style.TabBorderSize, 0.0f, 1.0f, "%.0f");
-            ImGui::Text("Rounding");
-            ImGui::SliderFloat("WindowRounding", &style.WindowRounding, 0.0f, 12.0f, "%.0f");
-            ImGui::SliderFloat("ChildRounding", &style.ChildRounding, 0.0f, 12.0f, "%.0f");
-            ImGui::SliderFloat("FrameRounding", &style.FrameRounding, 0.0f, 12.0f, "%.0f");
-            ImGui::SliderFloat("PopupRounding", &style.PopupRounding, 0.0f, 12.0f, "%.0f");
-            ImGui::SliderFloat("ScrollbarRounding", &style.ScrollbarRounding, 0.0f, 12.0f, "%.0f");
-            ImGui::SliderFloat("GrabRounding", &style.GrabRounding, 0.0f, 12.0f, "%.0f");
-            ImGui::SliderFloat("LogSliderDeadzone", &style.LogSliderDeadzone, 0.0f, 12.0f, "%.0f");
-            ImGui::SliderFloat("TabRounding", &style.TabRounding, 0.0f, 12.0f, "%.0f");
-            ImGui::Text("Alignment");
-            ImGui::SliderFloat2("WindowTitleAlign", (float*)&style.WindowTitleAlign, 0.0f, 1.0f, "%.2f");
-            int window_menu_button_position = style.WindowMenuButtonPosition + 1;
-            if (ImGui::Combo("WindowMenuButtonPosition", (int*)&window_menu_button_position, "None\0Left\0Right\0"))
-                style.WindowMenuButtonPosition = window_menu_button_position - 1;
-            ImGui::Combo("ColorButtonPosition", (int*)&style.ColorButtonPosition, "Left\0Right\0");
-            ImGui::SliderFloat2("ButtonTextAlign", (float*)&style.ButtonTextAlign, 0.0f, 1.0f, "%.2f");
-            ImGui::SameLine(); HelpMarker("Alignment applies when a button is larger than its text content.");
-            ImGui::SliderFloat2("SelectableTextAlign", (float*)&style.SelectableTextAlign, 0.0f, 1.0f, "%.2f");
-            ImGui::SameLine(); HelpMarker("Alignment applies when a selectable is larger than its text content.");
-            ImGui::Text("Safe Area Padding");
-            ImGui::SameLine(); HelpMarker("Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured).");
-            ImGui::SliderFloat2("DisplaySafeAreaPadding", (float*)&style.DisplaySafeAreaPadding, 0.0f, 30.0f, "%.0f");
-            ImGui::EndTabItem();
-        }
-
-        if (ImGui::BeginTabItem("Colors"))
-        {
-            static int output_dest = 0;
-            static bool output_only_modified = true;
-            if (ImGui::Button("Export"))
-            {
-                if (output_dest == 0)
-                    ImGui::LogToClipboard();
-                else
-                    ImGui::LogToTTY();
-                ImGui::LogText("ImVec4* colors = ImGui::GetStyle().Colors;" IM_NEWLINE);
-                for (int i = 0; i < ImGuiCol_COUNT; i++)
-                {
-                    const ImVec4& col = style.Colors[i];
-                    const char* name = ImGui::GetStyleColorName(i);
-                    if (!output_only_modified || memcmp(&col, &ref->Colors[i], sizeof(ImVec4)) != 0)
-                        ImGui::LogText("colors[ImGuiCol_%s]%*s= ImVec4(%.2ff, %.2ff, %.2ff, %.2ff);" IM_NEWLINE,
-                            name, 23 - (int)strlen(name), "", col.x, col.y, col.z, col.w);
-                }
-                ImGui::LogFinish();
-            }
-            ImGui::SameLine(); ImGui::SetNextItemWidth(120); ImGui::Combo("##output_type", &output_dest, "To Clipboard\0To TTY\0");
-            ImGui::SameLine(); ImGui::Checkbox("Only Modified Colors", &output_only_modified);
-
-            static ImGuiTextFilter filter;
-            filter.Draw("Filter colors", ImGui::GetFontSize() * 16);
-
-            static ImGuiColorEditFlags alpha_flags = 0;
-            if (ImGui::RadioButton("Opaque", alpha_flags == ImGuiColorEditFlags_None))             { alpha_flags = ImGuiColorEditFlags_None; } ImGui::SameLine();
-            if (ImGui::RadioButton("Alpha",  alpha_flags == ImGuiColorEditFlags_AlphaPreview))     { alpha_flags = ImGuiColorEditFlags_AlphaPreview; } ImGui::SameLine();
-            if (ImGui::RadioButton("Both",   alpha_flags == ImGuiColorEditFlags_AlphaPreviewHalf)) { alpha_flags = ImGuiColorEditFlags_AlphaPreviewHalf; } ImGui::SameLine();
-            HelpMarker(
-                "In the color list:\n"
-                "Left-click on color square to open color picker,\n"
-                "Right-click to open edit options menu.");
-
-            ImGui::BeginChild("##colors", ImVec2(0, 0), true, ImGuiWindowFlags_AlwaysVerticalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar | ImGuiWindowFlags_NavFlattened);
-            ImGui::PushItemWidth(-160);
-            for (int i = 0; i < ImGuiCol_COUNT; i++)
-            {
-                const char* name = ImGui::GetStyleColorName(i);
-                if (!filter.PassFilter(name))
-                    continue;
-                ImGui::PushID(i);
-                ImGui::ColorEdit4("##color", (float*)&style.Colors[i], ImGuiColorEditFlags_AlphaBar | alpha_flags);
-                if (memcmp(&style.Colors[i], &ref->Colors[i], sizeof(ImVec4)) != 0)
-                {
-                    ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); if (ImGui::Button("Save")) { ref->Colors[i] = style.Colors[i]; }
-                    ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); if (ImGui::Button("Revert")) { style.Colors[i] = ref->Colors[i]; }
-                }
-                ImGui::SameLine(0.0f, style.ItemInnerSpacing.x);
-                ImGui::TextUnformatted(name);
-                ImGui::PopID();
-            }
-            ImGui::PopItemWidth();
-            ImGui::EndChild();
-
-            ImGui::EndTabItem();
-        }
-
-        if (ImGui::BeginTabItem("Fonts"))
-        {
-            ImGuiIO& io = ImGui::GetIO();
-            ImFontAtlas* atlas = io.Fonts;
-            HelpMarker("Read FAQ and docs/FONTS.md for details on font loading.");
-            ImGui::PushItemWidth(120);
-            for (int i = 0; i < atlas->Fonts.Size; i++)
-            {
-                ImFont* font = atlas->Fonts[i];
-                ImGui::PushID(font);
-                NodeFont(font);
-                ImGui::PopID();
-            }
-            if (ImGui::TreeNode("Atlas texture", "Atlas texture (%dx%d pixels)", atlas->TexWidth, atlas->TexHeight))
-            {
-                ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
-                ImVec4 border_col = ImVec4(1.0f, 1.0f, 1.0f, 0.5f);
-                ImGui::Image(atlas->TexID, ImVec2((float)atlas->TexWidth, (float)atlas->TexHeight), ImVec2(0, 0), ImVec2(1, 1), tint_col, border_col);
-                ImGui::TreePop();
-            }
-
-            const float MIN_SCALE = 0.3f;
-            const float MAX_SCALE = 2.0f;
-            HelpMarker(
-                "Those are old settings provided for convenience.\n"
-                "However, the _correct_ way of scaling your UI is currently to reload your font at the designed size, "
-                "rebuild the font atlas, and call style.ScaleAllSizes() on a reference ImGuiStyle structure.\n"
-                "Using those settings here will give you poor quality results.");
-            static float window_scale = 1.0f;
-            if (ImGui::DragFloat("window scale", &window_scale, 0.005f, MIN_SCALE, MAX_SCALE, "%.2f", ImGuiSliderFlags_AlwaysClamp))     
-                ImGui::SetWindowFontScale(window_scale);
-            ImGui::DragFloat("global scale", &io.FontGlobalScale, 0.005f, MIN_SCALE, MAX_SCALE, "%.2f", ImGuiSliderFlags_AlwaysClamp);   
-            ImGui::PopItemWidth();
-
-            ImGui::EndTabItem();
-        }
-
-        if (ImGui::BeginTabItem("Rendering"))
-        {
-            ImGui::Checkbox("Anti-aliased lines", &style.AntiAliasedLines);
-            ImGui::SameLine();
-            HelpMarker("When disabling anti-aliasing lines, you'll probably want to disable borders in your style as well.");
-
-            ImGui::Checkbox("Anti-aliased lines use texture", &style.AntiAliasedLinesUseTex);
-            ImGui::SameLine();
-            HelpMarker("Faster lines using texture data. Require backend to render with bilinear filtering (not point/nearest filtering).");
-
-            ImGui::Checkbox("Anti-aliased fill", &style.AntiAliasedFill);
-            ImGui::PushItemWidth(100);
-            ImGui::DragFloat("Curve Tessellation Tolerance", &style.CurveTessellationTol, 0.02f, 0.10f, 10.0f, "%.2f");
-            if (style.CurveTessellationTol < 0.10f) style.CurveTessellationTol = 0.10f;
-
-            ImGui::DragFloat("Circle Segment Max Error", &style.CircleSegmentMaxError, 0.01f, 0.10f, 10.0f, "%.2f");
-            if (ImGui::IsItemActive())
-            {
-                ImGui::SetNextWindowPos(ImGui::GetCursorScreenPos());
-                ImGui::BeginTooltip();
-                ImVec2 p = ImGui::GetCursorScreenPos();
-                ImDrawList* draw_list = ImGui::GetWindowDrawList();
-                float RAD_MIN = 10.0f, RAD_MAX = 80.0f;
-                float off_x = 10.0f;
-                for (int n = 0; n < 7; n++)
-                {
-                    const float rad = RAD_MIN + (RAD_MAX - RAD_MIN) * (float)n / (7.0f - 1.0f);
-                    draw_list->AddCircle(ImVec2(p.x + off_x + rad, p.y + RAD_MAX), rad, ImGui::GetColorU32(ImGuiCol_Text), 0);
-                    off_x += 10.0f + rad * 2.0f;
-                }
-                ImGui::Dummy(ImVec2(off_x, RAD_MAX * 2.0f));
-                ImGui::EndTooltip();
-            }
-            ImGui::SameLine();
-            HelpMarker("When drawing circle primitives with \"num_segments == 0\" tesselation will be calculated automatically.");
-
-            ImGui::DragFloat("Global Alpha", &style.Alpha, 0.005f, 0.20f, 1.0f, "%.2f");                             
-            ImGui::PopItemWidth();
-
-            ImGui::EndTabItem();
-        }
-
-        ImGui::EndTabBar();
-    }
-
-    ImGui::PopItemWidth();
-}
-
-static void ShowExampleAppMainMenuBar()
-{
-    if (ImGui::BeginMainMenuBar())
-    {
-        if (ImGui::BeginMenu("File"))
-        {
-            ShowExampleMenuFile();
-            ImGui::EndMenu();
-        }
-        if (ImGui::BeginMenu("Edit"))
-        {
-            if (ImGui::MenuItem("Undo", "CTRL+Z")) {}
-            if (ImGui::MenuItem("Redo", "CTRL+Y", false, false)) {}    
-            ImGui::Separator();
-            if (ImGui::MenuItem("Cut", "CTRL+X")) {}
-            if (ImGui::MenuItem("Copy", "CTRL+C")) {}
-            if (ImGui::MenuItem("Paste", "CTRL+V")) {}
-            ImGui::EndMenu();
-        }
-        ImGui::EndMainMenuBar();
-    }
-}
-
-static void ShowExampleMenuFile()
-{
-    ImGui::MenuItem("(demo menu)", NULL, false, false);
-    if (ImGui::MenuItem("New")) {}
-    if (ImGui::MenuItem("Open", "Ctrl+O")) {}
-    if (ImGui::BeginMenu("Open Recent"))
-    {
-        ImGui::MenuItem("fish_hat.c");
-        ImGui::MenuItem("fish_hat.inl");
-        ImGui::MenuItem("fish_hat.h");
-        if (ImGui::BeginMenu("More.."))
-        {
-            ImGui::MenuItem("Hello");
-            ImGui::MenuItem("Sailor");
-            if (ImGui::BeginMenu("Recurse.."))
-            {
-                ShowExampleMenuFile();
-                ImGui::EndMenu();
-            }
-            ImGui::EndMenu();
-        }
-        ImGui::EndMenu();
-    }
-    if (ImGui::MenuItem("Save", "Ctrl+S")) {}
-    if (ImGui::MenuItem("Save As..")) {}
-
-    ImGui::Separator();
-    if (ImGui::BeginMenu("Options"))
-    {
-        static bool enabled = true;
-        ImGui::MenuItem("Enabled", "", &enabled);
-        ImGui::BeginChild("child", ImVec2(0, 60), true);
-        for (int i = 0; i < 10; i++)
-            ImGui::Text("Scrolling Text %d", i);
-        ImGui::EndChild();
-        static float f = 0.5f;
-        static int n = 0;
-        ImGui::SliderFloat("Value", &f, 0.0f, 1.0f);
-        ImGui::InputFloat("Input", &f, 0.1f);
-        ImGui::Combo("Combo", &n, "Yes\0No\0Maybe\0\0");
-        ImGui::EndMenu();
-    }
-
-    if (ImGui::BeginMenu("Colors"))
-    {
-        float sz = ImGui::GetTextLineHeight();
-        for (int i = 0; i < ImGuiCol_COUNT; i++)
-        {
-            const char* name = ImGui::GetStyleColorName((ImGuiCol)i);
-            ImVec2 p = ImGui::GetCursorScreenPos();
-            ImGui::GetWindowDrawList()->AddRectFilled(p, ImVec2(p.x + sz, p.y + sz), ImGui::GetColorU32((ImGuiCol)i));
-            ImGui::Dummy(ImVec2(sz, sz));
-            ImGui::SameLine();
-            ImGui::MenuItem(name);
-        }
-        ImGui::EndMenu();
-    }
-
-    if (ImGui::BeginMenu("Options"))   
-    {
-        static bool b = true;
-        ImGui::Checkbox("SomeOption", &b);
-        ImGui::EndMenu();
-    }
-
-    if (ImGui::BeginMenu("Disabled", false))  
-    {
-        IM_ASSERT(0);
-    }
-    if (ImGui::MenuItem("Checked", NULL, true)) {}
-    if (ImGui::MenuItem("Quit", "Alt+F4")) {}
-}
-
-struct ExampleAppConsole
-{
-    char                  InputBuf[256];
-    ImVector<char*>       Items;
-    ImVector<const char*> Commands;
-    ImVector<char*>       History;
-    int                   HistoryPos;          
-    ImGuiTextFilter       Filter;
-    bool                  AutoScroll;
-    bool                  ScrollToBottom;
-
-    ExampleAppConsole()
-    {
-        ClearLog();
-        memset(InputBuf, 0, sizeof(InputBuf));
-        HistoryPos = -1;
-
-        Commands.push_back("HELP");
-        Commands.push_back("HISTORY");
-        Commands.push_back("CLEAR");
-        Commands.push_back("CLASSIFY");
-        AutoScroll = true;
-        ScrollToBottom = false;
-        AddLog("Welcome to Dear ImGui!");
-    }
-    ~ExampleAppConsole()
-    {
-        ClearLog();
-        for (int i = 0; i < History.Size; i++)
-            free(History[i]);
-    }
-
-    static int   Stricmp(const char* s1, const char* s2)         { int d; while ((d = toupper(*s2) - toupper(*s1)) == 0 && *s1) { s1++; s2++; } return d; }
-    static int   Strnicmp(const char* s1, const char* s2, int n) { int d = 0; while (n > 0 && (d = toupper(*s2) - toupper(*s1)) == 0 && *s1) { s1++; s2++; n--; } return d; }
-    static char* Strdup(const char* s)                           { IM_ASSERT(s); size_t len = strlen(s) + 1; void* buf = malloc(len); IM_ASSERT(buf); return (char*)memcpy(buf, (const void*)s, len); }
-    static void  Strtrim(char* s)                                { char* str_end = s + strlen(s); while (str_end > s && str_end[-1] == ' ') str_end--; *str_end = 0; }
-
-    void    ClearLog()
-    {
-        for (int i = 0; i < Items.Size; i++)
-            free(Items[i]);
-        Items.clear();
-    }
-
-    void    AddLog(const char* fmt, ...) IM_FMTARGS(2)
-    {
-        char buf[1024];
-        va_list args;
-        va_start(args, fmt);
-        vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
-        buf[IM_ARRAYSIZE(buf)-1] = 0;
-        va_end(args);
-        Items.push_back(Strdup(buf));
-    }
-
-    void    Draw(const char* title, bool* p_open)
-    {
-        ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-        if (!ImGui::Begin(title, p_open))
-        {
-            ImGui::End();
-            return;
-        }
-
-        if (ImGui::BeginPopupContextItem())
-        {
-            if (ImGui::MenuItem("Close Console"))
-                *p_open = false;
-            ImGui::EndPopup();
-        }
-
-        ImGui::TextWrapped(
-            "This example implements a console with basic coloring, completion (TAB key) and history (Up/Down keys). A more elaborate "
-            "implementation may want to store entries along with extra data such as timestamp, emitter, etc.");
-        ImGui::TextWrapped("Enter 'HELP' for help.");
-
-        if (ImGui::SmallButton("Add Debug Text"))  { AddLog("%d some text", Items.Size); AddLog("some more text"); AddLog("display very important message here!"); }
-        ImGui::SameLine();
-        if (ImGui::SmallButton("Add Debug Error")) { AddLog("[error] something went wrong"); }
-        ImGui::SameLine();
-        if (ImGui::SmallButton("Clear"))           { ClearLog(); }
-        ImGui::SameLine();
-        bool copy_to_clipboard = ImGui::SmallButton("Copy");
-        ImGui::Separator();
-
-        if (ImGui::BeginPopup("Options"))
-        {
-            ImGui::Checkbox("Auto-scroll", &AutoScroll);
-            ImGui::EndPopup();
-        }
-
-        if (ImGui::Button("Options"))
-            ImGui::OpenPopup("Options");
-        ImGui::SameLine();
-        Filter.Draw("Filter (\"incl,-excl\") (\"error\")", 180);
-        ImGui::Separator();
-
-        const float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
-        ImGui::BeginChild("ScrollingRegion", ImVec2(0, -footer_height_to_reserve), false, ImGuiWindowFlags_HorizontalScrollbar);
-        if (ImGui::BeginPopupContextWindow())
-        {
-            if (ImGui::Selectable("Clear")) ClearLog();
-            ImGui::EndPopup();
-        }
-
-        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4, 1));   
-        if (copy_to_clipboard)
-            ImGui::LogToClipboard();
-        for (int i = 0; i < Items.Size; i++)
-        {
-            const char* item = Items[i];
-            if (!Filter.PassFilter(item))
-                continue;
-
-            ImVec4 color;
-            bool has_color = false;
-            if (strstr(item, "[error]"))          { color = ImVec4(1.0f, 0.4f, 0.4f, 1.0f); has_color = true; }
-            else if (strncmp(item, "# ", 2) == 0) { color = ImVec4(1.0f, 0.8f, 0.6f, 1.0f); has_color = true; }
-            if (has_color)
-                ImGui::PushStyleColor(ImGuiCol_Text, color);
-            ImGui::TextUnformatted(item);
-            if (has_color)
-                ImGui::PopStyleColor();
-        }
-        if (copy_to_clipboard)
-            ImGui::LogFinish();
-
-        if (ScrollToBottom || (AutoScroll && ImGui::GetScrollY() >= ImGui::GetScrollMaxY()))
-            ImGui::SetScrollHereY(1.0f);
-        ScrollToBottom = false;
-
-        ImGui::PopStyleVar();
-        ImGui::EndChild();
-        ImGui::Separator();
-
-        bool reclaim_focus = false;
-        ImGuiInputTextFlags input_text_flags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_CallbackHistory;
-        if (ImGui::InputText("Input", InputBuf, IM_ARRAYSIZE(InputBuf), input_text_flags, &TextEditCallbackStub, (void*)this))
-        {
-            char* s = InputBuf;
-            Strtrim(s);
-            if (s[0])
-                ExecCommand(s);
-            strcpy(s, "");
-            reclaim_focus = true;
-        }
-
-        ImGui::SetItemDefaultFocus();
-        if (reclaim_focus)
-            ImGui::SetKeyboardFocusHere(-1);     
-
-        ImGui::End();
-    }
-
-    void    ExecCommand(const char* command_line)
-    {
-        AddLog("# %s\n", command_line);
-
-        HistoryPos = -1;
-        for (int i = History.Size - 1; i >= 0; i--)
-            if (Stricmp(History[i], command_line) == 0)
-            {
-                free(History[i]);
-                History.erase(History.begin() + i);
-                break;
-            }
-        History.push_back(Strdup(command_line));
-
-        if (Stricmp(command_line, "CLEAR") == 0)
-        {
-            ClearLog();
-        }
-        else if (Stricmp(command_line, "HELP") == 0)
-        {
-            AddLog("Commands:");
-            for (int i = 0; i < Commands.Size; i++)
-                AddLog("- %s", Commands[i]);
-        }
-        else if (Stricmp(command_line, "HISTORY") == 0)
-        {
-            int first = History.Size - 10;
-            for (int i = first > 0 ? first : 0; i < History.Size; i++)
-                AddLog("%3d: %s\n", i, History[i]);
-        }
-        else
-        {
-            AddLog("Unknown command: '%s'\n", command_line);
-        }
-
-        ScrollToBottom = true;
-    }
-
-    static int TextEditCallbackStub(ImGuiInputTextCallbackData* data)
-    {
-        ExampleAppConsole* console = (ExampleAppConsole*)data->UserData;
-        return console->TextEditCallback(data);
-    }
-
-    int     TextEditCallback(ImGuiInputTextCallbackData* data)
-    {
-        switch (data->EventFlag)
-        {
-        case ImGuiInputTextFlags_CallbackCompletion:
-            {
-                const char* word_end = data->Buf + data->CursorPos;
-                const char* word_start = word_end;
-                while (word_start > data->Buf)
-                {
-                    const char c = word_start[-1];
-                    if (c == ' ' || c == '\t' || c == ',' || c == ';')
-                        break;
-                    word_start--;
-                }
-
-                ImVector<const char*> candidates;
-                for (int i = 0; i < Commands.Size; i++)
-                    if (Strnicmp(Commands[i], word_start, (int)(word_end - word_start)) == 0)
-                        candidates.push_back(Commands[i]);
-
-                if (candidates.Size == 0)
-                {
-                    AddLog("No match for \"%.*s\"!\n", (int)(word_end - word_start), word_start);
-                }
-                else if (candidates.Size == 1)
-                {
-                    data->DeleteChars((int)(word_start - data->Buf), (int)(word_end - word_start));
-                    data->InsertChars(data->CursorPos, candidates[0]);
-                    data->InsertChars(data->CursorPos, " ");
-                }
-                else
-                {
-                    int match_len = (int)(word_end - word_start);
-                    for (;;)
-                    {
-                        int c = 0;
-                        bool all_candidates_matches = true;
-                        for (int i = 0; i < candidates.Size && all_candidates_matches; i++)
-                            if (i == 0)
-                                c = toupper(candidates[i][match_len]);
-                            else if (c == 0 || c != toupper(candidates[i][match_len]))
-                                all_candidates_matches = false;
-                        if (!all_candidates_matches)
-                            break;
-                        match_len++;
-                    }
-
-                    if (match_len > 0)
-                    {
-                        data->DeleteChars((int)(word_start - data->Buf), (int)(word_end - word_start));
-                        data->InsertChars(data->CursorPos, candidates[0], candidates[0] + match_len);
-                    }
-
-                    AddLog("Possible matches:\n");
-                    for (int i = 0; i < candidates.Size; i++)
-                        AddLog("- %s\n", candidates[i]);
-                }
-
-                break;
-            }
-        case ImGuiInputTextFlags_CallbackHistory:
-            {
-                const int prev_history_pos = HistoryPos;
-                if (data->EventKey == ImGuiKey_UpArrow)
-                {
-                    if (HistoryPos == -1)
-                        HistoryPos = History.Size - 1;
-                    else if (HistoryPos > 0)
-                        HistoryPos--;
-                }
-                else if (data->EventKey == ImGuiKey_DownArrow)
-                {
-                    if (HistoryPos != -1)
-                        if (++HistoryPos >= History.Size)
-                            HistoryPos = -1;
-                }
-
-                if (prev_history_pos != HistoryPos)
-                {
-                    const char* history_str = (HistoryPos >= 0) ? History[HistoryPos] : "";
-                    data->DeleteChars(0, data->BufTextLen);
-                    data->InsertChars(0, history_str);
-                }
-            }
-        }
-        return 0;
-    }
-};
-
-static void ShowExampleAppConsole(bool* p_open)
-{
-    static ExampleAppConsole console;
-    console.Draw("Example: Console", p_open);
-}
-
-struct ExampleAppLog
-{
-    ImGuiTextBuffer     Buf;
-    ImGuiTextFilter     Filter;
-    ImVector<int>       LineOffsets;           
-    bool                AutoScroll;         
-
-    ExampleAppLog()
-    {
-        AutoScroll = true;
-        Clear();
-    }
-
-    void    Clear()
-    {
-        Buf.clear();
-        LineOffsets.clear();
-        LineOffsets.push_back(0);
-    }
-
-    void    AddLog(const char* fmt, ...) IM_FMTARGS(2)
-    {
-        int old_size = Buf.size();
-        va_list args;
-        va_start(args, fmt);
-        Buf.appendfv(fmt, args);
-        va_end(args);
-        for (int new_size = Buf.size(); old_size < new_size; old_size++)
-            if (Buf[old_size] == '\n')
-                LineOffsets.push_back(old_size + 1);
-    }
-
-    void    Draw(const char* title, bool* p_open = NULL)
-    {
-        if (!ImGui::Begin(title, p_open))
-        {
-            ImGui::End();
-            return;
-        }
-
-        if (ImGui::BeginPopup("Options"))
-        {
-            ImGui::Checkbox("Auto-scroll", &AutoScroll);
-            ImGui::EndPopup();
-        }
-
-        if (ImGui::Button("Options"))
-            ImGui::OpenPopup("Options");
-        ImGui::SameLine();
-        bool clear = ImGui::Button("Clear");
-        ImGui::SameLine();
-        bool copy = ImGui::Button("Copy");
-        ImGui::SameLine();
-        Filter.Draw("Filter", -100.0f);
-
-        ImGui::Separator();
-        ImGui::BeginChild("scrolling", ImVec2(0, 0), false, ImGuiWindowFlags_HorizontalScrollbar);
-
-        if (clear)
-            Clear();
-        if (copy)
-            ImGui::LogToClipboard();
-
-        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0));
-        const char* buf = Buf.begin();
-        const char* buf_end = Buf.end();
-        if (Filter.IsActive())
-        {
-            for (int line_no = 0; line_no < LineOffsets.Size; line_no++)
-            {
-                const char* line_start = buf + LineOffsets[line_no];
-                const char* line_end = (line_no + 1 < LineOffsets.Size) ? (buf + LineOffsets[line_no + 1] - 1) : buf_end;
-                if (Filter.PassFilter(line_start, line_end))
-                    ImGui::TextUnformatted(line_start, line_end);
-            }
-        }
-        else
-        {
-            ImGuiListClipper clipper;
-            clipper.Begin(LineOffsets.Size);
-            while (clipper.Step())
-            {
-                for (int line_no = clipper.DisplayStart; line_no < clipper.DisplayEnd; line_no++)
-                {
-                    const char* line_start = buf + LineOffsets[line_no];
-                    const char* line_end = (line_no + 1 < LineOffsets.Size) ? (buf + LineOffsets[line_no + 1] - 1) : buf_end;
-                    ImGui::TextUnformatted(line_start, line_end);
-                }
-            }
-            clipper.End();
-        }
-        ImGui::PopStyleVar();
-
-        if (AutoScroll && ImGui::GetScrollY() >= ImGui::GetScrollMaxY())
-            ImGui::SetScrollHereY(1.0f);
-
-        ImGui::EndChild();
-        ImGui::End();
-    }
-};
-
-static void ShowExampleAppLog(bool* p_open)
-{
-    static ExampleAppLog log;
-
-    ImGui::SetNextWindowSize(ImVec2(500, 400), ImGuiCond_FirstUseEver);
-    ImGui::Begin("Example: Log", p_open);
-    if (ImGui::SmallButton("[Debug] Add 5 entries"))
-    {
-        static int counter = 0;
-        const char* categories[3] = { "info", "warn", "error" };
-        const char* words[] = { "Bumfuzzled", "Cattywampus", "Snickersnee", "Abibliophobia", "Absquatulate", "Nincompoop", "Pauciloquent" };
-        for (int n = 0; n < 5; n++)
-        {
-            const char* category = categories[counter % IM_ARRAYSIZE(categories)];
-            const char* word = words[counter % IM_ARRAYSIZE(words)];
-            log.AddLog("[%05d] [%s] Hello, current time is %.1f, here's a word: '%s'\n",
-                ImGui::GetFrameCount(), category, ImGui::GetTime(), word);
-            counter++;
-        }
-    }
-    ImGui::End();
-
-    log.Draw("Example: Log", p_open);
-}
-
-static void ShowExampleAppLayout(bool* p_open)
-{
-    ImGui::SetNextWindowSize(ImVec2(500, 440), ImGuiCond_FirstUseEver);
-    if (ImGui::Begin("Example: Simple layout", p_open, ImGuiWindowFlags_MenuBar))
-    {
-        if (ImGui::BeginMenuBar())
-        {
-            if (ImGui::BeginMenu("File"))
-            {
-                if (ImGui::MenuItem("Close")) *p_open = false;
-                ImGui::EndMenu();
-            }
-            ImGui::EndMenuBar();
-        }
-
-        static int selected = 0;
-        {
-            ImGui::BeginChild("left pane", ImVec2(150, 0), true);
-            for (int i = 0; i < 100; i++)
-            {
-                char label[128];
-                sprintf(label, "MyObject %d", i);
-                if (ImGui::Selectable(label, selected == i))
-                    selected = i;
-            }
-            ImGui::EndChild();
-        }
-        ImGui::SameLine();
-
-        {
-            ImGui::BeginGroup();
-            ImGui::BeginChild("item view", ImVec2(0, -ImGui::GetFrameHeightWithSpacing()));        
-            ImGui::Text("MyObject: %d", selected);
-            ImGui::Separator();
-            if (ImGui::BeginTabBar("##Tabs", ImGuiTabBarFlags_None))
-            {
-                if (ImGui::BeginTabItem("Description"))
-                {
-                    ImGui::TextWrapped("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ");
-                    ImGui::EndTabItem();
-                }
-                if (ImGui::BeginTabItem("Details"))
-                {
-                    ImGui::Text("ID: 0123456789");
-                    ImGui::EndTabItem();
-                }
-                ImGui::EndTabBar();
-            }
-            ImGui::EndChild();
-            if (ImGui::Button("Revert")) {}
-            ImGui::SameLine();
-            if (ImGui::Button("Save")) {}
-            ImGui::EndGroup();
-        }
-    }
-    ImGui::End();
-}
-
-static void ShowPlaceholderObject(const char* prefix, int uid)
-{
-    ImGui::PushID(uid);
-
-    ImGui::TableNextRow();
-    ImGui::TableSetColumnIndex(0);
-    ImGui::AlignTextToFramePadding();
-    bool node_open = ImGui::TreeNode("Object", "%s_%u", prefix, uid);
-    ImGui::TableSetColumnIndex(1);
-    ImGui::Text("my sailor is rich");
-
-    if (node_open)
-    {
-        static float placeholder_members[8] = { 0.0f, 0.0f, 1.0f, 3.1416f, 100.0f, 999.0f };
-        for (int i = 0; i < 8; i++)
-        {
-            ImGui::PushID(i);      
-            if (i < 2)
-            {
-                ShowPlaceholderObject("Child", 424242);
-            }
-            else
-            {
-                ImGui::TableNextRow();
-                ImGui::TableSetColumnIndex(0);
-                ImGui::AlignTextToFramePadding();
-                ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_Bullet;
-                ImGui::TreeNodeEx("Field", flags, "Field_%d", i);
-
-                ImGui::TableSetColumnIndex(1);
-                ImGui::SetNextItemWidth(-FLT_MIN);
-                if (i >= 5)
-                    ImGui::InputFloat("##value", &placeholder_members[i], 1.0f);
-                else
-                    ImGui::DragFloat("##value", &placeholder_members[i], 0.01f);
-                ImGui::NextColumn();
-            }
-            ImGui::PopID();
-        }
-        ImGui::TreePop();
-    }
-    ImGui::PopID();
-}
-
-static void ShowExampleAppPropertyEditor(bool* p_open)
-{
-    ImGui::SetNextWindowSize(ImVec2(430, 450), ImGuiCond_FirstUseEver);
-    if (!ImGui::Begin("Example: Property editor", p_open))
-    {
-        ImGui::End();
-        return;
-    }
-
-    HelpMarker(
-        "This example shows how you may implement a property editor using two columns.\n"
-        "All objects/fields data are dummies here.\n"
-        "Remember that in many simple cases, you can use ImGui::SameLine(xxx) to position\n"
-        "your cursor horizontally instead of using the Columns() API.");
-
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2, 2));
-    if (ImGui::BeginTable("split", 2, ImGuiTableFlags_BordersOuter | ImGuiTableFlags_Resizable))
-    {
-        for (int obj_i = 0; obj_i < 4; obj_i++)
-        {
-            ShowPlaceholderObject("Object", obj_i);
-        }
-        ImGui::EndTable();
-    }
-    ImGui::PopStyleVar();
-    ImGui::End();
-}
-
-static void ShowExampleAppLongText(bool* p_open)
-{
-    ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-    if (!ImGui::Begin("Example: Long text display", p_open))
-    {
-        ImGui::End();
-        return;
-    }
-
-    static int test_type = 0;
-    static ImGuiTextBuffer log;
-    static int lines = 0;
-    ImGui::Text("Printing unusually long amount of text.");
-    ImGui::Combo("Test type", &test_type,
-        "Single call to TextUnformatted()\0"
-        "Multiple calls to Text(), clipped\0"
-        "Multiple calls to Text(), not clipped (slow)\0");
-    ImGui::Text("Buffer contents: %d lines, %d bytes", lines, log.size());
-    if (ImGui::Button("Clear")) { log.clear(); lines = 0; }
-    ImGui::SameLine();
-    if (ImGui::Button("Add 1000 lines"))
-    {
-        for (int i = 0; i < 1000; i++)
-            log.appendf("%i The quick brown fox jumps over the lazy dog\n", lines + i);
-        lines += 1000;
-    }
-    ImGui::BeginChild("Log");
-    switch (test_type)
-    {
-    case 0:
-        ImGui::TextUnformatted(log.begin(), log.end());
-        break;
-    case 1:
-        {
-            ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0));
-            ImGuiListClipper clipper;
-            clipper.Begin(lines);
-            while (clipper.Step())
-                for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
-                    ImGui::Text("%i The quick brown fox jumps over the lazy dog", i);
-            ImGui::PopStyleVar();
-            break;
-        }
-    case 2:
-        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0));
-        for (int i = 0; i < lines; i++)
-            ImGui::Text("%i The quick brown fox jumps over the lazy dog", i);
-        ImGui::PopStyleVar();
-        break;
-    }
-    ImGui::EndChild();
-    ImGui::End();
-}
-
-static void ShowExampleAppAutoResize(bool* p_open)
-{
-    if (!ImGui::Begin("Example: Auto-resizing window", p_open, ImGuiWindowFlags_AlwaysAutoResize))
-    {
-        ImGui::End();
-        return;
-    }
-
-    static int lines = 10;
-    ImGui::TextUnformatted(
-        "Window will resize every-frame to the size of its content.\n"
-        "Note that you probably don't want to query the window size to\n"
-        "output your content because that would create a feedback loop.");
-    ImGui::SliderInt("Number of lines", &lines, 1, 20);
-    for (int i = 0; i < lines; i++)
-        ImGui::Text("%*sThis is line %d", i * 4, "", i);        
-    ImGui::End();
-}
-
-static void ShowExampleAppConstrainedResize(bool* p_open)
-{
-    struct CustomConstraints
-    {
-        static void Square(ImGuiSizeCallbackData* data) { data->DesiredSize.x = data->DesiredSize.y = IM_MAX(data->DesiredSize.x, data->DesiredSize.y); }
-        static void Step(ImGuiSizeCallbackData* data)   { float step = (float)(int)(intptr_t)data->UserData; data->DesiredSize = ImVec2((int)(data->DesiredSize.x / step + 0.5f) * step, (int)(data->DesiredSize.y / step + 0.5f) * step); }
-    };
-
-    const char* test_desc[] =
-    {
-        "Resize vertical only",
-        "Resize horizontal only",
-        "Width > 100, Height > 100",
-        "Width 400-500",
-        "Height 400-500",
-        "Custom: Always Square",
-        "Custom: Fixed Steps (100)",
-    };
-
-    static bool auto_resize = false;
-    static int type = 0;
-    static int display_lines = 10;
-    if (type == 0) ImGui::SetNextWindowSizeConstraints(ImVec2(-1, 0),    ImVec2(-1, FLT_MAX));        
-    if (type == 1) ImGui::SetNextWindowSizeConstraints(ImVec2(0, -1),    ImVec2(FLT_MAX, -1));        
-    if (type == 2) ImGui::SetNextWindowSizeConstraints(ImVec2(100, 100), ImVec2(FLT_MAX, FLT_MAX));       
-    if (type == 3) ImGui::SetNextWindowSizeConstraints(ImVec2(400, -1),  ImVec2(500, -1));            
-    if (type == 4) ImGui::SetNextWindowSizeConstraints(ImVec2(-1, 400),  ImVec2(-1, 500));            
-    if (type == 5) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0),     ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::Square);                       
-    if (type == 6) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0),     ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::Step, (void*)(intptr_t)100);   
-
-    ImGuiWindowFlags flags = auto_resize ? ImGuiWindowFlags_AlwaysAutoResize : 0;
-    if (ImGui::Begin("Example: Constrained Resize", p_open, flags))
-    {
-        if (ImGui::Button("200x200")) { ImGui::SetWindowSize(ImVec2(200, 200)); } ImGui::SameLine();
-        if (ImGui::Button("500x500")) { ImGui::SetWindowSize(ImVec2(500, 500)); } ImGui::SameLine();
-        if (ImGui::Button("800x200")) { ImGui::SetWindowSize(ImVec2(800, 200)); }
-        ImGui::SetNextItemWidth(200);
-        ImGui::Combo("Constraint", &type, test_desc, IM_ARRAYSIZE(test_desc));
-        ImGui::SetNextItemWidth(200);
-        ImGui::DragInt("Lines", &display_lines, 0.2f, 1, 100);
-        ImGui::Checkbox("Auto-resize", &auto_resize);
-        for (int i = 0; i < display_lines; i++)
-            ImGui::Text("%*sHello, sailor! Making this line long enough for the example.", i * 4, "");
-    }
-    ImGui::End();
-}
-
-static void ShowExampleAppSimpleOverlay(bool* p_open)
-{
-    const float DISTANCE = 10.0f;
-    static int corner = 0;
-    ImGuiIO& io = ImGui::GetIO();
-    ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav;
-    if (corner != -1)
-    {
-        window_flags |= ImGuiWindowFlags_NoMove;
-        ImVec2 window_pos = ImVec2((corner & 1) ? io.DisplaySize.x - DISTANCE : DISTANCE, (corner & 2) ? io.DisplaySize.y - DISTANCE : DISTANCE);
-        ImVec2 window_pos_pivot = ImVec2((corner & 1) ? 1.0f : 0.0f, (corner & 2) ? 1.0f : 0.0f);
-        ImGui::SetNextWindowPos(window_pos, ImGuiCond_Always, window_pos_pivot);
-    }
-    ImGui::SetNextWindowBgAlpha(0.35f);   
-    if (ImGui::Begin("Example: Simple overlay", p_open, window_flags))
-    {
-        ImGui::Text("Simple overlay\n" "in the corner of the screen.\n" "(right-click to change position)");
-        ImGui::Separator();
-        if (ImGui::IsMousePosValid())
-            ImGui::Text("Mouse Position: (%.1f,%.1f)", io.MousePos.x, io.MousePos.y);
-        else
-            ImGui::Text("Mouse Position: <invalid>");
-        if (ImGui::BeginPopupContextWindow())
-        {
-            if (ImGui::MenuItem("Custom",       NULL, corner == -1)) corner = -1;
-            if (ImGui::MenuItem("Top-left",     NULL, corner == 0)) corner = 0;
-            if (ImGui::MenuItem("Top-right",    NULL, corner == 1)) corner = 1;
-            if (ImGui::MenuItem("Bottom-left",  NULL, corner == 2)) corner = 2;
-            if (ImGui::MenuItem("Bottom-right", NULL, corner == 3)) corner = 3;
-            if (p_open && ImGui::MenuItem("Close")) *p_open = false;
-            ImGui::EndPopup();
-        }
-    }
-    ImGui::End();
-}
-
-static void ShowExampleAppWindowTitles(bool*)
-{
-    ImGui::SetNextWindowPos(ImVec2(100, 100), ImGuiCond_FirstUseEver);
-    ImGui::Begin("Same title as another window##1");
-    ImGui::Text("This is window 1.\nMy title is the same as window 2, but my identifier is unique.");
-    ImGui::End();
-
-    ImGui::SetNextWindowPos(ImVec2(100, 200), ImGuiCond_FirstUseEver);
-    ImGui::Begin("Same title as another window##2");
-    ImGui::Text("This is window 2.\nMy title is the same as window 1, but my identifier is unique.");
-    ImGui::End();
-
-    char buf[128];
-    sprintf(buf, "Animated title %c %d###AnimatedTitle", "|/-\\"[(int)(ImGui::GetTime() / 0.25f) & 3], ImGui::GetFrameCount());
-    ImGui::SetNextWindowPos(ImVec2(100, 300), ImGuiCond_FirstUseEver);
-    ImGui::Begin(buf);
-    ImGui::Text("This window has a changing title.");
-    ImGui::End();
-}
-
-static void ShowExampleAppCustomRendering(bool* p_open)
-{
-    if (!ImGui::Begin("Example: Custom rendering", p_open))
-    {
-        ImGui::End();
-        return;
-    }
-
-    if (ImGui::BeginTabBar("##TabBar"))
-    {
-        if (ImGui::BeginTabItem("Primitives"))
-        {
-            ImGui::PushItemWidth(-ImGui::GetFontSize() * 15);
-            ImDrawList* draw_list = ImGui::GetWindowDrawList();
-
-            ImGui::Text("Gradients");
-            ImVec2 gradient_size = ImVec2(ImGui::CalcItemWidth(), ImGui::GetFrameHeight());
-            {
-                ImVec2 p0 = ImGui::GetCursorScreenPos();
-                ImVec2 p1 = ImVec2(p0.x + gradient_size.x, p0.y + gradient_size.y);
-                ImU32 col_a = ImGui::GetColorU32(IM_COL32(0, 0, 0, 255));
-                ImU32 col_b = ImGui::GetColorU32(IM_COL32(255, 255, 255, 255));
-                draw_list->AddRectFilledMultiColor(p0, p1, col_a, col_b, col_b, col_a);
-                ImGui::InvisibleButton("##gradient1", gradient_size);
-            }
-            {
-                ImVec2 p0 = ImGui::GetCursorScreenPos();
-                ImVec2 p1 = ImVec2(p0.x + gradient_size.x, p0.y + gradient_size.y);
-                ImU32 col_a = ImGui::GetColorU32(IM_COL32(0, 255, 0, 255));
-                ImU32 col_b = ImGui::GetColorU32(IM_COL32(255, 0, 0, 255));
-                draw_list->AddRectFilledMultiColor(p0, p1, col_a, col_b, col_b, col_a);
-                ImGui::InvisibleButton("##gradient2", gradient_size);
-            }
-
-            ImGui::Text("All primitives");
-            static float sz = 36.0f;
-            static float thickness = 3.0f;
-            static int ngon_sides = 6;
-            static bool circle_segments_override = false;
-            static int circle_segments_override_v = 12;
-            static bool curve_segments_override = false;
-            static int curve_segments_override_v = 8;
-            static ImVec4 colf = ImVec4(1.0f, 1.0f, 0.4f, 1.0f);
-            ImGui::DragFloat("Size", &sz, 0.2f, 2.0f, 72.0f, "%.0f");
-            ImGui::DragFloat("Thickness", &thickness, 0.05f, 1.0f, 8.0f, "%.02f");
-            ImGui::SliderInt("N-gon sides", &ngon_sides, 3, 12);
-            ImGui::Checkbox("##circlesegmentoverride", &circle_segments_override);
-            ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-            circle_segments_override |= ImGui::SliderInt("Circle segments override", &circle_segments_override_v, 3, 40);
-            ImGui::Checkbox("##curvessegmentoverride", &curve_segments_override);
-            ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
-            curve_segments_override |= ImGui::SliderInt("Curves segments override", &curve_segments_override_v, 3, 40);
-            ImGui::ColorEdit4("Color", &colf.x);
-
-            const ImVec2 p = ImGui::GetCursorScreenPos();
-            const ImU32 col = ImColor(colf);
-            const float spacing = 10.0f;
-            const ImDrawCornerFlags corners_none = 0;
-            const ImDrawCornerFlags corners_all = ImDrawCornerFlags_All;
-            const ImDrawCornerFlags corners_tl_br = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotRight;
-            const int circle_segments = circle_segments_override ? circle_segments_override_v : 0;
-            const int curve_segments = curve_segments_override ? curve_segments_override_v : 0;
-            float x = p.x + 4.0f;
-            float y = p.y + 4.0f;
-            for (int n = 0; n < 2; n++)
-            {
-                float th = (n == 0) ? 1.0f : thickness;
-                draw_list->AddNgon(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, ngon_sides, th);                 x += sz + spacing;   
-                draw_list->AddCircle(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, circle_segments, th);          x += sz + spacing;   
-                draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 0.0f,  corners_none, th);             x += sz + spacing;   
-                draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_all, th);              x += sz + spacing;       
-                draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_tl_br, th);            x += sz + spacing;       
-                draw_list->AddTriangle(ImVec2(x+sz*0.5f,y), ImVec2(x+sz, y+sz-0.5f), ImVec2(x, y+sz-0.5f), col, th);x += sz + spacing;   
-                draw_list->AddLine(ImVec2(x, y), ImVec2(x + sz, y), col, th);                                       x += sz + spacing;            
-                draw_list->AddLine(ImVec2(x, y), ImVec2(x, y + sz), col, th);                                       x += spacing;                 
-                draw_list->AddLine(ImVec2(x, y), ImVec2(x + sz, y + sz), col, th);                                  x += sz + spacing;    
-
-                ImVec2 cp3[3] = { ImVec2(x, y + sz * 0.6f), ImVec2(x + sz * 0.5f, y - sz * 0.4f), ImVec2(x + sz, y + sz) };
-                draw_list->AddBezierQuadratic(cp3[0], cp3[1], cp3[2], col, th, curve_segments); x += sz + spacing;
-
-                ImVec2 cp4[4] = { ImVec2(x, y), ImVec2(x + sz * 1.3f, y + sz * 0.3f), ImVec2(x + sz - sz * 1.3f, y + sz - sz * 0.3f), ImVec2(x + sz, y + sz) };
-                draw_list->AddBezierCubic(cp4[0], cp4[1], cp4[2], cp4[3], col, th, curve_segments);
-
-                x = p.x + 4;
-                y += sz + spacing;
-            }
-            draw_list->AddNgonFilled(ImVec2(x + sz * 0.5f, y + sz * 0.5f), sz*0.5f, col, ngon_sides);               x += sz + spacing;   
-            draw_list->AddCircleFilled(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, circle_segments);            x += sz + spacing;   
-            draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col);                                    x += sz + spacing;   
-            draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f);                             x += sz + spacing;       
-            draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_tl_br);              x += sz + spacing;       
-            draw_list->AddTriangleFilled(ImVec2(x+sz*0.5f,y), ImVec2(x+sz, y+sz-0.5f), ImVec2(x, y+sz-0.5f), col);  x += sz + spacing;   
-            draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + thickness), col);                             x += sz + spacing;            
-            draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + thickness, y + sz), col);                             x += spacing * 2.0f;          
-            draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + 1, y + 1), col);                                      x += sz;                
-            draw_list->AddRectFilledMultiColor(ImVec2(x, y), ImVec2(x + sz, y + sz), IM_COL32(0, 0, 0, 255), IM_COL32(255, 0, 0, 255), IM_COL32(255, 255, 0, 255), IM_COL32(0, 255, 0, 255));
-
-            ImGui::Dummy(ImVec2((sz + spacing) * 10.2f, (sz + spacing) * 3.0f));
-            ImGui::PopItemWidth();
-            ImGui::EndTabItem();
-        }
-
-        if (ImGui::BeginTabItem("Canvas"))
-        {
-            static ImVector<ImVec2> points;
-            static ImVec2 scrolling(0.0f, 0.0f);
-            static bool opt_enable_grid = true;
-            static bool opt_enable_context_menu = true;
-            static bool adding_line = false;
-
-            ImGui::Checkbox("Enable grid", &opt_enable_grid);
-            ImGui::Checkbox("Enable context menu", &opt_enable_context_menu);
-            ImGui::Text("Mouse Left: drag to add lines,\nMouse Right: drag to scroll, click for context menu.");
-
-            ImVec2 canvas_p0 = ImGui::GetCursorScreenPos();           
-            ImVec2 canvas_sz = ImGui::GetContentRegionAvail();        
-            if (canvas_sz.x < 50.0f) canvas_sz.x = 50.0f;
-            if (canvas_sz.y < 50.0f) canvas_sz.y = 50.0f;
-            ImVec2 canvas_p1 = ImVec2(canvas_p0.x + canvas_sz.x, canvas_p0.y + canvas_sz.y);
-
-            ImGuiIO& io = ImGui::GetIO();
-            ImDrawList* draw_list = ImGui::GetWindowDrawList();
-            draw_list->AddRectFilled(canvas_p0, canvas_p1, IM_COL32(50, 50, 50, 255));
-            draw_list->AddRect(canvas_p0, canvas_p1, IM_COL32(255, 255, 255, 255));
-
-            ImGui::InvisibleButton("canvas", canvas_sz, ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight);
-            const bool is_hovered = ImGui::IsItemHovered();  
-            const bool is_active = ImGui::IsItemActive();    
-            const ImVec2 origin(canvas_p0.x + scrolling.x, canvas_p0.y + scrolling.y);    
-            const ImVec2 mouse_pos_in_canvas(io.MousePos.x - origin.x, io.MousePos.y - origin.y);
-
-            if (is_hovered && !adding_line && ImGui::IsMouseClicked(ImGuiMouseButton_Left))
-            {
-                points.push_back(mouse_pos_in_canvas);
-                points.push_back(mouse_pos_in_canvas);
-                adding_line = true;
-            }
-            if (adding_line)
-            {
-                points.back() = mouse_pos_in_canvas;
-                if (!ImGui::IsMouseDown(ImGuiMouseButton_Left))
-                    adding_line = false;
-            }
-
-            const float mouse_threshold_for_pan = opt_enable_context_menu ? -1.0f : 0.0f;
-            if (is_active && ImGui::IsMouseDragging(ImGuiMouseButton_Right, mouse_threshold_for_pan))
-            {
-                scrolling.x += io.MouseDelta.x;
-                scrolling.y += io.MouseDelta.y;
-            }
-
-            ImVec2 drag_delta = ImGui::GetMouseDragDelta(ImGuiMouseButton_Right);
-            if (opt_enable_context_menu && ImGui::IsMouseReleased(ImGuiMouseButton_Right) && drag_delta.x == 0.0f && drag_delta.y == 0.0f)
-                ImGui::OpenPopupOnItemClick("context");
-            if (ImGui::BeginPopup("context"))
-            {
-                if (adding_line)
-                    points.resize(points.size() - 2);
-                adding_line = false;
-                if (ImGui::MenuItem("Remove one", NULL, false, points.Size > 0)) { points.resize(points.size() - 2); }
-                if (ImGui::MenuItem("Remove all", NULL, false, points.Size > 0)) { points.clear(); }
-                ImGui::EndPopup();
-            }
-
-            draw_list->PushClipRect(canvas_p0, canvas_p1, true);
-            if (opt_enable_grid)
-            {
-                const float GRID_STEP = 64.0f;
-                for (float x = fmodf(scrolling.x, GRID_STEP); x < canvas_sz.x; x += GRID_STEP)
-                    draw_list->AddLine(ImVec2(canvas_p0.x + x, canvas_p0.y), ImVec2(canvas_p0.x + x, canvas_p1.y), IM_COL32(200, 200, 200, 40));
-                for (float y = fmodf(scrolling.y, GRID_STEP); y < canvas_sz.y; y += GRID_STEP)
-                    draw_list->AddLine(ImVec2(canvas_p0.x, canvas_p0.y + y), ImVec2(canvas_p1.x, canvas_p0.y + y), IM_COL32(200, 200, 200, 40));
-            }
-            for (int n = 0; n < points.Size; n += 2)
-                draw_list->AddLine(ImVec2(origin.x + points[n].x, origin.y + points[n].y), ImVec2(origin.x + points[n + 1].x, origin.y + points[n + 1].y), IM_COL32(255, 255, 0, 255), 2.0f);
-            draw_list->PopClipRect();
-
-            ImGui::EndTabItem();
-        }
-
-        if (ImGui::BeginTabItem("BG/FG draw lists"))
-        {
-            static bool draw_bg = true;
-            static bool draw_fg = true;
-            ImGui::Checkbox("Draw in Background draw list", &draw_bg);
-            ImGui::SameLine(); HelpMarker("The Background draw list will be rendered below every Dear ImGui windows.");
-            ImGui::Checkbox("Draw in Foreground draw list", &draw_fg);
-            ImGui::SameLine(); HelpMarker("The Foreground draw list will be rendered over every Dear ImGui windows.");
-            ImVec2 window_pos = ImGui::GetWindowPos();
-            ImVec2 window_size = ImGui::GetWindowSize();
-            ImVec2 window_center = ImVec2(window_pos.x + window_size.x * 0.5f, window_pos.y + window_size.y * 0.5f);
-            if (draw_bg)
-                ImGui::GetBackgroundDrawList()->AddCircle(window_center, window_size.x * 0.6f, IM_COL32(255, 0, 0, 200), 0, 10 + 4);
-            if (draw_fg)
-                ImGui::GetForegroundDrawList()->AddCircle(window_center, window_size.y * 0.6f, IM_COL32(0, 255, 0, 200), 0, 10);
-            ImGui::EndTabItem();
-        }
-
-        ImGui::EndTabBar();
-    }
-
-    ImGui::End();
-}
-
-struct MyDocument
-{
-    const char* Name;         
-    bool        Open;                      
-    bool        OpenPrev;         
-    bool        Dirty;             
-    bool        WantClose;      
-    ImVec4      Color;             
-
-    MyDocument(const char* name, bool open = true, const ImVec4& color = ImVec4(1.0f, 1.0f, 1.0f, 1.0f))
-    {
-        Name = name;
-        Open = OpenPrev = open;
-        Dirty = false;
-        WantClose = false;
-        Color = color;
-    }
-    void DoOpen()       { Open = true; }
-    void DoQueueClose() { WantClose = true; }
-    void DoForceClose() { Open = false; Dirty = false; }
-    void DoSave()       { Dirty = false; }
-
-    static void DisplayContents(MyDocument* doc)
-    {
-        ImGui::PushID(doc);
-        ImGui::Text("Document \"%s\"", doc->Name);
-        ImGui::PushStyleColor(ImGuiCol_Text, doc->Color);
-        ImGui::TextWrapped("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
-        ImGui::PopStyleColor();
-        if (ImGui::Button("Modify", ImVec2(100, 0)))
-            doc->Dirty = true;
-        ImGui::SameLine();
-        if (ImGui::Button("Save", ImVec2(100, 0)))
-            doc->DoSave();
-        ImGui::ColorEdit3("color", &doc->Color.x);           
-        ImGui::PopID();
-    }
-
-    static void DisplayContextMenu(MyDocument* doc)
-    {
-        if (!ImGui::BeginPopupContextItem())
-            return;
-
-        char buf[256];
-        sprintf(buf, "Save %s", doc->Name);
-        if (ImGui::MenuItem(buf, "CTRL+S", false, doc->Open))
-            doc->DoSave();
-        if (ImGui::MenuItem("Close", "CTRL+W", false, doc->Open))
-            doc->DoQueueClose();
-        ImGui::EndPopup();
-    }
-};
-
-struct ExampleAppDocuments
-{
-    ImVector<MyDocument> Documents;
-
-    ExampleAppDocuments()
-    {
-        Documents.push_back(MyDocument("Lettuce",             true,  ImVec4(0.4f, 0.8f, 0.4f, 1.0f)));
-        Documents.push_back(MyDocument("Eggplant",            true,  ImVec4(0.8f, 0.5f, 1.0f, 1.0f)));
-        Documents.push_back(MyDocument("Carrot",              true,  ImVec4(1.0f, 0.8f, 0.5f, 1.0f)));
-        Documents.push_back(MyDocument("Tomato",              false, ImVec4(1.0f, 0.3f, 0.4f, 1.0f)));
-        Documents.push_back(MyDocument("A Rather Long Title", false));
-        Documents.push_back(MyDocument("Some Document",       false));
-    }
-};
-
-static void NotifyOfDocumentsClosedElsewhere(ExampleAppDocuments& app)
-{
-    for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
-    {
-        MyDocument* doc = &app.Documents[doc_n];
-        if (!doc->Open && doc->OpenPrev)
-            ImGui::SetTabItemClosed(doc->Name);
-        doc->OpenPrev = doc->Open;
-    }
-}
-
-void ShowExampleAppDocuments(bool* p_open)
-{
-    static ExampleAppDocuments app;
-
-    static bool opt_reorderable = true;
-    static ImGuiTabBarFlags opt_fitting_flags = ImGuiTabBarFlags_FittingPolicyDefault_;
-
-    bool window_contents_visible = ImGui::Begin("Example: Documents", p_open, ImGuiWindowFlags_MenuBar);
-    if (!window_contents_visible)
-    {
-        ImGui::End();
-        return;
-    }
-
-    if (ImGui::BeginMenuBar())
-    {
-        if (ImGui::BeginMenu("File"))
-        {
-            int open_count = 0;
-            for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
-                open_count += app.Documents[doc_n].Open ? 1 : 0;
-
-            if (ImGui::BeginMenu("Open", open_count < app.Documents.Size))
-            {
-                for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
-                {
-                    MyDocument* doc = &app.Documents[doc_n];
-                    if (!doc->Open)
-                        if (ImGui::MenuItem(doc->Name))
-                            doc->DoOpen();
-                }
-                ImGui::EndMenu();
-            }
-            if (ImGui::MenuItem("Close All Documents", NULL, false, open_count > 0))
-                for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
-                    app.Documents[doc_n].DoQueueClose();
-            if (ImGui::MenuItem("Exit", "Alt+F4")) {}
-            ImGui::EndMenu();
-        }
-        ImGui::EndMenuBar();
-    }
-
-    for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
-    {
-        MyDocument* doc = &app.Documents[doc_n];
-        if (doc_n > 0)
-            ImGui::SameLine();
-        ImGui::PushID(doc);
-        if (ImGui::Checkbox(doc->Name, &doc->Open))
-            if (!doc->Open)
-                doc->DoForceClose();
-        ImGui::PopID();
-    }
-
-    ImGui::Separator();
-
-    {
-        ImGuiTabBarFlags tab_bar_flags = (opt_fitting_flags) | (opt_reorderable ? ImGuiTabBarFlags_Reorderable : 0);
-        if (ImGui::BeginTabBar("##tabs", tab_bar_flags))
-        {
-            if (opt_reorderable)
-                NotifyOfDocumentsClosedElsewhere(app);
-
-            for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
-            {
-                MyDocument* doc = &app.Documents[doc_n];
-                if (!doc->Open)
-                    continue;
-
-                ImGuiTabItemFlags tab_flags = (doc->Dirty ? ImGuiTabItemFlags_UnsavedDocument : 0);
-                bool visible = ImGui::BeginTabItem(doc->Name, &doc->Open, tab_flags);
-
-                if (!doc->Open && doc->Dirty)
-                {
-                    doc->Open = true;
-                    doc->DoQueueClose();
-                }
-
-                MyDocument::DisplayContextMenu(doc);
-                if (visible)
-                {
-                    MyDocument::DisplayContents(doc);
-                    ImGui::EndTabItem();
-                }
-            }
-
-            ImGui::EndTabBar();
-        }
-    }
-
-    static ImVector<MyDocument*> close_queue;
-    if (close_queue.empty())
-    {
-        for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
-        {
-            MyDocument* doc = &app.Documents[doc_n];
-            if (doc->WantClose)
-            {
-                doc->WantClose = false;
-                close_queue.push_back(doc);
-            }
-        }
-    }
-
-    if (!close_queue.empty())
-    {
-        int close_queue_unsaved_documents = 0;
-        for (int n = 0; n < close_queue.Size; n++)
-            if (close_queue[n]->Dirty)
-                close_queue_unsaved_documents++;
-
-        if (close_queue_unsaved_documents == 0)
-        {
-            for (int n = 0; n < close_queue.Size; n++)
-                close_queue[n]->DoForceClose();
-            close_queue.clear();
-        }
-        else
-        {
-            if (!ImGui::IsPopupOpen("Save?"))
-                ImGui::OpenPopup("Save?");
-            if (ImGui::BeginPopupModal("Save?", NULL, ImGuiWindowFlags_AlwaysAutoResize))
-            {
-                ImGui::Text("Save change to the following items?");
-                float item_height = ImGui::GetTextLineHeightWithSpacing();
-                if (ImGui::BeginChildFrame(ImGui::GetID("frame"), ImVec2(-FLT_MIN, 6.25f * item_height)))
-                {
-                    for (int n = 0; n < close_queue.Size; n++)
-                        if (close_queue[n]->Dirty)
-                            ImGui::Text("%s", close_queue[n]->Name);
-                    ImGui::EndChildFrame();
-                }
-
-                ImVec2 button_size(ImGui::GetFontSize() * 7.0f, 0.0f);
-                if (ImGui::Button("Yes", button_size))
-                {
-                    for (int n = 0; n < close_queue.Size; n++)
-                    {
-                        if (close_queue[n]->Dirty)
-                            close_queue[n]->DoSave();
-                        close_queue[n]->DoForceClose();
-                    }
-                    close_queue.clear();
-                    ImGui::CloseCurrentPopup();
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("No", button_size))
-                {
-                    for (int n = 0; n < close_queue.Size; n++)
-                        close_queue[n]->DoForceClose();
-                    close_queue.clear();
-                    ImGui::CloseCurrentPopup();
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Cancel", button_size))
-                {
-                    close_queue.clear();
-                    ImGui::CloseCurrentPopup();
-                }
-                ImGui::EndPopup();
-            }
-        }
-    }
-
-    ImGui::End();
-}
-
-#else
-
-void ImGui::ShowAboutWindow(bool*) {}
-void ImGui::ShowDemoWindow(bool*) {}
-void ImGui::ShowUserGuide() {}
-void ImGui::ShowStyleEditor(ImGuiStyle*) {}
-
-#endif
-
-#endif   
diff --git a/SpyCustom/imgui/imgui_draw.cpp b/SpyCustom/imgui/imgui_draw.cpp
deleted file mode 100644
index ddf42c3..0000000
--- a/SpyCustom/imgui/imgui_draw.cpp
+++ /dev/null
@@ -1,3568 +0,0 @@
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "imgui.h"
-#ifndef IMGUI_DISABLE
-
-#ifndef IMGUI_DEFINE_MATH_OPERATORS
-#define IMGUI_DEFINE_MATH_OPERATORS
-#endif
-
-#include "imgui_internal.h"
-#ifdef IMGUI_ENABLE_FREETYPE
-#include "misc/freetype/imgui_freetype.h"
-#endif
-
-#include <stdio.h>         
-#if !defined(alloca)
-#if defined(__GLIBC__) || defined(__sun) || defined(__APPLE__) || defined(__NEWLIB__)
-#include <alloca.h>                     
-#elif defined(_WIN32)
-#include <malloc.h>      
-#if !defined(alloca)
-#define alloca _alloca       
-#endif
-#else
-#include <stdlib.h>      
-#endif
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (disable: 4127)     
-#pragma warning (disable: 4505)         
-#pragma warning (disable: 4996)              
-#endif
-
-#if defined(__clang__)
-#if __has_warning("-Wunknown-warning-option")
-#pragma clang diagnostic ignored "-Wunknown-warning-option"                                                             
-#endif
-#if __has_warning("-Walloca")
-#pragma clang diagnostic ignored "-Walloca"                                
-#endif
-#pragma clang diagnostic ignored "-Wunknown-pragmas"                     
-#pragma clang diagnostic ignored "-Wold-style-cast"                                                       
-#pragma clang diagnostic ignored "-Wfloat-equal"                                      
-#pragma clang diagnostic ignored "-Wglobal-constructors"                                     
-#pragma clang diagnostic ignored "-Wsign-conversion"                     
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"                                    
-#pragma clang diagnostic ignored "-Wcomma"                                 
-#pragma clang diagnostic ignored "-Wreserved-id-macro"                     
-#pragma clang diagnostic ignored "-Wdouble-promotion"                                            
-#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion"            
-#elif defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wpragmas"                          
-#pragma GCC diagnostic ignored "-Wunused-function"                
-#pragma GCC diagnostic ignored "-Wdouble-promotion"                     
-#pragma GCC diagnostic ignored "-Wconversion"                         
-#pragma GCC diagnostic ignored "-Wstack-protector"                    
-#pragma GCC diagnostic ignored "-Wclass-memaccess"                              
-#endif
-
-#ifdef IMGUI_STB_NAMESPACE
-namespace IMGUI_STB_NAMESPACE
-{
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (push)
-#pragma warning (disable: 4456)                                    
-#endif
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#pragma clang diagnostic ignored "-Wcast-qual"                          
-#endif
-
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtype-limits"                           
-#pragma GCC diagnostic ignored "-Wcast-qual"                              
-#endif
-
-#ifndef STB_RECT_PACK_IMPLEMENTATION                                        
-#ifndef IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION                      
-#define STBRP_STATIC
-#define STBRP_ASSERT(x)     do { IM_ASSERT(x); } while (0)
-#define STBRP_SORT          ImQsort
-#define STB_RECT_PACK_IMPLEMENTATION
-#endif
-#ifdef IMGUI_STB_RECT_PACK_FILENAME
-#include IMGUI_STB_RECT_PACK_FILENAME
-#else
-#include "imstb_rectpack.h"
-#endif
-#endif
-
-#ifdef  IMGUI_ENABLE_STB_TRUETYPE
-#ifndef STB_TRUETYPE_IMPLEMENTATION                                         
-#ifndef IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION                       
-#define STBTT_malloc(x,u)   ((void)(u), IM_ALLOC(x))
-#define STBTT_free(x,u)     ((void)(u), IM_FREE(x))
-#define STBTT_assert(x)     do { IM_ASSERT(x); } while(0)
-#define STBTT_fmod(x,y)     ImFmod(x,y)
-#define STBTT_sqrt(x)       ImSqrt(x)
-#define STBTT_pow(x,y)      ImPow(x,y)
-#define STBTT_fabs(x)       ImFabs(x)
-#define STBTT_ifloor(x)     ((int)ImFloorStd(x))
-#define STBTT_iceil(x)      ((int)ImCeil(x))
-#define STBTT_STATIC
-#define STB_TRUETYPE_IMPLEMENTATION
-#else
-#define STBTT_DEF extern
-#endif
-#ifdef IMGUI_STB_TRUETYPE_FILENAME
-#include IMGUI_STB_TRUETYPE_FILENAME
-#else
-#include "imstb_truetype.h"
-#endif
-#endif
-#endif  
-
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-#if defined(_MSC_VER)
-#pragma warning (pop)
-#endif
-
-#ifdef IMGUI_STB_NAMESPACE
-}   
-using namespace IMGUI_STB_NAMESPACE;
-#endif
-
-void ImGui::StyleColorsDark(ImGuiStyle* dst)
-{
-    ImGuiStyle* style = dst ? dst : &ImGui::GetStyle();
-    ImVec4* colors = style->Colors;
-
-    colors[ImGuiCol_Text]                   = ImVec4(1.00f, 1.00f, 1.00f, 1.00f);
-    colors[ImGuiCol_TextDisabled]           = ImVec4(0.50f, 0.50f, 0.50f, 1.00f);
-    colors[ImGuiCol_WindowBg]               = ImVec4(0.06f, 0.06f, 0.06f, 0.94f);
-    colors[ImGuiCol_ChildBg]                = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
-    colors[ImGuiCol_PopupBg]                = ImVec4(0.08f, 0.08f, 0.08f, 0.94f);
-    colors[ImGuiCol_Border]                 = ImVec4(0.43f, 0.43f, 0.50f, 0.50f);
-    colors[ImGuiCol_BorderShadow]           = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
-    colors[ImGuiCol_FrameBg]                = ImVec4(0.16f, 0.29f, 0.48f, 0.54f);
-    colors[ImGuiCol_FrameBgHovered]         = ImVec4(0.26f, 0.59f, 0.98f, 0.40f);
-    colors[ImGuiCol_FrameBgActive]          = ImVec4(0.26f, 0.59f, 0.98f, 0.67f);
-    colors[ImGuiCol_TitleBg]                = ImVec4(0.04f, 0.04f, 0.04f, 1.00f);
-    colors[ImGuiCol_TitleBgActive]          = ImVec4(0.16f, 0.29f, 0.48f, 1.00f);
-    colors[ImGuiCol_TitleBgCollapsed]       = ImVec4(0.00f, 0.00f, 0.00f, 0.51f);
-    colors[ImGuiCol_MenuBarBg]              = ImVec4(0.14f, 0.14f, 0.14f, 1.00f);
-    colors[ImGuiCol_ScrollbarBg]            = ImVec4(0.02f, 0.02f, 0.02f, 0.53f);
-    colors[ImGuiCol_ScrollbarGrab]          = ImVec4(0.31f, 0.31f, 0.31f, 1.00f);
-    colors[ImGuiCol_ScrollbarGrabHovered]   = ImVec4(0.41f, 0.41f, 0.41f, 1.00f);
-    colors[ImGuiCol_ScrollbarGrabActive]    = ImVec4(0.51f, 0.51f, 0.51f, 1.00f);
-    colors[ImGuiCol_CheckMark]              = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
-    colors[ImGuiCol_SliderGrab]             = ImVec4(0.24f, 0.52f, 0.88f, 1.00f);
-    colors[ImGuiCol_SliderGrabActive]       = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
-    colors[ImGuiCol_Button]                 = ImVec4(0.26f, 0.59f, 0.98f, 0.40f);
-    colors[ImGuiCol_ButtonHovered]          = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
-    colors[ImGuiCol_ButtonActive]           = ImVec4(0.06f, 0.53f, 0.98f, 1.00f);
-    colors[ImGuiCol_Header]                 = ImVec4(0.26f, 0.59f, 0.98f, 0.31f);
-    colors[ImGuiCol_HeaderHovered]          = ImVec4(0.26f, 0.59f, 0.98f, 0.80f);
-    colors[ImGuiCol_HeaderActive]           = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
-    colors[ImGuiCol_Separator]              = colors[ImGuiCol_Border];
-    colors[ImGuiCol_SeparatorHovered]       = ImVec4(0.10f, 0.40f, 0.75f, 0.78f);
-    colors[ImGuiCol_SeparatorActive]        = ImVec4(0.10f, 0.40f, 0.75f, 1.00f);
-    colors[ImGuiCol_ResizeGrip]             = ImVec4(0.26f, 0.59f, 0.98f, 0.20f);
-    colors[ImGuiCol_ResizeGripHovered]      = ImVec4(0.26f, 0.59f, 0.98f, 0.67f);
-    colors[ImGuiCol_ResizeGripActive]       = ImVec4(0.26f, 0.59f, 0.98f, 0.95f);
-    colors[ImGuiCol_Tab]                    = ImLerp(colors[ImGuiCol_Header],       colors[ImGuiCol_TitleBgActive], 0.80f);
-    colors[ImGuiCol_TabHovered]             = colors[ImGuiCol_HeaderHovered];
-    colors[ImGuiCol_TabActive]              = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f);
-    colors[ImGuiCol_TabUnfocused]           = ImLerp(colors[ImGuiCol_Tab],          colors[ImGuiCol_TitleBg], 0.80f);
-    colors[ImGuiCol_TabUnfocusedActive]     = ImLerp(colors[ImGuiCol_TabActive],    colors[ImGuiCol_TitleBg], 0.40f);
-    colors[ImGuiCol_PlotLines]              = ImVec4(0.61f, 0.61f, 0.61f, 1.00f);
-    colors[ImGuiCol_PlotLinesHovered]       = ImVec4(1.00f, 0.43f, 0.35f, 1.00f);
-    colors[ImGuiCol_PlotHistogram]          = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
-    colors[ImGuiCol_PlotHistogramHovered]   = ImVec4(1.00f, 0.60f, 0.00f, 1.00f);
-    colors[ImGuiCol_TableHeaderBg]          = ImVec4(0.19f, 0.19f, 0.20f, 1.00f);
-    colors[ImGuiCol_TableBorderStrong]      = ImVec4(0.31f, 0.31f, 0.35f, 1.00f);       
-    colors[ImGuiCol_TableBorderLight]       = ImVec4(0.23f, 0.23f, 0.25f, 1.00f);       
-    colors[ImGuiCol_TableRowBg]             = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
-    colors[ImGuiCol_TableRowBgAlt]          = ImVec4(1.00f, 1.00f, 1.00f, 0.06f);
-    colors[ImGuiCol_TextSelectedBg]         = ImVec4(0.26f, 0.59f, 0.98f, 0.35f);
-    colors[ImGuiCol_DragDropTarget]         = ImVec4(1.00f, 1.00f, 0.00f, 0.90f);
-    colors[ImGuiCol_NavHighlight]           = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
-    colors[ImGuiCol_NavWindowingHighlight]  = ImVec4(1.00f, 1.00f, 1.00f, 0.70f);
-    colors[ImGuiCol_NavWindowingDimBg]      = ImVec4(0.80f, 0.80f, 0.80f, 0.20f);
-    colors[ImGuiCol_ModalWindowDimBg]       = ImVec4(0.80f, 0.80f, 0.80f, 0.35f);
-}
-
-void ImGui::StyleColorsClassic(ImGuiStyle* dst)
-{
-    ImGuiStyle* style = dst ? dst : &ImGui::GetStyle();
-    ImVec4* colors = style->Colors;
-
-    colors[ImGuiCol_Text]                   = ImVec4(0.90f, 0.90f, 0.90f, 1.00f);
-    colors[ImGuiCol_TextDisabled]           = ImVec4(0.60f, 0.60f, 0.60f, 1.00f);
-    colors[ImGuiCol_WindowBg]               = ImVec4(0.00f, 0.00f, 0.00f, 0.85f);
-    colors[ImGuiCol_ChildBg]                = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
-    colors[ImGuiCol_PopupBg]                = ImVec4(0.11f, 0.11f, 0.14f, 0.92f);
-    colors[ImGuiCol_Border]                 = ImVec4(0.50f, 0.50f, 0.50f, 0.50f);
-    colors[ImGuiCol_BorderShadow]           = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
-    colors[ImGuiCol_FrameBg]                = ImVec4(0.43f, 0.43f, 0.43f, 0.39f);
-    colors[ImGuiCol_FrameBgHovered]         = ImVec4(0.47f, 0.47f, 0.69f, 0.40f);
-    colors[ImGuiCol_FrameBgActive]          = ImVec4(0.42f, 0.41f, 0.64f, 0.69f);
-    colors[ImGuiCol_TitleBg]                = ImVec4(0.27f, 0.27f, 0.54f, 0.83f);
-    colors[ImGuiCol_TitleBgActive]          = ImVec4(0.32f, 0.32f, 0.63f, 0.87f);
-    colors[ImGuiCol_TitleBgCollapsed]       = ImVec4(0.40f, 0.40f, 0.80f, 0.20f);
-    colors[ImGuiCol_MenuBarBg]              = ImVec4(0.40f, 0.40f, 0.55f, 0.80f);
-    colors[ImGuiCol_ScrollbarBg]            = ImVec4(0.20f, 0.25f, 0.30f, 0.60f);
-    colors[ImGuiCol_ScrollbarGrab]          = ImVec4(0.40f, 0.40f, 0.80f, 0.30f);
-    colors[ImGuiCol_ScrollbarGrabHovered]   = ImVec4(0.40f, 0.40f, 0.80f, 0.40f);
-    colors[ImGuiCol_ScrollbarGrabActive]    = ImVec4(0.41f, 0.39f, 0.80f, 0.60f);
-    colors[ImGuiCol_CheckMark]              = ImVec4(0.90f, 0.90f, 0.90f, 0.50f);
-    colors[ImGuiCol_SliderGrab]             = ImVec4(1.00f, 1.00f, 1.00f, 0.30f);
-    colors[ImGuiCol_SliderGrabActive]       = ImVec4(0.41f, 0.39f, 0.80f, 0.60f);
-    colors[ImGuiCol_Button]                 = ImVec4(0.35f, 0.40f, 0.61f, 0.62f);
-    colors[ImGuiCol_ButtonHovered]          = ImVec4(0.40f, 0.48f, 0.71f, 0.79f);
-    colors[ImGuiCol_ButtonActive]           = ImVec4(0.46f, 0.54f, 0.80f, 1.00f);
-    colors[ImGuiCol_Header]                 = ImVec4(0.40f, 0.40f, 0.90f, 0.45f);
-    colors[ImGuiCol_HeaderHovered]          = ImVec4(0.45f, 0.45f, 0.90f, 0.80f);
-    colors[ImGuiCol_HeaderActive]           = ImVec4(0.53f, 0.53f, 0.87f, 0.80f);
-    colors[ImGuiCol_Separator]              = ImVec4(0.50f, 0.50f, 0.50f, 0.60f);
-    colors[ImGuiCol_SeparatorHovered]       = ImVec4(0.60f, 0.60f, 0.70f, 1.00f);
-    colors[ImGuiCol_SeparatorActive]        = ImVec4(0.70f, 0.70f, 0.90f, 1.00f);
-    colors[ImGuiCol_ResizeGrip]             = ImVec4(1.00f, 1.00f, 1.00f, 0.10f);
-    colors[ImGuiCol_ResizeGripHovered]      = ImVec4(0.78f, 0.82f, 1.00f, 0.60f);
-    colors[ImGuiCol_ResizeGripActive]       = ImVec4(0.78f, 0.82f, 1.00f, 0.90f);
-    colors[ImGuiCol_Tab]                    = ImLerp(colors[ImGuiCol_Header],       colors[ImGuiCol_TitleBgActive], 0.80f);
-    colors[ImGuiCol_TabHovered]             = colors[ImGuiCol_HeaderHovered];
-    colors[ImGuiCol_TabActive]              = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f);
-    colors[ImGuiCol_TabUnfocused]           = ImLerp(colors[ImGuiCol_Tab],          colors[ImGuiCol_TitleBg], 0.80f);
-    colors[ImGuiCol_TabUnfocusedActive]     = ImLerp(colors[ImGuiCol_TabActive],    colors[ImGuiCol_TitleBg], 0.40f);
-    colors[ImGuiCol_PlotLines]              = ImVec4(1.00f, 1.00f, 1.00f, 1.00f);
-    colors[ImGuiCol_PlotLinesHovered]       = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
-    colors[ImGuiCol_PlotHistogram]          = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
-    colors[ImGuiCol_PlotHistogramHovered]   = ImVec4(1.00f, 0.60f, 0.00f, 1.00f);
-    colors[ImGuiCol_TableHeaderBg]          = ImVec4(0.27f, 0.27f, 0.38f, 1.00f);
-    colors[ImGuiCol_TableBorderStrong]      = ImVec4(0.31f, 0.31f, 0.45f, 1.00f);       
-    colors[ImGuiCol_TableBorderLight]       = ImVec4(0.26f, 0.26f, 0.28f, 1.00f);       
-    colors[ImGuiCol_TableRowBg]             = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
-    colors[ImGuiCol_TableRowBgAlt]          = ImVec4(1.00f, 1.00f, 1.00f, 0.07f);
-    colors[ImGuiCol_TextSelectedBg]         = ImVec4(0.00f, 0.00f, 1.00f, 0.35f);
-    colors[ImGuiCol_DragDropTarget]         = ImVec4(1.00f, 1.00f, 0.00f, 0.90f);
-    colors[ImGuiCol_NavHighlight]           = colors[ImGuiCol_HeaderHovered];
-    colors[ImGuiCol_NavWindowingHighlight]  = ImVec4(1.00f, 1.00f, 1.00f, 0.70f);
-    colors[ImGuiCol_NavWindowingDimBg]      = ImVec4(0.80f, 0.80f, 0.80f, 0.20f);
-    colors[ImGuiCol_ModalWindowDimBg]       = ImVec4(0.20f, 0.20f, 0.20f, 0.35f);
-}
-
-void ImGui::StyleColorsLight(ImGuiStyle* dst)
-{
-    ImGuiStyle* style = dst ? dst : &ImGui::GetStyle();
-    ImVec4* colors = style->Colors;
-
-    colors[ImGuiCol_Text]                   = ImVec4(0.00f, 0.00f, 0.00f, 1.00f);
-    colors[ImGuiCol_TextDisabled]           = ImVec4(0.60f, 0.60f, 0.60f, 1.00f);
-    colors[ImGuiCol_WindowBg]               = ImVec4(0.94f, 0.94f, 0.94f, 1.00f);
-    colors[ImGuiCol_ChildBg]                = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
-    colors[ImGuiCol_PopupBg]                = ImVec4(1.00f, 1.00f, 1.00f, 0.98f);
-    colors[ImGuiCol_Border]                 = ImVec4(0.00f, 0.00f, 0.00f, 0.30f);
-    colors[ImGuiCol_BorderShadow]           = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
-    colors[ImGuiCol_FrameBg]                = ImVec4(1.00f, 1.00f, 1.00f, 1.00f);
-    colors[ImGuiCol_FrameBgHovered]         = ImVec4(0.26f, 0.59f, 0.98f, 0.40f);
-    colors[ImGuiCol_FrameBgActive]          = ImVec4(0.26f, 0.59f, 0.98f, 0.67f);
-    colors[ImGuiCol_TitleBg]                = ImVec4(0.96f, 0.96f, 0.96f, 1.00f);
-    colors[ImGuiCol_TitleBgActive]          = ImVec4(0.82f, 0.82f, 0.82f, 1.00f);
-    colors[ImGuiCol_TitleBgCollapsed]       = ImVec4(1.00f, 1.00f, 1.00f, 0.51f);
-    colors[ImGuiCol_MenuBarBg]              = ImVec4(0.86f, 0.86f, 0.86f, 1.00f);
-    colors[ImGuiCol_ScrollbarBg]            = ImVec4(0.98f, 0.98f, 0.98f, 0.53f);
-    colors[ImGuiCol_ScrollbarGrab]          = ImVec4(0.69f, 0.69f, 0.69f, 0.80f);
-    colors[ImGuiCol_ScrollbarGrabHovered]   = ImVec4(0.49f, 0.49f, 0.49f, 0.80f);
-    colors[ImGuiCol_ScrollbarGrabActive]    = ImVec4(0.49f, 0.49f, 0.49f, 1.00f);
-    colors[ImGuiCol_CheckMark]              = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
-    colors[ImGuiCol_SliderGrab]             = ImVec4(0.26f, 0.59f, 0.98f, 0.78f);
-    colors[ImGuiCol_SliderGrabActive]       = ImVec4(0.46f, 0.54f, 0.80f, 0.60f);
-    colors[ImGuiCol_Button]                 = ImVec4(0.26f, 0.59f, 0.98f, 0.40f);
-    colors[ImGuiCol_ButtonHovered]          = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
-    colors[ImGuiCol_ButtonActive]           = ImVec4(0.06f, 0.53f, 0.98f, 1.00f);
-    colors[ImGuiCol_Header]                 = ImVec4(0.26f, 0.59f, 0.98f, 0.31f);
-    colors[ImGuiCol_HeaderHovered]          = ImVec4(0.26f, 0.59f, 0.98f, 0.80f);
-    colors[ImGuiCol_HeaderActive]           = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
-    colors[ImGuiCol_Separator]              = ImVec4(0.39f, 0.39f, 0.39f, 0.62f);
-    colors[ImGuiCol_SeparatorHovered]       = ImVec4(0.14f, 0.44f, 0.80f, 0.78f);
-    colors[ImGuiCol_SeparatorActive]        = ImVec4(0.14f, 0.44f, 0.80f, 1.00f);
-    colors[ImGuiCol_ResizeGrip]             = ImVec4(0.35f, 0.35f, 0.35f, 0.17f);
-    colors[ImGuiCol_ResizeGripHovered]      = ImVec4(0.26f, 0.59f, 0.98f, 0.67f);
-    colors[ImGuiCol_ResizeGripActive]       = ImVec4(0.26f, 0.59f, 0.98f, 0.95f);
-    colors[ImGuiCol_Tab]                    = ImLerp(colors[ImGuiCol_Header],       colors[ImGuiCol_TitleBgActive], 0.90f);
-    colors[ImGuiCol_TabHovered]             = colors[ImGuiCol_HeaderHovered];
-    colors[ImGuiCol_TabActive]              = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f);
-    colors[ImGuiCol_TabUnfocused]           = ImLerp(colors[ImGuiCol_Tab],          colors[ImGuiCol_TitleBg], 0.80f);
-    colors[ImGuiCol_TabUnfocusedActive]     = ImLerp(colors[ImGuiCol_TabActive],    colors[ImGuiCol_TitleBg], 0.40f);
-    colors[ImGuiCol_PlotLines]              = ImVec4(0.39f, 0.39f, 0.39f, 1.00f);
-    colors[ImGuiCol_PlotLinesHovered]       = ImVec4(1.00f, 0.43f, 0.35f, 1.00f);
-    colors[ImGuiCol_PlotHistogram]          = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
-    colors[ImGuiCol_PlotHistogramHovered]   = ImVec4(1.00f, 0.45f, 0.00f, 1.00f);
-    colors[ImGuiCol_TableHeaderBg]          = ImVec4(0.78f, 0.87f, 0.98f, 1.00f);
-    colors[ImGuiCol_TableBorderStrong]      = ImVec4(0.57f, 0.57f, 0.64f, 1.00f);       
-    colors[ImGuiCol_TableBorderLight]       = ImVec4(0.68f, 0.68f, 0.74f, 1.00f);       
-    colors[ImGuiCol_TableRowBg]             = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
-    colors[ImGuiCol_TableRowBgAlt]          = ImVec4(0.30f, 0.30f, 0.30f, 0.09f);
-    colors[ImGuiCol_TextSelectedBg]         = ImVec4(0.26f, 0.59f, 0.98f, 0.35f);
-    colors[ImGuiCol_DragDropTarget]         = ImVec4(0.26f, 0.59f, 0.98f, 0.95f);
-    colors[ImGuiCol_NavHighlight]           = colors[ImGuiCol_HeaderHovered];
-    colors[ImGuiCol_NavWindowingHighlight]  = ImVec4(0.70f, 0.70f, 0.70f, 0.70f);
-    colors[ImGuiCol_NavWindowingDimBg]      = ImVec4(0.20f, 0.20f, 0.20f, 0.20f);
-    colors[ImGuiCol_ModalWindowDimBg]       = ImVec4(0.20f, 0.20f, 0.20f, 0.35f);
-}
-
-ImDrawListSharedData::ImDrawListSharedData()
-{
-    memset(this, 0, sizeof(*this));
-    for (int i = 0; i < IM_ARRAYSIZE(ArcFastVtx); i++)
-    {
-        const float a = ((float)i * 2 * IM_PI) / (float)IM_ARRAYSIZE(ArcFastVtx);
-        ArcFastVtx[i] = ImVec2(ImCos(a), ImSin(a));
-    }
-}
-
-void ImDrawListSharedData::SetCircleSegmentMaxError(float max_error)
-{
-    if (CircleSegmentMaxError == max_error)
-        return;
-    CircleSegmentMaxError = max_error;
-    for (int i = 0; i < IM_ARRAYSIZE(CircleSegmentCounts); i++)
-    {
-        const float radius = (float)i;
-        const int segment_count = IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(radius, CircleSegmentMaxError);
-        CircleSegmentCounts[i] = (ImU8)ImMin(segment_count, 255);
-    }
-}
-
-void ImDrawList::_ResetForNewFrame()
-{
-    IM_ASSERT(IM_OFFSETOF(ImDrawCmd, ClipRect) == 0);
-    IM_ASSERT(IM_OFFSETOF(ImDrawCmd, TextureId) == sizeof(ImVec4));
-    IM_ASSERT(IM_OFFSETOF(ImDrawCmd, VtxOffset) == sizeof(ImVec4) + sizeof(ImTextureID));
-
-    CmdBuffer.resize(0);
-    IdxBuffer.resize(0);
-    VtxBuffer.resize(0);
-    Flags = _Data->InitialFlags;
-    memset(&_CmdHeader, 0, sizeof(_CmdHeader));
-    _VtxCurrentIdx = 0;
-    _VtxWritePtr = NULL;
-    _IdxWritePtr = NULL;
-    _ClipRectStack.resize(0);
-    _TextureIdStack.resize(0);
-    _Path.resize(0);
-    _Splitter.Clear();
-    CmdBuffer.push_back(ImDrawCmd());
-    _FringeScale = 1.0f;
-}
-
-void ImDrawList::_ClearFreeMemory()
-{
-    CmdBuffer.clear();
-    IdxBuffer.clear();
-    VtxBuffer.clear();
-    Flags = ImDrawListFlags_None;
-    _VtxCurrentIdx = 0;
-    _VtxWritePtr = NULL;
-    _IdxWritePtr = NULL;
-    _ClipRectStack.clear();
-    _TextureIdStack.clear();
-    _Path.clear();
-    _Splitter.ClearFreeMemory();
-}
-
-ImDrawList* ImDrawList::CloneOutput() const
-{
-    ImDrawList* dst = IM_NEW(ImDrawList(_Data));
-    dst->CmdBuffer = CmdBuffer;
-    dst->IdxBuffer = IdxBuffer;
-    dst->VtxBuffer = VtxBuffer;
-    dst->Flags = Flags;
-    return dst;
-}
-
-void ImDrawList::AddDrawCmd()
-{
-    ImDrawCmd draw_cmd;
-    draw_cmd.ClipRect = _CmdHeader.ClipRect;        
-    draw_cmd.TextureId = _CmdHeader.TextureId;
-    draw_cmd.VtxOffset = _CmdHeader.VtxOffset;
-    draw_cmd.IdxOffset = IdxBuffer.Size;
-
-    IM_ASSERT(draw_cmd.ClipRect.x <= draw_cmd.ClipRect.z && draw_cmd.ClipRect.y <= draw_cmd.ClipRect.w);
-    CmdBuffer.push_back(draw_cmd);
-}
-
-void ImDrawList::_PopUnusedDrawCmd()
-{
-    if (CmdBuffer.Size == 0)
-        return;
-    ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1];
-    if (curr_cmd->ElemCount == 0 && curr_cmd->UserCallback == NULL)
-        CmdBuffer.pop_back();
-}
-
-void ImDrawList::AddCallback(ImDrawCallback callback, void* callback_data)
-{
-    ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1];
-    IM_ASSERT(curr_cmd->UserCallback == NULL);
-    if (curr_cmd->ElemCount != 0)
-    {
-        AddDrawCmd();
-        curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1];
-    }
-    curr_cmd->UserCallback = callback;
-    curr_cmd->UserCallbackData = callback_data;
-
-    AddDrawCmd();          
-}
-
-#define ImDrawCmd_HeaderSize                        (IM_OFFSETOF(ImDrawCmd, VtxOffset) + sizeof(unsigned int))
-#define ImDrawCmd_HeaderCompare(CMD_LHS, CMD_RHS)   (memcmp(CMD_LHS, CMD_RHS, ImDrawCmd_HeaderSize))        
-#define ImDrawCmd_HeaderCopy(CMD_DST, CMD_SRC)      (memcpy(CMD_DST, CMD_SRC, ImDrawCmd_HeaderSize))        
-
-void ImDrawList::_OnChangedClipRect()
-{
-    ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1];
-    if (curr_cmd->ElemCount != 0 && memcmp(&curr_cmd->ClipRect, &_CmdHeader.ClipRect, sizeof(ImVec4)) != 0)
-    {
-        AddDrawCmd();
-        return;
-    }
-    IM_ASSERT(curr_cmd->UserCallback == NULL);
-
-    ImDrawCmd* prev_cmd = curr_cmd - 1;
-    if (curr_cmd->ElemCount == 0 && CmdBuffer.Size > 1 && ImDrawCmd_HeaderCompare(&_CmdHeader, prev_cmd) == 0 && prev_cmd->UserCallback == NULL)
-    {
-        CmdBuffer.pop_back();
-        return;
-    }
-
-    curr_cmd->ClipRect = _CmdHeader.ClipRect;
-}
-
-void ImDrawList::_OnChangedTextureID()
-{
-    ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1];
-    if (curr_cmd->ElemCount != 0 && curr_cmd->TextureId != _CmdHeader.TextureId)
-    {
-        AddDrawCmd();
-        return;
-    }
-    IM_ASSERT(curr_cmd->UserCallback == NULL);
-
-    ImDrawCmd* prev_cmd = curr_cmd - 1;
-    if (curr_cmd->ElemCount == 0 && CmdBuffer.Size > 1 && ImDrawCmd_HeaderCompare(&_CmdHeader, prev_cmd) == 0 && prev_cmd->UserCallback == NULL)
-    {
-        CmdBuffer.pop_back();
-        return;
-    }
-
-    curr_cmd->TextureId = _CmdHeader.TextureId;
-}
-
-void ImDrawList::_OnChangedVtxOffset()
-{
-    _VtxCurrentIdx = 0;
-    ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1];
-    if (curr_cmd->ElemCount != 0)
-    {
-        AddDrawCmd();
-        return;
-    }
-    IM_ASSERT(curr_cmd->UserCallback == NULL);
-    curr_cmd->VtxOffset = _CmdHeader.VtxOffset;
-}
-
-void ImDrawList::PushClipRect(ImVec2 cr_min, ImVec2 cr_max, bool intersect_with_current_clip_rect)
-{
-    ImVec4 cr(cr_min.x, cr_min.y, cr_max.x, cr_max.y);
-    if (intersect_with_current_clip_rect)
-    {
-        ImVec4 current = _CmdHeader.ClipRect;
-        if (cr.x < current.x) cr.x = current.x;
-        if (cr.y < current.y) cr.y = current.y;
-        if (cr.z > current.z) cr.z = current.z;
-        if (cr.w > current.w) cr.w = current.w;
-    }
-    cr.z = ImMax(cr.x, cr.z);
-    cr.w = ImMax(cr.y, cr.w);
-
-    _ClipRectStack.push_back(cr);
-    _CmdHeader.ClipRect = cr;
-    _OnChangedClipRect();
-}
-
-void ImDrawList::PushClipRectFullScreen()
-{
-    PushClipRect(ImVec2(_Data->ClipRectFullscreen.x, _Data->ClipRectFullscreen.y), ImVec2(_Data->ClipRectFullscreen.z, _Data->ClipRectFullscreen.w));
-}
-
-void ImDrawList::PopClipRect()
-{
-    _ClipRectStack.pop_back();
-    _CmdHeader.ClipRect = (_ClipRectStack.Size == 0) ? _Data->ClipRectFullscreen : _ClipRectStack.Data[_ClipRectStack.Size - 1];
-    _OnChangedClipRect();
-}
-
-void ImDrawList::PushTextureID(ImTextureID texture_id)
-{
-    _TextureIdStack.push_back(texture_id);
-    _CmdHeader.TextureId = texture_id;
-    _OnChangedTextureID();
-}
-
-void ImDrawList::PopTextureID()
-{
-    _TextureIdStack.pop_back();
-    _CmdHeader.TextureId = (_TextureIdStack.Size == 0) ? (ImTextureID)NULL : _TextureIdStack.Data[_TextureIdStack.Size - 1];
-    _OnChangedTextureID();
-}
-
-void ImDrawList::PrimReserve(int idx_count, int vtx_count)
-{
-    IM_ASSERT_PARANOID(idx_count >= 0 && vtx_count >= 0);
-    if (sizeof(ImDrawIdx) == 2 && (_VtxCurrentIdx + vtx_count >= (1 << 16)) && (Flags & ImDrawListFlags_AllowVtxOffset))
-    {
-        _CmdHeader.VtxOffset = VtxBuffer.Size;
-        _OnChangedVtxOffset();
-    }
-
-    ImDrawCmd* draw_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1];
-    draw_cmd->ElemCount += idx_count;
-
-    int vtx_buffer_old_size = VtxBuffer.Size;
-    VtxBuffer.resize(vtx_buffer_old_size + vtx_count);
-    _VtxWritePtr = VtxBuffer.Data + vtx_buffer_old_size;
-
-    int idx_buffer_old_size = IdxBuffer.Size;
-    IdxBuffer.resize(idx_buffer_old_size + idx_count);
-    _IdxWritePtr = IdxBuffer.Data + idx_buffer_old_size;
-}
-
-void ImDrawList::PrimUnreserve(int idx_count, int vtx_count)
-{
-    IM_ASSERT_PARANOID(idx_count >= 0 && vtx_count >= 0);
-
-    ImDrawCmd* draw_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1];
-    draw_cmd->ElemCount -= idx_count;
-    VtxBuffer.shrink(VtxBuffer.Size - vtx_count);
-    IdxBuffer.shrink(IdxBuffer.Size - idx_count);
-}
-
-void ImDrawList::PrimRect(const ImVec2& a, const ImVec2& c, ImU32 col)
-{
-    ImVec2 b(c.x, a.y), d(a.x, c.y), uv(_Data->TexUvWhitePixel);
-    ImDrawIdx idx = (ImDrawIdx)_VtxCurrentIdx;
-    _IdxWritePtr[0] = idx; _IdxWritePtr[1] = (ImDrawIdx)(idx+1); _IdxWritePtr[2] = (ImDrawIdx)(idx+2);
-    _IdxWritePtr[3] = idx; _IdxWritePtr[4] = (ImDrawIdx)(idx+2); _IdxWritePtr[5] = (ImDrawIdx)(idx+3);
-    _VtxWritePtr[0].pos = a; _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col;
-    _VtxWritePtr[1].pos = b; _VtxWritePtr[1].uv = uv; _VtxWritePtr[1].col = col;
-    _VtxWritePtr[2].pos = c; _VtxWritePtr[2].uv = uv; _VtxWritePtr[2].col = col;
-    _VtxWritePtr[3].pos = d; _VtxWritePtr[3].uv = uv; _VtxWritePtr[3].col = col;
-    _VtxWritePtr += 4;
-    _VtxCurrentIdx += 4;
-    _IdxWritePtr += 6;
-}
-
-void ImDrawList::PrimRectUV(const ImVec2& a, const ImVec2& c, const ImVec2& uv_a, const ImVec2& uv_c, ImU32 col)
-{
-    ImVec2 b(c.x, a.y), d(a.x, c.y), uv_b(uv_c.x, uv_a.y), uv_d(uv_a.x, uv_c.y);
-    ImDrawIdx idx = (ImDrawIdx)_VtxCurrentIdx;
-    _IdxWritePtr[0] = idx; _IdxWritePtr[1] = (ImDrawIdx)(idx+1); _IdxWritePtr[2] = (ImDrawIdx)(idx+2);
-    _IdxWritePtr[3] = idx; _IdxWritePtr[4] = (ImDrawIdx)(idx+2); _IdxWritePtr[5] = (ImDrawIdx)(idx+3);
-    _VtxWritePtr[0].pos = a; _VtxWritePtr[0].uv = uv_a; _VtxWritePtr[0].col = col;
-    _VtxWritePtr[1].pos = b; _VtxWritePtr[1].uv = uv_b; _VtxWritePtr[1].col = col;
-    _VtxWritePtr[2].pos = c; _VtxWritePtr[2].uv = uv_c; _VtxWritePtr[2].col = col;
-    _VtxWritePtr[3].pos = d; _VtxWritePtr[3].uv = uv_d; _VtxWritePtr[3].col = col;
-    _VtxWritePtr += 4;
-    _VtxCurrentIdx += 4;
-    _IdxWritePtr += 6;
-}
-
-void ImDrawList::PrimQuadUV(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, const ImVec2& uv_a, const ImVec2& uv_b, const ImVec2& uv_c, const ImVec2& uv_d, ImU32 col)
-{
-    ImDrawIdx idx = (ImDrawIdx)_VtxCurrentIdx;
-    _IdxWritePtr[0] = idx; _IdxWritePtr[1] = (ImDrawIdx)(idx+1); _IdxWritePtr[2] = (ImDrawIdx)(idx+2);
-    _IdxWritePtr[3] = idx; _IdxWritePtr[4] = (ImDrawIdx)(idx+2); _IdxWritePtr[5] = (ImDrawIdx)(idx+3);
-    _VtxWritePtr[0].pos = a; _VtxWritePtr[0].uv = uv_a; _VtxWritePtr[0].col = col;
-    _VtxWritePtr[1].pos = b; _VtxWritePtr[1].uv = uv_b; _VtxWritePtr[1].col = col;
-    _VtxWritePtr[2].pos = c; _VtxWritePtr[2].uv = uv_c; _VtxWritePtr[2].col = col;
-    _VtxWritePtr[3].pos = d; _VtxWritePtr[3].uv = uv_d; _VtxWritePtr[3].col = col;
-    _VtxWritePtr += 4;
-    _VtxCurrentIdx += 4;
-    _IdxWritePtr += 6;
-}
-
-#define IM_NORMALIZE2F_OVER_ZERO(VX,VY)     do { float d2 = VX*VX + VY*VY; if (d2 > 0.0f) { float inv_len = 1.0f / ImSqrt(d2); VX *= inv_len; VY *= inv_len; } } while (0)
-#define IM_FIXNORMAL2F(VX,VY)               do { float d2 = VX*VX + VY*VY; if (d2 < 0.5f) d2 = 0.5f; float inv_lensq = 1.0f / d2; VX *= inv_lensq; VY *= inv_lensq; } while (0)
-
-void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32 col, bool closed, float thickness)
-{
-    if (points_count < 2)
-        return;
-
-    const ImVec2 opaque_uv = _Data->TexUvWhitePixel;
-    const int count = closed ? points_count : points_count - 1;          
-    const bool thick_line = (thickness > _FringeScale);
-
-    if (Flags & ImDrawListFlags_AntiAliasedLines)
-    {
-        const float AA_SIZE = _FringeScale;
-        const ImU32 col_trans = col & ~IM_COL32_A_MASK;
-
-        thickness = ImMax(thickness, 1.0f);
-        const int integer_thickness = (int)thickness;
-        const float fractional_thickness = thickness - integer_thickness;
-
-        const bool use_texture = (Flags & ImDrawListFlags_AntiAliasedLinesUseTex) && (integer_thickness < IM_DRAWLIST_TEX_LINES_WIDTH_MAX) && (fractional_thickness <= 0.00001f) && (AA_SIZE == 1.0f);
-
-        IM_ASSERT_PARANOID(!use_texture || !(_Data->Font->ContainerAtlas->Flags & ImFontAtlasFlags_NoBakedLines));
-
-        const int idx_count = use_texture ? (count * 6) : (thick_line ? count * 18 : count * 12);
-        const int vtx_count = use_texture ? (points_count * 2) : (thick_line ? points_count * 4 : points_count * 3);
-        PrimReserve(idx_count, vtx_count);
-
-        ImVec2* temp_normals = (ImVec2*)alloca(points_count * ((use_texture || !thick_line) ? 3 : 5) * sizeof(ImVec2)); 
-        ImVec2* temp_points = temp_normals + points_count;
-
-        for (int i1 = 0; i1 < count; i1++)
-        {
-            const int i2 = (i1 + 1) == points_count ? 0 : i1 + 1;
-            float dx = points[i2].x - points[i1].x;
-            float dy = points[i2].y - points[i1].y;
-            IM_NORMALIZE2F_OVER_ZERO(dx, dy);
-            temp_normals[i1].x = dy;
-            temp_normals[i1].y = -dx;
-        }
-        if (!closed)
-            temp_normals[points_count - 1] = temp_normals[points_count - 2];
-
-        if (use_texture || !thick_line)
-        {
-            const float half_draw_size = use_texture ? ((thickness * 0.5f) + 1) : AA_SIZE;
-
-            if (!closed)
-            {
-                temp_points[0] = points[0] + temp_normals[0] * half_draw_size;
-                temp_points[1] = points[0] - temp_normals[0] * half_draw_size;
-                temp_points[(points_count-1)*2+0] = points[points_count-1] + temp_normals[points_count-1] * half_draw_size;
-                temp_points[(points_count-1)*2+1] = points[points_count-1] - temp_normals[points_count-1] * half_draw_size;
-            }
-
-            unsigned int idx1 = _VtxCurrentIdx;        
-            for (int i1 = 0; i1 < count; i1++)          
-            {
-                const int i2 = (i1 + 1) == points_count ? 0 : i1 + 1;          
-                const unsigned int idx2 = ((i1 + 1) == points_count) ? _VtxCurrentIdx : (idx1 + (use_texture ? 2 : 3));       
-
-                float dm_x = (temp_normals[i1].x + temp_normals[i2].x) * 0.5f;
-                float dm_y = (temp_normals[i1].y + temp_normals[i2].y) * 0.5f;
-                IM_FIXNORMAL2F(dm_x, dm_y);
-                dm_x *= half_draw_size;             
-                dm_y *= half_draw_size;
-
-                ImVec2* out_vtx = &temp_points[i2 * 2];
-                out_vtx[0].x = points[i2].x + dm_x;
-                out_vtx[0].y = points[i2].y + dm_y;
-                out_vtx[1].x = points[i2].x - dm_x;
-                out_vtx[1].y = points[i2].y - dm_y;
-
-                if (use_texture)
-                {
-                    _IdxWritePtr[0] = (ImDrawIdx)(idx2 + 0); _IdxWritePtr[1] = (ImDrawIdx)(idx1 + 0); _IdxWritePtr[2] = (ImDrawIdx)(idx1 + 1);   
-                    _IdxWritePtr[3] = (ImDrawIdx)(idx2 + 1); _IdxWritePtr[4] = (ImDrawIdx)(idx1 + 1); _IdxWritePtr[5] = (ImDrawIdx)(idx2 + 0);   
-                    _IdxWritePtr += 6;
-                }
-                else
-                {
-                    _IdxWritePtr[0] = (ImDrawIdx)(idx2 + 0); _IdxWritePtr[1] = (ImDrawIdx)(idx1 + 0); _IdxWritePtr[2] = (ImDrawIdx)(idx1 + 2);    
-                    _IdxWritePtr[3] = (ImDrawIdx)(idx1 + 2); _IdxWritePtr[4] = (ImDrawIdx)(idx2 + 2); _IdxWritePtr[5] = (ImDrawIdx)(idx2 + 0);    
-                    _IdxWritePtr[6] = (ImDrawIdx)(idx2 + 1); _IdxWritePtr[7] = (ImDrawIdx)(idx1 + 1); _IdxWritePtr[8] = (ImDrawIdx)(idx1 + 0);    
-                    _IdxWritePtr[9] = (ImDrawIdx)(idx1 + 0); _IdxWritePtr[10] = (ImDrawIdx)(idx2 + 0); _IdxWritePtr[11] = (ImDrawIdx)(idx2 + 1);    
-                    _IdxWritePtr += 12;
-                }
-
-                idx1 = idx2;
-            }
-
-            if (use_texture)
-            {
-                ImVec4 tex_uvs = _Data->TexUvLines[integer_thickness];
-                ImVec2 tex_uv0(tex_uvs.x, tex_uvs.y);
-                ImVec2 tex_uv1(tex_uvs.z, tex_uvs.w);
-                for (int i = 0; i < points_count; i++)
-                {
-                    _VtxWritePtr[0].pos = temp_points[i * 2 + 0]; _VtxWritePtr[0].uv = tex_uv0; _VtxWritePtr[0].col = col;    
-                    _VtxWritePtr[1].pos = temp_points[i * 2 + 1]; _VtxWritePtr[1].uv = tex_uv1; _VtxWritePtr[1].col = col;    
-                    _VtxWritePtr += 2;
-                }
-            }
-            else
-            {
-                for (int i = 0; i < points_count; i++)
-                {
-                    _VtxWritePtr[0].pos = points[i];              _VtxWritePtr[0].uv = opaque_uv; _VtxWritePtr[0].col = col;          
-                    _VtxWritePtr[1].pos = temp_points[i * 2 + 0]; _VtxWritePtr[1].uv = opaque_uv; _VtxWritePtr[1].col = col_trans;    
-                    _VtxWritePtr[2].pos = temp_points[i * 2 + 1]; _VtxWritePtr[2].uv = opaque_uv; _VtxWritePtr[2].col = col_trans;    
-                    _VtxWritePtr += 3;
-                }
-            }
-        }
-        else
-        {
-            const float half_inner_thickness = (thickness - AA_SIZE) * 0.5f;
-
-            if (!closed)
-            {
-                const int points_last = points_count - 1;
-                temp_points[0] = points[0] + temp_normals[0] * (half_inner_thickness + AA_SIZE);
-                temp_points[1] = points[0] + temp_normals[0] * (half_inner_thickness);
-                temp_points[2] = points[0] - temp_normals[0] * (half_inner_thickness);
-                temp_points[3] = points[0] - temp_normals[0] * (half_inner_thickness + AA_SIZE);
-                temp_points[points_last * 4 + 0] = points[points_last] + temp_normals[points_last] * (half_inner_thickness + AA_SIZE);
-                temp_points[points_last * 4 + 1] = points[points_last] + temp_normals[points_last] * (half_inner_thickness);
-                temp_points[points_last * 4 + 2] = points[points_last] - temp_normals[points_last] * (half_inner_thickness);
-                temp_points[points_last * 4 + 3] = points[points_last] - temp_normals[points_last] * (half_inner_thickness + AA_SIZE);
-            }
-
-            unsigned int idx1 = _VtxCurrentIdx;        
-            for (int i1 = 0; i1 < count; i1++)          
-            {
-                const int i2 = (i1 + 1) == points_count ? 0 : (i1 + 1);          
-                const unsigned int idx2 = (i1 + 1) == points_count ? _VtxCurrentIdx : (idx1 + 4);       
-
-                float dm_x = (temp_normals[i1].x + temp_normals[i2].x) * 0.5f;
-                float dm_y = (temp_normals[i1].y + temp_normals[i2].y) * 0.5f;
-                IM_FIXNORMAL2F(dm_x, dm_y);
-                float dm_out_x = dm_x * (half_inner_thickness + AA_SIZE);
-                float dm_out_y = dm_y * (half_inner_thickness + AA_SIZE);
-                float dm_in_x = dm_x * half_inner_thickness;
-                float dm_in_y = dm_y * half_inner_thickness;
-
-                ImVec2* out_vtx = &temp_points[i2 * 4];
-                out_vtx[0].x = points[i2].x + dm_out_x;
-                out_vtx[0].y = points[i2].y + dm_out_y;
-                out_vtx[1].x = points[i2].x + dm_in_x;
-                out_vtx[1].y = points[i2].y + dm_in_y;
-                out_vtx[2].x = points[i2].x - dm_in_x;
-                out_vtx[2].y = points[i2].y - dm_in_y;
-                out_vtx[3].x = points[i2].x - dm_out_x;
-                out_vtx[3].y = points[i2].y - dm_out_y;
-
-                _IdxWritePtr[0]  = (ImDrawIdx)(idx2 + 1); _IdxWritePtr[1]  = (ImDrawIdx)(idx1 + 1); _IdxWritePtr[2]  = (ImDrawIdx)(idx1 + 2);
-                _IdxWritePtr[3]  = (ImDrawIdx)(idx1 + 2); _IdxWritePtr[4]  = (ImDrawIdx)(idx2 + 2); _IdxWritePtr[5]  = (ImDrawIdx)(idx2 + 1);
-                _IdxWritePtr[6]  = (ImDrawIdx)(idx2 + 1); _IdxWritePtr[7]  = (ImDrawIdx)(idx1 + 1); _IdxWritePtr[8]  = (ImDrawIdx)(idx1 + 0);
-                _IdxWritePtr[9]  = (ImDrawIdx)(idx1 + 0); _IdxWritePtr[10] = (ImDrawIdx)(idx2 + 0); _IdxWritePtr[11] = (ImDrawIdx)(idx2 + 1);
-                _IdxWritePtr[12] = (ImDrawIdx)(idx2 + 2); _IdxWritePtr[13] = (ImDrawIdx)(idx1 + 2); _IdxWritePtr[14] = (ImDrawIdx)(idx1 + 3);
-                _IdxWritePtr[15] = (ImDrawIdx)(idx1 + 3); _IdxWritePtr[16] = (ImDrawIdx)(idx2 + 3); _IdxWritePtr[17] = (ImDrawIdx)(idx2 + 2);
-                _IdxWritePtr += 18;
-
-                idx1 = idx2;
-            }
-
-            for (int i = 0; i < points_count; i++)
-            {
-                _VtxWritePtr[0].pos = temp_points[i * 4 + 0]; _VtxWritePtr[0].uv = opaque_uv; _VtxWritePtr[0].col = col_trans;
-                _VtxWritePtr[1].pos = temp_points[i * 4 + 1]; _VtxWritePtr[1].uv = opaque_uv; _VtxWritePtr[1].col = col;
-                _VtxWritePtr[2].pos = temp_points[i * 4 + 2]; _VtxWritePtr[2].uv = opaque_uv; _VtxWritePtr[2].col = col;
-                _VtxWritePtr[3].pos = temp_points[i * 4 + 3]; _VtxWritePtr[3].uv = opaque_uv; _VtxWritePtr[3].col = col_trans;
-                _VtxWritePtr += 4;
-            }
-        }
-        _VtxCurrentIdx += (ImDrawIdx)vtx_count;
-    }
-    else
-    {
-        const int idx_count = count * 6;
-        const int vtx_count = count * 4;        
-        PrimReserve(idx_count, vtx_count);
-
-        for (int i1 = 0; i1 < count; i1++)
-        {
-            const int i2 = (i1 + 1) == points_count ? 0 : i1 + 1;
-            const ImVec2& p1 = points[i1];
-            const ImVec2& p2 = points[i2];
-
-            float dx = p2.x - p1.x;
-            float dy = p2.y - p1.y;
-            IM_NORMALIZE2F_OVER_ZERO(dx, dy);
-            dx *= (thickness * 0.5f);
-            dy *= (thickness * 0.5f);
-
-            _VtxWritePtr[0].pos.x = p1.x + dy; _VtxWritePtr[0].pos.y = p1.y - dx; _VtxWritePtr[0].uv = opaque_uv; _VtxWritePtr[0].col = col;
-            _VtxWritePtr[1].pos.x = p2.x + dy; _VtxWritePtr[1].pos.y = p2.y - dx; _VtxWritePtr[1].uv = opaque_uv; _VtxWritePtr[1].col = col;
-            _VtxWritePtr[2].pos.x = p2.x - dy; _VtxWritePtr[2].pos.y = p2.y + dx; _VtxWritePtr[2].uv = opaque_uv; _VtxWritePtr[2].col = col;
-            _VtxWritePtr[3].pos.x = p1.x - dy; _VtxWritePtr[3].pos.y = p1.y + dx; _VtxWritePtr[3].uv = opaque_uv; _VtxWritePtr[3].col = col;
-            _VtxWritePtr += 4;
-
-            _IdxWritePtr[0] = (ImDrawIdx)(_VtxCurrentIdx); _IdxWritePtr[1] = (ImDrawIdx)(_VtxCurrentIdx + 1); _IdxWritePtr[2] = (ImDrawIdx)(_VtxCurrentIdx + 2);
-            _IdxWritePtr[3] = (ImDrawIdx)(_VtxCurrentIdx); _IdxWritePtr[4] = (ImDrawIdx)(_VtxCurrentIdx + 2); _IdxWritePtr[5] = (ImDrawIdx)(_VtxCurrentIdx + 3);
-            _IdxWritePtr += 6;
-            _VtxCurrentIdx += 4;
-        }
-    }
-}
-
-void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_count, ImU32 col)
-{
-    if (points_count < 3)
-        return;
-
-    const ImVec2 uv = _Data->TexUvWhitePixel;
-
-    if (Flags & ImDrawListFlags_AntiAliasedFill)
-    {
-        const float AA_SIZE = _FringeScale;
-        const ImU32 col_trans = col & ~IM_COL32_A_MASK;
-        const int idx_count = (points_count - 2)*3 + points_count * 6;
-        const int vtx_count = (points_count * 2);
-        PrimReserve(idx_count, vtx_count);
-
-        unsigned int vtx_inner_idx = _VtxCurrentIdx;
-        unsigned int vtx_outer_idx = _VtxCurrentIdx + 1;
-        for (int i = 2; i < points_count; i++)
-        {
-            _IdxWritePtr[0] = (ImDrawIdx)(vtx_inner_idx); _IdxWritePtr[1] = (ImDrawIdx)(vtx_inner_idx + ((i - 1) << 1)); _IdxWritePtr[2] = (ImDrawIdx)(vtx_inner_idx + (i << 1));
-            _IdxWritePtr += 3;
-        }
-
-        ImVec2* temp_normals = (ImVec2*)alloca(points_count * sizeof(ImVec2)); 
-        for (int i0 = points_count - 1, i1 = 0; i1 < points_count; i0 = i1++)
-        {
-            const ImVec2& p0 = points[i0];
-            const ImVec2& p1 = points[i1];
-            float dx = p1.x - p0.x;
-            float dy = p1.y - p0.y;
-            IM_NORMALIZE2F_OVER_ZERO(dx, dy);
-            temp_normals[i0].x = dy;
-            temp_normals[i0].y = -dx;
-        }
-
-        for (int i0 = points_count - 1, i1 = 0; i1 < points_count; i0 = i1++)
-        {
-            const ImVec2& n0 = temp_normals[i0];
-            const ImVec2& n1 = temp_normals[i1];
-            float dm_x = (n0.x + n1.x) * 0.5f;
-            float dm_y = (n0.y + n1.y) * 0.5f;
-            IM_FIXNORMAL2F(dm_x, dm_y);
-            dm_x *= AA_SIZE * 0.5f;
-            dm_y *= AA_SIZE * 0.5f;
-
-            _VtxWritePtr[0].pos.x = (points[i1].x - dm_x); _VtxWritePtr[0].pos.y = (points[i1].y - dm_y); _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col;         
-            _VtxWritePtr[1].pos.x = (points[i1].x + dm_x); _VtxWritePtr[1].pos.y = (points[i1].y + dm_y); _VtxWritePtr[1].uv = uv; _VtxWritePtr[1].col = col_trans;   
-            _VtxWritePtr += 2;
-
-            _IdxWritePtr[0] = (ImDrawIdx)(vtx_inner_idx + (i1 << 1)); _IdxWritePtr[1] = (ImDrawIdx)(vtx_inner_idx + (i0 << 1)); _IdxWritePtr[2] = (ImDrawIdx)(vtx_outer_idx + (i0 << 1));
-            _IdxWritePtr[3] = (ImDrawIdx)(vtx_outer_idx + (i0 << 1)); _IdxWritePtr[4] = (ImDrawIdx)(vtx_outer_idx + (i1 << 1)); _IdxWritePtr[5] = (ImDrawIdx)(vtx_inner_idx + (i1 << 1));
-            _IdxWritePtr += 6;
-        }
-        _VtxCurrentIdx += (ImDrawIdx)vtx_count;
-    }
-    else
-    {
-        const int idx_count = (points_count - 2)*3;
-        const int vtx_count = points_count;
-        PrimReserve(idx_count, vtx_count);
-        for (int i = 0; i < vtx_count; i++)
-        {
-            _VtxWritePtr[0].pos = points[i]; _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col;
-            _VtxWritePtr++;
-        }
-        for (int i = 2; i < points_count; i++)
-        {
-            _IdxWritePtr[0] = (ImDrawIdx)(_VtxCurrentIdx); _IdxWritePtr[1] = (ImDrawIdx)(_VtxCurrentIdx + i - 1); _IdxWritePtr[2] = (ImDrawIdx)(_VtxCurrentIdx + i);
-            _IdxWritePtr += 3;
-        }
-        _VtxCurrentIdx += (ImDrawIdx)vtx_count;
-    }
-}
-
-void ImDrawList::PathArcToFast(const ImVec2& center, float radius, int a_min_of_12, int a_max_of_12)
-{
-    if (radius == 0.0f || a_min_of_12 > a_max_of_12)
-    {
-        _Path.push_back(center);
-        return;
-    }
-
-#if IM_DRAWLIST_ARCFAST_TESSELLATION_MULTIPLIER != 1
-    a_min_of_12 *= IM_DRAWLIST_ARCFAST_TESSELLATION_MULTIPLIER;
-    a_max_of_12 *= IM_DRAWLIST_ARCFAST_TESSELLATION_MULTIPLIER;
-#endif
-
-    _Path.reserve(_Path.Size + (a_max_of_12 - a_min_of_12 + 1));
-    for (int a = a_min_of_12; a <= a_max_of_12; a++)
-    {
-        const ImVec2& c = _Data->ArcFastVtx[a % IM_ARRAYSIZE(_Data->ArcFastVtx)];
-        _Path.push_back(ImVec2(center.x + c.x * radius, center.y + c.y * radius));
-    }
-}
-
-void ImDrawList::PathArcTo(const ImVec2& center, float radius, float a_min, float a_max, int num_segments)
-{
-    if (radius == 0.0f)
-    {
-        _Path.push_back(center);
-        return;
-    }
-
-    _Path.reserve(_Path.Size + (num_segments + 1));
-    for (int i = 0; i <= num_segments; i++)
-    {
-        const float a = a_min + ((float)i / (float)num_segments) * (a_max - a_min);
-        _Path.push_back(ImVec2(center.x + ImCos(a) * radius, center.y + ImSin(a) * radius));
-    }
-}
-
-ImVec2 ImBezierCubicCalc(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, float t)
-{
-    float u = 1.0f - t;
-    float w1 = u * u * u;
-    float w2 = 3 * u * u * t;
-    float w3 = 3 * u * t * t;
-    float w4 = t * t * t;
-    return ImVec2(w1 * p1.x + w2 * p2.x + w3 * p3.x + w4 * p4.x, w1 * p1.y + w2 * p2.y + w3 * p3.y + w4 * p4.y);
-}
-
-ImVec2 ImBezierQuadraticCalc(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, float t)
-{
-    float u = 1.0f - t;
-    float w1 = u * u;
-    float w2 = 2 * u * t;
-    float w3 = t * t;
-    return ImVec2(w1 * p1.x + w2 * p2.x + w3 * p3.x, w1 * p1.y + w2 * p2.y + w3 * p3.y);
-}
-
-static void PathBezierCubicCurveToCasteljau(ImVector<ImVec2>* path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, float tess_tol, int level)
-{
-    float dx = x4 - x1;
-    float dy = y4 - y1;
-    float d2 = (x2 - x4) * dy - (y2 - y4) * dx;
-    float d3 = (x3 - x4) * dy - (y3 - y4) * dx;
-    d2 = (d2 >= 0) ? d2 : -d2;
-    d3 = (d3 >= 0) ? d3 : -d3;
-    if ((d2 + d3) * (d2 + d3) < tess_tol * (dx * dx + dy * dy))
-    {
-        path->push_back(ImVec2(x4, y4));
-    }
-    else if (level < 10)
-    {
-        float x12 = (x1 + x2) * 0.5f, y12 = (y1 + y2) * 0.5f;
-        float x23 = (x2 + x3) * 0.5f, y23 = (y2 + y3) * 0.5f;
-        float x34 = (x3 + x4) * 0.5f, y34 = (y3 + y4) * 0.5f;
-        float x123 = (x12 + x23) * 0.5f, y123 = (y12 + y23) * 0.5f;
-        float x234 = (x23 + x34) * 0.5f, y234 = (y23 + y34) * 0.5f;
-        float x1234 = (x123 + x234) * 0.5f, y1234 = (y123 + y234) * 0.5f;
-        PathBezierCubicCurveToCasteljau(path, x1, y1, x12, y12, x123, y123, x1234, y1234, tess_tol, level + 1);
-        PathBezierCubicCurveToCasteljau(path, x1234, y1234, x234, y234, x34, y34, x4, y4, tess_tol, level + 1);
-    }
-}
-
-static void PathBezierQuadraticCurveToCasteljau(ImVector<ImVec2>* path, float x1, float y1, float x2, float y2, float x3, float y3, float tess_tol, int level)
-{
-    float dx = x3 - x1, dy = y3 - y1;
-    float det = (x2 - x3) * dy - (y2 - y3) * dx;
-    if (det * det * 4.0f < tess_tol * (dx * dx + dy * dy))
-    {
-        path->push_back(ImVec2(x3, y3));
-    }
-    else if (level < 10)
-    {
-        float x12 = (x1 + x2) * 0.5f, y12 = (y1 + y2) * 0.5f;
-        float x23 = (x2 + x3) * 0.5f, y23 = (y2 + y3) * 0.5f;
-        float x123 = (x12 + x23) * 0.5f, y123 = (y12 + y23) * 0.5f;
-        PathBezierQuadraticCurveToCasteljau(path, x1, y1, x12, y12, x123, y123, tess_tol, level + 1);
-        PathBezierQuadraticCurveToCasteljau(path, x123, y123, x23, y23, x3, y3, tess_tol, level + 1);
-    }
-}
-
-void ImDrawList::PathBezierCubicCurveTo(const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, int num_segments)
-{
-    ImVec2 p1 = _Path.back();
-    if (num_segments == 0)
-    {
-        PathBezierCubicCurveToCasteljau(&_Path, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, _Data->CurveTessellationTol, 0);  
-    }
-    else
-    {
-        float t_step = 1.0f / (float)num_segments;
-        for (int i_step = 1; i_step <= num_segments; i_step++)
-            _Path.push_back(ImBezierCubicCalc(p1, p2, p3, p4, t_step * i_step));
-    }
-}
-
-void ImDrawList::PathBezierQuadraticCurveTo(const ImVec2& p2, const ImVec2& p3, int num_segments)
-{
-    ImVec2 p1 = _Path.back();
-    if (num_segments == 0)
-    {
-        PathBezierQuadraticCurveToCasteljau(&_Path, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, _Data->CurveTessellationTol, 0); 
-    }
-    else
-    {
-        float t_step = 1.0f / (float)num_segments;
-        for (int i_step = 1; i_step <= num_segments; i_step++)
-            _Path.push_back(ImBezierQuadraticCalc(p1, p2, p3, t_step * i_step));
-    }
-}
-
-void ImDrawList::PathRect(const ImVec2& a, const ImVec2& b, float rounding, ImDrawCornerFlags rounding_corners)
-{
-    rounding = ImMin(rounding, ImFabs(b.x - a.x) * ( ((rounding_corners & ImDrawCornerFlags_Top)  == ImDrawCornerFlags_Top)  || ((rounding_corners & ImDrawCornerFlags_Bot)   == ImDrawCornerFlags_Bot)   ? 0.5f : 1.0f ) - 1.0f);
-    rounding = ImMin(rounding, ImFabs(b.y - a.y) * ( ((rounding_corners & ImDrawCornerFlags_Left) == ImDrawCornerFlags_Left) || ((rounding_corners & ImDrawCornerFlags_Right) == ImDrawCornerFlags_Right) ? 0.5f : 1.0f ) - 1.0f);
-
-    if (rounding <= 0.0f || rounding_corners == 0)
-    {
-        PathLineTo(a);
-        PathLineTo(ImVec2(b.x, a.y));
-        PathLineTo(b);
-        PathLineTo(ImVec2(a.x, b.y));
-    }
-    else
-    {
-        const float rounding_tl = (rounding_corners & ImDrawCornerFlags_TopLeft) ? rounding : 0.0f;
-        const float rounding_tr = (rounding_corners & ImDrawCornerFlags_TopRight) ? rounding : 0.0f;
-        const float rounding_br = (rounding_corners & ImDrawCornerFlags_BotRight) ? rounding : 0.0f;
-        const float rounding_bl = (rounding_corners & ImDrawCornerFlags_BotLeft) ? rounding : 0.0f;
-        PathArcToFast(ImVec2(a.x + rounding_tl, a.y + rounding_tl), rounding_tl, 6, 9);
-        PathArcToFast(ImVec2(b.x - rounding_tr, a.y + rounding_tr), rounding_tr, 9, 12);
-        PathArcToFast(ImVec2(b.x - rounding_br, b.y - rounding_br), rounding_br, 0, 3);
-        PathArcToFast(ImVec2(a.x + rounding_bl, b.y - rounding_bl), rounding_bl, 3, 6);
-    }
-}
-
-void ImDrawList::AddLine(const ImVec2& p1, const ImVec2& p2, ImU32 col, float thickness)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-    PathLineTo(p1 + ImVec2(0.5f, 0.5f));
-    PathLineTo(p2 + ImVec2(0.5f, 0.5f));
-    PathStroke(col, false, thickness);
-}
-
-void ImDrawList::AddRect(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners, float thickness)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-    if (Flags & ImDrawListFlags_AntiAliasedLines)
-        PathRect(p_min + ImVec2(0.50f, 0.50f), p_max - ImVec2(0.50f, 0.50f), rounding, rounding_corners);
-    else
-        PathRect(p_min + ImVec2(0.50f, 0.50f), p_max - ImVec2(0.49f, 0.49f), rounding, rounding_corners);         
-    PathStroke(col, true, thickness);
-}
-
-void ImDrawList::AddRectFilled(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-    if (rounding > 0.0f)
-    {
-        PathRect(p_min, p_max, rounding, rounding_corners);
-        PathFillConvex(col);
-    }
-    else
-    {
-        PrimReserve(6, 4);
-        PrimRect(p_min, p_max, col);
-    }
-}
-
-void ImDrawList::AddRectFilledMultiColor(const ImVec2& p_min, const ImVec2& p_max, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left)
-{
-    if (((col_upr_left | col_upr_right | col_bot_right | col_bot_left) & IM_COL32_A_MASK) == 0)
-        return;
-
-    const ImVec2 uv = _Data->TexUvWhitePixel;
-    PrimReserve(6, 4);
-    PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx + 1)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx + 2));
-    PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx + 2)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx + 3));
-    PrimWriteVtx(p_min, uv, col_upr_left);
-    PrimWriteVtx(ImVec2(p_max.x, p_min.y), uv, col_upr_right);
-    PrimWriteVtx(p_max, uv, col_bot_right);
-    PrimWriteVtx(ImVec2(p_min.x, p_max.y), uv, col_bot_left);
-}
-
-void ImDrawList::AddQuad(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-
-    PathLineTo(p1);
-    PathLineTo(p2);
-    PathLineTo(p3);
-    PathLineTo(p4);
-    PathStroke(col, true, thickness);
-}
-
-void ImDrawList::AddQuadFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-
-    PathLineTo(p1);
-    PathLineTo(p2);
-    PathLineTo(p3);
-    PathLineTo(p4);
-    PathFillConvex(col);
-}
-
-void ImDrawList::AddTriangle(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col, float thickness)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-
-    PathLineTo(p1);
-    PathLineTo(p2);
-    PathLineTo(p3);
-    PathStroke(col, true, thickness);
-}
-
-void ImDrawList::AddTriangleFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-
-    PathLineTo(p1);
-    PathLineTo(p2);
-    PathLineTo(p3);
-    PathFillConvex(col);
-}
-
-void ImDrawList::AddCircle(const ImVec2& center, float radius, ImU32 col, int num_segments, float thickness)
-{
-    if ((col & IM_COL32_A_MASK) == 0 || radius <= 0.0f)
-        return;
-
-    if (num_segments <= 0)
-    {
-        const int radius_idx = (int)radius;
-        if (radius_idx < IM_ARRAYSIZE(_Data->CircleSegmentCounts))
-            num_segments = _Data->CircleSegmentCounts[radius_idx];    
-        else
-            num_segments = IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(radius, _Data->CircleSegmentMaxError);
-    }
-    else
-    {
-        num_segments = ImClamp(num_segments, 3, IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX);
-    }
-
-    const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments;
-    if (num_segments == 12)
-        PathArcToFast(center, radius - 0.5f, 0, 12 - 1);
-    else
-        PathArcTo(center, radius - 0.5f, 0.0f, a_max, num_segments - 1);
-    PathStroke(col, true, thickness);
-}
-
-void ImDrawList::AddCircleFilled(const ImVec2& center, float radius, ImU32 col, int num_segments)
-{
-    if ((col & IM_COL32_A_MASK) == 0 || radius <= 0.0f)
-        return;
-
-    if (num_segments <= 0)
-    {
-        const int radius_idx = (int)radius;
-        if (radius_idx < IM_ARRAYSIZE(_Data->CircleSegmentCounts))
-            num_segments = _Data->CircleSegmentCounts[radius_idx];    
-        else
-            num_segments = IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(radius, _Data->CircleSegmentMaxError);
-    }
-    else
-    {
-        num_segments = ImClamp(num_segments, 3, IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX);
-    }
-
-    const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments;
-    if (num_segments == 12)
-        PathArcToFast(center, radius, 0, 12 - 1);
-    else
-        PathArcTo(center, radius, 0.0f, a_max, num_segments - 1);
-    PathFillConvex(col);
-}
-
-void ImDrawList::AddNgon(const ImVec2& center, float radius, ImU32 col, int num_segments, float thickness)
-{
-    if ((col & IM_COL32_A_MASK) == 0 || num_segments <= 2)
-        return;
-
-    const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments;
-    PathArcTo(center, radius - 0.5f, 0.0f, a_max, num_segments - 1);
-    PathStroke(col, true, thickness);
-}
-
-void ImDrawList::AddNgonFilled(const ImVec2& center, float radius, ImU32 col, int num_segments)
-{
-    if ((col & IM_COL32_A_MASK) == 0 || num_segments <= 2)
-        return;
-
-    const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments;
-    PathArcTo(center, radius, 0.0f, a_max, num_segments - 1);
-    PathFillConvex(col);
-}
-
-void ImDrawList::AddBezierCubic(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness, int num_segments)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-
-    PathLineTo(p1);
-    PathBezierCubicCurveTo(p2, p3, p4, num_segments);
-    PathStroke(col, false, thickness);
-}
-
-void ImDrawList::AddBezierQuadratic(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col, float thickness, int num_segments)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-
-    PathLineTo(p1);
-    PathBezierQuadraticCurveTo(p2, p3, num_segments);
-    PathStroke(col, false, thickness);
-}
-
-void ImDrawList::AddText(const ImFont* font, float font_size, const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end, float wrap_width, const ImVec4* cpu_fine_clip_rect)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-
-    if (text_end == NULL)
-        text_end = text_begin + strlen(text_begin);
-    if (text_begin == text_end)
-        return;
-
-    if (font == NULL)
-        font = _Data->Font;
-    if (font_size == 0.0f)
-        font_size = _Data->FontSize;
-
-    IM_ASSERT(font->ContainerAtlas->TexID == _CmdHeader.TextureId);           
-
-    ImVec4 clip_rect = _CmdHeader.ClipRect;
-    if (cpu_fine_clip_rect)
-    {
-        clip_rect.x = ImMax(clip_rect.x, cpu_fine_clip_rect->x);
-        clip_rect.y = ImMax(clip_rect.y, cpu_fine_clip_rect->y);
-        clip_rect.z = ImMin(clip_rect.z, cpu_fine_clip_rect->z);
-        clip_rect.w = ImMin(clip_rect.w, cpu_fine_clip_rect->w);
-    }
-    font->RenderText(this, font_size, pos, col, clip_rect, text_begin, text_end, wrap_width, cpu_fine_clip_rect != NULL);
-}
-
-void ImDrawList::AddText(const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end)
-{
-    AddText(NULL, 0.0f, pos, col, text_begin, text_end);
-}
-
-void ImDrawList::AddImage(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-
-    const bool push_texture_id = user_texture_id != _CmdHeader.TextureId;
-    if (push_texture_id)
-        PushTextureID(user_texture_id);
-
-    PrimReserve(6, 4);
-    PrimRectUV(p_min, p_max, uv_min, uv_max, col);
-
-    if (push_texture_id)
-        PopTextureID();
-}
-
-void ImDrawList::AddImageQuad(ImTextureID user_texture_id, const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& uv1, const ImVec2& uv2, const ImVec2& uv3, const ImVec2& uv4, ImU32 col)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-
-    const bool push_texture_id = user_texture_id != _CmdHeader.TextureId;
-    if (push_texture_id)
-        PushTextureID(user_texture_id);
-
-    PrimReserve(6, 4);
-    PrimQuadUV(p1, p2, p3, p4, uv1, uv2, uv3, uv4, col);
-
-    if (push_texture_id)
-        PopTextureID();
-}
-
-void ImDrawList::AddImageRounded(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners)
-{
-    if ((col & IM_COL32_A_MASK) == 0)
-        return;
-
-    if (rounding <= 0.0f || (rounding_corners & ImDrawCornerFlags_All) == 0)
-    {
-        AddImage(user_texture_id, p_min, p_max, uv_min, uv_max, col);
-        return;
-    }
-
-    const bool push_texture_id = _TextureIdStack.empty() || user_texture_id != _TextureIdStack.back();
-    if (push_texture_id)
-        PushTextureID(user_texture_id);
-
-    int vert_start_idx = VtxBuffer.Size;
-    PathRect(p_min, p_max, rounding, rounding_corners);
-    PathFillConvex(col);
-    int vert_end_idx = VtxBuffer.Size;
-    ImGui::ShadeVertsLinearUV(this, vert_start_idx, vert_end_idx, p_min, p_max, uv_min, uv_max, true);
-
-    if (push_texture_id)
-        PopTextureID();
-}
-
-
-void ImDrawListSplitter::ClearFreeMemory()
-{
-    for (int i = 0; i < _Channels.Size; i++)
-    {
-        if (i == _Current)
-            memset(&_Channels[i], 0, sizeof(_Channels[i]));            
-        _Channels[i]._CmdBuffer.clear();
-        _Channels[i]._IdxBuffer.clear();
-    }
-    _Current = 0;
-    _Count = 1;
-    _Channels.clear();
-}
-
-void ImDrawListSplitter::Split(ImDrawList* draw_list, int channels_count)
-{
-    IM_UNUSED(draw_list);
-    IM_ASSERT(_Current == 0 && _Count <= 1 && "Nested channel splitting is not supported. Please use separate instances of ImDrawListSplitter.");
-    int old_channels_count = _Channels.Size;
-    if (old_channels_count < channels_count)
-    {
-        _Channels.reserve(channels_count);           
-        _Channels.resize(channels_count);
-    }
-    _Count = channels_count;
-
-    memset(&_Channels[0], 0, sizeof(ImDrawChannel));
-    for (int i = 1; i < channels_count; i++)
-    {
-        if (i >= old_channels_count)
-        {
-            IM_PLACEMENT_NEW(&_Channels[i]) ImDrawChannel();
-        }
-        else
-        {
-            _Channels[i]._CmdBuffer.resize(0);
-            _Channels[i]._IdxBuffer.resize(0);
-        }
-    }
-}
-
-void ImDrawListSplitter::Merge(ImDrawList* draw_list)
-{
-    if (_Count <= 1)
-        return;
-
-    SetCurrentChannel(draw_list, 0);
-    draw_list->_PopUnusedDrawCmd();
-
-    int new_cmd_buffer_count = 0;
-    int new_idx_buffer_count = 0;
-    ImDrawCmd* last_cmd = (_Count > 0 && draw_list->CmdBuffer.Size > 0) ? &draw_list->CmdBuffer.back() : NULL;
-    int idx_offset = last_cmd ? last_cmd->IdxOffset + last_cmd->ElemCount : 0;
-    for (int i = 1; i < _Count; i++)
-    {
-        ImDrawChannel& ch = _Channels[i];
-
-        if (ch._CmdBuffer.Size > 0 && ch._CmdBuffer.back().ElemCount == 0)
-            ch._CmdBuffer.pop_back();
-
-        if (ch._CmdBuffer.Size > 0 && last_cmd != NULL)
-        {
-            ImDrawCmd* next_cmd = &ch._CmdBuffer[0];
-            if (ImDrawCmd_HeaderCompare(last_cmd, next_cmd) == 0 && last_cmd->UserCallback == NULL && next_cmd->UserCallback == NULL)
-            {
-                last_cmd->ElemCount += next_cmd->ElemCount;
-                idx_offset += next_cmd->ElemCount;
-                ch._CmdBuffer.erase(ch._CmdBuffer.Data);      
-            }
-        }
-        if (ch._CmdBuffer.Size > 0)
-            last_cmd = &ch._CmdBuffer.back();
-        new_cmd_buffer_count += ch._CmdBuffer.Size;
-        new_idx_buffer_count += ch._IdxBuffer.Size;
-        for (int cmd_n = 0; cmd_n < ch._CmdBuffer.Size; cmd_n++)
-        {
-            ch._CmdBuffer.Data[cmd_n].IdxOffset = idx_offset;
-            idx_offset += ch._CmdBuffer.Data[cmd_n].ElemCount;
-        }
-    }
-    draw_list->CmdBuffer.resize(draw_list->CmdBuffer.Size + new_cmd_buffer_count);
-    draw_list->IdxBuffer.resize(draw_list->IdxBuffer.Size + new_idx_buffer_count);
-
-    ImDrawCmd* cmd_write = draw_list->CmdBuffer.Data + draw_list->CmdBuffer.Size - new_cmd_buffer_count;
-    ImDrawIdx* idx_write = draw_list->IdxBuffer.Data + draw_list->IdxBuffer.Size - new_idx_buffer_count;
-    for (int i = 1; i < _Count; i++)
-    {
-        ImDrawChannel& ch = _Channels[i];
-        if (int sz = ch._CmdBuffer.Size) { memcpy(cmd_write, ch._CmdBuffer.Data, sz * sizeof(ImDrawCmd)); cmd_write += sz; }
-        if (int sz = ch._IdxBuffer.Size) { memcpy(idx_write, ch._IdxBuffer.Data, sz * sizeof(ImDrawIdx)); idx_write += sz; }
-    }
-    draw_list->_IdxWritePtr = idx_write;
-
-    if (draw_list->CmdBuffer.Size == 0 || draw_list->CmdBuffer.back().UserCallback != NULL)
-        draw_list->AddDrawCmd();
-
-    ImDrawCmd* curr_cmd = &draw_list->CmdBuffer.Data[draw_list->CmdBuffer.Size - 1];
-    if (curr_cmd->ElemCount == 0)
-        ImDrawCmd_HeaderCopy(curr_cmd, &draw_list->_CmdHeader);     
-    else if (ImDrawCmd_HeaderCompare(curr_cmd, &draw_list->_CmdHeader) != 0)
-        draw_list->AddDrawCmd();
-
-    _Count = 1;
-}
-
-void ImDrawListSplitter::SetCurrentChannel(ImDrawList* draw_list, int idx)
-{
-    IM_ASSERT(idx >= 0 && idx < _Count);
-    if (_Current == idx)
-        return;
-
-    memcpy(&_Channels.Data[_Current]._CmdBuffer, &draw_list->CmdBuffer, sizeof(draw_list->CmdBuffer));
-    memcpy(&_Channels.Data[_Current]._IdxBuffer, &draw_list->IdxBuffer, sizeof(draw_list->IdxBuffer));
-    _Current = idx;
-    memcpy(&draw_list->CmdBuffer, &_Channels.Data[idx]._CmdBuffer, sizeof(draw_list->CmdBuffer));
-    memcpy(&draw_list->IdxBuffer, &_Channels.Data[idx]._IdxBuffer, sizeof(draw_list->IdxBuffer));
-    draw_list->_IdxWritePtr = draw_list->IdxBuffer.Data + draw_list->IdxBuffer.Size;
-
-    ImDrawCmd* curr_cmd = (draw_list->CmdBuffer.Size == 0) ? NULL : &draw_list->CmdBuffer.Data[draw_list->CmdBuffer.Size - 1];
-    if (curr_cmd == NULL)
-        draw_list->AddDrawCmd();
-    else if (curr_cmd->ElemCount == 0)
-        ImDrawCmd_HeaderCopy(curr_cmd, &draw_list->_CmdHeader);     
-    else if (ImDrawCmd_HeaderCompare(curr_cmd, &draw_list->_CmdHeader) != 0)
-        draw_list->AddDrawCmd();
-}
-
-void ImDrawData::DeIndexAllBuffers()
-{
-    ImVector<ImDrawVert> new_vtx_buffer;
-    TotalVtxCount = TotalIdxCount = 0;
-    for (int i = 0; i < CmdListsCount; i++)
-    {
-        ImDrawList* cmd_list = CmdLists[i];
-        if (cmd_list->IdxBuffer.empty())
-            continue;
-        new_vtx_buffer.resize(cmd_list->IdxBuffer.Size);
-        for (int j = 0; j < cmd_list->IdxBuffer.Size; j++)
-            new_vtx_buffer[j] = cmd_list->VtxBuffer[cmd_list->IdxBuffer[j]];
-        cmd_list->VtxBuffer.swap(new_vtx_buffer);
-        cmd_list->IdxBuffer.resize(0);
-        TotalVtxCount += cmd_list->VtxBuffer.Size;
-    }
-}
-
-void ImDrawData::ScaleClipRects(const ImVec2& fb_scale)
-{
-    for (int i = 0; i < CmdListsCount; i++)
-    {
-        ImDrawList* cmd_list = CmdLists[i];
-        for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++)
-        {
-            ImDrawCmd* cmd = &cmd_list->CmdBuffer[cmd_i];
-            cmd->ClipRect = ImVec4(cmd->ClipRect.x * fb_scale.x, cmd->ClipRect.y * fb_scale.y, cmd->ClipRect.z * fb_scale.x, cmd->ClipRect.w * fb_scale.y);
-        }
-    }
-}
-
-void ImGui::ShadeVertsLinearColorGradientKeepAlpha(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, ImVec2 gradient_p0, ImVec2 gradient_p1, ImU32 col0, ImU32 col1)
-{
-    ImVec2 gradient_extent = gradient_p1 - gradient_p0;
-    float gradient_inv_length2 = 1.0f / ImLengthSqr(gradient_extent);
-    ImDrawVert* vert_start = draw_list->VtxBuffer.Data + vert_start_idx;
-    ImDrawVert* vert_end = draw_list->VtxBuffer.Data + vert_end_idx;
-    const int col0_r = (int)(col0 >> IM_COL32_R_SHIFT) & 0xFF;
-    const int col0_g = (int)(col0 >> IM_COL32_G_SHIFT) & 0xFF;
-    const int col0_b = (int)(col0 >> IM_COL32_B_SHIFT) & 0xFF;
-    const int col_delta_r = ((int)(col1 >> IM_COL32_R_SHIFT) & 0xFF) - col0_r;
-    const int col_delta_g = ((int)(col1 >> IM_COL32_G_SHIFT) & 0xFF) - col0_g;
-    const int col_delta_b = ((int)(col1 >> IM_COL32_B_SHIFT) & 0xFF) - col0_b;
-    for (ImDrawVert* vert = vert_start; vert < vert_end; vert++)
-    {
-        float d = ImDot(vert->pos - gradient_p0, gradient_extent);
-        float t = ImClamp(d * gradient_inv_length2, 0.0f, 1.0f);
-        int r = (int)(col0_r + col_delta_r * t);
-        int g = (int)(col0_g + col_delta_g * t);
-        int b = (int)(col0_b + col_delta_b * t);
-        vert->col = (r << IM_COL32_R_SHIFT) | (g << IM_COL32_G_SHIFT) | (b << IM_COL32_B_SHIFT) | (vert->col & IM_COL32_A_MASK);
-    }
-}
-
-void ImGui::ShadeVertsLinearUV(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, bool clamp)
-{
-    const ImVec2 size = b - a;
-    const ImVec2 uv_size = uv_b - uv_a;
-    const ImVec2 scale = ImVec2(
-        size.x != 0.0f ? (uv_size.x / size.x) : 0.0f,
-        size.y != 0.0f ? (uv_size.y / size.y) : 0.0f);
-
-    ImDrawVert* vert_start = draw_list->VtxBuffer.Data + vert_start_idx;
-    ImDrawVert* vert_end = draw_list->VtxBuffer.Data + vert_end_idx;
-    if (clamp)
-    {
-        const ImVec2 min = ImMin(uv_a, uv_b);
-        const ImVec2 max = ImMax(uv_a, uv_b);
-        for (ImDrawVert* vertex = vert_start; vertex < vert_end; ++vertex)
-            vertex->uv = ImClamp(uv_a + ImMul(ImVec2(vertex->pos.x, vertex->pos.y) - a, scale), min, max);
-    }
-    else
-    {
-        for (ImDrawVert* vertex = vert_start; vertex < vert_end; ++vertex)
-            vertex->uv = uv_a + ImMul(ImVec2(vertex->pos.x, vertex->pos.y) - a, scale);
-    }
-}
-
-ImFontConfig::ImFontConfig()
-{
-    memset(this, 0, sizeof(*this));
-    FontDataOwnedByAtlas = true;
-    OversampleH = 3;        
-    OversampleV = 1;
-    GlyphMaxAdvanceX = FLT_MAX;
-    RasterizerMultiply = 1.0f;
-    EllipsisChar = (ImWchar)-1;
-}
-
-const int FONT_ATLAS_DEFAULT_TEX_DATA_W = 108;           
-const int FONT_ATLAS_DEFAULT_TEX_DATA_H = 27;
-static const char FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS[FONT_ATLAS_DEFAULT_TEX_DATA_W * FONT_ATLAS_DEFAULT_TEX_DATA_H + 1] =
-{
-    "..-         -XXXXXXX-    X    -           X           -XXXXXXX          -          XXXXXXX-     XX          "
-    "..-         -X.....X-   X.X   -          X.X          -X.....X          -          X.....X-    X..X         "
-    "---         -XXX.XXX-  X...X  -         X...X         -X....X           -           X....X-    X..X         "
-    "X           -  X.X  - X.....X -        X.....X        -X...X            -            X...X-    X..X         "
-    "XX          -  X.X  -X.......X-       X.......X       -X..X.X           -           X.X..X-    X..X         "
-    "X.X         -  X.X  -XXXX.XXXX-       XXXX.XXXX       -X.X X.X          -          X.X X.X-    X..XXX       "
-    "X..X        -  X.X  -   X.X   -          X.X          -XX   X.X         -         X.X   XX-    X..X..XXX    "
-    "X...X       -  X.X  -   X.X   -    XX    X.X    XX    -      X.X        -        X.X      -    X..X..X..XX  "
-    "X....X      -  X.X  -   X.X   -   X.X    X.X    X.X   -       X.X       -       X.X       -    X..X..X..X.X "
-    "X.....X     -  X.X  -   X.X   -  X..X    X.X    X..X  -        X.X      -      X.X        -XXX X..X..X..X..X"
-    "X......X    -  X.X  -   X.X   - X...XXXXXX.XXXXXX...X -         X.X   XX-XX   X.X         -X..XX........X..X"
-    "X.......X   -  X.X  -   X.X   -X.....................X-          X.X X.X-X.X X.X          -X...X...........X"
-    "X........X  -  X.X  -   X.X   - X...XXXXXX.XXXXXX...X -           X.X..X-X..X.X           - X..............X"
-    "X.........X -XXX.XXX-   X.X   -  X..X    X.X    X..X  -            X...X-X...X            -  X.............X"
-    "X..........X-X.....X-   X.X   -   X.X    X.X    X.X   -           X....X-X....X           -  X.............X"
-    "X......XXXXX-XXXXXXX-   X.X   -    XX    X.X    XX    -          X.....X-X.....X          -   X............X"
-    "X...X..X    ---------   X.X   -          X.X          -          XXXXXXX-XXXXXXX          -   X...........X "
-    "X..X X..X   -       -XXXX.XXXX-       XXXX.XXXX       -------------------------------------    X..........X "
-    "X.X  X..X   -       -X.......X-       X.......X       -    XX           XX    -           -    X..........X "
-    "XX    X..X  -       - X.....X -        X.....X        -   X.X           X.X   -           -     X........X  "
-    "      X..X          -  X...X  -         X...X         -  X..X           X..X  -           -     X........X  "
-    "       XX           -   X.X   -          X.X          - X...XXXXXXXXXXXXX...X -           -     XXXXXXXXXX  "
-    "------------        -    X    -           X           -X.....................X-           ------------------"
-    "                    ----------------------------------- X...XXXXXXXXXXXXX...X -                             "
-    "                                                      -  X..X           X..X  -                             "
-    "                                                      -   X.X           X.X   -                             "
-    "                                                      -    XX           XX    -                             "
-};
-
-static const ImVec2 FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[ImGuiMouseCursor_COUNT][3] =
-{
-    { ImVec2( 0,3), ImVec2(12,19), ImVec2( 0, 0) },  
-    { ImVec2(13,0), ImVec2( 7,16), ImVec2( 1, 8) },  
-    { ImVec2(31,0), ImVec2(23,23), ImVec2(11,11) },  
-    { ImVec2(21,0), ImVec2( 9,23), ImVec2( 4,11) },  
-    { ImVec2(55,18),ImVec2(23, 9), ImVec2(11, 4) },  
-    { ImVec2(73,0), ImVec2(17,17), ImVec2( 8, 8) },  
-    { ImVec2(55,0), ImVec2(17,17), ImVec2( 8, 8) },  
-    { ImVec2(91,0), ImVec2(17,22), ImVec2( 5, 0) },  
-};
-
-ImFontAtlas::ImFontAtlas()
-{
-    memset(this, 0, sizeof(*this));
-    TexGlyphPadding = 1;
-    PackIdMouseCursors = PackIdLines = -1;
-}
-
-ImFontAtlas::~ImFontAtlas()
-{
-    IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!");
-    Clear();
-}
-
-void    ImFontAtlas::ClearInputData()
-{
-    IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!");
-    for (int i = 0; i < ConfigData.Size; i++)
-        if (ConfigData[i].FontData && ConfigData[i].FontDataOwnedByAtlas)
-        {
-            IM_FREE(ConfigData[i].FontData);
-            ConfigData[i].FontData = NULL;
-        }
-
-    for (int i = 0; i < Fonts.Size; i++)
-        if (Fonts[i]->ConfigData >= ConfigData.Data && Fonts[i]->ConfigData < ConfigData.Data + ConfigData.Size)
-        {
-            Fonts[i]->ConfigData = NULL;
-            Fonts[i]->ConfigDataCount = 0;
-        }
-    ConfigData.clear();
-    CustomRects.clear();
-    PackIdMouseCursors = PackIdLines = -1;
-}
-
-void    ImFontAtlas::ClearTexData()
-{
-    IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!");
-    if (TexPixelsAlpha8)
-        IM_FREE(TexPixelsAlpha8);
-    if (TexPixelsRGBA32)
-        IM_FREE(TexPixelsRGBA32);
-    TexPixelsAlpha8 = NULL;
-    TexPixelsRGBA32 = NULL;
-}
-
-void    ImFontAtlas::ClearFonts()
-{
-    IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!");
-    for (int i = 0; i < Fonts.Size; i++)
-        IM_DELETE(Fonts[i]);
-    Fonts.clear();
-}
-
-void    ImFontAtlas::Clear()
-{
-    ClearInputData();
-    ClearTexData();
-    ClearFonts();
-}
-
-void    ImFontAtlas::GetTexDataAsAlpha8(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel)
-{
-    if (TexPixelsAlpha8 == NULL)
-    {
-        if (ConfigData.empty())
-            AddFontDefault();
-        Build();
-    }
-
-    *out_pixels = TexPixelsAlpha8;
-    if (out_width) *out_width = TexWidth;
-    if (out_height) *out_height = TexHeight;
-    if (out_bytes_per_pixel) *out_bytes_per_pixel = 1;
-}
-
-void    ImFontAtlas::GetTexDataAsRGBA32(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel)
-{
-    if (!TexPixelsRGBA32)
-    {
-        unsigned char* pixels = NULL;
-        GetTexDataAsAlpha8(&pixels, NULL, NULL);
-        if (pixels)
-        {
-            TexPixelsRGBA32 = (unsigned int*)IM_ALLOC((size_t)TexWidth * (size_t)TexHeight * 4);
-            const unsigned char* src = pixels;
-            unsigned int* dst = TexPixelsRGBA32;
-            for (int n = TexWidth * TexHeight; n > 0; n--)
-                *dst++ = IM_COL32(255, 255, 255, (unsigned int)(*src++));
-        }
-    }
-
-    *out_pixels = (unsigned char*)TexPixelsRGBA32;
-    if (out_width) *out_width = TexWidth;
-    if (out_height) *out_height = TexHeight;
-    if (out_bytes_per_pixel) *out_bytes_per_pixel = 4;
-}
-
-ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg)
-{
-    IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!");
-    IM_ASSERT(font_cfg->FontData != NULL && font_cfg->FontDataSize > 0);
-    IM_ASSERT(font_cfg->SizePixels > 0.0f);
-
-    if (!font_cfg->MergeMode)
-        Fonts.push_back(IM_NEW(ImFont));
-    else
-        IM_ASSERT(!Fonts.empty() && "Cannot use MergeMode for the first font");                        
-
-    ConfigData.push_back(*font_cfg);
-    ImFontConfig& new_font_cfg = ConfigData.back();
-    if (new_font_cfg.DstFont == NULL)
-        new_font_cfg.DstFont = Fonts.back();
-    if (!new_font_cfg.FontDataOwnedByAtlas)
-    {
-        new_font_cfg.FontData = IM_ALLOC(new_font_cfg.FontDataSize);
-        new_font_cfg.FontDataOwnedByAtlas = true;
-        memcpy(new_font_cfg.FontData, font_cfg->FontData, (size_t)new_font_cfg.FontDataSize);
-    }
-
-    if (new_font_cfg.DstFont->EllipsisChar == (ImWchar)-1)
-        new_font_cfg.DstFont->EllipsisChar = font_cfg->EllipsisChar;
-
-    ClearTexData();
-    return new_font_cfg.DstFont;
-}
-
-static unsigned int stb_decompress_length(const unsigned char* input);
-static unsigned int stb_decompress(unsigned char* output, const unsigned char* input, unsigned int length);
-static const char*  GetDefaultCompressedFontDataTTFBase85();
-static unsigned int Decode85Byte(char c)                                    { return c >= '\\' ? c-36 : c-35; }
-static void         Decode85(const unsigned char* src, unsigned char* dst)
-{
-    while (*src)
-    {
-        unsigned int tmp = Decode85Byte(src[0]) + 85 * (Decode85Byte(src[1]) + 85 * (Decode85Byte(src[2]) + 85 * (Decode85Byte(src[3]) + 85 * Decode85Byte(src[4]))));
-        dst[0] = ((tmp >> 0) & 0xFF); dst[1] = ((tmp >> 8) & 0xFF); dst[2] = ((tmp >> 16) & 0xFF); dst[3] = ((tmp >> 24) & 0xFF);       
-        src += 5;
-        dst += 4;
-    }
-}
-
-ImFont* ImFontAtlas::AddFontDefault(const ImFontConfig* font_cfg_template)
-{
-    ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig();
-    if (!font_cfg_template)
-    {
-        font_cfg.OversampleH = font_cfg.OversampleV = 1;
-        font_cfg.PixelSnapH = true;
-    }
-    if (font_cfg.SizePixels <= 0.0f)
-        font_cfg.SizePixels = 13.0f * 1.0f;
-    if (font_cfg.Name[0] == '\0')
-        ImFormatString(font_cfg.Name, IM_ARRAYSIZE(font_cfg.Name), "ProggyClean.ttf, %dpx", (int)font_cfg.SizePixels);
-    font_cfg.EllipsisChar = (ImWchar)0x0085;
-    font_cfg.GlyphOffset.y = 1.0f * IM_FLOOR(font_cfg.SizePixels / 13.0f);        
-
-    const char* ttf_compressed_base85 = GetDefaultCompressedFontDataTTFBase85();
-    const ImWchar* glyph_ranges = font_cfg.GlyphRanges != NULL ? font_cfg.GlyphRanges : GetGlyphRangesDefault();
-    ImFont* font = AddFontFromMemoryCompressedBase85TTF(ttf_compressed_base85, font_cfg.SizePixels, &font_cfg, glyph_ranges);
-    return font;
-}
-
-ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels, const ImFontConfig* font_cfg_template, const ImWchar* glyph_ranges)
-{
-    IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!");
-    size_t data_size = 0;
-    void* data = ImFileLoadToMemory(filename, "rb", &data_size, 0);
-    if (!data)
-    {
-        IM_ASSERT_USER_ERROR(0, "Could not load font file!");
-        return NULL;
-    }
-    ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig();
-    if (font_cfg.Name[0] == '\0')
-    {
-        const char* p;
-        for (p = filename + strlen(filename); p > filename && p[-1] != '/' && p[-1] != '\\'; p--) {}
-        ImFormatString(font_cfg.Name, IM_ARRAYSIZE(font_cfg.Name), "%s, %.0fpx", p, size_pixels);
-    }
-    return AddFontFromMemoryTTF(data, (int)data_size, size_pixels, &font_cfg, glyph_ranges);
-}
-
-ImFont* ImFontAtlas::AddFontFromMemoryTTF(void* ttf_data, int ttf_size, float size_pixels, const ImFontConfig* font_cfg_template, const ImWchar* glyph_ranges)
-{
-    IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!");
-    ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig();
-    IM_ASSERT(font_cfg.FontData == NULL);
-    font_cfg.FontData = ttf_data;
-    font_cfg.FontDataSize = ttf_size;
-    font_cfg.SizePixels = size_pixels;
-    if (glyph_ranges)
-        font_cfg.GlyphRanges = glyph_ranges;
-    return AddFont(&font_cfg);
-}
-
-ImFont* ImFontAtlas::AddFontFromMemoryCompressedTTF(const void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, const ImFontConfig* font_cfg_template, const ImWchar* glyph_ranges)
-{
-    const unsigned int buf_decompressed_size = stb_decompress_length((const unsigned char*)compressed_ttf_data);
-    unsigned char* buf_decompressed_data = (unsigned char*)IM_ALLOC(buf_decompressed_size);
-    stb_decompress(buf_decompressed_data, (const unsigned char*)compressed_ttf_data, (unsigned int)compressed_ttf_size);
-
-    ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig();
-    IM_ASSERT(font_cfg.FontData == NULL);
-    font_cfg.FontDataOwnedByAtlas = true;
-    return AddFontFromMemoryTTF(buf_decompressed_data, (int)buf_decompressed_size, size_pixels, &font_cfg, glyph_ranges);
-}
-
-ImFont* ImFontAtlas::AddFontFromMemoryCompressedBase85TTF(const char* compressed_ttf_data_base85, float size_pixels, const ImFontConfig* font_cfg, const ImWchar* glyph_ranges)
-{
-    int compressed_ttf_size = (((int)strlen(compressed_ttf_data_base85) + 4) / 5) * 4;
-    void* compressed_ttf = IM_ALLOC((size_t)compressed_ttf_size);
-    Decode85((const unsigned char*)compressed_ttf_data_base85, (unsigned char*)compressed_ttf);
-    ImFont* font = AddFontFromMemoryCompressedTTF(compressed_ttf, compressed_ttf_size, size_pixels, font_cfg, glyph_ranges);
-    IM_FREE(compressed_ttf);
-    return font;
-}
-
-int ImFontAtlas::AddCustomRectRegular(int width, int height)
-{
-    IM_ASSERT(width > 0 && width <= 0xFFFF);
-    IM_ASSERT(height > 0 && height <= 0xFFFF);
-    ImFontAtlasCustomRect r;
-    r.Width = (unsigned short)width;
-    r.Height = (unsigned short)height;
-    CustomRects.push_back(r);
-    return CustomRects.Size - 1;   
-}
-
-int ImFontAtlas::AddCustomRectFontGlyph(ImFont* font, ImWchar id, int width, int height, float advance_x, const ImVec2& offset)
-{
-#ifdef IMGUI_USE_WCHAR32
-    IM_ASSERT(id <= IM_UNICODE_CODEPOINT_MAX);
-#endif
-    IM_ASSERT(font != NULL);
-    IM_ASSERT(width > 0 && width <= 0xFFFF);
-    IM_ASSERT(height > 0 && height <= 0xFFFF);
-    ImFontAtlasCustomRect r;
-    r.Width = (unsigned short)width;
-    r.Height = (unsigned short)height;
-    r.GlyphID = id;
-    r.GlyphAdvanceX = advance_x;
-    r.GlyphOffset = offset;
-    r.Font = font;
-    CustomRects.push_back(r);
-    return CustomRects.Size - 1;   
-}
-
-void ImFontAtlas::CalcCustomRectUV(const ImFontAtlasCustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max) const
-{
-    IM_ASSERT(TexWidth > 0 && TexHeight > 0);               
-    IM_ASSERT(rect->IsPacked());                       
-    *out_uv_min = ImVec2((float)rect->X * TexUvScale.x, (float)rect->Y * TexUvScale.y);
-    *out_uv_max = ImVec2((float)(rect->X + rect->Width) * TexUvScale.x, (float)(rect->Y + rect->Height) * TexUvScale.y);
-}
-
-bool ImFontAtlas::GetMouseCursorTexData(ImGuiMouseCursor cursor_type, ImVec2* out_offset, ImVec2* out_size, ImVec2 out_uv_border[2], ImVec2 out_uv_fill[2])
-{
-    if (cursor_type <= ImGuiMouseCursor_None || cursor_type >= ImGuiMouseCursor_COUNT)
-        return false;
-    if (Flags & ImFontAtlasFlags_NoMouseCursors)
-        return false;
-
-    IM_ASSERT(PackIdMouseCursors != -1);
-    ImFontAtlasCustomRect* r = GetCustomRectByIndex(PackIdMouseCursors);
-    ImVec2 pos = FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[cursor_type][0] + ImVec2((float)r->X, (float)r->Y);
-    ImVec2 size = FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[cursor_type][1];
-    *out_size = size;
-    *out_offset = FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[cursor_type][2];
-    out_uv_border[0] = (pos) * TexUvScale;
-    out_uv_border[1] = (pos + size) * TexUvScale;
-    pos.x += FONT_ATLAS_DEFAULT_TEX_DATA_W + 1;
-    out_uv_fill[0] = (pos) * TexUvScale;
-    out_uv_fill[1] = (pos + size) * TexUvScale;
-    return true;
-}
-
-bool    ImFontAtlas::Build()
-{
-    IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!");
-
-    const ImFontBuilderIO* builder_io = FontBuilderIO;
-    if (builder_io == NULL)
-    {
-#ifdef IMGUI_ENABLE_FREETYPE
-        builder_io = ImGuiFreeType::GetBuilderForFreeType();
-#elif defined(IMGUI_ENABLE_STB_TRUETYPE)
-        builder_io = ImFontAtlasGetBuilderForStbTruetype();
-#else
-        IM_ASSERT(0);    
-#endif
-    }
-
-    return builder_io->FontBuilder_Build(this);
-}
-
-void    ImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256], float in_brighten_factor)
-{
-    for (unsigned int i = 0; i < 256; i++)
-    {
-        unsigned int value = (unsigned int)(i * in_brighten_factor);
-        out_table[i] = value > 255 ? 255 : (value & 0xFF);
-    }
-}
-
-void    ImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256], unsigned char* pixels, int x, int y, int w, int h, int stride)
-{
-    unsigned char* data = pixels + x + y * stride;
-    for (int j = h; j > 0; j--, data += stride)
-        for (int i = 0; i < w; i++)
-            data[i] = table[data[i]];
-}
-
-#ifdef IMGUI_ENABLE_STB_TRUETYPE
-struct ImFontBuildSrcData
-{
-    stbtt_fontinfo      FontInfo;
-    stbtt_pack_range    PackRange;                     
-    stbrp_rect*         Rects;                               
-    stbtt_packedchar*   PackedChars;          
-    const ImWchar*      SrcRanges;                        
-    int                 DstIndex;                
-    int                 GlyphsHighest;         
-    int                 GlyphsCount;                      
-    ImBitVector         GlyphsSet;                         
-    ImVector<int>       GlyphsList;                
-};
-
-struct ImFontBuildDstData
-{
-    int                 SrcCount;                   
-    int                 GlyphsHighest;
-    int                 GlyphsCount;
-    ImBitVector         GlyphsSet;                          
-};
-
-static void UnpackBitVectorToFlatIndexList(const ImBitVector* in, ImVector<int>* out)
-{
-    IM_ASSERT(sizeof(in->Storage.Data[0]) == sizeof(int));
-    const ImU32* it_begin = in->Storage.begin();
-    const ImU32* it_end = in->Storage.end();
-    for (const ImU32* it = it_begin; it < it_end; it++)
-        if (ImU32 entries_32 = *it)
-            for (ImU32 bit_n = 0; bit_n < 32; bit_n++)
-                if (entries_32 & ((ImU32)1 << bit_n))
-                    out->push_back((int)(((it - it_begin) << 5) + bit_n));
-}
-
-static bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas)
-{
-    IM_ASSERT(atlas->ConfigData.Size > 0);
-
-    ImFontAtlasBuildInit(atlas);
-
-    atlas->TexID = (ImTextureID)NULL;
-    atlas->TexWidth = atlas->TexHeight = 0;
-    atlas->TexUvScale = ImVec2(0.0f, 0.0f);
-    atlas->TexUvWhitePixel = ImVec2(0.0f, 0.0f);
-    atlas->ClearTexData();
-
-    ImVector<ImFontBuildSrcData> src_tmp_array;
-    ImVector<ImFontBuildDstData> dst_tmp_array;
-    src_tmp_array.resize(atlas->ConfigData.Size);
-    dst_tmp_array.resize(atlas->Fonts.Size);
-    memset(src_tmp_array.Data, 0, (size_t)src_tmp_array.size_in_bytes());
-    memset(dst_tmp_array.Data, 0, (size_t)dst_tmp_array.size_in_bytes());
-
-    for (int src_i = 0; src_i < atlas->ConfigData.Size; src_i++)
-    {
-        ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
-        ImFontConfig& cfg = atlas->ConfigData[src_i];
-        IM_ASSERT(cfg.DstFont && (!cfg.DstFont->IsLoaded() || cfg.DstFont->ContainerAtlas == atlas));
-
-        src_tmp.DstIndex = -1;
-        for (int output_i = 0; output_i < atlas->Fonts.Size && src_tmp.DstIndex == -1; output_i++)
-            if (cfg.DstFont == atlas->Fonts[output_i])
-                src_tmp.DstIndex = output_i;
-        if (src_tmp.DstIndex == -1)
-        {
-            IM_ASSERT(src_tmp.DstIndex != -1);       
-            return false;
-        }
-        const int font_offset = stbtt_GetFontOffsetForIndex((unsigned char*)cfg.FontData, cfg.FontNo);
-        IM_ASSERT(font_offset >= 0 && "FontData is incorrect, or FontNo cannot be found.");
-        if (!stbtt_InitFont(&src_tmp.FontInfo, (unsigned char*)cfg.FontData, font_offset))
-            return false;
-
-        ImFontBuildDstData& dst_tmp = dst_tmp_array[src_tmp.DstIndex];
-        src_tmp.SrcRanges = cfg.GlyphRanges ? cfg.GlyphRanges : atlas->GetGlyphRangesDefault();
-        for (const ImWchar* src_range = src_tmp.SrcRanges; src_range[0] && src_range[1]; src_range += 2)
-            src_tmp.GlyphsHighest = ImMax(src_tmp.GlyphsHighest, (int)src_range[1]);
-        dst_tmp.SrcCount++;
-        dst_tmp.GlyphsHighest = ImMax(dst_tmp.GlyphsHighest, src_tmp.GlyphsHighest);
-    }
-
-    int total_glyphs_count = 0;
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
-        ImFontBuildDstData& dst_tmp = dst_tmp_array[src_tmp.DstIndex];
-        src_tmp.GlyphsSet.Create(src_tmp.GlyphsHighest + 1);
-        if (dst_tmp.GlyphsSet.Storage.empty())
-            dst_tmp.GlyphsSet.Create(dst_tmp.GlyphsHighest + 1);
-
-        for (const ImWchar* src_range = src_tmp.SrcRanges; src_range[0] && src_range[1]; src_range += 2)
-            for (unsigned int codepoint = src_range[0]; codepoint <= src_range[1]; codepoint++)
-            {
-                if (dst_tmp.GlyphsSet.TestBit(codepoint))                  
-                    continue;
-                if (!stbtt_FindGlyphIndex(&src_tmp.FontInfo, codepoint))          
-                    continue;
-
-                src_tmp.GlyphsCount++;
-                dst_tmp.GlyphsCount++;
-                src_tmp.GlyphsSet.SetBit(codepoint);
-                dst_tmp.GlyphsSet.SetBit(codepoint);
-                total_glyphs_count++;
-            }
-    }
-
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
-        src_tmp.GlyphsList.reserve(src_tmp.GlyphsCount);
-        UnpackBitVectorToFlatIndexList(&src_tmp.GlyphsSet, &src_tmp.GlyphsList);
-        src_tmp.GlyphsSet.Clear();
-        IM_ASSERT(src_tmp.GlyphsList.Size == src_tmp.GlyphsCount);
-    }
-    for (int dst_i = 0; dst_i < dst_tmp_array.Size; dst_i++)
-        dst_tmp_array[dst_i].GlyphsSet.Clear();
-    dst_tmp_array.clear();
-
-    ImVector<stbrp_rect> buf_rects;
-    ImVector<stbtt_packedchar> buf_packedchars;
-    buf_rects.resize(total_glyphs_count);
-    buf_packedchars.resize(total_glyphs_count);
-    memset(buf_rects.Data, 0, (size_t)buf_rects.size_in_bytes());
-    memset(buf_packedchars.Data, 0, (size_t)buf_packedchars.size_in_bytes());
-
-    int total_surface = 0;
-    int buf_rects_out_n = 0;
-    int buf_packedchars_out_n = 0;
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
-        if (src_tmp.GlyphsCount == 0)
-            continue;
-
-        src_tmp.Rects = &buf_rects[buf_rects_out_n];
-        src_tmp.PackedChars = &buf_packedchars[buf_packedchars_out_n];
-        buf_rects_out_n += src_tmp.GlyphsCount;
-        buf_packedchars_out_n += src_tmp.GlyphsCount;
-
-        ImFontConfig& cfg = atlas->ConfigData[src_i];
-        src_tmp.PackRange.font_size = cfg.SizePixels;
-        src_tmp.PackRange.first_unicode_codepoint_in_range = 0;
-        src_tmp.PackRange.array_of_unicode_codepoints = src_tmp.GlyphsList.Data;
-        src_tmp.PackRange.num_chars = src_tmp.GlyphsList.Size;
-        src_tmp.PackRange.chardata_for_range = src_tmp.PackedChars;
-        src_tmp.PackRange.h_oversample = (unsigned char)cfg.OversampleH;
-        src_tmp.PackRange.v_oversample = (unsigned char)cfg.OversampleV;
-
-        const float scale = (cfg.SizePixels > 0) ? stbtt_ScaleForPixelHeight(&src_tmp.FontInfo, cfg.SizePixels) : stbtt_ScaleForMappingEmToPixels(&src_tmp.FontInfo, -cfg.SizePixels);
-        const int padding = atlas->TexGlyphPadding;
-        for (int glyph_i = 0; glyph_i < src_tmp.GlyphsList.Size; glyph_i++)
-        {
-            int x0, y0, x1, y1;
-            const int glyph_index_in_font = stbtt_FindGlyphIndex(&src_tmp.FontInfo, src_tmp.GlyphsList[glyph_i]);
-            IM_ASSERT(glyph_index_in_font != 0);
-            stbtt_GetGlyphBitmapBoxSubpixel(&src_tmp.FontInfo, glyph_index_in_font, scale * cfg.OversampleH, scale * cfg.OversampleV, 0, 0, &x0, &y0, &x1, &y1);
-            src_tmp.Rects[glyph_i].w = (stbrp_coord)(x1 - x0 + padding + cfg.OversampleH - 1);
-            src_tmp.Rects[glyph_i].h = (stbrp_coord)(y1 - y0 + padding + cfg.OversampleV - 1);
-            total_surface += src_tmp.Rects[glyph_i].w * src_tmp.Rects[glyph_i].h;
-        }
-    }
-
-    const int surface_sqrt = (int)ImSqrt((float)total_surface) + 1;
-    atlas->TexHeight = 0;
-    if (atlas->TexDesiredWidth > 0)
-        atlas->TexWidth = atlas->TexDesiredWidth;
-    else
-        atlas->TexWidth = (surface_sqrt >= 4096 * 0.7f) ? 4096 : (surface_sqrt >= 2048 * 0.7f) ? 2048 : (surface_sqrt >= 1024 * 0.7f) ? 1024 : 512;
-
-    const int TEX_HEIGHT_MAX = 1024 * 32;
-    stbtt_pack_context spc = {};
-    stbtt_PackBegin(&spc, NULL, atlas->TexWidth, TEX_HEIGHT_MAX, 0, atlas->TexGlyphPadding, NULL);
-    ImFontAtlasBuildPackCustomRects(atlas, spc.pack_info);
-
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
-        if (src_tmp.GlyphsCount == 0)
-            continue;
-
-        stbrp_pack_rects((stbrp_context*)spc.pack_info, src_tmp.Rects, src_tmp.GlyphsCount);
-
-        for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++)
-            if (src_tmp.Rects[glyph_i].was_packed)
-                atlas->TexHeight = ImMax(atlas->TexHeight, src_tmp.Rects[glyph_i].y + src_tmp.Rects[glyph_i].h);
-    }
-
-    atlas->TexHeight = (atlas->Flags & ImFontAtlasFlags_NoPowerOfTwoHeight) ? (atlas->TexHeight + 1) : ImUpperPowerOfTwo(atlas->TexHeight);
-    atlas->TexUvScale = ImVec2(1.0f / atlas->TexWidth, 1.0f / atlas->TexHeight);
-    atlas->TexPixelsAlpha8 = (unsigned char*)IM_ALLOC(atlas->TexWidth * atlas->TexHeight);
-    memset(atlas->TexPixelsAlpha8, 0, atlas->TexWidth * atlas->TexHeight);
-    spc.pixels = atlas->TexPixelsAlpha8;
-    spc.height = atlas->TexHeight;
-
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontConfig& cfg = atlas->ConfigData[src_i];
-        ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
-        if (src_tmp.GlyphsCount == 0)
-            continue;
-
-        stbtt_PackFontRangesRenderIntoRects(&spc, &src_tmp.FontInfo, &src_tmp.PackRange, 1, src_tmp.Rects);
-
-        if (cfg.RasterizerMultiply != 1.0f)
-        {
-            unsigned char multiply_table[256];
-            ImFontAtlasBuildMultiplyCalcLookupTable(multiply_table, cfg.RasterizerMultiply);
-            stbrp_rect* r = &src_tmp.Rects[0];
-            for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++, r++)
-                if (r->was_packed)
-                    ImFontAtlasBuildMultiplyRectAlpha8(multiply_table, atlas->TexPixelsAlpha8, r->x, r->y, r->w, r->h, atlas->TexWidth * 1);
-        }
-        src_tmp.Rects = NULL;
-    }
-
-    stbtt_PackEnd(&spc);
-    buf_rects.clear();
-
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
-        if (src_tmp.GlyphsCount == 0)
-            continue;
-
-        ImFontConfig& cfg = atlas->ConfigData[src_i];
-        ImFont* dst_font = cfg.DstFont;
-
-        const float font_scale = stbtt_ScaleForPixelHeight(&src_tmp.FontInfo, cfg.SizePixels);
-        int unscaled_ascent, unscaled_descent, unscaled_line_gap;
-        stbtt_GetFontVMetrics(&src_tmp.FontInfo, &unscaled_ascent, &unscaled_descent, &unscaled_line_gap);
-
-        const float ascent = ImFloor(unscaled_ascent * font_scale + ((unscaled_ascent > 0.0f) ? +1 : -1));
-        const float descent = ImFloor(unscaled_descent * font_scale + ((unscaled_descent > 0.0f) ? +1 : -1));
-        ImFontAtlasBuildSetupFont(atlas, dst_font, &cfg, ascent, descent);
-        const float font_off_x = cfg.GlyphOffset.x;
-        const float font_off_y = cfg.GlyphOffset.y + IM_ROUND(dst_font->Ascent);
-
-        for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++)
-        {
-            const int codepoint = src_tmp.GlyphsList[glyph_i];
-            const stbtt_packedchar& pc = src_tmp.PackedChars[glyph_i];
-            stbtt_aligned_quad q;
-            float unused_x = 0.0f, unused_y = 0.0f;
-            stbtt_GetPackedQuad(src_tmp.PackedChars, atlas->TexWidth, atlas->TexHeight, glyph_i, &unused_x, &unused_y, &q, 0);
-            dst_font->AddGlyph(&cfg, (ImWchar)codepoint, q.x0 + font_off_x, q.y0 + font_off_y, q.x1 + font_off_x, q.y1 + font_off_y, q.s0, q.t0, q.s1, q.t1, pc.xadvance);
-        }
-    }
-
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-        src_tmp_array[src_i].~ImFontBuildSrcData();
-
-    ImFontAtlasBuildFinish(atlas);
-    return true;
-}
-
-const ImFontBuilderIO* ImFontAtlasGetBuilderForStbTruetype()
-{
-    static ImFontBuilderIO io;
-    io.FontBuilder_Build = ImFontAtlasBuildWithStbTruetype;
-    return &io;
-}
-
-#endif  
-
-void ImFontAtlasBuildSetupFont(ImFontAtlas* atlas, ImFont* font, ImFontConfig* font_config, float ascent, float descent)
-{
-    if (!font_config->MergeMode)
-    {
-        font->ClearOutputData();
-        font->FontSize = font_config->SizePixels;
-        font->ConfigData = font_config;
-        font->ConfigDataCount = 0;
-        font->ContainerAtlas = atlas;
-        font->Ascent = ascent;
-        font->Descent = descent;
-    }
-    font->ConfigDataCount++;
-}
-
-void ImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas, void* stbrp_context_opaque)
-{
-    stbrp_context* pack_context = (stbrp_context*)stbrp_context_opaque;
-    IM_ASSERT(pack_context != NULL);
-
-    ImVector<ImFontAtlasCustomRect>& user_rects = atlas->CustomRects;
-    IM_ASSERT(user_rects.Size >= 1);                
-
-    ImVector<stbrp_rect> pack_rects;
-    pack_rects.resize(user_rects.Size);
-    memset(pack_rects.Data, 0, (size_t)pack_rects.size_in_bytes());
-    for (int i = 0; i < user_rects.Size; i++)
-    {
-        pack_rects[i].w = user_rects[i].Width;
-        pack_rects[i].h = user_rects[i].Height;
-    }
-    stbrp_pack_rects(pack_context, &pack_rects[0], pack_rects.Size);
-    for (int i = 0; i < pack_rects.Size; i++)
-        if (pack_rects[i].was_packed)
-        {
-            user_rects[i].X = pack_rects[i].x;
-            user_rects[i].Y = pack_rects[i].y;
-            IM_ASSERT(pack_rects[i].w == user_rects[i].Width && pack_rects[i].h == user_rects[i].Height);
-            atlas->TexHeight = ImMax(atlas->TexHeight, pack_rects[i].y + pack_rects[i].h);
-        }
-}
-
-void ImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas, int x, int y, int w, int h, const char* in_str, char in_marker_char, unsigned char in_marker_pixel_value)
-{
-    IM_ASSERT(x >= 0 && x + w <= atlas->TexWidth);
-    IM_ASSERT(y >= 0 && y + h <= atlas->TexHeight);
-    unsigned char* out_pixel = atlas->TexPixelsAlpha8 + x + (y * atlas->TexWidth);
-    for (int off_y = 0; off_y < h; off_y++, out_pixel += atlas->TexWidth, in_str += w)
-        for (int off_x = 0; off_x < w; off_x++)
-            out_pixel[off_x] = (in_str[off_x] == in_marker_char) ? in_marker_pixel_value : 0x00;
-}
-
-void ImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas, int x, int y, int w, int h, const char* in_str, char in_marker_char, unsigned int in_marker_pixel_value)
-{
-    IM_ASSERT(x >= 0 && x + w <= atlas->TexWidth);
-    IM_ASSERT(y >= 0 && y + h <= atlas->TexHeight);
-    unsigned int* out_pixel = atlas->TexPixelsRGBA32 + x + (y * atlas->TexWidth);
-    for (int off_y = 0; off_y < h; off_y++, out_pixel += atlas->TexWidth, in_str += w)
-        for (int off_x = 0; off_x < w; off_x++)
-            out_pixel[off_x] = (in_str[off_x] == in_marker_char) ? in_marker_pixel_value : IM_COL32_BLACK_TRANS;
-}
-
-static void ImFontAtlasBuildRenderDefaultTexData(ImFontAtlas* atlas)
-{
-    ImFontAtlasCustomRect* r = atlas->GetCustomRectByIndex(atlas->PackIdMouseCursors);
-    IM_ASSERT(r->IsPacked());
-
-    const int w = atlas->TexWidth;
-    if (!(atlas->Flags & ImFontAtlasFlags_NoMouseCursors))
-    {
-        IM_ASSERT(r->Width == FONT_ATLAS_DEFAULT_TEX_DATA_W * 2 + 1 && r->Height == FONT_ATLAS_DEFAULT_TEX_DATA_H);
-        const int x_for_white = r->X;
-        const int x_for_black = r->X + FONT_ATLAS_DEFAULT_TEX_DATA_W + 1;
-        if (atlas->TexPixelsAlpha8 != NULL)
-        {
-            ImFontAtlasBuildRender8bppRectFromString(atlas, x_for_white, r->Y, FONT_ATLAS_DEFAULT_TEX_DATA_W, FONT_ATLAS_DEFAULT_TEX_DATA_H, FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS, '.', 0xFF);
-            ImFontAtlasBuildRender8bppRectFromString(atlas, x_for_black, r->Y, FONT_ATLAS_DEFAULT_TEX_DATA_W, FONT_ATLAS_DEFAULT_TEX_DATA_H, FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS, 'X', 0xFF);
-        }
-        else
-        {
-            ImFontAtlasBuildRender32bppRectFromString(atlas, x_for_white, r->Y, FONT_ATLAS_DEFAULT_TEX_DATA_W, FONT_ATLAS_DEFAULT_TEX_DATA_H, FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS, '.', IM_COL32_WHITE);
-            ImFontAtlasBuildRender32bppRectFromString(atlas, x_for_black, r->Y, FONT_ATLAS_DEFAULT_TEX_DATA_W, FONT_ATLAS_DEFAULT_TEX_DATA_H, FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS, 'X', IM_COL32_WHITE);
-        }
-    }
-    else
-    {
-        IM_ASSERT(r->Width == 2 && r->Height == 2);
-        const int offset = (int)r->X + (int)r->Y * w;
-        if (atlas->TexPixelsAlpha8 != NULL)
-        {
-            atlas->TexPixelsAlpha8[offset] = atlas->TexPixelsAlpha8[offset + 1] = atlas->TexPixelsAlpha8[offset + w] = atlas->TexPixelsAlpha8[offset + w + 1] = 0xFF;
-        }
-        else
-        {
-            atlas->TexPixelsRGBA32[offset] = atlas->TexPixelsRGBA32[offset + 1] = atlas->TexPixelsRGBA32[offset + w] = atlas->TexPixelsRGBA32[offset + w + 1] = IM_COL32_WHITE;
-        }
-    }
-    atlas->TexUvWhitePixel = ImVec2((r->X + 0.5f) * atlas->TexUvScale.x, (r->Y + 0.5f) * atlas->TexUvScale.y);
-}
-
-static void ImFontAtlasBuildRenderLinesTexData(ImFontAtlas* atlas)
-{
-    if (atlas->Flags & ImFontAtlasFlags_NoBakedLines)
-        return;
-
-    ImFontAtlasCustomRect* r = atlas->GetCustomRectByIndex(atlas->PackIdLines);
-    IM_ASSERT(r->IsPacked());
-    for (unsigned int n = 0; n < IM_DRAWLIST_TEX_LINES_WIDTH_MAX + 1; n++)       
-    {
-        unsigned int y = n;
-        unsigned int line_width = n;
-        unsigned int pad_left = (r->Width - line_width) / 2;
-        unsigned int pad_right = r->Width - (pad_left + line_width);
-
-        IM_ASSERT(pad_left + line_width + pad_right == r->Width && y < r->Height);             
-        if (atlas->TexPixelsAlpha8 != NULL)
-        {
-            unsigned char* write_ptr = &atlas->TexPixelsAlpha8[r->X + ((r->Y + y) * atlas->TexWidth)];
-            for (unsigned int i = 0; i < pad_left; i++)
-                *(write_ptr + i) = 0x00;
-            
-            for (unsigned int i = 0; i < line_width; i++)
-                *(write_ptr + pad_left + i) = 0xFF;
-
-            for (unsigned int i = 0; i < pad_right; i++)
-                *(write_ptr + pad_left + line_width + i) = 0x00;
-        }
-        else
-        {
-            unsigned int* write_ptr = &atlas->TexPixelsRGBA32[r->X + ((r->Y + y) * atlas->TexWidth)];
-            for (unsigned int i = 0; i < pad_left; i++)
-                *(write_ptr + i) = IM_COL32_BLACK_TRANS;
-            
-            for (unsigned int i = 0; i < line_width; i++)
-                *(write_ptr + pad_left + i) = IM_COL32_WHITE;
-
-            for (unsigned int i = 0; i < pad_right; i++)
-                *(write_ptr + pad_left + line_width + i) = IM_COL32_BLACK_TRANS;
-        }
-
-        ImVec2 uv0 = ImVec2((float)(r->X + pad_left - 1), (float)(r->Y + y)) * atlas->TexUvScale;
-        ImVec2 uv1 = ImVec2((float)(r->X + pad_left + line_width + 1), (float)(r->Y + y + 1)) * atlas->TexUvScale;
-        float half_v = (uv0.y + uv1.y) * 0.5f;               
-        atlas->TexUvLines[n] = ImVec4(uv0.x, half_v, uv1.x, half_v);
-    }
-}
-
-void ImFontAtlasBuildInit(ImFontAtlas* atlas)
-{
-    if (atlas->PackIdMouseCursors < 0)
-    {
-        if (!(atlas->Flags & ImFontAtlasFlags_NoMouseCursors))
-            atlas->PackIdMouseCursors = atlas->AddCustomRectRegular(FONT_ATLAS_DEFAULT_TEX_DATA_W * 2 + 1, FONT_ATLAS_DEFAULT_TEX_DATA_H);
-        else
-            atlas->PackIdMouseCursors = atlas->AddCustomRectRegular(2, 2);
-    }
-
-    if (atlas->PackIdLines < 0)
-    {
-        if (!(atlas->Flags & ImFontAtlasFlags_NoBakedLines))
-            atlas->PackIdLines = atlas->AddCustomRectRegular(IM_DRAWLIST_TEX_LINES_WIDTH_MAX + 2, IM_DRAWLIST_TEX_LINES_WIDTH_MAX + 1);
-    }
-}
-
-void ImFontAtlasBuildFinish(ImFontAtlas* atlas)
-{
-    IM_ASSERT(atlas->TexPixelsAlpha8 != NULL || atlas->TexPixelsRGBA32 != NULL);
-    ImFontAtlasBuildRenderDefaultTexData(atlas);
-    ImFontAtlasBuildRenderLinesTexData(atlas);
-
-    for (int i = 0; i < atlas->CustomRects.Size; i++)
-    {
-        const ImFontAtlasCustomRect* r = &atlas->CustomRects[i];
-        if (r->Font == NULL || r->GlyphID == 0)
-            continue;
-
-        IM_ASSERT(r->Font->ContainerAtlas == atlas);
-        ImVec2 uv0, uv1;
-        atlas->CalcCustomRectUV(r, &uv0, &uv1);
-        r->Font->AddGlyph(NULL, (ImWchar)r->GlyphID, r->GlyphOffset.x, r->GlyphOffset.y, r->GlyphOffset.x + r->Width, r->GlyphOffset.y + r->Height, uv0.x, uv0.y, uv1.x, uv1.y, r->GlyphAdvanceX);
-    }
-
-    for (int i = 0; i < atlas->Fonts.Size; i++)
-        if (atlas->Fonts[i]->DirtyLookupTables)
-            atlas->Fonts[i]->BuildLookupTable();
-
-    for (int i = 0; i < atlas->Fonts.size(); i++)
-    {
-        ImFont* font = atlas->Fonts[i];
-        if (font->EllipsisChar != (ImWchar)-1)
-            continue;
-        const ImWchar ellipsis_variants[] = { (ImWchar)0x2026, (ImWchar)0x0085 };
-        for (int j = 0; j < IM_ARRAYSIZE(ellipsis_variants); j++)
-            if (font->FindGlyphNoFallback(ellipsis_variants[j]) != NULL)    
-            {
-                font->EllipsisChar = ellipsis_variants[j];
-                break;
-            }
-    }
-}
-
-const ImWchar*   ImFontAtlas::GetGlyphRangesDefault()
-{
-    static const ImWchar ranges[] =
-    {
-        0x0020, 0x00FF,      
-        0,
-    };
-    return &ranges[0];
-}
-
-const ImWchar*  ImFontAtlas::GetGlyphRangesKorean()
-{
-    static const ImWchar ranges[] =
-    {
-        0x0020, 0x00FF,      
-        0x3131, 0x3163,   
-        0xAC00, 0xD7A3,   
-        0,
-    };
-    return &ranges[0];
-}
-
-const ImWchar*  ImFontAtlas::GetGlyphRangesChineseFull()
-{
-    static const ImWchar ranges[] =
-    {
-        0x0020, 0x00FF,      
-        0x2000, 0x206F,   
-        0x3000, 0x30FF,       
-        0x31F0, 0x31FF,    
-        0xFF00, 0xFFEF,   
-        0x4e00, 0x9FAF,   
-        0,
-    };
-    return &ranges[0];
-}
-
-static void UnpackAccumulativeOffsetsIntoRanges(int base_codepoint, const short* accumulative_offsets, int accumulative_offsets_count, ImWchar* out_ranges)
-{
-    for (int n = 0; n < accumulative_offsets_count; n++, out_ranges += 2)
-    {
-        out_ranges[0] = out_ranges[1] = (ImWchar)(base_codepoint + accumulative_offsets[n]);
-        base_codepoint += accumulative_offsets[n];
-    }
-    out_ranges[0] = 0;
-}
-
-const ImWchar*  ImFontAtlas::GetGlyphRangesChineseSimplifiedCommon()
-{
-    static const short accumulative_offsets_from_0x4E00[] =
-    {
-        0,1,2,4,1,1,1,1,2,1,3,2,1,2,2,1,1,1,1,1,5,2,1,2,3,3,3,2,2,4,1,1,1,2,1,5,2,3,1,2,1,2,1,1,2,1,1,2,2,1,4,1,1,1,1,5,10,1,2,19,2,1,2,1,2,1,2,1,2,
-        1,5,1,6,3,2,1,2,2,1,1,1,4,8,5,1,1,4,1,1,3,1,2,1,5,1,2,1,1,1,10,1,1,5,2,4,6,1,4,2,2,2,12,2,1,1,6,1,1,1,4,1,1,4,6,5,1,4,2,2,4,10,7,1,1,4,2,4,
-        2,1,4,3,6,10,12,5,7,2,14,2,9,1,1,6,7,10,4,7,13,1,5,4,8,4,1,1,2,28,5,6,1,1,5,2,5,20,2,2,9,8,11,2,9,17,1,8,6,8,27,4,6,9,20,11,27,6,68,2,2,1,1,
-        1,2,1,2,2,7,6,11,3,3,1,1,3,1,2,1,1,1,1,1,3,1,1,8,3,4,1,5,7,2,1,4,4,8,4,2,1,2,1,1,4,5,6,3,6,2,12,3,1,3,9,2,4,3,4,1,5,3,3,1,3,7,1,5,1,1,1,1,2,
-        3,4,5,2,3,2,6,1,1,2,1,7,1,7,3,4,5,15,2,2,1,5,3,22,19,2,1,1,1,1,2,5,1,1,1,6,1,1,12,8,2,9,18,22,4,1,1,5,1,16,1,2,7,10,15,1,1,6,2,4,1,2,4,1,6,
-        1,1,3,2,4,1,6,4,5,1,2,1,1,2,1,10,3,1,3,2,1,9,3,2,5,7,2,19,4,3,6,1,1,1,1,1,4,3,2,1,1,1,2,5,3,1,1,1,2,2,1,1,2,1,1,2,1,3,1,1,1,3,7,1,4,1,1,2,1,
-        1,2,1,2,4,4,3,8,1,1,1,2,1,3,5,1,3,1,3,4,6,2,2,14,4,6,6,11,9,1,15,3,1,28,5,2,5,5,3,1,3,4,5,4,6,14,3,2,3,5,21,2,7,20,10,1,2,19,2,4,28,28,2,3,
-        2,1,14,4,1,26,28,42,12,40,3,52,79,5,14,17,3,2,2,11,3,4,6,3,1,8,2,23,4,5,8,10,4,2,7,3,5,1,1,6,3,1,2,2,2,5,28,1,1,7,7,20,5,3,29,3,17,26,1,8,4,
-        27,3,6,11,23,5,3,4,6,13,24,16,6,5,10,25,35,7,3,2,3,3,14,3,6,2,6,1,4,2,3,8,2,1,1,3,3,3,4,1,1,13,2,2,4,5,2,1,14,14,1,2,2,1,4,5,2,3,1,14,3,12,
-        3,17,2,16,5,1,2,1,8,9,3,19,4,2,2,4,17,25,21,20,28,75,1,10,29,103,4,1,2,1,1,4,2,4,1,2,3,24,2,2,2,1,1,2,1,3,8,1,1,1,2,1,1,3,1,1,1,6,1,5,3,1,1,
-        1,3,4,1,1,5,2,1,5,6,13,9,16,1,1,1,1,3,2,3,2,4,5,2,5,2,2,3,7,13,7,2,2,1,1,1,1,2,3,3,2,1,6,4,9,2,1,14,2,14,2,1,18,3,4,14,4,11,41,15,23,15,23,
-        176,1,3,4,1,1,1,1,5,3,1,2,3,7,3,1,1,2,1,2,4,4,6,2,4,1,9,7,1,10,5,8,16,29,1,1,2,2,3,1,3,5,2,4,5,4,1,1,2,2,3,3,7,1,6,10,1,17,1,44,4,6,2,1,1,6,
-        5,4,2,10,1,6,9,2,8,1,24,1,2,13,7,8,8,2,1,4,1,3,1,3,3,5,2,5,10,9,4,9,12,2,1,6,1,10,1,1,7,7,4,10,8,3,1,13,4,3,1,6,1,3,5,2,1,2,17,16,5,2,16,6,
-        1,4,2,1,3,3,6,8,5,11,11,1,3,3,2,4,6,10,9,5,7,4,7,4,7,1,1,4,2,1,3,6,8,7,1,6,11,5,5,3,24,9,4,2,7,13,5,1,8,82,16,61,1,1,1,4,2,2,16,10,3,8,1,1,
-        6,4,2,1,3,1,1,1,4,3,8,4,2,2,1,1,1,1,1,6,3,5,1,1,4,6,9,2,1,1,1,2,1,7,2,1,6,1,5,4,4,3,1,8,1,3,3,1,3,2,2,2,2,3,1,6,1,2,1,2,1,3,7,1,8,2,1,2,1,5,
-        2,5,3,5,10,1,2,1,1,3,2,5,11,3,9,3,5,1,1,5,9,1,2,1,5,7,9,9,8,1,3,3,3,6,8,2,3,2,1,1,32,6,1,2,15,9,3,7,13,1,3,10,13,2,14,1,13,10,2,1,3,10,4,15,
-        2,15,15,10,1,3,9,6,9,32,25,26,47,7,3,2,3,1,6,3,4,3,2,8,5,4,1,9,4,2,2,19,10,6,2,3,8,1,2,2,4,2,1,9,4,4,4,6,4,8,9,2,3,1,1,1,1,3,5,5,1,3,8,4,6,
-        2,1,4,12,1,5,3,7,13,2,5,8,1,6,1,2,5,14,6,1,5,2,4,8,15,5,1,23,6,62,2,10,1,1,8,1,2,2,10,4,2,2,9,2,1,1,3,2,3,1,5,3,3,2,1,3,8,1,1,1,11,3,1,1,4,
-        3,7,1,14,1,2,3,12,5,2,5,1,6,7,5,7,14,11,1,3,1,8,9,12,2,1,11,8,4,4,2,6,10,9,13,1,1,3,1,5,1,3,2,4,4,1,18,2,3,14,11,4,29,4,2,7,1,3,13,9,2,2,5,
-        3,5,20,7,16,8,5,72,34,6,4,22,12,12,28,45,36,9,7,39,9,191,1,1,1,4,11,8,4,9,2,3,22,1,1,1,1,4,17,1,7,7,1,11,31,10,2,4,8,2,3,2,1,4,2,16,4,32,2,
-        3,19,13,4,9,1,5,2,14,8,1,1,3,6,19,6,5,1,16,6,2,10,8,5,1,2,3,1,5,5,1,11,6,6,1,3,3,2,6,3,8,1,1,4,10,7,5,7,7,5,8,9,2,1,3,4,1,1,3,1,3,3,2,6,16,
-        1,4,6,3,1,10,6,1,3,15,2,9,2,10,25,13,9,16,6,2,2,10,11,4,3,9,1,2,6,6,5,4,30,40,1,10,7,12,14,33,6,3,6,7,3,1,3,1,11,14,4,9,5,12,11,49,18,51,31,
-        140,31,2,2,1,5,1,8,1,10,1,4,4,3,24,1,10,1,3,6,6,16,3,4,5,2,1,4,2,57,10,6,22,2,22,3,7,22,6,10,11,36,18,16,33,36,2,5,5,1,1,1,4,10,1,4,13,2,7,
-        5,2,9,3,4,1,7,43,3,7,3,9,14,7,9,1,11,1,1,3,7,4,18,13,1,14,1,3,6,10,73,2,2,30,6,1,11,18,19,13,22,3,46,42,37,89,7,3,16,34,2,2,3,9,1,7,1,1,1,2,
-        2,4,10,7,3,10,3,9,5,28,9,2,6,13,7,3,1,3,10,2,7,2,11,3,6,21,54,85,2,1,4,2,2,1,39,3,21,2,2,5,1,1,1,4,1,1,3,4,15,1,3,2,4,4,2,3,8,2,20,1,8,7,13,
-        4,1,26,6,2,9,34,4,21,52,10,4,4,1,5,12,2,11,1,7,2,30,12,44,2,30,1,1,3,6,16,9,17,39,82,2,2,24,7,1,7,3,16,9,14,44,2,1,2,1,2,3,5,2,4,1,6,7,5,3,
-        2,6,1,11,5,11,2,1,18,19,8,1,3,24,29,2,1,3,5,2,2,1,13,6,5,1,46,11,3,5,1,1,5,8,2,10,6,12,6,3,7,11,2,4,16,13,2,5,1,1,2,2,5,2,28,5,2,23,10,8,4,
-        4,22,39,95,38,8,14,9,5,1,13,5,4,3,13,12,11,1,9,1,27,37,2,5,4,4,63,211,95,2,2,2,1,3,5,2,1,1,2,2,1,1,1,3,2,4,1,2,1,1,5,2,2,1,1,2,3,1,3,1,1,1,
-        3,1,4,2,1,3,6,1,1,3,7,15,5,3,2,5,3,9,11,4,2,22,1,6,3,8,7,1,4,28,4,16,3,3,25,4,4,27,27,1,4,1,2,2,7,1,3,5,2,28,8,2,14,1,8,6,16,25,3,3,3,14,3,
-        3,1,1,2,1,4,6,3,8,4,1,1,1,2,3,6,10,6,2,3,18,3,2,5,5,4,3,1,5,2,5,4,23,7,6,12,6,4,17,11,9,5,1,1,10,5,12,1,1,11,26,33,7,3,6,1,17,7,1,5,12,1,11,
-        2,4,1,8,14,17,23,1,2,1,7,8,16,11,9,6,5,2,6,4,16,2,8,14,1,11,8,9,1,1,1,9,25,4,11,19,7,2,15,2,12,8,52,7,5,19,2,16,4,36,8,1,16,8,24,26,4,6,2,9,
-        5,4,36,3,28,12,25,15,37,27,17,12,59,38,5,32,127,1,2,9,17,14,4,1,2,1,1,8,11,50,4,14,2,19,16,4,17,5,4,5,26,12,45,2,23,45,104,30,12,8,3,10,2,2,
-        3,3,1,4,20,7,2,9,6,15,2,20,1,3,16,4,11,15,6,134,2,5,59,1,2,2,2,1,9,17,3,26,137,10,211,59,1,2,4,1,4,1,1,1,2,6,2,3,1,1,2,3,2,3,1,3,4,4,2,3,3,
-        1,4,3,1,7,2,2,3,1,2,1,3,3,3,2,2,3,2,1,3,14,6,1,3,2,9,6,15,27,9,34,145,1,1,2,1,1,1,1,2,1,1,1,1,2,2,2,3,1,2,1,1,1,2,3,5,8,3,5,2,4,1,3,2,2,2,12,
-        4,1,1,1,10,4,5,1,20,4,16,1,15,9,5,12,2,9,2,5,4,2,26,19,7,1,26,4,30,12,15,42,1,6,8,172,1,1,4,2,1,1,11,2,2,4,2,1,2,1,10,8,1,2,1,4,5,1,2,5,1,8,
-        4,1,3,4,2,1,6,2,1,3,4,1,2,1,1,1,1,12,5,7,2,4,3,1,1,1,3,3,6,1,2,2,3,3,3,2,1,2,12,14,11,6,6,4,12,2,8,1,7,10,1,35,7,4,13,15,4,3,23,21,28,52,5,
-        26,5,6,1,7,10,2,7,53,3,2,1,1,1,2,163,532,1,10,11,1,3,3,4,8,2,8,6,2,2,23,22,4,2,2,4,2,1,3,1,3,3,5,9,8,2,1,2,8,1,10,2,12,21,20,15,105,2,3,1,1,
-        3,2,3,1,1,2,5,1,4,15,11,19,1,1,1,1,5,4,5,1,1,2,5,3,5,12,1,2,5,1,11,1,1,15,9,1,4,5,3,26,8,2,1,3,1,1,15,19,2,12,1,2,5,2,7,2,19,2,20,6,26,7,5,
-        2,2,7,34,21,13,70,2,128,1,1,2,1,1,2,1,1,3,2,2,2,15,1,4,1,3,4,42,10,6,1,49,85,8,1,2,1,1,4,4,2,3,6,1,5,7,4,3,211,4,1,2,1,2,5,1,2,4,2,2,6,5,6,
-        10,3,4,48,100,6,2,16,296,5,27,387,2,2,3,7,16,8,5,38,15,39,21,9,10,3,7,59,13,27,21,47,5,21,6
-    };
-    static ImWchar base_ranges[] =   
-    {
-        0x0020, 0x00FF,      
-        0x2000, 0x206F,   
-        0x3000, 0x30FF,       
-        0x31F0, 0x31FF,    
-        0xFF00, 0xFFEF    
-    };
-    static ImWchar full_ranges[IM_ARRAYSIZE(base_ranges) + IM_ARRAYSIZE(accumulative_offsets_from_0x4E00) * 2 + 1] = { 0 };
-    if (!full_ranges[0])
-    {
-        memcpy(full_ranges, base_ranges, sizeof(base_ranges));
-        UnpackAccumulativeOffsetsIntoRanges(0x4E00, accumulative_offsets_from_0x4E00, IM_ARRAYSIZE(accumulative_offsets_from_0x4E00), full_ranges + IM_ARRAYSIZE(base_ranges));
-    }
-    return &full_ranges[0];
-}
-
-const ImWchar*  ImFontAtlas::GetGlyphRangesJapanese()
-{
-    static const short accumulative_offsets_from_0x4E00[] =
-    {
-        0,1,2,4,1,1,1,1,2,1,3,3,2,2,1,5,3,5,7,5,6,1,2,1,7,2,6,3,1,8,1,1,4,1,1,18,2,11,2,6,2,1,2,1,5,1,2,1,3,1,2,1,2,3,3,1,1,2,3,1,1,1,12,7,9,1,4,5,1,
-        1,2,1,10,1,1,9,2,2,4,5,6,9,3,1,1,1,1,9,3,18,5,2,2,2,2,1,6,3,7,1,1,1,1,2,2,4,2,1,23,2,10,4,3,5,2,4,10,2,4,13,1,6,1,9,3,1,1,6,6,7,6,3,1,2,11,3,
-        2,2,3,2,15,2,2,5,4,3,6,4,1,2,5,2,12,16,6,13,9,13,2,1,1,7,16,4,7,1,19,1,5,1,2,2,7,7,8,2,6,5,4,9,18,7,4,5,9,13,11,8,15,2,1,1,1,2,1,2,2,1,2,2,8,
-        2,9,3,3,1,1,4,4,1,1,1,4,9,1,4,3,5,5,2,7,5,3,4,8,2,1,13,2,3,3,1,14,1,1,4,5,1,3,6,1,5,2,1,1,3,3,3,3,1,1,2,7,6,6,7,1,4,7,6,1,1,1,1,1,12,3,3,9,5,
-        2,6,1,5,6,1,2,3,18,2,4,14,4,1,3,6,1,1,6,3,5,5,3,2,2,2,2,12,3,1,4,2,3,2,3,11,1,7,4,1,2,1,3,17,1,9,1,24,1,1,4,2,2,4,1,2,7,1,1,1,3,1,2,2,4,15,1,
-        1,2,1,1,2,1,5,2,5,20,2,5,9,1,10,8,7,6,1,1,1,1,1,1,6,2,1,2,8,1,1,1,1,5,1,1,3,1,1,1,1,3,1,1,12,4,1,3,1,1,1,1,1,10,3,1,7,5,13,1,2,3,4,6,1,1,30,
-        2,9,9,1,15,38,11,3,1,8,24,7,1,9,8,10,2,1,9,31,2,13,6,2,9,4,49,5,2,15,2,1,10,2,1,1,1,2,2,6,15,30,35,3,14,18,8,1,16,10,28,12,19,45,38,1,3,2,3,
-        13,2,1,7,3,6,5,3,4,3,1,5,7,8,1,5,3,18,5,3,6,1,21,4,24,9,24,40,3,14,3,21,3,2,1,2,4,2,3,1,15,15,6,5,1,1,3,1,5,6,1,9,7,3,3,2,1,4,3,8,21,5,16,4,
-        5,2,10,11,11,3,6,3,2,9,3,6,13,1,2,1,1,1,1,11,12,6,6,1,4,2,6,5,2,1,1,3,3,6,13,3,1,1,5,1,2,3,3,14,2,1,2,2,2,5,1,9,5,1,1,6,12,3,12,3,4,13,2,14,
-        2,8,1,17,5,1,16,4,2,2,21,8,9,6,23,20,12,25,19,9,38,8,3,21,40,25,33,13,4,3,1,4,1,2,4,1,2,5,26,2,1,1,2,1,3,6,2,1,1,1,1,1,1,2,3,1,1,1,9,2,3,1,1,
-        1,3,6,3,2,1,1,6,6,1,8,2,2,2,1,4,1,2,3,2,7,3,2,4,1,2,1,2,2,1,1,1,1,1,3,1,2,5,4,10,9,4,9,1,1,1,1,1,1,5,3,2,1,6,4,9,6,1,10,2,31,17,8,3,7,5,40,1,
-        7,7,1,6,5,2,10,7,8,4,15,39,25,6,28,47,18,10,7,1,3,1,1,2,1,1,1,3,3,3,1,1,1,3,4,2,1,4,1,3,6,10,7,8,6,2,2,1,3,3,2,5,8,7,9,12,2,15,1,1,4,1,2,1,1,
-        1,3,2,1,3,3,5,6,2,3,2,10,1,4,2,8,1,1,1,11,6,1,21,4,16,3,1,3,1,4,2,3,6,5,1,3,1,1,3,3,4,6,1,1,10,4,2,7,10,4,7,4,2,9,4,3,1,1,1,4,1,8,3,4,1,3,1,
-        6,1,4,2,1,4,7,2,1,8,1,4,5,1,1,2,2,4,6,2,7,1,10,1,1,3,4,11,10,8,21,4,6,1,3,5,2,1,2,28,5,5,2,3,13,1,2,3,1,4,2,1,5,20,3,8,11,1,3,3,3,1,8,10,9,2,
-        10,9,2,3,1,1,2,4,1,8,3,6,1,7,8,6,11,1,4,29,8,4,3,1,2,7,13,1,4,1,6,2,6,12,12,2,20,3,2,3,6,4,8,9,2,7,34,5,1,18,6,1,1,4,4,5,7,9,1,2,2,4,3,4,1,7,
-        2,2,2,6,2,3,25,5,3,6,1,4,6,7,4,2,1,4,2,13,6,4,4,3,1,5,3,4,4,3,2,1,1,4,1,2,1,1,3,1,11,1,6,3,1,7,3,6,2,8,8,6,9,3,4,11,3,2,10,12,2,5,11,1,6,4,5,
-        3,1,8,5,4,6,6,3,5,1,1,3,2,1,2,2,6,17,12,1,10,1,6,12,1,6,6,19,9,6,16,1,13,4,4,15,7,17,6,11,9,15,12,6,7,2,1,2,2,15,9,3,21,4,6,49,18,7,3,2,3,1,
-        6,8,2,2,6,2,9,1,3,6,4,4,1,2,16,2,5,2,1,6,2,3,5,3,1,2,5,1,2,1,9,3,1,8,6,4,8,11,3,1,1,1,1,3,1,13,8,4,1,3,2,2,1,4,1,11,1,5,2,1,5,2,5,8,6,1,1,7,
-        4,3,8,3,2,7,2,1,5,1,5,2,4,7,6,2,8,5,1,11,4,5,3,6,18,1,2,13,3,3,1,21,1,1,4,1,4,1,1,1,8,1,2,2,7,1,2,4,2,2,9,2,1,1,1,4,3,6,3,12,5,1,1,1,5,6,3,2,
-        4,8,2,2,4,2,7,1,8,9,5,2,3,2,1,3,2,13,7,14,6,5,1,1,2,1,4,2,23,2,1,1,6,3,1,4,1,15,3,1,7,3,9,14,1,3,1,4,1,1,5,8,1,3,8,3,8,15,11,4,14,4,4,2,5,5,
-        1,7,1,6,14,7,7,8,5,15,4,8,6,5,6,2,1,13,1,20,15,11,9,2,5,6,2,11,2,6,2,5,1,5,8,4,13,19,25,4,1,1,11,1,34,2,5,9,14,6,2,2,6,1,1,14,1,3,14,13,1,6,
-        12,21,14,14,6,32,17,8,32,9,28,1,2,4,11,8,3,1,14,2,5,15,1,1,1,1,3,6,4,1,3,4,11,3,1,1,11,30,1,5,1,4,1,5,8,1,1,3,2,4,3,17,35,2,6,12,17,3,1,6,2,
-        1,1,12,2,7,3,3,2,1,16,2,8,3,6,5,4,7,3,3,8,1,9,8,5,1,2,1,3,2,8,1,2,9,12,1,1,2,3,8,3,24,12,4,3,7,5,8,3,3,3,3,3,3,1,23,10,3,1,2,2,6,3,1,16,1,16,
-        22,3,10,4,11,6,9,7,7,3,6,2,2,2,4,10,2,1,1,2,8,7,1,6,4,1,3,3,3,5,10,12,12,2,3,12,8,15,1,1,16,6,6,1,5,9,11,4,11,4,2,6,12,1,17,5,13,1,4,9,5,1,11,
-        2,1,8,1,5,7,28,8,3,5,10,2,17,3,38,22,1,2,18,12,10,4,38,18,1,4,44,19,4,1,8,4,1,12,1,4,31,12,1,14,7,75,7,5,10,6,6,13,3,2,11,11,3,2,5,28,15,6,18,
-        18,5,6,4,3,16,1,7,18,7,36,3,5,3,1,7,1,9,1,10,7,2,4,2,6,2,9,7,4,3,32,12,3,7,10,2,23,16,3,1,12,3,31,4,11,1,3,8,9,5,1,30,15,6,12,3,2,2,11,19,9,
-        14,2,6,2,3,19,13,17,5,3,3,25,3,14,1,1,1,36,1,3,2,19,3,13,36,9,13,31,6,4,16,34,2,5,4,2,3,3,5,1,1,1,4,3,1,17,3,2,3,5,3,1,3,2,3,5,6,3,12,11,1,3,
-        1,2,26,7,12,7,2,14,3,3,7,7,11,25,25,28,16,4,36,1,2,1,6,2,1,9,3,27,17,4,3,4,13,4,1,3,2,2,1,10,4,2,4,6,3,8,2,1,18,1,1,24,2,2,4,33,2,3,63,7,1,6,
-        40,7,3,4,4,2,4,15,18,1,16,1,1,11,2,41,14,1,3,18,13,3,2,4,16,2,17,7,15,24,7,18,13,44,2,2,3,6,1,1,7,5,1,7,1,4,3,3,5,10,8,2,3,1,8,1,1,27,4,2,1,
-        12,1,2,1,10,6,1,6,7,5,2,3,7,11,5,11,3,6,6,2,3,15,4,9,1,1,2,1,2,11,2,8,12,8,5,4,2,3,1,5,2,2,1,14,1,12,11,4,1,11,17,17,4,3,2,5,5,7,3,1,5,9,9,8,
-        2,5,6,6,13,13,2,1,2,6,1,2,2,49,4,9,1,2,10,16,7,8,4,3,2,23,4,58,3,29,1,14,19,19,11,11,2,7,5,1,3,4,6,2,18,5,12,12,17,17,3,3,2,4,1,6,2,3,4,3,1,
-        1,1,1,5,1,1,9,1,3,1,3,6,1,8,1,1,2,6,4,14,3,1,4,11,4,1,3,32,1,2,4,13,4,1,2,4,2,1,3,1,11,1,4,2,1,4,4,6,3,5,1,6,5,7,6,3,23,3,5,3,5,3,3,13,3,9,10,
-        1,12,10,2,3,18,13,7,160,52,4,2,2,3,2,14,5,4,12,4,6,4,1,20,4,11,6,2,12,27,1,4,1,2,2,7,4,5,2,28,3,7,25,8,3,19,3,6,10,2,2,1,10,2,5,4,1,3,4,1,5,
-        3,2,6,9,3,6,2,16,3,3,16,4,5,5,3,2,1,2,16,15,8,2,6,21,2,4,1,22,5,8,1,1,21,11,2,1,11,11,19,13,12,4,2,3,2,3,6,1,8,11,1,4,2,9,5,2,1,11,2,9,1,1,2,
-        14,31,9,3,4,21,14,4,8,1,7,2,2,2,5,1,4,20,3,3,4,10,1,11,9,8,2,1,4,5,14,12,14,2,17,9,6,31,4,14,1,20,13,26,5,2,7,3,6,13,2,4,2,19,6,2,2,18,9,3,5,
-        12,12,14,4,6,2,3,6,9,5,22,4,5,25,6,4,8,5,2,6,27,2,35,2,16,3,7,8,8,6,6,5,9,17,2,20,6,19,2,13,3,1,1,1,4,17,12,2,14,7,1,4,18,12,38,33,2,10,1,1,
-        2,13,14,17,11,50,6,33,20,26,74,16,23,45,50,13,38,33,6,6,7,4,4,2,1,3,2,5,8,7,8,9,3,11,21,9,13,1,3,10,6,7,1,2,2,18,5,5,1,9,9,2,68,9,19,13,2,5,
-        1,4,4,7,4,13,3,9,10,21,17,3,26,2,1,5,2,4,5,4,1,7,4,7,3,4,2,1,6,1,1,20,4,1,9,2,2,1,3,3,2,3,2,1,1,1,20,2,3,1,6,2,3,6,2,4,8,1,3,2,10,3,5,3,4,4,
-        3,4,16,1,6,1,10,2,4,2,1,1,2,10,11,2,2,3,1,24,31,4,10,10,2,5,12,16,164,15,4,16,7,9,15,19,17,1,2,1,1,5,1,1,1,1,1,3,1,4,3,1,3,1,3,1,2,1,1,3,3,7,
-        2,8,1,2,2,2,1,3,4,3,7,8,12,92,2,10,3,1,3,14,5,25,16,42,4,7,7,4,2,21,5,27,26,27,21,25,30,31,2,1,5,13,3,22,5,6,6,11,9,12,1,5,9,7,5,5,22,60,3,5,
-        13,1,1,8,1,1,3,3,2,1,9,3,3,18,4,1,2,3,7,6,3,1,2,3,9,1,3,1,3,2,1,3,1,1,1,2,1,11,3,1,6,9,1,3,2,3,1,2,1,5,1,1,4,3,4,1,2,2,4,4,1,7,2,1,2,2,3,5,13,
-        18,3,4,14,9,9,4,16,3,7,5,8,2,6,48,28,3,1,1,4,2,14,8,2,9,2,1,15,2,4,3,2,10,16,12,8,7,1,1,3,1,1,1,2,7,4,1,6,4,38,39,16,23,7,15,15,3,2,12,7,21,
-        37,27,6,5,4,8,2,10,8,8,6,5,1,2,1,3,24,1,16,17,9,23,10,17,6,1,51,55,44,13,294,9,3,6,2,4,2,2,15,1,1,1,13,21,17,68,14,8,9,4,1,4,9,3,11,7,1,1,1,
-        5,6,3,2,1,1,1,2,3,8,1,2,2,4,1,5,5,2,1,4,3,7,13,4,1,4,1,3,1,1,1,5,5,10,1,6,1,5,2,1,5,2,4,1,4,5,7,3,18,2,9,11,32,4,3,3,2,4,7,11,16,9,11,8,13,38,
-        32,8,4,2,1,1,2,1,2,4,4,1,1,1,4,1,21,3,11,1,16,1,1,6,1,3,2,4,9,8,57,7,44,1,3,3,13,3,10,1,1,7,5,2,7,21,47,63,3,15,4,7,1,16,1,1,2,8,2,3,42,15,4,
-        1,29,7,22,10,3,78,16,12,20,18,4,67,11,5,1,3,15,6,21,31,32,27,18,13,71,35,5,142,4,10,1,2,50,19,33,16,35,37,16,19,27,7,1,133,19,1,4,8,7,20,1,4,
-        4,1,10,3,1,6,1,2,51,5,40,15,24,43,22928,11,1,13,154,70,3,1,1,7,4,10,1,2,1,1,2,1,2,1,2,2,1,1,2,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,
-        3,2,1,1,1,1,2,1,1,
-    };
-    static ImWchar base_ranges[] =   
-    {
-        0x0020, 0x00FF,      
-        0x3000, 0x30FF,       
-        0x31F0, 0x31FF,    
-        0xFF00, 0xFFEF    
-    };
-    static ImWchar full_ranges[IM_ARRAYSIZE(base_ranges) + IM_ARRAYSIZE(accumulative_offsets_from_0x4E00)*2 + 1] = { 0 };
-    if (!full_ranges[0])
-    {
-        memcpy(full_ranges, base_ranges, sizeof(base_ranges));
-        UnpackAccumulativeOffsetsIntoRanges(0x4E00, accumulative_offsets_from_0x4E00, IM_ARRAYSIZE(accumulative_offsets_from_0x4E00), full_ranges + IM_ARRAYSIZE(base_ranges));
-    }
-    return &full_ranges[0];
-}
-
-const ImWchar*  ImFontAtlas::GetGlyphRangesCyrillic()
-{
-    static const ImWchar ranges[] =
-    {
-        0x0020, 0x00FF,      
-        0x0400, 0x052F,     
-        0x2DE0, 0x2DFF,   
-        0xA640, 0xA69F,   
-        0,
-    };
-    return &ranges[0];
-}
-
-const ImWchar*  ImFontAtlas::GetGlyphRangesThai()
-{
-    static const ImWchar ranges[] =
-    {
-        0x0020, 0x00FF,   
-        0x2010, 0x205E,  
-        0x0E00, 0x0E7F,  
-        0,
-    };
-    return &ranges[0];
-}
-
-const ImWchar*  ImFontAtlas::GetGlyphRangesVietnamese()
-{
-    static const ImWchar ranges[] =
-    {
-        0x0020, 0x00FF,   
-        0x0102, 0x0103,
-        0x0110, 0x0111,
-        0x0128, 0x0129,
-        0x0168, 0x0169,
-        0x01A0, 0x01A1,
-        0x01AF, 0x01B0,
-        0x1EA0, 0x1EF9,
-        0,
-    };
-    return &ranges[0];
-}
-
-void ImFontGlyphRangesBuilder::AddText(const char* text, const char* text_end)
-{
-    while (text_end ? (text < text_end) : *text)
-    {
-        unsigned int c = 0;
-        int c_len = ImTextCharFromUtf8(&c, text, text_end);
-        text += c_len;
-        if (c_len == 0)
-            break;
-        AddChar((ImWchar)c);
-    }
-}
-
-void ImFontGlyphRangesBuilder::AddRanges(const ImWchar* ranges)
-{
-    for (; ranges[0]; ranges += 2)
-        for (ImWchar c = ranges[0]; c <= ranges[1]; c++)
-            AddChar(c);
-}
-
-void ImFontGlyphRangesBuilder::BuildRanges(ImVector<ImWchar>* out_ranges)
-{
-    const int max_codepoint = IM_UNICODE_CODEPOINT_MAX;
-    for (int n = 0; n <= max_codepoint; n++)
-        if (GetBit(n))
-        {
-            out_ranges->push_back((ImWchar)n);
-            while (n < max_codepoint && GetBit(n + 1))
-                n++;
-            out_ranges->push_back((ImWchar)n);
-        }
-    out_ranges->push_back(0);
-}
-
-ImFont::ImFont()
-{
-    FontSize = 0.0f;
-    FallbackAdvanceX = 0.0f;
-    FallbackChar = (ImWchar)'?';
-    EllipsisChar = (ImWchar)-1;
-    FallbackGlyph = NULL;
-    ContainerAtlas = NULL;
-    ConfigData = NULL;
-    ConfigDataCount = 0;
-    DirtyLookupTables = false;
-    Scale = 1.0f;
-    Ascent = Descent = 0.0f;
-    MetricsTotalSurface = 0;
-    memset(Used4kPagesMap, 0, sizeof(Used4kPagesMap));
-}
-
-ImFont::~ImFont()
-{
-    ClearOutputData();
-}
-
-void    ImFont::ClearOutputData()
-{
-    FontSize = 0.0f;
-    FallbackAdvanceX = 0.0f;
-    Glyphs.clear();
-    IndexAdvanceX.clear();
-    IndexLookup.clear();
-    FallbackGlyph = NULL;
-    ContainerAtlas = NULL;
-    DirtyLookupTables = true;
-    Ascent = Descent = 0.0f;
-    MetricsTotalSurface = 0;
-}
-
-void ImFont::BuildLookupTable()
-{
-    int max_codepoint = 0;
-    for (int i = 0; i != Glyphs.Size; i++)
-        max_codepoint = ImMax(max_codepoint, (int)Glyphs[i].Codepoint);
-
-    IM_ASSERT(Glyphs.Size < 0xFFFF);    
-    IndexAdvanceX.clear();
-    IndexLookup.clear();
-    DirtyLookupTables = false;
-    memset(Used4kPagesMap, 0, sizeof(Used4kPagesMap));
-    GrowIndex(max_codepoint + 1);
-    for (int i = 0; i < Glyphs.Size; i++)
-    {
-        int codepoint = (int)Glyphs[i].Codepoint;
-        IndexAdvanceX[codepoint] = Glyphs[i].AdvanceX;
-        IndexLookup[codepoint] = (ImWchar)i;
-
-        const int page_n = codepoint / 4096;
-        Used4kPagesMap[page_n >> 3] |= 1 << (page_n & 7);
-    }
-
-    if (FindGlyph((ImWchar)' '))
-    {
-        if (Glyphs.back().Codepoint != '\t')             
-            Glyphs.resize(Glyphs.Size + 1);
-        ImFontGlyph& tab_glyph = Glyphs.back();
-        tab_glyph = *FindGlyph((ImWchar)' ');
-        tab_glyph.Codepoint = '\t';
-        tab_glyph.AdvanceX *= IM_TABSIZE;
-        IndexAdvanceX[(int)tab_glyph.Codepoint] = (float)tab_glyph.AdvanceX;
-        IndexLookup[(int)tab_glyph.Codepoint] = (ImWchar)(Glyphs.Size - 1);
-    }
-
-    SetGlyphVisible((ImWchar)' ', false);
-    SetGlyphVisible((ImWchar)'\t', false);
-
-    FallbackGlyph = FindGlyphNoFallback(FallbackChar);
-    FallbackAdvanceX = FallbackGlyph ? FallbackGlyph->AdvanceX : 0.0f;
-    for (int i = 0; i < max_codepoint + 1; i++)
-        if (IndexAdvanceX[i] < 0.0f)
-            IndexAdvanceX[i] = FallbackAdvanceX;
-}
-
-bool ImFont::IsGlyphRangeUnused(unsigned int c_begin, unsigned int c_last)
-{
-    unsigned int page_begin = (c_begin / 4096);
-    unsigned int page_last = (c_last / 4096);
-    for (unsigned int page_n = page_begin; page_n <= page_last; page_n++)
-        if ((page_n >> 3) < sizeof(Used4kPagesMap))
-            if (Used4kPagesMap[page_n >> 3] & (1 << (page_n & 7)))
-                return false;
-    return true;
-}
-
-void ImFont::SetGlyphVisible(ImWchar c, bool visible)
-{
-    if (ImFontGlyph* glyph = (ImFontGlyph*)(void*)FindGlyph((ImWchar)c))
-        glyph->Visible = visible ? 1 : 0;
-}
-
-void ImFont::SetFallbackChar(ImWchar c)
-{
-    FallbackChar = c;
-    BuildLookupTable();
-}
-
-void ImFont::GrowIndex(int new_size)
-{
-    IM_ASSERT(IndexAdvanceX.Size == IndexLookup.Size);
-    if (new_size <= IndexLookup.Size)
-        return;
-    IndexAdvanceX.resize(new_size, -1.0f);
-    IndexLookup.resize(new_size, (ImWchar)-1);
-}
-
-void ImFont::AddGlyph(const ImFontConfig* cfg, ImWchar codepoint, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x)
-{
-    if (cfg != NULL)
-    {
-        const float advance_x_original = advance_x;
-        advance_x = ImClamp(advance_x, cfg->GlyphMinAdvanceX, cfg->GlyphMaxAdvanceX);
-        if (advance_x != advance_x_original)
-        {
-            float char_off_x = cfg->PixelSnapH ? ImFloor((advance_x - advance_x_original) * 0.5f) : (advance_x - advance_x_original) * 0.5f;
-            x0 += char_off_x;
-            x1 += char_off_x;
-        }
-
-        if (cfg->PixelSnapH)
-            advance_x = IM_ROUND(advance_x);
-
-        advance_x += cfg->GlyphExtraSpacing.x;
-    }
-
-    Glyphs.resize(Glyphs.Size + 1);
-    ImFontGlyph& glyph = Glyphs.back();
-    glyph.Codepoint = (unsigned int)codepoint;
-    glyph.Visible = (x0 != x1) && (y0 != y1);
-    glyph.Colored = false;
-    glyph.X0 = x0;
-    glyph.Y0 = y0;
-    glyph.X1 = x1;
-    glyph.Y1 = y1;
-    glyph.U0 = u0;
-    glyph.V0 = v0;
-    glyph.U1 = u1;
-    glyph.V1 = v1;
-    glyph.AdvanceX = advance_x;
-
-    float pad = ContainerAtlas->TexGlyphPadding + 0.99f;
-    DirtyLookupTables = true;
-    MetricsTotalSurface += (int)((glyph.U1 - glyph.U0) * ContainerAtlas->TexWidth + pad) * (int)((glyph.V1 - glyph.V0) * ContainerAtlas->TexHeight + pad);
-}
-
-void ImFont::AddRemapChar(ImWchar dst, ImWchar src, bool overwrite_dst)
-{
-    IM_ASSERT(IndexLookup.Size > 0);                     
-    unsigned int index_size = (unsigned int)IndexLookup.Size;
-
-    if (dst < index_size && IndexLookup.Data[dst] == (ImWchar)-1 && !overwrite_dst)    
-        return;
-    if (src >= index_size && dst >= index_size)         
-        return;
-
-    GrowIndex(dst + 1);
-    IndexLookup[dst] = (src < index_size) ? IndexLookup.Data[src] : (ImWchar)-1;
-    IndexAdvanceX[dst] = (src < index_size) ? IndexAdvanceX.Data[src] : 1.0f;
-}
-
-const ImFontGlyph* ImFont::FindGlyph(ImWchar c) const
-{
-    if (c >= (size_t)IndexLookup.Size)
-        return FallbackGlyph;
-    const ImWchar i = IndexLookup.Data[c];
-    if (i == (ImWchar)-1)
-        return FallbackGlyph;
-    return &Glyphs.Data[i];
-}
-
-const ImFontGlyph* ImFont::FindGlyphNoFallback(ImWchar c) const
-{
-    if (c >= (size_t)IndexLookup.Size)
-        return NULL;
-    const ImWchar i = IndexLookup.Data[c];
-    if (i == (ImWchar)-1)
-        return NULL;
-    return &Glyphs.Data[i];
-}
-
-const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const char* text_end, float wrap_width) const
-{
-    float line_width = 0.0f;
-    float word_width = 0.0f;
-    float blank_width = 0.0f;
-    wrap_width /= scale;           
-
-    const char* word_end = text;
-    const char* prev_word_end = NULL;
-    bool inside_word = true;
-
-    const char* s = text;
-    while (s < text_end)
-    {
-        unsigned int c = (unsigned int)*s;
-        const char* next_s;
-        if (c < 0x80)
-            next_s = s + 1;
-        else
-            next_s = s + ImTextCharFromUtf8(&c, s, text_end);
-        if (c == 0)
-            break;
-
-        if (c < 32)
-        {
-            if (c == '\n')
-            {
-                line_width = word_width = blank_width = 0.0f;
-                inside_word = true;
-                s = next_s;
-                continue;
-            }
-            if (c == '\r')
-            {
-                s = next_s;
-                continue;
-            }
-        }
-
-        const float char_width = ((int)c < IndexAdvanceX.Size ? IndexAdvanceX.Data[c] : FallbackAdvanceX);
-        if (ImCharIsBlankW(c))
-        {
-            if (inside_word)
-            {
-                line_width += blank_width;
-                blank_width = 0.0f;
-                word_end = s;
-            }
-            blank_width += char_width;
-            inside_word = false;
-        }
-        else
-        {
-            word_width += char_width;
-            if (inside_word)
-            {
-                word_end = next_s;
-            }
-            else
-            {
-                prev_word_end = word_end;
-                line_width += word_width + blank_width;
-                word_width = blank_width = 0.0f;
-            }
-
-            inside_word = (c != '.' && c != ',' && c != ';' && c != '!' && c != '?' && c != '\"');
-        }
-
-        if (line_width + word_width > wrap_width)
-        {
-            if (word_width < wrap_width)
-                s = prev_word_end ? prev_word_end : word_end;
-            break;
-        }
-
-        s = next_s;
-    }
-
-    return s;
-}
-
-ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, const char* text_begin, const char* text_end, const char** remaining) const
-{
-    if (!text_end)
-        text_end = text_begin + strlen(text_begin);      
-
-    const float line_height = size;
-    const float scale = size / FontSize;
-
-    ImVec2 text_size = ImVec2(0, 0);
-    float line_width = 0.0f;
-
-    const bool word_wrap_enabled = (wrap_width > 0.0f);
-    const char* word_wrap_eol = NULL;
-
-    const char* s = text_begin;
-    while (s < text_end)
-    {
-        if (word_wrap_enabled)
-        {
-            if (!word_wrap_eol)
-            {
-                word_wrap_eol = CalcWordWrapPositionA(scale, s, text_end, wrap_width - line_width);
-                if (word_wrap_eol == s)                 
-                    word_wrap_eol++;                        
-            }
-
-            if (s >= word_wrap_eol)
-            {
-                if (text_size.x < line_width)
-                    text_size.x = line_width;
-                text_size.y += line_height;
-                line_width = 0.0f;
-                word_wrap_eol = NULL;
-
-                while (s < text_end)
-                {
-                    const char c = *s;
-                    if (ImCharIsBlankA(c)) { s++; } else if (c == '\n') { s++; break; } else { break; }
-                }
-                continue;
-            }
-        }
-
-        const char* prev_s = s;
-        unsigned int c = (unsigned int)*s;
-        if (c < 0x80)
-        {
-            s += 1;
-        }
-        else
-        {
-            s += ImTextCharFromUtf8(&c, s, text_end);
-            if (c == 0)   
-                break;
-        }
-
-        if (c < 32)
-        {
-            if (c == '\n')
-            {
-                text_size.x = ImMax(text_size.x, line_width);
-                text_size.y += line_height;
-                line_width = 0.0f;
-                continue;
-            }
-            if (c == '\r')
-                continue;
-        }
-
-        const float char_width = ((int)c < IndexAdvanceX.Size ? IndexAdvanceX.Data[c] : FallbackAdvanceX) * scale;
-        if (line_width + char_width >= max_width)
-        {
-            s = prev_s;
-            break;
-        }
-
-        line_width += char_width;
-    }
-
-    if (text_size.x < line_width)
-        text_size.x = line_width;
-
-    if (line_width > 0 || text_size.y == 0.0f)
-        text_size.y += line_height;
-
-    if (remaining)
-        *remaining = s;
-
-    return text_size;
-}
-
-void ImFont::RenderChar(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, ImWchar c) const
-{
-    const ImFontGlyph* glyph = FindGlyph(c);
-    if (!glyph || !glyph->Visible)
-        return;
-    if (glyph->Colored)
-        col |= ~IM_COL32_A_MASK;
-    float scale = (size >= 0.0f) ? (size / FontSize) : 1.0f;
-    pos.x = IM_FLOOR(pos.x);
-    pos.y = IM_FLOOR(pos.y);
-    draw_list->PrimReserve(6, 4);
-    draw_list->PrimRectUV(ImVec2(pos.x + glyph->X0 * scale, pos.y + glyph->Y0 * scale), ImVec2(pos.x + glyph->X1 * scale, pos.y + glyph->Y1 * scale), ImVec2(glyph->U0, glyph->V0), ImVec2(glyph->U1, glyph->V1), col);
-}
-
-void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, const ImVec4& clip_rect, const char* text_begin, const char* text_end, float wrap_width, bool cpu_fine_clip) const
-{
-    if (!text_end)
-        text_end = text_begin + strlen(text_begin);                 
-
-    pos.x = IM_FLOOR(pos.x);
-    pos.y = IM_FLOOR(pos.y);
-    float x = pos.x;
-    float y = pos.y;
-    if (y > clip_rect.w)
-        return;
-
-    const float scale = size / FontSize;
-    const float line_height = FontSize * scale;
-    const bool word_wrap_enabled = (wrap_width > 0.0f);
-    const char* word_wrap_eol = NULL;
-
-    const char* s = text_begin;
-    if (y + line_height < clip_rect.y && !word_wrap_enabled)
-        while (y + line_height < clip_rect.y && s < text_end)
-        {
-            s = (const char*)memchr(s, '\n', text_end - s);
-            s = s ? s + 1 : text_end;
-            y += line_height;
-        }
-
-    if (text_end - s > 10000 && !word_wrap_enabled)
-    {
-        const char* s_end = s;
-        float y_end = y;
-        while (y_end < clip_rect.w && s_end < text_end)
-        {
-            s_end = (const char*)memchr(s_end, '\n', text_end - s_end);
-            s_end = s_end ? s_end + 1 : text_end;
-            y_end += line_height;
-        }
-        text_end = s_end;
-    }
-    if (s == text_end)
-        return;
-
-    const int vtx_count_max = (int)(text_end - s) * 4;
-    const int idx_count_max = (int)(text_end - s) * 6;
-    const int idx_expected_size = draw_list->IdxBuffer.Size + idx_count_max;
-    draw_list->PrimReserve(idx_count_max, vtx_count_max);
-
-    ImDrawVert* vtx_write = draw_list->_VtxWritePtr;
-    ImDrawIdx* idx_write = draw_list->_IdxWritePtr;
-    unsigned int vtx_current_idx = draw_list->_VtxCurrentIdx;
-
-    const ImU32 col_untinted = col | ~IM_COL32_A_MASK;
-
-    while (s < text_end)
-    {
-        if (word_wrap_enabled)
-        {
-            if (!word_wrap_eol)
-            {
-                word_wrap_eol = CalcWordWrapPositionA(scale, s, text_end, wrap_width - (x - pos.x));
-                if (word_wrap_eol == s)                 
-                    word_wrap_eol++;                        
-            }
-
-            if (s >= word_wrap_eol)
-            {
-                x = pos.x;
-                y += line_height;
-                word_wrap_eol = NULL;
-
-                while (s < text_end)
-                {
-                    const char c = *s;
-                    if (ImCharIsBlankA(c)) { s++; } else if (c == '\n') { s++; break; } else { break; }
-                }
-                continue;
-            }
-        }
-
-        unsigned int c = (unsigned int)*s;
-        if (c < 0x80)
-        {
-            s += 1;
-        }
-        else
-        {
-            s += ImTextCharFromUtf8(&c, s, text_end);
-            if (c == 0)   
-                break;
-        }
-
-        if (c < 32)
-        {
-            if (c == '\n')
-            {
-                x = pos.x;
-                y += line_height;
-                if (y > clip_rect.w)
-                    break;      
-                continue;
-            }
-            if (c == '\r')
-                continue;
-        }
-
-        const ImFontGlyph* glyph = FindGlyph((ImWchar)c);
-        if (glyph == NULL)
-            continue;
-
-        float char_width = glyph->AdvanceX * scale;
-        if (glyph->Visible)
-        {
-            float x1 = x + glyph->X0 * scale;
-            float x2 = x + glyph->X1 * scale;
-            float y1 = y + glyph->Y0 * scale;
-            float y2 = y + glyph->Y1 * scale;
-            if (x1 <= clip_rect.z && x2 >= clip_rect.x)
-            {
-                float u1 = glyph->U0;
-                float v1 = glyph->V0;
-                float u2 = glyph->U1;
-                float v2 = glyph->V1;
-
-                if (cpu_fine_clip)
-                {
-                    if (x1 < clip_rect.x)
-                    {
-                        u1 = u1 + (1.0f - (x2 - clip_rect.x) / (x2 - x1)) * (u2 - u1);
-                        x1 = clip_rect.x;
-                    }
-                    if (y1 < clip_rect.y)
-                    {
-                        v1 = v1 + (1.0f - (y2 - clip_rect.y) / (y2 - y1)) * (v2 - v1);
-                        y1 = clip_rect.y;
-                    }
-                    if (x2 > clip_rect.z)
-                    {
-                        u2 = u1 + ((clip_rect.z - x1) / (x2 - x1)) * (u2 - u1);
-                        x2 = clip_rect.z;
-                    }
-                    if (y2 > clip_rect.w)
-                    {
-                        v2 = v1 + ((clip_rect.w - y1) / (y2 - y1)) * (v2 - v1);
-                        y2 = clip_rect.w;
-                    }
-                    if (y1 >= y2)
-                    {
-                        x += char_width;
-                        continue;
-                    }
-                }
-
-                ImU32 glyph_col = glyph->Colored ? col_untinted : col;
-
-                {
-                    idx_write[0] = (ImDrawIdx)(vtx_current_idx); idx_write[1] = (ImDrawIdx)(vtx_current_idx+1); idx_write[2] = (ImDrawIdx)(vtx_current_idx+2);
-                    idx_write[3] = (ImDrawIdx)(vtx_current_idx); idx_write[4] = (ImDrawIdx)(vtx_current_idx+2); idx_write[5] = (ImDrawIdx)(vtx_current_idx+3);
-                    vtx_write[0].pos.x = x1; vtx_write[0].pos.y = y1; vtx_write[0].col = glyph_col; vtx_write[0].uv.x = u1; vtx_write[0].uv.y = v1;
-                    vtx_write[1].pos.x = x2; vtx_write[1].pos.y = y1; vtx_write[1].col = glyph_col; vtx_write[1].uv.x = u2; vtx_write[1].uv.y = v1;
-                    vtx_write[2].pos.x = x2; vtx_write[2].pos.y = y2; vtx_write[2].col = glyph_col; vtx_write[2].uv.x = u2; vtx_write[2].uv.y = v2;
-                    vtx_write[3].pos.x = x1; vtx_write[3].pos.y = y2; vtx_write[3].col = glyph_col; vtx_write[3].uv.x = u1; vtx_write[3].uv.y = v2;
-                    vtx_write += 4;
-                    vtx_current_idx += 4;
-                    idx_write += 6;
-                }
-            }
-        }
-        x += char_width;
-    }
-
-    draw_list->VtxBuffer.Size = (int)(vtx_write - draw_list->VtxBuffer.Data);     
-    draw_list->IdxBuffer.Size = (int)(idx_write - draw_list->IdxBuffer.Data);
-    draw_list->CmdBuffer[draw_list->CmdBuffer.Size - 1].ElemCount -= (idx_expected_size - draw_list->IdxBuffer.Size);
-    draw_list->_VtxWritePtr = vtx_write;
-    draw_list->_IdxWritePtr = idx_write;
-    draw_list->_VtxCurrentIdx = vtx_current_idx;
-}
-
-void ImGui::RenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float scale)
-{
-    const float h = draw_list->_Data->FontSize * 1.00f;
-    float r = h * 0.40f * scale;
-    ImVec2 center = pos + ImVec2(h * 0.50f, h * 0.50f * scale);
-
-    ImVec2 a, b, c;
-    switch (dir)
-    {
-    case ImGuiDir_Up:
-    case ImGuiDir_Down:
-        if (dir == ImGuiDir_Up) r = -r;
-        a = ImVec2(+0.000f, +0.750f) * r;
-        b = ImVec2(-0.866f, -0.750f) * r;
-        c = ImVec2(+0.866f, -0.750f) * r;
-        break;
-    case ImGuiDir_Left:
-    case ImGuiDir_Right:
-        if (dir == ImGuiDir_Left) r = -r;
-        a = ImVec2(+0.750f, +0.000f) * r;
-        b = ImVec2(-0.750f, +0.866f) * r;
-        c = ImVec2(-0.750f, -0.866f) * r;
-        break;
-    case ImGuiDir_None:
-    case ImGuiDir_COUNT:
-        IM_ASSERT(0);
-        break;
-    }
-    draw_list->AddTriangleFilled(center + a, center + b, center + c, col);
-}
-
-void ImGui::RenderBullet(ImDrawList* draw_list, ImVec2 pos, ImU32 col)
-{
-    draw_list->AddCircleFilled(pos, draw_list->_Data->FontSize * 0.20f, col, 8);
-}
-
-void ImGui::RenderCheckMark(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz)
-{
-    float thickness = ImMax(sz / 5.0f, 1.0f);
-    sz -= thickness * 0.5f;
-    pos += ImVec2(thickness * 0.25f, thickness * 0.25f);
-
-    float third = sz / 3.0f;
-    float bx = pos.x + third;
-    float by = pos.y + sz - third * 0.5f;
-    draw_list->PathLineTo(ImVec2(bx - third, by - third));
-    draw_list->PathLineTo(ImVec2(bx, by));
-    draw_list->PathLineTo(ImVec2(bx + third * 2.0f, by - third * 2.0f));
-    draw_list->PathStroke(col, false, thickness);
-}
-
-void ImGui::RenderMouseCursor(ImDrawList* draw_list, ImVec2 pos, float scale, ImGuiMouseCursor mouse_cursor, ImU32 col_fill, ImU32 col_border, ImU32 col_shadow)
-{
-    if (mouse_cursor == ImGuiMouseCursor_None)
-        return;
-    IM_ASSERT(mouse_cursor > ImGuiMouseCursor_None && mouse_cursor < ImGuiMouseCursor_COUNT);
-
-    ImFontAtlas* font_atlas = draw_list->_Data->Font->ContainerAtlas;
-    ImVec2 offset, size, uv[4];
-    if (font_atlas->GetMouseCursorTexData(mouse_cursor, &offset, &size, &uv[0], &uv[2]))
-    {
-        pos -= offset;
-        const ImTextureID tex_id = font_atlas->TexID;
-        draw_list->PushTextureID(tex_id);
-        draw_list->AddImage(tex_id, pos + ImVec2(1, 0) * scale, pos + (ImVec2(1, 0) + size) * scale,    uv[2], uv[3], col_shadow);
-        draw_list->AddImage(tex_id, pos + ImVec2(2, 0) * scale, pos + (ImVec2(2, 0) + size) * scale,    uv[2], uv[3], col_shadow);
-        draw_list->AddImage(tex_id, pos,                        pos + size * scale,                     uv[2], uv[3], col_border);
-        draw_list->AddImage(tex_id, pos,                        pos + size * scale,                     uv[0], uv[1], col_fill);
-        draw_list->PopTextureID();
-    }
-}
-
-void ImGui::RenderArrowPointingAt(ImDrawList* draw_list, ImVec2 pos, ImVec2 half_sz, ImGuiDir direction, ImU32 col)
-{
-    switch (direction)
-    {
-    case ImGuiDir_Left:  draw_list->AddTriangleFilled(ImVec2(pos.x + half_sz.x, pos.y - half_sz.y), ImVec2(pos.x + half_sz.x, pos.y + half_sz.y), pos, col); return;
-    case ImGuiDir_Right: draw_list->AddTriangleFilled(ImVec2(pos.x - half_sz.x, pos.y + half_sz.y), ImVec2(pos.x - half_sz.x, pos.y - half_sz.y), pos, col); return;
-    case ImGuiDir_Up:    draw_list->AddTriangleFilled(ImVec2(pos.x + half_sz.x, pos.y + half_sz.y), ImVec2(pos.x - half_sz.x, pos.y + half_sz.y), pos, col); return;
-    case ImGuiDir_Down:  draw_list->AddTriangleFilled(ImVec2(pos.x - half_sz.x, pos.y - half_sz.y), ImVec2(pos.x + half_sz.x, pos.y - half_sz.y), pos, col); return;
-    case ImGuiDir_None: case ImGuiDir_COUNT: break;   
-    }
-}
-
-static inline float ImAcos01(float x)
-{
-    if (x <= 0.0f) return IM_PI * 0.5f;
-    if (x >= 1.0f) return 0.0f;
-    return ImAcos(x);
-}
-
-void ImGui::RenderRectFilledRangeH(ImDrawList* draw_list, const ImRect& rect, ImU32 col, float x_start_norm, float x_end_norm, float rounding)
-{
-    if (x_end_norm == x_start_norm)
-        return;
-    if (x_start_norm > x_end_norm)
-        ImSwap(x_start_norm, x_end_norm);
-
-    ImVec2 p0 = ImVec2(ImLerp(rect.Min.x, rect.Max.x, x_start_norm), rect.Min.y);
-    ImVec2 p1 = ImVec2(ImLerp(rect.Min.x, rect.Max.x, x_end_norm), rect.Max.y);
-    if (rounding == 0.0f)
-    {
-        draw_list->AddRectFilled(p0, p1, col, 0.0f);
-        return;
-    }
-
-    rounding = ImClamp(ImMin((rect.Max.x - rect.Min.x) * 0.5f, (rect.Max.y - rect.Min.y) * 0.5f) - 1.0f, 0.0f, rounding);
-    const float inv_rounding = 1.0f / rounding;
-    const float arc0_b = ImAcos01(1.0f - (p0.x - rect.Min.x) * inv_rounding);
-    const float arc0_e = ImAcos01(1.0f - (p1.x - rect.Min.x) * inv_rounding);
-    const float half_pi = IM_PI * 0.5f;                  
-    const float x0 = ImMax(p0.x, rect.Min.x + rounding);
-    if (arc0_b == arc0_e)
-    {
-        draw_list->PathLineTo(ImVec2(x0, p1.y));
-        draw_list->PathLineTo(ImVec2(x0, p0.y));
-    }
-    else if (arc0_b == 0.0f && arc0_e == half_pi)
-    {
-        draw_list->PathArcToFast(ImVec2(x0, p1.y - rounding), rounding, 3, 6);  
-        draw_list->PathArcToFast(ImVec2(x0, p0.y + rounding), rounding, 6, 9);  
-    }
-    else
-    {
-        draw_list->PathArcTo(ImVec2(x0, p1.y - rounding), rounding, IM_PI - arc0_e, IM_PI - arc0_b, 3);  
-        draw_list->PathArcTo(ImVec2(x0, p0.y + rounding), rounding, IM_PI + arc0_b, IM_PI + arc0_e, 3);  
-    }
-    if (p1.x > rect.Min.x + rounding)
-    {
-        const float arc1_b = ImAcos01(1.0f - (rect.Max.x - p1.x) * inv_rounding);
-        const float arc1_e = ImAcos01(1.0f - (rect.Max.x - p0.x) * inv_rounding);
-        const float x1 = ImMin(p1.x, rect.Max.x - rounding);
-        if (arc1_b == arc1_e)
-        {
-            draw_list->PathLineTo(ImVec2(x1, p0.y));
-            draw_list->PathLineTo(ImVec2(x1, p1.y));
-        }
-        else if (arc1_b == 0.0f && arc1_e == half_pi)
-        {
-            draw_list->PathArcToFast(ImVec2(x1, p0.y + rounding), rounding, 9, 12);  
-            draw_list->PathArcToFast(ImVec2(x1, p1.y - rounding), rounding, 0, 3);   
-        }
-        else
-        {
-            draw_list->PathArcTo(ImVec2(x1, p0.y + rounding), rounding, -arc1_e, -arc1_b, 3);  
-            draw_list->PathArcTo(ImVec2(x1, p1.y - rounding), rounding, +arc1_b, +arc1_e, 3);  
-        }
-    }
-    draw_list->PathFillConvex(col);
-}
-
-void ImGui::RenderRectFilledWithHole(ImDrawList* draw_list, ImRect outer, ImRect inner, ImU32 col, float rounding)
-{
-    const bool fill_L = (inner.Min.x > outer.Min.x);
-    const bool fill_R = (inner.Max.x < outer.Max.x);
-    const bool fill_U = (inner.Min.y > outer.Min.y);
-    const bool fill_D = (inner.Max.y < outer.Max.y);
-    if (fill_L) draw_list->AddRectFilled(ImVec2(outer.Min.x, inner.Min.y), ImVec2(inner.Min.x, inner.Max.y), col, rounding, (fill_U ? 0 : ImDrawCornerFlags_TopLeft) | (fill_D ? 0 : ImDrawCornerFlags_BotLeft));
-    if (fill_R) draw_list->AddRectFilled(ImVec2(inner.Max.x, inner.Min.y), ImVec2(outer.Max.x, inner.Max.y), col, rounding, (fill_U ? 0 : ImDrawCornerFlags_TopRight) | (fill_D ? 0 : ImDrawCornerFlags_BotRight));
-    if (fill_U) draw_list->AddRectFilled(ImVec2(inner.Min.x, outer.Min.y), ImVec2(inner.Max.x, inner.Min.y), col, rounding, (fill_L ? 0 : ImDrawCornerFlags_TopLeft) | (fill_R ? 0 : ImDrawCornerFlags_TopRight));
-    if (fill_D) draw_list->AddRectFilled(ImVec2(inner.Min.x, inner.Max.y), ImVec2(inner.Max.x, outer.Max.y), col, rounding, (fill_L ? 0 : ImDrawCornerFlags_BotLeft) | (fill_R ? 0 : ImDrawCornerFlags_BotRight));
-    if (fill_L && fill_U) draw_list->AddRectFilled(ImVec2(outer.Min.x, outer.Min.y), ImVec2(inner.Min.x, inner.Min.y), col, rounding, ImDrawCornerFlags_TopLeft);
-    if (fill_R && fill_U) draw_list->AddRectFilled(ImVec2(inner.Max.x, outer.Min.y), ImVec2(outer.Max.x, inner.Min.y), col, rounding, ImDrawCornerFlags_TopRight);
-    if (fill_L && fill_D) draw_list->AddRectFilled(ImVec2(outer.Min.x, inner.Max.y), ImVec2(inner.Min.x, outer.Max.y), col, rounding, ImDrawCornerFlags_BotLeft);
-    if (fill_R && fill_D) draw_list->AddRectFilled(ImVec2(inner.Max.x, inner.Max.y), ImVec2(outer.Max.x, outer.Max.y), col, rounding, ImDrawCornerFlags_BotRight);
-}
-
-void ImGui::RenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list, ImVec2 p_min, ImVec2 p_max, ImU32 col, float grid_step, ImVec2 grid_off, float rounding, int rounding_corners_flags)
-{
-    if (((col & IM_COL32_A_MASK) >> IM_COL32_A_SHIFT) < 0xFF)
-    {
-        ImU32 col_bg1 = ImGui::GetColorU32(ImAlphaBlendColors(IM_COL32(204, 204, 204, 255), col));
-        ImU32 col_bg2 = ImGui::GetColorU32(ImAlphaBlendColors(IM_COL32(128, 128, 128, 255), col));
-        draw_list->AddRectFilled(p_min, p_max, col_bg1, rounding, rounding_corners_flags);
-
-        int yi = 0;
-        for (float y = p_min.y + grid_off.y; y < p_max.y; y += grid_step, yi++)
-        {
-            float y1 = ImClamp(y, p_min.y, p_max.y), y2 = ImMin(y + grid_step, p_max.y);
-            if (y2 <= y1)
-                continue;
-            for (float x = p_min.x + grid_off.x + (yi & 1) * grid_step; x < p_max.x; x += grid_step * 2.0f)
-            {
-                float x1 = ImClamp(x, p_min.x, p_max.x), x2 = ImMin(x + grid_step, p_max.x);
-                if (x2 <= x1)
-                    continue;
-                int rounding_corners_flags_cell = 0;
-                if (y1 <= p_min.y) { if (x1 <= p_min.x) rounding_corners_flags_cell |= ImDrawCornerFlags_TopLeft; if (x2 >= p_max.x) rounding_corners_flags_cell |= ImDrawCornerFlags_TopRight; }
-                if (y2 >= p_max.y) { if (x1 <= p_min.x) rounding_corners_flags_cell |= ImDrawCornerFlags_BotLeft; if (x2 >= p_max.x) rounding_corners_flags_cell |= ImDrawCornerFlags_BotRight; }
-                rounding_corners_flags_cell &= rounding_corners_flags;
-                draw_list->AddRectFilled(ImVec2(x1, y1), ImVec2(x2, y2), col_bg2, rounding_corners_flags_cell ? rounding : 0.0f, rounding_corners_flags_cell);
-            }
-        }
-    }
-    else
-    {
-        draw_list->AddRectFilled(p_min, p_max, col, rounding, rounding_corners_flags);
-    }
-}
-
-static unsigned int stb_decompress_length(const unsigned char *input)
-{
-    return (input[8] << 24) + (input[9] << 16) + (input[10] << 8) + input[11];
-}
-
-static unsigned char *stb__barrier_out_e, *stb__barrier_out_b;
-static const unsigned char *stb__barrier_in_b;
-static unsigned char *stb__dout;
-static void stb__match(const unsigned char *data, unsigned int length)
-{
-    IM_ASSERT(stb__dout + length <= stb__barrier_out_e);
-    if (stb__dout + length > stb__barrier_out_e) { stb__dout += length; return; }
-    if (data < stb__barrier_out_b) { stb__dout = stb__barrier_out_e+1; return; }
-    while (length--) *stb__dout++ = *data++;
-}
-
-static void stb__lit(const unsigned char *data, unsigned int length)
-{
-    IM_ASSERT(stb__dout + length <= stb__barrier_out_e);
-    if (stb__dout + length > stb__barrier_out_e) { stb__dout += length; return; }
-    if (data < stb__barrier_in_b) { stb__dout = stb__barrier_out_e+1; return; }
-    memcpy(stb__dout, data, length);
-    stb__dout += length;
-}
-
-#define stb__in2(x)   ((i[x] << 8) + i[(x)+1])
-#define stb__in3(x)   ((i[x] << 16) + stb__in2((x)+1))
-#define stb__in4(x)   ((i[x] << 24) + stb__in3((x)+1))
-
-static const unsigned char *stb_decompress_token(const unsigned char *i)
-{
-    if (*i >= 0x20) {         
-        if (*i >= 0x80)       stb__match(stb__dout-i[1]-1, i[0] - 0x80 + 1), i += 2;
-        else if (*i >= 0x40)  stb__match(stb__dout-(stb__in2(0) - 0x4000 + 1), i[2]+1), i += 3;
-        else      stb__lit(i+1, i[0] - 0x20 + 1), i += 1 + (i[0] - 0x20 + 1);
-    } else {            
-        if (*i >= 0x18)       stb__match(stb__dout-(stb__in3(0) - 0x180000 + 1), i[3]+1), i += 4;
-        else if (*i >= 0x10)  stb__match(stb__dout-(stb__in3(0) - 0x100000 + 1), stb__in2(3)+1), i += 5;
-        else if (*i >= 0x08)  stb__lit(i+2, stb__in2(0) - 0x0800 + 1), i += 2 + (stb__in2(0) - 0x0800 + 1);
-        else if (*i == 0x07)  stb__lit(i+3, stb__in2(1) + 1), i += 3 + (stb__in2(1) + 1);
-        else if (*i == 0x06)  stb__match(stb__dout-(stb__in3(1)+1), i[4]+1), i += 5;
-        else if (*i == 0x04)  stb__match(stb__dout-(stb__in3(1)+1), stb__in2(4)+1), i += 6;
-    }
-    return i;
-}
-
-static unsigned int stb_adler32(unsigned int adler32, unsigned char *buffer, unsigned int buflen)
-{
-    const unsigned long ADLER_MOD = 65521;
-    unsigned long s1 = adler32 & 0xffff, s2 = adler32 >> 16;
-    unsigned long blocklen = buflen % 5552;
-
-    unsigned long i;
-    while (buflen) {
-        for (i=0; i + 7 < blocklen; i += 8) {
-            s1 += buffer[0], s2 += s1;
-            s1 += buffer[1], s2 += s1;
-            s1 += buffer[2], s2 += s1;
-            s1 += buffer[3], s2 += s1;
-            s1 += buffer[4], s2 += s1;
-            s1 += buffer[5], s2 += s1;
-            s1 += buffer[6], s2 += s1;
-            s1 += buffer[7], s2 += s1;
-
-            buffer += 8;
-        }
-
-        for (; i < blocklen; ++i)
-            s1 += *buffer++, s2 += s1;
-
-        s1 %= ADLER_MOD, s2 %= ADLER_MOD;
-        buflen -= blocklen;
-        blocklen = 5552;
-    }
-    return (unsigned int)(s2 << 16) + (unsigned int)s1;
-}
-
-static unsigned int stb_decompress(unsigned char *output, const unsigned char *i, unsigned int )
-{
-    if (stb__in4(0) != 0x57bC0000) return 0;
-    if (stb__in4(4) != 0)          return 0;      
-    const unsigned int olen = stb_decompress_length(i);
-    stb__barrier_in_b = i;
-    stb__barrier_out_e = output + olen;
-    stb__barrier_out_b = output;
-    i += 16;
-
-    stb__dout = output;
-    for (;;) {
-        const unsigned char *old_i = i;
-        i = stb_decompress_token(i);
-        if (i == old_i) {
-            if (*i == 0x05 && i[1] == 0xfa) {
-                IM_ASSERT(stb__dout == output + olen);
-                if (stb__dout != output + olen) return 0;
-                if (stb_adler32(1, output, olen) != (unsigned int) stb__in4(2))
-                    return 0;
-                return olen;
-            } else {
-                IM_ASSERT(0);   
-                return 0;
-            }
-        }
-        IM_ASSERT(stb__dout <= output + olen);
-        if (stb__dout > output + olen)
-            return 0;
-    }
-}
-
-static const char proggy_clean_ttf_compressed_data_base85[11980 + 1] =
-    "7])#######hV0qs'/###[),##/l:$#Q6>##5[n42>c-TH`->>#/e>11NNV=Bv(*:.F?uu#(gRU.o0XGH`$vhLG1hxt9?W`#,5LsCp#-i>.r$<$6pD>Lb';9Crc6tgXmKVeU2cD4Eo3R/"
-    "2*>]b(MC;$jPfY.;h^`IWM9<Lh2TlS+f-s$o6Q<BWH`YiU.xfLq$N;$0iR/GX:U(jcW2p/W*q?-qmnUCI;jHSAiFWM.R*kU@C=GH?a9wp8f$e.-4^Qg1)Q-GL(lf(r/7GrRgwV%MS=C#"
-    "`8ND>Qo#t'X#(v#Y9w0#1D$CIf;W'#pWUPXOuxXuU(H9M(1<q-UE31#^-V'8IRUo7Qf./L>=Ke$$'5F%)]0^#0X@U.a<r:QLtFsLcL6##lOj)#.Y5<-R&KgLwqJfLgN&;Q?gI^#DY2uL"
-    "i@^rMl9t=cWq6##weg>$FBjVQTSDgEKnIS7EM9>ZY9w0#L;>>#Mx&4Mvt//L[MkA#W@lK.N'[0#7RL_&#w+F%HtG9M#XL`N&.,GM4Pg;-<nLENhvx>-VsM.M0rJfLH2eTM`*oJMHRC`N"
-    "kfimM2J,W-jXS:)r0wK#@Fge$U>`w'N7G#$#fB#$E^$#:9:hk+eOe--6x)F7*E%?76%^GMHePW-Z5l'&GiF#$956:rS?dA#fiK:)Yr+`&#0j@'DbG&#^$PG.Ll+DNa<XCMKEV*N)LN/N"
-    "*b=%Q6pia-Xg8I$<MR&,VdJe$<(7G;Ckl'&hF;;$<_=X(b.RS%%)###MPBuuE1V:v&cX&#2m#(&cV]`k9OhLMbn%s$G2,B$BfD3X*sp5#l,$R#]x_X1xKX%b5U*[r5iMfUo9U`N99hG)"
-    "tm+/Us9pG)XPu`<0s-)WTt(gCRxIg(%6sfh=ktMKn3j)<6<b5Sk_/0(^]AaN#(p/L>&VZ>1i%h1S9u5o@YaaW$e+b<TWFn/Z:Oh(Cx2$lNEoN^e)#CFY@@I;BOQ*sRwZtZxRcU7uW6CX"
-    "ow0i(?$Q[cjOd[P4d)]>ROPOpxTO7Stwi1::iB1q)C_=dV26J;2,]7op$]uQr@_V7$q^%lQwtuHY]=DX,n3L#0PHDO4f9>dC@O>HBuKPpP*E,N+b3L#lpR/MrTEH.IAQk.a>D[.e;mc."
-    "x]Ip.PH^'/aqUO/$1WxLoW0[iLA<QT;5HKD+@qQ'NQ(3_PLhE48R.qAPSwQ0/WK?Z,[x?-J;jQTWA0X@KJ(_Y8N-:/M74:/-ZpKrUss?d#dZq]DAbkU*JqkL+nwX@@47`5>w=4h(9.`G"
-    "CRUxHPeR`5Mjol(dUWxZa(>STrPkrJiWx`5U7F#.g*jrohGg`cg:lSTvEY/EV_7H4Q9[Z%cnv;JQYZ5q.l7Zeas:HOIZOB?G<Nald$qs]@]L<J7bR*>gv:[7MI2k).'2($5FNP&EQ(,)"
-    "U]W]+fh18.vsai00);D3@4ku5P?DP8aJt+;qUM]=+b'8@;mViBKx0DE[-auGl8:PJ&Dj+M6OC]O^((##]`0i)drT;-7X`=-H3[igUnPG-NZlo.#k@h#=Ork$m>a>$-?Tm$UV(?#P6YY#"
-    "'/###xe7q.73rI3*pP/$1>s9)W,JrM7SN]'/4C#v$U`0#V.[0>xQsH$fEmPMgY2u7Kh(G%siIfLSoS+MK2eTM$=5,M8p`A.;_R%#u[K#$x4AG8.kK/HSB==-'Ie/QTtG?-.*^N-4B/ZM"
-    "_3YlQC7(p7q)&](`6_c)$/*JL(L-^(]$wIM`dPtOdGA,U3:w2M-0<q-]L_?^)1vw'.,MRsqVr.L;aN&#/EgJ)PBc[-f>+WomX2u7lqM2iEumMTcsF?-aT=Z-97UEnXglEn1K-bnEO`gu"
-    "Ft(c%=;Am_Qs@jLooI&NX;]0#j4#F14;gl8-GQpgwhrq8'=l_f-b49'UOqkLu7-##oDY2L(te+Mch&gLYtJ,MEtJfLh'x'M=$CS-ZZ%P]8bZ>#S?YY#%Q&q'3^Fw&?D)UDNrocM3A76/"
-    "/oL?#h7gl85[qW/NDOk%16ij;+:1a'iNIdb-ou8.P*w,v5#EI$TWS>Pot-R*H'-SEpA:g)f+O$%%`kA#G=8RMmG1&O`>to8bC]T&$,n.LoO>29sp3dt-52U%VM#q7'DHpg+#Z9%H[K<L"
-    "%a2E-grWVM3@2=-k22tL]4$##6We'8UJCKE[d_=%wI;'6X-GsLX4j^SgJ$##R*w,vP3wK#iiW&#*h^D&R?jp7+/u&#(AP##XU8c$fSYW-J95_-Dp[g9wcO&#M-h1OcJlc-*vpw0xUX&#"
-    "OQFKNX@QI'IoPp7nb,QU//MQ&ZDkKP)X<WSVL(68uVl&#c'[0#(s1X&xm$Y%B7*K:eDA323j998GXbA#pwMs-jgD$9QISB-A_(aN4xoFM^@C58D0+Q+q3n0#3U1InDjF682-SjMXJK)("
-    "h$hxua_K]ul92%'BOU&#BRRh-slg8KDlr:%L71Ka:.A;%YULjDPmL<LYs8i#XwJOYaKPKc1h:'9Ke,g)b),78=I39B;xiY$bgGw-&.Zi9InXDuYa%G*f2Bq7mn9^#p1vv%#(Wi-;/Z5h"
-    "o;#2:;%d&#x9v68C5g?ntX0X)pT`;%pB3q7mgGN)3%(P8nTd5L7GeA-GL@+%J3u2:(Yf>et`e;)f#Km8&+DC$I46>#Kr]]u-[=99tts1.qb#q72g1WJO81q+eN'03'eM>&1XxY-caEnO"
-    "j%2n8)),?ILR5^.Ibn<-X-Mq7[a82Lq:F&#ce+S9wsCK*x`569E8ew'He]h:sI[2LM$[guka3ZRd6:t%IG:;$%YiJ:Nq=?eAw;/:nnDq0(CYcMpG)qLN4$##&J<j$UpK<Q4a1]MupW^-"
-    "sj_$%[HK%'F####QRZJ::Y3EGl4'@%FkiAOg#p[##O`gukTfBHagL<LHw%q&OV0##F=6/:chIm0@eCP8X]:kFI%hl8hgO@RcBhS-@Qb$%+m=hPDLg*%K8ln(wcf3/'DW-$.lR?n[nCH-"
-    "eXOONTJlh:.RYF%3'p6sq:UIMA945&^HFS87@$EP2iG<-lCO$%c`uKGD3rC$x0BL8aFn--`ke%#HMP'vh1/R&O_J9'um,.<tx[@%wsJk&bUT2`0uMv7gg#qp/ij.L56'hl;.s5CUrxjO"
-    "M7-##.l+Au'A&O:-T72L]P`&=;ctp'XScX*rU.>-XTt,%OVU4)S1+R-#dg0/Nn?Ku1^0f$B*P:Rowwm-`0PKjYDDM'3]d39VZHEl4,.j']Pk-M.h^&:0FACm$maq-&sgw0t7/6(^xtk%"
-    "LuH88Fj-ekm>GA#_>568x6(OFRl-IZp`&b,_P'$M<Jnq79VsJW/mWS*PUiq76;]/NM_>hLbxfc$mj`,O;&%W2m`Zh:/)Uetw:aJ%]K9h:TcF]u_-Sj9,VK3M.*'&0D[Ca]J9gp8,kAW]"
-    "%(?A%R$f<->Zts'^kn=-^@c4%-pY6qI%J%1IGxfLU9CP8cbPlXv);C=b),<2mOvP8up,UVf3839acAWAW-W?#ao/^#%KYo8fRULNd2.>%m]UK:n%r$'sw]J;5pAoO_#2mO3n,'=H5(et"
-    "Hg*`+RLgv>=4U8guD$I%D:W>-r5V*%j*W:Kvej.Lp$<M-SGZ':+Q_k+uvOSLiEo(<aD/K<CCc`'Lx>'?;++O'>()jLR-^u68PHm8ZFWe+ej8h:9r6L*0//c&iH&R8pRbA#Kjm%upV1g:"
-    "a_#Ur7FuA#(tRh#.Y5K+@?3<-8m0$PEn;J:rh6?I6uG<-`wMU'ircp0LaE_OtlMb&1#6T.#FDKu#1Lw%u%+GM+X'e?YLfjM[VO0MbuFp7;>Q&#WIo)0@F%q7c#4XAXN-U&VB<HFF*qL("
-    "$/V,;(kXZejWO`<[5?\?ewY(*9=%wDc;,u<'9t3W-(H1th3+G]ucQ]kLs7df($/*JL]@*t7Bu_G3_7mp7<iaQjO@.kLg;x3B0lqp7Hf,^Ze7-##@/c58Mo(3;knp0%)A7?-W+eI'o8)b<"
-    "nKnw'Ho8C=Y>pqB>0ie&jhZ[?iLR@@_AvA-iQC(=ksRZRVp7`.=+NpBC%rh&3]R:8XDmE5^V8O(x<<aG/1N$#FX$0V5Y6x'aErI3I$7x%E`v<-BY,)%-?Psf*l?%C3.mM(=/M0:JxG'?"
-    "7WhH%o'a<-80g0NBxoO(GH<dM]n.+%q@jH?f.UsJ2Ggs&4<-e47&Kl+f//9@`b+?.TeN_&B8Ss?v;^Trk;f#YvJkl&w$]>-+k?'(<S:68tq*WoDfZu';mM?8X[ma8W%*`-=;D.(nc7/;"
-    ")g:T1=^J$&BRV(-lTmNB6xqB[@0*o.erM*<SWF]u2=st-*(6v>^](H.aREZSi,#1:[IXaZFOm<-ui#qUq2$##Ri;u75OK#(RtaW-K-F`S+cF]uN`-KMQ%rP/Xri.LRcB##=YL3BgM/3M"
-    "D?@f&1'BW-)Ju<L25gl8uhVm1hL$##*8###'A3/LkKW+(^rWX?5W_8g)a(m&K8P>#bmmWCMkk&#TR`C,5d>g)F;t,4:@_l8G/5h4vUd%&%950:VXD'QdWoY-F$BtUwmfe$YqL'8(PWX("
-    "P?^@Po3$##`MSs?DWBZ/S>+4%>fX,VWv/w'KD`LP5IbH;rTV>n3cEK8U#bX]l-/V+^lj3;vlMb&[5YQ8#pekX9JP3XUC72L,,?+Ni&co7ApnO*5NK,((W-i:$,kp'UDAO(G0Sq7MVjJs"
-    "bIu)'Z,*[>br5fX^:FPAWr-m2KgL<LUN098kTF&#lvo58=/vjDo;.;)Ka*hLR#/k=rKbxuV`>Q_nN6'8uTG&#1T5g)uLv:873UpTLgH+#FgpH'_o1780Ph8KmxQJ8#H72L4@768@Tm&Q"
-    "h4CB/5OvmA&,Q&QbUoi$a_%3M01H)4x7I^&KQVgtFnV+;[Pc>[m4k//,]1?#`VY[Jr*3&&slRfLiVZJ:]?=K3Sw=[$=uRB?3xk48@aeg<Z'<$#4H)6,>e0jT6'N#(q%.O=?2S]u*(m<-"
-    "V8J'(1)G][68hW$5'q[GC&5j`TE?m'esFGNRM)j,ffZ?-qx8;->g4t*:CIP/[Qap7/9'#(1sao7w-.qNUdkJ)tCF&#B^;xGvn2r9FEPFFFcL@.iFNkTve$m%#QvQS8U@)2Z+3K:AKM5i"
-    "sZ88+dKQ)W6>J%CL<KE>`.d*(B`-n8D9oK<Up]c$X$(,)M8Zt7/[rdkqTgl-0cuGMv'?>-XV1q['-5k'cAZ69e;D_?$ZPP&s^+7])$*$#@QYi9,5P&#9r+$%CE=68>K8r0=dSC%%(@p7"
-    ".m7jilQ02'0-VWAg<a/''3u.=4L$Y)6k/K:_[3=&jvL<L0C/2'v:^;-DIBW,B4E68:kZ;%?8(Q8BH=kO65BW?xSG&#@uU,DS*,?.+(o(#1vCS8#CHF>TlGW'b)Tq7VT9q^*^$$.:&N@@"
-    "$&)WHtPm*5_rO0&e%K&#-30j(E4#'Zb.o/(Tpm$>K'f@[PvFl,hfINTNU6u'0pao7%XUp9]5.>%h`8_=VYbxuel.NTSsJfLacFu3B'lQSu/m6-Oqem8T+oE--$0a/k]uj9EwsG>%veR*"
-    "hv^BFpQj:K'#SJ,sB-'#](j.Lg92rTw-*n%@/;39rrJF,l#qV%OrtBeC6/,;qB3ebNW[?,Hqj2L.1NP&GjUR=1D8QaS3Up&@*9wP?+lo7b?@%'k4`p0Z$22%K3+iCZj?XJN4Nm&+YF]u"
-    "@-W$U%VEQ/,,>>#)D<h#`)h0:<Q6909ua+&VU%n2:cG3FJ-%@Bj-DgLr`Hw&HAKjKjseK</xKT*)B,N9X3]krc12t'pgTV(Lv-tL[xg_%=M_q7a^x?7Ubd>#%8cY#YZ?=,`Wdxu/ae&#"
-    "w6)R89tI#6@s'(6Bf7a&?S=^ZI_kS&ai`&=tE72L_D,;^R)7[$s<Eh#c&)q.MXI%#v9ROa5FZO%sF7q7Nwb&#ptUJ:aqJe$Sl68%.D###EC><?-aF&#RNQv>o8lKN%5/$(vdfq7+ebA#"
-    "u1p]ovUKW&Y%q]'>$1@-[xfn$7ZTp7mM,G,Ko7a&Gu%G[RMxJs[0MM%wci.LFDK)(<c`Q8N)jEIF*+?P2a8g%)$q]o2aH8C&<SibC/q,(e:v;-b#6[$NtDZ84Je2KNvB#$P5?tQ3nt(0"
-    "d=j.LQf./Ll33+(;q3L-w=8dX$#WF&uIJ@-bfI>%:_i2B5CsR8&9Z&#=mPEnm0f`<&c)QL5uJ#%u%lJj+D-r;BoF&#4DoS97h5g)E#o:&S4weDF,9^Hoe`h*L+_a*NrLW-1pG_&2UdB8"
-    "6e%B/:=>)N4xeW.*wft-;$'58-ESqr<b?UI(_%@[P46>#U`'6AQ]m&6/`Z>#S?YY#Vc;r7U2&326d=w&H####?TZ`*4?&.MK?LP8Vxg>$[QXc%QJv92.(Db*B)gb*BM9dM*hJMAo*c&#"
-    "b0v=Pjer]$gG&JXDf->'StvU7505l9$AFvgYRI^&<^b68?j#q9QX4SM'RO#&sL1IM.rJfLUAj221]d##DW=m83u5;'bYx,*Sl0hL(W;;$doB&O/TQ:(Z^xBdLjL<Lni;''X.`$#8+1GD"
-    ":k$YUWsbn8ogh6rxZ2Z9]%nd+>V#*8U_72Lh+2Q8Cj0i:6hp&$C/:p(HK>T8Y[gHQ4`4)'$Ab(Nof%V'8hL&#<NEdtg(n'=S1A(Q1/I&4([%dM`,Iu'1:_hL>SfD07&6D<fp8dHM7/g+"
-    "tlPN9J*rKaPct&?'uBCem^jn%9_K)<,C5K3s=5g&GmJb*[SYq7K;TRLGCsM-$$;S%:Y@r7AK0pprpL<Lrh,q7e/%KWK:50I^+m'vi`3?%Zp+<-d+$L-Sv:@.o19n$s0&39;kn;S%BSq*"
-    "$3WoJSCLweV[aZ'MQIjO<7;X-X;&+dMLvu#^UsGEC9WEc[X(wI7#2.(F0jV*eZf<-Qv3J-c+J5AlrB#$p(H68LvEA'q3n0#m,[`*8Ft)FcYgEud]CWfm68,(aLA$@EFTgLXoBq/UPlp7"
-    ":d[/;r_ix=:TF`S5H-b<LI&HY(K=h#)]Lk$K14lVfm:x$H<3^Ql<M`$OhapBnkup'D#L$Pb_`N*g]2e;X/Dtg,bsj&K#2[-:iYr'_wgH)NUIR8a1n#S?Yej'h8^58UbZd+^FKD*T@;6A"
-    "7aQC[K8d-(v6GI$x:T<&'Gp5Uf>@M.*J:;$-rv29'M]8qMv-tLp,'886iaC=Hb*YJoKJ,(j%K=H`K.v9HggqBIiZu'QvBT.#=)0ukruV&.)3=(^1`o*Pj4<-<aN((^7('#Z0wK#5GX@7"
-    "u][`*S^43933A4rl][`*O4CgLEl]v$1Q3AeF37dbXk,.)vj#x'd`;qgbQR%FW,2(?LO=s%Sc68%NP'##Aotl8x=BE#j1UD([3$M(]UI2LX3RpKN@;/#f'f/&_mt&F)XdF<9t4)Qa.*kT"
-    "LwQ'(TTB9.xH'>#MJ+gLq9-##@HuZPN0]u:h7.T..G:;$/Usj(T7`Q8tT72LnYl<-qx8;-HV7Q-&Xdx%1a,hC=0u+HlsV>nuIQL-5<N?)NBS)QN*_I,?&)2'IM%L3I)X((e/dl2&8'<M"
-    ":^#M*Q+[T.Xri.LYS3v%fF`68h;b-X[/En'CR.q7E)p'/kle2HM,u;^%OKC-N+Ll%F9CF<Nf'^#t2L,;27W:0O@6##U6W7:$rJfLWHj$#)woqBefIZ.PK<b*t7ed;p*_m;4ExK#h@&]>"
-    "_>@kXQtMacfD.m-VAb8;IReM3$wf0''hra*so568'Ip&vRs849'MRYSp%:t:h5qSgwpEr$B>Q,;s(C#$)`svQuF$##-D,##,g68@2[T;.XSdN9Qe)rpt._K-#5wF)sP'##p#C0c%-Gb%"
-    "hd+<-j'Ai*x&&HMkT]C'OSl##5RG[JXaHN;d'uA#x._U;.`PU@(Z3dt4r152@:v,'R.Sj'w#0<-;kPI)FfJ&#AYJ&#//)>-k=m=*XnK$>=)72L]0I%>.G690a:$##<,);?;72#?x9+d;"
-    "^V'9;jY@;)br#q^YQpx:X#Te$Z^'=-=bGhLf:D6&bNwZ9-ZD#n^9HhLMr5G;']d&6'wYmTFmL<LD)F^%[tC'8;+9E#C$g%#5Y>q9wI>P(9mI[>kC-ekLC/R&CH+s'B;K-M6$EB%is00:"
-    "+A4[7xks.LrNk0&E)wILYF@2L'0Nb$+pv<(2.768/FrY&h$^3i&@+G%JT'<-,v`3;_)I9M^AE]CN?Cl2AZg+%4iTpT3<n-&%H%b<FDj2M<hH=&Eh<2Len$b*aTX=-8QxN)k11IM1c^j%"
-    "9s<L<NFSo)B?+<-(GxsF,^-Eh@$4dXhN$+#rxK8'je'D7k`e;)2pYwPA'_p9&@^18ml1^[@g4t*[JOa*[=Qp7(qJ_oOL^('7fB&Hq-:sf,sNj8xq^>$U4O]GKx'm9)b@p7YsvK3w^YR-"
-    "CdQ*:Ir<($u&)#(&?L9Rg3H)4fiEp^iI9O8KnTj,]H?D*r7'M;PwZ9K0E^k&-cpI;.p/6_vwoFMV<->#%Xi.LxVnrU(4&8/P+:hLSKj$#U%]49t'I:rgMi'FL@a:0Y-uA[39',(vbma*"
-    "hU%<-SRF`Tt:542R_VV$p@[p8DV[A,?1839FWdF<TddF<9Ah-6&9tWoDlh]&1SpGMq>Ti1O*H&#(AL8[_P%.M>v^-))qOT*F5Cq0`Ye%+$B6i:7@0IX<N+T+0MlMBPQ*Vj>SsD<U4JHY"
-    "8kD2)2fU/M#$e.)T4,_=8hLim[&);?UkK'-x?'(:siIfL<$pFM`i<?%W(mGDHM%>iWP,##P`%/L<eXi:@Z9C.7o=@(pXdAO/NLQ8lPl+HPOQa8wD8=^GlPa8TKI1CjhsCTSLJM'/Wl>-"
-    "S(qw%sf/@%#B6;/U7K]uZbi^Oc^2n<bhPmUkMw>%t<)'mEVE''n`WnJra$^TKvX5B>;_aSEK',(hwa0:i4G?.Bci.(X[?b*($,=-n<.Q%`(X=?+@Am*Js0&=3bh8K]mL<LoNs'6,'85`"
-    "0?t/'_U59@]ddF<#LdF<eWdF<OuN/45rY<-L@&#+fm>69=Lb,OcZV/);TTm8VI;?%OtJ<(b4mq7M6:u?KRdF<gR@2L=FNU-<b[(9c/ML3m;Z[$oF3g)GAWqpARc=<ROu7cL5l;-[A]%/"
-    "+fsd;l#SafT/f*W]0=O'$(Tb<[)*@e775R-:Yob%g*>l*:xP?Yb.5)%w_I?7uk5JC+FS(m#i'k.'a0i)9<7b'fs'59hq$*5Uhv##pi^8+hIEBF`nvo`;'l0.^S1<-wUK2/Coh58KKhLj"
-    "M=SO*rfO`+qC`W-On.=AJ56>>i2@2LH6A:&5q`?9I3@@'04&p2/LVa*T-4<-i3;M9UvZd+N7>b*eIwg:CC)c<>nO&#<IGe;__.thjZl<%w(Wk2xmp4Q@I#I9,DF]u7-P=.-_:YJ]aS@V"
-    "?6*C()dOp7:WL,b&3Rg/.cmM9&r^>$(>.Z-I&J(Q0Hd5Q%7Co-b`-c<N(6r@ip+AurK<m86QIth*#v;-OBqi+L7wDE-Ir8K['m+DDSLwK&/.?-V%U_%3:qKNu$_b*B-kp7NaD'QdWQPK"
-    "Yq[@>P)hI;*_F]u`Rb[.j8_Q/<&>uu+VsH$sM9TA%?)(vmJ80),P7E>)tjD%2L=-t#fK[%`v=Q8<FfNkgg^oIbah*#8/Qt$F&:K*-(N/'+1vMB,u()-a.VUU*#[e%gAAO(S>WlA2);Sa"
-    ">gXm8YB`1d@K#n]76-a$U,mF<fX]idqd)<3,]J7JmW4`6]uks=4-72L(jEk+:bJ0M^q-8Dm_Z?0olP1C9Sa&H[d&c$ooQUj]Exd*3ZM@-WGW2%s',B-_M%>%Ul:#/'xoFM9QX-$.QN'>"
-    "[%$Z$uF6pA6Ki2O5:8w*vP1<-1`[G,)-m#>0`P&#eb#.3i)rtB61(o'$?X3B</R90;eZ]%Ncq;-Tl]#F>2Qft^ae_5tKL9MUe9b*sLEQ95C&`=G?@Mj=wh*'3E>=-<)Gt*Iw)'QG:`@I"
-    "wOf7&]1i'S01B+Ev/Nac#9S;=;YQpg_6U`*kVY39xK,[/6Aj7:'1Bm-_1EYfa1+o&o4hp7KN_Q(OlIo@S%;jVdn0'1<Vc52=u`3^o-n1'g4v58Hj&6_t7$##?M)c<$bgQ_'SY((-xkA#"
-    "Y(,p'H9rIVY-b,'%bCPF7.J<Up^,(dU1VY*5#WkTU>h19w,WQhLI)3S#f$2(eb,jr*b;3Vw]*7NH%$c4Vs,eD9>XW8?N]o+(*pgC%/72LV-u<Hp,3@e^9UB1J+ak9-TN/mhKPg+AJYd$"
-    "MlvAF_jCK*.O-^(63adMT->W%iewS8W6m2rtCpo'RS1R84=@paTKt)>=%&1[)*vp'u+x,VrwN;&]kuO9JDbg=pO$J*.jVe;u'm0dr9l,<*wMK*Oe=g8lV_KEBFkO'oU]^=[-792#ok,)"
-    "i]lR8qQ2oA8wcRCZ^7w/Njh;?.stX?Q1>S1q4Bn$)K1<-rGdO'$Wr.Lc.CG)$/*JL4tNR/,SVO3,aUw'DJN:)Ss;wGn9A32ijw%FL+Z0Fn.U9;reSq)bmI32U==5ALuG&#Vf1398/pVo"
-    "1*c-(aY168o<`JsSbk-,1N;$>0:OUas(3:8Z972LSfF8eb=c-;>SPw7.6hn3m`9^Xkn(r.qS[0;T%&Qc=+STRxX'q1BNk3&*eu2;&8q$&x>Q#Q7^Tf+6<(d%ZVmj2bDi%.3L2n+4W'$P"
-    "iDDG)g,r%+?,$@?uou5tSe2aN_AQU*<h`e-GI7)?OK2A.d7_c)?wQ5AS@DL3r#7fSkgl6-++D:'A,uq7SvlB$pcpH'q3n0#_%dY#xCpr-l<F0NR@-##FEV6NTF6##$l84N1w?AO>'IAO"
-    "URQ##V^Fv-XFbGM7Fl(N<3DhLGF%q.1rC$#:T__&Pi68%0xi_&[qFJ(77j_&JWoF.V735&T,[R*:xFR*K5>>#`bW-?4Ne_&6Ne_&6Ne_&n`kr-#GJcM6X;uM6X;uM(.a..^2TkL%oR(#"
-    ";u.T%fAr%4tJ8&><1=GHZ_+m9/#H1F^R#SC#*N=BA9(D?v[UiFY>>^8p,KKF.W]L29uLkLlu/+4T<XoIB&hx=T1PcDaB&;HH+-AFr?(m9HZV)FKS8JCw;SD=6[^/DZUL`EUDf]GGlG&>"
-    "w$)F./^n3+rlo+DB;5sIYGNk+i1t-69Jg--0pao7Sm#K)pdHW&;LuDNH@H>#/X-TI(;P>#,Gc>#0Su>#4`1?#8lC?#<xU?#@.i?#D:%@#HF7@#LRI@#P_[@#Tkn@#Xw*A#]-=A#a9OA#"
-    "d<F&#*;G##.GY##2Sl##6`($#:l:$#>xL$#B.`$#F:r$#JF.%#NR@%#R_R%#Vke%#Zww%#_-4&#3^Rh%Sflr-k'MS.o?.5/sWel/wpEM0%3'/1)K^f1-d>G21&v(35>V`39V7A4=onx4"
-    "A1OY5EI0;6Ibgr6M$HS7Q<)58C5w,;WoA*#[%T*#`1g*#d=#+#hI5+#lUG+#pbY+#tnl+#x$),#&1;,#*=M,#.I`,#2Ur,#6b.-#;w[H#iQtA#m^0B#qjBB#uvTB##-hB#'9$C#+E6C#"
-    "/QHC#3^ZC#7jmC#;v)D#?,<D#C8ND#GDaD#KPsD#O]/E#g1A5#KA*1#gC17#MGd;#8(02#L-d3#rWM4#Hga1#,<w0#T.j<#O#'2#CYN1#qa^:#_4m3#o@/=#eG8=#t8J5#`+78#4uI-#"
-    "m3B2#SB[8#Q0@8#i[*9#iOn8#1Nm;#^sN9#qh<9#:=x-#P;K2#$%X9#bC+.#Rg;<#mN=.#MTF.#RZO.#2?)4#Y#(/#[)1/#b;L/#dAU/#0Sv;#lY$0#n`-0#sf60#(F24#wrH0#%/e0#"
-    "TmD<#%JSMFove:CTBEXI:<eh2g)B,3h2^G3i;#d3jD>)4kMYD4lVu`4m`:&5niUA5@(A5BA1]PBB:xlBCC=2CDLXMCEUtiCf&0g2'tN?PGT4CPGT4CPGT4CPGT4CPGT4CPGT4CPGT4CP"
-    "GT4CPGT4CPGT4CPGT4CPGT4CPGT4CP-qekC`.9kEg^+F$kwViFJTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5o,^<-28ZI'O?;xp"
-    "O?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xp;7q-#lLYI:xvD=#";
-
-static const char* GetDefaultCompressedFontDataTTFBase85()
-{
-    return proggy_clean_ttf_compressed_data_base85;
-}
-
-#endif   
diff --git a/SpyCustom/imgui/imgui_impl_dx9.cpp b/SpyCustom/imgui/imgui_impl_dx9.cpp
deleted file mode 100644
index 150c958..0000000
--- a/SpyCustom/imgui/imgui_impl_dx9.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-#include "imgui.h"
-#include "imgui_impl_dx9.h"
-
-#include <d3d9.h>
-#define DIRECTINPUT_VERSION 0x0800
-#include <dinput.h>
-
-static LPDIRECT3DDEVICE9        g_pd3dDevice = NULL;
-static LPDIRECT3DVERTEXBUFFER9  g_pVB = NULL;
-static LPDIRECT3DINDEXBUFFER9   g_pIB = NULL;
-static LPDIRECT3DTEXTURE9       g_FontTexture = NULL;
-static int                      g_VertexBufferSize = 5000, g_IndexBufferSize = 10000;
-
-struct CUSTOMVERTEX
-{
-    float    pos[3];
-    D3DCOLOR col;
-    float    uv[2];
-};
-#define D3DFVF_CUSTOMVERTEX (D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1)
-
-static void ImGui_ImplDX9_SetupRenderState(ImDrawData* draw_data)
-{
-    D3DVIEWPORT9 vp;
-    vp.X = vp.Y = 0;
-    vp.Width = (DWORD)draw_data->DisplaySize.x;
-    vp.Height = (DWORD)draw_data->DisplaySize.y;
-    vp.MinZ = 0.0f;
-    vp.MaxZ = 1.0f;
-    g_pd3dDevice->SetViewport(&vp);
-
-    g_pd3dDevice->SetPixelShader(NULL);
-    g_pd3dDevice->SetVertexShader(NULL);
-    g_pd3dDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-    g_pd3dDevice->SetRenderState(D3DRS_LIGHTING, FALSE);
-    g_pd3dDevice->SetRenderState(D3DRS_ZENABLE, FALSE);
-    g_pd3dDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
-    g_pd3dDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
-    g_pd3dDevice->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_ADD);
-    g_pd3dDevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
-    g_pd3dDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
-    g_pd3dDevice->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE);
-    g_pd3dDevice->SetRenderState(D3DRS_SHADEMODE, D3DSHADE_GOURAUD);
-    g_pd3dDevice->SetRenderState(D3DRS_FOGENABLE, FALSE);
-    g_pd3dDevice->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_MODULATE);
-    g_pd3dDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-    g_pd3dDevice->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-    g_pd3dDevice->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
-    g_pd3dDevice->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-    g_pd3dDevice->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-    g_pd3dDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-    g_pd3dDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
-
-    {
-        float L = draw_data->DisplayPos.x + 0.5f;
-        float R = draw_data->DisplayPos.x + draw_data->DisplaySize.x + 0.5f;
-        float T = draw_data->DisplayPos.y + 0.5f;
-        float B = draw_data->DisplayPos.y + draw_data->DisplaySize.y + 0.5f;
-        D3DMATRIX mat_identity = { { { 1.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, 0.0f, 0.0f,  0.0f, 0.0f, 1.0f, 0.0f,  0.0f, 0.0f, 0.0f, 1.0f } } };
-        D3DMATRIX mat_projection =
-        { { {
-            2.0f/(R-L),   0.0f,         0.0f,  0.0f,
-            0.0f,         2.0f/(T-B),   0.0f,  0.0f,
-            0.0f,         0.0f,         0.5f,  0.0f,
-            (L+R)/(L-R),  (T+B)/(B-T),  0.5f,  1.0f
-        } } };
-        g_pd3dDevice->SetTransform(D3DTS_WORLD, &mat_identity);
-        g_pd3dDevice->SetTransform(D3DTS_VIEW, &mat_identity);
-        g_pd3dDevice->SetTransform(D3DTS_PROJECTION, &mat_projection);
-    }
-}
-
-void ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data)
-{
-    if (draw_data->DisplaySize.x <= 0.0f || draw_data->DisplaySize.y <= 0.0f)
-        return;
-
-    if (!g_pVB || g_VertexBufferSize < draw_data->TotalVtxCount)
-    {
-        if (g_pVB) { g_pVB->Release(); g_pVB = NULL; }
-        g_VertexBufferSize = draw_data->TotalVtxCount + 5000;
-        if (g_pd3dDevice->CreateVertexBuffer(g_VertexBufferSize * sizeof(CUSTOMVERTEX), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_DEFAULT, &g_pVB, NULL) < 0)
-            return;
-    }
-    if (!g_pIB || g_IndexBufferSize < draw_data->TotalIdxCount)
-    {
-        if (g_pIB) { g_pIB->Release(); g_pIB = NULL; }
-        g_IndexBufferSize = draw_data->TotalIdxCount + 10000;
-        if (g_pd3dDevice->CreateIndexBuffer(g_IndexBufferSize * sizeof(ImDrawIdx), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, sizeof(ImDrawIdx) == 2 ? D3DFMT_INDEX16 : D3DFMT_INDEX32, D3DPOOL_DEFAULT, &g_pIB, NULL) < 0)
-            return;
-    }
-
-    IDirect3DStateBlock9* d3d9_state_block = NULL;
-    if (g_pd3dDevice->CreateStateBlock(D3DSBT_ALL, &d3d9_state_block) < 0)
-        return;
-
-    D3DMATRIX last_world, last_view, last_projection;
-    g_pd3dDevice->GetTransform(D3DTS_WORLD, &last_world);
-    g_pd3dDevice->GetTransform(D3DTS_VIEW, &last_view);
-    g_pd3dDevice->GetTransform(D3DTS_PROJECTION, &last_projection);
-
-    CUSTOMVERTEX* vtx_dst;
-    ImDrawIdx* idx_dst;
-    if (g_pVB->Lock(0, (UINT)(draw_data->TotalVtxCount * sizeof(CUSTOMVERTEX)), (void**)&vtx_dst, D3DLOCK_DISCARD) < 0)
-        return;
-    if (g_pIB->Lock(0, (UINT)(draw_data->TotalIdxCount * sizeof(ImDrawIdx)), (void**)&idx_dst, D3DLOCK_DISCARD) < 0)
-        return;
-    for (int n = 0; n < draw_data->CmdListsCount; n++)
-    {
-        const ImDrawList* cmd_list = draw_data->CmdLists[n];
-        const ImDrawVert* vtx_src = cmd_list->VtxBuffer.Data;
-        for (int i = 0; i < cmd_list->VtxBuffer.Size; i++)
-        {
-            vtx_dst->pos[0] = vtx_src->pos.x;
-            vtx_dst->pos[1] = vtx_src->pos.y;
-            vtx_dst->pos[2] = 0.0f;
-            vtx_dst->col = (vtx_src->col & 0xFF00FF00) | ((vtx_src->col & 0xFF0000) >> 16) | ((vtx_src->col & 0xFF) << 16);          
-            vtx_dst->uv[0] = vtx_src->uv.x;
-            vtx_dst->uv[1] = vtx_src->uv.y;
-            vtx_dst++;
-            vtx_src++;
-        }
-        memcpy(idx_dst, cmd_list->IdxBuffer.Data, cmd_list->IdxBuffer.Size * sizeof(ImDrawIdx));
-        idx_dst += cmd_list->IdxBuffer.Size;
-    }
-    g_pVB->Unlock();
-    g_pIB->Unlock();
-    g_pd3dDevice->SetStreamSource(0, g_pVB, 0, sizeof(CUSTOMVERTEX));
-    g_pd3dDevice->SetIndices(g_pIB);
-    g_pd3dDevice->SetFVF(D3DFVF_CUSTOMVERTEX);
-
-    ImGui_ImplDX9_SetupRenderState(draw_data);
-
-    int global_vtx_offset = 0;
-    int global_idx_offset = 0;
-    ImVec2 clip_off = draw_data->DisplayPos;
-    for (int n = 0; n < draw_data->CmdListsCount; n++)
-    {
-        const ImDrawList* cmd_list = draw_data->CmdLists[n];
-        for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++)
-        {
-            const ImDrawCmd* pcmd = &cmd_list->CmdBuffer[cmd_i];
-            if (pcmd->UserCallback != NULL)
-            {
-                if (pcmd->UserCallback == ImDrawCallback_ResetRenderState)
-                    ImGui_ImplDX9_SetupRenderState(draw_data);
-                else
-                    pcmd->UserCallback(cmd_list, pcmd);
-            }
-            else
-            {
-                const RECT r = { (LONG)(pcmd->ClipRect.x - clip_off.x), (LONG)(pcmd->ClipRect.y - clip_off.y), (LONG)(pcmd->ClipRect.z - clip_off.x), (LONG)(pcmd->ClipRect.w - clip_off.y) };
-                const LPDIRECT3DTEXTURE9 texture = (LPDIRECT3DTEXTURE9)pcmd->TextureId;
-                g_pd3dDevice->SetTexture(0, texture);
-                g_pd3dDevice->SetScissorRect(&r);
-                g_pd3dDevice->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, pcmd->VtxOffset + global_vtx_offset, 0, (UINT)cmd_list->VtxBuffer.Size, pcmd->IdxOffset + global_idx_offset, pcmd->ElemCount / 3);
-            }
-        }
-        global_idx_offset += cmd_list->IdxBuffer.Size;
-        global_vtx_offset += cmd_list->VtxBuffer.Size;
-    }
-
-    g_pd3dDevice->SetTransform(D3DTS_WORLD, &last_world);
-    g_pd3dDevice->SetTransform(D3DTS_VIEW, &last_view);
-    g_pd3dDevice->SetTransform(D3DTS_PROJECTION, &last_projection);
-
-    d3d9_state_block->Apply();
-    d3d9_state_block->Release();
-}
-
-bool ImGui_ImplDX9_Init(IDirect3DDevice9* device)
-{
-    ImGuiIO& io = ImGui::GetIO();
-    io.BackendRendererName = "imgui_impl_dx9";
-    io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset;            
-
-    g_pd3dDevice = device;
-    g_pd3dDevice->AddRef();
-    return true;
-}
-
-void ImGui_ImplDX9_Shutdown()
-{
-    ImGui_ImplDX9_InvalidateDeviceObjects();
-    if (g_pd3dDevice) { g_pd3dDevice->Release(); g_pd3dDevice = NULL; }
-}
-
-static bool ImGui_ImplDX9_CreateFontsTexture()
-{
-    ImGuiIO& io = ImGui::GetIO();
-    unsigned char* pixels;
-    int width, height, bytes_per_pixel;
-    io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height, &bytes_per_pixel);
-
-    g_FontTexture = NULL;
-    if (g_pd3dDevice->CreateTexture(width, height, 1, D3DUSAGE_DYNAMIC, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &g_FontTexture, NULL) < 0)
-        return false;
-    D3DLOCKED_RECT tex_locked_rect;
-    if (g_FontTexture->LockRect(0, &tex_locked_rect, NULL, 0) != D3D_OK)
-        return false;
-    for (int y = 0; y < height; y++)
-        memcpy((unsigned char*)tex_locked_rect.pBits + tex_locked_rect.Pitch * y, pixels + (width * bytes_per_pixel) * y, (width * bytes_per_pixel));
-    g_FontTexture->UnlockRect(0);
-
-    io.Fonts->SetTexID((ImTextureID)g_FontTexture);
-
-    return true;
-}
-
-bool ImGui_ImplDX9_CreateDeviceObjects()
-{
-    if (!g_pd3dDevice)
-        return false;
-    if (!ImGui_ImplDX9_CreateFontsTexture())
-        return false;
-    return true;
-}
-
-void ImGui_ImplDX9_InvalidateDeviceObjects()
-{
-    if (!g_pd3dDevice)
-        return;
-    if (g_pVB) { g_pVB->Release(); g_pVB = NULL; }
-    if (g_pIB) { g_pIB->Release(); g_pIB = NULL; }
-    if (g_FontTexture) { g_FontTexture->Release(); g_FontTexture = NULL; ImGui::GetIO().Fonts->SetTexID(NULL); }            
-}
-
-void ImGui_ImplDX9_NewFrame()
-{
-    if (!g_FontTexture)
-        ImGui_ImplDX9_CreateDeviceObjects();
-}
diff --git a/SpyCustom/imgui/imgui_impl_dx9.h b/SpyCustom/imgui/imgui_impl_dx9.h
deleted file mode 100644
index 2b7f351..0000000
--- a/SpyCustom/imgui/imgui_impl_dx9.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include "imgui.h"       
-
-struct IDirect3DDevice9;
-
-IMGUI_IMPL_API bool     ImGui_ImplDX9_Init(IDirect3DDevice9* device);
-IMGUI_IMPL_API void     ImGui_ImplDX9_Shutdown();
-IMGUI_IMPL_API void     ImGui_ImplDX9_NewFrame();
-IMGUI_IMPL_API void     ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data);
-
-IMGUI_IMPL_API bool     ImGui_ImplDX9_CreateDeviceObjects();
-IMGUI_IMPL_API void     ImGui_ImplDX9_InvalidateDeviceObjects();
diff --git a/SpyCustom/imgui/imgui_impl_win32.cpp b/SpyCustom/imgui/imgui_impl_win32.cpp
deleted file mode 100644
index ecae700..0000000
--- a/SpyCustom/imgui/imgui_impl_win32.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-#include "imgui.h"
-#include "imgui_impl_win32.h"
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#include <tchar.h>
-
-#ifndef IMGUI_IMPL_WIN32_DISABLE_GAMEPAD
-#include <XInput.h>
-typedef DWORD (WINAPI *PFN_XInputGetCapabilities)(DWORD, DWORD, XINPUT_CAPABILITIES*);
-typedef DWORD (WINAPI *PFN_XInputGetState)(DWORD, XINPUT_STATE*);
-#endif
-
-static HWND                 g_hWnd = NULL;
-static INT64                g_Time = 0;
-static INT64                g_TicksPerSecond = 0;
-static ImGuiMouseCursor     g_LastMouseCursor = ImGuiMouseCursor_COUNT;
-static bool                 g_HasGamepad = false;
-static bool                 g_WantUpdateHasGamepad = true;
-
-#ifndef IMGUI_IMPL_WIN32_DISABLE_GAMEPAD
-static HMODULE                      g_XInputDLL = NULL;
-static PFN_XInputGetCapabilities    g_XInputGetCapabilities = NULL;
-static PFN_XInputGetState           g_XInputGetState = NULL;
-#endif
-
-bool    ImGui_ImplWin32_Init(void* hwnd)
-{
-    if (!::QueryPerformanceFrequency((LARGE_INTEGER*)&g_TicksPerSecond))
-        return false;
-    if (!::QueryPerformanceCounter((LARGE_INTEGER*)&g_Time))
-        return false;
-
-    g_hWnd = (HWND)hwnd;
-    ImGuiIO& io = ImGui::GetIO();
-    io.BackendFlags |= ImGuiBackendFlags_HasMouseCursors;               
-    io.BackendFlags |= ImGuiBackendFlags_HasSetMousePos;                  
-    io.BackendPlatformName = "imgui_impl_win32";
-    io.ImeWindowHandle = hwnd;
-
-    io.KeyMap[ImGuiKey_Tab] = VK_TAB;
-    io.KeyMap[ImGuiKey_LeftArrow] = VK_LEFT;
-    io.KeyMap[ImGuiKey_RightArrow] = VK_RIGHT;
-    io.KeyMap[ImGuiKey_UpArrow] = VK_UP;
-    io.KeyMap[ImGuiKey_DownArrow] = VK_DOWN;
-    io.KeyMap[ImGuiKey_PageUp] = VK_PRIOR;
-    io.KeyMap[ImGuiKey_PageDown] = VK_NEXT;
-    io.KeyMap[ImGuiKey_Home] = VK_HOME;
-    io.KeyMap[ImGuiKey_End] = VK_END;
-    io.KeyMap[ImGuiKey_Insert] = VK_INSERT;
-    io.KeyMap[ImGuiKey_Delete] = VK_DELETE;
-    io.KeyMap[ImGuiKey_Backspace] = VK_BACK;
-    io.KeyMap[ImGuiKey_Space] = VK_SPACE;
-    io.KeyMap[ImGuiKey_Enter] = VK_RETURN;
-    io.KeyMap[ImGuiKey_Escape] = VK_ESCAPE;
-    io.KeyMap[ImGuiKey_KeyPadEnter] = VK_RETURN;
-    io.KeyMap[ImGuiKey_A] = 'A';
-    io.KeyMap[ImGuiKey_C] = 'C';
-    io.KeyMap[ImGuiKey_V] = 'V';
-    io.KeyMap[ImGuiKey_X] = 'X';
-    io.KeyMap[ImGuiKey_Y] = 'Y';
-    io.KeyMap[ImGuiKey_Z] = 'Z';
-
-#ifndef IMGUI_IMPL_WIN32_DISABLE_GAMEPAD
-    const char* xinput_dll_names[] =
-    {
-        "xinput1_4.dll",     
-        "xinput1_3.dll",     
-        "xinput9_1_0.dll",     
-        "xinput1_2.dll",     
-        "xinput1_1.dll"      
-    };
-    for (int n = 0; n < IM_ARRAYSIZE(xinput_dll_names); n++)
-        if (HMODULE dll = ::LoadLibraryA(xinput_dll_names[n]))
-        {
-            g_XInputDLL = dll;
-            g_XInputGetCapabilities = (PFN_XInputGetCapabilities)::GetProcAddress(dll, "XInputGetCapabilities");
-            g_XInputGetState = (PFN_XInputGetState)::GetProcAddress(dll, "XInputGetState");
-            break;
-        }
-#endif  
-    
-    return true;
-}
-
-void    ImGui_ImplWin32_Shutdown()
-{
-#ifndef IMGUI_IMPL_WIN32_DISABLE_GAMEPAD
-    if (g_XInputDLL)
-        ::FreeLibrary(g_XInputDLL);
-    g_XInputDLL = NULL;
-    g_XInputGetCapabilities = NULL;
-    g_XInputGetState = NULL;
-#endif  
-    
-    g_hWnd = NULL;
-    g_Time = 0;
-    g_TicksPerSecond = 0;
-    g_LastMouseCursor = ImGuiMouseCursor_COUNT;
-    g_HasGamepad = false;
-    g_WantUpdateHasGamepad = true;
-}
-
-static bool ImGui_ImplWin32_UpdateMouseCursor()
-{
-    ImGuiIO& io = ImGui::GetIO();
-    if (io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange)
-        return false;
-
-    ImGuiMouseCursor imgui_cursor = ImGui::GetMouseCursor();
-    if (imgui_cursor == ImGuiMouseCursor_None || io.MouseDrawCursor)
-    {
-        ::SetCursor(NULL);
-    }
-    else
-    {
-        LPTSTR win32_cursor = IDC_ARROW;
-        switch (imgui_cursor)
-        {
-        case ImGuiMouseCursor_Arrow:        win32_cursor = IDC_ARROW; break;
-        case ImGuiMouseCursor_TextInput:    win32_cursor = IDC_IBEAM; break;
-        case ImGuiMouseCursor_ResizeAll:    win32_cursor = IDC_SIZEALL; break;
-        case ImGuiMouseCursor_ResizeEW:     win32_cursor = IDC_SIZEWE; break;
-        case ImGuiMouseCursor_ResizeNS:     win32_cursor = IDC_SIZENS; break;
-        case ImGuiMouseCursor_ResizeNESW:   win32_cursor = IDC_SIZENESW; break;
-        case ImGuiMouseCursor_ResizeNWSE:   win32_cursor = IDC_SIZENWSE; break;
-        case ImGuiMouseCursor_Hand:         win32_cursor = IDC_HAND; break;
-        case ImGuiMouseCursor_NotAllowed:   win32_cursor = IDC_NO; break;
-        }
-        ::SetCursor(::LoadCursor(NULL, win32_cursor));
-    }
-    return true;
-}
-
-static void ImGui_ImplWin32_UpdateMousePos()
-{
-    ImGuiIO& io = ImGui::GetIO();
-
-    if (io.WantSetMousePos)
-    {
-        POINT pos = { (int)io.MousePos.x, (int)io.MousePos.y };
-        if (::ClientToScreen(g_hWnd, &pos))
-            ::SetCursorPos(pos.x, pos.y);
-    }
-
-    io.MousePos = ImVec2(-FLT_MAX, -FLT_MAX);
-    POINT pos;
-    if (HWND active_window = ::GetForegroundWindow())
-        if (active_window == g_hWnd || ::IsChild(active_window, g_hWnd))
-            if (::GetCursorPos(&pos) && ::ScreenToClient(g_hWnd, &pos))
-                io.MousePos = ImVec2((float)pos.x, (float)pos.y);
-}
-
-static void ImGui_ImplWin32_UpdateGamepads()
-{
-#ifndef IMGUI_IMPL_WIN32_DISABLE_GAMEPAD
-    ImGuiIO& io = ImGui::GetIO();
-    memset(io.NavInputs, 0, sizeof(io.NavInputs));
-    if ((io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) == 0)
-        return;
-
-    if (g_WantUpdateHasGamepad)
-    {
-        XINPUT_CAPABILITIES caps;
-        g_HasGamepad = g_XInputGetCapabilities ? (g_XInputGetCapabilities(0, XINPUT_FLAG_GAMEPAD, &caps) == ERROR_SUCCESS) : false;
-        g_WantUpdateHasGamepad = false;
-    }
-
-    io.BackendFlags &= ~ImGuiBackendFlags_HasGamepad;
-    XINPUT_STATE xinput_state;
-    if (g_HasGamepad && g_XInputGetState && g_XInputGetState(0, &xinput_state) == ERROR_SUCCESS)
-    {
-        const XINPUT_GAMEPAD& gamepad = xinput_state.Gamepad;
-        io.BackendFlags |= ImGuiBackendFlags_HasGamepad;
-
-        #define MAP_BUTTON(NAV_NO, BUTTON_ENUM)     { io.NavInputs[NAV_NO] = (gamepad.wButtons & BUTTON_ENUM) ? 1.0f : 0.0f; }
-        #define MAP_ANALOG(NAV_NO, VALUE, V0, V1)   { float vn = (float)(VALUE - V0) / (float)(V1 - V0); if (vn > 1.0f) vn = 1.0f; if (vn > 0.0f && io.NavInputs[NAV_NO] < vn) io.NavInputs[NAV_NO] = vn; }
-        MAP_BUTTON(ImGuiNavInput_Activate,      XINPUT_GAMEPAD_A);                 
-        MAP_BUTTON(ImGuiNavInput_Cancel,        XINPUT_GAMEPAD_B);                 
-        MAP_BUTTON(ImGuiNavInput_Menu,          XINPUT_GAMEPAD_X);                 
-        MAP_BUTTON(ImGuiNavInput_Input,         XINPUT_GAMEPAD_Y);                 
-        MAP_BUTTON(ImGuiNavInput_DpadLeft,      XINPUT_GAMEPAD_DPAD_LEFT);        
-        MAP_BUTTON(ImGuiNavInput_DpadRight,     XINPUT_GAMEPAD_DPAD_RIGHT);       
-        MAP_BUTTON(ImGuiNavInput_DpadUp,        XINPUT_GAMEPAD_DPAD_UP);          
-        MAP_BUTTON(ImGuiNavInput_DpadDown,      XINPUT_GAMEPAD_DPAD_DOWN);        
-        MAP_BUTTON(ImGuiNavInput_FocusPrev,     XINPUT_GAMEPAD_LEFT_SHOULDER);     
-        MAP_BUTTON(ImGuiNavInput_FocusNext,     XINPUT_GAMEPAD_RIGHT_SHOULDER);    
-        MAP_BUTTON(ImGuiNavInput_TweakSlow,     XINPUT_GAMEPAD_LEFT_SHOULDER);     
-        MAP_BUTTON(ImGuiNavInput_TweakFast,     XINPUT_GAMEPAD_RIGHT_SHOULDER);    
-        MAP_ANALOG(ImGuiNavInput_LStickLeft,    gamepad.sThumbLX,  -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE, -32768);
-        MAP_ANALOG(ImGuiNavInput_LStickRight,   gamepad.sThumbLX,  +XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE, +32767);
-        MAP_ANALOG(ImGuiNavInput_LStickUp,      gamepad.sThumbLY,  +XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE, +32767);
-        MAP_ANALOG(ImGuiNavInput_LStickDown,    gamepad.sThumbLY,  -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE, -32767);
-        #undef MAP_BUTTON
-        #undef MAP_ANALOG
-    }
-#endif   
-}
-
-void    ImGui_ImplWin32_NewFrame()
-{
-    ImGuiIO& io = ImGui::GetIO();
-    IM_ASSERT(io.Fonts->IsBuilt() && "Font atlas not built! It is generally built by the renderer backend. Missing call to renderer _NewFrame() function? e.g. ImGui_ImplOpenGL3_NewFrame().");
-
-    RECT rect = { 0, 0, 0, 0 };
-    ::GetClientRect(g_hWnd, &rect);
-    io.DisplaySize = ImVec2((float)(rect.right - rect.left), (float)(rect.bottom - rect.top));
-
-    INT64 current_time = 0;
-    ::QueryPerformanceCounter((LARGE_INTEGER*)&current_time);
-    io.DeltaTime = (float)(current_time - g_Time) / g_TicksPerSecond;
-    g_Time = current_time;
-
-    io.KeyCtrl = (::GetKeyState(VK_CONTROL) & 0x8000) != 0;
-    io.KeyShift = (::GetKeyState(VK_SHIFT) & 0x8000) != 0;
-    io.KeyAlt = (::GetKeyState(VK_MENU) & 0x8000) != 0;
-    io.KeySuper = false;
-    ImGui_ImplWin32_UpdateMousePos();
-
-    ImGuiMouseCursor mouse_cursor = io.MouseDrawCursor ? ImGuiMouseCursor_None : ImGui::GetMouseCursor();
-    if (g_LastMouseCursor != mouse_cursor)
-    {
-        g_LastMouseCursor = mouse_cursor;
-        ImGui_ImplWin32_UpdateMouseCursor();
-    }
-
-    ImGui_ImplWin32_UpdateGamepads();
-}
-
-#ifndef WM_MOUSEHWHEEL
-#define WM_MOUSEHWHEEL 0x020E
-#endif
-#ifndef DBT_DEVNODES_CHANGED
-#define DBT_DEVNODES_CHANGED 0x0007
-#endif
-
-#if 0
-extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-#endif
-IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-    if (ImGui::GetCurrentContext() == NULL)
-        return 0;
-
-    ImGuiIO& io = ImGui::GetIO();
-    switch (msg)
-    {
-    case WM_LBUTTONDOWN: case WM_LBUTTONDBLCLK:
-    case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK:
-    case WM_MBUTTONDOWN: case WM_MBUTTONDBLCLK:
-    case WM_XBUTTONDOWN: case WM_XBUTTONDBLCLK:
-    {
-        int button = 0;
-        if (msg == WM_LBUTTONDOWN || msg == WM_LBUTTONDBLCLK) { button = 0; }
-        if (msg == WM_RBUTTONDOWN || msg == WM_RBUTTONDBLCLK) { button = 1; }
-        if (msg == WM_MBUTTONDOWN || msg == WM_MBUTTONDBLCLK) { button = 2; }
-        if (msg == WM_XBUTTONDOWN || msg == WM_XBUTTONDBLCLK) { button = (GET_XBUTTON_WPARAM(wParam) == XBUTTON1) ? 3 : 4; }
-        if (!ImGui::IsAnyMouseDown() && ::GetCapture() == NULL)
-            ::SetCapture(hwnd);
-        io.MouseDown[button] = true;
-        return 0;
-    }
-    case WM_LBUTTONUP:
-    case WM_RBUTTONUP:
-    case WM_MBUTTONUP:
-    case WM_XBUTTONUP:
-    {
-        int button = 0;
-        if (msg == WM_LBUTTONUP) { button = 0; }
-        if (msg == WM_RBUTTONUP) { button = 1; }
-        if (msg == WM_MBUTTONUP) { button = 2; }
-        if (msg == WM_XBUTTONUP) { button = (GET_XBUTTON_WPARAM(wParam) == XBUTTON1) ? 3 : 4; }
-        io.MouseDown[button] = false;
-        if (!ImGui::IsAnyMouseDown() && ::GetCapture() == hwnd)
-            ::ReleaseCapture();
-        return 0;
-    }
-    case WM_MOUSEWHEEL:
-        io.MouseWheel += (float)GET_WHEEL_DELTA_WPARAM(wParam) / (float)WHEEL_DELTA;
-        return 0;
-    case WM_MOUSEHWHEEL:
-        io.MouseWheelH += (float)GET_WHEEL_DELTA_WPARAM(wParam) / (float)WHEEL_DELTA;
-        return 0;
-    case WM_KEYDOWN:
-    case WM_SYSKEYDOWN:
-        if (wParam < 256)
-            io.KeysDown[wParam] = 1;
-        return 0;
-    case WM_KEYUP:
-    case WM_SYSKEYUP:
-        if (wParam < 256)
-            io.KeysDown[wParam] = 0;
-        return 0;
-    case WM_CHAR:
-        if (wParam > 0 && wParam < 0x10000)
-            io.AddInputCharacterUTF16((unsigned short)wParam);
-        return 0;
-    case WM_SETCURSOR:
-        if (LOWORD(lParam) == HTCLIENT && ImGui_ImplWin32_UpdateMouseCursor())
-            return 1;
-        return 0;
-    case WM_DEVICECHANGE:
-        if ((UINT)wParam == DBT_DEVNODES_CHANGED)
-            g_WantUpdateHasGamepad = true;
-        return 0;
-    }
-    return 0;
-}
-
-
-#if !defined(_versionhelpers_H_INCLUDED_) && !defined(_INC_VERSIONHELPERS)
-static BOOL IsWindowsVersionOrGreater(WORD major, WORD minor, WORD sp)
-{
-    OSVERSIONINFOEXW osvi = { sizeof(osvi), major, minor, 0, 0, { 0 }, sp, 0, 0, 0, 0 };
-    DWORD mask = VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR;
-    ULONGLONG cond = ::VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL);
-    cond = ::VerSetConditionMask(cond, VER_MINORVERSION, VER_GREATER_EQUAL);
-    cond = ::VerSetConditionMask(cond, VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
-    return ::VerifyVersionInfoW(&osvi, mask, cond);
-}
-#define IsWindows8Point1OrGreater()  IsWindowsVersionOrGreater(HIBYTE(0x0602), LOBYTE(0x0602), 0)  
-#endif
-
-#ifndef DPI_ENUMS_DECLARED
-typedef enum { PROCESS_DPI_UNAWARE = 0, PROCESS_SYSTEM_DPI_AWARE = 1, PROCESS_PER_MONITOR_DPI_AWARE = 2 } PROCESS_DPI_AWARENESS;
-typedef enum { MDT_EFFECTIVE_DPI = 0, MDT_ANGULAR_DPI = 1, MDT_RAW_DPI = 2, MDT_DEFAULT = MDT_EFFECTIVE_DPI } MONITOR_DPI_TYPE;
-#endif
-#ifndef _DPI_AWARENESS_CONTEXTS_
-DECLARE_HANDLE(DPI_AWARENESS_CONTEXT);
-#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE    (DPI_AWARENESS_CONTEXT)-3
-#endif
-#ifndef DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2
-#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 (DPI_AWARENESS_CONTEXT)-4
-#endif
-typedef HRESULT(WINAPI* PFN_SetProcessDpiAwareness)(PROCESS_DPI_AWARENESS);                          
-typedef HRESULT(WINAPI* PFN_GetDpiForMonitor)(HMONITOR, MONITOR_DPI_TYPE, UINT*, UINT*);             
-typedef DPI_AWARENESS_CONTEXT(WINAPI* PFN_SetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);         
-
-void ImGui_ImplWin32_EnableDpiAwareness()
-{
-    {
-        static HINSTANCE user32_dll = ::LoadLibraryA("user32.dll");    
-        if (PFN_SetThreadDpiAwarenessContext SetThreadDpiAwarenessContextFn = (PFN_SetThreadDpiAwarenessContext)::GetProcAddress(user32_dll, "SetThreadDpiAwarenessContext"))
-        {
-            SetThreadDpiAwarenessContextFn(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
-            return;
-        }
-    }
-    if (IsWindows8Point1OrGreater())
-    {
-        static HINSTANCE shcore_dll = ::LoadLibraryA("shcore.dll");    
-        if (PFN_SetProcessDpiAwareness SetProcessDpiAwarenessFn = (PFN_SetProcessDpiAwareness)::GetProcAddress(shcore_dll, "SetProcessDpiAwareness"))
-        {
-            SetProcessDpiAwarenessFn(PROCESS_PER_MONITOR_DPI_AWARE);
-            return;
-        }
-    }
-#if _WIN32_WINNT >= 0x0600
-    ::SetProcessDPIAware();
-#endif
-}
-
-#if defined(_MSC_VER) && !defined(NOGDI)
-#pragma comment(lib, "gdi32")        
-#endif
-
-float ImGui_ImplWin32_GetDpiScaleForMonitor(void* monitor)
-{
-    UINT xdpi = 96, ydpi = 96;
-    static BOOL bIsWindows8Point1OrGreater = IsWindows8Point1OrGreater();
-    if (bIsWindows8Point1OrGreater)
-    {
-        static HINSTANCE shcore_dll = ::LoadLibraryA("shcore.dll");    
-        if (PFN_GetDpiForMonitor GetDpiForMonitorFn = (PFN_GetDpiForMonitor)::GetProcAddress(shcore_dll, "GetDpiForMonitor"))
-            GetDpiForMonitorFn((HMONITOR)monitor, MDT_EFFECTIVE_DPI, &xdpi, &ydpi);
-    }
-#ifndef NOGDI
-    else
-    {
-        const HDC dc = ::GetDC(NULL);
-        xdpi = ::GetDeviceCaps(dc, LOGPIXELSX);
-        ydpi = ::GetDeviceCaps(dc, LOGPIXELSY);
-        ::ReleaseDC(NULL, dc);
-    }
-#endif
-    IM_ASSERT(xdpi == ydpi);         
-    return xdpi / 96.0f;
-}
-
-float ImGui_ImplWin32_GetDpiScaleForHwnd(void* hwnd)
-{
-    HMONITOR monitor = ::MonitorFromWindow((HWND)hwnd, MONITOR_DEFAULTTONEAREST);
-    return ImGui_ImplWin32_GetDpiScaleForMonitor(monitor);
-}
-
diff --git a/SpyCustom/imgui/imgui_impl_win32.h b/SpyCustom/imgui/imgui_impl_win32.h
deleted file mode 100644
index 10d1575..0000000
--- a/SpyCustom/imgui/imgui_impl_win32.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include "imgui.h"       
-
-IMGUI_IMPL_API bool     ImGui_ImplWin32_Init(void* hwnd);
-IMGUI_IMPL_API void     ImGui_ImplWin32_Shutdown();
-IMGUI_IMPL_API void     ImGui_ImplWin32_NewFrame();
-
-#if 0
-extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-#endif
-
-IMGUI_IMPL_API void     ImGui_ImplWin32_EnableDpiAwareness();
-IMGUI_IMPL_API float    ImGui_ImplWin32_GetDpiScaleForHwnd(void* hwnd);         
-IMGUI_IMPL_API float    ImGui_ImplWin32_GetDpiScaleForMonitor(void* monitor);   
diff --git a/SpyCustom/imgui/imgui_internal.h b/SpyCustom/imgui/imgui_internal.h
deleted file mode 100644
index 9fb7000..0000000
--- a/SpyCustom/imgui/imgui_internal.h
+++ /dev/null
@@ -1,2224 +0,0 @@
-#pragma once
-#ifndef IMGUI_DISABLE
-
-#ifndef IMGUI_VERSION
-#error Must include imgui.h before imgui_internal.h
-#endif
-
-#include <stdio.h>        
-#include <stdlib.h>           
-#include <math.h>               
-#include <limits.h>       
-
-#ifdef _MSC_VER
-#pragma warning (push)
-#pragma warning (disable: 4251)                     
-#endif
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#if __has_warning("-Wunknown-warning-option")
-#pragma clang diagnostic ignored "-Wunknown-warning-option"              
-#endif
-#pragma clang diagnostic ignored "-Wunknown-pragmas"                     
-#pragma clang diagnostic ignored "-Wunused-function"                  
-#pragma clang diagnostic ignored "-Wmissing-prototypes"               
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#pragma clang diagnostic ignored "-Wdouble-promotion"
-#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion"            
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"                      
-#pragma GCC diagnostic ignored "-Wclass-memaccess"                          
-#endif
-
-#ifdef IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS               
-#error Use IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS
-#endif
-#ifdef IMGUI_DISABLE_MATH_FUNCTIONS                        
-#error Use IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS
-#endif
-
-
-
-#ifndef IMGUI_ENABLE_FREETYPE
-#define IMGUI_ENABLE_STB_TRUETYPE
-#endif
-
-struct ImBitVector;                     
-struct ImRect;                           
-struct ImDrawDataBuilder;                 
-struct ImDrawListSharedData;              
-struct ImGuiColorMod;                           
-struct ImGuiContext;                    
-struct ImGuiContextHook;                 
-struct ImGuiDataTypeInfo;                  
-struct ImGuiGroupData;                   
-struct ImGuiInputTextState;                  
-struct ImGuiLastItemDataBackup;           
-struct ImGuiMenuColumns;                    
-struct ImGuiNavMoveResult;                   
-struct ImGuiMetricsConfig;                
-struct ImGuiNextWindowData;             
-struct ImGuiNextItemData;               
-struct ImGuiOldColumnData;                    
-struct ImGuiOldColumns;                       
-struct ImGuiPopupData;                   
-struct ImGuiSettingsHandler;                 
-struct ImGuiStackSizes;                   
-struct ImGuiStyleMod;                           
-struct ImGuiTabBar;                      
-struct ImGuiTabItem;                         
-struct ImGuiTable;                      
-struct ImGuiTableColumn;                   
-struct ImGuiTableSettings;                
-struct ImGuiTableColumnsSettings;         
-struct ImGuiWindow;                     
-struct ImGuiWindowTempData;                             
-struct ImGuiWindowSettings;                              
-
-typedef int ImGuiLayoutType;                            
-typedef int ImGuiItemFlags;                             
-typedef int ImGuiItemStatusFlags;                 
-typedef int ImGuiOldColumnFlags;                   
-typedef int ImGuiNavHighlightFlags;             
-typedef int ImGuiNavDirSourceFlags;             
-typedef int ImGuiNavMoveFlags;                        
-typedef int ImGuiNextItemDataFlags;              
-typedef int ImGuiNextWindowDataFlags;          
-typedef int ImGuiSeparatorFlags;                   
-typedef int ImGuiTextFlags;                             
-typedef int ImGuiTooltipFlags;                       
-
-typedef void (*ImGuiErrorLogCallback)(void* user_data, const char* fmt, ...);
-
-#ifndef GImGui
-extern IMGUI_API ImGuiContext* GImGui;      
-#endif
-
-namespace ImStb
-{
-
-#undef STB_TEXTEDIT_STRING
-#undef STB_TEXTEDIT_CHARTYPE
-#define STB_TEXTEDIT_STRING             ImGuiInputTextState
-#define STB_TEXTEDIT_CHARTYPE           ImWchar
-#define STB_TEXTEDIT_GETWIDTH_NEWLINE   (-1.0f)
-#define STB_TEXTEDIT_UNDOSTATECOUNT     99
-#define STB_TEXTEDIT_UNDOCHARCOUNT      999
-#include "imstb_textedit.h"
-
-}   
-
-#ifndef IMGUI_DEBUG_LOG
-#define IMGUI_DEBUG_LOG(_FMT,...)       printf("[%05d] " _FMT, GImGui->FrameCount, __VA_ARGS__)
-#endif
-
-#define IMGUI_DEBUG_LOG_POPUP(...)      ((void)0)         
-#define IMGUI_DEBUG_LOG_NAV(...)        ((void)0)         
-
-#if (__cplusplus >= 201100) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201100)
-#define IM_STATIC_ASSERT(_COND)         static_assert(_COND, "")
-#else
-#define IM_STATIC_ASSERT(_COND)         typedef char static_assertion_##__line__[(_COND)?1:-1]
-#endif
-
-#ifdef IMGUI_DEBUG_PARANOID
-#define IM_ASSERT_PARANOID(_EXPR)       IM_ASSERT(_EXPR)
-#else
-#define IM_ASSERT_PARANOID(_EXPR)
-#endif
-
-#ifndef IM_ASSERT_USER_ERROR
-#define IM_ASSERT_USER_ERROR(_EXP,_MSG) IM_ASSERT((_EXP) && _MSG)      
-#endif
-
-#define IM_PI                           3.14159265358979323846f
-#ifdef _WIN32
-#define IM_NEWLINE                      "\r\n"                    
-#else
-#define IM_NEWLINE                      "\n"
-#endif
-#define IM_TABSIZE                      (4)
-#define IM_F32_TO_INT8_UNBOUND(_VAL)    ((int)((_VAL) * 255.0f + ((_VAL)>=0 ? 0.5f : -0.5f)))       
-#define IM_F32_TO_INT8_SAT(_VAL)        ((int)(ImSaturate(_VAL) * 255.0f + 0.5f))                   
-#define IM_FLOOR(_VAL)                  ((float)(int)(_VAL))                                            
-#define IM_ROUND(_VAL)                  ((float)(int)((_VAL) + 0.5f))                           
-
-#ifdef _MSC_VER
-#define IMGUI_CDECL __cdecl
-#else
-#define IMGUI_CDECL
-#endif
-
-#ifndef IM_DEBUG_BREAK
-#if defined(__clang__)
-#define IM_DEBUG_BREAK()    __builtin_debugtrap()
-#elif defined (_MSC_VER)
-#define IM_DEBUG_BREAK()    __debugbreak()
-#else
-#define IM_DEBUG_BREAK()    IM_ASSERT(0)                    
-#endif
-#endif   
-
-IMGUI_API ImGuiID       ImHashData(const void* data, size_t data_size, ImU32 seed = 0);
-IMGUI_API ImGuiID       ImHashStr(const char* data, size_t data_size = 0, ImU32 seed = 0);
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-static inline ImGuiID   ImHash(const void* data, int size, ImU32 seed = 0) { return size ? ImHashData(data, (size_t)size, seed) : ImHashStr((const char*)data, 0, seed); }      
-#endif
-
-#define ImQsort         qsort
-
-IMGUI_API ImU32         ImAlphaBlendColors(ImU32 col_a, ImU32 col_b);
-
-static inline bool      ImIsPowerOfTwo(int v)           { return v != 0 && (v & (v - 1)) == 0; }
-static inline bool      ImIsPowerOfTwo(ImU64 v)         { return v != 0 && (v & (v - 1)) == 0; }
-static inline int       ImUpperPowerOfTwo(int v)        { v--; v |= v >> 1; v |= v >> 2; v |= v >> 4; v |= v >> 8; v |= v >> 16; v++; return v; }
-
-IMGUI_API int           ImStricmp(const char* str1, const char* str2);
-IMGUI_API int           ImStrnicmp(const char* str1, const char* str2, size_t count);
-IMGUI_API void          ImStrncpy(char* dst, const char* src, size_t count);
-IMGUI_API char*         ImStrdup(const char* str);
-IMGUI_API char*         ImStrdupcpy(char* dst, size_t* p_dst_size, const char* str);
-IMGUI_API const char*   ImStrchrRange(const char* str_begin, const char* str_end, char c);
-IMGUI_API int           ImStrlenW(const ImWchar* str);
-IMGUI_API const char*   ImStreolRange(const char* str, const char* str_end);                  
-IMGUI_API const ImWchar*ImStrbolW(const ImWchar* buf_mid_line, const ImWchar* buf_begin);     
-IMGUI_API const char*   ImStristr(const char* haystack, const char* haystack_end, const char* needle, const char* needle_end);
-IMGUI_API void          ImStrTrimBlanks(char* str);
-IMGUI_API const char*   ImStrSkipBlank(const char* str);
-IMGUI_API int           ImFormatString(char* buf, size_t buf_size, const char* fmt, ...) IM_FMTARGS(3);
-IMGUI_API int           ImFormatStringV(char* buf, size_t buf_size, const char* fmt, va_list args) IM_FMTLIST(3);
-IMGUI_API const char*   ImParseFormatFindStart(const char* format);
-IMGUI_API const char*   ImParseFormatFindEnd(const char* format);
-IMGUI_API const char*   ImParseFormatTrimDecorations(const char* format, char* buf, size_t buf_size);
-IMGUI_API int           ImParseFormatPrecision(const char* format, int default_value);
-static inline bool      ImCharIsBlankA(char c)          { return c == ' ' || c == '\t'; }
-static inline bool      ImCharIsBlankW(unsigned int c)  { return c == ' ' || c == '\t' || c == 0x3000; }
-
-IMGUI_API int           ImTextStrToUtf8(char* buf, int buf_size, const ImWchar* in_text, const ImWchar* in_text_end);           
-IMGUI_API int           ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end);                  
-IMGUI_API int           ImTextStrFromUtf8(ImWchar* buf, int buf_size, const char* in_text, const char* in_text_end, const char** in_remaining = NULL);        
-IMGUI_API int           ImTextCountCharsFromUtf8(const char* in_text, const char* in_text_end);                                    
-IMGUI_API int           ImTextCountUtf8BytesFromChar(const char* in_text, const char* in_text_end);                                  
-IMGUI_API int           ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const ImWchar* in_text_end);                            
-
-#ifdef IMGUI_DEFINE_MATH_OPERATORS
-static inline ImVec2 operator*(const ImVec2& lhs, const float rhs)              { return ImVec2(lhs.x * rhs, lhs.y * rhs); }
-static inline ImVec2 operator/(const ImVec2& lhs, const float rhs)              { return ImVec2(lhs.x / rhs, lhs.y / rhs); }
-static inline ImVec2 operator+(const ImVec2& lhs, const ImVec2& rhs)            { return ImVec2(lhs.x + rhs.x, lhs.y + rhs.y); }
-static inline ImVec2 operator-(const ImVec2& lhs, const ImVec2& rhs)            { return ImVec2(lhs.x - rhs.x, lhs.y - rhs.y); }
-static inline ImVec2 operator*(const ImVec2& lhs, const ImVec2& rhs)            { return ImVec2(lhs.x * rhs.x, lhs.y * rhs.y); }
-static inline ImVec2 operator/(const ImVec2& lhs, const ImVec2& rhs)            { return ImVec2(lhs.x / rhs.x, lhs.y / rhs.y); }
-static inline ImVec2& operator*=(ImVec2& lhs, const float rhs)                  { lhs.x *= rhs; lhs.y *= rhs; return lhs; }
-static inline ImVec2& operator/=(ImVec2& lhs, const float rhs)                  { lhs.x /= rhs; lhs.y /= rhs; return lhs; }
-static inline ImVec2& operator+=(ImVec2& lhs, const ImVec2& rhs)                { lhs.x += rhs.x; lhs.y += rhs.y; return lhs; }
-static inline ImVec2& operator-=(ImVec2& lhs, const ImVec2& rhs)                { lhs.x -= rhs.x; lhs.y -= rhs.y; return lhs; }
-static inline ImVec2& operator*=(ImVec2& lhs, const ImVec2& rhs)                { lhs.x *= rhs.x; lhs.y *= rhs.y; return lhs; }
-static inline ImVec2& operator/=(ImVec2& lhs, const ImVec2& rhs)                { lhs.x /= rhs.x; lhs.y /= rhs.y; return lhs; }
-static inline ImVec4 operator+(const ImVec4& lhs, const ImVec4& rhs)            { return ImVec4(lhs.x + rhs.x, lhs.y + rhs.y, lhs.z + rhs.z, lhs.w + rhs.w); }
-static inline ImVec4 operator-(const ImVec4& lhs, const ImVec4& rhs)            { return ImVec4(lhs.x - rhs.x, lhs.y - rhs.y, lhs.z - rhs.z, lhs.w - rhs.w); }
-static inline ImVec4 operator*(const ImVec4& lhs, const ImVec4& rhs)            { return ImVec4(lhs.x * rhs.x, lhs.y * rhs.y, lhs.z * rhs.z, lhs.w * rhs.w); }
-#endif
-
-#ifdef IMGUI_DISABLE_FILE_FUNCTIONS
-#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS
-typedef void* ImFileHandle;
-static inline ImFileHandle  ImFileOpen(const char*, const char*)                    { return NULL; }
-static inline bool          ImFileClose(ImFileHandle)                               { return false; }
-static inline ImU64         ImFileGetSize(ImFileHandle)                             { return (ImU64)-1; }
-static inline ImU64         ImFileRead(void*, ImU64, ImU64, ImFileHandle)           { return 0; }
-static inline ImU64         ImFileWrite(const void*, ImU64, ImU64, ImFileHandle)    { return 0; }
-#endif
-#ifndef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS
-typedef FILE* ImFileHandle;
-IMGUI_API ImFileHandle      ImFileOpen(const char* filename, const char* mode);
-IMGUI_API bool              ImFileClose(ImFileHandle file);
-IMGUI_API ImU64             ImFileGetSize(ImFileHandle file);
-IMGUI_API ImU64             ImFileRead(void* data, ImU64 size, ImU64 count, ImFileHandle file);
-IMGUI_API ImU64             ImFileWrite(const void* data, ImU64 size, ImU64 count, ImFileHandle file);
-#else
-#define IMGUI_DISABLE_TTY_FUNCTIONS             
-#endif
-IMGUI_API void*             ImFileLoadToMemory(const char* filename, const char* mode, size_t* out_file_size = NULL, int padding_bytes = 0);
-
-#ifndef IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS
-#define ImFabs(X)           fabsf(X)
-#define ImSqrt(X)           sqrtf(X)
-#define ImFmod(X, Y)        fmodf((X), (Y))
-#define ImCos(X)            cosf(X)
-#define ImSin(X)            sinf(X)
-#define ImAcos(X)           acosf(X)
-#define ImAtan2(Y, X)       atan2f((Y), (X))
-#define ImAtof(STR)         atof(STR)
-#define ImFloorStd(X)       floorf(X)                                   
-#define ImCeil(X)           ceilf(X)
-static inline float  ImPow(float x, float y)    { return powf(x, y); }                    
-static inline double ImPow(double x, double y)  { return pow(x, y); }
-static inline float  ImLog(float x)             { return logf(x); }                       
-static inline double ImLog(double x)            { return log(x); }
-static inline float  ImAbs(float x)             { return fabsf(x); }
-static inline double ImAbs(double x)            { return fabs(x); }
-static inline float  ImSign(float x)            { return (x < 0.0f) ? -1.0f : ((x > 0.0f) ? 1.0f : 0.0f); }              
-static inline double ImSign(double x)           { return (x < 0.0) ? -1.0 : ((x > 0.0) ? 1.0 : 0.0); }
-#endif
-template<typename T> static inline T ImMin(T lhs, T rhs)                        { return lhs < rhs ? lhs : rhs; }
-template<typename T> static inline T ImMax(T lhs, T rhs)                        { return lhs >= rhs ? lhs : rhs; }
-template<typename T> static inline T ImClamp(T v, T mn, T mx)                   { return (v < mn) ? mn : (v > mx) ? mx : v; }
-template<typename T> static inline T ImLerp(T a, T b, float t)                  { return (T)(a + (b - a) * t); }
-template<typename T> static inline void ImSwap(T& a, T& b)                      { T tmp = a; a = b; b = tmp; }
-template<typename T> static inline T ImAddClampOverflow(T a, T b, T mn, T mx)   { if (b < 0 && (a < mn - b)) return mn; if (b > 0 && (a > mx - b)) return mx; return a + b; }
-template<typename T> static inline T ImSubClampOverflow(T a, T b, T mn, T mx)   { if (b > 0 && (a < mn + b)) return mn; if (b < 0 && (a > mx + b)) return mx; return a - b; }
-static inline ImVec2 ImMin(const ImVec2& lhs, const ImVec2& rhs)                { return ImVec2(lhs.x < rhs.x ? lhs.x : rhs.x, lhs.y < rhs.y ? lhs.y : rhs.y); }
-static inline ImVec2 ImMax(const ImVec2& lhs, const ImVec2& rhs)                { return ImVec2(lhs.x >= rhs.x ? lhs.x : rhs.x, lhs.y >= rhs.y ? lhs.y : rhs.y); }
-static inline ImVec2 ImClamp(const ImVec2& v, const ImVec2& mn, ImVec2 mx)      { return ImVec2((v.x < mn.x) ? mn.x : (v.x > mx.x) ? mx.x : v.x, (v.y < mn.y) ? mn.y : (v.y > mx.y) ? mx.y : v.y); }
-static inline ImVec2 ImLerp(const ImVec2& a, const ImVec2& b, float t)          { return ImVec2(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t); }
-static inline ImVec2 ImLerp(const ImVec2& a, const ImVec2& b, const ImVec2& t)  { return ImVec2(a.x + (b.x - a.x) * t.x, a.y + (b.y - a.y) * t.y); }
-static inline ImVec4 ImLerp(const ImVec4& a, const ImVec4& b, float t)          { return ImVec4(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t, a.z + (b.z - a.z) * t, a.w + (b.w - a.w) * t); }
-static inline float  ImSaturate(float f)                                        { return (f < 0.0f) ? 0.0f : (f > 1.0f) ? 1.0f : f; }
-static inline float  ImLengthSqr(const ImVec2& lhs)                             { return (lhs.x * lhs.x) + (lhs.y * lhs.y); }
-static inline float  ImLengthSqr(const ImVec4& lhs)                             { return (lhs.x * lhs.x) + (lhs.y * lhs.y) + (lhs.z * lhs.z) + (lhs.w * lhs.w); }
-static inline float  ImInvLength(const ImVec2& lhs, float fail_value)           { float d = (lhs.x * lhs.x) + (lhs.y * lhs.y); if (d > 0.0f) return 1.0f / ImSqrt(d); return fail_value; }
-static inline float  ImFloor(float f)                                           { return (float)(int)(f); }
-static inline ImVec2 ImFloor(const ImVec2& v)                                   { return ImVec2((float)(int)(v.x), (float)(int)(v.y)); }
-static inline int    ImModPositive(int a, int b)                                { return (a + b) % b; }
-static inline float  ImDot(const ImVec2& a, const ImVec2& b)                    { return a.x * b.x + a.y * b.y; }
-static inline ImVec2 ImRotate(const ImVec2& v, float cos_a, float sin_a)        { return ImVec2(v.x * cos_a - v.y * sin_a, v.x * sin_a + v.y * cos_a); }
-static inline float  ImLinearSweep(float current, float target, float speed)    { if (current < target) return ImMin(current + speed, target); if (current > target) return ImMax(current - speed, target); return current; }
-static inline ImVec2 ImMul(const ImVec2& lhs, const ImVec2& rhs)                { return ImVec2(lhs.x * rhs.x, lhs.y * rhs.y); }
-
-IMGUI_API ImVec2     ImBezierCubicCalc(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, float t);
-IMGUI_API ImVec2     ImBezierCubicClosestPoint(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, int num_segments);              
-IMGUI_API ImVec2     ImBezierCubicClosestPointCasteljau(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, float tess_tol);         
-IMGUI_API ImVec2     ImBezierQuadraticCalc(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, float t);
-IMGUI_API ImVec2     ImLineClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& p);
-IMGUI_API bool       ImTriangleContainsPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p);
-IMGUI_API ImVec2     ImTriangleClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p);
-IMGUI_API void       ImTriangleBarycentricCoords(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p, float& out_u, float& out_v, float& out_w);
-inline float         ImTriangleArea(const ImVec2& a, const ImVec2& b, const ImVec2& c) { return ImFabs((a.x * (b.y - c.y)) + (b.x * (c.y - a.y)) + (c.x * (a.y - b.y))) * 0.5f; }
-IMGUI_API ImGuiDir   ImGetDirQuadrantFromDelta(float dx, float dy);
-
-struct ImVec1
-{
-    float   x;
-    ImVec1()         { x = 0.0f; }
-    ImVec1(float _x) { x = _x; }
-};
-
-struct ImVec2ih
-{
-    short   x, y;
-    ImVec2ih()                           { x = y = 0; }
-    ImVec2ih(short _x, short _y)         { x = _x; y = _y; }
-    explicit ImVec2ih(const ImVec2& rhs) { x = (short)rhs.x; y = (short)rhs.y; }
-};
-
-struct IMGUI_API ImRect
-{
-    ImVec2      Min;     
-    ImVec2      Max;     
-
-    ImRect()                                        : Min(0.0f, 0.0f), Max(0.0f, 0.0f)  {}
-    ImRect(const ImVec2& min, const ImVec2& max)    : Min(min), Max(max)                {}
-    ImRect(const ImVec4& v)                         : Min(v.x, v.y), Max(v.z, v.w)      {}
-    ImRect(float x1, float y1, float x2, float y2)  : Min(x1, y1), Max(x2, y2)          {}
-
-    ImVec2      GetCenter() const                   { return ImVec2((Min.x + Max.x) * 0.5f, (Min.y + Max.y) * 0.5f); }
-    ImVec2      GetSize() const                     { return ImVec2(Max.x - Min.x, Max.y - Min.y); }
-    float       GetWidth() const                    { return Max.x - Min.x; }
-    float       GetHeight() const                   { return Max.y - Min.y; }
-    ImVec2      GetTL() const                       { return Min; }                    
-    ImVec2      GetTR() const                       { return ImVec2(Max.x, Min.y); }   
-    ImVec2      GetBL() const                       { return ImVec2(Min.x, Max.y); }   
-    ImVec2      GetBR() const                       { return Max; }                    
-    bool        Contains(const ImVec2& p) const     { return p.x     >= Min.x && p.y     >= Min.y && p.x     <  Max.x && p.y     <  Max.y; }
-    bool        Contains(const ImRect& r) const     { return r.Min.x >= Min.x && r.Min.y >= Min.y && r.Max.x <= Max.x && r.Max.y <= Max.y; }
-    bool        Overlaps(const ImRect& r) const     { return r.Min.y <  Max.y && r.Max.y >  Min.y && r.Min.x <  Max.x && r.Max.x >  Min.x; }
-    void        Add(const ImVec2& p)                { if (Min.x > p.x)     Min.x = p.x;     if (Min.y > p.y)     Min.y = p.y;     if (Max.x < p.x)     Max.x = p.x;     if (Max.y < p.y)     Max.y = p.y; }
-    void        Add(const ImRect& r)                { if (Min.x > r.Min.x) Min.x = r.Min.x; if (Min.y > r.Min.y) Min.y = r.Min.y; if (Max.x < r.Max.x) Max.x = r.Max.x; if (Max.y < r.Max.y) Max.y = r.Max.y; }
-    void        Expand(const float amount)          { Min.x -= amount;   Min.y -= amount;   Max.x += amount;   Max.y += amount; }
-    void        Expand(const ImVec2& amount)        { Min.x -= amount.x; Min.y -= amount.y; Max.x += amount.x; Max.y += amount.y; }
-    void        Translate(const ImVec2& d)          { Min.x += d.x; Min.y += d.y; Max.x += d.x; Max.y += d.y; }
-    void        TranslateX(float dx)                { Min.x += dx; Max.x += dx; }
-    void        TranslateY(float dy)                { Min.y += dy; Max.y += dy; }
-    void        ClipWith(const ImRect& r)           { Min = ImMax(Min, r.Min); Max = ImMin(Max, r.Max); }                                     
-    void        ClipWithFull(const ImRect& r)       { Min = ImClamp(Min, r.Min, r.Max); Max = ImClamp(Max, r.Min, r.Max); }         
-    void        Floor()                             { Min.x = IM_FLOOR(Min.x); Min.y = IM_FLOOR(Min.y); Max.x = IM_FLOOR(Max.x); Max.y = IM_FLOOR(Max.y); }
-    bool        IsInverted() const                  { return Min.x > Max.x || Min.y > Max.y; }
-    ImVec4      ToVec4() const                      { return ImVec4(Min.x, Min.y, Max.x, Max.y); }
-};
-
-inline bool     ImBitArrayTestBit(const ImU32* arr, int n)      { ImU32 mask = (ImU32)1 << (n & 31); return (arr[n >> 5] & mask) != 0; }
-inline void     ImBitArrayClearBit(ImU32* arr, int n)           { ImU32 mask = (ImU32)1 << (n & 31); arr[n >> 5] &= ~mask; }
-inline void     ImBitArraySetBit(ImU32* arr, int n)             { ImU32 mask = (ImU32)1 << (n & 31); arr[n >> 5] |= mask; }
-inline void     ImBitArraySetBitRange(ImU32* arr, int n, int n2)     
-{
-    n2--;
-    while (n <= n2)
-    {
-        int a_mod = (n & 31);
-        int b_mod = (n2 > (n | 31) ? 31 : (n2 & 31)) + 1;
-        ImU32 mask = (ImU32)(((ImU64)1 << b_mod) - 1) & ~(ImU32)(((ImU64)1 << a_mod) - 1);
-        arr[n >> 5] |= mask;
-        n = (n + 32) & ~31;
-    }
-}
-
-template<int BITCOUNT>
-struct IMGUI_API ImBitArray
-{
-    ImU32           Storage[(BITCOUNT + 31) >> 5];
-    ImBitArray()                                { }
-    void            ClearAllBits()              { memset(Storage, 0, sizeof(Storage)); }
-    void            SetAllBits()                { memset(Storage, 255, sizeof(Storage)); }
-    bool            TestBit(int n) const        { IM_ASSERT(n < BITCOUNT); return ImBitArrayTestBit(Storage, n); }
-    void            SetBit(int n)               { IM_ASSERT(n < BITCOUNT); ImBitArraySetBit(Storage, n); }
-    void            ClearBit(int n)             { IM_ASSERT(n < BITCOUNT); ImBitArrayClearBit(Storage, n); }
-    void            SetBitRange(int n, int n2)  { ImBitArraySetBitRange(Storage, n, n2); }     
-};
-
-struct IMGUI_API ImBitVector
-{
-    ImVector<ImU32> Storage;
-    void            Create(int sz)              { Storage.resize((sz + 31) >> 5); memset(Storage.Data, 0, (size_t)Storage.Size * sizeof(Storage.Data[0])); }
-    void            Clear()                     { Storage.clear(); }
-    bool            TestBit(int n) const        { IM_ASSERT(n < (Storage.Size << 5)); return ImBitArrayTestBit(Storage.Data, n); }
-    void            SetBit(int n)               { IM_ASSERT(n < (Storage.Size << 5)); ImBitArraySetBit(Storage.Data, n); }
-    void            ClearBit(int n)             { IM_ASSERT(n < (Storage.Size << 5)); ImBitArrayClearBit(Storage.Data, n); }
-};
-
-template<typename T>
-struct ImSpan
-{
-    T*                  Data;
-    T*                  DataEnd;
-
-    inline ImSpan()                                 { Data = DataEnd = NULL; }
-    inline ImSpan(T* data, int size)                { Data = data; DataEnd = data + size; }
-    inline ImSpan(T* data, T* data_end)             { Data = data; DataEnd = data_end; }
-
-    inline void         set(T* data, int size)      { Data = data; DataEnd = data + size; }
-    inline void         set(T* data, T* data_end)   { Data = data; DataEnd = data_end; }
-    inline int          size() const                { return (int)(ptrdiff_t)(DataEnd - Data); }
-    inline int          size_in_bytes() const       { return (int)(ptrdiff_t)(DataEnd - Data) * (int)sizeof(T); }
-    inline T&           operator[](int i)           { T* p = Data + i; IM_ASSERT(p >= Data && p < DataEnd); return *p; }
-    inline const T&     operator[](int i) const     { const T* p = Data + i; IM_ASSERT(p >= Data && p < DataEnd); return *p; }
-
-    inline T*           begin()                     { return Data; }
-    inline const T*     begin() const               { return Data; }
-    inline T*           end()                       { return DataEnd; }
-    inline const T*     end() const                 { return DataEnd; }
-
-    inline int  index_from_ptr(const T* it) const   { IM_ASSERT(it >= Data && it < DataEnd); const ptrdiff_t off = it - Data; return (int)off; }
-};
-
-template<int CHUNKS>
-struct ImSpanAllocator
-{
-    char*   BasePtr;
-    int     TotalSize;
-    int     CurrSpan;
-    int     Offsets[CHUNKS];
-
-    ImSpanAllocator()                               { memset(this, 0, sizeof(*this)); }
-    inline void  ReserveBytes(int n, size_t sz)     { IM_ASSERT(n == CurrSpan && n < CHUNKS); IM_UNUSED(n); Offsets[CurrSpan++] = TotalSize; TotalSize += (int)sz; }
-    inline int   GetArenaSizeInBytes()              { return TotalSize; }
-    inline void  SetArenaBasePtr(void* base_ptr)    { BasePtr = (char*)base_ptr; }
-    inline void* GetSpanPtrBegin(int n)             { IM_ASSERT(n >= 0 && n < CHUNKS && CurrSpan == CHUNKS); return (void*)(BasePtr + Offsets[n]); }
-    inline void* GetSpanPtrEnd(int n)               { IM_ASSERT(n >= 0 && n < CHUNKS && CurrSpan == CHUNKS); return (n + 1 < CHUNKS) ? BasePtr + Offsets[n + 1] : (void*)(BasePtr + TotalSize); }
-    template<typename T>
-    inline void  GetSpan(int n, ImSpan<T>* span)    { span->set((T*)GetSpanPtrBegin(n), (T*)GetSpanPtrEnd(n)); }
-};
-
-typedef int ImPoolIdx;
-template<typename T>
-struct IMGUI_API ImPool
-{
-    ImVector<T>     Buf;          
-    ImGuiStorage    Map;         
-    ImPoolIdx       FreeIdx;         
-
-    ImPool()    { FreeIdx = 0; }
-    ~ImPool()   { Clear(); }
-    T*          GetByKey(ImGuiID key)               { int idx = Map.GetInt(key, -1); return (idx != -1) ? &Buf[idx] : NULL; }
-    T*          GetByIndex(ImPoolIdx n)             { return &Buf[n]; }
-    ImPoolIdx   GetIndex(const T* p) const          { IM_ASSERT(p >= Buf.Data && p < Buf.Data + Buf.Size); return (ImPoolIdx)(p - Buf.Data); }
-    T*          GetOrAddByKey(ImGuiID key)          { int* p_idx = Map.GetIntRef(key, -1); if (*p_idx != -1) return &Buf[*p_idx]; *p_idx = FreeIdx; return Add(); }
-    bool        Contains(const T* p) const          { return (p >= Buf.Data && p < Buf.Data + Buf.Size); }
-    void        Clear()                             { for (int n = 0; n < Map.Data.Size; n++) { int idx = Map.Data[n].val_i; if (idx != -1) Buf[idx].~T(); } Map.Clear(); Buf.clear(); FreeIdx = 0; }
-    T*          Add()                               { int idx = FreeIdx; if (idx == Buf.Size) { Buf.resize(Buf.Size + 1); FreeIdx++; } else { FreeIdx = *(int*)&Buf[idx]; } IM_PLACEMENT_NEW(&Buf[idx]) T(); return &Buf[idx]; }
-    void        Remove(ImGuiID key, const T* p)     { Remove(key, GetIndex(p)); }
-    void        Remove(ImGuiID key, ImPoolIdx idx)  { Buf[idx].~T(); *(int*)&Buf[idx] = FreeIdx; FreeIdx = idx; Map.SetInt(key, -1); }
-    void        Reserve(int capacity)               { Buf.reserve(capacity); Map.Data.reserve(capacity); }
-    int         GetSize() const                     { return Buf.Size; }
-};
-
-template<typename T>
-struct IMGUI_API ImChunkStream
-{
-    ImVector<char>  Buf;
-
-    void    clear()                     { Buf.clear(); }
-    bool    empty() const               { return Buf.Size == 0; }
-    int     size() const                { return Buf.Size; }
-    T*      alloc_chunk(size_t sz)      { size_t HDR_SZ = 4; sz = ((HDR_SZ + sz) + 3u) & ~3u; int off = Buf.Size; Buf.resize(off + (int)sz); ((int*)(void*)(Buf.Data + off))[0] = (int)sz; return (T*)(void*)(Buf.Data + off + (int)HDR_SZ); }
-    T*      begin()                     { size_t HDR_SZ = 4; if (!Buf.Data) return NULL; return (T*)(void*)(Buf.Data + HDR_SZ); }
-    T*      next_chunk(T* p)            { size_t HDR_SZ = 4; IM_ASSERT(p >= begin() && p < end()); p = (T*)(void*)((char*)(void*)p + chunk_size(p)); if (p == (T*)(void*)((char*)end() + HDR_SZ)) return (T*)0; IM_ASSERT(p < end()); return p; }
-    int     chunk_size(const T* p)      { return ((const int*)p)[-1]; }
-    T*      end()                       { return (T*)(void*)(Buf.Data + Buf.Size); }
-    int     offset_from_ptr(const T* p) { IM_ASSERT(p >= begin() && p < end()); const ptrdiff_t off = (const char*)p - Buf.Data; return (int)off; }
-    T*      ptr_from_offset(int off)    { IM_ASSERT(off >= 4 && off < Buf.Size); return (T*)(void*)(Buf.Data + off); }
-    void    swap(ImChunkStream<T>& rhs) { rhs.Buf.swap(Buf); }
-
-};
-
-#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MIN                     12
-#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX                     512
-#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(_RAD,_MAXERROR)    ImClamp((int)((IM_PI * 2.0f) / ImAcos(((_RAD) - (_MAXERROR)) / (_RAD))), IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MIN, IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX)
-
-#ifndef IM_DRAWLIST_ARCFAST_TESSELLATION_MULTIPLIER
-#define IM_DRAWLIST_ARCFAST_TESSELLATION_MULTIPLIER             1
-#endif
-
-struct IMGUI_API ImDrawListSharedData
-{
-    ImVec2          TexUvWhitePixel;                   
-    ImFont*         Font;                              
-    float           FontSize;                           
-    float           CurveTessellationTol;            
-    float           CircleSegmentMaxError;                   
-    ImVec4          ClipRectFullscreen;            
-    ImDrawListFlags InitialFlags;                                  
-
-    ImVec2          ArcFastVtx[12 * IM_DRAWLIST_ARCFAST_TESSELLATION_MULTIPLIER];         
-    ImU8            CircleSegmentCounts[64];                   
-    const ImVec4*   TexUvLines;                        
-
-    ImDrawListSharedData();
-    void SetCircleSegmentMaxError(float max_error);
-};
-
-struct ImDrawDataBuilder
-{
-    ImVector<ImDrawList*>   Layers[2];                
-
-    void Clear()            { for (int n = 0; n < IM_ARRAYSIZE(Layers); n++) Layers[n].resize(0); }
-    void ClearFreeMemory()  { for (int n = 0; n < IM_ARRAYSIZE(Layers); n++) Layers[n].clear(); }
-    IMGUI_API void FlattenIntoSingleLayer();
-};
-
-enum ImGuiItemFlags_
-{
-    ImGuiItemFlags_None                     = 0,
-    ImGuiItemFlags_NoTabStop                = 1 << 0,   
-    ImGuiItemFlags_ButtonRepeat             = 1 << 1,                   
-    ImGuiItemFlags_Disabled                 = 1 << 2,                 
-    ImGuiItemFlags_NoNav                    = 1 << 3,   
-    ImGuiItemFlags_NoNavDefaultFocus        = 1 << 4,   
-    ImGuiItemFlags_SelectableDontClosePopup = 1 << 5,             
-    ImGuiItemFlags_MixedValue               = 1 << 6,                             
-    ImGuiItemFlags_ReadOnly                 = 1 << 7,                 
-    ImGuiItemFlags_Default_                 = 0
-};
-
-enum ImGuiItemStatusFlags_
-{
-    ImGuiItemStatusFlags_None               = 0,
-    ImGuiItemStatusFlags_HoveredRect        = 1 << 0,
-    ImGuiItemStatusFlags_HasDisplayRect     = 1 << 1,
-    ImGuiItemStatusFlags_Edited             = 1 << 2,                      
-    ImGuiItemStatusFlags_ToggledSelection   = 1 << 3,                           
-    ImGuiItemStatusFlags_ToggledOpen        = 1 << 4,           
-    ImGuiItemStatusFlags_HasDeactivated     = 1 << 5,                
-    ImGuiItemStatusFlags_Deactivated        = 1 << 6          
-
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    ,   
-    ImGuiItemStatusFlags_Openable           = 1 << 10,  
-    ImGuiItemStatusFlags_Opened             = 1 << 11,  
-    ImGuiItemStatusFlags_Checkable          = 1 << 12,  
-    ImGuiItemStatusFlags_Checked            = 1 << 13   
-#endif
-};
-
-enum ImGuiButtonFlagsPrivate_
-{
-    ImGuiButtonFlags_PressedOnClick         = 1 << 4,          
-    ImGuiButtonFlags_PressedOnClickRelease  = 1 << 5,                       
-    ImGuiButtonFlags_PressedOnClickReleaseAnywhere = 1 << 6,                   
-    ImGuiButtonFlags_PressedOnRelease       = 1 << 7,          
-    ImGuiButtonFlags_PressedOnDoubleClick   = 1 << 8,          
-    ImGuiButtonFlags_PressedOnDragDropHold  = 1 << 9,                       
-    ImGuiButtonFlags_Repeat                 = 1 << 10,     
-    ImGuiButtonFlags_FlattenChildren        = 1 << 11,           
-    ImGuiButtonFlags_AllowItemOverlap       = 1 << 12,                    
-    ImGuiButtonFlags_DontClosePopups        = 1 << 13,           
-    ImGuiButtonFlags_Disabled               = 1 << 14,    
-    ImGuiButtonFlags_AlignTextBaseLine      = 1 << 15,                           
-    ImGuiButtonFlags_NoKeyModifiers         = 1 << 16,           
-    ImGuiButtonFlags_NoHoldingActiveId      = 1 << 17,           
-    ImGuiButtonFlags_NoNavFocus             = 1 << 18,        
-    ImGuiButtonFlags_NoHoveredOnFocus       = 1 << 19,             
-    ImGuiButtonFlags_PressedOnMask_         = ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnClickReleaseAnywhere | ImGuiButtonFlags_PressedOnRelease | ImGuiButtonFlags_PressedOnDoubleClick | ImGuiButtonFlags_PressedOnDragDropHold,
-    ImGuiButtonFlags_PressedOnDefault_      = ImGuiButtonFlags_PressedOnClickRelease
-};
-
-enum ImGuiSliderFlagsPrivate_
-{
-    ImGuiSliderFlags_Vertical               = 1 << 20,        
-    ImGuiSliderFlags_ReadOnly               = 1 << 21
-};
-
-enum ImGuiSelectableFlagsPrivate_
-{
-    ImGuiSelectableFlags_NoHoldingActiveID      = 1 << 20,
-    ImGuiSelectableFlags_SelectOnClick          = 1 << 21,            
-    ImGuiSelectableFlags_SelectOnRelease        = 1 << 22,            
-    ImGuiSelectableFlags_SpanAvailWidth         = 1 << 23,                            
-    ImGuiSelectableFlags_DrawHoveredWhenHeld    = 1 << 24,                  
-    ImGuiSelectableFlags_SetNavIdOnHover        = 1 << 25,           
-    ImGuiSelectableFlags_NoPadWithHalfSpacing   = 1 << 26           
-};
-
-enum ImGuiTreeNodeFlagsPrivate_
-{
-    ImGuiTreeNodeFlags_ClipLabelForTrailingButton = 1 << 20
-};
-
-enum ImGuiSeparatorFlags_
-{
-    ImGuiSeparatorFlags_None                = 0,
-    ImGuiSeparatorFlags_Horizontal          = 1 << 0,                  
-    ImGuiSeparatorFlags_Vertical            = 1 << 1,
-    ImGuiSeparatorFlags_SpanAllColumns      = 1 << 2
-};
-
-enum ImGuiTextFlags_
-{
-    ImGuiTextFlags_None = 0,
-    ImGuiTextFlags_NoWidthForLargeClippedText = 1 << 0
-};
-
-enum ImGuiTooltipFlags_
-{
-    ImGuiTooltipFlags_None = 0,
-    ImGuiTooltipFlags_OverridePreviousTooltip = 1 << 0               
-};
-
-enum ImGuiLayoutType_
-{
-    ImGuiLayoutType_Horizontal = 0,
-    ImGuiLayoutType_Vertical = 1
-};
-
-enum ImGuiLogType
-{
-    ImGuiLogType_None = 0,
-    ImGuiLogType_TTY,
-    ImGuiLogType_File,
-    ImGuiLogType_Buffer,
-    ImGuiLogType_Clipboard
-};
-
-enum ImGuiAxis
-{
-    ImGuiAxis_None = -1,
-    ImGuiAxis_X = 0,
-    ImGuiAxis_Y = 1
-};
-
-enum ImGuiPlotType
-{
-    ImGuiPlotType_Lines,
-    ImGuiPlotType_Histogram
-};
-
-enum ImGuiInputSource
-{
-    ImGuiInputSource_None = 0,
-    ImGuiInputSource_Mouse,
-    ImGuiInputSource_Nav,
-    ImGuiInputSource_NavKeyboard,             
-    ImGuiInputSource_NavGamepad,     
-    ImGuiInputSource_COUNT
-};
-
-enum ImGuiInputReadMode
-{
-    ImGuiInputReadMode_Down,
-    ImGuiInputReadMode_Pressed,
-    ImGuiInputReadMode_Released,
-    ImGuiInputReadMode_Repeat,
-    ImGuiInputReadMode_RepeatSlow,
-    ImGuiInputReadMode_RepeatFast
-};
-
-enum ImGuiNavHighlightFlags_
-{
-    ImGuiNavHighlightFlags_None         = 0,
-    ImGuiNavHighlightFlags_TypeDefault  = 1 << 0,
-    ImGuiNavHighlightFlags_TypeThin     = 1 << 1,
-    ImGuiNavHighlightFlags_AlwaysDraw   = 1 << 2,                   
-    ImGuiNavHighlightFlags_NoRounding   = 1 << 3
-};
-
-enum ImGuiNavDirSourceFlags_
-{
-    ImGuiNavDirSourceFlags_None         = 0,
-    ImGuiNavDirSourceFlags_Keyboard     = 1 << 0,
-    ImGuiNavDirSourceFlags_PadDPad      = 1 << 1,
-    ImGuiNavDirSourceFlags_PadLStick    = 1 << 2
-};
-
-enum ImGuiNavMoveFlags_
-{
-    ImGuiNavMoveFlags_None                  = 0,
-    ImGuiNavMoveFlags_LoopX                 = 1 << 0,          
-    ImGuiNavMoveFlags_LoopY                 = 1 << 1,
-    ImGuiNavMoveFlags_WrapX                 = 1 << 2,                     
-    ImGuiNavMoveFlags_WrapY                 = 1 << 3,            
-    ImGuiNavMoveFlags_AllowCurrentNavId     = 1 << 4,                                                  
-    ImGuiNavMoveFlags_AlsoScoreVisibleSet   = 1 << 5,                 
-    ImGuiNavMoveFlags_ScrollToEdge          = 1 << 6
-};
-
-enum ImGuiNavForward
-{
-    ImGuiNavForward_None,
-    ImGuiNavForward_ForwardQueued,
-    ImGuiNavForward_ForwardActive
-};
-
-enum ImGuiNavLayer
-{
-    ImGuiNavLayer_Main  = 0,       
-    ImGuiNavLayer_Menu  = 1,         
-    ImGuiNavLayer_COUNT
-};
-
-enum ImGuiPopupPositionPolicy
-{
-    ImGuiPopupPositionPolicy_Default,
-    ImGuiPopupPositionPolicy_ComboBox,
-    ImGuiPopupPositionPolicy_Tooltip
-};
-
-struct ImGuiDataTypeTempStorage
-{
-    ImU8        Data[8];               
-};
-
-struct ImGuiDataTypeInfo
-{
-    size_t      Size;              
-    const char* Name;                   
-    const char* PrintFmt;             
-    const char* ScanFmt;              
-};
-
-enum ImGuiDataTypePrivate_
-{
-    ImGuiDataType_String = ImGuiDataType_COUNT + 1,
-    ImGuiDataType_Pointer,
-    ImGuiDataType_ID
-};
-
-struct ImGuiColorMod
-{
-    ImGuiCol    Col;
-    ImVec4      BackupValue;
-};
-
-struct ImGuiStyleMod
-{
-    ImGuiStyleVar   VarIdx;
-    union           { int BackupInt[2]; float BackupFloat[2]; };
-    ImGuiStyleMod(ImGuiStyleVar idx, int v)     { VarIdx = idx; BackupInt[0] = v; }
-    ImGuiStyleMod(ImGuiStyleVar idx, float v)   { VarIdx = idx; BackupFloat[0] = v; }
-    ImGuiStyleMod(ImGuiStyleVar idx, ImVec2 v)  { VarIdx = idx; BackupFloat[0] = v.x; BackupFloat[1] = v.y; }
-};
-
-struct ImGuiGroupData
-{
-    ImGuiID     WindowID;
-    ImVec2      BackupCursorPos;
-    ImVec2      BackupCursorMaxPos;
-    ImVec1      BackupIndent;
-    ImVec1      BackupGroupOffset;
-    ImVec2      BackupCurrLineSize;
-    float       BackupCurrLineTextBaseOffset;
-    ImGuiID     BackupActiveIdIsAlive;
-    bool        BackupActiveIdPreviousFrameIsAlive;
-    bool        EmitItem;
-};
-
-struct IMGUI_API ImGuiMenuColumns
-{
-    float       Spacing;
-    float       Width, NextWidth;
-    float       Pos[3], NextWidths[3];
-
-    ImGuiMenuColumns() { memset(this, 0, sizeof(*this)); }
-    void        Update(int count, float spacing, bool clear);
-    float       DeclColumns(float w0, float w1, float w2);
-    float       CalcExtraSpace(float avail_w) const;
-};
-
-struct IMGUI_API ImGuiInputTextState
-{
-    ImGuiID                 ID;                           
-    int                     CurLenW, CurLenA;                             
-    ImVector<ImWchar>       TextW;                                       
-    ImVector<char>          TextA;                                  
-    ImVector<char>          InitialTextA;                       
-    bool                    TextAIsValid;                                 
-    int                     BufCapacityA;              
-    float                   ScrollX;                  
-    ImStb::STB_TexteditState Stb;                      
-    float                   CursorAnim;                           
-    bool                    CursorFollow;                        
-    bool                    SelectedAllMouseLock;                 
-    bool                    Edited;                    
-    ImGuiInputTextFlags     UserFlags;                     
-    ImGuiInputTextCallback  UserCallback;            
-    void*                   UserCallbackData;        
-
-    ImGuiInputTextState()                   { memset(this, 0, sizeof(*this)); }
-    void        ClearText()                 { CurLenW = CurLenA = 0; TextW[0] = 0; TextA[0] = 0; CursorClamp(); }
-    void        ClearFreeMemory()           { TextW.clear(); TextA.clear(); InitialTextA.clear(); }
-    int         GetUndoAvailCount() const   { return Stb.undostate.undo_point; }
-    int         GetRedoAvailCount() const   { return STB_TEXTEDIT_UNDOSTATECOUNT - Stb.undostate.redo_point; }
-    void        OnKeyPressed(int key);                 
-
-    void        CursorAnimReset()           { CursorAnim = -0.30f; }                                               
-    void        CursorClamp()               { Stb.cursor = ImMin(Stb.cursor, CurLenW); Stb.select_start = ImMin(Stb.select_start, CurLenW); Stb.select_end = ImMin(Stb.select_end, CurLenW); }
-    bool        HasSelection() const        { return Stb.select_start != Stb.select_end; }
-    void        ClearSelection()            { Stb.select_start = Stb.select_end = Stb.cursor; }
-    void        SelectAll()                 { Stb.select_start = 0; Stb.cursor = Stb.select_end = CurLenW; Stb.has_preferred_x = 0; }
-};
-
-struct ImGuiPopupData
-{
-    ImGuiID             PopupId;           
-    ImGuiWindow*        Window;                     
-    ImGuiWindow*        SourceWindow;                
-    int                 OpenFrameCount;    
-    ImGuiID             OpenParentId;                         
-    ImVec2              OpenPopupPos;               
-    ImVec2              OpenMousePos;                
-
-    ImGuiPopupData()    { memset(this, 0, sizeof(*this)); OpenFrameCount = -1; }
-};
-
-struct ImGuiNavMoveResult
-{
-    ImGuiWindow*    Window;                
-    ImGuiID         ID;                    
-    ImGuiID         FocusScopeId;            
-    float           DistBox;                   
-    float           DistCenter;                
-    float           DistAxial;
-    ImRect          RectRel;                    
-
-    ImGuiNavMoveResult() { Clear(); }
-    void Clear()         { Window = NULL; ID = FocusScopeId = 0; DistBox = DistCenter = DistAxial = FLT_MAX; RectRel = ImRect(); }
-};
-
-enum ImGuiNextWindowDataFlags_
-{
-    ImGuiNextWindowDataFlags_None               = 0,
-    ImGuiNextWindowDataFlags_HasPos             = 1 << 0,
-    ImGuiNextWindowDataFlags_HasSize            = 1 << 1,
-    ImGuiNextWindowDataFlags_HasContentSize     = 1 << 2,
-    ImGuiNextWindowDataFlags_HasCollapsed       = 1 << 3,
-    ImGuiNextWindowDataFlags_HasSizeConstraint  = 1 << 4,
-    ImGuiNextWindowDataFlags_HasFocus           = 1 << 5,
-    ImGuiNextWindowDataFlags_HasBgAlpha         = 1 << 6,
-    ImGuiNextWindowDataFlags_HasScroll          = 1 << 7
-};
-
-struct ImGuiNextWindowData
-{
-    ImGuiNextWindowDataFlags    Flags;
-    ImGuiCond                   PosCond;
-    ImGuiCond                   SizeCond;
-    ImGuiCond                   CollapsedCond;
-    ImVec2                      PosVal;
-    ImVec2                      PosPivotVal;
-    ImVec2                      SizeVal;
-    ImVec2                      ContentSizeVal;
-    ImVec2                      ScrollVal;
-    bool                        CollapsedVal;
-    ImRect                      SizeConstraintRect;
-    ImGuiSizeCallback           SizeCallback;
-    void*                       SizeCallbackUserData;
-    float                       BgAlphaVal;                
-    ImVec2                      MenuBarOffsetMinVal;                
-
-    ImGuiNextWindowData()       { memset(this, 0, sizeof(*this)); }
-    inline void ClearFlags()    { Flags = ImGuiNextWindowDataFlags_None; }
-};
-
-enum ImGuiNextItemDataFlags_
-{
-    ImGuiNextItemDataFlags_None     = 0,
-    ImGuiNextItemDataFlags_HasWidth = 1 << 0,
-    ImGuiNextItemDataFlags_HasOpen  = 1 << 1
-};
-
-struct ImGuiNextItemData
-{
-    ImGuiNextItemDataFlags      Flags;
-    float                       Width;             
-    ImGuiID                     FocusScopeId;                                      
-    ImGuiCond                   OpenCond;
-    bool                        OpenVal;           
-
-    ImGuiNextItemData()         { memset(this, 0, sizeof(*this)); }
-    inline void ClearFlags()    { Flags = ImGuiNextItemDataFlags_None; }      
-};
-
-struct ImGuiShrinkWidthItem
-{
-    int         Index;
-    float       Width;
-};
-
-struct ImGuiPtrOrIndex
-{
-    void*       Ptr;                                 
-    int         Index;                
-
-    ImGuiPtrOrIndex(void* ptr)  { Ptr = ptr; Index = -1; }
-    ImGuiPtrOrIndex(int index)  { Ptr = NULL; Index = index; }
-};
-
-enum ImGuiOldColumnFlags_
-{
-    ImGuiOldColumnFlags_None                    = 0,
-    ImGuiOldColumnFlags_NoBorder                = 1 << 0,      
-    ImGuiOldColumnFlags_NoResize                = 1 << 1,           
-    ImGuiOldColumnFlags_NoPreserveWidths        = 1 << 2,          
-    ImGuiOldColumnFlags_NoForceWithinWindow     = 1 << 3,          
-    ImGuiOldColumnFlags_GrowParentContentsSize  = 1 << 4                          
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-    , ImGuiColumnsFlags_None                    = ImGuiOldColumnFlags_None,
-    ImGuiColumnsFlags_NoBorder                  = ImGuiOldColumnFlags_NoBorder,
-    ImGuiColumnsFlags_NoResize                  = ImGuiOldColumnFlags_NoResize,
-    ImGuiColumnsFlags_NoPreserveWidths          = ImGuiOldColumnFlags_NoPreserveWidths,
-    ImGuiColumnsFlags_NoForceWithinWindow       = ImGuiOldColumnFlags_NoForceWithinWindow,
-    ImGuiColumnsFlags_GrowParentContentsSize    = ImGuiOldColumnFlags_GrowParentContentsSize
-#endif
-};
-
-struct ImGuiOldColumnData
-{
-    float               OffsetNorm;                    
-    float               OffsetNormBeforeResize;
-    ImGuiOldColumnFlags Flags;                
-    ImRect              ClipRect;
-
-    ImGuiOldColumnData() { memset(this, 0, sizeof(*this)); }
-};
-
-struct ImGuiOldColumns
-{
-    ImGuiID             ID;
-    ImGuiOldColumnFlags Flags;
-    bool                IsFirstFrame;
-    bool                IsBeingResized;
-    int                 Current;
-    int                 Count;
-    float               OffMinX, OffMaxX;          
-    float               LineMinY, LineMaxY;
-    float               HostCursorPosY;                 
-    float               HostCursorMaxPosX;              
-    ImRect              HostInitialClipRect;            
-    ImRect              HostBackupClipRect;          
-    ImRect              HostBackupParentWorkRect;       
-    ImVector<ImGuiOldColumnData> Columns;
-    ImDrawListSplitter  Splitter;
-
-    ImGuiOldColumns()   { memset(this, 0, sizeof(*this)); }
-};
-
-#ifdef IMGUI_HAS_MULTI_SELECT
-#endif   
-
-#ifdef IMGUI_HAS_DOCK
-#endif   
-
-#ifdef IMGUI_HAS_VIEWPORT
-#endif   
-
-struct ImGuiWindowSettings
-{
-    ImGuiID     ID;
-    ImVec2ih    Pos;
-    ImVec2ih    Size;
-    bool        Collapsed;
-    bool        WantApply;                      
-
-    ImGuiWindowSettings()       { memset(this, 0, sizeof(*this)); }
-    char* GetName()             { return (char*)(this + 1); }
-};
-
-struct ImGuiSettingsHandler
-{
-    const char* TypeName;                 
-    ImGuiID     TypeHash;         
-    void        (*ClearAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler);                                    
-    void        (*ReadInitFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler);                                       
-    void*       (*ReadOpenFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, const char* name);                         
-    void        (*ReadLineFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, void* entry, const char* line);            
-    void        (*ApplyAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler);                                       
-    void        (*WriteAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* out_buf);            
-    void*       UserData;
-
-    ImGuiSettingsHandler() { memset(this, 0, sizeof(*this)); }
-};
-
-struct ImGuiMetricsConfig
-{
-    bool        ShowWindowsRects;
-    bool        ShowWindowsBeginOrder;
-    bool        ShowTablesRects;
-    bool        ShowDrawCmdMesh;
-    bool        ShowDrawCmdBoundingBoxes;
-    int         ShowWindowsRectsType;
-    int         ShowTablesRectsType;
-
-    ImGuiMetricsConfig()
-    {
-        ShowWindowsRects = false;
-        ShowWindowsBeginOrder = false;
-        ShowTablesRects = false;
-        ShowDrawCmdMesh = true;
-        ShowDrawCmdBoundingBoxes = true;
-        ShowWindowsRectsType = -1;
-        ShowTablesRectsType = -1;
-    }
-};
-
-struct IMGUI_API ImGuiStackSizes
-{
-    short   SizeOfIDStack;
-    short   SizeOfColorStack;
-    short   SizeOfStyleVarStack;
-    short   SizeOfFontStack;
-    short   SizeOfFocusScopeStack;
-    short   SizeOfGroupStack;
-    short   SizeOfBeginPopupStack;
-
-    ImGuiStackSizes() { memset(this, 0, sizeof(*this)); }
-    void SetToCurrentState();
-    void CompareWithCurrentState();
-};
-
-typedef void (*ImGuiContextHookCallback)(ImGuiContext* ctx, ImGuiContextHook* hook);
-enum ImGuiContextHookType { ImGuiContextHookType_NewFramePre, ImGuiContextHookType_NewFramePost, ImGuiContextHookType_EndFramePre, ImGuiContextHookType_EndFramePost, ImGuiContextHookType_RenderPre, ImGuiContextHookType_RenderPost, ImGuiContextHookType_Shutdown, ImGuiContextHookType_PendingRemoval_ };
-
-struct ImGuiContextHook
-{
-    ImGuiID                     HookId;           
-    ImGuiContextHookType        Type;
-    ImGuiID                     Owner;
-    ImGuiContextHookCallback    Callback;
-    void*                       UserData;
-
-    ImGuiContextHook()          { memset(this, 0, sizeof(*this)); }
-};
-
-struct ImGuiContext
-{
-    bool                    Initialized;
-    bool                    FontAtlasOwnedByContext;                         
-    ImGuiIO                 IO;
-    ImGuiStyle              Style;
-    ImFont*                 Font;                                      
-    float                   FontSize;                                       
-    float                   FontBaseSize;                                 
-    ImDrawListSharedData    DrawListSharedData;
-    double                  Time;
-    int                     FrameCount;
-    int                     FrameCountEnded;
-    int                     FrameCountRendered;
-    bool                    WithinFrameScope;                         
-    bool                    WithinFrameScopeWithImplicitWindow;               
-    bool                    WithinEndChild;                        
-    bool                    GcCompactAll;                          
-    bool                    TestEngineHookItems;                        
-    ImGuiID                 TestEngineHookIdInfo;                       
-    void*                   TestEngine;                             
-
-    ImVector<ImGuiWindow*>  Windows;                                    
-    ImVector<ImGuiWindow*>  WindowsFocusOrder;                                                   
-    ImVector<ImGuiWindow*>  WindowsTempSortBuffer;                             
-    ImVector<ImGuiWindow*>  CurrentWindowStack;
-    ImGuiStorage            WindowsById;                             
-    int                     WindowsActiveCount;                        
-    ImGuiWindow*            CurrentWindow;                          
-    ImGuiWindow*            HoveredWindow;                                
-    ImGuiWindow*            HoveredRootWindow;                                  
-    ImGuiWindow*            HoveredWindowUnderMovingWindow;               
-    ImGuiWindow*            MovingWindow;                                           
-    ImGuiWindow*            WheelingWindow;                                                         
-    ImVec2                  WheelingWindowRefMousePos;
-    float                   WheelingWindowTimer;
-
-    ImGuiID                 HoveredId;                                
-    ImGuiID                 HoveredIdPreviousFrame;
-    bool                    HoveredIdAllowOverlap;
-    bool                    HoveredIdUsingMouseWheel;                      
-    bool                    HoveredIdPreviousFrameUsingMouseWheel;
-    bool                    HoveredIdDisabled;                                            
-    float                   HoveredIdTimer;                         
-    float                   HoveredIdNotActiveTimer;                       
-    ImGuiID                 ActiveId;                             
-    ImGuiID                 ActiveIdIsAlive;                                        
-    float                   ActiveIdTimer;
-    bool                    ActiveIdIsJustActivated;                     
-    bool                    ActiveIdAllowOverlap;                               
-    bool                    ActiveIdNoClearOnFocusLoss;                    
-    bool                    ActiveIdHasBeenPressedBefore;                                
-    bool                    ActiveIdHasBeenEditedBefore;                       
-    bool                    ActiveIdHasBeenEditedThisFrame;
-    bool                    ActiveIdUsingMouseWheel;                         
-    ImU32                   ActiveIdUsingNavDirMask;                                
-    ImU32                   ActiveIdUsingNavInputMask;                   
-    ImU64                   ActiveIdUsingKeyInputMask;                                               
-    ImVec2                  ActiveIdClickOffset;                            
-    ImGuiWindow*            ActiveIdWindow;
-    ImGuiInputSource        ActiveIdSource;                           
-    int                     ActiveIdMouseButton;
-    ImGuiID                 ActiveIdPreviousFrame;
-    bool                    ActiveIdPreviousFrameIsAlive;
-    bool                    ActiveIdPreviousFrameHasBeenEditedBefore;
-    ImGuiWindow*            ActiveIdPreviousFrameWindow;
-    ImGuiID                 LastActiveId;                               
-    float                   LastActiveIdTimer;                                
-
-    ImGuiNextWindowData     NextWindowData;                         
-    ImGuiNextItemData       NextItemData;                           
-
-    ImVector<ImGuiColorMod> ColorStack;                                
-    ImVector<ImGuiStyleMod> StyleVarStack;                             
-    ImVector<ImFont*>       FontStack;                                 
-    ImVector<ImGuiID>       FocusScopeStack;                               
-    ImVector<ImGuiItemFlags>ItemFlagsStack;                            
-    ImVector<ImGuiGroupData>GroupStack;                                 
-    ImVector<ImGuiPopupData>OpenPopupStack;                          
-    ImVector<ImGuiPopupData>BeginPopupStack;                              
-
-    ImGuiWindow*            NavWindow;                                  
-    ImGuiID                 NavId;                                  
-    ImGuiID                 NavFocusScopeId;                                         
-    ImGuiID                 NavActivateId;                                     
-    ImGuiID                 NavActivateDownId;                        
-    ImGuiID                 NavActivatePressedId;                     
-    ImGuiID                 NavInputId;                               
-    ImGuiID                 NavJustTabbedId;                         
-    ImGuiID                 NavJustMovedToId;                             
-    ImGuiID                 NavJustMovedToFocusScopeId;                     
-    ImGuiKeyModFlags        NavJustMovedToKeyMods;
-    ImGuiID                 NavNextActivateId;                         
-    ImGuiInputSource        NavInputSource;                                  
-    ImRect                  NavScoringRect;                                    
-    int                     NavScoringCount;                       
-    ImGuiNavLayer           NavLayer;                                                
-    int                     NavIdTabCounter;                           
-    bool                    NavIdIsAlive;                                  
-    bool                    NavMousePosDirty;                                      
-    bool                    NavDisableHighlight;                                       
-    bool                    NavDisableMouseHover;                              
-    bool                    NavAnyRequest;                          
-    bool                    NavInitRequest;                              
-    bool                    NavInitRequestFromMove;
-    ImGuiID                 NavInitResultId;                                   
-    ImRect                  NavInitResultRectRel;                       
-    bool                    NavMoveRequest;                          
-    ImGuiNavMoveFlags       NavMoveRequestFlags;
-    ImGuiNavForward         NavMoveRequestForward;                               
-    ImGuiKeyModFlags        NavMoveRequestKeyMods;
-    ImGuiDir                NavMoveDir, NavMoveDirLast;                     
-    ImGuiDir                NavMoveClipDir;                                
-    ImGuiNavMoveResult      NavMoveResultLocal;                       
-    ImGuiNavMoveResult      NavMoveResultLocalVisibleSet;                     
-    ImGuiNavMoveResult      NavMoveResultOther;                             
-    ImGuiWindow*            NavWrapRequestWindow;                     
-    ImGuiNavMoveFlags       NavWrapRequestFlags;                   
-
-    ImGuiWindow*            NavWindowingTarget;                                 
-    ImGuiWindow*            NavWindowingTargetAnim;                               
-    ImGuiWindow*            NavWindowingListWindow;                    
-    float                   NavWindowingTimer;
-    float                   NavWindowingHighlightAlpha;
-    bool                    NavWindowingToggleLayer;
-
-    ImGuiWindow*            FocusRequestCurrWindow;             
-    ImGuiWindow*            FocusRequestNextWindow;             
-    int                     FocusRequestCurrCounterRegular;                               
-    int                     FocusRequestCurrCounterTabStop;               
-    int                     FocusRequestNextCounterRegular;         
-    int                     FocusRequestNextCounterTabStop;      
-    bool                    FocusTabPressed;                    
-
-    ImDrawData              DrawData;                                     
-    ImDrawDataBuilder       DrawDataBuilder;
-    float                   DimBgRatio;                                       
-    ImDrawList              BackgroundDrawList;                       
-    ImDrawList              ForegroundDrawList;                                        
-    ImGuiMouseCursor        MouseCursor;
-
-    bool                    DragDropActive;
-    bool                    DragDropWithinSource;                         
-    bool                    DragDropWithinTarget;                         
-    ImGuiDragDropFlags      DragDropSourceFlags;
-    int                     DragDropSourceFrameCount;
-    int                     DragDropMouseButton;
-    ImGuiPayload            DragDropPayload;
-    ImRect                  DragDropTargetRect;                             
-    ImGuiID                 DragDropTargetId;
-    ImGuiDragDropFlags      DragDropAcceptFlags;
-    float                   DragDropAcceptIdCurrRectSurface;                
-    ImGuiID                 DragDropAcceptIdCurr;                          
-    ImGuiID                 DragDropAcceptIdPrev;                                  
-    int                     DragDropAcceptFrameCount;                      
-    ImGuiID                 DragDropHoldJustPressedId;                     
-    ImVector<unsigned char> DragDropPayloadBufHeap;                       
-    unsigned char           DragDropPayloadBufLocal[16];             
-
-    ImGuiTable*                     CurrentTable;
-    ImPool<ImGuiTable>              Tables;
-    ImVector<ImGuiPtrOrIndex>       CurrentTableStack;
-    ImVector<float>                 TablesLastTimeActive;                 
-    ImVector<ImDrawChannel>         DrawChannelsTempMergeBuffer;
-
-    ImGuiTabBar*                    CurrentTabBar;
-    ImPool<ImGuiTabBar>             TabBars;
-    ImVector<ImGuiPtrOrIndex>       CurrentTabBarStack;
-    ImVector<ImGuiShrinkWidthItem>  ShrinkWidthBuffer;
-
-    ImVec2                  LastValidMousePos;
-    ImGuiInputTextState     InputTextState;
-    ImFont                  InputTextPasswordFont;
-    ImGuiID                 TempInputId;                                 
-    ImGuiColorEditFlags     ColorEditOptions;                          
-    float                   ColorEditLastHue;                                    
-    float                   ColorEditLastSat;                                    
-    float                   ColorEditLastColor[3];
-    ImVec4                  ColorPickerRef;                               
-    float                   SliderCurrentAccum;                        
-    bool                    SliderCurrentAccumDirty;                          
-    bool                    DragCurrentAccumDirty;
-    float                   DragCurrentAccum;                               
-    float                   DragSpeedDefaultRatio;                      
-    float                   ScrollbarClickDeltaToGrabCenter;                  
-    int                     TooltipOverrideCount;
-    float                   TooltipSlowDelay;                                   
-    ImVector<char>          ClipboardHandlerData;                      
-    ImVector<ImGuiID>       MenusIdSubmittedThisFrame;                     
-
-    ImVec2                  PlatformImePos;                                 
-    ImVec2                  PlatformImeLastPos;
-    char                    PlatformLocaleDecimalPoint;            
-
-    bool                    SettingsLoaded;
-    float                   SettingsDirtyTimer;                          
-    ImGuiTextBuffer         SettingsIniData;                        
-    ImVector<ImGuiSettingsHandler>      SettingsHandlers;            
-    ImChunkStream<ImGuiWindowSettings>  SettingsWindows;            
-    ImChunkStream<ImGuiTableSettings>   SettingsTables;             
-    ImVector<ImGuiContextHook>          Hooks;                        
-    ImGuiID                             HookIdNext;                
-
-    bool                    LogEnabled;                           
-    ImGuiLogType            LogType;                              
-    ImFileHandle            LogFile;                                   
-    ImGuiTextBuffer         LogBuffer;                                            
-    const char*             LogNextPrefix;
-    const char*             LogNextSuffix;
-    float                   LogLinePosY;
-    bool                    LogLineFirstItem;
-    int                     LogDepthRef;
-    int                     LogDepthToExpand;
-    int                     LogDepthToExpandDefault;                        
-
-    bool                    DebugItemPickerActive;                     
-    ImGuiID                 DebugItemPickerBreakId;                    
-    ImGuiMetricsConfig      DebugMetricsConfig;
-
-    float                   FramerateSecPerFrame[120];                     
-    int                     FramerateSecPerFrameIdx;
-    float                   FramerateSecPerFrameAccum;
-    int                     WantCaptureMouseNextFrame;                 
-    int                     WantCaptureKeyboardNextFrame;
-    int                     WantTextInputNextFrame;
-    char                    TempBuffer[1024 * 3 + 1];              
-
-    ImGuiContext(ImFontAtlas* shared_font_atlas) : BackgroundDrawList(&DrawListSharedData), ForegroundDrawList(&DrawListSharedData)
-    {
-        Initialized = false;
-        FontAtlasOwnedByContext = shared_font_atlas ? false : true;
-        Font = NULL;
-        FontSize = FontBaseSize = 0.0f;
-        IO.Fonts = shared_font_atlas ? shared_font_atlas : IM_NEW(ImFontAtlas)();
-        Time = 0.0f;
-        FrameCount = 0;
-        FrameCountEnded = FrameCountRendered = -1;
-        WithinFrameScope = WithinFrameScopeWithImplicitWindow = WithinEndChild = false;
-        GcCompactAll = false;
-        TestEngineHookItems = false;
-        TestEngineHookIdInfo = 0;
-        TestEngine = NULL;
-
-        WindowsActiveCount = 0;
-        CurrentWindow = NULL;
-        HoveredWindow = NULL;
-        HoveredRootWindow = NULL;
-        HoveredWindowUnderMovingWindow = NULL;
-        MovingWindow = NULL;
-        WheelingWindow = NULL;
-        WheelingWindowTimer = 0.0f;
-
-        HoveredId = HoveredIdPreviousFrame = 0;
-        HoveredIdAllowOverlap = false;
-        HoveredIdUsingMouseWheel = HoveredIdPreviousFrameUsingMouseWheel = false;
-        HoveredIdDisabled = false;
-        HoveredIdTimer = HoveredIdNotActiveTimer = 0.0f;
-        ActiveId = 0;
-        ActiveIdIsAlive = 0;
-        ActiveIdTimer = 0.0f;
-        ActiveIdIsJustActivated = false;
-        ActiveIdAllowOverlap = false;
-        ActiveIdNoClearOnFocusLoss = false;
-        ActiveIdHasBeenPressedBefore = false;
-        ActiveIdHasBeenEditedBefore = false;
-        ActiveIdHasBeenEditedThisFrame = false;
-        ActiveIdUsingMouseWheel = false;
-        ActiveIdUsingNavDirMask = 0x00;
-        ActiveIdUsingNavInputMask = 0x00;
-        ActiveIdUsingKeyInputMask = 0x00;
-        ActiveIdClickOffset = ImVec2(-1, -1);
-        ActiveIdWindow = NULL;
-        ActiveIdSource = ImGuiInputSource_None;
-        ActiveIdMouseButton = 0;
-        ActiveIdPreviousFrame = 0;
-        ActiveIdPreviousFrameIsAlive = false;
-        ActiveIdPreviousFrameHasBeenEditedBefore = false;
-        ActiveIdPreviousFrameWindow = NULL;
-        LastActiveId = 0;
-        LastActiveIdTimer = 0.0f;
-
-        NavWindow = NULL;
-        NavId = NavFocusScopeId = NavActivateId = NavActivateDownId = NavActivatePressedId = NavInputId = 0;
-        NavJustTabbedId = NavJustMovedToId = NavJustMovedToFocusScopeId = NavNextActivateId = 0;
-        NavJustMovedToKeyMods = ImGuiKeyModFlags_None;
-        NavInputSource = ImGuiInputSource_None;
-        NavScoringRect = ImRect();
-        NavScoringCount = 0;
-        NavLayer = ImGuiNavLayer_Main;
-        NavIdTabCounter = INT_MAX;
-        NavIdIsAlive = false;
-        NavMousePosDirty = false;
-        NavDisableHighlight = true;
-        NavDisableMouseHover = false;
-        NavAnyRequest = false;
-        NavInitRequest = false;
-        NavInitRequestFromMove = false;
-        NavInitResultId = 0;
-        NavMoveRequest = false;
-        NavMoveRequestFlags = ImGuiNavMoveFlags_None;
-        NavMoveRequestForward = ImGuiNavForward_None;
-        NavMoveRequestKeyMods = ImGuiKeyModFlags_None;
-        NavMoveDir = NavMoveDirLast = NavMoveClipDir = ImGuiDir_None;
-        NavWrapRequestWindow = NULL;
-        NavWrapRequestFlags = ImGuiNavMoveFlags_None;
-
-        NavWindowingTarget = NavWindowingTargetAnim = NavWindowingListWindow = NULL;
-        NavWindowingTimer = NavWindowingHighlightAlpha = 0.0f;
-        NavWindowingToggleLayer = false;
-
-        FocusRequestCurrWindow = FocusRequestNextWindow = NULL;
-        FocusRequestCurrCounterRegular = FocusRequestCurrCounterTabStop = INT_MAX;
-        FocusRequestNextCounterRegular = FocusRequestNextCounterTabStop = INT_MAX;
-        FocusTabPressed = false;
-
-        DimBgRatio = 0.0f;
-        BackgroundDrawList._OwnerName = "##Background";       
-        ForegroundDrawList._OwnerName = "##Foreground";       
-        MouseCursor = ImGuiMouseCursor_Arrow;
-
-        DragDropActive = DragDropWithinSource = DragDropWithinTarget = false;
-        DragDropSourceFlags = ImGuiDragDropFlags_None;
-        DragDropSourceFrameCount = -1;
-        DragDropMouseButton = -1;
-        DragDropTargetId = 0;
-        DragDropAcceptFlags = ImGuiDragDropFlags_None;
-        DragDropAcceptIdCurrRectSurface = 0.0f;
-        DragDropAcceptIdPrev = DragDropAcceptIdCurr = 0;
-        DragDropAcceptFrameCount = -1;
-        DragDropHoldJustPressedId = 0;
-        memset(DragDropPayloadBufLocal, 0, sizeof(DragDropPayloadBufLocal));
-
-        CurrentTable = NULL;
-        CurrentTabBar = NULL;
-
-        LastValidMousePos = ImVec2(0.0f, 0.0f);
-        TempInputId = 0;
-        ColorEditOptions = ImGuiColorEditFlags__OptionsDefault;
-        ColorEditLastHue = ColorEditLastSat = 0.0f;
-        ColorEditLastColor[0] = ColorEditLastColor[1] = ColorEditLastColor[2] = FLT_MAX;
-        SliderCurrentAccum = 0.0f;
-        SliderCurrentAccumDirty = false;
-        DragCurrentAccumDirty = false;
-        DragCurrentAccum = 0.0f;
-        DragSpeedDefaultRatio = 1.0f / 100.0f;
-        ScrollbarClickDeltaToGrabCenter = 0.0f;
-        TooltipOverrideCount = 0;
-        TooltipSlowDelay = 0.50f;
-
-        PlatformImePos = PlatformImeLastPos = ImVec2(FLT_MAX, FLT_MAX);
-        PlatformLocaleDecimalPoint = '.';
-
-        SettingsLoaded = false;
-        SettingsDirtyTimer = 0.0f;
-        HookIdNext = 0;
-
-        LogEnabled = false;
-        LogType = ImGuiLogType_None;
-        LogNextPrefix = LogNextSuffix = NULL;
-        LogFile = NULL;
-        LogLinePosY = FLT_MAX;
-        LogLineFirstItem = false;
-        LogDepthRef = 0;
-        LogDepthToExpand = LogDepthToExpandDefault = 2;
-
-        DebugItemPickerActive = false;
-        DebugItemPickerBreakId = 0;
-
-        memset(FramerateSecPerFrame, 0, sizeof(FramerateSecPerFrame));
-        FramerateSecPerFrameIdx = 0;
-        FramerateSecPerFrameAccum = 0.0f;
-        WantCaptureMouseNextFrame = WantCaptureKeyboardNextFrame = WantTextInputNextFrame = -1;
-        memset(TempBuffer, 0, sizeof(TempBuffer));
-    }
-};
-
-struct IMGUI_API ImGuiWindowTempData
-{
-    ImVec2                  CursorPos;                    
-    ImVec2                  CursorPosPrevLine;
-    ImVec2                  CursorStartPos;                   
-    ImVec2                  CursorMaxPos;                                
-    ImVec2                  IdealMaxPos;                               
-    ImVec2                  CurrLineSize;
-    ImVec2                  PrevLineSize;
-    float                   CurrLineTextBaseOffset;                    
-    float                   PrevLineTextBaseOffset;
-    ImVec1                  Indent;                             
-    ImVec1                  ColumnsOffset;                                      
-    ImVec1                  GroupOffset;
-
-    ImGuiID                 LastItemId;                 
-    ImGuiItemStatusFlags    LastItemStatusFlags;           
-    ImRect                  LastItemRect;                
-    ImRect                  LastItemDisplayRect;                
-
-    ImGuiNavLayer           NavLayerCurrent;                
-    int                     NavLayerActiveMask;               
-    int                     NavLayerActiveMaskNext;           
-    ImGuiID                 NavFocusScopeIdCurrent;       
-    bool                    NavHideHighlightOneFrame;
-    bool                    NavHasScroll;                    
-
-    bool                    MenuBarAppending;          
-    ImVec2                  MenuBarOffset;                                            
-    ImGuiMenuColumns        MenuColumns;                   
-    int                     TreeDepth;                 
-    ImU32                   TreeJumpToParentOnPopMask;                 
-    ImVector<ImGuiWindow*>  ChildWindows;
-    ImGuiStorage*           StateStorage;                     
-    ImGuiOldColumns*        CurrentColumns;            
-    int                     CurrentTableIdx;             
-    ImGuiLayoutType         LayoutType;
-    ImGuiLayoutType         ParentLayoutType;                 
-    int                     FocusCounterRegular;                     
-    int                     FocusCounterTabStop;                 
-
-    ImGuiItemFlags          ItemFlags;                
-    float                   ItemWidth;                              
-    float                   TextWrapPos;                
-    ImVector<float>         ItemWidthStack;                    
-    ImVector<float>         TextWrapPosStack;                   
-    ImGuiStackSizes         StackSizesOnBegin;             
-};
-
-struct IMGUI_API ImGuiWindow
-{
-    char*                   Name;                                     
-    ImGuiID                 ID;                                   
-    ImGuiWindowFlags        Flags;                                 
-    ImVec2                  Pos;                                      
-    ImVec2                  Size;                                       
-    ImVec2                  SizeFull;                               
-    ImVec2                  ContentSize;                                                
-    ImVec2                  ContentSizeIdeal;
-    ImVec2                  ContentSizeExplicit;                            
-    ImVec2                  WindowPadding;                             
-    float                   WindowRounding;                                          
-    float                   WindowBorderSize;                           
-    int                     NameBufLen;                                   
-    ImGuiID                 MoveId;                               
-    ImGuiID                 ChildId;                                             
-    ImVec2                  Scroll;
-    ImVec2                  ScrollMax;
-    ImVec2                  ScrollTarget;                                             
-    ImVec2                  ScrollTargetCenterRatio;                               
-    ImVec2                  ScrollTargetEdgeSnapDist;                  
-    ImVec2                  ScrollbarSizes;                                              
-    bool                    ScrollbarX, ScrollbarY;                
-    bool                    Active;                                    
-    bool                    WasActive;
-    bool                    WriteAccessed;                                
-    bool                    Collapsed;                                  
-    bool                    WantCollapseToggle;
-    bool                    SkipItems;                                        
-    bool                    Appearing;                                     
-    bool                    Hidden;                                    
-    bool                    IsFallbackWindow;                        
-    bool                    HasCloseButton;                                
-    signed char             ResizeBorderHeld;                             
-    short                   BeginCount;                                           
-    short                   BeginOrderWithinParent;                          
-    short                   BeginOrderWithinContext;                           
-    ImGuiID                 PopupId;                                                
-    ImS8                    AutoFitFramesX, AutoFitFramesY;
-    ImS8                    AutoFitChildAxises;
-    bool                    AutoFitOnlyGrows;
-    ImGuiDir                AutoPosLastDirection;
-    ImS8                    HiddenFramesCanSkipItems;                 
-    ImS8                    HiddenFramesCannotSkipItems;                          
-    ImS8                    HiddenFramesForRenderOnly;                    
-    ImGuiCond               SetWindowPosAllowFlags : 8;                
-    ImGuiCond               SetWindowSizeAllowFlags : 8;               
-    ImGuiCond               SetWindowCollapsedAllowFlags : 8;          
-    ImVec2                  SetWindowPosVal;                                        
-    ImVec2                  SetWindowPosPivot;                                       
-
-    ImVector<ImGuiID>       IDStack;                                                    
-    ImGuiWindowTempData     DC;                                                      
-
-    ImRect                  OuterRectClipped;                               
-    ImRect                  InnerRect;                                   
-    ImRect                  InnerClipRect;                                     
-    ImRect                  WorkRect;                                                         
-    ImRect                  ParentWorkRect;                                                    
-    ImRect                  ClipRect;                                       
-    ImRect                  ContentRegionRect;                                                
-    ImVec2ih                HitTestHoleSize;                               
-    ImVec2ih                HitTestHoleOffset;
-
-    int                     LastFrameActive;                           
-    float                   LastTimeActive;                                    
-    float                   ItemWidthDefault;
-    ImGuiStorage            StateStorage;
-    ImVector<ImGuiOldColumns> ColumnsStorage;
-    float                   FontWindowScale;                          
-    int                     SettingsOffset;                                     
-
-    ImDrawList*             DrawList;                                          
-    ImDrawList              DrawListInst;
-    ImGuiWindow*            ParentWindow;                                       
-    ImGuiWindow*            RootWindow;                                        
-    ImGuiWindow*            RootWindowForTitleBarHighlight;                     
-    ImGuiWindow*            RootWindowForNav;                               
-
-    ImGuiWindow*            NavLastChildNavWindow;                                             
-    ImGuiID                 NavLastIds[ImGuiNavLayer_COUNT];             
-    ImRect                  NavRectRel[ImGuiNavLayer_COUNT];          
-
-    int                     MemoryDrawListIdxCapacity;                            
-    int                     MemoryDrawListVtxCapacity;
-    bool                    MemoryCompacted;                             
-
-public:
-    ImGuiWindow(ImGuiContext* context, const char* name);
-    ~ImGuiWindow();
-
-    ImGuiID     GetID(const char* str, const char* str_end = NULL);
-    ImGuiID     GetID(const void* ptr);
-    ImGuiID     GetID(int n);
-    ImGuiID     GetIDNoKeepAlive(const char* str, const char* str_end = NULL);
-    ImGuiID     GetIDNoKeepAlive(const void* ptr);
-    ImGuiID     GetIDNoKeepAlive(int n);
-    ImGuiID     GetIDFromRectangle(const ImRect& r_abs);
-
-    ImRect      Rect() const            { return ImRect(Pos.x, Pos.y, Pos.x + Size.x, Pos.y + Size.y); }
-    float       CalcFontSize() const    { ImGuiContext& g = *GImGui; float scale = g.FontBaseSize * FontWindowScale; if (ParentWindow) scale *= ParentWindow->FontWindowScale; return scale; }
-    float       TitleBarHeight() const  { ImGuiContext& g = *GImGui; return (Flags & ImGuiWindowFlags_NoTitleBar) ? 0.0f : CalcFontSize() + g.Style.FramePadding.y * 2.0f; }
-    ImRect      TitleBarRect() const    { return ImRect(Pos, ImVec2(Pos.x + SizeFull.x, Pos.y + TitleBarHeight())); }
-    float       MenuBarHeight() const   { ImGuiContext& g = *GImGui; return (Flags & ImGuiWindowFlags_MenuBar) ? DC.MenuBarOffset.y + CalcFontSize() + g.Style.FramePadding.y * 2.0f : 0.0f; }
-    ImRect      MenuBarRect() const     { float y1 = Pos.y + TitleBarHeight(); return ImRect(Pos.x, y1, Pos.x + SizeFull.x, y1 + MenuBarHeight()); }
-};
-
-struct ImGuiLastItemDataBackup
-{
-    ImGuiID                 LastItemId;
-    ImGuiItemStatusFlags    LastItemStatusFlags;
-    ImRect                  LastItemRect;
-    ImRect                  LastItemDisplayRect;
-
-    ImGuiLastItemDataBackup() { Backup(); }
-    void Backup()           { ImGuiWindow* window = GImGui->CurrentWindow; LastItemId = window->DC.LastItemId; LastItemStatusFlags = window->DC.LastItemStatusFlags; LastItemRect = window->DC.LastItemRect; LastItemDisplayRect = window->DC.LastItemDisplayRect; }
-    void Restore() const    { ImGuiWindow* window = GImGui->CurrentWindow; window->DC.LastItemId = LastItemId; window->DC.LastItemStatusFlags = LastItemStatusFlags; window->DC.LastItemRect = LastItemRect; window->DC.LastItemDisplayRect = LastItemDisplayRect; }
-};
-
-enum ImGuiTabBarFlagsPrivate_
-{
-    ImGuiTabBarFlags_DockNode                   = 1 << 20,                        
-    ImGuiTabBarFlags_IsFocused                  = 1 << 21,
-    ImGuiTabBarFlags_SaveSettings               = 1 << 22                        
-};
-
-enum ImGuiTabItemFlagsPrivate_
-{
-    ImGuiTabItemFlags_NoCloseButton             = 1 << 20,                      
-    ImGuiTabItemFlags_Button                    = 1 << 21               
-};
-
-struct ImGuiTabItem
-{
-    ImGuiID             ID;
-    ImGuiTabItemFlags   Flags;
-    int                 LastFrameVisible;
-    int                 LastFrameSelected;                      
-    float               Offset;                       
-    float               Width;                     
-    float               ContentWidth;                  
-    ImS16               NameOffset;                     
-    ImS16               BeginOrder;                      
-    ImS16               IndexDuringLayout;           
-    bool                WantClose;                   
-
-    ImGuiTabItem()      { memset(this, 0, sizeof(*this)); LastFrameVisible = LastFrameSelected = -1; NameOffset = BeginOrder = IndexDuringLayout = -1; }
-};
-
-struct ImGuiTabBar
-{
-    ImVector<ImGuiTabItem> Tabs;
-    ImGuiTabBarFlags    Flags;
-    ImGuiID             ID;                           
-    ImGuiID             SelectedTabId;            
-    ImGuiID             NextSelectedTabId;
-    ImGuiID             VisibleTabId;                       
-    int                 CurrFrameVisible;
-    int                 PrevFrameVisible;
-    ImRect              BarRect;
-    float               CurrTabsContentsHeight;
-    float               PrevTabsContentsHeight;           
-    float               WidthAllTabs;                   
-    float               WidthAllTabsIdeal;                
-    float               ScrollingAnim;
-    float               ScrollingTarget;
-    float               ScrollingTargetDistToVisibility;
-    float               ScrollingSpeed;
-    float               ScrollingRectMinX;
-    float               ScrollingRectMaxX;
-    ImGuiID             ReorderRequestTabId;
-    ImS8                ReorderRequestDir;
-    ImS8                BeginCount;
-    bool                WantLayout;
-    bool                VisibleTabWasSubmitted;
-    bool                TabsAddedNew;                               
-    ImS16               TabsActiveCount;              
-    ImS16               LastTabItemIdx;                  
-    float               ItemSpacingY;
-    ImVec2              FramePadding;                  
-    ImVec2              BackupCursorPos;
-    ImGuiTextBuffer     TabsNames;                         
-
-    ImGuiTabBar();
-    int                 GetTabOrder(const ImGuiTabItem* tab) const  { return Tabs.index_from_ptr(tab); }
-    const char*         GetTabName(const ImGuiTabItem* tab) const
-    {
-        IM_ASSERT(tab->NameOffset != -1 && (int)tab->NameOffset < TabsNames.Buf.Size);
-        return TabsNames.Buf.Data + tab->NameOffset;
-    }
-};
-
-#ifdef IMGUI_HAS_TABLE
-
-#define IM_COL32_DISABLE                IM_COL32(0,0,0,1)              
-#define IMGUI_TABLE_MAX_COLUMNS         64                                 
-#define IMGUI_TABLE_MAX_DRAW_CHANNELS   (4 + 64 * 2)          
-
-typedef ImS8 ImGuiTableColumnIdx;
-typedef ImU8 ImGuiTableDrawChannelIdx;
-
-struct ImGuiTableColumn
-{
-    ImGuiTableColumnFlags   Flags;                                       
-    float                   WidthGiven;                                                   
-    float                   MinX;                             
-    float                   MaxX;
-    float                   WidthRequest;                                      
-    float                   WidthAuto;                        
-    float                   StretchWeight;                             
-    float                   InitStretchWeightOrWidth;                    
-    ImRect                  ClipRect;                            
-    ImGuiID                 UserID;                              
-    float                   WorkMinX;                                      
-    float                   WorkMaxX;                               
-    float                   ItemWidth;                               
-    float                   ContentMaxXFrozen;                              
-    float                   ContentMaxXUnfrozen;
-    float                   ContentMaxXHeadersUsed;                                 
-    float                   ContentMaxXHeadersIdeal;
-    ImS16                   NameOffset;                         
-    ImGuiTableColumnIdx     DisplayOrder;                             
-    ImGuiTableColumnIdx     IndexWithinEnabledSet;                
-    ImGuiTableColumnIdx     PrevEnabledColumn;                          
-    ImGuiTableColumnIdx     NextEnabledColumn;                          
-    ImGuiTableColumnIdx     SortOrder;                                            
-    ImGuiTableDrawChannelIdx DrawChannelCurrent;               
-    ImGuiTableDrawChannelIdx DrawChannelFrozen;
-    ImGuiTableDrawChannelIdx DrawChannelUnfrozen;
-    bool                    IsEnabled;                                       
-    bool                    IsEnabledNextFrame;
-    bool                    IsVisibleX;                                  
-    bool                    IsVisibleY;
-    bool                    IsRequestOutput;                               
-    bool                    IsSkipItems;                                    
-    bool                    IsPreserveWidthAuto;
-    ImS8                    NavLayerCurrent;                    
-    ImU8                    AutoFitQueue;                               
-    ImU8                    CannotSkipItemsQueue;                       
-    ImU8                    SortDirection : 2;                 
-    ImU8                    SortDirectionsAvailCount : 2;           
-    ImU8                    SortDirectionsAvailMask : 4;           
-    ImU8                    SortDirectionsAvailList;               
-
-    ImGuiTableColumn()
-    {
-        memset(this, 0, sizeof(*this));
-        StretchWeight = WidthRequest = -1.0f;
-        NameOffset = -1;
-        DisplayOrder = IndexWithinEnabledSet = -1;
-        PrevEnabledColumn = NextEnabledColumn = -1;
-        SortOrder = -1;
-        SortDirection = ImGuiSortDirection_None;
-        DrawChannelCurrent = DrawChannelFrozen = DrawChannelUnfrozen = (ImU8)-1;
-    }
-};
-
-struct ImGuiTableCellData
-{
-    ImU32                       BgColor;      
-    ImGuiTableColumnIdx         Column;       
-};
-
-struct ImGuiTable
-{
-    ImGuiID                     ID;
-    ImGuiTableFlags             Flags;
-    void*                       RawData;                            
-    ImSpan<ImGuiTableColumn>    Columns;                       
-    ImSpan<ImGuiTableColumnIdx> DisplayOrderToIndex;                       
-    ImSpan<ImGuiTableCellData>  RowCellData;                          
-    ImU64                       EnabledMaskByDisplayOrder;       
-    ImU64                       EnabledMaskByIndex;                              
-    ImU64                       VisibleMaskByIndex;                        
-    ImU64                       RequestOutputMaskByIndex;               
-    ImGuiTableFlags             SettingsLoadedFlags;                          
-    int                         SettingsOffset;                
-    int                         LastFrameActive;
-    int                         ColumnsCount;                     
-    int                         CurrentRow;
-    int                         CurrentColumn;
-    ImS16                       InstanceCurrent;                                                  
-    ImS16                       InstanceInteracted;                      
-    float                       RowPosY1;
-    float                       RowPosY2;
-    float                       RowMinHeight;                   
-    float                       RowTextBaseline;
-    float                       RowIndentOffsetX;
-    ImGuiTableRowFlags          RowFlags : 16;                   
-    ImGuiTableRowFlags          LastRowFlags : 16;
-    int                         RowBgColorCounter;                                
-    ImU32                       RowBgColor[2];                    
-    ImU32                       BorderColorStrong;
-    ImU32                       BorderColorLight;
-    float                       BorderX1;
-    float                       BorderX2;
-    float                       HostIndentX;
-    float                       MinColumnWidth;
-    float                       OuterPaddingX;
-    float                       CellPaddingX;                   
-    float                       CellPaddingY;
-    float                       CellSpacingX1;                  
-    float                       CellSpacingX2;
-    float                       LastOuterHeight;                 
-    float                       LastFirstRowHeight;                
-    float                       InnerWidth;                               
-    float                       ColumnsGivenWidth;               
-    float                       ColumnsAutoFitWidth;                             
-    float                       ResizedColumnNextWidth;
-    float                       ResizeLockMinContentsX2;                        
-    float                       RefScale;                              
-    ImRect                      OuterRect;                                    
-    ImRect                      InnerRect;                              
-    ImRect                      WorkRect;
-    ImRect                      InnerClipRect;
-    ImRect                      BgClipRect;                          
-    ImRect                      Bg0ClipRectForDrawCmd;                           
-    ImRect                      Bg2ClipRectForDrawCmd;                                
-    ImRect                      HostClipRect;                                      
-    ImRect                      HostBackupWorkRect;                 
-    ImRect                      HostBackupParentWorkRect;           
-    ImRect                      HostBackupInnerClipRect;         
-    ImVec2                      HostBackupPrevLineSize;             
-    ImVec2                      HostBackupCurrLineSize;             
-    ImVec2                      HostBackupCursorMaxPos;             
-    ImVec2                      UserOuterSize;                  
-    ImVec1                      HostBackupColumnsOffset;            
-    float                       HostBackupItemWidth;                
-    int                         HostBackupItemWidthStackSize;        
-    ImGuiWindow*                OuterWindow;                     
-    ImGuiWindow*                InnerWindow;                           
-    ImGuiTextBuffer             ColumnsNames;                    
-    ImDrawListSplitter          DrawSplitter;                                      
-    ImGuiTableColumnSortSpecs   SortSpecsSingle;
-    ImVector<ImGuiTableColumnSortSpecs> SortSpecsMulti;              
-    ImGuiTableSortSpecs         SortSpecs;                             
-    ImGuiTableColumnIdx         SortSpecsCount;
-    ImGuiTableColumnIdx         ColumnsEnabledCount;              
-    ImGuiTableColumnIdx         ColumnsEnabledFixedCount;         
-    ImGuiTableColumnIdx         DeclColumnsCount;               
-    ImGuiTableColumnIdx         HoveredColumnBody;                              
-    ImGuiTableColumnIdx         HoveredColumnBorder;                  
-    ImGuiTableColumnIdx         AutoFitSingleColumn;              
-    ImGuiTableColumnIdx         ResizedColumn;                      
-    ImGuiTableColumnIdx         LastResizedColumn;                  
-    ImGuiTableColumnIdx         HeldHeaderColumn;                 
-    ImGuiTableColumnIdx         ReorderColumn;                     
-    ImGuiTableColumnIdx         ReorderColumnDir;              
-    ImGuiTableColumnIdx         LeftMostStretchedColumn;         
-    ImGuiTableColumnIdx         RightMostStretchedColumn;        
-    ImGuiTableColumnIdx         RightMostEnabledColumn;          
-    ImGuiTableColumnIdx         ContextPopupColumn;                      
-    ImGuiTableColumnIdx         FreezeRowsRequest;              
-    ImGuiTableColumnIdx         FreezeRowsCount;                         
-    ImGuiTableColumnIdx         FreezeColumnsRequest;           
-    ImGuiTableColumnIdx         FreezeColumnsCount;                      
-    ImGuiTableColumnIdx         RowCellDataCurrent;                 
-    ImGuiTableDrawChannelIdx    DummyDrawChannel;               
-    ImGuiTableDrawChannelIdx    Bg2DrawChannelCurrent;                     
-    ImGuiTableDrawChannelIdx    Bg2DrawChannelUnfrozen;
-    bool                        IsLayoutLocked;                        
-    bool                        IsInsideRow;                    
-    bool                        IsInitializing;
-    bool                        IsSortSpecsDirty;
-    bool                        IsUsingHeaders;                      
-    bool                        IsContextPopupOpen;                    
-    bool                        IsSettingsRequestLoad;
-    bool                        IsSettingsDirty;                          
-    bool                        IsDefaultDisplayOrder;                 
-    bool                        IsResetAllRequest;
-    bool                        IsResetDisplayOrderRequest;
-    bool                        IsUnfrozenRows;                     
-    bool                        IsDefaultSizingPolicy;                 
-    bool                        MemoryCompacted;
-    bool                        HostSkipItems;                               
-
-    IMGUI_API ImGuiTable()      { memset(this, 0, sizeof(*this)); LastFrameActive = -1; }
-    IMGUI_API ~ImGuiTable()     { IM_FREE(RawData); }
-};
-
-struct ImGuiTableColumnSettings
-{
-    float                   WidthOrWeight;
-    ImGuiID                 UserID;
-    ImGuiTableColumnIdx     Index;
-    ImGuiTableColumnIdx     DisplayOrder;
-    ImGuiTableColumnIdx     SortOrder;
-    ImU8                    SortDirection : 2;
-    ImU8                    IsEnabled : 1;     
-    ImU8                    IsStretch : 1;
-
-    ImGuiTableColumnSettings()
-    {
-        WidthOrWeight = 0.0f;
-        UserID = 0;
-        Index = -1;
-        DisplayOrder = SortOrder = -1;
-        SortDirection = ImGuiSortDirection_None;
-        IsEnabled = 1;
-        IsStretch = 0;
-    }
-};
-
-struct ImGuiTableSettings
-{
-    ImGuiID                     ID;                            
-    ImGuiTableFlags             SaveFlags;                              
-    float                       RefScale;                          
-    ImGuiTableColumnIdx         ColumnsCount;
-    ImGuiTableColumnIdx         ColumnsCountMax;                               
-    bool                        WantApply;                              
-
-    ImGuiTableSettings()        { memset(this, 0, sizeof(*this)); }
-    ImGuiTableColumnSettings*   GetColumnSettings()     { return (ImGuiTableColumnSettings*)(this + 1); }
-};
-
-#endif   
-
-namespace ImGui
-{
-    inline    ImGuiWindow*  GetCurrentWindowRead()      { ImGuiContext& g = *GImGui; return g.CurrentWindow; }
-    inline    ImGuiWindow*  GetCurrentWindow()          { ImGuiContext& g = *GImGui; g.CurrentWindow->WriteAccessed = true; return g.CurrentWindow; }
-    IMGUI_API ImGuiWindow*  FindWindowByID(ImGuiID id);
-    IMGUI_API ImGuiWindow*  FindWindowByName(const char* name);
-    IMGUI_API void          UpdateWindowParentAndRootLinks(ImGuiWindow* window, ImGuiWindowFlags flags, ImGuiWindow* parent_window);
-    IMGUI_API ImVec2        CalcWindowNextAutoFitSize(ImGuiWindow* window);
-    IMGUI_API bool          IsWindowChildOf(ImGuiWindow* window, ImGuiWindow* potential_parent);
-    IMGUI_API bool          IsWindowAbove(ImGuiWindow* potential_above, ImGuiWindow* potential_below);
-    IMGUI_API bool          IsWindowNavFocusable(ImGuiWindow* window);
-    IMGUI_API ImRect        GetWindowAllowedExtentRect(ImGuiWindow* window);
-    IMGUI_API void          SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond = 0);
-    IMGUI_API void          SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond = 0);
-    IMGUI_API void          SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond = 0);
-    IMGUI_API void          SetWindowHitTestHole(ImGuiWindow* window, const ImVec2& pos, const ImVec2& size);
-
-    IMGUI_API void          FocusWindow(ImGuiWindow* window);
-    IMGUI_API void          FocusTopMostWindowUnderOne(ImGuiWindow* under_this_window, ImGuiWindow* ignore_window);
-    IMGUI_API void          BringWindowToFocusFront(ImGuiWindow* window);
-    IMGUI_API void          BringWindowToDisplayFront(ImGuiWindow* window);
-    IMGUI_API void          BringWindowToDisplayBack(ImGuiWindow* window);
-
-    IMGUI_API void          SetCurrentFont(ImFont* font);
-    inline ImFont*          GetDefaultFont() { ImGuiContext& g = *GImGui; return g.IO.FontDefault ? g.IO.FontDefault : g.IO.Fonts->Fonts[0]; }
-    inline ImDrawList*      GetForegroundDrawList(ImGuiWindow* window) { IM_UNUSED(window); ImGuiContext& g = *GImGui; return &g.ForegroundDrawList; }             
-
-    IMGUI_API void          Initialize(ImGuiContext* context);
-    IMGUI_API void          Shutdown(ImGuiContext* context);                      
-
-    IMGUI_API void          UpdateHoveredWindowAndCaptureFlags();
-    IMGUI_API void          StartMouseMovingWindow(ImGuiWindow* window);
-    IMGUI_API void          UpdateMouseMovingWindowNewFrame();
-    IMGUI_API void          UpdateMouseMovingWindowEndFrame();
-
-    IMGUI_API ImGuiID       AddContextHook(ImGuiContext* context, const ImGuiContextHook* hook);
-    IMGUI_API void          RemoveContextHook(ImGuiContext* context, ImGuiID hook_to_remove);
-    IMGUI_API void          CallContextHooks(ImGuiContext* context, ImGuiContextHookType type);
-
-    IMGUI_API void                  MarkIniSettingsDirty();
-    IMGUI_API void                  MarkIniSettingsDirty(ImGuiWindow* window);
-    IMGUI_API void                  ClearIniSettings();
-    IMGUI_API ImGuiWindowSettings*  CreateNewWindowSettings(const char* name);
-    IMGUI_API ImGuiWindowSettings*  FindWindowSettings(ImGuiID id);
-    IMGUI_API ImGuiWindowSettings*  FindOrCreateWindowSettings(const char* name);
-    IMGUI_API ImGuiSettingsHandler* FindSettingsHandler(const char* type_name);
-
-    IMGUI_API void          SetNextWindowScroll(const ImVec2& scroll);         
-    IMGUI_API void          SetScrollX(ImGuiWindow* window, float scroll_x);
-    IMGUI_API void          SetScrollY(ImGuiWindow* window, float scroll_y);
-    IMGUI_API void          SetScrollFromPosX(ImGuiWindow* window, float local_x, float center_x_ratio);
-    IMGUI_API void          SetScrollFromPosY(ImGuiWindow* window, float local_y, float center_y_ratio);
-    IMGUI_API ImVec2        ScrollToBringRectIntoView(ImGuiWindow* window, const ImRect& item_rect);
-
-    inline ImGuiID          GetItemID()     { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.LastItemId; }             
-    inline ImGuiItemStatusFlags GetItemStatusFlags() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.LastItemStatusFlags; }
-    inline ImGuiID          GetActiveID()   { ImGuiContext& g = *GImGui; return g.ActiveId; }
-    inline ImGuiID          GetFocusID()    { ImGuiContext& g = *GImGui; return g.NavId; }
-    inline ImGuiItemFlags   GetItemsFlags() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.ItemFlags; }
-    IMGUI_API void          SetActiveID(ImGuiID id, ImGuiWindow* window);
-    IMGUI_API void          SetFocusID(ImGuiID id, ImGuiWindow* window);
-    IMGUI_API void          ClearActiveID();
-    IMGUI_API ImGuiID       GetHoveredID();
-    IMGUI_API void          SetHoveredID(ImGuiID id);
-    IMGUI_API void          KeepAliveID(ImGuiID id);
-    IMGUI_API void          MarkItemEdited(ImGuiID id);                 
-    IMGUI_API void          PushOverrideID(ImGuiID id);                       
-    IMGUI_API ImGuiID       GetIDWithSeed(const char* str_id_begin, const char* str_id_end, ImGuiID seed);
-
-    IMGUI_API void          ItemSize(const ImVec2& size, float text_baseline_y = -1.0f);
-    IMGUI_API void          ItemSize(const ImRect& bb, float text_baseline_y = -1.0f);
-    IMGUI_API bool          ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb = NULL);
-    IMGUI_API bool          ItemHoverable(const ImRect& bb, ImGuiID id);
-    IMGUI_API bool          IsClippedEx(const ImRect& bb, ImGuiID id, bool clip_even_when_logged);
-    IMGUI_API void          SetLastItemData(ImGuiWindow* window, ImGuiID item_id, ImGuiItemStatusFlags status_flags, const ImRect& item_rect);
-    IMGUI_API bool          FocusableItemRegister(ImGuiWindow* window, ImGuiID id);         
-    IMGUI_API void          FocusableItemUnregister(ImGuiWindow* window);
-    IMGUI_API ImVec2        CalcItemSize(ImVec2 size, float default_w, float default_h);
-    IMGUI_API float         CalcWrapWidthForPos(const ImVec2& pos, float wrap_pos_x);
-    IMGUI_API void          PushMultiItemsWidths(int components, float width_full);
-    IMGUI_API void          PushItemFlag(ImGuiItemFlags option, bool enabled);
-    IMGUI_API void          PopItemFlag();
-    IMGUI_API bool          IsItemToggledSelection();                                                        
-    IMGUI_API ImVec2        GetContentRegionMaxAbs();
-    IMGUI_API void          ShrinkWidths(ImGuiShrinkWidthItem* items, int count, float width_excess);
-
-    IMGUI_API void          LogBegin(ImGuiLogType type, int auto_open_depth);                             
-    IMGUI_API void          LogToBuffer(int auto_open_depth = -1);                           
-    IMGUI_API void          LogRenderedText(const ImVec2* ref_pos, const char* text, const char* text_end = NULL);
-    IMGUI_API void          LogSetNextTextDecoration(const char* prefix, const char* suffix);
-
-    IMGUI_API bool          BeginChildEx(const char* name, ImGuiID id, const ImVec2& size_arg, bool border, ImGuiWindowFlags flags);
-    IMGUI_API void          OpenPopupEx(ImGuiID id, ImGuiPopupFlags popup_flags = ImGuiPopupFlags_None);
-    IMGUI_API void          ClosePopupToLevel(int remaining, bool restore_focus_to_window_under_popup);
-    IMGUI_API void          ClosePopupsOverWindow(ImGuiWindow* ref_window, bool restore_focus_to_window_under_popup);
-    IMGUI_API bool          IsPopupOpen(ImGuiID id, ImGuiPopupFlags popup_flags);
-    IMGUI_API bool          BeginPopupEx(ImGuiID id, ImGuiWindowFlags extra_flags);
-    IMGUI_API void          BeginTooltipEx(ImGuiWindowFlags extra_flags, ImGuiTooltipFlags tooltip_flags);
-    IMGUI_API ImGuiWindow*  GetTopMostPopupModal();
-    IMGUI_API ImVec2        FindBestWindowPosForPopup(ImGuiWindow* window);
-    IMGUI_API ImVec2        FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& size, ImGuiDir* last_dir, const ImRect& r_outer, const ImRect& r_avoid, ImGuiPopupPositionPolicy policy);
-
-    IMGUI_API void          NavInitWindow(ImGuiWindow* window, bool force_reinit);
-    IMGUI_API bool          NavMoveRequestButNoResultYet();
-    IMGUI_API void          NavMoveRequestCancel();
-    IMGUI_API void          NavMoveRequestForward(ImGuiDir move_dir, ImGuiDir clip_dir, const ImRect& bb_rel, ImGuiNavMoveFlags move_flags);
-    IMGUI_API void          NavMoveRequestTryWrapping(ImGuiWindow* window, ImGuiNavMoveFlags move_flags);
-    IMGUI_API float         GetNavInputAmount(ImGuiNavInput n, ImGuiInputReadMode mode);
-    IMGUI_API ImVec2        GetNavInputAmount2d(ImGuiNavDirSourceFlags dir_sources, ImGuiInputReadMode mode, float slow_factor = 0.0f, float fast_factor = 0.0f);
-    IMGUI_API int           CalcTypematicRepeatAmount(float t0, float t1, float repeat_delay, float repeat_rate);
-    IMGUI_API void          ActivateItem(ImGuiID id);                              
-    IMGUI_API void          SetNavID(ImGuiID id, int nav_layer, ImGuiID focus_scope_id);
-    IMGUI_API void          SetNavIDWithRectRel(ImGuiID id, int nav_layer, ImGuiID focus_scope_id, const ImRect& rect_rel);
-
-    IMGUI_API void          PushFocusScope(ImGuiID id);
-    IMGUI_API void          PopFocusScope();
-    inline ImGuiID          GetFocusedFocusScope()          { ImGuiContext& g = *GImGui; return g.NavFocusScopeId; }                                  
-    inline ImGuiID          GetFocusScope()                 { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.NavFocusScopeIdCurrent; }            
-
-    IMGUI_API void          SetItemUsingMouseWheel();
-    inline bool             IsActiveIdUsingNavDir(ImGuiDir dir)                         { ImGuiContext& g = *GImGui; return (g.ActiveIdUsingNavDirMask & (1 << dir)) != 0; }
-    inline bool             IsActiveIdUsingNavInput(ImGuiNavInput input)                { ImGuiContext& g = *GImGui; return (g.ActiveIdUsingNavInputMask & (1 << input)) != 0; }
-    inline bool             IsActiveIdUsingKey(ImGuiKey key)                            { ImGuiContext& g = *GImGui; IM_ASSERT(key < 64); return (g.ActiveIdUsingKeyInputMask & ((ImU64)1 << key)) != 0; }
-    IMGUI_API bool          IsMouseDragPastThreshold(ImGuiMouseButton button, float lock_threshold = -1.0f);
-    inline bool             IsKeyPressedMap(ImGuiKey key, bool repeat = true)           { ImGuiContext& g = *GImGui; const int key_index = g.IO.KeyMap[key]; return (key_index >= 0) ? IsKeyPressed(key_index, repeat) : false; }
-    inline bool             IsNavInputDown(ImGuiNavInput n)                             { ImGuiContext& g = *GImGui; return g.IO.NavInputs[n] > 0.0f; }
-    inline bool             IsNavInputTest(ImGuiNavInput n, ImGuiInputReadMode rm)      { return (GetNavInputAmount(n, rm) > 0.0f); }
-    IMGUI_API ImGuiKeyModFlags GetMergedKeyModFlags();
-
-    IMGUI_API bool          BeginDragDropTargetCustom(const ImRect& bb, ImGuiID id);
-    IMGUI_API void          ClearDragDrop();
-    IMGUI_API bool          IsDragDropPayloadBeingAccepted();
-
-    IMGUI_API void          SetWindowClipRectBeforeSetChannel(ImGuiWindow* window, const ImRect& clip_rect);
-    IMGUI_API void          BeginColumns(const char* str_id, int count, ImGuiOldColumnFlags flags = 0);                
-    IMGUI_API void          EndColumns();                                                                 
-    IMGUI_API void          PushColumnClipRect(int column_index);
-    IMGUI_API void          PushColumnsBackground();
-    IMGUI_API void          PopColumnsBackground();
-    IMGUI_API ImGuiID       GetColumnsID(const char* str_id, int count);
-    IMGUI_API ImGuiOldColumns* FindOrCreateColumns(ImGuiWindow* window, ImGuiID id);
-    IMGUI_API float         GetColumnOffsetFromNorm(const ImGuiOldColumns* columns, float offset_norm);
-    IMGUI_API float         GetColumnNormFromOffset(const ImGuiOldColumns* columns, float offset);
-
-    IMGUI_API void          TableOpenContextMenu(int column_n = -1);
-    IMGUI_API void          TableSetColumnEnabled(int column_n, bool enabled);
-    IMGUI_API void          TableSetColumnWidth(int column_n, float width);
-    IMGUI_API void          TableSetColumnSortDirection(int column_n, ImGuiSortDirection sort_direction, bool append_to_sort_specs);
-    IMGUI_API int           TableGetHoveredColumn();                               
-    IMGUI_API float         TableGetHeaderRowHeight();
-    IMGUI_API void          TablePushBackgroundChannel();
-    IMGUI_API void          TablePopBackgroundChannel();
-
-    IMGUI_API ImGuiTable*   TableFindByID(ImGuiID id);
-    IMGUI_API bool          BeginTableEx(const char* name, ImGuiID id, int columns_count, ImGuiTableFlags flags = 0, const ImVec2& outer_size = ImVec2(0, 0), float inner_width = 0.0f);
-    IMGUI_API void          TableBeginInitMemory(ImGuiTable* table, int columns_count);
-    IMGUI_API void          TableBeginApplyRequests(ImGuiTable* table);
-    IMGUI_API void          TableSetupDrawChannels(ImGuiTable* table);
-    IMGUI_API void          TableUpdateLayout(ImGuiTable* table);
-    IMGUI_API void          TableUpdateBorders(ImGuiTable* table);
-    IMGUI_API void          TableUpdateColumnsWeightFromWidth(ImGuiTable* table);
-    IMGUI_API void          TableDrawBorders(ImGuiTable* table);
-    IMGUI_API void          TableDrawContextMenu(ImGuiTable* table);
-    IMGUI_API void          TableMergeDrawChannels(ImGuiTable* table);
-    IMGUI_API void          TableSortSpecsSanitize(ImGuiTable* table);
-    IMGUI_API void          TableSortSpecsBuild(ImGuiTable* table);
-    IMGUI_API ImGuiSortDirection TableGetColumnNextSortDirection(ImGuiTableColumn* column);
-    IMGUI_API void          TableFixColumnSortDirection(ImGuiTable* table, ImGuiTableColumn* column);
-    IMGUI_API float         TableGetColumnWidthAuto(ImGuiTable* table, ImGuiTableColumn* column);
-    IMGUI_API void          TableBeginRow(ImGuiTable* table);
-    IMGUI_API void          TableEndRow(ImGuiTable* table);
-    IMGUI_API void          TableBeginCell(ImGuiTable* table, int column_n);
-    IMGUI_API void          TableEndCell(ImGuiTable* table);
-    IMGUI_API ImRect        TableGetCellBgRect(const ImGuiTable* table, int column_n);
-    IMGUI_API const char*   TableGetColumnName(const ImGuiTable* table, int column_n);
-    IMGUI_API ImGuiID       TableGetColumnResizeID(const ImGuiTable* table, int column_n, int instance_no = 0);
-    IMGUI_API float         TableGetMaxColumnWidth(const ImGuiTable* table, int column_n);
-    IMGUI_API void          TableSetColumnWidthAutoSingle(ImGuiTable* table, int column_n);
-    IMGUI_API void          TableSetColumnWidthAutoAll(ImGuiTable* table);
-    IMGUI_API void          TableRemove(ImGuiTable* table);
-    IMGUI_API void          TableGcCompactTransientBuffers(ImGuiTable* table);
-    IMGUI_API void          TableGcCompactSettings();
-
-    IMGUI_API void                  TableLoadSettings(ImGuiTable* table);
-    IMGUI_API void                  TableSaveSettings(ImGuiTable* table);
-    IMGUI_API void                  TableResetSettings(ImGuiTable* table);
-    IMGUI_API ImGuiTableSettings*   TableGetBoundSettings(ImGuiTable* table);
-    IMGUI_API void                  TableSettingsInstallHandler(ImGuiContext* context);
-    IMGUI_API ImGuiTableSettings*   TableSettingsCreate(ImGuiID id, int columns_count);
-    IMGUI_API ImGuiTableSettings*   TableSettingsFindByID(ImGuiID id);
-
-    IMGUI_API bool          BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& bb, ImGuiTabBarFlags flags);
-    IMGUI_API ImGuiTabItem* TabBarFindTabByID(ImGuiTabBar* tab_bar, ImGuiID tab_id);
-    IMGUI_API void          TabBarRemoveTab(ImGuiTabBar* tab_bar, ImGuiID tab_id);
-    IMGUI_API void          TabBarCloseTab(ImGuiTabBar* tab_bar, ImGuiTabItem* tab);
-    IMGUI_API void          TabBarQueueReorder(ImGuiTabBar* tab_bar, const ImGuiTabItem* tab, int dir);
-    IMGUI_API bool          TabBarProcessReorder(ImGuiTabBar* tab_bar);
-    IMGUI_API bool          TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, ImGuiTabItemFlags flags);
-    IMGUI_API ImVec2        TabItemCalcSize(const char* label, bool has_close_button);
-    IMGUI_API void          TabItemBackground(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImU32 col);
-    IMGUI_API void          TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImVec2 frame_padding, const char* label, ImGuiID tab_id, ImGuiID close_button_id, bool is_contents_visible, bool* out_just_closed, bool* out_text_clipped, bool tabActive = 1);
-
-    IMGUI_API void          RenderText(ImVec2 pos, const char* text, const char* text_end = NULL, bool hide_text_after_hash = true, ImU32 customcol = 0);
-    IMGUI_API void          RenderTextWrapped(ImVec2 pos, const char* text, const char* text_end, float wrap_width);
-    IMGUI_API void          RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align = ImVec2(0, 0), const ImRect* clip_rect = NULL);
-    IMGUI_API void          RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align, const ImRect* clip_rect, ImColor customcolor);
-
-    IMGUI_API void          RenderTextClippedEx(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align = ImVec2(0, 0), const ImRect* clip_rect = NULL, ImU32 Color = 0);
-    IMGUI_API void          RenderTextEllipsis(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, float clip_max_x, float ellipsis_max_x, const char* text, const char* text_end, const ImVec2* text_size_if_known, ImU32 Color = 0);
-    IMGUI_API void          RenderFrame(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, bool border = true, float rounding = 0.0f);
-    IMGUI_API void          RenderFrameBorder(ImVec2 p_min, ImVec2 p_max, float rounding = 0.0f);
-    IMGUI_API void          RenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list, ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, float grid_step, ImVec2 grid_off, float rounding = 0.0f, int rounding_corners_flags = ~0);
-    IMGUI_API void          RenderNavHighlight(const ImRect& bb, ImGuiID id, ImGuiNavHighlightFlags flags = ImGuiNavHighlightFlags_TypeDefault);   
-    IMGUI_API const char*   FindRenderedTextEnd(const char* text, const char* text_end = NULL);           
-
-    IMGUI_API void          RenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float scale = 1.0f);
-    IMGUI_API void          RenderBullet(ImDrawList* draw_list, ImVec2 pos, ImU32 col);
-    IMGUI_API void          RenderCheckMark(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz);
-    IMGUI_API void          RenderMouseCursor(ImDrawList* draw_list, ImVec2 pos, float scale, ImGuiMouseCursor mouse_cursor, ImU32 col_fill, ImU32 col_border, ImU32 col_shadow);
-    IMGUI_API void          RenderArrowPointingAt(ImDrawList* draw_list, ImVec2 pos, ImVec2 half_sz, ImGuiDir direction, ImU32 col);
-    IMGUI_API void          RenderRectFilledRangeH(ImDrawList* draw_list, const ImRect& rect, ImU32 col, float x_start_norm, float x_end_norm, float rounding);
-    IMGUI_API void          RenderRectFilledWithHole(ImDrawList* draw_list, ImRect outer, ImRect inner, ImU32 col, float rounding);
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-    inline void RenderArrow(ImVec2 pos, ImGuiDir dir, float scale=1.0f) { ImGuiWindow* window = GetCurrentWindow(); RenderArrow(window->DrawList, pos, GetColorU32(ImGuiCol_Text), dir, scale); }
-    inline void RenderBullet(ImVec2 pos)                                { ImGuiWindow* window = GetCurrentWindow(); RenderBullet(window->DrawList, pos, GetColorU32(ImGuiCol_Text)); }
-#endif
-
-    IMGUI_API void          TextEx(const char* text, const char* text_end = NULL, ImGuiTextFlags flags = 0);
-    IMGUI_API bool          ButtonEx(const char* label, const ImVec2& size_arg = ImVec2(0, 0), ImGuiButtonFlags flags = 0);
-    IMGUI_API bool          CloseButton(ImGuiID id, const ImVec2& pos);
-    IMGUI_API bool          CollapseButton(ImGuiID id, const ImVec2& pos);
-    IMGUI_API bool          ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size_arg, ImGuiButtonFlags flags = 0);
-    IMGUI_API void          Scrollbar(ImGuiAxis axis);
-    IMGUI_API bool          ScrollbarEx(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float* p_scroll_v, float avail_v, float contents_v, ImDrawCornerFlags rounding_corners);
-    IMGUI_API bool          ImageButtonEx(ImGuiID id, ImTextureID texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, const ImVec2& padding, const ImVec4& bg_col, const ImVec4& tint_col);
-    IMGUI_API ImRect        GetWindowScrollbarRect(ImGuiWindow* window, ImGuiAxis axis);
-    IMGUI_API ImGuiID       GetWindowScrollbarID(ImGuiWindow* window, ImGuiAxis axis);
-    IMGUI_API ImGuiID       GetWindowResizeID(ImGuiWindow* window, int n);     
-    IMGUI_API void          SeparatorEx(ImGuiSeparatorFlags flags);
-    IMGUI_API bool          CheckboxFlags(const char* label, ImS64* flags, ImS64 flags_value);
-    IMGUI_API bool          CheckboxFlags(const char* label, ImU64* flags, ImU64 flags_value);
-
-    IMGUI_API bool          ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool* out_held, ImGuiButtonFlags flags = 0);
-    IMGUI_API bool          DragBehavior(ImGuiID id, ImGuiDataType data_type, void* p_v, float v_speed, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags);
-    IMGUI_API bool          SliderBehavior(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, void* p_v, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags, ImRect* out_grab_bb);
-    IMGUI_API bool          SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float* size1, float* size2, float min_size1, float min_size2, float hover_extend = 0.0f, float hover_visibility_delay = 0.0f);
-    IMGUI_API bool          TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* label, const char* label_end = NULL);
-    IMGUI_API bool          TreeNodeBehaviorIsOpen(ImGuiID id, ImGuiTreeNodeFlags flags = 0);                                
-    IMGUI_API void          TreePushOverrideID(ImGuiID id);
-
-    template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API float ScaleRatioFromValueT(ImGuiDataType data_type, T v, T v_min, T v_max, bool is_logarithmic, float logarithmic_zero_epsilon, float zero_deadzone_size);
-    template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API T     ScaleValueFromRatioT(ImGuiDataType data_type, float t, T v_min, T v_max, bool is_logarithmic, float logarithmic_zero_epsilon, float zero_deadzone_size);
-    template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API bool  DragBehaviorT(ImGuiDataType data_type, T* v, float v_speed, T v_min, T v_max, const char* format, ImGuiSliderFlags flags);
-    template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API bool  SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, T* v, T v_min, T v_max, const char* format, ImGuiSliderFlags flags, ImRect* out_grab_bb);
-    template<typename T, typename SIGNED_T>                     IMGUI_API T     RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, T v);
-    template<typename T>                                        IMGUI_API bool  CheckboxFlagsT(const char* label, T* flags, T flags_value);
-
-    IMGUI_API const ImGuiDataTypeInfo*  DataTypeGetInfo(ImGuiDataType data_type);
-    IMGUI_API int           DataTypeFormatString(char* buf, int buf_size, ImGuiDataType data_type, const void* p_data, const char* format);
-    IMGUI_API void          DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, const void* arg_1, const void* arg_2);
-    IMGUI_API bool          DataTypeApplyOpFromText(const char* buf, const char* initial_value_buf, ImGuiDataType data_type, void* p_data, const char* format);
-    IMGUI_API int           DataTypeCompare(ImGuiDataType data_type, const void* arg_1, const void* arg_2);
-    IMGUI_API bool          DataTypeClamp(ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max);
-
-    IMGUI_API bool          InputTextEx(const char* label, const char* hint, char* buf, int buf_size, const ImVec2& size_arg, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
-    IMGUI_API bool          TempInputText(const ImRect& bb, ImGuiID id, const char* label, char* buf, int buf_size, ImGuiInputTextFlags flags);
-    IMGUI_API bool          TempInputScalar(const ImRect& bb, ImGuiID id, const char* label, ImGuiDataType data_type, void* p_data, const char* format, const void* p_clamp_min = NULL, const void* p_clamp_max = NULL);
-    inline bool             TempInputIsActive(ImGuiID id)       { ImGuiContext& g = *GImGui; return (g.ActiveId == id && g.TempInputId == id); }
-    inline ImGuiInputTextState* GetInputTextState(ImGuiID id)   { ImGuiContext& g = *GImGui; return (g.InputTextState.ID == id) ? &g.InputTextState : NULL; }       
-
-    IMGUI_API void          ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags flags);
-    IMGUI_API void          ColorEditOptionsPopup(const float* col, ImGuiColorEditFlags flags);
-    IMGUI_API void          ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags flags);
-
-    IMGUI_API int           PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size);
-
-    IMGUI_API void          ShadeVertsLinearColorGradientKeepAlpha(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, ImVec2 gradient_p0, ImVec2 gradient_p1, ImU32 col0, ImU32 col1);
-    IMGUI_API void          ShadeVertsLinearUV(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, bool clamp);
-
-    IMGUI_API void          GcCompactTransientMiscBuffers();
-    IMGUI_API void          GcCompactTransientWindowBuffers(ImGuiWindow* window);
-    IMGUI_API void          GcAwakeTransientWindowBuffers(ImGuiWindow* window);
-
-    IMGUI_API void          ErrorCheckEndFrameRecover(ImGuiErrorLogCallback log_callback, void* user_data = NULL);
-    inline void             DebugDrawItemRect(ImU32 col = IM_COL32(255,0,0,255))    { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; GetForegroundDrawList(window)->AddRect(window->DC.LastItemRect.Min, window->DC.LastItemRect.Max, col); }
-    inline void             DebugStartItemPicker()                                  { ImGuiContext& g = *GImGui; g.DebugItemPickerActive = true; }
-
-    IMGUI_API void          DebugNodeColumns(ImGuiOldColumns* columns);
-    IMGUI_API void          DebugNodeDrawList(ImGuiWindow* window, const ImDrawList* draw_list, const char* label);
-    IMGUI_API void          DebugNodeDrawCmdShowMeshAndBoundingBox(ImGuiWindow* window, const ImDrawList* draw_list, const ImDrawCmd* draw_cmd, bool show_mesh, bool show_aabb);
-    IMGUI_API void          DebugNodeStorage(ImGuiStorage* storage, const char* label);
-    IMGUI_API void          DebugNodeTabBar(ImGuiTabBar* tab_bar, const char* label);
-    IMGUI_API void          DebugNodeTable(ImGuiTable* table);
-    IMGUI_API void          DebugNodeTableSettings(ImGuiTableSettings* settings);
-    IMGUI_API void          DebugNodeWindow(ImGuiWindow* window, const char* label);
-    IMGUI_API void          DebugNodeWindowSettings(ImGuiWindowSettings* settings);
-    IMGUI_API void          DebugNodeWindowsList(ImVector<ImGuiWindow*>* windows, const char* label);
-
-}   
-
-
-struct ImFontBuilderIO
-{
-    bool    (*FontBuilder_Build)(ImFontAtlas* atlas);
-};
-
-IMGUI_API const ImFontBuilderIO* ImFontAtlasGetBuilderForStbTruetype();
-IMGUI_API void      ImFontAtlasBuildInit(ImFontAtlas* atlas);
-IMGUI_API void      ImFontAtlasBuildSetupFont(ImFontAtlas* atlas, ImFont* font, ImFontConfig* font_config, float ascent, float descent);
-IMGUI_API void      ImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas, void* stbrp_context_opaque);
-IMGUI_API void      ImFontAtlasBuildFinish(ImFontAtlas* atlas);
-IMGUI_API void      ImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas, int x, int y, int w, int h, const char* in_str, char in_marker_char, unsigned char in_marker_pixel_value);
-IMGUI_API void      ImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas, int x, int y, int w, int h, const char* in_str, char in_marker_char, unsigned int in_marker_pixel_value);
-IMGUI_API void      ImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256], float in_multiply_factor);
-IMGUI_API void      ImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256], unsigned char* pixels, int x, int y, int w, int h, int stride);
-
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-extern void                 ImGuiTestEngineHook_ItemAdd(ImGuiContext* ctx, const ImRect& bb, ImGuiID id);
-extern void                 ImGuiTestEngineHook_ItemInfo(ImGuiContext* ctx, ImGuiID id, const char* label, ImGuiItemStatusFlags flags);
-extern void                 ImGuiTestEngineHook_IdInfo(ImGuiContext* ctx, ImGuiDataType data_type, ImGuiID id, const void* data_id);
-extern void                 ImGuiTestEngineHook_IdInfo(ImGuiContext* ctx, ImGuiDataType data_type, ImGuiID id, const void* data_id, const void* data_id_end);
-extern void                 ImGuiTestEngineHook_Log(ImGuiContext* ctx, const char* fmt, ...);
-#define IMGUI_TEST_ENGINE_ITEM_ADD(_BB,_ID)                 if (g.TestEngineHookItems) ImGuiTestEngineHook_ItemAdd(&g, _BB, _ID)                   
-#define IMGUI_TEST_ENGINE_ITEM_INFO(_ID,_LABEL,_FLAGS)      if (g.TestEngineHookItems) ImGuiTestEngineHook_ItemInfo(&g, _ID, _LABEL, _FLAGS)          
-#define IMGUI_TEST_ENGINE_LOG(_FMT,...)                     if (g.TestEngineHookItems) ImGuiTestEngineHook_Log(&g, _FMT, __VA_ARGS__)                   
-#define IMGUI_TEST_ENGINE_ID_INFO(_ID,_TYPE,_DATA)          if (g.TestEngineHookIdInfo == id) ImGuiTestEngineHook_IdInfo(&g, _TYPE, _ID, (const void*)(_DATA));
-#define IMGUI_TEST_ENGINE_ID_INFO2(_ID,_TYPE,_DATA,_DATA2)  if (g.TestEngineHookIdInfo == id) ImGuiTestEngineHook_IdInfo(&g, _TYPE, _ID, (const void*)(_DATA), (const void*)(_DATA2));
-#else
-#define IMGUI_TEST_ENGINE_ITEM_ADD(_BB,_ID)                 do { } while (0)
-#define IMGUI_TEST_ENGINE_ITEM_INFO(_ID,_LABEL,_FLAGS)      do { } while (0)
-#define IMGUI_TEST_ENGINE_LOG(_FMT,...)                     do { } while (0)
-#define IMGUI_TEST_ENGINE_ID_INFO(_ID,_TYPE,_DATA)          do { } while (0)
-#define IMGUI_TEST_ENGINE_ID_INFO2(_ID,_TYPE,_DATA,_DATA2)  do { } while (0)
-#endif
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
-
-#endif   
diff --git a/SpyCustom/imgui/imgui_tables.cpp b/SpyCustom/imgui/imgui_tables.cpp
deleted file mode 100644
index b8cff7c..0000000
--- a/SpyCustom/imgui/imgui_tables.cpp
+++ /dev/null
@@ -1,3073 +0,0 @@
-
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "imgui.h"
-#ifndef IMGUI_DISABLE
-
-#ifndef IMGUI_DEFINE_MATH_OPERATORS
-#define IMGUI_DEFINE_MATH_OPERATORS
-#endif
-#include "imgui_internal.h"
-
-#if defined(_MSC_VER) && _MSC_VER <= 1500     
-#include <stddef.h>      
-#else
-#include <stdint.h>      
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (disable: 4127)         
-#pragma warning (disable: 4996)                  
-#if defined(_MSC_VER) && _MSC_VER >= 1922      
-#pragma warning (disable: 5054)             
-#endif
-#endif
-
-#if defined(__clang__)
-#if __has_warning("-Wunknown-warning-option")
-#pragma clang diagnostic ignored "-Wunknown-warning-option"                                                             
-#endif
-#pragma clang diagnostic ignored "-Wunknown-pragmas"                     
-#pragma clang diagnostic ignored "-Wold-style-cast"                                                       
-#pragma clang diagnostic ignored "-Wfloat-equal"                                         
-#pragma clang diagnostic ignored "-Wformat-nonliteral"                                                
-#pragma clang diagnostic ignored "-Wsign-conversion"                     
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"                                    
-#pragma clang diagnostic ignored "-Wdouble-promotion"                                            
-#pragma clang diagnostic ignored "-Wenum-enum-conversion"                     
-#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion"            
-#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion"            
-#elif defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wpragmas"                                  
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"                          
-#pragma GCC diagnostic ignored "-Wclass-memaccess"                                      
-#endif
-
-static const int TABLE_DRAW_CHANNEL_BG0 = 0;
-static const int TABLE_DRAW_CHANNEL_BG2_FROZEN = 1;
-static const int TABLE_DRAW_CHANNEL_NOCLIP = 2;                              
-static const float TABLE_BORDER_SIZE                     = 1.0f;               
-static const float TABLE_RESIZE_SEPARATOR_HALF_THICKNESS = 4.0f;        
-static const float TABLE_RESIZE_SEPARATOR_FEEDBACK_TIMER = 0.06f;                  
-
-inline ImGuiTableFlags TableFixFlags(ImGuiTableFlags flags, ImGuiWindow* outer_window)
-{
-    if ((flags & ImGuiTableFlags_SizingMask_) == 0)
-        flags |= ((flags & ImGuiTableFlags_ScrollX) || (outer_window->Flags & ImGuiWindowFlags_AlwaysAutoResize)) ? ImGuiTableFlags_SizingFixedFit : ImGuiTableFlags_SizingStretchSame;
-
-    if ((flags & ImGuiTableFlags_SizingMask_) == ImGuiTableFlags_SizingFixedSame)
-        flags |= ImGuiTableFlags_NoKeepColumnsVisible;
-
-    if (flags & ImGuiTableFlags_Resizable)
-        flags |= ImGuiTableFlags_BordersInnerV;
-
-    if (flags & (ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY))
-        flags &= ~(ImGuiTableFlags_NoHostExtendX | ImGuiTableFlags_NoHostExtendY);
-
-    if (flags & ImGuiTableFlags_NoBordersInBodyUntilResize)
-        flags &= ~ImGuiTableFlags_NoBordersInBody;
-
-    if ((flags & (ImGuiTableFlags_Resizable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Sortable)) == 0)
-        flags |= ImGuiTableFlags_NoSavedSettings;
-
-#ifdef IMGUI_HAS_DOCK
-    ImGuiWindow* window_for_settings = outer_window->RootWindowDockStop;
-#else
-    ImGuiWindow* window_for_settings = outer_window->RootWindow;
-#endif
-    if (window_for_settings->Flags & ImGuiWindowFlags_NoSavedSettings)
-        flags |= ImGuiTableFlags_NoSavedSettings;
-
-    return flags;
-}
-
-ImGuiTable* ImGui::TableFindByID(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    return g.Tables.GetByKey(id);
-}
-
-bool    ImGui::BeginTable(const char* str_id, int columns_count, ImGuiTableFlags flags, const ImVec2& outer_size, float inner_width)
-{
-    ImGuiID id = GetID(str_id);
-    return BeginTableEx(str_id, id, columns_count, flags, outer_size, inner_width);
-}
-
-bool    ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImGuiTableFlags flags, const ImVec2& outer_size, float inner_width)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* outer_window = GetCurrentWindow();
-    if (outer_window->SkipItems)                  
-        return false;
-
-    IM_ASSERT(columns_count > 0 && columns_count <= IMGUI_TABLE_MAX_COLUMNS && "Only 1..64 columns allowed!");
-    if (flags & ImGuiTableFlags_ScrollX)
-        IM_ASSERT(inner_width >= 0.0f);
-
-    const bool use_child_window = (flags & (ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY)) != 0;
-    const ImVec2 avail_size = GetContentRegionAvail();
-    ImVec2 actual_outer_size = CalcItemSize(outer_size, ImMax(avail_size.x, 1.0f), use_child_window ? ImMax(avail_size.y, 1.0f) : 0.0f);
-    ImRect outer_rect(outer_window->DC.CursorPos, outer_window->DC.CursorPos + actual_outer_size);
-    if (use_child_window && IsClippedEx(outer_rect, 0, false))
-    {
-        ItemSize(outer_rect);
-        return false;
-    }
-
-    ImGuiTable* table = g.Tables.GetOrAddByKey(id);
-    const int instance_no = (table->LastFrameActive != g.FrameCount) ? 0 : table->InstanceCurrent + 1;
-    const ImGuiID instance_id = id + instance_no;
-    const ImGuiTableFlags table_last_flags = table->Flags;
-    if (instance_no > 0)
-        IM_ASSERT(table->ColumnsCount == columns_count && "BeginTable(): Cannot change columns count mid-frame while preserving same ID");
-
-    table->IsDefaultSizingPolicy = (flags & ImGuiTableFlags_SizingMask_) == 0;
-    flags = TableFixFlags(flags, outer_window);
-
-    table->ID = id;
-    table->Flags = flags;
-    table->InstanceCurrent = (ImS16)instance_no;
-    table->LastFrameActive = g.FrameCount;
-    table->OuterWindow = table->InnerWindow = outer_window;
-    table->ColumnsCount = columns_count;
-    table->IsLayoutLocked = false;
-    table->InnerWidth = inner_width;
-    table->UserOuterSize = outer_size;
-
-    if (use_child_window)
-    {
-        ImVec2 override_content_size(FLT_MAX, FLT_MAX);
-        if ((flags & ImGuiTableFlags_ScrollX) && !(flags & ImGuiTableFlags_ScrollY))
-            override_content_size.y = FLT_MIN;
-
-        if ((flags & ImGuiTableFlags_ScrollX) && inner_width > 0.0f)
-            override_content_size.x = inner_width;
-
-        if (override_content_size.x != FLT_MAX || override_content_size.y != FLT_MAX)
-            SetNextWindowContentSize(ImVec2(override_content_size.x != FLT_MAX ? override_content_size.x : 0.0f, override_content_size.y != FLT_MAX ? override_content_size.y : 0.0f));
-
-        if ((table_last_flags & (ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY)) == 0)
-            SetNextWindowScroll(ImVec2(0.0f, 0.0f));
-
-        ImGuiWindowFlags child_flags = (flags & ImGuiTableFlags_ScrollX) ? ImGuiWindowFlags_HorizontalScrollbar : ImGuiWindowFlags_None;
-        BeginChildEx(name, instance_id, outer_rect.GetSize(), false, child_flags);
-        table->InnerWindow = g.CurrentWindow;
-        table->WorkRect = table->InnerWindow->WorkRect;
-        table->OuterRect = table->InnerWindow->Rect();
-        table->InnerRect = table->InnerWindow->InnerRect;
-        IM_ASSERT(table->InnerWindow->WindowPadding.x == 0.0f && table->InnerWindow->WindowPadding.y == 0.0f && table->InnerWindow->WindowBorderSize == 0.0f);
-    }
-    else
-    {
-        table->WorkRect = table->OuterRect = table->InnerRect = outer_rect;
-    }
-
-    PushOverrideID(instance_id);
-
-    ImGuiWindow* inner_window = table->InnerWindow;
-    table->HostIndentX = inner_window->DC.Indent.x;
-    table->HostClipRect = inner_window->ClipRect;
-    table->HostSkipItems = inner_window->SkipItems;
-    table->HostBackupWorkRect = inner_window->WorkRect;
-    table->HostBackupParentWorkRect = inner_window->ParentWorkRect;
-    table->HostBackupColumnsOffset = outer_window->DC.ColumnsOffset;
-    table->HostBackupPrevLineSize = inner_window->DC.PrevLineSize;
-    table->HostBackupCurrLineSize = inner_window->DC.CurrLineSize;
-    table->HostBackupCursorMaxPos = inner_window->DC.CursorMaxPos;
-    table->HostBackupItemWidth = outer_window->DC.ItemWidth;
-    table->HostBackupItemWidthStackSize = outer_window->DC.ItemWidthStack.Size;
-    inner_window->DC.PrevLineSize = inner_window->DC.CurrLineSize = ImVec2(0.0f, 0.0f);
-
-    const bool pad_outer_x = (flags & ImGuiTableFlags_NoPadOuterX) ? false : (flags & ImGuiTableFlags_PadOuterX) ? true : (flags & ImGuiTableFlags_BordersOuterV) != 0;
-    const bool pad_inner_x = (flags & ImGuiTableFlags_NoPadInnerX) ? false : true;
-    const float inner_spacing_for_border = (flags & ImGuiTableFlags_BordersInnerV) ? TABLE_BORDER_SIZE : 0.0f;
-    const float inner_spacing_explicit = (pad_inner_x && (flags & ImGuiTableFlags_BordersInnerV) == 0) ? g.Style.CellPadding.x : 0.0f;
-    const float inner_padding_explicit = (pad_inner_x && (flags & ImGuiTableFlags_BordersInnerV) != 0) ? g.Style.CellPadding.x : 0.0f;
-    table->CellSpacingX1 = inner_spacing_explicit + inner_spacing_for_border;
-    table->CellSpacingX2 = inner_spacing_explicit;
-    table->CellPaddingX = inner_padding_explicit;
-    table->CellPaddingY = g.Style.CellPadding.y;
-
-    const float outer_padding_for_border = (flags & ImGuiTableFlags_BordersOuterV) ? TABLE_BORDER_SIZE : 0.0f;
-    const float outer_padding_explicit = pad_outer_x ? g.Style.CellPadding.x : 0.0f;
-    table->OuterPaddingX = (outer_padding_for_border + outer_padding_explicit) - table->CellPaddingX;
-
-    table->CurrentColumn = -1;
-    table->CurrentRow = -1;
-    table->RowBgColorCounter = 0;
-    table->LastRowFlags = ImGuiTableRowFlags_None;
-    table->InnerClipRect = (inner_window == outer_window) ? table->WorkRect : inner_window->ClipRect;
-    table->InnerClipRect.ClipWith(table->WorkRect);           
-    table->InnerClipRect.ClipWithFull(table->HostClipRect);
-    table->InnerClipRect.Max.y = (flags & ImGuiTableFlags_NoHostExtendY) ? ImMin(table->InnerClipRect.Max.y, inner_window->WorkRect.Max.y) : inner_window->ClipRect.Max.y;
-
-    table->RowPosY1 = table->RowPosY2 = table->WorkRect.Min.y;     
-    table->RowTextBaseline = 0.0f;        
-    table->FreezeRowsRequest = table->FreezeRowsCount = 0;         
-    table->FreezeColumnsRequest = table->FreezeColumnsCount = 0;
-    table->IsUnfrozenRows = true;
-    table->DeclColumnsCount = 0;
-
-    table->BorderColorStrong = GetColorU32(ImGuiCol_TableBorderStrong);
-    table->BorderColorLight = GetColorU32(ImGuiCol_TableBorderLight);
-
-    const int table_idx = g.Tables.GetIndex(table);
-    g.CurrentTableStack.push_back(ImGuiPtrOrIndex(table_idx));
-    g.CurrentTable = table;
-    outer_window->DC.CurrentTableIdx = table_idx;
-    if (inner_window != outer_window)            
-        inner_window->DC.CurrentTableIdx = table_idx;
-
-    if ((table_last_flags & ImGuiTableFlags_Reorderable) && (flags & ImGuiTableFlags_Reorderable) == 0)
-        table->IsResetDisplayOrderRequest = true;
-
-    if (table_idx >= g.TablesLastTimeActive.Size)
-        g.TablesLastTimeActive.resize(table_idx + 1, -1.0f);
-    g.TablesLastTimeActive[table_idx] = (float)g.Time;
-    table->MemoryCompacted = false;
-
-    const int stored_size = table->Columns.size();
-    if (stored_size != 0 && stored_size != columns_count)
-    {
-        IM_FREE(table->RawData);
-        table->RawData = NULL;
-    }
-    if (table->RawData == NULL)
-    {
-        TableBeginInitMemory(table, columns_count);
-        table->IsInitializing = table->IsSettingsRequestLoad = true;
-    }
-    if (table->IsResetAllRequest)
-        TableResetSettings(table);
-    if (table->IsInitializing)
-    {
-        table->SettingsOffset = -1;
-        table->IsSortSpecsDirty = true;
-        table->InstanceInteracted = -1;
-        table->ContextPopupColumn = -1;
-        table->ReorderColumn = table->ResizedColumn = table->LastResizedColumn = -1;
-        table->AutoFitSingleColumn = -1;
-        table->HoveredColumnBody = table->HoveredColumnBorder = -1;
-        for (int n = 0; n < columns_count; n++)
-        {
-            ImGuiTableColumn* column = &table->Columns[n];
-            float width_auto = column->WidthAuto;
-            *column = ImGuiTableColumn();
-            column->WidthAuto = width_auto;
-            column->IsPreserveWidthAuto = true;                
-            column->DisplayOrder = table->DisplayOrderToIndex[n] = (ImGuiTableColumnIdx)n;
-            column->IsEnabled = column->IsEnabledNextFrame = true;
-        }
-    }
-
-    if (table->IsSettingsRequestLoad)
-        TableLoadSettings(table);
-
-    const float new_ref_scale_unit = g.FontSize;   
-    if (table->RefScale != 0.0f && table->RefScale != new_ref_scale_unit)
-    {
-        const float scale_factor = new_ref_scale_unit / table->RefScale;
-        for (int n = 0; n < columns_count; n++)
-            table->Columns[n].WidthRequest = table->Columns[n].WidthRequest * scale_factor;
-    }
-    table->RefScale = new_ref_scale_unit;
-
-    inner_window->SkipItems = true;
-
-    if (table->ColumnsNames.Buf.Size > 0)
-        table->ColumnsNames.Buf.resize(0);
-
-    TableBeginApplyRequests(table);
-
-    return true;
-}
-
-void ImGui::TableBeginInitMemory(ImGuiTable* table, int columns_count)
-{
-    ImSpanAllocator<3> span_allocator;
-    span_allocator.ReserveBytes(0, columns_count * sizeof(ImGuiTableColumn));
-    span_allocator.ReserveBytes(1, columns_count * sizeof(ImGuiTableColumnIdx));
-    span_allocator.ReserveBytes(2, columns_count * sizeof(ImGuiTableCellData));
-    table->RawData = IM_ALLOC(span_allocator.GetArenaSizeInBytes());
-    memset(table->RawData, 0, span_allocator.GetArenaSizeInBytes());
-    span_allocator.SetArenaBasePtr(table->RawData);
-    span_allocator.GetSpan(0, &table->Columns);
-    span_allocator.GetSpan(1, &table->DisplayOrderToIndex);
-    span_allocator.GetSpan(2, &table->RowCellData);
-}
-
-void ImGui::TableBeginApplyRequests(ImGuiTable* table)
-{
-    if (table->InstanceCurrent == 0)
-    {
-        if (table->ResizedColumn != -1 && table->ResizedColumnNextWidth != FLT_MAX)
-            TableSetColumnWidth(table->ResizedColumn, table->ResizedColumnNextWidth);
-        table->LastResizedColumn = table->ResizedColumn;
-        table->ResizedColumnNextWidth = FLT_MAX;
-        table->ResizedColumn = -1;
-
-        if (table->AutoFitSingleColumn != -1)
-        {
-            TableSetColumnWidth(table->AutoFitSingleColumn, table->Columns[table->AutoFitSingleColumn].WidthAuto);
-            table->AutoFitSingleColumn = -1;
-        }
-    }
-
-    if (table->InstanceCurrent == 0)
-    {
-        if (table->HeldHeaderColumn == -1 && table->ReorderColumn != -1)
-            table->ReorderColumn = -1;
-        table->HeldHeaderColumn = -1;
-        if (table->ReorderColumn != -1 && table->ReorderColumnDir != 0)
-        {
-            const int reorder_dir = table->ReorderColumnDir;
-            IM_ASSERT(reorder_dir == -1 || reorder_dir == +1);
-            IM_ASSERT(table->Flags & ImGuiTableFlags_Reorderable);
-            ImGuiTableColumn* src_column = &table->Columns[table->ReorderColumn];
-            ImGuiTableColumn* dst_column = &table->Columns[(reorder_dir == -1) ? src_column->PrevEnabledColumn : src_column->NextEnabledColumn];
-            IM_UNUSED(dst_column);
-            const int src_order = src_column->DisplayOrder;
-            const int dst_order = dst_column->DisplayOrder;
-            src_column->DisplayOrder = (ImGuiTableColumnIdx)dst_order;
-            for (int order_n = src_order + reorder_dir; order_n != dst_order + reorder_dir; order_n += reorder_dir)
-                table->Columns[table->DisplayOrderToIndex[order_n]].DisplayOrder -= (ImGuiTableColumnIdx)reorder_dir;
-            IM_ASSERT(dst_column->DisplayOrder == dst_order - reorder_dir);
-
-            for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-                table->DisplayOrderToIndex[table->Columns[column_n].DisplayOrder] = (ImGuiTableColumnIdx)column_n;
-            table->ReorderColumnDir = 0;
-            table->IsSettingsDirty = true;
-        }
-    }
-
-    if (table->IsResetDisplayOrderRequest)
-    {
-        for (int n = 0; n < table->ColumnsCount; n++)
-            table->DisplayOrderToIndex[n] = table->Columns[n].DisplayOrder = (ImGuiTableColumnIdx)n;
-        table->IsResetDisplayOrderRequest = false;
-        table->IsSettingsDirty = true;
-    }
-}
-
-static void TableSetupColumnFlags(ImGuiTable* table, ImGuiTableColumn* column, ImGuiTableColumnFlags flags_in)
-{
-    ImGuiTableColumnFlags flags = flags_in;
-
-    if ((flags & ImGuiTableColumnFlags_WidthMask_) == 0)
-    {
-        const ImGuiTableFlags table_sizing_policy = (table->Flags & ImGuiTableFlags_SizingMask_);
-        if (table_sizing_policy == ImGuiTableFlags_SizingFixedFit || table_sizing_policy == ImGuiTableFlags_SizingFixedSame)
-            flags |= ImGuiTableColumnFlags_WidthFixed;
-        else
-            flags |= ImGuiTableColumnFlags_WidthStretch;
-    }
-    else
-    {
-        IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiTableColumnFlags_WidthMask_));          
-    }
-    
-    if ((table->Flags & ImGuiTableFlags_Resizable) == 0)
-        flags |= ImGuiTableColumnFlags_NoResize;
-
-    if ((flags & ImGuiTableColumnFlags_NoSortAscending) && (flags & ImGuiTableColumnFlags_NoSortDescending))
-        flags |= ImGuiTableColumnFlags_NoSort;
-
-    if ((flags & ImGuiTableColumnFlags_IndentMask_) == 0)
-        flags |= (table->Columns.index_from_ptr(column) == 0) ? ImGuiTableColumnFlags_IndentEnable : ImGuiTableColumnFlags_IndentDisable;
-
-    column->Flags = flags | (column->Flags & ImGuiTableColumnFlags_StatusMask_);
-
-    column->SortDirectionsAvailCount = column->SortDirectionsAvailMask = column->SortDirectionsAvailList = 0;
-    if (table->Flags & ImGuiTableFlags_Sortable)
-    {
-        int count = 0, mask = 0, list = 0;
-        if ((flags & ImGuiTableColumnFlags_PreferSortAscending)  != 0 && (flags & ImGuiTableColumnFlags_NoSortAscending)  == 0) { mask |= 1 << ImGuiSortDirection_Ascending;  list |= ImGuiSortDirection_Ascending  << (count << 1); count++; }
-        if ((flags & ImGuiTableColumnFlags_PreferSortDescending) != 0 && (flags & ImGuiTableColumnFlags_NoSortDescending) == 0) { mask |= 1 << ImGuiSortDirection_Descending; list |= ImGuiSortDirection_Descending << (count << 1); count++; }
-        if ((flags & ImGuiTableColumnFlags_PreferSortAscending)  == 0 && (flags & ImGuiTableColumnFlags_NoSortAscending)  == 0) { mask |= 1 << ImGuiSortDirection_Ascending;  list |= ImGuiSortDirection_Ascending  << (count << 1); count++; }
-        if ((flags & ImGuiTableColumnFlags_PreferSortDescending) == 0 && (flags & ImGuiTableColumnFlags_NoSortDescending) == 0) { mask |= 1 << ImGuiSortDirection_Descending; list |= ImGuiSortDirection_Descending << (count << 1); count++; }
-        if ((table->Flags & ImGuiTableFlags_SortTristate) || count == 0) { mask |= 1 << ImGuiSortDirection_None; count++; }
-        column->SortDirectionsAvailList = (ImU8)list;
-        column->SortDirectionsAvailMask = (ImU8)mask;
-        column->SortDirectionsAvailCount = (ImU8)count;
-        ImGui::TableFixColumnSortDirection(table, column);
-    }
-}
-
-void ImGui::TableUpdateLayout(ImGuiTable* table)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(table->IsLayoutLocked == false);
-
-    const ImGuiTableFlags table_sizing_policy = (table->Flags & ImGuiTableFlags_SizingMask_);
-    table->IsDefaultDisplayOrder = true;
-    table->ColumnsEnabledCount = 0;
-    table->EnabledMaskByIndex = 0x00;
-    table->EnabledMaskByDisplayOrder = 0x00;
-    table->MinColumnWidth = ImMax(1.0f, g.Style.FramePadding.x * 1.0f);    
-
-    int count_fixed = 0;                        
-    int count_stretch = 0;                      
-    int last_visible_column_idx = -1;
-    bool has_auto_fit_request = false;
-    bool has_resizable = false;
-    float stretch_sum_width_auto = 0.0f;
-    float fixed_max_width_auto = 0.0f;
-    for (int order_n = 0; order_n < table->ColumnsCount; order_n++)
-    {
-        const int column_n = table->DisplayOrderToIndex[order_n];
-        if (column_n != order_n)
-            table->IsDefaultDisplayOrder = false;
-        ImGuiTableColumn* column = &table->Columns[column_n];
-
-        if (table->DeclColumnsCount <= column_n)
-        {
-            TableSetupColumnFlags(table, column, ImGuiTableColumnFlags_None);
-            column->NameOffset = -1;
-            column->UserID = 0;
-            column->InitStretchWeightOrWidth = -1.0f;
-        }
-
-        if (!(table->Flags & ImGuiTableFlags_Hideable) || (column->Flags & ImGuiTableColumnFlags_NoHide))
-            column->IsEnabledNextFrame = true;
-        if (column->IsEnabled != column->IsEnabledNextFrame)
-        {
-            column->IsEnabled = column->IsEnabledNextFrame;
-            table->IsSettingsDirty = true;
-            if (!column->IsEnabled && column->SortOrder != -1)
-                table->IsSortSpecsDirty = true;
-        }
-        if (column->SortOrder > 0 && !(table->Flags & ImGuiTableFlags_SortMulti))
-            table->IsSortSpecsDirty = true;
-
-        const bool start_auto_fit = (column->Flags & ImGuiTableColumnFlags_WidthFixed) ? (column->WidthRequest < 0.0f) : (column->StretchWeight < 0.0f);
-        if (start_auto_fit)
-            column->AutoFitQueue = column->CannotSkipItemsQueue = (1 << 3) - 1;     
-
-        if (!column->IsEnabled)
-        {
-            column->IndexWithinEnabledSet = -1;
-            continue;
-        }
-
-        column->PrevEnabledColumn = (ImGuiTableColumnIdx)last_visible_column_idx;
-        column->NextEnabledColumn = -1;
-        if (last_visible_column_idx != -1)
-            table->Columns[last_visible_column_idx].NextEnabledColumn = (ImGuiTableColumnIdx)column_n;
-        column->IndexWithinEnabledSet = table->ColumnsEnabledCount++;
-        table->EnabledMaskByIndex |= (ImU64)1 << column_n;
-        table->EnabledMaskByDisplayOrder |= (ImU64)1 << column->DisplayOrder;
-        last_visible_column_idx = column_n;
-        IM_ASSERT(column->IndexWithinEnabledSet <= column->DisplayOrder);
-
-        if (!column->IsPreserveWidthAuto)
-            column->WidthAuto = TableGetColumnWidthAuto(table, column);
-
-        const bool column_is_resizable = (column->Flags & ImGuiTableColumnFlags_NoResize) == 0;
-        if (column_is_resizable)
-            has_resizable = true;
-        if ((column->Flags & ImGuiTableColumnFlags_WidthFixed) && column->InitStretchWeightOrWidth > 0.0f && !column_is_resizable)
-            column->WidthAuto = column->InitStretchWeightOrWidth;
-
-        if (column->AutoFitQueue != 0x00)
-            has_auto_fit_request = true;
-        if (column->Flags & ImGuiTableColumnFlags_WidthStretch)
-        {
-            stretch_sum_width_auto += column->WidthAuto;
-            count_stretch++;
-        }
-        else
-        {
-            fixed_max_width_auto = ImMax(fixed_max_width_auto, column->WidthAuto);
-            count_fixed++;
-        }
-    }
-    if ((table->Flags & ImGuiTableFlags_Sortable) && table->SortSpecsCount == 0 && !(table->Flags & ImGuiTableFlags_SortTristate))
-        table->IsSortSpecsDirty = true;
-    table->RightMostEnabledColumn = (ImGuiTableColumnIdx)last_visible_column_idx;
-    IM_ASSERT(table->RightMostEnabledColumn >= 0);
-
-    if (has_auto_fit_request && table->OuterWindow != table->InnerWindow)
-        table->InnerWindow->SkipItems = false;
-    if (has_auto_fit_request)
-        table->IsSettingsDirty = true;
-
-    float sum_width_requests = 0.0f;                          
-    float stretch_sum_weights = 0.0f;              
-    table->LeftMostStretchedColumn = table->RightMostStretchedColumn = -1;
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-    {
-        if (!(table->EnabledMaskByIndex & ((ImU64)1 << column_n)))
-            continue;
-        ImGuiTableColumn* column = &table->Columns[column_n];
-
-        const bool column_is_resizable = (column->Flags & ImGuiTableColumnFlags_NoResize) == 0;
-        if (column->Flags & ImGuiTableColumnFlags_WidthFixed)
-        {
-            float width_auto = column->WidthAuto;
-            if (table_sizing_policy == ImGuiTableFlags_SizingFixedSame && (column->AutoFitQueue != 0x00 || !column_is_resizable))
-                width_auto = fixed_max_width_auto; 
-
-            if (column->AutoFitQueue != 0x00)
-                column->WidthRequest = width_auto;
-            else if ((column->Flags & ImGuiTableColumnFlags_WidthFixed) && !column_is_resizable && (table->RequestOutputMaskByIndex & ((ImU64)1 << column_n)))
-                column->WidthRequest = width_auto;
-
-            if (column->AutoFitQueue > 0x01 && table->IsInitializing && !column->IsPreserveWidthAuto)
-                column->WidthRequest = ImMax(column->WidthRequest, table->MinColumnWidth * 4.0f);    
-            sum_width_requests += column->WidthRequest;
-        }
-        else
-        {
-            if (column->AutoFitQueue != 0x00 || column->StretchWeight < 0.0f || !column_is_resizable)
-            {
-                if (column->InitStretchWeightOrWidth > 0.0f)
-                    column->StretchWeight = column->InitStretchWeightOrWidth;
-                else if (table_sizing_policy == ImGuiTableFlags_SizingStretchProp)
-                    column->StretchWeight = (column->WidthAuto / stretch_sum_width_auto) * count_stretch;
-                else
-                    column->StretchWeight = 1.0f;
-            }
-
-            stretch_sum_weights += column->StretchWeight;
-            if (table->LeftMostStretchedColumn == -1 || table->Columns[table->LeftMostStretchedColumn].DisplayOrder > column->DisplayOrder)
-                table->LeftMostStretchedColumn = (ImGuiTableColumnIdx)column_n;
-            if (table->RightMostStretchedColumn == -1 || table->Columns[table->RightMostStretchedColumn].DisplayOrder < column->DisplayOrder)
-                table->RightMostStretchedColumn = (ImGuiTableColumnIdx)column_n;
-        }
-        column->IsPreserveWidthAuto = false;
-        sum_width_requests += table->CellPaddingX * 2.0f;
-    }
-    table->ColumnsEnabledFixedCount = (ImGuiTableColumnIdx)count_fixed;
-
-    const ImRect work_rect = table->WorkRect;
-    const float width_spacings = (table->OuterPaddingX * 2.0f) + (table->CellSpacingX1 + table->CellSpacingX2) * (table->ColumnsEnabledCount - 1);
-    const float width_avail = ((table->Flags & ImGuiTableFlags_ScrollX) && table->InnerWidth == 0.0f) ? table->InnerClipRect.GetWidth() : work_rect.GetWidth();
-    const float width_avail_for_stretched_columns = width_avail - width_spacings - sum_width_requests;
-    float width_remaining_for_stretched_columns = width_avail_for_stretched_columns;
-    table->ColumnsGivenWidth = width_spacings + (table->CellPaddingX * 2.0f) * table->ColumnsEnabledCount;
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-    {
-        if (!(table->EnabledMaskByIndex & ((ImU64)1 << column_n)))
-            continue;
-        ImGuiTableColumn* column = &table->Columns[column_n];
-
-        if (column->Flags & ImGuiTableColumnFlags_WidthStretch)
-        {
-            float weight_ratio = column->StretchWeight / stretch_sum_weights;
-            column->WidthRequest = IM_FLOOR(ImMax(width_avail_for_stretched_columns * weight_ratio, table->MinColumnWidth) + 0.01f);
-            width_remaining_for_stretched_columns -= column->WidthRequest;
-        }
-
-        if (column->NextEnabledColumn == -1 && table->LeftMostStretchedColumn != -1)
-            column->Flags |= ImGuiTableColumnFlags_NoDirectResize_;
-
-        column->WidthGiven = ImFloor(ImMax(column->WidthRequest, table->MinColumnWidth));
-        table->ColumnsGivenWidth += column->WidthGiven;
-    }
-
-    if (width_remaining_for_stretched_columns >= 1.0f && !(table->Flags & ImGuiTableFlags_PreciseWidths))
-        for (int order_n = table->ColumnsCount - 1; stretch_sum_weights > 0.0f && width_remaining_for_stretched_columns >= 1.0f && order_n >= 0; order_n--)
-        {
-            if (!(table->EnabledMaskByDisplayOrder & ((ImU64)1 << order_n)))
-                continue;
-            ImGuiTableColumn* column = &table->Columns[table->DisplayOrderToIndex[order_n]];
-            if (!(column->Flags & ImGuiTableColumnFlags_WidthStretch))
-                continue;
-            column->WidthRequest += 1.0f;
-            column->WidthGiven += 1.0f;
-            width_remaining_for_stretched_columns -= 1.0f;
-        }
-
-    table->HoveredColumnBody = -1;
-    table->HoveredColumnBorder = -1;
-    const ImRect mouse_hit_rect(table->OuterRect.Min.x, table->OuterRect.Min.y, table->OuterRect.Max.x, ImMax(table->OuterRect.Max.y, table->OuterRect.Min.y + table->LastOuterHeight));
-    const bool is_hovering_table = ItemHoverable(mouse_hit_rect, 0);
-
-    int visible_n = 0;
-    bool offset_x_frozen = (table->FreezeColumnsCount > 0);
-    float offset_x = ((table->FreezeColumnsCount > 0) ? table->OuterRect.Min.x : work_rect.Min.x) + table->OuterPaddingX - table->CellSpacingX1;
-    ImRect host_clip_rect = table->InnerClipRect;
-    table->VisibleMaskByIndex = 0x00;
-    table->RequestOutputMaskByIndex = 0x00;
-    for (int order_n = 0; order_n < table->ColumnsCount; order_n++)
-    {
-        const int column_n = table->DisplayOrderToIndex[order_n];
-        ImGuiTableColumn* column = &table->Columns[column_n];
-
-        column->NavLayerCurrent = (ImS8)((table->FreezeRowsCount > 0 || column_n < table->FreezeColumnsCount) ? ImGuiNavLayer_Menu : ImGuiNavLayer_Main);
-
-        if (offset_x_frozen && table->FreezeColumnsCount == visible_n)
-        {
-            offset_x += work_rect.Min.x - table->OuterRect.Min.x;
-            offset_x_frozen = false;
-        }
-
-        column->Flags &= ~ImGuiTableColumnFlags_StatusMask_;
-
-        if ((table->EnabledMaskByDisplayOrder & ((ImU64)1 << order_n)) == 0)
-        {
-            column->MinX = column->MaxX = column->WorkMinX = column->ClipRect.Min.x = column->ClipRect.Max.x = offset_x;
-            column->WidthGiven = 0.0f;
-            column->ClipRect.Min.y = work_rect.Min.y;
-            column->ClipRect.Max.y = FLT_MAX;
-            column->ClipRect.ClipWithFull(host_clip_rect);
-            column->IsVisibleX = column->IsVisibleY = column->IsRequestOutput = false;
-            column->IsSkipItems = true;
-            column->ItemWidth = 1.0f;
-            continue;
-        }
-
-        if (is_hovering_table && g.IO.MousePos.x >= column->ClipRect.Min.x && g.IO.MousePos.x < column->ClipRect.Max.x)
-            table->HoveredColumnBody = (ImGuiTableColumnIdx)column_n;
-
-        column->MinX = offset_x;
-
-        float max_width = TableGetMaxColumnWidth(table, column_n);
-        column->WidthGiven = ImMin(column->WidthGiven, max_width);
-        column->WidthGiven = ImMax(column->WidthGiven, ImMin(column->WidthRequest, table->MinColumnWidth));
-        column->MaxX = offset_x + column->WidthGiven + table->CellSpacingX1 + table->CellSpacingX2 + table->CellPaddingX * 2.0f;
-
-        column->WorkMinX = column->MinX + table->CellPaddingX + table->CellSpacingX1;
-        column->WorkMaxX = column->MaxX - table->CellPaddingX - table->CellSpacingX2;   
-        column->ItemWidth = ImFloor(column->WidthGiven * 0.65f);
-        column->ClipRect.Min.x = column->MinX;
-        column->ClipRect.Min.y = work_rect.Min.y;
-        column->ClipRect.Max.x = column->MaxX; 
-        column->ClipRect.Max.y = FLT_MAX;
-        column->ClipRect.ClipWithFull(host_clip_rect);
-
-        column->IsVisibleX = (column->ClipRect.Max.x > column->ClipRect.Min.x);
-        column->IsVisibleY = true;    
-        const bool is_visible = column->IsVisibleX;  
-        if (is_visible)
-            table->VisibleMaskByIndex |= ((ImU64)1 << column_n);
-
-        column->IsRequestOutput = is_visible || column->AutoFitQueue != 0 || column->CannotSkipItemsQueue != 0;
-        if (column->IsRequestOutput)
-            table->RequestOutputMaskByIndex |= ((ImU64)1 << column_n);
-
-        column->IsSkipItems = !column->IsEnabled || table->HostSkipItems;
-        if (column->IsSkipItems)
-            IM_ASSERT(!is_visible);
-
-        column->Flags |= ImGuiTableColumnFlags_IsEnabled;
-        if (is_visible)
-            column->Flags |= ImGuiTableColumnFlags_IsVisible;
-        if (column->SortOrder != -1)
-            column->Flags |= ImGuiTableColumnFlags_IsSorted;
-        if (table->HoveredColumnBody == column_n)
-            column->Flags |= ImGuiTableColumnFlags_IsHovered;
-
-        column->ContentMaxXFrozen = column->ContentMaxXUnfrozen = column->WorkMinX;
-        column->ContentMaxXHeadersUsed = column->ContentMaxXHeadersIdeal = column->WorkMinX;
-
-        if (table->HostSkipItems == false)
-        {
-            column->AutoFitQueue >>= 1;
-            column->CannotSkipItemsQueue >>= 1;
-        }
-
-        if (visible_n < table->FreezeColumnsCount)
-            host_clip_rect.Min.x = ImClamp(column->MaxX + TABLE_BORDER_SIZE, host_clip_rect.Min.x, host_clip_rect.Max.x);
-
-        offset_x += column->WidthGiven + table->CellSpacingX1 + table->CellSpacingX2 + table->CellPaddingX * 2.0f;
-        visible_n++;
-    }
-
-    const float unused_x1 = ImMax(table->WorkRect.Min.x, table->Columns[table->RightMostEnabledColumn].ClipRect.Max.x);
-    if (is_hovering_table && table->HoveredColumnBody == -1)
-    {
-        if (g.IO.MousePos.x >= unused_x1)
-            table->HoveredColumnBody = (ImGuiTableColumnIdx)table->ColumnsCount;
-    }
-    if (has_resizable == false && (table->Flags & ImGuiTableFlags_Resizable))
-        table->Flags &= ~ImGuiTableFlags_Resizable;
-
-    if (table->RightMostStretchedColumn != -1)
-        table->Flags &= ~ImGuiTableFlags_NoHostExtendX;
-    if (table->Flags & ImGuiTableFlags_NoHostExtendX)
-    {
-        table->OuterRect.Max.x = table->WorkRect.Max.x = unused_x1;
-        table->InnerClipRect.Max.x = ImMin(table->InnerClipRect.Max.x, unused_x1);
-    }
-    table->InnerWindow->ParentWorkRect = table->WorkRect;
-    table->BorderX1 = table->InnerClipRect.Min.x;       
-    table->BorderX2 = table->InnerClipRect.Max.x;       
-
-    TableSetupDrawChannels(table);
-
-    if (table->Flags & ImGuiTableFlags_Resizable)
-        TableUpdateBorders(table);
-    table->LastFirstRowHeight = 0.0f;
-    table->IsLayoutLocked = true;
-    table->IsUsingHeaders = false;
-
-    if (table->IsContextPopupOpen && table->InstanceCurrent == table->InstanceInteracted)
-    {
-        const ImGuiID context_menu_id = ImHashStr("##ContextMenu", 0, table->ID);
-        if (BeginPopupEx(context_menu_id, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings))
-        {
-            TableDrawContextMenu(table);
-            EndPopup();
-        }
-        else
-        {
-            table->IsContextPopupOpen = false;
-        }
-    }
-
-    if (table->IsSortSpecsDirty && (table->Flags & ImGuiTableFlags_Sortable))
-        TableSortSpecsBuild(table);
-
-    ImGuiWindow* inner_window = table->InnerWindow;
-    if (table->Flags & ImGuiTableFlags_NoClip)
-        table->DrawSplitter.SetCurrentChannel(inner_window->DrawList, TABLE_DRAW_CHANNEL_NOCLIP);
-    else
-        inner_window->DrawList->PushClipRect(inner_window->ClipRect.Min, inner_window->ClipRect.Max, false);
-}
-
-void ImGui::TableUpdateBorders(ImGuiTable* table)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(table->Flags & ImGuiTableFlags_Resizable);
-
-    const float hit_half_width = TABLE_RESIZE_SEPARATOR_HALF_THICKNESS;
-    const float hit_y1 = table->OuterRect.Min.y;
-    const float hit_y2_body = ImMax(table->OuterRect.Max.y, hit_y1 + table->LastOuterHeight);
-    const float hit_y2_head = hit_y1 + table->LastFirstRowHeight;
-
-    for (int order_n = 0; order_n < table->ColumnsCount; order_n++)
-    {
-        if (!(table->EnabledMaskByDisplayOrder & ((ImU64)1 << order_n)))
-            continue;
-
-        const int column_n = table->DisplayOrderToIndex[order_n];
-        ImGuiTableColumn* column = &table->Columns[column_n];
-        if (column->Flags & (ImGuiTableColumnFlags_NoResize | ImGuiTableColumnFlags_NoDirectResize_))
-            continue;
-
-        const float border_y2_hit = (table->Flags & ImGuiTableFlags_NoBordersInBody) ? hit_y2_head : hit_y2_body;
-        if ((table->Flags & ImGuiTableFlags_NoBordersInBody) && table->IsUsingHeaders == false)
-            continue;
-
-        if (table->FreezeColumnsCount > 0)
-            if (column->MaxX < table->Columns[table->DisplayOrderToIndex[table->FreezeColumnsCount - 1]].MaxX)
-                continue;
-
-        ImGuiID column_id = TableGetColumnResizeID(table, column_n, table->InstanceCurrent);
-        ImRect hit_rect(column->MaxX - hit_half_width, hit_y1, column->MaxX + hit_half_width, border_y2_hit);
-        KeepAliveID(column_id);
-
-        bool hovered = false, held = false;
-        bool pressed = ButtonBehavior(hit_rect, column_id, &hovered, &held, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_AllowItemOverlap | ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnDoubleClick);
-        if (pressed && IsMouseDoubleClicked(0))
-        {
-            TableSetColumnWidthAutoSingle(table, column_n);
-            ClearActiveID();
-            held = hovered = false;
-        }
-        if (held)
-        {
-            if (table->LastResizedColumn == -1)
-                table->ResizeLockMinContentsX2 = table->RightMostEnabledColumn != -1 ? table->Columns[table->RightMostEnabledColumn].MaxX : -FLT_MAX;
-            table->ResizedColumn = (ImGuiTableColumnIdx)column_n;
-            table->InstanceInteracted = table->InstanceCurrent;
-        }
-        if ((hovered && g.HoveredIdTimer > TABLE_RESIZE_SEPARATOR_FEEDBACK_TIMER) || held)
-        {
-            table->HoveredColumnBorder = (ImGuiTableColumnIdx)column_n;
-            SetMouseCursor(ImGuiMouseCursor_ResizeEW);
-        }
-    }
-}
-
-void    ImGui::EndTable()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    IM_ASSERT(table != NULL && "Only call EndTable() if BeginTable() returns true!");
-
-    if (!table->IsLayoutLocked)
-        TableUpdateLayout(table);
-
-    const ImGuiTableFlags flags = table->Flags;
-    ImGuiWindow* inner_window = table->InnerWindow;
-    ImGuiWindow* outer_window = table->OuterWindow;
-    IM_ASSERT(inner_window == g.CurrentWindow);
-    IM_ASSERT(outer_window == inner_window || outer_window == inner_window->ParentWindow);
-
-    if (table->IsInsideRow)
-        TableEndRow(table);
-
-    if (flags & ImGuiTableFlags_ContextMenuInBody)
-        if (table->HoveredColumnBody != -1 && !IsAnyItemHovered() && IsMouseReleased(ImGuiMouseButton_Right))
-            TableOpenContextMenu((int)table->HoveredColumnBody);
-
-    inner_window->DC.PrevLineSize = table->HostBackupPrevLineSize;
-    inner_window->DC.CurrLineSize = table->HostBackupCurrLineSize;
-    inner_window->DC.CursorMaxPos = table->HostBackupCursorMaxPos;
-    const float inner_content_max_y = table->RowPosY2;
-    IM_ASSERT(table->RowPosY2 == inner_window->DC.CursorPos.y);
-    if (inner_window != outer_window)
-        inner_window->DC.CursorMaxPos.y = inner_content_max_y;
-    else if (!(flags & ImGuiTableFlags_NoHostExtendY))
-        table->OuterRect.Max.y = table->InnerRect.Max.y = ImMax(table->OuterRect.Max.y, inner_content_max_y);    
-    table->WorkRect.Max.y = ImMax(table->WorkRect.Max.y, table->OuterRect.Max.y);
-    table->LastOuterHeight = table->OuterRect.GetHeight();
-
-    if (table->Flags & ImGuiTableFlags_ScrollX)
-    {
-        const float outer_padding_for_border = (table->Flags & ImGuiTableFlags_BordersOuterV) ? TABLE_BORDER_SIZE : 0.0f;
-        float max_pos_x = table->InnerWindow->DC.CursorMaxPos.x;
-        if (table->RightMostEnabledColumn != -1)
-            max_pos_x = ImMax(max_pos_x, table->Columns[table->RightMostEnabledColumn].WorkMaxX + table->CellPaddingX + table->OuterPaddingX - outer_padding_for_border);
-        if (table->ResizedColumn != -1)
-            max_pos_x = ImMax(max_pos_x, table->ResizeLockMinContentsX2);
-        table->InnerWindow->DC.CursorMaxPos.x = max_pos_x;
-    }
-
-    if (!(flags & ImGuiTableFlags_NoClip))
-        inner_window->DrawList->PopClipRect();
-    inner_window->ClipRect = inner_window->DrawList->_ClipRectStack.back();
-
-    if ((flags & ImGuiTableFlags_Borders) != 0)
-        TableDrawBorders(table);
-
-#if 0
-    if (table->DummyDrawChannel != (ImGuiTableColumnIdx)-1)
-    {
-        ImDrawChannel* dummy_channel = &table->DrawSplitter._Channels[table->DummyDrawChannel];
-        dummy_channel->_CmdBuffer.resize(0);
-        dummy_channel->_IdxBuffer.resize(0);
-    }
-#endif
-
-    table->DrawSplitter.SetCurrentChannel(inner_window->DrawList, 0);
-    if ((table->Flags & ImGuiTableFlags_NoClip) == 0)
-        TableMergeDrawChannels(table);
-    table->DrawSplitter.Merge(inner_window->DrawList);
-
-    const float width_spacings = (table->OuterPaddingX * 2.0f) + (table->CellSpacingX1 + table->CellSpacingX2) * (table->ColumnsEnabledCount - 1);
-    table->ColumnsAutoFitWidth = width_spacings + (table->CellPaddingX * 2.0f) * table->ColumnsEnabledCount;
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-        if (table->EnabledMaskByIndex & ((ImU64)1 << column_n))
-        {
-            ImGuiTableColumn* column = &table->Columns[column_n];
-            if ((column->Flags & ImGuiTableColumnFlags_WidthFixed) && !(column->Flags & ImGuiTableColumnFlags_NoResize))
-                table->ColumnsAutoFitWidth += column->WidthRequest;
-            else
-                table->ColumnsAutoFitWidth += TableGetColumnWidthAuto(table, column);
-        }
-
-    if ((table->Flags & ImGuiTableFlags_ScrollX) == 0 && inner_window != outer_window)
-    {
-        inner_window->Scroll.x = 0.0f;
-    }
-    else if (table->LastResizedColumn != -1 && table->ResizedColumn == -1 && inner_window->ScrollbarX && table->InstanceInteracted == table->InstanceCurrent)
-    {
-        const float neighbor_width_to_keep_visible = table->MinColumnWidth + table->CellPaddingX * 2.0f;
-        ImGuiTableColumn* column = &table->Columns[table->LastResizedColumn];
-        if (column->MaxX < table->InnerClipRect.Min.x)
-            SetScrollFromPosX(inner_window, column->MaxX - inner_window->Pos.x - neighbor_width_to_keep_visible, 1.0f);
-        else if (column->MaxX > table->InnerClipRect.Max.x)
-            SetScrollFromPosX(inner_window, column->MaxX - inner_window->Pos.x + neighbor_width_to_keep_visible, 1.0f);
-    }
-
-    if (table->ResizedColumn != -1 && table->InstanceCurrent == table->InstanceInteracted)
-    {
-        ImGuiTableColumn* column = &table->Columns[table->ResizedColumn];
-        const float new_x2 = (g.IO.MousePos.x - g.ActiveIdClickOffset.x + TABLE_RESIZE_SEPARATOR_HALF_THICKNESS);
-        const float new_width = ImFloor(new_x2 - column->MinX - table->CellSpacingX1 - table->CellPaddingX * 2.0f);
-        table->ResizedColumnNextWidth = new_width;
-    }
-
-    IM_ASSERT_USER_ERROR(inner_window->IDStack.back() == table->ID + table->InstanceCurrent, "Mismatching PushID/PopID!");
-    IM_ASSERT_USER_ERROR(outer_window->DC.ItemWidthStack.Size >= table->HostBackupItemWidthStackSize, "Too many PopItemWidth!");
-    PopID();
-
-    const ImVec2 backup_outer_max_pos = outer_window->DC.CursorMaxPos;
-    inner_window->WorkRect = table->HostBackupWorkRect;
-    inner_window->ParentWorkRect = table->HostBackupParentWorkRect;
-    inner_window->SkipItems = table->HostSkipItems;
-    outer_window->DC.CursorPos = table->OuterRect.Min;
-    outer_window->DC.ItemWidth = table->HostBackupItemWidth;
-    outer_window->DC.ItemWidthStack.Size = table->HostBackupItemWidthStackSize;
-    outer_window->DC.ColumnsOffset = table->HostBackupColumnsOffset;
-
-    if (inner_window != outer_window)
-    {
-        EndChild();
-    }
-    else
-    {
-        ItemSize(table->OuterRect.GetSize());
-        ItemAdd(table->OuterRect, 0);
-    }
-
-    if (table->Flags & ImGuiTableFlags_NoHostExtendX)
-    {
-        IM_ASSERT((table->Flags & ImGuiTableFlags_ScrollX) == 0);
-        outer_window->DC.CursorMaxPos.x = ImMax(backup_outer_max_pos.x, table->OuterRect.Min.x + table->ColumnsAutoFitWidth);
-    }
-    else if (table->UserOuterSize.x <= 0.0f)
-    {
-        const float decoration_size = (table->Flags & ImGuiTableFlags_ScrollX) ? inner_window->ScrollbarSizes.x : 0.0f;
-        outer_window->DC.IdealMaxPos.x = ImMax(outer_window->DC.IdealMaxPos.x, table->OuterRect.Min.x + table->ColumnsAutoFitWidth + decoration_size - table->UserOuterSize.x);
-        outer_window->DC.CursorMaxPos.x = ImMax(backup_outer_max_pos.x, ImMin(table->OuterRect.Max.x, table->OuterRect.Min.x + table->ColumnsAutoFitWidth));
-    }
-    else
-    {
-        outer_window->DC.CursorMaxPos.x = ImMax(backup_outer_max_pos.x, table->OuterRect.Max.x);
-    }
-    if (table->UserOuterSize.y <= 0.0f)
-    {
-        const float decoration_size = (table->Flags & ImGuiTableFlags_ScrollY) ? inner_window->ScrollbarSizes.y : 0.0f;
-        outer_window->DC.IdealMaxPos.y = ImMax(outer_window->DC.IdealMaxPos.y, inner_content_max_y + decoration_size - table->UserOuterSize.y);
-        outer_window->DC.CursorMaxPos.y = ImMax(backup_outer_max_pos.y, ImMin(table->OuterRect.Max.y, inner_content_max_y));
-    }
-    else
-    {
-        outer_window->DC.CursorMaxPos.y = ImMax(backup_outer_max_pos.y, table->OuterRect.Max.y);
-    }
-
-    if (table->IsSettingsDirty)
-        TableSaveSettings(table);
-    table->IsInitializing = false;
-
-    IM_ASSERT(g.CurrentWindow == outer_window && g.CurrentTable == table);
-    g.CurrentTableStack.pop_back();
-    g.CurrentTable = g.CurrentTableStack.Size ? g.Tables.GetByIndex(g.CurrentTableStack.back().Index) : NULL;
-    outer_window->DC.CurrentTableIdx = g.CurrentTable ? g.Tables.GetIndex(g.CurrentTable) : -1;
-}
-
-void ImGui::TableSetupColumn(const char* label, ImGuiTableColumnFlags flags, float init_width_or_weight, ImGuiID user_id)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    IM_ASSERT(table != NULL && "Need to call TableSetupColumn() after BeginTable()!");
-    IM_ASSERT(table->IsLayoutLocked == false && "Need to call call TableSetupColumn() before first row!");
-    IM_ASSERT((flags & ImGuiTableColumnFlags_StatusMask_) == 0 && "Illegal to pass StatusMask values to TableSetupColumn()");
-    if (table->DeclColumnsCount >= table->ColumnsCount)
-    {
-        IM_ASSERT_USER_ERROR(table->DeclColumnsCount < table->ColumnsCount, "Called TableSetupColumn() too many times!");
-        return;
-    }
-
-    ImGuiTableColumn* column = &table->Columns[table->DeclColumnsCount];
-    table->DeclColumnsCount++;
-
-    if (table->IsDefaultSizingPolicy && (flags & ImGuiTableColumnFlags_WidthMask_) == 0 && (flags & ImGuiTableFlags_ScrollX) == 0)
-        IM_ASSERT(init_width_or_weight <= 0.0f && "Can only specify width/weight if sizing policy is set explicitly in either Table or Column.");
-
-    if ((flags & ImGuiTableColumnFlags_WidthMask_) == 0 && init_width_or_weight > 0.0f)
-        if ((table->Flags & ImGuiTableFlags_SizingMask_) == ImGuiTableFlags_SizingFixedFit || (table->Flags & ImGuiTableFlags_SizingMask_) == ImGuiTableFlags_SizingFixedSame)
-            flags |= ImGuiTableColumnFlags_WidthFixed;
-
-    TableSetupColumnFlags(table, column, flags);
-    column->UserID = user_id;
-    flags = column->Flags;
-
-    column->InitStretchWeightOrWidth = init_width_or_weight;
-    if (table->IsInitializing)
-    {
-        if (column->WidthRequest < 0.0f && column->StretchWeight < 0.0f)
-        {
-            if ((flags & ImGuiTableColumnFlags_WidthFixed) && init_width_or_weight > 0.0f)
-                column->WidthRequest = init_width_or_weight;
-            if (flags & ImGuiTableColumnFlags_WidthStretch)
-                column->StretchWeight = (init_width_or_weight > 0.0f) ? init_width_or_weight : -1.0f;
-
-            if (init_width_or_weight > 0.0f)
-                column->AutoFitQueue = 0x00;
-        }
-
-        if ((flags & ImGuiTableColumnFlags_DefaultHide) && (table->SettingsLoadedFlags & ImGuiTableFlags_Hideable) == 0)
-            column->IsEnabled = column->IsEnabledNextFrame = false;
-        if (flags & ImGuiTableColumnFlags_DefaultSort && (table->SettingsLoadedFlags & ImGuiTableFlags_Sortable) == 0)
-        {
-            column->SortOrder = 0;                
-            column->SortDirection = (column->Flags & ImGuiTableColumnFlags_PreferSortDescending) ? (ImS8)ImGuiSortDirection_Descending : (ImU8)(ImGuiSortDirection_Ascending);
-        }
-    }
-
-    column->NameOffset = -1;
-    if (label != NULL && label[0] != 0)
-    {
-        column->NameOffset = (ImS16)table->ColumnsNames.size();
-        table->ColumnsNames.append(label, label + strlen(label) + 1);
-    }
-}
-
-void ImGui::TableSetupScrollFreeze(int columns, int rows)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    IM_ASSERT(table != NULL && "Need to call TableSetupColumn() after BeginTable()!");
-    IM_ASSERT(table->IsLayoutLocked == false && "Need to call TableSetupColumn() before first row!");
-    IM_ASSERT(columns >= 0 && columns < IMGUI_TABLE_MAX_COLUMNS);
-    IM_ASSERT(rows >= 0 && rows < 128);   
-
-    table->FreezeColumnsRequest = (table->Flags & ImGuiTableFlags_ScrollX) ? (ImGuiTableColumnIdx)columns : 0;
-    table->FreezeColumnsCount = (table->InnerWindow->Scroll.x != 0.0f) ? table->FreezeColumnsRequest : 0;
-    table->FreezeRowsRequest = (table->Flags & ImGuiTableFlags_ScrollY) ? (ImGuiTableColumnIdx)rows : 0;
-    table->FreezeRowsCount = (table->InnerWindow->Scroll.y != 0.0f) ? table->FreezeRowsRequest : 0;
-    table->IsUnfrozenRows = (table->FreezeRowsCount == 0);              
-}
-
-int ImGui::TableGetColumnCount()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    return table ? table->ColumnsCount : 0;
-}
-
-const char* ImGui::TableGetColumnName(int column_n)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    if (!table)
-        return NULL;
-    if (column_n < 0)
-        column_n = table->CurrentColumn;
-    return TableGetColumnName(table, column_n);
-}
-
-const char* ImGui::TableGetColumnName(const ImGuiTable* table, int column_n)
-{
-    if (table->IsLayoutLocked == false && column_n >= table->DeclColumnsCount)
-        return "";       
-    const ImGuiTableColumn* column = &table->Columns[column_n];
-    if (column->NameOffset == -1)
-        return "";
-    return &table->ColumnsNames.Buf[column->NameOffset];
-}
-
-void ImGui::TableSetColumnEnabled(int column_n, bool enabled)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    IM_ASSERT(table != NULL);
-    if (!table)
-        return;
-    if (column_n < 0)
-        column_n = table->CurrentColumn;
-    IM_ASSERT(column_n >= 0 && column_n < table->ColumnsCount);
-    ImGuiTableColumn* column = &table->Columns[column_n];
-    column->IsEnabledNextFrame = enabled;
-}
-
-ImGuiTableColumnFlags ImGui::TableGetColumnFlags(int column_n)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    if (!table)
-        return ImGuiTableColumnFlags_None;
-    if (column_n < 0)
-        column_n = table->CurrentColumn;
-    if (column_n == table->ColumnsCount)
-        return (table->HoveredColumnBody == column_n) ? ImGuiTableColumnFlags_IsHovered : ImGuiTableColumnFlags_None;
-    return table->Columns[column_n].Flags;
-}
-
-ImRect ImGui::TableGetCellBgRect(const ImGuiTable* table, int column_n)
-{
-    const ImGuiTableColumn* column = &table->Columns[column_n];
-    float x1 = column->MinX;
-    float x2 = column->MaxX;
-    if (column->PrevEnabledColumn == -1)
-        x1 -= table->CellSpacingX1;
-    if (column->NextEnabledColumn == -1)
-        x2 += table->CellSpacingX2;
-    return ImRect(x1, table->RowPosY1, x2, table->RowPosY2);
-}
-
-ImGuiID ImGui::TableGetColumnResizeID(const ImGuiTable* table, int column_n, int instance_no)
-{
-    IM_ASSERT(column_n >= 0 && column_n < table->ColumnsCount);
-    ImGuiID id = table->ID + 1 + (instance_no * table->ColumnsCount) + column_n;
-    return id;
-}
-
-int ImGui::TableGetHoveredColumn()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    if (!table)
-        return -1;
-    return (int)table->HoveredColumnBody;
-}
-
-void ImGui::TableSetBgColor(ImGuiTableBgTarget target, ImU32 color, int column_n)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    IM_ASSERT(target != ImGuiTableBgTarget_None);
-
-    if (color == IM_COL32_DISABLE)
-        color = 0;
-
-    switch (target)
-    {
-    case ImGuiTableBgTarget_CellBg:
-    {
-        if (table->RowPosY1 > table->InnerClipRect.Max.y)  
-            return;
-        if (column_n == -1)
-            column_n = table->CurrentColumn;
-        if ((table->VisibleMaskByIndex & ((ImU64)1 << column_n)) == 0)
-            return;
-        if (table->RowCellDataCurrent < 0 || table->RowCellData[table->RowCellDataCurrent].Column != column_n)
-            table->RowCellDataCurrent++;
-        ImGuiTableCellData* cell_data = &table->RowCellData[table->RowCellDataCurrent];
-        cell_data->BgColor = color;
-        cell_data->Column = (ImGuiTableColumnIdx)column_n;
-        break;
-    }
-    case ImGuiTableBgTarget_RowBg0:
-    case ImGuiTableBgTarget_RowBg1:
-    {
-        if (table->RowPosY1 > table->InnerClipRect.Max.y)  
-            return;
-        IM_ASSERT(column_n == -1);
-        int bg_idx = (target == ImGuiTableBgTarget_RowBg1) ? 1 : 0;
-        table->RowBgColor[bg_idx] = color;
-        break;
-    }
-    default:
-        IM_ASSERT(0);
-    }
-}
-
-int ImGui::TableGetRowIndex()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    if (!table)
-        return 0;
-    return table->CurrentRow;
-}
-
-void ImGui::TableNextRow(ImGuiTableRowFlags row_flags, float row_min_height)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-
-    if (!table->IsLayoutLocked)
-        TableUpdateLayout(table);
-    if (table->IsInsideRow)
-        TableEndRow(table);
-
-    table->LastRowFlags = table->RowFlags;
-    table->RowFlags = row_flags;
-    table->RowMinHeight = row_min_height;
-    TableBeginRow(table);
-
-    table->RowPosY2 += table->CellPaddingY * 2.0f;
-    table->RowPosY2 = ImMax(table->RowPosY2, table->RowPosY1 + row_min_height);
-
-    table->InnerWindow->SkipItems = true;
-}
-
-void ImGui::TableBeginRow(ImGuiTable* table)
-{
-    ImGuiWindow* window = table->InnerWindow;
-    IM_ASSERT(!table->IsInsideRow);
-
-    table->CurrentRow++;
-    table->CurrentColumn = -1;
-    table->RowBgColor[0] = table->RowBgColor[1] = IM_COL32_DISABLE;
-    table->RowCellDataCurrent = -1;
-    table->IsInsideRow = true;
-
-    float next_y1 = table->RowPosY2;
-    if (table->CurrentRow == 0 && table->FreezeRowsCount > 0)
-        next_y1 = window->DC.CursorPos.y = table->OuterRect.Min.y;
-
-    table->RowPosY1 = table->RowPosY2 = next_y1;
-    table->RowTextBaseline = 0.0f;
-    table->RowIndentOffsetX = window->DC.Indent.x - table->HostIndentX;   
-    window->DC.PrevLineTextBaseOffset = 0.0f;
-    window->DC.CursorMaxPos.y = next_y1;
-
-    if (table->RowFlags & ImGuiTableRowFlags_Headers)
-    {
-        TableSetBgColor(ImGuiTableBgTarget_RowBg0, GetColorU32(ImGuiCol_TableHeaderBg));
-        if (table->CurrentRow == 0)
-            table->IsUsingHeaders = true;
-    }
-}
-
-void ImGui::TableEndRow(ImGuiTable* table)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    IM_ASSERT(window == table->InnerWindow);
-    IM_ASSERT(table->IsInsideRow);
-
-    if (table->CurrentColumn != -1)
-        TableEndCell(table);
-
-    if (g.LogEnabled)
-        LogRenderedText(NULL, "|");
-
-    window->DC.CursorPos.y = table->RowPosY2;
-
-    const float bg_y1 = table->RowPosY1;
-    const float bg_y2 = table->RowPosY2;
-    const bool unfreeze_rows_actual = (table->CurrentRow + 1 == table->FreezeRowsCount);
-    const bool unfreeze_rows_request = (table->CurrentRow + 1 == table->FreezeRowsRequest);
-    if (table->CurrentRow == 0)
-        table->LastFirstRowHeight = bg_y2 - bg_y1;
-
-    const bool is_visible = (bg_y2 >= table->InnerClipRect.Min.y && bg_y1 <= table->InnerClipRect.Max.y);
-    if (is_visible)
-    {
-        ImU32 bg_col0 = 0;
-        ImU32 bg_col1 = 0;
-        if (table->RowBgColor[0] != IM_COL32_DISABLE)
-            bg_col0 = table->RowBgColor[0];
-        else if (table->Flags & ImGuiTableFlags_RowBg)
-            bg_col0 = GetColorU32((table->RowBgColorCounter & 1) ? ImGuiCol_TableRowBgAlt : ImGuiCol_TableRowBg);
-        if (table->RowBgColor[1] != IM_COL32_DISABLE)
-            bg_col1 = table->RowBgColor[1];
-
-        ImU32 border_col = 0;
-        const float border_size = TABLE_BORDER_SIZE;
-        if (table->CurrentRow > 0 || table->InnerWindow == table->OuterWindow)
-            if (table->Flags & ImGuiTableFlags_BordersInnerH)
-                border_col = (table->LastRowFlags & ImGuiTableRowFlags_Headers) ? table->BorderColorStrong : table->BorderColorLight;
-
-        const bool draw_cell_bg_color = table->RowCellDataCurrent >= 0;
-        const bool draw_strong_bottom_border = unfreeze_rows_actual;
-        if ((bg_col0 | bg_col1 | border_col) != 0 || draw_strong_bottom_border || draw_cell_bg_color)
-        {
-            if ((table->Flags & ImGuiTableFlags_NoClip) == 0)
-                window->DrawList->_CmdHeader.ClipRect = table->Bg0ClipRectForDrawCmd.ToVec4();
-            table->DrawSplitter.SetCurrentChannel(window->DrawList, TABLE_DRAW_CHANNEL_BG0);
-        }
-
-        if (bg_col0 || bg_col1)
-        {
-            ImRect row_rect(table->WorkRect.Min.x, bg_y1, table->WorkRect.Max.x, bg_y2);
-            row_rect.ClipWith(table->BgClipRect);
-            if (bg_col0 != 0 && row_rect.Min.y < row_rect.Max.y)
-                window->DrawList->AddRectFilled(row_rect.Min, row_rect.Max, bg_col0);
-            if (bg_col1 != 0 && row_rect.Min.y < row_rect.Max.y)
-                window->DrawList->AddRectFilled(row_rect.Min, row_rect.Max, bg_col1);
-        }
-
-        if (draw_cell_bg_color)
-        {
-            ImGuiTableCellData* cell_data_end = &table->RowCellData[table->RowCellDataCurrent];
-            for (ImGuiTableCellData* cell_data = &table->RowCellData[0]; cell_data <= cell_data_end; cell_data++)
-            {
-                const ImGuiTableColumn* column = &table->Columns[cell_data->Column];
-                ImRect cell_bg_rect = TableGetCellBgRect(table, cell_data->Column);
-                cell_bg_rect.ClipWith(table->BgClipRect);
-                cell_bg_rect.Min.x = ImMax(cell_bg_rect.Min.x, column->ClipRect.Min.x);              
-                cell_bg_rect.Max.x = ImMin(cell_bg_rect.Max.x, column->MaxX);
-                window->DrawList->AddRectFilled(cell_bg_rect.Min, cell_bg_rect.Max, cell_data->BgColor);
-            }
-        }
-
-        if (border_col && bg_y1 >= table->BgClipRect.Min.y && bg_y1 < table->BgClipRect.Max.y)
-            window->DrawList->AddLine(ImVec2(table->BorderX1, bg_y1), ImVec2(table->BorderX2, bg_y1), border_col, border_size);
-
-        if (draw_strong_bottom_border && bg_y2 >= table->BgClipRect.Min.y && bg_y2 < table->BgClipRect.Max.y)
-            window->DrawList->AddLine(ImVec2(table->BorderX1, bg_y2), ImVec2(table->BorderX2, bg_y2), table->BorderColorStrong, border_size);
-    }
-
-    if (unfreeze_rows_request)
-        for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-        {
-            ImGuiTableColumn* column = &table->Columns[column_n];
-            column->NavLayerCurrent = (ImS8)((column_n < table->FreezeColumnsCount) ? ImGuiNavLayer_Menu : ImGuiNavLayer_Main);
-        }
-    if (unfreeze_rows_actual)
-    {
-        IM_ASSERT(table->IsUnfrozenRows == false);
-        table->IsUnfrozenRows = true;
-
-        float y0 = ImMax(table->RowPosY2 + 1, window->InnerClipRect.Min.y);
-        table->BgClipRect.Min.y = table->Bg2ClipRectForDrawCmd.Min.y = ImMin(y0, window->InnerClipRect.Max.y);
-        table->BgClipRect.Max.y = table->Bg2ClipRectForDrawCmd.Max.y = window->InnerClipRect.Max.y;
-        table->Bg2DrawChannelCurrent = table->Bg2DrawChannelUnfrozen;
-        IM_ASSERT(table->Bg2ClipRectForDrawCmd.Min.y <= table->Bg2ClipRectForDrawCmd.Max.y);
-
-        float row_height = table->RowPosY2 - table->RowPosY1;
-        table->RowPosY2 = window->DC.CursorPos.y = table->WorkRect.Min.y + table->RowPosY2 - table->OuterRect.Min.y;
-        table->RowPosY1 = table->RowPosY2 - row_height;
-        for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-        {
-            ImGuiTableColumn* column = &table->Columns[column_n];
-            column->DrawChannelCurrent = column->DrawChannelUnfrozen;
-            column->ClipRect.Min.y = table->Bg2ClipRectForDrawCmd.Min.y;
-        }
-
-        SetWindowClipRectBeforeSetChannel(window, table->Columns[0].ClipRect);
-        table->DrawSplitter.SetCurrentChannel(window->DrawList, table->Columns[0].DrawChannelCurrent);
-    }
-
-    if (!(table->RowFlags & ImGuiTableRowFlags_Headers))
-        table->RowBgColorCounter++;
-    table->IsInsideRow = false;
-}
-
-int ImGui::TableGetColumnIndex()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    if (!table)
-        return 0;
-    return table->CurrentColumn;
-}
-
-bool ImGui::TableSetColumnIndex(int column_n)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    if (!table)
-        return false;
-
-    if (table->CurrentColumn != column_n)
-    {
-        if (table->CurrentColumn != -1)
-            TableEndCell(table);
-        IM_ASSERT(column_n >= 0 && table->ColumnsCount);
-        TableBeginCell(table, column_n);
-    }
-
-    return (table->RequestOutputMaskByIndex & ((ImU64)1 << column_n)) != 0;
-}
-
-bool ImGui::TableNextColumn()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    if (!table)
-        return false;
-
-    if (table->IsInsideRow && table->CurrentColumn + 1 < table->ColumnsCount)
-    {
-        if (table->CurrentColumn != -1)
-            TableEndCell(table);
-        TableBeginCell(table, table->CurrentColumn + 1);
-    }
-    else
-    {
-        TableNextRow();
-        TableBeginCell(table, 0);
-    }
-
-    int column_n = table->CurrentColumn;
-    return (table->RequestOutputMaskByIndex & ((ImU64)1 << column_n)) != 0;
-}
-
-
-void ImGui::TableBeginCell(ImGuiTable* table, int column_n)
-{
-    ImGuiTableColumn* column = &table->Columns[column_n];
-    ImGuiWindow* window = table->InnerWindow;
-    table->CurrentColumn = column_n;
-
-    float start_x = column->WorkMinX;
-
-    if (column->Flags & ImGuiTableColumnFlags_IndentEnable) 
-        start_x += table->RowIndentOffsetX;             
-    window->DC.CursorPos.x = start_x;
-    window->DC.CursorPos.y = table->RowPosY1 + table->CellPaddingY;
-    window->DC.CursorMaxPos.x = window->DC.CursorPos.x;
-    window->DC.ColumnsOffset.x = start_x - window->Pos.x - window->DC.Indent.x;  
-    window->DC.CurrLineTextBaseOffset = table->RowTextBaseline;
-    window->DC.NavLayerCurrent = (ImGuiNavLayer)column->NavLayerCurrent;
-
-    window->WorkRect.Min.y = window->DC.CursorPos.y;
-    window->WorkRect.Min.x = column->WorkMinX;
-    window->WorkRect.Max.x = column->WorkMaxX;
-    window->DC.ItemWidth = column->ItemWidth;
-
-    if (!column->IsEnabled)
-        window->DC.CursorPos.y = ImMax(window->DC.CursorPos.y, table->RowPosY2);
-
-    window->SkipItems = column->IsSkipItems;
-    if (column->IsSkipItems)
-    {
-        window->DC.LastItemId = 0;
-        window->DC.LastItemStatusFlags = 0;
-    }
-
-    if (table->Flags & ImGuiTableFlags_NoClip)
-    {
-        table->DrawSplitter.SetCurrentChannel(window->DrawList, TABLE_DRAW_CHANNEL_NOCLIP);
-    }
-    else
-    {
-        SetWindowClipRectBeforeSetChannel(window, column->ClipRect);
-        table->DrawSplitter.SetCurrentChannel(window->DrawList, column->DrawChannelCurrent);
-    }
-
-    ImGuiContext& g = *GImGui;
-    if (g.LogEnabled && !column->IsSkipItems)
-    {
-        LogRenderedText(&window->DC.CursorPos, "|");
-        g.LogLinePosY = FLT_MAX;
-    }
-}
-
-void ImGui::TableEndCell(ImGuiTable* table)
-{
-    ImGuiTableColumn* column = &table->Columns[table->CurrentColumn];
-    ImGuiWindow* window = table->InnerWindow;
-
-    float* p_max_pos_x;
-    if (table->RowFlags & ImGuiTableRowFlags_Headers)
-        p_max_pos_x = &column->ContentMaxXHeadersUsed;                 
-    else
-        p_max_pos_x = table->IsUnfrozenRows ? &column->ContentMaxXUnfrozen : &column->ContentMaxXFrozen;
-    *p_max_pos_x = ImMax(*p_max_pos_x, window->DC.CursorMaxPos.x);
-    table->RowPosY2 = ImMax(table->RowPosY2, window->DC.CursorMaxPos.y + table->CellPaddingY);
-    column->ItemWidth = window->DC.ItemWidth;
-
-    table->RowTextBaseline = ImMax(table->RowTextBaseline, window->DC.PrevLineTextBaseOffset);
-}
-
-float ImGui::TableGetMaxColumnWidth(const ImGuiTable* table, int column_n)
-{
-    const ImGuiTableColumn* column = &table->Columns[column_n];
-    float max_width = FLT_MAX;
-    const float min_column_distance = table->MinColumnWidth + table->CellPaddingX * 2.0f + table->CellSpacingX1 + table->CellSpacingX2;
-    if (table->Flags & ImGuiTableFlags_ScrollX)
-    {
-        if (column->DisplayOrder < table->FreezeColumnsRequest)
-        {
-            max_width = (table->InnerClipRect.Max.x - (table->FreezeColumnsRequest - column->DisplayOrder) * min_column_distance) - column->MinX;
-            max_width = max_width - table->OuterPaddingX - table->CellPaddingX - table->CellSpacingX2;
-        }
-    }
-    else if ((table->Flags & ImGuiTableFlags_NoKeepColumnsVisible) == 0)
-    {
-        max_width = table->WorkRect.Max.x - (table->ColumnsEnabledCount - column->IndexWithinEnabledSet - 1) * min_column_distance - column->MinX;
-        max_width -= table->CellSpacingX2;
-        max_width -= table->CellPaddingX * 2.0f;
-        max_width -= table->OuterPaddingX;
-    }
-    return max_width;
-}
-
-float ImGui::TableGetColumnWidthAuto(ImGuiTable* table, ImGuiTableColumn* column)
-{
-    const float content_width_body = ImMax(column->ContentMaxXFrozen, column->ContentMaxXUnfrozen) - column->WorkMinX;
-    const float content_width_headers = column->ContentMaxXHeadersIdeal - column->WorkMinX;
-    float width_auto = content_width_body;
-    if (!(column->Flags & ImGuiTableColumnFlags_NoHeaderWidth))
-        width_auto = ImMax(width_auto, content_width_headers);
-
-    if ((column->Flags & ImGuiTableColumnFlags_WidthFixed) && column->InitStretchWeightOrWidth > 0.0f)
-        if (!(table->Flags & ImGuiTableFlags_Resizable) || (column->Flags & ImGuiTableColumnFlags_NoResize))
-            width_auto = column->InitStretchWeightOrWidth;
-
-    return ImMax(width_auto, table->MinColumnWidth);
-}
-
-void ImGui::TableSetColumnWidth(int column_n, float width)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    IM_ASSERT(table != NULL && table->IsLayoutLocked == false);
-    IM_ASSERT(column_n >= 0 && column_n < table->ColumnsCount);
-    ImGuiTableColumn* column_0 = &table->Columns[column_n];
-    float column_0_width = width;
-
-    IM_ASSERT(table->MinColumnWidth > 0.0f);
-    const float min_width = table->MinColumnWidth;
-    const float max_width = ImMax(min_width, TableGetMaxColumnWidth(table, column_n));
-    column_0_width = ImClamp(column_0_width, min_width, max_width);
-    if (column_0->WidthGiven == column_0_width || column_0->WidthRequest == column_0_width)
-        return;
-
-    ImGuiTableColumn* column_1 = (column_0->NextEnabledColumn != -1) ? &table->Columns[column_0->NextEnabledColumn] : NULL;
-
-    if (column_0->Flags & ImGuiTableColumnFlags_WidthFixed)
-        if (!column_1 || table->LeftMostStretchedColumn == -1 || table->Columns[table->LeftMostStretchedColumn].DisplayOrder >= column_0->DisplayOrder)
-        {
-            column_0->WidthRequest = column_0_width;
-            table->IsSettingsDirty = true;
-            return;
-        }
-
-    if (column_1 == NULL)
-        column_1 = (column_0->PrevEnabledColumn != -1) ? &table->Columns[column_0->PrevEnabledColumn] : NULL;
-    if (column_1 == NULL)
-        return;
-
-    float column_1_width = ImMax(column_1->WidthRequest - (column_0_width - column_0->WidthRequest), min_width);
-    column_0_width = column_0->WidthRequest + column_1->WidthRequest - column_1_width;
-    IM_ASSERT(column_0_width > 0.0f && column_1_width > 0.0f);
-    column_0->WidthRequest = column_0_width;
-    column_1->WidthRequest = column_1_width;
-    if ((column_0->Flags | column_1->Flags) & ImGuiTableColumnFlags_WidthStretch)
-        TableUpdateColumnsWeightFromWidth(table);
-    table->IsSettingsDirty = true;
-}
-
-void ImGui::TableSetColumnWidthAutoSingle(ImGuiTable* table, int column_n)
-{
-    ImGuiTableColumn* column = &table->Columns[column_n];
-    if (!column->IsEnabled)
-        return;
-    column->CannotSkipItemsQueue = (1 << 0);
-    table->AutoFitSingleColumn = (ImGuiTableColumnIdx)column_n;
-}
-
-void ImGui::TableSetColumnWidthAutoAll(ImGuiTable* table)
-{
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-    {
-        ImGuiTableColumn* column = &table->Columns[column_n];
-        if (!column->IsEnabled && !(column->Flags & ImGuiTableColumnFlags_WidthStretch))        
-            continue;
-        column->CannotSkipItemsQueue = (1 << 0);
-        column->AutoFitQueue = (1 << 1);
-    }
-}
-
-void ImGui::TableUpdateColumnsWeightFromWidth(ImGuiTable* table)
-{
-    IM_ASSERT(table->LeftMostStretchedColumn != -1 && table->RightMostStretchedColumn != -1);
-
-    float visible_weight = 0.0f;
-    float visible_width = 0.0f;
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-    {
-        ImGuiTableColumn* column = &table->Columns[column_n];
-        if (!column->IsEnabled || !(column->Flags & ImGuiTableColumnFlags_WidthStretch))
-            continue;
-        IM_ASSERT(column->StretchWeight > 0.0f);
-        visible_weight += column->StretchWeight;
-        visible_width += column->WidthRequest;
-    }
-    IM_ASSERT(visible_weight > 0.0f && visible_width > 0.0f);
-
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-    {
-        ImGuiTableColumn* column = &table->Columns[column_n];
-        if (!column->IsEnabled || !(column->Flags & ImGuiTableColumnFlags_WidthStretch))
-            continue;
-        column->StretchWeight = (column->WidthRequest / visible_width) * visible_weight;
-        IM_ASSERT(column->StretchWeight > 0.0f);
-    }
-}
-
-void ImGui::TablePushBackgroundChannel()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiTable* table = g.CurrentTable;
-
-    table->HostBackupInnerClipRect = window->ClipRect;
-    SetWindowClipRectBeforeSetChannel(window, table->Bg2ClipRectForDrawCmd);
-    table->DrawSplitter.SetCurrentChannel(window->DrawList, table->Bg2DrawChannelCurrent);
-}
-
-void ImGui::TablePopBackgroundChannel()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiTable* table = g.CurrentTable;
-    ImGuiTableColumn* column = &table->Columns[table->CurrentColumn];
-
-    SetWindowClipRectBeforeSetChannel(window, table->HostBackupInnerClipRect);
-    table->DrawSplitter.SetCurrentChannel(window->DrawList, column->DrawChannelCurrent);
-}
-
-void ImGui::TableSetupDrawChannels(ImGuiTable* table)
-{
-    const int freeze_row_multiplier = (table->FreezeRowsCount > 0) ? 2 : 1;
-    const int channels_for_row = (table->Flags & ImGuiTableFlags_NoClip) ? 1 : table->ColumnsEnabledCount;
-    const int channels_for_bg = 1 + 1 * freeze_row_multiplier;
-    const int channels_for_dummy = (table->ColumnsEnabledCount < table->ColumnsCount || table->VisibleMaskByIndex != table->EnabledMaskByIndex) ? +1 : 0;
-    const int channels_total = channels_for_bg + (channels_for_row * freeze_row_multiplier) + channels_for_dummy;
-    table->DrawSplitter.Split(table->InnerWindow->DrawList, channels_total);
-    table->DummyDrawChannel = (ImGuiTableDrawChannelIdx)((channels_for_dummy > 0) ? channels_total - 1 : -1);
-    table->Bg2DrawChannelCurrent = TABLE_DRAW_CHANNEL_BG2_FROZEN;
-    table->Bg2DrawChannelUnfrozen = (ImGuiTableDrawChannelIdx)((table->FreezeRowsCount > 0) ? 2 + channels_for_row : TABLE_DRAW_CHANNEL_BG2_FROZEN);
-
-    int draw_channel_current = 2;
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-    {
-        ImGuiTableColumn* column = &table->Columns[column_n];
-        if (column->IsVisibleX && column->IsVisibleY)
-        {
-            column->DrawChannelFrozen = (ImGuiTableDrawChannelIdx)(draw_channel_current);
-            column->DrawChannelUnfrozen = (ImGuiTableDrawChannelIdx)(draw_channel_current + (table->FreezeRowsCount > 0 ? channels_for_row + 1 : 0));
-            if (!(table->Flags & ImGuiTableFlags_NoClip))
-                draw_channel_current++;
-        }
-        else
-        {
-            column->DrawChannelFrozen = column->DrawChannelUnfrozen = table->DummyDrawChannel;
-        }
-        column->DrawChannelCurrent = column->DrawChannelFrozen;
-    }
-
-    table->BgClipRect = table->InnerClipRect;
-    table->Bg0ClipRectForDrawCmd = table->OuterWindow->ClipRect;
-    table->Bg2ClipRectForDrawCmd = table->HostClipRect;
-    IM_ASSERT(table->BgClipRect.Min.y <= table->BgClipRect.Max.y);
-}
-
-void ImGui::TableMergeDrawChannels(ImGuiTable* table)
-{
-    ImGuiContext& g = *GImGui;
-    ImDrawListSplitter* splitter = &table->DrawSplitter;
-    const bool has_freeze_v = (table->FreezeRowsCount > 0);
-    const bool has_freeze_h = (table->FreezeColumnsCount > 0);
-    IM_ASSERT(splitter->_Current == 0);
-
-    struct MergeGroup
-    {
-        ImRect  ClipRect;
-        int     ChannelsCount;
-        ImBitArray<IMGUI_TABLE_MAX_DRAW_CHANNELS> ChannelsMask;
-    };
-    int merge_group_mask = 0x00;
-    MergeGroup merge_groups[4];
-    memset(merge_groups, 0, sizeof(merge_groups));
-
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-    {
-        if ((table->VisibleMaskByIndex & ((ImU64)1 << column_n)) == 0)
-            continue;
-        ImGuiTableColumn* column = &table->Columns[column_n];
-
-        const int merge_group_sub_count = has_freeze_v ? 2 : 1;
-        for (int merge_group_sub_n = 0; merge_group_sub_n < merge_group_sub_count; merge_group_sub_n++)
-        {
-            const int channel_no = (merge_group_sub_n == 0) ? column->DrawChannelFrozen : column->DrawChannelUnfrozen;
-
-            ImDrawChannel* src_channel = &splitter->_Channels[channel_no];
-            if (src_channel->_CmdBuffer.Size > 0 && src_channel->_CmdBuffer.back().ElemCount == 0)
-                src_channel->_CmdBuffer.pop_back();
-            if (src_channel->_CmdBuffer.Size != 1)
-                continue;
-
-            if (!(column->Flags & ImGuiTableColumnFlags_NoClip))
-            {
-                float content_max_x;
-                if (!has_freeze_v)
-                    content_max_x = ImMax(column->ContentMaxXUnfrozen, column->ContentMaxXHeadersUsed);    
-                else if (merge_group_sub_n == 0)
-                    content_max_x = ImMax(column->ContentMaxXFrozen, column->ContentMaxXHeadersUsed);         
-                else
-                    content_max_x = column->ContentMaxXUnfrozen;                                              
-                if (content_max_x > column->ClipRect.Max.x)
-                    continue;
-            }
-
-            const int merge_group_n = (has_freeze_h && column_n < table->FreezeColumnsCount ? 0 : 1) + (has_freeze_v && merge_group_sub_n == 0 ? 0 : 2);
-            IM_ASSERT(channel_no < IMGUI_TABLE_MAX_DRAW_CHANNELS);
-            MergeGroup* merge_group = &merge_groups[merge_group_n];
-            if (merge_group->ChannelsCount == 0)
-                merge_group->ClipRect = ImRect(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX);
-            merge_group->ChannelsMask.SetBit(channel_no);
-            merge_group->ChannelsCount++;
-            merge_group->ClipRect.Add(src_channel->_CmdBuffer[0].ClipRect);
-            merge_group_mask |= (1 << merge_group_n);
-        }
-
-        column->DrawChannelCurrent = (ImGuiTableDrawChannelIdx)-1;
-    }
-
-#if 0
-    if (g.IO.KeyShift)
-        for (int merge_group_n = 0; merge_group_n < IM_ARRAYSIZE(merge_groups); merge_group_n++)
-        {
-            MergeGroup* merge_group = &merge_groups[merge_group_n];
-            if (merge_group->ChannelsCount == 0)
-                continue;
-            char buf[32];
-            ImFormatString(buf, 32, "MG%d:%d", merge_group_n, merge_group->ChannelsCount);
-            ImVec2 text_pos = merge_group->ClipRect.Min + ImVec2(4, 4);
-            ImVec2 text_size = CalcTextSize(buf, NULL);
-            GetForegroundDrawList()->AddRectFilled(text_pos, text_pos + text_size, IM_COL32(0, 0, 0, 255));
-            GetForegroundDrawList()->AddText(text_pos, IM_COL32(255, 255, 0, 255), buf, NULL);
-            GetForegroundDrawList()->AddRect(merge_group->ClipRect.Min, merge_group->ClipRect.Max, IM_COL32(255, 255, 0, 255));
-        }
-#endif
-
-    if (merge_group_mask != 0)
-    {
-        const int LEADING_DRAW_CHANNELS = 2;
-        g.DrawChannelsTempMergeBuffer.resize(splitter->_Count - LEADING_DRAW_CHANNELS);          
-        ImDrawChannel* dst_tmp = g.DrawChannelsTempMergeBuffer.Data;
-        ImBitArray<IMGUI_TABLE_MAX_DRAW_CHANNELS> remaining_mask;                            
-        remaining_mask.ClearAllBits();
-        remaining_mask.SetBitRange(LEADING_DRAW_CHANNELS, splitter->_Count);
-        remaining_mask.ClearBit(table->Bg2DrawChannelUnfrozen);
-        IM_ASSERT(has_freeze_v == false || table->Bg2DrawChannelUnfrozen != TABLE_DRAW_CHANNEL_BG2_FROZEN);
-        int remaining_count = splitter->_Count - (has_freeze_v ? LEADING_DRAW_CHANNELS + 1 : LEADING_DRAW_CHANNELS);
-        ImRect host_rect = table->HostClipRect;
-        for (int merge_group_n = 0; merge_group_n < IM_ARRAYSIZE(merge_groups); merge_group_n++)
-        {
-            if (int merge_channels_count = merge_groups[merge_group_n].ChannelsCount)
-            {
-                MergeGroup* merge_group = &merge_groups[merge_group_n];
-                ImRect merge_clip_rect = merge_group->ClipRect;
-
-                if ((merge_group_n & 1) == 0 || !has_freeze_h)
-                    merge_clip_rect.Min.x = ImMin(merge_clip_rect.Min.x, host_rect.Min.x);
-                if ((merge_group_n & 2) == 0 || !has_freeze_v)
-                    merge_clip_rect.Min.y = ImMin(merge_clip_rect.Min.y, host_rect.Min.y);
-                if ((merge_group_n & 1) != 0)
-                    merge_clip_rect.Max.x = ImMax(merge_clip_rect.Max.x, host_rect.Max.x);
-                if ((merge_group_n & 2) != 0 && (table->Flags & ImGuiTableFlags_NoHostExtendY) == 0)
-                    merge_clip_rect.Max.y = ImMax(merge_clip_rect.Max.y, host_rect.Max.y);
-#if 0
-                GetOverlayDrawList()->AddRect(merge_group->ClipRect.Min, merge_group->ClipRect.Max, IM_COL32(255, 0, 0, 200), 0.0f, ~0, 1.0f);
-                GetOverlayDrawList()->AddLine(merge_group->ClipRect.Min, merge_clip_rect.Min, IM_COL32(255, 100, 0, 200));
-                GetOverlayDrawList()->AddLine(merge_group->ClipRect.Max, merge_clip_rect.Max, IM_COL32(255, 100, 0, 200));
-#endif
-                remaining_count -= merge_group->ChannelsCount;
-                for (int n = 0; n < IM_ARRAYSIZE(remaining_mask.Storage); n++)
-                    remaining_mask.Storage[n] &= ~merge_group->ChannelsMask.Storage[n];
-                for (int n = 0; n < splitter->_Count && merge_channels_count != 0; n++)
-                {
-                    if (!merge_group->ChannelsMask.TestBit(n))
-                        continue;
-                    merge_group->ChannelsMask.ClearBit(n);
-                    merge_channels_count--;
-
-                    ImDrawChannel* channel = &splitter->_Channels[n];
-                    IM_ASSERT(channel->_CmdBuffer.Size == 1 && merge_clip_rect.Contains(ImRect(channel->_CmdBuffer[0].ClipRect)));
-                    channel->_CmdBuffer[0].ClipRect = merge_clip_rect.ToVec4();
-                    memcpy(dst_tmp++, channel, sizeof(ImDrawChannel));
-                }
-            }
-
-            if (merge_group_n == 1 && has_freeze_v)
-                memcpy(dst_tmp++, &splitter->_Channels[table->Bg2DrawChannelUnfrozen], sizeof(ImDrawChannel));
-        }
-
-        for (int n = 0; n < splitter->_Count && remaining_count != 0; n++)
-        {
-            if (!remaining_mask.TestBit(n))
-                continue;
-            ImDrawChannel* channel = &splitter->_Channels[n];
-            memcpy(dst_tmp++, channel, sizeof(ImDrawChannel));
-            remaining_count--;
-        }
-        IM_ASSERT(dst_tmp == g.DrawChannelsTempMergeBuffer.Data + g.DrawChannelsTempMergeBuffer.Size);
-        memcpy(splitter->_Channels.Data + LEADING_DRAW_CHANNELS, g.DrawChannelsTempMergeBuffer.Data, (splitter->_Count - LEADING_DRAW_CHANNELS) * sizeof(ImDrawChannel));
-    }
-}
-
-void ImGui::TableDrawBorders(ImGuiTable* table)
-{
-    ImGuiWindow* inner_window = table->InnerWindow;
-    if (!table->OuterWindow->ClipRect.Overlaps(table->OuterRect))
-        return;
-
-    ImDrawList* inner_drawlist = inner_window->DrawList;
-    table->DrawSplitter.SetCurrentChannel(inner_drawlist, TABLE_DRAW_CHANNEL_BG0);
-    inner_drawlist->PushClipRect(table->Bg0ClipRectForDrawCmd.Min, table->Bg0ClipRectForDrawCmd.Max, false);
-
-    const float border_size = TABLE_BORDER_SIZE;
-    const float draw_y1 = table->InnerRect.Min.y;
-    const float draw_y2_body = table->InnerRect.Max.y;
-    const float draw_y2_head = table->IsUsingHeaders ? ImMin(table->InnerRect.Max.y, (table->FreezeRowsCount >= 1 ? table->InnerRect.Min.y : table->WorkRect.Min.y) + table->LastFirstRowHeight) : draw_y1;
-    if (table->Flags & ImGuiTableFlags_BordersInnerV)
-    {
-        for (int order_n = 0; order_n < table->ColumnsCount; order_n++)
-        {
-            if (!(table->EnabledMaskByDisplayOrder & ((ImU64)1 << order_n)))
-                continue;
-
-            const int column_n = table->DisplayOrderToIndex[order_n];
-            ImGuiTableColumn* column = &table->Columns[column_n];
-            const bool is_hovered = (table->HoveredColumnBorder == column_n);
-            const bool is_resized = (table->ResizedColumn == column_n) && (table->InstanceInteracted == table->InstanceCurrent);
-            const bool is_resizable = (column->Flags & (ImGuiTableColumnFlags_NoResize | ImGuiTableColumnFlags_NoDirectResize_)) == 0;
-            const bool is_frozen_separator = (table->FreezeColumnsCount != -1 && table->FreezeColumnsCount == order_n + 1);
-            if (column->MaxX > table->InnerClipRect.Max.x && !is_resized)
-                continue;
-
-            if (column->NextEnabledColumn == -1 && !is_resizable)
-                if ((table->Flags & ImGuiTableFlags_SizingMask_) != ImGuiTableFlags_SizingFixedSame || (table->Flags & ImGuiTableFlags_NoHostExtendX))
-                    continue;
-            if (column->MaxX <= column->ClipRect.Min.x)                
-                continue;
-
-            ImU32 col;
-            float draw_y2;
-            if (is_hovered || is_resized || is_frozen_separator)
-            {
-                draw_y2 = draw_y2_body;
-                col = is_resized ? GetColorU32(ImGuiCol_SeparatorActive) : is_hovered ? GetColorU32(ImGuiCol_SeparatorHovered) : table->BorderColorStrong;
-            }
-            else
-            {
-                draw_y2 = (table->Flags & (ImGuiTableFlags_NoBordersInBody | ImGuiTableFlags_NoBordersInBodyUntilResize)) ? draw_y2_head : draw_y2_body;
-                col = (table->Flags & (ImGuiTableFlags_NoBordersInBody | ImGuiTableFlags_NoBordersInBodyUntilResize)) ? table->BorderColorStrong : table->BorderColorLight;
-            }
-
-            if (draw_y2 > draw_y1)
-                inner_drawlist->AddLine(ImVec2(column->MaxX, draw_y1), ImVec2(column->MaxX, draw_y2), col, border_size);
-        }
-    }
-
-    if (table->Flags & ImGuiTableFlags_BordersOuter)
-    {
-        const ImRect outer_border = table->OuterRect;
-        const ImU32 outer_col = table->BorderColorStrong;
-        if ((table->Flags & ImGuiTableFlags_BordersOuter) == ImGuiTableFlags_BordersOuter)
-        {
-            inner_drawlist->AddRect(outer_border.Min, outer_border.Max, outer_col, 0.0f, ~0, border_size);
-        }
-        else if (table->Flags & ImGuiTableFlags_BordersOuterV)
-        {
-            inner_drawlist->AddLine(outer_border.Min, ImVec2(outer_border.Min.x, outer_border.Max.y), outer_col, border_size);
-            inner_drawlist->AddLine(ImVec2(outer_border.Max.x, outer_border.Min.y), outer_border.Max, outer_col, border_size);
-        }
-        else if (table->Flags & ImGuiTableFlags_BordersOuterH)
-        {
-            inner_drawlist->AddLine(outer_border.Min, ImVec2(outer_border.Max.x, outer_border.Min.y), outer_col, border_size);
-            inner_drawlist->AddLine(ImVec2(outer_border.Min.x, outer_border.Max.y), outer_border.Max, outer_col, border_size);
-        }
-    }
-    if ((table->Flags & ImGuiTableFlags_BordersInnerH) && table->RowPosY2 < table->OuterRect.Max.y)
-    {
-        const float border_y = table->RowPosY2;
-        if (border_y >= table->BgClipRect.Min.y && border_y < table->BgClipRect.Max.y)
-            inner_drawlist->AddLine(ImVec2(table->BorderX1, border_y), ImVec2(table->BorderX2, border_y), table->BorderColorLight, border_size);
-    }
-
-    inner_drawlist->PopClipRect();
-}
-
-ImGuiTableSortSpecs* ImGui::TableGetSortSpecs()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    IM_ASSERT(table != NULL);
-
-    if (!(table->Flags & ImGuiTableFlags_Sortable))
-        return NULL;
-
-    if (!table->IsLayoutLocked)
-        TableUpdateLayout(table);
-
-    if (table->IsSortSpecsDirty)
-        TableSortSpecsBuild(table);
-
-    return &table->SortSpecs;
-}
-
-static inline ImGuiSortDirection TableGetColumnAvailSortDirection(ImGuiTableColumn* column, int n)
-{
-    IM_ASSERT(n < column->SortDirectionsAvailCount);
-    return (column->SortDirectionsAvailList >> (n << 1)) & 0x03;
-}
-
-void ImGui::TableFixColumnSortDirection(ImGuiTable* table, ImGuiTableColumn* column)
-{
-    if (column->SortOrder == -1 || (column->SortDirectionsAvailMask & (1 << column->SortDirection)) != 0)
-        return;
-    column->SortDirection = (ImU8)TableGetColumnAvailSortDirection(column, 0);
-    table->IsSortSpecsDirty = true;
-}
-
-IM_STATIC_ASSERT(ImGuiSortDirection_None == 0 && ImGuiSortDirection_Ascending == 1 && ImGuiSortDirection_Descending == 2);
-ImGuiSortDirection ImGui::TableGetColumnNextSortDirection(ImGuiTableColumn* column)
-{
-    IM_ASSERT(column->SortDirectionsAvailCount > 0);
-    if (column->SortOrder == -1)
-        return TableGetColumnAvailSortDirection(column, 0);
-    for (int n = 0; n < 3; n++)
-        if (column->SortDirection == TableGetColumnAvailSortDirection(column, n))
-            return TableGetColumnAvailSortDirection(column, (n + 1) % column->SortDirectionsAvailCount);
-    IM_ASSERT(0);
-    return ImGuiSortDirection_None;
-}
-
-void ImGui::TableSetColumnSortDirection(int column_n, ImGuiSortDirection sort_direction, bool append_to_sort_specs)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-
-    if (!(table->Flags & ImGuiTableFlags_SortMulti))
-        append_to_sort_specs = false;
-    if (!(table->Flags & ImGuiTableFlags_SortTristate))
-        IM_ASSERT(sort_direction != ImGuiSortDirection_None);
-
-    ImGuiTableColumnIdx sort_order_max = 0;
-    if (append_to_sort_specs)
-        for (int other_column_n = 0; other_column_n < table->ColumnsCount; other_column_n++)
-            sort_order_max = ImMax(sort_order_max, table->Columns[other_column_n].SortOrder);
-
-    ImGuiTableColumn* column = &table->Columns[column_n];
-    column->SortDirection = (ImU8)sort_direction;
-    if (column->SortDirection == ImGuiSortDirection_None)
-        column->SortOrder = -1;
-    else if (column->SortOrder == -1 || !append_to_sort_specs)
-        column->SortOrder = append_to_sort_specs ? sort_order_max + 1 : 0;
-
-    for (int other_column_n = 0; other_column_n < table->ColumnsCount; other_column_n++)
-    {
-        ImGuiTableColumn* other_column = &table->Columns[other_column_n];
-        if (other_column != column && !append_to_sort_specs)
-            other_column->SortOrder = -1;
-        TableFixColumnSortDirection(table, other_column);
-    }
-    table->IsSettingsDirty = true;
-    table->IsSortSpecsDirty = true;
-}
-
-void ImGui::TableSortSpecsSanitize(ImGuiTable* table)
-{
-    IM_ASSERT(table->Flags & ImGuiTableFlags_Sortable);
-
-    int sort_order_count = 0;
-    ImU64 sort_order_mask = 0x00;
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-    {
-        ImGuiTableColumn* column = &table->Columns[column_n];
-        if (column->SortOrder != -1 && !column->IsEnabled)
-            column->SortOrder = -1;
-        if (column->SortOrder == -1)
-            continue;
-        sort_order_count++;
-        sort_order_mask |= ((ImU64)1 << column->SortOrder);
-        IM_ASSERT(sort_order_count < (int)sizeof(sort_order_mask) * 8);
-    }
-
-    const bool need_fix_linearize = ((ImU64)1 << sort_order_count) != (sort_order_mask + 1);
-    const bool need_fix_single_sort_order = (sort_order_count > 1) && !(table->Flags & ImGuiTableFlags_SortMulti);
-    if (need_fix_linearize || need_fix_single_sort_order)
-    {
-        ImU64 fixed_mask = 0x00;
-        for (int sort_n = 0; sort_n < sort_order_count; sort_n++)
-        {
-            int column_with_smallest_sort_order = -1;
-            for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-                if ((fixed_mask & ((ImU64)1 << (ImU64)column_n)) == 0 && table->Columns[column_n].SortOrder != -1)
-                    if (column_with_smallest_sort_order == -1 || table->Columns[column_n].SortOrder < table->Columns[column_with_smallest_sort_order].SortOrder)
-                        column_with_smallest_sort_order = column_n;
-            IM_ASSERT(column_with_smallest_sort_order != -1);
-            fixed_mask |= ((ImU64)1 << column_with_smallest_sort_order);
-            table->Columns[column_with_smallest_sort_order].SortOrder = (ImGuiTableColumnIdx)sort_n;
-
-            if (need_fix_single_sort_order)
-            {
-                sort_order_count = 1;
-                for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-                    if (column_n != column_with_smallest_sort_order)
-                        table->Columns[column_n].SortOrder = -1;
-                break;
-            }
-        }
-    }
-
-    if (sort_order_count == 0 && !(table->Flags & ImGuiTableFlags_SortTristate))
-        for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-        {
-            ImGuiTableColumn* column = &table->Columns[column_n];
-            if (column->IsEnabled && !(column->Flags & ImGuiTableColumnFlags_NoSort))
-            {
-                sort_order_count = 1;
-                column->SortOrder = 0;
-                column->SortDirection = (ImU8)TableGetColumnAvailSortDirection(column, 0);
-                break;
-            }
-        }
-
-    table->SortSpecsCount = (ImGuiTableColumnIdx)sort_order_count;
-}
-
-void ImGui::TableSortSpecsBuild(ImGuiTable* table)
-{
-    IM_ASSERT(table->IsSortSpecsDirty);
-    TableSortSpecsSanitize(table);
-
-    table->SortSpecsMulti.resize(table->SortSpecsCount <= 1 ? 0 : table->SortSpecsCount);
-    ImGuiTableColumnSortSpecs* sort_specs = (table->SortSpecsCount == 0) ? NULL : (table->SortSpecsCount == 1) ? &table->SortSpecsSingle : table->SortSpecsMulti.Data;
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-    {
-        ImGuiTableColumn* column = &table->Columns[column_n];
-        if (column->SortOrder == -1)
-            continue;
-        IM_ASSERT(column->SortOrder < table->SortSpecsCount);
-        ImGuiTableColumnSortSpecs* sort_spec = &sort_specs[column->SortOrder];
-        sort_spec->ColumnUserID = column->UserID;
-        sort_spec->ColumnIndex = (ImGuiTableColumnIdx)column_n;
-        sort_spec->SortOrder = (ImGuiTableColumnIdx)column->SortOrder;
-        sort_spec->SortDirection = column->SortDirection;
-    }
-    table->SortSpecs.Specs = sort_specs;
-    table->SortSpecs.SpecsCount = table->SortSpecsCount;
-    table->SortSpecs.SpecsDirty = true;      
-    table->IsSortSpecsDirty = false;       
-}
-
-float ImGui::TableGetHeaderRowHeight()
-{
-    float row_height = GetTextLineHeight();
-    int columns_count = TableGetColumnCount();
-    for (int column_n = 0; column_n < columns_count; column_n++)
-        if (TableGetColumnFlags(column_n) & ImGuiTableColumnFlags_IsEnabled)
-            row_height = ImMax(row_height, CalcTextSize(TableGetColumnName(column_n)).y);
-    row_height += GetStyle().CellPadding.y * 2.0f;
-    return row_height;
-}
-
-void ImGui::TableHeadersRow()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    IM_ASSERT(table != NULL && "Need to call TableHeadersRow() after BeginTable()!");
-
-    if (!table->IsLayoutLocked)
-        TableUpdateLayout(table);
-
-    const float row_y1 = GetCursorScreenPos().y;
-    const float row_height = TableGetHeaderRowHeight();
-    TableNextRow(ImGuiTableRowFlags_Headers, row_height);
-    if (table->HostSkipItems)           
-        return;
-
-    const int columns_count = TableGetColumnCount();
-    for (int column_n = 0; column_n < columns_count; column_n++)
-    {
-        if (!TableSetColumnIndex(column_n))
-            continue;
-
-        const char* name = TableGetColumnName(column_n);
-        PushID(table->InstanceCurrent * table->ColumnsCount + column_n);
-        TableHeader(name);
-        PopID();
-    }
-
-    ImVec2 mouse_pos = ImGui::GetMousePos();
-    if (IsMouseReleased(1) && TableGetHoveredColumn() == columns_count)
-        if (mouse_pos.y >= row_y1 && mouse_pos.y < row_y1 + row_height)
-            TableOpenContextMenu(-1);      
-}
-
-void ImGui::TableHeader(const char* label)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return;
-
-    ImGuiTable* table = g.CurrentTable;
-    IM_ASSERT(table != NULL && "Need to call TableHeader() after BeginTable()!");
-    IM_ASSERT(table->CurrentColumn != -1);
-    const int column_n = table->CurrentColumn;
-    ImGuiTableColumn* column = &table->Columns[column_n];
-
-    if (label == NULL)
-        label = "";
-    const char* label_end = FindRenderedTextEnd(label);
-    ImVec2 label_size = CalcTextSize(label, label_end, true);
-    ImVec2 label_pos = window->DC.CursorPos;
-
-    ImRect cell_r = TableGetCellBgRect(table, column_n);
-    float label_height = ImMax(label_size.y, table->RowMinHeight - table->CellPaddingY * 2.0f);
-
-    float w_arrow = 0.0f;
-    float w_sort_text = 0.0f;
-    char sort_order_suf[4] = "";
-    const float ARROW_SCALE = 0.65f;
-    if ((table->Flags & ImGuiTableFlags_Sortable) && !(column->Flags & ImGuiTableColumnFlags_NoSort))
-    {
-        w_arrow = ImFloor(g.FontSize * ARROW_SCALE + g.Style.FramePadding.x);
-        if (column->SortOrder > 0)
-        {
-            ImFormatString(sort_order_suf, IM_ARRAYSIZE(sort_order_suf), "%d", column->SortOrder + 1);
-            w_sort_text = g.Style.ItemInnerSpacing.x + CalcTextSize(sort_order_suf).x;
-        }
-    }
-
-    float max_pos_x = label_pos.x + label_size.x + w_sort_text + w_arrow;
-    column->ContentMaxXHeadersUsed = ImMax(column->ContentMaxXHeadersUsed, column->WorkMaxX);
-    column->ContentMaxXHeadersIdeal = ImMax(column->ContentMaxXHeadersIdeal, max_pos_x);
-
-    const bool selected = (table->IsContextPopupOpen && table->ContextPopupColumn == column_n && table->InstanceInteracted == table->InstanceCurrent);
-    ImGuiID id = window->GetID(label);
-    ImRect bb(cell_r.Min.x, cell_r.Min.y, cell_r.Max.x, ImMax(cell_r.Max.y, cell_r.Min.y + label_height + g.Style.CellPadding.y * 2.0f));
-    ItemSize(ImVec2(0.0f, label_height));         
-    if (!ItemAdd(bb, id))
-        return;
-
-    bool hovered, held;
-    bool pressed = ButtonBehavior(bb, id, &hovered, &held, ImGuiButtonFlags_AllowItemOverlap);
-    if (g.ActiveId != id)
-        SetItemAllowOverlap();
-    if (held || hovered || selected)
-    {
-        const ImU32 col = GetColorU32(held ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header);
-        TableSetBgColor(ImGuiTableBgTarget_CellBg, col, table->CurrentColumn);
-        RenderNavHighlight(bb, id, ImGuiNavHighlightFlags_TypeThin | ImGuiNavHighlightFlags_NoRounding);
-    }
-    else
-    {
-        if ((table->RowFlags & ImGuiTableRowFlags_Headers) == 0)
-            TableSetBgColor(ImGuiTableBgTarget_CellBg, GetColorU32(ImGuiCol_TableHeaderBg), table->CurrentColumn);
-    }
-    if (held)
-        table->HeldHeaderColumn = (ImGuiTableColumnIdx)column_n;
-    window->DC.CursorPos.y -= g.Style.ItemSpacing.y * 0.5f;
-
-    if (held && (table->Flags & ImGuiTableFlags_Reorderable) && IsMouseDragging(0) && !g.DragDropActive)
-    {
-        table->ReorderColumn = (ImGuiTableColumnIdx)column_n;
-        table->InstanceInteracted = table->InstanceCurrent;
-
-        if (g.IO.MouseDelta.x < 0.0f && g.IO.MousePos.x < cell_r.Min.x)
-            if (ImGuiTableColumn* prev_column = (column->PrevEnabledColumn != -1) ? &table->Columns[column->PrevEnabledColumn] : NULL)
-                if (!((column->Flags | prev_column->Flags) & ImGuiTableColumnFlags_NoReorder))
-                    if ((column->IndexWithinEnabledSet < table->FreezeColumnsRequest) == (prev_column->IndexWithinEnabledSet < table->FreezeColumnsRequest))
-                        table->ReorderColumnDir = -1;
-        if (g.IO.MouseDelta.x > 0.0f && g.IO.MousePos.x > cell_r.Max.x)
-            if (ImGuiTableColumn* next_column = (column->NextEnabledColumn != -1) ? &table->Columns[column->NextEnabledColumn] : NULL)
-                if (!((column->Flags | next_column->Flags) & ImGuiTableColumnFlags_NoReorder))
-                    if ((column->IndexWithinEnabledSet < table->FreezeColumnsRequest) == (next_column->IndexWithinEnabledSet < table->FreezeColumnsRequest))
-                        table->ReorderColumnDir = +1;
-    }
-
-    const float ellipsis_max = cell_r.Max.x - w_arrow - w_sort_text;
-    if ((table->Flags & ImGuiTableFlags_Sortable) && !(column->Flags & ImGuiTableColumnFlags_NoSort))
-    {
-        if (column->SortOrder != -1)
-        {
-            float x = ImMax(cell_r.Min.x, cell_r.Max.x - w_arrow - w_sort_text);
-            float y = label_pos.y;
-            if (column->SortOrder > 0)
-            {
-                PushStyleColor(ImGuiCol_Text, GetColorU32(ImGuiCol_Text, 0.70f));
-                RenderText(ImVec2(x + g.Style.ItemInnerSpacing.x, y), sort_order_suf);
-                PopStyleColor();
-                x += w_sort_text;
-            }
-            RenderArrow(window->DrawList, ImVec2(x, y), GetColorU32(ImGuiCol_Text), column->SortDirection == ImGuiSortDirection_Ascending ? ImGuiDir_Up : ImGuiDir_Down, ARROW_SCALE);
-        }
-
-        if (pressed && table->ReorderColumn != column_n)
-        {
-            ImGuiSortDirection sort_direction = TableGetColumnNextSortDirection(column);
-            TableSetColumnSortDirection(column_n, sort_direction, g.IO.KeyShift);
-        }
-    }
-
-    RenderTextEllipsis(window->DrawList, label_pos, ImVec2(ellipsis_max, label_pos.y + label_height + g.Style.FramePadding.y), ellipsis_max, ellipsis_max, label, label_end, &label_size);
-
-    const bool text_clipped = label_size.x > (ellipsis_max - label_pos.x);
-    if (text_clipped && hovered && g.HoveredIdNotActiveTimer > g.TooltipSlowDelay)
-        SetTooltip("%.*s", (int)(label_end - label), label);
-
-    if (IsMouseReleased(1) && IsItemHovered())
-        TableOpenContextMenu(column_n);
-}
-
-void ImGui::TableOpenContextMenu(int column_n)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTable* table = g.CurrentTable;
-    if (column_n == -1 && table->CurrentColumn != -1)              
-        column_n = table->CurrentColumn;
-    if (column_n == table->ColumnsCount)                     
-        column_n = -1;
-    IM_ASSERT(column_n >= -1 && column_n < table->ColumnsCount);
-    if (table->Flags & (ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable))
-    {
-        table->IsContextPopupOpen = true;
-        table->ContextPopupColumn = (ImGuiTableColumnIdx)column_n;
-        table->InstanceInteracted = table->InstanceCurrent;
-        const ImGuiID context_menu_id = ImHashStr("##ContextMenu", 0, table->ID);
-        OpenPopupEx(context_menu_id, ImGuiPopupFlags_None);
-    }
-}
-
-void ImGui::TableDrawContextMenu(ImGuiTable* table)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return;
-
-    bool want_separator = false;
-    const int column_n = (table->ContextPopupColumn >= 0 && table->ContextPopupColumn < table->ColumnsCount) ? table->ContextPopupColumn : -1;
-    ImGuiTableColumn* column = (column_n != -1) ? &table->Columns[column_n] : NULL;
-
-    if (table->Flags & ImGuiTableFlags_Resizable)
-    {
-        if (column != NULL)
-        {
-            const bool can_resize = !(column->Flags & ImGuiTableColumnFlags_NoResize) && column->IsEnabled;
-            if (MenuItem("Size column to fit###SizeOne", NULL, false, can_resize))
-                TableSetColumnWidthAutoSingle(table, column_n);
-        }
-
-        const char* size_all_desc;
-        if (table->ColumnsEnabledFixedCount == table->ColumnsEnabledCount && (table->Flags & ImGuiTableFlags_SizingMask_) != ImGuiTableFlags_SizingFixedSame)
-            size_all_desc = "Size all columns to fit###SizeAll";          
-        else
-            size_all_desc = "Size all columns to default###SizeAll";        
-        if (MenuItem(size_all_desc, NULL))
-            TableSetColumnWidthAutoAll(table);
-        want_separator = true;
-    }
-
-    if (table->Flags & ImGuiTableFlags_Reorderable)
-    {
-        if (MenuItem("Reset order", NULL, false, !table->IsDefaultDisplayOrder))
-            table->IsResetDisplayOrderRequest = true;
-        want_separator = true;
-    }
-
-#if 0
-    if ((table->Flags & ImGuiTableFlags_Sortable) && column != NULL && (column->Flags & ImGuiTableColumnFlags_NoSort) == 0)
-    {
-        if (want_separator)
-            Separator();
-        want_separator = true;
-
-        bool append_to_sort_specs = g.IO.KeyShift;
-        if (MenuItem("Sort in Ascending Order", NULL, column->SortOrder != -1 && column->SortDirection == ImGuiSortDirection_Ascending, (column->Flags & ImGuiTableColumnFlags_NoSortAscending) == 0))
-            TableSetColumnSortDirection(table, column_n, ImGuiSortDirection_Ascending, append_to_sort_specs);
-        if (MenuItem("Sort in Descending Order", NULL, column->SortOrder != -1 && column->SortDirection == ImGuiSortDirection_Descending, (column->Flags & ImGuiTableColumnFlags_NoSortDescending) == 0))
-            TableSetColumnSortDirection(table, column_n, ImGuiSortDirection_Descending, append_to_sort_specs);
-    }
-#endif
-
-    if (table->Flags & ImGuiTableFlags_Hideable)
-    {
-        if (want_separator)
-            Separator();
-        want_separator = true;
-
-        PushItemFlag(ImGuiItemFlags_SelectableDontClosePopup, true);
-        for (int other_column_n = 0; other_column_n < table->ColumnsCount; other_column_n++)
-        {
-            ImGuiTableColumn* other_column = &table->Columns[other_column_n];
-            const char* name = TableGetColumnName(table, other_column_n);
-            if (name == NULL || name[0] == 0)
-                name = "<Unknown>";
-
-            bool menu_item_active = (other_column->Flags & ImGuiTableColumnFlags_NoHide) ? false : true;
-            if (other_column->IsEnabled && table->ColumnsEnabledCount <= 1)
-                menu_item_active = false;
-            if (MenuItem(name, NULL, other_column->IsEnabled, menu_item_active))
-                other_column->IsEnabledNextFrame = !other_column->IsEnabled;
-        }
-        PopItemFlag();
-    }
-}
-
-static void TableSettingsInit(ImGuiTableSettings* settings, ImGuiID id, int columns_count, int columns_count_max)
-{
-    IM_PLACEMENT_NEW(settings) ImGuiTableSettings();
-    ImGuiTableColumnSettings* settings_column = settings->GetColumnSettings();
-    for (int n = 0; n < columns_count_max; n++, settings_column++)
-        IM_PLACEMENT_NEW(settings_column) ImGuiTableColumnSettings();
-    settings->ID = id;
-    settings->ColumnsCount = (ImGuiTableColumnIdx)columns_count;
-    settings->ColumnsCountMax = (ImGuiTableColumnIdx)columns_count_max;
-    settings->WantApply = true;
-}
-
-static size_t TableSettingsCalcChunkSize(int columns_count)
-{
-    return sizeof(ImGuiTableSettings) + (size_t)columns_count * sizeof(ImGuiTableColumnSettings);
-}
-
-ImGuiTableSettings* ImGui::TableSettingsCreate(ImGuiID id, int columns_count)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiTableSettings* settings = g.SettingsTables.alloc_chunk(TableSettingsCalcChunkSize(columns_count));
-    TableSettingsInit(settings, id, columns_count, columns_count);
-    return settings;
-}
-
-ImGuiTableSettings* ImGui::TableSettingsFindByID(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings))
-        if (settings->ID == id)
-            return settings;
-    return NULL;
-}
-
-ImGuiTableSettings* ImGui::TableGetBoundSettings(ImGuiTable* table)
-{
-    if (table->SettingsOffset != -1)
-    {
-        ImGuiContext& g = *GImGui;
-        ImGuiTableSettings* settings = g.SettingsTables.ptr_from_offset(table->SettingsOffset);
-        IM_ASSERT(settings->ID == table->ID);
-        if (settings->ColumnsCountMax >= table->ColumnsCount)
-            return settings;  
-        settings->ID = 0;           
-    }
-    return NULL;
-}
-
-void ImGui::TableResetSettings(ImGuiTable* table)
-{
-    table->IsInitializing = table->IsSettingsDirty = true;
-    table->IsResetAllRequest = false;
-    table->IsSettingsRequestLoad = false;                       
-    table->SettingsLoadedFlags = ImGuiTableFlags_None;                
-}
-
-void ImGui::TableSaveSettings(ImGuiTable* table)
-{
-    table->IsSettingsDirty = false;
-    if (table->Flags & ImGuiTableFlags_NoSavedSettings)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    ImGuiTableSettings* settings = TableGetBoundSettings(table);
-    if (settings == NULL)
-    {
-        settings = TableSettingsCreate(table->ID, table->ColumnsCount);
-        table->SettingsOffset = g.SettingsTables.offset_from_ptr(settings);
-    }
-    settings->ColumnsCount = (ImGuiTableColumnIdx)table->ColumnsCount;
-
-    IM_ASSERT(settings->ID == table->ID);
-    IM_ASSERT(settings->ColumnsCount == table->ColumnsCount && settings->ColumnsCountMax >= settings->ColumnsCount);
-    ImGuiTableColumn* column = table->Columns.Data;
-    ImGuiTableColumnSettings* column_settings = settings->GetColumnSettings();
-
-    bool save_ref_scale = false;
-    settings->SaveFlags = ImGuiTableFlags_None;
-    for (int n = 0; n < table->ColumnsCount; n++, column++, column_settings++)
-    {
-        const float width_or_weight = (column->Flags & ImGuiTableColumnFlags_WidthStretch) ? column->StretchWeight : column->WidthRequest;
-        column_settings->WidthOrWeight = width_or_weight;
-        column_settings->Index = (ImGuiTableColumnIdx)n;
-        column_settings->DisplayOrder = column->DisplayOrder;
-        column_settings->SortOrder = column->SortOrder;
-        column_settings->SortDirection = column->SortDirection;
-        column_settings->IsEnabled = column->IsEnabled;
-        column_settings->IsStretch = (column->Flags & ImGuiTableColumnFlags_WidthStretch) ? 1 : 0;
-        if ((column->Flags & ImGuiTableColumnFlags_WidthStretch) == 0)
-            save_ref_scale = true;
-
-        if (width_or_weight != column->InitStretchWeightOrWidth)
-            settings->SaveFlags |= ImGuiTableFlags_Resizable;
-        if (column->DisplayOrder != n)
-            settings->SaveFlags |= ImGuiTableFlags_Reorderable;
-        if (column->SortOrder != -1)
-            settings->SaveFlags |= ImGuiTableFlags_Sortable;
-        if (column->IsEnabled != ((column->Flags & ImGuiTableColumnFlags_DefaultHide) == 0))
-            settings->SaveFlags |= ImGuiTableFlags_Hideable;
-    }
-    settings->SaveFlags &= table->Flags;
-    settings->RefScale = save_ref_scale ? table->RefScale : 0.0f;
-
-    MarkIniSettingsDirty();
-}
-
-void ImGui::TableLoadSettings(ImGuiTable* table)
-{
-    ImGuiContext& g = *GImGui;
-    table->IsSettingsRequestLoad = false;
-    if (table->Flags & ImGuiTableFlags_NoSavedSettings)
-        return;
-
-    ImGuiTableSettings* settings;
-    if (table->SettingsOffset == -1)
-    {
-        settings = TableSettingsFindByID(table->ID);
-        if (settings == NULL)
-            return;
-        if (settings->ColumnsCount != table->ColumnsCount)             
-            table->IsSettingsDirty = true;
-        table->SettingsOffset = g.SettingsTables.offset_from_ptr(settings);
-    }
-    else
-    {
-        settings = TableGetBoundSettings(table);
-    }
-
-    table->SettingsLoadedFlags = settings->SaveFlags;
-    table->RefScale = settings->RefScale;
-
-    ImGuiTableColumnSettings* column_settings = settings->GetColumnSettings();
-    ImU64 display_order_mask = 0;
-    for (int data_n = 0; data_n < settings->ColumnsCount; data_n++, column_settings++)
-    {
-        int column_n = column_settings->Index;
-        if (column_n < 0 || column_n >= table->ColumnsCount)
-            continue;
-
-        ImGuiTableColumn* column = &table->Columns[column_n];
-        if (settings->SaveFlags & ImGuiTableFlags_Resizable)
-        {
-            if (column_settings->IsStretch)
-                column->StretchWeight = column_settings->WidthOrWeight;
-            else
-                column->WidthRequest = column_settings->WidthOrWeight;
-            column->AutoFitQueue = 0x00;
-        }
-        if (settings->SaveFlags & ImGuiTableFlags_Reorderable)
-            column->DisplayOrder = column_settings->DisplayOrder;
-        else
-            column->DisplayOrder = (ImGuiTableColumnIdx)column_n;
-        display_order_mask |= (ImU64)1 << column->DisplayOrder;
-        column->IsEnabled = column->IsEnabledNextFrame = column_settings->IsEnabled;
-        column->SortOrder = column_settings->SortOrder;
-        column->SortDirection = column_settings->SortDirection;
-    }
-
-    const ImU64 expected_display_order_mask = (settings->ColumnsCount == 64) ? ~0 : ((ImU64)1 << settings->ColumnsCount) - 1;
-    if (display_order_mask != expected_display_order_mask)
-        for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-            table->Columns[column_n].DisplayOrder = (ImGuiTableColumnIdx)column_n;
-
-    for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
-        table->DisplayOrderToIndex[table->Columns[column_n].DisplayOrder] = (ImGuiTableColumnIdx)column_n;
-}
-
-static void TableSettingsHandler_ClearAll(ImGuiContext* ctx, ImGuiSettingsHandler*)
-{
-    ImGuiContext& g = *ctx;
-    for (int i = 0; i != g.Tables.GetSize(); i++)
-        g.Tables.GetByIndex(i)->SettingsOffset = -1;
-    g.SettingsTables.clear();
-}
-
-static void TableSettingsHandler_ApplyAll(ImGuiContext* ctx, ImGuiSettingsHandler*)
-{
-    ImGuiContext& g = *ctx;
-    for (int i = 0; i != g.Tables.GetSize(); i++)
-    {
-        ImGuiTable* table = g.Tables.GetByIndex(i);
-        table->IsSettingsRequestLoad = true;
-        table->SettingsOffset = -1;
-    }
-}
-
-static void* TableSettingsHandler_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name)
-{
-    ImGuiID id = 0;
-    int columns_count = 0;
-    if (sscanf(name, "0x%08X,%d", &id, &columns_count) < 2)
-        return NULL;
-
-    if (ImGuiTableSettings* settings = ImGui::TableSettingsFindByID(id))
-    {
-        if (settings->ColumnsCountMax >= columns_count)
-        {
-            TableSettingsInit(settings, id, columns_count, settings->ColumnsCountMax);  
-            return settings;
-        }
-        settings->ID = 0;           
-    }
-    return ImGui::TableSettingsCreate(id, columns_count);
-}
-
-static void TableSettingsHandler_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line)
-{
-    ImGuiTableSettings* settings = (ImGuiTableSettings*)entry;
-    float f = 0.0f;
-    int column_n = 0, r = 0, n = 0;
-
-    if (sscanf(line, "RefScale=%f", &f) == 1) { settings->RefScale = f; return; }
-
-    if (sscanf(line, "Column %d%n", &column_n, &r) == 1)
-    {
-        if (column_n < 0 || column_n >= settings->ColumnsCount)
-            return;
-        line = ImStrSkipBlank(line + r);
-        char c = 0;
-        ImGuiTableColumnSettings* column = settings->GetColumnSettings() + column_n;
-        column->Index = (ImGuiTableColumnIdx)column_n;
-        if (sscanf(line, "UserID=0x%08X%n", (ImU32*)&n, &r)==1) { line = ImStrSkipBlank(line + r); column->UserID = (ImGuiID)n; }
-        if (sscanf(line, "Width=%d%n", &n, &r) == 1)            { line = ImStrSkipBlank(line + r); column->WidthOrWeight = (float)n; column->IsStretch = 0; settings->SaveFlags |= ImGuiTableFlags_Resizable; }
-        if (sscanf(line, "Weight=%f%n", &f, &r) == 1)           { line = ImStrSkipBlank(line + r); column->WidthOrWeight = f; column->IsStretch = 1; settings->SaveFlags |= ImGuiTableFlags_Resizable; }
-        if (sscanf(line, "Visible=%d%n", &n, &r) == 1)          { line = ImStrSkipBlank(line + r); column->IsEnabled = (ImU8)n; settings->SaveFlags |= ImGuiTableFlags_Hideable; }
-        if (sscanf(line, "Order=%d%n", &n, &r) == 1)            { line = ImStrSkipBlank(line + r); column->DisplayOrder = (ImGuiTableColumnIdx)n; settings->SaveFlags |= ImGuiTableFlags_Reorderable; }
-        if (sscanf(line, "Sort=%d%c%n", &n, &c, &r) == 2)       { line = ImStrSkipBlank(line + r); column->SortOrder = (ImGuiTableColumnIdx)n; column->SortDirection = (c == '^') ? ImGuiSortDirection_Descending : ImGuiSortDirection_Ascending; settings->SaveFlags |= ImGuiTableFlags_Sortable; }
-    }
-}
-
-static void TableSettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf)
-{
-    ImGuiContext& g = *ctx;
-    for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings))
-    {
-        if (settings->ID == 0)    
-            continue;
-
-        const bool save_size    = (settings->SaveFlags & ImGuiTableFlags_Resizable) != 0;
-        const bool save_visible = (settings->SaveFlags & ImGuiTableFlags_Hideable) != 0;
-        const bool save_order   = (settings->SaveFlags & ImGuiTableFlags_Reorderable) != 0;
-        const bool save_sort    = (settings->SaveFlags & ImGuiTableFlags_Sortable) != 0;
-        if (!save_size && !save_visible && !save_order && !save_sort)
-            continue;
-
-        buf->reserve(buf->size() + 30 + settings->ColumnsCount * 50);   
-        buf->appendf("[%s][0x%08X,%d]\n", handler->TypeName, settings->ID, settings->ColumnsCount);
-        if (settings->RefScale != 0.0f)
-            buf->appendf("RefScale=%g\n", settings->RefScale);
-        ImGuiTableColumnSettings* column = settings->GetColumnSettings();
-        for (int column_n = 0; column_n < settings->ColumnsCount; column_n++, column++)
-        {
-            buf->appendf("Column %-2d", column_n);
-            if (column->UserID != 0)                    buf->appendf(" UserID=%08X", column->UserID);
-            if (save_size && column->IsStretch)         buf->appendf(" Weight=%.4f", column->WidthOrWeight);
-            if (save_size && !column->IsStretch)        buf->appendf(" Width=%d", (int)column->WidthOrWeight);
-            if (save_visible)                           buf->appendf(" Visible=%d", column->IsEnabled);
-            if (save_order)                             buf->appendf(" Order=%d", column->DisplayOrder);
-            if (save_sort && column->SortOrder != -1)   buf->appendf(" Sort=%d%c", column->SortOrder, (column->SortDirection == ImGuiSortDirection_Ascending) ? 'v' : '^');
-            buf->append("\n");
-        }
-        buf->append("\n");
-    }
-}
-
-void ImGui::TableSettingsInstallHandler(ImGuiContext* context)
-{
-    ImGuiContext& g = *context;
-    ImGuiSettingsHandler ini_handler;
-    ini_handler.TypeName = "Table";
-    ini_handler.TypeHash = ImHashStr("Table");
-    ini_handler.ClearAllFn = TableSettingsHandler_ClearAll;
-    ini_handler.ReadOpenFn = TableSettingsHandler_ReadOpen;
-    ini_handler.ReadLineFn = TableSettingsHandler_ReadLine;
-    ini_handler.ApplyAllFn = TableSettingsHandler_ApplyAll;
-    ini_handler.WriteAllFn = TableSettingsHandler_WriteAll;
-    g.SettingsHandlers.push_back(ini_handler);
-}
-
-void ImGui::TableRemove(ImGuiTable* table)
-{
-    ImGuiContext& g = *GImGui;
-    int table_idx = g.Tables.GetIndex(table);
-    g.Tables.Remove(table->ID, table);
-    g.TablesLastTimeActive[table_idx] = -1.0f;
-}
-
-void ImGui::TableGcCompactTransientBuffers(ImGuiTable* table)
-{
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(table->MemoryCompacted == false);
-    table->DrawSplitter.ClearFreeMemory();
-    table->SortSpecsMulti.clear();
-    table->SortSpecs.Specs = NULL;
-    table->IsSortSpecsDirty = true;
-    table->ColumnsNames.clear();
-    table->MemoryCompacted = true;
-    for (int n = 0; n < table->ColumnsCount; n++)
-        table->Columns[n].NameOffset = -1;
-    g.TablesLastTimeActive[g.Tables.GetIndex(table)] = -1.0f;
-}
-
-void ImGui::TableGcCompactSettings()
-{
-    ImGuiContext& g = *GImGui;
-    int required_memory = 0;
-    for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings))
-        if (settings->ID != 0)
-            required_memory += (int)TableSettingsCalcChunkSize(settings->ColumnsCount);
-    if (required_memory == g.SettingsTables.Buf.Size)
-        return;
-    ImChunkStream<ImGuiTableSettings> new_chunk_stream;
-    new_chunk_stream.Buf.reserve(required_memory);
-    for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings))
-        if (settings->ID != 0)
-            memcpy(new_chunk_stream.alloc_chunk(TableSettingsCalcChunkSize(settings->ColumnsCount)), settings, TableSettingsCalcChunkSize(settings->ColumnsCount));
-    g.SettingsTables.swap(new_chunk_stream);
-}
-
-
-#ifndef IMGUI_DISABLE_METRICS_WINDOW
-
-static const char* DebugNodeTableGetSizingPolicyDesc(ImGuiTableFlags sizing_policy)
-{
-    sizing_policy &= ImGuiTableFlags_SizingMask_;
-    if (sizing_policy == ImGuiTableFlags_SizingFixedFit)    { return "FixedFit"; }
-    if (sizing_policy == ImGuiTableFlags_SizingFixedSame)   { return "FixedSame"; }
-    if (sizing_policy == ImGuiTableFlags_SizingStretchProp) { return "StretchProp"; }
-    if (sizing_policy == ImGuiTableFlags_SizingStretchSame) { return "StretchSame"; }
-    return "N/A";
-}
-
-void ImGui::DebugNodeTable(ImGuiTable* table)
-{
-    char buf[512];
-    char* p = buf;
-    const char* buf_end = buf + IM_ARRAYSIZE(buf);
-    const bool is_active = (table->LastFrameActive >= ImGui::GetFrameCount() - 2);              
-    ImFormatString(p, buf_end - p, "Table 0x%08X (%d columns, in '%s')%s", table->ID, table->ColumnsCount, table->OuterWindow->Name, is_active ? "" : " *Inactive*");
-    if (!is_active) { PushStyleColor(ImGuiCol_Text, GetStyleColorVec4(ImGuiCol_TextDisabled)); }
-    bool open = TreeNode(table, "%s", buf);
-    if (!is_active) { PopStyleColor(); }
-    if (IsItemHovered())
-        GetForegroundDrawList()->AddRect(table->OuterRect.Min, table->OuterRect.Max, IM_COL32(255, 255, 0, 255));
-    if (IsItemVisible() && table->HoveredColumnBody != -1)
-        GetForegroundDrawList()->AddRect(GetItemRectMin(), GetItemRectMax(), IM_COL32(255, 255, 0, 255));
-    if (!open)
-        return;
-    bool clear_settings = SmallButton("Clear settings");
-    BulletText("OuterRect: Pos: (%.1f,%.1f) Size: (%.1f,%.1f) Sizing: '%s'", table->OuterRect.Min.x, table->OuterRect.Min.y, table->OuterRect.GetWidth(), table->OuterRect.GetHeight(), DebugNodeTableGetSizingPolicyDesc(table->Flags));
-    BulletText("ColumnsGivenWidth: %.1f, ColumnsAutoFitWidth: %.1f, InnerWidth: %.1f%s", table->ColumnsGivenWidth, table->ColumnsAutoFitWidth, table->InnerWidth, table->InnerWidth == 0.0f ? " (auto)" : "");
-    BulletText("CellPaddingX: %.1f, CellSpacingX: %.1f/%.1f, OuterPaddingX: %.1f", table->CellPaddingX, table->CellSpacingX1, table->CellSpacingX2, table->OuterPaddingX);
-    BulletText("HoveredColumnBody: %d, HoveredColumnBorder: %d", table->HoveredColumnBody, table->HoveredColumnBorder);
-    BulletText("ResizedColumn: %d, ReorderColumn: %d, HeldHeaderColumn: %d", table->ResizedColumn, table->ReorderColumn, table->HeldHeaderColumn);
-    float sum_weights = 0.0f;
-    for (int n = 0; n < table->ColumnsCount; n++)
-        if (table->Columns[n].Flags & ImGuiTableColumnFlags_WidthStretch)
-            sum_weights += table->Columns[n].StretchWeight;
-    for (int n = 0; n < table->ColumnsCount; n++)
-    {
-        ImGuiTableColumn* column = &table->Columns[n];
-        const char* name = TableGetColumnName(table, n);
-        ImFormatString(buf, IM_ARRAYSIZE(buf),
-            "Column %d order %d '%s': offset %+.2f to %+.2f%s\n"
-            "Enabled: %d, VisibleX/Y: %d/%d, RequestOutput: %d, SkipItems: %d, DrawChannels: %d,%d\n"
-            "WidthGiven: %.1f, Request/Auto: %.1f/%.1f, StretchWeight: %.3f (%.1f%%)\n"
-            "MinX: %.1f, MaxX: %.1f (%+.1f), ClipRect: %.1f to %.1f (+%.1f)\n"
-            "ContentWidth: %.1f,%.1f, HeadersUsed/Ideal %.1f/%.1f\n"
-            "Sort: %d%s, UserID: 0x%08X, Flags: 0x%04X: %s%s%s..",
-            n, column->DisplayOrder, name, column->MinX - table->WorkRect.Min.x, column->MaxX - table->WorkRect.Min.x, (n < table->FreezeColumnsRequest) ? " (Frozen)" : "",
-            column->IsEnabled, column->IsVisibleX, column->IsVisibleY, column->IsRequestOutput, column->IsSkipItems, column->DrawChannelFrozen, column->DrawChannelUnfrozen,
-            column->WidthGiven, column->WidthRequest, column->WidthAuto, column->StretchWeight, column->StretchWeight > 0.0f ? (column->StretchWeight / sum_weights) * 100.0f : 0.0f,
-            column->MinX, column->MaxX, column->MaxX - column->MinX, column->ClipRect.Min.x, column->ClipRect.Max.x, column->ClipRect.Max.x - column->ClipRect.Min.x,
-            column->ContentMaxXFrozen - column->WorkMinX, column->ContentMaxXUnfrozen - column->WorkMinX, column->ContentMaxXHeadersUsed - column->WorkMinX, column->ContentMaxXHeadersIdeal - column->WorkMinX,
-            column->SortOrder, (column->SortDirection == ImGuiSortDirection_Ascending) ? " (Asc)" : (column->SortDirection == ImGuiSortDirection_Descending) ? " (Des)" : "", column->UserID, column->Flags,
-            (column->Flags & ImGuiTableColumnFlags_WidthStretch) ? "WidthStretch " : "",
-            (column->Flags & ImGuiTableColumnFlags_WidthFixed) ? "WidthFixed " : "",
-            (column->Flags & ImGuiTableColumnFlags_NoResize) ? "NoResize " : "");
-        Bullet();
-        Selectable(buf);
-        if (IsItemHovered())
-        {
-            ImRect r(column->MinX, table->OuterRect.Min.y, column->MaxX, table->OuterRect.Max.y);
-            GetForegroundDrawList()->AddRect(r.Min, r.Max, IM_COL32(255, 255, 0, 255));
-        }
-    }
-    if (ImGuiTableSettings* settings = TableGetBoundSettings(table))
-        DebugNodeTableSettings(settings);
-    if (clear_settings)
-        table->IsResetAllRequest = true;
-    TreePop();
-}
-
-void ImGui::DebugNodeTableSettings(ImGuiTableSettings* settings)
-{
-    if (!TreeNode((void*)(intptr_t)settings->ID, "Settings 0x%08X (%d columns)", settings->ID, settings->ColumnsCount))
-        return;
-    BulletText("SaveFlags: 0x%08X", settings->SaveFlags);
-    BulletText("ColumnsCount: %d (max %d)", settings->ColumnsCount, settings->ColumnsCountMax);
-    for (int n = 0; n < settings->ColumnsCount; n++)
-    {
-        ImGuiTableColumnSettings* column_settings = &settings->GetColumnSettings()[n];
-        ImGuiSortDirection sort_dir = (column_settings->SortOrder != -1) ? (ImGuiSortDirection)column_settings->SortDirection : ImGuiSortDirection_None;
-        BulletText("Column %d Order %d SortOrder %d %s Vis %d %s %7.3f UserID 0x%08X",
-            n, column_settings->DisplayOrder, column_settings->SortOrder,
-            (sort_dir == ImGuiSortDirection_Ascending) ? "Asc" : (sort_dir == ImGuiSortDirection_Descending) ? "Des" : "---",
-            column_settings->IsEnabled, column_settings->IsStretch ? "Weight" : "Width ", column_settings->WidthOrWeight, column_settings->UserID);
-    }
-    TreePop();
-}
-
-#else   
-
-void ImGui::DebugNodeTable(ImGuiTable*) {}
-void ImGui::DebugNodeTableSettings(ImGuiTableSettings*) {}
-
-#endif
-
-
-void ImGui::SetWindowClipRectBeforeSetChannel(ImGuiWindow* window, const ImRect& clip_rect)
-{
-    ImVec4 clip_rect_vec4 = clip_rect.ToVec4();
-    window->ClipRect = clip_rect;
-    window->DrawList->_CmdHeader.ClipRect = clip_rect_vec4;
-    window->DrawList->_ClipRectStack.Data[window->DrawList->_ClipRectStack.Size - 1] = clip_rect_vec4;
-}
-
-int ImGui::GetColumnIndex()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.CurrentColumns ? window->DC.CurrentColumns->Current : 0;
-}
-
-int ImGui::GetColumnsCount()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.CurrentColumns ? window->DC.CurrentColumns->Count : 1;
-}
-
-float ImGui::GetColumnOffsetFromNorm(const ImGuiOldColumns* columns, float offset_norm)
-{
-    return offset_norm * (columns->OffMaxX - columns->OffMinX);
-}
-
-float ImGui::GetColumnNormFromOffset(const ImGuiOldColumns* columns, float offset)
-{
-    return offset / (columns->OffMaxX - columns->OffMinX);
-}
-
-static const float COLUMNS_HIT_RECT_HALF_WIDTH = 4.0f;
-
-static float GetDraggedColumnOffset(ImGuiOldColumns* columns, int column_index)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    IM_ASSERT(column_index > 0);         
-    IM_ASSERT(g.ActiveId == columns->ID + ImGuiID(column_index));
-
-    float x = g.IO.MousePos.x - g.ActiveIdClickOffset.x + COLUMNS_HIT_RECT_HALF_WIDTH - window->Pos.x;
-    x = ImMax(x, ImGui::GetColumnOffset(column_index - 1) + g.Style.ColumnsMinSpacing);
-    if ((columns->Flags & ImGuiOldColumnFlags_NoPreserveWidths))
-        x = ImMin(x, ImGui::GetColumnOffset(column_index + 1) - g.Style.ColumnsMinSpacing);
-
-    return x;
-}
-
-float ImGui::GetColumnOffset(int column_index)
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiOldColumns* columns = window->DC.CurrentColumns;
-    if (columns == NULL)
-        return 0.0f;
-
-    if (column_index < 0)
-        column_index = columns->Current;
-    IM_ASSERT(column_index < columns->Columns.Size);
-
-    const float t = columns->Columns[column_index].OffsetNorm;
-    const float x_offset = ImLerp(columns->OffMinX, columns->OffMaxX, t);
-    return x_offset;
-}
-
-static float GetColumnWidthEx(ImGuiOldColumns* columns, int column_index, bool before_resize = false)
-{
-    if (column_index < 0)
-        column_index = columns->Current;
-
-    float offset_norm;
-    if (before_resize)
-        offset_norm = columns->Columns[column_index + 1].OffsetNormBeforeResize - columns->Columns[column_index].OffsetNormBeforeResize;
-    else
-        offset_norm = columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm;
-    return ImGui::GetColumnOffsetFromNorm(columns, offset_norm);
-}
-
-float ImGui::GetColumnWidth(int column_index)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiOldColumns* columns = window->DC.CurrentColumns;
-    if (columns == NULL)
-        return GetContentRegionAvail().x;
-
-    if (column_index < 0)
-        column_index = columns->Current;
-    return GetColumnOffsetFromNorm(columns, columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm);
-}
-
-void ImGui::SetColumnOffset(int column_index, float offset)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiOldColumns* columns = window->DC.CurrentColumns;
-    IM_ASSERT(columns != NULL);
-
-    if (column_index < 0)
-        column_index = columns->Current;
-    IM_ASSERT(column_index < columns->Columns.Size);
-
-    const bool preserve_width = !(columns->Flags & ImGuiOldColumnFlags_NoPreserveWidths) && (column_index < columns->Count - 1);
-    const float width = preserve_width ? GetColumnWidthEx(columns, column_index, columns->IsBeingResized) : 0.0f;
-
-    if (!(columns->Flags & ImGuiOldColumnFlags_NoForceWithinWindow))
-        offset = ImMin(offset, columns->OffMaxX - g.Style.ColumnsMinSpacing * (columns->Count - column_index));
-    columns->Columns[column_index].OffsetNorm = GetColumnNormFromOffset(columns, offset - columns->OffMinX);
-
-    if (preserve_width)
-        SetColumnOffset(column_index + 1, offset + ImMax(g.Style.ColumnsMinSpacing, width));
-}
-
-void ImGui::SetColumnWidth(int column_index, float width)
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiOldColumns* columns = window->DC.CurrentColumns;
-    IM_ASSERT(columns != NULL);
-
-    if (column_index < 0)
-        column_index = columns->Current;
-    SetColumnOffset(column_index + 1, GetColumnOffset(column_index) + width);
-}
-
-void ImGui::PushColumnClipRect(int column_index)
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiOldColumns* columns = window->DC.CurrentColumns;
-    if (column_index < 0)
-        column_index = columns->Current;
-
-    ImGuiOldColumnData* column = &columns->Columns[column_index];
-    PushClipRect(column->ClipRect.Min, column->ClipRect.Max, false);
-}
-
-void ImGui::PushColumnsBackground()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiOldColumns* columns = window->DC.CurrentColumns;
-    if (columns->Count == 1)
-        return;
-
-    columns->HostBackupClipRect = window->ClipRect;
-    SetWindowClipRectBeforeSetChannel(window, columns->HostInitialClipRect);
-    columns->Splitter.SetCurrentChannel(window->DrawList, 0);
-}
-
-void ImGui::PopColumnsBackground()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiOldColumns* columns = window->DC.CurrentColumns;
-    if (columns->Count == 1)
-        return;
-
-    SetWindowClipRectBeforeSetChannel(window, columns->HostBackupClipRect);
-    columns->Splitter.SetCurrentChannel(window->DrawList, columns->Current + 1);
-}
-
-ImGuiOldColumns* ImGui::FindOrCreateColumns(ImGuiWindow* window, ImGuiID id)
-{
-    for (int n = 0; n < window->ColumnsStorage.Size; n++)
-        if (window->ColumnsStorage[n].ID == id)
-            return &window->ColumnsStorage[n];
-
-    window->ColumnsStorage.push_back(ImGuiOldColumns());
-    ImGuiOldColumns* columns = &window->ColumnsStorage.back();
-    columns->ID = id;
-    return columns;
-}
-
-ImGuiID ImGui::GetColumnsID(const char* str_id, int columns_count)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-
-    PushID(0x11223347 + (str_id ? 0 : columns_count));
-    ImGuiID id = window->GetID(str_id ? str_id : "columns");
-    PopID();
-
-    return id;
-}
-
-void ImGui::BeginColumns(const char* str_id, int columns_count, ImGuiOldColumnFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-
-    IM_ASSERT(columns_count >= 1);
-    IM_ASSERT(window->DC.CurrentColumns == NULL);         
-
-    ImGuiID id = GetColumnsID(str_id, columns_count);
-    ImGuiOldColumns* columns = FindOrCreateColumns(window, id);
-    IM_ASSERT(columns->ID == id);
-    columns->Current = 0;
-    columns->Count = columns_count;
-    columns->Flags = flags;
-    window->DC.CurrentColumns = columns;
-
-    columns->HostCursorPosY = window->DC.CursorPos.y;
-    columns->HostCursorMaxPosX = window->DC.CursorMaxPos.x;
-    columns->HostInitialClipRect = window->ClipRect;
-    columns->HostBackupParentWorkRect = window->ParentWorkRect;
-    window->ParentWorkRect = window->WorkRect;
-
-    const float column_padding = g.Style.ItemSpacing.x;
-    const float half_clip_extend_x = ImFloor(ImMax(window->WindowPadding.x * 0.5f, window->WindowBorderSize));
-    const float max_1 = window->WorkRect.Max.x + column_padding - ImMax(column_padding - window->WindowPadding.x, 0.0f);
-    const float max_2 = window->WorkRect.Max.x + half_clip_extend_x;
-    columns->OffMinX = window->DC.Indent.x - column_padding + ImMax(column_padding - window->WindowPadding.x, 0.0f);
-    columns->OffMaxX = ImMax(ImMin(max_1, max_2) - window->Pos.x, columns->OffMinX + 1.0f);
-    columns->LineMinY = columns->LineMaxY = window->DC.CursorPos.y;
-
-    if (columns->Columns.Size != 0 && columns->Columns.Size != columns_count + 1)
-        columns->Columns.resize(0);
-
-    columns->IsFirstFrame = (columns->Columns.Size == 0);
-    if (columns->Columns.Size == 0)
-    {
-        columns->Columns.reserve(columns_count + 1);
-        for (int n = 0; n < columns_count + 1; n++)
-        {
-            ImGuiOldColumnData column;
-            column.OffsetNorm = n / (float)columns_count;
-            columns->Columns.push_back(column);
-        }
-    }
-
-    for (int n = 0; n < columns_count; n++)
-    {
-        ImGuiOldColumnData* column = &columns->Columns[n];
-        float clip_x1 = IM_ROUND(window->Pos.x + GetColumnOffset(n));
-        float clip_x2 = IM_ROUND(window->Pos.x + GetColumnOffset(n + 1) - 1.0f);
-        column->ClipRect = ImRect(clip_x1, -FLT_MAX, clip_x2, +FLT_MAX);
-        column->ClipRect.ClipWithFull(window->ClipRect);
-    }
-
-    if (columns->Count > 1)
-    {
-        columns->Splitter.Split(window->DrawList, 1 + columns->Count);
-        columns->Splitter.SetCurrentChannel(window->DrawList, 1);
-        PushColumnClipRect(0);
-    }
-
-    float offset_0 = GetColumnOffset(columns->Current);
-    float offset_1 = GetColumnOffset(columns->Current + 1);
-    float width = offset_1 - offset_0;
-    PushItemWidth(width * 0.65f);
-    window->DC.ColumnsOffset.x = ImMax(column_padding - window->WindowPadding.x, 0.0f);
-    window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
-    window->WorkRect.Max.x = window->Pos.x + offset_1 - column_padding;
-}
-
-void ImGui::NextColumn()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems || window->DC.CurrentColumns == NULL)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    ImGuiOldColumns* columns = window->DC.CurrentColumns;
-
-    if (columns->Count == 1)
-    {
-        window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
-        IM_ASSERT(columns->Current == 0);
-        return;
-    }
-
-    if (++columns->Current == columns->Count)
-        columns->Current = 0;
-
-    PopItemWidth();
-
-    ImGuiOldColumnData* column = &columns->Columns[columns->Current];
-    SetWindowClipRectBeforeSetChannel(window, column->ClipRect);
-    columns->Splitter.SetCurrentChannel(window->DrawList, columns->Current + 1);
-
-    const float column_padding = g.Style.ItemSpacing.x;
-    columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y);
-    if (columns->Current > 0)
-    {
-        window->DC.ColumnsOffset.x = GetColumnOffset(columns->Current) - window->DC.Indent.x + column_padding;
-    }
-    else
-    {
-        window->DC.ColumnsOffset.x = ImMax(column_padding - window->WindowPadding.x, 0.0f);
-        columns->LineMinY = columns->LineMaxY;
-    }
-    window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
-    window->DC.CursorPos.y = columns->LineMinY;
-    window->DC.CurrLineSize = ImVec2(0.0f, 0.0f);
-    window->DC.CurrLineTextBaseOffset = 0.0f;
-
-    float offset_0 = GetColumnOffset(columns->Current);
-    float offset_1 = GetColumnOffset(columns->Current + 1);
-    float width = offset_1 - offset_0;
-    PushItemWidth(width * 0.65f);
-    window->WorkRect.Max.x = window->Pos.x + offset_1 - column_padding;
-}
-
-void ImGui::EndColumns()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-    ImGuiOldColumns* columns = window->DC.CurrentColumns;
-    IM_ASSERT(columns != NULL);
-
-    PopItemWidth();
-    if (columns->Count > 1)
-    {
-        PopClipRect();
-        columns->Splitter.Merge(window->DrawList);
-    }
-
-    const ImGuiOldColumnFlags flags = columns->Flags;
-    columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y);
-    window->DC.CursorPos.y = columns->LineMaxY;
-    if (!(flags & ImGuiOldColumnFlags_GrowParentContentsSize))
-        window->DC.CursorMaxPos.x = columns->HostCursorMaxPosX;           
-
-    bool is_being_resized = false;
-    if (!(flags & ImGuiOldColumnFlags_NoBorder) && !window->SkipItems)
-    {
-        const float y1 = ImMax(columns->HostCursorPosY, window->ClipRect.Min.y);
-        const float y2 = ImMin(window->DC.CursorPos.y, window->ClipRect.Max.y);
-        int dragging_column = -1;
-        for (int n = 1; n < columns->Count; n++)
-        {
-            ImGuiOldColumnData* column = &columns->Columns[n];
-            float x = window->Pos.x + GetColumnOffset(n);
-            const ImGuiID column_id = columns->ID + ImGuiID(n);
-            const float column_hit_hw = COLUMNS_HIT_RECT_HALF_WIDTH;
-            const ImRect column_hit_rect(ImVec2(x - column_hit_hw, y1), ImVec2(x + column_hit_hw, y2));
-            KeepAliveID(column_id);
-            if (IsClippedEx(column_hit_rect, column_id, false))
-                continue;
-
-            bool hovered = false, held = false;
-            if (!(flags & ImGuiOldColumnFlags_NoResize))
-            {
-                ButtonBehavior(column_hit_rect, column_id, &hovered, &held);
-                if (hovered || held)
-                    g.MouseCursor = ImGuiMouseCursor_ResizeEW;
-                if (held && !(column->Flags & ImGuiOldColumnFlags_NoResize))
-                    dragging_column = n;
-            }
-
-            const ImU32 col = GetColorU32(held ? ImGuiCol_SeparatorActive : hovered ? ImGuiCol_SeparatorHovered : ImGuiCol_Separator);
-            const float xi = IM_FLOOR(x);
-            window->DrawList->AddLine(ImVec2(xi, y1 + 1.0f), ImVec2(xi, y2), col);
-        }
-
-        if (dragging_column != -1)
-        {
-            if (!columns->IsBeingResized)
-                for (int n = 0; n < columns->Count + 1; n++)
-                    columns->Columns[n].OffsetNormBeforeResize = columns->Columns[n].OffsetNorm;
-            columns->IsBeingResized = is_being_resized = true;
-            float x = GetDraggedColumnOffset(columns, dragging_column);
-            SetColumnOffset(dragging_column, x);
-        }
-    }
-    columns->IsBeingResized = is_being_resized;
-
-    window->WorkRect = window->ParentWorkRect;
-    window->ParentWorkRect = columns->HostBackupParentWorkRect;
-    window->DC.CurrentColumns = NULL;
-    window->DC.ColumnsOffset.x = 0.0f;
-    window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
-}
-
-void ImGui::Columns(int columns_count, const char* id, bool border)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    IM_ASSERT(columns_count >= 1);
-
-    ImGuiOldColumnFlags flags = (border ? 0 : ImGuiOldColumnFlags_NoBorder);
-    ImGuiOldColumns* columns = window->DC.CurrentColumns;
-    if (columns != NULL && columns->Count == columns_count && columns->Flags == flags)
-        return;
-
-    if (columns != NULL)
-        EndColumns();
-
-    if (columns_count != 1)
-        BeginColumns(id, columns_count, flags);
-}
-
-#endif   
diff --git a/SpyCustom/imgui/imgui_widgets.cpp b/SpyCustom/imgui/imgui_widgets.cpp
deleted file mode 100644
index 0db4f2d..0000000
--- a/SpyCustom/imgui/imgui_widgets.cpp
+++ /dev/null
@@ -1,7141 +0,0 @@
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "imgui.h"
-#ifndef IMGUI_DISABLE
-
-#ifndef IMGUI_DEFINE_MATH_OPERATORS
-#define IMGUI_DEFINE_MATH_OPERATORS
-#endif
-#include "imgui_internal.h"
-
-#include <ctype.h>       
-#if defined(_MSC_VER) && _MSC_VER <= 1500     
-#include <stddef.h>      
-#else
-#include <stdint.h>      
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (disable: 4127)         
-#pragma warning (disable: 4996)                  
-#if defined(_MSC_VER) && _MSC_VER >= 1922      
-#pragma warning (disable: 5054)             
-#endif
-#endif
-
-#if defined(__clang__)
-#if __has_warning("-Wunknown-warning-option")
-#pragma clang diagnostic ignored "-Wunknown-warning-option"                                                             
-#endif
-#pragma clang diagnostic ignored "-Wunknown-pragmas"                     
-#pragma clang diagnostic ignored "-Wold-style-cast"                                                       
-#pragma clang diagnostic ignored "-Wfloat-equal"                                         
-#pragma clang diagnostic ignored "-Wformat-nonliteral"                                                
-#pragma clang diagnostic ignored "-Wsign-conversion"                     
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"                                    
-#pragma clang diagnostic ignored "-Wdouble-promotion"                                            
-#pragma clang diagnostic ignored "-Wenum-enum-conversion"                     
-#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion"            
-#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion"            
-#elif defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wpragmas"                                  
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"                          
-#pragma GCC diagnostic ignored "-Wclass-memaccess"                                      
-#endif
-
-static const float          DRAGDROP_HOLD_TO_OPEN_TIMER = 0.70f;               
-static const float          DRAG_MOUSE_THRESHOLD_FACTOR = 0.50f;                   
-
-static const signed char    IM_S8_MIN  = -128;
-static const signed char    IM_S8_MAX  = 127;
-static const unsigned char  IM_U8_MIN  = 0;
-static const unsigned char  IM_U8_MAX  = 0xFF;
-static const signed short   IM_S16_MIN = -32768;
-static const signed short   IM_S16_MAX = 32767;
-static const unsigned short IM_U16_MIN = 0;
-static const unsigned short IM_U16_MAX = 0xFFFF;
-static const ImS32          IM_S32_MIN = INT_MIN;        
-static const ImS32          IM_S32_MAX = INT_MAX;      
-static const ImU32          IM_U32_MIN = 0;
-static const ImU32          IM_U32_MAX = UINT_MAX;    
-#ifdef LLONG_MIN
-static const ImS64          IM_S64_MIN = LLONG_MIN;     
-static const ImS64          IM_S64_MAX = LLONG_MAX;   
-#else
-static const ImS64          IM_S64_MIN = -9223372036854775807LL - 1;
-static const ImS64          IM_S64_MAX = 9223372036854775807LL;
-#endif
-static const ImU64          IM_U64_MIN = 0;
-#ifdef ULLONG_MAX
-static const ImU64          IM_U64_MAX = ULLONG_MAX;  
-#else
-static const ImU64          IM_U64_MAX = (2ULL * 9223372036854775807LL + 1);
-#endif
-
-static bool             InputTextFilterCharacter(unsigned int* p_char, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data);
-static int              InputTextCalcTextLenAndLineCount(const char* text_begin, const char** out_text_end);
-static ImVec2           InputTextCalcTextSizeW(const ImWchar* text_begin, const ImWchar* text_end, const ImWchar** remaining = NULL, ImVec2* out_offset = NULL, bool stop_on_new_line = false);
-
-const ImU32 colWhite = 0xFFC1C1C1; const ImU32 colBlack = 0xFF585858; const ImU32 colWhiteText = 0xFFD9D9D9;
-void ImGui::TextEx(const char* text, const char* text_end, ImGuiTextFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(text != NULL);
-    const char* text_begin = text;
-    if (text_end == NULL)
-        text_end = text + strlen(text);  
-
-    const ImVec2 text_pos(window->DC.CursorPos.x, window->DC.CursorPos.y + window->DC.CurrLineTextBaseOffset);
-    const float wrap_pos_x = window->DC.TextWrapPos;
-    const bool wrap_enabled = (wrap_pos_x >= 0.0f);
-    if (text_end - text > 2000 && !wrap_enabled)
-    {
-        const char* line = text;
-        float line_height = GetTextLineHeight();
-        ImVec2 text_size(0, 0);
-
-        ImVec2 pos = text_pos;
-        if (!g.LogEnabled)
-        {
-            int lines_skippable = (int)((window->ClipRect.Min.y - text_pos.y) / line_height);
-            if (lines_skippable > 0)
-            {
-                int lines_skipped = 0;
-                while (line < text_end && lines_skipped < lines_skippable)
-                {
-                    const char* line_end = (const char*)memchr(line, '\n', text_end - line);
-                    if (!line_end)
-                        line_end = text_end;
-                    if ((flags & ImGuiTextFlags_NoWidthForLargeClippedText) == 0)
-                        text_size.x = ImMax(text_size.x, CalcTextSize(line, line_end).x);
-                    line = line_end + 1;
-                    lines_skipped++;
-                }
-                pos.y += lines_skipped * line_height;
-            }
-        }
-
-        if (line < text_end)
-        {
-            ImRect line_rect(pos, pos + ImVec2(FLT_MAX, line_height));
-            while (line < text_end)
-            {
-                if (IsClippedEx(line_rect, 0, false))
-                    break;
-
-                const char* line_end = (const char*)memchr(line, '\n', text_end - line);
-                if (!line_end)
-                    line_end = text_end;
-                text_size.x = ImMax(text_size.x, CalcTextSize(line, line_end).x);
-                RenderText(pos, line, line_end, false);
-                line = line_end + 1;
-                line_rect.Min.y += line_height;
-                line_rect.Max.y += line_height;
-
-                pos.y += line_height;
-            }
-
-            int lines_skipped = 0;
-            while (line < text_end)
-            {
-                const char* line_end = (const char*)memchr(line, '\n', text_end - line);
-                if (!line_end)
-                    line_end = text_end;
-                if ((flags & ImGuiTextFlags_NoWidthForLargeClippedText) == 0)
-                    text_size.x = ImMax(text_size.x, CalcTextSize(line, line_end).x);
-                line = line_end + 1;
-                lines_skipped++;
-            }
-            pos.y += lines_skipped * line_height;
-        }
-        text_size.y = (pos - text_pos).y;
-
-        ImRect bb(text_pos, text_pos + text_size);
-
-        ItemSize(text_size, 0.0f);
-        ItemAdd(bb, 0);
-    }
-    else
-    {
-        float wrap_width = wrap_enabled ? CalcWrapWidthForPos(window->DC.CursorPos, wrap_pos_x) : 0.0f;
-        const ImVec2 text_size = CalcTextSize(text_begin, text_end, false, wrap_width);
-
-        ImRect bb(text_pos, text_pos + text_size);
-        ItemSize(text_size, 0.0f);
-        if (!ItemAdd(bb, 0))
-            return;
-
-        RenderTextWrapped(bb.Min, text_begin, text_end, wrap_width);
-    }
-}
-
-void ImGui::TextUnformatted(const char* text, const char* text_end)
-{
-    TextEx(text, text_end, ImGuiTextFlags_NoWidthForLargeClippedText);
-}
-
-void ImGui::Text(const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    TextV(fmt, args);
-    va_end(args);
-}
-
-void ImGui::TextV(const char* fmt, va_list args)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    const char* text_end = g.TempBuffer + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args);
-    TextEx(g.TempBuffer, text_end, ImGuiTextFlags_NoWidthForLargeClippedText);
-}
-
-void ImGui::TextColored(const ImVec4& col, const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    TextColoredV(col, fmt, args);
-    va_end(args);
-}
-
-void ImGui::TextColoredV(const ImVec4& col, const char* fmt, va_list args)
-{
-    PushStyleColor(ImGuiCol_Text, col);
-    if (fmt[0] == '%' && fmt[1] == 's' && fmt[2] == 0)
-        TextEx(va_arg(args, const char*), NULL, ImGuiTextFlags_NoWidthForLargeClippedText);   
-    else
-        TextV(fmt, args);
-    PopStyleColor();
-}
-
-void ImGui::TextDisabled(const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    TextDisabledV(fmt, args);
-    va_end(args);
-}
-
-void ImGui::TextDisabledV(const char* fmt, va_list args)
-{
-    ImGuiContext& g = *GImGui;
-    PushStyleColor(ImGuiCol_Text, g.Style.Colors[ImGuiCol_TextDisabled]);
-    if (fmt[0] == '%' && fmt[1] == 's' && fmt[2] == 0)
-        TextEx(va_arg(args, const char*), NULL, ImGuiTextFlags_NoWidthForLargeClippedText);   
-    else
-        TextV(fmt, args);
-    PopStyleColor();
-}
-
-void ImGui::TextWrapped(const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    TextWrappedV(fmt, args);
-    va_end(args);
-}
-
-void ImGui::TextWrappedV(const char* fmt, va_list args)
-{
-    ImGuiContext& g = *GImGui;
-    bool need_backup = (g.CurrentWindow->DC.TextWrapPos < 0.0f);           
-    if (need_backup)
-        PushTextWrapPos(0.0f);
-    if (fmt[0] == '%' && fmt[1] == 's' && fmt[2] == 0)
-        TextEx(va_arg(args, const char*), NULL, ImGuiTextFlags_NoWidthForLargeClippedText);   
-    else
-        TextV(fmt, args);
-    if (need_backup)
-        PopTextWrapPos();
-}
-
-void ImGui::LabelText(const char* label, const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    LabelTextV(label, fmt, args);
-    va_end(args);
-}
-
-void ImGui::LabelTextV(const char* label, const char* fmt, va_list args)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const float w = CalcItemWidth();
-
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-    const ImRect value_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y * 2));
-    const ImRect total_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w + (label_size.x > 0.0f ? style.ItemInnerSpacing.x : 0.0f), style.FramePadding.y * 2) + label_size);
-    ItemSize(total_bb, style.FramePadding.y);
-    if (!ItemAdd(total_bb, 0))
-        return;
-
-    const char* value_text_begin = &g.TempBuffer[0];
-    const char* value_text_end = value_text_begin + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args);
-    RenderTextClipped(value_bb.Min, value_bb.Max, value_text_begin, value_text_end, NULL, ImVec2(0.0f, 0.5f));
-    if (label_size.x > 0.0f)
-        RenderText(ImVec2(value_bb.Max.x + style.ItemInnerSpacing.x, value_bb.Min.y + style.FramePadding.y), label);
-}
-
-void ImGui::BulletText(const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    BulletTextV(fmt, args);
-    va_end(args);
-}
-
-void ImGui::BulletTextV(const char* fmt, va_list args)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-
-    const char* text_begin = g.TempBuffer;
-    const char* text_end = text_begin + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args);
-    const ImVec2 label_size = CalcTextSize(text_begin, text_end, false);
-    const ImVec2 total_size = ImVec2(g.FontSize + (label_size.x > 0.0f ? (label_size.x + style.FramePadding.x * 2) : 0.0f), label_size.y);       
-    ImVec2 pos = window->DC.CursorPos;
-    pos.y += window->DC.CurrLineTextBaseOffset;
-    ItemSize(total_size, 0.0f);
-    const ImRect bb(pos, pos + total_size);
-    if (!ItemAdd(bb, 0))
-        return;
-
-    ImU32 text_col = GetColorU32(ImGuiCol_Text);
-    RenderBullet(window->DrawList, bb.Min + ImVec2(style.FramePadding.x + g.FontSize * 0.5f, g.FontSize * 0.5f), text_col);
-    RenderText(bb.Min + ImVec2(g.FontSize + style.FramePadding.x * 2, 0.0f), text_begin, text_end, false);
-}
-
-bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool* out_held, ImGuiButtonFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-
-    if (flags & ImGuiButtonFlags_Disabled)
-    {
-        if (out_hovered) *out_hovered = false;
-        if (out_held) *out_held = false;
-        if (g.ActiveId == id) ClearActiveID();
-        return false;
-    }
-
-    if ((flags & ImGuiButtonFlags_MouseButtonMask_) == 0)
-        flags |= ImGuiButtonFlags_MouseButtonDefault_;
-
-    if ((flags & ImGuiButtonFlags_PressedOnMask_) == 0)
-        flags |= ImGuiButtonFlags_PressedOnDefault_;
-
-    ImGuiWindow* backup_hovered_window = g.HoveredWindow;
-    const bool flatten_hovered_children = (flags & ImGuiButtonFlags_FlattenChildren) && g.HoveredRootWindow == window;
-    if (flatten_hovered_children)
-        g.HoveredWindow = window;
-
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    if (id != 0 && window->DC.LastItemId != id)
-        IMGUI_TEST_ENGINE_ITEM_ADD(bb, id);
-#endif
-
-    bool pressed = false;
-    bool hovered = ItemHoverable(bb, id);
-
-    if (hovered && g.DragDropActive && g.DragDropPayload.SourceId == id && !(g.DragDropSourceFlags & ImGuiDragDropFlags_SourceNoDisableHover))
-        hovered = false;
-
-    if (g.DragDropActive && (flags & ImGuiButtonFlags_PressedOnDragDropHold) && !(g.DragDropSourceFlags & ImGuiDragDropFlags_SourceNoHoldToOpenOthers))
-        if (IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem))
-        {
-            hovered = true;
-            SetHoveredID(id);
-            if (CalcTypematicRepeatAmount(g.HoveredIdTimer + 0.0001f - g.IO.DeltaTime, g.HoveredIdTimer + 0.0001f, DRAGDROP_HOLD_TO_OPEN_TIMER, 0.00f))
-            {
-                pressed = true;
-                g.DragDropHoldJustPressedId = id;
-                FocusWindow(window);
-            }
-        }
-
-    if (flatten_hovered_children)
-        g.HoveredWindow = backup_hovered_window;
-
-    if (hovered && (flags & ImGuiButtonFlags_AllowItemOverlap) && (g.HoveredIdPreviousFrame != id && g.HoveredIdPreviousFrame != 0))
-        hovered = false;
-
-    if (hovered)
-    {
-        if (!(flags & ImGuiButtonFlags_NoKeyModifiers) || (!g.IO.KeyCtrl && !g.IO.KeyShift && !g.IO.KeyAlt))
-        {
-            int mouse_button_clicked = -1;
-            int mouse_button_released = -1;
-            if ((flags & ImGuiButtonFlags_MouseButtonLeft) && g.IO.MouseClicked[0])         { mouse_button_clicked = 0; }
-            else if ((flags & ImGuiButtonFlags_MouseButtonRight) && g.IO.MouseClicked[1])   { mouse_button_clicked = 1; }
-            else if ((flags & ImGuiButtonFlags_MouseButtonMiddle) && g.IO.MouseClicked[2])  { mouse_button_clicked = 2; }
-            if ((flags & ImGuiButtonFlags_MouseButtonLeft) && g.IO.MouseReleased[0])        { mouse_button_released = 0; }
-            else if ((flags & ImGuiButtonFlags_MouseButtonRight) && g.IO.MouseReleased[1])  { mouse_button_released = 1; }
-            else if ((flags & ImGuiButtonFlags_MouseButtonMiddle) && g.IO.MouseReleased[2]) { mouse_button_released = 2; }
-
-            if (mouse_button_clicked != -1 && g.ActiveId != id)
-            {
-                if (flags & (ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnClickReleaseAnywhere))
-                {
-                    SetActiveID(id, window);
-                    g.ActiveIdMouseButton = mouse_button_clicked;
-                    if (!(flags & ImGuiButtonFlags_NoNavFocus))
-                        SetFocusID(id, window);
-                    FocusWindow(window);
-                }
-                if ((flags & ImGuiButtonFlags_PressedOnClick) || ((flags & ImGuiButtonFlags_PressedOnDoubleClick) && g.IO.MouseDoubleClicked[mouse_button_clicked]))
-                {
-                    pressed = true;
-                    if (flags & ImGuiButtonFlags_NoHoldingActiveId)
-                        ClearActiveID();
-                    else
-                        SetActiveID(id, window);    
-                    g.ActiveIdMouseButton = mouse_button_clicked;
-                    FocusWindow(window);
-                }
-            }
-            if ((flags & ImGuiButtonFlags_PressedOnRelease) && mouse_button_released != -1)
-            {
-                const bool has_repeated_at_least_once = (flags & ImGuiButtonFlags_Repeat) && g.IO.MouseDownDurationPrev[mouse_button_released] >= g.IO.KeyRepeatDelay;
-                if (!has_repeated_at_least_once)
-                    pressed = true;
-                ClearActiveID();
-            }
-
-            if (g.ActiveId == id && (flags & ImGuiButtonFlags_Repeat))
-                if (g.IO.MouseDownDuration[g.ActiveIdMouseButton] > 0.0f && IsMouseClicked(g.ActiveIdMouseButton, true))
-                    pressed = true;
-        }
-
-        if (pressed)
-            g.NavDisableHighlight = true;
-    }
-
-    if (g.NavId == id && !g.NavDisableHighlight && g.NavDisableMouseHover && (g.ActiveId == 0 || g.ActiveId == id || g.ActiveId == window->MoveId))
-        if (!(flags & ImGuiButtonFlags_NoHoveredOnFocus))
-            hovered = true;
-    if (g.NavActivateDownId == id)
-    {
-        bool nav_activated_by_code = (g.NavActivateId == id);
-        bool nav_activated_by_inputs = IsNavInputTest(ImGuiNavInput_Activate, (flags & ImGuiButtonFlags_Repeat) ? ImGuiInputReadMode_Repeat : ImGuiInputReadMode_Pressed);
-        if (nav_activated_by_code || nav_activated_by_inputs)
-            pressed = true;
-        if (nav_activated_by_code || nav_activated_by_inputs || g.ActiveId == id)
-        {
-            g.NavActivateId = id;         
-            SetActiveID(id, window);
-            if ((nav_activated_by_code || nav_activated_by_inputs) && !(flags & ImGuiButtonFlags_NoNavFocus))
-                SetFocusID(id, window);
-        }
-    }
-
-    bool held = false;
-    if (g.ActiveId == id)
-    {
-        if (g.ActiveIdSource == ImGuiInputSource_Mouse)
-        {
-            if (g.ActiveIdIsJustActivated)
-                g.ActiveIdClickOffset = g.IO.MousePos - bb.Min;
-
-            const int mouse_button = g.ActiveIdMouseButton;
-            IM_ASSERT(mouse_button >= 0 && mouse_button < ImGuiMouseButton_COUNT);
-            if (g.IO.MouseDown[mouse_button])
-            {
-                held = true;
-            }
-            else
-            {
-                bool release_in = hovered && (flags & ImGuiButtonFlags_PressedOnClickRelease) != 0;
-                bool release_anywhere = (flags & ImGuiButtonFlags_PressedOnClickReleaseAnywhere) != 0;
-                if ((release_in || release_anywhere) && !g.DragDropActive)
-                {
-                    bool is_double_click_release = (flags & ImGuiButtonFlags_PressedOnDoubleClick) && g.IO.MouseDownWasDoubleClick[mouse_button];
-                    bool is_repeating_already = (flags & ImGuiButtonFlags_Repeat) && g.IO.MouseDownDurationPrev[mouse_button] >= g.IO.KeyRepeatDelay;      
-                    if (!is_double_click_release && !is_repeating_already)
-                        pressed = true;
-                }
-                ClearActiveID();
-            }
-            if (!(flags & ImGuiButtonFlags_NoNavFocus))
-                g.NavDisableHighlight = true;
-        }
-        else if (g.ActiveIdSource == ImGuiInputSource_Nav)
-        {
-            if (g.NavActivateDownId != id)
-                ClearActiveID();
-        }
-        if (pressed)
-            g.ActiveIdHasBeenPressedBefore = true;
-    }
-
-    if (out_hovered) *out_hovered = hovered;
-    if (out_held) *out_held = held;
-
-    return pressed;
-}
-
-bool ImGui::ButtonEx(const char* label, const ImVec2& size_arg, ImGuiButtonFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const ImGuiID id = window->GetID(label);
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-
-    ImVec2 pos = window->DC.CursorPos;
-    if ((flags & ImGuiButtonFlags_AlignTextBaseLine) && style.FramePadding.y < window->DC.CurrLineTextBaseOffset)                        
-        pos.y += window->DC.CurrLineTextBaseOffset - style.FramePadding.y;
-    ImVec2 size = CalcItemSize(size_arg, label_size.x + style.FramePadding.x * 2.0f, label_size.y + style.FramePadding.y * 2.0f);
-
-    
-     ImRect bb(pos, pos + size);
-    ItemSize(size, style.FramePadding.y);
-    if (!ItemAdd(bb, id))
-        return false;
-        
-
-    if (window->DC.ItemFlags & ImGuiItemFlags_ButtonRepeat)
-        flags |= ImGuiButtonFlags_Repeat;
-    bool hovered, held;
-    bool pressed = ButtonBehavior(bb, id, &hovered, &held, flags);
-
-    
-    if (!held) {
-        RenderFrame(bb.Min - ImVec2(1, 1), bb.Max - ImVec2(0, 0), colWhite, true, style.FrameRounding);
-        RenderFrame(bb.Min + ImVec2(0, 0), bb.Max + ImVec2(1, 1), colBlack, true, style.FrameRounding);
-    }
-    else
-    {
-        RenderFrame(bb.Min - ImVec2(1, 1), bb.Max - ImVec2(0, 0), colBlack, true, style.FrameRounding);
-        RenderFrame(bb.Min + ImVec2(0, 0), bb.Max + ImVec2(1, 1), colWhite, true, style.FrameRounding);
-    }
-
-    const ImU32 col = GetColorU32(ImGuiCol_Button);
-    RenderNavHighlight(bb, id);
-    RenderFrame(bb.Min, bb.Max, col, true, style.FrameRounding);
-
-    if (g.LogEnabled)
-        LogSetNextTextDecoration("[", "]");
-
-    if (!held) {
-        RenderTextClipped(bb.Min + style.FramePadding - ImVec2(1,1), bb.Max - style.FramePadding, label, NULL, &label_size, style.ButtonTextAlign, &bb);
-    }
-    else
-    {
-        RenderTextClipped(bb.Min + style.FramePadding, bb.Max - style.FramePadding + ImVec2(2.0f, 2.0f), label, NULL, &label_size, style.ButtonTextAlign, &bb);
-    }
-
-
-
-    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.LastItemStatusFlags);
-
-    ImVec2 newpos = window->DC.CursorPos;
-    window->DC.CursorPos = newpos + ImVec2(0, 8.0f);
-
-    return pressed;
-}
-
-bool ImGui::Button(const char* label, const ImVec2& size_arg)
-{
-    return ButtonEx(label, size_arg, ImGuiButtonFlags_None);
-}
-
-bool ImGui::SmallButton(const char* label)
-{
-    ImGuiContext& g = *GImGui;
-    float backup_padding_y = g.Style.FramePadding.y;
-    g.Style.FramePadding.y = 0.0f;
-    bool pressed = ButtonEx(label, ImVec2(0, 0), ImGuiButtonFlags_AlignTextBaseLine);
-    g.Style.FramePadding.y = backup_padding_y;
-    return pressed;
-}
-
-bool ImGui::InvisibleButton(const char* str_id, const ImVec2& size_arg, ImGuiButtonFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    IM_ASSERT(size_arg.x != 0.0f && size_arg.y != 0.0f);
-
-    const ImGuiID id = window->GetID(str_id);
-    ImVec2 size = CalcItemSize(size_arg, 0.0f, 0.0f);
-    const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
-    ItemSize(size);
-    if (!ItemAdd(bb, id))
-        return false;
-
-    bool hovered, held;
-    bool pressed = ButtonBehavior(bb, id, &hovered, &held, flags);
-
-    return pressed;
-}
-
-bool ImGui::ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size, ImGuiButtonFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiID id = window->GetID(str_id);
-    const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
-    const float default_size = GetFrameHeight();
-    ItemSize(size, (size.y >= default_size) ? g.Style.FramePadding.y : -1.0f);
-    if (!ItemAdd(bb, id))
-        return false;
-
-    if (window->DC.ItemFlags & ImGuiItemFlags_ButtonRepeat)
-        flags |= ImGuiButtonFlags_Repeat;
-
-    bool hovered, held;
-    bool pressed = ButtonBehavior(bb, id, &hovered, &held, flags);
-
-    ImU32 bg_col = GetColorU32(hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg); 
-    ImU32 text_col = GetColorU32(ImGuiCol_Text);
-
-    RenderNavHighlight(bb, id);
-    RenderFrame(bb.Min, bb.Max, bg_col, true, g.Style.FrameRounding);
-    RenderArrow(window->DrawList, bb.Min + ImVec2(ImMax(0.0f, (size.x - g.FontSize) * 0.5f), ImMax(0.0f, (size.y - g.FontSize) * 0.5f)), text_col, dir);
-
-    window->DrawList->AddLine(ImVec2(bb.Min.x - 1.0f, bb.Min.y), ImVec2(bb.Max.x - 1.0f, bb.Min.y), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(bb.Min.x - 1.0f, bb.Min.y), ImVec2(bb.Min.x - 1.0f, bb.Max.y), 0xFFA2A2A2, 1.0f); 
-
-    window->DrawList->AddLine(ImVec2(bb.Max.x - 1.0f, bb.Min.y), ImVec2(bb.Max.x - 1.0f, bb.Max.y), colWhite, 1.0f);
-    window->DrawList->AddLine(ImVec2(bb.Min.x - 1.0f, bb.Max.y), ImVec2(bb.Max.x - 1.0f, bb.Max.y), colWhite, 1.0f);
-    return pressed;
-}
-
-bool ImGui::ArrowButton(const char* str_id, ImGuiDir dir)
-{
-    float sz = GetFrameHeight();
-    return ArrowButtonEx(str_id, dir, ImVec2(sz, sz), ImGuiButtonFlags_None);
-}
-
-bool ImGui::CloseButton(ImGuiID id, const ImVec2& pos)  
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    const ImRect bb(pos, pos + ImVec2(g.FontSize, g.FontSize) + g.Style.FramePadding * 2.0f);
-    bool is_clipped = !ItemAdd(bb, id);
-
-    bool hovered, held;
-    bool pressed = ButtonBehavior(bb, id, &hovered, &held);
-    if (is_clipped)
-        return pressed;
-
-    ImU32 col = GetColorU32(held ? ImGuiCol_ButtonActive : ImGuiCol_ButtonHovered);
-    ImVec2 center = bb.GetCenter();
-    if (hovered)
-        window->DrawList->AddCircleFilled(center, ImMax(2.0f, g.FontSize * 0.5f + 1.0f), col, 12);
-
-    float cross_extent = g.FontSize * 0.5f * 0.7071f - 1.0f;
-    ImU32 cross_col = GetColorU32(ImGuiCol_Text);
-    center -= ImVec2(0.5f, 0.5f);
-    window->DrawList->AddLine(center + ImVec2(+cross_extent, +cross_extent), center + ImVec2(-cross_extent, -cross_extent), cross_col, 1.0f);
-    window->DrawList->AddLine(center + ImVec2(+cross_extent, -cross_extent), center + ImVec2(-cross_extent, +cross_extent), cross_col, 1.0f);
-
-    return pressed;
-}
-
-bool ImGui::CollapseButton(ImGuiID id, const ImVec2& pos)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    ImRect bb(pos, pos + ImVec2(g.FontSize, g.FontSize) + g.Style.FramePadding * 2.0f);
-    ItemAdd(bb, id);
-    bool hovered, held;
-    bool pressed = ButtonBehavior(bb, id, &hovered, &held, ImGuiButtonFlags_None);
-
-    ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button);
-    ImU32 text_col = GetColorU32(ImGuiCol_Text);
-    ImVec2 center = bb.GetCenter();
-    if (hovered || held)
-        window->DrawList->AddCircleFilled(center  , g.FontSize * 0.5f + 1.0f, bg_col, 12);
-    RenderArrow(window->DrawList, bb.Min + g.Style.FramePadding, text_col, window->Collapsed ? ImGuiDir_Right : ImGuiDir_Down, 1.0f);
-
-    if (IsItemActive() && IsMouseDragging(0))
-        StartMouseMovingWindow(window);
-
-    return pressed;
-}
-
-ImGuiID ImGui::GetWindowScrollbarID(ImGuiWindow* window, ImGuiAxis axis)
-{
-    return window->GetIDNoKeepAlive(axis == ImGuiAxis_X ? "#SCROLLX" : "#SCROLLY");
-}
-
-ImRect ImGui::GetWindowScrollbarRect(ImGuiWindow* window, ImGuiAxis axis)
-{
-    const ImRect outer_rect = window->Rect();
-    const ImRect inner_rect = window->InnerRect;
-    const float border_size = window->WindowBorderSize;
-    const float scrollbar_size = window->ScrollbarSizes[axis ^ 1];             
-    IM_ASSERT(scrollbar_size > 0.0f);
-    if (axis == ImGuiAxis_X)
-        return ImRect(inner_rect.Min.x, ImMax(outer_rect.Min.y, outer_rect.Max.y - border_size - scrollbar_size), inner_rect.Max.x, outer_rect.Max.y);
-    else
-        return ImRect(ImMax(outer_rect.Min.x, outer_rect.Max.x - border_size - scrollbar_size), inner_rect.Min.y, outer_rect.Max.x, inner_rect.Max.y);
-}
-
-void ImGui::Scrollbar(ImGuiAxis axis)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    const ImGuiID id = GetWindowScrollbarID(window, axis);
-    KeepAliveID(id);
-
-    ImRect bb = GetWindowScrollbarRect(window, axis);
-    ImDrawCornerFlags rounding_corners = 0;
-    if (axis == ImGuiAxis_X)
-    {
-        rounding_corners |= ImDrawCornerFlags_BotLeft;
-        if (!window->ScrollbarY)
-            rounding_corners |= ImDrawCornerFlags_BotRight;
-    }
-    else
-    {
-        if ((window->Flags & ImGuiWindowFlags_NoTitleBar) && !(window->Flags & ImGuiWindowFlags_MenuBar))
-            rounding_corners |= ImDrawCornerFlags_TopRight;
-        if (!window->ScrollbarX)
-            rounding_corners |= ImDrawCornerFlags_BotRight;
-    }
-    float size_avail = window->InnerRect.Max[axis] - window->InnerRect.Min[axis];
-    float size_contents = window->ContentSize[axis] + window->WindowPadding[axis] * 2.0f;
-    ScrollbarEx(bb, id, axis, &window->Scroll[axis], size_avail, size_contents, rounding_corners);
-}
-
-bool ImGui::ScrollbarEx(const ImRect& bb_frame, ImGuiID id, ImGuiAxis axis, float* p_scroll_v, float size_avail_v, float size_contents_v, ImDrawCornerFlags rounding_corners)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return false;
-
-    const float bb_frame_width = bb_frame.GetWidth();
-    const float bb_frame_height = bb_frame.GetHeight();
-    if (bb_frame_width <= 0.0f || bb_frame_height <= 0.0f)
-        return false;
-
-    float alpha = 1.0f;
-    if ((axis == ImGuiAxis_Y) && bb_frame_height < g.FontSize + g.Style.FramePadding.y * 2.0f)
-        alpha = ImSaturate((bb_frame_height - g.FontSize) / (g.Style.FramePadding.y * 2.0f));
-    if (alpha <= 0.0f)
-        return false;
-
-    const ImGuiStyle& style = g.Style;
-    const bool allow_interaction = (alpha >= 1.0f);
-
-    ImRect bb = bb_frame;
-    bb.Expand(ImVec2(-ImClamp(IM_FLOOR((bb_frame_width - 2.0f) * 0.5f), 0.0f, 3.0f), -ImClamp(IM_FLOOR((bb_frame_height - 2.0f) * 0.5f), 0.0f, 3.0f)));
-
-    const float scrollbar_size_v = (axis == ImGuiAxis_X) ? bb.GetWidth() : bb.GetHeight();
-
-    IM_ASSERT(ImMax(size_contents_v, size_avail_v) > 0.0f);                  
-    const float win_size_v = ImMax(ImMax(size_contents_v, size_avail_v), 1.0f);
-    const float grab_h_pixels = ImClamp(scrollbar_size_v * (size_avail_v / win_size_v), style.GrabMinSize, scrollbar_size_v);
-    const float grab_h_norm = grab_h_pixels / scrollbar_size_v;
-
-    bool held = false;
-    bool hovered = false;
-    ButtonBehavior(bb, id, &hovered, &held, ImGuiButtonFlags_NoNavFocus);
-
-    float scroll_max = ImMax(1.0f, size_contents_v - size_avail_v);
-    float scroll_ratio = ImSaturate(*p_scroll_v / scroll_max);
-    float grab_v_norm = scroll_ratio * (scrollbar_size_v - grab_h_pixels) / scrollbar_size_v;      
-    if (held && allow_interaction && grab_h_norm < 1.0f)
-    {
-        float scrollbar_pos_v = bb.Min[axis];
-        float mouse_pos_v = g.IO.MousePos[axis];
-
-        const float clicked_v_norm = ImSaturate((mouse_pos_v - scrollbar_pos_v) / scrollbar_size_v);
-        SetHoveredID(id);
-
-        bool seek_absolute = false;
-        if (g.ActiveIdIsJustActivated)
-        {
-            seek_absolute = (clicked_v_norm < grab_v_norm || clicked_v_norm > grab_v_norm + grab_h_norm);
-            if (seek_absolute)
-                g.ScrollbarClickDeltaToGrabCenter = 0.0f;
-            else
-                g.ScrollbarClickDeltaToGrabCenter = clicked_v_norm - grab_v_norm - grab_h_norm * 0.5f;
-        }
-
-        const float scroll_v_norm = ImSaturate((clicked_v_norm - g.ScrollbarClickDeltaToGrabCenter - grab_h_norm * 0.5f) / (1.0f - grab_h_norm));
-        *p_scroll_v = IM_ROUND(scroll_v_norm * scroll_max);  
-
-        scroll_ratio = ImSaturate(*p_scroll_v / scroll_max);
-        grab_v_norm = scroll_ratio * (scrollbar_size_v - grab_h_pixels) / scrollbar_size_v;
-
-        if (seek_absolute)
-            g.ScrollbarClickDeltaToGrabCenter = clicked_v_norm - grab_v_norm - grab_h_norm * 0.5f;
-    }
-
-    const ImU32 grab_col = GetColorU32(ImGuiCol_ScrollbarGrabActive) ;      
-    const ImU32 bg_col = GetColorU32(ImGuiCol_ScrollbarBg);  
-    window->DrawList->AddRectFilled(bb_frame.Min, bb_frame.Max, bg_col, window->WindowRounding, rounding_corners);
-    ImRect grab_rect;
-    if (axis == ImGuiAxis_X)
-        grab_rect = ImRect(ImLerp(bb.Min.x, bb.Max.x, grab_v_norm), bb.Min.y, ImLerp(bb.Min.x, bb.Max.x, grab_v_norm) + grab_h_pixels, bb.Max.y);
-    else
-        grab_rect = ImRect(bb.Min.x, ImLerp(bb.Min.y, bb.Max.y, grab_v_norm), bb.Max.x, ImLerp(bb.Min.y, bb.Max.y, grab_v_norm) + grab_h_pixels);
-
-    RenderFrame(grab_rect.Min - ImVec2(1, 1), grab_rect.Max - ImVec2(0, 0), colWhite, true, style.FrameRounding);  
-    RenderFrame(grab_rect.Min + ImVec2(0, 0), grab_rect.Max + ImVec2(1, 1), colBlack, true, style.FrameRounding);
-    window->DrawList->AddRectFilled(grab_rect.Min, grab_rect.Max, grab_col, style.ScrollbarRounding);
-
-   
-
-
-    return held;
-}
-
-void ImGui::Image(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& tint_col, const ImVec4& border_col)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
-    if (border_col.w > 0.0f)
-        bb.Max += ImVec2(2, 2);
-    ItemSize(bb);
-    if (!ItemAdd(bb, 0))
-        return;
-
-    if (border_col.w > 0.0f)
-    {
-        window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(border_col), 0.0f);
-        window->DrawList->AddImage(user_texture_id, bb.Min + ImVec2(1, 1), bb.Max - ImVec2(1, 1), uv0, uv1, GetColorU32(tint_col));
-    }
-    else
-    {
-        window->DrawList->AddImage(user_texture_id, bb.Min, bb.Max, uv0, uv1, GetColorU32(tint_col));
-    }
-}
-
-bool ImGui::ImageButtonEx(ImGuiID id, ImTextureID texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, const ImVec2& padding, const ImVec4& bg_col, const ImVec4& tint_col)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size + padding * 2);
-    ItemSize(bb);
-    if (!ItemAdd(bb, id))
-        return false;
-
-    bool hovered, held;
-    bool pressed = ButtonBehavior(bb, id, &hovered, &held);
-
-    const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button);
-    RenderNavHighlight(bb, id);
-    RenderFrame(bb.Min, bb.Max, col, true, ImClamp((float)ImMin(padding.x, padding.y), 0.0f, g.Style.FrameRounding));
-    if (bg_col.w > 0.0f)
-        window->DrawList->AddRectFilled(bb.Min + padding, bb.Max - padding, GetColorU32(bg_col));
-    window->DrawList->AddImage(texture_id, bb.Min + padding, bb.Max - padding, uv0, uv1, GetColorU32(tint_col));
-
-    return pressed;
-}
-
-bool ImGui::ImageButton(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, int frame_padding, const ImVec4& bg_col, const ImVec4& tint_col)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return false;
-
-    PushID((void*)(intptr_t)user_texture_id);
-    const ImGuiID id = window->GetID("#image");
-    PopID();
-
-    const ImVec2 padding = (frame_padding >= 0) ? ImVec2((float)frame_padding, (float)frame_padding) : g.Style.FramePadding;
-    return ImageButtonEx(id, user_texture_id, size, uv0, uv1, padding, bg_col, tint_col);
-}
-
-bool ImGui::Checkbox(const char* label, bool* v)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const ImGuiID id = window->GetID(label);
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-
-    const float square_sz = GetFrameHeight();
-    const ImVec2 pos = window->DC.CursorPos; 
-     ImRect total_bb(pos, pos + ImVec2(square_sz + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f), label_size.y + style.FramePadding.y * 2.0f));
-     total_bb.Max.y += 10.0f; 
-
-    ItemSize(total_bb, style.FramePadding.y);
-    if (!ItemAdd(total_bb, id))
-    {
-        IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags | ImGuiItemStatusFlags_Checkable | (*v ? ImGuiItemStatusFlags_Checked : 0));
-        return false;
-    }
-
-    bool hovered, held;
-    bool pressed = ButtonBehavior(total_bb, id, &hovered, &held);
-    if (pressed)
-    {
-        *v = !(*v);
-        MarkItemEdited(id);
-    }
-
-     ImRect check_bb(pos, pos + ImVec2(square_sz, square_sz));
-    RenderNavHighlight(total_bb, id);
-    
-    check_bb.Max.x -= 10.0f;
-    check_bb.Max.y -= 10.0f;
-
-    RenderFrame(check_bb.Min, check_bb.Max, GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), true, style.FrameRounding);
-    
-    window->DrawList->AddLine(ImVec2(check_bb.Min.x - 1.0f, check_bb.Min.y), ImVec2(check_bb.Max.x - 1.0f, check_bb.Min.y ), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(check_bb.Min.x - 1.0f, check_bb.Min.y), ImVec2(check_bb.Min.x - 1.0f, check_bb.Max.y), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(check_bb.Max.x - 1.0f, check_bb.Min.y), ImVec2(check_bb.Max.x - 1.0f, check_bb.Max.y), colWhite, 1.0f);
-    window->DrawList->AddLine(ImVec2(check_bb.Min.x - 1.0f, check_bb.Max.y), ImVec2(check_bb.Max.x - 1.0f, check_bb.Max.y), colWhite, 1.0f);
-
-    ImU32 check_col = GetColorU32(ImGuiCol_CheckMark);
-    bool mixed_value = (window->DC.ItemFlags & ImGuiItemFlags_MixedValue) != 0;
-    if (mixed_value)
-    {
-        ImVec2 pad(ImMax(1.0f, IM_FLOOR(square_sz / 3.6f)), ImMax(1.0f, IM_FLOOR(square_sz / 3.6f)));
-        window->DrawList->AddRectFilled(check_bb.Min + pad, check_bb.Max - pad, check_col, style.FrameRounding);
-    }
-    else if (*v)
-    {
-        const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
-        RenderCheckMark(window->DrawList, check_bb.Min + ImVec2(pad, pad) - ImVec2(2.0f,1.0f), check_col, square_sz - pad * 2.0f - 7.0f);
-    }
-
-    ImVec2 label_pos = ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y);
-    label_pos.y -= 5.0f; label_pos.x += 3.0f;
-    if (g.LogEnabled)
-        LogRenderedText(&label_pos, mixed_value ? "[~]" : *v ? "[x]" : "[ ]");
-    if (label_size.x > 0.0f) {
-        if (*v)
-            RenderText(label_pos, label, 0, 1);
-        else
-            RenderText(label_pos, label, 0, 1, colWhiteText);
-    }
-
-
-    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags | ImGuiItemStatusFlags_Checkable | (*v ? ImGuiItemStatusFlags_Checked : 0));
-    return pressed;
-}
-
-template<typename T>
-bool ImGui::CheckboxFlagsT(const char* label, T* flags, T flags_value)
-{
-    bool all_on = (*flags & flags_value) == flags_value;
-    bool any_on = (*flags & flags_value) != 0;
-    bool pressed;
-    if (!all_on && any_on)
-    {
-        ImGuiWindow* window = GetCurrentWindow();
-        ImGuiItemFlags backup_item_flags = window->DC.ItemFlags;
-        window->DC.ItemFlags |= ImGuiItemFlags_MixedValue;
-        pressed = Checkbox(label, &all_on);
-        window->DC.ItemFlags = backup_item_flags;
-    }
-    else
-    {
-        pressed = Checkbox(label, &all_on);
-
-    }
-    if (pressed)
-    {
-        if (all_on)
-            *flags |= flags_value;
-        else
-            *flags &= ~flags_value;
-    }
-    return pressed;
-}
-
-bool ImGui::CheckboxFlags(const char* label, int* flags, int flags_value)
-{
-    return CheckboxFlagsT(label, flags, flags_value);
-}
-
-bool ImGui::CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value)
-{
-    return CheckboxFlagsT(label, flags, flags_value);
-}
-
-bool ImGui::CheckboxFlags(const char* label, ImS64* flags, ImS64 flags_value)
-{
-    return CheckboxFlagsT(label, flags, flags_value);
-}
-
-bool ImGui::CheckboxFlags(const char* label, ImU64* flags, ImU64 flags_value)
-{
-    return CheckboxFlagsT(label, flags, flags_value);
-}
-
-bool ImGui::RadioButton(const char* label, bool active)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const ImGuiID id = window->GetID(label);
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-
-    const float square_sz = GetFrameHeight();
-    const ImVec2 pos = window->DC.CursorPos;
-    const ImRect check_bb(pos, pos + ImVec2(square_sz, square_sz));
-    const ImRect total_bb(pos, pos + ImVec2(square_sz + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f), label_size.y + style.FramePadding.y * 2.0f));
-    ItemSize(total_bb, style.FramePadding.y);
-    if (!ItemAdd(total_bb, id))
-        return false;
-
-    ImVec2 center = check_bb.GetCenter();
-    center.x = IM_ROUND(center.x);
-    center.y = IM_ROUND(center.y);
-    const float radius = (square_sz - 1.0f) * 0.5f;
-
-    bool hovered, held;
-    bool pressed = ButtonBehavior(total_bb, id, &hovered, &held);
-    if (pressed)
-        MarkItemEdited(id);
-
-    RenderNavHighlight(total_bb, id);
-    window->DrawList->AddCircleFilled(center, radius, GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), 16);
-    if (active)
-    {
-        const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
-        window->DrawList->AddCircleFilled(center, radius - pad, GetColorU32(ImGuiCol_CheckMark), 16);
-    }
-
-    if (style.FrameBorderSize > 0.0f)
-    {
-        window->DrawList->AddCircle(center + ImVec2(1, 1), radius, GetColorU32(ImGuiCol_BorderShadow), 16, style.FrameBorderSize);
-        window->DrawList->AddCircle(center, radius, GetColorU32(ImGuiCol_Border), 16, style.FrameBorderSize);
-    }
-
-    ImVec2 label_pos = ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y);
-    if (g.LogEnabled)
-        LogRenderedText(&label_pos, active ? "(x)" : "( )");
-    if (label_size.x > 0.0f)
-        RenderText(label_pos, label);
-
-    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags);
-    return pressed;
-}
-
-bool ImGui::RadioButton(const char* label, int* v, int v_button)
-{
-    const bool pressed = RadioButton(label, *v == v_button);
-    if (pressed)
-        *v = v_button;
-    return pressed;
-}
-
-void ImGui::ProgressBar(float fraction, const ImVec2& size_arg, const char* overlay)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-
-    ImVec2 pos = window->DC.CursorPos;
-    ImVec2 size = CalcItemSize(size_arg, CalcItemWidth(), g.FontSize + style.FramePadding.y * 2.0f);
-    ImRect bb(pos, pos + size);
-    ItemSize(size, style.FramePadding.y);
-    if (!ItemAdd(bb, 0))
-        return;
-
-    fraction = ImSaturate(fraction);
-    RenderFrame(bb.Min, bb.Max, GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding);
-    bb.Expand(ImVec2(-style.FrameBorderSize, -style.FrameBorderSize));
-    const ImVec2 fill_br = ImVec2(ImLerp(bb.Min.x, bb.Max.x, fraction), bb.Max.y);
-    RenderRectFilledRangeH(window->DrawList, bb, GetColorU32(ImGuiCol_PlotHistogram), 0.0f, fraction, style.FrameRounding);
-
-    char overlay_buf[32];
-    if (!overlay)
-    {
-        ImFormatString(overlay_buf, IM_ARRAYSIZE(overlay_buf), "%.0f%%", fraction * 100 + 0.01f);
-        overlay = overlay_buf;
-    }
-
-    ImVec2 overlay_size = CalcTextSize(overlay, NULL);
-    if (overlay_size.x > 0.0f)
-        RenderTextClipped(ImVec2(ImClamp(fill_br.x + style.ItemSpacing.x, bb.Min.x, bb.Max.x - overlay_size.x - style.ItemInnerSpacing.x), bb.Min.y), bb.Max, overlay, NULL, &overlay_size, ImVec2(0.0f, 0.5f), &bb);
-}
-
-void ImGui::Bullet()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const float line_height = ImMax(ImMin(window->DC.CurrLineSize.y, g.FontSize + g.Style.FramePadding.y * 2), g.FontSize);
-    const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(g.FontSize, line_height));
-    ItemSize(bb);
-    if (!ItemAdd(bb, 0))
-    {
-        SameLine(0, style.FramePadding.x * 2);
-        return;
-    }
-
-    ImU32 text_col = GetColorU32(ImGuiCol_Text);
-    RenderBullet(window->DrawList, bb.Min + ImVec2(style.FramePadding.x + g.FontSize * 0.5f, line_height * 0.5f), text_col);
-    SameLine(0, style.FramePadding.x * 2.0f);
-}
-
-void ImGui::Spacing()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-    ItemSize(ImVec2(0, 0));
-}
-
-void ImGui::Dummy(const ImVec2& size)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
-    ItemSize(size);
-    ItemAdd(bb, 0);
-}
-
-void ImGui::NewLine()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiLayoutType backup_layout_type = window->DC.LayoutType;
-    window->DC.LayoutType = ImGuiLayoutType_Vertical;
-    if (window->DC.CurrLineSize.y > 0.0f)                           
-        ItemSize(ImVec2(0, 0));
-    else
-        ItemSize(ImVec2(0.0f, g.FontSize));
-    window->DC.LayoutType = backup_layout_type;
-}
-
-void ImGui::AlignTextToFramePadding()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    window->DC.CurrLineSize.y = ImMax(window->DC.CurrLineSize.y, g.FontSize + g.Style.FramePadding.y * 2);
-    window->DC.CurrLineTextBaseOffset = ImMax(window->DC.CurrLineTextBaseOffset, g.Style.FramePadding.y);
-}
-
-void ImGui::SeparatorEx(ImGuiSeparatorFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    IM_ASSERT(ImIsPowerOfTwo(flags & (ImGuiSeparatorFlags_Horizontal | ImGuiSeparatorFlags_Vertical)));          
-
-    float thickness_draw = 1.0f;
-    float thickness_layout = 0.0f;
-    if (flags & ImGuiSeparatorFlags_Vertical)
-    {
-        float y1 = window->DC.CursorPos.y;
-        float y2 = window->DC.CursorPos.y + window->DC.CurrLineSize.y;
-        const ImRect bb(ImVec2(window->DC.CursorPos.x, y1), ImVec2(window->DC.CursorPos.x + thickness_draw, y2));
-        ItemSize(ImVec2(thickness_layout, 0.0f));
-        if (!ItemAdd(bb, 0))
-            return;
-
-        window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Min.y), ImVec2(bb.Min.x, bb.Max.y), GetColorU32(ImGuiCol_Separator));
-        if (g.LogEnabled)
-            LogText(" |");
-    }
-    else if (flags & ImGuiSeparatorFlags_Horizontal)
-    {
-        float x1 = window->Pos.x;
-        float x2 = window->Pos.x + window->Size.x;
-
-        if (g.GroupStack.Size > 0 && g.GroupStack.back().WindowID == window->ID)
-            x1 += window->DC.Indent.x;
-
-        ImGuiOldColumns* columns = (flags & ImGuiSeparatorFlags_SpanAllColumns) ? window->DC.CurrentColumns : NULL;
-        if (columns)
-            PushColumnsBackground();
-
-        const ImRect bb(ImVec2(x1, window->DC.CursorPos.y), ImVec2(x2, window->DC.CursorPos.y + thickness_draw));
-        ItemSize(ImVec2(0.0f, thickness_layout));
-        const bool item_visible = ItemAdd(bb, 0);
-        if (item_visible)
-        {
-            window->DrawList->AddLine(ImVec2(bb.Min.x + 19.0f, bb.Min.y), ImVec2(bb.Max.x - 74.0f, bb.Min.y), colBlack);
-            if (g.LogEnabled)
-                LogRenderedText(&bb.Min, "--------------------------------\n");
-
-        }
-        if (columns)
-        {
-            PopColumnsBackground();
-            columns->LineMinY = window->DC.CursorPos.y;
-        }
-    }
-}
-
-void ImGui::Separator()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return;
-
-    ImGuiSeparatorFlags flags = (window->DC.LayoutType == ImGuiLayoutType_Horizontal) ? ImGuiSeparatorFlags_Vertical : ImGuiSeparatorFlags_Horizontal;
-    flags |= ImGuiSeparatorFlags_SpanAllColumns;
-    SeparatorEx(flags);
-}
-
-bool ImGui::SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float* size1, float* size2, float min_size1, float min_size2, float hover_extend, float hover_visibility_delay)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    const ImGuiItemFlags item_flags_backup = window->DC.ItemFlags;
-    window->DC.ItemFlags |= ImGuiItemFlags_NoNav | ImGuiItemFlags_NoNavDefaultFocus;
-    bool item_add = ItemAdd(bb, id);
-    window->DC.ItemFlags = item_flags_backup;
-    if (!item_add)
-        return false;
-
-    bool hovered, held;
-    ImRect bb_interact = bb;
-    bb_interact.Expand(axis == ImGuiAxis_Y ? ImVec2(0.0f, hover_extend) : ImVec2(hover_extend, 0.0f));
-    ButtonBehavior(bb_interact, id, &hovered, &held, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_AllowItemOverlap);
-    if (g.ActiveId != id)
-        SetItemAllowOverlap();
-
-    if (held || (g.HoveredId == id && g.HoveredIdPreviousFrame == id && g.HoveredIdTimer >= hover_visibility_delay))
-        SetMouseCursor(axis == ImGuiAxis_Y ? ImGuiMouseCursor_ResizeNS : ImGuiMouseCursor_ResizeEW);
-
-    ImRect bb_render = bb;
-    if (held)
-    {
-        ImVec2 mouse_delta_2d = g.IO.MousePos - g.ActiveIdClickOffset - bb_interact.Min;
-        float mouse_delta = (axis == ImGuiAxis_Y) ? mouse_delta_2d.y : mouse_delta_2d.x;
-
-        float size_1_maximum_delta = ImMax(0.0f, *size1 - min_size1);
-        float size_2_maximum_delta = ImMax(0.0f, *size2 - min_size2);
-        if (mouse_delta < -size_1_maximum_delta)
-            mouse_delta = -size_1_maximum_delta;
-        if (mouse_delta > size_2_maximum_delta)
-            mouse_delta = size_2_maximum_delta;
-
-        if (mouse_delta != 0.0f)
-        {
-            if (mouse_delta < 0.0f)
-                IM_ASSERT(*size1 + mouse_delta >= min_size1);
-            if (mouse_delta > 0.0f)
-                IM_ASSERT(*size2 - mouse_delta >= min_size2);
-            *size1 += mouse_delta;
-            *size2 -= mouse_delta;
-            bb_render.Translate((axis == ImGuiAxis_X) ? ImVec2(mouse_delta, 0.0f) : ImVec2(0.0f, mouse_delta));
-            MarkItemEdited(id);
-        }
-    }
-
-    const ImU32 col = GetColorU32(held ? ImGuiCol_SeparatorActive : (hovered && g.HoveredIdTimer >= hover_visibility_delay) ? ImGuiCol_SeparatorHovered : ImGuiCol_Separator);
-    window->DrawList->AddRectFilled(bb_render.Min, bb_render.Max, col, 0.0f);
-
-    return held;
-}
-
-static int IMGUI_CDECL ShrinkWidthItemComparer(const void* lhs, const void* rhs)
-{
-    const ImGuiShrinkWidthItem* a = (const ImGuiShrinkWidthItem*)lhs;
-    const ImGuiShrinkWidthItem* b = (const ImGuiShrinkWidthItem*)rhs;
-    if (int d = (int)(b->Width - a->Width))
-        return d;
-    return (b->Index - a->Index);
-}
-
-void ImGui::ShrinkWidths(ImGuiShrinkWidthItem* items, int count, float width_excess)
-{
-    if (count == 1)
-    {
-        if (items[0].Width >= 0.0f)
-            items[0].Width = ImMax(items[0].Width - width_excess, 1.0f);
-        return;
-    }
-    ImQsort(items, (size_t)count, sizeof(ImGuiShrinkWidthItem), ShrinkWidthItemComparer);
-    int count_same_width = 1;
-    while (width_excess > 0.0f && count_same_width < count)
-    {
-        while (count_same_width < count && items[0].Width <= items[count_same_width].Width)
-            count_same_width++;
-        float max_width_to_remove_per_item = (count_same_width < count && items[count_same_width].Width >= 0.0f) ? (items[0].Width - items[count_same_width].Width) : (items[0].Width - 1.0f);
-        if (max_width_to_remove_per_item <= 0.0f)
-            break;
-        float width_to_remove_per_item = ImMin(width_excess / count_same_width, max_width_to_remove_per_item);
-        for (int item_n = 0; item_n < count_same_width; item_n++)
-            items[item_n].Width -= width_to_remove_per_item;
-        width_excess -= width_to_remove_per_item * count_same_width;
-    }
-
-    width_excess = 0.0f;
-    for (int n = 0; n < count; n++)
-    {
-        float width_rounded = ImFloor(items[n].Width);
-        width_excess += items[n].Width - width_rounded;
-        items[n].Width = width_rounded;
-    }
-    if (width_excess > 0.0f)
-        for (int n = 0; n < count; n++)
-            if (items[n].Index < (int)(width_excess + 0.01f))
-                items[n].Width += 1.0f;
-}
-
-static float CalcMaxPopupHeightFromItemCount(int items_count)
-{
-    ImGuiContext& g = *GImGui;
-    if (items_count <= 0)
-        return FLT_MAX;
-    return (g.FontSize + g.Style.ItemSpacing.y) * items_count - g.Style.ItemSpacing.y + (g.Style.WindowPadding.y * 2);
-}
-
-bool ImGui::BeginCombo(const char* label, const char* preview_value, ImGuiComboFlags flags)
-{
-    
-    ImGuiContext& g = *GImGui;
-    bool has_window_size_constraint = (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSizeConstraint) != 0;
-    g.NextWindowData.Flags &= ~ImGuiNextWindowDataFlags_HasSizeConstraint;
-
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    IM_ASSERT((flags & (ImGuiComboFlags_NoArrowButton | ImGuiComboFlags_NoPreview)) != (ImGuiComboFlags_NoArrowButton | ImGuiComboFlags_NoPreview));      
-
-     ImGuiStyle& style = g.Style;
-    const ImGuiID id = window->GetID(label);
-
-    const float arrow_size = (flags & ImGuiComboFlags_NoArrowButton) ? 0.0f : GetFrameHeight();
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-    const float expected_w = CalcItemWidth();
-    const float w = (flags & ImGuiComboFlags_NoPreview) ? arrow_size : expected_w;
-     ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y * 2.0f));
-     ImRect total_bb(frame_bb.Min - ImVec2(0.0f,10.0f), frame_bb.Max + ImVec2(style.ItemInnerSpacing.x,-10.0f));   
-     total_bb.Max.y += 10.0f;
-    ItemSize(total_bb, style.FramePadding.y);
-    if (!ItemAdd(total_bb, id, &frame_bb))
-        return false;
-
-    bool hovered, held;
-    bool pressed = ButtonBehavior(frame_bb, id, &hovered, &held);
-    bool popup_open = IsPopupOpen(id, ImGuiPopupFlags_None);
-
-    const ImU32 frame_col = GetColorU32(ImGuiCol_FrameBg);
-
-    const float value_x2 = ImMax(frame_bb.Min.x, frame_bb.Max.x - arrow_size);
-    RenderNavHighlight(frame_bb, id);
-    if (!(flags & ImGuiComboFlags_NoPreview))
-        window->DrawList->AddRectFilled(frame_bb.Min, ImVec2(value_x2, frame_bb.Max.y), frame_col, style.FrameRounding, (flags & ImGuiComboFlags_NoArrowButton) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Left);
-    
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Min.y), ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Min.y), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Min.y), ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Max.y), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Min.y), ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Max.y), colWhite, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Max.y), ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Max.y), colWhite, 1.0f);
-  
-
-    if (!(flags & ImGuiComboFlags_NoArrowButton))
-    {
-        ImU32 bg_col = GetColorU32(hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg); 
-        ImU32 text_col = GetColorU32(ImGuiCol_Text);
-        window->DrawList->AddRectFilled(ImVec2(value_x2 + 1.0f, frame_bb.Min.y + 1.0f), ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Max.y), bg_col, style.FrameRounding, (w <= arrow_size) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Right);
-
-        if (value_x2 + arrow_size - style.FramePadding.x <= frame_bb.Max.x)
-            RenderArrow(window->DrawList, ImVec2(value_x2 + style.FramePadding.y, frame_bb.Min.y + style.FramePadding.y), text_col, ImGuiDir_Down, 1.0f);
-    }
-    RenderFrameBorder(frame_bb.Min, frame_bb.Max, style.FrameRounding);
-    if (preview_value != NULL && !(flags & ImGuiComboFlags_NoPreview))
-    {
-        ImVec2 preview_pos = frame_bb.Min + style.FramePadding;
-        if (g.LogEnabled)
-            LogSetNextTextDecoration("{", "}");
-        RenderTextClipped(preview_pos, ImVec2(value_x2, frame_bb.Max.y), preview_value, NULL, NULL, ImVec2(0.0f, 0.0f));
-    }
-    if (label_size.x > 0)
-        RenderText(ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y - 20.0f), label);
-
-    if ((pressed || g.NavActivateId == id) && !popup_open)
-    {
-        if (window->DC.NavLayerCurrent == 0)
-            window->NavLastIds[0] = id;
-        OpenPopupEx(id, ImGuiPopupFlags_None);
-        popup_open = true;
-    }
-
-    if (!popup_open)
-        return false;
-
-    if (has_window_size_constraint)
-    {
-        g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasSizeConstraint;
-        g.NextWindowData.SizeConstraintRect.Min.x = ImMax(g.NextWindowData.SizeConstraintRect.Min.x, w);
-    }
-    else
-    {
-        if ((flags & ImGuiComboFlags_HeightMask_) == 0)
-            flags |= ImGuiComboFlags_HeightRegular;
-        IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiComboFlags_HeightMask_));      
-        int popup_max_height_in_items = -1;
-        if (flags & ImGuiComboFlags_HeightRegular)     popup_max_height_in_items = 8;
-        else if (flags & ImGuiComboFlags_HeightSmall)  popup_max_height_in_items = 4;
-        else if (flags & ImGuiComboFlags_HeightLarge)  popup_max_height_in_items = 20;
-        SetNextWindowSizeConstraints(ImVec2(w, 0.0f), ImVec2(FLT_MAX, CalcMaxPopupHeightFromItemCount(popup_max_height_in_items)));
-    }
-
-    char name[16];
-    ImFormatString(name, IM_ARRAYSIZE(name), "##Combo_%02d", g.BeginPopupStack.Size);      
-
-    if (ImGuiWindow* popup_window = FindWindowByName(name))
-        if (popup_window->WasActive)
-        {
-            ImVec2 size_expected = CalcWindowNextAutoFitSize(popup_window);
-            if (flags & ImGuiComboFlags_PopupAlignLeft)
-                popup_window->AutoPosLastDirection = ImGuiDir_Left;    
-            else
-                popup_window->AutoPosLastDirection = ImGuiDir_Down;     
-            ImRect r_outer = GetWindowAllowedExtentRect(popup_window);
-            ImVec2 pos = FindBestWindowPosForPopupEx(frame_bb.GetBL(), size_expected, &popup_window->AutoPosLastDirection, r_outer, frame_bb, ImGuiPopupPositionPolicy_ComboBox);
-            SetNextWindowPos(pos);
-        }
-
-    ImGuiWindowFlags window_flags = ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_Popup | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoMove;
-
-    PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(style.FramePadding.x, style.WindowPadding.y));
-    bool ret = Begin(name, NULL, window_flags);
-    PopStyleVar();
-    if (!ret)
-    {
-        EndPopup();
-        IM_ASSERT(0);             
-        return false;
-    }
-    return true;
-}
-
-void ImGui::EndCombo()
-{
-    EndPopup();
-}
-
-static bool Items_ArrayGetter(void* data, int idx, const char** out_text)
-{
-    const char* const* items = (const char* const*)data;
-    if (out_text)
-        *out_text = items[idx];
-    return true;
-}
-
-static bool Items_SingleStringGetter(void* data, int idx, const char** out_text)
-{
-    const char* items_separated_by_zeros = (const char*)data;
-    int items_count = 0;
-    const char* p = items_separated_by_zeros;
-    while (*p)
-    {
-        if (idx == items_count)
-            break;
-        p += strlen(p) + 1;
-        items_count++;
-    }
-    if (!*p)
-        return false;
-    if (out_text)
-        *out_text = p;
-    return true;
-}
-
-bool ImGui::Combo(const char* label, int* current_item, bool (*items_getter)(void*, int, const char**), void* data, int items_count, int popup_max_height_in_items)
-{
-    ImGuiContext& g = *GImGui;
-
-    const char* preview_value = NULL;
-    if (*current_item >= 0 && *current_item < items_count)
-        items_getter(data, *current_item, &preview_value);
-
-    if (popup_max_height_in_items != -1 && !(g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSizeConstraint))
-        SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, CalcMaxPopupHeightFromItemCount(popup_max_height_in_items)));
-
-    if (!BeginCombo(label, preview_value, ImGuiComboFlags_None))
-        return false;
-
-    bool value_changed = false;
-    for (int i = 0; i < items_count; i++)
-    {
-        PushID((void*)(intptr_t)i);
-        const bool item_selected = (i == *current_item);
-        const char* item_text;
-        if (!items_getter(data, i, &item_text))
-            item_text = "*Unknown item*";
-        if (Selectable(item_text, item_selected))
-        {
-            value_changed = true;
-            *current_item = i;
-        }
-        if (item_selected) {
-            SetItemDefaultFocus();
-        }
-        PopID();
-    }
-
-    EndCombo();
-    if (value_changed) {
-       MarkItemEdited(g.CurrentWindow->DC.LastItemId);
-    }
-
-    return value_changed;
-}
-
-bool ImGui::Combo(const char* label, int* current_item, const char* const items[], int items_count, int height_in_items)
-{
-    const bool value_changed = Combo(label, current_item, Items_ArrayGetter, (void*)items, items_count, height_in_items);
-    return value_changed;
-}
-
-bool ImGui::Combo(const char* label, int* current_item, const char* items_separated_by_zeros, int height_in_items)
-{
-    int items_count = 0;
-    const char* p = items_separated_by_zeros;                   
-    while (*p)
-    {
-        p += strlen(p) + 1;
-        items_count++;
-    }
-    bool value_changed = Combo(label, current_item, Items_SingleStringGetter, (void*)items_separated_by_zeros, items_count, height_in_items);
-    return value_changed;
-}
-
-static const ImGuiDataTypeInfo GDataTypeInfo[] =
-{
-    { sizeof(char),             "S8",   "%d",   "%d"    },   
-    { sizeof(unsigned char),    "U8",   "%u",   "%u"    },
-    { sizeof(short),            "S16",  "%d",   "%d"    },   
-    { sizeof(unsigned short),   "U16",  "%u",   "%u"    },
-    { sizeof(int),              "S32",  "%d",   "%d"    },   
-    { sizeof(unsigned int),     "U32",  "%u",   "%u"    },
-#ifdef _MSC_VER
-    { sizeof(ImS64),            "S64",  "%I64d","%I64d" },   
-    { sizeof(ImU64),            "U64",  "%I64u","%I64u" },
-#else
-    { sizeof(ImS64),            "S64",  "%lld", "%lld"  },   
-    { sizeof(ImU64),            "U64",  "%llu", "%llu"  },
-#endif
-    { sizeof(float),            "float", "%f",  "%f"    },          
-    { sizeof(double),           "double","%f",  "%lf"   },   
-};
-IM_STATIC_ASSERT(IM_ARRAYSIZE(GDataTypeInfo) == ImGuiDataType_COUNT);
-
-static const char* PatchFormatStringFloatToInt(const char* fmt)
-{
-    if (fmt[0] == '%' && fmt[1] == '.' && fmt[2] == '0' && fmt[3] == 'f' && fmt[4] == 0)               
-        return "%d";
-    const char* fmt_start = ImParseFormatFindStart(fmt);           
-    const char* fmt_end = ImParseFormatFindEnd(fmt_start);                      
-    if (fmt_end > fmt_start && fmt_end[-1] == 'f')
-    {
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-        if (fmt_start == fmt && fmt_end[0] == 0)
-            return "%d";
-        ImGuiContext& g = *GImGui;
-        ImFormatString(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), "%.*s%%d%s", (int)(fmt_start - fmt), fmt, fmt_end);         
-        return g.TempBuffer;
-#else
-        IM_ASSERT(0 && "DragInt(): Invalid format string!");              
-#endif
-    }
-    return fmt;
-}
-
-const ImGuiDataTypeInfo* ImGui::DataTypeGetInfo(ImGuiDataType data_type)
-{
-    IM_ASSERT(data_type >= 0 && data_type < ImGuiDataType_COUNT);
-    return &GDataTypeInfo[data_type];
-}
-
-int ImGui::DataTypeFormatString(char* buf, int buf_size, ImGuiDataType data_type, const void* p_data, const char* format)
-{
-    if (data_type == ImGuiDataType_S32 || data_type == ImGuiDataType_U32)
-        return ImFormatString(buf, buf_size, format, *(const ImU32*)p_data);
-    if (data_type == ImGuiDataType_S64 || data_type == ImGuiDataType_U64)
-        return ImFormatString(buf, buf_size, format, *(const ImU64*)p_data);
-    if (data_type == ImGuiDataType_Float)
-        return ImFormatString(buf, buf_size, format, *(const float*)p_data);
-    if (data_type == ImGuiDataType_Double)
-        return ImFormatString(buf, buf_size, format, *(const double*)p_data);
-    if (data_type == ImGuiDataType_S8)
-        return ImFormatString(buf, buf_size, format, *(const ImS8*)p_data);
-    if (data_type == ImGuiDataType_U8)
-        return ImFormatString(buf, buf_size, format, *(const ImU8*)p_data);
-    if (data_type == ImGuiDataType_S16)
-        return ImFormatString(buf, buf_size, format, *(const ImS16*)p_data);
-    if (data_type == ImGuiDataType_U16)
-        return ImFormatString(buf, buf_size, format, *(const ImU16*)p_data);
-    IM_ASSERT(0);
-    return 0;
-}
-
-void ImGui::DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, const void* arg1, const void* arg2)
-{
-    IM_ASSERT(op == '+' || op == '-');
-    switch (data_type)
-    {
-        case ImGuiDataType_S8:
-            if (op == '+') { *(ImS8*)output  = ImAddClampOverflow(*(const ImS8*)arg1,  *(const ImS8*)arg2,  IM_S8_MIN,  IM_S8_MAX); }
-            if (op == '-') { *(ImS8*)output  = ImSubClampOverflow(*(const ImS8*)arg1,  *(const ImS8*)arg2,  IM_S8_MIN,  IM_S8_MAX); }
-            return;
-        case ImGuiDataType_U8:
-            if (op == '+') { *(ImU8*)output  = ImAddClampOverflow(*(const ImU8*)arg1,  *(const ImU8*)arg2,  IM_U8_MIN,  IM_U8_MAX); }
-            if (op == '-') { *(ImU8*)output  = ImSubClampOverflow(*(const ImU8*)arg1,  *(const ImU8*)arg2,  IM_U8_MIN,  IM_U8_MAX); }
-            return;
-        case ImGuiDataType_S16:
-            if (op == '+') { *(ImS16*)output = ImAddClampOverflow(*(const ImS16*)arg1, *(const ImS16*)arg2, IM_S16_MIN, IM_S16_MAX); }
-            if (op == '-') { *(ImS16*)output = ImSubClampOverflow(*(const ImS16*)arg1, *(const ImS16*)arg2, IM_S16_MIN, IM_S16_MAX); }
-            return;
-        case ImGuiDataType_U16:
-            if (op == '+') { *(ImU16*)output = ImAddClampOverflow(*(const ImU16*)arg1, *(const ImU16*)arg2, IM_U16_MIN, IM_U16_MAX); }
-            if (op == '-') { *(ImU16*)output = ImSubClampOverflow(*(const ImU16*)arg1, *(const ImU16*)arg2, IM_U16_MIN, IM_U16_MAX); }
-            return;
-        case ImGuiDataType_S32:
-            if (op == '+') { *(ImS32*)output = ImAddClampOverflow(*(const ImS32*)arg1, *(const ImS32*)arg2, IM_S32_MIN, IM_S32_MAX); }
-            if (op == '-') { *(ImS32*)output = ImSubClampOverflow(*(const ImS32*)arg1, *(const ImS32*)arg2, IM_S32_MIN, IM_S32_MAX); }
-            return;
-        case ImGuiDataType_U32:
-            if (op == '+') { *(ImU32*)output = ImAddClampOverflow(*(const ImU32*)arg1, *(const ImU32*)arg2, IM_U32_MIN, IM_U32_MAX); }
-            if (op == '-') { *(ImU32*)output = ImSubClampOverflow(*(const ImU32*)arg1, *(const ImU32*)arg2, IM_U32_MIN, IM_U32_MAX); }
-            return;
-        case ImGuiDataType_S64:
-            if (op == '+') { *(ImS64*)output = ImAddClampOverflow(*(const ImS64*)arg1, *(const ImS64*)arg2, IM_S64_MIN, IM_S64_MAX); }
-            if (op == '-') { *(ImS64*)output = ImSubClampOverflow(*(const ImS64*)arg1, *(const ImS64*)arg2, IM_S64_MIN, IM_S64_MAX); }
-            return;
-        case ImGuiDataType_U64:
-            if (op == '+') { *(ImU64*)output = ImAddClampOverflow(*(const ImU64*)arg1, *(const ImU64*)arg2, IM_U64_MIN, IM_U64_MAX); }
-            if (op == '-') { *(ImU64*)output = ImSubClampOverflow(*(const ImU64*)arg1, *(const ImU64*)arg2, IM_U64_MIN, IM_U64_MAX); }
-            return;
-        case ImGuiDataType_Float:
-            if (op == '+') { *(float*)output = *(const float*)arg1 + *(const float*)arg2; }
-            if (op == '-') { *(float*)output = *(const float*)arg1 - *(const float*)arg2; }
-            return;
-        case ImGuiDataType_Double:
-            if (op == '+') { *(double*)output = *(const double*)arg1 + *(const double*)arg2; }
-            if (op == '-') { *(double*)output = *(const double*)arg1 - *(const double*)arg2; }
-            return;
-        case ImGuiDataType_COUNT: break;
-    }
-    IM_ASSERT(0);
-}
-
-bool ImGui::DataTypeApplyOpFromText(const char* buf, const char* initial_value_buf, ImGuiDataType data_type, void* p_data, const char* format)
-{
-    while (ImCharIsBlankA(*buf))
-        buf++;
-
-    char op = buf[0];
-    if (op == '+' || op == '*' || op == '/')
-    {
-        buf++;
-        while (ImCharIsBlankA(*buf))
-            buf++;
-    }
-    else
-    {
-        op = 0;
-    }
-    if (!buf[0])
-        return false;
-
-    const ImGuiDataTypeInfo* type_info = DataTypeGetInfo(data_type);
-    ImGuiDataTypeTempStorage data_backup;
-    memcpy(&data_backup, p_data, type_info->Size);
-
-    if (format == NULL)
-        format = type_info->ScanFmt;
-
-    int arg1i = 0;
-    if (data_type == ImGuiDataType_S32)
-    {
-        int* v = (int*)p_data;
-        int arg0i = *v;
-        float arg1f = 0.0f;
-        if (op && sscanf(initial_value_buf, format, &arg0i) < 1)
-            return false;
-        if (op == '+')      { if (sscanf(buf, "%d", &arg1i)) *v = (int)(arg0i + arg1i); }                        
-        else if (op == '*') { if (sscanf(buf, "%f", &arg1f)) *v = (int)(arg0i * arg1f); }                    
-        else if (op == '/') { if (sscanf(buf, "%f", &arg1f) && arg1f != 0.0f) *v = (int)(arg0i / arg1f); }   
-        else                { if (sscanf(buf, format, &arg1i) == 1) *v = arg1i; }                             
-    }
-    else if (data_type == ImGuiDataType_Float)
-    {
-        format = "%f";
-        float* v = (float*)p_data;
-        float arg0f = *v, arg1f = 0.0f;
-        if (op && sscanf(initial_value_buf, format, &arg0f) < 1)
-            return false;
-        if (sscanf(buf, format, &arg1f) < 1)
-            return false;
-        if (op == '+')      { *v = arg0f + arg1f; }                         
-        else if (op == '*') { *v = arg0f * arg1f; }                     
-        else if (op == '/') { if (arg1f != 0.0f) *v = arg0f / arg1f; }  
-        else                { *v = arg1f; }                              
-    }
-    else if (data_type == ImGuiDataType_Double)
-    {
-        format = "%lf";              
-        double* v = (double*)p_data;
-        double arg0f = *v, arg1f = 0.0;
-        if (op && sscanf(initial_value_buf, format, &arg0f) < 1)
-            return false;
-        if (sscanf(buf, format, &arg1f) < 1)
-            return false;
-        if (op == '+')      { *v = arg0f + arg1f; }                         
-        else if (op == '*') { *v = arg0f * arg1f; }                     
-        else if (op == '/') { if (arg1f != 0.0f) *v = arg0f / arg1f; }  
-        else                { *v = arg1f; }                              
-    }
-    else if (data_type == ImGuiDataType_U32 || data_type == ImGuiDataType_S64 || data_type == ImGuiDataType_U64)
-    {
-        sscanf(buf, format, p_data);
-    }
-    else
-    {
-        int v32;
-        sscanf(buf, format, &v32);
-        if (data_type == ImGuiDataType_S8)
-            *(ImS8*)p_data = (ImS8)ImClamp(v32, (int)IM_S8_MIN, (int)IM_S8_MAX);
-        else if (data_type == ImGuiDataType_U8)
-            *(ImU8*)p_data = (ImU8)ImClamp(v32, (int)IM_U8_MIN, (int)IM_U8_MAX);
-        else if (data_type == ImGuiDataType_S16)
-            *(ImS16*)p_data = (ImS16)ImClamp(v32, (int)IM_S16_MIN, (int)IM_S16_MAX);
-        else if (data_type == ImGuiDataType_U16)
-            *(ImU16*)p_data = (ImU16)ImClamp(v32, (int)IM_U16_MIN, (int)IM_U16_MAX);
-        else
-            IM_ASSERT(0);
-    }
-
-    return memcmp(&data_backup, p_data, type_info->Size) != 0;
-}
-
-template<typename T>
-static int DataTypeCompareT(const T* lhs, const T* rhs)
-{
-    if (*lhs < *rhs) return -1;
-    if (*lhs > *rhs) return +1;
-    return 0;
-}
-
-int ImGui::DataTypeCompare(ImGuiDataType data_type, const void* arg_1, const void* arg_2)
-{
-    switch (data_type)
-    {
-    case ImGuiDataType_S8:     return DataTypeCompareT<ImS8  >((const ImS8*  )arg_1, (const ImS8*  )arg_2);
-    case ImGuiDataType_U8:     return DataTypeCompareT<ImU8  >((const ImU8*  )arg_1, (const ImU8*  )arg_2);
-    case ImGuiDataType_S16:    return DataTypeCompareT<ImS16 >((const ImS16* )arg_1, (const ImS16* )arg_2);
-    case ImGuiDataType_U16:    return DataTypeCompareT<ImU16 >((const ImU16* )arg_1, (const ImU16* )arg_2);
-    case ImGuiDataType_S32:    return DataTypeCompareT<ImS32 >((const ImS32* )arg_1, (const ImS32* )arg_2);
-    case ImGuiDataType_U32:    return DataTypeCompareT<ImU32 >((const ImU32* )arg_1, (const ImU32* )arg_2);
-    case ImGuiDataType_S64:    return DataTypeCompareT<ImS64 >((const ImS64* )arg_1, (const ImS64* )arg_2);
-    case ImGuiDataType_U64:    return DataTypeCompareT<ImU64 >((const ImU64* )arg_1, (const ImU64* )arg_2);
-    case ImGuiDataType_Float:  return DataTypeCompareT<float >((const float* )arg_1, (const float* )arg_2);
-    case ImGuiDataType_Double: return DataTypeCompareT<double>((const double*)arg_1, (const double*)arg_2);
-    case ImGuiDataType_COUNT:  break;
-    }
-    IM_ASSERT(0);
-    return 0;
-}
-
-template<typename T>
-static bool DataTypeClampT(T* v, const T* v_min, const T* v_max)
-{
-    if (v_min && *v < *v_min) { *v = *v_min; return true; }
-    if (v_max && *v > *v_max) { *v = *v_max; return true; }
-    return false;
-}
-
-bool ImGui::DataTypeClamp(ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max)
-{
-    switch (data_type)
-    {
-    case ImGuiDataType_S8:     return DataTypeClampT<ImS8  >((ImS8*  )p_data, (const ImS8*  )p_min, (const ImS8*  )p_max);
-    case ImGuiDataType_U8:     return DataTypeClampT<ImU8  >((ImU8*  )p_data, (const ImU8*  )p_min, (const ImU8*  )p_max);
-    case ImGuiDataType_S16:    return DataTypeClampT<ImS16 >((ImS16* )p_data, (const ImS16* )p_min, (const ImS16* )p_max);
-    case ImGuiDataType_U16:    return DataTypeClampT<ImU16 >((ImU16* )p_data, (const ImU16* )p_min, (const ImU16* )p_max);
-    case ImGuiDataType_S32:    return DataTypeClampT<ImS32 >((ImS32* )p_data, (const ImS32* )p_min, (const ImS32* )p_max);
-    case ImGuiDataType_U32:    return DataTypeClampT<ImU32 >((ImU32* )p_data, (const ImU32* )p_min, (const ImU32* )p_max);
-    case ImGuiDataType_S64:    return DataTypeClampT<ImS64 >((ImS64* )p_data, (const ImS64* )p_min, (const ImS64* )p_max);
-    case ImGuiDataType_U64:    return DataTypeClampT<ImU64 >((ImU64* )p_data, (const ImU64* )p_min, (const ImU64* )p_max);
-    case ImGuiDataType_Float:  return DataTypeClampT<float >((float* )p_data, (const float* )p_min, (const float* )p_max);
-    case ImGuiDataType_Double: return DataTypeClampT<double>((double*)p_data, (const double*)p_min, (const double*)p_max);
-    case ImGuiDataType_COUNT:  break;
-    }
-    IM_ASSERT(0);
-    return false;
-}
-
-static float GetMinimumStepAtDecimalPrecision(int decimal_precision)
-{
-    static const float min_steps[10] = { 1.0f, 0.1f, 0.01f, 0.001f, 0.0001f, 0.00001f, 0.000001f, 0.0000001f, 0.00000001f, 0.000000001f };
-    if (decimal_precision < 0)
-        return FLT_MIN;
-    return (decimal_precision < IM_ARRAYSIZE(min_steps)) ? min_steps[decimal_precision] : ImPow(10.0f, (float)-decimal_precision);
-}
-
-template<typename TYPE>
-static const char* ImAtoi(const char* src, TYPE* output)
-{
-    int negative = 0;
-    if (*src == '-') { negative = 1; src++; }
-    if (*src == '+') { src++; }
-    TYPE v = 0;
-    while (*src >= '0' && *src <= '9')
-        v = (v * 10) + (*src++ - '0');
-    *output = negative ? -v : v;
-    return src;
-}
-
-template<typename TYPE, typename SIGNEDTYPE>
-TYPE ImGui::RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, TYPE v)
-{
-    const char* fmt_start = ImParseFormatFindStart(format);
-    if (fmt_start[0] != '%' || fmt_start[1] == '%')             
-        return v;
-    char v_str[64];
-    ImFormatString(v_str, IM_ARRAYSIZE(v_str), fmt_start, v);
-    const char* p = v_str;
-    while (*p == ' ')
-        p++;
-    if (data_type == ImGuiDataType_Float || data_type == ImGuiDataType_Double)
-        v = (TYPE)ImAtof(p);
-    else
-        ImAtoi(p, (SIGNEDTYPE*)&v);
-    return v;
-}
-
-template<typename TYPE, typename SIGNEDTYPE, typename FLOATTYPE>
-bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const TYPE v_min, const TYPE v_max, const char* format, ImGuiSliderFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    const ImGuiAxis axis = (flags & ImGuiSliderFlags_Vertical) ? ImGuiAxis_Y : ImGuiAxis_X;
-    const bool is_decimal = (data_type == ImGuiDataType_Float) || (data_type == ImGuiDataType_Double);
-    const bool is_clamped = (v_min < v_max);
-    const bool is_logarithmic = (flags & ImGuiSliderFlags_Logarithmic) && is_decimal;
-
-    if (v_speed == 0.0f && is_clamped && (v_max - v_min < FLT_MAX))
-        v_speed = (float)((v_max - v_min) * g.DragSpeedDefaultRatio);
-
-    float adjust_delta = 0.0f;
-    if (g.ActiveIdSource == ImGuiInputSource_Mouse && IsMousePosValid() && IsMouseDragPastThreshold(0, g.IO.MouseDragThreshold * DRAG_MOUSE_THRESHOLD_FACTOR))
-    {
-        adjust_delta = g.IO.MouseDelta[axis];
-        if (g.IO.KeyAlt)
-            adjust_delta *= 1.0f / 100.0f;
-        if (g.IO.KeyShift)
-            adjust_delta *= 10.0f;
-    }
-    else if (g.ActiveIdSource == ImGuiInputSource_Nav)
-    {
-        int decimal_precision = is_decimal ? ImParseFormatPrecision(format, 3) : 0;
-        adjust_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_Keyboard | ImGuiNavDirSourceFlags_PadDPad, ImGuiInputReadMode_RepeatFast, 1.0f / 10.0f, 10.0f)[axis];
-        v_speed = ImMax(v_speed, GetMinimumStepAtDecimalPrecision(decimal_precision));
-    }
-    adjust_delta *= v_speed;
-
-    if (axis == ImGuiAxis_Y)
-        adjust_delta = -adjust_delta;
-
-    if (is_logarithmic && (v_max - v_min < FLT_MAX) && ((v_max - v_min) > 0.000001f))     
-        adjust_delta /= (float)(v_max - v_min);
-
-    bool is_just_activated = g.ActiveIdIsJustActivated;
-    bool is_already_past_limits_and_pushing_outward = is_clamped && ((*v >= v_max && adjust_delta > 0.0f) || (*v <= v_min && adjust_delta < 0.0f));
-    if (is_just_activated || is_already_past_limits_and_pushing_outward)
-    {
-        g.DragCurrentAccum = 0.0f;
-        g.DragCurrentAccumDirty = false;
-    }
-    else if (adjust_delta != 0.0f)
-    {
-        g.DragCurrentAccum += adjust_delta;
-        g.DragCurrentAccumDirty = true;
-    }
-
-    if (!g.DragCurrentAccumDirty)
-        return false;
-
-    TYPE v_cur = *v;
-    FLOATTYPE v_old_ref_for_accum_remainder = (FLOATTYPE)0.0f;
-
-    float logarithmic_zero_epsilon = 0.0f;       
-    const float zero_deadzone_halfsize = 0.0f;           
-    if (is_logarithmic)
-    {
-        const int decimal_precision = is_decimal ? ImParseFormatPrecision(format, 3) : 1;
-        logarithmic_zero_epsilon = ImPow(0.1f, (float)decimal_precision);
-
-        float v_old_parametric = ScaleRatioFromValueT<TYPE, SIGNEDTYPE, FLOATTYPE>(data_type, v_cur, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize);
-        float v_new_parametric = v_old_parametric + g.DragCurrentAccum;
-        v_cur = ScaleValueFromRatioT<TYPE, SIGNEDTYPE, FLOATTYPE>(data_type, v_new_parametric, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize);
-        v_old_ref_for_accum_remainder = v_old_parametric;
-    }
-    else
-    {
-        v_cur += (SIGNEDTYPE)g.DragCurrentAccum;
-    }
-
-    if (!(flags & ImGuiSliderFlags_NoRoundToFormat))
-        v_cur = RoundScalarWithFormatT<TYPE, SIGNEDTYPE>(format, data_type, v_cur);
-
-    g.DragCurrentAccumDirty = false;
-    if (is_logarithmic)
-    {
-        float v_new_parametric = ScaleRatioFromValueT<TYPE, SIGNEDTYPE, FLOATTYPE>(data_type, v_cur, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize);
-        g.DragCurrentAccum -= (float)(v_new_parametric - v_old_ref_for_accum_remainder);
-    }
-    else
-    {
-        g.DragCurrentAccum -= (float)((SIGNEDTYPE)v_cur - (SIGNEDTYPE)*v);
-    }
-
-    if (v_cur == (TYPE)-0)
-        v_cur = (TYPE)0;
-
-    if (*v != v_cur && is_clamped)
-    {
-        if (v_cur < v_min || (v_cur > *v && adjust_delta < 0.0f && !is_decimal))
-            v_cur = v_min;
-        if (v_cur > v_max || (v_cur < *v && adjust_delta > 0.0f && !is_decimal))
-            v_cur = v_max;
-    }
-
-    if (*v == v_cur)
-        return false;
-    *v = v_cur;
-    return true;
-}
-
-bool ImGui::DragBehavior(ImGuiID id, ImGuiDataType data_type, void* p_v, float v_speed, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags)
-{
-    IM_ASSERT((flags == 1 || (flags & ImGuiSliderFlags_InvalidMask_) == 0) && "Invalid ImGuiSliderFlags flags! Has the 'float power' argument been mistakenly cast to flags? Call function with ImGuiSliderFlags_Logarithmic flags instead.");
-
-    ImGuiContext& g = *GImGui;
-    if (g.ActiveId == id)
-    {
-        if (g.ActiveIdSource == ImGuiInputSource_Mouse && !g.IO.MouseDown[0])
-            ClearActiveID();
-        else if (g.ActiveIdSource == ImGuiInputSource_Nav && g.NavActivatePressedId == id && !g.ActiveIdIsJustActivated)
-            ClearActiveID();
-    }
-    if (g.ActiveId != id)
-        return false;
-    if ((g.CurrentWindow->DC.ItemFlags & ImGuiItemFlags_ReadOnly) || (flags & ImGuiSliderFlags_ReadOnly))
-        return false;
-
-    switch (data_type)
-    {
-    case ImGuiDataType_S8:     { ImS32 v32 = (ImS32)*(ImS8*)p_v;  bool r = DragBehaviorT<ImS32, ImS32, float>(ImGuiDataType_S32, &v32, v_speed, p_min ? *(const ImS8*) p_min : IM_S8_MIN,  p_max ? *(const ImS8*)p_max  : IM_S8_MAX,  format, flags); if (r) *(ImS8*)p_v = (ImS8)v32; return r; }
-    case ImGuiDataType_U8:     { ImU32 v32 = (ImU32)*(ImU8*)p_v;  bool r = DragBehaviorT<ImU32, ImS32, float>(ImGuiDataType_U32, &v32, v_speed, p_min ? *(const ImU8*) p_min : IM_U8_MIN,  p_max ? *(const ImU8*)p_max  : IM_U8_MAX,  format, flags); if (r) *(ImU8*)p_v = (ImU8)v32; return r; }
-    case ImGuiDataType_S16:    { ImS32 v32 = (ImS32)*(ImS16*)p_v; bool r = DragBehaviorT<ImS32, ImS32, float>(ImGuiDataType_S32, &v32, v_speed, p_min ? *(const ImS16*)p_min : IM_S16_MIN, p_max ? *(const ImS16*)p_max : IM_S16_MAX, format, flags); if (r) *(ImS16*)p_v = (ImS16)v32; return r; }
-    case ImGuiDataType_U16:    { ImU32 v32 = (ImU32)*(ImU16*)p_v; bool r = DragBehaviorT<ImU32, ImS32, float>(ImGuiDataType_U32, &v32, v_speed, p_min ? *(const ImU16*)p_min : IM_U16_MIN, p_max ? *(const ImU16*)p_max : IM_U16_MAX, format, flags); if (r) *(ImU16*)p_v = (ImU16)v32; return r; }
-    case ImGuiDataType_S32:    return DragBehaviorT<ImS32, ImS32, float >(data_type, (ImS32*)p_v,  v_speed, p_min ? *(const ImS32* )p_min : IM_S32_MIN, p_max ? *(const ImS32* )p_max : IM_S32_MAX, format, flags);
-    case ImGuiDataType_U32:    return DragBehaviorT<ImU32, ImS32, float >(data_type, (ImU32*)p_v,  v_speed, p_min ? *(const ImU32* )p_min : IM_U32_MIN, p_max ? *(const ImU32* )p_max : IM_U32_MAX, format, flags);
-    case ImGuiDataType_S64:    return DragBehaviorT<ImS64, ImS64, double>(data_type, (ImS64*)p_v,  v_speed, p_min ? *(const ImS64* )p_min : IM_S64_MIN, p_max ? *(const ImS64* )p_max : IM_S64_MAX, format, flags);
-    case ImGuiDataType_U64:    return DragBehaviorT<ImU64, ImS64, double>(data_type, (ImU64*)p_v,  v_speed, p_min ? *(const ImU64* )p_min : IM_U64_MIN, p_max ? *(const ImU64* )p_max : IM_U64_MAX, format, flags);
-    case ImGuiDataType_Float:  return DragBehaviorT<float, float, float >(data_type, (float*)p_v,  v_speed, p_min ? *(const float* )p_min : -FLT_MAX,   p_max ? *(const float* )p_max : FLT_MAX,    format, flags);
-    case ImGuiDataType_Double: return DragBehaviorT<double,double,double>(data_type, (double*)p_v, v_speed, p_min ? *(const double*)p_min : -DBL_MAX,   p_max ? *(const double*)p_max : DBL_MAX,    format, flags);
-    case ImGuiDataType_COUNT:  break;
-    }
-    IM_ASSERT(0);
-    return false;
-}
-
-bool ImGui::DragScalar(const char* label, ImGuiDataType data_type, void* p_data, float v_speed, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const ImGuiID id = window->GetID(label);
-    const float w = CalcItemWidth();
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-    const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y * 2.0f));
-    const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f));
-
-    ItemSize(total_bb, style.FramePadding.y);
-    if (!ItemAdd(total_bb, id, &frame_bb))
-        return false;
-
-    if (format == NULL)
-        format = DataTypeGetInfo(data_type)->PrintFmt;
-    else if (data_type == ImGuiDataType_S32 && strcmp(format, "%d") != 0)              
-        format = PatchFormatStringFloatToInt(format);
-
-    const bool hovered = ItemHoverable(frame_bb, id);
-    const bool temp_input_allowed = (flags & ImGuiSliderFlags_NoInput) == 0;
-    bool temp_input_is_active = temp_input_allowed && TempInputIsActive(id);
-    if (!temp_input_is_active)
-    {
-        const bool focus_requested = temp_input_allowed && FocusableItemRegister(window, id);
-        const bool clicked = (hovered && g.IO.MouseClicked[0]);
-        const bool double_clicked = (hovered && g.IO.MouseDoubleClicked[0]);
-        if (focus_requested || clicked || double_clicked || g.NavActivateId == id || g.NavInputId == id)
-        {
-            SetActiveID(id, window);
-            SetFocusID(id, window);
-            FocusWindow(window);
-            g.ActiveIdUsingNavDirMask = (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right);
-            if (temp_input_allowed && (focus_requested || (clicked && g.IO.KeyCtrl) || double_clicked || g.NavInputId == id))
-            {
-                temp_input_is_active = true;
-                FocusableItemUnregister(window);
-            }
-        }
-        if (g.IO.ConfigDragClickToInputText && temp_input_allowed && !temp_input_is_active)
-            if (g.ActiveId == id && hovered && g.IO.MouseReleased[0] && !IsMouseDragPastThreshold(0, g.IO.MouseDragThreshold * DRAG_MOUSE_THRESHOLD_FACTOR))
-            {
-                g.NavInputId = id;
-                temp_input_is_active = true;
-                FocusableItemUnregister(window);
-            }
-    }
-
-    if (temp_input_is_active)
-    {
-        const bool is_clamp_input = (flags & ImGuiSliderFlags_AlwaysClamp) != 0 && (p_min == NULL || p_max == NULL || DataTypeCompare(data_type, p_min, p_max) < 0);
-        return TempInputScalar(frame_bb, id, label, data_type, p_data, format, is_clamp_input ? p_min : NULL, is_clamp_input ? p_max : NULL);
-    }
-
-    const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : g.HoveredId == id ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg);
-    RenderNavHighlight(frame_bb, id);
-    RenderFrame(frame_bb.Min, frame_bb.Max, frame_col, true, style.FrameRounding);
-
-    const bool value_changed = DragBehavior(id, data_type, p_data, v_speed, p_min, p_max, format, flags);
-    if (value_changed)
-        MarkItemEdited(id);
-
-    char value_buf[64];
-    const char* value_buf_end = value_buf + DataTypeFormatString(value_buf, IM_ARRAYSIZE(value_buf), data_type, p_data, format);
-    if (g.LogEnabled)
-        LogSetNextTextDecoration("{", "}");
-    RenderTextClipped(frame_bb.Min, frame_bb.Max, value_buf, value_buf_end, NULL, ImVec2(0.5f, 0.5f));
-
-    if (label_size.x > 0.0f)
-        RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label);
-
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Min.y), ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Min.y), colWhite, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Min.y), ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Max.y), colWhite, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Min.y), ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Max.y), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Max.y), ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Max.y), colBlack, 1.0f);
-
-
-    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags);
-    return value_changed;
-}
-
-bool ImGui::DragScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, float v_speed, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    bool value_changed = false;
-    BeginGroup();
-    PushID(label);
-    PushMultiItemsWidths(components, CalcItemWidth());
-    size_t type_size = GDataTypeInfo[data_type].Size;
-    for (int i = 0; i < components; i++)
-    {
-        PushID(i);
-        if (i > 0)
-            SameLine(0, g.Style.ItemInnerSpacing.x);
-        value_changed |= DragScalar("", data_type, p_data, v_speed, p_min, p_max, format, flags);
-        PopID();
-        PopItemWidth();
-        p_data = (void*)((char*)p_data + type_size);
-    }
-    PopID();
-
-    const char* label_end = FindRenderedTextEnd(label);
-    if (label != label_end)
-    {
-        SameLine(0, g.Style.ItemInnerSpacing.x);
-        TextEx(label, label_end);
-    }
-
-    EndGroup();
-    return value_changed;
-}
-
-bool ImGui::DragFloat(const char* label, float* v, float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return DragScalar(label, ImGuiDataType_Float, v, v_speed, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::DragFloat2(const char* label, float v[2], float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return DragScalarN(label, ImGuiDataType_Float, v, 2, v_speed, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::DragFloat3(const char* label, float v[3], float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return DragScalarN(label, ImGuiDataType_Float, v, 3, v_speed, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::DragFloat4(const char* label, float v[4], float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return DragScalarN(label, ImGuiDataType_Float, v, 4, v_speed, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::DragFloatRange2(const char* label, float* v_current_min, float* v_current_max, float v_speed, float v_min, float v_max, const char* format, const char* format_max, ImGuiSliderFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    PushID(label);
-    BeginGroup();
-    PushMultiItemsWidths(2, CalcItemWidth());
-
-    float min_min = (v_min >= v_max) ? -FLT_MAX : v_min;
-    float min_max = (v_min >= v_max) ? *v_current_max : ImMin(v_max, *v_current_max);
-    ImGuiSliderFlags min_flags = flags | ((min_min == min_max) ? ImGuiSliderFlags_ReadOnly : 0);
-    bool value_changed = DragScalar("##min", ImGuiDataType_Float, v_current_min, v_speed, &min_min, &min_max, format, min_flags);
-    PopItemWidth();
-    SameLine(0, g.Style.ItemInnerSpacing.x);
-
-    float max_min = (v_min >= v_max) ? *v_current_min : ImMax(v_min, *v_current_min);
-    float max_max = (v_min >= v_max) ? FLT_MAX : v_max;
-    ImGuiSliderFlags max_flags = flags | ((max_min == max_max) ? ImGuiSliderFlags_ReadOnly : 0);
-    value_changed |= DragScalar("##max", ImGuiDataType_Float, v_current_max, v_speed, &max_min, &max_max, format_max ? format_max : format, max_flags);
-    PopItemWidth();
-    SameLine(0, g.Style.ItemInnerSpacing.x);
-
-    TextEx(label, FindRenderedTextEnd(label));
-    EndGroup();
-    PopID();
-    return value_changed;
-}
-
-bool ImGui::DragInt(const char* label, int* v, float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return DragScalar(label, ImGuiDataType_S32, v, v_speed, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::DragInt2(const char* label, int v[2], float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return DragScalarN(label, ImGuiDataType_S32, v, 2, v_speed, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::DragInt3(const char* label, int v[3], float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return DragScalarN(label, ImGuiDataType_S32, v, 3, v_speed, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::DragInt4(const char* label, int v[4], float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return DragScalarN(label, ImGuiDataType_S32, v, 4, v_speed, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::DragIntRange2(const char* label, int* v_current_min, int* v_current_max, float v_speed, int v_min, int v_max, const char* format, const char* format_max, ImGuiSliderFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    PushID(label);
-    BeginGroup();
-    PushMultiItemsWidths(2, CalcItemWidth());
-
-    int min_min = (v_min >= v_max) ? INT_MIN : v_min;
-    int min_max = (v_min >= v_max) ? *v_current_max : ImMin(v_max, *v_current_max);
-    ImGuiSliderFlags min_flags = flags | ((min_min == min_max) ? ImGuiSliderFlags_ReadOnly : 0);
-    bool value_changed = DragInt("##min", v_current_min, v_speed, min_min, min_max, format, min_flags);
-    PopItemWidth();
-    SameLine(0, g.Style.ItemInnerSpacing.x);
-
-    int max_min = (v_min >= v_max) ? *v_current_min : ImMax(v_min, *v_current_min);
-    int max_max = (v_min >= v_max) ? INT_MAX : v_max;
-    ImGuiSliderFlags max_flags = flags | ((max_min == max_max) ? ImGuiSliderFlags_ReadOnly : 0);
-    value_changed |= DragInt("##max", v_current_max, v_speed, max_min, max_max, format_max ? format_max : format, max_flags);
-    PopItemWidth();
-    SameLine(0, g.Style.ItemInnerSpacing.x);
-
-    TextEx(label, FindRenderedTextEnd(label));
-    EndGroup();
-    PopID();
-
-    return value_changed;
-}
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-
-bool ImGui::DragScalar(const char* label, ImGuiDataType data_type, void* p_data, float v_speed, const void* p_min, const void* p_max, const char* format, float power)
-{
-    ImGuiSliderFlags drag_flags = ImGuiSliderFlags_None;
-    if (power != 1.0f)
-    {
-        IM_ASSERT(power == 1.0f && "Call function with ImGuiSliderFlags_Logarithmic flags instead of using the old 'float power' function!");
-        IM_ASSERT(p_min != NULL && p_max != NULL);              
-        drag_flags |= ImGuiSliderFlags_Logarithmic;       
-    }
-    return DragScalar(label, data_type, p_data, v_speed, p_min, p_max, format, drag_flags);
-}
-
-bool ImGui::DragScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, float v_speed, const void* p_min, const void* p_max, const char* format, float power)
-{
-    ImGuiSliderFlags drag_flags = ImGuiSliderFlags_None;
-    if (power != 1.0f)
-    {
-        IM_ASSERT(power == 1.0f && "Call function with ImGuiSliderFlags_Logarithmic flags instead of using the old 'float power' function!");
-        IM_ASSERT(p_min != NULL && p_max != NULL);              
-        drag_flags |= ImGuiSliderFlags_Logarithmic;       
-    }
-    return DragScalarN(label, data_type, p_data, components, v_speed, p_min, p_max, format, drag_flags);
-}
-
-#endif  
-
-template<typename TYPE, typename SIGNEDTYPE, typename FLOATTYPE>
-float ImGui::ScaleRatioFromValueT(ImGuiDataType data_type, TYPE v, TYPE v_min, TYPE v_max, bool is_logarithmic, float logarithmic_zero_epsilon, float zero_deadzone_halfsize)
-{
-    if (v_min == v_max)
-        return 0.0f;
-    IM_UNUSED(data_type);
-
-    const TYPE v_clamped = (v_min < v_max) ? ImClamp(v, v_min, v_max) : ImClamp(v, v_max, v_min);
-    if (is_logarithmic)
-    {
-        bool flipped = v_max < v_min;
-
-        if (flipped)         
-            ImSwap(v_min, v_max);
-
-        FLOATTYPE v_min_fudged = (ImAbs((FLOATTYPE)v_min) < logarithmic_zero_epsilon) ? ((v_min < 0.0f) ? -logarithmic_zero_epsilon : logarithmic_zero_epsilon) : (FLOATTYPE)v_min;
-        FLOATTYPE v_max_fudged = (ImAbs((FLOATTYPE)v_max) < logarithmic_zero_epsilon) ? ((v_max < 0.0f) ? -logarithmic_zero_epsilon : logarithmic_zero_epsilon) : (FLOATTYPE)v_max;
-
-        if ((v_min == 0.0f) && (v_max < 0.0f))
-            v_min_fudged = -logarithmic_zero_epsilon;
-        else if ((v_max == 0.0f) && (v_min < 0.0f))
-            v_max_fudged = -logarithmic_zero_epsilon;
-
-        float result;
-
-        if (v_clamped <= v_min_fudged)
-            result = 0.0f;           
-        else if (v_clamped >= v_max_fudged)
-            result = 1.0f;           
-        else if ((v_min * v_max) < 0.0f)         
-        {
-            float zero_point_center = (-(float)v_min) / ((float)v_max - (float)v_min);                                       
-            float zero_point_snap_L = zero_point_center - zero_deadzone_halfsize;
-            float zero_point_snap_R = zero_point_center + zero_deadzone_halfsize;
-            if (v == 0.0f)
-                result = zero_point_center;      
-            else if (v < 0.0f)
-                result = (1.0f - (float)(ImLog(-(FLOATTYPE)v_clamped / logarithmic_zero_epsilon) / ImLog(-v_min_fudged / logarithmic_zero_epsilon))) * zero_point_snap_L;
-            else
-                result = zero_point_snap_R + ((float)(ImLog((FLOATTYPE)v_clamped / logarithmic_zero_epsilon) / ImLog(v_max_fudged / logarithmic_zero_epsilon)) * (1.0f - zero_point_snap_R));
-        }
-        else if ((v_min < 0.0f) || (v_max < 0.0f))    
-            result = 1.0f - (float)(ImLog(-(FLOATTYPE)v_clamped / -v_max_fudged) / ImLog(-v_min_fudged / -v_max_fudged));
-        else
-            result = (float)(ImLog((FLOATTYPE)v_clamped / v_min_fudged) / ImLog(v_max_fudged / v_min_fudged));
-
-        return flipped ? (1.0f - result) : result;
-    }
-
-    return (float)((FLOATTYPE)(SIGNEDTYPE)(v_clamped - v_min) / (FLOATTYPE)(SIGNEDTYPE)(v_max - v_min));
-}
-
-template<typename TYPE, typename SIGNEDTYPE, typename FLOATTYPE>
-TYPE ImGui::ScaleValueFromRatioT(ImGuiDataType data_type, float t, TYPE v_min, TYPE v_max, bool is_logarithmic, float logarithmic_zero_epsilon, float zero_deadzone_halfsize)
-{
-    if (v_min == v_max)
-        return v_min;
-    const bool is_decimal = (data_type == ImGuiDataType_Float) || (data_type == ImGuiDataType_Double);
-
-    TYPE result;
-    if (is_logarithmic)
-    {
-        if (t <= 0.0f)
-            result = v_min;
-        else if (t >= 1.0f)
-            result = v_max;
-        else
-        {
-            bool flipped = v_max < v_min;      
-
-            FLOATTYPE v_min_fudged = (ImAbs((FLOATTYPE)v_min) < logarithmic_zero_epsilon) ? ((v_min < 0.0f) ? -logarithmic_zero_epsilon : logarithmic_zero_epsilon) : (FLOATTYPE)v_min;
-            FLOATTYPE v_max_fudged = (ImAbs((FLOATTYPE)v_max) < logarithmic_zero_epsilon) ? ((v_max < 0.0f) ? -logarithmic_zero_epsilon : logarithmic_zero_epsilon) : (FLOATTYPE)v_max;
-
-            if (flipped)
-                ImSwap(v_min_fudged, v_max_fudged);
-
-            if ((v_max == 0.0f) && (v_min < 0.0f))
-                v_max_fudged = -logarithmic_zero_epsilon;
-
-            float t_with_flip = flipped ? (1.0f - t) : t;             
-
-            if ((v_min * v_max) < 0.0f)             
-            {
-                float zero_point_center = (-(float)ImMin(v_min, v_max)) / ImAbs((float)v_max - (float)v_min);       
-                float zero_point_snap_L = zero_point_center - zero_deadzone_halfsize;
-                float zero_point_snap_R = zero_point_center + zero_deadzone_halfsize;
-                if (t_with_flip >= zero_point_snap_L && t_with_flip <= zero_point_snap_R)
-                    result = (TYPE)0.0f;              
-                else if (t_with_flip < zero_point_center)
-                    result = (TYPE)-(logarithmic_zero_epsilon * ImPow(-v_min_fudged / logarithmic_zero_epsilon, (FLOATTYPE)(1.0f - (t_with_flip / zero_point_snap_L))));
-                else
-                    result = (TYPE)(logarithmic_zero_epsilon * ImPow(v_max_fudged / logarithmic_zero_epsilon, (FLOATTYPE)((t_with_flip - zero_point_snap_R) / (1.0f - zero_point_snap_R))));
-            }
-            else if ((v_min < 0.0f) || (v_max < 0.0f))    
-                result = (TYPE)-(-v_max_fudged * ImPow(-v_min_fudged / -v_max_fudged, (FLOATTYPE)(1.0f - t_with_flip)));
-            else
-                result = (TYPE)(v_min_fudged * ImPow(v_max_fudged / v_min_fudged, (FLOATTYPE)t_with_flip));
-        }
-    }
-    else
-    {
-        if (is_decimal)
-        {
-            result = ImLerp(v_min, v_max, t);
-        }
-        else
-        {
-            if (t < 1.0)
-            {
-                FLOATTYPE v_new_off_f = (SIGNEDTYPE)(v_max - v_min) * t;
-                result = (TYPE)((SIGNEDTYPE)v_min + (SIGNEDTYPE)(v_new_off_f + (FLOATTYPE)(v_min > v_max ? -0.5 : 0.5)));
-            }
-            else
-            {
-                result = v_max;
-            }
-        }
-    }
-
-    return result;
-}
-
-template<typename TYPE, typename SIGNEDTYPE, typename FLOATTYPE>
-bool ImGui::SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, TYPE* v, const TYPE v_min, const TYPE v_max, const char* format, ImGuiSliderFlags flags, ImRect* out_grab_bb)
-{
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-
-    const ImGuiAxis axis = (flags & ImGuiSliderFlags_Vertical) ? ImGuiAxis_Y : ImGuiAxis_X;
-    const bool is_decimal = (data_type == ImGuiDataType_Float) || (data_type == ImGuiDataType_Double);
-    const bool is_logarithmic = (flags & ImGuiSliderFlags_Logarithmic) && is_decimal;
-
-    const float grab_padding = 2.0f;
-    const float slider_sz = (bb.Max[axis] - bb.Min[axis]) - grab_padding * 2.0f;
-    float grab_sz = style.GrabMinSize;
-    SIGNEDTYPE v_range = (v_min < v_max ? v_max - v_min : v_min - v_max);
-    if (!is_decimal && v_range >= 0)                                                     
-        grab_sz = ImMax((float)(slider_sz / (v_range + 1)), style.GrabMinSize);              
-    grab_sz = ImMin(grab_sz, slider_sz);
-    const float slider_usable_sz = slider_sz - grab_sz;
-    const float slider_usable_pos_min = bb.Min[axis] + grab_padding + grab_sz * 0.5f;
-    const float slider_usable_pos_max = bb.Max[axis] - grab_padding - grab_sz * 0.5f;
-
-    float logarithmic_zero_epsilon = 0.0f;       
-    float zero_deadzone_halfsize = 0.0f;       
-    if (is_logarithmic)
-    {
-        const int decimal_precision = is_decimal ? ImParseFormatPrecision(format, 3) : 1;
-        logarithmic_zero_epsilon = ImPow(0.1f, (float)decimal_precision);
-        zero_deadzone_halfsize = (style.LogSliderDeadzone * 0.5f) / ImMax(slider_usable_sz, 1.0f);
-    }
-
-    bool value_changed = false;
-    if (g.ActiveId == id)
-    {
-        bool set_new_value = false;
-        float clicked_t = 0.0f;
-        if (g.ActiveIdSource == ImGuiInputSource_Mouse)
-        {
-            if (!g.IO.MouseDown[0])
-            {
-                ClearActiveID();
-            }
-            else
-            {
-                const float mouse_abs_pos = g.IO.MousePos[axis];
-                clicked_t = (slider_usable_sz > 0.0f) ? ImClamp((mouse_abs_pos - slider_usable_pos_min) / slider_usable_sz, 0.0f, 1.0f) : 0.0f;
-                if (axis == ImGuiAxis_Y)
-                    clicked_t = 1.0f - clicked_t;
-                set_new_value = true;
-            }
-        }
-        else if (g.ActiveIdSource == ImGuiInputSource_Nav)
-        {
-            if (g.ActiveIdIsJustActivated)
-            {
-                g.SliderCurrentAccum = 0.0f;        
-                g.SliderCurrentAccumDirty = false;
-            }
-
-            const ImVec2 input_delta2 = GetNavInputAmount2d(ImGuiNavDirSourceFlags_Keyboard | ImGuiNavDirSourceFlags_PadDPad, ImGuiInputReadMode_RepeatFast, 0.0f, 0.0f);
-            float input_delta = (axis == ImGuiAxis_X) ? input_delta2.x : -input_delta2.y;
-            if (input_delta != 0.0f)
-            {
-                const int decimal_precision = is_decimal ? ImParseFormatPrecision(format, 3) : 0;
-                if (decimal_precision > 0)
-                {
-                    input_delta /= 100.0f;            
-                    if (IsNavInputDown(ImGuiNavInput_TweakSlow))
-                        input_delta /= 10.0f;
-                }
-                else
-                {
-                    if ((v_range >= -100.0f && v_range <= 100.0f) || IsNavInputDown(ImGuiNavInput_TweakSlow))
-                        input_delta = ((input_delta < 0.0f) ? -1.0f : +1.0f) / (float)v_range;       
-                    else
-                        input_delta /= 100.0f;
-                }
-                if (IsNavInputDown(ImGuiNavInput_TweakFast))
-                    input_delta *= 10.0f;
-
-                g.SliderCurrentAccum += input_delta;
-                g.SliderCurrentAccumDirty = true;
-            }
-
-            float delta = g.SliderCurrentAccum;
-            if (g.NavActivatePressedId == id && !g.ActiveIdIsJustActivated)
-            {
-                ClearActiveID();
-            }
-            else if (g.SliderCurrentAccumDirty)
-            {
-                clicked_t = ScaleRatioFromValueT<TYPE, SIGNEDTYPE, FLOATTYPE>(data_type, *v, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize);
-
-                if ((clicked_t >= 1.0f && delta > 0.0f) || (clicked_t <= 0.0f && delta < 0.0f))             
-                {
-                    set_new_value = false;
-                    g.SliderCurrentAccum = 0.0f;           
-                }
-                else
-                {
-                    set_new_value = true;
-                    float old_clicked_t = clicked_t;
-                    clicked_t = ImSaturate(clicked_t + delta);
-
-                    TYPE v_new = ScaleValueFromRatioT<TYPE, SIGNEDTYPE, FLOATTYPE>(data_type, clicked_t, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize);
-                    if (!(flags & ImGuiSliderFlags_NoRoundToFormat))
-                        v_new = RoundScalarWithFormatT<TYPE, SIGNEDTYPE>(format, data_type, v_new);
-                    float new_clicked_t = ScaleRatioFromValueT<TYPE, SIGNEDTYPE, FLOATTYPE>(data_type, v_new, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize);
-
-                    if (delta > 0)
-                        g.SliderCurrentAccum -= ImMin(new_clicked_t - old_clicked_t, delta);
-                    else
-                        g.SliderCurrentAccum -= ImMax(new_clicked_t - old_clicked_t, delta);
-                }
-
-                g.SliderCurrentAccumDirty = false;
-            }
-        }
-
-        if (set_new_value)
-        {
-            TYPE v_new = ScaleValueFromRatioT<TYPE, SIGNEDTYPE, FLOATTYPE>(data_type, clicked_t, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize);
-
-            if (!(flags & ImGuiSliderFlags_NoRoundToFormat))
-                v_new = RoundScalarWithFormatT<TYPE, SIGNEDTYPE>(format, data_type, v_new);
-
-            if (*v != v_new)
-            {
-                *v = v_new;
-                value_changed = true;
-            }
-        }
-    }
-
-    if (slider_sz < 1.0f)
-    {
-        *out_grab_bb = ImRect(bb.Min, bb.Min);
-    }
-    else
-    {
-        float grab_t = ScaleRatioFromValueT<TYPE, SIGNEDTYPE, FLOATTYPE>(data_type, *v, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize);
-        if (axis == ImGuiAxis_Y)
-            grab_t = 1.0f - grab_t;
-        const float grab_pos = ImLerp(slider_usable_pos_min, slider_usable_pos_max, grab_t);
-        if (axis == ImGuiAxis_X)
-            *out_grab_bb = ImRect(grab_pos - grab_sz * 0.5f, bb.Min.y + grab_padding, grab_pos + grab_sz * 0.5f, bb.Max.y - grab_padding);
-        else
-            *out_grab_bb = ImRect(bb.Min.x + grab_padding, grab_pos - grab_sz * 0.5f, bb.Max.x - grab_padding, grab_pos + grab_sz * 0.5f);
-    }
-
-    return value_changed;
-}
-
-bool ImGui::SliderBehavior(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, void* p_v, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags, ImRect* out_grab_bb)
-{
-    IM_ASSERT((flags == 1 || (flags & ImGuiSliderFlags_InvalidMask_) == 0) && "Invalid ImGuiSliderFlags flag!  Has the 'float power' argument been mistakenly cast to flags? Call function with ImGuiSliderFlags_Logarithmic flags instead.");
-
-    ImGuiContext& g = *GImGui;
-    if ((g.CurrentWindow->DC.ItemFlags & ImGuiItemFlags_ReadOnly) || (flags & ImGuiSliderFlags_ReadOnly))
-        return false;
-
-    switch (data_type)
-    {
-    case ImGuiDataType_S8:  { ImS32 v32 = (ImS32)*(ImS8*)p_v;  bool r = SliderBehaviorT<ImS32, ImS32, float>(bb, id, ImGuiDataType_S32, &v32, *(const ImS8*)p_min,  *(const ImS8*)p_max,  format, flags, out_grab_bb); if (r) *(ImS8*)p_v  = (ImS8)v32;  return r; }
-    case ImGuiDataType_U8:  { ImU32 v32 = (ImU32)*(ImU8*)p_v;  bool r = SliderBehaviorT<ImU32, ImS32, float>(bb, id, ImGuiDataType_U32, &v32, *(const ImU8*)p_min,  *(const ImU8*)p_max,  format, flags, out_grab_bb); if (r) *(ImU8*)p_v  = (ImU8)v32;  return r; }
-    case ImGuiDataType_S16: { ImS32 v32 = (ImS32)*(ImS16*)p_v; bool r = SliderBehaviorT<ImS32, ImS32, float>(bb, id, ImGuiDataType_S32, &v32, *(const ImS16*)p_min, *(const ImS16*)p_max, format, flags, out_grab_bb); if (r) *(ImS16*)p_v = (ImS16)v32; return r; }
-    case ImGuiDataType_U16: { ImU32 v32 = (ImU32)*(ImU16*)p_v; bool r = SliderBehaviorT<ImU32, ImS32, float>(bb, id, ImGuiDataType_U32, &v32, *(const ImU16*)p_min, *(const ImU16*)p_max, format, flags, out_grab_bb); if (r) *(ImU16*)p_v = (ImU16)v32; return r; }
-    case ImGuiDataType_S32:
-        IM_ASSERT(*(const ImS32*)p_min >= IM_S32_MIN / 2 && *(const ImS32*)p_max <= IM_S32_MAX / 2);
-        return SliderBehaviorT<ImS32, ImS32, float >(bb, id, data_type, (ImS32*)p_v,  *(const ImS32*)p_min,  *(const ImS32*)p_max,  format, flags, out_grab_bb);
-    case ImGuiDataType_U32:
-        IM_ASSERT(*(const ImU32*)p_max <= IM_U32_MAX / 2);
-        return SliderBehaviorT<ImU32, ImS32, float >(bb, id, data_type, (ImU32*)p_v,  *(const ImU32*)p_min,  *(const ImU32*)p_max,  format, flags, out_grab_bb);
-    case ImGuiDataType_S64:
-        IM_ASSERT(*(const ImS64*)p_min >= IM_S64_MIN / 2 && *(const ImS64*)p_max <= IM_S64_MAX / 2);
-        return SliderBehaviorT<ImS64, ImS64, double>(bb, id, data_type, (ImS64*)p_v,  *(const ImS64*)p_min,  *(const ImS64*)p_max,  format, flags, out_grab_bb);
-    case ImGuiDataType_U64:
-        IM_ASSERT(*(const ImU64*)p_max <= IM_U64_MAX / 2);
-        return SliderBehaviorT<ImU64, ImS64, double>(bb, id, data_type, (ImU64*)p_v,  *(const ImU64*)p_min,  *(const ImU64*)p_max,  format, flags, out_grab_bb);
-    case ImGuiDataType_Float:
-        IM_ASSERT(*(const float*)p_min >= -FLT_MAX / 2.0f && *(const float*)p_max <= FLT_MAX / 2.0f);
-        return SliderBehaviorT<float, float, float >(bb, id, data_type, (float*)p_v,  *(const float*)p_min,  *(const float*)p_max,  format, flags, out_grab_bb);
-    case ImGuiDataType_Double:
-        IM_ASSERT(*(const double*)p_min >= -DBL_MAX / 2.0f && *(const double*)p_max <= DBL_MAX / 2.0f);
-        return SliderBehaviorT<double, double, double>(bb, id, data_type, (double*)p_v, *(const double*)p_min, *(const double*)p_max, format, flags, out_grab_bb);
-    case ImGuiDataType_COUNT: break;
-    }
-    IM_ASSERT(0);
-    return false;
-}
-
-bool ImGui::SliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags)
-{
-    InvisibleButton("##0", ImVec2(0, 0));
-
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const ImGuiID id = window->GetID(label);
-    const float w = CalcItemWidth();
-
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-     ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y * 2.0f));
-     frame_bb.Max -= ImVec2(style.ItemInnerSpacing.x + 30.0f, 7.0f);
-    ImRect total_bb(frame_bb.Min + ImVec2(0,20.0f), frame_bb.Max + ImVec2(0, 30.0f));
-    frame_bb.Min -= ImVec2(0, 7.0f);
-    
-    total_bb.Min += ImVec2(0, 10.0f);
-
-    ItemSize(total_bb, style.FramePadding.y);
-    if (!ItemAdd(total_bb, id, &frame_bb))
-        return false;
-
-    if (format == NULL)
-        format = DataTypeGetInfo(data_type)->PrintFmt;
-    else if (data_type == ImGuiDataType_S32 && strcmp(format, "%d") != 0)              
-        format = PatchFormatStringFloatToInt(format);
-
-    const bool hovered = ItemHoverable(frame_bb, id);
-    const bool temp_input_allowed = (flags & ImGuiSliderFlags_NoInput) == 0;
-    bool temp_input_is_active = temp_input_allowed && TempInputIsActive(id);
-    if (!temp_input_is_active)
-    {
-        const bool focus_requested = temp_input_allowed && FocusableItemRegister(window, id);
-        const bool clicked = (hovered && g.IO.MouseClicked[0]);
-        if (focus_requested || clicked || g.NavActivateId == id || g.NavInputId == id)
-        {
-            SetActiveID(id, window);
-            SetFocusID(id, window);
-            FocusWindow(window);
-            g.ActiveIdUsingNavDirMask |= (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right);
-            if (temp_input_allowed && (focus_requested || (clicked && g.IO.KeyCtrl) || g.NavInputId == id))
-            {
-                temp_input_is_active = true;
-                FocusableItemUnregister(window);
-            }
-        }
-    }
-
-    if (temp_input_is_active)
-    {
-        const bool is_clamp_input = (flags & ImGuiSliderFlags_AlwaysClamp) != 0;
-        return TempInputScalar(frame_bb, id, label, data_type, p_data, format, is_clamp_input ? p_min : NULL, is_clamp_input ? p_max : NULL);
-    }
-
-    const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : g.HoveredId == id ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg);
-    RenderNavHighlight(frame_bb, id);
-
-    ImVec2 tempmin = frame_bb.Min + ImVec2(0, 9.0f);
-    ImVec2 tempmax = frame_bb.Max - ImVec2(0, 9.0f);
-
-    RenderFrame(tempmin, tempmax, frame_col, true, g.Style.FrameRounding);
-    window->DrawList->AddLine(ImVec2(tempmin.x - 1.0f, tempmin.y - 1.0f), ImVec2(tempmax.x - 1.0f, tempmin.y - 1.0f), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(tempmin.x - 1.0f, tempmin.y - 1.0f), ImVec2(tempmin.x - 1.0f, tempmax.y ), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(tempmax.x - 1.0f, tempmin.y - 1.0f), ImVec2(tempmax.x - 1.0f, tempmax.y), colWhite, 1.0f);
-    window->DrawList->AddLine(ImVec2(tempmin.x - 1.0f, tempmax.y), ImVec2(tempmax.x - 1.0f, tempmax.y), colWhite, 1.0f);
-    
-   
-
-    ImRect grab_bb;
-    const bool value_changed = SliderBehavior(frame_bb, id, data_type, p_data, p_min, p_max, format, flags, &grab_bb);
-    if (value_changed)
-        MarkItemEdited(id);
-
-
-    tempmin.x += 1.0f; tempmax.x -= 2.0f;
-    tempmin.x += (grab_bb.Max.x - grab_bb.Min.x)/2;
-    tempmax.x -= (grab_bb.Max.x - grab_bb.Min.x)/2;
-
-    for (int i = 0; i < 11; i++)
-        window->DrawList->AddLine(ImVec2(tempmin.x + (i * (tempmax.x - tempmin.x) / 10) - 1.0f, tempmax.y + 4.0f), ImVec2(tempmin.x + (i * (tempmax.x - tempmin.x) / 10) - 1.0f, tempmax.y + 9.0f), 0xFFD9D9D9, 1.0f); 
-
-
-    if (grab_bb.Max.x > grab_bb.Min.x) {
-        grab_bb.Min.x += 1.0f; grab_bb.Max.x -= 2.0f;
-        grab_bb.Min.y += 1.0f; grab_bb.Max.y -= 1.0f;
-
-        window->DrawList->AddRectFilled(grab_bb.Min, grab_bb.Max, GetColorU32(g.ActiveId == id ? ImGuiCol_SliderGrabActive : ImGuiCol_SliderGrab), style.GrabRounding);
-        window->DrawList->AddLine(ImVec2(grab_bb.Min.x - 1.0f, grab_bb.Min.y - 1.0f), ImVec2(grab_bb.Max.x - 1.0f, grab_bb.Min.y - 1.0f), colBlack, 1.0f);
-        window->DrawList->AddLine(ImVec2(grab_bb.Min.x - 1.0f, grab_bb.Min.y - 1.0f), ImVec2(grab_bb.Min.x - 1.0f, grab_bb.Max.y), colBlack, 1.0f);
-        window->DrawList->AddLine(ImVec2(grab_bb.Max.x - 1.0f, grab_bb.Min.y - 1.0f), ImVec2(grab_bb.Max.x - 1.0f, grab_bb.Max.y), colWhite, 1.0f);
-        window->DrawList->AddLine(ImVec2(grab_bb.Min.x - 1.0f, grab_bb.Max.y), ImVec2(grab_bb.Max.x - 1.0f, grab_bb.Max.y), colWhite, 1.0f);
-    }
-
-    char value_buf[64];
-    const char* value_buf_end = value_buf + DataTypeFormatString(value_buf, IM_ARRAYSIZE(value_buf), data_type, p_data, format);
-    if (g.LogEnabled)
-        LogSetNextTextDecoration("{", "}");
-    
-    RenderTextClipped(frame_bb.Min + ImVec2(frame_bb.Max.x - frame_bb.Min.x, 0), frame_bb.Max + ImVec2(45.0f, 0), value_buf, value_buf_end, NULL, ImVec2(0.5f, 0.5f));
-
-    if (label_size.x > 0.0f)     
-    {
-            RenderText(ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y - 20.0f), label);  
-    }
-
-    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags);
-    return value_changed;
-}
-
-bool ImGui::SliderScalarN(const char* label, ImGuiDataType data_type, void* v, int components, const void* v_min, const void* v_max, const char* format, ImGuiSliderFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    bool value_changed = false;
-    BeginGroup();
-    PushID(label);
-    PushMultiItemsWidths(components, CalcItemWidth());
-    size_t type_size = GDataTypeInfo[data_type].Size;
-    for (int i = 0; i < components; i++)
-    {
-        PushID(i);
-        if (i > 0)
-            SameLine(0, g.Style.ItemInnerSpacing.x);
-        value_changed |= SliderScalar("", data_type, v, v_min, v_max, format, flags);
-        PopID();
-        PopItemWidth();
-        v = (void*)((char*)v + type_size);
-    }
-    PopID();
-
-    const char* label_end = FindRenderedTextEnd(label);
-    if (label != label_end)
-    {
-        SameLine(0, g.Style.ItemInnerSpacing.x);
-        TextEx(label, label_end);
-    }
-
-    EndGroup();
-    return value_changed;
-}
-
-bool ImGui::SliderFloat(const char* label, float* v, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return SliderScalar(label, ImGuiDataType_Float, v, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::SliderFloat2(const char* label, float v[2], float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return SliderScalarN(label, ImGuiDataType_Float, v, 2, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::SliderFloat3(const char* label, float v[3], float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return SliderScalarN(label, ImGuiDataType_Float, v, 3, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::SliderFloat4(const char* label, float v[4], float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return SliderScalarN(label, ImGuiDataType_Float, v, 4, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::SliderAngle(const char* label, float* v_rad, float v_degrees_min, float v_degrees_max, const char* format, ImGuiSliderFlags flags)
-{
-    if (format == NULL)
-        format = "%.0f deg";
-    float v_deg = (*v_rad) * 360.0f / (2 * IM_PI);
-    bool value_changed = SliderFloat(label, &v_deg, v_degrees_min, v_degrees_max, format, flags);
-    *v_rad = v_deg * (2 * IM_PI) / 360.0f;
-    return value_changed;
-}
-
-bool ImGui::SliderInt(const char* label, int* v, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return SliderScalar(label, ImGuiDataType_S32, v, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::SliderInt2(const char* label, int v[2], int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return SliderScalarN(label, ImGuiDataType_S32, v, 2, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::SliderInt3(const char* label, int v[3], int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return SliderScalarN(label, ImGuiDataType_S32, v, 3, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::SliderInt4(const char* label, int v[4], int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return SliderScalarN(label, ImGuiDataType_S32, v, 4, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const ImGuiID id = window->GetID(label);
-
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-    const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + size);
-    const ImRect bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f));
-
-    ItemSize(bb, style.FramePadding.y);
-    if (!ItemAdd(frame_bb, id))
-        return false;
-
-    if (format == NULL)
-        format = DataTypeGetInfo(data_type)->PrintFmt;
-    else if (data_type == ImGuiDataType_S32 && strcmp(format, "%d") != 0)              
-        format = PatchFormatStringFloatToInt(format);
-
-    const bool hovered = ItemHoverable(frame_bb, id);
-    if ((hovered && g.IO.MouseClicked[0]) || g.NavActivateId == id || g.NavInputId == id)
-    {
-        SetActiveID(id, window);
-        SetFocusID(id, window);
-        FocusWindow(window);
-        g.ActiveIdUsingNavDirMask |= (1 << ImGuiDir_Up) | (1 << ImGuiDir_Down);
-    }
-
-    const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : g.HoveredId == id ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg);
-    RenderNavHighlight(frame_bb, id);
-    RenderFrame(frame_bb.Min, frame_bb.Max, frame_col, true, g.Style.FrameRounding);
-
-    ImRect grab_bb;
-    const bool value_changed = SliderBehavior(frame_bb, id, data_type, p_data, p_min, p_max, format, flags | ImGuiSliderFlags_Vertical, &grab_bb);
-    if (value_changed)
-        MarkItemEdited(id);
-
-    if (grab_bb.Max.y > grab_bb.Min.y)
-        window->DrawList->AddRectFilled(grab_bb.Min, grab_bb.Max, GetColorU32(g.ActiveId == id ? ImGuiCol_SliderGrabActive : ImGuiCol_SliderGrab), style.GrabRounding);
-
-    char value_buf[64];
-    const char* value_buf_end = value_buf + DataTypeFormatString(value_buf, IM_ARRAYSIZE(value_buf), data_type, p_data, format);
-    RenderTextClipped(ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y), frame_bb.Max, value_buf, value_buf_end, NULL, ImVec2(0.5f, 0.0f));
-    if (label_size.x > 0.0f)
-        RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label);
-
-    return value_changed;
-}
-
-bool ImGui::VSliderFloat(const char* label, const ImVec2& size, float* v, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return VSliderScalar(label, size, ImGuiDataType_Float, v, &v_min, &v_max, format, flags);
-}
-
-bool ImGui::VSliderInt(const char* label, const ImVec2& size, int* v, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
-{
-    return VSliderScalar(label, size, ImGuiDataType_S32, v, &v_min, &v_max, format, flags);
-}
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-
-bool ImGui::SliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format, float power)
-{
-    ImGuiSliderFlags slider_flags = ImGuiSliderFlags_None;
-    if (power != 1.0f)
-    {
-        IM_ASSERT(power == 1.0f && "Call function with ImGuiSliderFlags_Logarithmic flags instead of using the old 'float power' function!");
-        slider_flags |= ImGuiSliderFlags_Logarithmic;       
-    }
-    return SliderScalar(label, data_type, p_data, p_min, p_max, format, slider_flags);
-}
-
-bool ImGui::SliderScalarN(const char* label, ImGuiDataType data_type, void* v, int components, const void* v_min, const void* v_max, const char* format, float power)
-{
-    ImGuiSliderFlags slider_flags = ImGuiSliderFlags_None;
-    if (power != 1.0f)
-    {
-        IM_ASSERT(power == 1.0f && "Call function with ImGuiSliderFlags_Logarithmic flags instead of using the old 'float power' function!");
-        slider_flags |= ImGuiSliderFlags_Logarithmic;       
-    }
-    return SliderScalarN(label, data_type, v, components, v_min, v_max, format, slider_flags);
-}
-
-#endif  
-
-const char* ImParseFormatFindStart(const char* fmt)
-{
-    while (char c = fmt[0])
-    {
-        if (c == '%' && fmt[1] != '%')
-            return fmt;
-        else if (c == '%')
-            fmt++;
-        fmt++;
-    }
-    return fmt;
-}
-
-const char* ImParseFormatFindEnd(const char* fmt)
-{
-    if (fmt[0] != '%')
-        return fmt;
-    const unsigned int ignored_uppercase_mask = (1 << ('I'-'A')) | (1 << ('L'-'A'));
-    const unsigned int ignored_lowercase_mask = (1 << ('h'-'a')) | (1 << ('j'-'a')) | (1 << ('l'-'a')) | (1 << ('t'-'a')) | (1 << ('w'-'a')) | (1 << ('z'-'a'));
-    for (char c; (c = *fmt) != 0; fmt++)
-    {
-        if (c >= 'A' && c <= 'Z' && ((1 << (c - 'A')) & ignored_uppercase_mask) == 0)
-            return fmt + 1;
-        if (c >= 'a' && c <= 'z' && ((1 << (c - 'a')) & ignored_lowercase_mask) == 0)
-            return fmt + 1;
-    }
-    return fmt;
-}
-
-const char* ImParseFormatTrimDecorations(const char* fmt, char* buf, size_t buf_size)
-{
-    const char* fmt_start = ImParseFormatFindStart(fmt);
-    if (fmt_start[0] != '%')
-        return fmt;
-    const char* fmt_end = ImParseFormatFindEnd(fmt_start);
-    if (fmt_end[0] == 0)              
-        return fmt_start;
-    ImStrncpy(buf, fmt_start, ImMin((size_t)(fmt_end - fmt_start) + 1, buf_size));
-    return buf;
-}
-
-int ImParseFormatPrecision(const char* fmt, int default_precision)
-{
-    fmt = ImParseFormatFindStart(fmt);
-    if (fmt[0] != '%')
-        return default_precision;
-    fmt++;
-    while (*fmt >= '0' && *fmt <= '9')
-        fmt++;
-    int precision = INT_MAX;
-    if (*fmt == '.')
-    {
-        fmt = ImAtoi<int>(fmt + 1, &precision);
-        if (precision < 0 || precision > 99)
-            precision = default_precision;
-    }
-    if (*fmt == 'e' || *fmt == 'E')      
-        precision = -1;
-    if ((*fmt == 'g' || *fmt == 'G') && precision == INT_MAX)
-        precision = -1;
-    return (precision == INT_MAX) ? default_precision : precision;
-}
-
-bool ImGui::TempInputText(const ImRect& bb, ImGuiID id, const char* label, char* buf, int buf_size, ImGuiInputTextFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    const bool init = (g.TempInputId != id);
-    if (init)
-        ClearActiveID();
-
-    g.CurrentWindow->DC.CursorPos = bb.Min;
-    bool value_changed = InputTextEx(label, NULL, buf, buf_size, bb.GetSize(), flags);
-    if (init)
-    {
-        IM_ASSERT(g.ActiveId == id);
-        g.TempInputId = g.ActiveId;
-    }
-    return value_changed;
-}
-
-bool ImGui::TempInputScalar(const ImRect& bb, ImGuiID id, const char* label, ImGuiDataType data_type, void* p_data, const char* format, const void* p_clamp_min, const void* p_clamp_max)
-{
-    ImGuiContext& g = *GImGui;
-
-    char fmt_buf[32];
-    char data_buf[32];
-    format = ImParseFormatTrimDecorations(format, fmt_buf, IM_ARRAYSIZE(fmt_buf));
-    DataTypeFormatString(data_buf, IM_ARRAYSIZE(data_buf), data_type, p_data, format);
-    ImStrTrimBlanks(data_buf);
-
-    ImGuiInputTextFlags flags = ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_NoMarkEdited;
-    flags |= ((data_type == ImGuiDataType_Float || data_type == ImGuiDataType_Double) ? ImGuiInputTextFlags_CharsScientific : ImGuiInputTextFlags_CharsDecimal);
-    bool value_changed = false;
-    if (TempInputText(bb, id, label, data_buf, IM_ARRAYSIZE(data_buf), flags))
-    {
-        size_t data_type_size = DataTypeGetInfo(data_type)->Size;
-        ImGuiDataTypeTempStorage data_backup;
-        memcpy(&data_backup, p_data, data_type_size);
-
-        DataTypeApplyOpFromText(data_buf, g.InputTextState.InitialTextA.Data, data_type, p_data, NULL);
-        if (p_clamp_min || p_clamp_max)
-        {
-            if (DataTypeCompare(data_type, p_clamp_min, p_clamp_max) > 0)
-                ImSwap(p_clamp_min, p_clamp_max);
-            DataTypeClamp(data_type, p_data, p_clamp_min, p_clamp_max);
-        }
-
-        value_changed = memcmp(&data_backup, p_data, data_type_size) != 0;
-        if (value_changed)
-            MarkItemEdited(id);
-    }
-    return value_changed;
-}
-
-bool ImGui::InputScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_step, const void* p_step_fast, const char* format, ImGuiInputTextFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    ImGuiStyle& style = g.Style;
-
-    if (format == NULL)
-        format = DataTypeGetInfo(data_type)->PrintFmt;
-
-    char buf[64];
-    DataTypeFormatString(buf, IM_ARRAYSIZE(buf), data_type, p_data, format);
-
-    bool value_changed = false;
-    if ((flags & (ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsScientific)) == 0)
-        flags |= ImGuiInputTextFlags_CharsDecimal;
-    flags |= ImGuiInputTextFlags_AutoSelectAll;
-    flags |= ImGuiInputTextFlags_NoMarkEdited;               
-
-    if (p_step != NULL)
-    {
-        const float button_size = GetFrameHeight();
-
-        BeginGroup();                   
-        PushID(label);
-        SetNextItemWidth(ImMax(1.0f, CalcItemWidth() - (button_size + style.ItemInnerSpacing.x) * 2));
-        if (InputText("", buf, IM_ARRAYSIZE(buf), flags))              
-            value_changed = DataTypeApplyOpFromText(buf, g.InputTextState.InitialTextA.Data, data_type, p_data, format);
-
-        const ImVec2 backup_frame_padding = style.FramePadding;
-        style.FramePadding.x = style.FramePadding.y;
-        ImGuiButtonFlags button_flags = ImGuiButtonFlags_Repeat | ImGuiButtonFlags_DontClosePopups;
-        if (flags & ImGuiInputTextFlags_ReadOnly)
-            button_flags |= ImGuiButtonFlags_Disabled;
-        SameLine(0, style.ItemInnerSpacing.x);
-        if (ButtonEx("-", ImVec2(button_size, button_size), button_flags))
-        {
-            DataTypeApplyOp(data_type, '-', p_data, p_data, g.IO.KeyCtrl && p_step_fast ? p_step_fast : p_step);
-            value_changed = true;
-        }
-        SameLine(0, style.ItemInnerSpacing.x);
-        if (ButtonEx("+", ImVec2(button_size, button_size), button_flags))
-        {
-            DataTypeApplyOp(data_type, '+', p_data, p_data, g.IO.KeyCtrl && p_step_fast ? p_step_fast : p_step);
-            value_changed = true;
-        }
-
-        const char* label_end = FindRenderedTextEnd(label);
-
-
-        if (label != label_end)
-        {
-            SameLine(0, style.ItemInnerSpacing.x);
-            TextEx(label, label_end);
-        }
-        style.FramePadding = backup_frame_padding;
-
-        PopID();
-        EndGroup();
-    }
-    else
-    {
-        if (InputText(label, buf, IM_ARRAYSIZE(buf), flags))
-            value_changed = DataTypeApplyOpFromText(buf, g.InputTextState.InitialTextA.Data, data_type, p_data, format);
-    }
-    if (value_changed)
-        MarkItemEdited(window->DC.LastItemId);
-
-    return value_changed;
-}
-
-bool ImGui::InputScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_step, const void* p_step_fast, const char* format, ImGuiInputTextFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    bool value_changed = false;
-    BeginGroup();
-    PushID(label);
-    PushMultiItemsWidths(components, CalcItemWidth());
-    size_t type_size = GDataTypeInfo[data_type].Size;
-    for (int i = 0; i < components; i++)
-    {
-        PushID(i);
-        if (i > 0)
-            SameLine(0, g.Style.ItemInnerSpacing.x);
-        value_changed |= InputScalar("", data_type, p_data, p_step, p_step_fast, format, flags);
-        PopID();
-        PopItemWidth();
-        p_data = (void*)((char*)p_data + type_size);
-    }
-    PopID();
-
-    const char* label_end = FindRenderedTextEnd(label);
-    if (label != label_end)
-    {
-        SameLine(0.0f, g.Style.ItemInnerSpacing.x);
-        TextEx(label, label_end);
-    }
-
-    EndGroup();
-    return value_changed;
-}
-
-bool ImGui::InputFloat(const char* label, float* v, float step, float step_fast, const char* format, ImGuiInputTextFlags flags)
-{
-    flags |= ImGuiInputTextFlags_CharsScientific;
-    return InputScalar(label, ImGuiDataType_Float, (void*)v, (void*)(step > 0.0f ? &step : NULL), (void*)(step_fast > 0.0f ? &step_fast : NULL), format, flags);
-}
-
-bool ImGui::InputFloat2(const char* label, float v[2], const char* format, ImGuiInputTextFlags flags)
-{
-    return InputScalarN(label, ImGuiDataType_Float, v, 2, NULL, NULL, format, flags);
-}
-
-bool ImGui::InputFloat3(const char* label, float v[3], const char* format, ImGuiInputTextFlags flags)
-{
-    return InputScalarN(label, ImGuiDataType_Float, v, 3, NULL, NULL, format, flags);
-}
-
-bool ImGui::InputFloat4(const char* label, float v[4], const char* format, ImGuiInputTextFlags flags)
-{
-    return InputScalarN(label, ImGuiDataType_Float, v, 4, NULL, NULL, format, flags);
-}
-
-bool ImGui::InputInt(const char* label, int* v, int step, int step_fast, ImGuiInputTextFlags flags)
-{
-    const char* format = (flags & ImGuiInputTextFlags_CharsHexadecimal) ? "%08X" : "%d";
-    return InputScalar(label, ImGuiDataType_S32, (void*)v, (void*)(step > 0 ? &step : NULL), (void*)(step_fast > 0 ? &step_fast : NULL), format, flags);
-}
-
-bool ImGui::InputInt2(const char* label, int v[2], ImGuiInputTextFlags flags)
-{
-    return InputScalarN(label, ImGuiDataType_S32, v, 2, NULL, NULL, "%d", flags);
-}
-
-bool ImGui::InputInt3(const char* label, int v[3], ImGuiInputTextFlags flags)
-{
-    return InputScalarN(label, ImGuiDataType_S32, v, 3, NULL, NULL, "%d", flags);
-}
-
-bool ImGui::InputInt4(const char* label, int v[4], ImGuiInputTextFlags flags)
-{
-    return InputScalarN(label, ImGuiDataType_S32, v, 4, NULL, NULL, "%d", flags);
-}
-
-bool ImGui::InputDouble(const char* label, double* v, double step, double step_fast, const char* format, ImGuiInputTextFlags flags)
-{
-    flags |= ImGuiInputTextFlags_CharsScientific;
-    return InputScalar(label, ImGuiDataType_Double, (void*)v, (void*)(step > 0.0 ? &step : NULL), (void*)(step_fast > 0.0 ? &step_fast : NULL), format, flags);
-}
-
-bool ImGui::InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
-{ 
-    IM_ASSERT(!(flags & ImGuiInputTextFlags_Multiline));   
-    return InputTextEx(label, NULL, buf, (int)buf_size, ImVec2(0, 0), flags, callback, user_data);
-}
-
-bool ImGui::InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
-{
-    return InputTextEx(label, NULL, buf, (int)buf_size, size, flags | ImGuiInputTextFlags_Multiline, callback, user_data);
-}
-
-bool ImGui::InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
-{
-    IM_ASSERT(!(flags & ImGuiInputTextFlags_Multiline));   
-    return InputTextEx(label, hint, buf, (int)buf_size, ImVec2(0, 0), flags, callback, user_data);
-}
-
-static int InputTextCalcTextLenAndLineCount(const char* text_begin, const char** out_text_end)
-{
-    int line_count = 0;
-    const char* s = text_begin;
-    while (char c = *s++)             
-        if (c == '\n')
-            line_count++;
-    s--;
-    if (s[0] != '\n' && s[0] != '\r')
-        line_count++;
-    *out_text_end = s;
-    return line_count;
-}
-
-static ImVec2 InputTextCalcTextSizeW(const ImWchar* text_begin, const ImWchar* text_end, const ImWchar** remaining, ImVec2* out_offset, bool stop_on_new_line)
-{
-    ImGuiContext& g = *GImGui;
-    ImFont* font = g.Font;
-    const float line_height = g.FontSize;
-    const float scale = line_height / font->FontSize;
-
-    ImVec2 text_size = ImVec2(0, 0);
-    float line_width = 0.0f;
-
-    const ImWchar* s = text_begin;
-    while (s < text_end)
-    {
-        unsigned int c = (unsigned int)(*s++);
-        if (c == '\n')
-        {
-            text_size.x = ImMax(text_size.x, line_width);
-            text_size.y += line_height;
-            line_width = 0.0f;
-            if (stop_on_new_line)
-                break;
-            continue;
-        }
-        if (c == '\r')
-            continue;
-
-        const float char_width = font->GetCharAdvance((ImWchar)c) * scale;
-        line_width += char_width;
-    }
-
-    if (text_size.x < line_width)
-        text_size.x = line_width;
-
-    if (out_offset)
-        *out_offset = ImVec2(line_width, text_size.y + line_height);             
-
-    if (line_width > 0 || text_size.y == 0.0f)                               
-        text_size.y += line_height;
-
-    if (remaining)
-        *remaining = s;
-
-    return text_size;
-}
-
-namespace ImStb
-{
-
-static int     STB_TEXTEDIT_STRINGLEN(const STB_TEXTEDIT_STRING* obj)                             { return obj->CurLenW; }
-static ImWchar STB_TEXTEDIT_GETCHAR(const STB_TEXTEDIT_STRING* obj, int idx)                      { return obj->TextW[idx]; }
-static float   STB_TEXTEDIT_GETWIDTH(STB_TEXTEDIT_STRING* obj, int line_start_idx, int char_idx)  { ImWchar c = obj->TextW[line_start_idx + char_idx]; if (c == '\n') return STB_TEXTEDIT_GETWIDTH_NEWLINE; ImGuiContext& g = *GImGui; return g.Font->GetCharAdvance(c) * (g.FontSize / g.Font->FontSize); }
-static int     STB_TEXTEDIT_KEYTOTEXT(int key)                                                    { return key >= 0x200000 ? 0 : key; }
-static ImWchar STB_TEXTEDIT_NEWLINE = '\n';
-static void    STB_TEXTEDIT_LAYOUTROW(StbTexteditRow* r, STB_TEXTEDIT_STRING* obj, int line_start_idx)
-{
-    const ImWchar* text = obj->TextW.Data;
-    const ImWchar* text_remaining = NULL;
-    const ImVec2 size = InputTextCalcTextSizeW(text + line_start_idx, text + obj->CurLenW, &text_remaining, NULL, true);
-    r->x0 = 0.0f;
-    r->x1 = size.x;
-    r->baseline_y_delta = size.y;
-    r->ymin = 0.0f;
-    r->ymax = size.y;
-    r->num_chars = (int)(text_remaining - (text + line_start_idx));
-}
-
-static bool is_separator(unsigned int c)                                        { return ImCharIsBlankW(c) || c==',' || c==';' || c=='(' || c==')' || c=='{' || c=='}' || c=='[' || c==']' || c=='|'; }
-static int  is_word_boundary_from_right(STB_TEXTEDIT_STRING* obj, int idx)      { return idx > 0 ? (is_separator(obj->TextW[idx - 1]) && !is_separator(obj->TextW[idx]) ) : 1; }
-static int  STB_TEXTEDIT_MOVEWORDLEFT_IMPL(STB_TEXTEDIT_STRING* obj, int idx)   { idx--; while (idx >= 0 && !is_word_boundary_from_right(obj, idx)) idx--; return idx < 0 ? 0 : idx; }
-#ifdef __APPLE__          
-static int  is_word_boundary_from_left(STB_TEXTEDIT_STRING* obj, int idx)       { return idx > 0 ? (!is_separator(obj->TextW[idx - 1]) && is_separator(obj->TextW[idx]) ) : 1; }
-static int  STB_TEXTEDIT_MOVEWORDRIGHT_IMPL(STB_TEXTEDIT_STRING* obj, int idx)  { idx++; int len = obj->CurLenW; while (idx < len && !is_word_boundary_from_left(obj, idx)) idx++; return idx > len ? len : idx; }
-#else
-static int  STB_TEXTEDIT_MOVEWORDRIGHT_IMPL(STB_TEXTEDIT_STRING* obj, int idx)  { idx++; int len = obj->CurLenW; while (idx < len && !is_word_boundary_from_right(obj, idx)) idx++; return idx > len ? len : idx; }
-#endif
-#define STB_TEXTEDIT_MOVEWORDLEFT   STB_TEXTEDIT_MOVEWORDLEFT_IMPL           
-#define STB_TEXTEDIT_MOVEWORDRIGHT  STB_TEXTEDIT_MOVEWORDRIGHT_IMPL
-
-static void STB_TEXTEDIT_DELETECHARS(STB_TEXTEDIT_STRING* obj, int pos, int n)
-{
-    ImWchar* dst = obj->TextW.Data + pos;
-
-    obj->Edited = true;
-    obj->CurLenA -= ImTextCountUtf8BytesFromStr(dst, dst + n);
-    obj->CurLenW -= n;
-
-    const ImWchar* src = obj->TextW.Data + pos + n;
-    while (ImWchar c = *src++)
-        *dst++ = c;
-    *dst = '\0';
-}
-
-static bool STB_TEXTEDIT_INSERTCHARS(STB_TEXTEDIT_STRING* obj, int pos, const ImWchar* new_text, int new_text_len)
-{
-    const bool is_resizable = (obj->UserFlags & ImGuiInputTextFlags_CallbackResize) != 0;
-    const int text_len = obj->CurLenW;
-    IM_ASSERT(pos <= text_len);
-
-    const int new_text_len_utf8 = ImTextCountUtf8BytesFromStr(new_text, new_text + new_text_len);
-    if (!is_resizable && (new_text_len_utf8 + obj->CurLenA + 1 > obj->BufCapacityA))
-        return false;
-
-    if (new_text_len + text_len + 1 > obj->TextW.Size)
-    {
-        if (!is_resizable)
-            return false;
-        IM_ASSERT(text_len < obj->TextW.Size);
-        obj->TextW.resize(text_len + ImClamp(new_text_len * 4, 32, ImMax(256, new_text_len)) + 1);
-    }
-
-    ImWchar* text = obj->TextW.Data;
-    if (pos != text_len)
-        memmove(text + pos + new_text_len, text + pos, (size_t)(text_len - pos) * sizeof(ImWchar));
-    memcpy(text + pos, new_text, (size_t)new_text_len * sizeof(ImWchar));
-
-    obj->Edited = true;
-    obj->CurLenW += new_text_len;
-    obj->CurLenA += new_text_len_utf8;
-    obj->TextW[obj->CurLenW] = '\0';
-
-    return true;
-}
-
-#define STB_TEXTEDIT_K_LEFT         0x200000       
-#define STB_TEXTEDIT_K_RIGHT        0x200001       
-#define STB_TEXTEDIT_K_UP           0x200002       
-#define STB_TEXTEDIT_K_DOWN         0x200003       
-#define STB_TEXTEDIT_K_LINESTART    0x200004          
-#define STB_TEXTEDIT_K_LINEEND      0x200005          
-#define STB_TEXTEDIT_K_TEXTSTART    0x200006          
-#define STB_TEXTEDIT_K_TEXTEND      0x200007          
-#define STB_TEXTEDIT_K_DELETE       0x200008          
-#define STB_TEXTEDIT_K_BACKSPACE    0x200009           
-#define STB_TEXTEDIT_K_UNDO         0x20000A      
-#define STB_TEXTEDIT_K_REDO         0x20000B      
-#define STB_TEXTEDIT_K_WORDLEFT     0x20000C         
-#define STB_TEXTEDIT_K_WORDRIGHT    0x20000D         
-#define STB_TEXTEDIT_K_PGUP         0x20000E         
-#define STB_TEXTEDIT_K_PGDOWN       0x20000F         
-#define STB_TEXTEDIT_K_SHIFT        0x400000
-
-#define STB_TEXTEDIT_IMPLEMENTATION
-#include "imstb_textedit.h"
-
-static void stb_textedit_replace(STB_TEXTEDIT_STRING* str, STB_TexteditState* state, const STB_TEXTEDIT_CHARTYPE* text, int text_len)
-{
-    stb_text_makeundo_replace(str, state, 0, str->CurLenW, text_len);
-    ImStb::STB_TEXTEDIT_DELETECHARS(str, 0, str->CurLenW);
-    if (text_len <= 0)
-        return;
-    if (ImStb::STB_TEXTEDIT_INSERTCHARS(str, 0, text, text_len))
-    {
-        state->cursor = text_len;
-        state->has_preferred_x = 0;
-        return;
-    }
-    IM_ASSERT(0);               
-}
-
-}   
-
-void ImGuiInputTextState::OnKeyPressed(int key)
-{
-    stb_textedit_key(this, &Stb, key);
-    CursorFollow = true;
-    CursorAnimReset();
-}
-
-ImGuiInputTextCallbackData::ImGuiInputTextCallbackData()
-{
-    memset(this, 0, sizeof(*this));
-}
-
-void ImGuiInputTextCallbackData::DeleteChars(int pos, int bytes_count)
-{
-    IM_ASSERT(pos + bytes_count <= BufTextLen);
-    char* dst = Buf + pos;
-    const char* src = Buf + pos + bytes_count;
-    while (char c = *src++)
-        *dst++ = c;
-    *dst = '\0';
-
-    if (CursorPos >= pos + bytes_count)
-        CursorPos -= bytes_count;
-    else if (CursorPos >= pos)
-        CursorPos = pos;
-    SelectionStart = SelectionEnd = CursorPos;
-    BufDirty = true;
-    BufTextLen -= bytes_count;
-}
-
-void ImGuiInputTextCallbackData::InsertChars(int pos, const char* new_text, const char* new_text_end)
-{
-    const bool is_resizable = (Flags & ImGuiInputTextFlags_CallbackResize) != 0;
-    const int new_text_len = new_text_end ? (int)(new_text_end - new_text) : (int)strlen(new_text);
-    if (new_text_len + BufTextLen >= BufSize)
-    {
-        if (!is_resizable)
-            return;
-
-        ImGuiContext& g = *GImGui;
-        ImGuiInputTextState* edit_state = &g.InputTextState;
-        IM_ASSERT(edit_state->ID != 0 && g.ActiveId == edit_state->ID);
-        IM_ASSERT(Buf == edit_state->TextA.Data);
-        int new_buf_size = BufTextLen + ImClamp(new_text_len * 4, 32, ImMax(256, new_text_len)) + 1;
-        edit_state->TextA.reserve(new_buf_size + 1);
-        Buf = edit_state->TextA.Data;
-        BufSize = edit_state->BufCapacityA = new_buf_size;
-    }
-
-    if (BufTextLen != pos)
-        memmove(Buf + pos + new_text_len, Buf + pos, (size_t)(BufTextLen - pos));
-    memcpy(Buf + pos, new_text, (size_t)new_text_len * sizeof(char));
-    Buf[BufTextLen + new_text_len] = '\0';
-
-    if (CursorPos >= pos)
-        CursorPos += new_text_len;
-    SelectionStart = SelectionEnd = CursorPos;
-    BufDirty = true;
-    BufTextLen += new_text_len;
-}
-
-static bool InputTextFilterCharacter(unsigned int* p_char, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
-{
-    unsigned int c = *p_char;
-
-    if (c < 0x20)
-    {
-        bool pass = false;
-        pass |= (c == '\n' && (flags & ImGuiInputTextFlags_Multiline));
-        pass |= (c == '\t' && (flags & ImGuiInputTextFlags_AllowTabInput));
-        if (!pass)
-            return false;
-    }
-
-    if (c == 127)
-        return false;
-
-    if (c >= 0xE000 && c <= 0xF8FF)
-        return false;
-
-    if (c > IM_UNICODE_CODEPOINT_MAX)
-        return false;
-
-    if (flags & (ImGuiInputTextFlags_CharsDecimal | ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase | ImGuiInputTextFlags_CharsNoBlank | ImGuiInputTextFlags_CharsScientific))
-    {
-        ImGuiContext& g = *GImGui;
-        const unsigned c_decimal_point = (unsigned int)g.PlatformLocaleDecimalPoint;
-
-        if (flags & ImGuiInputTextFlags_CharsDecimal)
-            if (!(c >= '0' && c <= '9') && (c != c_decimal_point) && (c != '-') && (c != '+') && (c != '*') && (c != '/'))
-                return false;
-
-        if (flags & ImGuiInputTextFlags_CharsScientific)
-            if (!(c >= '0' && c <= '9') && (c != c_decimal_point) && (c != '-') && (c != '+') && (c != '*') && (c != '/') && (c != 'e') && (c != 'E'))
-                return false;
-
-        if (flags & ImGuiInputTextFlags_CharsHexadecimal)
-            if (!(c >= '0' && c <= '9') && !(c >= 'a' && c <= 'f') && !(c >= 'A' && c <= 'F'))
-                return false;
-
-        if (flags & ImGuiInputTextFlags_CharsUppercase)
-            if (c >= 'a' && c <= 'z')
-                *p_char = (c += (unsigned int)('A' - 'a'));
-
-        if (flags & ImGuiInputTextFlags_CharsNoBlank)
-            if (ImCharIsBlankW(c))
-                return false;
-    }
-
-    if (flags & ImGuiInputTextFlags_CallbackCharFilter)
-    {
-        ImGuiInputTextCallbackData callback_data;
-        memset(&callback_data, 0, sizeof(ImGuiInputTextCallbackData));
-        callback_data.EventFlag = ImGuiInputTextFlags_CallbackCharFilter;
-        callback_data.EventChar = (ImWchar)c;
-        callback_data.Flags = flags;
-        callback_data.UserData = user_data;
-        if (callback(&callback_data) != 0)
-            return false;
-        *p_char = callback_data.EventChar;
-        if (!callback_data.EventChar)
-            return false;
-    }
-
-    return true;
-}
-
-bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_size, const ImVec2& size_arg, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* callback_user_data)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    IM_ASSERT(buf != NULL && buf_size >= 0);
-    IM_ASSERT(!((flags & ImGuiInputTextFlags_CallbackHistory) && (flags & ImGuiInputTextFlags_Multiline)));                 
-    IM_ASSERT(!((flags & ImGuiInputTextFlags_CallbackCompletion) && (flags & ImGuiInputTextFlags_AllowTabInput)));          
-
-    ImGuiContext& g = *GImGui;
-    ImGuiIO& io = g.IO;
-    const ImGuiStyle& style = g.Style;
-
-    const bool RENDER_SELECTION_WHEN_INACTIVE = false;
-    const bool is_multiline = (flags & ImGuiInputTextFlags_Multiline) != 0;
-    const bool is_readonly = (flags & ImGuiInputTextFlags_ReadOnly) != 0;
-    const bool is_password = (flags & ImGuiInputTextFlags_Password) != 0;
-    const bool is_undoable = (flags & ImGuiInputTextFlags_NoUndoRedo) == 0;
-    const bool is_resizable = (flags & ImGuiInputTextFlags_CallbackResize) != 0;
-    if (is_resizable)
-        IM_ASSERT(callback != NULL);           
-
-    if (is_multiline)              
-        BeginGroup();
-    const ImGuiID id = window->GetID(label);
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-    const ImVec2 frame_size = CalcItemSize(size_arg, CalcItemWidth(), (is_multiline ? g.FontSize * 8.0f : label_size.y) + style.FramePadding.y * 2.0f);         
-    const ImVec2 total_size = ImVec2(frame_size.x + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f), frame_size.y);
-
-    const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + frame_size);
-    ImRect total_bb(frame_bb.Min - ImVec2(0.0f, 10.0f), frame_bb.Max + ImVec2(style.ItemInnerSpacing.x, 0.0f));
-
-
-    ImGuiWindow* draw_window = window;
-    ImVec2 inner_size = frame_size;
-    if (is_multiline)
-    {
-        if (!ItemAdd(total_bb, id, &frame_bb))
-        {
-            ItemSize(total_bb, style.FramePadding.y);
-            EndGroup();
-            return false;
-        }
-
-        PushStyleColor(ImGuiCol_ChildBg, style.Colors[ImGuiCol_FrameBg]);
-        PushStyleVar(ImGuiStyleVar_ChildRounding, style.FrameRounding);
-        PushStyleVar(ImGuiStyleVar_ChildBorderSize, style.FrameBorderSize);
-        bool child_visible = BeginChildEx(label, id, frame_bb.GetSize(), true, ImGuiWindowFlags_NoMove);
-        PopStyleVar(2);
-        PopStyleColor();
-        if (!child_visible)
-        {
-            EndChild();
-            EndGroup();
-            return false;
-        }
-        draw_window = g.CurrentWindow;   
-        draw_window->DC.NavLayerActiveMaskNext |= (1 << draw_window->DC.NavLayerCurrent);                  
-        draw_window->DC.CursorPos += style.FramePadding;
-        inner_size.x -= draw_window->ScrollbarSizes.x;
-    }
-    else
-    {
-        ItemSize(total_bb, style.FramePadding.y);
-        if (!ItemAdd(total_bb, id, &frame_bb))
-            return false;
-    }
-    const bool hovered = ItemHoverable(frame_bb, id);
-    if (hovered)
-        g.MouseCursor = ImGuiMouseCursor_TextInput;
-
-    ImGuiInputTextState* state = GetInputTextState(id);
-
-    const bool focus_requested = FocusableItemRegister(window, id);
-    const bool focus_requested_by_code = focus_requested && (g.FocusRequestCurrWindow == window && g.FocusRequestCurrCounterRegular == window->DC.FocusCounterRegular);
-    const bool focus_requested_by_tab = focus_requested && !focus_requested_by_code;
-
-    const bool user_clicked = hovered && io.MouseClicked[0];
-    const bool user_nav_input_start = (g.ActiveId != id) && ((g.NavInputId == id) || (g.NavActivateId == id && g.NavInputSource == ImGuiInputSource_NavKeyboard));
-    const bool user_scroll_finish = is_multiline && state != NULL && g.ActiveId == 0 && g.ActiveIdPreviousFrame == GetWindowScrollbarID(draw_window, ImGuiAxis_Y);
-    const bool user_scroll_active = is_multiline && state != NULL && g.ActiveId == GetWindowScrollbarID(draw_window, ImGuiAxis_Y);
-
-    bool clear_active_id = false;
-    bool select_all = (g.ActiveId != id) && ((flags & ImGuiInputTextFlags_AutoSelectAll) != 0 || user_nav_input_start) && (!is_multiline);
-
-    float scroll_y = is_multiline ? draw_window->Scroll.y : FLT_MAX;
-
-    const bool init_changed_specs = (state != NULL && state->Stb.single_line != !is_multiline);
-    const bool init_make_active = (focus_requested || user_clicked || user_scroll_finish || user_nav_input_start);
-    const bool init_state = (init_make_active || user_scroll_active);
-    if ((init_state && g.ActiveId != id) || init_changed_specs)
-    {
-        state = &g.InputTextState;
-        state->CursorAnimReset();
-
-        const int buf_len = (int)strlen(buf);
-        state->InitialTextA.resize(buf_len + 1);                      
-        memcpy(state->InitialTextA.Data, buf, buf_len + 1);
-
-        const char* buf_end = NULL;
-        state->TextW.resize(buf_size + 1);                                
-        state->TextA.resize(0);
-        state->TextAIsValid = false;                           
-        state->CurLenW = ImTextStrFromUtf8(state->TextW.Data, buf_size, buf, NULL, &buf_end);
-        state->CurLenA = (int)(buf_end - buf);                          
-
-        const bool recycle_state = (state->ID == id && !init_changed_specs);
-        if (recycle_state)
-        {
-            state->CursorClamp();
-        }
-        else
-        {
-            state->ID = id;
-            state->ScrollX = 0.0f;
-            stb_textedit_initialize_state(&state->Stb, !is_multiline);
-            if (!is_multiline && focus_requested_by_code)
-                select_all = true;
-        }
-        if (flags & ImGuiInputTextFlags_AlwaysInsertMode)
-            state->Stb.insert_mode = 1;
-        if (!is_multiline && (focus_requested_by_tab || (user_clicked && io.KeyCtrl)))
-            select_all = true;
-    }
-
-    if (g.ActiveId != id && init_make_active)
-    {
-        IM_ASSERT(state && state->ID == id);
-        SetActiveID(id, window);
-        SetFocusID(id, window);
-        FocusWindow(window);
-
-        IM_ASSERT(ImGuiNavInput_COUNT < 32);
-        g.ActiveIdUsingNavDirMask |= (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right);
-        if (is_multiline || (flags & ImGuiInputTextFlags_CallbackHistory))
-            g.ActiveIdUsingNavDirMask |= (1 << ImGuiDir_Up) | (1 << ImGuiDir_Down);
-        g.ActiveIdUsingNavInputMask |= (1 << ImGuiNavInput_Cancel);
-        g.ActiveIdUsingKeyInputMask |= ((ImU64)1 << ImGuiKey_Home) | ((ImU64)1 << ImGuiKey_End);
-        if (is_multiline)
-            g.ActiveIdUsingKeyInputMask |= ((ImU64)1 << ImGuiKey_PageUp) | ((ImU64)1 << ImGuiKey_PageDown);
-        if (flags & (ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_AllowTabInput))             
-            g.ActiveIdUsingKeyInputMask |= ((ImU64)1 << ImGuiKey_Tab);
-    }
-
-    if (g.ActiveId == id && state == NULL)
-        ClearActiveID();
-
-    if (g.ActiveId == id && io.MouseClicked[0] && !init_state && !init_make_active) 
-        clear_active_id = true;
-
-    const bool render_cursor = (g.ActiveId == id) || (state && user_scroll_active);
-    bool render_selection = state && state->HasSelection() && (RENDER_SELECTION_WHEN_INACTIVE || render_cursor);
-    bool value_changed = false;
-    bool enter_pressed = false;
-
-    if (is_readonly && state != NULL && (render_cursor || render_selection))
-    {
-        const char* buf_end = NULL;
-        state->TextW.resize(buf_size + 1);
-        state->CurLenW = ImTextStrFromUtf8(state->TextW.Data, state->TextW.Size, buf, NULL, &buf_end);
-        state->CurLenA = (int)(buf_end - buf);
-        state->CursorClamp();
-        render_selection &= state->HasSelection();
-    }
-
-    const bool buf_display_from_state = (render_cursor || render_selection || g.ActiveId == id) && !is_readonly && state && state->TextAIsValid;
-    const bool is_displaying_hint = (hint != NULL && (buf_display_from_state ? state->TextA.Data : buf)[0] == 0);
-
-    if (is_password && !is_displaying_hint)
-    {
-        const ImFontGlyph* glyph = g.Font->FindGlyph('*');
-        ImFont* password_font = &g.InputTextPasswordFont;
-        password_font->FontSize = g.Font->FontSize;
-        password_font->Scale = g.Font->Scale;
-        password_font->Ascent = g.Font->Ascent;
-        password_font->Descent = g.Font->Descent;
-        password_font->ContainerAtlas = g.Font->ContainerAtlas;
-        password_font->FallbackGlyph = glyph;
-        password_font->FallbackAdvanceX = glyph->AdvanceX;
-        IM_ASSERT(password_font->Glyphs.empty() && password_font->IndexAdvanceX.empty() && password_font->IndexLookup.empty());
-        PushFont(password_font);
-    }
-
-    int backup_current_text_length = 0;
-
-    if (g.ActiveId == id)
-    { 
-        IM_ASSERT(state != NULL);
-        backup_current_text_length = state->CurLenA;
-        state->Edited = false;
-        state->BufCapacityA = buf_size;
-        state->UserFlags = flags;
-        state->UserCallback = callback;
-        state->UserCallbackData = callback_user_data;
-
-        g.ActiveIdAllowOverlap = !io.MouseDown[0];
-        g.WantTextInputNextFrame = 1;
-
-        const float mouse_x = (io.MousePos.x - frame_bb.Min.x - style.FramePadding.x) + state->ScrollX;
-        const float mouse_y = (is_multiline ? (io.MousePos.y - draw_window->DC.CursorPos.y) : (g.FontSize * 0.5f));
-
-        const bool is_osx = io.ConfigMacOSXBehaviors;
-        if (select_all || (hovered && !is_osx && io.MouseDoubleClicked[0]))
-        {
-            state->SelectAll();
-            state->SelectedAllMouseLock = true;
-        }
-        else if (hovered && is_osx && io.MouseDoubleClicked[0])
-        {
-            state->OnKeyPressed(STB_TEXTEDIT_K_WORDLEFT);
-            state->OnKeyPressed(STB_TEXTEDIT_K_WORDRIGHT | STB_TEXTEDIT_K_SHIFT);
-        }
-        else if (io.MouseClicked[0] && !state->SelectedAllMouseLock)
-        {
-            if (hovered)
-            {
-                stb_textedit_click(state, &state->Stb, mouse_x, mouse_y);
-                state->CursorAnimReset();
-            }
-        }
-        else if (io.MouseDown[0] && !state->SelectedAllMouseLock && (io.MouseDelta.x != 0.0f || io.MouseDelta.y != 0.0f))
-        {
-            stb_textedit_drag(state, &state->Stb, mouse_x, mouse_y);
-            state->CursorAnimReset();
-            state->CursorFollow = true;
-        }
-        if (state->SelectedAllMouseLock && !io.MouseDown[0])
-            state->SelectedAllMouseLock = false;
-
-        const bool ignore_char_inputs = (io.KeyCtrl && !io.KeyAlt) || (is_osx && io.KeySuper);
-        if ((flags & ImGuiInputTextFlags_AllowTabInput) && IsKeyPressedMap(ImGuiKey_Tab) && !ignore_char_inputs && !io.KeyShift && !is_readonly)
-            if (!io.InputQueueCharacters.contains('\t'))
-            {
-                unsigned int c = '\t';   
-                if (InputTextFilterCharacter(&c, flags, callback, callback_user_data))
-                    state->OnKeyPressed((int)c);
-            }
-
-        if (io.InputQueueCharacters.Size > 0)
-        {
-            if (!ignore_char_inputs && !is_readonly && !user_nav_input_start)
-                for (int n = 0; n < io.InputQueueCharacters.Size; n++)
-                {
-                    unsigned int c = (unsigned int)io.InputQueueCharacters[n];
-                    if (c == '\t' && io.KeyShift)
-                        continue;
-                    if (InputTextFilterCharacter(&c, flags, callback, callback_user_data))
-                        state->OnKeyPressed((int)c);
-                }
-
-            io.InputQueueCharacters.resize(0);
-        }
-    }
-
-    bool cancel_edit = false;
-    if (g.ActiveId == id && !g.ActiveIdIsJustActivated && !clear_active_id)
-    { 
-        IM_ASSERT(state != NULL);
-        IM_ASSERT(io.KeyMods == GetMergedKeyModFlags() && "Mismatching io.KeyCtrl/io.KeyShift/io.KeyAlt/io.KeySuper vs io.KeyMods");             
-
-        const int row_count_per_page = ImMax((int)((inner_size.y - style.FramePadding.y) / g.FontSize), 1);
-        state->Stb.row_count_per_page = row_count_per_page;
-
-        const int k_mask = (io.KeyShift ? STB_TEXTEDIT_K_SHIFT : 0);
-        const bool is_osx = io.ConfigMacOSXBehaviors;
-        const bool is_osx_shift_shortcut = is_osx && (io.KeyMods == (ImGuiKeyModFlags_Super | ImGuiKeyModFlags_Shift));
-        const bool is_wordmove_key_down = is_osx ? io.KeyAlt : io.KeyCtrl;                                 
-        const bool is_startend_key_down = is_osx && io.KeySuper && !io.KeyCtrl && !io.KeyAlt;              
-        const bool is_ctrl_key_only = (io.KeyMods == ImGuiKeyModFlags_Ctrl);
-        const bool is_shift_key_only = (io.KeyMods == ImGuiKeyModFlags_Shift);
-        const bool is_shortcut_key = g.IO.ConfigMacOSXBehaviors ? (io.KeyMods == ImGuiKeyModFlags_Super) : (io.KeyMods == ImGuiKeyModFlags_Ctrl);
-
-        const bool is_cut   = ((is_shortcut_key && IsKeyPressedMap(ImGuiKey_X)) || (is_shift_key_only && IsKeyPressedMap(ImGuiKey_Delete))) && !is_readonly && !is_password && (!is_multiline || state->HasSelection());
-        const bool is_copy  = ((is_shortcut_key && IsKeyPressedMap(ImGuiKey_C)) || (is_ctrl_key_only  && IsKeyPressedMap(ImGuiKey_Insert))) && !is_password && (!is_multiline || state->HasSelection());
-        const bool is_paste = ((is_shortcut_key && IsKeyPressedMap(ImGuiKey_V)) || (is_shift_key_only && IsKeyPressedMap(ImGuiKey_Insert))) && !is_readonly;
-        const bool is_undo  = ((is_shortcut_key && IsKeyPressedMap(ImGuiKey_Z)) && !is_readonly && is_undoable);
-        const bool is_redo  = ((is_shortcut_key && IsKeyPressedMap(ImGuiKey_Y)) || (is_osx_shift_shortcut && IsKeyPressedMap(ImGuiKey_Z))) && !is_readonly && is_undoable;
-
-        if (IsKeyPressedMap(ImGuiKey_LeftArrow))                        { state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_LINESTART : is_wordmove_key_down ? STB_TEXTEDIT_K_WORDLEFT : STB_TEXTEDIT_K_LEFT) | k_mask); }
-        else if (IsKeyPressedMap(ImGuiKey_RightArrow))                  { state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_LINEEND : is_wordmove_key_down ? STB_TEXTEDIT_K_WORDRIGHT : STB_TEXTEDIT_K_RIGHT) | k_mask); }
-        else if (IsKeyPressedMap(ImGuiKey_UpArrow) && is_multiline)     { if (io.KeyCtrl) SetScrollY(draw_window, ImMax(draw_window->Scroll.y - g.FontSize, 0.0f)); else state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_TEXTSTART : STB_TEXTEDIT_K_UP) | k_mask); }
-        else if (IsKeyPressedMap(ImGuiKey_DownArrow) && is_multiline)   { if (io.KeyCtrl) SetScrollY(draw_window, ImMin(draw_window->Scroll.y + g.FontSize, GetScrollMaxY())); else state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_TEXTEND : STB_TEXTEDIT_K_DOWN) | k_mask); }
-        else if (IsKeyPressedMap(ImGuiKey_PageUp) && is_multiline)      { state->OnKeyPressed(STB_TEXTEDIT_K_PGUP | k_mask); scroll_y -= row_count_per_page * g.FontSize; }
-        else if (IsKeyPressedMap(ImGuiKey_PageDown) && is_multiline)    { state->OnKeyPressed(STB_TEXTEDIT_K_PGDOWN | k_mask); scroll_y += row_count_per_page * g.FontSize; }
-        else if (IsKeyPressedMap(ImGuiKey_Home))                        { state->OnKeyPressed(io.KeyCtrl ? STB_TEXTEDIT_K_TEXTSTART | k_mask : STB_TEXTEDIT_K_LINESTART | k_mask); }
-        else if (IsKeyPressedMap(ImGuiKey_End))                         { state->OnKeyPressed(io.KeyCtrl ? STB_TEXTEDIT_K_TEXTEND | k_mask : STB_TEXTEDIT_K_LINEEND | k_mask); }
-        else if (IsKeyPressedMap(ImGuiKey_Delete) && !is_readonly)      { state->OnKeyPressed(STB_TEXTEDIT_K_DELETE | k_mask); }
-        else if (IsKeyPressedMap(ImGuiKey_Backspace) && !is_readonly)
-        {
-            if (!state->HasSelection())
-            {
-                if (is_wordmove_key_down)
-                    state->OnKeyPressed(STB_TEXTEDIT_K_WORDLEFT | STB_TEXTEDIT_K_SHIFT);
-                else if (is_osx && io.KeySuper && !io.KeyAlt && !io.KeyCtrl)
-                    state->OnKeyPressed(STB_TEXTEDIT_K_LINESTART | STB_TEXTEDIT_K_SHIFT);
-            }
-            state->OnKeyPressed(STB_TEXTEDIT_K_BACKSPACE | k_mask);
-        }
-        else if (IsKeyPressedMap(ImGuiKey_Enter) || IsKeyPressedMap(ImGuiKey_KeyPadEnter))
-        {
-            bool ctrl_enter_for_new_line = (flags & ImGuiInputTextFlags_CtrlEnterForNewLine) != 0;
-            if (!is_multiline || (ctrl_enter_for_new_line && !io.KeyCtrl) || (!ctrl_enter_for_new_line && io.KeyCtrl))
-            {
-                enter_pressed = clear_active_id = true;
-            }
-            else if (!is_readonly)
-            {
-                unsigned int c = '\n';    
-                if (InputTextFilterCharacter(&c, flags, callback, callback_user_data))
-                    state->OnKeyPressed((int)c);
-            }
-        }
-        else if (IsKeyPressedMap(ImGuiKey_Escape))
-        {
-            clear_active_id = cancel_edit = true;
-        }
-        else if (is_undo || is_redo)
-        {
-            state->OnKeyPressed(is_undo ? STB_TEXTEDIT_K_UNDO : STB_TEXTEDIT_K_REDO);
-            state->ClearSelection();
-        }
-        else if (is_shortcut_key && IsKeyPressedMap(ImGuiKey_A))
-        {
-            state->SelectAll();
-            state->CursorFollow = true;
-        }
-        else if (is_cut || is_copy)
-        {
-            if (io.SetClipboardTextFn)
-            {
-                const int ib = state->HasSelection() ? ImMin(state->Stb.select_start, state->Stb.select_end) : 0;
-                const int ie = state->HasSelection() ? ImMax(state->Stb.select_start, state->Stb.select_end) : state->CurLenW;
-                const int clipboard_data_len = ImTextCountUtf8BytesFromStr(state->TextW.Data + ib, state->TextW.Data + ie) + 1;
-                char* clipboard_data = (char*)IM_ALLOC(clipboard_data_len * sizeof(char));
-                ImTextStrToUtf8(clipboard_data, clipboard_data_len, state->TextW.Data + ib, state->TextW.Data + ie);
-                SetClipboardText(clipboard_data);
-                MemFree(clipboard_data);
-            }
-            if (is_cut)
-            {
-                if (!state->HasSelection())
-                    state->SelectAll();
-                state->CursorFollow = true;
-                stb_textedit_cut(state, &state->Stb);
-            }
-        }
-        else if (is_paste)
-        {
-            if (const char* clipboard = GetClipboardText())
-            {
-                const int clipboard_len = (int)strlen(clipboard);
-                ImWchar* clipboard_filtered = (ImWchar*)IM_ALLOC((clipboard_len + 1) * sizeof(ImWchar));
-                int clipboard_filtered_len = 0;
-                for (const char* s = clipboard; *s; )
-                {
-                    unsigned int c;
-                    s += ImTextCharFromUtf8(&c, s, NULL);
-                    if (c == 0)
-                        break;
-                    if (!InputTextFilterCharacter(&c, flags, callback, callback_user_data))
-                        continue;
-                    clipboard_filtered[clipboard_filtered_len++] = (ImWchar)c;
-                }
-                clipboard_filtered[clipboard_filtered_len] = 0;
-                if (clipboard_filtered_len > 0)         
-                {
-                    stb_textedit_paste(state, &state->Stb, clipboard_filtered, clipboard_filtered_len);
-                    state->CursorFollow = true;
-                }
-                MemFree(clipboard_filtered);
-            }
-        }
-
-        render_selection |= state->HasSelection() && (RENDER_SELECTION_WHEN_INACTIVE || render_cursor);
-    }
-
-    if (g.ActiveId == id)
-    {  
-        IM_ASSERT(state != NULL);
-        const char* apply_new_text = NULL;
-        int apply_new_text_length = 0;
-        if (cancel_edit)
-        {
-            if (!is_readonly && strcmp(buf, state->InitialTextA.Data) != 0)
-            {
-                apply_new_text = state->InitialTextA.Data;
-                apply_new_text_length = state->InitialTextA.Size - 1;
-                ImVector<ImWchar> w_text;
-                if (apply_new_text_length > 0)
-                {
-                    w_text.resize(ImTextCountCharsFromUtf8(apply_new_text, apply_new_text + apply_new_text_length) + 1);
-                    ImTextStrFromUtf8(w_text.Data, w_text.Size, apply_new_text, apply_new_text + apply_new_text_length);
-                }
-                stb_textedit_replace(state, &state->Stb, w_text.Data, (apply_new_text_length > 0) ? (w_text.Size - 1) : 0);
-            }
-        }
-
-        bool apply_edit_back_to_user_buffer = !cancel_edit || (enter_pressed && (flags & ImGuiInputTextFlags_EnterReturnsTrue) != 0);
-        if (apply_edit_back_to_user_buffer)
-        {
-            if (!is_readonly)
-            {
-                state->TextAIsValid = true;
-                state->TextA.resize(state->TextW.Size * 4 + 1);
-                ImTextStrToUtf8(state->TextA.Data, state->TextA.Size, state->TextW.Data, NULL);
-            }
-
-            if ((flags & (ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_CallbackHistory | ImGuiInputTextFlags_CallbackEdit | ImGuiInputTextFlags_CallbackAlways)) != 0)
-            {
-                IM_ASSERT(callback != NULL);
-
-                ImGuiInputTextFlags event_flag = 0;
-                ImGuiKey event_key = ImGuiKey_COUNT;
-                if ((flags & ImGuiInputTextFlags_CallbackCompletion) != 0 && IsKeyPressedMap(ImGuiKey_Tab))
-                {
-                    event_flag = ImGuiInputTextFlags_CallbackCompletion;
-                    event_key = ImGuiKey_Tab;
-                }
-                else if ((flags & ImGuiInputTextFlags_CallbackHistory) != 0 && IsKeyPressedMap(ImGuiKey_UpArrow))
-                {
-                    event_flag = ImGuiInputTextFlags_CallbackHistory;
-                    event_key = ImGuiKey_UpArrow;
-                }
-                else if ((flags & ImGuiInputTextFlags_CallbackHistory) != 0 && IsKeyPressedMap(ImGuiKey_DownArrow))
-                {
-                    event_flag = ImGuiInputTextFlags_CallbackHistory;
-                    event_key = ImGuiKey_DownArrow;
-                }
-                else if ((flags & ImGuiInputTextFlags_CallbackEdit) && state->Edited)
-                {
-                    event_flag = ImGuiInputTextFlags_CallbackEdit;
-                }
-                else if (flags & ImGuiInputTextFlags_CallbackAlways)
-                {
-                    event_flag = ImGuiInputTextFlags_CallbackAlways;
-                }
-
-                if (event_flag)
-                {
-                    ImGuiInputTextCallbackData callback_data;
-                    memset(&callback_data, 0, sizeof(ImGuiInputTextCallbackData));
-                    callback_data.EventFlag = event_flag;
-                    callback_data.Flags = flags;
-                    callback_data.UserData = callback_user_data;
-
-                    callback_data.EventKey = event_key;
-                    callback_data.Buf = state->TextA.Data;
-                    callback_data.BufTextLen = state->CurLenA;
-                    callback_data.BufSize = state->BufCapacityA;
-                    callback_data.BufDirty = false;
-
-                    ImWchar* text = state->TextW.Data;
-                    const int utf8_cursor_pos = callback_data.CursorPos = ImTextCountUtf8BytesFromStr(text, text + state->Stb.cursor);
-                    const int utf8_selection_start = callback_data.SelectionStart = ImTextCountUtf8BytesFromStr(text, text + state->Stb.select_start);
-                    const int utf8_selection_end = callback_data.SelectionEnd = ImTextCountUtf8BytesFromStr(text, text + state->Stb.select_end);
-
-                    callback(&callback_data);
-
-                    IM_ASSERT(callback_data.Buf == state->TextA.Data);       
-                    IM_ASSERT(callback_data.BufSize == state->BufCapacityA);
-                    IM_ASSERT(callback_data.Flags == flags);
-                    const bool buf_dirty = callback_data.BufDirty;
-                    if (callback_data.CursorPos != utf8_cursor_pos || buf_dirty)            { state->Stb.cursor = ImTextCountCharsFromUtf8(callback_data.Buf, callback_data.Buf + callback_data.CursorPos); state->CursorFollow = true; }
-                    if (callback_data.SelectionStart != utf8_selection_start || buf_dirty)  { state->Stb.select_start = (callback_data.SelectionStart == callback_data.CursorPos) ? state->Stb.cursor : ImTextCountCharsFromUtf8(callback_data.Buf, callback_data.Buf + callback_data.SelectionStart); }
-                    if (callback_data.SelectionEnd != utf8_selection_end || buf_dirty)      { state->Stb.select_end = (callback_data.SelectionEnd == callback_data.SelectionStart) ? state->Stb.select_start : ImTextCountCharsFromUtf8(callback_data.Buf, callback_data.Buf + callback_data.SelectionEnd); }
-                    if (buf_dirty)
-                    {
-                        IM_ASSERT(callback_data.BufTextLen == (int)strlen(callback_data.Buf));           
-                        if (callback_data.BufTextLen > backup_current_text_length && is_resizable)
-                            state->TextW.resize(state->TextW.Size + (callback_data.BufTextLen - backup_current_text_length));
-                        state->CurLenW = ImTextStrFromUtf8(state->TextW.Data, state->TextW.Size, callback_data.Buf, NULL);
-                        state->CurLenA = callback_data.BufTextLen;               
-                        state->CursorAnimReset();
-                    }
-                }
-            }
-
-            if (!is_readonly && strcmp(state->TextA.Data, buf) != 0)
-            {
-                apply_new_text = state->TextA.Data;
-                apply_new_text_length = state->CurLenA;
-            }
-        }
-
-        if (apply_new_text)
-        {
-            IM_ASSERT(apply_new_text_length >= 0);
-            if (is_resizable)
-            {
-                ImGuiInputTextCallbackData callback_data;
-                callback_data.EventFlag = ImGuiInputTextFlags_CallbackResize;
-                callback_data.Flags = flags;
-                callback_data.Buf = buf;
-                callback_data.BufTextLen = apply_new_text_length;
-                callback_data.BufSize = ImMax(buf_size, apply_new_text_length + 1);
-                callback_data.UserData = callback_user_data;
-                callback(&callback_data);
-                buf = callback_data.Buf;
-                buf_size = callback_data.BufSize;
-                apply_new_text_length = ImMin(callback_data.BufTextLen, buf_size - 1);
-                IM_ASSERT(apply_new_text_length <= buf_size);
-            }
-            ImStrncpy(buf, apply_new_text, ImMin(apply_new_text_length + 1, buf_size));
-            value_changed = true;
-        }
-
-        state->UserFlags = 0;
-        state->UserCallback = NULL;
-        state->UserCallbackData = NULL;
-    }
-
-    if (clear_active_id && g.ActiveId == id)
-        ClearActiveID();
-
-    if (!is_multiline)
-    {
-        RenderNavHighlight(frame_bb, id);
-        RenderFrame(frame_bb.Min, frame_bb.Max, GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding);
-       
-    }
-    
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Min.y), ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Min.y), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Min.y), ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Max.y), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Min.y), ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Max.y), colWhite, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Max.y), ImVec2(frame_bb.Max.x - 1.0f, frame_bb.Max.y), colWhite, 1.0f);
-    
-
-    const ImVec4 clip_rect(frame_bb.Min.x, frame_bb.Min.y, frame_bb.Min.x + inner_size.x, frame_bb.Min.y + inner_size.y);         
-    ImVec2 draw_pos = is_multiline ? draw_window->DC.CursorPos : frame_bb.Min + style.FramePadding;
-    ImVec2 text_size(0.0f, 0.0f);
-
-    const int buf_display_max_length = 2 * 1024 * 1024;
-    const char* buf_display = buf_display_from_state ? state->TextA.Data : buf; 
-    const char* buf_display_end = NULL;          
-    if (is_displaying_hint)
-    {
-        buf_display = hint;
-        buf_display_end = hint + strlen(hint);
-    }
-
-    if (render_cursor || render_selection)
-    {
-        IM_ASSERT(state != NULL);
-        if (!is_displaying_hint)
-            buf_display_end = buf_display + state->CurLenA;
-
-        const ImWchar* text_begin = state->TextW.Data;
-        ImVec2 cursor_offset, select_start_offset;
-
-        {
-            const ImWchar* searches_input_ptr[2] = { NULL, NULL };
-            int searches_result_line_no[2] = { -1000, -1000 };
-            int searches_remaining = 0;
-            if (render_cursor)
-            {
-                searches_input_ptr[0] = text_begin + state->Stb.cursor;
-                searches_result_line_no[0] = -1;
-                searches_remaining++;
-            }
-            if (render_selection)
-            {
-                searches_input_ptr[1] = text_begin + ImMin(state->Stb.select_start, state->Stb.select_end);
-                searches_result_line_no[1] = -1;
-                searches_remaining++;
-            }
-
-            searches_remaining += is_multiline ? 1 : 0;
-            int line_count = 0;
-            for (const ImWchar* s = text_begin; *s != 0; s++)
-                if (*s == '\n')
-                {
-                    line_count++;
-                    if (searches_result_line_no[0] == -1 && s >= searches_input_ptr[0]) { searches_result_line_no[0] = line_count; if (--searches_remaining <= 0) break; }
-                    if (searches_result_line_no[1] == -1 && s >= searches_input_ptr[1]) { searches_result_line_no[1] = line_count; if (--searches_remaining <= 0) break; }
-                }
-            line_count++;
-            if (searches_result_line_no[0] == -1)
-                searches_result_line_no[0] = line_count;
-            if (searches_result_line_no[1] == -1)
-                searches_result_line_no[1] = line_count;
-
-            cursor_offset.x = InputTextCalcTextSizeW(ImStrbolW(searches_input_ptr[0], text_begin), searches_input_ptr[0]).x;
-            cursor_offset.y = searches_result_line_no[0] * g.FontSize;
-            if (searches_result_line_no[1] >= 0)
-            {
-                select_start_offset.x = InputTextCalcTextSizeW(ImStrbolW(searches_input_ptr[1], text_begin), searches_input_ptr[1]).x;
-                select_start_offset.y = searches_result_line_no[1] * g.FontSize;
-            }
-
-            if (is_multiline)
-                text_size = ImVec2(inner_size.x, line_count * g.FontSize);
-        }
-
-        if (render_cursor && state->CursorFollow)
-        {
-            if (!(flags & ImGuiInputTextFlags_NoHorizontalScroll))
-            {
-                const float scroll_increment_x = inner_size.x * 0.25f;
-                const float visible_width = inner_size.x - style.FramePadding.x;
-                if (cursor_offset.x < state->ScrollX)
-                    state->ScrollX = IM_FLOOR(ImMax(0.0f, cursor_offset.x - scroll_increment_x));
-                else if (cursor_offset.x - visible_width >= state->ScrollX)
-                    state->ScrollX = IM_FLOOR(cursor_offset.x - visible_width + scroll_increment_x);
-            }
-            else
-            {
-                state->ScrollX = 0.0f;
-            }
-
-            if (is_multiline)
-            {
-                if (cursor_offset.y - g.FontSize < scroll_y)
-                    scroll_y = ImMax(0.0f, cursor_offset.y - g.FontSize);
-                else if (cursor_offset.y - inner_size.y >= scroll_y)
-                    scroll_y = cursor_offset.y - inner_size.y + style.FramePadding.y * 2.0f;
-                const float scroll_max_y = ImMax((text_size.y + style.FramePadding.y * 2.0f) - inner_size.y, 0.0f);
-                scroll_y = ImClamp(scroll_y, 0.0f, scroll_max_y);
-                draw_pos.y += (draw_window->Scroll.y - scroll_y);            
-                draw_window->Scroll.y = scroll_y;
-            }
-
-            state->CursorFollow = false;
-        }
-
-        const ImVec2 draw_scroll = ImVec2(state->ScrollX, 0.0f);
-        if (render_selection)
-        {
-            const ImWchar* text_selected_begin = text_begin + ImMin(state->Stb.select_start, state->Stb.select_end);
-            const ImWchar* text_selected_end = text_begin + ImMax(state->Stb.select_start, state->Stb.select_end);
-
-            ImU32 bg_color = GetColorU32(ImGuiCol_TextSelectedBg, render_cursor ? 1.0f : 0.6f);                    
-            float bg_offy_up = is_multiline ? 0.0f : -1.0f;                     
-            float bg_offy_dn = is_multiline ? 0.0f : 2.0f;
-            ImVec2 rect_pos = draw_pos + select_start_offset - draw_scroll;
-            for (const ImWchar* p = text_selected_begin; p < text_selected_end; )
-            {
-                if (rect_pos.y > clip_rect.w + g.FontSize)
-                    break;
-                if (rect_pos.y < clip_rect.y)
-                {
-                    while (p < text_selected_end)
-                        if (*p++ == '\n')
-                            break;
-                }
-                else
-                {
-                    ImVec2 rect_size = InputTextCalcTextSizeW(p, text_selected_end, &p, NULL, true);
-                    if (rect_size.x <= 0.0f) rect_size.x = IM_FLOOR(g.Font->GetCharAdvance((ImWchar)' ') * 0.50f);        
-                    ImRect rect(rect_pos + ImVec2(0.0f, bg_offy_up - g.FontSize), rect_pos + ImVec2(rect_size.x, bg_offy_dn));
-                    rect.ClipWith(clip_rect);
-                    if (rect.Overlaps(clip_rect))
-                        draw_window->DrawList->AddRectFilled(rect.Min, rect.Max, bg_color);
-                }
-                rect_pos.x = draw_pos.x - draw_scroll.x;
-                rect_pos.y += g.FontSize;
-            }
-        }
-
-        if (is_multiline || (buf_display_end - buf_display) < buf_display_max_length)
-        {
-            ImU32 col = GetColorU32(is_displaying_hint ? ImGuiCol_TextDisabled : ImGuiCol_Text);
-            draw_window->DrawList->AddText(g.Font, g.FontSize, draw_pos - draw_scroll, col, buf_display, buf_display_end, 0.0f, is_multiline ? NULL : &clip_rect);
-        }
-
-        if (render_cursor)
-        {
-            state->CursorAnim += io.DeltaTime;
-            bool cursor_is_visible = (!g.IO.ConfigInputTextCursorBlink) || (state->CursorAnim <= 0.0f) || ImFmod(state->CursorAnim, 1.20f) <= 0.80f;
-            ImVec2 cursor_screen_pos = draw_pos + cursor_offset - draw_scroll;
-            ImRect cursor_screen_rect(cursor_screen_pos.x, cursor_screen_pos.y - g.FontSize + 0.5f, cursor_screen_pos.x + 1.0f, cursor_screen_pos.y - 1.5f);
-            if (cursor_is_visible && cursor_screen_rect.Overlaps(clip_rect))
-                draw_window->DrawList->AddLine(cursor_screen_rect.Min, cursor_screen_rect.GetBL(), GetColorU32(ImGuiCol_Text));
-
-            if (!is_readonly)
-                g.PlatformImePos = ImVec2(cursor_screen_pos.x - 1.0f, cursor_screen_pos.y - g.FontSize);
-        }
-    }
-    else
-    {
-        if (is_multiline)
-            text_size = ImVec2(inner_size.x, InputTextCalcTextLenAndLineCount(buf_display, &buf_display_end) * g.FontSize);     
-        else if (!is_displaying_hint && g.ActiveId == id)
-            buf_display_end = buf_display + state->CurLenA;
-        else if (!is_displaying_hint)
-            buf_display_end = buf_display + strlen(buf_display);
-
-        if (is_multiline || (buf_display_end - buf_display) < buf_display_max_length)
-        {
-            ImU32 col = GetColorU32(is_displaying_hint ? ImGuiCol_TextDisabled : ImGuiCol_Text);
-            draw_window->DrawList->AddText(g.Font, g.FontSize, draw_pos, col, buf_display, buf_display_end, 0.0f, is_multiline ? NULL : &clip_rect);
-        }
-    }
-
-    if (is_password && !is_displaying_hint)
-        PopFont();
-
-    if (is_multiline)
-    {
-        Dummy(ImVec2(text_size.x, text_size.y + style.FramePadding.y));
-        EndChild();
-        EndGroup();
-    }
-
-    if (g.LogEnabled && (!is_password || is_displaying_hint))
-    {
-        LogSetNextTextDecoration("{", "}");
-        LogRenderedText(&draw_pos, buf_display, buf_display_end);
-    }
-
-    if (label_size.x > 0)
-        RenderText(ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y - 20.0f), label);
-    if (value_changed && !(flags & ImGuiInputTextFlags_NoMarkEdited))
-        MarkItemEdited(id);
-
-    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags);
-    if ((flags & ImGuiInputTextFlags_EnterReturnsTrue) != 0)
-        return enter_pressed;
-    else
-        return value_changed;
-}
-
-
-bool ImGui::ColorEdit3(const char* label, float col[3], ImGuiColorEditFlags flags)
-{
-    return ColorEdit4(label, col, flags | ImGuiColorEditFlags_NoAlpha);
-}
-
-
-bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const float square_sz = GetFrameHeight();
-    const float w_full = CalcItemWidth();
-    const float w_button = (flags & ImGuiColorEditFlags_NoSmallPreview) ? 0.0f : (square_sz + style.ItemInnerSpacing.x);
-    const float w_inputs = w_full - w_button;
-    const char* label_display_end = FindRenderedTextEnd(label);
-    g.NextItemData.ClearFlags();
-
-    BeginGroup();
-    PushID(label);
-
-    window->DC.CursorPos.y += 5.0f;
-
-
-    const ImGuiColorEditFlags flags_untouched = flags;
-    if (flags & ImGuiColorEditFlags_NoInputs)
-        flags = (flags & (~ImGuiColorEditFlags__DisplayMask)) | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_NoOptions;
-
-    if (!(flags & ImGuiColorEditFlags_NoOptions))
-        ColorEditOptionsPopup(col, flags);
-
-    if (!(flags & ImGuiColorEditFlags__DisplayMask))
-        flags |= (g.ColorEditOptions & ImGuiColorEditFlags__DisplayMask);
-    if (!(flags & ImGuiColorEditFlags__DataTypeMask))
-        flags |= (g.ColorEditOptions & ImGuiColorEditFlags__DataTypeMask);
-    if (!(flags & ImGuiColorEditFlags__PickerMask))
-        flags |= (g.ColorEditOptions & ImGuiColorEditFlags__PickerMask);
-    if (!(flags & ImGuiColorEditFlags__InputMask))
-        flags |= (g.ColorEditOptions & ImGuiColorEditFlags__InputMask);
-    flags |= (g.ColorEditOptions & ~(ImGuiColorEditFlags__DisplayMask | ImGuiColorEditFlags__DataTypeMask | ImGuiColorEditFlags__PickerMask | ImGuiColorEditFlags__InputMask));
-    IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__DisplayMask));       
-    IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__InputMask));         
-
-    const bool alpha = (flags & ImGuiColorEditFlags_NoAlpha) == 0;
-    const bool hdr = (flags & ImGuiColorEditFlags_HDR) != 0;
-    const int components = alpha ? 4 : 3;
-
-    float f[4] = { col[0], col[1], col[2], alpha ? col[3] : 1.0f };
-    if ((flags & ImGuiColorEditFlags_InputHSV) && (flags & ImGuiColorEditFlags_DisplayRGB))
-        ColorConvertHSVtoRGB(f[0], f[1], f[2], f[0], f[1], f[2]);
-    else if ((flags & ImGuiColorEditFlags_InputRGB) && (flags & ImGuiColorEditFlags_DisplayHSV))
-    {
-        ColorConvertRGBtoHSV(f[0], f[1], f[2], f[0], f[1], f[2]);
-        if (memcmp(g.ColorEditLastColor, col, sizeof(float) * 3) == 0)
-        {
-            if (f[1] == 0)
-                f[0] = g.ColorEditLastHue;
-            if (f[2] == 0)
-                f[1] = g.ColorEditLastSat;
-        }
-    }
-    int i[4] = { IM_F32_TO_INT8_UNBOUND(f[0]), IM_F32_TO_INT8_UNBOUND(f[1]), IM_F32_TO_INT8_UNBOUND(f[2]), IM_F32_TO_INT8_UNBOUND(f[3]) };
-
-    bool value_changed = false;
-    bool value_changed_as_float = false;
-
-    ImVec2 pos = window->DC.CursorPos;
-
-
-
-
-    const float inputs_offset_x = (style.ColorButtonPosition == ImGuiDir_Left) ? w_button : 0.0f;
-    window->DC.CursorPos.x = pos.x + inputs_offset_x;
-
-    if ((flags & (ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_DisplayHSV)) != 0 && (flags & ImGuiColorEditFlags_NoInputs) == 0)
-    {
-        const float w_item_one = ImMax(1.0f, IM_FLOOR((w_inputs - (style.ItemInnerSpacing.x) * (components - 1)) / (float)components));
-        const float w_item_last = ImMax(1.0f, IM_FLOOR(w_inputs - (w_item_one + style.ItemInnerSpacing.x) * (components - 1)));
-
-        const bool hide_prefix = (w_item_one <= CalcTextSize((flags & ImGuiColorEditFlags_Float) ? "M:0.000" : "M:000").x);
-        static const char* ids[4] = { "##X", "##Y", "##Z", "##W" };
-        static const char* fmt_table_int[3][4] =
-        {
-            {   "%3d",   "%3d",   "%3d",   "%3d" },   
-            { "R:%3d", "G:%3d", "B:%3d", "A:%3d" },     
-            { "H:%3d", "S:%3d", "V:%3d", "A:%3d" }      
-        };
-        static const char* fmt_table_float[3][4] =
-        {
-            {   "%0.3f",   "%0.3f",   "%0.3f",   "%0.3f" },   
-            { "R:%0.3f", "G:%0.3f", "B:%0.3f", "A:%0.3f" },     
-            { "H:%0.3f", "S:%0.3f", "V:%0.3f", "A:%0.3f" }      
-        };
-        const int fmt_idx = hide_prefix ? 0 : (flags & ImGuiColorEditFlags_DisplayHSV) ? 2 : 1;
-
-        for (int n = 0; n < components; n++)
-        {
-            if (n > 0)
-                SameLine(0, style.ItemInnerSpacing.x);
-            SetNextItemWidth((n + 1 < components) ? w_item_one : w_item_last);
-
-            if (flags & ImGuiColorEditFlags_Float)
-            {
-                value_changed |= DragFloat(ids[n], &f[n], 1.0f / 255.0f, 0.0f, hdr ? 0.0f : 1.0f, fmt_table_float[fmt_idx][n]);
-                value_changed_as_float |= value_changed;
-            }
-            else
-            {
-                value_changed |= DragInt(ids[n], &i[n], 1.0f, 0, hdr ? 0 : 255, fmt_table_int[fmt_idx][n]);
-            }
-            if (!(flags & ImGuiColorEditFlags_NoOptions))
-                OpenPopupOnItemClick("context");
-        }
-    }
-    else if ((flags & ImGuiColorEditFlags_DisplayHex) != 0 && (flags & ImGuiColorEditFlags_NoInputs) == 0)
-    {
-        char buf[64];
-        if (alpha)
-            ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X%02X", ImClamp(i[0], 0, 255), ImClamp(i[1], 0, 255), ImClamp(i[2], 0, 255), ImClamp(i[3], 0, 255));
-        else
-            ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X", ImClamp(i[0], 0, 255), ImClamp(i[1], 0, 255), ImClamp(i[2], 0, 255));
-        SetNextItemWidth(w_inputs);
-        if (InputText("##Text", buf, IM_ARRAYSIZE(buf), ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase))
-        {
-            value_changed = true;
-            char* p = buf;
-            while (*p == '#' || ImCharIsBlankA(*p))
-                p++;
-            i[0] = i[1] = i[2] = i[3] = 0;
-            if (alpha)
-                sscanf(p, "%02X%02X%02X%02X", (unsigned int*)&i[0], (unsigned int*)&i[1], (unsigned int*)&i[2], (unsigned int*)&i[3]);       
-            else
-                sscanf(p, "%02X%02X%02X", (unsigned int*)&i[0], (unsigned int*)&i[1], (unsigned int*)&i[2]);
-        }
-        if (!(flags & ImGuiColorEditFlags_NoOptions))
-            OpenPopupOnItemClick("context");
-    }
-    
-
-
-    ImGuiWindow* picker_active_window = NULL;
-    if (!(flags & ImGuiColorEditFlags_NoSmallPreview))
-    {
-        const float button_offset_x = ((flags & ImGuiColorEditFlags_NoInputs) || (style.ColorButtonPosition == ImGuiDir_Left)) ? 0.0f : w_inputs + style.ItemInnerSpacing.x;
-        window->DC.CursorPos = ImVec2(pos.x + button_offset_x, pos.y - 5.0f);
-
-        const ImVec4 col_v4(col[0], col[1], col[2], alpha ? col[3] : 1.0f);
-        if (ColorButton("##ColorButton", col_v4, flags))
-        {
-            if (!(flags & ImGuiColorEditFlags_NoPicker))
-            {
-                g.ColorPickerRef = col_v4;
-                OpenPopup("picker");
-                SetNextWindowPos(window->DC.LastItemRect.GetBL() + ImVec2(-1, style.ItemSpacing.y));
-            }
-        }
-        if (!(flags & ImGuiColorEditFlags_NoOptions))
-            OpenPopupOnItemClick("context");
-
-        if (BeginPopup("picker"))
-        {
-            picker_active_window = g.CurrentWindow;
-            if (label != label_display_end)
-            {
-                TextEx(label, label_display_end);
-                Spacing();
-            }
-            ImGuiColorEditFlags picker_flags_to_forward = ImGuiColorEditFlags__DataTypeMask | ImGuiColorEditFlags__PickerMask | ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaBar;
-            ImGuiColorEditFlags picker_flags = (flags_untouched & picker_flags_to_forward) | ImGuiColorEditFlags__DisplayMask | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf;
-            SetNextItemWidth(square_sz * 12.0f);      
-            value_changed |= ColorPicker4("##picker", col, picker_flags, &g.ColorPickerRef.x);
-            EndPopup();
-        }
-    }
-
-    if (label != label_display_end && !(flags & ImGuiColorEditFlags_NoLabel))
-    {
-        const float text_offset_x = (flags & ImGuiColorEditFlags_NoInputs) ? w_button : w_full + style.ItemInnerSpacing.x;
-        window->DC.CursorPos = ImVec2(pos.x + text_offset_x, pos.y + style.FramePadding.y);
-        TextEx(label, label_display_end);
-    }
-
-    if (value_changed && picker_active_window == NULL)
-    {
-        if (!value_changed_as_float)
-            for (int n = 0; n < 4; n++)
-                f[n] = i[n] / 255.0f;
-        if ((flags & ImGuiColorEditFlags_DisplayHSV) && (flags & ImGuiColorEditFlags_InputRGB))
-        {
-            g.ColorEditLastHue = f[0];
-            g.ColorEditLastSat = f[1];
-            ColorConvertHSVtoRGB(f[0], f[1], f[2], f[0], f[1], f[2]);
-            memcpy(g.ColorEditLastColor, f, sizeof(float) * 3);
-        }
-        if ((flags & ImGuiColorEditFlags_DisplayRGB) && (flags & ImGuiColorEditFlags_InputHSV))
-            ColorConvertRGBtoHSV(f[0], f[1], f[2], f[0], f[1], f[2]);
-
-        col[0] = f[0];
-        col[1] = f[1];
-        col[2] = f[2];
-        if (alpha)
-            col[3] = f[3];
-    }
-
-    PopID();
-    EndGroup();
-
-
-    if ((window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HoveredRect) && !(flags & ImGuiColorEditFlags_NoDragDrop) && BeginDragDropTarget())
-    {
-        bool accepted_drag_drop = false;
-        if (const ImGuiPayload* payload = AcceptDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_3F))
-        {
-            memcpy((float*)col, payload->Data, sizeof(float) * 3);      
-            value_changed = accepted_drag_drop = true;
-        }
-        if (const ImGuiPayload* payload = AcceptDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_4F))
-        {
-            memcpy((float*)col, payload->Data, sizeof(float) * components);
-            value_changed = accepted_drag_drop = true;
-        }
-
-        if (accepted_drag_drop && (flags & ImGuiColorEditFlags_InputHSV))
-            ColorConvertRGBtoHSV(col[0], col[1], col[2], col[0], col[1], col[2]);
-        EndDragDropTarget();
-    }
-
-    if (picker_active_window && g.ActiveId != 0 && g.ActiveIdWindow == picker_active_window)
-        window->DC.LastItemId = g.ActiveId;
-
-    if (value_changed)
-        MarkItemEdited(window->DC.LastItemId);
-
-
-    window->DC.CursorPos.y += 10.0f;
-    return value_changed;
-}
-
-
-bool ImGui::ColorPicker3(const char* label, float col[3], ImGuiColorEditFlags flags)
-{
-    float col4[4] = { col[0], col[1], col[2], 1.0f };
-    if (!ColorPicker4(label, col4, flags | ImGuiColorEditFlags_NoAlpha))
-        return false;
-    col[0] = col4[0]; col[1] = col4[1]; col[2] = col4[2];
-    return true;
-}
-
-static void RenderArrowsForVerticalBar(ImDrawList* draw_list, ImVec2 pos, ImVec2 half_sz, float bar_w, float alpha)
-{
-    ImU32 alpha8 = IM_F32_TO_INT8_SAT(alpha);
-    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + half_sz.x + 1,         pos.y), ImVec2(half_sz.x + 2, half_sz.y + 1), ImGuiDir_Right, IM_COL32(0,0,0,alpha8));
-    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + half_sz.x,             pos.y), half_sz,                              ImGuiDir_Right, IM_COL32(255,255,255,alpha8));
-    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + bar_w - half_sz.x - 1, pos.y), ImVec2(half_sz.x + 2, half_sz.y + 1), ImGuiDir_Left,  IM_COL32(0,0,0,alpha8));
-    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + bar_w - half_sz.x,     pos.y), half_sz,                              ImGuiDir_Left,  IM_COL32(255,255,255,alpha8));
-}
-
-bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags flags, const float* ref_col)   
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImDrawList* draw_list = window->DrawList;
-    ImGuiStyle& style = g.Style;
-    ImGuiIO& io = g.IO;
-
-    const float width = CalcItemWidth();
-    g.NextItemData.ClearFlags();
-
-    PushID(label);
-    BeginGroup();
-
-    if (!(flags & ImGuiColorEditFlags_NoSidePreview))
-        flags |= ImGuiColorEditFlags_NoSmallPreview;
-
-    if (!(flags & ImGuiColorEditFlags_NoOptions))
-        ColorPickerOptionsPopup(col, flags);
-
-    if (!(flags & ImGuiColorEditFlags__PickerMask))
-        flags |= ((g.ColorEditOptions & ImGuiColorEditFlags__PickerMask) ? g.ColorEditOptions : ImGuiColorEditFlags__OptionsDefault) & ImGuiColorEditFlags__PickerMask;
-    if (!(flags & ImGuiColorEditFlags__InputMask))
-        flags |= ((g.ColorEditOptions & ImGuiColorEditFlags__InputMask) ? g.ColorEditOptions : ImGuiColorEditFlags__OptionsDefault) & ImGuiColorEditFlags__InputMask;
-    IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__PickerMask));       
-    IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__InputMask));        
-    if (!(flags & ImGuiColorEditFlags_NoOptions))
-        flags |= (g.ColorEditOptions & ImGuiColorEditFlags_AlphaBar);
-
-    int components = (flags & ImGuiColorEditFlags_NoAlpha) ? 3 : 4;
-    bool alpha_bar = (flags & ImGuiColorEditFlags_AlphaBar) && !(flags & ImGuiColorEditFlags_NoAlpha);
-    ImVec2 picker_pos = window->DC.CursorPos;
-    float square_sz = GetFrameHeight();
-    float bars_width = square_sz;        
-    float sv_picker_size = ImMax(bars_width * 1, width - (alpha_bar ? 2 : 1) * (bars_width + style.ItemInnerSpacing.x));    
-    float bar0_pos_x = picker_pos.x + sv_picker_size + style.ItemInnerSpacing.x;
-    float bar1_pos_x = bar0_pos_x + bars_width + style.ItemInnerSpacing.x;
-    float bars_triangles_half_sz = IM_FLOOR(bars_width * 0.20f);
-
-    float backup_initial_col[4];
-    memcpy(backup_initial_col, col, components * sizeof(float));
-
-    float wheel_thickness = sv_picker_size * 0.08f;
-    float wheel_r_outer = sv_picker_size * 0.50f;
-    float wheel_r_inner = wheel_r_outer - wheel_thickness;
-    ImVec2 wheel_center(picker_pos.x + (sv_picker_size + bars_width)*0.5f, picker_pos.y + sv_picker_size * 0.5f);
-
-    float triangle_r = wheel_r_inner - (int)(sv_picker_size * 0.027f);
-    ImVec2 triangle_pa = ImVec2(triangle_r, 0.0f);   
-    ImVec2 triangle_pb = ImVec2(triangle_r * -0.5f, triangle_r * -0.866025f);   
-    ImVec2 triangle_pc = ImVec2(triangle_r * -0.5f, triangle_r * +0.866025f);   
-
-    float H = col[0], S = col[1], V = col[2];
-    float R = col[0], G = col[1], B = col[2];
-    if (flags & ImGuiColorEditFlags_InputRGB)
-    {
-        ColorConvertRGBtoHSV(R, G, B, H, S, V);
-        if (memcmp(g.ColorEditLastColor, col, sizeof(float) * 3) == 0)
-        {
-            if (S == 0)
-                H = g.ColorEditLastHue;
-            if (V == 0)
-                S = g.ColorEditLastSat;
-        }
-    }
-    else if (flags & ImGuiColorEditFlags_InputHSV)
-    {
-        ColorConvertHSVtoRGB(H, S, V, R, G, B);
-    }
-
-    bool value_changed = false, value_changed_h = false, value_changed_sv = false;
-
-    PushItemFlag(ImGuiItemFlags_NoNav, true);
-    if (flags & ImGuiColorEditFlags_PickerHueWheel)
-    {
-        InvisibleButton("hsv", ImVec2(sv_picker_size + style.ItemInnerSpacing.x + bars_width, sv_picker_size));
-        if (IsItemActive())
-        {
-            ImVec2 initial_off = g.IO.MouseClickedPos[0] - wheel_center;
-            ImVec2 current_off = g.IO.MousePos - wheel_center;
-            float initial_dist2 = ImLengthSqr(initial_off);
-            if (initial_dist2 >= (wheel_r_inner - 1) * (wheel_r_inner - 1) && initial_dist2 <= (wheel_r_outer + 1) * (wheel_r_outer + 1))
-            {
-                H = ImAtan2(current_off.y, current_off.x) / IM_PI * 0.5f;
-                if (H < 0.0f)
-                    H += 1.0f;
-                value_changed = value_changed_h = true;
-            }
-            float cos_hue_angle = ImCos(-H * 2.0f * IM_PI);
-            float sin_hue_angle = ImSin(-H * 2.0f * IM_PI);
-            if (ImTriangleContainsPoint(triangle_pa, triangle_pb, triangle_pc, ImRotate(initial_off, cos_hue_angle, sin_hue_angle)))
-            {
-                ImVec2 current_off_unrotated = ImRotate(current_off, cos_hue_angle, sin_hue_angle);
-                if (!ImTriangleContainsPoint(triangle_pa, triangle_pb, triangle_pc, current_off_unrotated))
-                    current_off_unrotated = ImTriangleClosestPoint(triangle_pa, triangle_pb, triangle_pc, current_off_unrotated);
-                float uu, vv, ww;
-                ImTriangleBarycentricCoords(triangle_pa, triangle_pb, triangle_pc, current_off_unrotated, uu, vv, ww);
-                V = ImClamp(1.0f - vv, 0.0001f, 1.0f);
-                S = ImClamp(uu / V, 0.0001f, 1.0f);
-                value_changed = value_changed_sv = true;
-            }
-        }
-        if (!(flags & ImGuiColorEditFlags_NoOptions))
-            OpenPopupOnItemClick("context");
-    }
-    else if (flags & ImGuiColorEditFlags_PickerHueBar)
-    {
-        InvisibleButton("sv", ImVec2(sv_picker_size, sv_picker_size));
-        if (IsItemActive())
-        {
-            S = ImSaturate((io.MousePos.x - picker_pos.x) / (sv_picker_size - 1));
-            V = 1.0f - ImSaturate((io.MousePos.y - picker_pos.y) / (sv_picker_size - 1));
-            value_changed = value_changed_sv = true;
-        }
-        if (!(flags & ImGuiColorEditFlags_NoOptions))
-            OpenPopupOnItemClick("context");
-
-        SetCursorScreenPos(ImVec2(bar0_pos_x, picker_pos.y));
-        InvisibleButton("hue", ImVec2(bars_width, sv_picker_size));
-        if (IsItemActive())
-        {
-            H = ImSaturate((io.MousePos.y - picker_pos.y) / (sv_picker_size - 1));
-            value_changed = value_changed_h = true;
-        }
-    }
-    
-    if (alpha_bar)
-    {
-        SetCursorScreenPos(ImVec2(bar1_pos_x, picker_pos.y));
-        InvisibleButton("alpha", ImVec2(bars_width, sv_picker_size));
-        if (IsItemActive())
-        {
-            col[3] = 1.0f - ImSaturate((io.MousePos.y - picker_pos.y) / (sv_picker_size - 1));
-            value_changed = true;
-        }
-    }
-    PopItemFlag();  
-
-    if (!(flags & ImGuiColorEditFlags_NoSidePreview))
-    {
-        SameLine(0, style.ItemInnerSpacing.x);
-        BeginGroup();
-    }
-
-    if (!(flags & ImGuiColorEditFlags_NoLabel))
-    {
-        const char* label_display_end = FindRenderedTextEnd(label);
-        if (label != label_display_end)
-        {
-            if ((flags & ImGuiColorEditFlags_NoSidePreview))
-                SameLine(0, style.ItemInnerSpacing.x);
-            TextEx(label, label_display_end);
-        }
-    }
-
-    if (!(flags & ImGuiColorEditFlags_NoSidePreview))
-    {
-        PushItemFlag(ImGuiItemFlags_NoNavDefaultFocus, true);
-        ImVec4 col_v4(col[0], col[1], col[2], (flags & ImGuiColorEditFlags_NoAlpha) ? 1.0f : col[3]);
-        if ((flags & ImGuiColorEditFlags_NoLabel))
-            Text("Current");
-
-        ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf | ImGuiColorEditFlags_NoTooltip;
-        ColorButton("##current", col_v4, (flags & sub_flags_to_forward), ImVec2(square_sz * 3, square_sz * 2));
-        if (ref_col != NULL)
-        {
-            Text("Original");
-            ImVec4 ref_col_v4(ref_col[0], ref_col[1], ref_col[2], (flags & ImGuiColorEditFlags_NoAlpha) ? 1.0f : ref_col[3]);
-            if (ColorButton("##original", ref_col_v4, (flags & sub_flags_to_forward), ImVec2(square_sz * 3, square_sz * 2)))
-            {
-                memcpy(col, ref_col, components * sizeof(float));
-                value_changed = true;
-            }
-        }
-        PopItemFlag();
-        EndGroup();
-    }
-
-    if (value_changed_h || value_changed_sv)
-    {
-        if (flags & ImGuiColorEditFlags_InputRGB)
-        {
-            ColorConvertHSVtoRGB(H >= 1.0f ? H - 10 * 1e-6f : H, S > 0.0f ? S : 10 * 1e-6f, V > 0.0f ? V : 1e-6f, col[0], col[1], col[2]);
-            g.ColorEditLastHue = H;
-            g.ColorEditLastSat = S;
-            memcpy(g.ColorEditLastColor, col, sizeof(float) * 3);
-        }
-        else if (flags & ImGuiColorEditFlags_InputHSV)
-        {
-            col[0] = H;
-            col[1] = S;
-            col[2] = V;
-        }
-    }
-
-    bool value_changed_fix_hue_wrap = false;
-    if ((flags & ImGuiColorEditFlags_NoInputs) == 0)
-    {
-        PushItemWidth((alpha_bar ? bar1_pos_x : bar0_pos_x) + bars_width - picker_pos.x);
-        ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags__DataTypeMask | ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoOptions | ImGuiColorEditFlags_NoSmallPreview | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf;
-        ImGuiColorEditFlags sub_flags = (flags & sub_flags_to_forward) | ImGuiColorEditFlags_NoPicker;
-        if (flags & ImGuiColorEditFlags_DisplayRGB || (flags & ImGuiColorEditFlags__DisplayMask) == 0)
-            if (ColorEdit4("##rgb", col, sub_flags | ImGuiColorEditFlags_DisplayRGB))
-            {
-                value_changed_fix_hue_wrap = (g.ActiveId != 0 && !g.ActiveIdAllowOverlap);
-                value_changed = true;
-            }
-        if (flags & ImGuiColorEditFlags_DisplayHSV || (flags & ImGuiColorEditFlags__DisplayMask) == 0)
-            value_changed |= ColorEdit4("##hsv", col, sub_flags | ImGuiColorEditFlags_DisplayHSV);
-        if (flags & ImGuiColorEditFlags_DisplayHex || (flags & ImGuiColorEditFlags__DisplayMask) == 0)
-            value_changed |= ColorEdit4("##hex", col, sub_flags | ImGuiColorEditFlags_DisplayHex);
-        PopItemWidth();
-    }
-
-    if (value_changed_fix_hue_wrap && (flags & ImGuiColorEditFlags_InputRGB))
-    {
-        float new_H, new_S, new_V;
-        ColorConvertRGBtoHSV(col[0], col[1], col[2], new_H, new_S, new_V);
-        if (new_H <= 0 && H > 0)
-        {
-            if (new_V <= 0 && V != new_V)
-                ColorConvertHSVtoRGB(H, S, new_V <= 0 ? V * 0.5f : new_V, col[0], col[1], col[2]);
-            else if (new_S <= 0)
-                ColorConvertHSVtoRGB(H, new_S <= 0 ? S * 0.5f : new_S, new_V, col[0], col[1], col[2]);
-        }
-    }
-
-    if (value_changed)
-    {
-        if (flags & ImGuiColorEditFlags_InputRGB)
-        {
-            R = col[0];
-            G = col[1];
-            B = col[2];
-            ColorConvertRGBtoHSV(R, G, B, H, S, V);
-            if (memcmp(g.ColorEditLastColor, col, sizeof(float) * 3) == 0)           
-            {
-                if (S == 0)
-                    H = g.ColorEditLastHue;
-                if (V == 0)
-                    S = g.ColorEditLastSat;
-            }
-        }
-        else if (flags & ImGuiColorEditFlags_InputHSV)
-        {
-            H = col[0];
-            S = col[1];
-            V = col[2];
-            ColorConvertHSVtoRGB(H, S, V, R, G, B);
-        }
-    }
-
-    const int style_alpha8 = IM_F32_TO_INT8_SAT(style.Alpha);
-    const ImU32 col_black = IM_COL32(0,0,0,style_alpha8);
-    const ImU32 col_white = IM_COL32(255,255,255,style_alpha8);
-    const ImU32 col_midgrey = IM_COL32(128,128,128,style_alpha8);
-    const ImU32 col_hues[6 + 1] = { IM_COL32(255,0,0,style_alpha8), IM_COL32(255,255,0,style_alpha8), IM_COL32(0,255,0,style_alpha8), IM_COL32(0,255,255,style_alpha8), IM_COL32(0,0,255,style_alpha8), IM_COL32(255,0,255,style_alpha8), IM_COL32(255,0,0,style_alpha8) };
-
-    ImVec4 hue_color_f(1, 1, 1, style.Alpha); ColorConvertHSVtoRGB(H, 1, 1, hue_color_f.x, hue_color_f.y, hue_color_f.z);
-    ImU32 hue_color32 = ColorConvertFloat4ToU32(hue_color_f);
-    ImU32 user_col32_striped_of_alpha = ColorConvertFloat4ToU32(ImVec4(R, G, B, style.Alpha));          
-
-    ImVec2 sv_cursor_pos;
-
-    if (flags & ImGuiColorEditFlags_PickerHueWheel)
-    {
-        const float aeps = 0.5f / wheel_r_outer;           
-        const int segment_per_arc = ImMax(4, (int)wheel_r_outer / 12);
-        for (int n = 0; n < 6; n++)
-        {
-            const float a0 = (n)     /6.0f * 2.0f * IM_PI - aeps;
-            const float a1 = (n+1.0f)/6.0f * 2.0f * IM_PI + aeps;
-            const int vert_start_idx = draw_list->VtxBuffer.Size;
-            draw_list->PathArcTo(wheel_center, (wheel_r_inner + wheel_r_outer)*0.5f, a0, a1, segment_per_arc);
-            draw_list->PathStroke(col_white, false, wheel_thickness);
-            const int vert_end_idx = draw_list->VtxBuffer.Size;
-
-            ImVec2 gradient_p0(wheel_center.x + ImCos(a0) * wheel_r_inner, wheel_center.y + ImSin(a0) * wheel_r_inner);
-            ImVec2 gradient_p1(wheel_center.x + ImCos(a1) * wheel_r_inner, wheel_center.y + ImSin(a1) * wheel_r_inner);
-            ShadeVertsLinearColorGradientKeepAlpha(draw_list, vert_start_idx, vert_end_idx, gradient_p0, gradient_p1, col_hues[n], col_hues[n + 1]);
-        }
-
-        float cos_hue_angle = ImCos(H * 2.0f * IM_PI);
-        float sin_hue_angle = ImSin(H * 2.0f * IM_PI);
-        ImVec2 hue_cursor_pos(wheel_center.x + cos_hue_angle * (wheel_r_inner + wheel_r_outer) * 0.5f, wheel_center.y + sin_hue_angle * (wheel_r_inner + wheel_r_outer) * 0.5f);
-        float hue_cursor_rad = value_changed_h ? wheel_thickness * 0.65f : wheel_thickness * 0.55f;
-        int hue_cursor_segments = ImClamp((int)(hue_cursor_rad / 1.4f), 9, 32);
-        draw_list->AddCircleFilled(hue_cursor_pos, hue_cursor_rad, hue_color32, hue_cursor_segments);
-        draw_list->AddCircle(hue_cursor_pos, hue_cursor_rad + 1, col_midgrey, hue_cursor_segments);
-        draw_list->AddCircle(hue_cursor_pos, hue_cursor_rad, col_white, hue_cursor_segments);
-
-        ImVec2 tra = wheel_center + ImRotate(triangle_pa, cos_hue_angle, sin_hue_angle);
-        ImVec2 trb = wheel_center + ImRotate(triangle_pb, cos_hue_angle, sin_hue_angle);
-        ImVec2 trc = wheel_center + ImRotate(triangle_pc, cos_hue_angle, sin_hue_angle);
-        ImVec2 uv_white = GetFontTexUvWhitePixel();
-        draw_list->PrimReserve(6, 6);
-        draw_list->PrimVtx(tra, uv_white, hue_color32);
-        draw_list->PrimVtx(trb, uv_white, hue_color32);
-        draw_list->PrimVtx(trc, uv_white, col_white);
-        draw_list->PrimVtx(tra, uv_white, 0);
-        draw_list->PrimVtx(trb, uv_white, col_black);
-        draw_list->PrimVtx(trc, uv_white, 0);
-        draw_list->AddTriangle(tra, trb, trc, col_midgrey, 1.5f);
-        sv_cursor_pos = ImLerp(ImLerp(trc, tra, ImSaturate(S)), trb, ImSaturate(1 - V));
-    }
-    else if (flags & ImGuiColorEditFlags_PickerHueBar)
-    {
-        draw_list->AddRectFilledMultiColor(picker_pos, picker_pos + ImVec2(sv_picker_size, sv_picker_size), col_white, hue_color32, hue_color32, col_white);
-        draw_list->AddRectFilledMultiColor(picker_pos, picker_pos + ImVec2(sv_picker_size, sv_picker_size), 0, 0, col_black, col_black);
-        RenderFrameBorder(picker_pos, picker_pos + ImVec2(sv_picker_size, sv_picker_size), 0.0f);
-        sv_cursor_pos.x = ImClamp(IM_ROUND(picker_pos.x + ImSaturate(S)     * sv_picker_size), picker_pos.x + 2, picker_pos.x + sv_picker_size - 2);          
-        sv_cursor_pos.y = ImClamp(IM_ROUND(picker_pos.y + ImSaturate(1 - V) * sv_picker_size), picker_pos.y + 2, picker_pos.y + sv_picker_size - 2);
-
-        for (int i = 0; i < 6; ++i)
-            draw_list->AddRectFilledMultiColor(ImVec2(bar0_pos_x, picker_pos.y + i * (sv_picker_size / 6)), ImVec2(bar0_pos_x + bars_width, picker_pos.y + (i + 1) * (sv_picker_size / 6)), col_hues[i], col_hues[i], col_hues[i + 1], col_hues[i + 1]);
-        float bar0_line_y = IM_ROUND(picker_pos.y + H * sv_picker_size);
-        RenderFrameBorder(ImVec2(bar0_pos_x, picker_pos.y), ImVec2(bar0_pos_x + bars_width, picker_pos.y + sv_picker_size), 0.0f);
-        RenderArrowsForVerticalBar(draw_list, ImVec2(bar0_pos_x - 1, bar0_line_y), ImVec2(bars_triangles_half_sz + 1, bars_triangles_half_sz), bars_width + 2.0f, style.Alpha);
-    }
-    
-    float sv_cursor_rad = value_changed_sv ? 10.0f : 6.0f;
-    draw_list->AddCircleFilled(sv_cursor_pos, sv_cursor_rad, user_col32_striped_of_alpha, 12);
-    draw_list->AddCircle(sv_cursor_pos, sv_cursor_rad + 1, col_midgrey, 12);
-    draw_list->AddCircle(sv_cursor_pos, sv_cursor_rad, col_white, 12);
-
-    if (alpha_bar)
-    {
-        float alpha = ImSaturate(col[3]);
-        ImRect bar1_bb(bar1_pos_x, picker_pos.y, bar1_pos_x + bars_width, picker_pos.y + sv_picker_size);
-        RenderColorRectWithAlphaCheckerboard(draw_list, bar1_bb.Min, bar1_bb.Max, 0, bar1_bb.GetWidth() / 2.0f, ImVec2(0.0f, 0.0f));
-        draw_list->AddRectFilledMultiColor(bar1_bb.Min, bar1_bb.Max, user_col32_striped_of_alpha, user_col32_striped_of_alpha, user_col32_striped_of_alpha & ~IM_COL32_A_MASK, user_col32_striped_of_alpha & ~IM_COL32_A_MASK);
-        float bar1_line_y = IM_ROUND(picker_pos.y + (1.0f - alpha) * sv_picker_size);
-        RenderFrameBorder(bar1_bb.Min, bar1_bb.Max, 0.0f);
-        RenderArrowsForVerticalBar(draw_list, ImVec2(bar1_pos_x - 1, bar1_line_y), ImVec2(bars_triangles_half_sz + 1, bars_triangles_half_sz), bars_width + 2.0f, style.Alpha);
-    }
-
-    EndGroup();
-
-    if (value_changed && memcmp(backup_initial_col, col, components * sizeof(float)) == 0)
-        value_changed = false;
-    if (value_changed)
-        MarkItemEdited(window->DC.LastItemId);
-        
-    PopID();
-
-    return value_changed;
-}
-
-
-bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFlags flags, ImVec2 size)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiID id = window->GetID(desc_id);
-    float default_size = GetFrameHeight();
-    if (size.x == 0.0f)
-        size.x = default_size;
-    if (size.y == 0.0f)
-        size.y = default_size;
-    const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
-    ItemSize(bb, (size.y >= default_size) ? g.Style.FramePadding.y : 0.0f);
-    if (!ItemAdd(bb, id))
-        return false;
-
-    
-
-    bool hovered, held;
-    bool pressed = ButtonBehavior(bb, id, &hovered, &held);
-
-    if (flags & ImGuiColorEditFlags_NoAlpha)
-        flags &= ~(ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf);
-
-    ImVec4 col_rgb = col;
-    if (flags & ImGuiColorEditFlags_InputHSV)
-        ColorConvertHSVtoRGB(col_rgb.x, col_rgb.y, col_rgb.z, col_rgb.x, col_rgb.y, col_rgb.z);
-
-    ImVec4 col_rgb_without_alpha(col_rgb.x, col_rgb.y, col_rgb.z, 1.0f);
-    float grid_step = ImMin(size.x, size.y) / 2.99f;
-    float rounding = ImMin(g.Style.FrameRounding, grid_step * 0.5f);
-    ImRect bb_inner = bb;
-    float off = 0.0f;
-    if ((flags & ImGuiColorEditFlags_NoBorder) == 0)
-    {
-        off = -0.75f;                             
-        bb_inner.Expand(off);
-    }
-
-    RenderFrame(bb_inner.Min - ImVec2(1, 1), bb_inner.Max - ImVec2(0, 0), colWhite, true, 0);
-    RenderFrame(bb_inner.Min + ImVec2(0, 0), bb_inner.Max + ImVec2(1, 1), colBlack, true, 0);
-    if ((flags & ImGuiColorEditFlags_AlphaPreviewHalf) && col_rgb.w < 1.0f)
-    {
-        float mid_x = IM_ROUND((bb_inner.Min.x + bb_inner.Max.x) * 0.5f);
-        RenderColorRectWithAlphaCheckerboard(window->DrawList, ImVec2(bb_inner.Min.x + grid_step, bb_inner.Min.y), bb_inner.Max, GetColorU32(col_rgb), grid_step, ImVec2(-grid_step + off, off), rounding, ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight);
-        window->DrawList->AddRectFilled(bb_inner.Min, ImVec2(mid_x, bb_inner.Max.y), GetColorU32(col_rgb_without_alpha), rounding, ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft);
-    }
-    else
-    {
-        ImVec4 col_source = (flags & ImGuiColorEditFlags_AlphaPreview) ? col_rgb : col_rgb_without_alpha;
-        if (col_source.w < 1.0f)
-            RenderColorRectWithAlphaCheckerboard(window->DrawList, bb_inner.Min, bb_inner.Max, GetColorU32(col_source), grid_step, ImVec2(off, off), rounding);
-        else
-            window->DrawList->AddRectFilled(bb_inner.Min, bb_inner.Max, GetColorU32(col_source), rounding, ImDrawCornerFlags_All);
-    }
-    RenderNavHighlight(bb, id);
-
-   
-
-    if (g.ActiveId == id && !(flags & ImGuiColorEditFlags_NoDragDrop) && BeginDragDropSource())
-    {
-        if (flags & ImGuiColorEditFlags_NoAlpha)
-            SetDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_3F, &col_rgb, sizeof(float) * 3, ImGuiCond_Once);
-        else
-            SetDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_4F, &col_rgb, sizeof(float) * 4, ImGuiCond_Once);
-        ColorButton(desc_id, col, flags);
-        SameLine();
-        TextEx("Color");
-        EndDragDropSource();
-    }
-
-    if (!(flags & ImGuiColorEditFlags_NoTooltip) && hovered)
-        ColorTooltip(desc_id, &col.x, flags & (ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf));
-
-    return pressed;
-}
-
-void ImGui::SetColorEditOptions(ImGuiColorEditFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    if ((flags & ImGuiColorEditFlags__DisplayMask) == 0)
-        flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__DisplayMask;
-    if ((flags & ImGuiColorEditFlags__DataTypeMask) == 0)
-        flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__DataTypeMask;
-    if ((flags & ImGuiColorEditFlags__PickerMask) == 0)
-        flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__PickerMask;
-    if ((flags & ImGuiColorEditFlags__InputMask) == 0)
-        flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__InputMask;
-    IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__DisplayMask));          
-    IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__DataTypeMask));         
-    IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__PickerMask));           
-    IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__InputMask));            
-    g.ColorEditOptions = flags;
-}
-
-void ImGui::ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-
-    BeginTooltipEx(0, ImGuiTooltipFlags_OverridePreviousTooltip);
-    const char* text_end = text ? FindRenderedTextEnd(text, NULL) : text;
-    if (text_end > text)
-    {
-        TextEx(text, text_end);
-        Separator();
-    }
-
-    ImVec2 sz(g.FontSize * 3 + g.Style.FramePadding.y * 2, g.FontSize * 3 + g.Style.FramePadding.y * 2);
-    ImVec4 cf(col[0], col[1], col[2], (flags & ImGuiColorEditFlags_NoAlpha) ? 1.0f : col[3]);
-    int cr = IM_F32_TO_INT8_SAT(col[0]), cg = IM_F32_TO_INT8_SAT(col[1]), cb = IM_F32_TO_INT8_SAT(col[2]), ca = (flags & ImGuiColorEditFlags_NoAlpha) ? 255 : IM_F32_TO_INT8_SAT(col[3]);
-    ColorButton("##preview", cf, (flags & (ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf)) | ImGuiColorEditFlags_NoTooltip, sz);
-    SameLine();
-    if ((flags & ImGuiColorEditFlags_InputRGB) || !(flags & ImGuiColorEditFlags__InputMask))
-    {
-        if (flags & ImGuiColorEditFlags_NoAlpha)
-            Text("#%02X%02X%02X\nR: %d, G: %d, B: %d\n(%.3f, %.3f, %.3f)", cr, cg, cb, cr, cg, cb, col[0], col[1], col[2]);
-        else
-            Text("#%02X%02X%02X%02X\nR:%d, G:%d, B:%d, A:%d\n(%.3f, %.3f, %.3f, %.3f)", cr, cg, cb, ca, cr, cg, cb, ca, col[0], col[1], col[2], col[3]);
-    }
-    else if (flags & ImGuiColorEditFlags_InputHSV)
-    {
-        if (flags & ImGuiColorEditFlags_NoAlpha)
-            Text("H: %.3f, S: %.3f, V: %.3f", col[0], col[1], col[2]);
-        else
-            Text("H: %.3f, S: %.3f, V: %.3f, A: %.3f", col[0], col[1], col[2], col[3]);
-    }
-    EndTooltip();
-}
-
-void ImGui::ColorEditOptionsPopup(const float* col, ImGuiColorEditFlags flags)
-{
-    bool allow_opt_inputs = !(flags & ImGuiColorEditFlags__DisplayMask);
-    bool allow_opt_datatype = !(flags & ImGuiColorEditFlags__DataTypeMask);
-    if ((!allow_opt_inputs && !allow_opt_datatype) || !BeginPopup("context"))
-        return;
-    ImGuiContext& g = *GImGui;
-    ImGuiColorEditFlags opts = g.ColorEditOptions;
-    if (allow_opt_inputs)
-    {
-        if (RadioButton("RGB", (opts & ImGuiColorEditFlags_DisplayRGB) != 0)) opts = (opts & ~ImGuiColorEditFlags__DisplayMask) | ImGuiColorEditFlags_DisplayRGB;
-        if (RadioButton("HSV", (opts & ImGuiColorEditFlags_DisplayHSV) != 0)) opts = (opts & ~ImGuiColorEditFlags__DisplayMask) | ImGuiColorEditFlags_DisplayHSV;
-        if (RadioButton("Hex", (opts & ImGuiColorEditFlags_DisplayHex) != 0)) opts = (opts & ~ImGuiColorEditFlags__DisplayMask) | ImGuiColorEditFlags_DisplayHex;
-    }
-    if (allow_opt_datatype)
-    {
-        if (allow_opt_inputs) Separator();
-        if (RadioButton("0..255",     (opts & ImGuiColorEditFlags_Uint8) != 0)) opts = (opts & ~ImGuiColorEditFlags__DataTypeMask) | ImGuiColorEditFlags_Uint8;
-        if (RadioButton("0.00..1.00", (opts & ImGuiColorEditFlags_Float) != 0)) opts = (opts & ~ImGuiColorEditFlags__DataTypeMask) | ImGuiColorEditFlags_Float;
-    }
-
-    if (allow_opt_inputs || allow_opt_datatype)
-        Separator();
-    if (Button("Copy as..", ImVec2(-1, 0)))
-        OpenPopup("Copy");
-    if (BeginPopup("Copy"))
-    {
-        int cr = IM_F32_TO_INT8_SAT(col[0]), cg = IM_F32_TO_INT8_SAT(col[1]), cb = IM_F32_TO_INT8_SAT(col[2]), ca = (flags & ImGuiColorEditFlags_NoAlpha) ? 255 : IM_F32_TO_INT8_SAT(col[3]);
-        char buf[64];
-        ImFormatString(buf, IM_ARRAYSIZE(buf), "(%.3ff, %.3ff, %.3ff, %.3ff)", col[0], col[1], col[2], (flags & ImGuiColorEditFlags_NoAlpha) ? 1.0f : col[3]);
-        if (Selectable(buf))
-            SetClipboardText(buf);
-        ImFormatString(buf, IM_ARRAYSIZE(buf), "(%d,%d,%d,%d)", cr, cg, cb, ca);
-        if (Selectable(buf))
-            SetClipboardText(buf);
-        ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X", cr, cg, cb);
-        if (Selectable(buf))
-            SetClipboardText(buf);
-        if (!(flags & ImGuiColorEditFlags_NoAlpha))
-        {
-            ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X%02X", cr, cg, cb, ca);
-            if (Selectable(buf))
-                SetClipboardText(buf);
-        }
-        EndPopup();
-    }
-
-    g.ColorEditOptions = opts;
-    EndPopup();
-}
-
-void ImGui::ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags flags)
-{
-    bool allow_opt_picker = !(flags & ImGuiColorEditFlags__PickerMask);
-    bool allow_opt_alpha_bar = !(flags & ImGuiColorEditFlags_NoAlpha) && !(flags & ImGuiColorEditFlags_AlphaBar);
-    if ((!allow_opt_picker && !allow_opt_alpha_bar) || !BeginPopup("context"))
-        return;
-    ImGuiContext& g = *GImGui;
-    if (allow_opt_picker)
-    {
-        ImVec2 picker_size(g.FontSize * 8, ImMax(g.FontSize * 8 - (GetFrameHeight() + g.Style.ItemInnerSpacing.x), 1.0f));         
-        PushItemWidth(picker_size.x);
-        for (int picker_type = 0; picker_type < 2; picker_type++)
-        {
-            if (picker_type > 0) Separator();
-            PushID(picker_type);
-            ImGuiColorEditFlags picker_flags = ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoOptions | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_NoSidePreview | (flags & ImGuiColorEditFlags_NoAlpha);
-            if (picker_type == 0) picker_flags |= ImGuiColorEditFlags_PickerHueBar;
-            if (picker_type == 1) picker_flags |= ImGuiColorEditFlags_PickerHueWheel;
-            ImVec2 backup_pos = GetCursorScreenPos();
-            if (Selectable("##selectable", false, 0, picker_size))       
-                g.ColorEditOptions = (g.ColorEditOptions & ~ImGuiColorEditFlags__PickerMask) | (picker_flags & ImGuiColorEditFlags__PickerMask);
-            SetCursorScreenPos(backup_pos);
-            ImVec4 previewing_ref_col;
-            memcpy(&previewing_ref_col, ref_col, sizeof(float) * ((picker_flags & ImGuiColorEditFlags_NoAlpha) ? 3 : 4));
-            ColorPicker4("##previewing_picker", &previewing_ref_col.x, picker_flags);
-            PopID();
-        }
-        PopItemWidth();
-    }
-    if (allow_opt_alpha_bar)
-    {
-        if (allow_opt_picker) Separator();
-        CheckboxFlags("Alpha Bar", &g.ColorEditOptions, ImGuiColorEditFlags_AlphaBar);
-    }
-    EndPopup();
-}
-
-bool ImGui::TreeNode(const char* str_id, const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    bool is_open = TreeNodeExV(str_id, 0, fmt, args);
-    va_end(args);
-    return is_open;
-}
-
-bool ImGui::TreeNode(const void* ptr_id, const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    bool is_open = TreeNodeExV(ptr_id, 0, fmt, args);
-    va_end(args);
-    return is_open;
-}
-
-bool ImGui::TreeNode(const char* label)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-    return TreeNodeBehavior(window->GetID(label), 0, label, NULL);
-}
-
-bool ImGui::TreeNodeV(const char* str_id, const char* fmt, va_list args)
-{
-    return TreeNodeExV(str_id, 0, fmt, args);
-}
-
-bool ImGui::TreeNodeV(const void* ptr_id, const char* fmt, va_list args)
-{
-    return TreeNodeExV(ptr_id, 0, fmt, args);
-}
-
-bool ImGui::TreeNodeEx(const char* label, ImGuiTreeNodeFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    return TreeNodeBehavior(window->GetID(label), flags, label, NULL);
-}
-
-bool ImGui::TreeNodeEx(const char* str_id, ImGuiTreeNodeFlags flags, const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    bool is_open = TreeNodeExV(str_id, flags, fmt, args);
-    va_end(args);
-    return is_open;
-}
-
-bool ImGui::TreeNodeEx(const void* ptr_id, ImGuiTreeNodeFlags flags, const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    bool is_open = TreeNodeExV(ptr_id, flags, fmt, args);
-    va_end(args);
-    return is_open;
-}
-
-bool ImGui::TreeNodeExV(const char* str_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const char* label_end = g.TempBuffer + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args);
-    return TreeNodeBehavior(window->GetID(str_id), flags, g.TempBuffer, label_end);
-}
-
-bool ImGui::TreeNodeExV(const void* ptr_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const char* label_end = g.TempBuffer + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args);
-    return TreeNodeBehavior(window->GetID(ptr_id), flags, g.TempBuffer, label_end);
-}
-
-bool ImGui::TreeNodeBehaviorIsOpen(ImGuiID id, ImGuiTreeNodeFlags flags)
-{
-    if (flags & ImGuiTreeNodeFlags_Leaf)
-        return true;
-
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiStorage* storage = window->DC.StateStorage;
-
-    bool is_open;
-    if (g.NextItemData.Flags & ImGuiNextItemDataFlags_HasOpen)
-    {
-        if (g.NextItemData.OpenCond & ImGuiCond_Always)
-        {
-            is_open = g.NextItemData.OpenVal;
-            storage->SetInt(id, is_open);
-        }
-        else
-        {
-            const int stored_value = storage->GetInt(id, -1);
-            if (stored_value == -1)
-            {
-                is_open = g.NextItemData.OpenVal;
-                storage->SetInt(id, is_open);
-            }
-            else
-            {
-                is_open = stored_value != 0;
-            }
-        }
-    }
-    else
-    {
-        is_open = storage->GetInt(id, (flags & ImGuiTreeNodeFlags_DefaultOpen) ? 1 : 0) != 0;
-    }
-
-    if (g.LogEnabled && !(flags & ImGuiTreeNodeFlags_NoAutoOpenOnLog) && (window->DC.TreeDepth - g.LogDepthRef) < g.LogDepthToExpand)
-        is_open = true;
-
-    return is_open;
-}
-
-bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* label, const char* label_end)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const bool display_frame = (flags & ImGuiTreeNodeFlags_Framed) != 0;
-    const ImVec2 padding = (display_frame || (flags & ImGuiTreeNodeFlags_FramePadding)) ? style.FramePadding : ImVec2(style.FramePadding.x, ImMin(window->DC.CurrLineTextBaseOffset, style.FramePadding.y));
-
-    if (!label_end)
-        label_end = FindRenderedTextEnd(label);
-    const ImVec2 label_size = CalcTextSize(label, label_end, false);
-
-    const float frame_height = ImMax(ImMin(window->DC.CurrLineSize.y, g.FontSize + style.FramePadding.y * 2), label_size.y + padding.y * 2);
-    ImRect frame_bb;
-    frame_bb.Min.x = (flags & ImGuiTreeNodeFlags_SpanFullWidth) ? window->WorkRect.Min.x : window->DC.CursorPos.x;
-    frame_bb.Min.y = window->DC.CursorPos.y;
-    frame_bb.Max.x = window->WorkRect.Max.x;
-    frame_bb.Max.y = window->DC.CursorPos.y + frame_height;
-    if (display_frame)
-    {
-        frame_bb.Min.x -= IM_FLOOR(window->WindowPadding.x * 0.5f - 1.0f);
-        frame_bb.Max.x += IM_FLOOR(window->WindowPadding.x * 0.5f);
-    }
-
-    const float text_offset_x = g.FontSize + (display_frame ? padding.x * 3 : padding.x * 2);                
-    const float text_offset_y = ImMax(padding.y, window->DC.CurrLineTextBaseOffset);                         
-    const float text_width = g.FontSize + (label_size.x > 0.0f ? label_size.x + padding.x * 2 : 0.0f);    
-    ImVec2 text_pos(window->DC.CursorPos.x + text_offset_x, window->DC.CursorPos.y + text_offset_y);
-    ItemSize(ImVec2(text_width, frame_height), padding.y);
-
-    ImRect interact_bb = frame_bb;
-    if (!display_frame && (flags & (ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_SpanFullWidth)) == 0)
-        interact_bb.Max.x = frame_bb.Min.x + text_width + style.ItemSpacing.x * 2.0f;
-
-    const bool is_leaf = (flags & ImGuiTreeNodeFlags_Leaf) != 0;
-    bool is_open = TreeNodeBehaviorIsOpen(id, flags);
-    if (is_open && !g.NavIdIsAlive && (flags & ImGuiTreeNodeFlags_NavLeftJumpsBackHere) && !(flags & ImGuiTreeNodeFlags_NoTreePushOnOpen))
-        window->DC.TreeJumpToParentOnPopMask |= (1 << window->DC.TreeDepth);
-
-    bool item_add = ItemAdd(interact_bb, id);
-    window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_HasDisplayRect;
-    window->DC.LastItemDisplayRect = frame_bb;
-
-    if (!item_add)
-    {
-        if (is_open && !(flags & ImGuiTreeNodeFlags_NoTreePushOnOpen))
-            TreePushOverrideID(id);
-        IMGUI_TEST_ENGINE_ITEM_INFO(window->DC.LastItemId, label, window->DC.ItemFlags | (is_leaf ? 0 : ImGuiItemStatusFlags_Openable) | (is_open ? ImGuiItemStatusFlags_Opened : 0));
-        return is_open;
-    }
-
-    ImGuiButtonFlags button_flags = ImGuiTreeNodeFlags_None;
-    if (flags & ImGuiTreeNodeFlags_AllowItemOverlap)
-        button_flags |= ImGuiButtonFlags_AllowItemOverlap;
-    if (!is_leaf)
-        button_flags |= ImGuiButtonFlags_PressedOnDragDropHold;
-
-    const float arrow_hit_x1 = (text_pos.x - text_offset_x) - style.TouchExtraPadding.x;
-    const float arrow_hit_x2 = (text_pos.x - text_offset_x) + (g.FontSize + padding.x * 2.0f) + style.TouchExtraPadding.x;
-    const bool is_mouse_x_over_arrow = (g.IO.MousePos.x >= arrow_hit_x1 && g.IO.MousePos.x < arrow_hit_x2);
-    if (window != g.HoveredWindow || !is_mouse_x_over_arrow)
-        button_flags |= ImGuiButtonFlags_NoKeyModifiers;
-
-    if (is_mouse_x_over_arrow)
-        button_flags |= ImGuiButtonFlags_PressedOnClick;
-    else if (flags & ImGuiTreeNodeFlags_OpenOnDoubleClick)
-        button_flags |= ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnDoubleClick;
-    else
-        button_flags |= ImGuiButtonFlags_PressedOnClickRelease;
-
-    bool selected = (flags & ImGuiTreeNodeFlags_Selected) != 0;
-    const bool was_selected = selected;
-
-    bool hovered, held;
-    bool pressed = ButtonBehavior(interact_bb, id, &hovered, &held, button_flags);
-    bool toggled = false;
-    if (!is_leaf)
-    {
-        if (pressed && g.DragDropHoldJustPressedId != id)
-        {
-            if ((flags & (ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick)) == 0 || (g.NavActivateId == id))
-                toggled = true;
-            if (flags & ImGuiTreeNodeFlags_OpenOnArrow)
-                toggled |= is_mouse_x_over_arrow && !g.NavDisableMouseHover;           
-            if ((flags & ImGuiTreeNodeFlags_OpenOnDoubleClick) && g.IO.MouseDoubleClicked[0])
-                toggled = true;
-        }
-        else if (pressed && g.DragDropHoldJustPressedId == id)
-        {
-            IM_ASSERT(button_flags & ImGuiButtonFlags_PressedOnDragDropHold);
-            if (!is_open)                     
-                toggled = true;
-        }
-
-        if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Left && is_open)
-        {
-            toggled = true;
-            NavMoveRequestCancel();
-        }
-        if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Right && !is_open)                
-        {
-            toggled = true;
-            NavMoveRequestCancel();
-        }
-
-        if (toggled)
-        {
-            is_open = !is_open;
-            window->DC.StateStorage->SetInt(id, is_open);
-            window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_ToggledOpen;
-        }
-    }
-    if (flags & ImGuiTreeNodeFlags_AllowItemOverlap)
-        SetItemAllowOverlap();
-
-    if (selected != was_selected) 
-        window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_ToggledSelection;
-
-    const ImU32 text_col = GetColorU32(ImGuiCol_Text);
-    ImGuiNavHighlightFlags nav_highlight_flags = ImGuiNavHighlightFlags_TypeThin;
-    if (display_frame)
-    {
-        const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header);
-        RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, true, style.FrameRounding);
-        RenderNavHighlight(frame_bb, id, nav_highlight_flags);
-        if (flags & ImGuiTreeNodeFlags_Bullet)
-            RenderBullet(window->DrawList, ImVec2(text_pos.x - text_offset_x * 0.60f, text_pos.y + g.FontSize * 0.5f), text_col);
-        else if (!is_leaf)
-            RenderArrow(window->DrawList, ImVec2(text_pos.x - text_offset_x + padding.x, text_pos.y), text_col, is_open ? ImGuiDir_Down : ImGuiDir_Right, 1.0f);
-        else      
-            text_pos.x -= text_offset_x;
-        if (flags & ImGuiTreeNodeFlags_ClipLabelForTrailingButton)
-            frame_bb.Max.x -= g.FontSize + style.FramePadding.x;
-
-        if (g.LogEnabled)
-            LogSetNextTextDecoration("###", "###");
-        RenderTextClipped(text_pos, frame_bb.Max, label, label_end, &label_size);
-    }
-    else
-    {
-        if (hovered || selected)
-        {
-            const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header);
-            RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, false);
-            RenderNavHighlight(frame_bb, id, nav_highlight_flags);
-        }
-        if (flags & ImGuiTreeNodeFlags_Bullet)
-            RenderBullet(window->DrawList, ImVec2(text_pos.x - text_offset_x * 0.5f, text_pos.y + g.FontSize * 0.5f), text_col);
-        else if (!is_leaf)
-            RenderArrow(window->DrawList, ImVec2(text_pos.x - text_offset_x + padding.x, text_pos.y + g.FontSize * 0.15f), text_col, is_open ? ImGuiDir_Down : ImGuiDir_Right, 0.70f);
-        if (g.LogEnabled)
-            LogSetNextTextDecoration(">", NULL);
-        RenderText(text_pos, label, label_end, false);
-    }
-
-    if (is_open && !(flags & ImGuiTreeNodeFlags_NoTreePushOnOpen))
-        TreePushOverrideID(id);
-    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags | (is_leaf ? 0 : ImGuiItemStatusFlags_Openable) | (is_open ? ImGuiItemStatusFlags_Opened : 0));
-    return is_open;
-}
-
-void ImGui::TreePush(const char* str_id)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    Indent();
-    window->DC.TreeDepth++;
-    PushID(str_id ? str_id : "#TreePush");
-}
-
-void ImGui::TreePush(const void* ptr_id)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    Indent();
-    window->DC.TreeDepth++;
-    PushID(ptr_id ? ptr_id : (const void*)"#TreePush");
-}
-
-void ImGui::TreePushOverrideID(ImGuiID id)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    Indent();
-    window->DC.TreeDepth++;
-    window->IDStack.push_back(id);
-}
-
-void ImGui::TreePop()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    Unindent();
-
-    window->DC.TreeDepth--;
-    ImU32 tree_depth_mask = (1 << window->DC.TreeDepth);
-
-    if (g.NavMoveDir == ImGuiDir_Left && g.NavWindow == window && NavMoveRequestButNoResultYet())
-        if (g.NavIdIsAlive && (window->DC.TreeJumpToParentOnPopMask & tree_depth_mask))
-        {
-            SetNavID(window->IDStack.back(), g.NavLayer, 0);
-            NavMoveRequestCancel();
-        }
-    window->DC.TreeJumpToParentOnPopMask &= tree_depth_mask - 1;
-
-    IM_ASSERT(window->IDStack.Size > 1);                      
-    PopID();
-}
-
-float ImGui::GetTreeNodeToLabelSpacing()
-{
-    ImGuiContext& g = *GImGui;
-    return g.FontSize + (g.Style.FramePadding.x * 2.0f);
-}
-
-void ImGui::SetNextItemOpen(bool is_open, ImGuiCond cond)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.CurrentWindow->SkipItems)
-        return;
-    g.NextItemData.Flags |= ImGuiNextItemDataFlags_HasOpen;
-    g.NextItemData.OpenVal = is_open;
-    g.NextItemData.OpenCond = cond ? cond : ImGuiCond_Always;
-}
-
-bool ImGui::CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    return TreeNodeBehavior(window->GetID(label), flags | ImGuiTreeNodeFlags_CollapsingHeader, label);
-}
-
-bool ImGui::CollapsingHeader(const char* label, bool* p_visible, ImGuiTreeNodeFlags flags)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    if (p_visible && !*p_visible)
-        return false;
-
-    ImGuiID id = window->GetID(label);
-    flags |= ImGuiTreeNodeFlags_CollapsingHeader;
-    if (p_visible)
-        flags |= ImGuiTreeNodeFlags_AllowItemOverlap | ImGuiTreeNodeFlags_ClipLabelForTrailingButton;
-    bool is_open = TreeNodeBehavior(id, flags, label);
-    if (p_visible != NULL)
-    {
-        ImGuiContext& g = *GImGui;
-        ImGuiLastItemDataBackup last_item_backup;
-        float button_size = g.FontSize;
-        float button_x = ImMax(window->DC.LastItemRect.Min.x, window->DC.LastItemRect.Max.x - g.Style.FramePadding.x * 2.0f - button_size);
-        float button_y = window->DC.LastItemRect.Min.y;
-        ImGuiID close_button_id = GetIDWithSeed("#CLOSE", NULL, id);
-        if (CloseButton(close_button_id, ImVec2(button_x, button_y)))
-            *p_visible = false;
-        last_item_backup.Restore();
-    }
-
-    return is_open;
-}
-
-bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags flags, const ImVec2& size_arg, bool ncolorhovered)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-
-    ImGuiID id = window->GetID(label);
-    ImVec2 label_size = CalcTextSize(label, NULL, true);
-    ImVec2 size(size_arg.x != 0.0f ? size_arg.x : label_size.x, size_arg.y != 0.0f ? size_arg.y : label_size.y);
-    ImVec2 pos = window->DC.CursorPos;
-    pos.y += window->DC.CurrLineTextBaseOffset;
-    ItemSize(size, 0.0f);
-
-    const bool span_all_columns = (flags & ImGuiSelectableFlags_SpanAllColumns) != 0;
-    const float min_x = span_all_columns ? window->ParentWorkRect.Min.x : pos.x;
-    const float max_x = span_all_columns ? window->ParentWorkRect.Max.x : window->WorkRect.Max.x;
-    if (size_arg.x == 0.0f || (flags & ImGuiSelectableFlags_SpanAvailWidth))
-        size.x = ImMax(label_size.x, max_x - min_x);
-
-    const ImVec2 text_min = pos;
-    const ImVec2 text_max(min_x + size.x, pos.y + size.y);
-    ImRect bb(min_x, pos.y, text_max.x, text_max.y);
-
-    if ((flags & ImGuiSelectableFlags_NoPadWithHalfSpacing) == 0)
-    {
-        const float spacing_x = span_all_columns ? 0.0f : style.ItemSpacing.x;
-        const float spacing_y = style.ItemSpacing.y;
-        const float spacing_L = IM_FLOOR(spacing_x * 0.50f);
-        const float spacing_U = IM_FLOOR(spacing_y * 0.50f);
-        bb.Min.x -= spacing_L;
-        bb.Min.y -= spacing_U;
-        bb.Max.x += (spacing_x - spacing_L);
-        bb.Max.y += (spacing_y - spacing_U);
-    }
-    const float backup_clip_rect_min_x = window->ClipRect.Min.x;
-    const float backup_clip_rect_max_x = window->ClipRect.Max.x;
-    if (span_all_columns)
-    {
-        window->ClipRect.Min.x = window->ParentWorkRect.Min.x;
-        window->ClipRect.Max.x = window->ParentWorkRect.Max.x;
-    }
-
-    bool item_add;
-    if (flags & ImGuiSelectableFlags_Disabled)
-    {
-        ImGuiItemFlags backup_item_flags = window->DC.ItemFlags;
-        window->DC.ItemFlags |= ImGuiItemFlags_Disabled | ImGuiItemFlags_NoNavDefaultFocus;
-        item_add = ItemAdd(bb, id);
-        window->DC.ItemFlags = backup_item_flags;
-    }
-    else
-    {
-        item_add = ItemAdd(bb, id);
-    }
-
-    if (span_all_columns)
-    {
-        window->ClipRect.Min.x = backup_clip_rect_min_x;
-        window->ClipRect.Max.x = backup_clip_rect_max_x;
-    }
-
-    if (!item_add)
-        return false;
-
-    if (span_all_columns && window->DC.CurrentColumns)
-        PushColumnsBackground();
-    else if (span_all_columns && g.CurrentTable)
-        TablePushBackgroundChannel();
-
-    ImGuiButtonFlags button_flags = 0;
-    if (flags & ImGuiSelectableFlags_NoHoldingActiveID) { button_flags |= ImGuiButtonFlags_NoHoldingActiveId; }
-    if (flags & ImGuiSelectableFlags_SelectOnClick)     { button_flags |= ImGuiButtonFlags_PressedOnClick; }
-    if (flags & ImGuiSelectableFlags_SelectOnRelease)   { button_flags |= ImGuiButtonFlags_PressedOnRelease; }
-    if (flags & ImGuiSelectableFlags_Disabled)          { button_flags |= ImGuiButtonFlags_Disabled; }
-    if (flags & ImGuiSelectableFlags_AllowDoubleClick)  { button_flags |= ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnDoubleClick; }
-    if (flags & ImGuiSelectableFlags_AllowItemOverlap)  { button_flags |= ImGuiButtonFlags_AllowItemOverlap; }
-
-    if (flags & ImGuiSelectableFlags_Disabled)
-        selected = false;
-
-    const bool was_selected = selected;
-    bool hovered, held;
-    bool pressed = ButtonBehavior(bb, id, &hovered, &held, button_flags);
-
-    if (pressed || (hovered && (flags & ImGuiSelectableFlags_SetNavIdOnHover)))
-    {
-        if (!g.NavDisableMouseHover && g.NavWindow == window && g.NavLayer == window->DC.NavLayerCurrent)
-        {
-            g.NavDisableHighlight = true;
-            SetNavID(id, window->DC.NavLayerCurrent, window->DC.NavFocusScopeIdCurrent);
-        }
-    }
-    if (pressed)
-        MarkItemEdited(id);
-
-    if (flags & ImGuiSelectableFlags_AllowItemOverlap)
-        SetItemAllowOverlap();
-
-    if (selected != was_selected) 
-        window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_ToggledSelection;
-
-    if (held && (flags & ImGuiSelectableFlags_DrawHoveredWhenHeld))
-        hovered = true;
-
-    
-    if (ncolorhovered) 
-    {
-        if (selected)
-        {
-            ImU32 col = GetColorU32(ImGuiCol_HeaderActive);
-            RenderFrame(bb.Min, bb.Max, col, false, 0.0f);
-            RenderNavHighlight(bb, id, ImGuiNavHighlightFlags_TypeThin | ImGuiNavHighlightFlags_NoRounding);
-        }
-    }
-    else {
-        if (hovered || selected)    
-        {
-            const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header);
-            RenderFrame(bb.Min, bb.Max, col, false, 0.0f);
-            RenderNavHighlight(bb, id, ImGuiNavHighlightFlags_TypeThin | ImGuiNavHighlightFlags_NoRounding);
-        }
-    }
-    
-
-    if (span_all_columns && window->DC.CurrentColumns)
-        PopColumnsBackground();
-    else if (span_all_columns && g.CurrentTable)
-        TablePopBackgroundChannel();
-
-    if (flags & ImGuiSelectableFlags_Disabled) PushStyleColor(ImGuiCol_Text, style.Colors[ImGuiCol_TextDisabled]);
-
-    if (ncolorhovered)
-    {
-        RenderTextClipped(text_min, text_max, label, NULL, &label_size, style.SelectableTextAlign, &bb);
-    }
-    else
-    {
-        if (selected || hovered)
-            RenderTextClipped(text_min, text_max, label, NULL, &label_size, style.SelectableTextAlign, &bb, colBlack); 
-        else RenderTextClipped(text_min, text_max, label, NULL, &label_size, style.SelectableTextAlign, &bb);
-    }
-
-    if (flags & ImGuiSelectableFlags_Disabled) PopStyleColor();
-
-    if (pressed && (window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiSelectableFlags_DontClosePopups) && !(window->DC.ItemFlags & ImGuiItemFlags_SelectableDontClosePopup))
-        CloseCurrentPopup();
-
-    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags);
-    return pressed;
-}
-
-bool ImGui::Selectable(const char* label, bool* p_selected, ImGuiSelectableFlags flags, const ImVec2& size_arg)
-{
-    if (Selectable(label, *p_selected, flags, size_arg))
-    {
-        *p_selected = !*p_selected;
-        return true;
-    }
-    return false;
-}
-
-bool ImGui::BeginListBox(const char* label, const ImVec2& size_arg)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    const ImGuiStyle& style = g.Style;
-    const ImGuiID id = GetID(label);
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-
-    ImVec2 size = ImFloor(CalcItemSize(size_arg, CalcItemWidth(), GetTextLineHeightWithSpacing() * 7.25f + style.FramePadding.y * 2.0f));
-    ImVec2 frame_size = ImVec2(size.x, ImMax(size.y, label_size.y));
-    ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + frame_size);
-
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Min.y - 1.0f), ImVec2(frame_bb.Max.x , frame_bb.Min.y - 1.0f), colBlack, 1.0f); 
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Min.y - 1.0f), ImVec2(frame_bb.Min.x - 1.0f, frame_bb.Max.y), colBlack, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Max.x , frame_bb.Min.y), ImVec2(frame_bb.Max.x , frame_bb.Max.y), colWhite, 1.0f);
-    window->DrawList->AddLine(ImVec2(frame_bb.Min.x , frame_bb.Max.y), ImVec2(frame_bb.Max.x , frame_bb.Max.y), colWhite, 1.0f);
-
-    ImRect bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f));
-    g.NextItemData.ClearFlags();
-
-    if (!IsRectVisible(bb.Min, bb.Max))
-    {
-        ItemSize(bb.GetSize(), style.FramePadding.y);
-        ItemAdd(bb, 0, &frame_bb);
-        return false;
-    }
-
-    BeginGroup();
-    if (label_size.x > 0.0f)
-    {
-        ImVec2 label_pos = ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y - 20.0f);
-        RenderText(label_pos, label); 
-        window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, label_pos + label_size);
-    }
-
-    BeginChildFrame(id, frame_bb.GetSize());
-    return true;
-}
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-bool ImGui::ListBoxHeader(const char* label, int items_count, int height_in_items)
-{
-    ImGuiContext& g = *GImGui;
-    float height_in_items_f = (height_in_items < 0 ? ImMin(items_count, 7) : height_in_items) + 0.25f;
-    ImVec2 size;
-    size.x = 0.0f;
-    size.y = GetTextLineHeightWithSpacing() * height_in_items_f + g.Style.FramePadding.y * 2.0f;
-    return BeginListBox(label, size);
-}
-#endif
-
-void ImGui::EndListBox()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    IM_ASSERT((window->Flags & ImGuiWindowFlags_ChildWindow) && "Mismatched BeginListBox/EndListBox calls. Did you test the return value of BeginListBox?");
-
-    EndChildFrame();
-    EndGroup();                  
-}
-
-bool ImGui::ListBox(const char* label, int* current_item, const char* const items[], int items_count, int height_items)
-{
-    const bool value_changed = ListBox(label, current_item, Items_ArrayGetter, (void*)items, items_count, height_items);
-    return value_changed;
-}
-
-bool ImGui::ListBox(const char* label, int* current_item, bool (*items_getter)(void*, int, const char**), void* data, int items_count, int height_in_items)
-{
-    ImGuiContext& g = *GImGui;
-
-    if (height_in_items < 0)
-        height_in_items = ImMin(items_count, 7);
-    float height_in_items_f = height_in_items + 0.25f;
-    ImVec2 size(0.0f, ImFloor(GetTextLineHeightWithSpacing() * height_in_items_f + g.Style.FramePadding.y * 2.0f));
-
-    if (!BeginListBox(label, size))
-        return false;
-
-    bool value_changed = false;
-    ImGuiListClipper clipper;
-    clipper.Begin(items_count, GetTextLineHeightWithSpacing());                      
-    while (clipper.Step())
-        for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
-        {
-            const char* item_text;
-            if (!items_getter(data, i, &item_text))
-                item_text = "*Unknown item*";
-
-            PushID(i);
-            const bool item_selected = (i == *current_item);
-            if (Selectable(item_text, item_selected))
-            {
-                *current_item = i;
-                value_changed = true;
-            }
-            if (item_selected)
-                SetItemDefaultFocus();
-            PopID();
-        }
-    EndListBox();
-    if (value_changed)
-        MarkItemEdited(g.CurrentWindow->DC.LastItemId);
-
-    return value_changed;
-}
-
-int ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return -1;
-
-    const ImGuiStyle& style = g.Style;
-    const ImGuiID id = window->GetID(label);
-
-    const ImVec2 label_size = CalcTextSize(label, NULL, true);
-    if (frame_size.x == 0.0f)
-        frame_size.x = CalcItemWidth();
-    if (frame_size.y == 0.0f)
-        frame_size.y = label_size.y + (style.FramePadding.y * 2);
-
-    const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + frame_size);
-    const ImRect inner_bb(frame_bb.Min + style.FramePadding, frame_bb.Max - style.FramePadding);
-    const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0));
-    ItemSize(total_bb, style.FramePadding.y);
-    if (!ItemAdd(total_bb, 0, &frame_bb))
-        return -1;
-    const bool hovered = ItemHoverable(frame_bb, id);
-
-    if (scale_min == FLT_MAX || scale_max == FLT_MAX)
-    {
-        float v_min = FLT_MAX;
-        float v_max = -FLT_MAX;
-        for (int i = 0; i < values_count; i++)
-        {
-            const float v = values_getter(data, i);
-            if (v != v)    
-                continue;
-            v_min = ImMin(v_min, v);
-            v_max = ImMax(v_max, v);
-        }
-        if (scale_min == FLT_MAX)
-            scale_min = v_min;
-        if (scale_max == FLT_MAX)
-            scale_max = v_max;
-    }
-
-    RenderFrame(frame_bb.Min, frame_bb.Max, GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding);
-
-    const int values_count_min = (plot_type == ImGuiPlotType_Lines) ? 2 : 1;
-    int idx_hovered = -1;
-    if (values_count >= values_count_min)
-    {
-        int res_w = ImMin((int)frame_size.x, values_count) + ((plot_type == ImGuiPlotType_Lines) ? -1 : 0);
-        int item_count = values_count + ((plot_type == ImGuiPlotType_Lines) ? -1 : 0);
-
-        if (hovered && inner_bb.Contains(g.IO.MousePos))
-        {
-            const float t = ImClamp((g.IO.MousePos.x - inner_bb.Min.x) / (inner_bb.Max.x - inner_bb.Min.x), 0.0f, 0.9999f);
-            const int v_idx = (int)(t * item_count);
-            IM_ASSERT(v_idx >= 0 && v_idx < values_count);
-
-            const float v0 = values_getter(data, (v_idx + values_offset) % values_count);
-            const float v1 = values_getter(data, (v_idx + 1 + values_offset) % values_count);
-            if (plot_type == ImGuiPlotType_Lines)
-                SetTooltip("%d: %8.4g\n%d: %8.4g", v_idx, v0, v_idx + 1, v1);
-            else if (plot_type == ImGuiPlotType_Histogram)
-                SetTooltip("%d: %8.4g", v_idx, v0);
-            idx_hovered = v_idx;
-        }
-
-        const float t_step = 1.0f / (float)res_w;
-        const float inv_scale = (scale_min == scale_max) ? 0.0f : (1.0f / (scale_max - scale_min));
-
-        float v0 = values_getter(data, (0 + values_offset) % values_count);
-        float t0 = 0.0f;
-        ImVec2 tp0 = ImVec2( t0, 1.0f - ImSaturate((v0 - scale_min) * inv_scale) );                                
-        float histogram_zero_line_t = (scale_min * scale_max < 0.0f) ? (-scale_min * inv_scale) : (scale_min < 0.0f ? 0.0f : 1.0f);         
-
-        const ImU32 col_base = GetColorU32((plot_type == ImGuiPlotType_Lines) ? ImGuiCol_PlotLines : ImGuiCol_PlotHistogram);
-        const ImU32 col_hovered = GetColorU32((plot_type == ImGuiPlotType_Lines) ? ImGuiCol_PlotLinesHovered : ImGuiCol_PlotHistogramHovered);
-
-        for (int n = 0; n < res_w; n++)
-        {
-            const float t1 = t0 + t_step;
-            const int v1_idx = (int)(t0 * item_count + 0.5f);
-            IM_ASSERT(v1_idx >= 0 && v1_idx < values_count);
-            const float v1 = values_getter(data, (v1_idx + values_offset + 1) % values_count);
-            const ImVec2 tp1 = ImVec2( t1, 1.0f - ImSaturate((v1 - scale_min) * inv_scale) );
-
-            ImVec2 pos0 = ImLerp(inner_bb.Min, inner_bb.Max, tp0);
-            ImVec2 pos1 = ImLerp(inner_bb.Min, inner_bb.Max, (plot_type == ImGuiPlotType_Lines) ? tp1 : ImVec2(tp1.x, histogram_zero_line_t));
-            if (plot_type == ImGuiPlotType_Lines)
-            {
-                window->DrawList->AddLine(pos0, pos1, idx_hovered == v1_idx ? col_hovered : col_base);
-            }
-            else if (plot_type == ImGuiPlotType_Histogram)
-            {
-                if (pos1.x >= pos0.x + 2.0f)
-                    pos1.x -= 1.0f;
-                window->DrawList->AddRectFilled(pos0, pos1, idx_hovered == v1_idx ? col_hovered : col_base);
-            }
-
-            t0 = t1;
-            tp0 = tp1;
-        }
-    }
-
-    if (overlay_text)
-        RenderTextClipped(ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y), frame_bb.Max, overlay_text, NULL, NULL, ImVec2(0.5f, 0.0f));
-
-    if (label_size.x > 0.0f)
-        RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, inner_bb.Min.y), label);
-
-    return idx_hovered;
-}
-
-struct ImGuiPlotArrayGetterData
-{
-    const float* Values;
-    int Stride;
-
-    ImGuiPlotArrayGetterData(const float* values, int stride) { Values = values; Stride = stride; }
-};
-
-static float Plot_ArrayGetter(void* data, int idx)
-{
-    ImGuiPlotArrayGetterData* plot_data = (ImGuiPlotArrayGetterData*)data;
-    const float v = *(const float*)(const void*)((const unsigned char*)plot_data->Values + (size_t)idx * plot_data->Stride);
-    return v;
-}
-
-void ImGui::PlotLines(const char* label, const float* values, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride)
-{
-    ImGuiPlotArrayGetterData data(values, stride);
-    PlotEx(ImGuiPlotType_Lines, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
-}
-
-void ImGui::PlotLines(const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size)
-{
-    PlotEx(ImGuiPlotType_Lines, label, values_getter, data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
-}
-
-void ImGui::PlotHistogram(const char* label, const float* values, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride)
-{
-    ImGuiPlotArrayGetterData data(values, stride);
-    PlotEx(ImGuiPlotType_Histogram, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
-}
-
-void ImGui::PlotHistogram(const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size)
-{
-    PlotEx(ImGuiPlotType_Histogram, label, values_getter, data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
-}
-
-void ImGui::Value(const char* prefix, bool b)
-{
-    Text("%s: %s", prefix, (b ? "true" : "false"));
-}
-
-void ImGui::Value(const char* prefix, int v)
-{
-    Text("%s: %d", prefix, v);
-}
-
-void ImGui::Value(const char* prefix, unsigned int v)
-{
-    Text("%s: %d", prefix, v);
-}
-
-void ImGui::Value(const char* prefix, float v, const char* float_format)
-{
-    if (float_format)
-    {
-        char fmt[64];
-        ImFormatString(fmt, IM_ARRAYSIZE(fmt), "%%s: %s", float_format);
-        Text(fmt, prefix, v);
-    }
-    else
-    {
-        Text("%s: %.3f", prefix, v);
-    }
-}
-
-void ImGuiMenuColumns::Update(int count, float spacing, bool clear)
-{
-    IM_ASSERT(count == IM_ARRAYSIZE(Pos));
-    IM_UNUSED(count);
-    Width = NextWidth = 0.0f;
-    Spacing = spacing;
-    if (clear)
-        memset(NextWidths, 0, sizeof(NextWidths));
-    for (int i = 0; i < IM_ARRAYSIZE(Pos); i++)
-    {
-        if (i > 0 && NextWidths[i] > 0.0f)
-            Width += Spacing;
-        Pos[i] = IM_FLOOR(Width);
-        Width += NextWidths[i];
-        NextWidths[i] = 0.0f;
-    }
-}
-
-float ImGuiMenuColumns::DeclColumns(float w0, float w1, float w2)          
-{
-    NextWidth = 0.0f;
-    NextWidths[0] = ImMax(NextWidths[0], w0);
-    NextWidths[1] = ImMax(NextWidths[1], w1);
-    NextWidths[2] = ImMax(NextWidths[2], w2);
-    for (int i = 0; i < IM_ARRAYSIZE(Pos); i++)
-        NextWidth += NextWidths[i] + ((i > 0 && NextWidths[i] > 0.0f) ? Spacing : 0.0f);
-    return ImMax(Width, NextWidth);
-}
-
-float ImGuiMenuColumns::CalcExtraSpace(float avail_w) const
-{
-    return ImMax(0.0f, avail_w - Width);
-}
-
-bool ImGui::BeginMenuBar()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-    if (!(window->Flags & ImGuiWindowFlags_MenuBar))
-        return false;
-
-    IM_ASSERT(!window->DC.MenuBarAppending);
-    BeginGroup();                
-    PushID("##menubar");
-
-    ImRect bar_rect = window->MenuBarRect();
-    ImRect clip_rect(IM_ROUND(bar_rect.Min.x + window->WindowBorderSize), IM_ROUND(bar_rect.Min.y + window->WindowBorderSize), IM_ROUND(ImMax(bar_rect.Min.x, bar_rect.Max.x - ImMax(window->WindowRounding, window->WindowBorderSize))), IM_ROUND(bar_rect.Max.y));
-    clip_rect.ClipWith(window->OuterRectClipped);
-    PushClipRect(clip_rect.Min, clip_rect.Max, false);
-
-    window->DC.CursorPos = window->DC.CursorMaxPos = ImVec2(bar_rect.Min.x + window->DC.MenuBarOffset.x, bar_rect.Min.y + window->DC.MenuBarOffset.y);
-    window->DC.LayoutType = ImGuiLayoutType_Horizontal;
-    window->DC.NavLayerCurrent = ImGuiNavLayer_Menu;
-    window->DC.MenuBarAppending = true;
-    AlignTextToFramePadding();
-    return true;
-}
-
-void ImGui::EndMenuBar()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return;
-    ImGuiContext& g = *GImGui;
-
-    if (NavMoveRequestButNoResultYet() && (g.NavMoveDir == ImGuiDir_Left || g.NavMoveDir == ImGuiDir_Right) && (g.NavWindow->Flags & ImGuiWindowFlags_ChildMenu))
-    {
-        ImGuiWindow* nav_earliest_child = g.NavWindow;
-        while (nav_earliest_child->ParentWindow && (nav_earliest_child->ParentWindow->Flags & ImGuiWindowFlags_ChildMenu))
-            nav_earliest_child = nav_earliest_child->ParentWindow;
-        if (nav_earliest_child->ParentWindow == window && nav_earliest_child->DC.ParentLayoutType == ImGuiLayoutType_Horizontal && g.NavMoveRequestForward == ImGuiNavForward_None)
-        {
-            const ImGuiNavLayer layer = ImGuiNavLayer_Menu;
-            IM_ASSERT(window->DC.NavLayerActiveMaskNext & (1 << layer));   
-            FocusWindow(window);
-            SetNavIDWithRectRel(window->NavLastIds[layer], layer, 0, window->NavRectRel[layer]);
-            g.NavLayer = layer;
-            g.NavDisableHighlight = true;              
-            g.NavMoveRequestForward = ImGuiNavForward_ForwardQueued;
-            NavMoveRequestCancel();
-        }
-    }
-
-    IM_ASSERT(window->Flags & ImGuiWindowFlags_MenuBar);
-    IM_ASSERT(window->DC.MenuBarAppending);
-    PopClipRect();
-    PopID();
-    window->DC.MenuBarOffset.x = window->DC.CursorPos.x - window->MenuBarRect().Min.x;                  
-    g.GroupStack.back().EmitItem = false;
-    EndGroup();      
-    window->DC.LayoutType = ImGuiLayoutType_Vertical;
-    window->DC.NavLayerCurrent = ImGuiNavLayer_Main;
-    window->DC.MenuBarAppending = false;
-}
-
-bool ImGui::BeginMainMenuBar()
-{
-    ImGuiContext& g = *GImGui;
-    g.NextWindowData.MenuBarOffsetMinVal = ImVec2(g.Style.DisplaySafeAreaPadding.x, ImMax(g.Style.DisplaySafeAreaPadding.y - g.Style.FramePadding.y, 0.0f));
-    SetNextWindowPos(ImVec2(0.0f, 0.0f));
-    SetNextWindowSize(ImVec2(g.IO.DisplaySize.x, g.NextWindowData.MenuBarOffsetMinVal.y + g.FontBaseSize + g.Style.FramePadding.y));
-    PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
-    PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(0, 0));
-    ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_MenuBar;
-    bool is_open = Begin("##MainMenuBar", NULL, window_flags) && BeginMenuBar();
-    PopStyleVar(2);
-    g.NextWindowData.MenuBarOffsetMinVal = ImVec2(0.0f, 0.0f);
-    if (!is_open)
-    {
-        End();
-        return false;
-    }
-    return true; 
-}
-
-void ImGui::EndMainMenuBar()
-{
-    EndMenuBar();
-
-    ImGuiContext& g = *GImGui;
-    if (g.CurrentWindow == g.NavWindow && g.NavLayer == ImGuiNavLayer_Main && !g.NavAnyRequest)
-        FocusTopMostWindowUnderOne(g.NavWindow, NULL);
-
-    End();
-}
-
-bool ImGui::BeginMenu(const char* label, bool enabled)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    const ImGuiStyle& style = g.Style;
-    const ImGuiID id = window->GetID(label);
-    bool menu_is_open = IsPopupOpen(id, ImGuiPopupFlags_None);
-
-    ImGuiWindowFlags flags = ImGuiWindowFlags_ChildMenu | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoNavFocus;
-    if (window->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu))
-        flags |= ImGuiWindowFlags_ChildWindow;
-
-    if (g.MenusIdSubmittedThisFrame.contains(id))
-    {
-        if (menu_is_open)
-            menu_is_open = BeginPopupEx(id, flags);               
-        else
-            g.NextWindowData.ClearFlags();                    
-        return menu_is_open;
-    }
-
-    g.MenusIdSubmittedThisFrame.push_back(id);
-
-    ImVec2 label_size = CalcTextSize(label, NULL, true);
-    bool pressed;
-    bool menuset_is_open = !(window->Flags & ImGuiWindowFlags_Popup) && (g.OpenPopupStack.Size > g.BeginPopupStack.Size && g.OpenPopupStack[g.BeginPopupStack.Size].OpenParentId == window->IDStack.back());
-    ImGuiWindow* backed_nav_window = g.NavWindow;
-    if (menuset_is_open)
-        g.NavWindow = window;                     
-
-    ImVec2 popup_pos, pos = window->DC.CursorPos;
-    if (window->DC.LayoutType == ImGuiLayoutType_Horizontal)
-    {
-        popup_pos = ImVec2(pos.x - 1.0f - IM_FLOOR(style.ItemSpacing.x * 0.5f), pos.y - style.FramePadding.y + window->MenuBarHeight());
-        window->DC.CursorPos.x += IM_FLOOR(style.ItemSpacing.x * 0.5f);
-        PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(style.ItemSpacing.x * 2.0f, style.ItemSpacing.y));
-        float w = label_size.x;
-        pressed = Selectable(label, menu_is_open, ImGuiSelectableFlags_NoHoldingActiveID | ImGuiSelectableFlags_SelectOnClick | ImGuiSelectableFlags_DontClosePopups | (!enabled ? ImGuiSelectableFlags_Disabled : 0), ImVec2(w, 0.0f));
-        PopStyleVar();
-        window->DC.CursorPos.x += IM_FLOOR(style.ItemSpacing.x * (-1.0f + 0.5f));                        
-    }
-    else
-    {
-        popup_pos = ImVec2(pos.x, pos.y - style.WindowPadding.y);
-        float min_w = window->DC.MenuColumns.DeclColumns(label_size.x, 0.0f, IM_FLOOR(g.FontSize * 1.20f));     
-        float extra_w = ImMax(0.0f, GetContentRegionAvail().x - min_w);
-        pressed = Selectable(label, menu_is_open, ImGuiSelectableFlags_NoHoldingActiveID | ImGuiSelectableFlags_SelectOnClick | ImGuiSelectableFlags_DontClosePopups | ImGuiSelectableFlags_SpanAvailWidth | (!enabled ? ImGuiSelectableFlags_Disabled : 0), ImVec2(min_w, 0.0f));
-        ImU32 text_col = GetColorU32(enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled);
-        RenderArrow(window->DrawList, pos + ImVec2(window->DC.MenuColumns.Pos[2] + extra_w + g.FontSize * 0.30f, 0.0f), text_col, ImGuiDir_Right);
-    }
-
-    const bool hovered = enabled && ItemHoverable(window->DC.LastItemRect, id);
-    if (menuset_is_open)
-        g.NavWindow = backed_nav_window;
-
-    bool want_open = false;
-    bool want_close = false;
-    if (window->DC.LayoutType == ImGuiLayoutType_Vertical)    
-    {
-        bool moving_toward_other_child_menu = false;
-
-        ImGuiWindow* child_menu_window = (g.BeginPopupStack.Size < g.OpenPopupStack.Size && g.OpenPopupStack[g.BeginPopupStack.Size].SourceWindow == window) ? g.OpenPopupStack[g.BeginPopupStack.Size].Window : NULL;
-        if (g.HoveredWindow == window && child_menu_window != NULL && !(window->Flags & ImGuiWindowFlags_MenuBar))
-        {
-            ImRect next_window_rect = child_menu_window->Rect();
-            ImVec2 ta = g.IO.MousePos - g.IO.MouseDelta;
-            ImVec2 tb = (window->Pos.x < child_menu_window->Pos.x) ? next_window_rect.GetTL() : next_window_rect.GetTR();
-            ImVec2 tc = (window->Pos.x < child_menu_window->Pos.x) ? next_window_rect.GetBL() : next_window_rect.GetBR();
-            float extra = ImClamp(ImFabs(ta.x - tb.x) * 0.30f, 5.0f, 30.0f);          
-            ta.x += (window->Pos.x < child_menu_window->Pos.x) ? -0.5f : +0.5f;     
-            tb.y = ta.y + ImMax((tb.y - extra) - ta.y, -100.0f);                                    
-            tc.y = ta.y + ImMin((tc.y + extra) - ta.y, +100.0f);
-            moving_toward_other_child_menu = ImTriangleContainsPoint(ta, tb, tc, g.IO.MousePos);
-        }
-        if (menu_is_open && !hovered && g.HoveredWindow == window && g.HoveredIdPreviousFrame != 0 && g.HoveredIdPreviousFrame != id && !moving_toward_other_child_menu)
-            want_close = true;
-
-        if (!menu_is_open && hovered && pressed)    
-            want_open = true;
-        else if (!menu_is_open && hovered && !moving_toward_other_child_menu)    
-            want_open = true;
-
-        if (g.NavActivateId == id)
-        {
-            want_close = menu_is_open;
-            want_open = !menu_is_open;
-        }
-        if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Right)    
-        {
-            want_open = true;
-            NavMoveRequestCancel();
-        }
-    }
-    else
-    {
-        if (menu_is_open && pressed && menuset_is_open)         
-        {
-            want_close = true;
-            want_open = menu_is_open = false;
-        }
-        else if (pressed || (hovered && menuset_is_open && !menu_is_open))          
-        {
-            want_open = true;
-        }
-        else if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Down)    
-        {
-            want_open = true;
-            NavMoveRequestCancel();
-        }
-    }
-
-    if (!enabled)                         
-        want_close = true;
-    if (want_close && IsPopupOpen(id, ImGuiPopupFlags_None))
-        ClosePopupToLevel(g.BeginPopupStack.Size, true);
-
-    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags | ImGuiItemStatusFlags_Openable | (menu_is_open ? ImGuiItemStatusFlags_Opened : 0));
-
-    if (!menu_is_open && want_open && g.OpenPopupStack.Size > g.BeginPopupStack.Size)
-    {
-        OpenPopup(label);
-        return false;
-    }
-
-    menu_is_open |= want_open;
-    if (want_open)
-        OpenPopup(label);
-
-    if (menu_is_open)
-    {
-        SetNextWindowPos(popup_pos, ImGuiCond_Always);                 
-        menu_is_open = BeginPopupEx(id, flags);               
-    }
-    else
-    {
-        g.NextWindowData.ClearFlags();           
-    }
-
-    return menu_is_open;
-}
-
-void ImGui::EndMenu()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (g.NavWindow && g.NavWindow->ParentWindow == window && g.NavMoveDir == ImGuiDir_Left && NavMoveRequestButNoResultYet() && window->DC.LayoutType == ImGuiLayoutType_Vertical)
-    {
-        ClosePopupToLevel(g.BeginPopupStack.Size, true);
-        NavMoveRequestCancel();
-    }
-
-    EndPopup();
-}
-
-bool ImGui::MenuItem(const char* label, const char* shortcut, bool selected, bool enabled)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
-        return false;
-
-    ImGuiContext& g = *GImGui;
-    ImGuiStyle& style = g.Style;
-    ImVec2 pos = window->DC.CursorPos;
-    ImVec2 label_size = CalcTextSize(label, NULL, true);
-
-    ImGuiSelectableFlags flags = ImGuiSelectableFlags_SelectOnRelease | ImGuiSelectableFlags_SetNavIdOnHover | (enabled ? 0 : ImGuiSelectableFlags_Disabled);
-    bool pressed;
-    if (window->DC.LayoutType == ImGuiLayoutType_Horizontal)
-    {
-        float w = label_size.x;
-        window->DC.CursorPos.x += IM_FLOOR(style.ItemSpacing.x * 0.5f);
-        PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(style.ItemSpacing.x * 2.0f, style.ItemSpacing.y));
-        pressed = Selectable(label, false, flags, ImVec2(w, 0.0f));
-        PopStyleVar();
-        window->DC.CursorPos.x += IM_FLOOR(style.ItemSpacing.x * (-1.0f + 0.5f));                        
-    }
-    else
-    {
-        float shortcut_w = shortcut ? CalcTextSize(shortcut, NULL).x : 0.0f;
-        float min_w = window->DC.MenuColumns.DeclColumns(label_size.x, shortcut_w, IM_FLOOR(g.FontSize * 1.20f));     
-        float extra_w = ImMax(0.0f, GetContentRegionAvail().x - min_w);
-        pressed = Selectable(label, false, flags | ImGuiSelectableFlags_SpanAvailWidth, ImVec2(min_w, 0.0f));
-        if (shortcut_w > 0.0f)
-        {
-            PushStyleColor(ImGuiCol_Text, g.Style.Colors[ImGuiCol_TextDisabled]);
-            RenderText(pos + ImVec2(window->DC.MenuColumns.Pos[1] + extra_w, 0.0f), shortcut, NULL, false);
-            PopStyleColor();
-        }
-        if (selected)
-            RenderCheckMark(window->DrawList, pos + ImVec2(window->DC.MenuColumns.Pos[2] + extra_w + g.FontSize * 0.40f, g.FontSize * 0.134f * 0.5f), GetColorU32(enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled), g.FontSize  * 0.866f);
-    }
-
-    IMGUI_TEST_ENGINE_ITEM_INFO(window->DC.LastItemId, label, window->DC.ItemFlags | ImGuiItemStatusFlags_Checkable | (selected ? ImGuiItemStatusFlags_Checked : 0));
-    return pressed;
-}
-
-bool ImGui::MenuItem(const char* label, const char* shortcut, bool* p_selected, bool enabled)
-{
-    if (MenuItem(label, shortcut, p_selected ? *p_selected : false, enabled))
-    {
-        if (p_selected)
-            *p_selected = !*p_selected;
-        return true;
-    }
-    return false;
-}
-
-struct ImGuiTabBarSection
-{
-    int                 TabCount;                     
-    float               Width;                             
-    float               Spacing;                        
-
-    ImGuiTabBarSection() { memset(this, 0, sizeof(*this)); }
-};
-
-namespace ImGui
-{
-    static void             TabBarLayout(ImGuiTabBar* tab_bar);
-    static ImU32            TabBarCalcTabID(ImGuiTabBar* tab_bar, const char* label);
-    static float            TabBarCalcMaxTabWidth();
-    static float            TabBarScrollClamp(ImGuiTabBar* tab_bar, float scrolling);
-    static void             TabBarScrollToTab(ImGuiTabBar* tab_bar, ImGuiTabItem* tab, ImGuiTabBarSection* sections);
-    static ImGuiTabItem*    TabBarScrollingButtons(ImGuiTabBar* tab_bar);
-    static ImGuiTabItem*    TabBarTabListPopupButton(ImGuiTabBar* tab_bar);
-}
-
-ImGuiTabBar::ImGuiTabBar()
-{
-    memset(this, 0, sizeof(*this));
-    CurrFrameVisible = PrevFrameVisible = -1;
-    LastTabItemIdx = -1;
-}
-
-static int IMGUI_CDECL TabItemComparerBySection(const void* lhs, const void* rhs)
-{
-    const ImGuiTabItem* a = (const ImGuiTabItem*)lhs;
-    const ImGuiTabItem* b = (const ImGuiTabItem*)rhs;
-    const int a_section = (a->Flags & ImGuiTabItemFlags_Leading) ? 0 : (a->Flags & ImGuiTabItemFlags_Trailing) ? 2 : 1;
-    const int b_section = (b->Flags & ImGuiTabItemFlags_Leading) ? 0 : (b->Flags & ImGuiTabItemFlags_Trailing) ? 2 : 1;
-    if (a_section != b_section)
-        return a_section - b_section;
-    return (int)(a->IndexDuringLayout - b->IndexDuringLayout);
-}
-
-static int IMGUI_CDECL TabItemComparerByBeginOrder(const void* lhs, const void* rhs)
-{
-    const ImGuiTabItem* a = (const ImGuiTabItem*)lhs;
-    const ImGuiTabItem* b = (const ImGuiTabItem*)rhs;
-    return (int)(a->BeginOrder - b->BeginOrder);
-}
-
-static ImGuiTabBar* GetTabBarFromTabBarRef(const ImGuiPtrOrIndex& ref)
-{
-    ImGuiContext& g = *GImGui;
-    return ref.Ptr ? (ImGuiTabBar*)ref.Ptr : g.TabBars.GetByIndex(ref.Index);
-}
-
-static ImGuiPtrOrIndex GetTabBarRefFromTabBar(ImGuiTabBar* tab_bar)
-{
-    ImGuiContext& g = *GImGui;
-    if (g.TabBars.Contains(tab_bar))
-        return ImGuiPtrOrIndex(g.TabBars.GetIndex(tab_bar));
-    return ImGuiPtrOrIndex(tab_bar);
-}
-
-bool    ImGui::BeginTabBar(const char* str_id, ImGuiTabBarFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return false;
-
-    ImGuiID id = window->GetID(str_id);
-    ImGuiTabBar* tab_bar = g.TabBars.GetOrAddByKey(id);
-    ImRect tab_bar_bb = ImRect(window->DC.CursorPos.x, window->DC.CursorPos.y, window->WorkRect.Max.x, window->DC.CursorPos.y + g.FontSize + g.Style.FramePadding.y * 2);
-    tab_bar->ID = id;
-    return BeginTabBarEx(tab_bar, tab_bar_bb, flags | ImGuiTabBarFlags_IsFocused);
-}
-
-bool    ImGui::BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& tab_bar_bb, ImGuiTabBarFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return false;
-
-    if ((flags & ImGuiTabBarFlags_DockNode) == 0)
-        PushOverrideID(tab_bar->ID);
-
-    g.CurrentTabBarStack.push_back(GetTabBarRefFromTabBar(tab_bar));
-    g.CurrentTabBar = tab_bar;
-
-    tab_bar->BackupCursorPos = window->DC.CursorPos;
-    if (tab_bar->CurrFrameVisible == g.FrameCount)
-    {
-        window->DC.CursorPos = ImVec2(tab_bar->BarRect.Min.x, tab_bar->BarRect.Max.y + tab_bar->ItemSpacingY);
-        tab_bar->BeginCount++;
-        return true;
-    }
-
-    if ((flags & ImGuiTabBarFlags_Reorderable) != (tab_bar->Flags & ImGuiTabBarFlags_Reorderable) || (tab_bar->TabsAddedNew && !(flags & ImGuiTabBarFlags_Reorderable)))
-        if (tab_bar->Tabs.Size > 1)
-            ImQsort(tab_bar->Tabs.Data, tab_bar->Tabs.Size, sizeof(ImGuiTabItem), TabItemComparerByBeginOrder);
-    tab_bar->TabsAddedNew = false;
-
-    if ((flags & ImGuiTabBarFlags_FittingPolicyMask_) == 0)
-        flags |= ImGuiTabBarFlags_FittingPolicyDefault_;
-
-    tab_bar->Flags = flags;
-    tab_bar->BarRect = tab_bar_bb;
-    tab_bar->WantLayout = true;           
-    tab_bar->PrevFrameVisible = tab_bar->CurrFrameVisible;
-    tab_bar->CurrFrameVisible = g.FrameCount;
-    tab_bar->PrevTabsContentsHeight = tab_bar->CurrTabsContentsHeight;
-    tab_bar->CurrTabsContentsHeight = 0.0f;
-    tab_bar->ItemSpacingY = g.Style.ItemSpacing.y;
-    tab_bar->FramePadding = g.Style.FramePadding;
-    tab_bar->TabsActiveCount = 0;
-    tab_bar->BeginCount = 1;
-
-   window->DC.CursorPos = ImVec2(tab_bar->BarRect.Min.x, tab_bar->BarRect.Max.y + tab_bar->ItemSpacingY);
-
-    const ImU32 col = colWhite;
-
-    const float y = tab_bar->BarRect.Max.y - 1.0f;
-    {
-         float separator_min_x = tab_bar->BarRect.Min.x - IM_FLOOR(window->WindowPadding.x * 0.5f) + 2.0f ; 
-         float separator_max_x = tab_bar->BarRect.Max.x + IM_FLOOR(window->WindowPadding.x * 0.5f) - 2.0f ; 
-        window->DrawList->AddLine(ImVec2(separator_min_x, y), ImVec2(separator_max_x, y), col, 1.0f);
-
-        float vosem = 380.0f;
-        window->DrawList->AddLine(ImVec2(separator_min_x, y + vosem), ImVec2(separator_max_x, y + vosem), colBlack, 1.0f);
-
-        window->DrawList->AddLine(ImVec2(separator_min_x, y), ImVec2(separator_min_x, y + vosem), col, 1.0f);
-        window->DrawList->AddLine(ImVec2(separator_max_x, y), ImVec2(separator_max_x, y + vosem), colBlack, 1.0f);
-    }
-    return true;
-}
-
-void    ImGui::EndTabBar()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return;
-
-    ImGuiTabBar* tab_bar = g.CurrentTabBar;
-    if (tab_bar == NULL)
-    {
-        IM_ASSERT_USER_ERROR(tab_bar != NULL, "Mismatched BeginTabBar()/EndTabBar()!");
-        return;
-    }
-
-    if (tab_bar->WantLayout)
-        TabBarLayout(tab_bar);
-
-    const bool tab_bar_appearing = (tab_bar->PrevFrameVisible + 1 < g.FrameCount);
-    if (tab_bar->VisibleTabWasSubmitted || tab_bar->VisibleTabId == 0 || tab_bar_appearing)
-    {
-        tab_bar->CurrTabsContentsHeight = ImMax(window->DC.CursorPos.y - tab_bar->BarRect.Max.y, tab_bar->CurrTabsContentsHeight);
-        window->DC.CursorPos.y = tab_bar->BarRect.Max.y + tab_bar->CurrTabsContentsHeight;
-    }
-    else
-    {
-        window->DC.CursorPos.y = tab_bar->BarRect.Max.y + tab_bar->PrevTabsContentsHeight;
-    }
-    if (tab_bar->BeginCount > 1)
-        window->DC.CursorPos = tab_bar->BackupCursorPos;
-
-    if ((tab_bar->Flags & ImGuiTabBarFlags_DockNode) == 0)
-        PopID();
-
-    g.CurrentTabBarStack.pop_back();
-    g.CurrentTabBar = g.CurrentTabBarStack.empty() ? NULL : GetTabBarFromTabBarRef(g.CurrentTabBarStack.back());
-}
-
-static void ImGui::TabBarLayout(ImGuiTabBar* tab_bar)
-{
-    ImGuiContext& g = *GImGui;
-    tab_bar->WantLayout = false;
-
-    int tab_dst_n = 0;
-    bool need_sort_by_section = false;
-    ImGuiTabBarSection sections[3];      
-    for (int tab_src_n = 0; tab_src_n < tab_bar->Tabs.Size; tab_src_n++)
-    {
-        ImGuiTabItem* tab = &tab_bar->Tabs[tab_src_n];
-        if (tab->LastFrameVisible < tab_bar->PrevFrameVisible || tab->WantClose)
-        {
-            if (tab_bar->VisibleTabId == tab->ID) { tab_bar->VisibleTabId = 0; }
-            if (tab_bar->SelectedTabId == tab->ID) { tab_bar->SelectedTabId = 0; }
-            if (tab_bar->NextSelectedTabId == tab->ID) { tab_bar->NextSelectedTabId = 0; }
-            continue;
-        }
-        if (tab_dst_n != tab_src_n)
-            tab_bar->Tabs[tab_dst_n] = tab_bar->Tabs[tab_src_n];
-
-        tab = &tab_bar->Tabs[tab_dst_n];
-        tab->IndexDuringLayout = (ImS16)tab_dst_n;
-
-        int curr_tab_section_n = (tab->Flags & ImGuiTabItemFlags_Leading) ? 0 : (tab->Flags & ImGuiTabItemFlags_Trailing) ? 2 : 1;
-        if (tab_dst_n > 0)
-        {
-            ImGuiTabItem* prev_tab = &tab_bar->Tabs[tab_dst_n - 1];
-            int prev_tab_section_n = (prev_tab->Flags & ImGuiTabItemFlags_Leading) ? 0 : (prev_tab->Flags & ImGuiTabItemFlags_Trailing) ? 2 : 1;
-            if (curr_tab_section_n == 0 && prev_tab_section_n != 0)
-                need_sort_by_section = true;
-            if (prev_tab_section_n == 2 && curr_tab_section_n != 2)
-                need_sort_by_section = true;
-        }
-
-        sections[curr_tab_section_n].TabCount++;
-        tab_dst_n++;
-    }
-    if (tab_bar->Tabs.Size != tab_dst_n)
-        tab_bar->Tabs.resize(tab_dst_n);
-
-    if (need_sort_by_section)
-        ImQsort(tab_bar->Tabs.Data, tab_bar->Tabs.Size, sizeof(ImGuiTabItem), TabItemComparerBySection);
-
-    sections[0].Spacing = sections[0].TabCount > 0 && (sections[1].TabCount + sections[2].TabCount) > 0 ? g.Style.ItemInnerSpacing.x : 0.0f;
-    sections[1].Spacing = sections[1].TabCount > 0 && sections[2].TabCount > 0 ? g.Style.ItemInnerSpacing.x : 0.0f;
-
-    ImGuiID scroll_track_selected_tab_id = 0;
-    if (tab_bar->NextSelectedTabId)
-    {
-        tab_bar->SelectedTabId = tab_bar->NextSelectedTabId;
-        tab_bar->NextSelectedTabId = 0;
-        scroll_track_selected_tab_id = tab_bar->SelectedTabId;
-    }
-
-    if (tab_bar->ReorderRequestTabId != 0)
-    {
-        if (TabBarProcessReorder(tab_bar))
-            if (tab_bar->ReorderRequestTabId == tab_bar->SelectedTabId)
-                scroll_track_selected_tab_id = tab_bar->ReorderRequestTabId;
-        tab_bar->ReorderRequestTabId = 0;
-    }
-
-    const bool tab_list_popup_button = (tab_bar->Flags & ImGuiTabBarFlags_TabListPopupButton) != 0;
-    if (tab_list_popup_button)
-        if (ImGuiTabItem* tab_to_select = TabBarTabListPopupButton(tab_bar))     
-            scroll_track_selected_tab_id = tab_bar->SelectedTabId = tab_to_select->ID;
-
-    int shrink_buffer_indexes[3] = { 0, sections[0].TabCount + sections[2].TabCount, sections[0].TabCount };
-    g.ShrinkWidthBuffer.resize(tab_bar->Tabs.Size);
-
-    ImGuiTabItem* most_recently_selected_tab = NULL;
-    int curr_section_n = -1;
-    bool found_selected_tab_id = false;
-    for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++)
-    {
-        ImGuiTabItem* tab = &tab_bar->Tabs[tab_n];
-        IM_ASSERT(tab->LastFrameVisible >= tab_bar->PrevFrameVisible);
-
-        if ((most_recently_selected_tab == NULL || most_recently_selected_tab->LastFrameSelected < tab->LastFrameSelected) && !(tab->Flags & ImGuiTabItemFlags_Button))
-            most_recently_selected_tab = tab;
-        if (tab->ID == tab_bar->SelectedTabId)
-            found_selected_tab_id = true;
-        if (scroll_track_selected_tab_id == 0 && g.NavJustMovedToId == tab->ID)
-            scroll_track_selected_tab_id = tab->ID;
-
-        const char* tab_name = tab_bar->GetTabName(tab);
-        const bool has_close_button = (tab->Flags & ImGuiTabItemFlags_NoCloseButton) ? false : true;
-        tab->ContentWidth = TabItemCalcSize(tab_name, has_close_button).x;
-
-        int section_n = (tab->Flags & ImGuiTabItemFlags_Leading) ? 0 : (tab->Flags & ImGuiTabItemFlags_Trailing) ? 2 : 1;
-        ImGuiTabBarSection* section = &sections[section_n];
-        section->Width += tab->ContentWidth + (section_n == curr_section_n ? g.Style.ItemInnerSpacing.x : 0.0f);
-        curr_section_n = section_n;
-
-        int shrink_buffer_index = shrink_buffer_indexes[section_n]++;
-        g.ShrinkWidthBuffer[shrink_buffer_index].Index = tab_n;
-        g.ShrinkWidthBuffer[shrink_buffer_index].Width = tab->ContentWidth;
-
-        IM_ASSERT(tab->ContentWidth > 0.0f);
-        tab->Width = tab->ContentWidth;
-    }
-
-    tab_bar->WidthAllTabsIdeal = 0.0f;
-    for (int section_n = 0; section_n < 3; section_n++)
-        tab_bar->WidthAllTabsIdeal += sections[section_n].Width + sections[section_n].Spacing;
-
-    if ((tab_bar->WidthAllTabsIdeal > tab_bar->BarRect.GetWidth() && tab_bar->Tabs.Size > 1) && !(tab_bar->Flags & ImGuiTabBarFlags_NoTabListScrollingButtons) && (tab_bar->Flags & ImGuiTabBarFlags_FittingPolicyScroll))
-        if (ImGuiTabItem* scroll_track_selected_tab = TabBarScrollingButtons(tab_bar))
-        {
-            scroll_track_selected_tab_id = scroll_track_selected_tab->ID;
-            if (!(scroll_track_selected_tab->Flags & ImGuiTabItemFlags_Button))
-                tab_bar->SelectedTabId = scroll_track_selected_tab_id;
-        }
-
-    float section_0_w = sections[0].Width + sections[0].Spacing;
-    float section_1_w = sections[1].Width + sections[1].Spacing;
-    float section_2_w = sections[2].Width + sections[2].Spacing;
-    bool central_section_is_visible = (section_0_w + section_2_w) < tab_bar->BarRect.GetWidth();
-    float width_excess;
-    if (central_section_is_visible)
-        width_excess = ImMax(section_1_w - (tab_bar->BarRect.GetWidth() - section_0_w - section_2_w), 0.0f);       
-    else
-        width_excess = (section_0_w + section_2_w) - tab_bar->BarRect.GetWidth();       
-
-    if (width_excess > 0.0f && ((tab_bar->Flags & ImGuiTabBarFlags_FittingPolicyResizeDown) || !central_section_is_visible))
-    {
-        int shrink_data_count = (central_section_is_visible ? sections[1].TabCount : sections[0].TabCount + sections[2].TabCount);
-        int shrink_data_offset = (central_section_is_visible ? sections[0].TabCount + sections[2].TabCount : 0);
-        ShrinkWidths(g.ShrinkWidthBuffer.Data + shrink_data_offset, shrink_data_count, width_excess);
-
-        for (int tab_n = shrink_data_offset; tab_n < shrink_data_offset + shrink_data_count; tab_n++)
-        {
-            ImGuiTabItem* tab = &tab_bar->Tabs[g.ShrinkWidthBuffer[tab_n].Index];
-            float shrinked_width = IM_FLOOR(g.ShrinkWidthBuffer[tab_n].Width);
-            if (shrinked_width < 0.0f)
-                continue;
-
-            int section_n = (tab->Flags & ImGuiTabItemFlags_Leading) ? 0 : (tab->Flags & ImGuiTabItemFlags_Trailing) ? 2 : 1;
-            sections[section_n].Width -= (tab->Width - shrinked_width);
-            tab->Width = shrinked_width;
-        }
-    }
-
-    int section_tab_index = 0;
-    float tab_offset = 0.0f;
-    tab_bar->WidthAllTabs = 0.0f;
-    for (int section_n = 0; section_n < 3; section_n++)
-    {
-        ImGuiTabBarSection* section = &sections[section_n];
-        if (section_n == 2)
-            tab_offset = ImMin(ImMax(0.0f, tab_bar->BarRect.GetWidth() - section->Width), tab_offset);
-
-        for (int tab_n = 0; tab_n < section->TabCount; tab_n++)
-        {
-            ImGuiTabItem* tab = &tab_bar->Tabs[section_tab_index + tab_n];
-            tab->Offset = tab_offset;
-            tab_offset += tab->Width + (tab_n < section->TabCount - 1 ? g.Style.ItemInnerSpacing.x : 0.0f);
-        }
-        tab_bar->WidthAllTabs += ImMax(section->Width + section->Spacing, 0.0f);
-        tab_offset += section->Spacing;
-        section_tab_index += section->TabCount;
-    }
-
-    if (found_selected_tab_id == false)
-        tab_bar->SelectedTabId = 0;
-    if (tab_bar->SelectedTabId == 0 && tab_bar->NextSelectedTabId == 0 && most_recently_selected_tab != NULL)
-        scroll_track_selected_tab_id = tab_bar->SelectedTabId = most_recently_selected_tab->ID;
-
-    tab_bar->VisibleTabId = tab_bar->SelectedTabId;
-    tab_bar->VisibleTabWasSubmitted = false;
-
-    if (scroll_track_selected_tab_id)
-        if (ImGuiTabItem* scroll_track_selected_tab = TabBarFindTabByID(tab_bar, scroll_track_selected_tab_id))
-            TabBarScrollToTab(tab_bar, scroll_track_selected_tab, sections);
-    tab_bar->ScrollingAnim = TabBarScrollClamp(tab_bar, tab_bar->ScrollingAnim);
-    tab_bar->ScrollingTarget = TabBarScrollClamp(tab_bar, tab_bar->ScrollingTarget);
-    if (tab_bar->ScrollingAnim != tab_bar->ScrollingTarget)
-    {
-        tab_bar->ScrollingSpeed = ImMax(tab_bar->ScrollingSpeed, 70.0f * g.FontSize);
-        tab_bar->ScrollingSpeed = ImMax(tab_bar->ScrollingSpeed, ImFabs(tab_bar->ScrollingTarget - tab_bar->ScrollingAnim) / 0.3f);
-        const bool teleport = (tab_bar->PrevFrameVisible + 1 < g.FrameCount) || (tab_bar->ScrollingTargetDistToVisibility > 10.0f * g.FontSize);
-        tab_bar->ScrollingAnim = teleport ? tab_bar->ScrollingTarget : ImLinearSweep(tab_bar->ScrollingAnim, tab_bar->ScrollingTarget, g.IO.DeltaTime * tab_bar->ScrollingSpeed);
-    }
-    else
-    {
-        tab_bar->ScrollingSpeed = 0.0f;
-    }
-    tab_bar->ScrollingRectMinX = tab_bar->BarRect.Min.x + sections[0].Width + sections[0].Spacing;
-    tab_bar->ScrollingRectMaxX = tab_bar->BarRect.Max.x - sections[2].Width - sections[1].Spacing;
-
-    if ((tab_bar->Flags & ImGuiTabBarFlags_DockNode) == 0)
-        tab_bar->TabsNames.Buf.resize(0);
-
-    ImGuiWindow* window = g.CurrentWindow;
-    window->DC.CursorPos = tab_bar->BarRect.Min;
-    ItemSize(ImVec2(tab_bar->WidthAllTabs, tab_bar->BarRect.GetHeight()), tab_bar->FramePadding.y);
-    window->DC.IdealMaxPos.x = ImMax(window->DC.IdealMaxPos.x, tab_bar->BarRect.Min.x + tab_bar->WidthAllTabsIdeal);
-}
-
-static ImU32   ImGui::TabBarCalcTabID(ImGuiTabBar* tab_bar, const char* label)
-{
-    if (tab_bar->Flags & ImGuiTabBarFlags_DockNode)
-    {
-        ImGuiID id = ImHashStr(label);
-        KeepAliveID(id);
-        return id;
-    }
-    else
-    {
-        ImGuiWindow* window = GImGui->CurrentWindow;
-        return window->GetID(label);
-    }
-}
-
-static float ImGui::TabBarCalcMaxTabWidth()
-{
-    ImGuiContext& g = *GImGui;
-    return g.FontSize * 20.0f;
-}
-
-ImGuiTabItem* ImGui::TabBarFindTabByID(ImGuiTabBar* tab_bar, ImGuiID tab_id)
-{
-    if (tab_id != 0)
-        for (int n = 0; n < tab_bar->Tabs.Size; n++)
-            if (tab_bar->Tabs[n].ID == tab_id)
-                return &tab_bar->Tabs[n];
-    return NULL;
-}
-
-void ImGui::TabBarRemoveTab(ImGuiTabBar* tab_bar, ImGuiID tab_id)
-{
-    if (ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, tab_id))
-        tab_bar->Tabs.erase(tab);
-    if (tab_bar->VisibleTabId == tab_id)      { tab_bar->VisibleTabId = 0; }
-    if (tab_bar->SelectedTabId == tab_id)     { tab_bar->SelectedTabId = 0; }
-    if (tab_bar->NextSelectedTabId == tab_id) { tab_bar->NextSelectedTabId = 0; }
-}
-
-void ImGui::TabBarCloseTab(ImGuiTabBar* tab_bar, ImGuiTabItem* tab)
-{
-    IM_ASSERT(!(tab->Flags & ImGuiTabItemFlags_Button));
-    if (!(tab->Flags & ImGuiTabItemFlags_UnsavedDocument))
-    {
-        tab->WantClose = true;
-        if (tab_bar->VisibleTabId == tab->ID)
-        {
-            tab->LastFrameVisible = -1;
-            tab_bar->SelectedTabId = tab_bar->NextSelectedTabId = 0;
-        }
-    }
-    else
-    {
-        if (tab_bar->VisibleTabId != tab->ID)
-            tab_bar->NextSelectedTabId = tab->ID;
-    }
-}
-
-static float ImGui::TabBarScrollClamp(ImGuiTabBar* tab_bar, float scrolling)
-{
-    scrolling = ImMin(scrolling, tab_bar->WidthAllTabs - tab_bar->BarRect.GetWidth());
-    return ImMax(scrolling, 0.0f);
-}
-
-static void ImGui::TabBarScrollToTab(ImGuiTabBar* tab_bar, ImGuiTabItem* tab, ImGuiTabBarSection* sections)
-{
-    if (tab->Flags & (ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_Trailing))
-        return;
-
-    ImGuiContext& g = *GImGui;
-    float margin = g.FontSize * 1.0f;                           
-    int order = tab_bar->GetTabOrder(tab);
-
-    float scrollable_width = tab_bar->BarRect.GetWidth() - sections[0].Width - sections[2].Width - sections[1].Spacing;
-
-    float tab_x1 = tab->Offset - sections[0].Width + (order > sections[0].TabCount - 1 ? -margin : 0.0f);
-    float tab_x2 = tab->Offset - sections[0].Width + tab->Width + (order + 1 < tab_bar->Tabs.Size - sections[2].TabCount ? margin : 1.0f);
-    tab_bar->ScrollingTargetDistToVisibility = 0.0f;
-    if (tab_bar->ScrollingTarget > tab_x1 || (tab_x2 - tab_x1 >= scrollable_width))
-    {
-        tab_bar->ScrollingTargetDistToVisibility = ImMax(tab_bar->ScrollingAnim - tab_x2, 0.0f);
-        tab_bar->ScrollingTarget = tab_x1;
-    }
-    else if (tab_bar->ScrollingTarget < tab_x2 - scrollable_width)
-    {
-        tab_bar->ScrollingTargetDistToVisibility = ImMax((tab_x1 - scrollable_width) - tab_bar->ScrollingAnim, 0.0f);
-        tab_bar->ScrollingTarget = tab_x2 - scrollable_width;
-    }
-}
-
-void ImGui::TabBarQueueReorder(ImGuiTabBar* tab_bar, const ImGuiTabItem* tab, int dir)
-{
-    IM_ASSERT(dir == -1 || dir == +1);
-    IM_ASSERT(tab_bar->ReorderRequestTabId == 0);
-    tab_bar->ReorderRequestTabId = tab->ID;
-    tab_bar->ReorderRequestDir = (ImS8)dir;
-}
-
-bool ImGui::TabBarProcessReorder(ImGuiTabBar* tab_bar)
-{
-    ImGuiTabItem* tab1 = TabBarFindTabByID(tab_bar, tab_bar->ReorderRequestTabId);
-    if (tab1 == NULL || (tab1->Flags & ImGuiTabItemFlags_NoReorder))
-        return false;
-
-    int tab2_order = tab_bar->GetTabOrder(tab1) + tab_bar->ReorderRequestDir;
-    if (tab2_order < 0 || tab2_order >= tab_bar->Tabs.Size)
-        return false;
-
-    ImGuiTabItem* tab2 = &tab_bar->Tabs[tab2_order];
-    if (tab2->Flags & ImGuiTabItemFlags_NoReorder)
-        return false;
-    if ((tab1->Flags & (ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_Trailing)) != (tab2->Flags & (ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_Trailing)))
-        return false;
-
-    ImGuiTabItem item_tmp = *tab1;
-    *tab1 = *tab2;
-    *tab2 = item_tmp;
-
-    if (tab_bar->Flags & ImGuiTabBarFlags_SaveSettings)
-        MarkIniSettingsDirty();
-    return true;
-}
-
-static ImGuiTabItem* ImGui::TabBarScrollingButtons(ImGuiTabBar* tab_bar)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    const ImVec2 arrow_button_size(g.FontSize - 2.0f, g.FontSize + g.Style.FramePadding.y * 2.0f);
-    const float scrolling_buttons_width = arrow_button_size.x * 2.0f;
-
-    const ImVec2 backup_cursor_pos = window->DC.CursorPos;
-    int select_dir = 0;
-    ImVec4 arrow_col = g.Style.Colors[ImGuiCol_Text];
-    arrow_col.w *= 0.5f;
-
-    PushStyleColor(ImGuiCol_Text, arrow_col);
-    PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-    const float backup_repeat_delay = g.IO.KeyRepeatDelay;
-    const float backup_repeat_rate = g.IO.KeyRepeatRate;
-    g.IO.KeyRepeatDelay = 0.250f;
-    g.IO.KeyRepeatRate = 0.200f;
-    float x = ImMax(tab_bar->BarRect.Min.x, tab_bar->BarRect.Max.x - scrolling_buttons_width);
-    window->DC.CursorPos = ImVec2(x, tab_bar->BarRect.Min.y);
-    if (ArrowButtonEx("##<", ImGuiDir_Left, arrow_button_size, ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_Repeat))
-        select_dir = -1;
-    window->DC.CursorPos = ImVec2(x + arrow_button_size.x, tab_bar->BarRect.Min.y);
-    if (ArrowButtonEx("##>", ImGuiDir_Right, arrow_button_size, ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_Repeat))
-        select_dir = +1;
-    PopStyleColor(2);
-    g.IO.KeyRepeatRate = backup_repeat_rate;
-    g.IO.KeyRepeatDelay = backup_repeat_delay;
-
-    ImGuiTabItem* tab_to_scroll_to = NULL;
-    if (select_dir != 0)
-        if (ImGuiTabItem* tab_item = TabBarFindTabByID(tab_bar, tab_bar->SelectedTabId))
-        {
-            int selected_order = tab_bar->GetTabOrder(tab_item);
-            int target_order = selected_order + select_dir;
-
-            while (tab_to_scroll_to == NULL)
-            {
-                tab_to_scroll_to = &tab_bar->Tabs[(target_order >= 0 && target_order < tab_bar->Tabs.Size) ? target_order : selected_order];
-
-                if (tab_to_scroll_to->Flags & ImGuiTabItemFlags_Button)
-                {
-                    target_order += select_dir;
-                    selected_order += select_dir;
-                    tab_to_scroll_to = (target_order < 0 || target_order >= tab_bar->Tabs.Size) ? tab_to_scroll_to : NULL;
-                }
-            }
-        }
-    window->DC.CursorPos = backup_cursor_pos;
-    tab_bar->BarRect.Max.x -= scrolling_buttons_width + 1.0f;
-
-    return tab_to_scroll_to;
-}
-
-static ImGuiTabItem* ImGui::TabBarTabListPopupButton(ImGuiTabBar* tab_bar)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-
-    const float tab_list_popup_button_width = g.FontSize + g.Style.FramePadding.y;
-    const ImVec2 backup_cursor_pos = window->DC.CursorPos;
-    window->DC.CursorPos = ImVec2(tab_bar->BarRect.Min.x - g.Style.FramePadding.y, tab_bar->BarRect.Min.y);
-    tab_bar->BarRect.Min.x += tab_list_popup_button_width;
-
-    ImVec4 arrow_col = g.Style.Colors[ImGuiCol_Text];
-    arrow_col.w *= 0.5f;
-    PushStyleColor(ImGuiCol_Text, arrow_col);
-    PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-    bool open = BeginCombo("##v", NULL, ImGuiComboFlags_NoPreview | ImGuiComboFlags_HeightLargest);
-    PopStyleColor(2);
-
-    ImGuiTabItem* tab_to_select = NULL;
-    if (open)
-    {
-        for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++)
-        {
-            ImGuiTabItem* tab = &tab_bar->Tabs[tab_n];
-            if (tab->Flags & ImGuiTabItemFlags_Button)
-                continue;
-
-            const char* tab_name = tab_bar->GetTabName(tab);
-            if (Selectable(tab_name, tab_bar->SelectedTabId == tab->ID))
-                tab_to_select = tab;
-        }
-        EndCombo();
-    }
-
-    window->DC.CursorPos = backup_cursor_pos;
-    return tab_to_select;
-}
-
-bool    ImGui::BeginTabItem(const char* label, bool* p_open, ImGuiTabItemFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return false;
-
-    ImGuiTabBar* tab_bar = g.CurrentTabBar;
-    if (tab_bar == NULL)
-    {
-        IM_ASSERT_USER_ERROR(tab_bar, "Needs to be called between BeginTabBar() and EndTabBar()!");
-        return false;
-    }
-    IM_ASSERT(!(flags & ImGuiTabItemFlags_Button));           
-
-    bool ret = TabItemEx(tab_bar, label, p_open, flags);
-    if (ret && !(flags & ImGuiTabItemFlags_NoPushId))
-    {
-        ImGuiTabItem* tab = &tab_bar->Tabs[tab_bar->LastTabItemIdx];
-        PushOverrideID(tab->ID);                   
-    }
-    return ret;
-}
-
-void    ImGui::EndTabItem()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return;
-
-    ImGuiTabBar* tab_bar = g.CurrentTabBar;
-    if (tab_bar == NULL)
-    {
-        IM_ASSERT_USER_ERROR(tab_bar != NULL, "Needs to be called between BeginTabBar() and EndTabBar()!");
-        return;
-    }
-    IM_ASSERT(tab_bar->LastTabItemIdx >= 0);
-    ImGuiTabItem* tab = &tab_bar->Tabs[tab_bar->LastTabItemIdx];
-    if (!(tab->Flags & ImGuiTabItemFlags_NoPushId))
-        PopID();
-}
-
-bool    ImGui::TabItemButton(const char* label, ImGuiTabItemFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return false;
-
-    ImGuiTabBar* tab_bar = g.CurrentTabBar;
-    if (tab_bar == NULL)
-    {
-        IM_ASSERT_USER_ERROR(tab_bar != NULL, "Needs to be called between BeginTabBar() and EndTabBar()!");
-        return false;
-    }
-    return TabItemEx(tab_bar, label, NULL, flags | ImGuiTabItemFlags_Button | ImGuiTabItemFlags_NoReorder);
-}
-
-bool    ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, ImGuiTabItemFlags flags)
-{
-    if (tab_bar->WantLayout)
-        TabBarLayout(tab_bar);
-
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    if (window->SkipItems)
-        return false;
-
-    const ImGuiStyle& style = g.Style;
-    const ImGuiID id = TabBarCalcTabID(tab_bar, label);
-
-    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.LastItemStatusFlags);
-    if (p_open && !*p_open)
-    {
-        PushItemFlag(ImGuiItemFlags_NoNav | ImGuiItemFlags_NoNavDefaultFocus, true);
-        ItemAdd(ImRect(), id);
-        PopItemFlag();
-        return false;
-    }
-
-    IM_ASSERT(!p_open || !(flags & ImGuiTabItemFlags_Button));
-    IM_ASSERT((flags & (ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_Trailing)) != (ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_Trailing));       
-
-    if (flags & ImGuiTabItemFlags_NoCloseButton)
-        p_open = NULL;
-    else if (p_open == NULL)
-        flags |= ImGuiTabItemFlags_NoCloseButton;
-
-    ImVec2 size = TabItemCalcSize(label, p_open != NULL);
-    ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, id);
-    bool tab_is_new = false;
-    if (tab == NULL)
-    {
-        tab_bar->Tabs.push_back(ImGuiTabItem());
-        tab = &tab_bar->Tabs.back();
-        tab->ID = id;
-        tab->Width = size.x;
-        tab_bar->TabsAddedNew = true;
-        tab_is_new = true;
-    }
-    tab_bar->LastTabItemIdx = (ImS16)tab_bar->Tabs.index_from_ptr(tab);
-    tab->ContentWidth = size.x;
-    tab->BeginOrder = tab_bar->TabsActiveCount++;
-
-    const bool tab_bar_appearing = (tab_bar->PrevFrameVisible + 1 < g.FrameCount);
-    const bool tab_bar_focused = (tab_bar->Flags & ImGuiTabBarFlags_IsFocused) != 0;
-    const bool tab_appearing = (tab->LastFrameVisible + 1 < g.FrameCount);
-    const bool is_tab_button = (flags & ImGuiTabItemFlags_Button) != 0;
-    tab->LastFrameVisible = g.FrameCount;
-    tab->Flags = flags;
-
-    tab->NameOffset = (ImS16)tab_bar->TabsNames.size();
-    tab_bar->TabsNames.append(label, label + strlen(label) + 1);
-
-    if (tab_appearing && (tab_bar->Flags & ImGuiTabBarFlags_AutoSelectNewTabs) && tab_bar->NextSelectedTabId == 0)
-        if (!tab_bar_appearing || tab_bar->SelectedTabId == 0)
-            if (!is_tab_button)
-                tab_bar->NextSelectedTabId = id;      
-    if ((flags & ImGuiTabItemFlags_SetSelected) && (tab_bar->SelectedTabId != id))          
-        if (!is_tab_button)
-            tab_bar->NextSelectedTabId = id;
-
-    bool tab_contents_visible = (tab_bar->VisibleTabId == id);
-    if (tab_contents_visible)
-        tab_bar->VisibleTabWasSubmitted = true;
-
-    if (!tab_contents_visible && tab_bar->SelectedTabId == 0 && tab_bar_appearing)
-        if (tab_bar->Tabs.Size == 1 && !(tab_bar->Flags & ImGuiTabBarFlags_AutoSelectNewTabs))
-            tab_contents_visible = true;
-
-    if (tab_appearing && (!tab_bar_appearing || tab_is_new))
-    {
-        PushItemFlag(ImGuiItemFlags_NoNav | ImGuiItemFlags_NoNavDefaultFocus, true);
-        ItemAdd(ImRect(), id);
-        PopItemFlag();
-        if (is_tab_button)
-            return false;
-        return tab_contents_visible;
-    }
-
-    if (tab_bar->SelectedTabId == id)
-        tab->LastFrameSelected = g.FrameCount;
-
-    const ImVec2 backup_main_cursor_pos = window->DC.CursorPos;
-
-    const bool is_central_section = (tab->Flags & (ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_Trailing)) == 0;
-    size.x = tab->Width;
-    if (is_central_section)
-        window->DC.CursorPos = tab_bar->BarRect.Min + ImVec2(IM_FLOOR(tab->Offset - tab_bar->ScrollingAnim), 0.0f);
-    else
-        window->DC.CursorPos = tab_bar->BarRect.Min + ImVec2(tab->Offset, 0.0f);
-    ImVec2 pos = window->DC.CursorPos;
-    ImRect bb(pos, pos + size);
-
-    const bool want_clip_rect = is_central_section && (bb.Min.x < tab_bar->ScrollingRectMinX || bb.Max.x > tab_bar->ScrollingRectMaxX);
-    if (want_clip_rect)
-        PushClipRect(ImVec2(ImMax(bb.Min.x, tab_bar->ScrollingRectMinX), bb.Min.y - 1), ImVec2(tab_bar->ScrollingRectMaxX, bb.Max.y), true);
-
-    ImVec2 backup_cursor_max_pos = window->DC.CursorMaxPos;
-    ItemSize(bb.GetSize(), style.FramePadding.y);
-    window->DC.CursorMaxPos = backup_cursor_max_pos;
-
-    if (!ItemAdd(bb, id))
-    {
-        if (want_clip_rect)
-            PopClipRect();
-        window->DC.CursorPos = backup_main_cursor_pos;
-        return tab_contents_visible;
-    }
-
-    ImGuiButtonFlags button_flags = ((is_tab_button ? ImGuiButtonFlags_PressedOnClickRelease : ImGuiButtonFlags_PressedOnClick) | ImGuiButtonFlags_AllowItemOverlap);
-    if (g.DragDropActive)
-        button_flags |= ImGuiButtonFlags_PressedOnDragDropHold;
-    bool hovered, held;
-    bool pressed = ButtonBehavior(bb, id, &hovered, &held, button_flags);
-    if (pressed && !is_tab_button)
-        tab_bar->NextSelectedTabId = id;
-    hovered |= (g.HoveredId == id);
-
-    if (g.ActiveId != id)
-        SetItemAllowOverlap();
-
-    if (held && !tab_appearing && IsMouseDragging(0))
-    {
-        if (!g.DragDropActive && (tab_bar->Flags & ImGuiTabBarFlags_Reorderable))
-        {
-            if (g.IO.MouseDelta.x < 0.0f && g.IO.MousePos.x < bb.Min.x)
-            {
-                if (tab_bar->Flags & ImGuiTabBarFlags_Reorderable)
-                    TabBarQueueReorder(tab_bar, tab, -1);
-            }
-            else if (g.IO.MouseDelta.x > 0.0f && g.IO.MousePos.x > bb.Max.x)
-            {
-                if (tab_bar->Flags & ImGuiTabBarFlags_Reorderable)
-                    TabBarQueueReorder(tab_bar, tab, +1);
-            }
-        }
-    }
-
-#if 0
-    if (hovered && g.HoveredIdNotActiveTimer > TOOLTIP_DELAY && bb.GetWidth() < tab->ContentWidth)
-    {
-        bb.Max.x = bb.Min.x + IM_FLOOR(ImLerp(bb.GetWidth(), tab->ContentWidth, ImSaturate((g.HoveredIdNotActiveTimer - 0.40f) * 6.0f)));
-        display_draw_list = GetForegroundDrawList(window);
-        TabItemBackground(display_draw_list, bb, flags, GetColorU32(ImGuiCol_TitleBgActive));
-    }
-#endif
-
-    ImDrawList* display_draw_list = window->DrawList;
-    const ImU32 tab_col = GetColorU32(ImGuiCol_Tab);
-    bb.Min.y -= 5.0f;
-    if ( tab_contents_visible && tab_bar_focused) bb.Min.y -= 3.0f; 
-    bb.Max.x += 3.0f; bb.Max.y += 1.0f; 
-    TabItemBackground(display_draw_list, bb, flags, tab_col);
-
-    const float y2 = bb.Max.y - 1.0f;
-    if ((!tab_contents_visible && tab_bar_focused)) {
-        display_draw_list->PathLineTo(ImVec2(bb.Min.x + 0.5f, y2));
-        display_draw_list->PathLineTo(ImVec2(bb.Max.x - 0.5f, y2));
-        display_draw_list->PathStroke(colWhite, false, g.Style.TabBorderSize);
-    } 
-
-    RenderNavHighlight(bb, id);
-
-    const bool hovered_unblocked = IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup);
-    if (hovered_unblocked && (IsMouseClicked(1) || IsMouseReleased(1)))
-        if (!is_tab_button)
-            tab_bar->NextSelectedTabId = id;
-
-    if (tab_bar->Flags & ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)
-        flags |= ImGuiTabItemFlags_NoCloseWithMiddleMouseButton;
-
-    const ImGuiID close_button_id = p_open ? GetIDWithSeed("#CLOSE", NULL, id) : 0;
-    bool just_closed;
-    bool text_clipped;
-
-    bb.Min.y += 3.0f;
-    if ((!tab_contents_visible && tab_bar_focused))
-        TabItemLabelAndCloseButton(display_draw_list, bb, flags, tab_bar->FramePadding, label, id, close_button_id, tab_contents_visible, &just_closed, &text_clipped, false);
-    else
-        TabItemLabelAndCloseButton(display_draw_list, bb, flags, tab_bar->FramePadding, label, id, close_button_id, tab_contents_visible, &just_closed, &text_clipped);
-
-    if (just_closed && p_open != NULL)
-    {
-        *p_open = false;
-        TabBarCloseTab(tab_bar, tab);
-    }
-
-    if (want_clip_rect)
-        PopClipRect();
-    window->DC.CursorPos = backup_main_cursor_pos;
-
-    if (text_clipped && g.HoveredId == id && !held && g.HoveredIdNotActiveTimer > g.TooltipSlowDelay && IsItemHovered())
-        if (!(tab_bar->Flags & ImGuiTabBarFlags_NoTooltip) && !(tab->Flags & ImGuiTabItemFlags_NoTooltip))
-            SetTooltip("%.*s", (int)(FindRenderedTextEnd(label) - label), label);
-
-    IM_ASSERT(!is_tab_button || !(tab_bar->SelectedTabId == tab->ID && is_tab_button));      
-    if (is_tab_button)
-        return pressed;
-    return tab_contents_visible;
-}
-
-void    ImGui::SetTabItemClosed(const char* label)
-{
-    ImGuiContext& g = *GImGui;
-    bool is_within_manual_tab_bar = g.CurrentTabBar && !(g.CurrentTabBar->Flags & ImGuiTabBarFlags_DockNode);
-    if (is_within_manual_tab_bar)
-    {
-        ImGuiTabBar* tab_bar = g.CurrentTabBar;
-        ImGuiID tab_id = TabBarCalcTabID(tab_bar, label);
-        if (ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, tab_id))
-            tab->WantClose = true;         
-    }
-}
-
-ImVec2 ImGui::TabItemCalcSize(const char* label, bool has_close_button)
-{
-    ImGuiContext& g = *GImGui;
-    ImVec2 label_size = CalcTextSize(label, NULL, true);
-    ImVec2 size = ImVec2(label_size.x + g.Style.FramePadding.x, label_size.y + g.Style.FramePadding.y * 2.0f);
-    if (has_close_button)
-        size.x += g.Style.FramePadding.x + (g.Style.ItemInnerSpacing.x + g.FontSize);           
-    else
-        size.x += g.Style.FramePadding.x + 1.0f;
-
-    return ImVec2(ImMin(size.x, TabBarCalcMaxTabWidth()), size.y);
-}
-
-void ImGui::TabItemBackground(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImU32 col)
-{
-    ImGuiContext& g = *GImGui;
-    const float width = bb.GetWidth();
-    IM_UNUSED(flags);
-    IM_ASSERT(width > 0.0f);
-    const float rounding = ImMax(0.0f, ImMin((flags & ImGuiTabItemFlags_Button) ? g.Style.FrameRounding : g.Style.TabRounding, width * 0.5f - 1.0f));
-    const float y1 = bb.Min.y + 1.0f;
-    const float y2 = bb.Max.y - 1.0f;
-    draw_list->PathLineTo(ImVec2(bb.Min.x, y2));
-    draw_list->PathArcToFast(ImVec2(bb.Min.x + rounding, y1 + rounding), rounding, 6, 9);
-    draw_list->PathArcToFast(ImVec2(bb.Max.x - rounding, y1 + rounding), rounding, 9, 12);
-    draw_list->PathLineTo(ImVec2(bb.Max.x, y2));
-    draw_list->PathFillConvex(col);
-    if (g.Style.TabBorderSize > 0.0f)
-    {
-        draw_list->PathLineTo(ImVec2(bb.Min.x + 0.5f, y2));
-        draw_list->PathArcToFast(ImVec2(bb.Min.x + rounding + 0.5f, y1 + rounding + 0.5f), rounding, 6, 9);
-        draw_list->PathArcToFast(ImVec2(bb.Max.x - rounding - 0.5f, y1 + rounding + 0.5f), rounding, 9, 12);
-        draw_list->PathLineTo(ImVec2(bb.Max.x - 0.5f, y2));
-        draw_list->PathStroke(GetColorU32(ImGuiCol_Border), false, g.Style.TabBorderSize); 
-
-        draw_list->PathLineTo(ImVec2(bb.Max.x, y2));
-        draw_list->PathLineTo(ImVec2(bb.Max.x, bb.Min.y + 2.0f));
-        draw_list->PathStroke(colBlack, false, g.Style.TabBorderSize);
-    }
-}
-
-void ImGui::TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImVec2 frame_padding, const char* label, ImGuiID tab_id, ImGuiID close_button_id, bool is_contents_visible, bool* out_just_closed, bool* out_text_clipped, bool tabActive)
-{
-    ImGuiContext& g = *GImGui;
-    ImVec2 label_size = CalcTextSize(label, NULL, true);
-
-    if (out_just_closed)
-        *out_just_closed = false;
-    if (out_text_clipped)
-        *out_text_clipped = false;
-
-    if (bb.GetWidth() <= 1.0f)
-        return;
-
-#if 0
-    const float backup_alpha = g.Style.Alpha;
-    if (!is_contents_visible)
-        g.Style.Alpha *= 0.7f;
-#endif
-
-    const char* TAB_UNSAVED_MARKER = "*";
-    ImRect text_pixel_clip_bb(bb.Min.x + frame_padding.x, bb.Min.y + frame_padding.y, bb.Max.x - frame_padding.x, bb.Max.y);
-    if (flags & ImGuiTabItemFlags_UnsavedDocument)
-    {
-        text_pixel_clip_bb.Max.x -= CalcTextSize(TAB_UNSAVED_MARKER, NULL, false).x;
-        ImVec2 unsaved_marker_pos(ImMin(bb.Min.x + frame_padding.x + label_size.x + 2, text_pixel_clip_bb.Max.x), bb.Min.y + frame_padding.y + IM_FLOOR(-g.FontSize * 0.25f));
-        RenderTextClippedEx(draw_list, unsaved_marker_pos, bb.Max - frame_padding, TAB_UNSAVED_MARKER, NULL, NULL);
-    }
-    ImRect text_ellipsis_clip_bb = text_pixel_clip_bb;
-
-    if (out_text_clipped)
-    {
-        *out_text_clipped = (text_ellipsis_clip_bb.Min.x + label_size.x) > text_pixel_clip_bb.Max.x;
-    }
-
-    bool close_button_pressed = false;
-    bool close_button_visible = false;
-    if (close_button_id != 0)
-        if (is_contents_visible || bb.GetWidth() >= g.Style.TabMinWidthForCloseButton)
-            if (g.HoveredId == tab_id || g.HoveredId == close_button_id || g.ActiveId == tab_id || g.ActiveId == close_button_id)
-                close_button_visible = true;
-    if (close_button_visible)
-    {
-        ImGuiLastItemDataBackup last_item_backup;
-        const float close_button_sz = g.FontSize;
-        PushStyleVar(ImGuiStyleVar_FramePadding, frame_padding);
-        if (CloseButton(close_button_id, ImVec2(bb.Max.x - frame_padding.x * 2.0f - close_button_sz, bb.Min.y)))
-            close_button_pressed = true;
-        PopStyleVar();
-        last_item_backup.Restore();
-
-        if (!(flags & ImGuiTabItemFlags_NoCloseWithMiddleMouseButton) && IsMouseClicked(2))
-            close_button_pressed = true;
-
-        text_pixel_clip_bb.Max.x -= close_button_sz;
-    }
-
-    float ellipsis_max_x = close_button_visible ? text_pixel_clip_bb.Max.x : bb.Max.x - 1.0f;
-    
-    if (!tabActive)
-        RenderTextEllipsis(draw_list, text_ellipsis_clip_bb.Min, text_ellipsis_clip_bb.Max, text_pixel_clip_bb.Max.x, ellipsis_max_x, label, NULL, &label_size, colWhiteText);
-    else
-        RenderTextEllipsis(draw_list, text_ellipsis_clip_bb.Min, text_ellipsis_clip_bb.Max, text_pixel_clip_bb.Max.x, ellipsis_max_x, label, NULL, &label_size);
-
-#if 0
-    if (!is_contents_visible)
-        g.Style.Alpha = backup_alpha;
-#endif
-
-    if (out_just_closed)
-        *out_just_closed = close_button_pressed;
-}
-
-
-#endif   
diff --git a/SpyCustom/imgui/imstb_rectpack.h b/SpyCustom/imgui/imstb_rectpack.h
deleted file mode 100644
index 4b17a99..0000000
--- a/SpyCustom/imgui/imstb_rectpack.h
+++ /dev/null
@@ -1,403 +0,0 @@
-#ifndef STB_INCLUDE_STB_RECT_PACK_H
-#define STB_INCLUDE_STB_RECT_PACK_H
-
-#define STB_RECT_PACK_VERSION  1
-
-#ifdef STBRP_STATIC
-#define STBRP_DEF static
-#else
-#define STBRP_DEF extern
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct stbrp_context stbrp_context;
-typedef struct stbrp_node    stbrp_node;
-typedef struct stbrp_rect    stbrp_rect;
-
-#ifdef STBRP_LARGE_RECTS
-typedef int            stbrp_coord;
-#else
-typedef unsigned short stbrp_coord;
-#endif
-
-STBRP_DEF int stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects);
-struct stbrp_rect
-{
-   int            id;
-
-   stbrp_coord    w, h;
-
-   stbrp_coord    x, y;
-   int            was_packed;      
-
-};    
-
-
-STBRP_DEF void stbrp_init_target (stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes);
-STBRP_DEF void stbrp_setup_allow_out_of_mem (stbrp_context *context, int allow_out_of_mem);
-
-STBRP_DEF void stbrp_setup_heuristic (stbrp_context *context, int heuristic);
-enum
-{
-   STBRP_HEURISTIC_Skyline_default=0,
-   STBRP_HEURISTIC_Skyline_BL_sortHeight = STBRP_HEURISTIC_Skyline_default,
-   STBRP_HEURISTIC_Skyline_BF_sortHeight
-};
-
-
-struct stbrp_node
-{
-   stbrp_coord  x,y;
-   stbrp_node  *next;
-};
-
-struct stbrp_context
-{
-   int width;
-   int height;
-   int align;
-   int init_mode;
-   int heuristic;
-   int num_nodes;
-   stbrp_node *active_head;
-   stbrp_node *free_head;
-   stbrp_node extra[2];             
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#ifdef STB_RECT_PACK_IMPLEMENTATION
-#ifndef STBRP_SORT
-#include <stdlib.h>
-#define STBRP_SORT qsort
-#endif
-
-#ifndef STBRP_ASSERT
-#include <assert.h>
-#define STBRP_ASSERT assert
-#endif
-
-#ifdef _MSC_VER
-#define STBRP__NOTUSED(v)  (void)(v)
-#define STBRP__CDECL __cdecl
-#else
-#define STBRP__NOTUSED(v)  (void)sizeof(v)
-#define STBRP__CDECL
-#endif
-
-enum
-{
-   STBRP__INIT_skyline = 1
-};
-
-STBRP_DEF void stbrp_setup_heuristic(stbrp_context *context, int heuristic)
-{
-   switch (context->init_mode) {
-      case STBRP__INIT_skyline:
-         STBRP_ASSERT(heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight || heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight);
-         context->heuristic = heuristic;
-         break;
-      default:
-         STBRP_ASSERT(0);
-   }
-}
-
-STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_out_of_mem)
-{
-   if (allow_out_of_mem)
-      context->align = 1;
-   else {
-      context->align = (context->width + context->num_nodes-1) / context->num_nodes;
-   }
-}
-
-STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes)
-{
-   int i;
-#ifndef STBRP_LARGE_RECTS
-   STBRP_ASSERT(width <= 0xffff && height <= 0xffff);
-#endif
-
-   for (i=0; i < num_nodes-1; ++i)
-      nodes[i].next = &nodes[i+1];
-   nodes[i].next = NULL;
-   context->init_mode = STBRP__INIT_skyline;
-   context->heuristic = STBRP_HEURISTIC_Skyline_default;
-   context->free_head = &nodes[0];
-   context->active_head = &context->extra[0];
-   context->width = width;
-   context->height = height;
-   context->num_nodes = num_nodes;
-   stbrp_setup_allow_out_of_mem(context, 0);
-
-   context->extra[0].x = 0;
-   context->extra[0].y = 0;
-   context->extra[0].next = &context->extra[1];
-   context->extra[1].x = (stbrp_coord) width;
-#ifdef STBRP_LARGE_RECTS
-   context->extra[1].y = (1<<30);
-#else
-   context->extra[1].y = 65535;
-#endif
-   context->extra[1].next = NULL;
-}
-
-static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0, int width, int *pwaste)
-{
-   stbrp_node *node = first;
-   int x1 = x0 + width;
-   int min_y, visited_width, waste_area;
-
-   STBRP__NOTUSED(c);
-
-   STBRP_ASSERT(first->x <= x0);
-
-   #if 0
-   while (node->next->x <= x0)
-      ++node;
-   #else
-   STBRP_ASSERT(node->next->x > x0);           
-   #endif
-
-   STBRP_ASSERT(node->x <= x0);
-
-   min_y = 0;
-   waste_area = 0;
-   visited_width = 0;
-   while (node->x < x1) {
-      if (node->y > min_y) {
-         waste_area += visited_width * (node->y - min_y);
-         min_y = node->y;
-         if (node->x < x0)
-            visited_width += node->next->x - x0;
-         else
-            visited_width += node->next->x - node->x;
-      } else {
-         int under_width = node->next->x - node->x;
-         if (under_width + visited_width > width)
-            under_width = width - visited_width;
-         waste_area += under_width * (min_y - node->y);
-         visited_width += under_width;
-      }
-      node = node->next;
-   }
-
-   *pwaste = waste_area;
-   return min_y;
-}
-
-typedef struct
-{
-   int x,y;
-   stbrp_node **prev_link;
-} stbrp__findresult;
-
-static stbrp__findresult stbrp__skyline_find_best_pos(stbrp_context *c, int width, int height)
-{
-   int best_waste = (1<<30), best_x, best_y = (1 << 30);
-   stbrp__findresult fr;
-   stbrp_node **prev, *node, *tail, **best = NULL;
-
-   width = (width + c->align - 1);
-   width -= width % c->align;
-   STBRP_ASSERT(width % c->align == 0);
-
-   if (width > c->width || height > c->height) {
-      fr.prev_link = NULL;
-      fr.x = fr.y = 0;
-      return fr;
-   }
-
-   node = c->active_head;
-   prev = &c->active_head;
-   while (node->x + width <= c->width) {
-      int y,waste;
-      y = stbrp__skyline_find_min_y(c, node, node->x, width, &waste);
-      if (c->heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight) {       
-         if (y < best_y) {
-            best_y = y;
-            best = prev;
-         }
-      } else {
-         if (y + height <= c->height) {
-            if (y < best_y || (y == best_y && waste < best_waste)) {
-               best_y = y;
-               best_waste = waste;
-               best = prev;
-            }
-         }
-      }
-      prev = &node->next;
-      node = node->next;
-   }
-
-   best_x = (best == NULL) ? 0 : (*best)->x;
-
-   if (c->heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight) {
-      tail = c->active_head;
-      node = c->active_head;
-      prev = &c->active_head;
-      while (tail->x < width)
-         tail = tail->next;
-      while (tail) {
-         int xpos = tail->x - width;
-         int y,waste;
-         STBRP_ASSERT(xpos >= 0);
-         while (node->next->x <= xpos) {
-            prev = &node->next;
-            node = node->next;
-         }
-         STBRP_ASSERT(node->next->x > xpos && node->x <= xpos);
-         y = stbrp__skyline_find_min_y(c, node, xpos, width, &waste);
-         if (y + height <= c->height) {
-            if (y <= best_y) {
-               if (y < best_y || waste < best_waste || (waste==best_waste && xpos < best_x)) {
-                  best_x = xpos;
-                  STBRP_ASSERT(y <= best_y);
-                  best_y = y;
-                  best_waste = waste;
-                  best = prev;
-               }
-            }
-         }
-         tail = tail->next;
-      }         
-   }
-
-   fr.prev_link = best;
-   fr.x = best_x;
-   fr.y = best_y;
-   return fr;
-}
-
-static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, int width, int height)
-{
-   stbrp__findresult res = stbrp__skyline_find_best_pos(context, width, height);
-   stbrp_node *node, *cur;
-
-   if (res.prev_link == NULL || res.y + height > context->height || context->free_head == NULL) {
-      res.prev_link = NULL;
-      return res;
-   }
-
-   node = context->free_head;
-   node->x = (stbrp_coord) res.x;
-   node->y = (stbrp_coord) (res.y + height);
-
-   context->free_head = node->next;
-
-   cur = *res.prev_link;
-   if (cur->x < res.x) {
-      stbrp_node *next = cur->next;
-      cur->next = node;
-      cur = next;
-   } else {
-      *res.prev_link = node;
-   }
-
-   while (cur->next && cur->next->x <= res.x + width) {
-      stbrp_node *next = cur->next;
-      cur->next = context->free_head;
-      context->free_head = cur;
-      cur = next;
-   }
-
-   node->next = cur;
-
-   if (cur->x < res.x + width)
-      cur->x = (stbrp_coord) (res.x + width);
-
-#ifdef _DEBUG
-   cur = context->active_head;
-   while (cur->x < context->width) {
-      STBRP_ASSERT(cur->x < cur->next->x);
-      cur = cur->next;
-   }
-   STBRP_ASSERT(cur->next == NULL);
-
-   {
-      int count=0;
-      cur = context->active_head;
-      while (cur) {
-         cur = cur->next;
-         ++count;
-      }
-      cur = context->free_head;
-      while (cur) {
-         cur = cur->next;
-         ++count;
-      }
-      STBRP_ASSERT(count == context->num_nodes+2);
-   }
-#endif
-
-   return res;
-}
-
-static int STBRP__CDECL rect_height_compare(const void *a, const void *b)
-{
-   const stbrp_rect *p = (const stbrp_rect *) a;
-   const stbrp_rect *q = (const stbrp_rect *) b;
-   if (p->h > q->h)
-      return -1;
-   if (p->h < q->h)
-      return  1;
-   return (p->w > q->w) ? -1 : (p->w < q->w);
-}
-
-static int STBRP__CDECL rect_original_order(const void *a, const void *b)
-{
-   const stbrp_rect *p = (const stbrp_rect *) a;
-   const stbrp_rect *q = (const stbrp_rect *) b;
-   return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed);
-}
-
-#ifdef STBRP_LARGE_RECTS
-#define STBRP__MAXVAL  0xffffffff
-#else
-#define STBRP__MAXVAL  0xffff
-#endif
-
-STBRP_DEF int stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects)
-{
-   int i, all_rects_packed = 1;
-
-   for (i=0; i < num_rects; ++i) {
-      rects[i].was_packed = i;
-   }
-
-   STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_height_compare);
-
-   for (i=0; i < num_rects; ++i) {
-      if (rects[i].w == 0 || rects[i].h == 0) {
-         rects[i].x = rects[i].y = 0;       
-      } else {
-         stbrp__findresult fr = stbrp__skyline_pack_rectangle(context, rects[i].w, rects[i].h);
-         if (fr.prev_link) {
-            rects[i].x = (stbrp_coord) fr.x;
-            rects[i].y = (stbrp_coord) fr.y;
-         } else {
-            rects[i].x = rects[i].y = STBRP__MAXVAL;
-         }
-      }
-   }
-
-   STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_original_order);
-
-   for (i=0; i < num_rects; ++i) {
-      rects[i].was_packed = !(rects[i].x == STBRP__MAXVAL && rects[i].y == STBRP__MAXVAL);
-      if (!rects[i].was_packed)
-         all_rects_packed = 0;
-   }
-
-   return all_rects_packed;
-}
-#endif
-
diff --git a/SpyCustom/imgui/imstb_textedit.h b/SpyCustom/imgui/imstb_textedit.h
deleted file mode 100644
index 0f94cfe..0000000
--- a/SpyCustom/imgui/imstb_textedit.h
+++ /dev/null
@@ -1,968 +0,0 @@
-
-#ifndef INCLUDE_STB_TEXTEDIT_H
-#define INCLUDE_STB_TEXTEDIT_H
-
-#ifndef STB_TEXTEDIT_UNDOSTATECOUNT
-#define STB_TEXTEDIT_UNDOSTATECOUNT   99
-#endif
-#ifndef STB_TEXTEDIT_UNDOCHARCOUNT
-#define STB_TEXTEDIT_UNDOCHARCOUNT   999
-#endif
-#ifndef STB_TEXTEDIT_CHARTYPE
-#define STB_TEXTEDIT_CHARTYPE        int
-#endif
-#ifndef STB_TEXTEDIT_POSITIONTYPE
-#define STB_TEXTEDIT_POSITIONTYPE    int
-#endif
-
-typedef struct
-{
-   STB_TEXTEDIT_POSITIONTYPE  where;
-   STB_TEXTEDIT_POSITIONTYPE  insert_length;
-   STB_TEXTEDIT_POSITIONTYPE  delete_length;
-   int                        char_storage;
-} StbUndoRecord;
-
-typedef struct
-{
-   StbUndoRecord          undo_rec [STB_TEXTEDIT_UNDOSTATECOUNT];
-   STB_TEXTEDIT_CHARTYPE  undo_char[STB_TEXTEDIT_UNDOCHARCOUNT];
-   short undo_point, redo_point;
-   int undo_char_point, redo_char_point;
-} StbUndoState;
-
-typedef struct
-{
-   int cursor;
-   int select_start;             
-   int select_end;
-   unsigned char insert_mode;
-   int row_count_per_page;
-   unsigned char cursor_at_end_of_line;    
-   unsigned char initialized;
-   unsigned char has_preferred_x;
-   unsigned char single_line;
-   unsigned char padding1, padding2, padding3;
-   float preferred_x;             
-   StbUndoState undostate;
-} STB_TexteditState;
-
-
-typedef struct
-{
-   float x0,x1;                       
-   float baseline_y_delta;          
-   float ymin,ymax;                
-   int num_chars;
-} StbTexteditRow;
-#endif 
-
-
-
-#ifdef STB_TEXTEDIT_IMPLEMENTATION
-
-#ifndef STB_TEXTEDIT_memmove
-#include <string.h>
-#define STB_TEXTEDIT_memmove memmove
-#endif
-
-
-static int stb_text_locate_coord(STB_TEXTEDIT_STRING *str, float x, float y)
-{
-   StbTexteditRow r;
-   int n = STB_TEXTEDIT_STRINGLEN(str);
-   float base_y = 0, prev_x;
-   int i=0, k;
-
-   r.x0 = r.x1 = 0;
-   r.ymin = r.ymax = 0;
-   r.num_chars = 0;
-
-   while (i < n) {
-      STB_TEXTEDIT_LAYOUTROW(&r, str, i);
-      if (r.num_chars <= 0)
-         return n;
-
-      if (i==0 && y < base_y + r.ymin)
-         return 0;
-
-      if (y < base_y + r.ymax)
-         break;
-
-      i += r.num_chars;
-      base_y += r.baseline_y_delta;
-   }
-
-   if (i >= n)
-      return n;
-
-   if (x < r.x0)
-      return i;
-
-   if (x < r.x1) {
-      prev_x = r.x0;
-      for (k=0; k < r.num_chars; ++k) {
-         float w = STB_TEXTEDIT_GETWIDTH(str, i, k);
-         if (x < prev_x+w) {
-            if (x < prev_x+w/2)
-               return k+i;
-            else
-               return k+i+1;
-         }
-         prev_x += w;
-      }
-   }
-
-   if (STB_TEXTEDIT_GETCHAR(str, i+r.num_chars-1) == STB_TEXTEDIT_NEWLINE)
-      return i+r.num_chars-1;
-   else
-      return i+r.num_chars;
-}
-
-static void stb_textedit_click(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, float x, float y)
-{
-   if( state->single_line )
-   {
-      StbTexteditRow r;
-      STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
-      y = r.ymin;
-   }
-
-   state->cursor = stb_text_locate_coord(str, x, y);
-   state->select_start = state->cursor;
-   state->select_end = state->cursor;
-   state->has_preferred_x = 0;
-}
-
-static void stb_textedit_drag(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, float x, float y)
-{
-   int p = 0;
-
-   if( state->single_line )
-   {
-      StbTexteditRow r;
-      STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
-      y = r.ymin;
-   }
-
-   if (state->select_start == state->select_end)
-      state->select_start = state->cursor;
-
-   p = stb_text_locate_coord(str, x, y);
-   state->cursor = state->select_end = p;
-}
-
-static void stb_text_undo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state);
-static void stb_text_redo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state);
-static void stb_text_makeundo_delete(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int length);
-static void stb_text_makeundo_insert(STB_TexteditState *state, int where, int length);
-static void stb_text_makeundo_replace(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int old_length, int new_length);
-
-typedef struct
-{
-   float x,y;        
-   float height;    
-   int first_char, length;       
-   int prev_first;       
-} StbFindState;
-
-static void stb_textedit_find_charpos(StbFindState *find, STB_TEXTEDIT_STRING *str, int n, int single_line)
-{
-   StbTexteditRow r;
-   int prev_start = 0;
-   int z = STB_TEXTEDIT_STRINGLEN(str);
-   int i=0, first;
-
-   if (n == z) {
-      if (single_line) {
-         STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
-         find->y = 0;
-         find->first_char = 0;
-         find->length = z;
-         find->height = r.ymax - r.ymin;
-         find->x = r.x1;
-      } else {
-         find->y = 0;
-         find->x = 0;
-         find->height = 1;
-         while (i < z) {
-            STB_TEXTEDIT_LAYOUTROW(&r, str, i);
-            prev_start = i;
-            i += r.num_chars;
-         }
-         find->first_char = i;
-         find->length = 0;
-         find->prev_first = prev_start;
-      }
-      return;
-   }
-
-   find->y = 0;
-
-   for(;;) {
-      STB_TEXTEDIT_LAYOUTROW(&r, str, i);
-      if (n < i + r.num_chars)
-         break;
-      prev_start = i;
-      i += r.num_chars;
-      find->y += r.baseline_y_delta;
-   }
-
-   find->first_char = first = i;
-   find->length = r.num_chars;
-   find->height = r.ymax - r.ymin;
-   find->prev_first = prev_start;
-
-   find->x = r.x0;
-   for (i=0; first+i < n; ++i)
-      find->x += STB_TEXTEDIT_GETWIDTH(str, first, i);
-}
-
-#define STB_TEXT_HAS_SELECTION(s)   ((s)->select_start != (s)->select_end)
-
-static void stb_textedit_clamp(STB_TEXTEDIT_STRING *str, STB_TexteditState *state)
-{
-   int n = STB_TEXTEDIT_STRINGLEN(str);
-   if (STB_TEXT_HAS_SELECTION(state)) {
-      if (state->select_start > n) state->select_start = n;
-      if (state->select_end   > n) state->select_end = n;
-      if (state->select_start == state->select_end)
-         state->cursor = state->select_start;
-   }
-   if (state->cursor > n) state->cursor = n;
-}
-
-static void stb_textedit_delete(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int len)
-{
-   stb_text_makeundo_delete(str, state, where, len);
-   STB_TEXTEDIT_DELETECHARS(str, where, len);
-   state->has_preferred_x = 0;
-}
-
-static void stb_textedit_delete_selection(STB_TEXTEDIT_STRING *str, STB_TexteditState *state)
-{
-   stb_textedit_clamp(str, state);
-   if (STB_TEXT_HAS_SELECTION(state)) {
-      if (state->select_start < state->select_end) {
-         stb_textedit_delete(str, state, state->select_start, state->select_end - state->select_start);
-         state->select_end = state->cursor = state->select_start;
-      } else {
-         stb_textedit_delete(str, state, state->select_end, state->select_start - state->select_end);
-         state->select_start = state->cursor = state->select_end;
-      }
-      state->has_preferred_x = 0;
-   }
-}
-
-static void stb_textedit_sortselection(STB_TexteditState *state)
-{
-   if (state->select_end < state->select_start) {
-      int temp = state->select_end;
-      state->select_end = state->select_start;
-      state->select_start = temp;
-   }
-}
-
-static void stb_textedit_move_to_first(STB_TexteditState *state)
-{
-   if (STB_TEXT_HAS_SELECTION(state)) {
-      stb_textedit_sortselection(state);
-      state->cursor = state->select_start;
-      state->select_end = state->select_start;
-      state->has_preferred_x = 0;
-   }
-}
-
-static void stb_textedit_move_to_last(STB_TEXTEDIT_STRING *str, STB_TexteditState *state)
-{
-   if (STB_TEXT_HAS_SELECTION(state)) {
-      stb_textedit_sortselection(state);
-      stb_textedit_clamp(str, state);
-      state->cursor = state->select_end;
-      state->select_start = state->select_end;
-      state->has_preferred_x = 0;
-   }
-}
-
-#ifdef STB_TEXTEDIT_IS_SPACE
-static int is_word_boundary( STB_TEXTEDIT_STRING *str, int idx )
-{
-   return idx > 0 ? (STB_TEXTEDIT_IS_SPACE( STB_TEXTEDIT_GETCHAR(str,idx-1) ) && !STB_TEXTEDIT_IS_SPACE( STB_TEXTEDIT_GETCHAR(str, idx) ) ) : 1;
-}
-
-#ifndef STB_TEXTEDIT_MOVEWORDLEFT
-static int stb_textedit_move_to_word_previous( STB_TEXTEDIT_STRING *str, int c )
-{
-   --c;       
-   while( c >= 0 && !is_word_boundary( str, c ) )
-      --c;
-
-   if( c < 0 )
-      c = 0;
-
-   return c;
-}
-#define STB_TEXTEDIT_MOVEWORDLEFT stb_textedit_move_to_word_previous
-#endif
-
-#ifndef STB_TEXTEDIT_MOVEWORDRIGHT
-static int stb_textedit_move_to_word_next( STB_TEXTEDIT_STRING *str, int c )
-{
-   const int len = STB_TEXTEDIT_STRINGLEN(str);
-   ++c;       
-   while( c < len && !is_word_boundary( str, c ) )
-      ++c;
-
-   if( c > len )
-      c = len;
-
-   return c;
-}
-#define STB_TEXTEDIT_MOVEWORDRIGHT stb_textedit_move_to_word_next
-#endif
-
-#endif
-
-static void stb_textedit_prep_selection_at_cursor(STB_TexteditState *state)
-{
-   if (!STB_TEXT_HAS_SELECTION(state))
-      state->select_start = state->select_end = state->cursor;
-   else
-      state->cursor = state->select_end;
-}
-
-static int stb_textedit_cut(STB_TEXTEDIT_STRING *str, STB_TexteditState *state)
-{
-   if (STB_TEXT_HAS_SELECTION(state)) {
-      stb_textedit_delete_selection(str,state);   
-      state->has_preferred_x = 0;
-      return 1;
-   }
-   return 0;
-}
-
-static int stb_textedit_paste_internal(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_CHARTYPE *text, int len)
-{
-   stb_textedit_clamp(str, state);
-   stb_textedit_delete_selection(str,state);
-   if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, text, len)) {
-      stb_text_makeundo_insert(state, state->cursor, len);
-      state->cursor += len;
-      state->has_preferred_x = 0;
-      return 1;
-   }
-   if (state->undostate.undo_point)
-      --state->undostate.undo_point;
-   return 0;
-}
-
-#ifndef STB_TEXTEDIT_KEYTYPE
-#define STB_TEXTEDIT_KEYTYPE int
-#endif
-
-static void stb_textedit_key(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_KEYTYPE key)
-{
-retry:
-   switch (key) {
-      default: {
-         int c = STB_TEXTEDIT_KEYTOTEXT(key);
-         if (c > 0) {
-            STB_TEXTEDIT_CHARTYPE ch = (STB_TEXTEDIT_CHARTYPE) c;
-
-            if (c == '\n' && state->single_line)
-               break;
-
-            if (state->insert_mode && !STB_TEXT_HAS_SELECTION(state) && state->cursor < STB_TEXTEDIT_STRINGLEN(str)) {
-               stb_text_makeundo_replace(str, state, state->cursor, 1, 1);
-               STB_TEXTEDIT_DELETECHARS(str, state->cursor, 1);
-               if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, &ch, 1)) {
-                  ++state->cursor;
-                  state->has_preferred_x = 0;
-               }
-            } else {
-               stb_textedit_delete_selection(str,state);   
-               if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, &ch, 1)) {
-                  stb_text_makeundo_insert(state, state->cursor, 1);
-                  ++state->cursor;
-                  state->has_preferred_x = 0;
-               }
-            }
-         }
-         break;
-      }
-
-#ifdef STB_TEXTEDIT_K_INSERT
-      case STB_TEXTEDIT_K_INSERT:
-         state->insert_mode = !state->insert_mode;
-         break;
-#endif
-         
-      case STB_TEXTEDIT_K_UNDO:
-         stb_text_undo(str, state);
-         state->has_preferred_x = 0;
-         break;
-
-      case STB_TEXTEDIT_K_REDO:
-         stb_text_redo(str, state);
-         state->has_preferred_x = 0;
-         break;
-
-      case STB_TEXTEDIT_K_LEFT:
-         if (STB_TEXT_HAS_SELECTION(state))
-            stb_textedit_move_to_first(state);
-         else 
-            if (state->cursor > 0)
-               --state->cursor;
-         state->has_preferred_x = 0;
-         break;
-
-      case STB_TEXTEDIT_K_RIGHT:
-         if (STB_TEXT_HAS_SELECTION(state))
-            stb_textedit_move_to_last(str, state);
-         else
-            ++state->cursor;
-         stb_textedit_clamp(str, state);
-         state->has_preferred_x = 0;
-         break;
-
-      case STB_TEXTEDIT_K_LEFT | STB_TEXTEDIT_K_SHIFT:
-         stb_textedit_clamp(str, state);
-         stb_textedit_prep_selection_at_cursor(state);
-         if (state->select_end > 0)
-            --state->select_end;
-         state->cursor = state->select_end;
-         state->has_preferred_x = 0;
-         break;
-
-#ifdef STB_TEXTEDIT_MOVEWORDLEFT
-      case STB_TEXTEDIT_K_WORDLEFT:
-         if (STB_TEXT_HAS_SELECTION(state))
-            stb_textedit_move_to_first(state);
-         else {
-            state->cursor = STB_TEXTEDIT_MOVEWORDLEFT(str, state->cursor);
-            stb_textedit_clamp( str, state );
-         }
-         break;
-
-      case STB_TEXTEDIT_K_WORDLEFT | STB_TEXTEDIT_K_SHIFT:
-         if( !STB_TEXT_HAS_SELECTION( state ) )
-            stb_textedit_prep_selection_at_cursor(state);
-
-         state->cursor = STB_TEXTEDIT_MOVEWORDLEFT(str, state->cursor);
-         state->select_end = state->cursor;
-
-         stb_textedit_clamp( str, state );
-         break;
-#endif
-
-#ifdef STB_TEXTEDIT_MOVEWORDRIGHT
-      case STB_TEXTEDIT_K_WORDRIGHT:
-         if (STB_TEXT_HAS_SELECTION(state)) 
-            stb_textedit_move_to_last(str, state);
-         else {
-            state->cursor = STB_TEXTEDIT_MOVEWORDRIGHT(str, state->cursor);
-            stb_textedit_clamp( str, state );
-         }
-         break;
-
-      case STB_TEXTEDIT_K_WORDRIGHT | STB_TEXTEDIT_K_SHIFT:
-         if( !STB_TEXT_HAS_SELECTION( state ) )
-            stb_textedit_prep_selection_at_cursor(state);
-
-         state->cursor = STB_TEXTEDIT_MOVEWORDRIGHT(str, state->cursor);
-         state->select_end = state->cursor;
-
-         stb_textedit_clamp( str, state );
-         break;
-#endif
-
-      case STB_TEXTEDIT_K_RIGHT | STB_TEXTEDIT_K_SHIFT:
-         stb_textedit_prep_selection_at_cursor(state);
-         ++state->select_end;
-         stb_textedit_clamp(str, state);
-         state->cursor = state->select_end;
-         state->has_preferred_x = 0;
-         break;
-
-      case STB_TEXTEDIT_K_DOWN:
-      case STB_TEXTEDIT_K_DOWN | STB_TEXTEDIT_K_SHIFT:
-      case STB_TEXTEDIT_K_PGDOWN:
-      case STB_TEXTEDIT_K_PGDOWN | STB_TEXTEDIT_K_SHIFT: {
-         StbFindState find;
-         StbTexteditRow row;
-         int i, j, sel = (key & STB_TEXTEDIT_K_SHIFT) != 0;
-         int is_page = (key & ~STB_TEXTEDIT_K_SHIFT) == STB_TEXTEDIT_K_PGDOWN;
-         int row_count = is_page ? state->row_count_per_page : 1;
-
-         if (!is_page && state->single_line) {
-            key = STB_TEXTEDIT_K_RIGHT | (key & STB_TEXTEDIT_K_SHIFT);
-            goto retry;
-         }
-
-         if (sel)
-            stb_textedit_prep_selection_at_cursor(state);
-         else if (STB_TEXT_HAS_SELECTION(state))
-            stb_textedit_move_to_last(str, state);
-
-         stb_textedit_clamp(str, state);
-         stb_textedit_find_charpos(&find, str, state->cursor, state->single_line);
-
-         for (j = 0; j < row_count; ++j) {
-            float x, goal_x = state->has_preferred_x ? state->preferred_x : find.x;
-            int start = find.first_char + find.length;
-
-            if (find.length == 0)
-               break;
-
-            if (STB_TEXTEDIT_GETCHAR(str, find.first_char + find.length - 1) != STB_TEXTEDIT_NEWLINE)
-               break;
-
-            state->cursor = start;
-            STB_TEXTEDIT_LAYOUTROW(&row, str, state->cursor);
-            x = row.x0;
-            for (i=0; i < row.num_chars; ++i) {
-               float dx = STB_TEXTEDIT_GETWIDTH(str, start, i);
-               #ifdef STB_TEXTEDIT_GETWIDTH_NEWLINE
-               if (dx == STB_TEXTEDIT_GETWIDTH_NEWLINE)
-                  break;
-               #endif
-               x += dx;
-               if (x > goal_x)
-                  break;
-               ++state->cursor;
-            }
-            stb_textedit_clamp(str, state);
-
-            state->has_preferred_x = 1;
-            state->preferred_x = goal_x;
-
-            if (sel)
-               state->select_end = state->cursor;
-
-            find.first_char = find.first_char + find.length;
-            find.length = row.num_chars;
-         }
-         break;
-      }
-         
-      case STB_TEXTEDIT_K_UP:
-      case STB_TEXTEDIT_K_UP | STB_TEXTEDIT_K_SHIFT:
-      case STB_TEXTEDIT_K_PGUP:
-      case STB_TEXTEDIT_K_PGUP | STB_TEXTEDIT_K_SHIFT: {
-         StbFindState find;
-         StbTexteditRow row;
-         int i, j, prev_scan, sel = (key & STB_TEXTEDIT_K_SHIFT) != 0;
-         int is_page = (key & ~STB_TEXTEDIT_K_SHIFT) == STB_TEXTEDIT_K_PGUP;
-         int row_count = is_page ? state->row_count_per_page : 1;
-
-         if (!is_page && state->single_line) {
-            key = STB_TEXTEDIT_K_LEFT | (key & STB_TEXTEDIT_K_SHIFT);
-            goto retry;
-         }
-
-         if (sel)
-            stb_textedit_prep_selection_at_cursor(state);
-         else if (STB_TEXT_HAS_SELECTION(state))
-            stb_textedit_move_to_first(state);
-
-         stb_textedit_clamp(str, state);
-         stb_textedit_find_charpos(&find, str, state->cursor, state->single_line);
-
-         for (j = 0; j < row_count; ++j) {
-            float  x, goal_x = state->has_preferred_x ? state->preferred_x : find.x;
-
-            if (find.prev_first == find.first_char)
-               break;
-
-            state->cursor = find.prev_first;
-            STB_TEXTEDIT_LAYOUTROW(&row, str, state->cursor);
-            x = row.x0;
-            for (i=0; i < row.num_chars; ++i) {
-               float dx = STB_TEXTEDIT_GETWIDTH(str, find.prev_first, i);
-               #ifdef STB_TEXTEDIT_GETWIDTH_NEWLINE
-               if (dx == STB_TEXTEDIT_GETWIDTH_NEWLINE)
-                  break;
-               #endif
-               x += dx;
-               if (x > goal_x)
-                  break;
-               ++state->cursor;
-            }
-            stb_textedit_clamp(str, state);
-
-            state->has_preferred_x = 1;
-            state->preferred_x = goal_x;
-
-            if (sel)
-               state->select_end = state->cursor;
-
-            prev_scan = find.prev_first > 0 ? find.prev_first - 1 : 0;
-            while (prev_scan > 0 && STB_TEXTEDIT_GETCHAR(str, prev_scan - 1) != STB_TEXTEDIT_NEWLINE)
-               --prev_scan;
-            find.first_char = find.prev_first;
-            find.prev_first = prev_scan;
-         }
-         break;
-      }
-
-      case STB_TEXTEDIT_K_DELETE:
-      case STB_TEXTEDIT_K_DELETE | STB_TEXTEDIT_K_SHIFT:
-         if (STB_TEXT_HAS_SELECTION(state))
-            stb_textedit_delete_selection(str, state);
-         else {
-            int n = STB_TEXTEDIT_STRINGLEN(str);
-            if (state->cursor < n)
-               stb_textedit_delete(str, state, state->cursor, 1);
-         }
-         state->has_preferred_x = 0;
-         break;
-
-      case STB_TEXTEDIT_K_BACKSPACE:
-      case STB_TEXTEDIT_K_BACKSPACE | STB_TEXTEDIT_K_SHIFT:
-         if (STB_TEXT_HAS_SELECTION(state))
-            stb_textedit_delete_selection(str, state);
-         else {
-            stb_textedit_clamp(str, state);
-            if (state->cursor > 0) {
-               stb_textedit_delete(str, state, state->cursor-1, 1);
-               --state->cursor;
-            }
-         }
-         state->has_preferred_x = 0;
-         break;
-         
-#ifdef STB_TEXTEDIT_K_TEXTSTART2
-      case STB_TEXTEDIT_K_TEXTSTART2:
-#endif
-      case STB_TEXTEDIT_K_TEXTSTART:
-         state->cursor = state->select_start = state->select_end = 0;
-         state->has_preferred_x = 0;
-         break;
-
-#ifdef STB_TEXTEDIT_K_TEXTEND2
-      case STB_TEXTEDIT_K_TEXTEND2:
-#endif
-      case STB_TEXTEDIT_K_TEXTEND:
-         state->cursor = STB_TEXTEDIT_STRINGLEN(str);
-         state->select_start = state->select_end = 0;
-         state->has_preferred_x = 0;
-         break;
-        
-#ifdef STB_TEXTEDIT_K_TEXTSTART2
-      case STB_TEXTEDIT_K_TEXTSTART2 | STB_TEXTEDIT_K_SHIFT:
-#endif
-      case STB_TEXTEDIT_K_TEXTSTART | STB_TEXTEDIT_K_SHIFT:
-         stb_textedit_prep_selection_at_cursor(state);
-         state->cursor = state->select_end = 0;
-         state->has_preferred_x = 0;
-         break;
-
-#ifdef STB_TEXTEDIT_K_TEXTEND2
-      case STB_TEXTEDIT_K_TEXTEND2 | STB_TEXTEDIT_K_SHIFT:
-#endif
-      case STB_TEXTEDIT_K_TEXTEND | STB_TEXTEDIT_K_SHIFT:
-         stb_textedit_prep_selection_at_cursor(state);
-         state->cursor = state->select_end = STB_TEXTEDIT_STRINGLEN(str);
-         state->has_preferred_x = 0;
-         break;
-
-
-#ifdef STB_TEXTEDIT_K_LINESTART2
-      case STB_TEXTEDIT_K_LINESTART2:
-#endif
-      case STB_TEXTEDIT_K_LINESTART:
-         stb_textedit_clamp(str, state);
-         stb_textedit_move_to_first(state);
-         if (state->single_line)
-            state->cursor = 0;
-         else while (state->cursor > 0 && STB_TEXTEDIT_GETCHAR(str, state->cursor-1) != STB_TEXTEDIT_NEWLINE)
-            --state->cursor;
-         state->has_preferred_x = 0;
-         break;
-
-#ifdef STB_TEXTEDIT_K_LINEEND2
-      case STB_TEXTEDIT_K_LINEEND2:
-#endif
-      case STB_TEXTEDIT_K_LINEEND: {
-         int n = STB_TEXTEDIT_STRINGLEN(str);
-         stb_textedit_clamp(str, state);
-         stb_textedit_move_to_first(state);
-         if (state->single_line)
-             state->cursor = n;
-         else while (state->cursor < n && STB_TEXTEDIT_GETCHAR(str, state->cursor) != STB_TEXTEDIT_NEWLINE)
-             ++state->cursor;
-         state->has_preferred_x = 0;
-         break;
-      }
-
-#ifdef STB_TEXTEDIT_K_LINESTART2
-      case STB_TEXTEDIT_K_LINESTART2 | STB_TEXTEDIT_K_SHIFT:
-#endif
-      case STB_TEXTEDIT_K_LINESTART | STB_TEXTEDIT_K_SHIFT:
-         stb_textedit_clamp(str, state);
-         stb_textedit_prep_selection_at_cursor(state);
-         if (state->single_line)
-            state->cursor = 0;
-         else while (state->cursor > 0 && STB_TEXTEDIT_GETCHAR(str, state->cursor-1) != STB_TEXTEDIT_NEWLINE)
-            --state->cursor;
-         state->select_end = state->cursor;
-         state->has_preferred_x = 0;
-         break;
-
-#ifdef STB_TEXTEDIT_K_LINEEND2
-      case STB_TEXTEDIT_K_LINEEND2 | STB_TEXTEDIT_K_SHIFT:
-#endif
-      case STB_TEXTEDIT_K_LINEEND | STB_TEXTEDIT_K_SHIFT: {
-         int n = STB_TEXTEDIT_STRINGLEN(str);
-         stb_textedit_clamp(str, state);
-         stb_textedit_prep_selection_at_cursor(state);
-         if (state->single_line)
-             state->cursor = n;
-         else while (state->cursor < n && STB_TEXTEDIT_GETCHAR(str, state->cursor) != STB_TEXTEDIT_NEWLINE)
-            ++state->cursor;
-         state->select_end = state->cursor;
-         state->has_preferred_x = 0;
-         break;
-      }
-   }
-}
-
-static void stb_textedit_flush_redo(StbUndoState *state)
-{
-   state->redo_point = STB_TEXTEDIT_UNDOSTATECOUNT;
-   state->redo_char_point = STB_TEXTEDIT_UNDOCHARCOUNT;
-}
-
-static void stb_textedit_discard_undo(StbUndoState *state)
-{
-   if (state->undo_point > 0) {
-      if (state->undo_rec[0].char_storage >= 0) {
-         int n = state->undo_rec[0].insert_length, i;
-         state->undo_char_point -= n;
-         STB_TEXTEDIT_memmove(state->undo_char, state->undo_char + n, (size_t) (state->undo_char_point*sizeof(STB_TEXTEDIT_CHARTYPE)));
-         for (i=0; i < state->undo_point; ++i)
-            if (state->undo_rec[i].char_storage >= 0)
-               state->undo_rec[i].char_storage -= n;         
-      }
-      --state->undo_point;
-      STB_TEXTEDIT_memmove(state->undo_rec, state->undo_rec+1, (size_t) (state->undo_point*sizeof(state->undo_rec[0])));
-   }
-}
-
-static void stb_textedit_discard_redo(StbUndoState *state)
-{
-   int k = STB_TEXTEDIT_UNDOSTATECOUNT-1;
-
-   if (state->redo_point <= k) {
-      if (state->undo_rec[k].char_storage >= 0) {
-         int n = state->undo_rec[k].insert_length, i;
-         state->redo_char_point += n;
-         STB_TEXTEDIT_memmove(state->undo_char + state->redo_char_point, state->undo_char + state->redo_char_point-n, (size_t) ((STB_TEXTEDIT_UNDOCHARCOUNT - state->redo_char_point)*sizeof(STB_TEXTEDIT_CHARTYPE)));
-         for (i=state->redo_point; i < k; ++i)
-            if (state->undo_rec[i].char_storage >= 0)
-               state->undo_rec[i].char_storage += n;
-      }
-      size_t move_size = (size_t)((STB_TEXTEDIT_UNDOSTATECOUNT - state->redo_point - 1) * sizeof(state->undo_rec[0]));
-      const char* buf_begin = (char*)state->undo_rec; (void)buf_begin;
-      const char* buf_end   = (char*)state->undo_rec + sizeof(state->undo_rec); (void)buf_end;
-      IM_ASSERT(((char*)(state->undo_rec + state->redo_point)) >= buf_begin);
-      IM_ASSERT(((char*)(state->undo_rec + state->redo_point + 1) + move_size) <= buf_end);
-      STB_TEXTEDIT_memmove(state->undo_rec + state->redo_point+1, state->undo_rec + state->redo_point, move_size);
-
-      ++state->redo_point;
-   }
-}
-
-static StbUndoRecord *stb_text_create_undo_record(StbUndoState *state, int numchars)
-{
-   stb_textedit_flush_redo(state);
-
-   if (state->undo_point == STB_TEXTEDIT_UNDOSTATECOUNT)
-      stb_textedit_discard_undo(state);
-
-   if (numchars > STB_TEXTEDIT_UNDOCHARCOUNT) {
-      state->undo_point = 0;
-      state->undo_char_point = 0;
-      return NULL;
-   }
-
-   while (state->undo_char_point + numchars > STB_TEXTEDIT_UNDOCHARCOUNT)
-      stb_textedit_discard_undo(state);
-
-   return &state->undo_rec[state->undo_point++];
-}
-
-static STB_TEXTEDIT_CHARTYPE *stb_text_createundo(StbUndoState *state, int pos, int insert_len, int delete_len)
-{
-   StbUndoRecord *r = stb_text_create_undo_record(state, insert_len);
-   if (r == NULL)
-      return NULL;
-
-   r->where = pos;
-   r->insert_length = (STB_TEXTEDIT_POSITIONTYPE) insert_len;
-   r->delete_length = (STB_TEXTEDIT_POSITIONTYPE) delete_len;
-
-   if (insert_len == 0) {
-      r->char_storage = -1;
-      return NULL;
-   } else {
-      r->char_storage = state->undo_char_point;
-      state->undo_char_point += insert_len;
-      return &state->undo_char[r->char_storage];
-   }
-}
-
-static void stb_text_undo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state)
-{
-   StbUndoState *s = &state->undostate;
-   StbUndoRecord u, *r;
-   if (s->undo_point == 0)
-      return;
-
-   u = s->undo_rec[s->undo_point-1];
-   r = &s->undo_rec[s->redo_point-1];
-   r->char_storage = -1;
-
-   r->insert_length = u.delete_length;
-   r->delete_length = u.insert_length;
-   r->where = u.where;
-
-   if (u.delete_length) {
-      if (s->undo_char_point + u.delete_length >= STB_TEXTEDIT_UNDOCHARCOUNT) {
-         r->insert_length = 0;
-      } else {
-         int i;
-
-         while (s->undo_char_point + u.delete_length > s->redo_char_point) {
-            if (s->redo_point == STB_TEXTEDIT_UNDOSTATECOUNT)
-               return;
-            stb_textedit_discard_redo(s);
-         }
-         r = &s->undo_rec[s->redo_point-1];
-
-         r->char_storage = s->redo_char_point - u.delete_length;
-         s->redo_char_point = s->redo_char_point - u.delete_length;
-
-         for (i=0; i < u.delete_length; ++i)
-            s->undo_char[r->char_storage + i] = STB_TEXTEDIT_GETCHAR(str, u.where + i);
-      }
-
-      STB_TEXTEDIT_DELETECHARS(str, u.where, u.delete_length);
-   }
-
-   if (u.insert_length) {
-      STB_TEXTEDIT_INSERTCHARS(str, u.where, &s->undo_char[u.char_storage], u.insert_length);
-      s->undo_char_point -= u.insert_length;
-   }
-
-   state->cursor = u.where + u.insert_length;
-
-   s->undo_point--;
-   s->redo_point--;
-}
-
-static void stb_text_redo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state)
-{
-   StbUndoState *s = &state->undostate;
-   StbUndoRecord *u, r;
-   if (s->redo_point == STB_TEXTEDIT_UNDOSTATECOUNT)
-      return;
-
-   u = &s->undo_rec[s->undo_point];
-   r = s->undo_rec[s->redo_point];
-
-   u->delete_length = r.insert_length;
-   u->insert_length = r.delete_length;
-   u->where = r.where;
-   u->char_storage = -1;
-
-   if (r.delete_length) {
-      if (s->undo_char_point + u->insert_length > s->redo_char_point) {
-         u->insert_length = 0;
-         u->delete_length = 0;
-      } else {
-         int i;
-         u->char_storage = s->undo_char_point;
-         s->undo_char_point = s->undo_char_point + u->insert_length;
-
-         for (i=0; i < u->insert_length; ++i)
-            s->undo_char[u->char_storage + i] = STB_TEXTEDIT_GETCHAR(str, u->where + i);
-      }
-
-      STB_TEXTEDIT_DELETECHARS(str, r.where, r.delete_length);
-   }
-
-   if (r.insert_length) {
-      STB_TEXTEDIT_INSERTCHARS(str, r.where, &s->undo_char[r.char_storage], r.insert_length);
-      s->redo_char_point += r.insert_length;
-   }
-
-   state->cursor = r.where + r.insert_length;
-
-   s->undo_point++;
-   s->redo_point++;
-}
-
-static void stb_text_makeundo_insert(STB_TexteditState *state, int where, int length)
-{
-   stb_text_createundo(&state->undostate, where, 0, length);
-}
-
-static void stb_text_makeundo_delete(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int length)
-{
-   int i;
-   STB_TEXTEDIT_CHARTYPE *p = stb_text_createundo(&state->undostate, where, length, 0);
-   if (p) {
-      for (i=0; i < length; ++i)
-         p[i] = STB_TEXTEDIT_GETCHAR(str, where+i);
-   }
-}
-
-static void stb_text_makeundo_replace(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int old_length, int new_length)
-{
-   int i;
-   STB_TEXTEDIT_CHARTYPE *p = stb_text_createundo(&state->undostate, where, old_length, new_length);
-   if (p) {
-      for (i=0; i < old_length; ++i)
-         p[i] = STB_TEXTEDIT_GETCHAR(str, where+i);
-   }
-}
-
-static void stb_textedit_clear_state(STB_TexteditState *state, int is_single_line)
-{
-   state->undostate.undo_point = 0;
-   state->undostate.undo_char_point = 0;
-   state->undostate.redo_point = STB_TEXTEDIT_UNDOSTATECOUNT;
-   state->undostate.redo_char_point = STB_TEXTEDIT_UNDOCHARCOUNT;
-   state->select_end = state->select_start = 0;
-   state->cursor = 0;
-   state->has_preferred_x = 0;
-   state->preferred_x = 0;
-   state->cursor_at_end_of_line = 0;
-   state->initialized = 1;
-   state->single_line = (unsigned char) is_single_line;
-   state->insert_mode = 0;
-   state->row_count_per_page = 0;
-}
-
-static void stb_textedit_initialize_state(STB_TexteditState *state, int is_single_line)
-{
-   stb_textedit_clear_state(state, is_single_line);
-}
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#endif
-
-static int stb_textedit_paste(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_CHARTYPE const *ctext, int len)
-{
-   return stb_textedit_paste_internal(str, state, (STB_TEXTEDIT_CHARTYPE *) ctext, len);
-}
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
-#endif
-
diff --git a/SpyCustom/imgui/imstb_truetype.h b/SpyCustom/imgui/imstb_truetype.h
deleted file mode 100644
index 9a2edb0..0000000
--- a/SpyCustom/imgui/imstb_truetype.h
+++ /dev/null
@@ -1,3861 +0,0 @@
-
-#if 0
-#define STB_TRUETYPE_IMPLEMENTATION        
-#include "stb_truetype.h"
-
-unsigned char ttf_buffer[1<<20];
-unsigned char temp_bitmap[512*512];
-
-stbtt_bakedchar cdata[96];      
-GLuint ftex;
-
-void my_stbtt_initfont(void)
-{
-   fread(ttf_buffer, 1, 1<<20, fopen("c:/windows/fonts/times.ttf", "rb"));
-   stbtt_BakeFontBitmap(ttf_buffer,0, 32.0, temp_bitmap,512,512, 32,96, cdata);     
-   glGenTextures(1, &ftex);
-   glBindTexture(GL_TEXTURE_2D, ftex);
-   glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 512,512, 0, GL_ALPHA, GL_UNSIGNED_BYTE, temp_bitmap);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-}
-
-void my_stbtt_print(float x, float y, char *text)
-{
-   glEnable(GL_TEXTURE_2D);
-   glBindTexture(GL_TEXTURE_2D, ftex);
-   glBegin(GL_QUADS);
-   while (*text) {
-      if (*text >= 32 && *text < 128) {
-         stbtt_aligned_quad q;
-         stbtt_GetBakedQuad(cdata, 512,512, *text-32, &x,&y,&q,1);  
-         glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y0);
-         glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y0);
-         glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y1);
-         glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y1);
-      }
-      ++text;
-   }
-   glEnd();
-}
-#endif
-#if 0
-#include <stdio.h>
-#define STB_TRUETYPE_IMPLEMENTATION        
-#include "stb_truetype.h"
-
-char ttf_buffer[1<<25];
-
-int main(int argc, char **argv)
-{
-   stbtt_fontinfo font;
-   unsigned char *bitmap;
-   int w,h,i,j,c = (argc > 1 ? atoi(argv[1]) : 'a'), s = (argc > 2 ? atoi(argv[2]) : 20);
-
-   fread(ttf_buffer, 1, 1<<25, fopen(argc > 3 ? argv[3] : "c:/windows/fonts/arialbd.ttf", "rb"));
-
-   stbtt_InitFont(&font, ttf_buffer, stbtt_GetFontOffsetForIndex(ttf_buffer,0));
-   bitmap = stbtt_GetCodepointBitmap(&font, 0,stbtt_ScaleForPixelHeight(&font, s), c, &w, &h, 0,0);
-
-   for (j=0; j < h; ++j) {
-      for (i=0; i < w; ++i)
-         putchar(" .:ioVM@"[bitmap[j*w+i]>>5]);
-      putchar('\n');
-   }
-   return 0;
-}
-#endif 
-#if 0
-char buffer[24<<20];
-unsigned char screen[20][79];
-
-int main(int arg, char **argv)
-{
-   stbtt_fontinfo font;
-   int i,j,ascent,baseline,ch=0;
-   float scale, xpos=2;           
-   char *text = "Heljo World!";       
-
-   fread(buffer, 1, 1000000, fopen("c:/windows/fonts/arialbd.ttf", "rb"));
-   stbtt_InitFont(&font, buffer, 0);
-
-   scale = stbtt_ScaleForPixelHeight(&font, 15);
-   stbtt_GetFontVMetrics(&font, &ascent,0,0);
-   baseline = (int) (ascent*scale);
-
-   while (text[ch]) {
-      int advance,lsb,x0,y0,x1,y1;
-      float x_shift = xpos - (float) floor(xpos);
-      stbtt_GetCodepointHMetrics(&font, text[ch], &advance, &lsb);
-      stbtt_GetCodepointBitmapBoxSubpixel(&font, text[ch], scale,scale,x_shift,0, &x0,&y0,&x1,&y1);
-      stbtt_MakeCodepointBitmapSubpixel(&font, &screen[baseline + y0][(int) xpos + x0], x1-x0,y1-y0, 79, scale,scale,x_shift,0, text[ch]);
-      xpos += (advance * scale);
-      if (text[ch+1])
-         xpos += scale*stbtt_GetCodepointKernAdvance(&font, text[ch],text[ch+1]);
-      ++ch;
-   }
-
-   for (j=0; j < 20; ++j) {
-      for (i=0; i < 78; ++i)
-         putchar(" .:ioVM@"[screen[j][i]>>5]);
-      putchar('\n');
-   }
-
-   return 0;
-}
-#endif
-
-
-#ifdef STB_TRUETYPE_IMPLEMENTATION
-   #ifndef stbtt_uint8
-   typedef unsigned char   stbtt_uint8;
-   typedef signed   char   stbtt_int8;
-   typedef unsigned short  stbtt_uint16;
-   typedef signed   short  stbtt_int16;
-   typedef unsigned int    stbtt_uint32;
-   typedef signed   int    stbtt_int32;
-   #endif
-
-   typedef char stbtt__check_size32[sizeof(stbtt_int32)==4 ? 1 : -1];
-   typedef char stbtt__check_size16[sizeof(stbtt_int16)==2 ? 1 : -1];
-
-   #ifndef STBTT_ifloor
-   #include <math.h>
-   #define STBTT_ifloor(x)   ((int) floor(x))
-   #define STBTT_iceil(x)    ((int) ceil(x))
-   #endif
-
-   #ifndef STBTT_sqrt
-   #include <math.h>
-   #define STBTT_sqrt(x)      sqrt(x)
-   #define STBTT_pow(x,y)     pow(x,y)
-   #endif
-
-   #ifndef STBTT_fmod
-   #include <math.h>
-   #define STBTT_fmod(x,y)    fmod(x,y)
-   #endif
-
-   #ifndef STBTT_cos
-   #include <math.h>
-   #define STBTT_cos(x)       cos(x)
-   #define STBTT_acos(x)      acos(x)
-   #endif
-
-   #ifndef STBTT_fabs
-   #include <math.h>
-   #define STBTT_fabs(x)      fabs(x)
-   #endif
-
-   #ifndef STBTT_malloc
-   #include <stdlib.h>
-   #define STBTT_malloc(x,u)  ((void)(u),malloc(x))
-   #define STBTT_free(x,u)    ((void)(u),free(x))
-   #endif
-
-   #ifndef STBTT_assert
-   #include <assert.h>
-   #define STBTT_assert(x)    assert(x)
-   #endif
-
-   #ifndef STBTT_strlen
-   #include <string.h>
-   #define STBTT_strlen(x)    strlen(x)
-   #endif
-
-   #ifndef STBTT_memcpy
-   #include <string.h>
-   #define STBTT_memcpy       memcpy
-   #define STBTT_memset       memset
-   #endif
-#endif
-
-#ifndef __STB_INCLUDE_STB_TRUETYPE_H__
-#define __STB_INCLUDE_STB_TRUETYPE_H__
-
-#ifdef STBTT_STATIC
-#define STBTT_DEF static
-#else
-#define STBTT_DEF extern
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct
-{
-   unsigned char *data;
-   int cursor;
-   int size;
-} stbtt__buf;
-
-typedef struct
-{
-   unsigned short x0,y0,x1,y1;      
-   float xoff,yoff,xadvance;
-} stbtt_bakedchar;
-
-STBTT_DEF int stbtt_BakeFontBitmap(const unsigned char *data, int offset,         
-                                float pixel_height,                          
-                                unsigned char *pixels, int pw, int ph,       
-                                int first_char, int num_chars,             
-                                stbtt_bakedchar *chardata);                   
-typedef struct
-{
-   float x0,y0,s0,t0;  
-   float x1,y1,s1,t1;  
-} stbtt_aligned_quad;
-
-STBTT_DEF void stbtt_GetBakedQuad(const stbtt_bakedchar *chardata, int pw, int ph,      
-                               int char_index,                
-                               float *xpos, float *ypos,           
-                               stbtt_aligned_quad *q,          
-                               int opengl_fillrule);                 
-STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap);
-
-typedef struct
-{
-   unsigned short x0,y0,x1,y1;      
-   float xoff,yoff,xadvance;
-   float xoff2,yoff2;
-} stbtt_packedchar;
-
-typedef struct stbtt_pack_context stbtt_pack_context;
-typedef struct stbtt_fontinfo stbtt_fontinfo;
-#ifndef STB_RECT_PACK_VERSION
-typedef struct stbrp_rect stbrp_rect;
-#endif
-
-STBTT_DEF int  stbtt_PackBegin(stbtt_pack_context *spc, unsigned char *pixels, int width, int height, int stride_in_bytes, int padding, void *alloc_context);
-STBTT_DEF void stbtt_PackEnd  (stbtt_pack_context *spc);
-#define STBTT_POINT_SIZE(x)   (-(x))
-
-STBTT_DEF int  stbtt_PackFontRange(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, float font_size,
-                                int first_unicode_char_in_range, int num_chars_in_range, stbtt_packedchar *chardata_for_range);
-typedef struct
-{
-   float font_size;
-   int first_unicode_codepoint_in_range;               
-   int *array_of_unicode_codepoints;                 
-   int num_chars;
-   stbtt_packedchar *chardata_for_range;  
-   unsigned char h_oversample, v_oversample;       
-} stbtt_pack_range;
-
-STBTT_DEF int  stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, stbtt_pack_range *ranges, int num_ranges);
-STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h_oversample, unsigned int v_oversample);
-STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip);
-STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph,      
-                               int char_index,                
-                               float *xpos, float *ypos,           
-                               stbtt_aligned_quad *q,          
-                               int align_to_integer);
-
-STBTT_DEF int  stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects);
-STBTT_DEF void stbtt_PackFontRangesPackRects(stbtt_pack_context *spc, stbrp_rect *rects, int num_rects);
-STBTT_DEF int  stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects);
-struct stbtt_pack_context {
-   void *user_allocator_context;
-   void *pack_info;
-   int   width;
-   int   height;
-   int   stride_in_bytes;
-   int   padding;
-   int   skip_missing;
-   unsigned int   h_oversample, v_oversample;
-   unsigned char *pixels;
-   void  *nodes;
-};
-
-STBTT_DEF int stbtt_GetNumberOfFonts(const unsigned char *data);
-STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index);
-struct stbtt_fontinfo
-{
-   void           * userdata;
-   unsigned char  * data;                  
-   int              fontstart;              
-
-   int numGlyphs;                            
-
-   int loca,head,glyf,hhea,hmtx,kern,gpos;         
-   int index_map;                             
-   int indexToLocFormat;                       
-
-   stbtt__buf cff;                       
-   stbtt__buf charstrings;               
-   stbtt__buf gsubrs;                     
-   stbtt__buf subrs;                      
-   stbtt__buf fontdicts;                  
-   stbtt__buf fdselect;                    
-};
-
-STBTT_DEF int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data, int offset);
-
-STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint);
-
-STBTT_DEF float stbtt_ScaleForPixelHeight(const stbtt_fontinfo *info, float pixels);
-STBTT_DEF float stbtt_ScaleForMappingEmToPixels(const stbtt_fontinfo *info, float pixels);
-STBTT_DEF void stbtt_GetFontVMetrics(const stbtt_fontinfo *info, int *ascent, int *descent, int *lineGap);
-STBTT_DEF int  stbtt_GetFontVMetricsOS2(const stbtt_fontinfo *info, int *typoAscent, int *typoDescent, int *typoLineGap);
-STBTT_DEF void stbtt_GetFontBoundingBox(const stbtt_fontinfo *info, int *x0, int *y0, int *x1, int *y1);
-STBTT_DEF void stbtt_GetCodepointHMetrics(const stbtt_fontinfo *info, int codepoint, int *advanceWidth, int *leftSideBearing);
-STBTT_DEF int  stbtt_GetCodepointKernAdvance(const stbtt_fontinfo *info, int ch1, int ch2);
-STBTT_DEF int stbtt_GetCodepointBox(const stbtt_fontinfo *info, int codepoint, int *x0, int *y0, int *x1, int *y1);
-STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_index, int *advanceWidth, int *leftSideBearing);
-STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2);
-STBTT_DEF int  stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1);
-
-#ifndef STBTT_vmove           
-   enum {
-      STBTT_vmove=1,
-      STBTT_vline,
-      STBTT_vcurve,
-      STBTT_vcubic
-   };
-#endif
-
-#ifndef stbtt_vertex         
-   #define stbtt_vertex_type short            
-   typedef struct
-   {
-      stbtt_vertex_type x,y,cx,cy,cx1,cy1;
-      unsigned char type,padding;
-   } stbtt_vertex;
-#endif
-
-STBTT_DEF int stbtt_IsGlyphEmpty(const stbtt_fontinfo *info, int glyph_index);
-STBTT_DEF int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices);
-STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **vertices);
-STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *vertices);
-STBTT_DEF void stbtt_FreeBitmap(unsigned char *bitmap, void *userdata);
-STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff);
-STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff);
-STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint);
-STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint);
-STBTT_DEF void stbtt_MakeCodepointBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int codepoint);
-STBTT_DEF void stbtt_GetCodepointBitmapBox(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1);
-STBTT_DEF void stbtt_GetCodepointBitmapBoxSubpixel(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1);
-STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff);
-STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int glyph, int *width, int *height, int *xoff, int *yoff);
-STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int glyph);
-STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int glyph);
-STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int glyph);
-STBTT_DEF void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1);
-STBTT_DEF void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1);
-
-
-typedef struct
-{
-   int w,h,stride;
-   unsigned char *pixels;
-} stbtt__bitmap;
-
-STBTT_DEF void stbtt_Rasterize(stbtt__bitmap *result,             
-                               float flatness_in_pixels,           
-                               stbtt_vertex *vertices,            
-                               int num_verts,                      
-                               float scale_x, float scale_y,      
-                               float shift_x, float shift_y,      
-                               int x_off, int y_off,              
-                               int invert,                        
-                               void *userdata);                  
-
-STBTT_DEF void stbtt_FreeSDF(unsigned char *bitmap, void *userdata);
-STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float scale, int glyph, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff);
-STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, float scale, int codepoint, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff);
-
-
-
-STBTT_DEF int stbtt_FindMatchingFont(const unsigned char *fontdata, const char *name, int flags);
-#define STBTT_MACSTYLE_DONTCARE     0
-#define STBTT_MACSTYLE_BOLD         1
-#define STBTT_MACSTYLE_ITALIC       2
-#define STBTT_MACSTYLE_UNDERSCORE   4
-#define STBTT_MACSTYLE_NONE         8                
-
-STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2);
-STBTT_DEF const char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *length, int platformID, int encodingID, int languageID, int nameID);
-enum {  
-   STBTT_PLATFORM_ID_UNICODE   =0,
-   STBTT_PLATFORM_ID_MAC       =1,
-   STBTT_PLATFORM_ID_ISO       =2,
-   STBTT_PLATFORM_ID_MICROSOFT =3
-};
-
-enum {    
-   STBTT_UNICODE_EID_UNICODE_1_0    =0,
-   STBTT_UNICODE_EID_UNICODE_1_1    =1,
-   STBTT_UNICODE_EID_ISO_10646      =2,
-   STBTT_UNICODE_EID_UNICODE_2_0_BMP=3,
-   STBTT_UNICODE_EID_UNICODE_2_0_FULL=4
-};
-
-enum {    
-   STBTT_MS_EID_SYMBOL        =0,
-   STBTT_MS_EID_UNICODE_BMP   =1,
-   STBTT_MS_EID_SHIFTJIS      =2,
-   STBTT_MS_EID_UNICODE_FULL  =10
-};
-
-enum {         
-   STBTT_MAC_EID_ROMAN        =0,   STBTT_MAC_EID_ARABIC       =4,
-   STBTT_MAC_EID_JAPANESE     =1,   STBTT_MAC_EID_HEBREW       =5,
-   STBTT_MAC_EID_CHINESE_TRAD =2,   STBTT_MAC_EID_GREEK        =6,
-   STBTT_MAC_EID_KOREAN       =3,   STBTT_MAC_EID_RUSSIAN      =7
-};
-
-enum {       
-   STBTT_MS_LANG_ENGLISH     =0x0409,   STBTT_MS_LANG_ITALIAN     =0x0410,
-   STBTT_MS_LANG_CHINESE     =0x0804,   STBTT_MS_LANG_JAPANESE    =0x0411,
-   STBTT_MS_LANG_DUTCH       =0x0413,   STBTT_MS_LANG_KOREAN      =0x0412,
-   STBTT_MS_LANG_FRENCH      =0x040c,   STBTT_MS_LANG_RUSSIAN     =0x0419,
-   STBTT_MS_LANG_GERMAN      =0x0407,   STBTT_MS_LANG_SPANISH     =0x0409,
-   STBTT_MS_LANG_HEBREW      =0x040d,   STBTT_MS_LANG_SWEDISH     =0x041D
-};
-
-enum {    
-   STBTT_MAC_LANG_ENGLISH      =0 ,   STBTT_MAC_LANG_JAPANESE     =11,
-   STBTT_MAC_LANG_ARABIC       =12,   STBTT_MAC_LANG_KOREAN       =23,
-   STBTT_MAC_LANG_DUTCH        =4 ,   STBTT_MAC_LANG_RUSSIAN      =32,
-   STBTT_MAC_LANG_FRENCH       =1 ,   STBTT_MAC_LANG_SPANISH      =6 ,
-   STBTT_MAC_LANG_GERMAN       =2 ,   STBTT_MAC_LANG_SWEDISH      =5 ,
-   STBTT_MAC_LANG_HEBREW       =10,   STBTT_MAC_LANG_CHINESE_SIMPLIFIED =33,
-   STBTT_MAC_LANG_ITALIAN      =3 ,   STBTT_MAC_LANG_CHINESE_TRAD =19
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  
-
-#ifdef STB_TRUETYPE_IMPLEMENTATION
-
-#ifndef STBTT_MAX_OVERSAMPLE
-#define STBTT_MAX_OVERSAMPLE   8
-#endif
-
-#if STBTT_MAX_OVERSAMPLE > 255
-#error "STBTT_MAX_OVERSAMPLE cannot be > 255"
-#endif
-
-typedef int stbtt__test_oversample_pow2[(STBTT_MAX_OVERSAMPLE & (STBTT_MAX_OVERSAMPLE-1)) == 0 ? 1 : -1];
-
-#ifndef STBTT_RASTERIZER_VERSION
-#define STBTT_RASTERIZER_VERSION 2
-#endif
-
-#ifdef _MSC_VER
-#define STBTT__NOTUSED(v)  (void)(v)
-#else
-#define STBTT__NOTUSED(v)  (void)sizeof(v)
-#endif
-
-static stbtt_uint8 stbtt__buf_get8(stbtt__buf *b)
-{
-   if (b->cursor >= b->size)
-      return 0;
-   return b->data[b->cursor++];
-}
-
-static stbtt_uint8 stbtt__buf_peek8(stbtt__buf *b)
-{
-   if (b->cursor >= b->size)
-      return 0;
-   return b->data[b->cursor];
-}
-
-static void stbtt__buf_seek(stbtt__buf *b, int o)
-{
-   STBTT_assert(!(o > b->size || o < 0));
-   b->cursor = (o > b->size || o < 0) ? b->size : o;
-}
-
-static void stbtt__buf_skip(stbtt__buf *b, int o)
-{
-   stbtt__buf_seek(b, b->cursor + o);
-}
-
-static stbtt_uint32 stbtt__buf_get(stbtt__buf *b, int n)
-{
-   stbtt_uint32 v = 0;
-   int i;
-   STBTT_assert(n >= 1 && n <= 4);
-   for (i = 0; i < n; i++)
-      v = (v << 8) | stbtt__buf_get8(b);
-   return v;
-}
-
-static stbtt__buf stbtt__new_buf(const void *p, size_t size)
-{
-   stbtt__buf r;
-   STBTT_assert(size < 0x40000000);
-   r.data = (stbtt_uint8*) p;
-   r.size = (int) size;
-   r.cursor = 0;
-   return r;
-}
-
-#define stbtt__buf_get16(b)  stbtt__buf_get((b), 2)
-#define stbtt__buf_get32(b)  stbtt__buf_get((b), 4)
-
-static stbtt__buf stbtt__buf_range(const stbtt__buf *b, int o, int s)
-{
-   stbtt__buf r = stbtt__new_buf(NULL, 0);
-   if (o < 0 || s < 0 || o > b->size || s > b->size - o) return r;
-   r.data = b->data + o;
-   r.size = s;
-   return r;
-}
-
-static stbtt__buf stbtt__cff_get_index(stbtt__buf *b)
-{
-   int count, start, offsize;
-   start = b->cursor;
-   count = stbtt__buf_get16(b);
-   if (count) {
-      offsize = stbtt__buf_get8(b);
-      STBTT_assert(offsize >= 1 && offsize <= 4);
-      stbtt__buf_skip(b, offsize * count);
-      stbtt__buf_skip(b, stbtt__buf_get(b, offsize) - 1);
-   }
-   return stbtt__buf_range(b, start, b->cursor - start);
-}
-
-static stbtt_uint32 stbtt__cff_int(stbtt__buf *b)
-{
-   int b0 = stbtt__buf_get8(b);
-   if (b0 >= 32 && b0 <= 246)       return b0 - 139;
-   else if (b0 >= 247 && b0 <= 250) return (b0 - 247)*256 + stbtt__buf_get8(b) + 108;
-   else if (b0 >= 251 && b0 <= 254) return -(b0 - 251)*256 - stbtt__buf_get8(b) - 108;
-   else if (b0 == 28)               return stbtt__buf_get16(b);
-   else if (b0 == 29)               return stbtt__buf_get32(b);
-   STBTT_assert(0);
-   return 0;
-}
-
-static void stbtt__cff_skip_operand(stbtt__buf *b) {
-   int v, b0 = stbtt__buf_peek8(b);
-   STBTT_assert(b0 >= 28);
-   if (b0 == 30) {
-      stbtt__buf_skip(b, 1);
-      while (b->cursor < b->size) {
-         v = stbtt__buf_get8(b);
-         if ((v & 0xF) == 0xF || (v >> 4) == 0xF)
-            break;
-      }
-   } else {
-      stbtt__cff_int(b);
-   }
-}
-
-static stbtt__buf stbtt__dict_get(stbtt__buf *b, int key)
-{
-   stbtt__buf_seek(b, 0);
-   while (b->cursor < b->size) {
-      int start = b->cursor, end, op;
-      while (stbtt__buf_peek8(b) >= 28)
-         stbtt__cff_skip_operand(b);
-      end = b->cursor;
-      op = stbtt__buf_get8(b);
-      if (op == 12)  op = stbtt__buf_get8(b) | 0x100;
-      if (op == key) return stbtt__buf_range(b, start, end-start);
-   }
-   return stbtt__buf_range(b, 0, 0);
-}
-
-static void stbtt__dict_get_ints(stbtt__buf *b, int key, int outcount, stbtt_uint32 *out)
-{
-   int i;
-   stbtt__buf operands = stbtt__dict_get(b, key);
-   for (i = 0; i < outcount && operands.cursor < operands.size; i++)
-      out[i] = stbtt__cff_int(&operands);
-}
-
-static int stbtt__cff_index_count(stbtt__buf *b)
-{
-   stbtt__buf_seek(b, 0);
-   return stbtt__buf_get16(b);
-}
-
-static stbtt__buf stbtt__cff_index_get(stbtt__buf b, int i)
-{
-   int count, offsize, start, end;
-   stbtt__buf_seek(&b, 0);
-   count = stbtt__buf_get16(&b);
-   offsize = stbtt__buf_get8(&b);
-   STBTT_assert(i >= 0 && i < count);
-   STBTT_assert(offsize >= 1 && offsize <= 4);
-   stbtt__buf_skip(&b, i*offsize);
-   start = stbtt__buf_get(&b, offsize);
-   end = stbtt__buf_get(&b, offsize);
-   return stbtt__buf_range(&b, 2+(count+1)*offsize+start, end - start);
-}
-
-#define ttBYTE(p)     (* (stbtt_uint8 *) (p))
-#define ttCHAR(p)     (* (stbtt_int8 *) (p))
-#define ttFixed(p)    ttLONG(p)
-
-static stbtt_uint16 ttUSHORT(stbtt_uint8 *p) { return p[0]*256 + p[1]; }
-static stbtt_int16 ttSHORT(stbtt_uint8 *p)   { return p[0]*256 + p[1]; }
-static stbtt_uint32 ttULONG(stbtt_uint8 *p)  { return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; }
-static stbtt_int32 ttLONG(stbtt_uint8 *p)    { return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; }
-
-#define stbtt_tag4(p,c0,c1,c2,c3) ((p)[0] == (c0) && (p)[1] == (c1) && (p)[2] == (c2) && (p)[3] == (c3))
-#define stbtt_tag(p,str)           stbtt_tag4(p,str[0],str[1],str[2],str[3])
-
-static int stbtt__isfont(stbtt_uint8 *font)
-{
-   if (stbtt_tag4(font, '1',0,0,0))  return 1;   
-   if (stbtt_tag(font, "typ1"))   return 1;           
-   if (stbtt_tag(font, "OTTO"))   return 1;    
-   if (stbtt_tag4(font, 0,1,0,0)) return 1;   
-   if (stbtt_tag(font, "true"))   return 1;      
-   return 0;
-}
-
-static stbtt_uint32 stbtt__find_table(stbtt_uint8 *data, stbtt_uint32 fontstart, const char *tag)
-{
-   stbtt_int32 num_tables = ttUSHORT(data+fontstart+4);
-   stbtt_uint32 tabledir = fontstart + 12;
-   stbtt_int32 i;
-   for (i=0; i < num_tables; ++i) {
-      stbtt_uint32 loc = tabledir + 16*i;
-      if (stbtt_tag(data+loc+0, tag))
-         return ttULONG(data+loc+8);
-   }
-   return 0;
-}
-
-static int stbtt_GetFontOffsetForIndex_internal(unsigned char *font_collection, int index)
-{
-   if (stbtt__isfont(font_collection))
-      return index == 0 ? 0 : -1;
-
-   if (stbtt_tag(font_collection, "ttcf")) {
-      if (ttULONG(font_collection+4) == 0x00010000 || ttULONG(font_collection+4) == 0x00020000) {
-         stbtt_int32 n = ttLONG(font_collection+8);
-         if (index >= n)
-            return -1;
-         return ttULONG(font_collection+12+index*4);
-      }
-   }
-   return -1;
-}
-
-static int stbtt_GetNumberOfFonts_internal(unsigned char *font_collection)
-{
-   if (stbtt__isfont(font_collection))
-      return 1;
-
-   if (stbtt_tag(font_collection, "ttcf")) {
-      if (ttULONG(font_collection+4) == 0x00010000 || ttULONG(font_collection+4) == 0x00020000) {
-         return ttLONG(font_collection+8);
-      }
-   }
-   return 0;
-}
-
-static stbtt__buf stbtt__get_subrs(stbtt__buf cff, stbtt__buf fontdict)
-{
-   stbtt_uint32 subrsoff = 0, private_loc[2] = { 0, 0 };
-   stbtt__buf pdict;
-   stbtt__dict_get_ints(&fontdict, 18, 2, private_loc);
-   if (!private_loc[1] || !private_loc[0]) return stbtt__new_buf(NULL, 0);
-   pdict = stbtt__buf_range(&cff, private_loc[1], private_loc[0]);
-   stbtt__dict_get_ints(&pdict, 19, 1, &subrsoff);
-   if (!subrsoff) return stbtt__new_buf(NULL, 0);
-   stbtt__buf_seek(&cff, private_loc[1]+subrsoff);
-   return stbtt__cff_get_index(&cff);
-}
-
-static int stbtt_InitFont_internal(stbtt_fontinfo *info, unsigned char *data, int fontstart)
-{
-   stbtt_uint32 cmap, t;
-   stbtt_int32 i,numTables;
-
-   info->data = data;
-   info->fontstart = fontstart;
-   info->cff = stbtt__new_buf(NULL, 0);
-
-   cmap = stbtt__find_table(data, fontstart, "cmap");        
-   info->loca = stbtt__find_table(data, fontstart, "loca");  
-   info->head = stbtt__find_table(data, fontstart, "head");  
-   info->glyf = stbtt__find_table(data, fontstart, "glyf");  
-   info->hhea = stbtt__find_table(data, fontstart, "hhea");  
-   info->hmtx = stbtt__find_table(data, fontstart, "hmtx");  
-   info->kern = stbtt__find_table(data, fontstart, "kern");   
-   info->gpos = stbtt__find_table(data, fontstart, "GPOS");   
-
-   if (!cmap || !info->head || !info->hhea || !info->hmtx)
-      return 0;
-   if (info->glyf) {
-      if (!info->loca) return 0;
-   } else {
-      stbtt__buf b, topdict, topdictidx;
-      stbtt_uint32 cstype = 2, charstrings = 0, fdarrayoff = 0, fdselectoff = 0;
-      stbtt_uint32 cff;
-
-      cff = stbtt__find_table(data, fontstart, "CFF ");
-      if (!cff) return 0;
-
-      info->fontdicts = stbtt__new_buf(NULL, 0);
-      info->fdselect = stbtt__new_buf(NULL, 0);
-
-      info->cff = stbtt__new_buf(data+cff, 512*1024*1024);
-      b = info->cff;
-
-      stbtt__buf_skip(&b, 2);
-      stbtt__buf_seek(&b, stbtt__buf_get8(&b));  
-
-      stbtt__cff_get_index(&b);    
-      topdictidx = stbtt__cff_get_index(&b);
-      topdict = stbtt__cff_index_get(topdictidx, 0);
-      stbtt__cff_get_index(&b);    
-      info->gsubrs = stbtt__cff_get_index(&b);
-
-      stbtt__dict_get_ints(&topdict, 17, 1, &charstrings);
-      stbtt__dict_get_ints(&topdict, 0x100 | 6, 1, &cstype);
-      stbtt__dict_get_ints(&topdict, 0x100 | 36, 1, &fdarrayoff);
-      stbtt__dict_get_ints(&topdict, 0x100 | 37, 1, &fdselectoff);
-      info->subrs = stbtt__get_subrs(b, topdict);
-
-      if (cstype != 2) return 0;
-      if (charstrings == 0) return 0;
-
-      if (fdarrayoff) {
-         if (!fdselectoff) return 0;
-         stbtt__buf_seek(&b, fdarrayoff);
-         info->fontdicts = stbtt__cff_get_index(&b);
-         info->fdselect = stbtt__buf_range(&b, fdselectoff, b.size-fdselectoff);
-      }
-
-      stbtt__buf_seek(&b, charstrings);
-      info->charstrings = stbtt__cff_get_index(&b);
-   }
-
-   t = stbtt__find_table(data, fontstart, "maxp");
-   if (t)
-      info->numGlyphs = ttUSHORT(data+t+4);
-   else
-      info->numGlyphs = 0xffff;
-
-   numTables = ttUSHORT(data + cmap + 2);
-   info->index_map = 0;
-   for (i=0; i < numTables; ++i) {
-      stbtt_uint32 encoding_record = cmap + 4 + 8 * i;
-      switch(ttUSHORT(data+encoding_record)) {
-         case STBTT_PLATFORM_ID_MICROSOFT:
-            switch (ttUSHORT(data+encoding_record+2)) {
-               case STBTT_MS_EID_UNICODE_BMP:
-               case STBTT_MS_EID_UNICODE_FULL:
-                  info->index_map = cmap + ttULONG(data+encoding_record+4);
-                  break;
-            }
-            break;
-        case STBTT_PLATFORM_ID_UNICODE:
-            info->index_map = cmap + ttULONG(data+encoding_record+4);
-            break;
-      }
-   }
-   if (info->index_map == 0)
-      return 0;
-
-   info->indexToLocFormat = ttUSHORT(data+info->head + 50);
-   return 1;
-}
-
-STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint)
-{
-   stbtt_uint8 *data = info->data;
-   stbtt_uint32 index_map = info->index_map;
-
-   stbtt_uint16 format = ttUSHORT(data + index_map + 0);
-   if (format == 0) {    
-      stbtt_int32 bytes = ttUSHORT(data + index_map + 2);
-      if (unicode_codepoint < bytes-6)
-         return ttBYTE(data + index_map + 6 + unicode_codepoint);
-      return 0;
-   } else if (format == 6) {
-      stbtt_uint32 first = ttUSHORT(data + index_map + 6);
-      stbtt_uint32 count = ttUSHORT(data + index_map + 8);
-      if ((stbtt_uint32) unicode_codepoint >= first && (stbtt_uint32) unicode_codepoint < first+count)
-         return ttUSHORT(data + index_map + 10 + (unicode_codepoint - first)*2);
-      return 0;
-   } else if (format == 2) {
-      STBTT_assert(0);      
-      return 0;
-   } else if (format == 4) {           
-      stbtt_uint16 segcount = ttUSHORT(data+index_map+6) >> 1;
-      stbtt_uint16 searchRange = ttUSHORT(data+index_map+8) >> 1;
-      stbtt_uint16 entrySelector = ttUSHORT(data+index_map+10);
-      stbtt_uint16 rangeShift = ttUSHORT(data+index_map+12) >> 1;
-
-      stbtt_uint32 endCount = index_map + 14;
-      stbtt_uint32 search = endCount;
-
-      if (unicode_codepoint > 0xffff)
-         return 0;
-
-      if (unicode_codepoint >= ttUSHORT(data + search + rangeShift*2))
-         search += rangeShift*2;
-
-      search -= 2;
-      while (entrySelector) {
-         stbtt_uint16 end;
-         searchRange >>= 1;
-         end = ttUSHORT(data + search + searchRange*2);
-         if (unicode_codepoint > end)
-            search += searchRange*2;
-         --entrySelector;
-      }
-      search += 2;
-
-      {
-         stbtt_uint16 offset, start;
-         stbtt_uint16 item = (stbtt_uint16) ((search - endCount) >> 1);
-
-         STBTT_assert(unicode_codepoint <= ttUSHORT(data + endCount + 2*item));
-         start = ttUSHORT(data + index_map + 14 + segcount*2 + 2 + 2*item);
-         if (unicode_codepoint < start)
-            return 0;
-
-         offset = ttUSHORT(data + index_map + 14 + segcount*6 + 2 + 2*item);
-         if (offset == 0)
-            return (stbtt_uint16) (unicode_codepoint + ttSHORT(data + index_map + 14 + segcount*4 + 2 + 2*item));
-
-         return ttUSHORT(data + offset + (unicode_codepoint-start)*2 + index_map + 14 + segcount*6 + 2 + 2*item);
-      }
-   } else if (format == 12 || format == 13) {
-      stbtt_uint32 ngroups = ttULONG(data+index_map+12);
-      stbtt_int32 low,high;
-      low = 0; high = (stbtt_int32)ngroups;
-      while (low < high) {
-         stbtt_int32 mid = low + ((high-low) >> 1);         
-         stbtt_uint32 start_char = ttULONG(data+index_map+16+mid*12);
-         stbtt_uint32 end_char = ttULONG(data+index_map+16+mid*12+4);
-         if ((stbtt_uint32) unicode_codepoint < start_char)
-            high = mid;
-         else if ((stbtt_uint32) unicode_codepoint > end_char)
-            low = mid+1;
-         else {
-            stbtt_uint32 start_glyph = ttULONG(data+index_map+16+mid*12+8);
-            if (format == 12)
-               return start_glyph + unicode_codepoint-start_char;
-            else    
-               return start_glyph;
-         }
-      }
-      return 0;   
-   }
-   STBTT_assert(0);
-   return 0;
-}
-
-STBTT_DEF int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices)
-{
-   return stbtt_GetGlyphShape(info, stbtt_FindGlyphIndex(info, unicode_codepoint), vertices);
-}
-
-static void stbtt_setvertex(stbtt_vertex *v, stbtt_uint8 type, stbtt_int32 x, stbtt_int32 y, stbtt_int32 cx, stbtt_int32 cy)
-{
-   v->type = type;
-   v->x = (stbtt_int16) x;
-   v->y = (stbtt_int16) y;
-   v->cx = (stbtt_int16) cx;
-   v->cy = (stbtt_int16) cy;
-}
-
-static int stbtt__GetGlyfOffset(const stbtt_fontinfo *info, int glyph_index)
-{
-   int g1,g2;
-
-   STBTT_assert(!info->cff.size);
-
-   if (glyph_index >= info->numGlyphs) return -1;      
-   if (info->indexToLocFormat >= 2)    return -1;     
-
-   if (info->indexToLocFormat == 0) {
-      g1 = info->glyf + ttUSHORT(info->data + info->loca + glyph_index * 2) * 2;
-      g2 = info->glyf + ttUSHORT(info->data + info->loca + glyph_index * 2 + 2) * 2;
-   } else {
-      g1 = info->glyf + ttULONG (info->data + info->loca + glyph_index * 4);
-      g2 = info->glyf + ttULONG (info->data + info->loca + glyph_index * 4 + 4);
-   }
-
-   return g1==g2 ? -1 : g1;       
-}
-
-static int stbtt__GetGlyphInfoT2(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1);
-
-STBTT_DEF int stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1)
-{
-   if (info->cff.size) {
-      stbtt__GetGlyphInfoT2(info, glyph_index, x0, y0, x1, y1);
-   } else {
-      int g = stbtt__GetGlyfOffset(info, glyph_index);
-      if (g < 0) return 0;
-
-      if (x0) *x0 = ttSHORT(info->data + g + 2);
-      if (y0) *y0 = ttSHORT(info->data + g + 4);
-      if (x1) *x1 = ttSHORT(info->data + g + 6);
-      if (y1) *y1 = ttSHORT(info->data + g + 8);
-   }
-   return 1;
-}
-
-STBTT_DEF int stbtt_GetCodepointBox(const stbtt_fontinfo *info, int codepoint, int *x0, int *y0, int *x1, int *y1)
-{
-   return stbtt_GetGlyphBox(info, stbtt_FindGlyphIndex(info,codepoint), x0,y0,x1,y1);
-}
-
-STBTT_DEF int stbtt_IsGlyphEmpty(const stbtt_fontinfo *info, int glyph_index)
-{
-   stbtt_int16 numberOfContours;
-   int g;
-   if (info->cff.size)
-      return stbtt__GetGlyphInfoT2(info, glyph_index, NULL, NULL, NULL, NULL) == 0;
-   g = stbtt__GetGlyfOffset(info, glyph_index);
-   if (g < 0) return 1;
-   numberOfContours = ttSHORT(info->data + g);
-   return numberOfContours == 0;
-}
-
-static int stbtt__close_shape(stbtt_vertex *vertices, int num_vertices, int was_off, int start_off,
-    stbtt_int32 sx, stbtt_int32 sy, stbtt_int32 scx, stbtt_int32 scy, stbtt_int32 cx, stbtt_int32 cy)
-{
-   if (start_off) {
-      if (was_off)
-         stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, (cx+scx)>>1, (cy+scy)>>1, cx,cy);
-      stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, sx,sy,scx,scy);
-   } else {
-      if (was_off)
-         stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve,sx,sy,cx,cy);
-      else
-         stbtt_setvertex(&vertices[num_vertices++], STBTT_vline,sx,sy,0,0);
-   }
-   return num_vertices;
-}
-
-static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices)
-{
-   stbtt_int16 numberOfContours;
-   stbtt_uint8 *endPtsOfContours;
-   stbtt_uint8 *data = info->data;
-   stbtt_vertex *vertices=0;
-   int num_vertices=0;
-   int g = stbtt__GetGlyfOffset(info, glyph_index);
-
-   *pvertices = NULL;
-
-   if (g < 0) return 0;
-
-   numberOfContours = ttSHORT(data + g);
-
-   if (numberOfContours > 0) {
-      stbtt_uint8 flags=0,flagcount;
-      stbtt_int32 ins, i,j=0,m,n, next_move, was_off=0, off, start_off=0;
-      stbtt_int32 x,y,cx,cy,sx,sy, scx,scy;
-      stbtt_uint8 *points;
-      endPtsOfContours = (data + g + 10);
-      ins = ttUSHORT(data + g + 10 + numberOfContours * 2);
-      points = data + g + 10 + numberOfContours * 2 + 2 + ins;
-
-      n = 1+ttUSHORT(endPtsOfContours + numberOfContours*2-2);
-
-      m = n + 2*numberOfContours;            
-      vertices = (stbtt_vertex *) STBTT_malloc(m * sizeof(vertices[0]), info->userdata);
-      if (vertices == 0)
-         return 0;
-
-      next_move = 0;
-      flagcount=0;
-
-      off = m - n;              
-
-      for (i=0; i < n; ++i) {
-         if (flagcount == 0) {
-            flags = *points++;
-            if (flags & 8)
-               flagcount = *points++;
-         } else
-            --flagcount;
-         vertices[off+i].type = flags;
-      }
-
-      x=0;
-      for (i=0; i < n; ++i) {
-         flags = vertices[off+i].type;
-         if (flags & 2) {
-            stbtt_int16 dx = *points++;
-            x += (flags & 16) ? dx : -dx;  
-         } else {
-            if (!(flags & 16)) {
-               x = x + (stbtt_int16) (points[0]*256 + points[1]);
-               points += 2;
-            }
-         }
-         vertices[off+i].x = (stbtt_int16) x;
-      }
-
-      y=0;
-      for (i=0; i < n; ++i) {
-         flags = vertices[off+i].type;
-         if (flags & 4) {
-            stbtt_int16 dy = *points++;
-            y += (flags & 32) ? dy : -dy;  
-         } else {
-            if (!(flags & 32)) {
-               y = y + (stbtt_int16) (points[0]*256 + points[1]);
-               points += 2;
-            }
-         }
-         vertices[off+i].y = (stbtt_int16) y;
-      }
-
-      num_vertices=0;
-      sx = sy = cx = cy = scx = scy = 0;
-      for (i=0; i < n; ++i) {
-         flags = vertices[off+i].type;
-         x     = (stbtt_int16) vertices[off+i].x;
-         y     = (stbtt_int16) vertices[off+i].y;
-
-         if (next_move == i) {
-            if (i != 0)
-               num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy);
-
-            start_off = !(flags & 1);
-            if (start_off) {
-               scx = x;
-               scy = y;
-               if (!(vertices[off+i+1].type & 1)) {
-                  sx = (x + (stbtt_int32) vertices[off+i+1].x) >> 1;
-                  sy = (y + (stbtt_int32) vertices[off+i+1].y) >> 1;
-               } else {
-                  sx = (stbtt_int32) vertices[off+i+1].x;
-                  sy = (stbtt_int32) vertices[off+i+1].y;
-                  ++i;            
-               }
-            } else {
-               sx = x;
-               sy = y;
-            }
-            stbtt_setvertex(&vertices[num_vertices++], STBTT_vmove,sx,sy,0,0);
-            was_off = 0;
-            next_move = 1 + ttUSHORT(endPtsOfContours+j*2);
-            ++j;
-         } else {
-            if (!(flags & 1)) {     
-               if (was_off)             
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, (cx+x)>>1, (cy+y)>>1, cx, cy);
-               cx = x;
-               cy = y;
-               was_off = 1;
-            } else {
-               if (was_off)
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, x,y, cx, cy);
-               else
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vline, x,y,0,0);
-               was_off = 0;
-            }
-         }
-      }
-      num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy);
-   } else if (numberOfContours == -1) {
-      int more = 1;
-      stbtt_uint8 *comp = data + g + 10;
-      num_vertices = 0;
-      vertices = 0;
-      while (more) {
-         stbtt_uint16 flags, gidx;
-         int comp_num_verts = 0, i;
-         stbtt_vertex *comp_verts = 0, *tmp = 0;
-         float mtx[6] = {1,0,0,1,0,0}, m, n;
-         
-         flags = ttSHORT(comp); comp+=2;
-         gidx = ttSHORT(comp); comp+=2;
-
-         if (flags & 2) {   
-            if (flags & 1) {  
-               mtx[4] = ttSHORT(comp); comp+=2;
-               mtx[5] = ttSHORT(comp); comp+=2;
-            } else {
-               mtx[4] = ttCHAR(comp); comp+=1;
-               mtx[5] = ttCHAR(comp); comp+=1;
-            }
-         }
-         else {
-            STBTT_assert(0);
-         }
-         if (flags & (1<<3)) {  
-            mtx[0] = mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[1] = mtx[2] = 0;
-         } else if (flags & (1<<6)) {  
-            mtx[0] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[1] = mtx[2] = 0;
-            mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
-         } else if (flags & (1<<7)) {  
-            mtx[0] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[1] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[2] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
-         }
-         
-         m = (float) STBTT_sqrt(mtx[0]*mtx[0] + mtx[1]*mtx[1]);
-         n = (float) STBTT_sqrt(mtx[2]*mtx[2] + mtx[3]*mtx[3]);
-
-         comp_num_verts = stbtt_GetGlyphShape(info, gidx, &comp_verts);
-         if (comp_num_verts > 0) {
-            for (i = 0; i < comp_num_verts; ++i) {
-               stbtt_vertex* v = &comp_verts[i];
-               stbtt_vertex_type x,y;
-               x=v->x; y=v->y;
-               v->x = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4]));
-               v->y = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5]));
-               x=v->cx; y=v->cy;
-               v->cx = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4]));
-               v->cy = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5]));
-            }
-            tmp = (stbtt_vertex*)STBTT_malloc((num_vertices+comp_num_verts)*sizeof(stbtt_vertex), info->userdata);
-            if (!tmp) {
-               if (vertices) STBTT_free(vertices, info->userdata);
-               if (comp_verts) STBTT_free(comp_verts, info->userdata);
-               return 0;
-            }
-            if (num_vertices > 0) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex)); 
-            STBTT_memcpy(tmp+num_vertices, comp_verts, comp_num_verts*sizeof(stbtt_vertex));
-            if (vertices) STBTT_free(vertices, info->userdata);
-            vertices = tmp;
-            STBTT_free(comp_verts, info->userdata);
-            num_vertices += comp_num_verts;
-         }
-         more = flags & (1<<5);
-      }
-   } else if (numberOfContours < 0) {
-      STBTT_assert(0);
-   } else {
-   }
-
-   *pvertices = vertices;
-   return num_vertices;
-}
-
-typedef struct
-{
-   int bounds;
-   int started;
-   float first_x, first_y;
-   float x, y;
-   stbtt_int32 min_x, max_x, min_y, max_y;
-
-   stbtt_vertex *pvertices;
-   int num_vertices;
-} stbtt__csctx;
-
-#define STBTT__CSCTX_INIT(bounds) {bounds,0, 0,0, 0,0, 0,0,0,0, NULL, 0}
-
-static void stbtt__track_vertex(stbtt__csctx *c, stbtt_int32 x, stbtt_int32 y)
-{
-   if (x > c->max_x || !c->started) c->max_x = x;
-   if (y > c->max_y || !c->started) c->max_y = y;
-   if (x < c->min_x || !c->started) c->min_x = x;
-   if (y < c->min_y || !c->started) c->min_y = y;
-   c->started = 1;
-}
-
-static void stbtt__csctx_v(stbtt__csctx *c, stbtt_uint8 type, stbtt_int32 x, stbtt_int32 y, stbtt_int32 cx, stbtt_int32 cy, stbtt_int32 cx1, stbtt_int32 cy1)
-{
-   if (c->bounds) {
-      stbtt__track_vertex(c, x, y);
-      if (type == STBTT_vcubic) {
-         stbtt__track_vertex(c, cx, cy);
-         stbtt__track_vertex(c, cx1, cy1);
-      }
-   } else {
-      stbtt_setvertex(&c->pvertices[c->num_vertices], type, x, y, cx, cy);
-      c->pvertices[c->num_vertices].cx1 = (stbtt_int16) cx1;
-      c->pvertices[c->num_vertices].cy1 = (stbtt_int16) cy1;
-   }
-   c->num_vertices++;
-}
-
-static void stbtt__csctx_close_shape(stbtt__csctx *ctx)
-{
-   if (ctx->first_x != ctx->x || ctx->first_y != ctx->y)
-      stbtt__csctx_v(ctx, STBTT_vline, (int)ctx->first_x, (int)ctx->first_y, 0, 0, 0, 0);
-}
-
-static void stbtt__csctx_rmove_to(stbtt__csctx *ctx, float dx, float dy)
-{
-   stbtt__csctx_close_shape(ctx);
-   ctx->first_x = ctx->x = ctx->x + dx;
-   ctx->first_y = ctx->y = ctx->y + dy;
-   stbtt__csctx_v(ctx, STBTT_vmove, (int)ctx->x, (int)ctx->y, 0, 0, 0, 0);
-}
-
-static void stbtt__csctx_rline_to(stbtt__csctx *ctx, float dx, float dy)
-{
-   ctx->x += dx;
-   ctx->y += dy;
-   stbtt__csctx_v(ctx, STBTT_vline, (int)ctx->x, (int)ctx->y, 0, 0, 0, 0);
-}
-
-static void stbtt__csctx_rccurve_to(stbtt__csctx *ctx, float dx1, float dy1, float dx2, float dy2, float dx3, float dy3)
-{
-   float cx1 = ctx->x + dx1;
-   float cy1 = ctx->y + dy1;
-   float cx2 = cx1 + dx2;
-   float cy2 = cy1 + dy2;
-   ctx->x = cx2 + dx3;
-   ctx->y = cy2 + dy3;
-   stbtt__csctx_v(ctx, STBTT_vcubic, (int)ctx->x, (int)ctx->y, (int)cx1, (int)cy1, (int)cx2, (int)cy2);
-}
-
-static stbtt__buf stbtt__get_subr(stbtt__buf idx, int n)
-{
-   int count = stbtt__cff_index_count(&idx);
-   int bias = 107;
-   if (count >= 33900)
-      bias = 32768;
-   else if (count >= 1240)
-      bias = 1131;
-   n += bias;
-   if (n < 0 || n >= count)
-      return stbtt__new_buf(NULL, 0);
-   return stbtt__cff_index_get(idx, n);
-}
-
-static stbtt__buf stbtt__cid_get_glyph_subrs(const stbtt_fontinfo *info, int glyph_index)
-{
-   stbtt__buf fdselect = info->fdselect;
-   int nranges, start, end, v, fmt, fdselector = -1, i;
-
-   stbtt__buf_seek(&fdselect, 0);
-   fmt = stbtt__buf_get8(&fdselect);
-   if (fmt == 0) {
-      stbtt__buf_skip(&fdselect, glyph_index);
-      fdselector = stbtt__buf_get8(&fdselect);
-   } else if (fmt == 3) {
-      nranges = stbtt__buf_get16(&fdselect);
-      start = stbtt__buf_get16(&fdselect);
-      for (i = 0; i < nranges; i++) {
-         v = stbtt__buf_get8(&fdselect);
-         end = stbtt__buf_get16(&fdselect);
-         if (glyph_index >= start && glyph_index < end) {
-            fdselector = v;
-            break;
-         }
-         start = end;
-      }
-   }
-   if (fdselector == -1) stbtt__new_buf(NULL, 0);
-   return stbtt__get_subrs(info->cff, stbtt__cff_index_get(info->fontdicts, fdselector));
-}
-
-static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, stbtt__csctx *c)
-{
-   int in_header = 1, maskbits = 0, subr_stack_height = 0, sp = 0, v, i, b0;
-   int has_subrs = 0, clear_stack;
-   float s[48];
-   stbtt__buf subr_stack[10], subrs = info->subrs, b;
-   float f;
-
-#define STBTT__CSERR(s) (0)
-
-   b = stbtt__cff_index_get(info->charstrings, glyph_index);
-   while (b.cursor < b.size) {
-      i = 0;
-      clear_stack = 1;
-      b0 = stbtt__buf_get8(&b);
-      switch (b0) {
-      case 0x13:  
-      case 0x14:  
-         if (in_header)
-            maskbits += (sp / 2);   
-         in_header = 0;
-         stbtt__buf_skip(&b, (maskbits + 7) / 8);
-         break;
-
-      case 0x01:  
-      case 0x03:  
-      case 0x12:  
-      case 0x17:  
-         maskbits += (sp / 2);
-         break;
-
-      case 0x15:  
-         in_header = 0;
-         if (sp < 2) return STBTT__CSERR("rmoveto stack");
-         stbtt__csctx_rmove_to(c, s[sp-2], s[sp-1]);
-         break;
-      case 0x04:  
-         in_header = 0;
-         if (sp < 1) return STBTT__CSERR("vmoveto stack");
-         stbtt__csctx_rmove_to(c, 0, s[sp-1]);
-         break;
-      case 0x16:  
-         in_header = 0;
-         if (sp < 1) return STBTT__CSERR("hmoveto stack");
-         stbtt__csctx_rmove_to(c, s[sp-1], 0);
-         break;
-
-      case 0x05:  
-         if (sp < 2) return STBTT__CSERR("rlineto stack");
-         for (; i + 1 < sp; i += 2)
-            stbtt__csctx_rline_to(c, s[i], s[i+1]);
-         break;
-
-      case 0x07:  
-         if (sp < 1) return STBTT__CSERR("vlineto stack");
-         goto vlineto;
-      case 0x06:  
-         if (sp < 1) return STBTT__CSERR("hlineto stack");
-         for (;;) {
-            if (i >= sp) break;
-            stbtt__csctx_rline_to(c, s[i], 0);
-            i++;
-      vlineto:
-            if (i >= sp) break;
-            stbtt__csctx_rline_to(c, 0, s[i]);
-            i++;
-         }
-         break;
-
-      case 0x1F:  
-         if (sp < 4) return STBTT__CSERR("hvcurveto stack");
-         goto hvcurveto;
-      case 0x1E:  
-         if (sp < 4) return STBTT__CSERR("vhcurveto stack");
-         for (;;) {
-            if (i + 3 >= sp) break;
-            stbtt__csctx_rccurve_to(c, 0, s[i], s[i+1], s[i+2], s[i+3], (sp - i == 5) ? s[i + 4] : 0.0f);
-            i += 4;
-      hvcurveto:
-            if (i + 3 >= sp) break;
-            stbtt__csctx_rccurve_to(c, s[i], 0, s[i+1], s[i+2], (sp - i == 5) ? s[i+4] : 0.0f, s[i+3]);
-            i += 4;
-         }
-         break;
-
-      case 0x08:  
-         if (sp < 6) return STBTT__CSERR("rcurveline stack");
-         for (; i + 5 < sp; i += 6)
-            stbtt__csctx_rccurve_to(c, s[i], s[i+1], s[i+2], s[i+3], s[i+4], s[i+5]);
-         break;
-
-      case 0x18:  
-         if (sp < 8) return STBTT__CSERR("rcurveline stack");
-         for (; i + 5 < sp - 2; i += 6)
-            stbtt__csctx_rccurve_to(c, s[i], s[i+1], s[i+2], s[i+3], s[i+4], s[i+5]);
-         if (i + 1 >= sp) return STBTT__CSERR("rcurveline stack");
-         stbtt__csctx_rline_to(c, s[i], s[i+1]);
-         break;
-
-      case 0x19:  
-         if (sp < 8) return STBTT__CSERR("rlinecurve stack");
-         for (; i + 1 < sp - 6; i += 2)
-            stbtt__csctx_rline_to(c, s[i], s[i+1]);
-         if (i + 5 >= sp) return STBTT__CSERR("rlinecurve stack");
-         stbtt__csctx_rccurve_to(c, s[i], s[i+1], s[i+2], s[i+3], s[i+4], s[i+5]);
-         break;
-
-      case 0x1A:  
-      case 0x1B:  
-         if (sp < 4) return STBTT__CSERR("(vv|hh)curveto stack");
-         f = 0.0;
-         if (sp & 1) { f = s[i]; i++; }
-         for (; i + 3 < sp; i += 4) {
-            if (b0 == 0x1B)
-               stbtt__csctx_rccurve_to(c, s[i], f, s[i+1], s[i+2], s[i+3], 0.0);
-            else
-               stbtt__csctx_rccurve_to(c, f, s[i], s[i+1], s[i+2], 0.0, s[i+3]);
-            f = 0.0;
-         }
-         break;
-
-      case 0x0A:  
-         if (!has_subrs) {
-            if (info->fdselect.size)
-               subrs = stbtt__cid_get_glyph_subrs(info, glyph_index);
-            has_subrs = 1;
-         }
-      case 0x1D:  
-         if (sp < 1) return STBTT__CSERR("call(g|)subr stack");
-         v = (int) s[--sp];
-         if (subr_stack_height >= 10) return STBTT__CSERR("recursion limit");
-         subr_stack[subr_stack_height++] = b;
-         b = stbtt__get_subr(b0 == 0x0A ? subrs : info->gsubrs, v);
-         if (b.size == 0) return STBTT__CSERR("subr not found");
-         b.cursor = 0;
-         clear_stack = 0;
-         break;
-
-      case 0x0B:  
-         if (subr_stack_height <= 0) return STBTT__CSERR("return outside subr");
-         b = subr_stack[--subr_stack_height];
-         clear_stack = 0;
-         break;
-
-      case 0x0E:  
-         stbtt__csctx_close_shape(c);
-         return 1;
-
-      case 0x0C: {   
-         float dx1, dx2, dx3, dx4, dx5, dx6, dy1, dy2, dy3, dy4, dy5, dy6;
-         float dx, dy;
-         int b1 = stbtt__buf_get8(&b);
-         switch (b1) {
-         case 0x22:  
-            if (sp < 7) return STBTT__CSERR("hflex stack");
-            dx1 = s[0];
-            dx2 = s[1];
-            dy2 = s[2];
-            dx3 = s[3];
-            dx4 = s[4];
-            dx5 = s[5];
-            dx6 = s[6];
-            stbtt__csctx_rccurve_to(c, dx1, 0, dx2, dy2, dx3, 0);
-            stbtt__csctx_rccurve_to(c, dx4, 0, dx5, -dy2, dx6, 0);
-            break;
-
-         case 0x23:  
-            if (sp < 13) return STBTT__CSERR("flex stack");
-            dx1 = s[0];
-            dy1 = s[1];
-            dx2 = s[2];
-            dy2 = s[3];
-            dx3 = s[4];
-            dy3 = s[5];
-            dx4 = s[6];
-            dy4 = s[7];
-            dx5 = s[8];
-            dy5 = s[9];
-            dx6 = s[10];
-            dy6 = s[11];
-            stbtt__csctx_rccurve_to(c, dx1, dy1, dx2, dy2, dx3, dy3);
-            stbtt__csctx_rccurve_to(c, dx4, dy4, dx5, dy5, dx6, dy6);
-            break;
-
-         case 0x24:  
-            if (sp < 9) return STBTT__CSERR("hflex1 stack");
-            dx1 = s[0];
-            dy1 = s[1];
-            dx2 = s[2];
-            dy2 = s[3];
-            dx3 = s[4];
-            dx4 = s[5];
-            dx5 = s[6];
-            dy5 = s[7];
-            dx6 = s[8];
-            stbtt__csctx_rccurve_to(c, dx1, dy1, dx2, dy2, dx3, 0);
-            stbtt__csctx_rccurve_to(c, dx4, 0, dx5, dy5, dx6, -(dy1+dy2+dy5));
-            break;
-
-         case 0x25:  
-            if (sp < 11) return STBTT__CSERR("flex1 stack");
-            dx1 = s[0];
-            dy1 = s[1];
-            dx2 = s[2];
-            dy2 = s[3];
-            dx3 = s[4];
-            dy3 = s[5];
-            dx4 = s[6];
-            dy4 = s[7];
-            dx5 = s[8];
-            dy5 = s[9];
-            dx6 = dy6 = s[10];
-            dx = dx1+dx2+dx3+dx4+dx5;
-            dy = dy1+dy2+dy3+dy4+dy5;
-            if (STBTT_fabs(dx) > STBTT_fabs(dy))
-               dy6 = -dy;
-            else
-               dx6 = -dx;
-            stbtt__csctx_rccurve_to(c, dx1, dy1, dx2, dy2, dx3, dy3);
-            stbtt__csctx_rccurve_to(c, dx4, dy4, dx5, dy5, dx6, dy6);
-            break;
-
-         default:
-            return STBTT__CSERR("unimplemented");
-         }
-      } break;
-
-      default:
-         if (b0 != 255 && b0 != 28 && (b0 < 32 || b0 > 254)) 
-            return STBTT__CSERR("reserved operator");
-
-         if (b0 == 255) {
-            f = (float)(stbtt_int32)stbtt__buf_get32(&b) / 0x10000;
-         } else {
-            stbtt__buf_skip(&b, -1);
-            f = (float)(stbtt_int16)stbtt__cff_int(&b);
-         }
-         if (sp >= 48) return STBTT__CSERR("push stack overflow");
-         s[sp++] = f;
-         clear_stack = 0;
-         break;
-      }
-      if (clear_stack) sp = 0;
-   }
-   return STBTT__CSERR("no endchar");
-
-#undef STBTT__CSERR
-}
-
-static int stbtt__GetGlyphShapeT2(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices)
-{
-   stbtt__csctx count_ctx = STBTT__CSCTX_INIT(1);
-   stbtt__csctx output_ctx = STBTT__CSCTX_INIT(0);
-   if (stbtt__run_charstring(info, glyph_index, &count_ctx)) {
-      *pvertices = (stbtt_vertex*)STBTT_malloc(count_ctx.num_vertices*sizeof(stbtt_vertex), info->userdata);
-      output_ctx.pvertices = *pvertices;
-      if (stbtt__run_charstring(info, glyph_index, &output_ctx)) {
-         STBTT_assert(output_ctx.num_vertices == count_ctx.num_vertices);
-         return output_ctx.num_vertices;
-      }
-   }
-   *pvertices = NULL;
-   return 0;
-}
-
-static int stbtt__GetGlyphInfoT2(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1)
-{
-   stbtt__csctx c = STBTT__CSCTX_INIT(1);
-   int r = stbtt__run_charstring(info, glyph_index, &c);
-   if (x0)  *x0 = r ? c.min_x : 0;
-   if (y0)  *y0 = r ? c.min_y : 0;
-   if (x1)  *x1 = r ? c.max_x : 0;
-   if (y1)  *y1 = r ? c.max_y : 0;
-   return r ? c.num_vertices : 0;
-}
-
-STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices)
-{
-   if (!info->cff.size)
-      return stbtt__GetGlyphShapeTT(info, glyph_index, pvertices);
-   else
-      return stbtt__GetGlyphShapeT2(info, glyph_index, pvertices);
-}
-
-STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_index, int *advanceWidth, int *leftSideBearing)
-{
-   stbtt_uint16 numOfLongHorMetrics = ttUSHORT(info->data+info->hhea + 34);
-   if (glyph_index < numOfLongHorMetrics) {
-      if (advanceWidth)     *advanceWidth    = ttSHORT(info->data + info->hmtx + 4*glyph_index);
-      if (leftSideBearing)  *leftSideBearing = ttSHORT(info->data + info->hmtx + 4*glyph_index + 2);
-   } else {
-      if (advanceWidth)     *advanceWidth    = ttSHORT(info->data + info->hmtx + 4*(numOfLongHorMetrics-1));
-      if (leftSideBearing)  *leftSideBearing = ttSHORT(info->data + info->hmtx + 4*numOfLongHorMetrics + 2*(glyph_index - numOfLongHorMetrics));
-   }
-}
-
-static int  stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
-{
-   stbtt_uint8 *data = info->data + info->kern;
-   stbtt_uint32 needle, straw;
-   int l, r, m;
-
-   if (!info->kern)
-      return 0;
-   if (ttUSHORT(data+2) < 1)        
-      return 0;
-   if (ttUSHORT(data+8) != 1)        
-      return 0;
-
-   l = 0;
-   r = ttUSHORT(data+10) - 1;
-   needle = glyph1 << 16 | glyph2;
-   while (l <= r) {
-      m = (l + r) >> 1;
-      straw = ttULONG(data+18+(m*6));    
-      if (needle < straw)
-         r = m - 1;
-      else if (needle > straw)
-         l = m + 1;
-      else
-         return ttSHORT(data+22+(m*6));
-   }
-   return 0;
-}
-
-static stbtt_int32  stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph)
-{
-    stbtt_uint16 coverageFormat = ttUSHORT(coverageTable);
-    switch(coverageFormat) {
-        case 1: {
-            stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2);
-
-            stbtt_int32 l=0, r=glyphCount-1, m;
-            int straw, needle=glyph;
-            while (l <= r) {
-                stbtt_uint8 *glyphArray = coverageTable + 4;
-                stbtt_uint16 glyphID;
-                m = (l + r) >> 1;
-                glyphID = ttUSHORT(glyphArray + 2 * m);
-                straw = glyphID;
-                if (needle < straw)
-                    r = m - 1;
-                else if (needle > straw)
-                    l = m + 1;
-                else {
-                     return m;
-                }
-            }
-        } break;
-
-        case 2: {
-            stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2);
-            stbtt_uint8 *rangeArray = coverageTable + 4;
-
-            stbtt_int32 l=0, r=rangeCount-1, m;
-            int strawStart, strawEnd, needle=glyph;
-            while (l <= r) {
-                stbtt_uint8 *rangeRecord;
-                m = (l + r) >> 1;
-                rangeRecord = rangeArray + 6 * m;
-                strawStart = ttUSHORT(rangeRecord);
-                strawEnd = ttUSHORT(rangeRecord + 2);
-                if (needle < strawStart)
-                    r = m - 1;
-                else if (needle > strawEnd)
-                    l = m + 1;
-                else {
-                    stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4);
-                    return startCoverageIndex + glyph - strawStart;
-                }
-            }
-        } break;
-
-        default: {
-            STBTT_assert(0);
-        } break;
-    }
-
-    return -1;
-}
-
-static stbtt_int32  stbtt__GetGlyphClass(stbtt_uint8 *classDefTable, int glyph)
-{
-    stbtt_uint16 classDefFormat = ttUSHORT(classDefTable);
-    switch(classDefFormat)
-    {
-        case 1: {
-            stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2);
-            stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4);
-            stbtt_uint8 *classDef1ValueArray = classDefTable + 6;
-
-            if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount)
-                return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID));
-
-        } break;
-
-        case 2: {
-            stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2);
-            stbtt_uint8 *classRangeRecords = classDefTable + 4;
-
-            stbtt_int32 l=0, r=classRangeCount-1, m;
-            int strawStart, strawEnd, needle=glyph;
-            while (l <= r) {
-                stbtt_uint8 *classRangeRecord;
-                m = (l + r) >> 1;
-                classRangeRecord = classRangeRecords + 6 * m;
-                strawStart = ttUSHORT(classRangeRecord);
-                strawEnd = ttUSHORT(classRangeRecord + 2);
-                if (needle < strawStart)
-                    r = m - 1;
-                else if (needle > strawEnd)
-                    l = m + 1;
-                else
-                    return (stbtt_int32)ttUSHORT(classRangeRecord + 4);
-            }
-
-        } break;
-
-        default: {
-            STBTT_assert(0);
-        } break;
-    }
-
-    return -1;
-}
-
-#define STBTT_GPOS_TODO_assert(x)
-
-static stbtt_int32  stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
-{
-    stbtt_uint16 lookupListOffset;
-    stbtt_uint8 *lookupList;
-    stbtt_uint16 lookupCount;
-    stbtt_uint8 *data;
-    stbtt_int32 i;
-
-    if (!info->gpos) return 0;
-
-    data = info->data + info->gpos;
-
-    if (ttUSHORT(data+0) != 1) return 0;    
-    if (ttUSHORT(data+2) != 0) return 0;    
-
-    lookupListOffset = ttUSHORT(data+8);
-    lookupList = data + lookupListOffset;
-    lookupCount = ttUSHORT(lookupList);
-
-    for (i=0; i<lookupCount; ++i) {
-        stbtt_uint16 lookupOffset = ttUSHORT(lookupList + 2 + 2 * i);
-        stbtt_uint8 *lookupTable = lookupList + lookupOffset;
-
-        stbtt_uint16 lookupType = ttUSHORT(lookupTable);
-        stbtt_uint16 subTableCount = ttUSHORT(lookupTable + 4);
-        stbtt_uint8 *subTableOffsets = lookupTable + 6;
-        switch(lookupType) {
-            case 2: {     
-                stbtt_int32 sti;
-                for (sti=0; sti<subTableCount; sti++) {
-                    stbtt_uint16 subtableOffset = ttUSHORT(subTableOffsets + 2 * sti);
-                    stbtt_uint8 *table = lookupTable + subtableOffset;
-                    stbtt_uint16 posFormat = ttUSHORT(table);
-                    stbtt_uint16 coverageOffset = ttUSHORT(table + 2);
-                    stbtt_int32 coverageIndex = stbtt__GetCoverageIndex(table + coverageOffset, glyph1);
-                    if (coverageIndex == -1) continue;
-
-                    switch (posFormat) {
-                        case 1: {
-                            stbtt_int32 l, r, m;
-                            int straw, needle;
-                            stbtt_uint16 valueFormat1 = ttUSHORT(table + 4);
-                            stbtt_uint16 valueFormat2 = ttUSHORT(table + 6);
-                            stbtt_int32 valueRecordPairSizeInBytes = 2;
-                            stbtt_uint16 pairSetCount = ttUSHORT(table + 8);
-                            stbtt_uint16 pairPosOffset = ttUSHORT(table + 10 + 2 * coverageIndex);
-                            stbtt_uint8 *pairValueTable = table + pairPosOffset;
-                            stbtt_uint16 pairValueCount = ttUSHORT(pairValueTable);
-                            stbtt_uint8 *pairValueArray = pairValueTable + 2;
-                            STBTT_GPOS_TODO_assert(valueFormat1 == 4);
-                            if (valueFormat1 != 4) return 0;
-                            STBTT_GPOS_TODO_assert(valueFormat2 == 0);
-                            if (valueFormat2 != 0) return 0;
-
-                            STBTT_assert(coverageIndex < pairSetCount);
-                            STBTT__NOTUSED(pairSetCount);
-
-                            needle=glyph2;
-                            r=pairValueCount-1;
-                            l=0;
-
-                            while (l <= r) {
-                                stbtt_uint16 secondGlyph;
-                                stbtt_uint8 *pairValue;
-                                m = (l + r) >> 1;
-                                pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m;
-                                secondGlyph = ttUSHORT(pairValue);
-                                straw = secondGlyph;
-                                if (needle < straw)
-                                    r = m - 1;
-                                else if (needle > straw)
-                                    l = m + 1;
-                                else {
-                                    stbtt_int16 xAdvance = ttSHORT(pairValue + 2);
-                                    return xAdvance;
-                                }
-                            }
-                        } break;
-
-                        case 2: {
-                            stbtt_uint16 valueFormat1 = ttUSHORT(table + 4);
-                            stbtt_uint16 valueFormat2 = ttUSHORT(table + 6);
-
-                            stbtt_uint16 classDef1Offset = ttUSHORT(table + 8);
-                            stbtt_uint16 classDef2Offset = ttUSHORT(table + 10);
-                            int glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1);
-                            int glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2);
-
-                            stbtt_uint16 class1Count = ttUSHORT(table + 12);
-                            stbtt_uint16 class2Count = ttUSHORT(table + 14);
-                            STBTT_assert(glyph1class < class1Count);
-                            STBTT_assert(glyph2class < class2Count);
-
-                            STBTT_GPOS_TODO_assert(valueFormat1 == 4);
-                            if (valueFormat1 != 4) return 0;
-                            STBTT_GPOS_TODO_assert(valueFormat2 == 0);
-                            if (valueFormat2 != 0) return 0;
-
-                            if (glyph1class >= 0 && glyph1class < class1Count && glyph2class >= 0 && glyph2class < class2Count) {
-                                stbtt_uint8 *class1Records = table + 16;
-                                stbtt_uint8 *class2Records = class1Records + 2 * (glyph1class * class2Count);
-                                stbtt_int16 xAdvance = ttSHORT(class2Records + 2 * glyph2class);
-                                return xAdvance;
-                            }
-                        } break;
-
-                        default: {
-                            STBTT_assert(0);
-                            break;
-                        }     
-                    }
-                }
-                break;
-            }     
-
-            default:
-                break;
-        }
-    }
-
-    return 0;
-}
-
-STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int g2)
-{
-   int xAdvance = 0;
-
-   if (info->gpos)
-      xAdvance += stbtt__GetGlyphGPOSInfoAdvance(info, g1, g2);
-
-   if (info->kern)
-      xAdvance += stbtt__GetGlyphKernInfoAdvance(info, g1, g2);
-
-   return xAdvance;
-}
-
-STBTT_DEF int  stbtt_GetCodepointKernAdvance(const stbtt_fontinfo *info, int ch1, int ch2)
-{
-   if (!info->kern && !info->gpos)            
-      return 0;
-   return stbtt_GetGlyphKernAdvance(info, stbtt_FindGlyphIndex(info,ch1), stbtt_FindGlyphIndex(info,ch2));
-}
-
-STBTT_DEF void stbtt_GetCodepointHMetrics(const stbtt_fontinfo *info, int codepoint, int *advanceWidth, int *leftSideBearing)
-{
-   stbtt_GetGlyphHMetrics(info, stbtt_FindGlyphIndex(info,codepoint), advanceWidth, leftSideBearing);
-}
-
-STBTT_DEF void stbtt_GetFontVMetrics(const stbtt_fontinfo *info, int *ascent, int *descent, int *lineGap)
-{
-   if (ascent ) *ascent  = ttSHORT(info->data+info->hhea + 4);
-   if (descent) *descent = ttSHORT(info->data+info->hhea + 6);
-   if (lineGap) *lineGap = ttSHORT(info->data+info->hhea + 8);
-}
-
-STBTT_DEF int  stbtt_GetFontVMetricsOS2(const stbtt_fontinfo *info, int *typoAscent, int *typoDescent, int *typoLineGap)
-{
-   int tab = stbtt__find_table(info->data, info->fontstart, "OS/2");
-   if (!tab)
-      return 0;
-   if (typoAscent ) *typoAscent  = ttSHORT(info->data+tab + 68);
-   if (typoDescent) *typoDescent = ttSHORT(info->data+tab + 70);
-   if (typoLineGap) *typoLineGap = ttSHORT(info->data+tab + 72);
-   return 1;
-}
-
-STBTT_DEF void stbtt_GetFontBoundingBox(const stbtt_fontinfo *info, int *x0, int *y0, int *x1, int *y1)
-{
-   *x0 = ttSHORT(info->data + info->head + 36);
-   *y0 = ttSHORT(info->data + info->head + 38);
-   *x1 = ttSHORT(info->data + info->head + 40);
-   *y1 = ttSHORT(info->data + info->head + 42);
-}
-
-STBTT_DEF float stbtt_ScaleForPixelHeight(const stbtt_fontinfo *info, float height)
-{
-   int fheight = ttSHORT(info->data + info->hhea + 4) - ttSHORT(info->data + info->hhea + 6);
-   return (float) height / fheight;
-}
-
-STBTT_DEF float stbtt_ScaleForMappingEmToPixels(const stbtt_fontinfo *info, float pixels)
-{
-   int unitsPerEm = ttUSHORT(info->data + info->head + 18);
-   return pixels / unitsPerEm;
-}
-
-STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *v)
-{
-   STBTT_free(v, info->userdata);
-}
-
-STBTT_DEF void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1)
-{
-   int x0=0,y0=0,x1,y1;     
-   if (!stbtt_GetGlyphBox(font, glyph, &x0,&y0,&x1,&y1)) {
-      if (ix0) *ix0 = 0;
-      if (iy0) *iy0 = 0;
-      if (ix1) *ix1 = 0;
-      if (iy1) *iy1 = 0;
-   } else {
-      if (ix0) *ix0 = STBTT_ifloor( x0 * scale_x + shift_x);
-      if (iy0) *iy0 = STBTT_ifloor(-y1 * scale_y + shift_y);
-      if (ix1) *ix1 = STBTT_iceil ( x1 * scale_x + shift_x);
-      if (iy1) *iy1 = STBTT_iceil (-y0 * scale_y + shift_y);
-   }
-}
-
-STBTT_DEF void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1)
-{
-   stbtt_GetGlyphBitmapBoxSubpixel(font, glyph, scale_x, scale_y,0.0f,0.0f, ix0, iy0, ix1, iy1);
-}
-
-STBTT_DEF void stbtt_GetCodepointBitmapBoxSubpixel(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1)
-{
-   stbtt_GetGlyphBitmapBoxSubpixel(font, stbtt_FindGlyphIndex(font,codepoint), scale_x, scale_y,shift_x,shift_y, ix0,iy0,ix1,iy1);
-}
-
-STBTT_DEF void stbtt_GetCodepointBitmapBox(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1)
-{
-   stbtt_GetCodepointBitmapBoxSubpixel(font, codepoint, scale_x, scale_y,0.0f,0.0f, ix0,iy0,ix1,iy1);
-}
-
-typedef struct stbtt__hheap_chunk
-{
-   struct stbtt__hheap_chunk *next;
-} stbtt__hheap_chunk;
-
-typedef struct stbtt__hheap
-{
-   struct stbtt__hheap_chunk *head;
-   void   *first_free;
-   int    num_remaining_in_head_chunk;
-} stbtt__hheap;
-
-static void *stbtt__hheap_alloc(stbtt__hheap *hh, size_t size, void *userdata)
-{
-   if (hh->first_free) {
-      void *p = hh->first_free;
-      hh->first_free = * (void **) p;
-      return p;
-   } else {
-      if (hh->num_remaining_in_head_chunk == 0) {
-         int count = (size < 32 ? 2000 : size < 128 ? 800 : 100);
-         stbtt__hheap_chunk *c = (stbtt__hheap_chunk *) STBTT_malloc(sizeof(stbtt__hheap_chunk) + size * count, userdata);
-         if (c == NULL)
-            return NULL;
-         c->next = hh->head;
-         hh->head = c;
-         hh->num_remaining_in_head_chunk = count;
-      }
-      --hh->num_remaining_in_head_chunk;
-      return (char *) (hh->head) + sizeof(stbtt__hheap_chunk) + size * hh->num_remaining_in_head_chunk;
-   }
-}
-
-static void stbtt__hheap_free(stbtt__hheap *hh, void *p)
-{
-   *(void **) p = hh->first_free;
-   hh->first_free = p;
-}
-
-static void stbtt__hheap_cleanup(stbtt__hheap *hh, void *userdata)
-{
-   stbtt__hheap_chunk *c = hh->head;
-   while (c) {
-      stbtt__hheap_chunk *n = c->next;
-      STBTT_free(c, userdata);
-      c = n;
-   }
-}
-
-typedef struct stbtt__edge {
-   float x0,y0, x1,y1;
-   int invert;
-} stbtt__edge;
-
-
-typedef struct stbtt__active_edge
-{
-   struct stbtt__active_edge *next;
-   #if STBTT_RASTERIZER_VERSION==1
-   int x,dx;
-   float ey;
-   int direction;
-   #elif STBTT_RASTERIZER_VERSION==2
-   float fx,fdx,fdy;
-   float direction;
-   float sy;
-   float ey;
-   #else
-   #error "Unrecognized value of STBTT_RASTERIZER_VERSION"
-   #endif
-} stbtt__active_edge;
-
-#if STBTT_RASTERIZER_VERSION == 1
-#define STBTT_FIXSHIFT   10
-#define STBTT_FIX        (1 << STBTT_FIXSHIFT)
-#define STBTT_FIXMASK    (STBTT_FIX-1)
-
-static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, int off_x, float start_point, void *userdata)
-{
-   stbtt__active_edge *z = (stbtt__active_edge *) stbtt__hheap_alloc(hh, sizeof(*z), userdata);
-   float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
-   STBTT_assert(z != NULL);
-   if (!z) return z;
-   
-   if (dxdy < 0)
-      z->dx = -STBTT_ifloor(STBTT_FIX * -dxdy);
-   else
-      z->dx = STBTT_ifloor(STBTT_FIX * dxdy);
-
-   z->x = STBTT_ifloor(STBTT_FIX * e->x0 + z->dx * (start_point - e->y0));             
-   z->x -= off_x * STBTT_FIX;
-
-   z->ey = e->y1;
-   z->next = 0;
-   z->direction = e->invert ? 1 : -1;
-   return z;
-}
-#elif STBTT_RASTERIZER_VERSION == 2
-static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, int off_x, float start_point, void *userdata)
-{
-   stbtt__active_edge *z = (stbtt__active_edge *) stbtt__hheap_alloc(hh, sizeof(*z), userdata);
-   float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
-   STBTT_assert(z != NULL);
-   if (!z) return z;
-   z->fdx = dxdy;
-   z->fdy = dxdy != 0.0f ? (1.0f/dxdy) : 0.0f;
-   z->fx = e->x0 + dxdy * (start_point - e->y0);
-   z->fx -= off_x;
-   z->direction = e->invert ? 1.0f : -1.0f;
-   z->sy = e->y0;
-   z->ey = e->y1;
-   z->next = 0;
-   return z;
-}
-#else
-#error "Unrecognized value of STBTT_RASTERIZER_VERSION"
-#endif
-
-#if STBTT_RASTERIZER_VERSION == 1
-static void stbtt__fill_active_edges(unsigned char *scanline, int len, stbtt__active_edge *e, int max_weight)
-{
-   int x0=0, w=0;
-
-   while (e) {
-      if (w == 0) {
-         x0 = e->x; w += e->direction;
-      } else {
-         int x1 = e->x; w += e->direction;
-         if (w == 0) {
-            int i = x0 >> STBTT_FIXSHIFT;
-            int j = x1 >> STBTT_FIXSHIFT;
-
-            if (i < len && j >= 0) {
-               if (i == j) {
-                  scanline[i] = scanline[i] + (stbtt_uint8) ((x1 - x0) * max_weight >> STBTT_FIXSHIFT);
-               } else {
-                  if (i >= 0)     
-                     scanline[i] = scanline[i] + (stbtt_uint8) (((STBTT_FIX - (x0 & STBTT_FIXMASK)) * max_weight) >> STBTT_FIXSHIFT);
-                  else
-                     i = -1;  
-
-                  if (j < len)     
-                     scanline[j] = scanline[j] + (stbtt_uint8) (((x1 & STBTT_FIXMASK) * max_weight) >> STBTT_FIXSHIFT);
-                  else
-                     j = len;  
-
-                  for (++i; i < j; ++i)       
-                     scanline[i] = scanline[i] + (stbtt_uint8) max_weight;
-               }
-            }
-         }
-      }
-      
-      e = e->next;
-   }
-}
-
-static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int n, int vsubsample, int off_x, int off_y, void *userdata)
-{
-   stbtt__hheap hh = { 0, 0, 0 };
-   stbtt__active_edge *active = NULL;
-   int y,j=0;
-   int max_weight = (255 / vsubsample);      
-   int s;    
-   unsigned char scanline_data[512], *scanline;
-
-   if (result->w > 512)
-      scanline = (unsigned char *) STBTT_malloc(result->w, userdata);
-   else
-      scanline = scanline_data;
-
-   y = off_y * vsubsample;
-   e[n].y0 = (off_y + result->h) * (float) vsubsample + 1;
-
-   while (j < result->h) {
-      STBTT_memset(scanline, 0, result->w);
-      for (s=0; s < vsubsample; ++s) {
-         float scan_y = y + 0.5f;
-         stbtt__active_edge **step = &active;
-
-         while (*step) {
-            stbtt__active_edge * z = *step;
-            if (z->ey <= scan_y) {
-               *step = z->next;    
-               STBTT_assert(z->direction);
-               z->direction = 0;
-               stbtt__hheap_free(&hh, z);
-            } else {
-               z->x += z->dx;       
-               step = &((*step)->next);    
-            }
-         }
-
-         for(;;) {
-            int changed=0;
-            step = &active;
-            while (*step && (*step)->next) {
-               if ((*step)->x > (*step)->next->x) {
-                  stbtt__active_edge *t = *step;
-                  stbtt__active_edge *q = t->next;
-
-                  t->next = q->next;
-                  q->next = t;
-                  *step = q;
-                  changed = 1;
-               }
-               step = &(*step)->next;
-            }
-            if (!changed) break;
-         }
-
-         while (e->y0 <= scan_y) {
-            if (e->y1 > scan_y) {
-               stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y, userdata);
-               if (z != NULL) {
-                  if (active == NULL)
-                     active = z;
-                  else if (z->x < active->x) {
-                     z->next = active;
-                     active = z;
-                  } else {
-                     stbtt__active_edge *p = active;
-                     while (p->next && p->next->x < z->x)
-                        p = p->next;
-                     z->next = p->next;
-                     p->next = z;
-                  }
-               }
-            }
-            ++e;
-         }
-
-         if (active)
-            stbtt__fill_active_edges(scanline, result->w, active, max_weight);
-
-         ++y;
-      }
-      STBTT_memcpy(result->pixels + j * result->stride, scanline, result->w);
-      ++j;
-   }
-
-   stbtt__hheap_cleanup(&hh, userdata);
-
-   if (scanline != scanline_data)
-      STBTT_free(scanline, userdata);
-}
-
-#elif STBTT_RASTERIZER_VERSION == 2
-
-static void stbtt__handle_clipped_edge(float *scanline, int x, stbtt__active_edge *e, float x0, float y0, float x1, float y1)
-{
-   if (y0 == y1) return;
-   STBTT_assert(y0 < y1);
-   STBTT_assert(e->sy <= e->ey);
-   if (y0 > e->ey) return;
-   if (y1 < e->sy) return;
-   if (y0 < e->sy) {
-      x0 += (x1-x0) * (e->sy - y0) / (y1-y0);
-      y0 = e->sy;
-   }
-   if (y1 > e->ey) {
-      x1 += (x1-x0) * (e->ey - y1) / (y1-y0);
-      y1 = e->ey;
-   }
-
-   if (x0 == x)
-      STBTT_assert(x1 <= x+1);
-   else if (x0 == x+1)
-      STBTT_assert(x1 >= x);
-   else if (x0 <= x)
-      STBTT_assert(x1 <= x);
-   else if (x0 >= x+1)
-      STBTT_assert(x1 >= x+1);
-   else
-      STBTT_assert(x1 >= x && x1 <= x+1);
-
-   if (x0 <= x && x1 <= x)
-      scanline[x] += e->direction * (y1-y0);
-   else if (x0 >= x+1 && x1 >= x+1)
-      ;
-   else {
-      STBTT_assert(x0 >= x && x0 <= x+1 && x1 >= x && x1 <= x+1);
-      scanline[x] += e->direction * (y1-y0) * (1-((x0-x)+(x1-x))/2);        
-   }
-}
-
-static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, int len, stbtt__active_edge *e, float y_top)
-{
-   float y_bottom = y_top+1;
-
-   while (e) {
-      STBTT_assert(e->ey >= y_top);
-
-      if (e->fdx == 0) {
-         float x0 = e->fx;
-         if (x0 < len) {
-            if (x0 >= 0) {
-               stbtt__handle_clipped_edge(scanline,(int) x0,e, x0,y_top, x0,y_bottom);
-               stbtt__handle_clipped_edge(scanline_fill-1,(int) x0+1,e, x0,y_top, x0,y_bottom);
-            } else {
-               stbtt__handle_clipped_edge(scanline_fill-1,0,e, x0,y_top, x0,y_bottom);
-            }
-         }
-      } else {
-         float x0 = e->fx;
-         float dx = e->fdx;
-         float xb = x0 + dx;
-         float x_top, x_bottom;
-         float sy0,sy1;
-         float dy = e->fdy;
-         STBTT_assert(e->sy <= y_bottom && e->ey >= y_top);
-
-         if (e->sy > y_top) {
-            x_top = x0 + dx * (e->sy - y_top);
-            sy0 = e->sy;
-         } else {
-            x_top = x0;
-            sy0 = y_top;
-         }
-         if (e->ey < y_bottom) {
-            x_bottom = x0 + dx * (e->ey - y_top);
-            sy1 = e->ey;
-         } else {
-            x_bottom = xb;
-            sy1 = y_bottom;
-         }
-
-         if (x_top >= 0 && x_bottom >= 0 && x_top < len && x_bottom < len) {
-            if ((int) x_top == (int) x_bottom) {
-               float height;
-               int x = (int) x_top;
-               height = sy1 - sy0;
-               STBTT_assert(x >= 0 && x < len);
-               scanline[x] += e->direction * (1-((x_top - x) + (x_bottom-x))/2)  * height;
-               scanline_fill[x] += e->direction * height;        
-            } else {
-               int x,x1,x2;
-               float y_crossing, step, sign, area;
-               if (x_top > x_bottom) {
-                  float t;
-                  sy0 = y_bottom - (sy0 - y_top);
-                  sy1 = y_bottom - (sy1 - y_top);
-                  t = sy0, sy0 = sy1, sy1 = t;
-                  t = x_bottom, x_bottom = x_top, x_top = t;
-                  dx = -dx;
-                  dy = -dy;
-                  t = x0, x0 = xb, xb = t;
-                  (void)dx;      
-               }
-
-               x1 = (int) x_top;
-               x2 = (int) x_bottom;
-               y_crossing = (x1+1 - x0) * dy + y_top;
-
-               sign = e->direction;
-               area = sign * (y_crossing-sy0);
-               scanline[x1] += area * (1-((x_top - x1)+(x1+1-x1))/2);
-
-               step = sign * dy;
-               for (x = x1+1; x < x2; ++x) {
-                  scanline[x] += area + step/2;
-                  area += step;
-               }
-               y_crossing += dy * (x2 - (x1+1));
-
-               STBTT_assert(STBTT_fabs(area) <= 1.01f);
-
-               scanline[x2] += area + sign * (1-((x2-x2)+(x_bottom-x2))/2) * (sy1-y_crossing);
-
-               scanline_fill[x2] += sign * (sy1-sy0);
-            }
-         } else {
-            int x;
-            for (x=0; x < len; ++x) {
-               float y0 = y_top;
-               float x1 = (float) (x);
-               float x2 = (float) (x+1);
-               float x3 = xb;
-               float y3 = y_bottom;
-
-               float y1 = (x - x0) / dx + y_top;
-               float y2 = (x+1 - x0) / dx + y_top;
-
-               if (x0 < x1 && x3 > x2) {             
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
-               } else if (x3 < x1 && x0 > x2) {      
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
-               } else if (x0 < x1 && x3 > x1) {       
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
-               } else if (x3 < x1 && x0 > x1) {       
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
-               } else if (x0 < x2 && x3 > x2) {       
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
-               } else if (x3 < x2 && x0 > x2) {       
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
-               } else {    
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x3,y3);
-               }
-            }
-         }
-      }
-      e = e->next;
-   }
-}
-
-static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int n, int vsubsample, int off_x, int off_y, void *userdata)
-{
-   stbtt__hheap hh = { 0, 0, 0 };
-   stbtt__active_edge *active = NULL;
-   int y,j=0, i;
-   float scanline_data[129], *scanline, *scanline2;
-
-   STBTT__NOTUSED(vsubsample);
-
-   if (result->w > 64)
-      scanline = (float *) STBTT_malloc((result->w*2+1) * sizeof(float), userdata);
-   else
-      scanline = scanline_data;
-
-   scanline2 = scanline + result->w;
-
-   y = off_y;
-   e[n].y0 = (float) (off_y + result->h) + 1;
-
-   while (j < result->h) {
-      float scan_y_top    = y + 0.0f;
-      float scan_y_bottom = y + 1.0f;
-      stbtt__active_edge **step = &active;
-
-      STBTT_memset(scanline , 0, result->w*sizeof(scanline[0]));
-      STBTT_memset(scanline2, 0, (result->w+1)*sizeof(scanline[0]));
-
-      while (*step) {
-         stbtt__active_edge * z = *step;
-         if (z->ey <= scan_y_top) {
-            *step = z->next;    
-            STBTT_assert(z->direction);
-            z->direction = 0;
-            stbtt__hheap_free(&hh, z);
-         } else {
-            step = &((*step)->next);    
-         }
-      }
-
-      while (e->y0 <= scan_y_bottom) {
-         if (e->y0 != e->y1) {
-            stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y_top, userdata);
-            if (z != NULL) {
-               if (j == 0 && off_y != 0) {
-                  if (z->ey < scan_y_top) {
-                     z->ey = scan_y_top;
-                  }
-               }
-               STBTT_assert(z->ey >= scan_y_top);                 
-               z->next = active;
-               active = z;
-            }
-         }
-         ++e;
-      }
-
-      if (active)
-         stbtt__fill_active_edges_new(scanline, scanline2+1, result->w, active, scan_y_top);
-
-      {
-         float sum = 0;
-         for (i=0; i < result->w; ++i) {
-            float k;
-            int m;
-            sum += scanline2[i];
-            k = scanline[i] + sum;
-            k = (float) STBTT_fabs(k)*255 + 0.5f;
-            m = (int) k;
-            if (m > 255) m = 255;
-            result->pixels[j*result->stride + i] = (unsigned char) m;
-         }
-      }
-      step = &active;
-      while (*step) {
-         stbtt__active_edge *z = *step;
-         z->fx += z->fdx;       
-         step = &((*step)->next);    
-      }
-
-      ++y;
-      ++j;
-   }
-
-   stbtt__hheap_cleanup(&hh, userdata);
-
-   if (scanline != scanline_data)
-      STBTT_free(scanline, userdata);
-}
-#else
-#error "Unrecognized value of STBTT_RASTERIZER_VERSION"
-#endif
-
-#define STBTT__COMPARE(a,b)  ((a)->y0 < (b)->y0)
-
-static void stbtt__sort_edges_ins_sort(stbtt__edge *p, int n)
-{
-   int i,j;
-   for (i=1; i < n; ++i) {
-      stbtt__edge t = p[i], *a = &t;
-      j = i;
-      while (j > 0) {
-         stbtt__edge *b = &p[j-1];
-         int c = STBTT__COMPARE(a,b);
-         if (!c) break;
-         p[j] = p[j-1];
-         --j;
-      }
-      if (i != j)
-         p[j] = t;
-   }
-}
-
-static void stbtt__sort_edges_quicksort(stbtt__edge *p, int n)
-{
-   while (n > 12) {
-      stbtt__edge t;
-      int c01,c12,c,m,i,j;
-
-      m = n >> 1;
-      c01 = STBTT__COMPARE(&p[0],&p[m]);
-      c12 = STBTT__COMPARE(&p[m],&p[n-1]);
-      if (c01 != c12) {
-         int z;
-         c = STBTT__COMPARE(&p[0],&p[n-1]);
-         z = (c == c12) ? 0 : n-1;
-         t = p[z];
-         p[z] = p[m];
-         p[m] = t;
-      }
-      t = p[0];
-      p[0] = p[m];
-      p[m] = t;
-
-      i=1;
-      j=n-1;
-      for(;;) {
-         for (;;++i) {
-            if (!STBTT__COMPARE(&p[i], &p[0])) break;
-         }
-         for (;;--j) {
-            if (!STBTT__COMPARE(&p[0], &p[j])) break;
-         }
-         if (i >= j) break;
-         t = p[i];
-         p[i] = p[j];
-         p[j] = t;
-
-         ++i;
-         --j;
-      }
-      if (j < (n-i)) {
-         stbtt__sort_edges_quicksort(p,j);
-         p = p+i;
-         n = n-i;
-      } else {
-         stbtt__sort_edges_quicksort(p+i, n-i);
-         n = j;
-      }
-   }
-}
-
-static void stbtt__sort_edges(stbtt__edge *p, int n)
-{
-   stbtt__sort_edges_quicksort(p, n);
-   stbtt__sort_edges_ins_sort(p, n);
-}
-
-typedef struct
-{
-   float x,y;
-} stbtt__point;
-
-static void stbtt__rasterize(stbtt__bitmap *result, stbtt__point *pts, int *wcount, int windings, float scale_x, float scale_y, float shift_x, float shift_y, int off_x, int off_y, int invert, void *userdata)
-{
-   float y_scale_inv = invert ? -scale_y : scale_y;
-   stbtt__edge *e;
-   int n,i,j,k,m;
-#if STBTT_RASTERIZER_VERSION == 1
-   int vsubsample = result->h < 8 ? 15 : 5;
-#elif STBTT_RASTERIZER_VERSION == 2
-   int vsubsample = 1;
-#else
-   #error "Unrecognized value of STBTT_RASTERIZER_VERSION"
-#endif
-   n = 0;
-   for (i=0; i < windings; ++i)
-      n += wcount[i];
-
-   e = (stbtt__edge *) STBTT_malloc(sizeof(*e) * (n+1), userdata);        
-   if (e == 0) return;
-   n = 0;
-
-   m=0;
-   for (i=0; i < windings; ++i) {
-      stbtt__point *p = pts + m;
-      m += wcount[i];
-      j = wcount[i]-1;
-      for (k=0; k < wcount[i]; j=k++) {
-         int a=k,b=j;
-         if (p[j].y == p[k].y)
-            continue;
-         e[n].invert = 0;
-         if (invert ? p[j].y > p[k].y : p[j].y < p[k].y) {
-            e[n].invert = 1;
-            a=j,b=k;
-         }
-         e[n].x0 = p[a].x * scale_x + shift_x;
-         e[n].y0 = (p[a].y * y_scale_inv + shift_y) * vsubsample;
-         e[n].x1 = p[b].x * scale_x + shift_x;
-         e[n].y1 = (p[b].y * y_scale_inv + shift_y) * vsubsample;
-         ++n;
-      }
-   }
-
-   stbtt__sort_edges(e, n);
-
-   stbtt__rasterize_sorted_edges(result, e, n, vsubsample, off_x, off_y, userdata);
-
-   STBTT_free(e, userdata);
-}
-
-static void stbtt__add_point(stbtt__point *points, int n, float x, float y)
-{
-   if (!points) return;      
-   points[n].x = x;
-   points[n].y = y;
-}
-
-static int stbtt__tesselate_curve(stbtt__point *points, int *num_points, float x0, float y0, float x1, float y1, float x2, float y2, float objspace_flatness_squared, int n)
-{
-   float mx = (x0 + 2*x1 + x2)/4;
-   float my = (y0 + 2*y1 + y2)/4;
-   float dx = (x0+x2)/2 - mx;
-   float dy = (y0+y2)/2 - my;
-   if (n > 16)         
-      return 1;
-   if (dx*dx+dy*dy > objspace_flatness_squared) {          
-      stbtt__tesselate_curve(points, num_points, x0,y0, (x0+x1)/2.0f,(y0+y1)/2.0f, mx,my, objspace_flatness_squared,n+1);
-      stbtt__tesselate_curve(points, num_points, mx,my, (x1+x2)/2.0f,(y1+y2)/2.0f, x2,y2, objspace_flatness_squared,n+1);
-   } else {
-      stbtt__add_point(points, *num_points,x2,y2);
-      *num_points = *num_points+1;
-   }
-   return 1;
-}
-
-static void stbtt__tesselate_cubic(stbtt__point *points, int *num_points, float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3, float objspace_flatness_squared, int n)
-{
-   float dx0 = x1-x0;
-   float dy0 = y1-y0;
-   float dx1 = x2-x1;
-   float dy1 = y2-y1;
-   float dx2 = x3-x2;
-   float dy2 = y3-y2;
-   float dx = x3-x0;
-   float dy = y3-y0;
-   float longlen = (float) (STBTT_sqrt(dx0*dx0+dy0*dy0)+STBTT_sqrt(dx1*dx1+dy1*dy1)+STBTT_sqrt(dx2*dx2+dy2*dy2));
-   float shortlen = (float) STBTT_sqrt(dx*dx+dy*dy);
-   float flatness_squared = longlen*longlen-shortlen*shortlen;
-
-   if (n > 16)         
-      return;
-
-   if (flatness_squared > objspace_flatness_squared) {
-      float x01 = (x0+x1)/2;
-      float y01 = (y0+y1)/2;
-      float x12 = (x1+x2)/2;
-      float y12 = (y1+y2)/2;
-      float x23 = (x2+x3)/2;
-      float y23 = (y2+y3)/2;
-
-      float xa = (x01+x12)/2;
-      float ya = (y01+y12)/2;
-      float xb = (x12+x23)/2;
-      float yb = (y12+y23)/2;
-
-      float mx = (xa+xb)/2;
-      float my = (ya+yb)/2;
-
-      stbtt__tesselate_cubic(points, num_points, x0,y0, x01,y01, xa,ya, mx,my, objspace_flatness_squared,n+1);
-      stbtt__tesselate_cubic(points, num_points, mx,my, xb,yb, x23,y23, x3,y3, objspace_flatness_squared,n+1);
-   } else {
-      stbtt__add_point(points, *num_points,x3,y3);
-      *num_points = *num_points+1;
-   }
-}
-
-static stbtt__point *stbtt_FlattenCurves(stbtt_vertex *vertices, int num_verts, float objspace_flatness, int **contour_lengths, int *num_contours, void *userdata)
-{
-   stbtt__point *points=0;
-   int num_points=0;
-
-   float objspace_flatness_squared = objspace_flatness * objspace_flatness;
-   int i,n=0,start=0, pass;
-
-   for (i=0; i < num_verts; ++i)
-      if (vertices[i].type == STBTT_vmove)
-         ++n;
-
-   *num_contours = n;
-   if (n == 0) return 0;
-
-   *contour_lengths = (int *) STBTT_malloc(sizeof(**contour_lengths) * n, userdata);
-
-   if (*contour_lengths == 0) {
-      *num_contours = 0;
-      return 0;
-   }
-
-   for (pass=0; pass < 2; ++pass) {
-      float x=0,y=0;
-      if (pass == 1) {
-         points = (stbtt__point *) STBTT_malloc(num_points * sizeof(points[0]), userdata);
-         if (points == NULL) goto error;
-      }
-      num_points = 0;
-      n= -1;
-      for (i=0; i < num_verts; ++i) {
-         switch (vertices[i].type) {
-            case STBTT_vmove:
-               if (n >= 0)
-                  (*contour_lengths)[n] = num_points - start;
-               ++n;
-               start = num_points;
-
-               x = vertices[i].x, y = vertices[i].y;
-               stbtt__add_point(points, num_points++, x,y);
-               break;
-            case STBTT_vline:
-               x = vertices[i].x, y = vertices[i].y;
-               stbtt__add_point(points, num_points++, x, y);
-               break;
-            case STBTT_vcurve:
-               stbtt__tesselate_curve(points, &num_points, x,y,
-                                        vertices[i].cx, vertices[i].cy,
-                                        vertices[i].x,  vertices[i].y,
-                                        objspace_flatness_squared, 0);
-               x = vertices[i].x, y = vertices[i].y;
-               break;
-            case STBTT_vcubic:
-               stbtt__tesselate_cubic(points, &num_points, x,y,
-                                        vertices[i].cx, vertices[i].cy,
-                                        vertices[i].cx1, vertices[i].cy1,
-                                        vertices[i].x,  vertices[i].y,
-                                        objspace_flatness_squared, 0);
-               x = vertices[i].x, y = vertices[i].y;
-               break;
-         }
-      }
-      (*contour_lengths)[n] = num_points - start;
-   }
-
-   return points;
-error:
-   STBTT_free(points, userdata);
-   STBTT_free(*contour_lengths, userdata);
-   *contour_lengths = 0;
-   *num_contours = 0;
-   return NULL;
-}
-
-STBTT_DEF void stbtt_Rasterize(stbtt__bitmap *result, float flatness_in_pixels, stbtt_vertex *vertices, int num_verts, float scale_x, float scale_y, float shift_x, float shift_y, int x_off, int y_off, int invert, void *userdata)
-{
-   float scale            = scale_x > scale_y ? scale_y : scale_x;
-   int winding_count      = 0;
-   int *winding_lengths   = NULL;
-   stbtt__point *windings = stbtt_FlattenCurves(vertices, num_verts, flatness_in_pixels / scale, &winding_lengths, &winding_count, userdata);
-   if (windings) {
-      stbtt__rasterize(result, windings, winding_lengths, winding_count, scale_x, scale_y, shift_x, shift_y, x_off, y_off, invert, userdata);
-      STBTT_free(winding_lengths, userdata);
-      STBTT_free(windings, userdata);
-   }
-}
-
-STBTT_DEF void stbtt_FreeBitmap(unsigned char *bitmap, void *userdata)
-{
-   STBTT_free(bitmap, userdata);
-}
-
-STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int glyph, int *width, int *height, int *xoff, int *yoff)
-{
-   int ix0,iy0,ix1,iy1;
-   stbtt__bitmap gbm;
-   stbtt_vertex *vertices;   
-   int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices);
-
-   if (scale_x == 0) scale_x = scale_y;
-   if (scale_y == 0) {
-      if (scale_x == 0) {
-         STBTT_free(vertices, info->userdata);
-         return NULL;
-      }
-      scale_y = scale_x;
-   }
-
-   stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,&ix1,&iy1);
-
-   gbm.w = (ix1 - ix0);
-   gbm.h = (iy1 - iy0);
-   gbm.pixels = NULL;     
-
-   if (width ) *width  = gbm.w;
-   if (height) *height = gbm.h;
-   if (xoff  ) *xoff   = ix0;
-   if (yoff  ) *yoff   = iy0;
-   
-   if (gbm.w && gbm.h) {
-      gbm.pixels = (unsigned char *) STBTT_malloc(gbm.w * gbm.h, info->userdata);
-      if (gbm.pixels) {
-         gbm.stride = gbm.w;
-
-         stbtt_Rasterize(&gbm, 0.35f, vertices, num_verts, scale_x, scale_y, shift_x, shift_y, ix0, iy0, 1, info->userdata);
-      }
-   }
-   STBTT_free(vertices, info->userdata);
-   return gbm.pixels;
-}   
-
-STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff)
-{
-   return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y, 0.0f, 0.0f, glyph, width, height, xoff, yoff);
-}
-
-STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int glyph)
-{
-   int ix0,iy0;
-   stbtt_vertex *vertices;
-   int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices);
-   stbtt__bitmap gbm;   
-
-   stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,0,0);
-   gbm.pixels = output;
-   gbm.w = out_w;
-   gbm.h = out_h;
-   gbm.stride = out_stride;
-
-   if (gbm.w && gbm.h)
-      stbtt_Rasterize(&gbm, 0.35f, vertices, num_verts, scale_x, scale_y, shift_x, shift_y, ix0,iy0, 1, info->userdata);
-
-   STBTT_free(vertices, info->userdata);
-}
-
-STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int glyph)
-{
-   stbtt_MakeGlyphBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, 0.0f,0.0f, glyph);
-}
-
-STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff)
-{
-   return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y,shift_x,shift_y, stbtt_FindGlyphIndex(info,codepoint), width,height,xoff,yoff);
-}   
-
-STBTT_DEF void stbtt_MakeCodepointBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int codepoint)
-{
-   stbtt_MakeGlyphBitmapSubpixelPrefilter(info, output, out_w, out_h, out_stride, scale_x, scale_y, shift_x, shift_y, oversample_x, oversample_y, sub_x, sub_y, stbtt_FindGlyphIndex(info,codepoint));
-}
-
-STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint)
-{
-   stbtt_MakeGlyphBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, shift_x, shift_y, stbtt_FindGlyphIndex(info,codepoint));
-}
-
-STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff)
-{
-   return stbtt_GetCodepointBitmapSubpixel(info, scale_x, scale_y, 0.0f,0.0f, codepoint, width,height,xoff,yoff);
-}   
-
-STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint)
-{
-   stbtt_MakeCodepointBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, 0.0f,0.0f, codepoint);
-}
-
-static int stbtt_BakeFontBitmap_internal(unsigned char *data, int offset,         
-                                float pixel_height,                          
-                                unsigned char *pixels, int pw, int ph,       
-                                int first_char, int num_chars,             
-                                stbtt_bakedchar *chardata)
-{
-   float scale;
-   int x,y,bottom_y, i;
-   stbtt_fontinfo f;
-   f.userdata = NULL;
-   if (!stbtt_InitFont(&f, data, offset))
-      return -1;
-   STBTT_memset(pixels, 0, pw*ph);      
-   x=y=1;
-   bottom_y = 1;
-
-   scale = stbtt_ScaleForPixelHeight(&f, pixel_height);
-
-   for (i=0; i < num_chars; ++i) {
-      int advance, lsb, x0,y0,x1,y1,gw,gh;
-      int g = stbtt_FindGlyphIndex(&f, first_char + i);
-      stbtt_GetGlyphHMetrics(&f, g, &advance, &lsb);
-      stbtt_GetGlyphBitmapBox(&f, g, scale,scale, &x0,&y0,&x1,&y1);
-      gw = x1-x0;
-      gh = y1-y0;
-      if (x + gw + 1 >= pw)
-         y = bottom_y, x = 1;     
-      if (y + gh + 1 >= ph)            
-         return -i;
-      STBTT_assert(x+gw < pw);
-      STBTT_assert(y+gh < ph);
-      stbtt_MakeGlyphBitmap(&f, pixels+x+y*pw, gw,gh,pw, scale,scale, g);
-      chardata[i].x0 = (stbtt_int16) x;
-      chardata[i].y0 = (stbtt_int16) y;
-      chardata[i].x1 = (stbtt_int16) (x + gw);
-      chardata[i].y1 = (stbtt_int16) (y + gh);
-      chardata[i].xadvance = scale * advance;
-      chardata[i].xoff     = (float) x0;
-      chardata[i].yoff     = (float) y0;
-      x = x + gw + 1;
-      if (y+gh+1 > bottom_y)
-         bottom_y = y+gh+1;
-   }
-   return bottom_y;
-}
-
-STBTT_DEF void stbtt_GetBakedQuad(const stbtt_bakedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int opengl_fillrule)
-{
-   float d3d_bias = opengl_fillrule ? 0 : -0.5f;
-   float ipw = 1.0f / pw, iph = 1.0f / ph;
-   const stbtt_bakedchar *b = chardata + char_index;
-   int round_x = STBTT_ifloor((*xpos + b->xoff) + 0.5f);
-   int round_y = STBTT_ifloor((*ypos + b->yoff) + 0.5f);
-
-   q->x0 = round_x + d3d_bias;
-   q->y0 = round_y + d3d_bias;
-   q->x1 = round_x + b->x1 - b->x0 + d3d_bias;
-   q->y1 = round_y + b->y1 - b->y0 + d3d_bias;
-
-   q->s0 = b->x0 * ipw;
-   q->t0 = b->y0 * iph;
-   q->s1 = b->x1 * ipw;
-   q->t1 = b->y1 * iph;
-
-   *xpos += b->xadvance;
-}
-
-#ifndef STB_RECT_PACK_VERSION
-
-typedef int stbrp_coord;
-
-typedef struct
-{
-   int width,height;
-   int x,y,bottom_y;
-} stbrp_context;
-
-typedef struct
-{
-   unsigned char x;
-} stbrp_node;
-
-struct stbrp_rect
-{
-   stbrp_coord x,y;
-   int id,w,h,was_packed;
-};
-
-static void stbrp_init_target(stbrp_context *con, int pw, int ph, stbrp_node *nodes, int num_nodes)
-{
-   con->width  = pw;
-   con->height = ph;
-   con->x = 0;
-   con->y = 0;
-   con->bottom_y = 0;
-   STBTT__NOTUSED(nodes);
-   STBTT__NOTUSED(num_nodes);   
-}
-
-static void stbrp_pack_rects(stbrp_context *con, stbrp_rect *rects, int num_rects)
-{
-   int i;
-   for (i=0; i < num_rects; ++i) {
-      if (con->x + rects[i].w > con->width) {
-         con->x = 0;
-         con->y = con->bottom_y;
-      }
-      if (con->y + rects[i].h > con->height)
-         break;
-      rects[i].x = con->x;
-      rects[i].y = con->y;
-      rects[i].was_packed = 1;
-      con->x += rects[i].w;
-      if (con->y + rects[i].h > con->bottom_y)
-         con->bottom_y = con->y + rects[i].h;
-   }
-   for (   ; i < num_rects; ++i)
-      rects[i].was_packed = 0;
-}
-#endif
-
-STBTT_DEF int stbtt_PackBegin(stbtt_pack_context *spc, unsigned char *pixels, int pw, int ph, int stride_in_bytes, int padding, void *alloc_context)
-{
-   stbrp_context *context = (stbrp_context *) STBTT_malloc(sizeof(*context)            ,alloc_context);
-   int            num_nodes = pw - padding;
-   stbrp_node    *nodes   = (stbrp_node    *) STBTT_malloc(sizeof(*nodes  ) * num_nodes,alloc_context);
-
-   if (context == NULL || nodes == NULL) {
-      if (context != NULL) STBTT_free(context, alloc_context);
-      if (nodes   != NULL) STBTT_free(nodes  , alloc_context);
-      return 0;
-   }
-
-   spc->user_allocator_context = alloc_context;
-   spc->width = pw;
-   spc->height = ph;
-   spc->pixels = pixels;
-   spc->pack_info = context;
-   spc->nodes = nodes;
-   spc->padding = padding;
-   spc->stride_in_bytes = stride_in_bytes != 0 ? stride_in_bytes : pw;
-   spc->h_oversample = 1;
-   spc->v_oversample = 1;
-   spc->skip_missing = 0;
-
-   stbrp_init_target(context, pw-padding, ph-padding, nodes, num_nodes);
-
-   if (pixels)
-      STBTT_memset(pixels, 0, pw*ph);      
-
-   return 1;
-}
-
-STBTT_DEF void stbtt_PackEnd  (stbtt_pack_context *spc)
-{
-   STBTT_free(spc->nodes    , spc->user_allocator_context);
-   STBTT_free(spc->pack_info, spc->user_allocator_context);
-}
-
-STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h_oversample, unsigned int v_oversample)
-{
-   STBTT_assert(h_oversample <= STBTT_MAX_OVERSAMPLE);
-   STBTT_assert(v_oversample <= STBTT_MAX_OVERSAMPLE);
-   if (h_oversample <= STBTT_MAX_OVERSAMPLE)
-      spc->h_oversample = h_oversample;
-   if (v_oversample <= STBTT_MAX_OVERSAMPLE)
-      spc->v_oversample = v_oversample;
-}
-
-STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip)
-{
-   spc->skip_missing = skip;
-}
-
-#define STBTT__OVER_MASK  (STBTT_MAX_OVERSAMPLE-1)
-
-static void stbtt__h_prefilter(unsigned char *pixels, int w, int h, int stride_in_bytes, unsigned int kernel_width)
-{
-   unsigned char buffer[STBTT_MAX_OVERSAMPLE];
-   int safe_w = w - kernel_width;
-   int j;
-   STBTT_memset(buffer, 0, STBTT_MAX_OVERSAMPLE);       
-   for (j=0; j < h; ++j) {
-      int i;
-      unsigned int total;
-      STBTT_memset(buffer, 0, kernel_width);
-
-      total = 0;
-
-      switch (kernel_width) {
-         case 2:
-            for (i=0; i <= safe_w; ++i) {
-               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
-               pixels[i] = (unsigned char) (total / 2);
-            }
-            break;
-         case 3:
-            for (i=0; i <= safe_w; ++i) {
-               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
-               pixels[i] = (unsigned char) (total / 3);
-            }
-            break;
-         case 4:
-            for (i=0; i <= safe_w; ++i) {
-               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
-               pixels[i] = (unsigned char) (total / 4);
-            }
-            break;
-         case 5:
-            for (i=0; i <= safe_w; ++i) {
-               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
-               pixels[i] = (unsigned char) (total / 5);
-            }
-            break;
-         default:
-            for (i=0; i <= safe_w; ++i) {
-               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
-               pixels[i] = (unsigned char) (total / kernel_width);
-            }
-            break;
-      }
-
-      for (; i < w; ++i) {
-         STBTT_assert(pixels[i] == 0);
-         total -= buffer[i & STBTT__OVER_MASK];
-         pixels[i] = (unsigned char) (total / kernel_width);
-      }
-
-      pixels += stride_in_bytes;
-   }
-}
-
-static void stbtt__v_prefilter(unsigned char *pixels, int w, int h, int stride_in_bytes, unsigned int kernel_width)
-{
-   unsigned char buffer[STBTT_MAX_OVERSAMPLE];
-   int safe_h = h - kernel_width;
-   int j;
-   STBTT_memset(buffer, 0, STBTT_MAX_OVERSAMPLE);       
-   for (j=0; j < w; ++j) {
-      int i;
-      unsigned int total;
-      STBTT_memset(buffer, 0, kernel_width);
-
-      total = 0;
-
-      switch (kernel_width) {
-         case 2:
-            for (i=0; i <= safe_h; ++i) {
-               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
-               pixels[i*stride_in_bytes] = (unsigned char) (total / 2);
-            }
-            break;
-         case 3:
-            for (i=0; i <= safe_h; ++i) {
-               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
-               pixels[i*stride_in_bytes] = (unsigned char) (total / 3);
-            }
-            break;
-         case 4:
-            for (i=0; i <= safe_h; ++i) {
-               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
-               pixels[i*stride_in_bytes] = (unsigned char) (total / 4);
-            }
-            break;
-         case 5:
-            for (i=0; i <= safe_h; ++i) {
-               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
-               pixels[i*stride_in_bytes] = (unsigned char) (total / 5);
-            }
-            break;
-         default:
-            for (i=0; i <= safe_h; ++i) {
-               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
-               pixels[i*stride_in_bytes] = (unsigned char) (total / kernel_width);
-            }
-            break;
-      }
-
-      for (; i < h; ++i) {
-         STBTT_assert(pixels[i*stride_in_bytes] == 0);
-         total -= buffer[i & STBTT__OVER_MASK];
-         pixels[i*stride_in_bytes] = (unsigned char) (total / kernel_width);
-      }
-
-      pixels += 1;
-   }
-}
-
-static float stbtt__oversample_shift(int oversample)
-{
-   if (!oversample)
-      return 0.0f;
-
-   return (float)-(oversample - 1) / (2.0f * (float)oversample);
-}
-
-STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
-{
-   int i,j,k;
-
-   k=0;
-   for (i=0; i < num_ranges; ++i) {
-      float fh = ranges[i].font_size;
-      float scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh);
-      ranges[i].h_oversample = (unsigned char) spc->h_oversample;
-      ranges[i].v_oversample = (unsigned char) spc->v_oversample;
-      for (j=0; j < ranges[i].num_chars; ++j) {
-         int x0,y0,x1,y1;
-         int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
-         int glyph = stbtt_FindGlyphIndex(info, codepoint);
-         if (glyph == 0 && spc->skip_missing) {
-            rects[k].w = rects[k].h = 0;
-         } else {
-            stbtt_GetGlyphBitmapBoxSubpixel(info,glyph,
-                                            scale * spc->h_oversample,
-                                            scale * spc->v_oversample,
-                                            0,0,
-                                            &x0,&y0,&x1,&y1);
-            rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1);
-            rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1);
-         }
-         ++k;
-      }
-   }
-
-   return k;
-}
-
-STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int prefilter_x, int prefilter_y, float *sub_x, float *sub_y, int glyph)
-{
-   stbtt_MakeGlyphBitmapSubpixel(info,
-                                 output,
-                                 out_w - (prefilter_x - 1),
-                                 out_h - (prefilter_y - 1),
-                                 out_stride,
-                                 scale_x,
-                                 scale_y,
-                                 shift_x,
-                                 shift_y,
-                                 glyph);
-
-   if (prefilter_x > 1)
-      stbtt__h_prefilter(output, out_w, out_h, out_stride, prefilter_x);
-
-   if (prefilter_y > 1)
-      stbtt__v_prefilter(output, out_w, out_h, out_stride, prefilter_y);
-
-   *sub_x = stbtt__oversample_shift(prefilter_x);
-   *sub_y = stbtt__oversample_shift(prefilter_y);
-}
-
-STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
-{
-   int i,j,k, return_value = 1;
-
-   int old_h_over = spc->h_oversample;
-   int old_v_over = spc->v_oversample;
-
-   k = 0;
-   for (i=0; i < num_ranges; ++i) {
-      float fh = ranges[i].font_size;
-      float scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh);
-      float recip_h,recip_v,sub_x,sub_y;
-      spc->h_oversample = ranges[i].h_oversample;
-      spc->v_oversample = ranges[i].v_oversample;
-      recip_h = 1.0f / spc->h_oversample;
-      recip_v = 1.0f / spc->v_oversample;
-      sub_x = stbtt__oversample_shift(spc->h_oversample);
-      sub_y = stbtt__oversample_shift(spc->v_oversample);
-      for (j=0; j < ranges[i].num_chars; ++j) {
-         stbrp_rect *r = &rects[k];
-         if (r->was_packed && r->w != 0 && r->h != 0) {
-            stbtt_packedchar *bc = &ranges[i].chardata_for_range[j];
-            int advance, lsb, x0,y0,x1,y1;
-            int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
-            int glyph = stbtt_FindGlyphIndex(info, codepoint);
-            stbrp_coord pad = (stbrp_coord) spc->padding;
-
-            r->x += pad;
-            r->y += pad;
-            r->w -= pad;
-            r->h -= pad;
-            stbtt_GetGlyphHMetrics(info, glyph, &advance, &lsb);
-            stbtt_GetGlyphBitmapBox(info, glyph,
-                                    scale * spc->h_oversample,
-                                    scale * spc->v_oversample,
-                                    &x0,&y0,&x1,&y1);
-            stbtt_MakeGlyphBitmapSubpixel(info,
-                                          spc->pixels + r->x + r->y*spc->stride_in_bytes,
-                                          r->w - spc->h_oversample+1,
-                                          r->h - spc->v_oversample+1,
-                                          spc->stride_in_bytes,
-                                          scale * spc->h_oversample,
-                                          scale * spc->v_oversample,
-                                          0,0,
-                                          glyph);
-
-            if (spc->h_oversample > 1)
-               stbtt__h_prefilter(spc->pixels + r->x + r->y*spc->stride_in_bytes,
-                                  r->w, r->h, spc->stride_in_bytes,
-                                  spc->h_oversample);
-
-            if (spc->v_oversample > 1)
-               stbtt__v_prefilter(spc->pixels + r->x + r->y*spc->stride_in_bytes,
-                                  r->w, r->h, spc->stride_in_bytes,
-                                  spc->v_oversample);
-
-            bc->x0       = (stbtt_int16)  r->x;
-            bc->y0       = (stbtt_int16)  r->y;
-            bc->x1       = (stbtt_int16) (r->x + r->w);
-            bc->y1       = (stbtt_int16) (r->y + r->h);
-            bc->xadvance =                scale * advance;
-            bc->xoff     =       (float)  x0 * recip_h + sub_x;
-            bc->yoff     =       (float)  y0 * recip_v + sub_y;
-            bc->xoff2    =                (x0 + r->w) * recip_h + sub_x;
-            bc->yoff2    =                (y0 + r->h) * recip_v + sub_y;
-         } else {
-            return_value = 0;      
-         }
-
-         ++k;
-      }
-   }
-
-   spc->h_oversample = old_h_over;
-   spc->v_oversample = old_v_over;
-
-   return return_value;
-}
-
-STBTT_DEF void stbtt_PackFontRangesPackRects(stbtt_pack_context *spc, stbrp_rect *rects, int num_rects)
-{
-   stbrp_pack_rects((stbrp_context *) spc->pack_info, rects, num_rects);
-}
-
-STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, stbtt_pack_range *ranges, int num_ranges)
-{
-   stbtt_fontinfo info;
-   int i,j,n, return_value;      
-   stbrp_rect    *rects;
-
-   for (i=0; i < num_ranges; ++i)
-      for (j=0; j < ranges[i].num_chars; ++j)
-         ranges[i].chardata_for_range[j].x0 =
-         ranges[i].chardata_for_range[j].y0 =
-         ranges[i].chardata_for_range[j].x1 =
-         ranges[i].chardata_for_range[j].y1 = 0;
-
-   n = 0;
-   for (i=0; i < num_ranges; ++i)
-      n += ranges[i].num_chars;
-         
-   rects = (stbrp_rect *) STBTT_malloc(sizeof(*rects) * n, spc->user_allocator_context);
-   if (rects == NULL)
-      return 0;
-
-   info.userdata = spc->user_allocator_context;
-   stbtt_InitFont(&info, fontdata, stbtt_GetFontOffsetForIndex(fontdata,font_index));
-
-   n = stbtt_PackFontRangesGatherRects(spc, &info, ranges, num_ranges, rects);
-
-   stbtt_PackFontRangesPackRects(spc, rects, n);
-  
-   return_value = stbtt_PackFontRangesRenderIntoRects(spc, &info, ranges, num_ranges, rects);
-
-   STBTT_free(rects, spc->user_allocator_context);
-   return return_value;
-}
-
-STBTT_DEF int stbtt_PackFontRange(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, float font_size,
-            int first_unicode_codepoint_in_range, int num_chars_in_range, stbtt_packedchar *chardata_for_range)
-{
-   stbtt_pack_range range;
-   range.first_unicode_codepoint_in_range = first_unicode_codepoint_in_range;
-   range.array_of_unicode_codepoints = NULL;
-   range.num_chars                   = num_chars_in_range;
-   range.chardata_for_range          = chardata_for_range;
-   range.font_size                   = font_size;
-   return stbtt_PackFontRanges(spc, fontdata, font_index, &range, 1);
-}
-
-STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap)
-{
-   int i_ascent, i_descent, i_lineGap;
-   float scale;
-   stbtt_fontinfo info;
-   stbtt_InitFont(&info, fontdata, stbtt_GetFontOffsetForIndex(fontdata, index));
-   scale = size > 0 ? stbtt_ScaleForPixelHeight(&info, size) : stbtt_ScaleForMappingEmToPixels(&info, -size);
-   stbtt_GetFontVMetrics(&info, &i_ascent, &i_descent, &i_lineGap);
-   *ascent  = (float) i_ascent  * scale;
-   *descent = (float) i_descent * scale;
-   *lineGap = (float) i_lineGap * scale;
-}
-
-STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int align_to_integer)
-{
-   float ipw = 1.0f / pw, iph = 1.0f / ph;
-   const stbtt_packedchar *b = chardata + char_index;
-
-   if (align_to_integer) {
-      float x = (float) STBTT_ifloor((*xpos + b->xoff) + 0.5f);
-      float y = (float) STBTT_ifloor((*ypos + b->yoff) + 0.5f);
-      q->x0 = x;
-      q->y0 = y;
-      q->x1 = x + b->xoff2 - b->xoff;
-      q->y1 = y + b->yoff2 - b->yoff;
-   } else {
-      q->x0 = *xpos + b->xoff;
-      q->y0 = *ypos + b->yoff;
-      q->x1 = *xpos + b->xoff2;
-      q->y1 = *ypos + b->yoff2;
-   }
-
-   q->s0 = b->x0 * ipw;
-   q->t0 = b->y0 * iph;
-   q->s1 = b->x1 * ipw;
-   q->t1 = b->y1 * iph;
-
-   *xpos += b->xadvance;
-}
-
-#define STBTT_min(a,b)  ((a) < (b) ? (a) : (b))
-#define STBTT_max(a,b)  ((a) < (b) ? (b) : (a))
-
-static int stbtt__ray_intersect_bezier(float orig[2], float ray[2], float q0[2], float q1[2], float q2[2], float hits[2][2])
-{
-   float q0perp = q0[1]*ray[0] - q0[0]*ray[1];
-   float q1perp = q1[1]*ray[0] - q1[0]*ray[1];
-   float q2perp = q2[1]*ray[0] - q2[0]*ray[1];
-   float roperp = orig[1]*ray[0] - orig[0]*ray[1];
-
-   float a = q0perp - 2*q1perp + q2perp;
-   float b = q1perp - q0perp;
-   float c = q0perp - roperp;
-
-   float s0 = 0., s1 = 0.;
-   int num_s = 0;
-
-   if (a != 0.0) {
-      float discr = b*b - a*c;
-      if (discr > 0.0) {
-         float rcpna = -1 / a;
-         float d = (float) STBTT_sqrt(discr);
-         s0 = (b+d) * rcpna;
-         s1 = (b-d) * rcpna;
-         if (s0 >= 0.0 && s0 <= 1.0)
-            num_s = 1;
-         if (d > 0.0 && s1 >= 0.0 && s1 <= 1.0) {
-            if (num_s == 0) s0 = s1;
-            ++num_s;
-         }
-      }
-   } else {
-      s0 = c / (-2 * b);
-      if (s0 >= 0.0 && s0 <= 1.0)
-         num_s = 1;
-   }
-
-   if (num_s == 0)
-      return 0;
-   else {
-      float rcp_len2 = 1 / (ray[0]*ray[0] + ray[1]*ray[1]);
-      float rayn_x = ray[0] * rcp_len2, rayn_y = ray[1] * rcp_len2;
-
-      float q0d =   q0[0]*rayn_x +   q0[1]*rayn_y;
-      float q1d =   q1[0]*rayn_x +   q1[1]*rayn_y;
-      float q2d =   q2[0]*rayn_x +   q2[1]*rayn_y;
-      float rod = orig[0]*rayn_x + orig[1]*rayn_y;
-
-      float q10d = q1d - q0d;
-      float q20d = q2d - q0d;
-      float q0rd = q0d - rod;
-
-      hits[0][0] = q0rd + s0*(2.0f - 2.0f*s0)*q10d + s0*s0*q20d;
-      hits[0][1] = a*s0+b;
-
-      if (num_s > 1) {
-         hits[1][0] = q0rd + s1*(2.0f - 2.0f*s1)*q10d + s1*s1*q20d;
-         hits[1][1] = a*s1+b;
-         return 2;
-      } else {
-         return 1;
-      }
-   }
-}
-
-static int equal(float *a, float *b)
-{
-   return (a[0] == b[0] && a[1] == b[1]);
-}
-
-static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex *verts)
-{
-   int i;
-   float orig[2], ray[2] = { 1, 0 };
-   float y_frac;
-   int winding = 0;
-
-   orig[0] = x;
-   y_frac = (float) STBTT_fmod(y, 1.0f);
-   if (y_frac < 0.01f)
-      y += 0.01f;
-   else if (y_frac > 0.99f)
-      y -= 0.01f;
-   orig[1] = y;
-
-   for (i=0; i < nverts; ++i) {
-      if (verts[i].type == STBTT_vline) {
-         int x0 = (int) verts[i-1].x, y0 = (int) verts[i-1].y;
-         int x1 = (int) verts[i  ].x, y1 = (int) verts[i  ].y;
-         if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {
-            float x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0;
-            if (x_inter < x)  
-               winding += (y0 < y1) ? 1 : -1;
-         }
-      }
-      if (verts[i].type == STBTT_vcurve) {
-         int x0 = (int) verts[i-1].x , y0 = (int) verts[i-1].y ;
-         int x1 = (int) verts[i  ].cx, y1 = (int) verts[i  ].cy;
-         int x2 = (int) verts[i  ].x , y2 = (int) verts[i  ].y ;
-         int ax = STBTT_min(x0,STBTT_min(x1,x2)), ay = STBTT_min(y0,STBTT_min(y1,y2));
-         int by = STBTT_max(y0,STBTT_max(y1,y2));
-         if (y > ay && y < by && x > ax) {
-            float q0[2],q1[2],q2[2];
-            float hits[2][2];
-            q0[0] = (float)x0;
-            q0[1] = (float)y0;
-            q1[0] = (float)x1;
-            q1[1] = (float)y1;
-            q2[0] = (float)x2;
-            q2[1] = (float)y2;
-            if (equal(q0,q1) || equal(q1,q2)) {
-               x0 = (int)verts[i-1].x;
-               y0 = (int)verts[i-1].y;
-               x1 = (int)verts[i  ].x;
-               y1 = (int)verts[i  ].y;
-               if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {
-                  float x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0;
-                  if (x_inter < x)  
-                     winding += (y0 < y1) ? 1 : -1;
-               }
-            } else {
-               int num_hits = stbtt__ray_intersect_bezier(orig, ray, q0, q1, q2, hits);
-               if (num_hits >= 1)
-                  if (hits[0][0] < 0)
-                     winding += (hits[0][1] < 0 ? -1 : 1);
-               if (num_hits >= 2)
-                  if (hits[1][0] < 0)
-                     winding += (hits[1][1] < 0 ? -1 : 1);
-            }
-         } 
-      }
-   }
-   return winding;
-}
-
-static float stbtt__cuberoot( float x )
-{
-   if (x<0)
-      return -(float) STBTT_pow(-x,1.0f/3.0f);
-   else
-      return  (float) STBTT_pow( x,1.0f/3.0f);
-}
-
-static int stbtt__solve_cubic(float a, float b, float c, float* r)
-{
-	float s = -a / 3;
-	float p = b - a*a / 3;
-	float q = a * (2*a*a - 9*b) / 27 + c;
-   float p3 = p*p*p;
-	float d = q*q + 4*p3 / 27;
-	if (d >= 0) {
-		float z = (float) STBTT_sqrt(d);
-		float u = (-q + z) / 2;
-		float v = (-q - z) / 2;
-		u = stbtt__cuberoot(u);
-		v = stbtt__cuberoot(v);
-		r[0] = s + u + v;
-		return 1;
-	} else {
-	   float u = (float) STBTT_sqrt(-p/3);
-	   float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3;         
-	   float m = (float) STBTT_cos(v);
-      float n = (float) STBTT_cos(v-3.141592/2)*1.732050808f;
-	   r[0] = s + u * 2 * m;
-	   r[1] = s - u * (m + n);
-	   r[2] = s - u * (m - n);
-
-   	return 3;
-   }
-}
-
-STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float scale, int glyph, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff)
-{
-   float scale_x = scale, scale_y = scale;
-   int ix0,iy0,ix1,iy1;
-   int w,h;
-   unsigned char *data;
-
-   if (scale_x == 0) scale_x = scale_y;
-   if (scale_y == 0) {
-      if (scale_x == 0) return NULL;         
-      scale_y = scale_x;
-   }
-
-   stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale, scale, 0.0f,0.0f, &ix0,&iy0,&ix1,&iy1);
-
-   if (ix0 == ix1 || iy0 == iy1)
-      return NULL;
-
-   ix0 -= padding;
-   iy0 -= padding;
-   ix1 += padding;
-   iy1 += padding;
-
-   w = (ix1 - ix0);
-   h = (iy1 - iy0);
-
-   if (width ) *width  = w;
-   if (height) *height = h;
-   if (xoff  ) *xoff   = ix0;
-   if (yoff  ) *yoff   = iy0;
-
-   scale_y = -scale_y;
-      
-   {
-      int x,y,i,j;
-      float *precompute;
-      stbtt_vertex *verts;
-      int num_verts = stbtt_GetGlyphShape(info, glyph, &verts);
-      data = (unsigned char *) STBTT_malloc(w * h, info->userdata);
-      precompute = (float *) STBTT_malloc(num_verts * sizeof(float), info->userdata);
-
-      for (i=0,j=num_verts-1; i < num_verts; j=i++) {
-         if (verts[i].type == STBTT_vline) {
-            float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y;
-            float x1 = verts[j].x*scale_x, y1 = verts[j].y*scale_y;
-            float dist = (float) STBTT_sqrt((x1-x0)*(x1-x0) + (y1-y0)*(y1-y0));
-            precompute[i] = (dist == 0) ? 0.0f : 1.0f / dist;
-         } else if (verts[i].type == STBTT_vcurve) {
-            float x2 = verts[j].x *scale_x, y2 = verts[j].y *scale_y;
-            float x1 = verts[i].cx*scale_x, y1 = verts[i].cy*scale_y;
-            float x0 = verts[i].x *scale_x, y0 = verts[i].y *scale_y;
-            float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2;
-            float len2 = bx*bx + by*by;
-            if (len2 != 0.0f)
-               precompute[i] = 1.0f / (bx*bx + by*by);
-            else
-               precompute[i] = 0.0f;
-         } else
-            precompute[i] = 0.0f;
-      }
-
-      for (y=iy0; y < iy1; ++y) {
-         for (x=ix0; x < ix1; ++x) {
-            float val;
-            float min_dist = 999999.0f;
-            float sx = (float) x + 0.5f;
-            float sy = (float) y + 0.5f;
-            float x_gspace = (sx / scale_x);
-            float y_gspace = (sy / scale_y);
-
-            int winding = stbtt__compute_crossings_x(x_gspace, y_gspace, num_verts, verts);                    
-
-            for (i=0; i < num_verts; ++i) {
-               float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y;
-
-               float dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy);
-               if (dist2 < min_dist*min_dist)
-                  min_dist = (float) STBTT_sqrt(dist2);
-
-               if (verts[i].type == STBTT_vline) {
-                  float x1 = verts[i-1].x*scale_x, y1 = verts[i-1].y*scale_y;
-
-                  float dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i];
-                  STBTT_assert(i != 0);
-                  if (dist < min_dist) {
-                     float dx = x1-x0, dy = y1-y0;
-                     float px = x0-sx, py = y0-sy;
-                     float t = -(px*dx + py*dy) / (dx*dx + dy*dy);
-                     if (t >= 0.0f && t <= 1.0f)
-                        min_dist = dist;
-                  }
-               } else if (verts[i].type == STBTT_vcurve) {
-                  float x2 = verts[i-1].x *scale_x, y2 = verts[i-1].y *scale_y;
-                  float x1 = verts[i  ].cx*scale_x, y1 = verts[i  ].cy*scale_y;
-                  float box_x0 = STBTT_min(STBTT_min(x0,x1),x2);
-                  float box_y0 = STBTT_min(STBTT_min(y0,y1),y2);
-                  float box_x1 = STBTT_max(STBTT_max(x0,x1),x2);
-                  float box_y1 = STBTT_max(STBTT_max(y0,y1),y2);
-                  if (sx > box_x0-min_dist && sx < box_x1+min_dist && sy > box_y0-min_dist && sy < box_y1+min_dist) {
-                     int num=0;
-                     float ax = x1-x0, ay = y1-y0;
-                     float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2;
-                     float mx = x0 - sx, my = y0 - sy;
-                     float res[3],px,py,t,it;
-                     float a_inv = precompute[i];
-                     if (a_inv == 0.0) {            
-                        float a = 3*(ax*bx + ay*by);
-                        float b = 2*(ax*ax + ay*ay) + (mx*bx+my*by);
-                        float c = mx*ax+my*ay;
-                        if (a == 0.0) {       
-                           if (b != 0.0) {
-                              res[num++] = -c/b;
-                           }
-                        } else {
-                           float discriminant = b*b - 4*a*c;
-                           if (discriminant < 0)
-                              num = 0;
-                           else {
-                              float root = (float) STBTT_sqrt(discriminant);
-                              res[0] = (-b - root)/(2*a);
-                              res[1] = (-b + root)/(2*a);
-                              num = 2;            
-                           }
-                        }
-                     } else {
-                        float b = 3*(ax*bx + ay*by) * a_inv;           
-                        float c = (2*(ax*ax + ay*ay) + (mx*bx+my*by)) * a_inv;
-                        float d = (mx*ax+my*ay) * a_inv;
-                        num = stbtt__solve_cubic(b, c, d, res);
-                     }
-                     if (num >= 1 && res[0] >= 0.0f && res[0] <= 1.0f) {
-                        t = res[0], it = 1.0f - t;
-                        px = it*it*x0 + 2*t*it*x1 + t*t*x2;
-                        py = it*it*y0 + 2*t*it*y1 + t*t*y2;
-                        dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
-                        if (dist2 < min_dist * min_dist)
-                           min_dist = (float) STBTT_sqrt(dist2);
-                     }
-                     if (num >= 2 && res[1] >= 0.0f && res[1] <= 1.0f) {
-                        t = res[1], it = 1.0f - t;
-                        px = it*it*x0 + 2*t*it*x1 + t*t*x2;
-                        py = it*it*y0 + 2*t*it*y1 + t*t*y2;
-                        dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
-                        if (dist2 < min_dist * min_dist)
-                           min_dist = (float) STBTT_sqrt(dist2);
-                     }
-                     if (num >= 3 && res[2] >= 0.0f && res[2] <= 1.0f) {
-                        t = res[2], it = 1.0f - t;
-                        px = it*it*x0 + 2*t*it*x1 + t*t*x2;
-                        py = it*it*y0 + 2*t*it*y1 + t*t*y2;
-                        dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
-                        if (dist2 < min_dist * min_dist)
-                           min_dist = (float) STBTT_sqrt(dist2);
-                     }
-                  }
-               }
-            }
-            if (winding == 0)
-               min_dist = -min_dist;         
-            val = onedge_value + pixel_dist_scale * min_dist;
-            if (val < 0)
-               val = 0;
-            else if (val > 255)
-               val = 255;
-            data[(y-iy0)*w+(x-ix0)] = (unsigned char) val;
-         }
-      }
-      STBTT_free(precompute, info->userdata);
-      STBTT_free(verts, info->userdata);
-   }
-   return data;
-}   
-
-STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, float scale, int codepoint, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff)
-{
-   return stbtt_GetGlyphSDF(info, scale, stbtt_FindGlyphIndex(info, codepoint), padding, onedge_value, pixel_dist_scale, width, height, xoff, yoff);
-}
-
-STBTT_DEF void stbtt_FreeSDF(unsigned char *bitmap, void *userdata)
-{
-   STBTT_free(bitmap, userdata);
-}
-
-static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, stbtt_int32 len1, stbtt_uint8 *s2, stbtt_int32 len2) 
-{
-   stbtt_int32 i=0;
-
-   while (len2) {
-      stbtt_uint16 ch = s2[0]*256 + s2[1];
-      if (ch < 0x80) {
-         if (i >= len1) return -1;
-         if (s1[i++] != ch) return -1;
-      } else if (ch < 0x800) {
-         if (i+1 >= len1) return -1;
-         if (s1[i++] != 0xc0 + (ch >> 6)) return -1;
-         if (s1[i++] != 0x80 + (ch & 0x3f)) return -1;
-      } else if (ch >= 0xd800 && ch < 0xdc00) {
-         stbtt_uint32 c;
-         stbtt_uint16 ch2 = s2[2]*256 + s2[3];
-         if (i+3 >= len1) return -1;
-         c = ((ch - 0xd800) << 10) + (ch2 - 0xdc00) + 0x10000;
-         if (s1[i++] != 0xf0 + (c >> 18)) return -1;
-         if (s1[i++] != 0x80 + ((c >> 12) & 0x3f)) return -1;
-         if (s1[i++] != 0x80 + ((c >>  6) & 0x3f)) return -1;
-         if (s1[i++] != 0x80 + ((c      ) & 0x3f)) return -1;
-         s2 += 2;     
-         len2 -= 2;
-      } else if (ch >= 0xdc00 && ch < 0xe000) {
-         return -1;
-      } else {
-         if (i+2 >= len1) return -1;
-         if (s1[i++] != 0xe0 + (ch >> 12)) return -1;
-         if (s1[i++] != 0x80 + ((ch >> 6) & 0x3f)) return -1;
-         if (s1[i++] != 0x80 + ((ch     ) & 0x3f)) return -1;
-      }
-      s2 += 2;
-      len2 -= 2;
-   }
-   return i;
-}
-
-static int stbtt_CompareUTF8toUTF16_bigendian_internal(char *s1, int len1, char *s2, int len2) 
-{
-   return len1 == stbtt__CompareUTF8toUTF16_bigendian_prefix((stbtt_uint8*) s1, len1, (stbtt_uint8*) s2, len2);
-}
-
-STBTT_DEF const char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *length, int platformID, int encodingID, int languageID, int nameID)
-{
-   stbtt_int32 i,count,stringOffset;
-   stbtt_uint8 *fc = font->data;
-   stbtt_uint32 offset = font->fontstart;
-   stbtt_uint32 nm = stbtt__find_table(fc, offset, "name");
-   if (!nm) return NULL;
-
-   count = ttUSHORT(fc+nm+2);
-   stringOffset = nm + ttUSHORT(fc+nm+4);
-   for (i=0; i < count; ++i) {
-      stbtt_uint32 loc = nm + 6 + 12 * i;
-      if (platformID == ttUSHORT(fc+loc+0) && encodingID == ttUSHORT(fc+loc+2)
-          && languageID == ttUSHORT(fc+loc+4) && nameID == ttUSHORT(fc+loc+6)) {
-         *length = ttUSHORT(fc+loc+8);
-         return (const char *) (fc+stringOffset+ttUSHORT(fc+loc+10));
-      }
-   }
-   return NULL;
-}
-
-static int stbtt__matchpair(stbtt_uint8 *fc, stbtt_uint32 nm, stbtt_uint8 *name, stbtt_int32 nlen, stbtt_int32 target_id, stbtt_int32 next_id)
-{
-   stbtt_int32 i;
-   stbtt_int32 count = ttUSHORT(fc+nm+2);
-   stbtt_int32 stringOffset = nm + ttUSHORT(fc+nm+4);
-
-   for (i=0; i < count; ++i) {
-      stbtt_uint32 loc = nm + 6 + 12 * i;
-      stbtt_int32 id = ttUSHORT(fc+loc+6);
-      if (id == target_id) {
-         stbtt_int32 platform = ttUSHORT(fc+loc+0), encoding = ttUSHORT(fc+loc+2), language = ttUSHORT(fc+loc+4);
-
-         if (platform == 0 || (platform == 3 && encoding == 1) || (platform == 3 && encoding == 10)) {
-            stbtt_int32 slen = ttUSHORT(fc+loc+8);
-            stbtt_int32 off = ttUSHORT(fc+loc+10);
-
-            stbtt_int32 matchlen = stbtt__CompareUTF8toUTF16_bigendian_prefix(name, nlen, fc+stringOffset+off,slen);
-            if (matchlen >= 0) {
-               if (i+1 < count && ttUSHORT(fc+loc+12+6) == next_id && ttUSHORT(fc+loc+12) == platform && ttUSHORT(fc+loc+12+2) == encoding && ttUSHORT(fc+loc+12+4) == language) {
-                  slen = ttUSHORT(fc+loc+12+8);
-                  off = ttUSHORT(fc+loc+12+10);
-                  if (slen == 0) {
-                     if (matchlen == nlen)
-                        return 1;
-                  } else if (matchlen < nlen && name[matchlen] == ' ') {
-                     ++matchlen;
-                     if (stbtt_CompareUTF8toUTF16_bigendian_internal((char*) (name+matchlen), nlen-matchlen, (char*)(fc+stringOffset+off),slen))
-                        return 1;
-                  }
-               } else {
-                  if (matchlen == nlen)
-                     return 1;
-               }
-            }
-         }
-
-      }
-   }
-   return 0;
-}
-
-static int stbtt__matches(stbtt_uint8 *fc, stbtt_uint32 offset, stbtt_uint8 *name, stbtt_int32 flags)
-{
-   stbtt_int32 nlen = (stbtt_int32) STBTT_strlen((char *) name);
-   stbtt_uint32 nm,hd;
-   if (!stbtt__isfont(fc+offset)) return 0;
-
-   if (flags) {
-      hd = stbtt__find_table(fc, offset, "head");
-      if ((ttUSHORT(fc+hd+44) & 7) != (flags & 7)) return 0;
-   }
-
-   nm = stbtt__find_table(fc, offset, "name");
-   if (!nm) return 0;
-
-   if (flags) {
-      if (stbtt__matchpair(fc, nm, name, nlen, 16, -1))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  1, -1))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  3, -1))  return 1;
-   } else {
-      if (stbtt__matchpair(fc, nm, name, nlen, 16, 17))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  1,  2))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  3, -1))  return 1;
-   }
-
-   return 0;
-}
-
-static int stbtt_FindMatchingFont_internal(unsigned char *font_collection, char *name_utf8, stbtt_int32 flags)
-{
-   stbtt_int32 i;
-   for (i=0;;++i) {
-      stbtt_int32 off = stbtt_GetFontOffsetForIndex(font_collection, i);
-      if (off < 0) return off;
-      if (stbtt__matches((stbtt_uint8 *) font_collection, off, (stbtt_uint8*) name_utf8, flags))
-         return off;
-   }
-}
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#endif
-
-STBTT_DEF int stbtt_BakeFontBitmap(const unsigned char *data, int offset,
-                                float pixel_height, unsigned char *pixels, int pw, int ph,
-                                int first_char, int num_chars, stbtt_bakedchar *chardata)
-{
-   return stbtt_BakeFontBitmap_internal((unsigned char *) data, offset, pixel_height, pixels, pw, ph, first_char, num_chars, chardata);
-}
-
-STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index)
-{
-   return stbtt_GetFontOffsetForIndex_internal((unsigned char *) data, index);   
-}
-
-STBTT_DEF int stbtt_GetNumberOfFonts(const unsigned char *data)
-{
-   return stbtt_GetNumberOfFonts_internal((unsigned char *) data);
-}
-
-STBTT_DEF int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data, int offset)
-{
-   return stbtt_InitFont_internal(info, (unsigned char *) data, offset);
-}
-
-STBTT_DEF int stbtt_FindMatchingFont(const unsigned char *fontdata, const char *name, int flags)
-{
-   return stbtt_FindMatchingFont_internal((unsigned char *) fontdata, (char *) name, flags);
-}
-
-STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2)
-{
-   return stbtt_CompareUTF8toUTF16_bigendian_internal((char *) s1, len1, (char *) s2, len2);
-}
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
-#endif  
-
-
diff --git a/SpyCustom/imovehelper.h b/SpyCustom/imovehelper.h
deleted file mode 100644
index 32432c4..0000000
--- a/SpyCustom/imovehelper.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef IMOVEHELPER_H
-#define IMOVEHELPER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-enum PLAYER_ANIM;
-class IPhysicsSurfaceProps;
-class Vector;
-struct model_t;
-struct cmodel_t;
-struct vcollide_t;
-class CGameTrace;
-enum soundlevel_t;
-
-enum
-{
-	WL_NotInWater = 0,
-	WL_Feet,
-	WL_Waist,
-	WL_Eyes
-};
-
-
-typedef CBaseHandle EntityHandle_t;
-
-
-#define INVALID_ENTITY_HANDLE INVALID_EHANDLE_INDEX
-
-abstract_class IMoveHelper
-{
-public:
-	static IMoveHelper * GetSingleton() { return sm_pSingleton; }
-
-	virtual	char const* GetName(EntityHandle_t handle) const = 0;
-
-	virtual void	ResetTouchList(void) = 0;
-	virtual bool	AddToTouched(const CGameTrace& tr, const Vector& impactvelocity) = 0;
-	virtual void	ProcessImpacts(void) = 0;
-
-	virtual void	Con_NPrintf(int idx, PRINTF_FORMAT_STRING char const* fmt, ...) = 0;
-
-	virtual void	StartSound(const Vector& origin, int channel, char const* sample, float volume, soundlevel_t soundlevel, int fFlags, int pitch) = 0;
-	virtual void	StartSound(const Vector& origin, const char* soundname) = 0;
-	virtual void	PlaybackEventFull(int flags, int clientindex, unsigned short eventindex, float delay, Vector& origin, Vector& angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2) = 0;
-
-	virtual bool	PlayerFallingDamage(void) = 0;
-
-	virtual void	PlayerSetAnimation(PLAYER_ANIM playerAnim) = 0;
-
-	virtual IPhysicsSurfaceProps* GetSurfaceProps(void) = 0;
-
-	virtual bool IsWorldEntity(const CBaseHandle& handle) = 0;
-
-protected:
-	static void SetSingleton(IMoveHelper* pMoveHelper) { sm_pSingleton = pMoveHelper; }
-
-	virtual			~IMoveHelper() {}
-
-	static IMoveHelper* sm_pSingleton;
-};
-
-#define IMPLEMENT_MOVEHELPER()	\
-	IMoveHelper* IMoveHelper::sm_pSingleton = 0
-
-inline IMoveHelper* MoveHelper()
-{
-	return IMoveHelper::GetSingleton();
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/inetchannel.h b/SpyCustom/inetchannel.h
deleted file mode 100644
index fe5e64a..0000000
--- a/SpyCustom/inetchannel.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef INETCHANNEL_H
-#define INETCHANNEL_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-#include "inetchannelinfo.h"
-#include "bitbuf.h"
-
-class	IDemoRecorder;
-class	INetMessage;
-class	INetChannelHandler;
-class	INetChannelInfo;
-typedef struct netpacket_s netpacket_t;
-typedef struct netadr_s	netadr_t;
-
-abstract_class INetChannel : public INetChannelInfo
-{
-public:
-	virtual	~INetChannel(void) {};
-
-	virtual void	SetDataRate(float rate) = 0;
-	virtual bool	RegisterMessage(INetMessage* msg) = 0;
-	virtual bool	UnregisterMessage(INetMessageBinder* msg) = 0; 
-	virtual bool	StartStreaming(unsigned int challengeNr) = 0;
-	virtual void	ResetStreaming(void) = 0;
-	virtual void	SetTimeout(float seconds) = 0;
-	virtual void	SetDemoRecorder(IDemoRecorder* recorder) = 0;
-	virtual void	SetChallengeNr(unsigned int chnr) = 0;
-
-	virtual void	Reset(void) = 0;
-	virtual void	Clear(void) = 0;
-	virtual void	Shutdown(const char* reason) = 0;
-
-	virtual void	ProcessPlayback(void) = 0;
-	virtual bool	ProcessStream(void) = 0;
-	virtual void	ProcessPacket(struct netpacket_s* packet, bool bHasHeader) = 0;
-
-	virtual bool	SendNetMsg(INetMessage& msg, bool bForceReliable = false, bool bVoice = false) = 0;
-#ifdef POSIX
-	FORCEINLINE bool SendNetMsg(INetMessage const& msg, bool bForceReliable = false, bool bVoice = false) { return SendNetMsg(*((INetMessage*)&msg), bForceReliable, bVoice); }
-#endif
-	virtual bool	SendData(bf_write& msg, bool bReliable = true) = 0;
-	virtual bool	SendFile(const char* filename, unsigned int transferID) = 0;
-	virtual void	DenyFile(const char* filename, unsigned int transferID) = 0;
-	virtual void	RequestFile_OLD(const char* filename, unsigned int transferID) = 0;	          
-	virtual void	SetChoked(void) = 0;
-	virtual int		SendDatagram(bf_write* data) = 0;
-	virtual bool	Transmit(bool onlyReliable = false) = 0;
-
-	virtual const netadr_t& GetRemoteAddress(void) const = 0;
-	virtual INetChannelHandler* GetMsgHandler(void) const = 0;
-	virtual int				GetDropNumber(void) const = 0;
-	virtual int				GetSocket(void) const = 0;
-	virtual unsigned int	GetChallengeNr(void) const = 0;
-	virtual void			GetSequenceData(int& nOutSequenceNr, int& nInSequenceNr, int& nOutSequenceNrAck) = 0;
-	virtual void			SetSequenceData(int nOutSequenceNr, int nInSequenceNr, int nOutSequenceNrAck) = 0;
-
-	virtual void	UpdateMessageStats(int msggroup, int bits) = 0;
-	virtual bool	CanPacket(void) const = 0;
-	virtual bool	IsOverflowed(void) const = 0;
-	virtual bool	IsTimedOut(void) const = 0;
-	virtual bool	HasPendingReliableData(void) = 0;
-
-	virtual void	SetFileTransmissionMode(bool bBackgroundMode) = 0;
-	virtual void	SetCompressionMode(bool bUseCompression) = 0;
-	virtual unsigned int RequestFile(const char* filename) = 0;
-	virtual float	GetTimeSinceLastReceived(void) const = 0;	        
-
-	virtual void	SetMaxBufferSize(bool bReliable, int nBytes, bool bVoice = false) = 0;
-
-	virtual bool	IsNull() const = 0;
-	virtual int		GetNumBitsWritten(bool bReliable) = 0;
-	virtual void	SetInterpolationAmount(float flInterpolationAmount) = 0;
-	virtual void	SetRemoteFramerate(float flFrameTime, float flFrameTimeStdDeviation) = 0;
-
-	virtual void	SetMaxRoutablePayloadSize(int nSplitSize) = 0;
-	virtual int		GetMaxRoutablePayloadSize() = 0;
-
-	virtual int		GetProtocolVersion() = 0;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/inetchannelinfo.h b/SpyCustom/inetchannelinfo.h
deleted file mode 100644
index 7300c4c..0000000
--- a/SpyCustom/inetchannelinfo.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#if !defined( INETCHANNELINFO_H )
-#define INETCHANNELINFO_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#define FLOW_OUTGOING	0		
-#define FLOW_INCOMING	1
-#define MAX_FLOWS		2		   
-
-class INetChannelInfo
-{
-public:
-
-	enum {
-		GENERIC = 0,	       
-		LOCALPLAYER,	      
-		OTHERPLAYERS,	     
-		ENTITIES,		    
-		SOUNDS,			  
-		EVENTS,			  
-		USERMESSAGES,	  
-		ENTMESSAGES,	  
-		VOICE,			  
-		STRINGTABLE,	   
-		MOVE,			   
-		STRINGCMD,		  
-		SIGNON,			  
-		TOTAL,			         
-	};
-
-	virtual const char* GetName(void) const = 0;	   
-	virtual const char* GetAddress(void) const = 0;       
-	virtual float		GetTime(void) const = 0;	   
-	virtual float		GetTimeConnected(void) const = 0;	     
-	virtual int			GetBufferSize(void) const = 0;	    
-	virtual int			GetDataRate(void) const = 0;      
-
-	virtual bool		IsLoopback(void) const = 0;	    
-	virtual bool		IsTimingOut(void) const = 0;	    
-	virtual bool		IsPlayback(void) const = 0;	    
-
-	virtual float		GetLatency(int flow) const = 0;	        
-	virtual float		GetAvgLatency(int flow) const = 0;      
-	virtual float		GetAvgLoss(int flow) const = 0;	    
-	virtual float		GetAvgChoke(int flow) const = 0;	    
-	virtual float		GetAvgData(int flow) const = 0;	     
-	virtual float		GetAvgPackets(int flow) const = 0;   
-	virtual int			GetTotalData(int flow) const = 0;	      
-	virtual int			GetSequenceNr(int flow) const = 0;	    
-	virtual bool		IsValidPacket(int flow, int frame_number) const = 0;       
-	virtual float		GetPacketTime(int flow, int frame_number) const = 0;      
-	virtual int			GetPacketBytes(int flow, int frame_number, int group) const = 0;      
-	virtual bool		GetStreamProgress(int flow, int* received, int* total) const = 0;      
-	virtual float		GetTimeSinceLastReceived(void) const = 0;	        
-	virtual	float		GetCommandInterpolationAmount(int flow, int frame_number) const = 0;
-	virtual void		GetPacketResponseLatency(int flow, int frame_number, int* pnLatencyMsecs, int* pnChoke) const = 0;
-	virtual void		GetRemoteFramerate(float* pflFrameTime, float* pflFrameTimeStdDeviation) const = 0;
-
-	virtual float		GetTimeoutSeconds() const = 0;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/inetmessage.h b/SpyCustom/inetmessage.h
deleted file mode 100644
index c2fa5a8..0000000
--- a/SpyCustom/inetmessage.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef INETMESSAGE_H
-#define INETMESSAGE_H
-
-#include "bitbuf.h"
-
-class INetMsgHandler;
-class INetMessage;
-class INetChannel;
-
-class INetMessage
-{
-public:
-	virtual	~INetMessage() {};
-
-	virtual void	SetNetChannel(INetChannel* netchan) { DebuggerBreak(); return; }
-	virtual void	SetReliable(bool state) = 0;	        
-
-	virtual bool	Process(void) { DebuggerBreak(); return false; }
-
-	virtual	bool	ReadFromBuffer(bf_read& buffer) = 0;       
-	virtual	bool	WriteToBuffer(bf_write& buffer) const = 0;	      
-
-	virtual bool	IsReliable(void) const = 0;        
-
-	virtual int				GetType(void) const = 0;        
-	virtual int				GetGroup(void) const = 0;	       
-	virtual const char* GetName(void) const = 0;	      
-
-	virtual INetChannel* GetNetChannel(void) const { DebuggerBreak(); return NULL; }
-
-	virtual const char* ToString(void) const = 0;         
-	virtual size_t			GetSize() const = 0;
-};
-
-class INetMessageBinder
-{
-public:
-	virtual	~INetMessageBinder() {};
-
-	virtual int	GetType(void) const = 0;        
-	virtual void SetNetChannel(INetChannel* netchan) = 0;      
-	virtual INetMessage* CreateFromBuffer(bf_read& buffer) = 0;
-	virtual bool Process(const INetMessage& src) = 0;
-};
-
-class INetChannelHandler
-{
-public:
-	virtual	~INetChannelHandler(void) {};
-
-	virtual void ConnectionStart(INetChannel* chan) = 0;	       
-	virtual void ConnectionStop() = 0;	       
-
-	virtual void ConnectionClosing(const char* reason) = 0;         
-
-	virtual void ConnectionCrashed(const char* reason) = 0;    
-
-	virtual void PacketStart(int incoming_sequence, int outgoing_acknowledged) = 0;	       
-
-	virtual void PacketEnd(void) = 0;      
-
-	virtual void FileRequested(const char* fileName, unsigned int transferID, bool isReplayDemoFile) = 0;        
-
-	virtual void FileReceived(const char* fileName, unsigned int transferID, bool isReplayDemoFile) = 0;     
-
-	virtual void FileDenied(const char* fileName, unsigned int transferID, bool isReplayDemoFile) = 0;	        
-
-	virtual void FileSent(const char* fileName, unsigned int transferID, bool isReplayDemoFile) = 0;	    
-
-	virtual bool ChangeSplitscreenUser(int nSplitScreenUserSlot) = 0;                   
-};
-
-#endif
-
diff --git a/SpyCustom/inetmsghandler.h b/SpyCustom/inetmsghandler.h
deleted file mode 100644
index 9f89f9c..0000000
--- a/SpyCustom/inetmsghandler.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#if !defined( INETMSGHANDLER_H )
-#define INETMSGHANDLER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "inetmessage.h"
-
-class	INetChannel;
-typedef struct netpacket_s netpacket_t;
-
-class IConnectionlessPacketHandler
-{
-public:
-	virtual	~IConnectionlessPacketHandler(void) {};
-
-	virtual bool ProcessConnectionlessPacket(netpacket_t* packet) = 0;	    
-};
-
-
-#endif  
diff --git a/SpyCustom/interface.h b/SpyCustom/interface.h
deleted file mode 100644
index 43a88e8..0000000
--- a/SpyCustom/interface.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef INTERFACE_H
-#define INTERFACE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-class IBaseInterface
-{
-public:
-	virtual	~IBaseInterface() {}
-};
-
-#if !defined( _X360 )
-#define CREATEINTERFACE_PROCNAME	"CreateInterface"
-#else
-#define CREATEINTERFACE_PROCNAME	((const char*)1)
-#endif
-
-typedef void* (*CreateInterfaceFn)(const char* pName, int* pReturnCode);
-typedef void* (*InstantiateInterfaceFn)();
-
-class InterfaceReg
-{
-public:
-	InterfaceReg(InstantiateInterfaceFn fn, const char* pName);
-
-public:
-	InstantiateInterfaceFn	m_CreateFn;
-	const char* m_pName;
-
-	InterfaceReg* m_pNext;     
-	static InterfaceReg* s_pInterfaceRegs;
-};
-
-#if !defined(_STATIC_LINKED) || !defined(_SUBSYSTEM)
-#define EXPOSE_INTERFACE_FN(functionName, interfaceName, versionName) \
-	static InterfaceReg __g_Create##interfaceName##_reg(functionName, versionName);
-#else
-#define EXPOSE_INTERFACE_FN(functionName, interfaceName, versionName) \
-	namespace _SUBSYSTEM \
-	{	\
-		static InterfaceReg __g_Create##interfaceName##_reg(functionName, versionName); \
-	}
-#endif
-
-#if !defined(_STATIC_LINKED) || !defined(_SUBSYSTEM)
-#define EXPOSE_INTERFACE(className, interfaceName, versionName) \
-	static void* __Create##className##_interface() {return static_cast<interfaceName *>( new className );} \
-	static InterfaceReg __g_Create##className##_reg(__Create##className##_interface, versionName );
-#else
-#define EXPOSE_INTERFACE(className, interfaceName, versionName) \
-	namespace _SUBSYSTEM \
-	{	\
-		static void* __Create##className##_interface() {return static_cast<interfaceName *>( new className );} \
-		static InterfaceReg __g_Create##className##_reg(__Create##className##_interface, versionName ); \
-	}
-#endif
-
-#if !defined(_STATIC_LINKED) || !defined(_SUBSYSTEM)
-#define EXPOSE_SINGLE_INTERFACE_GLOBALVAR_WITH_NAMESPACE(className, interfaceNamespace, interfaceName, versionName, globalVarName) \
-	static void* __Create##className##interfaceName##_interface() {return static_cast<interfaceNamespace interfaceName *>( &globalVarName );} \
-	static InterfaceReg __g_Create##className##interfaceName##_reg(__Create##className##interfaceName##_interface, versionName);
-#else
-#define EXPOSE_SINGLE_INTERFACE_GLOBALVAR_WITH_NAMESPACE(className, interfaceNamespace, interfaceName, versionName, globalVarName) \
-	namespace _SUBSYSTEM \
-	{ \
-		static void* __Create##className##interfaceName##_interface() {return static_cast<interfaceNamespace interfaceName *>( &globalVarName );} \
-		static InterfaceReg __g_Create##className##interfaceName##_reg(__Create##className##interfaceName##_interface, versionName); \
-	}
-#endif
-
-#define EXPOSE_SINGLE_INTERFACE_GLOBALVAR(className, interfaceName, versionName, globalVarName) \
-	EXPOSE_SINGLE_INTERFACE_GLOBALVAR_WITH_NAMESPACE(className, , interfaceName, versionName, globalVarName)
-
-#if !defined(_STATIC_LINKED) || !defined(_SUBSYSTEM)
-#define EXPOSE_SINGLE_INTERFACE(className, interfaceName, versionName) \
-	static className __g_##className##_singleton; \
-	EXPOSE_SINGLE_INTERFACE_GLOBALVAR(className, interfaceName, versionName, __g_##className##_singleton)
-#else
-#define EXPOSE_SINGLE_INTERFACE(className, interfaceName, versionName) \
-	namespace _SUBSYSTEM \
-	{	\
-		static className __g_##className##_singleton; \
-	}	\
-	EXPOSE_SINGLE_INTERFACE_GLOBALVAR(className, interfaceName, versionName, __g_##className##_singleton)
-#endif
-
-class CSysModule;
-
-enum
-{
-	IFACE_OK = 0,
-	IFACE_FAILED
-};
-
-void* CreateInterface(const char* pName, int* pReturnCode);
-
-#if defined( _X360 )
-DLL_EXPORT void* CreateInterfaceThunk(const char* pName, int* pReturnCode);
-#endif
-
-extern CreateInterfaceFn	Sys_GetFactory(CSysModule* pModule);
-extern CreateInterfaceFn	Sys_GetFactory(const char* pModuleName);
-extern CreateInterfaceFn	Sys_GetFactoryThis(void);
-
-enum Sys_Flags
-{
-	SYS_NOFLAGS = 0x00,
-	SYS_NOLOAD = 0x01               
-};
-
-extern CSysModule* Sys_LoadModule(const char* pModuleName, Sys_Flags flags = SYS_NOFLAGS);
-extern void					Sys_UnloadModule(CSysModule* pModule);
-
-bool Sys_LoadInterface(
-	const char* pModuleName,
-	const char* pInterfaceVersionName,
-	CSysModule** pOutModule,
-	void** pOutInterface);
-
-bool Sys_IsDebuggerPresent();
-
-class CDllDemandLoader
-{
-public:
-	CDllDemandLoader(char const* pchModuleName);
-	virtual				~CDllDemandLoader();
-	CreateInterfaceFn	GetFactory();
-	void				Unload();
-
-private:
-
-	char const* m_pchModuleName;
-	CSysModule* m_hModule;
-	bool		m_bLoadAttempted;
-};
-
-#endif
diff --git a/SpyCustom/interpolatedvar.h b/SpyCustom/interpolatedvar.h
deleted file mode 100644
index 2bfdecc..0000000
--- a/SpyCustom/interpolatedvar.h
+++ /dev/null
@@ -1,1429 +0,0 @@
-#ifndef INTERPOLATEDVAR_H
-#define INTERPOLATEDVAR_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utllinkedlist.h"
-#include "rangecheckedvar.h"
-#include "lerp_functions.h"
-#include "animationlayer.h"
-#include "convar.h"
-
-
-#include "memdbgon.h"
-
-#define COMPARE_HISTORY(a,b) \
-	( memcmp( m_VarHistory[a].GetValue(), m_VarHistory[b].GetValue(), sizeof(Type)*GetMaxCount() ) == 0 ) 			
-
-
-#define LATCH_ANIMATION_VAR  (1<<0)		     
-#define LATCH_SIMULATION_VAR (1<<1)		     
-
-#define EXCLUDE_AUTO_LATCH			(1<<2)
-#define EXCLUDE_AUTO_INTERPOLATE	(1<<3)
-
-#define INTERPOLATE_LINEAR_ONLY		(1<<4)	    
-#define INTERPOLATE_OMIT_UPDATE_LAST_NETWORKED (1<<5)
-
-
-
-#define EXTRA_INTERPOLATION_HISTORY_STORED 0.05f	       
-extern float g_flLastPacketTimestamp;
-
-inline void Interpolation_SetLastPacketTimeStamp(float timestamp)
-{
-	Assert(timestamp > 0);
-	g_flLastPacketTimestamp = timestamp;
-}
-
-
-class CInterpolationContext
-{
-public:
-
-	CInterpolationContext()
-	{
-		m_bOldAllowExtrapolation = s_bAllowExtrapolation;
-		m_flOldLastTimeStamp = s_flLastTimeStamp;
-
-		s_bAllowExtrapolation = false;
-
-		m_pNext = s_pHead;
-		s_pHead = this;
-	}
-
-	~CInterpolationContext()
-	{
-		s_bAllowExtrapolation = m_bOldAllowExtrapolation;
-		s_flLastTimeStamp = m_flOldLastTimeStamp;
-
-		Assert(s_pHead == this);
-		s_pHead = m_pNext;
-	}
-
-	static void EnableExtrapolation(bool state)
-	{
-		s_bAllowExtrapolation = state;
-	}
-
-	static bool IsThereAContext()
-	{
-		return s_pHead != NULL;
-	}
-
-	static bool IsExtrapolationAllowed()
-	{
-		return s_bAllowExtrapolation;
-	}
-
-	static void SetLastTimeStamp(float timestamp)
-	{
-		s_flLastTimeStamp = timestamp;
-	}
-
-	static float GetLastTimeStamp()
-	{
-		return s_flLastTimeStamp;
-	}
-
-
-private:
-
-	CInterpolationContext* m_pNext;
-	bool m_bOldAllowExtrapolation;
-	float m_flOldLastTimeStamp;
-
-	static CInterpolationContext* s_pHead;
-	static bool s_bAllowExtrapolation;
-	static float s_flLastTimeStamp;
-};
-
-
-extern ConVar cl_extrapolate_amount;
-
-
-template< class T >
-inline T ExtrapolateInterpolatedVarType(const T& oldVal, const T& newVal, float divisor, float flExtrapolationAmount)
-{
-	return newVal;
-}
-
-inline Vector ExtrapolateInterpolatedVarType(const Vector& oldVal, const Vector& newVal, float divisor, float flExtrapolationAmount)
-{
-	return Lerp(1.0f + flExtrapolationAmount * divisor, oldVal, newVal);
-}
-
-inline float ExtrapolateInterpolatedVarType(const float& oldVal, const float& newVal, float divisor, float flExtrapolationAmount)
-{
-	return Lerp(1.0f + flExtrapolationAmount * divisor, oldVal, newVal);
-}
-
-inline QAngle ExtrapolateInterpolatedVarType(const QAngle& oldVal, const QAngle& newVal, float divisor, float flExtrapolationAmount)
-{
-	return Lerp<QAngle>(1.0f + flExtrapolationAmount * divisor, oldVal, newVal);
-}
-
-
-abstract_class IInterpolatedVar
-{
-public:
-	virtual		 ~IInterpolatedVar() {}
-
-	virtual void Setup(void* pValue, int type) = 0;
-	virtual void SetInterpolationAmount(float seconds) = 0;
-
-	virtual void NoteLastNetworkedValue() = 0;
-	virtual bool NoteChanged(float changetime, bool bUpdateLastNetworkedValue) = 0;
-	virtual void Reset() = 0;
-
-	virtual int Interpolate(float currentTime) = 0;
-
-	virtual int	 GetType() const = 0;
-	virtual void RestoreToLastNetworked() = 0;
-	virtual void Copy(IInterpolatedVar* pSrc) = 0;
-
-	virtual const char* GetDebugName() = 0;
-	virtual void SetDebugName(const char* pName) = 0;
-
-	virtual void SetDebug(bool bDebug) = 0;
-};
-
-template< typename Type, bool IS_ARRAY >
-struct CInterpolatedVarEntryBase
-{
-	CInterpolatedVarEntryBase()
-	{
-		value = NULL;
-		count = 0;
-		changetime = 0;
-	}
-	~CInterpolatedVarEntryBase()
-	{
-		delete[] value;
-		value = NULL;
-	}
-
-	void FastTransferFrom(CInterpolatedVarEntryBase& src)
-	{
-		Assert(!value);
-		value = src.value;
-		count = src.count;
-		changetime = src.changetime;
-		src.value = 0;
-		src.count = 0;
-	}
-
-	CInterpolatedVarEntryBase& operator=(const CInterpolatedVarEntryBase& src)
-	{
-		delete[] value;
-		value = NULL;
-		count = 0;
-		if (src.value)
-		{
-			count = src.count;
-			value = new Type[count];
-			for (int i = 0; i < count; i++)
-			{
-				value[i] = src.value[i];
-			}
-		}
-		return *this;
-	}
-
-	Type* GetValue() { return value; }
-	const Type* GetValue() const { return value; }
-
-	void Init(int maxCount)
-	{
-		if (!maxCount)
-		{
-			DeleteEntry();
-		}
-		else
-		{
-			if (maxCount != count)
-			{
-				DeleteEntry();
-			}
-
-			if (!value)
-			{
-				count = maxCount;
-				value = new Type[maxCount];
-			}
-		}
-		Assert(count == maxCount);
-	}
-	Type* NewEntry(const Type* pValue, int maxCount, float time)
-	{
-		changetime = time;
-		Init(maxCount);
-		if (value && maxCount)
-		{
-			memcpy(value, pValue, maxCount * sizeof(Type));
-		}
-		return value;
-	}
-
-	void DeleteEntry()
-	{
-		delete[] value;
-		value = NULL;
-		count = 0;
-	}
-
-	float		changetime;
-	int			count;
-	Type* value;
-
-private:
-	CInterpolatedVarEntryBase(const CInterpolatedVarEntryBase& src);
-};
-
-template<typename Type>
-struct CInterpolatedVarEntryBase<Type, false>
-{
-	CInterpolatedVarEntryBase() {}
-	~CInterpolatedVarEntryBase() {}
-
-	const Type* GetValue() const { return &value; }
-	Type* GetValue() { return &value; }
-
-	void Init(int maxCount)
-	{
-		Assert(maxCount == 1);
-	}
-	Type* NewEntry(const Type* pValue, int maxCount, float time)
-	{
-		Assert(maxCount == 1);
-		changetime = time;
-		memcpy(&value, pValue, maxCount * sizeof(Type));
-		return &value;
-	}
-	void FastTransferFrom(CInterpolatedVarEntryBase& src)
-	{
-		*this = src;
-	}
-
-	void DeleteEntry() {}
-
-	float		changetime;
-	Type		value;
-};
-
-template<typename T>
-class CSimpleRingBuffer
-{
-public:
-	CSimpleRingBuffer(int startSize = 4)
-	{
-		m_pElements = 0;
-		m_maxElement = 0;
-		m_firstElement = 0;
-		m_count = 0;
-		m_growSize = 16;
-		EnsureCapacity(startSize);
-	}
-	~CSimpleRingBuffer()
-	{
-		delete[] m_pElements;
-		m_pElements = NULL;
-	}
-
-	inline int Count() const { return m_count; }
-
-	int Head() const { return (m_count > 0) ? 0 : InvalidIndex(); }
-
-	bool IsIdxValid(int i) const { return (i >= 0 && i < m_count) ? true : false; }
-	bool IsValidIndex(int i) const { return IsIdxValid(i); }
-	static int InvalidIndex() { return -1; }
-
-	T& operator[](int i)
-	{
-		Assert(IsIdxValid(i));
-		i += m_firstElement;
-		i = WrapRange(i);
-		return m_pElements[i];
-	}
-
-	const T& operator[](int i) const
-	{
-		Assert(IsIdxValid(i));
-		i += m_firstElement;
-		i = WrapRange(i);
-		return m_pElements[i];
-	}
-
-	void EnsureCapacity(int capSize)
-	{
-		if (capSize > m_maxElement)
-		{
-			int newMax = m_maxElement + ((capSize + m_growSize - 1) / m_growSize) * m_growSize;
-			T* pNew = new T[newMax];
-			for (int i = 0; i < m_maxElement; i++)
-			{
-				pNew[i].FastTransferFrom(m_pElements[WrapRange(i + m_firstElement)]);
-			}
-			m_firstElement = 0;
-			m_maxElement = newMax;
-			delete[] m_pElements;
-			m_pElements = pNew;
-		}
-	}
-
-	int AddToHead()
-	{
-		EnsureCapacity(m_count + 1);
-		int i = m_firstElement + m_maxElement - 1;
-		m_count++;
-		i = WrapRange(i);
-		m_firstElement = i;
-		return 0;
-	}
-
-	int AddToHead(const T& elem)
-	{
-		AddToHead();
-		m_pElements[m_firstElement] = elem;
-		return 0;
-	}
-
-	int AddToTail()
-	{
-		EnsureCapacity(m_count + 1);
-		m_count++;
-		return WrapRange(m_firstElement + m_count - 1);
-	}
-
-	void RemoveAll()
-	{
-		m_count = 0;
-		m_firstElement = 0;
-	}
-
-	void RemoveAtHead()
-	{
-		if (m_count > 0)
-		{
-			m_firstElement = WrapRange(m_firstElement + 1);
-			m_count--;
-		}
-	}
-
-	void Truncate(int newLength)
-	{
-		if (newLength < m_count)
-		{
-			Assert(newLength >= 0);
-			m_count = newLength;
-		}
-	}
-
-private:
-	inline int WrapRange(int i) const
-	{
-		return (i >= m_maxElement) ? (i - m_maxElement) : i;
-	}
-
-	T* m_pElements;
-	unsigned short m_maxElement;
-	unsigned short m_firstElement;
-	unsigned short m_count;
-	unsigned short m_growSize;
-};
-
-template< typename Type, bool IS_ARRAY>
-class CInterpolatedVarArrayBase : public IInterpolatedVar
-{
-public:
-	friend class CInterpolatedVarPrivate;
-
-	CInterpolatedVarArrayBase(const char* pDebugName = "no debug name");
-	virtual ~CInterpolatedVarArrayBase();
-
-
-public:
-
-	virtual void Setup(void* pValue, int type);
-	virtual void SetInterpolationAmount(float seconds);
-	virtual void NoteLastNetworkedValue();
-	virtual bool NoteChanged(float changetime, bool bUpdateLastNetworkedValue);
-	virtual void Reset();
-	virtual int Interpolate(float currentTime);
-	virtual int GetType() const;
-	virtual void RestoreToLastNetworked();
-	virtual void Copy(IInterpolatedVar* pInSrc);
-	virtual const char* GetDebugName() { return m_pDebugName; }
-
-
-public:
-
-	bool NoteChanged(float changetime, float interpolation_amount, bool bUpdateLastNetworkedValue);
-	int Interpolate(float currentTime, float interpolation_amount);
-
-	void DebugInterpolate(Type* pOut, float currentTime);
-
-	void GetDerivative(Type* pOut, float currentTime);
-	void GetDerivative_SmoothVelocity(Type* pOut, float currentTime);	      
-
-	void ClearHistory();
-	void AddToHead(float changeTime, const Type* values, bool bFlushNewer);
-	const Type& GetPrev(int iArrayIndex = 0) const;
-	const Type& GetCurrent(int iArrayIndex = 0) const;
-
-	float	GetInterval() const;
-	bool	IsValidIndex(int i);
-	Type* GetHistoryValue(int index, float& changetime, int iArrayIndex = 0);
-	int		GetHead() { return 0; }
-	int		GetNext(int i)
-	{
-		int next = i + 1;
-		if (!m_VarHistory.IsValidIndex(next))
-			return m_VarHistory.InvalidIndex();
-		return next;
-	}
-
-	void SetHistoryValuesForItem(int item, Type& value);
-	void	SetLooping(bool looping, int iArrayIndex = 0);
-
-	void SetMaxCount(int newmax);
-	int GetMaxCount() const;
-
-	float GetOldestEntry();
-
-	void	SetDebugName(const char* pName) { m_pDebugName = pName; }
-	virtual void SetDebug(bool bDebug) { m_bDebug = bDebug; }
-	bool GetInterpolationInfo(float currentTime, int* pNewer, int* pOlder, int* pOldest);
-
-protected:
-
-	typedef CInterpolatedVarEntryBase<Type, IS_ARRAY> CInterpolatedVarEntry;
-	typedef CSimpleRingBuffer< CInterpolatedVarEntry > CVarHistory;
-	friend class CInterpolationInfo;
-
-	class CInterpolationInfo
-	{
-	public:
-		bool m_bHermite;
-		int oldest;	     
-		int older;
-		int newer;
-		float frac;
-	};
-
-
-protected:
-
-	void RemoveOldEntries(float oldesttime);
-	void RemoveEntriesPreviousTo(float flTime);
-
-	bool GetInterpolationInfo(
-		CInterpolationInfo* pInfo,
-		float currentTime,
-		float interpolation_amount,
-		int* pNoMoreChanges);
-
-	void TimeFixup_Hermite(
-		CInterpolatedVarEntry& fixup,
-		CInterpolatedVarEntry*& prev,
-		CInterpolatedVarEntry*& start,
-		CInterpolatedVarEntry*& end);
-
-	void TimeFixup2_Hermite(
-		CInterpolatedVarEntry& fixup,
-		CInterpolatedVarEntry*& prev,
-		CInterpolatedVarEntry*& start,
-		float dt
-	);
-
-	void _Extrapolate(
-		Type* pOut,
-		CInterpolatedVarEntry* pOld,
-		CInterpolatedVarEntry* pNew,
-		float flDestinationTime,
-		float flMaxExtrapolationAmount
-	);
-
-	void _Interpolate(Type* out, float frac, CInterpolatedVarEntry* start, CInterpolatedVarEntry* end);
-	void _Interpolate_Hermite(Type* out, float frac, CInterpolatedVarEntry* pOriginalPrev, CInterpolatedVarEntry* start, CInterpolatedVarEntry* end, bool looping = false);
-
-	void _Derivative_Hermite(Type* out, float frac, CInterpolatedVarEntry* pOriginalPrev, CInterpolatedVarEntry* start, CInterpolatedVarEntry* end);
-	void _Derivative_Hermite_SmoothVelocity(Type* out, float frac, CInterpolatedVarEntry* b, CInterpolatedVarEntry* c, CInterpolatedVarEntry* d);
-	void _Derivative_Linear(Type* out, CInterpolatedVarEntry* start, CInterpolatedVarEntry* end);
-
-	bool ValidOrder();
-
-protected:
-	Type* m_pValue;
-	CVarHistory							m_VarHistory;
-	Type* m_LastNetworkedValue;
-	float								m_LastNetworkedTime;
-	byte								m_fType;
-	byte								m_nMaxCount;
-	byte* m_bLooping;
-	float								m_InterpolationAmount;
-	const char* m_pDebugName;
-	bool								m_bDebug : 1;
-};
-
-
-template< typename Type, bool IS_ARRAY >
-inline CInterpolatedVarArrayBase<Type, IS_ARRAY>::CInterpolatedVarArrayBase(const char* pDebugName)
-{
-	m_pDebugName = pDebugName;
-	m_pValue = NULL;
-	m_fType = LATCH_ANIMATION_VAR;
-	m_InterpolationAmount = 0.0f;
-	m_nMaxCount = 0;
-	m_LastNetworkedTime = 0;
-	m_LastNetworkedValue = NULL;
-	m_bLooping = NULL;
-	m_bDebug = false;
-}
-
-template< typename Type, bool IS_ARRAY >
-inline CInterpolatedVarArrayBase<Type, IS_ARRAY>::~CInterpolatedVarArrayBase()
-{
-	ClearHistory();
-	delete[] m_bLooping;
-	delete[] m_LastNetworkedValue;
-}
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::Setup(void* pValue, int type)
-{
-	m_pValue = (Type*)pValue;
-	m_fType = type;
-}
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::SetInterpolationAmount(float seconds)
-{
-	m_InterpolationAmount = seconds;
-}
-
-template< typename Type, bool IS_ARRAY >
-inline int CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetType() const
-{
-	return m_fType;
-}
-
-template< typename Type, bool IS_ARRAY >
-void CInterpolatedVarArrayBase<Type, IS_ARRAY>::NoteLastNetworkedValue()
-{
-	memcpy(m_LastNetworkedValue, m_pValue, m_nMaxCount * sizeof(Type));
-	m_LastNetworkedTime = g_flLastPacketTimestamp;
-}
-
-template< typename Type, bool IS_ARRAY >
-inline bool CInterpolatedVarArrayBase<Type, IS_ARRAY>::NoteChanged(float changetime, float interpolation_amount, bool bUpdateLastNetworkedValue)
-{
-	Assert(m_pValue);
-
-	bool bRet = true;
-	if (m_VarHistory.Count())
-	{
-		if (memcmp(m_pValue, m_VarHistory[0].GetValue(), sizeof(Type) * m_nMaxCount) == 0)
-		{
-			bRet = false;
-		}
-	}
-
-	if (m_bDebug)
-	{
-		char const* pDiffString = bRet ? "differs" : "identical";
-
-	}
-
-	AddToHead(changetime, m_pValue, true);
-
-	if (bUpdateLastNetworkedValue)
-	{
-		NoteLastNetworkedValue();
-	}
-
-#if 0
-	RemoveOldEntries(gpGlobals->curtime - interpolation_amount - 2.0f);
-#else
-#endif
-
-	return bRet;
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline bool CInterpolatedVarArrayBase<Type, IS_ARRAY>::NoteChanged(float changetime, bool bUpdateLastNetworkedValue)
-{
-	return NoteChanged(changetime, m_InterpolationAmount, bUpdateLastNetworkedValue);
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::RestoreToLastNetworked()
-{
-	Assert(m_pValue);
-	memcpy(m_pValue, m_LastNetworkedValue, m_nMaxCount * sizeof(Type));
-}
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::ClearHistory()
-{
-	for (int i = 0; i < m_VarHistory.Count(); i++)
-	{
-		m_VarHistory[i].DeleteEntry();
-	}
-	m_VarHistory.RemoveAll();
-}
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::AddToHead(float changeTime, const Type* values, bool bFlushNewer)
-{
-	MEM_ALLOC_CREDIT_CLASS();
-	int newslot;
-
-	if (bFlushNewer)
-	{
-		while (m_VarHistory.Count())
-		{
-			if ((m_VarHistory[0].changetime + 0.0001f) > changeTime)
-			{
-				m_VarHistory.RemoveAtHead();
-			}
-			else
-			{
-				break;
-			}
-		}
-
-		newslot = m_VarHistory.AddToHead();
-	}
-	else
-	{
-		newslot = m_VarHistory.AddToHead();
-		for (int i = 1; i < m_VarHistory.Count(); i++)
-		{
-			if (m_VarHistory[i].changetime <= changeTime)
-				break;
-			m_VarHistory[newslot].FastTransferFrom(m_VarHistory[i]);
-			newslot = i;
-		}
-	}
-
-	CInterpolatedVarEntry* e = &m_VarHistory[newslot];
-	e->NewEntry(values, m_nMaxCount, changeTime);
-}
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::Reset()
-{
-	ClearHistory();
-
-	if (m_pValue)
-	{
-		memcpy(m_LastNetworkedValue, m_pValue, m_nMaxCount * sizeof(Type));
-	}
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline float CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetOldestEntry()
-{
-	float lastVal = 0;
-	if (m_VarHistory.Count())
-	{
-		lastVal = m_VarHistory[m_VarHistory.Count() - 1].changetime;
-	}
-	return lastVal;
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::RemoveOldEntries(float oldesttime)
-{
-	int newCount = m_VarHistory.Count();
-	for (int i = m_VarHistory.Count(); --i > 2; )
-	{
-		if (m_VarHistory[i].changetime > oldesttime)
-			break;
-		newCount = i;
-	}
-	m_VarHistory.Truncate(newCount);
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::RemoveEntriesPreviousTo(float flTime)
-{
-	for (int i = 0; i < m_VarHistory.Count(); i++)
-	{
-		if (m_VarHistory[i].changetime < flTime)
-		{
-			m_VarHistory.Truncate(i + 3);
-			break;
-		}
-	}
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline bool CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetInterpolationInfo(
-	typename CInterpolatedVarArrayBase<Type, IS_ARRAY>::CInterpolationInfo* pInfo,
-	float currentTime,
-	float interpolation_amount,
-	int* pNoMoreChanges
-)
-{
-	Assert(m_pValue);
-
-	CVarHistory& varHistory = m_VarHistory;
-
-	float targettime = currentTime - interpolation_amount;
-
-	pInfo->m_bHermite = false;
-	pInfo->frac = 0;
-	pInfo->oldest = pInfo->older = pInfo->newer = varHistory.InvalidIndex();
-
-	for (int i = 0; i < varHistory.Count(); i++)
-	{
-		pInfo->older = i;
-
-		float older_change_time = m_VarHistory[i].changetime;
-		if (older_change_time == 0.0f)
-			break;
-
-		if (targettime < older_change_time)
-		{
-			pInfo->newer = pInfo->older;
-			continue;
-		}
-
-		if (pInfo->newer == varHistory.InvalidIndex())
-		{
-			pInfo->newer = pInfo->older;
-
-			if (pNoMoreChanges)
-				*pNoMoreChanges = 1;
-			return true;
-		}
-
-		float newer_change_time = varHistory[pInfo->newer].changetime;
-		float dt = newer_change_time - older_change_time;
-		if (dt > 0.0001f)
-		{
-			pInfo->frac = (targettime - older_change_time) / (newer_change_time - older_change_time);
-			pInfo->frac = MIN(pInfo->frac, 2.0f);
-
-			int oldestindex = i + 1;
-
-			if (!(m_fType & INTERPOLATE_LINEAR_ONLY) && varHistory.IsIdxValid(oldestindex))
-			{
-				pInfo->oldest = oldestindex;
-				float oldest_change_time = varHistory[oldestindex].changetime;
-				float dt2 = older_change_time - oldest_change_time;
-				if (dt2 > 0.0001f)
-				{
-					pInfo->m_bHermite = true;
-				}
-			}
-
-			if (pNoMoreChanges && pInfo->newer == m_VarHistory.Head())
-			{
-				if (COMPARE_HISTORY(pInfo->newer, pInfo->older))
-				{
-					if (!pInfo->m_bHermite || COMPARE_HISTORY(pInfo->newer, pInfo->oldest))
-						*pNoMoreChanges = 1;
-				}
-			}
-		}
-		return true;
-	}
-
-	if (pInfo->newer != varHistory.InvalidIndex())
-	{
-		pInfo->older = pInfo->newer;
-		return true;
-	}
-
-
-	pInfo->newer = pInfo->older;
-	return (pInfo->older != varHistory.InvalidIndex());
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline bool CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetInterpolationInfo(float currentTime, int* pNewer, int* pOlder, int* pOldest)
-{
-	CInterpolationInfo info;
-	bool result = GetInterpolationInfo(&info, currentTime, m_InterpolationAmount, NULL);
-
-	if (pNewer)
-		*pNewer = (int)info.newer;
-
-	if (pOlder)
-		*pOlder = (int)info.older;
-
-	if (pOldest)
-		*pOldest = (int)info.oldest;
-
-	return result;
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::DebugInterpolate(Type* pOut, float currentTime)
-{
-	float interpolation_amount = m_InterpolationAmount;
-
-	int noMoreChanges = 0;
-
-	CInterpolationInfo info;
-	GetInterpolationInfo(&info, currentTime, interpolation_amount, &noMoreChanges);
-
-	CVarHistory& history = m_VarHistory;
-
-	if (info.m_bHermite)
-	{
-		_Interpolate_Hermite(pOut, info.frac, &history[info.oldest], &history[info.older], &history[info.newer]);
-	}
-	else if (info.newer == info.older)
-	{
-		int realOlder = info.newer + 1;
-		if (CInterpolationContext::IsExtrapolationAllowed() &&
-			IsValidIndex(realOlder) &&
-			history[realOlder].changetime != 0.0 &&
-			interpolation_amount > 0.000001f &&
-			CInterpolationContext::GetLastTimeStamp() <= m_LastNetworkedTime)
-		{
-			_Extrapolate(pOut, &history[realOlder], &history[info.newer], currentTime - interpolation_amount, cl_extrapolate_amount.GetFloat());
-		}
-		else
-		{
-			_Interpolate(pOut, info.frac, &history[info.older], &history[info.newer]);
-		}
-	}
-	else
-	{
-		_Interpolate(pOut, info.frac, &history[info.older], &history[info.newer]);
-	}
-}
-
-template< typename Type, bool IS_ARRAY >
-inline int CInterpolatedVarArrayBase<Type, IS_ARRAY>::Interpolate(float currentTime, float interpolation_amount)
-{
-	int noMoreChanges = 0;
-
-	CInterpolationInfo info;
-	if (!GetInterpolationInfo(&info, currentTime, interpolation_amount, &noMoreChanges))
-		return noMoreChanges;
-
-
-	CVarHistory& history = m_VarHistory;
-
-	if (m_bDebug)
-	{
-		Msg("%s Interpolate at %f%s\n", GetDebugName(), currentTime, noMoreChanges ? " [value will hold]" : "");
-	}
-
-
-#ifdef INTERPOLATEDVAR_PARANOID_MEASUREMENT
-	Type* backupValues = (Type*)_alloca(m_nMaxCount * sizeof(Type));
-	memcpy(backupValues, m_pValue, sizeof(Type) * m_nMaxCount);
-#endif
-
-	if (info.m_bHermite)
-	{
-		_Interpolate_Hermite(m_pValue, info.frac, &history[info.oldest], &history[info.older], &history[info.newer]);
-	}
-	else if (info.newer == info.older)
-	{
-		int realOlder = info.newer + 1;
-		if (CInterpolationContext::IsExtrapolationAllowed() &&
-			IsValidIndex(realOlder) &&
-			history[realOlder].changetime != 0.0 &&
-			interpolation_amount > 0.000001f &&
-			CInterpolationContext::GetLastTimeStamp() <= m_LastNetworkedTime)
-		{
-			_Extrapolate(m_pValue, &history[realOlder], &history[info.newer], currentTime - interpolation_amount, cl_extrapolate_amount.GetFloat());
-		}
-		else
-		{
-			_Interpolate(m_pValue, info.frac, &history[info.older], &history[info.newer]);
-		}
-	}
-	else
-	{
-		_Interpolate(m_pValue, info.frac, &history[info.older], &history[info.newer]);
-	}
-
-#ifdef INTERPOLATEDVAR_PARANOID_MEASUREMENT
-	if (memcmp(backupValues, m_pValue, sizeof(Type) * m_nMaxCount) != 0)
-	{
-		extern int g_nInterpolatedVarsChanged;
-		extern bool g_bRestoreInterpolatedVarValues;
-
-		++g_nInterpolatedVarsChanged;
-
-		if (g_bRestoreInterpolatedVarValues)
-		{
-			memcpy(m_pValue, backupValues, sizeof(Type) * m_nMaxCount);
-			return noMoreChanges;
-		}
-	}
-#endif
-
-	RemoveEntriesPreviousTo(currentTime - interpolation_amount - EXTRA_INTERPOLATION_HISTORY_STORED);
-	return noMoreChanges;
-}
-
-
-template< typename Type, bool IS_ARRAY >
-void CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetDerivative(Type* pOut, float currentTime)
-{
-	CInterpolationInfo info;
-	if (!GetInterpolationInfo(&info, currentTime, m_InterpolationAmount, NULL))
-		return;
-
-	if (info.m_bHermite)
-	{
-		_Derivative_Hermite(pOut, info.frac, &m_VarHistory[info.oldest], &m_VarHistory[info.older], &m_VarHistory[info.newer]);
-	}
-	else
-	{
-		_Derivative_Linear(pOut, &m_VarHistory[info.older], &m_VarHistory[info.newer]);
-	}
-}
-
-
-template< typename Type, bool IS_ARRAY >
-void CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetDerivative_SmoothVelocity(Type* pOut, float currentTime)
-{
-	CInterpolationInfo info;
-	if (!GetInterpolationInfo(&info, currentTime, m_InterpolationAmount, NULL))
-		return;
-
-	CVarHistory& history = m_VarHistory;
-	bool bExtrapolate = false;
-	int realOlder = 0;
-
-	if (info.m_bHermite)
-	{
-		_Derivative_Hermite_SmoothVelocity(pOut, info.frac, &history[info.oldest], &history[info.older], &history[info.newer]);
-		return;
-	}
-	else if (info.newer == info.older && CInterpolationContext::IsExtrapolationAllowed())
-	{
-		realOlder = info.newer + 1;
-		if (IsValidIndex(realOlder) && history[realOlder].changetime != 0.0)
-		{
-			if (m_InterpolationAmount > 0.000001f &&
-				CInterpolationContext::GetLastTimeStamp() <= (currentTime - m_InterpolationAmount))
-			{
-				bExtrapolate = true;
-			}
-		}
-	}
-
-	if (bExtrapolate)
-	{
-		_Derivative_Linear(pOut, &history[realOlder], &history[info.newer]);
-
-		float flDestTime = currentTime - m_InterpolationAmount;
-		float diff = flDestTime - history[info.newer].changetime;
-		diff = clamp(diff, 0.f, cl_extrapolate_amount.GetFloat() * 2);
-		if (diff > cl_extrapolate_amount.GetFloat())
-		{
-			float scale = 1 - (diff - cl_extrapolate_amount.GetFloat()) / cl_extrapolate_amount.GetFloat();
-			for (int i = 0; i < m_nMaxCount; i++)
-			{
-				pOut[i] *= scale;
-			}
-		}
-	}
-	else
-	{
-		_Derivative_Linear(pOut, &history[info.older], &history[info.newer]);
-	}
-
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline int CInterpolatedVarArrayBase<Type, IS_ARRAY>::Interpolate(float currentTime)
-{
-	return Interpolate(currentTime, m_InterpolationAmount);
-}
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::Copy(IInterpolatedVar* pInSrc)
-{
-	CInterpolatedVarArrayBase<Type, IS_ARRAY>* pSrc = dynamic_cast<CInterpolatedVarArrayBase<Type, IS_ARRAY>*>(pInSrc);
-
-	if (!pSrc || pSrc->m_nMaxCount != m_nMaxCount)
-	{
-		if (pSrc)
-		{
-			AssertMsg3(false, "pSrc->m_nMaxCount (%i) != m_nMaxCount (%i) for %s.", pSrc->m_nMaxCount, m_nMaxCount, m_pDebugName);
-		}
-		else
-		{
-			AssertMsg(false, "pSrc was null in CInterpolatedVarArrayBase<Type, IS_ARRAY>::Copy.");
-		}
-
-		return;
-	}
-
-	Assert((m_fType & ~EXCLUDE_AUTO_INTERPOLATE) == (pSrc->m_fType & ~EXCLUDE_AUTO_INTERPOLATE));
-	Assert(m_pDebugName == pSrc->GetDebugName());
-
-	for (int i = 0; i < m_nMaxCount; i++)
-	{
-		m_LastNetworkedValue[i] = pSrc->m_LastNetworkedValue[i];
-		m_bLooping[i] = pSrc->m_bLooping[i];
-	}
-
-	m_LastNetworkedTime = pSrc->m_LastNetworkedTime;
-
-	m_VarHistory.RemoveAll();
-
-	for (int i = 0; i < pSrc->m_VarHistory.Count(); i++)
-	{
-		int newslot = m_VarHistory.AddToTail();
-
-		CInterpolatedVarEntry* dest = &m_VarHistory[newslot];
-		CInterpolatedVarEntry* src = &pSrc->m_VarHistory[i];
-		dest->NewEntry(src->GetValue(), m_nMaxCount, src->changetime);
-	}
-}
-
-template< typename Type, bool IS_ARRAY >
-inline const Type& CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetPrev(int iArrayIndex) const
-{
-	Assert(m_pValue);
-	Assert(iArrayIndex >= 0 && iArrayIndex < m_nMaxCount);
-
-	if (m_VarHistory.Count() > 1)
-	{
-		return m_VarHistory[1].GetValue()[iArrayIndex];
-	}
-	return m_pValue[iArrayIndex];
-}
-
-template< typename Type, bool IS_ARRAY >
-inline const Type& CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetCurrent(int iArrayIndex) const
-{
-	Assert(m_pValue);
-	Assert(iArrayIndex >= 0 && iArrayIndex < m_nMaxCount);
-
-	if (m_VarHistory.Count() > 0)
-	{
-		return m_VarHistory[0].GetValue()[iArrayIndex];
-	}
-	return m_pValue[iArrayIndex];
-}
-
-template< typename Type, bool IS_ARRAY >
-inline float CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetInterval() const
-{
-	if (m_VarHistory.Count() > 1)
-	{
-		return m_VarHistory[0].changetime - m_VarHistory[1].changetime;
-	}
-
-	return 0.0f;
-}
-
-template< typename Type, bool IS_ARRAY >
-inline bool	CInterpolatedVarArrayBase<Type, IS_ARRAY>::IsValidIndex(int i)
-{
-	return m_VarHistory.IsValidIndex(i);
-}
-
-template< typename Type, bool IS_ARRAY >
-inline Type* CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetHistoryValue(int index, float& changetime, int iArrayIndex)
-{
-	Assert(iArrayIndex >= 0 && iArrayIndex < m_nMaxCount);
-	if (m_VarHistory.IsIdxValid(index))
-	{
-		CInterpolatedVarEntry* entry = &m_VarHistory[index];
-		changetime = entry->changetime;
-		return &entry->GetValue()[iArrayIndex];
-	}
-	else
-	{
-		changetime = 0.0f;
-		return NULL;
-	}
-}
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::SetHistoryValuesForItem(int item, Type& value)
-{
-	Assert(item >= 0 && item < m_nMaxCount);
-
-	for (int i = 0; i < m_VarHistory.Count(); i++)
-	{
-		CInterpolatedVarEntry* entry = &m_VarHistory[i];
-		entry->GetValue()[item] = value;
-	}
-}
-
-template< typename Type, bool IS_ARRAY >
-inline void	CInterpolatedVarArrayBase<Type, IS_ARRAY>::SetLooping(bool looping, int iArrayIndex)
-{
-	Assert(iArrayIndex >= 0 && iArrayIndex < m_nMaxCount);
-	m_bLooping[iArrayIndex] = looping;
-}
-
-template< typename Type, bool IS_ARRAY >
-inline void	CInterpolatedVarArrayBase<Type, IS_ARRAY>::SetMaxCount(int newmax)
-{
-	bool changed = (newmax != m_nMaxCount) ? true : false;
-
-	newmax = MAX(1, newmax);
-
-	m_nMaxCount = newmax;
-	if (changed)
-	{
-		delete[] m_bLooping;
-		delete[] m_LastNetworkedValue;
-		m_bLooping = new byte[m_nMaxCount];
-		m_LastNetworkedValue = new Type[m_nMaxCount];
-		memset(m_bLooping, 0, sizeof(byte) * m_nMaxCount);
-		memset(m_LastNetworkedValue, 0, sizeof(Type) * m_nMaxCount);
-
-		Reset();
-	}
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline int CInterpolatedVarArrayBase<Type, IS_ARRAY>::GetMaxCount() const
-{
-	return m_nMaxCount;
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::_Interpolate(Type* out, float frac, CInterpolatedVarEntry* start, CInterpolatedVarEntry* end)
-{
-	Assert(start);
-	Assert(end);
-
-	if (start == end)
-	{
-		for (int i = 0; i < m_nMaxCount; i++)
-		{
-			out[i] = end->GetValue()[i];
-			Lerp_Clamp(out[i]);
-		}
-		return;
-	}
-
-	Assert(frac >= 0.0f && frac <= 1.0f);
-
-	for (int i = 0; i < m_nMaxCount; i++)
-	{
-		if (m_bLooping[i])
-		{
-			out[i] = LoopingLerp(frac, start->GetValue()[i], end->GetValue()[i]);
-		}
-		else
-		{
-			out[i] = Lerp(frac, start->GetValue()[i], end->GetValue()[i]);
-		}
-		Lerp_Clamp(out[i]);
-	}
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::_Extrapolate(
-	Type* pOut,
-	CInterpolatedVarEntry* pOld,
-	CInterpolatedVarEntry* pNew,
-	float flDestinationTime,
-	float flMaxExtrapolationAmount
-)
-{
-	if (fabs(pOld->changetime - pNew->changetime) < 0.001f || flDestinationTime <= pNew->changetime)
-	{
-		for (int i = 0; i < m_nMaxCount; i++)
-			pOut[i] = pNew->GetValue()[i];
-	}
-	else
-	{
-		float flExtrapolationAmount = MIN(flDestinationTime - pNew->changetime, flMaxExtrapolationAmount);
-
-		float divisor = 1.0f / (pNew->changetime - pOld->changetime);
-		for (int i = 0; i < m_nMaxCount; i++)
-		{
-			pOut[i] = ExtrapolateInterpolatedVarType(pOld->GetValue()[i], pNew->GetValue()[i], divisor, flExtrapolationAmount);
-		}
-	}
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::TimeFixup2_Hermite(
-	typename CInterpolatedVarArrayBase<Type, IS_ARRAY>::CInterpolatedVarEntry& fixup,
-	typename CInterpolatedVarArrayBase<Type, IS_ARRAY>::CInterpolatedVarEntry*& prev,
-	typename CInterpolatedVarArrayBase<Type, IS_ARRAY>::CInterpolatedVarEntry*& start,
-	float dt1
-)
-{
-	float dt2 = start->changetime - prev->changetime;
-
-	if (fabs(dt1 - dt2) > 0.0001f &&
-		dt2 > 0.0001f)
-	{
-		float frac = dt1 / dt2;
-
-		fixup.changetime = start->changetime - dt1;
-
-		for (int i = 0; i < m_nMaxCount; i++)
-		{
-			if (m_bLooping[i])
-			{
-				fixup.GetValue()[i] = LoopingLerp(1 - frac, prev->GetValue()[i], start->GetValue()[i]);
-			}
-			else
-			{
-				fixup.GetValue()[i] = Lerp(1 - frac, prev->GetValue()[i], start->GetValue()[i]);
-			}
-		}
-
-		prev = &fixup;
-	}
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::TimeFixup_Hermite(
-	typename CInterpolatedVarArrayBase<Type, IS_ARRAY>::CInterpolatedVarEntry& fixup,
-	typename CInterpolatedVarArrayBase<Type, IS_ARRAY>::CInterpolatedVarEntry*& prev,
-	typename CInterpolatedVarArrayBase<Type, IS_ARRAY>::CInterpolatedVarEntry*& start,
-	typename CInterpolatedVarArrayBase<Type, IS_ARRAY>::CInterpolatedVarEntry*& end)
-{
-	TimeFixup2_Hermite(fixup, prev, start, end->changetime - start->changetime);
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::_Interpolate_Hermite(
-	Type* out,
-	float frac,
-	CInterpolatedVarEntry* prev,
-	CInterpolatedVarEntry* start,
-	CInterpolatedVarEntry* end,
-	bool looping)
-{
-	Assert(start);
-	Assert(end);
-
-	CDisableRangeChecks disableRangeChecks;
-
-	CInterpolatedVarEntry fixup;
-	fixup.Init(m_nMaxCount);
-	TimeFixup_Hermite(fixup, prev, start, end);
-
-	for (int i = 0; i < m_nMaxCount; i++)
-	{
-		if (m_bLooping[i])
-		{
-			out[i] = LoopingLerp_Hermite(frac, prev->GetValue()[i], start->GetValue()[i], end->GetValue()[i]);
-		}
-		else
-		{
-			out[i] = Lerp_Hermite(frac, prev->GetValue()[i], start->GetValue()[i], end->GetValue()[i]);
-		}
-
-		Lerp_Clamp(out[i]);
-	}
-}
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::_Derivative_Hermite(
-	Type* out,
-	float frac,
-	CInterpolatedVarEntry* prev,
-	CInterpolatedVarEntry* start,
-	CInterpolatedVarEntry* end)
-{
-	Assert(start);
-	Assert(end);
-
-	CDisableRangeChecks disableRangeChecks;
-
-	CInterpolatedVarEntry fixup;
-	fixup.value = (Type*)_alloca(sizeof(Type) * m_nMaxCount);
-	TimeFixup_Hermite(fixup, prev, start, end);
-
-	float divisor = 1.0f / (end->changetime - start->changetime);
-
-	for (int i = 0; i < m_nMaxCount; i++)
-	{
-		Assert(!m_bLooping[i]);
-		out[i] = Derivative_Hermite(frac, prev->GetValue()[i], start->GetValue()[i], end->GetValue()[i]);
-		out[i] *= divisor;
-	}
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::_Derivative_Hermite_SmoothVelocity(
-	Type* out,
-	float frac,
-	CInterpolatedVarEntry* b,
-	CInterpolatedVarEntry* c,
-	CInterpolatedVarEntry* d)
-{
-	CInterpolatedVarEntry fixup;
-	fixup.Init(m_nMaxCount);
-	TimeFixup_Hermite(fixup, b, c, d);
-	for (int i = 0; i < m_nMaxCount; i++)
-	{
-		Type prevVel = (c->GetValue()[i] - b->GetValue()[i]) / (c->changetime - b->changetime);
-		Type curVel = (d->GetValue()[i] - c->GetValue()[i]) / (d->changetime - c->changetime);
-		out[i] = Lerp(frac, prevVel, curVel);
-	}
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline void CInterpolatedVarArrayBase<Type, IS_ARRAY>::_Derivative_Linear(
-	Type* out,
-	CInterpolatedVarEntry* start,
-	CInterpolatedVarEntry* end)
-{
-	if (start == end || fabs(start->changetime - end->changetime) < 0.0001f)
-	{
-		for (int i = 0; i < m_nMaxCount; i++)
-		{
-			out[i] = start->GetValue()[i] * 0;
-		}
-	}
-	else
-	{
-		float divisor = 1.0f / (end->changetime - start->changetime);
-		for (int i = 0; i < m_nMaxCount; i++)
-		{
-			out[i] = (end->GetValue()[i] - start->GetValue()[i]) * divisor;
-		}
-	}
-}
-
-
-template< typename Type, bool IS_ARRAY >
-inline bool CInterpolatedVarArrayBase<Type, IS_ARRAY>::ValidOrder()
-{
-	float newestchangetime = 0.0f;
-	bool first = true;
-	for (int i = 0; i < m_VarHistory.Count(); i++)
-	{
-		CInterpolatedVarEntry* entry = &m_VarHistory[i];
-		if (first)
-		{
-			first = false;
-			newestchangetime = entry->changetime;
-			continue;
-		}
-
-		if (entry->changetime > newestchangetime)
-		{
-			Assert(0);
-			return false;
-		}
-
-		newestchangetime = entry->changetime;
-	}
-
-	return true;
-}
-
-template< typename Type, int COUNT >
-class CInterpolatedVarArray : public CInterpolatedVarArrayBase<Type, true >
-{
-public:
-	CInterpolatedVarArray(const char* pDebugName = "no debug name")
-		: CInterpolatedVarArrayBase<Type, true>(pDebugName)
-	{
-		this->SetMaxCount(COUNT);
-	}
-};
-
-
-template< typename Type >
-class CInterpolatedVar : public CInterpolatedVarArrayBase< Type, false >
-{
-public:
-	CInterpolatedVar(const char* pDebugName = NULL)
-		: CInterpolatedVarArrayBase< Type, false >(pDebugName)
-	{
-		this->SetMaxCount(1);
-	}
-};
-
-#include "memdbgoff.h"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/inventory_changer.h b/SpyCustom/inventory_changer.h
deleted file mode 100644
index a4b67db..0000000
--- a/SpyCustom/inventory_changer.h
+++ /dev/null
@@ -1,397 +0,0 @@
-#pragma once
-#include "ProtoParse.h"
-#include "ProtobuffMessages.h"
-#include <ctime>
-
-#include "Options.hpp"
-
-struct wskin
-{
-	int wId;
-	int paintkit;
-};
-
-#define START_MUSICKIT_INDEX 1500000
-#define START_ITEM_INDEX     2000000
-
-static void clear_equip_state(CMsgClientWelcome::SubscribedType& object);
-static void apply_medals(CMsgClientWelcome::SubscribedType& object);
-static void apply_music_kits(CMsgClientWelcome::SubscribedType& object);
-
-static void add_item(CMsgClientWelcome::SubscribedType& object, int index, ItemDefinitionIndex itemIndex, int quality, int rarity, int paintKit, int seed, float wear, std::string name, std::string desc, sticker stickers[5], int stattrak, int flag);
-
-static int GetAvailableClassID(int definition_index);
-static int GetSlotID(int definition_index);
-static std::vector<uint32_t> music_kits = { 3, 4, 5, 6, 7, 8 };
-
-
-template<typename T>
-inline std::string get_4bytes(T value)
-{
-	return std::string{ reinterpret_cast<const char*>(reinterpret_cast<void*>(&value)), 4 };
-}
-
-template<typename T>
-inline CSOEconItemAttribute make_econ_item_attribute(int def_index, T value)
-{
-	CSOEconItemAttribute attribute;
-	attribute.def_index().set(def_index);
-	attribute.value_bytes().set(get_4bytes(value));
-	return attribute;
-}
-
-inline CSOEconItemEquipped make_equipped_state(int team, int slot)
-{
-	CSOEconItemEquipped equipped_state;
-	equipped_state.new_class().set(team);
-	equipped_state.new_slot().set(slot);
-	return equipped_state;
-}
-
-static std::string inventory_changer(void* pubDest, uint32_t* pcubMsgSize) {
-	CMsgClientWelcome msg((void*)((DWORD)pubDest + 8), *pcubMsgSize - 8);
-	if (!msg.outofdate_subscribed_caches().has())
-		return msg.serialize();
-
-	auto cache = msg.outofdate_subscribed_caches().get();
-
-	static auto fix_null_inventory = [&cache]()
-	{
-		auto objects = cache.objects().get_all();
-		auto it = std::find_if(objects.begin(), objects.end(), [](decltype(objects.front()) o)
-		{
-			return o.type_id().has() && o.type_id().get() == 1;
-		});
-
-		if (it == objects.end())
-		{
-			CMsgClientWelcome::SubscribedType null_object;
-			null_object.type_id().set(1);
-			cache.objects().add(null_object);
-		}
-	};
-
-	fix_null_inventory();
-
-	auto objects = cache.objects().get_all();
-	for (size_t i = 0; i < objects.size(); i++) {
-		auto object = objects[i];
-
-		if (!object.type_id().has())
-			continue;
-
-		switch (object.type_id().get())
-		{
-		case 1:  
-		{
-			if (true) 
-				object.object_data().clear();
-
-			int indexcount = 0;
-
-			for (int i = 0; i < g_Options.weapons.value->weaponzcount; i++)
-				if (g_Options.weapons.value->arr[i].active) {
-					indexcount++;
-					add_item(object, indexcount,
-						(ItemDefinitionIndex)g_Options.weapons.value->arr[i].modeldefindex,
-						g_Options.weapons.value->arr[i].quality,
-						g_Options.weapons.value->arr[i].rarity,
-						g_Options.weapons.value->arr[i].skinid,
-						g_Options.weapons.value->arr[i].seed,
-						g_Options.weapons.value->arr[i].wear,
-						g_Options.weapons.value->arr[i].nametag,
-						g_Options.weapons.value->arr[i].desctag,
-						g_Options.weapons.value->arr[i].stickers,
-						g_Options.weapons.value->arr[i].stattrak,
-						i);
-				}
-
-			cache.objects().set(object, i);
-		}
-		break;
-		}
-	}
-	msg.outofdate_subscribed_caches().set(cache);
-
-	return msg.serialize();
-}
-
-static bool inventory_changer_presend(void* pubData, uint32_t& cubData)
-{
-	CMsgAdjustItemEquippedState msg((void*)((DWORD)pubData + 8), cubData - 8);
-	if (msg.item_id().has() && (msg.new_class().get() == 0 || msg.new_slot().get() == 54))
-	{
-		auto ItemIndex = msg.item_id().get() - START_MUSICKIT_INDEX;
-
-		if (ItemIndex > 38 || ItemIndex < 3)
-			return true;
-
-		  msg.new_slot().get() == 0xFFFF ? 0 : ItemIndex - 2;
-
-		return false;
-	}
-	if (!msg.item_id().has() || !msg.new_class().get() || !msg.new_slot().get())
-		return true;
-
-	return false;
-}
-
-
-static void clear_equip_state(CMsgClientWelcome::SubscribedType& object)
-{
-	auto object_data = object.object_data().get_all();
-	for (size_t j = 0; j < object_data.size(); j++)
-	{
-		auto item = object_data[j];
-
-		if (!item.equipped_state().has())
-			continue;
-
-		auto null_equipped_state = make_equipped_state(0, 0);
-
-		auto equipped_state = item.equipped_state().get_all();
-		for (size_t k = 0; k < equipped_state.size(); k++)
-			item.equipped_state().set(null_equipped_state, k);
-
-		object.object_data().set(item, j);
-	}
-}
-
-
-static void add_item(CMsgClientWelcome::SubscribedType& object, int index, ItemDefinitionIndex itemIndex, int quality, int rarity, int paintKit, int seed, float wear, std::string name, std::string desc, sticker stickers[5], int stattrak, int flag)
-{
-	uint32_t steamid = iff.g_SteamUser->GetSteamID().GetAccountID();
-
-	CSOEconItem item;
-	item.id().set(START_ITEM_INDEX + itemIndex);
-	item.account_id().set(steamid);
-	if (flag == 5)
-		item.def_index().set(1314);
-	else item.def_index().set(itemIndex);
-	item.inventory().set(START_ITEM_INDEX + index);
-	item.origin().set(24);
-	item.quantity().set(1);
-	item.level().set(1);
-	item.style().set(0);
-	item.flags().set(0);
-	item.in_use().set(true);
-	item.original_id().set(0);
-	item.rarity().set(rarity);
-	item.quality().set(quality);
-
-	if (name.size() > 0)
-		item.custom_name().set(name);
-
-	if (desc.size() > 0) 
-		item.custom_desc().set(desc);
-
-	if (flag > 5) {
-		int avalTeam = GetAvailableClassID(itemIndex);
-		if (avalTeam == TEAM_SPECTATOR || avalTeam == TEAM_TERRORIST) {
-			item.equipped_state().add(make_equipped_state(TEAM_TERRORIST, GetSlotID(itemIndex)));
-		}
-		if (avalTeam == TEAM_SPECTATOR || avalTeam == TEAM_CT) {
-			item.equipped_state().add(make_equipped_state(TEAM_CT, GetSlotID(itemIndex)));
-		}
-	}
-
-	item.attribute().add(make_econ_item_attribute(6, float(paintKit)));
-	item.attribute().add(make_econ_item_attribute(7, float(seed)));
-	item.attribute().add(make_econ_item_attribute(8, float(wear)));
-
-
-	for (int j = 0; j < 5; j++)
-	{
-		item.attribute().add(make_econ_item_attribute(113 + 4 * j, stickers[j].stickerid ));   
-		item.attribute().add(make_econ_item_attribute(114 + 4 * j, stickers[j].wear));       
-		item.attribute().add(make_econ_item_attribute(115 + 4 * j, stickers[j].scale));          
-		item.attribute().add(make_econ_item_attribute(116 + 4 * j, stickers[j].rotation));          
-	}
-
-	if (stattrak != -1)
-	{
-		item.attribute().add(make_econ_item_attribute(80, stattrak)); 
-		item.attribute().add(make_econ_item_attribute(81, 0));
-	}
-
-	if (flag == 0)  
-	{
-		item.equipped_state().add(make_equipped_state(TEAM_TERRORIST, 0));
-		item.equipped_state().add(make_equipped_state(TEAM_CT, 0));
-	}
-
-	if (flag == 1)  
-	{
-		item.equipped_state().add(make_equipped_state(TEAM_TERRORIST, 41));
-		item.equipped_state().add(make_equipped_state(TEAM_CT, 41));
-	}
-
-	if (flag == 2)    
-		item.equipped_state().set(make_equipped_state(2, 38)); 
-
-	if (flag == 3)    
-		item.equipped_state().set(make_equipped_state(3, 38));
-
-
-	if (flag == 4)  
-		item.equipped_state().set(make_equipped_state(0, 55));
-
-
-	if (flag == 5) 
-	{
-		item.attribute().add(make_econ_item_attribute(166, itemIndex));    
-		item.inventory().set(START_MUSICKIT_INDEX + itemIndex);
-		item.id().set(START_MUSICKIT_INDEX + itemIndex);
-		item.equipped_state().set(make_equipped_state(0, 54)); 
-	}
-
-	object.object_data().add(item);
-}
-
-static int GetAvailableClassID(int definition_index)
-{
-	switch (definition_index)
-	{
-	case WEAPON_KNIFE_BAYONET:
-	case WEAPON_KNIFE_FLIP:
-	case WEAPON_KNIFE_GUT:
-	case WEAPON_KNIFE_KARAMBIT:
-	case WEAPON_KNIFE_M9_BAYONET:
-	case WEAPON_KNIFE_TACTICAL:
-	case WEAPON_KNIFE_FALCHION:
-	case WEAPON_KNIFE_SURVIVAL_BOWIE:
-	case WEAPON_KNIFE_BUTTERFLY:
-	case WEAPON_KNIFE_PUSH:
-	case WEAPON_ELITE:
-	case WEAPON_P250:
-	case WEAPON_CZ75A:
-	case WEAPON_DEAGLE:
-	case WEAPON_REVOLVER:
-	case WEAPON_MP7:
-	case WEAPON_UMP45:
-	case WEAPON_P90:
-	case WEAPON_BIZON:
-	case WEAPON_SSG08:
-	case WEAPON_AWP:
-	case WEAPON_NOVA:
-	case WEAPON_XM1014:
-	case WEAPON_M249:
-	case WEAPON_NEGEV:
-	case GLOVE_STUDDED_BLOODHOUND:
-	case GLOVE_SPORTY:
-	case GLOVE_SLICK:
-	case GLOVE_LEATHER_WRAP:
-	case GLOVE_MOTORCYCLE:
-	case GLOVE_SPECIALIST:
-		return TEAM_SPECTATOR;
-
-	case WEAPON_GLOCK:
-	case WEAPON_AK47:
-	case WEAPON_MAC10:
-	case WEAPON_G3SG1:
-	case WEAPON_TEC9:
-	case WEAPON_GALILAR:
-	case WEAPON_SG553:
-	case WEAPON_SAWEDOFF:
-	case WEAPON_C4:
-		return TEAM_TERRORIST;
-
-	case WEAPON_AUG:
-	case WEAPON_FAMAS:
-	case WEAPON_MAG7:
-	case WEAPON_FIVESEVEN:
-	case WEAPON_USP_SILENCER:
-	case WEAPON_HKP2000:
-	case WEAPON_MP9:
-	case WEAPON_M4A1_SILENCER:
-	case WEAPON_M4A1:
-	case WEAPON_SCAR20:
-		return TEAM_CT;
-
-	default:
-		return TEAM_UNASSIGNED;
-	}
-}
-
-static int GetSlotID(int definition_index)
-{
-	switch (definition_index)
-	{
-	case WEAPON_KNIFE_BAYONET:
-	case WEAPON_KNIFE_FLIP:
-	case WEAPON_KNIFE_GUT:
-	case WEAPON_KNIFE_KARAMBIT:
-	case WEAPON_KNIFE_M9_BAYONET:
-	case WEAPON_KNIFE_TACTICAL:
-	case WEAPON_KNIFE_FALCHION:
-	case WEAPON_KNIFE_SURVIVAL_BOWIE:
-	case WEAPON_KNIFE_BUTTERFLY:
-	case WEAPON_KNIFE_PUSH:
-		return 0;
-	case WEAPON_C4:
-		return 1;
-	case WEAPON_USP_SILENCER:
-	case WEAPON_HKP2000:
-	case WEAPON_GLOCK:
-		return 2;
-	case WEAPON_ELITE:
-		return 3;
-	case WEAPON_P250:
-		return 4;
-	case WEAPON_TEC9:
-	case WEAPON_CZ75A:
-	case WEAPON_FIVESEVEN:
-		return 5;
-	case WEAPON_DEAGLE:
-	case WEAPON_REVOLVER:
-		return 6;
-	case WEAPON_MP9:
-	case WEAPON_MAC10:
-		return 8;
-	case WEAPON_MP7:
-		return 9;
-	case WEAPON_UMP45:
-		return 10;
-	case WEAPON_P90:
-		return 11;
-	case WEAPON_BIZON:
-		return 12;
-	case WEAPON_FAMAS:
-	case WEAPON_GALILAR:
-		return 14;
-	case WEAPON_M4A1_SILENCER:
-	case WEAPON_M4A1:
-	case WEAPON_AK47:
-		return 15;
-	case WEAPON_SSG08:
-		return 16;
-	case WEAPON_SG553:
-	case WEAPON_AUG:
-		return 17;
-	case WEAPON_AWP:
-		return 18;
-	case WEAPON_G3SG1:
-	case WEAPON_SCAR20:
-		return 19;
-	case WEAPON_NOVA:
-		return 20;
-	case WEAPON_XM1014:
-		return 21;
-	case WEAPON_SAWEDOFF:
-	case WEAPON_MAG7:
-		return 22;
-	case WEAPON_M249:
-		return 23;
-	case WEAPON_NEGEV:
-		return 24;
-	case GLOVE_STUDDED_BLOODHOUND:
-	case GLOVE_SPORTY:
-	case GLOVE_SLICK:
-	case GLOVE_LEATHER_WRAP:
-	case GLOVE_MOTORCYCLE:
-	case GLOVE_SPECIALIST:
-		return 41;
-	default:
-		return -1;
-	}
-}
\ No newline at end of file
diff --git a/SpyCustom/ipredictionsystem.h b/SpyCustom/ipredictionsystem.h
deleted file mode 100644
index 1c8ff7f..0000000
--- a/SpyCustom/ipredictionsystem.h
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef IPREDICTIONSYSTEM_H
-#define IPREDICTIONSYSTEM_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "predictable_entity.h"
-
-class CBaseEntity;
-
-class IPredictionSystem
-{
-public:
-	IPredictionSystem()
-	{
-		m_pNextSystem = g_pPredictionSystems;
-		g_pPredictionSystems = this;
-
-		m_bSuppressEvent = false;
-		m_pSuppressHost = NULL;
-
-		m_nStatusPushed = 0;
-	};
-
-	virtual ~IPredictionSystem() {};
-
-	IPredictionSystem* GetNext()
-	{
-		return m_pNextSystem;
-	}
-
-	void SetSuppressEvent(bool state)
-	{
-		m_bSuppressEvent = state;
-	}
-
-	void SetSuppressHost(CBaseEntity* host)
-	{
-		m_pSuppressHost = host;
-	}
-
-	CBaseEntity const* GetSuppressHost(void)
-	{
-		if (DisableFiltering())
-		{
-			return NULL;
-		}
-
-		return m_pSuppressHost;
-	}
-
-	bool CanPredict(void) const
-	{
-		if (DisableFiltering())
-		{
-			return false;
-		}
-
-		return !m_bSuppressEvent;
-	}
-
-	static IPredictionSystem* g_pPredictionSystems;
-
-	static void SuppressEvents(bool state)
-	{
-		IPredictionSystem* sys = g_pPredictionSystems;
-		while (sys)
-		{
-			sys->SetSuppressEvent(state);
-			sys = sys->GetNext();
-		}
-	}
-
-	static void SuppressHostEvents(CBaseEntity* host)
-	{
-		IPredictionSystem* sys = g_pPredictionSystems;
-		while (sys)
-		{
-			sys->SetSuppressHost(host);
-			sys = sys->GetNext();
-		}
-	}
-
-private:
-
-	static void Push(void)
-	{
-		IPredictionSystem* sys = g_pPredictionSystems;
-		while (sys)
-		{
-			sys->_Push();
-			sys = sys->GetNext();
-		}
-	}
-
-	static void Pop(void)
-	{
-		IPredictionSystem* sys = g_pPredictionSystems;
-		while (sys)
-		{
-			sys->_Pop();
-			sys = sys->GetNext();
-		}
-	}
-
-	void _Push(void)
-	{
-		++m_nStatusPushed;
-	}
-	void _Pop(void)
-	{
-		--m_nStatusPushed;
-	}
-
-	bool DisableFiltering(void) const
-	{
-		return (m_nStatusPushed > 0) ? true : false;
-	}
-
-	IPredictionSystem* m_pNextSystem;
-	bool				m_bSuppressEvent;
-	CBaseEntity* m_pSuppressHost;
-
-	int					m_nStatusPushed;
-
-	friend class CDisablePredictionFiltering;
-};
-
-class CDisablePredictionFiltering
-{
-public:
-	CDisablePredictionFiltering(bool disable = true)
-	{
-		m_bDisabled = disable;
-		if (m_bDisabled)
-		{
-			IPredictionSystem::Push();
-		}
-	}
-
-	~CDisablePredictionFiltering(void)
-	{
-		if (m_bDisabled)
-		{
-			IPredictionSystem::Pop();
-		}
-	}
-private:
-	bool	m_bDisabled;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/irecipientfilter.h b/SpyCustom/irecipientfilter.h
deleted file mode 100644
index 59b5b6e..0000000
--- a/SpyCustom/irecipientfilter.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose: 
-//
-// $NoKeywords: $
-//=============================================================================//
-
-#ifndef IRECIPIENTFILTER_H
-#define IRECIPIENTFILTER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-//-----------------------------------------------------------------------------
-// Purpose: Generic interface for routing messages to users
-//-----------------------------------------------------------------------------
-class IRecipientFilter
-{
-public:
-	virtual			~IRecipientFilter() {}
-
-	virtual bool	IsReliable(void) const = 0;
-	virtual bool	IsInitMessage(void) const = 0;
-
-	virtual int		GetRecipientCount(void) const = 0;
-	virtual int		GetRecipientIndex(int slot) const = 0;
-};
-
-#endif // IRECIPIENTFILTER_H
\ No newline at end of file
diff --git a/SpyCustom/iscenetokenprocessor.h b/SpyCustom/iscenetokenprocessor.h
deleted file mode 100644
index 7b7ed20..0000000
--- a/SpyCustom/iscenetokenprocessor.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef ISCENETOKENPROCESSOR_H
-#define ISCENETOKENPROCESSOR_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class ISceneTokenProcessor
-{
-public:
-	virtual const char* CurrentToken(void) = 0;
-	virtual bool		GetToken(bool crossline) = 0;
-	virtual bool		TokenAvailable(void) = 0;
-	virtual void		Error(PRINTF_FORMAT_STRING const char* fmt, ...) = 0;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iserverentity.h b/SpyCustom/iserverentity.h
deleted file mode 100644
index 44661e9..0000000
--- a/SpyCustom/iserverentity.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef ISERVERENTITY_H
-#define ISERVERENTITY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "iserverunknown.h"
-#include "string_t.h"
-
-
-
-struct Ray_t;
-class ServerClass;
-class ICollideable;
-class IServerNetworkable;
-class Vector;
-class QAngle;
-
-class IServerEntity : public IServerUnknown
-{
-public:
-	virtual					~IServerEntity() {}
-
-	virtual int				GetModelIndex(void) const = 0;
-	virtual string_t		GetModelName(void) const = 0;
-
-	virtual void			SetModelIndex(int index) = 0;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iservernetworkable.h b/SpyCustom/iservernetworkable.h
deleted file mode 100644
index 6742005..0000000
--- a/SpyCustom/iservernetworkable.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef ISERVERNETWORKABLE_H
-#define ISERVERNETWORKABLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "ihandleentity.h"
-#include "basetypes.h"
-#include "bitvec.h"
-#include "const.h"
-#include "bspfile.h"
-
-
-
-#define	MAX_FAST_ENT_CLUSTERS	4
-#define	MAX_ENT_CLUSTERS	64
-#define MAX_WORLD_AREAS		8
-
-
-class ServerClass;
-class SendTable;
-struct edict_t;
-class CBaseEntity;
-class CSerialEntity;
-class CBaseNetworkable;
-
-
-class CCheckTransmitInfo
-{
-public:
-	edict_t* m_pClientEnt;	    
-	byte	m_PVS[PAD_NUMBER(MAX_MAP_CLUSTERS, 8) / 8];
-	int		m_nPVSSize;		    
-
-	CBitVec<MAX_EDICTS>* m_pTransmitEdict;	       
-	CBitVec<MAX_EDICTS>* m_pTransmitAlways;               
-
-	int 	m_AreasNetworked;      
-	int		m_Areas[MAX_WORLD_AREAS];   
-
-	byte	m_AreaFloodNums[MAX_MAP_AREAS];
-	int		m_nMapAreas;
-};
-
-struct PVSInfo_t
-{
-	short		m_nHeadNode;
-
-	short		m_nClusterCount;
-
-	unsigned short* m_pClusters;
-
-	short		m_nAreaNum;
-	short		m_nAreaNum2;
-
-	float		m_vCenter[3];
-
-private:
-	unsigned short m_pClustersInline[MAX_FAST_ENT_CLUSTERS];
-
-	friend class CVEngineServer;
-};
-
-
-class IServerNetworkable
-{
-public:
-	virtual IHandleEntity* GetEntityHandle() = 0;
-
-	virtual ServerClass* GetServerClass() = 0;
-
-	virtual edict_t* GetEdict() const = 0;
-
-	virtual const char* GetClassName() const = 0;
-	virtual void			Release() = 0;
-
-	virtual int				AreaNum() const = 0;
-
-	virtual CBaseNetworkable* GetBaseNetworkable() = 0;
-	virtual CBaseEntity* GetBaseEntity() = 0;      
-	virtual PVSInfo_t* GetPVSInfo() = 0;     
-
-protected:
-	virtual					~IServerNetworkable() {}
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iserverplugin.h b/SpyCustom/iserverplugin.h
deleted file mode 100644
index 652fb15..0000000
--- a/SpyCustom/iserverplugin.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef ISERVERPLUGIN_H
-#define ISERVERPLUGIN_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "edict.h"
-#include "interface.h"
-#include "KeyValues.h"
-
-class CCommand;
-
-typedef enum
-{
-	PLUGIN_CONTINUE = 0,   
-	PLUGIN_OVERRIDE,            
-	PLUGIN_STOP,         
-} PLUGIN_RESULT;
-
-
-typedef enum
-{
-	eQueryCvarValueStatus_ValueIntact = 0,	     
-	eQueryCvarValueStatus_CvarNotFound = 1,
-	eQueryCvarValueStatus_NotACvar = 2,		        
-	eQueryCvarValueStatus_CvarProtected = 3	                
-} EQueryCvarValueStatus;
-
-
-typedef int QueryCvarCookie_t;
-#define InvalidQueryCvarCookie -1
-
-
-#define INTERFACEVERSION_ISERVERPLUGINCALLBACKS_VERSION_1	"ISERVERPLUGINCALLBACKS001"
-#define INTERFACEVERSION_ISERVERPLUGINCALLBACKS_VERSION_2	"ISERVERPLUGINCALLBACKS002"
-#define INTERFACEVERSION_ISERVERPLUGINCALLBACKS				"ISERVERPLUGINCALLBACKS003"
-
-abstract_class IServerPluginCallbacks
-{
-public:
-	virtual bool			Load(CreateInterfaceFn interfaceFactory, CreateInterfaceFn gameServerFactory) = 0;
-
-	virtual void			Unload(void) = 0;
-
-	virtual void			Pause(void) = 0;
-
-	virtual void			UnPause(void) = 0;
-
-	virtual const char* GetPluginDescription(void) = 0;
-
-	virtual void			LevelInit(char const* pMapName) = 0;
-
-	virtual void			ServerActivate(edict_t* pEdictList, int edictCount, int clientMax) = 0;
-
-	virtual void			GameFrame(bool simulating) = 0;
-
-	virtual void			LevelShutdown(void) = 0;
-
-	virtual void			ClientActive(edict_t* pEntity) = 0;
-
-	virtual void			ClientDisconnect(edict_t* pEntity) = 0;
-
-	virtual void			ClientPutInServer(edict_t* pEntity, char const* playername) = 0;
-
-	virtual void			SetCommandClient(int index) = 0;
-
-	virtual void			ClientSettingsChanged(edict_t* pEdict) = 0;
-
-	virtual PLUGIN_RESULT	ClientConnect(bool* bAllowConnect, edict_t* pEntity, const char* pszName, const char* pszAddress, char* reject, int maxrejectlen) = 0;
-
-	virtual PLUGIN_RESULT	ClientCommand(edict_t* pEntity, const CCommand& args) = 0;
-
-	virtual PLUGIN_RESULT	NetworkIDValidated(const char* pszUserName, const char* pszNetworkID) = 0;
-
-	virtual void			OnQueryCvarValueFinished(QueryCvarCookie_t iCookie, edict_t* pPlayerEntity, EQueryCvarValueStatus eStatus, const char* pCvarName, const char* pCvarValue) = 0;
-
-	virtual void			OnEdictAllocated(edict_t* edict) = 0;
-	virtual void			OnEdictFreed(const edict_t* edict) = 0;
-};
-
-#define INTERFACEVERSION_ISERVERPLUGINHELPERS			"ISERVERPLUGINHELPERS001"
-
-
-typedef enum
-{
-	DIALOG_MSG = 0,		     
-	DIALOG_MENU,		   
-	DIALOG_TEXT,		   
-	DIALOG_ENTRY,		   
-	DIALOG_ASKCONNECT	                  
-} DIALOG_TYPE;
-
-abstract_class IServerPluginHelpers
-{
-public:
-	virtual void CreateMessage(edict_t * pEntity, DIALOG_TYPE type, KeyValues * data, IServerPluginCallbacks * plugin) = 0;
-	virtual void ClientCommand(edict_t* pEntity, const char* cmd) = 0;
-
-	virtual QueryCvarCookie_t StartQueryCvarValue(edict_t* pEntity, const char* pName) = 0;
-};
-
-#endif 
\ No newline at end of file
diff --git a/SpyCustom/iserverunknown.h b/SpyCustom/iserverunknown.h
deleted file mode 100644
index 9c0bf4f..0000000
--- a/SpyCustom/iserverunknown.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef ISERVERUNKNOWN_H
-#define ISERVERUNKNOWN_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "ihandleentity.h"
-
-class ICollideable;
-class IServerNetworkable;
-class CBaseEntity;
-
-
-class IServerUnknown : public IHandleEntity
-{
-public:
-	virtual ICollideable* GetCollideable() = 0;
-	virtual IServerNetworkable* GetNetworkable() = 0;
-	virtual CBaseEntity* GetBaseEntity() = 0;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ishadowmgr.h b/SpyCustom/ishadowmgr.h
deleted file mode 100644
index b0ccdf7..0000000
--- a/SpyCustom/ishadowmgr.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#ifndef ISHADOWMGR_H
-#define ISHADOWMGR_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "vmatrix.h"
-
-
-class IMaterial;
-class Vector;
-class Vector2D;
-struct model_t;
-typedef unsigned short ModelInstanceHandle_t;
-class IClientRenderable;
-class ITexture;
-
-#define ENGINE_SHADOWMGR_INTERFACE_VERSION	"VEngineShadowMgr002"
-
-
-enum ShadowFlags_t
-{
-	SHADOW_FLAGS_FLASHLIGHT = (1 << 0),
-	SHADOW_FLAGS_SHADOW = (1 << 1),
-	SHADOW_FLAGS_LAST_FLAG = SHADOW_FLAGS_SHADOW
-};
-
-#define SHADOW_FLAGS_PROJECTED_TEXTURE_TYPE_MASK ( SHADOW_FLAGS_FLASHLIGHT | SHADOW_FLAGS_SHADOW )
-
-
-
-typedef unsigned short ShadowHandle_t;
-
-enum
-{
-	SHADOW_HANDLE_INVALID = (ShadowHandle_t)~0
-};
-
-
-enum ShadowCreateFlags_t
-{
-	SHADOW_CACHE_VERTS = (1 << 0),
-	SHADOW_FLASHLIGHT = (1 << 1),
-
-	SHADOW_LAST_FLAG = SHADOW_FLASHLIGHT,
-};
-
-
-struct ShadowInfo_t
-{
-	VMatrix		m_WorldToShadow;
-
-	float			m_FalloffOffset;
-	float			m_MaxDist;
-	float			m_FalloffAmount;	       
-	Vector2D		m_TexOrigin;
-	Vector2D		m_TexSize;
-	unsigned char	m_FalloffBias;
-};
-
-struct FlashlightState_t;
-
-abstract_class IShadowMgr
-{
-public:
-	virtual ShadowHandle_t CreateShadow(IMaterial * pMaterial, IMaterial * pModelMaterial, void* pBindProxy, int creationFlags) = 0;
-	virtual void DestroyShadow(ShadowHandle_t handle) = 0;
-
-	virtual void SetShadowMaterial(ShadowHandle_t handle, IMaterial* pMaterial, IMaterial* pModelMaterial, void* pBindProxy) = 0;
-
-	virtual void ProjectShadow(ShadowHandle_t handle, const Vector& origin,
-		const Vector& projectionDir, const VMatrix& worldToShadow, const Vector2D& size,
-		int nLeafCount, const int* pLeafList,
-		float maxHeight, float falloffOffset, float falloffAmount, const Vector& vecCasterOrigin) = 0;
-
-	virtual void ProjectFlashlight(ShadowHandle_t handle, const VMatrix& worldToShadow, int nLeafCount, const int* pLeafList) = 0;
-
-	virtual const ShadowInfo_t& GetInfo(ShadowHandle_t handle) = 0;
-
-	virtual const Frustum_t& GetFlashlightFrustum(ShadowHandle_t handle) = 0;
-
-	virtual void AddShadowToBrushModel(ShadowHandle_t handle,
-		model_t* pModel, const Vector& origin, const QAngle& angles) = 0;
-
-	virtual void RemoveAllShadowsFromBrushModel(model_t* pModel) = 0;
-
-	virtual void SetShadowTexCoord(ShadowHandle_t handle, float x, float y, float w, float h) = 0;
-
-	virtual void AddShadowToModel(ShadowHandle_t shadow, ModelInstanceHandle_t instance) = 0;
-	virtual void RemoveAllShadowsFromModel(ModelInstanceHandle_t instance) = 0;
-
-	virtual void ClearExtraClipPlanes(ShadowHandle_t shadow) = 0;
-	virtual void AddExtraClipPlane(ShadowHandle_t shadow, const Vector& normal, float dist) = 0;
-
-	virtual void EnableShadow(ShadowHandle_t shadow, bool bEnable) = 0;
-
-	virtual void SetFalloffBias(ShadowHandle_t shadow, unsigned char ucBias) = 0;
-
-	virtual void UpdateFlashlightState(ShadowHandle_t shadowHandle, const FlashlightState_t& lightState) = 0;
-
-	virtual void DrawFlashlightDepthTexture() = 0;
-
-	virtual void AddFlashlightRenderable(ShadowHandle_t shadow, IClientRenderable* pRenderable) = 0;
-	virtual ShadowHandle_t CreateShadowEx(IMaterial* pMaterial, IMaterial* pModelMaterial, void* pBindProxy, int creationFlags) = 0;
-
-	virtual void SetFlashlightDepthTexture(ShadowHandle_t shadowHandle, ITexture* pFlashlightDepthTexture, unsigned char ucShadowStencilBit) = 0;
-
-	virtual const FlashlightState_t& GetFlashlightState(ShadowHandle_t handle) = 0;
-
-	virtual void SetFlashlightRenderState(ShadowHandle_t handle) = 0;
-};
-
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/ispatialpartition.h b/SpyCustom/ispatialpartition.h
deleted file mode 100644
index 0d4cd56..0000000
--- a/SpyCustom/ispatialpartition.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#ifndef ISPATIALPARTITION_H
-#define ISPATIALPARTITION_H
-
-#include "interface.h"
-
-class Vector;
-struct Ray_t;
-class IHandleEntity;
-
-
-#define INTERFACEVERSION_SPATIALPARTITION	"SpatialPartition001"
-
-enum
-{
-	PARTITION_ENGINE_SOLID_EDICTS = (1 << 0),		          
-	PARTITION_ENGINE_TRIGGER_EDICTS = (1 << 1),		     
-	PARTITION_CLIENT_SOLID_EDICTS = (1 << 2),
-	PARTITION_CLIENT_RESPONSIVE_EDICTS = (1 << 3),		           
-	PARTITION_ENGINE_NON_STATIC_EDICTS = (1 << 4),		           
-	PARTITION_CLIENT_STATIC_PROPS = (1 << 5),
-	PARTITION_ENGINE_STATIC_PROPS = (1 << 6),
-	PARTITION_CLIENT_NON_STATIC_EDICTS = (1 << 7),		     
-};
-
-#define PARTITION_ALL_CLIENT_EDICTS	(		\
-	PARTITION_CLIENT_NON_STATIC_EDICTS |	\
-	PARTITION_CLIENT_STATIC_PROPS |			\
-	PARTITION_CLIENT_RESPONSIVE_EDICTS |	\
-	PARTITION_CLIENT_SOLID_EDICTS			\
-	)
-
-
-#define PARTITION_CLIENT_GAME_EDICTS (PARTITION_ALL_CLIENT_EDICTS & ~PARTITION_CLIENT_STATIC_PROPS)
-#define PARTITION_SERVER_GAME_EDICTS (PARTITION_ENGINE_SOLID_EDICTS|PARTITION_ENGINE_TRIGGER_EDICTS|PARTITION_ENGINE_NON_STATIC_EDICTS)
-
-enum IterationRetval_t
-{
-	ITERATION_CONTINUE = 0,
-	ITERATION_STOP,
-};
-
-
-typedef unsigned short SpatialPartitionHandle_t;
-
-typedef int SpatialPartitionListMask_t;
-
-typedef int SpatialTempHandle_t;
-
-
-class IPartitionEnumerator
-{
-public:
-	virtual IterationRetval_t EnumElement(IHandleEntity* pHandleEntity) = 0;
-};
-
-
-class IPartitionQueryCallback
-{
-public:
-	virtual void OnPreQuery_V1() = 0;
-	virtual void OnPreQuery(SpatialPartitionListMask_t listMask) = 0;
-	virtual void OnPostQuery(SpatialPartitionListMask_t listMask) = 0;
-};
-
-
-enum
-{
-	PARTITION_INVALID_HANDLE = (SpatialPartitionHandle_t)~0
-};
-
-
-abstract_class ISpatialPartition
-{
-public:
-	virtual ~ISpatialPartition() {}
-
-	virtual SpatialPartitionHandle_t CreateHandle(IHandleEntity * pHandleEntity) = 0;
-
-	virtual SpatialPartitionHandle_t CreateHandle(IHandleEntity* pHandleEntity,
-		SpatialPartitionListMask_t listMask, const Vector& mins, const Vector& maxs) = 0;
-
-	virtual void DestroyHandle(SpatialPartitionHandle_t handle) = 0;
-
-	virtual void Insert(SpatialPartitionListMask_t listMask,
-		SpatialPartitionHandle_t handle) = 0;
-	virtual void Remove(SpatialPartitionListMask_t listMask,
-		SpatialPartitionHandle_t handle) = 0;
-
-	virtual void RemoveAndInsert(SpatialPartitionListMask_t removeMask, SpatialPartitionListMask_t insertMask,
-		SpatialPartitionHandle_t handle) = 0;
-
-	virtual void Remove(SpatialPartitionHandle_t handle) = 0;
-
-	virtual void ElementMoved(SpatialPartitionHandle_t handle,
-		const Vector& mins, const Vector& maxs) = 0;
-
-	virtual SpatialTempHandle_t HideElement(SpatialPartitionHandle_t handle) = 0;
-	virtual void UnhideElement(SpatialPartitionHandle_t handle, SpatialTempHandle_t tempHandle) = 0;
-
-	virtual void InstallQueryCallback_V1(IPartitionQueryCallback* pCallback) = 0;
-	virtual void RemoveQueryCallback(IPartitionQueryCallback* pCallback) = 0;
-
-	virtual void EnumerateElementsInBox(
-		SpatialPartitionListMask_t listMask,
-		const Vector& mins,
-		const Vector& maxs,
-		bool coarseTest,
-		IPartitionEnumerator* pIterator
-		) = 0;
-
-	virtual void EnumerateElementsInSphere(
-		SpatialPartitionListMask_t listMask,
-		const Vector& origin,
-		float radius,
-		bool coarseTest,
-		IPartitionEnumerator* pIterator
-		) = 0;
-
-	virtual void EnumerateElementsAlongRay(
-		SpatialPartitionListMask_t listMask,
-		const Ray_t& ray,
-		bool coarseTest,
-		IPartitionEnumerator* pIterator
-		) = 0;
-
-	virtual void EnumerateElementsAtPoint(
-		SpatialPartitionListMask_t listMask,
-		const Vector& pt,
-		bool coarseTest,
-		IPartitionEnumerator* pIterator
-		) = 0;
-
-	virtual void SuppressLists(SpatialPartitionListMask_t nListMask, bool bSuppress) = 0;
-	virtual SpatialPartitionListMask_t GetSuppressedLists() = 0;
-
-	virtual void RenderAllObjectsInTree(float flTime) = 0;
-	virtual void RenderObjectsInPlayerLeafs(const Vector& vecPlayerMin, const Vector& vecPlayerMax, float flTime) = 0;
-	virtual void RenderLeafsForRayTraceStart(float flTime) = 0;
-	virtual void RenderLeafsForRayTraceEnd(void) = 0;
-	virtual void RenderLeafsForHullTraceStart(float flTime) = 0;
-	virtual void RenderLeafsForHullTraceEnd(void) = 0;
-	virtual void RenderLeafsForBoxStart(float flTime) = 0;
-	virtual void RenderLeafsForBoxEnd(void) = 0;
-	virtual void RenderLeafsForSphereStart(float flTime) = 0;
-	virtual void RenderLeafsForSphereEnd(void) = 0;
-
-	virtual void RenderObjectsInBox(const Vector& vecMin, const Vector& vecMax, float flTime) = 0;
-	virtual void RenderObjectsInSphere(const Vector& vecCenter, float flRadius, float flTime) = 0;
-	virtual void RenderObjectsAlongRay(const Ray_t& ray, float flTime) = 0;
-
-	virtual void ReportStats(const char* pFileName) = 0;
-
-	virtual void InstallQueryCallback(IPartitionQueryCallback* pCallback) = 0;
-};
-
-#endif
-
diff --git a/SpyCustom/istudiorender.h b/SpyCustom/istudiorender.h
deleted file mode 100644
index 134fef6..0000000
--- a/SpyCustom/istudiorender.h
+++ /dev/null
@@ -1,290 +0,0 @@
-#ifndef ISTUDIORENDER_H
-#define ISTUDIORENDER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "vector.h"
-#include "vector4d.h"
-#include "utlbuffer.h"
-#include "utlvector.h"
-#include "imaterial.h"
-#include "imaterialsystem.h"
-#include "IAppSystem.h"
-#include "imdlcache.h"
-#include "studio.h"
-
-
-struct studiohdr_t;
-struct studiomeshdata_t;
-class Vector;
-struct LightDesc_t;
-class IMaterial;
-struct studiohwdata_t;
-struct Ray_t;
-class Vector4D;
-class IMaterialSystem;
-struct matrix3x4_t;
-class IMesh;
-struct vertexFileHeader_t;
-struct FlashlightState_t;
-class VMatrix;
-namespace OptimizedModel { struct FileHeader_t; }
-class IPooledVBAllocator;
-
-typedef void (*StudioRender_Printf_t)(PRINTF_FORMAT_STRING const char* fmt, ...);
-
-struct StudioRenderConfig_t
-{
-	float fEyeShiftX;	   
-	float fEyeShiftY;	   
-	float fEyeShiftZ;	   
-	float fEyeSize;		    
-	float fEyeGlintPixelWidthLODThreshold;
-
-	int maxDecalsPerModel;
-	int drawEntities;
-	int skin;
-	int fullbright;
-
-	bool bEyeMove : 1;		  
-	bool bSoftwareSkin : 1;
-	bool bNoHardware : 1;
-	bool bNoSoftware : 1;
-	bool bTeeth : 1;
-	bool bEyes : 1;
-	bool bFlex : 1;
-	bool bWireframe : 1;
-	bool bDrawNormals : 1;
-	bool bDrawTangentFrame : 1;
-	bool bDrawZBufferedWireframe : 1;
-	bool bSoftwareLighting : 1;
-	bool bShowEnvCubemapOnly : 1;
-	bool bWireframeDecals : 1;
-
-	int m_nReserved[4];
-};
-
-
-
-DECLARE_POINTER_HANDLE(StudioDecalHandle_t);
-#define STUDIORENDER_DECAL_INVALID  ( (StudioDecalHandle_t)0 )
-
-enum
-{
-	ADDDECAL_TO_ALL_LODS = -1
-};
-
-
-enum
-{
-	STUDIORENDER_DRAW_ENTIRE_MODEL = 0,
-	STUDIORENDER_DRAW_OPAQUE_ONLY = 0x01,
-	STUDIORENDER_DRAW_TRANSLUCENT_ONLY = 0x02,
-	STUDIORENDER_DRAW_GROUP_MASK = 0x03,
-
-	STUDIORENDER_DRAW_NO_FLEXES = 0x04,
-	STUDIORENDER_DRAW_STATIC_LIGHTING = 0x08,
-
-	STUDIORENDER_DRAW_ACCURATETIME = 0x10,		       
-	STUDIORENDER_DRAW_NO_SHADOWS = 0x20,
-	STUDIORENDER_DRAW_GET_PERF_STATS = 0x40,
-
-	STUDIORENDER_DRAW_WIREFRAME = 0x80,
-
-	STUDIORENDER_DRAW_ITEM_BLINK = 0x100,
-
-	STUDIORENDER_SHADOWDEPTHTEXTURE = 0x200,
-
-	STUDIORENDER_SSAODEPTHTEXTURE = 0x1000,
-
-	STUDIORENDER_GENERATE_STATS = 0x8000,
-};
-
-
-#define VERTEX_TEXCOORD0_2D ( ( (uint64) 2 ) << ( TEX_COORD_SIZE_BIT + ( 3*0 ) ) )
-enum MaterialVertexFormat_t
-{
-	MATERIAL_VERTEX_FORMAT_MODEL_SKINNED = (VertexFormat_t)VERTEX_POSITION | VERTEX_COLOR | VERTEX_NORMAL | VERTEX_TEXCOORD0_2D | VERTEX_BONEWEIGHT(2) | VERTEX_BONE_INDEX | VERTEX_USERDATA_SIZE(4),
-	MATERIAL_VERTEX_FORMAT_MODEL_SKINNED_DX7 = (VertexFormat_t)VERTEX_POSITION | VERTEX_COLOR | VERTEX_NORMAL | VERTEX_TEXCOORD0_2D | VERTEX_BONEWEIGHT(2) | VERTEX_BONE_INDEX,
-	MATERIAL_VERTEX_FORMAT_MODEL = (VertexFormat_t)VERTEX_POSITION | VERTEX_COLOR | VERTEX_NORMAL | VERTEX_TEXCOORD0_2D | VERTEX_USERDATA_SIZE(4),
-	MATERIAL_VERTEX_FORMAT_MODEL_DX7 = (VertexFormat_t)VERTEX_POSITION | VERTEX_COLOR | VERTEX_NORMAL | VERTEX_TEXCOORD0_2D,
-	MATERIAL_VERTEX_FORMAT_COLOR = (VertexFormat_t)VERTEX_SPECULAR
-};
-
-
-enum OverrideType_t
-{
-	OVERRIDE_NORMAL = 0,
-	OVERRIDE_BUILD_SHADOWS,
-	OVERRIDE_DEPTH_WRITE,
-	OVERRIDE_SSAO_DEPTH_WRITE,
-};
-
-
-enum
-{
-	USESHADOWLOD = -2,
-};
-
-#define MAX_DRAW_MODEL_INFO_MATERIALS 8
-
-struct DrawModelResults_t
-{
-	int m_ActualTriCount;
-	int m_TextureMemoryBytes;
-	int m_NumHardwareBones;
-	int m_NumBatches;
-	int m_NumMaterials;
-	int m_nLODUsed;
-	int m_flLODMetric;
-	CFastTimer m_RenderTime;
-	CUtlVectorFixed<IMaterial*, MAX_DRAW_MODEL_INFO_MATERIALS> m_Materials;
-};
-
-struct ColorMeshInfo_t
-{
-	IMesh* m_pMesh;
-	IPooledVBAllocator* m_pPooledVBAllocator;
-	int						m_nVertOffsetInBytes;
-	int						m_nNumVerts;
-};
-
-struct DrawModelInfo_t
-{
-	studiohdr_t* m_pStudioHdr;
-	studiohwdata_t* m_pHardwareData;
-	StudioDecalHandle_t m_Decals;
-	int				m_Skin;
-	int				m_Body;
-	int				m_HitboxSet;
-	void* m_pClientEntity;
-	int				m_Lod;
-	ColorMeshInfo_t* m_pColorMeshes;
-	bool			m_bStaticLighting;
-	Vector			m_vecAmbientCube[6];		       
-	int				m_nLocalLightCount;
-	LightDesc_t		m_LocalLightDescs[4];
-};
-
-struct GetTriangles_Vertex_t
-{
-	Vector m_Position;
-	Vector m_Normal;
-	Vector4D m_TangentS;
-	Vector2D m_TexCoord;
-	Vector4D m_BoneWeight;
-	int m_BoneIndex[4];
-	int m_NumBones;
-};
-
-struct GetTriangles_MaterialBatch_t
-{
-	IMaterial* m_pMaterial;
-	CUtlVector<GetTriangles_Vertex_t> m_Verts;
-	CUtlVector<int> m_TriListIndices;
-};
-
-struct GetTriangles_Output_t
-{
-	CUtlVector<GetTriangles_MaterialBatch_t> m_MaterialBatches;
-	matrix3x4_t m_PoseToWorld[MAXSTUDIOBONES];
-};
-
-
-struct model_array_instance_t
-{
-	matrix3x4_t		modelToWorld;
-
-};
-
-#define STUDIO_DATA_CACHE_INTERFACE_VERSION "VStudioDataCache005"
-
-abstract_class IStudioDataCache : public IAppSystem
-{
-public:
-	virtual bool VerifyHeaders(studiohdr_t * pStudioHdr) = 0;
-	virtual vertexFileHeader_t* CacheVertexData(studiohdr_t* pStudioHdr) = 0;
-};
-
-
-#define STUDIO_RENDER_INTERFACE_VERSION "VStudioRender025"
-
-abstract_class IStudioRender : public IAppSystem
-{
-public:
-	virtual void BeginFrame(void) = 0;
-	virtual void EndFrame(void) = 0;
-
-	virtual void Mat_Stub(IMaterialSystem* pMatSys) = 0;
-
-	virtual void UpdateConfig(const StudioRenderConfig_t& config) = 0;
-	virtual void GetCurrentConfig(StudioRenderConfig_t& config) = 0;
-
-	virtual bool LoadModel(studiohdr_t* pStudioHdr, void* pVtxData, studiohwdata_t* pHardwareData) = 0;
-	virtual void UnloadModel(studiohwdata_t* pHardwareData) = 0;
-
-	virtual void RefreshStudioHdr(studiohdr_t* pStudioHdr, studiohwdata_t* pHardwareData) = 0;
-
-	virtual void SetEyeViewTarget(const studiohdr_t* pStudioHdr, int nBodyIndex, const Vector& worldPosition) = 0;
-
-	virtual int GetNumAmbientLightSamples() = 0;
-	virtual const Vector* GetAmbientLightDirections() = 0;
-	virtual void SetAmbientLightColors(const Vector4D* pAmbientOnlyColors) = 0;
-	virtual void SetAmbientLightColors(const Vector* pAmbientOnlyColors) = 0;
-	virtual void SetLocalLights(int numLights, const LightDesc_t* pLights) = 0;
-
-	virtual void SetViewState(const Vector& viewOrigin, const Vector& viewRight,
-		const Vector& viewUp, const Vector& viewPlaneNormal) = 0;
-
-	virtual void LockFlexWeights(int nWeightCount, float** ppFlexWeights, float** ppFlexDelayedWeights = NULL) = 0;
-	virtual void UnlockFlexWeights() = 0;
-
-	virtual matrix3x4_t* LockBoneMatrices(int nBoneCount) = 0;
-	virtual void UnlockBoneMatrices() = 0;
-
-	virtual int GetNumLODs(const studiohwdata_t& hardwareData) const = 0;
-	virtual float GetLODSwitchValue(const studiohwdata_t& hardwareData, int lod) const = 0;
-	virtual void SetLODSwitchValue(studiohwdata_t& hardwareData, int lod, float switchValue) = 0;
-
-	virtual void SetColorModulation(float const* pColor) = 0;
-	virtual void SetAlphaModulation(float flAlpha) = 0;
-
-	virtual void DrawModel(DrawModelResults_t* pResults, const DrawModelInfo_t& info,
-		matrix3x4_t* pBoneToWorld, float* pFlexWeights, float* pFlexDelayedWeights, const Vector& modelOrigin, int flags = STUDIORENDER_DRAW_ENTIRE_MODEL) = 0;
-
-	virtual void DrawModelStaticProp(const DrawModelInfo_t& drawInfo, const matrix3x4_t& modelToWorld, int flags = STUDIORENDER_DRAW_ENTIRE_MODEL) = 0;
-	virtual void DrawStaticPropDecals(const DrawModelInfo_t& drawInfo, const matrix3x4_t& modelToWorld) = 0;
-	virtual void DrawStaticPropShadows(const DrawModelInfo_t& drawInfo, const matrix3x4_t& modelToWorld, int flags) = 0;
-
-	virtual void ForcedMaterialOverride(IMaterial* newMaterial, OverrideType_t nOverrideType = OVERRIDE_NORMAL) = 0;
-
-	virtual StudioDecalHandle_t CreateDecalList(studiohwdata_t* pHardwareData) = 0;
-	virtual void DestroyDecalList(StudioDecalHandle_t handle) = 0;
-
-	virtual void AddDecal(StudioDecalHandle_t handle, studiohdr_t* pStudioHdr, matrix3x4_t* pBoneToWorld,
-		const Ray_t& ray, const Vector& decalUp, IMaterial* pDecalMaterial, float radius, int body, bool noPokethru = false, int maxLODToDecal = ADDDECAL_TO_ALL_LODS) = 0;
-
-	virtual void ComputeLighting(const Vector* pAmbient, int lightCount,
-		LightDesc_t* pLights, const Vector& pt, const Vector& normal, Vector& lighting) = 0;
-
-	virtual void ComputeLightingConstDirectional(const Vector* pAmbient, int lightCount,
-		LightDesc_t* pLights, const Vector& pt, const Vector& normal, Vector& lighting, float flDirectionalAmount) = 0;
-
-	virtual void AddShadow(IMaterial* pMaterial, void* pProxyData, FlashlightState_t* m_pFlashlightState = NULL, VMatrix* pWorldToTexture = NULL, ITexture* pFlashlightDepthTexture = NULL) = 0;
-	virtual void ClearAllShadows() = 0;
-
-	virtual int ComputeModelLod(studiohwdata_t* pHardwareData, float unitSphereSize, float* pMetric = NULL) = 0;
-
-	virtual void GetPerfStats(DrawModelResults_t* pResults, const DrawModelInfo_t& info, CUtlBuffer* pSpewBuf = NULL) const = 0;
-	virtual void GetTriangles(const DrawModelInfo_t& info, matrix3x4_t* pBoneToWorld, GetTriangles_Output_t& out) = 0;
-
-	virtual int GetMaterialList(studiohdr_t* pStudioHdr, int count, IMaterial** ppMaterials) = 0;
-	virtual int GetMaterialListFromBodyAndSkin(MDLHandle_t studio, int nSkin, int nBody, int nCountOutputMaterials, IMaterial** ppOutputMaterials) = 0;
-	virtual void DrawModelArray(const DrawModelInfo_t& drawInfo, int arrayCount, model_array_instance_t* pInstanceData, int instanceStride, int flags = STUDIORENDER_DRAW_ENTIRE_MODEL) = 0;
-};
-
-extern IStudioRender* g_pStudioRender;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/item_selection_criteria.h b/SpyCustom/item_selection_criteria.h
deleted file mode 100644
index 6636535..0000000
--- a/SpyCustom/item_selection_criteria.h
+++ /dev/null
@@ -1,202 +0,0 @@
-#ifndef ITEM_SELECTION_CRITERIA_H
-#define ITEM_SELECTION_CRITERIA_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "game_item_schema.h"
-
-const int k_cchCreateItemLen = 64;
-
-enum EItemCriteriaOperator
-{
-	k_EOperator_String_EQ = 0,				      
-	k_EOperator_Not = 1,					  
-	k_EOperator_String_Not_EQ = 1,			       
-	k_EOperator_Float_EQ = 2,				        
-	k_EOperator_Float_Not_EQ = 3,			         
-	k_EOperator_Float_LT = 4,				        
-	k_EOperator_Float_Not_LT = 5,			         
-	k_EOperator_Float_LTE = 6,				          
-	k_EOperator_Float_Not_LTE = 7,			           
-	k_EOperator_Float_GT = 8,				        
-	k_EOperator_Float_Not_GT = 9,			         
-	k_EOperator_Float_GTE = 10,				          
-	k_EOperator_Float_Not_GTE = 11,			           
-	k_EOperator_Subkey_Contains = 12,		      
-	k_EOperator_Subkey_Not_Contains = 13,	        
-
-	k_EItemCriteriaOperator_Count = 14,
-};
-
-
-EItemCriteriaOperator EItemCriteriaOperatorFromName(const char* pch);
-const char* PchNameFromEItemCriteriaOperator(int eItemCriteriaOperator);
-
-class CEconItemSchema;
-class CEconItemDefinition;
-class CEconItem;
-class CSOItemCriteria;
-class CSOItemCriteriaCondition;
-
-const uint8	 k_unItemRarity_Any = 0xF;
-const uint8	 k_unItemQuality_Any = 0xF;
-
-
-class CItemSelectionCriteria
-{
-public:
-	CItemSelectionCriteria() :
-		m_bItemLevelSet(false),
-		m_unItemLevel(0),
-		m_bQualitySet(false),
-		m_nItemQuality(k_unItemQuality_Any),
-		m_bRaritySet(false),
-		m_nItemRarity(k_unItemRarity_Any),
-		m_unInitialInventory(0),
-		m_unInitialQuantity(1),
-		m_bForcedQualityMatch(false),
-		m_bIgnoreEnabledFlag(false),
-		m_bRecentOnly(false),
-		m_bIsLootList(false)
-	{
-	}
-
-	CItemSelectionCriteria(const CItemSelectionCriteria& that);
-	CItemSelectionCriteria& operator=(const CItemSelectionCriteria& rhs);
-	~CItemSelectionCriteria();
-
-	bool			BItemLevelSet(void) const { return m_bItemLevelSet; }
-	uint32		GetItemLevel(void) const { Assert(m_bItemLevelSet); return m_unItemLevel; }
-	void			SetItemLevel(uint32 unLevel) { m_unItemLevel = unLevel; m_bItemLevelSet = true; }
-	bool			BQualitySet(void) const { return m_bQualitySet; }
-	int32			GetQuality(void) const { Assert(m_bQualitySet); return m_nItemQuality; }
-	void			SetQuality(int32 nQuality) { m_nItemQuality = nQuality; m_bQualitySet = true; }
-	bool			BRaritySet(void) const { return m_bRaritySet; }
-	int32			GetRarity(void) const { Assert(m_bRaritySet); return m_nItemRarity; }
-	void			SetRarity(int32 nRarity) { m_nItemRarity = nRarity; m_bRaritySet = true; }
-	uint32		GetInitialInventory(void) const { return m_unInitialInventory; }
-	void			SetInitialInventory(uint32 unInventory) { m_unInitialInventory = unInventory; }
-	uint32		GetInitialQuantity(void) const { return m_unInitialQuantity; }
-	void			SetInitialQuantity(uint32 unQuantity) { m_unInitialQuantity = unQuantity; }
-	void			SetExplicitQualityMatch(bool bExplicit) { m_bForcedQualityMatch = bExplicit; }
-	void			SetIgnoreEnabledFlag(bool bIgnore) { m_bIgnoreEnabledFlag = bIgnore; }
-	void			SetRecentOnly(bool bCheck) { m_bRecentOnly = bCheck; }
-	bool			IsLootList(void) const { return m_bIsLootList; }
-
-	bool			BAddCondition(const char* pszField, EItemCriteriaOperator eOp, float flValue, bool bRequired);
-	bool			BAddCondition(const char* pszField, EItemCriteriaOperator eOp, const char* pszValue, bool bRequired);
-	int			GetConditionsCount() { return m_vecConditions.Count(); }
-	const char* GetValueForFirstConditionOfFieldName(const char* pchName) const;
-
-	bool			BInitFromKV(KeyValues* pKVCriteria, const CEconItemSchema& schemaa);
-	bool			BInitFromItemAndPaint(int nItemDef, int nPaintID, const CEconItemSchema& schemaa);
-
-	bool			BSerializeToMsg(CSOItemCriteria& msg) const;
-	bool			BDeserializeFromMsg(const CSOItemCriteria& msg);
-
-	bool			BEvaluate(const CEconItemDefinition* pItemDef, const CEconItemSchema& pschema) const;
-	bool			BEvaluate(const CEconItem* pItem, const CEconItemSchema& pschema) const;
-
-private:
-	class CCondition
-	{
-	public:
-		CCondition(const char* pszField, EItemCriteriaOperator eOp, bool bRequired)
-			: m_sField(pszField), m_EOp(eOp), m_bRequired(bRequired)
-		{
-		}
-
-		virtual ~CCondition() { }
-
-		bool BEvaluate(KeyValues* pKVItem) const;
-
-		virtual bool BSerializeToMsg(CSOItemCriteriaCondition& msg) const;
-
-		EItemCriteriaOperator	GetEOp(void) const { return m_EOp; }
-		virtual	const char* GetField(void) { return m_sField.Get(); }
-		virtual	const char* GetValue(void) { Assert(0); return NULL; }
-
-	protected:
-		virtual bool BInternalEvaluate(KeyValues* pKVItem) const = 0;
-
-		CUtlString				m_sField;
-		EItemCriteriaOperator	m_EOp;
-		bool					m_bRequired;
-	};
-
-
-	class CStringCondition : public CCondition
-	{
-	public:
-		CStringCondition(const char* pszField, EItemCriteriaOperator eOp, const char* pszValue, bool bRequired)
-			: CCondition(pszField, eOp, bRequired), m_sValue(pszValue)
-		{
-		}
-
-		virtual ~CStringCondition() { }
-
-		virtual	const char* GetValue(void) { return m_sValue.Get(); }
-
-	protected:
-		virtual bool BInternalEvaluate(KeyValues* pKVItem) const;
-		virtual bool BSerializeToMsg(CSOItemCriteriaCondition& msg) const;
-
-		CUtlString		m_sValue;
-	};
-
-
-	class CFloatCondition : public CCondition
-	{
-	public:
-		CFloatCondition(const char* pszField, EItemCriteriaOperator eOp, float flValue, bool bRequired)
-			: CCondition(pszField, eOp, bRequired), m_flValue(flValue)
-		{
-		}
-
-		virtual ~CFloatCondition() { }
-
-	protected:
-		virtual bool BInternalEvaluate(KeyValues* pKVItem) const;
-		virtual bool BSerializeToMsg(CSOItemCriteriaCondition& msg) const;
-
-		float				m_flValue;
-	};
-
-
-	class CSetCondition : public CCondition
-	{
-	public:
-		CSetCondition(const char* pszField, EItemCriteriaOperator eOp, const char* pszValue, bool bRequired)
-			: CCondition(pszField, eOp, bRequired), m_sValue(pszValue)
-		{
-		}
-
-		virtual ~CSetCondition() { }
-
-	protected:
-		virtual bool BInternalEvaluate(KeyValues* pKVItem) const;
-
-		virtual bool BSerializeToMsg(CSOItemCriteriaCondition& msg) const;
-
-		CUtlString			m_sValue;
-	};
-
-	bool			m_bItemLevelSet;
-	uint32			m_unItemLevel;
-	bool			m_bQualitySet;
-	int32			m_nItemQuality;
-	bool			m_bRaritySet;
-	int32			m_nItemRarity;
-	uint32			m_unInitialInventory;
-	uint32			m_unInitialQuantity;
-	bool			m_bForcedQualityMatch;
-	bool			m_bIgnoreEnabledFlag;
-	bool			m_bRecentOnly;
-	bool			m_bIsLootList;
-
-	CUtlVector<CCondition*>	m_vecConditions;
-};
-
-
-#endif 
\ No newline at end of file
diff --git a/SpyCustom/itempents.h b/SpyCustom/itempents.h
deleted file mode 100644
index 1a6fbbb..0000000
--- a/SpyCustom/itempents.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#if !defined( ITEMPENTS_H )
-#define ITEMPENTS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "ipredictionsystem.h"
-#include "shattersurfacetypes.h"
-#include "irecipientfilter.h"
-
-class CEffectData;
-class KeyValues;
-
-
-abstract_class ITempEntsSystem : public IPredictionSystem
-{
-public:
-	virtual bool SuppressTE(IRecipientFilter & filter) = 0;
-	virtual void ArmorRicochet(IRecipientFilter& filer, float delay,
-		const Vector* pos, const Vector* dir) = 0;
-	virtual void BeamEntPoint(IRecipientFilter& filer, float delay,
-		int	nStartEntity, const Vector* start, int nEndEntity, const Vector* end,
-		int modelindex, int haloindex, int startframe, int framerate,
-		float life, float width, float endWidth, int fadeLength, float amplitude,
-		int r, int g, int b, int a, int speed) = 0;
-	virtual void BeamEnts(IRecipientFilter& filer, float delay,
-		int	start, int end, int modelindex, int haloindex, int startframe, int framerate,
-		float life, float width, float endWidth, int fadeLength, float amplitude,
-		int r, int g, int b, int a, int speed) = 0;
-	virtual void BeamFollow(IRecipientFilter& filter, float delay,
-		int iEntIndex, int modelIndex, int haloIndex, float life, float width, float endWidth,
-		float fadeLength, float r, float g, float b, float a) = 0;
-	virtual void BeamPoints(IRecipientFilter& filer, float delay,
-		const Vector* start, const Vector* end, int modelindex, int haloindex, int startframe, int framerate,
-		float life, float width, float endWidth, int fadeLength, float amplitude,
-		int r, int g, int b, int a, int speed) = 0;
-	virtual void BeamLaser(IRecipientFilter& filer, float delay,
-		int	start, int end, int modelindex, int haloindex, int startframe, int framerate,
-		float life, float width, float endWidth, int fadeLength, float amplitude, int r, int g, int b, int a, int speed) = 0;
-	virtual void BeamRing(IRecipientFilter& filer, float delay,
-		int	start, int end, int modelindex, int haloindex, int startframe, int framerate,
-		float life, float width, int spread, float amplitude, int r, int g, int b, int a, int speed, int flags = 0) = 0;
-	virtual void BeamRingPoint(IRecipientFilter& filer, float delay,
-		const Vector& center, float start_radius, float end_radius, int modelindex, int haloindex, int startframe, int framerate,
-		float life, float width, int spread, float amplitude, int r, int g, int b, int a, int speed, int flags = 0) = 0;
-	virtual void BeamSpline(IRecipientFilter& filer, float delay,
-		int points, Vector* rgPoints) = 0;
-	virtual void BloodStream(IRecipientFilter& filer, float delay,
-		const Vector* org, const Vector* dir, int r, int g, int b, int a, int amount) = 0;
-	virtual void BloodSprite(IRecipientFilter& filer, float delay,
-		const Vector* org, const Vector* dir, int r, int g, int b, int a, int size) = 0;
-	virtual void BreakModel(IRecipientFilter& filer, float delay,
-		const Vector& pos, const QAngle& angle, const Vector& size, const Vector& vel,
-		int modelindex, int randomization, int count, float time, int flags) = 0;
-	virtual void BSPDecal(IRecipientFilter& filer, float delay,
-		const Vector* pos, int entity, int index) = 0;
-	virtual void ProjectDecal(IRecipientFilter& filter, float delay,
-		const Vector* pos, const QAngle* angles, float distance, int index) = 0;
-	virtual void Bubbles(IRecipientFilter& filer, float delay,
-		const Vector* mins, const Vector* maxs, float height, int modelindex, int count, float speed) = 0;
-	virtual void BubbleTrail(IRecipientFilter& filer, float delay,
-		const Vector* mins, const Vector* maxs, float height, int modelindex, int count, float speed) = 0;
-	virtual void Decal(IRecipientFilter& filer, float delay,
-		const Vector* pos, const Vector* start, int entity, int hitbox, int index) = 0;
-	virtual void DynamicLight(IRecipientFilter& filer, float delay,
-		const Vector* org, int r, int g, int b, int exponent, float radius, float time, float decay) = 0;
-	virtual void Explosion(IRecipientFilter& filer, float delay,
-		const Vector* pos, int modelindex, float scale, int framerate, int flags, int radius, int magnitude, const Vector* normal = NULL, unsigned char materialType = 'C') = 0;
-	virtual void ShatterSurface(IRecipientFilter& filer, float delay,
-		const Vector* pos, const QAngle* angle, const Vector* vForce, const Vector* vForcePos,
-		float width, float height, float shardsize, ShatterSurface_t surfacetype,
-		int front_r, int front_g, int front_b, int back_r, int back_g, int back_b) = 0;
-	virtual void GlowSprite(IRecipientFilter& filer, float delay,
-		const Vector* pos, int modelindex, float life, float size, int brightness) = 0;
-	virtual void FootprintDecal(IRecipientFilter& filer, float delay, const Vector* origin, const Vector* right,
-		int entity, int index, unsigned char materialType) = 0;
-	virtual void Fizz(IRecipientFilter& filer, float delay,
-		const CBaseEntity* ed, int modelindex, int density, int current) = 0;
-	virtual void KillPlayerAttachments(IRecipientFilter& filer, float delay,
-		int player) = 0;
-	virtual void LargeFunnel(IRecipientFilter& filer, float delay,
-		const Vector* pos, int modelindex, int reversed) = 0;
-	virtual void MetalSparks(IRecipientFilter& filer, float delay,
-		const Vector* pos, const Vector* dir) = 0;
-	virtual void EnergySplash(IRecipientFilter& filer, float delay,
-		const Vector* pos, const Vector* dir, bool bExplosive) = 0;
-	virtual void PlayerDecal(IRecipientFilter& filer, float delay,
-		const Vector* pos, int player, int entity) = 0;
-	virtual void ShowLine(IRecipientFilter& filer, float delay,
-		const Vector* start, const Vector* end) = 0;
-	virtual void Smoke(IRecipientFilter& filer, float delay,
-		const Vector* pos, int modelindex, float scale, int framerate) = 0;
-	virtual void Sparks(IRecipientFilter& filer, float delay,
-		const Vector* pos, int nMagnitude, int nTrailLength, const Vector* pDir) = 0;
-	virtual void Sprite(IRecipientFilter& filer, float delay,
-		const Vector* pos, int modelindex, float size, int brightness) = 0;
-	virtual void SpriteSpray(IRecipientFilter& filer, float delay,
-		const Vector* pos, const Vector* dir, int modelindex, int speed, float noise, int count) = 0;
-	virtual void WorldDecal(IRecipientFilter& filer, float delay,
-		const Vector* pos, int index) = 0;
-	virtual void MuzzleFlash(IRecipientFilter& filer, float delay,
-		const Vector& start, const QAngle& angles, float scale, int type) = 0;
-	virtual void Dust(IRecipientFilter& filer, float delay,
-				 const Vector& pos, const Vector& dir, float size, float speed) = 0;
-	virtual void GaussExplosion(IRecipientFilter& filer, float delay,
-				const Vector& pos, const Vector& dir, int type) = 0;
-	virtual void PhysicsProp(IRecipientFilter& filter, float delay, int modelindex, int skin,
-		const Vector& pos, const QAngle& angles, const Vector& vel, int flags, int effects) = 0;
-
-	virtual void TriggerTempEntity(KeyValues* pKeyValues) = 0;
-
-	virtual void ClientProjectile(IRecipientFilter& filter, float delay,
-		const Vector* vecOrigin, const Vector* vecVelocity, int modelindex, int lifetime, CBaseEntity* pOwner) = 0;
-};
-
-extern ITempEntsSystem* te;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/itexture.h b/SpyCustom/itexture.h
deleted file mode 100644
index 891de98..0000000
--- a/SpyCustom/itexture.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef ITEXTURE_H
-#define ITEXTURE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-#include "imageformat.h"   
-
-class IVTFTexture;
-class ITexture;
-struct Rect_t;
-
-abstract_class ITextureRegenerator
-{
-public:
-	virtual void RegenerateTextureBits(ITexture * pTexture, IVTFTexture * pVTFTexture, Rect_t * pRect) = 0;
-
-	virtual void Release() = 0;
-
-};
-
-abstract_class ITexture
-{
-public:
-	virtual const char* GetName(void) const = 0;
-	virtual int GetMappingWidth() const = 0;
-	virtual int GetMappingHeight() const = 0;
-	virtual int GetActualWidth() const = 0;
-	virtual int GetActualHeight() const = 0;
-	virtual int GetNumAnimationFrames() const = 0;
-	virtual bool IsTranslucent() const = 0;
-	virtual bool IsMipmapped() const = 0;
-
-	virtual void GetLowResColorSample(float s, float t, float* color) const = 0;
-
-	virtual void* GetResourceData(uint32 eDataType, size_t* pNumBytes) const = 0;
-
-	virtual void IncrementReferenceCount(void) = 0;
-	virtual void DecrementReferenceCount(void) = 0;
-
-	inline void AddRef() { IncrementReferenceCount(); }
-	inline void Release() { DecrementReferenceCount(); }
-
-	virtual void SetTextureRegenerator(ITextureRegenerator* pTextureRegen) = 0;
-
-	virtual void Download(Rect_t* pRect = 0, int nAdditionalCreationFlags = 0) = 0;
-
-	virtual int GetApproximateVidMemBytes(void) const = 0;
-
-	virtual bool IsError() const = 0;
-
-	virtual bool IsVolumeTexture() const = 0;
-	virtual int GetMappingDepth() const = 0;
-	virtual int GetActualDepth() const = 0;
-
-	virtual ImageFormat GetImageFormat() const = 0;
-	virtual NormalDecodeMode_t GetNormalDecodeMode() const = 0;
-
-	virtual bool IsRenderTarget() const = 0;
-	virtual bool IsCubeMap() const = 0;
-	virtual bool IsNormalMap() const = 0;
-	virtual bool IsProcedural() const = 0;
-
-	virtual void DeleteIfUnreferenced() = 0;
-
-#if defined( _X360 )
-	virtual bool ClearTexture(int r, int g, int b, int a) = 0;
-	virtual bool CreateRenderTargetSurface(int width, int height, ImageFormat format, bool bSameAsTexture) = 0;
-#endif
-
-	virtual void SwapContents(ITexture* pOther) = 0;
-
-	virtual unsigned int GetFlags(void) const = 0;
-
-	virtual void ForceLODOverride(int iNumLodsOverrideUpOrDown) = 0;
-
-	virtual bool SaveToFile(const char* fileName) = 0;
-
-	virtual void CopyToStagingTexture(ITexture* pDstTex) = 0;
-
-	virtual void SetErrorTexture(bool bIsErrorTexture) = 0;
-};
-
-
-inline bool IsErrorTexture(ITexture* pTex)
-{
-	return !pTex || pTex->IsError();
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/itoolentity.h b/SpyCustom/itoolentity.h
deleted file mode 100644
index 26f6b32..0000000
--- a/SpyCustom/itoolentity.h
+++ /dev/null
@@ -1,190 +0,0 @@
-#ifndef ITOOLENTITY_H
-#define ITOOLENTITY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "utlvector.h"
-#include "Color.h"
-#include "basehandle.h"
-#include "iclientrenderable.h"
-#include "ishadowmgr.h"
-
-
-class IServerEntity;
-class IClientEntity;
-class IToolSystem;
-class IClientRenderable;
-class Vector;
-class QAngle;
-class CBaseEntity;
-class CBaseAnimating;
-class CTakeDamageInfo;
-class ITempEntsSystem;
-class IEntityFactoryDictionary;
-
-
-typedef unsigned int HTOOLHANDLE;
-enum
-{
-	HTOOLHANDLE_INVALID = 0
-};
-
-
-enum ClientShadowFlags_t
-{
-	SHADOW_FLAGS_USE_RENDER_TO_TEXTURE = (SHADOW_FLAGS_LAST_FLAG << 1),
-	SHADOW_FLAGS_ANIMATING_SOURCE = (SHADOW_FLAGS_LAST_FLAG << 2),
-	SHADOW_FLAGS_USE_DEPTH_TEXTURE = (SHADOW_FLAGS_LAST_FLAG << 3),
-	CLIENT_SHADOW_FLAGS_LAST_FLAG = SHADOW_FLAGS_USE_DEPTH_TEXTURE
-};
-
-
-typedef void* EntitySearchResult;
-
-
-class IClientTools : public IBaseInterface
-{
-public:
-	virtual HTOOLHANDLE		AttachToEntity(EntitySearchResult entityToAttach) = 0;
-	virtual void			DetachFromEntity(EntitySearchResult entityToDetach) = 0;
-
-	virtual bool			IsValidHandle(HTOOLHANDLE handle) = 0;
-
-	virtual int				GetNumRecordables() = 0;
-	virtual HTOOLHANDLE		GetRecordable(int index) = 0;
-
-	virtual EntitySearchResult	NextEntity(EntitySearchResult currentEnt) = 0;
-	EntitySearchResult			FirstEntity() { return NextEntity(NULL); }
-
-	virtual void			SetEnabled(HTOOLHANDLE handle, bool enabled) = 0;
-	virtual void			SetRecording(HTOOLHANDLE handle, bool recording) = 0;
-	virtual bool			ShouldRecord(HTOOLHANDLE handle) = 0;
-
-	virtual HTOOLHANDLE		GetToolHandleForEntityByIndex(int entindex) = 0;
-
-	virtual int				GetModelIndex(HTOOLHANDLE handle) = 0;
-	virtual const char* GetModelName(HTOOLHANDLE handle) = 0;
-	virtual const char* GetClassname(HTOOLHANDLE handle) = 0;
-
-	virtual void			AddClientRenderable(IClientRenderable* pRenderable, int renderGroup) = 0;
-	virtual void			RemoveClientRenderable(IClientRenderable* pRenderable) = 0;
-	virtual void			SetRenderGroup(IClientRenderable* pRenderable, int renderGroup) = 0;
-	virtual void			MarkClientRenderableDirty(IClientRenderable* pRenderable) = 0;
-	virtual void			UpdateProjectedTexture(ClientShadowHandle_t h, bool bForce) = 0;
-
-	virtual bool			DrawSprite(IClientRenderable* pRenderable, float scale, float frame, int rendermode, int renderfx, const Color& color, float flProxyRadius, int* pVisHandle) = 0;
-
-	virtual EntitySearchResult	GetLocalPlayer() = 0;
-	virtual bool			GetLocalPlayerEyePosition(Vector& org, QAngle& ang, float& fov) = 0;
-
-	virtual ClientShadowHandle_t CreateShadow(CBaseHandle handle, int nFlags) = 0;
-	virtual void			DestroyShadow(ClientShadowHandle_t h) = 0;
-
-	virtual ClientShadowHandle_t CreateFlashlight(const FlashlightState_t& lightState) = 0;
-	virtual void			DestroyFlashlight(ClientShadowHandle_t h) = 0;
-	virtual void			UpdateFlashlightState(ClientShadowHandle_t h, const FlashlightState_t& lightState) = 0;
-
-	virtual void			AddToDirtyShadowList(ClientShadowHandle_t h, bool force = false) = 0;
-	virtual void			MarkRenderToTextureShadowDirty(ClientShadowHandle_t h) = 0;
-
-	virtual void			EnableRecordingMode(bool bEnable) = 0;
-	virtual bool			IsInRecordingMode() const = 0;
-
-	virtual void			TriggerTempEntity(KeyValues* pKeyValues) = 0;
-
-	virtual int				GetOwningWeaponEntIndex(int entindex) = 0;
-	virtual int				GetEntIndex(EntitySearchResult entityToAttach) = 0;
-
-	virtual int				FindGlobalFlexcontroller(char const* name) = 0;
-	virtual char const* GetGlobalFlexControllerName(int idx) = 0;
-
-	virtual EntitySearchResult	GetOwnerEntity(EntitySearchResult currentEnt) = 0;
-
-	virtual bool			IsPlayer(EntitySearchResult currentEnt) = 0;
-	virtual bool			IsBaseCombatCharacter(EntitySearchResult currentEnt) = 0;
-	virtual bool			IsNPC(EntitySearchResult currentEnt) = 0;
-
-	virtual Vector			GetAbsOrigin(HTOOLHANDLE handle) = 0;
-	virtual QAngle			GetAbsAngles(HTOOLHANDLE handle) = 0;
-
-	virtual void			ReloadParticleDefintions(const char* pFileName, const void* pBufData, int nLen) = 0;
-
-	virtual void			PostToolMessage(KeyValues* pKeyValues) = 0;
-
-	virtual void			EnableParticleSystems(bool bEnable) = 0;
-
-	virtual bool			IsRenderingThirdPerson() const = 0;
-};
-
-#define VCLIENTTOOLS_INTERFACE_VERSION "VCLIENTTOOLS001"
-
-
-class IServerTools : public IBaseInterface
-{
-public:
-	virtual IServerEntity* GetIServerEntity(IClientEntity* pClientEntity) = 0;
-	virtual bool SnapPlayerToPosition(const Vector& org, const QAngle& ang, IClientEntity* pClientPlayer = NULL) = 0;
-	virtual bool GetPlayerPosition(Vector& org, QAngle& ang, IClientEntity* pClientPlayer = NULL) = 0;
-	virtual bool SetPlayerFOV(int fov, IClientEntity* pClientPlayer = NULL) = 0;
-	virtual int GetPlayerFOV(IClientEntity* pClientPlayer = NULL) = 0;
-	virtual bool IsInNoClipMode(IClientEntity* pClientPlayer = NULL) = 0;
-
-	virtual CBaseEntity* FirstEntity(void) = 0;
-	virtual CBaseEntity* NextEntity(CBaseEntity* pEntity) = 0;
-	virtual CBaseEntity* FindEntityByHammerID(int iHammerID) = 0;
-
-	virtual bool GetKeyValue(CBaseEntity* pEntity, const char* szField, char* szValue, int iMaxLen) = 0;
-	virtual bool SetKeyValue(CBaseEntity* pEntity, const char* szField, const char* szValue) = 0;
-	virtual bool SetKeyValue(CBaseEntity* pEntity, const char* szField, float flValue) = 0;
-	virtual bool SetKeyValue(CBaseEntity* pEntity, const char* szField, const Vector& vecValue) = 0;
-
-	virtual CBaseEntity* CreateEntityByName(const char* szClassName) = 0;
-	virtual void DispatchSpawn(CBaseEntity* pEntity) = 0;
-
-	virtual void ReloadParticleDefintions(const char* pFileName, const void* pBufData, int nLen) = 0;
-
-	virtual void AddOriginToPVS(const Vector& org) = 0;
-	virtual void MoveEngineViewTo(const Vector& vPos, const QAngle& vAngles) = 0;
-
-	virtual bool DestroyEntityByHammerId(int iHammerID) = 0;
-	virtual CBaseEntity* GetBaseEntityByEntIndex(int iEntIndex) = 0;
-	virtual void RemoveEntity(CBaseEntity* pEntity) = 0;
-	virtual void RemoveEntityImmediate(CBaseEntity* pEntity) = 0;
-	virtual IEntityFactoryDictionary* GetEntityFactoryDictionary(void) = 0;
-
-	virtual void SetMoveType(CBaseEntity* pEntity, int val) = 0;
-	virtual void SetMoveType(CBaseEntity* pEntity, int val, int moveCollide) = 0;
-	virtual void ResetSequence(CBaseAnimating* pEntity, int nSequence) = 0;
-	virtual void ResetSequenceInfo(CBaseAnimating* pEntity) = 0;
-
-	virtual void ClearMultiDamage(void) = 0;
-	virtual void ApplyMultiDamage(void) = 0;
-	virtual void AddMultiDamage(const CTakeDamageInfo& pTakeDamageInfo, CBaseEntity* pEntity) = 0;
-	virtual void RadiusDamage(const CTakeDamageInfo& info, const Vector& vecSrc, float flRadius, int iClassIgnore, CBaseEntity* pEntityIgnore) = 0;
-
-	virtual ITempEntsSystem* GetTempEntsSystem(void) = 0;
-};
-
-typedef IServerTools IServerTools001;
-
-#define VSERVERTOOLS_INTERFACE_VERSION_1	"VSERVERTOOLS001"
-#define VSERVERTOOLS_INTERFACE_VERSION		"VSERVERTOOLS002"
-#define VSERVERTOOLS_INTERFACE_VERSION_INT	2
-
-class IServerChoreoTools : public IBaseInterface
-{
-public:
-
-	virtual EntitySearchResult	NextChoreoEntity(EntitySearchResult currentEnt) = 0;
-	EntitySearchResult			FirstChoreoEntity() { return NextChoreoEntity(NULL); }
-	virtual const char* GetSceneFile(EntitySearchResult sr) = 0;
-
-	virtual int					GetEntIndex(EntitySearchResult sr) = 0;
-	virtual void				ReloadSceneFromDisk(int entindex) = 0;
-};
-
-#define VSERVERCHOREOTOOLS_INTERFACE_VERSION "VSERVERCHOREOTOOLS001"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ivdebugoverlay.h b/SpyCustom/ivdebugoverlay.h
deleted file mode 100644
index e1253af..0000000
--- a/SpyCustom/ivdebugoverlay.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef IVDEBUGOVERLAY_H
-#define IVDEBUGOVERLAY_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-class Vector;
-
-#define VDEBUG_OVERLAY_INTERFACE_VERSION	"VDebugOverlay003"
-
-#define NDEBUG_PERSIST_TILL_NEXT_SERVER (0.0f)
-
-class OverlayText_t;
-
-abstract_class IVDebugOverlay
-{
-public:
-    virtual void            __unkn() = 0;
-    virtual void            AddEntityTextOverlay(int ent_index, int line_offset, float duration, int r, int g, int b, int a, const char* format, ...) = 0;
-    virtual void            AddBoxOverlay(const Vector& origin, const Vector& mins, const Vector& max, Vector const& orientation, int r, int g, int b, int a, float duration) = 0;
-    virtual void            AddSphereOverlay(const Vector& vOrigin, float flRadius, int nTheta, int nPhi, int r, int g, int b, int a, float flDuration) = 0;
-    virtual void            AddTriangleOverlay(const Vector& p1, const Vector& p2, const Vector& p3, int r, int g, int b, int a, bool noDepthTest, float duration) = 0;
-    virtual void            AddLineOverlay(const Vector& origin, const Vector& dest, int r, int g, int b, bool noDepthTest, float duration) = 0;
-    virtual void            AddTextOverlay(const Vector& origin, float duration, const char* format, ...) = 0;
-    virtual void            AddTextOverlay(const Vector& origin, int line_offset, float duration, const char* format, ...) = 0;
-    virtual void            AddScreenTextOverlay(float flXPos, float flYPos, float flDuration, int r, int g, int b, int a, const char* text) = 0;
-    virtual void            AddSweptBoxOverlay(const Vector& start, const Vector& end, const Vector& mins, const Vector& max, const QAngle& angles, int r, int g, int b, int a, float flDuration) = 0;
-    virtual void            AddGridOverlay(const Vector& origin) = 0;
-    virtual void            AddCoordFrameOverlay(const matrix3x4_t& frame, float flScale, int vColorTable[3][3] = NULL) = 0;
-    virtual int             ScreenPosition(const Vector& point, Vector& screen) = 0;
-    virtual int             ScreenPosition(float flXPos, float flYPos, Vector& screen) = 0;
-    virtual OverlayText_t* GetFirst(void) = 0;
-    virtual OverlayText_t* GetNext(OverlayText_t* current) = 0;
-    virtual void            ClearDeadOverlays(void) = 0;
-    virtual void            ClearAllOverlays() = 0;
-    virtual void            AddTextOverlayRGB(const Vector& origin, int line_offset, float duration, float r, float g, float b, float alpha, const char* format, ...) = 0;
-    virtual void            AddTextOverlayRGB(const Vector& origin, int line_offset, float duration, int r, int g, int b, int a, const char* format, ...) = 0;
-    virtual void            AddLineOverlayAlpha(const Vector& origin, const Vector& dest, int r, int g, int b, int a, bool noDepthTest, float duration) = 0;
-    virtual void            AddBoxOverlay2(const Vector& origin, const Vector& mins, const Vector& max, QAngle const& orientation, const Color& faceColor, const Color& edgeColor, float duration) = 0;
-    virtual void            PurgeTextOverlays() = 0;
-    virtual void            DrawPill(const Vector& mins, const Vector& max, float& diameter, int r, int g, int b, int a, float duration) = 0;
-};
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iviewrender.h b/SpyCustom/iviewrender.h
deleted file mode 100644
index 505f8dc..0000000
--- a/SpyCustom/iviewrender.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#if !defined( IVIEWRENDER_H )
-#define IVIEWRENDER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "ivrenderview.h"
-
-
-#define MAX_DEPTH_TEXTURE_SHADOWS 1
-#define MAX_DEPTH_TEXTURE_HIGHRES_SHADOWS 0
-
-#define MAX_DEPTH_TEXTURE_SHADOWS_TOOLS 8
-#define MAX_DEPTH_TEXTURE_HIGHRES_SHADOWS_TOOLS 0
-
-
-enum DrawFlags_t
-{
-	DF_RENDER_REFRACTION = 0x1,
-	DF_RENDER_REFLECTION = 0x2,
-
-	DF_CLIP_Z = 0x4,
-	DF_CLIP_BELOW = 0x8,
-
-	DF_RENDER_UNDERWATER = 0x10,
-	DF_RENDER_ABOVEWATER = 0x20,
-	DF_RENDER_WATER = 0x40,
-
-	DF_SSAO_DEPTH_PASS = 0x80,
-
-	DF_RENDER_PSEUDO_TRANSLUCENT_WATER = 0x100,                     
-	DF_WATERHEIGHT = 0x200,
-	DF_DRAW_SSAO = 0x400,
-	DF_DRAWSKYBOX = 0x800,
-
-	DF_FUDGE_UP = 0x1000,
-
-	DF_DRAW_ENTITITES = 0x2000,
-
-	DF_SKIP_WORLD = 0x4000,
-	DF_SKIP_WORLD_DECALS_AND_OVERLAYS = 0x8000,
-
-	DF_UNUSED5 = 0x10000,
-	DF_SAVEGAMESCREENSHOT = 0x20000,
-	DF_CLIP_SKYBOX = 0x40000,
-
-	DF_DRAW_SIMPLE_WORLD_MODEL = 0x80000,	           
-
-	DF_SHADOW_DEPTH_MAP = 0x100000,	      
-
-	DF_FAST_ENTITY_RENDERING = 0x200000,                 
-	DF_DRAW_SIMPLE_WORLD_MODEL_WATER = 0x400000,	           
-};
-
-class CViewSetup;
-class C_BaseEntity;
-struct vrect_t;
-class C_BaseViewModel;
-
-abstract_class IViewRender
-{
-public:
-	virtual void		Init(void) = 0;
-
-	virtual void		LevelInit(void) = 0;
-	virtual void		LevelShutdown(void) = 0;
-
-	virtual void		Shutdown(void) = 0;
-
-	virtual void		OnRenderStart() = 0;
-
-	virtual	void		Render(vrect_t* rect) = 0;
-
-	virtual void		RenderView(const CViewSetup& view, const CViewSetup& hudViewSetup, int nClearFlags, int whatToDraw) = 0;
-
-	virtual int GetDrawFlags() = 0;
-
-	virtual void		StartPitchDrift(void) = 0;
-	virtual void		StopPitchDrift(void) = 0;
-
-	virtual VPlane* GetFrustum() = 0;
-
-	virtual bool		ShouldDrawBrushModels(void) = 0;
-
-	virtual const CViewSetup* GetPlayerViewSetup(int nSlot = -1) const = 0;
-	virtual const CViewSetup* GetViewSetup(void) const = 0;
-
-	virtual void		DisableVis(void) = 0;
-
-	virtual int			BuildWorldListsNumber() const = 0;
-
-	virtual void		SetCheapWaterStartDistance(float flCheapWaterStartDistance) = 0;
-	virtual void		SetCheapWaterEndDistance(float flCheapWaterEndDistance) = 0;
-
-	virtual void		GetWaterLODParams(float& flCheapWaterStartDistance, float& flCheapWaterEndDistance) = 0;
-
-	virtual void		DriftPitch(void) = 0;
-
-	virtual void		SetScreenOverlayMaterial(IMaterial* pMaterial) = 0;
-	virtual IMaterial* GetScreenOverlayMaterial() = 0;
-
-	virtual void		WriteSaveGameScreenshot(const char* pFilename) = 0;
-	virtual void		WriteSaveGameScreenshotOfSize(const char* pFilename, int width, int height) = 0;
-
-	virtual void		QueueOverlayRenderView(const CViewSetup& view, int nClearFlags, int whatToDraw) = 0;
-
-	virtual float		GetZNear() = 0;
-	virtual float		GetZFar() = 0;
-
-	virtual void		GetScreenFadeDistances(float* pMin, float* pMax, float* pScale) = 0;
-
-	virtual C_BaseEntity* GetCurrentlyDrawingEntity() = 0;
-	virtual void		SetCurrentlyDrawingEntity(C_BaseEntity* pEnt) = 0;
-
-	virtual bool		UpdateShadowDepthTexture(ITexture* pRenderTarget, ITexture* pDepthTexture, const CViewSetup& shadowView, bool bRenderWorldAndObjects = true, bool bRenderViewModels = false) = 0;
-
-	virtual void		FreezeFrame(float flFreezeTime) = 0;
-
-	virtual void		InitFadeData(void) = 0;
-};
-
-extern IViewRender* view;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/iviewrender_beams.h b/SpyCustom/iviewrender_beams.h
deleted file mode 100644
index 73f17a2..0000000
--- a/SpyCustom/iviewrender_beams.h
+++ /dev/null
@@ -1,144 +0,0 @@
-#if !defined( IVIEWRENDER_BEAMS_H )
-#define IVIEWRENDER_BEAMS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vector.h"
-#include "beam_flags.h"
-#include "tempentity.h"
-
-extern void SetBeamCreationAllowed(bool state);
-extern bool BeamCreationAllowed(void);
-
-
-class C_Beam;
-class Beam_t;
-
-struct BeamTrail_t
-{
-	BeamTrail_t* next;
-	float			die;
-	Vector			org;
-	Vector			vel;
-};
-
-struct BeamInfo_t
-{
-	int			m_nType;
-
-	C_BaseEntity* m_pStartEnt;
-	int			m_nStartAttachment;
-	C_BaseEntity* m_pEndEnt;
-	int			m_nEndAttachment;
-
-	Vector		m_vecStart;
-	Vector		m_vecEnd;
-
-	int			m_nModelIndex;
-	const char* m_pszModelName;
-
-	int			m_nHaloIndex;
-	const char* m_pszHaloName;
-	float		m_flHaloScale;
-
-	float		m_flLife;
-	float		m_flWidth;
-	float		m_flEndWidth;
-	float		m_flFadeLength;
-	float		m_flAmplitude;
-
-	float		m_flBrightness;
-	float		m_flSpeed;
-
-	int			m_nStartFrame;
-	float		m_flFrameRate;
-
-	float		m_flRed;
-	float		m_flGreen;
-	float		m_flBlue;
-
-	bool		m_bRenderable;
-
-	int			m_nSegments;
-
-	int			m_nFlags;
-
-	Vector		m_vecCenter;
-	float		m_flStartRadius;
-	float		m_flEndRadius;
-
-	BeamInfo_t()
-	{
-		m_nType = TE_BEAMPOINTS;
-		m_nSegments = -1;
-		m_pszModelName = NULL;
-		m_pszHaloName = NULL;
-		m_nModelIndex = -1;
-		m_nHaloIndex = -1;
-		m_bRenderable = true;
-		m_nFlags = 0;
-	}
-};
-
-
-abstract_class IViewRenderBeams
-{
-public:
-public:
-public:
-	virtual void	InitBeams(void) = 0;
-	virtual void	ShutdownBeams(void) = 0;
-	virtual void	ClearBeams(void) = 0;
-
-	virtual void	UpdateTempEntBeams() = 0;
-
-
-	virtual void	DrawBeam(C_Beam* pbeam, ITraceFilter* pEntityBeamTraceFilter = NULL) = 0;
-	virtual void	DrawBeam(Beam_t* pbeam) = 0;
-	
-	
-	virtual void	KillDeadBeams(CBaseEntity* pEnt) = 0;
-
-	virtual Beam_t* CreateBeamEnts(BeamInfo_t& beamInfo) = 0;
-	virtual Beam_t* CreateBeamEntPoint(BeamInfo_t& beamInfo) = 0;
-	virtual	Beam_t* CreateBeamPoints(BeamInfo_t& beamInfo) = 0;
-	virtual Beam_t* CreateBeamRing(BeamInfo_t& beamInfo) = 0;
-	virtual Beam_t* CreateBeamRingPoint(BeamInfo_t& beamInfo) = 0;
-	virtual Beam_t* CreateBeamCirclePoints(BeamInfo_t& beamInfo) = 0;
-	virtual Beam_t* CreateBeamFollow(BeamInfo_t& beamInfo) = 0;
-
-	virtual void	FreeBeam(Beam_t* pBeam) = 0;
-	virtual void	UpdateBeamInfo(Beam_t* pBeam, BeamInfo_t& beamInfo) = 0;
-
-	virtual void	CreateBeamEnts(int startEnt, int endEnt, int modelIndex, int haloIndex, float haloScale,
-							float life, float width, float m_nEndWidth, float m_nFadeLength, float amplitude,
-							float brightness, float speed, int startFrame,
-							float framerate, float r, float g, float b, int type = -1) = 0;
-	virtual void	CreateBeamEntPoint(int	nStartEntity, const Vector* pStart, int nEndEntity, const Vector* pEnd,
-							int modelIndex, int haloIndex, float haloScale,
-							float life, float width, float m_nEndWidth, float m_nFadeLength, float amplitude,
-							float brightness, float speed, int startFrame,
-							float framerate, float r, float g, float b) = 0;
-	virtual void	CreateBeamPoints(Vector& start, Vector& end, int modelIndex, int haloIndex, float haloScale,
-							float life, float width, float m_nEndWidth, float m_nFadeLength, float amplitude,
-							float brightness, float speed, int startFrame,
-							float framerate, float r, float g, float b) = 0;
-	virtual void	CreateBeamRing(int startEnt, int endEnt, int modelIndex, int haloIndex, float haloScale,
-							float life, float width, float m_nEndWidth, float m_nFadeLength, float amplitude,
-							float brightness, float speed, int startFrame,
-							float framerate, float r, float g, float b, int flags = 0) = 0;
-	virtual void	CreateBeamRingPoint(const Vector& center, float start_radius, float end_radius, int modelIndex, int haloIndex, float haloScale,
-							float life, float width, float m_nEndWidth, float m_nFadeLength, float amplitude,
-							float brightness, float speed, int startFrame,
-							float framerate, float r, float g, float b, int flags = 0) = 0;
-	virtual void	CreateBeamCirclePoints(int type, Vector& start, Vector& end,
-							int modelIndex,  int haloIndex,  float haloScale, float life, float width,
-							float m_nEndWidth, float m_nFadeLength, float amplitude, float brightness, float speed,
-							int startFrame, float framerate, float r, float g, float b) = 0;
-	virtual void	CreateBeamFollow(int startEnt, int modelIndex, int haloIndex, float haloScale,
-							float life, float width, float m_nEndWidth, float m_nFadeLength, float r, float g, float b,
-							float brightness) = 0;
-};
-
-#endif  
diff --git a/SpyCustom/ivmodelinfo.h b/SpyCustom/ivmodelinfo.h
deleted file mode 100644
index f1f236a..0000000
--- a/SpyCustom/ivmodelinfo.h
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef IVMODELINFO_H
-#define IVMODELINFO_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-#include "dbg.h"
-
-class IMaterial;
-class KeyValues;
-struct vcollide_t;
-struct model_t;
-class Vector;
-class QAngle;
-class CGameTrace;
-struct cplane_t;
-typedef CGameTrace trace_t;
-struct studiohdr_t;
-struct virtualmodel_t;
-typedef unsigned char byte;
-struct virtualterrainparams_t;
-class CPhysCollide;
-typedef unsigned short MDLHandle_t;
-class CUtlBuffer;
-class IClientRenderable;
-
-class CStudioHdr;
-enum RenderableTranslucencyType_t
-{
-	RENDERABLE_IS_OPAQUE = 0,
-	RENDERABLE_IS_TRANSLUCENT,
-	RENDERABLE_IS_TWO_PASS,          
-};
-
-abstract_class IModelLoadCallback
-{
-public:
-	virtual void OnModelLoadComplete(const model_t * pModel) = 0;
-
-protected:
-	~IModelLoadCallback();
-};
-
-
-class CRefCountedModelIndex
-{
-private:
-	int m_nIndex;
-public:
-	CRefCountedModelIndex() : m_nIndex(-1) { }
-	~CRefCountedModelIndex() { Set(-1); }
-
-	CRefCountedModelIndex(const CRefCountedModelIndex& src) : m_nIndex(-1) { Set(src.m_nIndex); }
-	CRefCountedModelIndex& operator=(const CRefCountedModelIndex& src) { Set(src.m_nIndex); return *this; }
-
-	explicit CRefCountedModelIndex(int i) : m_nIndex(-1) { Set(i); }
-	CRefCountedModelIndex& operator=(int i) { Set(i); return *this; }
-
-	int Get() const { return m_nIndex; }
-	void Set(int i);
-	void Clear() { Set(-1); }
-
-	operator int() const { return m_nIndex; }
-};
-
-
-#define VMODELINFO_CLIENT_INTERFACE_VERSION		"VModelInfoClient006"
-#define VMODELINFO_SERVER_INTERFACE_VERSION_3	"VModelInfoServer003"
-#define VMODELINFO_SERVER_INTERFACE_VERSION		"VModelInfoServer004"
-
-inline bool IsDynamicModelIndex(int modelindex) { return modelindex < -1; }
-inline bool IsClientOnlyModelIndex(int modelindex) { return modelindex < -1 && (modelindex & 1); }
-
-
-class IVModelInfo
-{
-public:
-	virtual                                 ~IVModelInfo(void) {}
-	virtual const model_t* GetModel(int modelindex) const = 0;
-	virtual int                             GetModelIndex(const char* name) const = 0;
-	virtual const char* GetModelName(const model_t* model) const = 0;
-	virtual vcollide_t* GetVCollide(const model_t* model) const = 0;
-	virtual vcollide_t* GetVCollide(int modelindex) const = 0;
-	virtual void                            GetModelBounds(const model_t* model, Vector& mins, Vector& maxs) const = 0;
-	virtual void                            GetModelRenderBounds(const model_t* model, Vector& mins, Vector& maxs) const = 0;
-	virtual int                             GetModelFrameCount(const model_t* model) const = 0;
-	virtual int                             GetModelType(const model_t* model) const = 0;
-	virtual void* GetModelExtraData(const model_t* model) = 0;
-	virtual bool                            ModelHasMaterialProxy(const model_t* model) const = 0;
-	virtual bool                            IsTranslucent(model_t const* model) const = 0;
-	virtual bool                            IsTranslucentTwoPass(const model_t* model) const = 0;
-	virtual void                            Unused0() {};
-	virtual void UNUSED() = 0;
-	virtual void UNUSE11D() = 0;
-	virtual RenderableTranslucencyType_t    ComputeTranslucencyType(const model_t* model, int nSkin, int nBody) = 0;
-	virtual int                             GetModelMaterialCount(const model_t* model) const = 0;
-	virtual void                            GetModelMaterials(const model_t* model, int count, IMaterial** ppMaterial) = 0;
-	virtual bool                            IsModelVertexLit(const model_t* model) const = 0;
-	virtual const char* GetModelKeyValueText(const model_t* model) = 0;
-	virtual bool                            GetModelKeyValue(const model_t* model, CUtlBuffer& buf) = 0;
-	virtual float                           GetModelRadius(const model_t* model) = 0;
-	virtual CStudioHdr* GetStudioHdr(MDLHandle_t handle) = 0;
-	virtual const studiohdr_t* FindModel(const studiohdr_t* pStudioHdr, void** cache, const char* modelname) const = 0;
-	virtual const studiohdr_t* FindModel(void* cache) const = 0;
-	virtual virtualmodel_t* GetVirtualModel(const studiohdr_t* pStudioHdr) const = 0;
-	virtual uint8_t* GetAnimBlock(const studiohdr_t* pStudioHdr, int iBlock) const = 0;
-	virtual void                            GetModelMaterialColorAndLighting(const model_t* model, Vector const& origin, QAngle const& angles, trace_t* pTrace, Vector& lighting, Vector& matColor) = 0;
-	virtual void                            GetIlluminationPoint(const model_t* model, IClientRenderable* pRenderable, Vector const& origin, QAngle const& angles, Vector* pLightingCenter) = 0;
-	virtual int                             GetModelContents(int modelIndex) const = 0;
-	virtual studiohdr_t* GetStudiomodel(const model_t* mod) = 0;
-	virtual int                             GetModelSpriteWidth(const model_t* model) const = 0;
-	virtual int                             GetModelSpriteHeight(const model_t* model) const = 0;
-	virtual void                            SetLevelScreenFadeRange(float flMinSize, float flMaxSize) = 0;
-	virtual void                            GetLevelScreenFadeRange(float* pMinArea, float* pMaxArea) const = 0;
-	virtual void                            SetViewScreenFadeRange(float flMinSize, float flMaxSize) = 0;
-	virtual unsigned char                   ComputeLevelScreenFade(const Vector& vecAbsOrigin, float flRadius, float flFadeScale) const = 0;
-	virtual unsigned char                   ComputeViewScreenFade(const Vector& vecAbsOrigin, float flRadius, float flFadeScale) const = 0;
-	virtual int                             GetAutoplayList(const studiohdr_t* pStudioHdr, unsigned short** pAutoplayList) const = 0;
-	virtual CPhysCollide* GetCollideForVirtualTerrain(int index) = 0;
-	virtual bool                            IsUsingFBTexture(const model_t* model, int nSkin, int nBody, IClientRenderable** pClientRenderable) const = 0;
-	virtual const model_t* FindOrLoadModel(const char* name) const = 0;
-	virtual MDLHandle_t                     GetCacheHandle(const model_t* model) const = 0;
-	virtual int                             GetBrushModelPlaneCount(const model_t* model) const = 0;
-	virtual void                            GetBrushModelPlane(const model_t* model, int nIndex, cplane_t& plane, Vector* pOrigin) const = 0;
-	virtual int                             GetSurfacepropsForVirtualTerrain(int index) = 0;
-	virtual bool                            UsesEnvCubemap(const model_t* model) const = 0;
-	virtual bool                            UsesStaticLighting(const model_t* model) const = 0;
-};
-
-typedef IVModelInfo IVModelInfo003;
-
-
-abstract_class IVModelInfoClient : public IVModelInfo
-{
-public:
-	virtual void OnDynamicModelsStringTableChange(int nStringIndex, const char* pString, const void* pData) = 0;
-
-	virtual const model_t* FindOrLoadModel(const char* name) = 0;
-};
-
-
-struct virtualterrainparams_t
-{
-	int index;
-};
-
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ivmodelrender.h b/SpyCustom/ivmodelrender.h
deleted file mode 100644
index 56f17ca..0000000
--- a/SpyCustom/ivmodelrender.h
+++ /dev/null
@@ -1,131 +0,0 @@
-#ifndef IVMODELRENDER_H
-#define IVMODELRENDER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "interface.h"
-#include "mathlib.h"
-#include "istudiorender.h"
-#include "idatacache.h" 
-
-struct mstudioanimdesc_t;
-struct mstudioseqdesc_t;
-struct model_t;
-class IClientRenderable;
-class Vector;
-struct studiohdr_t;
-class IMaterial;
-class CStudioHdr;
-struct MaterialLightingState_t; 
-
-FORWARD_DECLARE_HANDLE(LightCacheHandle_t);
-
-
-struct DrawModelState_t
-{
-	studiohdr_t* m_pStudioHdr;
-	studiohwdata_t* m_pStudioHWData;
-	IClientRenderable* m_pRenderable;
-	const matrix3x4_t* m_pModelToWorld;
-	StudioDecalHandle_t		m_decals;
-	int						m_drawFlags;
-	int						m_lod;
-};
-
-
-#define VENGINE_HUDMODEL_INTERFACE_VERSION	"VEngineModel016"
-
-typedef unsigned short ModelInstanceHandle_t;
-
-enum
-{
-	MODEL_INSTANCE_INVALID = (ModelInstanceHandle_t)~0
-};
-
-
-struct ModelRenderInfo_t
-{
-	Vector                  origin;
-	Vector                  angles; 
-	char                    pad[4];
-	IClientRenderable* pRenderable;
-	const model_t* pModel;
-	const matrix3x4_t* pModelToWorld;
-	const matrix3x4_t* pLightingOffset;
-	const Vector* pLightingOrigin;
-	int                     flags;
-	int                     entity_index;
-	int                     skin;
-	int                     body;
-	int                     hitboxset;
-	ModelInstanceHandle_t   instance;
-	
-	ModelRenderInfo_t()
-	{
-		pModelToWorld = NULL;
-		pLightingOffset = NULL;
-		pLightingOrigin = NULL;
-	}
-};
-
-struct StaticPropRenderInfo_t
-{
-	const matrix3x4_t* pModelToWorld;
-	const model_t* pModel;
-	IClientRenderable* pRenderable;
-	Vector* pLightingOrigin;
-	short					skin;
-	ModelInstanceHandle_t	instance;
-};
-
-struct LightingQuery_t
-{
-Vector m_LightingOrigin;
-ModelInstanceHandle_t m_InstanceHandle;
-bool m_bAmbientBoost;
-};
-
-struct StaticLightingQuery_t : public LightingQuery_t
-{
-IClientRenderable * m_pRenderable;
-};
-class IVModelRender
-{
-public:
-	virtual int                     DrawModel(int flags, IClientRenderable* pRenderable, ModelInstanceHandle_t instance, int entity_index, const model_t* model, Vector const& origin, QAngle const& angles, int skin, int body, int hitboxset, const matrix3x4_t* modelToWorld = NULL, const matrix3x4_t* pLightingOffset = NULL) = 0;
-	virtual void                    ForcedMaterialOverride(IMaterial* newMaterial, OverrideType_t nOverrideType = OVERRIDE_NORMAL, int nOverrides = 0) = 0;
-	virtual bool                    IsForcedMaterialOverride(void) = 0;
-	virtual void                    SetViewTarget(const CStudioHdr* pStudioHdr, int nBodyIndex, const Vector& target) = 0;
-	virtual ModelInstanceHandle_t   CreateInstance(IClientRenderable* pRenderable, LightCacheHandle_t* pCache = NULL) = 0;
-	virtual void                    DestroyInstance(ModelInstanceHandle_t handle) = 0;
-	virtual void                    SetStaticLighting(ModelInstanceHandle_t handle, LightCacheHandle_t* pHandle) = 0;
-	virtual LightCacheHandle_t      GetStaticLighting(ModelInstanceHandle_t handle) = 0;
-	virtual bool                    ChangeInstance(ModelInstanceHandle_t handle, IClientRenderable* pRenderable) = 0;
-	virtual void                    AddDecal(ModelInstanceHandle_t handle, Ray_t const& ray, Vector const& decalUp, int decalIndex, int body, bool noPokeThru, int maxLODToDecal) = 0;
-	virtual void                    RemoveAllDecals(ModelInstanceHandle_t handle) = 0;
-	virtual bool                    ModelHasDecals(ModelInstanceHandle_t handle) = 0;
-	virtual void                    RemoveAllDecalsFromAllModels() = 0;
-	virtual matrix3x4_t* DrawModelShadowSetup(IClientRenderable* pRenderable, int body, int skin, DrawModelInfo_t* pInfo, matrix3x4_t* pCustomBoneToWorld = NULL) = 0;
-	virtual void                    DrawModelShadow(IClientRenderable* pRenderable, const DrawModelInfo_t& info, matrix3x4_t* pCustomBoneToWorld = NULL) = 0;
-	virtual bool                    RecomputeStaticLighting(ModelInstanceHandle_t handle) = 0;
-	virtual void                    ReleaseAllStaticPropColorData(void) = 0;
-	virtual void                    RestoreAllStaticPropColorData(void) = 0;
-	virtual int                     DrawModelEx(ModelRenderInfo_t& pInfo) = 0;
-	virtual int                     DrawModelExStaticProp(ModelRenderInfo_t& pInfo) = 0;
-	virtual bool                    DrawModelSetup(ModelRenderInfo_t& pInfo, DrawModelState_t* pState, matrix3x4_t** ppBoneToWorldOut) = 0;
-	virtual void                    DrawModelExecute(IMatRenderContext* ctx, const DrawModelState_t& state, const ModelRenderInfo_t& pInfo, matrix3x4_t* pCustomBoneToWorld = NULL) = 0;
-	virtual void                    SetupLighting(const Vector& vecCenter) = 0;
-	virtual int                     DrawStaticPropArrayFast(StaticPropRenderInfo_t* pProps, int count, bool bShadowDepth) = 0;
-	virtual void                    SuppressEngineLighting(bool bSuppress) = 0;
-	virtual void                    SetupColorMeshes(int nTotalVerts) = 0;
-	virtual void                    SetupLightingEx(const Vector& vecCenter, ModelInstanceHandle_t handle) = 0;
-	virtual bool                    GetBrightestShadowingLightSource(const Vector& vecCenter, Vector& lightPos, Vector& lightBrightness, bool bAllowNonTaggedLights) = 0;
-	virtual void                    ComputeLightingState(int nCount, const LightingQuery_t* pQuery, MaterialLightingState_t* pState, ITexture** ppEnvCubemapTexture) = 0;
-	virtual void                    GetModelDecalHandles(StudioDecalHandle_t* pDecals, int nDecalStride, int nCount, const ModelInstanceHandle_t* pHandles) = 0;
-	virtual void                    ComputeStaticLightingState(int nCount, const StaticLightingQuery_t* pQuery, MaterialLightingState_t* pState, MaterialLightingState_t* pDecalState, ColorMeshInfo_t** ppStaticLighting, ITexture** ppEnvCubemapTexture, DataCacheHandle_t* pColorMeshHandles) = 0;
-	virtual void                    CleanupStaticLightingState(int nCount, DataCacheHandle_t* pColorMeshHandles) = 0;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ivrenderview.h b/SpyCustom/ivrenderview.h
deleted file mode 100644
index 12f031c..0000000
--- a/SpyCustom/ivrenderview.h
+++ /dev/null
@@ -1,310 +0,0 @@
-#if !defined( IVRENDERVIEW_H )
-#define IVRENDERVIEW_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "basetypes.h"
-#include "vplane.h"
-#include "interface.h"
-#include "imaterialsystem.h"
-#include "const.h"
-#include "vertexcolor.h"
-#include "refcount.h"
- 
-
-
-class CViewSetup;
-class CEngineSprite;
-class IClientEntity;
-class IMaterial;
-struct model_t;
-class IClientRenderable;
-class IMatRenderContext;
-class CVolumeCuller;
-
-
-enum
-{
-	DRAWWORLDLISTS_DRAW_STRICTLYABOVEWATER = 0x001,
-	DRAWWORLDLISTS_DRAW_STRICTLYUNDERWATER = 0x002,
-	DRAWWORLDLISTS_DRAW_INTERSECTSWATER = 0x004,
-	DRAWWORLDLISTS_DRAW_WATERSURFACE = 0x008,
-	DRAWWORLDLISTS_DRAW_SKYBOX = 0x010,
-	DRAWWORLDLISTS_DRAW_CLIPSKYBOX = 0x020,
-	DRAWWORLDLISTS_DRAW_SHADOWDEPTH = 0x040,
-	DRAWWORLDLISTS_DRAW_REFRACTION = 0x080,
-	DRAWWORLDLISTS_DRAW_REFLECTION = 0x100,
-	DRAWWORLDLISTS_DRAW_WORLD_GEOMETRY = 0x200,
-	DRAWWORLDLISTS_DRAW_DECALS_AND_OVERLAYS = 0x400,
-	DRAWWORLDLISTS_DRAW_SIMPLE_WORLD_MODEL = 0x800,
-	DRAWWORLDLISTS_DRAW_SIMPLE_WORLD_MODEL_WATER = 0x1000,
-	DRAWWORLDLISTS_DRAW_SKIP_DISPLACEMENTS = 0x2000,
-	DRAWWORLDLISTS_DRAW_SSAO = 0x4000,
-};
-
-enum
-{
-	MAT_SORT_GROUP_STRICTLY_ABOVEWATER = 0,
-	MAT_SORT_GROUP_STRICTLY_UNDERWATER,
-	MAT_SORT_GROUP_INTERSECTS_WATER_SURFACE,
-	MAT_SORT_GROUP_WATERSURFACE,
-
-	MAX_MAT_SORT_GROUPS
-};
-
-enum ERenderDepthMode_t
-{
-	DEPTH_MODE_NORMAL = 0,
-	DEPTH_MODE_SHADOW = 1,
-	DEPTH_MODE_SSA0 = 2,
-
-	DEPTH_MODE_MAX
-};
-
-
-static const char* s_pMatSortGroupsString[] =
-{
-	"Sort: Abovewater",
-	"Sort: Underwater",
-	"Sort: IntersectsWater",
-	"Sort: WaterSurface",
-};
-
-typedef VPlane Frustum[FRUSTUM_NUMPLANES];
-
-
-typedef unsigned short LeafIndex_t;
-enum
-{
-	INVALID_LEAF_INDEX = (LeafIndex_t)~0
-};
-
-
-#if 1
-struct WorldListLeafData_t
-{
-	LeafIndex_t	leafIndex;	  
-	int16	waterData;
-	uint16 	firstTranslucentSurface;	   
-	uint16	translucentSurfaceCount;	    
-};
-#else
-struct WorldListLeafData_t
-{
-	uint32	leafIndex;
-	int32	waterData;
-	uint32	firstTranslucentSurface;	   
-	uint32	translucentSurfaceCount;	    
-};
-#endif
-struct WorldListInfo_t
-{
-	int		m_ViewFogVolume;
-	int		m_LeafCount;
-	bool	m_bHasWater;
-	WorldListLeafData_t* m_pLeafDataList;
-};
-
-class IWorldRenderList : public IRefCounted
-{
-};
-
-struct VisibleFogVolumeInfo_t
-{
-	int		m_nVisibleFogVolume;
-	int		m_nVisibleFogVolumeLeaf;
-	bool	m_bEyeInFogVolume;
-	float	m_flDistanceToWater;
-	float	m_flWaterHeight;
-	IMaterial* m_pFogVolumeMaterial;
-};
-
-
-struct BrushVertex_t
-{
-	Vector		m_Pos;
-	Vector		m_Normal;
-	Vector		m_TangentS;
-	Vector		m_TangentT;
-	Vector2D	m_TexCoord;
-	Vector2D	m_LightmapCoord;
-
-private:
-	BrushVertex_t(const BrushVertex_t& src);
-};
-
-struct VisOverrideData_t
-{
-	Vector		m_vecVisOrigin;					              
-	float		m_fDistToAreaPortalTolerance;	               
-
-	Vector		m_vPortalCorners[4];			                      
-	bool		m_bTrimFrustumToPortalCorners;
-
-	Vector		m_vPortalOrigin;
-	Vector		m_vPortalForward;
-	float		m_flPortalRadius;
-
-};
-
-
-class IBrushSurface
-{
-public:
-	virtual void ComputeTextureCoordinate(Vector const& worldPos, Vector2D& texCoord) = 0;
-	virtual void ComputeLightmapCoordinate(Vector const& worldPos, Vector2D& lightmapCoord) = 0;
-
-	virtual int  GetVertexCount() const = 0;
-	virtual void GetVertexData(BrushVertex_t* pVerts) = 0;
-
-	virtual IMaterial* GetMaterial() = 0;
-};
-
-
-class IBrushRenderer
-{
-public:
-	virtual bool RenderBrushModelSurface(IClientEntity* pBaseEntity, IBrushSurface* pBrushSurface) = 0;
-};
-
-
-#define MAX_VIS_LEAVES	32
-enum DrawBrushModelMode_t
-{
-	DBM_DRAW_ALL = 0,
-	DBM_DRAW_OPAQUE_ONLY,
-	DBM_DRAW_TRANSLUCENT_ONLY,
-};
-
-
-struct BrushArrayInstanceData_t
-{
-	matrix3x4a_t* m_pBrushToWorld;			                   
-	const model_t* m_pBrushModel;			           
-	Vector4D m_DiffuseModulation;
-	ShaderStencilState_t* m_pStencilState;
-};
-
-
-class IVRenderView
-{
-public:
-
-	virtual void			DrawBrushModel(								
-		IClientEntity* baseentity,
-		model_t* model,
-		const Vector& origin,
-		const QAngle& angles,
-		bool bUnused) = 0;
-
-	virtual void			DrawIdentityBrushModel(IWorldRenderList* pList, model_t* model) = 0;								
-
-	virtual void			TouchLight(struct dlight_t* light) = 0;								
-	virtual void			Draw3DDebugOverlays(void) = 0;								
-	virtual void			SetBlend(float blend) = 0;								
-	virtual float			GetBlend(void) = 0;								
-
-	virtual void			SetColorModulation(float const* blend) = 0;								
-	virtual void			GetColorModulation(float* blend) = 0;								
-
-	virtual void			SceneBegin(void) = 0;								
-	virtual void			SceneEnd(void) = 0;								
-
-	virtual void			GetVisibleFogVolume(const Vector& eyePoint, const VisOverrideData_t* pVisOverrideData, VisibleFogVolumeInfo_t* pInfo) = 0;
-
-	virtual IWorldRenderList* CreateWorldList() = 0;								
-#if defined(_PS3)
-	virtual IWorldRenderList* CreateWorldList_PS3(int viewID) = 0;
-	virtual void			BuildWorldLists_PS3_Epilogue(IWorldRenderList* pList, WorldListInfo_t* pInfo, bool bShadowDepth) = 0;
-#else
-	virtual void			BuildWorldLists_Epilogue(IWorldRenderList* pList, WorldListInfo_t* pInfo, bool bShadowDepth) = 0;								
-#endif
-	virtual void			BuildWorldLists(IWorldRenderList* pList, WorldListInfo_t* pInfo, int iForceFViewLeaf, const VisOverrideData_t* pVisData = NULL, bool bShadowDepth = false, float* pReflectionWaterHeight = NULL) = 0;
-	virtual void			DrawWorldLists(IMatRenderContext* pRenderContext, IWorldRenderList* pList, unsigned long flags, float waterZAdjust) = 0;								
-	virtual void			GetWorldListIndicesInfo(WorldListIndicesInfo_t* pIndicesInfoOut, IWorldRenderList* pList, unsigned long nFlags) = 0;								
-
-	virtual void			DrawTopView(bool enable) = 0;								
-	virtual void			TopViewNoBackfaceCulling(bool bDisable) = 0;								
-	virtual void			TopViewNoVisCheck(bool bDisable) = 0;								
-	virtual void			TopViewBounds(Vector2D const& mins, Vector2D const& maxs) = 0;								
-	virtual void			SetTopViewVolumeCuller(const CVolumeCuller* pVolumeCuller) = 0;								
-
-	virtual void			DrawLights(void) = 0;								
-	virtual void			DrawMaskEntities(void) = 0;								
-
-	virtual void			DrawTranslucentSurfaces(IMatRenderContext* pRenderContext, IWorldRenderList* pList, int* pSortList, int sortCount, unsigned long flags) = 0;
-
-	virtual void			DrawLineFile(void) = 0;								
-	virtual void			DrawLightmaps(IWorldRenderList* pList, int pageId) = 0;								
-	virtual void			ViewSetupVis(bool novis, int numorigins, const Vector origin[]) = 0;								
-
-	virtual bool			AreAnyLeavesVisible(int* leafList, int nLeaves) = 0;								
-
-	virtual	void			VguiPaint(void) = 0;								
-	virtual void			ViewDrawFade(byte* color, IMaterial* pMaterial, bool mapFullTextureToScreen = true) = 0;								
-	virtual void			OLD_SetProjectionMatrix(float fov, float zNear, float zFar) = 0;
-	virtual colorVec		GetLightAtPoint(Vector& pos) = 0;
-	virtual int				GetViewEntity(void) = 0;
-	virtual bool			IsViewEntity(int entindex) = 0;
-	virtual float			GetFieldOfView(void) = 0;
-	virtual unsigned char** GetAreaBits(void) = 0;
-
-	virtual void			SetFogVolumeState(int nVisibleFogVolume, bool bUseHeightFog) = 0;
-
-	virtual void			InstallBrushSurfaceRenderer(IBrushRenderer* pBrushRenderer) = 0;
-
-	virtual void			DrawBrushModelShadow(IClientRenderable* pRenderable) = 0;
-
-	virtual	bool			LeafContainsTranslucentSurfaces(IWorldRenderList* pList, int sortIndex, unsigned long flags) = 0;
-
-	virtual bool			DoesBoxIntersectWaterVolume(const Vector& mins, const Vector& maxs, int leafWaterDataID) = 0;
-
-	virtual void			SetAreaState(
-		unsigned char chAreaBits[MAX_AREA_STATE_BYTES],
-		unsigned char chAreaPortalBits[MAX_AREA_PORTAL_STATE_BYTES]) = 0;
-
-	virtual void			VGui_Paint(int mode) = 0;
-
-	virtual void			Push3DView(IMatRenderContext* pRenderContext, const CViewSetup& view, int nFlags, ITexture* pRenderTarget, Frustum frustumPlanes) = 0;
-	virtual void			Push2DView(IMatRenderContext* pRenderContext, const CViewSetup& view, int nFlags, ITexture* pRenderTarget, Frustum frustumPlanes) = 0;
-	virtual void			PopView(IMatRenderContext* pRenderContext, Frustum frustumPlanes) = 0;
-
-	virtual void			SetMainView(const Vector& vecOrigin, const QAngle& angles) = 0;
-
-	enum
-	{
-		VIEW_SETUP_VIS_EX_RETURN_FLAGS_USES_RADIAL_VIS = 0x00000001
-	};
-
-	virtual void			ViewSetupVisEx(bool novis, int numorigins, const Vector origin[], unsigned int& returnFlags) = 0;
-
-	virtual void			OverrideViewFrustum(Frustum custom) = 0;
-
-	virtual void			DrawBrushModelShadowDepth(IClientEntity* baseentity, model_t* model, const Vector& origin, const QAngle& angles, ERenderDepthMode_t DepthMode) = 0;
-	virtual void			UpdateBrushModelLightmap(model_t* model, IClientRenderable* pRenderable) = 0;
-	virtual void			BeginUpdateLightmaps(void) = 0;
-	virtual void			EndUpdateLightmaps() = 0;
-	virtual void			OLD_SetOffCenterProjectionMatrix(float fov, float zNear, float zFar, float flAspectRatio, float flBottom, float flTop, float flLeft, float flRight) = 0;
-	virtual void			OLD_SetProjectionMatrixOrtho(float left, float top, float right, float bottom, float zNear, float zFar) = 0;
-	virtual void			Push3DView(IMatRenderContext* pRenderContext, const CViewSetup& view, int nFlags, ITexture* pRenderTarget, Frustum frustumPlanes, ITexture* pDepthTexture) = 0;
-	virtual void			GetMatricesForView(const CViewSetup& view, VMatrix* pWorldToView, VMatrix* pViewToProjection, VMatrix* pWorldToProjection, VMatrix* pWorldToPixels) = 0;
-	virtual void			DrawBrushModelEx(IClientEntity* baseentity, model_t* model, const Vector& origin, const QAngle& angles, DrawBrushModelMode_t mode) = 0;
-
-	virtual bool			DoesBrushModelNeedPowerOf2Framebuffer(const model_t* model) = 0;
-
-	virtual void			DrawBrushModelArray(IMatRenderContext* pContext, int nCount, const BrushArrayInstanceData_t* pInstanceData, int nModelTypeFlags) = 0;
-};
-
-#define VENGINE_RENDERVIEW_INTERFACE_VERSION	"VEngineRenderView014"
-
-#if defined(_STATIC_LINKED) && defined(CLIENT_DLL)
-namespace Client
-{
-	extern IVRenderView* render;
-}
-#else
-extern IVRenderView* render;
-#endif
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/jobthread.h b/SpyCustom/jobthread.h
deleted file mode 100644
index d254370..0000000
--- a/SpyCustom/jobthread.h
+++ /dev/null
@@ -1,1270 +0,0 @@
-#include <limits.h>
-#include "threadtools.h"
-#include "refcount.h"
-#include "utllinkedlist.h"
-#include "utlvector.h"
-#include "functors.h"
-
-#include "vstdlib.h"
-
-#ifndef JOBTHREAD_H
-#define JOBTHREAD_H
-
-#ifdef AddJob      
-#undef AddJob
-#undef GetJob
-#endif
-
-#ifdef VSTDLIB_DLL_EXPORT
-#define JOB_INTERFACE	DLL_EXPORT
-#define JOB_OVERLOAD	DLL_GLOBAL_EXPORT
-#define JOB_CLASS		DLL_CLASS_EXPORT
-#else
-#define JOB_INTERFACE	DLL_IMPORT
-#define JOB_OVERLOAD	DLL_GLOBAL_IMPORT
-#define JOB_CLASS		DLL_CLASS_IMPORT
-#endif
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-class CJob;
-
-enum JobStatusEnum_t
-{
-	JOB_OK,						   
-	JOB_STATUS_PENDING,			       
-	JOB_STATUS_INPROGRESS,		    
-	JOB_STATUS_ABORTED,			     
-	JOB_STATUS_UNSERVICED,		     
-};
-
-typedef int JobStatus_t;
-
-enum JobFlags_t
-{
-	JF_IO = (1 << 0),	        
-	JF_BOOST_THREAD = (1 << 1),	          
-	JF_SERIAL = (1 << 2),	            
-	JF_QUEUE = (1 << 3),	        
-};
-
-enum JobPriority_t
-{
-	JP_LOW,
-	JP_NORMAL,
-	JP_HIGH,
-	JP_IMMEDIATE,
-
-	JP_NUM_PRIORITIES,
-
-	JP_FRAME = JP_NORMAL,
-	JP_FRAME_SEGMENT = JP_HIGH,
-};
-
-#define TP_MAX_POOL_THREADS	64
-struct ThreadPoolStartParams_t
-{
-	ThreadPoolStartParams_t(bool bIOThreads = false, unsigned nThreads = (unsigned)-1, int* pAffinities = NULL, ThreeState_t fDistribute = TRS_NONE, unsigned nStackSize = (unsigned)-1, int iThreadPriority = SHRT_MIN)
-		: bIOThreads(bIOThreads), nThreads(nThreads), nThreadsMax(-1), fDistribute(fDistribute), nStackSize(nStackSize), iThreadPriority(iThreadPriority)
-	{
-		bExecOnThreadPoolThreadsOnly = false;
-#if defined( DEDICATED ) && IsPlatformLinux()
-		bEnableOnLinuxDedicatedServer = false;           
-#endif
-
-		bUseAffinityTable = (pAffinities != NULL) && (fDistribute == TRS_TRUE) && (nThreads != (unsigned)-1);
-		if (bUseAffinityTable)
-		{
-			nThreads = MIN(TP_MAX_POOL_THREADS, nThreads);
-			for (unsigned int i = 0; i < nThreads; i++)
-			{
-				iAffinityTable[i] = pAffinities[i];
-			}
-		}
-	}
-
-	int				nThreads;
-	int				nThreadsMax;
-	ThreeState_t	fDistribute;
-	int				nStackSize;
-	int				iThreadPriority;
-	int				iAffinityTable[TP_MAX_POOL_THREADS];
-
-	bool			bIOThreads : 1;
-	bool			bUseAffinityTable : 1;
-	bool			bExecOnThreadPoolThreadsOnly : 1;
-#if defined( DEDICATED ) && IsPlatformLinux()
-	bool			bEnableOnLinuxDedicatedServer : 1;
-#endif
-};
-
-typedef bool (*JobFilter_t)(CJob*);
-
-enum ThreadPoolMessages_t
-{
-	TPM_EXIT,		   
-	TPM_SUSPEND,		    
-};
-
-#ifdef Yield
-#undef Yield
-#endif
-
-abstract_class IThreadPool : public IRefCounted
-{
-public:
-	virtual ~IThreadPool() {};
-
-	virtual bool Start(const ThreadPoolStartParams_t& startParams = ThreadPoolStartParams_t()) = 0;
-	virtual bool Stop(int timeout = TT_INFINITE) = 0;
-
-	virtual unsigned GetJobCount() = 0;
-	virtual int NumThreads() = 0;
-	virtual int NumIdleThreads() = 0;
-
-	virtual int SuspendExecution() = 0;
-	virtual int ResumeExecution() = 0;
-
-	virtual int YieldWait(CThreadEvent** pEvents, int nEvents, bool bWaitAll = true, unsigned timeout = TT_INFINITE) = 0;
-	virtual int YieldWait(CJob**, int nJobs, bool bWaitAll = true, unsigned timeout = TT_INFINITE) = 0;
-	virtual void Yield(unsigned timeout) = 0;
-
-	bool YieldWait(CThreadEvent& event, unsigned timeout = TT_INFINITE);
-	bool YieldWait(CJob*, unsigned timeout = TT_INFINITE);
-
-	virtual void AddJob(CJob*) = 0;
-
-	virtual void AddFunctor(CFunctor* pFunctor, CJob** ppJob = NULL, const char* pszDescription = NULL, unsigned flags = 0) { AddFunctorInternal(RetAddRef(pFunctor), ppJob, pszDescription, flags); }
-
-	virtual void ChangePriority(CJob* p, JobPriority_t priority) = 0;
-
-	int ExecuteAll(JobFilter_t pfnFilter = NULL) { return ExecuteToPriority(JP_LOW, pfnFilter); }
-	virtual int ExecuteToPriority(JobPriority_t toPriority, JobFilter_t pfnFilter = NULL) = 0;
-	virtual int AbortAll() = 0;
-
-	virtual void AddPerFrameJob(CJob*) = 0;
-
-	#define DEFINE_NONMEMBER_ADD_CALL(N) \
-		template <typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		CJob *AddCall(FUNCTION_RETTYPE (*pfnProxied)( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			CJob *pJob; \
-			if ( !NumIdleThreads() ) \
-			{ \
-				pJob = GetDummyJob(); \
-				FunctorDirectCall( pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ); \
-			} \
-			else \
-			{ \
-				AddFunctorInternal( CreateFunctor( pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ), &pJob ); \
-			} \
-			\
-			return pJob; \
-		}
-
-	#define DEFINE_MEMBER_ADD_CALL(N) \
-		template <typename OBJECT_TYPE, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		CJob *AddCall(OBJECT_TYPE *pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			CJob *pJob; \
-			if ( !NumIdleThreads() ) \
-			{ \
-				pJob = GetDummyJob(); \
-				FunctorDirectCall( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ); \
-			} \
-			else \
-			{ \
-				AddFunctorInternal( CreateFunctor( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ), &pJob ); \
-			} \
-			\
-			return pJob; \
-		}
-
-	#define DEFINE_CONST_MEMBER_ADD_CALL(N) \
-		template <typename OBJECT_TYPE, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		CJob *AddCall(OBJECT_TYPE *pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) const FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			CJob *pJob; \
-			if ( !NumIdleThreads() ) \
-			{ \
-				pJob = GetDummyJob(); \
-				FunctorDirectCall( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ); \
-			} \
-			else \
-			{ \
-				AddFunctorInternal( CreateFunctor( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ), &pJob ); \
-			} \
-			\
-			return pJob; \
-		}
-
-	#define DEFINE_REF_COUNTING_MEMBER_ADD_CALL(N) \
-		template <typename OBJECT_TYPE, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		CJob *AddRefCall(OBJECT_TYPE *pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			CJob *pJob; \
-			if ( !NumIdleThreads() ) \
-			{ \
-				pJob = GetDummyJob(); \
-				FunctorDirectCall( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ); \
-			} \
-			else \
-			{ \
-				AddFunctorInternal( CreateRefCountingFunctor( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ), &pJob ); \
-			} \
-			\
-			return pJob; \
-		}
-
-	#define DEFINE_REF_COUNTING_CONST_MEMBER_ADD_CALL(N) \
-		template <typename OBJECT_TYPE, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		CJob *AddRefCall(OBJECT_TYPE *pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) const FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			CJob *pJob; \
-			if ( !NumIdleThreads() ) \
-			{ \
-				pJob = GetDummyJob(); \
-				FunctorDirectCall( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ); \
-			} \
-			else \
-			{ \
-				AddFunctorInternal( CreateRefCountingFunctor( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ), &pJob ); \
-			} \
-			\
-			return pJob; \
-		}
-
-	#define DEFINE_NONMEMBER_QUEUE_CALL(N) \
-		template <typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		CJob *QueueCall(FUNCTION_RETTYPE (*pfnProxied)( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			CJob *pJob; \
-			AddFunctorInternal( CreateFunctor( pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ), &pJob, NULL, JF_QUEUE ); \
-			return pJob; \
-		}
-
-	#define DEFINE_MEMBER_QUEUE_CALL(N) \
-		template <typename OBJECT_TYPE, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		CJob *QueueCall(OBJECT_TYPE *pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			CJob *pJob; \
-			AddFunctorInternal( CreateFunctor( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ), &pJob, NULL, JF_QUEUE ); \
-			return pJob; \
-		}
-
-	#define DEFINE_CONST_MEMBER_QUEUE_CALL(N) \
-		template <typename OBJECT_TYPE, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		CJob *QueueCall(OBJECT_TYPE *pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) const FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			CJob *pJob; \
-			AddFunctorInternal( CreateFunctor( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ), &pJob, NULL, JF_QUEUE ); \
-			return pJob; \
-		}
-
-	#define DEFINE_REF_COUNTING_MEMBER_QUEUE_CALL(N) \
-		template <typename OBJECT_TYPE, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		CJob *QueueRefCall(OBJECT_TYPE *pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			CJob *pJob; \
-			AddFunctorInternal( CreateRefCountingFunctor( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ), &pJob, NULL, JF_QUEUE ); \
-			return pJob; \
-		}
-
-	#define DEFINE_REF_COUNTING_CONST_MEMBER_QUEUE_CALL(N) \
-		template <typename OBJECT_TYPE, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N> \
-		CJob *QueueRefCall(OBJECT_TYPE *pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ) const FUNC_ARG_FORMAL_PARAMS_##N ) \
-		{ \
-			CJob *pJob; \
-			AddFunctorInternal( CreateRefCountingFunctor( pObject, pfnProxied FUNC_FUNCTOR_CALL_ARGS_##N ), &pJob, NULL, JF_QUEUE ); \
-			\
-			return pJob; \
-		}
-
-	FUNC_GENERATE_ALL(DEFINE_NONMEMBER_ADD_CALL);
-	FUNC_GENERATE_ALL(DEFINE_MEMBER_ADD_CALL);
-	FUNC_GENERATE_ALL(DEFINE_CONST_MEMBER_ADD_CALL);
-	FUNC_GENERATE_ALL(DEFINE_REF_COUNTING_MEMBER_ADD_CALL);
-	FUNC_GENERATE_ALL(DEFINE_REF_COUNTING_CONST_MEMBER_ADD_CALL);
-	FUNC_GENERATE_ALL(DEFINE_NONMEMBER_QUEUE_CALL);
-	FUNC_GENERATE_ALL(DEFINE_MEMBER_QUEUE_CALL);
-	FUNC_GENERATE_ALL(DEFINE_CONST_MEMBER_QUEUE_CALL);
-	FUNC_GENERATE_ALL(DEFINE_REF_COUNTING_MEMBER_QUEUE_CALL);
-	FUNC_GENERATE_ALL(DEFINE_REF_COUNTING_CONST_MEMBER_QUEUE_CALL);
-
-	#undef DEFINE_NONMEMBER_ADD_CALL
-	#undef DEFINE_MEMBER_ADD_CALL
-	#undef DEFINE_CONST_MEMBER_ADD_CALL
-	#undef DEFINE_REF_COUNTING_MEMBER_ADD_CALL
-	#undef DEFINE_REF_COUNTING_CONST_MEMBER_ADD_CALL
-	#undef DEFINE_NONMEMBER_QUEUE_CALL
-	#undef DEFINE_MEMBER_QUEUE_CALL
-	#undef DEFINE_CONST_MEMBER_QUEUE_CALL
-	#undef DEFINE_REF_COUNTING_MEMBER_QUEUE_CALL
-	#undef DEFINE_REF_COUNTING_CONST_MEMBER_QUEUE_CALL
-
-private:
-	virtual void AddFunctorInternal(CFunctor*, CJob** = NULL, const char* pszDescription = NULL, unsigned flags = 0) = 0;
-
-	friend class CJob;
-
-	virtual CJob* GetDummyJob() = 0;
-
-public:
-	virtual void Distribute(bool bDistribute = true, int* pAffinityTable = NULL) = 0;
-
-	virtual bool Start(const ThreadPoolStartParams_t& startParams, const char* pszNameOverride) = 0;
-
-	virtual int YieldWaitPerFrameJobs() = 0;
-};
-
-JOB_INTERFACE IThreadPool* CreateNewThreadPool();
-JOB_INTERFACE void DestroyThreadPool(IThreadPool* pPool);
-
-JOB_INTERFACE void RunThreadPoolTests();
-
-JOB_INTERFACE IThreadPool* g_pThreadPool;
-#ifdef _X360
-JOB_INTERFACE IThreadPool* g_pAlternateThreadPool;
-#endif
-
-DECLARE_POINTER_HANDLE(ThreadPoolData_t);
-#define JOB_NO_DATA ((ThreadPoolData_t)-1)
-
-class CJob : public CRefCounted1<IRefCounted, CRefCountServiceMT>
-{
-public:
-	CJob(JobPriority_t priority = JP_NORMAL)
-		: m_status(JOB_STATUS_UNSERVICED),
-		m_ThreadPoolData(JOB_NO_DATA),
-		m_priority(priority),
-		m_flags(0),
-		m_pThreadPool(NULL),
-		m_CompleteEvent(true),
-		m_iServicingThread(-1)
-	{
-	}
-
-	void SetPriority(JobPriority_t priority) { m_priority = priority; }
-	JobPriority_t GetPriority() const { return m_priority; }
-
-	void SetFlags(unsigned flags) { m_flags = flags; }
-	unsigned GetFlags() const { return m_flags; }
-
-	void SetServiceThread(int iServicingThread) { m_iServicingThread = (char)iServicingThread; }
-	int GetServiceThread() const { return m_iServicingThread; }
-	void ClearServiceThread() { m_iServicingThread = -1; }
-
-	bool Executed() const { return (m_status == JOB_OK); }
-	bool CanExecute() const { return (m_status == JOB_STATUS_PENDING || m_status == JOB_STATUS_UNSERVICED); }
-	bool IsFinished() const { return (m_status != JOB_STATUS_PENDING && m_status != JOB_STATUS_INPROGRESS && m_status != JOB_STATUS_UNSERVICED); }
-	JobStatus_t GetStatus() const { return m_status; }
-
-	bool TryLock() { return m_mutex.TryLock(); }
-	void Lock() { m_mutex.Lock(); }
-	void Unlock() { m_mutex.Unlock(); }
-
-	bool WaitForFinish(uint32 dwTimeout = TT_INFINITE) { if (!this) return true; return (!IsFinished()) ? g_pThreadPool->YieldWait(this, dwTimeout) : true; }
-	bool WaitForFinishAndRelease(uint32 dwTimeout = TT_INFINITE) { if (!this) return true; bool bResult = WaitForFinish(dwTimeout); Release(); return bResult; }
-	CThreadEvent* AccessEvent() { return &m_CompleteEvent; }
-
-	JobStatus_t Execute();
-	JobStatus_t TryExecute();
-	JobStatus_t ExecuteAndRelease() { JobStatus_t status = Execute(); Release(); return status; }
-	JobStatus_t TryExecuteAndRelease() { JobStatus_t status = TryExecute(); Release(); return status; }
-
-	JobStatus_t Abort(bool bDiscard = true);
-
-	virtual char const* Describe() { return "Job"; }
-
-private:
-	friend class CThreadPool;
-
-	JobStatus_t			m_status;
-	JobPriority_t		m_priority;
-	CThreadMutex		m_mutex;
-	unsigned char		m_flags;
-	char				m_iServicingThread;
-	short				m_reserved;
-	ThreadPoolData_t	m_ThreadPoolData;
-	IThreadPool* m_pThreadPool;
-	CThreadEvent		m_CompleteEvent;
-
-#if defined( THREAD_PARENT_STACK_TRACE_ENABLED )
-	void* m_ParentStackTrace[THREAD_PARENT_STACK_TRACE_LENGTH];
-#endif
-
-private:
-	CJob(const CJob& fromRequest);
-	void operator=(const CJob& fromRequest);
-
-	virtual JobStatus_t DoExecute() = 0;
-	virtual JobStatus_t DoAbort(bool bDiscard) { return JOB_STATUS_ABORTED; }
-	virtual void DoCleanup() {}
-};
-
-class CFunctorJob : public CJob
-{
-public:
-	CFunctorJob(CFunctor* pFunctor, const char* pszDescription = NULL)
-		: m_pFunctor(pFunctor)
-	{
-		if (pszDescription)
-		{
-			Q_strncpy(m_szDescription, pszDescription, sizeof(m_szDescription));
-		}
-		else
-		{
-			m_szDescription[0] = 0;
-		}
-	}
-
-	virtual JobStatus_t DoExecute()
-	{
-		(*m_pFunctor)();
-		return JOB_OK;
-	}
-
-	const char* Describe()
-	{
-		return m_szDescription;
-	}
-
-private:
-	CRefPtr<CFunctor> m_pFunctor;
-	char m_szDescription[16];
-};
-
-class CJobSet
-{
-public:
-	CJobSet(CJob* pJob = NULL)
-	{
-		if (pJob)
-		{
-			m_jobs.AddToTail(pJob);
-		}
-	}
-
-	CJobSet(CJob** ppJobs, int nJobs)
-	{
-		if (ppJobs)
-		{
-			m_jobs.AddMultipleToTail(nJobs, ppJobs);
-		}
-	}
-
-	~CJobSet()
-	{
-		for (int i = 0; i < m_jobs.Count(); i++)
-		{
-			m_jobs[i]->Release();
-		}
-	}
-
-	void operator+=(CJob* pJob)
-	{
-		m_jobs.AddToTail(pJob);
-	}
-
-	void operator-=(CJob* pJob)
-	{
-		m_jobs.FindAndRemove(pJob);
-	}
-
-	void Execute(bool bRelease = true)
-	{
-		for (int i = 0; i < m_jobs.Count(); i++)
-		{
-			m_jobs[i]->Execute();
-			if (bRelease)
-			{
-				m_jobs[i]->Release();
-			}
-		}
-
-		if (bRelease)
-		{
-			m_jobs.RemoveAll();
-		}
-	}
-
-	void Abort(bool bRelease = true)
-	{
-		for (int i = 0; i < m_jobs.Count(); i++)
-		{
-			m_jobs[i]->Abort();
-			if (bRelease)
-			{
-				m_jobs[i]->Release();
-			}
-		}
-
-		if (bRelease)
-		{
-			m_jobs.RemoveAll();
-		}
-	}
-
-	void WaitForFinish(bool bRelease = true)
-	{
-		for (int i = 0; i < m_jobs.Count(); i++)
-		{
-			m_jobs[i]->WaitForFinish();
-			if (bRelease)
-			{
-				m_jobs[i]->Release();
-			}
-		}
-
-		if (bRelease)
-		{
-			m_jobs.RemoveAll();
-		}
-	}
-
-	void WaitForFinish(IThreadPool* pPool, bool bRelease = true)
-	{
-		pPool->YieldWait(m_jobs.Base(), m_jobs.Count());
-
-		if (bRelease)
-		{
-			for (int i = 0; i < m_jobs.Count(); i++)
-			{
-				m_jobs[i]->Release();
-			}
-
-			m_jobs.RemoveAll();
-		}
-	}
-
-private:
-	CUtlVectorFixed<CJob*, 16> m_jobs;
-};
-
-#define ThreadExecute g_pThreadPool->QueueCall
-#define ThreadExecuteRef g_pThreadPool->QueueRefCall
-
-#define BeginExecuteParallel()	do { CJobSet jobSet
-#define EndExecuteParallel()	jobSet.WaitForFinish( g_pThreadPool ); } while (0)
-
-#define ExecuteParallel			jobSet += g_pThreadPool->QueueCall
-#define ExecuteRefParallel		jobSet += g_pThreadPool->QueueCallRef
-
-
-#pragma warning(push)
-#pragma warning(disable:4389)
-#pragma warning(disable:4018)
-#pragma warning(disable:4701)
-
-#define DEFINE_NON_MEMBER_ITER_RANGE_PARALLEL(N) \
-	template <typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N, typename ITERTYPE1, typename ITERTYPE2> \
-	void IterRangeParallel(FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( ITERTYPE1, ITERTYPE2 FUNC_SEPARATOR_##N FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ), ITERTYPE1 from, ITERTYPE2 to FUNC_ARG_FORMAL_PARAMS_##N ) \
-	{ \
-		const int MAX_THREADS = 16; \
-		int nIdle = g_pThreadPool->NumIdleThreads(); \
-		ITERTYPE1 range = to - from; \
-		int nThreads = min( nIdle + 1, range ); \
-		if ( nThreads > MAX_THREADS ) \
-		{ \
-			nThreads = MAX_THREADS; \
-		} \
-		if ( nThreads < 2 ) \
-		{ \
-			FunctorDirectCall( pfnProxied, from, to FUNC_FUNCTOR_CALL_ARGS_##N ); \
-		} \
-		else \
-		{ \
-			ITERTYPE1 nIncrement = range / nThreads; \
-			\
-			CJobSet jobSet; \
-			while ( --nThreads ) \
-			{ \
-				ITERTYPE2 thisTo = from + nIncrement; \
-				jobSet += g_pThreadPool->AddCall( pfnProxied, from, thisTo FUNC_FUNCTOR_CALL_ARGS_##N ); \
-				from = thisTo; \
-			} \
-			FunctorDirectCall( pfnProxied, from, to FUNC_FUNCTOR_CALL_ARGS_##N ); \
-			jobSet.WaitForFinish( g_pThreadPool ); \
-		} \
-		\
-	}
-
-FUNC_GENERATE_ALL(DEFINE_NON_MEMBER_ITER_RANGE_PARALLEL);
-
-#define DEFINE_MEMBER_ITER_RANGE_PARALLEL(N) \
-	template <typename OBJECT_TYPE, typename FUNCTION_CLASS, typename FUNCTION_RETTYPE FUNC_TEMPLATE_FUNC_PARAMS_##N FUNC_TEMPLATE_ARG_PARAMS_##N, typename ITERTYPE1, typename ITERTYPE2> \
-	void IterRangeParallel(OBJECT_TYPE *pObject, FUNCTION_RETTYPE ( FUNCTION_CLASS::*pfnProxied )( ITERTYPE1, ITERTYPE2 FUNC_SEPARATOR_##N FUNC_BASE_TEMPLATE_FUNC_PARAMS_##N ), ITERTYPE1 from, ITERTYPE2 to FUNC_ARG_FORMAL_PARAMS_##N ) \
-	{ \
-		const int MAX_THREADS = 16; \
-		int nIdle = g_pThreadPool->NumIdleThreads(); \
-		ITERTYPE1 range = to - from; \
-		int nThreads = min( nIdle + 1, range ); \
-		if ( nThreads > MAX_THREADS ) \
-		{ \
-			nThreads = MAX_THREADS; \
-		} \
-		if ( nThreads < 2 ) \
-		{ \
-			FunctorDirectCall( pObject, pfnProxied, from, to FUNC_FUNCTOR_CALL_ARGS_##N ); \
-		} \
-		else \
-		{ \
-			ITERTYPE1 nIncrement = range / nThreads; \
-			\
-			CJobSet jobSet; \
-			while ( --nThreads ) \
-			{ \
-				ITERTYPE2 thisTo = from + nIncrement; \
-				jobSet += g_pThreadPool->AddCall( pObject, pfnProxied, from, thisTo FUNC_FUNCTOR_CALL_ARGS_##N ); \
-				from = thisTo; \
-			} \
-			FunctorDirectCall( pObject, pfnProxied, from, to FUNC_FUNCTOR_CALL_ARGS_##N ); \
-			jobSet.WaitForFinish( g_pThreadPool ); \
-		} \
-		\
-	}
-
-FUNC_GENERATE_ALL(DEFINE_MEMBER_ITER_RANGE_PARALLEL);
-
-
-template <typename T>
-class CJobItemProcessor
-{
-public:
-	typedef T ItemType_t;
-	void Begin() {}
-	void End() {}
-};
-
-template <typename T>
-class CFuncJobItemProcessor : public CJobItemProcessor<T>
-{
-public:
-	void Init(void (*pfnProcess)(T&), void (*pfnBegin)() = NULL, void (*pfnEnd)() = NULL)
-	{
-		m_pfnProcess = pfnProcess;
-		m_pfnBegin = pfnBegin;
-		m_pfnEnd = pfnEnd;
-	}
-
-	void Begin() { if (m_pfnBegin) (*m_pfnBegin)(); }
-	void Process(T& item) { (*m_pfnProcess)(item); }
-	void End() { if (m_pfnEnd) (*m_pfnEnd)(); }
-
-protected:
-	void (*m_pfnProcess)(T&);
-	void (*m_pfnBegin)();
-	void (*m_pfnEnd)();
-};
-
-template <typename T, class OBJECT_TYPE, class FUNCTION_CLASS = OBJECT_TYPE >
-class CMemberFuncJobItemProcessor : public CJobItemProcessor<T>
-{
-public:
-	void Init(OBJECT_TYPE* pObject, void (FUNCTION_CLASS::* pfnProcess)(T&), void (FUNCTION_CLASS::* pfnBegin)() = NULL, void (FUNCTION_CLASS::* pfnEnd)() = NULL)
-	{
-		m_pObject = pObject;
-		m_pfnProcess = pfnProcess;
-		m_pfnBegin = pfnBegin;
-		m_pfnEnd = pfnEnd;
-	}
-
-	void Begin() { if (m_pfnBegin) ((*m_pObject).*m_pfnBegin)(); }
-	void Process(T& item) { ((*m_pObject).*m_pfnProcess)(item); }
-	void End() { if (m_pfnEnd) ((*m_pObject).*m_pfnEnd)(); }
-
-protected:
-	OBJECT_TYPE* m_pObject;
-
-	void (FUNCTION_CLASS::* m_pfnProcess)(T&);
-	void (FUNCTION_CLASS::* m_pfnBegin)();
-	void (FUNCTION_CLASS::* m_pfnEnd)();
-};
-
-template <typename T>
-class CLoopFuncJobItemProcessor : public CJobItemProcessor<T>
-{
-public:
-	void Init(void (*pfnProcess)(T*, int, int), void (*pfnBegin)() = NULL, void (*pfnEnd)() = NULL)
-	{
-		m_pfnProcess = pfnProcess;
-		m_pfnBegin = pfnBegin;
-		m_pfnEnd = pfnEnd;
-	}
-
-	void Begin() { if (m_pfnBegin) (*m_pfnBegin)(); }
-	void Process(T* pContext, int nFirst, int nCount) { (*m_pfnProcess)(pContext, nFirst, nCount); }
-	void End() { if (m_pfnEnd) (*m_pfnEnd)(); }
-
-protected:
-	void (*m_pfnProcess)(T*, int, int);
-	void (*m_pfnBegin)();
-	void (*m_pfnEnd)();
-};
-
-template <typename T, class OBJECT_TYPE, class FUNCTION_CLASS = OBJECT_TYPE >
-class CLoopMemberFuncJobItemProcessor : public CJobItemProcessor<T>
-{
-public:
-	void Init(OBJECT_TYPE* pObject, void (FUNCTION_CLASS::* pfnProcess)(T*, int, int), void (FUNCTION_CLASS::* pfnBegin)() = NULL, void (FUNCTION_CLASS::* pfnEnd)() = NULL)
-	{
-		m_pObject = pObject;
-		m_pfnProcess = pfnProcess;
-		m_pfnBegin = pfnBegin;
-		m_pfnEnd = pfnEnd;
-	}
-
-	void Begin() { if (m_pfnBegin) ((*m_pObject).*m_pfnBegin)(); }
-	void Process(T* item, int nFirst, int nCount) { ((*m_pObject).*m_pfnProcess)(item, nFirst, nCount); }
-	void End() { if (m_pfnEnd) ((*m_pObject).*m_pfnEnd)(); }
-
-protected:
-	OBJECT_TYPE* m_pObject;
-
-	void (FUNCTION_CLASS::* m_pfnProcess)(T*, int, int);
-	void (FUNCTION_CLASS::* m_pfnBegin)();
-	void (FUNCTION_CLASS::* m_pfnEnd)();
-};
-
-
-#pragma warning(push)
-#pragma warning(disable:4189)
-
-template <typename ITEM_TYPE, class ITEM_PROCESSOR_TYPE, int ID_TO_PREVENT_COMDATS_IN_PROFILES = 1>
-class CParallelProcessor
-{
-public:
-	CParallelProcessor()
-	{
-		m_pItems = m_pLimit = 0;
-	}
-
-	void Run(ITEM_TYPE* pItems, unsigned nItems, int nChunkSize = 1, int nMaxParallel = INT_MAX, IThreadPool* pThreadPool = NULL)
-	{
-		if (nItems == 0)
-			return;
-
-#if defined(_X360)
-		volatile int ignored = ID_TO_PREVENT_COMDATS_IN_PROFILES;
-#endif
-
-		m_nChunkSize = nChunkSize;
-		if (!pThreadPool)
-		{
-			pThreadPool = g_pThreadPool;
-		}
-
-		m_pItems = pItems;
-		m_pLimit = pItems + nItems;
-
-		int nJobs = nItems - 1;
-
-		if (nJobs > nMaxParallel)
-		{
-			nJobs = nMaxParallel;
-		}
-
-		if (!pThreadPool)									    
-		{
-			DoExecute();
-			return;
-		}
-
-		int nThreads = pThreadPool->NumThreads();
-		if (nJobs > nThreads)
-		{
-			nJobs = nThreads;
-		}
-
-		if (nJobs > 0)
-		{
-			CJob** jobs = (CJob**)stackalloc(nJobs * sizeof(CJob**));
-			int i = nJobs;
-
-			while (i--)
-			{
-				jobs[i] = pThreadPool->QueueCall(this, &CParallelProcessor<ITEM_TYPE, ITEM_PROCESSOR_TYPE, ID_TO_PREVENT_COMDATS_IN_PROFILES>::DoExecute);
-			}
-
-			DoExecute();
-
-			for (i = 0; i < nJobs; i++)
-			{
-				jobs[i]->Abort();                
-				jobs[i]->Release();
-			}
-		}
-		else
-		{
-			DoExecute();
-		}
-	}
-
-	ITEM_PROCESSOR_TYPE m_ItemProcessor;
-
-private:
-	void DoExecute()
-	{
-		if (m_pItems < m_pLimit)
-		{
-#if defined(_X360)
-			volatile int ignored = ID_TO_PREVENT_COMDATS_IN_PROFILES;
-#endif
-			m_ItemProcessor.Begin();
-
-			ITEM_TYPE* pLimit = m_pLimit;
-
-			int nChunkSize = m_nChunkSize;
-			for (;;)
-			{
-				ITEM_TYPE* pCurrent = m_pItems.AtomicAdd(nChunkSize);
-				ITEM_TYPE* pLast = MIN(pLimit, pCurrent + nChunkSize);
-				while (pCurrent < pLast)
-				{
-					m_ItemProcessor.Process(*pCurrent);
-					pCurrent++;
-				}
-				if (pCurrent >= pLimit)
-				{
-					break;
-				}
-			}
-			m_ItemProcessor.End();
-		}
-	}
-	CInterlockedPtr<ITEM_TYPE>	m_pItems;
-	ITEM_TYPE* m_pLimit;
-	int m_nChunkSize;
-
-};
-
-#pragma warning(pop)
-
-template <typename ITEM_TYPE>
-inline void ParallelProcess(ITEM_TYPE* pItems, unsigned nItems, void (*pfnProcess)(ITEM_TYPE&), void (*pfnBegin)() = NULL, void (*pfnEnd)() = NULL, int nMaxParallel = INT_MAX)
-{
-	CParallelProcessor<ITEM_TYPE, CFuncJobItemProcessor<ITEM_TYPE> > processor;
-	processor.m_ItemProcessor.Init(pfnProcess, pfnBegin, pfnEnd);
-	processor.Run(pItems, nItems, 1, nMaxParallel);
-}
-
-template <typename ITEM_TYPE, typename OBJECT_TYPE, typename FUNCTION_CLASS >
-inline void ParallelProcess(ITEM_TYPE* pItems, unsigned nItems, OBJECT_TYPE* pObject, void (FUNCTION_CLASS::* pfnProcess)(ITEM_TYPE&), void (FUNCTION_CLASS::* pfnBegin)() = NULL, void (FUNCTION_CLASS::* pfnEnd)() = NULL, int nMaxParallel = INT_MAX)
-{
-	CParallelProcessor<ITEM_TYPE, CMemberFuncJobItemProcessor<ITEM_TYPE, OBJECT_TYPE, FUNCTION_CLASS> > processor;
-	processor.m_ItemProcessor.Init(pObject, pfnProcess, pfnBegin, pfnEnd);
-	processor.Run(pItems, nItems, 1, nMaxParallel);
-}
-
-template <typename ITEM_TYPE>
-inline void ParallelProcess(IThreadPool* pPool, ITEM_TYPE* pItems, unsigned nItems, void (*pfnProcess)(ITEM_TYPE&), void (*pfnBegin)() = NULL, void (*pfnEnd)() = NULL, int nMaxParallel = INT_MAX)
-{
-	CParallelProcessor<ITEM_TYPE, CFuncJobItemProcessor<ITEM_TYPE> > processor;
-	processor.m_ItemProcessor.Init(pfnProcess, pfnBegin, pfnEnd);
-	processor.Run(pItems, nItems, 1, nMaxParallel, pPool);
-}
-
-template <typename ITEM_TYPE, typename OBJECT_TYPE, typename FUNCTION_CLASS >
-inline void ParallelProcess(IThreadPool* pPool, ITEM_TYPE* pItems, unsigned nItems, OBJECT_TYPE* pObject, void (FUNCTION_CLASS::* pfnProcess)(ITEM_TYPE&), void (FUNCTION_CLASS::* pfnBegin)() = NULL, void (FUNCTION_CLASS::* pfnEnd)() = NULL, int nMaxParallel = INT_MAX)
-{
-	CParallelProcessor<ITEM_TYPE, CMemberFuncJobItemProcessor<ITEM_TYPE, OBJECT_TYPE, FUNCTION_CLASS> > processor;
-	processor.m_ItemProcessor.Init(pObject, pfnProcess, pfnBegin, pfnEnd);
-	processor.Run(pItems, nItems, 1, nMaxParallel, pPool);
-}
-
-template <typename ITEM_TYPE>
-inline void ParallelProcessChunks(ITEM_TYPE* pItems, unsigned nItems, void (*pfnProcess)(ITEM_TYPE&), int nChunkSize, int nMaxParallel = INT_MAX)
-{
-	CParallelProcessor<ITEM_TYPE, CFuncJobItemProcessor<ITEM_TYPE> > processor;
-	processor.m_ItemProcessor.Init(pfnProcess, NULL, NULL);
-	processor.Run(pItems, nItems, nChunkSize, nMaxParallel);
-}
-
-template <typename ITEM_TYPE, typename OBJECT_TYPE, typename FUNCTION_CLASS >
-inline void ParallelProcessChunks(ITEM_TYPE* pItems, unsigned nItems, OBJECT_TYPE* pObject, void (FUNCTION_CLASS::* pfnProcess)(ITEM_TYPE&), int nChunkSize, int nMaxParallel = INT_MAX)
-{
-	CParallelProcessor<ITEM_TYPE, CMemberFuncJobItemProcessor<ITEM_TYPE, OBJECT_TYPE, FUNCTION_CLASS> > processor;
-	processor.m_ItemProcessor.Init(pObject, pfnProcess, NULL, NULL);
-	processor.Run(pItems, nItems, nChunkSize, nMaxParallel);
-}
-
-template <typename ITEM_TYPE, typename OBJECT_TYPE, typename FUNCTION_CLASS >
-inline void ParallelProcessChunks(IThreadPool* pPool, ITEM_TYPE* pItems, unsigned nItems, OBJECT_TYPE* pObject, void (FUNCTION_CLASS::* pfnProcess)(ITEM_TYPE&), int nChunkSize, int nMaxParallel = INT_MAX)
-{
-	CParallelProcessor<ITEM_TYPE, CMemberFuncJobItemProcessor<ITEM_TYPE, OBJECT_TYPE, FUNCTION_CLASS> > processor;
-	processor.m_ItemProcessor.Init(pObject, pfnProcess, NULL, NULL);
-	processor.Run(pItems, nItems, nChunkSize, nMaxParallel, pPool);
-}
-
-
-template <class CONTEXT_TYPE, class ITEM_PROCESSOR_TYPE>
-class CParallelLoopProcessor
-{
-public:
-	CParallelLoopProcessor()
-	{
-		m_nIndex = m_nLimit = 0;
-		m_nChunkCount = 0;
-		m_nActive = 0;
-	}
-
-	void Run(CONTEXT_TYPE* pContext, int nBegin, int nItems, int nChunkCount, int nMaxParallel = INT_MAX, IThreadPool* pThreadPool = NULL)
-	{
-		if (!nItems)
-			return;
-
-		if (!pThreadPool)
-		{
-			pThreadPool = g_pThreadPool;
-		}
-
-		m_pContext = pContext;
-		m_nIndex = nBegin;
-		m_nLimit = nBegin + nItems;
-		nChunkCount = MAX(MIN(nItems, nChunkCount), 1);
-		m_nChunkCount = (nItems + nChunkCount - 1) / nChunkCount;
-		int nJobs = (nItems + m_nChunkCount - 1) / m_nChunkCount;
-		if (nJobs > nMaxParallel)
-		{
-			nJobs = nMaxParallel;
-		}
-
-		if (!pThreadPool)									    
-		{
-			DoExecute();
-			return;
-		}
-
-		int nThreads = pThreadPool->NumThreads();
-		if (nJobs > nThreads)
-		{
-			nJobs = nThreads;
-		}
-
-		if (nJobs > 0)
-		{
-			CJob** jobs = (CJob**)stackalloc(nJobs * sizeof(CJob**));
-			int i = nJobs;
-
-			while (i--)
-			{
-				jobs[i] = pThreadPool->QueueCall(this, &CParallelLoopProcessor<CONTEXT_TYPE, ITEM_PROCESSOR_TYPE>::DoExecute);
-			}
-
-			DoExecute();
-
-			for (i = 0; i < nJobs; i++)
-			{
-				jobs[i]->Abort();                
-				jobs[i]->Release();
-			}
-		}
-		else
-		{
-			DoExecute();
-		}
-	}
-
-	ITEM_PROCESSOR_TYPE m_ItemProcessor;
-
-private:
-	void DoExecute()
-	{
-		m_ItemProcessor.Begin();
-		for (;;)
-		{
-			int nIndex = m_nIndex.AtomicAdd(m_nChunkCount);
-			if (nIndex < m_nLimit)
-			{
-				int nCount = MIN(m_nChunkCount, m_nLimit - nIndex);
-				m_ItemProcessor.Process(m_pContext, nIndex, nCount);
-			}
-			else
-			{
-				break;
-			}
-		}
-		m_ItemProcessor.End();
-		--m_nActive;
-	}
-
-	CONTEXT_TYPE* m_pContext;
-	CInterlockedInt				m_nIndex;
-	int							m_nLimit;
-	int							m_nChunkCount;
-	CInterlockedInt				m_nActive;
-};
-
-template < typename CONTEXT_TYPE >
-inline void ParallelLoopProcess(IThreadPool* pPool, CONTEXT_TYPE* pContext, int nStart, int nCount, void (*pfnProcess)(CONTEXT_TYPE*, int, int), void (*pfnBegin)() = NULL, void (*pfnEnd)() = NULL, int nMaxParallel = INT_MAX)
-{
-	CParallelLoopProcessor< CONTEXT_TYPE, CLoopFuncJobItemProcessor< CONTEXT_TYPE > > processor;
-	processor.m_ItemProcessor.Init(pfnProcess, pfnBegin, pfnEnd);
-	processor.Run(pContext, nStart, nCount, 1, nMaxParallel, pPool);
-}
-
-template < typename CONTEXT_TYPE, typename OBJECT_TYPE, typename FUNCTION_CLASS >
-inline void ParallelLoopProcess(IThreadPool* pPool, CONTEXT_TYPE* pContext, int nStart, int nCount, OBJECT_TYPE* pObject, void (FUNCTION_CLASS::* pfnProcess)(CONTEXT_TYPE*, int, int), void (FUNCTION_CLASS::* pfnBegin)() = NULL, void (FUNCTION_CLASS::* pfnEnd)() = NULL, int nMaxParallel = INT_MAX)
-{
-	CParallelLoopProcessor< CONTEXT_TYPE, CLoopMemberFuncJobItemProcessor<CONTEXT_TYPE, OBJECT_TYPE, FUNCTION_CLASS> > processor;
-	processor.m_ItemProcessor.Init(pObject, pfnProcess, pfnBegin, pfnEnd);
-	processor.Run(pContext, nStart, nCount, 1, nMaxParallel, pPool);
-}
-
-template < typename CONTEXT_TYPE >
-inline void ParallelLoopProcessChunks(IThreadPool* pPool, CONTEXT_TYPE* pContext, int nStart, int nCount, int nChunkSize, void (*pfnProcess)(CONTEXT_TYPE*, int, int), void (*pfnBegin)() = NULL, void (*pfnEnd)() = NULL, int nMaxParallel = INT_MAX)
-{
-	CParallelLoopProcessor< CONTEXT_TYPE, CLoopFuncJobItemProcessor< CONTEXT_TYPE > > processor;
-	processor.m_ItemProcessor.Init(pfnProcess, pfnBegin, pfnEnd);
-	processor.Run(pContext, nStart, nCount, nChunkSize, nMaxParallel, pPool);
-}
-
-template < typename CONTEXT_TYPE, typename OBJECT_TYPE, typename FUNCTION_CLASS >
-inline void ParallelLoopProcessChunks(IThreadPool* pPool, CONTEXT_TYPE* pContext, int nStart, int nCount, int nChunkSize, OBJECT_TYPE* pObject, void (FUNCTION_CLASS::* pfnProcess)(CONTEXT_TYPE*, int, int), void (FUNCTION_CLASS::* pfnBegin)() = NULL, void (FUNCTION_CLASS::* pfnEnd)() = NULL, int nMaxParallel = INT_MAX)
-{
-	CParallelLoopProcessor< CONTEXT_TYPE, CLoopMemberFuncJobItemProcessor<CONTEXT_TYPE, OBJECT_TYPE, FUNCTION_CLASS> > processor;
-	processor.m_ItemProcessor.Init(pObject, pfnProcess, pfnBegin, pfnEnd);
-	processor.Run(pContext, nStart, nCount, nChunkSize, nMaxParallel, pPool);
-}
-
-template <class Derived>
-class CParallelProcessorBase
-{
-protected:
-	typedef CParallelProcessorBase<Derived> ThisParallelProcessorBase_t;
-	typedef Derived ThisParallelProcessorDerived_t;
-
-public:
-	CParallelProcessorBase()
-	{
-		m_nActive = 0;
-	}
-
-protected:
-	void Run(int nMaxParallel = INT_MAX, int threadOverride = -1)
-	{
-		int i = g_pThreadPool->NumIdleThreads();
-
-		if (nMaxParallel < i)
-		{
-			i = nMaxParallel;
-		}
-
-		while (i-- > 0)
-		{
-			if (threadOverride == -1 || i == threadOverride - 1)
-			{
-				++m_nActive;
-				ThreadExecute(this, &ThisParallelProcessorBase_t::DoExecute)->Release();
-			}
-		}
-
-		if (threadOverride == -1 || threadOverride == 0)
-		{
-			++m_nActive;
-			DoExecute();
-		}
-
-		while (m_nActive)
-		{
-			ThreadPause();
-		}
-	}
-
-protected:
-	void OnBegin() {}
-	bool OnProcess() { return false; }
-	void OnEnd() {}
-
-private:
-	void DoExecute()
-	{
-		static_cast<Derived*>(this)->OnBegin();
-
-		while (static_cast<Derived*>(this)->OnProcess())
-			continue;
-
-		static_cast<Derived*>(this)->OnEnd();
-
-		--m_nActive;
-	}
-
-	CInterlockedInt				m_nActive;
-};
-
-
-
-
-inline uintp FunctorExecuteThread(void* pParam)
-{
-	CFunctor* pFunctor = (CFunctor*)pParam;
-	(*pFunctor)();
-	pFunctor->Release();
-	return 0;
-}
-
-inline ThreadHandle_t ThreadExecuteSoloImpl(CFunctor* pFunctor, const char* pszName = NULL);
-
-
-inline ThreadHandle_t ThreadExecuteSolo(CJob* pJob) { return ThreadExecuteSoloImpl(CreateFunctor(pJob, &CJob::Execute), pJob->Describe()); }
-
-template <typename T1>
-inline ThreadHandle_t ThreadExecuteSolo(const char* pszName, T1 a1) { return ThreadExecuteSoloImpl(CreateFunctor(a1), pszName); }
-
-template <typename T1, typename T2>
-inline ThreadHandle_t ThreadExecuteSolo(const char* pszName, T1 a1, T2 a2) { return ThreadExecuteSoloImpl(CreateFunctor(a1, a2), pszName); }
-
-template <typename T1, typename T2, typename T3>
-inline ThreadHandle_t ThreadExecuteSolo(const char* pszName, T1 a1, T2 a2, T3 a3) { return ThreadExecuteSoloImpl(CreateFunctor(a1, a2, a3), pszName); }
-
-template <typename T1, typename T2, typename T3, typename T4>
-inline ThreadHandle_t ThreadExecuteSolo(const char* pszName, T1 a1, T2 a2, T3 a3, T4 a4) { return ThreadExecuteSoloImpl(CreateFunctor(a1, a2, a3, a4), pszName); }
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5>
-inline ThreadHandle_t ThreadExecuteSolo(const char* pszName, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5) { return ThreadExecuteSoloImpl(CreateFunctor(a1, a2, a3, a4, a5), pszName); }
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-inline ThreadHandle_t ThreadExecuteSolo(const char* pszName, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6) { return ThreadExecuteSoloImpl(CreateFunctor(a1, a2, a3, a4, a5, a6), pszName); }
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-inline ThreadHandle_t ThreadExecuteSolo(const char* pszName, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7) { return ThreadExecuteSoloImpl(CreateFunctor(a1, a2, a3, a4, a5, a6, a7), pszName); }
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
-inline ThreadHandle_t ThreadExecuteSolo(const char* pszName, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8) { return ThreadExecuteSoloImpl(CreateFunctor(a1, a2, a3, a4, a5, a6, a7, a8), pszName); }
-
-template <typename T1, typename T2>
-inline ThreadHandle_t ThreadExecuteSoloRef(const char* pszName, T1 a1, T2 a2) { return ThreadExecuteSoloImpl(CreateRefCountingFunctor(a1, a2), pszName); }
-
-template <typename T1, typename T2, typename T3>
-inline ThreadHandle_t ThreadExecuteSoloRef(const char* pszName, T1 a1, T2 a2, T3 a3) { return ThreadExecuteSoloImpl(CreateRefCountingFunctor(a1, a2, a3), pszName); }
-
-template <typename T1, typename T2, typename T3, typename T4>
-inline ThreadHandle_t ThreadExecuteSoloRef(const char* pszName, T1 a1, T2 a2, T3 a3, T4 a4) { return ThreadExecuteSoloImpl(CreateRefCountingFunctor(a1, a2, a3, a4), pszName); }
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5>
-inline ThreadHandle_t ThreadExecuteSoloRef(const char* pszName, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5) { return ThreadExecuteSoloImpl(CreateRefCountingFunctor(a1, a2, a3, a4, a5), pszName); }
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-inline ThreadHandle_t ThreadExecuteSoloRef(const char* pszName, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6) { return ThreadExecuteSoloImpl(CreateRefCountingFunctor(a1, a2, a3, a4, a5, a6), pszName); }
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-inline ThreadHandle_t ThreadExecuteSoloRef(const char* pszName, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7) { return ThreadExecuteSoloImpl(CreateRefCountingFunctor(a1, a2, a3, a4, a5, a6, a7), pszName); }
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
-inline ThreadHandle_t ThreadExecuteSoloRef(const char* pszName, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8) { return ThreadExecuteSoloImpl(CreateRefCountingFunctor(a1, a2, a3, a4, a5, a6, a7, a8), pszName); }
-
-inline bool IThreadPool::YieldWait(CThreadEvent& theEvent, unsigned timeout)
-{
-	CThreadEvent* pEvent = &theEvent;
-	return (YieldWait(&pEvent, 1, true, timeout) != TW_TIMEOUT);
-}
-
-inline bool IThreadPool::YieldWait(CJob* pJob, unsigned timeout)
-{
-	return (YieldWait(&pJob, 1, true, timeout) != TW_TIMEOUT);
-}
-
-inline JobStatus_t CJob::Execute()
-{
-	if (IsFinished())
-	{
-		return m_status;
-	}
-
-	AUTO_LOCK(m_mutex);
-	AddRef();
-
-	JobStatus_t result;
-
-	switch (m_status)
-	{
-	case JOB_STATUS_UNSERVICED:
-	case JOB_STATUS_PENDING:
-	{
-		m_status = JOB_STATUS_INPROGRESS;
-
-#if defined( THREAD_PARENT_STACK_TRACE_ENABLED )
-		{
-			CStackTop_ReferenceParentStack stackTop(m_ParentStackTrace, ARRAYSIZE(m_ParentStackTrace));
-			result = m_status = DoExecute();
-		}
-#else
-		result = m_status = DoExecute();
-#endif			
-
-		DoCleanup();
-		m_CompleteEvent.Set();
-		break;
-	}
-
-	case JOB_STATUS_INPROGRESS:
-		AssertMsg(0, "Mutex Should have protected use while processing");
-	case JOB_OK:
-	case JOB_STATUS_ABORTED:
-		result = m_status;
-		break;
-
-	default:
-		AssertMsg(m_status < JOB_OK, "Unknown job state");
-		result = m_status;
-	}
-
-	Release();
-
-	return result;
-}
-
-
-inline JobStatus_t CJob::TryExecute()
-{
-	if (!IsFinished() && TryLock())
-	{
-		Execute();
-		Unlock();
-	}
-	return m_status;
-}
-
-inline JobStatus_t CJob::Abort(bool bDiscard)
-{
-	if (IsFinished())
-	{
-		return m_status;
-	}
-
-	AUTO_LOCK(m_mutex);
-	AddRef();
-
-	JobStatus_t result;
-
-	switch (m_status)
-	{
-	case JOB_STATUS_UNSERVICED:
-	case JOB_STATUS_PENDING:
-	{
-		result = m_status = DoAbort(bDiscard);
-		if (bDiscard)
-			DoCleanup();
-		m_CompleteEvent.Set();
-	}
-	break;
-
-	case JOB_STATUS_ABORTED:
-	case JOB_STATUS_INPROGRESS:
-	case JOB_OK:
-		result = m_status;
-		break;
-
-	default:
-		AssertMsg(m_status < JOB_OK, "Unknown job state");
-		result = m_status;
-	}
-
-	Release();
-
-	return result;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/keyvalues.h b/SpyCustom/keyvalues.h
deleted file mode 100644
index ad5c2d2..0000000
--- a/SpyCustom/keyvalues.h
+++ /dev/null
@@ -1,420 +0,0 @@
-#ifndef KEYVALUES_H
-#define KEYVALUES_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL    0
-#else
-#define NULL    ((void *)0)
-#endif
-#endif
-
-#include "utlvector.h"
-#include "color.h"
-#include "exprevaluator.h"
-
-#define TRACK_KV_ADD( ptr, name )	track.AddKv( ptr, name )
-#define SPLIT_3_BYTES_INTO_1_AND_2( x1, x2, x3 ) do { x1 = (uint8)(x3); x2 = (uint16)( (x3) >> 8 ); } while( 0 )
-
-
-#define FOR_EACH_SUBKEY( kvRoot, kvSubKey ) \
-	for ( KeyValues * kvSubKey = kvRoot->GetFirstSubKey(); kvSubKey != NULL; kvSubKey = kvSubKey->GetNextKey() )
-
-#define FOR_EACH_TRUE_SUBKEY( kvRoot, kvSubKey ) \
-	for ( KeyValues * kvSubKey = kvRoot->GetFirstTrueSubKey(); kvSubKey != NULL; kvSubKey = kvSubKey->GetNextTrueSubKey() )
-
-#define FOR_EACH_VALUE( kvRoot, kvValue ) \
-	for ( KeyValues * kvValue = kvRoot->GetFirstValue(); kvValue != NULL; kvValue = kvValue->GetNextValue() )
-
-
-class IBaseFileSystem;
-class CUtlBuffer;
-class Color;
-class CKeyValuesTokenReader;
-class KeyValues;
-class IKeyValuesDumpContext;
-typedef void* FileHandle_t;
-class CKeyValuesGrowableStringTable;
-
-
-#define KV_BINARY_POOLED_FORMAT 0xAA
-
-
-#define FOR_EACH_SUBKEY( kvRoot, kvSubKey ) \
-	for ( KeyValues * kvSubKey = kvRoot->GetFirstSubKey(); kvSubKey != NULL; kvSubKey = kvSubKey->GetNextKey() )
-
-#define FOR_EACH_TRUE_SUBKEY( kvRoot, kvSubKey ) \
-	for ( KeyValues * kvSubKey = kvRoot->GetFirstTrueSubKey(); kvSubKey != NULL; kvSubKey = kvSubKey->GetNextTrueSubKey() )
-
-#define FOR_EACH_VALUE( kvRoot, kvValue ) \
-	for ( KeyValues * kvValue = kvRoot->GetFirstValue(); kvValue != NULL; kvValue = kvValue->GetNextValue() )
-
-
-class KeyValues
-{
-	friend class CKeyValuesTokenReader;
-
-public:
-	static void SetUseGrowableStringTable(bool bUseGrowableTable);
-
-	explicit KeyValues(const char* setName);
-
-	class AutoDelete
-	{
-	public:
-		explicit inline AutoDelete(KeyValues* pKeyValues) : m_pKeyValues(pKeyValues) {}
-		explicit inline AutoDelete(const char* pchKVName) : m_pKeyValues(new KeyValues(pchKVName)) {}
-		inline ~AutoDelete(void) { delete m_pKeyValues; }
-		inline void Assign(KeyValues* pKeyValues) { m_pKeyValues = pKeyValues; }
-		inline KeyValues* Detach() { KeyValues* retval = m_pKeyValues; Assign(NULL); return retval; }
-		KeyValues* operator->() { return m_pKeyValues; }
-		operator KeyValues* () { return m_pKeyValues; }
-	private:
-		AutoDelete(AutoDelete const& x);  
-		AutoDelete& operator= (AutoDelete const& x);  
-	protected:
-		KeyValues* m_pKeyValues;
-	};
-
-	class AutoDeleteInline : public AutoDelete
-	{
-	public:
-		explicit inline AutoDeleteInline(KeyValues* pKeyValues) : AutoDelete(pKeyValues) {}
-		inline operator KeyValues* () const { return m_pKeyValues; }
-		inline KeyValues* Get() const { return m_pKeyValues; }
-	};
-
-	KeyValues(const char* setName, const char* firstKey, const char* firstValue);
-	KeyValues(const char* setName, const char* firstKey, const wchar_t* firstValue);
-	KeyValues(const char* setName, const char* firstKey, int firstValue);
-	KeyValues(const char* setName, const char* firstKey, const char* firstValue, const char* secondKey, const char* secondValue);
-	KeyValues(const char* setName, const char* firstKey, int firstValue, const char* secondKey, int secondValue);
-
-	~KeyValues();
-
-	const char* GetName() const;
-	void SetName(const char* setName);
-
-	int GetNameSymbol() const;
-	int GetNameSymbolCaseSensitive() const;
-
-	void UsesEscapeSequences(bool state);   
-	bool LoadFromFile(IBaseFileSystem* filesystem, const char* resourceName, const char* pathID = NULL);
-	
-	bool SaveToFile(IBaseFileSystem* filesystem, const char* resourceName, const char* pathID = NULL, bool bWriteEmptySubkeys = false);
-
-	bool LoadFromBuffer(char const* resourceName, const char* pBuffer, IBaseFileSystem* pFileSystem = NULL, const char* pPathID = NULL);
-
-	bool LoadFromBuffer(char const* resourceName, CUtlBuffer& buf, IBaseFileSystem* pFileSystem = NULL, const char* pPathID = NULL);
-
-
-
-	KeyValues* FindKey(const char* keyName, bool bCreate = false);
-	KeyValues* FindKey(int keySymbol) const;
-	KeyValues* CreateNewKey();		                           
-	void AddSubKey(KeyValues* pSubkey);	              
-	void RemoveSubKey(KeyValues* subKey);	          
-	void InsertSubKey(int nIndex, KeyValues* pSubKey);          
-	bool ContainsSubKey(KeyValues* pSubKey);              
-	void SwapSubKey(KeyValues* pExistingSubKey, KeyValues* pNewSubKey);	                     
-	void ElideSubKey(KeyValues* pSubKey);	                    
-	KeyValues* CreateKey(const char* keyName);
-	KeyValues* CreatePeerKey(const char* keyName);
-
-	KeyValues* GetFirstSubKey() { return m_pSub; }	       
-	KeyValues* GetNextKey() { return m_pPeer; }		    
-	void SetNextKey(KeyValues* pDat);
-
-	KeyValues* FindLastSubKey();	                           
-
-	KeyValues* GetFirstTrueSubKey();
-	KeyValues* GetNextTrueSubKey();
-
-	KeyValues* GetFirstValue();	                  
-	KeyValues* GetNextValue();
-
-
-	int   GetInt(const char* keyName = NULL, int defaultValue = 0);
-	uint64 GetUint64(const char* keyName = NULL, uint64 defaultValue = 0);
-	float GetFloat(const char* keyName = NULL, float defaultValue = 0.0f);
-	const char* GetString(const char* keyName = NULL, const char* defaultValue = "");
-	const wchar_t* GetWString(const char* keyName = NULL, const wchar_t* defaultValue = L"");
-	void* GetPtr(const char* keyName = NULL, void* defaultValue = (void*)0);
-	Color GetColor(const char* keyName = NULL, const Color& defaultColor = Color(0, 0, 0, 0));
-	bool GetBool(const char* keyName = NULL, bool defaultValue = false) { return GetInt(keyName, defaultValue ? 1 : 0) ? true : false; }
-	bool  IsEmpty(const char* keyName = NULL);
-
-	int   GetInt(int keySymbol, int defaultValue = 0);
-	uint64 GetUint64(int keySymbol, uint64 defaultValue = 0);
-	float GetFloat(int keySymbol, float defaultValue = 0.0f);
-	const char* GetString(int keySymbol, const char* defaultValue = "");
-	const wchar_t* GetWString(int keySymbol, const wchar_t* defaultValue = L"");
-	void* GetPtr(int keySymbol, void* defaultValue = (void*)0);
-	Color GetColor(int keySymbol       );
-	bool GetBool(int keySymbol, bool defaultValue = false) { return GetInt(keySymbol, defaultValue ? 1 : 0) ? true : false; }
-	bool  IsEmpty(int keySymbol);
-
-	void SetWString(const char* keyName, const wchar_t* value);
-	void SetString(const char* keyName, const char* value);
-	void SetInt(const char* keyName, int value);
-	void SetUint64(const char* keyName, uint64 value);
-	void SetFloat(const char* keyName, float value);
-	void SetPtr(const char* keyName, void* value);
-	void SetColor(const char* keyName, Color value);
-	void SetBool(const char* keyName, bool value) { SetInt(keyName, value ? 1 : 0); }
-
-	void* operator new(size_t iAllocSize);
-	void* operator new(size_t iAllocSize, int nBlockUse, const char* pFileName, int nLine);
-	void operator delete(void* pMem);
-	void operator delete(void* pMem, int nBlockUse, const char* pFileName, int nLine);
-
-	KeyValues& operator=(KeyValues& src);
-
-	bool IsEqual(KeyValues* pRHS);
-
-	void ChainKeyValue(KeyValues* pChain);
-
-	void RecursiveSaveToFile(CUtlBuffer& buf, int indentLevel);
-
-	bool WriteAsBinary(CUtlBuffer& buffer) const;
-	bool ReadAsBinary(CUtlBuffer& buffer, int nStackDepth = 0);
-
-	bool WriteAsBinaryFiltered(CUtlBuffer& buffer);
-	bool ReadAsBinaryFiltered(CUtlBuffer& buffer, int nStackDepth = 0);
-
-	KeyValues* MakeCopy(void) const;
-
-	void CopySubkeys(KeyValues* pParent) const;
-
-	void Clear(void);
-
-	enum types_t
-	{
-		TYPE_NONE = 0,
-		TYPE_STRING,
-		TYPE_INT,
-		TYPE_FLOAT,
-		TYPE_PTR,
-		TYPE_WSTRING,
-		TYPE_COLOR,
-		TYPE_UINT64,
-		TYPE_COMPILED_INT_BYTE,			          
-		TYPE_COMPILED_INT_0,			        
-		TYPE_COMPILED_INT_1,			        
-		TYPE_NUMTYPES,
-	};
-	types_t GetDataType(const char* keyName = NULL);
-	types_t GetDataType() const;
-
-	void deleteThis();
-
-	void SetStringValue(char const* strValue);
-
-	void UnpackIntoStructure(struct KeyValuesUnpackStructure const* pUnpackTable, void* pDest);
-
-	bool ProcessResolutionKeys(const char* pResString);
-
-	bool Dump(IKeyValuesDumpContext* pDump, int nIndentLevel = 0);
-
-	enum MergeKeyValuesOp_t
-	{
-		MERGE_KV_ALL,
-		MERGE_KV_UPDATE,	               
-		MERGE_KV_DELETE,	         
-		MERGE_KV_BORROW,	                   
-	};
-	void MergeFrom(KeyValues* kvMerge, MergeKeyValuesOp_t eOp = MERGE_KV_ALL);
-
-	static KeyValues* FromString(char const* szName, char const* szStringVal, char const** ppEndOfParse = NULL);
-
-	KeyValues* CreateKeyUsingKnownLastChild(const char* keyName, KeyValues* pLastChild);
-	void AddSubkeyUsingKnownLastChild(KeyValues* pSubKey, KeyValues* pLastChild);
-
-	KeyValues(KeyValues&);	     
-
-
-	void RecursiveCopyKeyValues(KeyValues& src);
-	void RemoveEverything();
-	void RecursiveSaveToFile(IBaseFileSystem* filesystem, FileHandle_t f, CUtlBuffer* pBuf, int indentLevel, bool bWriteEmptySubkeys = false);
-	void WriteConvertedString(IBaseFileSystem* filesystem, FileHandle_t f, CUtlBuffer* pBuf, const char* pszString);
-
-	void RecursiveLoadFromBuffer(char const* resourceName, CUtlBuffer& buf);
-
-	void AppendIncludedKeys(CUtlVector< KeyValues* >& includedKeys);
-	void ParseIncludedKeys(char const* resourceName, const char* filetoinclude,
-		IBaseFileSystem* pFileSystem, const char* pPathID, CUtlVector< KeyValues* >& includedKeys);
-
-	void MergeBaseKeys(CUtlVector< KeyValues* >& baseKeys);
-	void RecursiveMergeKeyValues(KeyValues* baseKV);
-
-	void InternalWrite(IBaseFileSystem* filesystem, FileHandle_t f, CUtlBuffer* pBuf, const void* pData, int len);
-
-	void Init();
-	const char* ReadToken(CUtlBuffer& buf, bool& wasQuoted, bool& wasConditional);
-	void WriteIndents(IBaseFileSystem* filesystem, FileHandle_t f, CUtlBuffer* pBuf, int indentLevel);
-
-	void FreeAllocatedValue();
-	void AllocateValueBlock(int size);
-
-	bool ReadAsBinaryPooledFormat(CUtlBuffer& buf, IBaseFileSystem* pFileSystem, unsigned int poolKey, GetSymbolProc_t pfnEvaluateSymbolProc);
-
-	bool EvaluateConditional(const char* str);
-
-	uint32 m_iKeyName : 24;	       
-	uint32 m_iKeyNameCaseSensitive1 : 8;	         
-
-	char* m_sValue;
-	wchar_t* m_wsValue;
-
-	union
-	{
-		int m_iValue;
-		float m_flValue;
-		void* m_pValue;
-		unsigned char m_Color[4];
-	};
-
-	char	   m_iDataType;
-	char	   m_bHasEscapeSequences;             
-	uint16	   m_iKeyNameCaseSensitive2;	         
-
-	KeyValues* m_pPeer;	      
-	KeyValues* m_pSub;	         
-	KeyValues* m_pChain;        
-
-	GetSymbolProc_t	m_pExpressionGetSymbolProc;
-
-private:
-	static int (*s_pfGetSymbolForString)(const char* name, bool bCreate);
-	static const char* (*s_pfGetStringForSymbol)(int symbol);
-	static CKeyValuesGrowableStringTable* s_pGrowableStringTable;
-
-public:
-	static int GetSymbolForStringClassic(const char* name, bool bCreate = true);
-	static const char* GetStringForSymbolClassic(int symbol);
-
-	static int GetSymbolForStringGrowable(const char* name, bool bCreate = true);
-	static const char* GetStringForSymbolGrowable(int symbol);
-};
-
-typedef KeyValues::AutoDelete KeyValuesAD;
-
-enum KeyValuesUnpackDestinationTypes_t
-{
-	UNPACK_TYPE_FLOAT,										    
-	UNPACK_TYPE_VECTOR,										    
-	UNPACK_TYPE_VECTOR_COLOR,								        
-	UNPACK_TYPE_STRING,										        
-	UNPACK_TYPE_INT,										    
-	UNPACK_TYPE_FOUR_FLOATS,	                 
-	UNPACK_TYPE_TWO_FLOATS,		               
-};
-
-#define UNPACK_FIXED( kname, kdefault, dtype, ofs ) { kname, kdefault, dtype, ofs, 0 }
-#define UNPACK_VARIABLE( kname, kdefault, dtype, ofs, sz ) { kname, kdefault, dtype, ofs, sz }
-#define UNPACK_END_MARKER { NULL, NULL, UNPACK_TYPE_FLOAT, 0 }
-
-struct KeyValuesUnpackStructure
-{
-	char const* m_pKeyName;									    
-	char const* m_pKeyDefault;								  
-	KeyValuesUnpackDestinationTypes_t m_eDataType;			  
-	size_t m_nFieldOffset;									    
-	size_t m_nFieldSize;									      
-};
-
-inline int   KeyValues::GetInt(int keySymbol, int defaultValue)
-{
-	KeyValues* dat = FindKey(keySymbol);
-	return dat ? dat->GetInt((const char*)NULL, defaultValue) : defaultValue;
-}
-
-inline uint64 KeyValues::GetUint64(int keySymbol, uint64 defaultValue)
-{
-	KeyValues* dat = FindKey(keySymbol);
-	return dat ? dat->GetUint64((const char*)NULL, defaultValue) : defaultValue;
-}
-
-inline float KeyValues::GetFloat(int keySymbol, float defaultValue)
-{
-	KeyValues* dat = FindKey(keySymbol);
-	return dat ? dat->GetFloat((const char*)NULL, defaultValue) : defaultValue;
-}
-
-inline const char* KeyValues::GetString(int keySymbol, const char* defaultValue)
-{
-	KeyValues* dat = FindKey(keySymbol);
-	return dat ? dat->GetString((const char*)NULL, defaultValue) : defaultValue;
-}
-
-inline const wchar_t* KeyValues::GetWString(int keySymbol, const wchar_t* defaultValue)
-{
-	KeyValues* dat = FindKey(keySymbol);
-	return dat ? dat->GetWString((const char*)NULL, defaultValue) : defaultValue;
-}
-
-inline void* KeyValues::GetPtr(int keySymbol, void* defaultValue)
-{
-	KeyValues* dat = FindKey(keySymbol);
-	return dat ? dat->GetPtr((const char*)NULL, defaultValue) : defaultValue;
-}
-
-inline Color KeyValues::GetColor(int keySymbol)
-{
-	Color defaultValue(0, 0, 0, 0);
-	KeyValues* dat = FindKey(keySymbol);
-	return dat ? dat->GetColor() : defaultValue;
-}
-
-inline bool  KeyValues::IsEmpty(int keySymbol)
-{
-	KeyValues* dat = FindKey(keySymbol);
-	return dat ? dat->IsEmpty() : true;
-}
-
-
-class IKeyValuesDumpContext
-{
-public:
-	virtual bool KvBeginKey(KeyValues* pKey, int nIndentLevel) = 0;
-	virtual bool KvWriteValue(KeyValues* pValue, int nIndentLevel) = 0;
-	virtual bool KvEndKey(KeyValues* pKey, int nIndentLevel) = 0;
-};
-
-class IKeyValuesDumpContextAsText : public IKeyValuesDumpContext
-{
-public:
-	virtual bool KvBeginKey(KeyValues* pKey, int nIndentLevel);
-	virtual bool KvWriteValue(KeyValues* pValue, int nIndentLevel);
-	virtual bool KvEndKey(KeyValues* pKey, int nIndentLevel);
-
-public:
-	virtual bool KvWriteIndent(int nIndentLevel);
-	virtual bool KvWriteText(char const* szText) = 0;
-};
-
-class CKeyValuesDumpContextAsDevMsg : public IKeyValuesDumpContextAsText
-{
-public:
-	CKeyValuesDumpContextAsDevMsg(int nDeveloperLevel = 1) : m_nDeveloperLevel(nDeveloperLevel) {}
-
-public:
-	virtual bool KvBeginKey(KeyValues* pKey, int nIndentLevel);
-	virtual bool KvWriteText(char const* szText);
-
-protected:
-	int m_nDeveloperLevel;
-};
-
-inline bool KeyValuesDumpAsDevMsg(KeyValues* pKeyValues, int nIndentLevel = 0, int nDeveloperLevel = 1)
-{
-	CKeyValuesDumpContextAsDevMsg ctx(nDeveloperLevel);
-	return pKeyValues->Dump(&ctx, nIndentLevel);
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/l2cache.h b/SpyCustom/l2cache.h
deleted file mode 100644
index 8e9d523..0000000
--- a/SpyCustom/l2cache.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CL2CACHE_H
-#define CL2CACHE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class P4Event_BSQ_cache_reference;
-
-class CL2Cache
-{
-public:
-
-	CL2Cache();
-	~CL2Cache();
-
-	void Start(void);
-	void End(void);
-
-	int GetL2CacheMisses(void)
-	{
-		return m_iL2CacheMissCount;
-	}
-
-#ifdef DBGFLAG_VALIDATE
-	void Validate(CValidator& validator, tchar* pchName);		    
-#endif  
-
-private:
-
-	int								m_nID;
-
-	P4Event_BSQ_cache_reference* m_pL2CacheEvent;
-	int64							m_i64Start;
-	int64							m_i64End;
-	int								m_iL2CacheMissCount;
-};
-
-#endif    
diff --git a/SpyCustom/lerp_functions.h b/SpyCustom/lerp_functions.h
deleted file mode 100644
index 659df5d..0000000
--- a/SpyCustom/lerp_functions.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#ifndef LERP_FUNCTIONS_H
-#define LERP_FUNCTIONS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-template <class T>
-inline T LoopingLerp(float flPercent, T flFrom, T flTo)
-{
-	T s = flTo * flPercent + flFrom * (1.0f - flPercent);
-	return s;
-}
-
-template <>
-inline float LoopingLerp(float flPercent, float flFrom, float flTo)
-{
-	if (fabs(flTo - flFrom) >= 0.5f)
-	{
-		if (flFrom < flTo)
-			flFrom += 1.0f;
-		else
-			flTo += 1.0f;
-	}
-
-	float s = flTo * flPercent + flFrom * (1.0f - flPercent);
-
-	s = s - (int)(s);
-	if (s < 0.0f)
-		s = s + 1.0f;
-
-	return s;
-}
-
-template <class T>
-inline T Lerp_Hermite(const T& , float t, const T& p0, const T& p1, const T& p2)
-{
-	T d1 = p1 - p0;
-	T d2 = p2 - p1;
-
-	T output;
-	float tSqr = t * t;
-	float tCube = t * tSqr;
-
-	output = p1 * (2 * tCube - 3 * tSqr + 1);
-	output += p2 * (-2 * tCube + 3 * tSqr);
-	output += d1 * (tCube - 2 * tSqr + t);
-	output += d2 * (tCube - tSqr);
-
-	return output;
-}
-
-
-template <class T>
-inline T Derivative_Hermite(float t, const T& p0, const T& p1, const T& p2)
-{
-	T d1 = p1 - p0;
-	T d2 = p2 - p1;
-
-	T output;
-	float tSqr = t * t;
-
-	output = p1 * (6 * tSqr - 6 * t);
-	output += p2 * (-6 * tSqr + 6 * t);
-	output += d1 * (3 * tSqr - 4 * t + 1);
-	output += d2 * (3 * tSqr - 2 * t);
-
-	return output;
-}
-
-
-inline void Lerp_Clamp(int val)
-{
-}
-
-inline void Lerp_Clamp(float val)
-{
-}
-
-inline void Lerp_Clamp(const Vector& val)
-{
-}
-
-inline void Lerp_Clamp(const QAngle& val)
-{
-}
-
-
-template< class T, int minValue, int maxValue, int startValue >
-inline void Lerp_Clamp(CRangeCheckedVar<T, minValue, maxValue, startValue>& val)
-{
-	val.Clamp();
-}
-
-
-template<>
-inline QAngle Lerp_Hermite<QAngle>(const QAngle&, float t, const QAngle& p0, const QAngle& p1, const QAngle& p2)
-{
-	return Lerp(t, p1, p2);
-}
-
-template <class T>
-inline T LoopingLerp_Hermite(T current, float t, T p0, T p1, T p2)
-{
-	return Lerp_Hermite(current, t, p0, p1, p2);
-}
-
-template <>
-inline float LoopingLerp_Hermite(float , float t, float p0, float p1, float p2)
-{
-	if (fabs(p1 - p0) > 0.5f)
-	{
-		if (p0 < p1)
-			p0 += 1.0f;
-		else
-			p1 += 1.0f;
-	}
-
-	if (fabs(p2 - p1) > 0.5f)
-	{
-		if (p1 < p2)
-		{
-			p1 += 1.0f;
-
-			if (abs(p1 - p0) > 0.5)
-			{
-				if (p0 < p1)
-					p0 += 1.0f;
-				else
-					p1 += 1.0f;
-			}
-		}
-		else
-		{
-			p2 += 1.0f;
-		}
-	}
-
-	float s = Lerp_Hermite(  0.0f, t, p0, p1, p2);
-
-	s = s - (int)(s);
-	if (s < 0.0f)
-	{
-		s = s + 1.0f;
-	}
-
-	return s;
-}
-
-template< int minValue, int maxValue, int startValue >
-inline CRangeCheckedVar<float, minValue, maxValue, startValue> LoopingLerp_Hermite(CRangeCheckedVar<float, minValue, maxValue, startValue> current, float t, CRangeCheckedVar<float, minValue, maxValue, startValue> p0, CRangeCheckedVar<float, minValue, maxValue, startValue> p1, CRangeCheckedVar<float, minValue, maxValue, startValue> p2)
-{
-	return LoopingLerp_Hermite((float)current, t, (float)p0, (float)p1, (float)p2);
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/lightdesc.h b/SpyCustom/lightdesc.h
deleted file mode 100644
index d896a31..0000000
--- a/SpyCustom/lightdesc.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef LIGHTDESC_H
-#define LIGHTDESC_H
-
-#include "ssemath.h"
-#include "vector.h"
-
-enum LightType_t
-{
-	MATERIAL_LIGHT_DISABLE = 0,
-	MATERIAL_LIGHT_POINT,
-	MATERIAL_LIGHT_DIRECTIONAL,
-	MATERIAL_LIGHT_SPOT,
-};
-
-enum LightType_OptimizationFlags_t
-{
-	LIGHTTYPE_OPTIMIZATIONFLAGS_HAS_ATTENUATION0 = 1,
-	LIGHTTYPE_OPTIMIZATIONFLAGS_HAS_ATTENUATION1 = 2,
-	LIGHTTYPE_OPTIMIZATIONFLAGS_HAS_ATTENUATION2 = 4,
-	LIGHTTYPE_OPTIMIZATIONFLAGS_DERIVED_VALUES_CALCED = 8,
-};
-
-struct LightDesc_t
-{
-	LightType_t m_Type;										 
-	Vector m_Color;											  
-	Vector m_Position;										    
-	Vector m_Direction;										      
-	float  m_Range;											    
-	float m_Falloff;										      
-	float m_Attenuation0;									    
-	float m_Attenuation1;									    
-	float m_Attenuation2;									    
-	float m_Theta;											       
-	float m_Phi;											   
-
-	float m_ThetaDot;
-	float m_PhiDot;
-	unsigned int m_Flags;
-protected:
-	float OneOver_ThetaDot_Minus_PhiDot;
-	float m_RangeSquared;
-public:
-
-	void RecalculateDerivedValues(void);			       
-
-	LightDesc_t(void)
-	{
-	}
-
-	LightDesc_t(const Vector& pos, const Vector& color)
-	{
-		InitPoint(pos, color);
-	}
-
-	LightDesc_t(const Vector& pos, const Vector& color, const Vector& point_at,
-		float inner_cone_boundary, float outer_cone_boundary)
-	{
-		InitSpot(pos, color, point_at, inner_cone_boundary, outer_cone_boundary);
-	}
-
-	void InitPoint(const Vector& pos, const Vector& color);
-	void InitDirectional(const Vector& dir, const Vector& color);
-	void InitSpot(const Vector& pos, const Vector& color, const Vector& point_at,
-		float inner_cone_boundary, float outer_cone_boundary);
-
-	void ComputeLightAtPoints(const FourVectors& pos, const FourVectors& normal,
-		FourVectors& color, bool DoHalfLambert = false) const;
-	void ComputeNonincidenceLightAtPoints(const FourVectors& pos, FourVectors& color) const;
-	void ComputeLightAtPointsForDirectional(const FourVectors& pos,
-		const FourVectors& normal,
-		FourVectors& color, bool DoHalfLambert = false) const;
-
-	void SetupOldStyleAttenuation(float fQuadatricAttn, float fLinearAttn, float fConstantAttn);
-
-	void SetupNewStyleAttenuation(float fFiftyPercentDistance, float fZeroPercentDistance);
-
-
-	bool IsDirectionWithinLightCone(const Vector& rdir) const
-	{
-		return ((m_Type != MATERIAL_LIGHT_SPOT) || (rdir.Dot(m_Direction) >= m_PhiDot));
-	}
-
-	float OneOverThetaDotMinusPhiDot() const
-	{
-		return OneOver_ThetaDot_Minus_PhiDot;
-	}
-};
-
-
-inline void LightDesc_t::InitPoint(const Vector& pos, const Vector& color)
-{
-	m_Type = MATERIAL_LIGHT_POINT;
-	m_Color = color;
-	m_Position = pos;
-	m_Range = 0.0;									 
-	m_Attenuation0 = 1.0;
-	m_Attenuation1 = 0;
-	m_Attenuation2 = 0;
-	RecalculateDerivedValues();
-}
-
-
-inline void LightDesc_t::InitDirectional(const Vector& dir, const Vector& color)
-{
-	m_Type = MATERIAL_LIGHT_DIRECTIONAL;
-	m_Color = color;
-	m_Direction = dir;
-	m_Range = 0.0;									 
-	m_Attenuation0 = 1.0;
-	m_Attenuation1 = 0;
-	m_Attenuation2 = 0;
-	RecalculateDerivedValues();
-}
-
-
-inline void LightDesc_t::InitSpot(const Vector& pos, const Vector& color, const Vector& point_at,
-	float inner_cone_boundary, float outer_cone_boundary)
-{
-	m_Type = MATERIAL_LIGHT_SPOT;
-	m_Color = color;
-	m_Position = pos;
-	m_Direction = point_at;
-	m_Direction -= pos;
-	VectorNormalizeFast(m_Direction);
-	m_Falloff = 5.0;										   
-	m_Theta = inner_cone_boundary;
-	m_Phi = outer_cone_boundary;
-
-	m_Range = 0.0;										 
-
-	m_Attenuation0 = 1.0;
-	m_Attenuation1 = 0;
-	m_Attenuation2 = 0;
-	RecalculateDerivedValues();
-}
-
-
-#endif
diff --git a/SpyCustom/localflexcontroller.h b/SpyCustom/localflexcontroller.h
deleted file mode 100644
index 60f2c36..0000000
--- a/SpyCustom/localflexcontroller.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef LOCALFLEXCONTROLLER_H
-#define LOCALFLEXCONTROLLER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-
-enum LocalFlexController_t
-{
-	DUMMY_FLEX_CONTROLLER = 0x7fffffff						    
-};
-
-inline LocalFlexController_t& operator++(LocalFlexController_t& a) { return a = LocalFlexController_t(int(a) + 1); }
-inline LocalFlexController_t& operator--(LocalFlexController_t& a) { return a = LocalFlexController_t(int(a) - 1); }
-inline LocalFlexController_t  operator++(LocalFlexController_t& a, int) { LocalFlexController_t t = a; a = LocalFlexController_t(int(a) + 1); return t; }
-inline LocalFlexController_t  operator--(LocalFlexController_t& a, int) { LocalFlexController_t t = a; a = LocalFlexController_t(int(a) - 1); return t; }
-
-
-#endif	 
\ No newline at end of file
diff --git a/SpyCustom/logging.h b/SpyCustom/logging.h
deleted file mode 100644
index a9fdfab..0000000
--- a/SpyCustom/logging.h
+++ /dev/null
@@ -1,421 +0,0 @@
-#ifndef LOGGING_H
-#define LOGGING_H
-
-#if !defined(__SPU__)
-
-#if defined( COMPILER_MSVC )
-#pragma once
-#endif
-
-#include "color.h"
-#include "icommandline.h"
-#include <stdio.h>
-
-#if defined( _X360 )
-#include "xbox/xbox_console.h"
-#endif
-
-#if defined( _WIN32 ) || (defined(POSIX) && !defined(_GAMECONSOLE))
-#include "win32consoleio.h"
-#endif
-
-class CLoggingSystem;
-class CThreadFastMutex;
-
-const int MAX_LOGGING_MESSAGE_LENGTH = 2048;
-
-const int MAX_LOGGING_IDENTIFIER_LENGTH = 32;
-
-const int MAX_LOGGING_CHANNEL_COUNT = 256;
-
-const int MAX_LOGGING_TAG_COUNT = 1024;
-
-const int MAX_LOGGING_TAG_CHARACTER_COUNT = 8192;
-
-const int MAX_LOGGING_LISTENER_COUNT = 16;
-
-const Color UNSPECIFIED_LOGGING_COLOR(0, 0, 0, 0);
-
-typedef int LoggingChannelID_t;
-
-const LoggingChannelID_t INVALID_LOGGING_CHANNEL_ID = -1;
-
-enum LoggingSeverity_t
-{
-	LS_MESSAGE = 0,
-
-	LS_WARNING = 1,
-
-	LS_ASSERT = 2,
-
-	LS_ERROR = 3,
-
-	LS_HIGHEST_SEVERITY = 4,
-};
-
-enum LoggingResponse_t
-{
-	LR_CONTINUE,
-	LR_DEBUGGER,
-	LR_ABORT,
-};
-
-enum LoggingChannelFlags_t
-{
-	LCF_CONSOLE_ONLY = 0x00000001,
-
-	LCF_DO_NOT_ECHO = 0x00000002,
-};
-
-typedef void (*RegisterTagsFunc)();
-
-struct LoggingContext_t
-{
-	LoggingChannelID_t m_ChannelID;
-	LoggingChannelFlags_t m_Flags;
-	LoggingSeverity_t m_Severity;
-	Color m_Color;
-};
-
-class ILoggingListener
-{
-public:
-	virtual void Log(const LoggingContext_t* pContext, const tchar* pMessage) = 0;
-};
-
-class ILoggingResponsePolicy
-{
-public:
-	virtual LoggingResponse_t OnLog(const LoggingContext_t* pContext) = 0;
-};
-
-class CSimpleLoggingListener : public ILoggingListener
-{
-public:
-	CSimpleLoggingListener(bool bQuietPrintf = false, bool bQuietDebugger = false) :
-		m_bQuietPrintf(bQuietPrintf),
-		m_bQuietDebugger(bQuietDebugger)
-	{
-	}
-
-	virtual void Log(const LoggingContext_t* pContext, const tchar* pMessage)
-	{
-#ifdef _X360
-		if (!m_bQuietDebugger && XBX_IsConsoleConnected())
-		{
-			XBX_DebugString(XMAKECOLOR(0, 0, 0), pMessage);
-		}
-		else
-#endif
-		{
-#if !defined( _CERT ) && !defined( DBGFLAG_STRINGS_STRIP )
-			if (!m_bQuietPrintf)
-			{
-				_tprintf(_T("%s"), pMessage);
-			}
-#endif
-
-#ifdef _WIN32
-			if (!m_bQuietDebugger && Plat_IsInDebugSession())
-			{
-				Plat_DebugString(pMessage);
-			}
-#endif
-		}
-	}
-
-	bool m_bQuietPrintf;
-	bool m_bQuietDebugger;
-};
-
-class CSimpleWindowsLoggingListener : public ILoggingListener
-{
-public:
-	virtual void Log(const LoggingContext_t* pContext, const tchar* pMessage)
-	{
-		if (Plat_IsInDebugSession())
-		{
-			Plat_DebugString(pMessage);
-		}
-		if (pContext->m_Severity == LS_ERROR)
-		{
-			if (Plat_IsInDebugSession())
-				DebuggerBreak();
-
-			Plat_MessageBox("Error", pMessage);
-		}
-	}
-};
-
-
-#if !defined(_GAMECONSOLE)
-class CColorizedLoggingListener : public CSimpleLoggingListener
-{
-public:
-	CColorizedLoggingListener(bool bQuietPrintf = false, bool bQuietDebugger = false) : CSimpleLoggingListener(bQuietPrintf, bQuietDebugger)
-	{
-		InitWin32ConsoleColorContext(&m_ColorContext);
-	}
-
-	virtual void Log(const LoggingContext_t* pContext, const tchar* pMessage)
-	{
-		if (!m_bQuietPrintf)
-		{
-			int nPrevColor = -1;
-
-			if (pContext->m_Color != UNSPECIFIED_LOGGING_COLOR)
-			{
-				nPrevColor = SetWin32ConsoleColor(&m_ColorContext,
-					pContext->m_Color.r(), pContext->m_Color.g(), pContext->m_Color.b(),
-					MAX(MAX(pContext->m_Color.r(), pContext->m_Color.g()), pContext->m_Color.b()) > 128);
-			}
-
-			_tprintf(_T("%s"), pMessage);
-
-			if (nPrevColor >= 0)
-			{
-				RestoreWin32ConsoleColor(&m_ColorContext, nPrevColor);
-			}
-		}
-
-#ifdef _WIN32
-		if (!m_bQuietDebugger && Plat_IsInDebugSession())
-		{
-			Plat_DebugString(pMessage);
-		}
-#endif
-	}
-
-	Win32ConsoleColorContext_t m_ColorContext;
-};
-#endif  
-
-
-class CDefaultLoggingResponsePolicy : public ILoggingResponsePolicy
-{
-public:
-	virtual LoggingResponse_t OnLog(const LoggingContext_t* pContext)
-	{
-		if (pContext->m_Severity == LS_ASSERT && !CommandLine()->FindParm("-noassert"))
-		{
-			return LR_DEBUGGER;
-		}
-		else if (pContext->m_Severity == LS_ERROR)
-		{
-			return LR_ABORT;
-		}
-		else
-		{
-			return LR_CONTINUE;
-		}
-	}
-};
-
-class CNonFatalLoggingResponsePolicy : public ILoggingResponsePolicy
-{
-public:
-	virtual LoggingResponse_t OnLog(const LoggingContext_t* pContext)
-	{
-		if ((pContext->m_Severity == LS_ASSERT && !CommandLine()->FindParm("-noassert")) || pContext->m_Severity == LS_ERROR)
-		{
-			return LR_DEBUGGER;
-		}
-		else
-		{
-			return LR_CONTINUE;
-		}
-	}
-};
-
-class CLoggingSystem
-{
-public:
-	struct LoggingChannel_t;
-
-	CLoggingSystem();
-	~CLoggingSystem();
-
-	LoggingChannelID_t RegisterLoggingChannel(const char* pChannelName, RegisterTagsFunc registerTagsFunc, int flags = 0, LoggingSeverity_t minimumSeverity = LS_MESSAGE, Color spewColor = UNSPECIFIED_LOGGING_COLOR);
-
-	LoggingChannelID_t FindChannel(const char* pChannelName) const;
-
-	int GetChannelCount() const { return m_nChannelCount; }
-
-	LoggingChannel_t* GetChannel(LoggingChannelID_t channelID);
-	const LoggingChannel_t* GetChannel(LoggingChannelID_t channelID) const;
-
-	bool HasTag(LoggingChannelID_t channelID, const char* pTag) const { return GetChannel(channelID)->HasTag(pTag); }
-
-	bool IsValidChannelID(LoggingChannelID_t channelID) const { return (channelID >= 0) && (channelID < m_nChannelCount); }
-
-	bool IsChannelEnabled(LoggingChannelID_t channelID, LoggingSeverity_t severity) const { return IsValidChannelID(channelID) && GetChannel(channelID)->IsEnabled(severity); }
-
-	void SetChannelSpewLevel(LoggingChannelID_t channelID, LoggingSeverity_t minimumSeverity);
-	void SetChannelSpewLevelByName(const char* pName, LoggingSeverity_t minimumSeverity);
-	void SetChannelSpewLevelByTag(const char* pTag, LoggingSeverity_t minimumSeverity);
-	void SetGlobalSpewLevel(LoggingSeverity_t minimumSeverity);
-
-	Color GetChannelColor(LoggingChannelID_t channelID) const { return GetChannel(channelID)->m_SpewColor; }
-	void SetChannelColor(LoggingChannelID_t channelID, Color color) { GetChannel(channelID)->m_SpewColor = color; }
-
-	LoggingChannelFlags_t GetChannelFlags(LoggingChannelID_t channelID) const { return GetChannel(channelID)->m_Flags; }
-	void SetChannelFlags(LoggingChannelID_t channelID, LoggingChannelFlags_t flags) { GetChannel(channelID)->m_Flags = flags; }
-
-	void AddTagToCurrentChannel(const char* pTagName);
-
-	void PushLoggingState(bool bThreadLocal = false, bool bClearState = true);
-	void PopLoggingState(bool bThreadLocal = false);
-
-	void RegisterLoggingListener(ILoggingListener* pListener);
-
-	bool IsListenerRegistered(ILoggingListener* pListener);
-
-	void ResetCurrentLoggingState();
-
-	void SetLoggingResponsePolicy(ILoggingResponsePolicy* pLoggingResponse);
-
-	LoggingResponse_t LogDirect(LoggingChannelID_t channelID, LoggingSeverity_t severity, Color color, const tchar* pMessage);
-
-	struct LoggingTag_t
-	{
-		const char* m_pTagName;
-		LoggingTag_t* m_pNextTag;
-	};
-
-	struct LoggingChannel_t
-	{
-		bool HasTag(const char* pTag) const
-		{
-			LoggingTag_t* pCurrentTag = m_pFirstTag;
-			while (pCurrentTag != NULL)
-			{
-				if (stricmp(pCurrentTag->m_pTagName, pTag) == 0)
-				{
-					return true;
-				}
-				pCurrentTag = pCurrentTag->m_pNextTag;
-			}
-			return false;
-		}
-		bool IsEnabled(LoggingSeverity_t severity) const { return severity >= m_MinimumSeverity; }
-		void SetSpewLevel(LoggingSeverity_t severity) { m_MinimumSeverity = severity; }
-
-		LoggingChannelID_t m_ID;
-		LoggingChannelFlags_t m_Flags;      
-		LoggingSeverity_t m_MinimumSeverity;          
-		Color m_SpewColor;
-		char m_Name[MAX_LOGGING_IDENTIFIER_LENGTH];
-		LoggingTag_t* m_pFirstTag;
-	};
-
-private:
-	struct LoggingState_t
-	{
-		int m_nPreviousStackEntry;
-
-		int m_nListenerCount;
-		ILoggingListener* m_RegisteredListeners[MAX_LOGGING_LISTENER_COUNT];
-
-		ILoggingResponsePolicy* m_pLoggingResponse;
-	};
-
-	LoggingState_t* GetCurrentState();
-	const LoggingState_t* GetCurrentState() const;
-
-	int FindUnusedStateIndex();
-	LoggingTag_t* AllocTag(const char* pTagName);
-
-	int m_nChannelCount;
-	LoggingChannel_t m_RegisteredChannels[MAX_LOGGING_CHANNEL_COUNT];
-
-	int m_nChannelTagCount;
-	LoggingTag_t m_ChannelTags[MAX_LOGGING_TAG_COUNT];
-
-	int m_nTagNamePoolIndex;
-	char m_TagNamePool[MAX_LOGGING_TAG_CHARACTER_COUNT];
-
-	CThreadFastMutex* m_pStateMutex;
-
-	int m_nGlobalStateIndex;
-
-	static const int MAX_LOGGING_STATE_COUNT = 16;
-	LoggingState_t m_LoggingStates[MAX_LOGGING_STATE_COUNT];
-
-	CDefaultLoggingResponsePolicy m_DefaultLoggingResponse;
-
-	CSimpleLoggingListener m_DefaultLoggingListener;
-
-};
-
-#ifdef DBGFLAG_STRINGS_STRIP
-#define InternalMsg( Channel, Severity,     ... ) do { if ( Severity == LS_ERROR && LoggingSystem_IsChannelEnabled( Channel, Severity ) ) LoggingSystem_Log( Channel, Severity,     ##__VA_ARGS__ ); } while( 0 )
-#else
-#define InternalMsg( Channel, Severity,     ... ) do { if ( LoggingSystem_IsChannelEnabled( Channel, Severity ) ) LoggingSystem_Log( Channel, Severity,     ##__VA_ARGS__ ); } while( 0 )
-#endif
-
-#define Log_Msg( Channel,     ... ) InternalMsg( Channel, LS_MESSAGE,     ##__VA_ARGS__ )
-#define Log_Warning( Channel,     ... ) InternalMsg( Channel, LS_WARNING,     ##__VA_ARGS__ )
-#define Log_Error( Channel,     ... ) InternalMsg( Channel, LS_ERROR,     ##__VA_ARGS__ )
-#ifdef DBGFLAG_STRINGS_STRIP
-#define Log_Assert( ... ) LR_CONTINUE
-#else
-#define Log_Assert( Message, ... ) LoggingSystem_LogAssert( Message, ##__VA_ARGS__ )
-#endif
-
-
-#define DECLARE_LOGGING_CHANNEL( Channel ) extern LoggingChannelID_t Channel
-
-#define DEFINE_LOGGING_CHANNEL_NO_TAGS( Channel, ChannelName,      ... ) \
-	LoggingChannelID_t Channel = LoggingSystem_RegisterLoggingChannel( ChannelName, NULL, ##__VA_ARGS__ )
-
-#define BEGIN_DEFINE_LOGGING_CHANNEL( Channel, ChannelName,      ... ) \
-	static void Register_##Channel##_Tags(); \
-	LoggingChannelID_t Channel = LoggingSystem_RegisterLoggingChannel( ChannelName, Register_##Channel##_Tags, ##__VA_ARGS__ ); \
-	void Register_##Channel##_Tags() \
-	{
-
-#define ADD_LOGGING_CHANNEL_TAG( Tag ) LoggingSystem_AddTagToCurrentChannel( Tag )
-
-#define END_DEFINE_LOGGING_CHANNEL() \
-	}
-
-PLATFORM_INTERFACE LoggingChannelID_t LoggingSystem_RegisterLoggingChannel(const char* pName, RegisterTagsFunc registerTagsFunc, int flags = 0, LoggingSeverity_t severity = LS_MESSAGE, Color color = UNSPECIFIED_LOGGING_COLOR);
-
-PLATFORM_INTERFACE void LoggingSystem_RegisterLoggingListener(ILoggingListener* pListener);
-PLATFORM_INTERFACE void LoggingSystem_UnregisterLoggingListener(ILoggingListener* pListener);
-PLATFORM_INTERFACE void LoggingSystem_ResetCurrentLoggingState();
-PLATFORM_INTERFACE void LoggingSystem_SetLoggingResponsePolicy(ILoggingResponsePolicy* pResponsePolicy);
-PLATFORM_INTERFACE void LoggingSystem_PushLoggingState(bool bThreadLocal = false, bool bClearState = true);
-PLATFORM_INTERFACE void LoggingSystem_PopLoggingState(bool bThreadLocal = false);
-
-PLATFORM_INTERFACE void LoggingSystem_AddTagToCurrentChannel(const char* pTagName);
-
-PLATFORM_INTERFACE LoggingChannelID_t LoggingSystem_FindChannel(const char* pChannelName);
-PLATFORM_INTERFACE int LoggingSystem_GetChannelCount();
-PLATFORM_INTERFACE LoggingChannelID_t LoggingSystem_GetFirstChannelID();
-PLATFORM_INTERFACE LoggingChannelID_t LoggingSystem_GetNextChannelID(LoggingChannelID_t channelID);
-PLATFORM_INTERFACE const CLoggingSystem::LoggingChannel_t* LoggingSystem_GetChannel(LoggingChannelID_t channelID);
-
-PLATFORM_INTERFACE bool LoggingSystem_HasTag(LoggingChannelID_t channelID, const char* pTag);
-
-PLATFORM_INTERFACE bool LoggingSystem_IsChannelEnabled(LoggingChannelID_t channelID, LoggingSeverity_t severity);
-PLATFORM_INTERFACE void LoggingSystem_SetChannelSpewLevel(LoggingChannelID_t channelID, LoggingSeverity_t minimumSeverity);
-PLATFORM_INTERFACE void LoggingSystem_SetChannelSpewLevelByName(const char* pName, LoggingSeverity_t minimumSeverity);
-PLATFORM_INTERFACE void LoggingSystem_SetChannelSpewLevelByTag(const char* pTag, LoggingSeverity_t minimumSeverity);
-PLATFORM_INTERFACE void LoggingSystem_SetGlobalSpewLevel(LoggingSeverity_t minimumSeverity);
-
-PLATFORM_INTERFACE int32 LoggingSystem_GetChannelColor(LoggingChannelID_t channelID);
-PLATFORM_INTERFACE void LoggingSystem_SetChannelColor(LoggingChannelID_t channelID, int color);
-
-PLATFORM_INTERFACE LoggingChannelFlags_t LoggingSystem_GetChannelFlags(LoggingChannelID_t channelID);
-PLATFORM_INTERFACE void LoggingSystem_SetChannelFlags(LoggingChannelID_t channelID, LoggingChannelFlags_t flags);
-
-PLATFORM_INTERFACE LoggingResponse_t LoggingSystem_Log(LoggingChannelID_t channelID, LoggingSeverity_t severity, PRINTF_FORMAT_STRING const char* pMessageFormat, ...) FMTFUNCTION(3, 4);
-PLATFORM_OVERLOAD LoggingResponse_t LoggingSystem_Log(LoggingChannelID_t channelID, LoggingSeverity_t severity, Color spewColor, PRINTF_FORMAT_STRING const char* pMessageFormat, ...) FMTFUNCTION(4, 5);
-
-PLATFORM_INTERFACE LoggingResponse_t LoggingSystem_LogDirect(LoggingChannelID_t channelID, LoggingSeverity_t severity, Color spewColor, const char* pMessage);
-PLATFORM_INTERFACE LoggingResponse_t LoggingSystem_LogAssert(PRINTF_FORMAT_STRING const char* pMessageFormat, ...) FMTFUNCTION(1, 2);
-
-#endif  
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/math_pfns.h b/SpyCustom/math_pfns.h
deleted file mode 100644
index 52292fe..0000000
--- a/SpyCustom/math_pfns.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _MATH_PFNS_H_
-#define _MATH_PFNS_H_
-
-#if defined( _X360 )
-#include <xboxmath.h>
-#endif
-
-#if !defined( _X360 )
-
-extern float (*pfSqrt)(float x);
-extern float (*pfRSqrt)(float x);
-extern float (*pfRSqrtFast)(float x);
-extern void  (*pfFastSinCos)(float x, float* s, float* c);
-extern float (*pfFastCos)(float x);
-
-#define FastSqrt(x)			(*pfSqrt)(x)
-#define	FastRSqrt(x)		(*pfRSqrt)(x)
-#define FastRSqrtFast(x)    (*pfRSqrtFast)(x)
-#define FastSinCos(x,s,c)   (*pfFastSinCos)(x,s,c)
-#define FastCos(x)			(*pfFastCos)(x)
-
-#if defined(__i386__) || defined(_M_IX86)
-#undef FastSqrt
-#define FastSqrt(x)			::sqrtf(x)
-#endif
-
-#endif  
-
-#if defined( _X360 )
-
-FORCEINLINE float _VMX_Sqrt(float x)
-{
-	return __fsqrts(x);
-}
-
-FORCEINLINE float _VMX_RSqrt(float x)
-{
-	float rroot = __frsqrte(x);
-
-	return (0.5f * rroot) * (3.0f - (x * rroot) * rroot);
-}
-
-FORCEINLINE float _VMX_RSqrtFast(float x)
-{
-	return __frsqrte(x);
-}
-
-FORCEINLINE void _VMX_SinCos(float a, float* pS, float* pC)
-{
-	XMScalarSinCos(pS, pC, a);
-}
-
-FORCEINLINE float _VMX_Cos(float a)
-{
-	return XMScalarCos(a);
-}
-
-#define FastSqrt(x)			_VMX_Sqrt(x)
-#define	FastRSqrt(x)		_VMX_RSqrt(x)
-#define FastRSqrtFast(x)	_VMX_RSqrtFast(x)
-#define FastSinCos(x,s,c)	_VMX_SinCos(x,s,c)
-#define FastCos(x)			_VMX_Cos(x)
-
-#endif  
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/mathlib.h b/SpyCustom/mathlib.h
deleted file mode 100644
index 9f32d71..0000000
--- a/SpyCustom/mathlib.h
+++ /dev/null
@@ -1,1785 +0,0 @@
-#ifndef MATH_LIB_H
-#define MATH_LIB_H
-
-#include <math.h>
-#include "basetypes.h"
-#include "commonmacros.h"
-#include "vector.h"
-#include "vector2d.h"
-#include "dbg.h"
-
-#include "math_pfns.h"
-
-#if defined(__i386__) || defined(_M_IX86)
-#include <xmmintrin.h>
-#endif
-
-#undef clamp
-
-
-#ifdef FP_EXCEPTIONS_ENABLED
-#include <float.h>     
-#endif
-
-class FPExceptionDisabler
-{
-public:
-#ifdef FP_EXCEPTIONS_ENABLED
-	FPExceptionDisabler();
-	~FPExceptionDisabler();
-
-private:
-	unsigned int mOldValues;
-#else
-	FPExceptionDisabler() {}
-	~FPExceptionDisabler() {}
-#endif
-
-private:
-	FPExceptionDisabler(const FPExceptionDisabler&);
-	FPExceptionDisabler& operator=(const FPExceptionDisabler&);
-};
-
-class FPExceptionEnabler
-{
-public:
-#ifdef FP_EXCEPTIONS_ENABLED
-	FPExceptionEnabler(unsigned int enableBits = _EM_OVERFLOW | _EM_ZERODIVIDE | _EM_INVALID);
-	~FPExceptionEnabler();
-
-private:
-	unsigned int mOldValues;
-#else
-	FPExceptionEnabler(unsigned int enableBits = 0)
-	{
-	}
-	~FPExceptionEnabler()
-	{
-	}
-#endif
-
-private:
-	FPExceptionEnabler(const FPExceptionEnabler&);
-	FPExceptionEnabler& operator=(const FPExceptionEnabler&);
-};
-
-
-
-#ifdef DEBUG     
-FORCEINLINE float clamp(float val, float minVal, float maxVal)
-{
-	if (maxVal < minVal)
-		return maxVal;
-	else if (val < minVal)
-		return minVal;
-	else if (val > maxVal)
-		return maxVal;
-	else
-		return val;
-}
-#else  
-FORCEINLINE float clamp(float val, float minVal, float maxVal)
-{
-#if defined(__i386__) || defined(_M_IX86)
-	_mm_store_ss(&val,
-		_mm_min_ss(
-			_mm_max_ss(
-				_mm_load_ss(&val),
-				_mm_load_ss(&minVal)),
-			_mm_load_ss(&maxVal)));
-#else
-	val = fpmax(minVal, val);
-	val = fpmin(maxVal, val);
-#endif
-	return val;
-}
-#endif  
-
-template< class T >
-inline T clamp(T const& val, T const& minVal, T const& maxVal)
-{
-	if (maxVal < minVal)
-		return maxVal;
-	else if (val < minVal)
-		return minVal;
-	else if (val > maxVal)
-		return maxVal;
-	else
-		return val;
-}
-
-
-struct cplane_t
-{
-	Vector	normal;
-	float	dist;
-	byte	type;			    
-	byte	signbits;		     
-	byte	pad[2];
-
-#ifdef VECTOR_NO_SLOW_OPERATIONS
-	cplane_t() {}
-
-private:
-	cplane_t(const cplane_t& vOther);
-#endif
-};
-
-#define CPLANE_NORMAL_X			0
-#define CPLANE_NORMAL_Y			4
-#define CPLANE_NORMAL_Z			8
-#define CPLANE_DIST				12
-#define CPLANE_TYPE				16
-#define CPLANE_SIGNBITS			17
-#define CPLANE_PAD0				18
-#define CPLANE_PAD1				19
-
-#define	PLANE_X			0
-#define	PLANE_Y			1
-#define	PLANE_Z			2
-
-#define	PLANE_ANYX		3
-#define	PLANE_ANYY		4
-#define	PLANE_ANYZ		5
-
-
-enum
-{
-	FRUSTUM_RIGHT = 0,
-	FRUSTUM_LEFT = 1,
-	FRUSTUM_TOP = 2,
-	FRUSTUM_BOTTOM = 3,
-	FRUSTUM_NEARZ = 4,
-	FRUSTUM_FARZ = 5,
-	FRUSTUM_NUMPLANES = 6
-};
-
-extern int SignbitsForPlane(cplane_t* out);
-
-class Frustum_t
-{
-public:
-	void SetPlane(int i, int nType, const Vector& vecNormal, float dist)
-	{
-		m_Plane[i].normal = vecNormal;
-		m_Plane[i].dist = dist;
-		m_Plane[i].type = nType;
-		m_Plane[i].signbits = SignbitsForPlane(&m_Plane[i]);
-		m_AbsNormal[i].Init(fabs(vecNormal.x), fabs(vecNormal.y), fabs(vecNormal.z));
-	}
-
-	inline const cplane_t* GetPlane(int i) const { return &m_Plane[i]; }
-	inline const Vector& GetAbsNormal(int i) const { return m_AbsNormal[i]; }
-
-private:
-	cplane_t	m_Plane[FRUSTUM_NUMPLANES];
-	Vector		m_AbsNormal[FRUSTUM_NUMPLANES];
-};
-
-float CalcFovY(float flFovX, float flScreenAspect);
-float CalcFovX(float flFovY, float flScreenAspect);
-
-void GeneratePerspectiveFrustum(const Vector& origin, const QAngle& angles, float flZNear, float flZFar, float flFovX, float flAspectRatio, Frustum_t& frustum);
-void GeneratePerspectiveFrustum(const Vector& origin, const Vector& forward, const Vector& right, const Vector& up, float flZNear, float flZFar, float flFovX, float flFovY, Frustum_t& frustum);
-
-bool R_CullBox(const Vector& mins, const Vector& maxs, const Frustum_t& frustum);
-bool R_CullBoxSkipNear(const Vector& mins, const Vector& maxs, const Frustum_t& frustum);
-
-struct matrix3x4_t
-{
-	matrix3x4_t() {}
-	matrix3x4_t(
-		float m00, float m01, float m02, float m03,
-		float m10, float m11, float m12, float m13,
-		float m20, float m21, float m22, float m23)
-	{
-		m_flMatVal[0][0] = m00;	m_flMatVal[0][1] = m01; m_flMatVal[0][2] = m02; m_flMatVal[0][3] = m03;
-		m_flMatVal[1][0] = m10;	m_flMatVal[1][1] = m11; m_flMatVal[1][2] = m12; m_flMatVal[1][3] = m13;
-		m_flMatVal[2][0] = m20;	m_flMatVal[2][1] = m21; m_flMatVal[2][2] = m22; m_flMatVal[2][3] = m23;
-	}
-
-	void Init(const Vector& xAxis, const Vector& yAxis, const Vector& zAxis, const Vector& vecOrigin)
-	{
-		m_flMatVal[0][0] = xAxis.x; m_flMatVal[0][1] = yAxis.x; m_flMatVal[0][2] = zAxis.x; m_flMatVal[0][3] = vecOrigin.x;
-		m_flMatVal[1][0] = xAxis.y; m_flMatVal[1][1] = yAxis.y; m_flMatVal[1][2] = zAxis.y; m_flMatVal[1][3] = vecOrigin.y;
-		m_flMatVal[2][0] = xAxis.z; m_flMatVal[2][1] = yAxis.z; m_flMatVal[2][2] = zAxis.z; m_flMatVal[2][3] = vecOrigin.z;
-	}
-
-	matrix3x4_t(const Vector& xAxis, const Vector& yAxis, const Vector& zAxis, const Vector& vecOrigin)
-	{
-		Init(xAxis, yAxis, zAxis, vecOrigin);
-	}
-
-	inline void Invalidate(void)
-	{
-		for (int i = 0; i < 3; i++)
-		{
-			for (int j = 0; j < 4; j++)
-			{
-				m_flMatVal[i][j] = VEC_T_NAN;
-			}
-		}
-	}
-
-	float* operator[](int i) { Assert((i >= 0) && (i < 3)); return m_flMatVal[i]; }
-	const float* operator[](int i) const { Assert((i >= 0) && (i < 3)); return m_flMatVal[i]; }
-	float* Base() { return &m_flMatVal[0][0]; }
-	const float* Base() const { return &m_flMatVal[0][0]; }
-
-	float m_flMatVal[3][4];
-};
-
-#include "fltx4.h"
-
-class ALIGN16 matrix3x4a_t : public matrix3x4_t
-{
-public:
-	matrix3x4a_t(const matrix3x4_t& src) { *this = src; };
-	matrix3x4a_t& operator=(const matrix3x4_t& src) { memcpy(Base(), src.Base(), sizeof(float) * 3 * 4); return *this; };
-
-	matrix3x4a_t(
-		float m00, float m01, float m02, float m03,
-		float m10, float m11, float m12, float m13,
-		float m20, float m21, float m22, float m23)
-	{
-		AssertDbg(((size_t)Base() & 0xf) == 0);
-		m_flMatVal[0][0] = m00;	m_flMatVal[0][1] = m01; m_flMatVal[0][2] = m02; m_flMatVal[0][3] = m03;
-		m_flMatVal[1][0] = m10;	m_flMatVal[1][1] = m11; m_flMatVal[1][2] = m12; m_flMatVal[1][3] = m13;
-		m_flMatVal[2][0] = m20;	m_flMatVal[2][1] = m21; m_flMatVal[2][2] = m22; m_flMatVal[2][3] = m23;
-	}
-	matrix3x4a_t() {}
-
-	static FORCEINLINE bool TypeIsAlignedForSIMD(void) { return true; }
-
-
-	FORCEINLINE fltx4& SIMDRow(uint nIdx) { AssertDbg(nIdx < 3); return *((fltx4*)(&(m_flMatVal[nIdx]))); }
-	FORCEINLINE const fltx4& SIMDRow(uint nIdx) const { AssertDbg(nIdx < 3); return *((const fltx4*)(&(m_flMatVal[nIdx]))); }
-
-} ALIGN16_POST;
-
-
-
-#ifndef M_PI
-#define M_PI		3.14159265358979323846	      
-#endif
-
-#define M_PI_F		((float)(M_PI))	    
-
-#ifndef RAD2DEG
-#define RAD2DEG( x  )  ( (float)(x) * (float)(180.f / M_PI_F) )
-#endif
-
-#ifndef DEG2RAD
-#define DEG2RAD( x  )  ( (float)(x) * (float)(M_PI_F / 180.f) )
-#endif
-
-#define	SIDE_FRONT	0
-#define	SIDE_BACK	1
-#define	SIDE_ON		2
-#define SIDE_CROSS  -2         
-
-#define ON_VIS_EPSILON  0.01              
-#define	EQUAL_EPSILON	0.001              
-
-extern bool s_bMathlibInitialized;
-
-extern  const Vector vec3_origin;
-extern  const QAngle vec3_angle;
-extern	const Quaternion quat_identity;
-extern const Vector vec3_invalid;
-extern	const int nanmask;
-
-#define	IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
-
-FORCEINLINE vec_t DotProduct(const vec_t* v1, const vec_t* v2)
-{
-	return v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2];
-}
-FORCEINLINE void VectorSubtract(const vec_t* a, const vec_t* b, vec_t* c)
-{
-	c[0] = a[0] - b[0];
-	c[1] = a[1] - b[1];
-	c[2] = a[2] - b[2];
-}
-FORCEINLINE void VectorAdd(const vec_t* a, const vec_t* b, vec_t* c)
-{
-	c[0] = a[0] + b[0];
-	c[1] = a[1] + b[1];
-	c[2] = a[2] + b[2];
-}
-FORCEINLINE void VectorCopy(const vec_t* a, vec_t* b)
-{
-	b[0] = a[0];
-	b[1] = a[1];
-	b[2] = a[2];
-}
-FORCEINLINE void VectorClear(vec_t* a)
-{
-	a[0] = a[1] = a[2] = 0;
-}
-
-FORCEINLINE float VectorMaximum(const vec_t* v)
-{
-	return max(v[0], max(v[1], v[2]));
-}
-
-FORCEINLINE float VectorMaximum(const Vector& v)
-{
-	return max(v.x, max(v.y, v.z));
-}
-
-FORCEINLINE void VectorScale(const float* in, vec_t scale, float* out)
-{
-	out[0] = in[0] * scale;
-	out[1] = in[1] * scale;
-	out[2] = in[2] * scale;
-}
-
-
-inline void VectorFill(vec_t* a, float b)
-{
-	a[0] = a[1] = a[2] = b;
-}
-
-inline void VectorNegate(vec_t* a)
-{
-	a[0] = -a[0];
-	a[1] = -a[1];
-	a[2] = -a[2];
-}
-
-
-#define Vector2Clear(x)			{(x)[0]=(x)[1]=0;}
-#define Vector2Negate(x)		{(x)[0]=-((x)[0]);(x)[1]=-((x)[1]);}
-#define Vector2Copy(a,b)		{(b)[0]=(a)[0];(b)[1]=(a)[1];}
-#define Vector2Subtract(a,b,c)	{(c)[0]=(a)[0]-(b)[0];(c)[1]=(a)[1]-(b)[1];}
-#define Vector2Add(a,b,c)		{(c)[0]=(a)[0]+(b)[0];(c)[1]=(a)[1]+(b)[1];}
-#define Vector2Scale(a,b,c)		{(c)[0]=(b)*(a)[0];(c)[1]=(b)*(a)[1];}
-
-#define VECTOR_COPY( A, B ) do { (B)[0] = (A)[0]; (B)[1] = (A)[1]; (B)[2]=(A)[2]; } while(0)
-#define DOT_PRODUCT( A, B ) ( (A)[0]*(B)[0] + (A)[1]*(B)[1] + (A)[2]*(B)[2] )
-
-FORCEINLINE void VectorMAInline(const float* start, float scale, const float* direction, float* dest)
-{
-	dest[0] = start[0] + direction[0] * scale;
-	dest[1] = start[1] + direction[1] * scale;
-	dest[2] = start[2] + direction[2] * scale;
-}
-
-FORCEINLINE void VectorMAInline(const Vector& start, float scale, const Vector& direction, Vector& dest)
-{
-	dest.x = start.x + direction.x * scale;
-	dest.y = start.y + direction.y * scale;
-	dest.z = start.z + direction.z * scale;
-}
-
-FORCEINLINE void VectorMA(const Vector& start, float scale, const Vector& direction, Vector& dest)
-{
-	VectorMAInline(start, scale, direction, dest);
-}
-
-FORCEINLINE void VectorMA(const float* start, float scale, const float* direction, float* dest)
-{
-	VectorMAInline(start, scale, direction, dest);
-}
-
-
-int VectorCompare(const float* v1, const float* v2);
-
-inline float VectorLength(const float* v)
-{
-	return FastSqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2] + FLT_EPSILON);
-}
-
-void CrossProduct(const float* v1, const float* v2, float* cross);
-
-qboolean VectorsEqual(const float* v1, const float* v2);
-
-inline vec_t RoundInt(vec_t in)
-{
-	return floor(in + 0.5f);
-}
-
-int Q_log2(int val);
-
-void inline SinCos(float radians, float* sine, float* cosine)
-{
-#if defined( _X360 )
-	XMScalarSinCos(sine, cosine, radians);
-#elif defined( PLATFORM_WINDOWS_PC32 )
-	_asm
-	{
-		fld		DWORD PTR[radians]
-		fsincos
-
-		mov edx, DWORD PTR[cosine]
-		mov eax, DWORD PTR[sine]
-
-		fstp DWORD PTR[edx]
-		fstp DWORD PTR[eax]
-	}
-#elif defined( PLATFORM_WINDOWS_PC64 )
-	*sine = sin(radians);
-	*cosine = cos(radians);
-#elif defined( POSIX )
-	register double __cosr, __sinr;
-	__asm ("fsincos" : "=t" (__cosr), "=u" (__sinr) : "0" (radians));
-
-	*sine = __sinr;
-	*cosine = __cosr;
-#endif
-}
-
-#define SIN_TABLE_SIZE	256
-#define FTOIBIAS		12582912.f
-extern float SinCosTable[SIN_TABLE_SIZE];
-
-inline float TableCos(float theta)
-{
-	union
-	{
-		int i;
-		float f;
-	} ftmp;
-
-	ftmp.f = theta * (float)(SIN_TABLE_SIZE / (2.0f * M_PI)) + (FTOIBIAS + (SIN_TABLE_SIZE / 4));
-	return SinCosTable[ftmp.i & (SIN_TABLE_SIZE - 1)];
-}
-
-inline float TableSin(float theta)
-{
-	union
-	{
-		int i;
-		float f;
-	} ftmp;
-
-	ftmp.f = theta * (float)(SIN_TABLE_SIZE / (2.0f * M_PI)) + FTOIBIAS;
-	return SinCosTable[ftmp.i & (SIN_TABLE_SIZE - 1)];
-}
-
-template<class T>
-FORCEINLINE T Square(T const& a)
-{
-	return a * a;
-}
-
-
-FORCEINLINE uint SmallestPowerOfTwoGreaterOrEqual(uint x)
-{
-	x -= 1;
-	x |= x >> 1;
-	x |= x >> 2;
-	x |= x >> 4;
-	x |= x >> 8;
-	x |= x >> 16;
-	return x + 1;
-}
-
-FORCEINLINE uint LargestPowerOfTwoLessThanOrEqual(uint x)
-{
-	if (x >= 0x80000000)
-		return 0x80000000;
-
-	return SmallestPowerOfTwoGreaterOrEqual(x + 1) >> 1;
-}
-
-
-void FloorDivMod(double numer, double denom, int* quotient, int* rem);
-int GreatestCommonDivisor(int i1, int i2);
-
-bool IsDenormal(const float& val);
-
-enum
-{
-	PITCH = 0,	   
-	YAW,		   
-	ROLL		  
-};
-
-void MatrixAngles(const matrix3x4_t& matrix, float* angles);  
-void MatrixVectors(const matrix3x4_t& matrix, Vector* pForward, Vector* pRight, Vector* pUp);
-void VectorTransform(const float* in1, const matrix3x4_t& in2, float* out);
-void VectorITransform(const float* in1, const matrix3x4_t& in2, float* out);
-void VectorRotate(const float* in1, const matrix3x4_t& in2, float* out);
-void VectorRotate(const Vector& in1, const QAngle& in2, Vector& out);
-void VectorRotate(const Vector& in1, const Quaternion& in2, Vector& out);
-void VectorIRotate(const float* in1, const matrix3x4_t& in2, float* out);
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-QAngle TransformAnglesToLocalSpace(const QAngle& angles, const matrix3x4_t& parentMatrix);
-QAngle TransformAnglesToWorldSpace(const QAngle& angles, const matrix3x4_t& parentMatrix);
-
-#endif
-
-void MatrixInitialize(matrix3x4_t& mat, const Vector& vecOrigin, const Vector& vecXAxis, const Vector& vecYAxis, const Vector& vecZAxis);
-void MatrixCopy(const matrix3x4_t& in, matrix3x4_t& out);
-void MatrixInvert(const matrix3x4_t& in, matrix3x4_t& out);
-
-bool MatricesAreEqual(const matrix3x4_t& src1, const matrix3x4_t& src2, float flTolerance = 1e-5);
-
-void MatrixGetColumn(const matrix3x4_t& in, int column, Vector& out);
-void MatrixSetColumn(const Vector& in, int column, matrix3x4_t& out);
-
-inline void MatrixGetTranslation(const matrix3x4_t& in, Vector& out)
-{
-	MatrixGetColumn(in, 3, out);
-}
-
-inline void MatrixSetTranslation(const Vector& in, matrix3x4_t& out)
-{
-	MatrixSetColumn(in, 3, out);
-}
-
-void MatrixScaleBy(const float flScale, matrix3x4_t& out);
-void MatrixScaleByZero(matrix3x4_t& out);
-
-void ConcatRotations(const matrix3x4_t& in1, const matrix3x4_t& in2, matrix3x4_t& out);
-void ConcatTransforms(const matrix3x4_t& in1, const matrix3x4_t& in2, matrix3x4_t& out);
-
-inline void MatrixMultiply(const matrix3x4_t& in1, const matrix3x4_t& in2, matrix3x4_t& out)
-{
-	ConcatTransforms(in1, in2, out);
-}
-
-void QuaternionSlerp(const Quaternion& p, const Quaternion& q, float t, Quaternion& qt);
-void QuaternionSlerpNoAlign(const Quaternion& p, const Quaternion& q, float t, Quaternion& qt);
-void QuaternionBlend(const Quaternion& p, const Quaternion& q, float t, Quaternion& qt);
-void QuaternionBlendNoAlign(const Quaternion& p, const Quaternion& q, float t, Quaternion& qt);
-void QuaternionIdentityBlend(const Quaternion& p, float t, Quaternion& qt);
-float QuaternionAngleDiff(const Quaternion& p, const Quaternion& q);
-void QuaternionScale(const Quaternion& p, float t, Quaternion& q);
-void QuaternionAlign(const Quaternion& p, const Quaternion& q, Quaternion& qt);
-float QuaternionDotProduct(const Quaternion& p, const Quaternion& q);
-void QuaternionConjugate(const Quaternion& p, Quaternion& q);
-void QuaternionInvert(const Quaternion& p, Quaternion& q);
-float QuaternionNormalize(Quaternion& q);
-void QuaternionAdd(const Quaternion& p, const Quaternion& q, Quaternion& qt);
-void QuaternionMult(const Quaternion& p, const Quaternion& q, Quaternion& qt);
-void QuaternionMatrix(const Quaternion& q, matrix3x4_t& matrix);
-void QuaternionMatrix(const Quaternion& q, const Vector& pos, matrix3x4_t& matrix);
-void QuaternionAngles(const Quaternion& q, QAngle& angles);
-void AngleQuaternion(const QAngle& angles, Quaternion& qt);
-void QuaternionAngles(const Quaternion& q, RadianEuler& angles);
-void AngleQuaternion(RadianEuler const& angles, Quaternion& qt);
-void QuaternionAxisAngle(const Quaternion& q, Vector& axis, float& angle);
-void AxisAngleQuaternion(const Vector& axis, float angle, Quaternion& q);
-void BasisToQuaternion(const Vector& vecForward, const Vector& vecRight, const Vector& vecUp, Quaternion& q);
-void MatrixQuaternion(const matrix3x4_t& mat, Quaternion& q);
-
-inline float MatrixRowDotProduct(const matrix3x4_t& in1, int row, const Vector& in2)
-{
-	Assert((row >= 0) && (row < 3));
-	return DotProduct(in1[row], in2.Base());
-}
-
-inline float MatrixColumnDotProduct(const matrix3x4_t& in1, int col, const Vector& in2)
-{
-	Assert((col >= 0) && (col < 4));
-	return in1[0][col] * in2[0] + in1[1][col] * in2[1] + in1[2][col] * in2[2];
-}
-
-int __cdecl BoxOnPlaneSide(const float* emins, const float* emaxs, const cplane_t* plane);
-
-inline float anglemod(float a)
-{
-	a = (360.f / 65536) * ((int)(a * (65536.f / 360.0f)) & 65535);
-	return a;
-}
-
-inline float RemapVal(float val, float A, float B, float C, float D)
-{
-	if (A == B)
-		return val >= B ? D : C;
-	return C + (D - C) * (val - A) / (B - A);
-}
-
-inline float RemapValClamped(float val, float A, float B, float C, float D)
-{
-	if (A == B)
-		return val >= B ? D : C;
-	float cVal = (val - A) / (B - A);
-	cVal = clamp(cVal, 0.0f, 1.0f);
-
-	return C + (D - C) * cVal;
-}
-
-template <class T>
-FORCEINLINE T Lerp(float flPercent, T const& A, T const& B)
-{
-	return A + (B - A) * flPercent;
-}
-
-FORCEINLINE float Sqr(float f)
-{
-	return f * f;
-}
-
-static inline float FLerp(float f1, float f2, float i1, float i2, float x)
-{
-	return f1 + (f2 - f1) * (x - i1) / (i2 - i1);
-}
-
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-template<> FORCEINLINE QAngle Lerp<QAngle>(float flPercent, const QAngle& q1, const QAngle& q2)
-{
-	if (q1 == q2)
-		return q1;
-
-	Quaternion src, dest;
-
-	AngleQuaternion(q1, src);
-	AngleQuaternion(q2, dest);
-
-	Quaternion result;
-
-	QuaternionSlerp(src, dest, flPercent, result);
-
-	QAngle output;
-	QuaternionAngles(result, output);
-	return output;
-}
-
-#else
-
-#pragma error
-
-template<> FORCEINLINE QAngleByValue Lerp<QAngleByValue>(float flPercent, const QAngleByValue& q1, const QAngleByValue& q2)
-{
-	if (q1 == q2)
-		return q1;
-
-	Quaternion src, dest;
-
-	AngleQuaternion(q1, src);
-	AngleQuaternion(q2, dest);
-
-	Quaternion result;
-
-	QuaternionSlerp(src, dest, flPercent, result);
-
-	QAngleByValue output;
-	QuaternionAngles(result, output);
-	return output;
-}
-
-#endif  
-
-
-template <class T>
-FORCEINLINE void V_swap(T& x, T& y)
-{
-	T temp = x;
-	x = y;
-	y = temp;
-}
-
-template <class T> FORCEINLINE T AVG(T a, T b)
-{
-	return (a + b) / 2;
-}
-
-#define NELEMS(x) ARRAYSIZE(x)
-
-#define XYZ(v) (v).x,(v).y,(v).z
-
-
-inline float Sign(float x)
-{
-	return (x < 0.0f) ? -1.0f : 1.0f;
-}
-
-inline int ClampArrayBounds(int n, unsigned maxindex)
-{
-	unsigned int inrangemask = 0xFFFFFFFF + (((unsigned)n) > maxindex);
-	unsigned int lessthan0mask = 0xFFFFFFFF + (n >= 0);
-
-	int result = (inrangemask & n);
-
-	result |= ((~inrangemask) & (~lessthan0mask)) & maxindex;
-
-	return result;
-}
-
-
-#define BOX_ON_PLANE_SIDE(emins, emaxs, p)	\
-	(((p)->type < 3)?						\
-	(										\
-		((p)->dist <= (emins)[(p)->type])?	\
-			1								\
-		:									\
-		(									\
-			((p)->dist >= (emaxs)[(p)->type])?\
-				2							\
-			:								\
-				3							\
-		)									\
-	)										\
-	:										\
-		BoxOnPlaneSide( (emins), (emaxs), (p)))
-
-void AngleVectors(const QAngle& angles, Vector* forward);
-void AngleVectors(const QAngle& angles, Vector* forward, Vector* right, Vector* up);
-void AngleVectorsTranspose(const QAngle& angles, Vector* forward, Vector* right, Vector* up);
-void AngleMatrix(const QAngle& angles, matrix3x4_t& mat);
-void AngleMatrix(const QAngle& angles, const Vector& position, matrix3x4_t& mat);
-void AngleMatrix(const RadianEuler& angles, matrix3x4_t& mat);
-void AngleMatrix(RadianEuler const& angles, const Vector& position, matrix3x4_t& mat);
-void AngleIMatrix(const QAngle& angles, matrix3x4_t& mat);
-void AngleIMatrix(const QAngle& angles, const Vector& position, matrix3x4_t& mat);
-void AngleIMatrix(const RadianEuler& angles, matrix3x4_t& mat);
-void VectorAngles(const Vector& forward, QAngle& angles);
-void VectorAngles(const Vector& forward, const Vector& pseudoup, QAngle& angles);
-void VectorMatrix(const Vector& forward, matrix3x4_t& mat);
-void VectorVectors(const Vector& forward, Vector& right, Vector& up);
-void SetIdentityMatrix(matrix3x4_t& mat);
-void SetScaleMatrix(float x, float y, float z, matrix3x4_t& dst);
-void MatrixBuildRotationAboutAxis(const Vector& vAxisOfRot, float angleDegrees, matrix3x4_t& dst);
-
-inline void SetScaleMatrix(float flScale, matrix3x4_t& dst)
-{
-	SetScaleMatrix(flScale, flScale, flScale, dst);
-}
-
-inline void SetScaleMatrix(const Vector& scale, matrix3x4_t& dst)
-{
-	SetScaleMatrix(scale.x, scale.y, scale.z, dst);
-}
-
-void MatrixTranspose(matrix3x4_t& mat);
-void MatrixTranspose(const matrix3x4_t& src, matrix3x4_t& dst);
-void MatrixInverseTranspose(const matrix3x4_t& src, matrix3x4_t& dst);
-
-inline void PositionMatrix(const Vector& position, matrix3x4_t& mat)
-{
-	MatrixSetColumn(position, 3, mat);
-}
-
-inline void MatrixPosition(const matrix3x4_t& matrix, Vector& position)
-{
-	MatrixGetColumn(matrix, 3, position);
-}
-
-inline void VectorRotate(const Vector& in1, const matrix3x4_t& in2, Vector& out)
-{
-	VectorRotate(&in1.x, in2, &out.x);
-}
-
-inline void VectorIRotate(const Vector& in1, const matrix3x4_t& in2, Vector& out)
-{
-	VectorIRotate(&in1.x, in2, &out.x);
-}
-
-inline void MatrixAngles(const matrix3x4_t& matrix, QAngle& angles)
-{
-	MatrixAngles(matrix, &angles.x);
-}
-
-inline void MatrixAngles(const matrix3x4_t& matrix, QAngle& angles, Vector& position)
-{
-	MatrixAngles(matrix, angles);
-	MatrixPosition(matrix, position);
-}
-
-inline void MatrixAngles(const matrix3x4_t& matrix, RadianEuler& angles)
-{
-	MatrixAngles(matrix, &angles.x);
-
-	angles.Init(DEG2RAD(angles.z), DEG2RAD(angles.x), DEG2RAD(angles.y));
-}
-
-void MatrixAngles(const matrix3x4_t& mat, RadianEuler& angles, Vector& position);
-
-void MatrixAngles(const matrix3x4_t& mat, Quaternion& q, Vector& position);
-
-inline int VectorCompare(const Vector& v1, const Vector& v2)
-{
-	return v1 == v2;
-}
-
-inline void VectorTransform(const Vector& in1, const matrix3x4_t& in2, Vector& out)
-{
-	VectorTransform(&in1.x, in2, &out.x);
-}
-
-inline void VectorITransform(const Vector& in1, const matrix3x4_t& in2, Vector& out)
-{
-	VectorITransform(&in1.x, in2, &out.x);
-}
-
-inline int BoxOnPlaneSide(const Vector& emins, const Vector& emaxs, const cplane_t* plane)
-{
-	return BoxOnPlaneSide(&emins.x, &emaxs.x, plane);
-}
-
-inline void VectorFill(Vector& a, float b)
-{
-	a[0] = a[1] = a[2] = b;
-}
-
-inline void VectorNegate(Vector& a)
-{
-	a[0] = -a[0];
-	a[1] = -a[1];
-	a[2] = -a[2];
-}
-
-inline vec_t VectorAvg(Vector& a)
-{
-	return (a[0] + a[1] + a[2]) / 3;
-}
-
-inline int FASTCALL BoxOnPlaneSide2(const Vector& emins, const Vector& emaxs, const cplane_t* p, float tolerance = 0.f)
-{
-	Vector	corners[2];
-
-	if (p->normal[0] < 0)
-	{
-		corners[0][0] = emins[0];
-		corners[1][0] = emaxs[0];
-	}
-	else
-	{
-		corners[1][0] = emins[0];
-		corners[0][0] = emaxs[0];
-	}
-
-	if (p->normal[1] < 0)
-	{
-		corners[0][1] = emins[1];
-		corners[1][1] = emaxs[1];
-	}
-	else
-	{
-		corners[1][1] = emins[1];
-		corners[0][1] = emaxs[1];
-	}
-
-	if (p->normal[2] < 0)
-	{
-		corners[0][2] = emins[2];
-		corners[1][2] = emaxs[2];
-	}
-	else
-	{
-		corners[1][2] = emins[2];
-		corners[0][2] = emaxs[2];
-	}
-
-	int sides = 0;
-
-	float dist1 = DotProduct(p->normal, corners[0]) - p->dist;
-	if (dist1 >= tolerance)
-		sides = 1;
-
-	float dist2 = DotProduct(p->normal, corners[1]) - p->dist;
-	if (dist2 < -tolerance)
-		sides |= 2;
-
-	return sides;
-}
-
-void ClearBounds(Vector& mins, Vector& maxs);
-void AddPointToBounds(const Vector& v, Vector& mins, Vector& maxs);
-
-void BuildGammaTable(float gamma, float texGamma, float brightness, int overbright);
-
-inline float TexLightToLinear(int c, int exponent)
-{
-	extern float power2_n[256];
-	Assert(exponent >= -128 && exponent <= 127);
-	return (float)c * power2_n[exponent + 128];
-}
-
-
-int LinearToTexture(float f);
-int LinearToScreenGamma(float f);
-float TextureToLinear(int c);
-
-struct ColorRGBExp32
-{
-	byte r, g, b;
-	signed char exponent;
-};
-
-void ColorRGBExp32ToVector(const ColorRGBExp32& in, Vector& out);
-void VectorToColorRGBExp32(const Vector& v, ColorRGBExp32& c);
-
-bool SolveQuadratic(float a, float b, float c, float& root1, float& root2);
-
-bool SolveInverseQuadratic(float x1, float y1, float x2, float y2, float x3, float y3, float& a, float& b, float& c);
-
-bool SolveInverseQuadraticMonotonic(float x1, float y1, float x2, float y2,
-	float x3, float y3, float& a, float& b, float& c);
-
-
-
-
-bool SolveInverseReciprocalQuadratic(float x1, float y1, float x2, float y2, float x3, float y3, float& a, float& b, float& c);
-
-void VectorYawRotate(const Vector& in, float flYaw, Vector& out);
-
-
-float Bias(float x, float biasAmt);
-
-
-float Gain(float x, float biasAmt);
-
-
-float SmoothCurve(float x);
-
-
-float SmoothCurve_Tweak(float x, float flPeakPos = 0.5, float flPeakSharpness = 0.5);
-
-
-inline float ExponentialDecay(float halflife, float dt)
-{
-	return expf(-0.69314718f / halflife * dt);
-}
-
-inline float ExponentialDecay(float decayTo, float decayTime, float dt)
-{
-	return expf(logf(decayTo) / decayTime * dt);
-}
-
-inline float ExponentialDecayIntegral(float decayTo, float decayTime, float dt)
-{
-	return (powf(decayTo, dt / decayTime) * decayTime - decayTime) / logf(decayTo);
-}
-
-inline float SimpleSpline(float value)
-{
-	float valueSquared = value * value;
-
-	return (3 * valueSquared - 2 * valueSquared * value);
-}
-
-inline float SimpleSplineRemapVal(float val, float A, float B, float C, float D)
-{
-	if (A == B)
-		return val >= B ? D : C;
-	float cVal = (val - A) / (B - A);
-	return C + (D - C) * SimpleSpline(cVal);
-}
-
-inline float SimpleSplineRemapValClamped(float val, float A, float B, float C, float D)
-{
-	if (A == B)
-		return val >= B ? D : C;
-	float cVal = (val - A) / (B - A);
-	cVal = clamp(cVal, 0.0f, 1.0f);
-	return C + (D - C) * SimpleSpline(cVal);
-}
-
-FORCEINLINE int RoundFloatToInt(float f)
-{
-#if defined(__i386__) || defined(_M_IX86) || defined( PLATFORM_WINDOWS_PC64 )
-	return _mm_cvtss_si32(_mm_load_ss(&f));
-#elif defined( _X360 )
-#ifdef Assert
-	Assert(IsFPUControlWordSet());
-#endif
-	union
-	{
-		double flResult;
-		int pResult[2];
-	};
-	flResult = __fctiw(f);
-	return pResult[1];
-#else
-#error Unknown architecture
-#endif
-}
-
-FORCEINLINE unsigned char RoundFloatToByte(float f)
-{
-	int nResult = RoundFloatToInt(f);
-#ifdef Assert
-	Assert((nResult & ~0xFF) == 0);
-#endif
-	return (unsigned char)nResult;
-}
-
-FORCEINLINE unsigned long RoundFloatToUnsignedLong(float f)
-{
-#if defined( _X360 )
-#ifdef Assert
-	Assert(IsFPUControlWordSet());
-#endif
-	union
-	{
-		double flResult;
-		int pIntResult[2];
-		unsigned long pResult[2];
-	};
-	flResult = __fctiw(f);
-	Assert(pIntResult[1] >= 0);
-	return pResult[1];
-#else   
-
-#if defined( PLATFORM_WINDOWS_PC64 )
-	uint nRet = (uint)f;
-	if (nRet & 1)
-	{
-		if ((f - floor(f) >= 0.5))
-		{
-			nRet++;
-		}
-	}
-	else
-	{
-		if ((f - floor(f) > 0.5))
-		{
-			nRet++;
-		}
-	}
-	return nRet;
-#else  
-	unsigned char nResult[8];
-
-#if defined( _WIN32 )
-	__asm
-	{
-		fld f
-		fistp       qword ptr nResult
-	}
-#elif POSIX
-	__asm __volatile__(
-	"fistpl %0;": "=m" (nResult) : "t" (f) : "st"
-		);
-#endif
-
-	return *((unsigned long*)nResult);
-#endif  
-#endif  
-}
-
-FORCEINLINE bool IsIntegralValue(float flValue, float flTolerance = 0.001f)
-{
-	return fabs(RoundFloatToInt(flValue) - flValue) < flTolerance;
-}
-
-FORCEINLINE int Float2Int(float a)
-{
-#if defined( _X360 )
-	union
-	{
-		double flResult;
-		int pResult[2];
-	};
-	flResult = __fctiwz(a);
-	return pResult[1];
-#else   
-	return (int)a;
-#endif
-}
-
-inline int Floor2Int(float a)
-{
-	int RetVal;
-#if defined( __i386__ )
-	__m128 a128 = _mm_set_ss(a);
-	RetVal = _mm_cvtss_si32(a128);
-	__m128 rounded128 = _mm_cvt_si2ss(_mm_setzero_ps(), RetVal);
-	RetVal -= _mm_comigt_ss(rounded128, a128);
-#else
-	RetVal = static_cast<int>(floor(a));
-#endif
-	return RetVal;
-}
-
-FORCEINLINE unsigned int FastFToC(float c)
-{
-#if defined( __i386__ )
-	union { float f; int i; } convert = { c * 255.0f + (float)(1 << 23) };
-	return convert.i & 255;
-#else
-	return Float2Int(c * 255.0f);
-#endif
-}
-
-FORCEINLINE int FastFloatToSmallInt(float c)
-{
-#if defined( __i386__ )
-	union { float f; int i; } convert = { c + (float)(3 << 22) };
-	return (convert.i & ((1 << 23) - 1)) - (1 << 22);
-#else
-	return Float2Int(c);
-#endif
-}
-
-inline float ClampToMsec(float in)
-{
-	int msec = Floor2Int(in * 1000.0f + 0.5f);
-	return 0.001f * msec;
-}
-
-inline int Ceil2Int(float a)
-{
-	int RetVal;
-#if defined( __i386__ )
-	__m128 a128 = _mm_load_ss(&a);
-	RetVal = _mm_cvtss_si32(a128);
-	__m128 rounded128 = _mm_cvt_si2ss(_mm_setzero_ps(), RetVal);
-	RetVal += _mm_comilt_ss(rounded128, a128);
-#else
-	RetVal = static_cast<int>(ceil(a));
-#endif
-	return RetVal;
-}
-
-
-#define TriArea2D( A, B, C ) \
-	( 0.5f * ( ( B.x - A.x ) * ( C.y - A.y ) - ( B.y - A.y ) * ( C.x - A.x ) ) )
-
-#define TriArea2DTimesTwo( A, B, C ) \
-	( ( ( B.x - A.x ) * ( C.y - A.y ) - ( B.y - A.y ) * ( C.x - A.x ) ) )
-
-
-inline void GetBarycentricCoords2D(
-	Vector2D const& A,
-	Vector2D const& B,
-	Vector2D const& C,
-	Vector2D const& pt,
-	float bcCoords[3])
-{
-	float invTriArea = 1.0f / TriArea2DTimesTwo(A, B, C);
-
-	bcCoords[0] = TriArea2DTimesTwo(B, C, pt) * invTriArea;
-	bcCoords[1] = TriArea2DTimesTwo(C, A, pt) * invTriArea;
-	bcCoords[2] = TriArea2DTimesTwo(A, B, pt) * invTriArea;
-}
-
-
-inline bool QuickBoxSphereTest(
-	const Vector& vOrigin,
-	float flRadius,
-	const Vector& bbMin,
-	const Vector& bbMax)
-{
-	return vOrigin.x - flRadius < bbMax.x&& vOrigin.x + flRadius > bbMin.x &&
-		vOrigin.y - flRadius < bbMax.y&& vOrigin.y + flRadius > bbMin.y &&
-		vOrigin.z - flRadius < bbMax.z&& vOrigin.z + flRadius > bbMin.z;
-}
-
-
-inline bool QuickBoxIntersectTest(
-	const Vector& vBox1Min,
-	const Vector& vBox1Max,
-	const Vector& vBox2Min,
-	const Vector& vBox2Max)
-{
-	return
-		vBox1Min.x < vBox2Max.x&& vBox1Max.x > vBox2Min.x &&
-		vBox1Min.y < vBox2Max.y&& vBox1Max.y > vBox2Min.y &&
-		vBox1Min.z < vBox2Max.z&& vBox1Max.z > vBox2Min.z;
-}
-
-
-extern float GammaToLinearFullRange(float gamma);
-extern float LinearToGammaFullRange(float linear);
-extern float GammaToLinear(float gamma);
-extern float LinearToGamma(float linear);
-
-extern float SrgbGammaToLinear(float flSrgbGammaValue);
-extern float SrgbLinearToGamma(float flLinearValue);
-extern float X360GammaToLinear(float fl360GammaValue);
-extern float X360LinearToGamma(float flLinearValue);
-extern float SrgbGammaTo360Gamma(float flSrgbGammaValue);
-
-FORCEINLINE float LinearToVertexLight(float f)
-{
-	extern float lineartovertex[4096];
-
-	int i = RoundFloatToInt(f * 1024.f);
-
-	if ((unsigned)i > 4095)
-	{
-		if (i < 0)
-			i = 0;		              
-		else
-			i = 4095;
-	}
-
-	return lineartovertex[i];
-}
-
-
-FORCEINLINE unsigned char LinearToLightmap(float f)
-{
-	extern unsigned char lineartolightmap[4096];
-
-	int i = RoundFloatToInt(f * 1024.f);	   
-
-	if ((unsigned)i > 4095)
-	{
-		if (i < 0)
-			i = 0;		              
-		else
-			i = 4095;
-	}
-
-	return lineartolightmap[i];
-}
-
-FORCEINLINE void ColorClamp(Vector& color)
-{
-	float maxc = max(color.x, max(color.y, color.z));
-	if (maxc > 1.0f)
-	{
-		float ooMax = 1.0f / maxc;
-		color.x *= ooMax;
-		color.y *= ooMax;
-		color.z *= ooMax;
-	}
-
-	if (color[0] < 0.f) color[0] = 0.f;
-	if (color[1] < 0.f) color[1] = 0.f;
-	if (color[2] < 0.f) color[2] = 0.f;
-}
-
-inline void ColorClampTruncate(Vector& color)
-{
-	if (color[0] > 1.0f) color[0] = 1.0f; else if (color[0] < 0.0f) color[0] = 0.0f;
-	if (color[1] > 1.0f) color[1] = 1.0f; else if (color[1] < 0.0f) color[1] = 0.0f;
-	if (color[2] > 1.0f) color[2] = 1.0f; else if (color[2] < 0.0f) color[2] = 0.0f;
-}
-
-void Catmull_Rom_Spline(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Catmull_Rom_Spline_Tangent(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Catmull_Rom_Spline_Integral(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Catmull_Rom_Spline_Integral(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	Vector& output);
-
-void Catmull_Rom_Spline_Normalize(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Catmull_Rom_Spline_Integral_Normalize(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Catmull_Rom_Spline_NormalizeX(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Catmull_Rom_Spline_NormalizeX(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Hermite_Spline(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& d1,
-	const Vector& d2,
-	float t,
-	Vector& output);
-
-float Hermite_Spline(
-	float p1,
-	float p2,
-	float d1,
-	float d2,
-	float t);
-
-void Hermite_Spline(
-	const Vector& p0,
-	const Vector& p1,
-	const Vector& p2,
-	float t,
-	Vector& output);
-
-float Hermite_Spline(
-	float p0,
-	float p1,
-	float p2,
-	float t);
-
-
-void Hermite_SplineBasis(float t, float basis[]);
-
-void Hermite_Spline(
-	const Quaternion& q0,
-	const Quaternion& q1,
-	const Quaternion& q2,
-	float t,
-	Quaternion& output);
-
-
-void Kochanek_Bartels_Spline(
-	float tension,
-	float bias,
-	float continuity,
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Kochanek_Bartels_Spline_NormalizeX(
-	float tension,
-	float bias,
-	float continuity,
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Cubic_Spline(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Cubic_Spline_NormalizeX(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void BSpline(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void BSpline_NormalizeX(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Parabolic_Spline(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-void Parabolic_Spline_NormalizeX(
-	const Vector& p1,
-	const Vector& p2,
-	const Vector& p3,
-	const Vector& p4,
-	float t,
-	Vector& output);
-
-FORCEINLINE float QuinticInterpolatingPolynomial(float t)
-{
-	return t * t * t * (t * (t * 6.0 - 15.0) + 10.0);
-}
-
-void GetInterpolationData(float const* pKnotPositions,
-	float const* pKnotValues,
-	int nNumValuesinList,
-	int nInterpolationRange,
-	float flPositionToInterpolateAt,
-	bool bWrap,
-	float* pValueA,
-	float* pValueB,
-	float* pInterpolationValue);
-
-float RangeCompressor(float flValue, float flMin, float flMax, float flBase);
-
-float CalcSqrDistanceToAABB(const Vector& mins, const Vector& maxs, const Vector& point);
-void CalcClosestPointOnAABB(const Vector& mins, const Vector& maxs, const Vector& point, Vector& closestOut);
-void CalcSqrDistAndClosestPointOnAABB(const Vector& mins, const Vector& maxs, const Vector& point, Vector& closestOut, float& distSqrOut);
-
-inline float CalcDistanceToAABB(const Vector& mins, const Vector& maxs, const Vector& point)
-{
-	float flDistSqr = CalcSqrDistanceToAABB(mins, maxs, point);
-	return sqrt(flDistSqr);
-}
-
-void  CalcClosestPointOnLine(const Vector& P, const Vector& vLineA, const Vector& vLineB, Vector& vClosest, float* t = 0);
-float CalcDistanceToLine(const Vector& P, const Vector& vLineA, const Vector& vLineB, float* t = 0);
-float CalcDistanceSqrToLine(const Vector& P, const Vector& vLineA, const Vector& vLineB, float* t = 0);
-
-void  CalcClosestPointOnLineSegment(const Vector& P, const Vector& vLineA, const Vector& vLineB, Vector& vClosest, float* t = 0);
-float CalcDistanceToLineSegment(const Vector& P, const Vector& vLineA, const Vector& vLineB, float* t = 0);
-float CalcDistanceSqrToLineSegment(const Vector& P, const Vector& vLineA, const Vector& vLineB, float* t = 0);
-
-bool CalcLineToLineIntersectionSegment(
-	const Vector& p1, const Vector& p2, const Vector& p3, const Vector& p4, Vector* s1, Vector* s2,
-	float* t1, float* t2);
-
-void  CalcClosestPointOnLine2D(Vector2D const& P, Vector2D const& vLineA, Vector2D const& vLineB, Vector2D& vClosest, float* t = 0);
-float CalcDistanceToLine2D(Vector2D const& P, Vector2D const& vLineA, Vector2D const& vLineB, float* t = 0);
-float CalcDistanceSqrToLine2D(Vector2D const& P, Vector2D const& vLineA, Vector2D const& vLineB, float* t = 0);
-void  CalcClosestPointOnLineSegment2D(Vector2D const& P, Vector2D const& vLineA, Vector2D const& vLineB, Vector2D& vClosest, float* t = 0);
-float CalcDistanceToLineSegment2D(Vector2D const& P, Vector2D const& vLineA, Vector2D const& vLineB, float* t = 0);
-float CalcDistanceSqrToLineSegment2D(Vector2D const& P, Vector2D const& vLineA, Vector2D const& vLineB, float* t = 0);
-
-void MathLib_Init(float gamma = 2.2f, float texGamma = 2.2f, float brightness = 0.0f, int overbright = 2.0f, bool bAllow3DNow = true, bool bAllowSSE = true, bool bAllowSSE2 = true, bool bAllowMMX = true);
-bool MathLib_3DNowEnabled(void);
-bool MathLib_MMXEnabled(void);
-bool MathLib_SSEEnabled(void);
-bool MathLib_SSE2Enabled(void);
-
-float Approach(float target, float value, float speed);
-float ApproachAngle(float target, float value, float speed);
-float AngleDiff(float destAngle, float srcAngle);
-float AngleDistance(float next, float cur);
-float AngleNormalize(float angle);
-
-float AngleNormalizePositive(float angle);
-
-bool AnglesAreEqual(float a, float b, float tolerance = 0.0f);
-
-
-void RotationDeltaAxisAngle(const QAngle& srcAngles, const QAngle& destAngles, Vector& deltaAxis, float& deltaAngle);
-void RotationDelta(const QAngle& srcAngles, const QAngle& destAngles, QAngle* out);
-
-void ComputeTrianglePlane(const Vector& v1, const Vector& v2, const Vector& v3, Vector& normal, float& intercept);
-int PolyFromPlane(Vector* outVerts, const Vector& normal, float dist, float fHalfScale = 9000.0f);
-int ClipPolyToPlane(Vector* inVerts, int vertCount, Vector* outVerts, const Vector& normal, float dist, float fOnPlaneEpsilon = 0.1f);
-int ClipPolyToPlane_Precise(double* inVerts, int vertCount, double* outVerts, const double* normal, double dist, double fOnPlaneEpsilon = 0.1);
-
-void CalcTriangleTangentSpace(const Vector& p0, const Vector& p1, const Vector& p2,
-	const Vector2D& t0, const Vector2D& t1, const Vector2D& t2,
-	Vector& sVect, Vector& tVect);
-
-void TransformAABB(const matrix3x4_t& in1, const Vector& vecMinsIn, const Vector& vecMaxsIn, Vector& vecMinsOut, Vector& vecMaxsOut);
-
-void ITransformAABB(const matrix3x4_t& in1, const Vector& vecMinsIn, const Vector& vecMaxsIn, Vector& vecMinsOut, Vector& vecMaxsOut);
-
-void RotateAABB(const matrix3x4_t& in1, const Vector& vecMinsIn, const Vector& vecMaxsIn, Vector& vecMinsOut, Vector& vecMaxsOut);
-
-void IRotateAABB(const matrix3x4_t& in1, const Vector& vecMinsIn, const Vector& vecMaxsIn, Vector& vecMinsOut, Vector& vecMaxsOut);
-
-inline void MatrixTransformPlane(const matrix3x4_t& src, const cplane_t& inPlane, cplane_t& outPlane)
-{
-	VectorRotate(inPlane.normal, src, outPlane.normal);
-	outPlane.dist = inPlane.dist * DotProduct(outPlane.normal, outPlane.normal);
-	outPlane.dist += outPlane.normal.x * src[0][3] + outPlane.normal.y * src[1][3] + outPlane.normal.z * src[2][3];
-}
-
-inline void MatrixITransformPlane(const matrix3x4_t& src, const cplane_t& inPlane, cplane_t& outPlane)
-{
-	Vector vecTranslation;
-	MatrixGetColumn(src, 3, vecTranslation);
-
-	Vector vecInvTranslation;
-	VectorIRotate(vecTranslation, src, vecInvTranslation);
-
-	VectorIRotate(inPlane.normal, src, outPlane.normal);
-	outPlane.dist = inPlane.dist * DotProduct(outPlane.normal, outPlane.normal);
-	outPlane.dist -= outPlane.normal.x * vecInvTranslation[0] + outPlane.normal.y * vecInvTranslation[1] + outPlane.normal.z * vecInvTranslation[2];
-}
-
-int CeilPow2(int in);
-int FloorPow2(int in);
-
-FORCEINLINE float* UnpackNormal_HEND3N(const unsigned int* pPackedNormal, float* pNormal)
-{
-	int temp[3];
-	temp[0] = ((*pPackedNormal >> 0L) & 0x7ff);
-	if (temp[0] & 0x400)
-	{
-		temp[0] = 2048 - temp[0];
-	}
-	temp[1] = ((*pPackedNormal >> 11L) & 0x7ff);
-	if (temp[1] & 0x400)
-	{
-		temp[1] = 2048 - temp[1];
-	}
-	temp[2] = ((*pPackedNormal >> 22L) & 0x3ff);
-	if (temp[2] & 0x200)
-	{
-		temp[2] = 1024 - temp[2];
-	}
-	pNormal[0] = (float)temp[0] * 1.0f / 1023.0f;
-	pNormal[1] = (float)temp[1] * 1.0f / 1023.0f;
-	pNormal[2] = (float)temp[2] * 1.0f / 511.0f;
-	return pNormal;
-}
-
-FORCEINLINE unsigned int* PackNormal_HEND3N(const float* pNormal, unsigned int* pPackedNormal)
-{
-	int temp[3];
-
-	temp[0] = Float2Int(pNormal[0] * 1023.0f);
-	temp[1] = Float2Int(pNormal[1] * 1023.0f);
-	temp[2] = Float2Int(pNormal[2] * 511.0f);
-
-	Assert(temp[0] >= -1023 && temp[0] <= 1023);
-	Assert(temp[1] >= -1023 && temp[1] <= 1023);
-	Assert(temp[2] >= -511 && temp[2] <= 511);
-
-	*pPackedNormal = ((temp[2] & 0x3ff) << 22L) |
-		((temp[1] & 0x7ff) << 11L) |
-		((temp[0] & 0x7ff) << 0L);
-	return pPackedNormal;
-}
-
-FORCEINLINE unsigned int* PackNormal_HEND3N(float nx, float ny, float nz, unsigned int* pPackedNormal)
-{
-	int temp[3];
-
-	temp[0] = Float2Int(nx * 1023.0f);
-	temp[1] = Float2Int(ny * 1023.0f);
-	temp[2] = Float2Int(nz * 511.0f);
-
-	Assert(temp[0] >= -1023 && temp[0] <= 1023);
-	Assert(temp[1] >= -1023 && temp[1] <= 1023);
-	Assert(temp[2] >= -511 && temp[2] <= 511);
-
-	*pPackedNormal = ((temp[2] & 0x3ff) << 22L) |
-		((temp[1] & 0x7ff) << 11L) |
-		((temp[0] & 0x7ff) << 0L);
-	return pPackedNormal;
-}
-
-FORCEINLINE float* UnpackNormal_SHORT2(const unsigned int* pPackedNormal, float* pNormal, bool bIsTangent = FALSE)
-{
-	short iX = (*pPackedNormal & 0x0000FFFF);
-	short iY = (*pPackedNormal & 0xFFFF0000) >> 16;
-
-	float zSign = +1;
-	if (iX < 0)
-	{
-		zSign = -1;
-		iX = -iX;
-	}
-	float tSign = +1;
-	if (iY < 0)
-	{
-		tSign = -1;
-		iY = -iY;
-	}
-
-	pNormal[0] = (iX - 16384.0f) / 16384.0f;
-	pNormal[1] = (iY - 16384.0f) / 16384.0f;
-	pNormal[2] = zSign * sqrtf(1.0f - (pNormal[0] * pNormal[0] + pNormal[1] * pNormal[1]));
-	if (bIsTangent)
-	{
-		pNormal[3] = tSign;
-	}
-
-	return pNormal;
-}
-
-FORCEINLINE unsigned int* PackNormal_SHORT2(float nx, float ny, float nz, unsigned int* pPackedNormal, float binormalSign = +1.0f)
-{
-	nx += 1;					   
-	ny += 1;
-	nx *= 16384.0f;				     
-	ny *= 16384.0f;
-
-	nx = max(nx, 1.0f);		       
-	ny = max(ny, 1.0f);
-	nx = min(nx, 32767.0f);	       
-	ny = min(ny, 32767.0f);
-
-	if (nz < 0.0f)
-		nx = -nx;				      
-
-	ny *= binormalSign;			             
-
-	short sX = (short)nx;		   
-	short sY = (short)ny;
-
-	*pPackedNormal = (sX & 0x0000FFFF) | (sY << 16);               
-
-	return pPackedNormal;
-}
-
-FORCEINLINE unsigned int* PackNormal_SHORT2(const float* pNormal, unsigned int* pPackedNormal, float binormalSign = +1.0f)
-{
-	return PackNormal_SHORT2(pNormal[0], pNormal[1], pNormal[2], pPackedNormal, binormalSign);
-}
-
-FORCEINLINE float* UnpackNormal_UBYTE4(const unsigned int* pPackedNormal, float* pNormal, bool bIsTangent = FALSE)
-{
-	unsigned char cX, cY;
-	if (bIsTangent)
-	{
-		cX = *pPackedNormal >> 16;					  
-		cY = *pPackedNormal >> 24;					  
-	}
-	else
-	{
-		cX = *pPackedNormal >> 0;					  
-		cY = *pPackedNormal >> 8;					  
-	}
-
-	float x = cX - 128.0f;
-	float y = cY - 128.0f;
-	float z;
-
-	float zSignBit = x < 0 ? 1.0f : 0.0f;			         
-	float tSignBit = y < 0 ? 1.0f : 0.0f;
-	float zSign = -(2 * zSignBit - 1);			    
-	float tSign = -(2 * tSignBit - 1);
-
-	x = x * zSign - zSignBit;							 
-	y = y * tSign - tSignBit;
-	x = x - 64;										 
-	y = y - 64;
-
-	float xSignBit = x < 0 ? 1.0f : 0.0f;	         
-	float ySignBit = y < 0 ? 1.0f : 0.0f;
-	float xSign = -(2 * xSignBit - 1);			    
-	float ySign = -(2 * ySignBit - 1);
-
-	x = (x * xSign - xSignBit) / 63.0f;				  
-	y = (y * ySign - ySignBit) / 63.0f;
-	z = 1.0f - x - y;
-
-	float oolen = 1.0f / sqrt(x * x + y * y + z * z);	  
-	x *= oolen * xSign;					  
-	y *= oolen * ySign;
-	z *= oolen * zSign;
-
-	pNormal[0] = x;
-	pNormal[1] = y;
-	pNormal[2] = z;
-	if (bIsTangent)
-	{
-		pNormal[3] = tSign;
-	}
-
-	return pNormal;
-}
-
-FORCEINLINE unsigned int* PackNormal_UBYTE4(float nx, float ny, float nz, unsigned int* pPackedNormal, bool bIsTangent = false, float binormalSign = +1.0f)
-{
-	float xSign = nx < 0.0f ? -1.0f : 1.0f;			    
-	float ySign = ny < 0.0f ? -1.0f : 1.0f;
-	float zSign = nz < 0.0f ? -1.0f : 1.0f;
-	float tSign = binormalSign;
-	Assert((binormalSign == +1.0f) || (binormalSign == -1.0f));
-
-	float xSignBit = 0.5f * (1 - xSign);			   
-	float ySignBit = 0.5f * (1 - ySign);			       
-	float zSignBit = 0.5f * (1 - zSign);
-	float tSignBit = 0.5f * (1 - binormalSign);
-
-	float absX = xSign * nx;							   
-	float absY = ySign * ny;
-	float absZ = zSign * nz;
-
-	float xbits = absX / (absX + absY + absZ);	    
-	float ybits = absY / (absX + absY + absZ);
-
-	xbits *= 63;									 
-	ybits *= 63;
-
-	xbits = xbits * xSign - xSignBit;				  
-	ybits = ybits * ySign - ySignBit;
-	xbits += 64.0f;									  
-	ybits += 64.0f;
-
-	xbits = xbits * zSign - zSignBit;				      
-	ybits = ybits * tSign - tSignBit;				  
-
-	xbits += 128.0f;								  
-	ybits += 128.0f;
-
-	unsigned char cX = (unsigned char)xbits;
-	unsigned char cY = (unsigned char)ybits;
-
-	if (!bIsTangent)
-		*pPackedNormal = (cX << 0) | (cY << 8);	   
-	else
-		*pPackedNormal = (cX << 16) | (cY << 24);	   
-
-	return pPackedNormal;
-}
-
-FORCEINLINE unsigned int* PackNormal_UBYTE4(const float* pNormal, unsigned int* pPackedNormal, bool bIsTangent = false, float binormalSign = +1.0f)
-{
-	return PackNormal_UBYTE4(pNormal[0], pNormal[1], pNormal[2], pPackedNormal, bIsTangent, binormalSign);
-}
-
-
-void RGBtoHSV(const Vector& rgb, Vector& hsv);
-
-
-void HSVtoRGB(const Vector& hsv, Vector& rgb);
-
-
-float FastLog2(float i);			   
-float FastPow2(float i);			 
-float FastPow(float a, float b);	 
-float FastPow10(float i);			 
-
-inline bool CloseEnough(float a, float b, float epsilon = EQUAL_EPSILON)
-{
-	return fabs(a - b) <= epsilon;
-}
-
-inline bool CloseEnough(const Vector& a, const Vector& b, float epsilon = EQUAL_EPSILON)
-{
-	return fabs(a.x - b.x) <= epsilon &&
-		fabs(a.y - b.y) <= epsilon &&
-		fabs(a.z - b.z) <= epsilon;
-}
-
-bool AlmostEqual(float a, float b, int maxUlps = 10);
-
-inline bool AlmostEqual(const Vector& a, const Vector& b, int maxUlps = 10)
-{
-	return AlmostEqual(a.x, b.x, maxUlps) &&
-		AlmostEqual(a.y, b.y, maxUlps) &&
-		AlmostEqual(a.z, b.z, maxUlps);
-}
-
-
-#endif	 
\ No newline at end of file
diff --git a/SpyCustom/mem.h b/SpyCustom/mem.h
deleted file mode 100644
index fc1ae45..0000000
--- a/SpyCustom/mem.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef TIER0_MEM_H
-#define TIER0_MEM_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <stddef.h>
-#ifdef LINUX
-#undef offsetof
-#define offsetof(s,m)	(size_t)&(((s *)0)->m)
-#endif
-
-#include "platform.h"
-
-#if !defined(STATIC_TIER0) && !defined(_STATIC_LINKED)
-
-#ifdef TIER0_DLL_EXPORT
-#  define MEM_INTERFACE DLL_EXPORT
-#else
-#  define MEM_INTERFACE DLL_IMPORT
-#endif
-
-#else  
-
-#define MEM_INTERFACE extern
-
-#endif  
-
-
-
-MEM_INTERFACE void* MemAllocScratch(int nMemSize);
-MEM_INTERFACE void MemFreeScratch();
-
-#ifdef _LINUX
-MEM_INTERFACE void ZeroMemory(void* mem, size_t length);
-#endif
-
-
-#endif   
\ No newline at end of file
diff --git a/SpyCustom/memalloc.h b/SpyCustom/memalloc.h
deleted file mode 100644
index a3463cc..0000000
--- a/SpyCustom/memalloc.h
+++ /dev/null
@@ -1,567 +0,0 @@
-#ifndef TIER0_MEMALLOC_H
-#define TIER0_MEMALLOC_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#ifndef POSIX
-#endif
-
-#if defined( _MEMTEST )
-#ifdef _WIN32
-#define USE_MEM_DEBUG 1
-#endif
-#endif
-
-#define MEM_DEBUG_CLASSNAME 1
-
-#include <stddef.h>
-#if defined( OSX )
-#include <malloc/malloc.h>
-#endif
-
-#include "mem.h"
-
-#if !defined(STEAM) && !defined(NO_MALLOC_OVERRIDE)
-
-struct _CrtMemState;
-
-#define MEMALLOC_VERSION 1
-
-typedef size_t(*MemAllocFailHandler_t)(size_t);
-
-class IMemAlloc
-{
-public:
-	virtual void* Alloc(size_t nSize) = 0;
-	virtual void* Realloc(void* pMem, size_t nSize) = 0;
-	virtual void Free(void* pMem) = 0;
-	virtual void* Expand_NoLongerSupported(void* pMem, size_t nSize) = 0;
-
-	virtual void* Alloc(size_t nSize, const char* pFileName, int nLine) = 0;
-	virtual void* Realloc(void* pMem, size_t nSize, const char* pFileName, int nLine) = 0;
-	virtual void  Free(void* pMem, const char* pFileName, int nLine) = 0;
-	virtual void* Expand_NoLongerSupported(void* pMem, size_t nSize, const char* pFileName, int nLine) = 0;
-
-	virtual size_t GetSize(void* pMem) = 0;
-
-	virtual void PushAllocDbgInfo(const char* pFileName, int nLine) = 0;
-	virtual void PopAllocDbgInfo() = 0;
-
-	virtual long CrtSetBreakAlloc(long lNewBreakAlloc) = 0;
-	virtual	int CrtSetReportMode(int nReportType, int nReportMode) = 0;
-	virtual int CrtIsValidHeapPointer(const void* pMem) = 0;
-	virtual int CrtIsValidPointer(const void* pMem, unsigned int size, int access) = 0;
-	virtual int CrtCheckMemory(void) = 0;
-	virtual int CrtSetDbgFlag(int nNewFlag) = 0;
-	virtual void CrtMemCheckpoint(_CrtMemState* pState) = 0;
-
-	virtual void DumpStats() = 0;
-	virtual void DumpStatsFileBase(char const* pchFileBase) = 0;
-
-	virtual void* CrtSetReportFile(int nRptType, void* hFile) = 0;
-	virtual void* CrtSetReportHook(void* pfnNewHook) = 0;
-	virtual int CrtDbgReport(int nRptType, const char* szFile,
-			int nLine, const char* szModule, const char* pMsg) = 0;
-
-	virtual int heapchk() = 0;
-
-	virtual bool IsDebugHeap() = 0;
-
-	virtual void GetActualDbgInfo(const char*& pFileName, int& nLine) = 0;
-	virtual void RegisterAllocation(const char* pFileName, int nLine, int nLogicalSize, int nActualSize, unsigned nTime) = 0;
-	virtual void RegisterDeallocation(const char* pFileName, int nLine, int nLogicalSize, int nActualSize, unsigned nTime) = 0;
-
-	virtual int GetVersion() = 0;
-
-	virtual void CompactHeap() = 0;
-
-	virtual MemAllocFailHandler_t SetAllocFailHandler(MemAllocFailHandler_t pfnMemAllocFailHandler) = 0;
-
-	virtual void DumpBlockStats(void*) = 0;
-
-#if defined( _MEMTEST )	
-	virtual void SetStatsExtraInfo(const char* pMapName, const char* pComment) = 0;
-#endif
-
-	virtual size_t MemoryAllocFailed() = 0;
-
-	virtual uint32 GetDebugInfoSize() = 0;
-	virtual void SaveDebugInfo(void* pvDebugInfo) = 0;
-	virtual void RestoreDebugInfo(const void* pvDebugInfo) = 0;
-	virtual void InitDebugInfo(void* pvDebugInfo, const char* pchRootFileName, int nLine) = 0;
-
-	virtual void GlobalMemoryStatus(size_t* pUsedMemory, size_t* pFreeMemory) = 0;
-};
-
-MEM_INTERFACE IMemAlloc* g_pMemAlloc;
-
-#ifdef MEMALLOC_REGIONS
-#ifndef MEMALLOC_REGION
-#define MEMALLOC_REGION 0
-#endif
-inline void* MemAlloc_Alloc(size_t nSize)
-{
-	return g_pMemAlloc->RegionAlloc(MEMALLOC_REGION, nSize);
-}
-
-inline void* MemAlloc_Alloc(size_t nSize, const char* pFileName, int nLine)
-{
-	return g_pMemAlloc->RegionAlloc(MEMALLOC_REGION, nSize, pFileName, nLine);
-}
-#else
-#undef MEMALLOC_REGION
-inline void* MemAlloc_Alloc(size_t nSize)
-{
-	return g_pMemAlloc->Alloc(nSize);
-}
-
-inline void* MemAlloc_Alloc(size_t nSize, const char* pFileName, int nLine)
-{
-	return g_pMemAlloc->Alloc(nSize, pFileName, nLine);
-}
-#endif
-inline void MemAlloc_Free(void* ptr)
-{
-	g_pMemAlloc->Free(ptr);
-}
-inline void MemAlloc_Free(void* ptr, const char* pFileName, int nLine)
-{
-	g_pMemAlloc->Free(ptr, pFileName, nLine);
-}
-
-inline bool ValueIsPowerOfTwo(size_t value)			     
-{
-	return (value & (value - 1)) == 0;
-}
-
-inline void* MemAlloc_AllocAligned(size_t size, size_t align)
-{
-	unsigned char* pAlloc, * pResult;
-
-	if (!IsPowerOfTwo(align))
-		return NULL;
-
-	align = (align > sizeof(void*) ? align : sizeof(void*)) - 1;
-
-	if ((pAlloc = (unsigned char*)g_pMemAlloc->Alloc(sizeof(void*) + align + size)) == (unsigned char*)NULL)
-		return NULL;
-
-	pResult = (unsigned char*)((size_t)(pAlloc + sizeof(void*) + align) & ~align);
-	((unsigned char**)(pResult))[-1] = pAlloc;
-
-	return (void*)pResult;
-}
-
-inline void* MemAlloc_AllocAligned(size_t size, size_t align, const char* pszFile, int nLine)
-{
-	unsigned char* pAlloc, * pResult;
-
-	if (!IsPowerOfTwo(align))
-		return NULL;
-
-	align = (align > sizeof(void*) ? align : sizeof(void*)) - 1;
-
-	if ((pAlloc = (unsigned char*)g_pMemAlloc->Alloc(sizeof(void*) + align + size, pszFile, nLine)) == (unsigned char*)NULL)
-		return NULL;
-
-	pResult = (unsigned char*)((size_t)(pAlloc + sizeof(void*) + align) & ~align);
-	((unsigned char**)(pResult))[-1] = pAlloc;
-
-	return (void*)pResult;
-}
-
-inline void* MemAlloc_AllocAlignedUnattributed(size_t size, size_t align)
-{
-	unsigned char* pAlloc, * pResult;
-
-	if (!ValueIsPowerOfTwo(align))
-		return NULL;
-
-	align = (align > sizeof(void*) ? align : sizeof(void*)) - 1;
-
-	if ((pAlloc = (unsigned char*)MemAlloc_Alloc(sizeof(void*) + align + size)) == (unsigned char*)NULL)
-		return NULL;
-
-	pResult = (unsigned char*)((size_t)(pAlloc + sizeof(void*) + align) & ~align);
-	((unsigned char**)(pResult))[-1] = pAlloc;
-
-	return (void*)pResult;
-}
-
-inline void* MemAlloc_AllocAlignedFileLine(size_t size, size_t align, const char* pszFile, int nLine)
-{
-	unsigned char* pAlloc, * pResult;
-
-	if (!ValueIsPowerOfTwo(align))
-		return NULL;
-
-	align = (align > sizeof(void*) ? align : sizeof(void*)) - 1;
-
-	if ((pAlloc = (unsigned char*)MemAlloc_Alloc(sizeof(void*) + align + size, pszFile, nLine)) == (unsigned char*)NULL)
-		return NULL;
-
-	pResult = (unsigned char*)((size_t)(pAlloc + sizeof(void*) + align) & ~align);
-	((unsigned char**)(pResult))[-1] = pAlloc;
-
-	return (void*)pResult;
-}
-
-inline void* MemAlloc_ReallocAligned(void* ptr, size_t size, size_t align)
-{
-	if (!IsPowerOfTwo(align))
-		return NULL;
-
-	if (((size_t)ptr & (align - 1)) != 0)
-		return NULL;
-
-	if (!ptr)
-		return MemAlloc_AllocAligned(size, align);
-
-	void* pAlloc, * pResult;
-
-	pAlloc = ptr;
-	pAlloc = (void*)(((size_t)pAlloc & ~(sizeof(void*) - 1)) - sizeof(void*));
-	pAlloc = *((void**)pAlloc);
-
-	size_t nOffset = (size_t)ptr - (size_t)pAlloc;
-	size_t nOldSize = g_pMemAlloc->GetSize(pAlloc);
-	if (nOldSize >= size + nOffset)
-		return ptr;
-
-	pResult = MemAlloc_AllocAligned(size, align);
-	memcpy(pResult, ptr, nOldSize - nOffset);
-	g_pMemAlloc->Free(pAlloc);
-	return pResult;
-}
-
-inline void MemAlloc_FreeAligned(void* pMemBlock)
-{
-	void* pAlloc;
-
-	if (pMemBlock == NULL)
-		return;
-
-	pAlloc = pMemBlock;
-
-	pAlloc = (void*)(((size_t)pAlloc & ~(sizeof(void*) - 1)) - sizeof(void*));
-
-	pAlloc = *((void**)pAlloc);
-	g_pMemAlloc->Free(pAlloc);
-}
-
-inline void MemAlloc_FreeAligned(void* pMemBlock, const char* pFileName, int nLine)
-{
-	void* pAlloc;
-
-	if (pMemBlock == NULL)
-		return;
-
-	pAlloc = pMemBlock;
-
-	pAlloc = (void*)(((size_t)pAlloc & ~(sizeof(void*) - 1)) - sizeof(void*));
-
-	pAlloc = *((void**)pAlloc);
-	g_pMemAlloc->Free(pAlloc, pFileName, nLine);
-}
-
-inline size_t MemAlloc_GetSizeAligned(void* pMemBlock)
-{
-	void* pAlloc;
-
-	if (pMemBlock == NULL)
-		return 0;
-
-	pAlloc = pMemBlock;
-
-	pAlloc = (void*)(((size_t)pAlloc & ~(sizeof(void*) - 1)) - sizeof(void*));
-
-	pAlloc = *((void**)pAlloc);
-	return g_pMemAlloc->GetSize(pAlloc) - ((byte*)pMemBlock - (byte*)pAlloc);
-}
-
-#if (defined(_DEBUG) || defined(USE_MEM_DEBUG))
-#define MEM_ALLOC_CREDIT_(tag)	CMemAllocAttributeAlloction memAllocAttributeAlloction( tag, __LINE__ )
-#define MemAlloc_PushAllocDbgInfo( pszFile, line ) g_pMemAlloc->PushAllocDbgInfo( pszFile, line )
-#define MemAlloc_PopAllocDbgInfo() g_pMemAlloc->PopAllocDbgInfo()
-#define MemAlloc_RegisterAllocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) g_pMemAlloc->RegisterAllocation( pFileName, nLine, nLogicalSize, nActualSize, nTime )
-#define MemAlloc_RegisterDeallocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) g_pMemAlloc->RegisterDeallocation( pFileName, nLine, nLogicalSize, nActualSize, nTime )
-#else
-#define MEM_ALLOC_CREDIT_(tag)	((void)0)
-#define MemAlloc_PushAllocDbgInfo( pszFile, line ) ((void)0)
-#define MemAlloc_PopAllocDbgInfo() ((void)0)
-#define MemAlloc_RegisterAllocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) ((void)0)
-#define MemAlloc_RegisterDeallocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) ((void)0)
-#endif
-
-#define MemAlloc_DumpStats() g_pMemAlloc->DumpStats()
-#define MemAlloc_CompactHeap() g_pMemAlloc->CompactHeap()
-#define MemAlloc_OutOfMemory() g_pMemAlloc->OutOfMemory()
-#define MemAlloc_CompactIncremental() g_pMemAlloc->CompactIncremental()
-#define MemAlloc_DumpStatsFileBase( _filename ) g_pMemAlloc->DumpStatsFileBase( _filename )
-#define MemAlloc_CrtCheckMemory() g_pMemAlloc->CrtCheckMemory()
-#define MemAlloc_GlobalMemoryStatus( _usedMemory, _freeMemory ) g_pMemAlloc->GlobalMemoryStatus( _usedMemory, _freeMemory )
-#define MemAlloc_MemoryAllocFailed() g_pMemAlloc->MemoryAllocFailed()
-
-#define MemAlloc_GetDebugInfoSize() g_pMemAlloc->GetDebugInfoSize()
-#define MemAlloc_SaveDebugInfo( pvDebugInfo ) g_pMemAlloc->SaveDebugInfo( pvDebugInfo )
-#define MemAlloc_RestoreDebugInfo( pvDebugInfo ) g_pMemAlloc->RestoreDebugInfo( pvDebugInfo )
-#define MemAlloc_InitDebugInfo( pvDebugInfo, pchRootFileName, nLine ) g_pMemAlloc->InitDebugInfo( pvDebugInfo, pchRootFileName, nLine )
-#define MemAlloc_GetSize( x ) g_pMemAlloc->GetSize( x );
-class CMemAllocAttributeAlloction
-{
-public:
-	CMemAllocAttributeAlloction(const char* pszFile, int line)
-	{
-		MemAlloc_PushAllocDbgInfo(pszFile, line);
-	}
-
-	~CMemAllocAttributeAlloction()
-	{
-		MemAlloc_PopAllocDbgInfo();
-	}
-};
-
-#define MEM_ALLOC_CREDIT()	MEM_ALLOC_CREDIT_(__FILE__)
-
-#if defined(_WIN32) && ( defined(_DEBUG) || defined(USE_MEM_DEBUG) )
-
-#pragma warning(disable:4290)
-#pragma warning(push)
-#include <typeinfo>
-
-#if defined(_CPPRTTI) && defined(MEM_DEBUG_CLASSNAME)
-#define MEM_ALLOC_CREDIT_CLASS()	MEM_ALLOC_CREDIT_( typeid(*this).name() )
-#define MEM_ALLOC_CLASSNAME(type) (typeid((type*)(0)).name())
-#else
-#define MEM_ALLOC_CREDIT_CLASS()	MEM_ALLOC_CREDIT_( __FILE__ )
-#define MEM_ALLOC_CLASSNAME(type) (__FILE__)
-#endif
-
-#ifdef _MSC_VER
-#define MEM_ALLOC_CREDIT_FUNCTION()		MEM_ALLOC_CREDIT_( __FUNCTION__ )
-#else
-#define MEM_ALLOC_CREDIT_FUNCTION() (__FILE__)
-#endif
-
-#pragma warning(pop)
-#else
-#define MEM_ALLOC_CREDIT_CLASS()
-#define MEM_ALLOC_CLASSNAME(type) NULL
-#define MEM_ALLOC_CREDIT_FUNCTION() 
-#endif
-
-#if (defined(_DEBUG) || defined(USE_MEM_DEBUG))
-struct MemAllocFileLine_t
-{
-	const char* pszFile;
-	int line;
-};
-
-#define MEMALLOC_DEFINE_EXTERNAL_TRACKING( tag ) \
-	static CUtlMap<void *, MemAllocFileLine_t, int> g_##tag##Allocs( DefLessFunc( void *) ); \
-	static const char *g_psz##tag##Alloc = strcpy( (char *)g_pMemAlloc->Alloc( strlen( #tag "Alloc" ) + 1, "intentional leak", 0 ), #tag "Alloc" );
-
-#define MemAlloc_RegisterExternalAllocation( tag, p, size ) \
-	if ( !p ) \
-		; \
-	else \
-	{ \
-		MemAllocFileLine_t fileLine = { g_psz##tag##Alloc, 0 }; \
-		g_pMemAlloc->GetActualDbgInfo( fileLine.pszFile, fileLine.line ); \
-		if ( fileLine.pszFile != g_psz##tag##Alloc ) \
-		{ \
-			g_##tag##Allocs.Insert( p, fileLine ); \
-		} \
-		\
-		MemAlloc_RegisterAllocation( fileLine.pszFile, fileLine.line, size, size, 0); \
-	}
-
-#define MemAlloc_RegisterExternalDeallocation( tag, p, size ) \
-	if ( !p ) \
-		; \
-	else \
-	{ \
-		MemAllocFileLine_t fileLine = { g_psz##tag##Alloc, 0 }; \
-		CUtlMap<void *, MemAllocFileLine_t, int>::IndexType_t iRecordedFileLine = g_##tag##Allocs.Find( p ); \
-		if ( iRecordedFileLine !=  g_##tag##Allocs.InvalidIndex() ) \
-		{ \
-			fileLine = g_##tag##Allocs[iRecordedFileLine]; \
-			g_##tag##Allocs.RemoveAt( iRecordedFileLine ); \
-		} \
-		\
-		MemAlloc_RegisterDeallocation( fileLine.pszFile, fileLine.line, size, size, 0); \
-	}
-
-#else
-
-#define MEMALLOC_DEFINE_EXTERNAL_TRACKING( tag )
-#define MemAlloc_RegisterExternalAllocation( tag, p, size ) ((void)0)
-#define MemAlloc_RegisterExternalDeallocation( tag, p, size ) ((void)0)
-
-#endif
-
-#elif defined( POSIX )
-
-#if defined( OSX )
-inline void* memalign(size_t alignment, size_t size) { void* pTmp = NULL; pTmp = malloc(size); return pTmp; }
-#endif
-
-inline void* _aligned_malloc(size_t nSize, size_t align) { return memalign(align, nSize); }
-inline void _aligned_free(void* ptr) { free(ptr); }
-
-inline void* MemAlloc_Alloc(size_t nSize, const char* pFileName = NULL, int nLine = 0) { return malloc(nSize); }
-inline void MemAlloc_Free(void* ptr, const char* pFileName = NULL, int nLine = 0) { free(ptr); }
-
-inline void* MemAlloc_AllocAligned(size_t size, size_t align, const char* pszFile = NULL, int nLine = 0) { return memalign(align, size); }
-inline void* MemAlloc_AllocAlignedFileLine(size_t size, size_t align, const char* pszFile = NULL, int nLine = 0) { return memalign(align, size); }
-inline void MemAlloc_FreeAligned(void* pMemBlock, const char* pszFile = NULL, int nLine = 0) { free(pMemBlock); }
-
-#if defined( OSX )
-inline size_t _msize(void* ptr) { return malloc_size(ptr); }
-#else
-inline size_t _msize(void* ptr) { return malloc_usable_size(ptr); }
-#endif
-
-inline void* MemAlloc_ReallocAligned(void* ptr, size_t size, size_t align)
-{
-	void* ptr_new_aligned = memalign(align, size);
-
-	if (ptr_new_aligned)
-	{
-		size_t old_size = _msize(ptr);
-		size_t copy_size = (size < old_size) ? size : old_size;
-
-		memcpy(ptr_new_aligned, ptr, copy_size);
-		free(ptr);
-	}
-
-	return ptr_new_aligned;
-}
-#else
-#define MemAlloc_GetDebugInfoSize() g_pMemAlloc->GetDebugInfoSize()
-#define MemAlloc_SaveDebugInfo( pvDebugInfo ) g_pMemAlloc->SaveDebugInfo( pvDebugInfo )
-#define MemAlloc_RestoreDebugInfo( pvDebugInfo ) g_pMemAlloc->RestoreDebugInfo( pvDebugInfo )
-#define MemAlloc_InitDebugInfo( pvDebugInfo, pchRootFileName, nLine ) g_pMemAlloc->InitDebugInfo( pvDebugInfo, pchRootFileName, nLine )
-
-#endif    
-
-#if !defined(STEAM) && defined(NO_MALLOC_OVERRIDE)
-
-#define MEM_ALLOC_CREDIT_(tag)	((void)0)
-#define MEM_ALLOC_CREDIT()	MEM_ALLOC_CREDIT_(__FILE__)
-#define MEM_ALLOC_CREDIT_FUNCTION()
-#define MEM_ALLOC_CREDIT_CLASS()
-#define MEM_ALLOC_CLASSNAME(type) NULL
-
-#define MemAlloc_PushAllocDbgInfo( pszFile, line )
-#define MemAlloc_PopAllocDbgInfo()
-#define MemAlloc_RegisterAllocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) ((void)0)
-#define MemAlloc_RegisterDeallocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) ((void)0)
-#define MemAlloc_DumpStats() ((void)0)
-#define MemAlloc_CompactHeap() ((void)0)
-#define MemAlloc_OutOfMemory() ((void)0)
-#define MemAlloc_CompactIncremental() ((void)0)
-#define MemAlloc_DumpStatsFileBase( _filename ) ((void)0)
-inline bool MemAlloc_CrtCheckMemory() { return true; }
-inline void MemAlloc_GlobalMemoryStatus(size_t* pusedMemory, size_t* pfreeMemory)
-{
-	*pusedMemory = 0;
-	*pfreeMemory = 0;
-}
-#define MemAlloc_MemoryAllocFailed() 0
-
-#define MemAlloc_GetDebugInfoSize() 0
-#define MemAlloc_SaveDebugInfo( pvDebugInfo ) ((void)0)
-#define MemAlloc_RestoreDebugInfo( pvDebugInfo ) ((void)0)
-#define MemAlloc_InitDebugInfo( pvDebugInfo, pchRootFileName, nLine ) ((void)0)
-
-
-#define MEMALLOC_DEFINE_EXTERNAL_TRACKING( tag )
-#define MemAlloc_RegisterExternalAllocation( tag, p, size ) ((void)0)
-#define MemAlloc_RegisterExternalDeallocation( tag, p, size ) ((void)0)
-
-#endif    
-
-
-
-#if defined( POSIX ) && !defined( NO_HOOK_MALLOC )
-PLATFORM_INTERFACE void MemoryLogMessage(char const* s);						       
-PLATFORM_INTERFACE void EnableMemoryLogging(bool bOnOff);
-PLATFORM_INTERFACE void DumpMemoryLog(int nThresh);
-PLATFORM_INTERFACE void DumpMemorySummary(void);
-PLATFORM_INTERFACE void SetMemoryMark(void);
-PLATFORM_INTERFACE void DumpChangedMemory(int nThresh);
-
-#else
-FORCEINLINE void MemoryLogMessage(char const* s)
-{
-}
-
-FORCEINLINE void EnableMemoryLogging(bool bOnOff)
-{
-}
-FORCEINLINE void DumpMemoryLog(int nThresh)
-{
-}
-FORCEINLINE void DumpMemorySummary(void)
-{
-}
-FORCEINLINE void SetMemoryMark(void)
-{
-}
-FORCEINLINE void DumpChangedMemory(int nThresh)
-{
-}
-
-#endif
-
-#ifdef POSIX
-PLATFORM_INTERFACE size_t ApproximateProcessMemoryUsage(void);
-#else
-FORCEINLINE size_t ApproximateProcessMemoryUsage(void)
-{
-	return 0;
-}
-
-#endif
-
-struct aligned_tmp_t
-{
-};
-
-template< int bytesAlignment = 16, class T = aligned_tmp_t >
-class CAlignedNewDelete : public T
-{
-
-public:
-	void* operator new(size_t nSize)
-	{
-		return MemAlloc_AllocAligned(nSize, bytesAlignment);
-	}
-
-	void* operator new(size_t nSize, int nBlockUse, const char* pFileName, int nLine)
-	{
-		return MemAlloc_AllocAlignedFileLine(nSize, bytesAlignment, pFileName, nLine);
-	}
-
-	void operator delete(void* pData)
-	{
-		if (pData)
-		{
-			MemAlloc_FreeAligned(pData);
-		}
-	}
-
-	void operator delete(void* pData, int nBlockUse, const char* pFileName, int nLine)
-	{
-		if (pData)
-		{
-			MemAlloc_FreeAligned(pData, pFileName, nLine);
-		}
-	}
-};
-
-
-#endif   
\ No newline at end of file
diff --git a/SpyCustom/memdbgoff.h b/SpyCustom/memdbgoff.h
deleted file mode 100644
index 4c63e25..0000000
--- a/SpyCustom/memdbgoff.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifdef MEM_OVERRIDE_ON
-
-#undef malloc
-#undef realloc
-#undef calloc
-#undef free
-#undef _expand
-#undef _msize
-#undef new
-#undef _aligned_malloc
-#undef _aligned_free
-#undef _malloc_dbg
-
-#undef MEM_OVERRIDE_ON
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/memdbgon.h b/SpyCustom/memdbgon.h
deleted file mode 100644
index 2a72ed9..0000000
--- a/SpyCustom/memdbgon.h
+++ /dev/null
@@ -1,219 +0,0 @@
-#if !defined(STEAM) && !defined(NO_MALLOC_OVERRIDE)
-
-#if defined(_DEBUG) && !defined(USE_MEM_DEBUG)
-#define USE_MEM_DEBUG 1
-#endif
-
-#if defined(NO_HOOK_MALLOC)
-#undef USE_MEM_DEBUG
-#endif
-
-#if (defined(_DEBUG) || !defined(_INC_CRTDBG)) || defined(MEMDBGON_H)
-
-#include "basetypes.h"
-#ifdef _WIN32
-#include <tchar.h>
-#else
-#include <wchar.h>
-#endif
-#include <string.h>
-#include <malloc.h>
-#include "commonmacros.h"
-#include "memalloc.h"
-
-#if defined(USE_MEM_DEBUG)
-#if defined( POSIX )
-
-#define _NORMAL_BLOCK 1
-
-#include <cstddef>
-#include <glob.h>
-#include <new>
-#include <sys/types.h>
-#if !defined( DID_THE_OPERATOR_NEW )
-#define DID_THE_OPERATOR_NEW
-void* operator new(size_t nSize, int blah, const char* pFileName, int nLine);
-void* operator new[](size_t nSize, int blah, const char* pFileName, int nLine);
-#endif
-
-#else  
-
-#if !defined(_DEBUG)
-#define _DEBUG 1
-#include <crtdbg.h>
-#undef _DEBUG
-#else
-#include <crtdbg.h>
-#endif  
-
-#endif  
-#endif
-
-#include "memdbgoff.h"
-
-#define MEM_OVERRIDE_ON 1
-
-#undef malloc
-#undef realloc
-#undef calloc
-#undef _expand
-#undef free
-#undef _msize
-#undef _aligned_malloc
-#undef _aligned_free
-
-#ifndef MEMDBGON_H
-inline void* MemAlloc_InlineCallocMemset(void* pMem, size_t nCount, size_t nElementSize)
-{
-	memset(pMem, 0, nElementSize * nCount);
-	return pMem;
-}
-#endif
-
-#define calloc(c, s)		MemAlloc_InlineCallocMemset(malloc(c*s), c, s)
-#define free(p)				g_pMemAlloc->Free( p )
-#define _msize(p)			g_pMemAlloc->GetSize( p )
-#define _expand(p, s)		_expand_NoLongerSupported(p, s)
-#define _aligned_free( p )	MemAlloc_FreeAligned( p )
-
-#if defined(USE_MEM_DEBUG)
-
-#define malloc(s)				g_pMemAlloc->Alloc( s, __FILE__, __LINE__)
-#define realloc(p, s)			g_pMemAlloc->Realloc( p, s, __FILE__, __LINE__ )
-#define _aligned_malloc( s, a )	MemAlloc_AllocAligned( s, a, __FILE__, __LINE__ )
-
-#define _malloc_dbg(s, t, f, l)	WHYCALLINGTHISDIRECTLY(s)
-
-#if !defined( LINUX )
-#if defined(__AFX_H__) && defined(DEBUG_NEW)
-#define new DEBUG_NEW
-#else
-#undef new
-#define MEMALL_DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
-#define new MEMALL_DEBUG_NEW
-#endif
-#endif
-
-#undef _strdup
-#undef strdup
-#undef _wcsdup
-#undef wcsdup
-
-#define _strdup(s) MemAlloc_StrDup(s, __FILE__, __LINE__)
-#define strdup(s)  MemAlloc_StrDup(s, __FILE__, __LINE__)
-#define _wcsdup(s) MemAlloc_WcStrDup(s, __FILE__, __LINE__)
-#define wcsdup(s)  MemAlloc_WcStrDup(s, __FILE__, __LINE__)
-
-#if !defined(MEMDBGON_H)
-
-inline char* MemAlloc_StrDup(const char* pString, const char* pFileName, unsigned nLine)
-{
-	char* pMemory;
-
-	if (!pString)
-		return NULL;
-
-	size_t len = strlen(pString) + 1;
-	if ((pMemory = (char*)g_pMemAlloc->Alloc(len, pFileName, nLine)) != NULL)
-	{
-		return strcpy(pMemory, pString);
-	}
-
-	return NULL;
-}
-
-inline wchar_t* MemAlloc_WcStrDup(const wchar_t* pString, const char* pFileName, unsigned nLine)
-{
-	wchar_t* pMemory;
-
-	if (!pString)
-		return NULL;
-
-	size_t len = (wcslen(pString) + 1);
-	if ((pMemory = (wchar_t*)g_pMemAlloc->Alloc(len * sizeof(wchar_t), pFileName, nLine)) != NULL)
-	{
-		return wcscpy(pMemory, pString);
-	}
-
-	return NULL;
-}
-
-#endif  
-
-#else
-#define malloc(s)				g_pMemAlloc->Alloc( s )
-#define realloc(p, s)			g_pMemAlloc->Realloc( p, s )
-#define _aligned_malloc( s, a )	MemAlloc_AllocAligned( s, a )
-
-#ifndef _malloc_dbg
-#define _malloc_dbg(s, t, f, l)	WHYCALLINGTHISDIRECTLY(s)
-#endif
-
-#undef new
-
-#undef _strdup
-#undef strdup
-#undef _wcsdup
-#undef wcsdup
-
-#define _strdup(s) MemAlloc_StrDup(s)
-#define strdup(s)  MemAlloc_StrDup(s)
-#define _wcsdup(s) MemAlloc_WcStrDup(s)
-#define wcsdup(s)  MemAlloc_WcStrDup(s)
-
-#if !defined(MEMDBGON_H)
-
-inline char* MemAlloc_StrDup(const char* pString)
-{
-	char* pMemory;
-
-	if (!pString)
-		return NULL;
-
-	size_t len = strlen(pString) + 1;
-	if ((pMemory = (char*)g_pMemAlloc->Alloc(len)) != NULL)
-	{
-		return strcpy(pMemory, pString);
-	}
-
-	return NULL;
-}
-
-inline wchar_t* MemAlloc_WcStrDup(const wchar_t* pString)
-{
-	wchar_t* pMemory;
-
-	if (!pString)
-		return NULL;
-
-	size_t len = (wcslen(pString) + 1);
-	if ((pMemory = (wchar_t*)g_pMemAlloc->Alloc(len * sizeof(wchar_t))) != NULL)
-	{
-		return wcscpy(pMemory, pString);
-	}
-
-	return NULL;
-}
-
-#endif  
-
-#endif  
-
-#define MEMDBGON_H        
-
-#else
-
-#if defined(USE_MEM_DEBUG)
-#ifndef _STATIC_LINKED
-#pragma message ("Note: file includes crtdbg.h directly, therefore will cannot use memdbgon.h in non-debug build")
-#else
-#error "Error: file includes crtdbg.h directly, therefore will cannot use memdbgon.h in non-debug build. Not recoverable in static build"
-#endif
-#endif
-#endif  
-
-#else
-
-#include "memalloc.h"
-
-#endif    
\ No newline at end of file
diff --git a/SpyCustom/mempool.h b/SpyCustom/mempool.h
deleted file mode 100644
index 2de8dba..0000000
--- a/SpyCustom/mempool.h
+++ /dev/null
@@ -1,590 +0,0 @@
-#ifndef MEMPOOL_H
-#define MEMPOOL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "memalloc.h"
-#include "tslist.h"
-#include "platform.h"
-#include "utlvector.h"
-#include "utlrbtree.h"
-
-typedef void (*MemoryPoolReportFunc_t)(PRINTF_FORMAT_STRING char const* pMsg, ...);
-
-class CUtlMemoryPool
-{
-public:
-	enum MemoryPoolGrowType_t
-	{
-		GROW_NONE = 0,		    
-		GROW_FAST = 1,		             
-							GROW_SLOW = 2			     
-	};
-
-	CUtlMemoryPool(int blockSize, int numElements, int growMode = GROW_FAST, const char* pszAllocOwner = NULL, int nAlignment = 0);
-	~CUtlMemoryPool();
-
-	void* Alloc();	         
-	void* Alloc(size_t amount);
-	void* AllocZero();	              
-	void* AllocZero(size_t amount);
-	void		Free(void* pMem);
-
-	void		Clear();
-
-	static void SetErrorReportFunc(MemoryPoolReportFunc_t func);
-
-	int Count() const { return m_BlocksAllocated; }
-	int PeakCount() const { return m_PeakAlloc; }
-	int BlockSize() const { return m_BlockSize; }
-	int Size() const;
-
-	bool		IsAllocationWithinPool(void* pMem) const;
-
-protected:
-	class CBlob
-	{
-	public:
-		CBlob* m_pPrev, * m_pNext;
-		int		m_NumBytes;		      
-		char	m_Data[1];
-		char	m_Padding[3];      
-	};
-
-	void		Init();
-	void		AddNewBlob();
-	void		ReportLeaks();
-
-	int			m_BlockSize;
-	int			m_BlocksPerBlob;
-
-	int			m_GrowMode;	  
-
-	int				m_BlocksAllocated;
-	int				m_PeakAlloc;
-	unsigned short	m_nAlignment;
-	unsigned short	m_NumBlobs;
-	void* m_pHeadOfFreeList;
-	const char* m_pszAllocOwner;
-	CBlob			m_BlobHead;
-
-	static MemoryPoolReportFunc_t g_ReportFunc;
-};
-
-
-class CMemoryPoolMT : public CUtlMemoryPool
-{
-public:
-	CMemoryPoolMT(int blockSize, int numElements, int growMode = GROW_FAST, const char* pszAllocOwner = NULL, int nAlignment = 0) : CUtlMemoryPool(blockSize, numElements, growMode, pszAllocOwner, nAlignment) {}
-
-
-	void* Alloc() { AUTO_LOCK(m_mutex); return CUtlMemoryPool::Alloc(); }
-	void* Alloc(size_t amount) { AUTO_LOCK(m_mutex); return CUtlMemoryPool::Alloc(amount); }
-	void* AllocZero() { AUTO_LOCK(m_mutex); return CUtlMemoryPool::AllocZero(); }
-	void* AllocZero(size_t amount) { AUTO_LOCK(m_mutex); return CUtlMemoryPool::AllocZero(amount); }
-	void		Free(void* pMem) { AUTO_LOCK(m_mutex); CUtlMemoryPool::Free(pMem); }
-
-	void		Clear() { AUTO_LOCK(m_mutex); return CUtlMemoryPool::Clear(); }
-private:
-	CThreadFastMutex m_mutex;        
-};
-
-
-template< class T >
-class CClassMemoryPool : public CUtlMemoryPool
-{
-public:
-	CClassMemoryPool(int numElements, int growMode = GROW_FAST, int nAlignment = 0) :
-		CUtlMemoryPool(sizeof(T), numElements, growMode, MEM_ALLOC_CLASSNAME(T), nAlignment) {}
-
-	T* Alloc();
-	T* AllocZero();
-	void	Free(T* pMem);
-
-	void	Clear();
-};
-
-template <int ITEM_SIZE, int ALIGNMENT, int CHUNK_SIZE, class CAllocator, bool GROWMODE = false, int COMPACT_THRESHOLD = 4 >
-class CAlignedMemPool
-{
-	enum
-	{
-		BLOCK_SIZE = COMPILETIME_MAX(ALIGN_VALUE(ITEM_SIZE, ALIGNMENT), 8),
-	};
-
-public:
-	CAlignedMemPool();
-
-	void* Alloc();
-	void Free(void* p);
-
-	static int __cdecl CompareChunk(void* const* ppLeft, void* const* ppRight);
-	void Compact();
-
-	int NumTotal() { AUTO_LOCK(m_mutex); return m_Chunks.Count() * (CHUNK_SIZE / BLOCK_SIZE); }
-	int NumAllocated() { AUTO_LOCK(m_mutex); return NumTotal() - m_nFree; }
-	int NumFree() { AUTO_LOCK(m_mutex); return m_nFree; }
-
-	int BytesTotal() { AUTO_LOCK(m_mutex); return NumTotal() * BLOCK_SIZE; }
-	int BytesAllocated() { AUTO_LOCK(m_mutex); return NumAllocated() * BLOCK_SIZE; }
-	int BytesFree() { AUTO_LOCK(m_mutex); return NumFree() * BLOCK_SIZE; }
-
-	int ItemSize() { return ITEM_SIZE; }
-	int BlockSize() { return BLOCK_SIZE; }
-	int ChunkSize() { return CHUNK_SIZE; }
-
-private:
-	struct FreeBlock_t
-	{
-		FreeBlock_t* pNext;
-		byte		reserved[BLOCK_SIZE - sizeof(FreeBlock_t*)];
-	};
-
-	CUtlVector<void*>	m_Chunks;		           
-	FreeBlock_t* m_pFirstFree;
-	int					m_nFree;
-	CAllocator			m_Allocator;
-	double				m_TimeLastCompact;
-
-	CThreadFastMutex	m_mutex;
-};
-
-template <typename T, int nInitialCount = 0, bool bDefCreateNewIfEmpty = true >
-class CObjectPool
-{
-public:
-	CObjectPool()
-	{
-		int i = nInitialCount;
-		while (i-- > 0)
-		{
-			m_AvailableObjects.PushItem(new T);
-		}
-	}
-
-	~CObjectPool()
-	{
-		Purge();
-	}
-
-	int NumAvailable()
-	{
-		return m_AvailableObjects.Count();
-	}
-
-	void Purge()
-	{
-		T* p = NULL;
-		while (m_AvailableObjects.PopItem(&p))
-		{
-			delete p;
-		}
-	}
-
-	T* GetObject(bool bCreateNewIfEmpty = bDefCreateNewIfEmpty)
-	{
-		T* p = NULL;
-		if (!m_AvailableObjects.PopItem(&p))
-		{
-			p = (bCreateNewIfEmpty) ? new T : NULL;
-		}
-		return p;
-	}
-
-	void PutObject(T* p)
-	{
-		m_AvailableObjects.PushItem(p);
-	}
-
-private:
-	CTSList<T*> m_AvailableObjects;
-};
-
-template <size_t PROVIDED_ITEM_SIZE, int ITEM_COUNT>
-class CFixedBudgetMemoryPool
-{
-public:
-	CFixedBudgetMemoryPool()
-	{
-		m_pBase = m_pLimit = 0;
-		COMPILE_TIME_ASSERT(ITEM_SIZE % 4 == 0);
-	}
-
-	bool Owns(void* p)
-	{
-		return (p >= m_pBase && p < m_pLimit);
-	}
-
-	void* Alloc()
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-#ifndef USE_MEM_DEBUG
-		if (!m_pBase)
-		{
-			LOCAL_THREAD_LOCK();
-			if (!m_pBase)
-			{
-				byte* pMemory = m_pBase = (byte*)malloc(ITEM_COUNT * ITEM_SIZE);
-				m_pLimit = m_pBase + (ITEM_COUNT * ITEM_SIZE);
-
-				for (int i = 0; i < ITEM_COUNT; i++)
-				{
-					m_freeList.Push((TSLNodeBase_t*)pMemory);
-					pMemory += ITEM_SIZE;
-				}
-			}
-		}
-
-		void* p = m_freeList.Pop();
-		if (p)
-			return p;
-#endif
-		return malloc(ITEM_SIZE);
-	}
-
-	void Free(void* p)
-	{
-#ifndef USE_MEM_DEBUG
-		if (Owns(p))
-			m_freeList.Push((TSLNodeBase_t*)p);
-		else
-#endif
-			free(p);
-	}
-
-	void Clear()
-	{
-#ifndef USE_MEM_DEBUG
-		if (m_pBase)
-		{
-			free(m_pBase);
-		}
-		m_pBase = m_pLimit = 0;
-		Construct(&m_freeList);
-#endif
-	}
-
-	bool IsEmpty()
-	{
-#ifndef USE_MEM_DEBUG
-		if (m_pBase && m_freeList.Count() != ITEM_COUNT)
-			return false;
-#endif
-		return true;
-	}
-
-	enum
-	{
-		ITEM_SIZE = ALIGN_VALUE(PROVIDED_ITEM_SIZE, TSLIST_NODE_ALIGNMENT)
-	};
-
-	CTSListBase m_freeList;
-	byte* m_pBase;
-	byte* m_pLimit;
-};
-
-#define BIND_TO_FIXED_BUDGET_POOL( poolName )									\
-	inline void* operator new( size_t size ) { return poolName.Alloc(); }   \
-	inline void* operator new( size_t size, int nBlockUse, const char *pFileName, int nLine ) { return poolName.Alloc(); }   \
-	inline void  operator delete( void* p ) { poolName.Free(p); }		\
-	inline void  operator delete( void* p, int nBlockUse, const char *pFileName, int nLine ) { poolName.Free(p); }
-
-
-template< class T >
-inline T* CClassMemoryPool<T>::Alloc()
-{
-	T* pRet;
-
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		pRet = (T*)CUtlMemoryPool::Alloc();
-	}
-
-	if (pRet)
-	{
-		Construct(pRet);
-	}
-	return pRet;
-}
-
-template< class T >
-inline T* CClassMemoryPool<T>::AllocZero()
-{
-	T* pRet;
-
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		pRet = (T*)CUtlMemoryPool::AllocZero();
-	}
-
-	if (pRet)
-	{
-		Construct(pRet);
-	}
-	return pRet;
-}
-
-template< class T >
-inline void CClassMemoryPool<T>::Free(T* pMem)
-{
-	if (pMem)
-	{
-		Destruct(pMem);
-	}
-
-	CUtlMemoryPool::Free(pMem);
-}
-
-template< class T >
-inline void CClassMemoryPool<T>::Clear()
-{
-	CUtlRBTree<void*, int> freeBlocks;
-	SetDefLessFunc(freeBlocks);
-
-	void* pCurFree = m_pHeadOfFreeList;
-	while (pCurFree != NULL)
-	{
-		freeBlocks.Insert(pCurFree);
-		pCurFree = *((void**)pCurFree);
-	}
-
-	for (CBlob* pCur = m_BlobHead.m_pNext; pCur != &m_BlobHead; pCur = pCur->m_pNext)
-	{
-		int nElements = pCur->m_NumBytes / this->m_BlockSize;
-		T* p = (T*)AlignValue(pCur->m_Data, this->m_nAlignment);
-		T* pLimit = p + nElements;
-		while (p < pLimit)
-		{
-			if (freeBlocks.Find(p) == freeBlocks.InvalidIndex())
-			{
-				Destruct(p);
-			}
-			p++;
-		}
-	}
-
-	CUtlMemoryPool::Clear();
-}
-
-
-
-
-
-#define DECLARE_FIXEDSIZE_ALLOCATOR( _class )									\
-	public:																		\
-		inline void* operator new( size_t size ) { MEM_ALLOC_CREDIT_(#_class " pool"); return s_Allocator.Alloc(size); }   \
-		inline void* operator new( size_t size, int nBlockUse, const char *pFileName, int nLine ) { MEM_ALLOC_CREDIT_(#_class " pool"); return s_Allocator.Alloc(size); }   \
-		inline void  operator delete( void* p ) { s_Allocator.Free(p); }		\
-		inline void  operator delete( void* p, int nBlockUse, const char *pFileName, int nLine ) { s_Allocator.Free(p); }   \
-	private:																		\
-		static   CUtlMemoryPool   s_Allocator
-
-#define DEFINE_FIXEDSIZE_ALLOCATOR( _class, _initsize, _grow )					\
-	CUtlMemoryPool   _class::s_Allocator(sizeof(_class), _initsize, _grow, #_class " pool")
-
-#define DEFINE_FIXEDSIZE_ALLOCATOR_ALIGNED( _class, _initsize, _grow, _alignment )		\
-	CUtlMemoryPool   _class::s_Allocator(sizeof(_class), _initsize, _grow, #_class " pool", _alignment )
-
-#define DECLARE_FIXEDSIZE_ALLOCATOR_MT( _class )									\
-	public:																		\
-	   inline void* operator new( size_t size ) { MEM_ALLOC_CREDIT_(#_class " pool"); return s_Allocator.Alloc(size); }   \
-	   inline void* operator new( size_t size, int nBlockUse, const char *pFileName, int nLine ) { MEM_ALLOC_CREDIT_(#_class " pool"); return s_Allocator.Alloc(size); }   \
-	   inline void  operator delete( void* p ) { s_Allocator.Free(p); }		\
-	   inline void  operator delete( void* p, int nBlockUse, const char *pFileName, int nLine ) { s_Allocator.Free(p); }   \
-	private:																		\
-		static   CMemoryPoolMT   s_Allocator
-
-#define DEFINE_FIXEDSIZE_ALLOCATOR_MT( _class, _initsize, _grow )					\
-	CMemoryPoolMT   _class::s_Allocator(sizeof(_class), _initsize, _grow, #_class " pool")
-
-#define DECLARE_FIXEDSIZE_ALLOCATOR_EXTERNAL( _class )							\
-   public:																		\
-      inline void* operator new( size_t size )  { MEM_ALLOC_CREDIT_(#_class " pool"); return s_pAllocator->Alloc(size); }   \
-      inline void* operator new( size_t size, int nBlockUse, const char *pFileName, int nLine )  { MEM_ALLOC_CREDIT_(#_class " pool"); return s_pAllocator->Alloc(size); }   \
-      inline void  operator delete( void* p )   { s_pAllocator->Free(p); }		\
-   private:																		\
-      static   CUtlMemoryPool*   s_pAllocator
-
-#define DEFINE_FIXEDSIZE_ALLOCATOR_EXTERNAL( _class, _allocator )				\
-   CUtlMemoryPool*   _class::s_pAllocator = _allocator
-
-
-template <int ITEM_SIZE, int ALIGNMENT, int CHUNK_SIZE, class CAllocator, bool GROWMODE, int COMPACT_THRESHOLD >
-inline CAlignedMemPool<ITEM_SIZE, ALIGNMENT, CHUNK_SIZE, CAllocator, GROWMODE, COMPACT_THRESHOLD>::CAlignedMemPool()
-	: m_pFirstFree(0),
-	m_nFree(0),
-	m_TimeLastCompact(0)
-{
-	{ COMPILE_TIME_ASSERT(sizeof(FreeBlock_t) >= BLOCK_SIZE); }
-	{ COMPILE_TIME_ASSERT(ALIGN_VALUE(sizeof(FreeBlock_t), ALIGNMENT) == sizeof(FreeBlock_t)); }
-}
-
-template <int ITEM_SIZE, int ALIGNMENT, int CHUNK_SIZE, class CAllocator, bool GROWMODE, int COMPACT_THRESHOLD >
-inline void* CAlignedMemPool<ITEM_SIZE, ALIGNMENT, CHUNK_SIZE, CAllocator, GROWMODE, COMPACT_THRESHOLD>::Alloc()
-{
-	AUTO_LOCK(m_mutex);
-
-	if (!m_pFirstFree)
-	{
-		if (!GROWMODE && m_Chunks.Count())
-		{
-			return NULL;
-		}
-
-		FreeBlock_t* pNew = (FreeBlock_t*)m_Allocator.Alloc(CHUNK_SIZE);
-		Assert((unsigned)pNew % ALIGNMENT == 0);
-		m_Chunks.AddToTail(pNew);
-		m_nFree = CHUNK_SIZE / BLOCK_SIZE;
-		m_pFirstFree = pNew;
-		for (int i = 0; i < m_nFree - 1; i++)
-		{
-			pNew->pNext = pNew + 1;
-			pNew++;
-		}
-		pNew->pNext = NULL;
-	}
-
-	void* p = m_pFirstFree;
-	m_pFirstFree = m_pFirstFree->pNext;
-	m_nFree--;
-
-	return p;
-}
-
-template <int ITEM_SIZE, int ALIGNMENT, int CHUNK_SIZE, class CAllocator, bool GROWMODE, int COMPACT_THRESHOLD >
-inline void CAlignedMemPool<ITEM_SIZE, ALIGNMENT, CHUNK_SIZE, CAllocator, GROWMODE, COMPACT_THRESHOLD>::Free(void* p)
-{
-	AUTO_LOCK(m_mutex);
-
-	FreeBlock_t* pFree = ((FreeBlock_t*)p);
-	FreeBlock_t* pCur = m_pFirstFree;
-	FreeBlock_t* pPrev = NULL;
-
-	while (pCur && pFree > pCur)
-	{
-		pPrev = pCur;
-		pCur = pCur->pNext;
-	}
-
-	pFree->pNext = pCur;
-
-	if (pPrev)
-	{
-		pPrev->pNext = pFree;
-	}
-	else
-	{
-		m_pFirstFree = pFree;
-	}
-	m_nFree++;
-
-	if (m_nFree >= (CHUNK_SIZE / BLOCK_SIZE) * COMPACT_THRESHOLD)
-	{
-		double time = Plat_FloatTime();
-		double compactTime = (m_nFree >= (CHUNK_SIZE / BLOCK_SIZE) * COMPACT_THRESHOLD * 4) ? 15.0 : 30.0;
-		if (m_TimeLastCompact > time || m_TimeLastCompact + compactTime < time)
-		{
-			Compact();
-			m_TimeLastCompact = time;
-		}
-	}
-}
-
-template <int ITEM_SIZE, int ALIGNMENT, int CHUNK_SIZE, class CAllocator, bool GROWMODE, int COMPACT_THRESHOLD >
-inline void CAlignedMemPool<ITEM_SIZE, ALIGNMENT, CHUNK_SIZE, CAllocator, GROWMODE, COMPACT_THRESHOLD>::Compact()
-{
-	FreeBlock_t* pCur = m_pFirstFree;
-	FreeBlock_t* pPrev = NULL;
-
-	m_Chunks.Sort(CompareChunk);
-
-#ifdef VALIDATE_ALIGNED_MEM_POOL
-	{
-		FreeBlock_t* p = m_pFirstFree;
-		while (p)
-		{
-			if (p->pNext && p > p->pNext)
-			{
-				__asm { int 3 }
-			}
-			p = p->pNext;
-		}
-
-		for (int i = 0; i < m_Chunks.Count(); i++)
-		{
-			if (i + 1 < m_Chunks.Count())
-			{
-				if (m_Chunks[i] > m_Chunks[i + 1])
-				{
-					__asm { int 3 }
-				}
-			}
-		}
-	}
-#endif
-
-	int i;
-
-	for (i = 0; i < m_Chunks.Count(); i++)
-	{
-		int nBlocksPerChunk = CHUNK_SIZE / BLOCK_SIZE;
-		FreeBlock_t* pChunkLimit = ((FreeBlock_t*)m_Chunks[i]) + nBlocksPerChunk;
-		int nFromChunk = 0;
-		if (pCur == m_Chunks[i])
-		{
-			FreeBlock_t* pFirst = pCur;
-			while (pCur && pCur >= m_Chunks[i] && pCur < pChunkLimit)
-			{
-				pCur = pCur->pNext;
-				nFromChunk++;
-			}
-			pCur = pFirst;
-
-		}
-
-		while (pCur && pCur >= m_Chunks[i] && pCur < pChunkLimit)
-		{
-			if (nFromChunk != nBlocksPerChunk)
-			{
-				if (pPrev)
-				{
-					pPrev->pNext = pCur;
-				}
-				else
-				{
-					m_pFirstFree = pCur;
-				}
-				pPrev = pCur;
-			}
-			else if (pPrev)
-			{
-				pPrev->pNext = NULL;
-			}
-			else
-			{
-				m_pFirstFree = NULL;
-			}
-
-			pCur = pCur->pNext;
-		}
-
-		if (nFromChunk == nBlocksPerChunk)
-		{
-			m_Allocator.Free(m_Chunks[i]);
-			m_nFree -= nBlocksPerChunk;
-			m_Chunks[i] = 0;
-		}
-	}
-
-	for (i = m_Chunks.Count() - 1; i >= 0; i--)
-	{
-		if (!m_Chunks[i])
-		{
-			m_Chunks.FastRemove(i);
-		}
-	}
-}
-
-#endif  
diff --git a/SpyCustom/meshreader.h b/SpyCustom/meshreader.h
deleted file mode 100644
index 6fa8d7a..0000000
--- a/SpyCustom/meshreader.h
+++ /dev/null
@@ -1,231 +0,0 @@
-#ifndef MESHREADER_H
-#define MESHREADER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-class CBaseMeshReader : protected MeshDesc_t
-{
-public:
-
-	CBaseMeshReader();
-	~CBaseMeshReader();
-
-	void BeginRead(
-		IMesh* pMesh,
-		int firstVertex = 0,
-		int numVertices = 0,
-		int firstIndex = 0,
-		int numIndices = 0);
-
-	void EndRead();
-
-	void BeginRead_Direct(const MeshDesc_t& desc, int numVertices, int nIndices);
-
-	void Reset();
-
-
-protected:
-	IMesh* m_pMesh;
-	int m_MaxVertices;
-	int m_MaxIndices;
-};
-
-
-class CMeshReader : public CBaseMeshReader
-{
-public:
-public:
-	int NumIndices() const;
-	unsigned short Index(int index) const;
-
-	const Vector& Position(int iVertex) const;
-
-	unsigned int Color(int iVertex) const;
-
-	const float* TexCoord(int iVertex, int stage) const;
-	void TexCoord2f(int iVertex, int stage, float& s, float& t) const;
-	const Vector2D& TexCoordVector2D(int iVertex, int stage) const;
-
-	int NumBoneWeights() const;
-	float Wrinkle(int iVertex) const;
-
-	const Vector& Normal(int iVertex) const;
-	void Normal(int iVertex, Vector& vNormal) const;
-
-	const Vector& TangentS(int iVertex) const;
-	const Vector& TangentT(int iVertex) const;
-	float BoneWeight(int iVertex) const;
-
-#ifdef NEW_SKINNING
-	float* BoneMatrix(int iVertex) const;
-#else
-	unsigned char* BoneMatrix(int iVertex) const;
-#endif
-};
-
-
-inline CBaseMeshReader::CBaseMeshReader()
-{
-	m_pMesh = NULL;
-}
-
-inline CBaseMeshReader::~CBaseMeshReader()
-{
-	Assert(!m_pMesh);
-}
-
-inline void CBaseMeshReader::BeginRead(
-	IMesh* pMesh,
-	int firstVertex,
-	int numVertices,
-	int firstIndex,
-	int numIndices)
-{
-	Assert(pMesh && (!m_pMesh));
-
-	if (numVertices < 0)
-	{
-		numVertices = pMesh->VertexCount();
-	}
-
-	if (numIndices < 0)
-	{
-		numIndices = pMesh->IndexCount();
-	}
-
-	m_pMesh = pMesh;
-	m_MaxVertices = numVertices;
-	m_MaxIndices = numIndices;
-
-	VertexCompressionType_t compressionType = CompressionType(pMesh->GetVertexFormat());
-	Assert(compressionType == VERTEX_COMPRESSION_NONE);
-	if (compressionType != VERTEX_COMPRESSION_NONE)
-	{
-		Warning("Cannot use CBaseMeshReader with compressed vertices! Will get junk data or a crash.\n");
-	}
-
-	pMesh->ModifyBeginEx(true, firstVertex, numVertices, firstIndex, numIndices, *this);
-
-	Reset();
-}
-
-inline void CBaseMeshReader::EndRead()
-{
-	Assert(m_pMesh);
-	m_pMesh->ModifyEnd(*this);
-	m_pMesh = NULL;
-}
-
-inline void CBaseMeshReader::BeginRead_Direct(const MeshDesc_t& desc, int nVertices, int nIndices)
-{
-	MeshDesc_t* pThis = this;
-	*pThis = desc;
-	m_MaxVertices = nVertices;
-	m_MaxIndices = nIndices;
-
-	Assert(desc.m_CompressionType == VERTEX_COMPRESSION_NONE);
-	if (desc.m_CompressionType != VERTEX_COMPRESSION_NONE)
-	{
-		Warning("Cannot use CBaseMeshReader with compressed vertices!\n");
-	}
-}
-
-inline void CBaseMeshReader::Reset()
-{
-}
-
-
-
-
-inline int CMeshReader::NumIndices() const
-{
-	return m_MaxIndices;
-}
-
-inline unsigned short CMeshReader::Index(int index) const
-{
-	Assert((index >= 0) && (index < m_MaxIndices));
-	return m_pIndices[index * m_nIndexSize];
-}
-
-inline const Vector& CMeshReader::Position(int iVertex) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	return *(Vector*)((char*)m_pPosition + iVertex * m_VertexSize_Position);
-}
-
-inline unsigned int CMeshReader::Color(int iVertex) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	unsigned char* pColor = m_pColor + iVertex * m_VertexSize_Color;
-	return (pColor[0] << 16) | (pColor[1] << 8) | (pColor[2]) | (pColor[3] << 24);
-}
-
-inline const float* CMeshReader::TexCoord(int iVertex, int iStage) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	return (float*)((char*)m_pTexCoord[iStage] + iVertex * m_VertexSize_TexCoord[iStage]);
-}
-
-inline void CMeshReader::TexCoord2f(int iVertex, int iStage, float& s, float& t) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	float* p = (float*)((char*)m_pTexCoord[iStage] + iVertex * m_VertexSize_TexCoord[iStage]);
-	s = p[0];
-	t = p[1];
-}
-
-inline const Vector2D& CMeshReader::TexCoordVector2D(int iVertex, int iStage) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	Vector2D* p = (Vector2D*)((char*)m_pTexCoord[iStage] + iVertex * m_VertexSize_TexCoord[iStage]);
-	return *p;
-}
-
-inline float CMeshReader::Wrinkle(int iVertex) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	return *(float*)((char*)m_pWrinkle + iVertex * m_VertexSize_Wrinkle);
-}
-
-inline int CMeshReader::NumBoneWeights() const
-{
-	return m_NumBoneWeights;
-}
-
-inline const Vector& CMeshReader::Normal(int iVertex) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	return *(const Vector*)(const float*)((char*)m_pNormal + iVertex * m_VertexSize_Normal);
-}
-
-inline void CMeshReader::Normal(int iVertex, Vector& vNormal) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	const float* p = (const float*)((char*)m_pNormal + iVertex * m_VertexSize_Normal);
-	vNormal.Init(p[0], p[1], p[2]);
-}
-
-inline const Vector& CMeshReader::TangentS(int iVertex) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	return *(const Vector*)((char*)m_pTangentS + iVertex * m_VertexSize_TangentS);
-}
-
-inline const Vector& CMeshReader::TangentT(int iVertex) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	return *(const Vector*)((char*)m_pTangentT + iVertex * m_VertexSize_TangentT);
-}
-
-inline float CMeshReader::BoneWeight(int iVertex) const
-{
-	Assert(iVertex >= 0 && iVertex < m_MaxVertices);
-	float* p = (float*)((char*)m_pBoneWeight + iVertex * m_VertexSize_BoneWeight);
-	return *p;
-}
-
-#endif  
diff --git a/SpyCustom/meshutils.h b/SpyCustom/meshutils.h
deleted file mode 100644
index 3c354eb..0000000
--- a/SpyCustom/meshutils.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef MESHUTILS_H
-#define MESHUTILS_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-void GenerateSequentialIndexBuffer(unsigned short* pIndexMemory, int nIndexCount, int nFirstVertex);
-void GenerateQuadIndexBuffer(unsigned short* pIndexMemory, int nIndexCount, int nFirstVertex);
-void GeneratePolygonIndexBuffer(unsigned short* pIndexMemory, int nIndexCount, int nFirstVertex);
-void GenerateLineStripIndexBuffer(unsigned short* pIndexMemory, int nIndexCount, int nFirstVertex);
-void GenerateLineLoopIndexBuffer(unsigned short* pIndexMemory, int nIndexCount, int nFirstVertex);
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/messagebox.h b/SpyCustom/messagebox.h
deleted file mode 100644
index 9fec7a7..0000000
--- a/SpyCustom/messagebox.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef MESSAGEBOX_H
-#define MESSAGEBOX_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vgui.h"
-#include "Frame.h"
-
-#ifdef MessageBox
-#undef MessageBox
-#endif
-
-namespace vgui
-{
-
-	class MessageBox : public Frame
-	{
-		DECLARE_CLASS_SIMPLE(MessageBox, Frame);
-
-	public:
-		MessageBox(const char* title, const char* text, Panel* parent = NULL);
-		MessageBox(const wchar_t* wszTitle, const wchar_t* wszText, Panel* parent = NULL);
-		~MessageBox();
-
-		virtual void DoModal(Frame* pFrameOver = NULL);
-
-		virtual void ShowWindow(Frame* pFrameOver = NULL);
-
-		virtual void SetCommand(const char* command);
-		virtual void SetCommand(KeyValues* command);
-
-		virtual void SetOKButtonVisible(bool state);
-
-		virtual void SetOKButtonText(const char* buttonText);
-		virtual void SetOKButtonText(const wchar_t* wszButtonText);
-
-		void SetCancelButtonVisible(bool state);
-		void SetCancelButtonText(const char* buttonText);
-		void SetCancelButtonText(const wchar_t* wszButtonText);
-		void SetCancelCommand(KeyValues* command);
-
-		virtual void DisableCloseButton(bool state);
-
-		virtual void OnCommand(const char* pCommand);
-
-		void ShowMessageBoxOverCursor(bool bEnable);
-
-	protected:
-		virtual void PerformLayout();
-		virtual void ApplySchemeSettings(IScheme* pScheme);
-
-	protected:
-		Button* m_pOkButton;
-		Button* m_pCancelButton;
-		Label* m_pMessageLabel;
-
-	private:
-		MESSAGE_FUNC(OnShutdownRequest, "ShutdownRequest");
-
-		void Init();
-
-		KeyValues* m_OkCommand;
-		KeyValues* m_CancelCommand;
-		vgui::Frame* m_pFrameOver;
-		bool m_bNoAutoClose : 1;
-		bool m_bShowMessageBoxOverCursor : 1;
-	};
-
-}   
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/minidump.h b/SpyCustom/minidump.h
deleted file mode 100644
index 5338a83..0000000
--- a/SpyCustom/minidump.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef MINIDUMP_H
-#define MINIDUMP_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-
-PLATFORM_INTERFACE void SetMinidumpFilenamePrefix(const char* pszPrefix);
-
-PLATFORM_INTERFACE void SetMinidumpComment(const char* pszComment);
-
-PLATFORM_INTERFACE void WriteMiniDump(const char* pszFilenameSuffix = NULL);
-
-typedef void (*FnWMain)(int, tchar* []);
-typedef void (*FnVoidPtrFn)(void*);
-
-#if defined(_WIN32) && !defined(_X360)
-
-typedef void (*FnWMain)(int, tchar* []);
-typedef int (*FnWMainIntRet)(int, tchar* []);
-typedef void (*FnVoidPtrFn)(void*);
-
-enum ECatchAndWriteMinidumpAction
-{
-	k_ECatchAndWriteMiniDumpAbort = 0,
-	k_ECatchAndWriteMiniDumpReThrow = 1,
-	k_ECatchAndWriteMiniDumpIgnore = 2,
-};
-
-PLATFORM_INTERFACE void CatchAndWriteMiniDump(FnWMain pfn, int argc, tchar* argv[]);    
-PLATFORM_INTERFACE void CatchAndWriteMiniDumpForVoidPtrFn(FnVoidPtrFn pfn, void* pv, bool bExitQuietly);        
-
-PLATFORM_INTERFACE void CatchAndWriteMiniDumpEx(FnWMain pfn, int argc, tchar* argv[], ECatchAndWriteMinidumpAction eAction);
-PLATFORM_INTERFACE int CatchAndWriteMiniDumpExReturnsInt(FnWMainIntRet pfn, int argc, tchar* argv[], ECatchAndWriteMinidumpAction eAction);
-PLATFORM_INTERFACE void CatchAndWriteMiniDumpExForVoidPtrFn(FnVoidPtrFn pfn, void* pv, ECatchAndWriteMinidumpAction eAction);
-
-struct _EXCEPTION_POINTERS;
-
-typedef void (*FnMiniDump)(unsigned int uStructuredExceptionCode, _EXCEPTION_POINTERS* pExceptionInfo, const char* pszFilenameSuffix);
-PLATFORM_INTERFACE FnMiniDump SetMiniDumpFunction(FnMiniDump pfn);
-
-PLATFORM_INTERFACE bool WriteMiniDumpUsingExceptionInfo(
-	unsigned int uStructuredExceptionCode,
-	_EXCEPTION_POINTERS* pExceptionInfo,
-	int    minidumpType,
-	const char* pszFilenameSuffix = NULL,
-	tchar* ptchMinidumpFileNameBuffer = NULL
-);
-
-PLATFORM_INTERFACE void MinidumpSetUnhandledExceptionFunction(FnMiniDump pfn);
-
-PLATFORM_INTERFACE void EnableCrashingOnCrashes();
-
-#endif
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/modelloader.h b/SpyCustom/modelloader.h
deleted file mode 100644
index 42c1a22..0000000
--- a/SpyCustom/modelloader.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#if !defined( MOD_LOADER_H )
-#define MOD_LOADER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-struct model_t;
-class IMaterial;
-class IFileList;
-
-
-#include "utlmemory.h"
-
-
-abstract_class IModelLoader
-{
-public:
-	enum REFERENCETYPE
-	{
-		FMODELLOADER_NOTLOADEDORREFERENCED = 0,
-		FMODELLOADER_LOADED = (1 << 0),
-
-		FMODELLOADER_SERVER = (1 << 1),
-		FMODELLOADER_CLIENT = (1 << 2),
-		FMODELLOADER_CLIENTDLL = (1 << 3),
-		FMODELLOADER_STATICPROP = (1 << 4),
-		FMODELLOADER_DETAILPROP = (1 << 5),
-		FMODELLOADER_REFERENCEMASK = (FMODELLOADER_SERVER | FMODELLOADER_CLIENT | FMODELLOADER_CLIENTDLL | FMODELLOADER_STATICPROP | FMODELLOADER_DETAILPROP),
-
-		FMODELLOADER_TOUCHED_BY_PRELOAD = (1 << 15),
-		FMODELLOADER_LOADED_BY_PRELOAD = (1 << 16),
-		FMODELLOADER_TOUCHED_MATERIALS = (1 << 17),
-	};
-
-	enum ReloadType_t
-	{
-		RELOAD_LOD_CHANGED = 0,
-		RELOAD_EVERYTHING,
-		RELOAD_REFRESH_MODELS,
-	};
-
-	virtual void		Init(void) = 0;
-	virtual void		Shutdown(void) = 0;
-
-	virtual int			GetCount(void) = 0;
-	virtual model_t* GetModelForIndex(int i) = 0;
-
-	virtual const char* GetName(const model_t* model) = 0;
-
-	virtual void* GetExtraData(model_t* model) = 0;
-
-	virtual int			GetModelFileSize(const char* name) = 0;
-
-	virtual model_t* GetModelForName(const char* name, REFERENCETYPE referencetype) = 0;
-	virtual model_t* ReferenceModel(const char* name, REFERENCETYPE referencetype) = 0;
-	virtual void		UnreferenceModel(model_t* model, REFERENCETYPE referencetype) = 0;
-	virtual void		UnreferenceAllModels(REFERENCETYPE referencetype) = 0;
-
-	virtual void		UnloadUnreferencedModels(void) = 0;
-	virtual void		PurgeUnusedModels(void) = 0;
-
-	virtual bool		Map_GetRenderInfoAllocated(void) = 0;
-	virtual void		Map_SetRenderInfoAllocated(bool allocated) = 0;
-
-	virtual void		Map_LoadDisplacements(model_t* model, bool bRestoring) = 0;
-
-	virtual void		Print(void) = 0;
-
-	virtual bool		Map_IsValid(char const* mapname) = 0;
-
-	virtual void		RecomputeSurfaceFlags(model_t* mod) = 0;
-
-	virtual void		Studio_ReloadModels(ReloadType_t reloadType) = 0;
-
-	virtual bool		IsLoaded(const model_t* mod) = 0;
-
-	virtual bool		LastLoadedMapHasHDRLighting(void) = 0;
-
-	virtual void ReloadFilesInList(IFileList* pFilesToReload) = 0;
-
-	virtual const char* GetActiveMapName(void) = 0;
-};
-
-extern IModelLoader* modelloader;
-
-class CMapLoadHelper
-{
-public:
-	CMapLoadHelper(int lumpToLoad);
-	~CMapLoadHelper(void);
-
-	byte* LumpBase(void);
-	int					LumpSize(void);
-	int					LumpOffset(void);
-	int					LumpVersion() const;
-	const char* GetMapName(void);
-	char* GetLoadName(void);
-	char* GetDiskName(void);
-	struct worldbrushdata_t* GetMap(void);
-
-	static void			Init(model_t* pMapModel, const char* pLoadname);
-	static void			InitFromMemory(model_t* pMapModel, const void* pData, int nDataSize);
-	static void			Shutdown(void);
-	static int			GetRefCount(void);
-
-	static void			FreeLightingLump();
-
-	static int			LumpSize(int lumpId);
-	static int			LumpOffset(int lumpId);
-
-	void				LoadLumpElement(int nElemIndex, int nElemSize, void* pData);
-	void				LoadLumpData(int offset, int size, void* pData);
-
-private:
-	int					m_nLumpSize;
-	int					m_nLumpOffset;
-	int					m_nLumpVersion;
-	byte* m_pRawData;
-	byte* m_pData;
-	byte* m_pUncompressedData;
-
-	int					m_nLumpID;
-	char				m_szLumpFilename[MAX_PATH];
-};
-
-void Mod_RecomputeTranslucency(model_t* mod, int nSkin, int nBody, void * pClientRenderable);
-
-int Mod_GameLumpSize(int lumpId);
-int Mod_GameLumpVersion(int lumpId);
-bool Mod_LoadGameLump(int lumpId, void* pBuffer, int size);
-
-int Mod_GetMaterialCount(model_t* mod);
-
-int Mod_GetModelMaterials(model_t* mod, int count, IMaterial** ppMaterial);
-
-bool Mod_MarkWaterSurfaces(model_t* pModel);
-
-void ConnectMDLCacheNotify();
-void DisconnectMDLCacheNotify();
-
-void InitStudioModelState(model_t* pModel);
-
-char* GetMapNameOnDisk(char* pDiskName, const char* pFullMapName, unsigned int nDiskNameSize);
-
-extern bool g_bLoadedMapHasBakedPropLighting;
-extern bool g_bBakedPropLightingNoSeparateHDR;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/modes.h b/SpyCustom/modes.h
deleted file mode 100644
index 21b91f5..0000000
--- a/SpyCustom/modes.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#if !defined( MODES_H )
-#define MODES_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-typedef struct vmode_s
-{
-	int			width;
-	int			height;
-	int			bpp;
-	int			refreshRate;
-} vmode_t;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/mouthinfo.h b/SpyCustom/mouthinfo.h
deleted file mode 100644
index 42ba87d..0000000
--- a/SpyCustom/mouthinfo.h
+++ /dev/null
@@ -1,178 +0,0 @@
-#if !defined( MOUTHINFO_H )
-#define MOUTHINFO_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class CAudioSource;
-
-#pragma pack(push,4)
-class CVoiceData
-{
-public:
-	CVoiceData(void)
-	{
-		m_flElapsed = 0.0f;
-		m_pAudioSource = NULL;
-		m_bIgnorePhonemes = false;
-	}
-
-	void SetElapsedTime(float t)
-	{
-		m_flElapsed = t;
-	}
-
-	float GetElapsedTime() const
-	{
-		return m_flElapsed;
-	}
-
-	void SetSource(CAudioSource* source, bool bIgnorePhonemes)
-	{
-		m_pAudioSource = source;
-		m_bIgnorePhonemes = bIgnorePhonemes;
-	}
-
-	bool ShouldIgnorePhonemes() const
-	{
-		return m_bIgnorePhonemes;
-	}
-
-	CAudioSource* GetSource()
-	{
-		return m_pAudioSource;
-	}
-
-private:
-	float					m_flElapsed;
-	CAudioSource* m_pAudioSource;
-	bool					m_bIgnorePhonemes;
-};
-
-#define UNKNOWN_VOICE_SOURCE -1
-
-class CMouthInfo
-{
-public:
-	byte					mouthopen;
-	byte					sndcount;
-	int						sndavg;
-
-public:
-	CMouthInfo(void) { m_nVoiceSources = 0; m_needsEnvelope = false; }
-	virtual					~CMouthInfo(void) { ClearVoiceSources(); }
-
-	int						GetNumVoiceSources(void);
-	CVoiceData* GetVoiceSource(int number);
-
-	void					ClearVoiceSources(void);
-	int						GetIndexForSource(CAudioSource* source);
-	bool					IsSourceReferenced(CAudioSource* source);
-
-	CVoiceData* AddSource(CAudioSource* source, bool bIgnorePhonemes);
-
-	void					RemoveSource(CAudioSource* source);
-	void					RemoveSourceByIndex(int index);
-
-	bool					IsActive(void);
-	bool					NeedsEnvelope() { return m_needsEnvelope != 0; }
-	void					ActivateEnvelope() { m_needsEnvelope = true; }
-
-private:
-	enum
-	{
-		MAX_VOICE_DATA = 4
-	};
-
-	short					m_nVoiceSources;
-	short					m_needsEnvelope;
-	CVoiceData				m_VoiceSources[MAX_VOICE_DATA];
-};
-#pragma pack(pop)
-
-
-inline bool CMouthInfo::IsActive(void)
-{
-	return (GetNumVoiceSources() > 0) ? true : false;
-}
-
-inline int CMouthInfo::GetNumVoiceSources(void)
-{
-	return m_nVoiceSources;
-}
-
-inline CVoiceData* CMouthInfo::GetVoiceSource(int number)
-{
-	if (number < 0 || number >= m_nVoiceSources)
-		return NULL;
-
-	return &m_VoiceSources[number];
-}
-
-inline void CMouthInfo::ClearVoiceSources(void)
-{
-	m_nVoiceSources = 0;
-}
-
-inline int CMouthInfo::GetIndexForSource(CAudioSource* source)
-{
-	for (int i = 0; i < m_nVoiceSources; i++)
-	{
-		CVoiceData* v = &m_VoiceSources[i];
-		if (!v)
-			continue;
-
-		if (v->GetSource() == source)
-			return i;
-	}
-
-	return UNKNOWN_VOICE_SOURCE;
-}
-
-inline bool CMouthInfo::IsSourceReferenced(CAudioSource* source)
-{
-	if (GetIndexForSource(source) != UNKNOWN_VOICE_SOURCE)
-		return true;
-
-	return false;
-}
-
-inline void CMouthInfo::RemoveSource(CAudioSource* source)
-{
-	int idx = GetIndexForSource(source);
-	if (idx == UNKNOWN_VOICE_SOURCE)
-		return;
-
-	RemoveSourceByIndex(idx);
-}
-
-inline void CMouthInfo::RemoveSourceByIndex(int index)
-{
-	if (index < 0 || index >= m_nVoiceSources)
-		return;
-
-	m_VoiceSources[index] = m_VoiceSources[--m_nVoiceSources];
-}
-
-inline CVoiceData* CMouthInfo::AddSource(CAudioSource* source, bool bIgnorePhonemes)
-{
-	int idx = GetIndexForSource(source);
-	if (idx == UNKNOWN_VOICE_SOURCE)
-	{
-		if (m_nVoiceSources < MAX_VOICE_DATA)
-		{
-			idx = m_nVoiceSources++;
-		}
-		else
-		{
-			return NULL;
-		}
-	}
-
-	CVoiceData* data = &m_VoiceSources[idx];
-	data->SetSource(source, bIgnorePhonemes);
-	data->SetElapsedTime(0.0f);
-	return data;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/netchannel.hpp b/SpyCustom/netchannel.hpp
deleted file mode 100644
index 1218b28..0000000
--- a/SpyCustom/netchannel.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-typedef const void(__thiscall* pShutdown)(void*, void*, const char*);
-pShutdown oShutdown;
-void __fastcall hkShutdown(void* thisptr, void* unk1, void* unk2, const char* reason) noexcept
-{
-#ifdef DEBUG
-    printf("shutdown (%x) HOOKED %s\n", thisptr, reason);
-#endif
-
-    if (*g_Options.discmsg_active) {
-#ifdef DEBUG
-        printf("set new reason %s\n", g_Options.discmsg.value->mystring);
-#endif
-        char customreason[256] = "#";
-        strcat_s( customreason, MakeControlChars(g_Options.discmsg.value->mystring));
-
-        oShutdown(thisptr, nullptr, customreason);
-    }
-    else
-        oShutdown(thisptr, nullptr, reason);
-}
-
-inline void HookNetchannel()
-{
-    DWORD ptrShutdown = *((DWORD*)iff.g_pEngineClient->GetNetChannelInfo()) + 36 * 4;
-    DWORD addrShutdown = *(DWORD*)ptrShutdown; 
-    oShutdown = (pShutdown)DetourFunction(
-        (PBYTE)(addrShutdown),
-        (PBYTE)hkShutdown);
-#ifdef DEBUG
-    printf("Detoured at %x\n", addrShutdown); 
-#endif
-    opt.netchannedlhooked = 1;
-}
-
diff --git a/SpyCustom/netvars.cpp b/SpyCustom/netvars.cpp
deleted file mode 100644
index c404600..0000000
--- a/SpyCustom/netvars.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "netvars.hpp"
-
-#include <fstream>
-#include <utility>
-
-#include "interfaces.hpp"
-
-void NetvarSys::Initialize()
-{
-
-    m_tables.clear();
-
-    ClientClass* clientClass = iff.g_pClient->GetAllClasses();
-    if (!clientClass)
-        return;
-
-    while (clientClass)
-    {
-        RecvTable* recvTable = clientClass->m_pRecvTable;
-        m_tables.push_back(recvTable);
-
-        clientClass = clientClass->m_pNext;
-    }
-
-}
-
-
-#undef GetProp
-
-int NetvarSys::GetOffset(const char* tableName, const char* propName)
-{
-    int offset = this->GetProp(tableName, propName);
-    if (!offset)
-    {
-#ifdef DEBUG
-        printf("%s not found!\n", propName);
-#endif
-        return 0;
-    }
-#ifdef DEBUG
-    printf("%s: 0x%02X\n", propName, offset);
-#endif
-    return offset;
-}
-
-
-int NetvarSys::GetProp(const char* tableName, const char* propName, RecvProp** prop)
-{
-    RecvTable* recvTable = GetTable(tableName);
-    if (!recvTable)
-        return 0;
-
-    int offset = this->GetProp(recvTable, propName, prop);
-    if (!offset)
-        return 0;
-
-    return offset;
-}
-
-
-int NetvarSys::GetProp(RecvTable* recvTable, const char* propName, RecvProp** prop)
-{
-    int extraOffset = 0;
-    for (int i = 0; i < recvTable->m_nProps; ++i)
-    {
-        RecvProp* recvProp = &recvTable->m_pProps[i];
-        RecvTable* child = recvProp->m_pDataTable;
-
-        if (child && (child->m_nProps > 0))
-        {
-            int tmp = this->GetProp(child, propName, prop);
-            if (tmp)
-                extraOffset += (recvProp->m_Offset + tmp);
-        }
-
-        if (_stricmp(recvProp->m_pVarName, propName))
-            continue;
-
-        if (prop)
-            *prop = recvProp;
-
-        return (recvProp->m_Offset + extraOffset);
-    }
-
-    return extraOffset;
-}
-
-RecvTable* NetvarSys::GetTable(const char* tableName)
-{
-    if (m_tables.empty())
-        return 0;
-
-    for (const auto& table : m_tables)
-    {
-        if (!table)
-            continue;
-
-        if (_stricmp(table->m_pNetTableName, tableName) == 0)
-            return table;
-    }
-
-    return 0;
-}
-
-
-
-
-
-
-
diff --git a/SpyCustom/netvars.hpp b/SpyCustom/netvars.hpp
deleted file mode 100644
index ec2c533..0000000
--- a/SpyCustom/netvars.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <iostream>
-#include <unordered_map>
-
-#include "dt_recv.h"
-#include "Singleton.hpp"
-
-class NetvarSys
-    : public Singleton<NetvarSys>
-{
-public:
-    void Initialize();
-
-    int GetOffset(const char* tableName, const char* propName);
-
-    RecvTable* GetTable(const char* tableName);
-    std::vector<RecvTable*>    m_tables;
-
-private:
-    int GetProp(const char* tableName, const char* propName, RecvProp** prop = 0);
-    int GetProp(RecvTable* recvTable, const char* propName, RecvProp** prop = 0);
-
-};
-
-
-#define NETVAR_OFFSET2(funcname, class_name, var_name, offset, ...) \
-auto funcname() -> std::add_lvalue_reference_t<__VA_ARGS__> \
-{ \
-    static int netvar = NetvarSys::Get().GetOffset(class_name, var_name);    \
-    auto addr = std::uintptr_t(this) + offset + netvar;     \
-	return *reinterpret_cast<std::add_pointer_t<__VA_ARGS__>>(addr); \
-}
-
-#define NETVAR2(funcname, class_name, var_name, ...) \
-	NETVAR_OFFSET2(funcname, class_name, var_name, 0, __VA_ARGS__)
diff --git a/SpyCustom/networkstringtabledefs.h b/SpyCustom/networkstringtabledefs.h
deleted file mode 100644
index 396849a..0000000
--- a/SpyCustom/networkstringtabledefs.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef NETWORKSTRINGTABLEDEFS_H
-#define NETWORKSTRINGTABLEDEFS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-typedef int TABLEID;
-
-#define INVALID_STRING_TABLE -1
-const unsigned short INVALID_STRING_INDEX = (unsigned short)-1;
-
-#define MAX_TABLES	32       
-
-#define INTERFACENAME_NETWORKSTRINGTABLESERVER "VEngineServerStringTable001"
-#define INTERFACENAME_NETWORKSTRINGTABLECLIENT "VEngineClientStringTable001"
-
-class INetworkStringTable;
-
-typedef void (*pfnStringChanged)(void* object, INetworkStringTable* stringTable, int stringNumber, char const* newString, void const* newData);
-
-class INetworkStringTable
-{
-public:
-
-	virtual					~INetworkStringTable(void) {};
-
-	virtual const char* GetTableName(void) const = 0;
-	virtual TABLEID			GetTableId(void) const = 0;
-	virtual int				GetNumStrings(void) const = 0;
-	virtual int				GetMaxStrings(void) const = 0;
-	virtual int				GetEntryBits(void) const = 0;
-
-	virtual void			SetTick(int tick) = 0;
-	virtual bool			ChangedSinceTick(int tick) const = 0;
-
-	virtual int				AddString(bool bIsServer, const char* value, int length = -1, const void* userdata = 0) = 0;
-
-	virtual const char* GetString(int stringNumber) = 0;
-	virtual void			SetStringUserData(int stringNumber, int length, const void* userdata) = 0;
-	virtual const void* GetStringUserData(int stringNumber, int* length) = 0;
-	virtual int				FindStringIndex(char const* string) = 0;      
-
-	virtual void			SetStringChangedCallback(void* object, pfnStringChanged changeFunc) = 0;
-};
-
-class INetworkStringTableContainer
-{
-public:
-
-	virtual					~INetworkStringTableContainer(void) {};
-
-	virtual INetworkStringTable* CreateStringTable(const char* tableName, int maxentries, int userdatafixedsize = 0, int userdatanetworkbits = 0) = 0;
-	virtual void				RemoveAllTables(void) = 0;
-
-	virtual INetworkStringTable* FindTable(const char* tableName) const = 0;
-	virtual INetworkStringTable* GetTable(TABLEID stringTable) const = 0;
-	virtual int					GetNumTables(void) const = 0;
-
-	virtual INetworkStringTable* CreateStringTableEx(const char* tableName, int maxentries, int userdatafixedsize = 0, int userdatanetworkbits = 0, bool bIsFilenames = false) = 0;
-	virtual void				SetAllowClientSideAddString(INetworkStringTable* table, bool bAllowClientSideAddString) = 0;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/networkvar.h b/SpyCustom/networkvar.h
deleted file mode 100644
index ff0b261..0000000
--- a/SpyCustom/networkvar.h
+++ /dev/null
@@ -1,737 +0,0 @@
-#ifndef NETWORKVAR_H
-#define NETWORKVAR_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "dbg.h"
-#include "convar.h"
-
-#if defined( CLIENT_DLL ) || defined( GAME_DLL )
-#include "basehandle.h"
-#endif
-
-
-#pragma warning( disable : 4284 )                             
-
-#define MyOffsetOf( type, var ) ( (int)&((type*)0)->var )
-
-#ifdef _DEBUG
-extern bool g_bUseNetworkVars;
-#define CHECK_USENETWORKVARS if(g_bUseNetworkVars)
-#else
-#define CHECK_USENETWORKVARS     
-#endif
-
-
-
-inline int InternalCheckDeclareClass(const char* pClassName, const char* pClassNameMatch, void* pTestPtr, void* pBasePtr)
-{
-	Assert(pTestPtr == pBasePtr);
-
-	Assert((void*)pClassName == (void*)pClassNameMatch);
-	return 0;
-}
-
-
-template <typename T>
-inline int CheckDeclareClass_Access(T*, const char* pShouldBe)
-{
-	return T::CheckDeclareClass(pShouldBe);
-}
-
-#ifndef _STATIC_LINKED
-#ifdef _MSC_VER
-#if defined(_DEBUG) && (_MSC_VER > 1200 )
-#define VALIDATE_DECLARE_CLASS 1
-#endif
-#endif
-#endif
-
-#ifdef  VALIDATE_DECLARE_CLASS
-
-#define DECLARE_CLASS( className, baseClassName ) \
-		typedef baseClassName BaseClass; \
-		typedef className ThisClass; \
-		template <typename T> friend int CheckDeclareClass_Access(T *, const char *pShouldBe); \
-		static int CheckDeclareClass( const char *pShouldBe ) \
-		{ \
-			InternalCheckDeclareClass( pShouldBe, #className, (ThisClass*)0xFFFFF, (BaseClass*)(ThisClass*)0xFFFFF ); \
-			return CheckDeclareClass_Access( (BaseClass *)NULL, #baseClassName ); \
-		}
-
-#define DECLARE_CLASS_GAMEROOT( className, baseClassName ) \
-		typedef baseClassName BaseClass; \
-		typedef className ThisClass; \
-		template <typename T> friend int CheckDeclareClass_Access(T *, const char *pShouldBe); \
-		static int CheckDeclareClass( const char *pShouldBe ) \
-		{ \
-			return InternalCheckDeclareClass( pShouldBe, #className, (ThisClass*)0xFFFFF, (BaseClass*)(ThisClass*)0xFFFFF ); \
-		}
-
-#define DECLARE_CLASS_NOFRIEND( className, baseClassName ) \
-		DECLARE_CLASS( className, baseClassName )
-
-#define DECLARE_CLASS_NOBASE( className ) \
-		typedef className ThisClass; \
-		template <typename T> friend int CheckDeclareClass_Access(T *, const char *pShouldBe); \
-		static int CheckDeclareClass( const char *pShouldBe ) \
-		{ \
-			return InternalCheckDeclareClass( pShouldBe, #className, 0, 0 ); \
-		} 
-
-#else
-#define DECLARE_CLASS( className, baseClassName ) \
-		typedef baseClassName BaseClass; \
-		typedef className ThisClass;
-
-#define DECLARE_CLASS_GAMEROOT( className, baseClassName )	DECLARE_CLASS( className, baseClassName )
-#define DECLARE_CLASS_NOFRIEND( className, baseClassName )	DECLARE_CLASS( className, baseClassName )
-
-#define DECLARE_CLASS_NOBASE( className )					typedef className ThisClass;
-#endif
-
-
-
-
-class CBaseEntity;
-class CAutoInitEntPtr
-{
-public:
-	CAutoInitEntPtr()
-	{
-		m_pEnt = NULL;
-	}
-	CBaseEntity* m_pEnt;
-};
-
-#define DECLARE_NETWORKVAR_CHAIN() \
-		CAutoInitEntPtr __m_pChainEntity; \
-		void NetworkStateChanged() { CHECK_USENETWORKVARS __m_pChainEntity.m_pEnt->NetworkStateChanged(); } \
-		void NetworkStateChanged( void *pVar ) { CHECK_USENETWORKVARS __m_pChainEntity.m_pEnt->NetworkStateChanged(); }
-
-#define IMPLEMENT_NETWORKVAR_CHAIN( varName ) \
-		(varName)->__m_pChainEntity.m_pEnt = this;
-
-
-
-template< class T >
-static inline void DispatchNetworkStateChanged(T* pObj)
-{
-	CHECK_USENETWORKVARS pObj->NetworkStateChanged();
-}
-template< class T >
-static inline void DispatchNetworkStateChanged(T* pObj, void* pVar)
-{
-	CHECK_USENETWORKVARS pObj->NetworkStateChanged(pVar);
-}
-
-
-#define DECLARE_EMBEDDED_NETWORKVAR() \
-	template <typename T> friend int ServerClassInit(T *);	\
-	template <typename T> friend int ClientClassInit(T *); \
-	virtual void NetworkStateChanged() {}  virtual void NetworkStateChanged( void *pProp ) {}
-
-#define CNetworkVarEmbedded( type, name ) \
-	class NetworkVar_##name; \
-	friend class NetworkVar_##name; \
-	static inline int GetOffset_##name() { return MyOffsetOf(ThisClass,name); } \
-	typedef ThisClass ThisClass_##name; \
-	class NetworkVar_##name : public type \
-	{ \
-		template< class T > NetworkVar_##name& operator=( const T &val ) { *((type*)this) = val; return *this; } \
-	public: \
-		void CopyFrom( const type &src ) { *((type *)this) = src; NetworkStateChanged(); } \
-		virtual void NetworkStateChanged() \
-		{ \
-			DispatchNetworkStateChanged( (ThisClass_##name*)( ((char*)this) - GetOffset_##name() ) ); \
-		} \
-		virtual void NetworkStateChanged( void *pVar ) \
-		{ \
-			DispatchNetworkStateChanged( (ThisClass_##name*)( ((char*)this) - GetOffset_##name() ), pVar ); \
-		} \
-	}; \
-	NetworkVar_##name name; 
-
-template<typename T>
-FORCEINLINE void NetworkVarConstruct(T& x) { x = T(0); }
-FORCEINLINE void NetworkVarConstruct(color32_s& x) { x.r = x.g = x.b = x.a = 0; }
-
-template< class Type, class Changer >
-class CNetworkVarBase
-{
-public:
-	inline CNetworkVarBase()
-	{
-		NetworkVarConstruct(m_Value);
-	}
-
-	template< class C >
-	const Type& operator=(const C& val)
-	{
-		return Set((const Type)val);
-	}
-
-	template< class C >
-	const Type& operator=(const CNetworkVarBase< C, Changer >& val)
-	{
-		return Set((const Type)val.m_Value);
-	}
-
-	const Type& Set(const Type& val)
-	{
-		if (memcmp(&m_Value, &val, sizeof(Type)))
-		{
-			NetworkStateChanged();
-			m_Value = val;
-		}
-		return m_Value;
-	}
-
-	Type& GetForModify()
-	{
-		NetworkStateChanged();
-		return m_Value;
-	}
-
-	template< class C >
-	const Type& operator+=(const C& val)
-	{
-		return Set(m_Value + (const Type)val);
-	}
-
-	template< class C >
-	const Type& operator-=(const C& val)
-	{
-		return Set(m_Value - (const Type)val);
-	}
-
-	template< class C >
-	const Type& operator/=(const C& val)
-	{
-		return Set(m_Value / (const Type)val);
-	}
-
-	template< class C >
-	const Type& operator*=(const C& val)
-	{
-		return Set(m_Value * (const Type)val);
-	}
-
-	template< class C >
-	const Type& operator^=(const C& val)
-	{
-		return Set(m_Value ^ (const Type)val);
-	}
-
-	template< class C >
-	const Type& operator|=(const C& val)
-	{
-		return Set(m_Value | (const Type)val);
-	}
-
-	const Type& operator++()
-	{
-		return (*this += 1);
-	}
-
-	Type operator--()
-	{
-		return (*this -= 1);
-	}
-
-	Type operator++(int)   
-	{
-		Type val = m_Value;
-		(*this += 1);
-		return val;
-	}
-
-	Type operator--(int)   
-	{
-		Type val = m_Value;
-		(*this -= 1);
-		return val;
-	}
-
-	template< class C >
-	const Type& operator&=(const C& val)
-	{
-		return Set(m_Value & (const Type)val);
-	}
-
-	operator const Type& () const
-	{
-		return m_Value;
-	}
-
-	const Type& Get() const
-	{
-		return m_Value;
-	}
-
-	const Type* operator->() const
-	{
-		return &m_Value;
-	}
-
-	Type m_Value;
-
-protected:
-	inline void NetworkStateChanged()
-	{
-		Changer::NetworkStateChanged(this);
-	}
-};
-
-
-template< class Type, class Changer >
-class CNetworkColor32Base : public CNetworkVarBase< Type, Changer >
-{
-public:
-	inline void Init(byte rVal, byte gVal, byte bVal)
-	{
-		SetR(rVal);
-		SetG(gVal);
-		SetB(bVal);
-	}
-	inline void Init(byte rVal, byte gVal, byte bVal, byte aVal)
-	{
-		SetR(rVal);
-		SetG(gVal);
-		SetB(bVal);
-		SetA(aVal);
-	}
-
-	const Type& operator=(const Type& val)
-	{
-		return this->Set(val);
-	}
-
-	const Type& operator=(const CNetworkColor32Base<Type, Changer>& val)
-	{
-		return CNetworkVarBase<Type, Changer>::Set(val.m_Value);
-	}
-
-	inline byte GetR() const { return CNetworkColor32Base<Type, Changer>::m_Value.r; }
-	inline byte GetG() const { return CNetworkColor32Base<Type, Changer>::m_Value.g; }
-	inline byte GetB() const { return CNetworkColor32Base<Type, Changer>::m_Value.b; }
-	inline byte GetA() const { return CNetworkColor32Base<Type, Changer>::m_Value.a; }
-	inline void SetR(byte val) { SetVal(CNetworkColor32Base<Type, Changer>::m_Value.r, val); }
-	inline void SetG(byte val) { SetVal(CNetworkColor32Base<Type, Changer>::m_Value.g, val); }
-	inline void SetB(byte val) { SetVal(CNetworkColor32Base<Type, Changer>::m_Value.b, val); }
-	inline void SetA(byte val) { SetVal(CNetworkColor32Base<Type, Changer>::m_Value.a, val); }
-
-protected:
-	inline void SetVal(byte& out, const byte& in)
-	{
-		if (out != in)
-		{
-			CNetworkVarBase< Type, Changer >::NetworkStateChanged();
-			out = in;
-		}
-	}
-};
-
-
-template< class Type, class Changer >
-class CNetworkVectorBase : public CNetworkVarBase< Type, Changer >
-{
-public:
-	inline void Init(float ix = 0, float iy = 0, float iz = 0)
-	{
-		SetX(ix);
-		SetY(iy);
-		SetZ(iz);
-	}
-
-	const Type& operator=(const Type& val)
-	{
-		return CNetworkVarBase< Type, Changer >::Set(val);
-	}
-
-	const Type& operator=(const CNetworkVectorBase<Type, Changer>& val)
-	{
-		return CNetworkVarBase<Type, Changer>::Set(val.m_Value);
-	}
-
-	inline float GetX() const { return CNetworkVectorBase<Type, Changer>::m_Value.x; }
-	inline float GetY() const { return CNetworkVectorBase<Type, Changer>::m_Value.y; }
-	inline float GetZ() const { return CNetworkVectorBase<Type, Changer>::m_Value.z; }
-	inline float operator[](int i) const { return CNetworkVectorBase<Type, Changer>::m_Value[i]; }
-
-	inline void SetX(float val) { DetectChange(CNetworkVectorBase<Type, Changer>::m_Value.x, val); }
-	inline void SetY(float val) { DetectChange(CNetworkVectorBase<Type, Changer>::m_Value.y, val); }
-	inline void SetZ(float val) { DetectChange(CNetworkVectorBase<Type, Changer>::m_Value.z, val); }
-	inline void Set(int i, float val) { DetectChange(CNetworkVectorBase<Type, Changer>::m_Value[i], val); }
-
-	bool operator==(const Type& val) const
-	{
-		return CNetworkVectorBase<Type, Changer>::m_Value == (Type)val;
-	}
-
-	bool operator!=(const Type& val) const
-	{
-		return CNetworkVectorBase<Type, Changer>::m_Value != (Type)val;
-	}
-
-	const Type operator+(const Type& val) const
-	{
-		return CNetworkVectorBase<Type, Changer>::m_Value + val;
-	}
-
-	const Type operator-(const Type& val) const
-	{
-		return CNetworkVectorBase<Type, Changer>::m_Value - val;
-	}
-
-	const Type operator*(const Type& val) const
-	{
-		return CNetworkVectorBase<Type, Changer>::m_Value * val;
-	}
-
-	const Type& operator*=(float val)
-	{
-		return CNetworkVarBase< Type, Changer >::Set(CNetworkVectorBase<Type, Changer>::m_Value * val);
-	}
-
-	const Type operator*(float val) const
-	{
-		return CNetworkVectorBase<Type, Changer>::m_Value * val;
-	}
-
-	const Type operator/(const Type& val) const
-	{
-		return CNetworkVectorBase<Type, Changer>::m_Value / val;
-	}
-
-private:
-	inline void DetectChange(float& out, float in)
-	{
-		if (out != in)
-		{
-			CNetworkVectorBase<Type, Changer>::NetworkStateChanged();
-			out = in;
-		}
-	}
-};
-
-
-template< class Type, class Changer >
-class CNetworkQuaternionBase : public CNetworkVarBase< Type, Changer >
-{
-public:
-	inline void Init(float ix = 0, float iy = 0, float iz = 0, float iw = 0)
-	{
-		SetX(ix);
-		SetY(iy);
-		SetZ(iz);
-		SetW(iw);
-	}
-
-	const Type& operator=(const Type& val)
-	{
-		return CNetworkVarBase< Type, Changer >::Set(val);
-	}
-
-	const Type& operator=(const CNetworkQuaternionBase<Type, Changer>& val)
-	{
-		return CNetworkVarBase<Type, Changer>::Set(val.m_Value);
-	}
-
-	inline float GetX() const { return CNetworkQuaternionBase<Type, Changer>::m_Value.x; }
-	inline float GetY() const { return CNetworkQuaternionBase<Type, Changer>::m_Value.y; }
-	inline float GetZ() const { return CNetworkQuaternionBase<Type, Changer>::m_Value.z; }
-	inline float GetW() const { return CNetworkQuaternionBase<Type, Changer>::m_Value.w; }
-	inline float operator[](int i) const { return CNetworkQuaternionBase<Type, Changer>::m_Value[i]; }
-
-	inline void SetX(float val) { DetectChange(CNetworkQuaternionBase<Type, Changer>::m_Value.x, val); }
-	inline void SetY(float val) { DetectChange(CNetworkQuaternionBase<Type, Changer>::m_Value.y, val); }
-	inline void SetZ(float val) { DetectChange(CNetworkQuaternionBase<Type, Changer>::m_Value.z, val); }
-	inline void SetW(float val) { DetectChange(CNetworkQuaternionBase<Type, Changer>::m_Value.w, val); }
-	inline void Set(int i, float val) { DetectChange(CNetworkQuaternionBase<Type, Changer>::m_Value[i], val); }
-
-	bool operator==(const Type& val) const
-	{
-		return CNetworkQuaternionBase<Type, Changer>::m_Value == (Type)val;
-	}
-
-	bool operator!=(const Type& val) const
-	{
-		return CNetworkQuaternionBase<Type, Changer>::m_Value != (Type)val;
-	}
-
-	const Type operator+(const Type& val) const
-	{
-		return CNetworkQuaternionBase<Type, Changer>::m_Value + val;
-	}
-
-	const Type operator-(const Type& val) const
-	{
-		return CNetworkQuaternionBase<Type, Changer>::m_Value - val;
-	}
-
-	const Type operator*(const Type& val) const
-	{
-		return CNetworkQuaternionBase<Type, Changer>::m_Value * val;
-	}
-
-	const Type& operator*=(float val)
-	{
-		return CNetworkQuaternionBase< Type, Changer >::Set(CNetworkQuaternionBase<Type, Changer>::m_Value * val);
-	}
-
-	const Type operator*(float val) const
-	{
-		return CNetworkQuaternionBase<Type, Changer>::m_Value * val;
-	}
-
-	const Type operator/(const Type& val) const
-	{
-		return CNetworkQuaternionBase<Type, Changer>::m_Value / val;
-	}
-
-private:
-	inline void DetectChange(float& out, float in)
-	{
-		if (out != in)
-		{
-			CNetworkQuaternionBase<Type, Changer>::NetworkStateChanged();
-			out = in;
-		}
-	}
-};
-
-
-#if defined( CLIENT_DLL ) || defined( GAME_DLL )
-inline void NetworkVarConstruct(CBaseHandle& x) {}
-
-template< class Type, class Changer >
-class CNetworkHandleBase : public CNetworkVarBase< CBaseHandle, Changer >
-{
-public:
-	const Type* operator=(const Type* val)
-	{
-		return Set(val);
-	}
-
-	const Type& operator=(const CNetworkHandleBase<Type, Changer>& val)
-	{
-		const CBaseHandle& handle = CNetworkVarBase<CBaseHandle, Changer>::Set(val.m_Value);
-		return *(const Type*)handle.Get();
-	}
-
-	bool operator !() const
-	{
-		return !CNetworkHandleBase<Type, Changer>::m_Value.Get();
-	}
-
-	operator Type* () const
-	{
-		return static_cast<Type*>(CNetworkHandleBase<Type, Changer>::m_Value.Get());
-	}
-
-	const Type* Set(const Type* val)
-	{
-		if (CNetworkHandleBase<Type, Changer>::m_Value != val)
-		{
-			this->NetworkStateChanged();
-			CNetworkHandleBase<Type, Changer>::m_Value = val;
-		}
-		return val;
-	}
-
-	Type* Get() const
-	{
-		return static_cast<Type*>(CNetworkHandleBase<Type, Changer>::m_Value.Get());
-	}
-
-	Type* operator->() const
-	{
-		return static_cast<Type*>(CNetworkHandleBase<Type, Changer>::m_Value.Get());
-	}
-
-	bool operator==(const Type* val) const
-	{
-		return CNetworkHandleBase<Type, Changer>::m_Value == val;
-	}
-
-	bool operator!=(const Type* val) const
-	{
-		return CNetworkHandleBase<Type, Changer>::m_Value != val;
-	}
-};
-
-#define CNetworkHandle( type, name ) CNetworkHandleInternal( type, name, NetworkStateChanged )
-
-#define CNetworkHandleInternal( type, name, stateChangedFn ) \
-		NETWORK_VAR_START( type, name ) \
-		NETWORK_VAR_END( type, name, CNetworkHandleBase, stateChangedFn )
-#endif
-
-
-#define CNetworkVar( type, name ) \
-	NETWORK_VAR_START( type, name ) \
-	NETWORK_VAR_END( type, name, CNetworkVarBase, NetworkStateChanged )
-
-
-#define CNetworkVarForDerived( type, name ) \
-		virtual void NetworkStateChanged_##name() {} \
-		virtual void NetworkStateChanged_##name( void *pVar ) {} \
-		NETWORK_VAR_START( type, name ) \
-		NETWORK_VAR_END( type, name, CNetworkVarBase, NetworkStateChanged_##name )
-
-#define CNetworkVectorForDerived( name ) \
-		virtual void NetworkStateChanged_##name() {} \
-		virtual void NetworkStateChanged_##name( void *pVar ) {} \
-		CNetworkVectorInternal( Vector, name, NetworkStateChanged_##name )
-
-#define CNetworkHandleForDerived( type, name ) \
-		virtual void NetworkStateChanged_##name() {} \
-		virtual void NetworkStateChanged_##name( void *pVar ) {} \
-		CNetworkHandleInternal( type, name, NetworkStateChanged_##name )
-
-#define CNetworkArrayForDerived( type, name, count ) \
-		virtual void NetworkStateChanged_##name() {} \
-		virtual void NetworkStateChanged_##name( void *pVar ) {} \
-		CNetworkArrayInternal( type, name, count, NetworkStateChanged_##name )
-
-#define IMPLEMENT_NETWORK_VAR_FOR_DERIVED( name ) \
-		virtual void NetworkStateChanged_##name() { CHECK_USENETWORKVARS NetworkStateChanged(); } \
-		virtual void NetworkStateChanged_##name( void *pVar ) { CHECK_USENETWORKVARS NetworkStateChanged( pVar ); }
-
-
-#define CNetworkVarForDerived_OnByDefault( type, name ) \
-		virtual void NetworkStateChanged_##name() { CHECK_USENETWORKVARS NetworkStateChanged(); } \
-		virtual void NetworkStateChanged_##name( void *pVar ) { CHECK_USENETWORKVARS NetworkStateChanged( pVar ); } \
-		NETWORK_VAR_START( type, name ) \
-		NETWORK_VAR_END( type, name, CNetworkVarBase, NetworkStateChanged_##name )
-
-#define DISABLE_NETWORK_VAR_FOR_DERIVED( name ) \
-		virtual void NetworkStateChanged_##name() {} \
-		virtual void NetworkStateChanged_##name( void *pVar ) {}
-
-
-
-#define CNetworkVector( name ) CNetworkVectorInternal( Vector, name, NetworkStateChanged )
-#define CNetworkQAngle( name ) CNetworkVectorInternal( QAngle, name, NetworkStateChanged )
-
-#define CNetworkVectorInternal( type, name, stateChangedFn ) \
-	NETWORK_VAR_START( type, name ) \
-	NETWORK_VAR_END( type, name, CNetworkVectorBase, stateChangedFn )
-
-#define CNetworkQuaternion( name ) \
-	NETWORK_VAR_START( Quaternion, name ) \
-	NETWORK_VAR_END( Quaternion, name, CNetworkQuaternionBase, NetworkStateChanged )
-
-#define CNetworkColor32( name ) \
-	NETWORK_VAR_START( color32, name ) \
-	NETWORK_VAR_END( color32, name, CNetworkColor32Base, NetworkStateChanged )
-
-
-#define CNetworkString( name, length ) \
-	class NetworkVar_##name; \
-	friend class NetworkVar_##name; \
-	typedef ThisClass MakeANetworkVar_##name; \
-	class NetworkVar_##name \
-	{ \
-	public: \
-		NetworkVar_##name() { m_Value[0] = '\0'; } \
-		operator const char*() const { return m_Value; } \
-		const char* Get() const { return m_Value; } \
-		char* GetForModify() \
-		{ \
-			NetworkStateChanged(); \
-			return m_Value; \
-		} \
-	protected: \
-		inline void NetworkStateChanged() \
-		{ \
-		CHECK_USENETWORKVARS ((ThisClass*)(((char*)this) - MyOffsetOf(ThisClass,name)))->NetworkStateChanged(); \
-		} \
-	private: \
-		char m_Value[length]; \
-	}; \
-	NetworkVar_##name name;
-
-
-
-
-#define CNetworkArrayInternal( type, name, count, stateChangedFn ) \
-	class NetworkVar_##name; \
-	friend class NetworkVar_##name; \
-	typedef ThisClass MakeANetworkVar_##name; \
-	class NetworkVar_##name \
-	{ \
-	public: \
-		inline NetworkVar_##name() \
-		{ \
-			for ( int i = 0 ; i < count ; ++i ) \
-				NetworkVarConstruct( m_Value[i] ); \
-		} \
-		template <typename T> friend int ServerClassInit(T *);	\
-		const type& operator[]( int i ) const \
-		{ \
-			return Get( i ); \
-		} \
-		\
-		const type& Get( int i ) const \
-		{ \
-			Assert( i >= 0 && i < count ); \
-			return m_Value[i]; \
-		} \
-		\
-		type& GetForModify( int i ) \
-		{ \
-			Assert( i >= 0 && i < count ); \
-			NetworkStateChanged( i ); \
-			return m_Value[i]; \
-		} \
-		\
-		void Set( int i, const type &val ) \
-		{ \
-			Assert( i >= 0 && i < count ); \
-			if( memcmp( &m_Value[i], &val, sizeof(type) ) ) \
-			{ \
-				NetworkStateChanged( i ); \
-			       	m_Value[i] = val; \
-			} \
-		} \
-		const type* Base() const { return m_Value; } \
-		int Count() const { return count; } \
-	protected: \
-		inline void NetworkStateChanged( int index ) \
-		{ \
-			CHECK_USENETWORKVARS ((ThisClass*)(((char*)this) - MyOffsetOf(ThisClass,name)))->stateChangedFn( &m_Value[index] ); \
-		} \
-		type m_Value[count]; \
-	}; \
-	NetworkVar_##name name;
-
-
-#define CNetworkArray( type, name, count )  CNetworkArrayInternal( type, name, count, NetworkStateChanged )
-
-
-#define NETWORK_VAR_START( type, name ) \
-	class NetworkVar_##name; \
-	friend class NetworkVar_##name; \
-	typedef ThisClass MakeANetworkVar_##name; \
-	class NetworkVar_##name \
-	{ \
-	public: \
-		template <typename T> friend int ServerClassInit(T *);
-
-
-#define NETWORK_VAR_END( type, name, base, stateChangedFn ) \
-	public: \
-		static inline void NetworkStateChanged( void *ptr ) \
-		{ \
-			CHECK_USENETWORKVARS ((ThisClass*)(((char*)ptr) - MyOffsetOf(ThisClass,name)))->stateChangedFn( ptr ); \
-		} \
-	}; \
-	base< type, NetworkVar_##name > name;
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/particle_iterators.h b/SpyCustom/particle_iterators.h
deleted file mode 100644
index 46e42fb..0000000
--- a/SpyCustom/particle_iterators.h
+++ /dev/null
@@ -1,222 +0,0 @@
-#ifndef PARTICLE_ITERATORS_H
-#define PARTICLE_ITERATORS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "imesh.h"
-#include "particledraw.h"
-
-
-#define NUM_PARTICLES_PER_BATCH 200
-#ifndef _XBOX
-#define MAX_TOTAL_PARTICLES		2048	     
-#else
-#define MAX_TOTAL_PARTICLES		1024
-#endif
-
-
-class CParticleRenderIterator
-{
-	friend class CParticleMgr;
-	friend class CParticleEffectBinding;
-public:
-	CParticleRenderIterator();
-
-	const Particle* GetFirst();
-	const Particle* GetNext(float sortKey);
-
-	ParticleDraw* GetParticleDraw() const;
-
-
-private:
-
-	void TestFlushBatch();
-
-
-private:
-	CParticleEffectBinding* m_pEffectBinding;
-	CEffectMaterial* m_pMaterial;
-	ParticleDraw* m_pParticleDraw;
-	CMeshBuilder* m_pMeshBuilder;
-	IMesh* m_pMesh;
-	bool m_bBucketSort;
-
-	float m_MinZ;
-	float m_MaxZ;
-	float m_zCoords[MAX_TOTAL_PARTICLES];
-	int m_nZCoords;
-
-	Particle* m_pCur;
-	bool m_bGotFirst;
-	float m_flPrevZ;
-	int m_nParticlesInCurrentBatch;
-};
-
-
-class CParticleSimulateIterator
-{
-	friend class CParticleMgr;
-	friend class CParticleEffectBinding;
-public:
-	CParticleSimulateIterator();
-
-	Particle* GetFirst();
-	Particle* GetNext();
-	float GetTimeDelta() const;
-
-	void RemoveParticle(Particle* pParticle);
-	void RemoveAllParticles();
-
-private:
-	CParticleEffectBinding* m_pEffectBinding;
-	CEffectMaterial* m_pMaterial;
-	float m_flTimeDelta;
-
-	bool m_bGotFirst;
-	Particle* m_pNextParticle;
-};
-
-
-inline CParticleRenderIterator::CParticleRenderIterator()
-{
-	m_pCur = NULL;
-	m_bGotFirst = false;
-	m_flPrevZ = 0;
-	m_nParticlesInCurrentBatch = 0;
-	m_MinZ = 1e24;
-	m_MaxZ = -1e24;
-	m_nZCoords = 0;
-}
-
-inline const Particle* CParticleRenderIterator::GetFirst()
-{
-	Assert(!m_bGotFirst);
-	m_bGotFirst = true;
-
-	m_pCur = m_pMaterial->m_Particles.m_pNext;
-	if (m_pCur == &m_pMaterial->m_Particles)
-		return NULL;
-
-	m_pParticleDraw->m_pSubTexture = m_pCur->m_pSubTexture;
-	return m_pCur;
-}
-
-inline void CParticleRenderIterator::TestFlushBatch()
-{
-	++m_nParticlesInCurrentBatch;
-	if (m_nParticlesInCurrentBatch >= NUM_PARTICLES_PER_BATCH)
-	{
-		m_pMeshBuilder->End(false, true);
-		m_pMeshBuilder->Begin(m_pMesh, MATERIAL_QUADS, NUM_PARTICLES_PER_BATCH * 4);
-
-		m_nParticlesInCurrentBatch = 0;
-	}
-}
-
-inline const Particle* CParticleRenderIterator::GetNext(float sortKey)
-{
-	Assert(m_bGotFirst);
-	Assert(m_pCur);
-
-	TestFlushBatch();
-
-	Particle* pNext = m_pCur->m_pNext;
-
-	if (m_bBucketSort)
-	{
-		m_MinZ = MIN(sortKey, m_MinZ);
-		m_MaxZ = MAX(sortKey, m_MaxZ);
-
-		m_zCoords[m_nZCoords] = sortKey;
-		++m_nZCoords;
-	}
-	else
-	{
-		if (m_pCur != m_pMaterial->m_Particles.m_pNext && m_flPrevZ > sortKey)
-		{
-			SwapParticles(m_pCur->m_pPrev, m_pCur);
-		}
-		else
-		{
-			m_flPrevZ = sortKey;
-		}
-	}
-
-	m_pCur = pNext;
-	if (m_pCur == &m_pMaterial->m_Particles)
-		return NULL;
-
-	m_pParticleDraw->m_pSubTexture = m_pCur->m_pSubTexture;
-	return m_pCur;
-}
-
-inline ParticleDraw* CParticleRenderIterator::GetParticleDraw() const
-{
-	return m_pParticleDraw;
-}
-
-
-inline CParticleSimulateIterator::CParticleSimulateIterator()
-{
-	m_pNextParticle = NULL;
-#ifdef _DEBUG
-	m_bGotFirst = false;
-#endif
-}
-
-inline Particle* CParticleSimulateIterator::GetFirst()
-{
-#ifdef _DEBUG
-	if (m_bGotFirst)
-	{
-		Assert(m_pNextParticle == &m_pMaterial->m_Particles);
-	}
-#endif
-
-	Particle* pRet = m_pMaterial->m_Particles.m_pNext;
-	if (pRet == &m_pMaterial->m_Particles)
-		return NULL;
-
-#ifdef _DEBUG
-	m_bGotFirst = true;
-#endif
-
-	m_pNextParticle = pRet->m_pNext;
-	return pRet;
-}
-
-inline Particle* CParticleSimulateIterator::GetNext()
-{
-	Particle* pRet = m_pNextParticle;
-
-	if (pRet == &m_pMaterial->m_Particles)
-		return NULL;
-
-	m_pNextParticle = pRet->m_pNext;
-	return pRet;
-}
-
-inline void CParticleSimulateIterator::RemoveParticle(Particle* pParticle)
-{
-	m_pEffectBinding->RemoveParticle(pParticle);
-}
-
-inline void CParticleSimulateIterator::RemoveAllParticles()
-{
-	Particle* pParticle = GetFirst();
-	while (pParticle)
-	{
-		RemoveParticle(pParticle);
-		pParticle = GetNext();
-	}
-}
-
-inline float CParticleSimulateIterator::GetTimeDelta() const
-{
-	return m_flTimeDelta;
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/particle_parse.h b/SpyCustom/particle_parse.h
deleted file mode 100644
index 4a4c415..0000000
--- a/SpyCustom/particle_parse.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef PARTICLE_PARSE_H
-#define PARTICLE_PARSE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-#include "utlstring.h"
-#include "ifilelist.h"
-
-enum ParticleAttachment_t
-{
-	PATTACH_ABSORIGIN = 0,			      
-	PATTACH_ABSORIGIN_FOLLOW,		         
-	PATTACH_CUSTOMORIGIN,			        
-	PATTACH_POINT,					       
-	PATTACH_POINT_FOLLOW,			          
-
-	PATTACH_WORLDORIGIN,			          
-
-	PATTACH_ROOTBONE_FOLLOW,		            
-
-	MAX_PATTACH_TYPES,
-};
-
-extern int GetAttachTypeFromString(const char* pszString);
-
-#define PARTICLE_DISPATCH_FROM_ENTITY		(1<<0)
-#define PARTICLE_DISPATCH_RESET_PARTICLES	(1<<1)
-
-struct te_tf_particle_effects_colors_t
-{
-	Vector m_vecColor1;
-	Vector m_vecColor2;
-};
-
-struct te_tf_particle_effects_control_point_t
-{
-	ParticleAttachment_t m_eParticleAttachment;
-	Vector m_vecOffset;
-};
-
-void ParseParticleEffects(bool bLoadSheets, bool bPrecache);
-void ParseParticleEffectsMap(const char* pMapName, bool bLoadSheets, IFileList* pFilesToReload = NULL);
-
-void GetParticleManifest(CUtlVector<CUtlString>& list);
-
-void PrecacheStandardParticleSystems();
-
-class IFileList;
-void ReloadParticleEffectsInList(IFileList* pFilesToReload);
-
-void DispatchParticleEffect(const char* pszParticleName, ParticleAttachment_t iAttachType, CBaseEntity* pEntity, const char* pszAttachmentName, bool bResetAllParticlesOnEntity = false);
-void DispatchParticleEffect(const char* pszParticleName, ParticleAttachment_t iAttachType, CBaseEntity* pEntity = NULL, int iAttachmentPoint = -1, bool bResetAllParticlesOnEntity = false);
-void DispatchParticleEffect(const char* pszParticleName, Vector vecOrigin, QAngle vecAngles, CBaseEntity* pEntity = NULL);
-void DispatchParticleEffect(const char* pszParticleName, Vector vecOrigin, Vector vecStart, QAngle vecAngles, CBaseEntity* pEntity = NULL);
-void DispatchParticleEffect(int iEffectIndex, Vector vecOrigin, Vector vecStart, QAngle vecAngles, CBaseEntity* pEntity = NULL);
-
-void DispatchParticleEffect(const char* pszParticleName, ParticleAttachment_t iAttachType, CBaseEntity* pEntity, const char* pszAttachmentName, Vector vecColor1, Vector vecColor2, bool bUseColors = true, bool bResetAllParticlesOnEntity = false);
-void DispatchParticleEffect(const char* pszParticleName, Vector vecOrigin, QAngle vecAngles, Vector vecColor1, Vector vecColor2, bool bUseColors = true, CBaseEntity* pEntity = NULL, int iAttachType = PATTACH_CUSTOMORIGIN);
-
-
-void StopParticleEffects(CBaseEntity* pEntity);
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/particle_property.h b/SpyCustom/particle_property.h
deleted file mode 100644
index 43012c0..0000000
--- a/SpyCustom/particle_property.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef PARTICLEPROPERTY_H
-#define PARTICLEPROPERTY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "smartptr.h"
-#include "globalvars_base.h"
-#include "particles_new.h"
-#include "particle_parse.h"
-
-class CBaseEntity;
-class CNewParticleEffect;
-
-#ifdef CLIENT_DLL
-#define INVALID_PARTICLE_ATTACHMENT			0
-#else
-#define INVALID_PARTICLE_ATTACHMENT			-1
-#endif
-
-struct ParticleControlPoint_t
-{
-	ParticleControlPoint_t()
-	{
-		iControlPoint = 0;
-		iAttachType = PATTACH_ABSORIGIN_FOLLOW;
-		iAttachmentPoint = 0;
-		vecOriginOffset = vec3_origin;
-	}
-
-	int								iControlPoint;
-	ParticleAttachment_t			iAttachType;
-	int								iAttachmentPoint;
-	Vector							vecOriginOffset;
-	EHANDLE							hEntity;
-};
-
-struct ParticleEffectList_t
-{
-	ParticleEffectList_t()
-	{
-		pParticleEffect = NULL;
-	}
-
-	CUtlVector<ParticleControlPoint_t>	pControlPoints;
-	CSmartPtr<CNewParticleEffect>		pParticleEffect;
-};
-
-extern int GetAttachTypeFromString(const char* pszString);
-
-class CParticleProperty
-{
-	DECLARE_CLASS_NOBASE(CParticleProperty);
-	DECLARE_EMBEDDED_NETWORKVAR();
-	DECLARE_PREDICTABLE();
-	DECLARE_DATADESC();
-
-public:
-	CParticleProperty();
-	~CParticleProperty();
-
-	void				Init(CBaseEntity* pEntity);
-	CBaseEntity* GetOuter(void) { return m_pOuter; }
-
-	CNewParticleEffect* Create(const char* pszParticleName, ParticleAttachment_t iAttachType, const char* pszAttachmentName);
-	CNewParticleEffect* Create(const char* pszParticleName, ParticleAttachment_t iAttachType, int iAttachmentPoint = INVALID_PARTICLE_ATTACHMENT, Vector vecOriginOffset = vec3_origin);
-	void				AddControlPoint(CNewParticleEffect* pEffect, int iPoint, C_BaseEntity* pEntity, ParticleAttachment_t iAttachType, const char* pszAttachmentName = NULL, Vector vecOriginOffset = vec3_origin);
-	void				AddControlPoint(int iEffectIndex, int iPoint, C_BaseEntity* pEntity, ParticleAttachment_t iAttachType, int iAttachmentPoint = INVALID_PARTICLE_ATTACHMENT, Vector vecOriginOffset = vec3_origin);
-
-	inline void			SetControlPointParent(CNewParticleEffect* pEffect, int whichControlPoint, int parentIdx);
-	void				SetControlPointParent(int iEffectIndex, int whichControlPoint, int parentIdx);
-
-	void				StopEmission(CNewParticleEffect* pEffect = NULL, bool bWakeOnStop = false, bool bDestroyAsleepSystems = false);
-	void				StopEmissionAndDestroyImmediately(CNewParticleEffect* pEffect = NULL);
-
-	void				StopParticlesInvolving(CBaseEntity* pEntity);
-	void				StopParticlesNamed(const char* pszEffectName, bool bForceRemoveInstantly = false);         
-	void				StopParticlesWithNameAndAttachment(const char* pszEffectName, int iAttachmentPoint, bool bForceRemoveInstantly = false);         
-
-	void				OnParticleSystemUpdated(CNewParticleEffect* pEffect, float flTimeDelta);
-	void				OnParticleSystemDeleted(CNewParticleEffect* pEffect);
-
-#ifdef CLIENT_DLL
-	void				OwnerSetDormantTo(bool bDormant);
-#endif
-
-	void				ReplaceParticleEffect(CNewParticleEffect* pOldEffect, CNewParticleEffect* pNewEffect);
-
-	void				DebugPrintEffects(void);
-
-	int					FindEffect(const char* pEffectName, int nStart = 0);
-	inline CNewParticleEffect* GetParticleEffectFromIdx(int idx);
-
-private:
-	int					GetParticleAttachment(C_BaseEntity* pEntity, const char* pszAttachmentName, const char* pszParticleName);
-	int					FindEffect(CNewParticleEffect* pEffect);
-	void				UpdateParticleEffect(ParticleEffectList_t* pEffect, bool bInitializing = false, int iOnlyThisControlPoint = -1);
-	void				UpdateControlPoint(ParticleEffectList_t* pEffect, int iPoint, bool bInitializing);
-
-private:
-	CBaseEntity* m_pOuter;
-	CUtlVector<ParticleEffectList_t>	m_ParticleEffects;
-	int			m_iDormancyChangedAtFrame;
-
-	friend class CBaseEntity;
-};
-
-#include "particle_property_inlines.h"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/particle_property_inlines.h b/SpyCustom/particle_property_inlines.h
deleted file mode 100644
index 95ba40d..0000000
--- a/SpyCustom/particle_property_inlines.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef PARTICLEPROPERTY_H
-#pragma message("Do not include particle_property_inlines.h from anywhere other than particle_property.h!")
-#pragma error
-#endif
-
-#ifndef PARTICLEPROPERTY_INLINES_H
-#define PARTICLEPROPERTY_INLINES_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-void CParticleProperty::SetControlPointParent(CNewParticleEffect* pEffect, int whichControlPoint, int parentIdx)
-{
-	pEffect->SetControlPointParent(whichControlPoint, parentIdx);
-}
-
-CNewParticleEffect* CParticleProperty::GetParticleEffectFromIdx(int idx)
-{
-	return m_ParticleEffects[idx].pParticleEffect.GetObject();
-}
-
-
-
-#endif   
\ No newline at end of file
diff --git a/SpyCustom/particle_util.h b/SpyCustom/particle_util.h
deleted file mode 100644
index 003c514..0000000
--- a/SpyCustom/particle_util.h
+++ /dev/null
@@ -1,289 +0,0 @@
-#ifndef PARTICLE_UTIL_H
-#define PARTICLE_UTIL_H
-
-#include "IMesh.h"
-#include "particledraw.h"
-#include "particlemgr.h"
-#include "cdll_client_int.h"
-#include "timedevent.h"
-
-
-
-inline float FLerp(float minVal, float maxVal, float t)
-{
-	return minVal + (maxVal - minVal) * t;
-}
-
-inline Vector VecLerp(const Vector& minVal, const Vector& maxVal, float t)
-{
-	return minVal + (maxVal - minVal) * t;
-}
-
-inline float FRand(float minVal, float maxVal)
-{
-	return minVal + ((float)rand() / RAND_MAX) * (maxVal - minVal);
-}
-
-inline void PhysicallySimulate(Vector& pos, Vector& velocity, const Vector& acceleration, const float fTimeDelta)
-{
-	pos = pos + (velocity + (acceleration * fTimeDelta * 0.5f)) * fTimeDelta;
-	velocity = velocity + acceleration * fTimeDelta;
-}
-
-
-inline Vector GetGravityVector()
-{
-	return Vector(0, 0, -150);
-}
-
-
-inline void RenderParticle_Color255SizeSpecularTCoord3(
-	ParticleDraw* pDraw,
-	const Vector& pos,
-	const Vector& color,
-	const float alpha,
-	const float size,
-	const unsigned char* specular,
-	const float tCoord
-)
-{
-	if (alpha < 0.5f)
-		return;
-
-	CMeshBuilder* pBuilder = pDraw->GetMeshBuilder();
-	if (!pBuilder)
-		return;
-
-	unsigned char ubColor[4];
-	ubColor[0] = (unsigned char)RoundFloatToInt(color.x);
-	ubColor[1] = (unsigned char)RoundFloatToInt(color.y);
-	ubColor[2] = (unsigned char)RoundFloatToInt(color.z);
-	ubColor[3] = (unsigned char)RoundFloatToInt(alpha);
-
-	pBuilder->Position3f(pos.x - size, pos.y - size, pos.z);
-	pBuilder->Color4ubv(ubColor);
-	pBuilder->TexCoord3f(0, pDraw->m_pSubTexture->m_tCoordMins[0], pDraw->m_pSubTexture->m_tCoordMaxs[1], tCoord);
-	pBuilder->Specular3ubv(specular);
-	pBuilder->AdvanceVertex();
-
-	pBuilder->Position3f(pos.x - size, pos.y + size, pos.z);
-	pBuilder->Color4ubv(ubColor);
-	pBuilder->TexCoord3f(0, pDraw->m_pSubTexture->m_tCoordMins[0], pDraw->m_pSubTexture->m_tCoordMins[1], tCoord);
-	pBuilder->Specular3ubv(specular);
-	pBuilder->AdvanceVertex();
-
-	pBuilder->Position3f(pos.x + size, pos.y + size, pos.z);
-	pBuilder->Color4ubv(ubColor);
-	pBuilder->TexCoord3f(0, pDraw->m_pSubTexture->m_tCoordMaxs[0], pDraw->m_pSubTexture->m_tCoordMins[1], tCoord);
-	pBuilder->Specular3ubv(specular);
-	pBuilder->AdvanceVertex();
-
-	pBuilder->Position3f(pos.x + size, pos.y - size, pos.z);
-	pBuilder->Color4ubv(ubColor);
-	pBuilder->TexCoord3f(0, pDraw->m_pSubTexture->m_tCoordMaxs[0], pDraw->m_pSubTexture->m_tCoordMaxs[1], tCoord);
-	pBuilder->Specular3ubv(specular);
-	pBuilder->AdvanceVertex();
-}
-
-
-inline void RenderParticle_Color255Size(
-	ParticleDraw* pDraw,
-	const Vector& pos,
-	const Vector& color,
-	const float alpha,
-	const float size)
-{
-	if (alpha < 0.5f)
-		return;
-
-	CMeshBuilder* pBuilder = pDraw->GetMeshBuilder();
-	if (!pBuilder)
-		return;
-
-	unsigned char ubColor[4];
-	ubColor[0] = (unsigned char)RoundFloatToInt(color.x);
-	ubColor[1] = (unsigned char)RoundFloatToInt(color.y);
-	ubColor[2] = (unsigned char)RoundFloatToInt(color.z);
-	ubColor[3] = (unsigned char)RoundFloatToInt(alpha);
-
-	pBuilder->Position3f(pos.x - size, pos.y - size, pos.z);
-	pBuilder->Color4ubv(ubColor);
-	pBuilder->TexCoord2f(0, pDraw->m_pSubTexture->m_tCoordMins[0], pDraw->m_pSubTexture->m_tCoordMaxs[1]);
-	pBuilder->AdvanceVertex();
-
-	pBuilder->Position3f(pos.x - size, pos.y + size, pos.z);
-	pBuilder->Color4ubv(ubColor);
-	pBuilder->TexCoord2f(0, pDraw->m_pSubTexture->m_tCoordMins[0], pDraw->m_pSubTexture->m_tCoordMins[1]);
-	pBuilder->AdvanceVertex();
-
-	pBuilder->Position3f(pos.x + size, pos.y + size, pos.z);
-	pBuilder->Color4ubv(ubColor);
-	pBuilder->TexCoord2f(0, pDraw->m_pSubTexture->m_tCoordMaxs[0], pDraw->m_pSubTexture->m_tCoordMins[1]);
-	pBuilder->AdvanceVertex();
-
-	pBuilder->Position3f(pos.x + size, pos.y - size, pos.z);
-	pBuilder->Color4ubv(ubColor);
-	pBuilder->TexCoord2f(0, pDraw->m_pSubTexture->m_tCoordMaxs[0], pDraw->m_pSubTexture->m_tCoordMaxs[1]);
-	pBuilder->AdvanceVertex();
-}
-
-
-inline void RenderParticle_Color255SizeNormal(
-	ParticleDraw* pDraw,
-	const Vector& pos,
-	const Vector& color,
-	const float alpha,
-	const float size,
-	const Vector& vNormal)
-{
-	if (alpha < 0.5f)
-		return;
-
-	CMeshBuilder* pBuilder = pDraw->GetMeshBuilder();
-	if (!pBuilder)
-		return;
-
-	unsigned char ubColor[4];
-	ubColor[0] = (unsigned char)RoundFloatToInt(color.x);
-	ubColor[1] = (unsigned char)RoundFloatToInt(color.y);
-	ubColor[2] = (unsigned char)RoundFloatToInt(color.z);
-	ubColor[3] = (unsigned char)RoundFloatToInt(alpha);
-
-}
-
-
-inline void RenderParticle_Color255SizeNormalAngle(
-	ParticleDraw* pDraw,
-	const Vector& pos,
-	const Vector& color,
-	const float alpha,
-	const float size,
-	const Vector& vNormal,
-	const float angle)
-{
-	if (alpha < 0.5f)
-		return;
-
-	CMeshBuilder* pBuilder = pDraw->GetMeshBuilder();
-	if (!pBuilder)
-		return;
-
-	unsigned char ubColor[4];
-	ubColor[0] = (unsigned char)RoundFloatToInt(color.x);
-	ubColor[1] = (unsigned char)RoundFloatToInt(color.y);
-	ubColor[2] = (unsigned char)RoundFloatToInt(color.z);
-	ubColor[3] = (unsigned char)RoundFloatToInt(alpha);
-
-	float ca = (float)cos(angle);
-	float sa = (float)sin(angle);
-
-}
-
-
-inline void RenderParticle_ColorSize(
-	ParticleDraw* pDraw,
-	const Vector& pos,
-	const Vector& color,
-	const float alpha,
-	const float size
-)
-{
-	if (alpha < 0.001f)
-		return;
-
-	CMeshBuilder* pBuilder = pDraw->GetMeshBuilder();
-	if (!pBuilder)
-		return;
-
-	unsigned char ubColor[4];
-	ubColor[0] = (unsigned char)RoundFloatToInt(color.x * 254.9f);
-	ubColor[1] = (unsigned char)RoundFloatToInt(color.y * 254.9f);
-	ubColor[2] = (unsigned char)RoundFloatToInt(color.z * 254.9f);
-	ubColor[3] = (unsigned char)RoundFloatToInt(alpha * 254.9f);
-
-}
-
-
-inline void RenderParticle_ColorSizeAngle(
-	ParticleDraw* pDraw,
-	const Vector& pos,
-	const Vector& color,
-	const float alpha,
-	const float size,
-	const float angle)
-{
-	if (alpha < 0.001f)
-		return;
-
-	CMeshBuilder* pBuilder = pDraw->GetMeshBuilder();
-	if (!pBuilder)
-		return;
-
-	unsigned char ubColor[4];
-	ubColor[0] = (unsigned char)RoundFloatToInt(color.x * 254.9f);
-	ubColor[1] = (unsigned char)RoundFloatToInt(color.y * 254.9f);
-	ubColor[2] = (unsigned char)RoundFloatToInt(color.z * 254.9f);
-	ubColor[3] = (unsigned char)RoundFloatToInt(alpha * 254.9f);
-
-	float sa, ca;
-	SinCos(angle, &sa, &ca);
-
-}
-
-inline void RenderParticle_ColorSizeAngles(
-	ParticleDraw* pDraw,
-	const Vector& pos,
-	const Vector& color,
-	const float alpha,
-	const float size,
-	const QAngle& angles)
-{
-	if (alpha < 0.001f)
-		return;
-
-	CMeshBuilder* pBuilder = pDraw->GetMeshBuilder();
-	if (!pBuilder)
-		return;
-
-	unsigned char ubColor[4];
-	ubColor[0] = (unsigned char)RoundFloatToInt(color.x * 254.9f);
-	ubColor[1] = (unsigned char)RoundFloatToInt(color.y * 254.9f);
-	ubColor[2] = (unsigned char)RoundFloatToInt(color.z * 254.9f);
-	ubColor[3] = (unsigned char)RoundFloatToInt(alpha * 254.9f);
-
-	Vector vNorm, vWidth, vHeight;
-	AngleVectors(angles, &vNorm, &vWidth, &vHeight);
-
-	Vector vVertex = pos;
-}
-
-inline float GetAlphaDistanceFade(
-	const Vector& pos,
-	const float fadeNearDist,
-	const float fadeFarDist)
-{
-	if (-pos.z > fadeFarDist)
-	{
-		return 1;
-	}
-	else if (-pos.z > fadeNearDist)
-	{
-		return (-pos.z - fadeNearDist) / (fadeFarDist - fadeNearDist);
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-
-inline Vector WorldGetLightForPoint(const Vector& vPos, bool bClamp)
-{
-#if defined(PARTICLEPROTOTYPE_APP)
-	return Vector(1, 1, 1);
-#else
-	return engine->GetLightForPoint(vPos, bClamp);
-#endif
-}
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/particledraw.h b/SpyCustom/particledraw.h
deleted file mode 100644
index f72b908..0000000
--- a/SpyCustom/particledraw.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef PARTICLEDRAW_H
-#define PARTICLEDRAW_H
-
-
-class IMaterial;
-class CMeshBuilder;
-class CParticleSubTexture;
-
-
-class ParticleDraw
-{
-	friend class CParticleEffectBinding;
-
-public:
-
-	ParticleDraw();
-
-	void			Init(CMeshBuilder* pMeshBuilder, IMaterial* pMaterial, float fTimeDelta);
-
-	float			GetTimeDelta() const;
-
-	CMeshBuilder* GetMeshBuilder();
-
-	CParticleSubTexture* m_pSubTexture;
-
-private:
-	CMeshBuilder* m_pMeshBuilder;
-	IMaterial* m_pMaterial;
-	float			m_fTimeDelta;
-};
-
-
-
-inline ParticleDraw::ParticleDraw()
-{
-	m_pMaterial = 0;
-}
-
-inline void ParticleDraw::Init(CMeshBuilder* pMeshBuilder, IMaterial* pMaterial, float fTimeDelta)
-{
-	m_pMeshBuilder = pMeshBuilder;
-	m_pMaterial = pMaterial;
-	m_fTimeDelta = fTimeDelta;
-}
-
-inline float ParticleDraw::GetTimeDelta() const
-{
-	return m_fTimeDelta;
-}
-
-inline CMeshBuilder* ParticleDraw::GetMeshBuilder()
-{
-	return m_pMeshBuilder;
-}
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/particlemgr.h b/SpyCustom/particlemgr.h
deleted file mode 100644
index 0b12d4b..0000000
--- a/SpyCustom/particlemgr.h
+++ /dev/null
@@ -1,617 +0,0 @@
-
-#ifndef PARTICLEMGR_H
-#define PARTICLEMGR_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "imaterial.h"
-#include "imaterialsystem.h"
-#include "vector.h"
-#include "vmatrix.h"
-#include "Mathlib.h"
-#include "iclientrenderable.h"
-#include "clientleafsystem.h"
-#include "fasttimer.h"
-#include "utllinkedlist.h"
-#include "UtlDict.h"
-#ifdef WIN32
-#include <typeinfo>
-#else
-#include <typeinfo>
-#endif
-#include "utlintrusivelist.h"
-#include "utlobjectreference.h"
-#include "utlstring.h"
-
-
-class IParticleEffect;
-class IClientParticleListener;
-struct Particle;
-class ParticleDraw;
-class CMeshBuilder;
-class CUtlMemoryPool;
-class CEffectMaterial;
-class CParticleSimulateIterator;
-class CParticleRenderIterator;
-class IThreadPool;
-class CParticleSystemDefinition;
-class CParticleMgr;
-class CNewParticleEffect;
-class CParticleCollection;
-
-#define INVALID_MATERIAL_HANDLE	NULL
-
-
-
-class CParticleSubTexture;
-class CParticleSubTextureGroup;
-
-
-struct Particle
-{
-	Particle* m_pPrev, * m_pNext;
-
-	CParticleSubTexture* m_pSubTexture;
-
-	Vector m_Pos;			       
-};
-
-
-typedef CParticleSubTexture* PMaterialHandle;
-
-class CEffectMaterial
-{
-public:
-	CEffectMaterial();
-
-public:
-	CParticleSubTextureGroup* m_pGroup;
-
-	Particle m_Particles;
-	CEffectMaterial* m_pHashedNext;
-};
-
-
-class CParticleSubTextureGroup
-{
-public:
-	CParticleSubTextureGroup();
-	~CParticleSubTextureGroup();
-
-	IMaterial* m_pPageMaterial;
-};
-
-class CParticleSubTexture
-{
-public:
-	CParticleSubTexture();
-
-	float m_tCoordMins[2];	         
-	float m_tCoordMaxs[2];	        
-
-	CParticleSubTextureGroup* m_pGroup;
-	CParticleSubTextureGroup m_DefaultGroup;	          
-#ifdef _DEBUG
-	char* m_szDebugName;
-#endif
-
-	IMaterial* m_pMaterial;
-};
-
-
-abstract_class IParticleEffect
-{
-	public:
-
-		virtual			~IParticleEffect() {}
-
-		virtual void	Update(float fTimeDelta) {}
-
-		virtual void	StartRender(VMatrix & effectMatrix) {}
-
-		virtual bool	ShouldSimulate() const = 0;
-		virtual void	SetShouldSimulate(bool bSim) = 0;
-		virtual void	SimulateParticles(CParticleSimulateIterator* pIterator) = 0;
-
-		virtual void	RenderParticles(CParticleRenderIterator* pIterator) = 0;
-
-		virtual void	NotifyRemove() {}
-
-		virtual void	NotifyDestroyParticle(Particle* pParticle) {}
-
-		virtual const Vector& GetSortOrigin() = 0;
-
-		virtual const Vector* GetParticlePosition(Particle* pParticle) { return &pParticle->m_Pos; }
-
-		virtual const char* GetEffectName() { return "???"; }
-};
-
-#define REGISTER_EFFECT( effect )														\
-	IParticleEffect* effect##_Factory()													\
-	{																					\
-		return new effect;																\
-	}																					\
-	struct effect##_RegistrationHelper													\
-	{																					\
-		effect##_RegistrationHelper()													\
-		{																				\
-			ParticleMgr()->RegisterEffect( typeid( effect ).name(), effect##_Factory );	\
-		}																				\
-	};																					\
-	static effect##_RegistrationHelper g_##effect##_RegistrationHelper
-
-#define REGISTER_EFFECT_USING_CREATE( effect )											\
-	IParticleEffect* effect##_Factory()													\
-	{																					\
-		return effect::Create( #effect ).GetObject();									\
-	}																					\
-	struct effect##_RegistrationHelper													\
-	{																					\
-		effect##_RegistrationHelper()													\
-		{																				\
-			ParticleMgr()->RegisterEffect( typeid( effect ).name(), effect##_Factory );	\
-		}																				\
-	};																					\
-	static effect##_RegistrationHelper g_##effect##_RegistrationHelper
-
-
-class CParticleEffectBinding : public CDefaultClientRenderable
-{
-	friend class CParticleMgr;
-	friend class CParticleSimulateIterator;
-	friend class CNewParticleEffect;
-
-public:
-	CParticleEffectBinding();
-	~CParticleEffectBinding();
-
-
-public:
-
-	void			SimulateParticles(float flTimeDelta);
-
-	PMaterialHandle	FindOrAddMaterial(const char* pMaterialName);
-
-	Particle* AddParticle(int sizeInBytes, PMaterialHandle pMaterial);
-
-	void			SetBBox(const Vector& bbMin, const Vector& bbMax, bool bDisableAutoUpdate = true);
-	void			GetWorldspaceBounds(Vector* pMins, Vector* pMaxs);
-
-	const matrix3x4_t& GetLocalSpaceTransform() const;
-	void			SetLocalSpaceTransform(const matrix3x4_t& transform);
-
-	bool			EnlargeBBoxToContain(const Vector& pt);
-
-	void			SetDrawThruLeafSystem(int bDraw);
-
-	void			SetDrawBeforeViewModel(int bDraw);
-
-	int				GetRemoveFlag() { return GetFlag(FLAGS_REMOVE); }
-	void			SetRemoveFlag() { SetFlag(FLAGS_REMOVE, 1); }
-
-	int				GetAlwaysSimulate() { return GetFlag(FLAGS_ALWAYSSIMULATE); }
-	void			SetAlwaysSimulate(int bAlwaysSimulate) { SetFlag(FLAGS_ALWAYSSIMULATE, bAlwaysSimulate); }
-
-	void			SetIsNewParticleSystem(void) { SetFlag(FLAGS_NEW_PARTICLE_SYSTEM, 1); }
-	int				WasDrawnPrevFrame() { return GetFlag(FLAGS_DRAWN_PREVFRAME); }
-	void			SetWasDrawnPrevFrame(int bWasDrawnPrevFrame) { SetFlag(FLAGS_DRAWN_PREVFRAME, bWasDrawnPrevFrame); }
-
-	int				IsEffectCameraSpace() { return GetFlag(FLAGS_CAMERASPACE); }
-	void			SetEffectCameraSpace(int bCameraSpace) { SetFlag(FLAGS_CAMERASPACE, bCameraSpace); }
-
-	int				GetAutoApplyLocalTransform() const { return GetFlag(FLAGS_AUTOAPPLYLOCALTRANSFORM); }
-	void			SetAutoApplyLocalTransform(int b) { SetFlag(FLAGS_AUTOAPPLYLOCALTRANSFORM, b); }
-
-	int				GetAutoUpdateBBox() { return GetFlag(FLAGS_AUTOUPDATEBBOX); }
-	void			SetAutoUpdateBBox(int bAutoUpdate) { SetFlag(FLAGS_AUTOUPDATEBBOX, bAutoUpdate); }
-
-	int				GetNumActiveParticles();
-
-	void			SetParticleCullRadius(float flMaxParticleRadius);
-
-	int				GetActiveParticleList(int nCount, Particle** ppParticleList);
-
-	void			DetectChanges();
-
-private:
-	void			SetFlag(int flag, int bOn) { if (bOn) m_Flags |= flag; else m_Flags &= ~flag; }
-	int				GetFlag(int flag) const { return m_Flags & flag; }
-
-	void			Init(CParticleMgr* pMgr, IParticleEffect* pSim);
-	void			Term();
-
-	void			RemoveParticle(Particle* pParticle);
-
-	void			StartDrawMaterialParticles(
-		CEffectMaterial* pMaterial,
-		float flTimeDelta,
-		IMesh*& pMesh,
-		CMeshBuilder& builder,
-		ParticleDraw& particleDraw,
-		bool bWireframe);
-
-	int				DrawMaterialParticles(
-		bool bBucketSort,
-		CEffectMaterial* pMaterial,
-		float flTimeDelta,
-		bool bWireframe
-	);
-
-	void			GrowBBoxFromParticlePositions(CEffectMaterial* pMaterial, bool& bboxSet, Vector& bbMin, Vector& bbMax);
-
-	void			RenderStart(VMatrix& mTempModel, VMatrix& mTempView);
-	void			RenderEnd(VMatrix& mModel, VMatrix& mView);
-
-	void			BBoxCalcStart(Vector& bbMin, Vector& bbMax);
-	void			BBoxCalcEnd(bool bboxSet, Vector& bbMin, Vector& bbMax);
-
-	void			DoBucketSort(
-		CEffectMaterial* pMaterial,
-		float* zCoords,
-		int nZCoords,
-		float minZ,
-		float maxZ);
-
-	int				GetRemovalInProgressFlag() { return GetFlag(FLAGS_REMOVALINPROGRESS); }
-	void			SetRemovalInProgressFlag() { SetFlag(FLAGS_REMOVALINPROGRESS, 1); }
-
-	int				GetNeedsBBoxUpdate() { return GetFlag(FLAGS_NEEDS_BBOX_UPDATE); }
-	void			SetNeedsBBoxUpdate(int bFirstUpdate) { SetFlag(FLAGS_NEEDS_BBOX_UPDATE, bFirstUpdate); }
-
-	int				GetFirstFrameFlag() { return GetFlag(FLAGS_FIRST_FRAME); }
-	void			SetFirstFrameFlag(int bFirstUpdate) { SetFlag(FLAGS_FIRST_FRAME, bFirstUpdate); }
-
-	int				WasDrawn() { return GetFlag(FLAGS_DRAWN); }
-	void			SetDrawn(int bDrawn) { SetFlag(FLAGS_DRAWN, bDrawn); }
-
-	bool			RecalculateBoundingBox();
-
-	CEffectMaterial* GetEffectMaterial(CParticleSubTexture* pSubTexture);
-
-public:
-
-	virtual const Vector& GetRenderOrigin(void);
-	virtual const QAngle& GetRenderAngles(void);
-	virtual const matrix3x4_t& RenderableToWorldTransform();
-	virtual void					GetRenderBounds(Vector& mins, Vector& maxs);
-	virtual bool					ShouldDraw(void);
-	virtual int						DrawModel(int flags, const RenderableInstance_t& instance);
-
-private:
-	enum
-	{
-		FLAGS_REMOVE = (1 << 0),	   
-		FLAGS_REMOVALINPROGRESS = (1 << 1),          
-											FLAGS_NEEDS_BBOX_UPDATE = (1 << 2),	           
-											FLAGS_AUTOUPDATEBBOX = (1 << 3),	      
-											FLAGS_ALWAYSSIMULATE = (1 << 4),   
-											FLAGS_DRAWN = (1 << 5),	          
-											FLAGS_DRAWN_PREVFRAME = (1 << 6),	         
-																				FLAGS_CAMERASPACE = (1 << 7),	  
-																				FLAGS_DRAW_THRU_LEAF_SYSTEM = (1 << 8),	             
-																				FLAGS_DRAW_BEFORE_VIEW_MODEL = (1 << 9),              
-																				FLAGS_AUTOAPPLYLOCALTRANSFORM = (1 << 10),         
-																				FLAGS_FIRST_FRAME = (1 << 11),	                
-																				FLAGS_NEW_PARTICLE_SYSTEM = (1 << 12)     
-	};
-
-
-	VMatrix m_LocalSpaceTransform;
-	bool m_bLocalSpaceTransformIdentity;	           
-
-	Vector							m_Min;
-	Vector							m_Max;
-
-	Vector							m_LastMin;
-	Vector							m_LastMax;
-
-	float							m_flParticleCullRadius;
-
-	unsigned short					m_nActiveParticles;
-
-	unsigned short					m_FrameCode;
-
-	unsigned short					m_ListIndex;
-
-	IParticleEffect* m_pSim;
-	CParticleMgr* m_pParticleMgr;
-
-	int								m_Flags;
-
-	enum { EFFECT_MATERIAL_HASH_SIZE = 8 };
-	CEffectMaterial* m_EffectMaterialHash[EFFECT_MATERIAL_HASH_SIZE];
-
-#ifdef INFESTED_PARTICLES
-public:
-#endif
-	CUtlLinkedList<CEffectMaterial*, unsigned short> m_Materials;
-
-	unsigned short					m_UpdateBBoxCounter;
-};
-
-
-class CParticleLightInfo
-{
-public:
-	Vector	m_vPos;
-	Vector	m_vColor;	 
-	float	m_flIntensity;
-};
-
-typedef IParticleEffect* (*CreateParticleEffectFN)();
-
-enum
-{
-	TOOLPARTICLESYSTEMID_INVALID = -1,
-};
-
-
-class CParticleCollection;
-
-class CNonDrawingParticleSystem
-{
-public:
-	CNonDrawingParticleSystem* m_pNext;
-	CNonDrawingParticleSystem* m_pPrev;
-	CParticleCollection* m_pSystem;
-
-	FORCEINLINE CParticleCollection* operator()(void) const
-	{
-		return m_pSystem;
-	}
-
-	FORCEINLINE CParticleCollection* Get(void) const
-	{
-		return m_pSystem;
-	}
-
-	~CNonDrawingParticleSystem(void);
-};
-
-
-
-
-class CClientTools;
-
-class CParticleMgr
-{
-	friend class CParticleEffectBinding;
-	friend class CParticleCollection;
-	friend class CNonDrawingParticleSystem;
-	friend class CClientTools;
-
-public:
-
-	CParticleMgr();
-	virtual			~CParticleMgr();
-
-	bool			Init(unsigned long nPreallocatedParticles, IMaterialSystem* pMaterial);
-
-	void			Term();
-
-	void			LevelInit();
-
-	void			RegisterEffect(const char* pEffectType, CreateParticleEffectFN func);
-	IParticleEffect* CreateEffect(const char* pEffectType);
-
-	bool			AddEffect(CParticleEffectBinding* pEffect, IParticleEffect* pSim);
-	void			RemoveEffect(CParticleEffectBinding* pEffect);
-
-	void			AddEffect(CNewParticleEffect* pEffect);
-	void			RemoveEffect(CNewParticleEffect* pEffect);
-
-	void			RemoveAllEffects();
-
-	void			IncrementFrameCode();
-
-	void			Simulate(float fTimeDelta);
-
-	void			PostRender();
-
-	void			DrawBeforeViewModelEffects();
-
-	VMatrix& GetModelView();
-
-	Particle* AllocParticle(int size);
-	void			FreeParticle(Particle*);
-
-	PMaterialHandle	GetPMaterial(const char* pMaterialName);
-	IMaterial* PMaterialToIMaterial(PMaterialHandle hMaterial);
-
-	void RepairPMaterial(PMaterialHandle hMaterial);
-
-	void GetDirectionalLightInfo(CParticleLightInfo& info) const;
-	void SetDirectionalLightInfo(const CParticleLightInfo& info);
-
-	void SpewInfo(bool bDetail);
-
-	void AddEffectListener(IClientParticleListener* pListener);
-	void RemoveEffectListener(IClientParticleListener* pListener);
-
-	int AllocateToolParticleEffectId();
-
-	void RemoveAllNewEffects();
-
-	CNewParticleEffect* FirstNewEffect();
-	CNewParticleEffect* NextNewEffect(CNewParticleEffect* pEffect);
-
-	void RenderParticleSystems(bool bEnable);
-	bool ShouldRenderParticleSystems() const;
-
-	void RemoveOldParticleEffects(float flTime);              
-	int GetNumParticles() const { return m_nCurrentParticlesAllocated; }
-
-
-	CNonDrawingParticleSystem* CreateNonDrawingEffect(const char* pEffectName);
-
-private:
-	struct RetireInfo_t
-	{
-		CParticleCollection* m_pCollection;
-		float m_flScreenArea;
-		bool m_bFirstFrame;
-	};
-
-	void UpdateAllEffects(float flTimeDelta);
-
-	void UpdateNewEffects(float flTimeDelta);				    
-
-	void SpewActiveParticleSystems();
-
-	CParticleSubTextureGroup* FindOrAddSubTextureGroup(IMaterial* pPageMaterial);
-
-	int ComputeParticleDefScreenArea(int nInfoCount, RetireInfo_t* pInfo, float* pTotalArea, CParticleSystemDefinition* pDef,
-		const CViewSetup& view, const VMatrix& worldToPixels, float flFocalDist);
-
-	bool RetireParticleCollections(CParticleSystemDefinition* pDef, int nCount, RetireInfo_t* pInfo, float flScreenArea, float flMaxTotalArea);
-	void BuildParticleSimList(CUtlVector< CNewParticleEffect* >& list);
-	bool EarlyRetireParticleSystems(int nCount, CNewParticleEffect** ppEffects);
-	static int RetireSort(const void* p1, const void* p2);
-
-private:
-
-	int m_nCurrentParticlesAllocated;
-
-	CParticleLightInfo m_DirectionalLight;
-
-	unsigned short					m_FrameCode;
-
-	bool							m_bUpdatingEffects;
-	bool							m_bRenderParticleEffects;
-
-	CUtlLinkedList<CParticleEffectBinding*, unsigned short>		m_Effects;
-
-	CUtlIntrusiveDList< CNewParticleEffect > m_NewEffects;
-	CUtlIntrusiveDList< CNonDrawingParticleSystem > m_NonDrawingParticleSystems;
-
-
-
-	CUtlVector< IClientParticleListener*> m_effectListeners;
-
-	IMaterialSystem* m_pMaterialSystem;
-
-	VMatrix							m_mModelView;
-
-	CUtlVector<CParticleSubTextureGroup*>				m_SubTextureGroups;	    
-	CUtlDict<CParticleSubTexture*, unsigned short>		m_SubTextures;		    
-	CParticleSubTexture m_DefaultInvalidSubTexture;         
-
-	CUtlMap< const char*, CreateParticleEffectFN > m_effectFactories;
-
-	int m_nToolParticleEffectId;
-
-	IThreadPool* m_pThreadPool[2];
-};
-
-inline int CParticleMgr::AllocateToolParticleEffectId()
-{
-	return m_nToolParticleEffectId++;
-}
-
-class IClientParticleListener
-{
-public:
-	virtual void OnParticleEffectAdded(IParticleEffect* pEffect) = 0;
-	virtual void OnParticleEffectRemoved(IParticleEffect* pEffect) = 0;
-};
-
-
-
-float	Helper_GetTime();
-float	Helper_GetFrameTime();
-float	Helper_RandomFloat(float minVal, float maxVal);
-int		Helper_RandomInt(int minVal, int maxVal);
-
-
-
-inline VMatrix& CParticleMgr::GetModelView()
-{
-	return m_mModelView;
-}
-
-
-
-inline const matrix3x4_t& CParticleEffectBinding::GetLocalSpaceTransform() const
-{
-	return m_LocalSpaceTransform.As3x4();
-}
-
-
-
-CParticleMgr* ParticleMgr();
-
-
-
-
-struct StandardParticle_t : public Particle
-{
-	void			SetColor(float r, float g, float b);
-	void			SetAlpha(float a);
-
-	Vector			m_Velocity;
-
-	float			m_Lifetime;
-
-	unsigned char	m_EffectData;	            
-	unsigned short	m_EffectDataWord;
-
-	unsigned char	m_Color[4];		         
-};
-
-
-inline void TransformParticle(const VMatrix& vMat, const Vector& vIn, Vector& vOut)
-{
-	vOut.x = vMat.m[0][0] * vIn.x + vMat.m[0][1] * vIn.y + vMat.m[0][2] * vIn.z + vMat.m[0][3];
-	vOut.y = vMat.m[1][0] * vIn.x + vMat.m[1][1] * vIn.y + vMat.m[1][2] * vIn.z + vMat.m[1][3];
-	vOut.z = vMat.m[2][0] * vIn.x + vMat.m[2][1] * vIn.y + vMat.m[2][2] * vIn.z + vMat.m[2][3];
-}
-
-
-inline void StandardParticle_t::SetColor(float r, float g, float b)
-{
-	m_Color[0] = (unsigned char)(r * 255.9f);
-	m_Color[1] = (unsigned char)(g * 255.9f);
-	m_Color[2] = (unsigned char)(b * 255.9f);
-}
-
-inline void StandardParticle_t::SetAlpha(float a)
-{
-	m_Color[3] = (unsigned char)(a * 255.9f);
-}
-
-
-
-inline void UnlinkParticle(Particle* pParticle)
-{
-	pParticle->m_pPrev->m_pNext = pParticle->m_pNext;
-	pParticle->m_pNext->m_pPrev = pParticle->m_pPrev;
-}
-
-inline void InsertParticleBefore(Particle* pInsert, Particle* pNext)
-{
-	pInsert->m_pNext = pNext;
-	pInsert->m_pPrev = pNext->m_pPrev;
-	pInsert->m_pNext->m_pPrev = pInsert->m_pPrev->m_pNext = pInsert;
-}
-
-inline void InsertParticleAfter(Particle* pInsert, Particle* pPrev)
-{
-	pInsert->m_pPrev = pPrev;
-	pInsert->m_pNext = pPrev->m_pNext;
-
-	pInsert->m_pNext->m_pPrev = pInsert->m_pPrev->m_pNext = pInsert;
-}
-
-inline void SwapParticles(Particle* pPrev, Particle* pCur)
-{
-	UnlinkParticle(pCur);
-	InsertParticleBefore(pCur, pPrev);
-}
-
-
-#include "particle_iterators.h"
-
-
-#endif
diff --git a/SpyCustom/particles.h b/SpyCustom/particles.h
deleted file mode 100644
index be72c49..0000000
--- a/SpyCustom/particles.h
+++ /dev/null
@@ -1,1954 +0,0 @@
-#ifndef PARTICLES_H
-#define PARTICLES_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "mathlib.h"
-#include "vector.h"
-#include "ssemath.h"
-#include "imaterialsystem.h"
-#include "dmxelement.h"
-#include "utlintrusivelist.h"
-#include "random.h"
-#include "utlobjectreference.h"
-#include "UtlStringMap.h"
-#include "utlmap.h"
-#include "MaterialSystemUtil.h"
-#include "trace.h"
-#include "utlsoacontainer.h"
-
-#if defined( CLIENT_DLL )
-#include "c_pixel_visibility.h"
-#endif
-
-struct DmxElementUnpackStructure_t;
-class CParticleSystemDefinition;
-class CParticleCollection;
-class CParticleOperatorInstance;
-class CParticleSystemDictionary;
-class CUtlBuffer;
-class IParticleOperatorDefinition;
-class CSheet;
-class CMeshBuilder;
-extern float s_pRandomFloats[];
-
-
-#define MAX_RANDOM_FLOATS 4096
-#define RANDOM_FLOAT_MASK ( MAX_RANDOM_FLOATS - 1 )
-
-
-#define MAX_PARTICLE_ATTRIBUTES 32
-
-#define DEFPARTICLE_ATTRIBUTE( name, bit )						\
-	const int PARTICLE_ATTRIBUTE_##name##_MASK = (1 << bit);	\
-	const int PARTICLE_ATTRIBUTE_##name = bit;
-
-DEFPARTICLE_ATTRIBUTE(XYZ, 0);
-
-DEFPARTICLE_ATTRIBUTE(LIFE_DURATION, 1);
-
-DEFPARTICLE_ATTRIBUTE(PREV_XYZ, 2);
-
-DEFPARTICLE_ATTRIBUTE(RADIUS, 3);
-
-DEFPARTICLE_ATTRIBUTE(ROTATION, 4);
-
-DEFPARTICLE_ATTRIBUTE(ROTATION_SPEED, 5);
-
-DEFPARTICLE_ATTRIBUTE(TINT_RGB, 6);
-
-DEFPARTICLE_ATTRIBUTE(ALPHA, 7);
-
-DEFPARTICLE_ATTRIBUTE(CREATION_TIME, 8);
-
-DEFPARTICLE_ATTRIBUTE(SEQUENCE_NUMBER, 9);
-
-DEFPARTICLE_ATTRIBUTE(TRAIL_LENGTH, 10);
-
-DEFPARTICLE_ATTRIBUTE(PARTICLE_ID, 11);
-
-DEFPARTICLE_ATTRIBUTE(YAW, 12);
-
-DEFPARTICLE_ATTRIBUTE(SEQUENCE_NUMBER1, 13);
-
-DEFPARTICLE_ATTRIBUTE(HITBOX_INDEX, 14);
-
-DEFPARTICLE_ATTRIBUTE(HITBOX_RELATIVE_XYZ, 15);
-
-DEFPARTICLE_ATTRIBUTE(ALPHA2, 16);
-
-DEFPARTICLE_ATTRIBUTE(TRACE_P0, 17);						    
-DEFPARTICLE_ATTRIBUTE(TRACE_P1, 18);						    
-DEFPARTICLE_ATTRIBUTE(TRACE_HIT_T, 19);					   
-DEFPARTICLE_ATTRIBUTE(TRACE_HIT_NORMAL, 20);				      
-
-
-#define MAX_PARTICLE_CONTROL_POINTS 64
-
-#define ATTRIBUTES_WHICH_ARE_VEC3S_MASK ( PARTICLE_ATTRIBUTE_TRACE_P0_MASK | PARTICLE_ATTRIBUTE_TRACE_P1_MASK | \
-										  PARTICLE_ATTRIBUTE_TRACE_HIT_NORMAL | PARTICLE_ATTRIBUTE_XYZ_MASK | \
-                                          PARTICLE_ATTRIBUTE_PREV_XYZ_MASK | PARTICLE_ATTRIBUTE_TINT_RGB_MASK | \
-                                          PARTICLE_ATTRIBUTE_HITBOX_RELATIVE_XYZ_MASK )
-#define ATTRIBUTES_WHICH_ARE_0_TO_1 (PARTICLE_ATTRIBUTE_ALPHA_MASK | PARTICLE_ATTRIBUTE_ALPHA2_MASK)
-#define ATTRIBUTES_WHICH_ARE_ANGLES (PARTICLE_ATTRIBUTE_ROTATION_MASK | PARTICLE_ATTRIBUTE_YAW_MASK )
-#define ATTRIBUTES_WHICH_ARE_INTS (PARTICLE_ATTRIBUTE_PARTICLE_ID_MASK | PARTICLE_ATTRIBUTE_HITBOX_INDEX_MASK )
-
-#if defined( _X360 )
-#define MAX_PARTICLES_IN_A_SYSTEM 2000
-#else
-#define MAX_PARTICLES_IN_A_SYSTEM 5000
-#endif
-
-#define MEASURE_PARTICLE_PERF 0
-
-
-enum ParticleFunctionType_t
-{
-	FUNCTION_RENDERER = 0,
-	FUNCTION_OPERATOR,
-	FUNCTION_INITIALIZER,
-	FUNCTION_EMITTER,
-	FUNCTION_CHILDREN,	                     
-	FUNCTION_FORCEGENERATOR,
-	FUNCTION_CONSTRAINT,
-	PARTICLE_FUNCTION_COUNT
-};
-
-struct CParticleVisibilityInputs
-{
-	float	m_flCameraBias;
-	float	m_flInputMin;
-	float	m_flInputMax;
-	float	m_flAlphaScaleMin;
-	float	m_flAlphaScaleMax;
-	float	m_flRadiusScaleMin;
-	float	m_flRadiusScaleMax;
-	float	m_flProxyRadius;
-	float	m_flBBoxScale;
-	bool	m_bUseBBox;
-	int		m_nCPin;
-};
-
-struct ModelHitBoxInfo_t
-{
-	Vector m_vecBoxMins;
-	Vector m_vecBoxMaxes;
-	matrix3x4_t m_Transform;
-};
-
-class CModelHitBoxesInfo
-{
-public:
-	float m_flLastUpdateTime;
-	float m_flPrevLastUpdateTime;
-	int m_nNumHitBoxes;
-	int m_nNumPrevHitBoxes;
-	ModelHitBoxInfo_t* m_pHitBoxes;
-	ModelHitBoxInfo_t* m_pPrevBoxes;
-
-	bool CurAndPrevValid(void) const
-	{
-		return (m_nNumHitBoxes && (m_nNumPrevHitBoxes == m_nNumHitBoxes));
-	}
-
-	CModelHitBoxesInfo(void)
-	{
-		m_flLastUpdateTime = -1;
-		m_nNumHitBoxes = 0;
-		m_nNumPrevHitBoxes = 0;
-		m_pHitBoxes = NULL;
-		m_pPrevBoxes = NULL;
-	}
-
-	~CModelHitBoxesInfo(void)
-	{
-		if (m_pHitBoxes)
-			delete[] m_pHitBoxes;
-		if (m_pPrevBoxes)
-			delete[] m_pPrevBoxes;
-	}
-
-};
-
-
-
-
-#define PARTICLE_SYSTEM_QUERY_INTERFACE_VERSION "VParticleSystemQuery001"
-
-class IParticleSystemQuery : public IAppSystem
-{
-public:
-	virtual void GetLightingAtPoint(const Vector& vecOrigin, Color& tint) = 0;
-	virtual void TraceLine(const Vector& vecAbsStart,
-		const Vector& vecAbsEnd, unsigned int mask,
-		const class IHandleEntity* ignore,
-		int collisionGroup,
-		CBaseTrace* ptr) = 0;
-
-	virtual bool MovePointInsideControllingObject(CParticleCollection* pParticles,
-		void* pObject,
-		Vector* pPnt)
-	{
-		return true;
-	}
-
-	virtual	bool IsPointInControllingObjectHitBox(
-		CParticleCollection* pParticles,
-		int nControlPointNumber, Vector vecPos, bool bBBoxOnly = false)
-	{
-		return true;
-	}
-
-	virtual int GetCollisionGroupFromName(const char* pszCollisionGroupName)
-	{
-		return 0;											  
-	}
-
-	virtual void GetRandomPointsOnControllingObjectHitBox(
-		CParticleCollection* pParticles,
-		int nControlPointNumber,
-		int nNumPtsOut,
-		float flBBoxScale,
-		int nNumTrysToGetAPointInsideTheModel,
-		Vector* pPntsOut,
-		Vector vecDirectionBias,
-		Vector* pHitBoxRelativeCoordOut = NULL,
-		int* pHitBoxIndexOut = NULL) = 0;
-
-
-	virtual int GetControllingObjectHitBoxInfo(
-		CParticleCollection* pParticles,
-		int nControlPointNumber,
-		int nBufSize,										     
-		ModelHitBoxInfo_t* pHitBoxOutputBuffer)
-	{
-		return 0;
-	}
-
-	virtual Vector GetLocalPlayerPos(void)
-	{
-		return vec3_origin;
-	}
-
-	virtual void GetLocalPlayerEyeVectors(Vector* pForward, Vector* pRight = NULL, Vector* pUp = NULL)
-	{
-		*pForward = vec3_origin;
-		*pRight = vec3_origin;
-		*pUp = vec3_origin;
-	}
-
-	virtual float GetPixelVisibility(int* pQueryHandle, const Vector& vecOrigin, float flScale) = 0;
-
-	virtual void SetUpLightingEnvironment(const Vector& pos)
-	{
-	}
-};
-
-
-typedef int ParticleSystemHandle_t;
-
-class CParticleSystemMgr
-{
-public:
-	CParticleSystemMgr();
-	~CParticleSystemMgr();
-
-	bool Init(IParticleSystemQuery* pQuery);
-
-	void AddBuiltinSimulationOperators(void);
-	void AddBuiltinRenderingOperators(void);
-
-
-
-	void AddParticleOperator(ParticleFunctionType_t nOpType, IParticleOperatorDefinition* pOpFactory);
-
-	bool ReadParticleConfigFile(const char* pFileName, bool bPrecache, bool bDecommitTempMemory = true);
-	bool ReadParticleConfigFile(CUtlBuffer& buf, bool bPrecache, bool bDecommitTempMemory = true, const char* pFileName = NULL);
-	void DecommitTempMemory();
-
-	bool WriteParticleConfigFile(const char* pParticleSystemName, CUtlBuffer& buf, bool bPreventNameBasedLookup = false);
-	bool WriteParticleConfigFile(const DmObjectId_t& id, CUtlBuffer& buf, bool bPreventNameBasedLookup = false);
-
-	CParticleCollection* CreateParticleCollection(const char* pParticleSystemName, float flDelay = 0.0f, int nRandomSeed = 0);
-
-	CParticleCollection* CreateParticleCollection(const DmObjectId_t& id, float flDelay = 0.0f, int nRandomSeed = 0);
-
-	bool IsParticleSystemDefined(const char* pParticleSystemName);
-	bool IsParticleSystemDefined(const DmObjectId_t& id);
-
-	ParticleSystemHandle_t GetParticleSystemIndex(const char* pParticleSystemName);
-
-	const char* GetParticleSystemNameFromIndex(ParticleSystemHandle_t iIndex);
-
-	int GetParticleSystemCount(void);
-
-	CUtlVector< IParticleOperatorDefinition*>& GetAvailableParticleOperatorList(ParticleFunctionType_t nWhichList);
-
-	const DmxElementUnpackStructure_t* GetParticleSystemDefinitionUnpackStructure();
-
-	void ShouldLoadSheets(bool bLoadSheets);
-	CSheet* FindOrLoadSheet(char const* pszFname, ITexture* pTexture);
-	CSheet* FindOrLoadSheet(IMaterial* pMaterial);
-	void FlushAllSheets(void);
-
-
-	void ResetRenderCache(void);
-	void AddToRenderCache(CParticleCollection* pParticles);
-	void DrawRenderCache(bool bShadowDepth);
-
-	IParticleSystemQuery* Query(void) { return m_pQuery; }
-
-	const char* GetParticleFieldName(int nParticleField) const;
-
-	CParticleSystemDefinition* FindParticleSystem(const char* pName);
-	CParticleSystemDefinition* FindParticleSystem(const DmObjectId_t& id);
-
-	void CommitProfileInformation(bool bCommit);			      
-
-	void DumpProfileInformation(void);					  
-
-	void PrecacheParticleSystem(const char* pName);
-	void UncacheAllParticleSystems();
-
-	void SetLastSimulationTime(float flTime);
-	float GetLastSimulationTime() const;
-
-	int Debug_GetTotalParticleCount() const;
-	bool Debug_FrameWarningNeededTestAndReset();
-	float ParticleThrottleScaling() const;		            
-	bool ParticleThrottleRandomEnable() const;	            
-
-	void TallyParticlesRendered(int nVertexCount, int nIndexCount = 0);
-
-private:
-	struct RenderCache_t
-	{
-		IMaterial* m_pMaterial;
-		CUtlVector< CParticleCollection* > m_ParticleCollections;
-	};
-
-	struct BatchStep_t
-	{
-		CParticleCollection* m_pParticles;
-		CParticleOperatorInstance* m_pRenderer;
-		void* m_pContext;
-		int m_nFirstParticle;
-		int m_nParticleCount;
-		int m_nVertCount;
-	};
-
-	struct Batch_t
-	{
-		int m_nVertCount;
-		int m_nIndexCount;
-		CUtlVector< BatchStep_t > m_BatchStep;
-	};
-
-	bool ReadParticleDefinitions(CUtlBuffer& buf, const char* pFileName, bool bPrecache, bool bDecommitTempMemory);
-	void AddParticleSystem(CDmxElement* pParticleSystem);
-
-	CDmxElement* CreateParticleDmxElement(const DmObjectId_t& id);
-	CDmxElement* CreateParticleDmxElement(const char* pParticleSystemName);
-
-	bool WriteParticleConfigFile(CDmxElement* pParticleSystem, CUtlBuffer& buf, bool bPreventNameBasedLookup);
-
-	void BuildBatchList(int iRenderCache, IMatRenderContext* pRenderContext, CUtlVector< Batch_t >& batches);
-
-	CUtlVector<IParticleOperatorDefinition*> m_ParticleOperators[PARTICLE_FUNCTION_COUNT];
-
-	CParticleSystemDictionary* m_pParticleSystemDictionary;
-
-	typedef CUtlStringMap< CSheet* > SheetsCache_t;
-	SheetsCache_t m_SheetList;
-
-	void AttachKillList(CParticleCollection* pParticles);
-	void DetachKillList(CParticleCollection* pParticles);
-
-	CParticleCollection* m_pVisualizedParticles;
-	DmObjectId_t m_VisualizedOperatorId;
-	IParticleSystemQuery* m_pQuery;
-	CUtlVector< RenderCache_t > m_RenderCache;
-	IMaterial* m_pShadowDepthMaterial;
-	float m_flLastSimulationTime;
-
-	bool m_bDidInit;
-	bool m_bUsingDefaultQuery;
-	bool m_bShouldLoadSheets;
-
-	int m_nNumFramesMeasured;
-
-	enum { c_nNumFramesTracked = 10 };
-	int		m_nParticleVertexCountHistory[c_nNumFramesTracked];
-	float	m_fParticleCountScaling;
-	int		m_nParticleIndexCount;
-	int		m_nParticleVertexCount;
-	bool	m_bFrameWarningNeeded;
-
-	friend class CParticleSystemDefinition;
-	friend class CParticleCollection;
-};
-
-extern CParticleSystemMgr* g_pParticleSystemMgr;
-
-
-enum ParticleOperatorId_t
-{
-	OPERATOR_GENERIC = -2,		         
-	OPERATOR_SINGLETON = -1,	            
-
-	OPERATOR_PI_POSITION,		         
-	OPERATOR_PI_RADIUS,
-	OPERATOR_PI_ALPHA,
-	OPERATOR_PI_TINT_RGB,
-	OPERATOR_PI_ROTATION,
-	OPERATOR_PI_YAW,
-
-	OPERATOR_ID_COUNT,
-};
-
-
-class IParticleOperatorDefinition
-{
-public:
-	virtual const char* GetName() const = 0;
-	virtual CParticleOperatorInstance* CreateInstance(const DmObjectId_t& id) const = 0;
-	virtual const DmxElementUnpackStructure_t* GetUnpackStructure() const = 0;
-	virtual ParticleOperatorId_t GetId() const = 0;
-	virtual bool IsObsolete() const = 0;
-	virtual size_t GetClassSize() const = 0;
-
-#if MEASURE_PARTICLE_PERF
-	float m_flMaxExecutionTime;
-	float m_flTotalExecutionTime;
-	float m_flUncomittedTime;
-
-	FORCEINLINE void RecordExecutionTime(float flETime)
-	{
-		m_flUncomittedTime += flETime;
-		m_flMaxExecutionTime = MAX(m_flMaxExecutionTime, flETime);
-	}
-
-	FORCEINLINE float TotalRecordedExecutionTime(void) const
-	{
-		return m_flTotalExecutionTime;
-	}
-
-	FORCEINLINE float MaximumRecordedExecutionTime(void) const
-	{
-		return m_flMaxExecutionTime;
-	}
-#endif
-};
-
-
-class CParticleOperatorInstance
-{
-public:
-	void* operator new(size_t nSize);
-	void* operator new(size_t size, int nBlockUse, const char* pFileName, int nLine);
-	void operator delete(void* pData);
-	void operator delete(void* p, int nBlockUse, const char* pFileName, int nLine);
-
-	virtual void InitParams(CParticleSystemDefinition* pDef, CDmxElement* pElement)
-	{
-	}
-
-	virtual size_t GetRequiredContextBytes() const
-	{
-		return 0;
-	}
-
-	virtual void InitializeContextData(CParticleCollection* pParticles, void* pContext) const
-	{
-	}
-
-	virtual uint32 GetWrittenAttributes(void) const = 0;
-	virtual uint32 GetReadAttributes(void) const = 0;
-	virtual uint64 GetReadControlPointMask() const
-	{
-		return 0;
-	}
-
-	virtual uint32 GetReadInitialAttributes(void) const
-	{
-		return 0;
-	}
-
-	virtual void Operate(CParticleCollection* pParticles, float flOpStrength, void* pContext) const
-	{
-	}
-
-	virtual void Render(IMatRenderContext* pRenderContext,
-		CParticleCollection* pParticles, void* pContext) const
-	{
-	}
-
-	virtual bool IsBatchable() const
-	{
-		return true;
-	}
-
-	virtual void RenderUnsorted(CParticleCollection* pParticles, void* pContext, IMatRenderContext* pRenderContext, CMeshBuilder& meshBuilder, int nVertexOffset, int nFirstParticle, int nParticleCount) const
-	{
-	}
-
-	virtual int GetParticlesToRender(CParticleCollection* pParticles, void* pContext, int nFirstParticle, int nRemainingVertices, int nRemainingIndices, int* pVertsUsed, int* pIndicesUsed) const
-	{
-		*pVertsUsed = 0;
-		*pIndicesUsed = 0;
-		return 0;
-	}
-
-
-	virtual uint32 Emit(CParticleCollection* pParticles, float flOpCurStrength,
-		void* pContext) const
-	{
-		return 0;
-	}
-
-	virtual void StopEmission(CParticleCollection* pParticles, void* pContext, bool bInfiniteOnly = false) const
-	{
-	}
-	virtual void StartEmission(CParticleCollection* pParticles, void* pContext, bool bInfiniteOnly = false) const
-	{
-	}
-	virtual void Restart(CParticleCollection* pParticles, void* pContext) {}
-
-	virtual void InitParticleSystem(CParticleCollection* pParticles, void* pContext) const
-	{
-	}
-
-
-	virtual void AddForces(FourVectors* AccumulatedForces,
-		CParticleCollection* pParticles,
-		int nBlocks,
-		float flCurStrength,
-		void* pContext) const
-	{
-	}
-
-
-	virtual void SetupConstraintPerFrameData(CParticleCollection* pParticles,
-		void* pContext) const
-	{
-	}
-
-
-	virtual bool EnforceConstraint(int nStartBlock,
-		int nNumBlocks,
-		CParticleCollection* pParticles,
-		void* pContext,
-		int nNumValidParticlesInLastChunk) const
-	{
-		return false;
-	}
-
-	virtual bool IsFinalConstraint(void) const
-	{
-		return false;
-	}
-
-	virtual bool InitMultipleOverride()
-	{
-		return false;
-	}
-
-
-	virtual bool IsScrubSafe()
-	{
-		return false;
-	}
-
-	virtual void InitNewParticlesScalar(CParticleCollection* pParticles, int nFirstParticle, int n_particles, int attribute_write_mask, void* pContext) const
-	{
-	}
-
-	virtual void InitNewParticlesBlock(CParticleCollection* pParticles, int start_block, int n_blocks, int attribute_write_mask, void* pContext) const
-	{
-		InitNewParticlesScalar(pParticles, 4 * start_block, 4 * n_blocks, attribute_write_mask, pContext);
-	}
-
-	void InitNewParticles(CParticleCollection* pParticles, int nFirstParticle, int n_particles, int attribute_write_mask, void* pContext) const;
-
-
-	virtual bool MayCreateMoreParticles(CParticleCollection* pParticles, void* pContext) const
-	{
-		return false;
-	}
-
-	const IParticleOperatorDefinition* GetDefinition()
-	{
-		return m_pDef;
-	}
-
-	virtual bool ShouldRunBeforeEmitters(void) const
-	{
-		return false;
-	}
-
-	virtual bool RequiresOrderInvariance(void) const
-	{
-		return false;
-	}
-
-	virtual void SkipToTime(float flTime, CParticleCollection* pParticles, void* pContext) const {}
-
-	const DmObjectId_t& GetId() { return m_Id; }
-
-	virtual void Render(CParticleCollection* pParticles) const {}
-
-	int RandomInt(int nMin, int nMax)
-	{
-		Assert(0);
-		return 0;
-	}
-
-	float RandomFloat(float flMinVal = 0.0f, float flMaxVal = 1.0f)
-	{
-		Assert(0);
-		return 0.0f;
-	}
-
-	float RandomFloatExp(float flMinVal = 0.0f, float flMaxVal = 1.0f, float flExponent = 1.0f)
-	{
-		Assert(0);
-		return 0.0f;
-	}
-
-	float m_flOpStartFadeInTime;
-	float m_flOpEndFadeInTime;
-	float m_flOpStartFadeOutTime;
-	float m_flOpEndFadeOutTime;
-	float m_flOpFadeOscillatePeriod;
-
-	virtual ~CParticleOperatorInstance(void)
-	{
-	}
-
-protected:
-	void InitScalarAttributeRandomRangeBlock(int nAttributeId, float fMinValue, float fMaxValue,
-		CParticleCollection* pParticles, int nStartBlock, int nBlockCount) const;
-	void InitScalarAttributeRandomRangeExpBlock(int nAttributeId, float fMinValue, float fMaxValue, float fExp,
-		CParticleCollection* pParticles, int nStartBlock, int nBlockCount) const;
-	void AddScalarAttributeRandomRangeBlock(int nAttributeId, float fMinValue, float fMaxValue, float fExp,
-		CParticleCollection* pParticles, int nStartBlock, int nBlockCount, bool bRandomlyInvert) const;
-
-private:
-	friend class CParticleCollection;
-
-	const IParticleOperatorDefinition* m_pDef;
-	void SetDefinition(const IParticleOperatorDefinition* pDef, const DmObjectId_t& id)
-	{
-		m_pDef = pDef;
-		CopyUniqueId(id, &m_Id);
-	}
-
-	DmObjectId_t m_Id;
-
-	template <typename T> friend class CParticleOperatorDefinition;
-};
-
-class CParticleRenderOperatorInstance : public CParticleOperatorInstance
-{
-public:
-
-	CParticleVisibilityInputs VisibilityInputs;
-};
-
-template < class T >
-class CParticleOperatorDefinition : public IParticleOperatorDefinition
-{
-public:
-	CParticleOperatorDefinition(const char* pFactoryName, ParticleOperatorId_t id, bool bIsObsolete) : m_pFactoryName(pFactoryName), m_Id(id)
-	{
-#if MEASURE_PARTICLE_PERF
-		m_flTotalExecutionTime = 0.0f;
-		m_flMaxExecutionTime = 0.0f;
-		m_flUncomittedTime = 0.0f;
-#endif
-		m_bIsObsolete = bIsObsolete;
-	}
-
-	virtual const char* GetName() const
-	{
-		return m_pFactoryName;
-	}
-
-	virtual ParticleOperatorId_t GetId() const
-	{
-		return m_Id;
-	}
-
-	virtual CParticleOperatorInstance* CreateInstance(const DmObjectId_t& id) const
-	{
-		CParticleOperatorInstance* pOp = new T;
-		pOp->SetDefinition(this, id);
-		return pOp;
-	}
-
-	virtual const DmxElementUnpackStructure_t* GetUnpackStructure() const
-	{
-		return m_pUnpackParams;
-	}
-
-	virtual bool IsObsolete() const
-	{
-		return m_bIsObsolete;
-	}
-
-	virtual size_t GetClassSize() const
-	{
-		return sizeof(T);
-	}
-
-private:
-	const char* m_pFactoryName;
-	ParticleOperatorId_t m_Id;
-	bool m_bIsObsolete;
-	static DmxElementUnpackStructure_t* m_pUnpackParams;
-};
-
-#define DECLARE_PARTICLE_OPERATOR( _className )				\
-	DECLARE_DMXELEMENT_UNPACK()								\
-	friend class CParticleOperatorDefinition<_className >
-
-#define DEFINE_PARTICLE_OPERATOR( _className, _operatorName, _id )	\
-	static CParticleOperatorDefinition<_className> s_##_className##Factory( _operatorName, _id, false )
-
-#define DEFINE_PARTICLE_OPERATOR_OBSOLETE( _className, _operatorName, _id )	\
-	static CParticleOperatorDefinition<_className> s_##_className##Factory( _operatorName, _id, true )
-
-#define BEGIN_PARTICLE_OPERATOR_UNPACK( _className )										\
-	BEGIN_DMXELEMENT_UNPACK( _className )													\
-	DMXELEMENT_UNPACK_FIELD( "operator start fadein","0", float, m_flOpStartFadeInTime )	\
-	DMXELEMENT_UNPACK_FIELD( "operator end fadein","0", float, m_flOpEndFadeInTime )		\
-	DMXELEMENT_UNPACK_FIELD( "operator start fadeout","0", float, m_flOpStartFadeOutTime )	\
-	DMXELEMENT_UNPACK_FIELD( "operator end fadeout","0", float, m_flOpEndFadeOutTime ) \
-    DMXELEMENT_UNPACK_FIELD( "operator fade oscillate","0", float, m_flOpFadeOscillatePeriod )
-
-#define END_PARTICLE_OPERATOR_UNPACK( _className )		\
-	END_DMXELEMENT_UNPACK_TEMPLATE( _className, CParticleOperatorDefinition<_className>::m_pUnpackParams )
-
-#define BEGIN_PARTICLE_RENDER_OPERATOR_UNPACK( _className )											\
-	BEGIN_PARTICLE_OPERATOR_UNPACK( _className )													\
-	DMXELEMENT_UNPACK_FIELD( "Visibility Proxy Input Control Point Number", "-1", int, VisibilityInputs.m_nCPin )	\
-	DMXELEMENT_UNPACK_FIELD( "Visibility Proxy Radius", "1.0", float, VisibilityInputs.m_flProxyRadius )				\
-	DMXELEMENT_UNPACK_FIELD( "Visibility input minimum","0", float, VisibilityInputs.m_flInputMin )					\
-	DMXELEMENT_UNPACK_FIELD( "Visibility input maximum","1", float, VisibilityInputs.m_flInputMax )					\
-	DMXELEMENT_UNPACK_FIELD( "Visibility Alpha Scale minimum","0", float, VisibilityInputs.m_flAlphaScaleMin )		\
-	DMXELEMENT_UNPACK_FIELD( "Visibility Alpha Scale maximum","1", float, VisibilityInputs.m_flAlphaScaleMax )		\
-	DMXELEMENT_UNPACK_FIELD( "Visibility Radius Scale minimum","1", float, VisibilityInputs.m_flRadiusScaleMin )		\
-	DMXELEMENT_UNPACK_FIELD( "Visibility Radius Scale maximum","1", float, VisibilityInputs.m_flRadiusScaleMax )	\
-	DMXELEMENT_UNPACK_FIELD( "Visibility Camera Depth Bias", "0", float, VisibilityInputs.m_flCameraBias )
-
-#define REGISTER_PARTICLE_OPERATOR( _type, _className )	\
-	g_pParticleSystemMgr->AddParticleOperator( _type, &s_##_className##Factory )
-
-
-
-enum
-{
-	PCFLAGS_FIRST_FRAME = 0x1,
-	PCFLAGS_PREV_CONTROL_POINTS_INITIALIZED = 0x2,
-};
-
-
-
-#define DEBUG_PARTICLE_SORT 0
-
-struct ParticleRenderData_t
-{
-	float m_flSortKey;										    
-	int   m_nIndex;									        
-	float m_flRadius;					       
-#if VALVE_LITTLE_ENDIAN
-	uint8 m_nAlpha;							           
-	uint8 m_nAlphaPad[3];										     
-#else
-	uint8 m_nAlphaPad[3];										     
-	uint8 m_nAlpha;							           
-#endif
-};
-
-struct ExtendedParticleRenderData_t : ParticleRenderData_t
-{
-	float m_flX;
-	float m_flY;
-	float m_flZ;
-	float m_flPad;
-};
-
-
-typedef struct ALIGN16 _FourInts
-{
-	int32 m_nValue[4];
-} ALIGN16_POST FourInts;
-
-
-
-struct CPathParameters
-{
-	int m_nStartControlPointNumber;
-	int m_nEndControlPointNumber;
-	int m_nBulgeControl;
-	float m_flBulge;
-	float m_flMidPoint;
-
-	void ClampControlPointIndices(void)
-	{
-		m_nStartControlPointNumber = MAX(0, MIN(MAX_PARTICLE_CONTROL_POINTS - 1, m_nStartControlPointNumber));
-		m_nEndControlPointNumber = MAX(0, MIN(MAX_PARTICLE_CONTROL_POINTS - 1, m_nEndControlPointNumber));
-	}
-};
-
-struct CParticleVisibilityData
-{
-	float	m_flAlphaVisibility;
-	float	m_flRadiusVisibility;
-	float	m_flCameraBias;
-	bool	m_bUseVisibility;
-};
-
-struct CParticleControlPoint
-{
-	Vector m_Position;
-	Vector m_PrevPosition;
-
-	Vector m_ForwardVector;
-	Vector m_UpVector;
-	Vector m_RightVector;
-
-	void* m_pObject;
-
-	int m_nParent;
-};
-
-
-struct CParticleSIMDTransformation
-{
-	FourVectors m_v4Origin;
-	FourVectors m_v4Fwd;
-	FourVectors m_v4Up;
-	FourVectors m_v4Right;
-
-
-	FORCEINLINE void VectorRotate(FourVectors& InPnt)
-	{
-		fltx4 fl4OutX = SubSIMD(AddSIMD(MulSIMD(InPnt.x, m_v4Fwd.x), MulSIMD(InPnt.z, m_v4Up.x)), MulSIMD(InPnt.y, m_v4Right.x));
-		fltx4 fl4OutY = SubSIMD(AddSIMD(MulSIMD(InPnt.x, m_v4Fwd.y), MulSIMD(InPnt.z, m_v4Up.y)), MulSIMD(InPnt.y, m_v4Right.y));
-		InPnt.z = SubSIMD(AddSIMD(MulSIMD(InPnt.x, m_v4Fwd.z), MulSIMD(InPnt.z, m_v4Up.z)), MulSIMD(InPnt.y, m_v4Right.z));
-		InPnt.x = fl4OutX;
-		InPnt.y = fl4OutY;
-	}
-
-	FORCEINLINE void VectorTransform(FourVectors& InPnt)
-	{
-		VectorRotate(InPnt);
-		InPnt.x = AddSIMD(InPnt.x, m_v4Origin.x);
-		InPnt.y = AddSIMD(InPnt.y, m_v4Origin.y);
-		InPnt.z = AddSIMD(InPnt.z, m_v4Origin.z);
-	}
-};
-
-#define NUM_COLLISION_CACHE_MODES 4
-
-class CParticleCollection
-{
-public:
-	~CParticleCollection(void);
-
-	void Restart();
-
-	void RecomputeBounds(void);
-
-	void SetControlPoint(int nWhichPoint, const Vector& v);
-	void SetControlPointObject(int nWhichPoint, void* pObject);
-
-	void SetControlPointOrientation(int nWhichPoint, const Vector& forward,
-		const Vector& right, const Vector& up);
-	void SetControlPointOrientation(int nWhichPoint, const Quaternion& q);
-	void SetControlPointForwardVector(int nWhichPoint, const Vector& v);
-	void SetControlPointUpVector(int nWhichPoint, const Vector& v);
-	void SetControlPointRightVector(int nWhichPoint, const Vector& v);
-	void SetControlPointParent(int nWhichPoint, int n);
-
-	const float* GetFloatAttributePtr(int nAttribute, int nParticleNumber) const;
-	const int* GetIntAttributePtr(int nAttribute, int nParticleNumber) const;
-	const fltx4* GetM128AttributePtr(int nAttribute, size_t* pStrideOut) const;
-	const FourVectors* Get4VAttributePtr(int nAttribute, size_t* pStrideOut) const;
-	const FourInts* Get4IAttributePtr(int nAttribute, size_t* pStrideOut) const;
-	const int* GetIntAttributePtr(int nAttribute, size_t* pStrideOut) const;
-
-
-	int* GetIntAttributePtrForWrite(int nAttribute, int nParticleNumber);
-
-	float* GetFloatAttributePtrForWrite(int nAttribute, int nParticleNumber);
-	fltx4* GetM128AttributePtrForWrite(int nAttribute, size_t* pStrideOut);
-	FourVectors* Get4VAttributePtrForWrite(int nAttribute, size_t* pStrideOut);
-
-	const float* GetInitialFloatAttributePtr(int nAttribute, int nParticleNumber) const;
-	const fltx4* GetInitialM128AttributePtr(int nAttribute, size_t* pStrideOut) const;
-	const FourVectors* GetInitial4VAttributePtr(int nAttribute, size_t* pStrideOut) const;
-	float* GetInitialFloatAttributePtrForWrite(int nAttribute, int nParticleNumber);
-	fltx4* GetInitialM128AttributePtrForWrite(int nAttribute, size_t* pStrideOut);
-
-	void Simulate(float dt, bool updateBboxOnly);
-	void SkipToTime(float t);
-
-	void Render(IMatRenderContext* pRenderContext, bool bTranslucentOnly = false, void* pCameraObject = NULL);
-
-	bool IsValid(void) const;
-	const char* GetName() const;
-
-	bool IsFinished(void);
-
-	bool IsValidAttributePtr(int nAttribute, const void* pPtr) const;
-
-	void SwapPosAndPrevPos(void);
-
-	void SetNActiveParticles(int nCount);
-	void KillParticle(int nPidx);
-
-	void StopEmission(bool bInfiniteOnly = false, bool bRemoveAllParticles = false, bool bWakeOnStop = false);
-	void StartEmission(bool bInfiniteOnly = false);
-	void SetDormant(bool bDormant);
-
-	const Vector& GetControlPointAtCurrentTime(int nControlPoint) const;
-	void GetControlPointOrientationAtCurrentTime(int nControlPoint, Vector* pForward, Vector* pRight, Vector* pUp) const;
-	void GetControlPointTransformAtCurrentTime(int nControlPoint, matrix3x4_t* pMat);
-	void GetControlPointTransformAtCurrentTime(int nControlPoint, VMatrix* pMat);
-	int GetControlPointParent(int nControlPoint) const;
-
-	void GetControlPointAtTime(int nControlPoint, float flTime, Vector* pControlPoint) const;
-	void GetControlPointAtPrevTime(int nControlPoint, Vector* pControlPoint) const;
-	void GetControlPointOrientationAtTime(int nControlPoint, float flTime, Vector* pForward, Vector* pRight, Vector* pUp);
-	void GetControlPointTransformAtTime(int nControlPoint, float flTime, matrix3x4_t* pMat);
-	void GetControlPointTransformAtTime(int nControlPoint, float flTime, VMatrix* pMat);
-	void GetControlPointTransformAtTime(int nControlPoint, float flTime, CParticleSIMDTransformation* pXForm);
-	int GetHighestControlPoint(void) const;
-
-	bool HasMoved() const;
-
-	bool ReadsControlPoint(int nPoint) const;
-
-	int RandomInt(int nMin, int nMax);
-	float RandomFloat(float flMin, float flMax);
-	float RandomFloatExp(float flMin, float flMax, float flExponent);
-	void RandomVector(float flMin, float flMax, Vector* pVector);
-	void RandomVector(const Vector& vecMin, const Vector& vecMax, Vector* pVector);
-	float RandomVectorInUnitSphere(Vector* pVector);	       
-
-	int RandomInt(int nRandomSampleId, int nMin, int nMax);
-	float RandomFloat(int nRandomSampleId, float flMin, float flMax);
-	float RandomFloatExp(int nRandomSampleId, float flMin, float flMax, float flExponent);
-	void RandomVector(int nRandomSampleId, float flMin, float flMax, Vector* pVector);
-	void RandomVector(int nRandomSampleId, const Vector& vecMin, const Vector& vecMax, Vector* pVector);
-	float RandomVectorInUnitSphere(int nRandomSampleId, Vector* pVector);	       
-
-	fltx4 RandomFloat(const FourInts& ParticleID, int nRandomSampleOffset);
-
-
-	int OperatorRandomSampleOffset() const;
-
-	void GetBounds(Vector* pMin, Vector* pMax);
-
-	void VisualizeOperator(const DmObjectId_t* pOpId = NULL);
-
-	bool UsesPowerOfTwoFrameBufferTexture(bool bThisFrame) const;
-
-	bool UsesFullFrameBufferTexture(bool bThisFrame) const;
-
-	bool IsTranslucent() const;
-
-	bool IsTwoPass() const;
-
-	bool IsBatchable() const;
-
-	int GetRendererCount() const;
-	CParticleOperatorInstance* GetRenderer(int i);
-	void* GetRendererContext(int i);
-
-
-	bool CheckIfOperatorShouldRun(CParticleOperatorInstance const* op, float* pflCurStrength = NULL);
-
-	Vector TransformAxis(const Vector& SrcAxis, bool bLocalSpace, int nControlPointNumber = 0);
-
-	const ParticleRenderData_t* GetRenderList(IMatRenderContext* pRenderContext, bool bSorted, int* pNparticles, CParticleVisibilityData* pVisibilityData);
-
-	void CalculatePathValues(CPathParameters const& PathIn,
-		float flTimeStamp,
-		Vector* pStartPnt,
-		Vector* pMidPnt,
-		Vector* pEndPnt
-	);
-
-	int GetGroupID() const;
-
-	void InitializeNewParticles(int nFirstParticle, int nParticleCount, uint32 nInittedMask);
-
-	void UpdateHitBoxInfo(int nControlPointNumber);
-
-	void UnlinkFromDefList();
-
-	CParticleCollection* GetNextCollectionUsingSameDef() { return m_pNextDef; }
-
-	CUtlReference< CSheet > m_Sheet;
-
-
-
-protected:
-	CParticleCollection();
-
-	bool Init(const char* pParticleSystemName);
-	bool Init(CParticleSystemDefinition* pDef);
-
-	void BloatBoundsUsingControlPoint();
-
-private:
-	void GenerateSortedIndexList(Vector vecCameraPos, CParticleVisibilityData* pVisibilityData, bool bSorted);
-
-	void Init(CParticleSystemDefinition* pDef, float flDelay, int nRandomSeed);
-	void InitStorage(CParticleSystemDefinition* pDef);
-	void InitParticleCreationTime(int nFirstParticle, int nNumToInit);
-	void CopyInitialAttributeValues(int nStartParticle, int nNumParticles);
-	void ApplyKillList(void);
-	void SetAttributeToConstant(int nAttribute, float fValue);
-	void SetAttributeToConstant(int nAttribute, float fValueX, float fValueY, float fValueZ);
-	void InitParticleAttributes(int nStartParticle, int nNumParticles, int nAttrsLeftToInit);
-
-	void FillAttributeWithConstant(int nAttribute, float fValue);
-
-	void UpdatePrevControlPoints(float dt);
-
-	float* GetConstantAttributeMemory(int nAttribute);
-
-	void SwapAdjacentParticles(int hParticle);
-
-	void UnlinkParticle(int hParticle);
-
-	void InsertParticleBefore(int hParticle, int hBefore);
-
-	void MoveParticle(int nInitialIndex, int nNewIndex);
-
-	float ComputeSqrDistanceToParticle(int hParticle, const Vector& vecPosition) const;
-
-	void GrowDistSqrBounds(float flDistSqr);
-
-	void SimulateFirstFrame();
-
-	bool SystemContainsParticlesWithBoolSet(bool CParticleCollection::* pField) const;
-	bool ContainsOpaqueCollections();
-	bool ComputeUsesPowerOfTwoFrameBufferTexture();
-	bool ComputeUsesFullFrameBufferTexture();
-	bool ComputeIsTranslucent();
-	bool ComputeIsTwoPass();
-	bool ComputeIsBatchable();
-	bool ComputeRequiresOrderInvariance();
-
-	void LabelTextureUsage(void);
-
-	void LinkIntoDefList();
-
-public:
-	fltx4 m_fl4CurTime;										  
-
-	int m_nPaddedActiveParticles;	      
-	float m_flCurTime;				  
-
-	int m_nActiveParticles;			    
-	float m_flDt;
-	float m_flPreviousDt;
-	float m_flNextSleepTime;								        
-
-	CUtlReference< CParticleSystemDefinition > m_pDef;
-	int m_nAllocatedParticles;
-	int m_nMaxAllowedParticles;
-	bool m_bDormant;
-	bool m_bEmissionStopped;
-	bool m_bRequiresOrderInvariance;
-
-	int m_LocalLightingCP;
-	Color m_LocalLighting;
-
-	CParticleControlPoint m_ControlPoints[MAX_PARTICLE_CONTROL_POINTS];
-
-	CModelHitBoxesInfo m_ControlPointHitBoxes[MAX_PARTICLE_CONTROL_POINTS];
-
-	uint8* m_pOperatorContextData;
-	CParticleCollection* m_pNext;							    
-	CParticleCollection* m_pPrev;							    
-
-	struct CWorldCollideContextData* m_pCollisionCacheData[NUM_COLLISION_CACHE_MODES];        
-	CParticleCollection* m_pParent;
-
-	CUtlIntrusiveDList<CParticleCollection>  m_Children;	      
-
-	void* operator new(size_t nSize);
-	void* operator new(size_t size, int nBlockUse, const char* pFileName, int nLine);
-	void operator delete(void* pData);
-	void operator delete(void* p, int nBlockUse, const char* pFileName, int nLine);
-
-
-protected:
-	bool m_bBoundsValid;
-	Vector m_MinBounds;
-	Vector m_MaxBounds;
-	int m_nHighestCP;                 
-
-private:
-
-
-	unsigned char* m_pParticleMemory;						         
-	unsigned char* m_pParticleInitialMemory;				         
-	unsigned char* m_pConstantMemory;
-
-	int m_nPerParticleInitializedAttributeMask;
-	int m_nPerParticleUpdatedAttributeMask;
-	int m_nPerParticleReadInitialAttributeMask;				           
-	float* m_pParticleAttributes[MAX_PARTICLE_ATTRIBUTES];
-	float* m_pParticleInitialAttributes[MAX_PARTICLE_ATTRIBUTES];
-	size_t m_nParticleFloatStrides[MAX_PARTICLE_ATTRIBUTES];
-	size_t m_nParticleInitialFloatStrides[MAX_PARTICLE_ATTRIBUTES];
-
-	float* m_pConstantAttributes;
-
-	uint64 m_nControlPointReadMask;							        
-	int m_nParticleFlags;									 
-	bool m_bIsScrubbable : 1;
-	bool m_bIsRunningInitializers : 1;
-	bool m_bIsRunningOperators : 1;
-	bool m_bIsTranslucent : 1;
-	bool m_bIsTwoPass : 1;
-	bool m_bAnyUsesPowerOfTwoFrameBufferTexture : 1;		         
-	bool m_bAnyUsesFullFrameBufferTexture : 1;
-	bool m_bIsBatchable : 1;
-
-	bool m_bUsesPowerOfTwoFrameBufferTexture;			         
-	bool m_bUsesFullFrameBufferTexture;
-
-	int m_nDrawnFrames;
-	int m_nSimulatedFrames;
-
-	Vector m_Center;										    
-
-	int m_nUniqueParticleId;
-
-	int m_nRandomQueryCount;
-	int m_nRandomSeed;
-	int m_nOperatorRandomSampleOffset;
-
-	float m_flMinDistSqr;
-	float m_flMaxDistSqr;
-	float m_flOOMaxDistSqr;
-	Vector m_vecLastCameraPos;
-	float m_flLastMinDistSqr;
-	float m_flLastMaxDistSqr;
-
-	int m_nNumParticlesToKill;
-	int* m_pParticleKillList;
-
-	CParticleCollection* m_pNextDef;
-	CParticleCollection* m_pPrevDef;
-
-	void LoanKillListTo(CParticleCollection* pBorrower) const;
-	bool HasAttachedKillList(void) const;
-
-
-	CParticleOperatorInstance* m_pRenderOp;
-	friend class CParticleSystemMgr;
-	friend class CParticleOperatorInstance;
-};
-
-
-
-class CM128InitialAttributeIterator : public CStridedConstPtr<fltx4>
-{
-public:
-	FORCEINLINE CM128InitialAttributeIterator(int nAttribute, CParticleCollection* pParticles)
-	{
-		m_pData = pParticles->GetInitialM128AttributePtr(nAttribute, &m_nStride);
-	}
-};
-
-
-class CM128AttributeIterator : public CStridedConstPtr<fltx4>
-{
-public:
-	FORCEINLINE CM128AttributeIterator(int nAttribute, CParticleCollection* pParticles)
-	{
-		m_pData = pParticles->GetM128AttributePtr(nAttribute, &m_nStride);
-	}
-};
-
-class C4IAttributeIterator : public CStridedConstPtr<FourInts>
-{
-public:
-	FORCEINLINE C4IAttributeIterator(int nAttribute, CParticleCollection* pParticles)
-	{
-		m_pData = pParticles->Get4IAttributePtr(nAttribute, &m_nStride);
-	}
-};
-
-class CM128AttributeWriteIterator : public CStridedPtr<fltx4>
-{
-public:
-	FORCEINLINE CM128AttributeWriteIterator(void)
-	{
-	}
-	FORCEINLINE void Init(int nAttribute, CParticleCollection* pParticles)
-	{
-		m_pData = pParticles->GetM128AttributePtrForWrite(nAttribute, &m_nStride);
-	}
-	FORCEINLINE CM128AttributeWriteIterator(int nAttribute, CParticleCollection* pParticles)
-	{
-		Init(nAttribute, pParticles);
-	}
-};
-
-class C4VAttributeIterator : public CStridedConstPtr<FourVectors>
-{
-public:
-	FORCEINLINE C4VAttributeIterator(int nAttribute, CParticleCollection* pParticles)
-	{
-		m_pData = pParticles->Get4VAttributePtr(nAttribute, &m_nStride);
-	}
-};
-
-class C4VInitialAttributeIterator : public CStridedConstPtr<FourVectors>
-{
-public:
-	FORCEINLINE C4VInitialAttributeIterator(int nAttribute, CParticleCollection* pParticles)
-	{
-		m_pData = pParticles->GetInitial4VAttributePtr(nAttribute, &m_nStride);
-	}
-};
-
-class C4VAttributeWriteIterator : public CStridedPtr<FourVectors>
-{
-public:
-	FORCEINLINE C4VAttributeWriteIterator(int nAttribute, CParticleCollection* pParticles)
-	{
-		m_pData = pParticles->Get4VAttributePtrForWrite(nAttribute, &m_nStride);
-	}
-};
-
-
-inline bool CParticleCollection::HasAttachedKillList(void) const
-{
-	return m_pParticleKillList != NULL;
-}
-
-inline bool CParticleCollection::ReadsControlPoint(int nPoint) const
-{
-	return (m_nControlPointReadMask & (1ULL << nPoint)) != 0;
-}
-
-inline void CParticleCollection::SetNActiveParticles(int nCount)
-{
-	Assert(nCount <= m_nMaxAllowedParticles);
-	m_nActiveParticles = nCount;
-	m_nPaddedActiveParticles = (nCount + 3) / 4;
-}
-
-inline void CParticleCollection::SwapPosAndPrevPos(void)
-{
-	Assert(m_nParticleFloatStrides[PARTICLE_ATTRIBUTE_XYZ] == m_nParticleFloatStrides[PARTICLE_ATTRIBUTE_PREV_XYZ]);
-	V_swap(m_pParticleAttributes[PARTICLE_ATTRIBUTE_XYZ], m_pParticleAttributes[PARTICLE_ATTRIBUTE_PREV_XYZ]);
-}
-
-inline void CParticleCollection::LoanKillListTo(CParticleCollection* pBorrower) const
-{
-	Assert(!pBorrower->m_pParticleKillList);
-	pBorrower->m_nNumParticlesToKill = 0;
-	pBorrower->m_pParticleKillList = m_pParticleKillList;
-}
-
-inline void CParticleCollection::SetAttributeToConstant(int nAttribute, float fValue)
-{
-	float* fconst = m_pConstantAttributes + 4 * 3 * nAttribute;
-	fconst[0] = fconst[1] = fconst[2] = fconst[3] = fValue;
-}
-
-inline void CParticleCollection::SetAttributeToConstant(int nAttribute, float fValueX, float fValueY, float fValueZ)
-{
-	float* fconst = m_pConstantAttributes + 4 * 3 * nAttribute;
-	fconst[0] = fconst[1] = fconst[2] = fconst[3] = fValueX;
-	fconst[4] = fconst[5] = fconst[6] = fconst[7] = fValueY;
-	fconst[8] = fconst[9] = fconst[10] = fconst[11] = fValueZ;
-}
-
-inline void CParticleCollection::SetControlPoint(int nWhichPoint, const Vector& v)
-{
-	Assert((nWhichPoint >= 0) && (nWhichPoint < MAX_PARTICLE_CONTROL_POINTS));
-	m_nHighestCP = MAX(m_nHighestCP, nWhichPoint);
-	m_ControlPoints[nWhichPoint].m_Position = v;
-	for (CParticleCollection* i = m_Children.m_pHead; i; i = i->m_pNext)
-	{
-		i->SetControlPoint(nWhichPoint, v);
-	}
-}
-
-inline void CParticleCollection::SetControlPointObject(int nWhichPoint, void* pObject)
-{
-	Assert((nWhichPoint >= 0) && (nWhichPoint < MAX_PARTICLE_CONTROL_POINTS));
-	m_ControlPoints[nWhichPoint].m_pObject = pObject;
-	for (CParticleCollection* i = m_Children.m_pHead; i; i = i->m_pNext)
-	{
-		i->SetControlPointObject(nWhichPoint, pObject);
-	}
-}
-
-inline void CParticleCollection::SetControlPointOrientation(int nWhichPoint, const Vector& forward,
-	const Vector& right, const Vector& up)
-{
-	Assert((nWhichPoint >= 0) && (nWhichPoint < MAX_PARTICLE_CONTROL_POINTS));
-
-	if (fabs(DotProduct(forward, up)) <= 0.1f
-		&& fabs(DotProduct(forward, right)) <= 0.1f
-		&& fabs(DotProduct(right, up)) <= 0.1f)
-	{
-		m_ControlPoints[nWhichPoint].m_ForwardVector = forward;
-		m_ControlPoints[nWhichPoint].m_UpVector = up;
-		m_ControlPoints[nWhichPoint].m_RightVector = right;
-
-		for (CParticleCollection* i = m_Children.m_pHead; i; i = i->m_pNext)
-		{
-			i->SetControlPointOrientation(nWhichPoint, forward, right, up);
-		}
-	}
-	else
-	{
-		Warning("Attempt to set particle collection %s to invalid orientation matrix\n", GetName());
-	}
-}
-
-inline Vector CParticleCollection::TransformAxis(const Vector& SrcAxis, bool bLocalSpace,
-	int nControlPointNumber)
-{
-	if (bLocalSpace)
-	{
-		return												 
-			(SrcAxis.x * m_ControlPoints[nControlPointNumber].m_RightVector) +
-			(SrcAxis.y * m_ControlPoints[nControlPointNumber].m_ForwardVector) +
-			(SrcAxis.z * m_ControlPoints[nControlPointNumber].m_UpVector);
-	}
-	else
-		return SrcAxis;
-}
-
-
-inline void CParticleCollection::SetControlPointOrientation(int nWhichPoint, const Quaternion& q)
-{
-	matrix3x4_t mat;
-	Vector vecForward, vecUp, vecRight;
-	QuaternionMatrix(q, mat);
-	MatrixVectors(mat, &vecForward, &vecRight, &vecUp);
-	SetControlPointOrientation(nWhichPoint, vecForward, vecRight, vecUp);
-}
-
-inline void CParticleCollection::SetControlPointForwardVector(int nWhichPoint, const Vector& v)
-{
-	Assert((nWhichPoint >= 0) && (nWhichPoint < MAX_PARTICLE_CONTROL_POINTS));
-	m_ControlPoints[nWhichPoint].m_ForwardVector = v;
-	for (CParticleCollection* i = m_Children.m_pHead; i; i = i->m_pNext)
-	{
-		i->SetControlPointForwardVector(nWhichPoint, v);
-	}
-}
-
-inline void CParticleCollection::SetControlPointUpVector(int nWhichPoint, const Vector& v)
-{
-	Assert((nWhichPoint >= 0) && (nWhichPoint < MAX_PARTICLE_CONTROL_POINTS));
-	m_ControlPoints[nWhichPoint].m_UpVector = v;
-	for (CParticleCollection* i = m_Children.m_pHead; i; i = i->m_pNext)
-	{
-		i->SetControlPointUpVector(nWhichPoint, v);
-	}
-}
-
-inline void CParticleCollection::SetControlPointRightVector(int nWhichPoint, const Vector& v)
-{
-	Assert((nWhichPoint >= 0) && (nWhichPoint < MAX_PARTICLE_CONTROL_POINTS));
-	m_ControlPoints[nWhichPoint].m_RightVector = v;
-	for (CParticleCollection* i = m_Children.m_pHead; i; i = i->m_pNext)
-	{
-		i->SetControlPointRightVector(nWhichPoint, v);
-	}
-}
-
-inline void CParticleCollection::SetControlPointParent(int nWhichPoint, int n)
-{
-	Assert((nWhichPoint >= 0) && (nWhichPoint < MAX_PARTICLE_CONTROL_POINTS));
-	m_ControlPoints[nWhichPoint].m_nParent = n;
-	for (CParticleCollection* i = m_Children.m_pHead; i; i = i->m_pNext)
-	{
-		i->SetControlPointParent(nWhichPoint, n);
-	}
-}
-
-
-inline float* CParticleCollection::GetConstantAttributeMemory(int nAttribute)
-{
-	return m_pConstantAttributes + 3 * 4 * nAttribute;
-}
-
-inline int CParticleCollection::OperatorRandomSampleOffset() const
-{
-	return m_nOperatorRandomSampleOffset;
-}
-
-inline int CParticleCollection::RandomInt(int nRandomSampleId, int nMin, int nMax)
-{
-	float flRand = s_pRandomFloats[(m_nRandomSeed + nRandomSampleId) & RANDOM_FLOAT_MASK];
-	flRand *= (nMax + 1 - nMin);
-	int nRand = (int)flRand + nMin;
-	return nRand;
-}
-
-inline float CParticleCollection::RandomFloat(int nRandomSampleId, float flMin, float flMax)
-{
-	float flRand = s_pRandomFloats[(m_nRandomSeed + nRandomSampleId) & RANDOM_FLOAT_MASK];
-	flRand *= (flMax - flMin);
-	flRand += flMin;
-	return flRand;
-}
-
-inline fltx4 CParticleCollection::RandomFloat(const FourInts& ParticleID, int nRandomSampleOffset)
-{
-	fltx4 Retval;
-	int nOfs = m_nRandomSeed + nRandomSampleOffset;
-	SubFloat(Retval, 0) = s_pRandomFloats[(nOfs + ParticleID.m_nValue[0]) & RANDOM_FLOAT_MASK];
-	SubFloat(Retval, 1) = s_pRandomFloats[(nOfs + ParticleID.m_nValue[1]) & RANDOM_FLOAT_MASK];
-	SubFloat(Retval, 2) = s_pRandomFloats[(nOfs + ParticleID.m_nValue[2]) & RANDOM_FLOAT_MASK];
-	SubFloat(Retval, 3) = s_pRandomFloats[(nOfs + ParticleID.m_nValue[3]) & RANDOM_FLOAT_MASK];
-	return Retval;
-}
-
-
-inline float CParticleCollection::RandomFloatExp(int nRandomSampleId, float flMin, float flMax, float flExponent)
-{
-	float flRand = s_pRandomFloats[(m_nRandomSeed + nRandomSampleId) & RANDOM_FLOAT_MASK];
-	flRand = powf(flRand, flExponent);
-	flRand *= (flMax - flMin);
-	flRand += flMin;
-	return flRand;
-}
-
-inline void CParticleCollection::RandomVector(int nRandomSampleId, float flMin, float flMax, Vector* pVector)
-{
-	float flDelta = flMax - flMin;
-	int nBaseId = m_nRandomSeed + nRandomSampleId;
-
-	pVector->x = s_pRandomFloats[nBaseId & RANDOM_FLOAT_MASK];
-	pVector->x *= flDelta;
-	pVector->x += flMin;
-
-	pVector->y = s_pRandomFloats[(nBaseId + 1) & RANDOM_FLOAT_MASK];
-	pVector->y *= flDelta;
-	pVector->y += flMin;
-
-	pVector->z = s_pRandomFloats[(nBaseId + 2) & RANDOM_FLOAT_MASK];
-	pVector->z *= flDelta;
-	pVector->z += flMin;
-}
-
-inline void CParticleCollection::RandomVector(int nRandomSampleId, const Vector& vecMin, const Vector& vecMax, Vector* pVector)
-{
-	int nBaseId = m_nRandomSeed + nRandomSampleId;
-	pVector->x = RandomFloat(nBaseId, vecMin.x, vecMax.x);
-	pVector->y = RandomFloat(nBaseId + 1, vecMin.y, vecMax.y);
-	pVector->z = RandomFloat(nBaseId + 2, vecMin.z, vecMax.z);
-}
-
-inline int CParticleCollection::RandomInt(int nMin, int nMax)
-{
-	return RandomInt(m_nRandomQueryCount++, nMin, nMax);
-}
-
-inline float CParticleCollection::RandomFloat(float flMin, float flMax)
-{
-	return RandomFloat(m_nRandomQueryCount++, flMin, flMax);
-}
-
-inline float CParticleCollection::RandomFloatExp(float flMin, float flMax, float flExponent)
-{
-	return RandomFloatExp(m_nRandomQueryCount++, flMin, flMax, flExponent);
-}
-
-inline void CParticleCollection::RandomVector(float flMin, float flMax, Vector* pVector)
-{
-	RandomVector(m_nRandomQueryCount++, flMin, flMax, pVector);
-}
-
-inline void CParticleCollection::RandomVector(const Vector& vecMin, const Vector& vecMax, Vector* pVector)
-{
-	RandomVector(m_nRandomQueryCount++, vecMin, vecMax, pVector);
-}
-
-inline float CParticleCollection::RandomVectorInUnitSphere(Vector* pVector)
-{
-	return RandomVectorInUnitSphere(m_nRandomQueryCount++, pVector);
-}
-
-
-inline const float* CParticleCollection::GetFloatAttributePtr(int nAttribute, int nParticleNumber) const
-{
-	Assert(nParticleNumber < m_nAllocatedParticles);
-	int block_ofs = nParticleNumber / 4;
-	return m_pParticleAttributes[nAttribute] +
-		m_nParticleFloatStrides[nAttribute] * block_ofs +
-		(nParticleNumber & 3);
-}
-
-inline int* CParticleCollection::GetIntAttributePtrForWrite(int nAttribute, int nParticleNumber)
-{
-	return reinterpret_cast<int*>(GetFloatAttributePtrForWrite(nAttribute, nParticleNumber));
-}
-
-inline const int* CParticleCollection::GetIntAttributePtr(int nAttribute, int nParticleNumber) const
-{
-	return (int*)GetFloatAttributePtr(nAttribute, nParticleNumber);
-}
-
-inline const fltx4* CParticleCollection::GetM128AttributePtr(int nAttribute, size_t* pStrideOut) const
-{
-	*(pStrideOut) = m_nParticleFloatStrides[nAttribute] / 4;
-	return reinterpret_cast<fltx4*>(m_pParticleAttributes[nAttribute]);
-}
-
-inline const FourInts* CParticleCollection::Get4IAttributePtr(int nAttribute, size_t* pStrideOut) const
-{
-	*(pStrideOut) = m_nParticleFloatStrides[nAttribute] / 4;
-	return reinterpret_cast<FourInts*>(m_pParticleAttributes[nAttribute]);
-}
-
-inline const int32* CParticleCollection::GetIntAttributePtr(int nAttribute, size_t* pStrideOut) const
-{
-	*(pStrideOut) = m_nParticleFloatStrides[nAttribute];
-	return reinterpret_cast<int32*>(m_pParticleAttributes[nAttribute]);
-}
-
-inline const FourVectors* CParticleCollection::Get4VAttributePtr(int nAttribute, size_t* pStrideOut) const
-{
-	*(pStrideOut) = m_nParticleFloatStrides[nAttribute] / 12;
-	return reinterpret_cast<const FourVectors*>(m_pParticleAttributes[nAttribute]);
-}
-
-inline FourVectors* CParticleCollection::Get4VAttributePtrForWrite(int nAttribute, size_t* pStrideOut)
-{
-	*(pStrideOut) = m_nParticleFloatStrides[nAttribute] / 12;
-	return reinterpret_cast<FourVectors*>(m_pParticleAttributes[nAttribute]);
-}
-
-inline const FourVectors* CParticleCollection::GetInitial4VAttributePtr(int nAttribute, size_t* pStrideOut) const
-{
-	*(pStrideOut) = m_nParticleInitialFloatStrides[nAttribute] / 12;
-	return reinterpret_cast<FourVectors*>(m_pParticleInitialAttributes[nAttribute]);
-}
-
-inline float* CParticleCollection::GetFloatAttributePtrForWrite(int nAttribute, int nParticleNumber)
-{
-	Assert(!m_bIsRunningInitializers || (m_nPerParticleInitializedAttributeMask & (1 << nAttribute)));
-	Assert(!m_bIsRunningOperators || (m_nPerParticleUpdatedAttributeMask & (1 << nAttribute)));
-
-	Assert(m_nParticleFloatStrides[nAttribute] != 0);
-
-	Assert(nParticleNumber < m_nAllocatedParticles);
-	int block_ofs = nParticleNumber / 4;
-	return m_pParticleAttributes[nAttribute] +
-		m_nParticleFloatStrides[nAttribute] * block_ofs +
-		(nParticleNumber & 3);
-}
-
-inline fltx4* CParticleCollection::GetM128AttributePtrForWrite(int nAttribute, size_t* pStrideOut)
-{
-	if (!HushAsserts())
-	{
-		Assert(!m_bIsRunningInitializers || (m_nPerParticleInitializedAttributeMask & (1 << nAttribute)));
-		Assert(!m_bIsRunningOperators || (m_nPerParticleUpdatedAttributeMask & (1 << nAttribute)));
-		Assert(m_nParticleFloatStrides[nAttribute] != 0);
-	}
-
-	*(pStrideOut) = m_nParticleFloatStrides[nAttribute] / 4;
-	return reinterpret_cast<fltx4*>(m_pParticleAttributes[nAttribute]);
-}
-
-inline const float* CParticleCollection::GetInitialFloatAttributePtr(int nAttribute, int nParticleNumber) const
-{
-	Assert(nParticleNumber < m_nAllocatedParticles);
-	int block_ofs = nParticleNumber / 4;
-	return m_pParticleInitialAttributes[nAttribute] + m_nParticleInitialFloatStrides[nAttribute] * block_ofs + (nParticleNumber & 3);
-}
-
-inline const fltx4* CParticleCollection::GetInitialM128AttributePtr(int nAttribute, size_t* pStrideOut) const
-{
-	*(pStrideOut) = m_nParticleInitialFloatStrides[nAttribute] / 4;
-	return reinterpret_cast<fltx4*>(m_pParticleInitialAttributes[nAttribute]);
-}
-
-inline float* CParticleCollection::GetInitialFloatAttributePtrForWrite(int nAttribute, int nParticleNumber)
-{
-	Assert(nParticleNumber < m_nAllocatedParticles);
-	Assert(m_nPerParticleReadInitialAttributeMask & (1 << nAttribute));
-	int block_ofs = nParticleNumber / 4;
-	return m_pParticleInitialAttributes[nAttribute] + m_nParticleInitialFloatStrides[nAttribute] * block_ofs + (nParticleNumber & 3);
-}
-
-inline fltx4* CParticleCollection::GetInitialM128AttributePtrForWrite(int nAttribute, size_t* pStrideOut)
-{
-	Assert(m_nPerParticleReadInitialAttributeMask & (1 << nAttribute));
-	*(pStrideOut) = m_nParticleInitialFloatStrides[nAttribute] / 4;
-	return reinterpret_cast<fltx4*>(m_pParticleInitialAttributes[nAttribute]);
-}
-
-inline bool CParticleCollection::IsValidAttributePtr(int nAttribute, const void* pPtr) const
-{
-	if (pPtr < m_pParticleAttributes[nAttribute])
-		return false;
-
-	size_t nArraySize = m_nParticleFloatStrides[nAttribute] * m_nAllocatedParticles / 4;
-	void* pMaxPtr = m_pParticleAttributes[nAttribute] + nArraySize;
-	return (pPtr <= pMaxPtr);
-}
-
-
-FORCEINLINE void CParticleCollection::KillParticle(int nPidx)
-{
-	Assert(nPidx < m_nActiveParticles + 4);
-
-	Assert(m_nNumParticlesToKill < MAX_PARTICLES_IN_A_SYSTEM);
-	m_pParticleKillList[m_nNumParticlesToKill++] = nPidx;
-}
-
-inline void CParticleCollection::FillAttributeWithConstant(int nAttribute, float fValue)
-{
-	size_t stride;
-	fltx4* pAttr = GetM128AttributePtrForWrite(nAttribute, &stride);
-	fltx4 fill = ReplicateX4(fValue);
-	for (int i = 0; i < m_nPaddedActiveParticles; i++)
-	{
-		*(pAttr) = fill;
-		pAttr += stride;
-	}
-}
-
-
-FORCEINLINE void SetVectorAttribute(float* pAttribute, float x, float y, float z)
-{
-	pAttribute[0] = x;
-	pAttribute[4] = y;
-	pAttribute[8] = z;
-}
-
-FORCEINLINE void SetVectorAttribute(float* pAttribute, const Vector& v)
-{
-	pAttribute[0] = v.x;
-	pAttribute[4] = v.y;
-	pAttribute[8] = v.z;
-}
-
-FORCEINLINE void SetVectorFromAttribute(Vector& v, const float* pAttribute)
-{
-	v.x = pAttribute[0];
-	v.y = pAttribute[4];
-	v.z = pAttribute[8];
-}
-
-
-FORCEINLINE float CParticleCollection::ComputeSqrDistanceToParticle(int hParticle, const Vector& vecPosition) const
-{
-	const float* xyz = GetFloatAttributePtr(PARTICLE_ATTRIBUTE_XYZ, hParticle);
-	Vector vecParticlePosition(xyz[0], xyz[4], xyz[8]);
-	return vecParticlePosition.DistToSqr(vecPosition);
-}
-
-
-FORCEINLINE void CParticleCollection::GrowDistSqrBounds(float flDistSqr)
-{
-	if (m_flLastMinDistSqr > flDistSqr)
-	{
-		m_flLastMinDistSqr = flDistSqr;
-	}
-	else if (m_flLastMaxDistSqr < flDistSqr)
-	{
-		m_flLastMaxDistSqr = flDistSqr;
-	}
-}
-
-
-
-
-struct ParticleChildrenInfo_t
-{
-	DmObjectId_t m_Id;
-	CUtlString m_Name;
-	bool m_bUseNameBasedLookup;
-	float m_flDelay;		          
-};
-
-
-class CParticleSystemDefinition
-{
-	DECLARE_DMXELEMENT_UNPACK();
-	DECLARE_REFERENCED_CLASS(CParticleSystemDefinition);
-
-
-public:
-	CParticleSystemDefinition(void);
-	~CParticleSystemDefinition(void);
-
-	void Read(CDmxElement* pElement);
-	CDmxElement* Write();
-
-	const char* MaterialName() const;
-	IMaterial* GetMaterial() const;
-	const char* GetName() const;
-	const DmObjectId_t& GetId() const;
-
-	bool UsesPowerOfTwoFrameBufferTexture();
-
-	bool UsesFullFrameBufferTexture();
-
-	bool ShouldAlwaysPrecache() const;
-
-	bool ShouldBatch() const;
-
-	bool IsViewModelEffect() const;
-
-	CParticleCollection* FirstCollection();
-
-	float GetCullRadius() const;
-	float GetCullFillCost() const;
-	int GetCullControlPoint() const;
-	const char* GetCullReplacementDefinition() const;
-
-	bool HasRetirementBeenChecked(int nFrame) const;
-	void MarkRetirementCheck(int nFrame);
-
-	void MarkReadsControlPoint(int nPoint);
-	bool ReadsControlPoint(int nPoint) const;
-
-private:
-	void Precache();
-	void Uncache();
-	bool IsPrecached() const;
-
-	void UnlinkAllCollections();
-
-	void SetupContextData();
-	void ParseChildren(CDmxElement* pElement);
-	void ParseOperators(const char* pszName, ParticleFunctionType_t nFunctionType,
-		CDmxElement* pElement, CUtlVector<CParticleOperatorInstance*>& out_list);
-	void WriteChildren(CDmxElement* pElement);
-	void WriteOperators(CDmxElement* pElement, const char* pOpKeyName,
-		const CUtlVector<CParticleOperatorInstance*>& inList);
-	CUtlVector<CParticleOperatorInstance*>* GetOperatorList(ParticleFunctionType_t type);
-	CParticleOperatorInstance* FindOperatorById(ParticleFunctionType_t type, const DmObjectId_t& id);
-
-private:
-	int m_nInitialParticles;
-	int m_nPerParticleUpdatedAttributeMask;
-	int m_nPerParticleInitializedAttributeMask;
-	int m_nInitialAttributeReadMask;
-	int m_nAttributeReadMask;
-	uint64 m_nControlPointReadMask;
-	Vector m_BoundingBoxMin;
-	Vector m_BoundingBoxMax;
-	char m_pszMaterialName[MAX_PATH];
-	CMaterialReference m_Material;
-	CParticleCollection* m_pFirstCollection;
-	char m_pszCullReplacementName[128];
-	float m_flCullRadius;
-	float m_flCullFillCost;
-	int m_nCullControlPoint;
-	int m_nRetireCheckFrame;
-
-	Color m_ConstantColor;
-	float m_flConstantRadius;
-	float m_flConstantRotation;
-	float m_flConstantRotationSpeed;
-	int m_nConstantSequenceNumber;
-	int m_nConstantSequenceNumber1;
-	int m_nGroupID;
-	float m_flMaximumTimeStep;
-	float m_flMaximumSimTime;					         
-	float m_flMinimumSimTime;            
-	int m_nMinimumFrames;					          
-
-
-	bool m_bViewModelEffect;
-
-
-	size_t m_nContextDataSize;
-	DmObjectId_t m_Id;
-
-public:
-	float m_flMaxDrawDistance;								       
-	float m_flNoDrawTimeToGoToSleep;						           
-
-	int m_nMaxParticles;
-	int m_nSkipRenderControlPoint;							       
-	CUtlString m_Name;
-
-	CUtlVector<CParticleOperatorInstance*> m_Operators;
-	CUtlVector<CParticleOperatorInstance*> m_Renderers;
-	CUtlVector<CParticleOperatorInstance*> m_Initializers;
-	CUtlVector<CParticleOperatorInstance*> m_Emitters;
-	CUtlVector<CParticleOperatorInstance*> m_ForceGenerators;
-	CUtlVector<CParticleOperatorInstance*> m_Constraints;
-	CUtlVector<ParticleChildrenInfo_t> m_Children;
-
-	CUtlVector<size_t> m_nOperatorsCtxOffsets;
-	CUtlVector<size_t> m_nRenderersCtxOffsets;
-	CUtlVector<size_t> m_nInitializersCtxOffsets;
-	CUtlVector<size_t> m_nEmittersCtxOffsets;
-	CUtlVector<size_t> m_nForceGeneratorsCtxOffsets;
-	CUtlVector<size_t> m_nConstraintsCtxOffsets;
-
-	float m_flTotalSimTime;
-	float m_flUncomittedTotalSimTime;
-	float m_flMaxMeasuredSimTime;
-	int m_nMaximumActiveParticles;
-	bool m_bShouldSort;
-	bool m_bShouldBatch;
-	bool m_bIsPrecached : 1;
-	bool m_bAlwaysPrecache : 1;
-
-	friend class CParticleCollection;
-	friend class CParticleSystemMgr;
-};
-
-
-inline CParticleSystemDefinition::CParticleSystemDefinition(void)
-{
-	m_nControlPointReadMask = 0;
-	m_nInitialAttributeReadMask = 0;
-	m_nPerParticleInitializedAttributeMask = 0;
-	m_nPerParticleUpdatedAttributeMask = 0;
-	m_nAttributeReadMask = 0;
-	m_flTotalSimTime = 0.0;
-	m_flMaxMeasuredSimTime = 0.0;
-	m_nMaximumActiveParticles = 0;
-	m_bIsPrecached = false;
-	m_bAlwaysPrecache = false;
-	m_bShouldBatch = false;
-	m_bShouldSort = true;
-	m_pFirstCollection = NULL;
-	m_flCullRadius = 0.0f;
-	m_flCullFillCost = 1.0f;
-	m_nRetireCheckFrame = 0;
-}
-
-inline CParticleSystemDefinition::~CParticleSystemDefinition(void)
-{
-	UnlinkAllCollections();
-	m_Operators.PurgeAndDeleteElements();
-	m_Renderers.PurgeAndDeleteElements();
-	m_Initializers.PurgeAndDeleteElements();
-	m_Emitters.PurgeAndDeleteElements();
-	m_ForceGenerators.PurgeAndDeleteElements();
-	m_Constraints.PurgeAndDeleteElements();
-}
-
-inline CParticleCollection* CParticleSystemDefinition::FirstCollection()
-{
-	return m_pFirstCollection;
-}
-
-inline float CParticleSystemDefinition::GetCullRadius() const
-{
-	return m_flCullRadius;
-}
-
-inline float CParticleSystemDefinition::GetCullFillCost() const
-{
-	return m_flCullFillCost;
-}
-
-inline const char* CParticleSystemDefinition::GetCullReplacementDefinition() const
-{
-	return m_pszCullReplacementName;
-}
-
-inline int CParticleSystemDefinition::GetCullControlPoint() const
-{
-	return m_nCullControlPoint;
-}
-
-inline void CParticleSystemDefinition::MarkReadsControlPoint(int nPoint)
-{
-	m_nControlPointReadMask |= (1ULL << nPoint);
-}
-
-inline bool CParticleSystemDefinition::ReadsControlPoint(int nPoint) const
-{
-	return (m_nControlPointReadMask & (1ULL << nPoint)) != 0;
-}
-
-inline bool CParticleSystemDefinition::HasRetirementBeenChecked(int nFrame) const
-{
-	return m_nRetireCheckFrame == nFrame;
-}
-
-inline void CParticleSystemDefinition::MarkRetirementCheck(int nFrame)
-{
-	m_nRetireCheckFrame = nFrame;
-}
-
-inline bool CParticleSystemDefinition::ShouldBatch() const
-{
-	return m_bShouldBatch;
-}
-
-inline bool CParticleSystemDefinition::IsViewModelEffect() const
-{
-	return m_bViewModelEffect;
-}
-
-inline const char* CParticleSystemDefinition::MaterialName() const
-{
-	return m_pszMaterialName;
-}
-
-inline const DmObjectId_t& CParticleSystemDefinition::GetId() const
-{
-	return m_Id;
-}
-
-inline int CParticleCollection::GetGroupID(void) const
-{
-	return m_pDef->m_nGroupID;
-}
-
-FORCEINLINE const Vector& CParticleCollection::GetControlPointAtCurrentTime(int nControlPoint) const
-{
-	Assert(nControlPoint <= GetHighestControlPoint());
-	Assert(m_pDef->ReadsControlPoint(nControlPoint));
-	return m_ControlPoints[nControlPoint].m_Position;
-}
-
-FORCEINLINE void CParticleCollection::GetControlPointOrientationAtCurrentTime(int nControlPoint, Vector* pForward, Vector* pRight, Vector* pUp) const
-{
-	Assert(nControlPoint <= GetHighestControlPoint());
-	Assert(m_pDef->ReadsControlPoint(nControlPoint));
-
-	*pForward = m_ControlPoints[nControlPoint].m_ForwardVector;
-	*pRight = m_ControlPoints[nControlPoint].m_RightVector;
-	*pUp = m_ControlPoints[nControlPoint].m_UpVector;
-}
-
-FORCEINLINE int CParticleCollection::GetControlPointParent(int nControlPoint) const
-{
-	Assert(nControlPoint <= GetHighestControlPoint());
-	Assert(m_pDef->ReadsControlPoint(nControlPoint));
-	return m_ControlPoints[nControlPoint].m_nParent;
-}
-
-FORCEINLINE bool CParticleCollection::IsValid(void) const
-{
-	return (m_pDef != NULL && m_pDef->GetMaterial());
-}
-
-
-#endif	 
\ No newline at end of file
diff --git a/SpyCustom/particles_new.h b/SpyCustom/particles_new.h
deleted file mode 100644
index 32abaf7..0000000
--- a/SpyCustom/particles_new.h
+++ /dev/null
@@ -1,295 +0,0 @@
-#ifndef PARTICLES_NEW_H
-#define PARTICLES_NEW_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "particlemgr.h"
-#include "particles.h"
-#include "particlesphererenderer.h"
-#include "smartptr.h"
-#include "particles_simple.h"
-#include "utlobjectreference.h"
-
-
-class CNewParticleEffect : public IParticleEffect, public CParticleCollection, public CDefaultClientRenderable
-{
-public:
-	DECLARE_CLASS_NOBASE(CNewParticleEffect);
-	DECLARE_REFERENCED_CLASS(CNewParticleEffect);
-
-public:
-	friend class CRefCountAccessor;
-
-	CNewParticleEffect* m_pNext;
-	CNewParticleEffect* m_pPrev;
-
-	void SetSortOrigin(const Vector& vSortOrigin);
-	bool ShouldDraw(void);
-	virtual bool IsTransparent(void);
-	virtual bool IsTwoPass(void);
-	virtual bool UsesPowerOfTwoFrameBufferTexture(void);
-	virtual bool UsesFullFrameBufferTexture(void);
-	const QAngle& GetRenderAngles(void);
-	const matrix3x4_t& RenderableToWorldTransform();
-	void GetRenderBounds(Vector& mins, Vector& maxs);
-
-	void DetectChanges(void);
-	const Vector& GetRenderOrigin(void);
-	PMaterialHandle GetPMaterial(const char* name);
-	bool RecalculateBoundingBox();
-	Particle* AddParticle(unsigned int particleSize, PMaterialHandle material, const Vector& origin);
-	const char* GetEffectName();
-	void SetDontRemove(bool bSet);
-	void SetDrawn(bool bDrawn);
-	void SetFirstFrameFlag(bool bFirst);
-	void SetNeedsBBoxUpdate(bool bNeedsUpdate);
-	void SetAutoUpdateBBox(bool bNeedsUpdate);
-	void SetRemoveFlag(void);
-	bool GetRemoveFlag(void);
-	bool GetFirstFrameFlag(void);
-	bool GetNeedsBBoxUpdate(void);
-	bool GetAutoUpdateBBox(void);
-	bool ShouldPerformCullCheck() const;
-	void MarkShouldPerformCullCheck(bool bEnable);
-	CBaseEntity* GetOwner(void) { return m_hOwner; }
-	void SetOwner(CBaseEntity* pOwner) { m_hOwner = pOwner; }
-	CNewParticleEffect* ReplaceWith(const char* pParticleSystemName);
-
-	static CSmartPtr<CNewParticleEffect> Create(CBaseEntity* pOwner, const char* pParticleSystemName,
-		const char* pDebugName = NULL);
-	static CSmartPtr<CNewParticleEffect> Create(CBaseEntity* pOwner, CParticleSystemDefinition* pDef,
-		const char* pDebugName = NULL);
-	virtual int DrawModel(int flags);
-
-	void DebugDrawBbox(bool bCulled);
-
-public:
-	void StopEmission(bool bInfiniteOnly = false, bool bRemoveAllParticles = false, bool bWakeOnStop = false);
-	void SetDormant(bool bDormant);
-	void SetControlPoint(int nWhichPoint, const Vector& v);
-	void SetControlPointEntity(int nWhichPoint, CBaseEntity* pEntity);
-	void SetControlPointOrientation(int nWhichPoint, const Quaternion& q);
-	void SetControlPointOrientation(int nWhichPoint, const Vector& forward, const Vector& right, const Vector& up);
-	void SetControlPointForwardVector(int nWhichPoint, const Vector& v);
-	void SetControlPointUpVector(int nWhichPoint, const Vector& v);
-	void SetControlPointRightVector(int nWhichPoint, const Vector& v);
-
-	FORCEINLINE EHANDLE const& GetControlPointEntity(int nWhichPoint)
-	{
-		return m_hControlPointOwners[nWhichPoint];
-	}
-
-
-public:
-
-	virtual void	SimulateParticles(CParticleSimulateIterator* pIterator)
-	{
-	}
-	virtual void	RenderParticles(CParticleRenderIterator* pIterator)
-	{
-	}
-
-	virtual void				SetParticleCullRadius(float radius);
-	virtual void				NotifyRemove(void);
-	virtual const Vector& GetSortOrigin(void);
-
-	virtual void				Update(float flTimeDelta);
-
-	void SetDynamicallyAllocated(bool bDynamic = true);
-
-	virtual bool				ShouldSimulate() const { return m_bSimulate; }
-	virtual void				SetShouldSimulate(bool bSim) { m_bSimulate = bSim; }
-
-	int AllocateToolParticleEffectId();
-	int GetToolParticleEffectId() const;
-	CNewParticleEffect(CBaseEntity* pOwner, const char* pEffectName);
-	CNewParticleEffect(CBaseEntity* pOwner, CParticleSystemDefinition* pEffect);
-	virtual ~CNewParticleEffect();
-
-protected:
-	int		IsReleased();
-
-	const char* m_pDebugName;
-
-	bool		m_bDontRemove : 1;
-	bool		m_bRemove : 1;
-	bool		m_bDrawn : 1;
-	bool		m_bNeedsBBoxUpdate : 1;
-	bool		m_bIsFirstFrame : 1;
-	bool		m_bAutoUpdateBBox : 1;
-	bool		m_bAllocated : 1;
-	bool		m_bSimulate : 1;
-	bool		m_bShouldPerformCullCheck : 1;
-
-	int			m_nToolParticleEffectId;
-	Vector		m_vSortOrigin;
-	EHANDLE		m_hOwner;
-	EHANDLE     m_hControlPointOwners[MAX_PARTICLE_CONTROL_POINTS];
-
-	Vector		m_LastMin;
-	Vector		m_LastMax;
-
-private:
-	void		AddRef();
-	void		Release();
-	void		RecordControlPointOrientation(int nWhichPoint);
-	void		Construct();
-
-	int			m_RefCount;		            
-	CNewParticleEffect(const CNewParticleEffect&);     
-};
-
-
-inline int CNewParticleEffect::GetToolParticleEffectId() const
-{
-	return m_nToolParticleEffectId;
-}
-
-inline int CNewParticleEffect::AllocateToolParticleEffectId()
-{
-	m_nToolParticleEffectId = ParticleMgr()->AllocateToolParticleEffectId();
-	return m_nToolParticleEffectId;
-}
-
-inline void CNewParticleEffect::SetSortOrigin(const Vector& vSortOrigin)
-{
-	m_vSortOrigin = vSortOrigin;
-}
-
-inline const Vector& CNewParticleEffect::GetSortOrigin(void)
-{
-	return m_vSortOrigin;
-}
-
-inline bool CNewParticleEffect::ShouldDraw(void)
-{
-	return true;
-}
-
-inline bool CNewParticleEffect::IsTransparent(void)
-{
-	return CParticleCollection::IsTranslucent();
-}
-
-inline const QAngle& CNewParticleEffect::GetRenderAngles(void)
-{
-	return vec3_angle;
-}
-
-inline const matrix3x4_t& CNewParticleEffect::RenderableToWorldTransform()
-{
-	static matrix3x4_t mat;
-	SetIdentityMatrix(mat);
-	PositionMatrix(GetRenderOrigin(), mat);
-	return mat;
-}
-
-inline Vector const& CNewParticleEffect::GetRenderOrigin(void)
-{
-	return m_vSortOrigin;
-}
-
-inline PMaterialHandle CNewParticleEffect::GetPMaterial(const char* name)
-{
-	Assert(0);
-	return NULL;
-}
-
-inline Particle* CNewParticleEffect::AddParticle(unsigned int particleSize, PMaterialHandle material, const Vector& origin)
-{
-	Assert(0);
-	return NULL;
-}
-
-
-inline const char* CNewParticleEffect::GetEffectName()
-{
-	return GetName();
-}
-
-inline void CNewParticleEffect::SetDontRemove(bool bSet)
-{
-	m_bDontRemove = bSet;
-}
-
-inline void CNewParticleEffect::SetDrawn(bool bDrawn)
-{
-	m_bDrawn = bDrawn;
-}
-
-inline void CNewParticleEffect::SetFirstFrameFlag(bool bFirst)
-{
-	m_bIsFirstFrame = bFirst;
-}
-
-inline void CNewParticleEffect::SetDynamicallyAllocated(bool bDynamic)
-{
-	m_bAllocated = bDynamic;
-}
-
-inline void CNewParticleEffect::SetNeedsBBoxUpdate(bool bNeedsUpdate)
-{
-	m_bNeedsBBoxUpdate = bNeedsUpdate;
-}
-
-inline void CNewParticleEffect::SetAutoUpdateBBox(bool bNeedsUpdate)
-{
-	m_bAutoUpdateBBox = bNeedsUpdate;
-}
-
-inline void CNewParticleEffect::SetRemoveFlag(void)
-{
-	m_bRemove = true;
-}
-
-inline bool CNewParticleEffect::GetRemoveFlag(void)
-{
-	return m_bRemove;
-}
-
-inline bool CNewParticleEffect::GetFirstFrameFlag(void)
-{
-	return m_bIsFirstFrame;
-}
-
-inline bool CNewParticleEffect::GetNeedsBBoxUpdate(void)
-{
-	return m_bNeedsBBoxUpdate;
-}
-
-inline bool CNewParticleEffect::GetAutoUpdateBBox(void)
-{
-	return m_bAutoUpdateBBox;
-}
-
-inline bool CNewParticleEffect::ShouldPerformCullCheck() const
-{
-	return m_bShouldPerformCullCheck;
-}
-
-inline void CNewParticleEffect::MarkShouldPerformCullCheck(bool bEnable)
-{
-	m_bShouldPerformCullCheck = bEnable;
-}
-
-inline CSmartPtr<CNewParticleEffect> CNewParticleEffect::Create(CBaseEntity* pOwner, const char* pParticleSystemName, const char* pDebugName)
-{
-	CNewParticleEffect* pRet = new CNewParticleEffect(pOwner, pParticleSystemName);
-	pRet->m_pDebugName = pDebugName;
-	pRet->SetDynamicallyAllocated(true);
-	return pRet;
-}
-
-inline CSmartPtr<CNewParticleEffect> CNewParticleEffect::Create(CBaseEntity* pOwner, CParticleSystemDefinition* pDef, const char* pDebugName)
-{
-	CNewParticleEffect* pRet = new CNewParticleEffect(pOwner, pDef);
-	pRet->m_pDebugName = pDebugName;
-	pRet->SetDynamicallyAllocated(true);
-	return pRet;
-}
-
-typedef CUtlReference<CNewParticleEffect> HPARTICLEFFECT;
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/particles_simple.h b/SpyCustom/particles_simple.h
deleted file mode 100644
index 71ea268..0000000
--- a/SpyCustom/particles_simple.h
+++ /dev/null
@@ -1,206 +0,0 @@
-#ifndef PARTICLES_SIMPLE_H
-#define PARTICLES_SIMPLE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "particlemgr.h"
-#include "ParticleSphereRenderer.h"
-#include "smartptr.h"
-
-
-class CParticleEffect : public IParticleEffect
-{
-public:
-	DECLARE_CLASS_NOBASE(CParticleEffect);
-
-	friend class CRefCountAccessor;
-
-	void				SetSortOrigin(const Vector& vSortOrigin);
-
-	PMaterialHandle		GetPMaterial(const char* name);
-
-	Particle* AddParticle(unsigned int particleSize, PMaterialHandle material, const Vector& origin);
-
-	CParticleEffectBinding& GetBinding() { return m_ParticleEffect; }
-
-	const char* GetEffectName();
-
-	void AddFlags(int iFlags) { m_Flags |= iFlags; }
-	void RemoveFlags(int iFlags) { m_Flags &= ~iFlags; }
-
-	void SetDontRemove(bool bSet)
-	{
-		if (bSet)
-			AddFlags(FLAG_DONT_REMOVE);
-		else
-			RemoveFlags(FLAG_DONT_REMOVE);
-	}
-
-public:
-
-	virtual void				SetParticleCullRadius(float radius);
-	virtual void				NotifyRemove(void);
-	virtual const Vector& GetSortOrigin();
-	virtual void				NotifyDestroyParticle(Particle* pParticle);
-	virtual void				Update(float flTimeDelta);
-
-	void						SetDynamicallyAllocated(bool bDynamic = true);
-
-	virtual bool				ShouldSimulate() const { return m_bSimulate; }
-	virtual void				SetShouldSimulate(bool bSim) { m_bSimulate = bSim; }
-
-	int							AllocateToolParticleEffectId();
-	int							GetToolParticleEffectId() const;
-protected:
-	CParticleEffect(const char* pDebugName);
-	virtual						~CParticleEffect();
-
-	int							IsReleased();
-
-	enum
-	{
-		FLAG_ALLOCATED = (1 << 1),	        
-								FLAG_DONT_REMOVE = (1 << 2),
-	};
-
-	char const* m_pDebugName;
-
-	CParticleEffectBinding		m_ParticleEffect;
-	Vector						m_vSortOrigin;
-
-	int							m_Flags;		   
-
-	bool						m_bSimulate;
-	int							m_nToolParticleEffectId;
-
-private:
-	void						AddRef();
-	void						Release();
-
-	int							m_RefCount;		            
-	CParticleEffect(const CParticleEffect&);     
-};
-
-inline int CParticleEffect::GetToolParticleEffectId() const
-{
-	return m_nToolParticleEffectId;
-}
-
-inline int CParticleEffect::AllocateToolParticleEffectId()
-{
-	m_nToolParticleEffectId = ParticleMgr()->AllocateToolParticleEffectId();
-	return m_nToolParticleEffectId;
-}
-
-
-enum SimpleParticleFlag_t
-{
-	SIMPLE_PARTICLE_FLAG_WINDBLOWN = 0x1,
-	SIMPLE_PARTICLE_FLAG_NO_VEL_DECAY = 0x2	           
-};
-
-class SimpleParticle : public Particle
-{
-public:
-	SimpleParticle() : m_iFlags(0) {}
-
-	Vector		m_vecVelocity;
-	float		m_flRoll;
-	float		m_flDieTime;	     
-	float		m_flLifetime;	         
-	unsigned char	m_uchColor[3];
-	unsigned char	m_uchStartAlpha;
-	unsigned char	m_uchEndAlpha;
-	unsigned char	m_uchStartSize;
-	unsigned char	m_uchEndSize;
-	unsigned char 	m_iFlags;	   
-	float		m_flRollDelta;
-};
-
-
-
-class CSimpleEmitter : public CParticleEffect
-{
-public:
-
-	DECLARE_CLASS(CSimpleEmitter, CParticleEffect);
-
-	static CSmartPtr<CSimpleEmitter>	Create(const char* pDebugName);
-
-	virtual void	SimulateParticles(CParticleSimulateIterator* pIterator);
-	virtual void	RenderParticles(CParticleRenderIterator* pIterator);
-
-	void			SetNearClip(float nearClipMin, float nearClipMax);
-
-	void			SetDrawBeforeViewModel(bool state = true);
-
-	SimpleParticle* AddSimpleParticle(PMaterialHandle hMaterial, const Vector& vOrigin, float flDieTime = 3, unsigned char uchSize = 10);
-
-	void			SetShouldDrawForSplitScreenUser(int nSlot);
-
-protected:
-	CSimpleEmitter(const char* pDebugName = NULL);
-	virtual			~CSimpleEmitter();
-
-	virtual	float	UpdateAlpha(const SimpleParticle* pParticle);
-	virtual float	UpdateScale(const SimpleParticle* pParticle);
-	virtual	float	UpdateRoll(SimpleParticle* pParticle, float timeDelta);
-	virtual	void	UpdateVelocity(SimpleParticle* pParticle, float timeDelta);
-	virtual Vector	UpdateColor(const SimpleParticle* pParticle);
-
-	float			m_flNearClipMin;
-	float			m_flNearClipMax;
-
-	int				m_nSplitScreenPlayerSlot;
-
-
-private:
-	CSimpleEmitter(const CSimpleEmitter&);     
-};
-
-class CEmberEffect : public CSimpleEmitter
-{
-public:
-	CEmberEffect(const char* pDebugName);
-	static CSmartPtr<CEmberEffect>	Create(const char* pDebugName);
-
-	virtual void UpdateVelocity(SimpleParticle* pParticle, float timeDelta);
-	virtual Vector UpdateColor(const SimpleParticle* pParticle);
-
-private:
-	CEmberEffect(const CEmberEffect&);     
-};
-
-
-class CFireSmokeEffect : public CSimpleEmitter
-{
-public:
-	CFireSmokeEffect(const char* pDebugName);
-	static CSmartPtr<CFireSmokeEffect>	Create(const char* pDebugName);
-
-	virtual void UpdateVelocity(SimpleParticle* pParticle, float timeDelta);
-	virtual float UpdateAlpha(const SimpleParticle* pParticle);
-
-protected:
-	VPlane	m_planeClip;
-
-private:
-	CFireSmokeEffect(const CFireSmokeEffect&);     
-};
-
-
-class CFireParticle : public CSimpleEmitter
-{
-public:
-	CFireParticle(const char* pDebugName);
-	static CSmartPtr<CFireParticle>	Create(const char* pDebugName);
-
-	virtual Vector UpdateColor(const SimpleParticle* pParticle);
-
-private:
-	CFireParticle(const CFireParticle&);     
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/pbwrap.hpp b/SpyCustom/pbwrap.hpp
deleted file mode 100644
index d8a1d6d..0000000
--- a/SpyCustom/pbwrap.hpp
+++ /dev/null
@@ -1,779 +0,0 @@
-#pragma once
-#include <stdint.h>
-#include <string>
-#include <vector>
-#include <tuple>
-
-#define PBFIELD(number, type, name) \
-  pbfield<number, type> name() const { \
-    return std::move(pbfield<number, type>( fv_ )); \
-  }
-
-#if defined(__GNUC__)
-#include <cstring>
-#include <memory>
-
-#define __forceinline __attribute__((always_inline))
-
-#define PBMSG_CTOR(class_name) \
-      class_name() : pbmsg() {} \
-      class_name(void* buf, size_t bytes) : pbmsg(buf, bytes) {} \
-      class_name(const std::string& buf) : pbmsg(buf) {}
-
-#elif defined(_MSC_VER)
-#define PBMSG_CTOR using pbmsg::pbmsg
-#endif
-
-namespace pbwrap
-{
-    static constexpr int32_t k_invalid_id = -1;
-
-    enum e_field_type
-    {
-        TYPE_DOUBLE = 1,
-        TYPE_FLOAT = 2,
-        TYPE_INT64 = 3,
-        TYPE_UINT64 = 4,
-        TYPE_INT32 = 5,
-        TYPE_FIXED64 = 6,
-        TYPE_FIXED32 = 7,
-        TYPE_BOOL = 8,
-        TYPE_STRING = 9,
-        TYPE_GROUP = 10,
-        TYPE_MESSAGE = 11,
-        TYPE_BYTES = 12,
-        TYPE_UINT32 = 13,
-        TYPE_ENUM = 14,
-        TYPE_SFIXED32 = 15,
-        TYPE_SFIXED64 = 16,
-        TYPE_SINT32 = 17,
-        TYPE_SINT64 = 18,
-        MAX_FIELD_TYPE = 18,
-    };
-
-    enum e_wire_type
-    {
-        WIRETYPE_VARINT = 0,
-        WIRETYPE_FIXED64 = 1,
-        WIRETYPE_LENGTH_DELIMITED = 2,
-        WIRETYPE_START_GROUP = 3,
-        WIRETYPE_END_GROUP = 4,
-        WIRETYPE_FIXED32 = 5,
-    };
-
-    static constexpr e_wire_type k_wire_type_for_field_type[MAX_FIELD_TYPE + 1] = {
-      static_cast<e_wire_type>(k_invalid_id),  
-      WIRETYPE_FIXED64,  
-      WIRETYPE_FIXED32,  
-      WIRETYPE_VARINT,  
-      WIRETYPE_VARINT,  
-      WIRETYPE_VARINT,  
-      WIRETYPE_FIXED64,  
-      WIRETYPE_FIXED32,  
-      WIRETYPE_VARINT,  
-      WIRETYPE_LENGTH_DELIMITED,  
-      WIRETYPE_START_GROUP,  
-      WIRETYPE_LENGTH_DELIMITED,  
-      WIRETYPE_LENGTH_DELIMITED,  
-      WIRETYPE_VARINT,  
-      WIRETYPE_VARINT,  
-      WIRETYPE_FIXED32,  
-      WIRETYPE_FIXED64,  
-      WIRETYPE_VARINT,  
-      WIRETYPE_VARINT,  
-    };
-
-    namespace utils
-    {
-        static constexpr int k_tag_type_bits = 3;
-        static constexpr uint32_t k_tag_type_mask = (1 << k_tag_type_bits) - 1;
-        static constexpr int k_max_varint_bytes = 10;
-        static constexpr int k_max_varint32_bytes = 5;
-
-        __forceinline auto make_tag(uint32_t field_number, uint32_t wire_type) -> uint32_t
-        {
-            return static_cast<uint32_t>((field_number << k_tag_type_bits) | wire_type);
-        }
-
-        static auto get_bytes_varint32(uint32_t value) -> std::string
-        {
-            uint8_t bytes[k_max_varint32_bytes];
-            int size = 0;
-            while (value > 0x7F)
-            {
-                bytes[size++] = (static_cast<uint8_t>(value) & 0x7F) | 0x80;
-                value >>= 7;
-            }
-            bytes[size++] = static_cast<uint8_t>(value) & 0x7F;
-            return std::string{ reinterpret_cast<const char*>(&bytes[0]), (size_t)size };
-        }
-
-        static auto get_bytes_varint64(uint64_t value) -> std::string
-        {
-            uint8_t bytes[k_max_varint_bytes];
-            int size = 0;
-            while (value > 0x7F)
-            {
-                bytes[size++] = (static_cast<uint8_t>(value) & 0x7F) | 0x80;
-                value >>= 7;
-            }
-            bytes[size++] = static_cast<uint8_t>(value) & 0x7F;
-            return std::string{ reinterpret_cast<const char*>(&bytes[0]), (size_t)size };
-        }
-
-        static auto read_varuint32(const void* data, size_t& bytes_read) -> uint32_t
-        {
-            auto ptr = reinterpret_cast<const uint8_t*>(data);
-            auto value = 0u;
-            auto bytes = 0u;
-
-            do
-            {
-                value |= static_cast<uint32_t>(*ptr & 0x7f) << (7 * bytes);
-                bytes++;
-            } while (*(ptr++) & 0x80 && bytes <= 5);
-
-            bytes_read = bytes;
-            return value;
-        }
-
-        static auto read_varuint64(const void* data, size_t& bytes_read) -> uint64_t
-        {
-            auto ptr = reinterpret_cast<const uint8_t*>(data);
-            auto value = 0ull;
-            auto bytes = 0u;
-
-            do
-            {
-                value |= static_cast<uint64_t>(*ptr & 0x7f) << (7 * bytes);
-                bytes++;
-            } while (*(ptr++) & 0x80 && bytes <= 10);
-
-            bytes_read = bytes;
-
-            return value;
-        }
-
-        static auto read_field(const void* data, size_t& bytes_read)
-            -> std::tuple<uint32_t, uint32_t, std::string, std::string>
-        {
-            uint32_t field = *reinterpret_cast<const uint16_t*>(data);
-            uint32_t wire_type = field & k_tag_type_mask;
-
-            if (field == 0xffff)
-            {
-                bytes_read = 0;
-                return std::make_tuple(k_invalid_id, k_invalid_id, "", "");
-            }
-
-            if (field & 0x80)
-            {
-                field = ((field & 0x7f) | ((field & 0xff00) >> 1)) >> k_tag_type_bits;
-                bytes_read = 2;
-            }
-            else
-            {
-                field = (field & 0xff) >> k_tag_type_bits;
-                bytes_read = 1;
-            }
-
-            std::string value_bytes, full_bytes;
-            size_t length, size_delimited;
-
-            switch (wire_type)
-            {
-            case WIRETYPE_VARINT:
-                read_varuint64((void*)((ptrdiff_t)data + bytes_read), length);
-                value_bytes = std::string{ reinterpret_cast<const char*>((void*)((ptrdiff_t)data + bytes_read)), length };
-                full_bytes = std::string{ reinterpret_cast<const char*>(data), bytes_read + length };
-                bytes_read += length;
-                break;
-            case WIRETYPE_FIXED64:
-                value_bytes = std::string{ reinterpret_cast<const char*>((void*)((ptrdiff_t)data + bytes_read)), 8 };
-                full_bytes = std::string{ reinterpret_cast<const char*>(data), bytes_read + 8 };
-                bytes_read += 8;
-                break;
-            case WIRETYPE_LENGTH_DELIMITED:
-                size_delimited = read_varuint32((void*)((ptrdiff_t)data + bytes_read), length);
-                value_bytes = std::string{
-                  reinterpret_cast<const char*>((void*)((ptrdiff_t)data + bytes_read)), length + size_delimited
-                };
-                full_bytes = std::string{ reinterpret_cast<const char*>(data), bytes_read + length + size_delimited };
-                bytes_read += length + size_delimited;
-                break;
-            case WIRETYPE_START_GROUP:
-                throw std::runtime_error("WIRETYPE_START_GROUP not implemented");
-                break;
-            case WIRETYPE_END_GROUP:
-                throw std::runtime_error("WIRETYPE_END_GROUP not implemented");
-                break;
-            case WIRETYPE_FIXED32:
-                value_bytes = std::string{ reinterpret_cast<const char*>((void*)((ptrdiff_t)data + bytes_read)), 4 };
-                full_bytes = std::string{ reinterpret_cast<const char*>(data), bytes_read + 4 };
-                bytes_read += 4;
-                break;
-            default:
-                throw std::runtime_error("Unknown wire type");
-                break;
-            }
-
-            return std::make_tuple(field, wire_type, std::move(value_bytes), std::move(full_bytes));
-        }
-
-        template <typename T>
-        auto get_field_bytes(uint32_t field, uint32_t wire_type, T value)
-            -> std::pair<std::string, std::string>
-        {
-            const auto tag = get_bytes_varint32(make_tag(field, wire_type));
-
-            std::string bytes{};
-            switch (wire_type)
-            {
-            case WIRETYPE_VARINT:
-                bytes += get_bytes_varint64(static_cast<uint64_t>(value));
-                break;
-            case WIRETYPE_FIXED32:
-                bytes += std::string{ reinterpret_cast<const char*>(&value), 4 };
-                break;
-            case WIRETYPE_FIXED64:
-                bytes += std::string{ reinterpret_cast<const char*>(&value), 8 };
-                break;
-            }
-
-            return { bytes, tag + bytes };
-        }
-
-        template <>
-        inline auto get_field_bytes<std::string>(uint32_t field, uint32_t wire_type, std::string value)
-            -> std::pair<std::string, std::string>
-        {
-            const auto tag = get_bytes_varint32(make_tag(field, wire_type));
-
-            std::string bytes{};
-            bytes += get_bytes_varint32(value.size());
-            bytes += value;
-
-            return { bytes, tag + bytes };
-        }
-
-        template <>
-        inline auto get_field_bytes<const char*>(uint32_t field, uint32_t wire_type, const char* value)
-            -> std::pair<std::string, std::string>
-        {
-            const auto tag = get_bytes_varint32(make_tag(field, wire_type));
-
-            std::string bytes{};
-            bytes += get_bytes_varint32(strlen(value));
-            bytes += value;
-
-            return { bytes, tag + bytes };
-        }
-    }  
-
-    namespace types
-    {
-        struct Int32
-        {
-            static constexpr e_field_type field_type = TYPE_INT32;
-            using type = int32_t;
-
-            static __forceinline auto get(const std::string& value) -> int32_t
-            {
-                size_t bytes_read;
-                return utils::read_varuint32(value.data(), bytes_read);
-            }
-        };
-
-        struct Uint32
-        {
-            static constexpr e_field_type field_type = TYPE_UINT32;
-            using type = uint32_t;
-
-            static __forceinline auto get(const std::string& value) -> uint32_t
-            {
-                size_t bytes_read;
-                return utils::read_varuint32(value.data(), bytes_read);
-            }
-        };
-
-        struct Int64
-        {
-            static constexpr e_field_type field_type = TYPE_INT64;
-            using type = int64_t;
-
-            static __forceinline auto get(const std::string& value) -> int64_t
-            {
-                size_t bytes_read;
-                return utils::read_varuint64(value.data(), bytes_read);
-            }
-        };
-
-        struct Uint64
-        {
-            static constexpr e_field_type field_type = TYPE_UINT64;
-            using type = uint64_t;
-
-            static __forceinline auto get(const std::string& value) -> uint64_t
-            {
-                size_t bytes_read;
-                return utils::read_varuint64(value.data(), bytes_read);
-            }
-        };
-
-        struct Float
-        {
-            static constexpr e_field_type field_type = TYPE_FLOAT;
-            using type = float;
-
-            static __forceinline auto get(const std::string& value) -> float
-            {
-                return *reinterpret_cast<const float*>(value.data());
-            }
-        };
-
-        struct Double
-        {
-            static constexpr e_field_type field_type = TYPE_DOUBLE;
-            using type = double;
-
-            static __forceinline auto get(const std::string& value) -> double
-            {
-                return *reinterpret_cast<const double*>(value.data());
-            }
-        };
-
-        struct Fixed32
-        {
-            static constexpr e_field_type field_type = TYPE_FIXED32;
-            using type = int32_t;
-
-            static __forceinline auto get(const std::string& value) -> int32_t
-            {
-                return *reinterpret_cast<const int32_t*>(value.data());
-            }
-        };
-
-        struct Fixed64
-        {
-            static constexpr e_field_type field_type = TYPE_FIXED64;
-            using type = int64_t;
-
-            static __forceinline auto get(const std::string& value) -> int64_t
-            {
-                return *reinterpret_cast<const int64_t*>(value.data());
-            }
-        };
-
-        struct Bool
-        {
-            static constexpr e_field_type field_type = TYPE_BOOL;
-            using type = bool;
-
-            static __forceinline auto get(const std::string& value) -> bool
-            {
-                size_t bytes_read;
-                return !!utils::read_varuint32(value.data(), bytes_read);
-            }
-        };
-
-        struct String
-        {
-            static constexpr e_field_type field_type = TYPE_STRING;
-            using type = std::string;
-
-            static __forceinline auto get(const std::string& value) -> std::string
-            {
-                size_t bytes_read;
-                const auto length = utils::read_varuint32(value.data(), bytes_read);
-                auto result = std::string{ value.data() + bytes_read, length };
-                return std::move(result);
-            }
-        };
-
-        struct Group : String
-        {
-            static constexpr e_field_type field_type = TYPE_GROUP;
-        };
-
-        struct Message : String
-        {
-            static constexpr e_field_type field_type = TYPE_MESSAGE;
-        };
-
-        struct Bytes : String
-        {
-            static constexpr e_field_type field_type = TYPE_BYTES;
-        };
-
-        struct Enum : Int32
-        {
-            static constexpr e_field_type field_type = TYPE_ENUM;
-        };
-
-        struct Sfixed32 : Fixed32
-        {
-            static constexpr e_field_type field_type = TYPE_SFIXED32;
-        };
-
-        struct Sfixed64 : Fixed64
-        {
-            static constexpr e_field_type field_type = TYPE_SFIXED64;
-        };
-
-        struct Sint32
-        {
-            static constexpr e_field_type field_type = TYPE_SINT32;
-            using type = int32_t;
-        };
-
-        struct Sint64
-        {
-            static constexpr e_field_type field_type = TYPE_SINT64;
-            using type = int64_t;
-        };
-    }  
-
-    namespace base
-    {
-        struct field_vector
-        {
-            using Entry = std::pair<std::string, std::string>;   
-            using Field = std::vector<Entry>;
-            using Fields = std::vector<Field>;
-
-            const std::shared_ptr<Fields> fields;
-            const size_t max_size;
-
-            explicit field_vector(const size_t max_size) : fields{ std::make_shared<Fields>() }, max_size{ max_size + 1 }
-            {
-                fields->resize(this->max_size);
-            }
-
-            auto clear(const uint32_t field) const -> void
-            {
-                if (field >= max_size)
-                    throw std::runtime_error("field range error");
-
-                auto& fld = fields->at(field);
-
-                if (!fld.empty())
-                    fld.clear();
-            }
-
-            auto has(const uint32_t field, const size_t index = 0) const -> bool
-            {
-                if (field >= max_size)
-                    throw std::runtime_error("field range error");
-
-                auto& fld = fields->at(field);
-
-                return fld.size() > index;
-            }
-
-            auto count(const uint32_t field) const -> size_t
-            {
-                if (field >= max_size)
-                    throw std::runtime_error("field range error");
-
-                auto& fld = fields->at(field);
-
-                return fld.size();
-            }
-
-            auto add(const uint32_t field, const Entry& entry) const -> void
-            {
-                if (field >= max_size)
-                    throw std::runtime_error("field range error");
-
-                fields->at(field).emplace_back(entry);
-            }
-
-            auto set(const uint32_t field, const Entry& entry, const size_t index = 0) const -> void
-            {
-                if (field >= max_size)
-                    throw std::runtime_error("field range error");
-
-                auto& fld = fields->at(field);
-
-                if (index == 0 && fld.empty())
-                {
-                    fld.emplace_back(entry);
-                }
-                else
-                {
-                    if (index >= fld.size())
-                        throw std::runtime_error("field range error");
-
-                    fld.at(index) = entry;
-                }
-            }
-
-            auto get(const uint32_t field, const size_t index = 0) const -> std::string
-            {
-                if (field >= max_size)
-                    throw std::runtime_error("field range error");
-
-                const auto& fld = fields->at(field);
-
-                if (index >= fld.size())
-                    throw std::runtime_error("field range error");
-
-                return fld.at(index).first;
-            }
-
-            auto get_all(const uint32_t field) const -> std::vector<std::string>
-            {
-                if (field >= max_size)
-                    throw std::runtime_error("field range error");
-
-                const auto& fld = fields->at(field);
-
-                std::vector<std::string> ret;
-
-                for (const auto& v : fld)
-                    ret.emplace_back(v.first);
-
-                return std::move(ret);
-            }
-        };
-
-        template <int Field, typename Type>
-        struct header
-        {
-            static constexpr uint32_t field = Field;
-            static constexpr e_field_type type = Type::field_type;
-            static constexpr e_wire_type wire_type = k_wire_type_for_field_type[type];
-        };
-
-        struct msg
-        {
-            static constexpr e_field_type field_type = TYPE_STRING;
-            using type = std::string;
-            virtual ~msg() = default;
-            msg() = delete;
-
-            explicit msg(const size_t max_size) : fv_{ field_vector(max_size) }
-            {
-            }
-
-            auto serialize() const -> std::string
-            {
-                std::string result;
-                for (const auto& f0 : *fv_.fields)
-                    for (const auto& f1 : f0)
-                        result.append(f1.second);
-
-                return std::move(result);
-            }
-
-            auto parse(const uint8_t* buf, size_t bytes) -> void
-            {
-                if (buf == nullptr)
-                    return;
-
-                size_t pos = 0, bytes_read;
-                uint32_t field, wire_type;
-                std::string field_value_bytes, field_full_bytes;
-
-                while (pos < bytes)
-                {
-                    std::tie(field, wire_type, field_value_bytes, field_full_bytes) = utils::read_field(buf + pos, bytes_read);
-
-                    if (bytes_read == 0)
-                        break;
-
-                    if (field >= fv_.max_size)
-                        throw std::runtime_error("field range error");
-
-                    fv_.fields->at(field).emplace_back(field_value_bytes, field_full_bytes);
-                    pos += bytes_read;
-                }
-            }
-
-        protected:
-            const field_vector fv_;
-        };
-
-        template <int Field, typename Type>
-        struct field
-        {
-            virtual ~field() = default;
-
-            explicit field(const field_vector& fv) : fv_{ fv }
-            {
-            }
-
-            auto clear() const -> void
-            {
-                fv_.clear(hdr.field);
-            }
-
-            auto has(size_t index = 0) const -> bool
-            {
-                return fv_.has(hdr.field, index);
-            }
-
-            auto count() const -> size_t
-            {
-                return fv_.count(hdr.field);
-            }
-
-        protected:
-            static constexpr header<Field, Type> hdr{};
-            const field_vector fv_;
-        };
-    }  
-
-
-    template <int Field, typename Type, typename S = void>
-    struct pbfield;
-
-
-    template <int Field, typename Type>
-    struct pbfield<Field, Type, typename std::enable_if<!std::is_base_of<base::msg, Type>::value>::type
-    > : base::field<Field, Type>
-    {
-        virtual ~pbfield() = default;
-
-        explicit pbfield(const base::field_vector& fv) : base::field<Field, Type>{ fv }
-        {
-        }
-
-        using type = typename Type::type;
-
-        auto add(type&& value) const -> void
-        {
-            const auto pair = utils::get_field_bytes(hdr.field, hdr.wire_type, value);
-            fv_.add(hdr.field, pair);
-        }
-
-        auto set(type&& value, size_t index = 0) const -> void
-        {
-            const auto pair = utils::get_field_bytes(hdr.field, hdr.wire_type, value);
-            fv_.set(hdr.field, pair, index);
-        }
-
-        auto set(const type& value, size_t index = 0) const -> void
-        {
-            const auto pair = utils::get_field_bytes(hdr.field, hdr.wire_type, value);
-            fv_.set(hdr.field, pair, index);
-        }
-
-        auto set(std::vector<type>&& values) const -> void
-        {
-            fv_.clear(hdr.field);
-
-            for (auto& v : values)
-            {
-                const auto pair = utils::get_field_bytes(hdr.field, hdr.wire_type, v);
-                fv_.add(hdr.field, pair);
-            }
-        }
-
-        auto set(std::vector<type>& values) const -> void
-        {
-            fv_.clear(hdr.field);
-
-            for (auto& v : values)
-            {
-                const auto pair = utils::get_field_bytes(hdr.field, hdr.wire_type, v);
-                fv_.add(hdr.field, pair);
-            }
-        }
-
-        auto get_all() const -> std::vector<type>
-        {
-            const auto values = fv_.get_all(hdr.field);
-
-            std::vector<type> ret;
-
-            for (const auto& v : values)
-                ret.emplace_back(Type::get(v));
-
-            return std::move(ret);
-        }
-
-        auto get(size_t index = 0) const -> type
-        {
-            const auto value = fv_.get(hdr.field, index);
-            return Type::get(value);
-        }
-
-    private:
-        using base::field<Field, Type>::hdr;
-        using base::field<Field, Type>::fv_;
-    };
-
-    template <int Field, typename Type>
-    struct pbfield<Field, Type, typename std::enable_if<std::is_base_of<base::msg, Type>::value>::type
-    > : base::field<Field, Type>
-    {
-        virtual ~pbfield() = default;
-
-        explicit pbfield(const base::field_vector& fv) : base::field<Field, Type>{ fv }
-        {
-        }
-
-        using type = typename Type::type;
-
-        auto add(const Type& value) const -> void
-        {
-            const auto v = value.serialize();
-            const auto pair = utils::get_field_bytes(hdr.field, hdr.wire_type, v);
-            fv_.add(hdr.field, pair);
-        }
-
-        auto set(const Type& value, size_t index = 0) const -> void
-        {
-            const auto v = value.serialize();
-            const auto pair = utils::get_field_bytes(hdr.field, hdr.wire_type, v);
-            fv_.set(hdr.field, pair, index);
-        }
-
-        auto get_all() const -> std::vector<Type>
-        {
-            const auto values = fv_.get_all(hdr.field);
-
-            std::vector<Type> ret;
-
-            for (const auto& v : values)
-            {
-                const auto s = types::String::get(v);
-                ret.emplace_back(s);
-            }
-
-            return std::move(ret);
-        }
-
-        auto get(size_t index = 0) const -> Type
-        {
-            const auto value = fv_.get(hdr.field, index);
-            const auto s = types::String::get(value);
-            return std::move(Type(s));
-        }
-
-    private:
-        using base::field<Field, Type>::hdr;
-        using base::field<Field, Type>::fv_;
-    };
-
-    template <size_t MsgSize>
-    struct pbmsg : base::msg
-    {
-        virtual ~pbmsg() = default;
-
-        explicit pbmsg() : msg(MsgSize)
-        {
-        }
-
-        explicit pbmsg(void* buf, size_t bytes) : msg(MsgSize)
-        {
-            parse(reinterpret_cast<const uint8_t*>(buf), bytes);
-        }
-
-        explicit pbmsg(const std::string& buf) : msg(MsgSize)
-        {
-            parse(reinterpret_cast<const uint8_t*>(buf.data()), buf.size());
-        }
-    };
-}  
diff --git a/SpyCustom/platform.h b/SpyCustom/platform.h
deleted file mode 100644
index 5c4f3ed..0000000
--- a/SpyCustom/platform.h
+++ /dev/null
@@ -1,1280 +0,0 @@
-#ifndef PLATFORM_H
-#define PLATFORM_H
-
-#if defined( _X360 )
-#define NO_STEAM
-#define NO_VOICE
-#define _XBOX
-#include <xtl.h>
-#include <xaudio2.h>
-#include <xbdm.h>
-#include <Xgraphics.h>
-#include <xui.h>
-#include <pmcpbsetup.h>
-#include <XMAHardwareAbstraction.h>
-#undef _XBOX
-#endif
-
-#include "wchartypes.h"
-#include "basetypes.h"
-#include "valve_off.h"
-
-#ifdef _DEBUG
-#if !defined( PLAT_COMPILE_TIME_ASSERT )
-#define PLAT_COMPILE_TIME_ASSERT( pred )	switch(0){case 0:case pred:;}
-#endif
-#else
-#if !defined( PLAT_COMPILE_TIME_ASSERT )
-#define PLAT_COMPILE_TIME_ASSERT( pred )
-#endif
-#endif
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define NEW_SOFTWARE_LIGHTING
-
-#ifdef POSIX
-#include <alloca.h>
-#include <unistd.h>
-#include <signal.h>
-#include <time.h>
-#endif
-
-#include <malloc.h>
-#include <new>
-
-
-#include <string.h>
-
-#include "valve_minmax_on.h"	        
-
-#ifdef _RETAIL
-#define IsRetail() true
-#else
-#define IsRetail() false
-#endif
-
-#ifdef _DEBUG
-#define IsRelease() false
-#define IsDebug() true
-#else
-#define IsRelease() true
-#define IsDebug() false
-#endif
-
-#define IsXbox()	false
-
-#ifdef _WIN32
-#define IsLinux() false
-#define IsOSX() false
-#define IsPosix() false
-#define PLATFORM_WINDOWS 1      
-#ifndef _X360
-#define IsWindows() true
-#define IsPC() true
-#define IsConsole() false
-#define IsX360() false
-#define IsPS3() false
-#define IS_WINDOWS_PC
-#define PLATFORM_WINDOWS_PC 1   
-#ifdef _WIN64
-#define IsPlatformWindowsPC64() true
-#define IsPlatformWindowsPC32() false
-#define PLATFORM_WINDOWS_PC64 1
-#else
-#define IsPlatformWindowsPC64() false
-#define IsPlatformWindowsPC32() true
-#define PLATFORM_WINDOWS_PC32 1
-#endif
-#else
-#define PLATFORM_X360 1
-#ifndef _CONSOLE
-#define _CONSOLE
-#endif
-#define IsWindows() false
-#define IsPC() false
-#define IsConsole() true
-#define IsX360() true
-#define IsPS3() false
-#endif
-#if defined( DX_TO_GL_ABSTRACTION )
-#define IsPlatformOpenGL() true
-#else
-#define IsPlatformOpenGL() false
-#endif
-#elif defined(POSIX)
-#define IsPC() true
-#define IsWindows() false
-#define IsConsole() false
-#define IsX360() false
-#define IsPS3() false
-#if defined( LINUX )
-#define IsLinux() true
-#else
-#define IsLinux() false
-#endif
-
-#if defined( OSX )
-#define IsOSX() true
-#else
-#define IsOSX() false
-#endif
-
-#define IsPosix() true
-#define IsPlatformOpenGL() true
-#else
-#error
-#endif
-
-typedef unsigned char uint8;
-typedef signed char int8;
-
-#if defined(__x86_64__) || defined(_WIN64)
-#define X64BITS
-#endif  
-
-#if defined( _WIN32 )
-
-typedef __int16					int16;
-typedef unsigned __int16		uint16;
-typedef __int32					int32;
-typedef unsigned __int32		uint32;
-typedef __int64					int64;
-typedef unsigned __int64		uint64;
-
-#ifdef PLATFORM_64BITS
-typedef __int64 intp;				         
-typedef unsigned __int64 uintp;		         
-#else
-typedef __int32 intp;
-typedef unsigned __int32 uintp;
-#endif
-
-#if defined( _X360 )
-#ifdef __m128
-#undef __m128
-#endif
-#define __m128				__vector4
-#endif
-
-#define OVERRIDE override
-
-#else  
-
-typedef short					int16;
-typedef unsigned short			uint16;
-typedef int						int32;
-typedef unsigned int			uint32;
-typedef long long				int64;
-typedef unsigned long long		uint64;
-#ifdef X64BITS
-typedef long long			intp;
-typedef unsigned long long	uintp;
-#else
-typedef int					intp;
-typedef unsigned int		uintp;
-#endif
-typedef void* HWND;
-
-#undef OVERRIDE
-#if defined(__clang__)
-#define OVERRIDE override
-#pragma GCC diagnostic ignored "-Wc++11-extensions"
-#else
-#define OVERRIDE
-#endif
-
-#endif   
-
-typedef uint32 RTime32;
-
-typedef float				float32;
-typedef double				float64;
-
-typedef unsigned int		uint;
-
-#ifdef _MSC_VER
-#pragma once
-#if _MSC_FULL_VER > 160000000
-#if _MSC_FULL_VER < 160040219
-#error You must install VS 2010 SP1
-#endif
-#else
-#if _MSC_FULL_VER < 140050727
-#error You must install VS 2005 SP1
-#endif
-#endif
-#endif
-
-#ifdef _MSC_VER
-#define SINGLE_INHERITANCE __single_inheritance
-#define MULTIPLE_INHERITANCE __multiple_inheritance
-#else
-#define SINGLE_INHERITANCE
-#define MULTIPLE_INHERITANCE
-#endif
-
-#ifdef _MSC_VER
-#define NO_VTABLE __declspec( novtable )
-#else
-#define NO_VTABLE
-#endif
-
-#ifdef _MSC_VER
-#define NORETURN				__declspec( noreturn )
-#else
-#define NORETURN
-#endif
-
-#ifndef _X360
-#define abstract_class class
-#else
-#define abstract_class class NO_VTABLE
-#endif
-
-
-#define VALVE_RAND_MAX 0x7fff
-
-
-
-#if defined(_WIN32) && !defined(WINDED)
-
-#if defined(_M_IX86)
-#define __i386__	1
-#endif
-
-#elif POSIX
-#if defined( OSX ) && defined( CARBON_WORKAROUND )
-#define DWORD unsigned int
-#else
-typedef unsigned int DWORD;
-#endif
-typedef unsigned short WORD;
-typedef void* HINSTANCE;
-#define _MAX_PATH PATH_MAX
-#define __cdecl
-#define __stdcall
-#define __declspec
-
-#endif    
-
-
-#ifndef MAX_PATH
-#define MAX_PATH  260
-#endif
-
-#ifdef _WIN32
-#define MAX_UNICODE_PATH 32767
-#else
-#define MAX_UNICODE_PATH MAX_PATH
-#endif
-
-#define MAX_UNICODE_PATH_IN_UTF8 MAX_UNICODE_PATH*4
-
-#ifdef GNUC
-#undef offsetof
-#define offsetof(s,m)	(size_t)&(((s *)0)->m)
-#else
-#undef offsetof
-#define offsetof(s,m)	(size_t)&(((s *)0)->m)
-#endif
-
-
-#define ALIGN_VALUE( val, alignment ) ( ( val + alignment - 1 ) & ~( alignment - 1 ) )       
-
-#if defined( _WIN32 ) && !defined( _X360 )
-#define DebuggerBreak()  __debugbreak()
-#elif defined( _X360 )
-#define DebuggerBreak() DebugBreak()
-#else
-#ifdef OSX
-#define DebuggerBreak()  if ( Plat_IsInDebugSession() ) { __asm ( "int $3" ); } else { raise(SIGTRAP); }
-#else
-#define DebuggerBreak()  raise(SIGTRAP)
-#endif
-#endif
-#define	DebuggerBreakIfDebugging() if ( !Plat_IsInDebugSession() ) ; else DebuggerBreak()
-
-#ifndef EXPORT
-#ifdef _WIN32
-#define EXPORT	_declspec( dllexport )
-#else
-#define EXPORT	 
-#endif
-#endif
-
-#if defined __i386__ && !defined __linux__
-#define id386	1
-#else
-#define id386	0
-#endif   
-
-#ifdef _WIN32
-#define DECL_ALIGN(x) __declspec(align(x))
-
-#elif GNUC
-#define DECL_ALIGN(x) __attribute__((aligned(x)))
-#else
-#define DECL_ALIGN(x)  
-#endif
-
-#ifdef _MSC_VER
-#define ALIGN4 DECL_ALIGN(4)
-#define ALIGN8 DECL_ALIGN(8)
-#define ALIGN16 DECL_ALIGN(16)
-#define ALIGN32 DECL_ALIGN(32)
-#define ALIGN128 DECL_ALIGN(128)
-
-#define ALIGN4_POST
-#define ALIGN8_POST
-#define ALIGN16_POST
-#define ALIGN32_POST
-#define ALIGN128_POST
-#elif defined( GNUC )
-#define ALIGN4
-#define ALIGN8 
-#define ALIGN16
-#define ALIGN32
-#define ALIGN128
-
-#define ALIGN4_POST DECL_ALIGN(4)
-#define ALIGN8_POST DECL_ALIGN(8)
-#define ALIGN16_POST DECL_ALIGN(16)
-#define ALIGN32_POST DECL_ALIGN(32)
-#define ALIGN128_POST DECL_ALIGN(128)
-#else
-#error
-#endif
-
-#ifdef __GNUC__
-#define COMPILE_TIME_ASSERT( pred ) typedef int UNIQUE_ID[ (pred) ? 1 : -1 ]
-#else
-#if _MSC_VER >= 1600
-#define COMPILE_TIME_ASSERT( pred ) static_assert( pred, "Compile time assert constraint is not true: " #pred )
-#else
-#define COMPILE_TIME_ASSERT( pred ) typedef char compile_time_assert_type[(pred) ? 1 : -1];
-#endif
-#endif
-#define ASSERT_INVARIANT( pred )	COMPILE_TIME_ASSERT( pred )
-
-#if defined( PLATFORM_WINDOWS_PC )
- void Plat_MessageBox(const char* pTitle, const tchar * pMessage);
-#else
-#define Plat_MessageBox( t, m ) ((void)0)
-#endif
-#define	DebuggerBreakIfDebugging() if ( !Plat_IsInDebugSession() ) ; else DebuggerBreak()
-void				Plat_GetModuleFilename(char* pOut, int nMaxBytes);
-void				Plat_ExitProcess(int nCode);
-
-void				Plat_ExitProcessWithError(int nCode, bool bGenerateMinidump = false);
-#if defined( PLATFORM_X360 ) || defined( _PS3 )
-#ifndef _GAMECONSOLE
-#define _GAMECONSOLE
-#endif
-#define IsPC()		0
-#define IsGameConsole() 1
-#else
-#define IsPC()		1
-#define IsGameConsole() 0
-#endif
-
-
-inline int64 CastPtrToInt64(const void* p)
-{
-	return (int64)((uintp)p);
-}
-
-#include "annotations.h"
-
-#define INT_TO_POINTER( i ) (void *)( ( i ) + (char *)NULL )
-#define POINTER_TO_INT( p ) ( (int)(uintp)( p ) )
-
-
-#if defined( GNUC )
-#define stackalloc( _size )		alloca( ALIGN_VALUE( _size, 16 ) )
-#ifdef _LINUX
-#define mallocsize( _p )	( malloc_usable_size( _p ) )
-#elif defined(OSX)
-#define mallocsize( _p )	( malloc_size( _p ) )
-#else
-#error
-#endif
-#elif defined ( _WIN32 )
-#define stackalloc( _size )		_alloca( ALIGN_VALUE( _size, 16 ) )
-#define mallocsize( _p )		( _msize( _p ) )
-#endif
-
-#define  stackfree( _p )			0
-
-#ifdef POSIX
-#define CONSTRUCT_EARLY __attribute__((init_priority(101)))
-#else
-#define CONSTRUCT_EARLY
-#endif
-
-#if defined(_MSC_VER)
-#define SELECTANY __declspec(selectany)
-#define RESTRICT __restrict
-#define RESTRICT_FUNC __declspec(restrict)
-#define FMTFUNCTION( a, b )
-#elif defined(GNUC)
-#define SELECTANY __attribute__((weak))
-#if defined(LINUX) && !defined(DEDICATED)
-#define RESTRICT
-#else
-#define RESTRICT __restrict
-#endif
-#define RESTRICT_FUNC
-#define FMTFUNCTION( fmtargnumber, firstvarargnumber ) __attribute__ (( format( __printf__, fmtargnumber, firstvarargnumber )))
-#else
-#define SELECTANY static
-#define RESTRICT
-#define RESTRICT_FUNC
-#define FMTFUNCTION( a, b )
-#endif
-
-#if defined( _WIN32 )
-
-#define DLL_EXPORT				extern "C" __declspec( dllexport )
-#define DLL_IMPORT				extern "C" __declspec( dllimport )
-
-#define DLL_CLASS_EXPORT		__declspec( dllexport )
-#define DLL_CLASS_IMPORT		__declspec( dllimport )
-
-#define DLL_GLOBAL_EXPORT		extern __declspec( dllexport )
-#define DLL_GLOBAL_IMPORT		extern __declspec( dllimport )
-
-#define DLL_LOCAL
-
-#elif defined GNUC
-#define  DLL_EXPORT   extern "C" __attribute__ ((visibility("default")))
-#define  DLL_IMPORT   extern "C"
-
-#define  DLL_CLASS_EXPORT __attribute__ ((visibility("default")))
-#define  DLL_CLASS_IMPORT
-
-#define  DLL_GLOBAL_EXPORT   extern __attribute ((visibility("default")))
-#define  DLL_GLOBAL_IMPORT   extern
-
-#define  DLL_LOCAL __attribute__ ((visibility("hidden")))
-
-#else
-#error "Unsupported Platform."
-#endif
-
-#if defined( _WIN32 ) && !defined( _X360 )
-#define  STDCALL				__stdcall
-#define  FASTCALL				__fastcall
-#define  FORCEINLINE			__forceinline
-#define  FORCEINLINE_TEMPLATE		__forceinline
-#elif defined( _X360 )
-#define  STDCALL				__stdcall
-#ifdef FORCEINLINE
-#undef FORCEINLINE
-#endif 
-#define  FORCEINLINE			__forceinline
-#define  FORCEINLINE_TEMPLATE		__forceinline
-#else
-#define  STDCALL
-#define  FASTCALL
-#ifdef _LINUX_DEBUGGABLE
-#define  FORCEINLINE
-#else
-#define  FORCEINLINE inline __attribute__ ((always_inline))
-#endif
-#define FORCEINLINE_TEMPLATE	inline
-#endif
-
-#define DONT_INLINE(a) (((int)(a)+1)?(a):(a))
-
-#ifdef _MSC_VER
-#define HINT(THE_HINT)	__assume((THE_HINT))
-#else
-#define HINT(THE_HINT)	0
-#endif
-
-#define UNREACHABLE() { Assert(0); HINT(0); }
-
-#define NO_DEFAULT default: UNREACHABLE();
-
-
-#ifdef _WIN32
-
-#pragma warning(disable : 4514)           
-#pragma warning(disable : 4100)        
-#pragma warning(disable : 4127)       
-#pragma warning(disable : 4512)           
-#pragma warning(disable : 4611)            
-#pragma warning(disable : 4710)       
-#pragma warning(disable : 4702)     
-#pragma warning(disable : 4505)       
-#pragma warning(disable : 4239)               
-#pragma warning(disable : 4097)         
-#pragma warning(disable : 4324)          
-#pragma warning(disable : 4244)    
-#pragma warning(disable : 4305)	        
-#pragma warning(disable : 4786)	      
-#pragma warning(disable : 4250)       
-#pragma warning(disable : 4201)       
-#pragma warning(disable : 4481)         
-#pragma warning(disable : 4748)                     
-
-#if _MSC_VER >= 1300
-#pragma warning(disable : 4511)	      
-#pragma warning(disable : 4121)	            
-#pragma warning(disable : 4530)	                      
-#endif
-
-#if _MSC_VER >= 1400
-#pragma warning(disable : 4996)	   
-#endif
-
-
-#endif  
-
-#if defined( LINUX ) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
-#define GCC_DIAG_STR(s) #s
-#define GCC_DIAG_JOINSTR(x,y) GCC_DIAG_STR(x ## y)
-#define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x)
-#define GCC_DIAG_PRAGMA(x)	GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
-
-#define GCC_DIAG_PUSH_OFF(x)	GCC_DIAG_PRAGMA(push) GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x))
-#define GCC_DIAG_POP()		GCC_DIAG_PRAGMA(pop)
-#else
-#define GCC_DIAG_PUSH_OFF(x)
-#define GCC_DIAG_POP()
-#endif
-
-#ifdef LINUX
-#pragma GCC diagnostic ignored "-Wconversion-null"	      
-#pragma GCC diagnostic ignored "-Wpointer-arith"	            
-#pragma GCC diagnostic ignored "-Wswitch"				      
-#endif
-
-#ifdef OSX
-#pragma GCC diagnostic ignored "-Wconversion-null"			      
-#pragma GCC diagnostic ignored "-Wnull-arithmetic"			            
-#pragma GCC diagnostic ignored "-Wswitch-enum"				      
-#pragma GCC diagnostic ignored "-Wswitch"					      
-#endif
-
-
-#if !defined( _WIN64 )
-#pragma warning( disable : 4267 )	         
-#pragma warning( disable : 4311 )	       
-#pragma warning( disable : 4312 )	         
-#endif
-
-
-#ifdef POSIX
-#define _stricmp stricmp
-#define strcmpi stricmp
-#define stricmp strcasecmp
-#define _vsnprintf vsnprintf
-#define _alloca alloca
-#ifdef _snprintf
-#undef _snprintf
-#endif
-#define _snprintf snprintf
-#define GetProcAddress dlsym
-#define _chdir chdir
-#define _strnicmp strnicmp
-#define strnicmp strncasecmp
-#define _getcwd getcwd
-#define _snwprintf swprintf
-#define swprintf_s swprintf
-#define wcsicmp _wcsicmp
-#define _wcsicmp wcscmp
-#define _finite finite
-#define _tempnam tempnam
-#define _unlink unlink
-#define _access access
-#define _mkdir(dir) mkdir( dir, S_IRWXU | S_IRWXG | S_IRWXO )
-#define _wtoi(arg) wcstol(arg, NULL, 10)
-#define _wtoi64(arg) wcstoll(arg, NULL, 10)
-
-typedef uint32 HMODULE;
-typedef void* HANDLE;
-#endif
-
-#ifndef _X360
-
-static FORCEINLINE float fsel(float fComparand, float fValGE, float fLT)
-{
-	return fComparand >= 0 ? fValGE : fLT;
-}
-static FORCEINLINE double fsel(double fComparand, double fValGE, double fLT)
-{
-	return fComparand >= 0 ? fValGE : fLT;
-}
-
-#else
-
-#define fsel __fsel
-
-#endif
-
-
-#if !defined( _X360 )
-#if defined( _MSC_VER )
-
-#if defined( PLATFORM_WINDOWS_PC64 )
-inline void SetupFPUControlWord()
-{
-}
-#else
-inline void SetupFPUControlWordForceExceptions()
-{
-	uint16 tmpCtrlW;
-	__asm
-	{
-		fnclex						     
-		fnstcw word ptr[tmpCtrlW]	     
-		and [tmpCtrlW], 0FCC0h		       
-		or [tmpCtrlW], 0230h		        
-		fldcw word ptr[tmpCtrlW]	       
-	}
-}
-
-#ifdef CHECK_FLOAT_EXCEPTIONS
-
-inline void SetupFPUControlWord()
-{
-	SetupFPUControlWordForceExceptions();
-}
-
-#else
-
-inline void SetupFPUControlWord()
-{
-	uint16 tmpCtrlW;
-	__asm
-	{
-		fnstcw word ptr[tmpCtrlW]	     
-		and [tmpCtrlW], 0FCC0h		       
-		or [tmpCtrlW], 023Fh		        
-		fldcw word ptr[tmpCtrlW]	       
-	}
-}
-
-#endif
-#endif
-
-#else
-
-inline void SetupFPUControlWord()
-{
-	__volatile unsigned short int __cw;
-	__asm __volatile("fnstcw %0" : "=m" (__cw));
-	__cw = __cw & 0x0FCC0;	      
-	__cw = __cw | 0x023F;	    
-	__asm __volatile("fldcw %0" : : "m" (__cw));
-}
-
-#endif  
-
-#else
-
-#ifdef _DEBUG
-FORCEINLINE bool IsFPUControlWordSet()
-{
-	float f = 0.996f;
-	union
-	{
-		double flResult;
-		int pResult[2];
-	};
-	flResult = __fctiw(f);
-	return (pResult[1] == 1);
-}
-#endif
-
-inline void SetupFPUControlWord()
-{
-	__emit(0xFF80010C);	   
-
-	__vector4  a = { 0.0f, 0.0f, 0.0f, 0.0f };
-	a;					  
-	__asm
-	{
-		mtvscr a;	         
-	}
-}
-
-#endif  
-
-template <typename T>
-inline T WordSwapC(T w)
-{
-	uint16 temp;
-
-	temp = ((*((uint16*)&w) & 0xff00) >> 8);
-	temp |= ((*((uint16*)&w) & 0x00ff) << 8);
-
-	return *((T*)&temp);
-}
-
-template <typename T>
-inline T DWordSwapC(T dw)
-{
-	uint32 temp;
-
-	temp = *((uint32*)&dw) >> 24;
-	temp |= ((*((uint32*)&dw) & 0x00FF0000) >> 8);
-	temp |= ((*((uint32*)&dw) & 0x0000FF00) << 8);
-	temp |= ((*((uint32*)&dw) & 0x000000FF) << 24);
-
-	return *((T*)&temp);
-}
-
-template <typename T>
-inline T QWordSwapC(T dw)
-{
-	PLAT_COMPILE_TIME_ASSERT(sizeof(dw) == sizeof(uint64));
-
-	uint64 temp;
-
-	temp = *((uint64*)&dw) >> 56;
-	temp |= ((*((uint64*)&dw) & 0x00FF000000000000ull) >> 40);
-	temp |= ((*((uint64*)&dw) & 0x0000FF0000000000ull) >> 24);
-	temp |= ((*((uint64*)&dw) & 0x000000FF00000000ull) >> 8);
-	temp |= ((*((uint64*)&dw) & 0x00000000FF000000ull) << 8);
-	temp |= ((*((uint64*)&dw) & 0x0000000000FF0000ull) << 24);
-	temp |= ((*((uint64*)&dw) & 0x000000000000FF00ull) << 40);
-	temp |= ((*((uint64*)&dw) & 0x00000000000000FFull) << 56);
-
-	return *((T*)&temp);
-}
-
-#if defined( _X360 )
-
-#define WordSwap  WordSwap360Intr
-#define DWordSwap DWordSwap360Intr
-
-template <typename T>
-inline T WordSwap360Intr(T w)
-{
-	T output;
-	__storeshortbytereverse(w, 0, &output);
-	return output;
-}
-
-template <typename T>
-inline T DWordSwap360Intr(T dw)
-{
-	T output;
-	__storewordbytereverse(dw, 0, &output);
-	return output;
-}
-
-#elif defined( _MSC_VER ) && !defined( PLATFORM_WINDOWS_PC64 )
-
-#define WordSwap  WordSwapAsm
-#define DWordSwap DWordSwapAsm
-
-#pragma warning(push)
-#pragma warning (disable:4035)    
-
-template <typename T>
-inline T WordSwapAsm(T w)
-{
-	__asm
-	{
-		mov ax, w
-		xchg al, ah
-	}
-}
-
-template <typename T>
-inline T DWordSwapAsm(T dw)
-{
-	__asm
-	{
-		mov eax, dw
-		bswap eax
-	}
-}
-
-#pragma warning(pop)
-
-#else
-
-#define WordSwap  WordSwapC
-#define DWordSwap DWordSwapC
-
-#endif
-
-#define QWordSwap QWordSwapC
-
-#if defined(__i386__) && !defined(VALVE_LITTLE_ENDIAN)
-#define VALVE_LITTLE_ENDIAN 1
-#endif
-
-#if defined( _SGI_SOURCE ) || defined( _X360 )
-#define	VALVE_BIG_ENDIAN 1
-#endif
-
-#define SafeSwapFloat( pOut, pIn )	(*((uint*)pOut) = DWordSwap( *((uint*)pIn) ))
-
-#if defined(VALVE_LITTLE_ENDIAN)
-
-#define BigShort( val )				WordSwap( val )
-#define BigWord( val )				WordSwap( val )
-#define BigLong( val )				DWordSwap( val )
-#define BigDWord( val )				DWordSwap( val )
-#define LittleShort( val )			( val )
-#define LittleWord( val )			( val )
-#define LittleLong( val )			( val )
-#define LittleDWord( val )			( val )
-#define LittleQWord( val )			( val )
-#define SwapShort( val )			BigShort( val )
-#define SwapWord( val )				BigWord( val )
-#define SwapLong( val )				BigLong( val )
-#define SwapDWord( val )			BigDWord( val )
-
-#define BigFloat( pOut, pIn )		SafeSwapFloat( pOut, pIn )
-#define LittleFloat( pOut, pIn )	( *pOut = *pIn )
-#define SwapFloat( pOut, pIn )		BigFloat( pOut, pIn )
-
-#elif defined(VALVE_BIG_ENDIAN)
-
-#define BigShort( val )				( val )
-#define BigWord( val )				( val )
-#define BigLong( val )				( val )
-#define BigDWord( val )				( val )
-#define LittleShort( val )			WordSwap( val )
-#define LittleWord( val )			WordSwap( val )
-#define LittleLong( val )			DWordSwap( val )
-#define LittleDWord( val )			DWordSwap( val )
-#define LittleQWord( val )			QWordSwap( val )
-#define SwapShort( val )			LittleShort( val )
-#define SwapWord( val )				LittleWord( val )
-#define SwapLong( val )				LittleLong( val )
-#define SwapDWord( val )			LittleDWord( val )
-
-#define BigFloat( pOut, pIn )		( *pOut = *pIn )
-#define LittleFloat( pOut, pIn )	SafeSwapFloat( pOut, pIn )
-#define SwapFloat( pOut, pIn )		LittleFloat( pOut, pIn )
-
-#else
-
-inline short BigShort(short val) { int test = 1; return (*(char*)&test == 1) ? WordSwap(val) : val; }
-inline uint16 BigWord(uint16 val) { int test = 1; return (*(char*)&test == 1) ? WordSwap(val) : val; }
-inline long BigLong(long val) { int test = 1; return (*(char*)&test == 1) ? DWordSwap(val) : val; }
-inline uint32 BigDWord(uint32 val) { int test = 1; return (*(char*)&test == 1) ? DWordSwap(val) : val; }
-inline short LittleShort(short val) { int test = 1; return (*(char*)&test == 1) ? val : WordSwap(val); }
-inline uint16 LittleWord(uint16 val) { int test = 1; return (*(char*)&test == 1) ? val : WordSwap(val); }
-inline long LittleLong(long val) { int test = 1; return (*(char*)&test == 1) ? val : DWordSwap(val); }
-inline uint32 LittleDWord(uint32 val) { int test = 1; return (*(char*)&test == 1) ? val : DWordSwap(val); }
-inline uint64 LittleQWord(uint64 val) { int test = 1; return (*(char*)&test == 1) ? val : QWordSwap(val); }
-inline short SwapShort(short val) { return WordSwap(val); }
-inline uint16 SwapWord(uint16 val) { return WordSwap(val); }
-inline long SwapLong(long val) { return DWordSwap(val); }
-inline uint32 SwapDWord(uint32 val) { return DWordSwap(val); }
-
-inline void BigFloat(float* pOut, const float* pIn) { int test = 1; (*(char*)&test == 1) ? SafeSwapFloat(pOut, pIn) : (*pOut = *pIn); }
-inline void LittleFloat(float* pOut, const float* pIn) { int test = 1; (*(char*)&test == 1) ? (*pOut = *pIn) : SafeSwapFloat(pOut, pIn); }
-inline void SwapFloat(float* pOut, const float* pIn) { SafeSwapFloat(pOut, pIn); }
-
-#endif
-
-#if _X360
-FORCEINLINE unsigned long LoadLittleDWord(const unsigned long* base, unsigned int dwordIndex)
-{
-	return __loadwordbytereverse(dwordIndex << 2, base);
-}
-
-FORCEINLINE void StoreLittleDWord(unsigned long* base, unsigned int dwordIndex, unsigned long dword)
-{
-	__storewordbytereverse(dword, dwordIndex << 2, base);
-}
-#else
-FORCEINLINE unsigned long LoadLittleDWord(const unsigned long* base, unsigned int dwordIndex)
-{
-	return LittleDWord(base[dwordIndex]);
-}
-
-FORCEINLINE void StoreLittleDWord(unsigned long* base, unsigned int dwordIndex, unsigned long dword)
-{
-	base[dwordIndex] = LittleDWord(dword);
-}
-#endif
-
-
-#ifndef STATIC_TIER0
-
-#ifdef TIER0_DLL_EXPORT
-#define PLATFORM_INTERFACE	DLL_EXPORT
-#define PLATFORM_OVERLOAD	DLL_GLOBAL_EXPORT
-#define PLATFORM_CLASS		DLL_CLASS_EXPORT
-#else
-#define PLATFORM_INTERFACE	DLL_IMPORT
-#define PLATFORM_OVERLOAD	DLL_GLOBAL_IMPORT
-#define PLATFORM_CLASS		DLL_CLASS_IMPORT
-#endif
-
-#else	 
-
-#define PLATFORM_INTERFACE	extern
-#define PLATFORM_OVERLOAD
-#define PLATFORM_CLASS
-
-#endif	 
-
-
-PLATFORM_INTERFACE void				Plat_SetBenchmarkMode(bool bBenchmarkMode);
-PLATFORM_INTERFACE bool				Plat_IsInBenchmarkMode();
-
-
-PLATFORM_INTERFACE double			Plat_FloatTime();		         
-PLATFORM_INTERFACE unsigned int		Plat_MSTime();			   
-PLATFORM_INTERFACE char* Plat_asctime(const struct tm* tm, char* buf);
-PLATFORM_INTERFACE char* Plat_ctime(const time_t* timep, char* buf, size_t bufsize);
-PLATFORM_INTERFACE struct tm* Plat_gmtime(const time_t* timep, struct tm* result);
-PLATFORM_INTERFACE time_t			Plat_timegm(struct tm* timeptr);
-PLATFORM_INTERFACE struct tm* Plat_localtime(const time_t* timep, struct tm* result);
-
-#if defined( _WIN32 ) && defined( _MSC_VER ) && ( _MSC_VER >= 1400 )
-extern "C" unsigned __int64 __rdtsc();
-#pragma intrinsic(__rdtsc)
-#endif
-
-inline uint64 Plat_Rdtsc()
-{
-#if defined( _X360 )
-	return (uint64)__mftb32();
-#elif defined( _WIN64 )
-	return (uint64)__rdtsc();
-#elif defined( _WIN32 )
-#if defined( _MSC_VER ) && ( _MSC_VER >= 1400 )
-	return (uint64)__rdtsc();
-#else
-	__asm rdtsc;
-	__asm ret;
-#endif
-#elif defined( __i386__ )
-	uint64 val;
-	__asm__ __volatile__("rdtsc" : "=A" (val));
-	return val;
-#elif defined( __x86_64__ )
-	uint32 lo, hi;
-	__asm__ __volatile__("rdtsc" : "=a" (lo), "=d" (hi));
-	return (((uint64)hi) << 32) | lo;
-#else
-#error
-#endif
-}
-
-#define Sys_FloatTime Plat_FloatTime
-
-#define DISALLOW_OPERATOR_EQUAL( _classname )			\
-	private:											\
-		_classname &operator=( const _classname & );	\
-	public:
-
-#define IMPLEMENT_OPERATOR_EQUAL( _classname )			\
-	public:												\
-		_classname &operator=( const _classname &src )	\
-		{												\
-			memcpy( this, &src, sizeof(_classname) );	\
-			return *this;								\
-		}
-
-struct CPUInformation
-{
-	int	 m_Size;		       
-
-	bool m_bRDTSC : 1,	   
-		m_bCMOV : 1,     
-		m_bFCMOV : 1,     
-		m_bSSE : 1,	   
-		m_bSSE2 : 1,	   
-		m_b3DNow : 1,	   
-		m_bMMX : 1,	   
-		m_bHT : 1;	   
-
-	uint8 m_nLogicalProcessors;		    
-	uint8 m_nPhysicalProcessors;	    
-
-	bool m_bSSE3 : 1,
-		m_bSSSE3 : 1,
-		m_bSSE4a : 1,
-		m_bSSE41 : 1,
-		m_bSSE42 : 1;
-
-	int64 m_Speed;						    
-
-	tchar* m_szProcessorID;				   
-
-	CPUInformation() : m_Size(0) {}
-};
-
-PLATFORM_INTERFACE const CPUInformation* GetCPUInformation();
-
-PLATFORM_INTERFACE float GetCPUUsage();
-
-PLATFORM_INTERFACE void GetCurrentDate(int* pDay, int* pMonth, int* pYear);
-
-PLATFORM_INTERFACE void InitPME();
-PLATFORM_INTERFACE void ShutdownPME();
-
-PLATFORM_INTERFACE void	Plat_SetHardwareDataBreakpoint(const void* pAddress, int nWatchBytes, bool bBreakOnRead);
-
-PLATFORM_INTERFACE void	Plat_ApplyHardwareDataBreakpointsToNewThread(unsigned long dwThreadID);
-
-PLATFORM_INTERFACE const tchar* Plat_GetCommandLine();
-#ifndef _WIN32
-PLATFORM_INTERFACE void Plat_SetCommandLine(const char* cmdLine);
-#endif
-PLATFORM_INTERFACE const char* Plat_GetCommandLineA();
-
-PLATFORM_INTERFACE bool Plat_VerifyHardwareKeyDriver();
-
-PLATFORM_INTERFACE bool Plat_VerifyHardwareKey();
-
-PLATFORM_INTERFACE bool Plat_VerifyHardwareKeyPrompt();
-
-PLATFORM_INTERFACE bool Plat_FastVerifyHardwareKey();
-
-PLATFORM_INTERFACE void* Plat_SimpleLog(const tchar* file, int line);
-
-#if _X360
-#define Plat_FastMemset XMemSet
-#define Plat_FastMemcpy XMemCpy
-#else
-#define Plat_FastMemset memset
-#define Plat_FastMemcpy memcpy
-#endif
-
-#if defined(_WIN32) || defined(LINUX) || defined(OSX)
-PLATFORM_INTERFACE bool Plat_IsInDebugSession(bool bForceRecheck = false);
-PLATFORM_INTERFACE void Plat_DebugString(const char*);
-#else
-inline bool Plat_IsInDebugSession(bool bForceRecheck = false) { return false; }
-#define Plat_DebugString(s) ((void)0)
-#endif
-
-PLATFORM_INTERFACE bool Is64BitOS();
-
-
-#define XBOX_DVD_SECTORSIZE			2048
-#define XBOX_DVD_ECC_SIZE			32768       
-#define XBOX_HDD_SECTORSIZE			512
-
-#define WM_XREMOTECOMMAND					(WM_USER + 100)
-#define WM_XCONTROLLER_KEY					(WM_USER + 101)
-#define WM_SYS_UI							(WM_USER + 102)
-#define WM_SYS_SIGNINCHANGED				(WM_USER + 103)
-#define WM_SYS_STORAGEDEVICESCHANGED		(WM_USER + 104)
-#define WM_SYS_PROFILESETTINGCHANGED		(WM_USER + 105)
-#define WM_SYS_MUTELISTCHANGED				(WM_USER + 106)
-#define WM_SYS_INPUTDEVICESCHANGED			(WM_USER + 107)
-#define WM_SYS_INPUTDEVICECONFIGCHANGED		(WM_USER + 108)
-#define WM_LIVE_CONNECTIONCHANGED			(WM_USER + 109)
-#define WM_LIVE_INVITE_ACCEPTED				(WM_USER + 110)
-#define WM_LIVE_LINK_STATE_CHANGED			(WM_USER + 111)
-#define WM_LIVE_CONTENT_INSTALLED			(WM_USER + 112)
-#define WM_LIVE_MEMBERSHIP_PURCHASED		(WM_USER + 113)
-#define WM_LIVE_VOICECHAT_AWAY				(WM_USER + 114)
-#define WM_LIVE_PRESENCE_CHANGED			(WM_USER + 115)
-#define WM_FRIENDS_PRESENCE_CHANGED			(WM_USER + 116)
-#define WM_FRIENDS_FRIEND_ADDED				(WM_USER + 117)
-#define WM_FRIENDS_FRIEND_REMOVED			(WM_USER + 118)
-#define WM_CUSTOM_GAMEBANNERPRESSED			(WM_USER + 119)
-#define WM_CUSTOM_ACTIONPRESSED				(WM_USER + 120)
-#define WM_XMP_STATECHANGED					(WM_USER + 121)
-#define WM_XMP_PLAYBACKBEHAVIORCHANGED		(WM_USER + 122)
-#define WM_XMP_PLAYBACKCONTROLLERCHANGED	(WM_USER + 123)
-
-inline const char* GetPlatformExt(void)
-{
-	return IsX360() ? ".360" : "";
-}
-
-#define XBOX_PROCESSOR_0			( 1<<0 )
-#define XBOX_PROCESSOR_1			( 1<<1 )
-#define XBOX_PROCESSOR_2			( 1<<2 )
-#define XBOX_PROCESSOR_3			( 1<<3 )
-#define XBOX_PROCESSOR_4			( 1<<4 )
-#define XBOX_PROCESSOR_5			( 1<<5 )
-
-#define XBOX_CORE_0_HWTHREAD_0		XBOX_PROCESSOR_0
-#define XBOX_CORE_0_HWTHREAD_1		XBOX_PROCESSOR_1
-#define XBOX_CORE_1_HWTHREAD_0		XBOX_PROCESSOR_2
-#define XBOX_CORE_1_HWTHREAD_1		XBOX_PROCESSOR_3
-#define XBOX_CORE_2_HWTHREAD_0		XBOX_PROCESSOR_4
-#define XBOX_CORE_2_HWTHREAD_1		XBOX_PROCESSOR_5
-
-#include "fasttimer.h"
-
-#if defined( _X360 )
-#include "xbox/xbox_core.h"
-#endif
-
-template <class T>
-inline T* Construct(T* pMemory)
-{
-	return ::new(pMemory) T;
-}
-
-template <class T, typename ARG1>
-inline T* Construct(T* pMemory, ARG1 a1)
-{
-	return ::new(pMemory) T(a1);
-}
-
-template <class T, typename ARG1, typename ARG2>
-inline T* Construct(T* pMemory, ARG1 a1, ARG2 a2)
-{
-	return ::new(pMemory) T(a1, a2);
-}
-
-template <class T, typename ARG1, typename ARG2, typename ARG3>
-inline T* Construct(T* pMemory, ARG1 a1, ARG2 a2, ARG3 a3)
-{
-	return ::new(pMemory) T(a1, a2, a3);
-}
-
-template <class T, typename ARG1, typename ARG2, typename ARG3, typename ARG4>
-inline T* Construct(T* pMemory, ARG1 a1, ARG2 a2, ARG3 a3, ARG4 a4)
-{
-	return ::new(pMemory) T(a1, a2, a3, a4);
-}
-
-template <class T, typename ARG1, typename ARG2, typename ARG3, typename ARG4, typename ARG5>
-inline T* Construct(T* pMemory, ARG1 a1, ARG2 a2, ARG3 a3, ARG4 a4, ARG5 a5)
-{
-	return ::new(pMemory) T(a1, a2, a3, a4, a5);
-}
-
-template <class T, class P>
-inline void ConstructOneArg(T* pMemory, P const& arg)
-{
-	::new(pMemory) T(arg);
-}
-
-template <class T, class P1, class P2 >
-inline void ConstructTwoArg(T* pMemory, P1 const& arg1, P2 const& arg2)
-{
-	::new(pMemory) T(arg1, arg2);
-}
-
-template <class T, class P1, class P2, class P3 >
-inline void ConstructThreeArg(T* pMemory, P1 const& arg1, P2 const& arg2, P3 const& arg3)
-{
-	::new(pMemory) T(arg1, arg2, arg3);
-}
-
-template <class T>
-inline T* CopyConstruct(T* pMemory, T const& src)
-{
-	return ::new(pMemory) T(src);
-}
-
-template <class T>
-inline void Destruct(T* pMemory)
-{
-	pMemory->~T();
-
-#ifdef _DEBUG
-	memset(reinterpret_cast<void*>(pMemory), 0xDD, sizeof(T));
-#endif
-}
-
-
-#define GET_OUTER( OuterType, OuterMember ) \
-   ( ( OuterType * ) ( (uint8 *)this - offsetof( OuterType, OuterMember ) ) )
-
-
-PLATFORM_INTERFACE bool vtune(bool resume);
-
-
-#define TEMPLATE_FUNCTION_TABLE(RETURN_TYPE, NAME, ARGS, COUNT)			\
-																		\
-typedef RETURN_TYPE (FASTCALL *__Type_##NAME) ARGS;						\
-																		\
-template<const int nArgument>											\
-struct __Function_##NAME												\
-{																		\
-	static RETURN_TYPE FASTCALL Run ARGS;								\
-};																		\
-																		\
-template <const int i>														\
-struct __MetaLooper_##NAME : __MetaLooper_##NAME<i-1>					\
-{																		\
-	__Type_##NAME func;													\
-	inline __MetaLooper_##NAME() { func = __Function_##NAME<i>::Run; }	\
-};																		\
-																		\
-template<>																\
-struct __MetaLooper_##NAME<0>											\
-{																		\
-	__Type_##NAME func;													\
-	inline __MetaLooper_##NAME() { func = __Function_##NAME<0>::Run; }	\
-};																		\
-																		\
-class NAME																\
-{																		\
-private:																\
-    static const __MetaLooper_##NAME<COUNT> m;							\
-public:																	\
-	enum { count = COUNT };												\
-	static const __Type_##NAME* functions;								\
-};																		\
-const __MetaLooper_##NAME<COUNT> NAME::m;								\
-const __Type_##NAME* NAME::functions = (__Type_##NAME*)&m;				\
-template<const int nArgument>													\
-RETURN_TYPE FASTCALL __Function_##NAME<nArgument>::Run ARGS
-
-
-#define LOOP_INTERCHANGE(BOOLEAN, CODE)\
-	if( (BOOLEAN) )\
-	{\
-		CODE;\
-	} else\
-	{\
-		CODE;\
-	}
-
-#if 0    
-
-PLATFORM_INTERFACE void* Plat_GetProcAddress(const char* pszModule, const char* pszName);
-
-template <typename FUNCPTR_TYPE>
-class CDynamicFunction
-{
-public:
-	CDynamicFunction(const char* pszModule, const char* pszName, FUNCPTR_TYPE pfnFallback = NULL)
-	{
-		m_pfn = pfnFallback;
-		void* pAddr = Plat_GetProcAddress(pszModule, pszName);
-		if (pAddr)
-		{
-			m_pfn = (FUNCPTR_TYPE)pAddr;
-		}
-	}
-
-	operator bool() { return m_pfn != NULL; }
-	bool operator !() { return !m_pfn; }
-	operator FUNCPTR_TYPE() { return m_pfn; }
-
-private:
-	FUNCPTR_TYPE m_pfn;
-};
-#endif
-
-
-#include "valve_on.h"
-
-#if defined(TIER0_DLL_EXPORT)
-extern "C" int V_tier0_stricmp(const char* s1, const char* s2);
-#undef stricmp
-#undef strcmpi
-#define stricmp(s1,s2) V_tier0_stricmp( s1, s2 )
-#define strcmpi(s1,s2) V_tier0_stricmp( s1, s2 )
-#endif
-
-
-#endif   
\ No newline at end of file
diff --git a/SpyCustom/playernet_vars.h b/SpyCustom/playernet_vars.h
deleted file mode 100644
index 5de8c00..0000000
--- a/SpyCustom/playernet_vars.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef PLAYERNET_VARS_H
-#define PLAYERNET_VARS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "shared_classnames.h"
-#include "networkvar.h" 
-#include "datamap.h" 
-
-#define NUM_AUDIO_LOCAL_SOUNDS	8
-
-struct fogparams_t
-{
-	DECLARE_CLASS_NOBASE(fogparams_t);
-	DECLARE_EMBEDDED_NETWORKVAR();
-
-#ifndef CLIENT_DLL
-	DECLARE_SIMPLE_DATADESC();
-#endif
-
-	bool operator !=(const fogparams_t& other) const;
-
-	CNetworkVector(dirPrimary);
-	CNetworkColor32(colorPrimary);
-	CNetworkColor32(colorSecondary);
-	CNetworkColor32(colorPrimaryLerpTo);
-	CNetworkColor32(colorSecondaryLerpTo);
-	CNetworkVar(float, start);
-	CNetworkVar(float, end);
-	CNetworkVar(float, farz);
-	CNetworkVar(float, maxdensity);
-
-	CNetworkVar(float, startLerpTo);
-	CNetworkVar(float, endLerpTo);
-	CNetworkVar(float, lerptime);
-	CNetworkVar(float, duration);
-	CNetworkVar(bool, enable);
-	CNetworkVar(bool, blend);
-};
-
-#ifdef CLIENT_DLL
-#define CFogController C_FogController
-#endif
-
-class CFogController;
-
-struct fogplayerparams_t
-{
-	DECLARE_CLASS_NOBASE(fogplayerparams_t);
-	DECLARE_EMBEDDED_NETWORKVAR();
-
-#ifndef CLIENT_DLL
-	DECLARE_SIMPLE_DATADESC();
-#endif
-
-	CNetworkHandle(CFogController, m_hCtrl);
-	float					m_flTransitionTime;
-
-	color32					m_OldColor;
-	float					m_flOldStart;
-	float					m_flOldEnd;
-
-	color32					m_NewColor;
-	float					m_flNewStart;
-	float					m_flNewEnd;
-
-	fogplayerparams_t()
-	{
-		m_hCtrl.Set(NULL);
-		m_flTransitionTime = -1.0f;
-		m_OldColor.r = m_OldColor.g = m_OldColor.b = m_OldColor.a = 0;
-		m_flOldStart = 0.0f;
-		m_flOldEnd = 0.0f;
-		m_NewColor.r = m_NewColor.g = m_NewColor.b = m_NewColor.a = 0;
-		m_flNewStart = 0.0f;
-		m_flNewEnd = 0.0f;
-	}
-};
-
-struct sky3dparams_t
-{
-	DECLARE_CLASS_NOBASE(sky3dparams_t);
-	DECLARE_EMBEDDED_NETWORKVAR();
-
-#ifndef CLIENT_DLL
-	DECLARE_SIMPLE_DATADESC();
-#endif
-
-	CNetworkVar(int, scale);
-	CNetworkVector(origin);
-	CNetworkVar(int, area);
-
-	CNetworkVarEmbedded(fogparams_t, fog);
-};
-
-struct audioparams_t
-{
-	DECLARE_CLASS_NOBASE(audioparams_t);
-	DECLARE_EMBEDDED_NETWORKVAR();
-
-#ifndef CLIENT_DLL
-	DECLARE_SIMPLE_DATADESC();
-#endif
-
-	CNetworkArray(Vector, localSound, NUM_AUDIO_LOCAL_SOUNDS)
-		CNetworkVar(int, soundscapeIndex);	       
-	CNetworkVar(int, localBits);			          
-	CNetworkHandle(CBaseEntity, ent);		     
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/precipitation_shared.h b/SpyCustom/precipitation_shared.h
deleted file mode 100644
index 26a0e77..0000000
--- a/SpyCustom/precipitation_shared.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef PRECIPITATION_SHARED_H
-#define PRECIPITATION_SHARED_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-enum PrecipitationType_t
-{
-	PRECIPITATION_TYPE_RAIN = 0,
-	PRECIPITATION_TYPE_SNOW,
-	PRECIPITATION_TYPE_ASH,
-	PRECIPITATION_TYPE_SNOWFALL,
-	PRECIPITATION_TYPE_PARTICLERAIN,
-	PRECIPITATION_TYPE_PARTICLEASH,
-	PRECIPITATION_TYPE_PARTICLERAINSTORM,
-	PRECIPITATION_TYPE_PARTICLESNOW,
-	NUM_PRECIPITATION_TYPES
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/predictable_entity.h b/SpyCustom/predictable_entity.h
deleted file mode 100644
index 38bcfb9..0000000
--- a/SpyCustom/predictable_entity.h
+++ /dev/null
@@ -1,185 +0,0 @@
-#ifndef PREDICTABLE_ENTITY_H
-#define PREDICTABLE_ENTITY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-#include "predictioncopy.h"
-#include "shared_classnames.h"
-
-#ifndef NO_ENTITY_PREDICTION
-#define UsePrediction() 1
-#else
-#define UsePrediction() 0
-#endif
-
-#if defined( CLIENT_DLL )
-
-#include "iclassmap.h"
-#include "recvproxy.h"
-
-class SendTable;
-
-#else
-
-#include "sendproxy.h"
-
-#endif   
-
-#if defined( CLIENT_DLL )
-
-#define DECLARE_NETWORKCLASS()											\
-		DECLARE_CLIENTCLASS()
-
-#define DECLARE_NETWORKCLASS_NOBASE()									\
-		DECLARE_CLIENTCLASS_NOBASE()							
-
-#else
-
-#define DECLARE_NETWORKCLASS()											\
-		DECLARE_SERVERCLASS()
-
-#define DECLARE_NETWORKCLASS_NOBASE()									\
-		DECLARE_SERVERCLASS_NOBASE()	
-
-#endif
-
-#if defined( CLIENT_DLL )
-
-#ifndef NO_ENTITY_PREDICTION
-#define DECLARE_PREDICTABLE()											\
-	public:																\
-		static typedescription_t m_PredDesc[];							\
-		static datamap_t m_PredMap;										\
-		virtual datamap_t *GetPredDescMap( void );						\
-		template <typename T> friend datamap_t *PredMapInit(T *)
-#else
-#define DECLARE_PREDICTABLE()	template <typename T> friend datamap_t *PredMapInit(T *)
-#endif
-
-#ifndef NO_ENTITY_PREDICTION
-#define BEGIN_PREDICTION_DATA( className ) \
-	datamap_t className::m_PredMap = { 0, 0, #className, &BaseClass::m_PredMap }; \
-	datamap_t *className::GetPredDescMap( void ) { return &m_PredMap; } \
-	BEGIN_PREDICTION_DATA_GUTS( className )
-
-#define BEGIN_PREDICTION_DATA_NO_BASE( className ) \
-	datamap_t className::m_PredMap = { 0, 0, #className, NULL }; \
-	datamap_t *className::GetPredDescMap( void ) { return &m_PredMap; } \
-	BEGIN_PREDICTION_DATA_GUTS( className )
-
-#define BEGIN_PREDICTION_DATA_GUTS( className ) \
-	template <typename T> datamap_t *PredMapInit(T *); \
-	template <> datamap_t *PredMapInit<className>( className * ); \
-	namespace className##_PredDataDescInit \
-	{ \
-		datamap_t *g_PredMapHolder = PredMapInit( (className *)NULL );             \
-	} \
-	\
-	template <> datamap_t *PredMapInit<className>( className * ) \
-	{ \
-		typedef className classNameTypedef; \
-		static typedescription_t predDesc[] = \
-		{ \
-		{ FIELD_VOID,0, {0,0},0,0,0,0,0,0},        
-
-#define END_PREDICTION_DATA() \
-		}; \
-		\
-		if ( sizeof( predDesc ) > sizeof( predDesc[0] ) ) \
-		{ \
-			classNameTypedef::m_PredMap.dataNumFields = ARRAYSIZE( predDesc ) - 1; \
-			classNameTypedef::m_PredMap.dataDesc 	  = &predDesc[1]; \
-		} \
-		else \
-		{ \
-			classNameTypedef::m_PredMap.dataNumFields = 1; \
-			classNameTypedef::m_PredMap.dataDesc 	  = predDesc; \
-		} \
-		return &classNameTypedef::m_PredMap; \
-	}
-#else
-#define BEGIN_PREDICTION_DATA( className ) \
-	template <> inline datamap_t *PredMapInit<className>( className * ) \
-	{ \
-		if ( 0 ) \
-		{ \
-			typedef className classNameTypedef; \
-			typedescription_t predDesc[] = \
-			{ \
-				{ FIELD_VOID,0, {0,0},0,0,0,0,0,0},
-
-#define BEGIN_PREDICTION_DATA_NO_BASE( className ) BEGIN_PREDICTION_DATA( className )
-
-#define END_PREDICTION_DATA() \
-			}; \
-			predDesc[0].flags = 0;         \
-		} \
-	}
-#endif
-
-#else
-
-#define DECLARE_PREDICTABLE()	
-#define BEGIN_PREDICTION_DATA( className ) 
-#define END_PREDICTION_DATA() 
-
-#endif
-
-#if defined( CLIENT_DLL )
-
-#define LINK_ENTITY_TO_CLASS( localName, className )						\
-	static C_BaseEntity *C##className##Factory( void )						\
-	{																		\
-		return static_cast< C_BaseEntity * >( new className );				\
-	};																		\
-	class C##localName##Foo													\
-	{																		\
-	public:																	\
-		C##localName##Foo( void )											\
-		{																	\
-			GetClassMap().Add( #localName, #className, sizeof( className ),	\
-				&C##className##Factory );									\
-		}																	\
-	};																		\
-	static C##localName##Foo g_C##localName##Foo;
-
-#define BEGIN_NETWORK_TABLE( className, tableName ) BEGIN_RECV_TABLE( className, tableName )
-#define BEGIN_NETWORK_TABLE_NOBASE( className, tableName ) BEGIN_RECV_TABLE_NOBASE( className, tableName )
-
-#define END_NETWORK_TABLE	END_RECV_TABLE
-
-#define IMPLEMENT_NETWORKCLASS_ALIASED(className, dataTable)			\
-	IMPLEMENT_CLIENTCLASS( C_##className, dataTable, C##className )
-#define IMPLEMENT_NETWORKCLASS(className, dataTable)			\
-	IMPLEMENT_CLIENTCLASS(className, dataTable, className)
-#define IMPLEMENT_NETWORKCLASS_DT(className, dataTable)			\
-	IMPLEMENT_CLIENTCLASS_DT(className, dataTable, className)
-
-#else
-
-#define BEGIN_NETWORK_TABLE( className, tableName ) BEGIN_SEND_TABLE( className, tableName )
-#define BEGIN_NETWORK_TABLE_NOBASE( className, tableName ) BEGIN_SEND_TABLE_NOBASE( className, tableName )
-
-#define END_NETWORK_TABLE	END_SEND_TABLE
-
-#define IMPLEMENT_NETWORKCLASS_ALIASED(className, dataTable)			\
-	IMPLEMENT_SERVERCLASS( C##className, dataTable )
-#define IMPLEMENT_NETWORKCLASS(className, dataTable)			\
-	IMPLEMENT_SERVERCLASS(className, dataTable)
-#define IMPLEMENT_NETWORKCLASS_DT(className, dataTable)			\
-	IMPLEMENT_SERVERCLASS_ST(className, dataTable)
-
-#endif																	
-
-abstract_class IPredictableList
-{
-public:
-	virtual CBaseEntity* GetPredictable(int slot) = 0;
-	virtual int				GetPredictableCount(void) = 0;
-};
-
-extern IPredictableList* predictables;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/predictableid.h b/SpyCustom/predictableid.h
deleted file mode 100644
index 5ec7216..0000000
--- a/SpyCustom/predictableid.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef PREDICTABLEID_H
-#define PREDICTABLEID_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#if !defined( NO_ENTITY_PREDICTION )
-class CPredictableId
-{
-public:
-	CPredictableId(void);
-
-	static void		ResetInstanceCounters(void);
-
-	bool			IsActive(void) const;
-
-	void			Init(int player, int command, const char* classname, const char* module, int line);
-
-	int				GetPlayer(void) const;
-	int				GetHash(void) const;
-	int				GetInstanceNumber(void) const;
-	int				GetCommandNumber(void) const;
-
-	void			SetAcknowledged(bool ack);
-	bool			GetAcknowledged(void) const;
-
-	int				GetRaw(void) const;
-	void			SetRaw(int raw);
-
-	char const* Describe(void) const;
-
-	bool operator ==(const CPredictableId& other) const;
-	bool operator !=(const CPredictableId& other) const;
-private:
-	void			SetCommandNumber(int commandNumber);
-	void			SetPlayer(int playerIndex);
-	void			SetInstanceNumber(int counter);
-
-	struct bitfields
-	{
-		unsigned int ack : 1;	 
-		unsigned int player : 5;	 
-		unsigned int command : 10;	 
-		unsigned int hash : 12;	 
-		unsigned int instance : 4;	 
-	} m_PredictableID;
-};
-
-FORCEINLINE void NetworkVarConstruct(CPredictableId& x) {}
-
-#endif
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/predictioncopy.h b/SpyCustom/predictioncopy.h
deleted file mode 100644
index ed24b7e..0000000
--- a/SpyCustom/predictioncopy.h
+++ /dev/null
@@ -1,278 +0,0 @@
-#ifndef PREDICTIONCOPY_H
-#define PREDICTIONCOPY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <memory.h>
-#include "datamap.h"
-#include "ehandle.h"
-#include "utlstring.h"
-
-#if defined( CLIENT_DLL )
-class C_BaseEntity;
-typedef CHandle<C_BaseEntity> EHANDLE;
-
-#if defined( _DEBUG )
-class IGameSystem;
-IGameSystem* GetPredictionCopyTester(void);
-#endif
-
-#else
-class CBaseEntity;
-typedef CHandle<CBaseEntity> EHANDLE;
-#endif
-
-enum
-{
-	PC_EVERYTHING = 0,
-	PC_NON_NETWORKED_ONLY,
-	PC_NETWORKED_ONLY,
-};
-
-#define PC_DATA_PACKED			true
-#define PC_DATA_NORMAL			false
-
-typedef void (*FN_FIELD_COMPARE)(const char* classname, const char* fieldname, const char* fieldtype,
-	bool networked, bool noterrorchecked, bool differs, bool withintolerance, const char* value);
-
-class CPredictionCopy
-{
-public:
-	typedef enum
-	{
-		DIFFERS = 0,
-		IDENTICAL,
-		WITHINTOLERANCE,
-	} difftype_t;
-
-	CPredictionCopy(int type, void* dest, bool dest_packed, void const* src, bool src_packed,
-		bool counterrors = false, bool reporterrors = false, bool performcopy = true,
-		bool describefields = false, FN_FIELD_COMPARE func = NULL);
-
-	void	CopyShort(difftype_t dt, short* outvalue, const short* invalue, int count);
-	void	CopyInt(difftype_t dt, int* outvalue, const int* invalue, int count);		   
-	void	CopyBool(difftype_t dt, bool* outvalue, const bool* invalue, int count);		   
-	void	CopyFloat(difftype_t dt, float* outvalue, const float* invalue, int count);	   
-	void	CopyString(difftype_t dt, char* outstring, const char* instring);			    
-	void	CopyVector(difftype_t dt, Vector& outValue, const Vector& inValue);				   
-	void	CopyVector(difftype_t dt, Vector* outValue, const Vector* inValue, int count);	    
-	void	CopyQuaternion(difftype_t dt, Quaternion& outValue, const Quaternion& inValue);				   
-	void	CopyQuaternion(difftype_t dt, Quaternion* outValue, const Quaternion* inValue, int count);				    
-	void	CopyEHandle(difftype_t dt, EHANDLE* outvalue, EHANDLE const* invalue, int count);
-
-	void	FORCEINLINE CopyData(difftype_t dt, int size, char* outdata, const char* indata)		     
-	{
-		if (!m_bPerformCopy)
-			return;
-
-		if (dt == IDENTICAL)
-			return;
-
-		memcpy(outdata, indata, size);
-	}
-
-	int		TransferData(const char* operation, int entindex, datamap_t* dmap);
-
-private:
-	void	TransferData_R(int chaincount, datamap_t* dmap);
-
-	void	DetermineWatchField(const char* operation, int entindex, datamap_t* dmap);
-	void	DumpWatchField(typedescription_t* field);
-	void	WatchMsg(PRINTF_FORMAT_STRING const char* fmt, ...);
-
-	difftype_t	CompareShort(short* outvalue, const short* invalue, int count);
-	difftype_t	CompareInt(int* outvalue, const int* invalue, int count);		   
-	difftype_t	CompareBool(bool* outvalue, const bool* invalue, int count);		   
-	difftype_t	CompareFloat(float* outvalue, const float* invalue, int count);	   
-	difftype_t	CompareData(int size, char* outdata, const char* indata);		     
-	difftype_t	CompareString(char* outstring, const char* instring);			    
-	difftype_t	CompareVector(Vector& outValue, const Vector& inValue);				   
-	difftype_t	CompareVector(Vector* outValue, const Vector* inValue, int count);	    
-	difftype_t	CompareQuaternion(Quaternion& outValue, const Quaternion& inValue);				   
-	difftype_t	CompareQuaternion(Quaternion* outValue, const Quaternion* inValue, int count);	    
-	difftype_t	CompareEHandle(EHANDLE* outvalue, EHANDLE const* invalue, int count);
-
-	void	DescribeShort(difftype_t dt, short* outvalue, const short* invalue, int count);
-	void	DescribeInt(difftype_t dt, int* outvalue, const int* invalue, int count);		   
-	void	DescribeBool(difftype_t dt, bool* outvalue, const bool* invalue, int count);		   
-	void	DescribeFloat(difftype_t dt, float* outvalue, const float* invalue, int count);	   
-	void	DescribeData(difftype_t dt, int size, char* outdata, const char* indata);		     
-	void	DescribeString(difftype_t dt, char* outstring, const char* instring);			    
-	void	DescribeVector(difftype_t dt, Vector& outValue, const Vector& inValue);				   
-	void	DescribeVector(difftype_t dt, Vector* outValue, const Vector* inValue, int count);	    
-	void	DescribeQuaternion(difftype_t dt, Quaternion& outValue, const Quaternion& inValue);				   
-	void	DescribeQuaternion(difftype_t dt, Quaternion* outValue, const Quaternion* inValue, int count);	    
-	void	DescribeEHandle(difftype_t dt, EHANDLE* outvalue, EHANDLE const* invalue, int count);
-
-	void	WatchShort(difftype_t dt, short* outvalue, const short* invalue, int count);
-	void	WatchInt(difftype_t dt, int* outvalue, const int* invalue, int count);		   
-	void	WatchBool(difftype_t dt, bool* outvalue, const bool* invalue, int count);		   
-	void	WatchFloat(difftype_t dt, float* outvalue, const float* invalue, int count);	   
-	void	WatchData(difftype_t dt, int size, char* outdata, const char* indata);		     
-	void	WatchString(difftype_t dt, char* outstring, const char* instring);			    
-	void	WatchVector(difftype_t dt, Vector& outValue, const Vector& inValue);				   
-	void	WatchVector(difftype_t dt, Vector* outValue, const Vector* inValue, int count);	    
-	void	WatchQuaternion(difftype_t dt, Quaternion& outValue, const Quaternion& inValue);				   
-	void	WatchQuaternion(difftype_t dt, Quaternion* outValue, const Quaternion* inValue, int count);	    
-	void	WatchEHandle(difftype_t dt, EHANDLE* outvalue, EHANDLE const* invalue, int count);
-
-	void	ReportFieldsDiffer(PRINTF_FORMAT_STRING const char* fmt, ...);
-	void	DescribeFields(difftype_t dt, PRINTF_FORMAT_STRING const char* fmt, ...);
-
-	bool	CanCheck(void);
-
-	void	CopyFields(int chaincount, datamap_t* pMap, typedescription_t* pFields, int fieldCount);
-
-private:
-
-	int				m_nType;
-	void* m_pDest;
-	void const* m_pSrc;
-	int				m_nDestOffsetIndex;
-	int				m_nSrcOffsetIndex;
-
-
-	bool			m_bErrorCheck;
-	bool			m_bReportErrors;
-	bool			m_bDescribeFields;
-	typedescription_t* m_pCurrentField;
-	char const* m_pCurrentClassName;
-	datamap_t* m_pCurrentMap;
-	bool			m_bShouldReport;
-	bool			m_bShouldDescribe;
-	int				m_nErrorCount;
-	bool			m_bPerformCopy;
-
-	FN_FIELD_COMPARE	m_FieldCompareFunc;
-
-	typedescription_t* m_pWatchField;
-	char const* m_pOperation;
-};
-
-typedef void (*FN_FIELD_DESCRIPTION)(const char* classname, const char* fieldname, const char* fieldtype,
-	bool networked, const char* value);
-
-class CPredictionDescribeData
-{
-public:
-	CPredictionDescribeData(void const* src, bool src_packed, FN_FIELD_DESCRIPTION func = 0);
-
-	void	DescribeShort(const short* invalue, int count);
-	void	DescribeInt(const int* invalue, int count);
-	void	DescribeBool(const bool* invalue, int count);
-	void	DescribeFloat(const float* invalue, int count);
-	void	DescribeData(int size, const char* indata);
-	void	DescribeString(const char* instring);
-	void	DescribeVector(const Vector& inValue);
-	void	DescribeVector(const Vector* inValue, int count);
-	void	DescribeQuaternion(const Quaternion& inValue);
-	void	DescribeQuaternion(const Quaternion* inValue, int count);
-	void	DescribeEHandle(EHANDLE const* invalue, int count);
-
-	void	DumpDescription(datamap_t* pMap);
-
-private:
-	void	DescribeFields_R(int chain_count, datamap_t* pMap, typedescription_t* pFields, int fieldCount);
-
-	void const* m_pSrc;
-	int				m_nSrcOffsetIndex;
-
-	void			Describe(PRINTF_FORMAT_STRING const char* fmt, ...);
-
-	typedescription_t* m_pCurrentField;
-	char const* m_pCurrentClassName;
-	datamap_t* m_pCurrentMap;
-
-	bool			m_bShouldReport;
-
-	FN_FIELD_DESCRIPTION	m_FieldDescFunc;
-};
-
-#if defined( CLIENT_DLL )
-class CValueChangeTracker
-{
-public:
-	CValueChangeTracker();
-
-	void Reset();
-
-	void StartTrack(char const* pchContext);
-	void EndTrack();
-
-	bool IsActive() const;
-
-	void SetupTracking(C_BaseEntity* ent, char const* pchFieldName);
-	void ClearTracking();
-
-	void Spew();
-
-	C_BaseEntity* GetEntity();
-
-private:
-
-	enum
-	{
-		eChangeTrackerBufSize = 128,
-	};
-
-	void				GetValue(char* buf, size_t bufsize);
-
-	bool				m_bActive : 1;
-	bool				m_bTracking : 1;
-	EHANDLE				m_hEntityToTrack;
-	CUtlVector< typedescription_t* > m_FieldStack;
-	CUtlString			m_strFieldName;
-	CUtlString			m_strContext;
-	char				m_OrigValueBuf[eChangeTrackerBufSize];
-	CUtlVector< CUtlString >	 m_History;
-};
-
-extern CValueChangeTracker* g_pChangeTracker;
-
-class CValueChangeTrackerScope
-{
-public:
-	CValueChangeTrackerScope(char const* pchContext)
-	{
-		m_bCallEndTrack = true;
-		g_pChangeTracker->StartTrack(pchContext);
-	}
-
-	CValueChangeTrackerScope(C_BaseEntity* pEntity, char const* pchContext)
-	{
-		m_bCallEndTrack = g_pChangeTracker->GetEntity() == pEntity;
-		if (m_bCallEndTrack)
-		{
-			g_pChangeTracker->StartTrack(pchContext);
-		}
-	}
-
-	~CValueChangeTrackerScope()
-	{
-		if (m_bCallEndTrack)
-		{
-			g_pChangeTracker->EndTrack();
-		}
-	}
-private:
-
-	bool		m_bCallEndTrack;
-};
-
-#if defined( _DEBUG )
-#define PREDICTION_TRACKVALUECHANGESCOPE( context )		CValueChangeTrackerScope scope( context );
-#define PREDICTION_TRACKVALUECHANGESCOPE_ENTITY( entity, context ) CValueChangeTrackerScope scope( entity, context );
-#define PREDICTION_STARTTRACKVALUE( context )			g_pChangeTracker->StartTrack( context );
-#define PREDICTION_ENDTRACKVALUE()						g_pChangeTracker->EndTrack();
-#define PREDICTION_SPEWVALUECHANGES()					g_pChangeTracker->Spew();
-#else
-#define PREDICTION_TRACKVALUECHANGESCOPE( context )
-#define PREDICTION_TRACKVALUECHANGESCOPE_ENTITY( entity, context )
-#define PREDICTION_STARTTRACKVALUE( context )
-#define PREDICTION_ENDTRACKVALUE()	
-#define PREDICTION_SPEWVALUECHANGES() 
-#endif
-
-#endif  
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/protobuffs.cpp b/SpyCustom/protobuffs.cpp
deleted file mode 100644
index 3adefa5..0000000
--- a/SpyCustom/protobuffs.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-#include "Protobuffs.hpp"
-#include "Interfaces.hpp"
-#include "inventory_changer.h"
-
-extern Protobuffs ProtoFeatures;
-#define CAST(cast, address, add) reinterpret_cast<cast>((uint32_t)address + (uint32_t)add)
-
-void Protobuffs::WritePacket(std::string packet, void* thisPtr, void* oldEBP, void* pubDest, uint32_t cubDest, uint32_t* pcubMsgSize)
-{
-	if ((uint32_t)packet.size() <= cubDest - 8)
-	{
-		memcpy((void*)((DWORD)pubDest + 8), (void*)packet.data(), packet.size());
-		*pcubMsgSize = packet.size() + 8;
-	}
-	else if (iff.g_pMemAlloc)
-	{
-		auto memPtr = *CAST(void**, thisPtr, 0x18);
-		auto memPtrSize = *CAST(uint32_t*, thisPtr, 0x1C);
-		auto newSize = (memPtrSize - cubDest) + packet.size() + 8;
-
-		auto memory = iff.g_pMemAlloc->Realloc(memPtr, newSize + 4);
-
-		*CAST(void**, thisPtr, 0x18) = memory;
-		*CAST(uint32_t*, thisPtr, 0x1C) = newSize;
-		*CAST(void**, oldEBP, -0x14) = memory;
-
-		memcpy(CAST(void*, memory, 0x1C), (void*)packet.data(), packet.size());
-
-		*pcubMsgSize = packet.size() + 8;
-	}
-}
-
-static bool onceChanger = false;
-
-void Protobuffs::ReceiveMessage(void* thisPtr, void* oldEBP, uint32_t messageType, void* pubDest, uint32_t cubDest, uint32_t* pcubMsgSize)
-{
-	if (messageType == k_EMsgGCCStrike15_v2_MatchmakingGC2ClientHello)
-	{
-#ifdef DEBUG
-		printf("Packet == k_EMsgGCCStrike15_v2_MatchmakingGC2ClientHello\n");
-#endif
-		if (g_Options.profile_active) {
-
-			MatchmakingGC2ClientHello msg((void*)((DWORD)pubDest + 8), *pcubMsgSize - 8);
-			MatchmakingGC2ClientHello::PlayerCommendationInfo commendations;
-			commendations.cmd_friendly().set(g_Options.comfriendly);
-			commendations.cmd_teaching().set(g_Options.comteacher);
-			commendations.cmd_leader().set(g_Options.comleader);
-			msg.commendation().set(commendations);
-		
-			msg.player_level().set(g_Options.level);
-			msg.player_cur_xp().set(g_Options.xp);
-
-			if (g_Options.banduration != 0) {
-				msg.penalty_reason().set(g_Options.banreason);
-				msg.penalty_seconds().set(g_Options.banduration);
-			}
-
-			msg.vac_banned().set(g_Options.vacban);
-
-			MatchmakingGC2ClientHello::PlayerRankingInfo ranking;
-			ranking.account_id().set(iff.g_SteamUser->GetSteamID().GetAccountID());
-			ranking.rank_type_id().set(6);
-			ranking.rank_id().set(g_Options.rankz.value->arr[0].rank);
-			ranking.wins().set(g_Options.rankz.value->arr[0].wins);
-			msg.ranking().set(ranking);
-
-			auto packet = msg.serialize();
-			WritePacket(packet, thisPtr, oldEBP, pubDest, cubDest, pcubMsgSize);
-
-#ifdef DEBUG
-			printf("send packet 0 6 rank %d wins %d\n", g_Options.rankz.value->arr[0].rank, g_Options.rankz.value->arr[0].wins);
-#endif
-		}
-
-		
-		
-	}
-	else if (messageType == k_EMsgGCCStrike15_v2_ClientGCRankUpdate)
-	{
-#ifdef DEBUG
-		printf("Packet == k_EMsgGCCStrike15_v2_ClientGCRankUpdate\n");
-#endif
-
-		if (g_Options.profile_active) {
-			CMsgGCCStrike15_v2_ClientGCRankUpdate msg((void*)((DWORD)pubDest + 8), *pcubMsgSize - 8);
-
-			auto ranking = msg.ranking().get();
-
-			int ranktype = ranking.rank_type_id().get();
-#ifdef DEBUG
-			printf("ranktype = %d\n", ranktype);
-#endif
-			int rankcount = 0;
-			if (ranktype == 7) rankcount = 1;
-			if (ranktype == 10) rankcount = 2;
-			
-			ranking.rank_id().set(g_Options.rankz.value->arr[rankcount].rank);
-			ranking.wins().set(g_Options.rankz.value->arr[rankcount].wins);
-
-			msg.ranking().set(ranking);
-
-			auto packet = msg.serialize();
-			WritePacket(packet, thisPtr, oldEBP, pubDest, cubDest, pcubMsgSize);
-
-		}
-
-	}
-	else if (messageType == k_EMsgGCClientWelcome)
-	{
-#ifdef DEBUG
-		printf("Packet == k_EMsgGCClientWelcome\n");
-#endif
-		auto packet = inventory_changer(pubDest, pcubMsgSize);
-		WritePacket(packet, thisPtr, oldEBP, pubDest, cubDest, pcubMsgSize);
-
-	}
-#ifdef DEBUG
-	printf(".GC Receive: %d\n", messageType);
-#endif
-}
-
-bool Protobuffs::PreSendMessage(uint32_t& unMsgType, void* pubData, uint32_t& cubData)
-{
-	uint32_t MessageType = unMsgType & 0x7FFFFFFF;
-#ifdef DEBUG
-	printf(".GC Sent: %d\n", MessageType);
-#endif
-	return true;
-}
-
-bool Protobuffs::SendClientHello()
-{
-	CMsgClientHello msg;
-	msg.client_session_need().set(1);
-	auto packet = msg.serialize();
-
-	void* ptr = malloc(packet.size() + 8);
-
-	if (!ptr)
-		return false;
-
-	((uint32_t*)ptr)[0] = k_EMsgGCClientHello | ((DWORD)1 << 31);
-	((uint32_t*)ptr)[1] = 0;
-
-	memcpy((void*)((DWORD)ptr + 8), (void*)packet.data(), packet.size());
-	bool result = iff.g_SteamGameCoordinator->GCSendMessage(k_EMsgGCClientHello | ((DWORD)1 << 31), ptr, packet.size() + 8) == k_EGCResultOK;
-	free(ptr);
-
-	return result;
-}
-
-bool Protobuffs::SendMatchmakingClient2GCHello()
-{
-	ProtoWriter msg(0);
-	auto packet = msg.serialize();
-	void* ptr = malloc(packet.size() + 8);
-
-	if (!ptr)
-		return false;
-
-	((uint32_t*)ptr)[0] = k_EMsgGCCStrike15_v2_MatchmakingClient2GCHello | ((DWORD)1 << 31);
-	((uint32_t*)ptr)[1] = 0;
-
-	memcpy((void*)((DWORD)ptr + 8), (void*)packet.data(), packet.size());
-	bool result = iff.g_SteamGameCoordinator->GCSendMessage(k_EMsgGCCStrike15_v2_MatchmakingClient2GCHello | ((DWORD)1 << 31), ptr, packet.size() + 8) == k_EGCResultOK;
-	free(ptr);
-
-	return result;
-}
-
-bool Protobuffs::SendClientGcRankUpdate()
-{
-	MatchmakingGC2ClientHello::PlayerRankingInfo rank_wingman;
-	rank_wingman.rank_type_id().set(7);       
-
-	CMsgGCCStrike15_v2_ClientGCRankUpdate msg;
-	msg.ranking().set(rank_wingman);
-
-	auto packet = msg.serialize();
-
-	void* ptr = malloc(packet.size() + 8);
-
-	if (!ptr)
-		return false;
-
-	((uint32_t*)ptr)[0] = k_EMsgGCCStrike15_v2_ClientGCRankUpdate | ((DWORD)1 << 31);
-	((uint32_t*)ptr)[1] = 0;
-
-	memcpy((void*)((DWORD)ptr + 8), (void*)packet.data(), packet.size());
-	bool result = iff.g_SteamGameCoordinator->GCSendMessage(k_EMsgGCCStrike15_v2_ClientGCRankUpdate | ((DWORD)1 << 31), ptr, packet.size() + 8) == k_EGCResultOK;
-	free(ptr);
-
-	return result;
-}
-
-bool Protobuffs::EquipWeapon(int weaponid, int classid, int slotid)
-{
-	CMsgAdjustItemEquippedState msg;
-	msg.item_id().set(START_ITEM_INDEX + weaponid);
-	msg.new_class().set(classid);
-	msg.new_slot().set(slotid);
-	msg.swap().set(true);
-	auto packet = msg.serialize();
-
-	void* ptr = malloc(packet.size() + 8);
-
-	if (!ptr)
-		return false;
-
-	((uint32_t*)ptr)[0] = k_EMsgGCAdjustItemEquippedState | ((DWORD)1 << 31);
-	((uint32_t*)ptr)[1] = 0;
-
-	memcpy((void*)((DWORD)ptr + 8), (void*)packet.data(), packet.size());
-	bool result = iff.g_SteamGameCoordinator->GCSendMessage(k_EMsgGCAdjustItemEquippedState | ((DWORD)1 << 31), ptr, packet.size() + 8) == k_EGCResultOK;
-	free(ptr);
-
-	return result;
-}
-
-
-
-
-
-VMTHook* ProtoHook = nullptr;
-Protobuffs ProtoFeatures;
-
-
-
-EGCResult __fastcall hkGCRetrieveMessage(void* ecx, void*, uint32_t* punMsgType, void* pubDest, uint32_t cubDest, uint32_t* pcubMsgSize)
-{
-	static auto oGCRetrieveMessage = ProtoHook->GetOriginal<EGCResult(__thiscall*)(void*, uint32_t* punMsgType, void* pubDest, uint32_t cubDest, uint32_t* pcubMsgSize)>(2);
-
-	auto status = oGCRetrieveMessage(ecx, punMsgType, pubDest, cubDest, pcubMsgSize);
-
-
-	if (status == k_EGCResultOK)
-	{
-		void* thisPtr = nullptr;
-		__asm mov thisPtr, ebx;
-		auto oldEBP = *reinterpret_cast<void**>((uint32_t)_AddressOfReturnAddress() - 4);
-
-		uint32_t messageType = *punMsgType & 0x7FFFFFFF;
-		ProtoFeatures.ReceiveMessage(thisPtr, oldEBP, messageType, pubDest, cubDest, pcubMsgSize);
-	}
-
-
-	return status;
-}
-
-EGCResult __fastcall hkGCSendMessage(void* ecx, void*, uint32_t unMsgType, const void* pubData, uint32_t cubData)
-{
-	static auto oGCSendMessage = ProtoHook->GetOriginal<EGCResult(__thiscall*)(void*, uint32_t unMsgType, const void* pubData, uint32_t cubData)>(0);
-
-	bool sendMessage = ProtoFeatures.PreSendMessage(unMsgType, const_cast<void*>(pubData), cubData);
-
-	if (!sendMessage)
-		return k_EGCResultOK;
-
-
-	return oGCSendMessage(ecx, unMsgType, const_cast<void*>(pubData), cubData);
-}
\ No newline at end of file
diff --git a/SpyCustom/protobuffs.hpp b/SpyCustom/protobuffs.hpp
deleted file mode 100644
index 7cbd9a2..0000000
--- a/SpyCustom/protobuffs.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-#include <windows.h>
-#include <string>
-
-#include "VMT.hpp"
-
-#include "steam.h"
-#include "intrin.h"
-
-extern VMTHook* ProtoHook;
-
-class Protobuffs
-{
-public:
-	static void WritePacket(std::string packet, void* thisPtr, void* oldEBP, void* pubDest, uint32_t cubDest, uint32_t* pcubMsgSize);
-	void ReceiveMessage(void* thisPtr, void* oldEBP, uint32_t messageType, void* pubDest, uint32_t cubDest, uint32_t* pcubMsgSize);
-	bool PreSendMessage(uint32_t& unMsgType, void* pubData, uint32_t& cubData);
-	bool SendClientHello();
-	bool SendMatchmakingClient2GCHello();
-	bool SendClientGcRankUpdate();
-	bool EquipWeapon(int weaponid, int classid, int slotid);
-};
-
-
-extern Protobuffs ProtoFeatures;
-
-EGCResult __fastcall hkGCRetrieveMessage(void* ecx, void*, uint32_t* punMsgType, void* pubDest, uint32_t cubDest, uint32_t* pcubMsgSize);
-EGCResult __fastcall hkGCSendMessage(void* ecx, void*, uint32_t unMsgType, const void* pubData, uint32_t cubData);
-
-
diff --git a/SpyCustom/proxies.hpp b/SpyCustom/proxies.hpp
deleted file mode 100644
index 62f06d6..0000000
--- a/SpyCustom/proxies.hpp
+++ /dev/null
@@ -1,195 +0,0 @@
-#pragma once
-
-
-RecvVarProxyFn fnSequenceProxyFn = NULL;
-
-void SetViewModelSequence(const CRecvProxyData* pDataConst, void* pStruct, void* pOut) {
-
-	CRecvProxyData* pData = const_cast<CRecvProxyData*>(pDataConst);
-
-		C_BaseViewModel* pViewModel = (C_BaseViewModel*)pStruct;
-
-		if (pViewModel) {
-			IClientEntity* pOwner = iff.g_pEntityList->GetClientEntityFromHandle(pViewModel->GetOwner());
-
-			if (pOwner && pOwner->GetIndex() == iff.g_pEngineClient->GetLocalPlayer()) {
-
-				
-
-				const model_t* pModel = iff.g_pMdlInfo->GetModel(pViewModel->GetModelIndex());
-				const char* szModel = iff.g_pMdlInfo->GetModelName(pModel);
-
-				int m_nSequence = pData->m_Value.m_Int;
-
-				auto model = fnv2::hashRuntime(szModel);
-
-				static int defknifethash = fnv2::hash("models/weapons/v_knife_default_t.mdl");
-				static int defknifecthash = fnv2::hash("models/weapons/v_knife_default_ct.mdl");
-				if (model == defknifethash || model == defknifecthash) model = fnv2::hash(g_Options.weapons.value->arr[0].model);
-				  
-				for (int i = 2; i < g_Options.models.value->itemcount; i++) {
-
-					if (model == g_Options.models.value->arr[i].vmodel_hash)
-					{
-						if (g_Options.models.value->arr[i].seq_active)
-							m_nSequence = g_Options.models.value->arr[i].seqs[m_nSequence].seq_repl;
-						break;
-					}
-					if (model == fnv2::hash(g_Options.models.value->arr[i].vmodel_orig))
-					{
-						if (g_Options.models.value->arr[i].seq_active)   
-							m_nSequence = g_Options.models.value->arr[i].seqs[m_nSequence].seq_repl;
-						
-						break;
-					}
-				}
-
-				switch (model) {
-				case fnv2::hash("models/weapons/v_knife_butterfly.mdl"):
-				{
-					switch (m_nSequence)
-					{
-					case SEQUENCE_DEFAULT_DRAW:
-						m_nSequence = random(SEQUENCE_BUTTERFLY_DRAW, SEQUENCE_BUTTERFLY_DRAW2); break;
-					case SEQUENCE_DEFAULT_LOOKAT01:
-						m_nSequence = random(SEQUENCE_BUTTERFLY_LOOKAT01, SEQUENCE_BUTTERFLY_LOOKAT03); break;
-					default:
-						m_nSequence++;
-					}
-					break;
-				}
-
-
-				case fnv2::hash("models/weapons/v_knife_falchion_advanced.mdl"):
-				{
-					switch (m_nSequence)
-					{
-					case SEQUENCE_DEFAULT_IDLE2:
-						m_nSequence = SEQUENCE_FALCHION_IDLE1; break;
-					case SEQUENCE_DEFAULT_HEAVY_MISS1:
-						m_nSequence = random(SEQUENCE_FALCHION_HEAVY_MISS1, SEQUENCE_FALCHION_HEAVY_MISS1_NOFLIP); break;
-					case SEQUENCE_DEFAULT_LOOKAT01:
-						m_nSequence = random(SEQUENCE_FALCHION_LOOKAT01, SEQUENCE_FALCHION_LOOKAT02); break;
-					case SEQUENCE_DEFAULT_DRAW:
-					case SEQUENCE_DEFAULT_IDLE1:
-						m_nSequence = m_nSequence; break;
-					default:
-						m_nSequence--;
-					}
-					break;
-				}
-
-
-				case fnv2::hash("models/weapons/v_knife_push.mdl"):
-				{
-					switch (m_nSequence)
-					{
-					case SEQUENCE_DEFAULT_IDLE2:
-						m_nSequence = SEQUENCE_DAGGERS_IDLE1; break;
-					case SEQUENCE_DEFAULT_LIGHT_MISS1:
-					case SEQUENCE_DEFAULT_LIGHT_MISS2:
-						m_nSequence = random(SEQUENCE_DAGGERS_LIGHT_MISS1, SEQUENCE_DAGGERS_LIGHT_MISS5); break;
-					case SEQUENCE_DEFAULT_HEAVY_MISS1:
-						m_nSequence = random(SEQUENCE_DAGGERS_HEAVY_MISS2, SEQUENCE_DAGGERS_HEAVY_MISS1); break;
-					case SEQUENCE_DEFAULT_HEAVY_HIT1:
-					case SEQUENCE_DEFAULT_HEAVY_BACKSTAB:
-					case SEQUENCE_DEFAULT_LOOKAT01:
-						m_nSequence = m_nSequence + 3; break;
-					case SEQUENCE_DEFAULT_DRAW:
-					case SEQUENCE_DEFAULT_IDLE1:
-						m_nSequence = m_nSequence; break;
-					default:
-						m_nSequence = m_nSequence + 2;
-					}
-					break;
-				}
-
-				case fnv2::hash("models/weapons/v_knife_survival_bowie.mdl"):  
-				{
-					switch (m_nSequence)
-					{
-					case SEQUENCE_DEFAULT_DRAW:
-					case SEQUENCE_DEFAULT_IDLE1:
-						m_nSequence = m_nSequence; break;
-					case SEQUENCE_DEFAULT_IDLE2:
-						m_nSequence = SEQUENCE_BOWIE_IDLE1; break;
-					default:
-						m_nSequence = m_nSequence - 1;
-					}
-					break;
-				}
-
-				case fnv2::hash("models/weapons/v_knife_ursus.mdl"):
-				case fnv2::hash("models/weapons/v_knife_skeleton.mdl"):
-				case fnv2::hash("models/weapons/v_knife_outdoor.mdl"):
-				case fnv2::hash("models/weapons/v_knife_cord.mdl"):
-				case fnv2::hash("models/weapons/v_knife_canis.mdl"):
-				{
-					switch (m_nSequence)
-					{
-					case SEQUENCE_DEFAULT_DRAW:
-						m_nSequence = random(SEQUENCE_BUTTERFLY_DRAW, SEQUENCE_BUTTERFLY_DRAW2); break;
-					case SEQUENCE_DEFAULT_LOOKAT01:
-						m_nSequence = random(SEQUENCE_BUTTERFLY_LOOKAT01, 14); break;
-					default:
-						m_nSequence = m_nSequence + 1;
-					}
-					break;
-				}
-
-				case fnv2::hash("models/weapons/v_knife_stiletto.mdl"):
-				{
-					switch (m_nSequence)
-					{
-					case SEQUENCE_DEFAULT_LOOKAT01:
-						m_nSequence = random(12, 13); break;
-					}
-					break;
-				}
-
-				case fnv2::hash("models/weapons/v_knife_widowmaker.mdl"):
-				{
-					switch (m_nSequence)
-					{
-					case SEQUENCE_DEFAULT_LOOKAT01:
-						m_nSequence = random(14, 15); break;
-					}
-					break;
-				}
-
-				case fnv2::hash("models/weapons/v_fists.mdl"):
-				case fnv2::hash("models/weapons/v_axe.mdl"):
-				case fnv2::hash("models/weapons/v_hammer.mdl"):
-				case fnv2::hash("models/weapons/v_spanner.mdl"):
-				{
-					static int lastpunch = 3;
-					switch (m_nSequence)
-					{
-					case SEQUENCE_DEFAULT_DRAW:
-						m_nSequence = 1; break; 
-					case 1:
-					case 2:
-					case 12:
-						m_nSequence = 0; break;
-					default:
-						if (lastpunch == 3) lastpunch = 2; else lastpunch = 3;
-						m_nSequence = lastpunch;
-					}
-
-					break;
-				}
-
-				}
-
-#ifdef DEBUG
-				cout << "activ " << (char*)pViewModel->GetSequenceActivity(m_nSequence);
-				printf(" new seq %d (%s)\n ", m_nSequence, szModel);
-#endif
-
-
-				pData->m_Value.m_Int = m_nSequence;
-			}
-		}
-
-	fnSequenceProxyFn(pData, pStruct, pOut);
-}
\ No newline at end of file
diff --git a/SpyCustom/ragdoll.h b/SpyCustom/ragdoll.h
deleted file mode 100644
index 9a5de13..0000000
--- a/SpyCustom/ragdoll.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#ifndef RAGDOLL_H
-#define RAGDOLL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "ragdoll_shared.h"
-
-#define RAGDOLL_VISUALIZE	0
-
-class C_BaseEntity;
-class CStudioHdr;
-struct mstudiobone_t;
-class Vector;
-class IPhysicsObject;
-class CBoneAccessor;
-
-abstract_class IRagdoll
-{
-public:
-	virtual ~IRagdoll() {}
-
-	virtual void RagdollBone(C_BaseEntity * ent, mstudiobone_t * pbones, int boneCount, bool* boneSimulated, CBoneAccessor & pBoneToWorld) = 0;
-	virtual const Vector& GetRagdollOrigin() = 0;
-	virtual void GetRagdollBounds(Vector& mins, Vector& maxs) = 0;
-	virtual int RagdollBoneCount() const = 0;
-	virtual IPhysicsObject* GetElement(int elementNum) = 0;
-	virtual void DrawWireframe(void) = 0;
-	virtual void VPhysicsUpdate(IPhysicsObject* pObject) = 0;
-};
-
-class CRagdoll : public IRagdoll
-{
-public:
-	CRagdoll();
-	~CRagdoll(void);
-
-	DECLARE_SIMPLE_DATADESC();
-
-	void Init(
-		C_BaseEntity* ent,
-		CStudioHdr* pstudiohdr,
-		const Vector& forceVector,
-		int forceBone,
-		const matrix3x4_t* pDeltaBones0,
-		const matrix3x4_t* pDeltaBones1,
-		const matrix3x4_t* pCurrentBonePosition,
-		float boneDt);
-
-	virtual void RagdollBone(C_BaseEntity* ent, mstudiobone_t* pbones, int boneCount, bool* boneSimulated, CBoneAccessor& pBoneToWorld);
-	virtual const Vector& GetRagdollOrigin();
-	virtual void GetRagdollBounds(Vector& theMins, Vector& theMaxs);
-	void	BuildRagdollBounds(C_BaseEntity* ent);
-
-	virtual IPhysicsObject* GetElement(int elementNum);
-	virtual IPhysicsConstraintGroup* GetConstraintGroup() { return m_ragdoll.pGroup; }
-	virtual void DrawWireframe();
-	virtual void VPhysicsUpdate(IPhysicsObject* pPhysics);
-	virtual int RagdollBoneCount() const { return m_ragdoll.listCount; }
-
-
-	void	SetInitialBonePosition(CStudioHdr* pstudiohdr, const CBoneAccessor& pDesiredBonePosition);
-
-	bool IsValid() { return m_ragdoll.listCount > 0; }
-	bool IsAsleep(void) const { return m_allAsleep; }
-
-	void ResetRagdollSleepAfterTime(void);
-	float GetLastVPhysicsUpdateTime() const { return m_lastUpdate; }
-
-private:
-
-	void			CheckSettleStationaryRagdoll();
-	void			PhysForceRagdollToSleep();
-
-	ragdoll_t	m_ragdoll;
-	Vector		m_mins, m_maxs;
-	Vector		m_origin;
-	float		m_lastUpdate;
-	bool		m_allAsleep;
-	Vector		m_vecLastOrigin;
-	float		m_flLastOriginChangeTime;
-	float		m_flAwakeTime;
-
-#if RAGDOLL_VISUALIZE
-	matrix3x4_t			m_savedBone1[MAXSTUDIOBONES];
-	matrix3x4_t			m_savedBone2[MAXSTUDIOBONES];
-	matrix3x4_t			m_savedBone3[MAXSTUDIOBONES];
-#endif
-
-public:
-
-	ragdoll_t* GetRagdoll(void) { return &m_ragdoll; }
-};
-
-
-CRagdoll* CreateRagdoll(
-	C_BaseEntity* ent,
-	CStudioHdr* pstudiohdr,
-	const Vector& forceVector,
-	int forceBone,
-	const matrix3x4_t* pDeltaBones0,
-	const matrix3x4_t* pDeltaBones1,
-	const matrix3x4_t* pCurrentBonePosition,
-	float boneDt);
-
-
-void NoteRagdollCreationTick(C_BaseEntity* pRagdoll);
-bool WasRagdollCreatedOnCurrentTick(C_BaseEntity* pRagdoll);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/ragdoll_shared.h b/SpyCustom/ragdoll_shared.h
deleted file mode 100644
index ca5ed8a..0000000
--- a/SpyCustom/ragdoll_shared.h
+++ /dev/null
@@ -1,135 +0,0 @@
-#ifndef RAGDOLL_SHARED_H
-#define RAGDOLL_SHARED_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class IPhysicsObject;
-class IPhysicsConstraint;
-class IPhysicsConstraintGroup;
-class IPhysicsCollision;
-class IPhysicsEnvironment;
-class IPhysicsSurfaceProps;
-struct matrix3x4_t;
-
-struct vcollide_t;
-struct studiohdr_t;
-class CStudioHdr;
-class CBoneAccessor;
-
-#include "vector.h"
-#include "bone_accessor.h"
-
-#define RAGDOLL_MAX_ELEMENTS	24
-#define RAGDOLL_INDEX_BITS		5			    
-
-#define CORE_DISSOLVE_FADE_START 0.2f
-#define CORE_DISSOLVE_MODEL_FADE_START 0.1f
-#define CORE_DISSOLVE_MODEL_FADE_LENGTH 0.05f
-#define CORE_DISSOLVE_FADEIN_LENGTH 0.1f
-
-struct ragdollelement_t
-{
-	Vector				originParentSpace;
-	IPhysicsObject* pObject;		      
-	IPhysicsConstraint* pConstraint;	         
-	int					parentIndex;
-};
-
-struct ragdollanimatedfriction_t
-{
-	float					flFrictionTimeIn;
-	float					flFrictionTimeOut;
-	float					flFrictionTimeHold;
-	int						iMinAnimatedFriction;
-	int						iMaxAnimatedFriction;
-};
-
-struct ragdoll_t
-{
-	int						listCount;
-	bool					allowStretch;
-	bool					unused;
-	IPhysicsConstraintGroup* pGroup;
-	ragdollelement_t 	list[RAGDOLL_MAX_ELEMENTS];
-	int					boneIndex[RAGDOLL_MAX_ELEMENTS];
-	ragdollanimatedfriction_t animfriction;
-};
-
-struct ragdollparams_t
-{
-	void* pGameData;
-	vcollide_t* pCollide;
-	CStudioHdr* pStudioHdr;
-	int			modelIndex;
-	Vector		forcePosition;
-	Vector		forceVector;
-	int			forceBoneIndex;
-	const matrix3x4_t* pCurrentBones;
-	float		jointFrictionScale;
-	bool		allowStretch;
-	bool		fixedConstraints;
-};
-
-class CRagdollLRURetirement : public CAutoGameSystemPerFrame
-{
-public:
-	CRagdollLRURetirement(char const* name) : CAutoGameSystemPerFrame(name)
-	{
-	}
-
-	virtual void Update(float frametime);
-	virtual void FrameUpdatePostEntityThink(void);
-
-	void MoveToTopOfLRU(CBaseAnimating* pRagdoll, bool bImportant = false);
-	void SetMaxRagdollCount(int iMaxCount) { m_iMaxRagdolls = iMaxCount; }
-
-	virtual void LevelInitPreEntity(void);
-	int CountRagdolls(bool bOnlySimulatingRagdolls) { return bOnlySimulatingRagdolls ? m_iSimulatedRagdollCount : m_iRagdollCount; }
-
-private:
-	typedef CHandle<CBaseAnimating> CRagdollHandle;
-	CUtlLinkedList< CRagdollHandle > m_LRU;
-	CUtlLinkedList< CRagdollHandle > m_LRUImportantRagdolls;
-
-	int m_iMaxRagdolls;
-	int m_iSimulatedRagdollCount;
-	int m_iRagdollCount;
-};
-
-extern CRagdollLRURetirement s_RagdollLRU;
-
-class CRagdollLowViolenceManager
-{
-public:
-	CRagdollLowViolenceManager() { m_bLowViolence = false; }
-	void SetLowViolence(const char* pMapName);
-	bool IsLowViolence(void) { return m_bLowViolence; }
-
-private:
-	bool m_bLowViolence;
-};
-
-extern CRagdollLowViolenceManager g_RagdollLVManager;
-
-
-bool RagdollCreate(ragdoll_t& ragdoll, const ragdollparams_t& params, IPhysicsEnvironment* pPhysEnv);
-
-void RagdollActivate(ragdoll_t& ragdoll, vcollide_t* pCollide, int modelIndex, bool bForceWake = true);
-void RagdollSetupCollisions(ragdoll_t& ragdoll, vcollide_t* pCollide, int modelIndex);
-void RagdollDestroy(ragdoll_t& ragdoll);
-
-bool RagdollGetBoneMatrix(const ragdoll_t& ragdoll, CBoneAccessor& pBoneToWorld, int objectIndex);
-
-int RagdollExtractBoneIndices(int* boneIndexOut, CStudioHdr* pStudioHdr, vcollide_t* pCollide);
-
-void RagdollComputeExactBbox(const ragdoll_t& ragdoll, const Vector& origin, Vector& outMins, Vector& outMaxs);
-bool RagdollIsAsleep(const ragdoll_t& ragdoll);
-void RagdollSetupAnimatedFriction(IPhysicsEnvironment* pPhysEnv, ragdoll_t* ragdoll, int iModelIndex);
-
-void RagdollApplyAnimationAsVelocity(ragdoll_t& ragdoll, const matrix3x4_t* pBoneToWorld);
-void RagdollApplyAnimationAsVelocity(ragdoll_t& ragdoll, const matrix3x4_t* pPrevBones, const matrix3x4_t* pCurrentBones, float dt);
-
-void RagdollSolveSeparation(ragdoll_t& ragdoll, CBaseEntity* pEntity);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/random.h b/SpyCustom/random.h
deleted file mode 100644
index 8448e2d..0000000
--- a/SpyCustom/random.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef VSTDLIB_RANDOM_H
-#define VSTDLIB_RANDOM_H
-
-#include "vstdlib.h"
-#include "basetypes.h"
-#include "threadtools.h"
-#include "interface.h"
-
-#define NTAB 32
-
-#pragma warning(push)
-#pragma warning( disable:4251 )
-
-class IUniformRandomStream
-{
-public:
-	virtual void	SetSeed(int iSeed) = 0;
-
-	virtual float	RandomFloat(float flMinVal = 0.0f, float flMaxVal = 1.0f) = 0;
-	virtual int		RandomInt(int iMinVal, int iMaxVal) = 0;
-	virtual float	RandomFloatExp(float flMinVal = 0.0f, float flMaxVal = 1.0f, float flExponent = 1.0f) = 0;
-};
-
-
-class VSTDLIB_CLASS CUniformRandomStream : public IUniformRandomStream
-{
-public:
-	CUniformRandomStream();
-
-	virtual void	SetSeed(int iSeed);
-
-	virtual float	RandomFloat(float flMinVal = 0.0f, float flMaxVal = 1.0f);
-	virtual int		RandomInt(int iMinVal, int iMaxVal);
-	virtual float	RandomFloatExp(float flMinVal = 0.0f, float flMaxVal = 1.0f, float flExponent = 1.0f);
-
-private:
-	int		GenerateRandomNumber();
-
-	int m_idum;
-	int m_iy;
-	int m_iv[NTAB];
-
-	CThreadFastMutex m_mutex;
-};
-
-
-class VSTDLIB_CLASS CGaussianRandomStream
-{
-public:
-	CGaussianRandomStream(IUniformRandomStream* pUniformStream = NULL);
-
-	void	AttachToStream(IUniformRandomStream* pUniformStream = NULL);
-
-	float	RandomFloat(float flMean = 0.0f, float flStdDev = 1.0f);
-
-private:
-	IUniformRandomStream* m_pUniformStream;
-	bool	m_bHaveValue;
-	float	m_flRandomValue;
-
-	CThreadFastMutex m_mutex;
-};
-
-
-VSTDLIB_INTERFACE void	RandomSeed(int iSeed);
-VSTDLIB_INTERFACE float	RandomFloat(float flMinVal = 0.0f, float flMaxVal = 1.0f);
-VSTDLIB_INTERFACE float	RandomFloatExp(float flMinVal = 0.0f, float flMaxVal = 1.0f, float flExponent = 1.0f);
-VSTDLIB_INTERFACE int	RandomInt(int iMinVal, int iMaxVal);
-VSTDLIB_INTERFACE float	RandomGaussianFloat(float flMean = 0.0f, float flStdDev = 1.0f);
-
-
-VSTDLIB_INTERFACE void	InstallUniformRandomStream(IUniformRandomStream* pStream);
-
-
-#pragma warning(pop)
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/rangecheckedvar.h b/SpyCustom/rangecheckedvar.h
deleted file mode 100644
index 9c07cb4..0000000
--- a/SpyCustom/rangecheckedvar.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef RANGECHECKEDVAR_H
-#define RANGECHECKEDVAR_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "dbg.h"
-#include "threadtools.h"
-#include "vector.h"
-#include <float.h>
-
-
-class CDisableRangeChecks
-{
-public:
-	CDisableRangeChecks();
-	~CDisableRangeChecks();
-};
-
-
-template< class T >
-inline void RangeCheck(const T& value, int minValue, int maxValue)
-{
-#ifdef _DEBUG
-	extern bool g_bDoRangeChecks;
-	if (ThreadInMainThread() && g_bDoRangeChecks)
-	{
-		Assert(_finite(value));
-	}
-#endif
-}
-
-inline void RangeCheck(const Vector& value, int minValue, int maxValue)
-{
-#ifdef _DEBUG
-	RangeCheck(value.x, minValue, maxValue);
-	RangeCheck(value.y, minValue, maxValue);
-	RangeCheck(value.z, minValue, maxValue);
-#endif
-}
-
-
-template< class T, int minValue, int maxValue, int startValue >
-class CRangeCheckedVar
-{
-public:
-
-	inline CRangeCheckedVar()
-	{
-		m_Val = startValue;
-	}
-
-	inline CRangeCheckedVar(const T& value)
-	{
-		*this = value;
-	}
-
-	T GetRaw() const
-	{
-		return m_Val;
-	}
-
-	inline void Clamp()
-	{
-		if (m_Val < minValue)
-			m_Val = minValue;
-		else if (m_Val > maxValue)
-			m_Val = maxValue;
-	}
-
-	inline operator const T& () const
-	{
-		return m_Val;
-	}
-
-	inline CRangeCheckedVar<T, minValue, maxValue, startValue>& operator=(const T& value)
-	{
-		RangeCheck(value, minValue, maxValue);
-		m_Val = value;
-		return *this;
-	}
-
-	inline CRangeCheckedVar<T, minValue, maxValue, startValue>& operator+=(const T& value)
-	{
-		return (*this = m_Val + value);
-	}
-
-	inline CRangeCheckedVar<T, minValue, maxValue, startValue>& operator-=(const T& value)
-	{
-		return (*this = m_Val - value);
-	}
-
-	inline CRangeCheckedVar<T, minValue, maxValue, startValue>& operator*=(const T& value)
-	{
-		return (*this = m_Val * value);
-	}
-
-	inline CRangeCheckedVar<T, minValue, maxValue, startValue>& operator/=(const T& value)
-	{
-		return (*this = m_Val / value);
-	}
-
-private:
-
-	T m_Val;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/recvproxy.h b/SpyCustom/recvproxy.h
deleted file mode 100644
index 412c8c4..0000000
--- a/SpyCustom/recvproxy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef RECVPROXY_H
-#define RECVPROXY_H
-
-
-class CRecvProxyData;
-
-
-void RecvProxy_IntToEHandle(const CRecvProxyData* pData, void* pStruct, void* pOut);
-
-void RecvProxy_IntToMoveParent(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_IntToColor32(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_IntSubOne(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_ShortSubOne(const CRecvProxyData* pData, void* pStruct, void* pOut);
-void RecvProxy_InterpolationAmountChanged(const CRecvProxyData* pData, void* pStruct, void* pOut);
-
-RecvProp RecvPropTime(
-	char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE);
-
-#if !defined( NO_ENTITY_PREDICTION ) && defined( USE_PREDICTABLEID )
-RecvProp RecvPropPredictableId(
-	char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE);
-#endif
-
-RecvProp RecvPropEHandle(
-	char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,
-	RecvVarProxyFn proxyFn = RecvProxy_IntToEHandle);
-
-RecvProp RecvPropBool(
-	char* pVarName,
-	int offset,
-	int sizeofVar);
-
-RecvProp RecvPropIntWithMinusOneFlag(
-	char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,
-	RecvVarProxyFn proxyFn = RecvProxy_IntSubOne);
-
-#endif  
diff --git a/SpyCustom/refcount.h b/SpyCustom/refcount.h
deleted file mode 100644
index 4f10d10..0000000
--- a/SpyCustom/refcount.h
+++ /dev/null
@@ -1,320 +0,0 @@
-#ifndef REFCOUNT_H
-#define REFCOUNT_H
-
-#include "threadtools.h"
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-class IRefCounted
-{
-public:
-	virtual int AddRef() = 0;
-	virtual int Release() = 0;
-};
-
-
-template <class REFCOUNTED_ITEM_PTR>
-inline int SafeRelease(REFCOUNTED_ITEM_PTR& pRef)
-{
-	REFCOUNTED_ITEM_PTR* ppRef = &pRef;
-	if (*ppRef)
-	{
-		int result = (*ppRef)->Release();
-		*ppRef = NULL;
-		return result;
-	}
-	return 0;
-}
-
-template <class T = IRefCounted>
-class CAutoRef
-{
-public:
-	CAutoRef(T* pRef)
-		: m_pRef(pRef)
-	{
-		if (m_pRef)
-			m_pRef->AddRef();
-	}
-
-	~CAutoRef()
-	{
-		if (m_pRef)
-			m_pRef->Release();
-	}
-
-private:
-	T* m_pRef;
-};
-
-#define RetAddRef( p ) ( (p)->AddRef(), (p) )
-#define InlineAddRef( p ) ( (p)->AddRef(), (p) )
-
-
-template <class T>
-class CBaseAutoPtr
-{
-public:
-	CBaseAutoPtr() : m_pObject(0) {}
-	CBaseAutoPtr(T* pFrom) : m_pObject(pFrom) {}
-
-	operator const void* () const { return m_pObject; }
-	operator void* () { return m_pObject; }
-
-	operator const T* () const { return m_pObject; }
-	operator const T* () { return m_pObject; }
-	operator T* () { return m_pObject; }
-
-	int			operator=(int i) { AssertMsg(i == 0, "Only NULL allowed on integer assign"); m_pObject = 0; return 0; }
-	T* operator=(T* p) { m_pObject = p; return p; }
-
-	bool        operator !() const { return (!m_pObject); }
-	bool        operator!=(int i) const { AssertMsg(i == 0, "Only NULL allowed on integer compare"); return (m_pObject != NULL); }
-	bool		operator==(const void* p) const { return (m_pObject == p); }
-	bool		operator!=(const void* p) const { return (m_pObject != p); }
-	bool		operator==(T* p) const { return operator==((void*)p); }
-	bool		operator!=(T* p) const { return operator!=((void*)p); }
-	bool		operator==(const CBaseAutoPtr<T>& p) const { return operator==((const void*)p); }
-	bool		operator!=(const CBaseAutoPtr<T>& p) const { return operator!=((const void*)p); }
-
-	T* operator->() { return m_pObject; }
-	T& operator *() { return *m_pObject; }
-	T** operator &() { return &m_pObject; }
-
-	const T* operator->() const { return m_pObject; }
-	const T& operator *() const { return *m_pObject; }
-	T* const* operator &() const { return &m_pObject; }
-
-protected:
-	CBaseAutoPtr(const CBaseAutoPtr<T>& from) : m_pObject(from.m_pObject) {}
-	void operator=(const CBaseAutoPtr<T>& from) { m_pObject = from.m_pObject; }
-
-	T* m_pObject;
-};
-
-template <class T>
-class CRefPtr : public CBaseAutoPtr<T>
-{
-	typedef CBaseAutoPtr<T> BaseClass;
-public:
-	CRefPtr() {}
-	CRefPtr(T* pInit) : BaseClass(pInit) {}
-	CRefPtr(const CRefPtr<T>& from) : BaseClass(from) {}
-	~CRefPtr() { if (BaseClass::m_pObject) BaseClass::m_pObject->Release(); }
-
-	void operator=(const CRefPtr<T>& from) { BaseClass::operator=(from); }
-
-	int operator=(int i) { return BaseClass::operator=(i); }
-	T* operator=(T* p) { return BaseClass::operator=(p); }
-
-	operator bool() const { return !BaseClass::operator!(); }
-	operator bool() { return !BaseClass::operator!(); }
-
-	void SafeRelease() { if (BaseClass::m_pObject) BaseClass::m_pObject->Release(); BaseClass::m_pObject = 0; }
-	void AssignAddRef(T* pFrom) { SafeRelease(); if (pFrom) pFrom->AddRef(); BaseClass::m_pObject = pFrom; }
-	void AddRefAssignTo(T*& pTo) { ::SafeRelease(pTo); if (BaseClass::m_pObject) BaseClass::m_pObject->AddRef(); pTo = BaseClass::m_pObject; }
-};
-
-
-class CRefMT
-{
-public:
-	static int Increment(int* p) { return ThreadInterlockedIncrement((long*)p); }
-	static int Decrement(int* p) { return ThreadInterlockedDecrement((long*)p); }
-};
-
-class CRefST
-{
-public:
-	static int Increment(int* p) { return ++(*p); }
-	static int Decrement(int* p) { return --(*p); }
-};
-
-template <const bool bSelfDelete, typename CRefThreading = CRefMT>
-class NO_VTABLE CRefCountServiceBase
-{
-protected:
-	CRefCountServiceBase()
-		: m_iRefs(1)
-	{
-	}
-
-	virtual ~CRefCountServiceBase()
-	{
-	}
-
-	virtual bool OnFinalRelease()
-	{
-		return true;
-	}
-
-	int GetRefCount() const
-	{
-		return m_iRefs;
-	}
-
-	int DoAddRef()
-	{
-		return CRefThreading::Increment(&m_iRefs);
-	}
-
-	int DoRelease()
-	{
-		int result = CRefThreading::Decrement(&m_iRefs);
-		if (result)
-			return result;
-		if (OnFinalRelease() && bSelfDelete)
-			delete this;
-		return 0;
-	}
-
-private:
-	int m_iRefs;
-};
-
-class CRefCountServiceNull
-{
-protected:
-	static int DoAddRef() { return 1; }
-	static int DoRelease() { return 1; }
-};
-
-template <typename CRefThreading = CRefMT>
-class NO_VTABLE CRefCountServiceDestruct
-{
-protected:
-	CRefCountServiceDestruct()
-		: m_iRefs(1)
-	{
-	}
-
-	virtual ~CRefCountServiceDestruct()
-	{
-	}
-
-	int GetRefCount() const
-	{
-		return m_iRefs;
-	}
-
-	int DoAddRef()
-	{
-		return CRefThreading::Increment(&m_iRefs);
-	}
-
-	int DoRelease()
-	{
-		int result = CRefThreading::Decrement(&m_iRefs);
-		if (result)
-			return result;
-		this->~CRefCountServiceDestruct();
-		return 0;
-	}
-
-private:
-	int m_iRefs;
-};
-
-
-typedef CRefCountServiceBase<true, CRefST>	CRefCountServiceST;
-typedef CRefCountServiceBase<false, CRefST>	CRefCountServiceNoDeleteST;
-
-typedef CRefCountServiceBase<true, CRefMT>	CRefCountServiceMT;
-typedef CRefCountServiceBase<false, CRefMT> CRefCountServiceNoDeleteMT;
-
-typedef CRefCountServiceNoDeleteMT			CRefCountServiceNoDelete;
-typedef CRefCountServiceMT					CRefCountService;
-
-template < class REFCOUNT_SERVICE = CRefCountService >
-class NO_VTABLE CRefCounted : public REFCOUNT_SERVICE
-{
-public:
-	virtual ~CRefCounted() {}
-	int AddRef() { return REFCOUNT_SERVICE::DoAddRef(); }
-	int Release() { return REFCOUNT_SERVICE::DoRelease(); }
-};
-
-template < class BASE1, class REFCOUNT_SERVICE = CRefCountService >
-class NO_VTABLE CRefCounted1 : public BASE1,
-	public REFCOUNT_SERVICE
-{
-public:
-	virtual ~CRefCounted1() {}
-	int AddRef() { return REFCOUNT_SERVICE::DoAddRef(); }
-	int Release() { return REFCOUNT_SERVICE::DoRelease(); }
-};
-
-template < class BASE1, class BASE2, class REFCOUNT_SERVICE = CRefCountService >
-class NO_VTABLE CRefCounted2 : public BASE1, public BASE2,
-	public REFCOUNT_SERVICE
-{
-public:
-	virtual ~CRefCounted2() {}
-	int AddRef() { return REFCOUNT_SERVICE::DoAddRef(); }
-	int Release() { return REFCOUNT_SERVICE::DoRelease(); }
-};
-
-template < class BASE1, class BASE2, class BASE3, class REFCOUNT_SERVICE = CRefCountService >
-class NO_VTABLE CRefCounted3 : public BASE1, public BASE2, public BASE3,
-	public REFCOUNT_SERVICE
-{
-	virtual ~CRefCounted3() {}
-	int AddRef() { return REFCOUNT_SERVICE::DoAddRef(); }
-	int Release() { return REFCOUNT_SERVICE::DoRelease(); }
-};
-
-template < class BASE1, class BASE2, class BASE3, class BASE4, class REFCOUNT_SERVICE = CRefCountService >
-class NO_VTABLE CRefCounted4 : public BASE1, public BASE2, public BASE3, public BASE4,
-	public REFCOUNT_SERVICE
-{
-public:
-	virtual ~CRefCounted4() {}
-	int AddRef() { return REFCOUNT_SERVICE::DoAddRef(); }
-	int Release() { return REFCOUNT_SERVICE::DoRelease(); }
-};
-
-template < class BASE1, class BASE2, class BASE3, class BASE4, class BASE5, class REFCOUNT_SERVICE = CRefCountService >
-class NO_VTABLE CRefCounted5 : public BASE1, public BASE2, public BASE3, public BASE4, public BASE5,
-	public REFCOUNT_SERVICE
-{
-public:
-	virtual ~CRefCounted5() {}
-	int AddRef() { return REFCOUNT_SERVICE::DoAddRef(); }
-	int Release() { return REFCOUNT_SERVICE::DoRelease(); }
-};
-
-template <class BASE_REFCOUNTED, int FINAL_REFS, const char* pszName>
-class CRefDebug : public BASE_REFCOUNTED
-{
-public:
-#ifdef _DEBUG
-	CRefDebug()
-	{
-		AssertMsg(this->GetRefCount() == 1, "Expected initial ref count of 1");
-		DevMsg("%s:create 0x%x\n", (pszName) ? pszName : "", this);
-	}
-
-	virtual ~CRefDebug()
-	{
-		AssertDevMsg(this->GetRefCount() == FINAL_REFS, "Object still referenced on destroy?");
-		DevMsg("%s:destroy 0x%x\n", (pszName) ? pszName : "", this);
-	}
-
-	int AddRef()
-	{
-		DevMsg("%s:(0x%x)->AddRef() --> %d\n", (pszName) ? pszName : "", this, this->GetRefCount() + 1);
-		return BASE_REFCOUNTED::AddRef();
-	}
-
-	int Release()
-	{
-		DevMsg("%s:(0x%x)->Release() --> %d\n", (pszName) ? pszName : "", this, this->GetRefCount() - 1);
-		Assert(this->GetRefCount() > 0);
-		return BASE_REFCOUNTED::Release();
-	}
-#endif
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/resource.h b/SpyCustom/resource.h
deleted file mode 100644
index 57db8dd..0000000
--- a/SpyCustom/resource.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#define IDR_WAVE1                       101
-#define IDR_WAVE2                       102
-
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        103
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/SpyCustom/sceneentity_shared.h b/SpyCustom/sceneentity_shared.h
deleted file mode 100644
index dc5e3d0..0000000
--- a/SpyCustom/sceneentity_shared.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef SCENEENTITY_SHARED_H
-#define SCENEENTITY_SHARED_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#if defined( CLIENT_DLL )
-#define CBaseFlex C_BaseFlex
-#define CSceneEntity C_SceneEntity
-#endif
-
-#include "iscenetokenprocessor.h"
-
-class CBaseFlex;
-
-class CChoreoEvent;
-class CChoreoScene;
-class CChoreoActor;
-class CSceneEntity;
-
-class CSceneEventInfo
-{
-public:
-	CSceneEventInfo()
-		:
-		m_pEvent(0),
-		m_pScene(0),
-		m_pActor(0),
-		m_bStarted(false),
-		m_iLayer(-1),
-		m_iPriority(0),
-		m_nSequence(0),
-		m_bIsGesture(false),
-		m_flWeight(0.0f),
-		m_hTarget(),
-		m_bIsMoving(false),
-		m_bHasArrived(false),
-		m_flInitialYaw(0.0f),
-		m_flTargetYaw(0.0f),
-		m_flFacingYaw(0.0f),
-		m_nType(0),
-		m_flNext(0.0f),
-		m_bClientSide(false)
-	{
-	}
-
-	CChoreoEvent* m_pEvent;
-
-	CChoreoScene* m_pScene;
-
-	CChoreoActor* m_pActor;
-
-	bool			m_bStarted;
-
-public:
-	int						m_iLayer;
-	int						m_iPriority;
-	int						m_nSequence;
-	bool					m_bIsGesture;
-	float					m_flWeight;        
-
-	EHANDLE					m_hTarget;
-	bool					m_bIsMoving;
-	bool					m_bHasArrived;
-	float					m_flInitialYaw;
-	float					m_flTargetYaw;
-	float					m_flFacingYaw;
-
-	int						m_nType;
-	float					m_flNext;
-
-	bool					m_bClientSide;
-
-	void					InitWeight(CBaseFlex* pActor);
-	float					UpdateWeight(CBaseFlex* pActor);
-};
-
-class CSceneTokenProcessor : public ISceneTokenProcessor
-{
-public:
-	const char* CurrentToken(void);
-	bool		GetToken(bool crossline);
-	bool		TokenAvailable(void);
-	void		Error(PRINTF_FORMAT_STRING const char* fmt, ...);
-	void		SetBuffer(char* buffer);
-private:
-	const char* m_pBuffer;
-	char		m_szToken[1024];
-};
-
-extern CSceneTokenProcessor g_TokenProcessor;
-
-void Scene_Printf(PRINTF_FORMAT_STRING const char* pFormat, ...);
-extern ConVar scene_clientflex;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/sdk_hud_chat.h b/SpyCustom/sdk_hud_chat.h
deleted file mode 100644
index cd9f6ac..0000000
--- a/SpyCustom/sdk_hud_chat.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef SDK_HUD_CHAT_H
-#define SDK_HUD_CHAT_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "hud_basechat.h"
-
-#include "GetVFunc.hpp"
-
-class CHudChatLine : public CBaseHudChatLine
-{
-	DECLARE_CLASS_SIMPLE(CHudChatLine, CBaseHudChatLine);
-
-public:
-	CHudChatLine(vgui::Panel* parent, const char* panelName) : CBaseHudChatLine(parent, panelName) {}
-
-	virtual void	ApplySchemeSettings(vgui::IScheme* pScheme);
-
-	void			PerformFadeout(void);
-
-	void			MsgFunc_SayText(bf_read& msg);
-
-private:
-	CHudChatLine(const CHudChatLine&);     
-};
-
-class CHudChatInputLine : public CBaseHudChatInputLine
-{
-	DECLARE_CLASS_SIMPLE(CHudChatInputLine, CBaseHudChatInputLine);
-
-public:
-	CHudChatInputLine(CBaseHudChat* parent, char const* panelName) : CBaseHudChatInputLine(parent, panelName) {}
-
-	virtual void	ApplySchemeSettings(vgui::IScheme* pScheme);
-};
-
-class CHudChat : public CBaseHudChat
-{
-	DECLARE_CLASS_SIMPLE(CHudChat, CBaseHudChat);
-
-public:
-	CHudChat(const char* pElementName);
-
-	virtual void	CreateChatInputLine(void);
-	virtual void	CreateChatLines(void);
-
-	virtual void	Init(void);
-	virtual void	Reset(void);
-	virtual void	ApplySchemeSettings(vgui::IScheme* pScheme);
-
-	void			MsgFunc_SayText(bf_read& msg);
-	void			MsgFunc_TextMsg(bf_read& msg);
-
-	enum ChatFilters
-	{
-		CHAT_FILTER_NONE = 0,
-		CHAT_FILTER_JOINLEAVE = 0x000001,
-		CHAT_FILTER_NAMECHANGE = 0x000002,
-		CHAT_FILTER_PUBLICCHAT = 0x000004,
-		CHAT_FILTER_SERVERMSG = 0x000008,
-		CHAT_FILTER_TEAMCHANGE = 0x000010,
-		CHAT_FILTER_ACHIEVEMENT = 0x000020,
-	};
-
-	void ChatPrintf2(int iPlayerIndex, int iFilter, const char* fmt, ...)
-	{
-		char msg[1024];
-		va_list args;
-		va_start(args, fmt);
-		vsnprintf(msg, 1024, fmt, args);
-		getvfunc<void(__cdecl*)(void*, int, int, const char*, ...)>(this, 27)(this, iPlayerIndex, iFilter, fmt);
-		va_end(args);
-	}
-
-	int				GetChatInputOffset(void);
-};
-
-#endif	
\ No newline at end of file
diff --git a/SpyCustom/seemath.h b/SpyCustom/seemath.h
deleted file mode 100644
index 118a2b0..0000000
--- a/SpyCustom/seemath.h
+++ /dev/null
@@ -1,5073 +0,0 @@
-#ifndef SSEMATH_H
-#define SSEMATH_H
-
-#if defined( _X360 )
-#include <xboxmath.h>
-#elif defined ( _PS3 )
-#include <vectormath/c/vectormath_aos.h>
-#include <vectormath/c/vectormath_aos_v.h>
-#else
-#include <xmmintrin.h>
-#ifndef _LINUX
-#include <emmintrin.h>
-#endif
-#endif
-
-#ifndef SPU
-#include "vector.h"
-#include "mathlib.h"
-#else
-#include "mathlib/math_pfns.h"
-#endif
-
-#include "fltx4.h"
-
-#ifdef _X360
-typedef __vector4 FLTX4;
-#elif defined( _PS3 )
-typedef vec_float4 FLTX4;
-#else
-typedef const fltx4& FLTX4;
-#endif
-
-struct ALIGN16 intx4
-{
-	int32 m_i32[4];
-
-	inline int& operator[](int which)
-	{
-		return m_i32[which];
-	}
-
-	inline const int& operator[](int which) const
-	{
-		return m_i32[which];
-	}
-
-	inline int32* Base() {
-		return m_i32;
-	}
-
-	inline const int32* Base() const
-	{
-		return m_i32;
-	}
-
-	inline bool operator==(const intx4& other) const
-	{
-		return m_i32[0] == other.m_i32[0] &&
-			m_i32[1] == other.m_i32[1] &&
-			m_i32[2] == other.m_i32[2] &&
-			m_i32[3] == other.m_i32[3];
-	}
-} ALIGN16_POST;
-
-
-#if defined( _DEBUG ) && defined( _X360 )
-FORCEINLINE void TestVPUFlags()
-{
-	__vector4 a;
-	__asm
-	{
-		mfvscr	a;
-	}
-	unsigned int* flags = (unsigned int*)&a;
-	unsigned int   controlWord = flags[3];
-	Assert(controlWord == 0);
-}
-#else   
-FORCEINLINE void TestVPUFlags() {}
-#endif  
-
-
-#ifdef _X360
-#define			   Four_Zeros			XMVectorZero()			    
-#define			   Four_Ones			XMVectorSplatOne()		    
-extern const fltx4 Four_Twos;									    
-extern const fltx4 Four_Threes;									    
-extern const fltx4 Four_Fours;									 
-extern const fltx4 Four_Point225s;								    
-extern const fltx4 Four_PointFives;								    
-extern const fltx4 Four_Thirds;									 
-extern const fltx4 Four_TwoThirds;								 
-extern const fltx4 Four_NegativeOnes;							     
-extern const fltx4 Four_DegToRad;								     
-#elif defined(SPU)
-#define			   Four_Zeros			spu_splats( 0.0f )		    
-#define			   Four_Ones			spu_splats( 1.0f )		    
-#define			   Four_Twos			spu_splats( 2.0f )		    
-#define			   Four_Threes			spu_splats( 3.0f )		    
-#define			   Four_Fours			spu_splats( 4.0f )		 
-#define			   Four_Point225s		spu_splats( 0.225f )		    
-#define			   Four_PointFives		spu_splats( 0.5f )		    
-#define			   Four_Thirds			spu_splats( 0.33333333 );	 
-#define			   Four_TwoThirds		spu_splats( 0.66666666 );	 
-#define			   Four_NegativeOnes	spu_splats( -1.0f )		     
-#define			   Four_DegToRad		spu_splats((float)(M_PI_F / 180.f))
-#else
-extern const fltx4 Four_Zeros;									    
-extern const fltx4 Four_Ones;									    
-extern const fltx4 Four_Twos;									    
-extern const fltx4 Four_Threes;									    
-extern const fltx4 Four_Fours;									 
-extern const fltx4 Four_Point225s;								    
-extern const fltx4 Four_PointFives;								    
-extern const fltx4 Four_Thirds;									 
-extern const fltx4 Four_TwoThirds;								 
-extern const fltx4 Four_NegativeOnes;							     
-extern const fltx4 Four_DegToRad;								     
-#endif
-extern const fltx4 Four_Epsilons;								    
-extern const fltx4 Four_2ToThe21s;								 
-extern const fltx4 Four_2ToThe22s;								 
-extern const fltx4 Four_2ToThe23s;								 
-extern const fltx4 Four_2ToThe24s;								 
-extern const fltx4 Four_Origin;									           
-extern const fltx4 Four_FLT_MAX;								    
-extern const fltx4 Four_Negative_FLT_MAX;						    
-extern const fltx4 g_SIMD_0123;									      
-
-
-extern const fltx4 Four_LinearToGammaCoefficients_A;		 
-extern const fltx4 Four_LinearToGammaCoefficients_B;		 
-extern const fltx4 Four_LinearToGammaCoefficients_C;		 
-extern const fltx4 Four_LinearToGammaCoefficients_D;		 
-extern const fltx4 Four_LinearToGammaCoefficients_E;		 
-
-extern const fltx4 Four_GammaToLinearCoefficients_A;		 
-extern const fltx4 Four_GammaToLinearCoefficients_B;		 
-extern const fltx4 Four_GammaToLinearCoefficients_C;		 
-extern const fltx4 Four_GammaToLinearCoefficients_D;		 
-
-
-#ifndef ALIGN16_POST
-#define ALIGN16_POST
-#endif
-extern const ALIGN16 int32 g_SIMD_clear_signmask[] ALIGN16_POST;			   
-extern const ALIGN16 int32 g_SIMD_signmask[] ALIGN16_POST;				   
-extern const ALIGN16 int32 g_SIMD_lsbmask[] ALIGN16_POST;				   
-extern const ALIGN16 int32 g_SIMD_clear_wmask[] ALIGN16_POST;			    
-extern const ALIGN16 int32 g_SIMD_ComponentMask[4][4] ALIGN16_POST;		                
-extern const ALIGN16 int32 g_SIMD_AllOnesMask[] ALIGN16_POST;			 
-extern const fltx4 g_SIMD_Identity[4];									                
-extern const ALIGN16 int32 g_SIMD_Low16BitsMask[] ALIGN16_POST;			   
-
-extern const int32 ALIGN16 g_SIMD_SkipTailMask[4][4] ALIGN16_POST;
-
-extern const int32 ALIGN16 g_SIMD_EveryOtherMask[];				    
-#ifdef PLATFORM_PPC
-#if defined(_X360)
-#define PREFETCH360(address, offset) __dcbt(offset,address)
-#elif defined(_PS3)
-#define PREFETCH360(address, offset) __dcbt( reinterpret_cast< const char * >(address) + offset )
-#else
-#error Prefetch not defined for this platform!
-#endif
-#else
-#define PREFETCH360(x,y)  
-#endif
-
-template<class T>
-inline T* AlignPointer(void* ptr)
-{
-#if defined( __clang__ )
-	uintp temp = (uintp)ptr;
-#else
-	unsigned temp = ptr;
-#endif
-	temp = ALIGN_VALUE(temp, sizeof(T));
-	return (T*)temp;
-}
-
-#ifdef _PS3
-
-#define _VEC_CLEAR_SIGNMASK (__vector unsigned int)		{0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff}
-#define _VEC_SIGNMASK		(__vector unsigned int)		{ 0x80000000, 0x80000000, 0x80000000, 0x80000000 }
-#define _VEC_LSBMASK		(__vector unsigned int)		{ 0xfffffffe, 0xfffffffe, 0xfffffffe, 0xfffffffe }
-#define _VEC_CLEAR_WMASK	(__vector unsigned int)		{0xffffffff, 0xffffffff, 0xffffffff, 0}
-#define _VEC_COMPONENT_MASK_0 (__vector unsigned int)	{0xffffffff, 0, 0, 0}
-#define _VEC_COMPONENT_MASK_1 (__vector unsigned int)	{0, 0xffffffff, 0, 0}
-#define _VEC_COMPONENT_MASK_2 (__vector unsigned int)	{0, 0, 0xffffffff, 0}
-#define _VEC_COMPONENT_MASK_3 (__vector unsigned int)	{0, 0, 0, 0xffffffff}
-
-#define _VEC_SWIZZLE_WZYX (__vector unsigned char)		{ 0x0c,0x0d,0x0e,0x0f, 0x08,0x09,0x0a,0x0b, 0x04,0x05,0x06,0x07, 0x00,0x01,0x02,0x03 }
-#define _VEC_SWIZZLE_ZWXY (__vector unsigned char)		{ 0x08,0x09,0x0a,0x0b, 0x0c,0x0d,0x0e,0x0f, 0x00,0x01,0x02,0x03, 0x04,0x05,0x06,0x07 }
-#define _VEC_SWIZZLE_YXWZ (__vector unsigned char)		{ 0x04,0x05,0x06,0x07, 0x00,0x01,0x02,0x03, 0x0c,0x0d,0x0e,0x0f, 0x08,0x09,0x0a,0x0b }
-
-#define _VEC_ZERO           (__vector unsigned int)		{0,0,0,0}
-
-#define _VEC_FLTMAX			(__vector float)			{FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX}
-#define _VEC_FLTMIN			(__vector float)			{FLT_MIN,FLT_MIN,FLT_MIN,FLT_MIN}
-
-#define _VEC_ORIGIN			(__vector unsigned int)		{ 0x00000000, 0x00000000, 0x00000000, 0xffffffff }
-
-#endif
-
-#if USE_STDC_FOR_SIMD
-
-FORCEINLINE float SubFloat(const fltx4& a, int idx)
-{
-	return a.m128_f32[idx];
-}
-
-FORCEINLINE float& SubFloat(fltx4& a, int idx)
-{
-	return a.m128_f32[idx];
-}
-
-FORCEINLINE uint32 SubInt(const fltx4& a, int idx)
-{
-	return a.m128_u32[idx];
-}
-
-FORCEINLINE uint32& SubInt(fltx4& a, int idx)
-{
-	return a.m128_u32[idx];
-}
-
-FORCEINLINE fltx4 LoadZeroSIMD(void)
-{
-	return Four_Zeros;
-}
-
-FORCEINLINE fltx4 LoadOneSIMD(void)
-{
-	return Four_Ones;
-}
-
-FORCEINLINE fltx4 SplatXSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 0);
-	SubFloat(retVal, 1) = SubFloat(a, 0);
-	SubFloat(retVal, 2) = SubFloat(a, 0);
-	SubFloat(retVal, 3) = SubFloat(a, 0);
-	return retVal;
-}
-
-FORCEINLINE fltx4 SplatYSIMD(fltx4 a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 1);
-	SubFloat(retVal, 1) = SubFloat(a, 1);
-	SubFloat(retVal, 2) = SubFloat(a, 1);
-	SubFloat(retVal, 3) = SubFloat(a, 1);
-	return retVal;
-}
-
-FORCEINLINE fltx4 SplatZSIMD(fltx4 a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 2);
-	SubFloat(retVal, 1) = SubFloat(a, 2);
-	SubFloat(retVal, 2) = SubFloat(a, 2);
-	SubFloat(retVal, 3) = SubFloat(a, 2);
-	return retVal;
-}
-
-FORCEINLINE fltx4 SplatWSIMD(fltx4 a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 3);
-	SubFloat(retVal, 1) = SubFloat(a, 3);
-	SubFloat(retVal, 2) = SubFloat(a, 3);
-	SubFloat(retVal, 3) = SubFloat(a, 3);
-	return retVal;
-}
-
-FORCEINLINE fltx4 SetXSIMD(const fltx4& a, const fltx4& x)
-{
-	fltx4 result = a;
-	SubFloat(result, 0) = SubFloat(x, 0);
-	return result;
-}
-
-FORCEINLINE fltx4 SetYSIMD(const fltx4& a, const fltx4& y)
-{
-	fltx4 result = a;
-	SubFloat(result, 1) = SubFloat(y, 1);
-	return result;
-}
-
-FORCEINLINE fltx4 SetZSIMD(const fltx4& a, const fltx4& z)
-{
-	fltx4 result = a;
-	SubFloat(result, 2) = SubFloat(z, 2);
-	return result;
-}
-
-FORCEINLINE fltx4 SetWSIMD(const fltx4& a, const fltx4& w)
-{
-	fltx4 result = a;
-	SubFloat(result, 3) = SubFloat(w, 3);
-	return result;
-}
-
-FORCEINLINE fltx4 SetComponentSIMD(const fltx4& a, int nComponent, float flValue)
-{
-	fltx4 result = a;
-	SubFloat(result, nComponent) = flValue;
-	return result;
-}
-
-
-FORCEINLINE fltx4 RotateLeft(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 1);
-	SubFloat(retVal, 1) = SubFloat(a, 2);
-	SubFloat(retVal, 2) = SubFloat(a, 3);
-	SubFloat(retVal, 3) = SubFloat(a, 0);
-	return retVal;
-}
-
-FORCEINLINE fltx4 RotateLeft2(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 2);
-	SubFloat(retVal, 1) = SubFloat(a, 3);
-	SubFloat(retVal, 2) = SubFloat(a, 0);
-	SubFloat(retVal, 3) = SubFloat(a, 1);
-	return retVal;
-}
-
-#define BINOP(op) 														\
-	fltx4 retVal;                                          				\
-	SubFloat( retVal, 0 ) = ( SubFloat( a, 0 ) op SubFloat( b, 0 ) );	\
-	SubFloat( retVal, 1 ) = ( SubFloat( a, 1 ) op SubFloat( b, 1 ) );	\
-	SubFloat( retVal, 2 ) = ( SubFloat( a, 2 ) op SubFloat( b, 2 ) );	\
-	SubFloat( retVal, 3 ) = ( SubFloat( a, 3 ) op SubFloat( b, 3 ) );	\
-    return retVal;
-
-#define IBINOP(op) 														\
-	fltx4 retVal;														\
-	SubInt( retVal, 0 ) = ( SubInt( a, 0 ) op SubInt ( b, 0 ) );		\
-	SubInt( retVal, 1 ) = ( SubInt( a, 1 ) op SubInt ( b, 1 ) );		\
-	SubInt( retVal, 2 ) = ( SubInt( a, 2 ) op SubInt ( b, 2 ) );		\
-	SubInt( retVal, 3 ) = ( SubInt( a, 3 ) op SubInt ( b, 3 ) );		\
-    return retVal;
-
-FORCEINLINE fltx4 AddSIMD(const fltx4& a, const fltx4& b)
-{
-	BINOP(+);
-}
-
-FORCEINLINE fltx4 SubSIMD(const fltx4& a, const fltx4& b)				 
-{
-	BINOP(-);
-};
-
-FORCEINLINE fltx4 MulSIMD(const fltx4& a, const fltx4& b)				 
-{
-	BINOP(*);
-}
-
-FORCEINLINE fltx4 DivSIMD(const fltx4& a, const fltx4& b)				 
-{
-	BINOP(/ );
-}
-
-FORCEINLINE fltx4 DivEstSIMD(const fltx4& a, const fltx4& b)			 
-{
-	BINOP(/ );
-}
-
-FORCEINLINE fltx4 MaddSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return AddSIMD(MulSIMD(a, b), c);
-}
-
-FORCEINLINE fltx4 MsubSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return SubSIMD(c, MulSIMD(a, b));
-};
-
-
-FORCEINLINE fltx4 SinSIMD(const fltx4& radians)
-{
-	fltx4 result;
-	SubFloat(result, 0) = sin(SubFloat(radians, 0));
-	SubFloat(result, 1) = sin(SubFloat(radians, 1));
-	SubFloat(result, 2) = sin(SubFloat(radians, 2));
-	SubFloat(result, 3) = sin(SubFloat(radians, 3));
-	return result;
-}
-
-FORCEINLINE void SinCos3SIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	SinCos(SubFloat(radians, 0), &SubFloat(sine, 0), &SubFloat(cosine, 0));
-	SinCos(SubFloat(radians, 1), &SubFloat(sine, 1), &SubFloat(cosine, 1));
-	SinCos(SubFloat(radians, 2), &SubFloat(sine, 2), &SubFloat(cosine, 2));
-}
-
-FORCEINLINE void SinCosSIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	SinCos(SubFloat(radians, 0), &SubFloat(sine, 0), &SubFloat(cosine, 0));
-	SinCos(SubFloat(radians, 1), &SubFloat(sine, 1), &SubFloat(cosine, 1));
-	SinCos(SubFloat(radians, 2), &SubFloat(sine, 2), &SubFloat(cosine, 2));
-	SinCos(SubFloat(radians, 3), &SubFloat(sine, 3), &SubFloat(cosine, 3));
-}
-
-FORCEINLINE fltx4 ArcSinSIMD(const fltx4& sine)
-{
-	fltx4 result;
-	SubFloat(result, 0) = asin(SubFloat(sine, 0));
-	SubFloat(result, 1) = asin(SubFloat(sine, 1));
-	SubFloat(result, 2) = asin(SubFloat(sine, 2));
-	SubFloat(result, 3) = asin(SubFloat(sine, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 ArcCosSIMD(const fltx4& cs)
-{
-	fltx4 result;
-	SubFloat(result, 0) = acos(SubFloat(cs, 0));
-	SubFloat(result, 1) = acos(SubFloat(cs, 1));
-	SubFloat(result, 2) = acos(SubFloat(cs, 2));
-	SubFloat(result, 3) = acos(SubFloat(cs, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 ArcTan2SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 result;
-	SubFloat(result, 0) = atan2(SubFloat(a, 0), SubFloat(b, 0));
-	SubFloat(result, 1) = atan2(SubFloat(a, 1), SubFloat(b, 1));
-	SubFloat(result, 2) = atan2(SubFloat(a, 2), SubFloat(b, 2));
-	SubFloat(result, 3) = atan2(SubFloat(a, 3), SubFloat(b, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 MaxSIMD(const fltx4& a, const fltx4& b)				 
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = max(SubFloat(a, 0), SubFloat(b, 0));
-	SubFloat(retVal, 1) = max(SubFloat(a, 1), SubFloat(b, 1));
-	SubFloat(retVal, 2) = max(SubFloat(a, 2), SubFloat(b, 2));
-	SubFloat(retVal, 3) = max(SubFloat(a, 3), SubFloat(b, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 MinSIMD(const fltx4& a, const fltx4& b)				 
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = min(SubFloat(a, 0), SubFloat(b, 0));
-	SubFloat(retVal, 1) = min(SubFloat(a, 1), SubFloat(b, 1));
-	SubFloat(retVal, 2) = min(SubFloat(a, 2), SubFloat(b, 2));
-	SubFloat(retVal, 3) = min(SubFloat(a, 3), SubFloat(b, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 AndSIMD(const fltx4& a, const fltx4& b)				   
-{
-	IBINOP(&);
-}
-
-FORCEINLINE fltx4 AndNotSIMD(const fltx4& a, const fltx4& b)			   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = ~SubInt(a, 0) & SubInt(b, 0);
-	SubInt(retVal, 1) = ~SubInt(a, 1) & SubInt(b, 1);
-	SubInt(retVal, 2) = ~SubInt(a, 2) & SubInt(b, 2);
-	SubInt(retVal, 3) = ~SubInt(a, 3) & SubInt(b, 3);
-	return retVal;
-}
-
-FORCEINLINE fltx4 XorSIMD(const fltx4& a, const fltx4& b)				   
-{
-	IBINOP(^);
-}
-
-FORCEINLINE fltx4 OrSIMD(const fltx4& a, const fltx4& b)				   
-{
-	IBINOP(| );
-}
-
-FORCEINLINE fltx4 NegSIMD(const fltx4& a)   
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = -SubFloat(a, 0);
-	SubFloat(retval, 1) = -SubFloat(a, 1);
-	SubFloat(retval, 2) = -SubFloat(a, 2);
-	SubFloat(retval, 3) = -SubFloat(a, 3);
-
-	return retval;
-}
-
-FORCEINLINE bool IsAllZeros(const fltx4& a)								     
-{
-	return	(SubFloat(a, 0) == 0.0) &&
-		(SubFloat(a, 1) == 0.0) &&
-		(SubFloat(a, 2) == 0.0) &&
-		(SubFloat(a, 3) == 0.0);
-}
-
-
-FORCEINLINE bool IsAllGreaterThan(const fltx4& a, const fltx4& b)
-{
-	return	SubFloat(a, 0) > SubFloat(b, 0) &&
-		SubFloat(a, 1) > SubFloat(b, 1) &&
-		SubFloat(a, 2) > SubFloat(b, 2) &&
-		SubFloat(a, 3) > SubFloat(b, 3);
-}
-
-FORCEINLINE bool IsAllGreaterThanOrEq(const fltx4& a, const fltx4& b)
-{
-	return	SubFloat(a, 0) >= SubFloat(b, 0) &&
-		SubFloat(a, 1) >= SubFloat(b, 1) &&
-		SubFloat(a, 2) >= SubFloat(b, 2) &&
-		SubFloat(a, 3) >= SubFloat(b, 3);
-}
-
-FORCEINLINE bool IsAllEqual(const fltx4& a, const fltx4& b)
-{
-	return	SubFloat(a, 0) == SubFloat(b, 0) &&
-		SubFloat(a, 1) == SubFloat(b, 1) &&
-		SubFloat(a, 2) == SubFloat(b, 2) &&
-		SubFloat(a, 3) == SubFloat(b, 3);
-}
-
-FORCEINLINE bool IsAnyEqual(const fltx4& a, const fltx4& b)
-{
-	return	SubFloat(a, 0) == SubFloat(b, 0) ||
-		SubFloat(a, 1) == SubFloat(b, 1) ||
-		SubFloat(a, 2) == SubFloat(b, 2) ||
-		SubFloat(a, 3) == SubFloat(b, 3);
-}
-
-FORCEINLINE int TestSignSIMD(const fltx4& a)								         
-{
-	int nRet = 0;
-
-	nRet |= (SubInt(a, 0) & 0x80000000) >> 31;     
-	nRet |= (SubInt(a, 1) & 0x80000000) >> 30;     
-	nRet |= (SubInt(a, 2) & 0x80000000) >> 29;     
-	nRet |= (SubInt(a, 3) & 0x80000000) >> 28;     
-
-	return nRet;
-}
-
-FORCEINLINE bool IsAnyNegative(const fltx4& a)							               
-{
-	return (0 != TestSignSIMD(a));
-}
-
-FORCEINLINE bool IsAnyTrue(const fltx4& a)							               
-{
-	return (0 != TestSignSIMD(a));
-}
-
-FORCEINLINE fltx4 CmpEqSIMD(const fltx4& a, const fltx4& b)				   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) == SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) == SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) == SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) == SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-FORCEINLINE fltx4 CmpGtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) > SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) > SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) > SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) > SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-FORCEINLINE fltx4 CmpGeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) >= SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) >= SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) >= SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) >= SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-FORCEINLINE fltx4 CmpLtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) < SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) < SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) < SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) < SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-FORCEINLINE fltx4 CmpLeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) <= SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) <= SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) <= SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) <= SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-FORCEINLINE fltx4 CmpInBoundsSIMD(const fltx4& a, const fltx4& b)		           
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) <= SubFloat(b, 0) && SubFloat(a, 0) >= -SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) <= SubFloat(b, 1) && SubFloat(a, 1) >= -SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) <= SubFloat(b, 2) && SubFloat(a, 2) >= -SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) <= SubFloat(b, 3) && SubFloat(a, 3) >= -SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-
-FORCEINLINE fltx4 MaskedAssign(const fltx4& ReplacementMask, const fltx4& NewValue, const fltx4& OldValue)
-{
-	return OrSIMD(
-		AndSIMD(ReplacementMask, NewValue),
-		AndNotSIMD(ReplacementMask, OldValue));
-}
-
-FORCEINLINE fltx4 ReplicateX4(float flValue)					  
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = flValue;
-	SubFloat(retVal, 1) = flValue;
-	SubFloat(retVal, 2) = flValue;
-	SubFloat(retVal, 3) = flValue;
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReplicateIX4(int nValue)
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = nValue;
-	SubInt(retVal, 1) = nValue;
-	SubInt(retVal, 2) = nValue;
-	SubInt(retVal, 3) = nValue;
-	return retVal;
-
-}
-
-FORCEINLINE fltx4 CeilSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = ceil(SubFloat(a, 0));
-	SubFloat(retVal, 1) = ceil(SubFloat(a, 1));
-	SubFloat(retVal, 2) = ceil(SubFloat(a, 2));
-	SubFloat(retVal, 3) = ceil(SubFloat(a, 3));
-	return retVal;
-
-}
-
-FORCEINLINE fltx4 FloorSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = floor(SubFloat(a, 0));
-	SubFloat(retVal, 1) = floor(SubFloat(a, 1));
-	SubFloat(retVal, 2) = floor(SubFloat(a, 2));
-	SubFloat(retVal, 3) = floor(SubFloat(a, 3));
-	return retVal;
-
-}
-
-FORCEINLINE fltx4 SqrtEstSIMD(const fltx4& a)				    
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = sqrt(SubFloat(a, 0));
-	SubFloat(retVal, 1) = sqrt(SubFloat(a, 1));
-	SubFloat(retVal, 2) = sqrt(SubFloat(a, 2));
-	SubFloat(retVal, 3) = sqrt(SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 SqrtSIMD(const fltx4& a)					 
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = sqrt(SubFloat(a, 0));
-	SubFloat(retVal, 1) = sqrt(SubFloat(a, 1));
-	SubFloat(retVal, 2) = sqrt(SubFloat(a, 2));
-	SubFloat(retVal, 3) = sqrt(SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSIMD(const fltx4& a)		    
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / sqrt(SubFloat(a, 0));
-	SubFloat(retVal, 1) = 1.0 / sqrt(SubFloat(a, 1));
-	SubFloat(retVal, 2) = 1.0 / sqrt(SubFloat(a, 2));
-	SubFloat(retVal, 3) = 1.0 / sqrt(SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / sqrt(SubFloat(a, 0) != 0.0f ? SubFloat(a, 0) : FLT_EPSILON);
-	SubFloat(retVal, 1) = 1.0 / sqrt(SubFloat(a, 1) != 0.0f ? SubFloat(a, 1) : FLT_EPSILON);
-	SubFloat(retVal, 2) = 1.0 / sqrt(SubFloat(a, 2) != 0.0f ? SubFloat(a, 2) : FLT_EPSILON);
-	SubFloat(retVal, 3) = 1.0 / sqrt(SubFloat(a, 3) != 0.0f ? SubFloat(a, 3) : FLT_EPSILON);
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtSIMD(const fltx4& a)			 
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / sqrt(SubFloat(a, 0));
-	SubFloat(retVal, 1) = 1.0 / sqrt(SubFloat(a, 1));
-	SubFloat(retVal, 2) = 1.0 / sqrt(SubFloat(a, 2));
-	SubFloat(retVal, 3) = 1.0 / sqrt(SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalEstSIMD(const fltx4& a)			    
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / SubFloat(a, 0);
-	SubFloat(retVal, 1) = 1.0 / SubFloat(a, 1);
-	SubFloat(retVal, 2) = 1.0 / SubFloat(a, 2);
-	SubFloat(retVal, 3) = 1.0 / SubFloat(a, 3);
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalSIMD(const fltx4& a)				 
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / SubFloat(a, 0);
-	SubFloat(retVal, 1) = 1.0 / SubFloat(a, 1);
-	SubFloat(retVal, 2) = 1.0 / SubFloat(a, 2);
-	SubFloat(retVal, 3) = 1.0 / SubFloat(a, 3);
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / (SubFloat(a, 0) == 0.0f ? FLT_EPSILON : SubFloat(a, 0));
-	SubFloat(retVal, 1) = 1.0 / (SubFloat(a, 1) == 0.0f ? FLT_EPSILON : SubFloat(a, 1));
-	SubFloat(retVal, 2) = 1.0 / (SubFloat(a, 2) == 0.0f ? FLT_EPSILON : SubFloat(a, 2));
-	SubFloat(retVal, 3) = 1.0 / (SubFloat(a, 3) == 0.0f ? FLT_EPSILON : SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalSaturateSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / (SubFloat(a, 0) == 0.0f ? FLT_EPSILON : SubFloat(a, 0));
-	SubFloat(retVal, 1) = 1.0 / (SubFloat(a, 1) == 0.0f ? FLT_EPSILON : SubFloat(a, 1));
-	SubFloat(retVal, 2) = 1.0 / (SubFloat(a, 2) == 0.0f ? FLT_EPSILON : SubFloat(a, 2));
-	SubFloat(retVal, 3) = 1.0 / (SubFloat(a, 3) == 0.0f ? FLT_EPSILON : SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 ExpSIMD(const fltx4& toPower)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = powf(2, SubFloat(toPower, 0));
-	SubFloat(retVal, 1) = powf(2, SubFloat(toPower, 1));
-	SubFloat(retVal, 2) = powf(2, SubFloat(toPower, 2));
-	SubFloat(retVal, 3) = powf(2, SubFloat(toPower, 3));
-
-	return retVal;
-}
-
-FORCEINLINE fltx4 Dot3SIMD(const fltx4& a, const fltx4& b)
-{
-	float flDot = SubFloat(a, 0) * SubFloat(b, 0) +
-		SubFloat(a, 1) * SubFloat(b, 1) +
-		SubFloat(a, 2) * SubFloat(b, 2);
-	return ReplicateX4(flDot);
-}
-
-FORCEINLINE fltx4 Dot4SIMD(const fltx4& a, const fltx4& b)
-{
-	float flDot = SubFloat(a, 0) * SubFloat(b, 0) +
-		SubFloat(a, 1) * SubFloat(b, 1) +
-		SubFloat(a, 2) * SubFloat(b, 2) +
-		SubFloat(a, 3) * SubFloat(b, 3);
-	return ReplicateX4(flDot);
-}
-
-FORCEINLINE fltx4 ClampVectorSIMD(FLTX4 in, FLTX4 min, FLTX4 max)
-{
-	return MaxSIMD(min, MinSIMD(max, in));
-}
-
-FORCEINLINE fltx4 SetWToZeroSIMD(const fltx4& a)
-{
-	fltx4 retval;
-	retval = a;
-	SubFloat(retval, 0) = 0;
-	return retval;
-}
-
-FORCEINLINE fltx4 LoadUnalignedSIMD(const void* pSIMD)
-{
-	return *(reinterpret_cast<const fltx4*> (pSIMD));
-}
-
-FORCEINLINE fltx4 LoadUnaligned3SIMD(const void* pSIMD)
-{
-	return *(reinterpret_cast<const fltx4*> (pSIMD));
-}
-
-FORCEINLINE fltx4 LoadUnalignedFloatSIMD(const float* pFlt)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = *pFlt;
-	return retval;
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const void* pSIMD)
-{
-	return *(reinterpret_cast<const fltx4*> (pSIMD));
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned& pSIMD)
-{
-	fltx4 retval = LoadAlignedSIMD(pSIMD.Base());
-	SubInt(retval, 3) = 0;
-	return retval;
-}
-
-
-FORCEINLINE fltx4 LoadGatherSIMD(const float& x, const float& y, const float& z, const float& w)
-{
-	fltx4 retval = { x, y, z, w };
-	return retval;
-}
-
-FORCEINLINE void StoreAlignedSIMD(float* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<fltx4*> (pSIMD)) = a;
-}
-
-FORCEINLINE void StoreUnalignedSIMD(float* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<fltx4*> (pSIMD)) = a;
-}
-
-FORCEINLINE void StoreUnalignedFloat(float* pSingleFloat, const fltx4& a)
-{
-	*pSingleFloat = SubFloat(a, 0);
-}
-
-FORCEINLINE void StoreUnaligned3SIMD(float* pSIMD, const fltx4& a)
-{
-	*pSIMD = SubFloat(a, 0);
-	*(pSIMD + 1) = SubFloat(a, 1);
-	*(pSIMD + 2) = SubFloat(a, 2);
-}
-
-
-FORCEINLINE void StoreAligned3SIMD(VectorAligned* RESTRICT pSIMD, const fltx4& a)
-{
-	StoreAlignedSIMD(pSIMD->Base(), a);
-}
-
-FORCEINLINE void StoreFourUnalignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-
-FORCEINLINE void StoreFourAlignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-
-
-FORCEINLINE void TransposeSIMD(fltx4& x, fltx4& y, fltx4& z, fltx4& w)
-{
-#define SWAP_FLOATS( _a_, _ia_, _b_, _ib_ ) { float tmp = SubFloat( _a_, _ia_ ); SubFloat( _a_, _ia_ ) = SubFloat( _b_, _ib_ ); SubFloat( _b_, _ib_ ) = tmp; }
-	SWAP_FLOATS(x, 1, y, 0);
-	SWAP_FLOATS(x, 2, z, 0);
-	SWAP_FLOATS(x, 3, w, 0);
-	SWAP_FLOATS(y, 2, z, 1);
-	SWAP_FLOATS(y, 3, w, 1);
-	SWAP_FLOATS(z, 3, w, 2);
-}
-
-FORCEINLINE fltx4 FindLowestSIMD3(const fltx4& a)
-{
-	float lowest = min(min(SubFloat(a, 0), SubFloat(a, 1)), SubFloat(a, 2));
-	return ReplicateX4(lowest);
-}
-
-FORCEINLINE fltx4 FindHighestSIMD3(const fltx4& a)
-{
-	float highest = max(max(SubFloat(a, 0), SubFloat(a, 1)), SubFloat(a, 2));
-	return ReplicateX4(highest);
-}
-
-FORCEINLINE void ConvertStoreAsIntsSIMD(intx4* RESTRICT pDest, const fltx4& vSrc)
-{
-	(*pDest)[0] = SubFloat(vSrc, 0);
-	(*pDest)[1] = SubFloat(vSrc, 1);
-	(*pDest)[2] = SubFloat(vSrc, 2);
-	(*pDest)[3] = SubFloat(vSrc, 3);
-}
-
-FORCEINLINE fltx4 IntSetImmediateSIMD(int nValue)
-{
-	fltx4 retval;
-	SubInt(retval, 0) = SubInt(retval, 1) = SubInt(retval, 2) = SubInt(retval, 3) = nValue;
-	return retval;
-}
-
-FORCEINLINE i32x4 LoadAlignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return *(reinterpret_cast<const i32x4*> (pSIMD));
-}
-
-FORCEINLINE i32x4 LoadUnalignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return *(reinterpret_cast<const i32x4*> (pSIMD));
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(int32* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<i32x4*> (pSIMD)) = a;
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(intx4& pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<i32x4*> (pSIMD.Base())) = a;
-}
-
-FORCEINLINE void StoreUnalignedIntSIMD(int32* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<i32x4*> (pSIMD)) = a;
-}
-
-FORCEINLINE fltx4 LoadAndConvertUint16SIMD(const uint16* pInts)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = pInts[0];
-	SubFloat(retval, 1) = pInts[1];
-	SubFloat(retval, 2) = pInts[2];
-	SubFloat(retval, 3) = pInts[3];
-}
-
-
-FORCEINLINE fltx4 UnsignedIntConvertToFltSIMD(const u32x4& vSrcA)
-{
-	Assert(0);			      
-	fltx4 retval;
-	SubFloat(retval, 0) = ((float)SubInt(vSrcA, 0));
-	SubFloat(retval, 1) = ((float)SubInt(vSrcA, 1));
-	SubFloat(retval, 2) = ((float)SubInt(vSrcA, 2));
-	SubFloat(retval, 3) = ((float)SubInt(vSrcA, 3));
-	return retval;
-}
-
-
-#if 0				      
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = ((float)(reinterpret_cast<int32*>(&vSrcA.m128_s32[0])));
-	SubFloat(retval, 1) = ((float)(reinterpret_cast<int32*>(&vSrcA.m128_s32[1])));
-	SubFloat(retval, 2) = ((float)(reinterpret_cast<int32*>(&vSrcA.m128_s32[2])));
-	SubFloat(retval, 3) = ((float)(reinterpret_cast<int32*>(&vSrcA.m128_s32[3])));
-	return retval;
-}
-
-
-FORCEINLINE i32x4 IntShiftLeftWordSIMD(const i32x4& vSrcA, const i32x4& vSrcB)
-{
-	i32x4 retval;
-	SubInt(retval, 0) = SubInt(vSrcA, 0) << SubInt(vSrcB, 0);
-	SubInt(retval, 1) = SubInt(vSrcA, 1) << SubInt(vSrcB, 1);
-	SubInt(retval, 2) = SubInt(vSrcA, 2) << SubInt(vSrcB, 2);
-	SubInt(retval, 3) = SubInt(vSrcA, 3) << SubInt(vSrcB, 3);
-
-
-	return retval;
-}
-
-#endif
-
-#elif ( defined( _PS3 ) )
-#define SN_IMPROVED_INTRINSICS ( (( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )) ||\
-							     (defined(__SN_VER__) && (__SN_VER__ > 25002)) )
-
-FORCEINLINE float FloatSIMD(fltx4& a, int idx)
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_extract(a, idx);
-#else
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-	return a_union.m128_f32[idx];
-#endif
-}
-
-FORCEINLINE unsigned int UIntSIMD(u32x4& a, int idx)
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_extract(a, idx);
-#else
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxui);
-	return a_union.m128_u32[idx];
-#endif
-}
-
-FORCEINLINE fltx4 AddSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_add(a, b);
-}
-
-FORCEINLINE fltx4 SubSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return vec_sub(a, b);
-}
-
-FORCEINLINE fltx4 MulSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return vec_madd(a, b, _VEC_ZEROF);
-}
-
-FORCEINLINE fltx4 MaddSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return vec_madd(a, b, c);
-}
-
-FORCEINLINE fltx4 MsubSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return vec_nmsub(a, b, c);
-};
-
-FORCEINLINE fltx4 Dot3SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 result;
-
-	result = vec_madd(a, b, _VEC_ZEROF);
-	result = vec_madd(vec_sld(a, a, 4), vec_sld(b, b, 4), result);
-	result = vec_madd(vec_sld(a, a, 8), vec_sld(b, b, 8), result);
-
-	result = vec_splat(result, 0);
-
-	return result;
-}
-
-FORCEINLINE fltx4 Dot4SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 result;
-
-	result = vec_madd(a, b, _VEC_ZEROF);
-	result = vec_madd(vec_sld(a, a, 4), vec_sld(b, b, 4), result);
-	result = vec_add(vec_sld(result, result, 8), result);
-
-	result = vec_splat(result, 0);
-
-	return result;
-}
-
-FORCEINLINE fltx4 SinSIMD(const fltx4& radians)
-{
-	return sinf4(radians);
-}
-
-FORCEINLINE void SinCos3SIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	sincosf4(radians, &sine, &cosine);
-}
-
-FORCEINLINE void SinCosSIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)				   
-{
-	sincosf4(radians, &sine, &cosine);
-}
-
-FORCEINLINE fltx4 ArcCosSIMD(const fltx4& cs)
-{
-	return acosf4(cs);
-}
-
-FORCEINLINE fltx4 ArcTan2SIMD(const fltx4& a, const fltx4& b)
-{
-	return atan2f4(a, b);
-}
-
-FORCEINLINE fltx4 ArcSinSIMD(const fltx4& sine)
-{
-	return asinf4(sine);
-}
-
-FORCEINLINE fltx4 MaxSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return vec_max(a, b);
-}
-FORCEINLINE fltx4 MinSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return vec_min(a, b);
-}
-
-FORCEINLINE fltx4 AndSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return vec_and(a, b);
-}
-FORCEINLINE fltx4 AndSIMD(const bi32x4& a, const fltx4& b)				   
-{
-	return vec_and((fltx4)a, b);
-}
-FORCEINLINE fltx4 AndSIMD(const fltx4& a, const bi32x4& b)				   
-{
-	return vec_and(a, (fltx4)b);
-}
-FORCEINLINE bi32x4 AndSIMD(const bi32x4& a, const bi32x4& b)				   
-{
-	return vec_and(a, b);
-}
-
-#if 0
-FORCEINLINE fltx4 AndNotSIMD(const fltx4& a, const fltx4& b)			   
-{
-	return vec_andc(b, a);
-}
-FORCEINLINE fltx4 AndNotSIMD(const bi32x4& a, const fltx4& b)			   
-{
-	return vec_andc(b, (fltx4)a);
-}
-FORCEINLINE fltx4 AndNotSIMD(const fltx4& a, const bi32x4& b)			   
-{
-	return (fltx4)vec_andc(b, (bi32x4)a);
-}
-FORCEINLINE bi32x4 AndNotSIMD(const bi32x4& a, const bi32x4& b)			   
-{
-	return vec_andc(b, a);
-}
-#else
-template< typename T, typename U >
-FORCEINLINE T AndNotSIMD(const T& a, const U& b)    
-{
-	return vec_andc(b, (T)a);
-}
-
-FORCEINLINE fltx4 AndNotSIMD(const bi32x4& a, const fltx4& b)    
-{
-	return vec_andc(b, (fltx4)a);
-}
-#endif
-
-FORCEINLINE fltx4 XorSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return vec_xor(a, b);
-}
-FORCEINLINE fltx4 XorSIMD(const bi32x4& a, const fltx4& b)				   
-{
-	return vec_xor((fltx4)a, b);
-}
-FORCEINLINE fltx4 XorSIMD(const fltx4& a, const bi32x4& b)				   
-{
-	return vec_xor(a, (fltx4)b);
-}
-FORCEINLINE bi32x4 XorSIMD(const bi32x4& a, const bi32x4& b)				   
-{
-	return vec_xor(a, b);
-}
-
-FORCEINLINE fltx4 OrSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return vec_or(a, b);
-}
-FORCEINLINE fltx4 OrSIMD(const bi32x4& a, const fltx4& b)				   
-{
-	return vec_or((fltx4)a, b);
-}
-FORCEINLINE fltx4 OrSIMD(const fltx4& a, const bi32x4& b)				   
-{
-	return vec_or(a, (fltx4)b);
-}
-FORCEINLINE i32x4 OrSIMD(const i32x4& a, const i32x4& b)				   
-{
-	return vec_or(a, b);
-}
-FORCEINLINE u32x4 OrSIMD(const u32x4& a, const u32x4& b)				   
-{
-	return vec_or(a, b);
-}
-
-#if !defined(__SPU__)	        
-FORCEINLINE bi32x4 OrSIMD(const bi32x4& a, const bi32x4& b)				   
-{
-	return vec_or(a, b);
-}
-#endif
-
-FORCEINLINE fltx4 NegSIMD(const fltx4& a)   
-{
-	return(SubSIMD(_VEC_ZEROF, a));
-
-}
-
-FORCEINLINE bool IsAnyZeros(const fltx4& a)								    
-{
-	return vec_any_eq(a, _VEC_ZEROF);
-}
-
-FORCEINLINE bool IsAnyZeros(const bi32x4& a)								    
-{
-	return vec_any_eq((u32x4)a, _VEC_ZERO);
-}
-
-FORCEINLINE bool IsAllZeros(const bi32x4& a)								     
-{
-	return vec_all_eq((u32x4)a, _VEC_ZERO);
-}
-
-FORCEINLINE bool IsAnyXYZZero(const fltx4& a)								     
-{
-#if SN_IMPROVED_INTRINSICS
-
-	fltx4 b = vec_insert(1.0f, a, 3);
-
-	return vec_any_eq(b, _VEC_ZEROF);
-#else
-	fltx4 b = vec_perm(a, _VEC_ONEF, _VEC_PERMUTE_XYZ0W1);
-	return vec_any_eq(b, _VEC_ZEROF);
-#endif
-}
-
-FORCEINLINE bool IsAllGreaterThan(const fltx4& a, const fltx4& b)
-{
-	return vec_all_gt(a, b);
-}
-
-FORCEINLINE bool IsAllGreaterThanOrEq(const fltx4& a, const fltx4& b)
-{
-	return vec_all_ge(a, b);
-}
-
-FORCEINLINE bool IsAllEqual(const fltx4& a, const fltx4& b)
-{
-	return vec_all_eq(a, b);
-}
-
-
-FORCEINLINE int TestSignSIMD(const fltx4& a)								         
-{
-	int nRet = 0;
-
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-
-	nRet |= (a_union.m128_u32[0] & 0x80000000) >> 31;     
-	nRet |= (a_union.m128_u32[1] & 0x80000000) >> 30;     
-	nRet |= (a_union.m128_u32[2] & 0x80000000) >> 29;     
-	nRet |= (a_union.m128_u32[3] & 0x80000000) >> 28;     
-
-	return nRet;
-}
-FORCEINLINE int TestSignSIMD(const bi32x4& a)								         
-{
-	int nRet = 0;
-
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxbi);
-
-	nRet |= (a_union.m128_u32[0] & 0x80000000) >> 31;     
-	nRet |= (a_union.m128_u32[1] & 0x80000000) >> 30;     
-	nRet |= (a_union.m128_u32[2] & 0x80000000) >> 29;     
-	nRet |= (a_union.m128_u32[3] & 0x80000000) >> 28;     
-
-	return nRet;
-}
-
-FORCEINLINE bool IsAnyNegative(const bi32x4& a)							               
-{
-	return (0 != TestSignSIMD(a));
-}
-
-FORCEINLINE fltx4 SetWToZeroSIMD(const fltx4& a)
-{
-	return (fltx4)vec_and((u32x4)a, _VEC_CLEAR_WMASK);
-}
-FORCEINLINE bi32x4 SetWToZeroSIMD(const bi32x4& a)
-{
-	return (bi32x4)vec_and((u32x4)a, _VEC_CLEAR_WMASK);
-}
-
-FORCEINLINE bool IsAnyNegative(const fltx4& a)							               
-{
-	return vec_any_lt(a, _VEC_ZEROF);
-}
-
-FORCEINLINE bool IsAnyTrue(const fltx4& a)
-{
-	return vec_any_ne(a, _VEC_ZEROF);
-}
-
-#ifdef DIFFERENT_NATIVE_VECTOR_TYPES
-
-FORCEINLINE bool IsAnyTrue(const bi32x4& a)
-{
-	return vec_any_ne((vector unsigned int) a, _VEC_0L);
-}
-
-#endif
-
-FORCEINLINE bi32x4 CmpEqSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return (bi32x4)vec_cmpeq(a, b);
-}
-FORCEINLINE bi32x4 CmpEqSIMD(const i32x4& a, const i32x4& b)				   
-{
-	return (bi32x4)vec_cmpeq(a, b);
-}
-FORCEINLINE bi32x4 CmpEqSIMD(const u32x4& a, const u32x4& b)				   
-{
-	return (bi32x4)vec_cmpeq(a, b);
-}
-
-FORCEINLINE bi32x4 CmpGtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return (bi32x4)vec_cmpgt(a, b);
-}
-FORCEINLINE bi32x4 CmpGtSIMD(const i32x4& a, const i32x4& b)				   
-{
-	return (bi32x4)vec_cmpgt(a, b);
-}
-FORCEINLINE bi32x4 CmpGtSIMD(const u32x4& a, const u32x4& b)				   
-{
-	return (bi32x4)vec_cmpgt(a, b);
-}
-
-FORCEINLINE bi32x4 CmpGeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return (bi32x4)vec_cmpge(a, b);
-}
-
-
-FORCEINLINE bi32x4 CmpLtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return (bi32x4)vec_cmplt(a, b);
-}
-
-FORCEINLINE bi32x4 CmpLeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return (bi32x4)vec_cmple(a, b);
-}
-
-
-
-FORCEINLINE bi32x4 CmpInBoundsSIMD(const fltx4& a, const fltx4& b)		           
-{
-	i32x4 control;
-	control = vec_cmpb(a, b);
-	return (bi32x4)vec_cmpeq((u32x4)control, _VEC_ZERO);
-}
-
-FORCEINLINE int CmpAnyLeSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_any_le(a, b);
-}
-
-FORCEINLINE int CmpAnyGeSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_any_ge(a, b);
-}
-
-FORCEINLINE int CmpAnyLtSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_any_lt(a, b);
-}
-FORCEINLINE int CmpAnyLtSIMD(const bi32x4& a, const i32x4& b)
-{
-	return vec_any_lt((i32x4)a, b);
-}
-
-FORCEINLINE int CmpAnyGtSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_any_gt(a, b);
-}
-
-FORCEINLINE int CmpAnyNeSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_any_ne(a, b);
-}
-FORCEINLINE int CmpAnyNeSIMD(const bi32x4& a, const bi32x4& b)
-{
-	return vec_any_ne(a, b);
-}
-FORCEINLINE int CmpAnyNeSIMD(const bi32x4& a, const i32x4& b)
-{
-	return vec_any_ne(a, (bi32x4)b);
-}
-
-FORCEINLINE int CmpAllLeSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_all_le(a, b);
-}
-
-FORCEINLINE fltx4 MaskedAssign(const bi32x4& ReplacementMask, const fltx4& NewValue, const fltx4& OldValue)
-{
-	return vec_sel(OldValue, NewValue, ReplacementMask);
-}
-
-FORCEINLINE fltx4 MaskedAssign(const fltx4& ReplacementMask, const fltx4& NewValue, const fltx4& OldValue)
-{
-	return vec_sel(OldValue, NewValue, (const bi32x4)ReplacementMask);
-}
-
-FORCEINLINE vector signed short MaskedAssign(const vector unsigned short& ReplacementMask, const vector signed short& NewValue, const vector signed short& OldValue)
-{
-	return vec_sel(OldValue, NewValue, ReplacementMask);
-}
-
-FORCEINLINE fltx4 ReplicateX4(float flValue)					  
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_splats(flValue);
-#else
-	float* pValue = &flValue;
-	Assert(pValue);
-	Assert(((unsigned int)pValue & 3) == 0);
-
-	fltx4 result;
-
-	result = vec_ld(0, pValue);
-	result = vec_splat(vec_perm(result, result, vec_lvsl(0, pValue)), 0);
-
-	return result;
-#endif
-}
-
-FORCEINLINE fltx4 ReplicateX4(const float* pValue)					  
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_splats(*pValue);
-#else
-	Assert(pValue);
-	fltx4 result;
-
-	result = vec_ld(0, pValue);
-	result = vec_splat(vec_perm(result, result, vec_lvsl(0, pValue)), 0);
-
-	return result;
-#endif
-}
-
-FORCEINLINE i32x4 ReplicateIX4(int nValue)
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_splats(nValue);
-#else
-	int* pValue = &nValue;
-	Assert(pValue);
-	Assert(((unsigned int)pValue & 3) == 0);
-	i32x4 result;
-
-	result = vec_ld(0, pValue);
-	result = vec_splat(vec_perm(result, result, vec_lvsl(0, pValue)), 0);
-
-	return result;
-#endif
-}
-
-FORCEINLINE fltx4 SqrtSIMD(const fltx4& a)					 
-{
-	return sqrtf4(a);
-}
-
-FORCEINLINE fltx4 SqrtEstSIMD(const fltx4& a)				    
-{
-#if defined( _PS3 ) && !defined( SPU )
-	fltx4 vRecipSquareRoot = vec_rsqrte(a);
-	i32x4 vOne = vec_splat_s32(1);
-	i32x4 vAllOnes = vec_splat_s32(-1);
-	i32x4 vShiftLeft24 = vec_splat_s32(-8);             
-	fltx4 vZero = (fltx4)vec_splat_s32(0);
-	u32x4 vInputShifted = vec_sl((u32x4)a, (u32x4)vOne);
-	u32x4 vInfinityShifted = vec_sl((u32x4)vAllOnes, (u32x4)vShiftLeft24);
-	bi32x4 vEqualsZero = vec_vcmpeqfp(a, vZero);
-	bi32x4 vEqualsInfinity = vec_vcmpequw(vInputShifted, vInfinityShifted);
-	fltx4 vSquareRoot = vec_madd(a, vRecipSquareRoot, _VEC_ZEROF);
-	bi32x4 vResultMask = vec_vcmpequw((u32x4)vEqualsInfinity, (u32x4)vEqualsZero);          
-	fltx4 vCorrectedSquareRoot = vec_sel(a, vSquareRoot, vResultMask);
-
-	return vCorrectedSquareRoot;
-#else
-	return SqrtSIMD(a);
-#endif
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSIMD(const fltx4& a)		    
-{
-	return vec_rsqrte(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtSIMD(const fltx4& a)			 
-{
-	fltx4 result;
-	vmathV4RsqrtPerElem((VmathVector4*)&result, (const VmathVector4*)&a);
-
-	return result;
-}
-
-FORCEINLINE fltx4 ReciprocalEstSIMD(const fltx4& a)			    
-{
-	return vec_re(a);
-}
-
-FORCEINLINE fltx4 ReciprocalEstSaturateSIMD(const fltx4& a)
-{
-	bi32x4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 ret = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	ret = ReciprocalEstSIMD(ret);
-	return ret;
-}
-
-
-FORCEINLINE fltx4 ReciprocalSIMD(const fltx4& a)				 
-{
-	fltx4 result;
-	vmathV4RecipPerElem((VmathVector4*)&result, (const VmathVector4*)&a);
-
-	return result;
-}
-
-FORCEINLINE fltx4 DivSIMD(const fltx4& a, const fltx4& b)	 
-{
-	return MulSIMD(ReciprocalSIMD(b), a);
-}
-
-FORCEINLINE fltx4 DivEstSIMD(const fltx4& a, const fltx4& b)	 
-{
-	return MulSIMD(ReciprocalEstSIMD(b), a);
-}
-
-FORCEINLINE fltx4 ReciprocalSaturateSIMD(const fltx4& a)
-{
-	bi32x4 zero_mask = CmpEqSIMD(a, _VEC_ZEROF);
-	fltx4 a_safe = OrSIMD(a, AndSIMD(_VEC_EPSILONF, zero_mask));
-	return ReciprocalSIMD(a_safe);
-
-}
-
-
-FORCEINLINE fltx4 ExpSIMD(const fltx4& toPower)
-{
-	return exp2f4(toPower);
-}
-
-FORCEINLINE fltx4 Exp2EstSIMD(const fltx4& f)
-{
-	return exp2f4fast(f);
-}
-
-
-FORCEINLINE fltx4 ClampVectorSIMD(FLTX4 in, FLTX4 min, FLTX4 max)
-{
-	fltx4 result = vec_max(min, in);
-	return vec_min(max, result);
-}
-
-
-FORCEINLINE fltx4 LoadUnalignedSIMD(const void* pSIMD)
-{
-#if SN_IMPROVED_INTRINSICS
-
-	fltx4 v0, v1;
-
-	Assert(pSIMD);
-
-
-	v0 = (fltx4)vec_lvlx(0, (float*)pSIMD);
-	v1 = (fltx4)vec_lvrx(16, (float*)pSIMD);
-	return vec_or(v0, v1);
-
-#else
-
-	fltx4 v0, v1;
-	vector unsigned char permMask;
-
-	Assert(pSIMD);
-
-	v0 = vec_ld(0, pSIMD);
-	permMask = vec_lvsl(0, pSIMD);
-	v1 = vec_ld(15, pSIMD);
-
-	return vec_perm(v0, v1, permMask);
-
-#endif
-}
-
-FORCEINLINE fltx4 LoadUnsignedByte4SIMD(unsigned char* pBytes)	        
-{
-
-#if SN_IMPROVED_INTRINSICS
-
-	__vector unsigned char  res_uc;
-	__vector unsigned short res_us;
-
-	__vector unsigned char vZero8 = (__vector unsigned char)vec_splat_u8(0);
-	__vector unsigned short vZero16 = (__vector unsigned short)vec_splat_u16(0);
-
-	res_uc = (__vector unsigned char)vec_lvlx(0, pBytes);
-	res_uc = vec_mergeh(vZero8, res_uc);
-	res_us = vec_mergeh(vZero16, (__vector unsigned short)res_uc);
-	return vec_ctf((__vector unsigned int)res_us, 0);
-
-#else
-
-	vector unsigned char v0, v1;
-	vector bool char res_uc;
-	vector unsigned char permMask;
-	vector bool short res_us;
-
-	vector bool char vZero8 = (vector bool char)vec_splat_u8(0);
-	vector bool short vZero16 = (vector bool short)vec_splat_u16(0);
-
-	v0 = vec_ld(0, pBytes);
-	permMask = vec_lvsl(0, pBytes);
-	v1 = vec_ld(3, pBytes);
-	res_uc = (vector bool char)vec_perm(v0, v1, permMask);
-	res_uc = vec_mergeh(vZero8, res_uc);
-	res_us = vec_mergeh(vZero16, (vector bool short)res_uc);
-	return vec_ctf((vector unsigned int)res_us, 0);
-
-#endif
-
-}
-
-FORCEINLINE fltx4 LoadSignedByte4SIMD(signed char* pBytes)	        
-{
-
-#if SN_IMPROVED_INTRINSICS	
-
-	vector signed char  res_uc;
-	vector signed short res_us;
-	vector signed int   res_ui;
-
-	res_uc = (vector signed char)vec_lvlx(0, pBytes);
-	res_us = vec_unpackh(res_uc);
-	res_ui = vec_unpackh(res_us);
-	return vec_ctf(res_ui, 0);
-
-#else
-
-	vector signed char v0, v1, res_uc;
-	vector unsigned char permMask;
-	vector signed short res_us;
-	vector signed int   res_ui;
-
-	v0 = vec_ld(0, pBytes);
-	permMask = vec_lvsl(0, pBytes);
-	v1 = vec_ld(3, pBytes);
-	res_uc = vec_perm(v0, v1, permMask);
-	res_us = vec_unpackh(res_uc);
-	res_ui = vec_unpackh(res_us);
-	return vec_ctf(res_ui, 0);
-
-#endif
-
-}
-
-
-FORCEINLINE fltx4 LoadUnaligned3SIMD(const void* pSIMD)
-{
-	Assert(pSIMD);
-
-	fltx4 v0 = vec_ld(0, (float*)(pSIMD));
-	vector unsigned char permMask = vec_lvsl(0, (float*)(pSIMD));
-	fltx4 v1 = vec_ld(11, (float*)(pSIMD));
-
-	return vec_perm(v0, v1, permMask);
-}
-
-
-FORCEINLINE fltx4 LoadUnalignedFloatSIMD(const float* pFlt)
-{
-	fltx4 v0 = vec_lde(0, const_cast<float*>(pFlt));
-	vector unsigned char permMask = vec_lvsl(0, const_cast<float*>(pFlt));
-	return vec_perm(v0, v0, permMask);
-}
-
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const void* pSIMD)
-{
-	return vec_ld(0, (float*)pSIMD);
-}
-
-#ifndef SPU
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned& pSIMD)
-{
-	fltx4 out;
-	out = vec_ld(0, pSIMD.Base());
-
-	return (fltx4)vec_and((u32x4)out, _VEC_CLEAR_WMASK);
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned* RESTRICT pSIMD)
-{
-	fltx4 out;
-	out = vec_ld(0, pSIMD->Base());
-
-	return (fltx4)vec_and((u32x4)out, _VEC_CLEAR_WMASK);
-}
-
-
-FORCEINLINE void StoreAligned3SIMD(VectorAligned* RESTRICT pSIMD, const fltx4& a)
-{
-	vec_st(a, 0, pSIMD->Base());
-}
-#endif
-
-FORCEINLINE void StoreAlignedSIMD(float* pSIMD, const fltx4& a)
-{
-	vec_st(a, 0, pSIMD);
-}
-
-FORCEINLINE void StoreUnalignedSIMD(float* pSIMD, const fltx4& a)
-{
-#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )
-	vec_stvlx(a, 0, pSIMD);
-	vec_stvrx(a, 16, pSIMD);
-#else
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-	pSIMD[0] = a_union.m128_f32[0];
-	pSIMD[1] = a_union.m128_f32[1];
-	pSIMD[2] = a_union.m128_f32[2];
-	pSIMD[3] = a_union.m128_f32[3];
-#endif
-
-}
-
-FORCEINLINE void StoreUnaligned3SIMD(float* pSIMD, const fltx4& a)
-{
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-	pSIMD[0] = a_union.m128_f32[0];
-	pSIMD[1] = a_union.m128_f32[1];
-	pSIMD[2] = a_union.m128_f32[2];
-};
-
-
-
-#ifndef SPU
-
-FORCEINLINE fltx4 Compress4SIMD(fltx4 const a, fltx4 const& b, fltx4 const& c, fltx4 const& d);
-FORCEINLINE fltx4 LoadGatherSIMD(const float& x, const float& y, const float& z, const float& w)
-{
-#if USING_POINTLESSLY_SLOW_SONY_CODE
-	return vmathV4MakeFromElems_V(x, y, z, w).vec128;
-#else
-	fltx4 vx = vec_lvlx(0, &x);
-	fltx4 vy = vec_lvlx(0, &y);
-	fltx4 vz = vec_lvlx(0, &z);
-	fltx4 vw = vec_lvlx(0, &w);
-	return Compress4SIMD(vx, vy, vz, vw);
-#endif
-}
-
-
-FORCEINLINE void StoreFourUnalignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-
-FORCEINLINE void StoreFourAlignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-#endif
-
-FORCEINLINE void ConvertStoreAsIntsSIMD(intx4* RESTRICT pDest, const fltx4& vSrc)
-{
-	i32x4 asInt = vec_cts(vSrc, 0);
-	vec_st(asInt, 0, pDest->Base());
-}
-
-FORCEINLINE void TransposeSIMD(fltx4& x, fltx4& y, fltx4& z, fltx4& w)
-{
-	fltx4 p0, p1, p2, p3;
-
-	p0 = vec_mergeh(x, z);
-	p1 = vec_mergeh(y, w);
-	p2 = vec_mergel(x, z);
-	p3 = vec_mergel(y, w);
-
-	x = vec_mergeh(p0, p1);
-	y = vec_mergel(p0, p1);
-	z = vec_mergeh(p2, p3);
-	w = vec_mergel(p2, p3);
-}
-
-FORCEINLINE fltx4 LoadZeroSIMD(void)
-{
-	return _VEC_ZEROF;
-}
-FORCEINLINE i32x4 LoadZeroISIMD(void)
-{
-	return vec_splat_s32(0);
-}
-
-
-FORCEINLINE fltx4 LoadOneSIMD(void)
-{
-	return _VEC_ONEF;
-}
-FORCEINLINE i32x4 LoadOneISIMD(void)
-{
-	return vec_splat_s32(1);
-}
-
-FORCEINLINE fltx4 SplatXSIMD(fltx4 a)
-{
-	return vec_splat(a, 0);
-}
-FORCEINLINE fltx4 SplatYSIMD(fltx4 a)
-{
-	return vec_splat(a, 1);
-}
-FORCEINLINE fltx4 SplatZSIMD(fltx4 a)
-{
-	return vec_splat(a, 2);
-}
-FORCEINLINE fltx4 SplatWSIMD(fltx4 a)
-{
-	return vec_splat(a, 3);
-}
-
-FORCEINLINE bi32x4 SplatXSIMD(bi32x4 a)
-{
-	return vec_splat(a, 0);
-}
-FORCEINLINE bi32x4 SplatYSIMD(bi32x4 a)
-{
-	return vec_splat(a, 1);
-}
-FORCEINLINE bi32x4 SplatZSIMD(bi32x4 a)
-{
-	return vec_splat(a, 2);
-}
-FORCEINLINE bi32x4 SplatWSIMD(bi32x4 a)
-{
-	return vec_splat(a, 3);
-}
-
-FORCEINLINE fltx4 SetXSIMD(const fltx4& a, const fltx4& x)
-{
-	return vec_sel(a, x, _VEC_COMPONENT_MASK_0);
-}
-
-FORCEINLINE fltx4 SetYSIMD(const fltx4& a, const fltx4& y)
-{
-	return vec_sel(a, y, _VEC_COMPONENT_MASK_1);
-}
-
-FORCEINLINE fltx4 SetZSIMD(const fltx4& a, const fltx4& z)
-{
-	return vec_sel(a, z, _VEC_COMPONENT_MASK_2);
-}
-
-FORCEINLINE fltx4 SetWSIMD(const fltx4& a, const fltx4& w)
-{
-	return vec_sel(a, w, _VEC_COMPONENT_MASK_3);
-}
-
-FORCEINLINE fltx4 SetComponentSIMD(const fltx4& a, int nComponent, float flValue)
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_insert(flValue, a, nComponent);
-#else
-	fltx4_union a_union;
-	a_union.vmxf = vec_ld(0, &a);
-	a_union.m128_f32[nComponent] = flValue;
-	return a_union.vmxf;
-#endif
-}
-
-FORCEINLINE float GetComponentSIMD(const fltx4& a, int nComponent)
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_extract(a, nComponent);
-#else
-	fltx4_union a_union;
-	a_union.vmxf = vec_ld(0, &a);
-	return a_union.m128_f32[nComponent];
-#endif
-}
-
-
-FORCEINLINE fltx4 RotateLeft(const fltx4& a)
-{
-	return vec_sld(a, a, 4);
-}
-
-FORCEINLINE fltx4 RotateLeft2(const fltx4& a)
-{
-	return vec_sld(a, a, 8);
-}
-
-FORCEINLINE fltx4 RotateRight(const fltx4& a)
-{
-	return vec_sld(a, a, 12);
-}
-
-FORCEINLINE fltx4 RotateRight2(const fltx4& a)
-{
-	return vec_sld(a, a, 8);
-}
-
-template < uint nBits, typename T >
-FORCEINLINE T ShiftLeftByBits(const T& a)
-{
-	if (nBits >= 128)     
-	{
-		return (T)LoadZeroSIMD();
-	}
-	else if (nBits == 0)
-	{
-		return a;
-	}
-	else if ((nBits > 7))                
-	{
-		T t = vec_sld(a, ((T)LoadZeroSIMD()), (nBits >> 3));     
-		return ShiftLeftByBits< (nBits & 0x7) >(t);
-	}
-	else          
-	{
-		vector unsigned int shifter = (vector unsigned int) (vec_splat_s8(((signed char)(nBits & 0x7))));
-		return (T)vec_sll((vector signed int) a, shifter);
-	}
-}
-
-template < uint nBits, typename T >
-FORCEINLINE T ShiftRightByBits(const T& a)
-{
-	if (nBits >= 128)     
-	{
-		return (T)LoadZeroSIMD();
-	}
-	else if (nBits == 0)
-	{
-		return a;
-	}
-	else if ((nBits > 7))                
-	{
-		T t = vec_sld(((T)LoadZeroSIMD()), a, 16 - (nBits >> 3));                   
-		return ShiftRightByBits< (nBits & 0x7) >(t);
-	}
-	else          
-	{
-		vector unsigned int shifter = (vector unsigned int) (vec_splat_s8(((signed char)(nBits & 0x7))));
-		return (T)vec_srl((vector unsigned int) a, shifter);
-	}
-}
-
-
-
-
-FORCEINLINE fltx4 FindLowestSIMD3(const fltx4& a)
-{
-	fltx4 result;
-	fltx4 x = vec_splat(a, 0);
-	fltx4 y = vec_splat(a, 1);
-	fltx4 z = vec_splat(a, 2);
-
-	if (vec_any_nan(a))
-	{
-		x = vec_all_nan(x) ? _VEC_FLTMAX : x;
-		y = vec_all_nan(y) ? _VEC_FLTMAX : y;
-		z = vec_all_nan(z) ? _VEC_FLTMAX : z;
-	}
-
-	result = vec_min(y, x);
-	result = vec_min(z, result);
-
-	return result;
-
-}
-
-FORCEINLINE fltx4 FindHighestSIMD3(const fltx4& a)
-{
-	fltx4 result;
-	fltx4 x = vec_splat(a, 0);
-	fltx4 y = vec_splat(a, 1);
-	fltx4 z = vec_splat(a, 2);
-
-	if (vec_any_nan(a))
-	{
-		x = vec_all_nan(x) ? _VEC_FLTMIN : x;
-		y = vec_all_nan(y) ? _VEC_FLTMIN : y;
-		z = vec_all_nan(z) ? _VEC_FLTMIN : z;
-	}
-
-	result = vec_max(y, x);
-	result = vec_max(z, result);
-
-	return result;
-}
-
-
-FORCEINLINE i32x4 LoadAlignedIntSIMD(const int32* RESTRICT pSIMD)
-{
-	return vec_ld(0, const_cast<int32*>(pSIMD));
-}
-
-FORCEINLINE i32x4 LoadUnalignedIntSIMD(const int32* RESTRICT pSIMD)
-{
-	i32x4 v0, v1;
-	vector unsigned char permMask;
-
-	Assert(pSIMD);
-
-	v0 = vec_ld(0, const_cast<int32*>(pSIMD));
-	permMask = vec_lvsl(0, const_cast<int32*>(pSIMD));
-	v1 = vec_ld(15, const_cast<int32*>(pSIMD));
-
-	return vec_perm(v0, v1, permMask);
-
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(int32* pSIMD, const i32x4& a)
-{
-	vec_st(a, 0, pSIMD);
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(int32* pSIMD, const fltx4& a)
-{
-	vec_st((i32x4)a, 0, pSIMD);
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(intx4& pSIMD, const i32x4& a)
-{
-	vec_st(a, 0, pSIMD.Base());
-}
-
-FORCEINLINE void StoreUnalignedIntSIMD(int32* pSIMD, const i32x4& a)
-{
-#if SN_IMPROVED_INTRINSICS
-
-	vec_stvlx(a, 0, pSIMD);
-	vec_stvrx(a, 16, pSIMD);
-
-#else
-
-	fltx4_union tmp;
-	vec_st(a, 0, &tmp.vmxi);
-
-	pSIMD[0] = tmp.m128_u32[0];
-	pSIMD[1] = tmp.m128_u32[1];
-	pSIMD[2] = tmp.m128_u32[2];
-	pSIMD[3] = tmp.m128_u32[3];
-
-#endif
-}
-
-FORCEINLINE fltx4 CompressSIMD(fltx4 const& a, fltx4 const& b)
-{
-	const int32 ALIGN16 n4shuffleACXZ[4] ALIGN16_POST = { 0x00010203, 0x08090A0B, 0x10111213, 0x18191A1B };
-	return vec_perm(a, b, (vec_uchar16)LoadAlignedIntSIMD(n4shuffleACXZ));
-}
-
-FORCEINLINE fltx4 Compress4SIMD(fltx4 const a, fltx4 const& b, fltx4 const& c, fltx4 const& d)
-{
-	fltx4 ab = vec_mergeh(a, b);      
-	fltx4 cd = vec_mergeh(c, d);    
-	static const int32 ALIGN16 shuffleABXY[4] ALIGN16_POST = { 0x00010203, 0x04050607, 0x10111213, 0x14151617 };
-
-	return vec_perm(ab, cd, (vec_uchar16)LoadAlignedIntSIMD(shuffleABXY));
-}
-
-
-FORCEINLINE fltx4 UnsignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	return vec_ctf(vSrcA, 0);
-}
-
-
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	return vec_ctf(vSrcA, 0);
-}
-
-#define UnsignedFixedIntConvertToFltSIMD(vSrcA, uImmed) (vec_ctf( (vSrcA), (uImmed) ))
-
-#define SignedFixedIntConvertToFltSIMD(vSrcA, uImmed) (vec_ctf( (vSrcA), (uImmed) ))
-
-#define IntSetImmediateSIMD(x) (vec_splat_s32(x))
-
-
-FORCEINLINE u32x4 IntShiftLeftWordSIMD(u32x4 vSrcA, u32x4 vSrcB)
-{
-	return vec_sl(vSrcA, vSrcB);
-}
-
-
-FORCEINLINE float SubFloat(const fltx4& a, int idx)
-{
-#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )
-	return(vec_extract(a, idx));
-#else   
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-	return a_union.m128_f32[idx];
-#endif   
-}
-
-FORCEINLINE float& SubFloat(fltx4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_f32[idx];
-}
-
-FORCEINLINE uint32 SubInt(const u32x4& a, int idx)
-{
-#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )
-	return(vec_extract(a, idx));
-#else   
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxui);
-	return a_union.m128_u32[idx];
-#endif   
-}
-
-FORCEINLINE uint32 SubInt(const fltx4& a, int idx)
-{
-#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )
-	return(vec_extract((u32x4)a, idx));
-#else
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-	return a_union.m128_u32[idx];
-#endif
-}
-
-FORCEINLINE uint32& SubInt(u32x4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_u32[idx];
-}
-
-FORCEINLINE uint32 SubFloatConvertToInt(const fltx4& a, int idx)
-{
-
-#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )
-	return(vec_extract(vec_ctu(a, 0), idx));
-#else
-	u32x4 t = vec_ctu(a, 0);
-	return SubInt(t, idx);
-#endif
-
-}
-
-template< typename T, typename U >
-FORCEINLINE T PermuteVMX(T a, T b, U swizzleMask)
-{
-	return vec_perm(a, b, (vec_uchar16)swizzleMask);
-}
-
-
-#if !defined(__SPU__)
-#define fsel __fsel
-#endif
-
-inline bool IsVector3LessThan(const fltx4& v1, const fltx4& v2)
-{
-	return vec_any_lt(v1, v2);
-}
-
-inline bool IsVector3GreaterOrEqual(const fltx4& v1, const fltx4& v2)
-{
-	return !IsVector3LessThan(v1, v2);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / sqrt(SubFloat(a, 0) != 0.0f ? SubFloat(a, 0) : FLT_EPSILON);
-	SubFloat(retVal, 1) = 1.0 / sqrt(SubFloat(a, 1) != 0.0f ? SubFloat(a, 1) : FLT_EPSILON);
-	SubFloat(retVal, 2) = 1.0 / sqrt(SubFloat(a, 2) != 0.0f ? SubFloat(a, 2) : FLT_EPSILON);
-	SubFloat(retVal, 3) = 1.0 / sqrt(SubFloat(a, 3) != 0.0f ? SubFloat(a, 3) : FLT_EPSILON);
-	return retVal;
-}
-
-FORCEINLINE fltx4 FloorSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = floor(SubFloat(a, 0));
-	SubFloat(retVal, 1) = floor(SubFloat(a, 1));
-	SubFloat(retVal, 2) = floor(SubFloat(a, 2));
-	SubFloat(retVal, 3) = floor(SubFloat(a, 3));
-	return retVal;
-}
-
-#elif ( defined( _X360 ) )
-
-inline bool IsVector3LessThan(const fltx4& v1, const fltx4& v2)
-{
-	return !XMVector3GreaterOrEqual(v1, v2);
-}
-
-inline BOOL IsVector3GreaterOrEqual(const fltx4& v1, const fltx4& v2)
-{
-	return XMVector3GreaterOrEqual(v1, v2);
-}
-
-
-FORCEINLINE float& FloatSIMD(fltx4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_f32[idx];
-}
-
-FORCEINLINE unsigned int& UIntSIMD(fltx4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_u32[idx];
-}
-
-FORCEINLINE fltx4 AddSIMD(const fltx4& a, const fltx4& b)
-{
-	return __vaddfp(a, b);
-}
-
-FORCEINLINE fltx4 SubSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return __vsubfp(a, b);
-}
-
-FORCEINLINE fltx4 MulSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return __vmulfp(a, b);
-}
-
-FORCEINLINE fltx4 MaddSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return __vmaddfp(a, b, c);
-}
-
-FORCEINLINE fltx4 MsubSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return __vnmsubfp(a, b, c);
-};
-
-FORCEINLINE fltx4 Dot3SIMD(const fltx4& a, const fltx4& b)
-{
-	return __vmsum3fp(a, b);
-}
-
-FORCEINLINE fltx4 Dot4SIMD(const fltx4& a, const fltx4& b)
-{
-	return __vmsum4fp(a, b);
-}
-
-FORCEINLINE fltx4 SinSIMD(const fltx4& radians)
-{
-	return XMVectorSin(radians);
-}
-
-FORCEINLINE void SinCos3SIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	XMVectorSinCos(&sine, &cosine, radians);
-}
-
-FORCEINLINE void SinCosSIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	XMVectorSinCos(&sine, &cosine, radians);
-}
-
-FORCEINLINE void CosSIMD(fltx4& cosine, const fltx4& radians)
-{
-	cosine = XMVectorCos(radians);
-}
-
-FORCEINLINE fltx4 ArcSinSIMD(const fltx4& sine)
-{
-	return XMVectorASin(sine);
-}
-
-FORCEINLINE fltx4 ArcCosSIMD(const fltx4& cs)
-{
-	return XMVectorACos(cs);
-}
-
-FORCEINLINE fltx4 ArcTan2SIMD(const fltx4& a, const fltx4& b)
-{
-	return XMVectorATan2(a, b);
-}
-
-FORCEINLINE fltx4 MaxSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return __vmaxfp(a, b);
-}
-
-FORCEINLINE fltx4 MinSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return __vminfp(a, b);
-}
-
-FORCEINLINE fltx4 AndSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vand(a, b);
-}
-
-FORCEINLINE fltx4 AndNotSIMD(const fltx4& a, const fltx4& b)			   
-{
-	return __vandc(b, a);
-}
-
-FORCEINLINE fltx4 XorSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vxor(a, b);
-}
-
-FORCEINLINE fltx4 OrSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vor(a, b);
-}
-
-FORCEINLINE fltx4 NegSIMD(const fltx4& a)   
-{
-	return XMVectorNegate(a);
-}
-
-FORCEINLINE bool IsAllZeros(const fltx4& a)								     
-{
-	unsigned int equalFlags = 0;
-	__vcmpeqfpR(a, Four_Zeros, &equalFlags);
-	return XMComparisonAllTrue(equalFlags);
-}
-
-FORCEINLINE bool IsAnyZeros(const fltx4& a)								    
-{
-	unsigned int conditionregister;
-	XMVectorEqualR(&conditionregister, a, XMVectorZero());
-	return XMComparisonAnyTrue(conditionregister);
-}
-
-FORCEINLINE bool IsAnyXYZZero(const fltx4& a)								     
-{
-	fltx4 temp = __vrlimi(a, a, 1, 1);
-	unsigned int conditionregister;
-	XMVectorEqualR(&conditionregister, temp, XMVectorZero());
-	return XMComparisonAnyTrue(conditionregister);
-}
-
-FORCEINLINE bool IsAllGreaterThan(const fltx4& a, const fltx4& b)
-{
-	unsigned int cr;
-	XMVectorGreaterR(&cr, a, b);
-	return XMComparisonAllTrue(cr);
-}
-
-FORCEINLINE bool IsAllGreaterThanOrEq(const fltx4& a, const fltx4& b)
-{
-	unsigned int cr;
-	XMVectorGreaterOrEqualR(&cr, a, b);
-	return XMComparisonAllTrue(cr);
-}
-
-FORCEINLINE bool IsAnyGreaterThan(const fltx4& a, const fltx4& b)
-{
-	unsigned int cr;
-	XMVectorGreaterR(&cr, a, b);
-	return XMComparisonAnyTrue(cr);
-}
-
-FORCEINLINE bool IsAnyGreaterThanOrEq(const fltx4& a, const fltx4& b)
-{
-	unsigned int cr;
-	XMVectorGreaterOrEqualR(&cr, a, b);
-	return XMComparisonAnyTrue(cr);
-}
-
-FORCEINLINE bool IsAllEqual(const fltx4& a, const fltx4& b)
-{
-	unsigned int cr;
-	XMVectorEqualR(&cr, a, b);
-	return XMComparisonAllTrue(cr);
-}
-
-
-FORCEINLINE int TestSignSIMD(const fltx4& a)								         
-{
-	int nRet = 0;
-
-	const fltx4_union& a_union = (const fltx4_union&)a;
-	nRet |= (a_union.m128_u32[0] & 0x80000000) >> 31;     
-	nRet |= (a_union.m128_u32[1] & 0x80000000) >> 30;     
-	nRet |= (a_union.m128_u32[2] & 0x80000000) >> 29;     
-	nRet |= (a_union.m128_u32[3] & 0x80000000) >> 28;     
-
-	return nRet;
-}
-
-FORCEINLINE fltx4 SetWToZeroSIMD(const fltx4& a)
-{
-	return __vrlimi(a, __vzero(), 1, 0);
-}
-
-FORCEINLINE bool IsAnyNegative(const fltx4& a)							               
-{
-	unsigned int equalFlags = 0;
-	fltx4 signMask = __vspltisw(-1);                          
-	signMask = __vslw(signMask, signMask);      
-	__vcmpequwR(Four_Zeros, __vand(signMask, a), &equalFlags);
-	return !XMComparisonAllTrue(equalFlags);
-}
-
-FORCEINLINE bool IsAnyTrue(const fltx4& a)
-{
-	unsigned int equalFlags = 0;
-	__vcmpequwR(Four_Zeros, a, &equalFlags);    
-	return XMComparisonAnyFalse(equalFlags);           
-}
-
-FORCEINLINE fltx4 CmpEqSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vcmpeqfp(a, b);
-}
-
-
-FORCEINLINE fltx4 CmpGtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vcmpgtfp(a, b);
-}
-
-FORCEINLINE fltx4 CmpGeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vcmpgefp(a, b);
-}
-
-FORCEINLINE fltx4 CmpLtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vcmpgtfp(b, a);
-}
-
-FORCEINLINE fltx4 CmpLeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vcmpgefp(b, a);
-}
-
-FORCEINLINE fltx4 CmpInBoundsSIMD(const fltx4& a, const fltx4& b)		           
-{
-	return XMVectorInBounds(a, b);
-}
-
-FORCEINLINE fltx4 MaskedAssign(const fltx4& ReplacementMask, const fltx4& NewValue, const fltx4& OldValue)
-{
-	return __vsel(OldValue, NewValue, ReplacementMask);
-}
-
-
-template< typename T, typename U >
-FORCEINLINE T PermuteVMX(T a, T b, U swizzleMask)
-{
-	return __vperm(a, b, swizzleMask);
-}
-
-FORCEINLINE fltx4 ReplicateX4(float flValue)					  
-{
-	float* pValue = &flValue;
-	Assert(pValue);
-	Assert(((unsigned int)pValue & 3) == 0);
-	return __vspltw(__lvlx(pValue, 0), 0);
-}
-
-FORCEINLINE fltx4 ReplicateX4(const float* pValue)					  
-{
-	Assert(pValue);
-	return __vspltw(__lvlx(pValue, 0), 0);
-}
-
-FORCEINLINE fltx4 ReplicateIX4(int nValue)
-{
-	int* pValue = &nValue;
-	Assert(pValue);
-	Assert(((unsigned int)pValue & 3) == 0);
-	return __vspltw(__lvlx(pValue, 0), 0);
-}
-
-FORCEINLINE fltx4 CeilSIMD(const fltx4& a)
-{
-	return __vrfip(a);
-}
-
-FORCEINLINE fltx4 RoundSIMD(const fltx4& a)
-{
-	return __vrfin(a);
-}
-
-FORCEINLINE fltx4 FloorSIMD(const fltx4& a)
-{
-	return __vrfim(a);
-}
-
-FORCEINLINE fltx4 SqrtEstSIMD(const fltx4& a)				    
-{
-	return XMVectorSqrtEst(a);
-}
-
-FORCEINLINE fltx4 SqrtSIMD(const fltx4& a)					 
-{
-	return XMVectorSqrt(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSIMD(const fltx4& a)		    
-{
-	return __vrsqrtefp(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 a_safe = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	return ReciprocalSqrtEstSIMD(a_safe);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtSIMD(const fltx4& a)			 
-{
-	return XMVectorReciprocalSqrt(a);
-}
-
-FORCEINLINE fltx4 ReciprocalEstSIMD(const fltx4& a)			    
-{
-	return __vrefp(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSIMD(const fltx4& a)				 
-{
-	return XMVectorReciprocal(a);
-}
-
-FORCEINLINE fltx4 DivSIMD(const fltx4& a, const fltx4& b)	 
-{
-	return MulSIMD(ReciprocalSIMD(b), a);
-}
-
-FORCEINLINE fltx4 DivEstSIMD(const fltx4& a, const fltx4& b)	 
-{
-	return MulSIMD(ReciprocalEstSIMD(b), a);
-}
-
-FORCEINLINE fltx4 ReciprocalEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 a_safe = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	return ReciprocalEstSIMD(a_safe);
-}
-
-FORCEINLINE fltx4 ReciprocalSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 a_safe = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	return ReciprocalSIMD(a_safe);
-
-}
-
-FORCEINLINE fltx4 ExpSIMD(const fltx4& toPower)
-{
-	return XMVectorExp(toPower);
-}
-
-FORCEINLINE fltx4 Exp2EstSIMD(const fltx4& f)
-{
-	return XMVectorExpEst(f);
-}
-
-FORCEINLINE fltx4 ClampVectorSIMD(FLTX4 in, FLTX4 min, FLTX4 max)
-{
-	return XMVectorClamp(in, min, max);
-}
-
-FORCEINLINE fltx4 LoadUnalignedSIMD(const void* pSIMD)
-{
-	return XMLoadVector4(pSIMD);
-}
-
-FORCEINLINE fltx4 LoadUnaligned3SIMD(const void* pSIMD)
-{
-	return XMLoadVector3(pSIMD);
-}
-
-FORCEINLINE fltx4 LoadUnalignedFloatSIMD(const float* pFlt)
-{
-	return __lvlx(pFlt, 0);
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const void* pSIMD)
-{
-	return *(reinterpret_cast<const fltx4*> (pSIMD));
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned& pSIMD)
-{
-	fltx4 out = XMLoadVector3A(pSIMD.Base());
-	return __vrlimi(out, __vzero(), 1, 0);
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned* RESTRICT pSIMD)
-{
-	fltx4 out = XMLoadVector3A(pSIMD);
-	return __vrlimi(out, __vzero(), 1, 0);
-}
-
-FORCEINLINE void StoreAlignedSIMD(float* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<fltx4*> (pSIMD)) = a;
-}
-
-FORCEINLINE void StoreUnalignedSIMD(float* pSIMD, const fltx4& a)
-{
-	XMStoreVector4(pSIMD, a);
-}
-
-FORCEINLINE void StoreUnaligned3SIMD(float* pSIMD, const fltx4& a)
-{
-	XMStoreVector3(pSIMD, a);
-}
-
-FORCEINLINE void StoreAligned3SIMD(VectorAligned* RESTRICT pSIMD, const fltx4& a)
-{
-	XMStoreVector3A(pSIMD->Base(), a);
-}
-
-FORCEINLINE void StoreFourUnalignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	b = __vrlimi(b, b, 15, 1);       
-	c = __vrlimi(c, c, 15, 2);       
-
-	a = __vrlimi(a, b, 1, 0);        
-	b = __vrlimi(b, c, 2 | 1, 0);      
-	c = __vrlimi(c, d, 4 | 2 | 1, 3);    
-
-	float* RESTRICT pOut = pDestination->Base();
-	StoreUnalignedSIMD(pOut + 0, a);
-	StoreUnalignedSIMD(pOut + 4, b);
-	StoreUnalignedSIMD(pOut + 8, c);
-}
-
-FORCEINLINE void StoreFourAlignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	b = __vrlimi(b, b, 15, 1);       
-	c = __vrlimi(c, c, 15, 2);       
-
-	a = __vrlimi(a, b, 1, 0);        
-	b = __vrlimi(b, c, 2 | 1, 0);      
-	c = __vrlimi(c, d, 4 | 2 | 1, 3);    
-
-	float* RESTRICT pOut = pDestination->Base();
-	StoreAlignedSIMD(pOut + 0, a);
-	StoreAlignedSIMD(pOut + 4, b);
-	StoreAlignedSIMD(pOut + 8, c);
-}
-
-FORCEINLINE void ConvertStoreAsIntsSIMD(intx4* RESTRICT pDest, const fltx4& vSrc)
-{
-	fltx4 asInt = __vctsxs(vSrc, 0);
-	XMStoreVector4A(pDest->Base(), asInt);
-}
-
-FORCEINLINE void TransposeSIMD(fltx4& x, fltx4& y, fltx4& z, fltx4& w)
-{
-	XMMATRIX xyzwMatrix = _XMMATRIX(x, y, z, w);
-	xyzwMatrix = XMMatrixTranspose(xyzwMatrix);
-	x = xyzwMatrix.r[0];
-	y = xyzwMatrix.r[1];
-	z = xyzwMatrix.r[2];
-	w = xyzwMatrix.r[3];
-}
-
-FORCEINLINE fltx4 LoadZeroSIMD(void)
-{
-	return XMVectorZero();
-}
-
-FORCEINLINE fltx4 LoadOneSIMD(void)
-{
-	return XMVectorSplatOne();
-}
-
-FORCEINLINE fltx4 SplatXSIMD(fltx4 a)
-{
-	return XMVectorSplatX(a);
-}
-
-FORCEINLINE fltx4 SplatYSIMD(fltx4 a)
-{
-	return XMVectorSplatY(a);
-}
-
-FORCEINLINE fltx4 SplatZSIMD(fltx4 a)
-{
-	return XMVectorSplatZ(a);
-}
-
-FORCEINLINE fltx4 SplatWSIMD(fltx4 a)
-{
-	return XMVectorSplatW(a);
-}
-
-FORCEINLINE fltx4 SetXSIMD(const fltx4& a, const fltx4& x)
-{
-	fltx4 result = __vrlimi(a, x, 8, 0);
-	return result;
-}
-
-FORCEINLINE fltx4 SetYSIMD(const fltx4& a, const fltx4& y)
-{
-	fltx4 result = __vrlimi(a, y, 4, 0);
-	return result;
-}
-
-FORCEINLINE fltx4 SetZSIMD(const fltx4& a, const fltx4& z)
-{
-	fltx4 result = __vrlimi(a, z, 2, 0);
-	return result;
-}
-
-FORCEINLINE fltx4 SetWSIMD(const fltx4& a, const fltx4& w)
-{
-	fltx4 result = __vrlimi(a, w, 1, 0);
-	return result;
-}
-
-FORCEINLINE fltx4 SetComponentSIMD(const fltx4& a, int nComponent, float flValue)
-{
-	static int s_nVrlimiMask[4] = { 8, 4, 2, 1 };
-	fltx4 val = ReplicateX4(flValue);
-	fltx4 result = __vrlimi(a, val, s_nVrlimiMask[nComponent], 0);
-	return result;
-}
-
-FORCEINLINE fltx4 RotateLeft(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	return __vrlimi(compareOne, a, 8 | 4 | 2 | 1, 1);
-}
-
-FORCEINLINE fltx4 RotateLeft2(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	return __vrlimi(compareOne, a, 8 | 4 | 2 | 1, 2);
-}
-
-FORCEINLINE fltx4 RotateRight(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	return __vrlimi(compareOne, a, 8 | 4 | 2 | 1, 3);
-}
-
-FORCEINLINE fltx4 RotateRight2(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	return __vrlimi(compareOne, a, 8 | 4 | 2 | 1, 2);
-}
-
-
-template < uint nBits >
-FORCEINLINE fltx4 ShiftLeftByBits(const fltx4& a)
-{
-	if (nBits >= 128)     
-	{
-		return LoadZeroSIMD();
-	}
-	else if (nBits == 0)
-	{
-		return a;
-	}
-	else if ((nBits > 7))                
-	{
-		fltx4 t = __vsldoi(a, (LoadZeroSIMD()), (nBits >> 3));     
-		return ShiftLeftByBits< (nBits & 0x7) >(t);
-	}
-	else          
-	{
-		u32x4 shifter = u32x4(__vspltisb(((signed char)(nBits & 0x7))));
-		return __vsl(a, shifter);
-	}
-}
-
-template < uint nBits >
-FORCEINLINE fltx4 ShiftRightByBits(const fltx4& a)
-{
-	if (nBits >= 128)     
-	{
-		return LoadZeroSIMD();
-	}
-	else if (nBits == 0)
-	{
-		return a;
-	}
-	else if ((nBits > 7))                
-	{
-		fltx4 t = __vsldoi((LoadZeroSIMD()), a, 16 - (nBits >> 3));                   
-		return ShiftRightByBits< (nBits & 0x7) >(t);
-	}
-	else          
-	{
-		u32x4 shifter = u32x4(__vspltisb(((signed char)(nBits & 0x7))));
-		return __vsr(a, shifter);
-	}
-}
-
-FORCEINLINE fltx4 FindLowestSIMD3(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	compareOne = __vrlimi(compareOne, a, 8 | 4, 1);
-	fltx4 retval = MinSIMD(a, compareOne);
-	compareOne = __vrlimi(compareOne, a, 8, 2);
-	retval = MinSIMD(retval, compareOne);
-	return SplatXSIMD(retval);
-}
-
-FORCEINLINE fltx4 FindHighestSIMD3(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	compareOne = __vrlimi(compareOne, a, 8 | 4, 1);
-	fltx4 retval = MaxSIMD(a, compareOne);
-	compareOne = __vrlimi(compareOne, a, 8, 2);
-	retval = MaxSIMD(retval, compareOne);
-	return SplatXSIMD(retval);
-}
-
-
-void TransformManyPointsBy(VectorAligned* RESTRICT pVectors, unsigned int numVectors, FLTX4 mRow1, FLTX4 mRow2, FLTX4 mRow3);
-
-FORCEINLINE void TransformManyPointsBy(VectorAligned* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& pMatrix)
-{
-	return TransformManyPointsBy(pVectors, numVectors,
-		LoadUnalignedSIMD(pMatrix[0]), LoadUnalignedSIMD(pMatrix[1]), LoadUnalignedSIMD(pMatrix[2]));
-}
-
-FORCEINLINE void TransformManyPointsByA(VectorAligned* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& pMatrix)
-{
-	return TransformManyPointsBy(pVectors, numVectors,
-		LoadAlignedSIMD(pMatrix[0]), LoadAlignedSIMD(pMatrix[1]), LoadAlignedSIMD(pMatrix[2]));
-}
-
-FORCEINLINE i32x4 LoadAlignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return XMLoadVector4A(pSIMD);
-}
-
-FORCEINLINE i32x4 LoadUnalignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return XMLoadVector4(pSIMD);
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(int32* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<i32x4*> (pSIMD)) = a;
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(intx4& pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<i32x4*> (pSIMD.Base())) = a;
-}
-
-FORCEINLINE void StoreUnalignedIntSIMD(int32* pSIMD, const fltx4& a)
-{
-	XMStoreVector4(pSIMD, a);
-}
-
-FORCEINLINE fltx4 LoadAndConvertUint16SIMD(const uint16* pInts)
-{
-	return XMLoadUShort4(reinterpret_cast<const XMUSHORT4*>(pInts));
-}
-
-FORCEINLINE fltx4 CompressSIMD(fltx4 const& a, fltx4 const& b)
-{
-	return XMVectorPermute(a, b, XMVectorPermuteControl(0, 2, 4, 6));
-}
-
-FORCEINLINE fltx4 Compress4SIMD(fltx4 const a, fltx4 const& b, fltx4 const& c, fltx4 const& d)
-{
-	fltx4 abcd = __vrlimi(a, b, 4, 3);      
-	abcd = __vrlimi(abcd, c, 2, 2);      
-	abcd = __vrlimi(abcd, d, 1, 1);      
-
-	return abcd;
-}
-
-
-FORCEINLINE fltx4 LoadGatherSIMD(const float& x, const float& y, const float& z, const float& w)
-{
-	fltx4 vx = __lvlx(&x, 0);
-	fltx4 vy = __lvlx(&y, 0);
-	fltx4 vz = __lvlx(&z, 0);
-	fltx4 vw = __lvlx(&w, 0);
-	return Compress4SIMD(vx, vy, vz, vw);
-}
-
-FORCEINLINE fltx4 UnsignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	return __vcfux(vSrcA, 0);
-}
-
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	return __vcfsx(vSrcA, 0);
-}
-
-#define UnsignedFixedIntConvertToFltSIMD(vSrcA, uImmed) (__vcfux( (vSrcA), (uImmed) ))
-
-#define SignedFixedIntConvertToFltSIMD(vSrcA, uImmed) (__vcfsx( (vSrcA), (uImmed) ))
-
-#define IntSetImmediateSIMD(x) (__vspltisw(x))
-
-FORCEINLINE fltx4 IntShiftLeftWordSIMD(fltx4 vSrcA, fltx4 vSrcB)
-{
-	return __vslw(vSrcA, vSrcB);
-}
-
-FORCEINLINE float SubFloat(const fltx4& a, int idx)
-{
-	const fltx4_union& a_union = (const fltx4_union&)a;
-	return a_union.m128_f32[idx];
-}
-
-FORCEINLINE float& SubFloat(fltx4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_f32[idx];
-}
-
-FORCEINLINE uint32 SubFloatConvertToInt(const fltx4& a, int idx)
-{
-	fltx4 t = __vctuxs(a, 0);
-	const fltx4_union& a_union = (const fltx4_union&)t;
-	return a_union.m128_u32[idx];
-}
-
-
-FORCEINLINE uint32 SubInt(const fltx4& a, int idx)
-{
-	const fltx4_union& a_union = (const fltx4_union&)a;
-	return a_union.m128_u32[idx];
-}
-
-FORCEINLINE uint32& SubInt(fltx4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_u32[idx];
-}
-
-#else
-
-FORCEINLINE void StoreAlignedSIMD(float* RESTRICT pSIMD, const fltx4& a)
-{
-	_mm_store_ps(pSIMD, a);
-}
-
-FORCEINLINE void StoreAlignedSIMD(short* RESTRICT pSIMD, const shortx8& a)
-{
-	_mm_store_si128((shortx8*)pSIMD, a);
-}
-FORCEINLINE void StoreUnalignedSIMD(float* RESTRICT pSIMD, const fltx4& a)
-{
-	_mm_storeu_ps(pSIMD, a);
-}
-
-FORCEINLINE void StoreUnalignedSIMD(short* RESTRICT pSIMD, const shortx8& a)
-{
-	_mm_storeu_si128((shortx8*)pSIMD, a);
-}
-
-FORCEINLINE void StoreUnalignedFloat(float* pSingleFloat, const fltx4& a)
-{
-	_mm_store_ss(pSingleFloat, a);
-}
-
-
-FORCEINLINE fltx4 RotateLeft(const fltx4& a);
-FORCEINLINE fltx4 RotateLeft2(const fltx4& a);
-
-FORCEINLINE void StoreUnaligned3SIMD(float* pSIMD, const fltx4& a)
-{
-	_mm_store_ss(pSIMD, a);
-	_mm_store_ss(pSIMD + 1, RotateLeft(a));
-	_mm_store_ss(pSIMD + 2, RotateLeft2(a));
-}
-
-
-FORCEINLINE void StoreAligned3SIMD(VectorAligned* RESTRICT pSIMD, const fltx4& a)
-{
-	StoreAlignedSIMD(pSIMD->Base(), a);
-}
-
-FORCEINLINE void StoreFourUnalignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-
-FORCEINLINE void StoreFourAlignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const void* pSIMD)
-{
-	return _mm_load_ps(reinterpret_cast<const float*> (pSIMD));
-}
-
-FORCEINLINE shortx8 LoadAlignedShortSIMD(const void* pSIMD)
-{
-	return _mm_load_si128(reinterpret_cast<const shortx8*> (pSIMD));
-}
-
-FORCEINLINE shortx8 LoadUnalignedShortSIMD(const void* pSIMD)
-{
-	return _mm_loadu_si128(reinterpret_cast<const shortx8*> (pSIMD));
-}
-
-FORCEINLINE fltx4 AndSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_and_ps(a, b);
-}
-
-FORCEINLINE fltx4 AndNotSIMD(const fltx4& a, const fltx4& b)			   
-{
-	return _mm_andnot_ps(a, b);
-}
-
-FORCEINLINE fltx4 XorSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_xor_ps(a, b);
-}
-
-FORCEINLINE fltx4 OrSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_or_ps(a, b);
-}
-
-FORCEINLINE fltx4 SetWToZeroSIMD(const fltx4& a)
-{
-	return AndSIMD(a, LoadAlignedSIMD(g_SIMD_clear_wmask));
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned& pSIMD)
-{
-	return SetWToZeroSIMD(LoadAlignedSIMD(pSIMD.Base()));
-}
-
-FORCEINLINE fltx4 LoadUnalignedSIMD(const void* pSIMD)
-{
-	return _mm_loadu_ps(reinterpret_cast<const float*>(pSIMD));
-}
-
-FORCEINLINE fltx4 LoadUnaligned3SIMD(const void* pSIMD)
-{
-	return _mm_loadu_ps(reinterpret_cast<const float*>(pSIMD));
-}
-
-FORCEINLINE fltx4 LoadUnalignedFloatSIMD(const float* pFlt)
-{
-	return _mm_load_ss(pFlt);
-}
-
-FORCEINLINE fltx4 ReplicateIX4(int i)
-{
-	fltx4 value = _mm_set_ss(*((float*)&i));;
-	return _mm_shuffle_ps(value, value, 0);
-}
-
-
-FORCEINLINE fltx4 ReplicateX4(float flValue)
-{
-	__m128 value = _mm_set_ss(flValue);
-	return _mm_shuffle_ps(value, value, 0);
-}
-
-FORCEINLINE fltx4 ReplicateX4(const float* flValue)
-{
-	__m128 value = _mm_set_ss(*flValue);
-	return _mm_shuffle_ps(value, value, 0);
-}
-
-FORCEINLINE float SubFloat(const fltx4& a, int idx)
-{
-#ifndef POSIX
-	return a.m128_f32[idx];
-#else
-	return (reinterpret_cast<float const*>(&a))[idx];
-#endif
-}
-
-FORCEINLINE float& SubFloat(fltx4& a, int idx)
-{
-#ifndef POSIX
-	return a.m128_f32[idx];
-#else
-	return (reinterpret_cast<float*>(&a))[idx];
-#endif
-}
-
-FORCEINLINE uint32 SubFloatConvertToInt(const fltx4& a, int idx)
-{
-	return (uint32)SubFloat(a, idx);
-}
-
-FORCEINLINE uint32 SubInt(const fltx4& a, int idx)
-{
-#ifndef POSIX
-	return a.m128_u32[idx];
-#else
-	return (reinterpret_cast<uint32 const*>(&a))[idx];
-#endif
-}
-
-FORCEINLINE uint32& SubInt(fltx4& a, int idx)
-{
-#ifndef POSIX
-	return a.m128_u32[idx];
-#else
-	return (reinterpret_cast<uint32*>(&a))[idx];
-#endif
-}
-
-FORCEINLINE fltx4 LoadZeroSIMD(void)
-{
-	return Four_Zeros;
-}
-
-FORCEINLINE fltx4 LoadOneSIMD(void)
-{
-	return Four_Ones;
-}
-
-FORCEINLINE fltx4 MaskedAssign(const fltx4& ReplacementMask, const fltx4& NewValue, const fltx4& OldValue)
-{
-	return OrSIMD(
-		AndSIMD(ReplacementMask, NewValue),
-		AndNotSIMD(ReplacementMask, OldValue));
-}
-
-#define MM_SHUFFLE_REV(a,b,c,d) _MM_SHUFFLE(d,c,b,a)
-
-FORCEINLINE fltx4 SplatXSIMD(fltx4 const& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(0, 0, 0, 0));
-}
-
-FORCEINLINE fltx4 SplatYSIMD(fltx4 const& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(1, 1, 1, 1));
-}
-
-FORCEINLINE fltx4 SplatZSIMD(fltx4 const& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(2, 2, 2, 2));
-}
-
-FORCEINLINE fltx4 SplatWSIMD(fltx4 const& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(3, 3, 3, 3));
-}
-
-FORCEINLINE fltx4 ShuffleXXYY(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(0, 0, 1, 1));
-}
-
-FORCEINLINE fltx4 ShuffleXYXY(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(0, 1, 0, 1));
-}
-
-FORCEINLINE fltx4 ShuffleZZWW(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(2, 2, 3, 3));
-}
-
-
-
-
-FORCEINLINE fltx4 SetXSIMD(const fltx4& a, const fltx4& x)
-{
-	fltx4 result = MaskedAssign(LoadAlignedSIMD(g_SIMD_ComponentMask[0]), x, a);
-	return result;
-}
-
-FORCEINLINE fltx4 SetYSIMD(const fltx4& a, const fltx4& y)
-{
-	fltx4 result = MaskedAssign(LoadAlignedSIMD(g_SIMD_ComponentMask[1]), y, a);
-	return result;
-}
-
-FORCEINLINE fltx4 SetZSIMD(const fltx4& a, const fltx4& z)
-{
-	fltx4 result = MaskedAssign(LoadAlignedSIMD(g_SIMD_ComponentMask[2]), z, a);
-	return result;
-}
-
-FORCEINLINE fltx4 SetWSIMD(const fltx4& a, const fltx4& w)
-{
-	fltx4 result = MaskedAssign(LoadAlignedSIMD(g_SIMD_ComponentMask[3]), w, a);
-	return result;
-}
-
-FORCEINLINE fltx4 SetComponentSIMD(const fltx4& a, int nComponent, float flValue)
-{
-	fltx4 val = ReplicateX4(flValue);
-	fltx4 result = MaskedAssign(LoadAlignedSIMD(g_SIMD_ComponentMask[nComponent]), val, a);
-	return result;
-}
-
-FORCEINLINE fltx4 RotateLeft(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(1, 2, 3, 0));
-}
-
-FORCEINLINE fltx4 RotateLeft2(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(2, 3, 0, 1));
-}
-
-FORCEINLINE fltx4 RotateRight(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(3, 0, 1, 2));
-}
-
-FORCEINLINE fltx4 RotateRight2(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(2, 3, 0, 1));
-}
-
-FORCEINLINE fltx4 AddSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_add_ps(a, b);
-}
-
-FORCEINLINE fltx4 SubSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_sub_ps(a, b);
-};
-
-FORCEINLINE fltx4 MulSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_mul_ps(a, b);
-};
-
-FORCEINLINE fltx4 DivSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_div_ps(a, b);
-};
-
-fltx4 ReciprocalEstSIMD(const fltx4& a);
-FORCEINLINE fltx4 DivEstSIMD(const fltx4& a, const fltx4& b)			 
-{
-	return MulSIMD(ReciprocalEstSIMD(b), a);
-};
-
-FORCEINLINE fltx4 MaddSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return AddSIMD(MulSIMD(a, b), c);
-}
-
-FORCEINLINE fltx4 MsubSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return SubSIMD(c, MulSIMD(a, b));
-};
-
-FORCEINLINE fltx4 Dot3SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 m = MulSIMD(a, b);
-	return AddSIMD(AddSIMD(SplatXSIMD(m), SplatYSIMD(m)), SplatZSIMD(m));
-}
-
-FORCEINLINE fltx4 Dot4SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 fl4Product = MulSIMD(a, b);
-	fltx4 fl4YXWZ = _mm_shuffle_ps(fl4Product, fl4Product, MM_SHUFFLE_REV(1, 0, 3, 2));
-	fltx4 fl4UUVV = AddSIMD(fl4Product, fl4YXWZ);       
-	fltx4 fl4VVUU = RotateLeft2(fl4UUVV);
-	return AddSIMD(fl4UUVV, fl4VVUU);
-}
-
-FORCEINLINE fltx4 SinSIMD(const fltx4& radians)
-{
-	fltx4 result;
-	SubFloat(result, 0) = sin(SubFloat(radians, 0));
-	SubFloat(result, 1) = sin(SubFloat(radians, 1));
-	SubFloat(result, 2) = sin(SubFloat(radians, 2));
-	SubFloat(result, 3) = sin(SubFloat(radians, 3));
-	return result;
-}
-
-FORCEINLINE void SinCos3SIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	SinCos(SubFloat(radians, 0), &SubFloat(sine, 0), &SubFloat(cosine, 0));
-	SinCos(SubFloat(radians, 1), &SubFloat(sine, 1), &SubFloat(cosine, 1));
-	SinCos(SubFloat(radians, 2), &SubFloat(sine, 2), &SubFloat(cosine, 2));
-}
-
-FORCEINLINE void SinCosSIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)				   
-{
-	SinCos(SubFloat(radians, 0), &SubFloat(sine, 0), &SubFloat(cosine, 0));
-	SinCos(SubFloat(radians, 1), &SubFloat(sine, 1), &SubFloat(cosine, 1));
-	SinCos(SubFloat(radians, 2), &SubFloat(sine, 2), &SubFloat(cosine, 2));
-	SinCos(SubFloat(radians, 3), &SubFloat(sine, 3), &SubFloat(cosine, 3));
-}
-
-FORCEINLINE fltx4 ArcSinSIMD(const fltx4& sine)
-{
-	fltx4 result;
-	SubFloat(result, 0) = asin(SubFloat(sine, 0));
-	SubFloat(result, 1) = asin(SubFloat(sine, 1));
-	SubFloat(result, 2) = asin(SubFloat(sine, 2));
-	SubFloat(result, 3) = asin(SubFloat(sine, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 ArcCosSIMD(const fltx4& cs)
-{
-	fltx4 result;
-	SubFloat(result, 0) = acos(SubFloat(cs, 0));
-	SubFloat(result, 1) = acos(SubFloat(cs, 1));
-	SubFloat(result, 2) = acos(SubFloat(cs, 2));
-	SubFloat(result, 3) = acos(SubFloat(cs, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 ArcTan2SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 result;
-	SubFloat(result, 0) = atan2(SubFloat(a, 0), SubFloat(b, 0));
-	SubFloat(result, 1) = atan2(SubFloat(a, 1), SubFloat(b, 1));
-	SubFloat(result, 2) = atan2(SubFloat(a, 2), SubFloat(b, 2));
-	SubFloat(result, 3) = atan2(SubFloat(a, 3), SubFloat(b, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 NegSIMD(const fltx4& a)   
-{
-	return SubSIMD(LoadZeroSIMD(), a);
-}
-
-FORCEINLINE int TestSignSIMD(const fltx4& a)								         
-{
-	return _mm_movemask_ps(a);
-}
-
-FORCEINLINE bool IsAnyNegative(const fltx4& a)							               
-{
-	return (0 != TestSignSIMD(a));
-}
-
-FORCEINLINE bool IsAnyTrue(const fltx4& a)
-{
-	return (0 != TestSignSIMD(a));
-}
-
-FORCEINLINE fltx4 CmpEqSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_cmpeq_ps(a, b);
-}
-
-FORCEINLINE fltx4 CmpGtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_cmpgt_ps(a, b);
-}
-
-FORCEINLINE fltx4 CmpGeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_cmpge_ps(a, b);
-}
-
-FORCEINLINE fltx4 CmpLtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_cmplt_ps(a, b);
-}
-
-FORCEINLINE fltx4 CmpLeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_cmple_ps(a, b);
-}
-
-FORCEINLINE bool IsAllGreaterThan(const fltx4& a, const fltx4& b)
-{
-	return	TestSignSIMD(CmpLeSIMD(a, b)) == 0;
-}
-
-FORCEINLINE bool IsAllGreaterThanOrEq(const fltx4& a, const fltx4& b)
-{
-	return	TestSignSIMD(CmpLtSIMD(a, b)) == 0;
-}
-
-FORCEINLINE bool IsAllEqual(const fltx4& a, const fltx4& b)
-{
-	return	TestSignSIMD(CmpEqSIMD(a, b)) == 0xf;
-}
-
-FORCEINLINE fltx4 CmpInBoundsSIMD(const fltx4& a, const fltx4& b)		           
-{
-	return AndSIMD(CmpLeSIMD(a, b), CmpGeSIMD(a, NegSIMD(b)));
-}
-
-FORCEINLINE fltx4 MinSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_min_ps(a, b);
-}
-
-FORCEINLINE fltx4 MaxSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_max_ps(a, b);
-}
-
-
-
-FORCEINLINE fltx4 CeilSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = ceil(SubFloat(a, 0));
-	SubFloat(retVal, 1) = ceil(SubFloat(a, 1));
-	SubFloat(retVal, 2) = ceil(SubFloat(a, 2));
-	SubFloat(retVal, 3) = ceil(SubFloat(a, 3));
-	return retVal;
-
-}
-
-fltx4 AbsSIMD(const fltx4& x);		                       
-fltx4 fabs(const fltx4& x);
-
-FORCEINLINE fltx4 FloorSIMD(const fltx4& val)
-{
-	fltx4 fl4Abs = fabs(val);
-	fltx4 ival = SubSIMD(AddSIMD(fl4Abs, Four_2ToThe23s), Four_2ToThe23s);
-	ival = MaskedAssign(CmpGtSIMD(ival, fl4Abs), SubSIMD(ival, Four_Ones), ival);
-	return XorSIMD(ival, XorSIMD(val, fl4Abs));			   
-}
-
-
-
-FORCEINLINE bool IsAnyZeros(const fltx4& a)								    
-{
-	return TestSignSIMD(CmpEqSIMD(a, Four_Zeros)) != 0;
-}
-
-inline bool IsAllZeros(const fltx4& var)
-{
-	return TestSignSIMD(CmpEqSIMD(var, Four_Zeros)) == 0xF;
-}
-
-FORCEINLINE fltx4 SqrtEstSIMD(const fltx4& a)					    
-{
-	return _mm_sqrt_ps(a);
-}
-
-FORCEINLINE fltx4 SqrtSIMD(const fltx4& a)						 
-{
-	return _mm_sqrt_ps(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSIMD(const fltx4& a)			    
-{
-	return _mm_rsqrt_ps(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 ret = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	ret = ReciprocalSqrtEstSIMD(ret);
-	return ret;
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtSIMD(const fltx4& a)				 
-{
-	fltx4 guess = ReciprocalSqrtEstSIMD(a);
-	guess = MulSIMD(guess, SubSIMD(Four_Threes, MulSIMD(a, MulSIMD(guess, guess))));
-	guess = MulSIMD(Four_PointFives, guess);
-	return guess;
-}
-
-FORCEINLINE fltx4 ReciprocalEstSIMD(const fltx4& a)				    
-{
-	return _mm_rcp_ps(a);
-}
-
-FORCEINLINE fltx4 ReciprocalEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 ret = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	ret = ReciprocalEstSIMD(ret);
-	return ret;
-}
-
-FORCEINLINE fltx4 ReciprocalSIMD(const fltx4& a)					 
-{
-	fltx4 ret = ReciprocalEstSIMD(a);
-	ret = SubSIMD(AddSIMD(ret, ret), MulSIMD(a, MulSIMD(ret, ret)));
-	return ret;
-}
-
-FORCEINLINE fltx4 ReciprocalSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 ret = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	ret = ReciprocalSIMD(ret);
-	return ret;
-}
-
-FORCEINLINE fltx4 ExpSIMD(const fltx4& toPower)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = powf(2, SubFloat(toPower, 0));
-	SubFloat(retval, 1) = powf(2, SubFloat(toPower, 1));
-	SubFloat(retval, 2) = powf(2, SubFloat(toPower, 2));
-	SubFloat(retval, 3) = powf(2, SubFloat(toPower, 3));
-
-	return retval;
-}
-
-FORCEINLINE fltx4 ClampVectorSIMD(FLTX4 in, FLTX4 min, FLTX4 max)
-{
-	return MaxSIMD(min, MinSIMD(max, in));
-}
-
-FORCEINLINE void TransposeSIMD(fltx4& x, fltx4& y, fltx4& z, fltx4& w)
-{
-	_MM_TRANSPOSE4_PS(x, y, z, w);
-}
-
-FORCEINLINE fltx4 FindLowestSIMD3(const fltx4& a)
-{
-	fltx4 compareOne = RotateLeft(a);
-	fltx4 retval = MinSIMD(a, compareOne);
-	compareOne = RotateLeft2(a);
-	retval = MinSIMD(retval, compareOne);
-	return SplatXSIMD(retval);
-
-}
-
-FORCEINLINE fltx4 FindHighestSIMD3(const fltx4& a)
-{
-	fltx4 compareOne = RotateLeft(a);
-	fltx4 retval = MaxSIMD(a, compareOne);
-	compareOne = RotateLeft2(a);
-	retval = MaxSIMD(retval, compareOne);
-	return SplatXSIMD(retval);
-
-}
-
-
-inline bool IsVector3LessThan(const fltx4& v1, const fltx4& v2)
-{
-	bi32x4 isOut = CmpLtSIMD(v1, v2);
-	return IsAnyNegative(isOut);
-}
-
-inline bool IsVector4LessThan(const fltx4& v1, const fltx4& v2)
-{
-	bi32x4 isOut = CmpLtSIMD(v1, v2);
-	return IsAnyNegative(isOut);
-}
-
-
-
-#if 0				       
-FORCEINLINE fltx4 IntSetImmediateSIMD(int to)
-{
-	fltx4 retval;
-	SubInt(retval, 0) = to;
-	SubInt(retval, 1) = to;
-	SubInt(retval, 2) = to;
-	SubInt(retval, 3) = to;
-	return retval;
-}
-#endif
-
-FORCEINLINE i32x4 LoadAlignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return _mm_load_ps(reinterpret_cast<const float*>(pSIMD));
-}
-
-FORCEINLINE i32x4 LoadUnalignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return _mm_loadu_ps(reinterpret_cast<const float*>(pSIMD));
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(int32* RESTRICT pSIMD, const fltx4& a)
-{
-	_mm_store_ps(reinterpret_cast<float*>(pSIMD), a);
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(intx4& pSIMD, const fltx4& a)
-{
-	_mm_store_ps(reinterpret_cast<float*>(pSIMD.Base()), a);
-}
-
-FORCEINLINE void StoreUnalignedIntSIMD(int32* RESTRICT pSIMD, const fltx4& a)
-{
-	_mm_storeu_ps(reinterpret_cast<float*>(pSIMD), a);
-}
-
-FORCEINLINE fltx4 CompressSIMD(fltx4 const& a, fltx4 const& b)
-{
-	return _mm_shuffle_ps(a, b, MM_SHUFFLE_REV(0, 2, 0, 2));
-}
-
-FORCEINLINE fltx4 LoadAndConvertUint16SIMD(const uint16* pInts)
-{
-#ifdef POSIX
-	fltx4 retval;
-	SubFloat(retval, 0) = pInts[0];
-	SubFloat(retval, 1) = pInts[1];
-	SubFloat(retval, 2) = pInts[2];
-	SubFloat(retval, 3) = pInts[3];
-	return retval;
-#else
-	__m128i inA = _mm_loadl_epi64((__m128i const*) pInts);                             
-	inA = _mm_unpacklo_epi16(inA, _mm_setzero_si128());       
-	return _mm_cvtepi32_ps(inA);
-#endif
-}
-
-
-FORCEINLINE fltx4 Compress4SIMD(fltx4 const a, fltx4 const& b, fltx4 const& c, fltx4 const& d)
-{
-	fltx4 aacc = _mm_shuffle_ps(a, c, MM_SHUFFLE_REV(0, 0, 0, 0));
-	fltx4 bbdd = _mm_shuffle_ps(b, d, MM_SHUFFLE_REV(0, 0, 0, 0));
-	return MaskedAssign(LoadAlignedSIMD(g_SIMD_EveryOtherMask), bbdd, aacc);
-}
-
-FORCEINLINE void ExpandSIMD(fltx4 const& a, fltx4& fl4OutA, fltx4& fl4OutB)
-{
-	fl4OutA = _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(0, 0, 1, 1));
-	fl4OutB = _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(2, 2, 3, 3));
-
-}
-
-
-FORCEINLINE fltx4 LoadGatherSIMD(const float& x, const float& y, const float& z, const float& w)
-{
-	fltx4 vx = _mm_load_ss(&x);
-	fltx4 vy = _mm_load_ss(&y);
-	fltx4 vz = _mm_load_ss(&z);
-	fltx4 vw = _mm_load_ss(&w);
-	return Compress4SIMD(vx, vy, vz, vw);
-}
-
-FORCEINLINE fltx4 UnsignedIntConvertToFltSIMD(const u32x4& vSrcA)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = ((float)SubInt(retval, 0));
-	SubFloat(retval, 1) = ((float)SubInt(retval, 1));
-	SubFloat(retval, 2) = ((float)SubInt(retval, 2));
-	SubFloat(retval, 3) = ((float)SubInt(retval, 3));
-	return retval;
-}
-
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	return  _mm_cvtepi32_ps((const __m128i&)vSrcA);
-}
-
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const shortx8& vSrcA)
-{
-	return  _mm_cvtepi32_ps(vSrcA);
-}
-
-#if 0
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = ((float)(reinterpret_cast<const int32*>(&vSrcA)[0]));
-	SubFloat(retval, 1) = ((float)(reinterpret_cast<const int32*>(&vSrcA)[1]));
-	SubFloat(retval, 2) = ((float)(reinterpret_cast<const int32*>(&vSrcA)[2]));
-	SubFloat(retval, 3) = ((float)(reinterpret_cast<const int32*>(&vSrcA)[3]));
-	return retval;
-}
-
-#endif
-
-FORCEINLINE i32x4 IntShiftLeftWordSIMD(const i32x4& vSrcA, const i32x4& vSrcB)
-{
-	i32x4 retval;
-	SubInt(retval, 0) = SubInt(vSrcA, 0) << SubInt(vSrcB, 0);
-	SubInt(retval, 1) = SubInt(vSrcA, 1) << SubInt(vSrcB, 1);
-	SubInt(retval, 2) = SubInt(vSrcA, 2) << SubInt(vSrcB, 2);
-	SubInt(retval, 3) = SubInt(vSrcA, 3) << SubInt(vSrcB, 3);
-
-
-	return retval;
-}
-
-
-FORCEINLINE void ConvertStoreAsIntsSIMD(intx4* RESTRICT pDest, const fltx4& vSrc)
-{
-#if defined(_MSC_VER) && _MSC_VER >= 1900 && defined(COMPILER_MSVC64)
-	(*pDest)[0] = (int)SubFloat(vSrc, 0);
-	(*pDest)[1] = (int)SubFloat(vSrc, 1);
-	(*pDest)[2] = (int)SubFloat(vSrc, 2);
-	(*pDest)[3] = (int)SubFloat(vSrc, 3);
-#else
-	__m64 bottom = _mm_cvttps_pi32(vSrc);
-	__m64 top = _mm_cvttps_pi32(_mm_movehl_ps(vSrc, vSrc));
-
-	*reinterpret_cast<__m64*>(&(*pDest)[0]) = bottom;
-	*reinterpret_cast<__m64*>(&(*pDest)[2]) = top;
-
-	_mm_empty();
-#endif
-}
-
-
-
-#endif
-
-FORCEINLINE void RotateLeftDoubleSIMD(fltx4& a, fltx4& b)
-{
-	a = SetWSIMD(RotateLeft(a), SplatXSIMD(b));
-	b = RotateLeft(b);
-}
-
-
-#if !defined(PLATFORM_PPC) && !defined( POSIX ) && !defined(SPU)
-#if 1         
-FORCEINLINE fltx4 operator+(FLTX4 a, FLTX4 b)
-{
-	return AddSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator-(FLTX4 a, FLTX4 b)
-{
-	return SubSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator*(FLTX4 a, FLTX4 b)
-{
-	return MulSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator&(FLTX4 a, FLTX4 b)
-{
-	return AndSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator|(FLTX4 a, FLTX4 b)
-{
-	return OrSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator^(FLTX4 a, FLTX4 b)
-{
-	return XorSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator-(FLTX4 a)
-{
-	return NegSIMD(a);
-}
-#endif  
-#endif
-
-#if defined(_X360) || defined(_PS3)
-FORCEINLINE fltx4 VectorMergeHighSIMD(fltx4 fl4SrcA, fltx4 fl4SrcB)
-{
-#if defined( _X360 )
-	return __vmrghw(fl4SrcA, fl4SrcB);
-#else
-	return vec_mergeh(fl4SrcA, fl4SrcB);
-#endif
-}
-
-FORCEINLINE fltx4 VectorMergeLowSIMD(fltx4 fl4SrcA, fltx4 fl4SrcB)
-{
-#if defined( _X360 )
-	return __vmrglw(fl4SrcA, fl4SrcB);
-#else
-	return vec_mergel(fl4SrcA, fl4SrcB);
-#endif
-}
-#endif
-
-#ifndef SPU
-struct ALIGN16 fourplanes_t
-{
-	fltx4		nX;
-	fltx4		nY;
-	fltx4		nZ;
-	fltx4		dist;
-	bi32x4		xSign;
-	bi32x4		ySign;
-	bi32x4		zSign;
-	fltx4		nXAbs;
-	fltx4		nYAbs;
-	fltx4		nZAbs;
-
-	void ComputeSignbits();
-
-	void Set4Planes(const VPlane* pPlanes);
-	void Set2Planes(const VPlane* pPlanes);
-	void Get4Planes(VPlane* pPlanesOut) const;
-	void Get2Planes(VPlane* pPlanesOut) const;
-	void GetPlane(int index, Vector* pNormal, float* pDist) const;
-	void SetPlane(int index, const Vector& vecNormal, float planeDist);
-};
-
-class ALIGN16 Frustum_t
-{
-public:
-	Frustum_t();
-	void SetPlane(int i, const Vector& vecNormal, float dist);
-	void GetPlane(int i, Vector* pNormalOut, float* pDistOut) const;
-	void SetPlanes(const VPlane* pPlanes);
-	void GetPlanes(VPlane* pPlanesOut) const;
-	bool CullBox(const Vector& mins, const Vector& maxs) const;
-	bool CullBoxCenterExtents(const Vector& center, const Vector& extents) const;
-
-	bool CullBox(const fltx4& fl4Mins, const fltx4& fl4Maxs) const;
-	bool CullBoxCenterExtents(const fltx4& fl4Center, const fltx4& fl4Extents) const;
-
-
-	bool Contains(const Vector& mins, const Vector& maxs) const;
-
-	bool Intersects(Frustum_t& otherFrustum) const;
-
-	bool Intersects(const Vector& mins, const Vector& maxs) const;
-	bool IntersectsCenterExtents(const Vector& center, const Vector& extents) const;
-
-	bool Intersects(const fltx4& fl4Mins, const fltx4& fl4Maxs) const;
-	bool IntersectsCenterExtents(const fltx4& fl4Center, const fltx4& fl4Extents) const;
-
-
-	void CreatePerspectiveFrustum(const Vector& origin, const Vector& forward,
-		const Vector& right, const Vector& up, float flZNear, float flZFar,
-		float flFovX, float flAspect);
-
-	void CreatePerspectiveFrustumFLU(const Vector& vOrigin, const Vector& vForward,
-		const Vector& vLeft, const Vector& vUp, float flZNear, float flZFar,
-		float flFovX, float flAspect);
-
-	void CreatePerspectiveFrustum(const Vector& origin, const QAngle& angles, float flZNear,
-		float flZFar, float flFovX, float flAspectRatio);
-
-	void CreateOrthoFrustum(const Vector& origin, const Vector& forward, const Vector& right, const Vector& up,
-		float flLeft, float flRight, float flBottom, float flTop, float flZNear, float flZFar);
-
-	void CreateOrthoFrustumFLU(const Vector& vOrigin, const Vector& vForward, const Vector& vLeft, const Vector& vUp,
-		float flLeft, float flRight, float flBottom, float flTop, float flZNear, float flZFar);
-
-	bool GetCorners(Vector* pPoints) const;
-
-	fourplanes_t	planes[2];
-};
-
-#endif
-
-class FourQuaternions;
-class ALIGN16 FourVectors
-{
-public:
-	fltx4 x, y, z;
-
-	FourVectors(void)
-	{
-	}
-
-	FourVectors(FourVectors const& src)
-	{
-		x = src.x;
-		y = src.y;
-		z = src.z;
-	}
-
-	explicit FORCEINLINE FourVectors(float a)
-	{
-		fltx4 aReplicated = ReplicateX4(a);
-		x = y = z = aReplicated;
-	}
-
-	FORCEINLINE void Init(void)
-	{
-		x = Four_Zeros;
-		y = Four_Zeros;
-		z = Four_Zeros;
-	}
-
-	FORCEINLINE void Init(float flX, float flY, float flZ)
-	{
-		x = ReplicateX4(flX);
-		y = ReplicateX4(flY);
-		z = ReplicateX4(flZ);
-	}
-
-	FORCEINLINE FourVectors(float flX, float flY, float flZ)
-	{
-		Init(flX, flY, flZ);
-	}
-
-	FORCEINLINE void Init(fltx4 const& fl4X, fltx4 const& fl4Y, fltx4 const& fl4Z)
-	{
-		x = fl4X;
-		y = fl4Y;
-		z = fl4Z;
-	}
-
-	FORCEINLINE FourVectors(fltx4 const& fl4X, fltx4 const& fl4Y, fltx4 const& fl4Z)
-	{
-		Init(fl4X, fl4Y, fl4Z);
-	}
-
-
-
-	FORCEINLINE FourVectors(Vector const& a, Vector const& b, Vector const& c, Vector const& d)
-	{
-		LoadAndSwizzle(a, b, c, d);
-	}
-
-	FORCEINLINE FourVectors(VectorAligned const& a, VectorAligned const& b, VectorAligned const& c, VectorAligned const& d)
-	{
-		LoadAndSwizzleAligned(a, b, c, d);
-	}
-
-	FORCEINLINE FourVectors(const float* xs, const float* ys, const float* zs) :
-		x(LoadAlignedSIMD(xs)), y(LoadAlignedSIMD(ys)), z(LoadAlignedSIMD(zs))
-	{};
-
-	FORCEINLINE void DuplicateVector(Vector const& v)			         
-	{
-		x = ReplicateX4(v.x);
-		y = ReplicateX4(v.y);
-		z = ReplicateX4(v.z);
-	}
-
-	FORCEINLINE fltx4 const& operator[](int idx) const
-	{
-		return *((&x) + idx);
-	}
-
-	FORCEINLINE fltx4& operator[](int idx)
-	{
-		return *((&x) + idx);
-	}
-
-	FORCEINLINE void operator+=(FourVectors const& b)			       
-	{
-		x = AddSIMD(x, b.x);
-		y = AddSIMD(y, b.y);
-		z = AddSIMD(z, b.z);
-	}
-
-	FORCEINLINE void operator-=(FourVectors const& b)			      
-	{
-		x = SubSIMD(x, b.x);
-		y = SubSIMD(y, b.y);
-		z = SubSIMD(z, b.z);
-	}
-
-	FORCEINLINE void operator*=(FourVectors const& b)			       
-	{
-		x = MulSIMD(x, b.x);
-		y = MulSIMD(y, b.y);
-		z = MulSIMD(z, b.z);
-	}
-
-	FORCEINLINE void operator*=(const fltx4& scale)			  
-	{
-		x = MulSIMD(x, scale);
-		y = MulSIMD(y, scale);
-		z = MulSIMD(z, scale);
-	}
-
-	FORCEINLINE void operator*=(float scale)					     
-	{
-		fltx4 scalepacked = ReplicateX4(scale);
-		*this *= scalepacked;
-	}
-
-	FORCEINLINE fltx4 operator*(FourVectors const& b) const		   
-	{
-		fltx4 dot = MulSIMD(x, b.x);
-		dot = MaddSIMD(y, b.y, dot);
-		dot = MaddSIMD(z, b.z, dot);
-		return dot;
-	}
-
-	FORCEINLINE fltx4 operator*(Vector const& b) const			        
-	{
-		fltx4 dot = MulSIMD(x, ReplicateX4(b.x));
-		dot = MaddSIMD(y, ReplicateX4(b.y), dot);
-		dot = MaddSIMD(z, ReplicateX4(b.z), dot);
-		return dot;
-	}
-
-	FORCEINLINE FourVectors operator*(float b) const					 
-	{
-		fltx4 scalepacked = ReplicateX4(b);
-		FourVectors res;
-		res.x = MulSIMD(x, scalepacked);
-		res.y = MulSIMD(y, scalepacked);
-		res.z = MulSIMD(z, scalepacked);
-		return res;
-	}
-
-	FORCEINLINE FourVectors operator*(FLTX4 fl4Scale) const					 
-	{
-		FourVectors res;
-		res.x = MulSIMD(x, fl4Scale);
-		res.y = MulSIMD(y, fl4Scale);
-		res.z = MulSIMD(z, fl4Scale);
-		return res;
-	}
-
-	FORCEINLINE void VProduct(FourVectors const& b)				    
-	{
-		x = MulSIMD(x, b.x);
-		y = MulSIMD(y, b.y);
-		z = MulSIMD(z, b.z);
-	}
-	FORCEINLINE void MakeReciprocal(void)						 
-	{
-		x = ReciprocalSIMD(x);
-		y = ReciprocalSIMD(y);
-		z = ReciprocalSIMD(z);
-	}
-
-	FORCEINLINE void MakeReciprocalSaturate(void)				  
-	{
-		x = ReciprocalSaturateSIMD(x);
-		y = ReciprocalSaturateSIMD(y);
-		z = ReciprocalSaturateSIMD(z);
-	}
-
-	inline void RotateBy(const matrix3x4_t& matrix);
-	static void RotateManyBy(FourVectors* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& rotationMatrix);
-
-	static void RotateManyBy(FourVectors* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& rotationMatrix, FourVectors* RESTRICT pOut);
-
-	inline void TransformBy(const matrix3x4_t& matrix);
-
-	static void TransformManyBy(FourVectors* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& rotationMatrix, FourVectors* RESTRICT pOut);
-
-	static void TransformManyBy(FourVectors* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& rotationMatrix);
-
-	static void CalcClosestPointOnLineSIMD(const FourVectors& P, const FourVectors& vLineA, const FourVectors& vLineB, FourVectors& vClosest, fltx4* outT = 0);
-	static fltx4 CalcClosestPointToLineTSIMD(const FourVectors& P, const FourVectors& vLineA, const FourVectors& vLineB, FourVectors& vDir);
-
-	FORCEINLINE const float& X(int idx) const
-	{
-		return SubFloat((fltx4&)x, idx);
-	}
-
-	FORCEINLINE const float& Y(int idx) const
-	{
-		return SubFloat((fltx4&)y, idx);
-	}
-
-	FORCEINLINE const float& Z(int idx) const
-	{
-		return SubFloat((fltx4&)z, idx);
-	}
-
-	FORCEINLINE float& X(int idx)
-	{
-		return SubFloat(x, idx);
-	}
-
-	FORCEINLINE float& Y(int idx)
-	{
-		return SubFloat(y, idx);
-	}
-
-	FORCEINLINE float& Z(int idx)
-	{
-		return SubFloat(z, idx);
-	}
-
-	FORCEINLINE Vector Vec(int idx) const						     
-	{
-		return Vector(X(idx), Y(idx), Z(idx));
-	}
-
-	FORCEINLINE void operator=(FourVectors const& src)
-	{
-		x = src.x;
-		y = src.y;
-		z = src.z;
-	}
-
-	FORCEINLINE void LoadAndSwizzle(Vector const& a, Vector const& b, Vector const& c, Vector const& d)
-	{
-#if defined( _X360 ) || defined(_PS3)
-		fltx4 tx = LoadUnalignedSIMD(&a.x);
-		fltx4 ty = LoadUnalignedSIMD(&b.x);
-		fltx4 tz = LoadUnalignedSIMD(&c.x);
-		fltx4 tw = LoadUnalignedSIMD(&d.x);
-		fltx4 r0 = VectorMergeHighSIMD(tx, tz);
-		fltx4 r1 = VectorMergeHighSIMD(ty, tw);
-		fltx4 r2 = VectorMergeLowSIMD(tx, tz);
-		fltx4 r3 = VectorMergeLowSIMD(ty, tw);
-
-		x = VectorMergeHighSIMD(r0, r1);
-		y = VectorMergeLowSIMD(r0, r1);
-		z = VectorMergeHighSIMD(r2, r3);
-#else
-		x = LoadUnalignedSIMD(&(a.x));
-		y = LoadUnalignedSIMD(&(b.x));
-		z = LoadUnalignedSIMD(&(c.x));
-		fltx4 w = LoadUnalignedSIMD(&(d.x));
-		TransposeSIMD(x, y, z, w);
-#endif
-	}
-
-	FORCEINLINE void LoadAndSwizzle(Vector const& a)
-	{
-		LoadAndSwizzle(a, a, a, a);
-	}
-
-	FORCEINLINE void Load(const float& a, const float& b, const float& c, const float& d)
-	{
-#if defined( _X360 ) || defined( _PS3 )
-		fltx4 temp[4];
-		temp[0] = LoadUnalignedFloatSIMD(&a);
-		temp[1] = LoadUnalignedFloatSIMD(&b);
-		temp[2] = LoadUnalignedFloatSIMD(&c);
-		temp[3] = LoadUnalignedFloatSIMD(&d);
-		y = VectorMergeHighSIMD(temp[0], temp[2]);  
-		z = VectorMergeHighSIMD(temp[1], temp[3]);  
-
-		x = VectorMergeHighSIMD(y, z);  
-		y = x;
-		z = x;
-#else
-		ALIGN16 float temp[4];
-		temp[0] = a; temp[1] = b; temp[2] = c; temp[3] = d;
-		fltx4 v = LoadAlignedSIMD(temp);
-		x = v;
-		y = v;
-		z = v;
-#endif
-	}
-
-	FORCEINLINE void LoadAndSwizzle(FLTX4 a, FLTX4 b, FLTX4 c, FLTX4 d)
-	{
-#if defined( _X360 ) || defined( _PS3 )
-		fltx4 tx = a;
-		fltx4 ty = b;
-		fltx4 tz = c;
-		fltx4 tw = d;
-		fltx4 r0 = VectorMergeHighSIMD(tx, tz);
-		fltx4 r1 = VectorMergeHighSIMD(ty, tw);
-		fltx4 r2 = VectorMergeLowSIMD(tx, tz);
-		fltx4 r3 = VectorMergeLowSIMD(ty, tw);
-
-		x = VectorMergeHighSIMD(r0, r1);
-		y = VectorMergeLowSIMD(r0, r1);
-		z = VectorMergeHighSIMD(r2, r3);
-#else
-		x = a;
-		y = b;
-		z = c;
-		fltx4 w = d;
-		TransposeSIMD(x, y, z, w);
-#endif
-	}
-
-	FORCEINLINE void LoadAndSwizzleAligned(const float* RESTRICT a, const float* RESTRICT b, const float* RESTRICT c, const float* RESTRICT d)
-	{
-#if defined( _X360 ) || defined( _PS3 )
-		fltx4 tx = LoadAlignedSIMD(a);
-		fltx4 ty = LoadAlignedSIMD(b);
-		fltx4 tz = LoadAlignedSIMD(c);
-		fltx4 tw = LoadAlignedSIMD(d);
-		fltx4 r0 = VectorMergeHighSIMD(tx, tz);
-		fltx4 r1 = VectorMergeHighSIMD(ty, tw);
-		fltx4 r2 = VectorMergeLowSIMD(tx, tz);
-		fltx4 r3 = VectorMergeLowSIMD(ty, tw);
-
-		x = VectorMergeHighSIMD(r0, r1);
-		y = VectorMergeLowSIMD(r0, r1);
-		z = VectorMergeHighSIMD(r2, r3);
-#else
-		x = LoadAlignedSIMD(a);
-		y = LoadAlignedSIMD(b);
-		z = LoadAlignedSIMD(c);
-		fltx4 w = LoadAlignedSIMD(d);
-		TransposeSIMD(x, y, z, w);
-#endif
-	}
-
-	FORCEINLINE void LoadAndSwizzleAligned(Vector const& a, Vector const& b, Vector const& c, Vector const& d)
-	{
-		LoadAndSwizzleAligned(&a.x, &b.x, &c.x, &d.x);
-	}
-
-	FORCEINLINE void TransposeOnto(fltx4& out0, fltx4& out1, fltx4& out2, fltx4& out3, FLTX4 w = Four_Zeros) const
-	{
-#if defined( _X360 ) || defined(_PS3)
-		fltx4 r0 = VectorMergeHighSIMD(x, z);
-		fltx4 r1 = VectorMergeHighSIMD(y, w);
-		fltx4 r2 = VectorMergeLowSIMD(x, z);
-		fltx4 r3 = VectorMergeLowSIMD(y, w);
-
-		out0 = VectorMergeHighSIMD(r0, r1);
-		out1 = VectorMergeLowSIMD(r0, r1);
-		out2 = VectorMergeHighSIMD(r2, r3);
-		out3 = VectorMergeLowSIMD(r2, r3);
-#else
-		out0 = x;
-		out1 = y;
-		out2 = z;
-		out3 = w;
-
-		TransposeSIMD(out0, out1, out2, out3);
-#endif
-	}
-
-#if !defined(__SPU__)
-	FORCEINLINE void StoreUnalignedVector3SIMD(Vector* RESTRICT out0, Vector* RESTRICT out1, Vector* RESTRICT out2, Vector* RESTRICT out3) const;
-#endif
-
-	FORCEINLINE void StoreAlignedVectorSIMD(VectorAligned* RESTRICT out0, VectorAligned* RESTRICT out1, VectorAligned* RESTRICT out2, VectorAligned* RESTRICT out3) const;
-
-#if !defined(__SPU__)
-	FORCEINLINE void StoreUnalignedContigVector3SIMD(Vector* RESTRICT pDestination)
-	{
-		fltx4 a, b, c, d;
-		TransposeOnto(a, b, c, d);
-		StoreFourUnalignedVector3SIMD(a, b, c, d, pDestination);
-	}
-#endif
-
-#if !defined(__SPU__)
-	FORCEINLINE void StoreAlignedContigVector3SIMD(Vector* RESTRICT pDestination)
-	{
-		fltx4 a, b, c, d;
-		TransposeOnto(a, b, c, d);
-		StoreFourAlignedVector3SIMD(a, b, c, d, pDestination);
-	}
-
-	FORCEINLINE void StoreAlignedContigVectorASIMD(VectorAligned* RESTRICT pDestination)
-	{
-		StoreAlignedVectorSIMD(pDestination, pDestination + 1, pDestination + 2, pDestination + 3);
-	}
-#endif
-
-	FORCEINLINE fltx4 LengthSqr(void) const
-	{
-		const FourVectors& a = *this;
-		return a * a;
-	}
-
-	FORCEINLINE fltx4 length2(void) const
-	{
-		return (*this) * (*this);
-	}
-
-	FORCEINLINE fltx4 length(void) const
-	{
-		return SqrtEstSIMD(length2());
-	}
-
-	FORCEINLINE fltx4 Length(void) const
-	{
-		return SqrtSIMD(length2());
-	}
-
-
-	FORCEINLINE void VectorNormalizeFast(void)
-	{
-		fltx4 mag_sq = (*this) * (*this);						 
-		(*this) *= ReciprocalSqrtEstSIMD(mag_sq);			 
-	}
-
-	FORCEINLINE void VectorNormalize(void)
-	{
-		fltx4 mag_sq = (*this) * (*this);						 
-		(*this) *= ReciprocalSqrtSIMD(mag_sq);				 
-	}
-
-	FORCEINLINE fltx4 DistToSqr(FourVectors const& pnt)
-	{
-		fltx4 fl4dX = SubSIMD(pnt.x, x);
-		fltx4 fl4dY = SubSIMD(pnt.y, y);
-		fltx4 fl4dZ = SubSIMD(pnt.z, z);
-		return AddSIMD(MulSIMD(fl4dX, fl4dX), AddSIMD(MulSIMD(fl4dY, fl4dY), MulSIMD(fl4dZ, fl4dZ)));
-
-	}
-
-	FORCEINLINE fltx4 TValueOfClosestPointOnLine(FourVectors const& p0, FourVectors const& p1) const
-	{
-		FourVectors lineDelta = p1;
-		lineDelta -= p0;
-		fltx4 OOlineDirDotlineDir = ReciprocalSIMD(p1 * p1);
-		FourVectors v4OurPnt = *this;
-		v4OurPnt -= p0;
-		return MulSIMD(OOlineDirDotlineDir, v4OurPnt * lineDelta);
-	}
-
-	FORCEINLINE fltx4 DistSqrToLineSegment(FourVectors const& p0, FourVectors const& p1) const
-	{
-		FourVectors lineDelta = p1;
-		FourVectors v4OurPnt = *this;
-		v4OurPnt -= p0;
-		lineDelta -= p0;
-
-		fltx4 OOlineDirDotlineDir = ReciprocalSIMD(lineDelta * lineDelta);
-
-		fltx4 fl4T = MulSIMD(OOlineDirDotlineDir, v4OurPnt * lineDelta);
-
-		fl4T = MinSIMD(fl4T, Four_Ones);
-		fl4T = MaxSIMD(fl4T, Four_Zeros);
-		lineDelta *= fl4T;
-		return v4OurPnt.DistToSqr(lineDelta);
-	}
-	FORCEINLINE FourVectors Normalized()const
-	{
-		fltx4 fl4LengthInv = ReciprocalSqrtSIMD(LengthSqr());
-		FourVectors out;
-		out.x = x * fl4LengthInv;
-		out.y = y * fl4LengthInv;
-		out.z = z * fl4LengthInv;
-		return out;
-	}
-
-	FORCEINLINE FourVectors NormalizedSafeX() const
-	{
-		fltx4 f4LenSqr = LengthSqr();
-		fltx4 isBigEnough = CmpGeSIMD(f4LenSqr, Four_Epsilons);
-		fltx4 fl4LengthInv = ReciprocalSqrtSIMD(f4LenSqr);
-		FourVectors out;
-		out.x = MaskedAssign(isBigEnough, x * fl4LengthInv, Four_Ones);
-		out.y = AndSIMD(y * fl4LengthInv, isBigEnough);
-		out.z = AndSIMD(z * fl4LengthInv, isBigEnough);
-		return out;
-	}
-	FORCEINLINE FourVectors NormalizedSafeY() const
-	{
-		fltx4 f4LenSqr = LengthSqr();
-		fltx4 isBigEnough = CmpGeSIMD(f4LenSqr, Four_Epsilons);
-		fltx4 fl4LengthInv = ReciprocalSqrtSIMD(f4LenSqr);
-		FourVectors out;
-		out.x = AndSIMD(x * fl4LengthInv, isBigEnough);
-		out.y = MaskedAssign(isBigEnough, y * fl4LengthInv, Four_Ones);
-		out.z = AndSIMD(z * fl4LengthInv, isBigEnough);
-		return out;
-	}
-
-	FORCEINLINE FourVectors NormalizedSafeZ() const
-	{
-		fltx4 f4LenSqr = LengthSqr();
-		fltx4 isBigEnough = CmpGeSIMD(f4LenSqr, Four_Epsilons);
-		fltx4 fl4LengthInv = ReciprocalSqrtSIMD(f4LenSqr);
-		FourVectors out;
-		out.x = AndSIMD(x * fl4LengthInv, isBigEnough);
-		out.y = AndSIMD(y * fl4LengthInv, isBigEnough);
-		out.z = MaskedAssign(isBigEnough, z * fl4LengthInv, Four_Ones);
-		return out;
-	}
-};
-
-
-inline FourVectors CrossProduct(const FourVectors& a, const FourVectors& b)
-{
-	return FourVectors(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x);
-}
-
-inline fltx4 DotProduct(const FourVectors& a, const FourVectors& b)
-{
-	return a.x * b.x + a.y * b.y + a.z * b.z;
-}
-
-inline FourVectors operator * (fltx4 left, const FourVectors& right)
-{
-	return right * left;
-}
-
-
-inline FourVectors Mul(const FourVectors& a, const fltx4& b)
-{
-	FourVectors ret;
-	ret.x = MulSIMD(a.x, b);
-	ret.y = MulSIMD(a.y, b);
-	ret.z = MulSIMD(a.z, b);
-	return ret;
-}
-
-inline FourVectors Mul(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = MulSIMD(a.x, b.x);
-	ret.y = MulSIMD(a.y, b.y);
-	ret.z = MulSIMD(a.z, b.z);
-	return ret;
-}
-
-inline FourVectors Madd(const FourVectors& a, const fltx4& b, const FourVectors& c)	   
-{
-	FourVectors ret;
-	ret.x = MaddSIMD(a.x, b, c.x);
-	ret.y = MaddSIMD(a.y, b, c.y);
-	ret.z = MaddSIMD(a.z, b, c.z);
-	return ret;
-}
-
-inline FourVectors operator ^(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = SubSIMD(MulSIMD(a.y, b.z), MulSIMD(a.z, b.y));
-	ret.y = SubSIMD(MulSIMD(a.z, b.x), MulSIMD(a.x, b.z));
-	ret.z = SubSIMD(MulSIMD(a.x, b.y), MulSIMD(a.y, b.x));
-	return ret;
-}
-
-inline FourVectors operator-(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = SubSIMD(a.x, b.x);
-	ret.y = SubSIMD(a.y, b.y);
-	ret.z = SubSIMD(a.z, b.z);
-	return ret;
-}
-
-inline FourVectors operator+(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = AddSIMD(a.x, b.x);
-	ret.y = AddSIMD(a.y, b.y);
-	ret.z = AddSIMD(a.z, b.z);
-	return ret;
-}
-
-inline FourVectors maximum(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = MaxSIMD(a.x, b.x);
-	ret.y = MaxSIMD(a.y, b.y);
-	ret.z = MaxSIMD(a.z, b.z);
-	return ret;
-}
-
-inline FourVectors minimum(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = MinSIMD(a.x, b.x);
-	ret.y = MinSIMD(a.y, b.y);
-	ret.z = MinSIMD(a.z, b.z);
-	return ret;
-}
-
-FORCEINLINE FourVectors RotateLeft(const FourVectors& src)
-{
-	FourVectors ret;
-	ret.x = RotateLeft(src.x);
-	ret.y = RotateLeft(src.y);
-	ret.z = RotateLeft(src.z);
-	return ret;
-}
-
-FORCEINLINE FourVectors RotateRight(const FourVectors& src)
-{
-	FourVectors ret;
-	ret.x = RotateRight(src.x);
-	ret.y = RotateRight(src.y);
-	ret.z = RotateRight(src.z);
-	return ret;
-}
-FORCEINLINE FourVectors MaskedAssign(const bi32x4& ReplacementMask, const FourVectors& NewValue, const FourVectors& OldValue)
-{
-	FourVectors ret;
-	ret.x = MaskedAssign(ReplacementMask, NewValue.x, OldValue.x);
-	ret.y = MaskedAssign(ReplacementMask, NewValue.y, OldValue.y);
-	ret.z = MaskedAssign(ReplacementMask, NewValue.z, OldValue.z);
-	return ret;
-}
-
-FORCEINLINE FourVectors VectorReflect(const FourVectors& incident, const FourVectors& normal)
-{
-	FourVectors ret = incident;
-	fltx4 iDotNx2 = incident * normal;
-	iDotNx2 = AddSIMD(iDotNx2, iDotNx2);
-	FourVectors nPart = normal;
-	nPart *= iDotNx2;
-	ret -= nPart;											 
-	return ret;
-}
-
-FORCEINLINE FourVectors VectorSlide(const FourVectors& incident, const FourVectors& normal)
-{
-	FourVectors ret = incident;
-	fltx4 iDotN = incident * normal;
-	FourVectors nPart = normal;
-	nPart *= iDotN;
-	ret -= nPart;											 
-	return ret;
-}
-
-FORCEINLINE FourVectors VectorNormalizeFast(const FourVectors& src)
-{
-	fltx4 mag_sq = ReciprocalSqrtEstSIMD(src * src);					 
-	FourVectors result;
-	result.x = MulSIMD(src.x, mag_sq);
-	result.y = MulSIMD(src.y, mag_sq);
-	result.z = MulSIMD(src.z, mag_sq);
-	return result;
-}
-
-#if !defined(__SPU__)
-FORCEINLINE void FourVectors::StoreUnalignedVector3SIMD(Vector* RESTRICT out0, Vector* RESTRICT out1, Vector* RESTRICT out2, Vector* RESTRICT out3) const
-{
-#ifdef _X360
-	fltx4 x0, x1, x2, x3, y0, y1, y2, y3, z0, z1, z2, z3;
-	x0 = SplatXSIMD(x);   
-	x1 = SplatYSIMD(x);
-	x2 = SplatZSIMD(x);
-	x3 = SplatWSIMD(x);
-
-	y0 = SplatXSIMD(y);
-	y1 = SplatYSIMD(y);
-	y2 = SplatZSIMD(y);
-	y3 = SplatWSIMD(y);
-
-	z0 = SplatXSIMD(z);
-	z1 = SplatYSIMD(z);
-	z2 = SplatZSIMD(z);
-	z3 = SplatWSIMD(z);
-
-	__stvewx(x0, out0->Base(), 0);     
-	__stvewx(y0, out0->Base(), 4);     
-	__stvewx(z0, out0->Base(), 8);     
-
-	__stvewx(x1, out1->Base(), 0);     
-	__stvewx(y1, out1->Base(), 4);     
-	__stvewx(z1, out1->Base(), 8);     
-
-	__stvewx(x2, out2->Base(), 0);     
-	__stvewx(y2, out2->Base(), 4);     
-	__stvewx(z2, out2->Base(), 8);     
-
-	__stvewx(x3, out3->Base(), 0);     
-	__stvewx(y3, out3->Base(), 4);     
-	__stvewx(z3, out3->Base(), 8);     
-#else
-	fltx4 a, b, c, d;
-	TransposeOnto(a, b, c, d);
-	StoreUnaligned3SIMD(out0->Base(), a);
-	StoreUnaligned3SIMD(out1->Base(), b);
-	StoreUnaligned3SIMD(out2->Base(), c);
-	StoreUnaligned3SIMD(out3->Base(), d);
-#endif
-}
-
-FORCEINLINE void FourVectors::StoreAlignedVectorSIMD(VectorAligned* RESTRICT out0, VectorAligned* RESTRICT out1, VectorAligned* RESTRICT out2, VectorAligned* RESTRICT out3) const
-{
-	fltx4 a, b, c, d;
-	TransposeOnto(a, b, c, d);
-	StoreAligned3SIMD(out0, a);
-	StoreAligned3SIMD(out1, b);
-	StoreAligned3SIMD(out2, c);
-	StoreAligned3SIMD(out3, d);
-
-}
-#endif
-
-#if !defined(__SPU__)
-void FourVectors::RotateBy(const matrix3x4_t& matrix)
-{
-	fltx4 matSplat00, matSplat01, matSplat02,
-		matSplat10, matSplat11, matSplat12,
-		matSplat20, matSplat21, matSplat22;
-
-	fltx4 matCol0 = LoadUnalignedSIMD(matrix[0]);
-	fltx4 matCol1 = LoadUnalignedSIMD(matrix[1]);
-	fltx4 matCol2 = LoadUnalignedSIMD(matrix[2]);
-
-	matSplat00 = SplatXSIMD(matCol0);
-	matSplat01 = SplatYSIMD(matCol0);
-	matSplat02 = SplatZSIMD(matCol0);
-
-	matSplat10 = SplatXSIMD(matCol1);
-	matSplat11 = SplatYSIMD(matCol1);
-	matSplat12 = SplatZSIMD(matCol1);
-
-	matSplat20 = SplatXSIMD(matCol2);
-	matSplat21 = SplatYSIMD(matCol2);
-	matSplat22 = SplatZSIMD(matCol2);
-
-	fltx4 outX, outY, outZ;
-	outX = AddSIMD(AddSIMD(MulSIMD(x, matSplat00), MulSIMD(y, matSplat01)), MulSIMD(z, matSplat02));
-	outY = AddSIMD(AddSIMD(MulSIMD(x, matSplat10), MulSIMD(y, matSplat11)), MulSIMD(z, matSplat12));
-	outZ = AddSIMD(AddSIMD(MulSIMD(x, matSplat20), MulSIMD(y, matSplat21)), MulSIMD(z, matSplat22));
-
-	x = outX;
-	y = outY;
-	z = outZ;
-}
-
-
-void FourVectors::TransformBy(const matrix3x4_t& matrix)
-{
-	fltx4 matSplat00, matSplat01, matSplat02,
-		matSplat10, matSplat11, matSplat12,
-		matSplat20, matSplat21, matSplat22;
-
-	fltx4 matCol0 = LoadUnalignedSIMD(matrix[0]);
-	fltx4 matCol1 = LoadUnalignedSIMD(matrix[1]);
-	fltx4 matCol2 = LoadUnalignedSIMD(matrix[2]);
-
-	matSplat00 = SplatXSIMD(matCol0);
-	matSplat01 = SplatYSIMD(matCol0);
-	matSplat02 = SplatZSIMD(matCol0);
-
-	matSplat10 = SplatXSIMD(matCol1);
-	matSplat11 = SplatYSIMD(matCol1);
-	matSplat12 = SplatZSIMD(matCol1);
-
-	matSplat20 = SplatXSIMD(matCol2);
-	matSplat21 = SplatYSIMD(matCol2);
-	matSplat22 = SplatZSIMD(matCol2);
-
-	fltx4 outX, outY, outZ;
-
-	outX = MaddSIMD(z, matSplat02, AddSIMD(MulSIMD(x, matSplat00), MulSIMD(y, matSplat01)));
-	outY = MaddSIMD(z, matSplat12, AddSIMD(MulSIMD(x, matSplat10), MulSIMD(y, matSplat11)));
-	outZ = MaddSIMD(z, matSplat22, AddSIMD(MulSIMD(x, matSplat20), MulSIMD(y, matSplat21)));
-
-	x = AddSIMD(outX, ReplicateX4(matrix[0][3]));
-	y = AddSIMD(outY, ReplicateX4(matrix[1][3]));
-	z = AddSIMD(outZ, ReplicateX4(matrix[2][3]));
-}
-#endif
-
-fltx4 NoiseSIMD(FourVectors const& v);
-
-FourVectors DNoiseSIMD(FourVectors const& v);
-
-FourVectors CurlNoiseSIMD(FourVectors const& v);
-
-
-fltx4 NoiseSIMD(const fltx4& x, const fltx4& y, const fltx4& z);
-
-
-inline fltx4 fabs(const fltx4& x)
-{
-	return AndSIMD(x, LoadAlignedSIMD(g_SIMD_clear_signmask));
-}
-
-inline fltx4 AbsSIMD(const fltx4& x)
-{
-	return fabs(x);
-}
-
-inline fltx4 fnegate(const fltx4& x)
-{
-	return XorSIMD(x, LoadAlignedSIMD(g_SIMD_signmask));
-}
-
-fltx4 Pow_FixedPoint_Exponent_SIMD(const fltx4& x, int exponent);
-
-inline fltx4 PowSIMD(const fltx4& x, float exponent)
-{
-	return Pow_FixedPoint_Exponent_SIMD(x, (int)(4.0 * exponent));
-}
-
-inline fltx4 LinearToGammaSIMD(fltx4 x)
-{
-	x = MaxSIMD(MinSIMD(Four_Ones, x), Four_Zeros);
-	return AddSIMD(Four_LinearToGammaCoefficients_E,
-		MulSIMD(x, AddSIMD(Four_LinearToGammaCoefficients_D,
-			MulSIMD(x, AddSIMD(Four_LinearToGammaCoefficients_C,
-				MulSIMD(x, AddSIMD(Four_LinearToGammaCoefficients_B,
-					MulSIMD(x, Four_LinearToGammaCoefficients_A))))))));
-}
-
-
-inline fltx4 GammaToLinearSIMD(fltx4 x)
-{
-	x = MaxSIMD(x, Four_Zeros);
-	x = AddSIMD(Four_GammaToLinearCoefficients_D,
-		MulSIMD(x, AddSIMD(Four_GammaToLinearCoefficients_C,
-			MulSIMD(x, AddSIMD(Four_GammaToLinearCoefficients_B,
-				MulSIMD(x, Four_GammaToLinearCoefficients_A))))));
-	return MinSIMD(x, Four_Ones);
-}
-
-inline fltx4 GammaToLinearExtendedSIMD(fltx4 x)
-{
-	x = MaxSIMD(x, Four_Zeros);
-	fltx4 fl4Ret = AddSIMD(Four_GammaToLinearCoefficients_D,
-		MulSIMD(x, AddSIMD(Four_GammaToLinearCoefficients_C,
-			MulSIMD(x, AddSIMD(Four_GammaToLinearCoefficients_B,
-				MulSIMD(x, Four_GammaToLinearCoefficients_A))))));
-	return MaskedAssign(CmpGeSIMD(x, Four_Ones), x, fl4Ret);
-}
-
-void SeedRandSIMD(uint32 seed);								     
-fltx4 RandSIMD(int nContext = 0);							       
-
-int GetSIMDRandContext(void);
-void ReleaseSIMDRandContext(int nContext);
-
-FORCEINLINE fltx4 RandSignedSIMD(void)					 
-{
-	return SubSIMD(MulSIMD(Four_Twos, RandSIMD()), Four_Ones);
-}
-
-
-FORCEINLINE fltx4 LerpSIMD(const fltx4& percent, const fltx4& a, const fltx4& b)
-{
-	return AddSIMD(a, MulSIMD(SubSIMD(b, a), percent));
-}
-
-FORCEINLINE fltx4 RemapValClampedSIMD(const fltx4& val, const fltx4& a, const fltx4& b, const fltx4& c, const fltx4& d)                 
-{
-	fltx4 range = MaskedAssign(CmpEqSIMD(a, b), Four_Ones, SubSIMD(b, a));     
-	fltx4 cVal = MaxSIMD(Four_Zeros, MinSIMD(Four_Ones, DivSIMD(SubSIMD(val, a), range))); 
-	return LerpSIMD(cVal, c, d);
-}
-
-inline fltx4 SimpleSpline(const fltx4& value)
-{
-	fltx4 valueDoubled = MulSIMD(value, Four_Twos);
-	fltx4 valueSquared = MulSIMD(value, value);
-
-	return SubSIMD(
-		MulSIMD(Four_Threes, valueSquared),
-		MulSIMD(valueDoubled, valueSquared));
-}
-
-inline fltx4 SimpleSplineRemapValWithDeltas(const fltx4& val,
-	const fltx4& A, const fltx4& BMinusA,
-	const fltx4& OneOverBMinusA, const fltx4& C,
-	const fltx4& DMinusC)
-{
-	fltx4 cVal = MulSIMD(SubSIMD(val, A), OneOverBMinusA);
-	return AddSIMD(C, MulSIMD(DMinusC, SimpleSpline(cVal)));
-}
-
-inline fltx4 SimpleSplineRemapValWithDeltasClamped(const fltx4& val,
-	const fltx4& A, const fltx4& BMinusA,
-	const fltx4& OneOverBMinusA, const fltx4& C,
-	const fltx4& DMinusC)
-{
-	fltx4 cVal = MulSIMD(SubSIMD(val, A), OneOverBMinusA);
-	cVal = MinSIMD(Four_Ones, MaxSIMD(Four_Zeros, cVal));
-	return AddSIMD(C, MulSIMD(DMinusC, SimpleSpline(cVal)));
-}
-
-FORCEINLINE fltx4 FracSIMD(const fltx4& val)
-{
-	fltx4 fl4Abs = fabs(val);
-	fltx4 ival = SubSIMD(AddSIMD(fl4Abs, Four_2ToThe23s), Four_2ToThe23s);
-	ival = MaskedAssign(CmpGtSIMD(ival, fl4Abs), SubSIMD(ival, Four_Ones), ival);
-	return XorSIMD(SubSIMD(fl4Abs, ival), XorSIMD(val, fl4Abs));			   
-}
-
-#ifndef SPU
-FORCEINLINE fltx4 Mod2SIMD(const fltx4& val)
-{
-	fltx4 fl4Abs = fabs(val);
-	fltx4 ival = SubSIMD(AndSIMD(LoadAlignedSIMD((float*)g_SIMD_lsbmask), AddSIMD(fl4Abs, Four_2ToThe23s)), Four_2ToThe23s);
-	ival = MaskedAssign(CmpGtSIMD(ival, fl4Abs), SubSIMD(ival, Four_Twos), ival);
-	return XorSIMD(SubSIMD(fl4Abs, ival), XorSIMD(val, fl4Abs));			   
-}
-#endif
-
-FORCEINLINE fltx4 Mod2SIMDPositiveInput(const fltx4& val)
-{
-	fltx4 ival = SubSIMD(AndSIMD(LoadAlignedSIMD(g_SIMD_lsbmask), AddSIMD(val, Four_2ToThe23s)), Four_2ToThe23s);
-	ival = MaskedAssign(CmpGtSIMD(ival, val), SubSIMD(ival, Four_Twos), ival);
-	return SubSIMD(val, ival);
-}
-
-
-FORCEINLINE fltx4 _SinEst01SIMD(const fltx4& val)
-{
-	return MulSIMD(val, SubSIMD(Four_Fours, MulSIMD(val, Four_Fours)));
-}
-
-FORCEINLINE fltx4 _Sin01SIMD(const fltx4& val)
-{
-	fltx4 fl4BadEst = MulSIMD(val, SubSIMD(Four_Fours, MulSIMD(val, Four_Fours)));
-	return AddSIMD(MulSIMD(Four_Point225s, SubSIMD(MulSIMD(fl4BadEst, fl4BadEst), fl4BadEst)), fl4BadEst);
-}
-
-FORCEINLINE fltx4 SinEst01SIMD(const fltx4& val)
-{
-	fltx4 fl4Abs = fabs(val);
-	fltx4 fl4Reduced2 = Mod2SIMDPositiveInput(fl4Abs);
-	bi32x4 fl4OddMask = CmpGeSIMD(fl4Reduced2, Four_Ones);
-	fltx4 fl4val = SubSIMD(fl4Reduced2, AndSIMD(Four_Ones, fl4OddMask));
-	fltx4 fl4Sin = _SinEst01SIMD(fl4val);
-	fl4Sin = XorSIMD(fl4Sin, AndSIMD(LoadAlignedSIMD(g_SIMD_signmask), XorSIMD(val, fl4OddMask)));
-	return fl4Sin;
-
-}
-
-FORCEINLINE fltx4 Sin01SIMD(const fltx4& val)
-{
-	fltx4 fl4Abs = fabs(val);
-	fltx4 fl4Reduced2 = Mod2SIMDPositiveInput(fl4Abs);
-	bi32x4 fl4OddMask = CmpGeSIMD(fl4Reduced2, Four_Ones);
-	fltx4 fl4val = SubSIMD(fl4Reduced2, AndSIMD(Four_Ones, fl4OddMask));
-	fltx4 fl4Sin = _Sin01SIMD(fl4val);
-	fl4Sin = XorSIMD(fl4Sin, AndSIMD(LoadAlignedSIMD(g_SIMD_signmask), XorSIMD(val, fl4OddMask)));
-	return fl4Sin;
-
-}
-
-FORCEINLINE fltx4 NatExpSIMD(const fltx4& val)			         
-{
-	fltx4 fl4Result;
-	SubFloat(fl4Result, 0) = exp(SubFloat(val, 0));
-	SubFloat(fl4Result, 1) = exp(SubFloat(val, 1));
-	SubFloat(fl4Result, 2) = exp(SubFloat(val, 2));
-	SubFloat(fl4Result, 3) = exp(SubFloat(val, 3));
-	return fl4Result;
-}
-
-FORCEINLINE fltx4 PreCalcBiasParameter(const fltx4& bias_parameter)
-{
-	return SubSIMD(ReciprocalSIMD(bias_parameter), Four_Twos);
-}
-
-FORCEINLINE fltx4 BiasSIMD(const fltx4& val, const fltx4& precalc_param)
-{
-	return DivSIMD(val, AddSIMD(MulSIMD(precalc_param, SubSIMD(Four_Ones, val)), Four_Ones));
-}
-
-#ifndef SPU
-FORCEINLINE int BoxOnPlaneSideSIMD(const fltx4& emins, const fltx4& emaxs, const cplane_t* p, float tolerance = 0.f)
-{
-	fltx4 corners[2];
-	fltx4 normal = LoadUnalignedSIMD(p->normal.Base());
-	fltx4 dist = ReplicateX4(-p->dist);
-	normal = SetWSIMD(normal, dist);
-	fltx4 t4 = ReplicateX4(tolerance);
-	fltx4 negt4 = ReplicateX4(-tolerance);
-	bi32x4 cmp = CmpGeSIMD(normal, Four_Zeros);
-	corners[0] = MaskedAssign(cmp, emaxs, emins);
-	corners[1] = MaskedAssign(cmp, emins, emaxs);
-	fltx4 dot1 = Dot4SIMD(normal, corners[0]);
-	fltx4 dot2 = Dot4SIMD(normal, corners[1]);
-	cmp = CmpGeSIMD(dot1, t4);
-	bi32x4 cmp2 = CmpGtSIMD(negt4, dot2);
-	fltx4 result = MaskedAssign(cmp, Four_Ones, Four_Zeros);
-	fltx4 result2 = MaskedAssign(cmp2, Four_Twos, Four_Zeros);
-	result = AddSIMD(result, result2);
-	intx4 sides;
-	ConvertStoreAsIntsSIMD(&sides, result);
-	return sides[0];
-}
-
-
-class KDop32_t
-{
-public:
-	fltx4 m_Mins[4];
-	fltx4 m_Maxes[4];
-
-	FORCEINLINE bool Intersects(KDop32_t const& other) const;
-
-	FORCEINLINE void operator|=(KDop32_t const& other);
-
-	FORCEINLINE bool IsEmpty(void) const;
-
-	FORCEINLINE void Init(void)
-	{
-		for (int i = 0; i < ARRAYSIZE(m_Mins); i++)
-		{
-			m_Mins[i] = Four_FLT_MAX;
-			m_Maxes[i] = Four_Negative_FLT_MAX;
-		}
-	}
-
-	void AddPointSet(Vector const* pPoints, int nPnts);
-
-	void CreateFromPointSet(Vector const* pPoints, int nPnts);
-};
-
-FORCEINLINE void KDop32_t::operator|=(KDop32_t const& other)
-{
-	m_Mins[0] = MinSIMD(m_Mins[0], other.m_Mins[0]);
-	m_Mins[1] = MinSIMD(m_Mins[1], other.m_Mins[1]);
-	m_Mins[2] = MinSIMD(m_Mins[2], other.m_Mins[2]);
-	m_Mins[3] = MinSIMD(m_Mins[3], other.m_Mins[3]);
-
-	m_Maxes[0] = MaxSIMD(m_Maxes[0], other.m_Maxes[0]);
-	m_Maxes[1] = MaxSIMD(m_Maxes[1], other.m_Maxes[1]);
-	m_Maxes[2] = MaxSIMD(m_Maxes[2], other.m_Maxes[2]);
-	m_Maxes[3] = MaxSIMD(m_Maxes[3], other.m_Maxes[3]);
-
-
-}
-
-FORCEINLINE bool KDop32_t::Intersects(KDop32_t const& other) const
-{
-	bi32x4 c00 = CmpLeSIMD(m_Mins[0], other.m_Maxes[0]);
-	bi32x4 c01 = CmpLeSIMD(m_Mins[1], other.m_Maxes[1]);
-	bi32x4 c02 = CmpLeSIMD(m_Mins[2], other.m_Maxes[2]);
-	bi32x4 c03 = CmpLeSIMD(m_Mins[3], other.m_Maxes[3]);
-
-	bi32x4 c10 = CmpGeSIMD(m_Maxes[0], other.m_Mins[0]);
-	bi32x4 c11 = CmpGeSIMD(m_Maxes[1], other.m_Mins[1]);
-	bi32x4 c12 = CmpGeSIMD(m_Maxes[2], other.m_Mins[2]);
-	bi32x4 c13 = CmpGeSIMD(m_Maxes[3], other.m_Mins[3]);
-
-	bi32x4 a0 = AndSIMD(AndSIMD(c00, c01), AndSIMD(c02, c03));
-	bi32x4 a1 = AndSIMD(AndSIMD(c10, c11), AndSIMD(c12, c13));
-
-	return !(IsAnyZeros(AndSIMD(a1, a0)));
-}
-
-
-FORCEINLINE bool KDop32_t::IsEmpty(void) const
-{
-	bi32x4 c00 = CmpLtSIMD(m_Maxes[0], m_Mins[0]);
-	bi32x4 c01 = CmpLtSIMD(m_Maxes[1], m_Mins[1]);
-	bi32x4 c02 = CmpLtSIMD(m_Maxes[2], m_Mins[2]);
-	bi32x4 c03 = CmpLtSIMD(m_Maxes[3], m_Mins[3]);
-
-	return IsAnyTrue(OrSIMD(OrSIMD(c00, c01), OrSIMD(c02, c03)));
-}
-
-
-extern const fltx4 g_KDop32XDirs[4];
-extern const fltx4 g_KDop32YDirs[4];
-extern const fltx4 g_KDop32ZDirs[4];
-#endif
-
-#if 0
-
-#define _VEC_SWIZZLE_QUAT48_UNPACK (__vector unsigned char)		{ 16, 17, 0, 1, 16, 17, 2, 3, 16, 17, 4, 5, 16, 17, 6, 7 }
-#define _VEC_SWIZZLE_QUAT48_UNPACK_SHIFT (__vector unsigned int )		{ 0, 0, 1, 0 }
-
-FORCEINLINE fltx4 UnpackQuaternion48SIMD(const Quaternion48* RESTRICT pVec)
-{
-	fltx4 q16s = LoadUnaligned3SIMD((const float*)pVec);
-
-	bool wneg = pVec->wneg;                   
-
-	q16s = vec_perm(q16s, Four_Threes, _VEC_SWIZZLE_QUAT48_UNPACK);                         
-
-	u32x4 tmp = IntShiftLeftWordSIMD(*(u32x4*)&q16s, _VEC_SWIZZLE_QUAT48_UNPACK_SHIFT);
-	q16s = *(fltx4*)&tmp;
-
-	const fltx4 vUpkMul = SplatXSIMD(g_SIMD_Quat48_Unpack_Magic_Constants);       
-	const fltx4 vUpkAdd = SplatYSIMD(g_SIMD_Quat48_Unpack_Magic_Constants);
-
-	fltx4 ret = vec_madd(q16s, vUpkMul, vUpkAdd);
-
-	fltx4 dotxyz = Dot3SIMD(ret, ret);          
-	dotxyz = ClampVectorSIMD(dotxyz, Four_Zeros, Four_Ones);
-
-	fltx4 ww = SubSIMD(Four_Ones, dotxyz);       
-	ww = SqrtSIMD(ww);     
-	if (wneg)
-	{
-		ret = SetWSIMD(ret, NegSIMD(ww));
-	}
-	else
-	{
-		ret = SetWSIMD(ret, ww);
-	}
-	return ret;
-}
-
-#endif
-
-FORCEINLINE fltx4 SetWFromXSIMD(const fltx4& a, const fltx4& x)
-{
-	fltx4 value = SplatXSIMD(x);
-	return SetWSIMD(a, value);
-}
-
-FORCEINLINE fltx4 SetWFromYSIMD(const fltx4& a, const fltx4& y)
-{
-	fltx4 value = SplatYSIMD(y);
-	return SetWSIMD(a, value);
-}
-
-FORCEINLINE fltx4 SetWFromZSIMD(const fltx4& a, const fltx4& z)
-{
-	fltx4 value = SplatZSIMD(z);
-	return SetWSIMD(a, value);
-}
-
-FORCEINLINE fltx4 CrossProductSIMD(const fltx4& A, const fltx4& B)
-{
-#if defined( _X360 )
-	return XMVector3Cross(A, B);
-#elif defined( _WIN32 )
-	fltx4 A1 = _mm_shuffle_ps(A, A, MM_SHUFFLE_REV(1, 2, 0, 3));
-	fltx4 B1 = _mm_shuffle_ps(B, B, MM_SHUFFLE_REV(2, 0, 1, 3));
-	fltx4 Result1 = MulSIMD(A1, B1);
-	fltx4 A2 = _mm_shuffle_ps(A, A, MM_SHUFFLE_REV(2, 0, 1, 3));
-	fltx4 B2 = _mm_shuffle_ps(B, B, MM_SHUFFLE_REV(1, 2, 0, 3));
-	fltx4 Result2 = MulSIMD(A2, B2);
-	return SubSIMD(Result1, Result2);
-
-#elif defined(_PS3)
-	return _vmathVfCross(A, B);
-#else
-	fltx4 CrossVal;
-	SubFloat(CrossVal, 0) = SubFloat(A, 1) * SubFloat(B, 2) - SubFloat(A, 2) * SubFloat(B, 1);
-	SubFloat(CrossVal, 1) = SubFloat(A, 2) * SubFloat(B, 0) - SubFloat(A, 0) * SubFloat(B, 2);
-	SubFloat(CrossVal, 2) = SubFloat(A, 0) * SubFloat(B, 1) - SubFloat(A, 1) * SubFloat(B, 0);
-	SubFloat(CrossVal, 3) = 0;
-	return CrossVal;
-#endif
-}
-
-inline const fltx4 Length3SIMD(const fltx4 vec)
-{
-	fltx4 scLengthSqr = Dot3SIMD(vec, vec);
-	bi32x4 isSignificant = CmpGtSIMD(scLengthSqr, Four_Epsilons);
-	fltx4 scLengthInv = ReciprocalSqrtSIMD(scLengthSqr);
-	return AndSIMD(isSignificant, MulSIMD(scLengthInv, scLengthSqr));
-}
-
-inline const fltx4 Normalized3SIMD(const fltx4 vec)
-{
-	fltx4 scLengthSqr = Dot3SIMD(vec, vec);
-	bi32x4 isSignificant = CmpGtSIMD(scLengthSqr, Four_Epsilons);
-	fltx4 scLengthInv = ReciprocalSqrtSIMD(scLengthSqr);
-	return AndSIMD(isSignificant, MulSIMD(vec, scLengthInv));
-}
-
-
-#ifndef COMPILER_GCC
-
-FORCEINLINE fltx4 operator+=(fltx4& a, FLTX4 b)
-{
-	a = AddSIMD(a, b);
-	return a;
-}
-
-FORCEINLINE fltx4 operator-=(fltx4& a, FLTX4 b)
-{
-	a = SubSIMD(a, b);
-	return a;
-}
-
-
-FORCEINLINE fltx4 operator*=(fltx4& a, FLTX4 b)
-{
-	a = MulSIMD(a, b);
-	return a;
-}
-
-#endif
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/sendproxy.h b/SpyCustom/sendproxy.h
deleted file mode 100644
index 819f980..0000000
--- a/SpyCustom/sendproxy.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef SENDPROXY_H
-#define SENDPROXY_H
-
-
-#include "dt_send.h"
-
-
-class DVariant;
-
-void SendProxy_Color32ToInt(const SendProp* pProp, const void* pStruct, const void* pData, DVariant* pOut, int iElement, int objectID);
-void SendProxy_EHandleToInt(const SendProp* pProp, const void* pStruct, const void* pVarData, DVariant* pOut, int iElement, int objectID);
-void SendProxy_IntAddOne(const SendProp* pProp, const void* pStruct, const void* pVarData, DVariant* pOut, int iElement, int objectID);
-void SendProxy_ShortAddOne(const SendProp* pProp, const void* pStruct, const void* pVarData, DVariant* pOut, int iElement, int objectID);
-
-SendProp SendPropBool(
-	const char* pVarName,
-	int offset,
-	int sizeofVar);
-
-SendProp SendPropEHandle(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,
-	int flags = 0,
-	SendVarProxyFn proxyFn = SendProxy_EHandleToInt);
-
-SendProp SendPropTime(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE);
-
-#if !defined( NO_ENTITY_PREDICTION )
-SendProp SendPropPredictableId(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE);
-#endif
-
-SendProp SendPropIntWithMinusOneFlag(
-	const char* pVarName,
-	int offset,
-	int sizeofVar = SIZEOF_IGNORE,
-	int bits = -1,
-	SendVarProxyFn proxyFn = SendProxy_IntAddOne);
-
-
-SendProp SendPropStringT(const char* pVarName, int offset, int sizeofVar);
-
-void* SendProxy_OnlyToTeam(const SendProp* pProp, const void* pStruct, const void* pVarData, CSendProxyRecipients* pRecipients, int objectID);
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/sequence_Transitioner.h b/SpyCustom/sequence_Transitioner.h
deleted file mode 100644
index 2140d78..0000000
--- a/SpyCustom/sequence_Transitioner.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef SEQUENCE_TRANSITIONER_H
-#define SEQUENCE_TRANSITIONER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-class CSequenceTransitioner
-{
-public:
-	void CheckForSequenceChange(
-		CStudioHdr* hdr,
-		int nCurSequence,
-
-		bool bForceNewSequence,
-
-		bool bInterpolate
-	);
-
-	void UpdateCurrent(
-		CStudioHdr* hdr,
-		int nCurSequence,
-		float flCurCycle,
-		float flCurPlaybackRate,
-		float flCurTime
-	);
-
-	void RemoveAll(void) { m_animationQueue.RemoveAll(); };
-
-public:
-	CUtlVector< CAnimationLayer >	m_animationQueue;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/shake.h b/SpyCustom/shake.h
deleted file mode 100644
index a82bf40..0000000
--- a/SpyCustom/shake.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef SHAKE_H
-#define SHAKE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-struct ScreenShake_t
-{
-	int		command;
-	float	amplitude;
-	float	frequency;
-	float	duration;
-};
-
-enum ShakeCommand_t
-{
-	SHAKE_START = 0,		          
-	SHAKE_STOP,				          
-	SHAKE_AMPLITUDE,		              
-	SHAKE_FREQUENCY,		              
-	SHAKE_START_RUMBLEONLY,	            
-	SHAKE_START_NORUMBLE,	         
-};
-
-
-extern int gmsgShake;
-
-extern int gmsgFade;
-
-#define FFADE_IN			0x0001		          
-#define FFADE_OUT			0x0002		    
-#define FFADE_MODULATE		0x0004		   
-#define FFADE_STAYOUT		0x0008		           
-#define FFADE_PURGE			0x0010		         
-
-#define SCREENFADE_FRACBITS		9		       
-struct ScreenFade_t
-{
-	unsigned short 	duration;		        
-	unsigned short 	holdTime;		             
-	short			fadeFlags;		 
-	byte			r, g, b, a;		       
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/shared_classnames.h b/SpyCustom/shared_classnames.h
deleted file mode 100644
index c77784a..0000000
--- a/SpyCustom/shared_classnames.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SHARED_CLASSNAMES_H
-#define SHARED_CLASSNAMES_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#if defined( CLIENT_DLL )
-
-#define CBaseEntity				C_BaseEntity
-#define CBaseCombatCharacter	C_BaseCombatCharacter
-#define CBaseAnimating			C_BaseAnimating
-#define CBasePlayer				C_BasePlayer
-
-#endif
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/shareddefs.h b/SpyCustom/shareddefs.h
deleted file mode 100644
index d3ec72c..0000000
--- a/SpyCustom/shareddefs.h
+++ /dev/null
@@ -1,838 +0,0 @@
-#ifndef SHADERAPI_SHAREDDEFS_H
-#define SHADERAPI_SHAREDDEFS_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-enum ShaderShadeMode_t
-{
-	SHADER_FLAT = 0,
-	SHADER_SMOOTH
-};
-
-enum ShaderTexCoordComponent_t
-{
-	SHADER_TEXCOORD_S = 0,
-	SHADER_TEXCOORD_T,
-	SHADER_TEXCOORD_U
-};
-
-enum ShaderTexFilterMode_t
-{
-	SHADER_TEXFILTERMODE_NEAREST,
-	SHADER_TEXFILTERMODE_LINEAR,
-	SHADER_TEXFILTERMODE_NEAREST_MIPMAP_NEAREST,
-	SHADER_TEXFILTERMODE_LINEAR_MIPMAP_NEAREST,
-	SHADER_TEXFILTERMODE_NEAREST_MIPMAP_LINEAR,
-	SHADER_TEXFILTERMODE_LINEAR_MIPMAP_LINEAR,
-	SHADER_TEXFILTERMODE_ANISOTROPIC
-};
-
-enum ShaderTexWrapMode_t
-{
-	SHADER_TEXWRAPMODE_CLAMP,
-	SHADER_TEXWRAPMODE_REPEAT,
-	SHADER_TEXWRAPMODE_BORDER
-};
-
-
-enum TextureStage_t
-{
-	SHADER_TEXTURE_STAGE0 = 0,
-	SHADER_TEXTURE_STAGE1,
-};
-
-enum Sampler_t
-{
-	SHADER_SAMPLER0 = 0,
-	SHADER_SAMPLER1,
-	SHADER_SAMPLER2,
-	SHADER_SAMPLER3,
-	SHADER_SAMPLER4,
-	SHADER_SAMPLER5,
-	SHADER_SAMPLER6,
-	SHADER_SAMPLER7,
-	SHADER_SAMPLER8,
-	SHADER_SAMPLER9,
-	SHADER_SAMPLER10,
-	SHADER_SAMPLER11,
-	SHADER_SAMPLER12,
-	SHADER_SAMPLER13,
-	SHADER_SAMPLER14,
-	SHADER_SAMPLER15,
-};
-
-enum VertexTextureSampler_t
-{
-	SHADER_VERTEXTEXTURE_SAMPLER0 = 0,
-	SHADER_VERTEXTEXTURE_SAMPLER1,
-	SHADER_VERTEXTEXTURE_SAMPLER2,
-	SHADER_VERTEXTEXTURE_SAMPLER3,
-};
-
-
-#if defined( _X360 )
-#define REVERSE_DEPTH_ON_X360                       
-#endif
-
-#if defined( REVERSE_DEPTH_ON_X360 )
-#define ReverseDepthOnX360() true
-#else
-#define ReverseDepthOnX360() false
-#endif
-
-
-
-
-
-
-#include "bittools.h"
-
-#define TICK_INTERVAL			(gpGlobals->interval_per_tick)
-
-
-#define TIME_TO_TICKS( dt )		( (int)( 0.5f + (float)(dt) / TICK_INTERVAL ) )
-#define TICKS_TO_TIME( t )		( TICK_INTERVAL *( t ) )
-#define ROUND_TO_TICKS( t )		( TICK_INTERVAL * TIME_TO_TICKS( t ) )
-#define TICK_NEVER_THINK		(-1)
-
-
-#define ANIMATION_CYCLE_BITS		15
-
-#define ANIMATION_CYCLE_MINFRAC		(1.0f / (1<<ANIMATION_CYCLE_BITS))
-
-#define CONCEPT_WEIGHT 5.0f
-
-
-
-class CViewVectors
-{
-public:
-	CViewVectors() {}
-
-	CViewVectors(
-		Vector vView,
-		Vector vHullMin,
-		Vector vHullMax,
-		Vector vDuckHullMin,
-		Vector vDuckHullMax,
-		Vector vDuckView,
-		Vector vObsHullMin,
-		Vector vObsHullMax,
-		Vector vDeadViewHeight)
-	{
-		m_vView = vView;
-		m_vHullMin = vHullMin;
-		m_vHullMax = vHullMax;
-		m_vDuckHullMin = vDuckHullMin;
-		m_vDuckHullMax = vDuckHullMax;
-		m_vDuckView = vDuckView;
-		m_vObsHullMin = vObsHullMin;
-		m_vObsHullMax = vObsHullMax;
-		m_vDeadViewHeight = vDeadViewHeight;
-	}
-
-	Vector m_vView;
-
-	Vector m_vHullMin;
-	Vector m_vHullMax;
-
-	Vector m_vDuckHullMin;
-	Vector m_vDuckHullMax;
-	Vector m_vDuckView;
-
-	Vector m_vObsHullMin;
-	Vector m_vObsHullMax;
-
-	Vector m_vDeadViewHeight;
-};
-
-#define VEC_VIEW			g_pGameRules->GetViewVectors()->m_vView
-#define VEC_HULL_MIN		g_pGameRules->GetViewVectors()->m_vHullMin
-#define VEC_HULL_MAX		g_pGameRules->GetViewVectors()->m_vHullMax
-
-#define VEC_DUCK_HULL_MIN	g_pGameRules->GetViewVectors()->m_vDuckHullMin
-#define VEC_DUCK_HULL_MAX	g_pGameRules->GetViewVectors()->m_vDuckHullMax
-#define VEC_DUCK_VIEW		g_pGameRules->GetViewVectors()->m_vDuckView
-
-#define VEC_OBS_HULL_MIN	g_pGameRules->GetViewVectors()->m_vObsHullMin
-#define VEC_OBS_HULL_MAX	g_pGameRules->GetViewVectors()->m_vObsHullMax
-
-#define VEC_DEAD_VIEWHEIGHT	g_pGameRules->GetViewVectors()->m_vDeadViewHeight
-
-
-#define WATERJUMP_HEIGHT			8
-
-#define MAX_CLIMB_SPEED		200
-
-
-#define TIME_TO_DUCK_MSECS		400
-
-#define TIME_TO_UNDUCK_MSECS		200
-
-inline float FractionDucked(int msecs)
-{
-	return clamp((float)msecs / (float)TIME_TO_DUCK_MSECS, 0.0f, 1.0f);
-}
-
-inline float FractionUnDucked(int msecs)
-{
-	return clamp((float)msecs / (float)TIME_TO_UNDUCK_MSECS, 0.0f, 1.0f);
-}
-
-#define MAX_WEAPON_SLOTS		6	    
-#define MAX_WEAPON_POSITIONS	20	       
-#define MAX_ITEM_TYPES			6	    
-#define MAX_WEAPONS				48	     
-
-#define MAX_ITEMS				5	    
-
-#define WEAPON_NOCLIP			-1	             
-
-#define	MAX_AMMO_TYPES	32		 
-#define MAX_AMMO_SLOTS  32		   
-
-#define HUD_PRINTNOTIFY		1
-#define HUD_PRINTCONSOLE	2
-#define HUD_PRINTTALK		3
-#define HUD_PRINTCENTER		4
-
-
-#define CLOSE_CAPTION_WARNIFMISSING	( 1<<0 )
-#define CLOSE_CAPTION_FROMPLAYER	( 1<<1 )
-#define CLOSE_CAPTION_GENDER_MALE	( 1<<2 )
-#define CLOSE_CAPTION_GENDER_FEMALE	( 1<<3 )
-
-#define	HIDEHUD_WEAPONSELECTION		( 1<<0 )	      
-#define	HIDEHUD_FLASHLIGHT			( 1<<1 )
-#define	HIDEHUD_ALL					( 1<<2 )
-#define HIDEHUD_HEALTH				( 1<<3 )	       
-#define HIDEHUD_PLAYERDEAD			( 1<<4 )	     
-#define HIDEHUD_NEEDSUIT			( 1<<5 )	          
-#define HIDEHUD_MISCSTATUS			( 1<<6 )	          
-#define HIDEHUD_CHAT				( 1<<7 )	        
-#define	HIDEHUD_CROSSHAIR			( 1<<8 )	  
-#define	HIDEHUD_VEHICLE_CROSSHAIR	( 1<<9 )	   
-#define HIDEHUD_INVEHICLE			( 1<<10 )
-#define HIDEHUD_BONUS_PROGRESS		( 1<<11 )	        
-#define HIDEHUD_RADAR				( 1<<12 )	   
-
-#define HIDEHUD_BITCOUNT			13
-
-#define bits_SUIT_DEVICE_SPRINT		0x00000001
-#define bits_SUIT_DEVICE_FLASHLIGHT	0x00000002
-#define bits_SUIT_DEVICE_BREATHER	0x00000004
-
-#define MAX_SUIT_DEVICES			3
-
-
-#define MAX_PLAYERS				33      
-
-
-#define MAX_PLACE_NAME_LENGTH		18
-
-#define TEAM_ANY				-1	     
-#define	TEAM_INVALID			-1
-#define TEAM_UNASSIGNED			0	     
-#define TEAM_SPECTATOR			1	  
-#define LAST_SHARED_TEAM		TEAM_SPECTATOR
-
-#define FIRST_GAME_TEAM			(LAST_SHARED_TEAM+1)
-
-#define MAX_TEAMS				32	       
-#define MAX_TEAM_NAME_LENGTH	32	      
-
-#define WEAPON_NOT_CARRIED				0	     
-#define WEAPON_IS_CARRIED_BY_PLAYER		1	      
-#define WEAPON_IS_ACTIVE				2	            
-
-#define SKILL_EASY		1
-#define SKILL_MEDIUM	2
-#define SKILL_HARD		3
-
-
-#define ITEM_FLAG_SELECTONEMPTY		(1<<0)
-#define ITEM_FLAG_NOAUTORELOAD		(1<<1)
-#define ITEM_FLAG_NOAUTOSWITCHEMPTY	(1<<2)
-#define ITEM_FLAG_LIMITINWORLD		(1<<3)
-#define ITEM_FLAG_EXHAUSTIBLE		(1<<4)	            
-#define ITEM_FLAG_DOHITLOCATIONDMG	(1<<5)	          
-#define ITEM_FLAG_NOAMMOPICKUPS		(1<<6)	         
-#define ITEM_FLAG_NOITEMPICKUP		(1<<7)	             
-
-#define MAX_VIEWMODELS			2
-
-#define MAX_BEAM_ENTS			10
-
-#define TRACER_TYPE_DEFAULT		0x00000001
-#define TRACER_TYPE_GUNSHIP		0x00000002
-#define TRACER_TYPE_STRIDER		0x00000004     
-#define TRACER_TYPE_GAUSS		0x00000008
-#define TRACER_TYPE_WATERBULLET	0x00000010
-
-#define MUZZLEFLASH_TYPE_DEFAULT	0x00000001
-#define MUZZLEFLASH_TYPE_GUNSHIP	0x00000002
-#define MUZZLEFLASH_TYPE_STRIDER	0x00000004
-
-enum
-{
-	MUZZLEFLASH_AR2 = 0,
-	MUZZLEFLASH_SHOTGUN,
-	MUZZLEFLASH_SMG1,
-	MUZZLEFLASH_SMG2,
-	MUZZLEFLASH_PISTOL,
-	MUZZLEFLASH_COMBINE,
-	MUZZLEFLASH_357,
-	MUZZLEFLASH_RPG,
-	MUZZLEFLASH_COMBINE_TURRET,
-
-	MUZZLEFLASH_FIRSTPERSON = 0x100,
-};
-
-#define TRACER_FLAG_WHIZ			0x0001
-#define TRACER_FLAG_USEATTACHMENT	0x0002
-
-#define TRACER_DONT_USE_ATTACHMENT	-1
-
-enum
-{
-	ENTITY_DISSOLVE_NORMAL = 0,
-	ENTITY_DISSOLVE_ELECTRICAL,
-	ENTITY_DISSOLVE_ELECTRICAL_LIGHT,
-	ENTITY_DISSOLVE_CORE,
-
-	ENTITY_DISSOLVE_BITS = 3
-};
-
-#define	HITGROUP_GENERIC	0
-#define	HITGROUP_HEAD		1
-#define	HITGROUP_CHEST		2
-#define	HITGROUP_STOMACH	3
-#define HITGROUP_LEFTARM	4	
-#define HITGROUP_RIGHTARM	5
-#define HITGROUP_LEFTLEG	6
-#define HITGROUP_RIGHTLEG	7
-#define HITGROUP_GEAR		10			          
-
-enum PLAYER_ANIM
-{
-	PLAYER_IDLE,
-	PLAYER_WALK,
-	PLAYER_JUMP,
-	PLAYER_SUPERJUMP,
-	PLAYER_DIE,
-	PLAYER_ATTACK1,
-	PLAYER_IN_VEHICLE,
-
-	PLAYER_RELOAD,
-	PLAYER_START_AIMING,
-	PLAYER_LEAVE_AIMING,
-};
-
-#ifdef HL2_DLL
-#define PLAYER_FATAL_FALL_SPEED		922.5f             
-#define PLAYER_MAX_SAFE_FALL_SPEED	526.5f             
-#define PLAYER_LAND_ON_FLOATING_OBJECT	173         
-#define PLAYER_MIN_BOUNCE_SPEED		173
-#define PLAYER_FALL_PUNCH_THRESHOLD 303.0f                          
-#else
-#define PLAYER_FATAL_FALL_SPEED		1024    
-#define PLAYER_MAX_SAFE_FALL_SPEED	580    
-#define PLAYER_LAND_ON_FLOATING_OBJECT	200         
-#define PLAYER_MIN_BOUNCE_SPEED		200
-#define PLAYER_FALL_PUNCH_THRESHOLD (float)350              
-#endif
-#define DAMAGE_FOR_FALL_SPEED		100.0f / ( PLAYER_FATAL_FALL_SPEED - PLAYER_MAX_SAFE_FALL_SPEED )      
-
-
-#define AUTOAIM_2DEGREES  0.0348994967025
-#define AUTOAIM_5DEGREES  0.08715574274766
-#define AUTOAIM_8DEGREES  0.1391731009601
-#define AUTOAIM_10DEGREES 0.1736481776669
-#define AUTOAIM_20DEGREES 0.3490658503989
-
-#define AUTOAIM_SCALE_DEFAULT		1.0f
-#define AUTOAIM_SCALE_DIRECT_ONLY	0.0f
-
-#define DMG_GENERIC			0			    
-#define DMG_CRUSH			(1 << 0)	       
-#define DMG_BULLET			(1 << 1)	 
-#define DMG_SLASH			(1 << 2)	   
-#define DMG_BURN			(1 << 3)	  
-#define DMG_VEHICLE			(1 << 4)	    
-#define DMG_FALL			(1 << 5)	   
-#define DMG_BLAST			(1 << 6)	   
-#define DMG_CLUB			(1 << 7)	   
-#define DMG_SHOCK			(1 << 8)	  
-#define DMG_SONIC			(1 << 9)	   
-#define DMG_ENERGYBEAM		(1 << 10)	       
-#define DMG_PREVENT_PHYSICS_FORCE		(1 << 11)	     
-#define DMG_NEVERGIB		(1 << 12)	                
-#define DMG_ALWAYSGIB		(1 << 13)	                
-#define DMG_DROWN			(1 << 14)	 
-
-
-#define DMG_PARALYZE		(1 << 15)	    
-#define DMG_NERVEGAS		(1 << 16)	    
-#define DMG_POISON			(1 << 17)	         
-#define DMG_RADIATION		(1 << 18)	  
-#define DMG_DROWNRECOVER	(1 << 19)	  
-#define DMG_ACID			(1 << 20)	     
-#define DMG_SLOWBURN		(1 << 21)	   
-
-#define DMG_REMOVENORAGDOLL	(1<<22)		                 
-#define DMG_PHYSGUN			(1<<23)		        
-#define DMG_PLASMA			(1<<24)		   
-#define DMG_AIRBOAT			(1<<25)		     
-
-#define DMG_DISSOLVE		(1<<26)		 
-#define DMG_BLAST_SURFACE	(1<<27)		            
-#define DMG_DIRECT			(1<<28)
-#define DMG_BUCKSHOT		(1<<29)		       
-
-#define DMG_LASTGENERICFLAG	DMG_BUCKSHOT
-
-
-
-#define	DAMAGE_NO				0
-#define DAMAGE_EVENTS_ONLY		1		       
-#define	DAMAGE_YES				2
-#define	DAMAGE_AIM				3
-
-enum
-{
-	OBS_MODE_NONE = 0,	    
-	OBS_MODE_DEATHCAM,	      
-	OBS_MODE_FREEZECAM,	        
-	OBS_MODE_FIXED,		      
-	OBS_MODE_IN_EYE,	       
-	OBS_MODE_CHASE,		       
-	OBS_MODE_ROAMING,	  
-
-	NUM_OBSERVER_MODES,
-};
-
-#define LAST_PLAYER_OBSERVERMODE	OBS_MODE_ROAMING
-
-enum {
-	OBS_ALLOW_ALL = 0,	     
-	OBS_ALLOW_TEAM,		         
-	OBS_ALLOW_NONE,		           
-
-	OBS_ALLOW_NUM_MODES,
-};
-
-enum
-{
-	TYPE_TEXT = 0,	     
-	TYPE_INDEX,		      
-	TYPE_URL,		   
-	TYPE_FILE,		    
-};
-
-enum
-{
-	VGUI_SCREEN_ACTIVE = 0x1,
-	VGUI_SCREEN_VISIBLE_TO_TEAMMATES = 0x2,
-	VGUI_SCREEN_ATTACHED_TO_VIEWMODEL = 0x4,
-	VGUI_SCREEN_TRANSPARENT = 0x8,
-	VGUI_SCREEN_ONLY_USABLE_BY_OWNER = 0x10,
-
-	VGUI_SCREEN_MAX_BITS = 5
-};
-
-typedef enum
-{
-	USE_OFF = 0,
-	USE_ON = 1,
-	USE_SET = 2,
-	USE_TOGGLE = 3
-} USE_TYPE;
-
-#define COLOR_RED		Color(255, 64, 64, 255)
-#define COLOR_BLUE		Color(153, 204, 255, 255)
-#define COLOR_YELLOW	Color(255, 178, 0, 255)
-#define COLOR_GREEN		Color(153, 255, 153, 255)
-#define COLOR_GREY		Color(204, 204, 204, 255)
-
-enum
-{
-	DONT_BLEED = -1,
-
-	BLOOD_COLOR_RED = 0,
-	BLOOD_COLOR_YELLOW,
-	BLOOD_COLOR_GREEN,
-	BLOOD_COLOR_MECH,
-
-#if defined( HL2_EPISODIC )
-	BLOOD_COLOR_ANTLION,		     
-	BLOOD_COLOR_ZOMBIE,			     
-	BLOOD_COLOR_ANTLION_WORKER,
-	BLOOD_COLOR_BLOB,
-	BLOOD_COLOR_BLOB_FROZEN,
-#endif  
-
-#if defined( INFESTED_DLL )
-	BLOOD_COLOR_BLOB,
-	BLOOD_COLOR_BLOB_FROZEN,
-#endif  
-
-	BLOOD_COLOR_BRIGHTGREEN,
-};
-
-enum PassengerRole_t
-{
-	VEHICLE_ROLE_NONE = -1,
-
-	VEHICLE_ROLE_DRIVER = 0,	   
-
-	LAST_SHARED_VEHICLE_ROLE,
-};
-
-enum
-{
-	FX_WATER_IN_SLIME = 0x1,
-};
-
-
-#define	MAX_CONTEXT_LENGTH		32
-#define NO_THINK_CONTEXT	-1
-
-enum
-{
-	EFL_KILLME = (1 << 0),	                   
-	EFL_DORMANT = (1 << 1),	       
-	EFL_NOCLIP_ACTIVE = (1 << 2),	         
-	EFL_SETTING_UP_BONES = (1 << 3),	         
-	EFL_KEEP_ON_RECREATE_ENTITIES = (1 << 4),                
-
-	EFL_DIRTY_SHADOWUPDATE = (1 << 5),	         
-	EFL_NOTIFY = (1 << 6),	           
-
-	EFL_FORCE_CHECK_TRANSMIT = (1 << 7),
-
-	EFL_BOT_FROZEN = (1 << 8),	        
-	EFL_SERVER_ONLY = (1 << 9),	  
-	EFL_NO_AUTO_EDICT_ATTACH = (1 << 10),         
-
-	EFL_DIRTY_ABSTRANSFORM = (1 << 11),
-	EFL_DIRTY_ABSVELOCITY = (1 << 12),
-	EFL_DIRTY_ABSANGVELOCITY = (1 << 13),
-	EFL_DIRTY_SURROUNDING_COLLISION_BOUNDS = (1 << 14),
-	EFL_DIRTY_SPATIAL_PARTITION = (1 << 15),
-	EFL_HAS_PLAYER_CHILD = (1 << 16),	        
-
-	EFL_IN_SKYBOX = (1 << 17),	            
-											EFL_USE_PARTITION_WHEN_NOT_SOLID = (1 << 18),	              
-											EFL_TOUCHING_FLUID = (1 << 19),	        
-
-											EFL_IS_BEING_LIFTED_BY_BARNACLE = (1 << 20),
-											EFL_NO_ROTORWASH_PUSH = (1 << 21),		       
-											EFL_NO_THINK_FUNCTION = (1 << 22),
-											EFL_NO_GAME_PHYSICS_SIMULATION = (1 << 23),
-
-											EFL_CHECK_UNTOUCH = (1 << 24),
-											EFL_DONTBLOCKLOS = (1 << 25),		     
-											EFL_DONTWALKON = (1 << 26),		       
-											EFL_NO_DISSOLVE = (1 << 27),		    
-											EFL_NO_MEGAPHYSCANNON_RAGDOLL = (1 << 28),	      
-											EFL_NO_WATER_VELOCITY_CHANGE = (1 << 29),	         
-											EFL_NO_PHYSCANNON_INTERACTION = (1 << 30),	        
-											EFL_NO_DAMAGE_FORCES = (1 << 31),	      
-};
-
-const int FX_BLOODSPRAY_DROPS = 0x01;
-const int FX_BLOODSPRAY_GORE = 0x02;
-const int FX_BLOODSPRAY_CLOUD = 0x04;
-const int FX_BLOODSPRAY_ALL = 0xFF;
-
-#define MAX_SCREEN_OVERLAYS		10
-
-enum
-{
-	GROUNDLINK = 0,
-	TOUCHLINK,
-	STEPSIMULATION,
-	MODELSCALE,
-	POSITIONWATCHER,
-	PHYSICSPUSHLIST,
-	VPHYSICSUPDATEAI,
-	VPHYSICSWATCHER,
-
-	NUM_DATAOBJECT_TYPES,
-};
-
-class CBaseEntity;
-
-class CBaseEntity;
-
-enum FireBulletsFlags_t
-{
-	FIRE_BULLETS_FIRST_SHOT_ACCURATE = 0x1,		       
-	FIRE_BULLETS_DONT_HIT_UNDERWATER = 0x2,		          
-	FIRE_BULLETS_ALLOW_WATER_SURFACE_IMPACTS = 0x4,	         
-	FIRE_BULLETS_TEMPORARY_DANGER_SOUND = 0x8,		              
-
-	FIRE_BULLETS_NO_PIERCING_SPARK = 0x16,	           
-	FIRE_BULLETS_HULL = 0x32,	         
-	FIRE_BULLETS_ANGULAR_SPREAD = 0x64,	              
-};
-
-
-struct FireBulletsInfo_t
-{
-	FireBulletsInfo_t()
-	{
-		m_iShots = 1;
-		m_vecSpread.Init(0, 0, 0);
-		m_flDistance = 8192;
-		m_iTracerFreq = 4;
-		m_flDamage = 0.0f;
-		m_flPlayerDamage = 0.0f;
-		m_pAttacker = NULL;
-		m_nFlags = 0;
-		m_pAdditionalIgnoreEnt = NULL;
-		m_flDamageForceScale = 1.0f;
-
-#ifdef _DEBUG
-		m_iAmmoType = -1;
-		m_vecSrc.Init(VEC_T_NAN, VEC_T_NAN, VEC_T_NAN);
-		m_vecDirShooting.Init(VEC_T_NAN, VEC_T_NAN, VEC_T_NAN);
-#endif
-		m_bPrimaryAttack = true;
-	}
-
-	FireBulletsInfo_t(int nShots, const Vector& vecSrc, const Vector& vecDir, const Vector& vecSpread, float flDistance, int nAmmoType, bool bPrimaryAttack = true)
-	{
-		m_iShots = nShots;
-		m_vecSrc = vecSrc;
-		m_vecDirShooting = vecDir;
-		m_vecSpread = vecSpread;
-		m_flDistance = flDistance;
-		m_iAmmoType = nAmmoType;
-		m_iTracerFreq = 4;
-		m_flDamage = 0;
-		m_flPlayerDamage = 0;
-		m_pAttacker = NULL;
-		m_nFlags = 0;
-		m_pAdditionalIgnoreEnt = NULL;
-		m_flDamageForceScale = 1.0f;
-		m_bPrimaryAttack = bPrimaryAttack;
-	}
-
-	int m_iShots;
-	Vector m_vecSrc;
-	Vector m_vecDirShooting;
-	Vector m_vecSpread;
-	float m_flDistance;
-	int m_iAmmoType;
-	int m_iTracerFreq;
-	float m_flDamage;
-	float m_flPlayerDamage;	            
-	int m_nFlags;			  
-	float m_flDamageForceScale;
-	CBaseEntity* m_pAttacker;
-	CBaseEntity* m_pAdditionalIgnoreEnt;
-	bool m_bPrimaryAttack;
-};
-
-struct StepSimulationStep
-{
-	int			nTickCount;
-	Vector		vecOrigin;
-	Quaternion	qRotation;
-};
-
-struct StepSimulationData
-{
-	bool		m_bOriginActive;
-	bool		m_bAnglesActive;
-
-	StepSimulationStep	m_Previous2;
-
-	StepSimulationStep	m_Previous;
-
-	StepSimulationStep	m_Discontinuity;
-
-	StepSimulationStep	m_Next;
-	QAngle		m_angNextRotation;
-
-	int			m_nLastProcessTickCount;
-	Vector		m_vecNetworkOrigin;
-	int			m_networkCell[3];
-	QAngle		m_angNetworkAngles;
-};
-
-struct ModelScale
-{
-	float		m_flModelScaleStart;
-	float		m_flModelScaleGoal;
-	float		m_flModelScaleFinishTime;
-	float		m_flModelScaleStartTime;
-};
-
-#include "soundflags.h"
-
-struct CSoundParameters;
-typedef short HSOUNDSCRIPTHANDLE;
-struct EmitSound_t
-{
-	EmitSound_t() :
-		m_nChannel(0),
-		m_pSoundName(0),
-		m_flVolume(VOL_NORM),
-		m_SoundLevel(SNDLVL_NONE),
-		m_nFlags(0),
-		m_nPitch(PITCH_NORM),
-		m_pOrigin(0),
-		m_flSoundTime(0.0f),
-		m_pflSoundDuration(0),
-		m_bEmitCloseCaption(true),
-		m_bWarnOnMissingCloseCaption(false),
-		m_bWarnOnDirectWaveReference(false),
-		m_nSpeakerEntity(-1),
-		m_UtlVecSoundOrigin(),
-		m_hSoundScriptHandle(-1)
-	{
-	}
-
-	EmitSound_t(const CSoundParameters& src);
-
-	int							m_nChannel;
-	char const* m_pSoundName;
-	float						m_flVolume;
-	soundlevel_t				m_SoundLevel;
-	int							m_nFlags;
-	int							m_nPitch;
-	const Vector* m_pOrigin;
-	float						m_flSoundTime;                  
-	float* m_pflSoundDuration;
-	bool						m_bEmitCloseCaption;
-	bool						m_bWarnOnMissingCloseCaption;
-	bool						m_bWarnOnDirectWaveReference;
-	int							m_nSpeakerEntity;
-	mutable CUtlVector< Vector >	m_UtlVecSoundOrigin;               
-	mutable HSOUNDSCRIPTHANDLE		m_hSoundScriptHandle;
-};
-
-#define MAX_ACTORS_IN_SCENE 16
-
-#define MAX_CONTROL_POINTS			8
-#define MAX_CONTROL_POINT_GROUPS	8
-
-#define MAX_PREVIOUS_POINTS			3
-
-#define MAX_CONTROL_POINT_TEAMS		8
-
-#define MAX_CAPLAYOUT_LENGTH		32
-
-#define MAX_ROUND_NAME				32
-
-#define MAX_ROUND_IMAGE_NAME		64
-
-#define TEAMPLAY_ROUND_WIN_SCORE	1
-
-enum
-{
-	CP_WARN_NORMAL = 0,
-	CP_WARN_FINALCAP,
-	CP_WARN_NO_ANNOUNCEMENTS
-};
-
-#define PREDICTION_ERROR_CHECK_LEVEL 0
-
-#define PREDICTION_ERROR_CHECK_STACKS_FOR_MISSING 0
-
-enum
-{
-	RT_STATE_SETUP,		     
-	RT_STATE_NORMAL,	     
-};
-
-enum
-{
-	SIMULATION_TIME_WINDOW_BITS = 8,
-};
-
-
-#define CELL_COUNT( bits ) ( (MAX_COORD_INTEGER*2) / (1 << (bits)) )               
-#define CELL_COUNT_BITS( bits ) MINIMUM_BITS_NEEDED( CELL_COUNT( bits ) )          
-#define CELL_BASEENTITY_ORIGIN_CELL_BITS 5         
-
-
-#ifdef GAME_HAS_NO_USE_KEY
-#define COMMENTARY_BUTTONS		(IN_ATTACK | IN_ATTACK2 | IN_USE)
-#else
-#define COMMENTARY_BUTTONS		(IN_USE)
-#endif
-
-bool IsHeadTrackingEnabled();
-
-
-#define MAX_SPLITSCREEN_PLAYERS 1
-
-
-inline bool IsSplitScreenSupported()
-{
-	return (MAX_SPLITSCREEN_PLAYERS > 1) ? true : false;
-}
-
-enum InvalidatePhysicsBits_t
-{
-	POSITION_CHANGED = 0x1,
-	ANGLES_CHANGED = 0x2,
-	VELOCITY_CHANGED = 0x4,
-	ANIMATION_CHANGED = 0x8,		                  
-	BOUNDS_CHANGED = 0x10,		            
-	SEQUENCE_CHANGED = 0x20,		            																				
-};
-
-enum Class_T
-{
-	CLASS_NONE = 0,
-	CLASS_PLAYER,
-	CLASS_PLAYER_ALLY,
-	CLASS_PLAYER_ALLY_VITAL,
-	CLASS_ANTLION,
-	CLASS_BARNACLE,
-	CLASS_BLOB,
-	CLASS_BULLSEYE,
-	CLASS_CITIZEN_PASSIVE,
-	CLASS_CITIZEN_REBEL,
-	CLASS_COMBINE,
-	CLASS_COMBINE_GUNSHIP,
-	CLASS_CONSCRIPT,
-	CLASS_HEADCRAB,
-	CLASS_MANHACK,
-	CLASS_METROPOLICE,
-	CLASS_MILITARY,
-	CLASS_SCANNER,
-	CLASS_STALKER,
-	CLASS_VORTIGAUNT,
-	CLASS_ZOMBIE,
-	CLASS_PROTOSNIPER,
-	CLASS_MISSILE,
-	CLASS_FLARE,
-	CLASS_EARTH_FAUNA,
-	CLASS_HACKED_ROLLERMINE,
-	CLASS_COMBINE_HUNTER,
-
-	LAST_SHARED_ENTITY_CLASS,
-};
-
-#define FACTION_NONE				0					               
-#define LAST_SHARED_FACTION			(FACTION_NONE)
-#define NUM_SHARED_FACTIONS			(FACTION_NONE + 1)
-
-
-
-
-
-
-
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/shattersurfacetypes.h b/SpyCustom/shattersurfacetypes.h
deleted file mode 100644
index 88ed8ba..0000000
--- a/SpyCustom/shattersurfacetypes.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#if !defined ( SHATTERSURFACETYPES_H )
-#define SHATTERSURFACETYPES_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-enum ShatterSurface_t
-{
-	SHATTERSURFACE_GLASS = 0,
-	SHATTERSURFACE_TILE = 1,
-};
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/smartptr.h b/SpyCustom/smartptr.h
deleted file mode 100644
index 5b005ec..0000000
--- a/SpyCustom/smartptr.h
+++ /dev/null
@@ -1,227 +0,0 @@
-#ifndef SMARTPTR_H
-#define SMARTPTR_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-class CRefCountAccessor
-{
-public:
-	template< class T >
-	static void AddRef(T* pObj)
-	{
-		pObj->AddRef();
-	}
-
-	template< class T >
-	static void Release(T* pObj)
-	{
-		pObj->Release();
-	}
-};
-
-class CRefCountAccessorLongName
-{
-public:
-	template< class T >
-	static void AddRef(T* pObj)
-	{
-		pObj->AddReference();
-	}
-
-	template< class T >
-	static void Release(T* pObj)
-	{
-		pObj->ReleaseReference();
-	}
-};
-
-
-template < typename T >
-class CPlainAutoPtr
-{
-public:
-	explicit CPlainAutoPtr(T* p = NULL) : m_p(p) {}
-	~CPlainAutoPtr(void) { Delete(); }
-
-public:
-	void Delete(void) { delete Detach(); }
-
-private:	        
-	CPlainAutoPtr(CPlainAutoPtr const& x);
-	CPlainAutoPtr& operator = (CPlainAutoPtr const& x);
-
-public:
-	void Attach(T* p) { m_p = p; }
-	T* Detach(void) { T* p(m_p); m_p = NULL; return p; }
-
-public:
-	bool IsValid(void) const { return m_p != NULL; }
-	T* Get(void) const { return m_p; }
-	T* operator -> (void) const { return Get(); }
-	T& operator *  (void) const { return *Get(); }
-
-private:
-	T* m_p;
-};
-
-template < typename T >
-class CArrayAutoPtr : public CPlainAutoPtr < T >             
-{
-public:
-	explicit CArrayAutoPtr(T* p = NULL) { this->Attach(p); }
-	~CArrayAutoPtr(void) { this->Delete(); }
-
-public:
-	void Delete(void) { delete[] CPlainAutoPtr < T >::Detach(); }
-
-public:
-	T& operator [] (int k) const { return CPlainAutoPtr < T >::Get()[k]; }
-};
-
-
-template<class T, class RefCountAccessor = CRefCountAccessor>
-class CSmartPtr
-{
-public:
-	CSmartPtr();
-	CSmartPtr(T* pObj);
-	CSmartPtr(const CSmartPtr<T, RefCountAccessor>& other);
-	~CSmartPtr();
-
-	T* operator=(T* pObj);
-	void			operator=(const CSmartPtr<T, RefCountAccessor>& other);
-	const T* operator->() const;
-	T* operator->();
-	bool			operator!() const;
-	bool			operator==(const T* pOther) const;
-	bool			IsValid() const;       
-	T* GetObject() const;           
-	void			MarkDeleted();
-
-private:
-	T* m_pObj;
-};
-
-
-template< class T, class RefCountAccessor >
-inline CSmartPtr<T, RefCountAccessor>::CSmartPtr()
-{
-	m_pObj = NULL;
-}
-
-template< class T, class RefCountAccessor >
-inline CSmartPtr<T, RefCountAccessor>::CSmartPtr(T* pObj)
-{
-	m_pObj = NULL;
-	*this = pObj;
-}
-
-template< class T, class RefCountAccessor >
-inline CSmartPtr<T, RefCountAccessor>::CSmartPtr(const CSmartPtr<T, RefCountAccessor>& other)
-{
-	m_pObj = NULL;
-	*this = other;
-}
-
-template< class T, class RefCountAccessor >
-inline CSmartPtr<T, RefCountAccessor>::~CSmartPtr()
-{
-	if (m_pObj)
-	{
-		RefCountAccessor::Release(m_pObj);
-	}
-}
-
-template< class T, class RefCountAccessor >
-inline T* CSmartPtr<T, RefCountAccessor>::operator=(T* pObj)
-{
-	if (pObj == m_pObj)
-		return pObj;
-
-	if (pObj)
-	{
-		RefCountAccessor::AddRef(pObj);
-	}
-	if (m_pObj)
-	{
-		RefCountAccessor::Release(m_pObj);
-	}
-	m_pObj = pObj;
-	return pObj;
-}
-
-template< class T, class RefCountAccessor >
-inline void	CSmartPtr<T, RefCountAccessor>::MarkDeleted()
-{
-	m_pObj = NULL;
-}
-
-template< class T, class RefCountAccessor >
-inline void CSmartPtr<T, RefCountAccessor>::operator=(const CSmartPtr<T, RefCountAccessor>& other)
-{
-	*this = other.m_pObj;
-}
-
-template< class T, class RefCountAccessor >
-inline const T* CSmartPtr<T, RefCountAccessor>::operator->() const
-{
-	return m_pObj;
-}
-
-template< class T, class RefCountAccessor >
-inline T* CSmartPtr<T, RefCountAccessor>::operator->()
-{
-	return m_pObj;
-}
-
-template< class T, class RefCountAccessor >
-inline bool CSmartPtr<T, RefCountAccessor>::operator!() const
-{
-	return !m_pObj;
-}
-
-template< class T, class RefCountAccessor >
-inline bool CSmartPtr<T, RefCountAccessor>::operator==(const T* pOther) const
-{
-	return m_pObj == pOther;
-}
-
-template< class T, class RefCountAccessor >
-inline bool CSmartPtr<T, RefCountAccessor>::IsValid() const
-{
-	return m_pObj != NULL;
-}
-
-template< class T, class RefCountAccessor >
-inline T* CSmartPtr<T, RefCountAccessor>::GetObject() const
-{
-	return m_pObj;
-}
-
-
-template < typename T >
-class CAutoPushPop
-{
-public:
-	explicit CAutoPushPop(T& var) : m_rVar(var), m_valPop(var) {}
-	CAutoPushPop(T& var, T const& valPush) : m_rVar(var), m_valPop(var) { m_rVar = valPush; }
-	CAutoPushPop(T& var, T const& valPush, T const& valPop) : m_rVar(var), m_valPop(var) { m_rVar = valPush; }
-
-	~CAutoPushPop() { m_rVar = m_valPop; }
-
-private:	  
-	CAutoPushPop(CAutoPushPop const& x);
-	CAutoPushPop& operator = (CAutoPushPop const& x);
-
-public:
-	T& Get() { return m_rVar; }
-
-private:
-	T& m_rVar;
-	T m_valPop;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/soundflags.h b/SpyCustom/soundflags.h
deleted file mode 100644
index c24ce8f..0000000
--- a/SpyCustom/soundflags.h
+++ /dev/null
@@ -1,161 +0,0 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose:
-//
-// $NoKeywords: $
-//=============================================================================//
-
-#ifndef SOUNDFLAGS_H
-#define SOUNDFLAGS_H
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-
-//-----------------------------------------------------------------------------
-// channels
-//-----------------------------------------------------------------------------
-enum
-{
-	CHAN_REPLACE = -1,
-	CHAN_AUTO = 0,
-	CHAN_WEAPON = 1,
-	CHAN_VOICE = 2,
-	CHAN_ITEM = 3,
-	CHAN_BODY = 4,
-	CHAN_STREAM = 5,		// allocate stream channel from the static or dynamic area
-	CHAN_STATIC = 6,		// allocate channel from the static area 
-	CHAN_VOICE2 = 7,
-	CHAN_VOICE_BASE = 8,		// allocate channel for network voice data
-	CHAN_USER_BASE = (CHAN_VOICE_BASE + 128)		// Anything >= this number is allocated to game code.
-};
-
-//-----------------------------------------------------------------------------
-// common volume values
-//-----------------------------------------------------------------------------
-#define VOL_NORM		1.0f
-
-
-//-----------------------------------------------------------------------------
-// common attenuation values
-//-----------------------------------------------------------------------------
-#define ATTN_NONE		0.0f
-#define ATTN_NORM		0.8f
-#define ATTN_IDLE		2.0f
-#define ATTN_STATIC		1.25f 
-#define ATTN_RICOCHET	1.5f
-
-// HL2 world is 8x bigger now! We want to hear gunfire from farther.
-// Don't change this without consulting Kelly or Wedge (sjb).
-#define ATTN_GUNFIRE	0.27f
-
-enum soundlevel_t
-{
-	SNDLVL_NONE = 0,
-
-	SNDLVL_20dB = 20,			// rustling leaves
-	SNDLVL_25dB = 25,			// whispering
-	SNDLVL_30dB = 30,			// library
-	SNDLVL_35dB = 35,
-	SNDLVL_40dB = 40,
-	SNDLVL_45dB = 45,			// refrigerator
-
-	SNDLVL_50dB = 50,	// 3.9	// average home
-	SNDLVL_55dB = 55,	// 3.0
-
-	SNDLVL_IDLE = 60,	// 2.0	
-	SNDLVL_60dB = 60,	// 2.0	// normal conversation, clothes dryer
-
-	SNDLVL_65dB = 65,	// 1.5	// washing machine, dishwasher
-	SNDLVL_STATIC = 66,	// 1.25
-
-	SNDLVL_70dB = 70,	// 1.0	// car, vacuum cleaner, mixer, electric sewing machine
-
-	SNDLVL_NORM = 75,
-	SNDLVL_75dB = 75,	// 0.8	// busy traffic
-
-	SNDLVL_80dB = 80,	// 0.7	// mini-bike, alarm clock, noisy restaurant, office tabulator, outboard motor, passing snowmobile
-	SNDLVL_TALKING = 80,	// 0.7
-	SNDLVL_85dB = 85,	// 0.6	// average factory, electric shaver
-	SNDLVL_90dB = 90,	// 0.5	// screaming child, passing motorcycle, convertible ride on frw
-	SNDLVL_95dB = 95,
-	SNDLVL_100dB = 100,	// 0.4	// subway train, diesel truck, woodworking shop, pneumatic drill, boiler shop, jackhammer
-	SNDLVL_105dB = 105,			// helicopter, power mower
-	SNDLVL_110dB = 110,			// snowmobile drvrs seat, inboard motorboat, sandblasting
-	SNDLVL_120dB = 120,			// auto horn, propeller aircraft
-	SNDLVL_130dB = 130,			// air raid siren
-
-	SNDLVL_GUNFIRE = 140,	// 0.27	// THRESHOLD OF PAIN, gunshot, jet engine
-	SNDLVL_140dB = 140,	// 0.2
-
-	SNDLVL_150dB = 150,	// 0.2
-
-	SNDLVL_180dB = 180,			// rocket launching
-
-	// NOTE: Valid soundlevel_t values are 0-255.
-	//       256-511 are reserved for sounds using goldsrc compatibility attenuation.
-};
-
-#define MAX_SNDLVL_BITS		9	// Used to encode 0-255 for regular soundlevel_t's and 256-511 for goldsrc-compatible ones.
-#define MIN_SNDLVL_VALUE	0
-#define MAX_SNDLVL_VALUE	((1<<MAX_SNDLVL_BITS)-1)
-
-
-#define ATTN_TO_SNDLVL( a ) (soundlevel_t)(int)((a) ? (50 + 20 / ((float)a)) : 0 )
-#define SNDLVL_TO_ATTN( a ) ((a > 50) ? (20.0f / (float)(a - 50)) : 4.0 )
-
-// This is a limit due to network encoding.
-// It encodes attenuation * 64 in 8 bits, so the maximum is (255 / 64)
-#define MAX_ATTENUATION		3.98f
-
-//-----------------------------------------------------------------------------
-// Flags to be or-ed together for the iFlags field
-//-----------------------------------------------------------------------------
-enum SoundFlags_t
-{
-	SND_NOFLAGS = 0,			// to keep the compiler happy
-	SND_CHANGE_VOL = (1 << 0),		// change sound vol
-	SND_CHANGE_PITCH = (1 << 1),		// change sound pitch
-	SND_STOP = (1 << 2),		// stop the sound
-	SND_SPAWNING = (1 << 3),		// we're spawning, used in some cases for ambients
-										// not sent over net, only a param between dll and server.
-										SND_DELAY = (1 << 4),		// sound has an initial delay
-										SND_STOP_LOOPING = (1 << 5),		// stop all looping sounds on the entity.
-										SND_SPEAKER = (1 << 6),		// being played again by a microphone through a speaker
-
-										SND_SHOULDPAUSE = (1 << 7),		// this sound should be paused if the game is paused
-										SND_IGNORE_PHONEMES = (1 << 8),
-										SND_IGNORE_NAME = (1 << 9),		// used to change all sounds emitted by an entity, regardless of scriptname
-
-										SND_DO_NOT_OVERWRITE_EXISTING_ON_CHANNEL = (1 << 10),
-};
-
-#define SND_FLAG_BITS_ENCODE 11
-
-#define MAX_SOUND_INDEX_BITS	14
-#define	MAX_SOUNDS				(1<<MAX_SOUND_INDEX_BITS)
-
-#if !defined( IN_XBOX_CODELINE )
-// +/-4096 msec
-#define MAX_SOUND_DELAY_MSEC_ENCODE_BITS	(13)
-#else
-// +/-65536 msec, 64 seconds
-#define MAX_SOUND_DELAY_MSEC_ENCODE_BITS	(17)
-#endif
-
-// Subtract one to leave room for the sign bit
-#define MAX_SOUND_DELAY_MSEC				(1<<(MAX_SOUND_DELAY_MSEC_ENCODE_BITS-1))    // 4096 msec or about 4 seconds
-
-//-----------------------------------------------------------------------------
-// common pitch values
-//-----------------------------------------------------------------------------
-#define	PITCH_NORM		100			// non-pitch shifted
-#define PITCH_LOW		95			// other values are possible - 0-255, where 255 is very high
-#define PITCH_HIGH		120
-
-#define DEFAULT_SOUND_PACKET_VOLUME 1.0f
-#define DEFAULT_SOUND_PACKET_PITCH	100
-#define DEFAULT_SOUND_PACKET_DELAY	0.0f
-
-#endif // SOUNDFLAGS_H
\ No newline at end of file
diff --git a/SpyCustom/ssemath.h b/SpyCustom/ssemath.h
deleted file mode 100644
index 9eb46a7..0000000
--- a/SpyCustom/ssemath.h
+++ /dev/null
@@ -1,5027 +0,0 @@
-#ifndef SSEMATH_H
-#define SSEMATH_H
-
-#if defined( _X360 )
-#include <xboxmath.h>
-#elif defined ( _PS3 )
-#include <vectormath/c/vectormath_aos.h>
-#include <vectormath/c/vectormath_aos_v.h>
-#else
-#include <xmmintrin.h>
-#ifndef _LINUX
-#include <emmintrin.h>
-#endif
-#endif
-
-#ifndef SPU
-#include "vector.h"
-#include "mathlib.h"
-#else
-#include "mathlib/math_pfns.h"
-#endif
-
-#include "fltx4.h"
-
-#ifdef _X360
-typedef __vector4 FLTX4;
-#elif defined( _PS3 )
-typedef vec_float4 FLTX4;
-#else
-typedef const fltx4& FLTX4;
-#endif
-
-struct ALIGN16 intx4
-{
-	int32 m_i32[4];
-
-	inline int& operator[](int which)
-	{
-		return m_i32[which];
-	}
-
-	inline const int& operator[](int which) const
-	{
-		return m_i32[which];
-	}
-
-	inline int32* Base() {
-		return m_i32;
-	}
-
-	inline const int32* Base() const
-	{
-		return m_i32;
-	}
-
-	inline bool operator==(const intx4& other) const
-	{
-		return m_i32[0] == other.m_i32[0] &&
-			m_i32[1] == other.m_i32[1] &&
-			m_i32[2] == other.m_i32[2] &&
-			m_i32[3] == other.m_i32[3];
-	}
-} ALIGN16_POST;
-
-
-#if defined( _DEBUG ) && defined( _X360 )
-FORCEINLINE void TestVPUFlags()
-{
-	__vector4 a;
-	__asm
-	{
-		mfvscr	a;
-	}
-	unsigned int* flags = (unsigned int*)&a;
-	unsigned int   controlWord = flags[3];
-	Assert(controlWord == 0);
-}
-#else   
-FORCEINLINE void TestVPUFlags() {}
-#endif  
-
-
-#ifdef _X360
-#define			   Four_Zeros			XMVectorZero()			    
-#define			   Four_Ones			XMVectorSplatOne()		    
-extern const fltx4 Four_Twos;									    
-extern const fltx4 Four_Threes;									    
-extern const fltx4 Four_Fours;									 
-extern const fltx4 Four_Point225s;								    
-extern const fltx4 Four_PointFives;								    
-extern const fltx4 Four_Thirds;									 
-extern const fltx4 Four_TwoThirds;								 
-extern const fltx4 Four_NegativeOnes;							     
-extern const fltx4 Four_DegToRad;								     
-#elif defined(SPU)
-#define			   Four_Zeros			spu_splats( 0.0f )		    
-#define			   Four_Ones			spu_splats( 1.0f )		    
-#define			   Four_Twos			spu_splats( 2.0f )		    
-#define			   Four_Threes			spu_splats( 3.0f )		    
-#define			   Four_Fours			spu_splats( 4.0f )		 
-#define			   Four_Point225s		spu_splats( 0.225f )		    
-#define			   Four_PointFives		spu_splats( 0.5f )		    
-#define			   Four_Thirds			spu_splats( 0.33333333 );	 
-#define			   Four_TwoThirds		spu_splats( 0.66666666 );	 
-#define			   Four_NegativeOnes	spu_splats( -1.0f )		     
-#define			   Four_DegToRad		spu_splats((float)(M_PI_F / 180.f))
-#else
-extern const fltx4 Four_Zeros;									    
-extern const fltx4 Four_Ones;									    
-extern const fltx4 Four_Twos;									    
-extern const fltx4 Four_Threes;									    
-extern const fltx4 Four_Fours;									 
-extern const fltx4 Four_Point225s;								    
-extern const fltx4 Four_PointFives;								    
-extern const fltx4 Four_Thirds;									 
-extern const fltx4 Four_TwoThirds;								 
-extern const fltx4 Four_NegativeOnes;							     
-extern const fltx4 Four_DegToRad;								     
-#endif
-extern const fltx4 Four_Epsilons;								    
-extern const fltx4 Four_2ToThe21s;								 
-extern const fltx4 Four_2ToThe22s;								 
-extern const fltx4 Four_2ToThe23s;								 
-extern const fltx4 Four_2ToThe24s;								 
-extern const fltx4 Four_Origin;									           
-extern const fltx4 Four_FLT_MAX;								    
-extern const fltx4 Four_Negative_FLT_MAX;						    
-extern const fltx4 g_SIMD_0123;									      
-
-
-extern const fltx4 Four_LinearToGammaCoefficients_A;		 
-extern const fltx4 Four_LinearToGammaCoefficients_B;		 
-extern const fltx4 Four_LinearToGammaCoefficients_C;		 
-extern const fltx4 Four_LinearToGammaCoefficients_D;		 
-extern const fltx4 Four_LinearToGammaCoefficients_E;		 
-
-extern const fltx4 Four_GammaToLinearCoefficients_A;		 
-extern const fltx4 Four_GammaToLinearCoefficients_B;		 
-extern const fltx4 Four_GammaToLinearCoefficients_C;		 
-extern const fltx4 Four_GammaToLinearCoefficients_D;		 
-
-
-#ifndef ALIGN16_POST
-#define ALIGN16_POST
-#endif
-extern const ALIGN16 int32 g_SIMD_clear_signmask[] ALIGN16_POST;			   
-extern const ALIGN16 int32 g_SIMD_signmask[] ALIGN16_POST;				   
-extern const ALIGN16 int32 g_SIMD_lsbmask[] ALIGN16_POST;				   
-extern const ALIGN16 int32 g_SIMD_clear_wmask[] ALIGN16_POST;			    
-extern const ALIGN16 int32 g_SIMD_ComponentMask[4][4] ALIGN16_POST;		                
-extern const ALIGN16 int32 g_SIMD_AllOnesMask[] ALIGN16_POST;			 
-extern const fltx4 g_SIMD_Identity[4];									                
-extern const ALIGN16 int32 g_SIMD_Low16BitsMask[] ALIGN16_POST;			   
-
-extern const int32 ALIGN16 g_SIMD_SkipTailMask[4][4] ALIGN16_POST;
-
-extern const int32 ALIGN16 g_SIMD_EveryOtherMask[];				    
-#ifdef PLATFORM_PPC
-#if defined(_X360)
-#define PREFETCH360(address, offset) __dcbt(offset,address)
-#elif defined(_PS3)
-#define PREFETCH360(address, offset) __dcbt( reinterpret_cast< const char * >(address) + offset )
-#else
-#error Prefetch not defined for this platform!
-#endif
-#else
-#define PREFETCH360(x,y)  
-#endif
-
-template<class T>
-inline T* AlignPointer(void* ptr)
-{
-#if defined( __clang__ )
-	uintp temp = (uintp)ptr;
-#else
-	unsigned temp = ptr;
-#endif
-	temp = ALIGN_VALUE(temp, sizeof(T));
-	return (T*)temp;
-}
-
-#ifdef _PS3
-
-#define _VEC_CLEAR_SIGNMASK (__vector unsigned int)		{0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff}
-#define _VEC_SIGNMASK		(__vector unsigned int)		{ 0x80000000, 0x80000000, 0x80000000, 0x80000000 }
-#define _VEC_LSBMASK		(__vector unsigned int)		{ 0xfffffffe, 0xfffffffe, 0xfffffffe, 0xfffffffe }
-#define _VEC_CLEAR_WMASK	(__vector unsigned int)		{0xffffffff, 0xffffffff, 0xffffffff, 0}
-#define _VEC_COMPONENT_MASK_0 (__vector unsigned int)	{0xffffffff, 0, 0, 0}
-#define _VEC_COMPONENT_MASK_1 (__vector unsigned int)	{0, 0xffffffff, 0, 0}
-#define _VEC_COMPONENT_MASK_2 (__vector unsigned int)	{0, 0, 0xffffffff, 0}
-#define _VEC_COMPONENT_MASK_3 (__vector unsigned int)	{0, 0, 0, 0xffffffff}
-
-#define _VEC_SWIZZLE_WZYX (__vector unsigned char)		{ 0x0c,0x0d,0x0e,0x0f, 0x08,0x09,0x0a,0x0b, 0x04,0x05,0x06,0x07, 0x00,0x01,0x02,0x03 }
-#define _VEC_SWIZZLE_ZWXY (__vector unsigned char)		{ 0x08,0x09,0x0a,0x0b, 0x0c,0x0d,0x0e,0x0f, 0x00,0x01,0x02,0x03, 0x04,0x05,0x06,0x07 }
-#define _VEC_SWIZZLE_YXWZ (__vector unsigned char)		{ 0x04,0x05,0x06,0x07, 0x00,0x01,0x02,0x03, 0x0c,0x0d,0x0e,0x0f, 0x08,0x09,0x0a,0x0b }
-
-#define _VEC_ZERO           (__vector unsigned int)		{0,0,0,0}
-
-#define _VEC_FLTMAX			(__vector float)			{FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX}
-#define _VEC_FLTMIN			(__vector float)			{FLT_MIN,FLT_MIN,FLT_MIN,FLT_MIN}
-
-#define _VEC_ORIGIN			(__vector unsigned int)		{ 0x00000000, 0x00000000, 0x00000000, 0xffffffff }
-
-#endif
-
-#if USE_STDC_FOR_SIMD
-
-FORCEINLINE float SubFloat(const fltx4& a, int idx)
-{
-	return a.m128_f32[idx];
-}
-
-FORCEINLINE float& SubFloat(fltx4& a, int idx)
-{
-	return a.m128_f32[idx];
-}
-
-FORCEINLINE uint32 SubInt(const fltx4& a, int idx)
-{
-	return a.m128_u32[idx];
-}
-
-FORCEINLINE uint32& SubInt(fltx4& a, int idx)
-{
-	return a.m128_u32[idx];
-}
-
-FORCEINLINE fltx4 LoadZeroSIMD(void)
-{
-	return Four_Zeros;
-}
-
-FORCEINLINE fltx4 LoadOneSIMD(void)
-{
-	return Four_Ones;
-}
-
-FORCEINLINE fltx4 SplatXSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 0);
-	SubFloat(retVal, 1) = SubFloat(a, 0);
-	SubFloat(retVal, 2) = SubFloat(a, 0);
-	SubFloat(retVal, 3) = SubFloat(a, 0);
-	return retVal;
-}
-
-FORCEINLINE fltx4 SplatYSIMD(fltx4 a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 1);
-	SubFloat(retVal, 1) = SubFloat(a, 1);
-	SubFloat(retVal, 2) = SubFloat(a, 1);
-	SubFloat(retVal, 3) = SubFloat(a, 1);
-	return retVal;
-}
-
-FORCEINLINE fltx4 SplatZSIMD(fltx4 a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 2);
-	SubFloat(retVal, 1) = SubFloat(a, 2);
-	SubFloat(retVal, 2) = SubFloat(a, 2);
-	SubFloat(retVal, 3) = SubFloat(a, 2);
-	return retVal;
-}
-
-FORCEINLINE fltx4 SplatWSIMD(fltx4 a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 3);
-	SubFloat(retVal, 1) = SubFloat(a, 3);
-	SubFloat(retVal, 2) = SubFloat(a, 3);
-	SubFloat(retVal, 3) = SubFloat(a, 3);
-	return retVal;
-}
-
-FORCEINLINE fltx4 SetXSIMD(const fltx4& a, const fltx4& x)
-{
-	fltx4 result = a;
-	SubFloat(result, 0) = SubFloat(x, 0);
-	return result;
-}
-
-FORCEINLINE fltx4 SetYSIMD(const fltx4& a, const fltx4& y)
-{
-	fltx4 result = a;
-	SubFloat(result, 1) = SubFloat(y, 1);
-	return result;
-}
-
-FORCEINLINE fltx4 SetZSIMD(const fltx4& a, const fltx4& z)
-{
-	fltx4 result = a;
-	SubFloat(result, 2) = SubFloat(z, 2);
-	return result;
-}
-
-FORCEINLINE fltx4 SetWSIMD(const fltx4& a, const fltx4& w)
-{
-	fltx4 result = a;
-	SubFloat(result, 3) = SubFloat(w, 3);
-	return result;
-}
-
-FORCEINLINE fltx4 SetComponentSIMD(const fltx4& a, int nComponent, float flValue)
-{
-	fltx4 result = a;
-	SubFloat(result, nComponent) = flValue;
-	return result;
-}
-
-
-FORCEINLINE fltx4 RotateLeft(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 1);
-	SubFloat(retVal, 1) = SubFloat(a, 2);
-	SubFloat(retVal, 2) = SubFloat(a, 3);
-	SubFloat(retVal, 3) = SubFloat(a, 0);
-	return retVal;
-}
-
-FORCEINLINE fltx4 RotateLeft2(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = SubFloat(a, 2);
-	SubFloat(retVal, 1) = SubFloat(a, 3);
-	SubFloat(retVal, 2) = SubFloat(a, 0);
-	SubFloat(retVal, 3) = SubFloat(a, 1);
-	return retVal;
-}
-
-#define BINOP(op) 														\
-	fltx4 retVal;                                          				\
-	SubFloat( retVal, 0 ) = ( SubFloat( a, 0 ) op SubFloat( b, 0 ) );	\
-	SubFloat( retVal, 1 ) = ( SubFloat( a, 1 ) op SubFloat( b, 1 ) );	\
-	SubFloat( retVal, 2 ) = ( SubFloat( a, 2 ) op SubFloat( b, 2 ) );	\
-	SubFloat( retVal, 3 ) = ( SubFloat( a, 3 ) op SubFloat( b, 3 ) );	\
-    return retVal;
-
-#define IBINOP(op) 														\
-	fltx4 retVal;														\
-	SubInt( retVal, 0 ) = ( SubInt( a, 0 ) op SubInt ( b, 0 ) );		\
-	SubInt( retVal, 1 ) = ( SubInt( a, 1 ) op SubInt ( b, 1 ) );		\
-	SubInt( retVal, 2 ) = ( SubInt( a, 2 ) op SubInt ( b, 2 ) );		\
-	SubInt( retVal, 3 ) = ( SubInt( a, 3 ) op SubInt ( b, 3 ) );		\
-    return retVal;
-
-FORCEINLINE fltx4 AddSIMD(const fltx4& a, const fltx4& b)
-{
-	BINOP(+);
-}
-
-FORCEINLINE fltx4 SubSIMD(const fltx4& a, const fltx4& b)				 
-{
-	BINOP(-);
-};
-
-FORCEINLINE fltx4 MulSIMD(const fltx4& a, const fltx4& b)				 
-{
-	BINOP(*);
-}
-
-FORCEINLINE fltx4 DivSIMD(const fltx4& a, const fltx4& b)				 
-{
-	BINOP(/ );
-}
-
-FORCEINLINE fltx4 DivEstSIMD(const fltx4& a, const fltx4& b)			 
-{
-	BINOP(/ );
-}
-
-FORCEINLINE fltx4 MaddSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return AddSIMD(MulSIMD(a, b), c);
-}
-
-FORCEINLINE fltx4 MsubSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return SubSIMD(c, MulSIMD(a, b));
-};
-
-
-FORCEINLINE fltx4 SinSIMD(const fltx4& radians)
-{
-	fltx4 result;
-	SubFloat(result, 0) = sin(SubFloat(radians, 0));
-	SubFloat(result, 1) = sin(SubFloat(radians, 1));
-	SubFloat(result, 2) = sin(SubFloat(radians, 2));
-	SubFloat(result, 3) = sin(SubFloat(radians, 3));
-	return result;
-}
-
-FORCEINLINE void SinCos3SIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	SinCos(SubFloat(radians, 0), &SubFloat(sine, 0), &SubFloat(cosine, 0));
-	SinCos(SubFloat(radians, 1), &SubFloat(sine, 1), &SubFloat(cosine, 1));
-	SinCos(SubFloat(radians, 2), &SubFloat(sine, 2), &SubFloat(cosine, 2));
-}
-
-FORCEINLINE void SinCosSIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	SinCos(SubFloat(radians, 0), &SubFloat(sine, 0), &SubFloat(cosine, 0));
-	SinCos(SubFloat(radians, 1), &SubFloat(sine, 1), &SubFloat(cosine, 1));
-	SinCos(SubFloat(radians, 2), &SubFloat(sine, 2), &SubFloat(cosine, 2));
-	SinCos(SubFloat(radians, 3), &SubFloat(sine, 3), &SubFloat(cosine, 3));
-}
-
-FORCEINLINE fltx4 ArcSinSIMD(const fltx4& sine)
-{
-	fltx4 result;
-	SubFloat(result, 0) = asin(SubFloat(sine, 0));
-	SubFloat(result, 1) = asin(SubFloat(sine, 1));
-	SubFloat(result, 2) = asin(SubFloat(sine, 2));
-	SubFloat(result, 3) = asin(SubFloat(sine, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 ArcCosSIMD(const fltx4& cs)
-{
-	fltx4 result;
-	SubFloat(result, 0) = acos(SubFloat(cs, 0));
-	SubFloat(result, 1) = acos(SubFloat(cs, 1));
-	SubFloat(result, 2) = acos(SubFloat(cs, 2));
-	SubFloat(result, 3) = acos(SubFloat(cs, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 ArcTan2SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 result;
-	SubFloat(result, 0) = atan2(SubFloat(a, 0), SubFloat(b, 0));
-	SubFloat(result, 1) = atan2(SubFloat(a, 1), SubFloat(b, 1));
-	SubFloat(result, 2) = atan2(SubFloat(a, 2), SubFloat(b, 2));
-	SubFloat(result, 3) = atan2(SubFloat(a, 3), SubFloat(b, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 MaxSIMD(const fltx4& a, const fltx4& b)				 
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = max(SubFloat(a, 0), SubFloat(b, 0));
-	SubFloat(retVal, 1) = max(SubFloat(a, 1), SubFloat(b, 1));
-	SubFloat(retVal, 2) = max(SubFloat(a, 2), SubFloat(b, 2));
-	SubFloat(retVal, 3) = max(SubFloat(a, 3), SubFloat(b, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 MinSIMD(const fltx4& a, const fltx4& b)				 
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = min(SubFloat(a, 0), SubFloat(b, 0));
-	SubFloat(retVal, 1) = min(SubFloat(a, 1), SubFloat(b, 1));
-	SubFloat(retVal, 2) = min(SubFloat(a, 2), SubFloat(b, 2));
-	SubFloat(retVal, 3) = min(SubFloat(a, 3), SubFloat(b, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 AndSIMD(const fltx4& a, const fltx4& b)				   
-{
-	IBINOP(&);
-}
-
-FORCEINLINE fltx4 AndNotSIMD(const fltx4& a, const fltx4& b)			   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = ~SubInt(a, 0) & SubInt(b, 0);
-	SubInt(retVal, 1) = ~SubInt(a, 1) & SubInt(b, 1);
-	SubInt(retVal, 2) = ~SubInt(a, 2) & SubInt(b, 2);
-	SubInt(retVal, 3) = ~SubInt(a, 3) & SubInt(b, 3);
-	return retVal;
-}
-
-FORCEINLINE fltx4 XorSIMD(const fltx4& a, const fltx4& b)				   
-{
-	IBINOP(^);
-}
-
-FORCEINLINE fltx4 OrSIMD(const fltx4& a, const fltx4& b)				   
-{
-	IBINOP(| );
-}
-
-FORCEINLINE fltx4 NegSIMD(const fltx4& a)   
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = -SubFloat(a, 0);
-	SubFloat(retval, 1) = -SubFloat(a, 1);
-	SubFloat(retval, 2) = -SubFloat(a, 2);
-	SubFloat(retval, 3) = -SubFloat(a, 3);
-
-	return retval;
-}
-
-FORCEINLINE bool IsAllZeros(const fltx4& a)								     
-{
-	return	(SubFloat(a, 0) == 0.0) &&
-		(SubFloat(a, 1) == 0.0) &&
-		(SubFloat(a, 2) == 0.0) &&
-		(SubFloat(a, 3) == 0.0);
-}
-
-
-FORCEINLINE bool IsAllGreaterThan(const fltx4& a, const fltx4& b)
-{
-	return	SubFloat(a, 0) > SubFloat(b, 0) &&
-		SubFloat(a, 1) > SubFloat(b, 1) &&
-		SubFloat(a, 2) > SubFloat(b, 2) &&
-		SubFloat(a, 3) > SubFloat(b, 3);
-}
-
-FORCEINLINE bool IsAllGreaterThanOrEq(const fltx4& a, const fltx4& b)
-{
-	return	SubFloat(a, 0) >= SubFloat(b, 0) &&
-		SubFloat(a, 1) >= SubFloat(b, 1) &&
-		SubFloat(a, 2) >= SubFloat(b, 2) &&
-		SubFloat(a, 3) >= SubFloat(b, 3);
-}
-
-FORCEINLINE bool IsAllEqual(const fltx4& a, const fltx4& b)
-{
-	return	SubFloat(a, 0) == SubFloat(b, 0) &&
-		SubFloat(a, 1) == SubFloat(b, 1) &&
-		SubFloat(a, 2) == SubFloat(b, 2) &&
-		SubFloat(a, 3) == SubFloat(b, 3);
-}
-
-FORCEINLINE bool IsAnyEqual(const fltx4& a, const fltx4& b)
-{
-	return	SubFloat(a, 0) == SubFloat(b, 0) ||
-		SubFloat(a, 1) == SubFloat(b, 1) ||
-		SubFloat(a, 2) == SubFloat(b, 2) ||
-		SubFloat(a, 3) == SubFloat(b, 3);
-}
-
-FORCEINLINE int TestSignSIMD(const fltx4& a)								         
-{
-	int nRet = 0;
-
-	nRet |= (SubInt(a, 0) & 0x80000000) >> 31;     
-	nRet |= (SubInt(a, 1) & 0x80000000) >> 30;     
-	nRet |= (SubInt(a, 2) & 0x80000000) >> 29;     
-	nRet |= (SubInt(a, 3) & 0x80000000) >> 28;     
-
-	return nRet;
-}
-
-FORCEINLINE bool IsAnyNegative(const fltx4& a)							               
-{
-	return (0 != TestSignSIMD(a));
-}
-
-FORCEINLINE bool IsAnyTrue(const fltx4& a)							               
-{
-	return (0 != TestSignSIMD(a));
-}
-
-FORCEINLINE fltx4 CmpEqSIMD(const fltx4& a, const fltx4& b)				   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) == SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) == SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) == SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) == SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-FORCEINLINE fltx4 CmpGtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) > SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) > SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) > SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) > SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-FORCEINLINE fltx4 CmpGeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) >= SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) >= SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) >= SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) >= SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-FORCEINLINE fltx4 CmpLtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) < SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) < SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) < SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) < SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-FORCEINLINE fltx4 CmpLeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) <= SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) <= SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) <= SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) <= SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-FORCEINLINE fltx4 CmpInBoundsSIMD(const fltx4& a, const fltx4& b)		           
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = (SubFloat(a, 0) <= SubFloat(b, 0) && SubFloat(a, 0) >= -SubFloat(b, 0)) ? ~0 : 0;
-	SubInt(retVal, 1) = (SubFloat(a, 1) <= SubFloat(b, 1) && SubFloat(a, 1) >= -SubFloat(b, 1)) ? ~0 : 0;
-	SubInt(retVal, 2) = (SubFloat(a, 2) <= SubFloat(b, 2) && SubFloat(a, 2) >= -SubFloat(b, 2)) ? ~0 : 0;
-	SubInt(retVal, 3) = (SubFloat(a, 3) <= SubFloat(b, 3) && SubFloat(a, 3) >= -SubFloat(b, 3)) ? ~0 : 0;
-	return retVal;
-}
-
-
-FORCEINLINE fltx4 MaskedAssign(const fltx4& ReplacementMask, const fltx4& NewValue, const fltx4& OldValue)
-{
-	return OrSIMD(
-		AndSIMD(ReplacementMask, NewValue),
-		AndNotSIMD(ReplacementMask, OldValue));
-}
-
-FORCEINLINE fltx4 ReplicateX4(float flValue)					  
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = flValue;
-	SubFloat(retVal, 1) = flValue;
-	SubFloat(retVal, 2) = flValue;
-	SubFloat(retVal, 3) = flValue;
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReplicateIX4(int nValue)
-{
-	fltx4 retVal;
-	SubInt(retVal, 0) = nValue;
-	SubInt(retVal, 1) = nValue;
-	SubInt(retVal, 2) = nValue;
-	SubInt(retVal, 3) = nValue;
-	return retVal;
-
-}
-
-FORCEINLINE fltx4 CeilSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = ceil(SubFloat(a, 0));
-	SubFloat(retVal, 1) = ceil(SubFloat(a, 1));
-	SubFloat(retVal, 2) = ceil(SubFloat(a, 2));
-	SubFloat(retVal, 3) = ceil(SubFloat(a, 3));
-	return retVal;
-
-}
-
-FORCEINLINE fltx4 FloorSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = floor(SubFloat(a, 0));
-	SubFloat(retVal, 1) = floor(SubFloat(a, 1));
-	SubFloat(retVal, 2) = floor(SubFloat(a, 2));
-	SubFloat(retVal, 3) = floor(SubFloat(a, 3));
-	return retVal;
-
-}
-
-FORCEINLINE fltx4 SqrtEstSIMD(const fltx4& a)				    
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = sqrt(SubFloat(a, 0));
-	SubFloat(retVal, 1) = sqrt(SubFloat(a, 1));
-	SubFloat(retVal, 2) = sqrt(SubFloat(a, 2));
-	SubFloat(retVal, 3) = sqrt(SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 SqrtSIMD(const fltx4& a)					 
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = sqrt(SubFloat(a, 0));
-	SubFloat(retVal, 1) = sqrt(SubFloat(a, 1));
-	SubFloat(retVal, 2) = sqrt(SubFloat(a, 2));
-	SubFloat(retVal, 3) = sqrt(SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSIMD(const fltx4& a)		    
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / sqrt(SubFloat(a, 0));
-	SubFloat(retVal, 1) = 1.0 / sqrt(SubFloat(a, 1));
-	SubFloat(retVal, 2) = 1.0 / sqrt(SubFloat(a, 2));
-	SubFloat(retVal, 3) = 1.0 / sqrt(SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / sqrt(SubFloat(a, 0) != 0.0f ? SubFloat(a, 0) : FLT_EPSILON);
-	SubFloat(retVal, 1) = 1.0 / sqrt(SubFloat(a, 1) != 0.0f ? SubFloat(a, 1) : FLT_EPSILON);
-	SubFloat(retVal, 2) = 1.0 / sqrt(SubFloat(a, 2) != 0.0f ? SubFloat(a, 2) : FLT_EPSILON);
-	SubFloat(retVal, 3) = 1.0 / sqrt(SubFloat(a, 3) != 0.0f ? SubFloat(a, 3) : FLT_EPSILON);
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtSIMD(const fltx4& a)			 
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / sqrt(SubFloat(a, 0));
-	SubFloat(retVal, 1) = 1.0 / sqrt(SubFloat(a, 1));
-	SubFloat(retVal, 2) = 1.0 / sqrt(SubFloat(a, 2));
-	SubFloat(retVal, 3) = 1.0 / sqrt(SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalEstSIMD(const fltx4& a)			    
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / SubFloat(a, 0);
-	SubFloat(retVal, 1) = 1.0 / SubFloat(a, 1);
-	SubFloat(retVal, 2) = 1.0 / SubFloat(a, 2);
-	SubFloat(retVal, 3) = 1.0 / SubFloat(a, 3);
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalSIMD(const fltx4& a)				 
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / SubFloat(a, 0);
-	SubFloat(retVal, 1) = 1.0 / SubFloat(a, 1);
-	SubFloat(retVal, 2) = 1.0 / SubFloat(a, 2);
-	SubFloat(retVal, 3) = 1.0 / SubFloat(a, 3);
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / (SubFloat(a, 0) == 0.0f ? FLT_EPSILON : SubFloat(a, 0));
-	SubFloat(retVal, 1) = 1.0 / (SubFloat(a, 1) == 0.0f ? FLT_EPSILON : SubFloat(a, 1));
-	SubFloat(retVal, 2) = 1.0 / (SubFloat(a, 2) == 0.0f ? FLT_EPSILON : SubFloat(a, 2));
-	SubFloat(retVal, 3) = 1.0 / (SubFloat(a, 3) == 0.0f ? FLT_EPSILON : SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 ReciprocalSaturateSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / (SubFloat(a, 0) == 0.0f ? FLT_EPSILON : SubFloat(a, 0));
-	SubFloat(retVal, 1) = 1.0 / (SubFloat(a, 1) == 0.0f ? FLT_EPSILON : SubFloat(a, 1));
-	SubFloat(retVal, 2) = 1.0 / (SubFloat(a, 2) == 0.0f ? FLT_EPSILON : SubFloat(a, 2));
-	SubFloat(retVal, 3) = 1.0 / (SubFloat(a, 3) == 0.0f ? FLT_EPSILON : SubFloat(a, 3));
-	return retVal;
-}
-
-FORCEINLINE fltx4 ExpSIMD(const fltx4& toPower)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = powf(2, SubFloat(toPower, 0));
-	SubFloat(retVal, 1) = powf(2, SubFloat(toPower, 1));
-	SubFloat(retVal, 2) = powf(2, SubFloat(toPower, 2));
-	SubFloat(retVal, 3) = powf(2, SubFloat(toPower, 3));
-
-	return retVal;
-}
-
-FORCEINLINE fltx4 Dot3SIMD(const fltx4& a, const fltx4& b)
-{
-	float flDot = SubFloat(a, 0) * SubFloat(b, 0) +
-		SubFloat(a, 1) * SubFloat(b, 1) +
-		SubFloat(a, 2) * SubFloat(b, 2);
-	return ReplicateX4(flDot);
-}
-
-FORCEINLINE fltx4 Dot4SIMD(const fltx4& a, const fltx4& b)
-{
-	float flDot = SubFloat(a, 0) * SubFloat(b, 0) +
-		SubFloat(a, 1) * SubFloat(b, 1) +
-		SubFloat(a, 2) * SubFloat(b, 2) +
-		SubFloat(a, 3) * SubFloat(b, 3);
-	return ReplicateX4(flDot);
-}
-
-FORCEINLINE fltx4 ClampVectorSIMD(FLTX4 in, FLTX4 min, FLTX4 max)
-{
-	return MaxSIMD(min, MinSIMD(max, in));
-}
-
-FORCEINLINE fltx4 SetWToZeroSIMD(const fltx4& a)
-{
-	fltx4 retval;
-	retval = a;
-	SubFloat(retval, 0) = 0;
-	return retval;
-}
-
-FORCEINLINE fltx4 LoadUnalignedSIMD(const void* pSIMD)
-{
-	return *(reinterpret_cast<const fltx4*> (pSIMD));
-}
-
-FORCEINLINE fltx4 LoadUnaligned3SIMD(const void* pSIMD)
-{
-	return *(reinterpret_cast<const fltx4*> (pSIMD));
-}
-
-FORCEINLINE fltx4 LoadUnalignedFloatSIMD(const float* pFlt)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = *pFlt;
-	return retval;
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const void* pSIMD)
-{
-	return *(reinterpret_cast<const fltx4*> (pSIMD));
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned& pSIMD)
-{
-	fltx4 retval = LoadAlignedSIMD(pSIMD.Base());
-	SubInt(retval, 3) = 0;
-	return retval;
-}
-
-
-FORCEINLINE fltx4 LoadGatherSIMD(const float& x, const float& y, const float& z, const float& w)
-{
-	fltx4 retval = { x, y, z, w };
-	return retval;
-}
-
-FORCEINLINE void StoreAlignedSIMD(float* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<fltx4*> (pSIMD)) = a;
-}
-
-FORCEINLINE void StoreUnalignedSIMD(float* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<fltx4*> (pSIMD)) = a;
-}
-
-FORCEINLINE void StoreUnalignedFloat(float* pSingleFloat, const fltx4& a)
-{
-	*pSingleFloat = SubFloat(a, 0);
-}
-
-FORCEINLINE void StoreUnaligned3SIMD(float* pSIMD, const fltx4& a)
-{
-	*pSIMD = SubFloat(a, 0);
-	*(pSIMD + 1) = SubFloat(a, 1);
-	*(pSIMD + 2) = SubFloat(a, 2);
-}
-
-
-FORCEINLINE void StoreAligned3SIMD(VectorAligned* RESTRICT pSIMD, const fltx4& a)
-{
-	StoreAlignedSIMD(pSIMD->Base(), a);
-}
-
-FORCEINLINE void StoreFourUnalignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-
-FORCEINLINE void StoreFourAlignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-
-
-FORCEINLINE void TransposeSIMD(fltx4& x, fltx4& y, fltx4& z, fltx4& w)
-{
-#define SWAP_FLOATS( _a_, _ia_, _b_, _ib_ ) { float tmp = SubFloat( _a_, _ia_ ); SubFloat( _a_, _ia_ ) = SubFloat( _b_, _ib_ ); SubFloat( _b_, _ib_ ) = tmp; }
-	SWAP_FLOATS(x, 1, y, 0);
-	SWAP_FLOATS(x, 2, z, 0);
-	SWAP_FLOATS(x, 3, w, 0);
-	SWAP_FLOATS(y, 2, z, 1);
-	SWAP_FLOATS(y, 3, w, 1);
-	SWAP_FLOATS(z, 3, w, 2);
-}
-
-FORCEINLINE fltx4 FindLowestSIMD3(const fltx4& a)
-{
-	float lowest = min(min(SubFloat(a, 0), SubFloat(a, 1)), SubFloat(a, 2));
-	return ReplicateX4(lowest);
-}
-
-FORCEINLINE fltx4 FindHighestSIMD3(const fltx4& a)
-{
-	float highest = max(max(SubFloat(a, 0), SubFloat(a, 1)), SubFloat(a, 2));
-	return ReplicateX4(highest);
-}
-
-FORCEINLINE void ConvertStoreAsIntsSIMD(intx4* RESTRICT pDest, const fltx4& vSrc)
-{
-	(*pDest)[0] = SubFloat(vSrc, 0);
-	(*pDest)[1] = SubFloat(vSrc, 1);
-	(*pDest)[2] = SubFloat(vSrc, 2);
-	(*pDest)[3] = SubFloat(vSrc, 3);
-}
-
-FORCEINLINE fltx4 IntSetImmediateSIMD(int nValue)
-{
-	fltx4 retval;
-	SubInt(retval, 0) = SubInt(retval, 1) = SubInt(retval, 2) = SubInt(retval, 3) = nValue;
-	return retval;
-}
-
-FORCEINLINE i32x4 LoadAlignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return *(reinterpret_cast<const i32x4*> (pSIMD));
-}
-
-FORCEINLINE i32x4 LoadUnalignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return *(reinterpret_cast<const i32x4*> (pSIMD));
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(int32* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<i32x4*> (pSIMD)) = a;
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(intx4& pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<i32x4*> (pSIMD.Base())) = a;
-}
-
-FORCEINLINE void StoreUnalignedIntSIMD(int32* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<i32x4*> (pSIMD)) = a;
-}
-
-FORCEINLINE fltx4 LoadAndConvertUint16SIMD(const uint16* pInts)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = pInts[0];
-	SubFloat(retval, 1) = pInts[1];
-	SubFloat(retval, 2) = pInts[2];
-	SubFloat(retval, 3) = pInts[3];
-}
-
-
-FORCEINLINE fltx4 UnsignedIntConvertToFltSIMD(const u32x4& vSrcA)
-{
-	Assert(0);			      
-	fltx4 retval;
-	SubFloat(retval, 0) = ((float)SubInt(vSrcA, 0));
-	SubFloat(retval, 1) = ((float)SubInt(vSrcA, 1));
-	SubFloat(retval, 2) = ((float)SubInt(vSrcA, 2));
-	SubFloat(retval, 3) = ((float)SubInt(vSrcA, 3));
-	return retval;
-}
-
-
-#if 0				      
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = ((float)(reinterpret_cast<int32*>(&vSrcA.m128_s32[0])));
-	SubFloat(retval, 1) = ((float)(reinterpret_cast<int32*>(&vSrcA.m128_s32[1])));
-	SubFloat(retval, 2) = ((float)(reinterpret_cast<int32*>(&vSrcA.m128_s32[2])));
-	SubFloat(retval, 3) = ((float)(reinterpret_cast<int32*>(&vSrcA.m128_s32[3])));
-	return retval;
-}
-
-
-FORCEINLINE i32x4 IntShiftLeftWordSIMD(const i32x4& vSrcA, const i32x4& vSrcB)
-{
-	i32x4 retval;
-	SubInt(retval, 0) = SubInt(vSrcA, 0) << SubInt(vSrcB, 0);
-	SubInt(retval, 1) = SubInt(vSrcA, 1) << SubInt(vSrcB, 1);
-	SubInt(retval, 2) = SubInt(vSrcA, 2) << SubInt(vSrcB, 2);
-	SubInt(retval, 3) = SubInt(vSrcA, 3) << SubInt(vSrcB, 3);
-
-
-	return retval;
-}
-
-#endif
-
-#elif ( defined( _PS3 ) )
-#define SN_IMPROVED_INTRINSICS ( (( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )) ||\
-							     (defined(__SN_VER__) && (__SN_VER__ > 25002)) )
-
-FORCEINLINE float FloatSIMD(fltx4& a, int idx)
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_extract(a, idx);
-#else
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-	return a_union.m128_f32[idx];
-#endif
-}
-
-FORCEINLINE unsigned int UIntSIMD(u32x4& a, int idx)
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_extract(a, idx);
-#else
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxui);
-	return a_union.m128_u32[idx];
-#endif
-}
-
-FORCEINLINE fltx4 AddSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_add(a, b);
-}
-
-FORCEINLINE fltx4 SubSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return vec_sub(a, b);
-}
-
-FORCEINLINE fltx4 MulSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return vec_madd(a, b, _VEC_ZEROF);
-}
-
-FORCEINLINE fltx4 MaddSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return vec_madd(a, b, c);
-}
-
-FORCEINLINE fltx4 MsubSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return vec_nmsub(a, b, c);
-};
-
-FORCEINLINE fltx4 Dot3SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 result;
-
-	result = vec_madd(a, b, _VEC_ZEROF);
-	result = vec_madd(vec_sld(a, a, 4), vec_sld(b, b, 4), result);
-	result = vec_madd(vec_sld(a, a, 8), vec_sld(b, b, 8), result);
-
-	result = vec_splat(result, 0);
-
-	return result;
-}
-
-FORCEINLINE fltx4 Dot4SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 result;
-
-	result = vec_madd(a, b, _VEC_ZEROF);
-	result = vec_madd(vec_sld(a, a, 4), vec_sld(b, b, 4), result);
-	result = vec_add(vec_sld(result, result, 8), result);
-
-	result = vec_splat(result, 0);
-
-	return result;
-}
-
-FORCEINLINE fltx4 SinSIMD(const fltx4& radians)
-{
-	return sinf4(radians);
-}
-
-FORCEINLINE void SinCos3SIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	sincosf4(radians, &sine, &cosine);
-}
-
-FORCEINLINE void SinCosSIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)				   
-{
-	sincosf4(radians, &sine, &cosine);
-}
-
-FORCEINLINE fltx4 ArcCosSIMD(const fltx4& cs)
-{
-	return acosf4(cs);
-}
-
-FORCEINLINE fltx4 ArcTan2SIMD(const fltx4& a, const fltx4& b)
-{
-	return atan2f4(a, b);
-}
-
-FORCEINLINE fltx4 ArcSinSIMD(const fltx4& sine)
-{
-	return asinf4(sine);
-}
-
-FORCEINLINE fltx4 MaxSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return vec_max(a, b);
-}
-FORCEINLINE fltx4 MinSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return vec_min(a, b);
-}
-
-FORCEINLINE fltx4 AndSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return vec_and(a, b);
-}
-FORCEINLINE fltx4 AndSIMD(const bi32x4& a, const fltx4& b)				   
-{
-	return vec_and((fltx4)a, b);
-}
-FORCEINLINE fltx4 AndSIMD(const fltx4& a, const bi32x4& b)				   
-{
-	return vec_and(a, (fltx4)b);
-}
-FORCEINLINE bi32x4 AndSIMD(const bi32x4& a, const bi32x4& b)				   
-{
-	return vec_and(a, b);
-}
-
-#if 0
-FORCEINLINE fltx4 AndNotSIMD(const fltx4& a, const fltx4& b)			   
-{
-	return vec_andc(b, a);
-}
-FORCEINLINE fltx4 AndNotSIMD(const bi32x4& a, const fltx4& b)			   
-{
-	return vec_andc(b, (fltx4)a);
-}
-FORCEINLINE fltx4 AndNotSIMD(const fltx4& a, const bi32x4& b)			   
-{
-	return (fltx4)vec_andc(b, (bi32x4)a);
-}
-FORCEINLINE bi32x4 AndNotSIMD(const bi32x4& a, const bi32x4& b)			   
-{
-	return vec_andc(b, a);
-}
-#else
-template< typename T, typename U >
-FORCEINLINE T AndNotSIMD(const T& a, const U& b)    
-{
-	return vec_andc(b, (T)a);
-}
-
-FORCEINLINE fltx4 AndNotSIMD(const bi32x4& a, const fltx4& b)    
-{
-	return vec_andc(b, (fltx4)a);
-}
-#endif
-
-FORCEINLINE fltx4 XorSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return vec_xor(a, b);
-}
-FORCEINLINE fltx4 XorSIMD(const bi32x4& a, const fltx4& b)				   
-{
-	return vec_xor((fltx4)a, b);
-}
-FORCEINLINE fltx4 XorSIMD(const fltx4& a, const bi32x4& b)				   
-{
-	return vec_xor(a, (fltx4)b);
-}
-FORCEINLINE bi32x4 XorSIMD(const bi32x4& a, const bi32x4& b)				   
-{
-	return vec_xor(a, b);
-}
-
-FORCEINLINE fltx4 OrSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return vec_or(a, b);
-}
-FORCEINLINE fltx4 OrSIMD(const bi32x4& a, const fltx4& b)				   
-{
-	return vec_or((fltx4)a, b);
-}
-FORCEINLINE fltx4 OrSIMD(const fltx4& a, const bi32x4& b)				   
-{
-	return vec_or(a, (fltx4)b);
-}
-FORCEINLINE i32x4 OrSIMD(const i32x4& a, const i32x4& b)				   
-{
-	return vec_or(a, b);
-}
-FORCEINLINE u32x4 OrSIMD(const u32x4& a, const u32x4& b)				   
-{
-	return vec_or(a, b);
-}
-
-#if !defined(__SPU__)	        
-FORCEINLINE bi32x4 OrSIMD(const bi32x4& a, const bi32x4& b)				   
-{
-	return vec_or(a, b);
-}
-#endif
-
-FORCEINLINE fltx4 NegSIMD(const fltx4& a)   
-{
-	return(SubSIMD(_VEC_ZEROF, a));
-
-}
-
-FORCEINLINE bool IsAnyZeros(const fltx4& a)								    
-{
-	return vec_any_eq(a, _VEC_ZEROF);
-}
-
-FORCEINLINE bool IsAnyZeros(const bi32x4& a)								    
-{
-	return vec_any_eq((u32x4)a, _VEC_ZERO);
-}
-
-FORCEINLINE bool IsAllZeros(const bi32x4& a)								     
-{
-	return vec_all_eq((u32x4)a, _VEC_ZERO);
-}
-
-FORCEINLINE bool IsAnyXYZZero(const fltx4& a)								     
-{
-#if SN_IMPROVED_INTRINSICS
-
-	fltx4 b = vec_insert(1.0f, a, 3);
-
-	return vec_any_eq(b, _VEC_ZEROF);
-#else
-	fltx4 b = vec_perm(a, _VEC_ONEF, _VEC_PERMUTE_XYZ0W1);
-	return vec_any_eq(b, _VEC_ZEROF);
-#endif
-}
-
-FORCEINLINE bool IsAllGreaterThan(const fltx4& a, const fltx4& b)
-{
-	return vec_all_gt(a, b);
-}
-
-FORCEINLINE bool IsAllGreaterThanOrEq(const fltx4& a, const fltx4& b)
-{
-	return vec_all_ge(a, b);
-}
-
-FORCEINLINE bool IsAllEqual(const fltx4& a, const fltx4& b)
-{
-	return vec_all_eq(a, b);
-}
-
-
-FORCEINLINE int TestSignSIMD(const fltx4& a)								         
-{
-	int nRet = 0;
-
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-
-	nRet |= (a_union.m128_u32[0] & 0x80000000) >> 31;     
-	nRet |= (a_union.m128_u32[1] & 0x80000000) >> 30;     
-	nRet |= (a_union.m128_u32[2] & 0x80000000) >> 29;     
-	nRet |= (a_union.m128_u32[3] & 0x80000000) >> 28;     
-
-	return nRet;
-}
-FORCEINLINE int TestSignSIMD(const bi32x4& a)								         
-{
-	int nRet = 0;
-
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxbi);
-
-	nRet |= (a_union.m128_u32[0] & 0x80000000) >> 31;     
-	nRet |= (a_union.m128_u32[1] & 0x80000000) >> 30;     
-	nRet |= (a_union.m128_u32[2] & 0x80000000) >> 29;     
-	nRet |= (a_union.m128_u32[3] & 0x80000000) >> 28;     
-
-	return nRet;
-}
-
-FORCEINLINE bool IsAnyNegative(const bi32x4& a)							               
-{
-	return (0 != TestSignSIMD(a));
-}
-
-FORCEINLINE fltx4 SetWToZeroSIMD(const fltx4& a)
-{
-	return (fltx4)vec_and((u32x4)a, _VEC_CLEAR_WMASK);
-}
-FORCEINLINE bi32x4 SetWToZeroSIMD(const bi32x4& a)
-{
-	return (bi32x4)vec_and((u32x4)a, _VEC_CLEAR_WMASK);
-}
-
-FORCEINLINE bool IsAnyNegative(const fltx4& a)							               
-{
-	return vec_any_lt(a, _VEC_ZEROF);
-}
-
-FORCEINLINE bool IsAnyTrue(const fltx4& a)
-{
-	return vec_any_ne(a, _VEC_ZEROF);
-}
-
-#ifdef DIFFERENT_NATIVE_VECTOR_TYPES
-
-FORCEINLINE bool IsAnyTrue(const bi32x4& a)
-{
-	return vec_any_ne((vector unsigned int) a, _VEC_0L);
-}
-
-#endif
-
-FORCEINLINE bi32x4 CmpEqSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return (bi32x4)vec_cmpeq(a, b);
-}
-FORCEINLINE bi32x4 CmpEqSIMD(const i32x4& a, const i32x4& b)				   
-{
-	return (bi32x4)vec_cmpeq(a, b);
-}
-FORCEINLINE bi32x4 CmpEqSIMD(const u32x4& a, const u32x4& b)				   
-{
-	return (bi32x4)vec_cmpeq(a, b);
-}
-
-FORCEINLINE bi32x4 CmpGtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return (bi32x4)vec_cmpgt(a, b);
-}
-FORCEINLINE bi32x4 CmpGtSIMD(const i32x4& a, const i32x4& b)				   
-{
-	return (bi32x4)vec_cmpgt(a, b);
-}
-FORCEINLINE bi32x4 CmpGtSIMD(const u32x4& a, const u32x4& b)				   
-{
-	return (bi32x4)vec_cmpgt(a, b);
-}
-
-FORCEINLINE bi32x4 CmpGeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return (bi32x4)vec_cmpge(a, b);
-}
-
-
-FORCEINLINE bi32x4 CmpLtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return (bi32x4)vec_cmplt(a, b);
-}
-
-FORCEINLINE bi32x4 CmpLeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return (bi32x4)vec_cmple(a, b);
-}
-
-
-
-FORCEINLINE bi32x4 CmpInBoundsSIMD(const fltx4& a, const fltx4& b)		           
-{
-	i32x4 control;
-	control = vec_cmpb(a, b);
-	return (bi32x4)vec_cmpeq((u32x4)control, _VEC_ZERO);
-}
-
-FORCEINLINE int CmpAnyLeSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_any_le(a, b);
-}
-
-FORCEINLINE int CmpAnyGeSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_any_ge(a, b);
-}
-
-FORCEINLINE int CmpAnyLtSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_any_lt(a, b);
-}
-FORCEINLINE int CmpAnyLtSIMD(const bi32x4& a, const i32x4& b)
-{
-	return vec_any_lt((i32x4)a, b);
-}
-
-FORCEINLINE int CmpAnyGtSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_any_gt(a, b);
-}
-
-FORCEINLINE int CmpAnyNeSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_any_ne(a, b);
-}
-FORCEINLINE int CmpAnyNeSIMD(const bi32x4& a, const bi32x4& b)
-{
-	return vec_any_ne(a, b);
-}
-FORCEINLINE int CmpAnyNeSIMD(const bi32x4& a, const i32x4& b)
-{
-	return vec_any_ne(a, (bi32x4)b);
-}
-
-FORCEINLINE int CmpAllLeSIMD(const fltx4& a, const fltx4& b)
-{
-	return vec_all_le(a, b);
-}
-
-FORCEINLINE fltx4 MaskedAssign(const bi32x4& ReplacementMask, const fltx4& NewValue, const fltx4& OldValue)
-{
-	return vec_sel(OldValue, NewValue, ReplacementMask);
-}
-
-FORCEINLINE fltx4 MaskedAssign(const fltx4& ReplacementMask, const fltx4& NewValue, const fltx4& OldValue)
-{
-	return vec_sel(OldValue, NewValue, (const bi32x4)ReplacementMask);
-}
-
-FORCEINLINE vector signed short MaskedAssign(const vector unsigned short& ReplacementMask, const vector signed short& NewValue, const vector signed short& OldValue)
-{
-	return vec_sel(OldValue, NewValue, ReplacementMask);
-}
-
-FORCEINLINE fltx4 ReplicateX4(float flValue)					  
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_splats(flValue);
-#else
-	float* pValue = &flValue;
-	Assert(pValue);
-	Assert(((unsigned int)pValue & 3) == 0);
-
-	fltx4 result;
-
-	result = vec_ld(0, pValue);
-	result = vec_splat(vec_perm(result, result, vec_lvsl(0, pValue)), 0);
-
-	return result;
-#endif
-}
-
-FORCEINLINE fltx4 ReplicateX4(const float* pValue)					  
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_splats(*pValue);
-#else
-	Assert(pValue);
-	fltx4 result;
-
-	result = vec_ld(0, pValue);
-	result = vec_splat(vec_perm(result, result, vec_lvsl(0, pValue)), 0);
-
-	return result;
-#endif
-}
-
-FORCEINLINE i32x4 ReplicateIX4(int nValue)
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_splats(nValue);
-#else
-	int* pValue = &nValue;
-	Assert(pValue);
-	Assert(((unsigned int)pValue & 3) == 0);
-	i32x4 result;
-
-	result = vec_ld(0, pValue);
-	result = vec_splat(vec_perm(result, result, vec_lvsl(0, pValue)), 0);
-
-	return result;
-#endif
-}
-
-FORCEINLINE fltx4 SqrtSIMD(const fltx4& a)					 
-{
-	return sqrtf4(a);
-}
-
-FORCEINLINE fltx4 SqrtEstSIMD(const fltx4& a)				    
-{
-#if defined( _PS3 ) && !defined( SPU )
-	fltx4 vRecipSquareRoot = vec_rsqrte(a);
-	i32x4 vOne = vec_splat_s32(1);
-	i32x4 vAllOnes = vec_splat_s32(-1);
-	i32x4 vShiftLeft24 = vec_splat_s32(-8);             
-	fltx4 vZero = (fltx4)vec_splat_s32(0);
-	u32x4 vInputShifted = vec_sl((u32x4)a, (u32x4)vOne);
-	u32x4 vInfinityShifted = vec_sl((u32x4)vAllOnes, (u32x4)vShiftLeft24);
-	bi32x4 vEqualsZero = vec_vcmpeqfp(a, vZero);
-	bi32x4 vEqualsInfinity = vec_vcmpequw(vInputShifted, vInfinityShifted);
-	fltx4 vSquareRoot = vec_madd(a, vRecipSquareRoot, _VEC_ZEROF);
-	bi32x4 vResultMask = vec_vcmpequw((u32x4)vEqualsInfinity, (u32x4)vEqualsZero);          
-	fltx4 vCorrectedSquareRoot = vec_sel(a, vSquareRoot, vResultMask);
-
-	return vCorrectedSquareRoot;
-#else
-	return SqrtSIMD(a);
-#endif
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSIMD(const fltx4& a)		    
-{
-	return vec_rsqrte(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtSIMD(const fltx4& a)			 
-{
-	fltx4 result;
-	vmathV4RsqrtPerElem((VmathVector4*)&result, (const VmathVector4*)&a);
-
-	return result;
-}
-
-FORCEINLINE fltx4 ReciprocalEstSIMD(const fltx4& a)			    
-{
-	return vec_re(a);
-}
-
-FORCEINLINE fltx4 ReciprocalEstSaturateSIMD(const fltx4& a)
-{
-	bi32x4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 ret = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	ret = ReciprocalEstSIMD(ret);
-	return ret;
-}
-
-
-FORCEINLINE fltx4 ReciprocalSIMD(const fltx4& a)				 
-{
-	fltx4 result;
-	vmathV4RecipPerElem((VmathVector4*)&result, (const VmathVector4*)&a);
-
-	return result;
-}
-
-FORCEINLINE fltx4 DivSIMD(const fltx4& a, const fltx4& b)	 
-{
-	return MulSIMD(ReciprocalSIMD(b), a);
-}
-
-FORCEINLINE fltx4 DivEstSIMD(const fltx4& a, const fltx4& b)	 
-{
-	return MulSIMD(ReciprocalEstSIMD(b), a);
-}
-
-FORCEINLINE fltx4 ReciprocalSaturateSIMD(const fltx4& a)
-{
-	bi32x4 zero_mask = CmpEqSIMD(a, _VEC_ZEROF);
-	fltx4 a_safe = OrSIMD(a, AndSIMD(_VEC_EPSILONF, zero_mask));
-	return ReciprocalSIMD(a_safe);
-
-}
-
-
-FORCEINLINE fltx4 ExpSIMD(const fltx4& toPower)
-{
-	return exp2f4(toPower);
-}
-
-FORCEINLINE fltx4 Exp2EstSIMD(const fltx4& f)
-{
-	return exp2f4fast(f);
-}
-
-
-FORCEINLINE fltx4 ClampVectorSIMD(FLTX4 in, FLTX4 min, FLTX4 max)
-{
-	fltx4 result = vec_max(min, in);
-	return vec_min(max, result);
-}
-
-
-FORCEINLINE fltx4 LoadUnalignedSIMD(const void* pSIMD)
-{
-#if SN_IMPROVED_INTRINSICS
-
-	fltx4 v0, v1;
-
-	Assert(pSIMD);
-
-
-	v0 = (fltx4)vec_lvlx(0, (float*)pSIMD);
-	v1 = (fltx4)vec_lvrx(16, (float*)pSIMD);
-	return vec_or(v0, v1);
-
-#else
-
-	fltx4 v0, v1;
-	vector unsigned char permMask;
-
-	Assert(pSIMD);
-
-	v0 = vec_ld(0, pSIMD);
-	permMask = vec_lvsl(0, pSIMD);
-	v1 = vec_ld(15, pSIMD);
-
-	return vec_perm(v0, v1, permMask);
-
-#endif
-}
-
-FORCEINLINE fltx4 LoadUnsignedByte4SIMD(unsigned char* pBytes)	        
-{
-
-#if SN_IMPROVED_INTRINSICS
-
-	__vector unsigned char  res_uc;
-	__vector unsigned short res_us;
-
-	__vector unsigned char vZero8 = (__vector unsigned char)vec_splat_u8(0);
-	__vector unsigned short vZero16 = (__vector unsigned short)vec_splat_u16(0);
-
-	res_uc = (__vector unsigned char)vec_lvlx(0, pBytes);
-	res_uc = vec_mergeh(vZero8, res_uc);
-	res_us = vec_mergeh(vZero16, (__vector unsigned short)res_uc);
-	return vec_ctf((__vector unsigned int)res_us, 0);
-
-#else
-
-	vector unsigned char v0, v1;
-	vector bool char res_uc;
-	vector unsigned char permMask;
-	vector bool short res_us;
-
-	vector bool char vZero8 = (vector bool char)vec_splat_u8(0);
-	vector bool short vZero16 = (vector bool short)vec_splat_u16(0);
-
-	v0 = vec_ld(0, pBytes);
-	permMask = vec_lvsl(0, pBytes);
-	v1 = vec_ld(3, pBytes);
-	res_uc = (vector bool char)vec_perm(v0, v1, permMask);
-	res_uc = vec_mergeh(vZero8, res_uc);
-	res_us = vec_mergeh(vZero16, (vector bool short)res_uc);
-	return vec_ctf((vector unsigned int)res_us, 0);
-
-#endif
-
-}
-
-FORCEINLINE fltx4 LoadSignedByte4SIMD(signed char* pBytes)	        
-{
-
-#if SN_IMPROVED_INTRINSICS	
-
-	vector signed char  res_uc;
-	vector signed short res_us;
-	vector signed int   res_ui;
-
-	res_uc = (vector signed char)vec_lvlx(0, pBytes);
-	res_us = vec_unpackh(res_uc);
-	res_ui = vec_unpackh(res_us);
-	return vec_ctf(res_ui, 0);
-
-#else
-
-	vector signed char v0, v1, res_uc;
-	vector unsigned char permMask;
-	vector signed short res_us;
-	vector signed int   res_ui;
-
-	v0 = vec_ld(0, pBytes);
-	permMask = vec_lvsl(0, pBytes);
-	v1 = vec_ld(3, pBytes);
-	res_uc = vec_perm(v0, v1, permMask);
-	res_us = vec_unpackh(res_uc);
-	res_ui = vec_unpackh(res_us);
-	return vec_ctf(res_ui, 0);
-
-#endif
-
-}
-
-
-FORCEINLINE fltx4 LoadUnaligned3SIMD(const void* pSIMD)
-{
-	Assert(pSIMD);
-
-	fltx4 v0 = vec_ld(0, (float*)(pSIMD));
-	vector unsigned char permMask = vec_lvsl(0, (float*)(pSIMD));
-	fltx4 v1 = vec_ld(11, (float*)(pSIMD));
-
-	return vec_perm(v0, v1, permMask);
-}
-
-
-FORCEINLINE fltx4 LoadUnalignedFloatSIMD(const float* pFlt)
-{
-	fltx4 v0 = vec_lde(0, const_cast<float*>(pFlt));
-	vector unsigned char permMask = vec_lvsl(0, const_cast<float*>(pFlt));
-	return vec_perm(v0, v0, permMask);
-}
-
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const void* pSIMD)
-{
-	return vec_ld(0, (float*)pSIMD);
-}
-
-#ifndef SPU
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned& pSIMD)
-{
-	fltx4 out;
-	out = vec_ld(0, pSIMD.Base());
-
-	return (fltx4)vec_and((u32x4)out, _VEC_CLEAR_WMASK);
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned* RESTRICT pSIMD)
-{
-	fltx4 out;
-	out = vec_ld(0, pSIMD->Base());
-
-	return (fltx4)vec_and((u32x4)out, _VEC_CLEAR_WMASK);
-}
-
-
-FORCEINLINE void StoreAligned3SIMD(VectorAligned* RESTRICT pSIMD, const fltx4& a)
-{
-	vec_st(a, 0, pSIMD->Base());
-}
-#endif
-
-FORCEINLINE void StoreAlignedSIMD(float* pSIMD, const fltx4& a)
-{
-	vec_st(a, 0, pSIMD);
-}
-
-FORCEINLINE void StoreUnalignedSIMD(float* pSIMD, const fltx4& a)
-{
-#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )
-	vec_stvlx(a, 0, pSIMD);
-	vec_stvrx(a, 16, pSIMD);
-#else
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-	pSIMD[0] = a_union.m128_f32[0];
-	pSIMD[1] = a_union.m128_f32[1];
-	pSIMD[2] = a_union.m128_f32[2];
-	pSIMD[3] = a_union.m128_f32[3];
-#endif
-
-}
-
-FORCEINLINE void StoreUnaligned3SIMD(float* pSIMD, const fltx4& a)
-{
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-	pSIMD[0] = a_union.m128_f32[0];
-	pSIMD[1] = a_union.m128_f32[1];
-	pSIMD[2] = a_union.m128_f32[2];
-};
-
-
-
-#ifndef SPU
-
-FORCEINLINE fltx4 Compress4SIMD(fltx4 const a, fltx4 const& b, fltx4 const& c, fltx4 const& d);
-FORCEINLINE fltx4 LoadGatherSIMD(const float& x, const float& y, const float& z, const float& w)
-{
-#if USING_POINTLESSLY_SLOW_SONY_CODE
-	return vmathV4MakeFromElems_V(x, y, z, w).vec128;
-#else
-	fltx4 vx = vec_lvlx(0, &x);
-	fltx4 vy = vec_lvlx(0, &y);
-	fltx4 vz = vec_lvlx(0, &z);
-	fltx4 vw = vec_lvlx(0, &w);
-	return Compress4SIMD(vx, vy, vz, vw);
-#endif
-}
-
-
-FORCEINLINE void StoreFourUnalignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-
-FORCEINLINE void StoreFourAlignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-#endif
-
-FORCEINLINE void ConvertStoreAsIntsSIMD(intx4* RESTRICT pDest, const fltx4& vSrc)
-{
-	i32x4 asInt = vec_cts(vSrc, 0);
-	vec_st(asInt, 0, pDest->Base());
-}
-
-FORCEINLINE void TransposeSIMD(fltx4& x, fltx4& y, fltx4& z, fltx4& w)
-{
-	fltx4 p0, p1, p2, p3;
-
-	p0 = vec_mergeh(x, z);
-	p1 = vec_mergeh(y, w);
-	p2 = vec_mergel(x, z);
-	p3 = vec_mergel(y, w);
-
-	x = vec_mergeh(p0, p1);
-	y = vec_mergel(p0, p1);
-	z = vec_mergeh(p2, p3);
-	w = vec_mergel(p2, p3);
-}
-
-FORCEINLINE fltx4 LoadZeroSIMD(void)
-{
-	return _VEC_ZEROF;
-}
-FORCEINLINE i32x4 LoadZeroISIMD(void)
-{
-	return vec_splat_s32(0);
-}
-
-
-FORCEINLINE fltx4 LoadOneSIMD(void)
-{
-	return _VEC_ONEF;
-}
-FORCEINLINE i32x4 LoadOneISIMD(void)
-{
-	return vec_splat_s32(1);
-}
-
-FORCEINLINE fltx4 SplatXSIMD(fltx4 a)
-{
-	return vec_splat(a, 0);
-}
-FORCEINLINE fltx4 SplatYSIMD(fltx4 a)
-{
-	return vec_splat(a, 1);
-}
-FORCEINLINE fltx4 SplatZSIMD(fltx4 a)
-{
-	return vec_splat(a, 2);
-}
-FORCEINLINE fltx4 SplatWSIMD(fltx4 a)
-{
-	return vec_splat(a, 3);
-}
-
-FORCEINLINE bi32x4 SplatXSIMD(bi32x4 a)
-{
-	return vec_splat(a, 0);
-}
-FORCEINLINE bi32x4 SplatYSIMD(bi32x4 a)
-{
-	return vec_splat(a, 1);
-}
-FORCEINLINE bi32x4 SplatZSIMD(bi32x4 a)
-{
-	return vec_splat(a, 2);
-}
-FORCEINLINE bi32x4 SplatWSIMD(bi32x4 a)
-{
-	return vec_splat(a, 3);
-}
-
-FORCEINLINE fltx4 SetXSIMD(const fltx4& a, const fltx4& x)
-{
-	return vec_sel(a, x, _VEC_COMPONENT_MASK_0);
-}
-
-FORCEINLINE fltx4 SetYSIMD(const fltx4& a, const fltx4& y)
-{
-	return vec_sel(a, y, _VEC_COMPONENT_MASK_1);
-}
-
-FORCEINLINE fltx4 SetZSIMD(const fltx4& a, const fltx4& z)
-{
-	return vec_sel(a, z, _VEC_COMPONENT_MASK_2);
-}
-
-FORCEINLINE fltx4 SetWSIMD(const fltx4& a, const fltx4& w)
-{
-	return vec_sel(a, w, _VEC_COMPONENT_MASK_3);
-}
-
-FORCEINLINE fltx4 SetComponentSIMD(const fltx4& a, int nComponent, float flValue)
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_insert(flValue, a, nComponent);
-#else
-	fltx4_union a_union;
-	a_union.vmxf = vec_ld(0, &a);
-	a_union.m128_f32[nComponent] = flValue;
-	return a_union.vmxf;
-#endif
-}
-
-FORCEINLINE float GetComponentSIMD(const fltx4& a, int nComponent)
-{
-#if SN_IMPROVED_INTRINSICS
-	return vec_extract(a, nComponent);
-#else
-	fltx4_union a_union;
-	a_union.vmxf = vec_ld(0, &a);
-	return a_union.m128_f32[nComponent];
-#endif
-}
-
-
-FORCEINLINE fltx4 RotateLeft(const fltx4& a)
-{
-	return vec_sld(a, a, 4);
-}
-
-FORCEINLINE fltx4 RotateLeft2(const fltx4& a)
-{
-	return vec_sld(a, a, 8);
-}
-
-FORCEINLINE fltx4 RotateRight(const fltx4& a)
-{
-	return vec_sld(a, a, 12);
-}
-
-FORCEINLINE fltx4 RotateRight2(const fltx4& a)
-{
-	return vec_sld(a, a, 8);
-}
-
-template < uint nBits, typename T >
-FORCEINLINE T ShiftLeftByBits(const T& a)
-{
-	if (nBits >= 128)     
-	{
-		return (T)LoadZeroSIMD();
-	}
-	else if (nBits == 0)
-	{
-		return a;
-	}
-	else if ((nBits > 7))                
-	{
-		T t = vec_sld(a, ((T)LoadZeroSIMD()), (nBits >> 3));     
-		return ShiftLeftByBits< (nBits & 0x7) >(t);
-	}
-	else          
-	{
-		vector unsigned int shifter = (vector unsigned int) (vec_splat_s8(((signed char)(nBits & 0x7))));
-		return (T)vec_sll((vector signed int) a, shifter);
-	}
-}
-
-template < uint nBits, typename T >
-FORCEINLINE T ShiftRightByBits(const T& a)
-{
-	if (nBits >= 128)     
-	{
-		return (T)LoadZeroSIMD();
-	}
-	else if (nBits == 0)
-	{
-		return a;
-	}
-	else if ((nBits > 7))                
-	{
-		T t = vec_sld(((T)LoadZeroSIMD()), a, 16 - (nBits >> 3));                   
-		return ShiftRightByBits< (nBits & 0x7) >(t);
-	}
-	else          
-	{
-		vector unsigned int shifter = (vector unsigned int) (vec_splat_s8(((signed char)(nBits & 0x7))));
-		return (T)vec_srl((vector unsigned int) a, shifter);
-	}
-}
-
-
-
-
-FORCEINLINE fltx4 FindLowestSIMD3(const fltx4& a)
-{
-	fltx4 result;
-	fltx4 x = vec_splat(a, 0);
-	fltx4 y = vec_splat(a, 1);
-	fltx4 z = vec_splat(a, 2);
-
-	if (vec_any_nan(a))
-	{
-		x = vec_all_nan(x) ? _VEC_FLTMAX : x;
-		y = vec_all_nan(y) ? _VEC_FLTMAX : y;
-		z = vec_all_nan(z) ? _VEC_FLTMAX : z;
-	}
-
-	result = vec_min(y, x);
-	result = vec_min(z, result);
-
-	return result;
-
-}
-
-FORCEINLINE fltx4 FindHighestSIMD3(const fltx4& a)
-{
-	fltx4 result;
-	fltx4 x = vec_splat(a, 0);
-	fltx4 y = vec_splat(a, 1);
-	fltx4 z = vec_splat(a, 2);
-
-	if (vec_any_nan(a))
-	{
-		x = vec_all_nan(x) ? _VEC_FLTMIN : x;
-		y = vec_all_nan(y) ? _VEC_FLTMIN : y;
-		z = vec_all_nan(z) ? _VEC_FLTMIN : z;
-	}
-
-	result = vec_max(y, x);
-	result = vec_max(z, result);
-
-	return result;
-}
-
-
-FORCEINLINE i32x4 LoadAlignedIntSIMD(const int32* RESTRICT pSIMD)
-{
-	return vec_ld(0, const_cast<int32*>(pSIMD));
-}
-
-FORCEINLINE i32x4 LoadUnalignedIntSIMD(const int32* RESTRICT pSIMD)
-{
-	i32x4 v0, v1;
-	vector unsigned char permMask;
-
-	Assert(pSIMD);
-
-	v0 = vec_ld(0, const_cast<int32*>(pSIMD));
-	permMask = vec_lvsl(0, const_cast<int32*>(pSIMD));
-	v1 = vec_ld(15, const_cast<int32*>(pSIMD));
-
-	return vec_perm(v0, v1, permMask);
-
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(int32* pSIMD, const i32x4& a)
-{
-	vec_st(a, 0, pSIMD);
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(int32* pSIMD, const fltx4& a)
-{
-	vec_st((i32x4)a, 0, pSIMD);
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(intx4& pSIMD, const i32x4& a)
-{
-	vec_st(a, 0, pSIMD.Base());
-}
-
-FORCEINLINE void StoreUnalignedIntSIMD(int32* pSIMD, const i32x4& a)
-{
-#if SN_IMPROVED_INTRINSICS
-
-	vec_stvlx(a, 0, pSIMD);
-	vec_stvrx(a, 16, pSIMD);
-
-#else
-
-	fltx4_union tmp;
-	vec_st(a, 0, &tmp.vmxi);
-
-	pSIMD[0] = tmp.m128_u32[0];
-	pSIMD[1] = tmp.m128_u32[1];
-	pSIMD[2] = tmp.m128_u32[2];
-	pSIMD[3] = tmp.m128_u32[3];
-
-#endif
-}
-
-FORCEINLINE fltx4 CompressSIMD(fltx4 const& a, fltx4 const& b)
-{
-	const int32 ALIGN16 n4shuffleACXZ[4] ALIGN16_POST = { 0x00010203, 0x08090A0B, 0x10111213, 0x18191A1B };
-	return vec_perm(a, b, (vec_uchar16)LoadAlignedIntSIMD(n4shuffleACXZ));
-}
-
-FORCEINLINE fltx4 Compress4SIMD(fltx4 const a, fltx4 const& b, fltx4 const& c, fltx4 const& d)
-{
-	fltx4 ab = vec_mergeh(a, b);      
-	fltx4 cd = vec_mergeh(c, d);    
-	static const int32 ALIGN16 shuffleABXY[4] ALIGN16_POST = { 0x00010203, 0x04050607, 0x10111213, 0x14151617 };
-
-	return vec_perm(ab, cd, (vec_uchar16)LoadAlignedIntSIMD(shuffleABXY));
-}
-
-
-FORCEINLINE fltx4 UnsignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	return vec_ctf(vSrcA, 0);
-}
-
-
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	return vec_ctf(vSrcA, 0);
-}
-
-#define UnsignedFixedIntConvertToFltSIMD(vSrcA, uImmed) (vec_ctf( (vSrcA), (uImmed) ))
-
-#define SignedFixedIntConvertToFltSIMD(vSrcA, uImmed) (vec_ctf( (vSrcA), (uImmed) ))
-
-#define IntSetImmediateSIMD(x) (vec_splat_s32(x))
-
-
-FORCEINLINE u32x4 IntShiftLeftWordSIMD(u32x4 vSrcA, u32x4 vSrcB)
-{
-	return vec_sl(vSrcA, vSrcB);
-}
-
-
-FORCEINLINE float SubFloat(const fltx4& a, int idx)
-{
-#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )
-	return(vec_extract(a, idx));
-#else   
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-	return a_union.m128_f32[idx];
-#endif   
-}
-
-FORCEINLINE float& SubFloat(fltx4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_f32[idx];
-}
-
-FORCEINLINE uint32 SubInt(const u32x4& a, int idx)
-{
-#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )
-	return(vec_extract(a, idx));
-#else   
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxui);
-	return a_union.m128_u32[idx];
-#endif   
-}
-
-FORCEINLINE uint32 SubInt(const fltx4& a, int idx)
-{
-#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )
-	return(vec_extract((u32x4)a, idx));
-#else
-	fltx4_union a_union;
-	vec_st(a, 0, &a_union.vmxf);
-	return a_union.m128_u32[idx];
-#endif
-}
-
-FORCEINLINE uint32& SubInt(u32x4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_u32[idx];
-}
-
-FORCEINLINE uint32 SubFloatConvertToInt(const fltx4& a, int idx)
-{
-
-#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 1 ) && ( __GNUC_PATCHLEVEL__ == 1 )
-	return(vec_extract(vec_ctu(a, 0), idx));
-#else
-	u32x4 t = vec_ctu(a, 0);
-	return SubInt(t, idx);
-#endif
-
-}
-
-template< typename T, typename U >
-FORCEINLINE T PermuteVMX(T a, T b, U swizzleMask)
-{
-	return vec_perm(a, b, (vec_uchar16)swizzleMask);
-}
-
-
-#if !defined(__SPU__)
-#define fsel __fsel
-#endif
-
-inline bool IsVector3LessThan(const fltx4& v1, const fltx4& v2)
-{
-	return vec_any_lt(v1, v2);
-}
-
-inline bool IsVector3GreaterOrEqual(const fltx4& v1, const fltx4& v2)
-{
-	return !IsVector3LessThan(v1, v2);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = 1.0 / sqrt(SubFloat(a, 0) != 0.0f ? SubFloat(a, 0) : FLT_EPSILON);
-	SubFloat(retVal, 1) = 1.0 / sqrt(SubFloat(a, 1) != 0.0f ? SubFloat(a, 1) : FLT_EPSILON);
-	SubFloat(retVal, 2) = 1.0 / sqrt(SubFloat(a, 2) != 0.0f ? SubFloat(a, 2) : FLT_EPSILON);
-	SubFloat(retVal, 3) = 1.0 / sqrt(SubFloat(a, 3) != 0.0f ? SubFloat(a, 3) : FLT_EPSILON);
-	return retVal;
-}
-
-FORCEINLINE fltx4 FloorSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = floor(SubFloat(a, 0));
-	SubFloat(retVal, 1) = floor(SubFloat(a, 1));
-	SubFloat(retVal, 2) = floor(SubFloat(a, 2));
-	SubFloat(retVal, 3) = floor(SubFloat(a, 3));
-	return retVal;
-}
-
-#elif ( defined( _X360 ) )
-
-inline bool IsVector3LessThan(const fltx4& v1, const fltx4& v2)
-{
-	return !XMVector3GreaterOrEqual(v1, v2);
-}
-
-inline BOOL IsVector3GreaterOrEqual(const fltx4& v1, const fltx4& v2)
-{
-	return XMVector3GreaterOrEqual(v1, v2);
-}
-
-
-FORCEINLINE float& FloatSIMD(fltx4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_f32[idx];
-}
-
-FORCEINLINE unsigned int& UIntSIMD(fltx4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_u32[idx];
-}
-
-FORCEINLINE fltx4 AddSIMD(const fltx4& a, const fltx4& b)
-{
-	return __vaddfp(a, b);
-}
-
-FORCEINLINE fltx4 SubSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return __vsubfp(a, b);
-}
-
-FORCEINLINE fltx4 MulSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return __vmulfp(a, b);
-}
-
-FORCEINLINE fltx4 MaddSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return __vmaddfp(a, b, c);
-}
-
-FORCEINLINE fltx4 MsubSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return __vnmsubfp(a, b, c);
-};
-
-FORCEINLINE fltx4 Dot3SIMD(const fltx4& a, const fltx4& b)
-{
-	return __vmsum3fp(a, b);
-}
-
-FORCEINLINE fltx4 Dot4SIMD(const fltx4& a, const fltx4& b)
-{
-	return __vmsum4fp(a, b);
-}
-
-FORCEINLINE fltx4 SinSIMD(const fltx4& radians)
-{
-	return XMVectorSin(radians);
-}
-
-FORCEINLINE void SinCos3SIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	XMVectorSinCos(&sine, &cosine, radians);
-}
-
-FORCEINLINE void SinCosSIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	XMVectorSinCos(&sine, &cosine, radians);
-}
-
-FORCEINLINE void CosSIMD(fltx4& cosine, const fltx4& radians)
-{
-	cosine = XMVectorCos(radians);
-}
-
-FORCEINLINE fltx4 ArcSinSIMD(const fltx4& sine)
-{
-	return XMVectorASin(sine);
-}
-
-FORCEINLINE fltx4 ArcCosSIMD(const fltx4& cs)
-{
-	return XMVectorACos(cs);
-}
-
-FORCEINLINE fltx4 ArcTan2SIMD(const fltx4& a, const fltx4& b)
-{
-	return XMVectorATan2(a, b);
-}
-
-FORCEINLINE fltx4 MaxSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return __vmaxfp(a, b);
-}
-
-FORCEINLINE fltx4 MinSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return __vminfp(a, b);
-}
-
-FORCEINLINE fltx4 AndSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vand(a, b);
-}
-
-FORCEINLINE fltx4 AndNotSIMD(const fltx4& a, const fltx4& b)			   
-{
-	return __vandc(b, a);
-}
-
-FORCEINLINE fltx4 XorSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vxor(a, b);
-}
-
-FORCEINLINE fltx4 OrSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vor(a, b);
-}
-
-FORCEINLINE fltx4 NegSIMD(const fltx4& a)   
-{
-	return XMVectorNegate(a);
-}
-
-FORCEINLINE bool IsAllZeros(const fltx4& a)								     
-{
-	unsigned int equalFlags = 0;
-	__vcmpeqfpR(a, Four_Zeros, &equalFlags);
-	return XMComparisonAllTrue(equalFlags);
-}
-
-FORCEINLINE bool IsAnyZeros(const fltx4& a)								    
-{
-	unsigned int conditionregister;
-	XMVectorEqualR(&conditionregister, a, XMVectorZero());
-	return XMComparisonAnyTrue(conditionregister);
-}
-
-FORCEINLINE bool IsAnyXYZZero(const fltx4& a)								     
-{
-	fltx4 temp = __vrlimi(a, a, 1, 1);
-	unsigned int conditionregister;
-	XMVectorEqualR(&conditionregister, temp, XMVectorZero());
-	return XMComparisonAnyTrue(conditionregister);
-}
-
-FORCEINLINE bool IsAllGreaterThan(const fltx4& a, const fltx4& b)
-{
-	unsigned int cr;
-	XMVectorGreaterR(&cr, a, b);
-	return XMComparisonAllTrue(cr);
-}
-
-FORCEINLINE bool IsAllGreaterThanOrEq(const fltx4& a, const fltx4& b)
-{
-	unsigned int cr;
-	XMVectorGreaterOrEqualR(&cr, a, b);
-	return XMComparisonAllTrue(cr);
-}
-
-FORCEINLINE bool IsAnyGreaterThan(const fltx4& a, const fltx4& b)
-{
-	unsigned int cr;
-	XMVectorGreaterR(&cr, a, b);
-	return XMComparisonAnyTrue(cr);
-}
-
-FORCEINLINE bool IsAnyGreaterThanOrEq(const fltx4& a, const fltx4& b)
-{
-	unsigned int cr;
-	XMVectorGreaterOrEqualR(&cr, a, b);
-	return XMComparisonAnyTrue(cr);
-}
-
-FORCEINLINE bool IsAllEqual(const fltx4& a, const fltx4& b)
-{
-	unsigned int cr;
-	XMVectorEqualR(&cr, a, b);
-	return XMComparisonAllTrue(cr);
-}
-
-
-FORCEINLINE int TestSignSIMD(const fltx4& a)								         
-{
-	int nRet = 0;
-
-	const fltx4_union& a_union = (const fltx4_union&)a;
-	nRet |= (a_union.m128_u32[0] & 0x80000000) >> 31;     
-	nRet |= (a_union.m128_u32[1] & 0x80000000) >> 30;     
-	nRet |= (a_union.m128_u32[2] & 0x80000000) >> 29;     
-	nRet |= (a_union.m128_u32[3] & 0x80000000) >> 28;     
-
-	return nRet;
-}
-
-FORCEINLINE fltx4 SetWToZeroSIMD(const fltx4& a)
-{
-	return __vrlimi(a, __vzero(), 1, 0);
-}
-
-FORCEINLINE bool IsAnyNegative(const fltx4& a)							               
-{
-	unsigned int equalFlags = 0;
-	fltx4 signMask = __vspltisw(-1);                          
-	signMask = __vslw(signMask, signMask);      
-	__vcmpequwR(Four_Zeros, __vand(signMask, a), &equalFlags);
-	return !XMComparisonAllTrue(equalFlags);
-}
-
-FORCEINLINE bool IsAnyTrue(const fltx4& a)
-{
-	unsigned int equalFlags = 0;
-	__vcmpequwR(Four_Zeros, a, &equalFlags);    
-	return XMComparisonAnyFalse(equalFlags);           
-}
-
-FORCEINLINE fltx4 CmpEqSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vcmpeqfp(a, b);
-}
-
-
-FORCEINLINE fltx4 CmpGtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vcmpgtfp(a, b);
-}
-
-FORCEINLINE fltx4 CmpGeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vcmpgefp(a, b);
-}
-
-FORCEINLINE fltx4 CmpLtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vcmpgtfp(b, a);
-}
-
-FORCEINLINE fltx4 CmpLeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return __vcmpgefp(b, a);
-}
-
-FORCEINLINE fltx4 CmpInBoundsSIMD(const fltx4& a, const fltx4& b)		           
-{
-	return XMVectorInBounds(a, b);
-}
-
-FORCEINLINE fltx4 MaskedAssign(const fltx4& ReplacementMask, const fltx4& NewValue, const fltx4& OldValue)
-{
-	return __vsel(OldValue, NewValue, ReplacementMask);
-}
-
-
-template< typename T, typename U >
-FORCEINLINE T PermuteVMX(T a, T b, U swizzleMask)
-{
-	return __vperm(a, b, swizzleMask);
-}
-
-FORCEINLINE fltx4 ReplicateX4(float flValue)					  
-{
-	float* pValue = &flValue;
-	Assert(pValue);
-	Assert(((unsigned int)pValue & 3) == 0);
-	return __vspltw(__lvlx(pValue, 0), 0);
-}
-
-FORCEINLINE fltx4 ReplicateX4(const float* pValue)					  
-{
-	Assert(pValue);
-	return __vspltw(__lvlx(pValue, 0), 0);
-}
-
-FORCEINLINE fltx4 ReplicateIX4(int nValue)
-{
-	int* pValue = &nValue;
-	Assert(pValue);
-	Assert(((unsigned int)pValue & 3) == 0);
-	return __vspltw(__lvlx(pValue, 0), 0);
-}
-
-FORCEINLINE fltx4 CeilSIMD(const fltx4& a)
-{
-	return __vrfip(a);
-}
-
-FORCEINLINE fltx4 RoundSIMD(const fltx4& a)
-{
-	return __vrfin(a);
-}
-
-FORCEINLINE fltx4 FloorSIMD(const fltx4& a)
-{
-	return __vrfim(a);
-}
-
-FORCEINLINE fltx4 SqrtEstSIMD(const fltx4& a)				    
-{
-	return XMVectorSqrtEst(a);
-}
-
-FORCEINLINE fltx4 SqrtSIMD(const fltx4& a)					 
-{
-	return XMVectorSqrt(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSIMD(const fltx4& a)		    
-{
-	return __vrsqrtefp(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 a_safe = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	return ReciprocalSqrtEstSIMD(a_safe);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtSIMD(const fltx4& a)			 
-{
-	return XMVectorReciprocalSqrt(a);
-}
-
-FORCEINLINE fltx4 ReciprocalEstSIMD(const fltx4& a)			    
-{
-	return __vrefp(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSIMD(const fltx4& a)				 
-{
-	return XMVectorReciprocal(a);
-}
-
-FORCEINLINE fltx4 DivSIMD(const fltx4& a, const fltx4& b)	 
-{
-	return MulSIMD(ReciprocalSIMD(b), a);
-}
-
-FORCEINLINE fltx4 DivEstSIMD(const fltx4& a, const fltx4& b)	 
-{
-	return MulSIMD(ReciprocalEstSIMD(b), a);
-}
-
-FORCEINLINE fltx4 ReciprocalEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 a_safe = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	return ReciprocalEstSIMD(a_safe);
-}
-
-FORCEINLINE fltx4 ReciprocalSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 a_safe = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	return ReciprocalSIMD(a_safe);
-
-}
-
-FORCEINLINE fltx4 ExpSIMD(const fltx4& toPower)
-{
-	return XMVectorExp(toPower);
-}
-
-FORCEINLINE fltx4 Exp2EstSIMD(const fltx4& f)
-{
-	return XMVectorExpEst(f);
-}
-
-FORCEINLINE fltx4 ClampVectorSIMD(FLTX4 in, FLTX4 min, FLTX4 max)
-{
-	return XMVectorClamp(in, min, max);
-}
-
-FORCEINLINE fltx4 LoadUnalignedSIMD(const void* pSIMD)
-{
-	return XMLoadVector4(pSIMD);
-}
-
-FORCEINLINE fltx4 LoadUnaligned3SIMD(const void* pSIMD)
-{
-	return XMLoadVector3(pSIMD);
-}
-
-FORCEINLINE fltx4 LoadUnalignedFloatSIMD(const float* pFlt)
-{
-	return __lvlx(pFlt, 0);
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const void* pSIMD)
-{
-	return *(reinterpret_cast<const fltx4*> (pSIMD));
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned& pSIMD)
-{
-	fltx4 out = XMLoadVector3A(pSIMD.Base());
-	return __vrlimi(out, __vzero(), 1, 0);
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned* RESTRICT pSIMD)
-{
-	fltx4 out = XMLoadVector3A(pSIMD);
-	return __vrlimi(out, __vzero(), 1, 0);
-}
-
-FORCEINLINE void StoreAlignedSIMD(float* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<fltx4*> (pSIMD)) = a;
-}
-
-FORCEINLINE void StoreUnalignedSIMD(float* pSIMD, const fltx4& a)
-{
-	XMStoreVector4(pSIMD, a);
-}
-
-FORCEINLINE void StoreUnaligned3SIMD(float* pSIMD, const fltx4& a)
-{
-	XMStoreVector3(pSIMD, a);
-}
-
-FORCEINLINE void StoreAligned3SIMD(VectorAligned* RESTRICT pSIMD, const fltx4& a)
-{
-	XMStoreVector3A(pSIMD->Base(), a);
-}
-
-FORCEINLINE void StoreFourUnalignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	b = __vrlimi(b, b, 15, 1);       
-	c = __vrlimi(c, c, 15, 2);       
-
-	a = __vrlimi(a, b, 1, 0);        
-	b = __vrlimi(b, c, 2 | 1, 0);      
-	c = __vrlimi(c, d, 4 | 2 | 1, 3);    
-
-	float* RESTRICT pOut = pDestination->Base();
-	StoreUnalignedSIMD(pOut + 0, a);
-	StoreUnalignedSIMD(pOut + 4, b);
-	StoreUnalignedSIMD(pOut + 8, c);
-}
-
-FORCEINLINE void StoreFourAlignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	b = __vrlimi(b, b, 15, 1);       
-	c = __vrlimi(c, c, 15, 2);       
-
-	a = __vrlimi(a, b, 1, 0);        
-	b = __vrlimi(b, c, 2 | 1, 0);      
-	c = __vrlimi(c, d, 4 | 2 | 1, 3);    
-
-	float* RESTRICT pOut = pDestination->Base();
-	StoreAlignedSIMD(pOut + 0, a);
-	StoreAlignedSIMD(pOut + 4, b);
-	StoreAlignedSIMD(pOut + 8, c);
-}
-
-FORCEINLINE void ConvertStoreAsIntsSIMD(intx4* RESTRICT pDest, const fltx4& vSrc)
-{
-	fltx4 asInt = __vctsxs(vSrc, 0);
-	XMStoreVector4A(pDest->Base(), asInt);
-}
-
-FORCEINLINE void TransposeSIMD(fltx4& x, fltx4& y, fltx4& z, fltx4& w)
-{
-	XMMATRIX xyzwMatrix = _XMMATRIX(x, y, z, w);
-	xyzwMatrix = XMMatrixTranspose(xyzwMatrix);
-	x = xyzwMatrix.r[0];
-	y = xyzwMatrix.r[1];
-	z = xyzwMatrix.r[2];
-	w = xyzwMatrix.r[3];
-}
-
-FORCEINLINE fltx4 LoadZeroSIMD(void)
-{
-	return XMVectorZero();
-}
-
-FORCEINLINE fltx4 LoadOneSIMD(void)
-{
-	return XMVectorSplatOne();
-}
-
-FORCEINLINE fltx4 SplatXSIMD(fltx4 a)
-{
-	return XMVectorSplatX(a);
-}
-
-FORCEINLINE fltx4 SplatYSIMD(fltx4 a)
-{
-	return XMVectorSplatY(a);
-}
-
-FORCEINLINE fltx4 SplatZSIMD(fltx4 a)
-{
-	return XMVectorSplatZ(a);
-}
-
-FORCEINLINE fltx4 SplatWSIMD(fltx4 a)
-{
-	return XMVectorSplatW(a);
-}
-
-FORCEINLINE fltx4 SetXSIMD(const fltx4& a, const fltx4& x)
-{
-	fltx4 result = __vrlimi(a, x, 8, 0);
-	return result;
-}
-
-FORCEINLINE fltx4 SetYSIMD(const fltx4& a, const fltx4& y)
-{
-	fltx4 result = __vrlimi(a, y, 4, 0);
-	return result;
-}
-
-FORCEINLINE fltx4 SetZSIMD(const fltx4& a, const fltx4& z)
-{
-	fltx4 result = __vrlimi(a, z, 2, 0);
-	return result;
-}
-
-FORCEINLINE fltx4 SetWSIMD(const fltx4& a, const fltx4& w)
-{
-	fltx4 result = __vrlimi(a, w, 1, 0);
-	return result;
-}
-
-FORCEINLINE fltx4 SetComponentSIMD(const fltx4& a, int nComponent, float flValue)
-{
-	static int s_nVrlimiMask[4] = { 8, 4, 2, 1 };
-	fltx4 val = ReplicateX4(flValue);
-	fltx4 result = __vrlimi(a, val, s_nVrlimiMask[nComponent], 0);
-	return result;
-}
-
-FORCEINLINE fltx4 RotateLeft(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	return __vrlimi(compareOne, a, 8 | 4 | 2 | 1, 1);
-}
-
-FORCEINLINE fltx4 RotateLeft2(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	return __vrlimi(compareOne, a, 8 | 4 | 2 | 1, 2);
-}
-
-FORCEINLINE fltx4 RotateRight(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	return __vrlimi(compareOne, a, 8 | 4 | 2 | 1, 3);
-}
-
-FORCEINLINE fltx4 RotateRight2(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	return __vrlimi(compareOne, a, 8 | 4 | 2 | 1, 2);
-}
-
-
-template < uint nBits >
-FORCEINLINE fltx4 ShiftLeftByBits(const fltx4& a)
-{
-	if (nBits >= 128)     
-	{
-		return LoadZeroSIMD();
-	}
-	else if (nBits == 0)
-	{
-		return a;
-	}
-	else if ((nBits > 7))                
-	{
-		fltx4 t = __vsldoi(a, (LoadZeroSIMD()), (nBits >> 3));     
-		return ShiftLeftByBits< (nBits & 0x7) >(t);
-	}
-	else          
-	{
-		u32x4 shifter = u32x4(__vspltisb(((signed char)(nBits & 0x7))));
-		return __vsl(a, shifter);
-	}
-}
-
-template < uint nBits >
-FORCEINLINE fltx4 ShiftRightByBits(const fltx4& a)
-{
-	if (nBits >= 128)     
-	{
-		return LoadZeroSIMD();
-	}
-	else if (nBits == 0)
-	{
-		return a;
-	}
-	else if ((nBits > 7))                
-	{
-		fltx4 t = __vsldoi((LoadZeroSIMD()), a, 16 - (nBits >> 3));                   
-		return ShiftRightByBits< (nBits & 0x7) >(t);
-	}
-	else          
-	{
-		u32x4 shifter = u32x4(__vspltisb(((signed char)(nBits & 0x7))));
-		return __vsr(a, shifter);
-	}
-}
-
-FORCEINLINE fltx4 FindLowestSIMD3(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	compareOne = __vrlimi(compareOne, a, 8 | 4, 1);
-	fltx4 retval = MinSIMD(a, compareOne);
-	compareOne = __vrlimi(compareOne, a, 8, 2);
-	retval = MinSIMD(retval, compareOne);
-	return SplatXSIMD(retval);
-}
-
-FORCEINLINE fltx4 FindHighestSIMD3(const fltx4& a)
-{
-	fltx4 compareOne = a;
-	compareOne = __vrlimi(compareOne, a, 8 | 4, 1);
-	fltx4 retval = MaxSIMD(a, compareOne);
-	compareOne = __vrlimi(compareOne, a, 8, 2);
-	retval = MaxSIMD(retval, compareOne);
-	return SplatXSIMD(retval);
-}
-
-
-void TransformManyPointsBy(VectorAligned* RESTRICT pVectors, unsigned int numVectors, FLTX4 mRow1, FLTX4 mRow2, FLTX4 mRow3);
-
-FORCEINLINE void TransformManyPointsBy(VectorAligned* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& pMatrix)
-{
-	return TransformManyPointsBy(pVectors, numVectors,
-		LoadUnalignedSIMD(pMatrix[0]), LoadUnalignedSIMD(pMatrix[1]), LoadUnalignedSIMD(pMatrix[2]));
-}
-
-FORCEINLINE void TransformManyPointsByA(VectorAligned* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& pMatrix)
-{
-	return TransformManyPointsBy(pVectors, numVectors,
-		LoadAlignedSIMD(pMatrix[0]), LoadAlignedSIMD(pMatrix[1]), LoadAlignedSIMD(pMatrix[2]));
-}
-
-FORCEINLINE i32x4 LoadAlignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return XMLoadVector4A(pSIMD);
-}
-
-FORCEINLINE i32x4 LoadUnalignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return XMLoadVector4(pSIMD);
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(int32* pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<i32x4*> (pSIMD)) = a;
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(intx4& pSIMD, const fltx4& a)
-{
-	*(reinterpret_cast<i32x4*> (pSIMD.Base())) = a;
-}
-
-FORCEINLINE void StoreUnalignedIntSIMD(int32* pSIMD, const fltx4& a)
-{
-	XMStoreVector4(pSIMD, a);
-}
-
-FORCEINLINE fltx4 LoadAndConvertUint16SIMD(const uint16* pInts)
-{
-	return XMLoadUShort4(reinterpret_cast<const XMUSHORT4*>(pInts));
-}
-
-FORCEINLINE fltx4 CompressSIMD(fltx4 const& a, fltx4 const& b)
-{
-	return XMVectorPermute(a, b, XMVectorPermuteControl(0, 2, 4, 6));
-}
-
-FORCEINLINE fltx4 Compress4SIMD(fltx4 const a, fltx4 const& b, fltx4 const& c, fltx4 const& d)
-{
-	fltx4 abcd = __vrlimi(a, b, 4, 3);      
-	abcd = __vrlimi(abcd, c, 2, 2);      
-	abcd = __vrlimi(abcd, d, 1, 1);      
-
-	return abcd;
-}
-
-
-FORCEINLINE fltx4 LoadGatherSIMD(const float& x, const float& y, const float& z, const float& w)
-{
-	fltx4 vx = __lvlx(&x, 0);
-	fltx4 vy = __lvlx(&y, 0);
-	fltx4 vz = __lvlx(&z, 0);
-	fltx4 vw = __lvlx(&w, 0);
-	return Compress4SIMD(vx, vy, vz, vw);
-}
-
-FORCEINLINE fltx4 UnsignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	return __vcfux(vSrcA, 0);
-}
-
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	return __vcfsx(vSrcA, 0);
-}
-
-#define UnsignedFixedIntConvertToFltSIMD(vSrcA, uImmed) (__vcfux( (vSrcA), (uImmed) ))
-
-#define SignedFixedIntConvertToFltSIMD(vSrcA, uImmed) (__vcfsx( (vSrcA), (uImmed) ))
-
-#define IntSetImmediateSIMD(x) (__vspltisw(x))
-
-FORCEINLINE fltx4 IntShiftLeftWordSIMD(fltx4 vSrcA, fltx4 vSrcB)
-{
-	return __vslw(vSrcA, vSrcB);
-}
-
-FORCEINLINE float SubFloat(const fltx4& a, int idx)
-{
-	const fltx4_union& a_union = (const fltx4_union&)a;
-	return a_union.m128_f32[idx];
-}
-
-FORCEINLINE float& SubFloat(fltx4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_f32[idx];
-}
-
-FORCEINLINE uint32 SubFloatConvertToInt(const fltx4& a, int idx)
-{
-	fltx4 t = __vctuxs(a, 0);
-	const fltx4_union& a_union = (const fltx4_union&)t;
-	return a_union.m128_u32[idx];
-}
-
-
-FORCEINLINE uint32 SubInt(const fltx4& a, int idx)
-{
-	const fltx4_union& a_union = (const fltx4_union&)a;
-	return a_union.m128_u32[idx];
-}
-
-FORCEINLINE uint32& SubInt(fltx4& a, int idx)
-{
-	fltx4_union& a_union = (fltx4_union&)a;
-	return a_union.m128_u32[idx];
-}
-
-#else
-
-FORCEINLINE void StoreAlignedSIMD(float* RESTRICT pSIMD, const fltx4& a)
-{
-	_mm_store_ps(pSIMD, a);
-}
-
-FORCEINLINE void StoreAlignedSIMD(short* RESTRICT pSIMD, const shortx8& a)
-{
-	_mm_store_si128((shortx8*)pSIMD, a);
-}
-FORCEINLINE void StoreUnalignedSIMD(float* RESTRICT pSIMD, const fltx4& a)
-{
-	_mm_storeu_ps(pSIMD, a);
-}
-
-FORCEINLINE void StoreUnalignedSIMD(short* RESTRICT pSIMD, const shortx8& a)
-{
-	_mm_storeu_si128((shortx8*)pSIMD, a);
-}
-
-FORCEINLINE void StoreUnalignedFloat(float* pSingleFloat, const fltx4& a)
-{
-	_mm_store_ss(pSingleFloat, a);
-}
-
-
-FORCEINLINE fltx4 RotateLeft(const fltx4& a);
-FORCEINLINE fltx4 RotateLeft2(const fltx4& a);
-
-FORCEINLINE void StoreUnaligned3SIMD(float* pSIMD, const fltx4& a)
-{
-	_mm_store_ss(pSIMD, a);
-	_mm_store_ss(pSIMD + 1, RotateLeft(a));
-	_mm_store_ss(pSIMD + 2, RotateLeft2(a));
-}
-
-
-FORCEINLINE void StoreAligned3SIMD(VectorAligned* RESTRICT pSIMD, const fltx4& a)
-{
-	StoreAlignedSIMD(pSIMD->Base(), a);
-}
-
-FORCEINLINE void StoreFourUnalignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-
-FORCEINLINE void StoreFourAlignedVector3SIMD(fltx4 a, fltx4 b, fltx4	c, FLTX4 d,       
-	Vector* const pDestination)
-{
-	StoreUnaligned3SIMD(pDestination->Base(), a);
-	StoreUnaligned3SIMD((pDestination + 1)->Base(), b);
-	StoreUnaligned3SIMD((pDestination + 2)->Base(), c);
-	StoreUnaligned3SIMD((pDestination + 3)->Base(), d);
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const void* pSIMD)
-{
-	return _mm_load_ps(reinterpret_cast<const float*> (pSIMD));
-}
-
-FORCEINLINE shortx8 LoadAlignedShortSIMD(const void* pSIMD)
-{
-	return _mm_load_si128(reinterpret_cast<const shortx8*> (pSIMD));
-}
-
-FORCEINLINE shortx8 LoadUnalignedShortSIMD(const void* pSIMD)
-{
-	return _mm_loadu_si128(reinterpret_cast<const shortx8*> (pSIMD));
-}
-
-FORCEINLINE fltx4 AndSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_and_ps(a, b);
-}
-
-FORCEINLINE fltx4 AndNotSIMD(const fltx4& a, const fltx4& b)			   
-{
-	return _mm_andnot_ps(a, b);
-}
-
-FORCEINLINE fltx4 XorSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_xor_ps(a, b);
-}
-
-FORCEINLINE fltx4 OrSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_or_ps(a, b);
-}
-
-FORCEINLINE fltx4 SetWToZeroSIMD(const fltx4& a)
-{
-	return AndSIMD(a, LoadAlignedSIMD(g_SIMD_clear_wmask));
-}
-
-FORCEINLINE fltx4 LoadAlignedSIMD(const VectorAligned& pSIMD)
-{
-	return SetWToZeroSIMD(LoadAlignedSIMD(pSIMD.Base()));
-}
-
-FORCEINLINE fltx4 LoadUnalignedSIMD(const void* pSIMD)
-{
-	return _mm_loadu_ps(reinterpret_cast<const float*>(pSIMD));
-}
-
-FORCEINLINE fltx4 LoadUnaligned3SIMD(const void* pSIMD)
-{
-	return _mm_loadu_ps(reinterpret_cast<const float*>(pSIMD));
-}
-
-FORCEINLINE fltx4 LoadUnalignedFloatSIMD(const float* pFlt)
-{
-	return _mm_load_ss(pFlt);
-}
-
-FORCEINLINE fltx4 ReplicateIX4(int i)
-{
-	fltx4 value = _mm_set_ss(*((float*)&i));;
-	return _mm_shuffle_ps(value, value, 0);
-}
-
-
-FORCEINLINE fltx4 ReplicateX4(float flValue)
-{
-	__m128 value = _mm_set_ss(flValue);
-	return _mm_shuffle_ps(value, value, 0);
-}
-
-FORCEINLINE fltx4 ReplicateX4(const float* flValue)
-{
-	__m128 value = _mm_set_ss(*flValue);
-	return _mm_shuffle_ps(value, value, 0);
-}
-
-FORCEINLINE float SubFloat(const fltx4& a, int idx)
-{
-#ifndef POSIX
-	return a.m128_f32[idx];
-#else
-	return (reinterpret_cast<float const*>(&a))[idx];
-#endif
-}
-
-FORCEINLINE float& SubFloat(fltx4& a, int idx)
-{
-#ifndef POSIX
-	return a.m128_f32[idx];
-#else
-	return (reinterpret_cast<float*>(&a))[idx];
-#endif
-}
-
-FORCEINLINE uint32 SubFloatConvertToInt(const fltx4& a, int idx)
-{
-	return (uint32)SubFloat(a, idx);
-}
-
-FORCEINLINE uint32 SubInt(const fltx4& a, int idx)
-{
-#ifndef POSIX
-	return a.m128_u32[idx];
-#else
-	return (reinterpret_cast<uint32 const*>(&a))[idx];
-#endif
-}
-
-FORCEINLINE uint32& SubInt(fltx4& a, int idx)
-{
-#ifndef POSIX
-	return a.m128_u32[idx];
-#else
-	return (reinterpret_cast<uint32*>(&a))[idx];
-#endif
-}
-
-FORCEINLINE fltx4 LoadZeroSIMD(void)
-{
-	return Four_Zeros;
-}
-
-FORCEINLINE fltx4 LoadOneSIMD(void)
-{
-	return Four_Ones;
-}
-
-FORCEINLINE fltx4 MaskedAssign(const fltx4& ReplacementMask, const fltx4& NewValue, const fltx4& OldValue)
-{
-	return OrSIMD(
-		AndSIMD(ReplacementMask, NewValue),
-		AndNotSIMD(ReplacementMask, OldValue));
-}
-
-#define MM_SHUFFLE_REV(a,b,c,d) _MM_SHUFFLE(d,c,b,a)
-
-FORCEINLINE fltx4 SplatXSIMD(fltx4 const& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(0, 0, 0, 0));
-}
-
-FORCEINLINE fltx4 SplatYSIMD(fltx4 const& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(1, 1, 1, 1));
-}
-
-FORCEINLINE fltx4 SplatZSIMD(fltx4 const& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(2, 2, 2, 2));
-}
-
-FORCEINLINE fltx4 SplatWSIMD(fltx4 const& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(3, 3, 3, 3));
-}
-
-FORCEINLINE fltx4 ShuffleXXYY(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(0, 0, 1, 1));
-}
-
-FORCEINLINE fltx4 ShuffleXYXY(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(0, 1, 0, 1));
-}
-
-FORCEINLINE fltx4 ShuffleZZWW(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(2, 2, 3, 3));
-}
-
-
-
-
-FORCEINLINE fltx4 SetXSIMD(const fltx4& a, const fltx4& x)
-{
-	fltx4 result = MaskedAssign(LoadAlignedSIMD(g_SIMD_ComponentMask[0]), x, a);
-	return result;
-}
-
-FORCEINLINE fltx4 SetYSIMD(const fltx4& a, const fltx4& y)
-{
-	fltx4 result = MaskedAssign(LoadAlignedSIMD(g_SIMD_ComponentMask[1]), y, a);
-	return result;
-}
-
-FORCEINLINE fltx4 SetZSIMD(const fltx4& a, const fltx4& z)
-{
-	fltx4 result = MaskedAssign(LoadAlignedSIMD(g_SIMD_ComponentMask[2]), z, a);
-	return result;
-}
-
-FORCEINLINE fltx4 SetWSIMD(const fltx4& a, const fltx4& w)
-{
-	fltx4 result = MaskedAssign(LoadAlignedSIMD(g_SIMD_ComponentMask[3]), w, a);
-	return result;
-}
-
-FORCEINLINE fltx4 SetComponentSIMD(const fltx4& a, int nComponent, float flValue)
-{
-	fltx4 val = ReplicateX4(flValue);
-	fltx4 result = MaskedAssign(LoadAlignedSIMD(g_SIMD_ComponentMask[nComponent]), val, a);
-	return result;
-}
-
-FORCEINLINE fltx4 RotateLeft(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(1, 2, 3, 0));
-}
-
-FORCEINLINE fltx4 RotateLeft2(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(2, 3, 0, 1));
-}
-
-FORCEINLINE fltx4 RotateRight(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(3, 0, 1, 2));
-}
-
-FORCEINLINE fltx4 RotateRight2(const fltx4& a)
-{
-	return _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(2, 3, 0, 1));
-}
-
-FORCEINLINE fltx4 AddSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_add_ps(a, b);
-}
-
-FORCEINLINE fltx4 SubSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_sub_ps(a, b);
-};
-
-FORCEINLINE fltx4 MulSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_mul_ps(a, b);
-};
-
-FORCEINLINE fltx4 DivSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_div_ps(a, b);
-};
-
-fltx4 ReciprocalEstSIMD(const fltx4& a);
-FORCEINLINE fltx4 DivEstSIMD(const fltx4& a, const fltx4& b)			 
-{
-	return MulSIMD(ReciprocalEstSIMD(b), a);
-};
-
-FORCEINLINE fltx4 MaddSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return AddSIMD(MulSIMD(a, b), c);
-}
-
-FORCEINLINE fltx4 MsubSIMD(const fltx4& a, const fltx4& b, const fltx4& c)				   
-{
-	return SubSIMD(c, MulSIMD(a, b));
-};
-
-FORCEINLINE fltx4 Dot3SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 m = MulSIMD(a, b);
-	return AddSIMD(AddSIMD(SplatXSIMD(m), SplatYSIMD(m)), SplatZSIMD(m));
-}
-
-FORCEINLINE fltx4 Dot4SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 fl4Product = MulSIMD(a, b);
-	fltx4 fl4YXWZ = _mm_shuffle_ps(fl4Product, fl4Product, MM_SHUFFLE_REV(1, 0, 3, 2));
-	fltx4 fl4UUVV = AddSIMD(fl4Product, fl4YXWZ);       
-	fltx4 fl4VVUU = RotateLeft2(fl4UUVV);
-	return AddSIMD(fl4UUVV, fl4VVUU);
-}
-
-FORCEINLINE fltx4 SinSIMD(const fltx4& radians)
-{
-	fltx4 result;
-	SubFloat(result, 0) = sin(SubFloat(radians, 0));
-	SubFloat(result, 1) = sin(SubFloat(radians, 1));
-	SubFloat(result, 2) = sin(SubFloat(radians, 2));
-	SubFloat(result, 3) = sin(SubFloat(radians, 3));
-	return result;
-}
-
-FORCEINLINE void SinCos3SIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)
-{
-	SinCos(SubFloat(radians, 0), &SubFloat(sine, 0), &SubFloat(cosine, 0));
-	SinCos(SubFloat(radians, 1), &SubFloat(sine, 1), &SubFloat(cosine, 1));
-	SinCos(SubFloat(radians, 2), &SubFloat(sine, 2), &SubFloat(cosine, 2));
-}
-
-FORCEINLINE void SinCosSIMD(fltx4& sine, fltx4& cosine, const fltx4& radians)				   
-{
-	SinCos(SubFloat(radians, 0), &SubFloat(sine, 0), &SubFloat(cosine, 0));
-	SinCos(SubFloat(radians, 1), &SubFloat(sine, 1), &SubFloat(cosine, 1));
-	SinCos(SubFloat(radians, 2), &SubFloat(sine, 2), &SubFloat(cosine, 2));
-	SinCos(SubFloat(radians, 3), &SubFloat(sine, 3), &SubFloat(cosine, 3));
-}
-
-FORCEINLINE fltx4 ArcSinSIMD(const fltx4& sine)
-{
-	fltx4 result;
-	SubFloat(result, 0) = asin(SubFloat(sine, 0));
-	SubFloat(result, 1) = asin(SubFloat(sine, 1));
-	SubFloat(result, 2) = asin(SubFloat(sine, 2));
-	SubFloat(result, 3) = asin(SubFloat(sine, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 ArcCosSIMD(const fltx4& cs)
-{
-	fltx4 result;
-	SubFloat(result, 0) = acos(SubFloat(cs, 0));
-	SubFloat(result, 1) = acos(SubFloat(cs, 1));
-	SubFloat(result, 2) = acos(SubFloat(cs, 2));
-	SubFloat(result, 3) = acos(SubFloat(cs, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 ArcTan2SIMD(const fltx4& a, const fltx4& b)
-{
-	fltx4 result;
-	SubFloat(result, 0) = atan2(SubFloat(a, 0), SubFloat(b, 0));
-	SubFloat(result, 1) = atan2(SubFloat(a, 1), SubFloat(b, 1));
-	SubFloat(result, 2) = atan2(SubFloat(a, 2), SubFloat(b, 2));
-	SubFloat(result, 3) = atan2(SubFloat(a, 3), SubFloat(b, 3));
-	return result;
-}
-
-FORCEINLINE fltx4 NegSIMD(const fltx4& a)   
-{
-	return SubSIMD(LoadZeroSIMD(), a);
-}
-
-FORCEINLINE int TestSignSIMD(const fltx4& a)								         
-{
-	return _mm_movemask_ps(a);
-}
-
-FORCEINLINE bool IsAnyNegative(const fltx4& a)							               
-{
-	return (0 != TestSignSIMD(a));
-}
-
-FORCEINLINE bool IsAnyTrue(const fltx4& a)
-{
-	return (0 != TestSignSIMD(a));
-}
-
-FORCEINLINE fltx4 CmpEqSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_cmpeq_ps(a, b);
-}
-
-FORCEINLINE fltx4 CmpGtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_cmpgt_ps(a, b);
-}
-
-FORCEINLINE fltx4 CmpGeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_cmpge_ps(a, b);
-}
-
-FORCEINLINE fltx4 CmpLtSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_cmplt_ps(a, b);
-}
-
-FORCEINLINE fltx4 CmpLeSIMD(const fltx4& a, const fltx4& b)				   
-{
-	return _mm_cmple_ps(a, b);
-}
-
-FORCEINLINE bool IsAllGreaterThan(const fltx4& a, const fltx4& b)
-{
-	return	TestSignSIMD(CmpLeSIMD(a, b)) == 0;
-}
-
-FORCEINLINE bool IsAllGreaterThanOrEq(const fltx4& a, const fltx4& b)
-{
-	return	TestSignSIMD(CmpLtSIMD(a, b)) == 0;
-}
-
-FORCEINLINE bool IsAllEqual(const fltx4& a, const fltx4& b)
-{
-	return	TestSignSIMD(CmpEqSIMD(a, b)) == 0xf;
-}
-
-FORCEINLINE fltx4 CmpInBoundsSIMD(const fltx4& a, const fltx4& b)		           
-{
-	return AndSIMD(CmpLeSIMD(a, b), CmpGeSIMD(a, NegSIMD(b)));
-}
-
-FORCEINLINE fltx4 MinSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_min_ps(a, b);
-}
-
-FORCEINLINE fltx4 MaxSIMD(const fltx4& a, const fltx4& b)				 
-{
-	return _mm_max_ps(a, b);
-}
-
-
-
-FORCEINLINE fltx4 CeilSIMD(const fltx4& a)
-{
-	fltx4 retVal;
-	SubFloat(retVal, 0) = ceil(SubFloat(a, 0));
-	SubFloat(retVal, 1) = ceil(SubFloat(a, 1));
-	SubFloat(retVal, 2) = ceil(SubFloat(a, 2));
-	SubFloat(retVal, 3) = ceil(SubFloat(a, 3));
-	return retVal;
-
-}
-
-fltx4 AbsSIMD(const fltx4& x);		                       
-fltx4 fabs(const fltx4& x);
-
-FORCEINLINE fltx4 FloorSIMD(const fltx4& val)
-{
-	fltx4 fl4Abs = fabs(val);
-	fltx4 ival = SubSIMD(AddSIMD(fl4Abs, Four_2ToThe23s), Four_2ToThe23s);
-	ival = MaskedAssign(CmpGtSIMD(ival, fl4Abs), SubSIMD(ival, Four_Ones), ival);
-	return XorSIMD(ival, XorSIMD(val, fl4Abs));			   
-}
-
-
-
-FORCEINLINE bool IsAnyZeros(const fltx4& a)								    
-{
-	return TestSignSIMD(CmpEqSIMD(a, Four_Zeros)) != 0;
-}
-
-inline bool IsAllZeros(const fltx4& var)
-{
-	return TestSignSIMD(CmpEqSIMD(var, Four_Zeros)) == 0xF;
-}
-
-FORCEINLINE fltx4 SqrtEstSIMD(const fltx4& a)					    
-{
-	return _mm_sqrt_ps(a);
-}
-
-FORCEINLINE fltx4 SqrtSIMD(const fltx4& a)						 
-{
-	return _mm_sqrt_ps(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSIMD(const fltx4& a)			    
-{
-	return _mm_rsqrt_ps(a);
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 ret = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	ret = ReciprocalSqrtEstSIMD(ret);
-	return ret;
-}
-
-FORCEINLINE fltx4 ReciprocalSqrtSIMD(const fltx4& a)				 
-{
-	fltx4 guess = ReciprocalSqrtEstSIMD(a);
-	guess = MulSIMD(guess, SubSIMD(Four_Threes, MulSIMD(a, MulSIMD(guess, guess))));
-	guess = MulSIMD(Four_PointFives, guess);
-	return guess;
-}
-
-FORCEINLINE fltx4 ReciprocalEstSIMD(const fltx4& a)				    
-{
-	return _mm_rcp_ps(a);
-}
-
-FORCEINLINE fltx4 ReciprocalEstSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 ret = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	ret = ReciprocalEstSIMD(ret);
-	return ret;
-}
-
-FORCEINLINE fltx4 ReciprocalSIMD(const fltx4& a)					 
-{
-	fltx4 ret = ReciprocalEstSIMD(a);
-	ret = SubSIMD(AddSIMD(ret, ret), MulSIMD(a, MulSIMD(ret, ret)));
-	return ret;
-}
-
-FORCEINLINE fltx4 ReciprocalSaturateSIMD(const fltx4& a)
-{
-	fltx4 zero_mask = CmpEqSIMD(a, Four_Zeros);
-	fltx4 ret = OrSIMD(a, AndSIMD(Four_Epsilons, zero_mask));
-	ret = ReciprocalSIMD(ret);
-	return ret;
-}
-
-FORCEINLINE fltx4 ExpSIMD(const fltx4& toPower)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = powf(2, SubFloat(toPower, 0));
-	SubFloat(retval, 1) = powf(2, SubFloat(toPower, 1));
-	SubFloat(retval, 2) = powf(2, SubFloat(toPower, 2));
-	SubFloat(retval, 3) = powf(2, SubFloat(toPower, 3));
-
-	return retval;
-}
-
-FORCEINLINE fltx4 ClampVectorSIMD(FLTX4 in, FLTX4 min, FLTX4 max)
-{
-	return MaxSIMD(min, MinSIMD(max, in));
-}
-
-FORCEINLINE void TransposeSIMD(fltx4& x, fltx4& y, fltx4& z, fltx4& w)
-{
-	_MM_TRANSPOSE4_PS(x, y, z, w);
-}
-
-FORCEINLINE fltx4 FindLowestSIMD3(const fltx4& a)
-{
-	fltx4 compareOne = RotateLeft(a);
-	fltx4 retval = MinSIMD(a, compareOne);
-	compareOne = RotateLeft2(a);
-	retval = MinSIMD(retval, compareOne);
-	return SplatXSIMD(retval);
-
-}
-
-FORCEINLINE fltx4 FindHighestSIMD3(const fltx4& a)
-{
-	fltx4 compareOne = RotateLeft(a);
-	fltx4 retval = MaxSIMD(a, compareOne);
-	compareOne = RotateLeft2(a);
-	retval = MaxSIMD(retval, compareOne);
-	return SplatXSIMD(retval);
-
-}
-
-
-inline bool IsVector3LessThan(const fltx4& v1, const fltx4& v2)
-{
-	bi32x4 isOut = CmpLtSIMD(v1, v2);
-	return IsAnyNegative(isOut);
-}
-
-inline bool IsVector4LessThan(const fltx4& v1, const fltx4& v2)
-{
-	bi32x4 isOut = CmpLtSIMD(v1, v2);
-	return IsAnyNegative(isOut);
-}
-
-
-
-#if 0				       
-FORCEINLINE fltx4 IntSetImmediateSIMD(int to)
-{
-	fltx4 retval;
-	SubInt(retval, 0) = to;
-	SubInt(retval, 1) = to;
-	SubInt(retval, 2) = to;
-	SubInt(retval, 3) = to;
-	return retval;
-}
-#endif
-
-FORCEINLINE i32x4 LoadAlignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return _mm_load_ps(reinterpret_cast<const float*>(pSIMD));
-}
-
-FORCEINLINE i32x4 LoadUnalignedIntSIMD(const void* RESTRICT pSIMD)
-{
-	return _mm_loadu_ps(reinterpret_cast<const float*>(pSIMD));
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(int32* RESTRICT pSIMD, const fltx4& a)
-{
-	_mm_store_ps(reinterpret_cast<float*>(pSIMD), a);
-}
-
-FORCEINLINE void StoreAlignedIntSIMD(intx4& pSIMD, const fltx4& a)
-{
-	_mm_store_ps(reinterpret_cast<float*>(pSIMD.Base()), a);
-}
-
-FORCEINLINE void StoreUnalignedIntSIMD(int32* RESTRICT pSIMD, const fltx4& a)
-{
-	_mm_storeu_ps(reinterpret_cast<float*>(pSIMD), a);
-}
-
-FORCEINLINE fltx4 CompressSIMD(fltx4 const& a, fltx4 const& b)
-{
-	return _mm_shuffle_ps(a, b, MM_SHUFFLE_REV(0, 2, 0, 2));
-}
-
-FORCEINLINE fltx4 LoadAndConvertUint16SIMD(const uint16* pInts)
-{
-#ifdef POSIX
-	fltx4 retval;
-	SubFloat(retval, 0) = pInts[0];
-	SubFloat(retval, 1) = pInts[1];
-	SubFloat(retval, 2) = pInts[2];
-	SubFloat(retval, 3) = pInts[3];
-	return retval;
-#else
-	__m128i inA = _mm_loadl_epi64((__m128i const*) pInts);                             
-	inA = _mm_unpacklo_epi16(inA, _mm_setzero_si128());       
-	return _mm_cvtepi32_ps(inA);
-#endif
-}
-
-
-FORCEINLINE fltx4 Compress4SIMD(fltx4 const a, fltx4 const& b, fltx4 const& c, fltx4 const& d)
-{
-	fltx4 aacc = _mm_shuffle_ps(a, c, MM_SHUFFLE_REV(0, 0, 0, 0));
-	fltx4 bbdd = _mm_shuffle_ps(b, d, MM_SHUFFLE_REV(0, 0, 0, 0));
-	return MaskedAssign(LoadAlignedSIMD(g_SIMD_EveryOtherMask), bbdd, aacc);
-}
-
-FORCEINLINE void ExpandSIMD(fltx4 const& a, fltx4& fl4OutA, fltx4& fl4OutB)
-{
-	fl4OutA = _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(0, 0, 1, 1));
-	fl4OutB = _mm_shuffle_ps(a, a, MM_SHUFFLE_REV(2, 2, 3, 3));
-
-}
-
-
-FORCEINLINE fltx4 LoadGatherSIMD(const float& x, const float& y, const float& z, const float& w)
-{
-	fltx4 vx = _mm_load_ss(&x);
-	fltx4 vy = _mm_load_ss(&y);
-	fltx4 vz = _mm_load_ss(&z);
-	fltx4 vw = _mm_load_ss(&w);
-	return Compress4SIMD(vx, vy, vz, vw);
-}
-
-FORCEINLINE fltx4 UnsignedIntConvertToFltSIMD(const u32x4& vSrcA)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = ((float)SubInt(retval, 0));
-	SubFloat(retval, 1) = ((float)SubInt(retval, 1));
-	SubFloat(retval, 2) = ((float)SubInt(retval, 2));
-	SubFloat(retval, 3) = ((float)SubInt(retval, 3));
-	return retval;
-}
-
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	return  _mm_cvtepi32_ps((const __m128i&)vSrcA);
-}
-
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const shortx8& vSrcA)
-{
-	return  _mm_cvtepi32_ps(vSrcA);
-}
-
-#if 0
-FORCEINLINE fltx4 SignedIntConvertToFltSIMD(const i32x4& vSrcA)
-{
-	fltx4 retval;
-	SubFloat(retval, 0) = ((float)(reinterpret_cast<const int32*>(&vSrcA)[0]));
-	SubFloat(retval, 1) = ((float)(reinterpret_cast<const int32*>(&vSrcA)[1]));
-	SubFloat(retval, 2) = ((float)(reinterpret_cast<const int32*>(&vSrcA)[2]));
-	SubFloat(retval, 3) = ((float)(reinterpret_cast<const int32*>(&vSrcA)[3]));
-	return retval;
-}
-
-#endif
-
-FORCEINLINE i32x4 IntShiftLeftWordSIMD(const i32x4& vSrcA, const i32x4& vSrcB)
-{
-	i32x4 retval;
-	SubInt(retval, 0) = SubInt(vSrcA, 0) << SubInt(vSrcB, 0);
-	SubInt(retval, 1) = SubInt(vSrcA, 1) << SubInt(vSrcB, 1);
-	SubInt(retval, 2) = SubInt(vSrcA, 2) << SubInt(vSrcB, 2);
-	SubInt(retval, 3) = SubInt(vSrcA, 3) << SubInt(vSrcB, 3);
-
-
-	return retval;
-}
-
-
-FORCEINLINE void ConvertStoreAsIntsSIMD(intx4* RESTRICT pDest, const fltx4& vSrc)
-{
-#if defined(_MSC_VER) && _MSC_VER >= 1900 && defined(COMPILER_MSVC64)
-	(*pDest)[0] = (int)SubFloat(vSrc, 0);
-	(*pDest)[1] = (int)SubFloat(vSrc, 1);
-	(*pDest)[2] = (int)SubFloat(vSrc, 2);
-	(*pDest)[3] = (int)SubFloat(vSrc, 3);
-#else
-	__m64 bottom = _mm_cvttps_pi32(vSrc);
-	__m64 top = _mm_cvttps_pi32(_mm_movehl_ps(vSrc, vSrc));
-
-	*reinterpret_cast<__m64*>(&(*pDest)[0]) = bottom;
-	*reinterpret_cast<__m64*>(&(*pDest)[2]) = top;
-
-	_mm_empty();
-#endif
-}
-
-
-
-#endif
-
-FORCEINLINE void RotateLeftDoubleSIMD(fltx4& a, fltx4& b)
-{
-	a = SetWSIMD(RotateLeft(a), SplatXSIMD(b));
-	b = RotateLeft(b);
-}
-
-
-#if !defined(PLATFORM_PPC) && !defined( POSIX ) && !defined(SPU)
-#if 1         
-FORCEINLINE fltx4 operator+(FLTX4 a, FLTX4 b)
-{
-	return AddSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator-(FLTX4 a, FLTX4 b)
-{
-	return SubSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator*(FLTX4 a, FLTX4 b)
-{
-	return MulSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator&(FLTX4 a, FLTX4 b)
-{
-	return AndSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator|(FLTX4 a, FLTX4 b)
-{
-	return OrSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator^(FLTX4 a, FLTX4 b)
-{
-	return XorSIMD(a, b);
-}
-
-FORCEINLINE fltx4 operator-(FLTX4 a)
-{
-	return NegSIMD(a);
-}
-#endif  
-#endif
-
-#if defined(_X360) || defined(_PS3)
-FORCEINLINE fltx4 VectorMergeHighSIMD(fltx4 fl4SrcA, fltx4 fl4SrcB)
-{
-#if defined( _X360 )
-	return __vmrghw(fl4SrcA, fl4SrcB);
-#else
-	return vec_mergeh(fl4SrcA, fl4SrcB);
-#endif
-}
-
-FORCEINLINE fltx4 VectorMergeLowSIMD(fltx4 fl4SrcA, fltx4 fl4SrcB)
-{
-#if defined( _X360 )
-	return __vmrglw(fl4SrcA, fl4SrcB);
-#else
-	return vec_mergel(fl4SrcA, fl4SrcB);
-#endif
-}
-#endif
-
-#ifndef SPU
-struct ALIGN16 fourplanes_t
-{
-	fltx4		nX;
-	fltx4		nY;
-	fltx4		nZ;
-	fltx4		dist;
-	bi32x4		xSign;
-	bi32x4		ySign;
-	bi32x4		zSign;
-	fltx4		nXAbs;
-	fltx4		nYAbs;
-	fltx4		nZAbs;
-
-	void ComputeSignbits();
-
-	void Set4Planes(const VPlane* pPlanes);
-	void Set2Planes(const VPlane* pPlanes);
-	void Get4Planes(VPlane* pPlanesOut) const;
-	void Get2Planes(VPlane* pPlanesOut) const;
-	void GetPlane(int index, Vector* pNormal, float* pDist) const;
-	void SetPlane(int index, const Vector& vecNormal, float planeDist);
-};
-
-
-
-#endif
-
-class FourQuaternions;
-class ALIGN16 FourVectors
-{
-public:
-	fltx4 x, y, z;
-
-	FourVectors(void)
-	{
-	}
-
-	FourVectors(FourVectors const& src)
-	{
-		x = src.x;
-		y = src.y;
-		z = src.z;
-	}
-
-	explicit FORCEINLINE FourVectors(float a)
-	{
-		fltx4 aReplicated = ReplicateX4(a);
-		x = y = z = aReplicated;
-	}
-
-	FORCEINLINE void Init(void)
-	{
-		x = Four_Zeros;
-		y = Four_Zeros;
-		z = Four_Zeros;
-	}
-
-	FORCEINLINE void Init(float flX, float flY, float flZ)
-	{
-		x = ReplicateX4(flX);
-		y = ReplicateX4(flY);
-		z = ReplicateX4(flZ);
-	}
-
-	FORCEINLINE FourVectors(float flX, float flY, float flZ)
-	{
-		Init(flX, flY, flZ);
-	}
-
-	FORCEINLINE void Init(fltx4 const& fl4X, fltx4 const& fl4Y, fltx4 const& fl4Z)
-	{
-		x = fl4X;
-		y = fl4Y;
-		z = fl4Z;
-	}
-
-	FORCEINLINE FourVectors(fltx4 const& fl4X, fltx4 const& fl4Y, fltx4 const& fl4Z)
-	{
-		Init(fl4X, fl4Y, fl4Z);
-	}
-
-
-
-	FORCEINLINE FourVectors(Vector const& a, Vector const& b, Vector const& c, Vector const& d)
-	{
-		LoadAndSwizzle(a, b, c, d);
-	}
-
-	FORCEINLINE FourVectors(VectorAligned const& a, VectorAligned const& b, VectorAligned const& c, VectorAligned const& d)
-	{
-		LoadAndSwizzleAligned(a, b, c, d);
-	}
-
-	FORCEINLINE FourVectors(const float* xs, const float* ys, const float* zs) :
-		x(LoadAlignedSIMD(xs)), y(LoadAlignedSIMD(ys)), z(LoadAlignedSIMD(zs))
-	{};
-
-	FORCEINLINE void DuplicateVector(Vector const& v)			         
-	{
-		x = ReplicateX4(v.x);
-		y = ReplicateX4(v.y);
-		z = ReplicateX4(v.z);
-	}
-
-	FORCEINLINE fltx4 const& operator[](int idx) const
-	{
-		return *((&x) + idx);
-	}
-
-	FORCEINLINE fltx4& operator[](int idx)
-	{
-		return *((&x) + idx);
-	}
-
-	FORCEINLINE void operator+=(FourVectors const& b)			       
-	{
-		x = AddSIMD(x, b.x);
-		y = AddSIMD(y, b.y);
-		z = AddSIMD(z, b.z);
-	}
-
-	FORCEINLINE void operator-=(FourVectors const& b)			      
-	{
-		x = SubSIMD(x, b.x);
-		y = SubSIMD(y, b.y);
-		z = SubSIMD(z, b.z);
-	}
-
-	FORCEINLINE void operator*=(FourVectors const& b)			       
-	{
-		x = MulSIMD(x, b.x);
-		y = MulSIMD(y, b.y);
-		z = MulSIMD(z, b.z);
-	}
-
-	FORCEINLINE void operator*=(const fltx4& scale)			  
-	{
-		x = MulSIMD(x, scale);
-		y = MulSIMD(y, scale);
-		z = MulSIMD(z, scale);
-	}
-
-	FORCEINLINE void operator*=(float scale)					     
-	{
-		fltx4 scalepacked = ReplicateX4(scale);
-		*this *= scalepacked;
-	}
-
-	FORCEINLINE fltx4 operator*(FourVectors const& b) const		   
-	{
-		fltx4 dot = MulSIMD(x, b.x);
-		dot = MaddSIMD(y, b.y, dot);
-		dot = MaddSIMD(z, b.z, dot);
-		return dot;
-	}
-
-	FORCEINLINE fltx4 operator*(Vector const& b) const			        
-	{
-		fltx4 dot = MulSIMD(x, ReplicateX4(b.x));
-		dot = MaddSIMD(y, ReplicateX4(b.y), dot);
-		dot = MaddSIMD(z, ReplicateX4(b.z), dot);
-		return dot;
-	}
-
-	FORCEINLINE FourVectors operator*(float b) const					 
-	{
-		fltx4 scalepacked = ReplicateX4(b);
-		FourVectors res;
-		res.x = MulSIMD(x, scalepacked);
-		res.y = MulSIMD(y, scalepacked);
-		res.z = MulSIMD(z, scalepacked);
-		return res;
-	}
-
-	FORCEINLINE FourVectors operator*(FLTX4 fl4Scale) const					 
-	{
-		FourVectors res;
-		res.x = MulSIMD(x, fl4Scale);
-		res.y = MulSIMD(y, fl4Scale);
-		res.z = MulSIMD(z, fl4Scale);
-		return res;
-	}
-
-	FORCEINLINE void VProduct(FourVectors const& b)				    
-	{
-		x = MulSIMD(x, b.x);
-		y = MulSIMD(y, b.y);
-		z = MulSIMD(z, b.z);
-	}
-	FORCEINLINE void MakeReciprocal(void)						 
-	{
-		x = ReciprocalSIMD(x);
-		y = ReciprocalSIMD(y);
-		z = ReciprocalSIMD(z);
-	}
-
-	FORCEINLINE void MakeReciprocalSaturate(void)				  
-	{
-		x = ReciprocalSaturateSIMD(x);
-		y = ReciprocalSaturateSIMD(y);
-		z = ReciprocalSaturateSIMD(z);
-	}
-
-	inline void RotateBy(const matrix3x4_t& matrix);
-	static void RotateManyBy(FourVectors* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& rotationMatrix);
-
-	static void RotateManyBy(FourVectors* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& rotationMatrix, FourVectors* RESTRICT pOut);
-
-	inline void TransformBy(const matrix3x4_t& matrix);
-
-	static void TransformManyBy(FourVectors* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& rotationMatrix, FourVectors* RESTRICT pOut);
-
-	static void TransformManyBy(FourVectors* RESTRICT pVectors, unsigned int numVectors, const matrix3x4_t& rotationMatrix);
-
-	static void CalcClosestPointOnLineSIMD(const FourVectors& P, const FourVectors& vLineA, const FourVectors& vLineB, FourVectors& vClosest, fltx4* outT = 0);
-	static fltx4 CalcClosestPointToLineTSIMD(const FourVectors& P, const FourVectors& vLineA, const FourVectors& vLineB, FourVectors& vDir);
-
-	FORCEINLINE const float& X(int idx) const
-	{
-		return SubFloat((fltx4&)x, idx);
-	}
-
-	FORCEINLINE const float& Y(int idx) const
-	{
-		return SubFloat((fltx4&)y, idx);
-	}
-
-	FORCEINLINE const float& Z(int idx) const
-	{
-		return SubFloat((fltx4&)z, idx);
-	}
-
-	FORCEINLINE float& X(int idx)
-	{
-		return SubFloat(x, idx);
-	}
-
-	FORCEINLINE float& Y(int idx)
-	{
-		return SubFloat(y, idx);
-	}
-
-	FORCEINLINE float& Z(int idx)
-	{
-		return SubFloat(z, idx);
-	}
-
-	FORCEINLINE Vector Vec(int idx) const						     
-	{
-		return Vector(X(idx), Y(idx), Z(idx));
-	}
-
-	FORCEINLINE void operator=(FourVectors const& src)
-	{
-		x = src.x;
-		y = src.y;
-		z = src.z;
-	}
-
-	FORCEINLINE void LoadAndSwizzle(Vector const& a, Vector const& b, Vector const& c, Vector const& d)
-	{
-#if defined( _X360 ) || defined(_PS3)
-		fltx4 tx = LoadUnalignedSIMD(&a.x);
-		fltx4 ty = LoadUnalignedSIMD(&b.x);
-		fltx4 tz = LoadUnalignedSIMD(&c.x);
-		fltx4 tw = LoadUnalignedSIMD(&d.x);
-		fltx4 r0 = VectorMergeHighSIMD(tx, tz);
-		fltx4 r1 = VectorMergeHighSIMD(ty, tw);
-		fltx4 r2 = VectorMergeLowSIMD(tx, tz);
-		fltx4 r3 = VectorMergeLowSIMD(ty, tw);
-
-		x = VectorMergeHighSIMD(r0, r1);
-		y = VectorMergeLowSIMD(r0, r1);
-		z = VectorMergeHighSIMD(r2, r3);
-#else
-		x = LoadUnalignedSIMD(&(a.x));
-		y = LoadUnalignedSIMD(&(b.x));
-		z = LoadUnalignedSIMD(&(c.x));
-		fltx4 w = LoadUnalignedSIMD(&(d.x));
-		TransposeSIMD(x, y, z, w);
-#endif
-	}
-
-	FORCEINLINE void LoadAndSwizzle(Vector const& a)
-	{
-		LoadAndSwizzle(a, a, a, a);
-	}
-
-	FORCEINLINE void Load(const float& a, const float& b, const float& c, const float& d)
-	{
-#if defined( _X360 ) || defined( _PS3 )
-		fltx4 temp[4];
-		temp[0] = LoadUnalignedFloatSIMD(&a);
-		temp[1] = LoadUnalignedFloatSIMD(&b);
-		temp[2] = LoadUnalignedFloatSIMD(&c);
-		temp[3] = LoadUnalignedFloatSIMD(&d);
-		y = VectorMergeHighSIMD(temp[0], temp[2]);  
-		z = VectorMergeHighSIMD(temp[1], temp[3]);  
-
-		x = VectorMergeHighSIMD(y, z);  
-		y = x;
-		z = x;
-#else
-		ALIGN16 float temp[4];
-		temp[0] = a; temp[1] = b; temp[2] = c; temp[3] = d;
-		fltx4 v = LoadAlignedSIMD(temp);
-		x = v;
-		y = v;
-		z = v;
-#endif
-	}
-
-	FORCEINLINE void LoadAndSwizzle(FLTX4 a, FLTX4 b, FLTX4 c, FLTX4 d)
-	{
-#if defined( _X360 ) || defined( _PS3 )
-		fltx4 tx = a;
-		fltx4 ty = b;
-		fltx4 tz = c;
-		fltx4 tw = d;
-		fltx4 r0 = VectorMergeHighSIMD(tx, tz);
-		fltx4 r1 = VectorMergeHighSIMD(ty, tw);
-		fltx4 r2 = VectorMergeLowSIMD(tx, tz);
-		fltx4 r3 = VectorMergeLowSIMD(ty, tw);
-
-		x = VectorMergeHighSIMD(r0, r1);
-		y = VectorMergeLowSIMD(r0, r1);
-		z = VectorMergeHighSIMD(r2, r3);
-#else
-		x = a;
-		y = b;
-		z = c;
-		fltx4 w = d;
-		TransposeSIMD(x, y, z, w);
-#endif
-	}
-
-	FORCEINLINE void LoadAndSwizzleAligned(const float* RESTRICT a, const float* RESTRICT b, const float* RESTRICT c, const float* RESTRICT d)
-	{
-#if defined( _X360 ) || defined( _PS3 )
-		fltx4 tx = LoadAlignedSIMD(a);
-		fltx4 ty = LoadAlignedSIMD(b);
-		fltx4 tz = LoadAlignedSIMD(c);
-		fltx4 tw = LoadAlignedSIMD(d);
-		fltx4 r0 = VectorMergeHighSIMD(tx, tz);
-		fltx4 r1 = VectorMergeHighSIMD(ty, tw);
-		fltx4 r2 = VectorMergeLowSIMD(tx, tz);
-		fltx4 r3 = VectorMergeLowSIMD(ty, tw);
-
-		x = VectorMergeHighSIMD(r0, r1);
-		y = VectorMergeLowSIMD(r0, r1);
-		z = VectorMergeHighSIMD(r2, r3);
-#else
-		x = LoadAlignedSIMD(a);
-		y = LoadAlignedSIMD(b);
-		z = LoadAlignedSIMD(c);
-		fltx4 w = LoadAlignedSIMD(d);
-		TransposeSIMD(x, y, z, w);
-#endif
-	}
-
-	FORCEINLINE void LoadAndSwizzleAligned(Vector const& a, Vector const& b, Vector const& c, Vector const& d)
-	{
-		LoadAndSwizzleAligned(&a.x, &b.x, &c.x, &d.x);
-	}
-
-	FORCEINLINE void TransposeOnto(fltx4& out0, fltx4& out1, fltx4& out2, fltx4& out3, FLTX4 w = Four_Zeros) const
-	{
-#if defined( _X360 ) || defined(_PS3)
-		fltx4 r0 = VectorMergeHighSIMD(x, z);
-		fltx4 r1 = VectorMergeHighSIMD(y, w);
-		fltx4 r2 = VectorMergeLowSIMD(x, z);
-		fltx4 r3 = VectorMergeLowSIMD(y, w);
-
-		out0 = VectorMergeHighSIMD(r0, r1);
-		out1 = VectorMergeLowSIMD(r0, r1);
-		out2 = VectorMergeHighSIMD(r2, r3);
-		out3 = VectorMergeLowSIMD(r2, r3);
-#else
-		out0 = x;
-		out1 = y;
-		out2 = z;
-		out3 = w;
-
-		TransposeSIMD(out0, out1, out2, out3);
-#endif
-	}
-
-#if !defined(__SPU__)
-	FORCEINLINE void StoreUnalignedVector3SIMD(Vector* RESTRICT out0, Vector* RESTRICT out1, Vector* RESTRICT out2, Vector* RESTRICT out3) const;
-#endif
-
-	FORCEINLINE void StoreAlignedVectorSIMD(VectorAligned* RESTRICT out0, VectorAligned* RESTRICT out1, VectorAligned* RESTRICT out2, VectorAligned* RESTRICT out3) const;
-
-#if !defined(__SPU__)
-	FORCEINLINE void StoreUnalignedContigVector3SIMD(Vector* RESTRICT pDestination)
-	{
-		fltx4 a, b, c, d;
-		TransposeOnto(a, b, c, d);
-		StoreFourUnalignedVector3SIMD(a, b, c, d, pDestination);
-	}
-#endif
-
-#if !defined(__SPU__)
-	FORCEINLINE void StoreAlignedContigVector3SIMD(Vector* RESTRICT pDestination)
-	{
-		fltx4 a, b, c, d;
-		TransposeOnto(a, b, c, d);
-		StoreFourAlignedVector3SIMD(a, b, c, d, pDestination);
-	}
-
-	FORCEINLINE void StoreAlignedContigVectorASIMD(VectorAligned* RESTRICT pDestination)
-	{
-		StoreAlignedVectorSIMD(pDestination, pDestination + 1, pDestination + 2, pDestination + 3);
-	}
-#endif
-
-	FORCEINLINE fltx4 LengthSqr(void) const
-	{
-		const FourVectors& a = *this;
-		return a * a;
-	}
-
-	FORCEINLINE fltx4 length2(void) const
-	{
-		return (*this) * (*this);
-	}
-
-	FORCEINLINE fltx4 length(void) const
-	{
-		return SqrtEstSIMD(length2());
-	}
-
-	FORCEINLINE fltx4 Length(void) const
-	{
-		return SqrtSIMD(length2());
-	}
-
-
-	FORCEINLINE void VectorNormalizeFast(void)
-	{
-		fltx4 mag_sq = (*this) * (*this);						 
-		(*this) *= ReciprocalSqrtEstSIMD(mag_sq);			 
-	}
-
-	FORCEINLINE void VectorNormalize(void)
-	{
-		fltx4 mag_sq = (*this) * (*this);						 
-		(*this) *= ReciprocalSqrtSIMD(mag_sq);				 
-	}
-
-	FORCEINLINE fltx4 DistToSqr(FourVectors const& pnt)
-	{
-		fltx4 fl4dX = SubSIMD(pnt.x, x);
-		fltx4 fl4dY = SubSIMD(pnt.y, y);
-		fltx4 fl4dZ = SubSIMD(pnt.z, z);
-		return AddSIMD(MulSIMD(fl4dX, fl4dX), AddSIMD(MulSIMD(fl4dY, fl4dY), MulSIMD(fl4dZ, fl4dZ)));
-
-	}
-
-	FORCEINLINE fltx4 TValueOfClosestPointOnLine(FourVectors const& p0, FourVectors const& p1) const
-	{
-		FourVectors lineDelta = p1;
-		lineDelta -= p0;
-		fltx4 OOlineDirDotlineDir = ReciprocalSIMD(p1 * p1);
-		FourVectors v4OurPnt = *this;
-		v4OurPnt -= p0;
-		return MulSIMD(OOlineDirDotlineDir, v4OurPnt * lineDelta);
-	}
-
-	FORCEINLINE fltx4 DistSqrToLineSegment(FourVectors const& p0, FourVectors const& p1) const
-	{
-		FourVectors lineDelta = p1;
-		FourVectors v4OurPnt = *this;
-		v4OurPnt -= p0;
-		lineDelta -= p0;
-
-		fltx4 OOlineDirDotlineDir = ReciprocalSIMD(lineDelta * lineDelta);
-
-		fltx4 fl4T = MulSIMD(OOlineDirDotlineDir, v4OurPnt * lineDelta);
-
-		fl4T = MinSIMD(fl4T, Four_Ones);
-		fl4T = MaxSIMD(fl4T, Four_Zeros);
-		lineDelta *= fl4T;
-		return v4OurPnt.DistToSqr(lineDelta);
-	}
-	FORCEINLINE FourVectors Normalized()const
-	{
-		fltx4 fl4LengthInv = ReciprocalSqrtSIMD(LengthSqr());
-		FourVectors out;
-		out.x = x * fl4LengthInv;
-		out.y = y * fl4LengthInv;
-		out.z = z * fl4LengthInv;
-		return out;
-	}
-
-	FORCEINLINE FourVectors NormalizedSafeX() const
-	{
-		fltx4 f4LenSqr = LengthSqr();
-		fltx4 isBigEnough = CmpGeSIMD(f4LenSqr, Four_Epsilons);
-		fltx4 fl4LengthInv = ReciprocalSqrtSIMD(f4LenSqr);
-		FourVectors out;
-		out.x = MaskedAssign(isBigEnough, x * fl4LengthInv, Four_Ones);
-		out.y = AndSIMD(y * fl4LengthInv, isBigEnough);
-		out.z = AndSIMD(z * fl4LengthInv, isBigEnough);
-		return out;
-	}
-	FORCEINLINE FourVectors NormalizedSafeY() const
-	{
-		fltx4 f4LenSqr = LengthSqr();
-		fltx4 isBigEnough = CmpGeSIMD(f4LenSqr, Four_Epsilons);
-		fltx4 fl4LengthInv = ReciprocalSqrtSIMD(f4LenSqr);
-		FourVectors out;
-		out.x = AndSIMD(x * fl4LengthInv, isBigEnough);
-		out.y = MaskedAssign(isBigEnough, y * fl4LengthInv, Four_Ones);
-		out.z = AndSIMD(z * fl4LengthInv, isBigEnough);
-		return out;
-	}
-
-	FORCEINLINE FourVectors NormalizedSafeZ() const
-	{
-		fltx4 f4LenSqr = LengthSqr();
-		fltx4 isBigEnough = CmpGeSIMD(f4LenSqr, Four_Epsilons);
-		fltx4 fl4LengthInv = ReciprocalSqrtSIMD(f4LenSqr);
-		FourVectors out;
-		out.x = AndSIMD(x * fl4LengthInv, isBigEnough);
-		out.y = AndSIMD(y * fl4LengthInv, isBigEnough);
-		out.z = MaskedAssign(isBigEnough, z * fl4LengthInv, Four_Ones);
-		return out;
-	}
-};
-
-
-inline FourVectors CrossProduct(const FourVectors& a, const FourVectors& b)
-{
-	return FourVectors(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x);
-}
-
-inline fltx4 DotProduct(const FourVectors& a, const FourVectors& b)
-{
-	return a.x * b.x + a.y * b.y + a.z * b.z;
-}
-
-inline FourVectors operator * (fltx4 left, const FourVectors& right)
-{
-	return right * left;
-}
-
-
-inline FourVectors Mul(const FourVectors& a, const fltx4& b)
-{
-	FourVectors ret;
-	ret.x = MulSIMD(a.x, b);
-	ret.y = MulSIMD(a.y, b);
-	ret.z = MulSIMD(a.z, b);
-	return ret;
-}
-
-inline FourVectors Mul(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = MulSIMD(a.x, b.x);
-	ret.y = MulSIMD(a.y, b.y);
-	ret.z = MulSIMD(a.z, b.z);
-	return ret;
-}
-
-inline FourVectors Madd(const FourVectors& a, const fltx4& b, const FourVectors& c)	   
-{
-	FourVectors ret;
-	ret.x = MaddSIMD(a.x, b, c.x);
-	ret.y = MaddSIMD(a.y, b, c.y);
-	ret.z = MaddSIMD(a.z, b, c.z);
-	return ret;
-}
-
-inline FourVectors operator ^(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = SubSIMD(MulSIMD(a.y, b.z), MulSIMD(a.z, b.y));
-	ret.y = SubSIMD(MulSIMD(a.z, b.x), MulSIMD(a.x, b.z));
-	ret.z = SubSIMD(MulSIMD(a.x, b.y), MulSIMD(a.y, b.x));
-	return ret;
-}
-
-inline FourVectors operator-(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = SubSIMD(a.x, b.x);
-	ret.y = SubSIMD(a.y, b.y);
-	ret.z = SubSIMD(a.z, b.z);
-	return ret;
-}
-
-inline FourVectors operator+(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = AddSIMD(a.x, b.x);
-	ret.y = AddSIMD(a.y, b.y);
-	ret.z = AddSIMD(a.z, b.z);
-	return ret;
-}
-
-inline FourVectors maximum(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = MaxSIMD(a.x, b.x);
-	ret.y = MaxSIMD(a.y, b.y);
-	ret.z = MaxSIMD(a.z, b.z);
-	return ret;
-}
-
-inline FourVectors minimum(const FourVectors& a, const FourVectors& b)
-{
-	FourVectors ret;
-	ret.x = MinSIMD(a.x, b.x);
-	ret.y = MinSIMD(a.y, b.y);
-	ret.z = MinSIMD(a.z, b.z);
-	return ret;
-}
-
-FORCEINLINE FourVectors RotateLeft(const FourVectors& src)
-{
-	FourVectors ret;
-	ret.x = RotateLeft(src.x);
-	ret.y = RotateLeft(src.y);
-	ret.z = RotateLeft(src.z);
-	return ret;
-}
-
-FORCEINLINE FourVectors RotateRight(const FourVectors& src)
-{
-	FourVectors ret;
-	ret.x = RotateRight(src.x);
-	ret.y = RotateRight(src.y);
-	ret.z = RotateRight(src.z);
-	return ret;
-}
-FORCEINLINE FourVectors MaskedAssign(const bi32x4& ReplacementMask, const FourVectors& NewValue, const FourVectors& OldValue)
-{
-	FourVectors ret;
-	ret.x = MaskedAssign(ReplacementMask, NewValue.x, OldValue.x);
-	ret.y = MaskedAssign(ReplacementMask, NewValue.y, OldValue.y);
-	ret.z = MaskedAssign(ReplacementMask, NewValue.z, OldValue.z);
-	return ret;
-}
-
-FORCEINLINE FourVectors VectorReflect(const FourVectors& incident, const FourVectors& normal)
-{
-	FourVectors ret = incident;
-	fltx4 iDotNx2 = incident * normal;
-	iDotNx2 = AddSIMD(iDotNx2, iDotNx2);
-	FourVectors nPart = normal;
-	nPart *= iDotNx2;
-	ret -= nPart;											 
-	return ret;
-}
-
-FORCEINLINE FourVectors VectorSlide(const FourVectors& incident, const FourVectors& normal)
-{
-	FourVectors ret = incident;
-	fltx4 iDotN = incident * normal;
-	FourVectors nPart = normal;
-	nPart *= iDotN;
-	ret -= nPart;											 
-	return ret;
-}
-
-FORCEINLINE FourVectors VectorNormalizeFast(const FourVectors& src)
-{
-	fltx4 mag_sq = ReciprocalSqrtEstSIMD(src * src);					 
-	FourVectors result;
-	result.x = MulSIMD(src.x, mag_sq);
-	result.y = MulSIMD(src.y, mag_sq);
-	result.z = MulSIMD(src.z, mag_sq);
-	return result;
-}
-
-#if !defined(__SPU__)
-FORCEINLINE void FourVectors::StoreUnalignedVector3SIMD(Vector* RESTRICT out0, Vector* RESTRICT out1, Vector* RESTRICT out2, Vector* RESTRICT out3) const
-{
-#ifdef _X360
-	fltx4 x0, x1, x2, x3, y0, y1, y2, y3, z0, z1, z2, z3;
-	x0 = SplatXSIMD(x);   
-	x1 = SplatYSIMD(x);
-	x2 = SplatZSIMD(x);
-	x3 = SplatWSIMD(x);
-
-	y0 = SplatXSIMD(y);
-	y1 = SplatYSIMD(y);
-	y2 = SplatZSIMD(y);
-	y3 = SplatWSIMD(y);
-
-	z0 = SplatXSIMD(z);
-	z1 = SplatYSIMD(z);
-	z2 = SplatZSIMD(z);
-	z3 = SplatWSIMD(z);
-
-	__stvewx(x0, out0->Base(), 0);     
-	__stvewx(y0, out0->Base(), 4);     
-	__stvewx(z0, out0->Base(), 8);     
-
-	__stvewx(x1, out1->Base(), 0);     
-	__stvewx(y1, out1->Base(), 4);     
-	__stvewx(z1, out1->Base(), 8);     
-
-	__stvewx(x2, out2->Base(), 0);     
-	__stvewx(y2, out2->Base(), 4);     
-	__stvewx(z2, out2->Base(), 8);     
-
-	__stvewx(x3, out3->Base(), 0);     
-	__stvewx(y3, out3->Base(), 4);     
-	__stvewx(z3, out3->Base(), 8);     
-#else
-	fltx4 a, b, c, d;
-	TransposeOnto(a, b, c, d);
-	StoreUnaligned3SIMD(out0->Base(), a);
-	StoreUnaligned3SIMD(out1->Base(), b);
-	StoreUnaligned3SIMD(out2->Base(), c);
-	StoreUnaligned3SIMD(out3->Base(), d);
-#endif
-}
-
-FORCEINLINE void FourVectors::StoreAlignedVectorSIMD(VectorAligned* RESTRICT out0, VectorAligned* RESTRICT out1, VectorAligned* RESTRICT out2, VectorAligned* RESTRICT out3) const
-{
-	fltx4 a, b, c, d;
-	TransposeOnto(a, b, c, d);
-	StoreAligned3SIMD(out0, a);
-	StoreAligned3SIMD(out1, b);
-	StoreAligned3SIMD(out2, c);
-	StoreAligned3SIMD(out3, d);
-
-}
-#endif
-
-#if !defined(__SPU__)
-void FourVectors::RotateBy(const matrix3x4_t& matrix)
-{
-	fltx4 matSplat00, matSplat01, matSplat02,
-		matSplat10, matSplat11, matSplat12,
-		matSplat20, matSplat21, matSplat22;
-
-	fltx4 matCol0 = LoadUnalignedSIMD(matrix[0]);
-	fltx4 matCol1 = LoadUnalignedSIMD(matrix[1]);
-	fltx4 matCol2 = LoadUnalignedSIMD(matrix[2]);
-
-	matSplat00 = SplatXSIMD(matCol0);
-	matSplat01 = SplatYSIMD(matCol0);
-	matSplat02 = SplatZSIMD(matCol0);
-
-	matSplat10 = SplatXSIMD(matCol1);
-	matSplat11 = SplatYSIMD(matCol1);
-	matSplat12 = SplatZSIMD(matCol1);
-
-	matSplat20 = SplatXSIMD(matCol2);
-	matSplat21 = SplatYSIMD(matCol2);
-	matSplat22 = SplatZSIMD(matCol2);
-
-	fltx4 outX, outY, outZ;
-	outX = AddSIMD(AddSIMD(MulSIMD(x, matSplat00), MulSIMD(y, matSplat01)), MulSIMD(z, matSplat02));
-	outY = AddSIMD(AddSIMD(MulSIMD(x, matSplat10), MulSIMD(y, matSplat11)), MulSIMD(z, matSplat12));
-	outZ = AddSIMD(AddSIMD(MulSIMD(x, matSplat20), MulSIMD(y, matSplat21)), MulSIMD(z, matSplat22));
-
-	x = outX;
-	y = outY;
-	z = outZ;
-}
-
-
-void FourVectors::TransformBy(const matrix3x4_t& matrix)
-{
-	fltx4 matSplat00, matSplat01, matSplat02,
-		matSplat10, matSplat11, matSplat12,
-		matSplat20, matSplat21, matSplat22;
-
-	fltx4 matCol0 = LoadUnalignedSIMD(matrix[0]);
-	fltx4 matCol1 = LoadUnalignedSIMD(matrix[1]);
-	fltx4 matCol2 = LoadUnalignedSIMD(matrix[2]);
-
-	matSplat00 = SplatXSIMD(matCol0);
-	matSplat01 = SplatYSIMD(matCol0);
-	matSplat02 = SplatZSIMD(matCol0);
-
-	matSplat10 = SplatXSIMD(matCol1);
-	matSplat11 = SplatYSIMD(matCol1);
-	matSplat12 = SplatZSIMD(matCol1);
-
-	matSplat20 = SplatXSIMD(matCol2);
-	matSplat21 = SplatYSIMD(matCol2);
-	matSplat22 = SplatZSIMD(matCol2);
-
-	fltx4 outX, outY, outZ;
-
-	outX = MaddSIMD(z, matSplat02, AddSIMD(MulSIMD(x, matSplat00), MulSIMD(y, matSplat01)));
-	outY = MaddSIMD(z, matSplat12, AddSIMD(MulSIMD(x, matSplat10), MulSIMD(y, matSplat11)));
-	outZ = MaddSIMD(z, matSplat22, AddSIMD(MulSIMD(x, matSplat20), MulSIMD(y, matSplat21)));
-
-	x = AddSIMD(outX, ReplicateX4(matrix[0][3]));
-	y = AddSIMD(outY, ReplicateX4(matrix[1][3]));
-	z = AddSIMD(outZ, ReplicateX4(matrix[2][3]));
-}
-#endif
-
-fltx4 NoiseSIMD(FourVectors const& v);
-
-FourVectors DNoiseSIMD(FourVectors const& v);
-
-FourVectors CurlNoiseSIMD(FourVectors const& v);
-
-
-fltx4 NoiseSIMD(const fltx4& x, const fltx4& y, const fltx4& z);
-
-
-inline fltx4 fabs(const fltx4& x)
-{
-	return AndSIMD(x, LoadAlignedSIMD(g_SIMD_clear_signmask));
-}
-
-inline fltx4 AbsSIMD(const fltx4& x)
-{
-	return fabs(x);
-}
-
-inline fltx4 fnegate(const fltx4& x)
-{
-	return XorSIMD(x, LoadAlignedSIMD(g_SIMD_signmask));
-}
-
-fltx4 Pow_FixedPoint_Exponent_SIMD(const fltx4& x, int exponent);
-
-inline fltx4 PowSIMD(const fltx4& x, float exponent)
-{
-	return Pow_FixedPoint_Exponent_SIMD(x, (int)(4.0 * exponent));
-}
-
-inline fltx4 LinearToGammaSIMD(fltx4 x)
-{
-	x = MaxSIMD(MinSIMD(Four_Ones, x), Four_Zeros);
-	return AddSIMD(Four_LinearToGammaCoefficients_E,
-		MulSIMD(x, AddSIMD(Four_LinearToGammaCoefficients_D,
-			MulSIMD(x, AddSIMD(Four_LinearToGammaCoefficients_C,
-				MulSIMD(x, AddSIMD(Four_LinearToGammaCoefficients_B,
-					MulSIMD(x, Four_LinearToGammaCoefficients_A))))))));
-}
-
-
-inline fltx4 GammaToLinearSIMD(fltx4 x)
-{
-	x = MaxSIMD(x, Four_Zeros);
-	x = AddSIMD(Four_GammaToLinearCoefficients_D,
-		MulSIMD(x, AddSIMD(Four_GammaToLinearCoefficients_C,
-			MulSIMD(x, AddSIMD(Four_GammaToLinearCoefficients_B,
-				MulSIMD(x, Four_GammaToLinearCoefficients_A))))));
-	return MinSIMD(x, Four_Ones);
-}
-
-inline fltx4 GammaToLinearExtendedSIMD(fltx4 x)
-{
-	x = MaxSIMD(x, Four_Zeros);
-	fltx4 fl4Ret = AddSIMD(Four_GammaToLinearCoefficients_D,
-		MulSIMD(x, AddSIMD(Four_GammaToLinearCoefficients_C,
-			MulSIMD(x, AddSIMD(Four_GammaToLinearCoefficients_B,
-				MulSIMD(x, Four_GammaToLinearCoefficients_A))))));
-	return MaskedAssign(CmpGeSIMD(x, Four_Ones), x, fl4Ret);
-}
-
-void SeedRandSIMD(uint32 seed);								     
-fltx4 RandSIMD(int nContext = 0);							       
-
-int GetSIMDRandContext(void);
-void ReleaseSIMDRandContext(int nContext);
-
-FORCEINLINE fltx4 RandSignedSIMD(void)					 
-{
-	return SubSIMD(MulSIMD(Four_Twos, RandSIMD()), Four_Ones);
-}
-
-
-FORCEINLINE fltx4 LerpSIMD(const fltx4& percent, const fltx4& a, const fltx4& b)
-{
-	return AddSIMD(a, MulSIMD(SubSIMD(b, a), percent));
-}
-
-FORCEINLINE fltx4 RemapValClampedSIMD(const fltx4& val, const fltx4& a, const fltx4& b, const fltx4& c, const fltx4& d)                 
-{
-	fltx4 range = MaskedAssign(CmpEqSIMD(a, b), Four_Ones, SubSIMD(b, a));     
-	fltx4 cVal = MaxSIMD(Four_Zeros, MinSIMD(Four_Ones, DivSIMD(SubSIMD(val, a), range))); 
-	return LerpSIMD(cVal, c, d);
-}
-
-inline fltx4 SimpleSpline(const fltx4& value)
-{
-	fltx4 valueDoubled = MulSIMD(value, Four_Twos);
-	fltx4 valueSquared = MulSIMD(value, value);
-
-	return SubSIMD(
-		MulSIMD(Four_Threes, valueSquared),
-		MulSIMD(valueDoubled, valueSquared));
-}
-
-inline fltx4 SimpleSplineRemapValWithDeltas(const fltx4& val,
-	const fltx4& A, const fltx4& BMinusA,
-	const fltx4& OneOverBMinusA, const fltx4& C,
-	const fltx4& DMinusC)
-{
-	fltx4 cVal = MulSIMD(SubSIMD(val, A), OneOverBMinusA);
-	return AddSIMD(C, MulSIMD(DMinusC, SimpleSpline(cVal)));
-}
-
-inline fltx4 SimpleSplineRemapValWithDeltasClamped(const fltx4& val,
-	const fltx4& A, const fltx4& BMinusA,
-	const fltx4& OneOverBMinusA, const fltx4& C,
-	const fltx4& DMinusC)
-{
-	fltx4 cVal = MulSIMD(SubSIMD(val, A), OneOverBMinusA);
-	cVal = MinSIMD(Four_Ones, MaxSIMD(Four_Zeros, cVal));
-	return AddSIMD(C, MulSIMD(DMinusC, SimpleSpline(cVal)));
-}
-
-FORCEINLINE fltx4 FracSIMD(const fltx4& val)
-{
-	fltx4 fl4Abs = fabs(val);
-	fltx4 ival = SubSIMD(AddSIMD(fl4Abs, Four_2ToThe23s), Four_2ToThe23s);
-	ival = MaskedAssign(CmpGtSIMD(ival, fl4Abs), SubSIMD(ival, Four_Ones), ival);
-	return XorSIMD(SubSIMD(fl4Abs, ival), XorSIMD(val, fl4Abs));			   
-}
-
-#ifndef SPU
-FORCEINLINE fltx4 Mod2SIMD(const fltx4& val)
-{
-	fltx4 fl4Abs = fabs(val);
-	fltx4 ival = SubSIMD(AndSIMD(LoadAlignedSIMD((float*)g_SIMD_lsbmask), AddSIMD(fl4Abs, Four_2ToThe23s)), Four_2ToThe23s);
-	ival = MaskedAssign(CmpGtSIMD(ival, fl4Abs), SubSIMD(ival, Four_Twos), ival);
-	return XorSIMD(SubSIMD(fl4Abs, ival), XorSIMD(val, fl4Abs));			   
-}
-#endif
-
-FORCEINLINE fltx4 Mod2SIMDPositiveInput(const fltx4& val)
-{
-	fltx4 ival = SubSIMD(AndSIMD(LoadAlignedSIMD(g_SIMD_lsbmask), AddSIMD(val, Four_2ToThe23s)), Four_2ToThe23s);
-	ival = MaskedAssign(CmpGtSIMD(ival, val), SubSIMD(ival, Four_Twos), ival);
-	return SubSIMD(val, ival);
-}
-
-
-FORCEINLINE fltx4 _SinEst01SIMD(const fltx4& val)
-{
-	return MulSIMD(val, SubSIMD(Four_Fours, MulSIMD(val, Four_Fours)));
-}
-
-FORCEINLINE fltx4 _Sin01SIMD(const fltx4& val)
-{
-	fltx4 fl4BadEst = MulSIMD(val, SubSIMD(Four_Fours, MulSIMD(val, Four_Fours)));
-	return AddSIMD(MulSIMD(Four_Point225s, SubSIMD(MulSIMD(fl4BadEst, fl4BadEst), fl4BadEst)), fl4BadEst);
-}
-
-FORCEINLINE fltx4 SinEst01SIMD(const fltx4& val)
-{
-	fltx4 fl4Abs = fabs(val);
-	fltx4 fl4Reduced2 = Mod2SIMDPositiveInput(fl4Abs);
-	bi32x4 fl4OddMask = CmpGeSIMD(fl4Reduced2, Four_Ones);
-	fltx4 fl4val = SubSIMD(fl4Reduced2, AndSIMD(Four_Ones, fl4OddMask));
-	fltx4 fl4Sin = _SinEst01SIMD(fl4val);
-	fl4Sin = XorSIMD(fl4Sin, AndSIMD(LoadAlignedSIMD(g_SIMD_signmask), XorSIMD(val, fl4OddMask)));
-	return fl4Sin;
-
-}
-
-FORCEINLINE fltx4 Sin01SIMD(const fltx4& val)
-{
-	fltx4 fl4Abs = fabs(val);
-	fltx4 fl4Reduced2 = Mod2SIMDPositiveInput(fl4Abs);
-	bi32x4 fl4OddMask = CmpGeSIMD(fl4Reduced2, Four_Ones);
-	fltx4 fl4val = SubSIMD(fl4Reduced2, AndSIMD(Four_Ones, fl4OddMask));
-	fltx4 fl4Sin = _Sin01SIMD(fl4val);
-	fl4Sin = XorSIMD(fl4Sin, AndSIMD(LoadAlignedSIMD(g_SIMD_signmask), XorSIMD(val, fl4OddMask)));
-	return fl4Sin;
-
-}
-
-FORCEINLINE fltx4 NatExpSIMD(const fltx4& val)			         
-{
-	fltx4 fl4Result;
-	SubFloat(fl4Result, 0) = exp(SubFloat(val, 0));
-	SubFloat(fl4Result, 1) = exp(SubFloat(val, 1));
-	SubFloat(fl4Result, 2) = exp(SubFloat(val, 2));
-	SubFloat(fl4Result, 3) = exp(SubFloat(val, 3));
-	return fl4Result;
-}
-
-FORCEINLINE fltx4 PreCalcBiasParameter(const fltx4& bias_parameter)
-{
-	return SubSIMD(ReciprocalSIMD(bias_parameter), Four_Twos);
-}
-
-FORCEINLINE fltx4 BiasSIMD(const fltx4& val, const fltx4& precalc_param)
-{
-	return DivSIMD(val, AddSIMD(MulSIMD(precalc_param, SubSIMD(Four_Ones, val)), Four_Ones));
-}
-
-#ifndef SPU
-FORCEINLINE int BoxOnPlaneSideSIMD(const fltx4& emins, const fltx4& emaxs, const cplane_t* p, float tolerance = 0.f)
-{
-	fltx4 corners[2];
-	fltx4 normal = LoadUnalignedSIMD(p->normal.Base());
-	fltx4 dist = ReplicateX4(-p->dist);
-	normal = SetWSIMD(normal, dist);
-	fltx4 t4 = ReplicateX4(tolerance);
-	fltx4 negt4 = ReplicateX4(-tolerance);
-	bi32x4 cmp = CmpGeSIMD(normal, Four_Zeros);
-	corners[0] = MaskedAssign(cmp, emaxs, emins);
-	corners[1] = MaskedAssign(cmp, emins, emaxs);
-	fltx4 dot1 = Dot4SIMD(normal, corners[0]);
-	fltx4 dot2 = Dot4SIMD(normal, corners[1]);
-	cmp = CmpGeSIMD(dot1, t4);
-	bi32x4 cmp2 = CmpGtSIMD(negt4, dot2);
-	fltx4 result = MaskedAssign(cmp, Four_Ones, Four_Zeros);
-	fltx4 result2 = MaskedAssign(cmp2, Four_Twos, Four_Zeros);
-	result = AddSIMD(result, result2);
-	intx4 sides;
-	ConvertStoreAsIntsSIMD(&sides, result);
-	return sides[0];
-}
-
-
-class KDop32_t
-{
-public:
-	fltx4 m_Mins[4];
-	fltx4 m_Maxes[4];
-
-	FORCEINLINE bool Intersects(KDop32_t const& other) const;
-
-	FORCEINLINE void operator|=(KDop32_t const& other);
-
-	FORCEINLINE bool IsEmpty(void) const;
-
-	FORCEINLINE void Init(void)
-	{
-		for (int i = 0; i < ARRAYSIZE(m_Mins); i++)
-		{
-			m_Mins[i] = Four_FLT_MAX;
-			m_Maxes[i] = Four_Negative_FLT_MAX;
-		}
-	}
-
-	void AddPointSet(Vector const* pPoints, int nPnts);
-
-	void CreateFromPointSet(Vector const* pPoints, int nPnts);
-};
-
-FORCEINLINE void KDop32_t::operator|=(KDop32_t const& other)
-{
-	m_Mins[0] = MinSIMD(m_Mins[0], other.m_Mins[0]);
-	m_Mins[1] = MinSIMD(m_Mins[1], other.m_Mins[1]);
-	m_Mins[2] = MinSIMD(m_Mins[2], other.m_Mins[2]);
-	m_Mins[3] = MinSIMD(m_Mins[3], other.m_Mins[3]);
-
-	m_Maxes[0] = MaxSIMD(m_Maxes[0], other.m_Maxes[0]);
-	m_Maxes[1] = MaxSIMD(m_Maxes[1], other.m_Maxes[1]);
-	m_Maxes[2] = MaxSIMD(m_Maxes[2], other.m_Maxes[2]);
-	m_Maxes[3] = MaxSIMD(m_Maxes[3], other.m_Maxes[3]);
-
-
-}
-
-FORCEINLINE bool KDop32_t::Intersects(KDop32_t const& other) const
-{
-	bi32x4 c00 = CmpLeSIMD(m_Mins[0], other.m_Maxes[0]);
-	bi32x4 c01 = CmpLeSIMD(m_Mins[1], other.m_Maxes[1]);
-	bi32x4 c02 = CmpLeSIMD(m_Mins[2], other.m_Maxes[2]);
-	bi32x4 c03 = CmpLeSIMD(m_Mins[3], other.m_Maxes[3]);
-
-	bi32x4 c10 = CmpGeSIMD(m_Maxes[0], other.m_Mins[0]);
-	bi32x4 c11 = CmpGeSIMD(m_Maxes[1], other.m_Mins[1]);
-	bi32x4 c12 = CmpGeSIMD(m_Maxes[2], other.m_Mins[2]);
-	bi32x4 c13 = CmpGeSIMD(m_Maxes[3], other.m_Mins[3]);
-
-	bi32x4 a0 = AndSIMD(AndSIMD(c00, c01), AndSIMD(c02, c03));
-	bi32x4 a1 = AndSIMD(AndSIMD(c10, c11), AndSIMD(c12, c13));
-
-	return !(IsAnyZeros(AndSIMD(a1, a0)));
-}
-
-
-FORCEINLINE bool KDop32_t::IsEmpty(void) const
-{
-	bi32x4 c00 = CmpLtSIMD(m_Maxes[0], m_Mins[0]);
-	bi32x4 c01 = CmpLtSIMD(m_Maxes[1], m_Mins[1]);
-	bi32x4 c02 = CmpLtSIMD(m_Maxes[2], m_Mins[2]);
-	bi32x4 c03 = CmpLtSIMD(m_Maxes[3], m_Mins[3]);
-
-	return IsAnyTrue(OrSIMD(OrSIMD(c00, c01), OrSIMD(c02, c03)));
-}
-
-
-extern const fltx4 g_KDop32XDirs[4];
-extern const fltx4 g_KDop32YDirs[4];
-extern const fltx4 g_KDop32ZDirs[4];
-#endif
-
-#if 0
-
-#define _VEC_SWIZZLE_QUAT48_UNPACK (__vector unsigned char)		{ 16, 17, 0, 1, 16, 17, 2, 3, 16, 17, 4, 5, 16, 17, 6, 7 }
-#define _VEC_SWIZZLE_QUAT48_UNPACK_SHIFT (__vector unsigned int )		{ 0, 0, 1, 0 }
-
-FORCEINLINE fltx4 UnpackQuaternion48SIMD(const Quaternion48* RESTRICT pVec)
-{
-	fltx4 q16s = LoadUnaligned3SIMD((const float*)pVec);
-
-	bool wneg = pVec->wneg;                   
-
-	q16s = vec_perm(q16s, Four_Threes, _VEC_SWIZZLE_QUAT48_UNPACK);                         
-
-	u32x4 tmp = IntShiftLeftWordSIMD(*(u32x4*)&q16s, _VEC_SWIZZLE_QUAT48_UNPACK_SHIFT);
-	q16s = *(fltx4*)&tmp;
-
-	const fltx4 vUpkMul = SplatXSIMD(g_SIMD_Quat48_Unpack_Magic_Constants);       
-	const fltx4 vUpkAdd = SplatYSIMD(g_SIMD_Quat48_Unpack_Magic_Constants);
-
-	fltx4 ret = vec_madd(q16s, vUpkMul, vUpkAdd);
-
-	fltx4 dotxyz = Dot3SIMD(ret, ret);          
-	dotxyz = ClampVectorSIMD(dotxyz, Four_Zeros, Four_Ones);
-
-	fltx4 ww = SubSIMD(Four_Ones, dotxyz);       
-	ww = SqrtSIMD(ww);     
-	if (wneg)
-	{
-		ret = SetWSIMD(ret, NegSIMD(ww));
-	}
-	else
-	{
-		ret = SetWSIMD(ret, ww);
-	}
-	return ret;
-}
-
-#endif
-
-FORCEINLINE fltx4 SetWFromXSIMD(const fltx4& a, const fltx4& x)
-{
-	fltx4 value = SplatXSIMD(x);
-	return SetWSIMD(a, value);
-}
-
-FORCEINLINE fltx4 SetWFromYSIMD(const fltx4& a, const fltx4& y)
-{
-	fltx4 value = SplatYSIMD(y);
-	return SetWSIMD(a, value);
-}
-
-FORCEINLINE fltx4 SetWFromZSIMD(const fltx4& a, const fltx4& z)
-{
-	fltx4 value = SplatZSIMD(z);
-	return SetWSIMD(a, value);
-}
-
-FORCEINLINE fltx4 CrossProductSIMD(const fltx4& A, const fltx4& B)
-{
-#if defined( _X360 )
-	return XMVector3Cross(A, B);
-#elif defined( _WIN32 )
-	fltx4 A1 = _mm_shuffle_ps(A, A, MM_SHUFFLE_REV(1, 2, 0, 3));
-	fltx4 B1 = _mm_shuffle_ps(B, B, MM_SHUFFLE_REV(2, 0, 1, 3));
-	fltx4 Result1 = MulSIMD(A1, B1);
-	fltx4 A2 = _mm_shuffle_ps(A, A, MM_SHUFFLE_REV(2, 0, 1, 3));
-	fltx4 B2 = _mm_shuffle_ps(B, B, MM_SHUFFLE_REV(1, 2, 0, 3));
-	fltx4 Result2 = MulSIMD(A2, B2);
-	return SubSIMD(Result1, Result2);
-
-#elif defined(_PS3)
-	return _vmathVfCross(A, B);
-#else
-	fltx4 CrossVal;
-	SubFloat(CrossVal, 0) = SubFloat(A, 1) * SubFloat(B, 2) - SubFloat(A, 2) * SubFloat(B, 1);
-	SubFloat(CrossVal, 1) = SubFloat(A, 2) * SubFloat(B, 0) - SubFloat(A, 0) * SubFloat(B, 2);
-	SubFloat(CrossVal, 2) = SubFloat(A, 0) * SubFloat(B, 1) - SubFloat(A, 1) * SubFloat(B, 0);
-	SubFloat(CrossVal, 3) = 0;
-	return CrossVal;
-#endif
-}
-
-inline const fltx4 Length3SIMD(const fltx4 vec)
-{
-	fltx4 scLengthSqr = Dot3SIMD(vec, vec);
-	bi32x4 isSignificant = CmpGtSIMD(scLengthSqr, Four_Epsilons);
-	fltx4 scLengthInv = ReciprocalSqrtSIMD(scLengthSqr);
-	return AndSIMD(isSignificant, MulSIMD(scLengthInv, scLengthSqr));
-}
-
-inline const fltx4 Normalized3SIMD(const fltx4 vec)
-{
-	fltx4 scLengthSqr = Dot3SIMD(vec, vec);
-	bi32x4 isSignificant = CmpGtSIMD(scLengthSqr, Four_Epsilons);
-	fltx4 scLengthInv = ReciprocalSqrtSIMD(scLengthSqr);
-	return AndSIMD(isSignificant, MulSIMD(vec, scLengthInv));
-}
-
-
-#ifndef COMPILER_GCC
-
-FORCEINLINE fltx4 operator+=(fltx4& a, FLTX4 b)
-{
-	a = AddSIMD(a, b);
-	return a;
-}
-
-FORCEINLINE fltx4 operator-=(fltx4& a, FLTX4 b)
-{
-	a = SubSIMD(a, b);
-	return a;
-}
-
-
-FORCEINLINE fltx4 operator*=(fltx4& a, FLTX4 b)
-{
-	a = MulSIMD(a, b);
-	return a;
-}
-
-#endif
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/steam.h b/SpyCustom/steam.h
deleted file mode 100644
index 7c93f42..0000000
--- a/SpyCustom/steam.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#pragma once
-#include <iostream>
-
-template<typename FuncType>
-__forceinline static FuncType CallVFunction(void* ppClass, int index)
-{
-	int* pVTable = *(int**)ppClass;
-	int dwAddress = pVTable[index];
-	return (FuncType)(dwAddress);
-}
-
-enum EGCResult
-{
-	k_EGCResultOK = 0,
-	k_EGCResultNoMessage = 1,                  
-	k_EGCResultBufferTooSmall = 2,               
-	k_EGCResultNotLoggedOn = 3,                
-	k_EGCResultInvalidMessage = 4,                
-};
-
-class ISteamGameCoordinator
-{
-public:
-	virtual EGCResult GCSendMessage(int unMsgType, const void* pubData, int cubData) = 0;
-	virtual bool IsMessageAvailable(int* pcubMsgSize) = 0;
-	virtual EGCResult GCRetrieveMessage(int* punMsgType, void* pubDest, int cubDest, int* pcubMsgSize) = 0;
-
-};
-
-class CSteamID
-{
-public:
-	CSteamID()
-	{
-		m_steamid.m_comp.m_unAccountID = 0;
-		m_steamid.m_comp.m_EAccountType = 0;
-		m_steamid.m_comp.m_EUniverse = 0;
-		m_steamid.m_comp.m_unAccountInstance = 0;
-	}
-	uint32_t GetAccountID() const { return m_steamid.m_comp.m_unAccountID; }
-
-private:
-	union SteamID_t
-	{
-		struct SteamIDComponent_t
-		{
-			uint32_t			m_unAccountID : 32;			   
-			unsigned int		m_unAccountInstance : 20;	         
-			unsigned int		m_EAccountType : 4;			              
-			int					m_EUniverse : 8;	     
-		} m_comp;
-
-		uint64_t m_unAll64Bits;
-	} m_steamid;
-};
-
-class ISteamUser
-{
-public:
-	virtual uint32_t GetHSteamUser() = 0;
-	virtual bool BLoggedOn() = 0;
-	virtual CSteamID GetSteamID() = 0;
-};
-
-class ISteamClient
-{
-public:
-	ISteamUser* GetISteamUser(void* hSteamUser, void* hSteamPipe, const char* pchVersion)
-	{
-		typedef ISteamUser* (__stdcall* func)(void*, void*, const char*);
-		return CallVFunction<func>(this, 5)(hSteamUser, hSteamPipe, pchVersion);
-	}
-
-	ISteamGameCoordinator* GetISteamGenericInterface(void* hSteamUser, void* hSteamPipe, const char* pchVersion)
-	{
-		typedef ISteamGameCoordinator* (__stdcall* func)(void*, void*, const char*);
-		return CallVFunction<func>(this, 12)(hSteamUser, hSteamPipe, pchVersion);
-	}
-};
\ No newline at end of file
diff --git a/SpyCustom/steamtypes.h b/SpyCustom/steamtypes.h
deleted file mode 100644
index a6ae74e..0000000
--- a/SpyCustom/steamtypes.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#ifndef STEAMTYPES_H
-#define STEAMTYPES_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define S_CALLTYPE __cdecl
-
-#ifndef WCHARTYPES_H
-typedef unsigned char uint8;
-#endif
-
-#if defined( __GNUC__ ) && !defined(POSIX)
-#if __GNUC__ < 4
-#error "Steamworks requires GCC 4.X (4.2 or 4.4 have been tested)"
-#endif
-#define POSIX 1
-#endif
-
-#if defined(__x86_64__) || defined(_WIN64)
-#define X64BITS
-#endif
-
-#if !defined(VALVE_BIG_ENDIAN) && defined(_PS3)
-#define VALVE_BIG_ENDIAN
-#endif
-
-typedef unsigned char uint8;
-typedef signed char int8;
-
-#if defined( _WIN32 )
-
-typedef __int16 int16;
-typedef unsigned __int16 uint16;
-typedef __int32 int32;
-typedef unsigned __int32 uint32;
-typedef __int64 int64;
-typedef unsigned __int64 uint64;
-
-typedef int64 lint64;
-typedef uint64 ulint64;
-
-#ifdef X64BITS
-typedef __int64 intp;				         
-typedef unsigned __int64 uintp;		         
-#else
-typedef __int32 intp;
-typedef unsigned __int32 uintp;
-#endif
-
-#else  
-
-typedef short int16;
-typedef unsigned short uint16;
-typedef int int32;
-typedef unsigned int uint32;
-typedef long long int64;
-typedef unsigned long long uint64;
-
-typedef long int lint64;
-typedef unsigned long int ulint64;
-
-#ifdef X64BITS
-typedef long long intp;
-typedef unsigned long long uintp;
-#else
-typedef int intp;
-typedef unsigned int uintp;
-#endif
-
-#endif   
-
-#ifdef __clang__
-# define CLANG_ATTR(ATTR) __attribute__((annotate( ATTR )))
-#else
-# define CLANG_ATTR(ATTR)
-#endif
-
-#define METHOD_DESC(DESC) CLANG_ATTR( "desc:" #DESC ";" )
-#define IGNOREATTR() CLANG_ATTR( "ignore" )
-#define OUT_STRUCT() CLANG_ATTR( "out_struct: ;" )
-#define OUT_ARRAY_CALL(COUNTER,FUNCTION,PARAMS) CLANG_ATTR( "out_array_call:" #COUNTER "," #FUNCTION "," #PARAMS ";" )
-#define OUT_ARRAY_COUNT(COUNTER, DESC) CLANG_ATTR( "out_array_count:" #COUNTER  ";desc:" #DESC )
-#define ARRAY_COUNT(COUNTER) CLANG_ATTR( "array_count:" #COUNTER ";" )
-#define ARRAY_COUNT_D(COUNTER, DESC) CLANG_ATTR( "array_count:" #COUNTER ";desc:" #DESC )
-#define BUFFER_COUNT(COUNTER) CLANG_ATTR( "buffer_count:" #COUNTER ";" )
-#define OUT_BUFFER_COUNT(COUNTER) CLANG_ATTR( "out_buffer_count:" #COUNTER ";" )
-#define OUT_STRING_COUNT(COUNTER) CLANG_ATTR( "out_string_count:" #COUNTER ";" )
-#define DESC(DESC) CLANG_ATTR("desc:" #DESC ";")
-
-
-const int k_cubSaltSize = 8;
-typedef	uint8 Salt_t[k_cubSaltSize];
-
-typedef uint64 GID_t;
-
-const GID_t k_GIDNil = 0xffffffffffffffffull;
-
-typedef uint64 JobID_t;			      
-typedef GID_t TxnID_t;			       
-
-const GID_t k_TxnIDNil = k_GIDNil;
-const GID_t k_TxnIDUnknown = 0;
-
-const JobID_t k_JobIDNil = 0xffffffffffffffffull;
-
-typedef uint32 PackageId_t;
-const PackageId_t k_uPackageIdFreeSub = 0x0;
-const PackageId_t k_uPackageIdInvalid = 0xFFFFFFFF;
-
-typedef uint32 BundleId_t;
-const BundleId_t k_uBundleIdInvalid = 0;
-
-typedef uint32 AppId_t;
-const AppId_t k_uAppIdInvalid = 0x0;
-
-typedef uint64 AssetClassId_t;
-const AssetClassId_t k_ulAssetClassIdInvalid = 0x0;
-
-typedef uint32 PhysicalItemId_t;
-const PhysicalItemId_t k_uPhysicalItemIdInvalid = 0x0;
-
-
-typedef uint32 DepotId_t;
-const DepotId_t k_uDepotIdInvalid = 0x0;
-
-typedef uint32 RTime32;
-
-typedef uint32 CellID_t;
-const CellID_t k_uCellIDInvalid = 0xFFFFFFFF;
-
-typedef uint64 SteamAPICall_t;
-const SteamAPICall_t k_uAPICallInvalid = 0x0;
-
-typedef uint32 AccountID_t;
-
-typedef uint32 PartnerId_t;
-const PartnerId_t k_uPartnerIdInvalid = 0;
-
-typedef uint64 ManifestId_t;
-const ManifestId_t k_uManifestIdInvalid = 0;
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/string_t.h b/SpyCustom/string_t.h
deleted file mode 100644
index f2a709e..0000000
--- a/SpyCustom/string_t.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef STRING_T_H
-#define STRING_T_H
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-#ifndef NO_STRING_T
-
-#ifdef WEAK_STRING_T
-
-typedef int	string_t;
-
-#define NULL_STRING			0
-
-#define STRING( offset )	( ( offset ) ? reinterpret_cast<const char *>( offset ) : "" )
-
-#define MAKE_STRING( str )	( ( *str != 0 ) ? reinterpret_cast<int>( str ) : 0 )
-
-#define IDENT_STRINGS( s1, s2 )	( *((void **)&(s1)) == *((void **)&(s2)) )
-
-#else   
-
-struct string_t
-{
-public:
-	bool operator!() const { return (pszValue == NULL); }
-	bool operator==(const string_t& rhs) const { return (pszValue == rhs.pszValue); }
-	bool operator!=(const string_t& rhs) const { return (pszValue != rhs.pszValue); }
-	bool operator<(const string_t& rhs) const { return ((void*)pszValue < (void*)rhs.pszValue); }
-
-	const char* ToCStr() const { return (pszValue) ? pszValue : ""; }
-
-protected:
-	const char* pszValue;
-};
-
-struct castable_string_t : public string_t          
-{
-	castable_string_t() { pszValue = NULL; }
-	castable_string_t(const char* pszFrom) { pszValue = (pszFrom && *pszFrom) ? pszFrom : 0; }
-};
-
-#define NULL_STRING			castable_string_t()
-
-#define STRING( string_t_obj )	(string_t_obj).ToCStr()
-
-#define MAKE_STRING( c_str )	castable_string_t( c_str )
-
-#define IDENT_STRINGS( s1, s2 )	( *((void **)&(s1)) == *((void **)&(s2)) )
-
-#endif
-
-#else	 
-
-typedef const char* string_t;
-#define NULL_STRING				0
-#define STRING( c_str )			( c_str )
-#define MAKE_STRING( c_str )	( c_str )
-#define IDENT_STRINGS( s1, s2 )	( *((void **)&(s1)) == *((void **)&(s2)) )
-
-#endif	 
-
-inline void EnsureValidValue(string_t& x) { x = NULL_STRING; }
-
-#endif  
diff --git a/SpyCustom/stringpool.h b/SpyCustom/stringpool.h
deleted file mode 100644
index c091d16..0000000
--- a/SpyCustom/stringpool.h
+++ /dev/null
@@ -1,465 +0,0 @@
-#ifndef STRINGPOOL_H
-#define STRINGPOOL_H
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-#include "utlrbtree.h"
-#include "utlvector.h"
-#include "utlbuffer.h"
-#include "generichash.h"
-
-enum StringPoolCase_t
-{
-	StringPoolCaseInsensitive,
-	StringPoolCaseSensitive
-};
-
-class CStringPool
-{
-public:
-	CStringPool(StringPoolCase_t caseSensitivity = StringPoolCaseInsensitive);
-	~CStringPool();
-
-	unsigned int Count() const;
-
-	const char* Allocate(const char* pszValue);
-	void FreeAll();
-
-	const char* Find(const char* pszValue);
-
-protected:
-	typedef CUtlRBTree<const char*, unsigned short> CStrSet;
-
-	CStrSet m_Strings;
-};
-
-template<class T>
-class CCountedStringPoolBase
-{
-public:        
-
-	struct hash_item_t
-	{
-		char* pString;
-		T				nNextElement;
-		unsigned char	nReferenceCount;
-		unsigned char	pad;
-	};
-
-	enum
-	{
-		INVALID_ELEMENT = 0,
-		MAX_REFERENCE = 0xFF,
-		HASH_TABLE_SIZE = 1024
-	};
-
-	CUtlVector<T>				m_HashTable;	    
-	CUtlVector<hash_item_t>		m_Elements;
-	T							m_FreeListStart;
-	StringPoolCase_t 			m_caseSensitivity;
-
-public:
-	CCountedStringPoolBase(StringPoolCase_t caseSensitivity = StringPoolCaseInsensitive);
-	virtual ~CCountedStringPoolBase();
-
-	void			FreeAll();
-
-	char* FindString(const char* pIntrinsic);
-	char* ReferenceString(const char* pIntrinsic);
-	void			DereferenceString(const char* pIntrinsic);
-
-	T				FindStringHandle(const char* pIntrinsic);
-	T				ReferenceStringHandle(const char* pIntrinsic);
-	char* HandleToString(T handle);
-	void			SpewStrings();
-	unsigned		Hash(const char* pszKey);
-
-	bool			SaveToBuffer(CUtlBuffer& buffer);
-	bool			RestoreFromBuffer(CUtlBuffer& buffer);
-
-	void			VerifyNotOverflowed(unsigned int value);
-};
-
-typedef CCountedStringPoolBase<unsigned short> CCountedStringPool;
-
-template<class T>
-inline CCountedStringPoolBase<T>::CCountedStringPoolBase(StringPoolCase_t caseSensitivity)
-{
-	MEM_ALLOC_CREDIT();
-	m_HashTable.EnsureCount(HASH_TABLE_SIZE);
-
-	for (int i = 0; i < m_HashTable.Count(); i++)
-	{
-		m_HashTable[i] = INVALID_ELEMENT;
-	}
-
-	m_FreeListStart = INVALID_ELEMENT;
-	m_Elements.AddToTail();
-	m_Elements[0].pString = NULL;
-	m_Elements[0].nReferenceCount = 0;
-	m_Elements[0].nNextElement = INVALID_ELEMENT;
-
-	m_caseSensitivity = caseSensitivity;
-}
-
-template<class T>
-inline CCountedStringPoolBase<T>::~CCountedStringPoolBase()
-{
-	FreeAll();
-}
-
-template<class T>
-inline void CCountedStringPoolBase<T>::FreeAll()
-{
-	int i;
-
-	for (i = 0; i < m_HashTable.Count(); i++)
-	{
-		m_HashTable[i] = INVALID_ELEMENT;
-	}
-
-	m_FreeListStart = INVALID_ELEMENT;
-
-	for (i = 0; i < m_Elements.Count(); i++)
-	{
-		if (m_Elements[i].pString)
-		{
-			delete[] m_Elements[i].pString;
-			m_Elements[i].pString = NULL;
-			m_Elements[i].nReferenceCount = 0;
-			m_Elements[i].nNextElement = INVALID_ELEMENT;
-		}
-	}
-
-	m_Elements.RemoveAll();
-	m_Elements.AddToTail();
-	m_Elements[0].pString = NULL;
-	m_Elements[0].nReferenceCount = 0;
-	m_Elements[0].nNextElement = INVALID_ELEMENT;
-}
-
-template<class T>
-inline unsigned CCountedStringPoolBase<T>::Hash(const char* pszKey)
-{
-	if (m_caseSensitivity == StringPoolCaseInsensitive)
-	{
-		return HashStringCaseless(pszKey);
-	}
-	return HashString(pszKey);
-}
-
-template<class T>
-inline T CCountedStringPoolBase<T>::FindStringHandle(const char* pIntrinsic)
-{
-	if (pIntrinsic == NULL)
-		return INVALID_ELEMENT;
-
-	T nHashBucketIndex = (Hash(pIntrinsic) % HASH_TABLE_SIZE);
-	T nCurrentBucket = m_HashTable[nHashBucketIndex];
-
-	if (nCurrentBucket != INVALID_ELEMENT)
-	{
-		for (; nCurrentBucket != INVALID_ELEMENT; nCurrentBucket = m_Elements[nCurrentBucket].nNextElement)
-		{
-			if (!Q_stricmp(pIntrinsic, m_Elements[nCurrentBucket].pString))
-			{
-				return nCurrentBucket;
-			}
-		}
-	}
-
-	return 0;
-
-}
-
-template<class T>
-inline char* CCountedStringPoolBase<T>::FindString(const char* pIntrinsic)
-{
-	if (pIntrinsic == NULL)
-		return NULL;
-
-	return m_Elements[FindStringHandle(pIntrinsic)].pString;
-}
-
-template<class T>
-inline T CCountedStringPoolBase<T>::ReferenceStringHandle(const char* pIntrinsic)
-{
-	if (pIntrinsic == NULL)
-		return INVALID_ELEMENT;
-
-	T nHashBucketIndex = (Hash(pIntrinsic) % HASH_TABLE_SIZE);
-	T nCurrentBucket = m_HashTable[nHashBucketIndex];
-
-	if (nCurrentBucket != INVALID_ELEMENT)
-	{
-		for (; nCurrentBucket != INVALID_ELEMENT; nCurrentBucket = m_Elements[nCurrentBucket].nNextElement)
-		{
-			if (!Q_stricmp(pIntrinsic, m_Elements[nCurrentBucket].pString))
-			{
-				if (m_Elements[nCurrentBucket].nReferenceCount < MAX_REFERENCE)
-				{
-					m_Elements[nCurrentBucket].nReferenceCount++;
-				}
-				return nCurrentBucket;
-			}
-		}
-	}
-
-	if (m_FreeListStart != INVALID_ELEMENT)
-	{
-		nCurrentBucket = m_FreeListStart;
-		m_FreeListStart = m_Elements[nCurrentBucket].nNextElement;
-	}
-	else
-	{
-		unsigned int newElement = m_Elements.AddToTail();
-		VerifyNotOverflowed(newElement);
-		nCurrentBucket = newElement;
-	}
-
-	m_Elements[nCurrentBucket].nReferenceCount = 1;
-
-	m_Elements[nCurrentBucket].nNextElement = m_HashTable[nHashBucketIndex];
-	m_HashTable[nHashBucketIndex] = nCurrentBucket;
-
-	m_Elements[nCurrentBucket].pString = new char[Q_strlen(pIntrinsic) + 1];
-	Q_strcpy(m_Elements[nCurrentBucket].pString, pIntrinsic);
-
-	return nCurrentBucket;
-}
-
-template<>
-inline void CCountedStringPoolBase<unsigned short>::VerifyNotOverflowed(unsigned int value) { Assert(value < 0xffff); }
-
-template<>
-inline void CCountedStringPoolBase<unsigned int>::VerifyNotOverflowed(unsigned int value) {}
-
-template<class T>
-inline char* CCountedStringPoolBase<T>::ReferenceString(const char* pIntrinsic)
-{
-	if (!pIntrinsic)
-		return NULL;
-
-	return m_Elements[ReferenceStringHandle(pIntrinsic)].pString;
-}
-
-template<class T>
-inline void CCountedStringPoolBase<T>::DereferenceString(const char* pIntrinsic)
-{
-	if (!pIntrinsic)
-		return;
-
-	T nHashBucketIndex = (Hash(pIntrinsic) % m_HashTable.Count());
-	T nCurrentBucket = m_HashTable[nHashBucketIndex];
-
-	if (nCurrentBucket == INVALID_ELEMENT)
-		return;
-
-	for (T previous = INVALID_ELEMENT; nCurrentBucket != INVALID_ELEMENT; nCurrentBucket = m_Elements[nCurrentBucket].nNextElement)
-	{
-		if (!Q_stricmp(pIntrinsic, m_Elements[nCurrentBucket].pString))
-		{
-			if (m_Elements[nCurrentBucket].nReferenceCount < MAX_REFERENCE)
-			{
-				m_Elements[nCurrentBucket].nReferenceCount--;
-			}
-
-			if (m_Elements[nCurrentBucket].nReferenceCount == 0)
-			{
-				if (previous == INVALID_ELEMENT)
-				{
-					m_HashTable[nHashBucketIndex] = m_Elements[nCurrentBucket].nNextElement;
-				}
-				else
-				{
-					m_Elements[previous].nNextElement = m_Elements[nCurrentBucket].nNextElement;
-				}
-
-				delete[] m_Elements[nCurrentBucket].pString;
-				m_Elements[nCurrentBucket].pString = NULL;
-				m_Elements[nCurrentBucket].nReferenceCount = 0;
-
-				m_Elements[nCurrentBucket].nNextElement = m_FreeListStart;
-				m_FreeListStart = nCurrentBucket;
-				break;
-
-			}
-		}
-
-		previous = nCurrentBucket;
-	}
-}
-
-template<class T>
-inline char* CCountedStringPoolBase<T>::HandleToString(T handle)
-{
-	return m_Elements[handle].pString;
-}
-
-template<class T>
-inline void CCountedStringPoolBase<T>::SpewStrings()
-{
-	int i;
-	for (i = 0; i < m_Elements.Count(); i++)
-	{
-		char* string = m_Elements[i].pString;
-
-		Msg("String %d: ref:%d %s\n", i, m_Elements[i].nReferenceCount, string == NULL ? "EMPTY - ok for slot zero only!" : string);
-	}
-
-	Msg("\n%d total counted strings.", m_Elements.Count());
-}
-
-#define STRING_POOL_VERSION		MAKEID( 'C', 'S', 'P', '1' )
-#define MAX_STRING_SAVE			1024
-
-template<>
-inline bool CCountedStringPoolBase<unsigned short>::SaveToBuffer(CUtlBuffer& buffer)
-{
-	if (m_Elements.Count() <= 1)
-	{
-		return true;
-	}
-
-	buffer.PutInt(STRING_POOL_VERSION);
-
-	buffer.PutUnsignedShort(m_FreeListStart);
-
-	buffer.PutInt(m_HashTable.Count());
-	for (int i = 0; i < m_HashTable.Count(); i++)
-	{
-		buffer.PutUnsignedShort(m_HashTable[i]);
-	}
-
-	buffer.PutInt(m_Elements.Count());
-	for (int i = 1; i < m_Elements.Count(); i++)
-	{
-		buffer.PutUnsignedShort(m_Elements[i].nNextElement);
-		buffer.PutUnsignedChar(m_Elements[i].nReferenceCount);
-
-		const char* pString = m_Elements[i].pString;
-		if (strlen(pString) >= MAX_STRING_SAVE)
-		{
-			return false;
-		}
-		buffer.PutString(pString ? pString : "");
-	}
-
-	return buffer.IsValid();
-}
-
-template<>
-inline bool CCountedStringPoolBase<unsigned short>::RestoreFromBuffer(CUtlBuffer& buffer)
-{
-	int signature = buffer.GetInt();
-	if (signature != STRING_POOL_VERSION)
-	{
-		return false;
-	}
-
-	FreeAll();
-
-	m_FreeListStart = buffer.GetUnsignedShort();
-
-	int hashCount = buffer.GetInt();
-	m_HashTable.SetCount(hashCount);
-
-	for (int i = 0; i < hashCount; i++)
-	{
-		m_HashTable[i] = buffer.GetUnsignedShort();
-	}
-
-	int tableCount = buffer.GetInt();
-	if (tableCount > 1)
-	{
-		m_Elements.AddMultipleToTail(tableCount - 1);
-	}
-
-	char tempString[MAX_STRING_SAVE];
-	for (int i = 1; i < tableCount; i++)
-	{
-		m_Elements[i].nNextElement = buffer.GetUnsignedShort();
-		m_Elements[i].nReferenceCount = buffer.GetUnsignedChar();
-		buffer.GetString(tempString, sizeof(tempString));
-		m_Elements[i].pString = strdup(tempString);
-	}
-
-	return buffer.IsValid();
-}
-
-template<>
-inline bool CCountedStringPoolBase<unsigned int>::SaveToBuffer(CUtlBuffer& buffer)
-{
-	if (m_Elements.Count() <= 1)
-	{
-		return true;
-	}
-
-	buffer.PutInt(STRING_POOL_VERSION);
-
-	buffer.PutUnsignedInt(m_FreeListStart);
-
-	buffer.PutInt(m_HashTable.Count());
-	for (int i = 0; i < m_HashTable.Count(); i++)
-	{
-		buffer.PutUnsignedInt(m_HashTable[i]);
-	}
-
-	buffer.PutInt(m_Elements.Count());
-	for (int i = 1; i < m_Elements.Count(); i++)
-	{
-		buffer.PutUnsignedInt(m_Elements[i].nNextElement);
-		buffer.PutUnsignedChar(m_Elements[i].nReferenceCount);
-
-		const char* pString = m_Elements[i].pString;
-		if (strlen(pString) >= MAX_STRING_SAVE)
-		{
-			return false;
-		}
-		buffer.PutString(pString ? pString : "");
-	}
-
-	return buffer.IsValid();
-}
-
-template<>
-inline bool CCountedStringPoolBase<unsigned int>::RestoreFromBuffer(CUtlBuffer& buffer)
-{
-	int signature = buffer.GetInt();
-	if (signature != STRING_POOL_VERSION)
-	{
-		return false;
-	}
-
-	FreeAll();
-
-	m_FreeListStart = buffer.GetUnsignedInt();
-
-	int hashCount = buffer.GetInt();
-	m_HashTable.SetCount(hashCount);
-
-	for (int i = 0; i < hashCount; i++)
-	{
-		m_HashTable[i] = buffer.GetUnsignedInt();
-	}
-
-	int tableCount = buffer.GetInt();
-	if (tableCount > 1)
-	{
-		m_Elements.AddMultipleToTail(tableCount - 1);
-	}
-
-	char tempString[MAX_STRING_SAVE];
-	for (int i = 1; i < tableCount; i++)
-	{
-		m_Elements[i].nNextElement = buffer.GetUnsignedInt();
-		m_Elements[i].nReferenceCount = buffer.GetUnsignedChar();
-		buffer.GetString(tempString, sizeof(tempString));
-		m_Elements[i].pString = strdup(tempString);
-	}
-
-	return buffer.IsValid();
-}
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/strtools.h b/SpyCustom/strtools.h
deleted file mode 100644
index c79aa79..0000000
--- a/SpyCustom/strtools.h
+++ /dev/null
@@ -1,660 +0,0 @@
-#ifndef TIER1_STRTOOLS_H
-#define TIER1_STRTOOLS_H
-
-#include "platform.h"
-
-#include <ctype.h>
-#include <stdarg.h>
-#ifdef _WIN32
-#pragma once
-#elif POSIX
-#include <wchar.h>
-#include <math.h>
-#include <wctype.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef _WIN64
-#define str_size unsigned int
-#else
-#define str_size size_t
-#endif
-
-template< class T, class I > class CUtlMemory;
-template< class T, class A > class CUtlVector;
-
-
-void	_V_memset(const char* file, int line, void* dest, int fill, int count);
-void	_V_memcpy(const char* file, int line, void* dest, const void* src, int count);
-void	_V_memmove(const char* file, int line, void* dest, const void* src, int count);
-int		_V_memcmp(const char* file, int line, const void* m1, const void* m2, int count);
-int		_V_strlen(const char* file, int line, const char* str);
-void	_V_strcpy(const char* file, int line, char* dest, const char* src);
-char* _V_strrchr(const char* file, int line, const char* s, char c);
-int		_V_strcmp(const char* file, int line, const char* s1, const char* s2);
-int		_V_wcscmp(const char* file, int line, const wchar_t* s1, const wchar_t* s2);
-char* _V_strstr(const char* file, int line, const char* s1, const char* search);
-int		_V_wcslen(const char* file, int line, const wchar_t* pwch);
-wchar_t* _V_wcslower(const char* file, int line, wchar_t* start);
-wchar_t* _V_wcsupr(const char* file, int line, wchar_t* start);
-
-char* V_strupr(char* start);
-char* V_strlower(char* start);
-int V_stricmp(const char* s1, const char* s2);
-int	V_strncmp(const char* s1, const char* s2, int count);
-int V_strnicmp(const char* s1, const char* s2, int n);
-
-#ifdef POSIX
-
-inline char* strupr(char* start)
-{
-	return V_strupr(start);
-}
-
-inline char* strlwr(char* start)
-{
-	return V_strlower(start);
-}
-
-inline wchar_t* _wcslwr(wchar_t* start)
-{
-	wchar_t* str = start;
-	while (str && *str)
-	{
-		*str = (wchar_t)towlower(static_cast<wint_t>(*str));
-		str++;
-	}
-	return start;
-};
-
-inline wchar_t* _wcsupr(wchar_t* start)
-{
-	wchar_t* str = start;
-	while (str && *str)
-	{
-		*str = (wchar_t)towupper(static_cast<wint_t>(*str));
-		str++;
-	}
-	return start;
-};
-
-#endif  
-
-
-#ifdef _DEBUG
-
-#define V_memset(dest, fill, count)		_V_memset   (__FILE__, __LINE__, (dest), (fill), (count))	
-#define V_memcpy(dest, src, count)		_V_memcpy	(__FILE__, __LINE__, (dest), (src), (count))	
-#define V_memmove(dest, src, count)		_V_memmove	(__FILE__, __LINE__, (dest), (src), (count))	
-#define V_memcmp(m1, m2, count)			_V_memcmp	(__FILE__, __LINE__, (m1), (m2), (count))		
-#define V_strlen(str)					_V_strlen	(__FILE__, __LINE__, (str))				
-#define V_strcpy(dest, src)				_V_strcpy	(__FILE__, __LINE__, (dest), (src))			
-#define V_strrchr(s, c)					_V_strrchr	(__FILE__, __LINE__, (s), (c))				
-#define V_strcmp(s1, s2)				_V_strcmp	(__FILE__, __LINE__, (s1), (s2))			
-#define V_wcscmp(s1, s2)				_V_wcscmp	(__FILE__, __LINE__, (s1), (s2))			
-#define V_strstr(s1, search )			_V_strstr	(__FILE__, __LINE__, (s1), (search) )		
-#define V_wcslen(pwch)					_V_wcslen	(__FILE__, __LINE__, (pwch))		
-#define V_wcslower(start)				_V_wcslower (__FILE__, __LINE__, (start))		
-#define V_wcsupr(start)					_V_wcsupr	(__FILE__, __LINE__, (start))				
-
-#else
-
-
-inline void		V_memset(void* dest, int fill, int count) { memset(dest, fill, count); }
-inline void		V_memcpy(void* dest, const void* src, int count) { memcpy(dest, src, count); }
-inline void		V_memmove(void* dest, const void* src, int count) { memmove(dest, src, count); }
-inline int		V_memcmp(const void* m1, const void* m2, int count) { return memcmp(m1, m2, count); }
-inline int		V_strlen(const char* str) { return (int)strlen(str); }
-inline void		V_strcpy(char* dest, const char* src) { strcpy(dest, src); }
-inline int		V_wcslen(const wchar_t* pwch) { return (int)wcslen(pwch); }
-inline char* V_strrchr(const char* s, char c) { return (char*)strrchr(s, c); }
-inline int		V_strcmp(const char* s1, const char* s2) { return strcmp(s1, s2); }
-inline int		V_wcscmp(const wchar_t* s1, const wchar_t* s2) { return wcscmp(s1, s2); }
-inline char* V_strstr(const char* s1, const char* search) { return (char*)strstr(s1, search); }
-inline wchar_t* V_wcslower(wchar_t* start) { return _wcslwr(start); }
-inline wchar_t* V_wcsupr(wchar_t* start) { return _wcsupr(start); }
-
-#endif
-
-int			V_atoi(const char* str);
-int64 		V_atoi64(const char* str);
-uint64 		V_atoui64(const char* str);
-float		V_atof(const char* str);
-char* V_stristr(char* pStr, const char* pSearch);
-const char* V_stristr(const char* pStr, const char* pSearch);
-const char* V_strnistr(const char* pStr, const char* pSearch, int n);
-const char* V_strnchr(const char* pStr, char c, int n);
-inline int V_strcasecmp(const char* s1, const char* s2) { return V_stricmp(s1, s2); }
-inline int V_strncasecmp(const char* s1, const char* s2, int n) { return V_strnicmp(s1, s2, n); }
-void		V_qsort_s(void* base, size_t num, size_t width, int(__cdecl* compare)(void*, const void*,
-	const void*), void* context);
-
-
-const char* StringAfterPrefix(const char* str, const char* prefix);
-const char* StringAfterPrefixCaseSensitive(const char* str, const char* prefix);
-inline bool	StringHasPrefix(const char* str, const char* prefix) { return StringAfterPrefix(str, prefix) != NULL; }
-inline bool	StringHasPrefixCaseSensitive(const char* str, const char* prefix) { return StringAfterPrefixCaseSensitive(str, prefix) != NULL; }
-
-
-void			V_normalizeFloatString(char* pFloat);
-
-inline bool V_isdigit(char c)
-{
-	return c >= '0' && c <= '9';
-}
-
-inline bool V_isalpha(char c) { return isalpha((unsigned char)c) != 0; }
-inline bool V_isalnum(char c) { return isalnum((unsigned char)c) != 0; }
-inline bool V_isprint(char c) { return isprint((unsigned char)c) != 0; }
-inline bool V_isxdigit(char c) { return isxdigit((unsigned char)c) != 0; }
-inline bool V_ispunct(char c) { return ispunct((unsigned char)c) != 0; }
-inline bool V_isgraph(char c) { return isgraph((unsigned char)c) != 0; }
-inline bool V_isupper(char c) { return isupper((unsigned char)c) != 0; }
-inline bool V_islower(char c) { return islower((unsigned char)c) != 0; }
-inline bool V_iscntrl(char c) { return iscntrl((unsigned char)c) != 0; }
-inline bool V_isspace(char c) { return isspace((unsigned char)c) != 0; }
-
-void V_strncpy(OUT_Z_CAP(maxLenInChars) char* pDest, const char* pSrc, int maxLenInChars);
-
-template <size_t maxLenInChars> void V_strcpy_safe(OUT_Z_ARRAY char(&pDest)[maxLenInChars], const char* pSrc)
-{
-	V_strncpy(pDest, pSrc, (int)maxLenInChars);
-}
-
-void V_wcsncpy(OUT_Z_BYTECAP(maxLenInBytes) wchar_t* pDest, wchar_t const* pSrc, int maxLenInBytes);
-template <size_t maxLenInChars> void V_wcscpy_safe(OUT_Z_ARRAY wchar_t(&pDest)[maxLenInChars], wchar_t const* pSrc)
-{
-	V_wcsncpy(pDest, pSrc, maxLenInChars * sizeof(*pDest));
-}
-
-#define COPY_ALL_CHARACTERS -1
-char* V_strncat(INOUT_Z_CAP(cchDest) char* pDest, const char* pSrc, size_t cchDest, int max_chars_to_copy = COPY_ALL_CHARACTERS);
-template <size_t cchDest> char* V_strcat_safe(INOUT_Z_ARRAY char(&pDest)[cchDest], const char* pSrc, int nMaxCharsToCopy = COPY_ALL_CHARACTERS)
-{
-	return V_strncat(pDest, pSrc, (int)cchDest, nMaxCharsToCopy);
-}
-
-wchar_t* V_wcsncat(INOUT_Z_CAP(cchDest) wchar_t* pDest, const wchar_t* pSrc, size_t cchDest, int nMaxCharsToCopy = COPY_ALL_CHARACTERS);
-template <size_t cchDest> wchar_t* V_wcscat_safe(INOUT_Z_ARRAY wchar_t(&pDest)[cchDest], const wchar_t* pSrc, int nMaxCharsToCopy = COPY_ALL_CHARACTERS)
-{
-	return V_wcsncat(pDest, pSrc, (int)cchDest, nMaxCharsToCopy);
-}
-
-char* V_strnlwr(INOUT_Z_CAP(cchBuf) char* pBuf, size_t cchBuf);
-template <size_t cchDest> char* V_strlwr_safe(INOUT_Z_ARRAY char(&pBuf)[cchDest])
-{
-	return _V_strnlwr(pBuf, (int)cchDest);
-}
-
-
-#ifdef _WIN32
-#ifndef _VA_LIST_DEFINED
-
-#ifdef  _M_ALPHA
-
-struct va_list
-{
-	char* a0;              
-	int offset;           
-};
-
-#else   
-
-typedef char* va_list;
-
-#endif  
-
-#define _VA_LIST_DEFINED
-
-#endif    
-
-#elif POSIX
-#include <stdarg.h>
-#endif
-
-#ifdef _WIN32
-#define CORRECT_PATH_SEPARATOR '\\'
-#define CORRECT_PATH_SEPARATOR_S "\\"
-#define INCORRECT_PATH_SEPARATOR '/'
-#define INCORRECT_PATH_SEPARATOR_S "/"
-#elif POSIX
-#define CORRECT_PATH_SEPARATOR '/'
-#define CORRECT_PATH_SEPARATOR_S "/"
-#define INCORRECT_PATH_SEPARATOR '\\'
-#define INCORRECT_PATH_SEPARATOR_S "\\"
-#endif
-
-int V_vsnprintf(OUT_Z_CAP(maxLenInCharacters) char* pDest, int maxLenInCharacters, PRINTF_FORMAT_STRING const char* pFormat, va_list params);
-template <size_t maxLenInCharacters> int V_vsprintf_safe(OUT_Z_ARRAY char(&pDest)[maxLenInCharacters], PRINTF_FORMAT_STRING const char* pFormat, va_list params) { return V_vsnprintf(pDest, maxLenInCharacters, pFormat, params); }
-
-int V_snprintf(OUT_Z_CAP(maxLenInChars) char* pDest, int maxLenInChars, PRINTF_FORMAT_STRING const char* pFormat, ...) FMTFUNCTION(3, 4);
-template <size_t maxLenInChars> int V_sprintf_safe(OUT_Z_ARRAY char(&pDest)[maxLenInChars], PRINTF_FORMAT_STRING const char* pFormat, ...) FMTFUNCTION(2, 3);
-template <size_t maxLenInChars> int V_sprintf_safe(OUT_Z_ARRAY char(&pDest)[maxLenInChars], PRINTF_FORMAT_STRING const char* pFormat, ...)
-{
-	va_list params;
-	va_start(params, pFormat);
-	int result = V_vsnprintf(pDest, maxLenInChars, pFormat, params);
-	va_end(params);
-	return result;
-}
-
-int V_vsnwprintf(OUT_Z_CAP(maxLenInCharacters) wchar_t* pDest, int maxLenInCharacters, PRINTF_FORMAT_STRING const wchar_t* pFormat, va_list params);
-template <size_t maxLenInCharacters> int V_vswprintf_safe(OUT_Z_ARRAY wchar_t(&pDest)[maxLenInCharacters], PRINTF_FORMAT_STRING const wchar_t* pFormat, va_list params) { return V_vsnwprintf(pDest, maxLenInCharacters, pFormat, params); }
-int V_vsnprintfRet(OUT_Z_CAP(maxLenInCharacters) char* pDest, int maxLenInCharacters, PRINTF_FORMAT_STRING const char* pFormat, va_list params, bool* pbTruncated);
-template <size_t maxLenInCharacters> int V_vsprintfRet_safe(OUT_Z_ARRAY char(&pDest)[maxLenInCharacters], PRINTF_FORMAT_STRING const char* pFormat, va_list params, bool* pbTruncated) { return V_vsnprintfRet(pDest, maxLenInCharacters, pFormat, params, pbTruncated); }
-
-int V_snwprintf(OUT_Z_CAP(maxLenInCharacters) wchar_t* pDest, int maxLenInCharacters, PRINTF_FORMAT_STRING const wchar_t* pFormat, ...);
-template <size_t maxLenInChars> int V_swprintf_safe(OUT_Z_ARRAY wchar_t(&pDest)[maxLenInChars], PRINTF_FORMAT_STRING const wchar_t* pFormat, ...)
-{
-	va_list params;
-	va_start(params, pFormat);
-	int result = V_vsnwprintf(pDest, maxLenInChars, pFormat, params);
-	va_end(params);
-	return result;
-}
-
-char* V_pretifymem(float value, int digitsafterdecimal = 2, bool usebinaryonek = false);
-
-char* V_pretifynum(int64 value);
-
-int V_UTF8ToUnicode(const char* pUTF8, OUT_Z_BYTECAP(cubDestSizeInBytes) wchar_t* pwchDest, int cubDestSizeInBytes);
-int V_UnicodeToUTF8(const wchar_t* pUnicode, OUT_Z_BYTECAP(cubDestSizeInBytes) char* pUTF8, int cubDestSizeInBytes);
-int V_UCS2ToUnicode(const ucs2* pUCS2, OUT_Z_BYTECAP(cubDestSizeInBytes) wchar_t* pUnicode, int cubDestSizeInBytes);
-int V_UCS2ToUTF8(const ucs2* pUCS2, OUT_Z_BYTECAP(cubDestSizeInBytes) char* pUTF8, int cubDestSizeInBytes);
-int V_UnicodeToUCS2(const wchar_t* pUnicode, int cubSrcInBytes, OUT_Z_BYTECAP(cubDestSizeInBytes) char* pUCS2, int cubDestSizeInBytes);
-int V_UTF8ToUCS2(const char* pUTF8, int cubSrcInBytes, OUT_Z_BYTECAP(cubDestSizeInBytes) ucs2* pUCS2, int cubDestSizeInBytes);
-
-bool Q_StripPrecedingAndTrailingWhitespace(char* pch);
-bool Q_StripPrecedingAndTrailingWhitespaceW(wchar_t* pwch);
-
-bool Q_AggressiveStripPrecedingAndTrailingWhitespace(char* pch);
-bool Q_AggressiveStripPrecedingAndTrailingWhitespaceW(wchar_t* pwch);
-
-unsigned char V_nibble(char c);
-void V_hextobinary(char const* in, int numchars, byte* out, int maxoutputbytes);
-void V_binarytohex(const byte* in, int inputbytes, char* out, int outsize);
-
-void V_FileBase(const char* in, char* out, int maxlen);
-void V_StripTrailingSlash(char* ppath);
-void V_StripExtension(const char* in, char* out, int outLen);
-void V_DefaultExtension(char* path, const char* extension, int pathStringLength);
-void V_SetExtension(char* path, const char* extension, int pathStringLength);
-void V_StripFilename(char* path);
-bool V_StripLastDir(char* dirName, int maxlen);
-const char* V_UnqualifiedFileName(const char* in);
-void V_ComposeFileName(const char* path, const char* filename, char* dest, int destSize);
-
-bool V_ExtractFilePath(const char* path, char* dest, int destSize);
-void V_ExtractFileExtension(const char* path, char* dest, int destSize);
-
-const char* V_GetFileExtension(const char* path);
-
-const char* V_GetFileName(const char* path);
-
-bool V_RemoveDotSlashes(char* pFilename, char separator = CORRECT_PATH_SEPARATOR, bool bRemoveDoubleSlashes = true);
-
-void V_MakeAbsolutePath(char* pOut, int outLen, const char* pPath, const char* pStartingDir = NULL);
-
-bool V_MakeRelativePath(const char* pFullPath, const char* pDirectory, char* pRelativePath, int nBufLen);
-
-void V_FixupPathName(OUT_Z_CAP(nOutLen) char* pOut, size_t nOutLen, const char* pPath);
-
-void V_AppendSlash(INOUT_Z_CAP(strSize) char* pStr, int strSize);
-
-bool V_IsAbsolutePath(IN_Z const char* pPath);
-
-bool V_StrSubst(IN_Z const char* pIn, IN_Z const char* pMatch, const char* pReplaceWith,
-	OUT_Z_CAP(outLen) char* pOut, int outLen, bool bCaseSensitive = false);
-
-void V_SplitString(IN_Z const char* pString, IN_Z const char* pSeparator, CUtlVector<char*, CUtlMemory<char*, int> >& outStrings);
-
-void V_SplitString2(IN_Z const char* pString, const char** pSeparators, int nSeparators, CUtlVector<char*, CUtlMemory<char*, int> >& outStrings);
-
-bool V_GetCurrentDirectory(OUT_Z_CAP(maxLen) char* pOut, int maxLen);
-
-bool V_SetCurrentDirectory(const char* pDirName);
-
-
-void V_StrSlice(const char* pStr, int firstChar, int lastCharNonInclusive, OUT_Z_CAP(outSize) char* pOut, int outSize);
-
-void V_StrLeft(const char* pStr, int nChars, OUT_Z_CAP(outSize) char* pOut, int outSize);
-
-void V_StrRight(const char* pStr, int nChars, OUT_Z_CAP(outSize) char* pOut, int outSize);
-
-char* V_AddBackSlashesToSpecialChars(char const* pSrc);
-
-void V_FixSlashes(char* pname, char separator = CORRECT_PATH_SEPARATOR);
-
-void V_FixDoubleSlashes(char* pStr);
-
-void V_strtowcs(const char* pString, int nInSize, OUT_Z_BYTECAP(nOutSizeInBytes) wchar_t* pWString, int nOutSizeInBytes);
-void V_wcstostr(const wchar_t* pWString, int nInSize, OUT_Z_CAP(nOutSizeInBytes) char* pString, int nOutSizeInBytes);
-
-inline void V_strcat(INOUT_Z_CAP(cchDest) char* dest, const char* src, int cchDest)
-{
-	V_strncat(dest, src, cchDest, COPY_ALL_CHARACTERS);
-}
-
-inline void V_wcscat(INOUT_Z_CAP(cchDest) wchar_t* dest, const wchar_t* src, int cchDest)
-{
-	V_wcsncat(dest, src, cchDest, COPY_ALL_CHARACTERS);
-}
-
-template < class NameArray >
-int V_GenerateUniqueNameIndex(const char* prefix, const NameArray& nameArray, int startindex = 0)
-{
-	if (prefix == NULL)
-		return 0;
-
-	int freeindex = startindex;
-
-	int nNames = nameArray.Count();
-	for (int i = 0; i < nNames; ++i)
-	{
-		const char* pName = nameArray[i];
-		if (!pName)
-			continue;
-
-		const char* pIndexStr = StringAfterPrefix(pName, prefix);
-		if (pIndexStr)
-		{
-			int index = *pIndexStr ? atoi(pIndexStr) : 1;
-			if (index >= freeindex)
-			{
-				freeindex = index + 1;
-			}
-		}
-	}
-
-	return freeindex;
-}
-
-template < class NameArray >
-bool V_GenerateUniqueName(OUT_Z_CAP(memsize) char* name, int memsize, const char* prefix, const NameArray& nameArray)
-{
-	if (name == NULL || memsize == 0)
-		return false;
-
-	if (prefix == NULL)
-	{
-		name[0] = '\0';
-		return false;
-	}
-
-	int prefixLength = V_strlen(prefix);
-	if (prefixLength + 1 > memsize)
-	{
-		name[0] = '\0';
-		return false;
-	}
-
-	int i = V_GenerateUniqueNameIndex(prefix, nameArray);
-	if (i <= 0)
-	{
-		V_strncpy(name, prefix, memsize);
-		return true;
-	}
-
-	int newlen = prefixLength + (int)log10((float)i) + 1;
-	if (newlen + 1 > memsize)
-	{
-		V_strncpy(name, prefix, memsize);
-		return false;
-	}
-
-	V_snprintf(name, memsize, "%s%d", prefix, i);
-	return true;
-}
-
-
-class CStrAutoEncode
-{
-public:
-
-	explicit CStrAutoEncode(const char* pch)
-	{
-		m_pch = pch;
-		m_pwch = NULL;
-#if !defined( WIN32 ) && !defined(_WIN32)
-		m_pucs2 = NULL;
-#endif
-		m_bCreatedUTF16 = false;
-	}
-
-	explicit CStrAutoEncode(const wchar_t* pwch)
-	{
-		m_pch = NULL;
-		m_pwch = pwch;
-#if !defined( WIN32 ) && !defined(_WIN32)
-		m_pucs2 = NULL;
-#endif
-		m_bCreatedUTF16 = true;
-	}
-
-#if !defined(WIN32) && !defined(_WINDOWS) && !defined(_WIN32)
-	explicit CStrAutoEncode(const ucs2* pwch)
-	{
-		m_pch = NULL;
-		m_pwch = NULL;
-		m_pucs2 = pwch;
-		m_bCreatedUTF16 = true;
-	}
-#endif
-
-	const char* ToString()
-	{
-		PopulateUTF8();
-		return m_pch;
-	}
-
-	char* ToStringWritable()
-	{
-		PopulateUTF8();
-		return const_cast<char*>(m_pch);
-	}
-
-	const wchar_t* ToWString()
-	{
-		PopulateUTF16();
-		return m_pwch;
-	}
-
-#if !defined( WIN32 ) && !defined(_WIN32)
-	const ucs2* ToUCS2String()
-	{
-		PopulateUCS2();
-		return m_pucs2;
-	}
-#endif
-
-	wchar_t* ToWStringWritable()
-	{
-		PopulateUTF16();
-		return const_cast<wchar_t*>(m_pwch);
-	}
-
-	~CStrAutoEncode()
-	{
-		if (m_bCreatedUTF16)
-		{
-			delete[] m_pch;
-		}
-		else
-		{
-			delete[] m_pwch;
-		}
-	}
-
-private:
-	void PopulateUTF8()
-	{
-		if (!m_bCreatedUTF16)
-			return;					    
-		if (m_pwch == NULL)
-			return;					       
-		if (m_pch != NULL)
-			return;					         
-
-		uint32 cbMax = 4 * static_cast<uint32>(V_wcslen(m_pwch)) + 1;
-		char* pchTemp = new char[cbMax];
-		if (V_UnicodeToUTF8(m_pwch, pchTemp, cbMax))
-		{
-			uint32 cchAlloc = static_cast<uint32>(V_strlen(pchTemp)) + 1;
-			char* pchHeap = new char[cchAlloc];
-			V_strncpy(pchHeap, pchTemp, cchAlloc);
-			delete[] pchTemp;
-			m_pch = pchHeap;
-		}
-		else
-		{
-			delete[] pchTemp;
-		}
-	}
-
-	void PopulateUTF16()
-	{
-		if (m_bCreatedUTF16)
-			return;					    
-		if (m_pch == NULL)
-			return;					     
-		if (m_pwch != NULL)
-			return;					         
-
-		uint32 cchMax = static_cast<uint32>(V_strlen(m_pch)) + 1;
-		wchar_t* pwchTemp = new wchar_t[cchMax];
-		if (V_UTF8ToUnicode(m_pch, pwchTemp, cchMax * sizeof(wchar_t)))
-		{
-			uint32 cchAlloc = static_cast<uint32>(V_wcslen(pwchTemp)) + 1;
-			wchar_t* pwchHeap = new wchar_t[cchAlloc];
-			V_wcsncpy(pwchHeap, pwchTemp, cchAlloc * sizeof(wchar_t));
-			delete[] pwchTemp;
-			m_pwch = pwchHeap;
-		}
-		else
-		{
-			delete[] pwchTemp;
-		}
-	}
-
-#if !defined( WIN32 ) && !defined(_WIN32)
-	void PopulateUCS2()
-	{
-		if (m_pch == NULL)
-			return;					     
-		if (m_pucs2 != NULL)
-			return;					         
-
-		uint32 cchMax = static_cast<uint32>(V_strlen(m_pch)) + 1;
-		ucs2* pwchTemp = new ucs2[cchMax];
-		if (V_UTF8ToUCS2(m_pch, cchMax, pwchTemp, cchMax * sizeof(ucs2)))
-		{
-			uint32 cchAlloc = cchMax;
-			ucs2* pwchHeap = new ucs2[cchAlloc];
-			memcpy(pwchHeap, pwchTemp, cchAlloc * sizeof(ucs2));
-			delete[] pwchTemp;
-			m_pucs2 = pwchHeap;
-		}
-		else
-		{
-			delete[] pwchTemp;
-		}
-	}
-#endif
-
-	const char* m_pch;
-	const wchar_t* m_pwch;
-#if !defined( WIN32 ) && !defined(_WIN32)
-	const ucs2* m_pucs2;
-#endif
-	bool m_bCreatedUTF16;
-
-};
-
-void Q_URLEncodeRaw(OUT_Z_CAP(nDestLen) char* pchDest, int nDestLen, const char* pchSource, int nSourceLen);
-
-size_t Q_URLDecodeRaw(OUT_CAP(nDecodeDestLen) char* pchDecodeDest, int nDecodeDestLen, const char* pchEncodedSource, int nEncodedSourceLen);
-
-void Q_URLEncode(OUT_Z_CAP(nDestLen) char* pchDest, int nDestLen, const char* pchSource, int nSourceLen);
-
-size_t Q_URLDecode(OUT_CAP(nDecodeDestLen) char* pchDecodeDest, int nDecodeDestLen, const char* pchEncodedSource, int nEncodedSourceLen);
-
-
-#if !defined( VSTDLIB_BACKWARD_COMPAT )
-
-#define Q_memset				V_memset
-#define Q_memcpy				V_memcpy
-#define Q_memmove				V_memmove
-#define Q_memcmp				V_memcmp
-#define Q_strlen				V_strlen
-#define Q_strcpy				V_strcpy
-#define Q_strrchr				V_strrchr
-#define Q_strcmp				V_strcmp
-#define Q_wcscmp				V_wcscmp
-#define Q_stricmp				V_stricmp
-#define Q_strstr				V_strstr
-#define Q_strupr				V_strupr
-#define Q_strlower				V_strlower
-#define Q_wcslen				V_wcslen
-#define	Q_strncmp				V_strncmp 
-#define	Q_strcasecmp			V_strcasecmp
-#define	Q_strncasecmp			V_strncasecmp
-#define	Q_strnicmp				V_strnicmp
-#define	Q_atoi					V_atoi
-#define	Q_atoi64				V_atoi64
-#define Q_atoui64				V_atoui64
-#define	Q_atof					V_atof
-#define	Q_stristr				V_stristr
-#define	Q_strnistr				V_strnistr
-#define	Q_strnchr				V_strnchr
-#define Q_normalizeFloatString	V_normalizeFloatString
-#define Q_strncpy				V_strncpy
-#define Q_snprintf				V_snprintf
-#define Q_snwprintf				V_snwprintf 
-#define Q_wcsncpy				V_wcsncpy
-#define Q_strncat				V_strncat
-#define Q_strnlwr				V_strnlwr
-#define Q_vsnprintf				V_vsnprintf
-#define Q_vsnprintfRet			V_vsnprintfRet
-#define Q_pretifymem			V_pretifymem
-#define Q_pretifynum			V_pretifynum
-#define Q_UTF8ToUnicode			V_UTF8ToUnicode
-#define Q_UnicodeToUTF8			V_UnicodeToUTF8
-#define Q_hextobinary			V_hextobinary
-#define Q_binarytohex			V_binarytohex
-#define Q_FileBase				V_FileBase
-#define Q_StripTrailingSlash	V_StripTrailingSlash
-#define Q_StripExtension		V_StripExtension
-#define	Q_DefaultExtension		V_DefaultExtension
-#define Q_SetExtension			V_SetExtension
-#define Q_StripFilename			V_StripFilename
-#define Q_StripLastDir			V_StripLastDir
-#define Q_UnqualifiedFileName	V_UnqualifiedFileName
-#define Q_ComposeFileName		V_ComposeFileName
-#define Q_ExtractFilePath		V_ExtractFilePath
-#define Q_ExtractFileExtension	V_ExtractFileExtension
-#define Q_GetFileExtension		V_GetFileExtension
-#define Q_RemoveDotSlashes		V_RemoveDotSlashes
-#define Q_MakeAbsolutePath		V_MakeAbsolutePath
-#define Q_AppendSlash			V_AppendSlash
-#define Q_IsAbsolutePath		V_IsAbsolutePath
-#define Q_StrSubst				V_StrSubst
-#define Q_SplitString			V_SplitString
-#define Q_SplitString2			V_SplitString2
-#define Q_StrSlice				V_StrSlice
-#define Q_StrLeft				V_StrLeft
-#define Q_StrRight				V_StrRight
-#define Q_FixSlashes			V_FixSlashes
-#define Q_strtowcs				V_strtowcs
-#define Q_wcstostr				V_wcstostr
-#define Q_strcat				V_strcat
-#define Q_GenerateUniqueNameIndex	V_GenerateUniqueNameIndex
-#define Q_GenerateUniqueName		V_GenerateUniqueName
-#define Q_MakeRelativePath		V_MakeRelativePath
-#define Q_qsort_s				V_qsort_s
-
-#endif    
-
-
-#endif	 
\ No newline at end of file
diff --git a/SpyCustom/studio.h b/SpyCustom/studio.h
deleted file mode 100644
index a0a880a..0000000
--- a/SpyCustom/studio.h
+++ /dev/null
@@ -1,2781 +0,0 @@
-#ifndef STUDIO_H
-#define STUDIO_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "basetypes.h"
-#include "vector2d.h"
-#include "vector.h"
-#include "vector4d.h"
-#include "compressed_vector.h"
-#include "dbg.h"
-#include "threadtools.h"
-#include "mathlib.h"
-#include "utlvector.h"
-#include "utlhash.h"
-#include "datamap.h"
-#include "generichash.h"
-#include "localflexcontroller.h"
-#include "utlsymbol.h"
-
-#define STUDIO_ENABLE_PERF_COUNTERS
-
-#define STUDIO_SEQUENCE_ACTIVITY_LOOKUPS_ARE_SLOW 0 
-#define STUDIO_SEQUENCE_ACTIVITY_LAZY_INITIALIZE 1
-
-class IMaterial;
-class IMesh;
-class IMorph;
-struct virtualmodel_t;
-struct vertexFileHeader_t;
-struct thinModelVertices_t;
-
-namespace OptimizedModel
-{
-	struct StripHeader_t;
-}
-
-
-#define STUDIO_VERSION		48
-
-#ifndef _XBOX
-#define MAXSTUDIOTRIANGLES	65536	   
-#define MAXSTUDIOVERTS		65536	   
-#define	MAXSTUDIOFLEXVERTS	10000	              
-#else
-#define MAXSTUDIOTRIANGLES	25000
-#define MAXSTUDIOVERTS		10000
-#define	MAXSTUDIOFLEXVERTS	1000
-#endif
-#define MAXSTUDIOSKINS		32		  
-#define MAXSTUDIOBONES		128		    
-#define MAXSTUDIOFLEXDESC	1024	         
-#define MAXSTUDIOFLEXCTRL	96		      
-#define MAXSTUDIOPOSEPARAM	24
-#define MAXSTUDIOBONECTRLS	4
-#define MAXSTUDIOANIMBLOCKS 256
-
-#define MAXSTUDIOBONEBITS	7		    
-
-#define MAX_NUM_BONES_PER_VERT 3
-
-#define NEW_EVENT_STYLE ( 1 << 10 )
-
-struct mstudiodata_t
-{
-	int		count;
-	int		offset;
-};
-
-#define STUDIO_PROC_AXISINTERP	1
-#define STUDIO_PROC_QUATINTERP	2
-#define STUDIO_PROC_AIMATBONE	3
-#define STUDIO_PROC_AIMATATTACH 4
-#define STUDIO_PROC_JIGGLE 5
-
-struct mstudioaxisinterpbone_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int				control;           
-	int				axis;	   
-	Vector			pos[6];	      
-	Quaternion		quat[6];      
-
-	mstudioaxisinterpbone_t() {}
-private:
-	mstudioaxisinterpbone_t(const mstudioaxisinterpbone_t& vOther);
-};
-
-
-struct mstudioquatinterpinfo_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	float			inv_tolerance;	       
-	Quaternion		trigger;	   
-	Vector			pos;		  
-	Quaternion		quat;		  
-
-	mstudioquatinterpinfo_t() {}
-private:
-	mstudioquatinterpinfo_t(const mstudioquatinterpinfo_t& vOther);
-};
-
-struct mstudioquatinterpbone_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int				control;    
-	int				numtriggers;
-	int				triggerindex;
-	inline mstudioquatinterpinfo_t* pTrigger(int i) const { return  (mstudioquatinterpinfo_t*)(((byte*)this) + triggerindex) + i; };
-
-	mstudioquatinterpbone_t() {}
-private:
-	mstudioquatinterpbone_t(const mstudioquatinterpbone_t& vOther);
-};
-
-
-#define JIGGLE_IS_FLEXIBLE				0x01
-#define JIGGLE_IS_RIGID					0x02
-#define JIGGLE_HAS_YAW_CONSTRAINT		0x04
-#define JIGGLE_HAS_PITCH_CONSTRAINT		0x08
-#define JIGGLE_HAS_ANGLE_CONSTRAINT		0x10
-#define JIGGLE_HAS_LENGTH_CONSTRAINT	0x20
-#define JIGGLE_HAS_BASE_SPRING			0x40
-#define JIGGLE_IS_BOING					0x80		      
-
-struct mstudiojigglebone_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	int				flags;
-
-	float			length;					         
-	float			tipMass;
-
-	float			yawStiffness;
-	float			yawDamping;
-	float			pitchStiffness;
-	float			pitchDamping;
-	float			alongStiffness;
-	float			alongDamping;
-
-	float			angleLimit;				      
-
-	float			minYaw;					  
-	float			maxYaw;					  
-	float			yawFriction;
-	float			yawBounce;
-
-	float			minPitch;				  
-	float			maxPitch;				  
-	float			pitchFriction;
-	float			pitchBounce;
-
-	float			baseMass;
-	float			baseStiffness;
-	float			baseDamping;
-	float			baseMinLeft;
-	float			baseMaxLeft;
-	float			baseLeftFriction;
-	float			baseMinUp;
-	float			baseMaxUp;
-	float			baseUpFriction;
-	float			baseMinForward;
-	float			baseMaxForward;
-	float			baseForwardFriction;
-
-	float			boingImpactSpeed;
-	float			boingImpactAngle;
-	float			boingDampingRate;
-	float			boingFrequency;
-	float			boingAmplitude;
-
-private:
-};
-
-struct mstudioaimatbone_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	int				parent;
-	int				aim;		     
-	Vector			aimvector;
-	Vector			upvector;
-	Vector			basepos;
-
-	mstudioaimatbone_t() {}
-private:
-	mstudioaimatbone_t(const mstudioaimatbone_t& vOther);
-};
-
-struct mstudiobone_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					sznameindex;
-	inline char* const pszName(void) const { return ((char*)this) + sznameindex; }
-	int		 			parent;		  
-	int					bonecontroller[6];	      
-
-	Vector				pos;
-	Quaternion			quat;
-	RadianEuler			rot;
-	Vector				posscale;
-	Vector				rotscale;
-
-	matrix3x4_t			poseToBone;
-	Quaternion			qAlignment;
-	int					flags;
-	int					proctype;
-	int					procindex;		  
-	mutable int			physicsbone;	     
-	inline void* pProcedure() const { if (procindex == 0) return NULL; else return  (void*)(((byte*)this) + procindex); };
-	int					surfacepropidx;	      
-	inline char* const pszSurfaceProp(void) const { return ((char*)this) + surfacepropidx; }
-	int					contents;		      
-
-	int					unused[8];		   
-
-	mstudiobone_t() {}
-private:
-	mstudiobone_t(const mstudiobone_t& vOther);
-};
-
-struct mstudiolinearbone_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	int numbones;
-
-	int flagsindex;
-	inline int flags(int i) const { Assert(i >= 0 && i < numbones); return *((int*)(((byte*)this) + flagsindex) + i); };
-	inline int* pflags(int i) { Assert(i >= 0 && i < numbones); return ((int*)(((byte*)this) + flagsindex) + i); };
-
-	int	parentindex;
-	inline int parent(int i) const { Assert(i >= 0 && i < numbones); return *((int*)(((byte*)this) + parentindex) + i); };
-
-	int	posindex;
-	inline Vector pos(int i) const { Assert(i >= 0 && i < numbones); return *((Vector*)(((byte*)this) + posindex) + i); };
-
-	int quatindex;
-	inline Quaternion quat(int i) const { Assert(i >= 0 && i < numbones); return *((Quaternion*)(((byte*)this) + quatindex) + i); };
-
-	int rotindex;
-	inline RadianEuler rot(int i) const { Assert(i >= 0 && i < numbones); return *((RadianEuler*)(((byte*)this) + rotindex) + i); };
-
-	int posetoboneindex;
-	inline matrix3x4_t poseToBone(int i) const { Assert(i >= 0 && i < numbones); return *((matrix3x4_t*)(((byte*)this) + posetoboneindex) + i); };
-
-	int	posscaleindex;
-	inline Vector posscale(int i) const { Assert(i >= 0 && i < numbones); return *((Vector*)(((byte*)this) + posscaleindex) + i); };
-
-	int	rotscaleindex;
-	inline Vector rotscale(int i) const { Assert(i >= 0 && i < numbones); return *((Vector*)(((byte*)this) + rotscaleindex) + i); };
-
-	int	qalignmentindex;
-	inline Quaternion qalignment(int i) const { Assert(i >= 0 && i < numbones); return *((Quaternion*)(((byte*)this) + qalignmentindex) + i); };
-
-	int unused[6];
-
-	mstudiolinearbone_t() {}
-private:
-	mstudiolinearbone_t(const mstudiolinearbone_t& vOther);
-};
-
-
-enum StudioBoneFlexComponent_t
-{
-	STUDIO_BONE_FLEX_INVALID = -1,	 
-	STUDIO_BONE_FLEX_TX = 0,		  
-	STUDIO_BONE_FLEX_TY = 1,		  
-	STUDIO_BONE_FLEX_TZ = 2			  
-};
-
-
-struct mstudioboneflexdrivercontrol_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	int m_nBoneComponent;		      
-	int m_nFlexControllerIndex;	    
-	float m_flMin;				           
-	float m_flMax;				           
-
-	mstudioboneflexdrivercontrol_t() {}
-private:
-	mstudioboneflexdrivercontrol_t(const mstudioboneflexdrivercontrol_t& vOther);
-};
-
-
-struct mstudioboneflexdriver_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	int m_nBoneIndex;			     
-	int m_nControlCount;		      
-	int m_nControlIndex;		         
-
-	inline mstudioboneflexdrivercontrol_t* pBoneFlexDriverControl(int i) const
-	{
-		Assert(i >= 0 && i < m_nControlCount);
-		return (mstudioboneflexdrivercontrol_t*)(((byte*)this) + m_nControlIndex) + i;
-	}
-
-	int unused[3];
-
-	mstudioboneflexdriver_t() {}
-private:
-	mstudioboneflexdriver_t(const mstudioboneflexdriver_t& vOther);
-};
-
-
-#define BONE_CALCULATE_MASK			0x1F
-#define BONE_PHYSICALLY_SIMULATED	0x01	        
-#define BONE_PHYSICS_PROCEDURAL		0x02	     
-#define BONE_ALWAYS_PROCEDURAL		0x04	     
-#define BONE_SCREEN_ALIGN_SPHERE	0x08	         
-#define BONE_SCREEN_ALIGN_CYLINDER	0x10	          
-
-#define BONE_USED_MASK				0x0007FF00
-#define BONE_USED_BY_ANYTHING		0x0007FF00
-#define BONE_USED_BY_HITBOX			0x00000100	         
-#define BONE_USED_BY_ATTACHMENT		0x00000200	         
-#define BONE_USED_BY_VERTEX_MASK	0x0003FC00
-#define BONE_USED_BY_VERTEX_LOD0	0x00000400	            
-#define BONE_USED_BY_VERTEX_LOD1	0x00000800	
-#define BONE_USED_BY_VERTEX_LOD2	0x00001000  
-#define BONE_USED_BY_VERTEX_LOD3	0x00002000
-#define BONE_USED_BY_VERTEX_LOD4	0x00004000
-#define BONE_USED_BY_VERTEX_LOD5	0x00008000
-#define BONE_USED_BY_VERTEX_LOD6	0x00010000
-#define BONE_USED_BY_VERTEX_LOD7	0x00020000
-#define BONE_USED_BY_BONE_MERGE		0x00040000	          
-
-#define BONE_USED_BY_VERTEX_AT_LOD(lod) ( BONE_USED_BY_VERTEX_LOD0 << (lod) )
-#define BONE_USED_BY_ANYTHING_AT_LOD(lod) ( ( BONE_USED_BY_ANYTHING & ~BONE_USED_BY_VERTEX_MASK ) | BONE_USED_BY_VERTEX_AT_LOD(lod) )
-
-#define MAX_NUM_LODS 8
-
-#define BONE_TYPE_MASK				0x00F00000
-#define BONE_FIXED_ALIGNMENT		0x00100000	             
-
-#define BONE_HAS_SAVEFRAME_POS		0x00200000	 
-#define BONE_HAS_SAVEFRAME_ROT		0x00400000	 
-
-struct mstudiobonecontroller_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					bone;	   
-	int					type;	       
-	float				start;
-	float				end;
-	int					rest;	     
-	int					inputfield;	      
-	int					unused[8];
-};
-
-struct mstudiobbox_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					bone;
-	int					group;				  
-	Vector				bbmin;				  
-	Vector				bbmax;
-	int					szhitboxnameindex;	       
-	int					unused[8];
-
-	const char* pszHitboxName()
-	{
-		if (szhitboxnameindex == 0)
-			return "";
-
-		return ((const char*)this) + szhitboxnameindex;
-	}
-
-	mstudiobbox_t() {}
-
-private:
-	mstudiobbox_t(const mstudiobbox_t& vOther);
-};
-
-struct mstudiomodelgroup_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					szlabelindex;	  
-	inline char* const pszLabel(void) const { return ((char*)this) + szlabelindex; }
-	int					sznameindex;	  
-	inline char* const pszName(void) const { return ((char*)this) + sznameindex; }
-};
-
-struct mstudiomodelgrouplookup_t
-{
-	int					modelgroup;
-	int					indexwithingroup;
-};
-
-struct mstudioevent_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	float				cycle;
-	int					event;
-	int					type;
-	inline const char* pszOptions(void) const { return options; }
-	char				options[64];
-
-	int					szeventindex;
-	inline char* const pszEventName(void) const { return ((char*)this) + szeventindex; }
-};
-
-#define	ATTACHMENT_FLAG_WORLD_ALIGN 0x10000
-
-struct mstudioattachment_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					sznameindex;
-	inline char* const pszName(void) const { return ((char*)this) + sznameindex; }
-	unsigned int		flags;
-	int					localbone;
-	matrix3x4_t			local;   
-	int					unused[8];
-};
-
-#define IK_SELF 1
-#define IK_WORLD 2
-#define IK_GROUND 3
-#define IK_RELEASE 4
-#define IK_ATTACHMENT 5
-#define IK_UNLATCH 6
-
-struct mstudioikerror_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	Vector		pos;
-	Quaternion	q;
-
-	mstudioikerror_t() {}
-
-private:
-	mstudioikerror_t(const mstudioikerror_t& vOther);
-};
-
-union mstudioanimvalue_t;
-
-struct mstudiocompressedikerror_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	float	scale[6];
-	short	offset[6];
-	inline mstudioanimvalue_t* pAnimvalue(int i) const { if (offset[i] > 0) return  (mstudioanimvalue_t*)(((byte*)this) + offset[i]); else return NULL; };
-	mstudiocompressedikerror_t() {}
-
-private:
-	mstudiocompressedikerror_t(const mstudiocompressedikerror_t& vOther);
-};
-
-struct mstudioikrule_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int			index;
-
-	int			type;
-	int			chain;
-
-	int			bone;
-
-	int			slot;	       
-	float		height;
-	float		radius;
-	float		floor;
-	Vector		pos;
-	Quaternion	q;
-
-	int			compressedikerrorindex;
-	inline mstudiocompressedikerror_t* pCompressedError() const { return (mstudiocompressedikerror_t*)(((byte*)this) + compressedikerrorindex); };
-	int			unused2;
-
-	int			iStart;
-	int			ikerrorindex;
-	inline mstudioikerror_t* pError(int i) const { return  (ikerrorindex) ? (mstudioikerror_t*)(((byte*)this) + ikerrorindex) + (i - iStart) : NULL; };
-
-	float		start;	   
-	float		peak;	    
-	float		tail;	    
-	float		end;	    
-
-	float		unused3;	 
-	float		contact;	     
-	float		drop;		           
-	float		top;		     
-
-	int			unused6;
-	int			unused7;
-	int			unused8;
-
-	int			szattachmentindex;		    
-	inline char* const pszAttachment(void) const { return ((char*)this) + szattachmentindex; }
-
-	int			unused[7];
-
-	mstudioikrule_t() {}
-
-private:
-	mstudioikrule_t(const mstudioikrule_t& vOther);
-};
-
-
-struct mstudioiklock_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int			chain;
-	float		flPosWeight;
-	float		flLocalQWeight;
-	int			flags;
-
-	int			unused[4];
-};
-
-
-struct mstudiolocalhierarchy_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int			iBone;			   
-	int			iNewParent;		    
-
-	float		start;			   
-	float		peak;			    
-	float		tail;			    
-	float		end;			    
-
-	int			iStart;			   
-
-	int			localanimindex;
-	inline mstudiocompressedikerror_t* pLocalAnim() const { return (mstudiocompressedikerror_t*)(((byte*)this) + localanimindex); };
-
-	int			unused[4];
-};
-
-
-
-union mstudioanimvalue_t
-{
-	struct
-	{
-		byte	valid;
-		byte	total;
-	} num;
-	short		value;
-};
-
-struct mstudioanim_valueptr_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	short	offset[3];
-	inline mstudioanimvalue_t* pAnimvalue(int i) const { if (offset[i] > 0) return  (mstudioanimvalue_t*)(((byte*)this) + offset[i]); else return NULL; };
-};
-
-#define STUDIO_ANIM_RAWPOS	0x01  
-#define STUDIO_ANIM_RAWROT	0x02  
-#define STUDIO_ANIM_ANIMPOS	0x04  
-#define STUDIO_ANIM_ANIMROT	0x08  
-#define STUDIO_ANIM_DELTA	0x10
-#define STUDIO_ANIM_RAWROT2	0x20  
-
-
-struct mstudioanim_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	byte				bone;
-	byte				flags;		  
-
-	inline byte* pData(void) const { return (((byte*)this) + sizeof(struct mstudioanim_t)); };
-	inline mstudioanim_valueptr_t* pRotV(void) const { return (mstudioanim_valueptr_t*)(pData()); };
-	inline mstudioanim_valueptr_t* pPosV(void) const { return (mstudioanim_valueptr_t*)(pData()) + ((flags & STUDIO_ANIM_ANIMROT) != 0); };
-
-	inline Quaternion48* pQuat48(void) const { return (Quaternion48*)(pData()); };
-	inline Quaternion64* pQuat64(void) const { return (Quaternion64*)(pData()); };
-	inline Vector48* pPos(void) const { return (Vector48*)(pData() + ((flags & STUDIO_ANIM_RAWROT) != 0) * sizeof(*pQuat48()) + ((flags & STUDIO_ANIM_RAWROT2) != 0) * sizeof(*pQuat64())); };
-
-	short				nextoffset;
-	inline mstudioanim_t* pNext(void) const { if (nextoffset != 0) return  (mstudioanim_t*)(((byte*)this) + nextoffset); else return NULL; };
-};
-
-struct mstudiomovement_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					endframe;
-	int					motionflags;
-	float				v0;			     
-	float				v1;			     
-	float				angle;		        
-	Vector				vector;		        
-	Vector				position;	     
-
-	mstudiomovement_t() {}
-private:
-	mstudiomovement_t(const mstudiomovement_t& vOther);
-};
-
-struct studiohdr_t;
-
-struct mstudioanimblock_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					datastart;
-	int					dataend;
-};
-
-struct mstudioanimsections_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					animblock;
-	int					animindex;
-};
-
-struct mstudioanimdesc_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					baseptr;
-	inline studiohdr_t* pStudiohdr(void) const { return (studiohdr_t*)(((byte*)this) + baseptr); }
-
-	int					sznameindex;
-	inline char* const pszName(void) const { return ((char*)this) + sznameindex; }
-
-	float				fps;		   	
-	int					flags;		  
-
-	int					numframes;
-
-	int					nummovements;
-	int					movementindex;
-	inline mstudiomovement_t* const pMovement(int i) const { return (mstudiomovement_t*)(((byte*)this) + movementindex) + i; };
-
-	int					unused1[6];			         	
-
-	int					animblock;
-	int					animindex;	        
-	mstudioanim_t* pAnimBlock(int block, int index) const;           
-	mstudioanim_t* pAnim(int* piFrame, float& flStall) const;         
-	mstudioanim_t* pAnim(int* piFrame) const;         
-
-	int					numikrules;
-	int					ikruleindex;	         
-	int					animblockikruleindex;          
-	mstudioikrule_t* pIKRule(int i) const;
-
-	int					numlocalhierarchy;
-	int					localhierarchyindex;
-	mstudiolocalhierarchy_t* pHierarchy(int i) const;
-
-	int					sectionindex;
-	int					sectionframes;              
-	inline mstudioanimsections_t* const pSection(int i) const { return (mstudioanimsections_t*)(((byte*)this) + sectionindex) + i; }
-
-	short				zeroframespan;	   
-	short				zeroframecount;    
-	int					zeroframeindex;
-	byte* pZeroFrameData() const { if (zeroframeindex) return (((byte*)this) + zeroframeindex); else return NULL; };
-	mutable float		zeroframestalltime;		    
-
-	mstudioanimdesc_t() {}
-private:
-	mstudioanimdesc_t(const mstudioanimdesc_t& vOther);
-};
-
-struct mstudioikrule_t;
-
-struct mstudioautolayer_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	short				iSequence;
-	short				iPose;
-	int					flags;
-	float				start;	   
-	float				peak;	    
-	float				tail;	    
-	float				end;	    
-};
-
-struct mstudioactivitymodifier_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	int					sznameindex;
-	inline char* pszName() { return (sznameindex) ? (char*)(((byte*)this) + sznameindex) : NULL; }
-};
-
-struct mstudioseqdesc_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					baseptr;
-	inline studiohdr_t* pStudiohdr(void) const { return (studiohdr_t*)(((byte*)this) + baseptr); }
-
-	int					szlabelindex;
-	inline char* const pszLabel(void) const { return ((char*)this) + szlabelindex; }
-
-	int					szactivitynameindex;
-	inline char* const pszActivityName(void) const { return ((char*)this) + szactivitynameindex; }
-
-	int					flags;		  
-
-	int					activity;	       
-	int					actweight;
-
-	int					numevents;
-	int					eventindex;
-	inline mstudioevent_t* pEvent(int i) const { Assert(i >= 0 && i < numevents); return (mstudioevent_t*)(((byte*)this) + eventindex) + i; };
-
-	Vector				bbmin;		    
-	Vector				bbmax;
-
-	int					numblends;
-
-	int					animindexindex;
-
-	inline int			anim(int x, int y) const
-	{
-		if (x >= groupsize[0])
-		{
-			x = groupsize[0] - 1;
-		}
-
-		if (y >= groupsize[1])
-		{
-			y = groupsize[1] - 1;
-		}
-
-		int offset = y * groupsize[0] + x;
-		short* blends = (short*)(((byte*)this) + animindexindex);
-		int value = (int)blends[offset];
-		return value;
-	}
-
-	int					movementindex;	      
-	int					groupsize[2];
-	int					paramindex[2];	      
-	float				paramstart[2];	    
-	float				paramend[2];	    
-	int					paramparent;
-
-	float				fadeintime;		       
-	float				fadeouttime;	       
-
-	int					localentrynode;		    
-	int					localexitnode;		    
-	int					nodeflags;		  
-
-	float				entryphase;		     
-	float				exitphase;		     
-
-	float				lastframe;		     
-
-	int					nextseq;		   
-	int					pose;			        
-
-	int					numikrules;
-
-	int					numautolayers;	
-	int					autolayerindex;
-	inline mstudioautolayer_t* pAutolayer(int i) const { Assert(i >= 0 && i < numautolayers); return (mstudioautolayer_t*)(((byte*)this) + autolayerindex) + i; };
-
-	int					weightlistindex;
-	inline float* pBoneweight(int i) const { return ((float*)(((byte*)this) + weightlistindex) + i); };
-	inline float		weight(int i) const { return *(pBoneweight(i)); };
-
-	int					posekeyindex;
-	float* pPoseKey(int iParam, int iAnim) const { return (float*)(((byte*)this) + posekeyindex) + iParam * groupsize[0] + iAnim; }
-	float				poseKey(int iParam, int iAnim) const { return *(pPoseKey(iParam, iAnim)); }
-
-	int					numiklocks;
-	int					iklockindex;
-	inline mstudioiklock_t* pIKLock(int i) const { Assert(i >= 0 && i < numiklocks); return (mstudioiklock_t*)(((byte*)this) + iklockindex) + i; };
-
-	int					keyvalueindex;
-	int					keyvaluesize;
-	inline const char* KeyValueText(void) const { return keyvaluesize != 0 ? ((char*)this) + keyvalueindex : NULL; }
-
-	int					cycleposeindex;		         
-
-	int					activitymodifierindex;
-	int					numactivitymodifiers;
-	inline mstudioactivitymodifier_t* pActivityModifier(int i) const { Assert(i >= 0 && i < numactivitymodifiers); return activitymodifierindex != 0 ? (mstudioactivitymodifier_t*)(((byte*)this) + activitymodifierindex) + i : NULL; };
-
-	int					unused[5];		           
-
-	mstudioseqdesc_t() {}
-private:
-	mstudioseqdesc_t(const mstudioseqdesc_t& vOther);
-};
-
-
-struct mstudioposeparamdesc_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					sznameindex;
-	inline char* const pszName(void) const { return ((char*)this) + sznameindex; }
-	int					flags;	 
-	float				start;	  
-	float				end;	  
-	float				loop;	          
-};
-
-struct mstudioflexdesc_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					szFACSindex;
-	inline char* const pszFACS(void) const { return ((char*)this) + szFACSindex; }
-};
-
-
-
-struct mstudioflexcontroller_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					sztypeindex;
-	inline char* const pszType(void) const { return ((char*)this) + sztypeindex; }
-	int					sznameindex;
-	inline char* const pszName(void) const { return ((char*)this) + sznameindex; }
-	mutable int			localToGlobal;	       
-	float				min;
-	float				max;
-};
-
-
-enum FlexControllerRemapType_t
-{
-	FLEXCONTROLLER_REMAP_PASSTHRU = 0,
-	FLEXCONTROLLER_REMAP_2WAY,	                
-	FLEXCONTROLLER_REMAP_NWAY,	                             
-	FLEXCONTROLLER_REMAP_EYELID
-};
-
-
-class CStudioHdr;
-struct mstudioflexcontrollerui_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					sznameindex;
-	inline char* const pszName(void) const { return ((char*)this) + sznameindex; }
-
-	int					szindex0;
-	int					szindex1;
-	int					szindex2;
-
-	inline const mstudioflexcontroller_t* pController(void) const
-	{
-		return !stereo ? (mstudioflexcontroller_t*)((char*)this + szindex0) : NULL;
-	}
-	inline char* const	pszControllerName(void) const { return !stereo ? pController()->pszName() : NULL; }
-	inline int			controllerIndex(const CStudioHdr& cStudioHdr) const;
-
-	inline const mstudioflexcontroller_t* pLeftController(void) const
-	{
-		return stereo ? (mstudioflexcontroller_t*)((char*)this + szindex0) : NULL;
-	}
-	inline char* const	pszLeftName(void) const { return stereo ? pLeftController()->pszName() : NULL; }
-	inline int			leftIndex(const CStudioHdr& cStudioHdr) const;
-
-	inline const mstudioflexcontroller_t* pRightController(void) const
-	{
-		return stereo ? (mstudioflexcontroller_t*)((char*)this + szindex1) : NULL;
-	}
-	inline char* const	pszRightName(void) const { return stereo ? pRightController()->pszName() : NULL; }
-	inline int			rightIndex(const CStudioHdr& cStudioHdr) const;
-
-	inline const mstudioflexcontroller_t* pNWayValueController(void) const
-	{
-		return remaptype == FLEXCONTROLLER_REMAP_NWAY ? (mstudioflexcontroller_t*)((char*)this + szindex2) : NULL;
-	}
-	inline char* const	pszNWayValueName(void) const { return remaptype == FLEXCONTROLLER_REMAP_NWAY ? pNWayValueController()->pszName() : NULL; }
-	inline int			nWayValueIndex(const CStudioHdr& cStudioHdr) const;
-
-	inline int			Count() const { return (stereo ? 2 : 1) + (remaptype == FLEXCONTROLLER_REMAP_NWAY ? 1 : 0); }
-	inline const mstudioflexcontroller_t* pController(int index) const;
-
-	unsigned char		remaptype;	    
-	bool				stereo;		     
-	byte				unused[2];
-};
-
-
-struct mstudiovertanim_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short		index;
-	byte				speed;	 
-	byte				side;	 
-
-protected:
-	union
-	{
-		short			delta[3];
-		float16			flDelta[3];
-	};
-
-	union
-	{
-		short			ndelta[3];
-		float16			flNDelta[3];
-	};
-
-public:
-	inline void ConvertToFixed(float flVertAnimFixedPointScale)
-	{
-		delta[0] = flDelta[0].GetFloat() / flVertAnimFixedPointScale;
-		delta[1] = flDelta[1].GetFloat() / flVertAnimFixedPointScale;
-		delta[2] = flDelta[2].GetFloat() / flVertAnimFixedPointScale;
-		ndelta[0] = flNDelta[0].GetFloat() / flVertAnimFixedPointScale;
-		ndelta[1] = flNDelta[1].GetFloat() / flVertAnimFixedPointScale;
-		ndelta[2] = flNDelta[2].GetFloat() / flVertAnimFixedPointScale;
-	}
-
-	inline Vector GetDeltaFixed(float flVertAnimFixedPointScale)
-	{
-		return Vector(delta[0] * flVertAnimFixedPointScale, delta[1] * flVertAnimFixedPointScale, delta[2] * flVertAnimFixedPointScale);
-	}
-	inline Vector GetNDeltaFixed(float flVertAnimFixedPointScale)
-	{
-		return Vector(ndelta[0] * flVertAnimFixedPointScale, ndelta[1] * flVertAnimFixedPointScale, ndelta[2] * flVertAnimFixedPointScale);
-	}
-	inline void GetDeltaFixed4DAligned(Vector4DAligned* vFillIn, float flVertAnimFixedPointScale)
-	{
-		vFillIn->Set(delta[0] * flVertAnimFixedPointScale, delta[1] * flVertAnimFixedPointScale, delta[2] * flVertAnimFixedPointScale, 0.0f);
-	}
-	inline void GetNDeltaFixed4DAligned(Vector4DAligned* vFillIn, float flVertAnimFixedPointScale)
-	{
-		vFillIn->Set(ndelta[0] * flVertAnimFixedPointScale, ndelta[1] * flVertAnimFixedPointScale, ndelta[2] * flVertAnimFixedPointScale, 0.0f);
-	}
-	inline Vector GetDeltaFloat()
-	{
-		return Vector(flDelta[0].GetFloat(), flDelta[1].GetFloat(), flDelta[2].GetFloat());
-	}
-	inline Vector GetNDeltaFloat()
-	{
-		return Vector(flNDelta[0].GetFloat(), flNDelta[1].GetFloat(), flNDelta[2].GetFloat());
-	}
-	inline void SetDeltaFixed(const Vector& vInput, float flVertAnimFixedPointScale)
-	{
-		delta[0] = vInput.x / flVertAnimFixedPointScale;
-		delta[1] = vInput.y / flVertAnimFixedPointScale;
-		delta[2] = vInput.z / flVertAnimFixedPointScale;
-	}
-	inline void SetNDeltaFixed(const Vector& vInputNormal, float flVertAnimFixedPointScale)
-	{
-		ndelta[0] = vInputNormal.x / flVertAnimFixedPointScale;
-		ndelta[1] = vInputNormal.y / flVertAnimFixedPointScale;
-		ndelta[2] = vInputNormal.z / flVertAnimFixedPointScale;
-	}
-
-	inline void SetDeltaFloat(const Vector& vInput)
-	{
-		flDelta[0].SetFloat(vInput.x);
-		flDelta[1].SetFloat(vInput.y);
-		flDelta[2].SetFloat(vInput.z);
-	}
-	inline void SetNDeltaFloat(const Vector& vInputNormal)
-	{
-		flNDelta[0].SetFloat(vInputNormal.x);
-		flNDelta[1].SetFloat(vInputNormal.y);
-		flNDelta[2].SetFloat(vInputNormal.z);
-	}
-
-	class CSortByIndex
-	{
-	public:
-		bool operator()(const mstudiovertanim_t& left, const mstudiovertanim_t& right)const
-		{
-			return left.index < right.index;
-		}
-	};
-	friend class CSortByIndex;
-
-	mstudiovertanim_t() {}
-};
-
-
-struct mstudiovertanim_wrinkle_t : public mstudiovertanim_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	short	wrinkledelta;
-
-	inline void SetWrinkleFixed(float flWrinkle, float flVertAnimFixedPointScale)
-	{
-		int nWrinkleDeltaInt = flWrinkle / flVertAnimFixedPointScale;
-		wrinkledelta = clamp(nWrinkleDeltaInt, -32767, 32767);
-	}
-
-	inline Vector4D GetDeltaFixed(float flVertAnimFixedPointScale)
-	{
-		return Vector4D(delta[0] * flVertAnimFixedPointScale, delta[1] * flVertAnimFixedPointScale, delta[2] * flVertAnimFixedPointScale, wrinkledelta * flVertAnimFixedPointScale);
-	}
-
-	inline void GetDeltaFixed4DAligned(Vector4DAligned* vFillIn, float flVertAnimFixedPointScale)
-	{
-		vFillIn->Set(delta[0] * flVertAnimFixedPointScale, delta[1] * flVertAnimFixedPointScale, delta[2] * flVertAnimFixedPointScale, wrinkledelta * flVertAnimFixedPointScale);
-	}
-
-	inline float GetWrinkleDeltaFixed(float flVertAnimFixedPointScale)
-	{
-		return wrinkledelta * flVertAnimFixedPointScale;
-	}
-};
-
-
-enum StudioVertAnimType_t
-{
-	STUDIO_VERT_ANIM_NORMAL = 0,
-	STUDIO_VERT_ANIM_WRINKLE,
-};
-
-struct mstudioflex_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					flexdesc;	  
-
-	float				target0;	 
-	float				target1;	 
-	float				target2;	 
-	float				target3;	 
-
-	int					numverts;
-	int					vertindex;
-
-	inline	mstudiovertanim_t* pVertanim(int i) const { Assert(vertanimtype == STUDIO_VERT_ANIM_NORMAL); return (mstudiovertanim_t*)(((byte*)this) + vertindex) + i; };
-	inline	mstudiovertanim_wrinkle_t* pVertanimWrinkle(int i) const { Assert(vertanimtype == STUDIO_VERT_ANIM_WRINKLE); return  (mstudiovertanim_wrinkle_t*)(((byte*)this) + vertindex) + i; };
-
-	inline	byte* pBaseVertanim() const { return ((byte*)this) + vertindex; };
-	inline	int	VertAnimSizeBytes() const { return (vertanimtype == STUDIO_VERT_ANIM_NORMAL) ? sizeof(mstudiovertanim_t) : sizeof(mstudiovertanim_wrinkle_t); }
-
-	int					flexpair;	   
-	unsigned char		vertanimtype;	  
-	unsigned char		unusedchar[3];
-	int					unused[6];
-};
-
-
-struct mstudioflexop_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int		op;
-	union
-	{
-		int		index;
-		float	value;
-	} d;
-};
-
-struct mstudioflexrule_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					flex;
-	int					numops;
-	int					opindex;
-	inline mstudioflexop_t* iFlexOp(int i) const { return  (mstudioflexop_t*)(((byte*)this) + opindex) + i; };
-};
-
-struct mstudioboneweight_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	float	weight[MAX_NUM_BONES_PER_VERT];
-	char	bone[MAX_NUM_BONES_PER_VERT];
-	byte	numbones;
-
-};
-
-struct mstudiovertex_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	mstudioboneweight_t	m_BoneWeights;
-	Vector				m_vecPosition;
-	Vector				m_vecNormal;
-	Vector2D			m_vecTexCoord;
-
-	mstudiovertex_t() {}
-
-private:
-	mstudiovertex_t(const mstudiovertex_t& vOther);
-};
-
-struct mstudiotexture_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int						sznameindex;
-	inline char* const		pszName(void) const { return ((char*)this) + sznameindex; }
-	int						flags;
-	int						used;
-	int						unused1;
-	mutable IMaterial* material;                   
-	mutable void* clientmaterial;	        
-
-	int						unused[10];
-};
-
-struct mstudioeyeball_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					sznameindex;
-	inline char* const pszName(void) const { return ((char*)this) + sznameindex; }
-	int		bone;
-	Vector	org;
-	float	zoffset;
-	float	radius;
-	Vector	up;
-	Vector	forward;
-	int		texture;
-
-	int		unused1;
-	float	iris_scale;
-	int		unused2;
-
-	int		upperflexdesc[3];	             
-	int		lowerflexdesc[3];
-	float	uppertarget[3];		         
-	float	lowertarget[3];
-
-	int		upperlidflexdesc;	          
-	int		lowerlidflexdesc;
-	int		unused[4];			          
-	bool	m_bNonFACS;			     
-	char	unused3[3];
-	int		unused4[7];
-
-	mstudioeyeball_t() {}
-private:
-	mstudioeyeball_t(const mstudioeyeball_t& vOther);
-};
-
-
-struct mstudioiklink_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int		bone;
-	Vector	kneeDir;	       
-	Vector	unused0;	 
-
-	mstudioiklink_t() {}
-private:
-	mstudioiklink_t(const mstudioiklink_t& vOther);
-};
-
-struct mstudioikchain_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int				sznameindex;
-	inline char* const pszName(void) const { return ((char*)this) + sznameindex; }
-	int				linktype;
-	int				numlinks;
-	int				linkindex;
-	inline mstudioiklink_t* pLink(int i) const { return (mstudioiklink_t*)(((byte*)this) + linkindex) + i; };
-};
-
-
-struct mstudioiface_t
-{
-	unsigned short a, b, c;		   
-};
-
-
-struct mstudiomodel_t;
-
-struct mstudio_modelvertexdata_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	Vector* Position(int i) const;
-	Vector* Normal(int i) const;
-	Vector4D* TangentS(int i) const;
-	Vector2D* Texcoord(int i) const;
-	mstudioboneweight_t* BoneWeights(int i) const;
-	mstudiovertex_t* Vertex(int i) const;
-	bool				HasTangentData(void) const;
-	int					GetGlobalVertexIndex(int i) const;
-	int					GetGlobalTangentIndex(int i) const;
-
-	const void* pVertexData;
-	const void* pTangentData;
-};
-
-struct mstudio_meshvertexdata_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	Vector* Position(int i) const;
-	Vector* Normal(int i) const;
-	Vector4D* TangentS(int i) const;
-	Vector2D* Texcoord(int i) const;
-	mstudioboneweight_t* BoneWeights(int i) const;
-	mstudiovertex_t* Vertex(int i) const;
-	bool				HasTangentData(void) const;
-	int					GetModelVertexIndex(int i) const;
-	int					GetGlobalVertexIndex(int i) const;
-
-	const mstudio_modelvertexdata_t* modelvertexdata;
-
-	int					numLODVertexes[MAX_NUM_LODS];
-};
-
-struct mstudiomesh_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					material;
-
-	int					modelindex;
-	mstudiomodel_t* pModel() const;
-
-	int					numvertices;		    
-	int					vertexoffset;		  
-
-	const mstudio_meshvertexdata_t* GetVertexData(void* pModelData = NULL);
-	const thinModelVertices_t* GetThinVertexData(void* pModelData = NULL);
-
-	int					numflexes;			  
-	int					flexindex;
-	inline mstudioflex_t* pFlex(int i) const { return (mstudioflex_t*)(((byte*)this) + flexindex) + i; };
-
-	int					materialtype;
-	int					materialparam;
-
-	int					meshid;
-
-	Vector				center;
-
-	mstudio_meshvertexdata_t vertexdata;
-
-	int					unused[8];    
-
-	mstudiomesh_t() {}
-private:
-	mstudiomesh_t(const mstudiomesh_t& vOther);
-};
-
-struct mstudiomodel_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	inline const char* pszName(void) const { return name; }
-	char				name[64];
-
-	int					type;
-
-	float				boundingradius;
-
-	int					nummeshes;
-	int					meshindex;
-	inline mstudiomesh_t* pMesh(int i) const { return (mstudiomesh_t*)(((byte*)this) + meshindex) + i; };
-
-	int					numvertices;		    
-	int					vertexindex;		  
-	int					tangentsindex;		  
-
-	const vertexFileHeader_t* CacheVertexData(void* pModelData);
-
-	const mstudio_modelvertexdata_t* GetVertexData(void* pModelData = NULL);
-	const thinModelVertices_t* GetThinVertexData(void* pModelData = NULL);
-
-	int					numattachments;
-	int					attachmentindex;
-
-	int					numeyeballs;
-	int					eyeballindex;
-	inline  mstudioeyeball_t* pEyeball(int i) { return (mstudioeyeball_t*)(((byte*)this) + eyeballindex) + i; };
-
-	mstudio_modelvertexdata_t vertexdata;
-
-	int					unused[8];		   
-};
-
-inline bool mstudio_modelvertexdata_t::HasTangentData(void) const
-{
-	return (pTangentData != NULL);
-}
-
-inline int mstudio_modelvertexdata_t::GetGlobalVertexIndex(int i) const
-{
-	mstudiomodel_t* modelptr = (mstudiomodel_t*)((byte*)this - offsetof(mstudiomodel_t, vertexdata));
-	Assert((modelptr->vertexindex % sizeof(mstudiovertex_t)) == 0);
-	return (i + (modelptr->vertexindex / sizeof(mstudiovertex_t)));
-}
-
-inline int mstudio_modelvertexdata_t::GetGlobalTangentIndex(int i) const
-{
-	mstudiomodel_t* modelptr = (mstudiomodel_t*)((byte*)this - offsetof(mstudiomodel_t, vertexdata));
-	Assert((modelptr->tangentsindex % sizeof(Vector4D)) == 0);
-	return (i + (modelptr->tangentsindex / sizeof(Vector4D)));
-}
-
-inline mstudiovertex_t* mstudio_modelvertexdata_t::Vertex(int i) const
-{
-	return (mstudiovertex_t*)pVertexData + GetGlobalVertexIndex(i);
-}
-
-inline Vector* mstudio_modelvertexdata_t::Position(int i) const
-{
-	return &Vertex(i)->m_vecPosition;
-}
-
-inline Vector* mstudio_modelvertexdata_t::Normal(int i) const
-{
-	return &Vertex(i)->m_vecNormal;
-}
-
-inline Vector4D* mstudio_modelvertexdata_t::TangentS(int i) const
-{
-	return (Vector4D*)pTangentData + GetGlobalTangentIndex(i);
-}
-
-inline Vector2D* mstudio_modelvertexdata_t::Texcoord(int i) const
-{
-	return &Vertex(i)->m_vecTexCoord;
-}
-
-inline mstudioboneweight_t* mstudio_modelvertexdata_t::BoneWeights(int i) const
-{
-	return &Vertex(i)->m_BoneWeights;
-}
-
-inline mstudiomodel_t* mstudiomesh_t::pModel() const
-{
-	return (mstudiomodel_t*)(((byte*)this) + modelindex);
-}
-
-inline bool mstudio_meshvertexdata_t::HasTangentData(void) const
-{
-	return modelvertexdata->HasTangentData();
-}
-
-inline const mstudio_meshvertexdata_t* mstudiomesh_t::GetVertexData(void* pModelData)
-{
-	this->pModel()->GetVertexData(pModelData);
-	vertexdata.modelvertexdata = &(this->pModel()->vertexdata);
-
-	if (!vertexdata.modelvertexdata->pVertexData)
-		return NULL;
-
-	return &vertexdata;
-}
-
-inline const thinModelVertices_t* mstudiomesh_t::GetThinVertexData(void* pModelData)
-{
-	return this->pModel()->GetThinVertexData(pModelData);
-}
-
-inline int mstudio_meshvertexdata_t::GetModelVertexIndex(int i) const
-{
-	mstudiomesh_t* meshptr = (mstudiomesh_t*)((byte*)this - offsetof(mstudiomesh_t, vertexdata));
-	return meshptr->vertexoffset + i;
-}
-
-inline int mstudio_meshvertexdata_t::GetGlobalVertexIndex(int i) const
-{
-	return modelvertexdata->GetGlobalVertexIndex(GetModelVertexIndex(i));
-}
-
-inline Vector* mstudio_meshvertexdata_t::Position(int i) const
-{
-	return modelvertexdata->Position(GetModelVertexIndex(i));
-};
-
-inline Vector* mstudio_meshvertexdata_t::Normal(int i) const
-{
-	return modelvertexdata->Normal(GetModelVertexIndex(i));
-};
-
-inline Vector4D* mstudio_meshvertexdata_t::TangentS(int i) const
-{
-	return modelvertexdata->TangentS(GetModelVertexIndex(i));
-}
-
-inline Vector2D* mstudio_meshvertexdata_t::Texcoord(int i) const
-{
-	return modelvertexdata->Texcoord(GetModelVertexIndex(i));
-};
-
-inline mstudioboneweight_t* mstudio_meshvertexdata_t::BoneWeights(int i) const
-{
-	return modelvertexdata->BoneWeights(GetModelVertexIndex(i));
-};
-
-inline mstudiovertex_t* mstudio_meshvertexdata_t::Vertex(int i) const
-{
-	return modelvertexdata->Vertex(GetModelVertexIndex(i));
-}
-
-enum studiomeshgroupflags_t
-{
-	MESHGROUP_IS_FLEXED = 0x1,
-	MESHGROUP_IS_HWSKINNED = 0x2,
-	MESHGROUP_IS_DELTA_FLEXED = 0x4
-};
-
-
-struct studiomeshgroup_t
-{
-	IMesh* m_pMesh;
-	int				m_NumStrips;
-	int				m_Flags;		  
-	OptimizedModel::StripHeader_t* m_pStripData;
-	unsigned short* m_pGroupIndexToMeshIndex;
-	int				m_NumVertices;
-	int* m_pUniqueTris;	   
-	unsigned short* m_pIndices;
-	bool			m_MeshNeedsRestore;
-	short			m_ColorMeshID;
-	IMorph* m_pMorph;
-
-	inline unsigned short MeshIndex(int i) const { return m_pGroupIndexToMeshIndex[m_pIndices[i]]; }
-};
-
-
-struct studiomeshdata_t
-{
-	int					m_NumGroup;
-	studiomeshgroup_t* m_pMeshGroup;
-};
-
-struct studioloddata_t
-{
-	studiomeshdata_t* m_pMeshData;      
-	float				m_SwitchPoint;
-	int					numMaterials;
-	IMaterial** ppMaterials;       
-	int* pMaterialFlags;       
-
-	int* m_pHWMorphDecalBoneRemap;
-	int					m_nDecalBoneCount;
-};
-
-struct studiohwdata_t
-{
-	int					m_RootLOD;	       
-	int					m_NumLODs;
-	studioloddata_t* m_pLODs;
-	int					m_NumStudioMeshes;
-
-	inline float LODMetric(float unitSphereSize) const { return (unitSphereSize != 0.0f) ? (100.0f / unitSphereSize) : 0.0f; }
-	inline int GetLODForMetric(float lodMetric) const
-	{
-		if (!m_NumLODs)
-			return 0;
-
-		int numLODs = (m_pLODs[m_NumLODs - 1].m_SwitchPoint < 0.0f) ? m_NumLODs - 1 : m_NumLODs;
-
-		for (int i = m_RootLOD; i < numLODs - 1; i++)
-		{
-			if (m_pLODs[i + 1].m_SwitchPoint > lodMetric)
-				return i;
-		}
-
-		return numLODs - 1;
-	}
-};
-
-struct mstudiobodyparts_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					sznameindex;
-	inline char* const pszName(void) const { return ((char*)this) + sznameindex; }
-	int					nummodels;
-	int					base;
-	int					modelindex;     
-	inline mstudiomodel_t* pModel(int i) const { return (mstudiomodel_t*)(((byte*)this) + modelindex) + i; };
-};
-
-
-struct mstudiomouth_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					bone;
-	Vector				forward;
-	int					flexdesc;
-
-	mstudiomouth_t() {}
-private:
-	mstudiomouth_t(const mstudiomouth_t& vOther);
-};
-
-struct mstudiohitboxset_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					sznameindex;
-	inline char* const	pszName(void) const { return ((char*)this) + sznameindex; }
-	int					numhitboxes;
-	int					hitboxindex;
-	inline mstudiobbox_t* pHitbox(int i) const { return (mstudiobbox_t*)(((byte*)this) + hitboxindex) + i; };
-};
-
-
-struct mstudiosrcbonetransform_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	int			sznameindex;
-	inline const char* pszName(void) const { return ((char*)this) + sznameindex; }
-	matrix3x4_t	pretransform;
-	matrix3x4_t	posttransform;
-};
-
-
-class virtualgroup_t
-{
-public:
-	virtualgroup_t(void) { cache = NULL; };
-	void* cache;
-	const studiohdr_t* GetStudioHdr(void) const;
-
-	CUtlVector< int > boneMap;				      
-	CUtlVector< int > masterBone;			      
-	CUtlVector< int > masterSeq;			      
-	CUtlVector< int > masterAnim;			      
-	CUtlVector< int > masterAttachment;	     
-	CUtlVector< int > masterPose;			      
-	CUtlVector< int > masterNode;			      
-};
-
-struct virtualsequence_t
-{
-#ifdef _XBOX
-	short flags;
-	short activity;
-	short group;
-	short index;
-#else
-	int	flags;
-	int activity;
-	int group;
-	int index;
-#endif
-};
-
-struct virtualgeneric_t
-{
-#ifdef _XBOX
-	short group;
-	short index;
-#else
-	int group;
-	int index;
-#endif
-};
-
-
-struct virtualmodel_t
-{
-	void AppendSequences(int group, const studiohdr_t* pStudioHdr);
-	void AppendAnimations(int group, const studiohdr_t* pStudioHdr);
-	void AppendAttachments(int ground, const studiohdr_t* pStudioHdr);
-	void AppendPoseParameters(int group, const studiohdr_t* pStudioHdr);
-	void AppendBonemap(int group, const studiohdr_t* pStudioHdr);
-	void AppendNodes(int group, const studiohdr_t* pStudioHdr);
-	void AppendTransitions(int group, const studiohdr_t* pStudioHdr);
-	void AppendIKLocks(int group, const studiohdr_t* pStudioHdr);
-	void AppendModels(int group, const studiohdr_t* pStudioHdr);
-	void UpdateAutoplaySequences(const studiohdr_t* pStudioHdr);
-
-	virtualgroup_t* pAnimGroup(int animation) { return &m_group[m_anim[animation].group]; }        
-	virtualgroup_t* pSeqGroup(int sequence)
-	{
-		if ((unsigned)sequence >= (unsigned)m_seq.Count())
-		{
-			Assert(0);
-			return 0;
-		}
-		return &m_group[m_seq[sequence].group];
-	}        
-
-	CThreadFastMutex m_Lock;
-
-	CUtlVector< virtualsequence_t > m_seq;
-	CUtlVector< virtualgeneric_t > m_anim;
-	CUtlVector< virtualgeneric_t > m_attachment;
-	CUtlVector< virtualgeneric_t > m_pose;
-	CUtlVector< virtualgroup_t > m_group;
-	CUtlVector< virtualgeneric_t > m_node;
-	CUtlVector< virtualgeneric_t > m_iklock;
-	CUtlVector< unsigned short > m_autoplaySequences;
-};
-
-struct thinModelVertices_t
-{
-	void Init(int numBoneInfluences, Vector* positions, unsigned short* normals, float* boneWeights, char* boneIndices)
-	{
-		Assert(positions != NULL);
-		Assert(normals != NULL);
-		Assert((numBoneInfluences >= 0) && (numBoneInfluences <= 3));
-		Assert(numBoneInfluences > 0 ? !!boneIndices : !boneIndices);
-		Assert(numBoneInfluences > 1 ? !!boneWeights : !boneWeights);
-		m_numBoneInfluences = numBoneInfluences;
-		m_vecPositions = positions;
-		m_vecNormals = normals;
-		m_boneWeights = boneWeights;
-		m_boneIndices = boneIndices;
-	}
-
-	void SetPosition(int vertIndex, const Vector& position)
-	{
-		Assert(m_vecPositions);
-		m_vecPositions[vertIndex] = position;
-	}
-
-	void SetNormal(int vertIndex, const Vector& normal)
-	{
-		Assert(m_vecNormals);
-		unsigned int packedNormal;
-		PackNormal_UBYTE4(normal.x, normal.y, normal.z, &packedNormal);
-		m_vecNormals[vertIndex] = (unsigned short)(0x0000FFFF & packedNormal);
-	}
-
-	void SetBoneWeights(int vertIndex, const mstudioboneweight_t& boneWeights)
-	{
-		Assert((m_numBoneInfluences >= 1) && (m_numBoneInfluences <= 3));
-		Assert((boneWeights.numbones >= 1) && (boneWeights.numbones <= m_numBoneInfluences));
-		int    numStoredWeights = max(0, (m_numBoneInfluences - 1));
-		float* pBaseWeight = m_boneWeights + vertIndex * numStoredWeights;
-		char* pBaseIndex = m_boneIndices + vertIndex * m_numBoneInfluences;
-		for (int i = 0; i < m_numBoneInfluences; i++)
-		{
-			pBaseIndex[i] = boneWeights.bone[i];
-		}
-		for (int i = 0; i < numStoredWeights; i++)
-		{
-			pBaseWeight[i] = boneWeights.weight[i];
-		}
-	}
-
-	void GetMeshPosition(mstudiomesh_t* pMesh, int meshIndex, Vector* pPosition) const
-	{
-		Assert(pMesh);
-		GetPosition(pMesh->vertexdata.GetGlobalVertexIndex(meshIndex), pPosition);
-	}
-
-	void GetMeshNormal(mstudiomesh_t* pMesh, int meshIndex, Vector* pNormal) const
-	{
-		Assert(pMesh);
-		GetNormal(pMesh->vertexdata.GetGlobalVertexIndex(meshIndex), pNormal);
-	}
-
-	void GetMeshBoneWeights(mstudiomesh_t* pMesh, int meshIndex, mstudioboneweight_t* pBoneWeights) const
-	{
-		Assert(pMesh);
-		GetBoneWeights(pMesh->vertexdata.GetGlobalVertexIndex(meshIndex), pBoneWeights);
-	}
-
-	void GetModelPosition(mstudiomodel_t* pModel, int modelIndex, Vector* pPosition) const
-	{
-		Assert(pModel);
-		GetPosition(pModel->vertexdata.GetGlobalVertexIndex(modelIndex), pPosition);
-	}
-
-	void GetModelNormal(mstudiomodel_t* pModel, int modelIndex, Vector* pNormal) const
-	{
-		Assert(pModel);
-		GetNormal(pModel->vertexdata.GetGlobalVertexIndex(modelIndex), pNormal);
-	}
-
-	void GetModelBoneWeights(mstudiomodel_t* pModel, int modelIndex, mstudioboneweight_t* pBoneWeights) const
-	{
-		Assert(pModel);
-		GetBoneWeights(pModel->vertexdata.GetGlobalVertexIndex(modelIndex), pBoneWeights);
-	}
-
-private:
-	void GetPosition(int vertIndex, Vector* pPosition) const
-	{
-		Assert(pPosition);
-		Assert(m_vecPositions);
-		*pPosition = m_vecPositions[vertIndex];
-	}
-
-	void GetNormal(int vertIndex, Vector* pNormal) const
-	{
-		Assert(pNormal);
-		Assert(m_vecNormals);
-		unsigned int packedNormal = 0x0000FFFF & m_vecNormals[vertIndex];
-		UnpackNormal_UBYTE4(&packedNormal, pNormal->Base());
-	}
-
-	void GetBoneWeights(int vertIndex, mstudioboneweight_t* pBoneWeights) const
-	{
-		Assert(pBoneWeights);
-		Assert((m_numBoneInfluences <= 1) || (m_boneWeights != NULL));
-		Assert((m_numBoneInfluences <= 0) || (m_boneIndices != NULL));
-		int    numStoredWeights = max(0, (m_numBoneInfluences - 1));
-		float* pBaseWeight = m_boneWeights + vertIndex * numStoredWeights;
-		char* pBaseIndex = m_boneIndices + vertIndex * m_numBoneInfluences;
-		float  sum = 0.0f;
-		for (int i = 0; i < MAX_NUM_BONES_PER_VERT; i++)
-		{
-			if (i < (m_numBoneInfluences - 1))
-				pBoneWeights->weight[i] = pBaseWeight[i];
-			else
-				pBoneWeights->weight[i] = 1.0f - sum;
-			sum += pBoneWeights->weight[i];
-
-			pBoneWeights->bone[i] = (i < m_numBoneInfluences) ? pBaseIndex[i] : 0;
-		}
-
-		pBoneWeights->numbones = m_numBoneInfluences ? m_numBoneInfluences : 1;
-	}
-
-	int				m_numBoneInfluences;       
-	float* m_boneWeights;		           
-	char* m_boneIndices;		       
-	Vector* m_vecPositions;
-	unsigned short* m_vecNormals;		          
-};
-
-#define MODEL_VERTEX_FILE_ID		(('V'<<24)+('S'<<16)+('D'<<8)+'I')
-#define MODEL_VERTEX_FILE_VERSION	4
-#define MODEL_VERTEX_FILE_THIN_ID	(('V'<<24)+('C'<<16)+('D'<<8)+'I')
-
-struct vertexFileHeader_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int		id;								 
-	int		version;						 
-	int		checksum;						     
-	int		numLODs;						    
-	int		numLODVertexes[MAX_NUM_LODS];	      
-	int		numFixups;						   
-	int		fixupTableStart;				      
-	int		vertexDataStart;				      
-	int		tangentDataStart;				      
-
-public:
-
-	const mstudiovertex_t* GetVertexData() const
-	{
-		if ((id == MODEL_VERTEX_FILE_ID) && (vertexDataStart != 0))
-			return (mstudiovertex_t*)(vertexDataStart + (byte*)this);
-		else
-			return NULL;
-	}
-	const Vector4D* GetTangentData() const
-	{
-		if ((id == MODEL_VERTEX_FILE_ID) && (tangentDataStart != 0))
-			return (Vector4D*)(tangentDataStart + (byte*)this);
-		else
-			return NULL;
-	}
-	const  thinModelVertices_t* GetThinVertexData() const
-	{
-		if ((id == MODEL_VERTEX_FILE_THIN_ID) && (vertexDataStart != 0))
-			return (thinModelVertices_t*)(vertexDataStart + (byte*)this);
-		else
-			return NULL;
-	}
-};
-
-inline const mstudio_modelvertexdata_t* mstudiomodel_t::GetVertexData(void* pModelData)
-{
-	const vertexFileHeader_t* pVertexHdr = CacheVertexData(pModelData);
-	if (!pVertexHdr)
-	{
-		vertexdata.pVertexData = NULL;
-		vertexdata.pTangentData = NULL;
-		return NULL;
-	}
-
-	vertexdata.pVertexData = pVertexHdr->GetVertexData();
-	vertexdata.pTangentData = pVertexHdr->GetTangentData();
-
-	if (!vertexdata.pVertexData)
-		return NULL;
-
-	return &vertexdata;
-}
-
-inline const thinModelVertices_t* mstudiomodel_t::GetThinVertexData(void* pModelData)
-{
-	const vertexFileHeader_t* pVertexHdr = CacheVertexData(pModelData);
-	if (!pVertexHdr)
-		return NULL;
-
-	return pVertexHdr->GetThinVertexData();
-}
-
-struct vertexFileFixup_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int		lod;				      
-	int		sourceVertexID;		       
-	int		numVertexes;
-};
-
-#define STUDIOHDR_FLAGS_AUTOGENERATED_HITBOX				0x00000001
-
-#define STUDIOHDR_FLAGS_USES_ENV_CUBEMAP					0x00000002
-
-#define STUDIOHDR_FLAGS_FORCE_OPAQUE						0x00000004
-
-#define STUDIOHDR_FLAGS_TRANSLUCENT_TWOPASS					0x00000008
-
-#define STUDIOHDR_FLAGS_STATIC_PROP							0x00000010
-
-#define STUDIOHDR_FLAGS_USES_FB_TEXTURE						0x00000020
-
-#define STUDIOHDR_FLAGS_HASSHADOWLOD						0x00000040
-
-#define STUDIOHDR_FLAGS_USES_BUMPMAPPING					0x00000080
-
-#define STUDIOHDR_FLAGS_USE_SHADOWLOD_MATERIALS				0x00000100
-
-#define STUDIOHDR_FLAGS_OBSOLETE							0x00000200
-
-#define STUDIOHDR_FLAGS_UNUSED								0x00000400
-
-#define STUDIOHDR_FLAGS_NO_FORCED_FADE						0x00000800
-
-#define STUDIOHDR_FLAGS_FORCE_PHONEME_CROSSFADE				0x00001000
-
-#define STUDIOHDR_FLAGS_CONSTANT_DIRECTIONAL_LIGHT_DOT		0x00002000
-
-#define STUDIOHDR_FLAGS_FLEXES_CONVERTED					0x00004000
-
-#define STUDIOHDR_FLAGS_BUILT_IN_PREVIEW_MODE				0x00008000
-
-#define STUDIOHDR_FLAGS_AMBIENT_BOOST						0x00010000
-
-#define STUDIOHDR_FLAGS_DO_NOT_CAST_SHADOWS					0x00020000
-
-#define STUDIOHDR_FLAGS_CAST_TEXTURE_SHADOWS				0x00040000
-
-
-#define STUDIOHDR_FLAGS_VERT_ANIM_FIXED_POINT_SCALE			0x00200000
-
-struct studiohdr2_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int numsrcbonetransform;
-	int srcbonetransformindex;
-
-	int	illumpositionattachmentindex;
-	inline int			IllumPositionAttachmentIndex() const { return illumpositionattachmentindex; }
-
-	float flMaxEyeDeflection;
-	inline float		MaxEyeDeflection() const { return flMaxEyeDeflection != 0.0f ? flMaxEyeDeflection : 0.866f; }       
-
-	int linearboneindex;
-	inline mstudiolinearbone_t* pLinearBones() const { return (linearboneindex) ? (mstudiolinearbone_t*)(((byte*)this) + linearboneindex) : NULL; }
-
-	int sznameindex;
-	inline char* pszName() { return (sznameindex) ? (char*)(((byte*)this) + sznameindex) : NULL; }
-
-	int m_nBoneFlexDriverCount;
-	int m_nBoneFlexDriverIndex;
-	inline mstudioboneflexdriver_t* pBoneFlexDriver(int i) const { Assert(i >= 0 && i < m_nBoneFlexDriverCount); return (mstudioboneflexdriver_t*)(((byte*)this) + m_nBoneFlexDriverIndex) + i; }
-
-	int reserved[56];
-};
-
-struct studiohdr_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					id;
-	int					version;
-	int					checksum;		              
-	inline const char* pszName(void) const { if (studiohdr2index && pStudioHdr2()->pszName()) return pStudioHdr2()->pszName(); else return name; }
-	char				name[64];
-	int					length;
-	Vector				eyeposition;	   
-	Vector				illumposition;	  
-	Vector				hull_min;		    
-	Vector				hull_max;
-	Vector				view_bbmin;		   
-	Vector				view_bbmax;
-	int					flags;
-	int					numbones;			 
-	int					boneindex;
-	inline mstudiobone_t* pBone(int i) const { Assert(i >= 0 && i < numbones); return (mstudiobone_t*)(((byte*)this) + boneindex) + i; };
-	int					RemapSeqBone(int iSequence, int iLocalBone) const;	       
-	int					RemapAnimBone(int iAnim, int iLocalBone) const;		       
-	int					numbonecontrollers;		  
-	int					bonecontrollerindex;
-	inline mstudiobonecontroller_t* pBonecontroller(int i) const { Assert(i >= 0 && i < numbonecontrollers); return (mstudiobonecontroller_t*)(((byte*)this) + bonecontrollerindex) + i; };
-	int					numhitboxsets;
-	int					hitboxsetindex;
-
-	mstudiohitboxset_t* pHitboxSet(int i) const
-	{
-		Assert(i >= 0 && i < numhitboxsets);
-		return (mstudiohitboxset_t*)(((byte*)this) + hitboxsetindex) + i;
-	};
-
-	inline mstudiobbox_t* pHitbox(int i, int set) const
-	{
-		mstudiohitboxset_t const* s = pHitboxSet(set);
-		if (!s)
-			return NULL;
-
-		return s->pHitbox(i);
-	};
-
-	inline int			iHitboxCount(int set) const
-	{
-		mstudiohitboxset_t const* s = pHitboxSet(set);
-		if (!s)
-			return 0;
-
-		return s->numhitboxes;
-	};
-
-
-	int					numlocalanim;			 
-	int					localanimindex;		  
-	inline mstudioanimdesc_t* pLocalAnimdesc(int i) const { if (i < 0 || i >= numlocalanim) i = 0; return (mstudioanimdesc_t*)(((byte*)this) + localanimindex) + i; };
-
-	int					numlocalseq;				 
-	int					localseqindex;
-	inline mstudioseqdesc_t* pLocalSeqdesc(int i) const { if (i < 0 || i >= numlocalseq) i = 0; return (mstudioseqdesc_t*)(((byte*)this) + localseqindex) + i; };
-
-	bool				SequencesAvailable() const;
-	int					GetNumSeq() const;
-	mstudioanimdesc_t& pAnimdesc(int i) const;
-	mstudioseqdesc_t& pSeqdesc(int i) const;
-	int					iRelativeAnim(int baseseq, int relanim) const;	         
-	int					iRelativeSeq(int baseseq, int relseq) const;		         
-
-	mutable int			activitylistversion;	        
-	mutable int			eventsindexed;
-	int					GetSequenceActivity(int iSequence);
-	void				SetSequenceActivity(int iSequence, int iActivity);
-	int					GetActivityListVersion(void);
-	void				SetActivityListVersion(int version) const;
-	int					GetEventListVersion(void);
-	void				SetEventListVersion(int version);
-
-	int					numtextures;
-	int					textureindex;
-	inline mstudiotexture_t* pTexture(int i) const { Assert(i >= 0 && i < numtextures); return (mstudiotexture_t*)(((byte*)this) + textureindex) + i; };
-
-
-	int					numcdtextures;
-	int					cdtextureindex;
-	inline char* pCdtexture(int i) const { return (((char*)this) + *((int*)(((byte*)this) + cdtextureindex) + i)); };
-
-	int					numskinref;
-	int					numskinfamilies;
-	int					skinindex;
-	inline short* pSkinref(int i) const { return (short*)(((byte*)this) + skinindex) + i; };
-
-	int					numbodyparts;
-	int					bodypartindex;
-	inline mstudiobodyparts_t* pBodypart(int i) const { return (mstudiobodyparts_t*)(((byte*)this) + bodypartindex) + i; };
-
-	int					numlocalattachments;
-	int					localattachmentindex;
-	inline mstudioattachment_t* pLocalAttachment(int i) const { Assert(i >= 0 && i < numlocalattachments); return (mstudioattachment_t*)(((byte*)this) + localattachmentindex) + i; };
-	int					GetNumAttachments(void) const;
-	const mstudioattachment_t& pAttachment(int i) const;
-	int					GetAttachmentBone(int i);
-	void				SetAttachmentBone(int iAttachment, int iBone);
-
-	int					numlocalnodes;
-	int					localnodeindex;
-	int					localnodenameindex;
-	inline char* pszLocalNodeName(int iNode) const { Assert(iNode >= 0 && iNode < numlocalnodes); return (((char*)this) + *((int*)(((byte*)this) + localnodenameindex) + iNode)); }
-	inline byte* pLocalTransition(int i) const { Assert(i >= 0 && i < (numlocalnodes* numlocalnodes)); return (byte*)(((byte*)this) + localnodeindex) + i; };
-
-	int					EntryNode(int iSequence);
-	int					ExitNode(int iSequence);
-	char* pszNodeName(int iNode);
-	int					GetTransition(int iFrom, int iTo) const;
-
-	int					numflexdesc;
-	int					flexdescindex;
-	inline mstudioflexdesc_t* pFlexdesc(int i) const { Assert(i >= 0 && i < numflexdesc); return (mstudioflexdesc_t*)(((byte*)this) + flexdescindex) + i; };
-
-	int					numflexcontrollers;
-	int					flexcontrollerindex;
-	inline mstudioflexcontroller_t* pFlexcontroller(LocalFlexController_t i) const { Assert(numflexcontrollers == 0 || (i >= 0 && i < numflexcontrollers)); return (mstudioflexcontroller_t*)(((byte*)this) + flexcontrollerindex) + i; };
-
-	int					numflexrules;
-	int					flexruleindex;
-	inline mstudioflexrule_t* pFlexRule(int i) const { Assert(i >= 0 && i < numflexrules); return (mstudioflexrule_t*)(((byte*)this) + flexruleindex) + i; };
-
-	int					numikchains;
-	int					ikchainindex;
-	inline mstudioikchain_t* pIKChain(int i) const { Assert(i >= 0 && i < numikchains); return (mstudioikchain_t*)(((byte*)this) + ikchainindex) + i; };
-
-	int					nummouths;
-	int					mouthindex;
-	inline mstudiomouth_t* pMouth(int i) const { Assert(i >= 0 && i < nummouths); return (mstudiomouth_t*)(((byte*)this) + mouthindex) + i; };
-
-	int					numlocalposeparameters;
-	int					localposeparamindex;
-	inline mstudioposeparamdesc_t* pLocalPoseParameter(int i) const { Assert(i >= 0 && i < numlocalposeparameters); return (mstudioposeparamdesc_t*)(((byte*)this) + localposeparamindex) + i; };
-	int					GetNumPoseParameters(void) const;
-	const mstudioposeparamdesc_t& pPoseParameter(int i);
-	int					GetSharedPoseParameter(int iSequence, int iLocalPose) const;
-
-	int					surfacepropindex;
-	inline char* const pszSurfaceProp(void) const { return ((char*)this) + surfacepropindex; }
-
-	int					keyvalueindex;
-	int					keyvaluesize;
-	inline const char* KeyValueText(void) const { return keyvaluesize != 0 ? ((char*)this) + keyvalueindex : NULL; }
-
-	int					numlocalikautoplaylocks;
-	int					localikautoplaylockindex;
-	inline mstudioiklock_t* pLocalIKAutoplayLock(int i) const { Assert(i >= 0 && i < numlocalikautoplaylocks); return (mstudioiklock_t*)(((byte*)this) + localikautoplaylockindex) + i; };
-
-	int					GetNumIKAutoplayLocks(void) const;
-	const mstudioiklock_t& pIKAutoplayLock(int i);
-	int					CountAutoplaySequences() const;
-	int					CopyAutoplaySequences(unsigned short* pOut, int outCount) const;
-	int					GetAutoplayList(unsigned short** pOut) const;
-
-	float				mass;
-	int					contents;
-
-	int					numincludemodels;
-	int					includemodelindex;
-	inline mstudiomodelgroup_t* pModelGroup(int i) const { Assert(i >= 0 && i < numincludemodels); return (mstudiomodelgroup_t*)(((byte*)this) + includemodelindex) + i; };
-	const studiohdr_t* FindModel(void** cache, char const* modelname) const;
-
-	mutable void* virtualModel;
-	virtualmodel_t* GetVirtualModel(void) const;
-
-	int					szanimblocknameindex;
-	inline char* const pszAnimBlockName(void) const { return ((char*)this) + szanimblocknameindex; }
-	int					numanimblocks;
-	int					animblockindex;
-	inline mstudioanimblock_t* pAnimBlock(int i) const { Assert(i > 0 && i < numanimblocks); return (mstudioanimblock_t*)(((byte*)this) + animblockindex) + i; };
-	mutable void* animblockModel;
-	byte* GetAnimBlock(int i) const;
-
-	int					bonetablebynameindex;
-	inline const byte* GetBoneTableSortedByName() const { return (byte*)this + bonetablebynameindex; }
-
-	void* pVertexBase;
-	void* pIndexBase;
-
-	byte				constdirectionallightdot;
-
-	byte				rootLOD;
-
-	byte				numAllowedRootLODs;
-
-	byte				unused[1];
-
-	int					unused4;       
-
-	int					numflexcontrollerui;
-	int					flexcontrolleruiindex;
-	mstudioflexcontrollerui_t* pFlexControllerUI(int i) const { Assert(i >= 0 && i < numflexcontrollerui); return (mstudioflexcontrollerui_t*)(((byte*)this) + flexcontrolleruiindex) + i; }
-
-	float				flVertAnimFixedPointScale;
-	inline float		VertAnimFixedPointScale() const { return (flags & STUDIOHDR_FLAGS_VERT_ANIM_FIXED_POINT_SCALE) ? flVertAnimFixedPointScale : 1.0f / 4096.0f; }
-
-	int					unused3[1];
-
-	int					studiohdr2index;
-	studiohdr2_t* pStudioHdr2() const { return (studiohdr2_t*)(((byte*)this) + studiohdr2index); }
-
-	int					NumSrcBoneTransforms() const { return studiohdr2index ? pStudioHdr2()->numsrcbonetransform : 0; }
-	const mstudiosrcbonetransform_t* SrcBoneTransform(int i) const { Assert(i >= 0 && i < NumSrcBoneTransforms()); return (mstudiosrcbonetransform_t*)(((byte*)this) + pStudioHdr2()->srcbonetransformindex) + i; }
-
-	inline int			IllumPositionAttachmentIndex() const { return studiohdr2index ? pStudioHdr2()->IllumPositionAttachmentIndex() : 0; }
-
-	inline float		MaxEyeDeflection() const { return studiohdr2index ? pStudioHdr2()->MaxEyeDeflection() : 0.866f; }       
-
-	inline mstudiolinearbone_t* pLinearBones() const { return studiohdr2index ? pStudioHdr2()->pLinearBones() : NULL; }
-
-	inline int			BoneFlexDriverCount() const { return studiohdr2index ? pStudioHdr2()->m_nBoneFlexDriverCount : 0; }
-	inline const mstudioboneflexdriver_t* BoneFlexDriver(int i) const { Assert(i >= 0 && i < BoneFlexDriverCount()); return studiohdr2index ? pStudioHdr2()->pBoneFlexDriver(i) : NULL; }
-
-	int					unused2[1];
-
-	studiohdr_t() {}
-
-private:
-	studiohdr_t(const studiohdr_t& vOther);
-
-	friend struct virtualmodel_t;
-};
-
-
-
-class IDataCache;
-class IMDLCache;
-
-class CStudioHdr
-{
-public:
-	CStudioHdr(void);
-	CStudioHdr(const studiohdr_t* pStudioHdr, IMDLCache* mdlcache = NULL);
-	~CStudioHdr() { Term(); }
-
-	void Init(const studiohdr_t* pStudioHdr, IMDLCache* mdlcache = NULL);
-	void Term();
-
-public:
-	inline bool IsVirtual(void) { return (m_pVModel != NULL); };
-	inline bool IsValid(void) { return (m_pStudioHdr != NULL); };
-	inline bool IsReadyForAccess(void) const { return (m_pStudioHdr != NULL); };
-	inline virtualmodel_t* GetVirtualModel(void) const { return m_pVModel; };
-	inline const studiohdr_t* GetRenderHdr(void) const { return m_pStudioHdr; };
-	const studiohdr_t* pSeqStudioHdr(int sequence);
-	const studiohdr_t* pAnimStudioHdr(int animation);
-
-private:
-	mutable const studiohdr_t* m_pStudioHdr;
-	mutable virtualmodel_t* m_pVModel;
-
-	const virtualmodel_t* ResetVModel(const virtualmodel_t* pVModel) const;
-	const studiohdr_t* GroupStudioHdr(int group);
-	mutable CUtlVector< const studiohdr_t* > m_pStudioHdrCache;
-
-	mutable int			m_nFrameUnlockCounter;
-	int* m_pFrameUnlockCounter;
-	CThreadFastMutex	m_FrameUnlockCounterMutex;
-
-public:
-	inline int			numbones(void) const { return m_pStudioHdr->numbones; };
-	inline mstudiobone_t* pBone(int i) const { return m_pStudioHdr->pBone(i); };
-	int					RemapAnimBone(int iAnim, int iLocalBone) const;		       
-	int					RemapSeqBone(int iSequence, int iLocalBone) const;	       
-
-	bool				SequencesAvailable() const;
-	int					GetNumSeq(void) const;
-	mstudioanimdesc_t& pAnimdesc(int i);
-	mstudioseqdesc_t& pSeqdesc(int iSequence);
-	int					iRelativeAnim(int baseseq, int relanim) const;	         
-	int					iRelativeSeq(int baseseq, int relseq) const;		         
-
-	int					GetSequenceActivity(int iSequence);
-	void				SetSequenceActivity(int iSequence, int iActivity);
-	int					GetActivityListVersion(void);
-	void				SetActivityListVersion(int version);
-	int					GetEventListVersion(void);
-	void				SetEventListVersion(int version);
-
-	int					GetNumAttachments(void) const;
-	const mstudioattachment_t& pAttachment(int i);
-	int					GetAttachmentBone(int i);
-	void				SetAttachmentBone(int iAttachment, int iBone);
-
-	int					EntryNode(int iSequence);
-	int					ExitNode(int iSequence);
-	char* pszNodeName(int iNode);
-	int					GetTransition(int iFrom, int iTo) const;
-
-	int					GetNumPoseParameters(void) const;
-	const mstudioposeparamdesc_t& pPoseParameter(int i);
-	int					GetSharedPoseParameter(int iSequence, int iLocalPose) const;
-
-	int					GetNumIKAutoplayLocks(void) const;
-	const mstudioiklock_t& pIKAutoplayLock(int i);
-
-	inline int			CountAutoplaySequences() const { return m_pStudioHdr->CountAutoplaySequences(); };
-	inline int			CopyAutoplaySequences(unsigned short* pOut, int outCount) const { return m_pStudioHdr->CopyAutoplaySequences(pOut, outCount); };
-	inline int			GetAutoplayList(unsigned short** pOut) const { return m_pStudioHdr->GetAutoplayList(pOut); };
-
-	inline int			GetNumBoneControllers(void) const { return m_pStudioHdr->numbonecontrollers; };
-	inline mstudiobonecontroller_t* pBonecontroller(int i) const { return m_pStudioHdr->pBonecontroller(i); };
-
-	inline int			numikchains() const { return m_pStudioHdr->numikchains; };
-	inline int			GetNumIKChains(void) const { return m_pStudioHdr->numikchains; };
-	inline mstudioikchain_t* pIKChain(int i) const { return m_pStudioHdr->pIKChain(i); };
-
-	inline int			numflexrules() const { return m_pStudioHdr->numflexrules; };
-	inline mstudioflexrule_t* pFlexRule(int i) const { return m_pStudioHdr->pFlexRule(i); };
-
-	inline int			numflexdesc() const { return m_pStudioHdr->numflexdesc; };
-	inline mstudioflexdesc_t* pFlexdesc(int i) const { return m_pStudioHdr->pFlexdesc(i); };
-
-	inline LocalFlexController_t			numflexcontrollers() const { return (LocalFlexController_t)m_pStudioHdr->numflexcontrollers; };
-	inline mstudioflexcontroller_t* pFlexcontroller(LocalFlexController_t i) const { return m_pStudioHdr->pFlexcontroller(i); };
-
-	inline int			numflexcontrollerui() const { return m_pStudioHdr->numflexcontrollerui; };
-	inline mstudioflexcontrollerui_t* pFlexcontrollerUI(int i) const { return m_pStudioHdr->pFlexControllerUI(i); };
-
-	inline const char* pszName() const { return m_pStudioHdr->pszName(); };
-
-	inline int			numbonecontrollers() const { return m_pStudioHdr->numbonecontrollers; };
-
-	inline int			numhitboxsets() const { return m_pStudioHdr->numhitboxsets; };
-	inline mstudiohitboxset_t* pHitboxSet(int i) const { return m_pStudioHdr->pHitboxSet(i); };
-
-	inline mstudiobbox_t* pHitbox(int i, int set) const { return m_pStudioHdr->pHitbox(i, set); };
-	inline int			iHitboxCount(int set) const { return m_pStudioHdr->iHitboxCount(set); };
-
-	inline int			numbodyparts() const { return m_pStudioHdr->numbodyparts; };
-	inline mstudiobodyparts_t* pBodypart(int i) const { return m_pStudioHdr->pBodypart(i); };
-
-	inline int			numskinfamilies() const { return m_pStudioHdr->numskinfamilies; }
-
-	inline Vector		eyeposition() const { return m_pStudioHdr->eyeposition; };
-
-	inline int			flags() const { return m_pStudioHdr->flags; };
-
-	inline char* const pszSurfaceProp(void) const { return m_pStudioHdr->pszSurfaceProp(); };
-
-	inline float		mass() const { return m_pStudioHdr->mass; };
-	inline int			contents() const { return m_pStudioHdr->contents; }
-
-	inline const byte* GetBoneTableSortedByName() const { return m_pStudioHdr->GetBoneTableSortedByName(); };
-
-	inline Vector		illumposition() const { return m_pStudioHdr->illumposition; };
-
-	inline Vector		hull_min() const { return m_pStudioHdr->hull_min; };		    
-	inline Vector		hull_max() const { return m_pStudioHdr->hull_max; };
-
-	inline Vector		view_bbmin() const { return m_pStudioHdr->view_bbmin; };		   
-	inline Vector		view_bbmax() const { return m_pStudioHdr->view_bbmax; };
-
-	inline int			numtextures() const { return m_pStudioHdr->numtextures; };
-
-	inline int			IllumPositionAttachmentIndex() const { return m_pStudioHdr->IllumPositionAttachmentIndex(); }
-
-	inline float		MaxEyeDeflection() const { return m_pStudioHdr->MaxEyeDeflection(); }
-
-	inline mstudiolinearbone_t* pLinearBones() const { return m_pStudioHdr->pLinearBones(); }
-
-	inline int			BoneFlexDriverCount() const { return m_pStudioHdr->BoneFlexDriverCount(); }
-	inline const mstudioboneflexdriver_t* BoneFlexDriver(int i) const { return m_pStudioHdr->BoneFlexDriver(i); }
-
-	inline float		VertAnimFixedPointScale() const { return m_pStudioHdr->VertAnimFixedPointScale(); }
-
-public:
-	int IsSequenceLooping(int iSequence);
-	float GetSequenceCycleRate(int iSequence);
-
-	void				RunFlexRules(const float* src, float* dest);
-
-
-public:
-	inline int boneFlags(int iBone) const { return m_boneFlags[iBone]; }
-	inline int boneParent(int iBone) const { return m_boneParent[iBone]; }
-
-private:
-	CUtlVector< int >  m_boneFlags;
-	CUtlVector< int >  m_boneParent;
-
-public:
-
-	class CActivityToSequenceMapping   
-	{
-	public:
-		struct SequenceTuple
-		{
-			short		seqnum;
-			short		weight;           
-			CUtlSymbol* pActivityModifiers;		     
-			int			iNumActivityModifiers;
-		};
-
-		struct HashValueType
-		{
-			int activityIdx;
-
-			int startingIdx;
-			int count;
-			int totalWeight;
-
-			HashValueType(int _actIdx, int _stIdx, int _ct, int _tW) :
-				activityIdx(_actIdx), startingIdx(_stIdx), count(_ct), totalWeight(_tW) {}
-
-			HashValueType() : activityIdx(-1), startingIdx(-1), count(-1), totalWeight(-1)
-			{
-				AssertMsg(false, "Don't use default HashValueType()!");
-			}
-
-
-			class HashFuncs
-			{
-			public:
-				HashFuncs(int) {}
-
-				bool operator()(const HashValueType& lhs, const HashValueType& rhs) const
-				{
-					return lhs.activityIdx == rhs.activityIdx;
-				}
-
-				unsigned int operator()(const HashValueType& item) const
-				{
-					return HashInt(item.activityIdx);
-				}
-			};
-		};
-
-		typedef CUtlHash<HashValueType, HashValueType::HashFuncs, HashValueType::HashFuncs> ActivityToValueIdxHash;
-
-		CActivityToSequenceMapping(void)
-			: m_pSequenceTuples(NULL), m_iSequenceTuplesCount(0), m_ActToSeqHash(8, 0, 0), m_expectedPStudioHdr(NULL), m_expectedVModel(NULL)
-#if STUDIO_SEQUENCE_ACTIVITY_LAZY_INITIALIZE
-			, m_bIsInitialized(false)
-#endif
-		{};
-
-		~CActivityToSequenceMapping()
-		{
-			if (m_pSequenceTuples != NULL)
-			{
-				if (m_pSequenceTuples->pActivityModifiers != NULL)
-				{
-					delete[] m_pSequenceTuples->pActivityModifiers;
-				}
-				delete[] m_pSequenceTuples;
-			}
-		}
-
-		const SequenceTuple* GetSequences(int forActivity, int* outSequenceCount, int* outTotalWeight);
-
-		int NumSequencesForActivity(int forActivity);
-
-#if STUDIO_SEQUENCE_ACTIVITY_LAZY_INITIALIZE
-		inline bool IsInitialized(void) { return m_bIsInitialized; }
-#endif
-
-	private:
-
-		void Initialize(CStudioHdr* pstudiohdr);
-
-		void Reinitialize(CStudioHdr* pstudiohdr);
-
-		int SelectWeightedSequence(CStudioHdr* pstudiohdr, int activity, int curSequence);
-
-		int SelectWeightedSequenceFromModifiers(CStudioHdr* pstudiohdr, int activity, CUtlSymbol* pActivityModifiers, int iModifierCount);
-
-		SequenceTuple* m_pSequenceTuples;
-		unsigned int m_iSequenceTuplesCount;      
-#if STUDIO_SEQUENCE_ACTIVITY_LAZY_INITIALIZE
-		bool m_bIsInitialized;
-#endif
-
-		ActivityToValueIdxHash m_ActToSeqHash;
-
-		const void* m_expectedPStudioHdr;
-		const void* m_expectedVModel;
-
-		bool ValidateAgainst(const CStudioHdr* RESTRICT pstudiohdr);
-		void SetValidationPair(const CStudioHdr* RESTRICT pstudiohdr);
-
-		friend class CStudioHdr;
-	};
-
-	CActivityToSequenceMapping m_ActivityToSequence;
-
-	inline int SelectWeightedSequence(int activity, int curSequence)
-	{
-#if STUDIO_SEQUENCE_ACTIVITY_LAZY_INITIALIZE
-		if (!m_ActivityToSequence.IsInitialized())
-		{
-			m_ActivityToSequence.Initialize(this);
-		}
-#endif
-		return m_ActivityToSequence.SelectWeightedSequence(this, activity, curSequence);
-	}
-
-	inline int SelectWeightedSequenceFromModifiers(int activity, CUtlSymbol* pActivityModifiers, int iModifierCount)
-	{
-#if STUDIO_SEQUENCE_ACTIVITY_LAZY_INITIALIZE
-		if (!m_ActivityToSequence.IsInitialized())
-		{
-			m_ActivityToSequence.Initialize(this);
-		}
-#endif
-		return m_ActivityToSequence.SelectWeightedSequenceFromModifiers(this, activity, pActivityModifiers, iModifierCount);
-	}
-
-	inline bool HaveSequenceForActivity(int activity)
-	{
-#if STUDIO_SEQUENCE_ACTIVITY_LAZY_INITIALIZE
-		if (!m_ActivityToSequence.IsInitialized())
-		{
-			m_ActivityToSequence.Initialize(this);
-		}
-#endif
-		return (m_ActivityToSequence.NumSequencesForActivity(activity) > 0);
-	}
-
-	inline void ReinitializeSequenceMapping(void)
-	{
-		m_ActivityToSequence.Reinitialize(this);
-	}
-
-#ifdef STUDIO_ENABLE_PERF_COUNTERS
-public:
-	inline void			ClearPerfCounters(void)
-	{
-		m_nPerfAnimatedBones = 0;
-		m_nPerfUsedBones = 0;
-		m_nPerfAnimationLayers = 0;
-	};
-
-	mutable	int			m_nPerfAnimatedBones;
-	mutable	int			m_nPerfUsedBones;
-	mutable	int			m_nPerfAnimationLayers;
-#endif
-
-
-};
-
-struct flexweight_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					key;
-	float				weight;
-	float				influence;
-};
-
-struct flexsetting_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					nameindex;
-
-	inline char* pszName(void) const
-	{
-		return (char*)(((byte*)this) + nameindex);
-	}
-
-	int					obsolete1;
-
-	int					numsettings;
-	int					index;
-
-	int					obsolete2;
-
-	int					settingindex;
-
-	inline int psetting(byte* base, int i, flexweight_t** weights) const;
-};
-
-
-struct flexsettinghdr_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	int					id;
-	int					version;
-
-	inline const char* pszName(void) const { return name; }
-	char				name[64];
-	int					length;
-
-	int					numflexsettings;
-	int					flexsettingindex;
-	inline flexsetting_t* pSetting(int i) const { return (flexsetting_t*)(((byte*)this) + flexsettingindex) + i; };
-	int					nameindex;
-
-	int					numindexes;
-	int					indexindex;
-
-	inline flexsetting_t* pIndexedSetting(int index) const
-	{
-		if (index < 0 || index >= numindexes)
-		{
-			return NULL;
-		}
-
-		int i = *((int*)(((byte*)this) + indexindex) + index);
-
-		if (i == -1)
-		{
-			return NULL;
-		}
-
-		return pSetting(i);
-	}
-
-	int					numkeys;
-	int					keynameindex;
-	inline char* pLocalName(int i) const { return (char*)(((byte*)this) + *((int*)(((byte*)this) + keynameindex) + i)); };
-
-	int					keymappingindex;
-	inline int* pLocalToGlobal(int i) const { return (int*)(((byte*)this) + keymappingindex) + i; };
-	inline int			LocalToGlobal(int i) const { return *pLocalToGlobal(i); };
-};
-
-inline int flexsetting_t::psetting(byte* base, int i, flexweight_t** weights) const
-{
-	*weights = (flexweight_t*)(((byte*)this) + settingindex) + i;
-	return numsettings;
-};
-
-
-inline int mstudioflexcontrollerui_t::controllerIndex(const CStudioHdr& cStudioHdr) const
-{
-	return !stereo ? pController() - cStudioHdr.pFlexcontroller((LocalFlexController_t)0) : -1;
-}
-
-
-inline int mstudioflexcontrollerui_t::rightIndex(const CStudioHdr& cStudioHdr) const
-{
-	return stereo ? pRightController() - cStudioHdr.pFlexcontroller((LocalFlexController_t)0) : -1;
-}
-
-
-inline int mstudioflexcontrollerui_t::leftIndex(const CStudioHdr& cStudioHdr) const
-{
-	return stereo ? pLeftController() - cStudioHdr.pFlexcontroller((LocalFlexController_t)0) : -1;
-}
-
-
-inline int mstudioflexcontrollerui_t::nWayValueIndex(const CStudioHdr& cStudioHdr) const
-{
-	return remaptype == FLEXCONTROLLER_REMAP_NWAY ? pNWayValueController() - cStudioHdr.pFlexcontroller((LocalFlexController_t)0) : -1;
-}
-
-
-inline const mstudioflexcontroller_t* mstudioflexcontrollerui_t::pController(int index) const
-{
-	if (index < 0 || index > Count())
-		return NULL;
-
-	if (remaptype == FLEXCONTROLLER_REMAP_NWAY)
-	{
-		if (stereo)
-			return (mstudioflexcontroller_t*)((char*)this) + *(&szindex0 + index);
-
-		if (index == 0)
-			return pController();
-
-		if (index == 1)
-			return pNWayValueController();
-
-		return NULL;
-	}
-
-	if (index > 1)
-		return NULL;
-
-	if (stereo)
-		return (mstudioflexcontroller_t*)((char*)this) + *(&szindex0 + index);
-
-	if (index > 0)
-		return NULL;
-
-	return pController();
-}
-
-
-#define STUDIO_CONST	1	  
-#define STUDIO_FETCH1	2	   
-#define STUDIO_FETCH2	3	   
-#define STUDIO_ADD		4
-#define STUDIO_SUB		5
-#define STUDIO_MUL		6
-#define STUDIO_DIV		7
-#define STUDIO_NEG		8	  
-#define STUDIO_EXP		9	  
-#define STUDIO_OPEN		10	     
-#define STUDIO_CLOSE	11
-#define STUDIO_COMMA	12	     
-#define STUDIO_MAX		13
-#define STUDIO_MIN		14
-#define STUDIO_2WAY_0	15	                  
-#define STUDIO_2WAY_1	16	                  
-#define STUDIO_NWAY		17	                  
-#define STUDIO_COMBO	18	             
-#define STUDIO_DOMINATE	19	     
-#define STUDIO_DME_LOWER_EYELID 20	 
-#define STUDIO_DME_UPPER_EYELID 21	 
-
-#define STUDIO_X		0x00000001
-#define STUDIO_Y		0x00000002	
-#define STUDIO_Z		0x00000004
-#define STUDIO_XR		0x00000008
-#define STUDIO_YR		0x00000010
-#define STUDIO_ZR		0x00000020
-
-#define STUDIO_LX		0x00000040
-#define STUDIO_LY		0x00000080
-#define STUDIO_LZ		0x00000100
-#define STUDIO_LXR		0x00000200
-#define STUDIO_LYR		0x00000400
-#define STUDIO_LZR		0x00000800
-
-#define STUDIO_LINEAR	0x00001000
-
-#define STUDIO_TYPES	0x0003FFFF
-#define STUDIO_RLOOP	0x00040000	     
-
-#define STUDIO_LOOPING	0x0001		          
-#define STUDIO_SNAP		0x0002		         
-#define STUDIO_DELTA	0x0004		          
-#define STUDIO_AUTOPLAY	0x0008		         
-#define STUDIO_POST		0x0010		 
-#define STUDIO_ALLZEROS	0x0020		       
-#define STUDIO_CYCLEPOSE 0x0080		         
-#define STUDIO_REALTIME	0x0100		             
-#define STUDIO_LOCAL	0x0200		      
-#define STUDIO_HIDDEN	0x0400		      
-#define STUDIO_OVERRIDE	0x0800		     
-#define STUDIO_ACTIVITY	0x1000		        
-#define STUDIO_EVENT	0x2000		        
-#define STUDIO_WORLD	0x4000		    
-#define STUDIO_AL_POST		0x0010		 
-#define STUDIO_AL_SPLINE	0x0040		           
-#define STUDIO_AL_XFADE		0x0080		                   
-#define STUDIO_AL_NOBLEND	0x0200		       
-#define STUDIO_AL_LOCAL		0x1000		      
-#define STUDIO_AL_POSE		0x4000		          
-
-
-inline bool Studio_ConvertStudioHdrToNewVersion(studiohdr_t* pStudioHdr)
-{
-	COMPILE_TIME_ASSERT(STUDIO_VERSION == 48);              
-
-	int version = pStudioHdr->version;
-	if (version == STUDIO_VERSION)
-		return true;
-
-	bool bResult = true;
-	if (version < 46)
-	{
-		for (int i = 0; i < pStudioHdr->numlocalanim; i++)
-		{
-			mstudioanimdesc_t* pAnim = (mstudioanimdesc_t*)pStudioHdr->pLocalAnimdesc(i);
-
-			if (pAnim->sectionframes != 0)
-			{
-				memset(&(pAnim->numframes), 0, (byte*)(pAnim + 1) - (byte*)&(pAnim->numframes));
-
-				pAnim->numframes = 1;
-				pAnim->animblock = -1;    
-				bResult = false;
-			}
-		}
-	}
-
-	if (version < 47)
-	{
-		if (pStudioHdr->unused4 != 0)
-		{
-			pStudioHdr->unused4 = 0;
-			bResult = false;
-		}
-		for (int i = 0; i < pStudioHdr->numlocalanim; i++)
-		{
-			mstudioanimdesc_t* pAnim = (mstudioanimdesc_t*)pStudioHdr->pLocalAnimdesc(i);
-			pAnim->zeroframeindex = 0;
-			pAnim->zeroframespan = 0;
-		}
-	}
-	else if (version == 47)
-	{
-		for (int i = 0; i < pStudioHdr->numlocalanim; i++)
-		{
-			mstudioanimdesc_t* pAnim = (mstudioanimdesc_t*)pStudioHdr->pLocalAnimdesc(i);
-			if (pAnim->zeroframeindex != 0)
-			{
-				pAnim->zeroframeindex = 0;
-				pAnim->zeroframespan = 0;
-				bResult = false;
-			}
-		}
-	}
-
-	pStudioHdr->version = STUDIO_VERSION;
-
-	return bResult;
-}
-
-inline void Studio_SetRootLOD(studiohdr_t* pStudioHdr, int rootLOD)
-{
-	if (pStudioHdr->numAllowedRootLODs > 0 &&
-		rootLOD >= pStudioHdr->numAllowedRootLODs)
-	{
-		rootLOD = pStudioHdr->numAllowedRootLODs - 1;
-	}
-
-	Assert(rootLOD >= 0 && rootLOD < MAX_NUM_LODS);
-	Clamp(rootLOD, 0, MAX_NUM_LODS - 1);
-
-	int vertexindex = 0;
-	int tangentsindex = 0;
-	int bodyPartID;
-	for (bodyPartID = 0; bodyPartID < pStudioHdr->numbodyparts; bodyPartID++)
-	{
-		mstudiobodyparts_t* pBodyPart = pStudioHdr->pBodypart(bodyPartID);
-		int modelID;
-		for (modelID = 0; modelID < pBodyPart->nummodels; modelID++)
-		{
-			mstudiomodel_t* pModel = pBodyPart->pModel(modelID);
-			int totalMeshVertexes = 0;
-			int meshID;
-			for (meshID = 0; meshID < pModel->nummeshes; meshID++)
-			{
-				mstudiomesh_t* pMesh = pModel->pMesh(meshID);
-
-				pMesh->numvertices = pMesh->vertexdata.numLODVertexes[rootLOD];
-				pMesh->vertexoffset = totalMeshVertexes;
-				totalMeshVertexes += pMesh->numvertices;
-			}
-
-			pModel->numvertices = totalMeshVertexes;
-			pModel->vertexindex = vertexindex;
-			pModel->tangentsindex = tangentsindex;
-
-			vertexindex += totalMeshVertexes * sizeof(mstudiovertex_t);
-			tangentsindex += totalMeshVertexes * sizeof(Vector4D);
-		}
-	}
-
-	pStudioHdr->rootLOD = rootLOD;
-}
-
-inline int Studio_VertexDataSize(const vertexFileHeader_t* pVvdHdr, int rootLOD, bool bNeedsTangentS)
-{
-	int numVertexes = pVvdHdr->numLODVertexes[rootLOD] + 1;
-	int dataLength = pVvdHdr->vertexDataStart + numVertexes * sizeof(mstudiovertex_t);
-	if (bNeedsTangentS)
-	{
-		dataLength += numVertexes * sizeof(Vector4D);
-	}
-
-	return dataLength;
-}
-
-inline int Studio_LoadVertexes(const vertexFileHeader_t* pTempVvdHdr, vertexFileHeader_t* pNewVvdHdr, int rootLOD, bool bNeedsTangentS)
-{
-	int					i;
-	int					target;
-	int					numVertexes;
-	vertexFileFixup_t* pFixupTable;
-
-	numVertexes = pTempVvdHdr->numLODVertexes[rootLOD];
-
-	memcpy((void*)pNewVvdHdr, (void*)pTempVvdHdr, pTempVvdHdr->vertexDataStart);
-
-	for (i = 0; i < rootLOD; i++)
-	{
-		pNewVvdHdr->numLODVertexes[i] = pNewVvdHdr->numLODVertexes[rootLOD];
-	}
-
-	if (bNeedsTangentS)
-	{
-		pNewVvdHdr->tangentDataStart = pNewVvdHdr->vertexDataStart + numVertexes * sizeof(mstudiovertex_t);
-	}
-	else
-	{
-		pNewVvdHdr->tangentDataStart = 0;
-	}
-
-	if (!pNewVvdHdr->numFixups)
-	{
-		memcpy(
-			(byte*)pNewVvdHdr + pNewVvdHdr->vertexDataStart,
-			(byte*)pTempVvdHdr + pTempVvdHdr->vertexDataStart,
-			numVertexes * sizeof(mstudiovertex_t));
-
-		if (bNeedsTangentS)
-		{
-			memcpy(
-				(byte*)pNewVvdHdr + pNewVvdHdr->tangentDataStart,
-				(byte*)pTempVvdHdr + pTempVvdHdr->tangentDataStart,
-				numVertexes * sizeof(Vector4D));
-		}
-
-		return numVertexes;
-	}
-
-	target = 0;
-	pFixupTable = (vertexFileFixup_t*)((byte*)pTempVvdHdr + pTempVvdHdr->fixupTableStart);
-	for (i = 0; i < pTempVvdHdr->numFixups; i++)
-	{
-		if (pFixupTable[i].lod < rootLOD)
-		{
-			continue;
-		}
-
-		memcpy(
-			(mstudiovertex_t*)((byte*)pNewVvdHdr + pNewVvdHdr->vertexDataStart) + target,
-			(mstudiovertex_t*)((byte*)pTempVvdHdr + pTempVvdHdr->vertexDataStart) + pFixupTable[i].sourceVertexID,
-			pFixupTable[i].numVertexes * sizeof(mstudiovertex_t));
-
-		if (bNeedsTangentS)
-		{
-			memcpy(
-				(Vector4D*)((byte*)pNewVvdHdr + pNewVvdHdr->tangentDataStart) + target,
-				(Vector4D*)((byte*)pTempVvdHdr + pTempVvdHdr->tangentDataStart) + pFixupTable[i].sourceVertexID,
-				pFixupTable[i].numVertexes * sizeof(Vector4D));
-		}
-
-		target += pFixupTable[i].numVertexes;
-	}
-
-	pNewVvdHdr->numFixups = 0;
-
-	return target;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/tempentity.h b/SpyCustom/tempentity.h
deleted file mode 100644
index 1d22f57..0000000
--- a/SpyCustom/tempentity.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef TEMPENTITY_H
-#define TEMPENTITY_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define TE_EXPLFLAG_NONE        0x0        
-#define TE_EXPLFLAG_NOADDITIVE  0x1                
-#define TE_EXPLFLAG_DLIGHT      0x2     
-#define TE_EXPLFLAG_NOSOUND     0x4       
-#define TE_EXPLFLAG_NOPARTICLES 0x8     
-#define TE_EXPLFLAG_DRAWALPHA   0x10         
-#define TE_EXPLFLAG_ROTATE      0x20        
-#define TE_EXPLFLAG_NOFIREBALL  0x40         
-#define TE_EXPLFLAG_NOFIREBALLSMOKE 0x80           
-#define TE_EXPLFLAG_ICE         0x100      
-#define TE_EXPLFLAG_SCALEPARTICLES      0x200
-
-#define TE_BEAMPOINTS       0            
-#define TE_SPRITE           1        
-#define TE_BEAMDISK         2           
-#define TE_BEAMCYLINDER     3               
-#define TE_BEAMFOLLOW       4                  
-#define TE_BEAMRING         5              
-#define TE_BEAMSPLINE       6       
-#define TE_BEAMRINGPOINT    7
-#define TE_BEAMLASER        8           
-#define TE_BEAMTESLA        9
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/textinputcombobox.cpp b/SpyCustom/textinputcombobox.cpp
deleted file mode 100644
index ad12b8c..0000000
--- a/SpyCustom/textinputcombobox.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-#include "imgui/imgui.h"
-#include "imgui/imgui_internal.h"
-#include <string>
-#include <vector>
-
-extern ImFont* ifontmini;
-extern ImFont* ifont;
-
-
-
-namespace ImGui {
-
-	bool identical(const char* buf, const char* item) {
-		size_t buf_size = strlen(buf);
-		size_t item_size = strlen(item);
-		if (buf_size >= item_size) return false;
-		for (int i = 0; i < strlen(buf); ++i)
-			if (buf[i] != item[i]) return false;
-		return true;
-	};
-
-	int propose(ImGuiInputTextCallbackData* data) {
-		if (strlen(data->Buf) == 0) return 0;
-
-		const char** items = static_cast<std::pair<const char**, size_t>*> (data->UserData)->first;
-		size_t length = static_cast<std::pair<const char**, size_t>*> (data->UserData)->second;
-
-		if (IsKeyPressedMap(ImGuiKey_Backspace)) {     
-			if (data->SelectionEnd != data->SelectionStart)
-				if (data->BufTextLen > 0)     			
-					if (data->CursorPos > 0)       
-						data->DeleteChars(data->CursorPos - 1, 1);
-			return 0;
-		}
-		if (IsKeyPressedMap(ImGuiKey_Delete)) return 0;     
-
-
-
-		for (int i = 0; i < length; i++) {
-			if (identical(data->Buf, items[i])) {
-				const int cursor = data->CursorPos;
-				data->DeleteChars(0, data->BufTextLen);
-				data->InsertChars(0, items[i]);
-				data->CursorPos = cursor;
-				data->SelectionStart = cursor;
-				data->SelectionEnd = data->BufTextLen;
-				break;
-			}
-		}
-		return 0;
-	}
-
-
-
-	bool TextInputComboBox(const char* id, char* buffer, size_t maxInputSize, const char* items[], size_t item_len, short showMaxItems) {
-		if (showMaxItems == 0)
-			showMaxItems = item_len;
-
-		ImGui::PushID(id);
-		std::pair<const char**, size_t> pass(items, item_len);         
-
-		bool ret = ImGui::InputText("##in", buffer, maxInputSize, 0, 0, 0);
-
-		ImGui::OpenPopupOnItemClick("combobox");  
-		ImVec2 pos = ImGui::GetItemRectMin();
-		ImVec2 size = ImGui::GetItemRectSize();
-
-		ImGui::SameLine(0, 0);
-		if (ImGui::ArrowButton("##openCombo", ImGuiDir_Down)) {
-			ImGui::OpenPopup("combobox");
-		}
-		ImGui::OpenPopupOnItemClick("combobox");  
-
-		pos.y += size.y;
-		size.x += ImGui::GetItemRectSize().x;
-		size.y += 5 + (size.y * showMaxItems);
-		ImGui::SetNextWindowPos(pos);
-		ImGui::SetNextWindowSize(size);
-
-		ImGuiStyle* style = &ImGui::GetStyle();
-		ImGui::PushFont(ifontmini);
-		style->ItemSpacing = ImVec2(7.0f, 2.0f); 
-		style->WindowPadding = ImVec2(5.0f, 5.0f);
-
-		if (ImGui::BeginPopup("combobox", ImGuiWindowFlags_::ImGuiWindowFlags_NoMove)) {
-
-
-			for (int i = 0; i < item_len; i++)
-				if (ImGui::Selectable(items[i]))
-					strcpy(buffer, items[i]);
-
-
-
-
-			ImGui::EndPopup();
-		}
-
-		style->WindowPadding = ImVec2(20.f, 20.0f);
-		style->ItemSpacing = ImVec2(7.0f, 15.0f); 
-		ImGui::PushFont(ifont);
-
-		ImGui::PopID();
-
-		ImGui::SameLine(0, ImGui::GetStyle().ItemInnerSpacing.x);
-		return ret;
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	bool TextInputComboBox(const char* id, char* buffer, size_t maxInputSize, std::vector<std::string> items, short showMaxItems) {
-
-		const ImVec2 label_size = CalcTextSize(id, NULL, true);
-		if (label_size.x > 0) {
-			ImVec2 savecursor = ImGui::GetCursorPos(); 
-			ImVec2 newcursor = savecursor;
-			savecursor.y += 20.0f;
-			ImGui::SetCursorPos(newcursor);
-			ImGui::TextEx(id);
-			ImGui::SetCursorPos(savecursor);
-		}
-
-		size_t item_len = items.size();
-
-		if (showMaxItems == 0)
-			showMaxItems = item_len;
-
-		ImGui::PushID(id);
-		std::pair<std::vector<std::string>, size_t> pass(items, item_len);         
-
-		ImGuiStyle* style = &ImGui::GetStyle();
-
-		const ImVec2 frame_size = CalcItemSize(ImVec2(0, 0), CalcItemWidth(),  label_size.y + style->FramePadding.y * 2.0f);         
-
-		ImGui::SetNextItemWidth(frame_size.x - 19.0f);
-
-		bool ret = ImGui::InputText("##in", buffer, maxInputSize, 0, 0, 0);
-
-		ImGui::OpenPopupOnItemClick("combobox");  
-		ImVec2 pos = ImGui::GetItemRectMin();
-		ImVec2 size = ImGui::GetItemRectSize();
-
-		ImGui::SameLine(0, 0);
-		ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 5.0f);
-		if (ImGui::ArrowButton("##openCombo", ImGuiDir_Down)) {
-			ImGui::OpenPopup("combobox");
-		}
-		ImGui::OpenPopupOnItemClick("combobox");  
-
-		pos.y += size.y;
-
-
-		ImGui::SetNextWindowPos(pos);
-		size.x += 15.0f;
-		ImGui::SetNextWindowSizeConstraints(size, ImVec2(400.0f, 200.0f));
-
-		ImGui::PushFont(ifontmini);
-		style->ItemSpacing = ImVec2(7.0f, 2.0f); 
-		style->WindowPadding = ImVec2(5.0f, 5.0f);
-
-		if (ImGui::BeginPopup("combobox", ImGuiWindowFlags_::ImGuiWindowFlags_NoMove)) {
-
-			for (int i = 0; i < item_len; i++)
-				if (ImGui::Selectable(items[i].c_str()))
-					strcpy(buffer, items[i].c_str());
-			ImGui::EndPopup();
-		}
-
-		style->WindowPadding = ImVec2(20.f, 20.0f);
-		style->ItemSpacing = ImVec2(7.0f, 15.0f); 
-		ImGui::PushFont(ifont);
-
-		ImGui::PopID();
-
-
-		return ret;
-	}
-
-
-
-
-
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/SpyCustom/texture_group_names.h b/SpyCustom/texture_group_names.h
deleted file mode 100644
index b289143..0000000
--- a/SpyCustom/texture_group_names.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef TEXTURE_GROUP_NAMES_H
-#define TEXTURE_GROUP_NAMES_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#define TEXTURE_GROUP_LIGHTMAP						"Lightmaps"
-#define TEXTURE_GROUP_WORLD							"World textures"
-#define TEXTURE_GROUP_MODEL							"Model textures"
-#define TEXTURE_GROUP_VGUI							"VGUI textures"
-#define TEXTURE_GROUP_PARTICLE						"Particle textures"
-#define TEXTURE_GROUP_DECAL							"Decal textures"
-#define TEXTURE_GROUP_SKYBOX						"SkyBox textures"
-#define TEXTURE_GROUP_CLIENT_EFFECTS				"ClientEffect textures"
-#define TEXTURE_GROUP_OTHER							"Other textures"
-#define TEXTURE_GROUP_PRECACHED						"Precached"				        
-#define TEXTURE_GROUP_CUBE_MAP						"CubeMap textures"
-#define TEXTURE_GROUP_RENDER_TARGET					"RenderTargets"
-#define TEXTURE_GROUP_RUNTIME_COMPOSITE				"Runtime Composite"
-#define TEXTURE_GROUP_UNACCOUNTED					"Unaccounted textures"	       
-#define TEXTURE_GROUP_STATIC_INDEX_BUFFER			"Static Indices"
-#define TEXTURE_GROUP_STATIC_VERTEX_BUFFER_DISP		"Displacement Verts"
-#define TEXTURE_GROUP_STATIC_VERTEX_BUFFER_COLOR	"Lighting Verts"
-#define TEXTURE_GROUP_STATIC_VERTEX_BUFFER_WORLD	"World Verts"
-#define TEXTURE_GROUP_STATIC_VERTEX_BUFFER_MODELS	"Model Verts"
-#define TEXTURE_GROUP_STATIC_VERTEX_BUFFER_OTHER	"Other Verts"
-#define TEXTURE_GROUP_DYNAMIC_INDEX_BUFFER			"Dynamic Indices"
-#define TEXTURE_GROUP_DYNAMIC_VERTEX_BUFFER			"Dynamic Verts"
-#define TEXTURE_GROUP_DEPTH_BUFFER					"DepthBuffer"
-#define TEXTURE_GROUP_VIEW_MODEL					"ViewModel"
-#define TEXTURE_GROUP_PIXEL_SHADERS					"Pixel Shaders"
-#define TEXTURE_GROUP_VERTEX_SHADERS				"Vertex Shaders"
-#define TEXTURE_GROUP_RENDER_TARGET_SURFACE			"RenderTarget Surfaces"
-#define TEXTURE_GROUP_MORPH_TARGETS					"Morph Targets"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/threadtools.h b/SpyCustom/threadtools.h
deleted file mode 100644
index 54bcc93..0000000
--- a/SpyCustom/threadtools.h
+++ /dev/null
@@ -1,1402 +0,0 @@
-#ifndef THREADTOOLS_H
-#define THREADTOOLS_H
-
-#include <limits.h>
-
-#include "platform.h"
-#include "dbg.h"
-#include "vcrmode.h"
-
-#ifdef PLATFORM_WINDOWS_PC
-#include <intrin.h>
-#endif
-
-#ifdef POSIX
-#include <pthread.h>
-#include <errno.h>
-#define WAIT_OBJECT_0 0
-#define WAIT_TIMEOUT 0x00000102
-#define WAIT_FAILED -1
-#define THREAD_PRIORITY_HIGHEST 2
-#endif
-
-#if defined( _WIN32 )
-#pragma once
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
-#ifndef _RETAIL
-#define THREAD_MUTEX_TRACING_SUPPORTED
-#if defined(_WIN32) && defined(_DEBUG)
-#define THREAD_MUTEX_TRACING_ENABLED
-#endif
-#endif
-
-#ifdef _WIN32
-typedef void* HANDLE;
-#endif
-
-const unsigned TT_INFINITE = 0xffffffff;
-
-#ifndef NO_THREAD_LOCAL
-
-#ifndef THREAD_LOCAL
-#ifdef _WIN32
-#define THREAD_LOCAL __declspec(thread)
-#elif POSIX
-#define THREAD_LOCAL __thread
-#endif
-#endif
-
-#endif  
-
-typedef unsigned long ThreadId_t;
-
-FORWARD_DECLARE_HANDLE(ThreadHandle_t);
-typedef unsigned (*ThreadFunc_t)(void* pParam);
-
-PLATFORM_OVERLOAD ThreadHandle_t CreateSimpleThread(ThreadFunc_t, void* pParam, ThreadId_t* pID, unsigned stackSize = 0);
-PLATFORM_INTERFACE ThreadHandle_t CreateSimpleThread(ThreadFunc_t, void* pParam, unsigned stackSize = 0);
-PLATFORM_INTERFACE bool ReleaseThreadHandle(ThreadHandle_t);
-
-
-PLATFORM_INTERFACE void ThreadSleep(unsigned duration = 0);
-PLATFORM_INTERFACE uint ThreadGetCurrentId();
-PLATFORM_INTERFACE ThreadHandle_t ThreadGetCurrentHandle();
-PLATFORM_INTERFACE int ThreadGetPriority(ThreadHandle_t hThread = NULL);
-PLATFORM_INTERFACE bool ThreadSetPriority(ThreadHandle_t hThread, int priority);
-inline		 bool ThreadSetPriority(int priority) { return ThreadSetPriority(NULL, priority); }
-PLATFORM_INTERFACE bool ThreadInMainThread();
-PLATFORM_INTERFACE void DeclareCurrentThreadIsMainThread();
-
-typedef int (*ThreadedLoadLibraryFunc_t)();
-PLATFORM_INTERFACE void SetThreadedLoadLibraryFunc(ThreadedLoadLibraryFunc_t func);
-PLATFORM_INTERFACE ThreadedLoadLibraryFunc_t GetThreadedLoadLibraryFunc();
-
-#if defined( _WIN32 ) && !defined( _WIN64 ) && !defined( _X360 )
-extern "C" unsigned long __declspec(dllimport) __stdcall GetCurrentThreadId();
-#define ThreadGetCurrentId GetCurrentThreadId
-#endif
-
-inline void ThreadPause()
-{
-#if defined( PLATFORM_WINDOWS_PC )
-	_mm_pause();
-#elif POSIX
-	__asm __volatile("pause");
-#elif defined( _X360 )
-#else
-#error "implement me"
-#endif
-}
-
-PLATFORM_INTERFACE bool ThreadJoin(ThreadHandle_t, unsigned timeout = TT_INFINITE);
-PLATFORM_INTERFACE void ThreadDetach(ThreadHandle_t);
-
-PLATFORM_INTERFACE void ThreadSetDebugName(ThreadId_t id, const char* pszName);
-inline		 void ThreadSetDebugName(const char* pszName) { ThreadSetDebugName((ThreadId_t)-1, pszName); }
-
-PLATFORM_INTERFACE void ThreadSetAffinity(ThreadHandle_t hThread, int nAffinityMask);
-
-enum ThreadWaitResult_t
-{
-	TW_FAILED = 0xffffffff,  
-	TW_TIMEOUT = 0x00000102,  
-};
-
-#ifdef _WIN32
-PLATFORM_INTERFACE int ThreadWaitForObjects(int nEvents, const HANDLE* pHandles, bool bWaitAll = true, unsigned timeout = TT_INFINITE);
-inline int ThreadWaitForObject(HANDLE handle, bool bWaitAll = true, unsigned timeout = TT_INFINITE) { return ThreadWaitForObjects(1, &handle, bWaitAll, timeout); }
-#endif
-
-#ifdef _WIN32
-#define NOINLINE
-#elif POSIX
-#define NOINLINE __attribute__ ((noinline))
-#endif
-
-#if defined( _X360 ) || defined( _PS3 )
-#define ThreadMemoryBarrier() __lwsync()
-
-#elif defined(_MSC_VER)
-#if _MSC_VER < 1500
-#pragma intrinsic(_ReadWriteBarrier)
-#endif
-#define ThreadMemoryBarrier() _ReadWriteBarrier()
-#elif defined(GNUC)
-#define ThreadMemoryBarrier() asm volatile("" ::: "memory")
-#else
-#error Every platform needs to define ThreadMemoryBarrier to at least prevent compiler reordering
-#endif
-
-#if defined(_WIN32) && !defined(_X360)
-#if ( _MSC_VER >= 1310 )
-#define USE_INTRINSIC_INTERLOCKED
-#endif
-#endif
-
-#ifdef USE_INTRINSIC_INTERLOCKED
-extern "C"
-{
-	long __cdecl _InterlockedIncrement(volatile long*);
-	long __cdecl _InterlockedDecrement(volatile long*);
-	long __cdecl _InterlockedExchange(volatile long*, long);
-	long __cdecl _InterlockedExchangeAdd(volatile long*, long);
-	long __cdecl _InterlockedCompareExchange(volatile long*, long, long);
-}
-
-#pragma intrinsic( _InterlockedCompareExchange )
-#pragma intrinsic( _InterlockedDecrement )
-#pragma intrinsic( _InterlockedExchange )
-#pragma intrinsic( _InterlockedExchangeAdd ) 
-#pragma intrinsic( _InterlockedIncrement )
-
-inline long ThreadInterlockedIncrement(long volatile* p) { Assert((size_t)p % 4 == 0); return _InterlockedIncrement(p); }
-inline long ThreadInterlockedDecrement(long volatile* p) { Assert((size_t)p % 4 == 0); return _InterlockedDecrement(p); }
-inline long ThreadInterlockedExchange(long volatile* p, long value) { Assert((size_t)p % 4 == 0); return _InterlockedExchange(p, value); }
-inline long ThreadInterlockedExchangeAdd(long volatile* p, long value) { Assert((size_t)p % 4 == 0); return _InterlockedExchangeAdd(p, value); }
-inline long ThreadInterlockedCompareExchange(long volatile* p, long value, long comperand) { Assert((size_t)p % 4 == 0); return _InterlockedCompareExchange(p, value, comperand); }
-inline bool ThreadInterlockedAssignIf(long volatile* p, long value, long comperand) { Assert((size_t)p % 4 == 0); return (_InterlockedCompareExchange(p, value, comperand) == comperand); }
-#else
-PLATFORM_INTERFACE long ThreadInterlockedIncrement(long volatile*);
-PLATFORM_INTERFACE long ThreadInterlockedDecrement(long volatile*);
-PLATFORM_INTERFACE long ThreadInterlockedExchange(long volatile*, long value);
-PLATFORM_INTERFACE long ThreadInterlockedExchangeAdd(long volatile*, long value);
-PLATFORM_INTERFACE long ThreadInterlockedCompareExchange(long volatile*, long value, long comperand);
-PLATFORM_INTERFACE bool ThreadInterlockedAssignIf(long volatile*, long value, long comperand);
-#endif
-
-inline unsigned ThreadInterlockedExchangeSubtract(long volatile* p, long value) { return ThreadInterlockedExchangeAdd((long volatile*)p, -value); }
-
-#if defined( USE_INTRINSIC_INTERLOCKED ) && !defined( _WIN64 )
-#define TIPTR()
-inline void* ThreadInterlockedExchangePointer(void* volatile* p, void* value) { return (void*)_InterlockedExchange(reinterpret_cast<long volatile*>(p), reinterpret_cast<long>(value)); }
-inline void* ThreadInterlockedCompareExchangePointer(void* volatile* p, void* value, void* comperand) { return (void*)_InterlockedCompareExchange(reinterpret_cast<long volatile*>(p), reinterpret_cast<long>(value), reinterpret_cast<long>(comperand)); }
-inline bool ThreadInterlockedAssignPointerIf(void* volatile* p, void* value, void* comperand) { return (_InterlockedCompareExchange(reinterpret_cast<long volatile*>(p), reinterpret_cast<long>(value), reinterpret_cast<long>(comperand)) == reinterpret_cast<long>(comperand)); }
-#else
-PLATFORM_INTERFACE void* ThreadInterlockedExchangePointer(void* volatile*, void* value) NOINLINE;
-PLATFORM_INTERFACE void* ThreadInterlockedCompareExchangePointer(void* volatile*, void* value, void* comperand) NOINLINE;
-PLATFORM_INTERFACE bool ThreadInterlockedAssignPointerIf(void* volatile*, void* value, void* comperand) NOINLINE;
-#endif
-
-inline void const* ThreadInterlockedExchangePointerToConst(void const* volatile* p, void const* value) { return ThreadInterlockedExchangePointer(const_cast <void* volatile*> (p), const_cast <void*> (value)); }
-inline void const* ThreadInterlockedCompareExchangePointerToConst(void const* volatile* p, void const* value, void const* comperand) { return ThreadInterlockedCompareExchangePointer(const_cast <void* volatile*> (p), const_cast <void*> (value), const_cast <void*> (comperand)); }
-inline bool ThreadInterlockedAssignPointerToConstIf(void const* volatile* p, void const* value, void const* comperand) { return ThreadInterlockedAssignPointerIf(const_cast <void* volatile*> (p), const_cast <void*> (value), const_cast <void*> (comperand)); }
-
-#if defined( PLATFORM_64BITS )
-#if defined (_WIN32) 
-typedef __m128i int128;
-inline int128 int128_zero() { return _mm_setzero_si128(); }
-#else
-typedef __int128_t int128;
-#define int128_zero() 0
-#endif
-
-PLATFORM_INTERFACE bool ThreadInterlockedAssignIf128(volatile int128* pDest, const int128& value, const int128& comperand) NOINLINE;
-
-#endif
-
-PLATFORM_INTERFACE int64 ThreadInterlockedIncrement64(int64 volatile*) NOINLINE;
-PLATFORM_INTERFACE int64 ThreadInterlockedDecrement64(int64 volatile*) NOINLINE;
-PLATFORM_INTERFACE int64 ThreadInterlockedCompareExchange64(int64 volatile*, int64 value, int64 comperand) NOINLINE;
-PLATFORM_INTERFACE int64 ThreadInterlockedExchange64(int64 volatile*, int64 value) NOINLINE;
-PLATFORM_INTERFACE int64 ThreadInterlockedExchangeAdd64(int64 volatile*, int64 value) NOINLINE;
-PLATFORM_INTERFACE bool ThreadInterlockedAssignIf64(volatile int64* pDest, int64 value, int64 comperand) NOINLINE;
-
-inline unsigned ThreadInterlockedExchangeSubtract(unsigned volatile* p, unsigned value) { return ThreadInterlockedExchangeAdd((long volatile*)p, value); }
-inline unsigned ThreadInterlockedIncrement(unsigned volatile* p) { return ThreadInterlockedIncrement((long volatile*)p); }
-inline unsigned ThreadInterlockedDecrement(unsigned volatile* p) { return ThreadInterlockedDecrement((long volatile*)p); }
-inline unsigned ThreadInterlockedExchange(unsigned volatile* p, unsigned value) { return ThreadInterlockedExchange((long volatile*)p, value); }
-inline unsigned ThreadInterlockedExchangeAdd(unsigned volatile* p, unsigned value) { return ThreadInterlockedExchangeAdd((long volatile*)p, value); }
-inline unsigned ThreadInterlockedCompareExchange(unsigned volatile* p, unsigned value, unsigned comperand) { return ThreadInterlockedCompareExchange((long volatile*)p, value, comperand); }
-inline bool ThreadInterlockedAssignIf(unsigned volatile* p, unsigned value, unsigned comperand) { return ThreadInterlockedAssignIf((long volatile*)p, value, comperand); }
-
-inline int ThreadInterlockedExchangeSubtract(int volatile* p, int value) { return ThreadInterlockedExchangeAdd((long volatile*)p, value); }
-inline int ThreadInterlockedIncrement(int volatile* p) { return ThreadInterlockedIncrement((long volatile*)p); }
-inline int ThreadInterlockedDecrement(int volatile* p) { return ThreadInterlockedDecrement((long volatile*)p); }
-inline int ThreadInterlockedExchange(int volatile* p, int value) { return ThreadInterlockedExchange((long volatile*)p, value); }
-inline int ThreadInterlockedExchangeAdd(int volatile* p, int value) { return ThreadInterlockedExchangeAdd((long volatile*)p, value); }
-inline int ThreadInterlockedCompareExchange(int volatile* p, int value, int comperand) { return ThreadInterlockedCompareExchange((long volatile*)p, value, comperand); }
-inline bool ThreadInterlockedAssignIf(int volatile* p, int value, int comperand) { return ThreadInterlockedAssignIf((long volatile*)p, value, comperand); }
-
-#if defined(_WIN32) && defined(THREAD_PROFILER)
-PLATFORM_INTERFACE void ThreadNotifySyncPrepare(void* p);
-PLATFORM_INTERFACE void ThreadNotifySyncCancel(void* p);
-PLATFORM_INTERFACE void ThreadNotifySyncAcquired(void* p);
-PLATFORM_INTERFACE void ThreadNotifySyncReleasing(void* p);
-#else
-#define ThreadNotifySyncPrepare(p)		((void)0)
-#define ThreadNotifySyncCancel(p)		((void)0)
-#define ThreadNotifySyncAcquired(p)		((void)0)
-#define ThreadNotifySyncReleasing(p)	((void)0)
-#endif
-
-#ifndef NO_THREAD_LOCAL
-
-#if defined(_LINUX) && !defined(OSX)
-#define PLAT_COMPILER_SUPPORTED_THREADLOCALS 1
-#define CTHREADLOCALINTEGER( typ ) __thread int
-#define CTHREADLOCALINT __thread int
-#define CTHREADLOCALPTR( typ ) __thread typ *
-#define CTHREADLOCAL( typ ) __thread typ
-#define GETLOCAL( x ) ( x )
-#endif    
-
-#if defined(WIN32) || defined(OSX)
-#ifndef __AFXTLS_H__       
-#define CTHREADLOCALINT CThreadLocalInt<int>
-#define CTHREADLOCALINTEGER( typ ) CThreadLocalInt<typ>
-#define CTHREADLOCALPTR( typ ) CThreadLocalPtr<typ>
-#define CTHREADLOCAL( typ ) CThreadLocal<typ>
-#define GETLOCAL( x ) ( x.Get() )
-#endif
-#endif    
-
-#endif  
-
-#ifndef __AFXTLS_H__       
-#ifndef NO_THREAD_LOCAL
-
-class PLATFORM_CLASS CThreadLocalBase
-{
-public:
-	CThreadLocalBase();
-	~CThreadLocalBase();
-
-	void* Get() const;
-	void   Set(void*);
-
-private:
-#ifdef _WIN32
-	uint32 m_index;
-#elif POSIX
-	pthread_key_t m_index;
-#endif
-};
-
-#ifndef __AFXTLS_H__
-
-template <class T>
-class CThreadLocal : public CThreadLocalBase
-{
-public:
-	CThreadLocal()
-	{
-		COMPILE_TIME_ASSERT(sizeof(T) == sizeof(void*));
-	}
-
-	T Get() const
-	{
-		return reinterpret_cast<T>(CThreadLocalBase::Get());
-	}
-
-	void Set(T val)
-	{
-		CThreadLocalBase::Set(reinterpret_cast<void*>(val));
-	}
-};
-
-#endif
-
-template <class T = intp>
-class CThreadLocalInt : public CThreadLocal<T>
-{
-public:
-	CThreadLocalInt()
-	{
-		COMPILE_TIME_ASSERT(sizeof(T) >= sizeof(int));
-	}
-
-	operator int() const { return (int)this->Get(); }
-	int	operator=(int i) { this->Set((intp)i); return i; }
-
-	int operator++() { T i = this->Get(); this->Set(++i); return (int)i; }
-	int operator++(int) { T i = this->Get(); this->Set(i + 1); return (int)i; }
-
-	int operator--() { T i = this->Get(); this->Set(--i); return (int)i; }
-	int operator--(int) { T i = this->Get(); this->Set(i - 1); return (int)i; }
-};
-
-
-template <class T>
-class CThreadLocalPtr : private CThreadLocalBase
-{
-public:
-	CThreadLocalPtr() {}
-
-	operator const void* () const { return (T*)Get(); }
-	operator void* () { return (T*)Get(); }
-
-	operator const T* () const { return (T*)Get(); }
-	operator const T* () { return (T*)Get(); }
-	operator T* () { return (T*)Get(); }
-
-	int			operator=(int i) { AssertMsg(i == 0, "Only NULL allowed on integer assign"); Set(NULL); return 0; }
-	T* operator=(T* p) { Set(p); return p; }
-
-	bool        operator !() const { return (!Get()); }
-	bool        operator!=(int i) const { AssertMsg(i == 0, "Only NULL allowed on integer compare"); return (Get() != NULL); }
-	bool        operator==(int i) const { AssertMsg(i == 0, "Only NULL allowed on integer compare"); return (Get() == NULL); }
-	bool		operator==(const void* p) const { return (Get() == p); }
-	bool		operator!=(const void* p) const { return (Get() != p); }
-	bool		operator==(const T* p) const { return operator==((void*)p); }
-	bool		operator!=(const T* p) const { return operator!=((void*)p); }
-
-	T* operator->() { return (T*)Get(); }
-	T& operator *() { return *((T*)Get()); }
-
-	const T* operator->() const { return (T*)Get(); }
-	const T& operator *() const { return *((T*)Get()); }
-
-	const T& operator[](int i) const { return *((T*)Get() + i); }
-	T& operator[](int i) { return *((T*)Get() + i); }
-
-private:
-	CThreadLocalPtr(T* pFrom);
-	CThreadLocalPtr(const CThreadLocalPtr<T>& from);
-	T** operator &();
-	T* const* operator &() const;
-	void operator=(const CThreadLocalPtr<T>& from);
-	bool operator==(const CThreadLocalPtr<T>& p) const;
-	bool operator!=(const CThreadLocalPtr<T>& p) const;
-};
-
-#endif  
-#endif  
-
-template <typename T>
-class CInterlockedIntT
-{
-public:
-	CInterlockedIntT() : m_value(0) { COMPILE_TIME_ASSERT(sizeof(T) == sizeof(long)); }
-	CInterlockedIntT(T value) : m_value(value) {}
-
-	T GetRaw() const { return m_value; }
-
-	operator T() const { return m_value; }
-
-	bool operator!() const { return (m_value == 0); }
-	bool operator==(T rhs) const { return (m_value == rhs); }
-	bool operator!=(T rhs) const { return (m_value != rhs); }
-
-	T operator++() { return (T)ThreadInterlockedIncrement((long*)&m_value); }
-	T operator++(int) { return operator++() - 1; }
-
-	T operator--() { return (T)ThreadInterlockedDecrement((long*)&m_value); }
-	T operator--(int) { return operator--() + 1; }
-
-	bool AssignIf(T conditionValue, T newValue) { return ThreadInterlockedAssignIf((long*)&m_value, (long)newValue, (long)conditionValue); }
-
-	T operator=(T newValue) { ThreadInterlockedExchange((long*)&m_value, newValue); return m_value; }
-
-	void operator+=(T add) { ThreadInterlockedExchangeAdd((long*)&m_value, (long)add); }
-	void operator-=(T subtract) { operator+=(-subtract); }
-	void operator*=(T multiplier) {
-		T original, result;
-		do
-		{
-			original = m_value;
-			result = original * multiplier;
-		} while (!AssignIf(original, result));
-	}
-	void operator/=(T divisor) {
-		T original, result;
-		do
-		{
-			original = m_value;
-			result = original / divisor;
-		} while (!AssignIf(original, result));
-	}
-
-	T operator+(T rhs) const { return m_value + rhs; }
-	T operator-(T rhs) const { return m_value - rhs; }
-
-private:
-	volatile T m_value;
-};
-
-typedef CInterlockedIntT<int> CInterlockedInt;
-typedef CInterlockedIntT<unsigned> CInterlockedUInt;
-
-template <typename T>
-class CInterlockedPtr
-{
-public:
-	CInterlockedPtr() : m_value(0) {}
-	CInterlockedPtr(T* value) : m_value(value) {}
-
-	operator T* () const { return m_value; }
-
-	bool operator!() const { return (m_value == 0); }
-	bool operator==(T* rhs) const { return (m_value == rhs); }
-	bool operator!=(T* rhs) const { return (m_value != rhs); }
-
-#if defined( PLATFORM_64BITS )
-	T* operator++() { return ((T*)ThreadInterlockedExchangeAdd64((int64*)&m_value, sizeof(T))) + 1; }
-	T* operator++(int) { return (T*)ThreadInterlockedExchangeAdd64((int64*)&m_value, sizeof(T)); }
-
-	T* operator--() { return ((T*)ThreadInterlockedExchangeAdd64((int64*)&m_value, -sizeof(T))) - 1; }
-	T* operator--(int) { return (T*)ThreadInterlockedExchangeAdd64((int64*)&m_value, -sizeof(T)); }
-
-	bool AssignIf(T* conditionValue, T* newValue) { return ThreadInterlockedAssignPointerToConstIf((void const**)&m_value, (void const*)newValue, (void const*)conditionValue); }
-
-	T* operator=(T* newValue) { ThreadInterlockedExchangePointerToConst((void const**)&m_value, (void const*)newValue); return newValue; }
-
-	void operator+=(int add) { ThreadInterlockedExchangeAdd64((int64*)&m_value, add * sizeof(T)); }
-#else
-	T* operator++() { return ((T*)ThreadInterlockedExchangeAdd((long*)&m_value, sizeof(T))) + 1; }
-	T* operator++(int) { return (T*)ThreadInterlockedExchangeAdd((long*)&m_value, sizeof(T)); }
-
-	T* operator--() { return ((T*)ThreadInterlockedExchangeAdd((long*)&m_value, -sizeof(T))) - 1; }
-	T* operator--(int) { return (T*)ThreadInterlockedExchangeAdd((long*)&m_value, -sizeof(T)); }
-
-	bool AssignIf(T* conditionValue, T* newValue) { return ThreadInterlockedAssignPointerToConstIf((void const**)&m_value, (void const*)newValue, (void const*)conditionValue); }
-
-	T* operator=(T* newValue) { ThreadInterlockedExchangePointerToConst((void const**)&m_value, (void const*)newValue); return newValue; }
-
-	void operator+=(int add) { ThreadInterlockedExchangeAdd((long*)&m_value, add * sizeof(T)); }
-#endif
-
-	void operator-=(int subtract) { operator+=(-subtract); }
-
-	T* operator+(int rhs) const { return m_value + rhs; }
-	T* operator-(int rhs) const { return m_value - rhs; }
-	T* operator+(unsigned rhs) const { return m_value + rhs; }
-	T* operator-(unsigned rhs) const { return m_value - rhs; }
-	size_t operator-(T* p) const { return m_value - p; }
-	size_t operator-(const CInterlockedPtr<T>& p) const { return m_value - p.m_value; }
-
-private:
-	T* volatile m_value;
-};
-
-class PLATFORM_CLASS CThreadMutex
-{
-public:
-	CThreadMutex();
-	~CThreadMutex();
-
-	void Lock();
-	void Lock() const { (const_cast<CThreadMutex*>(this))->Lock(); }
-	void Unlock();
-	void Unlock() const { (const_cast<CThreadMutex*>(this))->Unlock(); }
-
-	bool TryLock();
-	bool TryLock() const { return (const_cast<CThreadMutex*>(this))->TryLock(); }
-
-	bool AssertOwnedByCurrentThread();
-
-	void SetTrace(bool);
-
-private:
-	CThreadMutex(const CThreadMutex&);
-	CThreadMutex& operator=(const CThreadMutex&);
-
-#if defined( _WIN32 )
-#ifdef _WIN64
-#define TT_SIZEOF_CRITICALSECTION 40	
-#else
-#ifndef _X360
-#define TT_SIZEOF_CRITICALSECTION 24
-#else
-#define TT_SIZEOF_CRITICALSECTION 28
-#endif  
-#endif  
-	byte m_CriticalSection[TT_SIZEOF_CRITICALSECTION];
-#elif defined(POSIX)
-	pthread_mutex_t m_Mutex;
-	pthread_mutexattr_t m_Attr;
-#else
-#error
-#endif
-
-#ifdef THREAD_MUTEX_TRACING_SUPPORTED
-	uint	m_currentOwnerID;
-	uint16	m_lockCount;
-	bool	m_bTrace;
-#endif
-};
-
-#if !defined(THREAD_PROFILER)
-
-class CThreadFastMutex
-{
-public:
-	CThreadFastMutex()
-		: m_ownerID(0),
-		m_depth(0)
-	{
-	}
-
-private:
-	FORCEINLINE bool TryLockInline(const uint32 threadId) volatile
-	{
-		if (threadId != m_ownerID && !ThreadInterlockedAssignIf((volatile long*)&m_ownerID, (long)threadId, 0))
-			return false;
-
-		ThreadMemoryBarrier();
-		++m_depth;
-		return true;
-	}
-
-	bool TryLock(const uint32 threadId) volatile
-	{
-		return TryLockInline(threadId);
-	}
-
-	PLATFORM_CLASS void Lock(const uint32 threadId, unsigned nSpinSleepTime) volatile;
-
-public:
-	bool TryLock() volatile
-	{
-#ifdef _DEBUG
-		if (m_depth == INT_MAX)
-			DebuggerBreak();
-
-		if (m_depth < 0)
-			DebuggerBreak();
-#endif
-		return TryLockInline(ThreadGetCurrentId());
-	}
-
-#ifndef _DEBUG 
-	FORCEINLINE
-#endif
-		void Lock(unsigned int nSpinSleepTime = 0) volatile
-	{
-		const uint32 threadId = ThreadGetCurrentId();
-
-		if (!TryLockInline(threadId))
-		{
-			ThreadPause();
-			Lock(threadId, nSpinSleepTime);
-		}
-#ifdef _DEBUG
-		if (m_ownerID != ThreadGetCurrentId())
-			DebuggerBreak();
-
-		if (m_depth == INT_MAX)
-			DebuggerBreak();
-
-		if (m_depth < 0)
-			DebuggerBreak();
-#endif
-	}
-
-#ifndef _DEBUG
-	FORCEINLINE
-#endif
-		void Unlock() volatile
-	{
-#ifdef _DEBUG
-		if (m_ownerID != ThreadGetCurrentId())
-			DebuggerBreak();
-
-		if (m_depth <= 0)
-			DebuggerBreak();
-#endif
-
-		--m_depth;
-		if (!m_depth)
-		{
-			ThreadMemoryBarrier();
-			ThreadInterlockedExchange(&m_ownerID, 0);
-		}
-	}
-
-#ifdef WIN32
-	bool TryLock() const volatile { return (const_cast<CThreadFastMutex*>(this))->TryLock(); }
-	void Lock(unsigned nSpinSleepTime = 1) const volatile { (const_cast<CThreadFastMutex*>(this))->Lock(nSpinSleepTime); }
-	void Unlock() const	volatile { (const_cast<CThreadFastMutex*>(this))->Unlock(); }
-#endif
-	bool AssertOwnedByCurrentThread() { return true; }
-	void SetTrace(bool) {}
-
-	uint32 GetOwnerId() const { return m_ownerID; }
-	int	GetDepth() const { return m_depth; }
-private:
-	volatile uint32 m_ownerID;
-	int				m_depth;
-};
-
-class ALIGN128 CAlignedThreadFastMutex : public CThreadFastMutex
-{
-public:
-	CAlignedThreadFastMutex()
-	{
-		Assert((size_t)this % 128 == 0 && sizeof(*this) == 128);
-	}
-
-private:
-	uint8 pad[128 - sizeof(CThreadFastMutex)];
-} ALIGN128_POST;
-
-#else
-typedef CThreadMutex CThreadFastMutex;
-#endif
-
-class CThreadNullMutex
-{
-public:
-	static void Lock() {}
-	static void Unlock() {}
-
-	static bool TryLock() { return true; }
-	static bool AssertOwnedByCurrentThread() { return true; }
-	static void SetTrace(bool b) {}
-
-	static uint32 GetOwnerId() { return 0; }
-	static int	GetDepth() { return 0; }
-};
-
-template <class BaseClass, bool* pCondition>
-class CThreadConditionalMutex : public BaseClass
-{
-public:
-	void Lock() { if (*pCondition) BaseClass::Lock(); }
-	void Lock() const { if (*pCondition) BaseClass::Lock(); }
-	void Unlock() { if (*pCondition) BaseClass::Unlock(); }
-	void Unlock() const { if (*pCondition) BaseClass::Unlock(); }
-
-	bool TryLock() { if (*pCondition) return BaseClass::TryLock(); else return true; }
-	bool TryLock() const { if (*pCondition) return BaseClass::TryLock(); else return true; }
-	bool AssertOwnedByCurrentThread() { if (*pCondition) return BaseClass::AssertOwnedByCurrentThread(); else return true; }
-	void SetTrace(bool b) { if (*pCondition) BaseClass::SetTrace(b); }
-};
-
-template <class BaseClass>
-class CThreadTerminalMutex : public BaseClass
-{
-public:
-	bool TryLock() { if (!BaseClass::TryLock()) { DebuggerBreak(); return false; } return true; }
-	bool TryLock() const { if (!BaseClass::TryLock()) { DebuggerBreak(); return false; } return true; }
-	void Lock() { if (!TryLock()) BaseClass::Lock(); }
-	void Lock() const { if (!TryLock()) BaseClass::Lock(); }
-
-};
-
-template <class MUTEX_TYPE = CThreadMutex>
-class CAutoLockT
-{
-public:
-	FORCEINLINE CAutoLockT(MUTEX_TYPE& lock)
-		: m_lock(lock)
-	{
-		m_lock.Lock();
-	}
-
-	FORCEINLINE CAutoLockT(const MUTEX_TYPE& lock)
-		: m_lock(const_cast<MUTEX_TYPE&>(lock))
-	{
-		m_lock.Lock();
-	}
-
-	FORCEINLINE ~CAutoLockT()
-	{
-		m_lock.Unlock();
-	}
-
-
-private:
-	MUTEX_TYPE& m_lock;
-
-	CAutoLockT<MUTEX_TYPE>(const CAutoLockT<MUTEX_TYPE>&);
-	CAutoLockT<MUTEX_TYPE>& operator=(const CAutoLockT<MUTEX_TYPE>&);
-};
-
-typedef CAutoLockT<CThreadMutex> CAutoLock;
-
-template <int size>	struct CAutoLockTypeDeducer {};
-template <> struct CAutoLockTypeDeducer<sizeof(CThreadMutex)> { typedef CThreadMutex Type_t; };
-template <> struct CAutoLockTypeDeducer<sizeof(CThreadNullMutex)> { typedef CThreadNullMutex Type_t; };
-#if !defined(THREAD_PROFILER)
-template <> struct CAutoLockTypeDeducer<sizeof(CThreadFastMutex)> { typedef CThreadFastMutex Type_t; };
-template <> struct CAutoLockTypeDeducer<sizeof(CAlignedThreadFastMutex)> { typedef CAlignedThreadFastMutex Type_t; };
-#endif
-
-#define AUTO_LOCK_( type, mutex ) \
-	CAutoLockT< type > UNIQUE_ID( static_cast<const type &>( mutex ) )
-
-#if defined(GNUC)
-
-template<typename T> T strip_cv_quals_for_mutex(T&);
-template<typename T> T strip_cv_quals_for_mutex(const T&);
-template<typename T> T strip_cv_quals_for_mutex(volatile T&);
-template<typename T> T strip_cv_quals_for_mutex(const volatile T&);
-
-#define AUTO_LOCK( mutex ) \
-    AUTO_LOCK_( typeof(::strip_cv_quals_for_mutex(mutex)), mutex )
-
-#else  
-
-#define AUTO_LOCK( mutex ) \
-	AUTO_LOCK_( CAutoLockTypeDeducer<sizeof(mutex)>::Type_t, mutex )
-
-#endif
-
-#define AUTO_LOCK_FM( mutex ) \
-	AUTO_LOCK_( CThreadFastMutex, mutex )
-
-#define LOCAL_THREAD_LOCK_( tag ) \
-	; \
-	static CThreadFastMutex autoMutex_##tag; \
-	AUTO_LOCK( autoMutex_##tag )
-
-#define LOCAL_THREAD_LOCK() \
-	LOCAL_THREAD_LOCK_(_)
-
-class PLATFORM_CLASS CThreadSyncObject
-{
-public:
-	~CThreadSyncObject();
-
-	bool operator!() const;
-
-#ifdef _WIN32
-	operator HANDLE() { return GetHandle(); }
-	const HANDLE GetHandle() const { return m_hSyncObject; }
-#endif
-	bool Wait(uint32 dwTimeout = TT_INFINITE);
-
-protected:
-	CThreadSyncObject();
-	void AssertUseable();
-
-#ifdef _WIN32
-	HANDLE m_hSyncObject;
-	bool m_bCreatedHandle;
-#elif defined(POSIX)
-	pthread_mutex_t	m_Mutex;
-	pthread_cond_t	m_Condition;
-	bool m_bInitalized;
-	int m_cSet;
-	bool m_bManualReset;
-	bool m_bWakeForEvent;
-#else
-#error "Implement me"
-#endif
-
-private:
-	CThreadSyncObject(const CThreadSyncObject&);
-	CThreadSyncObject& operator=(const CThreadSyncObject&);
-};
-
-
-#if defined( _WIN32 )
-
-class PLATFORM_CLASS CThreadSemaphore : public CThreadSyncObject
-{
-public:
-	CThreadSemaphore(long initialValue, long maxValue);
-
-	bool Release(long releaseCount = 1, long* pPreviousCount = NULL);
-
-private:
-	CThreadSemaphore(const CThreadSemaphore&);
-	CThreadSemaphore& operator=(const CThreadSemaphore&);
-};
-
-
-class PLATFORM_CLASS CThreadFullMutex : public CThreadSyncObject
-{
-public:
-	CThreadFullMutex(bool bEstablishInitialOwnership = false, const char* pszName = NULL);
-
-	bool Release();
-
-	void Lock() { Wait(); }
-	void Lock(unsigned timeout) { Wait(timeout); }
-	void Unlock() { Release(); }
-	bool AssertOwnedByCurrentThread() { return true; }
-	void SetTrace(bool) {}
-
-private:
-	CThreadFullMutex(const CThreadFullMutex&);
-	CThreadFullMutex& operator=(const CThreadFullMutex&);
-};
-#endif
-
-
-class PLATFORM_CLASS CThreadEvent : public CThreadSyncObject
-{
-public:
-	CThreadEvent(bool fManualReset = false);
-#ifdef WIN32
-	CThreadEvent(HANDLE hHandle);
-#endif
-	bool Set();
-
-	bool Reset();
-
-	bool Check();
-
-	bool Wait(uint32 dwTimeout = TT_INFINITE);
-
-private:
-	CThreadEvent(const CThreadEvent&);
-	CThreadEvent& operator=(const CThreadEvent&);
-};
-
-class CThreadManualEvent : public CThreadEvent
-{
-public:
-	CThreadManualEvent()
-		: CThreadEvent(true)
-	{
-	}
-};
-
-inline int ThreadWaitForEvents(int nEvents, CThreadEvent* const* pEvents, bool bWaitAll = true, unsigned timeout = TT_INFINITE)
-{
-#ifdef POSIX
-	Assert(nEvents == 1);
-	if (pEvents[0]->Wait(timeout))
-		return WAIT_OBJECT_0;
-	else
-		return WAIT_TIMEOUT;
-#else
-	HANDLE handles[64];
-	for (unsigned int i = 0; i < min(nEvents, ARRAYSIZE(handles)); i++)
-		handles[i] = pEvents[i]->GetHandle();
-	return ThreadWaitForObjects(nEvents, handles, bWaitAll, timeout);
-#endif
-}
-
-class PLATFORM_CLASS CThreadRWLock
-{
-public:
-	CThreadRWLock();
-
-	void LockForRead();
-	void UnlockRead();
-	void LockForWrite();
-	void UnlockWrite();
-
-	void LockForRead() const { const_cast<CThreadRWLock*>(this)->LockForRead(); }
-	void UnlockRead() const { const_cast<CThreadRWLock*>(this)->UnlockRead(); }
-	void LockForWrite() const { const_cast<CThreadRWLock*>(this)->LockForWrite(); }
-	void UnlockWrite() const { const_cast<CThreadRWLock*>(this)->UnlockWrite(); }
-
-private:
-	void WaitForRead();
-
-#ifdef WIN32
-	CThreadFastMutex m_mutex;
-#else
-	CThreadMutex m_mutex;
-#endif
-	CThreadEvent m_CanWrite;
-	CThreadEvent m_CanRead;
-
-	int m_nWriters;
-	int m_nActiveReaders;
-	int m_nPendingReaders;
-};
-
-class ALIGN8 PLATFORM_CLASS CThreadSpinRWLock
-{
-public:
-	CThreadSpinRWLock() { COMPILE_TIME_ASSERT(sizeof(LockInfo_t) == sizeof(int64)); Assert((intp)this % 8 == 0); memset(this, 0, sizeof(*this)); }
-
-	bool TryLockForWrite();
-	bool TryLockForRead();
-
-	void LockForRead();
-	void UnlockRead();
-	void LockForWrite();
-	void UnlockWrite();
-
-	bool TryLockForWrite() const { return const_cast<CThreadSpinRWLock*>(this)->TryLockForWrite(); }
-	bool TryLockForRead() const { return const_cast<CThreadSpinRWLock*>(this)->TryLockForRead(); }
-	void LockForRead() const { const_cast<CThreadSpinRWLock*>(this)->LockForRead(); }
-	void UnlockRead() const { const_cast<CThreadSpinRWLock*>(this)->UnlockRead(); }
-	void LockForWrite() const { const_cast<CThreadSpinRWLock*>(this)->LockForWrite(); }
-	void UnlockWrite() const { const_cast<CThreadSpinRWLock*>(this)->UnlockWrite(); }
-
-private:
-	struct LockInfo_t
-	{
-		uint32	m_writerId;
-		int		m_nReaders;
-	};
-
-	bool AssignIf(const LockInfo_t& newValue, const LockInfo_t& comperand);
-	bool TryLockForWrite(const uint32 threadId);
-	void SpinLockForWrite(const uint32 threadId);
-
-	volatile LockInfo_t m_lockInfo;
-	CInterlockedInt m_nWriters;
-} ALIGN8_POST;
-
-class PLATFORM_CLASS CThread
-{
-public:
-	CThread();
-	virtual ~CThread();
-
-	const char* GetName();
-	void SetName(const char*);
-
-	size_t CalcStackDepth(void* pStackVariable) { return ((byte*)m_pStackBase - (byte*)pStackVariable); }
-
-	virtual bool Start(unsigned nBytesStack = 0);
-
-	bool IsAlive();
-
-	bool Join(unsigned timeout = TT_INFINITE);
-
-#ifdef _WIN32
-	HANDLE GetThreadHandle();
-	uint GetThreadId();
-#elif defined( LINUX )
-	uint GetThreadId();
-#endif
-
-	int GetResult();
-
-	void Stop(int exitCode = 0);
-
-	int GetPriority() const;
-
-	bool SetPriority(int);
-
-	void SuspendCooperative();
-
-	void ResumeCooperative();
-
-	void BWaitForThreadSuspendCooperative();
-
-#ifndef LINUX
-	unsigned int Suspend();
-
-	unsigned int Resume();
-#endif
-
-	bool Terminate(int exitCode = 0);
-
-	static CThread* GetCurrentCThread();
-
-#ifdef Yield
-#undef Yield
-#endif
-	static void Yield();
-
-	static void Sleep(unsigned duration);
-
-protected:
-
-	virtual bool Init();
-
-	virtual int Run() = 0;
-
-	virtual void OnExit();
-
-	void Cleanup();
-
-	bool WaitForCreateComplete(CThreadEvent* pEvent);
-
-	typedef unsigned(__stdcall* ThreadProc_t)(void*);
-	virtual ThreadProc_t GetThreadProc();
-	virtual bool IsThreadRunning();
-
-	CThreadMutex m_Lock;
-
-#ifdef WIN32
-	ThreadHandle_t GetThreadID() const { return (ThreadHandle_t)m_hThread; }
-#else
-	ThreadId_t GetThreadID() const { return (ThreadId_t)m_threadId; }
-#endif
-
-private:
-	enum Flags
-	{
-		SUPPORT_STOP_PROTOCOL = 1 << 0
-	};
-
-	struct ThreadInit_t
-	{
-		CThread* pThread;
-		CThreadEvent* pInitCompleteEvent;
-		bool* pfInitSuccess;
-	};
-
-	static unsigned __stdcall ThreadProc(void* pv);
-
-	CThread(const CThread&);
-	CThread& operator=(const CThread&);
-
-#ifdef _WIN32
-	HANDLE 	m_hThread;
-	ThreadId_t m_threadId;
-#elif defined(POSIX)
-	pthread_t m_threadId;
-#endif
-	CInterlockedInt m_nSuspendCount;
-	CThreadEvent m_SuspendEvent;
-	CThreadEvent m_SuspendEventSignal;
-	int		m_result;
-	char	m_szName[32];
-	void* m_pStackBase;
-	unsigned m_flags;
-};
-
-class PLATFORM_CLASS CValidatableThread : public CThread
-{
-public:
-	CValidatableThread()
-	{
-		m_bSleepForValidate = false;
-		m_bSleepingForValidate = false;
-	}
-
-#ifdef DBGFLAG_VALIDATE
-	virtual void SleepForValidate() { m_bSleepForValidate = true; }
-	bool BSleepingForValidate() { return m_bSleepingForValidate; }
-	virtual void WakeFromValidate() { m_bSleepForValidate = false; }
-#endif
-protected:
-	bool m_bSleepForValidate;
-	bool m_bSleepingForValidate;
-};
-
-
-enum WTCallResult_t
-{
-	WTCR_FAIL = -1,
-	WTCR_TIMEOUT = -2,
-	WTCR_THREAD_GONE = -3,
-};
-
-class CFunctor;
-class PLATFORM_CLASS CWorkerThread : public CThread
-{
-public:
-	CWorkerThread();
-
-	int CallWorker(unsigned, unsigned timeout = TT_INFINITE, bool fBoostWorkerPriorityToMaster = true, CFunctor* pParamFunctor = NULL);
-
-	int CallMaster(unsigned, unsigned timeout = TT_INFINITE);
-
-	bool WaitForCall(unsigned dwTimeout, unsigned* pResult = NULL);
-	bool WaitForCall(unsigned* pResult = NULL);
-
-	bool PeekCall(unsigned* pParam = NULL, CFunctor** ppParamFunctor = NULL);
-
-	void Reply(unsigned);
-
-	int WaitForReply(unsigned timeout = TT_INFINITE);
-
-	CThreadEvent& GetCallHandle();
-	unsigned GetCallParam(CFunctor** ppParamFunctor = NULL) const;
-
-	int BoostPriority();
-
-protected:
-#ifndef _WIN32
-#define __stdcall
-#endif
-	typedef uint32(__stdcall* WaitFunc_t)(int nEvents, CThreadEvent* const* pEvents, int bWaitAll, uint32 timeout);
-
-	int Call(unsigned, unsigned timeout, bool fBoost, WaitFunc_t = NULL, CFunctor* pParamFunctor = NULL);
-	int WaitForReply(unsigned timeout, WaitFunc_t);
-
-private:
-	CWorkerThread(const CWorkerThread&);
-	CWorkerThread& operator=(const CWorkerThread&);
-
-	CThreadEvent	m_EventSend;
-	CThreadEvent	m_EventComplete;
-
-	unsigned        m_Param;
-	CFunctor* m_pParamFunctor;
-	int				m_ReturnVal;
-};
-
-
-template<class T> class CMessageQueue
-{
-	CThreadEvent SignalEvent;								    
-	CThreadMutex QueueAccessMutex;
-
-	struct MsgNode
-	{
-		MsgNode* Next;
-		T Data;
-	};
-
-	MsgNode* Head;
-	MsgNode* Tail;
-
-public:
-	CMessageQueue(void)
-	{
-		Head = Tail = NULL;
-	}
-
-	bool MessageWaiting(void)
-	{
-		return (Head != NULL);
-	}
-
-	void WaitMessage(T* pMsg)
-	{
-		for (;;)
-		{
-			while (!MessageWaiting())
-				SignalEvent.Wait();
-			QueueAccessMutex.Lock();
-			if (!Head)
-			{
-				QueueAccessMutex.Unlock();
-				continue;
-			}
-			*(pMsg) = Head->Data;
-			MsgNode* remove_this = Head;
-			Head = Head->Next;
-			if (!Head)										     
-				Tail = NULL;
-			QueueAccessMutex.Unlock();
-			delete remove_this;
-			break;
-		}
-	}
-
-	void QueueMessage(T const& Msg)
-	{
-		MsgNode* new1 = new MsgNode;
-		new1->Data = Msg;
-		new1->Next = NULL;
-		QueueAccessMutex.Lock();
-		if (Tail)
-		{
-			Tail->Next = new1;
-			Tail = new1;
-		}
-		else
-		{
-			Head = new1;
-			Tail = new1;
-		}
-		SignalEvent.Set();
-		QueueAccessMutex.Unlock();
-	}
-};
-
-
-#ifdef _WIN32
-typedef struct _RTL_CRITICAL_SECTION RTL_CRITICAL_SECTION;
-typedef RTL_CRITICAL_SECTION CRITICAL_SECTION;
-
-#ifndef _X360
-extern "C"
-{
-	void __declspec(dllimport) __stdcall InitializeCriticalSection(CRITICAL_SECTION*);
-	void __declspec(dllimport) __stdcall EnterCriticalSection(CRITICAL_SECTION*);
-	void __declspec(dllimport) __stdcall LeaveCriticalSection(CRITICAL_SECTION*);
-	void __declspec(dllimport) __stdcall DeleteCriticalSection(CRITICAL_SECTION*);
-};
-#endif
-
-inline void CThreadMutex::Lock()
-{
-#ifdef THREAD_MUTEX_TRACING_ENABLED
-	uint thisThreadID = ThreadGetCurrentId();
-	if (m_bTrace && m_currentOwnerID && (m_currentOwnerID != thisThreadID))
-		Msg("Thread %u about to wait for lock %p owned by %u\n", ThreadGetCurrentId(), (CRITICAL_SECTION*)&m_CriticalSection, m_currentOwnerID);
-#endif
-
-	VCRHook_EnterCriticalSection((CRITICAL_SECTION*)&m_CriticalSection);
-
-#ifdef THREAD_MUTEX_TRACING_ENABLED
-	if (m_lockCount == 0)
-	{
-		m_currentOwnerID = thisThreadID;
-		if (m_bTrace)
-			Msg("Thread %u now owns lock %p\n", m_currentOwnerID, (CRITICAL_SECTION*)&m_CriticalSection);
-	}
-	m_lockCount++;
-#endif
-}
-
-inline void CThreadMutex::Unlock()
-{
-#ifdef THREAD_MUTEX_TRACING_ENABLED
-	AssertMsg(m_lockCount >= 1, "Invalid unlock of thread lock");
-	m_lockCount--;
-	if (m_lockCount == 0)
-	{
-		if (m_bTrace)
-			Msg("Thread %u releasing lock %p\n", m_currentOwnerID, (CRITICAL_SECTION*)&m_CriticalSection);
-		m_currentOwnerID = 0;
-	}
-#endif
-	LeaveCriticalSection((CRITICAL_SECTION*)&m_CriticalSection);
-}
-
-inline bool CThreadMutex::AssertOwnedByCurrentThread()
-{
-#ifdef THREAD_MUTEX_TRACING_ENABLED
-	if (ThreadGetCurrentId() == m_currentOwnerID)
-		return true;
-	AssertMsg3(0, "Expected thread %u as owner of lock %p, but %u owns", ThreadGetCurrentId(), (CRITICAL_SECTION*)&m_CriticalSection, m_currentOwnerID);
-	return false;
-#else
-	return true;
-#endif
-}
-
-inline void CThreadMutex::SetTrace(bool bTrace)
-{
-#ifdef THREAD_MUTEX_TRACING_ENABLED
-	m_bTrace = bTrace;
-#endif
-}
-
-#elif defined(POSIX)
-
-inline CThreadMutex::CThreadMutex()
-{
-	pthread_mutexattr_init(&m_Attr);
-	pthread_mutexattr_settype(&m_Attr, PTHREAD_MUTEX_RECURSIVE);
-	pthread_mutex_init(&m_Mutex, &m_Attr);
-}
-
-inline CThreadMutex::~CThreadMutex()
-{
-	pthread_mutex_destroy(&m_Mutex);
-}
-
-inline void CThreadMutex::Lock()
-{
-	pthread_mutex_lock(&m_Mutex);
-}
-
-inline void CThreadMutex::Unlock()
-{
-	pthread_mutex_unlock(&m_Mutex);
-}
-
-inline bool CThreadMutex::AssertOwnedByCurrentThread()
-{
-	return true;
-}
-
-inline void CThreadMutex::SetTrace(bool fTrace)
-{
-}
-
-#endif  
-
-inline CThreadRWLock::CThreadRWLock()
-	: m_CanRead(true),
-	m_nWriters(0),
-	m_nActiveReaders(0),
-	m_nPendingReaders(0)
-{
-}
-
-inline void CThreadRWLock::LockForRead()
-{
-	m_mutex.Lock();
-	if (m_nWriters)
-	{
-		WaitForRead();
-	}
-	m_nActiveReaders++;
-	m_mutex.Unlock();
-}
-
-inline void CThreadRWLock::UnlockRead()
-{
-	m_mutex.Lock();
-	m_nActiveReaders--;
-	if (m_nActiveReaders == 0 && m_nWriters != 0)
-	{
-		m_CanWrite.Set();
-	}
-	m_mutex.Unlock();
-}
-
-
-inline bool CThreadSpinRWLock::AssignIf(const LockInfo_t& newValue, const LockInfo_t& comperand)
-{
-	return ThreadInterlockedAssignIf64((int64*)&m_lockInfo, *((int64*)&newValue), *((int64*)&comperand));
-}
-
-inline bool CThreadSpinRWLock::TryLockForWrite(const uint32 threadId)
-{
-	if (m_lockInfo.m_nReaders > 0 || (m_lockInfo.m_writerId && m_lockInfo.m_writerId != threadId))
-	{
-		return false;
-	}
-
-	static const LockInfo_t oldValue = { 0, 0 };
-	LockInfo_t newValue = { threadId, 0 };
-	const bool bSuccess = AssignIf(newValue, oldValue);
-#if defined(_X360)
-	if (bSuccess)
-	{
-	}
-#endif
-	return bSuccess;
-}
-
-inline bool CThreadSpinRWLock::TryLockForWrite()
-{
-	m_nWriters++;
-	if (!TryLockForWrite(ThreadGetCurrentId()))
-	{
-		m_nWriters--;
-		return false;
-	}
-	return true;
-}
-
-inline bool CThreadSpinRWLock::TryLockForRead()
-{
-	if (m_nWriters != 0)
-	{
-		return false;
-	}
-	LockInfo_t oldValue;
-	LockInfo_t newValue;
-
-	oldValue.m_nReaders = m_lockInfo.m_nReaders;
-	oldValue.m_writerId = 0;
-	newValue.m_nReaders = oldValue.m_nReaders + 1;
-	newValue.m_writerId = 0;
-
-	const bool bSuccess = AssignIf(newValue, oldValue);
-#if defined(_X360)
-	if (bSuccess)
-	{
-	}
-#endif
-	return bSuccess;
-}
-
-inline void CThreadSpinRWLock::LockForWrite()
-{
-	const uint32 threadId = ThreadGetCurrentId();
-
-	m_nWriters++;
-
-	if (!TryLockForWrite(threadId))
-	{
-		ThreadPause();
-		SpinLockForWrite(threadId);
-	}
-}
-
-template<class T> FORCEINLINE T ReadVolatileMemory(T const* pPtr)
-{
-	volatile const T* pVolatilePtr = (volatile const T*)pPtr;
-	return *pVolatilePtr;
-}
-
-#if defined( _WIN32 )
-#pragma warning(pop)
-#endif
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/tier1.h b/SpyCustom/tier1.h
deleted file mode 100644
index fa8c490..0000000
--- a/SpyCustom/tier1.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-#ifndef TIER1_H
-#define TIER1_H
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-#include "iappsystem.h"
-#include "convar.h"
-
-
-void ConnectTier1Libraries(CreateInterfaceFn* pFactoryList, int nFactoryCount);
-void DisconnectTier1Libraries();
-
-
-template< class IInterface, int ConVarFlag = 0 >
-class CTier1AppSystem : public CTier0AppSystem< IInterface >
-{
-	typedef CTier0AppSystem< IInterface > BaseClass;
-
-public:
-	virtual bool Connect(CreateInterfaceFn factory)
-	{
-		if (!BaseClass::Connect(factory))
-			return false;
-
-		ConnectTier1Libraries(&factory, 1);
-		return true;
-	}
-
-	virtual void Disconnect()
-	{
-		DisconnectTier1Libraries();
-		BaseClass::Disconnect();
-	}
-
-	virtual InitReturnVal_t Init()
-	{
-		InitReturnVal_t nRetVal = BaseClass::Init();
-		if (nRetVal != INIT_OK)
-			return nRetVal;
-
-		if (g_pCVar)
-		{
-			ConVar_Register(ConVarFlag);
-		}
-		return INIT_OK;
-	}
-
-	virtual void Shutdown()
-	{
-		if (g_pCVar)
-		{
-			ConVar_Unregister();
-		}
-		BaseClass::Shutdown();
-	}
-
-	
-	virtual AppSystemTier_t GetTier()
-	{
-		return APP_SYSTEM_TIER1;
-	}
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/tier2.h b/SpyCustom/tier2.h
deleted file mode 100644
index fc7a44c..0000000
--- a/SpyCustom/tier2.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-#ifndef TIER2_H
-#define TIER2_H
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-#include "tier1.h"
-
-
-void ConnectTier2Libraries(CreateInterfaceFn* pFactoryList, int nFactoryCount);
-void DisconnectTier2Libraries();
-
-
-void InitDefaultFileSystem(void);
-void ShutdownDefaultFileSystem(void);
-
-
-void InitCommandLineProgram(int& argc, char**& argv);
-
-
-template< class IInterface, int ConVarFlag = 0 >
-class CTier2AppSystem : public CTier1AppSystem< IInterface, ConVarFlag >
-{
-	typedef CTier1AppSystem< IInterface, ConVarFlag > BaseClass;
-
-public:
-	virtual bool Connect(CreateInterfaceFn factory)
-	{
-		if (!BaseClass::Connect(factory))
-			return false;
-
-		ConnectTier2Libraries(&factory, 1);
-		return true;
-	}
-
-	virtual InitReturnVal_t Init()
-	{
-		InitReturnVal_t nRetVal = BaseClass::Init();
-		if (nRetVal != INIT_OK)
-			return nRetVal;
-
-		return INIT_OK;
-	}
-
-	
-	virtual AppSystemTier_t GetTier()
-	{
-		return APP_SYSTEM_TIER2;
-	}
-	virtual void Shutdown()
-	{
-		BaseClass::Shutdown();
-	}
-
-	virtual void Disconnect()
-	{
-		DisconnectTier2Libraries();
-		BaseClass::Disconnect();
-	}
-};
-
-
-enum FadeMode_t
-{
-	FADE_MODE_NONE = 0,
-	FADE_MODE_LOW,
-	FADE_MODE_MED,
-	FADE_MODE_HIGH,
-	FADE_MODE_360,
-	FADE_MODE_PS3,
-	FADE_MODE_LEVEL,
-
-	FADE_MODE_COUNT,
-};
-
-struct FadeData_t
-{
-	float	m_flPixelMin;		           
-	float	m_flPixelMax;		           
-	float	m_flWidth;			           
-	float	m_flFadeDistScale;	         
-};
-
-extern FadeData_t g_aFadeData[FADE_MODE_COUNT];
-
-
-extern uint32 g_nResourceFrameCount;
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/tier2_logging.h b/SpyCustom/tier2_logging.h
deleted file mode 100644
index 3fa1d05..0000000
--- a/SpyCustom/tier2_logging.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef TIER2_LOGGING_H
-#define TIER2_LOGGING_H
-
-#if defined( COMPILER_MSVC )
-#pragma once
-#endif
-
-#include "logging.h"
-
-
-const int MAX_SIMULTANEOUS_LOGGING_FILE_COUNT = 16;
-const int INVALID_LOGGING_FILE_HANDLE = -1;
-
-typedef int LoggingFileHandle_t;
-typedef void* FileHandle_t;
-
-#define FILELOGGINGLISTENER_INTERFACE_VERSION	"FileLoggingListener001"
-
-abstract_class IFileLoggingListener : public ILoggingListener
-{
-public:
-	virtual void Log(const LoggingContext_t * pContext, const char* pMessage) = 0;
-
-	virtual LoggingFileHandle_t BeginLoggingToFile(const char* pFilename, const char* pOptions, const char* pPathID = NULL) = 0;
-	virtual void EndLoggingToFile(LoggingFileHandle_t fileHandle) = 0;
-
-	virtual void AssignLogChannel(LoggingChannelID_t channelID, LoggingFileHandle_t loggingFileHandle) = 0;
-	virtual void UnassignLogChannel(LoggingChannelID_t channelID) = 0;
-	virtual void AssignAllLogChannels(LoggingFileHandle_t loggingFileHandle) = 0;
-	virtual void UnassignAllLogChannels() = 0;
-};
-
-class CFileLoggingListener : public IFileLoggingListener
-{
-public:
-	CFileLoggingListener();
-	~CFileLoggingListener();
-
-	virtual void Log(const LoggingContext_t* pContext, const char* pMessage);
-
-	virtual LoggingFileHandle_t BeginLoggingToFile(const char* pFilename, const char* pOptions, const char* pPathID = NULL);
-	virtual void EndLoggingToFile(LoggingFileHandle_t fileHandle);
-
-	virtual void AssignLogChannel(LoggingChannelID_t channelID, LoggingFileHandle_t loggingFileHandle);
-	virtual void UnassignLogChannel(LoggingChannelID_t channelID);
-	virtual void AssignAllLogChannels(LoggingFileHandle_t loggingFileHandle);
-	virtual void UnassignAllLogChannels();
-
-private:
-	int GetUnusedFileInfo() const;
-
-	struct FileInfo_t
-	{
-		FileHandle_t m_FileHandle;
-
-		bool IsOpen() const { return m_FileHandle != 0; }
-		void Reset() { m_FileHandle = 0; }
-	};
-
-	FileInfo_t m_OpenFiles[MAX_SIMULTANEOUS_LOGGING_FILE_COUNT];
-
-	int m_FileIndices[MAX_LOGGING_CHANNEL_COUNT];
-};
-
-#endif  
diff --git a/SpyCustom/tier3.h b/SpyCustom/tier3.h
deleted file mode 100644
index 826b10b..0000000
--- a/SpyCustom/tier3.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-#ifndef TIER3_H
-#define TIER3_H
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-#include "tier2.h"
-
-
-void ConnectTier3Libraries(CreateInterfaceFn* pFactoryList, int nFactoryCount);
-void DisconnectTier3Libraries();
-
-
-template< class IInterface, int ConVarFlag = 0 >
-class CTier3AppSystem : public CTier2AppSystem< IInterface, ConVarFlag >
-{
-	typedef CTier2AppSystem< IInterface, ConVarFlag > BaseClass;
-
-public:
-	virtual bool Connect(CreateInterfaceFn factory)
-	{
-		if (!BaseClass::Connect(factory))
-			return false;
-
-		ConnectTier3Libraries(&factory, 1);
-		return true;
-	}
-
-	virtual void Disconnect()
-	{
-		DisconnectTier3Libraries();
-		BaseClass::Disconnect();
-	}
-
-	
-	virtual AppSystemTier_t GetTier()
-	{
-		return APP_SYSTEM_TIER3;
-	}
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/timedevent.h b/SpyCustom/timedevent.h
deleted file mode 100644
index a8f5a80..0000000
--- a/SpyCustom/timedevent.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef TIMEDEVENT_H
-#define TIMEDEVENT_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class TimedEvent
-{
-public:
-	TimedEvent()
-	{
-		m_TimeBetweenEvents = -1;
-		m_fNextEvent = 0;
-	}
-
-	inline void	Init(float rate)
-	{
-		m_TimeBetweenEvents = 1.0f / rate;
-		m_fNextEvent = 0;
-	}
-
-	inline void ResetRate(float rate)
-	{
-		m_TimeBetweenEvents = 1.0f / rate;
-	}
-
-	inline bool NextEvent(float& curDelta)
-	{
-		Assert(m_TimeBetweenEvents != -1);
-
-		if (curDelta >= m_fNextEvent)
-		{
-			curDelta -= m_fNextEvent;
-
-			m_fNextEvent = m_TimeBetweenEvents;
-			return true;
-		}
-		else
-		{
-			m_fNextEvent -= curDelta;
-			return false;
-		}
-	}
-
-private:
-	float		m_TimeBetweenEvents;
-	float		m_fNextEvent;	       
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/timeutils.h b/SpyCustom/timeutils.h
deleted file mode 100644
index e635872..0000000
--- a/SpyCustom/timeutils.h
+++ /dev/null
@@ -1,149 +0,0 @@
-#ifndef TIMEUTILS_H
-#define TIMEUTILS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <limits.h>
-#include <math.h>
-#include "dbg.h"
-
-enum RoundStyle_t
-{
-	ROUND_NEAREST,
-	ROUND_DOWN,
-	ROUND_UP,
-};
-
-class DmeTime_t;
-
-class DmeFramerate_t
-{
-public:
-	DmeFramerate_t(float fps);
-	DmeFramerate_t(int fps = 0);
-	DmeFramerate_t(const DmeFramerate_t& src) : m_num(src.m_num), m_den(src.m_den) {}
-
-	void SetFramerate(float flFrameRate);
-	void SetFramerate(int fps);
-	void SetFramerateNTSC(int multiplier = 30);
-
-	float GetFramesPerSecond() const;
-	DmeTime_t GetTimePerFrame() const;
-
-	bool operator==(DmeFramerate_t f) const { return m_num == f.m_num && m_den == f.m_den; }
-	bool operator!=(DmeFramerate_t f) const { return m_num != f.m_num && m_den != f.m_den; }
-	bool operator< (DmeFramerate_t f) const { return m_num * (int)f.m_den < f.m_num* (int)m_den; }
-	bool operator> (DmeFramerate_t f) const { return m_num * (int)f.m_den > f.m_num * (int)m_den; }
-	bool operator<=(DmeFramerate_t f) const { return m_num * (int)f.m_den <= f.m_num * (int)m_den; }
-	bool operator>=(DmeFramerate_t f) const { return m_num * (int)f.m_den >= f.m_num * (int)m_den; }
-
-	DmeFramerate_t operator*(int i) const { return DmeFramerate_t(m_num * i, m_den); }
-	DmeFramerate_t operator/(int i) const { return DmeFramerate_t(m_num, m_den * i); }
-
-	DmeFramerate_t operator*=(int i) { Assert(abs(m_num * i) <= USHRT_MAX); m_num *= (unsigned short)i; return *this; }
-	DmeFramerate_t operator/=(int i) { Assert(abs(m_den * i) <= USHRT_MAX); m_den *= (unsigned short)i; return *this; }
-
-private:
-	DmeFramerate_t(int nNumerator, int nDenominator);
-
-	unsigned short m_num;
-	unsigned short m_den;
-
-	friend class DmeTime_t;
-};
-
-#define DMETIME_ZERO		DmeTime_t(0)
-#define DMETIME_MINDELTA	DmeTime_t::MinTimeDelta()
-#define DMETIME_MINTIME		DmeTime_t::MinTime()
-#define DMETIME_MAXTIME		DmeTime_t::MaxTime()
-#define DMETIME_INVALID		DmeTime_t::InvalidTime()
-
-class DmeTime_t
-{
-public:
-	DmeTime_t() : m_tms(INT_MIN) {}   
-	explicit DmeTime_t(int tms) : m_tms(tms) {}
-	explicit DmeTime_t(float  sec) : m_tms(RoundSecondsToTMS(sec)) {}
-	explicit DmeTime_t(double sec) : m_tms(RoundSecondsToTMS(sec)) {}
-	DmeTime_t(int frame, DmeFramerate_t framerate);
-
-
-	friend bool operator==(DmeTime_t a, DmeTime_t b) { return a.m_tms == b.m_tms; }
-	friend bool operator!=(DmeTime_t a, DmeTime_t b) { return a.m_tms != b.m_tms; }
-	friend bool operator< (DmeTime_t a, DmeTime_t b) { return a.m_tms < b.m_tms; }
-	friend bool operator> (DmeTime_t a, DmeTime_t b) { return a.m_tms > b.m_tms; }
-	friend bool operator<=(DmeTime_t a, DmeTime_t b) { return a.m_tms <= b.m_tms; }
-	friend bool operator>=(DmeTime_t a, DmeTime_t b) { return a.m_tms >= b.m_tms; }
-
-	friend DmeTime_t operator%(DmeTime_t a, DmeTime_t b) { return DmeTime_t(a.m_tms % b.m_tms); }
-	friend DmeTime_t operator+(DmeTime_t a, DmeTime_t b) { return DmeTime_t(a.m_tms + b.m_tms); }
-	friend DmeTime_t operator-(DmeTime_t a, DmeTime_t b) { return DmeTime_t(a.m_tms - b.m_tms); }
-
-	DmeTime_t operator-() const { return DmeTime_t(-m_tms); }
-
-	DmeTime_t operator+=(DmeTime_t t) { m_tms += t.m_tms; return *this; }
-	DmeTime_t operator-=(DmeTime_t t) { m_tms -= t.m_tms; return *this; }
-
-	friend DmeTime_t operator*(DmeTime_t t, float f) { t *= f; return t; }
-	friend DmeTime_t operator*(float f, DmeTime_t t) { t *= f; return t; }
-	friend DmeTime_t operator/(DmeTime_t t, float f) { t /= f; return t; }
-	friend float     operator/(DmeTime_t n, DmeTime_t d) { return float(n.m_tms / double(d.m_tms)); }
-
-	DmeTime_t operator*=(float f);
-	DmeTime_t operator/=(float f);
-
-	DmeTime_t operator++() { ++m_tms; return *this; }
-	DmeTime_t operator--() { --m_tms; return *this; }
-	DmeTime_t operator++(int) { DmeTime_t t = *this; ++m_tms; return t; }   
-	DmeTime_t operator--(int) { DmeTime_t t = *this; --m_tms; return t; }   
-
-	bool IsValid() const { return m_tms != INT_MIN; }
-
-	static DmeTime_t InvalidTime() { return DmeTime_t(INT_MIN); }
-	static DmeTime_t MinTime() { return DmeTime_t(INT_MIN + 1); }
-	static DmeTime_t MaxTime() { return DmeTime_t(INT_MAX); }
-	static DmeTime_t MinTimeDelta() { return DmeTime_t(1); }
-
-
-	int GetTenthsOfMS() const { return m_tms; }
-	float GetSeconds() const { return m_tms * 0.0001f; }
-	void SetTenthsOfMS(int tms) { m_tms = tms; }
-	void SetSeconds(float sec) { m_tms = RoundSecondsToTMS(sec); }
-
-
-	void Clamp(DmeTime_t lo, DmeTime_t hi);
-	bool IsInRange(DmeTime_t lo, DmeTime_t hi) const;
-
-
-	friend float GetFractionOfTimeBetween(DmeTime_t t, DmeTime_t start, DmeTime_t end, bool bClamp);
-	friend float GetFractionOfTime(DmeTime_t t, DmeTime_t duration, bool bClamp);
-	friend int FrameForTime(DmeTime_t t, DmeFramerate_t framerate);
-
-
-	friend DmeTime_t abs(DmeTime_t t) { return t.m_tms >= 0 ? t : -t; }
-
-
-	int CurrentFrame(DmeFramerate_t framerate, RoundStyle_t roundStyle = ROUND_DOWN) const;
-	DmeTime_t TimeAtCurrentFrame(DmeFramerate_t framerate, RoundStyle_t roundStyle = ROUND_DOWN) const;
-	DmeTime_t TimeAtNextFrame(DmeFramerate_t framerate) const;
-	DmeTime_t TimeAtPrevFrame(DmeFramerate_t framerate) const;
-
-private:
-	explicit DmeTime_t(int64 tms) : m_tms(int(tms)) {}
-
-	static int RoundSecondsToTMS(float sec);
-	static int RoundSecondsToTMS(double sec);
-
-	int m_tms;
-};
-
-float GetFractionOfTimeBetween(DmeTime_t t, DmeTime_t start, DmeTime_t end, bool bClamp = false);
-float GetFractionOfTime(DmeTime_t t, DmeTime_t duration, bool bClamp = false);
-
-class CUtlBuffer;
-bool Serialize(CUtlBuffer& buf, const DmeTime_t& src);
-bool Unserialize(CUtlBuffer& buf, DmeTime_t& dest);
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/touchlink.h b/SpyCustom/touchlink.h
deleted file mode 100644
index 6b710d7..0000000
--- a/SpyCustom/touchlink.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef TOUCHLINK_H
-#define TOUCHLINK_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-enum touchlink_flags_t
-{
-	FTOUCHLINK_START_TOUCH = 0x00000001,
-};
-
-struct touchlink_t
-{
-#if defined( CLIENT_DLL )
-	C_BaseEntity* entityTouched;
-#else
-	EHANDLE				entityTouched;
-#endif
-	int					touchStamp;
-	touchlink_t* nextLink;
-	touchlink_t* prevLink;
-	int					flags;
-};
-
-#define TOUCHSTAMP_EVENT_DRIVEN		-1
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/trace.h b/SpyCustom/trace.h
deleted file mode 100644
index 17dda41..0000000
--- a/SpyCustom/trace.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef TRACE_H
-#define TRACE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "mathlib.h"
-
-#define DISPSURF_FLAG_SURFACE		(1<<0)
-#define DISPSURF_FLAG_WALKABLE		(1<<1)
-#define DISPSURF_FLAG_BUILDABLE		(1<<2)
-#define DISPSURF_FLAG_SURFPROP1		(1<<3)
-#define DISPSURF_FLAG_SURFPROP2		(1<<4)
-
-class CBaseTrace
-{
-public:
-
-	bool IsDispSurface(void) { return ((dispFlags & DISPSURF_FLAG_SURFACE) != 0); }
-	bool IsDispSurfaceWalkable(void) { return ((dispFlags & DISPSURF_FLAG_WALKABLE) != 0); }
-	bool IsDispSurfaceBuildable(void) { return ((dispFlags & DISPSURF_FLAG_BUILDABLE) != 0); }
-	bool IsDispSurfaceProp1(void) { return ((dispFlags & DISPSURF_FLAG_SURFPROP1) != 0); }
-	bool IsDispSurfaceProp2(void) { return ((dispFlags & DISPSURF_FLAG_SURFPROP2) != 0); }
-
-public:
-
-	Vector			startpos;				  
-	Vector			endpos;					  
-	BYTE plane[20]; 
-
-	float			fraction;				       
-
-	int				contents;				       
-	unsigned short	dispFlags;				       
-
-	bool			allsolid;				      
-	bool			startsolid;				          
-
-
-	CBaseTrace() {}
-
-private:
-	CBaseTrace(const CBaseTrace& vOther);
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/tslist.h b/SpyCustom/tslist.h
deleted file mode 100644
index f153c4c..0000000
--- a/SpyCustom/tslist.h
+++ /dev/null
@@ -1,948 +0,0 @@
-#ifndef TSLIST_H
-#define TSLIST_H
-
-#if defined( _WIN32 )
-#pragma once
-#pragma warning( push )
-#pragma warning( disable : 4700 )
-#endif
-
-#if defined( USE_NATIVE_SLIST ) && !defined( _X360 )
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-#include "dbg.h"
-#include "threadtools.h"
-#include "memalloc.h"
-#include "memdbgoff.h"
-
-#if defined( _X360 )
-#define USE_NATIVE_SLIST
-#endif
-
-#if defined( PLATFORM_64BITS )
-
-#if defined (PLATFORM_WINDOWS) 
-#else   
-typedef __int128_t int128;
-#define int128_zero() 0
-#endif 
-
-#define TSLIST_HEAD_ALIGNMENT 16
-#define TSLIST_NODE_ALIGNMENT 16
-
-#ifdef POSIX
-inline bool ThreadInterlockedAssignIf128(int128 volatile* pDest, const int128& value, const int128& comparand)
-{
-	int128 local_comparand = comparand;
-	return __sync_bool_compare_and_swap(pDest, local_comparand, value);
-}
-#endif
-
-inline bool ThreadInterlockedAssignIf64x128(volatile int128* pDest, const int128& value, const int128& comperand)
-{
-	return ThreadInterlockedAssignIf128(pDest, value, comperand);
-}
-#else
-#define TSLIST_HEAD_ALIGNMENT 8
-#define TSLIST_NODE_ALIGNMENT 8
-inline bool ThreadInterlockedAssignIf64x128(volatile int64* pDest, const int64 value, const int64 comperand)
-{
-	return ThreadInterlockedAssignIf64(pDest, value, comperand);
-}
-#endif
-
-#ifdef _MSC_VER
-#define TSLIST_HEAD_ALIGN DECL_ALIGN(TSLIST_HEAD_ALIGNMENT)
-#define TSLIST_NODE_ALIGN DECL_ALIGN(TSLIST_NODE_ALIGNMENT)
-#define TSLIST_HEAD_ALIGN_POST
-#define TSLIST_NODE_ALIGN_POST
-#elif defined( GNUC )
-#define TSLIST_HEAD_ALIGN 
-#define TSLIST_NODE_ALIGN 
-#define TSLIST_HEAD_ALIGN_POST DECL_ALIGN(TSLIST_HEAD_ALIGNMENT)
-#define TSLIST_NODE_ALIGN_POST DECL_ALIGN(TSLIST_NODE_ALIGNMENT)
-#elif defined( _PS3 )
-#define TSLIST_HEAD_ALIGNMENT 8
-#define TSLIST_NODE_ALIGNMENT 8
-
-#define TSLIST_HEAD_ALIGN ALIGN8
-#define TSLIST_NODE_ALIGN ALIGN8
-#define TSLIST_HEAD_ALIGN_POST ALIGN8_POST
-#define TSLIST_NODE_ALIGN_POST ALIGN8_POST
-
-#else
-#error
-#endif
-
-PLATFORM_INTERFACE bool RunTSQueueTests(int nListSize = 10000, int nTests = 1);
-PLATFORM_INTERFACE bool RunTSListTests(int nListSize = 10000, int nTests = 1);
-
-#ifdef USE_NATIVE_SLIST
-typedef SLIST_ENTRY TSLNodeBase_t;
-typedef SLIST_HEADER TSLHead_t;
-#else
-struct TSLIST_NODE_ALIGN TSLNodeBase_t
-{
-	TSLNodeBase_t* Next;     
-} TSLIST_NODE_ALIGN_POST;
-
-union TSLIST_HEAD_ALIGN TSLHead_t
-{
-	struct Value_t
-	{
-		TSLNodeBase_t* Next;
-#ifdef VALVE_BIG_ENDIAN
-		int16	Sequence;
-		int16   Depth;
-#else
-		int16   Depth;
-		int16	Sequence;
-#endif
-#ifdef PLATFORM_64BITS
-		int32   Padding;
-#endif
-	} value;
-
-	struct Value32_t
-	{
-		TSLNodeBase_t* Next_do_not_use_me;
-		int32   DepthAndSequence;
-	} value32;
-
-#ifdef PLATFORM_64BITS
-	int128 value64x128;
-#else
-	int64 value64x128;
-#endif
-} TSLIST_HEAD_ALIGN_POST;
-
-#endif
-
-class CTSListBase
-{
-public:
-
-	static void* operator new(size_t size)
-	{
-		CTSListBase* pNode = (CTSListBase*)MemAlloc_AllocAlignedFileLine(size, TSLIST_HEAD_ALIGNMENT, __FILE__, __LINE__);
-		return pNode;
-	}
-
-	static void* operator new(size_t size, int nBlockUse, const char* pFileName, int nLine)
-	{
-		CTSListBase* pNode = (CTSListBase*)MemAlloc_AllocAlignedFileLine(size, TSLIST_HEAD_ALIGNMENT, pFileName, nLine);
-		return pNode;
-	}
-
-	static void operator delete(void* p)
-	{
-		MemAlloc_FreeAligned(p);
-	}
-
-	static void operator delete(void* p, int nBlockUse, const char* pFileName, int nLine)
-	{
-		MemAlloc_FreeAligned(p);
-	}
-
-private:
-	static void* operator new[](size_t size);
-	static void operator delete[](void* p);
-
-public:
-
-	CTSListBase()
-	{
-		if (((size_t)&m_Head) % TSLIST_HEAD_ALIGNMENT != 0)
-		{
-			Error("CTSListBase: Misaligned list\n");
-			DebuggerBreak();
-		}
-
-#ifdef USE_NATIVE_SLIST
-		InitializeSListHead(&m_Head);
-#elif defined(PLATFORM_64BITS)
-		m_Head.value64x128 = int128_zero();
-#else
-		m_Head.value64x128 = (int64)0;
-#endif
-	}
-
-	~CTSListBase()
-	{
-		Detach();
-	}
-
-	TSLNodeBase_t* Push(TSLNodeBase_t* pNode)
-	{
-#ifdef _DEBUG
-		if ((size_t)pNode % TSLIST_NODE_ALIGNMENT != 0)
-		{
-			Error("CTSListBase: Misaligned node\n");
-			DebuggerBreak();
-		}
-#endif
-
-#ifdef USE_NATIVE_SLIST
-#ifdef _X360
-		return (TSLNodeBase_t*)InterlockedPushEntrySListRelease(&m_Head, pNode);
-#else
-		return (TSLNodeBase_t*)InterlockedPushEntrySList(&m_Head, pNode);
-#endif
-#else
-		TSLHead_t oldHead;
-		TSLHead_t newHead;
-
-#if defined( PLATFORM_PS3 ) || defined( PLATFORM_X360 )
-		__lwsync();   
-#endif
-
-#ifdef PLATFORM_64BITS
-		newHead.value.Padding = 0;
-#endif
-		for (;; )
-		{
-			oldHead.value64x128 = m_Head.value64x128;
-			pNode->Next = oldHead.value.Next;
-			newHead.value.Next = pNode;
-
-			newHead.value32.DepthAndSequence = oldHead.value32.DepthAndSequence + 0x10001;
-
-
-			if (ThreadInterlockedAssignIf64x128(&m_Head.value64x128, newHead.value64x128, oldHead.value64x128))
-			{
-				break;
-			}
-			ThreadPause();
-		};
-
-		return (TSLNodeBase_t*)oldHead.value.Next;
-#endif
-	}
-
-	TSLNodeBase_t* Pop()
-	{
-#ifdef USE_NATIVE_SLIST
-#ifdef _X360
-		TSLNodeBase_t* pNode = (TSLNodeBase_t*)InterlockedPopEntrySListAcquire(&m_Head);
-#else
-		TSLNodeBase_t* pNode = (TSLNodeBase_t*)InterlockedPopEntrySList(&m_Head);
-#endif
-		return pNode;
-#else
-		TSLHead_t oldHead;
-		TSLHead_t newHead;
-
-#ifdef PLATFORM_64BITS
-		newHead.value.Padding = 0;
-#endif
-		for (;; )
-		{
-			oldHead.value64x128 = m_Head.value64x128;
-			if (!oldHead.value.Next)
-				return NULL;
-
-			newHead.value.Next = oldHead.value.Next->Next;
-			newHead.value32.DepthAndSequence = oldHead.value32.DepthAndSequence - 1;
-
-
-			if (ThreadInterlockedAssignIf64x128(&m_Head.value64x128, newHead.value64x128, oldHead.value64x128))
-			{
-#if defined( PLATFORM_PS3 ) || defined( PLATFORM_X360 )
-				__lwsync();   
-#endif
-				break;
-			}
-			ThreadPause();
-		};
-
-		return (TSLNodeBase_t*)oldHead.value.Next;
-#endif
-	}
-
-	TSLNodeBase_t* Detach()
-	{
-#ifdef USE_NATIVE_SLIST
-		TSLNodeBase_t* pBase = (TSLNodeBase_t*)InterlockedFlushSList(&m_Head);
-#if defined( _X360 ) || defined( _PS3 )
-		__lwsync();   
-#endif
-		return pBase;
-#else
-		TSLHead_t oldHead;
-		TSLHead_t newHead;
-
-#ifdef PLATFORM_64BITS
-		newHead.value.Padding = 0;
-#endif
-		do
-		{
-			ThreadPause();
-
-			oldHead.value64x128 = m_Head.value64x128;
-			if (!oldHead.value.Next)
-				return NULL;
-
-			newHead.value.Next = NULL;
-			newHead.value32.DepthAndSequence = oldHead.value32.DepthAndSequence & 0xffff0000;
-
-		} while (!ThreadInterlockedAssignIf64x128(&m_Head.value64x128, newHead.value64x128, oldHead.value64x128));
-
-		return (TSLNodeBase_t*)oldHead.value.Next;
-#endif
-	}
-
-	TSLHead_t* AccessUnprotected()
-	{
-		return &m_Head;
-	}
-
-	int Count() const
-	{
-#ifdef USE_NATIVE_SLIST
-		return QueryDepthSList(const_cast<TSLHead_t*>(&m_Head));
-#else
-		return m_Head.value.Depth;
-#endif
-	}
-
-private:
-	TSLHead_t m_Head;
-} TSLIST_HEAD_ALIGN_POST;
-
-template <typename T>
-class TSLIST_HEAD_ALIGN CTSSimpleList : public CTSListBase
-{
-public:
-	void Push(T* pNode)
-	{
-		Assert(sizeof(T) >= sizeof(TSLNodeBase_t));
-		CTSListBase::Push((TSLNodeBase_t*)pNode);
-	}
-
-	T* Pop()
-	{
-		return (T*)CTSListBase::Pop();
-	}
-} TSLIST_HEAD_ALIGN_POST;
-
-template< class T >
-class TSLIST_HEAD_ALIGN CTSPool : public CTSListBase
-{
-	struct TSLIST_NODE_ALIGN simpleTSPoolStruct_t : public TSLNodeBase_t
-	{
-		T elem;
-	} TSLIST_NODE_ALIGN_POST;
-
-public:
-
-	~CTSPool()
-	{
-		Purge();
-	}
-
-	void Purge()
-	{
-		simpleTSPoolStruct_t* pNode = NULL;
-		while (1)
-		{
-			pNode = (simpleTSPoolStruct_t*)CTSListBase::Pop();
-			if (!pNode)
-				break;
-			delete pNode;
-		}
-	}
-
-	void PutObject(T* pInfo)
-	{
-		char* pElem = (char*)pInfo;
-		pElem -= offsetof(simpleTSPoolStruct_t, elem);
-		simpleTSPoolStruct_t* pNode = (simpleTSPoolStruct_t*)pElem;
-
-		CTSListBase::Push(pNode);
-	}
-
-	T* GetObject()
-	{
-		simpleTSPoolStruct_t* pNode = (simpleTSPoolStruct_t*)CTSListBase::Pop();
-		if (!pNode)
-		{
-			pNode = new simpleTSPoolStruct_t;
-		}
-		return &pNode->elem;
-	}
-
-	FORCEINLINE T* Get()
-	{
-		return GetObject();
-	}
-} TSLIST_HEAD_ALIGN_POST;
-template <typename T>
-class TSLIST_HEAD_ALIGN CTSList : public CTSListBase
-{
-public:
-	struct TSLIST_NODE_ALIGN Node_t : public TSLNodeBase_t
-	{
-		Node_t() {}
-		Node_t(const T& init) : elem(init) {}
-		T elem;
-
-		static void* operator new(size_t size)
-		{
-			Node_t* pNode = (Node_t*)MemAlloc_AllocAlignedFileLine(size, TSLIST_NODE_ALIGNMENT, __FILE__, __LINE__);
-			return pNode;
-		}
-
-		static void* operator new(size_t size, int nBlockUse, const char* pFileName, int nLine)
-		{
-			Node_t* pNode = (Node_t*)MemAlloc_AllocAlignedFileLine(size, TSLIST_NODE_ALIGNMENT, pFileName, nLine);
-			return pNode;
-		}
-
-		static void operator delete(void* p)
-		{
-			MemAlloc_FreeAligned(p);
-		}
-		static void operator delete(void* p, int nBlockUse, const char* pFileName, int nLine)
-		{
-			MemAlloc_FreeAligned(p);
-		}
-
-	} TSLIST_NODE_ALIGN_POST;
-
-	~CTSList()
-	{
-		Purge();
-	}
-
-	void Purge()
-	{
-		Node_t* pCurrent = Detach();
-		Node_t* pNext;
-		while (pCurrent)
-		{
-			pNext = (Node_t*)pCurrent->Next;
-			delete pCurrent;
-			pCurrent = pNext;
-		}
-	}
-
-	void RemoveAll()
-	{
-		Purge();
-	}
-
-	Node_t* Push(Node_t* pNode)
-	{
-		return (Node_t*)CTSListBase::Push(pNode);
-	}
-
-	Node_t* Pop()
-	{
-		return (Node_t*)CTSListBase::Pop();
-	}
-
-	void PushItem(const T& init)
-	{
-		Push(new Node_t(init));
-	}
-
-	bool PopItem(T* pResult)
-	{
-		Node_t* pNode = Pop();
-		if (!pNode)
-			return false;
-		*pResult = pNode->elem;
-		delete pNode;
-		return true;
-	}
-
-	Node_t* Detach()
-	{
-		return (Node_t*)CTSListBase::Detach();
-	}
-
-} TSLIST_HEAD_ALIGN_POST;
-
-template <typename T>
-class TSLIST_HEAD_ALIGN CTSListWithFreeList : public CTSListBase
-{
-public:
-	struct TSLIST_NODE_ALIGN Node_t : public TSLNodeBase_t
-	{
-		Node_t() {}
-		Node_t(const T& init) : elem(init) {}
-
-		T elem;
-	} TSLIST_NODE_ALIGN_POST;
-
-	~CTSListWithFreeList()
-	{
-		Purge();
-	}
-
-	void Purge()
-	{
-		Node_t* pCurrent = Detach();
-		Node_t* pNext;
-		while (pCurrent)
-		{
-			pNext = (Node_t*)pCurrent->Next;
-			delete pCurrent;
-			pCurrent = pNext;
-		}
-		pCurrent = (Node_t*)m_FreeList.Detach();
-		while (pCurrent)
-		{
-			pNext = (Node_t*)pCurrent->Next;
-			delete pCurrent;
-			pCurrent = pNext;
-		}
-	}
-
-	void RemoveAll()
-	{
-		Node_t* pCurrent = Detach();
-		Node_t* pNext;
-		while (pCurrent)
-		{
-			pNext = (Node_t*)pCurrent->Next;
-			m_FreeList.Push(pCurrent);
-			pCurrent = pNext;
-		}
-	}
-
-	Node_t* Push(Node_t* pNode)
-	{
-		return (Node_t*)CTSListBase::Push(pNode);
-	}
-
-	Node_t* Pop()
-	{
-		return (Node_t*)CTSListBase::Pop();
-	}
-
-	void PushItem(const T& init)
-	{
-		Node_t* pNode = (Node_t*)m_FreeList.Pop();
-		if (!pNode)
-		{
-			pNode = new Node_t;
-		}
-		pNode->elem = init;
-		Push(pNode);
-	}
-
-	bool PopItem(T* pResult)
-	{
-		Node_t* pNode = Pop();
-		if (!pNode)
-			return false;
-		*pResult = pNode->elem;
-		m_FreeList.Push(pNode);
-		return true;
-	}
-
-	Node_t* Detach()
-	{
-		return (Node_t*)CTSListBase::Detach();
-	}
-
-	void FreeNode(Node_t* pNode)
-	{
-		m_FreeList.Push(pNode);
-	}
-
-private:
-	CTSListBase m_FreeList;
-} TSLIST_HEAD_ALIGN_POST;
-
-template <typename T, bool bTestOptimizer = false>
-class TSLIST_HEAD_ALIGN CTSQueue
-{
-public:
-
-	static void* operator new(size_t size)
-	{
-		CTSQueue* pNode = (CTSQueue*)MemAlloc_AllocAlignedFileLine(size, TSLIST_HEAD_ALIGNMENT, __FILE__, __LINE__);
-		return pNode;
-	}
-
-	static void* operator new(size_t size, int nBlockUse, const char* pFileName, int nLine)
-	{
-		CTSQueue* pNode = (CTSQueue*)MemAlloc_AllocAlignedFileLine(size, TSLIST_HEAD_ALIGNMENT, pFileName, nLine);
-		return pNode;
-	}
-
-	static void operator delete(void* p)
-	{
-		MemAlloc_FreeAligned(p);
-	}
-
-	static void operator delete(void* p, int nBlockUse, const char* pFileName, int nLine)
-	{
-		MemAlloc_FreeAligned(p);
-	}
-
-private:
-	static void* operator new[](size_t size) throw()
-	{
-		return NULL;
-	}
-
-		static void operator delete [](void* p)
-	{
-	}
-
-public:
-
-	struct TSLIST_NODE_ALIGN Node_t
-	{
-		static void* operator new(size_t size)
-		{
-			Node_t* pNode = (Node_t*)MemAlloc_AllocAlignedFileLine(size, TSLIST_HEAD_ALIGNMENT, __FILE__, __LINE__);
-			return pNode;
-		}
-
-		static void* operator new(size_t size, int nBlockUse, const char* pFileName, int nLine)
-		{
-			Node_t* pNode = (Node_t*)MemAlloc_AllocAlignedFileLine(size, TSLIST_HEAD_ALIGNMENT, pFileName, nLine);
-			return pNode;
-		}
-
-		static void operator delete(void* p)
-		{
-			MemAlloc_FreeAligned(p);
-		}
-
-		static void operator delete(void* p, int nBlockUse, const char* pFileName, int nLine)
-		{
-			MemAlloc_FreeAligned(p);
-		}
-
-		Node_t() {}
-		Node_t(const T& init) : elem(init) {}
-
-		Node_t* pNext;
-		T elem;
-	} TSLIST_NODE_ALIGN_POST;
-
-	union TSLIST_HEAD_ALIGN NodeLink_t
-	{
-		static void* operator new(size_t size)
-		{
-			NodeLink_t* pNode = (NodeLink_t*)MemAlloc_AllocAlignedFileLine(size, TSLIST_HEAD_ALIGNMENT, __FILE__, __LINE__);
-			return pNode;
-		}
-
-		static void operator delete(void* p)
-		{
-			MemAlloc_FreeAligned(p);
-		}
-
-		struct Value_t
-		{
-			Node_t* pNode;
-			intp	sequence;
-		} value;
-
-#ifdef PLATFORM_64BITS
-		int128 value64x128;
-#else
-		int64 value64x128;
-#endif
-	} TSLIST_HEAD_ALIGN_POST;
-
-	CTSQueue()
-	{
-		COMPILE_TIME_ASSERT(sizeof(Node_t) >= sizeof(TSLNodeBase_t));
-		if (((size_t)&m_Head) % TSLIST_HEAD_ALIGNMENT != 0)
-		{
-			Error("CTSQueue: Misaligned queue\n");
-			DebuggerBreak();
-		}
-		if (((size_t)&m_Tail) % TSLIST_HEAD_ALIGNMENT != 0)
-		{
-			Error("CTSQueue: Misaligned queue\n");
-			DebuggerBreak();
-		}
-		m_Count = 0;
-		m_Head.value.sequence = m_Tail.value.sequence = 0;
-		m_Head.value.pNode = m_Tail.value.pNode = new Node_t;       
-		m_Head.value.pNode->pNext = End();
-	}
-
-	~CTSQueue()
-	{
-		Purge();
-		Assert(m_Count == 0);
-		Assert(m_Head.value.pNode == m_Tail.value.pNode);
-		Assert(m_Head.value.pNode->pNext == End());
-		delete m_Head.value.pNode;
-	}
-
-	void Purge()
-	{
-		if (IsDebug())
-		{
-			ValidateQueue();
-		}
-
-		Node_t* pNode;
-		while ((pNode = Pop()) != NULL)
-		{
-			delete pNode;
-		}
-
-		while ((pNode = (Node_t*)m_FreeNodes.Pop()) != NULL)
-		{
-			delete pNode;
-		}
-
-		Assert(m_Count == 0);
-		Assert(m_Head.value.pNode == m_Tail.value.pNode);
-		Assert(m_Head.value.pNode->pNext == End());
-
-		m_Head.value.sequence = m_Tail.value.sequence = 0;
-	}
-
-	void RemoveAll()
-	{
-		if (IsDebug())
-		{
-			ValidateQueue();
-		}
-
-		Node_t* pNode;
-		while ((pNode = Pop()) != NULL)
-		{
-			m_FreeNodes.Push((TSLNodeBase_t*)pNode);
-		}
-	}
-
-	bool ValidateQueue()
-	{
-		if (IsDebug())
-		{
-			bool bResult = true;
-			int nNodes = 0;
-			if (m_Tail.value.pNode->pNext != End())
-			{
-				DebuggerBreakIfDebugging();
-				bResult = false;
-			}
-
-			if (m_Count == 0)
-			{
-				if (m_Head.value.pNode != m_Tail.value.pNode)
-				{
-					DebuggerBreakIfDebugging();
-					bResult = false;
-				}
-			}
-
-			Node_t* pNode = m_Head.value.pNode;
-			while (pNode != End())
-			{
-				nNodes++;
-				pNode = pNode->pNext;
-			}
-
-			nNodes--;   
-
-			if (nNodes != m_Count)
-			{
-				DebuggerBreakIfDebugging();
-				bResult = false;
-			}
-
-			if (!bResult)
-			{
-				Msg("Corrupt CTSQueueDetected");
-			}
-
-			return bResult;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	void FinishPush(Node_t* pNode, const NodeLink_t& oldTail)
-	{
-		NodeLink_t newTail;
-
-		newTail.value.pNode = pNode;
-		newTail.value.sequence = oldTail.value.sequence + 1;
-
-		ThreadMemoryBarrier();
-
-		InterlockedCompareExchangeNodeLink(&m_Tail, newTail, oldTail);
-	}
-
-	Node_t* Push(Node_t* pNode)
-	{
-#ifdef _DEBUG
-		if ((size_t)pNode % TSLIST_NODE_ALIGNMENT != 0)
-		{
-			Error("CTSListBase: Misaligned node\n");
-			DebuggerBreak();
-		}
-#endif
-
-		NodeLink_t oldTail;
-
-		pNode->pNext = End();
-
-		for (;; )
-		{
-			oldTail.value.sequence = m_Tail.value.sequence;
-			oldTail.value.pNode = m_Tail.value.pNode;
-			if (InterlockedCompareExchangeNode(&(oldTail.value.pNode->pNext), pNode, End()) == End())
-			{
-				break;
-			}
-			else
-			{
-				FinishPush(oldTail.value.pNode->pNext, oldTail);
-			}
-		}
-
-		FinishPush(pNode, oldTail);                    
-
-		m_Count++;
-
-		return oldTail.value.pNode;
-	}
-
-	Node_t* Pop()
-	{
-#define TSQUEUE_BAD_NODE_LINK ( (Node_t *)INT_TO_POINTER( 0xdeadbeef ) )
-		NodeLink_t* volatile		pHead = &m_Head;
-		NodeLink_t* volatile		pTail = &m_Tail;
-		Node_t* volatile* pHeadNode = &m_Head.value.pNode;
-		volatile intp* volatile	pHeadSequence = &m_Head.value.sequence;
-		Node_t* volatile* pTailNode = &pTail->value.pNode;
-
-		NodeLink_t head;
-		NodeLink_t newHead;
-		Node_t* pNext;
-		intp tailSequence;
-		T elem;
-
-		for (;; )
-		{
-			head.value.sequence = *pHeadSequence;              
-			ThreadMemoryBarrier();          
-			head.value.pNode = *pHeadNode;
-			tailSequence = pTail->value.sequence;
-			pNext = head.value.pNode->pNext;
-
-			if (!pNext || head.value.sequence != *pHeadSequence)
-				continue;
-
-			if (bTestOptimizer)
-			{
-				if (pNext == TSQUEUE_BAD_NODE_LINK)
-				{
-					Msg("Bad node link detected\n");
-					continue;
-				}
-			}
-
-			if (head.value.pNode == *pTailNode)
-			{
-				if (pNext == End())
-					return NULL;
-
-				NodeLink_t& oldTail = head;           
-				oldTail.value.sequence = tailSequence;    
-				FinishPush(pNext, oldTail);
-				continue;
-			}
-
-			if (pNext != End())
-			{
-				elem = pNext->elem;           
-				newHead.value.pNode = pNext;
-				newHead.value.sequence = head.value.sequence + 1;
-				if (InterlockedCompareExchangeNodeLink(pHead, newHead, head))
-				{
-					ThreadMemoryBarrier();
-					if (bTestOptimizer)
-					{
-						head.value.pNode->pNext = TSQUEUE_BAD_NODE_LINK;
-					}
-					break;
-				}
-			}
-		}
-
-		m_Count--;
-		head.value.pNode->elem = elem;
-		return head.value.pNode;
-	}
-
-	void FreeNode(Node_t* pNode)
-	{
-		m_FreeNodes.Push((TSLNodeBase_t*)pNode);
-	}
-
-	void PushItem(const T& init)
-	{
-		Node_t* pNode = (Node_t*)m_FreeNodes.Pop();
-		if (pNode)
-		{
-			pNode->elem = init;
-		}
-		else
-		{
-			pNode = new Node_t(init);
-		}
-		Push(pNode);
-	}
-
-	bool PopItem(T* pResult)
-	{
-		Node_t* pNode = Pop();
-		if (!pNode)
-			return false;
-
-		*pResult = pNode->elem;
-		m_FreeNodes.Push((TSLNodeBase_t*)pNode);
-		return true;
-	}
-
-	int Count() const
-	{
-		return m_Count;
-	}
-
-private:
-	Node_t* End() { return (Node_t*)this; }      
-
-	Node_t* InterlockedCompareExchangeNode(Node_t* volatile* ppNode, Node_t* value, Node_t* comperand)
-	{
-		return (Node_t*)::ThreadInterlockedCompareExchangePointer((void**)ppNode, value, comperand);
-	}
-
-	bool InterlockedCompareExchangeNodeLink(NodeLink_t volatile* pLink, const NodeLink_t& value, const NodeLink_t& comperand)
-	{
-		return ThreadInterlockedAssignIf64x128(&pLink->value64x128, value.value64x128, comperand.value64x128);
-	}
-
-	NodeLink_t m_Head;
-	NodeLink_t m_Tail;
-
-	CInterlockedInt m_Count;
-
-	CTSListBase m_FreeNodes;
-} TSLIST_NODE_ALIGN_POST;
-
-#if defined( _WIN32 )
-#pragma warning( pop )
-#endif
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/uniqueid.h b/SpyCustom/uniqueid.h
deleted file mode 100644
index e71f93e..0000000
--- a/SpyCustom/uniqueid.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef UNIQUEID_H
-#define UNIQUEID_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-
-
-struct UniqueId_t;
-class CUtlBuffer;
-
-
-struct UniqueId_t
-{
-	unsigned char m_Value[16];
-};
-
-
-void CreateUniqueId(UniqueId_t* pDest);
-void InvalidateUniqueId(UniqueId_t* pDest);
-bool IsUniqueIdValid(const UniqueId_t& id);
-bool IsUniqueIdEqual(const UniqueId_t& id1, const UniqueId_t& id2);
-void UniqueIdToString(const UniqueId_t& id, char* pBuf, int nMaxLen);
-bool UniqueIdFromString(UniqueId_t* pDest, const char* pBuf, int nMaxLen = 0);
-void CopyUniqueId(const UniqueId_t& src, UniqueId_t* pDest);
-bool Serialize(CUtlBuffer& buf, const UniqueId_t& src);
-bool Unserialize(CUtlBuffer& buf, UniqueId_t& dest);
-
-inline bool operator ==(const UniqueId_t& lhs, const UniqueId_t& rhs)
-{
-	return !Q_memcmp((void*)&lhs.m_Value[0], (void*)&rhs.m_Value[0], sizeof(lhs.m_Value));
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/usercmd.h b/SpyCustom/usercmd.h
deleted file mode 100644
index 01e7458..0000000
--- a/SpyCustom/usercmd.h
+++ /dev/null
@@ -1,295 +0,0 @@
-#if !defined( USERCMD_H )
-#define USERCMD_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vector.h"
-#include "utlvector.h"
-#include "imovehelper.h"
-#include "checksum_crc.h"
-
-
-class bf_read;
-class bf_write;
-
-class CEntityGroundContact
-{
-public:
-	int					entindex;
-	float				minheight;
-	float				maxheight;
-};
-
-#ifdef DOTA_DLL
-
-class CUnitOrders
-{
-public:
-
-	CUnitOrders()
-	{
-		m_nOrderSequenceNumber = 0;
-	}
-
-	void Reset(void)
-	{
-		m_nUnits.RemoveAll();
-		m_nOrderType = 0;
-		m_nTargetIndex = 0;
-		m_vPosition = vec3_origin;
-		m_nAbilityIndex = 0;
-	}
-
-	int		m_nOrderSequenceNumber;
-	CUtlVector <int>		m_nUnits;
-	int		m_nOrderType;
-	int		m_nTargetIndex;
-	int		m_nAbilityIndex;
-	Vector  m_vPosition;
-};
-
-#endif
-
-
-class CUserCmd
-{
-public:
-	CUserCmd()
-	{
-		Reset();
-	}
-
-	virtual ~CUserCmd() { };
-
-	void Reset()
-	{
-		command_number = 0;
-		tick_count = 0;
-		viewangles.Init();
-		aimdirection.Init();
-		forwardmove = 0.0f;
-		sidemove = 0.0f;
-		upmove = 0.0f;
-		buttons = 0;
-		impulse = 0;
-		weaponselect = 0;
-		weaponsubtype = 0;
-		random_seed = 0;
-#ifndef CLIENT_DLL
-		server_random_seed = 0;
-#endif
-		mousedx = 0;
-		mousedy = 0;
-
-		hasbeenpredicted = false;
-#if defined( HL2_DLL ) || defined( HL2_CLIENT_DLL )
-		entitygroundcontact.RemoveAll();
-#endif
-
-#ifdef DOTA_DLL
-		dota_unitorders.Reset();
-#endif
-
-#if defined ( PORTAL2 )
-		player_held_entity = 0;
-		held_entity_was_grabbed_through_portal = 0;
-
-		command_acknowledgements_pending = 0;
-		predictedPortalTeleportations = 0;
-#endif  
-
-		headangles.Init();
-		headoffset.Init();
-
-#if defined( INFESTED_DLL ) || defined( DOTA_DLL )
-		crosshairtrace = vec3_origin;
-#endif
-
-#ifdef INFESTED_DLL
-		crosshair_entity = 0;
-		forced_action = 0;
-		sync_kill_ent = 0;
-		skill_dest.Init();
-		skill_dest_ent = 0;
-
-#endif
-
-#if defined( KEEP_COMMAND_REPREDICTION_COUNT )
-		debug_RepredictionCount = 0;
-#endif
-	}
-
-	CUserCmd& operator =(const CUserCmd& src)
-	{
-		if (this == &src)
-			return *this;
-
-		command_number = src.command_number;
-		tick_count = src.tick_count;
-		viewangles = src.viewangles;
-		aimdirection = src.aimdirection;
-		forwardmove = src.forwardmove;
-		sidemove = src.sidemove;
-		upmove = src.upmove;
-		buttons = src.buttons;
-		impulse = src.impulse;
-		weaponselect = src.weaponselect;
-		weaponsubtype = src.weaponsubtype;
-		random_seed = src.random_seed;
-#ifndef CLIENT_DLL
-		server_random_seed = src.server_random_seed;
-#endif
-		mousedx = src.mousedx;
-		mousedy = src.mousedy;
-
-		hasbeenpredicted = src.hasbeenpredicted;
-
-#if defined( HL2_DLL ) || defined( HL2_CLIENT_DLL )
-		entitygroundcontact = src.entitygroundcontact;
-#endif
-
-#if defined ( PORTAL2 )
-		player_held_entity = src.player_held_entity;
-		held_entity_was_grabbed_through_portal = src.held_entity_was_grabbed_through_portal;
-		command_acknowledgements_pending = src.command_acknowledgements_pending;
-		predictedPortalTeleportations = src.predictedPortalTeleportations;
-#endif  
-
-		headangles = src.headangles;
-		headoffset = src.headoffset;
-#if defined( INFESTED_DLL ) || defined( DOTA_DLL )
-		crosshairtrace = src.crosshairtrace;
-#endif
-
-#ifdef INFESTED_DLL
-		crosshair_entity = src.crosshair_entity;
-		forced_action = src.forced_action;
-		sync_kill_ent = src.sync_kill_ent;
-		skill_dest = src.skill_dest;
-		skill_dest_ent = src.skill_dest_ent;
-#endif
-
-#ifdef DOTA_DLL
-		dota_unitorders = src.dota_unitorders;
-#endif
-
-#if defined( KEEP_COMMAND_REPREDICTION_COUNT )
-		debug_RepredictionCount = src.debug_RepredictionCount;
-#endif
-
-		return *this;
-	}
-
-	CUserCmd(const CUserCmd& src)
-	{
-		*this = src;
-	}
-
-	CRC32_t GetChecksum(void) const
-	{
-		CRC32_t crc;
-
-		CRC32_Init(&crc);
-		CRC32_ProcessBuffer(&crc, &command_number, sizeof(command_number));
-		CRC32_ProcessBuffer(&crc, &tick_count, sizeof(tick_count));
-		CRC32_ProcessBuffer(&crc, &viewangles, sizeof(viewangles));
-		CRC32_ProcessBuffer(&crc, &aimdirection, sizeof(aimdirection));
-		CRC32_ProcessBuffer(&crc, &forwardmove, sizeof(forwardmove));
-		CRC32_ProcessBuffer(&crc, &sidemove, sizeof(sidemove));
-		CRC32_ProcessBuffer(&crc, &upmove, sizeof(upmove));
-		CRC32_ProcessBuffer(&crc, &buttons, sizeof(buttons));
-		CRC32_ProcessBuffer(&crc, &impulse, sizeof(impulse));
-		CRC32_ProcessBuffer(&crc, &weaponselect, sizeof(weaponselect));
-		CRC32_ProcessBuffer(&crc, &weaponsubtype, sizeof(weaponsubtype));
-		CRC32_ProcessBuffer(&crc, &random_seed, sizeof(random_seed));
-		CRC32_ProcessBuffer(&crc, &mousedx, sizeof(mousedx));
-		CRC32_ProcessBuffer(&crc, &mousedy, sizeof(mousedy));
-
-#if defined( INFESTED_DLL ) || defined( DOTA_DLL )
-		CRC32_ProcessBuffer(&crc, &crosshairtrace, sizeof(crosshairtrace));
-#endif
-
-#if defined ( PORTAL2 )
-		CRC32_ProcessBuffer(&crc, &player_held_entity, sizeof(player_held_entity));
-		CRC32_ProcessBuffer(&crc, &held_entity_was_grabbed_through_portal, sizeof(held_entity_was_grabbed_through_portal));
-		CRC32_ProcessBuffer(&crc, &command_acknowledgements_pending, sizeof(command_acknowledgements_pending));
-		CRC32_ProcessBuffer(&crc, &predictedPortalTeleportations, sizeof(predictedPortalTeleportations));
-#endif  
-
-#ifdef INFESTED_DLL
-		CRC32_ProcessBuffer(&crc, &crosshair_entity, sizeof(crosshair_entity));
-		CRC32_ProcessBuffer(&crc, &forced_action, sizeof(forced_action));
-		CRC32_ProcessBuffer(&crc, &sync_kill_ent, sizeof(sync_kill_ent));
-		CRC32_ProcessBuffer(&crc, &skill_dest, sizeof(skill_dest));
-		CRC32_ProcessBuffer(&crc, &skill_dest_ent, sizeof(skill_dest_ent));
-#endif
-		CRC32_Final(&crc);
-
-		return crc;
-	}
-
-	int		command_number;
-
-	int		tick_count;
-
-	QAngle	viewangles;
-	Vector	aimdirection;	    
-	float	forwardmove;
-	float	sidemove;
-	float	upmove;
-	int		buttons;
-	byte    impulse;
-	int		weaponselect;
-	int		weaponsubtype;
-
-	int		random_seed;	    
-
-#ifndef CLIENT_DLL
-	int		server_random_seed;       
-#endif
-
-	short	mousedx;		       
-	short	mousedy;		       
-
-	bool	hasbeenpredicted;
-
-#if defined( HL2_DLL ) || defined( HL2_CLIENT_DLL )
-	CUtlVector< CEntityGroundContact > entitygroundcontact;
-#endif
-
-#if defined ( DOTA_DLL )
-	CUnitOrders dota_unitorders;
-#endif
-
-#if defined ( PORTAL2 )
-	short player_held_entity;
-	short held_entity_was_grabbed_through_portal;
-
-	unsigned short command_acknowledgements_pending;                                
-	uint8 predictedPortalTeleportations;             
-#endif  
-
-	QAngle headangles;
-	Vector headoffset;
-#if defined( INFESTED_DLL ) || defined( DOTA_DLL )
-	Vector crosshairtrace;		       
-#endif
-
-#ifdef INFESTED_DLL
-	short crosshair_entity;			        
-	byte forced_action;
-	short sync_kill_ent;
-	Vector skill_dest;
-	short skill_dest_ent;
-#endif
-
-#if defined( KEEP_COMMAND_REPREDICTION_COUNT )
-	unsigned int debug_RepredictionCount;
-#endif
-};
-
-void ReadUsercmd(bf_read* buf, CUserCmd* move, CUserCmd* from);
-void WriteUsercmd(bf_write* buf, const CUserCmd* to, const CUserCmd* from);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/userid.h b/SpyCustom/userid.h
deleted file mode 100644
index d8c2ef4..0000000
--- a/SpyCustom/userid.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef USERID_H
-#define USERID_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#if !defined( INCLUDED_STEAM_STEAMUSERIDTYPES_H )
-#include "SteamCommon.h"
-#endif
-
-#define IDTYPE_WON		0
-#define IDTYPE_STEAM	1
-#define IDTYPE_VALVE	2
-#define IDTYPE_HLTV		3		
-#define IDTYPE_REPLAY	4
-typedef struct USERID_s
-{
-	int			idtype;
-
-	union
-	{
-		TSteamGlobalUserID	steamid;
-	} uid;
-
-} USERID_t;
-
-#endif  
diff --git a/SpyCustom/utlblockmemory.h b/SpyCustom/utlblockmemory.h
deleted file mode 100644
index 7fb4512..0000000
--- a/SpyCustom/utlblockmemory.h
+++ /dev/null
@@ -1,294 +0,0 @@
-#ifndef UTLBLOCKMEMORY_H
-#define UTLBLOCKMEMORY_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dbg.h"
-#include "platform.h"
-#include "mathlib.h"
-
-#include "memalloc.h"
-#include "memdbgon.h"
-
-#pragma warning (disable:4100)
-#pragma warning (disable:4514)
-
-#ifdef UTBLOCKLMEMORY_TRACK
-#define UTLBLOCKMEMORY_TRACK_ALLOC()		MemAlloc_RegisterAllocation( "Sum of all UtlBlockMemory", 0, NumAllocated() * sizeof(T), NumAllocated() * sizeof(T), 0 )
-#define UTLBLOCKMEMORY_TRACK_FREE()		if ( !m_pMemory ) ; else MemAlloc_RegisterDeallocation( "Sum of all UtlBlockMemory", 0, NumAllocated() * sizeof(T), NumAllocated() * sizeof(T), 0 )
-#else
-#define UTLBLOCKMEMORY_TRACK_ALLOC()		((void)0)
-#define UTLBLOCKMEMORY_TRACK_FREE()		((void)0)
-#endif
-
-
-template< class T, class I >
-class CUtlBlockMemory
-{
-public:
-	CUtlBlockMemory(int nGrowSize = 0, int nInitSize = 0);
-	~CUtlBlockMemory();
-
-	void Init(int nGrowSize = 0, int nInitSize = 0);
-
-	T* Base() { return NULL; }
-	const T* Base() const { return NULL; }
-
-	class Iterator_t
-	{
-	public:
-		Iterator_t(I i) : index(i) {}
-		I index;
-
-		bool operator==(const Iterator_t it) const { return index == it.index; }
-		bool operator!=(const Iterator_t it) const { return index != it.index; }
-	};
-	Iterator_t First() const { return Iterator_t(IsIdxValid(0) ? 0 : InvalidIndex()); }
-	Iterator_t Next(const Iterator_t& it) const { return Iterator_t(IsIdxValid(it.index + 1) ? it.index + 1 : InvalidIndex()); }
-	I GetIndex(const Iterator_t& it) const { return it.index; }
-	bool IsIdxAfter(I i, const Iterator_t& it) const { return i > it.index; }
-	bool IsValidIterator(const Iterator_t& it) const { return IsIdxValid(it.index); }
-	Iterator_t InvalidIterator() const { return Iterator_t(InvalidIndex()); }
-
-	T& operator[](I i);
-	const T& operator[](I i) const;
-	T& Element(I i);
-	const T& Element(I i) const;
-
-	bool IsIdxValid(I i) const;
-	static I InvalidIndex() { return (I)-1; }
-
-	void Swap(CUtlBlockMemory< T, I >& mem);
-
-	int NumAllocated() const;
-	int Count() const { return NumAllocated(); }
-
-	void Grow(int num = 1);
-
-	void EnsureCapacity(int num);
-
-	void Purge();
-
-	void Purge(int numElements);
-
-protected:
-	int Index(int major, int minor) const { return (major << m_nIndexShift) | minor; }
-	int MajorIndex(int i) const { return i >> m_nIndexShift; }
-	int MinorIndex(int i) const { return i & m_nIndexMask; }
-	void ChangeSize(int nBlocks);
-	int NumElementsInBlock() const { return m_nIndexMask + 1; }
-
-	T** m_pMemory;
-	int m_nBlocks;
-	int m_nIndexMask : 27;
-	int m_nIndexShift : 5;
-};
-
-template< class T, class I >
-CUtlBlockMemory<T, I>::CUtlBlockMemory(int nGrowSize, int nInitAllocationCount)
-	: m_pMemory(0), m_nBlocks(0), m_nIndexMask(0), m_nIndexShift(0)
-{
-	Init(nGrowSize, nInitAllocationCount);
-}
-
-template< class T, class I >
-CUtlBlockMemory<T, I>::~CUtlBlockMemory()
-{
-	Purge();
-}
-
-
-template< class T, class I >
-void CUtlBlockMemory<T, I>::Swap(CUtlBlockMemory< T, I >& mem)
-{
-	swap(m_pMemory, mem.m_pMemory);
-	swap(m_nBlocks, mem.m_nBlocks);
-	swap(m_nIndexMask, mem.m_nIndexMask);
-	swap(m_nIndexShift, mem.m_nIndexShift);
-}
-
-
-template< class T, class I >
-void CUtlBlockMemory<T, I>::Init(int nGrowSize    , int nInitSize    )
-{
-	Purge();
-
-	if (nGrowSize == 0)
-	{
-		nGrowSize = (127 + sizeof(T)) / sizeof(T);
-	}
-	nGrowSize = SmallestPowerOfTwoGreaterOrEqual(nGrowSize);
-	m_nIndexMask = nGrowSize - 1;
-
-	m_nIndexShift = 0;
-	while (nGrowSize > 1)
-	{
-		nGrowSize >>= 1;
-		++m_nIndexShift;
-	}
-	Assert(m_nIndexMask + 1 == (1 << m_nIndexShift));
-
-	Grow(nInitSize);
-}
-
-
-template< class T, class I >
-inline T& CUtlBlockMemory<T, I>::operator[](I i)
-{
-	Assert(IsIdxValid(i));
-	T* pBlock = m_pMemory[MajorIndex(i)];
-	return pBlock[MinorIndex(i)];
-}
-
-template< class T, class I >
-inline const T& CUtlBlockMemory<T, I>::operator[](I i) const
-{
-	Assert(IsIdxValid(i));
-	const T* pBlock = m_pMemory[MajorIndex(i)];
-	return pBlock[MinorIndex(i)];
-}
-
-template< class T, class I >
-inline T& CUtlBlockMemory<T, I>::Element(I i)
-{
-	Assert(IsIdxValid(i));
-	T* pBlock = m_pMemory[MajorIndex(i)];
-	return pBlock[MinorIndex(i)];
-}
-
-template< class T, class I >
-inline const T& CUtlBlockMemory<T, I>::Element(I i) const
-{
-	Assert(IsIdxValid(i));
-	const T* pBlock = m_pMemory[MajorIndex(i)];
-	return pBlock[MinorIndex(i)];
-}
-
-
-template< class T, class I >
-inline int CUtlBlockMemory<T, I>::NumAllocated() const
-{
-	return m_nBlocks * NumElementsInBlock();
-}
-
-
-template< class T, class I >
-inline bool CUtlBlockMemory<T, I>::IsIdxValid(I i) const
-{
-	return (i >= 0) && (MajorIndex(i) < m_nBlocks);
-}
-
-template< class T, class I >
-void CUtlBlockMemory<T, I>::Grow(int num)
-{
-	if (num <= 0)
-		return;
-
-	int nBlockSize = NumElementsInBlock();
-	int nBlocks = (num + nBlockSize - 1) / nBlockSize;
-
-	ChangeSize(m_nBlocks + nBlocks);
-}
-
-template< class T, class I >
-void CUtlBlockMemory<T, I>::ChangeSize(int nBlocks)
-{
-	UTLBLOCKMEMORY_TRACK_FREE();                
-
-	int nBlocksOld = m_nBlocks;
-	m_nBlocks = nBlocks;
-
-	UTLBLOCKMEMORY_TRACK_ALLOC();                
-
-	if (m_pMemory)
-	{
-		for (int i = m_nBlocks; i < nBlocksOld; ++i)
-		{
-			UTLBLOCKMEMORY_TRACK_FREE();
-			free((void*)m_pMemory[i]);
-		}
-
-		MEM_ALLOC_CREDIT_CLASS();
-		m_pMemory = (T**)realloc(m_pMemory, m_nBlocks * sizeof(T*));
-		Assert(m_pMemory);
-	}
-	else
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		m_pMemory = (T**)malloc(m_nBlocks * sizeof(T*));
-		Assert(m_pMemory);
-	}
-
-	if (!m_pMemory)
-	{
-		Error("CUtlBlockMemory overflow!\n");
-	}
-
-	int nBlockSize = NumElementsInBlock();
-	for (int i = nBlocksOld; i < m_nBlocks; ++i)
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		m_pMemory[i] = (T*)malloc(nBlockSize * sizeof(T));
-		Assert(m_pMemory[i]);
-	}
-}
-
-
-template< class T, class I >
-inline void CUtlBlockMemory<T, I>::EnsureCapacity(int num)
-{
-	Grow(num - NumAllocated());
-}
-
-
-template< class T, class I >
-void CUtlBlockMemory<T, I>::Purge()
-{
-	if (!m_pMemory)
-		return;
-
-	for (int i = 0; i < m_nBlocks; ++i)
-	{
-		UTLBLOCKMEMORY_TRACK_FREE();
-		free((void*)m_pMemory[i]);
-	}
-	m_nBlocks = 0;
-
-	UTLBLOCKMEMORY_TRACK_FREE();
-	free((void*)m_pMemory);
-	m_pMemory = 0;
-}
-
-template< class T, class I >
-void CUtlBlockMemory<T, I>::Purge(int numElements)
-{
-	Assert(numElements >= 0);
-
-	int nAllocated = NumAllocated();
-	if (numElements > nAllocated)
-	{
-		Assert(numElements <= nAllocated);
-		return;
-	}
-
-	if (numElements <= 0)
-	{
-		Purge();
-		return;
-	}
-
-	int nBlockSize = NumElementsInBlock();
-	int nBlocksOld = m_nBlocks;
-	int nBlocks = (numElements + nBlockSize - 1) / nBlockSize;
-
-	if (nBlocks == m_nBlocks)
-		return;
-
-	ChangeSize(nBlocks);
-}
-
-#include "memdbgoff.h"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlbuffer.h b/SpyCustom/utlbuffer.h
deleted file mode 100644
index bd56c8a..0000000
--- a/SpyCustom/utlbuffer.h
+++ /dev/null
@@ -1,1157 +0,0 @@
-#ifndef UTLBUFFER_H
-#define UTLBUFFER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlmemory.h"
-#include "byteswap.h"
-#include <stdarg.h>
-
-
-struct characterset_t;
-
-
-class CUtlCharConversion
-{
-public:
-	struct ConversionArray_t
-	{
-		char m_nActualChar;
-		char* m_pReplacementString;
-	};
-
-	CUtlCharConversion(char nEscapeChar, const char* pDelimiter, int nCount, ConversionArray_t* pArray);
-	char GetEscapeChar() const;
-	const char* GetDelimiter() const;
-	int GetDelimiterLength() const;
-
-	const char* GetConversionString(char c) const;
-	int GetConversionLength(char c) const;
-	int MaxConversionLength() const;
-
-	virtual char FindConversion(const char* pString, int* pLength);
-
-protected:
-	struct ConversionInfo_t
-	{
-		int m_nLength;
-		char* m_pReplacementString;
-	};
-
-	char m_nEscapeChar;
-	const char* m_pDelimiter;
-	int m_nDelimiterLength;
-	int m_nCount;
-	int m_nMaxConversionLength;
-	char m_pList[256];
-	ConversionInfo_t m_pReplacements[256];
-};
-
-#define BEGIN_CHAR_CONVERSION( _name, _delimiter, _escapeChar )	\
-	static CUtlCharConversion::ConversionArray_t s_pConversionArray ## _name[] = {
-
-#define END_CHAR_CONVERSION( _name, _delimiter, _escapeChar ) \
-	}; \
-	CUtlCharConversion _name( _escapeChar, _delimiter, sizeof( s_pConversionArray ## _name ) / sizeof( CUtlCharConversion::ConversionArray_t ), s_pConversionArray ## _name );
-
-#define BEGIN_CUSTOM_CHAR_CONVERSION( _className, _name, _delimiter, _escapeChar ) \
-	static CUtlCharConversion::ConversionArray_t s_pConversionArray ## _name[] = {
-
-#define END_CUSTOM_CHAR_CONVERSION( _className, _name, _delimiter, _escapeChar ) \
-	}; \
-	_className _name( _escapeChar, _delimiter, sizeof( s_pConversionArray ## _name ) / sizeof( CUtlCharConversion::ConversionArray_t ), s_pConversionArray ## _name );
-
-CUtlCharConversion* GetCStringCharConversion();
-
-CUtlCharConversion* GetNoEscCharConversion();
-
-
-#define SetUtlBufferOverflowFuncs( _get, _put )	\
-	SetOverflowFuncs( static_cast <UtlBufferOverflowFunc_t>( _get ), static_cast <UtlBufferOverflowFunc_t>( _put ) )
-
-
-
-typedef unsigned short ushort;
-
-template < class A >
-static const char* GetFmtStr(int nRadix = 10, bool bPrint = true) { Assert(0); return ""; }
-#if defined( LINUX ) || defined( __clang__ ) || ( defined( _MSC_VER ) && _MSC_VER >= 1900 )
-template <> const char* GetFmtStr< short >(int nRadix, bool bPrint) { Assert(nRadix == 10); return "%hd"; }
-template <> const char* GetFmtStr< ushort >(int nRadix, bool bPrint) { Assert(nRadix == 10); return "%hu"; }
-template <> const char* GetFmtStr< int >(int nRadix, bool bPrint) { Assert(nRadix == 10); return "%d"; }
-template <> const char* GetFmtStr< uint >(int nRadix, bool bPrint) { Assert(nRadix == 10 || nRadix == 16); return nRadix == 16 ? "%x" : "%u"; }
-template <> const char* GetFmtStr< int64 >(int nRadix, bool bPrint) { Assert(nRadix == 10); return "%lld"; }
-template <> const char* GetFmtStr< float >(int nRadix, bool bPrint) { Assert(nRadix == 10); return "%f"; }
-template <> const char* GetFmtStr< double >(int nRadix, bool bPrint) { Assert(nRadix == 10); return bPrint ? "%.15lf" : "%lf"; }               
-#else
-template <> static const char* GetFmtStr< short >(int nRadix, bool bPrint) { Assert(nRadix == 10); return "%hd"; }
-template <> static const char* GetFmtStr< ushort >(int nRadix, bool bPrint) { Assert(nRadix == 10); return "%hu"; }
-template <> static const char* GetFmtStr< int >(int nRadix, bool bPrint) { Assert(nRadix == 10); return "%d"; }
-template <> static const char* GetFmtStr< uint >(int nRadix, bool bPrint) { Assert(nRadix == 10 || nRadix == 16); return nRadix == 16 ? "%x" : "%u"; }
-template <> static const char* GetFmtStr< int64 >(int nRadix, bool bPrint) { Assert(nRadix == 10); return "%lld"; }
-template <> static const char* GetFmtStr< float >(int nRadix, bool bPrint) { Assert(nRadix == 10); return "%f"; }
-template <> static const char* GetFmtStr< double >(int nRadix, bool bPrint) { Assert(nRadix == 10); return bPrint ? "%.15lf" : "%lf"; }               
-#endif
-class CUtlBuffer
-{
-public:
-	enum SeekType_t
-	{
-		SEEK_HEAD = 0,
-		SEEK_CURRENT,
-		SEEK_TAIL
-	};
-
-	enum BufferFlags_t
-	{
-		TEXT_BUFFER = 0x1,			          
-		EXTERNAL_GROWABLE = 0x2,	                     
-		CONTAINS_CRLF = 0x4,		          
-		READ_ONLY = 0x8,			        
-		AUTO_TABS_DISABLED = 0x10,	     
-	};
-
-	typedef bool (CUtlBuffer::* UtlBufferOverflowFunc_t)(int nSize);
-
-	CUtlBuffer(int growSize = 0, int initSize = 0, int nFlags = 0);
-	CUtlBuffer(const void* pBuffer, int size, int nFlags = 0);
-	CUtlBuffer(const void* pBuffer, int size, bool crap) = delete;
-
-	CUtlBuffer(const CUtlBuffer&);   
-	CUtlBuffer& operator= (const CUtlBuffer&);   
-
-#if VALVE_CPP11
-	CUtlBuffer(CUtlBuffer&& moveFrom);   
-	CUtlBuffer& operator= (CUtlBuffer&& moveFrom);   
-#endif
-
-	unsigned char	GetFlags() const;
-
-	void			SetBufferType(bool bIsText, bool bContainsCRLF);
-
-	void			EnsureCapacity(int num);
-
-	void* AccessForDirectRead(int nBytes);
-
-	void			SetExternalBuffer(void* pMemory, int nSize, int nInitialPut, int nFlags = 0);
-	bool			IsExternallyAllocated() const;
-	void			AssumeMemory(void* pMemory, int nSize, int nInitialPut, int nFlags = 0);
-	void* Detach();
-	void* DetachMemory();
-
-	void			CopyBuffer(const CUtlBuffer& buffer);
-	void			CopyBuffer(const void* pubData, int cubData);
-
-	void			Swap(CUtlBuffer& buf);
-	void			Swap(CUtlMemory<uint8>& mem);
-
-
-	FORCEINLINE void ActivateByteSwappingIfBigEndian(void)
-	{
-		if ((IsX360() || IsPS3()))
-			ActivateByteSwapping(true);
-	}
-
-
-	void			ActivateByteSwapping(bool bActivate);
-	void			SetBigEndian(bool bigEndian);
-	bool			IsBigEndian(void);
-
-	void			Clear();
-
-	void			Purge();
-
-	void			Spew();
-
-	char			GetChar();
-	unsigned char	GetUnsignedChar();
-	short			GetShort();
-	unsigned short	GetUnsignedShort();
-	int				GetInt();
-	int64			GetInt64();
-	unsigned int	GetIntHex();
-	unsigned int	GetUnsignedInt();
-	uint64			GetUnsignedInt64();
-	float			GetFloat();
-	double			GetDouble();
-	void* GetPtr();
-	void			GetString(char* pString, int nMaxChars);
-	void			Get(void* pMem, int size);
-	void			GetLine(char* pLine, int nMaxChars);
-
-	template <typename T> void GetObjects(T* dest, int count = 1);
-
-	int				GetUpTo(void* pMem, int nSize);
-
-	void			GetDelimitedString(CUtlCharConversion* pConv, char* pString, int nMaxChars = 0);
-	char			GetDelimitedChar(CUtlCharConversion* pConv);
-
-	int				PeekStringLength();
-
-	int				PeekDelimitedStringLength(CUtlCharConversion* pConv, bool bActualSize = true);
-
-	int				Scanf(SCANF_FORMAT_STRING const char* pFmt, ...);
-	int				VaScanf(const char* pFmt, va_list list);
-
-	void			EatWhiteSpace();
-
-	bool			EatCPPComment();
-
-	bool			ParseToken(const char* pStartingDelim, const char* pEndingDelim, char* pString, int nMaxLen);
-
-	bool			GetToken(const char* pToken);
-
-	int				ParseToken(characterset_t* pBreaks, char* pTokenBuf, int nMaxLen, bool bParseComments = true);
-
-	void			PutChar(char c);
-	void			PutUnsignedChar(unsigned char uc);
-	void			PutShort(short s);
-	void			PutUnsignedShort(unsigned short us);
-	void			PutInt(int i);
-	void			PutInt64(int64 i);
-	void			PutUnsignedInt(unsigned int u);
-	void			PutUnsignedInt64(uint64 u);
-	void			PutFloat(float f);
-	void			PutDouble(double d);
-	void			PutPtr(void*);        
-	void			PutString(const char* pString);
-	void			Put(const void* pMem, int size);
-
-	template <typename T> void PutObjects(T* src, int count = 1);
-
-	void			PutDelimitedString(CUtlCharConversion* pConv, const char* pString);
-	void			PutDelimitedChar(CUtlCharConversion* pConv, char c);
-
-	void			Printf(PRINTF_FORMAT_STRING const char* pFmt, ...) FMTFUNCTION(2, 3);
-	void			VaPrintf(const char* pFmt, va_list list);
-
-	void* PeekPut(int offset = 0);
-	const void* PeekGet(int offset = 0) const;
-	const void* PeekGet(int nMaxSize, int nOffset);
-
-	int TellPut() const;
-	int TellGet() const;
-
-	int TellMaxPut() const;
-
-	int GetBytesRemaining() const;
-
-	void SeekPut(SeekType_t type, int offset);
-	void SeekGet(SeekType_t type, int offset);
-
-	const void* Base() const;
-	void* Base();
-
-	int Size() const;
-
-	bool IsText() const;
-
-	bool IsGrowable() const;
-
-	bool IsValid() const;
-
-	bool ContainsCRLF() const;
-
-	bool IsReadOnly() const;
-
-	bool ConvertCRLF(CUtlBuffer& outBuf);
-
-	void PushTab();
-	void PopTab();
-
-	void EnableTabs(bool bEnable);
-
-#if !defined( _GAMECONSOLE )
-	void SwapCopy(CUtlBuffer& other);
-#endif
-
-protected:
-	enum
-	{
-		PUT_OVERFLOW = 0x1,
-		GET_OVERFLOW = 0x2,
-		MAX_ERROR_FLAG = GET_OVERFLOW,
-	};
-
-	void SetOverflowFuncs(UtlBufferOverflowFunc_t getFunc, UtlBufferOverflowFunc_t putFunc);
-
-	bool OnPutOverflow(int nSize);
-	bool OnGetOverflow(int nSize);
-
-protected:
-	bool CheckPut(int size);
-	bool CheckGet(int size);
-
-	void AddNullTermination(int nPut);
-	bool WasLastCharacterCR();
-	void PutTabs();
-
-	char GetDelimitedCharInternal(CUtlCharConversion* pConv);
-	void PutDelimitedCharInternal(CUtlCharConversion* pConv, char c);
-
-	bool PutOverflow(int nSize);
-	bool GetOverflow(int nSize);
-
-	bool PeekStringMatch(int nOffset, const char* pString, int nLen);
-
-	int	PeekLineLength();
-
-	int PeekWhiteSpace(int nOffset);
-
-	bool CheckPeekGet(int nOffset, int nSize);
-
-	bool CheckArbitraryPeekGet(int nOffset, int& nIncrement);
-
-	template <typename T> void GetType(T& dest);
-	template <typename T> void GetTypeBin(T& dest);
-	template <typename T> bool GetTypeText(T& value, int nRadix = 10);
-	template <typename T> void GetObject(T* src);
-
-	template <typename T> void PutType(T src);
-	template <typename T> void PutTypeBin(T src);
-	template <typename T> void PutObject(T* src);
-
-	CUtlMemory<unsigned char> m_Memory;
-	int m_Get;
-	int m_Put;
-
-	unsigned char m_Error;
-	unsigned char m_Flags;
-	unsigned char m_Reserved;
-#if defined( _GAMECONSOLE )
-	unsigned char pad;
-#endif
-
-	int m_nTab;
-	int m_nMaxPut;
-	int m_nOffset;
-
-	UtlBufferOverflowFunc_t m_GetOverflowFunc;
-	UtlBufferOverflowFunc_t m_PutOverflowFunc;
-
-	CByteswap	m_Byteswap;
-};
-
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, char v)
-{
-	b.PutChar(v);
-	return b;
-}
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, unsigned char v)
-{
-	b.PutUnsignedChar(v);
-	return b;
-}
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, short v)
-{
-	b.PutShort(v);
-	return b;
-}
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, unsigned short v)
-{
-	b.PutUnsignedShort(v);
-	return b;
-}
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, int v)
-{
-	b.PutInt(v);
-	return b;
-}
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, unsigned int v)
-{
-	b.PutUnsignedInt(v);
-	return b;
-}
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, float v)
-{
-	b.PutFloat(v);
-	return b;
-}
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, double v)
-{
-	b.PutDouble(v);
-	return b;
-}
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, const char* pv)
-{
-	b.PutString(pv);
-	return b;
-}
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, const Vector& v)
-{
-	b << v.x << " " << v.y << " " << v.z;
-	return b;
-}
-
-inline CUtlBuffer& operator<<(CUtlBuffer& b, const Vector2D& v)
-{
-	b << v.x << " " << v.y;
-	return b;
-}
-
-
-class CUtlInplaceBuffer : public CUtlBuffer
-{
-public:
-	CUtlInplaceBuffer(int growSize = 0, int initSize = 0, int nFlags = 0);
-
-public:
-	bool InplaceGetLinePtr(    char** ppszInBufferPtr,    int* pnLineLength);
-
-	char* InplaceGetLinePtr(void);
-};
-
-
-inline int CUtlBuffer::TellGet() const
-{
-	return m_Get;
-}
-
-
-inline int CUtlBuffer::GetBytesRemaining() const
-{
-	return m_nMaxPut - TellGet();
-}
-
-
-inline const void* CUtlBuffer::PeekGet(int offset) const
-{
-	return &m_Memory[m_Get + offset - m_nOffset];
-}
-
-
-template <typename T>
-inline void CUtlBuffer::GetObject(T* dest)
-{
-	if (CheckGet(sizeof(T)))
-	{
-		if (!m_Byteswap.IsSwappingBytes() || (sizeof(T) == 1))
-		{
-			*dest = *(T*)PeekGet();
-		}
-		else
-		{
-			m_Byteswap.SwapFieldsToTargetEndian<T>(dest, (T*)PeekGet());
-		}
-		m_Get += sizeof(T);
-	}
-	else
-	{
-		Q_memset(&dest, 0, sizeof(T));
-	}
-}
-
-
-template <typename T>
-inline void CUtlBuffer::GetObjects(T* dest, int count)
-{
-	for (int i = 0; i < count; ++i, ++dest)
-	{
-		GetObject<T>(dest);
-	}
-}
-
-
-template <typename T>
-inline void CUtlBuffer::GetTypeBin(T& dest)
-{
-	if (CheckGet(sizeof(T)))
-	{
-		if (!m_Byteswap.IsSwappingBytes() || (sizeof(T) == 1))
-		{
-			dest = *(T*)PeekGet();
-		}
-		else
-		{
-			m_Byteswap.SwapBufferToTargetEndian<T>(&dest, (T*)PeekGet());
-		}
-		m_Get += sizeof(T);
-	}
-	else
-	{
-		dest = 0;
-	}
-}
-
-template <>
-inline void CUtlBuffer::GetTypeBin< float >(float& dest)
-{
-	if (CheckGet(sizeof(float)))
-	{
-		uintp pData = (uintp)PeekGet();
-		if ((IsX360() || IsPS3()) && (pData & 0x03))
-		{
-			((unsigned char*)&dest)[0] = ((unsigned char*)pData)[0];
-			((unsigned char*)&dest)[1] = ((unsigned char*)pData)[1];
-			((unsigned char*)&dest)[2] = ((unsigned char*)pData)[2];
-			((unsigned char*)&dest)[3] = ((unsigned char*)pData)[3];
-		}
-		else
-		{
-			dest = *(float*)pData;
-		}
-		if (m_Byteswap.IsSwappingBytes())
-		{
-			m_Byteswap.SwapBufferToTargetEndian< float >(&dest, &dest);
-		}
-		m_Get += sizeof(float);
-	}
-	else
-	{
-		dest = 0;
-	}
-}
-
-template <>
-inline void CUtlBuffer::GetTypeBin< double >(double& dest)
-{
-	if (CheckGet(sizeof(double)))
-	{
-		uintp pData = (uintp)PeekGet();
-		if ((IsX360() || IsPS3()) && (pData & 0x07))
-		{
-			((unsigned char*)&dest)[0] = ((unsigned char*)pData)[0];
-			((unsigned char*)&dest)[1] = ((unsigned char*)pData)[1];
-			((unsigned char*)&dest)[2] = ((unsigned char*)pData)[2];
-			((unsigned char*)&dest)[3] = ((unsigned char*)pData)[3];
-			((unsigned char*)&dest)[4] = ((unsigned char*)pData)[4];
-			((unsigned char*)&dest)[5] = ((unsigned char*)pData)[5];
-			((unsigned char*)&dest)[6] = ((unsigned char*)pData)[6];
-			((unsigned char*)&dest)[7] = ((unsigned char*)pData)[7];
-		}
-		else
-		{
-			dest = *(double*)pData;
-		}
-		if (m_Byteswap.IsSwappingBytes())
-		{
-			m_Byteswap.SwapBufferToTargetEndian< double >(&dest, &dest);
-		}
-		m_Get += sizeof(double);
-	}
-	else
-	{
-		dest = 0;
-	}
-}
-
-template < class T >
-inline T StringToNumber(char* pString, char** ppEnd, int nRadix)
-{
-	Assert(0);
-	*ppEnd = pString;
-	return 0;
-}
-
-template <>
-inline int8 StringToNumber(char* pString, char** ppEnd, int nRadix)
-{
-	return (int8)strtol(pString, ppEnd, nRadix);
-}
-
-template <>
-inline uint8 StringToNumber(char* pString, char** ppEnd, int nRadix)
-{
-	return (uint8)strtoul(pString, ppEnd, nRadix);
-}
-
-template <>
-inline int16 StringToNumber(char* pString, char** ppEnd, int nRadix)
-{
-	return (int16)strtol(pString, ppEnd, nRadix);
-}
-
-template <>
-inline uint16 StringToNumber(char* pString, char** ppEnd, int nRadix)
-{
-	return (uint16)strtoul(pString, ppEnd, nRadix);
-}
-
-template <>
-inline int32 StringToNumber(char* pString, char** ppEnd, int nRadix)
-{
-	return (int32)strtol(pString, ppEnd, nRadix);
-}
-
-template <>
-inline uint32 StringToNumber(char* pString, char** ppEnd, int nRadix)
-{
-	return (uint32)strtoul(pString, ppEnd, nRadix);
-}
-
-template <>
-inline int64 StringToNumber(char* pString, char** ppEnd, int nRadix)
-{
-#if defined(_PS3) || defined(POSIX)
-	return (int64)strtoll(pString, ppEnd, nRadix);
-#else  
-	return (int64)_strtoi64(pString, ppEnd, nRadix);
-#endif  
-}
-
-template <>
-inline float StringToNumber(char* pString, char** ppEnd, int nRadix)
-{
-	NOTE_UNUSED(nRadix);
-	return (float)strtod(pString, ppEnd);
-}
-
-template <>
-inline double StringToNumber(char* pString, char** ppEnd, int nRadix)
-{
-	NOTE_UNUSED(nRadix);
-	return (double)strtod(pString, ppEnd);
-}
-
-template <typename T>
-inline bool CUtlBuffer::GetTypeText(T& value, int nRadix  )
-{
-	int nLength = 128;
-	if (!CheckArbitraryPeekGet(0, nLength))
-	{
-		value = 0;
-		return false;
-	}
-
-	char* pStart = (char*)PeekGet();
-	char* pEnd = pStart;
-	value = StringToNumber< T >(pStart, &pEnd, nRadix);
-
-	int nBytesRead = (int)(pEnd - pStart);
-	if (nBytesRead == 0)
-		return false;
-
-	m_Get += nBytesRead;
-	return true;
-}
-
-template <typename T>
-inline void CUtlBuffer::GetType(T& dest)
-{
-	if (!IsText())
-	{
-		GetTypeBin(dest);
-	}
-	else
-	{
-		GetTypeText(dest);
-	}
-}
-
-inline char CUtlBuffer::GetChar()
-{
-	char c;
-	GetTypeBin(c);     
-	return c;
-}
-
-inline unsigned char CUtlBuffer::GetUnsignedChar()
-{
-	unsigned char c;
-	if (!IsText())
-	{
-		GetTypeBin(c);
-	}
-	else
-	{
-		c = (unsigned char)GetUnsignedShort();
-	}
-	return c;
-}
-
-inline short CUtlBuffer::GetShort()
-{
-	short s;
-	GetType(s);
-	return s;
-}
-
-inline unsigned short CUtlBuffer::GetUnsignedShort()
-{
-	unsigned short s;
-	GetType(s);
-	return s;
-}
-
-inline int CUtlBuffer::GetInt()
-{
-	int i;
-	GetType(i);
-	return i;
-}
-
-inline int64 CUtlBuffer::GetInt64()
-{
-	int64 i;
-	GetType(i);
-	return i;
-}
-
-inline unsigned int CUtlBuffer::GetIntHex()
-{
-	uint i;
-	if (!IsText())
-	{
-		GetTypeBin(i);
-	}
-	else
-	{
-		GetTypeText(i, 16);
-	}
-	return i;
-}
-
-inline unsigned int CUtlBuffer::GetUnsignedInt()
-{
-	unsigned int i;
-	GetType(i);
-	return i;
-}
-
-inline uint64 CUtlBuffer::GetUnsignedInt64()
-{
-	uint64 i;
-	GetType(i);
-	return i;
-}
-
-
-inline float CUtlBuffer::GetFloat()
-{
-	float f;
-	GetType(f);
-	return f;
-}
-
-inline double CUtlBuffer::GetDouble()
-{
-	double d;
-	GetType(d);
-	return d;
-}
-
-inline void* CUtlBuffer::GetPtr()
-{
-	void* p;
-#if !defined(X64BITS) && !defined(PLATFORM_64BITS)
-	p = (void*)GetUnsignedInt();
-#else
-	p = (void*)GetInt64();
-#endif
-	return p;
-}
-
-inline unsigned char CUtlBuffer::GetFlags() const
-{
-	return m_Flags;
-}
-
-
-inline bool CUtlBuffer::IsExternallyAllocated() const
-{
-	return m_Memory.IsExternallyAllocated();
-}
-
-
-inline int CUtlBuffer::TellPut() const
-{
-	return m_Put;
-}
-
-
-inline int CUtlBuffer::TellMaxPut() const
-{
-	return m_nMaxPut;
-}
-
-
-inline void* CUtlBuffer::PeekPut(int offset)
-{
-	return &m_Memory[m_Put + offset - m_nOffset];
-}
-
-
-template <typename T>
-inline void CUtlBuffer::PutObject(T* src)
-{
-	if (CheckPut(sizeof(T)))
-	{
-		if (!m_Byteswap.IsSwappingBytes() || (sizeof(T) == 1))
-		{
-			*(T*)PeekPut() = *src;
-		}
-		else
-		{
-			m_Byteswap.SwapFieldsToTargetEndian<T>((T*)PeekPut(), src);
-		}
-		m_Put += sizeof(T);
-		AddNullTermination(m_Put);
-	}
-}
-
-
-template <typename T>
-inline void CUtlBuffer::PutObjects(T* src, int count)
-{
-	for (int i = 0; i < count; ++i, ++src)
-	{
-		PutObject<T>(src);
-	}
-}
-
-
-template <typename T>
-inline void CUtlBuffer::PutTypeBin(T src)
-{
-	if (CheckPut(sizeof(T)))
-	{
-		if (!m_Byteswap.IsSwappingBytes() || (sizeof(T) == 1))
-		{
-			*(T*)PeekPut() = src;
-		}
-		else
-		{
-			m_Byteswap.SwapBufferToTargetEndian<T>((T*)PeekPut(), &src);
-		}
-		m_Put += sizeof(T);
-		AddNullTermination(m_Put);
-	}
-}
-
-#if defined( _GAMECONSOLE )
-template <>
-inline void CUtlBuffer::PutTypeBin< float >(float src)
-{
-	if (CheckPut(sizeof(src)))
-	{
-		if (m_Byteswap.IsSwappingBytes())
-		{
-			m_Byteswap.SwapBufferToTargetEndian<float>(&src, &src);
-		}
-
-		unsigned pData = (unsigned)PeekPut();
-		if (pData & 0x03)
-		{
-			byte* dst = (byte*)pData;
-			byte* srcPtr = (byte*)&src;
-			dst[0] = srcPtr[0];
-			dst[1] = srcPtr[1];
-			dst[2] = srcPtr[2];
-			dst[3] = srcPtr[3];
-		}
-		else
-		{
-			*(float*)pData = src;
-		}
-
-		m_Put += sizeof(float);
-		AddNullTermination(m_Put);
-	}
-}
-
-template <>
-inline void CUtlBuffer::PutTypeBin< double >(double src)
-{
-	if (CheckPut(sizeof(src)))
-	{
-		if (m_Byteswap.IsSwappingBytes())
-		{
-			m_Byteswap.SwapBufferToTargetEndian<double>(&src, &src);
-		}
-
-		unsigned pData = (unsigned)PeekPut();
-		if (pData & 0x07)
-		{
-			byte* dst = (byte*)pData;
-			byte* srcPtr = (byte*)&src;
-			dst[0] = srcPtr[0];
-			dst[1] = srcPtr[1];
-			dst[2] = srcPtr[2];
-			dst[3] = srcPtr[3];
-			dst[4] = srcPtr[4];
-			dst[5] = srcPtr[5];
-			dst[6] = srcPtr[6];
-			dst[7] = srcPtr[7];
-		}
-		else
-		{
-			*(double*)pData = src;
-		}
-
-		m_Put += sizeof(double);
-		AddNullTermination(m_Put);
-	}
-}
-#endif
-
-template <typename T>
-inline void CUtlBuffer::PutType(T src)
-{
-	if (!IsText())
-	{
-		PutTypeBin(src);
-	}
-	else
-	{
-		Printf(GetFmtStr< T >(), src);
-	}
-}
-
-inline bool CUtlBuffer::WasLastCharacterCR()
-{
-	if (!IsText() || (TellPut() == 0))
-		return false;
-	return (*(const char*)PeekPut(-1) == '\n');
-}
-
-inline void CUtlBuffer::PutTabs()
-{
-	int nTabCount = (m_Flags & AUTO_TABS_DISABLED) ? 0 : m_nTab;
-	for (int i = nTabCount; --i >= 0; )
-	{
-		PutTypeBin<char>('\t');
-	}
-}
-
-
-inline void CUtlBuffer::PushTab()
-{
-	++m_nTab;
-}
-
-inline void CUtlBuffer::PopTab()
-{
-	if (--m_nTab < 0)
-	{
-		m_nTab = 0;
-	}
-}
-
-
-inline void CUtlBuffer::EnableTabs(bool bEnable)
-{
-	if (bEnable)
-	{
-		m_Flags &= ~AUTO_TABS_DISABLED;
-	}
-	else
-	{
-		m_Flags |= AUTO_TABS_DISABLED;
-	}
-}
-
-inline void CUtlBuffer::PutChar(char c)
-{
-	if (WasLastCharacterCR())
-	{
-		PutTabs();
-	}
-
-	PutTypeBin(c);
-}
-
-inline void CUtlBuffer::PutUnsignedChar(unsigned char c)
-{
-	if (!IsText())
-	{
-		PutTypeBin(c);
-	}
-	else
-	{
-		PutUnsignedShort(c);
-	}
-}
-
-inline void  CUtlBuffer::PutShort(short s)
-{
-	PutType(s);
-}
-
-inline void CUtlBuffer::PutUnsignedShort(unsigned short s)
-{
-	PutType(s);
-}
-
-inline void CUtlBuffer::PutInt(int i)
-{
-	PutType(i);
-}
-
-inline void CUtlBuffer::PutInt64(int64 i)
-{
-	PutType(i);
-}
-
-inline void CUtlBuffer::PutUnsignedInt(unsigned int u)
-{
-	PutType(u);
-}
-
-inline void CUtlBuffer::PutUnsignedInt64(uint64 i)
-{
-	PutType(i);
-}
-
-
-inline void CUtlBuffer::PutFloat(float f)
-{
-	PutType(f);
-}
-
-inline void CUtlBuffer::PutDouble(double d)
-{
-	PutType(d);
-}
-
-inline void CUtlBuffer::PutPtr(void* p)
-{
-	if (!IsText())
-	{
-		PutTypeBin(p);
-	}
-	else
-	{
-		Printf("0x%p", p);
-	}
-}
-
-inline bool CUtlBuffer::IsText() const
-{
-	return (m_Flags & TEXT_BUFFER) != 0;
-}
-
-
-inline bool CUtlBuffer::IsGrowable() const
-{
-	return (m_Flags & EXTERNAL_GROWABLE) != 0;
-}
-
-
-inline bool CUtlBuffer::IsValid() const
-{
-	return m_Error == 0;
-}
-
-
-inline bool CUtlBuffer::ContainsCRLF() const
-{
-	return IsText() && ((m_Flags & CONTAINS_CRLF) != 0);
-}
-
-
-inline bool CUtlBuffer::IsReadOnly() const
-{
-	return (m_Flags & READ_ONLY) != 0;
-}
-
-
-inline const void* CUtlBuffer::Base() const
-{
-	return m_Memory.Base();
-}
-
-inline void* CUtlBuffer::Base()
-{
-	return m_Memory.Base();
-}
-
-inline int CUtlBuffer::Size() const
-{
-	return m_Memory.NumAllocated();
-}
-
-
-inline void CUtlBuffer::Clear()
-{
-	m_Get = 0;
-	m_Put = 0;
-	m_Error = 0;
-	m_nOffset = 0;
-	m_nMaxPut = -1;
-	AddNullTermination(m_Put);
-}
-
-inline void CUtlBuffer::Purge()
-{
-	m_Get = 0;
-	m_Put = 0;
-	m_nOffset = 0;
-	m_nMaxPut = 0;
-	m_Error = 0;
-	m_Memory.Purge();
-}
-
-inline void* CUtlBuffer::AccessForDirectRead(int nBytes)
-{
-	Assert(m_Get == 0 && m_Put == 0 && m_nMaxPut == 0);
-	EnsureCapacity(nBytes);
-	m_nMaxPut = nBytes;
-	return Base();
-}
-
-inline void* CUtlBuffer::Detach()
-{
-	void* p = m_Memory.Detach();
-	Clear();
-	return p;
-}
-
-inline void CUtlBuffer::Spew()
-{
-	SeekGet(CUtlBuffer::SEEK_HEAD, 0);
-
-	char pTmpLine[1024];
-	while (IsValid() && GetBytesRemaining())
-	{
-		V_memset(pTmpLine, 0, sizeof(pTmpLine));
-		Get(pTmpLine, MIN((size_t)GetBytesRemaining(), sizeof(pTmpLine) - 1));
-		Msg(_T("%s"), pTmpLine);
-	}
-}
-
-#if !defined(_GAMECONSOLE)
-inline void CUtlBuffer::SwapCopy(CUtlBuffer& other)
-{
-	m_Get = other.m_Get;
-	m_Put = other.m_Put;
-	m_Error = other.m_Error;
-	m_Flags = other.m_Flags;
-	m_Reserved = other.m_Reserved;
-	m_nTab = other.m_nTab;
-	m_nMaxPut = other.m_nMaxPut;
-	m_nOffset = other.m_nOffset;
-	m_GetOverflowFunc = other.m_GetOverflowFunc;
-	m_PutOverflowFunc = other.m_PutOverflowFunc;
-	m_Byteswap = other.m_Byteswap;
-
-	m_Memory.Swap(other.m_Memory);
-}
-#endif
-
-inline void CUtlBuffer::CopyBuffer(const CUtlBuffer& buffer)
-{
-	CopyBuffer(buffer.Base(), buffer.TellPut());
-}
-
-inline void	CUtlBuffer::CopyBuffer(const void* pubData, int cubData)
-{
-	Clear();
-	if (cubData)
-	{
-		Put(pubData, cubData);
-	}
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utldict.h b/SpyCustom/utldict.h
deleted file mode 100644
index ca636d3..0000000
--- a/SpyCustom/utldict.h
+++ /dev/null
@@ -1,278 +0,0 @@
-#ifndef UTLDICT_H
-#define UTLDICT_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dbg.h"
-#include "utlmap.h"
-
-#include "utlsymbol.h"
-
-#include "memdbgon.h"
-
-enum EDictCompareType
-{
-	k_eDictCompareTypeCaseSensitive = 0,
-	k_eDictCompareTypeCaseInsensitive = 1,
-	k_eDictCompareTypeFilenames				        
-};
-
-#define FOR_EACH_DICT( dictName, iteratorName ) \
-	for( int iteratorName=dictName.First(); iteratorName != dictName.InvalidIndex(); iteratorName = dictName.Next( iteratorName ) )
-
-#define FOR_EACH_DICT_FAST( dictName, iteratorName ) \
-	for ( int iteratorName = 0; iteratorName < dictName.MaxElement(); ++iteratorName ) if ( !dictName.IsValidIndex( iteratorName ) ) continue; else
-
-template <class T, class I = int >
-class CUtlDict
-{
-public:
-	typedef const char* KeyType_t;
-	typedef T ElemType_t;
-
-	CUtlDict(int compareType = k_eDictCompareTypeCaseInsensitive, int growSize = 0, int initSize = 0);
-	~CUtlDict();
-
-	void EnsureCapacity(int);
-
-	T& Element(I i);
-	const T& Element(I i) const;
-	T& operator[](I i);
-	const T& operator[](I i) const;
-
-	char const* GetElementName(I i) const;
-
-	void		SetElementName(I i, char const* pName);
-
-	unsigned int Count() const;
-
-	I MaxElement() const;
-
-	bool  IsValidIndex(I i) const;
-
-	static I InvalidIndex();
-
-	I  Insert(const char* pName, const T& element);
-	I  Insert(const char* pName);
-
-	I  Find(const char* pName) const;
-	bool HasElement(const char* pName) const;
-
-	void	RemoveAt(I i);
-	void	Remove(const char* pName);
-	void	RemoveAll();
-
-	void	Purge();
-	void	PurgeAndDeleteElements();	     
-
-	I		First() const;
-	I		Next(I i) const;
-
-	typedef I IndexType_t;
-
-protected:
-	typedef CUtlMap<const char*, T, I> DictElementMap_t;
-	DictElementMap_t m_Elements;
-};
-
-
-template <class T, class I>
-CUtlDict<T, I>::CUtlDict(int compareType, int growSize, int initSize) : m_Elements(growSize, initSize)
-{
-	if (compareType == k_eDictCompareTypeFilenames)
-	{
-		m_Elements.SetLessFunc(CaselessStringLessThanIgnoreSlashes);
-	}
-	else if (compareType == k_eDictCompareTypeCaseInsensitive)
-	{
-		m_Elements.SetLessFunc(CaselessStringLessThan);
-	}
-	else
-	{
-		m_Elements.SetLessFunc(StringLessThan);
-	}
-}
-
-template <class T, class I>
-CUtlDict<T, I>::~CUtlDict()
-{
-	Purge();
-}
-
-template <class T, class I>
-inline void CUtlDict<T, I>::EnsureCapacity(int num)
-{
-	return m_Elements.EnsureCapacity(num);
-}
-
-template <class T, class I>
-inline T& CUtlDict<T, I>::Element(I i)
-{
-	return m_Elements[i];
-}
-
-template <class T, class I>
-inline const T& CUtlDict<T, I>::Element(I i) const
-{
-	return m_Elements[i];
-}
-
-template <class T, class I>
-inline char const* CUtlDict<T, I>::GetElementName(I i) const
-{
-	return m_Elements.Key(i);
-}
-
-template <class T, class I>
-inline T& CUtlDict<T, I>::operator[](I i)
-{
-	return Element(i);
-}
-
-template <class T, class I>
-inline const T& CUtlDict<T, I>::operator[](I i) const
-{
-	return Element(i);
-}
-
-template <class T, class I>
-inline void CUtlDict<T, I>::SetElementName(I i, char const* pName)
-{
-	MEM_ALLOC_CREDIT_CLASS();
-	free(const_cast<char*>(m_Elements.Key(i)));
-	m_Elements.Reinsert(strdup(pName), i);
-}
-
-template <class T, class I>
-inline	unsigned int CUtlDict<T, I>::Count() const
-{
-	return m_Elements.Count();
-}
-
-template <class T, class I>
-inline I CUtlDict<T, I>::MaxElement() const
-{
-	return m_Elements.MaxElement();
-}
-
-template <class T, class I>
-inline	bool CUtlDict<T, I>::IsValidIndex(I i) const
-{
-	return m_Elements.IsValidIndex(i);
-}
-
-
-template <class T, class I>
-inline I CUtlDict<T, I>::InvalidIndex()
-{
-	return DictElementMap_t::InvalidIndex();
-}
-
-
-template <class T, class I>
-void CUtlDict<T, I>::RemoveAt(I elem)
-{
-	free(const_cast<char*>(m_Elements.Key(elem)));
-	m_Elements.RemoveAt(elem);
-}
-
-
-template <class T, class I> void CUtlDict<T, I>::Remove(const char* search)
-{
-	I node = Find(search);
-	if (node != InvalidIndex())
-	{
-		RemoveAt(node);
-	}
-}
-
-
-template <class T, class I>
-void CUtlDict<T, I>::RemoveAll()
-{
-	typename DictElementMap_t::IndexType_t index = m_Elements.FirstInorder();
-	while (index != m_Elements.InvalidIndex())
-	{
-		const char* p = m_Elements.Key(index);
-		free(const_cast<char*>(p));
-		index = m_Elements.NextInorder(index);
-	}
-
-	m_Elements.RemoveAll();
-}
-
-template <class T, class I>
-void CUtlDict<T, I>::Purge()
-{
-	RemoveAll();
-}
-
-
-template <class T, class I>
-void CUtlDict<T, I>::PurgeAndDeleteElements()
-{
-	I index = m_Elements.FirstInorder();
-	while (index != m_Elements.InvalidIndex())
-	{
-		const char* p = m_Elements.Key(index);
-		free(const_cast<char*>(p));
-		delete m_Elements[index];
-		index = m_Elements.NextInorder(index);
-	}
-
-	m_Elements.RemoveAll();
-}
-
-
-template <class T, class I>
-I CUtlDict<T, I>::Insert(const char* pName, const T& element)
-{
-	MEM_ALLOC_CREDIT_CLASS();
-	return m_Elements.Insert(strdup(pName), element);
-}
-
-template <class T, class I>
-I CUtlDict<T, I>::Insert(const char* pName)
-{
-	MEM_ALLOC_CREDIT_CLASS();
-	return m_Elements.Insert(strdup(pName));
-}
-
-
-template <class T, class I>
-I CUtlDict<T, I>::Find(const char* pName) const
-{
-	MEM_ALLOC_CREDIT_CLASS();
-	if (pName)
-		return m_Elements.Find(pName);
-	else
-		return InvalidIndex();
-}
-
-template <class T, class I>
-bool CUtlDict<T, I>::HasElement(const char* pName) const
-{
-	if (pName)
-		return m_Elements.IsValidIndex(m_Elements.Find(pName));
-	else
-		return false;
-}
-
-
-template <class T, class I>
-I CUtlDict<T, I>::First() const
-{
-	return m_Elements.FirstInorder();
-}
-
-template <class T, class I>
-I CUtlDict<T, I>::Next(I i) const
-{
-	return m_Elements.NextInorder(i);
-}
-
-#include "memdbgoff.h"
-
-#endif  
diff --git a/SpyCustom/utlenvelope.h b/SpyCustom/utlenvelope.h
deleted file mode 100644
index a9e08e7..0000000
--- a/SpyCustom/utlenvelope.h
+++ /dev/null
@@ -1,221 +0,0 @@
-#include "utlstring.h"
-#include "basetypes.h"
-
-#ifndef UTLENVELOPE_H
-#define UTLENVELOPE_H
-
-#if defined( _WIN32 )
-#pragma once
-#endif
-
-class CUtlDataEnvelope
-{
-public:
-	CUtlDataEnvelope(const void* pData, int nBytes);
-	CUtlDataEnvelope(const CUtlDataEnvelope& from);
-	~CUtlDataEnvelope();
-
-	CUtlDataEnvelope& operator=(const CUtlDataEnvelope& from);
-
-	operator void* ();
-	operator void* () const;
-
-private:
-	void Assign(const void* pData, int nBytes);
-	void Assign(const CUtlDataEnvelope& from);
-	void Purge();
-
-	union
-	{
-		byte* m_pData;
-		byte m_data[4];
-	};
-	int m_nBytes;
-};
-
-
-template <typename T>
-class CUtlEnvelope : protected CUtlDataEnvelope
-{
-public:
-	CUtlEnvelope(const T* pData, int nElems = 1);
-	CUtlEnvelope(const CUtlEnvelope<T>& from);
-
-	CUtlEnvelope<T>& operator=(const CUtlEnvelope<T>& from);
-
-	operator T* ();
-	operator T* () const;
-
-	operator void* ();
-	operator void* () const;
-};
-
-template <>
-class CUtlEnvelope<const char*>
-{
-public:
-	CUtlEnvelope(const char* pData)
-	{
-		m_string = pData;
-	}
-
-	CUtlEnvelope(const CUtlEnvelope<const char*>& from)
-	{
-		m_string = from.m_string;
-	}
-
-	CUtlEnvelope<const char*>& operator=(const CUtlEnvelope<const char*>& from)
-	{
-		m_string = from.m_string;
-		return *this;
-	}
-
-	operator char* ()
-	{
-		return (char*)m_string.Get();
-	}
-
-	operator char* () const
-	{
-		return (char*)m_string.Get();
-	}
-
-	operator void* ()
-	{
-		return (void*)m_string.Get();
-	}
-
-	operator void* () const
-	{
-		return (void*)m_string.Get();
-	}
-
-private:
-	CUtlString m_string;
-};
-
-#include "memdbgon.h"
-
-inline void CUtlDataEnvelope::Assign(const void* pData, int nBytes)
-{
-	if (pData)
-	{
-		m_nBytes = nBytes;
-		if (m_nBytes > 4)
-		{
-			m_pData = new byte[nBytes];
-			memcpy(m_pData, pData, nBytes);
-		}
-		else
-		{
-			memcpy(m_data, pData, nBytes);
-		}
-	}
-	else
-	{
-		m_pData = NULL;
-		m_nBytes = 0;
-	}
-}
-
-inline void CUtlDataEnvelope::Assign(const CUtlDataEnvelope& from)
-{
-	Assign(from.operator void* (), from.m_nBytes);
-}
-
-inline void CUtlDataEnvelope::Purge()
-{
-	if (m_nBytes > 4)
-		delete[] m_pData;
-	m_nBytes = 0;
-}
-
-inline CUtlDataEnvelope::CUtlDataEnvelope(const void* pData, int nBytes)
-{
-	Assign(pData, nBytes);
-}
-
-inline CUtlDataEnvelope::CUtlDataEnvelope(const CUtlDataEnvelope& from)
-{
-	Assign(from);
-}
-
-inline CUtlDataEnvelope::~CUtlDataEnvelope()
-{
-	Purge();
-}
-
-inline CUtlDataEnvelope& CUtlDataEnvelope::operator=(const CUtlDataEnvelope& from)
-{
-	Purge();
-	Assign(from);
-	return *this;
-}
-
-inline CUtlDataEnvelope::operator void* ()
-{
-	if (!m_nBytes)
-	{
-		return NULL;
-	}
-
-	return (m_nBytes > 4) ? m_pData : m_data;
-}
-
-inline CUtlDataEnvelope::operator void* () const
-{
-	if (!m_nBytes)
-	{
-		return NULL;
-	}
-
-	return (m_nBytes > 4) ? (void*)m_pData : (void*)m_data;
-}
-
-template <typename T>
-inline CUtlEnvelope<T>::CUtlEnvelope(const T* pData, int nElems)
-	: CUtlDataEnvelope(pData, sizeof(T)* nElems)
-{
-}
-
-template <typename T>
-inline CUtlEnvelope<T>::CUtlEnvelope(const CUtlEnvelope<T>& from)
-	: CUtlDataEnvelope(from)
-{
-
-}
-
-template <typename T>
-inline CUtlEnvelope<T>& CUtlEnvelope<T>::operator=(const CUtlEnvelope<T>& from)
-{
-	CUtlDataEnvelope::operator=(from);
-	return *this;
-}
-
-template <typename T>
-inline CUtlEnvelope<T>::operator T* ()
-{
-	return (T*)CUtlDataEnvelope::operator void* ();
-}
-
-template <typename T>
-inline CUtlEnvelope<T>::operator T* () const
-{
-	return (T*)((const_cast<CUtlEnvelope<T>*>(this))->operator T * ());
-}
-
-template <typename T>
-inline CUtlEnvelope<T>::operator void* ()
-{
-	return CUtlDataEnvelope::operator void* ();
-}
-
-template <typename T>
-inline CUtlEnvelope<T>::operator void* () const
-{
-	return ((const_cast<CUtlEnvelope<T>*>(this))->operator void* ());
-}
-
-#include "memdbgoff.h"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlfixedmemory.h b/SpyCustom/utlfixedmemory.h
deleted file mode 100644
index ab71e8a..0000000
--- a/SpyCustom/utlfixedmemory.h
+++ /dev/null
@@ -1,302 +0,0 @@
-#ifndef UTLFIXEDMEMORY_H
-#define UTLFIXEDMEMORY_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dbg.h"
-#include "platform.h"
-
-#include "memalloc.h"
-#include "memdbgon.h"
-
-#pragma warning (disable:4100)
-#pragma warning (disable:4514)
-
-#ifdef UTLFIXEDMEMORY_TRACK
-#define UTLFIXEDMEMORY_TRACK_ALLOC()		MemAlloc_RegisterAllocation( "Sum of all UtlFixedMemory", 0, NumAllocated() * sizeof(T), NumAllocated() * sizeof(T), 0 )
-#define UTLFIXEDMEMORY_TRACK_FREE()		if ( !m_pMemory ) ; else MemAlloc_RegisterDeallocation( "Sum of all UtlFixedMemory", 0, NumAllocated() * sizeof(T), NumAllocated() * sizeof(T), 0 )
-#else
-#define UTLFIXEDMEMORY_TRACK_ALLOC()		((void)0)
-#define UTLFIXEDMEMORY_TRACK_FREE()		((void)0)
-#endif
-
-
-template< class T >
-class CUtlFixedMemory
-{
-public:
-	CUtlFixedMemory(int nGrowSize = 0, int nInitSize = 0);
-	~CUtlFixedMemory();
-
-	void Init(int nGrowSize = 0, int nInitSize = 0);
-
-	T* Base() { return NULL; }
-	const T* Base() const { return NULL; }
-
-protected:
-	struct BlockHeader_t;
-
-public:
-	class Iterator_t
-	{
-	public:
-		Iterator_t(BlockHeader_t* p, int i) : m_pBlockHeader(p), m_nIndex(i) {}
-		BlockHeader_t* m_pBlockHeader;
-		intp m_nIndex;
-
-		bool operator==(const Iterator_t it) const { return m_pBlockHeader == it.m_pBlockHeader && m_nIndex == it.m_nIndex; }
-		bool operator!=(const Iterator_t it) const { return m_pBlockHeader != it.m_pBlockHeader || m_nIndex != it.m_nIndex; }
-	};
-	Iterator_t First() const { return m_pBlocks ? Iterator_t(m_pBlocks, 0) : InvalidIterator(); }
-	Iterator_t Next(const Iterator_t& it) const
-	{
-		Assert(IsValidIterator(it));
-		if (!IsValidIterator(it))
-			return InvalidIterator();
-
-		BlockHeader_t* RESTRICT pHeader = it.m_pBlockHeader;
-		if (it.m_nIndex + 1 < pHeader->m_nBlockSize)
-			return Iterator_t(pHeader, it.m_nIndex + 1);
-
-		return pHeader->m_pNext ? Iterator_t(pHeader->m_pNext, 0) : InvalidIterator();
-	}
-	intp GetIndex(const Iterator_t& it) const
-	{
-		Assert(IsValidIterator(it));
-		if (!IsValidIterator(it))
-			return InvalidIndex();
-
-		return (intp)(HeaderToBlock(it.m_pBlockHeader) + it.m_nIndex);
-	}
-	bool IsIdxAfter(intp i, const Iterator_t& it) const
-	{
-		Assert(IsValidIterator(it));
-		if (!IsValidIterator(it))
-			return false;
-
-		if (IsInBlock(i, it.m_pBlockHeader))
-			return i > GetIndex(it);
-
-		for (BlockHeader_t* RESTRICT pbh = it.m_pBlockHeader->m_pNext; pbh; pbh = pbh->m_pNext)
-		{
-			if (IsInBlock(i, pbh))
-				return true;
-		}
-		return false;
-	}
-	bool IsValidIterator(const Iterator_t& it) const { return it.m_pBlockHeader && it.m_nIndex >= 0 && it.m_nIndex < it.m_pBlockHeader->m_nBlockSize; }
-	Iterator_t InvalidIterator() const { return Iterator_t(NULL, INVALID_INDEX); }
-
-	T& operator[](intp i);
-	const T& operator[](intp i) const;
-	T& Element(intp i);
-	const T& Element(intp i) const;
-
-	bool IsIdxValid(intp i) const;
-
-	static const intp INVALID_INDEX = 0;     
-	static intp InvalidIndex() { return INVALID_INDEX; }
-
-	int NumAllocated() const;
-	int Count() const { return NumAllocated(); }
-
-	void Grow(int num = 1);
-
-	void EnsureCapacity(int num);
-
-	void Purge();
-
-protected:
-	void Swap(CUtlFixedMemory< T >& mem);
-
-	bool IsInBlock(intp i, BlockHeader_t* pBlockHeader) const
-	{
-		T* p = (T*)i;
-		const T* p0 = HeaderToBlock(pBlockHeader);
-		return p >= p0 && p < p0 + pBlockHeader->m_nBlockSize;
-	}
-
-	struct BlockHeader_t
-	{
-		BlockHeader_t* m_pNext;
-		intp m_nBlockSize;
-	};
-
-	const T* HeaderToBlock(const BlockHeader_t* pHeader) const { return (T*)(pHeader + 1); }
-	const BlockHeader_t* BlockToHeader(const T* pBlock) const { return (BlockHeader_t*)(pBlock)-1; }
-
-	BlockHeader_t* m_pBlocks;
-	int m_nAllocationCount;
-	int m_nGrowSize;
-};
-
-template< class T >
-CUtlFixedMemory<T>::CUtlFixedMemory(int nGrowSize, int nInitAllocationCount)
-	: m_pBlocks(0), m_nAllocationCount(0), m_nGrowSize(0)
-{
-	Init(nGrowSize, nInitAllocationCount);
-}
-
-template< class T >
-CUtlFixedMemory<T>::~CUtlFixedMemory()
-{
-	Purge();
-}
-
-
-template< class T >
-void CUtlFixedMemory<T>::Swap(CUtlFixedMemory< T >& mem)
-{
-	V_swap(m_pBlocks, mem.m_pBlocks);
-	V_swap(m_nAllocationCount, mem.m_nAllocationCount);
-	V_swap(m_nGrowSize, mem.m_nGrowSize);
-}
-
-
-template< class T >
-void CUtlFixedMemory<T>::Init(int nGrowSize    , int nInitSize    )
-{
-	Purge();
-
-	m_nGrowSize = nGrowSize;
-
-	Grow(nInitSize);
-}
-
-template< class T >
-inline T& CUtlFixedMemory<T>::operator[](intp i)
-{
-	Assert(IsIdxValid(i));
-	return *(T*)i;
-}
-
-template< class T >
-inline const T& CUtlFixedMemory<T>::operator[](intp i) const
-{
-	Assert(IsIdxValid(i));
-	return *(T*)i;
-}
-
-template< class T >
-inline T& CUtlFixedMemory<T>::Element(intp i)
-{
-	Assert(IsIdxValid(i));
-	return *(T*)i;
-}
-
-template< class T >
-inline const T& CUtlFixedMemory<T>::Element(intp i) const
-{
-	Assert(IsIdxValid(i));
-	return *(T*)i;
-}
-
-
-template< class T >
-inline int CUtlFixedMemory<T>::NumAllocated() const
-{
-	return m_nAllocationCount;
-}
-
-
-template< class T >
-inline bool CUtlFixedMemory<T>::IsIdxValid(intp i) const
-{
-#ifdef _DEBUG
-	for (BlockHeader_t* pbh = m_pBlocks; pbh; pbh = pbh->m_pNext)
-	{
-		if (IsInBlock(i, pbh))
-			return true;
-	}
-	return false;
-#else
-	return i != InvalidIndex();
-#endif
-}
-
-template< class T >
-void CUtlFixedMemory<T>::Grow(int num)
-{
-	if (num <= 0)
-		return;
-
-	int nBlockSize = m_nGrowSize;
-	if (nBlockSize == 0)
-	{
-		if (m_nAllocationCount)
-		{
-			nBlockSize = m_nAllocationCount;
-		}
-		else
-		{
-			nBlockSize = (31 + sizeof(T)) / sizeof(T);
-			Assert(nBlockSize);
-		}
-	}
-	if (nBlockSize < num)
-	{
-		int n = (num + nBlockSize - 1) / nBlockSize;
-		Assert(n * nBlockSize >= num);
-		Assert((n - 1) * nBlockSize < num);
-		nBlockSize *= n;
-	}
-	m_nAllocationCount += nBlockSize;
-
-	MEM_ALLOC_CREDIT_CLASS();
-	BlockHeader_t* RESTRICT pBlockHeader = (BlockHeader_t*)malloc(sizeof(BlockHeader_t) + nBlockSize * sizeof(T));
-	if (!pBlockHeader)
-	{
-		Error("CUtlFixedMemory overflow!\n");
-	}
-	pBlockHeader->m_pNext = NULL;
-	pBlockHeader->m_nBlockSize = nBlockSize;
-
-	if (!m_pBlocks)
-	{
-		m_pBlocks = pBlockHeader;
-	}
-	else
-	{
-#if 1	          
-		BlockHeader_t* RESTRICT  pbh = m_pBlocks;
-		while (pbh->m_pNext)
-		{
-			pbh = pbh->m_pNext;
-		}
-		pbh->m_pNext = pBlockHeader;
-#else
-		pBlockHeader = m_pBlocks;
-		pBlockHeader->m_pNext = m_pBlocks;
-#endif
-	}
-}
-
-
-template< class T >
-inline void CUtlFixedMemory<T>::EnsureCapacity(int num)
-{
-	Grow(num - NumAllocated());
-}
-
-
-template< class T >
-void CUtlFixedMemory<T>::Purge()
-{
-	if (!m_pBlocks)
-		return;
-
-	for (BlockHeader_t* pbh = m_pBlocks; pbh; )
-	{
-		BlockHeader_t* pFree = pbh;
-		pbh = pbh->m_pNext;
-		free(pFree);
-	}
-	m_pBlocks = NULL;
-	m_nAllocationCount = 0;
-}
-
-#include "memdbgoff.h"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlflags.h b/SpyCustom/utlflags.h
deleted file mode 100644
index ac37ac9..0000000
--- a/SpyCustom/utlflags.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef UTLFLAGS_H
-#define UTLFLAGS_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dbg.h"
-
-
-template< class T >
-class CUtlFlags
-{
-public:
-	CUtlFlags(int nInitialFlags = 0);
-
-	void SetFlag(int nFlagMask);
-	void SetFlag(int nFlagMask, bool bEnable);
-
-	void ClearFlag(int nFlagMask);
-	void ClearAllFlags();
-	bool IsFlagSet(int nFlagMask) const;
-
-	bool IsAnyFlagSet() const;
-
-private:
-	T m_nFlags;
-};
-
-
-template< class T >
-CUtlFlags<T>::CUtlFlags(int nInitialFlags)
-{
-	Assert(nInitialFlags == (T)nInitialFlags);
-
-	m_nFlags = (T)nInitialFlags;
-}
-
-
-template< class T >
-void CUtlFlags<T>::SetFlag(int nFlagMask)
-{
-	Assert(nFlagMask == (T)nFlagMask);
-
-	m_nFlags |= (T)nFlagMask;
-}
-
-template< class T >
-void CUtlFlags<T>::SetFlag(int nFlagMask, bool bEnable)
-{
-	Assert(nFlagMask == (T)nFlagMask);
-
-	if (bEnable)
-	{
-		m_nFlags |= (T)nFlagMask;
-	}
-	else
-	{
-		m_nFlags &= ~((T)nFlagMask);
-	}
-}
-
-
-template< class T >
-void CUtlFlags<T>::ClearFlag(int nFlagMask)
-{
-	Assert(nFlagMask == (T)nFlagMask);
-	m_nFlags &= ~((T)nFlagMask);
-}
-
-template< class T >
-void CUtlFlags<T>::ClearAllFlags()
-{
-	m_nFlags = 0;
-}
-
-
-template< class T >
-bool CUtlFlags<T>::IsFlagSet(int nFlagMask) const
-{
-	Assert(nFlagMask == (T)nFlagMask);
-	return (m_nFlags & nFlagMask) != 0;
-}
-
-
-template< class T >
-bool CUtlFlags<T>::IsAnyFlagSet() const
-{
-	return m_nFlags != 0;
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlhandletable.h b/SpyCustom/utlhandletable.h
deleted file mode 100644
index d3b4836..0000000
--- a/SpyCustom/utlhandletable.h
+++ /dev/null
@@ -1,499 +0,0 @@
-#ifndef UTLHANDLETABLE_H
-#define	UTLHANDLETABLE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "utlvector.h"
-#include "utlqueue.h"
-
-
-typedef unsigned int UtlHandle_t;
-#define UTLHANDLE_INVALID ((UtlHandle_t)~0)
-
-
-template< class T, int HandleBits >
-class CUtlHandleTable
-{
-public:
-	CUtlHandleTable();
-
-	UtlHandle_t AddHandle();
-	void RemoveHandle(UtlHandle_t h);
-
-	void SetHandle(UtlHandle_t h, T* pData);
-	T* GetHandle(UtlHandle_t h) const;
-	T* GetHandle(UtlHandle_t h, bool checkValidity) const;
-
-	bool IsHandleValid(UtlHandle_t h) const;
-
-	unsigned int GetValidHandleCount() const;
-	unsigned int GetHandleCount() const;
-	UtlHandle_t GetHandleFromIndex(int i) const;
-	int GetIndexFromHandle(UtlHandle_t h) const;
-
-	void MarkHandleInvalid(UtlHandle_t h);
-	void MarkHandleValid(UtlHandle_t h);
-
-private:
-	struct HandleType_t
-	{
-		HandleType_t(unsigned int i, unsigned int s) : nIndex(i), nSerial(s)
-		{
-			Assert(i < (1 << HandleBits));
-			Assert(s < (1 << (31 - HandleBits)));
-		}
-		unsigned int nIndex : HandleBits;
-		unsigned int nSerial : 31 - HandleBits;
-	};
-
-	struct EntryType_t
-	{
-		EntryType_t() : m_nSerial(0), nInvalid(0), m_pData(0) {}
-		unsigned int m_nSerial : 31;
-		unsigned int nInvalid : 1;
-		T* m_pData;
-	};
-
-	static unsigned int GetSerialNumber(UtlHandle_t handle);
-	static unsigned int GetListIndex(UtlHandle_t handle);
-	static UtlHandle_t CreateHandle(unsigned int nSerial, unsigned int nIndex);
-	const EntryType_t* GetEntry(UtlHandle_t handle, bool checkValidity) const;
-
-	unsigned int m_nValidHandles;
-	CUtlVector< EntryType_t > m_list;
-	CUtlQueue< int > m_unused;
-};
-
-
-template< class T, int HandleBits >
-CUtlHandleTable<T, HandleBits>::CUtlHandleTable() : m_nValidHandles(0)
-{
-}
-
-
-template< class T, int HandleBits >
-UtlHandle_t CUtlHandleTable<T, HandleBits>::AddHandle()
-{
-	unsigned int nIndex = (m_unused.Count() > 0) ? m_unused.RemoveAtHead() : m_list.AddToTail();
-
-	EntryType_t& entry = m_list[nIndex];
-	entry.nInvalid = 0;
-	entry.m_pData = NULL;
-
-	++m_nValidHandles;
-
-	return CreateHandle(entry.m_nSerial, nIndex);
-}
-
-template< class T, int HandleBits >
-void CUtlHandleTable<T, HandleBits>::RemoveHandle(UtlHandle_t handle)
-{
-	unsigned int nIndex = GetListIndex(handle);
-	Assert(nIndex < (unsigned int)m_list.Count());
-	if (nIndex >= (unsigned int)m_list.Count())
-		return;
-
-	EntryType_t& entry = m_list[nIndex];
-	++entry.m_nSerial;     
-	if (!entry.nInvalid)
-	{
-		entry.nInvalid = 1;
-		--m_nValidHandles;
-	}
-	entry.m_pData = NULL;
-
-
-	bool bStopUsing = (entry.m_nSerial >= ((1 << (31 - HandleBits)) - 1));
-	if (!bStopUsing)
-	{
-		m_unused.Insert(nIndex);
-	}
-}
-
-
-template< class T, int HandleBits >
-void CUtlHandleTable<T, HandleBits>::SetHandle(UtlHandle_t handle, T* pData)
-{
-	EntryType_t* entry = const_cast<EntryType_t*>(GetEntry(handle, false));
-	Assert(entry);
-	if (entry == NULL)
-		return;
-
-	if (entry->nInvalid)
-	{
-		++m_nValidHandles;
-		entry->nInvalid = 0;
-	}
-	entry->m_pData = pData;
-}
-
-template< class T, int HandleBits >
-T* CUtlHandleTable<T, HandleBits>::GetHandle(UtlHandle_t handle) const
-{
-	const EntryType_t* entry = GetEntry(handle, true);
-	return entry ? entry->m_pData : NULL;
-}
-
-template< class T, int HandleBits >
-T* CUtlHandleTable<T, HandleBits>::GetHandle(UtlHandle_t handle, bool checkValidity) const
-{
-	const EntryType_t* entry = GetEntry(handle, checkValidity);
-	return entry ? entry->m_pData : NULL;
-}
-
-
-template< class T, int HandleBits >
-bool CUtlHandleTable<T, HandleBits>::IsHandleValid(UtlHandle_t handle) const
-{
-	if (handle == UTLHANDLE_INVALID)
-		return false;
-
-	unsigned int nIndex = GetListIndex(handle);
-	AssertOnce(nIndex < (unsigned int)m_list.Count());
-	if (nIndex >= (unsigned int)m_list.Count())
-		return false;
-
-	const EntryType_t& entry = m_list[nIndex];
-	if (entry.m_nSerial != GetSerialNumber(handle))
-		return false;
-
-	if (1 == entry.nInvalid)
-		return false;
-
-	return true;
-}
-
-
-template< class T, int HandleBits >
-unsigned int CUtlHandleTable<T, HandleBits>::GetValidHandleCount() const
-{
-	return m_nValidHandles;
-}
-
-template< class T, int HandleBits >
-unsigned int CUtlHandleTable<T, HandleBits>::GetHandleCount() const
-{
-	return m_list.Count();
-}
-
-template< class T, int HandleBits >
-UtlHandle_t CUtlHandleTable<T, HandleBits>::GetHandleFromIndex(int i) const
-{
-	if (m_list[i].m_pData)
-		return CreateHandle(m_list[i].m_nSerial, i);
-	return UTLHANDLE_INVALID;
-}
-
-template< class T, int HandleBits >
-int CUtlHandleTable<T, HandleBits>::GetIndexFromHandle(UtlHandle_t h) const
-{
-	if (h == UTLHANDLE_INVALID)
-		return -1;
-
-	return GetListIndex(h);
-}
-
-
-
-template< class T, int HandleBits >
-unsigned int CUtlHandleTable<T, HandleBits>::GetSerialNumber(UtlHandle_t handle)
-{
-	return ((HandleType_t*)&handle)->nSerial;
-}
-
-template< class T, int HandleBits >
-unsigned int CUtlHandleTable<T, HandleBits>::GetListIndex(UtlHandle_t handle)
-{
-	return ((HandleType_t*)&handle)->nIndex;
-}
-
-template< class T, int HandleBits >
-UtlHandle_t CUtlHandleTable<T, HandleBits>::CreateHandle(unsigned int nSerial, unsigned int nIndex)
-{
-	HandleType_t h(nIndex, nSerial);
-	return *(UtlHandle_t*)&h;
-}
-
-
-template< class T, int HandleBits >
-const typename CUtlHandleTable<T, HandleBits>::EntryType_t* CUtlHandleTable<T, HandleBits>::GetEntry(UtlHandle_t handle, bool checkValidity) const
-{
-	if (handle == UTLHANDLE_INVALID)
-		return NULL;
-
-	unsigned int nIndex = GetListIndex(handle);
-	Assert(nIndex < (unsigned int)m_list.Count());
-	if (nIndex >= (unsigned int)m_list.Count())
-		return NULL;
-
-	const EntryType_t& entry = m_list[nIndex];
-	if (entry.m_nSerial != GetSerialNumber(handle))
-		return NULL;
-
-	if (checkValidity &&
-		(1 == entry.nInvalid))
-		return NULL;
-
-	return &entry;
-}
-
-template< class T, int HandleBits >
-void CUtlHandleTable<T, HandleBits>::MarkHandleInvalid(UtlHandle_t handle)
-{
-	if (handle == UTLHANDLE_INVALID)
-		return;
-
-	unsigned int nIndex = GetListIndex(handle);
-	Assert(nIndex < (unsigned int)m_list.Count());
-	if (nIndex >= (unsigned int)m_list.Count())
-		return;
-
-	EntryType_t& entry = m_list[nIndex];
-	if (entry.m_nSerial != GetSerialNumber(handle))
-		return;
-
-	if (!entry.nInvalid)
-	{
-		--m_nValidHandles;
-		entry.nInvalid = 1;
-	}
-}
-
-template< class T, int HandleBits >
-void CUtlHandleTable<T, HandleBits>::MarkHandleValid(UtlHandle_t handle)
-{
-	if (handle == UTLHANDLE_INVALID)
-		return;
-
-	unsigned int nIndex = GetListIndex(handle);
-	Assert(nIndex < (unsigned int)m_list.Count());
-	if (nIndex >= (unsigned int)m_list.Count())
-		return;
-
-	EntryType_t& entry = m_list[nIndex];
-	if (entry.m_nSerial != GetSerialNumber(handle))
-		return;
-
-	if (entry.nInvalid)
-	{
-		++m_nValidHandles;
-		entry.nInvalid = 0;
-	}
-}
-
-
-template< class T >
-class CUtlHandle
-{
-public:
-	CUtlHandle();
-	explicit CUtlHandle(T* pObject);
-	CUtlHandle(UtlHandle_t h);
-	CUtlHandle(const CUtlHandle<T>& h);
-
-	void Set(T* pObject);
-	void Set(UtlHandle_t h);
-	const CUtlHandle<T>& operator=(UtlHandle_t h);
-	const CUtlHandle<T>& operator=(T* pObject);
-
-	T* Get();
-	const T* Get() const;
-
-	bool IsValid() const;
-
-	operator T* ();
-	operator UtlHandle_t();
-	operator bool();
-	T* operator->();
-	const T* operator->() const;
-
-	bool operator==(CUtlHandle<T> h) const;
-	bool operator==(T* pObject) const;
-	bool operator==(UtlHandle_t h) const;
-	bool operator!=(CUtlHandle<T> h) const;
-	bool operator!=(T* pObject) const;
-	bool operator!=(UtlHandle_t h) const;
-
-private:
-	UtlHandle_t m_handle;
-};
-
-
-template< class T >
-CUtlHandle<T>::CUtlHandle() : m_handle(UTLHANDLE_INVALID)
-{
-}
-
-template< class T >
-CUtlHandle<T>::CUtlHandle(T* pObject)
-{
-	Set(pObject);
-}
-
-template< class T >
-CUtlHandle<T>::CUtlHandle(UtlHandle_t h)
-{
-	m_handle = h;
-}
-
-template< class T >
-CUtlHandle<T>::CUtlHandle(const CUtlHandle<T>& h)
-{
-	m_handle = h.m_handle;
-}
-
-
-template< class T >
-void CUtlHandle<T>::Set(T* pObject)
-{
-	m_handle = pObject ? pObject->GetHandle() : UTLHANDLE_INVALID;
-}
-
-template< class T >
-void CUtlHandle<T>::Set(UtlHandle_t h)
-{
-	m_handle = h;
-}
-
-template< class T >
-const CUtlHandle<T>& CUtlHandle<T>::operator=(UtlHandle_t h)
-{
-	Set(h);
-	return *this;
-}
-
-template< class T >
-const CUtlHandle<T>& CUtlHandle<T>::operator=(T* pObject)
-{
-	Set(pObject);
-	return *this;
-}
-
-
-template< class T >
-bool CUtlHandle<T>::IsValid() const
-{
-	return T::IsHandleValid(m_handle);
-}
-
-
-template< class T >
-T* CUtlHandle<T>::Get()
-{
-	return T::GetPtrFromHandle(m_handle);
-}
-
-template< class T >
-const T* CUtlHandle<T>::Get() const
-{
-	return T::GetPtrFromHandle(m_handle);
-}
-
-
-template< class T >
-CUtlHandle<T>::operator T* ()
-{
-	return Get();
-}
-
-template< class T >
-CUtlHandle<T>::operator UtlHandle_t()
-{
-	return m_handle;
-}
-
-template< class T >
-T* CUtlHandle<T>::operator->()
-{
-	return Get();
-}
-
-template< class T >
-const T* CUtlHandle<T>::operator->() const
-{
-	return Get();
-}
-
-template< class T >
-CUtlHandle<T>::operator bool()
-{
-	return m_handle != UTLHANDLE_INVALID;
-}
-
-
-template< class T >
-bool CUtlHandle<T>::operator==(CUtlHandle<T> h) const
-{
-	return m_handle == h.m_handle;
-}
-
-template< class T >
-bool CUtlHandle<T>::operator==(T* pObject) const
-{
-	UtlHandle_t h = pObject ? pObject->GetHandle() : UTLHANDLE_INVALID;
-	return m_handle == h;
-}
-
-template< class T >
-bool CUtlHandle<T>::operator==(UtlHandle_t h) const
-{
-	return m_handle == h;
-}
-
-template< class T >
-bool CUtlHandle<T>::operator!=(CUtlHandle<T> h) const
-{
-	return m_handle != h.m_handle;
-}
-
-template< class T >
-bool CUtlHandle<T>::operator!=(T* pObject) const
-{
-	UtlHandle_t h = pObject ? pObject->GetHandle() : UTLHANDLE_INVALID;
-	return m_handle != h;
-}
-
-template< class T >
-bool CUtlHandle<T>::operator!=(UtlHandle_t h) const
-{
-	return m_handle != h;
-}
-
-
-#define DECLARE_HANDLES( _className, _handleBitCount )						\
-	public:																	\
-		UtlHandle_t GetHandle()												\
-		{																	\
-			return m_Handle;												\
-		}																	\
-		static _className* GetPtrFromHandle( UtlHandle_t h )				\
-		{																	\
-			return m_HandleTable.GetHandle( h );							\
-		}																	\
-		static bool IsHandleValid( UtlHandle_t h )							\
-		{																	\
-			return m_HandleTable.IsHandleValid( h );						\
-		}																	\
-	private:																\
-		UtlHandle_t m_Handle;												\
-		static CUtlHandleTable< _className, _handleBitCount > m_HandleTable
-
-
-#define IMPLEMENT_HANDLES( _className, _handleBitCount )					\
-	CUtlHandleTable< _className, _handleBitCount > _className::m_HandleTable;
-
-
-#define CONSTRUCT_HANDLE( )						\
-	m_Handle = m_HandleTable.AddHandle();		\
-	m_HandleTable.SetHandle( m_Handle, this )
-
-#define DESTRUCT_HANDLE()						\
-	m_HandleTable.RemoveHandle( m_Handle );		\
-	m_Handle = UTLHANDLE_INVALID
-
-
-
-#endif  
diff --git a/SpyCustom/utlhash.h b/SpyCustom/utlhash.h
deleted file mode 100644
index 5b20034..0000000
--- a/SpyCustom/utlhash.h
+++ /dev/null
@@ -1,732 +0,0 @@
-#ifndef UTLHASH_H
-#define UTLHASH_H
-#pragma once
-
-#include <assert.h>
-#include <limits.h>
-#include "utlmemory.h"
-#include "utlvector.h"
-#include "utllinkedlist.h"
-#include "commonmacros.h"
-#include "generichash.h"
-
-typedef unsigned int UtlHashHandle_t;
-
-template<class Data, typename C = bool (*)(Data const&, Data const&), typename K = unsigned int (*)(Data const&) >
-class CUtlHash
-{
-public:
-	typedef C CompareFunc_t;
-	typedef K KeyFunc_t;
-
-	CUtlHash(int bucketCount = 0, int growCount = 0, int initCount = 0,
-		CompareFunc_t compareFunc = 0, KeyFunc_t keyFunc = 0);
-	~CUtlHash();
-
-	static UtlHashHandle_t InvalidHandle(void) { return (UtlHashHandle_t)~0; }
-	bool IsValidHandle(UtlHashHandle_t handle) const;
-
-	int Count(void) const;
-
-	void Purge(void);
-
-	UtlHashHandle_t Insert(Data const& src);
-	UtlHashHandle_t Insert(Data const& src, bool* pDidInsert);
-	UtlHashHandle_t AllocEntryFromKey(Data const& src);
-
-	void Remove(UtlHashHandle_t handle);
-	void RemoveAll();
-
-	UtlHashHandle_t Find(Data const& src) const;
-
-	Data& Element(UtlHashHandle_t handle);
-	Data const& Element(UtlHashHandle_t handle) const;
-	Data& operator[](UtlHashHandle_t handle);
-	Data const& operator[](UtlHashHandle_t handle) const;
-
-	UtlHashHandle_t GetFirstHandle() const;
-	UtlHashHandle_t GetNextHandle(UtlHashHandle_t h) const;
-
-	void Log(const char* filename);
-
-protected:
-
-	int GetBucketIndex(UtlHashHandle_t handle) const;
-	int GetKeyDataIndex(UtlHashHandle_t handle) const;
-	UtlHashHandle_t BuildHandle(int ndxBucket, int ndxKeyData) const;
-
-	bool DoFind(Data const& src, unsigned int* pBucket, int* pIndex) const;
-
-protected:
-
-	typedef CUtlVector<Data> HashBucketList_t;
-	CUtlVector<HashBucketList_t>	m_Buckets;
-
-	CompareFunc_t					m_CompareFunc;			        
-	KeyFunc_t						m_KeyFunc;				       
-
-	bool							m_bPowerOfTwo;			          
-	unsigned int					m_ModMask;				      	
-};
-
-
-template<class Data, typename C, typename K>
-CUtlHash<Data, C, K>::CUtlHash(int bucketCount, int growCount, int initCount,
-	CompareFunc_t compareFunc, KeyFunc_t keyFunc) :
-	m_CompareFunc(compareFunc),
-	m_KeyFunc(keyFunc)
-{
-	m_Buckets.SetSize(bucketCount);
-	for (int ndxBucket = 0; ndxBucket < bucketCount; ndxBucket++)
-	{
-		m_Buckets[ndxBucket].SetSize(initCount);
-		m_Buckets[ndxBucket].SetGrowSize(growCount);
-	}
-
-	m_bPowerOfTwo = IsPowerOfTwo(bucketCount);
-	m_ModMask = m_bPowerOfTwo ? (bucketCount - 1) : 0;
-}
-
-
-template<class Data, typename C, typename K>
-CUtlHash<Data, C, K>::~CUtlHash()
-{
-	Purge();
-}
-
-
-template<class Data, typename C, typename K>
-inline bool CUtlHash<Data, C, K>::IsValidHandle(UtlHashHandle_t handle) const
-{
-	int ndxBucket = GetBucketIndex(handle);
-	int ndxKeyData = GetKeyDataIndex(handle);
-
-	if (             (ndxBucket < m_Buckets.Count()))
-	{
-		if (        (ndxKeyData < m_Buckets[ndxBucket].Count()))
-			return true;
-	}
-
-	return false;
-}
-
-template<class Data, typename C, typename K>
-inline int CUtlHash<Data, C, K>::Count(void) const
-{
-	int count = 0;
-
-	int bucketCount = m_Buckets.Count();
-	for (int ndxBucket = 0; ndxBucket < bucketCount; ndxBucket++)
-	{
-		count += m_Buckets[ndxBucket].Count();
-	}
-
-	return count;
-}
-
-
-template<class Data, typename C, typename K>
-inline int CUtlHash<Data, C, K>::GetBucketIndex(UtlHashHandle_t handle) const
-{
-	return (((handle >> 16) & 0x0000ffff));
-}
-
-
-template<class Data, typename C, typename K>
-inline int CUtlHash<Data, C, K>::GetKeyDataIndex(UtlHashHandle_t handle) const
-{
-	return (handle & 0x0000ffff);
-}
-
-
-template<class Data, typename C, typename K>
-inline UtlHashHandle_t CUtlHash<Data, C, K>::BuildHandle(int ndxBucket, int ndxKeyData) const
-{
-	assert((ndxBucket >= 0) && (ndxBucket < 65536));
-	assert((ndxKeyData >= 0) && (ndxKeyData < 65536));
-
-	UtlHashHandle_t handle = ndxKeyData;
-	handle |= (ndxBucket << 16);
-
-	return handle;
-}
-
-
-template<class Data, typename C, typename K>
-inline void CUtlHash<Data, C, K>::Purge(void)
-{
-	int bucketCount = m_Buckets.Count();
-	for (int ndxBucket = 0; ndxBucket < bucketCount; ndxBucket++)
-	{
-		m_Buckets[ndxBucket].Purge();
-	}
-}
-
-template<class Data, typename C, typename K>
-inline bool CUtlHash<Data, C, K>::DoFind(Data const& src, unsigned int* pBucket, int* pIndex) const
-{
-	unsigned int key = m_KeyFunc(src);
-
-	unsigned int ndxBucket;
-	if (m_bPowerOfTwo)
-	{
-		*pBucket = ndxBucket = (key & m_ModMask);
-	}
-	else
-	{
-		int bucketCount = m_Buckets.Count();
-		*pBucket = ndxBucket = key % bucketCount;
-	}
-
-	int ndxKeyData;
-	const CUtlVector<Data>& bucket = m_Buckets[ndxBucket];
-	int keyDataCount = bucket.Count();
-	for (ndxKeyData = 0; ndxKeyData < keyDataCount; ndxKeyData++)
-	{
-		if (m_CompareFunc(bucket.Element(ndxKeyData), src))
-			break;
-	}
-
-	if (ndxKeyData == keyDataCount)
-		return false;
-
-	*pIndex = ndxKeyData;
-	return true;
-}
-
-
-template<class Data, typename C, typename K>
-inline UtlHashHandle_t CUtlHash<Data, C, K>::Find(Data const& src) const
-{
-	unsigned int ndxBucket;
-	int ndxKeyData;
-
-	if (DoFind(src, &ndxBucket, &ndxKeyData))
-	{
-		return (BuildHandle(ndxBucket, ndxKeyData));
-	}
-	return (InvalidHandle());
-}
-
-
-template<class Data, typename C, typename K>
-inline UtlHashHandle_t CUtlHash<Data, C, K>::Insert(Data const& src)
-{
-	unsigned int ndxBucket;
-	int ndxKeyData;
-
-	if (DoFind(src, &ndxBucket, &ndxKeyData))
-	{
-		return (BuildHandle(ndxBucket, ndxKeyData));
-	}
-
-	ndxKeyData = m_Buckets[ndxBucket].AddToTail(src);
-
-	return (BuildHandle(ndxBucket, ndxKeyData));
-}
-
-template<class Data, typename C, typename K>
-inline UtlHashHandle_t CUtlHash<Data, C, K>::Insert(Data const& src, bool* pDidInsert)
-{
-	unsigned int ndxBucket;
-	int ndxKeyData;
-
-	if (DoFind(src, &ndxBucket, &ndxKeyData))
-	{
-		*pDidInsert = false;
-		return (BuildHandle(ndxBucket, ndxKeyData));
-	}
-
-	*pDidInsert = true;
-	ndxKeyData = m_Buckets[ndxBucket].AddToTail(src);
-
-	return (BuildHandle(ndxBucket, ndxKeyData));
-}
-
-
-template<class Data, typename C, typename K>
-inline UtlHashHandle_t CUtlHash<Data, C, K>::AllocEntryFromKey(Data const& src)
-{
-	unsigned int ndxBucket;
-	int ndxKeyData;
-
-	if (DoFind(src, &ndxBucket, &ndxKeyData))
-	{
-		return (BuildHandle(ndxBucket, ndxKeyData));
-	}
-
-	ndxKeyData = m_Buckets[ndxBucket].AddToTail();
-
-	return (BuildHandle(ndxBucket, ndxKeyData));
-}
-
-
-template<class Data, typename C, typename K>
-inline void CUtlHash<Data, C, K>::Remove(UtlHashHandle_t handle)
-{
-	assert(IsValidHandle(handle));
-
-	int ndxBucket = GetBucketIndex(handle);
-	int ndxKeyData = GetKeyDataIndex(handle);
-
-	if (m_Buckets[ndxBucket].IsValidIndex(ndxKeyData))
-	{
-		m_Buckets[ndxBucket].FastRemove(ndxKeyData);
-	}
-}
-
-
-template<class Data, typename C, typename K>
-inline void CUtlHash<Data, C, K>::RemoveAll()
-{
-	int bucketCount = m_Buckets.Count();
-	for (int ndxBucket = 0; ndxBucket < bucketCount; ndxBucket++)
-	{
-		m_Buckets[ndxBucket].RemoveAll();
-	}
-}
-
-
-template<class Data, typename C, typename K>
-inline Data& CUtlHash<Data, C, K>::Element(UtlHashHandle_t handle)
-{
-	int ndxBucket = GetBucketIndex(handle);
-	int ndxKeyData = GetKeyDataIndex(handle);
-
-	return (m_Buckets[ndxBucket].Element(ndxKeyData));
-}
-
-template<class Data, typename C, typename K>
-inline Data const& CUtlHash<Data, C, K>::Element(UtlHashHandle_t handle) const
-{
-	int ndxBucket = GetBucketIndex(handle);
-	int ndxKeyData = GetKeyDataIndex(handle);
-
-	return (m_Buckets[ndxBucket].Element(ndxKeyData));
-}
-
-
-template<class Data, typename C, typename K>
-inline Data& CUtlHash<Data, C, K>::operator[](UtlHashHandle_t handle)
-{
-	int ndxBucket = GetBucketIndex(handle);
-	int ndxKeyData = GetKeyDataIndex(handle);
-
-	return (m_Buckets[ndxBucket].Element(ndxKeyData));
-}
-
-
-template<class Data, typename C, typename K>
-inline Data const& CUtlHash<Data, C, K>::operator[](UtlHashHandle_t handle) const
-{
-	int ndxBucket = GetBucketIndex(handle);
-	int ndxKeyData = GetKeyDataIndex(handle);
-
-	return (m_Buckets[ndxBucket].Element(ndxKeyData));
-}
-
-template<class Data, typename C, typename K>
-inline UtlHashHandle_t CUtlHash<Data, C, K>::GetFirstHandle() const
-{
-	return GetNextHandle((UtlHashHandle_t)-1);
-}
-
-template<class Data, typename C, typename K>
-inline UtlHashHandle_t CUtlHash<Data, C, K>::GetNextHandle(UtlHashHandle_t handle) const
-{
-	++handle;           
-
-	int bi = GetBucketIndex(handle);
-	int ki = GetKeyDataIndex(handle);
-
-	int nBuckets = m_Buckets.Count();
-	for (; bi < nBuckets; ++bi)
-	{
-		if (ki < m_Buckets[bi].Count())
-			return BuildHandle(bi, ki);
-
-		ki = 0;
-	}
-
-	return InvalidHandle();
-}
-
-template<class Data, typename C, typename K>
-inline void CUtlHash<Data, C, K>::Log(const char* filename)
-{
-	FILE* pDebugFp;
-	pDebugFp = fopen(filename, "w");
-	if (!pDebugFp)
-		return;
-
-	int maxBucketSize = 0;
-	int numBucketsEmpty = 0;
-
-	int bucketCount = m_Buckets.Count();
-	fprintf(pDebugFp, "\n%d Buckets\n", bucketCount);
-
-	for (int ndxBucket = 0; ndxBucket < bucketCount; ndxBucket++)
-	{
-		int count = m_Buckets[ndxBucket].Count();
-
-		if (count > maxBucketSize) { maxBucketSize = count; }
-		if (count == 0)
-			numBucketsEmpty++;
-
-		fprintf(pDebugFp, "Bucket %d: %d\n", ndxBucket, count);
-	}
-
-	fprintf(pDebugFp, "\nBucketHeads Used: %d\n", bucketCount - numBucketsEmpty);
-	fprintf(pDebugFp, "Max Bucket Size: %d\n", maxBucketSize);
-
-	fclose(pDebugFp);
-}
-
-typedef int UtlHashFastHandle_t;
-
-#define UTLHASH_POOL_SCALAR		2
-
-class CUtlHashFastNoHash
-{
-public:
-	static int Hash(int key, int bucketMask)
-	{
-		return (key & bucketMask);
-	}
-};
-
-class CUtlHashFastGenericHash
-{
-public:
-	static int Hash(int key, int bucketMask)
-	{
-		return (HashIntConventional(key) & bucketMask);
-	}
-};
-
-template<class Data, class HashFuncs = CUtlHashFastNoHash >
-class CUtlHashFast
-{
-public:
-
-	CUtlHashFast();
-	~CUtlHashFast();
-
-	void Purge(void);
-
-	static UtlHashFastHandle_t InvalidHandle(void) { return (UtlHashFastHandle_t)~0; }
-
-	bool Init(int nBucketCount);
-
-	int Count(void);
-
-	UtlHashFastHandle_t Insert(unsigned int uiKey, const Data& data);
-	UtlHashFastHandle_t FastInsert(unsigned int uiKey, const Data& data);
-
-	void Remove(UtlHashFastHandle_t hHash);
-	void RemoveAll(void);
-
-	UtlHashFastHandle_t Find(unsigned int uiKey);
-
-	Data& Element(UtlHashFastHandle_t hHash);
-	Data const& Element(UtlHashFastHandle_t hHash) const;
-	Data& operator[](UtlHashFastHandle_t hHash);
-	Data const& operator[](UtlHashFastHandle_t hHash) const;
-
-	template <typename HashData>
-	struct HashFastData_t_
-	{
-		unsigned int	m_uiKey;
-		HashData	m_Data;
-	};
-
-	typedef HashFastData_t_<Data> HashFastData_t;
-
-	unsigned int						m_uiBucketMask;
-	CUtlVector<UtlHashFastHandle_t>		m_aBuckets;
-	CUtlFixedLinkedList<HashFastData_t>	m_aDataPool;
-};
-
-template<class Data, class HashFuncs> CUtlHashFast<Data, HashFuncs>::CUtlHashFast()
-{
-	Purge();
-}
-
-template<class Data, class HashFuncs> CUtlHashFast<Data, HashFuncs>::~CUtlHashFast()
-{
-	Purge();
-}
-
-template<class Data, class HashFuncs> inline void CUtlHashFast<Data, HashFuncs>::Purge(void)
-{
-	m_aBuckets.Purge();
-	m_aDataPool.Purge();
-}
-
-template<class Data, class HashFuncs> bool CUtlHashFast<Data, HashFuncs>::Init(int nBucketCount)
-{
-	if (!IsPowerOfTwo(nBucketCount))
-		return false;
-
-	m_aBuckets.SetSize(nBucketCount);
-	for (int iBucket = 0; iBucket < nBucketCount; ++iBucket)
-	{
-		m_aBuckets[iBucket] = m_aDataPool.InvalidIndex();
-	}
-
-	m_uiBucketMask = nBucketCount - 1;
-
-	int nGrowSize = UTLHASH_POOL_SCALAR * nBucketCount;
-	m_aDataPool.SetGrowSize(nGrowSize);
-
-	return true;
-}
-
-template<class Data, class HashFuncs> inline int CUtlHashFast<Data, HashFuncs>::Count(void)
-{
-	return m_aDataPool.Count();
-}
-
-template<class Data, class HashFuncs> inline UtlHashFastHandle_t CUtlHashFast<Data, HashFuncs>::Insert(unsigned int uiKey, const Data& data)
-{
-	UtlHashFastHandle_t hHash = Find(uiKey);
-	if (hHash != InvalidHandle())
-		return hHash;
-
-	return FastInsert(uiKey, data);
-}
-
-template<class Data, class HashFuncs> inline UtlHashFastHandle_t CUtlHashFast<Data, HashFuncs>::FastInsert(unsigned int uiKey, const Data& data)
-{
-	int iHashData = m_aDataPool.Alloc(true);
-	HashFastData_t* pHashData = &m_aDataPool[iHashData];
-	if (!pHashData)
-		return InvalidHandle();
-
-	pHashData->m_uiKey = uiKey;
-	pHashData->m_Data = data;
-
-	int iBucket = HashFuncs::Hash(uiKey, m_uiBucketMask);
-	m_aDataPool.LinkBefore(m_aBuckets[iBucket], iHashData);
-	m_aBuckets[iBucket] = iHashData;
-
-	return iHashData;
-}
-
-template<class Data, class HashFuncs> inline void CUtlHashFast<Data, HashFuncs>::Remove(UtlHashFastHandle_t hHash)
-{
-	int iBucket = HashFuncs::Hash(m_aDataPool[hHash].m_uiKey, m_uiBucketMask);
-	if (m_aBuckets[iBucket] == hHash)
-	{
-		m_aBuckets[iBucket] = m_aDataPool.Next(hHash);
-	}
-	else
-	{
-		m_aDataPool.Unlink(hHash);
-	}
-
-	m_aDataPool.Remove(hHash);
-}
-
-template<class Data, class HashFuncs> inline void CUtlHashFast<Data, HashFuncs>::RemoveAll(void)
-{
-	m_aBuckets.RemoveAll();
-	m_aDataPool.RemoveAll();
-}
-
-template<class Data, class HashFuncs> inline UtlHashFastHandle_t CUtlHashFast<Data, HashFuncs>::Find(unsigned int uiKey)
-{
-	int iBucket = HashFuncs::Hash(uiKey, m_uiBucketMask);
-
-	for (int iElement = m_aBuckets[iBucket]; iElement != m_aDataPool.InvalidIndex(); iElement = m_aDataPool.Next(iElement))
-	{
-		if (m_aDataPool[iElement].m_uiKey == uiKey)
-			return iElement;
-	}
-
-	return InvalidHandle();
-}
-
-template<class Data, class HashFuncs> inline Data& CUtlHashFast<Data, HashFuncs>::Element(UtlHashFastHandle_t hHash)
-{
-	return (m_aDataPool[hHash].m_Data);
-}
-
-template<class Data, class HashFuncs> inline Data const& CUtlHashFast<Data, HashFuncs>::Element(UtlHashFastHandle_t hHash) const
-{
-	return (m_aDataPool[hHash].m_Data);
-}
-
-template<class Data, class HashFuncs> inline Data& CUtlHashFast<Data, HashFuncs>::operator[](UtlHashFastHandle_t hHash)
-{
-	return (m_aDataPool[hHash].m_Data);
-}
-
-template<class Data, class HashFuncs> inline Data const& CUtlHashFast<Data, HashFuncs>::operator[](UtlHashFastHandle_t hHash) const
-{
-	return (m_aDataPool[hHash].m_Data);
-}
-
-typedef int UtlHashFixedHandle_t;
-
-template <int NUM_BUCKETS>
-class CUtlHashFixedGenericHash
-{
-public:
-	static int Hash(int key, int bucketMask)
-	{
-		int hash = HashIntConventional(key);
-		if (NUM_BUCKETS <= USHRT_MAX)
-		{
-			hash ^= (hash >> 16);
-		}
-		if (NUM_BUCKETS <= UCHAR_MAX)
-		{
-			hash ^= (hash >> 8);
-		}
-		return (hash & bucketMask);
-	}
-};
-
-template<class Data, int NUM_BUCKETS, class CHashFuncs = CUtlHashFastNoHash >
-class CUtlHashFixed
-{
-public:
-
-	CUtlHashFixed();
-	~CUtlHashFixed();
-
-	void Purge(void);
-
-	static UtlHashFixedHandle_t InvalidHandle(void) { return (UtlHashFixedHandle_t)~0; }
-
-	int Count(void);
-
-	UtlHashFixedHandle_t Insert(unsigned int uiKey, const Data& data);
-	UtlHashFixedHandle_t FastInsert(unsigned int uiKey, const Data& data);
-
-	void Remove(UtlHashFixedHandle_t hHash);
-	void RemoveAll(void);
-
-	UtlHashFixedHandle_t Find(unsigned int uiKey);
-
-	Data& Element(UtlHashFixedHandle_t hHash);
-	Data const& Element(UtlHashFixedHandle_t hHash) const;
-	Data& operator[](UtlHashFixedHandle_t hHash);
-	Data const& operator[](UtlHashFixedHandle_t hHash) const;
-
-	template <typename Data_t>
-	struct HashFixedData_t_
-	{
-		unsigned int	m_uiKey;
-		Data_t			m_Data;
-	};
-
-	typedef HashFixedData_t_<Data> HashFixedData_t;
-
-	enum
-	{
-		BUCKET_MASK = NUM_BUCKETS - 1
-	};
-	CUtlPtrLinkedList<HashFixedData_t> m_aBuckets[NUM_BUCKETS];
-	int m_nElements;
-};
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::CUtlHashFixed()
-{
-	Purge();
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::~CUtlHashFixed()
-{
-	Purge();
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline void CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::Purge(void)
-{
-	RemoveAll();
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline int CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::Count(void)
-{
-	return m_nElements;
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline UtlHashFixedHandle_t CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::Insert(unsigned int uiKey, const Data& data)
-{
-	UtlHashFixedHandle_t hHash = Find(uiKey);
-	if (hHash != InvalidHandle())
-		return hHash;
-
-	return FastInsert(uiKey, data);
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline UtlHashFixedHandle_t CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::FastInsert(unsigned int uiKey, const Data& data)
-{
-	int iBucket = HashFuncs::Hash(uiKey, NUM_BUCKETS - 1);
-	UtlPtrLinkedListIndex_t iElem = m_aBuckets[iBucket].AddToHead();
-
-	HashFixedData_t* pHashData = &m_aBuckets[iBucket][iElem];
-
-	Assert((UtlPtrLinkedListIndex_t)pHashData == iElem);
-
-	pHashData->m_uiKey = uiKey;
-	pHashData->m_Data = data;
-
-	m_nElements++;
-	return (UtlHashFixedHandle_t)pHashData;
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline void CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::Remove(UtlHashFixedHandle_t hHash)
-{
-	HashFixedData_t* pHashData = (HashFixedData_t*)hHash;
-	Assert(Find(pHashData->m_uiKey) != InvalidHandle());
-	int iBucket = HashFuncs::Hash(pHashData->m_uiKey, NUM_BUCKETS - 1);
-	m_aBuckets[iBucket].Remove((UtlPtrLinkedListIndex_t)pHashData);
-	m_nElements--;
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline void CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::RemoveAll(void)
-{
-	for (int i = 0; i < NUM_BUCKETS; i++)
-	{
-		m_aBuckets[i].RemoveAll();
-	}
-	m_nElements = 0;
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline UtlHashFixedHandle_t CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::Find(unsigned int uiKey)
-{
-	int iBucket = HashFuncs::Hash(uiKey, NUM_BUCKETS - 1);
-	CUtlPtrLinkedList<HashFixedData_t>& bucket = m_aBuckets[iBucket];
-
-	for (UtlPtrLinkedListIndex_t iElement = bucket.Head(); iElement != bucket.InvalidIndex(); iElement = bucket.Next(iElement))
-	{
-		if (bucket[iElement].m_uiKey == uiKey)
-			return (UtlHashFixedHandle_t)iElement;
-	}
-
-	return InvalidHandle();
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline Data& CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::Element(UtlHashFixedHandle_t hHash)
-{
-	return ((HashFixedData_t*)hHash)->m_Data;
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline Data const& CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::Element(UtlHashFixedHandle_t hHash) const
-{
-	return ((HashFixedData_t*)hHash)->m_Data;
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline Data& CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::operator[](UtlHashFixedHandle_t hHash)
-{
-	return ((HashFixedData_t*)hHash)->m_Data;
-}
-
-template<class Data, int NUM_BUCKETS, class HashFuncs> inline Data const& CUtlHashFixed<Data, NUM_BUCKETS, HashFuncs>::operator[](UtlHashFixedHandle_t hHash) const
-{
-	return ((HashFixedData_t*)hHash)->m_Data;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlintrusivelist.h b/SpyCustom/utlintrusivelist.h
deleted file mode 100644
index 1739ddc..0000000
--- a/SpyCustom/utlintrusivelist.h
+++ /dev/null
@@ -1,797 +0,0 @@
-#ifndef UTILINTRUSIVELIST_H
-#define UTILINTRUSIVELIST_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "basetypes.h"
-#include "utlmemory.h"
-#include "dbg.h"
-
-
-
-namespace IntrusiveList
-{
-#ifdef SUPERSLOW_DEBUG_VERSION                              
-	template<class T> inline void ValidateDList(T* head)
-	{
-		if (head)
-		{
-			Assert(head->m_pPrev == 0);
-		}
-		while (head)
-		{
-			if (head->m_pNext)
-			{
-				Assert(head->m_pNext->m_pPrev == head);
-			}
-			if (head->m_pPrev)
-			{
-				Assert(head->m_pPrev->m_pNext == head);
-			}
-			head = head->m_pNext;
-		}
-	}
-#else
-	template<class T> inline void ValidateDList(T* )
-	{
-	}
-#endif
-
-
-
-	template <class T> inline void MoveDNodeBackwards(T* which, T*& head)
-	{
-		if (which->m_pPrev)
-		{
-			T* p = which->m_pPrev;
-			T* pp = p->m_pPrev;
-			T* n = which->m_pNext;
-			Assert(p->m_pNext == which);
-			if (n)
-			{
-				Assert(n->m_pPrev == which);
-				n->m_pPrev = p;
-			}
-			if (pp)
-			{
-				Assert(pp->m_pNext == p);
-				pp->m_pNext = which;
-			}
-			else
-			{
-				head = which;                           
-			}
-			which->m_pNext = p;
-			which->m_pPrev = pp;
-			p->m_pNext = n;
-			p->m_pPrev = which;
-		}
-		ValidateDList(head);
-	}
-
-
-
-	template<class T> inline void RemoveFromDList(T*& head, T* which)
-	{
-		if (which->m_pPrev)
-		{
-			Assert(which->m_pPrev->m_pNext == which);
-			which->m_pPrev->m_pNext = which->m_pNext;
-			if (which->m_pNext)
-			{
-				Assert(which->m_pNext->m_pPrev == which);
-				which->m_pNext->m_pPrev = which->m_pPrev;
-			}
-		}
-		else
-		{
-			if (head == which)
-			{
-				head = which->m_pNext;
-				if (head)
-				{
-					Assert(head->m_pPrev == which);
-					head->m_pPrev = 0;
-				}
-			}
-		}
-		which->m_pNext = which->m_pPrev = 0;
-		ValidateDList(head);
-
-	}
-
-	template<class T> bool OnDList(T const* head, T const* which)
-	{
-		return (head == which) || (which->m_pNext != 0) || (which->m_pPrev != 0);
-	}
-
-	template<class T> void AddToDTail(T*& head, T* node)
-	{
-		node->m_pNext = 0;
-		if (!head)
-		{
-			head = node;
-		}
-		else
-		{
-			T* ptr = head;
-			while (ptr->m_pNext)
-			{
-				ptr = ptr->m_pNext;
-			}
-			ptr->m_pNext = node;
-			node->m_pPrev = ptr;   
-		}
-	}
-
-	template<class T> inline void AddToDHead(T*& head, T* which)
-	{
-		which->m_pNext = head;
-		if (head)
-		{
-			head->m_pPrev = which;
-		}
-		which->m_pPrev = 0;
-		head = which;
-		ValidateDList(head);
-	}
-
-	template<class T> inline void AddToDHeadWithTailPtr(T*& head, T* which, T*& tailptr)
-	{
-		which->m_pNext = head;
-		if (head)
-		{
-			head->m_pPrev = which;
-		}
-		else
-		{
-			tailptr = which;
-		}
-		which->m_pPrev = 0;
-		head = which;
-		ValidateDList(head);
-	}
-
-	template<class T> inline void AddToDTailWithTailPtr(T*& head, T* which, T*& tailptr)
-	{
-		if (!tailptr)
-		{
-			Assert(!head);
-			which->m_pPrev = which->m_pNext = 0;
-			tailptr = head = which;
-		}
-		else
-		{
-			which->m_pNext = 0;
-			which->m_pPrev = tailptr;
-			tailptr->m_pNext = which;
-			tailptr = which;
-		}
-		ValidateDList(head);
-	}
-
-	template<class T> inline void RemoveFromDListWithTailPtr(T*& head, T* which, T*& tailptr)
-	{
-		if (which == tailptr)
-		{
-			tailptr = which->m_pPrev;
-		}
-		if (which->m_pPrev)
-		{
-			Assert(which->m_pPrev->m_pNext == which);
-			which->m_pPrev->m_pNext = which->m_pNext;
-			if (which->m_pNext)
-			{
-				Assert(which->m_pNext->m_pPrev == which);
-				which->m_pNext->m_pPrev = which->m_pPrev;
-			}
-		}
-		else
-		{
-			if (head == which)
-			{
-				head = which->m_pNext;
-				if (head)
-				{
-					Assert(head->m_pPrev == which);
-					head->m_pPrev = 0;
-				}
-			}
-		}
-		which->m_pNext = which->m_pPrev = 0;
-		ValidateDList(head);
-
-	}
-
-	template<class T> inline void DeleteFromDListWithTailPtr(T*& head, T* which, T*& tailptr)
-	{
-		T* tmp = which;
-		if (which == tailptr)
-		{
-			tailptr = which->m_pPrev;
-		}
-		if (which->m_pPrev)
-		{
-			Assert(which->m_pPrev->m_pNext == which);
-			which->m_pPrev->m_pNext = which->m_pNext;
-			if (which->m_pNext)
-			{
-				Assert(which->m_pNext->m_pPrev == which);
-				which->m_pNext->m_pPrev = which->m_pPrev;
-			}
-		}
-		else
-		{
-			if (head == which)
-			{
-				head = which->m_pNext;
-				if (head)
-				{
-					Assert(head->m_pPrev == which);
-					head->m_pPrev = 0;
-				}
-			}
-		}
-		which->m_pNext = which->m_pPrev = 0;
-		delete tmp;
-		ValidateDList(head);
-	}
-
-	template<class T> inline void AddToDPriority(T*& head, T* which)
-	{
-		T* prevnode = 0;
-		for (T* curnode = head; curnode; curnode = curnode->m_pNext)
-		{
-			if (which->m_Priority >= curnode->m_Priority)
-				break;
-			prevnode = curnode;
-		}
-		if (!prevnode)
-		{
-			AddToDHead(head, which);
-		}
-		else
-		{
-			which->m_pNext = prevnode->m_pNext;
-			prevnode->m_pNext = which;
-			which->m_pPrev = prevnode;
-			if (which->m_pNext)
-				which->m_pNext->m_pPrev = which;
-		}
-	}
-
-	template<class T> inline void AddToDPriorityLowestFirst(T*& head, T* which)
-	{
-		T* prevnode = 0;
-		for (T* curnode = head; curnode; curnode = curnode->m_pNext)
-		{
-			if (which->m_Priority <= curnode->m_Priority)
-				break;
-			prevnode = curnode;
-		}
-		if (!prevnode)
-		{
-			AddToDHead(head, which);
-		}
-		else
-		{
-			which->m_pNext = prevnode->m_pNext;
-			prevnode->m_pNext = which;
-			which->m_pPrev = prevnode;
-			if (which->m_pNext)
-				which->m_pNext->m_pPrev = which;
-		}
-	}
-
-
-	template<class T> T* LastNode(T* head)
-	{
-		if (head)
-		{
-			while (head->m_pNext)
-			{
-				head = head->m_pNext;
-			}
-		}
-		return head;
-	}
-
-
-	template<class T, class V> void RemoveFromList(T*& head, V* which)
-	{
-		if (head == which)
-		{
-			head = which->m_pNext;
-		}
-		else
-		{
-			for (T* i = head; i; i = i->m_pNext)
-			{
-				if (i->m_pNext == which)
-				{
-					i->m_pNext = which->m_pNext;
-					return;
-				}
-			}
-		}
-	}
-
-	template<class T, class V> void DeleteFromList(T*& head, V* which)
-	{
-		T* tmp;
-		if (head == which)
-		{
-			tmp = which->m_pNext;
-			delete(head);
-			head = tmp;
-		}
-		else
-		{
-			for (T* i = head; i; i = i->m_pNext)
-			{
-				if (i->m_pNext == which)
-				{
-					tmp = which->m_pNext;
-					delete(which);
-					i->m_pNext = tmp;
-					return;
-				}
-			}
-		}
-	}
-
-	template<class T, class V> int PositionInList(T* head, V* node)
-	{
-		int pos = 0;
-		while (head)
-		{
-			if (head == node) return pos;
-			head = head->m_pNext;
-			pos++;
-		}
-		return -1;
-	}
-
-	template<class T> T* NthNode(T* head, int idx)
-	{
-		while (idx && head)
-		{
-			idx--;
-			head = head->m_pNext;
-		}
-		return head;
-	}
-
-	template<class T, class V> static inline void AddToHead(T*& head, V* node)
-	{
-		node->m_pNext = head;
-		head = node;
-	}
-
-	template<class T, class V> static inline void AddToTail(T*& head, V* node)
-	{
-		node->m_pNext = NULL;
-		if (!head)
-			head = node;
-		else
-		{
-			T* pLastNode = head;
-			while (pLastNode->m_pNext)
-				pLastNode = pLastNode->m_pNext;
-			pLastNode->m_pNext = node;
-		}
-	}
-
-	template<class T, class V> static inline void AddToHead(T*& head, T*& tail, V* node)
-	{
-		if (!head)
-		{
-			tail = node;
-		}
-		node->m_pNext = head;
-		head = node;
-	}
-
-
-
-	template<class T> static inline T* PrevNode(T* head, T* node)
-	{
-		T* i;
-		for (i = head; i; i = i->m_pNext)
-		{
-			if (i->m_pNext == node)
-				break;
-		}
-		return i;
-	}
-
-
-	template<class T, class V> void AddToEnd(T*& head, V* node)
-	{
-		node->m_pNext = 0;
-		if (!head)
-		{
-			head = node;
-		}
-		else
-		{
-			T* ptr = head;
-			while (ptr->m_pNext)
-			{
-				ptr = ptr->m_pNext;
-			}
-			ptr->m_pNext = node;
-		}
-	}
-
-	template<class T, class V> void AddToEndWithTail(T*& head, T*& tail, V* node)
-	{
-		Assert((head && tail) || ((!head) && (!tail)));
-		node->m_pNext = 0;
-		if (!head)
-		{
-			head = tail = node;
-		}
-		else
-		{
-			tail->m_pNext = node;
-			tail = node;
-		}
-	}
-
-	template<class T> void AddSortedByName(T*& head, T* node)
-	{
-		if ((!head) ||                                            
-			(stricmp(node->m_Name, head->m_Name) == -1))                     
-		{
-			node->m_pNext = head;                                           
-			head = node;
-		}
-		else
-		{
-			T* t;
-			for (t = head; t->m_pNext; t = t->m_pNext)                               
-				if (stricmp(t->m_pNext->m_Name, node->m_Name) >= 0)
-					break;
-			node->m_pNext = t->m_pNext;
-			t->m_pNext = node;
-		}
-	}
-
-	template<class T> int ListLength(T* head)
-	{
-		int len = 0;
-		while (head)
-		{
-			len++;
-			head = head->m_pNext;
-		}
-		return len;
-	}
-
-	template<class T> void KillList(T*& head)
-	{
-		while (head)
-		{
-			delete head;
-		}
-	}
-
-
-	template<class T> void DeleteList(T*& head)
-	{
-		while (head)
-		{
-			T* tmp = head->m_pNext;
-			delete head;
-			head = tmp;
-		}
-	}
-
-	template <class T> static inline T* FindNamedNode(T* head, char const* name)
-	{
-		for (; head && stricmp(head->m_Name, name); head = head->m_pNext)
-		{
-		}
-		return head;
-	}
-
-	template <class T> static inline T* FindNamedNodeCaseSensitive(T* head, char const* name)
-	{
-		for (; head && strcmp(head->m_Name, name); head = head->m_pNext)
-		{
-		}
-		return head;
-	}
-
-	template <class T, class U, class V> static inline T* FindNodeByField(T* head, U data, U V::* field)
-	{
-		while (head)
-		{
-			if (data == (*head).*field)
-				return head;
-			head = head->m_pNext;
-		}
-		return 0;
-	}
-
-	template <class T, class U, class V> static inline T* FindNodeByFieldWithPrev(T* head, U data, U V::* field, T*& prev)
-	{
-		prev = 0;
-		for (T* i = head; i; i = i->m_pNext)
-		{
-			if (data == (*i).*field)
-				return i;
-			prev = i;
-		}
-		prev = 0;
-		return 0;
-	}
-
-
-	template<class T> void SortList(T*& head, int (*comparefn)(T* a, T* b))
-	{
-		int didswap = 1;
-		while (didswap)
-		{
-			didswap = 0;
-			T* prev = 0;
-			for (T* i = head; i && i->m_pNext; i = i->m_pNext)
-			{
-				int rslt = (*comparefn)(i, i->m_pNext);
-				if (rslt == -1)
-				{
-					didswap = 1;
-					T* newfirst = i->m_pNext;
-					if (prev)
-					{
-						prev->m_pNext = newfirst;
-						i->m_pNext = newfirst->m_pNext;
-						newfirst->m_pNext = i;
-					}
-					else
-					{
-						head = i->m_pNext;
-						i->m_pNext = newfirst->m_pNext;
-						newfirst->m_pNext = i;
-					}
-					i = newfirst;
-				}
-				prev = i;
-			}
-		}
-	}
-
-	template <class T> void SortDList(T*& head, int (*comparefn)(T* a, T* b))
-	{
-		SortList(head, comparefn);
-		T* prev = 0;
-		for (T* i = head; i; i = i->m_pNext)
-		{
-			i->m_pPrev = prev;
-			prev = i;
-		}
-	}
-
-	template <class T> T* ReversedList(T* head)
-	{
-		T* pNewHead = NULL;
-		while (head)
-		{
-			T* pNext = head->m_pNext;
-#ifdef INTERVIEW_QUESTION
-			head->m_pNext = pNewHead;
-			pNewHead = head;
-#else
-			AddToHead(pNewHead, head);
-#endif
-			head = pNext;
-		}
-		return pNewHead;
-	}
-};
-
-template<class T> class CUtlIntrusiveList
-{
-public:
-	T* m_pHead;
-
-	FORCEINLINE T* Head(void) const
-	{
-		return m_pHead;
-	}
-
-	FORCEINLINE CUtlIntrusiveList(void)
-	{
-		m_pHead = NULL;
-	}
-
-
-	FORCEINLINE void RemoveAll(void)
-	{
-		m_pHead = NULL;
-	}
-	FORCEINLINE void AddToHead(T* node)
-	{
-		IntrusiveList::AddToHead(m_pHead, node);
-	}
-
-	FORCEINLINE void AddToTail(T* node)
-	{
-		IntrusiveList::AddToTail(m_pHead, node);
-	}
-
-	void RemoveNode(T* which)
-	{
-		IntrusiveList::RemoveFromList(m_pHead, which);
-	}
-
-	void KillList(void)
-	{
-		while (m_pHead)
-		{
-			delete m_pHead;
-		}
-	}
-
-
-	T* PrevNode(T* node)
-	{
-		return IntrusiveList::PrevNode(m_pHead, node);
-	}
-
-	int NthNode(int n)
-	{
-		return NthNode(m_pHead, n);
-	}
-
-	void Purge(void)
-	{
-		while (m_pHead)
-		{
-			T* tmp = m_pHead->m_pNext;
-			delete m_pHead;
-			m_pHead = tmp;
-		}
-	}
-
-	int Count(void) const
-	{
-		return IntrusiveList::ListLength(m_pHead);
-	}
-
-	FORCEINLINE T* FindNamedNodeCaseSensitive(char const* pName) const
-	{
-		return IntrusiveList::FindNamedNodeCaseSensitive(m_pHead, pName);
-
-	}
-
-	T* RemoveHead(void)
-	{
-		if (m_pHead)
-		{
-			T* pRet = m_pHead;
-			m_pHead = pRet->m_pNext;
-			return pRet;
-		}
-		else
-			return NULL;
-	}
-};
-
-template<class T> class CUtlIntrusiveDList : public CUtlIntrusiveList<T>
-{
-public:
-
-	FORCEINLINE void AddToHead(T* node)
-	{
-		IntrusiveList::AddToDHead(CUtlIntrusiveList<T>::m_pHead, node);
-	}
-	FORCEINLINE void AddToTail(T* node)
-	{
-		IntrusiveList::AddToDTail(CUtlIntrusiveList<T>::m_pHead, node);
-	}
-
-	void RemoveNode(T* which)
-	{
-		IntrusiveList::RemoveFromDList(CUtlIntrusiveList<T>::m_pHead, which);
-	}
-
-	T* RemoveHead(void)
-	{
-		if (CUtlIntrusiveList<T>::m_pHead)
-		{
-			T* pRet = CUtlIntrusiveList<T>::m_pHead;
-			CUtlIntrusiveList<T>::m_pHead = CUtlIntrusiveList<T>::m_pHead->m_pNext;
-			if (CUtlIntrusiveList<T>::m_pHead)
-				CUtlIntrusiveList<T>::m_pHead->m_pPrev = NULL;
-			return pRet;
-		}
-		else
-			return NULL;
-	}
-
-	T* PrevNode(T* node)
-	{
-		return (node) ? node->m_Prev : NULL;
-	}
-
-};
-
-template<class T> class CUtlIntrusiveDListWithTailPtr : public CUtlIntrusiveDList<T>
-{
-public:
-
-	T* m_pTailPtr;
-
-	FORCEINLINE CUtlIntrusiveDListWithTailPtr(void) : CUtlIntrusiveDList<T>()
-	{
-		m_pTailPtr = NULL;
-	}
-
-	FORCEINLINE void AddToHead(T* node)
-	{
-		IntrusiveList::AddToDHeadWithTailPtr(CUtlIntrusiveList<T>::m_pHead, node, m_pTailPtr);
-	}
-	FORCEINLINE void AddToTail(T* node)
-	{
-		IntrusiveList::AddToDTailWithTailPtr(CUtlIntrusiveList<T>::m_pHead, node, m_pTailPtr);
-	}
-
-	void RemoveNode(T* pWhich)
-	{
-		IntrusiveList::RemoveFromDListWithTailPtr(CUtlIntrusiveList<T>::m_pHead, pWhich, m_pTailPtr);
-	}
-
-	void Purge(void)
-	{
-		CUtlIntrusiveList<T>::Purge();
-		m_pTailPtr = NULL;
-	}
-
-	void Kill(void)
-	{
-		CUtlIntrusiveList<T>::Purge();
-		m_pTailPtr = NULL;
-	}
-
-	T* RemoveHead(void)
-	{
-		if (CUtlIntrusiveDList<T>::m_pHead)
-		{
-			T* pRet = CUtlIntrusiveDList<T>::m_pHead;
-			CUtlIntrusiveDList<T>::m_pHead = CUtlIntrusiveDList<T>::m_pHead->m_pNext;
-			if (CUtlIntrusiveDList<T>::m_pHead)
-				CUtlIntrusiveDList<T>::m_pHead->m_pPrev = NULL;
-			if (!CUtlIntrusiveDList<T>::m_pHead)
-				m_pTailPtr = NULL;
-			ValidateDList(CUtlIntrusiveDList<T>::m_pHead);
-			return pRet;
-		}
-		else
-			return NULL;
-	}
-
-	T* PrevNode(T* node)
-	{
-		return (node) ? node->m_Prev : NULL;
-	}
-
-};
-
-template<class T> void PrependDListWithTailToDList(CUtlIntrusiveDListWithTailPtr<T>& src,
-	CUtlIntrusiveDList<T>& dest)
-{
-	if (src.m_pHead)
-	{
-		src.m_pTailPtr->m_pNext = dest.m_pHead;
-		if (dest.m_pHead)
-			dest.m_pHead->m_pPrev = src.m_pTailPtr;
-		dest.m_pHead = src.m_pHead;
-		IntrusiveList::ValidateDList(dest.m_pHead);
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/utllinkedlist.h b/SpyCustom/utllinkedlist.h
deleted file mode 100644
index 2ed0867..0000000
--- a/SpyCustom/utllinkedlist.h
+++ /dev/null
@@ -1,1077 +0,0 @@
-#ifndef UTLLINKEDLIST_H
-#define UTLLINKEDLIST_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "basetypes.h"
-#include "utlmemory.h"
-#include "utlfixedmemory.h"
-#include "utlblockmemory.h"
-#include "dbg.h"
-
-#define FOR_EACH_LL( listName, iteratorName ) \
-	for( int iteratorName=(listName).Head(); (listName).IsUtlLinkedList && iteratorName != (listName).InvalidIndex(); iteratorName = (listName).Next( iteratorName ) )
-
-template <class T, class I>
-struct UtlLinkedListElem_t
-{
-	T  m_Element;
-	I  m_Previous;
-	I  m_Next;
-
-private:
-	UtlLinkedListElem_t(const UtlLinkedListElem_t&);
-};
-
-
-template <class T, class S = unsigned short, bool ML = false, class I = S, class M = CUtlMemory< UtlLinkedListElem_t<T, S>, I > >
-class CUtlLinkedList
-{
-public:
-	typedef T ElemType_t;
-	typedef S IndexType_t;             
-	typedef I IndexLocalType_t;
-	typedef M MemoryAllocator_t;
-	static const bool IsUtlLinkedList = true;        
-
-	CUtlLinkedList(int growSize = 0, int initSize = 0);
-	~CUtlLinkedList();
-
-	T& Element(I i);
-	T const& Element(I i) const;
-	T& operator[](I i);
-	T const& operator[](I i) const;
-
-	void EnsureCapacity(int num);
-
-	void SetGrowSize(int growSize);
-
-	void Purge();
-
-	void PurgeAndDeleteElements();
-
-	I	InsertBefore(I before);
-	I	InsertAfter(I after);
-	I	AddToHead();
-	I	AddToTail();
-
-	I	InsertBefore(I before, T const& src);
-	I	InsertAfter(I after, T const& src);
-	I	AddToHead(T const& src);
-	I	AddToTail(T const& src);
-
-	I		Find(const T& src) const;
-
-	bool	FindAndRemove(const T& src);
-
-	void	Remove(I elem);
-	void	RemoveAll();
-
-	I		Alloc(bool multilist = false);
-	void	Free(I elem);
-
-	void	LinkBefore(I before, I elem);
-	void	LinkAfter(I after, I elem);
-	void	Unlink(I elem);
-	void	LinkToHead(I elem);
-	void	LinkToTail(I elem);
-
-	inline static S  InvalidIndex() { return (S)M::InvalidIndex(); }
-
-	static bool IndexInRange(I index);
-
-	inline static size_t ElementSize() { return sizeof(ListElem_t); }
-
-	int	Count() const;
-	I	MaxElementIndex() const;
-	I	NumAllocated(void) const { return m_NumAlloced; }
-
-	I  Head() const;
-	I  Tail() const;
-	I  Previous(I i) const;
-	I  Next(I i) const;
-
-	template < typename List_t >
-	class _CUtlLinkedList_constiterator_t
-	{
-	public:
-		typedef typename List_t::ElemType_t ElemType_t;
-		typedef typename List_t::IndexType_t IndexType_t;
-
-		_CUtlLinkedList_constiterator_t()
-			: m_list(0)
-			, m_index(List_t::InvalidIndex())
-		{
-		}
-		_CUtlLinkedList_constiterator_t(const List_t& list, IndexType_t index)
-			: m_list(&list)
-			, m_index(index)
-		{
-		}
-
-		_CUtlLinkedList_constiterator_t& operator++()
-		{
-			m_index = m_list->Next(m_index);
-			return *this;
-		}
-		_CUtlLinkedList_constiterator_t operator++(int)
-		{
-			_CUtlLinkedList_constiterator_t temp = *this;
-			++* this;
-			return temp;
-		}
-
-		_CUtlLinkedList_constiterator_t& operator--()
-		{
-			Assert(m_index != m_list->Head());
-			if (m_index == m_list->InvalidIndex())
-			{
-				m_index = m_list->Tail();
-			}
-			else
-			{
-				m_index = m_list->Previous(m_index);
-			}
-			return *this;
-		}
-		_CUtlLinkedList_constiterator_t operator--(int)
-		{
-			_CUtlLinkedList_constiterator_t temp = *this;
-			--* this;
-			return temp;
-		}
-
-		bool operator==(const _CUtlLinkedList_constiterator_t& other) const
-		{
-			Assert(m_list == other.m_list);
-			return m_index == other.m_index;
-		}
-
-		bool operator!=(const _CUtlLinkedList_constiterator_t& other) const
-		{
-			Assert(m_list == other.m_list);
-			return m_index != other.m_index;
-		}
-
-		const ElemType_t& operator*() const
-		{
-			return m_list->Element(m_index);
-		}
-
-		const ElemType_t* operator->() const
-		{
-			return (&**this);
-		}
-
-	protected:
-		const List_t* m_list;
-		IndexType_t m_index;
-	};
-
-	template < typename List_t >
-	class _CUtlLinkedList_iterator_t : public _CUtlLinkedList_constiterator_t< List_t >
-	{
-	public:
-		typedef typename List_t::ElemType_t ElemType_t;
-		typedef typename List_t::IndexType_t IndexType_t;
-		typedef _CUtlLinkedList_constiterator_t< List_t > Base;
-
-		_CUtlLinkedList_iterator_t()
-		{
-		}
-		_CUtlLinkedList_iterator_t(const List_t& list, IndexType_t index)
-			: _CUtlLinkedList_constiterator_t< List_t >(list, index)
-		{
-		}
-
-		_CUtlLinkedList_iterator_t& operator++()
-		{
-			Base::m_index = Base::m_list->Next(Base::m_index);
-			return *this;
-		}
-		_CUtlLinkedList_iterator_t operator++(int)
-		{
-			_CUtlLinkedList_iterator_t temp = *this;
-			++* this;
-			return temp;
-		}
-
-		_CUtlLinkedList_iterator_t& operator--()
-		{
-			Assert(Base::m_index != Base::m_list->Head());
-			if (Base::m_index == Base::m_list->InvalidIndex())
-			{
-				Base::m_index = Base::m_list->Tail();
-			}
-			else
-			{
-				Base::m_index = Base::m_list->Previous(Base::m_index);
-			}
-			return *this;
-		}
-		_CUtlLinkedList_iterator_t operator--(int)
-		{
-			_CUtlLinkedList_iterator_t temp = *this;
-			--* this;
-			return temp;
-		}
-
-		ElemType_t& operator*() const
-		{
-			List_t* pMutableList = const_cast<List_t*>(Base::m_list);
-			return pMutableList->Element(Base::m_index);
-		}
-
-		ElemType_t* operator->() const
-		{
-			return (&**this);
-		}
-	};
-
-	typedef _CUtlLinkedList_constiterator_t<CUtlLinkedList<T, S, ML, I, M> > const_iterator;
-	typedef _CUtlLinkedList_iterator_t<CUtlLinkedList<T, S, ML, I, M> > iterator;
-	const_iterator begin() const
-	{
-		return const_iterator(*this, Head());
-	}
-	iterator begin()
-	{
-		return iterator(*this, Head());
-	}
-
-	const_iterator end() const
-	{
-		return const_iterator(*this, InvalidIndex());
-	}
-	iterator end()
-	{
-		return iterator(*this, InvalidIndex());
-	}
-
-	bool  IsValidIndex(I i) const;
-	bool  IsInList(I i) const;
-
-protected:
-
-	typedef UtlLinkedListElem_t<T, S>  ListElem_t;
-
-	I		AllocInternal(bool multilist = false);
-	void ConstructList();
-
-	ListElem_t& InternalElement(I i) { return m_Memory[i]; }
-	ListElem_t const& InternalElement(I i) const { return m_Memory[i]; }
-
-	CUtlLinkedList(CUtlLinkedList<T, S, ML, I, M> const& list) { Assert(0); }
-
-	M	m_Memory;
-	I	m_Head;
-	I	m_Tail;
-	I	m_FirstFree;
-	I	m_ElementCount;		      
-	I	m_NumAlloced;		     
-	typename M::Iterator_t	m_LastAlloc;     
-
-	ListElem_t* m_pElements;
-
-	FORCEINLINE M const& Memory(void) const
-	{
-		return m_Memory;
-	}
-
-	void ResetDbgInfo()
-	{
-		m_pElements = m_Memory.Base();
-	}
-
-private:
-	I  PrivateNext(I i) const;
-};
-
-
-template < class T >
-class CUtlFixedLinkedList : public CUtlLinkedList< T, int, true, int, CUtlFixedMemory< UtlLinkedListElem_t< T, int > > >
-{
-public:
-	CUtlFixedLinkedList(int growSize = 0, int initSize = 0)
-		: CUtlLinkedList< T, int, true, int, CUtlFixedMemory< UtlLinkedListElem_t< T, int > > >(growSize, initSize) {}
-
-	typedef CUtlLinkedList< T, int, true, int, CUtlFixedMemory< UtlLinkedListElem_t< T, int > > > BaseClass;
-	bool IsValidIndex(int i) const
-	{
-		if (!BaseClass::Memory().IsIdxValid(i))
-			return false;
-
-#ifdef _DEBUG                    
-		if (BaseClass::Memory().IsIdxAfter(i, this->m_LastAlloc))
-		{
-			Assert(0);
-			return false;           
-		}
-#endif
-
-		return (BaseClass::Memory()[i].m_Previous != i) || (BaseClass::Memory()[i].m_Next == i);
-	}
-
-private:
-	int	MaxElementIndex() const { Assert(0); return BaseClass::InvalidIndex(); }        
-	void ResetDbgInfo() {}
-};
-
-template < class T, class I = unsigned short >
-class CUtlBlockLinkedList : public CUtlLinkedList< T, I, true, I, CUtlBlockMemory< UtlLinkedListElem_t< T, I >, I > >
-{
-public:
-	CUtlBlockLinkedList(int growSize = 0, int initSize = 0)
-		: CUtlLinkedList< T, I, true, I, CUtlBlockMemory< UtlLinkedListElem_t< T, I >, I > >(growSize, initSize) {}
-protected:
-	void ResetDbgInfo() {}
-};
-
-
-template <class T, class S, bool ML, class I, class M>
-CUtlLinkedList<T, S, ML, I, M>::CUtlLinkedList(int growSize, int initSize) :
-	m_Memory(growSize, initSize), m_LastAlloc(m_Memory.InvalidIterator())
-{
-	COMPILE_TIME_ASSERT(sizeof(S) == 4 || (((S)-1) > 0));
-	ConstructList();
-	ResetDbgInfo();
-}
-
-template <class T, class S, bool ML, class I, class M>
-CUtlLinkedList<T, S, ML, I, M>::~CUtlLinkedList()
-{
-	RemoveAll();
-}
-
-template <class T, class S, bool ML, class I, class M>
-void CUtlLinkedList<T, S, ML, I, M>::ConstructList()
-{
-	m_Head = InvalidIndex();
-	m_Tail = InvalidIndex();
-	m_FirstFree = InvalidIndex();
-	m_ElementCount = 0;
-	m_NumAlloced = 0;
-}
-
-
-template <class T, class S, bool ML, class I, class M>
-inline T& CUtlLinkedList<T, S, ML, I, M>::Element(I i)
-{
-	return m_Memory[i].m_Element;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline T const& CUtlLinkedList<T, S, ML, I, M>::Element(I i) const
-{
-	return m_Memory[i].m_Element;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline T& CUtlLinkedList<T, S, ML, I, M>::operator[](I i)
-{
-	return m_Memory[i].m_Element;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline T const& CUtlLinkedList<T, S, ML, I, M>::operator[](I i) const
-{
-	return m_Memory[i].m_Element;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline int CUtlLinkedList<T, S, ML, I, M>::Count() const
-{
-#ifdef MULTILIST_PEDANTIC_ASSERTS
-	AssertMsg(!ML, "CUtlLinkedList::Count() is meaningless for linked lists.");
-#endif
-	return m_ElementCount;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline I CUtlLinkedList<T, S, ML, I, M>::MaxElementIndex() const
-{
-	return m_Memory.NumAllocated();
-}
-
-
-template <class T, class S, bool ML, class I, class M>
-inline I  CUtlLinkedList<T, S, ML, I, M>::Head() const
-{
-	return m_Head;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline I  CUtlLinkedList<T, S, ML, I, M>::Tail() const
-{
-	return m_Tail;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline I  CUtlLinkedList<T, S, ML, I, M>::Previous(I i) const
-{
-	Assert(IsValidIndex(i));
-	return InternalElement(i).m_Previous;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline I  CUtlLinkedList<T, S, ML, I, M>::Next(I i) const
-{
-	Assert(IsValidIndex(i));
-	return InternalElement(i).m_Next;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline I  CUtlLinkedList<T, S, ML, I, M>::PrivateNext(I i) const
-{
-	return InternalElement(i).m_Next;
-}
-
-
-#pragma warning(push)
-#pragma warning( disable: 4310 )    
-template <class T, class S, bool ML, class I, class M>
-inline bool CUtlLinkedList<T, S, ML, I, M>::IndexInRange(I index)   
-{
-	COMPILE_TIME_ASSERT(sizeof(I) >= sizeof(S));
-	COMPILE_TIME_ASSERT((sizeof(S) > 2) || (((S)-1) > 0));
-	COMPILE_TIME_ASSERT((M::INVALID_INDEX == -1) || (M::INVALID_INDEX == (S)M::INVALID_INDEX));
-
-	return (((S)index == index) && ((S)index != InvalidIndex()));
-}
-#pragma warning(pop)
-
-template <class T, class S, bool ML, class I, class M>
-inline bool CUtlLinkedList<T, S, ML, I, M>::IsValidIndex(I i) const
-{
-	if (!m_Memory.IsIdxValid(i))
-		return false;
-
-	if (m_Memory.IsIdxAfter(i, m_LastAlloc))
-		return false;           
-
-	return (m_Memory[i].m_Previous != i) || (m_Memory[i].m_Next == i);
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline bool CUtlLinkedList<T, S, ML, I, M>::IsInList(I i) const
-{
-	if (!m_Memory.IsIdxValid(i) || m_Memory.IsIdxAfter(i, m_LastAlloc))
-		return false;           
-
-	return Previous(i) != i;
-}
-
-template< class T, class S, bool ML, class I, class M >
-void CUtlLinkedList<T, S, ML, I, M>::EnsureCapacity(int num)
-{
-	MEM_ALLOC_CREDIT_CLASS();
-	m_Memory.EnsureCapacity(num);
-	ResetDbgInfo();
-}
-
-template< class T, class S, bool ML, class I, class M >
-void CUtlLinkedList<T, S, ML, I, M>::SetGrowSize(int growSize)
-{
-	RemoveAll();
-	m_Memory.Init(growSize);
-	ResetDbgInfo();
-}
-
-
-template <class T, class S, bool ML, class I, class M>
-void  CUtlLinkedList<T, S, ML, I, M>::Purge()
-{
-	RemoveAll();
-
-	m_Memory.Purge();
-	m_FirstFree = InvalidIndex();
-	m_NumAlloced = 0;
-
-	const typename M::Iterator_t scInvalidIterator = m_Memory.InvalidIterator();
-	m_LastAlloc = scInvalidIterator;
-	ResetDbgInfo();
-}
-
-
-template<class T, class S, bool ML, class I, class M>
-void CUtlLinkedList<T, S, ML, I, M>::PurgeAndDeleteElements()
-{
-	I iNext;
-	for (I i = Head(); i != InvalidIndex(); i = iNext)
-	{
-		iNext = Next(i);
-		delete Element(i);
-	}
-
-	Purge();
-}
-
-
-template <class T, class S, bool ML, class I, class M>
-I CUtlLinkedList<T, S, ML, I, M>::AllocInternal(bool multilist)
-{
-	Assert(!multilist || ML);
-#ifdef MULTILIST_PEDANTIC_ASSERTS
-	Assert(multilist == ML);
-#endif
-	I elem;
-	if (m_FirstFree == InvalidIndex())
-	{
-		Assert(m_Memory.IsValidIterator(m_LastAlloc) || m_ElementCount == 0);
-
-		typename M::Iterator_t it = m_Memory.IsValidIterator(m_LastAlloc) ? m_Memory.Next(m_LastAlloc) : m_Memory.First();
-
-		if (!m_Memory.IsValidIterator(it))
-		{
-			MEM_ALLOC_CREDIT_CLASS();
-			m_Memory.Grow();
-			ResetDbgInfo();
-
-			it = m_Memory.IsValidIterator(m_LastAlloc) ? m_Memory.Next(m_LastAlloc) : m_Memory.First();
-
-			Assert(m_Memory.IsValidIterator(it));
-			if (!m_Memory.IsValidIterator(it))
-			{
-				Error("CUtlLinkedList overflow! (exhausted memory allocator)\n");
-				return InvalidIndex();
-			}
-		}
-
-		if (!IndexInRange(m_Memory.GetIndex(it)))
-		{
-			Error("CUtlLinkedList overflow! (exhausted index range)\n");
-			return InvalidIndex();
-		}
-
-		m_LastAlloc = it;
-		elem = m_Memory.GetIndex(m_LastAlloc);
-		m_NumAlloced++;
-	}
-	else
-	{
-		elem = m_FirstFree;
-		m_FirstFree = InternalElement(m_FirstFree).m_Next;
-	}
-
-	if (!multilist)
-	{
-		InternalElement(elem).m_Next = elem;
-		InternalElement(elem).m_Previous = elem;
-	}
-	else
-	{
-		InternalElement(elem).m_Next = InvalidIndex();
-		InternalElement(elem).m_Previous = InvalidIndex();
-	}
-
-	return elem;
-}
-
-template <class T, class S, bool ML, class I, class M>
-I CUtlLinkedList<T, S, ML, I, M>::Alloc(bool multilist)
-{
-	I elem = AllocInternal(multilist);
-	if (elem == InvalidIndex())
-		return elem;
-
-	Construct(&Element(elem));
-
-	return elem;
-}
-
-template <class T, class S, bool ML, class I, class M>
-void  CUtlLinkedList<T, S, ML, I, M>::Free(I elem)
-{
-	Assert(IsValidIndex(elem) && IndexInRange(elem));
-	Unlink(elem);
-
-	ListElem_t& internalElem = InternalElement(elem);
-	Destruct(&internalElem.m_Element);
-	internalElem.m_Next = m_FirstFree;
-	m_FirstFree = elem;
-}
-
-template <class T, class S, bool ML, class I, class M>
-I CUtlLinkedList<T, S, ML, I, M>::InsertBefore(I before)
-{
-	I   newNode = AllocInternal();
-	if (newNode == InvalidIndex())
-		return newNode;
-
-	LinkBefore(before, newNode);
-
-	Construct(&Element(newNode));
-
-	return newNode;
-}
-
-template <class T, class S, bool ML, class I, class M>
-I CUtlLinkedList<T, S, ML, I, M>::InsertAfter(I after)
-{
-	I   newNode = AllocInternal();
-	if (newNode == InvalidIndex())
-		return newNode;
-
-	LinkAfter(after, newNode);
-
-	Construct(&Element(newNode));
-
-	return newNode;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline I CUtlLinkedList<T, S, ML, I, M>::AddToHead()
-{
-	return InsertAfter(InvalidIndex());
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline I CUtlLinkedList<T, S, ML, I, M>::AddToTail()
-{
-	return InsertBefore(InvalidIndex());
-}
-
-
-template <class T, class S, bool ML, class I, class M>
-I CUtlLinkedList<T, S, ML, I, M>::InsertBefore(I before, T const& src)
-{
-	I   newNode = AllocInternal();
-	if (newNode == InvalidIndex())
-		return newNode;
-
-	LinkBefore(before, newNode);
-
-	CopyConstruct(&Element(newNode), src);
-
-	return newNode;
-}
-
-template <class T, class S, bool ML, class I, class M>
-I CUtlLinkedList<T, S, ML, I, M>::InsertAfter(I after, T const& src)
-{
-	I   newNode = AllocInternal();
-	if (newNode == InvalidIndex())
-		return newNode;
-
-	LinkAfter(after, newNode);
-
-	CopyConstruct(&Element(newNode), src);
-
-	return newNode;
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline I CUtlLinkedList<T, S, ML, I, M>::AddToHead(T const& src)
-{
-	return InsertAfter(InvalidIndex(), src);
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline I CUtlLinkedList<T, S, ML, I, M>::AddToTail(T const& src)
-{
-	return InsertBefore(InvalidIndex(), src);
-}
-
-
-template<class T, class S, bool ML, class I, class M>
-I CUtlLinkedList<T, S, ML, I, M>::Find(const T& src) const
-{
-	I invalidIndex = InvalidIndex();
-	for (I i = Head(); i != invalidIndex; i = PrivateNext(i))
-	{
-		if (Element(i) == src)
-			return i;
-	}
-	return InvalidIndex();
-}
-
-
-template<class T, class S, bool ML, class I, class M>
-bool CUtlLinkedList<T, S, ML, I, M>::FindAndRemove(const T& src)
-{
-	I i = Find(src);
-	if (i == InvalidIndex())
-	{
-		return false;
-	}
-	else
-	{
-		Remove(i);
-		return true;
-	}
-}
-
-
-template <class T, class S, bool ML, class I, class M>
-void  CUtlLinkedList<T, S, ML, I, M>::Remove(I elem)
-{
-	Free(elem);
-}
-
-template <class T, class S, bool ML, class I, class M>
-void  CUtlLinkedList<T, S, ML, I, M>::RemoveAll()
-{
-	if (m_LastAlloc == m_Memory.InvalidIterator())
-	{
-		Assert(m_Head == InvalidIndex());
-		Assert(m_Tail == InvalidIndex());
-		Assert(m_FirstFree == InvalidIndex());
-		Assert(m_ElementCount == 0);
-		return;
-	}
-
-	if (ML)
-	{
-		for (typename M::Iterator_t it = m_Memory.First(); it != m_Memory.InvalidIterator(); it = m_Memory.Next(it))
-		{
-			I i = m_Memory.GetIndex(it);
-			if (IsValidIndex(i))        
-			{
-				ListElem_t& internalElem = InternalElement(i);
-				Destruct(&internalElem.m_Element);
-				internalElem.m_Previous = i;
-				internalElem.m_Next = m_FirstFree;
-				m_FirstFree = i;
-			}
-
-			if (it == m_LastAlloc)
-				break;         
-		}
-	}
-	else
-	{
-		I i = Head();
-		I next;
-		while (i != InvalidIndex())
-		{
-			next = Next(i);
-			ListElem_t& internalElem = InternalElement(i);
-			Destruct(&internalElem.m_Element);
-			internalElem.m_Previous = i;
-			internalElem.m_Next = next == InvalidIndex() ? m_FirstFree : next;
-			i = next;
-		}
-		if (Head() != InvalidIndex())
-		{
-			m_FirstFree = Head();
-		}
-	}
-
-	m_Head = InvalidIndex();
-	m_Tail = InvalidIndex();
-	m_ElementCount = 0;
-}
-
-
-template <class T, class S, bool ML, class I, class M>
-void  CUtlLinkedList<T, S, ML, I, M>::LinkBefore(I before, I elem)
-{
-	Assert(IsValidIndex(elem));
-
-	Unlink(elem);
-
-	ListElem_t* RESTRICT pNewElem = &InternalElement(elem);
-
-	pNewElem->m_Next = before;
-
-	S newElem_mPrevious;             
-	if (before == InvalidIndex())
-	{
-		newElem_mPrevious = m_Tail;
-		pNewElem->m_Previous = m_Tail;
-		m_Tail = elem;
-	}
-	else
-	{
-		Assert(IsInList(before));
-		ListElem_t* RESTRICT beforeElem = &InternalElement(before);
-		pNewElem->m_Previous = newElem_mPrevious = beforeElem->m_Previous;
-		beforeElem->m_Previous = elem;
-	}
-
-	if (newElem_mPrevious == InvalidIndex())
-		m_Head = elem;
-	else
-		InternalElement(newElem_mPrevious).m_Next = elem;
-
-	++m_ElementCount;
-}
-
-template <class T, class S, bool ML, class I, class M>
-void  CUtlLinkedList<T, S, ML, I, M>::LinkAfter(I after, I elem)
-{
-	Assert(IsValidIndex(elem));
-
-	if (IsInList(elem))
-		Unlink(elem);
-
-	ListElem_t& newElem = InternalElement(elem);
-
-	newElem.m_Previous = after;
-	if (after == InvalidIndex())
-	{
-		newElem.m_Next = m_Head;
-		m_Head = elem;
-	}
-	else
-	{
-		Assert(IsInList(after));
-		ListElem_t& afterElem = InternalElement(after);
-		newElem.m_Next = afterElem.m_Next;
-		afterElem.m_Next = elem;
-	}
-
-	if (newElem.m_Next == InvalidIndex())
-		m_Tail = elem;
-	else
-		InternalElement(newElem.m_Next).m_Previous = elem;
-
-	++m_ElementCount;
-}
-
-template <class T, class S, bool ML, class I, class M>
-void  CUtlLinkedList<T, S, ML, I, M>::Unlink(I elem)
-{
-	Assert(IsValidIndex(elem));
-	if (IsInList(elem))
-	{
-		ListElem_t* RESTRICT pOldElem = &m_Memory[elem];
-
-		if (pOldElem->m_Previous != InvalidIndex())
-		{
-			m_Memory[pOldElem->m_Previous].m_Next = pOldElem->m_Next;
-		}
-		else
-		{
-			m_Head = pOldElem->m_Next;
-		}
-
-		if (pOldElem->m_Next != InvalidIndex())
-		{
-			m_Memory[pOldElem->m_Next].m_Previous = pOldElem->m_Previous;
-		}
-		else
-		{
-			m_Tail = pOldElem->m_Previous;
-		}
-
-		pOldElem->m_Previous = pOldElem->m_Next = elem;
-
-		--m_ElementCount;
-	}
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline void CUtlLinkedList<T, S, ML, I, M>::LinkToHead(I elem)
-{
-	LinkAfter(InvalidIndex(), elem);
-}
-
-template <class T, class S, bool ML, class I, class M>
-inline void CUtlLinkedList<T, S, ML, I, M>::LinkToTail(I elem)
-{
-	LinkBefore(InvalidIndex(), elem);
-}
-
-
-DECLARE_POINTER_HANDLE(UtlPtrLinkedListIndex_t);     
-
-template < typename T >
-class CUtlPtrLinkedList
-{
-public:
-	CUtlPtrLinkedList()
-		: m_pFirst(NULL),
-		m_nElems(0)
-	{
-		COMPILE_TIME_ASSERT(sizeof(IndexType_t) == sizeof(Node_t*));
-	}
-
-	~CUtlPtrLinkedList()
-	{
-		RemoveAll();
-	}
-
-	typedef UtlPtrLinkedListIndex_t IndexType_t;
-
-	T& operator[](IndexType_t i)
-	{
-		return ((Node_t*)i)->elem;
-	}
-
-	const T& operator[](IndexType_t i) const
-	{
-		return ((Node_t*)i)->elem;
-	}
-
-	IndexType_t	AddToTail()
-	{
-		return DoInsertBefore((IndexType_t)m_pFirst, NULL);
-	}
-
-	IndexType_t	AddToTail(T const& src)
-	{
-		return DoInsertBefore((IndexType_t)m_pFirst, &src);
-	}
-
-	IndexType_t	AddToHead()
-	{
-		IndexType_t result = DoInsertBefore((IndexType_t)m_pFirst, NULL);
-		m_pFirst = ((Node_t*)result);
-		return result;
-	}
-
-	IndexType_t	AddToHead(T const& src)
-	{
-		IndexType_t result = DoInsertBefore((IndexType_t)m_pFirst, &src);
-		m_pFirst = ((Node_t*)result);
-		return result;
-	}
-
-	IndexType_t InsertBefore(IndexType_t before)
-	{
-		return DoInsertBefore(before, NULL);
-	}
-
-	IndexType_t InsertAfter(IndexType_t after)
-	{
-		Node_t* pBefore = ((Node_t*)after)->next;
-		return DoInsertBefore(pBefore, NULL);
-	}
-
-	IndexType_t InsertBefore(IndexType_t before, T const& src)
-	{
-		return DoInsertBefore(before, &src);
-	}
-
-	IndexType_t InsertAfter(IndexType_t after, T const& src)
-	{
-		Node_t* pBefore = ((Node_t*)after)->next;
-		return DoInsertBefore(pBefore, &src);
-	}
-
-	void Remove(IndexType_t elem)
-	{
-		Node_t* p = (Node_t*)elem;
-
-		if (p->pNext == p)
-		{
-			m_pFirst = NULL;
-		}
-		else
-		{
-			if (m_pFirst == p)
-			{
-				m_pFirst = p->pNext;
-			}
-			p->pNext->pPrev = p->pPrev;
-			p->pPrev->pNext = p->pNext;
-		}
-
-		delete p;
-		m_nElems--;
-	}
-
-	void RemoveAll()
-	{
-		Node_t* p = m_pFirst;
-		if (p)
-		{
-			do
-			{
-				Node_t* pNext = p->pNext;
-				delete p;
-				p = pNext;
-			} while (p != m_pFirst);
-		}
-
-		m_pFirst = NULL;
-		m_nElems = 0;
-	}
-
-	int	Count() const
-	{
-		return m_nElems;
-	}
-
-	IndexType_t Head() const
-	{
-		return (IndexType_t)m_pFirst;
-	}
-
-	IndexType_t Next(IndexType_t i) const
-	{
-		Node_t* p = ((Node_t*)i)->pNext;
-		if (p != m_pFirst)
-		{
-			return (IndexType_t)p;
-		}
-		return NULL;
-	}
-
-	bool IsValidIndex(IndexType_t i) const
-	{
-		Node_t* p = ((Node_t*)i);
-		return (p && p->pNext && p->pPrev);
-	}
-
-	inline static IndexType_t  InvalidIndex()
-	{
-		return NULL;
-	}
-private:
-
-	struct Node_t
-	{
-		Node_t() {}
-		Node_t(const T& _elem) : elem(_elem) {}
-
-		T elem;
-		Node_t* pPrev, * pNext;
-	};
-
-	Node_t* AllocNode(const T* pCopyFrom)
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		Node_t* p;
-
-		if (!pCopyFrom)
-		{
-			p = new Node_t;
-		}
-		else
-		{
-			p = new Node_t(*pCopyFrom);
-		}
-
-		return p;
-	}
-
-	IndexType_t DoInsertBefore(IndexType_t before, const T* pCopyFrom)
-	{
-		Node_t* p = AllocNode(pCopyFrom);
-		Node_t* pBefore = (Node_t*)before;
-		if (pBefore)
-		{
-			p->pNext = pBefore;
-			p->pPrev = pBefore->pPrev;
-			pBefore->pPrev = p;
-			p->pPrev->pNext = p;
-		}
-		else
-		{
-			Assert(!m_pFirst);
-			m_pFirst = p->pNext = p->pPrev = p;
-		}
-
-		m_nElems++;
-		return (IndexType_t)p;
-	}
-
-	Node_t* m_pFirst;
-	unsigned m_nElems;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlmap.h b/SpyCustom/utlmap.h
deleted file mode 100644
index ac63c15..0000000
--- a/SpyCustom/utlmap.h
+++ /dev/null
@@ -1,245 +0,0 @@
-#ifndef UTLMAP_H
-#define UTLMAP_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dbg.h"
-#include "utlrbtree.h"
-
-#define FOR_EACH_MAP( mapName, iteratorName ) \
-	for ( int iteratorName = (mapName).FirstInorder(); (mapName).IsUtlMap && iteratorName != (mapName).InvalidIndex(); iteratorName = (mapName).NextInorder( iteratorName ) )
-
-#define FOR_EACH_MAP_FAST( mapName, iteratorName ) \
-	for ( int iteratorName = 0; (mapName).IsUtlMap && iteratorName < (mapName).MaxElement(); ++iteratorName ) if ( !(mapName).IsValidIndex( iteratorName ) ) continue; else
-
-
-struct base_utlmap_t
-{
-public:
-	enum { IsUtlMap = true };
-};
-
-template <typename K, typename T, typename I = unsigned short, typename LessFunc_t = bool (*)(const K&, const K&)>
-class CUtlMap : public base_utlmap_t
-{
-public:
-	typedef K KeyType_t;
-	typedef T ElemType_t;
-	typedef I IndexType_t;
-
-	CUtlMap(int growSize = 0, int initSize = 0, const LessFunc_t& lessfunc = 0)
-		: m_Tree(growSize, initSize, CKeyLess(lessfunc))
-	{
-	}
-
-	CUtlMap(LessFunc_t lessfunc)
-		: m_Tree(CKeyLess(lessfunc))
-	{
-	}
-
-	void EnsureCapacity(int num) { m_Tree.EnsureCapacity(num); }
-
-	ElemType_t& Element(IndexType_t i) { return m_Tree.Element(i).elem; }
-	const ElemType_t& Element(IndexType_t i) const { return m_Tree.Element(i).elem; }
-	ElemType_t& operator[](IndexType_t i) { return m_Tree.Element(i).elem; }
-	const ElemType_t& operator[](IndexType_t i) const { return m_Tree.Element(i).elem; }
-	KeyType_t& Key(IndexType_t i) { return m_Tree.Element(i).key; }
-	const KeyType_t& Key(IndexType_t i) const { return m_Tree.Element(i).key; }
-
-
-	unsigned int Count() const { return m_Tree.Count(); }
-
-	IndexType_t  MaxElement() const { return m_Tree.MaxElement(); }
-
-	bool  IsValidIndex(IndexType_t i) const { return m_Tree.IsValidIndex(i); }
-
-	bool  IsValid() const { return m_Tree.IsValid(); }
-
-	static IndexType_t InvalidIndex() { return CTree::InvalidIndex(); }
-
-	void SetLessFunc(LessFunc_t func)
-	{
-		m_Tree.SetLessFunc(CKeyLess(func));
-	}
-
-	IndexType_t  Insert(const KeyType_t& key, const ElemType_t& insert)
-	{
-		Node_t node;
-		node.key = key;
-		node.elem = insert;
-		return m_Tree.Insert(node);
-	}
-
-	IndexType_t  Insert(const KeyType_t& key)
-	{
-		Node_t node;
-		node.key = key;
-		return m_Tree.Insert(node);
-	}
-
-	IndexType_t  InsertWithDupes(const KeyType_t& key, const ElemType_t& insert)
-	{
-		Node_t node;
-		node.key = key;
-		node.elem = insert;
-		return m_Tree.Insert(node);
-	}
-
-	IndexType_t  InsertWithDupes(const KeyType_t& key)
-	{
-		Node_t node;
-		node.key = key;
-		return m_Tree.Insert(node);
-	}
-
-
-	bool HasElement(const KeyType_t& key) const
-	{
-		Node_t dummyNode;
-		dummyNode.key = key;
-		return m_Tree.HasElement(dummyNode);
-	}
-
-
-	IndexType_t  Find(const KeyType_t& key) const
-	{
-		Node_t dummyNode;
-		dummyNode.key = key;
-		return m_Tree.Find(dummyNode);
-	}
-
-	IndexType_t  FindFirst(const KeyType_t& key) const
-	{
-		Node_t dummyNode;
-		dummyNode.key = key;
-		return m_Tree.FindFirst(dummyNode);
-	}
-
-
-	const ElemType_t& FindElement(const KeyType_t& key, const ElemType_t& defaultValue) const
-	{
-		IndexType_t i = Find(key);
-		if (i == InvalidIndex())
-			return defaultValue;
-		return Element(i);
-	}
-
-
-	IndexType_t  FindClosest(const KeyType_t& key, CompareOperands_t eFindCriteria) const
-	{
-		Node_t dummyNode;
-		dummyNode.key = key;
-		return m_Tree.FindClosest(dummyNode, eFindCriteria);
-	}
-
-	void     RemoveAt(IndexType_t i) { m_Tree.RemoveAt(i); }
-	bool     Remove(const KeyType_t& key)
-	{
-		Node_t dummyNode;
-		dummyNode.key = key;
-		return m_Tree.Remove(dummyNode);
-	}
-
-	void     RemoveAll() { m_Tree.RemoveAll(); }
-	void     Purge() { m_Tree.Purge(); }
-
-	void PurgeAndDeleteElements();
-
-	IndexType_t  FirstInorder() const { return m_Tree.FirstInorder(); }
-	IndexType_t  NextInorder(IndexType_t i) const { return m_Tree.NextInorder(i); }
-	IndexType_t  PrevInorder(IndexType_t i) const { return m_Tree.PrevInorder(i); }
-	IndexType_t  LastInorder() const { return m_Tree.LastInorder(); }
-
-	IndexType_t  NextInorderSameKey(IndexType_t i) const
-	{
-		IndexType_t iNext = NextInorder(i);
-		if (!IsValidIndex(iNext))
-			return InvalidIndex();
-		if (Key(iNext) != Key(i))
-			return InvalidIndex();
-		return iNext;
-	}
-
-	void	Reinsert(const KeyType_t& key, IndexType_t i)
-	{
-		m_Tree[i].key = key;
-		m_Tree.Reinsert(i);
-	}
-
-	IndexType_t InsertOrReplace(const KeyType_t& key, const ElemType_t& insert)
-	{
-		IndexType_t i = Find(key);
-		if (i != InvalidIndex())
-		{
-			Element(i) = insert;
-			return i;
-		}
-
-		return Insert(key, insert);
-	}
-
-	void Swap(CUtlMap< K, T, I >& that)
-	{
-		m_Tree.Swap(that.m_Tree);
-	}
-
-
-	struct Node_t
-	{
-		Node_t()
-		{
-		}
-
-		Node_t(const Node_t& from)
-			: key(from.key),
-			elem(from.elem)
-		{
-		}
-
-		KeyType_t	key;
-		ElemType_t	elem;
-	};
-
-	class CKeyLess
-	{
-	public:
-		CKeyLess(const LessFunc_t& lessFunc) : m_LessFunc(lessFunc) {}
-
-		bool operator!() const
-		{
-			return !m_LessFunc;
-		}
-
-		bool operator()(const Node_t& left, const Node_t& right) const
-		{
-			return m_LessFunc(left.key, right.key);
-		}
-
-		LessFunc_t m_LessFunc;
-	};
-
-	typedef CUtlRBTree<Node_t, I, CKeyLess> CTree;
-
-	CTree* AccessTree() { return &m_Tree; }
-
-protected:
-	CTree 	   m_Tree;
-};
-
-template< typename K, typename T, typename I, typename LessFunc_t >
-inline void CUtlMap<K, T, I, LessFunc_t>::PurgeAndDeleteElements()
-{
-	for (I i = 0; i < MaxElement(); ++i)
-	{
-		if (!IsValidIndex(i))
-			continue;
-
-		delete Element(i);
-	}
-
-	Purge();
-}
-
-#endif  
diff --git a/SpyCustom/utlmemory.h b/SpyCustom/utlmemory.h
deleted file mode 100644
index acb9b9f..0000000
--- a/SpyCustom/utlmemory.h
+++ /dev/null
@@ -1,957 +0,0 @@
-#ifndef UTLMEMORY_H
-#define UTLMEMORY_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "dbg.h"
-#include <string.h>
-#include "platform.h"
-
-#include "memalloc.h"
-#include "mathlib.h"
-#include "memdbgon.h"
-
-#pragma warning (disable:4100)
-#pragma warning (disable:4514)
-
-
-
-#ifdef UTLMEMORY_TRACK
-#define UTLMEMORY_TRACK_ALLOC()		MemAlloc_RegisterAllocation( "||Sum of all UtlMemory||", 0, m_nAllocationCount * sizeof(T), m_nAllocationCount * sizeof(T), 0 )
-#define UTLMEMORY_TRACK_FREE()		if ( !m_pMemory ) ; else MemAlloc_RegisterDeallocation( "||Sum of all UtlMemory||", 0, m_nAllocationCount * sizeof(T), m_nAllocationCount * sizeof(T), 0 )
-#else
-#define UTLMEMORY_TRACK_ALLOC()		((void)0)
-#define UTLMEMORY_TRACK_FREE()		((void)0)
-#endif
-
-
-template< class T, class I = int >
-class CUtlMemory
-{
-	template< class A, class B> friend class CUtlVector;
-	template< class A, size_t B> friend class CUtlVectorFixedGrowableCompat;
-public:
-	CUtlMemory(int nGrowSize = 0, int nInitSize = 0);
-	CUtlMemory(T* pMemory, int numElements);
-	CUtlMemory(const T* pMemory, int numElements);
-	~CUtlMemory();
-
-	CUtlMemory(const CUtlMemory&) = delete;
-	CUtlMemory& operator=(const CUtlMemory&) = delete;
-
-	CUtlMemory(CUtlMemory&& moveFrom);
-	CUtlMemory& operator=(CUtlMemory&& moveFrom);
-
-	void Init(int nGrowSize = 0, int nInitSize = 0);
-
-	class Iterator_t
-	{
-	public:
-		Iterator_t(I i) : index(i) {}
-		I index;
-
-		bool operator==(const Iterator_t it) const { return index == it.index; }
-		bool operator!=(const Iterator_t it) const { return index != it.index; }
-	};
-	Iterator_t First() const { return Iterator_t(IsIdxValid(0) ? 0 : InvalidIndex()); }
-	Iterator_t Next(const Iterator_t& it) const { return Iterator_t(IsIdxValid(it.index + 1) ? it.index + 1 : InvalidIndex()); }
-	I GetIndex(const Iterator_t& it) const { return it.index; }
-	bool IsIdxAfter(I i, const Iterator_t& it) const { return i > it.index; }
-	bool IsValidIterator(const Iterator_t& it) const { return IsIdxValid(it.index); }
-	Iterator_t InvalidIterator() const { return Iterator_t(InvalidIndex()); }
-
-	T& operator[](I i);
-	const T& operator[](I i) const;
-	T& Element(I i);
-	const T& Element(I i) const;
-
-	bool IsIdxValid(I i) const;
-
-	static const I INVALID_INDEX = (I)-1;     
-	static I InvalidIndex() { return INVALID_INDEX; }
-
-	T* Base();
-	const T* Base() const;
-
-	void SetExternalBuffer(T* pMemory, int numElements);
-	void SetExternalBuffer(const T* pMemory, int numElements);
-	void AssumeMemory(T* pMemory, int nSize);
-	T* Detach();
-	void* DetachMemory();
-
-	void Swap(CUtlMemory< T, I >& mem);
-
-	void ConvertToGrowableMemory(int nGrowSize);
-
-	int NumAllocated() const;
-	int Count() const;
-
-	void Grow(int num = 1);
-
-	void EnsureCapacity(int num);
-
-	void Purge();
-
-	void Purge(int numElements);
-
-	bool IsExternallyAllocated() const;
-
-	bool IsReadOnly() const;
-
-	void SetGrowSize(int size);
-
-protected:
-	void ValidateGrowSize()
-	{
-#ifdef _X360
-		if (m_nGrowSize && m_nGrowSize != EXTERNAL_BUFFER_MARKER)
-		{
-			const int MAX_GROW = 128;
-			if (m_nGrowSize * sizeof(T) > MAX_GROW)
-			{
-				m_nGrowSize = max(1, MAX_GROW / sizeof(T));
-			}
-		}
-#endif
-	}
-
-	enum
-	{
-		EXTERNAL_BUFFER_MARKER = -1,
-		EXTERNAL_CONST_BUFFER_MARKER = -2,
-	};
-
-	T* m_pMemory;
-	int m_nAllocationCount;
-	int m_nGrowSize;
-};
-
-
-template< class T, size_t SIZE, class I = int >
-class CUtlMemoryFixedGrowable : public CUtlMemory< T, I >
-{
-	typedef CUtlMemory< T, I > BaseClass;
-
-public:
-	CUtlMemoryFixedGrowable(int nGrowSize = 0, int nInitSize = SIZE) : BaseClass(m_pFixedMemory, SIZE)
-	{
-		Assert(nInitSize == 0 || nInitSize == SIZE);
-		m_nMallocGrowSize = nGrowSize;
-	}
-
-	void Grow(int nCount = 1)
-	{
-		if (this->IsExternallyAllocated())
-		{
-			this->ConvertToGrowableMemory(m_nMallocGrowSize);
-		}
-		BaseClass::Grow(nCount);
-	}
-
-	void EnsureCapacity(int num)
-	{
-		if (CUtlMemory<T>::m_nAllocationCount >= num)
-			return;
-
-		if (this->IsExternallyAllocated())
-		{
-			this->ConvertToGrowableMemory(m_nMallocGrowSize);
-		}
-
-		BaseClass::EnsureCapacity(num);
-	}
-
-private:
-	int m_nMallocGrowSize;
-	T m_pFixedMemory[SIZE];
-};
-
-template< typename T, size_t SIZE, int nAlignment = 0 >
-class CUtlMemoryFixed
-{
-public:
-	CUtlMemoryFixed(int nGrowSize = 0, int nInitSize = 0) { Assert(nInitSize == 0 || nInitSize == SIZE); }
-	CUtlMemoryFixed(T* pMemory, int numElements) { Assert(0); }
-
-	bool IsIdxValid(int i) const { return (i >= 0) && (i < SIZE); }
-
-	static const int INVALID_INDEX = -1;     
-	static int InvalidIndex() { return INVALID_INDEX; }
-
-	T* Base() { if (nAlignment == 0) return (T*)(&m_Memory[0]); else return (T*)AlignValue(&m_Memory[0], nAlignment); }
-	const T* Base() const { if (nAlignment == 0) return (T*)(&m_Memory[0]); else return (T*)AlignValue(&m_Memory[0], nAlignment); }
-
-	T& operator[](int i) { Assert(IsIdxValid(i)); return Base()[i]; }
-	const T& operator[](int i) const { Assert(IsIdxValid(i)); return Base()[i]; }
-	T& Element(int i) { Assert(IsIdxValid(i)); return Base()[i]; }
-	const T& Element(int i) const { Assert(IsIdxValid(i)); return Base()[i]; }
-
-	void SetExternalBuffer(T* pMemory, int numElements) { Assert(0); }
-
-	int NumAllocated() const { return SIZE; }
-	int Count() const { return SIZE; }
-
-	void Grow(int num = 1) { Assert(0); }
-
-	void EnsureCapacity(int num) { Assert(num <= SIZE); }
-
-	void Purge() {}
-
-	void Purge(int numElements) { Assert(0); }
-
-	bool IsExternallyAllocated() const { return false; }
-
-	void SetGrowSize(int size) {}
-
-	class Iterator_t
-	{
-	public:
-		Iterator_t(int i) : index(i) {}
-		int index;
-		bool operator==(const Iterator_t it) const { return index == it.index; }
-		bool operator!=(const Iterator_t it) const { return index != it.index; }
-	};
-	Iterator_t First() const { return Iterator_t(IsIdxValid(0) ? 0 : InvalidIndex()); }
-	Iterator_t Next(const Iterator_t& it) const { return Iterator_t(IsIdxValid(it.index + 1) ? it.index + 1 : InvalidIndex()); }
-	int GetIndex(const Iterator_t& it) const { return it.index; }
-	bool IsIdxAfter(int i, const Iterator_t& it) const { return i > it.index; }
-	bool IsValidIterator(const Iterator_t& it) const { return IsIdxValid(it.index); }
-	Iterator_t InvalidIterator() const { return Iterator_t(InvalidIndex()); }
-
-private:
-	char m_Memory[SIZE * sizeof(T) + nAlignment];
-};
-
-#ifdef _LINUX
-#define REMEMBER_ALLOC_SIZE_FOR_VALGRIND 1
-#endif
-
-template< typename T >
-class CUtlMemoryConservative
-{
-
-public:
-	CUtlMemoryConservative(int nGrowSize = 0, int nInitSize = 0) : m_pMemory(NULL)
-	{
-#ifdef REMEMBER_ALLOC_SIZE_FOR_VALGRIND
-		m_nCurAllocSize = 0;
-#endif
-
-	}
-	CUtlMemoryConservative(T* pMemory, int numElements) { Assert(0); }
-	~CUtlMemoryConservative() { if (m_pMemory) free(m_pMemory); }
-
-	bool IsIdxValid(int i) const { return (IsDebug()) ? (i >= 0 && i < NumAllocated()) : (i >= 0); }
-	static int InvalidIndex() { return -1; }
-
-	T* Base() { return m_pMemory; }
-	const T* Base() const { return m_pMemory; }
-
-	T& operator[](int i) { Assert(IsIdxValid(i)); return Base()[i]; }
-	const T& operator[](int i) const { Assert(IsIdxValid(i)); return Base()[i]; }
-	T& Element(int i) { Assert(IsIdxValid(i)); return Base()[i]; }
-	const T& Element(int i) const { Assert(IsIdxValid(i)); return Base()[i]; }
-
-	void SetExternalBuffer(T* pMemory, int numElements) { Assert(0); }
-
-	FORCEINLINE void RememberAllocSize(size_t sz)
-	{
-#ifdef REMEMBER_ALLOC_SIZE_FOR_VALGRIND
-		m_nCurAllocSize = sz;
-#endif
-	}
-
-	size_t AllocSize(void) const
-	{
-#ifdef REMEMBER_ALLOC_SIZE_FOR_VALGRIND
-		return m_nCurAllocSize;
-#else
-		return (m_pMemory) ? g_pMemAlloc->GetSize(m_pMemory) : 0;
-#endif
-	}
-
-	int NumAllocated() const
-	{
-		return AllocSize() / sizeof(T);
-	}
-	int Count() const
-	{
-		return NumAllocated();
-	}
-
-	FORCEINLINE void ReAlloc(size_t sz)
-	{
-		m_pMemory = (T*)realloc(m_pMemory, sz);
-		RememberAllocSize(sz);
-	}
-	void Grow(int num = 1)
-	{
-		int nCurN = NumAllocated();
-		ReAlloc((nCurN + num) * sizeof(T));
-	}
-
-	void EnsureCapacity(int num)
-	{
-		size_t nSize = sizeof(T) * MAX(num, Count());
-		ReAlloc(nSize);
-	}
-
-	void Purge()
-	{
-		free(m_pMemory);
-		RememberAllocSize(0);
-		m_pMemory = NULL;
-	}
-
-	void Purge(int numElements) { ReAlloc(numElements * sizeof(T)); }
-
-	bool IsExternallyAllocated() const { return false; }
-
-	void SetGrowSize(int size) {}
-
-	class Iterator_t
-	{
-	public:
-		Iterator_t(int i, int _limit) : index(i), limit(_limit) {}
-		int index;
-		int limit;
-		bool operator==(const Iterator_t it) const { return index == it.index; }
-		bool operator!=(const Iterator_t it) const { return index != it.index; }
-	};
-	Iterator_t First() const { int limit = NumAllocated(); return Iterator_t(limit ? 0 : InvalidIndex(), limit); }
-	Iterator_t Next(const Iterator_t& it) const { return Iterator_t((it.index + 1 < it.limit) ? it.index + 1 : InvalidIndex(), it.limit); }
-	int GetIndex(const Iterator_t& it) const { return it.index; }
-	bool IsIdxAfter(int i, const Iterator_t& it) const { return i > it.index; }
-	bool IsValidIterator(const Iterator_t& it) const { return IsIdxValid(it.index) && (it.index < it.limit); }
-	Iterator_t InvalidIterator() const { return Iterator_t(InvalidIndex(), 0); }
-
-private:
-	T* m_pMemory;
-#ifdef REMEMBER_ALLOC_SIZE_FOR_VALGRIND
-	size_t m_nCurAllocSize;
-#endif
-
-};
-
-
-template< class T, class I >
-CUtlMemory<T, I>::CUtlMemory(int nGrowSize, int nInitAllocationCount) : m_pMemory(0),
-m_nAllocationCount(nInitAllocationCount), m_nGrowSize(nGrowSize)
-{
-	ValidateGrowSize();
-	Assert(nGrowSize >= 0);
-	if (m_nAllocationCount)
-	{
-		UTLMEMORY_TRACK_ALLOC();
-		MEM_ALLOC_CREDIT_CLASS();
-		m_pMemory = (T*)malloc(m_nAllocationCount * sizeof(T));
-	}
-}
-
-template< class T, class I >
-CUtlMemory<T, I>::CUtlMemory(T* pMemory, int numElements) : m_pMemory(pMemory),
-m_nAllocationCount(numElements)
-{
-	m_nGrowSize = EXTERNAL_BUFFER_MARKER;
-}
-
-template< class T, class I >
-CUtlMemory<T, I>::CUtlMemory(const T* pMemory, int numElements) : m_pMemory((T*)pMemory),
-m_nAllocationCount(numElements)
-{
-	m_nGrowSize = EXTERNAL_CONST_BUFFER_MARKER;
-}
-
-template< class T, class I >
-CUtlMemory<T, I>::~CUtlMemory()
-{
-	Purge();
-
-#ifdef _DEBUG
-	m_pMemory = reinterpret_cast<T*>(0xFEFEBAAD);
-	m_nAllocationCount = 0x7BADF00D;
-#endif
-}
-
-template< class T, class I >
-CUtlMemory<T, I>::CUtlMemory(CUtlMemory&& moveFrom)
-	: m_pMemory(moveFrom.m_pMemory)
-	, m_nAllocationCount(moveFrom.m_nAllocationCount)
-	, m_nGrowSize(moveFrom.m_nGrowSize)
-{
-	moveFrom.m_pMemory = nullptr;
-	moveFrom.m_nAllocationCount = 0;
-	moveFrom.m_nGrowSize = 0;
-}
-
-template< class T, class I >
-CUtlMemory<T, I>& CUtlMemory<T, I>::operator=(CUtlMemory&& moveFrom)
-{
-	T* pMemory = moveFrom.m_pMemory;
-	int nAllocationCount = moveFrom.m_nAllocationCount;
-	int nGrowSize = moveFrom.m_nGrowSize;
-
-	moveFrom.m_pMemory = nullptr;
-	moveFrom.m_nAllocationCount = 0;
-	moveFrom.m_nGrowSize = 0;
-
-	Purge();
-
-	m_pMemory = pMemory;
-	m_nAllocationCount = nAllocationCount;
-	m_nGrowSize = nGrowSize;
-
-	return *this;
-}
-
-template< class T, class I >
-void CUtlMemory<T, I>::Init(int nGrowSize  , int nInitSize  )
-{
-	Purge();
-
-	m_nGrowSize = nGrowSize;
-	m_nAllocationCount = nInitSize;
-	ValidateGrowSize();
-	Assert(nGrowSize >= 0);
-	if (m_nAllocationCount)
-	{
-		UTLMEMORY_TRACK_ALLOC();
-		MEM_ALLOC_CREDIT_CLASS();
-		m_pMemory = (T*)malloc(m_nAllocationCount * sizeof(T));
-	}
-}
-
-template< class T, class I >
-void CUtlMemory<T, I>::Swap(CUtlMemory<T, I>& mem)
-{
-	V_swap(m_nGrowSize, mem.m_nGrowSize);
-	V_swap(m_pMemory, mem.m_pMemory);
-	V_swap(m_nAllocationCount, mem.m_nAllocationCount);
-}
-
-
-template< class T, class I >
-void CUtlMemory<T, I>::ConvertToGrowableMemory(int nGrowSize)
-{
-	if (!IsExternallyAllocated())
-		return;
-
-	m_nGrowSize = nGrowSize;
-	if (m_nAllocationCount)
-	{
-		UTLMEMORY_TRACK_ALLOC();
-		MEM_ALLOC_CREDIT_CLASS();
-
-		int nNumBytes = m_nAllocationCount * sizeof(T);
-		T* pMemory = (T*)malloc(nNumBytes);
-		memcpy(pMemory, m_pMemory, nNumBytes);
-		m_pMemory = pMemory;
-	}
-	else
-	{
-		m_pMemory = NULL;
-	}
-}
-
-
-template< class T, class I >
-void CUtlMemory<T, I>::SetExternalBuffer(T* pMemory, int numElements)
-{
-	Purge();
-
-	m_pMemory = pMemory;
-	m_nAllocationCount = numElements;
-
-	m_nGrowSize = EXTERNAL_BUFFER_MARKER;
-}
-
-template< class T, class I >
-void CUtlMemory<T, I>::SetExternalBuffer(const T* pMemory, int numElements)
-{
-	Purge();
-
-	m_pMemory = const_cast<T*>(pMemory);
-	m_nAllocationCount = numElements;
-
-	m_nGrowSize = EXTERNAL_CONST_BUFFER_MARKER;
-}
-
-template< class T, class I >
-void CUtlMemory<T, I>::AssumeMemory(T* pMemory, int numElements)
-{
-	Purge();
-
-	m_pMemory = pMemory;
-	m_nAllocationCount = numElements;
-}
-
-template< class T, class I >
-void* CUtlMemory<T, I>::DetachMemory()
-{
-	if (IsExternallyAllocated())
-		return NULL;
-
-	void* pMemory = m_pMemory;
-	m_pMemory = 0;
-	m_nAllocationCount = 0;
-	return pMemory;
-}
-
-template< class T, class I >
-inline T* CUtlMemory<T, I>::Detach()
-{
-	return (T*)DetachMemory();
-}
-
-
-template< class T, class I >
-inline T& CUtlMemory<T, I>::operator[](I i)
-{
-	Assert(!IsReadOnly());
-	Assert(IsIdxValid(i));
-	return m_pMemory[i];
-}
-
-template< class T, class I >
-inline const T& CUtlMemory<T, I>::operator[](I i) const
-{
-	Assert(IsIdxValid(i));
-	return m_pMemory[i];
-}
-
-template< class T, class I >
-inline T& CUtlMemory<T, I>::Element(I i)
-{
-	Assert(!IsReadOnly());
-	Assert(IsIdxValid(i));
-	return m_pMemory[i];
-}
-
-template< class T, class I >
-inline const T& CUtlMemory<T, I>::Element(I i) const
-{
-	Assert(IsIdxValid(i));
-	return m_pMemory[i];
-}
-
-
-template< class T, class I >
-bool CUtlMemory<T, I>::IsExternallyAllocated() const
-{
-	return (m_nGrowSize < 0);
-}
-
-
-template< class T, class I >
-bool CUtlMemory<T, I>::IsReadOnly() const
-{
-	return (m_nGrowSize == EXTERNAL_CONST_BUFFER_MARKER);
-}
-
-
-template< class T, class I >
-void CUtlMemory<T, I>::SetGrowSize(int nSize)
-{
-	Assert(!IsExternallyAllocated());
-	Assert(nSize >= 0);
-	m_nGrowSize = nSize;
-	ValidateGrowSize();
-}
-
-
-template< class T, class I >
-inline T* CUtlMemory<T, I>::Base()
-{
-	Assert(!IsReadOnly());
-	return m_pMemory;
-}
-
-template< class T, class I >
-inline const T* CUtlMemory<T, I>::Base() const
-{
-	return m_pMemory;
-}
-
-
-template< class T, class I >
-inline int CUtlMemory<T, I>::NumAllocated() const
-{
-	return m_nAllocationCount;
-}
-
-template< class T, class I >
-inline int CUtlMemory<T, I>::Count() const
-{
-	return m_nAllocationCount;
-}
-
-
-template< class T, class I >
-inline bool CUtlMemory<T, I>::IsIdxValid(I i) const
-{
-	long x = i;
-	return (x >= 0) && (x < m_nAllocationCount);
-}
-
-inline int UtlMemory_CalcNewAllocationCount(int nAllocationCount, int nGrowSize, int nNewSize, int nBytesItem)
-{
-	if (nGrowSize)
-	{
-		nAllocationCount = ((1 + ((nNewSize - 1) / nGrowSize)) * nGrowSize);
-	}
-	else
-	{
-		if (!nAllocationCount)
-		{
-			nAllocationCount = (31 + nBytesItem) / nBytesItem;
-			if (nAllocationCount < nNewSize)
-				nAllocationCount = nNewSize;
-		}
-
-		while (nAllocationCount < nNewSize)
-		{
-#ifndef _X360
-			nAllocationCount *= 2;
-#else
-			int nNewAllocationCount = (nAllocationCount * 9) / 8;   
-			if (nNewAllocationCount > nAllocationCount)
-				nAllocationCount = nNewAllocationCount;
-			else
-				nAllocationCount *= 2;
-#endif
-		}
-	}
-
-	return nAllocationCount;
-}
-
-template< class T, class I >
-void CUtlMemory<T, I>::Grow(int num)
-{
-	Assert(num > 0);
-
-	if (IsExternallyAllocated())
-	{
-		Assert(0);
-		return;
-	}
-
-	int nAllocationRequested = m_nAllocationCount + num;
-
-	UTLMEMORY_TRACK_FREE();
-
-	int nNewAllocationCount = UtlMemory_CalcNewAllocationCount(m_nAllocationCount, m_nGrowSize, nAllocationRequested, sizeof(T));
-
-	if ((int)(I)nNewAllocationCount < nAllocationRequested)
-	{
-		if ((int)(I)nNewAllocationCount == 0 && (int)(I)(nNewAllocationCount - 1) >= nAllocationRequested)
-		{
-			--nNewAllocationCount;            
-		}
-		else
-		{
-			if ((int)(I)nAllocationRequested != nAllocationRequested)
-			{
-				Assert(0);
-				return;
-			}
-			while ((int)(I)nNewAllocationCount < nAllocationRequested)
-			{
-				nNewAllocationCount = (nNewAllocationCount + nAllocationRequested) / 2;
-			}
-		}
-	}
-
-	m_nAllocationCount = nNewAllocationCount;
-
-	UTLMEMORY_TRACK_ALLOC();
-
-	if (m_pMemory)
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		m_pMemory = (T*)realloc(m_pMemory, m_nAllocationCount * sizeof(T));
-		Assert(m_pMemory);
-	}
-	else
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		m_pMemory = (T*)malloc(m_nAllocationCount * sizeof(T));
-		Assert(m_pMemory);
-	}
-}
-
-
-template< class T, class I >
-inline void CUtlMemory<T, I>::EnsureCapacity(int num)
-{
-	if (m_nAllocationCount >= num)
-		return;
-
-	if (IsExternallyAllocated())
-	{
-		Assert(0);
-		return;
-	}
-
-	UTLMEMORY_TRACK_FREE();
-
-	m_nAllocationCount = num;
-
-	UTLMEMORY_TRACK_ALLOC();
-
-	if (m_pMemory)
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		m_pMemory = (T*)realloc(m_pMemory, m_nAllocationCount * sizeof(T));
-	}
-	else
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		m_pMemory = (T*)malloc(m_nAllocationCount * sizeof(T));
-	}
-}
-
-
-template< class T, class I >
-void CUtlMemory<T, I>::Purge()
-{
-	if (!IsExternallyAllocated())
-	{
-		if (m_pMemory)
-		{
-			UTLMEMORY_TRACK_FREE();
-			free((void*)m_pMemory);
-			m_pMemory = 0;
-		}
-		m_nAllocationCount = 0;
-	}
-}
-
-template< class T, class I >
-void CUtlMemory<T, I>::Purge(int numElements)
-{
-	Assert(numElements >= 0);
-
-	if (numElements > m_nAllocationCount)
-	{
-		Assert(numElements <= m_nAllocationCount);
-		return;
-	}
-
-	if (numElements == 0)
-	{
-		Purge();
-		return;
-	}
-
-	if (IsExternallyAllocated())
-	{
-		return;
-	}
-
-	if (numElements == m_nAllocationCount)
-	{
-		return;
-	}
-
-
-	if (!m_pMemory)
-	{
-		Assert(m_pMemory);
-		return;
-	}
-
-	UTLMEMORY_TRACK_FREE();
-
-	m_nAllocationCount = numElements;
-
-	UTLMEMORY_TRACK_ALLOC();
-
-	MEM_ALLOC_CREDIT_CLASS();
-	m_pMemory = (T*)realloc(m_pMemory, m_nAllocationCount * sizeof(T));
-}
-
-template< class T, int nAlignment >
-class CUtlMemoryAligned : public CUtlMemory<T>
-{
-public:
-	CUtlMemoryAligned(int nGrowSize = 0, int nInitSize = 0);
-	CUtlMemoryAligned(T* pMemory, int numElements);
-	CUtlMemoryAligned(const T* pMemory, int numElements);
-	~CUtlMemoryAligned();
-
-	void SetExternalBuffer(T* pMemory, int numElements);
-	void SetExternalBuffer(const T* pMemory, int numElements);
-
-	void Grow(int num = 1);
-
-	void EnsureCapacity(int num);
-
-	void Purge();
-
-	void Purge(int numElements) { Assert(0); }
-
-private:
-	void* Align(const void* pAddr);
-};
-
-
-template< class T, int nAlignment >
-void* CUtlMemoryAligned<T, nAlignment>::Align(const void* pAddr)
-{
-	size_t nAlignmentMask = nAlignment - 1;
-	return (void*)(((size_t)pAddr + nAlignmentMask) & (~nAlignmentMask));
-}
-
-
-template< class T, int nAlignment >
-CUtlMemoryAligned<T, nAlignment>::CUtlMemoryAligned(int nGrowSize, int nInitAllocationCount)
-{
-	CUtlMemory<T>::m_pMemory = 0;
-	CUtlMemory<T>::m_nAllocationCount = nInitAllocationCount;
-	CUtlMemory<T>::m_nGrowSize = nGrowSize;
-	this->ValidateGrowSize();
-
-	COMPILE_TIME_ASSERT((nAlignment & (nAlignment - 1)) == 0);
-	Assert((nGrowSize >= 0) && (nGrowSize != CUtlMemory<T>::EXTERNAL_BUFFER_MARKER));
-	if (CUtlMemory<T>::m_nAllocationCount)
-	{
-		UTLMEMORY_TRACK_ALLOC();
-		MEM_ALLOC_CREDIT_CLASS();
-		CUtlMemory<T>::m_pMemory = (T*)_aligned_malloc(nInitAllocationCount * sizeof(T), nAlignment);
-	}
-}
-
-template< class T, int nAlignment >
-CUtlMemoryAligned<T, nAlignment>::CUtlMemoryAligned(T* pMemory, int numElements)
-{
-	CUtlMemory<T>::m_nGrowSize = CUtlMemory<T>::EXTERNAL_BUFFER_MARKER;
-
-	CUtlMemory<T>::m_pMemory = (T*)Align(pMemory);
-	CUtlMemory<T>::m_nAllocationCount = ((int)(pMemory + numElements) - (int)CUtlMemory<T>::m_pMemory) / sizeof(T);
-}
-
-template< class T, int nAlignment >
-CUtlMemoryAligned<T, nAlignment>::CUtlMemoryAligned(const T* pMemory, int numElements)
-{
-	CUtlMemory<T>::m_nGrowSize = CUtlMemory<T>::EXTERNAL_CONST_BUFFER_MARKER;
-
-	CUtlMemory<T>::m_pMemory = (T*)Align(pMemory);
-	CUtlMemory<T>::m_nAllocationCount = ((int)(pMemory + numElements) - (int)CUtlMemory<T>::m_pMemory) / sizeof(T);
-}
-
-template< class T, int nAlignment >
-CUtlMemoryAligned<T, nAlignment>::~CUtlMemoryAligned()
-{
-	Purge();
-}
-
-
-template< class T, int nAlignment >
-void CUtlMemoryAligned<T, nAlignment>::SetExternalBuffer(T* pMemory, int numElements)
-{
-	Purge();
-
-	CUtlMemory<T>::m_pMemory = (T*)Align(pMemory);
-	CUtlMemory<T>::m_nAllocationCount = ((int)(pMemory + numElements) - (int)CUtlMemory<T>::m_pMemory) / sizeof(T);
-
-	CUtlMemory<T>::m_nGrowSize = CUtlMemory<T>::EXTERNAL_BUFFER_MARKER;
-}
-
-template< class T, int nAlignment >
-void CUtlMemoryAligned<T, nAlignment>::SetExternalBuffer(const T* pMemory, int numElements)
-{
-	Purge();
-
-	CUtlMemory<T>::m_pMemory = (T*)Align(pMemory);
-	CUtlMemory<T>::m_nAllocationCount = ((int)(pMemory + numElements) - (int)CUtlMemory<T>::m_pMemory) / sizeof(T);
-
-	CUtlMemory<T>::m_nGrowSize = CUtlMemory<T>::EXTERNAL_CONST_BUFFER_MARKER;
-}
-
-
-template< class T, int nAlignment >
-void CUtlMemoryAligned<T, nAlignment>::Grow(int num)
-{
-	Assert(num > 0);
-
-	if (this->IsExternallyAllocated())
-	{
-		Assert(0);
-		return;
-	}
-
-	UTLMEMORY_TRACK_FREE();
-
-	int nAllocationRequested = CUtlMemory<T>::m_nAllocationCount + num;
-
-	CUtlMemory<T>::m_nAllocationCount = UtlMemory_CalcNewAllocationCount(CUtlMemory<T>::m_nAllocationCount, CUtlMemory<T>::m_nGrowSize, nAllocationRequested, sizeof(T));
-
-	UTLMEMORY_TRACK_ALLOC();
-
-	if (CUtlMemory<T>::m_pMemory)
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		CUtlMemory<T>::m_pMemory = (T*)MemAlloc_ReallocAligned(CUtlMemory<T>::m_pMemory, CUtlMemory<T>::m_nAllocationCount * sizeof(T), nAlignment);
-		Assert(CUtlMemory<T>::m_pMemory);
-	}
-	else
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		CUtlMemory<T>::m_pMemory = (T*)MemAlloc_AllocAligned(CUtlMemory<T>::m_nAllocationCount * sizeof(T), nAlignment);
-		Assert(CUtlMemory<T>::m_pMemory);
-	}
-}
-
-
-template< class T, int nAlignment >
-inline void CUtlMemoryAligned<T, nAlignment>::EnsureCapacity(int num)
-{
-	if (CUtlMemory<T>::m_nAllocationCount >= num)
-		return;
-
-	if (this->IsExternallyAllocated())
-	{
-		Assert(0);
-		return;
-	}
-
-	UTLMEMORY_TRACK_FREE();
-
-	CUtlMemory<T>::m_nAllocationCount = num;
-
-	UTLMEMORY_TRACK_ALLOC();
-
-	if (CUtlMemory<T>::m_pMemory)
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		CUtlMemory<T>::m_pMemory = (T*)MemAlloc_ReallocAligned(CUtlMemory<T>::m_pMemory, CUtlMemory<T>::m_nAllocationCount * sizeof(T), nAlignment);
-	}
-	else
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		CUtlMemory<T>::m_pMemory = (T*)MemAlloc_AllocAligned(CUtlMemory<T>::m_nAllocationCount * sizeof(T), nAlignment);
-	}
-}
-
-
-template< class T, int nAlignment >
-void CUtlMemoryAligned<T, nAlignment>::Purge()
-{
-	if (!this->IsExternallyAllocated())
-	{
-		if (CUtlMemory<T>::m_pMemory)
-		{
-			UTLMEMORY_TRACK_FREE();
-			MemAlloc_FreeAligned(CUtlMemory<T>::m_pMemory);
-			CUtlMemory<T>::m_pMemory = 0;
-		}
-		CUtlMemory<T>::m_nAllocationCount = 0;
-	}
-}
-
-#include "memdbgoff.h"
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlobjectreference.h b/SpyCustom/utlobjectreference.h
deleted file mode 100644
index 4f3c353..0000000
--- a/SpyCustom/utlobjectreference.h
+++ /dev/null
@@ -1,138 +0,0 @@
-#ifndef UTLOBJECTREFERENCE_H
-#define UTLOBJECTREFERENCE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlintrusivelist.h"
-#include "mathlib.h"
-
-
-
-
-
-template<class T> class CUtlReference
-{
-public:
-	FORCEINLINE CUtlReference(void)
-	{
-		m_pNext = m_pPrev = NULL;
-		m_pObject = NULL;
-	}
-
-	FORCEINLINE CUtlReference(T* pObj)
-	{
-		m_pNext = m_pPrev = NULL;
-		AddRef(pObj);
-	}
-
-	FORCEINLINE ~CUtlReference(void)
-	{
-		KillRef();
-	}
-
-	FORCEINLINE void Set(T* pObj)
-	{
-		if (m_pObject != pObj)
-		{
-			KillRef();
-			AddRef(pObj);
-		}
-	}
-
-	FORCEINLINE T* operator()(void) const
-	{
-		return m_pObject;
-	}
-
-	FORCEINLINE operator T* ()
-	{
-		return m_pObject;
-	}
-
-	FORCEINLINE operator const T* () const
-	{
-		return m_pObject;
-	}
-
-	FORCEINLINE T* operator->()
-	{
-		return m_pObject;
-	}
-
-	FORCEINLINE const T* operator->() const
-	{
-		return m_pObject;
-	}
-
-	FORCEINLINE CUtlReference& operator=(const CUtlReference& otherRef)
-	{
-		Set(otherRef.m_pObject);
-		return *this;
-	}
-
-	FORCEINLINE CUtlReference& operator=(T* pObj)
-	{
-		Set(pObj);
-		return *this;
-	}
-
-
-	FORCEINLINE bool operator==(const CUtlReference& o) const
-	{
-		return (o.m_pObject == m_pObject);
-	}
-
-public:
-	CUtlReference* m_pNext;
-	CUtlReference* m_pPrev;
-
-	T* m_pObject;
-
-	FORCEINLINE void AddRef(T* pObj)
-	{
-		m_pObject = pObj;
-		if (pObj)
-		{
-			pObj->m_References.AddToHead(this);
-		}
-	}
-
-	FORCEINLINE void KillRef(void)
-	{
-		if (m_pObject)
-		{
-			m_pObject->m_References.RemoveNode(this);
-			m_pObject = NULL;
-		}
-	}
-
-};
-
-template<class T> class CUtlReferenceList : public CUtlIntrusiveDList< CUtlReference<T> >
-{
-public:
-	~CUtlReferenceList(void)
-	{
-		CUtlReference<T>* i = CUtlIntrusiveDList<CUtlReference<T> >::m_pHead;
-		while (i)
-		{
-			CUtlReference<T>* n = i->m_pNext;
-			i->m_pNext = NULL;
-			i->m_pPrev = NULL;
-			i->m_pObject = NULL;
-			i = n;
-		}
-		CUtlIntrusiveDList<CUtlReference<T> >::m_pHead = NULL;
-	}
-};
-
-
-#define DECLARE_REFERENCED_CLASS( _className )				\
-	private:												\
-		CUtlReferenceList< _className > m_References;		\
-		template<class T> friend class CUtlReference;
-
-
-#endif
diff --git a/SpyCustom/utlpriorityqueue.h b/SpyCustom/utlpriorityqueue.h
deleted file mode 100644
index eb5d446..0000000
--- a/SpyCustom/utlpriorityqueue.h
+++ /dev/null
@@ -1,164 +0,0 @@
-#ifndef UTLPRIORITYQUEUE_H
-#define UTLPRIORITYQUEUE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-
-template< class T >
-class CUtlPriorityQueue
-{
-public:
-	typedef bool (*LessFunc_t)(T const&, T const&);
-
-	typedef T ElemType_t;
-
-	CUtlPriorityQueue(int growSize = 0, int initSize = 0, LessFunc_t lessfunc = 0);
-	CUtlPriorityQueue(T* pMemory, int numElements, LessFunc_t lessfunc = 0);
-
-	inline T const& ElementAtHead() const { return m_heap.Element(0); }
-
-	inline bool IsValidIndex(int index) { return m_heap.IsValidIndex(index); }
-
-	void		RemoveAtHead();
-	void		RemoveAt(int index);
-
-	void		Insert(T const& element);
-	void		SetLessFunc(LessFunc_t func);
-
-	inline int	Count() const { return m_heap.Count(); }
-
-	void		RemoveAll() { m_heap.RemoveAll(); }
-
-	void		Purge() { m_heap.Purge(); }
-
-	inline const T& Element(int index) const { return m_heap.Element(index); }
-
-protected:
-	CUtlVector<T>	m_heap;
-
-	void		Swap(int index1, int index2);
-
-	LessFunc_t m_LessFunc;
-};
-
-template< class T >
-inline CUtlPriorityQueue<T>::CUtlPriorityQueue(int growSize, int initSize, LessFunc_t lessfunc) :
-	m_heap(growSize, initSize), m_LessFunc(lessfunc)
-{
-}
-
-template< class T >
-inline CUtlPriorityQueue<T>::CUtlPriorityQueue(T* pMemory, int numElements, LessFunc_t lessfunc) :
-	m_heap(pMemory, numElements), m_LessFunc(lessfunc)
-{
-}
-
-template <class T>
-void CUtlPriorityQueue<T>::RemoveAtHead()
-{
-	m_heap.FastRemove(0);
-	int index = 0;
-
-	int count = Count();
-	if (!count)
-		return;
-
-	int half = count / 2;
-	int larger = index;
-	while (index < half)
-	{
-		int child = ((index + 1) * 2) - 1;	              
-		if (child < count)
-		{
-			if (m_LessFunc(m_heap[index], m_heap[child]))
-			{
-				larger = child;
-			}
-		}
-		child++;
-		if (child < count)
-		{
-			if (m_LessFunc(m_heap[larger], m_heap[child]))
-				larger = child;
-		}
-
-		if (larger == index)
-			break;
-
-		Swap(index, larger);
-		index = larger;
-	}
-}
-
-
-template <class T>
-void CUtlPriorityQueue<T>::RemoveAt(int index)
-{
-	Assert(m_heap.IsValidIndex(index));
-	m_heap.FastRemove(index);
-
-	int count = Count();
-	if (!count)
-		return;
-
-	int half = count / 2;
-	int larger = index;
-	while (index < half)
-	{
-		int child = ((index + 1) * 2) - 1;	              
-		if (child < count)
-		{
-			if (m_LessFunc(m_heap[index], m_heap[child]))
-			{
-				larger = child;
-			}
-		}
-		child++;
-		if (child < count)
-		{
-			if (m_LessFunc(m_heap[larger], m_heap[child]))
-				larger = child;
-		}
-
-		if (larger == index)
-			break;
-
-		Swap(index, larger);
-		index = larger;
-	}
-}
-
-template <class T>
-void CUtlPriorityQueue<T>::Insert(T const& element)
-{
-	int index = m_heap.AddToTail();
-	m_heap[index] = element;
-
-	while (index != 0)
-	{
-		int parent = ((index + 1) / 2) - 1;
-		if (m_LessFunc(m_heap[index], m_heap[parent]))
-			break;
-
-		Swap(parent, index);
-		index = parent;
-	}
-}
-
-template <class T>
-void CUtlPriorityQueue<T>::Swap(int index1, int index2)
-{
-	T tmp = m_heap[index1];
-	m_heap[index1] = m_heap[index2];
-	m_heap[index2] = tmp;
-}
-
-template <class T>
-void CUtlPriorityQueue<T>::SetLessFunc(LessFunc_t lessfunc)
-{
-	m_LessFunc = lessfunc;
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlqueue.h b/SpyCustom/utlqueue.h
deleted file mode 100644
index dd012af..0000000
--- a/SpyCustom/utlqueue.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef UTLQUEUE_H
-#define UTLQUEUE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "utlvector.h"
-
-template< class T >
-class CUtlQueue
-{
-public:
-
-	CUtlQueue(int growSize = 0, int initSize = 0);
-	CUtlQueue(T* pMemory, int numElements);
-
-	T const& RemoveAtHead();
-	T const& RemoveAtTail();
-
-	T const& Head();
-	T const& Tail();
-
-	void	Insert(T const& element);
-
-	bool		Check(T const element);
-
-	int			Count() const { return m_heap.Count(); }
-
-	void		RemoveAll() { m_heap.RemoveAll(); }
-
-	void		Purge() { m_heap.Purge(); }
-
-protected:
-	CUtlVector<T>	m_heap;
-	T				m_current;
-};
-
-template< class T >
-inline CUtlQueue<T>::CUtlQueue(int growSize, int initSize) :
-	m_heap(growSize, initSize)
-{
-}
-
-template< class T >
-inline CUtlQueue<T>::CUtlQueue(T* pMemory, int numElements) :
-	m_heap(pMemory, numElements)
-{
-}
-
-template <class T>
-inline T const& CUtlQueue<T>::RemoveAtHead()
-{
-	m_current = m_heap[0];
-	m_heap.Remove((int)0);
-	return m_current;
-}
-
-template <class T>
-inline T const& CUtlQueue<T>::RemoveAtTail()
-{
-	m_current = m_heap[m_heap.Count() - 1];
-	m_heap.Remove((int)(m_heap.Count() - 1));
-	return m_current;
-}
-
-template <class T>
-inline T const& CUtlQueue<T>::Head()
-{
-	m_current = m_heap[0];
-	return m_current;
-}
-
-template <class T>
-inline T const& CUtlQueue<T>::Tail()
-{
-	m_current = m_heap[m_heap.Count() - 1];
-	return m_current;
-}
-
-template <class T>
-void CUtlQueue<T>::Insert(T const& element)
-{
-	int index = m_heap.AddToTail();
-	m_heap[index] = element;
-}
-
-template <class T>
-bool CUtlQueue<T>::Check(T const element)
-{
-	int index = m_heap.Find(element);
-	return (index != -1);
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlrbtree.h b/SpyCustom/utlrbtree.h
deleted file mode 100644
index a6bcb9a..0000000
--- a/SpyCustom/utlrbtree.h
+++ /dev/null
@@ -1,1432 +0,0 @@
-#ifndef UTLRBTREE_H
-#define UTLRBTREE_H
-
-#include "utlmemory.h"
-#include "utlfixedmemory.h"
-#include "utlblockmemory.h"
-
-
-#define FOR_EACH_UTLRBTREE( treeName, iteratorName ) \
-	for ( int iteratorName = treeName.FirstInorder(); (treeName).IsUtlRBTree && iteratorName != treeName.InvalidIndex(); iteratorName = treeName.NextInorder( iteratorName ) )
-
-
-template <typename T >
-class CDefOps
-{
-public:
-	static bool LessFunc(const T& lhs, const T& rhs) { return (lhs < rhs); }
-};
-
-#define DefLessFunc( type ) CDefOps< type >::LessFunc
-
-template <typename T>
-class CDefLess
-{
-public:
-	CDefLess() {}
-	CDefLess(int i) {}
-	inline bool operator()(const T& lhs, const T& rhs) const { return (lhs < rhs); }
-	inline bool operator!() const { return false; }
-};
-
-
-inline bool StringLessThan(const char* const& lhs, const char* const& rhs) {
-	if (!lhs) return false;
-	if (!rhs) return true;
-	return (strcmp(lhs, rhs) < 0);
-}
-
-inline bool CaselessStringLessThan(const char* const& lhs, const char* const& rhs) {
-	if (!lhs) return false;
-	if (!rhs) return true;
-	return (stricmp(lhs, rhs) < 0);
-}
-
-
-inline bool CaselessStringLessThanIgnoreSlashes(const char* const& lhs, const char* const& rhs)
-{
-	const char* pa = lhs;
-	const char* pb = rhs;
-	while (*pa && *pb)
-	{
-		char a = *pa;
-		char b = *pb;
-
-		if (a == '/' || a == '\\')
-		{
-			if (b != '/' && b != '\\')
-				return ('/' < b);
-		}
-		else
-		{
-			if (a >= 'a' && a <= 'z')
-				a = 'A' + (a - 'a');
-
-			if (b >= 'a' && b <= 'z')
-				b = 'A' + (b - 'a');
-
-			if (a > b)
-				return false;
-			else if (a < b)
-				return true;
-		}
-		++pa;
-		++pb;
-	}
-
-	if (*pa != *pb)
-	{
-		return (!*pa);
-	}
-
-	return false;
-}
-
-template <> inline bool CDefOps<const char*>::LessFunc(const char* const& lhs, const char* const& rhs) { return StringLessThan(lhs, rhs); }
-template <> inline bool CDefOps<char*>::LessFunc(char* const& lhs, char* const& rhs) { return StringLessThan(lhs, rhs); }
-
-template <typename RBTREE_T>
-void SetDefLessFunc(RBTREE_T& RBTree)
-{
-	RBTree.SetLessFunc(DefLessFunc(typename RBTREE_T::KeyType_t));
-}
-
-enum CompareOperands_t
-{
-	k_EEqual = 0x1,
-	k_EGreaterThan = 0x2,
-	k_ELessThan = 0x4,
-	k_EGreaterThanOrEqualTo = k_EGreaterThan | k_EEqual,
-	k_ELessThanOrEqualTo = k_ELessThan | k_EEqual,
-};
-
-template < class I >
-struct UtlRBTreeLinks_t
-{
-	I  m_Left;
-	I  m_Right;
-	I  m_Parent;
-	I  m_Tag;
-};
-
-template < class T, class I >
-struct UtlRBTreeNode_t : public UtlRBTreeLinks_t< I >
-{
-	T  m_Data;
-};
-
-template < class T, class I = unsigned short, typename L = bool (*)(const T&, const T&), class M = CUtlMemory< UtlRBTreeNode_t< T, I >, I > >
-class CUtlRBTree
-{
-public:
-
-	typedef T KeyType_t;
-	typedef T ElemType_t;
-	typedef I IndexType_t;
-	enum { IsUtlRBTree = true };        
-
-	typedef L LessFunc_t;
-
-	explicit CUtlRBTree(int growSize = 0, int initSize = 0, const LessFunc_t& lessfunc = 0);
-	explicit CUtlRBTree(const LessFunc_t& lessfunc);
-	~CUtlRBTree();
-
-	void EnsureCapacity(int num);
-
-	void CopyFrom(const CUtlRBTree<T, I, L, M>& other);
-
-	T& Element(I i);
-	T const& Element(I i) const;
-	T& operator[](I i);
-	T const& operator[](I i) const;
-
-	I  Root() const;
-
-	unsigned int Count() const;
-
-	I  MaxElement() const;
-
-	I  Parent(I i) const;
-	I  LeftChild(I i) const;
-	I  RightChild(I i) const;
-
-	bool  IsLeftChild(I i) const;
-	bool  IsRightChild(I i) const;
-
-	bool  IsRoot(I i) const;
-	bool  IsLeaf(I i) const;
-
-	bool  IsValidIndex(I i) const;
-
-	bool  IsValid() const;
-
-	static I InvalidIndex();
-
-	int   Depth(I node) const;
-	int   Depth() const;
-
-	void SetLessFunc(const LessFunc_t& func);
-
-	I  NewNode();
-
-	I  Insert(T const& insert);
-	void Insert(const T* pArray, int nItems);
-	I  InsertIfNotFound(T const& insert);
-
-	I  Find(T const& search) const;
-
-	I  FindFirst(T const& search) const;
-
-	I  FindClosest(T const& search, CompareOperands_t eFindCriteria) const;
-
-	void     RemoveAt(I i);
-	bool     Remove(T const& remove);
-	void     RemoveAll();
-	void	 Purge();
-
-	void  FreeNode(I i);
-
-	I  FirstInorder() const;
-	I  NextInorder(I i) const;
-	I  PrevInorder(I i) const;
-	I  LastInorder() const;
-
-	I  FirstPreorder() const;
-	I  NextPreorder(I i) const;
-	I  PrevPreorder(I i) const;
-	I  LastPreorder() const;
-
-	I  FirstPostorder() const;
-	I  NextPostorder(I i) const;
-
-	void	Reinsert(I elem);
-
-	void Swap(CUtlRBTree< T, I, L >& that);
-
-private:
-	CUtlRBTree<T, I, L, M>& operator=(const CUtlRBTree<T, I, L, M>& other);
-
-protected:
-	enum NodeColor_t
-	{
-		RED = 0,
-		BLACK
-	};
-
-	typedef UtlRBTreeNode_t< T, I > Node_t;
-	typedef UtlRBTreeLinks_t< I > Links_t;
-
-	void  SetParent(I i, I parent);
-	void  SetLeftChild(I i, I child);
-	void  SetRightChild(I i, I child);
-	void  LinkToParent(I i, I parent, bool isLeft);
-
-	Links_t const& Links(I i) const;
-	Links_t& Links(I i);
-
-	bool IsRed(I i) const;
-	bool IsBlack(I i) const;
-
-	NodeColor_t Color(I i) const;
-	void        SetColor(I i, NodeColor_t c);
-
-	void RotateLeft(I i);
-	void RotateRight(I i);
-	void InsertRebalance(I i);
-	void RemoveRebalance(I i);
-
-	I  InsertAt(I parent, bool leftchild);
-
-	CUtlRBTree(CUtlRBTree<T, I, L, M> const& tree);
-
-	void FindInsertionPosition(T const& insert, I& parent, bool& leftchild);
-
-	void	Unlink(I elem);
-	void	Link(I elem);
-
-	LessFunc_t m_LessFunc;
-
-	M m_Elements;
-	I m_Root;
-	I m_NumElements;
-	I m_FirstFree;
-	typename M::Iterator_t m_LastAlloc;     
-
-	Node_t* m_pElements;
-
-	FORCEINLINE M const& Elements(void) const
-	{
-		return m_Elements;
-	}
-
-
-	void ResetDbgInfo()
-	{
-		m_pElements = (Node_t*)m_Elements.Base();
-	}
-};
-
-template < class T, class I = int, typename L = bool (*)(const T&, const T&)  >
-class CUtlFixedRBTree : public CUtlRBTree< T, I, L, CUtlFixedMemory< UtlRBTreeNode_t< T, I > > >
-{
-public:
-
-	typedef L LessFunc_t;
-
-	CUtlFixedRBTree(int growSize = 0, int initSize = 0, const LessFunc_t& lessfunc = 0)
-		: CUtlRBTree< T, I, L, CUtlFixedMemory< UtlRBTreeNode_t< T, I > > >(growSize, initSize, lessfunc) {}
-	CUtlFixedRBTree(const LessFunc_t& lessfunc)
-		: CUtlRBTree< T, I, L, CUtlFixedMemory< UtlRBTreeNode_t< T, I > > >(lessfunc) {}
-
-	typedef CUtlRBTree< T, I, L, CUtlFixedMemory< UtlRBTreeNode_t< T, I > > > BaseClass;
-	bool IsValidIndex(I i) const
-	{
-		if (!BaseClass::Elements().IsIdxValid(i))
-			return false;
-
-#ifdef _DEBUG                    
-		if (BaseClass::Elements().IsIdxAfter(i, this->m_LastAlloc))
-		{
-			Assert(0);
-			return false;           
-		}
-#endif
-
-		return LeftChild(i) != i;
-	}
-
-protected:
-	void ResetDbgInfo() {}
-
-private:
-	I  MaxElement() const;
-};
-
-template < class T, class I = unsigned short, typename L = bool (*)(const T&, const T&)  >
-class CUtlBlockRBTree : public CUtlRBTree< T, I, L, CUtlBlockMemory< UtlRBTreeNode_t< T, I >, I > >
-{
-public:
-	typedef L LessFunc_t;
-	CUtlBlockRBTree(int growSize = 0, int initSize = 0, const LessFunc_t& lessfunc = 0)
-		: CUtlRBTree< T, I, L, CUtlBlockMemory< UtlRBTreeNode_t< T, I >, I > >(growSize, initSize, lessfunc) {}
-	CUtlBlockRBTree(const LessFunc_t& lessfunc)
-		: CUtlRBTree< T, I, L, CUtlBlockMemory< UtlRBTreeNode_t< T, I >, I > >(lessfunc) {}
-protected:
-	void ResetDbgInfo() {}
-};
-
-
-template < class T, class I, typename L, class M >
-inline CUtlRBTree<T, I, L, M>::CUtlRBTree(int growSize, int initSize, const LessFunc_t& lessfunc) :
-	m_LessFunc(lessfunc),
-	m_Elements(growSize, initSize),
-	m_Root(InvalidIndex()),
-	m_NumElements(0),
-	m_FirstFree(InvalidIndex()),
-	m_LastAlloc(m_Elements.InvalidIterator())
-{
-	ResetDbgInfo();
-}
-
-template < class T, class I, typename L, class M >
-inline CUtlRBTree<T, I, L, M>::CUtlRBTree(const LessFunc_t& lessfunc) :
-	m_Elements(0, 0),
-	m_LessFunc(lessfunc),
-	m_Root(InvalidIndex()),
-	m_NumElements(0),
-	m_FirstFree(InvalidIndex()),
-	m_LastAlloc(m_Elements.InvalidIterator())
-{
-	ResetDbgInfo();
-}
-
-template < class T, class I, typename L, class M >
-inline CUtlRBTree<T, I, L, M>::~CUtlRBTree()
-{
-	Purge();
-}
-
-template < class T, class I, typename L, class M >
-inline void CUtlRBTree<T, I, L, M>::EnsureCapacity(int num)
-{
-	m_Elements.EnsureCapacity(num);
-}
-
-template < class T, class I, typename L, class M >
-inline void CUtlRBTree<T, I, L, M>::CopyFrom(const CUtlRBTree<T, I, L, M>& other)
-{
-	Purge();
-	m_Elements.EnsureCapacity(other.m_Elements.Count());
-	memcpy(m_Elements.Base(), other.m_Elements.Base(), other.m_Elements.Count() * sizeof(UtlRBTreeNode_t< T, I >));
-	m_LessFunc = other.m_LessFunc;
-	m_Root = other.m_Root;
-	m_NumElements = other.m_NumElements;
-	m_FirstFree = other.m_FirstFree;
-	m_LastAlloc = other.m_LastAlloc;
-	ResetDbgInfo();
-}
-
-template < class T, class I, typename L, class M >
-inline T& CUtlRBTree<T, I, L, M>::Element(I i)
-{
-	Assert(IsValidIndex(i));
-	return m_Elements[i].m_Data;
-}
-
-template < class T, class I, typename L, class M >
-inline T const& CUtlRBTree<T, I, L, M>::Element(I i) const
-{
-	Assert(IsValidIndex(i));
-	return m_Elements[i].m_Data;
-}
-
-template < class T, class I, typename L, class M >
-inline T& CUtlRBTree<T, I, L, M>::operator[](I i)
-{
-	return Element(i);
-}
-
-template < class T, class I, typename L, class M >
-inline T const& CUtlRBTree<T, I, L, M>::operator[](I i) const
-{
-	return Element(i);
-}
-
-template < class T, class I, typename L, class M >
-inline	I  CUtlRBTree<T, I, L, M>::Root() const
-{
-	return m_Root;
-}
-
-template < class T, class I, typename L, class M >
-inline	unsigned int CUtlRBTree<T, I, L, M>::Count() const
-{
-	return (unsigned int)m_NumElements;
-}
-
-template < class T, class I, typename L, class M >
-inline	I  CUtlRBTree<T, I, L, M>::MaxElement() const
-{
-	return (I)m_Elements.NumAllocated();
-}
-
-
-template < class T, class I, typename L, class M >
-inline	I CUtlRBTree<T, I, L, M>::Parent(I i) const
-{
-	return i != InvalidIndex() ? m_Elements[i].m_Parent : InvalidIndex();
-}
-
-template < class T, class I, typename L, class M >
-inline	I CUtlRBTree<T, I, L, M>::LeftChild(I i) const
-{
-	return i != InvalidIndex() ? m_Elements[i].m_Left : InvalidIndex();
-}
-
-template < class T, class I, typename L, class M >
-inline	I CUtlRBTree<T, I, L, M>::RightChild(I i) const
-{
-	return i != InvalidIndex() ? m_Elements[i].m_Right : InvalidIndex();
-}
-
-template < class T, class I, typename L, class M >
-inline	bool CUtlRBTree<T, I, L, M>::IsLeftChild(I i) const
-{
-	return LeftChild(Parent(i)) == i;
-}
-
-template < class T, class I, typename L, class M >
-inline	bool CUtlRBTree<T, I, L, M>::IsRightChild(I i) const
-{
-	return RightChild(Parent(i)) == i;
-}
-
-
-template < class T, class I, typename L, class M >
-inline	bool CUtlRBTree<T, I, L, M>::IsRoot(I i) const
-{
-	return i == m_Root;
-}
-
-template < class T, class I, typename L, class M >
-inline	bool CUtlRBTree<T, I, L, M>::IsLeaf(I i) const
-{
-	return (LeftChild(i) == InvalidIndex()) && (RightChild(i) == InvalidIndex());
-}
-
-
-template < class T, class I, typename L, class M >
-inline	bool CUtlRBTree<T, I, L, M>::IsValidIndex(I i) const
-{
-	if (!m_Elements.IsIdxValid(i))
-		return false;
-
-	if (m_Elements.IsIdxAfter(i, m_LastAlloc))
-		return false;           
-
-	return LeftChild(i) != i;
-}
-
-
-template < class T, class I, typename L, class M >
-inline I CUtlRBTree<T, I, L, M>::InvalidIndex()
-{
-	return (I)M::InvalidIndex();
-}
-
-
-template < class T, class I, typename L, class M >
-inline int CUtlRBTree<T, I, L, M>::Depth() const
-{
-	return Depth(Root());
-}
-
-template < class T, class I, typename L, class M >
-inline void  CUtlRBTree<T, I, L, M>::SetParent(I i, I parent)
-{
-	Links(i).m_Parent = parent;
-}
-
-template < class T, class I, typename L, class M >
-inline void  CUtlRBTree<T, I, L, M>::SetLeftChild(I i, I child)
-{
-	Links(i).m_Left = child;
-}
-
-template < class T, class I, typename L, class M >
-inline void  CUtlRBTree<T, I, L, M>::SetRightChild(I i, I child)
-{
-	Links(i).m_Right = child;
-}
-
-template < class T, class I, typename L, class M >
-inline typename CUtlRBTree<T, I, L, M>::Links_t const& CUtlRBTree<T, I, L, M>::Links(I i) const
-{
-	static const Links_t s_Sentinel =
-	{
-		M::INVALID_INDEX, M::INVALID_INDEX, M::INVALID_INDEX, CUtlRBTree<T, I, L, M>::BLACK
-	};
-
-	return (i != InvalidIndex()) ? m_Elements[i] : s_Sentinel;
-}
-
-template < class T, class I, typename L, class M >
-inline typename CUtlRBTree<T, I, L, M>::Links_t& CUtlRBTree<T, I, L, M>::Links(I i)
-{
-	Assert(i != InvalidIndex());
-	return m_Elements[i];
-}
-
-template < class T, class I, typename L, class M >
-inline bool CUtlRBTree<T, I, L, M>::IsRed(I i) const
-{
-	return Color(i) == RED;
-}
-
-template < class T, class I, typename L, class M >
-inline bool CUtlRBTree<T, I, L, M>::IsBlack(I i) const
-{
-	return Color(i) == BLACK;
-}
-
-
-template < class T, class I, typename L, class M >
-inline typename CUtlRBTree<T, I, L, M>::NodeColor_t  CUtlRBTree<T, I, L, M>::Color(I i) const
-{
-	return (NodeColor_t)(i != InvalidIndex() ? m_Elements[i].m_Tag : BLACK);
-}
-
-template < class T, class I, typename L, class M >
-inline void CUtlRBTree<T, I, L, M>::SetColor(I i, typename CUtlRBTree<T, I, L, M>::NodeColor_t c)
-{
-	Links(i).m_Tag = (I)c;
-}
-
-#pragma warning(push)
-#pragma warning(disable:4389)     
-template < class T, class I, typename L, class M >
-I  CUtlRBTree<T, I, L, M>::NewNode()
-{
-	I elem;
-
-	if (m_FirstFree == InvalidIndex())
-	{
-		Assert(m_Elements.IsValidIterator(m_LastAlloc) || m_NumElements == 0);
-		typename M::Iterator_t it = m_Elements.IsValidIterator(m_LastAlloc) ? m_Elements.Next(m_LastAlloc) : m_Elements.First();
-		if (!m_Elements.IsValidIterator(it))
-		{
-			MEM_ALLOC_CREDIT_CLASS();
-			m_Elements.Grow();
-
-			it = m_Elements.IsValidIterator(m_LastAlloc) ? m_Elements.Next(m_LastAlloc) : m_Elements.First();
-
-			Assert(m_Elements.IsValidIterator(it));
-			if (!m_Elements.IsValidIterator(it))
-			{
-				Error("CUtlRBTree overflow!\n");
-			}
-		}
-		m_LastAlloc = it;
-		elem = m_Elements.GetIndex(m_LastAlloc);
-		Assert(m_Elements.IsValidIterator(m_LastAlloc));
-	}
-	else
-	{
-		elem = m_FirstFree;
-		m_FirstFree = RightChild(m_FirstFree);
-	}
-
-#ifdef _DEBUG
-	Links_t& node = Links(elem);
-	node.m_Left = node.m_Right = node.m_Parent = InvalidIndex();
-#endif
-
-	Construct(&Element(elem));
-	ResetDbgInfo();
-
-	return elem;
-}
-#pragma warning(pop)
-
-template < class T, class I, typename L, class M >
-void  CUtlRBTree<T, I, L, M>::FreeNode(I i)
-{
-	Assert(IsValidIndex(i) && (i != InvalidIndex()));
-	Destruct(&Element(i));
-	SetLeftChild(i, i);        
-	SetRightChild(i, m_FirstFree);
-	m_FirstFree = i;
-}
-
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::RotateLeft(I elem)
-{
-	I rightchild = RightChild(elem);
-	SetRightChild(elem, LeftChild(rightchild));
-	if (LeftChild(rightchild) != InvalidIndex())
-		SetParent(LeftChild(rightchild), elem);
-
-	if (rightchild != InvalidIndex())
-		SetParent(rightchild, Parent(elem));
-	if (!IsRoot(elem))
-	{
-		if (IsLeftChild(elem))
-			SetLeftChild(Parent(elem), rightchild);
-		else
-			SetRightChild(Parent(elem), rightchild);
-	}
-	else
-		m_Root = rightchild;
-
-	SetLeftChild(rightchild, elem);
-	if (elem != InvalidIndex())
-		SetParent(elem, rightchild);
-}
-
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::RotateRight(I elem)
-{
-	I leftchild = LeftChild(elem);
-	SetLeftChild(elem, RightChild(leftchild));
-	if (RightChild(leftchild) != InvalidIndex())
-		SetParent(RightChild(leftchild), elem);
-
-	if (leftchild != InvalidIndex())
-		SetParent(leftchild, Parent(elem));
-	if (!IsRoot(elem))
-	{
-		if (IsRightChild(elem))
-			SetRightChild(Parent(elem), leftchild);
-		else
-			SetLeftChild(Parent(elem), leftchild);
-	}
-	else
-		m_Root = leftchild;
-
-	SetRightChild(leftchild, elem);
-	if (elem != InvalidIndex())
-		SetParent(elem, leftchild);
-}
-
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::InsertRebalance(I elem)
-{
-	while (!IsRoot(elem) && (Color(Parent(elem)) == RED))
-	{
-		I parent = Parent(elem);
-		I grandparent = Parent(parent);
-
-		if (IsLeftChild(parent))
-		{
-			I uncle = RightChild(grandparent);
-			if (IsRed(uncle))
-			{
-				SetColor(parent, BLACK);
-				SetColor(uncle, BLACK);
-				SetColor(grandparent, RED);
-				elem = grandparent;
-			}
-			else
-			{
-				if (IsRightChild(elem))
-				{
-					elem = parent;
-					RotateLeft(elem);
-					parent = Parent(elem);
-					grandparent = Parent(parent);
-				}
-				SetColor(parent, BLACK);
-				SetColor(grandparent, RED);
-				RotateRight(grandparent);
-			}
-		}
-		else
-		{
-			I uncle = LeftChild(grandparent);
-			if (IsRed(uncle))
-			{
-				SetColor(parent, BLACK);
-				SetColor(uncle, BLACK);
-				SetColor(grandparent, RED);
-				elem = grandparent;
-			}
-			else
-			{
-				if (IsLeftChild(elem))
-				{
-					elem = parent;
-					RotateRight(parent);
-					parent = Parent(elem);
-					grandparent = Parent(parent);
-				}
-				SetColor(parent, BLACK);
-				SetColor(grandparent, RED);
-				RotateLeft(grandparent);
-			}
-		}
-	}
-	SetColor(m_Root, BLACK);
-}
-
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::InsertAt(I parent, bool leftchild)
-{
-	I i = NewNode();
-	LinkToParent(i, parent, leftchild);
-	++m_NumElements;
-
-	Assert(IsValid());
-
-	return i;
-}
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::LinkToParent(I i, I parent, bool isLeft)
-{
-	Links_t& elem = Links(i);
-	elem.m_Parent = parent;
-	elem.m_Left = elem.m_Right = InvalidIndex();
-	elem.m_Tag = RED;
-
-	if (parent != InvalidIndex())
-	{
-		if (isLeft)
-			Links(parent).m_Left = i;
-		else
-			Links(parent).m_Right = i;
-	}
-	else
-	{
-		m_Root = i;
-	}
-
-	InsertRebalance(i);
-}
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::RemoveRebalance(I elem)
-{
-	while (elem != m_Root && IsBlack(elem))
-	{
-		I parent = Parent(elem);
-
-		if (elem == LeftChild(parent))
-		{
-			I sibling = RightChild(parent);
-			if (IsRed(sibling))
-			{
-				SetColor(sibling, BLACK);
-				SetColor(parent, RED);
-				RotateLeft(parent);
-
-				parent = Parent(elem);
-				sibling = RightChild(parent);
-			}
-			if ((IsBlack(LeftChild(sibling))) && (IsBlack(RightChild(sibling))))
-			{
-				if (sibling != InvalidIndex())
-					SetColor(sibling, RED);
-				elem = parent;
-			}
-			else
-			{
-				if (IsBlack(RightChild(sibling)))
-				{
-					SetColor(LeftChild(sibling), BLACK);
-					SetColor(sibling, RED);
-					RotateRight(sibling);
-
-					parent = Parent(elem);
-					sibling = RightChild(parent);
-				}
-				SetColor(sibling, Color(parent));
-				SetColor(parent, BLACK);
-				SetColor(RightChild(sibling), BLACK);
-				RotateLeft(parent);
-				elem = m_Root;
-			}
-		}
-		else
-		{
-			I sibling = LeftChild(parent);
-			if (IsRed(sibling))
-			{
-				SetColor(sibling, BLACK);
-				SetColor(parent, RED);
-				RotateRight(parent);
-
-				parent = Parent(elem);
-				sibling = LeftChild(parent);
-			}
-			if ((IsBlack(RightChild(sibling))) && (IsBlack(LeftChild(sibling))))
-			{
-				if (sibling != InvalidIndex())
-					SetColor(sibling, RED);
-				elem = parent;
-			}
-			else
-			{
-				if (IsBlack(LeftChild(sibling)))
-				{
-					SetColor(RightChild(sibling), BLACK);
-					SetColor(sibling, RED);
-					RotateLeft(sibling);
-
-					parent = Parent(elem);
-					sibling = LeftChild(parent);
-				}
-				SetColor(sibling, Color(parent));
-				SetColor(parent, BLACK);
-				SetColor(LeftChild(sibling), BLACK);
-				RotateRight(parent);
-				elem = m_Root;
-			}
-		}
-	}
-	SetColor(elem, BLACK);
-}
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::Unlink(I elem)
-{
-	if (elem != InvalidIndex())
-	{
-		I x, y;
-
-		if ((LeftChild(elem) == InvalidIndex()) ||
-			(RightChild(elem) == InvalidIndex()))
-		{
-			y = elem;
-		}
-		else
-		{
-			y = RightChild(elem);
-			while (LeftChild(y) != InvalidIndex())
-				y = LeftChild(y);
-		}
-
-		if (LeftChild(y) != InvalidIndex())
-			x = LeftChild(y);
-		else
-			x = RightChild(y);
-
-		if (x != InvalidIndex())
-			SetParent(x, Parent(y));
-		if (!IsRoot(y))
-		{
-			if (IsLeftChild(y))
-				SetLeftChild(Parent(y), x);
-			else
-				SetRightChild(Parent(y), x);
-		}
-		else
-			m_Root = x;
-
-		NodeColor_t ycolor = Color(y);
-		if (y != elem)
-		{
-			SetParent(y, Parent(elem));
-			SetRightChild(y, RightChild(elem));
-			SetLeftChild(y, LeftChild(elem));
-
-			if (!IsRoot(elem))
-				if (IsLeftChild(elem))
-					SetLeftChild(Parent(elem), y);
-				else
-					SetRightChild(Parent(elem), y);
-			else
-				m_Root = y;
-
-			if (LeftChild(y) != InvalidIndex())
-				SetParent(LeftChild(y), y);
-			if (RightChild(y) != InvalidIndex())
-				SetParent(RightChild(y), y);
-
-			SetColor(y, Color(elem));
-		}
-
-		if ((x != InvalidIndex()) && (ycolor == BLACK))
-			RemoveRebalance(x);
-	}
-}
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::Link(I elem)
-{
-	if (elem != InvalidIndex())
-	{
-		I parent = InvalidIndex();
-		bool leftchild = false;
-
-		FindInsertionPosition(Element(elem), parent, leftchild);
-
-		LinkToParent(elem, parent, leftchild);
-
-		Assert(IsValid());
-	}
-}
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::RemoveAt(I elem)
-{
-	if (elem != InvalidIndex())
-	{
-		Unlink(elem);
-
-		FreeNode(elem);
-		--m_NumElements;
-
-		Assert(IsValid());
-	}
-}
-
-
-template < class T, class I, typename L, class M > bool CUtlRBTree<T, I, L, M>::Remove(T const& search)
-{
-	I node = Find(search);
-	if (node != InvalidIndex())
-	{
-		RemoveAt(node);
-		return true;
-	}
-	return false;
-}
-
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::RemoveAll()
-{
-	if (m_LastAlloc == m_Elements.InvalidIterator())
-	{
-		Assert(m_Root == InvalidIndex());
-		Assert(m_FirstFree == InvalidIndex());
-		Assert(m_NumElements == 0);
-		return;
-	}
-
-	for (typename M::Iterator_t it = m_Elements.First(); it != m_Elements.InvalidIterator(); it = m_Elements.Next(it))
-	{
-		I i = m_Elements.GetIndex(it);
-		if (IsValidIndex(i))       
-		{
-			Destruct(&Element(i));
-			SetRightChild(i, m_FirstFree);
-			SetLeftChild(i, i);
-			m_FirstFree = i;
-		}
-
-		if (it == m_LastAlloc)
-			break;         
-	}
-
-	m_Root = InvalidIndex();
-	m_NumElements = 0;
-
-	Assert(IsValid());
-}
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::Purge()
-{
-	RemoveAll();
-	m_FirstFree = InvalidIndex();
-	m_Elements.Purge();
-	m_LastAlloc = m_Elements.InvalidIterator();
-}
-
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::FirstInorder() const
-{
-	I i = m_Root;
-	I left;
-	while ((left = LeftChild(i)) != InvalidIndex())
-		i = left;
-	return i;
-}
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::NextInorder(I i) const
-{
-	Assert(IsValidIndex(i));
-
-	I right;
-	if ((right = RightChild(i)) != InvalidIndex())
-	{
-		i = right;
-		I left;
-		while ((left = LeftChild(i)) != InvalidIndex())
-			i = left;
-		return i;
-	}
-
-	I parent = Parent(i);
-	while (IsRightChild(i))
-	{
-		i = parent;
-		if (i == InvalidIndex()) break;
-		parent = Parent(i);
-	}
-	return parent;
-}
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::PrevInorder(I i) const
-{
-	Assert(IsValidIndex(i));
-
-	I left, right;
-	if ((left = LeftChild(i)) != InvalidIndex())
-	{
-		i = left;
-		while ((right = RightChild(i)) != InvalidIndex())
-			i = right;
-		return i;
-	}
-
-	I parent = Parent(i);
-	while (IsLeftChild(i))
-	{
-		i = parent;
-		if (i == InvalidIndex()) break;
-		parent = Parent(i);
-	}
-	return parent;
-}
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::LastInorder() const
-{
-	I i = m_Root;
-	I right;
-	while ((right = RightChild(i)) != InvalidIndex())
-		i = right;
-	return i;
-}
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::FirstPreorder() const
-{
-	return m_Root;
-}
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::NextPreorder(I i) const
-{
-	I left, right;
-	if ((left = LeftChild(i)) != InvalidIndex())
-		return left;
-
-	if ((right = RightChild(i)) != InvalidIndex())
-		return right;
-
-	I parent = Parent(i);
-	while (parent != InvalidIndex())
-	{
-		if (IsLeftChild(i) && (RightChild(parent) != InvalidIndex()))
-			return RightChild(parent);
-		i = parent;
-		parent = Parent(parent);
-	}
-	return InvalidIndex();
-}
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::PrevPreorder(I i) const
-{
-	Assert(0);     
-	return InvalidIndex();
-}
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::LastPreorder() const
-{
-	I i = m_Root;
-	while (1)
-	{
-		I left, right;
-		while ((right = RightChild(i)) != InvalidIndex())
-			i = right;
-
-		if ((left = LeftChild(i)) != InvalidIndex())
-			i = left;
-		else
-			break;
-	}
-	return i;
-}
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::FirstPostorder() const
-{
-	I i = m_Root;
-	while (!IsLeaf(i))
-	{
-		I left;
-		if ((left = LeftChild(i)) != InvalidIndex())
-			i = left;
-		else
-			i = RightChild(i);
-	}
-	return i;
-}
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::NextPostorder(I i) const
-{
-	I parent = Parent(i);
-	if (parent == InvalidIndex())
-		return InvalidIndex();
-
-	if (IsRightChild(i))
-		return parent;
-
-	if (RightChild(parent) == InvalidIndex())
-		return parent;
-
-	i = RightChild(parent);
-	while (!IsLeaf(i))
-	{
-		I left;
-		if ((left = LeftChild(i)) != InvalidIndex())
-			i = left;
-		else
-			i = RightChild(i);
-	}
-	return i;
-}
-
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::Reinsert(I elem)
-{
-	Unlink(elem);
-	Link(elem);
-}
-
-
-template < class T, class I, typename L, class M >
-int CUtlRBTree<T, I, L, M>::Depth(I node) const
-{
-	if (node == InvalidIndex())
-		return 0;
-
-	int depthright = Depth(RightChild(node));
-	int depthleft = Depth(LeftChild(node));
-	return MAX(depthright, depthleft) + 1;
-}
-
-
-template < class T, class I, typename L, class M >
-bool CUtlRBTree<T, I, L, M>::IsValid() const
-{
-	if (!Count())
-		return true;
-
-	if (m_LastAlloc == m_Elements.InvalidIterator())
-		return false;
-
-	if (!m_Elements.IsIdxValid(Root()))
-		return false;
-
-	if (Parent(Root()) != InvalidIndex())
-		return false;
-
-#ifdef UTLTREE_PARANOID
-
-	int numFree = 0;
-	for (int i = m_FirstFree; i != InvalidIndex(); i = RightChild(i))
-	{
-		++numFree;
-		if (!m_Elements.IsIdxValid(i))
-			return false;
-	}
-
-	int nElements = 0;
-	int numFree2 = 0;
-	for (M::Iterator_t it = m_Elements.First(); it != m_Elements.InvalidIterator(); it = m_Elements.Next(it))
-	{
-		I i = m_Elements.GetIndex(it);
-		if (!IsValidIndex(i))
-		{
-			++numFree2;
-		}
-		else
-		{
-			++nElements;
-
-			int right = RightChild(i);
-			int left = LeftChild(i);
-			if ((right == left) && (right != InvalidIndex()))
-				return false;
-
-			if (right != InvalidIndex())
-			{
-				if (!IsValidIndex(right))
-					return false;
-				if (Parent(right) != i)
-					return false;
-				if (IsRed(i) && IsRed(right))
-					return false;
-			}
-
-			if (left != InvalidIndex())
-			{
-				if (!IsValidIndex(left))
-					return false;
-				if (Parent(left) != i)
-					return false;
-				if (IsRed(i) && IsRed(left))
-					return false;
-			}
-		}
-
-		if (it == m_LastAlloc)
-			break;
-	}
-	if (numFree2 != numFree)
-		return false;
-
-	if (nElements != m_NumElements)
-		return false;
-
-#endif  
-
-	return true;
-}
-
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::SetLessFunc(const typename CUtlRBTree<T, I, L, M>::LessFunc_t& func)
-{
-	if (!m_LessFunc)
-	{
-		m_LessFunc = func;
-	}
-	else if (Count() > 0)
-	{
-		Assert(0);
-	}
-}
-
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::FindInsertionPosition(T const& insert, I& parent, bool& leftchild)
-{
-	Assert(!!m_LessFunc);
-
-	I current = m_Root;
-	parent = InvalidIndex();
-	leftchild = false;
-	while (current != InvalidIndex())
-	{
-		parent = current;
-		if (m_LessFunc(insert, Element(current)))
-		{
-			leftchild = true; current = LeftChild(current);
-		}
-		else
-		{
-			leftchild = false; current = RightChild(current);
-		}
-	}
-}
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::Insert(T const& insert)
-{
-	I parent = InvalidIndex();
-	bool leftchild = false;
-	FindInsertionPosition(insert, parent, leftchild);
-	I newNode = InsertAt(parent, leftchild);
-	CopyConstruct(&Element(newNode), insert);
-	return newNode;
-}
-
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::Insert(const T* pArray, int nItems)
-{
-	while (nItems--)
-	{
-		Insert(*pArray++);
-	}
-}
-
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::InsertIfNotFound(T const& insert)
-{
-	I parent;
-	bool leftchild;
-
-	I current = m_Root;
-	parent = InvalidIndex();
-	leftchild = false;
-	while (current != InvalidIndex())
-	{
-		parent = current;
-		if (m_LessFunc(insert, Element(current)))
-		{
-			leftchild = true; current = LeftChild(current);
-		}
-		else if (m_LessFunc(Element(current), insert))
-		{
-			leftchild = false; current = RightChild(current);
-		}
-		else
-			return InvalidIndex();
-	}
-
-	I newNode = InsertAt(parent, leftchild);
-	CopyConstruct(&Element(newNode), insert);
-	return newNode;
-}
-
-
-template < class T, class I, typename L, class M >
-I CUtlRBTree<T, I, L, M>::Find(T const& search) const
-{
-	Assert(!!m_LessFunc);
-
-	I current = m_Root;
-	while (current != InvalidIndex())
-	{
-		if (m_LessFunc(search, Element(current)))
-			current = LeftChild(current);
-		else if (m_LessFunc(Element(current), search))
-			current = RightChild(current);
-		else
-			break;
-	}
-	return current;
-}
-
-
-template <class T, class I, typename L, class E>
-I CUtlRBTree<T, I, L, E>::FindFirst(T const& search) const
-{
-	Assert(!!m_LessFunc);
-
-	I current = m_Root;
-	I best = InvalidIndex();
-	while (current != InvalidIndex())
-	{
-		if (m_LessFunc(search, Element(current)))
-			current = LeftChild(current);
-		else if (m_LessFunc(Element(current), search))
-			current = RightChild(current);
-		else
-		{
-			best = current;
-			current = LeftChild(current);
-		}
-	}
-	return best;
-}
-
-
-template <class T, class I, typename L, class E>
-I CUtlRBTree<T, I, L, E>::FindClosest(T const& search, CompareOperands_t eFindCriteria) const
-{
-	Assert(!!m_LessFunc);
-	Assert((eFindCriteria & (k_EGreaterThan | k_ELessThan)) ^ (k_EGreaterThan | k_ELessThan));
-
-	I current = m_Root;
-	I best = InvalidIndex();
-
-	while (current != InvalidIndex())
-	{
-		if (m_LessFunc(search, Element(current)))
-		{
-			if (eFindCriteria & k_EGreaterThan)
-				best = current;
-			current = LeftChild(current);
-		}
-		else if (m_LessFunc(Element(current), search))
-		{
-			if (eFindCriteria & k_ELessThan)
-				best = current;
-			current = RightChild(current);
-		}
-		else
-		{
-			if (eFindCriteria & k_EEqual)
-			{
-				best = current;
-				break;
-			}
-			else if (eFindCriteria & k_EGreaterThan)
-			{
-				current = RightChild(current);
-			}
-			else if (eFindCriteria & k_ELessThan)
-			{
-				current = LeftChild(current);
-			}
-		}
-	}
-	return best;
-}
-
-
-template < class T, class I, typename L, class M >
-void CUtlRBTree<T, I, L, M>::Swap(CUtlRBTree< T, I, L >& that)
-{
-	m_Elements.Swap(that.m_Elements);
-	V_swap(m_LessFunc, that.m_LessFunc);
-	V_swap(m_Root, that.m_Root);
-	V_swap(m_NumElements, that.m_NumElements);
-	V_swap(m_FirstFree, that.m_FirstFree);
-	V_swap(m_pElements, that.m_pElements);
-	V_swap(m_LastAlloc, that.m_LastAlloc);
-	Assert(IsValid());
-	Assert(m_Elements.IsValidIterator(m_LastAlloc) || (m_NumElements == 0 && m_FirstFree == InvalidIndex()));
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlsoacontainer.h b/SpyCustom/utlsoacontainer.h
deleted file mode 100644
index 02b6a8a..0000000
--- a/SpyCustom/utlsoacontainer.h
+++ /dev/null
@@ -1,300 +0,0 @@
-#ifndef UTLSOACONTAINER_H
-#define UTLSOACONTAINER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "platform.h"
-#include "dbg.h"
-#include "threadtools.h"
-#include "utlmemory.h"
-#include "utlblockmemory.h"
-#include "ssemath.h"
-
-
-template<class T> class CStridedPtr
-{
-protected:
-	T* m_pData;
-	size_t m_nStride;
-
-public:
-	FORCEINLINE CStridedPtr<T>(void* pData, size_t nByteStride)
-	{
-		m_pData = reinterpret_cast<T*>(pData);
-		m_nStride = nByteStride / sizeof(T);
-	}
-
-	FORCEINLINE CStridedPtr<T>(void) {}
-	T* operator->(void) const
-	{
-		return m_pData;
-	}
-
-	T& operator*(void) const
-	{
-		return *m_pData;
-	}
-
-	FORCEINLINE operator T* (void)
-	{
-		return m_pData;
-	}
-
-	FORCEINLINE CStridedPtr<T>& operator++(void)
-	{
-		m_pData += m_nStride;
-		return *this;
-	}
-
-	FORCEINLINE void operator+=(size_t nNumElements)
-	{
-		m_pData += nNumElements * m_nStride;
-	}
-
-};
-
-template<class T> class CStridedConstPtr
-{
-protected:
-	const T* m_pData;
-	size_t m_nStride;
-
-public:
-	FORCEINLINE CStridedConstPtr<T>(void const* pData, size_t nByteStride)
-	{
-		m_pData = reinterpret_cast<T const*>(pData);
-		m_nStride = nByteStride / sizeof(T);
-	}
-
-	FORCEINLINE CStridedConstPtr<T>(void) {}
-
-	const T* operator->(void) const
-	{
-		return m_pData;
-	}
-
-	const T& operator*(void) const
-	{
-		return *m_pData;
-	}
-
-	FORCEINLINE operator const T* (void) const
-	{
-		return m_pData;
-	}
-
-	FORCEINLINE CStridedConstPtr<T>& operator++(void)
-	{
-		m_pData += m_nStride;
-		return *this;
-	}
-	FORCEINLINE void operator+=(size_t nNumElements)
-	{
-		m_pData += nNumElements * m_nStride;
-	}
-};
-
-enum EAttributeDataType
-{
-	ATTRDATATYPE_FLOAT = 0,									   
-	ATTRDATATYPE_4V = 1,									       
-	ATTRDATATYPE_INT = 2,									     
-															ATTRDATATYPE_POINTER = 3,								  
-															ATTRDATATYPE_NONE = -1,									    
-};
-
-#define MAX_SOA_FIELDS 32
-
-class CSOAContainer
-{
-
-protected:
-	int m_nColumns;											       
-	int m_nRows;
-	int m_nSlices;
-
-	int m_nPaddedColumns;									       
-	int m_nNumQuadsPerRow;									        
-
-	uint8* m_pDataMemory;									    
-	uint8* m_pAttributePtrs[MAX_SOA_FIELDS];
-
-	EAttributeDataType m_nDataType[MAX_SOA_FIELDS];
-
-	size_t m_nStrideInBytes[MAX_SOA_FIELDS];			         
-	size_t m_nRowStrideInBytes[MAX_SOA_FIELDS];			           
-	size_t m_nSliceStrideInBytes[MAX_SOA_FIELDS];                  
-
-
-
-	uint32 m_nFieldPresentMask;
-
-	FORCEINLINE void Init(void)
-	{
-		memset(m_nDataType, 0xff, sizeof(m_nDataType));
-		m_pDataMemory = 0;
-		m_nColumns = m_nPaddedColumns = m_nRows = m_nSlices = 0;
-		m_nFieldPresentMask = 0;
-	}
-public:
-
-
-	CSOAContainer(void)									      
-	{
-		Init();
-	}
-
-	void Purge(void);										       
-
-	~CSOAContainer(void);
-
-	CSOAContainer(int nCols, int nRows, ...);
-
-	size_t ElementSize(void) const;					       
-
-	FORCEINLINE void SetAttributeType(int nAttrIdx, EAttributeDataType nDataType, bool bAllocateMemory = true)
-	{
-		Assert(!m_pDataMemory);							     
-		Assert(nAttrIdx < MAX_SOA_FIELDS);
-		m_nDataType[nAttrIdx] = nDataType;
-		if ((m_nDataType[nAttrIdx] != ATTRDATATYPE_NONE) && bAllocateMemory)
-			m_nFieldPresentMask |= (1 << nAttrIdx);
-		else
-			m_nFieldPresentMask &= ~(1 << nAttrIdx);
-	}
-
-	FORCEINLINE int NumRows(void) const
-	{
-		return m_nRows;
-	}
-
-	FORCEINLINE int NumCols(void) const
-	{
-		return m_nColumns;
-	}
-	FORCEINLINE int NumSlices(void) const
-	{
-		return m_nSlices;
-	}
-
-
-	FORCEINLINE void AssertDataType(int nAttrIdx, EAttributeDataType nDataType) const
-	{
-		Assert(nAttrIdx >= 0);
-		Assert(nAttrIdx < MAX_SOA_FIELDS);
-		Assert(m_nStrideInBytes[nAttrIdx]);
-	}
-
-
-	FORCEINLINE int NumQuadsPerRow(void) const
-	{
-		return m_nNumQuadsPerRow;
-	}
-
-	FORCEINLINE int Count(void) const						   
-	{
-		return NumCols();
-	}
-
-	FORCEINLINE int NumElements(void) const
-	{
-		return NumCols() * NumRows() * NumSlices();
-	}
-
-
-	FORCEINLINE size_t RowToRowStep(int nAttrIdx) const
-	{
-		return 0;
-	}
-
-	FORCEINLINE void* RowPtr(int nAttributeIdx, int nRowNumber, int nSliceNumber = 0) const
-	{
-		Assert(nRowNumber < m_nRows);
-		Assert(nAttributeIdx < MAX_SOA_FIELDS);
-		Assert(m_nDataType[nAttributeIdx] != ATTRDATATYPE_NONE);
-		Assert(m_nFieldPresentMask & (1 << nAttributeIdx));
-		return m_pAttributePtrs[nAttributeIdx] +
-			+nRowNumber * m_nRowStrideInBytes[nAttributeIdx]
-			+ nSliceNumber * m_nSliceStrideInBytes[nAttributeIdx];
-	}
-
-	FORCEINLINE void const* ConstRowPtr(int nAttributeIdx, int nRowNumber, int nSliceNumber = 0) const
-	{
-		Assert(nRowNumber < m_nRows);
-		Assert(nAttributeIdx < MAX_SOA_FIELDS);
-		Assert(m_nDataType[nAttributeIdx] != ATTRDATATYPE_NONE);
-		return m_pAttributePtrs[nAttributeIdx]
-			+ nRowNumber * m_nRowStrideInBytes[nAttributeIdx]
-			+ nSliceNumber * m_nSliceStrideInBytes[nAttributeIdx];
-	}
-
-
-	template<class T> FORCEINLINE T* ElementPointer(int nAttributeIdx,
-		int nX = 0, int nY = 0, int nZ = 0) const
-	{
-		Assert(nAttributeIdx < MAX_SOA_FIELDS);
-		Assert(nX < m_nColumns);
-		Assert(nY < m_nRows);
-		Assert(nZ < m_nSlices);
-		Assert(m_nDataType[nAttributeIdx] != ATTRDATATYPE_NONE);
-		Assert(m_nDataType[nAttributeIdx] != ATTRDATATYPE_4V);
-		return reinterpret_cast<T*>(m_pAttributePtrs[nAttributeIdx]
-			+ nX * sizeof(float)
-			+ nY * m_nRowStrideInBytes[nAttributeIdx]
-			+ nZ * m_nSliceStrideInBytes[nAttributeIdx]
-			);
-	}
-
-	FORCEINLINE size_t ItemByteStride(int nAttributeIdx) const
-	{
-		Assert(nAttributeIdx < MAX_SOA_FIELDS);
-		Assert(m_nDataType[nAttributeIdx] != ATTRDATATYPE_NONE);
-		return m_nStrideInBytes[nAttributeIdx];
-	}
-
-	void CopyAttrFrom(CSOAContainer const& other, int nAttributeIdx);
-
-	void CopyAttrToAttr(int nSrcAttributeIndex, int nDestAttributeIndex);
-
-	FORCEINLINE void MoveDataFrom(CSOAContainer other)
-	{
-		(*this) = other;
-		other.Init();
-	}
-
-
-
-	void AllocateData(int nNCols, int nNRows, int nSlices = 1);          
-
-	void RandomizeAttribute(int nAttr, float flMin, float flMax) const;
-
-	void FillAttrWithInterpolatedValues(int nAttr, float flValue00, float flValue10, float flValue01, float flValue11) const;
-	void FillAttrWithInterpolatedValues(int nAttr, Vector flValue00, Vector flValue10,
-		Vector const& flValue01, Vector const& flValue11) const;
-
-};
-
-class CFltX4AttributeIterator : public CStridedConstPtr<fltx4>
-{
-	FORCEINLINE CFltX4AttributeIterator(CSOAContainer const* pContainer, int nAttribute, int nRowNumber = 0)
-		: CStridedConstPtr<fltx4>(pContainer->ConstRowPtr(nAttribute, nRowNumber),
-			pContainer->ItemByteStride(nAttribute))
-	{
-	}
-};
-
-class CFltX4AttributeWriteIterator : public CStridedPtr<fltx4>
-{
-	FORCEINLINE CFltX4AttributeWriteIterator(CSOAContainer const* pContainer, int nAttribute, int nRowNumber = 0)
-		: CStridedPtr<fltx4>(pContainer->RowPtr(nAttribute, nRowNumber),
-			pContainer->ItemByteStride(nAttribute))
-	{
-	}
-
-};
-
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/utlstack.h b/SpyCustom/utlstack.h
deleted file mode 100644
index 6c549bf..0000000
--- a/SpyCustom/utlstack.h
+++ /dev/null
@@ -1,238 +0,0 @@
-#ifndef UTLSTACK_H
-#define UTLSTACK_H
-
-#include <assert.h>
-#include <string.h>
-#include "utlmemory.h"
-
-
-template< class T, class M = CUtlMemory< T > >
-class CUtlStack
-{
-public:
-	CUtlStack(int growSize = 0, int initSize = 0);
-	~CUtlStack();
-
-	void CopyFrom(const CUtlStack<T, M>& from);
-
-	T& operator[](int i);
-	T const& operator[](int i) const;
-	T& Element(int i);
-	T const& Element(int i) const;
-
-	T* Base();
-	T const* Base() const;
-
-	T& Top();
-	T const& Top() const;
-
-	int Count() const;
-
-	bool IsIdxValid(int i) const;
-
-	int Push();
-
-	int Push(T const& src);
-
-	void Pop();
-	void Pop(T& oldTop);
-	void PopMultiple(int num);
-
-	void EnsureCapacity(int num);
-
-	void Clear();
-
-	void Purge();
-
-private:
-	void GrowStack();
-
-	void ResetDbgInfo();
-
-	M m_Memory;
-	int m_Size;
-
-	T* m_pElements;
-};
-
-
-template< class T, class M >
-inline void CUtlStack<T, M>::ResetDbgInfo()
-{
-	m_pElements = m_Memory.Base();
-}
-
-template< class T, class M >
-CUtlStack<T, M>::CUtlStack(int growSize, int initSize) :
-	m_Memory(growSize, initSize), m_Size(0)
-{
-	ResetDbgInfo();
-}
-
-template< class T, class M >
-CUtlStack<T, M>::~CUtlStack()
-{
-	Purge();
-}
-
-
-template< class T, class M >
-void CUtlStack<T, M>::CopyFrom(const CUtlStack<T, M>& from)
-{
-	Purge();
-	EnsureCapacity(from.Count());
-	for (int i = 0; i < from.Count(); i++)
-	{
-		Push(from[i]);
-	}
-}
-
-template< class T, class M >
-inline T& CUtlStack<T, M>::operator[](int i)
-{
-	assert(IsIdxValid(i));
-	return m_Memory[i];
-}
-
-template< class T, class M >
-inline T const& CUtlStack<T, M>::operator[](int i) const
-{
-	assert(IsIdxValid(i));
-	return m_Memory[i];
-}
-
-template< class T, class M >
-inline T& CUtlStack<T, M>::Element(int i)
-{
-	assert(IsIdxValid(i));
-	return m_Memory[i];
-}
-
-template< class T, class M >
-inline T const& CUtlStack<T, M>::Element(int i) const
-{
-	assert(IsIdxValid(i));
-	return m_Memory[i];
-}
-
-
-template< class T, class M >
-inline T* CUtlStack<T, M>::Base()
-{
-	return m_Memory.Base();
-}
-
-template< class T, class M >
-inline T const* CUtlStack<T, M>::Base() const
-{
-	return m_Memory.Base();
-}
-
-template< class T, class M >
-inline T& CUtlStack<T, M>::Top()
-{
-	assert(m_Size > 0);
-	return Element(m_Size - 1);
-}
-
-template< class T, class M >
-inline T const& CUtlStack<T, M>::Top() const
-{
-	assert(m_Size > 0);
-	return Element(m_Size - 1);
-}
-
-template< class T, class M >
-inline int CUtlStack<T, M>::Count() const
-{
-	return m_Size;
-}
-
-
-template< class T, class M >
-inline bool CUtlStack<T, M>::IsIdxValid(int i) const
-{
-	return (i >= 0) && (i < m_Size);
-}
-
-template< class T, class M >
-void CUtlStack<T, M>::GrowStack()
-{
-	if (m_Size >= m_Memory.NumAllocated())
-		m_Memory.Grow();
-
-	++m_Size;
-
-	ResetDbgInfo();
-}
-
-template< class T, class M >
-void CUtlStack<T, M>::EnsureCapacity(int num)
-{
-	m_Memory.EnsureCapacity(num);
-	ResetDbgInfo();
-}
-
-
-template< class T, class M >
-int CUtlStack<T, M>::Push()
-{
-	GrowStack();
-	Construct(&Element(m_Size - 1));
-	return m_Size - 1;
-}
-
-template< class T, class M >
-int CUtlStack<T, M>::Push(T const& src)
-{
-	GrowStack();
-	CopyConstruct(&Element(m_Size - 1), src);
-	return m_Size - 1;
-}
-
-
-template< class T, class M >
-void CUtlStack<T, M>::Pop()
-{
-	assert(m_Size > 0);
-	Destruct(&Element(m_Size - 1));
-	--m_Size;
-}
-
-template< class T, class M >
-void CUtlStack<T, M>::Pop(T& oldTop)
-{
-	assert(m_Size > 0);
-	oldTop = Top();
-	Pop();
-}
-
-template< class T, class M >
-void CUtlStack<T, M>::PopMultiple(int num)
-{
-	assert(m_Size >= num);
-	for (int i = 0; i < num; ++i)
-		Destruct(&Element(m_Size - i - 1));
-	m_Size -= num;
-}
-
-
-template< class T, class M >
-void CUtlStack<T, M>::Clear()
-{
-	for (int i = m_Size; --i >= 0; )
-		Destruct(&Element(i));
-
-	m_Size = 0;
-}
-
-
-template< class T, class M >
-void CUtlStack<T, M>::Purge()
-{
-	Clear();
-	m_Memory.Purge();
-	ResetDbgInfo();
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlstring.h b/SpyCustom/utlstring.h
deleted file mode 100644
index e00e143..0000000
--- a/SpyCustom/utlstring.h
+++ /dev/null
@@ -1,331 +0,0 @@
-#ifndef UTLSTRING_H
-#define UTLSTRING_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "utlmemory.h"
-#include "strtools.h"
-#include "limits.h"
-
-#if defined( OSX )
-#define wcsdup wcsdup_osx
-inline wchar_t* wcsdup_osx(const wchar_t* pString)
-{
-	wchar_t* pMemory;
-
-	if (!pString)
-		return NULL;
-
-	size_t len = (wcslen(pString) + 1);
-	if ((pMemory = (wchar_t*)malloc(len * sizeof(wchar_t))) != NULL)
-	{
-		return wcscpy(pMemory, pString);
-	}
-
-	return NULL;
-}
-#endif
-
-class CUtlBinaryBlock
-{
-public:
-	CUtlBinaryBlock(int growSize = 0, int initSize = 0);
-
-	CUtlBinaryBlock(void* pMemory, int nSizeInBytes, int nInitialLength);
-	CUtlBinaryBlock(const void* pMemory, int nSizeInBytes);
-	CUtlBinaryBlock(const CUtlBinaryBlock& src);
-
-	void		Get(void* pValue, int nMaxLen) const;
-	void		Set(const void* pValue, int nLen);
-	const void* Get() const;
-	void* Get();
-
-	unsigned char& operator[](int i);
-	const unsigned char& operator[](int i) const;
-
-	int			Length() const;
-	void		SetLength(int nLength);	    
-	bool		IsEmpty() const;
-	void		Clear();
-	void		Purge();
-
-	bool		IsReadOnly() const;
-
-	CUtlBinaryBlock& operator=(const CUtlBinaryBlock& src);
-
-	bool operator==(const CUtlBinaryBlock& src) const;
-
-private:
-	CUtlMemory<unsigned char> m_Memory;
-	int m_nActualLength;
-};
-
-
-inline const void* CUtlBinaryBlock::Get() const
-{
-	return m_Memory.Base();
-}
-
-inline void* CUtlBinaryBlock::Get()
-{
-	return m_Memory.Base();
-}
-
-inline int CUtlBinaryBlock::Length() const
-{
-	return m_nActualLength;
-}
-
-inline unsigned char& CUtlBinaryBlock::operator[](int i)
-{
-	return m_Memory[i];
-}
-
-inline const unsigned char& CUtlBinaryBlock::operator[](int i) const
-{
-	return m_Memory[i];
-}
-
-inline bool CUtlBinaryBlock::IsReadOnly() const
-{
-	return m_Memory.IsReadOnly();
-}
-
-inline bool CUtlBinaryBlock::IsEmpty() const
-{
-	return Length() == 0;
-}
-
-inline void CUtlBinaryBlock::Clear()
-{
-	SetLength(0);
-}
-
-inline void CUtlBinaryBlock::Purge()
-{
-	SetLength(0);
-	m_Memory.Purge();
-}
-
-
-class CUtlString
-{
-public:
-	typedef enum
-	{
-		PATTERN_NONE = 0x00000000,
-		PATTERN_DIRECTORY = 0x00000001
-	} TUtlStringPattern;
-
-public:
-	CUtlString();
-	CUtlString(const char* pString);
-	CUtlString(const CUtlString& string);
-
-	CUtlString(void* pMemory, int nSizeInBytes, int nInitialLength);
-	CUtlString(const void* pMemory, int nSizeInBytes);
-
-	const char* Get() const;
-	void		Set(const char* pValue);
-
-	void Clear() { Set(NULL); }
-
-	operator const char* () const;
-
-	const char* String() const { return Get(); }
-
-	int			Length() const;
-	bool		IsEmpty() const;
-
-	void		SetLength(int nLen);
-	char* Get();
-	void		Purge();
-
-	void		ToLower();
-	void		ToUpper();
-
-	void		Append(const char* pchAddition);
-
-	void		StripTrailingSlash();
-
-	CUtlString& operator=(const CUtlString& src);
-	CUtlString& operator=(const char* src);
-
-	bool operator==(const CUtlString& src) const;
-	bool operator==(const char* src) const;
-	bool operator!=(const CUtlString& src) const { return !operator==(src); }
-	bool operator!=(const char* src) const { return !operator==(src); }
-
-	inline friend bool operator==(const char* lhs, const CUtlString& rhs) { return rhs.operator==(lhs); }
-	inline friend bool operator!=(const char* lhs, const CUtlString& rhs) { return rhs.operator!=(lhs); }
-
-	CUtlString& operator+=(const CUtlString& rhs);
-	CUtlString& operator+=(const char* rhs);
-	CUtlString& operator+=(char c);
-	CUtlString& operator+=(int rhs);
-	CUtlString& operator+=(double rhs);
-
-	bool IsValid() const;
-
-	bool MatchesPattern(const CUtlString& Pattern, int nFlags = 0);		         
-
-	int Format(PRINTF_FORMAT_STRING const char* pFormat, ...);
-	void SetDirect(const char* pValue, int nChars);
-
-	typedef const char* AltArgumentType_t;
-
-	CUtlString Slice(int32 nStart = 0, int32 nEnd = INT_MAX);
-
-	CUtlString Left(int32 nChars);
-	CUtlString Right(int32 nChars);
-
-	CUtlString Replace(char cFrom, char cTo);
-
-	CUtlString AbsPath(const char* pStartingDir = NULL);
-
-	CUtlString UnqualifiedFilename();
-
-	CUtlString DirName();
-
-	static CUtlString PathJoin(const char* pStr1, const char* pStr2);
-
-	static int __cdecl SortCaseInsensitive(const CUtlString* pString1, const CUtlString* pString2);
-	static int __cdecl SortCaseSensitive(const CUtlString* pString1, const CUtlString* pString2);
-
-private:
-	CUtlBinaryBlock m_Storage;
-};
-
-inline bool CUtlString::IsEmpty() const
-{
-	return Length() == 0;
-}
-
-inline bool CUtlString::IsValid() const
-{
-	return (String() != NULL);
-}
-
-inline int __cdecl CUtlString::SortCaseInsensitive(const CUtlString* pString1, const CUtlString* pString2)
-{
-	return V_stricmp(pString1->String(), pString2->String());
-}
-
-inline int __cdecl CUtlString::SortCaseSensitive(const CUtlString* pString1, const CUtlString* pString2)
-{
-	return V_strcmp(pString1->String(), pString2->String());
-}
-
-template < typename T >
-class StringFuncs
-{
-public:
-	static T* Duplicate(const T* pValue);
-	static void		 Copy(T* out_pOut, const T* pIn, int iLengthInChars);
-	static int		 Compare(const T* pLhs, const T* pRhs);
-	static int		 CaselessCompare(const T* pLhs, const T* pRhs);
-	static int		 Length(const T* pValue);
-	static const T* FindChar(const T* pStr, const T cSearch);
-	static const T* EmptyString();
-	static const T* NullDebugString();
-};
-
-template < >
-class StringFuncs<char>
-{
-public:
-	static char* Duplicate(const char* pValue) { return strdup(pValue); }
-	static void		   Copy(OUT_CAP(iLengthInChars) char* out_pOut, const char* pIn, int iLengthInChars) { strncpy(out_pOut, pIn, iLengthInChars); }
-	static int		   Compare(const char* pLhs, const char* pRhs) { return strcmp(pLhs, pRhs); }
-	static int		   CaselessCompare(const char* pLhs, const char* pRhs) { return Q_strcasecmp(pLhs, pRhs); }
-	static int		   Length(const char* pValue) { return (int)strlen(pValue); }
-	static const char* FindChar(const char* pStr, const char cSearch) { return strchr(pStr, cSearch); }
-	static const char* EmptyString() { return ""; }
-	static const char* NullDebugString() { return "(null)"; }
-};
-
-template < >
-class StringFuncs<wchar_t>
-{
-public:
-	static wchar_t* Duplicate(const wchar_t* pValue) { return wcsdup(pValue); }
-	static void			  Copy(OUT_CAP(iLengthInChars) wchar_t* out_pOut, const wchar_t* pIn, int iLengthInChars) { wcsncpy(out_pOut, pIn, iLengthInChars); }
-	static int			  Compare(const wchar_t* pLhs, const wchar_t* pRhs) { return wcscmp(pLhs, pRhs); }
-	static int			  CaselessCompare(const wchar_t* pLhs, const wchar_t* pRhs);   
-	static int			  Length(const wchar_t* pValue) { return (int)wcslen(pValue); }
-	static const wchar_t* FindChar(const wchar_t* pStr, const wchar_t cSearch) { return wcschr(pStr, cSearch); }
-	static const wchar_t* EmptyString() { return L""; }
-	static const wchar_t* NullDebugString() { return L"(null)"; }
-};
-
-template < typename T = char >
-class CUtlConstStringBase
-{
-public:
-	CUtlConstStringBase() : m_pString(NULL) {}
-	explicit CUtlConstStringBase(const T* pString) : m_pString(NULL) { Set(pString); }
-	CUtlConstStringBase(const CUtlConstStringBase& src) : m_pString(NULL) { Set(src.m_pString); }
-	~CUtlConstStringBase() { Set(NULL); }
-
-	void Set(const T* pValue);
-	void Clear() { Set(NULL); }
-
-	const T* Get() const { return m_pString ? m_pString : StringFuncs<T>::EmptyString(); }
-	operator const T* () const { return m_pString ? m_pString : StringFuncs<T>::EmptyString(); }
-
-	bool IsEmpty() const { return m_pString == NULL; }         
-
-	int Compare(const T* rhs) const;
-
-	bool operator<(const T* rhs) const { return Compare(rhs) < 0; }
-	bool operator==(const T* rhs) const { return Compare(rhs) == 0; }
-	bool operator!=(const T* rhs) const { return Compare(rhs) != 0; }
-	bool operator<(const CUtlConstStringBase& rhs) const { return Compare(rhs.m_pString) < 0; }
-	bool operator==(const CUtlConstStringBase& rhs) const { return Compare(rhs.m_pString) == 0; }
-	bool operator!=(const CUtlConstStringBase& rhs) const { return Compare(rhs.m_pString) != 0; }
-
-	inline friend bool operator<(const T* lhs, const CUtlConstStringBase& rhs) { return rhs.Compare(lhs) > 0; }
-	inline friend bool operator==(const T* lhs, const CUtlConstStringBase& rhs) { return rhs.Compare(lhs) == 0; }
-	inline friend bool operator!=(const T* lhs, const CUtlConstStringBase& rhs) { return rhs.Compare(lhs) != 0; }
-
-	CUtlConstStringBase& operator=(const T* src) { Set(src); return *this; }
-	CUtlConstStringBase& operator=(const CUtlConstStringBase& src) { Set(src.m_pString); return *this; }
-
-	typedef const T* AltArgumentType_t;
-
-protected:
-	const T* m_pString;
-};
-
-template < typename T >
-void CUtlConstStringBase<T>::Set(const T* pValue)
-{
-	if (pValue != m_pString)
-	{
-		free((void*)m_pString);
-		m_pString = pValue && pValue[0] ? StringFuncs<T>::Duplicate(pValue) : NULL;
-	}
-}
-
-template < typename T >
-int CUtlConstStringBase<T>::Compare(const T* rhs) const
-{
-	if (!rhs || !rhs[0])
-		return m_pString ? 1 : 0;
-
-	if (!m_pString)
-		return -1;
-
-	return StringFuncs<T>::Compare(m_pString, rhs);
-}
-
-typedef	CUtlConstStringBase<char>		CUtlConstString;
-typedef	CUtlConstStringBase<wchar_t>	CUtlConstWideString;
-
-template < typename T > struct UTLConstStringCaselessStringLessFunctor { bool operator()(const CUtlConstStringBase<T>& a, const char* b) const { return StringFuncs<T>::CaselessCompare(a.Get(), b) < 0; } };
-template < typename T > struct UTLConstStringCaselessStringEqualFunctor { bool operator()(const CUtlConstStringBase<T>& a, const char* b) const { return StringFuncs<T>::CaselessCompare(a.Get(), b) == 0; } };
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlsymbol.h b/SpyCustom/utlsymbol.h
deleted file mode 100644
index ea8ca8d..0000000
--- a/SpyCustom/utlsymbol.h
+++ /dev/null
@@ -1,210 +0,0 @@
-#ifndef UTLSYMBOL_H
-#define UTLSYMBOL_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "threadtools.h"
-#include "utlrbtree.h"
-#include "utlvector.h"
-
-
-class CUtlSymbolTable;
-class CUtlSymbolTableMT;
-
-
-typedef unsigned short UtlSymId_t;
-
-#define UTL_INVAL_SYMBOL  ((UtlSymId_t)~0)
-
-class CUtlSymbol
-{
-public:
-	CUtlSymbol() : m_Id(UTL_INVAL_SYMBOL) {}
-	CUtlSymbol(UtlSymId_t id) : m_Id(id) {}
-	CUtlSymbol(const char* pStr);
-	CUtlSymbol(CUtlSymbol const& sym) : m_Id(sym.m_Id) {}
-
-	CUtlSymbol& operator=(CUtlSymbol const& src) { m_Id = src.m_Id; return *this; }
-
-	bool operator==(CUtlSymbol const& src) const { return m_Id == src.m_Id; }
-	bool operator==(const char* pStr) const;
-
-	bool IsValid() const { return m_Id != UTL_INVAL_SYMBOL; }
-
-	operator UtlSymId_t const() const { return m_Id; }
-
-	const char* String() const;
-
-	static void DisableStaticSymbolTable();
-
-protected:
-	UtlSymId_t   m_Id;
-
-	static void Initialize();
-
-	static CUtlSymbolTableMT* CurrTable();
-
-	static CUtlSymbolTableMT* s_pSymbolTable;
-
-	static bool s_bAllowStaticSymbolTable;
-
-	friend class CCleanupUtlSymbolTable;
-};
-
-
-class CUtlSymbolTable
-{
-public:
-	CUtlSymbolTable(int growSize = 0, int initSize = 32, bool caseInsensitive = false);
-	~CUtlSymbolTable();
-
-	CUtlSymbol AddString(const char* pString);
-
-	CUtlSymbol Find(const char* pString) const;
-
-	const char* String(CUtlSymbol id) const;
-
-	void  RemoveAll();
-
-	int GetNumStrings(void) const
-	{
-		return m_Lookup.Count();
-	}
-
-protected:
-	class CStringPoolIndex
-	{
-	public:
-		inline CStringPoolIndex()
-		{
-		}
-
-		inline CStringPoolIndex(unsigned short iPool, unsigned short iOffset)
-		{
-			m_iPool = iPool;
-			m_iOffset = iOffset;
-		}
-
-		inline bool operator==(const CStringPoolIndex& other)	const
-		{
-			return m_iPool == other.m_iPool && m_iOffset == other.m_iOffset;
-		}
-
-		unsigned short m_iPool;		   
-		unsigned short m_iOffset;	     
-	};
-
-	class CLess
-	{
-	public:
-		CLess(int ignored = 0) {}        
-		bool operator!() const { return false; }
-		bool operator()(const CStringPoolIndex& left, const CStringPoolIndex& right) const;
-	};
-
-	class CTree : public CUtlRBTree<CStringPoolIndex, unsigned short, CLess>
-	{
-	public:
-		CTree(int growSize, int initSize) : CUtlRBTree<CStringPoolIndex, unsigned short, CLess>(growSize, initSize) {}
-		friend class CUtlSymbolTable::CLess;           
-	};
-
-	struct StringPool_t
-	{
-		int m_TotalLen;		    
-		int m_SpaceUsed;
-		char m_Data[1];
-	};
-
-	CTree m_Lookup;
-	bool m_bInsensitive;
-	mutable const char* m_pUserSearchString;
-
-	CUtlVector<StringPool_t*> m_StringPools;
-
-private:
-	int FindPoolWithSpace(int len) const;
-	const char* StringFromIndex(const CStringPoolIndex& index) const;
-
-	friend class CLess;
-};
-
-class CUtlSymbolTableMT : private CUtlSymbolTable
-{
-public:
-	CUtlSymbolTableMT(int growSize = 0, int initSize = 32, bool caseInsensitive = false)
-		: CUtlSymbolTable(growSize, initSize, caseInsensitive)
-	{
-	}
-
-	CUtlSymbol AddString(const char* pString)
-	{
-		m_lock.LockForWrite();
-		CUtlSymbol result = CUtlSymbolTable::AddString(pString);
-		m_lock.UnlockWrite();
-		return result;
-	}
-
-	CUtlSymbol Find(const char* pString) const
-	{
-		m_lock.LockForRead();
-		CUtlSymbol result = CUtlSymbolTable::Find(pString);
-		m_lock.UnlockRead();
-		return result;
-	}
-
-	const char* String(CUtlSymbol id) const
-	{
-		m_lock.LockForRead();
-		const char* pszResult = CUtlSymbolTable::String(id);
-		m_lock.UnlockRead();
-		return pszResult;
-	}
-
-private:
-#if defined(WIN32) || defined(_WIN32)
-	mutable CThreadSpinRWLock m_lock;
-#else
-	mutable CThreadRWLock m_lock;
-#endif
-};
-
-
-
-typedef void* FileNameHandle_t;
-#define FILENAMEHANDLE_INVALID 0
-
-class CUtlFilenameSymbolTable
-{
-	struct FileNameHandleInternal_t
-	{
-		FileNameHandleInternal_t()
-		{
-			path = 0;
-			file = 0;
-		}
-
-		unsigned short path;
-		unsigned short file;
-	};
-
-	class HashTable;
-
-public:
-	CUtlFilenameSymbolTable();
-	~CUtlFilenameSymbolTable();
-	FileNameHandle_t	FindOrAddFileName(const char* pFileName);
-	FileNameHandle_t	FindFileName(const char* pFileName);
-	int					PathIndex(const FileNameHandle_t& handle) { return ((const FileNameHandleInternal_t*)&handle)->path; }
-	bool				String(const FileNameHandle_t& handle, char* buf, int buflen);
-	void				RemoveAll();
-
-private:
-	HashTable* m_Strings;
-	mutable CThreadSpinRWLock m_lock;
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlsymbollarge.h b/SpyCustom/utlsymbollarge.h
deleted file mode 100644
index 826192f..0000000
--- a/SpyCustom/utlsymbollarge.h
+++ /dev/null
@@ -1,424 +0,0 @@
-#ifndef UTLSYMBOLLARGE_H
-#define UTLSYMBOLLARGE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "threadtools.h"
-#include "utltshash.h"
-#include "stringpool.h"
-#include "vprof.h"
-#include "utltshash.h"
-
-typedef intp UtlSymLargeId_t;
-
-#define UTL_INVAL_SYMBOL_LARGE  ((UtlSymLargeId_t)~0)
-
-class CUtlSymbolLarge
-{
-public:
-	CUtlSymbolLarge()
-	{
-		u.m_Id = UTL_INVAL_SYMBOL_LARGE;
-	}
-
-	CUtlSymbolLarge(UtlSymLargeId_t id)
-	{
-		u.m_Id = id;
-	}
-	CUtlSymbolLarge(CUtlSymbolLarge const& sym)
-	{
-		u.m_Id = sym.u.m_Id;
-	}
-
-	CUtlSymbolLarge& operator=(CUtlSymbolLarge const& src)
-	{
-		u.m_Id = src.u.m_Id;
-		return *this;
-	}
-
-	bool operator==(CUtlSymbolLarge const& src) const
-	{
-		return u.m_Id == src.u.m_Id;
-	}
-
-	bool operator==(UtlSymLargeId_t const& src) const
-	{
-		return u.m_Id == src;
-	}
-
-	bool operator!=(CUtlSymbolLarge const& src) const
-	{
-		return u.m_Id != src.u.m_Id;
-	}
-
-	bool operator!=(UtlSymLargeId_t const& src) const
-	{
-		return u.m_Id != src;
-	}
-
-	operator UtlSymLargeId_t const() const
-	{
-		return u.m_Id;
-	}
-
-	inline const char* String() const
-	{
-		if (u.m_Id == UTL_INVAL_SYMBOL_LARGE)
-			return "";
-		return u.m_pAsString;
-	}
-
-	inline bool IsValid() const
-	{
-		return u.m_Id != UTL_INVAL_SYMBOL_LARGE ? true : false;
-	}
-
-private:
-	CUtlSymbolLarge(const char* pStr);                  
-	bool operator==(const char* pStr) const;                     
-
-	union
-	{
-		UtlSymLargeId_t m_Id;
-		char const* m_pAsString;
-	} u;
-};
-
-#define MIN_STRING_POOL_SIZE	2048
-
-inline uint32 CUtlSymbolLarge_Hash(bool CASEINSENSITIVE, const char* pString, int len)
-{
-	return (CASEINSENSITIVE ? HashStringCaseless(pString) : HashString(pString));
-}
-
-typedef uint32 LargeSymbolTableHashDecoration_t;
-
-struct CUtlSymbolTableLargeBaseTreeEntry_t
-{
-	LargeSymbolTableHashDecoration_t	m_Hash;
-	char								m_String[1];
-
-	bool IsEmpty() const
-	{
-		return ((m_Hash == 0) && (0 == m_String[0]));
-	}
-
-	char const* String() const
-	{
-		return (const char*)&m_String[0];
-	}
-
-	CUtlSymbolLarge ToSymbol() const
-	{
-		return reinterpret_cast<UtlSymLargeId_t>(String());
-	}
-
-	LargeSymbolTableHashDecoration_t HashValue() const
-	{
-		return m_Hash;
-	}
-};
-
-template< class TreeType, bool CASEINSENSITIVE >
-class CTreeEntryLess
-{
-public:
-	CTreeEntryLess(int ignored = 0) {}        
-	bool operator!() const { return false; }
-	bool operator()(CUtlSymbolTableLargeBaseTreeEntry_t* const& left, CUtlSymbolTableLargeBaseTreeEntry_t* const& right) const
-	{
-		if (left->m_Hash == right->m_Hash)
-		{
-			if (!CASEINSENSITIVE)
-				return strcmp(left->String(), right->String()) < 0;
-			else
-				return V_stricmp(left->String(), right->String()) < 0;
-		}
-		else
-		{
-			return left->m_Hash < right->m_Hash;
-		}
-	}
-};
-
-template< bool CASEINSENSITIVE >
-class CNonThreadsafeTree : public CUtlRBTree<CUtlSymbolTableLargeBaseTreeEntry_t*, intp, CTreeEntryLess< CNonThreadsafeTree< CASEINSENSITIVE >, CASEINSENSITIVE > >
-{
-public:
-	typedef CUtlRBTree<CUtlSymbolTableLargeBaseTreeEntry_t*, intp, CTreeEntryLess< CNonThreadsafeTree, CASEINSENSITIVE > > CNonThreadsafeTreeType;
-
-	CNonThreadsafeTree() :
-		CNonThreadsafeTreeType(0, 16)
-	{
-	}
-	inline void Commit()
-	{
-	}
-	inline intp Insert(CUtlSymbolTableLargeBaseTreeEntry_t* entry)
-	{
-		return CNonThreadsafeTreeType::Insert(entry);
-	}
-	inline intp Find(CUtlSymbolTableLargeBaseTreeEntry_t* entry) const
-	{
-		return CNonThreadsafeTreeType::Find(entry);
-	}
-	inline intp InvalidIndex() const
-	{
-		return CNonThreadsafeTreeType::InvalidIndex();
-	}
-	inline int GetElements(int nFirstElement, int nCount, CUtlSymbolLarge* pElements) const
-	{
-		CUtlVector< CUtlSymbolTableLargeBaseTreeEntry_t* > list;
-		list.EnsureCount(nCount);
-		for (int i = 0; i < nCount; ++i)
-		{
-			pElements[i] = CNonThreadsafeTreeType::Element(i)->ToSymbol();
-		}
-
-		return nCount;
-	}
-};
-
-template < int BUCKET_COUNT, class KEYTYPE, bool CASEINSENSITIVE >
-class CCThreadsafeTreeHashMethod
-{
-public:
-	static int Hash(const KEYTYPE& key, int nBucketMask)
-	{
-		uint32 nHash = key->HashValue();
-		return (nHash & nBucketMask);
-	}
-
-	static bool Compare(CUtlSymbolTableLargeBaseTreeEntry_t* const& lhs, CUtlSymbolTableLargeBaseTreeEntry_t* const& rhs)
-	{
-		if (lhs->m_Hash != rhs->m_Hash)
-			return false;
-		if (!CASEINSENSITIVE)
-		{
-			return (!Q_strcmp(lhs->String(), rhs->String()) ? true : false);
-		}
-
-		return (!Q_stricmp(lhs->String(), rhs->String()) ? true : false);
-	}
-};
-
-template < bool CASEINSENSITIVE >
-class CThreadsafeTree : public CUtlTSHash< CUtlSymbolTableLargeBaseTreeEntry_t*, 2048, CUtlSymbolTableLargeBaseTreeEntry_t*, CCThreadsafeTreeHashMethod< 2048, CUtlSymbolTableLargeBaseTreeEntry_t*, CASEINSENSITIVE > >
-{
-public:
-	typedef CUtlTSHash< CUtlSymbolTableLargeBaseTreeEntry_t*, 2048, CUtlSymbolTableLargeBaseTreeEntry_t*, CCThreadsafeTreeHashMethod< 2048, CUtlSymbolTableLargeBaseTreeEntry_t*, CASEINSENSITIVE > > CThreadsafeTreeType;
-
-	CThreadsafeTree() :
-		CThreadsafeTreeType(32)
-	{
-	}
-	inline void Commit()
-	{
-		CThreadsafeTreeType::Commit();
-	}
-	inline UtlTSHashHandle_t Insert(CUtlSymbolTableLargeBaseTreeEntry_t* entry)
-	{
-		return CThreadsafeTreeType::Insert(entry, entry);
-	}
-	inline UtlTSHashHandle_t Find(CUtlSymbolTableLargeBaseTreeEntry_t* entry)
-	{
-		return CThreadsafeTreeType::Find(entry);
-	}
-	inline UtlTSHashHandle_t InvalidIndex() const
-	{
-		return CThreadsafeTreeType::InvalidHandle();
-	}
-	inline int GetElements(UtlTSHashHandle_t nFirstElement, int nCount, CUtlSymbolLarge* pElements) const
-	{
-		CUtlVector< UtlTSHashHandle_t > list;
-		list.EnsureCount(nCount);
-		int c = CThreadsafeTreeType::GetElements(nFirstElement, nCount, list.Base());
-		for (int i = 0; i < c; ++i)
-		{
-			pElements[i] = CThreadsafeTreeType::Element(list[i])->ToSymbol();
-		}
-
-		return c;
-	}
-};
-
-template < class TreeType, bool CASEINSENSITIVE, size_t POOL_SIZE = MIN_STRING_POOL_SIZE >
-class CUtlSymbolTableLargeBase
-{
-public:
-	CUtlSymbolTableLargeBase();
-	~CUtlSymbolTableLargeBase();
-
-	CUtlSymbolLarge AddString(const char* pString);
-
-	CUtlSymbolLarge Find(const char* pString) const;
-
-	void  RemoveAll();
-
-	int GetNumStrings(void) const
-	{
-		return m_Lookup.Count();
-	}
-
-	void Commit()
-	{
-		m_Lookup.Commit();
-	}
-
-	int GetElements(int nFirstElement, int nCount, CUtlSymbolLarge* pElements) const
-	{
-		return m_Lookup.GetElements(nFirstElement, nCount, pElements);
-	}
-
-	const char* GetElementString(int nElement) const
-	{
-		return m_Lookup.Element(nElement)->String();
-	}
-
-	uint64 GetMemoryUsage() const
-	{
-		uint64 unBytesUsed = 0u;
-
-		for (int i = 0; i < m_StringPools.Count(); i++)
-		{
-			StringPool_t* pPool = m_StringPools[i];
-
-			unBytesUsed += (uint64)pPool->m_TotalLen;
-		}
-		return unBytesUsed;
-	}
-
-
-protected:
-
-	struct StringPool_t
-	{
-		int m_TotalLen;		    
-		int m_SpaceUsed;
-		char m_Data[1];
-	};
-
-	TreeType m_Lookup;
-
-	CUtlVector< StringPool_t* > m_StringPools;
-
-private:
-	int FindPoolWithSpace(int len) const;
-};
-
-template < class TreeType, bool CASEINSENSITIVE, size_t POOL_SIZE >
-inline CUtlSymbolTableLargeBase<TreeType, CASEINSENSITIVE, POOL_SIZE >::CUtlSymbolTableLargeBase() :
-	m_StringPools(8)
-{
-}
-
-template < class TreeType, bool CASEINSENSITIVE, size_t POOL_SIZE >
-inline CUtlSymbolTableLargeBase<TreeType, CASEINSENSITIVE, POOL_SIZE>::~CUtlSymbolTableLargeBase()
-{
-	RemoveAll();
-}
-
-template < class TreeType, bool CASEINSENSITIVE, size_t POOL_SIZE >
-inline CUtlSymbolLarge CUtlSymbolTableLargeBase<TreeType, CASEINSENSITIVE, POOL_SIZE>::Find(const char* pString) const
-{
-	VPROF("CUtlSymbolLarge::Find");
-	if (!pString)
-		return CUtlSymbolLarge();
-
-	int len = Q_strlen(pString) + 1;
-
-	CUtlSymbolTableLargeBaseTreeEntry_t* search = (CUtlSymbolTableLargeBaseTreeEntry_t*)_alloca(len + sizeof(LargeSymbolTableHashDecoration_t));
-	search->m_Hash = CUtlSymbolLarge_Hash(CASEINSENSITIVE, pString, len);
-	Q_memcpy((char*)&search->m_String[0], pString, len);
-
-	intp idx = const_cast<TreeType&>(m_Lookup).Find(search);
-
-	if (idx == m_Lookup.InvalidIndex())
-		return UTL_INVAL_SYMBOL_LARGE;
-
-	const CUtlSymbolTableLargeBaseTreeEntry_t* entry = m_Lookup[idx];
-	return entry->ToSymbol();
-}
-
-template < class TreeType, bool CASEINSENSITIVE, size_t POOL_SIZE >
-inline int CUtlSymbolTableLargeBase<TreeType, CASEINSENSITIVE, POOL_SIZE>::FindPoolWithSpace(int len)	const
-{
-	for (int i = 0; i < m_StringPools.Count(); i++)
-	{
-		StringPool_t* pPool = m_StringPools[i];
-
-		if ((pPool->m_TotalLen - pPool->m_SpaceUsed) >= len)
-		{
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-template < class TreeType, bool CASEINSENSITIVE, size_t POOL_SIZE >
-inline CUtlSymbolLarge CUtlSymbolTableLargeBase<TreeType, CASEINSENSITIVE, POOL_SIZE>::AddString(const char* pString)
-{
-	VPROF("CUtlSymbolLarge::AddString");
-	if (!pString)
-		return UTL_INVAL_SYMBOL_LARGE;
-
-	CUtlSymbolLarge id = Find(pString);
-	if (id != UTL_INVAL_SYMBOL_LARGE)
-		return id;
-
-	int lenString = Q_strlen(pString) + 1;      
-	int lenDecorated = lenString + sizeof(LargeSymbolTableHashDecoration_t);      
-	lenDecorated = ALIGN_VALUE(lenDecorated, sizeof(LargeSymbolTableHashDecoration_t));
-
-	int iPool = FindPoolWithSpace(lenDecorated);
-	if (iPool == -1)
-	{
-		int newPoolSize = MAX(lenDecorated + sizeof(StringPool_t), POOL_SIZE);
-		StringPool_t* pPool = (StringPool_t*)malloc(newPoolSize);
-
-		pPool->m_TotalLen = newPoolSize - sizeof(StringPool_t);
-		pPool->m_SpaceUsed = 0;
-		iPool = m_StringPools.AddToTail(pPool);
-	}
-
-	LargeSymbolTableHashDecoration_t hash = CUtlSymbolLarge_Hash(CASEINSENSITIVE, pString, lenString);
-
-	StringPool_t* pPool = m_StringPools[iPool];
-	CUtlSymbolTableLargeBaseTreeEntry_t* entry = (CUtlSymbolTableLargeBaseTreeEntry_t*)&pPool->m_Data[pPool->m_SpaceUsed];
-
-	pPool->m_SpaceUsed += lenDecorated;
-
-	entry->m_Hash = hash;
-	char* pText = (char*)&entry->m_String[0];
-	Q_memcpy(pText, pString, lenString);
-
-	MEM_ALLOC_CREDIT();
-	return m_Lookup.Element(m_Lookup.Insert(entry))->ToSymbol();
-}
-
-#ifdef ANALYZE_SUPPRESS     
-ANALYZE_SUPPRESS(6001);        
-#endif
-template < class TreeType, bool CASEINSENSITIVE, size_t POOL_SIZE >
-inline void CUtlSymbolTableLargeBase<TreeType, CASEINSENSITIVE, POOL_SIZE>::RemoveAll()
-{
-	m_Lookup.Purge();
-
-	for (int i = 0; i < m_StringPools.Count(); i++)
-		free(m_StringPools[i]);
-
-	m_StringPools.RemoveAll();
-}
-#ifdef ANALYZE_UNSUPPRESS     
-ANALYZE_UNSUPPRESS();        
-#endif
-
-typedef CUtlSymbolTableLargeBase< CNonThreadsafeTree< false >, false > CUtlSymbolTableLarge;
-typedef CUtlSymbolTableLargeBase< CNonThreadsafeTree< true >, true > CUtlSymbolTableLarge_CI;
-typedef CUtlSymbolTableLargeBase< CThreadsafeTree< false >, false > CUtlSymbolTableLargeMT;
-typedef CUtlSymbolTableLargeBase< CThreadsafeTree< true >, true > CUtlSymbolTableLargeMT_CI;
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utltshash.h b/SpyCustom/utltshash.h
deleted file mode 100644
index 9248634..0000000
--- a/SpyCustom/utltshash.h
+++ /dev/null
@@ -1,531 +0,0 @@
-#ifndef UTLTSHASH_H
-#define UTLTSHASH_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <limits.h>
-#include "threadtools.h"
-#include "mempool.h"
-#include "generichash.h"
-
-
-typedef intp UtlTSHashHandle_t;
-
-template < class T >
-abstract_class ITSHashConstructor
-{
-public:
-	virtual void Construct(T * pElement) = 0;
-};
-
-template < class T >
-class CDefaultTSHashConstructor : public ITSHashConstructor< T >
-{
-public:
-	virtual void Construct(T* pElement)
-	{
-		::Construct(pElement);
-	}
-};
-
-template < int BUCKET_COUNT, class KEYTYPE = intp >
-class CUtlTSHashGenericHash
-{
-public:
-	static int Hash(const KEYTYPE& key, int nBucketMask)
-	{
-		int nHash = HashIntConventional((intp)key);
-		if (BUCKET_COUNT <= USHRT_MAX)
-		{
-			nHash ^= (nHash >> 16);
-		}
-		if (BUCKET_COUNT <= UCHAR_MAX)
-		{
-			nHash ^= (nHash >> 8);
-		}
-		return (nHash & nBucketMask);
-	}
-
-	static bool Compare(const KEYTYPE& lhs, const KEYTYPE& rhs)
-	{
-		return lhs == rhs;
-	}
-};
-
-template < int BUCKET_COUNT, class KEYTYPE >
-class CUtlTSHashUseKeyHashMethod
-{
-public:
-	static int Hash(const KEYTYPE& key, int nBucketMask)
-	{
-		uint32 nHash = key.HashValue();
-		return (nHash & nBucketMask);
-	}
-
-	static bool Compare(const KEYTYPE& lhs, const KEYTYPE& rhs)
-	{
-		return lhs == rhs;
-	}
-};
-
-template< class T, int BUCKET_COUNT, class KEYTYPE = intp, class HashFuncs = CUtlTSHashGenericHash< BUCKET_COUNT, KEYTYPE >, int nAlignment = 0 >
-class CUtlTSHash
-{
-public:
-	CUtlTSHash(int nAllocationCount);
-	~CUtlTSHash();
-
-	static UtlTSHashHandle_t InvalidHandle(void) { return (UtlTSHashHandle_t)0; }
-
-	UtlTSHashHandle_t Find(KEYTYPE uiKey);
-
-	UtlTSHashHandle_t Insert(KEYTYPE uiKey, const T& data, bool* pDidInsert = NULL);
-	UtlTSHashHandle_t Insert(KEYTYPE uiKey, ITSHashConstructor<T>* pConstructor, bool* pDidInsert = NULL);
-
-	UtlTSHashHandle_t FastInsert(KEYTYPE uiKey, const T& data);
-	UtlTSHashHandle_t FastInsert(KEYTYPE uiKey, ITSHashConstructor<T>* pConstructor);
-
-	void Commit();
-
-	void FindAndRemove(KEYTYPE uiKey);
-	void Remove(UtlTSHashHandle_t hHash) { FindAndRemove(GetID(hHash)); }
-	void RemoveAll(void);
-	void Purge(void);
-
-	int Count() const;
-
-	int GetElements(int nFirstElement, int nCount, UtlTSHashHandle_t* pHandles) const;
-
-	T& Element(UtlTSHashHandle_t hHash);
-	T const& Element(UtlTSHashHandle_t hHash) const;
-	T& operator[](UtlTSHashHandle_t hHash);
-	T const& operator[](UtlTSHashHandle_t hHash) const;
-	KEYTYPE GetID(UtlTSHashHandle_t hHash) const;
-
-	UtlTSHashHandle_t ElementPtrToHandle(T* pElement) const;
-
-private:
-	template < typename Data_t >
-	struct HashFixedDataInternal_t
-	{
-		KEYTYPE	m_uiKey;
-		HashFixedDataInternal_t< Data_t >* m_pNext;
-		Data_t	m_Data;
-	};
-
-	typedef HashFixedDataInternal_t<T> HashFixedData_t;
-
-	enum
-	{
-		BUCKET_MASK = BUCKET_COUNT - 1
-	};
-
-	struct HashBucket_t
-	{
-		HashFixedData_t* m_pFirst;
-		HashFixedData_t* m_pFirstUncommitted;
-		CThreadSpinRWLock m_AddLock;
-	};
-
-	UtlTSHashHandle_t Find(KEYTYPE uiKey, HashFixedData_t* pFirstElement, HashFixedData_t* pLastElement);
-	UtlTSHashHandle_t InsertUncommitted(KEYTYPE uiKey, HashBucket_t& bucket);
-	CMemoryPoolMT m_EntryMemory;
-	HashBucket_t m_aBuckets[BUCKET_COUNT];
-	bool m_bNeedsCommit;
-
-#ifdef _DEBUG
-	CInterlockedInt m_ContentionCheck;
-#endif
-};
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::CUtlTSHash(int nAllocationCount) :
-	m_EntryMemory(sizeof(HashFixedData_t), nAllocationCount, CUtlMemoryPool::GROW_SLOW, MEM_ALLOC_CLASSNAME(HashFixedData_t), nAlignment)
-{
-#ifdef _DEBUG
-	m_ContentionCheck = 0;
-#endif
-	m_bNeedsCommit = false;
-	for (int i = 0; i < BUCKET_COUNT; i++)
-	{
-		HashBucket_t& bucket = m_aBuckets[i];
-		bucket.m_pFirst = NULL;
-		bucket.m_pFirstUncommitted = NULL;
-	}
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::~CUtlTSHash()
-{
-#ifdef _DEBUG
-	if (m_ContentionCheck != 0)
-	{
-		DebuggerBreak();
-	}
-#endif
-	Purge();
-}
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline void CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::Purge(void)
-{
-	RemoveAll();
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline int CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::Count() const
-{
-	return m_EntryMemory.Count();
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-int CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::GetElements(int nFirstElement, int nCount, UtlTSHashHandle_t* pHandles) const
-{
-	int nIndex = 0;
-	for (int i = 0; i < BUCKET_COUNT; i++)
-	{
-		const HashBucket_t& bucket = m_aBuckets[i];
-		bucket.m_AddLock.LockForRead();
-		for (HashFixedData_t* pElement = bucket.m_pFirstUncommitted; pElement; pElement = pElement->m_pNext)
-		{
-			if (--nFirstElement >= 0)
-				continue;
-
-			pHandles[nIndex++] = (UtlTSHashHandle_t)pElement;
-			if (nIndex >= nCount)
-			{
-				bucket.m_AddLock.UnlockRead();
-				return nIndex;
-			}
-		}
-		bucket.m_AddLock.UnlockRead();
-	}
-	return nIndex;
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline UtlTSHashHandle_t CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::InsertUncommitted(KEYTYPE uiKey, HashBucket_t& bucket)
-{
-	m_bNeedsCommit = true;
-	HashFixedData_t* pNewElement = static_cast<HashFixedData_t*>(m_EntryMemory.Alloc());
-	pNewElement->m_pNext = bucket.m_pFirstUncommitted;
-	bucket.m_pFirstUncommitted = pNewElement;
-	pNewElement->m_uiKey = uiKey;
-	return (UtlTSHashHandle_t)pNewElement;
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline UtlTSHashHandle_t CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::Insert(KEYTYPE uiKey, const T& data, bool* pDidInsert)
-{
-#ifdef _DEBUG
-	if (m_ContentionCheck != 0)
-	{
-		DebuggerBreak();
-	}
-#endif
-
-	if (pDidInsert)
-	{
-		*pDidInsert = false;
-	}
-
-	int iBucket = HashFuncs::Hash(uiKey, BUCKET_MASK);
-	HashBucket_t& bucket = m_aBuckets[iBucket];
-
-	UtlTSHashHandle_t h = Find(uiKey);
-	if (h != InvalidHandle())
-		return h;
-
-	bucket.m_AddLock.LockForWrite();
-
-	h = Find(uiKey, bucket.m_pFirstUncommitted, bucket.m_pFirst);
-	if (h == InvalidHandle())
-	{
-		h = InsertUncommitted(uiKey, bucket);
-		CopyConstruct(&Element(h), data);
-		if (pDidInsert)
-		{
-			*pDidInsert = true;
-		}
-	}
-
-	bucket.m_AddLock.UnlockWrite();
-	return h;
-}
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline UtlTSHashHandle_t CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::Insert(KEYTYPE uiKey, ITSHashConstructor<T>* pConstructor, bool* pDidInsert)
-{
-#ifdef _DEBUG
-	if (m_ContentionCheck != 0)
-	{
-		DebuggerBreak();
-	}
-#endif
-
-	if (pDidInsert)
-	{
-		*pDidInsert = false;
-	}
-
-	UtlTSHashHandle_t h = Find(uiKey);
-	if (h != InvalidHandle())
-		return h;
-
-	int iBucket = HashFuncs::Hash(uiKey, BUCKET_MASK);
-	HashBucket_t& bucket = m_aBuckets[iBucket];
-	bucket.m_AddLock.LockForWrite();
-
-	h = Find(uiKey, bucket.m_pFirstUncommitted, bucket.m_pFirst);
-	if (h == InvalidHandle())
-	{
-		h = InsertUncommitted(uiKey, bucket);
-		pConstructor->Construct(&Element(h));
-		if (pDidInsert)
-		{
-			*pDidInsert = true;
-		}
-	}
-
-	bucket.m_AddLock.UnlockWrite();
-	return h;
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline UtlTSHashHandle_t CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::FastInsert(KEYTYPE uiKey, const T& data)
-{
-#ifdef _DEBUG
-	if (m_ContentionCheck != 0)
-	{
-		DebuggerBreak();
-	}
-#endif
-	int iBucket = HashFuncs::Hash(uiKey, BUCKET_MASK);
-	HashBucket_t& bucket = m_aBuckets[iBucket];
-	bucket.m_AddLock.LockForWrite();
-	UtlTSHashHandle_t h = InsertUncommitted(uiKey, bucket);
-	CopyConstruct(&Element(h), data);
-	bucket.m_AddLock.UnlockWrite();
-	return h;
-}
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline UtlTSHashHandle_t CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::FastInsert(KEYTYPE uiKey, ITSHashConstructor<T>* pConstructor)
-{
-#ifdef _DEBUG
-	if (m_ContentionCheck != 0)
-	{
-		DebuggerBreak();
-	}
-#endif
-	int iBucket = HashFuncs::Hash(uiKey, BUCKET_MASK);
-	HashBucket_t& bucket = m_aBuckets[iBucket];
-	bucket.m_AddLock.LockForWrite();
-	UtlTSHashHandle_t h = InsertUncommitted(uiKey, bucket);
-	pConstructor->Construct(&Element(h));
-	bucket.m_AddLock.UnlockWrite();
-	return h;
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline void CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::Commit()
-{
-	if (!m_bNeedsCommit)
-		return;
-
-#ifdef _DEBUG
-	m_ContentionCheck++;
-#endif
-
-	for (int i = 0; i < BUCKET_COUNT; i++)
-	{
-		HashBucket_t& bucket = m_aBuckets[i];
-		bucket.m_AddLock.LockForRead();
-		bucket.m_pFirst = bucket.m_pFirstUncommitted;
-		bucket.m_AddLock.UnlockRead();
-	}
-
-	m_bNeedsCommit = false;
-
-#ifdef _DEBUG
-	m_ContentionCheck--;
-#endif
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline void CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::FindAndRemove(KEYTYPE uiKey)
-{
-	if (m_EntryMemory.Count() == 0)
-		return;
-
-#ifdef _DEBUG
-	m_ContentionCheck++;
-#endif
-
-	int iBucket = HashFuncs::Hash(uiKey, BUCKET_MASK);
-	HashBucket_t& bucket = m_aBuckets[iBucket];
-	bucket.m_AddLock.LockForWrite();
-
-	HashFixedData_t* pPrev = NULL;
-	for (HashFixedData_t* pElement = bucket.m_pFirstUncommitted; pElement; pPrev = pElement, pElement = pElement->m_pNext)
-	{
-		if (!HashFuncs::Compare(pElement->m_uiKey, uiKey))
-			continue;
-
-		if (pPrev)
-		{
-			pPrev->m_pNext = pElement->m_pNext;
-		}
-		else
-		{
-			bucket.m_pFirstUncommitted = pElement->m_pNext;
-		}
-
-		if (bucket.m_pFirst == pElement)
-		{
-			bucket.m_pFirst = bucket.m_pFirst->m_pNext;
-		}
-
-		Destruct(&pElement->m_Data);
-
-#ifdef _DEBUG
-		memset(pElement, 0xDD, sizeof(HashFixedData_t));
-#endif
-
-		m_EntryMemory.Free(pElement);
-
-		break;
-	}
-
-	bucket.m_AddLock.UnlockWrite();
-
-#ifdef _DEBUG
-	m_ContentionCheck--;
-#endif
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline void CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::RemoveAll(void)
-{
-	m_bNeedsCommit = false;
-	if (m_EntryMemory.Count() == 0)
-		return;
-
-#ifdef _DEBUG
-	m_ContentionCheck++;
-#endif
-
-	for (int i = 0; i < BUCKET_COUNT; i++)
-	{
-		HashBucket_t& bucket = m_aBuckets[i];
-
-		bucket.m_AddLock.LockForWrite();
-
-		for (HashFixedData_t* pElement = bucket.m_pFirstUncommitted; pElement; pElement = pElement->m_pNext)
-		{
-			Destruct(&pElement->m_Data);
-		}
-
-		bucket.m_pFirst = NULL;
-		bucket.m_pFirstUncommitted = NULL;
-		bucket.m_AddLock.UnlockWrite();
-	}
-
-	m_EntryMemory.Clear();
-
-#ifdef _DEBUG
-	m_ContentionCheck--;
-#endif
-}
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline UtlTSHashHandle_t CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::Find(KEYTYPE uiKey, HashFixedData_t* pFirstElement, HashFixedData_t* pLastElement)
-{
-#ifdef _DEBUG
-	if (m_ContentionCheck != 0)
-	{
-		DebuggerBreak();
-	}
-#endif
-
-	for (HashFixedData_t* pElement = pFirstElement; pElement != pLastElement; pElement = pElement->m_pNext)
-	{
-		if (HashFuncs::Compare(pElement->m_uiKey, uiKey))
-			return (UtlTSHashHandle_t)pElement;
-	}
-	return InvalidHandle();
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline UtlTSHashHandle_t CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::Find(KEYTYPE uiKey)
-{
-	int iBucket = HashFuncs::Hash(uiKey, BUCKET_MASK);
-	const HashBucket_t& bucket = m_aBuckets[iBucket];
-	UtlTSHashHandle_t h = Find(uiKey, bucket.m_pFirst, NULL);
-	if (h != InvalidHandle())
-		return h;
-
-	bucket.m_AddLock.LockForRead();
-	h = Find(uiKey, bucket.m_pFirstUncommitted, bucket.m_pFirst);
-	bucket.m_AddLock.UnlockRead();
-
-	return h;
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline T& CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::Element(UtlTSHashHandle_t hHash)
-{
-	return ((HashFixedData_t*)hHash)->m_Data;
-}
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline T const& CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::Element(UtlTSHashHandle_t hHash) const
-{
-	return ((HashFixedData_t*)hHash)->m_Data;
-}
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline T& CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::operator[](UtlTSHashHandle_t hHash)
-{
-	return ((HashFixedData_t*)hHash)->m_Data;
-}
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline T const& CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::operator[](UtlTSHashHandle_t hHash) const
-{
-	return ((HashFixedData_t*)hHash)->m_Data;
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline KEYTYPE CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::GetID(UtlTSHashHandle_t hHash) const
-{
-	return ((HashFixedData_t*)hHash)->m_uiKey;
-}
-
-
-template<class T, int BUCKET_COUNT, class KEYTYPE, class HashFuncs, int nAlignment>
-inline UtlTSHashHandle_t CUtlTSHash<T, BUCKET_COUNT, KEYTYPE, HashFuncs, nAlignment>::ElementPtrToHandle(T* pElement) const
-{
-	Assert(pElement);
-	HashFixedData_t* pFixedData = (HashFixedData_t*)((uint8*)pElement - offsetof(HashFixedData_t, m_Data));
-	Assert(m_EntryMemory.IsAllocationWithinPool(pFixedData));
-	return (UtlTSHashHandle_t)pFixedData;
-}
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/utlvector.h b/SpyCustom/utlvector.h
deleted file mode 100644
index 60cae2d..0000000
--- a/SpyCustom/utlvector.h
+++ /dev/null
@@ -1,1016 +0,0 @@
-#ifndef UTLVECTOR_H
-#define UTLVECTOR_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include <string.h>
-#include "platform.h"
-#include "dbg.h"
-#include "threadtools.h"
-#include "utlmemory.h"
-#include "utlblockmemory.h"
-#include "strtools.h"
-#include "random.h"
-
-#define FOR_EACH_VEC( vecName, iteratorName ) \
-	for ( int iteratorName = 0; iteratorName < (vecName).Count(); iteratorName++ )
-#define FOR_EACH_VEC_BACK( vecName, iteratorName ) \
-	for ( int iteratorName = (vecName).Count()-1; iteratorName >= 0; iteratorName-- )
-
-
-template< class T, class A = CUtlMemory<T> >
-class CUtlVector
-{
-	typedef A CAllocator;
-public:
-	typedef T ElemType_t;
-
-	CUtlVector(int growSize = 0, int initSize = 0);
-	CUtlVector(T* pMemory, int allocationCount, int numElements = 0);
-	~CUtlVector();
-
-	CUtlVector<T, A>& operator=(const CUtlVector<T, A>& other);
-
-	T& operator[](int i);
-	const T& operator[](int i) const;
-	T& Element(int i);
-	const T& Element(int i) const;
-	T& Head();
-	const T& Head() const;
-	T& Tail();
-	const T& Tail() const;
-
-	T* Base() { return m_Memory.Base(); }
-	const T* Base() const { return m_Memory.Base(); }
-	int Count() const;
-	bool IsValidIndex(int i) const;
-	static int InvalidIndex();
-	int AddToHead();
-	int AddToTail();
-	int InsertBefore(int elem);
-	int InsertAfter(int elem);
-	int AddToHead(const T& src);
-	int AddToTail(const T& src);
-	int InsertBefore(int elem, const T& src);
-	int InsertAfter(int elem, const T& src);
-	int AddMultipleToHead(int num);
-	int AddMultipleToTail(int num);
-	int AddMultipleToTail(int num, const T* pToCopy);
-	int InsertMultipleBefore(int elem, int num);
-	int InsertMultipleBefore(int elem, int num, const T* pToCopy);
-	int InsertMultipleAfter(int elem, int num);
-	void SetSize(int size);
-	void SetCount(int count);
-	void SetCountNonDestructively(int count);                   
-	void CopyArray(const T* pArray, int size);      
-	void Swap(CUtlVector< T, A >& vec);
-	int AddVectorToTail(CUtlVector<T, A> const& src);
-	int GetOffset(const T& src) const;
-	void FillWithValue(const T& src);
-	bool HasElement(const T& src) const;
-	void EnsureCapacity(int num);
-	void EnsureCount(int num);
-	void FastRemove(int elem);       
-	void Remove(int elem);            
-	bool FindAndRemove(const T& src);             
-	bool FindAndFastRemove(const T& src);            
-	void RemoveMultiple(int elem, int num);        
-	void RemoveMultipleFromHead(int num);      
-	void RemoveMultipleFromTail(int num);      
-	void RemoveAll();                   
-	void Purge();   
-	void PurgeAndDeleteElements();
-	void Compact();
-	void SetGrowSize(int size) { m_Memory.SetGrowSize(size); }
-	int NumAllocated() const;              
-	void Sort(int(__cdecl* pfnCompare)(const T*, const T*));
-
-protected:
-	CUtlVector(CUtlVector const& vec) { assert(0); }
-
-	void GrowVector(int num = 1);
-
-	void ShiftElementsRight(int elem, int num = 1);
-	void ShiftElementsLeft(int elem, int num = 1);
-
-public:
-	CAllocator m_Memory;
-	int m_Size;
-
-	T* m_pElements;
-
-	inline void ResetDbgInfo()
-	{
-		m_pElements = Base();
-	}
-};
-template < class T >
-class CUtlBlockVector : public CUtlVector< T, CUtlBlockMemory< T, int > >
-{
-public:
-	explicit CUtlBlockVector(int growSize = 0, int initSize = 0)
-		: CUtlVector< T, CUtlBlockMemory< T, int > >(growSize, initSize) {}
-
-private:
-	typedef CUtlVector< T, CUtlBlockMemory< T, int > > Base;
-	typename Base::iterator begin();
-	typename Base::const_iterator begin() const;
-	typename Base::iterator end();
-	typename Base::const_iterator end() const;
-};
-
-template< class BASE_UTLVECTOR, class MUTEX_TYPE = CThreadFastMutex >
-class CUtlVectorMT : public BASE_UTLVECTOR, public MUTEX_TYPE
-{
-	typedef BASE_UTLVECTOR BaseClass;
-public:
-	MUTEX_TYPE Mutex_t;
-
-	explicit CUtlVectorMT(int growSize = 0, int initSize = 0) : BaseClass(growSize, initSize) {}
-	explicit CUtlVectorMT(typename BaseClass::ElemType_t* pMemory, int numElements) : BaseClass(pMemory, numElements) {}
-};
-
-
-template< class T, size_t MAX_SIZE >
-class CUtlVectorFixed : public CUtlVector< T, CUtlMemoryFixed<T, MAX_SIZE > >
-{
-	typedef CUtlVector< T, CUtlMemoryFixed<T, MAX_SIZE > > BaseClass;
-public:
-
-	explicit CUtlVectorFixed(int growSize = 0, int initSize = 0) : BaseClass(growSize, initSize) {}
-	explicit CUtlVectorFixed(T* pMemory, int numElements) : BaseClass(pMemory, numElements) {}
-};
-
-
-template< class T, size_t MAX_SIZE >
-class CUtlVectorFixedGrowable : public CUtlVector< T, CUtlMemoryFixedGrowable<T, MAX_SIZE > >
-{
-	typedef CUtlVector< T, CUtlMemoryFixedGrowable<T, MAX_SIZE > > BaseClass;
-
-public:
-	explicit CUtlVectorFixedGrowable(int growSize = 0) : BaseClass(growSize, MAX_SIZE) {}
-};
-
-
-template< class T >
-class CUtlVectorConservative : public CUtlVector< T, CUtlMemoryConservative<T> >
-{
-	typedef CUtlVector< T, CUtlMemoryConservative<T> > BaseClass;
-public:
-
-	explicit CUtlVectorConservative(int growSize = 0, int initSize = 0) : BaseClass(growSize, initSize) {}
-	explicit CUtlVectorConservative(T* pMemory, int numElements) : BaseClass(pMemory, numElements) {}
-};
-
-
-#pragma warning(push)
-#pragma warning(disable : 4200)           
-#pragma warning(disable : 4815 )              
-
-class CUtlVectorUltraConservativeAllocator
-{
-public:
-	static void* Alloc(size_t nSize)
-	{
-		return malloc(nSize);
-	}
-
-	static void* Realloc(void* pMem, size_t nSize)
-	{
-		return realloc(pMem, nSize);
-	}
-
-	static void Free(void* pMem)
-	{
-		free(pMem);
-	}
-
-	static size_t GetSize(void* pMem)
-	{
-		return mallocsize(pMem);
-	}
-
-};
-
-template <typename T, typename A = CUtlVectorUltraConservativeAllocator >
-class CUtlVectorUltraConservative : private A
-{
-public:
-	CUtlVectorUltraConservative()
-	{
-		m_pData = StaticData();
-	}
-
-	~CUtlVectorUltraConservative()
-	{
-		RemoveAll();
-	}
-
-	int Count() const
-	{
-		return m_pData->m_Size;
-	}
-
-	static int InvalidIndex()
-	{
-		return -1;
-	}
-
-	inline bool IsValidIndex(int i) const
-	{
-		return (i >= 0) && (i < Count());
-	}
-
-	T& operator[](int i)
-	{
-		Assert(IsValidIndex(i));
-		return m_pData->m_Elements[i];
-	}
-
-	const T& operator[](int i) const
-	{
-		Assert(IsValidIndex(i));
-		return m_pData->m_Elements[i];
-	}
-
-	T& Element(int i)
-	{
-		Assert(IsValidIndex(i));
-		return m_pData->m_Elements[i];
-	}
-
-	const T& Element(int i) const
-	{
-		Assert(IsValidIndex(i));
-		return m_pData->m_Elements[i];
-	}
-
-	void EnsureCapacity(int num)
-	{
-		int nCurCount = Count();
-		if (num <= nCurCount)
-		{
-			return;
-		}
-		if (m_pData == StaticData())
-		{
-			m_pData = (Data_t*)A::Alloc(sizeof(int) + (num * sizeof(T)));
-			m_pData->m_Size = 0;
-		}
-		else
-		{
-			int nNeeded = sizeof(int) + (num * sizeof(T));
-			int nHave = A::GetSize(m_pData);
-			if (nNeeded > nHave)
-			{
-				m_pData = (Data_t*)A::Realloc(m_pData, nNeeded);
-			}
-		}
-	}
-
-	int AddToTail(const T& src)
-	{
-		int iNew = Count();
-		EnsureCapacity(Count() + 1);
-		m_pData->m_Elements[iNew] = src;
-		m_pData->m_Size++;
-		return iNew;
-	}
-
-	void RemoveAll()
-	{
-		if (Count())
-		{
-			for (int i = m_pData->m_Size; --i >= 0; )
-			{
-				Destruct(&m_pData->m_Elements[i]);
-			}
-		}
-		if (m_pData != StaticData())
-		{
-			A::Free(m_pData);
-			m_pData = StaticData();
-
-		}
-	}
-
-	void PurgeAndDeleteElements()
-	{
-		if (m_pData != StaticData())
-		{
-			for (int i = 0; i < m_pData->m_Size; i++)
-			{
-				delete Element(i);
-			}
-			RemoveAll();
-		}
-	}
-
-	void FastRemove(int elem)
-	{
-		Assert(IsValidIndex(elem));
-
-		Destruct(&Element(elem));
-		if (Count() > 0)
-		{
-			if (elem != m_pData->m_Size - 1)
-				memcpy(&Element(elem), &Element(m_pData->m_Size - 1), sizeof(T));
-			--m_pData->m_Size;
-		}
-		if (!m_pData->m_Size)
-		{
-			A::Free(m_pData);
-			m_pData = StaticData();
-		}
-	}
-
-	void Remove(int elem)
-	{
-		Destruct(&Element(elem));
-		ShiftElementsLeft(elem);
-		--m_pData->m_Size;
-		if (!m_pData->m_Size)
-		{
-			A::Free(m_pData);
-			m_pData = StaticData();
-		}
-	}
-
-	int Find(const T& src) const
-	{
-		int nCount = Count();
-		for (int i = 0; i < nCount; ++i)
-		{
-			if (Element(i) == src)
-				return i;
-		}
-		return -1;
-	}
-
-	bool FindAndRemove(const T& src)
-	{
-		int elem = Find(src);
-		if (elem != -1)
-		{
-			Remove(elem);
-			return true;
-		}
-		return false;
-	}
-
-
-	bool FindAndFastRemove(const T& src)
-	{
-		int elem = Find(src);
-		if (elem != -1)
-		{
-			FastRemove(elem);
-			return true;
-		}
-		return false;
-	}
-
-	struct Data_t
-	{
-		int m_Size;
-		T m_Elements[0];
-	};
-
-	Data_t* m_pData;
-private:
-	void ShiftElementsLeft(int elem, int num = 1)
-	{
-		int Size = Count();
-		Assert(IsValidIndex(elem) || (Size == 0) || (num == 0));
-		int numToMove = Size - elem - num;
-		if ((numToMove > 0) && (num > 0))
-		{
-			Q_memmove(&Element(elem), &Element(elem + num), numToMove * sizeof(T));
-
-#ifdef _DEBUG
-			Q_memset(&Element(Size - num), 0xDD, num * sizeof(T));
-#endif
-		}
-	}
-
-
-
-	static Data_t* StaticData()
-	{
-		static Data_t staticData;
-		Assert(staticData.m_Size == 0);
-		return &staticData;
-	}
-};
-
-#pragma warning(pop)
-
-
-template< typename T, typename A = CUtlMemory<T> >
-class CCopyableUtlVector : public CUtlVector< T, A >
-{
-	typedef CUtlVector< T, A > BaseClass;
-public:
-	explicit CCopyableUtlVector(int growSize = 0, int initSize = 0) : BaseClass(growSize, initSize) {}
-	explicit CCopyableUtlVector(T* pMemory, int numElements) : BaseClass(pMemory, numElements) {}
-	virtual ~CCopyableUtlVector() {}
-	CCopyableUtlVector(CCopyableUtlVector const& vec) { this->CopyArray(vec.Base(), vec.Count()); }
-};
-
-template< typename T, class A >
-inline CUtlVector<T, A>::CUtlVector(int growSize, int initSize) :
-	m_Memory(growSize, initSize), m_Size(0)
-{
-	ResetDbgInfo();
-}
-
-template< typename T, class A >
-inline CUtlVector<T, A>::CUtlVector(T* pMemory, int allocationCount, int numElements) :
-	m_Memory(pMemory, allocationCount), m_Size(numElements)
-{
-	ResetDbgInfo();
-}
-
-template< typename T, class A >
-inline CUtlVector<T, A>::~CUtlVector()
-{
-	Purge();
-}
-
-template< typename T, class A >
-inline CUtlVector<T, A>& CUtlVector<T, A>::operator=(const CUtlVector<T, A>& other)
-{
-	int nCount = other.Count();
-	SetSize(nCount);
-	for (int i = 0; i < nCount; i++)
-	{
-		(*this)[i] = other[i];
-	}
-	return *this;
-}
-
-#ifdef STAGING_ONLY
-inline void StagingUtlVectorBoundsCheck(int i, int size)
-{
-	if ((unsigned)i >= (unsigned)size)
-	{
-		Msg("Array access error: %d / %d\n", i, size);
-		DebuggerBreak();
-	}
-}
-
-#else
-#define StagingUtlVectorBoundsCheck( _i, _size )
-#endif
-
-template< typename T, class A >
-inline T& CUtlVector<T, A>::operator[](int i)
-{
-	Assert((unsigned)i < (unsigned)m_Size);
-	StagingUtlVectorBoundsCheck(i, m_Size);
-	return m_Memory[i];
-}
-
-template< typename T, class A >
-inline const T& CUtlVector<T, A>::operator[](int i) const
-{
-	Assert((unsigned)i < (unsigned)m_Size);
-	StagingUtlVectorBoundsCheck(i, m_Size);
-	return m_Memory[i];
-}
-
-template< typename T, class A >
-inline T& CUtlVector<T, A>::Element(int i)
-{
-	Assert((unsigned)i < (unsigned)m_Size);
-	StagingUtlVectorBoundsCheck(i, m_Size);
-	return m_Memory[i];
-}
-
-template< typename T, class A >
-inline const T& CUtlVector<T, A>::Element(int i) const
-{
-	Assert((unsigned)i < (unsigned)m_Size);
-	StagingUtlVectorBoundsCheck(i, m_Size);
-	return m_Memory[i];
-}
-
-template< typename T, class A >
-inline T& CUtlVector<T, A>::Head()
-{
-	Assert(m_Size > 0);
-	StagingUtlVectorBoundsCheck(0, m_Size);
-	return m_Memory[0];
-}
-
-template< typename T, class A >
-inline const T& CUtlVector<T, A>::Head() const
-{
-	Assert(m_Size > 0);
-	StagingUtlVectorBoundsCheck(0, m_Size);
-	return m_Memory[0];
-}
-
-template< typename T, class A >
-inline T& CUtlVector<T, A>::Tail()
-{
-	Assert(m_Size > 0);
-	StagingUtlVectorBoundsCheck(0, m_Size);
-	return m_Memory[m_Size - 1];
-}
-
-template< typename T, class A >
-inline const T& CUtlVector<T, A>::Tail() const
-{
-	Assert(m_Size > 0);
-	StagingUtlVectorBoundsCheck(0, m_Size);
-	return m_Memory[m_Size - 1];
-}
-
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::Count() const
-{
-	return m_Size;
-}
-
-template< typename T, class A >
-inline bool CUtlVector<T, A>::IsValidIndex(int i) const
-{
-	return (i >= 0) && (i < m_Size);
-}
-
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::InvalidIndex()
-{
-	return -1;
-}
-
-
-template< typename T, class A >
-void CUtlVector<T, A>::GrowVector(int num)
-{
-	if (m_Size + num > m_Memory.NumAllocated())
-	{
-		MEM_ALLOC_CREDIT_CLASS();
-		m_Memory.Grow(m_Size + num - m_Memory.NumAllocated());
-	}
-
-	m_Size += num;
-	ResetDbgInfo();
-}
-
-
-template< typename T, class A >
-void CUtlVector<T, A>::Sort(int(__cdecl* pfnCompare)(const T*, const T*))
-{
-	typedef int(__cdecl* QSortCompareFunc_t)(const void*, const void*);
-	if (Count() <= 1)
-		return;
-
-	if (Base())
-	{
-		qsort(Base(), Count(), sizeof(T), (QSortCompareFunc_t)(pfnCompare));
-	}
-	else
-	{
-		Assert(0);
-		for (int i = m_Size - 1; i >= 0; --i)
-		{
-			for (int j = 1; j <= i; ++j)
-			{
-				if (pfnCompare(&Element(j - 1), &Element(j)) < 0)
-				{
-					V_swap(Element(j - 1), Element(j));
-				}
-			}
-		}
-	}
-}
-
-template< typename T, class A >
-void CUtlVector<T, A>::EnsureCapacity(int num)
-{
-	MEM_ALLOC_CREDIT_CLASS();
-	m_Memory.EnsureCapacity(num);
-	ResetDbgInfo();
-}
-
-
-template< typename T, class A >
-void CUtlVector<T, A>::EnsureCount(int num)
-{
-	if (Count() < num)
-		AddMultipleToTail(num - Count());
-}
-
-
-template< typename T, class A >
-void CUtlVector<T, A>::ShiftElementsRight(int elem, int num)
-{
-	Assert(IsValidIndex(elem) || (m_Size == 0) || (num == 0));
-	int numToMove = m_Size - elem - num;
-	if ((numToMove > 0) && (num > 0))
-		Q_memmove(&Element(elem + num), &Element(elem), numToMove * sizeof(T));
-}
-
-template< typename T, class A >
-void CUtlVector<T, A>::ShiftElementsLeft(int elem, int num)
-{
-	Assert(IsValidIndex(elem) || (m_Size == 0) || (num == 0));
-	int numToMove = m_Size - elem - num;
-	if ((numToMove > 0) && (num > 0))
-	{
-		Q_memmove(&Element(elem), &Element(elem + num), numToMove * sizeof(T));
-
-#ifdef _DEBUG
-		Q_memset(&Element(m_Size - num), 0xDD, num * sizeof(T));
-#endif
-	}
-}
-
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::AddToHead()
-{
-	return InsertBefore(0);
-}
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::AddToTail()
-{
-	return InsertBefore(m_Size);
-}
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::InsertAfter(int elem)
-{
-	return InsertBefore(elem + 1);
-}
-
-template< typename T, class A >
-int CUtlVector<T, A>::InsertBefore(int elem)
-{
-	Assert((elem == Count()) || IsValidIndex(elem));
-
-	GrowVector();
-	ShiftElementsRight(elem);
-	Construct(&Element(elem));
-	return elem;
-}
-
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::AddToHead(const T& src)
-{
-	Assert((Base() == NULL) || (&src < Base()) || (&src >= (Base() + Count())));
-	return InsertBefore(0, src);
-}
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::AddToTail(const T& src)
-{
-	Assert((Base() == NULL) || (&src < Base()) || (&src >= (Base() + Count())));
-	return InsertBefore(m_Size, src);
-}
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::InsertAfter(int elem, const T& src)
-{
-	Assert((Base() == NULL) || (&src < Base()) || (&src >= (Base() + Count())));
-	return InsertBefore(elem + 1, src);
-}
-
-template< typename T, class A >
-int CUtlVector<T, A>::InsertBefore(int elem, const T& src)
-{
-	Assert((Base() == NULL) || (&src < Base()) || (&src >= (Base() + Count())));
-
-	Assert((elem == Count()) || IsValidIndex(elem));
-
-	GrowVector();
-	ShiftElementsRight(elem);
-	CopyConstruct(&Element(elem), src);
-	return elem;
-}
-
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::AddMultipleToHead(int num)
-{
-	return InsertMultipleBefore(0, num);
-}
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::AddMultipleToTail(int num, const T* pToCopy)
-{
-	Assert((Base() == NULL) || !pToCopy || (pToCopy + num < Base()) || (pToCopy >= (Base() + Count())));
-
-	return InsertMultipleBefore(m_Size, num, pToCopy);
-}
-
-template< typename T, class A >
-int CUtlVector<T, A>::InsertMultipleAfter(int elem, int num)
-{
-	return InsertMultipleBefore(elem + 1, num);
-}
-
-
-template< typename T, class A >
-void CUtlVector<T, A>::SetCount(int count)
-{
-	RemoveAll();
-	AddMultipleToTail(count);
-}
-
-template< typename T, class A >
-inline void CUtlVector<T, A>::SetSize(int size)
-{
-	SetCount(size);
-}
-
-template< typename T, class A >
-void CUtlVector<T, A>::SetCountNonDestructively(int count)
-{
-	int delta = count - m_Size;
-	if (delta > 0) AddMultipleToTail(delta);
-	else if (delta < 0) RemoveMultipleFromTail(-delta);
-}
-
-template< typename T, class A >
-void CUtlVector<T, A>::CopyArray(const T* pArray, int size)
-{
-	Assert((Base() == NULL) || !pArray || (Base() >= (pArray + size)) || (pArray >= (Base() + Count())));
-
-	SetSize(size);
-	for (int i = 0; i < size; i++)
-	{
-		(*this)[i] = pArray[i];
-	}
-}
-
-template< typename T, class A >
-void CUtlVector<T, A>::Swap(CUtlVector< T, A >& vec)
-{
-	m_Memory.Swap(vec.m_Memory);
-	V_swap(m_Size, vec.m_Size);
-
-#ifndef _X360
-	V_swap(m_pElements, vec.m_pElements);
-#endif
-}
-
-template< typename T, class A >
-int CUtlVector<T, A>::AddVectorToTail(CUtlVector const& src)
-{
-	Assert(&src != this);
-
-	int base = Count();
-
-	AddMultipleToTail(src.Count());
-
-	for (int i = 0; i < src.Count(); i++)
-	{
-		(*this)[base + i] = src[i];
-	}
-
-	return base;
-}
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::InsertMultipleBefore(int elem, int num, const T* pToInsert)
-{
-	if (num == 0)
-		return elem;
-
-	Assert((elem == Count()) || IsValidIndex(elem));
-
-	GrowVector(num);
-	ShiftElementsRight(elem, num);
-
-	for (int i = 0; i < num; ++i)
-		Construct(&Element(elem + i));
-
-	if (pToInsert)
-	{
-		for (int i = 0; i < num; i++)
-		{
-			Element(elem + i) = pToInsert[i];
-		}
-	}
-
-	return elem;
-}
-
-
-template< typename T, class A >
-int CUtlVector<T, A>::GetOffset(const T& src) const
-{
-	return -1;
-}
-template< typename T, class A >
-bool CUtlVector<T, A>::HasElement(const T& src) const
-{
-	return (Find(src) >= 0);
-}
-
-
-template< typename T, class A >
-void CUtlVector<T, A>::FastRemove(int elem)
-{
-	Assert(IsValidIndex(elem));
-
-	Destruct(&Element(elem));
-	if (m_Size > 0)
-	{
-		if (elem != m_Size - 1)
-			memcpy(reinterpret_cast<void*>(&Element(elem)), reinterpret_cast<void*>(&Element(m_Size - 1)), sizeof(T));
-		--m_Size;
-	}
-}
-
-template< typename T, class A >
-void CUtlVector<T, A>::Remove(int elem)
-{
-	Destruct(&Element(elem));
-	ShiftElementsLeft(elem);
-	--m_Size;
-}
-
-template< typename T, class A >
-bool CUtlVector<T, A>::FindAndRemove(const T& src)
-{
-	int elem = GetOffset(src);
-	if (elem != -1)
-	{
-		Remove(elem);
-		return true;
-	}
-	return false;
-}
-
-template< typename T, class A >
-bool CUtlVector<T, A>::FindAndFastRemove(const T& src)
-{
-	int elem = Find(src);
-	if (elem != -1)
-	{
-		FastRemove(elem);
-		return true;
-	}
-	return false;
-}
-
-template< typename T, class A >
-void CUtlVector<T, A>::RemoveMultiple(int elem, int num)
-{
-	Assert(elem >= 0);
-	Assert(elem + num <= Count());
-
-	for (int i = elem + num; --i >= elem; )
-		Destruct(&Element(i));
-
-	ShiftElementsLeft(elem, num);
-	m_Size -= num;
-}
-
-template< typename T, class A >
-void CUtlVector<T, A>::RemoveMultipleFromHead(int num)
-{
-	Assert(num <= Count());
-
-	for (int i = num; --i >= 0; )
-		Destruct(&Element(i));
-
-	ShiftElementsLeft(0, num);
-	m_Size -= num;
-}
-
-template< typename T, class A >
-void CUtlVector<T, A>::RemoveMultipleFromTail(int num)
-{
-	Assert(num <= Count());
-
-	for (int i = m_Size - num; i < m_Size; i++)
-		Destruct(&Element(i));
-
-	m_Size -= num;
-}
-
-template< typename T, class A >
-void CUtlVector<T, A>::RemoveAll()
-{
-	for (int i = m_Size; --i >= 0; )
-	{
-		Destruct(&Element(i));
-	}
-
-	m_Size = 0;
-}
-
-
-template< typename T, class A >
-inline void CUtlVector<T, A>::Purge()
-{
-	RemoveAll();
-	m_Memory.Purge();
-	ResetDbgInfo();
-}
-
-
-template< typename T, class A >
-inline void CUtlVector<T, A>::PurgeAndDeleteElements()
-{
-	for (int i = 0; i < m_Size; i++)
-	{
-		delete Element(i);
-	}
-	Purge();
-}
-
-template< typename T, class A >
-inline void CUtlVector<T, A>::Compact()
-{
-	m_Memory.Purge(m_Size);
-}
-
-template< typename T, class A >
-inline int CUtlVector<T, A>::NumAllocated() const
-{
-	return m_Memory.NumAllocated();
-}
-
-
-#ifdef DBGFLAG_VALIDATE
-template< typename T, class A >
-void CUtlVector<T, A>::Validate(CValidator& validator, char* pchName)
-{
-	validator.Push(typeid(*this).name(), this, pchName);
-
-	m_Memory.Validate(validator, "m_Memory");
-
-	validator.Pop();
-}
-#endif  
-
-template<class T> class CUtlVectorAutoPurge : public CUtlVector< T, CUtlMemory< T, int> >
-{
-public:
-	~CUtlVectorAutoPurge(void)
-	{
-		this->PurgeAndDeleteElements();
-	}
-
-};
-
-class CUtlStringList : public CUtlVectorAutoPurge< char*>
-{
-public:
-	void CopyAndAddToTail(char const* pString)			        
-	{
-		char* pNewStr = new char[1 + strlen(pString)];
-		V_strcpy(pNewStr, pString);
-		AddToTail(pNewStr);
-	}
-
-	static int __cdecl SortFunc(char* const* sz1, char* const* sz2)
-	{
-		return strcmp(*sz1, *sz2);
-	}
-
-	inline void PurgeAndDeleteElements()
-	{
-		for (int i = 0; i < m_Size; i++)
-		{
-			delete[] Element(i);
-		}
-		Purge();
-	}
-
-	~CUtlStringList(void)
-	{
-		this->PurgeAndDeleteElements();
-	}
-};
-
-
-
-class CSplitString : public CUtlVector<char*, CUtlMemory<char*, int> >
-{
-public:
-	CSplitString(const char* pString, const char* pSeparator);
-	CSplitString(const char* pString, const char** pSeparators, int nSeparators);
-	~CSplitString();
-private:
-	void Construct(const char* pString, const char** pSeparators, int nSeparators);
-	void PurgeAndDeleteElements();
-private:
-	char* m_szBuffer;           
-};
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/valve_minmax_on.h b/SpyCustom/valve_minmax_on.h
deleted file mode 100644
index 219070b..0000000
--- a/SpyCustom/valve_minmax_on.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#if !defined(POSIX)
-#ifndef min
-#define min(a,b)  (((a) < (b)) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a,b)  (((a) > (b)) ? (a) : (b))
-#endif
-#endif
\ No newline at end of file
diff --git a/SpyCustom/valve_off.h b/SpyCustom/valve_off.h
deleted file mode 100644
index 32d1ad1..0000000
--- a/SpyCustom/valve_off.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#ifdef STEAM
-
-#undef char
-
-
-#undef malloc
-#undef realloc
-#undef _expand
-#undef free
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/valve_on.h b/SpyCustom/valve_on.h
deleted file mode 100644
index 54bbd7a..0000000
--- a/SpyCustom/valve_on.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifdef STEAM
-#ifdef ENFORCE_WCHAR
-#define char DontUseChar_SeeWcharOn.h
-#endif
-
-
-#define malloc( cub ) HEY_DONT_USE_MALLOC_USE_PVALLOC
-#define realloc( pvOld, cub ) HEY_DONT_USE_REALLOC_USE_PVREALLOC
-#define _expand( pvOld, cub ) HEY_DONT_USE_EXPAND_USE_PVEXPAND
-#define free( pv ) HEY_DONT_USE_FREE_USE_FREEPV
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/vcollide.h b/SpyCustom/vcollide.h
deleted file mode 100644
index 9544813..0000000
--- a/SpyCustom/vcollide.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef VCOLLIDE_H
-#define VCOLLIDE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-class CPhysCollide;
-
-struct vcollide_t
-{
-	unsigned short solidCount : 15;
-	unsigned short isPacked : 1;
-	unsigned short descSize;
-	CPhysCollide** solids;
-	char* pKeyValues;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vcrmode.h b/SpyCustom/vcrmode.h
deleted file mode 100644
index d56365f..0000000
--- a/SpyCustom/vcrmode.h
+++ /dev/null
@@ -1,281 +0,0 @@
-#ifndef VCRMODE_H
-#define VCRMODE_H
-
-#ifdef _WIN32
-#include <process.h>
-#endif
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-#define VCRFILE_VERSION		2
-
-
-typedef enum
-{
-	VCREvent_Sys_FloatTime = 0,
-	VCREvent_recvfrom,
-	VCREvent_SyncToken,
-	VCREvent_GetCursorPos,
-	VCREvent_SetCursorPos,
-	VCREvent_ScreenToClient,
-	VCREvent_Cmd_Exec,
-	VCREvent_CmdLine,
-	VCREvent_RegOpenKeyEx,
-	VCREvent_RegSetValueEx,
-	VCREvent_RegQueryValueEx,
-	VCREvent_RegCreateKeyEx,
-	VCREvent_RegCloseKey,
-	VCREvent_PeekMessage,
-	VCREvent_GameMsg,
-	VCREvent_GetNumberOfConsoleInputEvents,
-	VCREvent_ReadConsoleInput,
-	VCREvent_GetKeyState,
-	VCREvent_recv,
-	VCREvent_send,
-	VCREvent_Generic,
-	VCREvent_CreateThread,
-	VCREvent_WaitForSingleObject,
-	VCREvent_EnterCriticalSection,
-	VCREvent_Time,
-	VCREvent_LocalTime,
-	VCREvent_GenericString,
-	VCREvent_NUMEVENTS
-} VCREvent;
-
-#include "dbg.h"
-
-#ifdef POSIX
-DBG_INTERFACE const char* BuildCmdLine(int argc, char** argv, bool fAddSteam = true);
-tchar* GetCommandLine();
-#endif
-
-#ifdef _X360
-#define NO_VCR 1
-#endif
-
-
-#ifndef NO_VCR
-#define NOVCR(x)	\
-{\
-	VCRSetEnabled(0);\
-	x;\
-	VCRSetEnabled(1);\
-}
-#else
-#define NOVCR(x)	\
-{\
-	x;\
-}
-#endif
-
-
-struct InputEvent_t;
-
-
-enum VCRMode_t
-{
-	VCR_Invalid = -1,
-	VCR_Disabled = 0,
-	VCR_Record,
-	VCR_Playback
-};
-
-
-abstract_class IVCRHelpers
-{
-public:
-	virtual void	ErrorMessage(const tchar * pMsg) = 0;
-	virtual void* GetMainWindow() = 0;
-};
-
-
-abstract_class IVCRTrace
-{
-public:
-	virtual VCREvent	ReadEvent() = 0;
-	virtual void		Read(void* pDest, int size) = 0;
-};
-
-typedef struct VCR_s
-{
-	int			(*Start)(tchar const* pFilename, bool bRecord, IVCRHelpers* pHelpers);
-	void		(*End)();
-
-	IVCRTrace* (*GetVCRTraceInterface)();
-
-	VCRMode_t(*GetMode)();
-
-	void		(*SetEnabled)(int bEnabled);
-
-	void		(*SyncToken)(tchar const* pToken);
-
-	double		(*Hook_Sys_FloatTime)(double time);
-
-	int			(*Hook_PeekMessage)(
-		struct tagMSG* msg,
-		void* hWnd,
-		unsigned int wMsgFilterMin,
-		unsigned int wMsgFilterMax,
-		unsigned int wRemoveMsg
-		);
-
-	void		(*Hook_RecordGameMsg)(const InputEvent_t& event);
-	void		(*Hook_RecordEndGameMsg)();
-
-	bool		(*Hook_PlaybackGameMsg)(InputEvent_t* pEvent);
-
-	int			(*Hook_recvfrom)(int s, char* buf, int len, int flags, struct sockaddr* from, int* fromlen);
-
-	void		(*Hook_GetCursorPos)(struct tagPOINT* pt);
-	void		(*Hook_ScreenToClient)(void* hWnd, struct tagPOINT* pt);
-
-	void		(*Hook_Cmd_Exec)(tchar** f);
-
-	tchar* (*Hook_GetCommandLine)();
-
-	long		(*Hook_RegOpenKeyEx)(void* hKey, const tchar* lpSubKey, unsigned long ulOptions, unsigned long samDesired, void* pHKey);
-	long		(*Hook_RegSetValueEx)(void* hKey, tchar const* lpValueName, unsigned long Reserved, unsigned long dwType, uint8 const* lpData, unsigned long cbData);
-	long		(*Hook_RegQueryValueEx)(void* hKey, tchar const* lpValueName, unsigned long* lpReserved, unsigned long* lpType, uint8* lpData, unsigned long* lpcbData);
-	long		(*Hook_RegCreateKeyEx)(void* hKey, tchar const* lpSubKey, unsigned long Reserved, tchar* lpClass, unsigned long dwOptions, unsigned long samDesired, void* lpSecurityAttributes, void* phkResult, unsigned long* lpdwDisposition);
-	void		(*Hook_RegCloseKey)(void* hKey);
-
-	int			(*Hook_GetNumberOfConsoleInputEvents)(void* hInput, unsigned long* pNumEvents);
-
-	int			(*Hook_ReadConsoleInput)(void* hInput, void* pRecs, int nMaxRecs, unsigned long* pNumRead);
-
-
-	void		(*Hook_LocalTime)(struct tm* today);
-
-	short		(*Hook_GetKeyState)(int nVirtKey);
-
-	int			(*Hook_recv)(int s, char* buf, int len, int flags);
-	int			(*Hook_send)(int s, const char* buf, int len, int flags);
-
-	void		(*GenericRecord)(const tchar* pEventName, const void* pData, int len);
-
-
-	int			(*GenericPlayback)(const tchar* pEventName, void* pOutData, int maxLen, bool bForceLenSame);
-
-	void		(*GenericValue)(const tchar* pEventName, void* pData, int maxLen);
-
-	double		(*GetPercentCompleted)();
-
-	void* (*Hook_CreateThread)(
-		void* lpThreadAttributes,
-		unsigned long dwStackSize,
-		void* lpStartAddress,
-		void* lpParameter,
-		unsigned long dwCreationFlags,
-		unsigned long* lpThreadID);
-
-	unsigned long (*Hook_WaitForSingleObject)(
-		void* handle,
-		unsigned long dwMilliseconds);
-
-	void		(*Hook_EnterCriticalSection)(void* pCS);
-
-	void		(*Hook_Time)(long* pTime);
-
-	void		(*GenericString)(const char* pEventName, const char* pString);
-
-	void		(*GenericValueVerify)(const tchar* pEventName, const void* pData, int maxLen);
-
-	unsigned long (*Hook_WaitForMultipleObjects)(uint32 nHandles, const void** pHandles, int bWaitAll, uint32 timeout);
-
-} VCR_t;
-
-#ifndef NO_VCR
-
-PLATFORM_INTERFACE VCR_t* g_pVCR;
-
-#endif
-
-
-#ifndef NO_VCR
-#define VCRStart								g_pVCR->Start
-#define VCREnd									g_pVCR->End
-#define VCRGetVCRTraceInterface					g_pVCR->GetVCRTraceInterface
-#define VCRGetMode								g_pVCR->GetMode
-#define VCRSetEnabled							g_pVCR->SetEnabled
-#define VCRSyncToken							g_pVCR->SyncToken
-#define VCRGenericString						g_pVCR->GenericString
-#define VCRGenericValueVerify					g_pVCR->GenericValueVerify
-#define VCRHook_Sys_FloatTime					g_pVCR->Hook_Sys_FloatTime
-#define VCRHook_PeekMessage						g_pVCR->Hook_PeekMessage
-#define VCRHook_RecordGameMsg					g_pVCR->Hook_RecordGameMsg
-#define VCRHook_RecordEndGameMsg				g_pVCR->Hook_RecordEndGameMsg
-#define VCRHook_PlaybackGameMsg					g_pVCR->Hook_PlaybackGameMsg
-#define VCRHook_recvfrom						g_pVCR->Hook_recvfrom
-#define VCRHook_GetCursorPos					g_pVCR->Hook_GetCursorPos
-#define VCRHook_ScreenToClient					g_pVCR->Hook_ScreenToClient
-#define VCRHook_Cmd_Exec						g_pVCR->Hook_Cmd_Exec
-#define VCRHook_GetCommandLine					g_pVCR->Hook_GetCommandLine
-#define VCRHook_RegOpenKeyEx					g_pVCR->Hook_RegOpenKeyEx
-#define VCRHook_RegSetValueEx					g_pVCR->Hook_RegSetValueEx
-#define VCRHook_RegQueryValueEx					g_pVCR->Hook_RegQueryValueEx
-#define VCRHook_RegCreateKeyEx					g_pVCR->Hook_RegCreateKeyEx
-#define VCRHook_RegCloseKey						g_pVCR->Hook_RegCloseKey
-#define VCRHook_GetNumberOfConsoleInputEvents	g_pVCR->Hook_GetNumberOfConsoleInputEvents
-#define VCRHook_ReadConsoleInput				g_pVCR->Hook_ReadConsoleInput
-#define VCRHook_LocalTime						g_pVCR->Hook_LocalTime
-#define VCRHook_GetKeyState						g_pVCR->Hook_GetKeyState
-#define VCRHook_recv							g_pVCR->Hook_recv
-#define VCRHook_send							g_pVCR->Hook_send
-#define VCRGenericRecord						g_pVCR->GenericRecord
-#define VCRGenericPlayback						g_pVCR->GenericPlayback
-#define VCRGenericValue							g_pVCR->GenericValue
-#define VCRGetPercentCompleted					g_pVCR->GetPercentCompleted
-#define VCRHook_CreateThread					g_pVCR->Hook_CreateThread
-#define VCRHook_WaitForSingleObject				g_pVCR->Hook_WaitForSingleObject
-#define VCRHook_EnterCriticalSection			g_pVCR->Hook_EnterCriticalSection
-#define VCRHook_Time							g_pVCR->Hook_Time
-#define VCRHook_WaitForMultipleObjects( a, b, c, d) g_pVCR->Hook_WaitForMultipleObjects( a, (const void **)b, c, d)
-#else
-#define VCRStart( a, b, c )						(1)
-#define VCREnd									((void)(0))
-#define VCRGetVCRTraceInterface					(NULL)
-#define VCRGetMode()							(VCR_Disabled)
-#define VCRSetEnabled( a )						((void)(0))
-#define VCRSyncToken( a )						((void)(0))
-#define VCRGenericRecord						MUST_IFDEF_OUT_GenericRecord
-#define VCRGenericPlayback						MUST_IFDEF_OUT_GenericPlayback
-#define VCRGenericValue							MUST_IFDEF_OUT_GenericValue
-#define VCRGenericString						MUST_IFDEF_OUT_GenericString
-#define VCRGenericValueVerify					MUST_IFDEF_OUT_GenericValueVerify
-#define VCRGetPercentCompleted()				(0.0f)
-#define VCRHook_Sys_FloatTime					Sys_FloatTime
-#define VCRHook_PeekMessage						PeekMessage
-#define VCRHook_RecordGameMsg					RecordGameMsg
-#define VCRHook_RecordEndGameMsg				RecordEndGameMsg
-#define VCRHook_PlaybackGameMsg					PlaybackGameMsg
-#define VCRHook_recvfrom						recvfrom
-#define VCRHook_GetCursorPos					GetCursorPos
-#define VCRHook_ScreenToClient					ScreenToClient
-#define VCRHook_Cmd_Exec( a )					((void)(0))
-#define VCRHook_GetCommandLine					GetCommandLine
-#define VCRHook_RegOpenKeyEx					RegOpenKeyEx
-#define VCRHook_RegSetValueEx					RegSetValueEx
-#define VCRHook_RegQueryValueEx					RegQueryValueEx
-#define VCRHook_RegCreateKeyEx					RegCreateKeyEx
-#define VCRHook_RegCloseKey						RegCloseKey
-#define VCRHook_GetNumberOfConsoleInputEvents	GetNumberOfConsoleInputEvents
-#define VCRHook_ReadConsoleInput				ReadConsoleInput
-#define VCRHook_LocalTime( a )					memset(a, 0, sizeof(*a));
-#define VCRHook_GetKeyState						GetKeyState
-#define VCRHook_recv							recv
-#define VCRHook_send							send
-#if defined( _X360 )
-#define VCRHook_CreateThread					CreateThread
-#else
-#define VCRHook_CreateThread					(void*)_beginthreadex
-#endif
-#define VCRHook_WaitForSingleObject				WaitForSingleObject
-#define VCRHook_EnterCriticalSection			EnterCriticalSection
-#define VCRHook_WaitForMultipleObjects( a, b, c, d) WaitForMultipleObjects( a, (const HANDLE *)b, c, d)
-#define VCRHook_Time							Time
-#endif
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vector.h b/SpyCustom/vector.h
deleted file mode 100644
index 6da5e30..0000000
--- a/SpyCustom/vector.h
+++ /dev/null
@@ -1,1878 +0,0 @@
-#ifndef VECTOR_H
-#define VECTOR_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <math.h>
-#include <float.h>
-
-#include "basetypes.h"
-
-#include <stdlib.h>
-
-#ifndef _X360
-#include <xmmintrin.h>
-#endif
-
-#include "dbg.h"
-#include "threadtools.h"
-#include "vector2d.h"
-#include "math_pfns.h"
-#include "minmax.h"
-
-
-#define X_INDEX	0
-#define Y_INDEX	1
-#define Z_INDEX	2
-
-
-#ifdef VECTOR_PARANOIA
-#define CHECK_VALID( _v)	Assert( (_v).IsValid() )
-#else
-#ifdef GNUC
-#define CHECK_VALID( _v)
-#else
-#define CHECK_VALID( _v)	0
-#endif
-#endif
-
-#define VecToString(v)	(static_cast<const char *>(CFmtStr("(%f, %f, %f)", (v).x, (v).y, (v).z)))          
-
-class VectorByValue;
-
-class Vector
-{
-public:
-	vec_t x, y, z;
-
-	Vector(void);
-	Vector(vec_t X, vec_t Y, vec_t Z);
-	explicit Vector(vec_t XYZ);   
-
-	void Init(vec_t ix = 0.0f, vec_t iy = 0.0f, vec_t iz = 0.0f);
-	bool IsValid() const;
-	void Invalidate();
-
-	vec_t operator[](int i) const;
-	vec_t& operator[](int i);
-
-	vec_t* Base();
-	vec_t const* Base() const;
-
-	Vector2D& AsVector2D();
-	const Vector2D& AsVector2D() const;
-
-	void Random(vec_t minVal, vec_t maxVal);
-	inline void Zero();     
-
-	bool operator==(const Vector& v) const;
-	bool operator!=(const Vector& v) const;
-
-	FORCEINLINE Vector& operator+=(const Vector& v);
-	FORCEINLINE Vector& operator-=(const Vector& v);
-	FORCEINLINE Vector& operator*=(const Vector& v);
-	FORCEINLINE Vector& operator*=(float s);
-	FORCEINLINE Vector& operator/=(const Vector& v);
-	FORCEINLINE Vector& operator/=(float s);
-	FORCEINLINE Vector& operator+=(float fl);   
-	FORCEINLINE Vector& operator-=(float fl);   			
-
-	void	Negate();
-
-	inline vec_t	Length() const;
-
-	FORCEINLINE vec_t LengthSqr(void) const
-	{
-		CHECK_VALID(*this);
-		return (x * x + y * y + z * z);
-	}
-
-	bool IsZero(float tolerance = 0.01f) const
-	{
-		return (x > -tolerance && x < tolerance&&
-			y > -tolerance && y < tolerance&&
-			z > -tolerance && z < tolerance);
-	}
-
-	vec_t	NormalizeInPlace();
-	Vector	Normalized() const;
-	bool	IsLengthGreaterThan(float val) const;
-	bool	IsLengthLessThan(float val) const;
-
-	FORCEINLINE bool WithinAABox(Vector const& boxmin, Vector const& boxmax);
-
-	vec_t	DistTo(const Vector& vOther) const;
-
-	FORCEINLINE vec_t DistToSqr(const Vector& vOther) const
-	{
-		Vector delta;
-
-		delta.x = x - vOther.x;
-		delta.y = y - vOther.y;
-		delta.z = z - vOther.z;
-
-		return delta.LengthSqr();
-	}
-
-	void	CopyToArray(float* rgfl) const;
-
-	void	MulAdd(const Vector& a, const Vector& b, float scalar);
-
-	vec_t	Dot(const Vector& vOther) const;
-
-	Vector& operator=(const Vector& vOther);
-
-	vec_t	Length2D(void) const;
-	vec_t	Length2DSqr(void) const;
-
-	operator VectorByValue& () { return *((VectorByValue*)(this)); }
-	operator const VectorByValue& () const { return *((const VectorByValue*)(this)); }
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-	Vector	operator-(void) const;
-
-	Vector	operator+(const Vector& v) const;
-	Vector	operator-(const Vector& v) const;
-	Vector	operator*(const Vector& v) const;
-	Vector	operator/(const Vector& v) const;
-	Vector	operator*(float fl) const;
-	Vector	operator/(float fl) const;
-
-	Vector	Cross(const Vector& vOther) const;
-
-	Vector	Min(const Vector& vOther) const;
-	Vector	Max(const Vector& vOther) const;
-
-#else
-
-private:
-	Vector(const Vector& vOther);
-#endif
-};
-
-FORCEINLINE void NetworkVarConstruct(Vector& v) { v.Zero(); }
-
-
-#define USE_M64S ( ( !defined( _X360 ) ) )
-
-
-
-class ALIGN8 ShortVector
-{
-public:
-
-	short x, y, z, w;
-
-	void Init(short ix = 0, short iy = 0, short iz = 0, short iw = 0);
-
-
-#if USE_M64S
-	__m64& AsM64() { return *(__m64*) & x; }
-	const __m64& AsM64() const { return *(const __m64*) & x; }
-#endif
-
-	void Set(const ShortVector& vOther);
-	void Set(const short ix, const short iy, const short iz, const short iw);
-
-	short operator[](int i) const;
-	short& operator[](int i);
-
-	short* Base();
-	short const* Base() const;
-
-	bool operator==(const ShortVector& v) const;
-	bool operator!=(const ShortVector& v) const;
-
-	FORCEINLINE ShortVector& operator+=(const ShortVector& v);
-	FORCEINLINE ShortVector& operator-=(const ShortVector& v);
-	FORCEINLINE ShortVector& operator*=(const ShortVector& v);
-	FORCEINLINE ShortVector& operator*=(float s);
-	FORCEINLINE ShortVector& operator/=(const ShortVector& v);
-	FORCEINLINE ShortVector& operator/=(float s);
-	FORCEINLINE ShortVector operator*(float fl) const;
-
-private:
-
-} ALIGN8_POST;
-
-
-
-
-
-
-class IntVector4D
-{
-public:
-
-	int x, y, z, w;
-
-	void Init(int ix = 0, int iy = 0, int iz = 0, int iw = 0);
-
-#if USE_M64S
-	__m64& AsM64() { return *(__m64*) & x; }
-	const __m64& AsM64() const { return *(const __m64*) & x; }
-#endif
-
-	void Set(const IntVector4D& vOther);
-	void Set(const int ix, const int iy, const int iz, const int iw);
-
-	int operator[](int i) const;
-	int& operator[](int i);
-
-	int* Base();
-	int const* Base() const;
-
-	bool operator==(const IntVector4D& v) const;
-	bool operator!=(const IntVector4D& v) const;
-
-	FORCEINLINE IntVector4D& operator+=(const IntVector4D& v);
-	FORCEINLINE IntVector4D& operator-=(const IntVector4D& v);
-	FORCEINLINE IntVector4D& operator*=(const IntVector4D& v);
-	FORCEINLINE IntVector4D& operator*=(float s);
-	FORCEINLINE IntVector4D& operator/=(const IntVector4D& v);
-	FORCEINLINE IntVector4D& operator/=(float s);
-	FORCEINLINE IntVector4D operator*(float fl) const;
-
-private:
-
-};
-
-
-
-class VectorByValue : public Vector
-{
-public:
-	VectorByValue(void) : Vector() {}
-	VectorByValue(vec_t X, vec_t Y, vec_t Z) : Vector(X, Y, Z) {}
-	VectorByValue(const VectorByValue& vOther) { *this = vOther; }
-};
-
-
-class TableVector
-{
-public:
-	vec_t x, y, z;
-
-	operator Vector& () { return *((Vector*)(this)); }
-	operator const Vector& () const { return *((const Vector*)(this)); }
-
-	inline vec_t& operator[](int i)
-	{
-		Assert((i >= 0) && (i < 3));
-		return ((vec_t*)this)[i];
-	}
-
-	inline vec_t operator[](int i) const
-	{
-		Assert((i >= 0) && (i < 3));
-		return ((vec_t*)this)[i];
-	}
-};
-
-
-class ALIGN16 VectorAligned : public Vector
-{
-public:
-	inline VectorAligned(void) {};
-	inline VectorAligned(vec_t X, vec_t Y, vec_t Z)
-	{
-		Init(X, Y, Z);
-	}
-
-#ifdef VECTOR_NO_SLOW_OPERATIONS
-
-private:
-	VectorAligned(const VectorAligned& vOther);
-	VectorAligned(const Vector& vOther);
-
-#else
-public:
-	explicit VectorAligned(const Vector& vOther)
-	{
-		Init(vOther.x, vOther.y, vOther.z);
-	}
-
-	VectorAligned& operator=(const Vector& vOther)
-	{
-		Init(vOther.x, vOther.y, vOther.z);
-		return *this;
-	}
-
-#endif
-	float w;	     
-} ALIGN16_POST;
-
-FORCEINLINE void VectorClear(Vector& a);
-
-FORCEINLINE void VectorCopy(const Vector& src, Vector& dst);
-
-FORCEINLINE void VectorAdd(const Vector& a, const Vector& b, Vector& result);
-FORCEINLINE void VectorSubtract(const Vector& a, const Vector& b, Vector& result);
-FORCEINLINE void VectorMultiply(const Vector& a, vec_t b, Vector& result);
-FORCEINLINE void VectorMultiply(const Vector& a, const Vector& b, Vector& result);
-FORCEINLINE void VectorDivide(const Vector& a, vec_t b, Vector& result);
-FORCEINLINE void VectorDivide(const Vector& a, const Vector& b, Vector& result);
-inline void VectorScale(const Vector& in, vec_t scale, Vector& result);
-void VectorMA(const Vector& start, float scale, const Vector& direction, Vector& dest);
-
-bool VectorsAreEqual(const Vector& src1, const Vector& src2, float tolerance = 0.0f);
-
-#define VectorExpand(v) (v).x, (v).y, (v).z
-
-
-inline vec_t VectorLength(const Vector& v);
-
-FORCEINLINE vec_t DotProduct(const Vector& a, const Vector& b);
-
-void CrossProduct(const Vector& a, const Vector& b, Vector& result);
-
-void VectorMin(const Vector& a, const Vector& b, Vector& result);
-void VectorMax(const Vector& a, const Vector& b, Vector& result);
-
-void VectorLerp(const Vector& src1, const Vector& src2, vec_t t, Vector& dest);
-Vector VectorLerp(const Vector& src1, const Vector& src2, vec_t t);
-
-FORCEINLINE Vector ReplicateToVector(float x)
-{
-	return Vector(x, x, x);
-}
-
-FORCEINLINE bool PointWithinViewAngle(Vector const& vecSrcPosition,
-	Vector const& vecTargetPosition,
-	Vector const& vecLookDirection, float flCosHalfFOV)
-{
-	Vector vecDelta = vecTargetPosition - vecSrcPosition;
-	float cosDiff = DotProduct(vecLookDirection, vecDelta);
-
-	if (cosDiff < 0)
-		return false;
-
-	float flLen2 = vecDelta.LengthSqr();
-
-	return (cosDiff * cosDiff > flLen2 * flCosHalfFOV * flCosHalfFOV);
-
-}
-
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-Vector CrossProduct(const Vector& a, const Vector& b);
-
-Vector RandomVector(vec_t minVal, vec_t maxVal);
-
-#endif
-
-float RandomVectorInUnitSphere(Vector* pVector);
-float RandomVectorInUnitCircle(Vector2D* pVector);
-
-
-
-inline Vector::Vector(void)
-{
-#ifdef _DEBUG
-#ifdef VECTOR_PARANOIA
-	x = y = z = VEC_T_NAN;
-#endif
-#endif
-}
-
-inline Vector::Vector(vec_t X, vec_t Y, vec_t Z)
-{
-	x = X; y = Y; z = Z;
-	CHECK_VALID(*this);
-}
-
-inline Vector::Vector(vec_t XYZ)
-{
-	x = y = z = XYZ;
-	CHECK_VALID(*this);
-}
-
-#if 0
-inline Vector::Vector(const Vector& vOther)
-{
-	CHECK_VALID(vOther);
-	x = vOther.x; y = vOther.y; z = vOther.z;
-}
-#endif
-
-inline void Vector::Init(vec_t ix, vec_t iy, vec_t iz)
-{
-	x = ix; y = iy; z = iz;
-	CHECK_VALID(*this);
-}
-
-inline void Vector::Random(vec_t minVal, vec_t maxVal)
-{
-	x = minVal + ((float)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-	y = minVal + ((float)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-	z = minVal + ((float)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-	CHECK_VALID(*this);
-}
-
-inline void Vector::Zero()
-{
-	x = y = z = 0.0f;
-}
-
-inline void VectorClear(Vector& a)
-{
-	a.x = a.y = a.z = 0.0f;
-}
-
-inline Vector& Vector::operator=(const Vector& vOther)
-{
-	CHECK_VALID(vOther);
-	x = vOther.x; y = vOther.y; z = vOther.z;
-	return *this;
-}
-
-
-inline vec_t& Vector::operator[](int i)
-{
-	Assert((i >= 0) && (i < 3));
-	return ((vec_t*)this)[i];
-}
-
-inline vec_t Vector::operator[](int i) const
-{
-	Assert((i >= 0) && (i < 3));
-	return ((vec_t*)this)[i];
-}
-
-
-inline vec_t* Vector::Base()
-{
-	return (vec_t*)this;
-}
-
-inline vec_t const* Vector::Base() const
-{
-	return (vec_t const*)this;
-}
-
-inline Vector2D& Vector::AsVector2D()
-{
-	return *(Vector2D*)this;
-}
-
-inline const Vector2D& Vector::AsVector2D() const
-{
-	return *(const Vector2D*)this;
-}
-
-inline bool Vector::IsValid() const
-{
-	return IsFinite(x) && IsFinite(y) && IsFinite(z);
-}
-
-inline void Vector::Invalidate()
-{
-	x = y = z = VEC_T_NAN;
-}
-
-inline bool Vector::operator==(const Vector& src) const
-{
-	CHECK_VALID(src);
-	CHECK_VALID(*this);
-	return (src.x == x) && (src.y == y) && (src.z == z);
-}
-
-inline bool Vector::operator!=(const Vector& src) const
-{
-	CHECK_VALID(src);
-	CHECK_VALID(*this);
-	return (src.x != x) || (src.y != y) || (src.z != z);
-}
-
-
-FORCEINLINE void VectorCopy(const Vector& src, Vector& dst)
-{
-	CHECK_VALID(src);
-	dst.x = src.x;
-	dst.y = src.y;
-	dst.z = src.z;
-}
-
-inline void	Vector::CopyToArray(float* rgfl) const
-{
-	Assert(rgfl);
-	CHECK_VALID(*this);
-	rgfl[0] = x, rgfl[1] = y, rgfl[2] = z;
-}
-
-inline void Vector::Negate()
-{
-	CHECK_VALID(*this);
-	x = -x; y = -y; z = -z;
-}
-
-FORCEINLINE  Vector& Vector::operator+=(const Vector& v)
-{
-	CHECK_VALID(*this);
-	CHECK_VALID(v);
-	x += v.x; y += v.y; z += v.z;
-	return *this;
-}
-
-FORCEINLINE  Vector& Vector::operator-=(const Vector& v)
-{
-	CHECK_VALID(*this);
-	CHECK_VALID(v);
-	x -= v.x; y -= v.y; z -= v.z;
-	return *this;
-}
-
-FORCEINLINE  Vector& Vector::operator*=(float fl)
-{
-	x *= fl;
-	y *= fl;
-	z *= fl;
-	CHECK_VALID(*this);
-	return *this;
-}
-
-FORCEINLINE  Vector& Vector::operator*=(const Vector& v)
-{
-	CHECK_VALID(v);
-	x *= v.x;
-	y *= v.y;
-	z *= v.z;
-	CHECK_VALID(*this);
-	return *this;
-}
-
-FORCEINLINE Vector& Vector::operator+=(float fl)
-{
-	x += fl;
-	y += fl;
-	z += fl;
-	CHECK_VALID(*this);
-	return *this;
-}
-
-FORCEINLINE Vector& Vector::operator-=(float fl)
-{
-	x -= fl;
-	y -= fl;
-	z -= fl;
-	CHECK_VALID(*this);
-	return *this;
-}
-
-
-
-FORCEINLINE  Vector& Vector::operator/=(float fl)
-{
-	Assert(fl != 0.0f);
-	float oofl = 1.0f / fl;
-	x *= oofl;
-	y *= oofl;
-	z *= oofl;
-	CHECK_VALID(*this);
-	return *this;
-}
-
-FORCEINLINE  Vector& Vector::operator/=(const Vector& v)
-{
-	CHECK_VALID(v);
-	Assert(v.x != 0.0f && v.y != 0.0f && v.z != 0.0f);
-	x /= v.x;
-	y /= v.y;
-	z /= v.z;
-	CHECK_VALID(*this);
-	return *this;
-}
-
-
-
-
-inline void ShortVector::Init(short ix, short iy, short iz, short iw)
-{
-	x = ix; y = iy; z = iz; w = iw;
-}
-
-FORCEINLINE void ShortVector::Set(const ShortVector& vOther)
-{
-	x = vOther.x;
-	y = vOther.y;
-	z = vOther.z;
-	w = vOther.w;
-}
-
-FORCEINLINE void ShortVector::Set(const short ix, const short iy, const short iz, const short iw)
-{
-	x = ix;
-	y = iy;
-	z = iz;
-	w = iw;
-}
-
-
-inline short ShortVector::operator[](int i) const
-{
-	Assert((i >= 0) && (i < 4));
-	return ((short*)this)[i];
-}
-
-inline short& ShortVector::operator[](int i)
-{
-	Assert((i >= 0) && (i < 4));
-	return ((short*)this)[i];
-}
-
-inline short* ShortVector::Base()
-{
-	return (short*)this;
-}
-
-inline short const* ShortVector::Base() const
-{
-	return (short const*)this;
-}
-
-
-inline bool ShortVector::operator==(const ShortVector& src) const
-{
-	return (src.x == x) && (src.y == y) && (src.z == z) && (src.w == w);
-}
-
-inline bool ShortVector::operator!=(const ShortVector& src) const
-{
-	return (src.x != x) || (src.y != y) || (src.z != z) || (src.w != w);
-}
-
-
-
-FORCEINLINE  ShortVector& ShortVector::operator+=(const ShortVector& v)
-{
-	x += v.x; y += v.y; z += v.z; w += v.w;
-	return *this;
-}
-
-FORCEINLINE  ShortVector& ShortVector::operator-=(const ShortVector& v)
-{
-	x -= v.x; y -= v.y; z -= v.z; w -= v.w;
-	return *this;
-}
-
-FORCEINLINE  ShortVector& ShortVector::operator*=(float fl)
-{
-	x *= fl;
-	y *= fl;
-	z *= fl;
-	w *= fl;
-	return *this;
-}
-
-FORCEINLINE  ShortVector& ShortVector::operator*=(const ShortVector& v)
-{
-	x *= v.x;
-	y *= v.y;
-	z *= v.z;
-	w *= v.w;
-	return *this;
-}
-
-FORCEINLINE  ShortVector& ShortVector::operator/=(float fl)
-{
-	Assert(fl != 0.0f);
-	float oofl = 1.0f / fl;
-	x *= oofl;
-	y *= oofl;
-	z *= oofl;
-	w *= oofl;
-	return *this;
-}
-
-FORCEINLINE  ShortVector& ShortVector::operator/=(const ShortVector& v)
-{
-	Assert(v.x != 0 && v.y != 0 && v.z != 0 && v.w != 0);
-	x /= v.x;
-	y /= v.y;
-	z /= v.z;
-	w /= v.w;
-	return *this;
-}
-
-FORCEINLINE void ShortVectorMultiply(const ShortVector& src, float fl, ShortVector& res)
-{
-	Assert(IsFinite(fl));
-	res.x = src.x * fl;
-	res.y = src.y * fl;
-	res.z = src.z * fl;
-	res.w = src.w * fl;
-}
-
-FORCEINLINE ShortVector ShortVector::operator*(float fl) const
-{
-	ShortVector res;
-	ShortVectorMultiply(*this, fl, res);
-	return res;
-}
-
-
-
-
-
-
-
-inline void IntVector4D::Init(int ix, int iy, int iz, int iw)
-{
-	x = ix; y = iy; z = iz; w = iw;
-}
-
-FORCEINLINE void IntVector4D::Set(const IntVector4D& vOther)
-{
-	x = vOther.x;
-	y = vOther.y;
-	z = vOther.z;
-	w = vOther.w;
-}
-
-FORCEINLINE void IntVector4D::Set(const int ix, const int iy, const int iz, const int iw)
-{
-	x = ix;
-	y = iy;
-	z = iz;
-	w = iw;
-}
-
-
-inline int IntVector4D::operator[](int i) const
-{
-	Assert((i >= 0) && (i < 4));
-	return ((int*)this)[i];
-}
-
-inline int& IntVector4D::operator[](int i)
-{
-	Assert((i >= 0) && (i < 4));
-	return ((int*)this)[i];
-}
-
-inline int* IntVector4D::Base()
-{
-	return (int*)this;
-}
-
-inline int const* IntVector4D::Base() const
-{
-	return (int const*)this;
-}
-
-
-inline bool IntVector4D::operator==(const IntVector4D& src) const
-{
-	return (src.x == x) && (src.y == y) && (src.z == z) && (src.w == w);
-}
-
-inline bool IntVector4D::operator!=(const IntVector4D& src) const
-{
-	return (src.x != x) || (src.y != y) || (src.z != z) || (src.w != w);
-}
-
-
-
-FORCEINLINE  IntVector4D& IntVector4D::operator+=(const IntVector4D& v)
-{
-	x += v.x; y += v.y; z += v.z; w += v.w;
-	return *this;
-}
-
-FORCEINLINE  IntVector4D& IntVector4D::operator-=(const IntVector4D& v)
-{
-	x -= v.x; y -= v.y; z -= v.z; w -= v.w;
-	return *this;
-}
-
-FORCEINLINE  IntVector4D& IntVector4D::operator*=(float fl)
-{
-	x *= fl;
-	y *= fl;
-	z *= fl;
-	w *= fl;
-	return *this;
-}
-
-FORCEINLINE  IntVector4D& IntVector4D::operator*=(const IntVector4D& v)
-{
-	x *= v.x;
-	y *= v.y;
-	z *= v.z;
-	w *= v.w;
-	return *this;
-}
-
-FORCEINLINE  IntVector4D& IntVector4D::operator/=(float fl)
-{
-	Assert(fl != 0.0f);
-	float oofl = 1.0f / fl;
-	x *= oofl;
-	y *= oofl;
-	z *= oofl;
-	w *= oofl;
-	return *this;
-}
-
-FORCEINLINE  IntVector4D& IntVector4D::operator/=(const IntVector4D& v)
-{
-	Assert(v.x != 0 && v.y != 0 && v.z != 0 && v.w != 0);
-	x /= v.x;
-	y /= v.y;
-	z /= v.z;
-	w /= v.w;
-	return *this;
-}
-
-FORCEINLINE void IntVector4DMultiply(const IntVector4D& src, float fl, IntVector4D& res)
-{
-	Assert(IsFinite(fl));
-	res.x = src.x * fl;
-	res.y = src.y * fl;
-	res.z = src.z * fl;
-	res.w = src.w * fl;
-}
-
-FORCEINLINE IntVector4D IntVector4D::operator*(float fl) const
-{
-	IntVector4D res;
-	IntVector4DMultiply(*this, fl, res);
-	return res;
-}
-
-
-
-
-FORCEINLINE void VectorAdd(const Vector& a, const Vector& b, Vector& c)
-{
-	CHECK_VALID(a);
-	CHECK_VALID(b);
-	c.x = a.x + b.x;
-	c.y = a.y + b.y;
-	c.z = a.z + b.z;
-}
-
-FORCEINLINE void VectorSubtract(const Vector& a, const Vector& b, Vector& c)
-{
-	CHECK_VALID(a);
-	CHECK_VALID(b);
-	c.x = a.x - b.x;
-	c.y = a.y - b.y;
-	c.z = a.z - b.z;
-}
-
-FORCEINLINE void VectorMultiply(const Vector& a, vec_t b, Vector& c)
-{
-	CHECK_VALID(a);
-	Assert(IsFinite(b));
-	c.x = a.x * b;
-	c.y = a.y * b;
-	c.z = a.z * b;
-}
-
-FORCEINLINE void VectorMultiply(const Vector& a, const Vector& b, Vector& c)
-{
-	CHECK_VALID(a);
-	CHECK_VALID(b);
-	c.x = a.x * b.x;
-	c.y = a.y * b.y;
-	c.z = a.z * b.z;
-}
-
-inline void VectorScale(const Vector& in, vec_t scale, Vector& result)
-{
-	VectorMultiply(in, scale, result);
-}
-
-
-FORCEINLINE void VectorDivide(const Vector& a, vec_t b, Vector& c)
-{
-	CHECK_VALID(a);
-	Assert(b != 0.0f);
-	vec_t oob = 1.0f / b;
-	c.x = a.x * oob;
-	c.y = a.y * oob;
-	c.z = a.z * oob;
-}
-
-FORCEINLINE void VectorDivide(const Vector& a, const Vector& b, Vector& c)
-{
-	CHECK_VALID(a);
-	CHECK_VALID(b);
-	Assert((b.x != 0.0f) && (b.y != 0.0f) && (b.z != 0.0f));
-	c.x = a.x / b.x;
-	c.y = a.y / b.y;
-	c.z = a.z / b.z;
-}
-
-inline void	Vector::MulAdd(const Vector& a, const Vector& b, float scalar)
-{
-	CHECK_VALID(a);
-	CHECK_VALID(b);
-	x = a.x + b.x * scalar;
-	y = a.y + b.y * scalar;
-	z = a.z + b.z * scalar;
-}
-
-inline void VectorLerp(const Vector& src1, const Vector& src2, vec_t t, Vector& dest)
-{
-	CHECK_VALID(src1);
-	CHECK_VALID(src2);
-	dest.x = src1.x + (src2.x - src1.x) * t;
-	dest.y = src1.y + (src2.y - src1.y) * t;
-	dest.z = src1.z + (src2.z - src1.z) * t;
-}
-
-inline Vector VectorLerp(const Vector& src1, const Vector& src2, vec_t t)
-{
-	Vector result;
-	VectorLerp(src1, src2, t, result);
-	return result;
-}
-
-inline Vector& AllocTempVector()
-{
-	static Vector s_vecTemp[128];
-	static CInterlockedInt s_nIndex;
-
-	int nIndex;
-	for (;;)
-	{
-		int nOldIndex = s_nIndex;
-		nIndex = ((nOldIndex + 0x10001) & 0x7F);
-
-		if (s_nIndex.AssignIf(nOldIndex, nIndex))
-		{
-			break;
-		}
-		ThreadPause();
-	}
-	return s_vecTemp[nIndex];
-}
-
-
-
-FORCEINLINE vec_t DotProduct(const Vector& a, const Vector& b)
-{
-	CHECK_VALID(a);
-	CHECK_VALID(b);
-	return(a.x * b.x + a.y * b.y + a.z * b.z);
-}
-
-inline vec_t Vector::Dot(const Vector& vOther) const
-{
-	CHECK_VALID(vOther);
-	return DotProduct(*this, vOther);
-}
-
-inline void CrossProduct(const Vector& a, const Vector& b, Vector& result)
-{
-	CHECK_VALID(a);
-	CHECK_VALID(b);
-	Assert(&a != &result);
-	Assert(&b != &result);
-	result.x = a.y * b.z - a.z * b.y;
-	result.y = a.z * b.x - a.x * b.z;
-	result.z = a.x * b.y - a.y * b.x;
-}
-
-inline vec_t DotProductAbs(const Vector& v0, const Vector& v1)
-{
-	CHECK_VALID(v0);
-	CHECK_VALID(v1);
-	return FloatMakePositive(v0.x * v1.x) + FloatMakePositive(v0.y * v1.y) + FloatMakePositive(v0.z * v1.z);
-}
-
-inline vec_t DotProductAbs(const Vector& v0, const float* v1)
-{
-	return FloatMakePositive(v0.x * v1[0]) + FloatMakePositive(v0.y * v1[1]) + FloatMakePositive(v0.z * v1[2]);
-}
-
-inline vec_t VectorLength(const Vector& v)
-{
-	CHECK_VALID(v);
-	return (vec_t)FastSqrt(v.x * v.x + v.y * v.y + v.z * v.z);
-}
-
-
-inline vec_t Vector::Length(void) const
-{
-	CHECK_VALID(*this);
-	return VectorLength(*this);
-}
-
-
-
-bool Vector::WithinAABox(Vector const& boxmin, Vector const& boxmax)
-{
-	return (
-		(x >= boxmin.x) && (x <= boxmax.x) &&
-		(y >= boxmin.y) && (y <= boxmax.y) &&
-		(z >= boxmin.z) && (z <= boxmax.z)
-		);
-}
-
-inline vec_t Vector::DistTo(const Vector& vOther) const
-{
-	Vector delta;
-	VectorSubtract(*this, vOther, delta);
-	return delta.Length();
-}
-
-
-inline bool VectorsAreEqual(const Vector& src1, const Vector& src2, float tolerance)
-{
-	if (FloatMakePositive(src1.x - src2.x) > tolerance)
-		return false;
-	if (FloatMakePositive(src1.y - src2.y) > tolerance)
-		return false;
-	return (FloatMakePositive(src1.z - src2.z) <= tolerance);
-}
-
-
-inline void ComputeClosestPoint(const Vector& vecStart, float flMaxDist, const Vector& vecTarget, Vector* pResult)
-{
-	Vector vecDelta;
-	VectorSubtract(vecTarget, vecStart, vecDelta);
-	float flDistSqr = vecDelta.LengthSqr();
-	if (flDistSqr <= flMaxDist * flMaxDist)
-	{
-		*pResult = vecTarget;
-	}
-	else
-	{
-		vecDelta /= FastSqrt(flDistSqr);
-		VectorMA(vecStart, flMaxDist, vecDelta, *pResult);
-	}
-}
-
-
-inline void VectorAbs(const Vector& src, Vector& dst)
-{
-	dst.x = FloatMakePositive(src.x);
-	dst.y = FloatMakePositive(src.y);
-	dst.z = FloatMakePositive(src.z);
-}
-
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline Vector Vector::Min(const Vector& vOther) const
-{
-	return Vector(x < vOther.x ? x : vOther.x,
-		y < vOther.y ? y : vOther.y,
-		z < vOther.z ? z : vOther.z);
-}
-
-inline Vector Vector::Max(const Vector& vOther) const
-{
-	return Vector(x > vOther.x ? x : vOther.x,
-		y > vOther.y ? y : vOther.y,
-		z > vOther.z ? z : vOther.z);
-}
-
-
-inline Vector Vector::operator-(void) const
-{
-	return Vector(-x, -y, -z);
-}
-
-inline Vector Vector::operator+(const Vector& v) const
-{
-	Vector res;
-	VectorAdd(*this, v, res);
-	return res;
-}
-
-inline Vector Vector::operator-(const Vector& v) const
-{
-	Vector res;
-	VectorSubtract(*this, v, res);
-	return res;
-}
-
-inline Vector Vector::operator*(float fl) const
-{
-	Vector res;
-	VectorMultiply(*this, fl, res);
-	return res;
-}
-
-inline Vector Vector::operator*(const Vector& v) const
-{
-	Vector res;
-	VectorMultiply(*this, v, res);
-	return res;
-}
-
-inline Vector Vector::operator/(float fl) const
-{
-	Vector res;
-	VectorDivide(*this, fl, res);
-	return res;
-}
-
-inline Vector Vector::operator/(const Vector& v) const
-{
-	Vector res;
-	VectorDivide(*this, v, res);
-	return res;
-}
-
-inline Vector operator*(float fl, const Vector& v)
-{
-	return v * fl;
-}
-
-inline Vector Vector::Cross(const Vector& vOther) const
-{
-	Vector res;
-	CrossProduct(*this, vOther, res);
-	return res;
-}
-
-inline vec_t Vector::Length2D(void) const
-{
-	return (vec_t)FastSqrt(x * x + y * y);
-}
-
-inline vec_t Vector::Length2DSqr(void) const
-{
-	return (x * x + y * y);
-}
-
-inline Vector CrossProduct(const Vector& a, const Vector& b)
-{
-	return Vector(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x);
-}
-
-inline void VectorMin(const Vector& a, const Vector& b, Vector& result)
-{
-	result.x = fpmin(a.x, b.x);
-	result.y = fpmin(a.y, b.y);
-	result.z = fpmin(a.z, b.z);
-}
-
-inline void VectorMax(const Vector& a, const Vector& b, Vector& result)
-{
-	result.x = fpmax(a.x, b.x);
-	result.y = fpmax(a.y, b.y);
-	result.z = fpmax(a.z, b.z);
-}
-
-inline float ComputeVolume(const Vector& vecMins, const Vector& vecMaxs)
-{
-	Vector vecDelta;
-	VectorSubtract(vecMaxs, vecMins, vecDelta);
-	return DotProduct(vecDelta, vecDelta);
-}
-
-inline Vector RandomVector(float minVal, float maxVal)
-{
-	Vector random;
-	random.Random(minVal, maxVal);
-	return random;
-}
-
-#endif 
-
-inline bool operator==(float const* f, const Vector& v)
-{
-	Assert(0);
-	return false;
-}
-
-inline bool operator==(const Vector& v, float const* f)
-{
-	Assert(0);
-	return false;
-}
-
-inline bool operator!=(float const* f, const Vector& v)
-{
-	Assert(0);
-	return false;
-}
-
-inline bool operator!=(const Vector& v, float const* f)
-{
-	Assert(0);
-	return false;
-}
-
-
-typedef Vector AngularImpulse;
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline AngularImpulse RandomAngularImpulse(float minVal, float maxVal)
-{
-	AngularImpulse	angImp;
-	angImp.Random(minVal, maxVal);
-	return angImp;
-}
-
-#endif
-
-
-class RadianEuler;
-
-class Quaternion				     
-{										   
-public:
-	inline Quaternion(void) {
-
-#ifdef _DEBUG
-#ifdef VECTOR_PARANOIA
-		x = y = z = w = VEC_T_NAN;
-#endif
-#endif
-	}
-	inline Quaternion(vec_t ix, vec_t iy, vec_t iz, vec_t iw) : x(ix), y(iy), z(iz), w(iw) { }
-	inline Quaternion(RadianEuler const& angle);	    
-
-	inline void Init(vec_t ix = 0.0f, vec_t iy = 0.0f, vec_t iz = 0.0f, vec_t iw = 0.0f) { x = ix; y = iy; z = iz; w = iw; }
-
-	bool IsValid() const;
-	void Invalidate();
-
-	bool operator==(const Quaternion& src) const;
-	bool operator!=(const Quaternion& src) const;
-
-	vec_t* Base() { return (vec_t*)this; }
-	const vec_t* Base() const { return (vec_t*)this; }
-
-	vec_t operator[](int i) const;
-	vec_t& operator[](int i);
-
-	vec_t x, y, z, w;
-};
-
-
-inline vec_t& Quaternion::operator[](int i)
-{
-	Assert((i >= 0) && (i < 4));
-	return ((vec_t*)this)[i];
-}
-
-inline vec_t Quaternion::operator[](int i) const
-{
-	Assert((i >= 0) && (i < 4));
-	return ((vec_t*)this)[i];
-}
-
-
-inline bool Quaternion::operator==(const Quaternion& src) const
-{
-	return (x == src.x) && (y == src.y) && (z == src.z) && (w == src.w);
-}
-
-inline bool Quaternion::operator!=(const Quaternion& src) const
-{
-	return !operator==(src);
-}
-
-
-inline bool QuaternionsAreEqual(const Quaternion& src1, const Quaternion& src2, float tolerance)
-{
-	if (FloatMakePositive(src1.x - src2.x) > tolerance)
-		return false;
-	if (FloatMakePositive(src1.y - src2.y) > tolerance)
-		return false;
-	if (FloatMakePositive(src1.z - src2.z) > tolerance)
-		return false;
-	return (FloatMakePositive(src1.w - src2.w) <= tolerance);
-}
-
-
-class ALIGN16 QuaternionAligned : public Quaternion
-{
-public:
-	inline QuaternionAligned(void) {};
-	inline QuaternionAligned(vec_t X, vec_t Y, vec_t Z, vec_t W)
-	{
-		Init(X, Y, Z, W);
-	}
-
-#ifdef VECTOR_NO_SLOW_OPERATIONS
-
-private:
-	QuaternionAligned(const QuaternionAligned& vOther);
-	QuaternionAligned(const Quaternion& vOther);
-
-#else
-public:
-	explicit QuaternionAligned(const Quaternion& vOther)
-	{
-		Init(vOther.x, vOther.y, vOther.z, vOther.w);
-	}
-
-	QuaternionAligned& operator=(const Quaternion& vOther)
-	{
-		Init(vOther.x, vOther.y, vOther.z, vOther.w);
-		return *this;
-	}
-
-#endif
-} ALIGN16_POST;
-
-
-class QAngle;
-class RadianEuler
-{
-public:
-	inline RadianEuler(void) { }
-	inline RadianEuler(vec_t X, vec_t Y, vec_t Z) { x = X; y = Y; z = Z; }
-	inline RadianEuler(Quaternion const& q);	    
-	inline RadianEuler(QAngle const& angles);	    
-
-	inline void Init(vec_t ix = 0.0f, vec_t iy = 0.0f, vec_t iz = 0.0f) { x = ix; y = iy; z = iz; }
-
-	QAngle ToQAngle(void) const;
-	bool IsValid() const;
-	void Invalidate();
-
-	vec_t operator[](int i) const;
-	vec_t& operator[](int i);
-
-	vec_t x, y, z;
-};
-
-
-extern void AngleQuaternion(RadianEuler const& angles, Quaternion& qt);
-extern void QuaternionAngles(Quaternion const& q, RadianEuler& angles);
-
-FORCEINLINE void NetworkVarConstruct(Quaternion& q) { q.x = q.y = q.z = q.w = 0.0f; }
-
-inline Quaternion::Quaternion(RadianEuler const& angle)
-{
-	AngleQuaternion(angle, *this);
-}
-
-inline bool Quaternion::IsValid() const
-{
-	return IsFinite(x) && IsFinite(y) && IsFinite(z) && IsFinite(w);
-}
-
-inline void Quaternion::Invalidate()
-{
-	x = y = z = w = VEC_T_NAN;
-}
-
-inline RadianEuler::RadianEuler(Quaternion const& q)
-{
-	QuaternionAngles(q, *this);
-}
-
-inline void VectorCopy(RadianEuler const& src, RadianEuler& dst)
-{
-	CHECK_VALID(src);
-	dst.x = src.x;
-	dst.y = src.y;
-	dst.z = src.z;
-}
-
-inline void VectorScale(RadianEuler const& src, float b, RadianEuler& dst)
-{
-	CHECK_VALID(src);
-	Assert(IsFinite(b));
-	dst.x = src.x * b;
-	dst.y = src.y * b;
-	dst.z = src.z * b;
-}
-
-inline bool RadianEuler::IsValid() const
-{
-	return IsFinite(x) && IsFinite(y) && IsFinite(z);
-}
-
-inline void RadianEuler::Invalidate()
-{
-	x = y = z = VEC_T_NAN;
-}
-
-
-inline vec_t& RadianEuler::operator[](int i)
-{
-	Assert((i >= 0) && (i < 3));
-	return ((vec_t*)this)[i];
-}
-
-inline vec_t RadianEuler::operator[](int i) const
-{
-	Assert((i >= 0) && (i < 3));
-	return ((vec_t*)this)[i];
-}
-
-
-class QAngleByValue;
-
-class QAngle
-{
-public:
-	vec_t x, y, z;
-
-	QAngle(void);
-	QAngle(vec_t X, vec_t Y, vec_t Z);
-	operator QAngleByValue& () { return *((QAngleByValue*)(this)); }
-	operator const QAngleByValue& () const { return *((const QAngleByValue*)(this)); }
-
-	void Init(vec_t ix = 0.0f, vec_t iy = 0.0f, vec_t iz = 0.0f);
-	void Random(vec_t minVal, vec_t maxVal);
-
-	bool IsValid() const;
-	void Invalidate();
-
-	vec_t operator[](int i) const;
-	vec_t& operator[](int i);
-
-	vec_t* Base();
-	vec_t const* Base() const;
-
-	bool operator==(const QAngle& v) const;
-	bool operator!=(const QAngle& v) const;
-
-	QAngle& operator+=(const QAngle& v);
-	QAngle& operator-=(const QAngle& v);
-	QAngle& operator*=(float s);
-	QAngle& operator/=(float s);
-
-	vec_t	Length() const;
-	vec_t	LengthSqr() const;
-
-	QAngle& operator=(const QAngle& src);
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-	QAngle	operator-(void) const;
-
-	QAngle	operator+(const QAngle& v) const;
-	QAngle	operator-(const QAngle& v) const;
-	QAngle	operator*(float fl) const;
-	QAngle	operator/(float fl) const;
-#else
-
-private:
-	QAngle(const QAngle& vOther);
-
-#endif
-};
-
-FORCEINLINE void NetworkVarConstruct(QAngle& q) { q.x = q.y = q.z = 0.0f; }
-
-class QAngleByValue : public QAngle
-{
-public:
-	QAngleByValue(void) : QAngle() {}
-	QAngleByValue(vec_t X, vec_t Y, vec_t Z) : QAngle(X, Y, Z) {}
-	QAngleByValue(const QAngleByValue& vOther) { *this = vOther; }
-};
-
-
-inline void VectorAdd(const QAngle& a, const QAngle& b, QAngle& result)
-{
-	CHECK_VALID(a);
-	CHECK_VALID(b);
-	result.x = a.x + b.x;
-	result.y = a.y + b.y;
-	result.z = a.z + b.z;
-}
-
-inline void VectorMA(const QAngle& start, float scale, const QAngle& direction, QAngle& dest)
-{
-	CHECK_VALID(start);
-	CHECK_VALID(direction);
-	dest.x = start.x + scale * direction.x;
-	dest.y = start.y + scale * direction.y;
-	dest.z = start.z + scale * direction.z;
-}
-
-
-inline QAngle::QAngle(void)
-{
-#ifdef _DEBUG
-#ifdef VECTOR_PARANOIA
-	x = y = z = VEC_T_NAN;
-#endif
-#endif
-}
-
-inline QAngle::QAngle(vec_t X, vec_t Y, vec_t Z)
-{
-	x = X; y = Y; z = Z;
-	CHECK_VALID(*this);
-}
-
-
-inline void QAngle::Init(vec_t ix, vec_t iy, vec_t iz)
-{
-	x = ix; y = iy; z = iz;
-	CHECK_VALID(*this);
-}
-
-inline void QAngle::Random(vec_t minVal, vec_t maxVal)
-{
-	x = minVal + ((float)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-	y = minVal + ((float)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-	z = minVal + ((float)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-	CHECK_VALID(*this);
-}
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline QAngle RandomAngle(float minVal, float maxVal)
-{
-	Vector random;
-	random.Random(minVal, maxVal);
-	QAngle ret(random.x, random.y, random.z);
-	return ret;
-}
-
-#endif
-
-
-inline RadianEuler::RadianEuler(QAngle const& angles)
-{
-	Init(
-		angles.z * 3.14159265358979323846f / 180.f,
-		angles.x * 3.14159265358979323846f / 180.f,
-		angles.y * 3.14159265358979323846f / 180.f);
-}
-
-
-
-
-inline QAngle RadianEuler::ToQAngle(void) const
-{
-	return QAngle(
-		y * 180.f / 3.14159265358979323846f,
-		z * 180.f / 3.14159265358979323846f,
-		x * 180.f / 3.14159265358979323846f);
-}
-
-
-inline QAngle& QAngle::operator=(const QAngle& vOther)
-{
-	CHECK_VALID(vOther);
-	x = vOther.x; y = vOther.y; z = vOther.z;
-	return *this;
-}
-
-
-inline vec_t& QAngle::operator[](int i)
-{
-	Assert((i >= 0) && (i < 3));
-	return ((vec_t*)this)[i];
-}
-
-inline vec_t QAngle::operator[](int i) const
-{
-	Assert((i >= 0) && (i < 3));
-	return ((vec_t*)this)[i];
-}
-
-
-inline vec_t* QAngle::Base()
-{
-	return (vec_t*)this;
-}
-
-inline vec_t const* QAngle::Base() const
-{
-	return (vec_t const*)this;
-}
-
-
-inline bool QAngle::IsValid() const
-{
-	return IsFinite(x) && IsFinite(y) && IsFinite(z);
-}
-
-inline void QAngle::Invalidate()
-{
-	x = y = z = VEC_T_NAN;
-}
-
-inline bool QAngle::operator==(const QAngle& src) const
-{
-	CHECK_VALID(src);
-	CHECK_VALID(*this);
-	return (src.x == x) && (src.y == y) && (src.z == z);
-}
-
-inline bool QAngle::operator!=(const QAngle& src) const
-{
-	CHECK_VALID(src);
-	CHECK_VALID(*this);
-	return (src.x != x) || (src.y != y) || (src.z != z);
-}
-
-
-inline void VectorCopy(const QAngle& src, QAngle& dst)
-{
-	CHECK_VALID(src);
-	dst.x = src.x;
-	dst.y = src.y;
-	dst.z = src.z;
-}
-
-
-inline QAngle& QAngle::operator+=(const QAngle& v)
-{
-	CHECK_VALID(*this);
-	CHECK_VALID(v);
-	x += v.x; y += v.y; z += v.z;
-	return *this;
-}
-
-inline QAngle& QAngle::operator-=(const QAngle& v)
-{
-	CHECK_VALID(*this);
-	CHECK_VALID(v);
-	x -= v.x; y -= v.y; z -= v.z;
-	return *this;
-}
-
-inline QAngle& QAngle::operator*=(float fl)
-{
-	x *= fl;
-	y *= fl;
-	z *= fl;
-	CHECK_VALID(*this);
-	return *this;
-}
-
-inline QAngle& QAngle::operator/=(float fl)
-{
-	Assert(fl != 0.0f);
-	float oofl = 1.0f / fl;
-	x *= oofl;
-	y *= oofl;
-	z *= oofl;
-	CHECK_VALID(*this);
-	return *this;
-}
-
-
-inline vec_t QAngle::Length() const
-{
-	CHECK_VALID(*this);
-	return (vec_t)FastSqrt(LengthSqr());
-}
-
-
-inline vec_t QAngle::LengthSqr() const
-{
-	CHECK_VALID(*this);
-	return x * x + y * y + z * z;
-}
-
-
-inline bool QAnglesAreEqual(const QAngle& src1, const QAngle& src2, float tolerance = 0.0f)
-{
-	if (FloatMakePositive(src1.x - src2.x) > tolerance)
-		return false;
-	if (FloatMakePositive(src1.y - src2.y) > tolerance)
-		return false;
-	return (FloatMakePositive(src1.z - src2.z) <= tolerance);
-}
-
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline QAngle QAngle::operator-(void) const
-{
-	QAngle ret(-x, -y, -z);
-	return ret;
-}
-
-inline QAngle QAngle::operator+(const QAngle& v) const
-{
-	QAngle res;
-	res.x = x + v.x;
-	res.y = y + v.y;
-	res.z = z + v.z;
-	return res;
-}
-
-inline QAngle QAngle::operator-(const QAngle& v) const
-{
-	QAngle res;
-	res.x = x - v.x;
-	res.y = y - v.y;
-	res.z = z - v.z;
-	return res;
-}
-
-inline QAngle QAngle::operator*(float fl) const
-{
-	QAngle res;
-	res.x = x * fl;
-	res.y = y * fl;
-	res.z = z * fl;
-	return res;
-}
-
-inline QAngle QAngle::operator/(float fl) const
-{
-	QAngle res;
-	res.x = x / fl;
-	res.y = y / fl;
-	res.z = z / fl;
-	return res;
-}
-
-inline QAngle operator*(float fl, const QAngle& v)
-{
-	QAngle ret(v * fl);
-	return ret;
-}
-
-#endif  
-
-
-inline void QAngleToAngularImpulse(const QAngle& angles, AngularImpulse& impulse)
-{
-	impulse.x = angles.z;
-	impulse.y = angles.x;
-	impulse.z = angles.y;
-}
-
-inline void AngularImpulseToQAngle(const AngularImpulse& impulse, QAngle& angles)
-{
-	angles.x = impulse.y;
-	angles.y = impulse.z;
-	angles.z = impulse.x;
-}
-
-#if !defined( _X360 )
-
-FORCEINLINE vec_t InvRSquared(float const* v)
-{
-#if defined(__i386__) || defined(_M_IX86)
-	float sqrlen = v[0] * v[0] + v[1] * v[1] + v[2] * v[2] + 1.0e-10f, result;
-	_mm_store_ss(&result, _mm_rcp_ss(_mm_max_ss(_mm_set_ss(1.0f), _mm_load_ss(&sqrlen))));
-	return result;
-#else
-	return 1.f / fpmax(1.f, v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-#endif
-}
-
-FORCEINLINE vec_t InvRSquared(const Vector& v)
-{
-	return InvRSquared(&v.x);
-}
-
-#if defined(__i386__) || defined(_M_IX86)
-inline void _SSE_RSqrtInline(float a, float* out)
-{
-	__m128  xx = _mm_load_ss(&a);
-	__m128  xr = _mm_rsqrt_ss(xx);
-	__m128  xt;
-	xt = _mm_mul_ss(xr, xr);
-	xt = _mm_mul_ss(xt, xx);
-	xt = _mm_sub_ss(_mm_set_ss(3.f), xt);
-	xt = _mm_mul_ss(xt, _mm_set_ss(0.5f));
-	xr = _mm_mul_ss(xr, xt);
-	_mm_store_ss(out, xr);
-}
-#endif
-
-FORCEINLINE float VectorNormalize(Vector& vec)
-{
-#ifndef DEBUG     
-#if defined(__i386__) || defined(_M_IX86)
-#define DO_SSE_OPTIMIZATION
-#endif
-#endif
-
-#if defined( DO_SSE_OPTIMIZATION )
-	float sqrlen = vec.LengthSqr() + 1.0e-10f, invlen;
-	_SSE_RSqrtInline(sqrlen, &invlen);
-	vec.x *= invlen;
-	vec.y *= invlen;
-	vec.z *= invlen;
-	return sqrlen * invlen;
-#else
-	extern float (FASTCALL * pfVectorNormalize)(Vector & v);
-	return (*pfVectorNormalize)(vec);
-#endif
-}
-
-FORCEINLINE float VectorNormalize(float* v)
-{
-	return VectorNormalize(*(reinterpret_cast<Vector*>(v)));
-}
-
-FORCEINLINE void VectorNormalizeFast(Vector& vec)
-{
-	VectorNormalize(vec);
-}
-
-#else
-
-FORCEINLINE float _VMX_InvRSquared(const Vector& v)
-{
-	XMVECTOR xmV = XMVector3ReciprocalLength(XMLoadVector3(v.Base()));
-	xmV = XMVector3Dot(xmV, xmV);
-	return xmV.x;
-}
-
-FORCEINLINE float _VMX_VectorNormalize(Vector& vec)
-{
-	float mag = XMVector3Length(XMLoadVector3(vec.Base())).x;
-	float den = 1.f / (mag + FLT_EPSILON);
-	vec.x *= den;
-	vec.y *= den;
-	vec.z *= den;
-	return mag;
-}
-
-#define InvRSquared(x) _VMX_InvRSquared(x)
-
-FORCEINLINE float VectorNormalize(Vector& v)
-{
-	return _VMX_VectorNormalize(v);
-}
-FORCEINLINE float VectorNormalize(float* pV)
-{
-	return _VMX_VectorNormalize(*(reinterpret_cast<Vector*>(pV)));
-}
-
-FORCEINLINE void VectorNormalizeFast(Vector& vec)
-{
-	XMVECTOR xmV = XMVector3LengthEst(XMLoadVector3(vec.Base()));
-	float den = 1.f / (xmV.x + FLT_EPSILON);
-	vec.x *= den;
-	vec.y *= den;
-	vec.z *= den;
-}
-
-#endif  
-
-
-inline vec_t Vector::NormalizeInPlace()
-{
-	return VectorNormalize(*this);
-}
-
-inline Vector Vector::Normalized() const
-{
-	Vector norm = *this;
-	VectorNormalize(norm);
-	return norm;
-}
-
-inline bool Vector::IsLengthGreaterThan(float val) const
-{
-	return LengthSqr() > val * val;
-}
-
-inline bool Vector::IsLengthLessThan(float val) const
-{
-	return LengthSqr() < val * val;
-}
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/vector2d.h b/SpyCustom/vector2d.h
deleted file mode 100644
index 99e80cb..0000000
--- a/SpyCustom/vector2d.h
+++ /dev/null
@@ -1,533 +0,0 @@
-#ifndef VECTOR2D_H
-#define VECTOR2D_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <math.h>
-#include <float.h>
-
-#include <stdlib.h>
-
-#include "dbg.h"
-#include "math_pfns.h"
-
-
-class Vector2D
-{
-public:
-	vec_t x, y;
-
-	Vector2D(void);
-	Vector2D(vec_t X, vec_t Y);
-	Vector2D(const float* pFloat);
-
-	void Init(vec_t ix = 0.0f, vec_t iy = 0.0f);
-
-	bool IsValid() const;
-
-	vec_t operator[](int i) const;
-	vec_t& operator[](int i);
-
-	vec_t* Base();
-	vec_t const* Base() const;
-
-	void Random(float minVal, float maxVal);
-
-	bool operator==(const Vector2D& v) const;
-	bool operator!=(const Vector2D& v) const;
-
-	Vector2D& operator+=(const Vector2D& v);
-	Vector2D& operator-=(const Vector2D& v);
-	Vector2D& operator*=(const Vector2D& v);
-	Vector2D& operator*=(float s);
-	Vector2D& operator/=(const Vector2D& v);
-	Vector2D& operator/=(float s);
-
-	void	Negate();
-
-	vec_t	Length() const;
-
-	vec_t	LengthSqr(void) const;
-
-	bool IsZero(float tolerance = 0.01f) const
-	{
-		return (x > -tolerance && x < tolerance&&
-			y > -tolerance && y < tolerance);
-	}
-
-	vec_t	NormalizeInPlace();
-
-	bool	IsLengthGreaterThan(float val) const;
-	bool	IsLengthLessThan(float val) const;
-
-	vec_t	DistTo(const Vector2D& vOther) const;
-
-	vec_t	DistToSqr(const Vector2D& vOther) const;
-
-	void	CopyToArray(float* rgfl) const;
-
-	void	MulAdd(const Vector2D& a, const Vector2D& b, float scalar);
-
-	vec_t	Dot(const Vector2D& vOther) const;
-
-	Vector2D& operator=(const Vector2D& vOther);
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-	Vector2D(const Vector2D& vOther);
-
-	Vector2D	operator-(void) const;
-
-	Vector2D	operator+(const Vector2D& v) const;
-	Vector2D	operator-(const Vector2D& v) const;
-	Vector2D	operator*(const Vector2D& v) const;
-	Vector2D	operator/(const Vector2D& v) const;
-	Vector2D	operator*(float fl) const;
-	Vector2D	operator/(float fl) const;
-
-	Vector2D	Cross(const Vector2D& vOther) const;
-
-	Vector2D	Min(const Vector2D& vOther) const;
-	Vector2D	Max(const Vector2D& vOther) const;
-
-#else
-
-private:
-	Vector2D(const Vector2D& vOther);
-#endif
-};
-
-const Vector2D vec2_origin(0, 0);
-const Vector2D vec2_invalid(FLT_MAX, FLT_MAX);
-
-void Vector2DClear(Vector2D& a);
-
-void Vector2DCopy(const Vector2D& src, Vector2D& dst);
-
-void Vector2DAdd(const Vector2D& a, const Vector2D& b, Vector2D& result);
-void Vector2DSubtract(const Vector2D& a, const Vector2D& b, Vector2D& result);
-void Vector2DMultiply(const Vector2D& a, vec_t b, Vector2D& result);
-void Vector2DMultiply(const Vector2D& a, const Vector2D& b, Vector2D& result);
-void Vector2DDivide(const Vector2D& a, vec_t b, Vector2D& result);
-void Vector2DDivide(const Vector2D& a, const Vector2D& b, Vector2D& result);
-void Vector2DMA(const Vector2D& start, float s, const Vector2D& dir, Vector2D& result);
-
-void Vector2DMin(const Vector2D& a, const Vector2D& b, Vector2D& result);
-void Vector2DMax(const Vector2D& a, const Vector2D& b, Vector2D& result);
-
-#define Vector2DExpand( v ) (v).x, (v).y
-
-vec_t Vector2DNormalize(Vector2D& v);
-
-vec_t Vector2DLength(const Vector2D& v);
-
-vec_t DotProduct2D(const Vector2D& a, const Vector2D& b);
-
-void Vector2DLerp(const Vector2D& src1, const Vector2D& src2, vec_t t, Vector2D& dest);
-
-
-
-inline Vector2D::Vector2D(void)
-{
-#ifdef _DEBUG
-	x = y = VEC_T_NAN;
-#endif
-}
-
-inline Vector2D::Vector2D(vec_t X, vec_t Y)
-{
-	x = X; y = Y;
-	Assert(IsValid());
-}
-
-inline Vector2D::Vector2D(const float* pFloat)
-{
-	Assert(pFloat);
-	x = pFloat[0]; y = pFloat[1];
-	Assert(IsValid());
-}
-
-
-inline Vector2D::Vector2D(const Vector2D& vOther)
-{
-	Assert(vOther.IsValid());
-	x = vOther.x; y = vOther.y;
-}
-
-inline void Vector2D::Init(vec_t ix, vec_t iy)
-{
-	x = ix; y = iy;
-	Assert(IsValid());
-}
-
-inline void Vector2D::Random(float minVal, float maxVal)
-{
-	x = minVal + ((float)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-	y = minVal + ((float)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-}
-
-inline void Vector2DClear(Vector2D& a)
-{
-	a.x = a.y = 0.0f;
-}
-
-inline Vector2D& Vector2D::operator=(const Vector2D& vOther)
-{
-	Assert(vOther.IsValid());
-	x = vOther.x; y = vOther.y;
-	return *this;
-}
-
-inline vec_t& Vector2D::operator[](int i)
-{
-	Assert((i >= 0) && (i < 2));
-	return ((vec_t*)this)[i];
-}
-
-inline vec_t Vector2D::operator[](int i) const
-{
-	Assert((i >= 0) && (i < 2));
-	return ((vec_t*)this)[i];
-}
-
-inline vec_t* Vector2D::Base()
-{
-	return (vec_t*)this;
-}
-
-inline vec_t const* Vector2D::Base() const
-{
-	return (vec_t const*)this;
-}
-
-inline bool Vector2D::IsValid() const
-{
-	return IsFinite(x) && IsFinite(y);
-}
-
-inline bool Vector2D::operator==(const Vector2D& src) const
-{
-	Assert(src.IsValid() && IsValid());
-	return (src.x == x) && (src.y == y);
-}
-
-inline bool Vector2D::operator!=(const Vector2D& src) const
-{
-	Assert(src.IsValid() && IsValid());
-	return (src.x != x) || (src.y != y);
-}
-
-
-inline void Vector2DCopy(const Vector2D& src, Vector2D& dst)
-{
-	Assert(src.IsValid());
-	dst.x = src.x;
-	dst.y = src.y;
-}
-
-inline void	Vector2D::CopyToArray(float* rgfl) const
-{
-	Assert(IsValid());
-	Assert(rgfl);
-	rgfl[0] = x; rgfl[1] = y;
-}
-
-inline void Vector2D::Negate()
-{
-	Assert(IsValid());
-	x = -x; y = -y;
-}
-
-inline Vector2D& Vector2D::operator+=(const Vector2D& v)
-{
-	Assert(IsValid() && v.IsValid());
-	x += v.x; y += v.y;
-	return *this;
-}
-
-inline Vector2D& Vector2D::operator-=(const Vector2D& v)
-{
-	Assert(IsValid() && v.IsValid());
-	x -= v.x; y -= v.y;
-	return *this;
-}
-
-inline Vector2D& Vector2D::operator*=(float fl)
-{
-	x *= fl;
-	y *= fl;
-	Assert(IsValid());
-	return *this;
-}
-
-inline Vector2D& Vector2D::operator*=(const Vector2D& v)
-{
-	x *= v.x;
-	y *= v.y;
-	Assert(IsValid());
-	return *this;
-}
-
-inline Vector2D& Vector2D::operator/=(float fl)
-{
-	Assert(fl != 0.0f);
-	float oofl = 1.0f / fl;
-	x *= oofl;
-	y *= oofl;
-	Assert(IsValid());
-	return *this;
-}
-
-inline Vector2D& Vector2D::operator/=(const Vector2D& v)
-{
-	Assert(v.x != 0.0f && v.y != 0.0f);
-	x /= v.x;
-	y /= v.y;
-	Assert(IsValid());
-	return *this;
-}
-
-inline void Vector2DAdd(const Vector2D& a, const Vector2D& b, Vector2D& c)
-{
-	Assert(a.IsValid() && b.IsValid());
-	c.x = a.x + b.x;
-	c.y = a.y + b.y;
-}
-
-inline void Vector2DSubtract(const Vector2D& a, const Vector2D& b, Vector2D& c)
-{
-	Assert(a.IsValid() && b.IsValid());
-	c.x = a.x - b.x;
-	c.y = a.y - b.y;
-}
-
-inline void Vector2DMultiply(const Vector2D& a, vec_t b, Vector2D& c)
-{
-	Assert(a.IsValid() && IsFinite(b));
-	c.x = a.x * b;
-	c.y = a.y * b;
-}
-
-inline void Vector2DMultiply(const Vector2D& a, const Vector2D& b, Vector2D& c)
-{
-	Assert(a.IsValid() && b.IsValid());
-	c.x = a.x * b.x;
-	c.y = a.y * b.y;
-}
-
-
-inline void Vector2DDivide(const Vector2D& a, vec_t b, Vector2D& c)
-{
-	Assert(a.IsValid());
-	Assert(b != 0.0f);
-	vec_t oob = 1.0f / b;
-	c.x = a.x * oob;
-	c.y = a.y * oob;
-}
-
-inline void Vector2DDivide(const Vector2D& a, const Vector2D& b, Vector2D& c)
-{
-	Assert(a.IsValid());
-	Assert((b.x != 0.0f) && (b.y != 0.0f));
-	c.x = a.x / b.x;
-	c.y = a.y / b.y;
-}
-
-inline void Vector2DMA(const Vector2D& start, float s, const Vector2D& dir, Vector2D& result)
-{
-	Assert(start.IsValid() && IsFinite(s) && dir.IsValid());
-	result.x = start.x + s * dir.x;
-	result.y = start.y + s * dir.y;
-}
-
-inline void	Vector2D::MulAdd(const Vector2D& a, const Vector2D& b, float scalar)
-{
-	x = a.x + b.x * scalar;
-	y = a.y + b.y * scalar;
-}
-
-inline void Vector2DLerp(const Vector2D& src1, const Vector2D& src2, vec_t t, Vector2D& dest)
-{
-	dest[0] = src1[0] + (src2[0] - src1[0]) * t;
-	dest[1] = src1[1] + (src2[1] - src1[1]) * t;
-}
-
-inline vec_t DotProduct2D(const Vector2D& a, const Vector2D& b)
-{
-	Assert(a.IsValid() && b.IsValid());
-	return(a.x * b.x + a.y * b.y);
-}
-
-inline vec_t Vector2D::Dot(const Vector2D& vOther) const
-{
-	return DotProduct2D(*this, vOther);
-}
-
-
-inline vec_t Vector2DLength(const Vector2D& v)
-{
-	Assert(v.IsValid());
-	return (vec_t)FastSqrt(v.x * v.x + v.y * v.y);
-}
-
-inline vec_t Vector2D::LengthSqr(void) const
-{
-	Assert(IsValid());
-	return (x * x + y * y);
-}
-
-inline vec_t Vector2D::NormalizeInPlace()
-{
-	return Vector2DNormalize(*this);
-}
-
-inline bool Vector2D::IsLengthGreaterThan(float val) const
-{
-	return LengthSqr() > val * val;
-}
-
-inline bool Vector2D::IsLengthLessThan(float val) const
-{
-	return LengthSqr() < val * val;
-}
-
-inline vec_t Vector2D::Length(void) const
-{
-	return Vector2DLength(*this);
-}
-
-
-inline void Vector2DMin(const Vector2D& a, const Vector2D& b, Vector2D& result)
-{
-	result.x = (a.x < b.x) ? a.x : b.x;
-	result.y = (a.y < b.y) ? a.y : b.y;
-}
-
-
-inline void Vector2DMax(const Vector2D& a, const Vector2D& b, Vector2D& result)
-{
-	result.x = (a.x > b.x) ? a.x : b.x;
-	result.y = (a.y > b.y) ? a.y : b.y;
-}
-
-
-inline vec_t Vector2DNormalize(Vector2D& v)
-{
-	Assert(v.IsValid());
-	vec_t l = v.Length();
-	if (l != 0.0f)
-	{
-		v /= l;
-	}
-	else
-	{
-		v.x = v.y = 0.0f;
-	}
-	return l;
-}
-
-
-inline vec_t Vector2D::DistTo(const Vector2D& vOther) const
-{
-	Vector2D delta;
-	Vector2DSubtract(*this, vOther, delta);
-	return delta.Length();
-}
-
-inline vec_t Vector2D::DistToSqr(const Vector2D& vOther) const
-{
-	Vector2D delta;
-	Vector2DSubtract(*this, vOther, delta);
-	return delta.LengthSqr();
-}
-
-
-inline void ComputeClosestPoint2D(const Vector2D& vecStart, float flMaxDist, const Vector2D& vecTarget, Vector2D* pResult)
-{
-	Vector2D vecDelta;
-	Vector2DSubtract(vecTarget, vecStart, vecDelta);
-	float flDistSqr = vecDelta.LengthSqr();
-	if (flDistSqr <= flMaxDist * flMaxDist)
-	{
-		*pResult = vecTarget;
-	}
-	else
-	{
-		vecDelta /= FastSqrt(flDistSqr);
-		Vector2DMA(vecStart, flMaxDist, vecDelta, *pResult);
-	}
-}
-
-
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline Vector2D Vector2D::Min(const Vector2D& vOther) const
-{
-	return Vector2D(x < vOther.x ? x : vOther.x,
-		y < vOther.y ? y : vOther.y);
-}
-
-inline Vector2D Vector2D::Max(const Vector2D& vOther) const
-{
-	return Vector2D(x > vOther.x ? x : vOther.x,
-		y > vOther.y ? y : vOther.y);
-}
-
-
-inline Vector2D Vector2D::operator-(void) const
-{
-	return Vector2D(-x, -y);
-}
-
-inline Vector2D Vector2D::operator+(const Vector2D& v) const
-{
-	Vector2D res;
-	Vector2DAdd(*this, v, res);
-	return res;
-}
-
-inline Vector2D Vector2D::operator-(const Vector2D& v) const
-{
-	Vector2D res;
-	Vector2DSubtract(*this, v, res);
-	return res;
-}
-
-inline Vector2D Vector2D::operator*(float fl) const
-{
-	Vector2D res;
-	Vector2DMultiply(*this, fl, res);
-	return res;
-}
-
-inline Vector2D Vector2D::operator*(const Vector2D& v) const
-{
-	Vector2D res;
-	Vector2DMultiply(*this, v, res);
-	return res;
-}
-
-inline Vector2D Vector2D::operator/(float fl) const
-{
-	Vector2D res;
-	Vector2DDivide(*this, fl, res);
-	return res;
-}
-
-inline Vector2D Vector2D::operator/(const Vector2D& v) const
-{
-	Vector2D res;
-	Vector2DDivide(*this, v, res);
-	return res;
-}
-
-inline Vector2D operator*(float fl, const Vector2D& v)
-{
-	return v * fl;
-}
-
-#endif 
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vector4d.h b/SpyCustom/vector4d.h
deleted file mode 100644
index 56d1cd8..0000000
--- a/SpyCustom/vector4d.h
+++ /dev/null
@@ -1,554 +0,0 @@
-#ifndef VECTOR4D_H
-#define VECTOR4D_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <math.h>
-#include <stdlib.h>		       
-#include <float.h>
-#if !defined( _X360 )
-#include <xmmintrin.h>	  
-#endif
-#include "basetypes.h"	      
-#include "dbg.h"
-#include "math_pfns.h"
-
-class Vector;
-class Vector2D;
-
-class Vector4D
-{
-public:
-	vec_t x, y, z, w;
-
-	Vector4D(void);
-	Vector4D(vec_t X, vec_t Y, vec_t Z, vec_t W);
-	Vector4D(const float* pFloat);
-
-	void Init(vec_t ix = 0.0f, vec_t iy = 0.0f, vec_t iz = 0.0f, vec_t iw = 0.0f);
-
-	bool IsValid() const;
-
-	vec_t operator[](int i) const;
-	vec_t& operator[](int i);
-
-	inline vec_t* Base();
-	inline vec_t const* Base() const;
-
-	Vector& AsVector3D();
-	Vector const& AsVector3D() const;
-
-	Vector2D& AsVector2D();
-	Vector2D const& AsVector2D() const;
-
-	void Random(vec_t minVal, vec_t maxVal);
-
-	bool operator==(const Vector4D& v) const;
-	bool operator!=(const Vector4D& v) const;
-
-	Vector4D& operator+=(const Vector4D& v);
-	Vector4D& operator-=(const Vector4D& v);
-	Vector4D& operator*=(const Vector4D& v);
-	Vector4D& operator*=(float s);
-	Vector4D& operator/=(const Vector4D& v);
-	Vector4D& operator/=(float s);
-
-	void	Negate();
-
-	vec_t	Length() const;
-
-	vec_t	LengthSqr(void) const;
-
-	bool IsZero(float tolerance = 0.01f) const
-	{
-		return (x > -tolerance && x < tolerance&&
-			y > -tolerance && y < tolerance&&
-			z > -tolerance && z < tolerance&&
-			w > -tolerance && w < tolerance);
-	}
-
-	vec_t	DistTo(const Vector4D& vOther) const;
-
-	vec_t	DistToSqr(const Vector4D& vOther) const;
-
-	void	CopyToArray(float* rgfl) const;
-
-	void	MulAdd(Vector4D const& a, Vector4D const& b, float scalar);
-
-	vec_t	Dot(Vector4D const& vOther) const;
-
-#ifdef VECTOR_NO_SLOW_OPERATIONS
-private:
-#else
-public:
-#endif
-	Vector4D(Vector4D const& vOther);
-
-	Vector4D& operator=(Vector4D const& src);
-};
-
-const Vector4D vec4_origin(0.0f, 0.0f, 0.0f, 0.0f);
-const Vector4D vec4_invalid(FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX);
-
-class ALIGN16 Vector4DAligned : public Vector4D
-{
-public:
-	Vector4DAligned(void) {}
-	Vector4DAligned(vec_t X, vec_t Y, vec_t Z, vec_t W);
-
-	inline void Set(vec_t X, vec_t Y, vec_t Z, vec_t W);
-	inline void InitZero(void);
-
-	inline __m128& AsM128() { return *(__m128*) & x; }
-	inline const __m128& AsM128() const { return *(const __m128*) & x; }
-
-private:
-	Vector4DAligned(Vector4DAligned const& vOther);
-
-	Vector4DAligned& operator=(Vector4DAligned const& src);
-} ALIGN16_POST;
-
-void Vector4DClear(Vector4D& a);
-
-void Vector4DCopy(Vector4D const& src, Vector4D& dst);
-
-void Vector4DAdd(Vector4D const& a, Vector4D const& b, Vector4D& result);
-void Vector4DSubtract(Vector4D const& a, Vector4D const& b, Vector4D& result);
-void Vector4DMultiply(Vector4D const& a, vec_t b, Vector4D& result);
-void Vector4DMultiply(Vector4D const& a, Vector4D const& b, Vector4D& result);
-void Vector4DDivide(Vector4D const& a, vec_t b, Vector4D& result);
-void Vector4DDivide(Vector4D const& a, Vector4D const& b, Vector4D& result);
-void Vector4DMA(Vector4D const& start, float s, Vector4D const& dir, Vector4D& result);
-
-void Vector4DMultiplyAligned(Vector4DAligned const& a, vec_t b, Vector4DAligned& result);
-
-
-#define Vector4DExpand( v ) (v).x, (v).y, (v).z, (v).w
-
-vec_t Vector4DNormalize(Vector4D& v);
-
-vec_t Vector4DLength(Vector4D const& v);
-
-vec_t DotProduct4D(Vector4D const& a, Vector4D const& b);
-
-void Vector4DLerp(Vector4D const& src1, Vector4D const& src2, vec_t t, Vector4D& dest);
-
-
-
-inline Vector4D::Vector4D(void)
-{
-#ifdef _DEBUG
-	x = y = z = w = VEC_T_NAN;
-#endif
-}
-
-inline Vector4D::Vector4D(vec_t X, vec_t Y, vec_t Z, vec_t W)
-{
-	x = X; y = Y; z = Z; w = W;
-	Assert(IsValid());
-}
-
-inline Vector4D::Vector4D(const float* pFloat)
-{
-	Assert(pFloat);
-	x = pFloat[0]; y = pFloat[1]; z = pFloat[2]; w = pFloat[3];
-	Assert(IsValid());
-}
-
-
-inline Vector4D::Vector4D(const Vector4D& vOther)
-{
-	Assert(vOther.IsValid());
-	x = vOther.x; y = vOther.y; z = vOther.z; w = vOther.w;
-}
-
-inline void Vector4D::Init(vec_t ix, vec_t iy, vec_t iz, vec_t iw)
-{
-	x = ix; y = iy; z = iz;	w = iw;
-	Assert(IsValid());
-}
-
-inline void Vector4D::Random(vec_t minVal, vec_t maxVal)
-{
-	x = minVal + ((vec_t)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-	y = minVal + ((vec_t)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-	z = minVal + ((vec_t)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-	w = minVal + ((vec_t)rand() / VALVE_RAND_MAX) * (maxVal - minVal);
-}
-
-inline void Vector4DClear(Vector4D& a)
-{
-	a.x = a.y = a.z = a.w = 0.0f;
-}
-
-inline Vector4D& Vector4D::operator=(const Vector4D& vOther)
-{
-	Assert(vOther.IsValid());
-	x = vOther.x; y = vOther.y; z = vOther.z; w = vOther.w;
-	return *this;
-}
-
-inline vec_t& Vector4D::operator[](int i)
-{
-	Assert((i >= 0) && (i < 4));
-	return ((vec_t*)this)[i];
-}
-
-inline vec_t Vector4D::operator[](int i) const
-{
-	Assert((i >= 0) && (i < 4));
-	return ((vec_t*)this)[i];
-}
-
-inline Vector& Vector4D::AsVector3D()
-{
-	return *(Vector*)this;
-}
-
-inline Vector const& Vector4D::AsVector3D() const
-{
-	return *(Vector const*)this;
-}
-
-inline Vector2D& Vector4D::AsVector2D()
-{
-	return *(Vector2D*)this;
-}
-
-inline Vector2D const& Vector4D::AsVector2D() const
-{
-	return *(Vector2D const*)this;
-}
-
-inline vec_t* Vector4D::Base()
-{
-	return (vec_t*)this;
-}
-
-inline vec_t const* Vector4D::Base() const
-{
-	return (vec_t const*)this;
-}
-
-inline bool Vector4D::IsValid() const
-{
-	return IsFinite(x) && IsFinite(y) && IsFinite(z) && IsFinite(w);
-}
-
-inline bool Vector4D::operator==(Vector4D const& src) const
-{
-	Assert(src.IsValid() && IsValid());
-	return (src.x == x) && (src.y == y) && (src.z == z) && (src.w == w);
-}
-
-inline bool Vector4D::operator!=(Vector4D const& src) const
-{
-	Assert(src.IsValid() && IsValid());
-	return (src.x != x) || (src.y != y) || (src.z != z) || (src.w != w);
-}
-
-
-inline void Vector4DCopy(Vector4D const& src, Vector4D& dst)
-{
-	Assert(src.IsValid());
-	dst.x = src.x;
-	dst.y = src.y;
-	dst.z = src.z;
-	dst.w = src.w;
-}
-
-inline void	Vector4D::CopyToArray(float* rgfl) const
-{
-	Assert(IsValid());
-	Assert(rgfl);
-	rgfl[0] = x; rgfl[1] = y; rgfl[2] = z; rgfl[3] = w;
-}
-
-inline void Vector4D::Negate()
-{
-	Assert(IsValid());
-	x = -x; y = -y; z = -z; w = -w;
-}
-
-inline Vector4D& Vector4D::operator+=(const Vector4D& v)
-{
-	Assert(IsValid() && v.IsValid());
-	x += v.x; y += v.y; z += v.z; w += v.w;
-	return *this;
-}
-
-inline Vector4D& Vector4D::operator-=(const Vector4D& v)
-{
-	Assert(IsValid() && v.IsValid());
-	x -= v.x; y -= v.y; z -= v.z; w -= v.w;
-	return *this;
-}
-
-inline Vector4D& Vector4D::operator*=(float fl)
-{
-	x *= fl;
-	y *= fl;
-	z *= fl;
-	w *= fl;
-	Assert(IsValid());
-	return *this;
-}
-
-inline Vector4D& Vector4D::operator*=(Vector4D const& v)
-{
-	x *= v.x;
-	y *= v.y;
-	z *= v.z;
-	w *= v.w;
-	Assert(IsValid());
-	return *this;
-}
-
-inline Vector4D& Vector4D::operator/=(float fl)
-{
-	Assert(fl != 0.0f);
-	float oofl = 1.0f / fl;
-	x *= oofl;
-	y *= oofl;
-	z *= oofl;
-	w *= oofl;
-	Assert(IsValid());
-	return *this;
-}
-
-inline Vector4D& Vector4D::operator/=(Vector4D const& v)
-{
-	Assert(v.x != 0.0f && v.y != 0.0f && v.z != 0.0f && v.w != 0.0f);
-	x /= v.x;
-	y /= v.y;
-	z /= v.z;
-	w /= v.w;
-	Assert(IsValid());
-	return *this;
-}
-
-inline void Vector4DAdd(Vector4D const& a, Vector4D const& b, Vector4D& c)
-{
-	Assert(a.IsValid() && b.IsValid());
-	c.x = a.x + b.x;
-	c.y = a.y + b.y;
-	c.z = a.z + b.z;
-	c.w = a.w + b.w;
-}
-
-inline void Vector4DSubtract(Vector4D const& a, Vector4D const& b, Vector4D& c)
-{
-	Assert(a.IsValid() && b.IsValid());
-	c.x = a.x - b.x;
-	c.y = a.y - b.y;
-	c.z = a.z - b.z;
-	c.w = a.w - b.w;
-}
-
-inline void Vector4DMultiply(Vector4D const& a, vec_t b, Vector4D& c)
-{
-	Assert(a.IsValid() && IsFinite(b));
-	c.x = a.x * b;
-	c.y = a.y * b;
-	c.z = a.z * b;
-	c.w = a.w * b;
-}
-
-inline void Vector4DMultiply(Vector4D const& a, Vector4D const& b, Vector4D& c)
-{
-	Assert(a.IsValid() && b.IsValid());
-	c.x = a.x * b.x;
-	c.y = a.y * b.y;
-	c.z = a.z * b.z;
-	c.w = a.w * b.w;
-}
-
-inline void Vector4DDivide(Vector4D const& a, vec_t b, Vector4D& c)
-{
-	Assert(a.IsValid());
-	Assert(b != 0.0f);
-	vec_t oob = 1.0f / b;
-	c.x = a.x * oob;
-	c.y = a.y * oob;
-	c.z = a.z * oob;
-	c.w = a.w * oob;
-}
-
-inline void Vector4DDivide(Vector4D const& a, Vector4D const& b, Vector4D& c)
-{
-	Assert(a.IsValid());
-	Assert((b.x != 0.0f) && (b.y != 0.0f) && (b.z != 0.0f) && (b.w != 0.0f));
-	c.x = a.x / b.x;
-	c.y = a.y / b.y;
-	c.z = a.z / b.z;
-	c.w = a.w / b.w;
-}
-
-inline void Vector4DMA(Vector4D const& start, float s, Vector4D const& dir, Vector4D& result)
-{
-	Assert(start.IsValid() && IsFinite(s) && dir.IsValid());
-	result.x = start.x + s * dir.x;
-	result.y = start.y + s * dir.y;
-	result.z = start.z + s * dir.z;
-	result.w = start.w + s * dir.w;
-}
-
-inline void	Vector4D::MulAdd(Vector4D const& a, Vector4D const& b, float scalar)
-{
-	x = a.x + b.x * scalar;
-	y = a.y + b.y * scalar;
-	z = a.z + b.z * scalar;
-	w = a.w + b.w * scalar;
-}
-
-inline void Vector4DLerp(const Vector4D& src1, const Vector4D& src2, vec_t t, Vector4D& dest)
-{
-	dest[0] = src1[0] + (src2[0] - src1[0]) * t;
-	dest[1] = src1[1] + (src2[1] - src1[1]) * t;
-	dest[2] = src1[2] + (src2[2] - src1[2]) * t;
-	dest[3] = src1[3] + (src2[3] - src1[3]) * t;
-}
-
-inline vec_t DotProduct4D(const Vector4D& a, const Vector4D& b)
-{
-	Assert(a.IsValid() && b.IsValid());
-	return(a.x * b.x + a.y * b.y + a.z * b.z + a.w * b.w);
-}
-
-inline vec_t Vector4D::Dot(Vector4D const& vOther) const
-{
-	return DotProduct4D(*this, vOther);
-}
-
-
-inline vec_t Vector4DLength(Vector4D const& v)
-{
-	Assert(v.IsValid());
-	return (vec_t)FastSqrt(v.x * v.x + v.y * v.y + v.z * v.z + v.w * v.w);
-}
-
-inline vec_t Vector4D::LengthSqr(void) const
-{
-	Assert(IsValid());
-	return (x * x + y * y + z * z + w * w);
-}
-
-inline vec_t Vector4D::Length(void) const
-{
-	return Vector4DLength(*this);
-}
-
-
-inline vec_t Vector4DNormalize(Vector4D& v)
-{
-	Assert(v.IsValid());
-	vec_t l = v.Length();
-	if (l != 0.0f)
-	{
-		v /= l;
-	}
-	else
-	{
-		v.x = v.y = v.z = v.w = 0.0f;
-	}
-	return l;
-}
-
-inline vec_t Vector4D::DistTo(const Vector4D& vOther) const
-{
-	Vector4D delta;
-	Vector4DSubtract(*this, vOther, delta);
-	return delta.Length();
-}
-
-inline vec_t Vector4D::DistToSqr(const Vector4D& vOther) const
-{
-	Vector4D delta;
-	Vector4DSubtract(*this, vOther, delta);
-	return delta.LengthSqr();
-}
-
-
-inline Vector4DAligned::Vector4DAligned(vec_t X, vec_t Y, vec_t Z, vec_t W)
-{
-	x = X; y = Y; z = Z; w = W;
-	Assert(IsValid());
-}
-
-inline void Vector4DAligned::Set(vec_t X, vec_t Y, vec_t Z, vec_t W)
-{
-	x = X; y = Y; z = Z; w = W;
-	Assert(IsValid());
-}
-
-inline void Vector4DAligned::InitZero(void)
-{
-#if !defined( _X360 )
-	this->AsM128() = _mm_set1_ps(0.0f);
-#else
-	this->AsM128() = __vspltisw(0);
-#endif
-	Assert(IsValid());
-}
-
-inline void Vector4DMultiplyAligned(Vector4DAligned const& a, Vector4DAligned const& b, Vector4DAligned& c)
-{
-	Assert(a.IsValid() && b.IsValid());
-#if !defined( _X360 )
-	c.x = a.x * b.x;
-	c.y = a.y * b.y;
-	c.z = a.z * b.z;
-	c.w = a.w * b.w;
-#else
-	c.AsM128() = __vmulfp(a.AsM128(), b.AsM128());
-#endif
-}
-
-inline void Vector4DWeightMAD(vec_t w, Vector4DAligned const& vInA, Vector4DAligned& vOutA, Vector4DAligned const& vInB, Vector4DAligned& vOutB)
-{
-	Assert(vInA.IsValid() && vInB.IsValid() && IsFinite(w));
-
-#if !defined( _X360 )
-	vOutA.x += vInA.x * w;
-	vOutA.y += vInA.y * w;
-	vOutA.z += vInA.z * w;
-	vOutA.w += vInA.w * w;
-
-	vOutB.x += vInB.x * w;
-	vOutB.y += vInB.y * w;
-	vOutB.z += vInB.z * w;
-	vOutB.w += vInB.w * w;
-#else
-	__vector4 temp;
-
-	temp = __lvlx(&w, 0);
-	temp = __vspltw(temp, 0);
-
-	vOutA.AsM128() = __vmaddfp(vInA.AsM128(), temp, vOutA.AsM128());
-	vOutB.AsM128() = __vmaddfp(vInB.AsM128(), temp, vOutB.AsM128());
-#endif
-}
-
-inline void Vector4DWeightMADSSE(vec_t w, Vector4DAligned const& vInA, Vector4DAligned& vOutA, Vector4DAligned const& vInB, Vector4DAligned& vOutB)
-{
-	Assert(vInA.IsValid() && vInB.IsValid() && IsFinite(w));
-
-#if !defined( _X360 )
-	__m128 packed = _mm_set1_ps(w);
-
-	vOutA.AsM128() = _mm_add_ps(vOutA.AsM128(), _mm_mul_ps(vInA.AsM128(), packed));
-	vOutB.AsM128() = _mm_add_ps(vOutB.AsM128(), _mm_mul_ps(vInB.AsM128(), packed));
-#else
-	__vector4 temp;
-
-	temp = __lvlx(&w, 0);
-	temp = __vspltw(temp, 0);
-
-	vOutA.AsM128() = __vmaddfp(vInA.AsM128(), temp, vOutA.AsM128());
-	vOutB.AsM128() = __vmaddfp(vInB.AsM128(), temp, vOutB.AsM128());
-#endif
-}
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vertexcolor.h b/SpyCustom/vertexcolor.h
deleted file mode 100644
index 685ebf7..0000000
--- a/SpyCustom/vertexcolor.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef VERTEXCOLOR_H
-#define VERTEXCOLOR_H
-
-#ifdef COMPILER_MSVC
-#pragma once
-#endif
-
-#include "platform.h"
-
-
-struct VertexColor_t
-{
-	VertexColor_t() {};
-	VertexColor_t(const VertexColor_t& src);
-	VertexColor_t(uint8 ir, uint8 ig, uint8 ib, uint8 ia);
-
-	uint32 AsUint32() const;
-	uint32* AsUint32Ptr();
-	const uint32* AsUint32Ptr() const;
-
-	VertexColor_t& operator=(const VertexColor_t& src);
-	VertexColor_t& operator=(const color32& src);
-
-	bool operator==(const VertexColor_t& src) const;
-	bool operator!=(const VertexColor_t& src) const;
-
-#ifdef PLATFORM_X360
-	uint8 a, b, g, r;
-#else
-	uint8 r, g, b, a;
-#endif
-};
-
-
-inline VertexColor_t::VertexColor_t(const VertexColor_t& src)
-{
-	*AsUint32Ptr() = src.AsUint32();
-}
-
-inline VertexColor_t::VertexColor_t(uint8 ir, uint8 ig, uint8 ib, uint8 ia) : r(ir), g(ig), b(ib), a(ia)
-{
-}
-
-
-inline uint32 VertexColor_t::AsUint32() const
-{
-	return *reinterpret_cast<const uint32*>(this);
-}
-
-inline uint32* VertexColor_t::AsUint32Ptr()
-{
-	return reinterpret_cast<uint32*>(this);
-}
-
-inline const uint32* VertexColor_t::AsUint32Ptr() const
-{
-	return reinterpret_cast<const uint32*>(this);
-}
-
-
-inline VertexColor_t& VertexColor_t::operator=(const VertexColor_t& src)
-{
-	*AsUint32Ptr() = src.AsUint32();
-	return *this;
-}
-
-inline VertexColor_t& VertexColor_t::operator=(const color32& src)
-{
-	r = src.r;
-	g = src.g;
-	b = src.b;
-	a = src.a;
-	return *this;
-}
-
-
-inline bool VertexColor_t::operator==(const VertexColor_t& src) const
-{
-	return AsUint32() == src.AsUint32();
-}
-
-inline bool VertexColor_t::operator!=(const VertexColor_t& src) const
-{
-	return AsUint32() != src.AsUint32();
-}
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vgui_basepanel.h b/SpyCustom/vgui_basepanel.h
deleted file mode 100644
index 450e5b2..0000000
--- a/SpyCustom/vgui_basepanel.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#if !defined( VGUI_BASEPANEL_H )
-#define VGUI_BASEPANEL_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <stdarg.h>
-#include "Panel.h"
-#include "Label.h"
-#include "Controls.h"
-#include "ISurface.h"
-
-class CBasePanel : public vgui::Panel
-{
-public:
-	DECLARE_CLASS_GAMEROOT(CBasePanel, vgui::Panel);
-
-	CBasePanel(vgui::Panel* pParent, const char* panelName);
-	CBasePanel(vgui::Panel* pParent, const char* panelName, int x, int y, int w, int h);
-	virtual			~CBasePanel(void);
-
-	virtual bool	ShouldDraw(void) { return true; }
-
-	virtual void	PaintBackground(void);
-
-	virtual	void	SetTexture(const char* texname, bool tiled = false);
-
-	virtual void	SetReflectMouse(bool reflect);
-	virtual void	OnCursorMoved(int x, int y);
-	virtual void	OnMousePressed(vgui::MouseCode code);
-	virtual void	OnMouseDoublePressed(vgui::MouseCode code);
-	virtual void	OnMouseReleased(vgui::MouseCode code);
-	virtual void	OnMouseWheeled(int delta);
-
-	virtual void	OnTick(void);
-
-protected:
-	bool			m_bTexturedBackground;
-	int				m_nBackgroundMaterial;
-	char			m_szBgTexture[256];
-	bool			m_bTiled;
-	int				m_nTextureSize[2];
-
-	bool			m_bReflectMouse;
-};
-
-class CHudLabel : public vgui::Label
-{
-	typedef vgui::Label BaseClass;
-public:
-	CHudLabel(vgui::Panel* parent, const char* panelName, const char* text);
-	virtual void ApplySchemeSettings(vgui::IScheme* pScheme);
-
-	void	SetSelected(bool bSelected);
-
-	bool	m_bSelected;
-
-private:
-	CHudLabel(const CHudLabel&);     
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/view_shared.h b/SpyCustom/view_shared.h
deleted file mode 100644
index f2be135..0000000
--- a/SpyCustom/view_shared.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef VIEW_SHARED_H
-#define VIEW_SHARED_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "convar.h"
-#include "vector.h"
-#include "MaterialSystemUtil.h"
-
-
-enum ClearFlags_t
-{
-	VIEW_CLEAR_COLOR = 0x1,
-	VIEW_CLEAR_DEPTH = 0x2,
-	VIEW_CLEAR_FULL_TARGET = 0x4,
-	VIEW_NO_DRAW = 0x8,
-	VIEW_CLEAR_OBEY_STENCIL = 0x10,           
-	VIEW_CLEAR_STENCIL = 0x20,
-};
-
-enum StereoEye_t
-{
-	STEREO_EYE_MONO = 0,
-	STEREO_EYE_LEFT = 1,
-	STEREO_EYE_RIGHT = 2,
-	STEREO_EYE_MAX = 3,
-};
-
-
-class CViewSetup
-{
-public:
-	CViewSetup()
-	{
-		m_flAspectRatio = 0.0f;
-		m_bRenderToSubrectOfLargerScreen = false;
-		m_bDoBloomAndToneMapping = true;
-		m_bOrtho = false;
-		m_bOffCenter = false;
-		m_bCacheFullSceneState = false;
-		m_bViewToProjectionOverride = false;
-		m_eStereoEye = STEREO_EYE_MONO;
-	}
-
-	int			x;
-	int			m_nUnscaledX;
-	int			y;
-	int			m_nUnscaledY;
-	int			width;
-	int			m_nUnscaledWidth;
-	int			height;
-	StereoEye_t m_eStereoEye;
-	int			m_nUnscaledHeight;
-
-	bool		m_bOrtho;
-	float		m_OrthoLeft;
-	float		m_OrthoTop;
-	float		m_OrthoRight;
-	float		m_OrthoBottom;
-
-	float		fov;
-	float		fovViewmodel;
-
-	Vector		origin;
-
-	QAngle		angles;
-	float		zNear;
-	float		zFar;
-
-	float		zNearViewmodel;
-	float		zFarViewmodel;
-
-	bool		m_bRenderToSubrectOfLargerScreen;
-
-	float		m_flAspectRatio;
-
-	bool		m_bOffCenter;
-	float		m_flOffCenterTop;
-	float		m_flOffCenterBottom;
-	float		m_flOffCenterLeft;
-	float		m_flOffCenterRight;
-
-	bool		m_bDoBloomAndToneMapping;
-
-	bool		m_bCacheFullSceneState;
-
-	bool        m_bViewToProjectionOverride;
-	VMatrix     m_ViewToProjection;
-};
-
-
-
-#endif  
diff --git a/SpyCustom/viewrender.h b/SpyCustom/viewrender.h
deleted file mode 100644
index 08d3549..0000000
--- a/SpyCustom/viewrender.h
+++ /dev/null
@@ -1,724 +0,0 @@
-#if !defined( VIEWRENDER_H )
-#define VIEWRENDER_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "shareddefs.h"
-#include "utlstack.h"
-#include "tier2.h"
-#include "iviewrender.h"
-#include "ivrenderview.h" 
-#include "view_shared.h"
-
-#if defined(_PS3)
-#include "buildrenderables_ps3.h"
-#endif
-#include "volumeculler.h"
-#include "jobthread.h"
-
-#include "bspfile.h"
-#include "const.h" 
-
-class ConVar;
-class CClientRenderablesList;
-class IClientVehicle;
-class C_PointCamera;
-class C_EnvProjectedTexture;
-class IScreenSpaceEffect;
-class CClientViewSetup;
-class CViewRender;
-struct ClientWorldListInfo_t;
-class C_BaseEntity;
-class CJob;
-
-#ifdef HL2_EPISODIC
-class CStunEffect;
-#endif  
-
-struct IntroDataBlendPass_t
-{
-	int m_BlendMode;
-	float m_Alpha;                   
-};
-
-struct IntroData_t
-{
-	bool	m_bDrawPrimary;
-	Vector	m_vecCameraView;
-	QAngle	m_vecCameraViewAngles;
-	float	m_playerViewFOV;
-	CUtlVector<IntroDataBlendPass_t> m_Passes;
-
-	float	m_flCurrentFadeColor[4];
-};
-
-extern IntroData_t* g_pIntroData;
-
-enum view_id_t
-{
-	VIEW_ILLEGAL = -2,
-	VIEW_NONE = -1,
-	VIEW_MAIN = 0,
-	VIEW_3DSKY = 1,
-	VIEW_MONITOR = 2,
-	VIEW_REFLECTION = 3,
-	VIEW_REFRACTION = 4,
-	VIEW_INTRO_PLAYER = 5,
-	VIEW_INTRO_CAMERA = 6,
-	VIEW_SHADOW_DEPTH_TEXTURE = 7,
-	VIEW_SSAO = 8,
-	VIEW_ID_COUNT
-};
-view_id_t CurrentViewID();
-
-#if defined(_PS3)
-#define PASS_BUILDLISTS_PS3 (1<<0)
-#define PASS_DRAWLISTS_PS3  (1<<1)
-#else
-#define PASS_BUILDLISTS (1<<0)
-#define PASS_DRAWLISTS  (1<<1)
-#endif
-
-class CPitchDrift
-{
-public:
-	float		pitchvel;
-	bool		nodrift;
-	float		driftmove;
-	double		laststop;
-};
-
-
-
-struct ViewCustomVisibility_t
-{
-	ViewCustomVisibility_t()
-	{
-		m_nNumVisOrigins = 0;
-		m_VisData.m_fDistToAreaPortalTolerance = FLT_MAX;
-		m_iForceViewLeaf = -1;
-	}
-
-	void AddVisOrigin(const Vector& origin)
-	{
-		AssertMsg(m_nNumVisOrigins < MAX_VIS_LEAVES, "Added more origins than will fit in the array!");
-
-		if (m_nNumVisOrigins >= MAX_VIS_LEAVES)
-			return;
-
-		m_rgVisOrigins[m_nNumVisOrigins++] = origin;
-	}
-
-	void ForceVisOverride(VisOverrideData_t& visData)
-	{
-		m_VisData = visData;
-	}
-
-	void ForceViewLeaf(int iViewLeaf)
-	{
-		m_iForceViewLeaf = iViewLeaf;
-	}
-
-	int				m_nNumVisOrigins;
-	Vector			m_rgVisOrigins[MAX_VIS_LEAVES];
-
-	VisOverrideData_t m_VisData;
-
-	int				m_iForceViewLeaf;
-};
-
-struct WaterRenderInfo_t
-{
-	bool m_bCheapWater : 1;
-	bool m_bReflect : 1;
-	bool m_bRefract : 1;
-	bool m_bReflectEntities : 1;
-	bool m_bReflectOnlyMarkedEntities : 1;
-	bool m_bDrawWaterSurface : 1;
-	bool m_bOpaqueWater : 1;
-	bool m_bPseudoTranslucentWater : 1;
-	bool m_bReflect2DSkybox : 1;
-};
-
-class CBase3dView : public CRefCounted<>,
-	protected CViewSetup
-{
-	DECLARE_CLASS_NOBASE(CBase3dView);
-public:
-	explicit CBase3dView(CViewRender* pMainView);
-
-	VPlane* GetFrustum();
-	virtual int		GetDrawFlags() { return 0; }
-
-#ifdef PORTAL
-	virtual	void	EnableWorldFog() {};
-#endif
-
-protected:
-	VPlane* m_Frustum;
-	CViewRender* m_pMainView;
-	int				m_nSlot;
-};
-
-struct FrustumCache_t
-{
-	int			m_nFrameCount;
-	Frustum_t	m_Frustums[MAX_SPLITSCREEN_PLAYERS];
-
-	FrustumCache_t() { m_nFrameCount = 0; }
-
-	bool IsValid(void);
-	void SetUpdated(void);
-
-	void Add(const CViewSetup* pView, int iSlot);
-};
-
-FrustumCache_t* FrustumCache(void);
-
-class CRendering3dView : public CBase3dView
-{
-	DECLARE_CLASS(CRendering3dView, CBase3dView);
-public:
-	explicit CRendering3dView(CViewRender* pMainView);
-	virtual ~CRendering3dView() { ReleaseLists(); }
-
-	void Setup(const CViewSetup& setup);
-
-	virtual int		GetDrawFlags();
-	virtual void	Draw() {};
-
-protected:
-
-	void			EnableWorldFog(void);
-	void			SetFogVolumeState(const VisibleFogVolumeInfo_t& fogInfo, bool bUseHeightFog);
-
-	void			SetupRenderablesList(int viewID, bool bFastEntityRendering = false, bool bDrawDepthViewNonCachedObjectsOnly = false);
-
-	void			BuildWorldRenderLists(bool bDrawEntities, int iForceViewLeaf = -1, bool bUseCacheIfEnabled = true, bool bShadowDepth = false, float* pReflectionWaterHeight = NULL);
-
-#if defined(_PS3)
-	void			SetupRenderablesList_PS3_Epilogue(void);
-
-	void			BuildWorldRenderLists_PS3_Epilogue(bool bShadowDepth);
-	void			BuildRenderableRenderLists_PS3_Epilogue(void);
-#else
-	void			BuildWorldRenderLists_Epilogue(bool bShadowDepth);
-	void			BuildRenderableRenderLists_Epilogue(int viewID);
-#endif
-
-	void			BuildRenderableRenderLists(int viewID, bool bFastEntityRendering = false, bool bDrawDepthViewNonCachedObjectsOnly = false);
-
-	void			BuildShadowDepthRenderableRenderLists();
-
-	void			DrawWorld(IMatRenderContext* pRenderContext, float waterZAdjust);
-
-	enum RenderablesRenderPath_t
-	{
-		RENDERABLES_RENDER_PATH_NORMAL = 0,
-		RENDERABLES_RENDER_PATH_SHADOWDEPTH_DEFAULT = (1 << 0),
-		RENDERABLES_RENDER_PATH_SHADOWDEPTH_BUILD_GEOCACHE = (1 << 1),
-		RENDERABLES_RENDER_PATH_SHADOWDEPTH_USE_GEOCACHE = (1 << 2),
-	};
-	void			DrawOpaqueRenderables(IMatRenderContext* pRenderContext, RenderablesRenderPath_t eRenderPath, ERenderDepthMode_t DepthMode, CUtlVector< CClientRenderablesList::CEntry* >* pDeferClippedOpaqueRenderables_Out, RenderGroup_t nGroup = RENDER_GROUP_OPAQUE);
-	void			DrawDeferredClippedOpaqueRenderables(IMatRenderContext* pRenderContext, RenderablesRenderPath_t eRenderPath, ERenderDepthMode_t DepthMode, CUtlVector< CClientRenderablesList::CEntry* >* pDeferClippedOpaqueRenderables);
-	void			DrawTranslucentRenderables(bool bInSkybox, bool bShadowDepth);
-
-#if defined( PORTAL )
-	void			DrawRecursivePortalViews(void);
-#endif
-
-	void			DrawTranslucentRenderablesNoWorld(bool bInSkybox);
-
-	void			DrawNoZBufferTranslucentRenderables(void);
-
-	void			DrawTranslucentWorldInLeaves(IMatRenderContext* pRenderContext, bool bShadowDepth);
-
-	void			DrawTranslucentWorldAndDetailPropsInLeaves(IMatRenderContext* pRenderContext, int iCurLeaf, int iFinalLeaf, int nEngineDrawFlags, int& nDetailLeafCount, LeafIndex_t* pDetailLeafList, bool bShadowDepth);
-
-	void			PruneWorldListInfo();
-
-	void			BeginConsoleZPass();
-	void			EndConsoleZPass();
-
-
-#ifdef PORTAL
-	virtual bool	ShouldDrawPortals() { return true; }
-#endif
-
-	void ReleaseLists();
-
-	int m_DrawFlags;
-	int m_ClearFlags;
-
-
-	IWorldRenderList* m_pWorldRenderList;
-
-#if defined( CSTRIKE15 ) && defined(_PS3)
-	CClientRenderablesList* m_pRenderablesList[MAX_CONCURRENT_BUILDVIEWS];
-	ClientWorldListInfo_t* m_pWorldListInfo[MAX_CONCURRENT_BUILDVIEWS];
-#else
-	CClientRenderablesList* m_pRenderables;
-	ClientWorldListInfo_t* m_pWorldListInfo;
-#endif
-
-	ViewCustomVisibility_t* m_pCustomVisibility;
-};
-
-
-class CRenderExecutor
-{
-	DECLARE_CLASS_NOBASE(CRenderExecutor);
-public:
-
-	virtual void AddView(CRendering3dView* pView) = 0;
-
-	virtual void Execute() = 0;
-
-protected:
-	explicit CRenderExecutor(CViewRender* pMainView) : m_pMainView(pMainView) {}
-	CViewRender* m_pMainView;
-};
-
-class CSimpleRenderExecutor : public CRenderExecutor
-{
-	DECLARE_CLASS(CSimpleRenderExecutor, CRenderExecutor);
-public:
-	explicit CSimpleRenderExecutor(CViewRender* pMainView) : CRenderExecutor(pMainView) {}
-
-	void AddView(CRendering3dView* pView);
-
-	void Execute() {}
-};
-
-
-#if defined(_PS3)
-class CConcurrentViewBuilderPS3
-{
-public:
-
-	CConcurrentViewBuilderPS3();
-	~CConcurrentViewBuilderPS3() { Purge(); };
-
-	void Init(void);
-	void Purge(void);
-
-	void ResetBuildViewID(void);
-
-	int	GetBuildViewID(void);
-
-	void PushBuildView(void);
-	void PopBuildView(void);
-
-	void SyncViewBuilderJobs(void);
-
-	void SPUBuildRWJobsOn(bool jobOn) { m_bSPUBuildRWJobsOn = jobOn; };
-	bool IsSPUBuildRWJobsOn(void) { return m_bSPUBuildRWJobsOn; };
-
-	int GetPassFlags(void) { return m_passFlags; };
-	void SetPassFlags(int flags) { m_passFlags = flags; };
-
-	IWorldRenderList* GetWorldRenderListElement(void);
-	void SetWorldRenderListElement(IWorldRenderList* pRenderList);
-
-	int GetDrawFlags(void) { return m_drawFlags; };
-	void SetDrawFlags(int drawFlags) { m_drawFlags = drawFlags; };
-
-	unsigned int GetVisFlags(void);
-	void SetVisFlags(unsigned int visFlags);
-
-	void CacheFrustumData(Frustum_t* pFrustum, Frustum_t* pAreaFrustum, void* pRenderAreaBits, int numArea, bool bViewerInSolidSpace);
-	void CacheBuildViewVolumeCuller(void* pVC);
-	void* GetBuildViewVolumeCuller(void);
-	Frustum_t* GetBuildViewFrustum(void);
-	Frustum_t* GetBuildViewAreaFrustum(void);
-	unsigned char* GetBuildViewRenderAreaBits(void);
-
-	int GetNumAreaFrustum(void);
-	Frustum_t* GetBuildViewAreaFrustumID(int frustumID);
-
-
-	void PushBuildRenderableJobs(void);
-
-private:
-
-	int						m_buildViewID;
-	int						m_nextFreeBuildViewID;
-
-	int* m_pBuildViewStack;
-	int						m_buildViewStack[MAX_CONCURRENT_BUILDVIEWS];
-
-	int						m_passFlags;
-	int						m_drawFlags;
-	unsigned int			m_visFlags[MAX_CONCURRENT_BUILDVIEWS];
-
-
-	IWorldRenderList* m_pWorldRenderListCache[MAX_CONCURRENT_BUILDVIEWS] ALIGN16;
-
-	Frustum_t				m_gFrustum[MAX_CONCURRENT_BUILDVIEWS] ALIGN16;
-	CUtlVector<Frustum_t>	m_gAreaFrustum[MAX_CONCURRENT_BUILDVIEWS] ALIGN16;
-	unsigned char			m_gRenderAreaBits[MAX_CONCURRENT_BUILDVIEWS][32] ALIGN16;
-	bool					m_bViewerInSolidSpace[MAX_CONCURRENT_BUILDVIEWS] ALIGN16;
-
-	CVolumeCuller			m_volumeCullerCache[MAX_CONCURRENT_BUILDVIEWS] ALIGN16;
-
-	bool					m_bSPUBuildRWJobsOn;
-};
-
-extern CConcurrentViewBuilderPS3 g_viewBuilder;
-
-#else
-
-class CConcurrentViewData
-{
-public:
-
-	void Init(void);
-	void Purge(void);
-
-	CVolumeCuller			m_volumeCuller;
-	Frustum_t				m_Frustum;
-	CUtlVector< Frustum_t, CUtlMemoryAligned< Frustum_t, 16 > > m_AreaFrustums;
-	Frustum_t* m_frustumList[MAX_MAP_AREAS];
-
-	IWorldRenderList* m_pWorldRenderList;
-	ClientWorldListInfo_t* m_pWorldListInfo;
-	CClientRenderablesList* m_pRenderablesList;
-
-	CJob* m_pBuildWorldListJob;
-	CJob* m_pBuildRenderablesListJob;
-	bool					m_bWaitForWorldList;
-};
-
-class CConcurrentViewBuilder
-{
-public:
-
-	CConcurrentViewBuilder();
-	~CConcurrentViewBuilder();
-
-	void					Init(void);
-	void					Purge(void);
-
-	void					SetBuildWRThreaded(bool bThreaded) { m_bThreaded = bThreaded; }
-	bool					GetBuildWRThreaded(void) { return m_bThreaded; }
-
-	void					ResetBuildViewID(void);
-
-	int						GetBuildViewID(void);
-
-	void					PushBuildView(void);
-	void					PopBuildView(void);
-
-	int						GetPassFlags(void) { return m_passFlags; };
-	void					SetPassFlags(int flags) { m_passFlags = flags; };
-
-	void					CacheBuildViewVolumeCuller(const CVolumeCuller* pVC);
-	const CVolumeCuller* GetBuildViewVolumeCuller(int buildViewID = -1) const;
-
-	void					CacheFrustumData(const Frustum_t& frustum, const CUtlVector< Frustum_t, CUtlMemoryAligned< Frustum_t, 16 > >& aeraFrustums);
-	void					CacheFrustumData(void);
-	const Frustum_t* GetBuildViewFrustum(int buildViewID = -1) const;
-	const CUtlVector< Frustum_t, CUtlMemoryAligned< Frustum_t, 16 > >* GetBuildViewAeraFrustums(int buildViewID = -1) const;
-	Frustum_t** GetBuildViewFrustumList(int buildViewID = -1);
-
-	IWorldRenderList* GetWorldRenderListElement(void);
-	void					SetWorldRenderListElement(IWorldRenderList* pRenderList);
-
-	ClientWorldListInfo_t* GetClientWorldListInfoElement(int buildViewID = -1);
-	WorldListInfo_t* GetWorldListInfoElement(int buildViewID);
-	void					SetWorldListInfoElement(ClientWorldListInfo_t* pWorldListInfo, int buildViewID = -1);
-
-	CClientRenderablesList* GetRenderablesListElement(int buildViewID = -1);
-	void					SetRenderablesListElement(CClientRenderablesList* pRenderables);
-
-	void					QueueBuildWorldListJob(CJob* pJob);
-	void					WaitForBuildWorldListJob(void);
-	void					FlushBuildWorldListJob(void);
-
-	void					QueueBuildRenderablesListJob(CJob* pJob);
-	void					WaitForBuildRenderablesListJob(void);
-	void					FlushBuildRenderablesListJob(void);
-	void					AddDependencyToWorldList(void);
-
-private:
-
-	void AddJobToThreadPool(CJob* pJob);
-	void AddToSequentialJobs(CJob* pJob);
-	void TryRunSequentialJobs(void);
-	void WaitForCurrentSequentialJobAndRunPending();
-	void InternalWaitForBuildWorldListJob(int buildViewID);
-
-	class SequentialJobs : public CJob
-	{
-	public:
-
-		explicit SequentialJobs(CJob* pJob = NULL);
-		~SequentialJobs();
-
-		void AddJob(CJob* pJob);
-
-		virtual JobStatus_t DoExecute();
-
-	private:
-
-		CUtlVectorFixed<CJob*, 16> m_jobs;
-	};
-
-	bool					m_bThreaded;
-
-	int						m_buildViewID;
-	int						m_nextFreeBuildViewID;
-
-	int* m_pBuildViewStack;
-	int						m_buildViewStack[MAX_CONCURRENT_BUILDVIEWS];
-
-	int						m_passFlags;
-
-	CConcurrentViewData		m_viewData[MAX_CONCURRENT_BUILDVIEWS];
-
-	SequentialJobs* m_pCurrentSeqJobs;
-	SequentialJobs* m_pPendingSeqJobs;
-
-	CUtlVector<CJob*>		mJobsAddedToThreadPool;
-};
-
-extern CConcurrentViewBuilder g_viewBuilder;
-
-#endif
-
-class CViewRender : public IViewRender
-{
-	DECLARE_CLASS_NOBASE(CViewRender);
-public:
-	virtual void	Init(void);
-	virtual void	Shutdown(void);
-
-	const CViewSetup* GetPlayerViewSetup(int nSlot = -1) const;
-
-	virtual void	StartPitchDrift(void);
-	virtual void	StopPitchDrift(void);
-
-	virtual float	GetZNear();
-	virtual float	GetZFar();
-
-	virtual void	OnRenderStart();
-	void			DriftPitch(void);
-
-	static CViewRender* GetMainView() { return assert_cast<CViewRender*>(view); }
-
-	void			AddViewToScene(CRendering3dView* pView) { m_SimpleExecutor.AddView(pView); }
-
-	CMaterialReference& GetWhite();
-
-	virtual void	InitFadeData(void);
-
-protected:
-	void			SetUpView();
-
-	void			SetUpOverView();
-	void			SetUpChaseOverview();
-
-	virtual void	WriteSaveGameScreenshotOfSize(const char* pFilename, int width, int height);
-	void			WriteSaveGameScreenshot(const char* filename);
-
-	CViewSetup& GetView(int nSlot = -1);
-	const CViewSetup& GetView(int nSlot = -1) const;
-
-	CViewSetup		m_UserView[MAX_SPLITSCREEN_PLAYERS];
-	bool			m_bAllowViewAccess;
-	CPitchDrift		m_PitchDrift;
-
-	virtual void	RenderPreScene(const CViewSetup& view) { }
-	virtual void	PreViewDrawScene(const CViewSetup& view) {}
-	virtual void	PostViewDrawScene(const CViewSetup& view) {}
-
-	float			m_flOldChaseOverviewScale;
-	float			m_flIdealChaseOverviewScale;
-	float			m_flNextIdealOverviewScaleUpdate;
-public:
-	CViewRender();
-	virtual			~CViewRender(void) {}
-
-public:
-
-	void			SetupVis(const CViewSetup& view, unsigned int& visFlags, ViewCustomVisibility_t* pCustomVisibility = NULL);
-
-
-	virtual	void	Render(vrect_t* rect);
-	virtual void	RenderView(const CViewSetup& view, const CViewSetup& hudViewSetup, int nClearFlags, int whatToDraw);
-	virtual void	RenderPlayerSprites();
-	virtual void	Render2DEffectsPreHUD(const CViewSetup& view);
-	virtual void	Render2DEffectsPostHUD(const CViewSetup& view);
-	virtual void	RenderSmokeOverlay(bool bPreViewModel = true) {};
-	float			GetLastRenderSmokeOverlayAmount() const { return m_flSmokeOverlayAmount; }
-
-
-	void			DisableFog(void);
-
-	void			LevelInit(void);
-	void			LevelShutdown(void);
-
-	bool			ShouldDrawEntities(void);
-	bool			ShouldDrawBrushModels(void);
-
-	const CViewSetup* GetViewSetup() const;
-
-	void			DisableVis(void);
-
-	void			MoveViewModels();
-
-	void			GetViewModelPosition(int nIndex, Vector* pPos, QAngle* pAngle);
-
-	void			SetCheapWaterStartDistance(float flCheapWaterStartDistance);
-	void			SetCheapWaterEndDistance(float flCheapWaterEndDistance);
-
-	void			GetWaterLODParams(float& flCheapWaterStartDistance, float& flCheapWaterEndDistance);
-
-	virtual void	QueueOverlayRenderView(const CViewSetup& view, int nClearFlags, int whatToDraw);
-
-	virtual void	GetScreenFadeDistances(float* pMin, float* pMax, float* pScale);
-
-	virtual C_BaseEntity* GetCurrentlyDrawingEntity();
-	virtual void		  SetCurrentlyDrawingEntity(C_BaseEntity* pEnt);
-
-	virtual bool		UpdateShadowDepthTexture(ITexture* pRenderTarget, ITexture* pDepthTexture, const CViewSetup& shadowView, bool bRenderWorldAndObjects = true, bool bRenderViewModels = false);
-
-	int GetBaseDrawFlags() { return m_BaseDrawFlags; }
-	virtual bool ShouldForceNoVis() { return m_bForceNoVis; }
-	int				BuildRenderablesListsNumber() const { return m_BuildRenderableListsNumber; }
-	int				IncRenderablesListsNumber() { return ++m_BuildRenderableListsNumber; }
-
-	int				BuildWorldListsNumber() const;
-	int				IncWorldListsNumber() { return ++m_BuildWorldListsNumber; }
-
-	virtual VPlane* GetFrustum() { return (m_pActiveRenderer) ? m_pActiveRenderer->GetFrustum() : m_Frustum; }
-
-	virtual int		GetDrawFlags() { return (m_pActiveRenderer) ? m_pActiveRenderer->GetDrawFlags() : 0; }
-
-	CBase3dView* GetActiveRenderer() { return m_pActiveRenderer; }
-	CBase3dView* SetActiveRenderer(CBase3dView* pActiveRenderer) { CBase3dView* pPrevious = m_pActiveRenderer; m_pActiveRenderer = pActiveRenderer; return pPrevious; }
-
-	void			FreezeFrame(float flFreezeTime);
-
-	void SetWaterOverlayMaterial(IMaterial* pMaterial)
-	{
-		m_UnderWaterOverlayMaterial.Init(pMaterial);
-	}
-
-	void			DrawViewModelsShadowDepth(const CViewSetup& view);
-
-protected:
-	int				m_BuildWorldListsNumber;
-
-
-	void			ViewDrawScene(bool bDrew3dSkybox, SkyboxVisibility_t nSkyboxVisible, const CViewSetup& view, int nClearFlags, view_id_t viewID, bool bDrawViewModel = false, int baseDrawFlags = 0, ViewCustomVisibility_t* pCustomVisibility = NULL);
-
-	void			DrawMonitors(const CViewSetup& cameraView);
-
-	bool			DrawOneMonitor(ITexture* pRenderTarget, int cameraNum, C_PointCamera* pCameraEnt, const CViewSetup& cameraView, void* localPlayer,
-		int x, int y, int width, int height);
-
-	bool			ShouldDrawViewModel(bool drawViewmodel);
-#ifdef IRONSIGHT
-	void			DrawViewModels(const CViewSetup& view, bool drawViewmodel, bool bDrawScopeLensMask = false);
-#else
-	void			DrawViewModels(const CViewSetup& view, bool drawViewmodel);
-#endif
-
-	void			PerformScreenSpaceEffects(int x, int y, int w, int h);
-
-	void			SetScreenOverlayMaterial(IMaterial* pMaterial);
-	IMaterial* GetScreenOverlayMaterial();
-	void			PerformScreenOverlay(int x, int y, int w, int h);
-
-	void DrawUnderwaterOverlay(void);
-
-	void			DrawWorldAndEntities(bool drawSkybox, const CViewSetup& view, int nClearFlags, ViewCustomVisibility_t* pCustomVisibility = NULL);
-
-	virtual void			ViewDrawScene_Intro(const CViewSetup& view, int nClearFlags, const IntroData_t& introData);
-
-#ifdef PORTAL 
-	void			ViewDrawScene_PortalStencil(const CViewSetup& view, ViewCustomVisibility_t* pCustomVisibility);
-	void			Draw3dSkyboxworld_Portal(const CViewSetup& view, int& nClearFlags, bool& bDrew3dSkybox, SkyboxVisibility_t& nSkyboxVisible, ITexture* pRenderTarget = NULL);
-#endif  
-
-#ifdef PORTAL2
-	void			ViewDrawPhoto(ITexture* pRenderTarget, C_BaseEntity* pEnt);      
-#endif
-
-	void			DetermineWaterRenderInfo(const VisibleFogVolumeInfo_t& fogVolumeInfo, WaterRenderInfo_t& info);
-
-	bool			UpdateRefractIfNeededByList(CViewModelRenderablesList::RenderGroups_t& list);
-	void			DrawRenderablesInList(CViewModelRenderablesList::RenderGroups_t& list, int flags = 0);
-
-	void			SetupMain3DView(int nSlot, const CViewSetup& view, const CViewSetup& hudViewSetup, int& nClearFlags, ITexture* pRenderTarget);
-	void			CleanupMain3DView(const CViewSetup& view);
-
-	void			GetLetterBoxRectangles(int nSlot, const CViewSetup& view, CUtlVector< vrect_t >& vecLetterBoxRectangles);
-	void			DrawLetterBoxRectangles(int nSlot, const CUtlVector< vrect_t >& vecLetterBoxRectangles);
-
-	void			EnableWaterDepthFeathing(IMaterial* pWaterMaterial, bool bEnable);
-
-#if defined(_PS3)
-	void			InitSPUBuildRenderingJobs(void);
-#endif
-
-	CViewSetup		m_CurrentView;
-
-	bool			m_bForceNoVis;
-
-	const ConVar* m_pDrawEntities;
-	const ConVar* m_pDrawBrushModels;
-
-	CMaterialReference	m_TranslucentSingleColor;
-	CMaterialReference	m_ModulateSingleColor;
-	CMaterialReference	m_ScreenOverlayMaterial;
-	CMaterialReference m_UnderWaterOverlayMaterial;
-
-	Vector				m_vecLastFacing;
-	float				m_flCheapWaterStartDistance;
-	float				m_flCheapWaterEndDistance;
-
-	CViewSetup			m_OverlayViewSetup;
-	int					m_OverlayClearFlags;
-	int					m_OverlayDrawFlags;
-	bool				m_bDrawOverlay;
-
-	int					m_BaseDrawFlags;	          
-	C_BaseEntity* m_pCurrentlyDrawingEntity;
-
-#ifdef PORTAL
-	friend class CPortalRender;         
-	friend class CPortalRenderable;
-#endif
-	int				m_BuildRenderableListsNumber;
-
-	friend class CBase3dView;
-
-	Frustum m_Frustum;
-
-	CBase3dView* m_pActiveRenderer;
-	CSimpleRenderExecutor m_SimpleExecutor;
-
-	struct FreezeParams_t
-	{
-		FreezeParams_t() : m_bTakeFreezeFrame(false), m_flFreezeFrameUntil(0.0f) {}
-
-		bool			m_bTakeFreezeFrame;
-		float			m_flFreezeFrameUntil;
-	};
-
-	FreezeParams_t		m_FreezeParams[MAX_SPLITSCREEN_PLAYERS];
-
-	FadeData_t			m_FadeData;
-
-	CMaterialReference	m_WhiteMaterial;
-
-	CON_COMMAND_MEMBER_F(CViewRender, "screenfademinsize", OnScreenFadeMinSize, "Modify global screen fade min size in pixels", FCVAR_CHEAT | FCVAR_DEVELOPMENTONLY);
-	CON_COMMAND_MEMBER_F(CViewRender, "screenfademaxsize", OnScreenFadeMaxSize, "Modify global screen fade max size in pixels", FCVAR_CHEAT | FCVAR_DEVELOPMENTONLY);
-
-	float				m_flSmokeOverlayAmount;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vmatrix.h b/SpyCustom/vmatrix.h
deleted file mode 100644
index 5f449b4..0000000
--- a/SpyCustom/vmatrix.h
+++ /dev/null
@@ -1,747 +0,0 @@
-#ifndef VMATRIX_H
-#define VMATRIX_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include <string.h>
-#include "vector.h"
-#include "vplane.h"
-#include "vector4d.h"
-#include "mathlib.h"
-
-struct cplane_t;
-
-
-class VMatrix
-{
-public:
-
-	VMatrix();
-	VMatrix(
-		vec_t m00, vec_t m01, vec_t m02, vec_t m03,
-		vec_t m10, vec_t m11, vec_t m12, vec_t m13,
-		vec_t m20, vec_t m21, vec_t m22, vec_t m23,
-		vec_t m30, vec_t m31, vec_t m32, vec_t m33
-	);
-
-	VMatrix(const Vector& forward, const Vector& left, const Vector& up);
-	VMatrix(const Vector& forward, const Vector& left, const Vector& up, const Vector& translation);
-
-	VMatrix(const matrix3x4_t& matrix3x4);
-
-	void		Init(
-		vec_t m00, vec_t m01, vec_t m02, vec_t m03,
-		vec_t m10, vec_t m11, vec_t m12, vec_t m13,
-		vec_t m20, vec_t m21, vec_t m22, vec_t m23,
-		vec_t m30, vec_t m31, vec_t m32, vec_t m33
-	);
-
-
-	void		Init(const matrix3x4_t& matrix3x4);
-
-	inline float* operator[](int i)
-	{
-		return m[i];
-	}
-
-	inline const float* operator[](int i) const
-	{
-		return m[i];
-	}
-
-	inline float* Base()
-	{
-		return &m[0][0];
-	}
-
-	inline const float* Base() const
-	{
-		return &m[0][0];
-	}
-
-	void		SetLeft(const Vector& vLeft);
-	void		SetUp(const Vector& vUp);
-	void		SetForward(const Vector& vForward);
-
-	void		GetBasisVectors(Vector& vForward, Vector& vLeft, Vector& vUp) const;
-	void		SetBasisVectors(const Vector& vForward, const Vector& vLeft, const Vector& vUp);
-
-	Vector& GetTranslation(Vector& vTrans) const;
-	void		SetTranslation(const Vector& vTrans);
-
-	void		PreTranslate(const Vector& vTrans);
-	void		PostTranslate(const Vector& vTrans);
-
-	const matrix3x4_t& As3x4() const;
-	void		CopyFrom3x4(const matrix3x4_t& m3x4);
-	void		Set3x4(matrix3x4_t& matrix3x4) const;
-
-	bool		operator==(const VMatrix& src) const;
-	bool		operator!=(const VMatrix& src) const { return !(*this == src); }
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-	Vector		GetLeft() const;
-	Vector		GetUp() const;
-	Vector		GetForward() const;
-	Vector		GetTranslation() const;
-#endif
-
-
-public:
-	void		V3Mul(const Vector& vIn, Vector& vOut) const;
-
-	void		V4Mul(const Vector4D& vIn, Vector4D& vOut) const;
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-	Vector		ApplyRotation(const Vector& vVec) const;
-
-	Vector		operator*(const Vector& vVec) const;
-
-	Vector		VMul3x3(const Vector& vVec) const;
-
-	Vector		VMul3x3Transpose(const Vector& vVec) const;
-
-	Vector		VMul4x3(const Vector& vVec) const;
-
-	Vector		VMul4x3Transpose(const Vector& vVec) const;
-#endif
-
-
-public:
-	void		TransformPlane(const VPlane& inPlane, VPlane& outPlane) const;
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-	VPlane		operator*(const VPlane& thePlane) const;
-#endif
-
-public:
-
-	VMatrix& operator=(const VMatrix& mOther);
-
-	void		MatrixMul(const VMatrix& vm, VMatrix& out) const;
-
-	const VMatrix& operator+=(const VMatrix& other);
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-	VMatrix		operator*(const VMatrix& mOther) const;
-
-	VMatrix		operator+(const VMatrix& other) const;
-	VMatrix		operator-(const VMatrix& other) const;
-
-	VMatrix		operator-() const;
-
-	VMatrix		operator~() const;
-#endif
-
-public:
-	void		Identity();
-
-	bool		IsIdentity() const;
-
-	void		SetupMatrixOrgAngles(const Vector& origin, const QAngle& vAngles);
-
-	void		SetupMatrixAngles(const QAngle& vAngles);
-
-	bool		InverseGeneral(VMatrix& vInverse) const;
-
-	void		InverseTR(VMatrix& mRet) const;
-
-	bool		IsRotationMatrix() const;
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-	VMatrix		InverseTR() const;
-
-	Vector		GetScale() const;
-
-	VMatrix		Scale(const Vector& vScale);
-
-	VMatrix		NormalizeBasisVectors() const;
-
-	VMatrix		Transpose() const;
-
-	VMatrix		Transpose3x3() const;
-#endif
-
-public:
-	vec_t		m[4][4];
-};
-
-
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-VMatrix		SetupMatrixIdentity();
-
-VMatrix		SetupMatrixScale(const Vector& vScale);
-
-VMatrix		SetupMatrixTranslation(const Vector& vTranslation);
-
-VMatrix		SetupMatrixReflection(const VPlane& thePlane);
-
-VMatrix		SetupMatrixProjection(const Vector& vOrigin, const VPlane& thePlane);
-
-VMatrix		SetupMatrixAxisRot(const Vector& vAxis, vec_t fDegrees);
-
-VMatrix		SetupMatrixAngles(const QAngle& vAngles);
-
-VMatrix		SetupMatrixOrgAngles(const Vector& origin, const QAngle& vAngles);
-
-#endif
-
-#define VMatToString(mat)	(static_cast<const char *>(CFmtStr("[ (%f, %f, %f), (%f, %f, %f), (%f, %f, %f), (%f, %f, %f) ]", mat.m[0][0], mat.m[0][1], mat.m[0][2], mat.m[0][3], mat.m[1][0], mat.m[1][1], mat.m[1][2], mat.m[1][3], mat.m[2][0], mat.m[2][1], mat.m[2][2], mat.m[2][3], mat.m[3][0], mat.m[3][1], mat.m[3][2], mat.m[3][3] )))          
-
-bool PlaneIntersection(const VPlane& vp1, const VPlane& vp2, const VPlane& vp3, Vector& vOut);
-
-
-void MatrixSetIdentity(VMatrix& dst);
-void MatrixTranspose(const VMatrix& src, VMatrix& dst);
-void MatrixCopy(const VMatrix& src, VMatrix& dst);
-void MatrixMultiply(const VMatrix& src1, const VMatrix& src2, VMatrix& dst);
-
-void MatrixGetColumn(const VMatrix& src, int nCol, Vector* pColumn);
-void MatrixSetColumn(VMatrix& src, int nCol, const Vector& column);
-void MatrixGetRow(const VMatrix& src, int nCol, Vector* pColumn);
-void MatrixSetRow(VMatrix& src, int nCol, const Vector& column);
-
-void Vector3DMultiply(const VMatrix& src1, const Vector& src2, Vector& dst);
-
-inline void Vector3DMultiplyPosition(const VMatrix& src1, const VectorByValue src2, Vector& dst);
-
-void Vector3DMultiplyPositionProjective(const VMatrix& src1, const Vector& src2, Vector& dst);
-
-void Vector3DMultiplyProjective(const VMatrix& src1, const Vector& src2, Vector& dst);
-
-void Vector4DMultiply(const VMatrix& src1, const Vector4D& src2, Vector4D& dst);
-
-void Vector4DMultiplyPosition(const VMatrix& src1, const Vector& src2, Vector4D& dst);
-
-void Vector3DMultiplyTranspose(const VMatrix& src1, const Vector& src2, Vector& dst);
-void Vector4DMultiplyTranspose(const VMatrix& src1, const Vector4D& src2, Vector4D& dst);
-
-void MatrixTransformPlane(const VMatrix& src, const cplane_t& inPlane, cplane_t& outPlane);
-
-void MatrixTransformAxisAlignedPlane(const VMatrix& src, int nDim, float flSign, float flDist, cplane_t& outPlane);
-
-void MatrixBuildTranslation(VMatrix& dst, float x, float y, float z);
-void MatrixBuildTranslation(VMatrix& dst, const Vector& translation);
-
-inline void MatrixTranslate(VMatrix& dst, const Vector& translation)
-{
-	VMatrix matTranslation, temp;
-	MatrixBuildTranslation(matTranslation, translation);
-	MatrixMultiply(dst, matTranslation, temp);
-	dst = temp;
-}
-
-
-void MatrixBuildRotationAboutAxis(VMatrix& dst, const Vector& vAxisOfRot, float angleDegrees);
-void MatrixBuildRotateZ(VMatrix& dst, float angleDegrees);
-
-inline void MatrixRotate(VMatrix& dst, const Vector& vAxisOfRot, float angleDegrees)
-{
-	VMatrix rotation, temp;
-	MatrixBuildRotationAboutAxis(rotation, vAxisOfRot, angleDegrees);
-	MatrixMultiply(dst, rotation, temp);
-	dst = temp;
-}
-
-void MatrixBuildRotation(VMatrix& dst, const Vector& initialDirection, const Vector& finalDirection);
-
-void MatrixBuildScale(VMatrix& dst, float x, float y, float z);
-void MatrixBuildScale(VMatrix& dst, const Vector& scale);
-
-void MatrixBuildPerspective(VMatrix& dst, float fovX, float fovY, float zNear, float zFar);
-
-void CalculateAABBFromProjectionMatrix(const VMatrix& worldToVolume, Vector* pMins, Vector* pMaxs);
-
-void CalculateSphereFromProjectionMatrix(const VMatrix& worldToVolume, Vector* pCenter, float* pflRadius);
-
-void CalculateAABBFromProjectionMatrixInverse(const VMatrix& volumeToWorld, Vector* pMins, Vector* pMaxs);
-
-void CalculateSphereFromProjectionMatrixInverse(const VMatrix& volumeToWorld, Vector* pCenter, float* pflRadius);
-
-void FrustumPlanesFromMatrix(const VMatrix& clipToWorld, Frustum_t& frustum);
-
-void MatrixFromAngles(const QAngle& vAngles, VMatrix& dst);
-
-void MatrixToAngles(const VMatrix& src, QAngle& vAngles);
-
-void MatrixInverseTR(const VMatrix& src, VMatrix& dst);
-
-bool MatrixInverseGeneral(const VMatrix& src, VMatrix& dst);
-
-void MatrixInverseTranspose(const VMatrix& src, VMatrix& dst);
-
-
-
-inline VMatrix::VMatrix()
-{
-}
-
-inline VMatrix::VMatrix(
-	vec_t m00, vec_t m01, vec_t m02, vec_t m03,
-	vec_t m10, vec_t m11, vec_t m12, vec_t m13,
-	vec_t m20, vec_t m21, vec_t m22, vec_t m23,
-	vec_t m30, vec_t m31, vec_t m32, vec_t m33)
-{
-	Init(
-		m00, m01, m02, m03,
-		m10, m11, m12, m13,
-		m20, m21, m22, m23,
-		m30, m31, m32, m33
-	);
-}
-
-
-inline VMatrix::VMatrix(const matrix3x4_t& matrix3x4)
-{
-	Init(matrix3x4);
-}
-
-
-inline VMatrix::VMatrix(const Vector& xAxis, const Vector& yAxis, const Vector& zAxis)
-{
-	Init(
-		xAxis.x, yAxis.x, zAxis.x, 0.0f,
-		xAxis.y, yAxis.y, zAxis.y, 0.0f,
-		xAxis.z, yAxis.z, zAxis.z, 0.0f,
-		0.0f, 0.0f, 0.0f, 1.0f
-	);
-}
-
-inline VMatrix::VMatrix(const Vector& xAxis, const Vector& yAxis, const Vector& zAxis, const Vector& translation)
-{
-	Init(
-		xAxis.x, yAxis.x, zAxis.x, translation.x,
-		xAxis.y, yAxis.y, zAxis.y, translation.y,
-		xAxis.z, yAxis.z, zAxis.z, translation.z,
-		0.0f, 0.0f, 0.0f, 1.0f
-	);
-}
-
-
-inline void VMatrix::Init(
-	vec_t m00, vec_t m01, vec_t m02, vec_t m03,
-	vec_t m10, vec_t m11, vec_t m12, vec_t m13,
-	vec_t m20, vec_t m21, vec_t m22, vec_t m23,
-	vec_t m30, vec_t m31, vec_t m32, vec_t m33
-)
-{
-	m[0][0] = m00;
-	m[0][1] = m01;
-	m[0][2] = m02;
-	m[0][3] = m03;
-
-	m[1][0] = m10;
-	m[1][1] = m11;
-	m[1][2] = m12;
-	m[1][3] = m13;
-
-	m[2][0] = m20;
-	m[2][1] = m21;
-	m[2][2] = m22;
-	m[2][3] = m23;
-
-	m[3][0] = m30;
-	m[3][1] = m31;
-	m[3][2] = m32;
-	m[3][3] = m33;
-}
-
-
-inline void VMatrix::Init(const matrix3x4_t& matrix3x4)
-{
-	memcpy(m, matrix3x4.Base(), sizeof(matrix3x4_t));
-
-	m[3][0] = 0.0f;
-	m[3][1] = 0.0f;
-	m[3][2] = 0.0f;
-	m[3][3] = 1.0f;
-}
-
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline Vector VMatrix::GetForward() const
-{
-	return Vector(m[0][0], m[1][0], m[2][0]);
-}
-
-inline Vector VMatrix::GetLeft() const
-{
-	return Vector(m[0][1], m[1][1], m[2][1]);
-}
-
-inline Vector VMatrix::GetUp() const
-{
-	return Vector(m[0][2], m[1][2], m[2][2]);
-}
-
-#endif
-
-inline void VMatrix::SetForward(const Vector& vForward)
-{
-	m[0][0] = vForward.x;
-	m[1][0] = vForward.y;
-	m[2][0] = vForward.z;
-}
-
-inline void VMatrix::SetLeft(const Vector& vLeft)
-{
-	m[0][1] = vLeft.x;
-	m[1][1] = vLeft.y;
-	m[2][1] = vLeft.z;
-}
-
-inline void VMatrix::SetUp(const Vector& vUp)
-{
-	m[0][2] = vUp.x;
-	m[1][2] = vUp.y;
-	m[2][2] = vUp.z;
-}
-
-inline void VMatrix::GetBasisVectors(Vector& vForward, Vector& vLeft, Vector& vUp) const
-{
-	vForward.Init(m[0][0], m[1][0], m[2][0]);
-	vLeft.Init(m[0][1], m[1][1], m[2][1]);
-	vUp.Init(m[0][2], m[1][2], m[2][2]);
-}
-
-inline void VMatrix::SetBasisVectors(const Vector& vForward, const Vector& vLeft, const Vector& vUp)
-{
-	SetForward(vForward);
-	SetLeft(vLeft);
-	SetUp(vUp);
-}
-
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline Vector VMatrix::GetTranslation() const
-{
-	return Vector(m[0][3], m[1][3], m[2][3]);
-}
-
-#endif
-
-inline Vector& VMatrix::GetTranslation(Vector& vTrans) const
-{
-	vTrans.x = m[0][3];
-	vTrans.y = m[1][3];
-	vTrans.z = m[2][3];
-	return vTrans;
-}
-
-inline void VMatrix::SetTranslation(const Vector& vTrans)
-{
-	m[0][3] = vTrans.x;
-	m[1][3] = vTrans.y;
-	m[2][3] = vTrans.z;
-}
-
-
-inline void VMatrix::PreTranslate(const Vector& vTrans)
-{
-	Vector tmp;
-	Vector3DMultiplyPosition(*this, vTrans, tmp);
-	m[0][3] = tmp.x;
-	m[1][3] = tmp.y;
-	m[2][3] = tmp.z;
-}
-
-
-inline void VMatrix::PostTranslate(const Vector& vTrans)
-{
-	m[0][3] += vTrans.x;
-	m[1][3] += vTrans.y;
-	m[2][3] += vTrans.z;
-}
-
-inline const matrix3x4_t& VMatrix::As3x4() const
-{
-	return *((const matrix3x4_t*)this);
-}
-
-inline void VMatrix::CopyFrom3x4(const matrix3x4_t& m3x4)
-{
-	memcpy(m, m3x4.Base(), sizeof(matrix3x4_t));
-	m[3][0] = m[3][1] = m[3][2] = 0;
-	m[3][3] = 1;
-}
-
-inline void	VMatrix::Set3x4(matrix3x4_t& matrix3x4) const
-{
-	memcpy(matrix3x4.Base(), m, sizeof(matrix3x4_t));
-}
-
-
-inline const VMatrix& VMatrix::operator+=(const VMatrix& other)
-{
-	for (int i = 0; i < 4; i++)
-	{
-		for (int j = 0; j < 4; j++)
-		{
-			m[i][j] += other.m[i][j];
-		}
-	}
-
-	return *this;
-}
-
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline VMatrix VMatrix::operator+(const VMatrix& other) const
-{
-	VMatrix ret;
-	for (int i = 0; i < 16; i++)
-	{
-		((float*)ret.m)[i] = ((float*)m)[i] + ((float*)other.m)[i];
-	}
-	return ret;
-}
-
-inline VMatrix VMatrix::operator-(const VMatrix& other) const
-{
-	VMatrix ret;
-
-	for (int i = 0; i < 4; i++)
-	{
-		for (int j = 0; j < 4; j++)
-		{
-			ret.m[i][j] = m[i][j] - other.m[i][j];
-		}
-	}
-
-	return ret;
-}
-
-inline VMatrix VMatrix::operator-() const
-{
-	VMatrix ret;
-	for (int i = 0; i < 16; i++)
-	{
-		((float*)ret.m)[i] = ((float*)m)[i];
-	}
-	return ret;
-}
-
-#endif  
-
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline Vector VMatrix::operator*(const Vector& vVec) const
-{
-	Vector vRet;
-	vRet.x = m[0][0] * vVec.x + m[0][1] * vVec.y + m[0][2] * vVec.z + m[0][3];
-	vRet.y = m[1][0] * vVec.x + m[1][1] * vVec.y + m[1][2] * vVec.z + m[1][3];
-	vRet.z = m[2][0] * vVec.x + m[2][1] * vVec.y + m[2][2] * vVec.z + m[2][3];
-
-	return vRet;
-}
-
-inline Vector VMatrix::VMul4x3(const Vector& vVec) const
-{
-	Vector vResult;
-	Vector3DMultiplyPosition(*this, vVec, vResult);
-	return vResult;
-}
-
-
-inline Vector VMatrix::VMul4x3Transpose(const Vector& vVec) const
-{
-	Vector tmp = vVec;
-	tmp.x -= m[0][3];
-	tmp.y -= m[1][3];
-	tmp.z -= m[2][3];
-
-	return Vector(
-		m[0][0] * tmp.x + m[1][0] * tmp.y + m[2][0] * tmp.z,
-		m[0][1] * tmp.x + m[1][1] * tmp.y + m[2][1] * tmp.z,
-		m[0][2] * tmp.x + m[1][2] * tmp.y + m[2][2] * tmp.z
-	);
-}
-
-inline Vector VMatrix::VMul3x3(const Vector& vVec) const
-{
-	return Vector(
-		m[0][0] * vVec.x + m[0][1] * vVec.y + m[0][2] * vVec.z,
-		m[1][0] * vVec.x + m[1][1] * vVec.y + m[1][2] * vVec.z,
-		m[2][0] * vVec.x + m[2][1] * vVec.y + m[2][2] * vVec.z
-	);
-}
-
-inline Vector VMatrix::VMul3x3Transpose(const Vector& vVec) const
-{
-	return Vector(
-		m[0][0] * vVec.x + m[1][0] * vVec.y + m[2][0] * vVec.z,
-		m[0][1] * vVec.x + m[1][1] * vVec.y + m[2][1] * vVec.z,
-		m[0][2] * vVec.x + m[1][2] * vVec.y + m[2][2] * vVec.z
-	);
-}
-
-#endif  
-
-
-inline void VMatrix::V3Mul(const Vector& vIn, Vector& vOut) const
-{
-	vec_t rw;
-
-	rw = 1.0f / (m[3][0] * vIn.x + m[3][1] * vIn.y + m[3][2] * vIn.z + m[3][3]);
-	vOut.x = (m[0][0] * vIn.x + m[0][1] * vIn.y + m[0][2] * vIn.z + m[0][3]) * rw;
-	vOut.y = (m[1][0] * vIn.x + m[1][1] * vIn.y + m[1][2] * vIn.z + m[1][3]) * rw;
-	vOut.z = (m[2][0] * vIn.x + m[2][1] * vIn.y + m[2][2] * vIn.z + m[2][3]) * rw;
-}
-
-inline void VMatrix::V4Mul(const Vector4D& vIn, Vector4D& vOut) const
-{
-	vOut[0] = m[0][0] * vIn[0] + m[0][1] * vIn[1] + m[0][2] * vIn[2] + m[0][3] * vIn[3];
-	vOut[1] = m[1][0] * vIn[0] + m[1][1] * vIn[1] + m[1][2] * vIn[2] + m[1][3] * vIn[3];
-	vOut[2] = m[2][0] * vIn[0] + m[2][1] * vIn[1] + m[2][2] * vIn[2] + m[2][3] * vIn[3];
-	vOut[3] = m[3][0] * vIn[0] + m[3][1] * vIn[1] + m[3][2] * vIn[2] + m[3][3] * vIn[3];
-}
-
-
-inline void	VMatrix::TransformPlane(const VPlane& inPlane, VPlane& outPlane) const
-{
-	Vector vTrans;
-	Vector3DMultiply(*this, inPlane.m_Normal, outPlane.m_Normal);
-	outPlane.m_Dist = inPlane.m_Dist * DotProduct(outPlane.m_Normal, outPlane.m_Normal);
-	outPlane.m_Dist += DotProduct(outPlane.m_Normal, GetTranslation(vTrans));
-}
-
-
-inline void VMatrix::Identity()
-{
-	MatrixSetIdentity(*this);
-}
-
-
-inline bool VMatrix::IsIdentity() const
-{
-	return
-		m[0][0] == 1.0f && m[0][1] == 0.0f && m[0][2] == 0.0f && m[0][3] == 0.0f &&
-		m[1][0] == 0.0f && m[1][1] == 1.0f && m[1][2] == 0.0f && m[1][3] == 0.0f &&
-		m[2][0] == 0.0f && m[2][1] == 0.0f && m[2][2] == 1.0f && m[2][3] == 0.0f &&
-		m[3][0] == 0.0f && m[3][1] == 0.0f && m[3][2] == 0.0f && m[3][3] == 1.0f;
-}
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline Vector VMatrix::ApplyRotation(const Vector& vVec) const
-{
-	return VMul3x3(vVec);
-}
-
-inline VMatrix VMatrix::operator~() const
-{
-	VMatrix mRet;
-	InverseGeneral(mRet);
-	return mRet;
-}
-
-#endif
-
-
-inline void MatrixGetColumn(const VMatrix& src, int nCol, Vector* pColumn)
-{
-	Assert((nCol >= 0) && (nCol <= 3));
-
-	pColumn->x = src[0][nCol];
-	pColumn->y = src[1][nCol];
-	pColumn->z = src[2][nCol];
-}
-
-inline void MatrixSetColumn(VMatrix& src, int nCol, const Vector& column)
-{
-	Assert((nCol >= 0) && (nCol <= 3));
-
-	src.m[0][nCol] = column.x;
-	src.m[1][nCol] = column.y;
-	src.m[2][nCol] = column.z;
-}
-
-inline void MatrixGetRow(const VMatrix& src, int nRow, Vector* pRow)
-{
-	Assert((nRow >= 0) && (nRow <= 3));
-	*pRow = *(Vector*)src[nRow];
-}
-
-inline void MatrixSetRow(VMatrix& dst, int nRow, const Vector& row)
-{
-	Assert((nRow >= 0) && (nRow <= 3));
-	*(Vector*)dst[nRow] = row;
-}
-
-
-inline void Vector3DMultiplyPosition(const VMatrix& src1, const VectorByValue src2, Vector& dst)
-{
-	dst[0] = src1[0][0] * src2.x + src1[0][1] * src2.y + src1[0][2] * src2.z + src1[0][3];
-	dst[1] = src1[1][0] * src2.x + src1[1][1] * src2.y + src1[1][2] * src2.z + src1[1][3];
-	dst[2] = src1[2][0] * src2.x + src1[2][1] * src2.y + src1[2][2] * src2.z + src1[2][3];
-}
-
-
-inline void MatrixTransformAxisAlignedPlane(const VMatrix& src, int nDim, float flSign, float flDist, cplane_t& outPlane)
-{
-	MatrixGetColumn(src, nDim, &outPlane.normal);
-	outPlane.normal *= flSign;
-	outPlane.dist = flDist * DotProduct(outPlane.normal, outPlane.normal);
-
-	outPlane.dist += outPlane.normal.x * src.m[0][3] + outPlane.normal.y * src.m[1][3] + outPlane.normal.z * src.m[2][3];
-}
-
-
-inline bool MatricesAreEqual(const VMatrix& src1, const VMatrix& src2, float flTolerance)
-{
-	for (int i = 0; i < 3; ++i)
-	{
-		for (int j = 0; j < 3; ++j)
-		{
-			if (fabs(src1[i][j] - src2[i][j]) > flTolerance)
-				return false;
-		}
-	}
-	return true;
-}
-
-void MatrixBuildOrtho(VMatrix& dst, double left, double top, double right, double bottom, double zNear, double zFar);
-void MatrixBuildPerspectiveX(VMatrix& dst, double flFovX, double flAspect, double flZNear, double flZFar);
-void MatrixBuildPerspectiveOffCenterX(VMatrix& dst, double flFovX, double flAspect, double flZNear, double flZFar, double bottom, double top, double left, double right);
-void MatrixBuildPerspectiveZRange(VMatrix& dst, double flZNear, double flZFar);
-
-inline void MatrixOrtho(VMatrix& dst, double left, double top, double right, double bottom, double zNear, double zFar)
-{
-	VMatrix mat;
-	MatrixBuildOrtho(mat, left, top, right, bottom, zNear, zFar);
-
-	VMatrix temp;
-	MatrixMultiply(dst, mat, temp);
-	dst = temp;
-}
-
-inline void MatrixPerspectiveX(VMatrix& dst, double flFovX, double flAspect, double flZNear, double flZFar)
-{
-	VMatrix mat;
-	MatrixBuildPerspectiveX(mat, flFovX, flAspect, flZNear, flZFar);
-
-	VMatrix temp;
-	MatrixMultiply(dst, mat, temp);
-	dst = temp;
-}
-
-inline void MatrixPerspectiveOffCenterX(VMatrix& dst, double flFovX, double flAspect, double flZNear, double flZFar, double bottom, double top, double left, double right)
-{
-	VMatrix mat;
-	MatrixBuildPerspectiveOffCenterX(mat, flFovX, flAspect, flZNear, flZFar, bottom, top, left, right);
-
-	VMatrix temp;
-	MatrixMultiply(dst, mat, temp);
-	dst = temp;
-}
-
-#endif
-
diff --git a/SpyCustom/vmt_smart_hook.hpp b/SpyCustom/vmt_smart_hook.hpp
deleted file mode 100644
index 2fe35bd..0000000
--- a/SpyCustom/vmt_smart_hook.hpp
+++ /dev/null
@@ -1,156 +0,0 @@
-#pragma once
-#include <cstring>
-#include <cassert>
-
-#include "Interfaces.hpp"
-using proc_t = void(*)();
-
-class vmt_base_hook
-{
-protected:
-	constexpr vmt_base_hook() = default;
-
-public:
-	~vmt_base_hook()
-	{
-		if (m_new_vmt)
-			delete[](m_new_vmt - 1);
-	}
-
-	vmt_base_hook(const vmt_base_hook&) = delete;
-	vmt_base_hook(vmt_base_hook&&) = delete;
-
-	vmt_base_hook& operator=(const vmt_base_hook&) = delete;
-	vmt_base_hook& operator=(vmt_base_hook&&) = delete;
-
-protected:
-	auto initialize(proc_t* original_table) -> void
-	{
-		m_old_vmt = original_table;
-
-		size_t size = 0;
-		while (m_old_vmt[size] && is_code_ptr(m_old_vmt[size]))
-			++size;
-
-		m_new_vmt = (new proc_t[size + 1]) + 1;
-		memcpy(m_new_vmt - 1, m_old_vmt - 1, sizeof(void*) * (size + 1));
-	}
-
-	constexpr auto leak_table() -> void
-	{
-		m_new_vmt = nullptr;
-	}
-
-	auto hook_instance(void* inst) const -> void
-	{
-		auto& vtbl = *reinterpret_cast<proc_t**>(inst);
-		assert(vtbl == m_old_vmt || vtbl == m_new_vmt);
-		vtbl = m_new_vmt;
-	}
-
-	auto unhook_instance(void* inst) const -> void
-	{
-		auto& vtbl = *reinterpret_cast<proc_t**>(inst);
-		assert(vtbl == m_old_vmt || vtbl == m_new_vmt);
-		vtbl = m_old_vmt;
-	}
-
-	auto initialize_and_hook_instance(void* inst) -> bool
-	{
-		auto& vtbl = *reinterpret_cast<proc_t**>(inst);
-		auto initialized = false;
-		if (!m_old_vmt)
-		{
-			initialized = true;
-			initialize(vtbl);
-		}
-		hook_instance(inst);
-		return initialized;
-	}
-
-	template <typename Fn>
-	auto hook_function(Fn hooked_fn, const std::size_t index) -> Fn
-	{
-		m_new_vmt[index] = (proc_t)(hooked_fn);
-		return (Fn)(m_old_vmt[index]);
-	}
-
-	template<typename T>
-	auto apply_hook(std::size_t idx) -> void
-	{
-		T::m_original = hook_function(&T::hooked, idx);
-	}
-
-	template <typename Fn = uintptr_t>
-	auto get_original_function(const int index) -> Fn
-	{
-		return (Fn)(m_old_vmt[index]);
-	}
-
-private:
-	proc_t* m_new_vmt = nullptr;
-	proc_t* m_old_vmt = nullptr;
-};
-
-class vmt_smart_hook : vmt_base_hook
-{
-public:
-	vmt_smart_hook(void* class_base)
-		: m_class{ class_base }
-	{
-		initialize_and_hook_instance(class_base);
-	}
-
-	~vmt_smart_hook()
-	{
-		unhook_instance(m_class);
-	}
-
-	vmt_smart_hook(const vmt_smart_hook&) = delete;
-	vmt_smart_hook(vmt_smart_hook&&) = delete;
-
-	vmt_smart_hook& operator=(const vmt_smart_hook&) = delete;
-	vmt_smart_hook& operator=(vmt_smart_hook&&) = delete;
-
-	auto rehook() const -> void
-	{
-		hook_instance(m_class);
-	}
-
-	auto unhook() const -> void
-	{
-		unhook_instance(m_class);
-	}
-
-	using vmt_base_hook::apply_hook;
-	using vmt_base_hook::get_original_function;
-	using vmt_base_hook::hook_function;
-
-private:
-	void* m_class = nullptr;
-};
-
-class vmt_multi_hook : vmt_base_hook
-{
-public:
-	constexpr vmt_multi_hook() = default;
-
-	~vmt_multi_hook()
-	{
-		leak_table();
-	}
-
-	vmt_multi_hook(const vmt_multi_hook&) = delete;
-	vmt_multi_hook(vmt_multi_hook&&) = delete;
-
-	vmt_multi_hook& operator=(const vmt_multi_hook&) = delete;
-	vmt_multi_hook& operator=(vmt_multi_hook&&) = delete;
-
-	using vmt_base_hook::apply_hook;
-	using vmt_base_hook::get_original_function;
-	using vmt_base_hook::hook_function;
-	using vmt_base_hook::hook_instance;
-	using vmt_base_hook::unhook_instance;
-	using vmt_base_hook::initialize;
-	using vmt_base_hook::initialize_and_hook_instance;
-};
\ No newline at end of file
diff --git a/SpyCustom/volumeculler.h b/SpyCustom/volumeculler.h
deleted file mode 100644
index e39ba5d..0000000
--- a/SpyCustom/volumeculler.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef VOLUME_CULLER_H
-#define VOLUME_CULLER_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vector.h"
-#include "vplane.h"
-#include "ssemath.h"
-#include "memalloc.h" 
-
-class CVolumeCuller : public CAlignedNewDelete< 16 >
-{
-public:
-	inline CVolumeCuller() { Clear(); }
-
-	inline void Clear() { m_nNumInclusionVolumePlanes = 0; m_bHasExclusionFrustum = false; m_bHasBaseFrustum = false; m_bCullSmallObjects = false; ClearCullCheckStats(); }
-
-	inline bool IsValid() const { return m_bHasExclusionFrustum || (m_nNumInclusionVolumePlanes != 0); }
-
-	bool CheckBox(const VectorAligned& mins, const VectorAligned& maxs) const;
-	bool CheckBox(const Vector& mins, const Vector& maxs) const;
-	bool CheckBoxCenterHalfDiagonal(const VectorAligned& center, const VectorAligned& halfDiagonal) const;
-
-	enum
-	{
-		cNumBaseFrustumPlanes = 6,
-
-		cNumExclusionFrustumPlanes = 6,
-
-		cMaxInclusionVolumePlanes = 12
-	};
-
-	inline bool HasBaseFrustum() const { return m_bHasBaseFrustum; }
-	void SetBaseFrustumPlanes(const VPlane* pPlanes);
-
-	void GetBaseFrustumPlanes(VPlane* pBasePlanes) const;
-	int GetNumBaseFrustumPlanes() const { return cNumBaseFrustumPlanes; }
-
-	inline bool HasExclusionFrustum() const { return m_bHasExclusionFrustum; }
-	void SetExclusionFrustumPlanes(const VPlane* pPlanes);
-
-	int GetNumExclusionFrustumPlanes() const { return cNumExclusionFrustumPlanes; }
-	const fltx4* GetExclusionFrustumPlanes() const { return m_ExclusionFrustumPlanes; }
-
-	inline bool HasInclusionVolume() const { return m_nNumInclusionVolumePlanes != 0; }
-	void SetInclusionVolumePlanes(const VPlane* pPlanes, uint nNumPlanes);
-
-	int GetNumInclusionVolumePlanes() const { return m_nNumInclusionVolumePlanes; }
-	const fltx4* GetInclusionVolumePlanes() const { return m_InclusionVolumePlanes; }
-
-	bool GetCullSmallObjects() const { return m_bCullSmallObjects; }
-	float GetSmallObjectCullVolumeThreshold() const { return m_flSmallObjectCullVolumeThreshold; }
-
-	void SetCullSmallObjects(bool bCullSmallObjects, float flCullVolumeThreshold) { m_bCullSmallObjects = bCullSmallObjects; m_flSmallObjectCullVolumeThreshold = flCullVolumeThreshold; }
-
-	struct CullCheckStats_t
-	{
-		uint m_nTotalAABB;
-		uint m_nTotalAABBPassed;
-
-		uint m_nTotalCenterHalfDiagonal;
-		uint m_nTotalCenterHalfDiagonalPassed;
-	};
-
-	inline void ClearCullCheckStats() { memset(&m_Stats, 0, sizeof(m_Stats)); }
-	inline CullCheckStats_t& GetStats() const { return m_Stats; }
-
-private:
-	fourplanes_t	m_baseplanes[2];
-
-	fltx4 m_ExclusionFrustumPlanes[cNumExclusionFrustumPlanes];
-
-	fltx4 m_InclusionVolumePlanes[cMaxInclusionVolumePlanes];
-
-	uint m_nNumInclusionVolumePlanes;
-
-	bool m_bHasBaseFrustum : 1;
-	bool m_bHasExclusionFrustum : 1;
-
-	bool m_bCullSmallObjects : 1;
-	float m_flSmallObjectCullVolumeThreshold;
-
-	mutable CullCheckStats_t m_Stats;
-};
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vphysics_interface.h b/SpyCustom/vphysics_interface.h
deleted file mode 100644
index c610486..0000000
--- a/SpyCustom/vphysics_interface.h
+++ /dev/null
@@ -1,898 +0,0 @@
-#ifndef VPHYSICS_INTERFACE_H
-#define VPHYSICS_INTERFACE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-
-#include "interface.h"
-#include "IAppSystem.h"
-#include "vector.h"
-#include "vector4d.h"
-#include "vcollide.h"
-
-
-#define METERS_PER_INCH					(0.0254f)
-#define CUBIC_METERS_PER_CUBIC_INCH		(METERS_PER_INCH*METERS_PER_INCH*METERS_PER_INCH)
-#define POUNDS_PER_KG	(2.2f)
-#define KG_PER_POUND	(1.0f/POUNDS_PER_KG)
-
-#define lbs2kg(x)		((x)*KG_PER_POUND)
-#define kg2lbs(x)		((x)*POUNDS_PER_KG)
-
-const float VPHYSICS_MIN_MASS = 0.1f;
-const float VPHYSICS_MAX_MASS = 5e4f;
-
-class IPhysicsObject;
-class IPhysicsEnvironment;
-class IPhysicsSurfaceProps;
-class IPhysicsConstraint;
-class IPhysicsConstraintGroup;
-class IPhysicsFluidController;
-class IPhysicsSpring;
-class IPhysicsVehicleController;
-class IConvexInfo;
-class IPhysicsObjectPairHash;
-class IPhysicsCollisionSet;
-class IPhysicsPlayerController;
-class IPhysicsFrictionSnapshot;
-
-struct Ray_t;
-struct constraint_ragdollparams_t;
-struct constraint_hingeparams_t;
-struct constraint_fixedparams_t;
-struct constraint_ballsocketparams_t;
-struct constraint_slidingparams_t;
-struct constraint_pulleyparams_t;
-struct constraint_lengthparams_t;
-struct constraint_groupparams_t;
-
-struct vehicleparams_t;
-struct matrix3x4_t;
-
-struct fluidparams_t;
-struct springparams_t;
-struct objectparams_t;
-struct debugcollide_t;
-class CGameTrace;
-typedef CGameTrace trace_t;
-struct physics_stats_t;
-struct physics_performanceparams_t;
-struct virtualmeshparams_t;
-
-struct physsaveparams_t;
-struct physrestoreparams_t;
-struct physprerestoreparams_t;
-
-enum PhysInterfaceId_t
-{
-	PIID_UNKNOWN,
-	PIID_IPHYSICSOBJECT,
-	PIID_IPHYSICSFLUIDCONTROLLER,
-	PIID_IPHYSICSSPRING,
-	PIID_IPHYSICSCONSTRAINTGROUP,
-	PIID_IPHYSICSCONSTRAINT,
-	PIID_IPHYSICSSHADOWCONTROLLER,
-	PIID_IPHYSICSPLAYERCONTROLLER,
-	PIID_IPHYSICSMOTIONCONTROLLER,
-	PIID_IPHYSICSVEHICLECONTROLLER,
-	PIID_IPHYSICSGAMETRACE,
-
-	PIID_NUM_TYPES
-};
-
-
-class ISave;
-class IRestore;
-
-
-#define VPHYSICS_DEBUG_OVERLAY_INTERFACE_VERSION	"VPhysicsDebugOverlay001"
-
-abstract_class IVPhysicsDebugOverlay
-{
-public:
-	virtual void AddEntityTextOverlay(int ent_index, int line_offset, float duration, int r, int g, int b, int a, PRINTF_FORMAT_STRING const char* format, ...) = 0;
-	virtual void AddBoxOverlay(const Vector& origin, const Vector& mins, const Vector& max, QAngle const& orientation, int r, int g, int b, int a, float duration) = 0;
-	virtual void AddTriangleOverlay(const Vector& p1, const Vector& p2, const Vector& p3, int r, int g, int b, int a, bool noDepthTest, float duration) = 0;
-	virtual void AddLineOverlay(const Vector& origin, const Vector& dest, int r, int g, int b,bool noDepthTest, float duration) = 0;
-	virtual void AddTextOverlay(const Vector& origin, float duration, PRINTF_FORMAT_STRING const char* format, ...) = 0;
-	virtual void AddTextOverlay(const Vector& origin, int line_offset, float duration, PRINTF_FORMAT_STRING const char* format, ...) = 0;
-	virtual void AddScreenTextOverlay(float flXPos, float flYPos,float flDuration, int r, int g, int b, int a, const char* text) = 0;
-	virtual void AddSweptBoxOverlay(const Vector& start, const Vector& end, const Vector& mins, const Vector& max, const QAngle& angles, int r, int g, int b, int a, float flDuration) = 0;
-	virtual void AddTextOverlayRGB(const Vector& origin, int line_offset, float duration, float r, float g, float b, float alpha, PRINTF_FORMAT_STRING const char* format, ...) = 0;
-};
-
-#define VPHYSICS_INTERFACE_VERSION	"VPhysics031"
-
-abstract_class IPhysics : public IAppSystem
-{
-public:
-	virtual	IPhysicsEnvironment * CreateEnvironment(void) = 0;
-	virtual void DestroyEnvironment(IPhysicsEnvironment*) = 0;
-	virtual IPhysicsEnvironment* GetActiveEnvironmentByIndex(int index) = 0;
-
-	virtual IPhysicsObjectPairHash* CreateObjectPairHash() = 0;
-	virtual void						DestroyObjectPairHash(IPhysicsObjectPairHash* pHash) = 0;
-
-	virtual IPhysicsCollisionSet* FindOrCreateCollisionSet(unsigned int id, int maxElementCount) = 0;
-	virtual IPhysicsCollisionSet* FindCollisionSet(unsigned int id) = 0;
-	virtual void						DestroyAllCollisionSets() = 0;
-};
-
-
-class CPhysConvex;
-class CPhysPolysoup;
-class ICollisionQuery;
-class IVPhysicsKeyParser;
-struct convertconvexparams_t;
-class CPackedPhysicsDescription;
-
-class CPolyhedron;
-
-struct truncatedcone_t
-{
-	Vector	origin;
-	Vector	normal;
-	float	h;			      
-	float	theta;		   
-};
-
-
-#define VPHYSICS_COLLISION_INTERFACE_VERSION	"VPhysicsCollision007"
-
-abstract_class IPhysicsCollision
-{
-public:
-	virtual ~IPhysicsCollision(void) {}
-
-	virtual CPhysConvex * ConvexFromVerts(Vector * *pVerts, int vertCount) = 0;
-	virtual CPhysConvex* ConvexFromPlanes(float* pPlanes, int planeCount, float mergeDistance) = 0;
-	virtual float			ConvexVolume(CPhysConvex* pConvex) = 0;
-
-	virtual float			ConvexSurfaceArea(CPhysConvex* pConvex) = 0;
-	virtual void			SetConvexGameData(CPhysConvex* pConvex, unsigned int gameData) = 0;
-	virtual void			ConvexFree(CPhysConvex* pConvex) = 0;
-	virtual CPhysConvex* BBoxToConvex(const Vector& mins, const Vector& maxs) = 0;
-	virtual CPhysConvex* ConvexFromConvexPolyhedron(const CPolyhedron& ConvexPolyhedron) = 0;
-	virtual void			ConvexesFromConvexPolygon(const Vector& vPolyNormal, const Vector* pPoints, int iPointCount, CPhysConvex** pOutput) = 0;
-
-	virtual CPhysPolysoup* PolysoupCreate(void) = 0;
-	virtual void			PolysoupDestroy(CPhysPolysoup* pSoup) = 0;
-	virtual void			PolysoupAddTriangle(CPhysPolysoup* pSoup, const Vector& a, const Vector& b, const Vector& c, int materialIndex7bits) = 0;
-	virtual CPhysCollide* ConvertPolysoupToCollide(CPhysPolysoup* pSoup, bool useMOPP) = 0;
-
-	virtual CPhysCollide* ConvertConvexToCollide(CPhysConvex** pConvex, int convexCount) = 0;
-	virtual CPhysCollide* ConvertConvexToCollideParams(CPhysConvex** pConvex, int convexCount, const convertconvexparams_t& convertParams) = 0;
-	virtual void			DestroyCollide(CPhysCollide* pCollide) = 0;
-
-	virtual int				CollideSize(CPhysCollide* pCollide) = 0;
-	virtual int				CollideWrite(char* pDest, CPhysCollide* pCollide, bool bSwap = false) = 0;
-	virtual CPhysCollide* UnserializeCollide(char* pBuffer, int size, int index) = 0;
-
-	virtual float			CollideVolume(CPhysCollide* pCollide) = 0;
-	virtual float			CollideSurfaceArea(CPhysCollide* pCollide) = 0;
-
-	virtual Vector			CollideGetExtent(const CPhysCollide* pCollide, const Vector& collideOrigin, const QAngle& collideAngles, const Vector& direction) = 0;
-
-	virtual void			CollideGetAABB(Vector* pMins, Vector* pMaxs, const CPhysCollide* pCollide, const Vector& collideOrigin, const QAngle& collideAngles) = 0;
-
-	virtual void			CollideGetMassCenter(CPhysCollide* pCollide, Vector* pOutMassCenter) = 0;
-	virtual void			CollideSetMassCenter(CPhysCollide* pCollide, const Vector& massCenter) = 0;
-	virtual Vector			CollideGetOrthographicAreas(const CPhysCollide* pCollide) = 0;
-	virtual void			CollideSetOrthographicAreas(CPhysCollide* pCollide, const Vector& areas) = 0;
-
-	virtual int				CollideIndex(const CPhysCollide* pCollide) = 0;
-
-	virtual CPhysCollide* BBoxToCollide(const Vector& mins, const Vector& maxs) = 0;
-	virtual int				GetConvexesUsedInCollideable(const CPhysCollide* pCollideable, CPhysConvex** pOutputArray, int iOutputArrayLimit) = 0;
-
-
-	virtual void TraceBox(const Vector& start, const Vector& end, const Vector& mins, const Vector& maxs, const CPhysCollide* pCollide, const Vector& collideOrigin, const QAngle& collideAngles, trace_t* ptr) = 0;
-	virtual void TraceBox(const Ray_t& ray, const CPhysCollide* pCollide, const Vector& collideOrigin, const QAngle& collideAngles, trace_t* ptr) = 0;
-	virtual void TraceBox(const Ray_t& ray, unsigned int contentsMask, IConvexInfo* pConvexInfo, const CPhysCollide* pCollide, const Vector& collideOrigin, const QAngle& collideAngles, trace_t* ptr) = 0;
-
-	virtual void TraceCollide(const Vector& start, const Vector& end, const CPhysCollide* pSweepCollide, const QAngle& sweepAngles, const CPhysCollide* pCollide, const Vector& collideOrigin, const QAngle& collideAngles, trace_t* ptr) = 0;
-
-	virtual bool			IsBoxIntersectingCone(const Vector& boxAbsMins, const Vector& boxAbsMaxs, const truncatedcone_t& cone) = 0;
-
-	virtual void			VCollideLoad(vcollide_t* pOutput, int solidCount, const char* pBuffer, int size, bool swap = false) = 0;
-	virtual void			VCollideUnload(vcollide_t* pVCollide) = 0;
-
-	virtual IVPhysicsKeyParser* VPhysicsKeyParserCreate(const char* pKeyData) = 0;
-	virtual void			VPhysicsKeyParserDestroy(IVPhysicsKeyParser* pParser) = 0;
-
-	virtual int				CreateDebugMesh(CPhysCollide const* pCollisionModel, Vector** outVerts) = 0;
-	virtual void			DestroyDebugMesh(int vertCount, Vector* outVerts) = 0;
-
-	virtual ICollisionQuery* CreateQueryModel(CPhysCollide* pCollide) = 0;
-	virtual void			DestroyQueryModel(ICollisionQuery* pQuery) = 0;
-
-	virtual IPhysicsCollision* ThreadContextCreate(void) = 0;
-	virtual void			ThreadContextDestroy(IPhysicsCollision* pThreadContex) = 0;
-
-	virtual CPhysCollide* CreateVirtualMesh(const virtualmeshparams_t& params) = 0;
-	virtual bool			SupportsVirtualMesh() = 0;
-
-
-	virtual bool			GetBBoxCacheSize(int* pCachedSize, int* pCachedCount) = 0;
-
-
-	virtual CPolyhedron* PolyhedronFromConvex(CPhysConvex* const pConvex, bool bUseTempPolyhedron) = 0;
-
-	virtual void			OutputDebugInfo(const CPhysCollide* pCollide) = 0;
-	virtual unsigned int	ReadStat(int statID) = 0;
-};
-
-abstract_class ICollisionQuery
-{
-public:
-	virtual ~ICollisionQuery() {}
-	virtual int		ConvexCount(void) = 0;
-	virtual int		TriangleCount(int convexIndex) = 0;
-	virtual unsigned int GetGameData(int convexIndex) = 0;
-	virtual void	GetTriangleVerts(int convexIndex, int triangleIndex, Vector* verts) = 0;
-
-	virtual void	SetTriangleVerts(int convexIndex, int triangleIndex, const Vector* verts) = 0;
-
-	virtual int		GetTriangleMaterialIndex(int convexIndex, int triangleIndex) = 0;
-	virtual void	SetTriangleMaterialIndex(int convexIndex, int triangleIndex, int index7bits) = 0;
-};
-
-abstract_class IPhysicsGameTrace
-{
-public:
-	virtual void VehicleTraceRay(const Ray_t & ray, void* pVehicle, trace_t * pTrace) = 0;
-	virtual	void VehicleTraceRayWithWater(const Ray_t& ray, void* pVehicle, trace_t* pTrace) = 0;
-	virtual bool VehiclePointInWater(const Vector& vecPoint) = 0;
-};
-
-abstract_class IConvexInfo
-{
-public:
-	virtual unsigned int GetContents(int convexGameData) = 0;
-};
-
-class CPhysicsEventHandler;
-abstract_class IPhysicsCollisionData
-{
-public:
-	virtual void GetSurfaceNormal(Vector & out) = 0;		        
-	virtual void GetContactPoint(Vector& out) = 0;		       
-	virtual void GetContactSpeed(Vector& out) = 0;		           
-};
-
-
-struct vcollisionevent_t
-{
-	IPhysicsObject* pObjects[2];
-	int				surfaceProps[2];
-	bool			isCollision;
-	bool			isShadowCollision;
-	float			deltaCollisionTime;
-
-	float			collisionSpeed;				    
-	IPhysicsCollisionData* pInternalData;		    
-};
-
-abstract_class IPhysicsCollisionEvent
-{
-public:
-	virtual void PreCollision(vcollisionevent_t * pEvent) = 0;
-	virtual void PostCollision(vcollisionevent_t* pEvent) = 0;
-
-	virtual void Friction(IPhysicsObject* pObject, float energy, int surfaceProps, int surfacePropsHit, IPhysicsCollisionData* pData) = 0;
-
-	virtual void StartTouch(IPhysicsObject* pObject1, IPhysicsObject* pObject2, IPhysicsCollisionData* pTouchData) = 0;
-	virtual void EndTouch(IPhysicsObject* pObject1, IPhysicsObject* pObject2, IPhysicsCollisionData* pTouchData) = 0;
-
-	virtual void FluidStartTouch(IPhysicsObject* pObject, IPhysicsFluidController* pFluid) = 0;
-	virtual void FluidEndTouch(IPhysicsObject* pObject, IPhysicsFluidController* pFluid) = 0;
-
-	virtual void PostSimulationFrame() = 0;
-
-	virtual void ObjectEnterTrigger(IPhysicsObject* pTrigger, IPhysicsObject* pObject) {}
-	virtual void ObjectLeaveTrigger(IPhysicsObject* pTrigger, IPhysicsObject* pObject) {}
-};
-
-
-abstract_class IPhysicsObjectEvent
-{
-public:
-	virtual void ObjectWake(IPhysicsObject * pObject) = 0;
-	virtual void ObjectSleep(IPhysicsObject* pObject) = 0;
-};
-
-abstract_class IPhysicsConstraintEvent
-{
-public:
-	virtual void ConstraintBroken(IPhysicsConstraint*) = 0;
-};
-
-struct hlshadowcontrol_params_t
-{
-	Vector			targetPosition;
-	QAngle			targetRotation;
-	float			maxAngular;
-	float			maxDampAngular;
-	float			maxSpeed;
-	float			maxDampSpeed;
-	float			dampFactor;
-	float			teleportDistance;
-};
-
-abstract_class IPhysicsShadowController
-{
-public:
-	virtual ~IPhysicsShadowController(void) {}
-
-	virtual void Update(const Vector & position, const QAngle & angles, float timeOffset) = 0;
-	virtual void MaxSpeed(float maxSpeed, float maxAngularSpeed) = 0;
-	virtual void StepUp(float height) = 0;
-
-	virtual void SetTeleportDistance(float teleportDistance) = 0;
-	virtual bool AllowsTranslation() = 0;
-	virtual bool AllowsRotation() = 0;
-
-	virtual void SetPhysicallyControlled(bool isPhysicallyControlled) = 0;
-	virtual bool IsPhysicallyControlled() = 0;
-	virtual void GetLastImpulse(Vector* pOut) = 0;
-	virtual void UseShadowMaterial(bool bUseShadowMaterial) = 0;
-	virtual void ObjectMaterialChanged(int materialIndex) = 0;
-
-
-	virtual float GetTargetPosition(Vector* pPositionOut, QAngle* pAnglesOut) = 0;
-
-	virtual float GetTeleportDistance(void) = 0;
-	virtual void GetMaxSpeed(float* pMaxSpeedOut, float* pMaxAngularSpeedOut) = 0;
-};
-
-class CPhysicsSimObject;
-class IPhysicsMotionController;
-
-class IMotionEvent
-{
-public:
-	enum simresult_e { SIM_NOTHING = 0, SIM_LOCAL_ACCELERATION, SIM_LOCAL_FORCE, SIM_GLOBAL_ACCELERATION, SIM_GLOBAL_FORCE };
-	virtual simresult_e	Simulate(IPhysicsMotionController* pController, IPhysicsObject* pObject, float deltaTime, Vector& linear, AngularImpulse& angular) = 0;
-};
-
-
-
-abstract_class IPhysicsMotionController
-{
-public:
-	virtual ~IPhysicsMotionController(void) {}
-	virtual void SetEventHandler(IMotionEvent * handler) = 0;
-	virtual void AttachObject(IPhysicsObject* pObject, bool checkIfAlreadyAttached) = 0;
-	virtual void DetachObject(IPhysicsObject* pObject) = 0;
-
-	virtual int CountObjects(void) = 0;
-	virtual void GetObjects(IPhysicsObject** pObjectList) = 0;
-	virtual void ClearObjects(void) = 0;
-	virtual void WakeObjects(void) = 0;
-
-	enum priority_t
-	{
-		LOW_PRIORITY = 0,
-		MEDIUM_PRIORITY = 1,
-		HIGH_PRIORITY = 2,
-	};
-	virtual void SetPriority(priority_t priority) = 0;
-};
-
-abstract_class IPhysicsCollisionSolver
-{
-public:
-	virtual int ShouldCollide(IPhysicsObject * pObj0, IPhysicsObject * pObj1, void* pGameData0, void* pGameData1) = 0;
-	virtual int ShouldSolvePenetration(IPhysicsObject* pObj0, IPhysicsObject* pObj1, void* pGameData0, void* pGameData1, float dt) = 0;
-
-	virtual bool ShouldFreezeObject(IPhysicsObject* pObject) = 0;
-
-	virtual int AdditionalCollisionChecksThisTick(int currentChecksDone) = 0;
-
-	virtual bool ShouldFreezeContacts(IPhysicsObject** pObjectList, int objectCount) = 0;
-};
-
-enum PhysicsTraceType_t
-{
-	VPHYSICS_TRACE_EVERYTHING = 0,
-	VPHYSICS_TRACE_STATIC_ONLY,
-	VPHYSICS_TRACE_MOVING_ONLY,
-	VPHYSICS_TRACE_TRIGGERS_ONLY,
-	VPHYSICS_TRACE_STATIC_AND_MOVING,
-};
-
-abstract_class IPhysicsTraceFilter
-{
-public:
-	virtual bool ShouldHitObject(IPhysicsObject * pObject, int contentsMask) = 0;
-	virtual PhysicsTraceType_t	GetTraceType() const = 0;
-};
-
-abstract_class IPhysicsEnvironment
-{
-public:
-	virtual ~IPhysicsEnvironment(void) {}
-
-	virtual void SetDebugOverlay(CreateInterfaceFn debugOverlayFactory) = 0;
-	virtual IVPhysicsDebugOverlay* GetDebugOverlay(void) = 0;
-
-	virtual void			SetGravity(const Vector& gravityVector) = 0;
-	virtual void			GetGravity(Vector* pGravityVector) const = 0;
-
-	virtual void			SetAirDensity(float density) = 0;
-	virtual float			GetAirDensity(void) const = 0;
-
-	virtual IPhysicsObject* CreatePolyObject(const CPhysCollide* pCollisionModel, int materialIndex, const Vector& position, const QAngle& angles, objectparams_t* pParams) = 0;
-	virtual IPhysicsObject* CreatePolyObjectStatic(const CPhysCollide* pCollisionModel, int materialIndex, const Vector& position, const QAngle& angles, objectparams_t* pParams) = 0;
-	virtual IPhysicsObject* CreateSphereObject(float radius, int materialIndex, const Vector& position, const QAngle& angles, objectparams_t* pParams, bool isStatic) = 0;
-	virtual void DestroyObject(IPhysicsObject*) = 0;
-
-	virtual IPhysicsFluidController* CreateFluidController(IPhysicsObject* pFluidObject, fluidparams_t* pParams) = 0;
-	virtual void DestroyFluidController(IPhysicsFluidController*) = 0;
-
-	virtual IPhysicsSpring* CreateSpring(IPhysicsObject* pObjectStart, IPhysicsObject* pObjectEnd, springparams_t* pParams) = 0;
-	virtual void DestroySpring(IPhysicsSpring*) = 0;
-
-	virtual IPhysicsConstraint* CreateRagdollConstraint(IPhysicsObject* pReferenceObject, IPhysicsObject* pAttachedObject, IPhysicsConstraintGroup* pGroup, const constraint_ragdollparams_t& ragdoll) = 0;
-	virtual IPhysicsConstraint* CreateHingeConstraint(IPhysicsObject* pReferenceObject, IPhysicsObject* pAttachedObject, IPhysicsConstraintGroup* pGroup, const constraint_hingeparams_t& hinge) = 0;
-	virtual IPhysicsConstraint* CreateFixedConstraint(IPhysicsObject* pReferenceObject, IPhysicsObject* pAttachedObject, IPhysicsConstraintGroup* pGroup, const constraint_fixedparams_t& fixed) = 0;
-	virtual IPhysicsConstraint* CreateSlidingConstraint(IPhysicsObject* pReferenceObject, IPhysicsObject* pAttachedObject, IPhysicsConstraintGroup* pGroup, const constraint_slidingparams_t& sliding) = 0;
-	virtual IPhysicsConstraint* CreateBallsocketConstraint(IPhysicsObject* pReferenceObject, IPhysicsObject* pAttachedObject, IPhysicsConstraintGroup* pGroup, const constraint_ballsocketparams_t& ballsocket) = 0;
-	virtual IPhysicsConstraint* CreatePulleyConstraint(IPhysicsObject* pReferenceObject, IPhysicsObject* pAttachedObject, IPhysicsConstraintGroup* pGroup, const constraint_pulleyparams_t& pulley) = 0;
-	virtual IPhysicsConstraint* CreateLengthConstraint(IPhysicsObject* pReferenceObject, IPhysicsObject* pAttachedObject, IPhysicsConstraintGroup* pGroup, const constraint_lengthparams_t& length) = 0;
-
-	virtual void DestroyConstraint(IPhysicsConstraint*) = 0;
-
-	virtual IPhysicsConstraintGroup* CreateConstraintGroup(const constraint_groupparams_t& groupParams) = 0;
-	virtual void DestroyConstraintGroup(IPhysicsConstraintGroup* pGroup) = 0;
-
-	virtual IPhysicsShadowController* CreateShadowController(IPhysicsObject* pObject, bool allowTranslation, bool allowRotation) = 0;
-	virtual void						DestroyShadowController(IPhysicsShadowController*) = 0;
-
-	virtual IPhysicsPlayerController* CreatePlayerController(IPhysicsObject* pObject) = 0;
-	virtual void						DestroyPlayerController(IPhysicsPlayerController*) = 0;
-
-	virtual IPhysicsMotionController* CreateMotionController(IMotionEvent* pHandler) = 0;
-	virtual void						DestroyMotionController(IPhysicsMotionController* pController) = 0;
-
-	virtual IPhysicsVehicleController* CreateVehicleController(IPhysicsObject* pVehicleBodyObject, const vehicleparams_t& params, unsigned int nVehicleType, IPhysicsGameTrace* pGameTrace) = 0;
-	virtual void						DestroyVehicleController(IPhysicsVehicleController*) = 0;
-
-	virtual void			SetCollisionSolver(IPhysicsCollisionSolver* pSolver) = 0;
-
-	virtual void			Simulate(float deltaTime) = 0;
-	virtual bool			IsInSimulation() const = 0;
-
-	virtual float			GetSimulationTimestep() const = 0;
-	virtual void			SetSimulationTimestep(float timestep) = 0;
-
-	virtual float			GetSimulationTime() const = 0;
-	virtual void			ResetSimulationClock() = 0;
-	virtual float			GetNextFrameTime(void) const = 0;
-
-	virtual void			SetCollisionEventHandler(IPhysicsCollisionEvent* pCollisionEvents) = 0;
-	virtual void			SetObjectEventHandler(IPhysicsObjectEvent* pObjectEvents) = 0;
-	virtual	void			SetConstraintEventHandler(IPhysicsConstraintEvent* pConstraintEvents) = 0;
-
-	virtual void			SetQuickDelete(bool bQuick) = 0;
-
-	virtual int				GetActiveObjectCount() const = 0;
-	virtual void			GetActiveObjects(IPhysicsObject** pOutputObjectList) const = 0;
-	virtual const IPhysicsObject** GetObjectList(int* pOutputObjectCount) const = 0;
-	virtual bool			TransferObject(IPhysicsObject* pObject, IPhysicsEnvironment* pDestinationEnvironment) = 0;
-
-	virtual void			CleanupDeleteList(void) = 0;
-	virtual void			EnableDeleteQueue(bool enable) = 0;
-
-	virtual bool			Save(const physsaveparams_t& params) = 0;
-	virtual void			PreRestore(const physprerestoreparams_t& params) = 0;
-	virtual bool			Restore(const physrestoreparams_t& params) = 0;
-	virtual void			PostRestore() = 0;
-
-	virtual bool IsCollisionModelUsed(CPhysCollide* pCollide) const = 0;
-
-	virtual void TraceRay(const Ray_t& ray, unsigned int fMask, IPhysicsTraceFilter* pTraceFilter, trace_t* pTrace) = 0;
-	virtual void SweepCollideable(const CPhysCollide* pCollide, const Vector& vecAbsStart, const Vector& vecAbsEnd,
-		const QAngle& vecAngles, unsigned int fMask, IPhysicsTraceFilter* pTraceFilter, trace_t* pTrace) = 0;
-
-	virtual void GetPerformanceSettings(physics_performanceparams_t* pOutput) const = 0;
-	virtual void SetPerformanceSettings(const physics_performanceparams_t* pSettings) = 0;
-
-	virtual void ReadStats(physics_stats_t* pOutput) = 0;
-	virtual void ClearStats() = 0;
-
-	virtual unsigned int	GetObjectSerializeSize(IPhysicsObject* pObject) const = 0;
-	virtual void			SerializeObjectToBuffer(IPhysicsObject* pObject, unsigned char* pBuffer, unsigned int bufferSize) = 0;
-	virtual IPhysicsObject* UnserializeObjectFromBuffer(void* pGameData, unsigned char* pBuffer, unsigned int bufferSize, bool enableCollisions) = 0;
-
-
-	virtual void EnableConstraintNotify(bool bEnable) = 0;
-	virtual void DebugCheckContacts(void) = 0;
-};
-
-enum callbackflags
-{
-	CALLBACK_GLOBAL_COLLISION = 0x0001,
-	CALLBACK_GLOBAL_FRICTION = 0x0002,
-	CALLBACK_GLOBAL_TOUCH = 0x0004,
-	CALLBACK_GLOBAL_TOUCH_STATIC = 0x0008,
-	CALLBACK_SHADOW_COLLISION = 0x0010,
-	CALLBACK_GLOBAL_COLLIDE_STATIC = 0x0020,
-	CALLBACK_IS_VEHICLE_WHEEL = 0x0040,
-	CALLBACK_FLUID_TOUCH = 0x0100,
-	CALLBACK_NEVER_DELETED = 0x0200,	             
-	CALLBACK_MARKED_FOR_DELETE = 0x0400,	              
-											CALLBACK_ENABLING_COLLISION = 0x0800,	           
-																					CALLBACK_DO_FLUID_SIMULATION = 0x1000,          
-																					CALLBACK_IS_PLAYER_CONTROLLER = 0x2000,	             
-																					CALLBACK_CHECK_COLLISION_DISABLE = 0x4000,
-																					CALLBACK_MARKED_FOR_TEST = 0x8000,	       
-};
-
-abstract_class IPhysicsObject
-{
-public:
-	virtual ~IPhysicsObject(void) {}
-
-	virtual bool			IsStatic() const = 0;
-	virtual bool			IsAsleep() const = 0;
-	virtual bool			IsTrigger() const = 0;
-	virtual bool			IsFluid() const = 0;		               
-	virtual bool			IsHinged() const = 0;
-	virtual bool			IsCollisionEnabled() const = 0;
-	virtual bool			IsGravityEnabled() const = 0;
-	virtual bool			IsDragEnabled() const = 0;
-	virtual bool			IsMotionEnabled() const = 0;
-	virtual bool			IsMoveable() const = 0;	     
-	virtual bool			IsAttachedToConstraint(bool bExternalOnly) const = 0;
-
-	virtual void			EnableCollisions(bool enable) = 0;
-	virtual void			EnableGravity(bool enable) = 0;
-	virtual void			EnableDrag(bool enable) = 0;
-	virtual void			EnableMotion(bool enable) = 0;
-
-	virtual void			SetGameData(void* pGameData) = 0;
-	virtual void* GetGameData(void) const = 0;
-	virtual void			SetGameFlags(unsigned short userFlags) = 0;
-	virtual unsigned short	GetGameFlags(void) const = 0;
-	virtual void			SetGameIndex(unsigned short gameIndex) = 0;
-	virtual unsigned short	GetGameIndex(void) const = 0;
-
-	virtual void			SetCallbackFlags(unsigned short callbackflags) = 0;
-	virtual unsigned short	GetCallbackFlags(void) const = 0;
-
-	virtual void			Wake(void) = 0;
-	virtual void			Sleep(void) = 0;
-	virtual void			RecheckCollisionFilter() = 0;
-	virtual void			RecheckContactPoints() = 0;
-
-	virtual void			SetMass(float mass) = 0;
-	virtual float			GetMass(void) const = 0;
-	virtual float			GetInvMass(void) const = 0;
-	virtual Vector			GetInertia(void) const = 0;
-	virtual Vector			GetInvInertia(void) const = 0;
-	virtual void			SetInertia(const Vector& inertia) = 0;
-
-	virtual void			SetDamping(const float* speed, const float* rot) = 0;
-	virtual void			GetDamping(float* speed, float* rot) const = 0;
-
-	virtual void			SetDragCoefficient(float* pDrag, float* pAngularDrag) = 0;
-	virtual void			SetBuoyancyRatio(float ratio) = 0;			  
-
-	virtual int				GetMaterialIndex() const = 0;
-	virtual void			SetMaterialIndex(int materialIndex) = 0;
-
-	virtual unsigned int	GetContents() const = 0;
-	virtual void			SetContents(unsigned int contents) = 0;
-
-	virtual float			GetSphereRadius() const = 0;
-	virtual float			GetEnergy() const = 0;
-	virtual Vector			GetMassCenterLocalSpace() const = 0;
-
-	virtual void			SetPosition(const Vector& worldPosition, const QAngle& angles, bool isTeleport) = 0;
-	virtual void			SetPositionMatrix(const matrix3x4_t& matrix, bool isTeleport) = 0;
-
-	virtual void			GetPosition(Vector* worldPosition, QAngle* angles) const = 0;
-	virtual void			GetPositionMatrix(matrix3x4_t* positionMatrix) const = 0;
-	virtual void			SetVelocity(const Vector* velocity, const AngularImpulse* angularVelocity) = 0;
-
-	virtual void			SetVelocityInstantaneous(const Vector* velocity, const AngularImpulse* angularVelocity) = 0;
-
-	virtual void			GetVelocity(Vector* velocity, AngularImpulse* angularVelocity) const = 0;
-
-	virtual void			AddVelocity(const Vector* velocity, const AngularImpulse* angularVelocity) = 0;
-	virtual void			GetVelocityAtPoint(const Vector& worldPosition, Vector* pVelocity) const = 0;
-	virtual void			GetImplicitVelocity(Vector* velocity, AngularImpulse* angularVelocity) const = 0;
-	virtual void			LocalToWorld(Vector* worldPosition, const Vector& localPosition) const = 0;
-	virtual void			WorldToLocal(Vector* localPosition, const Vector& worldPosition) const = 0;
-
-	virtual void			LocalToWorldVector(Vector* worldVector, const Vector& localVector) const = 0;
-	virtual void			WorldToLocalVector(Vector* localVector, const Vector& worldVector) const = 0;
-
-	virtual void			ApplyForceCenter(const Vector& forceVector) = 0;
-	virtual void			ApplyForceOffset(const Vector& forceVector, const Vector& worldPosition) = 0;
-	virtual void			ApplyTorqueCenter(const AngularImpulse& torque) = 0;
-
-	virtual void			CalculateForceOffset(const Vector& forceVector, const Vector& worldPosition, Vector* centerForce, AngularImpulse* centerTorque) const = 0;
-	virtual void			CalculateVelocityOffset(const Vector& forceVector, const Vector& worldPosition, Vector* centerVelocity, AngularImpulse* centerAngularVelocity) const = 0;
-	virtual float			CalculateLinearDrag(const Vector& unitDirection) const = 0;
-	virtual float			CalculateAngularDrag(const Vector& objectSpaceRotationAxis) const = 0;
-
-	virtual bool			GetContactPoint(Vector* contactPoint, IPhysicsObject** contactObject) const = 0;
-
-	virtual void			SetShadow(float maxSpeed, float maxAngularSpeed, bool allowPhysicsMovement, bool allowPhysicsRotation) = 0;
-	virtual void			UpdateShadow(const Vector& targetPosition, const QAngle& targetAngles, bool tempDisableGravity, float timeOffset) = 0;
-
-	virtual int				GetShadowPosition(Vector* position, QAngle* angles) const = 0;
-	virtual IPhysicsShadowController* GetShadowController(void) const = 0;
-	virtual void			RemoveShadowController() = 0;
-	virtual float			ComputeShadowControl(const hlshadowcontrol_params_t& params, float secondsToArrival, float dt) = 0;
-
-
-	virtual const CPhysCollide* GetCollide(void) const = 0;
-	virtual const char* GetName() const = 0;
-
-	virtual void			BecomeTrigger() = 0;
-	virtual void			RemoveTrigger() = 0;
-
-	virtual void			BecomeHinged(int localAxis) = 0;
-	virtual void			RemoveHinged() = 0;
-
-	virtual IPhysicsFrictionSnapshot* CreateFrictionSnapshot() = 0;
-	virtual void DestroyFrictionSnapshot(IPhysicsFrictionSnapshot* pSnapshot) = 0;
-
-	virtual void			OutputDebugInfo() const = 0;
-
-};
-
-
-abstract_class IPhysicsSpring
-{
-public:
-	virtual ~IPhysicsSpring(void) {}
-	virtual void			GetEndpoints(Vector * worldPositionStart, Vector * worldPositionEnd) = 0;
-	virtual void			SetSpringConstant(float flSpringContant) = 0;
-	virtual void			SetSpringDamping(float flSpringDamping) = 0;
-	virtual void			SetSpringLength(float flSpringLenght) = 0;
-
-	virtual IPhysicsObject* GetStartObject(void) = 0;
-
-	virtual IPhysicsObject* GetEndObject(void) = 0;
-};
-
-
-struct surfacephysicsparams_t
-{
-	float			friction;
-	float			elasticity;				         
-	float			density;				      
-	float			thickness;				         
-	float			dampening;
-};
-
-struct surfaceaudioparams_t
-{
-	float			reflectivity;		            
-	float			hardnessFactor;	        
-	float			roughnessFactor;	        
-
-	float			roughThreshold;	            
-	float			hardThreshold;	            
-	float			hardVelocityThreshold;	            
-};
-
-struct surfacesoundnames_t
-{
-	unsigned short	stepleft;
-	unsigned short	stepright;
-
-	unsigned short	impactSoft;
-	unsigned short	impactHard;
-
-	unsigned short	scrapeSmooth;
-	unsigned short	scrapeRough;
-
-	unsigned short	bulletImpact;
-	unsigned short	rolling;
-
-	unsigned short	breakSound;
-	unsigned short	strainSound;
-};
-
-struct surfacesoundhandles_t
-{
-	short	stepleft;
-	short	stepright;
-
-	short	impactSoft;
-	short	impactHard;
-
-	short	scrapeSmooth;
-	short	scrapeRough;
-
-	short	bulletImpact;
-	short	rolling;
-
-	short	breakSound;
-	short	strainSound;
-};
-
-struct surfacegameprops_t
-{
-	float			maxSpeedFactor;			         
-	float			jumpFactor;				            
-	unsigned short	material;
-	unsigned char	climbable;
-	unsigned char	pad;
-};
-
-struct surfacedata_t
-{
-	surfacephysicsparams_t	physics;	  
-	surfaceaudioparams_t	audio;		  
-	surfacesoundnames_t		sounds;		    
-	surfacegameprops_t		game;		    
-
-	surfacesoundhandles_t		soundhandles;
-};
-
-#define VPHYSICS_SURFACEPROPS_INTERFACE_VERSION	"VPhysicsSurfaceProps001"
-abstract_class IPhysicsSurfaceProps
-{
-public:
-	virtual ~IPhysicsSurfaceProps(void) {}
-
-	virtual int		ParseSurfaceData(const char* pFilename, const char* pTextfile) = 0;
-	virtual int		SurfacePropCount(void) const = 0;
-
-	virtual int		GetSurfaceIndex(const char* pSurfacePropName) const = 0;
-	virtual void	GetPhysicsProperties(int surfaceDataIndex, float* density, float* thickness, float* friction, float* elasticity) const = 0;
-
-	virtual surfacedata_t* GetSurfaceData(int surfaceDataIndex) = 0;
-	virtual const char* GetString(unsigned short stringTableIndex) const = 0;
-
-
-	virtual const char* GetPropName(int surfaceDataIndex) const = 0;
-
-	virtual void	SetWorldMaterialIndexTable(int* pMapArray, int mapSize) = 0;
-
-	virtual void	GetPhysicsParameters(int surfaceDataIndex, surfacephysicsparams_t* pParamsOut) const = 0;
-};
-
-abstract_class IPhysicsFluidController
-{
-public:
-	virtual ~IPhysicsFluidController(void) {}
-
-	virtual void	SetGameData(void* pGameData) = 0;
-	virtual void* GetGameData(void) const = 0;
-
-	virtual void	GetSurfacePlane(Vector* pNormal, float* pDist) const = 0;
-	virtual float	GetDensity() const = 0;
-	virtual void	WakeAllSleepingObjects() = 0;
-	virtual int		GetContents() const = 0;
-};
-
-
-struct fluidparams_t
-{
-	Vector4D	surfacePlane;	       
-	Vector		currentVelocity;       
-	float		damping;		     
-	float		torqueFactor;
-	float		viscosityFactor;
-	void* pGameData;
-	bool		useAerodynamics;        
-	int			contents;
-
-	fluidparams_t() {}
-	fluidparams_t(fluidparams_t const& src)
-	{
-		Vector4DCopy(src.surfacePlane, surfacePlane);
-		VectorCopy(src.currentVelocity, currentVelocity);
-		damping = src.damping;
-		torqueFactor = src.torqueFactor;
-		viscosityFactor = src.viscosityFactor;
-		contents = src.contents;
-	}
-};
-
-struct springparams_t
-{
-	springparams_t()
-	{
-		memset(this, 0, sizeof(*this));
-	}
-	float	constant;		  
-	float	naturalLength;  
-	float	damping;		  
-	float	relativeDamping;	              
-	Vector	startPosition;
-	Vector	endPosition;
-	bool	useLocalPositions;	                 
-	bool	onlyStretch;		            
-};
-
-struct objectparams_t
-{
-	Vector* massCenterOverride;
-	float		mass;
-	float		inertia;
-	float		damping;
-	float		rotdamping;
-	float		rotInertiaLimit;
-	const char* pName;				    
-	void* pGameData;
-	float		volume;
-	float		dragCoefficient;
-	bool		enableCollisions;
-};
-
-struct convertconvexparams_t
-{
-	bool		buildOuterConvexHull;
-	bool		buildDragAxisAreas;
-	bool		buildOptimizedTraceTables;
-	float		dragAreaEpsilon;
-	CPhysConvex* pForcedOuterHull;
-
-	void Defaults()
-	{
-		dragAreaEpsilon = 0.25f;     
-		buildOuterConvexHull = false;
-		buildDragAxisAreas = false;
-		buildOptimizedTraceTables = false;
-		pForcedOuterHull = NULL;
-	}
-};
-
-
-struct physsaveparams_t
-{
-	ISave* pSave;
-	void* pObject;
-	PhysInterfaceId_t 	type;
-};
-
-struct physrestoreparams_t
-{
-	IRestore* pRestore;
-	void** ppObject;
-	PhysInterfaceId_t 	type;
-	void* pGameData;
-	const char* pName;				    
-	const CPhysCollide* pCollisionModel;
-	IPhysicsEnvironment* pEnvironment;
-	IPhysicsGameTrace* pGameTrace;
-};
-
-struct physrecreateparams_t
-{
-	void* pOldObject;
-	void* pNewObject;
-};
-
-struct physprerestoreparams_t
-{
-	int recreatedObjectCount;
-	physrecreateparams_t recreatedObjectList[1];
-};
-
-#define DEFINE_PIID( type, enumval ) \
-	template <> inline PhysInterfaceId_t GetPhysIID<type>( type ** ) { return enumval; }
-
-template <class PHYSPTR> inline PhysInterfaceId_t GetPhysIID(PHYSPTR**);        
-
-DEFINE_PIID(IPhysicsObject, PIID_IPHYSICSOBJECT);
-DEFINE_PIID(IPhysicsFluidController, PIID_IPHYSICSFLUIDCONTROLLER);
-DEFINE_PIID(IPhysicsSpring, PIID_IPHYSICSSPRING);
-DEFINE_PIID(IPhysicsConstraintGroup, PIID_IPHYSICSCONSTRAINTGROUP);
-DEFINE_PIID(IPhysicsConstraint, PIID_IPHYSICSCONSTRAINT);
-DEFINE_PIID(IPhysicsShadowController, PIID_IPHYSICSSHADOWCONTROLLER);
-DEFINE_PIID(IPhysicsPlayerController, PIID_IPHYSICSPLAYERCONTROLLER);
-DEFINE_PIID(IPhysicsMotionController, PIID_IPHYSICSMOTIONCONTROLLER);
-DEFINE_PIID(IPhysicsVehicleController, PIID_IPHYSICSVEHICLECONTROLLER);
-DEFINE_PIID(IPhysicsGameTrace, PIID_IPHYSICSGAMETRACE);
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vpkparser.h b/SpyCustom/vpkparser.h
deleted file mode 100644
index a1db3ef..0000000
--- a/SpyCustom/vpkparser.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#pragma once
-
-#include <fstream>
-#include <string>
-#include <optional>
-#include <unordered_map>
-
-#pragma pack(push,1)
-struct vpk_header_t
-{
-    uint32_t signature;
-    uint32_t version;
-    uint32_t tree_size;
-    uint32_t file_data_section_size;
-    uint32_t archive_md5_section_size;
-    uint32_t other_md5_section_size;
-    uint32_t signature_section_size;
-};
-
-struct dir_entry_t
-{
-    uint32_t crc;
-    uint16_t preload_bytes;
-    uint16_t archive_index;
-    uint32_t entry_offset;
-    uint32_t entry_length;
-    uint16_t terminator;
-};
-#pragma pack(pop)
-
-class c_vpk_entry
-{
-public:
-    c_vpk_entry() = default;
-    c_vpk_entry(const std::string& base_file, const std::string& path, const dir_entry_t& entry) :_base_file(base_file), _path(path), _entry(entry) {}
-
-    std::optional<std::vector<uint8_t>> get_data()
-    {
-        size_t _dir_pos = _base_file.find("dir");
-
-        std::string old_number_string = std::to_string(_entry.archive_index);
-        std::string vpk_file = _base_file.replace(_base_file.begin() + _dir_pos, _base_file.begin() + _dir_pos + 3, std::string(3 - old_number_string.length(), '0') + old_number_string);
-        std::ifstream stream(vpk_file, std::ios::binary);
-        if (!stream.is_open())
-            return {};
-
-        uint8_t* data = new uint8_t[_entry.entry_length];
-        stream.seekg(_entry.entry_offset, stream.beg);
-        stream.read((char*)data, _entry.entry_length);
-        stream.close();
-
-        std::vector<uint8_t> data_vector(data, data + _entry.entry_length);
-        delete[] data;
-
-        return data_vector;
-    }
-
-    std::vector<uint8_t> preload_bytes = {};
-    std::string _base_file = {};
-    std::string _path = {};
-    dir_entry_t _entry = {};
-};
-
-class c_vpk_archive
-{
-public:
-    bool load(const std::string& name)
-    {
-        std::ifstream stream(name, std::ios::binary);
-        if (!stream.is_open())
-            return false;
-
-        try
-        {
-            vpk_header_t file_header = {};
-            stream.read((char*)&file_header, sizeof(file_header));
-            if (file_header.signature != 0x55aa1234)
-            {
-                stream.close();
-                return false;
-            }
-
-            if (file_header.version != 2)
-            {
-                stream.close();
-                return false;
-            }
-
-            while (true)
-            {
-                std::string extension;
-
-                std::getline(stream, extension, '\x00');
-                if (extension.empty())
-                    break;
-
-                while (true)
-                {
-                    std::string directory;
-                    std::getline(stream, directory, '\x00');
-                    if (directory.empty())
-                        break;
-
-                    while (true)
-                    {
-                        std::string file_name;
-                        std::getline(stream, file_name, '\x00');
-                        if (file_name.empty())
-                            break;
-
-                        std::string path = directory + '/' + file_name + '.' + extension;
-
-                        dir_entry_t dir_entry;
-                        stream.read((char*)&dir_entry, sizeof(dir_entry));
-
-                        c_vpk_entry vpk_entry(name, path, dir_entry);
-                        if (dir_entry.preload_bytes)
-                        {
-                            uint8_t* bytes = new uint8_t[dir_entry.preload_bytes];
-                            stream.read((char*)bytes, dir_entry.preload_bytes);
-                            vpk_entry.preload_bytes = std::vector<uint8_t>(bytes, bytes + dir_entry.preload_bytes);
-                            delete[] bytes;
-                        }
-
-                        if (!files.count(path))
-                            files[path] = vpk_entry;
-                    }
-                }
-            }
-        }
-        catch (const std::exception& e) { return false; }
-        stream.close();
-
-        return true;
-    }
-
-    std::optional<c_vpk_entry> get_file(const std::string& name)
-    {
-        if (files.count(name))
-            return files[name];
-
-        return {};
-    }
-    std::unordered_map<std::string, c_vpk_entry> files = {};
-};
\ No newline at end of file
diff --git a/SpyCustom/vplane.h b/SpyCustom/vplane.h
deleted file mode 100644
index 145b3f4..0000000
--- a/SpyCustom/vplane.h
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifndef VPLANE_H
-#define VPLANE_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "vector.h"
-
-typedef int SideType;
-
-#define	SIDE_FRONT	0
-#define	SIDE_BACK	1
-#define	SIDE_ON		2
-
-#define VP_EPSILON	0.01f
-
-
-class VPlane
-{
-public:
-	VPlane();
-	VPlane(const Vector& vNormal, vec_t dist);
-
-	void		Init(const Vector& vNormal, vec_t dist);
-
-	vec_t		DistTo(const Vector& vVec) const;
-
-	VPlane& operator=(const VPlane& thePlane);
-
-	SideType	GetPointSide(const Vector& vPoint, vec_t sideEpsilon = VP_EPSILON) const;
-
-	SideType	GetPointSideExact(const Vector& vPoint) const;
-
-	SideType	BoxOnPlaneSide(const Vector& vMin, const Vector& vMax) const;
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-	VPlane		Flip();
-
-	Vector		GetPointOnPlane() const;
-
-	Vector		SnapPointToPlane(const Vector& vPoint) const;
-#endif
-
-public:
-	Vector		m_Normal;
-	vec_t		m_Dist;
-
-#ifdef VECTOR_NO_SLOW_OPERATIONS
-private:
-	VPlane(const VPlane& vOther);
-#endif
-};
-
-
-inline VPlane::VPlane()
-{
-}
-
-inline VPlane::VPlane(const Vector& vNormal, vec_t dist)
-{
-	m_Normal = vNormal;
-	m_Dist = dist;
-}
-
-inline void	VPlane::Init(const Vector& vNormal, vec_t dist)
-{
-	m_Normal = vNormal;
-	m_Dist = dist;
-}
-
-inline vec_t VPlane::DistTo(const Vector& vVec) const
-{
-	return vVec.Dot(m_Normal) - m_Dist;
-}
-
-inline VPlane& VPlane::operator=(const VPlane& thePlane)
-{
-	m_Normal = thePlane.m_Normal;
-	m_Dist = thePlane.m_Dist;
-	return *this;
-}
-
-#ifndef VECTOR_NO_SLOW_OPERATIONS
-
-inline VPlane VPlane::Flip()
-{
-	return VPlane(-m_Normal, -m_Dist);
-}
-
-inline Vector VPlane::GetPointOnPlane() const
-{
-	return m_Normal * m_Dist;
-}
-
-inline Vector VPlane::SnapPointToPlane(const Vector& vPoint) const
-{
-	return vPoint - m_Normal * DistTo(vPoint);
-}
-
-#endif
-
-inline SideType VPlane::GetPointSide(const Vector& vPoint, vec_t sideEpsilon) const
-{
-	vec_t fDist;
-
-	fDist = DistTo(vPoint);
-	if (fDist >= sideEpsilon)
-		return SIDE_FRONT;
-	else if (fDist <= -sideEpsilon)
-		return SIDE_BACK;
-	else
-		return SIDE_ON;
-}
-
-inline SideType VPlane::GetPointSideExact(const Vector& vPoint) const
-{
-	return DistTo(vPoint) > 0.0f ? SIDE_FRONT : SIDE_BACK;
-}
-
-
-inline SideType VPlane::BoxOnPlaneSide(const Vector& vMin, const Vector& vMax) const
-{
-	int i, firstSide, side;
-	TableVector vPoints[8] =
-	{
-		{ vMin.x, vMin.y, vMin.z },
-		{ vMin.x, vMin.y, vMax.z },
-		{ vMin.x, vMax.y, vMax.z },
-		{ vMin.x, vMax.y, vMin.z },
-
-		{ vMax.x, vMin.y, vMin.z },
-		{ vMax.x, vMin.y, vMax.z },
-		{ vMax.x, vMax.y, vMax.z },
-		{ vMax.x, vMax.y, vMin.z },
-	};
-
-	firstSide = GetPointSideExact(vPoints[0]);
-	for (i = 1; i < 8; i++)
-	{
-		side = GetPointSideExact(vPoints[i]);
-
-		if (side != firstSide)
-			return SIDE_ON;
-	}
-
-	return firstSide;
-}
-
-
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vprof.h b/SpyCustom/vprof.h
deleted file mode 100644
index 7e47e0e..0000000
--- a/SpyCustom/vprof.h
+++ /dev/null
@@ -1,1359 +0,0 @@
-#ifndef VPROF_H
-#define VPROF_H
-
-#if !defined(__SPU__)
-
-#include "dbg.h"
-#include "fasttimer.h"
-#include "l2cache.h"
-#include "threadtools.h"
-#include "vprof_sn.h"
-#include "vprof_telemetry.h"
-
-#if !( defined( _GAMECONSOLE ) && defined( _CERT ) ) && !defined( _PS3 )
-#define VPROF_ENABLED
-#endif
-
-#if defined(_X360) && defined(VPROF_ENABLED)
-
-#ifdef PROFILE
-#define VPROF_PIX 1
-#endif
-
-#include "tier0/pmc360.h"
-#ifndef USE_PIX
-#define VPROF_UNDO_PIX
-#undef _PIX_H_
-#undef PIXBeginNamedEvent
-#undef PIXEndNamedEvent
-#undef PIXSetMarker
-#undef PIXNameThread
-#define USE_PIX
-#include <pix.h>
-#undef USE_PIX
-#else
-#include <pix.h>
-#endif
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
-#if defined( _X360 ) && defined( PROFILE )
-#define VPROF_PIX 1
-#endif
-
-#if defined(_X360) || defined(_PS3)
-#define VPROF_VXCONSOLE_EXISTS 1
-#endif
-
-
-#if defined(_X360) && defined(VPROF_PIX)
-#pragma comment( lib, "Xapilibi" )
-#endif
-
-#define MAXCOUNTERS 256
-
-
-#ifdef VPROF_ENABLED
-
-#define VPROF_VTUNE_GROUP
-
-#define	VPROF( name )						VPROF_(name, 1, VPROF_BUDGETGROUP_OTHER_UNACCOUNTED, false, 0)
-#define	VPROF_ASSERT_ACCOUNTED( name )		VPROF_(name, 1, VPROF_BUDGETGROUP_OTHER_UNACCOUNTED, true, 0)
-#define	VPROF_( name, detail, group, bAssertAccounted, budgetFlags )		VPROF_##detail(name,group, bAssertAccounted, budgetFlags)
-
-#define VPROF_BUDGET( name, group )					VPROF_BUDGET_FLAGS(name, group, BUDGETFLAG_OTHER)
-#define VPROF_BUDGET_FLAGS( name, group, flags )	VPROF_(name, 0, group, false, flags)
-
-#define VPROF_SCOPE_BEGIN( tag )	do { VPROF( tag )
-#define VPROF_SCOPE_END()			} while (0)
-
-#define VPROF_ONLY( expression )	( expression )
-
-#define VPROF_ENTER_SCOPE( name )			g_VProfCurrentProfile.EnterScope( name, 1, VPROF_BUDGETGROUP_OTHER_UNACCOUNTED, false, 0 )
-#define VPROF_EXIT_SCOPE()					g_VProfCurrentProfile.ExitScope()
-
-#define VPROF_BUDGET_GROUP_ID_UNACCOUNTED 0
-
-
-#define BUDGETFLAG_CLIENT	(1<<0)		      
-#define BUDGETFLAG_SERVER	(1<<1)		      
-#define BUDGETFLAG_OTHER	(1<<2)		          
-#define BUDGETFLAG_HIDDEN	(1<<15)
-#define BUDGETFLAG_ALL		0xFFFF
-
-
-#define VPROF_BUDGETGROUP_OTHER_UNACCOUNTED			_T("Unaccounted")
-#define VPROF_BUDGETGROUP_WORLD_RENDERING			_T("World Rendering")
-#define VPROF_BUDGETGROUP_DISPLACEMENT_RENDERING	_T("Displacement_Rendering")
-#define VPROF_BUDGETGROUP_GAME						_T("Game")
-#define VPROF_BUDGETGROUP_NPCS						_T("NPCs")
-#define VPROF_BUDGETGROUP_SERVER_ANIM				_T("Server Animation")
-#define VPROF_BUDGETGROUP_PHYSICS					_T("Physics")
-#define VPROF_BUDGETGROUP_STATICPROP_RENDERING		_T("Static_Prop_Rendering")
-#define VPROF_BUDGETGROUP_MODEL_RENDERING			_T("Other_Model_Rendering")
-#define VPROF_BUDGETGROUP_MODEL_FAST_PATH_RENDERING _T("Fast Path Model Rendering")
-#define VPROF_BUDGETGROUP_BRUSH_FAST_PATH_RENDERING _T("Fast Path Brush Rendering")
-#define VPROF_BUDGETGROUP_BRUSHMODEL_RENDERING		_T("Brush_Model_Rendering")
-#define VPROF_BUDGETGROUP_SHADOW_RENDERING			_T("Shadow_Rendering")
-#define VPROF_BUDGETGROUP_DETAILPROP_RENDERING		_T("Detail_Prop_Rendering")
-#define VPROF_BUDGETGROUP_PARTICLE_RENDERING		_T("Particle/Effect_Rendering")
-#define VPROF_BUDGETGROUP_ROPES						_T("Ropes")
-#define VPROF_BUDGETGROUP_DLIGHT_RENDERING			_T("Dynamic_Light_Rendering")
-#define VPROF_BUDGETGROUP_OTHER_NETWORKING			_T("Networking")
-#define VPROF_BUDGETGROUP_CLIENT_ANIMATION			_T("Client_Animation")
-#define VPROF_BUDGETGROUP_OTHER_SOUND				_T("Sound")
-#define VPROF_BUDGETGROUP_OTHER_VGUI				_T("VGUI")
-#define VPROF_BUDGETGROUP_OTHER_FILESYSTEM			_T("FileSystem")
-#define VPROF_BUDGETGROUP_PREDICTION				_T("Prediction")
-#define VPROF_BUDGETGROUP_INTERPOLATION				_T("Interpolation")
-#define VPROF_BUDGETGROUP_SWAP_BUFFERS				_T("Swap_Buffers")
-#define VPROF_BUDGETGROUP_PLAYER					_T("Player")
-#define VPROF_BUDGETGROUP_OCCLUSION					_T("Occlusion")
-#define VPROF_BUDGETGROUP_OVERLAYS					_T("Overlays")
-#define VPROF_BUDGETGROUP_TOOLS						_T("Tools")
-#define VPROF_BUDGETGROUP_LIGHTCACHE				_T("Light_Cache")
-#define VPROF_BUDGETGROUP_DISP_HULLTRACES			_T("Displacement_Hull_Traces")
-#define VPROF_BUDGETGROUP_TEXTURE_CACHE				_T("Texture_Cache")
-#define VPROF_BUDGETGROUP_REPLAY					_T("Replay")
-#define VPROF_BUDGETGROUP_PARTICLE_SIMULATION		_T("Particle Simulation")
-#define VPROF_BUDGETGROUP_SHADOW_DEPTH_TEXTURING	_T("Flashlight Shadows")
-#define VPROF_BUDGETGROUP_CLIENT_SIM				_T("Client Simulation")     
-#define VPROF_BUDGETGROUP_STEAM						_T("Steam") 
-#define VPROF_BUDGETGROUP_CVAR_FIND					_T("Cvar_Find") 
-#define VPROF_BUDGETGROUP_CLIENTLEAFSYSTEM			_T("ClientLeafSystem")
-#define VPROF_BUDGETGROUP_JOBS_COROUTINES			_T("Jobs/Coroutines")
-#define VPROF_BUDGETGROUP_SLEEPING					_T("Sleeping")
-#define VPROF_BUDGETGROUP_THREADINGMAIN				_T("ThreadingMain")
-#define VPROF_BUDGETGROUP_ENCRYPTION				_T("Encryption")
-
-
-#define VPROF_BUDGETGROUP_CHROMEHTML				_T("Chromehtml")
-#define VPROF_BUDGETGROUP_VGUI						VPROF_BUDGETGROUP_CHROMEHTML
-#define VPROF_BUDGETGROUP_TENFOOT					VPROF_BUDGETGROUP_CHROMEHTML
-#define VPROF_BUDGETGROUP_STEAMUI					VPROF_BUDGETGROUP_CHROMEHTML
-
-#ifdef VPROF_VXCONSOLE_EXISTS
-#define VPROF_UPDATE_BUDGET				0x01	     
-#define VPROF_UPDATE_TEXTURE_GLOBAL		0x02	      
-#define VPROF_UPDATE_TEXTURE_PERFRAME	0x04	      
-#endif
-
-#ifndef VPROF_LEVEL
-#endif
-
-#if !defined( VPROF_SN_LEVEL ) && !defined( _CERT )
-#endif
-
-#define VPROF_SCOPE_VARIABLE_NAME( prefix, line ) prefix##line
-#define VPROF_SCOPE_VARIABLE_DECL( name, level, group, assertAccounted, budgetFlags, line ) CVProfScope VPROF_SCOPE_VARIABLE_NAME( VProf_,line )(name, level, group, assertAccounted, budgetFlags)
-
-#define	VPROF_0(name,group,assertAccounted,budgetFlags)	TM_ZONE( TELEMETRY_LEVEL2, TMZF_NONE, "(%s)%s", group, name ); VPROF_SCOPE_VARIABLE_DECL(name, 0, group, assertAccounted, budgetFlags, __LINE__ );
-
-#if VPROF_LEVEL > 0 
-#  define	VPROF_1(name,group,assertAccounted,budgetFlags)	TM_ZONE( TELEMETRY_LEVEL3, TMZF_NONE, "(%s)%s", group, name ); VPROF_SCOPE_VARIABLE_DECL(name, 1, group, assertAccounted, budgetFlags, __LINE__ );
-#else
-#  if VPROF_SN_LEVEL > 0 && defined( _PS3 )
-#	 define	VPROF_1(name,group,assertAccounted,budgetFlags)	CVProfSnMarkerScope VProfSn_( name )
-#  else
-#    define	VPROF_1(name,group,assertAccounted,budgetFlags)	((void)0)
-#  endif
-#endif
-
-#if VPROF_LEVEL > 1 
-#define	VPROF_2(name,group,assertAccounted,budgetFlags)	TM_ZONE( TELEMETRY_LEVEL4, TMZF_NONE, "(%s)%s", group, name ); VPROF_SCOPE_VARIABLE_DECL(name, 2, group, assertAccounted, budgetFlags, __LINE__);
-#else
-#  if VPROF_SN_LEVEL > 1 && defined( _PS3 )
-#	 define	VPROF_2(name,group,assertAccounted,budgetFlags)	CVProfSnMarkerScope VProfSn_( name )
-#  else
-#    define	VPROF_2(name,group,assertAccounted,budgetFlags)	((void)0)
-#  endif
-#endif
-
-#if VPROF_LEVEL > 2 
-#define	VPROF_3(name,group,assertAccounted,budgetFlags)	TM_ZONE( TELEMETRY_LEVEL5, TMZF_NONE, "(%s)%s", group, name ); VPROF_SCOPE_VARIABLE_DECL(name, 3, group, assertAccounted, budgetFlags, __LINE__);
-#else
-#  if VPROF_SN_LEVEL > 2 && defined( _PS3 )
-#	 define	VPROF_3(name,group,assertAccounted,budgetFlags)	CVProfSnMarkerScope VProfSn_( name )
-#  else
-#    define	VPROF_3(name,group,assertAccounted,budgetFlags)	((void)0)
-#  endif
-#endif
-
-#if VPROF_LEVEL > 3 
-#define	VPROF_4(name,group,assertAccounted,budgetFlags)	TM_ZONE( TELEMETRY_LEVEL6, TMZF_NONE, "(%s)%s", group, name ); VPROF_SCOPE_VARIABLE_DECL(name, 4, group, assertAccounted, budgetFlags, __LINE__);
-#else
-#  if VPROF_SN_LEVEL > 3 && defined( _PS3 )
-#	 define	VPROF_4(name,group,assertAccounted,budgetFlags)	CVProfSnMarkerScope VProfSn_( name )
-#  else
-#    define	VPROF_4(name,group,assertAccounted,budgetFlags)	((void)0)
-#  endif
-#endif
-
-#ifdef _MSC_VER
-#define VProfCode( code ) \
-	if ( 0 ) \
-		; \
-	else \
-	{ \
-	VPROF( __FUNCTION__ ": " #code ); \
-		code; \
-	}
-#else
-#define VProfCode( code ) \
-	if ( 0 ) \
-		; \
-	else \
-	{ \
-		VPROF( #code ); \
-		code; \
-	} 
-#endif
-
-
-#define VPROF_INCREMENT_COUNTER(name,amount)			do { static CVProfCounter _counter( name ); _counter.Increment( amount ); } while( 0 )
-#define VPROF_INCREMENT_GROUP_COUNTER(name,group,amount)			do { static CVProfCounter _counter( name, group ); _counter.Increment( amount ); } while( 0 )
-#define VPROF_SET_COUNTER(name,amount)			do { static CVProfCounter _counter( name ); _counter.Set( amount ); } while( 0 )
-#define VPROF_SET_GROUP_COUNTER(name,group,amount)			do { static CVProfCounter _counter( name, group ); _counter.Set( amount ); } while( 0 )
-
-#else
-
-#  if defined( VPROF_SN_LEVEL ) && ( VPROF_SN_LEVEL >= 0 )
-#    define	VPROF( name )									CVProfSnMarkerScope VProfSn_( name )
-#    define	VPROF_ASSERT_ACCOUNTED( name )					VPROF( name )
-#    define	VPROF_( name, detail, group, bAssertAccounted, budgetFlags )	VPROF_##detail( name, group, bAssertAccounted, budgetFlags )
-#	 define	VPROF_0(name,group,assertAccounted,budgetFlags)	VPROF( name )
-#    define VPROF_BUDGET( name, group )						VPROF( name )
-#    define VPROF_BUDGET_FLAGS( name, group, flags )		VPROF( name )
-
-#    define VPROF_SCOPE_BEGIN( tag )	do { VPROF( tag )
-#    define VPROF_SCOPE_END()			} while (0)
-
-#    define VPROF_ONLY( expression )	( expression )
-
-#    define VPROF_ENTER_SCOPE( name )   g_pfnPushMarker( name )
-#    define VPROF_EXIT_SCOPE()   g_pfnPopMarker()
-#  else
-#    define	VPROF( name )									((void)0)
-#    define	VPROF_ASSERT_ACCOUNTED( name )					((void)0)
-#    define	VPROF_( name, detail, group, bAssertAccounted, budgetFlags )	((void)0)
-#    define	VPROF_0(name,group,assertAccounted,budgetFlags)	((void)0)
-#    define VPROF_BUDGET( name, group )						((void)0)
-#    define VPROF_BUDGET_FLAGS( name, group, flags )		((void)0)
-
-#    define VPROF_SCOPE_BEGIN( tag )	do {
-#    define VPROF_SCOPE_END()			} while (0)
-
-#    define VPROF_ONLY( expression )	((void)0)
-
-#    define VPROF_ENTER_SCOPE( name )
-#    define VPROF_EXIT_SCOPE()
-#  endif
-
-#  if defined( VPROF_SN_LEVEL ) && ( VPROF_SN_LEVEL >= 1 )
-#	 define	VPROF_1(name,group,assertAccounted,budgetFlags)	VPROF( name )
-#  else
-#    define	VPROF_1(name,group,assertAccounted,budgetFlags)	((void)0)
-#  endif
-
-#  if defined( VPROF_SN_LEVEL ) && ( VPROF_SN_LEVEL >= 2 )
-#	 define	VPROF_2(name,group,assertAccounted,budgetFlags)	VPROF( name )
-#  else
-#    define	VPROF_2(name,group,assertAccounted,budgetFlags)	((void)0)
-#  endif
-
-#  if defined( VPROF_SN_LEVEL ) && ( VPROF_SN_LEVEL >= 3 )
-#	 define	VPROF_3(name,group,assertAccounted,budgetFlags)	VPROF( name )
-#  else
-#    define	VPROF_3(name,group,assertAccounted,budgetFlags)	((void)0)
-#  endif
-
-#  if defined( VPROF_SN_LEVEL ) && ( VPROF_SN_LEVEL >= 4 )
-#	 define	VPROF_4(name,group,assertAccounted,budgetFlags)	VPROF( name )
-#  else
-#    define	VPROF_4(name,group,assertAccounted,budgetFlags)	((void)0)
-#  endif
-
-
-
-#define VPROF_INCREMENT_COUNTER(name,amount)			((void)0)
-#define VPROF_INCREMENT_GROUP_COUNTER(name,group,amount)	((void)0)
-#define VPROF_SET_COUNTER(name,amount)		((void)0)
-#define VPROF_SET_GROUP_COUNTER(name,group,amount)	((void)0)
-
-#define VPROF_TEST_SPIKE( msec )	((void)0)
-
-#define VProfCode( code ) code
-
-#endif
-
-#ifdef VPROF_ENABLED
-
-class PLATFORM_CLASS CVProfNode
-{
-	friend class CVProfRecorder;
-	friend class CVProfile;
-
-public:
-	CVProfNode(const tchar* pszName, int detailLevel, CVProfNode* pParent, const tchar* pBudgetGroupName, int budgetFlags);
-	~CVProfNode();
-
-	CVProfNode* GetSubNode(const tchar* pszName, int detailLevel, const tchar* pBudgetGroupName, int budgetFlags);
-	CVProfNode* GetSubNode(const tchar* pszName, int detailLevel, const tchar* pBudgetGroupName);
-	CVProfNode* GetParent();
-	CVProfNode* GetSibling();
-	CVProfNode* GetPrevSibling();
-	CVProfNode* GetChild();
-
-	void MarkFrame();
-	void ResetPeak();
-
-	void Pause();
-	void Resume();
-	void Reset();
-
-	void EnterScope();
-	bool ExitScope();
-
-	const tchar* GetName();
-
-	int GetBudgetGroupID()
-	{
-		return m_BudgetGroupID;
-	}
-
-	void SetBudgetGroupID(int id)
-	{
-		m_BudgetGroupID = id;
-	}
-
-	int	GetCurCalls();
-	double GetCurTime();
-	int GetPrevCalls();
-	double GetPrevTime();
-	int	GetTotalCalls();
-	double GetTotalTime();
-	double GetPeakTime();
-
-	double GetCurTimeLessChildren();
-	double GetPrevTimeLessChildren();
-	double GetTotalTimeLessChildren();
-
-	int GetPrevL2CacheMissLessChildren();
-	int GetPrevLoadHitStoreLessChildren();
-
-	void ClearPrevTime();
-
-	int GetL2CacheMisses();
-
-	void SetCurFrameTime(unsigned long milliseconds);
-
-	void SetClientData(int iClientData) { m_iClientData = iClientData; }
-	int GetClientData() const { return m_iClientData; }
-
-#ifdef DBGFLAG_VALIDATE
-	void Validate(CValidator& validator, tchar* pchName);		    
-#endif  
-
-
-private:
-
-	void SetUniqueNodeID(int id)
-	{
-		m_iUniqueNodeID = id;
-	}
-
-	int GetUniqueNodeID() const
-	{
-		return m_iUniqueNodeID;
-	}
-
-	static int s_iCurrentUniqueNodeID;
-
-
-private:
-	const tchar* m_pszName;
-	CFastTimer	m_Timer;
-
-	int			m_iPrevL2CacheMiss;
-	int			m_iCurL2CacheMiss;
-	int			m_iTotalL2CacheMiss;
-
-#ifndef _X360	
-	CL2Cache	m_L2Cache;
-#else  
-
-	unsigned int m_iBitFlags;      
-	CPMCData	m_PMCData;
-	int			m_iPrevLoadHitStores;
-	int			m_iCurLoadHitStores;
-	int			m_iTotalLoadHitStores;
-
-public:
-	enum FlagBits
-	{
-		kRecordL2 = 0x01,
-		kCPUTrace = 0x02,        
-	};
-	inline void EnableL2andLHS(bool enable)
-	{
-		if (enable)
-			m_iBitFlags |= kRecordL2;
-		else
-			m_iBitFlags &= (~kRecordL2);
-	}
-
-	inline bool IsL2andLHSEnabled(void)
-	{
-		return (m_iBitFlags & kRecordL2) != 0;
-	}
-
-	int GetLoadHitStores();
-
-private:
-
-#endif
-
-	int			m_nRecursions;
-
-	unsigned	m_nCurFrameCalls;
-	CCycleCount	m_CurFrameTime;
-
-	unsigned	m_nPrevFrameCalls;
-	CCycleCount	m_PrevFrameTime;
-
-	unsigned	m_nTotalCalls;
-	CCycleCount	m_TotalTime;
-
-	CCycleCount	m_PeakTime;
-
-	CVProfNode* m_pParent;
-	CVProfNode* m_pChild;
-	CVProfNode* m_pSibling;
-
-	int m_BudgetGroupID;
-
-	int m_iClientData;
-	int m_iUniqueNodeID;
-};
-
-enum VProfReportType_t
-{
-	VPRT_SUMMARY = (1 << 0),
-	VPRT_HIERARCHY = (1 << 1),
-	VPRT_HIERARCHY_TIME_PER_FRAME_AND_COUNT_ONLY = (1 << 2),
-	VPRT_LIST_BY_TIME = (1 << 3),
-	VPRT_LIST_BY_TIME_LESS_CHILDREN = (1 << 4),
-	VPRT_LIST_BY_AVG_TIME = (1 << 5),
-	VPRT_LIST_BY_AVG_TIME_LESS_CHILDREN = (1 << 6),
-	VPRT_LIST_BY_PEAK_TIME = (1 << 7),
-	VPRT_LIST_BY_PEAK_OVER_AVERAGE = (1 << 8),
-	VPRT_LIST_TOP_ITEMS_ONLY = (1 << 9),
-
-	VPRT_FULL = (0xffffffff & ~(VPRT_HIERARCHY_TIME_PER_FRAME_AND_COUNT_ONLY | VPRT_LIST_TOP_ITEMS_ONLY)),
-};
-
-enum CounterGroup_t
-{
-	COUNTER_GROUP_DEFAULT = 0,
-	COUNTER_GROUP_NO_RESET,				           
-										COUNTER_GROUP_TEXTURE_GLOBAL,		           
-										COUNTER_GROUP_TEXTURE_PER_FRAME,		    
-										COUNTER_GROUP_GRAPHICS_PER_FRAME,	        
-
-										COUNTER_GROUP_TELEMETRY,
-};
-
-class PLATFORM_CLASS CVProfile
-{
-public:
-	CVProfile();
-	~CVProfile();
-
-	void Term();
-
-	void Start();
-	void Stop();
-
-	void SetTargetThreadId(unsigned id) { m_TargetThreadId = id; }
-	unsigned GetTargetThreadId() { return m_TargetThreadId; }
-	bool InTargetThread() { return (m_TargetThreadId == ThreadGetCurrentId()); }
-
-#ifdef VPROF_VXCONSOLE_EXISTS
-	enum VXConsoleReportMode_t
-	{
-		VXCONSOLE_REPORT_TIME = 0,
-		VXCONSOLE_REPORT_L2CACHE_MISSES,
-		VXCONSOLE_REPORT_LOAD_HIT_STORE,
-		VXCONSOLE_REPORT_COUNT,
-	};
-
-	void VXProfileStart();
-	void VXProfileUpdate();
-	void VXEnableUpdateMode(int event, bool bEnable);
-	void VXSendNodes(void);
-
-	void PMCDisableAllNodes(CVProfNode* pStartNode = NULL);          
-	bool PMCEnableL2Upon(const tchar* pszNodeName, bool bRecursive = false);          
-	bool PMCDisableL2Upon(const tchar* pszNodeName, bool bRecursive = false);          
-
-	void DumpEnabledPMCNodes(void);
-
-	void VXConsoleReportMode(VXConsoleReportMode_t mode);
-	void VXConsoleReportScale(VXConsoleReportMode_t mode, float flScale);
-#endif
-
-#ifdef _X360
-
-
-	enum CPUTraceState
-	{
-		kDisabled,
-		kFirstHitNode,						             
-		kAllNodesInFrame_WaitingForMark,	                      
-		kAllNodesInFrame_Recording,			         
-
-		kAllNodesInFrame_WaitingForMarkMultiFrame,	                      
-		kAllNodesInFrame_RecordingMultiFrame,
-	};
-
-	inline CPUTraceState GetCPUTraceMode();
-	inline void SetCPUTraceEnabled(CPUTraceState enabled, bool bTraceCompleteEvent = false, int nNumFrames = -1);
-	inline void IncrementMultiTraceIndex();            
-	inline unsigned int GetMultiTraceIndex();    
-	void CPUTraceDisableAllNodes(CVProfNode* pStartNode = NULL);          
-	CVProfNode* CPUTraceEnableForNode(const tchar* pszNodeName);                
-	CVProfNode* CPUTraceGetEnabledNode(CVProfNode* pStartNode = NULL);          
-	const char* GetCPUTraceFilename();         
-	const char* SetCPUTraceFilename(const char* filename);                
-	inline bool TraceCompleteEvent(void);
-
-#ifdef _X360
-	void LatchMultiFrame(int64 cycles);
-	void SpewWorstMultiFrame();
-#endif
-
-#endif
-
-	void EnterScope(const tchar* pszName, int detailLevel, const tchar* pBudgetGroupName, bool bAssertAccounted);
-	void EnterScope(const tchar* pszName, int detailLevel, const tchar* pBudgetGroupName, bool bAssertAccounted, int budgetFlags);
-	void ExitScope();
-
-	void MarkFrame(char const* str);
-	void MarkFrame();
-	void ResetPeaks();
-
-	void Pause();
-	void Resume();
-	void Reset();
-
-	bool IsEnabled() const;
-	int GetDetailLevel() const;
-
-	bool AtRoot() const;
-
-#ifdef VPROF_VTUNE_GROUP
-#	define MAX_GROUP_STACK_DEPTH 1024
-
-	void EnableVTuneGroup(const tchar* pGroupName)
-	{
-		m_nVTuneGroupID = BudgetGroupNameToBudgetGroupID(pGroupName);
-		m_bVTuneGroupEnabled = true;
-	}
-	void DisableVTuneGroup(void)
-	{
-		m_bVTuneGroupEnabled = false;
-	}
-
-	inline void PushGroup(int nGroupID);
-	inline void PopGroup(void);
-#endif
-
-	int NumFramesSampled() { return m_nFrames; }
-	double GetPeakFrameTime();
-	double GetTotalTimeSampled();
-	double GetTimeLastFrame();
-
-	CVProfNode* GetRoot();
-	CVProfNode* FindNode(CVProfNode* pStartNode, const tchar* pszNode);
-	CVProfNode* GetCurrentNode();
-
-	void OutputReport(int type = VPRT_FULL, const tchar* pszStartNode = NULL, int budgetGroupID = -1);
-
-	const tchar* GetBudgetGroupName(int budgetGroupID);
-	int GetBudgetGroupFlags(int budgetGroupID) const;	      
-	int GetNumBudgetGroups(void);
-	void GetBudgetGroupColor(int budgetGroupID, int& r, int& g, int& b, int& a);
-	int BudgetGroupNameToBudgetGroupID(const tchar* pBudgetGroupName);
-	int BudgetGroupNameToBudgetGroupID(const tchar* pBudgetGroupName, int budgetFlagsToORIn);
-	void RegisterNumBudgetGroupsChangedCallBack(void (*pCallBack)(void));
-
-	int BudgetGroupNameToBudgetGroupIDNoCreate(const tchar* pBudgetGroupName) { return FindBudgetGroupName(pBudgetGroupName); }
-
-	void HideBudgetGroup(int budgetGroupID, bool bHide = true);
-	void HideBudgetGroup(const tchar* pszName, bool bHide = true) { HideBudgetGroup(BudgetGroupNameToBudgetGroupID(pszName), bHide); }
-
-	int* FindOrCreateCounter(const tchar* pName, CounterGroup_t eCounterGroup = COUNTER_GROUP_DEFAULT);
-	void ResetCounters(CounterGroup_t eCounterGroup);
-
-	int GetNumCounters(void) const;
-
-	const tchar* GetCounterName(int index) const;
-	int GetCounterValue(int index) const;
-	const tchar* GetCounterNameAndValue(int index, int& val) const;
-	CounterGroup_t GetCounterGroup(int index) const;
-
-	void PMEInitialized(bool bInit) { m_bPMEInit = bInit; }
-	void PMEEnable(bool bEnable) { m_bPMEEnabled = bEnable; }
-
-#ifdef _X360
-	bool UsePME(void) { return (CPMCData::IsInitialized() && m_bPMEEnabled); }
-#elif defined( _PS3 )
-	inline bool UsePME(void) { return false; }
-#else
-	bool UsePME(void) { return (m_bPMEInit && m_bPMEEnabled); }
-#endif
-
-#ifdef DBGFLAG_VALIDATE
-	void Validate(CValidator& validator, tchar* pchName);		    
-#endif  
-
-protected:
-
-	void FreeNodes_R(CVProfNode* pNode);
-
-#ifdef VPROF_VTUNE_GROUP
-	bool VTuneGroupEnabled()
-	{
-		return m_bVTuneGroupEnabled;
-	}
-	int VTuneGroupID()
-	{
-		return m_nVTuneGroupID;
-	}
-#endif
-
-	void SumTimes(const tchar* pszStartNode, int budgetGroupID);
-	void SumTimes(CVProfNode* pNode, int budgetGroupID);
-	void DumpNodes(CVProfNode* pNode, int indent, bool bAverageAndCountOnly);
-	int FindBudgetGroupName(const tchar* pBudgetGroupName);
-	int AddBudgetGroupName(const tchar* pBudgetGroupName, int budgetFlags);
-
-#ifdef VPROF_VTUNE_GROUP
-	bool		m_bVTuneGroupEnabled;
-	int			m_nVTuneGroupID;
-	int			m_GroupIDStack[MAX_GROUP_STACK_DEPTH];
-	int			m_GroupIDStackDepth;
-#endif
-	int 		m_enabled;
-	bool		m_fAtRoot;         
-	CVProfNode* m_pCurNode;
-	CVProfNode	m_Root;
-	int			m_nFrames;
-	int			m_ProfileDetailLevel;
-	int			m_pausedEnabledDepth;
-
-	class CBudgetGroup
-	{
-	public:
-		tchar* m_pName;
-		int m_BudgetFlags;
-	};
-
-	CBudgetGroup* m_pBudgetGroups;
-	int			m_nBudgetGroupNamesAllocated;
-	int			m_nBudgetGroupNames;
-	void		(*m_pNumBudgetGroupsChangedCallBack)(void);
-
-	bool		m_bPMEInit;
-	bool		m_bPMEEnabled;
-
-	int m_Counters[MAXCOUNTERS];
-	char m_CounterGroups[MAXCOUNTERS];    
-	tchar* m_CounterNames[MAXCOUNTERS];
-	int m_NumCounters;
-
-#ifdef VPROF_VXCONSOLE_EXISTS
-	int						m_UpdateMode;
-	int						m_nFramesRemaining;
-	int						m_nFrameCount;
-	int64					m_WorstCycles;
-	char					m_WorstTraceFilename[128];
-	char					m_CPUTraceFilename[128];
-	unsigned int			m_iSuccessiveTraceIndex;
-	VXConsoleReportMode_t	m_ReportMode;
-	float					m_pReportScale[VXCONSOLE_REPORT_COUNT];
-	bool					m_bTraceCompleteEvent;
-#endif
-#ifdef _X360
-	CPUTraceState			m_iCPUTraceEnabled;
-#endif
-
-	unsigned m_TargetThreadId;
-};
-
-PLATFORM_INTERFACE CVProfile g_VProfCurrentProfile;
-
-PLATFORM_INTERFACE bool g_VProfSignalSpike;
-
-class CVProfSpikeDetector
-{
-public:
-	CVProfSpikeDetector(float spike) :
-		m_timeLast(GetTimeLast())
-	{
-		m_spike = spike;
-		m_Timer.Start();
-	}
-
-	~CVProfSpikeDetector()
-	{
-		m_Timer.End();
-		if (Plat_FloatTime() - m_timeLast > 2.0)
-		{
-			m_timeLast = Plat_FloatTime();
-			if (m_Timer.GetDuration().GetMillisecondsF() > m_spike)
-			{
-				g_VProfSignalSpike = true;
-			}
-		}
-	}
-
-private:
-	static float& GetTimeLast() { static float timeLast = 0; return timeLast; }
-	CFastTimer	m_Timer;
-	float m_spike;
-	float& m_timeLast;
-};
-
-
-#define VPROF_TEST_SPIKE( msec ) CVProfSpikeDetector UNIQUE_ID( msec )
-
-#ifdef VPROF_VTUNE_GROUP
-inline void CVProfile::PushGroup(int nGroupID)
-{
-	Assert(m_GroupIDStackDepth > 0);
-	Assert(m_GroupIDStackDepth < MAX_GROUP_STACK_DEPTH);
-	m_GroupIDStack[m_GroupIDStackDepth] = nGroupID;
-	m_GroupIDStackDepth++;
-	if (m_GroupIDStack[m_GroupIDStackDepth - 2] != nGroupID &&
-		VTuneGroupEnabled() &&
-		nGroupID == VTuneGroupID())
-	{
-		vtune(true);
-	}
-}
-#endif  
-
-#ifdef VPROF_VTUNE_GROUP
-inline void CVProfile::PopGroup(void)
-{
-	m_GroupIDStackDepth--;
-	Assert(m_GroupIDStackDepth > 0);
-	if (m_GroupIDStack[m_GroupIDStackDepth] != m_GroupIDStack[m_GroupIDStackDepth + 1] &&
-		VTuneGroupEnabled() &&
-		m_GroupIDStack[m_GroupIDStackDepth + 1] == VTuneGroupID())
-	{
-		vtune(false);
-	}
-}
-#endif  
-
-inline CVProfile* GetVProfProfileForCurrentThread()
-{
-	return NULL;
-}
-
-class CVProfScope : public CVProfSnMarkerScope
-{
-public:
-	CVProfScope(const tchar* pszName, int detailLevel, const tchar* pBudgetGroupName, bool bAssertAccounted, int budgetFlags);
-	~CVProfScope();
-
-private:
-	bool m_bEnabled;
-};
-
-inline CVProfNode::CVProfNode(const tchar* pszName, int detailLevel, CVProfNode* pParent, const tchar* pBudgetGroupName, int budgetFlags)
-	: m_pszName(pszName),
-	m_nCurFrameCalls(0),
-	m_nPrevFrameCalls(0),
-	m_nRecursions(0),
-	m_pParent(pParent),
-	m_pChild(NULL),
-	m_pSibling(NULL),
-	m_iClientData(-1)
-#ifdef _X360
-	, m_iBitFlags(0)
-#endif
-{
-	m_iUniqueNodeID = s_iCurrentUniqueNodeID++;
-
-	if (m_iUniqueNodeID > 0)
-	{
-		m_BudgetGroupID = g_VProfCurrentProfile.BudgetGroupNameToBudgetGroupID(pBudgetGroupName, budgetFlags);
-	}
-	else
-	{
-		m_BudgetGroupID = 0;          
-	}
-
-	Reset();
-
-	if (m_pParent && (m_BudgetGroupID == VPROF_BUDGET_GROUP_ID_UNACCOUNTED))
-	{
-		m_BudgetGroupID = m_pParent->GetBudgetGroupID();
-	}
-}
-
-
-inline CVProfNode* CVProfNode::GetParent()
-{
-	Assert(m_pParent);
-	return m_pParent;
-}
-
-inline CVProfNode* CVProfNode::GetSibling()
-{
-	return m_pSibling;
-}
-
-inline CVProfNode* CVProfNode::GetPrevSibling()
-{
-	CVProfNode* p = GetParent();
-
-	if (!p)
-		return NULL;
-
-	CVProfNode* s;
-	for (s = p->GetChild();
-		s && (s->GetSibling() != this);
-		s = s->GetSibling())
-		;
-
-	return s;
-}
-
-inline CVProfNode* CVProfNode::GetChild()
-{
-	return m_pChild;
-}
-
-inline const tchar* CVProfNode::GetName()
-{
-	return m_pszName;
-}
-
-inline int	CVProfNode::GetTotalCalls()
-{
-	return m_nTotalCalls;
-}
-
-inline double CVProfNode::GetTotalTime()
-{
-	return m_TotalTime.GetMillisecondsF();
-}
-
-inline int	CVProfNode::GetCurCalls()
-{
-	return m_nCurFrameCalls;
-}
-
-inline double CVProfNode::GetCurTime()
-{
-	return m_CurFrameTime.GetMillisecondsF();
-}
-
-inline int CVProfNode::GetPrevCalls()
-{
-	return m_nPrevFrameCalls;
-}
-
-inline double CVProfNode::GetPrevTime()
-{
-	return m_PrevFrameTime.GetMillisecondsF();
-}
-
-inline double CVProfNode::GetPeakTime()
-{
-	return m_PeakTime.GetMillisecondsF();
-}
-
-inline double CVProfNode::GetTotalTimeLessChildren()
-{
-	double result = GetTotalTime();
-	CVProfNode* pChild = GetChild();
-	while (pChild)
-	{
-		result -= pChild->GetTotalTime();
-		pChild = pChild->GetSibling();
-	}
-	return result;
-}
-
-inline double CVProfNode::GetCurTimeLessChildren()
-{
-	double result = GetCurTime();
-	CVProfNode* pChild = GetChild();
-	while (pChild)
-	{
-		result -= pChild->GetCurTime();
-		pChild = pChild->GetSibling();
-	}
-	return result;
-}
-
-inline double CVProfNode::GetPrevTimeLessChildren()
-{
-	double result = GetPrevTime();
-	CVProfNode* pChild = GetChild();
-	while (pChild)
-	{
-		result -= pChild->GetPrevTime();
-		pChild = pChild->GetSibling();
-	}
-	return result;
-}
-
-inline int CVProfNode::GetPrevL2CacheMissLessChildren()
-{
-	int result = m_iPrevL2CacheMiss;
-	CVProfNode* pChild = GetChild();
-	while (pChild)
-	{
-		result -= pChild->m_iPrevL2CacheMiss;
-		pChild = pChild->GetSibling();
-	}
-	return result;
-}
-
-inline int CVProfNode::GetPrevLoadHitStoreLessChildren()
-{
-#ifndef _X360
-	return 0;
-#else
-	int result = m_iPrevLoadHitStores;
-	CVProfNode* pChild = GetChild();
-	while (pChild)
-	{
-		result -= pChild->m_iPrevLoadHitStores;
-		pChild = pChild->GetSibling();
-	}
-	return result;
-#endif
-}
-
-
-inline void CVProfNode::ClearPrevTime()
-{
-	m_PrevFrameTime.Init();
-}
-
-inline int CVProfNode::GetL2CacheMisses(void)
-{
-#ifndef _X360
-	return m_L2Cache.GetL2CacheMisses();
-#else
-	return m_iTotalL2CacheMiss;
-#endif
-}
-
-#ifdef _X360
-inline int CVProfNode::GetLoadHitStores(void)
-{
-	return m_iTotalLoadHitStores;
-}
-#endif
-
-inline bool CVProfile::IsEnabled() const
-{
-	return (m_enabled != 0);
-}
-
-inline int CVProfile::GetDetailLevel() const
-{
-	return m_ProfileDetailLevel;
-}
-
-
-inline bool CVProfile::AtRoot() const
-{
-	return m_fAtRoot;
-}
-
-inline void CVProfile::Start()
-{
-	if (++m_enabled == 1)
-	{
-		m_Root.EnterScope();
-#ifdef	VPROF_VXCONSOLE_EXISTS 
-		VXProfileStart();
-#endif
-#ifdef _X360
-		CPMCData::InitializeOnceProgramWide();
-#endif
-	}
-}
-
-inline void CVProfile::Stop()
-{
-	if (--m_enabled == 0)
-		m_Root.ExitScope();
-}
-
-inline void CVProfile::EnterScope(const tchar* pszName, int detailLevel, const tchar* pBudgetGroupName, bool bAssertAccounted, int budgetFlags)
-{
-	if ((m_enabled != 0 || !m_fAtRoot) && InTargetThread())            
-	{
-		if (pszName != m_pCurNode->GetName())
-		{
-			m_pCurNode = m_pCurNode->GetSubNode(pszName, detailLevel, pBudgetGroupName, budgetFlags);
-		}
-		m_pBudgetGroups[m_pCurNode->GetBudgetGroupID()].m_BudgetFlags |= budgetFlags;
-
-#if defined( _DEBUG ) && !defined( _X360 )
-		if (bAssertAccounted)
-		{
-			AssertOnce(m_pCurNode->GetBudgetGroupID() != 0);
-		}
-#endif
-		m_pCurNode->EnterScope();
-		m_fAtRoot = false;
-	}
-#if defined(_X360) && defined(VPROF_PIX)
-	if (m_pCurNode->GetBudgetGroupID() != VPROF_BUDGET_GROUP_ID_UNACCOUNTED)
-		PIXBeginNamedEvent(0, pszName);
-#endif
-}
-
-inline void CVProfile::EnterScope(const tchar* pszName, int detailLevel, const tchar* pBudgetGroupName, bool bAssertAccounted)
-{
-	EnterScope(pszName, detailLevel, pBudgetGroupName, bAssertAccounted, BUDGETFLAG_OTHER);
-}
-
-inline void CVProfile::ExitScope()
-{
-#if defined(_X360) && defined(VPROF_PIX)
-#ifndef PIXBeginNamedEvent
-#error PIX.h must be included if VPROF_PIX is enabled
-#endif
-	if (m_pCurNode->GetBudgetGroupID() != VPROF_BUDGET_GROUP_ID_UNACCOUNTED)
-		PIXEndNamedEvent();
-#endif
-	if ((!m_fAtRoot || m_enabled != 0) && InTargetThread())
-	{
-		if (m_pCurNode->ExitScope())
-		{
-			m_pCurNode = m_pCurNode->GetParent();
-		}
-		m_fAtRoot = (m_pCurNode == &m_Root);
-	}
-}
-
-inline void CVProfile::Pause()
-{
-	m_pausedEnabledDepth = m_enabled;
-	m_enabled = 0;
-	if (!AtRoot())
-		m_Root.Pause();
-}
-
-inline void CVProfile::Resume()
-{
-	m_enabled = m_pausedEnabledDepth;
-	if (!AtRoot())
-		m_Root.Resume();
-}
-
-inline void CVProfile::Reset()
-{
-	m_Root.Reset();
-	m_nFrames = 0;
-}
-
-inline void CVProfile::ResetPeaks()
-{
-	m_Root.ResetPeak();
-}
-
-inline void CVProfile::MarkFrame(char const* str)
-{
-	MarkFrame();
-}
-
-inline void CVProfile::MarkFrame()
-{
-	if (m_enabled)
-	{
-		++m_nFrames;
-		m_Root.ExitScope();
-		m_Root.MarkFrame();
-		m_Root.EnterScope();
-
-#ifdef _X360
-		switch (GetCPUTraceMode())
-		{
-		case kAllNodesInFrame_WaitingForMark:
-			m_iCPUTraceEnabled = kAllNodesInFrame_Recording;
-			break;
-		case kAllNodesInFrame_WaitingForMarkMultiFrame:
-			m_iCPUTraceEnabled = kAllNodesInFrame_RecordingMultiFrame;
-			break;
-		case kAllNodesInFrame_Recording:
-			m_iCPUTraceEnabled = kDisabled;
-			Msg("Frame ended. Recording no more CPU traces\n");
-
-			break;
-		case kAllNodesInFrame_RecordingMultiFrame:
-			if (--m_nFramesRemaining == 0)
-			{
-				m_iCPUTraceEnabled = kDisabled;
-				Msg("Frames ended. Recording no more CPU traces\n");
-
-				SpewWorstMultiFrame();
-			}
-
-			++m_nFrameCount;
-
-			break;
-		default:
-			break;
-		}
-#endif
-	}
-}
-
-inline double CVProfile::GetTotalTimeSampled()
-{
-	return m_Root.GetTotalTime();
-}
-
-inline double CVProfile::GetPeakFrameTime()
-{
-	return m_Root.GetPeakTime();
-}
-
-inline double CVProfile::GetTimeLastFrame()
-{
-	return m_Root.GetCurTime();
-}
-
-inline CVProfNode* CVProfile::GetRoot()
-{
-	return &m_Root;
-}
-
-inline CVProfNode* CVProfile::GetCurrentNode()
-{
-	return m_pCurNode;
-}
-
-
-inline const tchar* CVProfile::GetBudgetGroupName(int budgetGroupID)
-{
-	Assert(budgetGroupID >= 0 && budgetGroupID < m_nBudgetGroupNames);
-	return m_pBudgetGroups[budgetGroupID].m_pName;
-}
-
-inline int CVProfile::GetBudgetGroupFlags(int budgetGroupID) const
-{
-	Assert(budgetGroupID >= 0 && budgetGroupID < m_nBudgetGroupNames);
-	return m_pBudgetGroups[budgetGroupID].m_BudgetFlags;
-}
-
-#ifdef _X360
-
-inline CVProfile::CPUTraceState CVProfile::GetCPUTraceMode()
-{
-	return m_iCPUTraceEnabled;
-}
-
-inline void CVProfile::SetCPUTraceEnabled(CPUTraceState enabled, bool bTraceCompleteEvent , int nNumFrames  )
-{
-	m_iCPUTraceEnabled = enabled;
-	m_bTraceCompleteEvent = bTraceCompleteEvent;
-	if (nNumFrames != -1)
-	{
-		m_nFramesRemaining = nNumFrames;
-		m_nFrameCount = 0;
-		m_WorstCycles = 0;
-		m_WorstTraceFilename[0] = 0;
-	}
-}
-
-inline void CVProfile::IncrementMultiTraceIndex()
-{
-	++m_iSuccessiveTraceIndex;
-}
-
-inline unsigned int CVProfile::GetMultiTraceIndex()
-{
-	return m_iSuccessiveTraceIndex;
-}
-
-#endif
-
-
-inline CVProfScope::CVProfScope(const tchar* pszName, int detailLevel, const tchar* pBudgetGroupName, bool bAssertAccounted, int budgetFlags) :
-	CVProfSnMarkerScope(pszName),
-	m_bEnabled(g_VProfCurrentProfile.IsEnabled())
-{
-	if (m_bEnabled)
-	{
-		g_VProfCurrentProfile.EnterScope(pszName, detailLevel, pBudgetGroupName, bAssertAccounted, budgetFlags);
-	}
-}
-
-inline CVProfScope::~CVProfScope()
-{
-	if (m_bEnabled)
-	{
-		g_VProfCurrentProfile.ExitScope();
-	}
-}
-
-class CVProfCounter
-{
-public:
-	CVProfCounter(const tchar* pName, CounterGroup_t group = COUNTER_GROUP_DEFAULT)
-	{
-		m_pCounter = g_VProfCurrentProfile.FindOrCreateCounter(pName, group);
-		Assert(m_pCounter);
-	}
-	~CVProfCounter()
-	{
-	}
-	void Increment(int val)
-	{
-		Assert(m_pCounter);
-		*m_pCounter += val;
-	}
-	void Set(int val)
-	{
-		Assert(m_pCounter);
-		*m_pCounter = val;
-	}
-private:
-	int* m_pCounter;
-};
-
-#endif
-
-#ifdef _X360
-
-#include "xbox/xbox_console.h"
-#include "tracerecording.h"
-#include  "tier1/fmtstr.h"
-#pragma comment( lib, "tracerecording.lib" )
-#pragma comment( lib, "xbdm.lib" )
-
-class CPIXRecorder
-{
-public:
-	CPIXRecorder() : m_bActive(false) {}
-	~CPIXRecorder() { Stop(); }
-
-	void Start(const char* pszFilename = "capture")
-	{
-		if (!m_bActive)
-		{
-			if (!XTraceStartRecording(CFmtStr("e:\\%s.pix2", pszFilename)))
-			{
-				Msg("XTraceStartRecording failed, error code %d\n", GetLastError());
-			}
-			else
-			{
-				m_bActive = true;
-			}
-		}
-	}
-
-	void Stop()
-	{
-		if (m_bActive)
-		{
-			m_bActive = false;
-			if (XTraceStopRecording())
-			{
-				Msg("CPU trace finished.\n");
-				XBX_rTraceComplete();
-			}
-		}
-	}
-
-private:
-	bool m_bActive;
-};
-
-#define VPROF_BEGIN_PIX_BLOCK( convar ) \
-	{ \
-	bool bRunPix = 0; \
-	static CFastTimer PIXTimer; \
-	extern ConVar convar; \
-	ConVar &PIXConvar = convar; \
-	CPIXRecorder PIXRecorder; \
-		{ \
-		PIXLabel: \
-			if ( bRunPix ) \
-			{ \
-				PIXRecorder.Start(); \
-			} \
-			else \
-			{ \
-				if ( PIXConvar.GetBool() ) \
-				{ \
-					PIXTimer.Start(); \
-				} \
-			} \
-				{
-
-
-#define VPROF_END_PIX_BLOCK() \
-				} \
-			\
-			if ( !bRunPix ) \
-			{ \
-				if ( PIXConvar.GetBool() ) \
-				{ \
-					PIXTimer.End(); \
-					if ( PIXTimer.GetDuration().GetMillisecondsF() > PIXConvar.GetFloat() ) \
-					{ \
-						PIXConvar.SetValue( 0 ); \
-						bRunPix = true; \
-						goto PIXLabel; \
-					} \
-				} \
-			} \
-			else \
-			{ \
-				PIXRecorder.Stop(); \
-			} \
-		} \
-	}
-#else
-#define VPROF_BEGIN_PIX_BLOCK( PIXConvar ) {
-#define VPROF_END_PIX_BLOCK() }
-#endif
-
-
-#ifdef VPROF_UNDO_PIX
-#undef USE_PIX
-#undef _PIX_H_
-#undef PIXBeginNamedEvent
-#undef PIXEndNamedEvent
-#undef PIXSetMarker
-#undef PIXNameThread
-#include <pix.h>
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#endif   
-
-#endif
-
diff --git a/SpyCustom/vprof_sn.h b/SpyCustom/vprof_sn.h
deleted file mode 100644
index 0bdaf5a..0000000
--- a/SpyCustom/vprof_sn.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef TIER_V0PROF_SN_HDR
-#define TIER_V0PROF_SN_HDR
-
-#if defined( SN_TARGET_PS3 ) && !defined(_CERT)
-extern "C" void(*g_pfnPushMarker)(const char* pName);
-extern "C" void(*g_pfnPopMarker)();
-
-class CVProfSnMarkerScope
-{
-public:
-	CVProfSnMarkerScope(const char* pszName)
-	{
-		g_pfnPushMarker(pszName);
-	}
-	~CVProfSnMarkerScope()
-	{
-		g_pfnPopMarker();
-	}
-};
-
-
-#define SNPROF(name) ((void)0) 
-#define SNPROF_ANIM(name) ((void)0)
-
-#else
-
-class CVProfSnMarkerScope { public: CVProfSnMarkerScope(const char*) {} };
-
-#define SNPROF(name) TM_ZONE( TELEMETRY_LEVEL1, TMZF_NONE, "%s", name );
-#define SNPROF_ANIM(name) TM_ZONE( TELEMETRY_LEVEL1, TMZF_NONE, "anim %s", name );
-
-#endif
-
-#endif
\ No newline at end of file
diff --git a/SpyCustom/vprof_telemetry.h b/SpyCustom/vprof_telemetry.h
deleted file mode 100644
index 3d67fc1..0000000
--- a/SpyCustom/vprof_telemetry.h
+++ /dev/null
@@ -1,471 +0,0 @@
-#ifndef VPROF_TELEMETRY_H
-#define VPROF_TELEMETRY_H
-
-#if !defined( MAKE_VPC )
-
-#if !defined( RAD_TELEMETRY_DISABLED ) && ( defined( IS_WINDOWS_PC ) || defined( _LINUX ) )
-#endif
-
-
-#ifdef WIN32
-#define __PRETTY_FUNCTION__ __FUNCSIG__
-#endif
-
-#endif    
-
-
-enum TelemetryZonePlotSlot_t
-{
-	TELEMETRY_ZONE_PLOT_SLOT_1,
-	TELEMETRY_ZONE_PLOT_SLOT_2,
-	TELEMETRY_ZONE_PLOT_SLOT_3,
-	TELEMETRY_ZONE_PLOT_SLOT_4,
-	TELEMETRY_ZONE_PLOT_SLOT_5,
-	TELEMETRY_ZONE_PLOT_SLOT_6,
-	TELEMETRY_ZONE_PLOT_SLOT_7,
-	TELEMETRY_ZONE_PLOT_SLOT_8,
-	TELEMETRY_ZONE_PLOT_SLOT_9,
-	TELEMETRY_ZONE_PLOT_SLOT_10,
-	TELEMETRY_ZONE_PLOT_SLOT_11,
-	TELEMETRY_ZONE_PLOT_SLOT_12,
-	TELEMETRY_ZONE_PLOT_SLOT_13,
-	TELEMETRY_ZONE_PLOT_SLOT_14,
-	TELEMETRY_ZONE_PLOT_SLOT_15,
-	TELEMETRY_ZONE_PLOT_SLOT_16,
-
-	TELEMETRY_ZONE_PLOT_SLOT_MAX
-};
-
-
-#if !defined( RAD_TELEMETRY_ENABLED )
-
-#define NTELEMETRY		1
-#undef RADCOPYRIGHT
-
-inline void TelemetryTick() {}
-inline void TelemetrySetLevel(unsigned int Level) {}
-
-#define TELEMETRY_REQUIRED( tmRequiredCode )           
-#define TELEMETRY_REQUIRED_REPLACE( tmRequiredCode, replacementCode ) replacementCode               
-
-#else
-
-#include "../../thirdparty/telemetry/include/telemetry.h"
-#undef RADCOPYRIGHT
-
-PLATFORM_INTERFACE void TelemetryTick();
-PLATFORM_INTERFACE void TelemetrySetLevel(unsigned int Level);
-
-struct TelemetryZonePlotData
-{
-	const char* m_Name;
-	TmU64 m_CurrFrameTime;
-};
-
-struct TelemetryData
-{
-	HTELEMETRY tmContext[32];
-	float flRDTSCToMilliSeconds;	      
-	uint32 FrameCount;				        
-	char ServerAddress[128];		     
-	uint32 ZoneFilterVal;			      
-	int playbacktick;				            
-	float dotatime;					 
-	uint32 DemoTickStart;			      
-	uint32 DemoTickEnd;				      
-	uint32 Level;					       
-	TelemetryZonePlotData m_ZonePlot[TELEMETRY_ZONE_PLOT_SLOT_MAX];		          
-};
-PLATFORM_INTERFACE TelemetryData g_Telemetry;
-
-#define TELEMETRY_REQUIRED( tmRequiredCode ) tmRequiredCode           
-#define TELEMETRY_REQUIRED_REPLACE( tmRequiredCode, replacementCode ) tmRequiredCode               
-
-#endif  
-
-
-
-
-
-
-
-
-
-
-#define TELEMETRY_ERROR_BUILD_DISABLED		TELEMETRY_REQUIRED_REPLACE( TMERR_DISABLED, 0x0001 )
-#define TELEMETRY_ERROR_DISCONNECTED		TELEMETRY_REQUIRED_REPLACE( TMCS_DISCONNECTED, 0 )
-
-
-#define TELEMETRY_LEVEL0	TELEMETRY_REQUIRED_REPLACE( g_Telemetry.tmContext[0], 0 )	   
-#define TELEMETRY_LEVEL1	TELEMETRY_REQUIRED_REPLACE( g_Telemetry.tmContext[1], 0 )	    
-#define TELEMETRY_LEVEL2	TELEMETRY_REQUIRED_REPLACE( g_Telemetry.tmContext[2], 0 )	 
-#define TELEMETRY_LEVEL3	TELEMETRY_REQUIRED_REPLACE( g_Telemetry.tmContext[3], 0 )	 
-#define TELEMETRY_LEVEL4	TELEMETRY_REQUIRED_REPLACE( g_Telemetry.tmContext[4], 0 )	 
-#define TELEMETRY_LEVEL5	TELEMETRY_REQUIRED_REPLACE( g_Telemetry.tmContext[5], 0 )	 
-#define TELEMETRY_LEVEL6	TELEMETRY_REQUIRED_REPLACE( g_Telemetry.tmContext[6], 0 )	 
-
-#define TM_FAST_TIME() TELEMETRY_REQUIRED_REPLACE( tmFastTime(), 0 )
-
-
-#define TM_LOAD_TELEMETRY(kUseCheckedDll) TELEMETRY_REQUIRED_REPLACE( tmLoadTelemetry(kUseCheckedDll), 0 )
-
-
-#define TM_STARTUP() TELEMETRY_REQUIRED_REPLACE( tmStartup(), TELEMETRY_ERROR_BUILD_DISABLED )
-
-
-#define TM_SHUTDOWN() TELEMETRY_REQUIRED( tmShutdown() )
-
-
-#define TM_INITIALIZE_CONTEXT( pContext, pArena, kArenaSize ) TELEMETRY_REQUIRED_REPLACE( tmInitializeContext( pContext, pArena, kArenaSize ), TELEMETRY_ERROR_BUILD_DISABLED )
-
-
-#define TM_ZONE_FILTERED( context, kThreshold, kFlags, kpFormat, ... ) TELEMETRY_REQUIRED( tmZoneFiltered( context, kThreshold, kFlags, kpFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_ZONE( context, kFlags, kpFormat, ... ) TELEMETRY_REQUIRED( tmZone( context, kFlags, kpFormat, ##__VA_ARGS__ ) )
-
-#define TM_ZONE_DEFAULT( context ) TM_ZONE( context, TMZF_NONE, __FUNCTION__ )
-#define TM_ZONE_IDLE( context ) TM_ZONE( context, TMZF_IDLE, __FUNCTION__ )
-#define TM_ZONE_STALL( context ) TM_ZONE( context, TMZF_STALL, __FUNCTION__ )
-
-
-#define TM_CHECK_VERSION( context, major, minor, build, cust ) TELEMETRY_REQUIRED_REPLACE( tmCheckVersion( context, major, minor, build, cust ), TELEMETRY_ERROR_BUILD_DISABLED )
-
-
-#define TM_LISTEN_IPC( context, name ) TELEMETRY_REQUIRED_REPLACE( tmListenIPC( context, name ), TELEMETRY_ERROR_BUILD_DISABLED )
-
-
-#define TM_UPDATE_SYMBOL_DATA( context ) TELEMETRY_REQUIRED( tmUpdateSymbolData( context ) )
-
-
-#define TM_GET_SESSION_NAME( context, dst, kDstSize ) TELEMETRY_REQUIRED_REPLACE( tmGetSessionName( context, dst, kDstSize ), TELEMETRY_ERROR_BUILD_DISABLED )
-
-
-#define TM_UNWIND_TO_DEBUG_ZONE_LEVEL( context, kLevel ) TELEMETRY_REQUIRED( tmUnwindToDebugZoneLevel( context, kLevel ) )
-
-
-#define TM_SET_DEBUG_ZONE_LEVEL( context, kLevel ) TELEMETRY_REQUIRED( tmSetDebugZoneLevel( context, kLevel ) )
-
-
-#define TM_CHECK_DEBUG_ZONE_LEVEL( context, kLevel ) TELEMETRY_REQUIRED( tmCheckDebugZoneLevel( context, kLevel ) )
-
-
-#define TM_GET_CALL_STACK( context, TmCallStack_Ptr ) TELEMETRY_REQUIRED_REPLACE( tmGetCallStack( context, TmCallStack_Ptr ), 0 )
-
-
-#define TM_SEND_CALL_STACK( context, TmCallStack_Ptr ) TELEMETRY_REQUIRED_REPLACE( tmSendCallStack( context, TmCallStack_Ptr ), 0 )
-
-
-#define TM_GET_LAST_ERROR( context ) TELEMETRY_REQUIRED_REPLACE( tmGetLastError( context ), TELEMETRY_ERROR_BUILD_DISABLED )
-
-
-#define TM_SHUTDOWN_CONTEXT( context ) TELEMETRY_REQUIRED( tmShutdownContext( context ) )
-
-
-#define TM_GET_ACCUMULATION_START( context ) TELEMETRY_REQUIRED_REPLACE( tmGetAccumulationStart( context ), 0 )
-
-
-#define TM_GET_LAST_CONTEXT_SWITCH_TIME( context ) TELEMETRY_REQUIRED_REPLACE( tmGetLastContextSwitchTime( context ), 0 )
-
-
-#define TM_ENTER_ACCUMULATION_ZONE( context, zone_variable ) TELEMETRY_REQUIRED( tmEnterAccumulationZone( context, zone_variable ) )
-
-
-#define TM_LEAVE_ACCUMULATION_ZONE( context, zone_variable ) TELEMETRY_REQUIRED( tmLeaveAccumulationZone( context, zone_variable ) )
-
-
-#define TM_GET_FORMAT_CODE( context, pCode, kpFmt ) TELEMETRY_REQUIRED( tmGetFormatCode( context, pCode, kpFmt ) )
-
-
-#define TM_DYNAMIC_STRING( context, kpString ) TELEMETRY_REQUIRED_REPLACE( tmDynamicString( context, kpString ), NULL )
-
-
-#define TM_CLEAR_STATIC_STRING( context, kpString ) TELEMETRY_REQUIRED( tmClearStaticString( context, kpString ) )
-
-
-#define TM_ENABLE( context, kOption, kValue ) TELEMETRY_REQUIRED( tmEnable( context, kOption, kValue ) )
-
-
-#define TM_IS_ENABLED( context, kOption ) TELEMETRY_REQUIRED_REPLACE( tmIsEnabled( context, kOption ), 0 )
-
-#define TM_SET_PARAMETER( context, kParameter, kpValue ) TELEMETRY_REQUIRED( tmSetParameter( context, kParameter, kpValue ) )
-
-
-#define TM_OPEN( context, kpAppName, kpBuildInfo, kpServerAddress, kConnection, kServerPort, kFlags, kTimeoutMS ) TELEMETRY_REQUIRED_REPLACE( tmOpen( context, kpAppName, kpBuildInfo, kpServerAddress, kConnection, kServerPort, kFlags, kTimeoutMS ), TELEMETRY_ERROR_BUILD_DISABLED )
-
-
-#define TM_CLOSE( context ) TELEMETRY_REQUIRED( tmClose( context ) )
-
-
-#define TM_TICK( context ) TELEMETRY_REQUIRED( tmTick( context ) )
-
-
-#define TM_FLUSH( context ) TELEMETRY_REQUIRED( tmFlush( context ) )
-
-
-#define TM_PAUSE( context, kPause ) TELEMETRY_REQUIRED( tmPause( context, kPause ) )
-
-
-#define TM_IS_PAUSED( context ) TELEMETRY_REQUIRED_REPLACE( tmIsPaused( context ), 0 )
-
-
-#define TM_GET_CONNECTION_STATUS( context ) TELEMETRY_REQUIRED_REPLACE( tmGetConnectionStatus( context ), TELEMETRY_ERROR_DISCONNECTED )
-
-
-#define TM_FREE( context, kpPtr ) TELEMETRY_REQUIRED( tmFree( context, kpPtr ) )
-
-
-#define TM_GET_STAT_I( context, kStat ) TELEMETRY_REQUIRED_REPLACE( tmGetStati( context, kStat ), 0 )
-
-
-#define TM_LEAVE( context ) TELEMETRY_REQUIRED( tmLeave( context ) )
-
-
-#define TM_LEAVE_EX( context, kMatchId, kThreadId, kpFilename, kLine ) TELEMETRY_REQUIRED( tmLeaveEx( context, kMatchId, kThreadId, kpFilename, kLine ) )
-
-
-#define TM_TRY_LOCK( context, kPtr, kpLockName, ... ) TELEMETRY_REQUIRED( tmTryLock( context, kPtr, kpLockName, ##__VA_ARGS__ ) )
-
-
-#define TM_TRY_LOCK_EX( context, matcher, kThreshold, kpFileName, kLine, kPtr, kpLockName, ... ) TELEMETRY_REQUIRED( tmTryLockEx( context, matcher, kThreshold, kpFileName, kLine, kPtr, kpLockName, ##__VA_ARGS__ ) )
-
-
-#define TM_END_TRY_LOCK( context, kPtr, kResult ) TELEMETRY_REQUIRED( tmEndTryLock( context, kPtr, kResult ) )
-
-
-#define TM_END_TRY_LOCK_EX( context, kMatchId, kpFileName, kLine, kPtr, kResult ) TELEMETRY_REQUIRED( tmEndTryLockEx( context, kMatchId, kpFileName, kLine, kPtr, kResult ) )
-
-
-#define TM_BEGIN_TIME_SPAN( context, kId, kFlags, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmBeginTimeSpan( context, kId, kFlags, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_END_TIME_SPAN( context, kId, kFlags, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmEndTimeSpan( context, kId, kFlags, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_BEGIN_TIME_SPAN_AT( context, kId, kFlags, kTimeStamp, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmBeginTimeSpanAt( context, kId, kFlags, kTimeStamp, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_END_TIME_SPAN_AT( context, kId, kFlags, kTimeStamp, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmEndTimeSpanAt( context, kId, kFlags, kTimeStamp, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_SIGNAL_LOCK_COUNT( context, kPtr, kCount, kpDescription, ... ) TELEMETRY_REQUIRED( tmSignalLockCount( context, kPtr, kCount, kpDescription, ##__VA_ARGS__ ) )
-
-
-#define TM_SET_LOCK_STATE( context, kPtr, kState, kpDescription, ... ) TELEMETRY_REQUIRED( tmSetLockState( context, kPtr, kState, kpDescription, ##__VA_ARGS__ ) )
-
-
-#define TM_SET_LOCK_STATE_EX( context, kpFileName, kLine, kPtr, kState, kpDescription, ... ) TELEMETRY_REQUIRED( tmSetLockStateEx( context, kpFileName, kLine, kPtr, kState, kpDescription, ##__VA_ARGS__ ) )
-
-
-#define TM_SET_LOCK_STATE_MIN_TIME( context, buf, kPtr, kState, kpDescription, ... ) TELEMETRY_REQUIRED( tmSetLockStateMinTime( context, buf, kPtr, kState, kpDescription, ##__VA_ARGS__ ) )
-
-
-#define TM_SET_LOCK_STATE_MIN_TIME_EX( context, buf, kpFilename, kLine, kPtr, kState, kpDescription, ... ) TELEMETRY_REQUIRED( tmSetLockStateMinTimeEx( context, buf, kpFilename, kLine, kPtr, kState, kpDescription, ##__VA_ARGS__ ) )
-
-
-#define TM_THREAD_NAME( context, kThreadID, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmThreadName( context, kThreadID, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_LOCK_NAME( context, kPtr, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmLockName( context, kPtr, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_EMIT_ACCUMULATION_ZONE( context, kZoneFlags, pStart, kCount, kTotal, kpZoneFormat, ... ) TELEMETRY_REQUIRED( tmEmitAccumulationZone( context, kZoneFlags, pStart, kCount, kTotal, kpZoneFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_SET_VARIABLE( context, kpKey, kpValueFormat, ... ) TELEMETRY_REQUIRED( tmSetVariable( context, kpKey, kpValueFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_SET_TIMELINE_SECTION_NAME( context, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmSetTimelineSectionName( context, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_ENTER( context, kFlags, kpZoneName, ... ) TELEMETRY_REQUIRED( tmEnter( context, kFlags, kpZoneName, ##__VA_ARGS__ ) )
-
-
-#define TM_ENTER_EX( context, pMatchId, kThreadId, kThreshold, kpFilename, kLine, kFlags, kpZoneName, ... ) TELEMETRY_REQUIRED( tmEnterEx( context, pMatchId, kThreadId, kThreshold, kpFilename, kLine, kFlags, kpZoneName, ##__VA_ARGS__ ) )
-
-
-#define TM_ALLOC( context, kPtr, kSize, kpDescription, ... ) TELEMETRY_REQUIRED( tmAlloc( context, kPtr, kSize, kpDescription, ##__VA_ARGS__ ) )
-
-
-#define TM_ALLOC_EX( context, kpFilename, kLineNumber, kPtr, kSize, kpDescription, ... ) TELEMETRY_REQUIRED( tmAllocEx( context, kpFilename, kLineNumber, kPtr, kSize, kpDescription, ##__VA_ARGS__ ) )
-
-
-#define TM_MESSAGE( context, kFlags, kpFormatString, ... ) TELEMETRY_REQUIRED( tmMessage( context, kFlags, kpFormatString, ##__VA_ARGS__ ) )
-#define TM_LOG( context, kpFormatString, ... ) TM_MESSAGE( context, TMMF_SEVERITY_LOG, kpFormatString, ##__VA_ARGS__ )
-#define TM_WARNING( context, kpFormatString, ... ) TM_MESSAGE( context, TMMF_SEVERITY_WARNING, kpFormatString, ##__VA_ARGS__ )
-#define TM_ERROR( context, kpFormatString, ... ) TM_MESSAGE( context, TMMF_SEVERITY_ERROR, kpFormatString, ##__VA_ARGS__ )
-
-
-
-#define TM_PLOT( context, kType, kFlags, kValue, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmPlot( context, kType, kFlags, kValue, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_PLOT_F32( context, kType, kFlags, kValue, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmPlotF32( context, kType, kFlags, kValue, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_PLOT_F64( context, kType, kFlags, kValue, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmPlotF64( context, kType, kFlags, kValue, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_PLOT_I32( context, kType, kFlags, kValue, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmPlotI32( context, kType, kFlags, kValue, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_PLOT_U32( context, kType, kFlags, kValue, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmPlotU32( context, kType, kFlags, kValue, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_PLOT_I64( context, kType, kFlags, kValue, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmPlotI64( context, kType, kFlags, kValue, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_PLOT_U64( context, kType, kFlags, kValue, kpNameFormat, ... ) TELEMETRY_REQUIRED( tmPlotU64( context, kType, kFlags, kValue, kpNameFormat, ##__VA_ARGS__ ) )
-
-
-#define TM_BLOB( context, kpData, kDataSize, kpPluginIdentifier, kpBlobName, ...) TELEMETRY_REQUIRED( tmBlob( context, kpData, kDataSize, kpPluginIdentifier, kpBlobName, ##__VA_ARGS__ ) )
-
-
-#define TM_DISJOINT_BLOB( context, kNumPieces, kpData, kDataSizes, kpPluginIdentifier, kpBlobName, ... ) TELEMETRY_REQUIRED( tmDisjointBlob( context, kNumPieces, kpData, kDataSizes, kpPluginIdentifier, kpBlobName, ##__VA_ARGS__ ) )
-
-
-
-
-
-
-
-
-
-
-
-
-#if !defined( RAD_TELEMETRY_ENABLED )
-
-class CTelemetryLock
-{
-public:
-	CTelemetryLock(void* plocation, const char* description) {}
-	~CTelemetryLock() {}
-	void Locked() {}
-	void Unlocked() {}
-};
-
-class CTelemetrySpikeDetector
-{
-public:
-	CTelemetrySpikeDetector(const char* msg, unsigned int threshold = 50) {}
-	~CTelemetrySpikeDetector() { }
-};
-
-class CTelemetryZonePlotScope
-{
-public:
-
-	CTelemetryZonePlotScope(const char* pName, TelemetryZonePlotSlot_t slot) {}
-	~CTelemetryZonePlotScope() {}
-};
-
-#define TelemetrySetLockName( _ctx, _location, _description ) 
-#define TM_ZONE_PLOT( context, name, slot ) 
-
-#else
-
-#define TelemetrySetLockName( _ctx, _location, _description ) \
-	do  													  \
-	{   													  \
-		static bool s_bNameSet = false; 					  \
-		if( _ctx && !s_bNameSet )							  \
-		{   												  \
-			tmLockName( _ctx, _location, _description ); 	  \
-			s_bNameSet = true;  							  \
-		}   												  \
-	} while( 0 )
-
-class CTelemetryLock
-{
-public:
-	CTelemetryLock(void* plocation, const char* description)
-	{
-		m_plocation = (const char*)plocation;
-		m_description = description;
-		TelemetrySetLockName(TELEMETRY_LEVEL1, m_plocation, m_description);
-		TM_TRY_LOCK(TELEMETRY_LEVEL1, m_plocation, "%s", m_description);
-	}
-	~CTelemetryLock()
-	{
-		Unlocked();
-	}
-	void Locked()
-	{
-		TM_END_TRY_LOCK(TELEMETRY_LEVEL1, m_plocation, TMLR_SUCCESS);
-		TM_SET_LOCK_STATE(TELEMETRY_LEVEL1, m_plocation, TMLS_LOCKED, "%s Locked", m_description);
-	}
-	void Unlocked()
-	{
-		if (m_plocation)
-		{
-			TM_SET_LOCK_STATE(TELEMETRY_LEVEL1, m_plocation, TMLS_RELEASED, "%s Released", m_description);
-			m_plocation = NULL;
-		}
-	}
-
-public:
-	const char* m_plocation;
-	const char* m_description;
-};
-
-class CTelemetrySpikeDetector
-{
-public:
-	CTelemetrySpikeDetector(const char* msg, float threshold = 5) :
-		m_message(msg), m_threshold(threshold), time0(tmFastTime()) {}
-	~CTelemetrySpikeDetector()
-	{
-		float time = (tmFastTime() - time0) * g_Telemetry.flRDTSCToMilliSeconds;
-		if (time >= m_threshold)
-		{
-			TM_MESSAGE(TELEMETRY_LEVEL0, TMMF_ICON_NOTE | TMMF_SEVERITY_WARNING, "(dota/spike)%s %.2fms %t", m_message, time, tmSendCallStack(TELEMETRY_LEVEL0, 0));
-		}
-	}
-
-private:
-	TmU64 time0;
-	float m_threshold;
-	const char* m_message;
-};
-
-#define TM_ZONE_PLOT( context, name, slot ) CTelemetryZonePlotScope _telemetryZonePlot##__LINE__(context, name, slot);
-
-class CTelemetryZonePlotScope
-{
-public:
-
-	CTelemetryZonePlotScope(HTELEMETRY context, const char* pName, TelemetryZonePlotSlot_t slot)
-		:
-		m_Context(context),
-		m_SlotData(NULL),
-		m_StartTime(0)
-	{
-		if (slot < TELEMETRY_ZONE_PLOT_SLOT_MAX)
-		{
-			m_SlotData = &g_Telemetry.m_ZonePlot[slot];
-			m_SlotData->m_Name = pName;
-			m_StartTime = TM_FAST_TIME();
-		}
-		TM_ENTER(m_Context, TMZF_NONE, "%s", pName);
-	}
-
-	~CTelemetryZonePlotScope()
-	{
-		TM_LEAVE(m_Context);
-		if (m_SlotData)
-		{
-			m_SlotData->m_CurrFrameTime += (TM_FAST_TIME() - m_StartTime);
-		}
-	}
-
-private:
-
-	HTELEMETRY m_Context;
-	TelemetryZonePlotData* m_SlotData;
-	TmU64 m_StartTime;
-};
-
-#endif  
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vstdlib.h b/SpyCustom/vstdlib.h
deleted file mode 100644
index 5b5d0c5..0000000
--- a/SpyCustom/vstdlib.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef VSTDLIB_H
-#define VSTDLIB_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-
-#ifdef VSTDLIB_DLL_EXPORT
-#define VSTDLIB_INTERFACE	DLL_EXPORT
-#define VSTDLIB_OVERLOAD	DLL_GLOBAL_EXPORT
-#define VSTDLIB_CLASS		DLL_CLASS_EXPORT
-#define VSTDLIB_GLOBAL		DLL_GLOBAL_EXPORT
-#else
-#define VSTDLIB_INTERFACE	DLL_IMPORT
-#define VSTDLIB_OVERLOAD	DLL_GLOBAL_IMPORT
-#define VSTDLIB_CLASS		DLL_CLASS_IMPORT
-#define VSTDLIB_GLOBAL		DLL_GLOBAL_IMPORT
-#endif
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/vtf.h b/SpyCustom/vtf.h
deleted file mode 100644
index 2fe7057..0000000
--- a/SpyCustom/vtf.h
+++ /dev/null
@@ -1,410 +0,0 @@
-#ifndef VTF_H
-#define VTF_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "imageformat.h"
-#include "platform.h"
-
-#ifndef VTF_FILE_FORMAT_ONLY
-
-class CUtlBuffer;
-class Vector;
-struct Rect_t;
-class IFileSystem;
-
-enum CompiledVtfFlags
-{
-	TEXTUREFLAGS_POINTSAMPLE = 0x00000001,
-	TEXTUREFLAGS_TRILINEAR = 0x00000002,
-	TEXTUREFLAGS_CLAMPS = 0x00000004,
-	TEXTUREFLAGS_CLAMPT = 0x00000008,
-	TEXTUREFLAGS_ANISOTROPIC = 0x00000010,
-	TEXTUREFLAGS_HINT_DXT5 = 0x00000020,
-	TEXTUREFLAGS_SRGB = 0x00000040,
-	TEXTUREFLAGS_NORMAL = 0x00000080,
-	TEXTUREFLAGS_NOMIP = 0x00000100,
-	TEXTUREFLAGS_NOLOD = 0x00000200,
-	TEXTUREFLAGS_ALL_MIPS = 0x00000400,
-	TEXTUREFLAGS_PROCEDURAL = 0x00000800,
-
-	TEXTUREFLAGS_ONEBITALPHA = 0x00001000,
-	TEXTUREFLAGS_EIGHTBITALPHA = 0x00002000,
-
-	TEXTUREFLAGS_ENVMAP = 0x00004000,
-	TEXTUREFLAGS_RENDERTARGET = 0x00008000,
-	TEXTUREFLAGS_DEPTHRENDERTARGET = 0x00010000,
-	TEXTUREFLAGS_NODEBUGOVERRIDE = 0x00020000,
-	TEXTUREFLAGS_SINGLECOPY = 0x00040000,
-
-	TEXTUREFLAGS_STAGING_MEMORY = 0x00080000,
-	TEXTUREFLAGS_IMMEDIATE_CLEANUP = 0x00100000,
-	TEXTUREFLAGS_IGNORE_PICMIP = 0x00200000,
-	TEXTUREFLAGS_UNUSED_00400000 = 0x00400000,
-
-	TEXTUREFLAGS_NODEPTHBUFFER = 0x00800000,
-
-	TEXTUREFLAGS_UNUSED_01000000 = 0x01000000,
-
-	TEXTUREFLAGS_CLAMPU = 0x02000000,
-
-	TEXTUREFLAGS_VERTEXTEXTURE = 0x04000000,					     
-
-	TEXTUREFLAGS_SSBUMP = 0x08000000,
-
-	TEXTUREFLAGS_UNUSED_10000000 = 0x10000000,
-
-	TEXTUREFLAGS_BORDER = 0x20000000,
-
-	TEXTUREFLAGS_UNUSED_40000000 = 0x40000000,
-	TEXTUREFLAGS_UNUSED_80000000 = 0x80000000,
-};
-
-enum VersionedVtfFlags
-{
-	VERSIONED_VTF_FLAGS_MASK_7_3 = ~0xD1780400,	           
-};
-
-
-struct VtfProcessingOptions
-{
-	uint32 cbSize;					     
-
-	enum Flags0
-	{
-		OPT_DECAY_R = 0x00000001,	  
-		OPT_DECAY_G = 0x00000002,	  
-		OPT_DECAY_B = 0x00000004,	  
-		OPT_DECAY_A = 0x00000008,	  
-
-		OPT_DECAY_EXP_R = 0x00000010,	      
-		OPT_DECAY_EXP_G = 0x00000020,	      
-		OPT_DECAY_EXP_B = 0x00000040,	      
-		OPT_DECAY_EXP_A = 0x00000080,	      
-
-		OPT_NOCOMPRESS = 0x00000100,	    
-		OPT_NORMAL_DUDV = 0x00000200,	    
-		OPT_FILTER_NICE = 0x00000400,	   
-
-		OPT_SET_ALPHA_ONEOVERMIP = 0x00001000,	    
-		OPT_PREMULT_COLOR_ONEOVERMIP = 0x00002000,	   
-		OPT_MIP_ALPHATEST = 0x00004000,	   
-	};
-
-	uint32 flags0;					    
-
-	uint8 clrDecayGoal[4];			       
-	uint8 numNotDecayMips[4];		            
-	float fDecayExponentBase[4];	        
-};
-
-
-enum CubeMapFaceIndex_t
-{
-	CUBEMAP_FACE_RIGHT = 0,
-	CUBEMAP_FACE_LEFT,
-	CUBEMAP_FACE_BACK,	        
-	CUBEMAP_FACE_FRONT,	        
-	CUBEMAP_FACE_UP,
-	CUBEMAP_FACE_DOWN,
-
-	CUBEMAP_FACE_SPHEREMAP,
-
-	CUBEMAP_FACE_COUNT
-};
-
-
-enum LookDir_t
-{
-	LOOK_DOWN_X = 0,
-	LOOK_DOWN_NEGX,
-	LOOK_DOWN_Y,
-	LOOK_DOWN_NEGY,
-	LOOK_DOWN_Z,
-	LOOK_DOWN_NEGZ,
-};
-
-
-#define IMAGE_FORMAT_DEFAULT	((ImageFormat)-2)
-
-class IVTFTexture
-{
-public:
-	virtual ~IVTFTexture() {}
-
-	virtual bool Init(int nWidth, int nHeight, int nDepth, ImageFormat fmt, int nFlags, int iFrameCount, int nForceMipCount = -1) = 0;
-
-	virtual void SetBumpScale(float flScale) = 0;
-	virtual void SetReflectivity(const Vector& vecReflectivity) = 0;
-
-	virtual void InitLowResImage(int nWidth, int nHeight, ImageFormat fmt) = 0;
-
-	virtual void* SetResourceData(uint32 eType, void const* pData, size_t nDataSize) = 0;
-
-	virtual void* GetResourceData(uint32 eType, size_t* pDataSize) const = 0;
-
-	virtual bool HasResourceEntry(uint32 eType) const = 0;
-
-	virtual unsigned int GetResourceTypes(uint32* arrTypesBuffer, int numTypesBufferElems) const = 0;
-
-	virtual bool Unserialize(CUtlBuffer& buf, bool bHeaderOnly = false, int nSkipMipLevels = 0) = 0;
-	virtual bool Serialize(CUtlBuffer& buf) = 0;
-
-	virtual void LowResFileInfo(int* pStartLocation, int* pSizeInBytes) const = 0;
-	virtual void ImageFileInfo(int nFrame, int nFace, int nMip, int* pStartLocation, int* pSizeInBytes) const = 0;
-	virtual int FileSize(int nMipSkipCount = 0) const = 0;
-
-	virtual int Width() const = 0;
-	virtual int Height() const = 0;
-	virtual int Depth() const = 0;
-	virtual int MipCount() const = 0;
-
-	virtual int RowSizeInBytes(int nMipLevel) const = 0;
-
-	virtual int FaceSizeInBytes(int nMipLevel) const = 0;
-
-	virtual ImageFormat Format() const = 0;
-	virtual int FaceCount() const = 0;
-	virtual int FrameCount() const = 0;
-	virtual int Flags() const = 0;
-
-	virtual float BumpScale() const = 0;
-
-	virtual int LowResWidth() const = 0;
-	virtual int LowResHeight() const = 0;
-	virtual ImageFormat LowResFormat() const = 0;
-
-	virtual const Vector& Reflectivity() const = 0;
-
-	virtual bool IsCubeMap() const = 0;
-	virtual bool IsNormalMap() const = 0;
-	virtual bool IsVolumeTexture() const = 0;
-
-	virtual void ComputeMipLevelDimensions(int iMipLevel, int* pMipWidth, int* pMipHeight, int* pMipDepth) const = 0;
-
-	virtual int ComputeMipSize(int iMipLevel) const = 0;
-
-	virtual void ComputeMipLevelSubRect(Rect_t* pSrcRect, int nMipLevel, Rect_t* pSubRect) const = 0;
-
-	virtual int ComputeFaceSize(int iStartingMipLevel = 0) const = 0;
-
-	virtual int ComputeTotalSize() const = 0;
-
-	virtual unsigned char* ImageData() = 0;
-
-	virtual unsigned char* ImageData(int iFrame, int iFace, int iMipLevel) = 0;
-
-	virtual unsigned char* ImageData(int iFrame, int iFace, int iMipLevel, int x, int y, int z = 0) = 0;
-
-	virtual unsigned char* LowResImageData() = 0;
-
-	virtual	void ConvertImageFormat(ImageFormat fmt, bool bNormalToDUDV) = 0;
-
-	virtual void GenerateSpheremap(LookDir_t lookDir = LOOK_DOWN_Z) = 0;
-
-	virtual void GenerateHemisphereMap(unsigned char* pSphereMapBitsRGBA, int targetWidth,
-		int targetHeight, LookDir_t lookDir, int iFrame) = 0;
-
-	virtual void FixCubemapFaceOrientation() = 0;
-
-	virtual void GenerateMipmaps() = 0;
-
-	virtual void PutOneOverMipLevelInAlpha() = 0;
-
-	virtual void ComputeReflectivity() = 0;
-
-	virtual void ComputeAlphaFlags() = 0;
-
-	virtual bool ConstructLowResImage() = 0;
-
-	virtual void PostProcess(bool bGenerateSpheremap, LookDir_t lookDir = LOOK_DOWN_Z, bool bAllowFixCubemapOrientation = true) = 0;
-
-	virtual void MatchCubeMapBorders(int iStage, ImageFormat finalFormat, bool bSkybox) = 0;
-
-	virtual void SetAlphaTestThreshholds(float flBase, float flHighFreq) = 0;
-
-#if defined( _X360 )
-	virtual int UpdateOrCreate(const char* pFilename, const char* pPathID = NULL, bool bForce = false) = 0;
-	virtual bool UnserializeFromBuffer(CUtlBuffer& buf, bool bBufferIsVolatile, bool bHeaderOnly, bool bPreloadOnly, int nMipSkipCount) = 0;
-	virtual int FileSize(bool bPreloadOnly, int nMipSkipCount) const = 0;
-	virtual int MappingWidth() const = 0;
-	virtual int MappingHeight() const = 0;
-	virtual int MappingDepth() const = 0;
-	virtual int MipSkipCount() const = 0;
-	virtual bool IsPreTiled() const = 0;
-	virtual unsigned char* LowResImageSample() = 0;
-	virtual void ReleaseImageMemory() = 0;
-#endif
-
-	virtual void SetPostProcessingSettings(VtfProcessingOptions const* pOptions) = 0;
-};
-
-IVTFTexture* CreateVTFTexture();
-void DestroyVTFTexture(IVTFTexture* pTexture);
-
-int VTFFileHeaderSize(int nMajorVersion = -1, int nMinorVersion = -1);
-
-typedef bool (*CompressFunc_t)(CUtlBuffer& inputBuffer, CUtlBuffer& outputBuffer);
-bool ConvertVTFTo360Format(const char* pDebugName, CUtlBuffer& sourceBuf, CUtlBuffer& targetBuf, CompressFunc_t pCompressFunc);
-
-bool GetVTFPreload360Data(const char* pDebugName, CUtlBuffer& fileBufferIn, CUtlBuffer& preloadBufferOut);
-
-#include "vector.h"
-
-#endif  
-
-
-#include "datamap.h"
-
-#pragma pack(1)
-
-#define VTF_MAJOR_VERSION 7
-#define VTF_MINOR_VERSION 4
-
-struct VTFFileBaseHeader_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	char fileTypeString[4];     
-	int version[2]; 		 
-	int headerSize;
-};
-
-struct VTFFileHeaderV7_1_t : public VTFFileBaseHeader_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short	width;
-	unsigned short	height;
-	unsigned int	flags;
-	unsigned short	numFrames;
-	unsigned short	startFrame;
-#if !defined( POSIX ) && !defined( _X360 )
-	VectorAligned	reflectivity;
-#else
-	char			pad1[4];
-	Vector			reflectivity;
-	char			pad2[4];
-#endif
-	float			bumpScale;
-	ImageFormat		imageFormat;
-	unsigned char	numMipLevels;
-	ImageFormat		lowResImageFormat;
-	unsigned char	lowResImageWidth;
-	unsigned char	lowResImageHeight;
-};
-
-struct VTFFileHeaderV7_2_t : public VTFFileHeaderV7_1_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	unsigned short depth;
-};
-
-#define BYTE_POS( byteVal, shft )	uint32( uint32(uint8(byteVal)) << uint8(shft * 8) )
-#if !defined( _X360 )
-#define MK_VTF_RSRC_ID(a, b, c)		uint32( BYTE_POS(a, 0) | BYTE_POS(b, 1) | BYTE_POS(c, 2) )
-#define MK_VTF_RSRCF(d)				BYTE_POS(d, 3)
-#else
-#define MK_VTF_RSRC_ID(a, b, c)		uint32( BYTE_POS(a, 3) | BYTE_POS(b, 2) | BYTE_POS(c, 1) )
-#define MK_VTF_RSRCF(d)				BYTE_POS(d, 0)
-#endif
-
-enum ResourceEntryType
-{
-	VTF_LEGACY_RSRC_LOW_RES_IMAGE = MK_VTF_RSRC_ID(0x01, 0, 0),	   
-	VTF_LEGACY_RSRC_IMAGE = MK_VTF_RSRC_ID(0x30, 0, 0),	  
-
-	VTF_RSRC_SHEET = MK_VTF_RSRC_ID(0x10, 0, 0),			  
-};
-
-enum ResourceEntryTypeFlag
-{
-	RSRCF_HAS_NO_DATA_CHUNK = MK_VTF_RSRCF(0x02),	       
-	RSRCF_MASK = MK_VTF_RSRCF(0xFF)	     
-};
-
-enum HeaderDetails
-{
-	MAX_RSRC_DICTIONARY_ENTRIES = 32,		      
-	MAX_X360_RSRC_DICTIONARY_ENTRIES = 4,	          
-};
-
-struct ResourceEntryInfo
-{
-	union
-	{
-		unsigned int	eType;		          
-		unsigned char	chTypeBytes[4];
-	};
-	unsigned int		resData;	          
-};
-
-struct VTFFileHeaderV7_3_t : public VTFFileHeaderV7_2_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	char			pad4[3];
-	unsigned int	numResources;
-
-#if defined( _X360 ) || defined( POSIX )
-	char			pad5[8];
-#endif
-
-};
-
-struct VTFFileHeader_t : public VTFFileHeaderV7_3_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-};
-
-#define VTF_X360_MAJOR_VERSION	0x0360
-#define VTF_X360_MINOR_VERSION	8
-struct VTFFileHeaderX360_t : public VTFFileBaseHeader_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned int	flags;
-	unsigned short	width;					      
-	unsigned short	height;					      
-	unsigned short	depth;					      
-	unsigned short	numFrames;
-	unsigned short	preloadDataSize;		         
-	unsigned char	mipSkipCount;			     
-	unsigned char	numResources;
-	Vector			reflectivity;			     
-	float			bumpScale;
-	ImageFormat		imageFormat;
-	unsigned char	lowResImageSample[4];
-	unsigned int	compressedSize;
-
-};
-
-#define VTF_RSRC_TEXTURE_LOD_SETTINGS ( MK_VTF_RSRC_ID( 'L','O','D' ) )
-struct TextureLODControlSettings_t
-{
-	uint8 m_ResolutionClampX;
-	uint8 m_ResolutionClampY;
-
-	uint8 m_ResolutionClampX_360;
-	uint8 m_ResolutionClampY_360;
-};
-
-#define VTF_RSRC_TEXTURE_SETTINGS_EX ( MK_VTF_RSRC_ID( 'T','S','0' ) )
-struct TextureSettingsEx_t
-{
-	enum Flags0			   
-	{
-		UNUSED = 0x01,
-	};
-
-	uint8 m_flags0;		     
-	uint8 m_flags1;		      
-	uint8 m_flags2;		      
-	uint8 m_flags3;		      
-};
-
-#define VTF_RSRC_TEXTURE_CRC ( MK_VTF_RSRC_ID( 'C','R','C' ) )
-
-#pragma pack()
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/wchartypes.h b/SpyCustom/wchartypes.h
deleted file mode 100644
index b406d65..0000000
--- a/SpyCustom/wchartypes.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-#ifndef WCHARTYPES_H
-#define WCHARTYPES_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#ifdef _INC_TCHAR
-#error ("Must include tier0 type headers before tchar.h")
-#endif
-
-#if !defined(_WCHAR_T_DEFINED) && !defined(GNUC)
-typedef unsigned short wchar_t;
-#define _WCHAR_T_DEFINED
-#endif
-
-typedef char char8;
-
-typedef unsigned char uint8;
-typedef unsigned char BYTE;
-typedef unsigned char byte;
-
-typedef wchar_t wchar;
-#define WIDEN2(x) L ## x
-#define WIDEN(x) WIDEN2(x)
-#define __WFILE__ WIDEN(__FILE__)
-
-#ifdef STEAM
-#ifndef _UNICODE
-#define FORCED_UNICODE
-#endif
-#define _UNICODE
-#endif
-
-#ifdef _WIN32
-#include <tchar.h>
-#else
-#define _tcsstr strstr
-#define _tcsicmp stricmp
-#define _tcscmp strcmp
-#define _tcscpy strcpy
-#define _tcsncpy strncpy
-#define _tcsrchr strrchr
-#define _tcslen strlen
-#define _tfopen fopen
-#define _stprintf sprintf 
-#define _ftprintf fprintf
-#define _vsntprintf _vsnprintf
-#define _tprintf printf
-#define _sntprintf _snprintf
-#define _T(s) s
-#endif
-
-#if defined(_UNICODE)
-typedef wchar tchar;
-#define tstring wstring
-#define __TFILE__ __WFILE__
-#define TCHAR_IS_WCHAR
-#else
-typedef char tchar;
-#define tstring string
-#define __TFILE__ __FILE__
-#define TCHAR_IS_CHAR
-#endif
-
-#ifdef FORCED_UNICODE
-#undef _UNICODE
-#endif
-
-
-#endif  
diff --git a/SpyCustom/weapon_parse.h b/SpyCustom/weapon_parse.h
deleted file mode 100644
index 9841b29..0000000
--- a/SpyCustom/weapon_parse.h
+++ /dev/null
@@ -1,216 +0,0 @@
-#ifndef WEAPON_PARSE_H
-#define WEAPON_PARSE_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "shareddefs.h"
-#include "GameEventListener.h"
-#include "utlsortvector.h"
-#include "gamestringpool.h"
-
-#ifdef CLIENT_DLL
-#define CEconItemView C_EconItemView
-#endif
-
-class IFileSystem;
-class CEconItemView;
-
-typedef unsigned short WEAPON_FILE_INFO_HANDLE;
-
-
-enum WeaponSound_t {
-	EMPTY,
-	SINGLE,
-	SINGLE_ACCURATE,
-	SINGLE_NPC,
-	WPN_DOUBLE,        
-	DOUBLE_NPC,
-	BURST,
-	RELOAD,
-	RELOAD_NPC,
-	MELEE_MISS,
-	MELEE_HIT,
-	MELEE_HIT_WORLD,
-	SPECIAL1,
-	SPECIAL2,
-	SPECIAL3,
-	TAUNT,
-	NEARLYEMPTY,
-	FAST_RELOAD,
-
-	NUM_SHOOT_SOUND_TYPES,
-};
-
-int GetWeaponSoundFromString(const char* pszString);
-
-#define MAX_SHOOT_SOUNDS	16			        
-
-#define MAX_WEAPON_STRING	80
-#define MAX_WEAPON_PREFIX	16
-#define MAX_WEAPON_AMMO_NAME		32
-
-#define WEAPON_PRINTNAME_MISSING "!!! Missing printname on weapon"
-
-
-class CHudTexture;
-class KeyValues;
-
-struct WeaponInfoLookup
-{
-	size_t m_nWeaponParseDataOffset;
-	_fieldtypes m_fieldType;
-	CGameString m_iszAttribClassName;
-
-	WeaponInfoLookup(void) {}
-	WeaponInfoLookup(size_t offset, _fieldtypes p_fieldType, const char* szAttribClassName);
-	WeaponInfoLookup(const WeaponInfoLookup& WepInfoLookup);
-};
-
-
-class CWeaponInfoLookupListLess
-{
-public:
-	bool Less(WeaponInfoLookup* const& src1, WeaponInfoLookup* const& src2, void* pCtx)
-	{
-		if (src1->m_iszAttribClassName.Get() < src2->m_iszAttribClassName.Get())
-			return true;
-
-		return false;
-	}
-};
-
-class FileWeaponInfo_t
-{
-public:
-
-	FileWeaponInfo_t();
-	virtual ~FileWeaponInfo_t() {}
-
-	virtual void Parse(KeyValues* pKeyValuesData, const char* szWeaponName);
-
-	virtual void RefreshDynamicParameters() {};
-
-public:
-	bool					bParsedScript;
-	bool					bLoadedHudElements;
-
-	char					szClassName[MAX_WEAPON_STRING];
-	char					szPrintName[MAX_WEAPON_STRING];			      
-
-	int GetIndexofAttribute(string_t iszAttribClassName) const;
-	static CUtlSortVector< WeaponInfoLookup*, CWeaponInfoLookupListLess > ms_vecWeaponInfoLookup;
-
-protected:
-	char					szViewModel[MAX_WEAPON_STRING];			     
-	char					szWorldModel[MAX_WEAPON_STRING];		         
-	char					szAmmo1[MAX_WEAPON_AMMO_NAME];			   
-	char					szWorldDroppedModel[MAX_WEAPON_STRING];
-
-	static bool				ms_bWeaponInfoLookupInitialized;
-
-public:
-	char					szAnimationPrefix[MAX_WEAPON_PREFIX];	              
-	int						iSlot;									  
-	int						iPosition;								     
-	int						iMaxClip1;								        
-	int						iMaxClip2;								        
-	int						iDefaultClip1;							          
-	int						iDefaultClip2;							          
-	int						iWeight;								          
-	int						iRumbleEffect;							        
-	bool					bAutoSwitchTo;							         
-	bool					bAutoSwitchFrom;						               
-	int						iFlags;									   
-
-	char					szAmmo2[MAX_WEAPON_AMMO_NAME];			   
-	char					szAIAddOn[MAX_WEAPON_STRING];			      
-
-	char					aShootSounds[NUM_SHOOT_SOUND_TYPES][MAX_WEAPON_STRING];
-
-private:
-	int						iAmmoType;
-	int						iAmmo2Type;
-
-public:
-
-	bool					m_bMeleeWeapon;		        
-
-	bool					m_bBuiltRightHanded;
-	bool					m_bAllowFlipping;	         
-
-
-	virtual int		GetPrimaryClipSize(const CEconItemView* pWepView = NULL, int nAlt = 0, float flScale = 1.0f) const { return 0; }
-	virtual int		GetSecondaryClipSize(const CEconItemView* pWepView = NULL, int nAlt = 0, float flScale = 1.0f) const { return 0; }
-	virtual int		GetDefaultPrimaryClipSize(const CEconItemView* pWepView = NULL, int nAlt = 0, float flScale = 1.0f) const { return 0; }
-	virtual int		GetDefaultSecondaryClipSize(const CEconItemView* pWepView = NULL, int nAlt = 0, float flScale = 1.0f) const { return 0; }
-	virtual int		GetPrimaryReserveAmmoMax(const CEconItemView* pWepView = NULL, int nAlt = 0, float flScale = 1.0f) const { return 0; }
-	virtual int		GetSecondaryReserveAmmoMax(const CEconItemView* pWepView = NULL, int nAlt = 0, float flScale = 1.0f) const { return 0; }
-
-	const char* GetWorldModel(const CEconItemView* pWepView = NULL, int iTeam = 0) const;
-	const char* GetViewModel(const CEconItemView* pWepView = NULL, int iTeam = 0) const;
-	const char* GetWorldDroppedModel(const CEconItemView* pWepView = NULL, int iTeam = 0) const;
-	const char* GetPrimaryAmmo(const CEconItemView* pWepView = NULL) const;
-
-	int GetPrimaryAmmoType(const CEconItemView* pWepView = NULL) const;
-
-	int						iSpriteCount;
-	CHudTexture* iconActive;
-	CHudTexture* iconInactive;
-	CHudTexture* iconAmmo;
-	CHudTexture* iconAmmo2;
-	CHudTexture* iconCrosshair;
-	CHudTexture* iconAutoaim;
-	CHudTexture* iconZoomedCrosshair;
-	CHudTexture* iconZoomedAutoaim;
-	CHudTexture* iconSmall;
-
-	bool					bShowUsageHint;							             
-
-};
-
-WEAPON_FILE_INFO_HANDLE LookupWeaponInfoSlot(const char* name);
-FileWeaponInfo_t* GetFileWeaponInfoFromHandle(WEAPON_FILE_INFO_HANDLE handle);
-WEAPON_FILE_INFO_HANDLE GetInvalidWeaponInfoHandle(void);
-
-void PrecacheFileWeaponInfoDatabase();
-
-
-KeyValues* ReadEncryptedKVFile(IFileSystem* filesystem, const char* szFilenameWithoutExtension, const unsigned char* pICEKey, bool bForceReadEncryptedFile = false);
-
-
-extern FileWeaponInfo_t* CreateWeaponInfo();
-
-extern void LoadEquipmentData();
-
-class CWeaponDatabase : public CAutoGameSystem, public CGameEventListener
-{
-public:
-	CWeaponDatabase();
-
-	void Reset();
-	bool LoadManifest();
-	void PrecacheAllWeapons();
-	void RefreshAllWeapons();
-
-	WEAPON_FILE_INFO_HANDLE FindWeaponInfo(const char* name);
-	FileWeaponInfo_t* GetFileWeaponInfoFromHandle(WEAPON_FILE_INFO_HANDLE handle);
-
-protected:
-	friend void LoadEquipmentData();
-
-	virtual bool Init();
-
-	WEAPON_FILE_INFO_HANDLE FindOrCreateWeaponInfo(const char* name);
-	bool LoadWeaponDataFromFile(IFileSystem* filesystem, const char* szWeaponName, const unsigned char* pICEKey);
-	void FireGameEvent(IGameEvent* event);
-
-private:
-	CUtlDict< FileWeaponInfo_t*, unsigned short > m_WeaponInfoDatabase;
-	bool m_bPreCached;
-};
-
-extern CWeaponDatabase g_WeaponDatabase;
-
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/win32consoleio.h b/SpyCustom/win32consoleio.h
deleted file mode 100644
index 927bd4d..0000000
--- a/SpyCustom/win32consoleio.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef WIN32_CONSOLE_IO_H
-#define WIN32_CONSOLE_IO_H
-
-#if defined( COMPILER_MSVC )
-#pragma once
-#endif
-
-PLATFORM_INTERFACE bool SetupWin32ConsoleIO();
-
-struct Win32ConsoleColorContext_t
-{
-	int  m_InitialColor;
-	uint16 m_LastColor;
-	uint16 m_BadColor;
-	uint16 m_BackgroundFlags;
-};
-
-PLATFORM_INTERFACE void InitWin32ConsoleColorContext(Win32ConsoleColorContext_t* pContext);
-
-PLATFORM_INTERFACE uint16 SetWin32ConsoleColor(Win32ConsoleColorContext_t* pContext, int nRed, int nGreen, int nBlue, int nIntensity);
-
-PLATFORM_INTERFACE void RestoreWin32ConsoleColor(Win32ConsoleColorContext_t* pContext, uint16 prevColor);
-
-#endif 
\ No newline at end of file
diff --git a/SpyCustom/xboxstubs.h b/SpyCustom/xboxstubs.h
deleted file mode 100644
index 0bc7d3f..0000000
--- a/SpyCustom/xboxstubs.h
+++ /dev/null
@@ -1,210 +0,0 @@
-#if !defined( XBOXSTUBS_H ) && !defined( _X360 )
-#define XBOXSTUBS_H
-
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "platform.h"
-
-#define XCONTENTFLAG_NONE                           0x00
-#define XCONTENTFLAG_CREATENEW                      0x00
-#define XCONTENTFLAG_CREATEALWAYS                   0x00
-#define XCONTENTFLAG_OPENEXISTING                   0x00
-#define XCONTENTFLAG_OPENALWAYS                     0x00
-#define XCONTENTFLAG_TRUNCATEEXISTING               0x00
-
-#define XCONTENTFLAG_NOPROFILE_TRANSFER             0x00
-#define XCONTENTFLAG_NODEVICE_TRANSFER              0x00
-#define XCONTENTFLAG_STRONG_SIGNED                  0x00
-#define XCONTENTFLAG_ALLOWPROFILE_TRANSFER          0x00
-#define XCONTENTFLAG_MOVEONLY_TRANSFER              0x00
-
-#define XDEVICE_PORT0               0
-#define XDEVICE_PORT1               1
-#define XDEVICE_PORT2               2
-#define XDEVICE_PORT3               3
-#define XUSER_MAX_COUNT				4
-#define XUSER_INDEX_NONE            0x000000FE
-
-#define XBX_CLR_DEFAULT				0xFF000000
-#define XBX_CLR_WARNING				0x0000FFFF
-#define XBX_CLR_ERROR				0x000000FF
-
-#define XBOX_MINBORDERSAFE			0
-#define XBOX_MAXBORDERSAFE			0
-
-typedef enum
-{
-	XK_NULL,
-	XK_BUTTON_UP,
-	XK_BUTTON_DOWN,
-	XK_BUTTON_LEFT,
-	XK_BUTTON_RIGHT,
-	XK_BUTTON_START,
-	XK_BUTTON_BACK,
-	XK_BUTTON_STICK1,
-	XK_BUTTON_STICK2,
-	XK_BUTTON_A,
-	XK_BUTTON_B,
-	XK_BUTTON_X,
-	XK_BUTTON_Y,
-	XK_BUTTON_LEFT_SHOULDER,
-	XK_BUTTON_RIGHT_SHOULDER,
-	XK_BUTTON_LTRIGGER,
-	XK_BUTTON_RTRIGGER,
-	XK_STICK1_UP,
-	XK_STICK1_DOWN,
-	XK_STICK1_LEFT,
-	XK_STICK1_RIGHT,
-	XK_STICK2_UP,
-	XK_STICK2_DOWN,
-	XK_STICK2_LEFT,
-	XK_STICK2_RIGHT,
-	XK_MAX_KEYS,
-} xKey_t;
-
-typedef unsigned short WORD;
-#ifndef POSIX
-typedef unsigned long DWORD;
-typedef void* HANDLE;
-typedef unsigned __int64 ULONGLONG;
-#endif
-
-#ifdef POSIX
-typedef DWORD COLORREF;
-#endif
-
-#ifndef INVALID_HANDLE_VALUE
-#define INVALID_HANDLE_VALUE ((HANDLE)-1)
-#endif
-
-typedef int XNADDR;
-typedef uint64 XUID;
-
-typedef struct {
-	BYTE        ab[8];                               
-} XNKID;
-
-typedef struct {
-	BYTE        ab[16];                               
-} XNKEY;
-
-typedef struct _XSESSION_INFO
-{
-	XNKID sessionID;                  
-	XNADDR hostAddress;               
-	XNKEY keyExchangeKey;             
-} XSESSION_INFO, * PXSESSION_INFO;
-
-typedef struct _XUSER_DATA
-{
-	BYTE                                type;
-
-	union
-	{
-		int                            nData;      
-		int64                        i64Data;    
-		double                          dblData;    
-		struct                                      
-		{
-			uint                       cbData;      
-			char* pwszData;
-		} string;
-		float                           fData;      
-		struct                                      
-		{
-			uint                       cbData;
-			char* pbData;
-		} binary;
-	};
-} XUSER_DATA, * PXUSER_DATA;
-
-typedef struct _XUSER_PROPERTY
-{
-	DWORD                               dwPropertyId;
-	XUSER_DATA                          value;
-} XUSER_PROPERTY, * PXUSER_PROPERTY;
-
-typedef struct _XUSER_CONTEXT
-{
-	DWORD                               dwContextId;
-	DWORD                               dwValue;
-} XUSER_CONTEXT, * PXUSER_CONTEXT;
-
-typedef struct _XSESSION_SEARCHRESULT
-{
-	XSESSION_INFO   info;
-	DWORD           dwOpenPublicSlots;
-	DWORD           dwOpenPrivateSlots;
-	DWORD           dwFilledPublicSlots;
-	DWORD           dwFilledPrivateSlots;
-	DWORD           cProperties;
-	DWORD           cContexts;
-	PXUSER_PROPERTY pProperties;
-	PXUSER_CONTEXT  pContexts;
-} XSESSION_SEARCHRESULT, * PXSESSION_SEARCHRESULT;
-
-typedef struct _XSESSION_SEARCHRESULT_HEADER
-{
-	DWORD dwSearchResults;
-	XSESSION_SEARCHRESULT* pResults;
-} XSESSION_SEARCHRESULT_HEADER, * PXSESSION_SEARCHRESULT_HEADER;
-
-typedef struct _XSESSION_REGISTRANT
-{
-	uint64 qwMachineID;
-	DWORD bTrustworthiness;
-	DWORD bNumUsers;
-	XUID* rgUsers;
-
-} XSESSION_REGISTRANT;
-
-typedef struct _XSESSION_REGISTRATION_RESULTS
-{
-	DWORD wNumRegistrants;
-	XSESSION_REGISTRANT* rgRegistrants;
-} XSESSION_REGISTRATION_RESULTS, * PXSESSION_REGISTRATION_RESULTS;
-
-typedef struct {
-	BYTE        bFlags;
-	BYTE        bReserved;
-	WORD        cProbesXmit;
-	WORD        cProbesRecv;
-	WORD        cbData;
-	BYTE* pbData;
-	WORD        wRttMinInMsecs;
-	WORD        wRttMedInMsecs;
-	DWORD       dwUpBitsPerSec;
-	DWORD       dwDnBitsPerSec;
-} XNQOSINFO;
-
-typedef struct {
-	uint        cxnqos;
-	uint        cxnqosPending;
-	XNQOSINFO   axnqosinfo[1];
-} XNQOS;
-
-#define XSESSION_CREATE_HOST				0
-#define XUSER_DATA_TYPE_INT32				0
-#define XSESSION_CREATE_USES_ARBITRATION	0
-#define XNET_QOS_LISTEN_ENABLE				0
-#define XNET_QOS_LISTEN_DISABLE				0
-#define XNET_QOS_LISTEN_SET_DATA			0
-
-FORCEINLINE void			XBX_ProcessEvents() {}
-FORCEINLINE unsigned int	XBX_GetSystemTime() { return 0; }
-FORCEINLINE	int				XBX_GetPrimaryUserId() { return 0; }
-FORCEINLINE	void			XBX_SetPrimaryUserId(DWORD idx) {}
-FORCEINLINE	int				XBX_GetStorageDeviceId() { return 0; }
-FORCEINLINE	void			XBX_SetStorageDeviceId(DWORD idx) {}
-FORCEINLINE const char* XBX_GetLanguageString() { return ""; }
-FORCEINLINE bool			XBX_IsLocalized() { return false; }
-
-#define XCONTENT_MAX_DISPLAYNAME_LENGTH	128
-#define XCONTENT_MAX_FILENAME_LENGTH	42
-
-#define XBX_INVALID_STORAGE_ID ((DWORD) -1)
-#define XBX_STORAGE_DECLINED ((DWORD) -2)
-
-#endif  
\ No newline at end of file
diff --git a/SpyCustom/zip_uncompressed.h b/SpyCustom/zip_uncompressed.h
deleted file mode 100644
index 83e33f0..0000000
--- a/SpyCustom/zip_uncompressed.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef ZIP_UNCOMPRESSED_H
-#define ZIP_UNCOMPRESSED_H
-#ifdef _WIN32
-#pragma once
-#endif
-
-#include "datamap.h"
-
-#define PKID( a, b ) (((b)<<24)|((a)<<16)|('K'<<8)|'P')
-
-#pragma pack(1)
-
-struct ZIP_EndOfCentralDirRecord
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned int	signature;    
-	unsigned short	numberOfThisDisk;    
-	unsigned short	numberOfTheDiskWithStartOfCentralDirectory;   
-	unsigned short	nCentralDirectoryEntries_ThisDisk;	  
-	unsigned short	nCentralDirectoryEntries_Total;	  
-	unsigned int	centralDirectorySize;   
-	unsigned int	startOfCentralDirOffset;   
-	unsigned short	commentLength;   
-};
-
-struct ZIP_FileHeader
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned int	signature;      
-	unsigned short	versionMadeBy;       
-	unsigned short	versionNeededToExtract;        
-	unsigned short	flags;        
-	unsigned short	compressionMethod;      
-	unsigned short	lastModifiedTime;        
-	unsigned short	lastModifiedDate;        
-	unsigned int	crc32;     
-	unsigned int	compressedSize;      
-	unsigned int	uncompressedSize;      
-	unsigned short	fileNameLength;       
-	unsigned short	extraFieldLength;       
-	unsigned short	fileCommentLength;       
-	unsigned short	diskNumberStart;       
-	unsigned short	internalFileAttribs;       
-	unsigned int	externalFileAttribs;       
-	unsigned int	relativeOffsetOfLocalHeader;         
-};
-
-struct ZIP_LocalFileHeader
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned int	signature;        
-	unsigned short	versionNeededToExtract;        
-	unsigned short	flags;        
-	unsigned short	compressionMethod;      
-	unsigned short	lastModifiedTime;        
-	unsigned short	lastModifiedDate;        
-	unsigned int	crc32;     
-	unsigned int	compressedSize;      
-	unsigned int	uncompressedSize;      
-	unsigned short	fileNameLength;       
-	unsigned short	extraFieldLength;       
-};
-
-#define PRELOAD_SECTION_NAME	"__preload_section.pre"
-#define PRELOAD_HDR_VERSION		3
-#define XZIP_COMMENT_LENGTH		32
-#define INVALID_PRELOAD_ENTRY	( (unsigned short)-1 )
-
-struct ZIP_PreloadHeader
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned int Version;					 
-	unsigned int DirectoryEntries;			     
-	unsigned int PreloadDirectoryEntries;	            
-	unsigned int Alignment;					     
-};
-
-struct ZIP_PreloadDirectoryEntry
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned int Length;					        
-	unsigned int DataOffset;				                
-};
-
-struct ZIP_PreloadRemapTable
-{
-	DECLARE_BYTESWAP_DATADESC();
-	unsigned short PreloadIndex;			            
-};
-
-#pragma pack()
-
-#endif  
\ No newline at end of file