1 files changed, 77 insertions, 69 deletions

diff --git a/src/T2DLL/T2ToolWindow.h b/src/T2DLL/T2ToolWindow.h
index 85c9bc8..b90aa6c 100644
--- a/src/T2DLL/T2ToolWindow.h
+++ b/src/T2DLL/T2ToolWindow.h
@@ -1,91 +1,99 @@
 #pragma once
 #include "common.h"
 
-class T2ToolWindow {
-public:
-	static CObject* __stdcall CreateObject();
-protected:
-	static CRuntimeClass* __stdcall _GetBaseClass();
+class T2ToolIconItem;
+
+class AFX_EXT_CLASS T2ToolWindow : public CFrameWnd {
+	DECLARE_DYNCREATE(T2ToolWindow)
+	DECLARE_MESSAGE_MAP()
 public:
-	virtual CRuntimeClass* GetRuntimeClass() const;
 	T2ToolWindow();
 	virtual ~T2ToolWindow();
-	virtual void SetDocument(T2TowerDoc*);
-protected:
-	static const AFX_MSGMAP* __stdcall _GetBaseMessageMap();
-	virtual const AFX_MSGMAP* GetMessageMap() const;
-	int OnQueryNewPalette();
-	int OnCreate(CREATESTRUCTA*);
-public:
+	virtual void SetDocument(T2TowerDoc* inDoc);
 	virtual int GetSel();
-	virtual void SetSel(int);
-	virtual CString* GetIconName(int);
-	virtual T2TemplatePlugin* GetIconPlugin(int);
-	virtual unsigned long GetIconOption(int);
-	virtual unsigned int GetIconValiation(int);
-	virtual void AddIcon(const char*, char*, unsigned int, unsigned long, T2ToolDef*, int, unsigned short, T2ToolCallback*);
-	virtual void AddIcon(const char*, unsigned short, char*, T2ToolCallback*);
-	virtual void RemoveIcon(const char*, unsigned int);
+	virtual void SetSel(int inID);
+	virtual CString* GetIconName(int inID);
+	virtual T2TemplatePlugin* GetIconPlugin(int inID);
+	virtual DWORD GetIconOption(int inID);
+	virtual unsigned int GetIconValiation(int inID);
+	virtual void AddIcon(const char* inName, char* inStr2, unsigned int inValiation, DWORD inOption, T2ToolDef* inToolDef, int inFld18, unsigned short inSomeMask, T2ToolCallback* inToolCallback);
+	virtual void AddIcon(const char* inName, unsigned short inSomeMask, char* inStr2, T2ToolCallback* inToolCallback);
+	virtual void RemoveIcon(const char* inName, unsigned int inValiation);
 	virtual void RemoveAll();
-	virtual int GetID(const char*, unsigned int);
-	virtual T2ToolIconItem* GetItem(const char*, unsigned int);
-	virtual T2ToolIconItem* GetItem(int);
 	virtual void Refresh();
+	virtual int GetID(const char* inName, unsigned int inValiation);
+	virtual T2ToolIconItem* GetItem(const char* inName, unsigned int inValiation);
+	virtual T2ToolIconItem* GetItem(int inID);
+	virtual BOOL EnableIcon(const char* inName, unsigned int inValiation, BOOL inFlag);
+	virtual void EnableIcon(BOOL inFlag);
+	virtual T2ToolIconItem* EnableIcon(unsigned short inMask);
+	virtual BOOL OnEraseBkgndProc(CDC* pDC);
+	virtual int OnCreateProc(LPCREATESTRUCT lpCreateStruct);
+	virtual void OnLButtonDownProc(UINT nFlags, CPoint point);
+	virtual void OnLButtonUpProc(UINT nFlags, CPoint point);
+	virtual void OnMouseMoveProc(UINT nFlags, CPoint point);
+	virtual void OnLButtonDblClkProc(UINT nFlags, CPoint point);
+	virtual void OnTimerProc(UINT nIDEvent);
+	virtual void OnSizeProc(UINT nType, int cx, int cy);
+	void StartTimer(UINT inDelay);
+	void StopTimer();
+
 protected:
-	virtual int RefreshItem(T2ToolIconItem*);
-	virtual T2TemplatePlugin* SearchPlugin(T2TemplatePluginList*, CString&);
-	virtual POSITION SearchID(int);
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
+	virtual BOOL RefreshItem(T2ToolIconItem* inItem);
+	virtual T2TemplatePlugin* SearchPlugin(T2TemplatePluginList* inList, CString& inName);
+	virtual POSITION SearchID(int inID);
 	virtual int AssignNewID();
-	virtual void RemoveItem(POSITION);
-	virtual void SelChange(int);
-public:
-	virtual int EnableIcon(const char*, unsigned int, int);
-	virtual void EnableIcon(int);
-	virtual T2ToolIconItem* EnableIcon(unsigned short);
-protected:
-	virtual void RedrawButton();
+	virtual void RemoveItem(POSITION inPos);
+	virtual void SelChange(int inID);
 	virtual void Updated();
 	virtual void ListUpdated();
-public:
-	void StartTimer(unsigned int);
-	void StopTimer();
-protected:
-	int OnEraseBkgnd(CDC*);
-	void OnLButtonDown(unsigned int, CPoint);
-	void OnLButtonUp(unsigned int, CPoint);
-	void OnMouseMove(unsigned int, CPoint);
-	void OnLButtonDblClk(unsigned int, CPoint);
-	void OnTimer(unsigned int);
-	void OnSize(unsigned int, int, int);
-	void OnDestroy();
-public:
-	virtual int OnCreateProc(CREATESTRUCTA*);
-	virtual int OnEraseBkgndProc(CDC*);
-	virtual void OnLButtonDownProc(unsigned int, CPoint);
-	virtual void OnLButtonUpProc(unsigned int, CPoint);
-	virtual void OnMouseMoveProc(unsigned int, CPoint);
-	virtual void OnLButtonDblClkProc(unsigned int, CPoint);
-	virtual void OnTimerProc(unsigned int);
-	virtual void OnSizeProc(unsigned int, int, int);
-protected:
-	void OnClose();
-	virtual int OnNotify(unsigned int, long, long*);
-public:
-	static const CRuntimeClass classT2ToolWindow;
-protected:
-	static const AFX_MSGMAP messageMap;
-private:
-	static const AFX_MSGMAP_ENTRY* const _messageEntries;
+	virtual void RedrawButton();
+
+	afx_msg BOOL OnQueryNewPalette();
+	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
+	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
+	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
+	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
+	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
+	afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point);
+	afx_msg void OnTimer(UINT nIDEvent);
+	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnDestroy();
+	afx_msg void OnClose();
+
+	int _C0;
+	T2TowerDoc *mDocument;
+	T2WorldDef *mWorldDef;
+	T2ToolIconList *mToolIconList;
+	int mSel;
+	UINT mTimerID;
+	T2ToolIconItem *_D8[16];
+	unsigned short _118;
+	CListCtrl *mListCtrl;
 };
-class T2ToolIconItem {
+
+class AFX_EXT_CLASS T2ToolIconItem {
 public:
 	T2ToolIconItem();
 	virtual ~T2ToolIconItem();
 
-	T2ToolIconItem(const T2ToolIconItem&) {}
-	T2ToolIconItem& operator=(const T2ToolIconItem&) {}
+	int mID;
+	T2TemplatePlugin *mPlugin;
+	CString mName;
+	unsigned int mValiation;
+	DWORD mOption;
+	int m18;
+	unsigned short m1C;
+	T2ToolCallback *mToolCallback;
+	BOOL m24;
+	int mEnableCount;
+	CString m2C;
+	unsigned int m30;
+	T2ToolDef *mToolDef;
 };
-class T2ToolIconList {
+
+class AFX_EXT_CLASS T2ToolIconList : public CList<T2ToolIconItem *, T2ToolIconItem *> {
 public:
 	T2ToolIconList();
 	virtual ~T2ToolIconList();