1 files changed, 20 insertions, 12 deletions
diff --git a/src/T2TowerDoc.h b/src/T2TowerDoc.h
index 7bde93f..cbdbb37 100644
--- a/src/T2TowerDoc.h
+++ b/src/T2TowerDoc.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "common.h"
-#include "T2MsgWindowCallback.h"
-#include "T2Settlement.h"
-#include "T2Sprite.h"
-#include "T2ToolCallback.h"
+#include "T2DLL/T2MsgWindowCallback.h"
+#include "T2DLL/T2Settlement.h"
+#include "T2DLL/T2Sprite.h"
+#include "T2DLL/T2ToolCallback.h"
 #include "T2TowerMainView.h"
 
 enum {
@@ -70,13 +70,20 @@ struct DragMask {
 };
 
 class T2TowerDoc : public CDocument, public T2MsgWindowCallback, public T2ToolCallback {
+protected:
+    T2TowerDoc();
 	DECLARE_DYNCREATE(T2TowerDoc)
-	DECLARE_MESSAGE_MAP()
 
 public:
-	T2TowerDoc();
 	virtual ~T2TowerDoc();
+
+    //{{AFX_VIRTUAL(T2TowerDoc)
+    public:
+    virtual BOOL OnNewDocument();
+    virtual BOOL OnOpenDocument(LPCTSTR lpszPathName);
+    virtual BOOL OnSaveDocument(LPCTSTR lpszPathName);
 	virtual void Serialize(CArchive &ar);
+    //}}AFX_VIRTUAL
 
     // is this one properly placed???
 	virtual BOOL IsDustOn() const { return mIsDustOn; }
@@ -93,9 +100,6 @@ public:
 	virtual void towerDoc_vfD0();
     void LoadOptionPlugins();
 	virtual void towerDoc_vfD4(BOOL inResetMainWindow);
-    virtual BOOL OnNewDocument();
-    virtual BOOL OnOpenDocument(LPCTSTR lpszPathName);
-    virtual BOOL OnSaveDocument(LPCTSTR lpszPathName);
 
 	virtual void towerDoc_vfD8(const RECT &inRect1, const RECT &inRect2);
 	virtual void DrawRequestAll(const RECT &inRect);
@@ -398,9 +402,6 @@ public:
     BOOL _22C;
 
 protected:
-	afx_msg void OnSystemInformation();
-	afx_msg void OnUpdateDebugStepRun(CCmdUI *pCmdUI);
-	afx_msg void OnDebugStepRun();
     void InvalClock();
     void InvalCalender();
     void InvalFunds();
@@ -409,6 +410,11 @@ protected:
     void x42670C();
     void x426717();
     void CycleOutlinePalette();
+
+    //{{AFX_MSG(T2TowerDoc)
+	afx_msg void OnSystemInformation();
+	afx_msg void OnUpdateDebugStepRun(CCmdUI *pCmdUI);
+	afx_msg void OnDebugStepRun();
 	afx_msg void OnUpdateDebugIdleSpeedMeasuring(CCmdUI *pCmdUI);
 	afx_msg void OnDebugIdleSpeedMeasuring();
 	afx_msg void OnUpdateDebugAllLoadMeasuring(CCmdUI *pCmdUI);
@@ -435,4 +441,6 @@ protected:
 	afx_msg void OnUpdateHideMessageWindow(CCmdUI *pCmdUI);
 	afx_msg void OnHideToolWindow();
 	afx_msg void OnUpdateHideToolWindow(CCmdUI *pCmdUI);
+    //}}AFX_MSG
+    DECLARE_MESSAGE_MAP()
 };