1 files changed, 34 insertions, 27 deletions

diff --git a/src/T2TowerMainView.h b/src/T2TowerMainView.h
index 0bccd8f..a91e867 100644
--- a/src/T2TowerMainView.h
+++ b/src/T2TowerMainView.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "common.h"
-#include "LAttachable.h"
+#include "T2DLL/LAttachable.h"
 
 enum {
     kTool0_Null = 0,
@@ -30,17 +30,27 @@ enum {
 };
 
 class T2TowerMainView : public CView, public LAttachable {
-    DECLARE_MESSAGE_MAP()
+protected:
+    T2TowerMainView();
     DECLARE_DYNCREATE(T2TowerMainView)
 
 public:
-    T2TowerMainView();
     virtual ~T2TowerMainView();
     virtual void AssertValid() const;
     virtual void Dump(CDumpContext &dc) const;
+
+    //{{AFX_VIRTUAL(T2TowerMainView)
+    public:
     virtual BOOL PreTranslateMessage(MSG *pMsg);
     virtual void OnInitialUpdate() {}
+    protected:
+    virtual BOOL PreCreateWindow(CREATESTRUCT &cs);
+    virtual void OnDraw(CDC *pDC);
+    virtual void OnUpdate(CView *pSender, LPARAM lHint, CObject *pHint);
+    virtual void OnActivateView(BOOL bActivate, CView *pActivateView, CView *pDeactiveView);
+    //}}AFX_VIRTUAL
 
+public:
 	virtual void tmv_vf110();
 	virtual void DrawDebugGrid();
 	virtual void CopySimulationImage(const RECT &inRect);
@@ -122,21 +132,33 @@ public:
 	CPoint mInitialClickPos;
 
 protected:
-    virtual BOOL PreCreateWindow(CREATESTRUCT &cs);
-    virtual void OnDraw(CDC *pDC);
-    virtual void OnUpdate(CView *pSender, LPARAM lHint, CObject *pHint);
-    virtual void OnActivateView(BOOL bActivate, CView *pActivateView, CView *pDeactiveView);
 
     BOOL CreateToolSprite(BOOL inSkipShowing = false);
     BOOL DeleteToolSprite();
 
-    afx_msg int OnCreate(LPCREATESTRUCT lpcs);
-    afx_msg void OnDestroy();
     void AdjustWorldBounds();
     void ClearUpdateRect();
     void x42AC1B();
-    afx_msg void OnSize(UINT nType, int cx, int cy);
 
+    void DrawDebugBkgndInfo(CDC *pDC);
+    void DrawDebugFloorInfoTenant(CDC *pDC, const RECT &inRect);
+    void DrawDebugFloorInfoMover(CDC *pDC, const RECT &inRect);
+    void DrawDebugFloorInfoRequest(CDC *pDC, const RECT &inRect);
+    void DrawDebugEquip(CDC *pDC, const RECT &inRect);
+    void x42CA08(const POINT &inPt);
+
+    void HandleLButtonDown(CPoint inPt);
+    void HandleLButtonUp(CPoint inPt);
+
+    void x42E366(int inType);
+
+    void HandleRButtonDown(CPoint inPt);
+    void HandleRButtonUp(CPoint inPt);
+
+    //{{AFX_MSG(T2TowerMainView)
+    afx_msg int OnCreate(LPCREATESTRUCT lpcs);
+    afx_msg void OnDestroy();
+    afx_msg void OnSize(UINT nType, int cx, int cy);
     afx_msg void OnDebugNormalDisplay();
     afx_msg void OnUpdateDebugNormalDisplay(CCmdUI *pCmdUI);
     afx_msg void OnDebugBkgndInfo();
@@ -147,34 +169,19 @@ protected:
     afx_msg void OnUpdateDebugFloorInfoMover(CCmdUI *pCmdUI);
     afx_msg void OnDebugFloorInfoRequest();
     afx_msg void OnUpdateDebugFloorInfoRequest(CCmdUI *pCmdUI);
-
-    void DrawDebugBkgndInfo(CDC *pDC);
-    void DrawDebugFloorInfoTenant(CDC *pDC, const RECT &inRect);
-    void DrawDebugFloorInfoMover(CDC *pDC, const RECT &inRect);
-    void DrawDebugFloorInfoRequest(CDC *pDC, const RECT &inRect);
-    void DrawDebugEquip(CDC *pDC, const RECT &inRect);
-    void x42CA08(const POINT &inPt);
     afx_msg void OnCommand10000to10010(UINT nCmd);
-
     afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-    void HandleLButtonDown(CPoint inPt);
     afx_msg void OnMouseMove(UINT nFlags, CPoint point);
     afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
-    void HandleLButtonUp(CPoint inPt);
-
     afx_msg void OnUpdateDebugGrid(CCmdUI *pCmdUI);
     afx_msg void OnDebugGrid();
-
-    void x42E366(int inType);
-
     afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
-    void HandleRButtonDown(CPoint inPt);
     afx_msg void OnRButtonUp(UINT nFlags, CPoint point);
-    void HandleRButtonUp(CPoint inPt);
-
     afx_msg void OnUpdateDebugDisplaySpeedMeasuring(CCmdUI *pCmdUI);
     afx_msg void OnDebugDisplaySpeedMeasuring();
     afx_msg void OnUpdateDebugOffscreenSpeedMeasuring(CCmdUI *pCmdUI);
     afx_msg void OnDebugOffscreenSpeedMeasuring();
     afx_msg void OnTimer(UINT nIDEvent);
+    //}}AFX_MSG
+    DECLARE_MESSAGE_MAP()
 };