diff options
| author | Ash Wolf <ninji@wuffs.org> | 2023-07-09 20:59:16 +0100 |
|---|---|---|
| committer | Ash Wolf <ninji@wuffs.org> | 2023-07-09 20:59:16 +0100 |
| commit | c920fe38a19013b99f3f74e48da9724fb053c212 (patch) | |
| tree | 6bb036fd3f61b85daceb26f74378eadcdd977db1 | |
| parent | 96a63139221587c6be9659c1e07eacd3a8e7f048 (diff) | |
| download | t2win-c920fe38a19013b99f3f74e48da9724fb053c212.tar.gz t2win-c920fe38a19013b99f3f74e48da9724fb053c212.zip | |
support building from VC++ IDE, add resources
Diffstat (limited to '')
562 files changed, 6053 insertions, 1244 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8092cb2..ab6bdce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2147,4 +2147,5 @@ add_executable(t2win src/T2TowerMainView.cpp src/T2HUnknown.cpp src/T2HUnknown.h + src/Resource.h ) diff --git a/src/256CheckDialog.cpp b/src/256CheckDialog.cpp index 8aea8d7..2692219 100644 --- a/src/256CheckDialog.cpp +++ b/src/256CheckDialog.cpp @@ -1,160 +1,161 @@ +#include "StdAfx.h" #define ATOI_KLUDGE #include "common.h" // Since this is the first TU in T2.exe, we pull the same trick as // in CDefRsrcPlugin.cpp for T2DLL and include all the headers that // will force inline functions to be emitted in the right order -#include "UT2Utils.h" -#include "T2PaletteAnimeDef.h" -#include "LAttachment.h" -#include "LAttachable.h" -#include "CLink.h" -#include "LArray.h" -#include "LBroadcaster.h" -#include "LListener.h" -#include "T2Archive.h" -#include "T2BitImage.h" -#include "T2ImageObj.h" -#include "T2SpriteObj.h" -#include "Wave.h" -#include "T2SoundPlayer.h" -#include "T2Balloon.h" -#include "T2DlgItemButtonBase.h" -#include "T2DlgItemIButton.h" -#include "T2DlgItemOK.h" -#include "T2DlgItemCANCEL.h" -#include "T2DlgItemTButton.h" -#include "T2DlgItemICheck.h" -#include "T2DlgItemCheck.h" -#include "T2DlgItemScr.h" -#include "T2DlgItemHScr.h" -#include "T2DlgItemVScr.h" -#include "T2DlgItemBox.h" -#include "T2DlgItemText.h" -#include "T2DlgItemGageBase.h" -#include "T2DlgItemStressGage.h" -#include "T2DlgItemPPLEvalGage.h" -#include "T2DlgItemBelongGage.h" -#include "T2DlgItemCustomerGage.h" -#include "T2DlgItemProfitsGage.h" -#include "T2DlgItemImageTable.h" -#include "T2DlgItemImage.h" -#include "CToggleButtonDisabled.h" -#include "T2VerticalTable.h" -#include "T2MovieTable.h" -#include "T2GuestroomTable.h" -#include "T2HallEventTable.h" -#include "CTokenizer.h" -#include "T2Dialog.h" -#include "T2PluginSpecifier.h" -#include "CResFile.h" -#include "CPlugin.h" -#include "CFilePlugin.h" -#include "CFilePluginList.h" -#include "CFilePluginDB.h" -#include "T2EquipInfoDialog.h" -#include "T2TenantInfoDialog.h" -#include "T2Object.h" -#include "T2ObjectArray.h" -#include "T2DrawableObject.h" -#include "CDefRsrcPlugin.h" -#include "T2TemplatePlugin.h" -#include "T2HaveOutViewObject.h" -#include "CProgramPlugin.h" -#include "T2TemplatePluginList.h" -#include "T2TemplatePluginDB.h" -#include "T2ToolPlugin.h" -#include "UT2Coordinate.h" -#include "T2DateTime.h" -#include "T2PeoplePtrList.h" -#include "T2TowerMessage.h" -#include "CResourcePlugin.h" -#include "T2SubPlugin.h" -#include "T2HallEventPlugin.h" -#include "T2MoviePlugin.h" -#include "T2ToolDef.h" -#include "T2EquipDef.h" -#include "T2TenantDef.h" -#include "T2MoverDef.h" -#include "T2OuterObjDef.h" -#include "T2SilhouetteDef.h" -#include "T2MatterDef.h" -#include "T2PeopleDef.h" -#include "T2Pool.h" -#include "T2Equip.h" -#include "T2Tenant.h" -#include "T2OutObj.h" -#include "T2Request.h" -#include "T2Mover.h" -#include "T2PlaceParamDef.h" -#include "T2TenantMemberTableDef.h" -#include "T2TenantMemberDef.h" -#include "T2PeopleTypeArray.h" -#include "T2PeopleTimeZoneList.h" -#include "T2PeopleDemandList.h" -#include "T2PeopleType.h" -#include "T2Matter.h" -#include "T2OuterObjList.h" -#include "T2OutObjArrayList.h" -#include "T2People.h" -#include "T2PeopleArray.h" -#include "T2PeopleArrayList.h" -#include "T2RequestArray.h" -#include "T2RequestArrayList.h" -#include "T2TenantArray.h" -#include "T2TenantArrayList.h" -#include "T2MoverArray.h" -#include "T2MoverArrayList.h" -#include "T2RegistedTenantDB.h" -#include "T2EquipPlugin.h" -#include "T2TenantPlugin.h" -#include "T2MoverPlugin.h" -#include "T2OuterObjPlugin.h" -#include "T2PeopleLoader.h" -#include "T2CrossEquipArray.h" -#include "T2TenantCEArray.h" -#include "T2RouteCEArray.h" -#include "T2FloorCEArray.h" -#include "T2MoverCEArray.h" -#include "T2UnitInfo.h" -#include "T2FloorInfo.h" -#include "T2FInfoAreaIterator.h" -#include "T2FInfoPtIterator.h" -#include "UT2BkgndInfo.h" -#include "T2WorldDef.h" -#include "T2WorldPlugin.h" -#include "T2AdvertisePlugin.h" -#include "T2GlobalData.h" -#include "T2EquipPtrList.h" -#include "T2FloorPtrList.h" -#include "T2RoutingTableElem.h" -#include "T2MoverRoutingTable.h" -#include "T2RoutingTable.h" -#include "T2RouteNavigator.h" -#include "T2Name.h" -#include "T2NameList.h" -#include "T2TrafficInfo.h" -#include "T2Settlement.h" -#include "T2PaletteAnime.h" -#include "T2OptionPlugin.h" -#include "T2OptionPluginList.h" -#include "T2TowerEvent.h" -#include "T2EventItem.h" -#include "T2BlackOut.h" -#include "T2FireBurning.h" -#include "T2MetroRailway.h" -#include "T2SantaClaus.h" -#include "T2Terrorist.h" -#include "T2VisitVIP.h" -#include "T2MsgWindowCallback.h" -#include "T2ToolWindow.h" -#include "T2ToolCallback.h" -#include "T2StewardDialog.h" -#include "T2ClassFactory.h" +#include "T2DLL/UT2Utils.h" +#include "T2DLL/T2PaletteAnimeDef.h" +#include "T2DLL/LAttachment.h" +#include "T2DLL/LAttachable.h" +#include "T2DLL/CLink.h" +#include "T2DLL/LArray.h" +#include "T2DLL/LBroadcaster.h" +#include "T2DLL/LListener.h" +#include "T2DLL/T2Archive.h" +#include "T2DLL/T2BitImage.h" +#include "T2DLL/T2ImageObj.h" +#include "T2DLL/T2SpriteObj.h" +#include "T2DLL/Wave.h" +#include "T2DLL/T2SoundPlayer.h" +#include "T2DLL/T2Balloon.h" +#include "T2DLL/T2DlgItemButtonBase.h" +#include "T2DLL/T2DlgItemIButton.h" +#include "T2DLL/T2DlgItemOK.h" +#include "T2DLL/T2DlgItemCANCEL.h" +#include "T2DLL/T2DlgItemTButton.h" +#include "T2DLL/T2DlgItemICheck.h" +#include "T2DLL/T2DlgItemCheck.h" +#include "T2DLL/T2DlgItemScr.h" +#include "T2DLL/T2DlgItemHScr.h" +#include "T2DLL/T2DlgItemVScr.h" +#include "T2DLL/T2DlgItemBox.h" +#include "T2DLL/T2DlgItemText.h" +#include "T2DLL/T2DlgItemGageBase.h" +#include "T2DLL/T2DlgItemStressGage.h" +#include "T2DLL/T2DlgItemPPLEvalGage.h" +#include "T2DLL/T2DlgItemBelongGage.h" +#include "T2DLL/T2DlgItemCustomerGage.h" +#include "T2DLL/T2DlgItemProfitsGage.h" +#include "T2DLL/T2DlgItemImageTable.h" +#include "T2DLL/T2DlgItemImage.h" +#include "T2DLL/CToggleButtonDisabled.h" +#include "T2DLL/T2VerticalTable.h" +#include "T2DLL/T2MovieTable.h" +#include "T2DLL/T2GuestroomTable.h" +#include "T2DLL/T2HallEventTable.h" +#include "T2DLL/CTokenizer.h" +#include "T2DLL/T2Dialog.h" +#include "T2DLL/T2PluginSpecifier.h" +#include "T2DLL/CResFile.h" +#include "T2DLL/CPlugin.h" +#include "T2DLL/CFilePlugin.h" +#include "T2DLL/CFilePluginList.h" +#include "T2DLL/CFilePluginDB.h" +#include "T2DLL/T2EquipInfoDialog.h" +#include "T2DLL/T2TenantInfoDialog.h" +#include "T2DLL/T2Object.h" +#include "T2DLL/T2ObjectArray.h" +#include "T2DLL/T2DrawableObject.h" +#include "T2DLL/CDefRsrcPlugin.h" +#include "T2DLL/T2TemplatePlugin.h" +#include "T2DLL/T2HaveOutViewObject.h" +#include "T2DLL/CProgramPlugin.h" +#include "T2DLL/T2TemplatePluginList.h" +#include "T2DLL/T2TemplatePluginDB.h" +#include "T2DLL/T2ToolPlugin.h" +#include "T2DLL/UT2Coordinate.h" +#include "T2DLL/T2DateTime.h" +#include "T2DLL/T2PeoplePtrList.h" +#include "T2DLL/T2TowerMessage.h" +#include "T2DLL/CResourcePlugin.h" +#include "T2DLL/T2SubPlugin.h" +#include "T2DLL/T2HallEventPlugin.h" +#include "T2DLL/T2MoviePlugin.h" +#include "T2DLL/T2ToolDef.h" +#include "T2DLL/T2EquipDef.h" +#include "T2DLL/T2TenantDef.h" +#include "T2DLL/T2MoverDef.h" +#include "T2DLL/T2OuterObjDef.h" +#include "T2DLL/T2SilhouetteDef.h" +#include "T2DLL/T2MatterDef.h" +#include "T2DLL/T2PeopleDef.h" +#include "T2DLL/T2Pool.h" +#include "T2DLL/T2Equip.h" +#include "T2DLL/T2Tenant.h" +#include "T2DLL/T2OutObj.h" +#include "T2DLL/T2Request.h" +#include "T2DLL/T2Mover.h" +#include "T2DLL/T2PlaceParamDef.h" +#include "T2DLL/T2TenantMemberTableDef.h" +#include "T2DLL/T2TenantMemberDef.h" +#include "T2DLL/T2PeopleTypeArray.h" +#include "T2DLL/T2PeopleTimeZoneList.h" +#include "T2DLL/T2PeopleDemandList.h" +#include "T2DLL/T2PeopleType.h" +#include "T2DLL/T2Matter.h" +#include "T2DLL/T2OuterObjList.h" +#include "T2DLL/T2OutObjArrayList.h" +#include "T2DLL/T2People.h" +#include "T2DLL/T2PeopleArray.h" +#include "T2DLL/T2PeopleArrayList.h" +#include "T2DLL/T2RequestArray.h" +#include "T2DLL/T2RequestArrayList.h" +#include "T2DLL/T2TenantArray.h" +#include "T2DLL/T2TenantArrayList.h" +#include "T2DLL/T2MoverArray.h" +#include "T2DLL/T2MoverArrayList.h" +#include "T2DLL/T2RegistedTenantDB.h" +#include "T2DLL/T2EquipPlugin.h" +#include "T2DLL/T2TenantPlugin.h" +#include "T2DLL/T2MoverPlugin.h" +#include "T2DLL/T2OuterObjPlugin.h" +#include "T2DLL/T2PeopleLoader.h" +#include "T2DLL/T2CrossEquipArray.h" +#include "T2DLL/T2TenantCEArray.h" +#include "T2DLL/T2RouteCEArray.h" +#include "T2DLL/T2FloorCEArray.h" +#include "T2DLL/T2MoverCEArray.h" +#include "T2DLL/T2UnitInfo.h" +#include "T2DLL/T2FloorInfo.h" +#include "T2DLL/T2FInfoAreaIterator.h" +#include "T2DLL/T2FInfoPtIterator.h" +#include "T2DLL/UT2BkgndInfo.h" +#include "T2DLL/T2WorldDef.h" +#include "T2DLL/T2WorldPlugin.h" +#include "T2DLL/T2AdvertisePlugin.h" +#include "T2DLL/T2GlobalData.h" +#include "T2DLL/T2EquipPtrList.h" +#include "T2DLL/T2FloorPtrList.h" +#include "T2DLL/T2RoutingTableElem.h" +#include "T2DLL/T2MoverRoutingTable.h" +#include "T2DLL/T2RoutingTable.h" +#include "T2DLL/T2RouteNavigator.h" +#include "T2DLL/T2Name.h" +#include "T2DLL/T2NameList.h" +#include "T2DLL/T2TrafficInfo.h" +#include "T2DLL/T2Settlement.h" +#include "T2DLL/T2PaletteAnime.h" +#include "T2DLL/T2OptionPlugin.h" +#include "T2DLL/T2OptionPluginList.h" +#include "T2DLL/T2TowerEvent.h" +#include "T2DLL/T2EventItem.h" +#include "T2DLL/T2BlackOut.h" +#include "T2DLL/T2FireBurning.h" +#include "T2DLL/T2MetroRailway.h" +#include "T2DLL/T2SantaClaus.h" +#include "T2DLL/T2Terrorist.h" +#include "T2DLL/T2VisitVIP.h" +#include "T2DLL/T2MsgWindowCallback.h" +#include "T2DLL/T2ToolWindow.h" +#include "T2DLL/T2ToolCallback.h" +#include "T2DLL/T2StewardDialog.h" +#include "T2DLL/T2ClassFactory.h" #include "256CheckDialog.h" #include "T2.h" -#include "T2DLL.h" +#include "T2DLL/T2DLL.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -162,38 +163,43 @@ static char THIS_FILE[] = __FILE__; #endif -C256ColorDialog::C256ColorDialog(CWnd *pParentWnd) - : CDialog(227, pParentWnd) +C256CheckDialog::C256CheckDialog(CWnd *pParent) + : CDialog(IDD, pParent) { - + //{{AFX_DATA_INIT(C256CheckDialog) + //}}AFX_DATA_INIT } -/*virtual*/ void C256ColorDialog::DoDataExchange(CDataExchange *pDX) { +/*virtual*/ void C256CheckDialog::DoDataExchange(CDataExchange *pDX) { CWnd::DoDataExchange(pDX); - DDX_Control(pDX, 1028, mButton); + //{{AFX_DATA_MAP(C256CheckDialog) + DDX_Control(pDX, IDC_DEFAULT_CHECK, mButton); + //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(C256ColorDialog, CDialog) +BEGIN_MESSAGE_MAP(C256CheckDialog, CDialog) + //{{AFX_MSG_MAP(C256CheckDialog) + //}}AFX_MSG_MAP END_MESSAGE_MAP() -/*virtual*/ void C256ColorDialog::OnOK() { +/*virtual*/ void C256CheckDialog::OnOK() { Save(); CDialog::OnOK(); } -/*virtual*/ void C256ColorDialog::OnCancel() { +/*virtual*/ void C256CheckDialog::OnCancel() { Save(); CDialog::OnCancel(); } -void C256ColorDialog::Save() { +void C256CheckDialog::Save() { if (mButton.GetCheck()) gT2App->WriteProfileInt("Settings", "CheckDisplay", 0); else gT2App->WriteProfileInt("Settings", "CheckDisplay", 1); } -/*virtual*/ int C256ColorDialog::DoModal() { +/*virtual*/ int C256CheckDialog::DoModal() { int value = gT2App->GetProfileInt("Settings", "CheckDisplay", 1); if (value == 0) diff --git a/src/256CheckDialog.h b/src/256CheckDialog.h index f95925b..5ad0f81 100644 --- a/src/256CheckDialog.h +++ b/src/256CheckDialog.h @@ -1,18 +1,29 @@ #pragma once #include "common.h" +#include "resource.h" -class C256ColorDialog : public CDialog { - DECLARE_MESSAGE_MAP() - +class C256CheckDialog : public CDialog { public: - C256ColorDialog(CWnd *pParentWnd); - virtual int DoModal(); + C256CheckDialog(CWnd *pParent = NULL); -protected: + //{{AFX_DATA(C256CheckDialog) + enum { IDD = IDD_256CHECK }; + CButton mButton; + //}}AFX_DATA + + //{{AFX_VIRTUAL(C256CheckDialog) + public: + virtual int DoModal(); + protected: virtual void DoDataExchange(CDataExchange *pDX); virtual void OnOK(); virtual void OnCancel(); + //}}AFX_VIRTUAL + +protected: void Save(); - CButton mButton; + //{{AFX_MSG(C256CheckDialog) + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/Bitmap.cpp b/src/Bitmap.cpp index 44674d6..6ef6ead 100644 --- a/src/Bitmap.cpp +++ b/src/Bitmap.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #define DONT_INCLUDE_AFXTEMPL #include "Bitmap.h" diff --git a/src/DbgEquipInfo.cpp b/src/DbgEquipInfo.cpp index b9c4487..13928cb 100644 --- a/src/DbgEquipInfo.cpp +++ b/src/DbgEquipInfo.cpp @@ -1,10 +1,10 @@ +#include "StdAfx.h" #include "DbgEquipInfo.h" -#include "LArray.h" -#include "T2CrossEquipArray.h" -#include "T2EquipDef.h" -#include "T2FloorInfo.h" -#include "T2Mover.h" -#include "T2Tenant.h" +#include "T2DLL/LArray.h" +#include "T2DLL/T2CrossEquipArray.h" +#include "T2DLL/T2FloorInfo.h" +#include "T2DLL/T2Mover.h" +#include "T2DLL/T2Tenant.h" #include "T2TowerDoc.h" #include "T2TowerMainView.h" @@ -14,18 +14,22 @@ static char THIS_FILE[] = __FILE__; #endif -DbgEquipInfo::DbgEquipInfo(CWnd *pParentWnd) - : CDialog(160, pParentWnd) +DbgEquipInfo::DbgEquipInfo(CWnd *pParent) + : CDialog(IDD, pParent) { + //{{AFX_DATA_INIT(DbgEquipInfo) + //}}AFX_DATA_INIT } /*virtual*/ void DbgEquipInfo::DoDataExchange(CDataExchange *pDX) { CWnd::DoDataExchange(pDX); - DDX_Control(pDX, 1014, mButton); - DDX_Control(pDX, 1013, mList1); - DDX_Control(pDX, 1011, mStatic1); - DDX_Control(pDX, 1012, mStatic2); - DDX_Control(pDX, 1010, mList2); + //{{AFX_DATA_MAP(DbgEquipInfo) + DDX_Control(pDX, IDC_DEBUG_INFO, mDebugInfoButton); + DDX_Control(pDX, IDC_DEBUG_INFO_LIST, mDebugInfoList); + DDX_Control(pDX, IDC_EQUIP_NAME, mEquipName); + DDX_Control(pDX, IDC_EQUIP_ID, mEquipID); + DDX_Control(pDX, IDC_CROSS_EQUIP_LIST, mCrossEquipList); + //}}AFX_DATA_MAP } void DbgEquipInfo::SetEquip(T2Equip *inEquip) { @@ -41,7 +45,9 @@ void DbgEquipInfo::SetTowerMainView(T2TowerMainView *inView) { } BEGIN_MESSAGE_MAP(DbgEquipInfo, CDialog) - ON_NOTIFY(NM_CLICK, 1010, OnListClick) + //{{AFX_MSG_MAP(DbgEquipInfo) + ON_NOTIFY(NM_CLICK, IDC_CROSS_EQUIP_LIST, OnListClick) + //}}AFX_MSG_MAP END_MESSAGE_MAP() /*virtual*/ BOOL DbgEquipInfo::OnInitDialog() { @@ -49,16 +55,16 @@ END_MESSAGE_MAP() CString str; - mStatic1.SetWindowText(mEquip->GetEquipDef()->mStr48); + mEquipName.SetWindowText(mEquip->GetEquipDef()->mStr48); str.Format("%d", mEquip->mEquipID); - mStatic2.SetWindowText(str); + mEquipID.SetWindowText(str); RECT rect; - mList2.GetClientRect(&rect); + mCrossEquipList.GetClientRect(&rect); int width = rect.right; - mList2.InsertColumn(0, "ID", LVCFMT_LEFT, width / 3); - mList2.InsertColumn(1, "Type", LVCFMT_LEFT, (width * 2) / 3); + mCrossEquipList.InsertColumn(0, "ID", LVCFMT_LEFT, width / 3); + mCrossEquipList.InsertColumn(1, "Type", LVCFMT_LEFT, (width * 2) / 3); LArrayIterator iterator(*mEquip->mCEArray); unsigned int id; @@ -67,32 +73,32 @@ END_MESSAGE_MAP() while (iterator.Next(&id)) { if (id >= 1000) { str.Format("%d", id); - mList2.InsertItem(index, str); + mCrossEquipList.InsertItem(index, str); T2Tenant *tenant = mDocument->mFloorInfo->GetTenant(id); if (tenant) - mList2.SetItemText(index, 1, tenant->GetEquipDef()->mStr48); + mCrossEquipList.SetItemText(index, 1, tenant->GetEquipDef()->mStr48); else - mList2.SetItemText(index, 1, "UNKNOWN"); + mCrossEquipList.SetItemText(index, 1, "UNKNOWN"); } else if (id >= 1) { str.Format("%d", id); - mList2.InsertItem(index, str); + mCrossEquipList.InsertItem(index, str); T2Mover *mover = mDocument->mFloorInfo->GetMover(id); if (mover) - mList2.SetItemText(index, 1, mover->GetEquipDef()->mStr48); + mCrossEquipList.SetItemText(index, 1, mover->GetEquipDef()->mStr48); else - mList2.SetItemText(index, 1, "UNKNOWN"); + mCrossEquipList.SetItemText(index, 1, "UNKNOWN"); } index++; } - mEquip->GetEquipDef()->DebugInfo(mButton, mList1, mEquip); + mEquip->GetEquipDef()->DebugInfo(mDebugInfoButton, mDebugInfoList, mEquip); return true; } void DbgEquipInfo::OnListClick(NMHDR *inHdr, LRESULT *outResult) { - int item = mList2.GetNextItem(-1, LVNI_SELECTED); + int item = mCrossEquipList.GetNextItem(-1, LVNI_SELECTED); if (item != -1) mTowerMainView->SendMessage(WM_COMMAND, MAKELONG(10000 + item, 0), 0); *outResult = 0; diff --git a/src/DbgEquipInfo.h b/src/DbgEquipInfo.h index 719fd43..5d16a23 100644 --- a/src/DbgEquipInfo.h +++ b/src/DbgEquipInfo.h @@ -1,26 +1,38 @@ #pragma once #include "common.h" +#include "resource.h" class DbgEquipInfo : public CDialog { - DECLARE_MESSAGE_MAP() - public: - DbgEquipInfo(CWnd *pParentWnd); + DbgEquipInfo(CWnd *pParent = NULL); + + //{{AFX_DATA(DbgEquipInfo) + enum { IDD = IDD_DBG_EQUIP_INFO }; + CButton mDebugInfoButton; + CListCtrl mDebugInfoList; + CStatic mEquipName; + CStatic mEquipID; + CListCtrl mCrossEquipList; + //}}AFX_DATA + + T2Equip *mEquip; + T2TowerDoc *mDocument; + T2TowerMainView *mTowerMainView; + void SetEquip(T2Equip *inEquip); void SetDocument(T2TowerDoc *inDoc); void SetTowerMainView(T2TowerMainView *inView); + + //{{AFX_VIRTUAL(DbgEquipInfo) + public: virtual BOOL OnInitDialog(); + protected: + virtual void DoDataExchange(CDataExchange *pDX); + //}}AFX_VIRTUAL protected: + //{{AFX_MSG(DbgEquipInfo) afx_msg void OnListClick(NMHDR *inHdr, LRESULT *outResult); - virtual void DoDataExchange(CDataExchange *pDX); - - CButton mButton; - CListCtrl mList1; - CStatic mStatic1; - CStatic mStatic2; - CListCtrl mList2; - T2Equip *mEquip; - T2TowerDoc *mDocument; - T2TowerMainView *mTowerMainView; + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/DbgEventList.cpp b/src/DbgEventList.cpp index 107f33f..46a390f 100644 --- a/src/DbgEventList.cpp +++ b/src/DbgEventList.cpp @@ -1,10 +1,11 @@ +#include "StdAfx.h" #include "DbgEventList.h" -#include "GlobalFunc.h" -#include "LArray.h" -#include "T2EventItem.h" +#include "T2DLL/GlobalFunc.h" +#include "T2DLL/LArray.h" +#include "T2DLL/T2EventItem.h" #include "T2TowerDoc.h" -#include "T2TowerEvent.h" -#include "T2WorldDef.h" +#include "T2DLL/T2TowerEvent.h" +#include "T2DLL/T2WorldDef.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -12,18 +13,24 @@ static char THIS_FILE[] = __FILE__; #endif -DbgEventList::DbgEventList(CWnd *pParentWnd) - : CDialog(182, pParentWnd) +DbgEventList::DbgEventList(CWnd *pParent) + : CDialog(IDD, pParent) { + //{{AFX_DATA_INIT(DbgEventList) + //}}AFX_DATA_INIT } /*virtual*/ void DbgEventList::DoDataExchange(CDataExchange *pDX) { CWnd::DoDataExchange(pDX); - DDX_Control(pDX, 1020, mList); + //{{AFX_DATA_MAP(DbgEventList) + DDX_Control(pDX, IDC_EVENT_LIST, mList); + //}}AFX_DATA_MAP } BEGIN_MESSAGE_MAP(DbgEventList, CDialog) - ON_COMMAND(1021, OnEventStart) + //{{AFX_MSG_MAP(DbgEventList) + ON_COMMAND(IDC_EVENT_START, OnEventStart) + //}}AFX_MSG_MAP END_MESSAGE_MAP() /*virtual*/ BOOL DbgEventList::OnInitDialog() { diff --git a/src/DbgEventList.h b/src/DbgEventList.h index d6ae2cb..7a7e6ed 100644 --- a/src/DbgEventList.h +++ b/src/DbgEventList.h @@ -1,19 +1,29 @@ #pragma once #include "common.h" +#include "resource.h" class DbgEventList : public CDialog { - DECLARE_MESSAGE_MAP() - public: - DbgEventList(CWnd *pParentWnd); + DbgEventList(CWnd *pParent = NULL); + + //{{AFX_DATA(DbgEventList) + enum { IDD = IDD_DBG_EVENT_LIST }; + CListCtrl mList; + T2TowerEvent *mTowerEvent; + //}}AFX_DATA + + //{{AFX_VIRTUAL(DbgEventList) + public: virtual BOOL OnInitDialog(); + protected: + virtual void DoDataExchange(CDataExchange *pDX); protected: - virtual void DoDataExchange(CDataExchange *pDX); void RefreshEvents(); void AddEvents(LArray &array, const char *mode); - afx_msg void OnEventStart(); - CListCtrl mList; - T2TowerEvent *mTowerEvent; + //{{AFX_MSG(DbgEventList) + afx_msg void OnEventStart(); + //}}AFX_MSG +DECLARE_MESSAGE_MAP() }; diff --git a/src/DbgIPS.cpp b/src/DbgIPS.cpp index 746ffc6..1ce0a20 100644 --- a/src/DbgIPS.cpp +++ b/src/DbgIPS.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "DbgIPS.h" #ifdef _DEBUG @@ -6,15 +7,21 @@ static char THIS_FILE[] = __FILE__; #endif -DbgIPS::DbgIPS(CWnd *pParentWnd) - : CDialog(171, pParentWnd) +DbgIPS::DbgIPS(CWnd *pParent) + : CDialog(IDD, pParent) { - Create(171, pParentWnd); + Create(IDD, pParent); + //{{AFX_DATA_INIT(DbgIPS) + //}}AFX_DATA_INIT } /*virtual*/ void DbgIPS::DoDataExchange(CDataExchange *pDX) { CWnd::DoDataExchange(pDX); + //{{AFX_DATA_MAP(DbgIPS) + //}}AFX_DATA_MAP } BEGIN_MESSAGE_MAP(DbgIPS, CDialog) + //{{AFX_MSG_MAP(DbgIPS) + //}}AFX_MSG_MAP END_MESSAGE_MAP() diff --git a/src/DbgIPS.h b/src/DbgIPS.h index f66208e..ca63a16 100644 --- a/src/DbgIPS.h +++ b/src/DbgIPS.h @@ -1,12 +1,21 @@ #pragma once #include "common.h" +#include "resource.h" class DbgIPS : public CDialog { - DECLARE_MESSAGE_MAP() - public: - DbgIPS(CWnd *pParentWnd); + DbgIPS(CWnd *pParent = NULL); + + //{{AFX_DATA(DbgIPS) + enum { IDD = IDD_DBG_IPS }; + //}}AFX_DATA -protected: + //{{AFX_VIRTUAL(DbgIPS) + protected: virtual void DoDataExchange(CDataExchange *pDX); + //}}AFX_VIRTUAL + + //{{AFX_MSG(DbgIPS) + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/DbgPeopleView.cpp b/src/DbgPeopleView.cpp index 3419b77..91d17b6 100644 --- a/src/DbgPeopleView.cpp +++ b/src/DbgPeopleView.cpp @@ -1,7 +1,8 @@ +#include "StdAfx.h" #include "DbgPeopleView.h" -#include "T2People.h" -#include "T2PeopleArray.h" -#include "T2PeopleArrayList.h" +#include "T2DLL/T2People.h" +#include "T2DLL/T2PeopleArray.h" +#include "T2DLL/T2PeopleArrayList.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -20,10 +21,12 @@ DbgPeopleView::DbgPeopleView() { } BEGIN_MESSAGE_MAP(DbgPeopleView, CFrameWnd) + //{{AFX_MSG_MAP(DbgPeopleView) ON_WM_ERASEBKGND() ON_WM_CREATE() ON_WM_TIMER() ON_WM_DESTROY() + //}}AFX_MSG_MAP END_MESSAGE_MAP() void DbgPeopleView::SetPeople(T2PeopleArrayList *inList) { diff --git a/src/DbgPeopleView.h b/src/DbgPeopleView.h index 6be9d18..2a69527 100644 --- a/src/DbgPeopleView.h +++ b/src/DbgPeopleView.h @@ -3,18 +3,23 @@ class DbgPeopleView : public CFrameWnd { DECLARE_DYNCREATE(DbgPeopleView) - DECLARE_MESSAGE_MAP() public: DbgPeopleView(); ~DbgPeopleView(); void SetPeople(T2PeopleArrayList *inList); + T2PeopleArrayList *mPeopleArrayList; + + //{{AFX_VIRTUAL(DbgPeopleView) + //}}AFX_VIRTUAL + protected: + //{{AFX_MSG(DbgPeopleView) afx_msg BOOL OnEraseBkgnd(CDC* pDC); afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); afx_msg void OnTimer(UINT nIDEvent); afx_msg void OnDestroy(); - - T2PeopleArrayList *mPeopleArrayList; + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/DbgStepRun.cpp b/src/DbgStepRun.cpp index 09ae722..970b487 100644 --- a/src/DbgStepRun.cpp +++ b/src/DbgStepRun.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "DbgStepRun.h" #include "T2MainWindow.h" #include "T2TowerDoc.h" @@ -8,16 +9,23 @@ static char THIS_FILE[] = __FILE__; #endif -DbgStepRun::DbgStepRun(CWnd *pParentWnd) { - Create(158, pParentWnd); +DbgStepRun::DbgStepRun(CWnd *pParent) { + Create(IDD, pParent); + + //{{AFX_DATA_INIT(DbgStepRun) + //}}AFX_DATA_INIT } /*virtual*/ void DbgStepRun::DoDataExchange(CDataExchange *pDX) { CWnd::DoDataExchange(pDX); + //{{AFX_DATA_MAP(DbgStepRun) + //}}AFX_DATA_MAP } BEGIN_MESSAGE_MAP(DbgStepRun, CDialog) - ON_COMMAND(1006, OnCommand1006) + //{{AFX_MSG_MAP(DbgStepRun) + ON_COMMAND(IDC_DBG_STEP, OnCommand1006) + //}}AFX_MSG_MAP END_MESSAGE_MAP() void DbgStepRun::OnCommand1006() { diff --git a/src/DbgStepRun.h b/src/DbgStepRun.h index 5330b47..4ea693a 100644 --- a/src/DbgStepRun.h +++ b/src/DbgStepRun.h @@ -1,13 +1,23 @@ #pragma once #include "common.h" +#include "resource.h" class DbgStepRun : public CDialog { - DECLARE_MESSAGE_MAP() - public: - DbgStepRun(CWnd *pParentWnd); + DbgStepRun(CWnd *pParent = NULL); -protected: + //{{AFX_DATA(DbgStepRun) + enum { IDD = IDD_DBG_STEP_RUN }; + //}}AFX_DATA + + //{{AFX_VIRTUAL(DbgStepRun) + protected: virtual void DoDataExchange(CDataExchange *pDX); + //}}AFX_VIRTUAL + +protected: + //{{AFX_MSG(DbgStepRun) afx_msg void OnCommand1006(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/StdAfx.cpp b/src/StdAfx.cpp new file mode 100644 index 0000000..33efafa --- /dev/null +++ b/src/StdAfx.cpp @@ -0,0 +1,6 @@ +// stdafx.cpp : source file that includes just the standard includes +// T2.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + diff --git a/src/StdAfx.h b/src/StdAfx.h new file mode 100644 index 0000000..7d3fc2f --- /dev/null +++ b/src/StdAfx.h @@ -0,0 +1,12 @@ +#pragma once + +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers + +#include <afxwin.h> // MFC core and standard components +#include <afxext.h> // MFC extensions +#ifndef _AFX_NO_AFXCMN_SUPPORT +#include <afxcmn.h> // MFC support for Windows Common Controls +#endif // _AFX_NO_AFXCMN_SUPPORT + +//{{AFX_INSERT_LOCATION}} + diff --git a/src/T2.DSP b/src/T2.DSP new file mode 100644 index 0000000..87aa83a --- /dev/null +++ b/src/T2.DSP @@ -0,0 +1,537 @@ +# Microsoft Developer Studio Project File - Name="T2" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=T2 - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "T2.MAK". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "T2.MAK" CFG="T2 - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "T2 - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "T2 - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "T2 - Win32 Release" + +# PROP BASE Use_MFC 6 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 6 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL" +# ADD RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 +# ADD LINK32 /nologo /subsystem:windows /machine:I386 + +!ELSEIF "$(CFG)" == "T2 - Win32 Debug" + +# PROP BASE Use_MFC 6 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 6 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Z:\Users\ash\src\t2-res\dx5\cdrom\sdk\inc" /I "Z:\Users\ash\src\t2-res\dxmedia51\DX51\dxmdev\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL" +# ADD RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 winmm.lib ole32.lib dxguid.lib dinput.lib dsound.lib T2DLL/Debug/T2DLL.lib /nologo /subsystem:windows /map /debug /machine:I386 /pdbtype:sept /libpath:"Z:\Users\ash\src\t2-res\dx5\cdrom\sdk\lib" /libpath:"Z:\Users\ash\src\t2-res\dxmedia51\DX51\dxmdev\lib" + +!ENDIF + +# Begin Target + +# Name "T2 - Win32 Release" +# Name "T2 - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\256CheckDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\Bitmap.cpp +# End Source File +# Begin Source File + +SOURCE=.\DbgEquipInfo.cpp +# End Source File +# Begin Source File + +SOURCE=.\DbgEventList.cpp +# End Source File +# Begin Source File + +SOURCE=.\DbgIPS.cpp +# End Source File +# Begin Source File + +SOURCE=.\DbgPeopleView.cpp +# End Source File +# Begin Source File + +SOURCE=.\DbgStepRun.cpp +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.cpp +# ADD CPP /Yc"stdafx.h" +# End Source File +# Begin Source File + +SOURCE=.\T2.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2.rc + +!IF "$(CFG)" == "T2 - Win32 Release" + +!ELSEIF "$(CFG)" == "T2 - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\T2CtrlPalette.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2FilePreview.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2GraphWindow.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2HUnknown.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MainWindow.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MsgWindow.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MWControl.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2NewDlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2NewDlgTmp.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OpenFileDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OpenningWindow.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OpenSelectDlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PoolView.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SysInfoDlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TowerDoc.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TowerMainView.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2WorldSelectDlg.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\256CheckDialog.h +# End Source File +# Begin Source File + +SOURCE=.\Bitmap.h +# End Source File +# Begin Source File + +SOURCE=.\common.h +# End Source File +# Begin Source File + +SOURCE=.\DbgEquipInfo.h +# End Source File +# Begin Source File + +SOURCE=.\DbgEventList.h +# End Source File +# Begin Source File + +SOURCE=.\DbgIPS.h +# End Source File +# Begin Source File + +SOURCE=.\DbgPeopleView.h +# End Source File +# Begin Source File + +SOURCE=.\DbgStepRun.h +# End Source File +# Begin Source File + +SOURCE=.\Resource.h +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.h +# End Source File +# Begin Source File + +SOURCE=.\T2.h +# End Source File +# Begin Source File + +SOURCE=.\T2CtrlPalette.h +# End Source File +# Begin Source File + +SOURCE=.\T2FilePreview.h +# End Source File +# Begin Source File + +SOURCE=.\T2GraphWindow.h +# End Source File +# Begin Source File + +SOURCE=.\T2HUnknown.h +# End Source File +# Begin Source File + +SOURCE=.\T2MainWindow.h +# End Source File +# Begin Source File + +SOURCE=.\T2MsgWindow.h +# End Source File +# Begin Source File + +SOURCE=.\T2MWControl.h +# End Source File +# Begin Source File + +SOURCE=.\T2NewDlg.h +# End Source File +# Begin Source File + +SOURCE=.\T2NewDlgTmp.h +# End Source File +# Begin Source File + +SOURCE=.\T2OpenFileDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2OpenningWindow.h +# End Source File +# Begin Source File + +SOURCE=.\T2OpenSelectDlg.h +# End Source File +# Begin Source File + +SOURCE=.\T2PoolView.h +# End Source File +# Begin Source File + +SOURCE=.\T2SysInfoDlg.h +# End Source File +# Begin Source File + +SOURCE=.\T2TowerDoc.h +# End Source File +# Begin Source File + +SOURCE=.\T2TowerMainView.h +# End Source File +# Begin Source File + +SOURCE=.\T2WorldSelectDlg.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=.\res\BITMAP170_1.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\BITMAP172_1.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\BITMAP175_1.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\BITMAP179_1.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\BITMAP189_1.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\BITMAP223_1.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\BITMAP224_1.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\BITMAP229_1.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\BITMAP32767_1.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR183_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR184_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR185_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR187_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR188_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR189_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR190_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR192_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR193_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR194_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR195_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\CURSOR210_1.cur +# End Source File +# Begin Source File + +SOURCE=.\res\ICON168_1.ico +# End Source File +# Begin Source File + +SOURCE=.\res\ICON169_1.ico +# End Source File +# Begin Source File + +SOURCE=.\res\ICON1_1.ico +# End Source File +# Begin Source File + +SOURCE=.\res\ICON2_1.ico +# End Source File +# Begin Source File + +SOURCE=.\res\ICON3_1.ico +# End Source File +# Begin Source File + +SOURCE=.\res\PALETTE100_1.bin +# End Source File +# Begin Source File + +SOURCE=.\res\PALETTE174_1.bin +# End Source File +# Begin Source File + +SOURCE=.\res\STRTABLE9999_1.bin +# End Source File +# Begin Source File + +SOURCE=.\res\T2.ico +# End Source File +# Begin Source File + +SOURCE=.\res\T2.rc2 +# End Source File +# Begin Source File + +SOURCE=.\res\T2TowerDoc.ico +# End Source File +# Begin Source File + +SOURCE=.\res\Toolbar.bmp +# End Source File +# End Group +# Begin Source File + +SOURCE=.\res\OBJMAP172_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\OBJMAP179_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\OBJMAP190_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG1000_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG1005_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG11000_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG1110_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG1111_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG178_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG4000_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG4001_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG4002_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG4003_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG4004_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG4005_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\T2DLG8001_1.txt +# End Source File +# Begin Source File + +SOURCE=.\res\WAVE1000_1.wav +# End Source File +# Begin Source File + +SOURCE=.\res\WAVE1001_1.wav +# End Source File +# Begin Source File + +SOURCE=.\res\WAVE1_1.wav +# End Source File +# End Target +# End Project diff --git a/src/T2.DSW b/src/T2.DSW new file mode 100644 index 0000000..9988a20 --- /dev/null +++ b/src/T2.DSW @@ -0,0 +1,41 @@ +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "T2"=.\T2.DSP - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "T2DLL"=.\T2DLL\T2DLL.DSP - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + @@ -1,16 +1,18 @@ +#include "StdAfx.h" #include "256CheckDialog.h" -#include "GlobalFunc.h" +#include "T2DLL/GlobalFunc.h" #include "T2.h" -#include "T2ClassFactory.h" -#include "T2DLL.h" -#include "T2GlobalData.h" -#include "T2MainWindow.h" -#include "T2Message.h" +#include "T2DLL/T2ClassFactory.h" +#include "T2DLL/T2DLL.h" +#include "T2DLL/T2GlobalData.h" +#include "T2DLL/T2Message.h" #include "T2OpenFileDialog.h" #include "T2OpenningWindow.h" #include "T2OpenSelectDlg.h" -#include "T2PluginLoader.h" -#include "T2PluginSpecifier.h" +#include "T2DLL/T2PluginLoader.h" +#include "T2DLL/T2PluginSpecifier.h" + +#include "T2MainWindow.h" #include "T2TowerDoc.h" #include "T2TowerMainView.h" @@ -21,10 +23,12 @@ static char THIS_FILE[] = __FILE__; #endif BEGIN_MESSAGE_MAP(CT2App, CWinApp) + //{{AFX_MSG_MAP(CT2App) ON_COMMAND(ID_APP_ABOUT, OnCmdAbout) ON_COMMAND(ID_FILE_OPEN, OnCmdOpen) - ON_COMMAND(ID_FILE_NEW, OnFileNew) - ON_COMMAND(ID_FILE_OPEN, OnFileOpen) + //}}AFX_MSG_MAP + ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew) + ON_COMMAND(ID_FILE_OPEN, CWinApp::OnFileOpen) END_MESSAGE_MAP() CT2App::CT2App() { @@ -37,7 +41,7 @@ CT2App theApp; static void setRegValue(HKEY rootKey, const char *subKey, const char *name, const char *value); /*virtual*/ BOOL CT2App::InitInstance() { - SetRegistryKey("OPeNBooK9003"); + SetRegistryKey(_T("OPeNBooK9003")); _DC = 1; @@ -115,7 +119,7 @@ static void setRegValue(HKEY rootKey, const char *subKey, const char *name, cons ReleaseDC(NULL, hdc); if (!isPaletteMode) { - C256ColorDialog dlg(NULL); + C256CheckDialog dlg(NULL); if (dlg.DoModal() != IDOK) return false; } @@ -125,7 +129,7 @@ static void setRegValue(HKEY rootKey, const char *subKey, const char *name, cons #line 161 CDocTemplate *pDocTemplate = new CSingleDocTemplate( - 128, + IDR_MAINFRAME, RUNTIME_CLASS(T2TowerDoc), RUNTIME_CLASS(T2MainWindow), RUNTIME_CLASS(T2TowerMainView) @@ -166,17 +170,26 @@ static void setRegValue(HKEY rootKey, const char *subKey, const char *name, cons RegCloseKey(key); } -class AboutDialog : public CDialog { - DECLARE_MESSAGE_MAP(); - +class CAboutDlg : public CDialog { public: - AboutDialog(); + CAboutDlg(); -protected: + //{{AFX_DATA(CAboutDlg) + enum { IDD = IDD_ABOUTBOX }; + //}}AFX_DATA + + //{{AFX_VIRTUAL(CAboutDlg) + protected: virtual void DoDataExchange(CDataExchange *pDX); + //}}AFX_VIRTUAL + +protected: + //{{AFX_MSG(CAboutDlg) afx_msg void OnTimer(UINT nIDEvent); afx_msg void OnDestroy(); afx_msg void OnShowWindow(BOOL bShow, UINT nStatus); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() int mCounter; CBitmap mBitmap; @@ -186,17 +199,20 @@ protected: BOOL mIsSetUp; }; -AboutDialog::AboutDialog() - : CDialog(100) +CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) { + //{{AFX_DATA_INIT(CAboutDlg) + //}}AFX_DATA_INIT mIsSetUp = false; } -/*virtual*/ void AboutDialog::DoDataExchange(CDataExchange *pDX) { +/*virtual*/ void CAboutDlg::DoDataExchange(CDataExchange *pDX) { CWnd::DoDataExchange(pDX); + //{{AFX_DATA_MAP(CAboutDlg) + //}}AFX_DATA_MAP } -void AboutDialog::OnShowWindow(BOOL bShow, UINT nStatus) { +void CAboutDlg::OnShowWindow(BOOL bShow, UINT nStatus) { CWnd::OnShowWindow(bShow, nStatus); if (!mIsSetUp) { @@ -206,13 +222,13 @@ void AboutDialog::OnShowWindow(BOOL bShow, UINT nStatus) { SetTimer(1, 50, NULL); - CWnd *logoItem = GetDlgItem(1026); + CWnd *logoItem = GetDlgItem(IDC_LOGO); logoItem->SetWindowPos(NULL, 16, 16, 0, 0, SWP_NOSIZE); RECT logoRect; logoItem->GetClientRect(&logoRect); - CWnd *serialLabelItem = GetDlgItem(1027); + CWnd *serialLabelItem = GetDlgItem(IDC_SERIAL_LABEL); serialLabelItem->SetWindowPos(NULL, 16, logoRect.bottom + 32, 0, 0, SWP_NOSIZE); RECT serialLabelRect; @@ -230,22 +246,22 @@ void AboutDialog::OnShowWindow(BOOL bShow, UINT nStatus) { niceSerialNo += " - "; niceSerialNo += serialNo.Mid(12, 4); - CWnd *serialItem = GetDlgItem(1024); + CWnd *serialItem = GetDlgItem(IDC_SERIAL_NUMBER); serialItem->SetWindowText(niceSerialNo); serialItem->SetWindowPos(NULL, serialLabelRect.right + 20, logoRect.bottom + 32, 0, 0, SWP_NOSIZE); - mBitmap.LoadBitmap(224); + mBitmap.LoadBitmap(IDB_CREDITS); BITMAP bitmap; mBitmap.GetBitmap(&bitmap); - CWnd *creditsWnd = GetDlgItem(1025); + CWnd *creditsWnd = GetDlgItem(IDC_CREDITS); mCreditsWidth = bitmap.bmWidth; mCreditsViewHeight = logoRect.bottom; creditsWnd->SetWindowPos(NULL, logoRect.right + 32, 16, mCreditsWidth, mCreditsViewHeight, 0); mCreditsFullHeight = bitmap.bmHeight; - CWnd *okButton = GetDlgItem(1); + CWnd *okButton = GetDlgItem(IDOK); RECT okRect; okButton->GetClientRect(&okRect); @@ -262,19 +278,19 @@ void AboutDialog::OnShowWindow(BOOL bShow, UINT nStatus) { } } -void AboutDialog::OnDestroy() { +void CAboutDlg::OnDestroy() { KillTimer(1); mBitmap.DeleteObject(); CWnd::OnDestroy(); } -void AboutDialog::OnTimer(UINT nIDEvent) { +void CAboutDlg::OnTimer(UINT nIDEvent) { #pragma var_order(prevBitmap, dc, newDC, creditsWnd) mCounter++; if (mCounter > (mCreditsFullHeight - mCreditsViewHeight)) mCounter = 0; - CWnd *creditsWnd = GetDlgItem(1025); + CWnd *creditsWnd = GetDlgItem(IDC_CREDITS); CDC newDC; CDC *dc = creditsWnd->GetDC(); @@ -288,15 +304,17 @@ void AboutDialog::OnTimer(UINT nIDEvent) { CWnd::OnTimer(nIDEvent); } -BEGIN_MESSAGE_MAP(AboutDialog, CDialog) +BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) + //{{AFX_MSG_MAP(CAboutDlg) ON_WM_TIMER() ON_WM_DESTROY() ON_WM_SHOWWINDOW() + //}}AFX_MSG_MAP END_MESSAGE_MAP() void CT2App::OnCmdAbout() { - AboutDialog dlg; - dlg.DoModal(); + CAboutDlg aboutDlg; + aboutDlg.DoModal(); } @@ -1,19 +1,23 @@ #pragma once -#include "common.h" -#define T2_APP ((CT2App *) AfxGetApp()) +#ifndef __AFXWIN_H__ +#error include 'stdafx.h' before including this file for PCH +#endif -class CT2App : public CWinApp { - DECLARE_MESSAGE_MAP() +#include "resource.h" // main symbols +#include "common.h" +class CT2App : public CWinApp { public: CT2App(); + //{{AFX_VIRTUAL(CT2App) virtual BOOL InitInstance(); virtual int Run(); virtual BOOL PreTranslateMessage(MSG *pMsg); virtual BOOL OnIdle(LONG lCount); virtual int ExitInstance(); + //}}AFX_VIRTUAL // modifies counter _DC - called from T2MoverModuleTable ctor // also called on Debug Step Run @@ -41,11 +45,13 @@ public: int _E4; T2Message *mMessage; -protected: + //{{AFX_MSG(CT2App) afx_msg void OnCmdAbout(); afx_msg void OnCmdOpen(); - - friend class T2OpenSelectDlg; + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; void ffDestroy(); + +#define T2_APP ((CT2App *) AfxGetApp()) diff --git a/src/T2.rc b/src/T2.rc new file mode 100644 index 0000000..df5915f --- /dev/null +++ b/src/T2.rc @@ -0,0 +1,724 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON DISCARDABLE "res\\ICON1_1.ico" +IDI_ICON2 ICON DISCARDABLE "res\\ICON2_1.ico" +IDI_ICON3 ICON DISCARDABLE "res\\ICON3_1.ico" +IDI_LEFT ICON DISCARDABLE "res\\ICON168_1.ico" +IDI_RIGHT ICON DISCARDABLE "res\\ICON169_1.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Toolbar +// + +IDR_MAINFRAME TOOLBAR DISCARDABLE 16, 15 +BEGIN + BUTTON ID_FILE_NEW + BUTTON ID_FILE_OPEN + BUTTON ID_FILE_SAVE + SEPARATOR + BUTTON ID_EDIT_CUT + BUTTON ID_EDIT_COPY + BUTTON ID_EDIT_PASTE + SEPARATOR + BUTTON ID_FILE_PRINT + BUTTON ID_APP_ABOUT +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_MAINFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE + MENUITEM "Save &As...", ID_FILE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "E&xit", ID_APP_EXIT + END + POPUP "Function" + BEGIN + MENUITEM "Pause", ID_PAUSE + MENUITEM "Setting...", ID_SETTING + MENUITEM "Hide Elevator Room", ID_HIDE_ELEVATOR_ROOM + END + MENUITEM "Favorite", ID_FAVORITE + POPUP "&Window" + BEGIN + MENUITEM "&Hide Control Window", ID_HIDE_CONTROL_WINDOW + , CHECKED + MENUITEM "&Hide Message Window", ID_HIDE_MESSAGE_WINDOW + , CHECKED + MENUITEM "&Hide Tool Window", ID_HIDE_TOOL_WINDOW, CHECKED + END + POPUP "&Help" + BEGIN + MENUITEM "&About T2...", ID_APP_ABOUT + END +END + +IDR_DEBUG_MENU MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE + MENUITEM "Save &As...", ID_FILE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "E&xit", ID_APP_EXIT + END + POPUP "Function" + BEGIN + MENUITEM "Pause", ID_PAUSE + MENUITEM "Setting...", ID_SETTING + MENUITEM "Hide Elevator Room", ID_HIDE_ELEVATOR_ROOM + END + MENUITEM "Favorite", ID_FAVORITE + POPUP "&Window" + BEGIN + MENUITEM "&Hide Control Window", ID_HIDE_CONTROL_WINDOW + , CHECKED + MENUITEM "&Hide Message Window", ID_HIDE_MESSAGE_WINDOW + , CHECKED + MENUITEM "&Hide Tool Window", ID_HIDE_TOOL_WINDOW, CHECKED + END + POPUP "&Debug" + BEGIN + POPUP "Display(&D)" + BEGIN + MENUITEM "Normal Display(&N)", ID_DBG_NORMAL_DISPLAY + MENUITEM "FloorInfo-Tenant(&T)", ID_DBG_FLOORINFO_TENANT + MENUITEM "FloorInfo-Mover(&M)", ID_DBG_FLOORINFO_MOVER + MENUITEM "FloorInfo-Request(&R)", ID_DBG_FLOORINFO_REQUEST + MENUITEM "BkgndInfo(&B)", ID_DBG_BKGNDINFO + MENUITEM SEPARATOR + MENUITEM "Pool(&O)", ID_DBG_POOL + MENUITEM "People(&P)", ID_DBG_PEOPLE + MENUITEM "Event(&E)", ID_DBG_EVENT + MENUITEM SEPARATOR + MENUITEM "Grid(&G)", ID_DBG_GRID + END + MENUITEM SEPARATOR + MENUITEM "Step Run(&S)", ID_DBG_STEP_RUN + MENUITEM SEPARATOR + POPUP "Speed measuring(&B)" + BEGIN + MENUITEM "Display speed measuring(&D)", ID_DBG_DISPLAY_SPEED_MEASURING + + MENUITEM "Offscreen speed measuring(&O)", + ID_DBG_OFFSCR_SPEED_MEASURING + + MENUITEM "IDLE Speed measuring(&I)", ID_DBG_IDLE_SPEED_MEASURING + + MENUITEM "All load measuring(&F)", ID_DBG_ALL_LOAD_MEASURING + + MENUITEM SEPARATOR + MENUITEM "Display IPS(&S)", ID_DBG_DISPLAY_IPS + END + MENUITEM SEPARATOR + MENUITEM "Grade UP(&U)\tAlt+U", ID_DBG_GRADE_UP + MENUITEM "Grade DOWN(&D)\tAlt+D", ID_DBG_GRADE_DOWN + END + POPUP "&Help" + BEGIN + MENUITEM "System Information(&I)...", ID_SYSTEM_INFO + MENUITEM SEPARATOR + MENUITEM "&About T2...", ID_APP_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE +BEGIN + "N", ID_FILE_NEW, VIRTKEY, CONTROL + "O", ID_FILE_OPEN, VIRTKEY, CONTROL + "S", ID_FILE_SAVE, VIRTKEY, CONTROL + VK_RWIN, ID_DBG_MODE, VIRTKEY, SHIFT, CONTROL, ALT +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 299, 195 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "About The Tower II" +FONT 9, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,245,170,42,14,WS_GROUP + CONTROL 223,IDC_LOGO,"Static",SS_BITMAP | SS_SUNKEN,5,5,20,20 + CONTROL "",IDC_CREDITS,"Static",SS_BLACKFRAME | SS_SUNKEN,195,5, + 95,161 + LTEXT "Serial No",IDC_SERIAL_LABEL,5,175,43,8 + LTEXT "0000-0000-0000-0000",IDC_SERIAL_NUMBER,55,175,85,8 +END + +IDD_ROUTING_TABLE DIALOG DISCARDABLE 0, 0, 344, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Routing table" +FONT 13, "FixedSys" +BEGIN + DEFPUSHBUTTON "OK",IDOK,287,219,50,14 + EDITTEXT IDC_ROUTING_TABLE_EDIT,4,5,334,208,ES_MULTILINE | + ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | + WS_HSCROLL +END + +IDD_WORLD_PLUGINS DIALOG DISCARDABLE 0, 0, 221, 103 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "World plugins" +FONT 9, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,164,83,50,14 + LISTBOX IDC_WORLD_PLUGIN_LIST,7,17,207,58,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LTEXT "World plugin",IDC_STATIC,7,7,90,8 + LTEXT "ToolPalette plugin",IDC_STATIC,7,76,83,8 + LISTBOX IDC_TOOLPALETTE_PLUGIN_LIST,7,44,207,21,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP +END + +IDD_DBG_STEP_RUN DIALOG DISCARDABLE 0, 0, 49, 31 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "DEBUG" +FONT 9, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "STEP",IDC_DBG_STEP,0,0,49,31 +END + +IDD_SYS_INFO DIALOG DISCARDABLE 0, 0, 264, 199 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "System information" +FONT 9, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,207,178,50,14 + GROUPBOX "Memory",IDC_STATIC,7,7,250,53 + GROUPBOX "Plugin",IDC_STATIC,7,64,250,108 + LTEXT "Free memory",IDC_STATIC,14,24,43,8 + LTEXT "Used memory",IDC_STATIC,14,40,44,8 + RTEXT "Static",IDC_FREE_MEMORY,62,24,35,8 + LTEXT "kBytes",IDC_STATIC,101,24,28,8 + RTEXT "Static",IDC_USED_MEMORY,62,40,35,8 + LTEXT "kBytes",IDC_STATIC,101,40,26,8 + CONTROL "List1",IDC_PLUGIN_LIST,"SysListView32",LVS_REPORT | + LVS_SORTASCENDING | LVS_NOLABELWRAP | WS_BORDER | + WS_TABSTOP,11,77,237,88 +END + +IDD_DBG_EQUIP_INFO DIALOG DISCARDABLE 0, 0, 233, 188 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Equip" +FONT 9, "MS Sans Serif" +BEGIN + LTEXT "EquipName",IDC_STATIC,7,6,37,8 + LTEXT "Static",IDC_EQUIP_NAME,50,6,51,8 + LTEXT "EquipID",IDC_STATIC,7,19,36,8 + LTEXT "Static",IDC_EQUIP_ID,50,19,36,8 + GROUPBOX "CrossEquipArray",IDC_STATIC,7,35,107,124 + CONTROL "List1",IDC_CROSS_EQUIP_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,13,46,95,109 + GROUPBOX "DebugInfo",IDC_DEBUG_INFO,119,35,107,124 + CONTROL "List1",IDC_DEBUG_INFO_LIST,"SysListView32",LVS_REPORT | + WS_BORDER | WS_TABSTOP,123,46,95,109 + DEFPUSHBUTTON "OK",IDOK,176,167,50,14 +END + +IDD_NEW_DLG_TMP DIALOG DISCARDABLE 0, 0, 187, 133 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 9, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,73,112,50,14 + PUSHBUTTON "Cancel",IDCANCEL,130,112,50,14 + CONTROL "",IDC_NEW_DLG_WORLDS,"Static",SS_BLACKFRAME,7,7,173,97 +END + +IDD_DBG_IPS DIALOG DISCARDABLE 0, 0, 74, 26 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IPS" +FONT 9, "MS Sans Serif" +BEGIN + RTEXT "Static",IDC_IPS,7,5,31,16,SS_CENTERIMAGE | SS_SUNKEN | + WS_BORDER + LTEXT "Idle/Sec",IDC_STATIC,41,9,29,8 +END + +IDD_DBG_EVENT_LIST DIALOGEX 0, 0, 230, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "EVENT" +FONT 9, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "List1",IDC_EVENT_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | + WS_TABSTOP,7,7,216,92,WS_EX_CLIENTEDGE + PUSHBUTTON "EVENT START",IDC_EVENT_START,7,104,77,14 + DEFPUSHBUTTON "Close",IDOK,173,104,50,14 +END + +IDD_256CHECK DIALOG DISCARDABLE 0, 0, 187, 97 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "The Tower II" +FONT 9, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,29,76,50,14 + PUSHBUTTON "NO",IDCANCEL,108,76,50,14 + LTEXT "Please set the display mode to 256 colors.\nThe game becomes slow or the display becomes strange.\n\nDo you want to continue?", + IDC_STATIC,7,7,173,46,SS_NOPREFIX + CONTROL "Message will not be displayed hereafter.", + IDC_DEFAULT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 35,58,117,10 +END + +IDD_SERIAL DIALOG DISCARDABLE 0, 0, 172, 115 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 9, "MS Sans Serif" +BEGIN + EDITTEXT IDC_SERIAL_1,14,49,25,14,ES_AUTOHSCROLL + EDITTEXT IDC_SERIAL_2,52,49,25,14,ES_AUTOHSCROLL + EDITTEXT IDC_SERIAL_3,90,49,25,14,ES_AUTOHSCROLL + EDITTEXT IDC_SERIAL_4,128,49,25,14,ES_AUTOHSCROLL + LTEXT "-",IDC_STATIC,43,52,8,8 + LTEXT "-",IDC_STATIC,81,52,8,8 + LTEXT "-",IDC_STATIC,119,52,8,8 + DEFPUSHBUTTON "OK",IDOK,115,79,50,14 +END + +1000 DIALOG DISCARDABLE 0, 0, 105, 22 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 14, "MS Sans Serif" +BEGIN + CTEXT "Confirming Plug-in files...",IDC_STATIC,7,7,91,8, + SS_CENTERIMAGE +END + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "T2 MFC Application\0" + VALUE "FileVersion", "1, 0, 0, 1\0" + VALUE "InternalName", "T2\0" + VALUE "LegalCopyright", "Copyright (C) 1997\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "T2.EXE\0" + VALUE "ProductName", "T2 Application\0" + VALUE "ProductVersion", "1, 0, 0, 1\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 210 + TOPMARGIN, 7 + BOTTOMMARGIN, 48 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_PATTERN_BRUSH BITMAP DISCARDABLE "res\\BITMAP170_1.bmp" +IDB_OPEN_SELECT BITMAP DISCARDABLE "res\\BITMAP172_1.bmp" +IDB_SPLASH_SCREEN BITMAP DISCARDABLE "res\\BITMAP175_1.bmp" +IDB_WORLD_SELECT BITMAP DISCARDABLE "res\\BITMAP179_1.bmp" +IDB_SETTINGS BITMAP DISCARDABLE "res\\BITMAP189_1.bmp" +IDB_LOGO BITMAP DISCARDABLE "res\\BITMAP223_1.bmp" +IDB_CREDITS BITMAP DISCARDABLE "res\\BITMAP224_1.bmp" +IDB_COPYRIGHT BITMAP DISCARDABLE "res\\BITMAP229_1.bmp" +IDB_ERROR BITMAP DISCARDABLE "res\\BITMAP32767_1.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Cursor +// + +IDC_INFO CURSOR DISCARDABLE "res\\CURSOR183_1.cur" +IDC_DESTRUCT CURSOR DISCARDABLE "res\\CURSOR184_1.cur" +IDC_MIC CURSOR DISCARDABLE "res\\CURSOR185_1.cur" +IDC_FINGER CURSOR DISCARDABLE "res\\CURSOR187_1.cur" +IDC_FINGER_B CURSOR DISCARDABLE "res\\CURSOR188_1.cur" +IDC_HAND CURSOR DISCARDABLE "res\\CURSOR189_1.cur" +IDC_HAND_B CURSOR DISCARDABLE "res\\CURSOR190_1.cur" +IDC_SEARCH_RANGE CURSOR DISCARDABLE "res\\CURSOR192_1.cur" +IDC_INFO_B CURSOR DISCARDABLE "res\\CURSOR193_1.cur" +IDC_DESTRUCT_B CURSOR DISCARDABLE "res\\CURSOR194_1.cur" +IDC_ZOOM CURSOR DISCARDABLE "res\\CURSOR195_1.cur" +IDC_T2_NO CURSOR DISCARDABLE "res\\CURSOR210_1.cur" + +///////////////////////////////////////////////////////////////////////////// +// +// OBJMAP +// + +172 OBJMAP MOVEABLE PURE "res\\OBJMAP172_1.txt" +IDB_WORLD_SELECT OBJMAP MOVEABLE PURE "res\\OBJMAP179_1.txt" +190 OBJMAP MOVEABLE PURE "res\\OBJMAP190_1.txt" + +///////////////////////////////////////////////////////////////////////////// +// +// PALETTE +// + +100 PALETTE MOVEABLE PURE "res\\PALETTE100_1.bin" +174 PALETTE MOVEABLE PURE "res\\PALETTE174_1.bin" + +///////////////////////////////////////////////////////////////////////////// +// +// STRTABLE +// + +9999 STRTABLE MOVEABLE PURE "res\\STRTABLE9999_1.bin" + +///////////////////////////////////////////////////////////////////////////// +// +// T2DLG +// + +ID_WORLD_SELECT_T2DLG T2DLG MOVEABLE PURE "res\\T2DLG178_1.txt" +1000 T2DLG MOVEABLE PURE "res\\T2DLG1000_1.txt" +1005 T2DLG MOVEABLE PURE "res\\T2DLG1005_1.txt" +1110 T2DLG MOVEABLE PURE "res\\T2DLG1110_1.txt" +1111 T2DLG MOVEABLE PURE "res\\T2DLG1111_1.txt" +4000 T2DLG MOVEABLE PURE "res\\T2DLG4000_1.txt" +4001 T2DLG MOVEABLE PURE "res\\T2DLG4001_1.txt" +4002 T2DLG MOVEABLE PURE "res\\T2DLG4002_1.txt" +4003 T2DLG MOVEABLE PURE "res\\T2DLG4003_1.txt" +4004 T2DLG MOVEABLE PURE "res\\T2DLG4004_1.txt" +4005 T2DLG MOVEABLE PURE "res\\T2DLG4005_1.txt" +8001 T2DLG MOVEABLE PURE "res\\T2DLG8001_1.txt" +11000 T2DLG MOVEABLE PURE "res\\T2DLG11000_1.txt" + +///////////////////////////////////////////////////////////////////////////// +// +// WAVE +// + +1 WAVE MOVEABLE PURE "res\\WAVE1_1.wav" +1000 WAVE MOVEABLE PURE "res\\WAVE1000_1.wav" +1001 WAVE MOVEABLE PURE "res\\WAVE1001_1.wav" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE PRELOAD DISCARDABLE +BEGIN + IDR_MAINFRAME "T2\n\nT2\nBuilding file (.bld)\n.bld\nT2.Document\nT2 Document" +END + +STRINGTABLE PRELOAD DISCARDABLE +BEGIN + 1024 "No demands." + 1025 "Need a more direct route to destination." + 1026 "Elevator is a bit far away." + 1027 "Elevator is far away." + 1028 "is a bit far away." + 1029 "is far away." + 1030 "Power is down." + 1031 "Uncle Reggae is noisy and annoying." + 1032 "There are no restaurants nearby." + 1033 "Requires its own parking space." + 1034 "Requires a Doctor's office nearby." + 1035 "The residents have left because of the bad atmosphere." + 1036 "There's no Trash Facility." + 1037 "Item not connected to Trash Facility." + 1038 "Full of garbage." + 1039 "Forced to close." +END + +STRINGTABLE PRELOAD DISCARDABLE +BEGIN + 1040 "Conditions are too bad" + 1041 "There aren't many customers." + 1042 "There are a few customers." + 1043 "Business is booming." + 1044 "There are many customers due to the weekend." + 1045 "There are fewer customers because its a rainy day." + 1046 "Will be opened tomorrow." + 1047 "Beds are not made." + 1048 "Room is too dirty." + 1049 "Room is not connected to the front desk." +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_ZOOM_100_PERCENT "????100%\n????100%" + ID_ZOOM_50_PERCENT "????50%\n????50%" + ID_ZOOM_25_PERCENT "????25%\n????25%" + ID_DBG_NORMAL_DISPLAY "Normal Display" + ID_DBG_FLOORINFO_TENANT "FloorInfo" + ID_DBG_BKGNDINFO "BkgndInfo" + ID_SYSTEM_INFO "System information" + ID_DBG_STEP_RUN "Step Run" + ID_DBG_GRID "Grid" + ID_DBG_CROSS_EQUIP "CrollEquip" + ID_DBG_DISPLAY_SPEED_MEASURING "display speed measuring." +END + +STRINGTABLE PRELOAD DISCARDABLE +BEGIN + AFX_IDS_APP_TITLE "T2" + AFX_IDS_IDLEMESSAGE "Ready" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_INDICATOR_EXT "EXT" + ID_INDICATOR_CAPS "CAP" + ID_INDICATOR_NUM "NUM" + ID_INDICATOR_SCRL "SCRL" + ID_INDICATOR_OVR "OVR" + ID_INDICATOR_REC "REC" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_NEW "Create a new document\nNew" + ID_FILE_OPEN "Open an existing document\nOpen" + ID_FILE_CLOSE "Close the active document\nClose" + ID_FILE_SAVE "Save the active document\nSave" + ID_FILE_SAVE_AS "Save the active document with a new name\nSave As" + ID_FILE_PAGE_SETUP "Change the printing options\nPage Setup" + ID_FILE_PRINT_SETUP "Change the printer and printing options\nPrint Setup" + ID_FILE_PRINT "Print the active document\nPrint" + ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_APP_ABOUT "Display program information, version number and copyright\nAbout" + ID_APP_EXIT "Quit the application; prompts to save documents\nExit" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_MRU_FILE1 "Open this document" + ID_FILE_MRU_FILE2 "Open this document" + ID_FILE_MRU_FILE3 "Open this document" + ID_FILE_MRU_FILE4 "Open this document" + ID_FILE_MRU_FILE5 "Open this document" + ID_FILE_MRU_FILE6 "Open this document" + ID_FILE_MRU_FILE7 "Open this document" + ID_FILE_MRU_FILE8 "Open this document" + ID_FILE_MRU_FILE9 "Open this document" + ID_FILE_MRU_FILE10 "Open this document" + ID_FILE_MRU_FILE11 "Open this document" + ID_FILE_MRU_FILE12 "Open this document" + ID_FILE_MRU_FILE13 "Open this document" + ID_FILE_MRU_FILE14 "Open this document" + ID_FILE_MRU_FILE15 "Open this document" + ID_FILE_MRU_FILE16 "Open this document" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_NEXT_PANE "Switch to the next window pane\nNext Pane" + ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_WINDOW_SPLIT "Split the active window into panes\nSplit" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_EDIT_CLEAR "Erase the selection\nErase" + ID_EDIT_CLEAR_ALL "Erase everything\nErase All" + ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy" + ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut" + ID_EDIT_FIND "Find the specified text\nFind" + ID_EDIT_PASTE "Insert Clipboard contents\nPaste" + ID_EDIT_REPEAT "Repeat the last action\nRepeat" + ID_EDIT_REPLACE "Replace specific text with different text\nReplace" + ID_EDIT_SELECT_ALL "Select the entire document\nSelect All" + ID_EDIT_UNDO "Undo the last action\nUndo" + ID_EDIT_REDO "Redo the previously undone action\nRedo" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar" + ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar" +END + +STRINGTABLE DISCARDABLE +BEGIN + AFX_IDS_SCSIZE "Change the window size" + AFX_IDS_SCMOVE "Change the window position" + AFX_IDS_SCMINIMIZE "Reduce the window to an icon" + AFX_IDS_SCMAXIMIZE "Enlarge the window to full size" + AFX_IDS_SCNEXTWINDOW "Switch to the next document window" + AFX_IDS_SCPREVWINDOW "Switch to the previous document window" + AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents" +END + +STRINGTABLE DISCARDABLE +BEGIN + AFX_IDS_SCRESTORE "Restore the window to normal size" + AFX_IDS_SCTASKLIST "Activate Task List" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// English (U.K.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#define _AFX_NO_SPLITTER_RESOURCES\r\n" + "#define _AFX_NO_OLE_RESOURCES\r\n" + "#define _AFX_NO_TRACKER_RESOURCES\r\n" + "#define _AFX_NO_PROPERTY_RESOURCES\r\n" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" + "#ifdef _WIN32\r\n" + "LANGUAGE 9, 1\r\n" + "#pragma code_page(1252)\r\n" + "#endif\r\n" + "#include ""res\\T2.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""afxres.rc"" // Standard components\r\n" + "#include ""afxprint.rc"" // printing/print preview resources\r\n" + "#endif\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.K.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#define _AFX_NO_SPLITTER_RESOURCES +#define _AFX_NO_OLE_RESOURCES +#define _AFX_NO_TRACKER_RESOURCES +#define _AFX_NO_PROPERTY_RESOURCES + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE 9, 1 +#pragma code_page(1252) +#endif +#include "res\T2.rc2" // non-Microsoft Visual C++ edited resources +#include "afxres.rc" // Standard components +#include "afxprint.rc" // printing/print preview resources +#endif +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/src/T2CtrlPalette.cpp b/src/T2CtrlPalette.cpp index d751a9c..1bd41fc 100644 --- a/src/T2CtrlPalette.cpp +++ b/src/T2CtrlPalette.cpp @@ -1,8 +1,9 @@ +#include "StdAfx.h" #include "T2CtrlPalette.h" -#include "T2ImageObj.h" +#include "T2DLL/T2ImageObj.h" #include "T2MWControl.h" #include "T2TowerDoc.h" -#include "T2WorldDef.h" +#include "T2DLL/T2WorldDef.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -42,10 +43,12 @@ T2CtrlPalette::T2CtrlPalette() { } BEGIN_MESSAGE_MAP(T2CtrlPalette, CFrameWnd) + //{{AFX_MSG_MAP(T2CtrlPalette) ON_WM_CREATE() ON_WM_QUERYNEWPALETTE() ON_WM_ERASEBKGND() ON_WM_CLOSE() + //}}AFX_MSG_MAP END_MESSAGE_MAP() /*virtual*/ void T2CtrlPalette::SetDocument(T2TowerDoc *inDoc) { diff --git a/src/T2CtrlPalette.h b/src/T2CtrlPalette.h index b262fee..a400a3a 100644 --- a/src/T2CtrlPalette.h +++ b/src/T2CtrlPalette.h @@ -2,8 +2,6 @@ #include "common.h" class T2CtrlPalette : public CFrameWnd { - DECLARE_MESSAGE_MAP() - public: T2CtrlPalette(); virtual ~T2CtrlPalette(); @@ -27,11 +25,17 @@ public: T2WorldDef *mWorldDef; BOOL mIsSetUp; + //{{AFX_VIRTUAL(T2CtrlPalette) + //}}AFX_VIRTUAL + protected: + //{{AFX_MSG(T2CtrlPalette) afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); afx_msg BOOL OnQueryNewPalette(); afx_msg BOOL OnEraseBkgnd(CDC* pDC); afx_msg void OnClose(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() static int sUnknown; }; diff --git a/src/T2DLL/CDefRsrcPlugin.cpp b/src/T2DLL/CDefRsrcPlugin.cpp index 20b1d90..8c17f23 100644 --- a/src/T2DLL/CDefRsrcPlugin.cpp +++ b/src/T2DLL/CDefRsrcPlugin.cpp @@ -1,5 +1,6 @@ +#include "StdAfx.h" #define ATOI_KLUDGE -#include "common.h" +#include "../common.h" // this is a horrible, horrible hack // because CDefRsrcPlugin is the first TU diff --git a/src/T2DLL/CDefRsrcPlugin.h b/src/T2DLL/CDefRsrcPlugin.h index ece42df..98a661f 100644 --- a/src/T2DLL/CDefRsrcPlugin.h +++ b/src/T2DLL/CDefRsrcPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CDEFRSRCPLUGIN_H +#define T2DLL_CDEFRSRCPLUGIN_H +#include "../common.h" #include "CPlugin.h" class AFX_CLASS_EXPORT CDefRsrcPlugin : public CPlugin { @@ -11,3 +12,4 @@ public: CString mStr48; }; +#endif diff --git a/src/T2DLL/CEditWFocus.cpp b/src/T2DLL/CEditWFocus.cpp index 0892aad..8647f2d 100644 --- a/src/T2DLL/CEditWFocus.cpp +++ b/src/T2DLL/CEditWFocus.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #define DONT_INCLUDE_AFXTEMPL #include "CEditWFocus.h" diff --git a/src/T2DLL/CEditWFocus.h b/src/T2DLL/CEditWFocus.h index 5c385cf..c3fbfe7 100644 --- a/src/T2DLL/CEditWFocus.h +++ b/src/T2DLL/CEditWFocus.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CEDITWFOCUS_H +#define T2DLL_CEDITWFOCUS_H +#include "../common.h" class CEditWFocus : public CEdit { DECLARE_MESSAGE_MAP() @@ -12,3 +13,4 @@ protected: afx_msg void OnKillFocus(CWnd* pNewWnd); afx_msg void OnSetFocus(CWnd* pOldWnd); }; +#endif diff --git a/src/T2DLL/CFilePlugin.cpp b/src/T2DLL/CFilePlugin.cpp index 71d1885..02442f9 100644 --- a/src/T2DLL/CFilePlugin.cpp +++ b/src/T2DLL/CFilePlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CFilePlugin.h" #include "CPluginInfo.h" #include "CResFile.h" diff --git a/src/T2DLL/CFilePlugin.h b/src/T2DLL/CFilePlugin.h index ad6e16f..0c1578c 100644 --- a/src/T2DLL/CFilePlugin.h +++ b/src/T2DLL/CFilePlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CFILEPLUGIN_H +#define T2DLL_CFILEPLUGIN_H +#include "../common.h" #include "CPlugin.h" class CPluginInfo; @@ -33,3 +34,4 @@ protected: int mMustItem; CString mPluginName; }; +#endif diff --git a/src/T2DLL/CFilePluginDB.cpp b/src/T2DLL/CFilePluginDB.cpp index 65afb4d..cf08046 100644 --- a/src/T2DLL/CFilePluginDB.cpp +++ b/src/T2DLL/CFilePluginDB.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CFilePlugin.h" #include "CFilePluginDB.h" #include "CFilePluginList.h" diff --git a/src/T2DLL/CFilePluginDB.h b/src/T2DLL/CFilePluginDB.h index d92ec3d..dc74b4e 100644 --- a/src/T2DLL/CFilePluginDB.h +++ b/src/T2DLL/CFilePluginDB.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CFILEPLUGINDB_H +#define T2DLL_CFILEPLUGINDB_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT CFilePluginDB : public LArray { @@ -9,3 +10,4 @@ public: virtual void Add(CFilePlugin* plugin); virtual CFilePluginList* GetFilePluginList(DWORD pluginType); }; +#endif diff --git a/src/T2DLL/CFilePluginList.cpp b/src/T2DLL/CFilePluginList.cpp index d55a841..283e16a 100644 --- a/src/T2DLL/CFilePluginList.cpp +++ b/src/T2DLL/CFilePluginList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CFilePlugin.h" #include "CFilePluginList.h" diff --git a/src/T2DLL/CFilePluginList.h b/src/T2DLL/CFilePluginList.h index 9eb31b1..41e80d8 100644 --- a/src/T2DLL/CFilePluginList.h +++ b/src/T2DLL/CFilePluginList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CFILEPLUGINLIST_H +#define T2DLL_CFILEPLUGINLIST_H +#include "../common.h" class AFX_CLASS_EXPORT CFilePluginList : public CList<CFilePlugin *, CFilePlugin *> { public: @@ -16,3 +17,4 @@ public: protected: DWORD mPluginType; }; +#endif diff --git a/src/T2DLL/CLink.cpp b/src/T2DLL/CLink.cpp index 88f63bc..871c34c 100644 --- a/src/T2DLL/CLink.cpp +++ b/src/T2DLL/CLink.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CLink.h" CLink::CLink() { diff --git a/src/T2DLL/CLink.h b/src/T2DLL/CLink.h index ed7304a..1049b40 100644 --- a/src/T2DLL/CLink.h +++ b/src/T2DLL/CLink.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CLINK_H +#define T2DLL_CLINK_H +#include "../common.h" class AFX_CLASS_EXPORT CLink { public: @@ -37,3 +38,4 @@ private: CLink *mStart; CLink *mCurrent; }; +#endif diff --git a/src/T2DLL/CObjectList.cpp b/src/T2DLL/CObjectList.cpp index 8aa761d..de0fb01 100644 --- a/src/T2DLL/CObjectList.cpp +++ b/src/T2DLL/CObjectList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CObjectList.h" CObjectList::CObjectList() { diff --git a/src/T2DLL/CObjectList.h b/src/T2DLL/CObjectList.h index 6141747..04c6e8c 100644 --- a/src/T2DLL/CObjectList.h +++ b/src/T2DLL/CObjectList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_COBJECTLIST_H +#define T2DLL_COBJECTLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT CObjectList : public LArray { @@ -8,3 +9,4 @@ public: virtual ~CObjectList(); virtual void AllClear(); }; +#endif diff --git a/src/T2DLL/CObjectQueue.cpp b/src/T2DLL/CObjectQueue.cpp index 20c94c2..f813e7f 100644 --- a/src/T2DLL/CObjectQueue.cpp +++ b/src/T2DLL/CObjectQueue.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CObjectQueue.h" CObjectQueue::CObjectQueue() { diff --git a/src/T2DLL/CObjectQueue.h b/src/T2DLL/CObjectQueue.h index 19a5519..e5fd0d1 100644 --- a/src/T2DLL/CObjectQueue.h +++ b/src/T2DLL/CObjectQueue.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_COBJECTQUEUE_H +#define T2DLL_COBJECTQUEUE_H +#include "../common.h" class AFX_CLASS_EXPORT CObjectQueue : public CList<void*, void*> { public: @@ -10,3 +11,4 @@ public: virtual unsigned int GetItemCount(); void RemoveItem(POSITION); }; +#endif diff --git a/src/T2DLL/CPEFile.cpp b/src/T2DLL/CPEFile.cpp index 46ce23b..05a88a8 100644 --- a/src/T2DLL/CPEFile.cpp +++ b/src/T2DLL/CPEFile.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #define DONT_INCLUDE_AFXTEMPL #include "CPEFile.h" diff --git a/src/T2DLL/CPEFile.h b/src/T2DLL/CPEFile.h index 3e566f8..4a3a03c 100644 --- a/src/T2DLL/CPEFile.h +++ b/src/T2DLL/CPEFile.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CPEFILE_H +#define T2DLL_CPEFILE_H +#include "../common.h" struct RESTRACKERWORK { int didRead; @@ -40,3 +41,4 @@ private: unsigned long mStartPosition; unsigned long mLength; }; +#endif diff --git a/src/T2DLL/CPieChartView.cpp b/src/T2DLL/CPieChartView.cpp index 890aab5..4ee4cf2 100644 --- a/src/T2DLL/CPieChartView.cpp +++ b/src/T2DLL/CPieChartView.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CPieChartView.h" #include "T2Archive.h" #include "URect.h" diff --git a/src/T2DLL/CPieChartView.h b/src/T2DLL/CPieChartView.h index 6354cc7..491b404 100644 --- a/src/T2DLL/CPieChartView.h +++ b/src/T2DLL/CPieChartView.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CPIECHARTVIEW_H +#define T2DLL_CPIECHARTVIEW_H +#include "../common.h" class AFX_CLASS_EXPORT CPieChartView : public CWnd { public: @@ -25,3 +26,4 @@ protected: int mBorderWidth; const Pie *mPie; }; +#endif diff --git a/src/T2DLL/CPiledMultiBarChartView.cpp b/src/T2DLL/CPiledMultiBarChartView.cpp index b39450a..246a4ec 100644 --- a/src/T2DLL/CPiledMultiBarChartView.cpp +++ b/src/T2DLL/CPiledMultiBarChartView.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CPiledMultiBarChartView.h" #include "T2Archive.h" diff --git a/src/T2DLL/CPiledMultiBarChartView.h b/src/T2DLL/CPiledMultiBarChartView.h index d16637d..368ad62 100644 --- a/src/T2DLL/CPiledMultiBarChartView.h +++ b/src/T2DLL/CPiledMultiBarChartView.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CPILEDMULTIBARCHARTVIEW_H +#define T2DLL_CPILEDMULTIBARCHARTVIEW_H +#include "../common.h" class AFX_CLASS_EXPORT CPiledMultiBarChartView : public CWnd { public: @@ -31,3 +32,4 @@ protected: COLORREF *mColorOfPiles; const GraphData *mGraphData; }; +#endif diff --git a/src/T2DLL/CPlugin.cpp b/src/T2DLL/CPlugin.cpp index a6f71c3..7525062 100644 --- a/src/T2DLL/CPlugin.cpp +++ b/src/T2DLL/CPlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CPlugin.h" #ifdef _DEBUG diff --git a/src/T2DLL/CPlugin.h b/src/T2DLL/CPlugin.h index 5bf7d37..5a6f8c0 100644 --- a/src/T2DLL/CPlugin.h +++ b/src/T2DLL/CPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CPLUGIN_H +#define T2DLL_CPLUGIN_H +#include "../common.h" #include "T2PluginSpecifier.h" class AFX_CLASS_EXPORT CPlugin { @@ -26,3 +27,4 @@ public: HINSTANCE mModuleHandle; T2ImageObj *mImageObj; }; +#endif diff --git a/src/T2DLL/CPluginInfo.cpp b/src/T2DLL/CPluginInfo.cpp index e836e42..6715220 100644 --- a/src/T2DLL/CPluginInfo.cpp +++ b/src/T2DLL/CPluginInfo.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CPluginInfo.h" #include "T2Archive.h" diff --git a/src/T2DLL/CPluginInfo.h b/src/T2DLL/CPluginInfo.h index cec185d..dbd9987 100644 --- a/src/T2DLL/CPluginInfo.h +++ b/src/T2DLL/CPluginInfo.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CPLUGININFO_H +#define T2DLL_CPLUGININFO_H +#include "../common.h" class AFX_CLASS_EXPORT CPluginInfo { public: @@ -31,3 +32,4 @@ protected: friend class T2TowerDoc; }; +#endif diff --git a/src/T2DLL/CPluginInfoArray.cpp b/src/T2DLL/CPluginInfoArray.cpp index ec38e3d..a22a76a 100644 --- a/src/T2DLL/CPluginInfoArray.cpp +++ b/src/T2DLL/CPluginInfoArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CPluginInfo.h" #include "CPluginInfoArray.h" #include "CPluginInfoComparator.h" diff --git a/src/T2DLL/CPluginInfoArray.h b/src/T2DLL/CPluginInfoArray.h index a03f0fb..a2e3905 100644 --- a/src/T2DLL/CPluginInfoArray.h +++ b/src/T2DLL/CPluginInfoArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CPLUGININFOARRAY_H +#define T2DLL_CPLUGININFOARRAY_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT CPluginInfoArray : public LArray { @@ -11,3 +12,4 @@ public: protected: BOOL mOwnsPluginInfo; }; +#endif diff --git a/src/T2DLL/CPluginInfoComparator.cpp b/src/T2DLL/CPluginInfoComparator.cpp index 1886613..4282331 100644 --- a/src/T2DLL/CPluginInfoComparator.cpp +++ b/src/T2DLL/CPluginInfoComparator.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CPluginInfo.h" #include "CPluginInfoComparator.h" diff --git a/src/T2DLL/CPluginInfoComparator.h b/src/T2DLL/CPluginInfoComparator.h index d810490..3aaebbe 100644 --- a/src/T2DLL/CPluginInfoComparator.h +++ b/src/T2DLL/CPluginInfoComparator.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CPLUGININFOCOMPARATOR_H +#define T2DLL_CPLUGININFOCOMPARATOR_H +#include "../common.h" #include "LComparator.h" class AFX_CLASS_EXPORT CPluginInfoComparator : public LComparator { @@ -13,3 +14,4 @@ public: protected: static CPluginInfoComparator* sCPluginInfoComparator; }; +#endif diff --git a/src/T2DLL/CProgramPlugin.cpp b/src/T2DLL/CProgramPlugin.cpp index e3c28aa..35d2c4e 100644 --- a/src/T2DLL/CProgramPlugin.cpp +++ b/src/T2DLL/CProgramPlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CProgramPlugin.h" CProgramPlugin::CProgramPlugin(DWORD type, T2PluginSpecifier& specifier) diff --git a/src/T2DLL/CProgramPlugin.h b/src/T2DLL/CProgramPlugin.h index 27ac4d7..5c070b5 100644 --- a/src/T2DLL/CProgramPlugin.h +++ b/src/T2DLL/CProgramPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CPROGRAMPLUGIN_H +#define T2DLL_CPROGRAMPLUGIN_H +#include "../common.h" #include "CFilePlugin.h" class AFX_CLASS_EXPORT CProgramPlugin : public CFilePlugin { @@ -18,3 +19,4 @@ public: protected: T2TemplatePlugin *mTemplatePlugin; }; +#endif diff --git a/src/T2DLL/CResFile.cpp b/src/T2DLL/CResFile.cpp index 27777a9..f481729 100644 --- a/src/T2DLL/CResFile.cpp +++ b/src/T2DLL/CResFile.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #define ATOI_KLUDGE #include "CPEFile.h" #include "CResFile.h" diff --git a/src/T2DLL/CResFile.h b/src/T2DLL/CResFile.h index 26dd4a6..020f399 100644 --- a/src/T2DLL/CResFile.h +++ b/src/T2DLL/CResFile.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CRESFILE_H +#define T2DLL_CRESFILE_H +#include "../common.h" class AFX_CLASS_EXPORT CResFile { public: @@ -48,3 +49,4 @@ private: unsigned int mRemaining; BOOL mIsSubPlugin; }; +#endif diff --git a/src/T2DLL/CResourcePlugin.cpp b/src/T2DLL/CResourcePlugin.cpp index 833d601..6d345e9 100644 --- a/src/T2DLL/CResourcePlugin.cpp +++ b/src/T2DLL/CResourcePlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResourcePlugin.h" CResourcePlugin::CResourcePlugin(DWORD type, T2PluginSpecifier& specifier) diff --git a/src/T2DLL/CResourcePlugin.h b/src/T2DLL/CResourcePlugin.h index 8153236..4b2f7b2 100644 --- a/src/T2DLL/CResourcePlugin.h +++ b/src/T2DLL/CResourcePlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CRESOURCEPLUGIN_H +#define T2DLL_CRESOURCEPLUGIN_H +#include "../common.h" #include "CFilePlugin.h" class AFX_CLASS_EXPORT CResourcePlugin : public CFilePlugin { @@ -12,3 +13,4 @@ public: protected: int m68; // unknown }; +#endif diff --git a/src/T2DLL/CToggleButtonDisabled.cpp b/src/T2DLL/CToggleButtonDisabled.cpp index a175bbc..277fdd7 100644 --- a/src/T2DLL/CToggleButtonDisabled.cpp +++ b/src/T2DLL/CToggleButtonDisabled.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CToggleButtonDisabled.h" #include "T2BitImage.h" diff --git a/src/T2DLL/CToggleButtonDisabled.h b/src/T2DLL/CToggleButtonDisabled.h index dc52a93..453df03 100644 --- a/src/T2DLL/CToggleButtonDisabled.h +++ b/src/T2DLL/CToggleButtonDisabled.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CTOGGLEBUTTONDISABLED_H +#define T2DLL_CTOGGLEBUTTONDISABLED_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT CToggleButtonDisabled : public T2DlgItem { @@ -15,3 +16,4 @@ protected: virtual void OnT2DlgItemLButtonUp(UINT nFlags, CPoint pt); virtual void OnT2DlgItemMouseMove(UINT nFlags, CPoint pt); }; +#endif diff --git a/src/T2DLL/CTokenizer.cpp b/src/T2DLL/CTokenizer.cpp index 215ffbc..b13b92e 100644 --- a/src/T2DLL/CTokenizer.cpp +++ b/src/T2DLL/CTokenizer.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #define DONT_INCLUDE_AFXTEMPL #include "CTokenizer.h" diff --git a/src/T2DLL/CTokenizer.h b/src/T2DLL/CTokenizer.h index 080d5cd..bcf2283 100644 --- a/src/T2DLL/CTokenizer.h +++ b/src/T2DLL/CTokenizer.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_CTOKENIZER_H +#define T2DLL_CTOKENIZER_H +#include "../common.h" class AFX_CLASS_EXPORT CTokenizer { public: @@ -31,3 +32,4 @@ protected: const char *mNewLineChars; const char *mSpaceChars; }; +#endif diff --git a/src/T2DLL/GlobalFunc.cpp b/src/T2DLL/GlobalFunc.cpp index 71139b0..67f3fd1 100644 --- a/src/T2DLL/GlobalFunc.cpp +++ b/src/T2DLL/GlobalFunc.cpp @@ -1,10 +1,11 @@ +#include "StdAfx.h" #define ATOI_KLUDGE #include "CResFile.h" #include "GlobalFunc.h" #include "T2BitImage.h" #include "T2DLL.h" #include "T2OptionPluginList.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" char *strtokEx(char * inStr, const char * inSep, char ** ioLast) { diff --git a/src/T2DLL/GlobalFunc.h b/src/T2DLL/GlobalFunc.h index fa658bd..f0a3589 100644 --- a/src/T2DLL/GlobalFunc.h +++ b/src/T2DLL/GlobalFunc.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_GLOBALFUNC_H +#define T2DLL_GLOBALFUNC_H +#include "../common.h" // these are horrible kludges used by LoadStringTable #define INSTANCE_EXE ((HINSTANCE) 1) @@ -44,3 +45,4 @@ AFX_API_EXPORT void WriteMachineProfileString(const char * inKey, const char * i AFX_API_EXPORT void WriteMachineProfileInt(const char * inKey, const char * inName, int inValue); AFX_API_EXPORT CString GetMachineProfileString(const char * inKey, const char * inName, const char * inDefaultValue); AFX_API_EXPORT int GetMachineProfileInt(const char * inKey, const char * inName, int inDefaultValue); +#endif diff --git a/src/T2DLL/LArray.cpp b/src/T2DLL/LArray.cpp index 53c44ce..15709fe 100644 --- a/src/T2DLL/LArray.cpp +++ b/src/T2DLL/LArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "LArray.h" #include "T2Archive.h" diff --git a/src/T2DLL/LArray.h b/src/T2DLL/LArray.h index 7d259a5..db49291 100644 --- a/src/T2DLL/LArray.h +++ b/src/T2DLL/LArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_LARRAY_H +#define T2DLL_LARRAY_H +#include "../common.h" #include "LComparator.h" class AFX_CLASS_EXPORT LArray { @@ -58,3 +59,4 @@ private: int mNextIndex; int mCurrentIndex; }; +#endif diff --git a/src/T2DLL/LAttachable.cpp b/src/T2DLL/LAttachable.cpp index 31f3aaa..7ec8afa 100644 --- a/src/T2DLL/LAttachable.cpp +++ b/src/T2DLL/LAttachable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "LArray.h" #include "LAttachable.h" #include "LAttachment.h" diff --git a/src/T2DLL/LAttachable.h b/src/T2DLL/LAttachable.h index 58e013d..6c33425 100644 --- a/src/T2DLL/LAttachable.h +++ b/src/T2DLL/LAttachable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_LATTACHABLE_H +#define T2DLL_LATTACHABLE_H +#include "../common.h" class AFX_CLASS_EXPORT LAttachable { public: @@ -18,3 +19,4 @@ protected: LArray *mAttachments; }; +#endif diff --git a/src/T2DLL/LAttachment.cpp b/src/T2DLL/LAttachment.cpp index da83c32..dfe631c 100644 --- a/src/T2DLL/LAttachment.cpp +++ b/src/T2DLL/LAttachment.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "LAttachable.h" #include "LAttachment.h" diff --git a/src/T2DLL/LAttachment.h b/src/T2DLL/LAttachment.h index a352628..4eee56a 100644 --- a/src/T2DLL/LAttachment.h +++ b/src/T2DLL/LAttachment.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_LATTACHMENT_H +#define T2DLL_LATTACHMENT_H +#include "../common.h" class AFX_CLASS_EXPORT LAttachment { public: @@ -24,3 +25,4 @@ protected: unsigned int mMessage; BOOL mExecuteHost; }; +#endif diff --git a/src/T2DLL/LBroadcaster.cpp b/src/T2DLL/LBroadcaster.cpp index 3486ce9..891e2fa 100644 --- a/src/T2DLL/LBroadcaster.cpp +++ b/src/T2DLL/LBroadcaster.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "LBroadcaster.h" #include "LListener.h" diff --git a/src/T2DLL/LBroadcaster.h b/src/T2DLL/LBroadcaster.h index 77a6f70..0931c58 100644 --- a/src/T2DLL/LBroadcaster.h +++ b/src/T2DLL/LBroadcaster.h @@ -1,6 +1,7 @@ -#pragma once +#ifndef T2DLL_LBROADCASTER_H +#define T2DLL_LBROADCASTER_H #define DONT_INCLUDE_AFXTEMPL -#include "common.h" +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT LBroadcaster { @@ -20,3 +21,4 @@ private: LArray mListeners; BOOL mBroadcasting; }; +#endif diff --git a/src/T2DLL/LComparator.cpp b/src/T2DLL/LComparator.cpp index 16e25cd..f1af9ff 100644 --- a/src/T2DLL/LComparator.cpp +++ b/src/T2DLL/LComparator.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "LComparator.h" LComparator* LComparator::sComparator; diff --git a/src/T2DLL/LComparator.h b/src/T2DLL/LComparator.h index 3d94996..a8d9fa0 100644 --- a/src/T2DLL/LComparator.h +++ b/src/T2DLL/LComparator.h @@ -1,6 +1,7 @@ -#pragma once +#ifndef T2DLL_LCOMPARATOR_H +#define T2DLL_LCOMPARATOR_H #define DONT_INCLUDE_AFXTEMPL -#include "common.h" +#include "../common.h" class LComparator { public: @@ -27,3 +28,4 @@ public: protected: static LLongComparator* sLongComparator; }; +#endif diff --git a/src/T2DLL/LListener.cpp b/src/T2DLL/LListener.cpp index 1fa9e83..8c00b49 100644 --- a/src/T2DLL/LListener.cpp +++ b/src/T2DLL/LListener.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "LBroadcaster.h" #include "LListener.h" diff --git a/src/T2DLL/LListener.h b/src/T2DLL/LListener.h index 0408b91..c4a6360 100644 --- a/src/T2DLL/LListener.h +++ b/src/T2DLL/LListener.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_LLISTENER_H +#define T2DLL_LLISTENER_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT LListener { @@ -22,3 +23,4 @@ private: LArray mBroadcasters; BOOL mListening; }; +#endif diff --git a/src/T2DLL/LPeriodical.cpp b/src/T2DLL/LPeriodical.cpp index 1d75869..429b8ec 100644 --- a/src/T2DLL/LPeriodical.cpp +++ b/src/T2DLL/LPeriodical.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "LArray.h" #include "LPeriodical.h" diff --git a/src/T2DLL/LPeriodical.h b/src/T2DLL/LPeriodical.h index 7e231a5..9578b93 100644 --- a/src/T2DLL/LPeriodical.h +++ b/src/T2DLL/LPeriodical.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_LPERIODICAL_H +#define T2DLL_LPERIODICAL_H +#include "../common.h" class AFX_CLASS_EXPORT LPeriodical { public: @@ -21,3 +22,4 @@ protected: static LArray* sIdlerQ; static LArray* sRepeaterQ; }; +#endif diff --git a/src/T2DLL/MMIO.h b/src/T2DLL/MMIO.h index dd35683..6bae1be 100644 --- a/src/T2DLL/MMIO.h +++ b/src/T2DLL/MMIO.h @@ -23,7 +23,7 @@ //----------------------------------------------------------------- // Inclusions //----------------------------------------------------------------- -#include "common.h" +#include "../common.h" #include <MMSystem.h> //----------------------------------------------------------------- diff --git a/src/T2DLL/Mmio.cpp b/src/T2DLL/Mmio.cpp index 8e77810..ac8a6de 100644 --- a/src/T2DLL/Mmio.cpp +++ b/src/T2DLL/Mmio.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" //----------------------------------------------------------------- // MMIO Objects // C++ Source - MMIO.cpp @@ -6,7 +7,7 @@ //----------------------------------------------------------------- // Inclusions //----------------------------------------------------------------- -#include "common.h" +#include "../common.h" //----------------------------------------------------------------- #include "MMIO.h" diff --git a/src/T2DLL/MoverSearchDlg.cpp b/src/T2DLL/MoverSearchDlg.cpp index f4733fc..bb4151e 100644 --- a/src/T2DLL/MoverSearchDlg.cpp +++ b/src/T2DLL/MoverSearchDlg.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "MoverSearchDlg.h" #include "T2DlgItemListBox.h" #include "T2FloorInfo.h" @@ -5,7 +6,7 @@ #include "T2MoverArrayList.h" #include "T2Name.h" #include "T2NameList.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #include "UT2Utils.h" diff --git a/src/T2DLL/MoverSearchDlg.h b/src/T2DLL/MoverSearchDlg.h index 8fb181b..c0dd444 100644 --- a/src/T2DLL/MoverSearchDlg.h +++ b/src/T2DLL/MoverSearchDlg.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_MOVERSEARCHDLG_H +#define T2DLL_MOVERSEARCHDLG_H +#include "../common.h" #include "T2Dialog.h" class MoverSearchDlg : public T2Dialog { @@ -15,3 +16,4 @@ protected: T2TowerDoc *mDocument; }; +#endif diff --git a/src/T2DLL/PeopleSearchDlg.cpp b/src/T2DLL/PeopleSearchDlg.cpp index deed18a..77aad69 100644 --- a/src/T2DLL/PeopleSearchDlg.cpp +++ b/src/T2DLL/PeopleSearchDlg.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "PeopleSearchDlg.h" #include "T2DlgItemListBox.h" #include "T2FloorInfo.h" @@ -6,7 +7,7 @@ #include "T2People.h" #include "T2PeopleArrayList.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #include "UT2Utils.h" diff --git a/src/T2DLL/PeopleSearchDlg.h b/src/T2DLL/PeopleSearchDlg.h index 4462912..11a3362 100644 --- a/src/T2DLL/PeopleSearchDlg.h +++ b/src/T2DLL/PeopleSearchDlg.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_PEOPLESEARCHDLG_H +#define T2DLL_PEOPLESEARCHDLG_H +#include "../common.h" #include "T2Dialog.h" class PeopleSearchDlg : public T2Dialog { @@ -15,3 +16,4 @@ protected: T2TowerDoc *mDocument; }; +#endif diff --git a/src/T2DLL/Resource.h b/src/T2DLL/Resource.h new file mode 100644 index 0000000..12c4700 --- /dev/null +++ b/src/T2DLL/Resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by T2DLL.RC +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS + +#define _APS_NEXT_RESOURCE_VALUE 129 +#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/T2DLL/SoundDlg.cpp b/src/T2DLL/SoundDlg.cpp index 0bc2236..af25431 100644 --- a/src/T2DLL/SoundDlg.cpp +++ b/src/T2DLL/SoundDlg.cpp @@ -1,11 +1,12 @@ +#include "StdAfx.h" #include "SoundDlg.h" -#include "T2.h" +#include "../T2.h" #include "T2DlgItem.h" #include "T2DlgItemText.h" -#include "T2MainWindow.h" -#include "T2MWControl.h" +#include "../T2MainWindow.h" +#include "../T2MWControl.h" #include "T2SoundPlayer.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #ifdef _DEBUG diff --git a/src/T2DLL/SoundDlg.h b/src/T2DLL/SoundDlg.h index 38347c2..b96b28e 100644 --- a/src/T2DLL/SoundDlg.h +++ b/src/T2DLL/SoundDlg.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_SOUNDDLG_H +#define T2DLL_SOUNDDLG_H +#include "../common.h" #include "T2Dialog.h" class SoundDlg : public T2Dialog { @@ -16,3 +17,4 @@ protected: T2TowerDoc *mDocument; }; +#endif diff --git a/src/T2DLL/SpeedDlg.cpp b/src/T2DLL/SpeedDlg.cpp index 281bb36..3381a7d 100644 --- a/src/T2DLL/SpeedDlg.cpp +++ b/src/T2DLL/SpeedDlg.cpp @@ -1,9 +1,10 @@ +#include "StdAfx.h" #include "SpeedDlg.h" -#include "T2.h" +#include "../T2.h" #include "T2DlgItem.h" -#include "T2MainWindow.h" -#include "T2MWControl.h" -#include "T2TowerDoc.h" +#include "../T2MainWindow.h" +#include "../T2MWControl.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #ifdef _DEBUG diff --git a/src/T2DLL/SpeedDlg.h b/src/T2DLL/SpeedDlg.h index 751fdc2..10ad33c 100644 --- a/src/T2DLL/SpeedDlg.h +++ b/src/T2DLL/SpeedDlg.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_SPEEDDLG_H +#define T2DLL_SPEEDDLG_H +#include "../common.h" #include "T2Dialog.h" class SpeedDlg : public T2Dialog { @@ -18,3 +19,4 @@ protected: int mCurrentSpeed; int mCurrentIndex; }; +#endif diff --git a/src/T2DLL/StdAfx.cpp b/src/T2DLL/StdAfx.cpp new file mode 100644 index 0000000..d993bcd --- /dev/null +++ b/src/T2DLL/StdAfx.cpp @@ -0,0 +1,7 @@ +#include "StdAfx.h" +// stdafx.cpp : source file that includes just the standard includes +// T2DLL.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + diff --git a/src/T2DLL/StdAfx.h b/src/T2DLL/StdAfx.h new file mode 100644 index 0000000..fae5590 --- /dev/null +++ b/src/T2DLL/StdAfx.h @@ -0,0 +1,41 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#if !defined(AFX_STDAFX_H__581DD077_94D5_4C06_99D3_036F3311F5CD__INCLUDED_) +#define AFX_STDAFX_H__581DD077_94D5_4C06_99D3_036F3311F5CD__INCLUDED_ + +#if _MSC_VER >= 1000 +#pragma once +#endif // _MSC_VER >= 1000 + +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers + +#include <afxwin.h> // MFC core and standard components +#include <afxext.h> // MFC extensions + +#ifndef _AFX_NO_OLE_SUPPORT +#include <afxole.h> // MFC OLE classes +#include <afxodlgs.h> // MFC OLE dialog classes +#include <afxdisp.h> // MFC OLE automation classes +#endif // _AFX_NO_OLE_SUPPORT + + +#ifndef _AFX_NO_DB_SUPPORT +#include <afxdb.h> // MFC ODBC database classes +#endif // _AFX_NO_DB_SUPPORT + +#ifndef _AFX_NO_DAO_SUPPORT +#include <afxdao.h> // MFC DAO database classes +#endif // _AFX_NO_DAO_SUPPORT + +#ifndef _AFX_NO_AFXCMN_SUPPORT +#include <afxcmn.h> // MFC support for Windows Common Controls +#endif // _AFX_NO_AFXCMN_SUPPORT + + +//{{AFX_INSERT_LOCATION}} +// Microsoft Developer Studio will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_STDAFX_H__581DD077_94D5_4C06_99D3_036F3311F5CD__INCLUDED_) diff --git a/src/T2DLL/T2AdvertisePlugin.cpp b/src/T2DLL/T2AdvertisePlugin.cpp index 5b10df3..a323655 100644 --- a/src/T2DLL/T2AdvertisePlugin.cpp +++ b/src/T2DLL/T2AdvertisePlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2AdvertisePlugin.h" #include "T2BitImage.h" diff --git a/src/T2DLL/T2AdvertisePlugin.h b/src/T2DLL/T2AdvertisePlugin.h index f4c3f50..048e2c6 100644 --- a/src/T2DLL/T2AdvertisePlugin.h +++ b/src/T2DLL/T2AdvertisePlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ADVERTISEPLUGIN_H +#define T2DLL_T2ADVERTISEPLUGIN_H +#include "../common.h" #include "T2SubPlugin.h" class AFX_CLASS_EXPORT T2AdvertisePlugin : public T2SubPlugin { @@ -25,3 +26,4 @@ protected: int mMoney; CString mPath; }; +#endif diff --git a/src/T2DLL/T2AdvertiseTable.cpp b/src/T2DLL/T2AdvertiseTable.cpp index e841425..f7d0d20 100644 --- a/src/T2DLL/T2AdvertiseTable.cpp +++ b/src/T2DLL/T2AdvertiseTable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CFilePluginList.h" #include "T2AdvertisePlugin.h" #include "T2AdvertiseTable.h" diff --git a/src/T2DLL/T2AdvertiseTable.h b/src/T2DLL/T2AdvertiseTable.h index ae743b9..d2ca620 100644 --- a/src/T2DLL/T2AdvertiseTable.h +++ b/src/T2DLL/T2AdvertiseTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ADVERTISETABLE_H +#define T2DLL_T2ADVERTISETABLE_H +#include "../common.h" #include "T2VerticalTable.h" class AFX_CLASS_EXPORT T2AdvertiseTable : public T2VerticalTable { @@ -25,3 +26,4 @@ protected: int mUserCon; }; +#endif diff --git a/src/T2DLL/T2Animation.cpp b/src/T2DLL/T2Animation.cpp index 1a3208d..6605ddd 100644 --- a/src/T2DLL/T2Animation.cpp +++ b/src/T2DLL/T2Animation.cpp @@ -1,10 +1,11 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2Animation.h" #include "T2BitImage.h" #include "T2ImageObj.h" #include "T2PluginSpecifier.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" T2Animation::T2Animation(T2TowerDoc* inDoc, short inNumOfFrame, short inNumOfSprite, const SpriteDef* inSpriteDef, const AnimationDef* inAnimationDef, T2Sprite::ELayer inLayer) { mDocument = inDoc; diff --git a/src/T2DLL/T2Animation.h b/src/T2DLL/T2Animation.h index a397117..9612d63 100644 --- a/src/T2DLL/T2Animation.h +++ b/src/T2DLL/T2Animation.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ANIMATION_H +#define T2DLL_T2ANIMATION_H +#include "../common.h" #include "T2Sprite.h" struct AnimationDef { @@ -51,3 +52,4 @@ protected: int mInterval; DWORD mTickCount; }; +#endif diff --git a/src/T2DLL/T2Archive.cpp b/src/T2DLL/T2Archive.cpp index 2431a27..c33e6e4 100644 --- a/src/T2DLL/T2Archive.cpp +++ b/src/T2DLL/T2Archive.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" T2Archive::T2Archive() { diff --git a/src/T2DLL/T2Archive.h b/src/T2DLL/T2Archive.h index cb72f3c..184fbc1 100644 --- a/src/T2DLL/T2Archive.h +++ b/src/T2DLL/T2Archive.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ARCHIVE_H +#define T2DLL_T2ARCHIVE_H +#include "../common.h" class AFX_CLASS_EXPORT T2Archive { public: @@ -50,3 +51,4 @@ private: int mBufferLen; char *mPtr; }; +#endif diff --git a/src/T2DLL/T2ArrowWnd.cpp b/src/T2DLL/T2ArrowWnd.cpp index da7466e..9aa7333 100644 --- a/src/T2DLL/T2ArrowWnd.cpp +++ b/src/T2DLL/T2ArrowWnd.cpp @@ -1,7 +1,8 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2ArrowWnd.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/T2DLL/T2ArrowWnd.h b/src/T2DLL/T2ArrowWnd.h index 692d1e0..8553b48 100644 --- a/src/T2DLL/T2ArrowWnd.h +++ b/src/T2DLL/T2ArrowWnd.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ARROWWND_H +#define T2DLL_T2ARROWWND_H +#include "../common.h" class AFX_CLASS_EXPORT T2ArrowWnd : public CFrameWnd { DECLARE_DYNCREATE(T2ArrowWnd) @@ -19,3 +20,4 @@ protected: CRgn mRgn; unsigned short mCounter; }; +#endif diff --git a/src/T2DLL/T2Balloon.cpp b/src/T2DLL/T2Balloon.cpp index 34ab19f..e087cfb 100644 --- a/src/T2DLL/T2Balloon.cpp +++ b/src/T2DLL/T2Balloon.cpp @@ -1,10 +1,11 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2Balloon.h" #include "T2BitImage.h" #include "T2ImageObj.h" #include "T2Sprite.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "T2WorldDef.h" #include "UT2Coordinate.h" diff --git a/src/T2DLL/T2Balloon.h b/src/T2DLL/T2Balloon.h index 2064857..f9017e3 100644 --- a/src/T2DLL/T2Balloon.h +++ b/src/T2DLL/T2Balloon.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2BALLOON_H +#define T2DLL_T2BALLOON_H +#include "../common.h" class AFX_CLASS_EXPORT T2Balloon { public: @@ -16,3 +17,4 @@ protected: T2ImageObj *mImageObj; int mSpriteID; }; +#endif diff --git a/src/T2DLL/T2BalloonWnd.cpp b/src/T2DLL/T2BalloonWnd.cpp index 549ebd1..1928559 100644 --- a/src/T2DLL/T2BalloonWnd.cpp +++ b/src/T2DLL/T2BalloonWnd.cpp @@ -1,7 +1,8 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2BalloonWnd.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/T2DLL/T2BalloonWnd.h b/src/T2DLL/T2BalloonWnd.h index 9389a43..b53eed7 100644 --- a/src/T2DLL/T2BalloonWnd.h +++ b/src/T2DLL/T2BalloonWnd.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2BALLOONWND_H +#define T2DLL_T2BALLOONWND_H +#include "../common.h" class AFX_CLASS_EXPORT T2BalloonWnd : public CFrameWnd { DECLARE_DYNCREATE(T2BalloonWnd) @@ -28,3 +29,4 @@ protected: POINT mStartCursorPos; BOOL mIsPause; }; +#endif diff --git a/src/T2DLL/T2BitImage.cpp b/src/T2DLL/T2BitImage.cpp index 93bd6f8..f9d897a 100644 --- a/src/T2DLL/T2BitImage.cpp +++ b/src/T2DLL/T2BitImage.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2BitImage.h" @@ -921,7 +922,7 @@ void T2BitImage::CopyImage(CDC* dc, const RECT& inSrc, const RECT& inDest, int, return; OffsetRect(&dest, -diffX, -diffY); - Bitmap bmp = mBitmap; + Bitmap256 bmp = mBitmap; bmp.header.biHeight = -bmp.header.biHeight; SetDIBitsToDevice( diff --git a/src/T2DLL/T2BitImage.h b/src/T2DLL/T2BitImage.h index 838e909..53b670f 100644 --- a/src/T2DLL/T2BitImage.h +++ b/src/T2DLL/T2BitImage.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2BITIMAGE_H +#define T2DLL_T2BITIMAGE_H +#include "../common.h" // unknown name struct Bitmap256 { @@ -52,3 +53,4 @@ protected: void DrawFocusLine(int, int, int, int); void DrawFrameLine(int, int, int, int, int); }; +#endif diff --git a/src/T2DLL/T2BlackOut.cpp b/src/T2DLL/T2BlackOut.cpp index 25868ea..a7f2860 100644 --- a/src/T2DLL/T2BlackOut.cpp +++ b/src/T2DLL/T2BlackOut.cpp @@ -1,16 +1,17 @@ +#include "StdAfx.h" #include "CFilePluginList.h" #include "CProgramPlugin.h" #include "CResFile.h" #include "T2Archive.h" #include "T2BlackOut.h" #include "T2DateTime.h" -#include "T2MainWindow.h" +#include "../T2MainWindow.h" #include "T2PeopleArrayList.h" #include "T2TemplatePlugin.h" #include "T2ToolWindow.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" -#include "T2TowerMainView.h" +#include "../T2TowerMainView.h" #include "T2TowerMessage.h" T2BlackOut::T2BlackOut(T2TowerEvent* inTowerEvent, CResFile* inResFile, int inSubID) diff --git a/src/T2DLL/T2BlackOut.h b/src/T2DLL/T2BlackOut.h index 5879656..9c27f03 100644 --- a/src/T2DLL/T2BlackOut.h +++ b/src/T2DLL/T2BlackOut.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2BLACKOUT_H +#define T2DLL_T2BLACKOUT_H +#include "../common.h" #include "LAttachment.h" #include "T2EventItem.h" @@ -55,3 +56,4 @@ protected: T2BlackOut *mBlackOut; }; +#endif diff --git a/src/T2DLL/T2ClassFactory.cpp b/src/T2DLL/T2ClassFactory.cpp index 92764a6..d34ec0b 100644 --- a/src/T2DLL/T2ClassFactory.cpp +++ b/src/T2DLL/T2ClassFactory.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2Balloon.h" #include "T2ClassFactory.h" diff --git a/src/T2DLL/T2ClassFactory.h b/src/T2DLL/T2ClassFactory.h index b552853..8bb4787 100644 --- a/src/T2DLL/T2ClassFactory.h +++ b/src/T2DLL/T2ClassFactory.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2CLASSFACTORY_H +#define T2DLL_T2CLASSFACTORY_H +#include "../common.h" struct CLASSFACTORY_CLASSINFO { int x0; @@ -19,3 +20,4 @@ private: static void* new_T2Balloon(); static void* new_T2SoundPlayer(CWnd* inArg1, IDirectSound* inArg2); }; +#endif diff --git a/src/T2DLL/T2ColdTableDef.cpp b/src/T2DLL/T2ColdTableDef.cpp index f112a5c..c664e40 100644 --- a/src/T2DLL/T2ColdTableDef.cpp +++ b/src/T2DLL/T2ColdTableDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2ColdTableDef.h" diff --git a/src/T2DLL/T2ColdTableDef.h b/src/T2DLL/T2ColdTableDef.h index 54162bb..03ab2a4 100644 --- a/src/T2DLL/T2ColdTableDef.h +++ b/src/T2DLL/T2ColdTableDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2COLDTABLEDEF_H +#define T2DLL_T2COLDTABLEDEF_H +#include "../common.h" class T2ColdTableDef { public: @@ -11,3 +12,4 @@ protected: unsigned int mMinimumGameLevel; unsigned int mEntries[12]; }; +#endif diff --git a/src/T2DLL/T2CrossEquipArray.cpp b/src/T2DLL/T2CrossEquipArray.cpp index 3e349aa..50fdb52 100644 --- a/src/T2DLL/T2CrossEquipArray.cpp +++ b/src/T2DLL/T2CrossEquipArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2CrossEquipArray.h" #include "T2FloorCEArray.h" diff --git a/src/T2DLL/T2CrossEquipArray.h b/src/T2DLL/T2CrossEquipArray.h index f14aa9e..06a5193 100644 --- a/src/T2DLL/T2CrossEquipArray.h +++ b/src/T2DLL/T2CrossEquipArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2CROSSEQUIPARRAY_H +#define T2DLL_T2CROSSEQUIPARRAY_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2CrossEquipArray : public LArray { @@ -16,3 +17,4 @@ public: static T2CrossEquipArray* ReadCEArray(T2Archive&); static void WriteCEArray(T2CrossEquipArray*, T2Archive&); }; +#endif diff --git a/src/T2DLL/T2CustomerTableIterator.cpp b/src/T2DLL/T2CustomerTableIterator.cpp index ad7e872..0d952cc 100644 --- a/src/T2DLL/T2CustomerTableIterator.cpp +++ b/src/T2DLL/T2CustomerTableIterator.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2CustomerTableIterator.h" #include "T2TenantMemberDef.h" #include "T2TenantMemberTableDef.h" diff --git a/src/T2DLL/T2CustomerTableIterator.h b/src/T2DLL/T2CustomerTableIterator.h index 2d17857..9c9e582 100644 --- a/src/T2DLL/T2CustomerTableIterator.h +++ b/src/T2DLL/T2CustomerTableIterator.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2CUSTOMERTABLEITERATOR_H +#define T2DLL_T2CUSTOMERTABLEITERATOR_H +#include "../common.h" class AFX_CLASS_EXPORT T2CustomerTableIterator { public: @@ -15,3 +16,4 @@ protected: int mBound; int mNextIndex; }; +#endif diff --git a/src/T2DLL/T2DLL.DSP b/src/T2DLL/T2DLL.DSP new file mode 100644 index 0000000..69b46d8 --- /dev/null +++ b/src/T2DLL/T2DLL.DSP @@ -0,0 +1,2133 @@ +# Microsoft Developer Studio Project File - Name="T2DLL" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=T2DLL - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "T2DLL.MAK". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "T2DLL.MAK" CFG="T2DLL - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "T2DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "T2DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "T2DLL - Win32 Release" + +# PROP BASE Use_MFC 6 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 6 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /Yu"stdafx.h" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL" +# ADD RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 + +!ELSEIF "$(CFG)" == "T2DLL - Win32 Debug" + +# PROP BASE Use_MFC 6 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 6 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Z:\Users\ash\src\t2-res\dx5\cdrom\sdk\inc" /I "Z:\Users\ash\src\t2-res\dxmedia51\DX51\dxmdev\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /Yu"stdafx.h" /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL" +# ADD RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ole32.lib winmm.lib strmiids.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"Z:\Users\ash\src\t2-res\dx5\cdrom\sdk\lib" /libpath:"Z:\Users\ash\src\t2-res\dxmedia51\DX51\dxmdev\lib" + +!ENDIF + +# Begin Target + +# Name "T2DLL - Win32 Release" +# Name "T2DLL - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\CDefRsrcPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\CEditWFocus.cpp +# End Source File +# Begin Source File + +SOURCE=.\CFilePlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\CFilePluginDB.cpp +# End Source File +# Begin Source File + +SOURCE=.\CFilePluginList.cpp +# End Source File +# Begin Source File + +SOURCE=.\CLink.cpp +# End Source File +# Begin Source File + +SOURCE=.\CObjectList.cpp +# End Source File +# Begin Source File + +SOURCE=.\CObjectQueue.cpp +# End Source File +# Begin Source File + +SOURCE=.\CPEFile.cpp +# End Source File +# Begin Source File + +SOURCE=.\CPieChartView.cpp +# End Source File +# Begin Source File + +SOURCE=.\CPiledMultiBarChartView.cpp +# End Source File +# Begin Source File + +SOURCE=.\CPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\CPluginInfo.cpp +# End Source File +# Begin Source File + +SOURCE=.\CPluginInfoArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\CPluginInfoComparator.cpp +# End Source File +# Begin Source File + +SOURCE=.\CProgramPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\CResFile.cpp +# End Source File +# Begin Source File + +SOURCE=.\CResourcePlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\CToggleButtonDisabled.cpp +# End Source File +# Begin Source File + +SOURCE=.\CTokenizer.cpp +# End Source File +# Begin Source File + +SOURCE=.\GlobalFunc.cpp +# End Source File +# Begin Source File + +SOURCE=.\LArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\LAttachable.cpp +# End Source File +# Begin Source File + +SOURCE=.\LAttachment.cpp +# End Source File +# Begin Source File + +SOURCE=.\LBroadcaster.cpp +# End Source File +# Begin Source File + +SOURCE=.\LComparator.cpp +# End Source File +# Begin Source File + +SOURCE=.\LListener.cpp +# End Source File +# Begin Source File + +SOURCE=.\LPeriodical.cpp +# End Source File +# Begin Source File + +SOURCE=.\Mmio.cpp +# End Source File +# Begin Source File + +SOURCE=.\MoverSearchDlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\PeopleSearchDlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\SoundDlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\SpeedDlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.cpp +# ADD CPP /Yc"stdafx.h" +# End Source File +# Begin Source File + +SOURCE=.\T2AdvertisePlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2AdvertiseTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Animation.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Archive.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ArrowWnd.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Balloon.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2BalloonWnd.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2BitImage.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2BlackOut.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ClassFactory.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ColdTableDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2CrossEquipArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2CustomerTableIterator.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DateTime.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DayLightFilter.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DayParamDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Dialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItem.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemAllPurpose.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemAnimation.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemAPTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemArrows.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemBelongGage.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemBox.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemButtonBase.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemCANCEL.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemCheck.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemCustomerGage.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemEdit.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemGageBase.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemHScr.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemIButton.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemICheck.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemImage.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemImageTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemIRepeater.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemListBox.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemMerchandiseField.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemMovie.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemOK.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemPeopleView.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemPopup.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemPPLEvalGage.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemProfitsGage.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemProgress.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemRadioButton.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemRadioText.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemScr.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemSTimeTbl.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemStressGage.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemTab.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemTButton.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemText.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemVScr.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DLL.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2DLL.def +# End Source File +# Begin Source File + +SOURCE=.\T2DLL.rc + +!IF "$(CFG)" == "T2DLL - Win32 Release" + +!ELSEIF "$(CFG)" == "T2DLL - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\T2DrawableObject.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ElevatorModule.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ElvModuleList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Equip.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2EquipDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2EquipInfoDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2EquipPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2EquipPtrList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2EventDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2EventItem.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2FInfoAreaIterator.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2FInfoPtIterator.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2FireBurning.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2FireWork.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2FloorCEArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2FloorInfo.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2FloorNumberTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2FloorPtrList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2GlobalData.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2GuestroomTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2HallEventPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2HallEventTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2HaveOutViewObject.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ImageObj.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2InfoDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Maru_Reggae.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Matter.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MatterArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MatterArrayList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MatterDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Message.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MetroRailway.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Mover.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoverArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoverArrayList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoverCEArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoverDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoverModule.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoverModuleList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoverModuleTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoverPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoverRoutingTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MovieParamArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoviePlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MoviePluginList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MovieTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2MsgWindowCallback.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Name.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2NameComparator.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2NameList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2NameTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Object.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ObjectArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ObjectArrayList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OptionPluginList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OutDecoration.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OuterObjDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OuterObjList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OuterObjPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OutObj.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OutObjArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OutObjArrayList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OutObjInfoDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2OutsideInfo.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PaletteAnime.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PaletteAnimeDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2People.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleAnimeDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleAnimeDefElem.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleArrayList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleDemandList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleInfoDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleLinkIterator.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleLoader.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeoplePtrList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleTimeZoneList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleType.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleTypeArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PlaceParamDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PluginInfoTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PluginLoader.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PluginSpecifier.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Pool.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PoolDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PrefDialogBox.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2PrefFile.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2RegistedTenantDB.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2RegistedTenantIterator.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2RemoveFavoriteDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Request.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2RequestArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2RequestArrayList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2RequestIDArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ReturnStack.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2RouteCEArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2RouteNavigator.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2RoutingTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2RoutingTableElem.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SantaClaus.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SearchDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SeasonParamDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SerialDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SettingDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Settlement.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SilhouetteDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SilhouettePane.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SoundPlayer.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Sprite.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SpriteObj.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2StairModule.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2StairModuleList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2StewardDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2StopInfoArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2SubPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TemplatePlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TemplatePluginDB.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TemplatePluginList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TempPluginComparator.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Tenant.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TenantArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TenantArrayList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TenantCEArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TenantDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TenantInfoDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TenantMemberDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TenantMemberTableDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TenantPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Terrorist.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ToolDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ToolDefDB.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ToolDefList.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ToolHelpWnd.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ToolPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2ToolWindow.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TowerEvent.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TowerMessage.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TowerVision.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TrafficInfo.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2Transport.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TreasureDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2TreasurePane.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2UnitInfo.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2VerticalTable.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2VisitVIP.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2WeatherFilter.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2WordDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2WordDefArray.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2WorldDef.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2WorldPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\T2XEvent.cpp +# End Source File +# Begin Source File + +SOURCE=.\TenantSearchDlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\UPoint.cpp +# End Source File +# Begin Source File + +SOURCE=.\URect.cpp +# End Source File +# Begin Source File + +SOURCE=.\UT2BkgndInfo.cpp +# End Source File +# Begin Source File + +SOURCE=.\UT2Coordinate.cpp +# End Source File +# Begin Source File + +SOURCE=.\UT2Utils.cpp +# End Source File +# Begin Source File + +SOURCE=.\WalkerDlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\Wave.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\CDefRsrcPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\CEditWFocus.h +# End Source File +# Begin Source File + +SOURCE=.\CFilePlugin.h +# End Source File +# Begin Source File + +SOURCE=.\CFilePluginDB.h +# End Source File +# Begin Source File + +SOURCE=.\CFilePluginList.h +# End Source File +# Begin Source File + +SOURCE=.\CLink.h +# End Source File +# Begin Source File + +SOURCE=.\CObjectList.h +# End Source File +# Begin Source File + +SOURCE=.\CObjectQueue.h +# End Source File +# Begin Source File + +SOURCE=.\CPEFile.h +# End Source File +# Begin Source File + +SOURCE=.\CPieChartView.h +# End Source File +# Begin Source File + +SOURCE=.\CPiledMultiBarChartView.h +# End Source File +# Begin Source File + +SOURCE=.\CPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\CPluginInfo.h +# End Source File +# Begin Source File + +SOURCE=.\CPluginInfoArray.h +# End Source File +# Begin Source File + +SOURCE=.\CPluginInfoComparator.h +# End Source File +# Begin Source File + +SOURCE=.\CProgramPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\CResFile.h +# End Source File +# Begin Source File + +SOURCE=.\CResourcePlugin.h +# End Source File +# Begin Source File + +SOURCE=.\CToggleButtonDisabled.h +# End Source File +# Begin Source File + +SOURCE=.\CTokenizer.h +# End Source File +# Begin Source File + +SOURCE=.\GlobalFunc.h +# End Source File +# Begin Source File + +SOURCE=.\LArray.h +# End Source File +# Begin Source File + +SOURCE=.\LAttachable.h +# End Source File +# Begin Source File + +SOURCE=.\LAttachment.h +# End Source File +# Begin Source File + +SOURCE=.\LBroadcaster.h +# End Source File +# Begin Source File + +SOURCE=.\LComparator.h +# End Source File +# Begin Source File + +SOURCE=.\LListener.h +# End Source File +# Begin Source File + +SOURCE=.\LPeriodical.h +# End Source File +# Begin Source File + +SOURCE=.\MMIO.h +# End Source File +# Begin Source File + +SOURCE=.\MoverSearchDlg.h +# End Source File +# Begin Source File + +SOURCE=.\PeopleSearchDlg.h +# End Source File +# Begin Source File + +SOURCE=.\Resource.h +# End Source File +# Begin Source File + +SOURCE=.\SoundDlg.h +# End Source File +# Begin Source File + +SOURCE=.\SpeedDlg.h +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.h +# End Source File +# Begin Source File + +SOURCE=.\T2AdvertisePlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2AdvertiseTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2Animation.h +# End Source File +# Begin Source File + +SOURCE=.\T2Archive.h +# End Source File +# Begin Source File + +SOURCE=.\T2ArrowWnd.h +# End Source File +# Begin Source File + +SOURCE=.\T2Balloon.h +# End Source File +# Begin Source File + +SOURCE=.\T2BalloonWnd.h +# End Source File +# Begin Source File + +SOURCE=.\T2BitImage.h +# End Source File +# Begin Source File + +SOURCE=.\T2BlackOut.h +# End Source File +# Begin Source File + +SOURCE=.\T2ClassFactory.h +# End Source File +# Begin Source File + +SOURCE=.\T2ColdTableDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2CrossEquipArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2CustomerTableIterator.h +# End Source File +# Begin Source File + +SOURCE=.\T2DateTime.h +# End Source File +# Begin Source File + +SOURCE=.\T2DayLightFilter.h +# End Source File +# Begin Source File + +SOURCE=.\T2DayParamDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2Dialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItem.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemAllPurpose.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemAnimation.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemAPTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemArrows.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemBelongGage.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemBox.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemButtonBase.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemCANCEL.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemCheck.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemCustomerGage.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemEdit.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemGageBase.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemHScr.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemIButton.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemICheck.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemImage.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemImageTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemIRepeater.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemListBox.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemMerchandiseField.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemMovie.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemOK.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemPeopleView.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemPopup.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemPPLEvalGage.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemProfitsGage.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemProgress.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemRadioButton.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemRadioText.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemScr.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemSTimeTbl.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemStressGage.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemTab.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemTButton.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemText.h +# End Source File +# Begin Source File + +SOURCE=.\T2DlgItemVScr.h +# End Source File +# Begin Source File + +SOURCE=.\T2DLL.h +# End Source File +# Begin Source File + +SOURCE=.\T2DrawableObject.h +# End Source File +# Begin Source File + +SOURCE=.\T2ElevatorModule.h +# End Source File +# Begin Source File + +SOURCE=.\T2ElvModuleList.h +# End Source File +# Begin Source File + +SOURCE=.\T2Equip.h +# End Source File +# Begin Source File + +SOURCE=.\T2EquipDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2EquipInfoDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2EquipPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2EquipPtrList.h +# End Source File +# Begin Source File + +SOURCE=.\T2EventDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2EventItem.h +# End Source File +# Begin Source File + +SOURCE=.\T2FInfoAreaIterator.h +# End Source File +# Begin Source File + +SOURCE=.\T2FInfoPtIterator.h +# End Source File +# Begin Source File + +SOURCE=.\T2FireBurning.h +# End Source File +# Begin Source File + +SOURCE=.\T2FireWork.h +# End Source File +# Begin Source File + +SOURCE=.\T2FloorCEArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2FloorInfo.h +# End Source File +# Begin Source File + +SOURCE=.\T2FloorNumberTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2FloorPtrList.h +# End Source File +# Begin Source File + +SOURCE=.\T2GlobalData.h +# End Source File +# Begin Source File + +SOURCE=.\T2GuestroomTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2HallEventPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2HallEventTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2HaveOutViewObject.h +# End Source File +# Begin Source File + +SOURCE=.\T2ImageObj.h +# End Source File +# Begin Source File + +SOURCE=.\T2InfoDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2Maru_Reggae.h +# End Source File +# Begin Source File + +SOURCE=.\T2Matter.h +# End Source File +# Begin Source File + +SOURCE=.\T2MatterArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2MatterArrayList.h +# End Source File +# Begin Source File + +SOURCE=.\T2MatterDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2Message.h +# End Source File +# Begin Source File + +SOURCE=.\T2MetroRailway.h +# End Source File +# Begin Source File + +SOURCE=.\T2Mover.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoverArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoverArrayList.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoverCEArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoverDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoverModule.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoverModuleList.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoverModuleTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoverPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoverRoutingTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2MovieParamArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoviePlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2MoviePluginList.h +# End Source File +# Begin Source File + +SOURCE=.\T2MovieTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2MsgWindowCallback.h +# End Source File +# Begin Source File + +SOURCE=.\T2Name.h +# End Source File +# Begin Source File + +SOURCE=.\T2NameComparator.h +# End Source File +# Begin Source File + +SOURCE=.\T2NameList.h +# End Source File +# Begin Source File + +SOURCE=.\T2NameTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2Object.h +# End Source File +# Begin Source File + +SOURCE=.\T2ObjectArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2ObjectArrayList.h +# End Source File +# Begin Source File + +SOURCE=.\T2OptionPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2OptionPluginList.h +# End Source File +# Begin Source File + +SOURCE=.\T2OutDecoration.h +# End Source File +# Begin Source File + +SOURCE=.\T2OuterObjDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2OuterObjList.h +# End Source File +# Begin Source File + +SOURCE=.\T2OuterObjPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2OutObj.h +# End Source File +# Begin Source File + +SOURCE=.\T2OutObjArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2OutObjArrayList.h +# End Source File +# Begin Source File + +SOURCE=.\T2OutObjInfoDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2OutsideInfo.h +# End Source File +# Begin Source File + +SOURCE=.\T2PaletteAnime.h +# End Source File +# Begin Source File + +SOURCE=.\T2PaletteAnimeDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2People.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleAnimeDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleAnimeDefElem.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleArrayList.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleDemandList.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleInfoDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleLinkIterator.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleLoader.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeoplePtrList.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleTimeZoneList.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleType.h +# End Source File +# Begin Source File + +SOURCE=.\T2PeopleTypeArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2PlaceParamDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2PluginInfoTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2PluginLoader.h +# End Source File +# Begin Source File + +SOURCE=.\T2PluginSpecifier.h +# End Source File +# Begin Source File + +SOURCE=.\T2Pool.h +# End Source File +# Begin Source File + +SOURCE=.\T2PoolDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2PrefDialogBox.h +# End Source File +# Begin Source File + +SOURCE=.\T2PrefFile.h +# End Source File +# Begin Source File + +SOURCE=.\T2RegistedTenantDB.h +# End Source File +# Begin Source File + +SOURCE=.\T2RegistedTenantIterator.h +# End Source File +# Begin Source File + +SOURCE=.\T2RemoveFavoriteDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2Request.h +# End Source File +# Begin Source File + +SOURCE=.\T2RequestArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2RequestArrayList.h +# End Source File +# Begin Source File + +SOURCE=.\T2RequestIDArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2ReturnStack.h +# End Source File +# Begin Source File + +SOURCE=.\T2RouteCEArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2RouteNavigator.h +# End Source File +# Begin Source File + +SOURCE=.\T2RoutingTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2RoutingTableElem.h +# End Source File +# Begin Source File + +SOURCE=.\T2SantaClaus.h +# End Source File +# Begin Source File + +SOURCE=.\T2SearchDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2SeasonParamDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2SerialDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2SettingDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2Settlement.h +# End Source File +# Begin Source File + +SOURCE=.\T2SilhouetteDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2SilhouettePane.h +# End Source File +# Begin Source File + +SOURCE=.\T2SoundPlayer.h +# End Source File +# Begin Source File + +SOURCE=.\T2Sprite.h +# End Source File +# Begin Source File + +SOURCE=.\T2SpriteObj.h +# End Source File +# Begin Source File + +SOURCE=.\T2StairModule.h +# End Source File +# Begin Source File + +SOURCE=.\T2StairModuleList.h +# End Source File +# Begin Source File + +SOURCE=.\T2StewardDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2StopInfoArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2SubPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2TemplatePlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2TemplatePluginDB.h +# End Source File +# Begin Source File + +SOURCE=.\T2TemplatePluginList.h +# End Source File +# Begin Source File + +SOURCE=.\T2TempPluginComparator.h +# End Source File +# Begin Source File + +SOURCE=.\T2Tenant.h +# End Source File +# Begin Source File + +SOURCE=.\T2TenantArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2TenantArrayList.h +# End Source File +# Begin Source File + +SOURCE=.\T2TenantCEArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2TenantDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2TenantInfoDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2TenantMemberDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2TenantMemberTableDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2TenantPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2Terrorist.h +# End Source File +# Begin Source File + +SOURCE=.\T2ToolCallback.h +# End Source File +# Begin Source File + +SOURCE=.\T2ToolDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2ToolDefDB.h +# End Source File +# Begin Source File + +SOURCE=.\T2ToolDefList.h +# End Source File +# Begin Source File + +SOURCE=.\T2ToolHelpWnd.h +# End Source File +# Begin Source File + +SOURCE=.\T2ToolPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2ToolWindow.h +# End Source File +# Begin Source File + +SOURCE=.\T2TowerEvent.h +# End Source File +# Begin Source File + +SOURCE=.\T2TowerMessage.h +# End Source File +# Begin Source File + +SOURCE=.\T2TowerVision.h +# End Source File +# Begin Source File + +SOURCE=.\T2TrafficInfo.h +# End Source File +# Begin Source File + +SOURCE=.\T2Transport.h +# End Source File +# Begin Source File + +SOURCE=.\T2TreasureDialog.h +# End Source File +# Begin Source File + +SOURCE=.\T2TreasurePane.h +# End Source File +# Begin Source File + +SOURCE=.\T2UnitInfo.h +# End Source File +# Begin Source File + +SOURCE=.\T2VerticalTable.h +# End Source File +# Begin Source File + +SOURCE=.\T2VisitVIP.h +# End Source File +# Begin Source File + +SOURCE=.\T2WeatherFilter.h +# End Source File +# Begin Source File + +SOURCE=.\T2WordDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2WordDefArray.h +# End Source File +# Begin Source File + +SOURCE=.\T2WorldDef.h +# End Source File +# Begin Source File + +SOURCE=.\T2WorldPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\T2XEvent.h +# End Source File +# Begin Source File + +SOURCE=.\TenantSearchDlg.h +# End Source File +# Begin Source File + +SOURCE=.\UPoint.h +# End Source File +# Begin Source File + +SOURCE=.\URect.h +# End Source File +# Begin Source File + +SOURCE=.\UT2BkgndInfo.h +# End Source File +# Begin Source File + +SOURCE=.\UT2Coordinate.h +# End Source File +# Begin Source File + +SOURCE=.\UT2Utils.h +# End Source File +# Begin Source File + +SOURCE=.\WalkerDlg.h +# End Source File +# Begin Source File + +SOURCE=.\Wave.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=.\res\T2DLL.rc2 +# End Source File +# End Group +# End Target +# End Project diff --git a/src/T2DLL/T2DLL.cpp b/src/T2DLL/T2DLL.cpp index 48cb3a7..113432f 100644 --- a/src/T2DLL/T2DLL.cpp +++ b/src/T2DLL/T2DLL.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DLL.h" AFX_DATA_EXPORT int kBlackColor = 255; diff --git a/src/T2DLL/T2DLL.def b/src/T2DLL/T2DLL.def new file mode 100644 index 0000000..cee7d2e --- /dev/null +++ b/src/T2DLL/T2DLL.def @@ -0,0 +1,6 @@ +; T2DLL.def : Declares the module parameters for the DLL. + +LIBRARY "T2DLL" +DESCRIPTION 'T2DLL Windows Dynamic Link Library' + +EXPORTS diff --git a/src/T2DLL/T2DLL.h b/src/T2DLL/T2DLL.h index e72bef2..8fad2d4 100644 --- a/src/T2DLL/T2DLL.h +++ b/src/T2DLL/T2DLL.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLL_H +#define T2DLL_T2DLL_H +#include "../common.h" class T2DLLApp : public CWinApp { public: @@ -18,3 +19,4 @@ extern AFX_EXT_DATA IDirectInputDevice2 *FFJoystick; extern AFX_EXT_DATA IDirectInputEffect *FFBuild; extern AFX_EXT_DATA IDirectInputEffect *FFStatic; extern AFX_EXT_DATA T2TowerDoc *g_TowerDoc; +#endif diff --git a/src/T2DLL/T2DLL.rc b/src/T2DLL/T2DLL.rc new file mode 100644 index 0000000..6d2e55b --- /dev/null +++ b/src/T2DLL/T2DLL.rc @@ -0,0 +1,124 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#define _AFX_NO_SPLITTER_RESOURCES\r\n" + "#define _AFX_NO_OLE_RESOURCES\r\n" + "#define _AFX_NO_TRACKER_RESOURCES\r\n" + "#define _AFX_NO_PROPERTY_RESOURCES\r\n" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" + "#ifdef _WIN32\r\n" + "LANGUAGE 9, 1\r\n" + "#pragma code_page(1252)\r\n" + "#endif\r\n" + "#include ""res\\T2DLL.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""afxres.rc"" // Standard components\r\n" + "#endif" + "\0" +END + +///////////////////////////////////////////////////////////////////////////// +#endif // APSTUDIO_INVOKED + + + + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE 9, 1 +#pragma code_page(1252) +#endif + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "T2DLL DLL\0" + VALUE "FileVersion", "1, 0, 0, 1\0" + VALUE "InternalName", "T2DLL\0" + VALUE "LegalCopyright", "Copyright (C) 1923\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename","T2DLL.DLL\0" + VALUE "ProductName", "T2DLL Dynamic Link Library\0" + VALUE "ProductVersion", "1, 0, 0, 1\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#define _AFX_NO_SPLITTER_RESOURCES +#define _AFX_NO_OLE_RESOURCES +#define _AFX_NO_TRACKER_RESOURCES +#define _AFX_NO_PROPERTY_RESOURCES + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE 9, 1 +#pragma code_page(1252) +#endif +#include "res\\T2DLL.rc2" // non-Microsoft Visual C++ edited resources +#include "afxres.rc" // Standard components +#endif + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/src/T2DLL/T2DateTime.cpp b/src/T2DLL/T2DateTime.cpp index 9938e93..e319e22 100644 --- a/src/T2DLL/T2DateTime.cpp +++ b/src/T2DLL/T2DateTime.cpp @@ -1,6 +1,7 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2DateTime.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldPlugin.h" T2DateTime::T2DateTime() { diff --git a/src/T2DLL/T2DateTime.h b/src/T2DLL/T2DateTime.h index aae18d4..207c1c4 100644 --- a/src/T2DLL/T2DateTime.h +++ b/src/T2DLL/T2DateTime.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DATETIME_H +#define T2DLL_T2DATETIME_H +#include "../common.h" class AFX_CLASS_EXPORT T2DateTime { public: @@ -69,3 +70,4 @@ protected: inline BOOL operator<=(const T2DateTime &a, const T2DateTime &b) { return a.CalcTotalCount() <= b.CalcTotalCount(); } +#endif diff --git a/src/T2DLL/T2DayLightFilter.cpp b/src/T2DLL/T2DayLightFilter.cpp index cf76d48..434dfd1 100644 --- a/src/T2DLL/T2DayLightFilter.cpp +++ b/src/T2DLL/T2DayLightFilter.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DayLightFilter.h" #include <MINMAX.H> diff --git a/src/T2DLL/T2DayLightFilter.h b/src/T2DLL/T2DayLightFilter.h index d64577a..5c7c661 100644 --- a/src/T2DLL/T2DayLightFilter.h +++ b/src/T2DLL/T2DayLightFilter.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DAYLIGHTFILTER_H +#define T2DLL_T2DAYLIGHTFILTER_H +#include "../common.h" class AFX_CLASS_EXPORT T2DayLightFilter { public: @@ -14,3 +15,4 @@ protected: RGBQUAD mBaseCol; int mTime; }; +#endif diff --git a/src/T2DLL/T2DayParamDef.cpp b/src/T2DLL/T2DayParamDef.cpp index 656479d..9194115 100644 --- a/src/T2DLL/T2DayParamDef.cpp +++ b/src/T2DLL/T2DayParamDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2DayParamDef.h" diff --git a/src/T2DLL/T2DayParamDef.h b/src/T2DLL/T2DayParamDef.h index 6e9b473..4f4674b 100644 --- a/src/T2DLL/T2DayParamDef.h +++ b/src/T2DLL/T2DayParamDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DAYPARAMDEF_H +#define T2DLL_T2DAYPARAMDEF_H +#include "../common.h" class AFX_CLASS_EXPORT T2DayParamDef { public: @@ -34,3 +35,4 @@ inline unsigned int T2DayParamDef::GetPercent(EDay day, EWhether whether) const inline float T2DayParamDef::GetRate(EDay day, EWhether whether) const { return mEntries[day][whether].mRate; } +#endif diff --git a/src/T2DLL/T2Dialog.cpp b/src/T2DLL/T2Dialog.cpp index 4823c7d..9f8b772 100644 --- a/src/T2DLL/T2Dialog.cpp +++ b/src/T2DLL/T2Dialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2AdvertiseTable.h" #include "T2Dialog.h" #include "T2DlgItemAnimation.h" @@ -16,7 +17,7 @@ #include "T2DlgItemRadioText.h" #include "T2DlgItemSTimeTbl.h" #include "T2PluginInfoTable.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2Dialog.h b/src/T2DLL/T2Dialog.h index 4f92ff8..172d5a0 100644 --- a/src/T2DLL/T2Dialog.h +++ b/src/T2DLL/T2Dialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DIALOG_H +#define T2DLL_T2DIALOG_H +#include "../common.h" #include "LListener.h" #include "T2DlgItemOK.h" #include "T2DlgItemCANCEL.h" @@ -109,3 +110,4 @@ protected: virtual void OnT2OK() {} virtual void OnT2Cancel() {} }; +#endif diff --git a/src/T2DLL/T2DlgItem.cpp b/src/T2DLL/T2DlgItem.cpp index 7f059d5..1d45e0c 100644 --- a/src/T2DLL/T2DlgItem.cpp +++ b/src/T2DLL/T2DlgItem.cpp @@ -1,6 +1,7 @@ +#include "StdAfx.h" #include "T2DlgItem.h" #include "T2ImageObj.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2DlgItem.h b/src/T2DLL/T2DlgItem.h index d025cbf..5e19faa 100644 --- a/src/T2DLL/T2DlgItem.h +++ b/src/T2DLL/T2DlgItem.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEM_H +#define T2DLL_T2DLGITEM_H +#include "../common.h" #include "LBroadcaster.h" class AFX_CLASS_EXPORT T2DlgItem : public CWnd, public LBroadcaster { @@ -64,3 +65,4 @@ protected: int mValue; int mPattern; }; +#endif diff --git a/src/T2DLL/T2DlgItemAPTable.cpp b/src/T2DLL/T2DlgItemAPTable.cpp index 029df73..019a1a9 100644 --- a/src/T2DLL/T2DlgItemAPTable.cpp +++ b/src/T2DLL/T2DlgItemAPTable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemAPTable.h" T2DlgItemAPTable::T2DlgItemAPTable(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette) diff --git a/src/T2DLL/T2DlgItemAPTable.h b/src/T2DLL/T2DlgItemAPTable.h index 3f36ae4..22dbb44 100644 --- a/src/T2DLL/T2DlgItemAPTable.h +++ b/src/T2DLL/T2DlgItemAPTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMAPTABLE_H +#define T2DLL_T2DLGITEMAPTABLE_H +#include "../common.h" #include "T2DlgItemImageTable.h" class AFX_CLASS_EXPORT T2DlgItemAPTable : public T2DlgItemImageTable { @@ -20,3 +21,4 @@ protected: CPoint mClickPoint; TableCellT mClickedCell; }; +#endif diff --git a/src/T2DLL/T2DlgItemAllPurpose.cpp b/src/T2DLL/T2DlgItemAllPurpose.cpp index 371be6e..6584881 100644 --- a/src/T2DLL/T2DlgItemAllPurpose.cpp +++ b/src/T2DLL/T2DlgItemAllPurpose.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemAllPurpose.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2DlgItemAllPurpose.h b/src/T2DLL/T2DlgItemAllPurpose.h index edf1aad..ee394f4 100644 --- a/src/T2DLL/T2DlgItemAllPurpose.h +++ b/src/T2DLL/T2DlgItemAllPurpose.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMALLPURPOSE_H +#define T2DLL_T2DLGITEMALLPURPOSE_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemAllPurpose : public T2DlgItem { @@ -20,3 +21,4 @@ protected: CPoint *mUpPoint; int mButton; }; +#endif diff --git a/src/T2DLL/T2DlgItemAnimation.cpp b/src/T2DLL/T2DlgItemAnimation.cpp index 905bcf5..c4a2808 100644 --- a/src/T2DLL/T2DlgItemAnimation.cpp +++ b/src/T2DLL/T2DlgItemAnimation.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2BitImage.h" #include "T2DlgItemAnimation.h" diff --git a/src/T2DLL/T2DlgItemAnimation.h b/src/T2DLL/T2DlgItemAnimation.h index c541b70..8c15f28 100644 --- a/src/T2DLL/T2DlgItemAnimation.h +++ b/src/T2DLL/T2DlgItemAnimation.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMANIMATION_H +#define T2DLL_T2DLGITEMANIMATION_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemAnimation : public T2DlgItem { @@ -22,3 +23,4 @@ protected: int mDelay; BOOL mTimerCreated; }; +#endif diff --git a/src/T2DLL/T2DlgItemArrows.cpp b/src/T2DLL/T2DlgItemArrows.cpp index a27fce6..f70651f 100644 --- a/src/T2DLL/T2DlgItemArrows.cpp +++ b/src/T2DLL/T2DlgItemArrows.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2BitImage.h" #include "T2DlgItemArrows.h" diff --git a/src/T2DLL/T2DlgItemArrows.h b/src/T2DLL/T2DlgItemArrows.h index 313cb69..a846f70 100644 --- a/src/T2DLL/T2DlgItemArrows.h +++ b/src/T2DLL/T2DlgItemArrows.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMARROWS_H +#define T2DLL_T2DLGITEMARROWS_H +#include "../common.h" #include "T2DlgItem.h" class T2DlgItemArrows : public T2DlgItem { @@ -24,3 +25,4 @@ protected: int mMaximum; BOOL mIsClicked; }; +#endif diff --git a/src/T2DLL/T2DlgItemBelongGage.cpp b/src/T2DLL/T2DlgItemBelongGage.cpp index 5320576..8aa8281 100644 --- a/src/T2DLL/T2DlgItemBelongGage.cpp +++ b/src/T2DLL/T2DlgItemBelongGage.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemBelongGage.h" #include "T2Tenant.h" diff --git a/src/T2DLL/T2DlgItemBelongGage.h b/src/T2DLL/T2DlgItemBelongGage.h index 878be44..50aed91 100644 --- a/src/T2DLL/T2DlgItemBelongGage.h +++ b/src/T2DLL/T2DlgItemBelongGage.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMBELONGGAGE_H +#define T2DLL_T2DLGITEMBELONGGAGE_H +#include "../common.h" #include "T2DlgItemGageBase.h" class AFX_CLASS_EXPORT T2DlgItemBelongGage : public T2DlgItemGageBase { @@ -18,3 +19,4 @@ protected: T2Tenant *mTenant; }; +#endif diff --git a/src/T2DLL/T2DlgItemBox.cpp b/src/T2DLL/T2DlgItemBox.cpp index d4cd62a..3c9c544 100644 --- a/src/T2DLL/T2DlgItemBox.cpp +++ b/src/T2DLL/T2DlgItemBox.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemBox.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2DlgItemBox.h b/src/T2DLL/T2DlgItemBox.h index b63b3aa..81bbb1a 100644 --- a/src/T2DLL/T2DlgItemBox.h +++ b/src/T2DLL/T2DlgItemBox.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMBOX_H +#define T2DLL_T2DLGITEMBOX_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemBox : public T2DlgItem { @@ -8,3 +9,4 @@ public: protected: virtual BOOL OnT2DlgItemEraseBkgnd(CDC*); }; +#endif diff --git a/src/T2DLL/T2DlgItemButtonBase.cpp b/src/T2DLL/T2DlgItemButtonBase.cpp index bb2fc14..35dad82 100644 --- a/src/T2DLL/T2DlgItemButtonBase.cpp +++ b/src/T2DLL/T2DlgItemButtonBase.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemButtonBase.h" T2DlgItemButtonBase::T2DlgItemButtonBase(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette) diff --git a/src/T2DLL/T2DlgItemButtonBase.h b/src/T2DLL/T2DlgItemButtonBase.h index aba1e15..f9955ad 100644 --- a/src/T2DLL/T2DlgItemButtonBase.h +++ b/src/T2DLL/T2DlgItemButtonBase.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMBUTTONBASE_H +#define T2DLL_T2DLGITEMBUTTONBASE_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemButtonBase : public T2DlgItem { @@ -13,3 +14,4 @@ protected: BOOL mIsClicked; }; +#endif diff --git a/src/T2DLL/T2DlgItemCANCEL.cpp b/src/T2DLL/T2DlgItemCANCEL.cpp index b75bcc9..ac8c07c 100644 --- a/src/T2DLL/T2DlgItemCANCEL.cpp +++ b/src/T2DLL/T2DlgItemCANCEL.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemCANCEL.h" T2DlgItemCANCEL::T2DlgItemCANCEL(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette) diff --git a/src/T2DLL/T2DlgItemCANCEL.h b/src/T2DLL/T2DlgItemCANCEL.h index 8dd6d61..e7a0088 100644 --- a/src/T2DLL/T2DlgItemCANCEL.h +++ b/src/T2DLL/T2DlgItemCANCEL.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMCANCEL_H +#define T2DLL_T2DLGITEMCANCEL_H +#include "../common.h" #include "T2DlgItemIButton.h" class AFX_CLASS_EXPORT T2DlgItemCANCEL : public T2DlgItemIButton { @@ -7,3 +8,4 @@ public: T2DlgItemCANCEL(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette); virtual BOOL Create(const char* windowName, DWORD style, const RECT& inRect, CWnd* parentWnd, UINT nId); }; +#endif diff --git a/src/T2DLL/T2DlgItemCheck.cpp b/src/T2DLL/T2DlgItemCheck.cpp index 5bb0427..2fdab2d 100644 --- a/src/T2DLL/T2DlgItemCheck.cpp +++ b/src/T2DLL/T2DlgItemCheck.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemCheck.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2DlgItemCheck.h b/src/T2DLL/T2DlgItemCheck.h index 0f0335a..ca9c1b1 100644 --- a/src/T2DLL/T2DlgItemCheck.h +++ b/src/T2DLL/T2DlgItemCheck.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMCHECK_H +#define T2DLL_T2DLGITEMCHECK_H +#include "../common.h" #include "T2DlgItemICheck.h" class AFX_CLASS_EXPORT T2DlgItemCheck : public T2DlgItemICheck { @@ -7,3 +8,4 @@ public: T2DlgItemCheck(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette); virtual BOOL Create(const char* windowName, DWORD style, const RECT& inRect, CWnd* parentWnd, UINT nId); }; +#endif diff --git a/src/T2DLL/T2DlgItemCustomerGage.cpp b/src/T2DLL/T2DlgItemCustomerGage.cpp index 2b395a6..f18d8b2 100644 --- a/src/T2DLL/T2DlgItemCustomerGage.cpp +++ b/src/T2DLL/T2DlgItemCustomerGage.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemCustomerGage.h" #include "T2Tenant.h" diff --git a/src/T2DLL/T2DlgItemCustomerGage.h b/src/T2DLL/T2DlgItemCustomerGage.h index 29d5ea2..649bc14 100644 --- a/src/T2DLL/T2DlgItemCustomerGage.h +++ b/src/T2DLL/T2DlgItemCustomerGage.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMCUSTOMERGAGE_H +#define T2DLL_T2DLGITEMCUSTOMERGAGE_H +#include "../common.h" #include "T2DlgItemGageBase.h" class AFX_CLASS_EXPORT T2DlgItemCustomerGage : public T2DlgItemGageBase { @@ -18,3 +19,4 @@ protected: T2Tenant *mTenant; }; +#endif diff --git a/src/T2DLL/T2DlgItemEdit.cpp b/src/T2DLL/T2DlgItemEdit.cpp index 0e73a02..093cbd2 100644 --- a/src/T2DLL/T2DlgItemEdit.cpp +++ b/src/T2DLL/T2DlgItemEdit.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #define ATOI_KLUDGE #include "CEditWFocus.h" #include "T2DlgItemEdit.h" diff --git a/src/T2DLL/T2DlgItemEdit.h b/src/T2DLL/T2DlgItemEdit.h index 5c95ad2..3bbc31c 100644 --- a/src/T2DLL/T2DlgItemEdit.h +++ b/src/T2DLL/T2DlgItemEdit.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMEDIT_H +#define T2DLL_T2DLGITEMEDIT_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemEdit : public T2DlgItem { @@ -21,3 +22,4 @@ protected: CEditWFocus *mSubItem; }; +#endif diff --git a/src/T2DLL/T2DlgItemGageBase.cpp b/src/T2DLL/T2DlgItemGageBase.cpp index 02ff085..a4ab67b 100644 --- a/src/T2DLL/T2DlgItemGageBase.cpp +++ b/src/T2DLL/T2DlgItemGageBase.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemGageBase.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2DlgItemGageBase.h b/src/T2DLL/T2DlgItemGageBase.h index 375f535..b4bf216 100644 --- a/src/T2DLL/T2DlgItemGageBase.h +++ b/src/T2DLL/T2DlgItemGageBase.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMGAGEBASE_H +#define T2DLL_T2DLGITEMGAGEBASE_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemGageBase : public T2DlgItem { @@ -19,3 +20,4 @@ protected: void DrawValueByText(CDC*, const CRect&); int CalcPos(const CRect&, int, int, int); }; +#endif diff --git a/src/T2DLL/T2DlgItemHScr.cpp b/src/T2DLL/T2DlgItemHScr.cpp index b230824..f2466ee 100644 --- a/src/T2DLL/T2DlgItemHScr.cpp +++ b/src/T2DLL/T2DlgItemHScr.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2BitImage.h" #include "T2DlgItemHScr.h" diff --git a/src/T2DLL/T2DlgItemHScr.h b/src/T2DLL/T2DlgItemHScr.h index 34fd5c9..c822eb4 100644 --- a/src/T2DLL/T2DlgItemHScr.h +++ b/src/T2DLL/T2DlgItemHScr.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMHSCR_H +#define T2DLL_T2DLGITEMHSCR_H +#include "../common.h" #include "T2DlgItemScr.h" class AFX_CLASS_EXPORT T2DlgItemHScr : public T2DlgItemScr { @@ -13,3 +14,4 @@ protected: virtual int PositionToValue(const CPoint&) const; virtual int PositionToValue(const CRect&) const; }; +#endif diff --git a/src/T2DLL/T2DlgItemIButton.cpp b/src/T2DLL/T2DlgItemIButton.cpp index 4d39112..59d7ab0 100644 --- a/src/T2DLL/T2DlgItemIButton.cpp +++ b/src/T2DLL/T2DlgItemIButton.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2BitImage.h" #include "T2DlgItemIButton.h" diff --git a/src/T2DLL/T2DlgItemIButton.h b/src/T2DLL/T2DlgItemIButton.h index d0085d1..3758e1e 100644 --- a/src/T2DLL/T2DlgItemIButton.h +++ b/src/T2DLL/T2DlgItemIButton.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMIBUTTON_H +#define T2DLL_T2DLGITEMIBUTTON_H +#include "../common.h" #include "T2DlgItemButtonBase.h" class AFX_CLASS_EXPORT T2DlgItemIButton : public T2DlgItemButtonBase { @@ -8,3 +9,4 @@ public: protected: virtual BOOL OnT2DlgItemEraseBkgnd(CDC*); }; +#endif diff --git a/src/T2DLL/T2DlgItemICheck.cpp b/src/T2DLL/T2DlgItemICheck.cpp index bbe6b24..2c4f81e 100644 --- a/src/T2DLL/T2DlgItemICheck.cpp +++ b/src/T2DLL/T2DlgItemICheck.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2BitImage.h" #include "T2DlgItemICheck.h" diff --git a/src/T2DLL/T2DlgItemICheck.h b/src/T2DLL/T2DlgItemICheck.h index f04e411..f75cf0d 100644 --- a/src/T2DLL/T2DlgItemICheck.h +++ b/src/T2DLL/T2DlgItemICheck.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMICHECK_H +#define T2DLL_T2DLGITEMICHECK_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemICheck : public T2DlgItem { @@ -13,3 +14,4 @@ protected: virtual void OnT2DlgItemLButtonUp(UINT, CPoint); virtual void OnT2DlgItemMouseMove(UINT, CPoint); }; +#endif diff --git a/src/T2DLL/T2DlgItemIRepeater.cpp b/src/T2DLL/T2DlgItemIRepeater.cpp index b671ca7..597d4c4 100644 --- a/src/T2DLL/T2DlgItemIRepeater.cpp +++ b/src/T2DLL/T2DlgItemIRepeater.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemIRepeater.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2DlgItemIRepeater.h b/src/T2DLL/T2DlgItemIRepeater.h index c27e943..de5d22e 100644 --- a/src/T2DLL/T2DlgItemIRepeater.h +++ b/src/T2DLL/T2DlgItemIRepeater.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMIREPEATER_H +#define T2DLL_T2DLGITEMIREPEATER_H +#include "../common.h" #include "T2DlgItemIButton.h" class T2DlgItemIRepeater : public T2DlgItemIButton { @@ -14,3 +15,4 @@ protected: UINT mTimerID; }; +#endif diff --git a/src/T2DLL/T2DlgItemImage.cpp b/src/T2DLL/T2DlgItemImage.cpp index e567135..ee76c01 100644 --- a/src/T2DLL/T2DlgItemImage.cpp +++ b/src/T2DLL/T2DlgItemImage.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2BitImage.h" #include "T2DlgItemImage.h" diff --git a/src/T2DLL/T2DlgItemImage.h b/src/T2DLL/T2DlgItemImage.h index 20e93fd..0d9b949 100644 --- a/src/T2DLL/T2DlgItemImage.h +++ b/src/T2DLL/T2DlgItemImage.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMIMAGE_H +#define T2DLL_T2DLGITEMIMAGE_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemImage : public T2DlgItem { @@ -11,3 +12,4 @@ protected: virtual BOOL OnT2DlgItemEraseBkgnd(CDC* pDC); T2BitImage* GetDrawImage(CRect& outRect) const; }; +#endif diff --git a/src/T2DLL/T2DlgItemImageTable.cpp b/src/T2DLL/T2DlgItemImageTable.cpp index e4b8b21..f5d4a3b 100644 --- a/src/T2DLL/T2DlgItemImageTable.cpp +++ b/src/T2DLL/T2DlgItemImageTable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemImageTable.h" T2DlgItemImageTable::T2DlgItemImageTable(T2TowerDoc* towerDoc, T2ImageObj* imageObj, CPalette* palette) diff --git a/src/T2DLL/T2DlgItemImageTable.h b/src/T2DLL/T2DlgItemImageTable.h index 82f0aa6..8a54b0c 100644 --- a/src/T2DLL/T2DlgItemImageTable.h +++ b/src/T2DLL/T2DlgItemImageTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMIMAGETABLE_H +#define T2DLL_T2DLGITEMIMAGETABLE_H +#include "../common.h" #include "T2DlgItemTable.h" class AFX_CLASS_EXPORT T2DlgItemImageTable : public T2DlgItemTable { @@ -12,3 +13,4 @@ protected: virtual void UnhiliteCell(CDC*, const TableCellT&); virtual void DrawCellSelf(CDC *dc, const TableCellT& cell, BOOL isSelected) = 0; }; +#endif diff --git a/src/T2DLL/T2DlgItemListBox.cpp b/src/T2DLL/T2DlgItemListBox.cpp index 66ad24e..0cc7435 100644 --- a/src/T2DLL/T2DlgItemListBox.cpp +++ b/src/T2DLL/T2DlgItemListBox.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemListBox.h" T2DlgItemListBox::T2DlgItemListBox(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette) diff --git a/src/T2DLL/T2DlgItemListBox.h b/src/T2DLL/T2DlgItemListBox.h index e506c2b..e6d081d 100644 --- a/src/T2DLL/T2DlgItemListBox.h +++ b/src/T2DLL/T2DlgItemListBox.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMLISTBOX_H +#define T2DLL_T2DLGITEMLISTBOX_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemListBox : public T2DlgItem { @@ -21,3 +22,4 @@ public: protected: CListBox *mListBox; }; +#endif diff --git a/src/T2DLL/T2DlgItemMerchandiseField.cpp b/src/T2DLL/T2DlgItemMerchandiseField.cpp index bc02ee0..fbdb759 100644 --- a/src/T2DLL/T2DlgItemMerchandiseField.cpp +++ b/src/T2DLL/T2DlgItemMerchandiseField.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CEditWFocus.h" #include "T2Dialog.h" #include "T2DlgItemMerchandiseField.h" diff --git a/src/T2DLL/T2DlgItemMerchandiseField.h b/src/T2DLL/T2DlgItemMerchandiseField.h index 7b42004..5726248 100644 --- a/src/T2DLL/T2DlgItemMerchandiseField.h +++ b/src/T2DLL/T2DlgItemMerchandiseField.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMMERCHANDISEFIELD_H +#define T2DLL_T2DLGITEMMERCHANDISEFIELD_H +#include "../common.h" #include "T2DlgItemEdit.h" class T2DlgItemMerchandiseField : public T2DlgItemEdit { @@ -11,3 +12,4 @@ public: void OnT2SetFocus(CWnd *inWnd); void OnT2KillFocus(CWnd *inWnd); }; +#endif diff --git a/src/T2DLL/T2DlgItemMovie.cpp b/src/T2DLL/T2DlgItemMovie.cpp index 8e6e324..1fd9f08 100644 --- a/src/T2DLL/T2DlgItemMovie.cpp +++ b/src/T2DLL/T2DlgItemMovie.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2BitImage.h" #include "T2DlgItemMovie.h" diff --git a/src/T2DLL/T2DlgItemMovie.h b/src/T2DLL/T2DlgItemMovie.h index cd80027..af8b850 100644 --- a/src/T2DLL/T2DlgItemMovie.h +++ b/src/T2DLL/T2DlgItemMovie.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMMOVIE_H +#define T2DLL_T2DLGITEMMOVIE_H +#include "../common.h" #include "T2DlgItem.h" // DirectShow #include <strmif.h> @@ -31,3 +32,4 @@ protected: IVideoWindow *mVideoWindow; IMediaPosition *mMediaPosition; }; +#endif diff --git a/src/T2DLL/T2DlgItemOK.cpp b/src/T2DLL/T2DlgItemOK.cpp index 07a7d08..ab955cb 100644 --- a/src/T2DLL/T2DlgItemOK.cpp +++ b/src/T2DLL/T2DlgItemOK.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemOK.h" T2DlgItemOK::T2DlgItemOK(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette) diff --git a/src/T2DLL/T2DlgItemOK.h b/src/T2DLL/T2DlgItemOK.h index 99a4e75..1257771 100644 --- a/src/T2DLL/T2DlgItemOK.h +++ b/src/T2DLL/T2DlgItemOK.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMOK_H +#define T2DLL_T2DLGITEMOK_H +#include "../common.h" #include "T2DlgItemIButton.h" class AFX_CLASS_EXPORT T2DlgItemOK : public T2DlgItemIButton { @@ -7,3 +8,4 @@ public: T2DlgItemOK(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette); virtual BOOL Create(const char* windowName, DWORD style, const RECT& inRect, CWnd* parentWnd, UINT nId); }; +#endif diff --git a/src/T2DLL/T2DlgItemPPLEvalGage.cpp b/src/T2DLL/T2DlgItemPPLEvalGage.cpp index 41b289b..5be309e 100644 --- a/src/T2DLL/T2DlgItemPPLEvalGage.cpp +++ b/src/T2DLL/T2DlgItemPPLEvalGage.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemPPLEvalGage.h" #include "T2People.h" #include "T2PeopleDef.h" diff --git a/src/T2DLL/T2DlgItemPPLEvalGage.h b/src/T2DLL/T2DlgItemPPLEvalGage.h index 8156c8a..61f2f61 100644 --- a/src/T2DLL/T2DlgItemPPLEvalGage.h +++ b/src/T2DLL/T2DlgItemPPLEvalGage.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMPPLEVALGAGE_H +#define T2DLL_T2DLGITEMPPLEVALGAGE_H +#include "../common.h" #include "T2DlgItemGageBase.h" class AFX_CLASS_EXPORT T2DlgItemPPLEvalGage : public T2DlgItemGageBase { @@ -18,3 +19,4 @@ protected: T2People *mPeople; }; +#endif diff --git a/src/T2DLL/T2DlgItemPeopleView.cpp b/src/T2DLL/T2DlgItemPeopleView.cpp index c205a2a..e3435d5 100644 --- a/src/T2DLL/T2DlgItemPeopleView.cpp +++ b/src/T2DLL/T2DlgItemPeopleView.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "LArray.h" #include "T2BitImage.h" #include "T2DlgItemHScr.h" diff --git a/src/T2DLL/T2DlgItemPeopleView.h b/src/T2DLL/T2DlgItemPeopleView.h index 7d1fb29..d3ce9b9 100644 --- a/src/T2DLL/T2DlgItemPeopleView.h +++ b/src/T2DLL/T2DlgItemPeopleView.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMPEOPLEVIEW_H +#define T2DLL_T2DLGITEMPEOPLEVIEW_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemPeopleView : public T2DlgItem { @@ -30,3 +31,4 @@ protected: int _98; CWnd *mParent; }; +#endif diff --git a/src/T2DLL/T2DlgItemPopup.cpp b/src/T2DLL/T2DlgItemPopup.cpp index dc268c1..14d624e 100644 --- a/src/T2DLL/T2DlgItemPopup.cpp +++ b/src/T2DLL/T2DlgItemPopup.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CTokenizer.h" #include "T2DlgItemPopup.h" diff --git a/src/T2DLL/T2DlgItemPopup.h b/src/T2DLL/T2DlgItemPopup.h index ae1cf73..0f6a9e6 100644 --- a/src/T2DLL/T2DlgItemPopup.h +++ b/src/T2DLL/T2DlgItemPopup.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMPOPUP_H +#define T2DLL_T2DLGITEMPOPUP_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemPopup : public T2DlgItem { @@ -18,3 +19,4 @@ protected: CMenu *mMenu; BOOL mMenuClicked; }; +#endif diff --git a/src/T2DLL/T2DlgItemProfitsGage.cpp b/src/T2DLL/T2DlgItemProfitsGage.cpp index 27e7ffa..64ead89 100644 --- a/src/T2DLL/T2DlgItemProfitsGage.cpp +++ b/src/T2DLL/T2DlgItemProfitsGage.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemProfitsGage.h" #include "T2Tenant.h" diff --git a/src/T2DLL/T2DlgItemProfitsGage.h b/src/T2DLL/T2DlgItemProfitsGage.h index 4c6ca24..42d57ae 100644 --- a/src/T2DLL/T2DlgItemProfitsGage.h +++ b/src/T2DLL/T2DlgItemProfitsGage.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMPROFITSGAGE_H +#define T2DLL_T2DLGITEMPROFITSGAGE_H +#include "../common.h" #include "T2DlgItemGageBase.h" class AFX_CLASS_EXPORT T2DlgItemProfitsGage : public T2DlgItemGageBase { @@ -21,3 +22,4 @@ protected: int mCost; T2Tenant *mTenant; }; +#endif diff --git a/src/T2DLL/T2DlgItemProgress.cpp b/src/T2DLL/T2DlgItemProgress.cpp index d82088a..752759c 100644 --- a/src/T2DLL/T2DlgItemProgress.cpp +++ b/src/T2DLL/T2DlgItemProgress.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemProgress.h" T2DlgItemProgress::T2DlgItemProgress(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette) diff --git a/src/T2DLL/T2DlgItemProgress.h b/src/T2DLL/T2DlgItemProgress.h index 5c2b41e..8490853 100644 --- a/src/T2DLL/T2DlgItemProgress.h +++ b/src/T2DLL/T2DlgItemProgress.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMPROGRESS_H +#define T2DLL_T2DLGITEMPROGRESS_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemProgress : public T2DlgItem { @@ -17,3 +18,4 @@ public: protected: CProgressCtrl *mSubItem; }; +#endif diff --git a/src/T2DLL/T2DlgItemRadioButton.cpp b/src/T2DLL/T2DlgItemRadioButton.cpp index ca7af43..6b26b07 100644 --- a/src/T2DLL/T2DlgItemRadioButton.cpp +++ b/src/T2DLL/T2DlgItemRadioButton.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemRadioButton.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2DlgItemRadioButton.h b/src/T2DLL/T2DlgItemRadioButton.h index 8e67088..fa498ac 100644 --- a/src/T2DLL/T2DlgItemRadioButton.h +++ b/src/T2DLL/T2DlgItemRadioButton.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMRADIOBUTTON_H +#define T2DLL_T2DLGITEMRADIOBUTTON_H +#include "../common.h" #include "T2DlgItemICheck.h" class T2DlgItemRadioButton : public T2DlgItemICheck { @@ -9,4 +10,5 @@ public: protected: void OnT2DlgItemLButtonDown(UINT inFlags, CPoint inPt); -};
\ No newline at end of file +}; +#endif diff --git a/src/T2DLL/T2DlgItemRadioText.cpp b/src/T2DLL/T2DlgItemRadioText.cpp index 84614f9..af652f6 100644 --- a/src/T2DLL/T2DlgItemRadioText.cpp +++ b/src/T2DLL/T2DlgItemRadioText.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2BitImage.h" #include "T2DlgItemRadioText.h" diff --git a/src/T2DLL/T2DlgItemRadioText.h b/src/T2DLL/T2DlgItemRadioText.h index 6a99861..c2100c0 100644 --- a/src/T2DLL/T2DlgItemRadioText.h +++ b/src/T2DLL/T2DlgItemRadioText.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMRADIOTEXT_H +#define T2DLL_T2DLGITEMRADIOTEXT_H +#include "../common.h" #include "T2DlgItemICheck.h" class T2DlgItemRadioText : public T2DlgItemICheck { @@ -14,3 +15,4 @@ protected: char mText[256]; }; +#endif diff --git a/src/T2DLL/T2DlgItemSTimeTbl.cpp b/src/T2DLL/T2DlgItemSTimeTbl.cpp index 985459d..bdb9bcd 100644 --- a/src/T2DLL/T2DlgItemSTimeTbl.cpp +++ b/src/T2DLL/T2DlgItemSTimeTbl.cpp @@ -1,6 +1,7 @@ +#include "StdAfx.h" #include "T2DlgItemSTimeTbl.h" #include "T2MetroRailway.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2DlgItemSTimeTbl.h b/src/T2DLL/T2DlgItemSTimeTbl.h index 733015d..2133202 100644 --- a/src/T2DLL/T2DlgItemSTimeTbl.h +++ b/src/T2DLL/T2DlgItemSTimeTbl.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMSTIMETBL_H +#define T2DLL_T2DLGITEMSTIMETBL_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemSTimeTbl : public T2DlgItem { @@ -16,3 +17,4 @@ private: CFont *mCFont; int mGrade; }; +#endif diff --git a/src/T2DLL/T2DlgItemScr.cpp b/src/T2DLL/T2DlgItemScr.cpp index 46b034f..a615116 100644 --- a/src/T2DLL/T2DlgItemScr.cpp +++ b/src/T2DLL/T2DlgItemScr.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemScr.h" T2DlgItemScr::T2DlgItemScr(T2TowerDoc* towerDoc, T2ImageObj* imageObj, CPalette* palette) diff --git a/src/T2DLL/T2DlgItemScr.h b/src/T2DLL/T2DlgItemScr.h index 39a120a..475f6be 100644 --- a/src/T2DLL/T2DlgItemScr.h +++ b/src/T2DLL/T2DlgItemScr.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMSCR_H +#define T2DLL_T2DLGITEMSCR_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemScr : public T2DlgItem { @@ -43,3 +44,4 @@ protected: int mClickedArea; UINT mTimerID; }; +#endif diff --git a/src/T2DLL/T2DlgItemStressGage.cpp b/src/T2DLL/T2DlgItemStressGage.cpp index 0f6f106..90bdf9f 100644 --- a/src/T2DLL/T2DlgItemStressGage.cpp +++ b/src/T2DLL/T2DlgItemStressGage.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemStressGage.h" #include "T2People.h" #include "T2PeopleDef.h" diff --git a/src/T2DLL/T2DlgItemStressGage.h b/src/T2DLL/T2DlgItemStressGage.h index 66120a6..171e81d 100644 --- a/src/T2DLL/T2DlgItemStressGage.h +++ b/src/T2DLL/T2DlgItemStressGage.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMSTRESSGAGE_H +#define T2DLL_T2DLGITEMSTRESSGAGE_H +#include "../common.h" #include "T2DlgItemGageBase.h" class AFX_CLASS_EXPORT T2DlgItemStressGage : public T2DlgItemGageBase { @@ -18,3 +19,4 @@ protected: T2People *mPeople; }; +#endif diff --git a/src/T2DLL/T2DlgItemTButton.cpp b/src/T2DLL/T2DlgItemTButton.cpp index d6b4293..04067a2 100644 --- a/src/T2DLL/T2DlgItemTButton.cpp +++ b/src/T2DLL/T2DlgItemTButton.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemTButton.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2DlgItemTButton.h b/src/T2DLL/T2DlgItemTButton.h index 6a1287b..62bc51b 100644 --- a/src/T2DLL/T2DlgItemTButton.h +++ b/src/T2DLL/T2DlgItemTButton.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMTBUTTON_H +#define T2DLL_T2DLGITEMTBUTTON_H +#include "../common.h" #include "T2DlgItemButtonBase.h" class AFX_CLASS_EXPORT T2DlgItemTButton : public T2DlgItemButtonBase { @@ -8,3 +9,4 @@ public: protected: virtual BOOL OnT2DlgItemEraseBkgnd(CDC* pDC); }; +#endif diff --git a/src/T2DLL/T2DlgItemTab.cpp b/src/T2DLL/T2DlgItemTab.cpp index fdf0d2f..023e62f 100644 --- a/src/T2DLL/T2DlgItemTab.cpp +++ b/src/T2DLL/T2DlgItemTab.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CTokenizer.h" #include "T2DlgItemTab.h" diff --git a/src/T2DLL/T2DlgItemTab.h b/src/T2DLL/T2DlgItemTab.h index e3978f2..9d43a7c 100644 --- a/src/T2DLL/T2DlgItemTab.h +++ b/src/T2DLL/T2DlgItemTab.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMTAB_H +#define T2DLL_T2DLGITEMTAB_H +#include "../common.h" #include "T2DlgItem.h" class CustomTabControl; @@ -18,3 +19,4 @@ protected: CustomTabControl *mSubItem; }; +#endif diff --git a/src/T2DLL/T2DlgItemTable.cpp b/src/T2DLL/T2DlgItemTable.cpp index 1af0ee4..a0d3867 100644 --- a/src/T2DLL/T2DlgItemTable.cpp +++ b/src/T2DLL/T2DlgItemTable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemHScr.h" #include "T2DlgItemTable.h" #include "T2DlgItemVScr.h" diff --git a/src/T2DLL/T2DlgItemTable.h b/src/T2DLL/T2DlgItemTable.h index f62fd63..adb2021 100644 --- a/src/T2DLL/T2DlgItemTable.h +++ b/src/T2DLL/T2DlgItemTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMTABLE_H +#define T2DLL_T2DLGITEMTABLE_H +#include "../common.h" #include "LListener.h" #include "T2DlgItem.h" @@ -107,3 +108,4 @@ protected: UINT mFirstCol; UINT mLastCol; }; +#endif diff --git a/src/T2DLL/T2DlgItemText.cpp b/src/T2DLL/T2DlgItemText.cpp index 415a460..8b4a5af 100644 --- a/src/T2DLL/T2DlgItemText.cpp +++ b/src/T2DLL/T2DlgItemText.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItemText.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2DlgItemText.h b/src/T2DLL/T2DlgItemText.h index 6c85cfa..c98c331 100644 --- a/src/T2DLL/T2DlgItemText.h +++ b/src/T2DLL/T2DlgItemText.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMTEXT_H +#define T2DLL_T2DLGITEMTEXT_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2DlgItemText : public T2DlgItem { @@ -21,3 +22,4 @@ protected: CString mPreviousString; UINT mTimerID; }; +#endif diff --git a/src/T2DLL/T2DlgItemVScr.cpp b/src/T2DLL/T2DlgItemVScr.cpp index 2dcf999..77df760 100644 --- a/src/T2DLL/T2DlgItemVScr.cpp +++ b/src/T2DLL/T2DlgItemVScr.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2BitImage.h" #include "T2DlgItemVScr.h" diff --git a/src/T2DLL/T2DlgItemVScr.h b/src/T2DLL/T2DlgItemVScr.h index 9d98c15..4c9e4bb 100644 --- a/src/T2DLL/T2DlgItemVScr.h +++ b/src/T2DLL/T2DlgItemVScr.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DLGITEMVSCR_H +#define T2DLL_T2DLGITEMVSCR_H +#include "../common.h" #include "T2DlgItemScr.h" class AFX_CLASS_EXPORT T2DlgItemVScr : public T2DlgItemScr { @@ -13,3 +14,4 @@ protected: virtual int PositionToValue(const CPoint&) const; virtual int PositionToValue(const CRect&) const; }; +#endif diff --git a/src/T2DLL/T2DrawableObject.cpp b/src/T2DLL/T2DrawableObject.cpp index 5775da7..e484a63 100644 --- a/src/T2DLL/T2DrawableObject.cpp +++ b/src/T2DLL/T2DrawableObject.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DrawableObject.h" #include "T2InfoDialog.h" diff --git a/src/T2DLL/T2DrawableObject.h b/src/T2DLL/T2DrawableObject.h index 42bdca3..652ff32 100644 --- a/src/T2DLL/T2DrawableObject.h +++ b/src/T2DLL/T2DrawableObject.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2DRAWABLEOBJECT_H +#define T2DLL_T2DRAWABLEOBJECT_H +#include "../common.h" #include "T2Object.h" class AFX_CLASS_EXPORT T2DrawableObject : public T2Object { @@ -13,3 +14,4 @@ protected: virtual void DrawSelf(T2TowerDoc*, const RECT&); virtual T2InfoDialog* ConstructInfoDialog(); }; +#endif diff --git a/src/T2DLL/T2ElevatorModule.cpp b/src/T2DLL/T2ElevatorModule.cpp index 5835aad..db59073 100644 --- a/src/T2DLL/T2ElevatorModule.cpp +++ b/src/T2DLL/T2ElevatorModule.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2ElevatorModule.h" #include "T2FloorInfo.h" @@ -9,8 +10,8 @@ #include "T2Request.h" #include "T2StopInfoArray.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "UT2Coordinate.h" T2ElevatorModule::T2ElevatorModule(int index) { diff --git a/src/T2DLL/T2ElevatorModule.h b/src/T2DLL/T2ElevatorModule.h index c1151fe..b79f6b1 100644 --- a/src/T2DLL/T2ElevatorModule.h +++ b/src/T2DLL/T2ElevatorModule.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ELEVATORMODULE_H +#define T2DLL_T2ELEVATORMODULE_H +#include "../common.h" #include "T2MoverModule.h" enum { @@ -86,3 +87,4 @@ inline int T2ElevatorModule::GetHomePosition() const { result = mHomePosition; return result; } +#endif diff --git a/src/T2DLL/T2ElvModuleList.cpp b/src/T2DLL/T2ElvModuleList.cpp index 0ed388f..9203e36 100644 --- a/src/T2DLL/T2ElvModuleList.cpp +++ b/src/T2DLL/T2ElvModuleList.cpp @@ -1,8 +1,9 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2ElevatorModule.h" #include "T2ElvModuleList.h" #include "T2MoverDef.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "UT2Coordinate.h" T2ElvModuleList::T2ElvModuleList() { diff --git a/src/T2DLL/T2ElvModuleList.h b/src/T2DLL/T2ElvModuleList.h index 1547a0f..8c1c48b 100644 --- a/src/T2DLL/T2ElvModuleList.h +++ b/src/T2DLL/T2ElvModuleList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ELVMODULELIST_H +#define T2DLL_T2ELVMODULELIST_H +#include "../common.h" #include "T2MoverModuleList.h" class AFX_CLASS_EXPORT T2ElvModuleList : public T2MoverModuleList { @@ -25,3 +26,4 @@ protected: RECT mModuleInset; }; +#endif diff --git a/src/T2DLL/T2Equip.cpp b/src/T2DLL/T2Equip.cpp index f2221d2..7f17091 100644 --- a/src/T2DLL/T2Equip.cpp +++ b/src/T2DLL/T2Equip.cpp @@ -1,10 +1,11 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2Archive.h" #include "T2DateTime.h" #include "T2Equip.h" #include "T2RouteCEArray.h" #include "T2SoundPlayer.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" T2Equip::T2Equip() { mEquipID = 0; diff --git a/src/T2DLL/T2Equip.h b/src/T2DLL/T2Equip.h index 2c0aa2e..923d4ef 100644 --- a/src/T2DLL/T2Equip.h +++ b/src/T2DLL/T2Equip.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2EQUIP_H +#define T2DLL_T2EQUIP_H +#include "../common.h" #include "T2EquipDef.h" #include "T2HaveOutViewObject.h" @@ -109,3 +110,4 @@ inline int T2Equip::GetPatIndex() const { inline void T2Equip::SetPatIndex(int i) { mPatIndex = i; } +#endif diff --git a/src/T2DLL/T2EquipDef.cpp b/src/T2DLL/T2EquipDef.cpp index 2888811..e1e9a84 100644 --- a/src/T2DLL/T2EquipDef.cpp +++ b/src/T2DLL/T2EquipDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2Archive.h" #include "T2BitImage.h" @@ -9,7 +10,7 @@ #include "T2People.h" #include "T2PeopleLinkIterator.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WordDefArray.h" #include "T2WorldDef.h" #include "UT2Coordinate.h" diff --git a/src/T2DLL/T2EquipDef.h b/src/T2DLL/T2EquipDef.h index 8b5b780..93f2290 100644 --- a/src/T2DLL/T2EquipDef.h +++ b/src/T2DLL/T2EquipDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2EQUIPDEF_H +#define T2DLL_T2EQUIPDEF_H +#include "../common.h" #include "T2ToolDef.h" class AFX_CLASS_EXPORT T2EquipDef : public T2ToolDef { @@ -77,3 +78,4 @@ inline void T2EquipDef::CalcEquipRect(RECT& rect) const { } inline int T2EquipDef::GetCapacity() const { return mCapacity; } inline unsigned int T2EquipDef::GetAttribute() const { return mAttribute; } +#endif diff --git a/src/T2DLL/T2EquipInfoDialog.cpp b/src/T2DLL/T2EquipInfoDialog.cpp index 024a06c..3dfeac9 100644 --- a/src/T2DLL/T2EquipInfoDialog.cpp +++ b/src/T2DLL/T2EquipInfoDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Equip.h" #include "T2EquipDef.h" #include "T2EquipInfoDialog.h" diff --git a/src/T2DLL/T2EquipInfoDialog.h b/src/T2DLL/T2EquipInfoDialog.h index 915aa7c..1fd987d 100644 --- a/src/T2DLL/T2EquipInfoDialog.h +++ b/src/T2DLL/T2EquipInfoDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2EQUIPINFODIALOG_H +#define T2DLL_T2EQUIPINFODIALOG_H +#include "../common.h" #include "T2InfoDialog.h" class AFX_CLASS_EXPORT T2EquipInfoDialog : public T2InfoDialog { @@ -13,3 +14,4 @@ public: protected: T2EquipDef *mEquipDef; }; +#endif diff --git a/src/T2DLL/T2EquipPlugin.cpp b/src/T2DLL/T2EquipPlugin.cpp index bd5fabf..abc0fb6 100644 --- a/src/T2DLL/T2EquipPlugin.cpp +++ b/src/T2DLL/T2EquipPlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2EquipPlugin.h" T2EquipPlugin::T2EquipPlugin(DWORD type, T2PluginSpecifier& specifier) diff --git a/src/T2DLL/T2EquipPlugin.h b/src/T2DLL/T2EquipPlugin.h index 5c20d36..bf01118 100644 --- a/src/T2DLL/T2EquipPlugin.h +++ b/src/T2DLL/T2EquipPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2EQUIPPLUGIN_H +#define T2DLL_T2EQUIPPLUGIN_H +#include "../common.h" #include "T2ToolPlugin.h" class AFX_CLASS_EXPORT T2EquipPlugin : public T2ToolPlugin { @@ -7,3 +8,4 @@ public: T2EquipPlugin(DWORD type, T2PluginSpecifier& specifier); virtual ~T2EquipPlugin(); }; +#endif diff --git a/src/T2DLL/T2EquipPtrList.cpp b/src/T2DLL/T2EquipPtrList.cpp index a8b57c2..e48f86a 100644 --- a/src/T2DLL/T2EquipPtrList.cpp +++ b/src/T2DLL/T2EquipPtrList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Equip.h" #include "T2EquipPtrList.h" #include "T2Tenant.h" diff --git a/src/T2DLL/T2EquipPtrList.h b/src/T2DLL/T2EquipPtrList.h index 5404425..cccaade 100644 --- a/src/T2DLL/T2EquipPtrList.h +++ b/src/T2DLL/T2EquipPtrList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2EQUIPPTRLIST_H +#define T2DLL_T2EQUIPPTRLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2EquipPtrList : public LArray { @@ -19,3 +20,4 @@ public: protected: unsigned int mAttribute; }; +#endif diff --git a/src/T2DLL/T2EventDialog.cpp b/src/T2DLL/T2EventDialog.cpp index e57a608..be651d0 100644 --- a/src/T2DLL/T2EventDialog.cpp +++ b/src/T2DLL/T2EventDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CTokenizer.h" #include "T2DlgItemAnimation.h" #include "T2EventDialog.h" diff --git a/src/T2DLL/T2EventDialog.h b/src/T2DLL/T2EventDialog.h index 886c14d..67c3f57 100644 --- a/src/T2DLL/T2EventDialog.h +++ b/src/T2DLL/T2EventDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2EVENTDIALOG_H +#define T2DLL_T2EVENTDIALOG_H +#include "../common.h" #include "T2Dialog.h" class T2EventDialog : public T2Dialog { @@ -12,3 +13,4 @@ public: protected: virtual void CreateDlgItem(CTokenizer& tokenizer, T2DialogDef& def); }; +#endif diff --git a/src/T2DLL/T2EventItem.cpp b/src/T2DLL/T2EventItem.cpp index bcd6f52..f1999fb 100644 --- a/src/T2DLL/T2EventItem.cpp +++ b/src/T2DLL/T2EventItem.cpp @@ -1,12 +1,13 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2Archive.h" #include "T2DlgItemAnimation.h" #include "T2EventDialog.h" #include "T2EventItem.h" #include "T2SoundPlayer.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" -#include "T2TowerMainView.h" +#include "../T2TowerMainView.h" #include "T2WorldDef.h" T2EventItem::T2EventItem(T2TowerEvent* inTowerEvent, CResFile* inResFile, int inSubID) { diff --git a/src/T2DLL/T2EventItem.h b/src/T2DLL/T2EventItem.h index 0167def..8d9476d 100644 --- a/src/T2DLL/T2EventItem.h +++ b/src/T2DLL/T2EventItem.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2EVENTITEM_H +#define T2DLL_T2EVENTITEM_H +#include "../common.h" class AFX_CLASS_EXPORT T2EventItem { public: @@ -53,3 +54,4 @@ protected: virtual UINT DialogHook(T2EventDialog*, unsigned int inResult, T2TowerDoc* inDoc) { return inResult; } virtual void SetupDialog(T2Dialog*) {} }; +#endif diff --git a/src/T2DLL/T2FInfoAreaIterator.cpp b/src/T2DLL/T2FInfoAreaIterator.cpp index d95ae82..e8c4d8d 100644 --- a/src/T2DLL/T2FInfoAreaIterator.cpp +++ b/src/T2DLL/T2FInfoAreaIterator.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2FInfoAreaIterator.h" #include "T2FloorInfo.h" diff --git a/src/T2DLL/T2FInfoAreaIterator.h b/src/T2DLL/T2FInfoAreaIterator.h index 1a35d42..c4b8ece 100644 --- a/src/T2DLL/T2FInfoAreaIterator.h +++ b/src/T2DLL/T2FInfoAreaIterator.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2FINFOAREAITERATOR_H +#define T2DLL_T2FINFOAREAITERATOR_H +#include "../common.h" class AFX_CLASS_EXPORT T2FInfoAreaIterator { public: @@ -31,3 +32,4 @@ protected: inline BOOL T2FInfoAreaIterator::IsValidPosition() const { return (mCurrH > -1); } +#endif diff --git a/src/T2DLL/T2FInfoPtIterator.cpp b/src/T2DLL/T2FInfoPtIterator.cpp index f3f2872..028c5a1 100644 --- a/src/T2DLL/T2FInfoPtIterator.cpp +++ b/src/T2DLL/T2FInfoPtIterator.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2FInfoPtIterator.h" #include "T2FloorInfo.h" diff --git a/src/T2DLL/T2FInfoPtIterator.h b/src/T2DLL/T2FInfoPtIterator.h index 95c0660..0310c37 100644 --- a/src/T2DLL/T2FInfoPtIterator.h +++ b/src/T2DLL/T2FInfoPtIterator.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2FINFOPTITERATOR_H +#define T2DLL_T2FINFOPTITERATOR_H +#include "../common.h" class AFX_CLASS_EXPORT T2FInfoPtIterator { public: @@ -29,3 +30,4 @@ protected: inline BOOL T2FInfoPtIterator::IsValidPosition() const { return (mCurrH > -1); } +#endif diff --git a/src/T2DLL/T2FireBurning.cpp b/src/T2DLL/T2FireBurning.cpp index 9d76af6..7a665c2 100644 --- a/src/T2DLL/T2FireBurning.cpp +++ b/src/T2DLL/T2FireBurning.cpp @@ -1,7 +1,8 @@ +#include "StdAfx.h" #include "CResFile.h" #include "GlobalFunc.h" #include "T2BitImage.h" -#include "T2CtrlPalette.h" +#include "../T2CtrlPalette.h" #include "T2DateTime.h" #include "T2Dialog.h" #include "T2DlgItem.h" @@ -10,7 +11,7 @@ #include "T2FireBurning.h" #include "T2FloorInfo.h" #include "T2ImageObj.h" -#include "T2MainWindow.h" +#include "../T2MainWindow.h" #include "T2People.h" #include "T2PeoplePtrList.h" #include "T2RegistedTenantDB.h" @@ -19,9 +20,9 @@ #include "T2Sprite.h" #include "T2Tenant.h" #include "T2ToolWindow.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" -#include "T2TowerMainView.h" +#include "../T2TowerMainView.h" #include "T2TowerMessage.h" #include "T2WorldDef.h" #include "UT2Coordinate.h" diff --git a/src/T2DLL/T2FireBurning.h b/src/T2DLL/T2FireBurning.h index 1f0bec8..e667602 100644 --- a/src/T2DLL/T2FireBurning.h +++ b/src/T2DLL/T2FireBurning.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2FIREBURNING_H +#define T2DLL_T2FIREBURNING_H +#include "../common.h" #include "LAttachment.h" #include "T2EventItem.h" @@ -105,3 +106,4 @@ protected: virtual void ExecuteSelf(unsigned int inMessage, void* ioData); T2EventItem *mOwner; }; +#endif diff --git a/src/T2DLL/T2FireWork.cpp b/src/T2DLL/T2FireWork.cpp index 11bb86f..f1eb164 100644 --- a/src/T2DLL/T2FireWork.cpp +++ b/src/T2DLL/T2FireWork.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2BitImage.h" #include "T2DLL.h" #include "T2FireWork.h" diff --git a/src/T2DLL/T2FireWork.h b/src/T2DLL/T2FireWork.h index 4c912e3..1690ab5 100644 --- a/src/T2DLL/T2FireWork.h +++ b/src/T2DLL/T2FireWork.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2FIREWORK_H +#define T2DLL_T2FIREWORK_H +#include "../common.h" struct FIREWORK_STARINFO { float m0; @@ -35,3 +36,4 @@ protected: FIREWORK_STARINFO *mStarInfo[20]; BOOL mUsed[20]; }; +#endif diff --git a/src/T2DLL/T2FloorCEArray.cpp b/src/T2DLL/T2FloorCEArray.cpp index f12a81a..6eb1f51 100644 --- a/src/T2DLL/T2FloorCEArray.cpp +++ b/src/T2DLL/T2FloorCEArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2FloorCEArray.h" T2FloorCEArray::T2FloorCEArray() { diff --git a/src/T2DLL/T2FloorCEArray.h b/src/T2DLL/T2FloorCEArray.h index adbda2b..00216e6 100644 --- a/src/T2DLL/T2FloorCEArray.h +++ b/src/T2DLL/T2FloorCEArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2FLOORCEARRAY_H +#define T2DLL_T2FLOORCEARRAY_H +#include "../common.h" #include "T2RouteCEArray.h" class AFX_CLASS_EXPORT T2FloorCEArray : public T2RouteCEArray { @@ -9,3 +10,4 @@ public: virtual DWORD GetCEClassID() { return 'FCEA'; } }; +#endif diff --git a/src/T2DLL/T2FloorInfo.cpp b/src/T2DLL/T2FloorInfo.cpp index a4366af..2d4c712 100644 --- a/src/T2DLL/T2FloorInfo.cpp +++ b/src/T2DLL/T2FloorInfo.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "GlobalFunc.h" #include "T2Archive.h" @@ -17,8 +18,8 @@ #include "T2RequestArrayList.h" #include "T2Tenant.h" #include "T2TenantArrayList.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "T2UnitInfo.h" #include "T2WorldDef.h" diff --git a/src/T2DLL/T2FloorInfo.h b/src/T2DLL/T2FloorInfo.h index bcb6165..1c0dd70 100644 --- a/src/T2DLL/T2FloorInfo.h +++ b/src/T2DLL/T2FloorInfo.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2FLOORINFO_H +#define T2DLL_T2FLOORINFO_H +#include "../common.h" class AFX_CLASS_EXPORT T2FloorInfo { public: @@ -112,3 +113,4 @@ inline T2MoverArrayList* T2FloorInfo::GetMoverArrayList() const { return mMoverA inline T2RequestArrayList* T2FloorInfo::GetRequestArrayList() const { return mRequestArrayList; } inline T2OutObjArrayList* T2FloorInfo::GetOutObjArrayList() const { return mOutObjArrayList; } inline T2OutsideInfo* T2FloorInfo::GetOutsideInfo() const { return mOutsideInfo; } +#endif diff --git a/src/T2DLL/T2FloorNumberTable.cpp b/src/T2DLL/T2FloorNumberTable.cpp index ce20205..29ae6ff 100644 --- a/src/T2DLL/T2FloorNumberTable.cpp +++ b/src/T2DLL/T2FloorNumberTable.cpp @@ -1,9 +1,10 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2FloorInfo.h" #include "T2FloorNumberTable.h" #include "T2Mover.h" #include "T2MoverModuleTable.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" T2FloorNumberTable::T2FloorNumberTable(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette) : T2DlgItemImageTable(inDoc, inImageObj, inPalette) diff --git a/src/T2DLL/T2FloorNumberTable.h b/src/T2DLL/T2FloorNumberTable.h index b767f93..4b23872 100644 --- a/src/T2DLL/T2FloorNumberTable.h +++ b/src/T2DLL/T2FloorNumberTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2FLOORNUMBERTABLE_H +#define T2DLL_T2FLOORNUMBERTABLE_H +#include "../common.h" #include "T2DlgItemImageTable.h" struct StflNotification { @@ -32,3 +33,4 @@ protected: T2Mover *mMover; T2MoverModuleTable *mMoverModuleTable; }; +#endif diff --git a/src/T2DLL/T2FloorPtrList.cpp b/src/T2DLL/T2FloorPtrList.cpp index fec528d..342ce83 100644 --- a/src/T2DLL/T2FloorPtrList.cpp +++ b/src/T2DLL/T2FloorPtrList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2FloorPtrList.h" #include "T2Tenant.h" #include "T2TenantArray.h" diff --git a/src/T2DLL/T2FloorPtrList.h b/src/T2DLL/T2FloorPtrList.h index dbfc24c..c171d4c 100644 --- a/src/T2DLL/T2FloorPtrList.h +++ b/src/T2DLL/T2FloorPtrList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2FLOORPTRLIST_H +#define T2DLL_T2FLOORPTRLIST_H +#include "../common.h" #include "T2EquipPtrList.h" class AFX_CLASS_EXPORT T2FloorPtrList : public T2EquipPtrList { @@ -8,3 +9,4 @@ public: virtual ~T2FloorPtrList(); int CalcDistance(int inIndexA, int inIndexB); }; +#endif diff --git a/src/T2DLL/T2GlobalData.cpp b/src/T2DLL/T2GlobalData.cpp index 3b0c100..a9eb778 100644 --- a/src/T2DLL/T2GlobalData.cpp +++ b/src/T2DLL/T2GlobalData.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #define ATOI_KLUDGE #include "GlobalFunc.h" #include "T2Archive.h" diff --git a/src/T2DLL/T2GlobalData.h b/src/T2DLL/T2GlobalData.h index 1e13644..de14127 100644 --- a/src/T2DLL/T2GlobalData.h +++ b/src/T2DLL/T2GlobalData.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2GLOBALDATA_H +#define T2DLL_T2GLOBALDATA_H +#include "../common.h" class AFX_CLASS_EXPORT T2GlobalData { public: @@ -21,3 +22,4 @@ protected: void Write(T2Archive& inArchive); BOOL Check_Serial(char* inSerial); }; +#endif diff --git a/src/T2DLL/T2GuestroomTable.cpp b/src/T2DLL/T2GuestroomTable.cpp index 752f276..4d0d4f2 100644 --- a/src/T2DLL/T2GuestroomTable.cpp +++ b/src/T2DLL/T2GuestroomTable.cpp @@ -1,8 +1,9 @@ +#include "StdAfx.h" #include "T2GuestroomTable.h" #include "T2Tenant.h" #include "T2TenantDef.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" /*virtual*/ int T2GuestroomTable::OnT2DlgItemCreate(CREATESTRUCT* cs) { return T2DlgItemTable::OnT2DlgItemCreate(cs); diff --git a/src/T2DLL/T2GuestroomTable.h b/src/T2DLL/T2GuestroomTable.h index 045cd92..1f4b6ef 100644 --- a/src/T2DLL/T2GuestroomTable.h +++ b/src/T2DLL/T2GuestroomTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2GUESTROOMTABLE_H +#define T2DLL_T2GUESTROOMTABLE_H +#include "../common.h" #include "LArray.h" #include "T2VerticalTable.h" @@ -64,3 +65,4 @@ protected: BOOL mRelation; int mDefaultInMoneyIndex; }; +#endif diff --git a/src/T2DLL/T2HallEventPlugin.cpp b/src/T2DLL/T2HallEventPlugin.cpp index b75e4ff..b378041 100644 --- a/src/T2DLL/T2HallEventPlugin.cpp +++ b/src/T2DLL/T2HallEventPlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2BitImage.h" #include "T2HallEventPlugin.h" diff --git a/src/T2DLL/T2HallEventPlugin.h b/src/T2DLL/T2HallEventPlugin.h index 2ed457c..bcc750d 100644 --- a/src/T2DLL/T2HallEventPlugin.h +++ b/src/T2DLL/T2HallEventPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2HALLEVENTPLUGIN_H +#define T2DLL_T2HALLEVENTPLUGIN_H +#include "../common.h" #include "T2SubPlugin.h" class AFX_CLASS_EXPORT T2HallEventPlugin : public T2SubPlugin { @@ -28,3 +29,4 @@ protected: int mF4; CString mF8; }; +#endif diff --git a/src/T2DLL/T2HallEventTable.cpp b/src/T2DLL/T2HallEventTable.cpp index 3bc08d7..01ded20 100644 --- a/src/T2DLL/T2HallEventTable.cpp +++ b/src/T2DLL/T2HallEventTable.cpp @@ -1,8 +1,9 @@ +#include "StdAfx.h" #include "CFilePluginList.h" #include "T2DateTime.h" #include "T2HallEventTable.h" #include "T2HallEventPlugin.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" /*virtual*/ int T2HallEventTable::OnT2DlgItemCreate(CREATESTRUCT* cs) { T2DlgItemTable::SetColWidth(cs->cx, 0, 0); diff --git a/src/T2DLL/T2HallEventTable.h b/src/T2DLL/T2HallEventTable.h index ea82315..6f30ccc 100644 --- a/src/T2DLL/T2HallEventTable.h +++ b/src/T2DLL/T2HallEventTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2HALLEVENTTABLE_H +#define T2DLL_T2HALLEVENTTABLE_H +#include "../common.h" #include "T2VerticalTable.h" class AFX_CLASS_EXPORT T2HallEventTable : public T2VerticalTable { @@ -55,3 +56,4 @@ protected: int mStartMonth; BOOL mIsHoliday[12]; }; +#endif diff --git a/src/T2DLL/T2HaveOutViewObject.cpp b/src/T2DLL/T2HaveOutViewObject.cpp index 125a0be..6a05bc8 100644 --- a/src/T2DLL/T2HaveOutViewObject.cpp +++ b/src/T2DLL/T2HaveOutViewObject.cpp @@ -1,7 +1,8 @@ +#include "StdAfx.h" #include "T2HaveOutViewObject.h" #include "T2Settlement.h" #include "T2ToolDef.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" T2HaveOutViewObject::T2HaveOutViewObject() { mToolDef = NULL; diff --git a/src/T2DLL/T2HaveOutViewObject.h b/src/T2DLL/T2HaveOutViewObject.h index 73081ed..9a1e43f 100644 --- a/src/T2DLL/T2HaveOutViewObject.h +++ b/src/T2DLL/T2HaveOutViewObject.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2HAVEOUTVIEWOBJECT_H +#define T2DLL_T2HAVEOUTVIEWOBJECT_H +#include "../common.h" #include "T2DrawableObject.h" class AFX_CLASS_EXPORT T2HaveOutViewObject : public T2DrawableObject { @@ -30,3 +31,4 @@ protected: inline unsigned int T2HaveOutViewObject::GetValiation() const { return mValiation; } +#endif diff --git a/src/T2DLL/T2ImageObj.cpp b/src/T2DLL/T2ImageObj.cpp index a770e6a..92f6137 100644 --- a/src/T2DLL/T2ImageObj.cpp +++ b/src/T2DLL/T2ImageObj.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #define ATOI_KLUDGE #include "GlobalFunc.h" #include "T2BitImage.h" diff --git a/src/T2DLL/T2ImageObj.h b/src/T2DLL/T2ImageObj.h index 71a9d5e..246e19c 100644 --- a/src/T2DLL/T2ImageObj.h +++ b/src/T2DLL/T2ImageObj.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2IMAGEOBJ_H +#define T2DLL_T2IMAGEOBJ_H +#include "../common.h" struct PARTSLIST { T2BitImage *image; @@ -70,3 +71,4 @@ protected: ObjectData *mData; HANDLE mHandle; }; +#endif diff --git a/src/T2DLL/T2InfoDialog.cpp b/src/T2DLL/T2InfoDialog.cpp index 8f9b155..34daca1 100644 --- a/src/T2DLL/T2InfoDialog.cpp +++ b/src/T2DLL/T2InfoDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Equip.h" #include "T2EquipDef.h" #include "T2InfoDialog.h" diff --git a/src/T2DLL/T2InfoDialog.h b/src/T2DLL/T2InfoDialog.h index 5ea04b8..4522baf 100644 --- a/src/T2DLL/T2InfoDialog.h +++ b/src/T2DLL/T2InfoDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2INFODIALOG_H +#define T2DLL_T2INFODIALOG_H +#include "../common.h" #include "T2Dialog.h" class AFX_CLASS_EXPORT T2InfoDialog : public T2Dialog { @@ -11,3 +12,4 @@ protected: T2DrawableObject *mObject; }; +#endif diff --git a/src/T2DLL/T2Maru_Reggae.cpp b/src/T2DLL/T2Maru_Reggae.cpp index 1c6fd2c..9d6e172 100644 --- a/src/T2DLL/T2Maru_Reggae.cpp +++ b/src/T2DLL/T2Maru_Reggae.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "GlobalFunc.h" #include "T2Archive.h" @@ -18,9 +19,9 @@ #include "T2SoundPlayer.h" #include "T2TemplatePluginList.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" -#include "T2TowerMainView.h" +#include "../T2TowerMainView.h" #include "T2TowerMessage.h" #include "T2WorldDef.h" #include "URect.h" diff --git a/src/T2DLL/T2Maru_Reggae.h b/src/T2DLL/T2Maru_Reggae.h index e0a8b99..8d33238 100644 --- a/src/T2DLL/T2Maru_Reggae.h +++ b/src/T2DLL/T2Maru_Reggae.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MARU_REGGAE_H +#define T2DLL_T2MARU_REGGAE_H +#include "../common.h" #include "T2EventItem.h" class T2Guardman; @@ -67,3 +68,4 @@ public: T2Maru_Reggae *mOwner; T2People *mPeople; }; +#endif diff --git a/src/T2DLL/T2Matter.cpp b/src/T2DLL/T2Matter.cpp index b97f410..3965c31 100644 --- a/src/T2DLL/T2Matter.cpp +++ b/src/T2DLL/T2Matter.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2Matter.h" #include "T2ReturnStack.h" diff --git a/src/T2DLL/T2Matter.h b/src/T2DLL/T2Matter.h index c3c66be..2be5f7d 100644 --- a/src/T2DLL/T2Matter.h +++ b/src/T2DLL/T2Matter.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MATTER_H +#define T2DLL_T2MATTER_H +#include "../common.h" #include "T2DrawableObject.h" class AFX_CLASS_EXPORT T2Matter : public T2DrawableObject { @@ -78,3 +79,4 @@ protected: virtual void LoadSelf(T2Archive&, T2TowerDoc*); virtual void SaveSelf(T2Archive&); }; +#endif diff --git a/src/T2DLL/T2MatterArray.cpp b/src/T2DLL/T2MatterArray.cpp index 42adf1b..5ac7a8d 100644 --- a/src/T2DLL/T2MatterArray.cpp +++ b/src/T2DLL/T2MatterArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2MatterArray.h" T2MatterArray::T2MatterArray(unsigned int jobType, unsigned int validRange, unsigned int startID) diff --git a/src/T2DLL/T2MatterArray.h b/src/T2DLL/T2MatterArray.h index fe96a05..1dbd1fc 100644 --- a/src/T2DLL/T2MatterArray.h +++ b/src/T2DLL/T2MatterArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MATTERARRAY_H +#define T2DLL_T2MATTERARRAY_H +#include "../common.h" #include "T2Matter.h" #include "T2ObjectArray.h" @@ -25,3 +26,4 @@ protected: unsigned int mValidRange; T2Matter mMatter[kGroupSize]; }; +#endif diff --git a/src/T2DLL/T2MatterArrayList.cpp b/src/T2DLL/T2MatterArrayList.cpp index 5611373..995dc9a 100644 --- a/src/T2DLL/T2MatterArrayList.cpp +++ b/src/T2DLL/T2MatterArrayList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2MatterArray.h" #include "T2MatterArrayList.h" diff --git a/src/T2DLL/T2MatterArrayList.h b/src/T2DLL/T2MatterArrayList.h index 2e71e01..69bb2ad 100644 --- a/src/T2DLL/T2MatterArrayList.h +++ b/src/T2DLL/T2MatterArrayList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MATTERARRAYLIST_H +#define T2DLL_T2MATTERARRAYLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2MatterArrayList : public LArray { @@ -11,3 +12,4 @@ public: T2MatterArray* GetItemAt(long inIndex); T2Matter* FindUnusedMatter(unsigned int inJobType, unsigned int inValidRange); }; +#endif diff --git a/src/T2DLL/T2MatterDef.cpp b/src/T2DLL/T2MatterDef.cpp index 3021754..ef206e8 100644 --- a/src/T2DLL/T2MatterDef.cpp +++ b/src/T2DLL/T2MatterDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2MatterDef.h" #include "T2TemplatePluginList.h" diff --git a/src/T2DLL/T2MatterDef.h b/src/T2DLL/T2MatterDef.h index 6894129..37c813a 100644 --- a/src/T2DLL/T2MatterDef.h +++ b/src/T2DLL/T2MatterDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MATTERDEF_H +#define T2DLL_T2MATTERDEF_H +#include "../common.h" #include "T2TemplatePlugin.h" class AFX_CLASS_EXPORT T2MatterDef : public T2TemplatePlugin { @@ -26,3 +27,4 @@ inline int T2MatterDef::GetAttribute() const { inline /*virtual*/ T2SilhouetteDef* T2MatterDef::GetSilhouetteDef() const { return mSilhouetteDef; } +#endif diff --git a/src/T2DLL/T2Message.cpp b/src/T2DLL/T2Message.cpp index 0d6b1bd..bac21c6 100644 --- a/src/T2DLL/T2Message.cpp +++ b/src/T2DLL/T2Message.cpp @@ -1,4 +1,5 @@ -#include "T2.h" +#include "StdAfx.h" +#include "../T2.h" #include "T2Message.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2Message.h b/src/T2DLL/T2Message.h index 7a6bb85..a6122fc 100644 --- a/src/T2DLL/T2Message.h +++ b/src/T2DLL/T2Message.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MESSAGE_H +#define T2DLL_T2MESSAGE_H +#include "../common.h" class AFX_CLASS_EXPORT T2Message : public CWnd { DECLARE_MESSAGE_MAP() @@ -27,3 +28,4 @@ protected: int m74; BOOL m78; }; +#endif diff --git a/src/T2DLL/T2MetroRailway.cpp b/src/T2DLL/T2MetroRailway.cpp index 560c58d..9b84441 100644 --- a/src/T2DLL/T2MetroRailway.cpp +++ b/src/T2DLL/T2MetroRailway.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "GlobalFunc.h" #include "T2BitImage.h" @@ -7,9 +8,9 @@ #include "T2MetroRailway.h" #include "T2SoundPlayer.h" #include "T2Sprite.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" -#include "T2TowerMainView.h" +#include "../T2TowerMainView.h" #include "T2WorldDef.h" #include "UT2Coordinate.h" diff --git a/src/T2DLL/T2MetroRailway.h b/src/T2DLL/T2MetroRailway.h index 40a7277..f558b47 100644 --- a/src/T2DLL/T2MetroRailway.h +++ b/src/T2DLL/T2MetroRailway.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2METRORAILWAY_H +#define T2DLL_T2METRORAILWAY_H +#include "../common.h" #include "T2EventItem.h" #include "T2Transport.h" @@ -33,3 +34,4 @@ protected: T2ImageObj *mImageObj; BOOL mVisible; }; +#endif diff --git a/src/T2DLL/T2Mover.cpp b/src/T2DLL/T2Mover.cpp index 7440364..34342cc 100644 --- a/src/T2DLL/T2Mover.cpp +++ b/src/T2DLL/T2Mover.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2Archive.h" #include "T2ElvModuleList.h" @@ -17,8 +18,8 @@ #include "T2StairModuleList.h" #include "T2TemplatePluginList.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "UT2Coordinate.h" T2Mover::T2Mover() { diff --git a/src/T2DLL/T2Mover.h b/src/T2DLL/T2Mover.h index 606ea09..fca14e1 100644 --- a/src/T2DLL/T2Mover.h +++ b/src/T2DLL/T2Mover.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVER_H +#define T2DLL_T2MOVER_H +#include "../common.h" #include "T2Equip.h" enum { @@ -122,3 +123,4 @@ inline T2MoverModuleList* T2Mover::GetModuleList() const { inline BOOL T2Mover::IsShaftVisible() const { return mShowShaft; } +#endif diff --git a/src/T2DLL/T2MoverArray.cpp b/src/T2DLL/T2MoverArray.cpp index 4f98a81..527ee89 100644 --- a/src/T2DLL/T2MoverArray.cpp +++ b/src/T2DLL/T2MoverArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2MoverArray.h" T2MoverArray::T2MoverArray(unsigned int inStartID) diff --git a/src/T2DLL/T2MoverArray.h b/src/T2DLL/T2MoverArray.h index a2266c7..475b2c3 100644 --- a/src/T2DLL/T2MoverArray.h +++ b/src/T2DLL/T2MoverArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVERARRAY_H +#define T2DLL_T2MOVERARRAY_H +#include "../common.h" #include "T2Mover.h" #include "T2ObjectArray.h" @@ -25,3 +26,4 @@ protected: T2Mover mMover[kGroupSize]; }; +#endif diff --git a/src/T2DLL/T2MoverArrayList.cpp b/src/T2DLL/T2MoverArrayList.cpp index 716419a..9f39f70 100644 --- a/src/T2DLL/T2MoverArrayList.cpp +++ b/src/T2DLL/T2MoverArrayList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2MoverArray.h" #include "T2MoverArrayList.h" diff --git a/src/T2DLL/T2MoverArrayList.h b/src/T2DLL/T2MoverArrayList.h index 566c5c8..0d3025d 100644 --- a/src/T2DLL/T2MoverArrayList.h +++ b/src/T2DLL/T2MoverArrayList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVERARRAYLIST_H +#define T2DLL_T2MOVERARRAYLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2MoverArrayList : public LArray { @@ -18,3 +19,4 @@ public: int CalcMentenanceCost(T2TowerDoc* inDoc) const; LArray* MakeMoverList(int inType); }; +#endif diff --git a/src/T2DLL/T2MoverCEArray.cpp b/src/T2DLL/T2MoverCEArray.cpp index fe00b8e..6caf764 100644 --- a/src/T2DLL/T2MoverCEArray.cpp +++ b/src/T2DLL/T2MoverCEArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2MoverCEArray.h" T2MoverCEArray::T2MoverCEArray() { diff --git a/src/T2DLL/T2MoverCEArray.h b/src/T2DLL/T2MoverCEArray.h index b28913b..5a9ca92 100644 --- a/src/T2DLL/T2MoverCEArray.h +++ b/src/T2DLL/T2MoverCEArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVERCEARRAY_H +#define T2DLL_T2MOVERCEARRAY_H +#include "../common.h" #include "T2RouteCEArray.h" class AFX_CLASS_EXPORT T2MoverCEArray : public T2RouteCEArray { @@ -9,3 +10,4 @@ public: virtual DWORD GetCEClassID() { return 'MCEA'; } }; +#endif diff --git a/src/T2DLL/T2MoverDef.cpp b/src/T2DLL/T2MoverDef.cpp index 9277fb8..abca3ba 100644 --- a/src/T2DLL/T2MoverDef.cpp +++ b/src/T2DLL/T2MoverDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2BitImage.h" #include "T2FloorInfo.h" @@ -7,7 +8,7 @@ #include "T2MoverDef.h" #include "T2MoverModuleList.h" #include "T2MoverPlugin.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "UT2Coordinate.h" T2MoverDef::T2MoverDef(DWORD type, T2PluginSpecifier& specifier, CResFile* resFile, T2WorldDef* worldDef, T2MoverPlugin* plugin) diff --git a/src/T2DLL/T2MoverDef.h b/src/T2DLL/T2MoverDef.h index d4ef617..37bcc00 100644 --- a/src/T2DLL/T2MoverDef.h +++ b/src/T2DLL/T2MoverDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVERDEF_H +#define T2DLL_T2MOVERDEF_H +#include "../common.h" #include "T2EquipDef.h" class AFX_CLASS_EXPORT T2MoverDef : public T2EquipDef { @@ -102,3 +103,4 @@ inline int T2MoverDef::GetScore() const { inline /*static*/ unsigned int T2MoverDef::GetRequiredRequestSpace() { return 4; } +#endif diff --git a/src/T2DLL/T2MoverModule.cpp b/src/T2DLL/T2MoverModule.cpp index 1d1db71..60514a9 100644 --- a/src/T2DLL/T2MoverModule.cpp +++ b/src/T2DLL/T2MoverModule.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2Archive.h" #include "T2FloorInfo.h" @@ -8,7 +9,7 @@ #include "T2People.h" #include "T2PeopleArrayList.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" T2MoverModule::T2MoverModule() { mPosition = 0; diff --git a/src/T2DLL/T2MoverModule.h b/src/T2DLL/T2MoverModule.h index 30d3192..72ce952 100644 --- a/src/T2DLL/T2MoverModule.h +++ b/src/T2DLL/T2MoverModule.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVERMODULE_H +#define T2DLL_T2MOVERMODULE_H +#include "../common.h" #include "LBroadcaster.h" #include "T2DrawableObject.h" @@ -57,3 +58,4 @@ private: static unsigned int GetNewModuleID(T2TowerDoc*); static unsigned int sModuleID; }; +#endif diff --git a/src/T2DLL/T2MoverModuleList.cpp b/src/T2DLL/T2MoverModuleList.cpp index 9711ec4..6d9c641 100644 --- a/src/T2DLL/T2MoverModuleList.cpp +++ b/src/T2DLL/T2MoverModuleList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2ElvModuleList.h" #include "T2MoverDef.h" diff --git a/src/T2DLL/T2MoverModuleList.h b/src/T2DLL/T2MoverModuleList.h index 0febad8..2891bd9 100644 --- a/src/T2DLL/T2MoverModuleList.h +++ b/src/T2DLL/T2MoverModuleList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVERMODULELIST_H +#define T2DLL_T2MOVERMODULELIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2MoverModuleList : public LArray { @@ -32,3 +33,4 @@ protected: int mModuleCount; RECT mBaseRect; }; +#endif diff --git a/src/T2DLL/T2MoverModuleTable.cpp b/src/T2DLL/T2MoverModuleTable.cpp index 80741e1..59ed080 100644 --- a/src/T2DLL/T2MoverModuleTable.cpp +++ b/src/T2DLL/T2MoverModuleTable.cpp @@ -1,5 +1,6 @@ +#include "StdAfx.h" #include "GlobalFunc.h" -#include "T2.h" +#include "../T2.h" #include "T2BitImage.h" #include "T2DlgItemVScr.h" #include "T2ElevatorModule.h" diff --git a/src/T2DLL/T2MoverModuleTable.h b/src/T2DLL/T2MoverModuleTable.h index 66adb4e..7532dc9 100644 --- a/src/T2DLL/T2MoverModuleTable.h +++ b/src/T2DLL/T2MoverModuleTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVERMODULETABLE_H +#define T2DLL_T2MOVERMODULETABLE_H +#include "../common.h" #include "T2DlgItemImageTable.h" struct HomeNotification { @@ -41,3 +42,4 @@ protected: T2BitImage *mImage; RECT mRect; }; +#endif diff --git a/src/T2DLL/T2MoverPlugin.cpp b/src/T2DLL/T2MoverPlugin.cpp index 95b4e7e..2c5a6ad 100644 --- a/src/T2DLL/T2MoverPlugin.cpp +++ b/src/T2DLL/T2MoverPlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2MoverPlugin.h" diff --git a/src/T2DLL/T2MoverPlugin.h b/src/T2DLL/T2MoverPlugin.h index f3a6b16..f689524 100644 --- a/src/T2DLL/T2MoverPlugin.h +++ b/src/T2DLL/T2MoverPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVERPLUGIN_H +#define T2DLL_T2MOVERPLUGIN_H +#include "../common.h" #include "T2EquipPlugin.h" class AFX_CLASS_EXPORT T2MoverPlugin : public T2EquipPlugin { @@ -10,3 +11,4 @@ public: private: void LoadT2MoverDef(T2WorldDef*); }; +#endif diff --git a/src/T2DLL/T2MoverRoutingTable.cpp b/src/T2DLL/T2MoverRoutingTable.cpp index 66c99fe..f7425ad 100644 --- a/src/T2DLL/T2MoverRoutingTable.cpp +++ b/src/T2DLL/T2MoverRoutingTable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2CrossEquipArray.h" #include "T2FloorInfo.h" #include "T2FloorPtrList.h" diff --git a/src/T2DLL/T2MoverRoutingTable.h b/src/T2DLL/T2MoverRoutingTable.h index a310821..806a707 100644 --- a/src/T2DLL/T2MoverRoutingTable.h +++ b/src/T2DLL/T2MoverRoutingTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVERROUTINGTABLE_H +#define T2DLL_T2MOVERROUTINGTABLE_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2MoverRoutingTable : private LArray { @@ -34,3 +35,4 @@ protected: inline T2Mover* T2MoverRoutingTable::GetMover() const { return mMover; } inline int T2MoverRoutingTable::GetMoverHPos() const { return mMoverHPos; } +#endif diff --git a/src/T2DLL/T2MovieParamArray.cpp b/src/T2DLL/T2MovieParamArray.cpp index 787301d..7a3a224 100644 --- a/src/T2DLL/T2MovieParamArray.cpp +++ b/src/T2DLL/T2MovieParamArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2MovieParamArray.h" diff --git a/src/T2DLL/T2MovieParamArray.h b/src/T2DLL/T2MovieParamArray.h index 2bd1771..19b1a9a 100644 --- a/src/T2DLL/T2MovieParamArray.h +++ b/src/T2DLL/T2MovieParamArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVIEPARAMARRAY_H +#define T2DLL_T2MOVIEPARAMARRAY_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2MovieParamArray : private LArray { @@ -13,3 +14,4 @@ public: virtual void Read(T2Archive& inArchive); virtual void Write(T2Archive& inArchive); }; +#endif diff --git a/src/T2DLL/T2MoviePlugin.cpp b/src/T2DLL/T2MoviePlugin.cpp index 213e849..adb9a28 100644 --- a/src/T2DLL/T2MoviePlugin.cpp +++ b/src/T2DLL/T2MoviePlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2Archive.h" #include "T2BitImage.h" diff --git a/src/T2DLL/T2MoviePlugin.h b/src/T2DLL/T2MoviePlugin.h index d46e1b8..55f4078 100644 --- a/src/T2DLL/T2MoviePlugin.h +++ b/src/T2DLL/T2MoviePlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVIEPLUGIN_H +#define T2DLL_T2MOVIEPLUGIN_H +#include "../common.h" #include "T2SubPlugin.h" // unknown name @@ -61,3 +62,4 @@ protected: int mNewNOPersonsR; int mNewNOPersonsF; }; +#endif diff --git a/src/T2DLL/T2MoviePluginList.cpp b/src/T2DLL/T2MoviePluginList.cpp index 976c00d..82f6f14 100644 --- a/src/T2DLL/T2MoviePluginList.cpp +++ b/src/T2DLL/T2MoviePluginList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2MoviePlugin.h" #include "T2MoviePluginList.h" diff --git a/src/T2DLL/T2MoviePluginList.h b/src/T2DLL/T2MoviePluginList.h index 65fb716..2c052c6 100644 --- a/src/T2DLL/T2MoviePluginList.h +++ b/src/T2DLL/T2MoviePluginList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVIEPLUGINLIST_H +#define T2DLL_T2MOVIEPLUGINLIST_H +#include "../common.h" #include "CFilePluginList.h" class AFX_CLASS_EXPORT T2MoviePluginList : public CFilePluginList { @@ -9,3 +10,4 @@ public: void Read(T2Archive& inArchive); void Write(T2Archive& inArchive); }; +#endif diff --git a/src/T2DLL/T2MovieTable.cpp b/src/T2DLL/T2MovieTable.cpp index ee47421..6335ccc 100644 --- a/src/T2DLL/T2MovieTable.cpp +++ b/src/T2DLL/T2MovieTable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2MoviePlugin.h" #include "T2MoviePluginList.h" #include "T2MovieTable.h" diff --git a/src/T2DLL/T2MovieTable.h b/src/T2DLL/T2MovieTable.h index a611ccc..ca7d562 100644 --- a/src/T2DLL/T2MovieTable.h +++ b/src/T2DLL/T2MovieTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MOVIETABLE_H +#define T2DLL_T2MOVIETABLE_H +#include "../common.h" #include "T2VerticalTable.h" class AFX_CLASS_EXPORT T2MovieTable : public T2VerticalTable { @@ -21,3 +22,4 @@ protected: int mMovieType; }; +#endif diff --git a/src/T2DLL/T2MsgWindowCallback.cpp b/src/T2DLL/T2MsgWindowCallback.cpp index 3bc77fa..26929c3 100644 --- a/src/T2DLL/T2MsgWindowCallback.cpp +++ b/src/T2DLL/T2MsgWindowCallback.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2MsgWindowCallback.h" /*virtual*/ void T2MsgWindowCallback::CallbackZoomIn() { diff --git a/src/T2DLL/T2MsgWindowCallback.h b/src/T2DLL/T2MsgWindowCallback.h index 72ca6bb..40b51a2 100644 --- a/src/T2DLL/T2MsgWindowCallback.h +++ b/src/T2DLL/T2MsgWindowCallback.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2MSGWINDOWCALLBACK_H +#define T2DLL_T2MSGWINDOWCALLBACK_H +#include "../common.h" class AFX_CLASS_EXPORT T2MsgWindowCallback { public: @@ -16,3 +17,4 @@ public: virtual void CallbackFunds(); virtual void CallbackPopulation(); }; +#endif diff --git a/src/T2DLL/T2Name.cpp b/src/T2DLL/T2Name.cpp index 078071e..4795249 100644 --- a/src/T2DLL/T2Name.cpp +++ b/src/T2DLL/T2Name.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2FloorInfo.h" #include "T2Mover.h" @@ -6,7 +7,7 @@ #include "T2People.h" #include "T2PeopleArrayList.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "UT2Utils.h" T2Name::T2Name() { diff --git a/src/T2DLL/T2Name.h b/src/T2DLL/T2Name.h index 6539dec..fcca961 100644 --- a/src/T2DLL/T2Name.h +++ b/src/T2DLL/T2Name.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2NAME_H +#define T2DLL_T2NAME_H +#include "../common.h" // assumed names enum { @@ -36,3 +37,4 @@ protected: unsigned int mID; BOOL mFavorite; }; +#endif diff --git a/src/T2DLL/T2NameComparator.cpp b/src/T2DLL/T2NameComparator.cpp index e2b1a70..4df0b79 100644 --- a/src/T2DLL/T2NameComparator.cpp +++ b/src/T2DLL/T2NameComparator.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Name.h" #include "T2NameComparator.h" diff --git a/src/T2DLL/T2NameComparator.h b/src/T2DLL/T2NameComparator.h index b95097b..f6a24c3 100644 --- a/src/T2DLL/T2NameComparator.h +++ b/src/T2DLL/T2NameComparator.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2NAMECOMPARATOR_H +#define T2DLL_T2NAMECOMPARATOR_H +#include "../common.h" #include "LComparator.h" class T2NameComparator : public LComparator { @@ -11,3 +12,4 @@ public: protected: static T2NameComparator* sT2NameComparator; }; +#endif diff --git a/src/T2DLL/T2NameList.cpp b/src/T2DLL/T2NameList.cpp index 8fda1d6..e140727 100644 --- a/src/T2DLL/T2NameList.cpp +++ b/src/T2DLL/T2NameList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2Mover.h" #include "T2MoverModule.h" diff --git a/src/T2DLL/T2NameList.h b/src/T2DLL/T2NameList.h index a8a984e..a6cc2c8 100644 --- a/src/T2DLL/T2NameList.h +++ b/src/T2DLL/T2NameList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2NAMELIST_H +#define T2DLL_T2NAMELIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2NameList : public LArray { @@ -19,3 +20,4 @@ public: void Read(T2Archive&); void Write(T2Archive&) const; }; +#endif diff --git a/src/T2DLL/T2NameTable.cpp b/src/T2DLL/T2NameTable.cpp index 994ab5a..8f50bd3 100644 --- a/src/T2DLL/T2NameTable.cpp +++ b/src/T2DLL/T2NameTable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Name.h" #include "T2NameList.h" #include "T2NameTable.h" diff --git a/src/T2DLL/T2NameTable.h b/src/T2DLL/T2NameTable.h index 6a64a12..31d53bd 100644 --- a/src/T2DLL/T2NameTable.h +++ b/src/T2DLL/T2NameTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2NAMETABLE_H +#define T2DLL_T2NAMETABLE_H +#include "../common.h" #include "T2VerticalTable.h" class AFX_CLASS_EXPORT T2NameTable : public T2VerticalTable { @@ -19,3 +20,4 @@ protected: virtual void DrawCellSelf(CDC* pDC, const TableCellT& inCell, BOOL inSelected); virtual BOOL OnT2DlgItemEraseBkgnd(CDC* pDC); }; +#endif diff --git a/src/T2DLL/T2Object.cpp b/src/T2DLL/T2Object.cpp index 3c52d9a..be7d016 100644 --- a/src/T2DLL/T2Object.cpp +++ b/src/T2DLL/T2Object.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2Object.h" diff --git a/src/T2DLL/T2Object.h b/src/T2DLL/T2Object.h index a7ca87e..0c44856 100644 --- a/src/T2DLL/T2Object.h +++ b/src/T2DLL/T2Object.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OBJECT_H +#define T2DLL_T2OBJECT_H +#include "../common.h" #include "CLink.h" enum { @@ -68,3 +69,4 @@ protected: int mStatus; BOOL mFavorite; }; +#endif diff --git a/src/T2DLL/T2ObjectArray.cpp b/src/T2DLL/T2ObjectArray.cpp index e6a9e51..1b15fa0 100644 --- a/src/T2DLL/T2ObjectArray.cpp +++ b/src/T2DLL/T2ObjectArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2ObjectArray.h" T2ObjectArray::T2ObjectArray(unsigned int startID) { diff --git a/src/T2DLL/T2ObjectArray.h b/src/T2DLL/T2ObjectArray.h index c77317c..e6ab5ad 100644 --- a/src/T2DLL/T2ObjectArray.h +++ b/src/T2DLL/T2ObjectArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OBJECTARRAY_H +#define T2DLL_T2OBJECTARRAY_H +#include "../common.h" class AFX_CLASS_EXPORT T2ObjectArray { public: @@ -14,3 +15,4 @@ public: protected: unsigned int mStartID; }; +#endif diff --git a/src/T2DLL/T2ObjectArrayList.cpp b/src/T2DLL/T2ObjectArrayList.cpp index 906c324..1ea8ecb 100644 --- a/src/T2DLL/T2ObjectArrayList.cpp +++ b/src/T2DLL/T2ObjectArrayList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2ObjectArrayList.h" T2ObjectArrayList::T2ObjectArrayList() { diff --git a/src/T2DLL/T2ObjectArrayList.h b/src/T2DLL/T2ObjectArrayList.h index c6037db..c66ba03 100644 --- a/src/T2DLL/T2ObjectArrayList.h +++ b/src/T2DLL/T2ObjectArrayList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OBJECTARRAYLIST_H +#define T2DLL_T2OBJECTARRAYLIST_H +#include "../common.h" #include "CObjectList.h" class AFX_CLASS_EXPORT T2ObjectArrayList : public CObjectList { @@ -9,3 +10,4 @@ public: void AddObjectArray(T2ObjectArray* inArray); T2ObjectArray* GetObjectArrayAt(int inIndex); }; +#endif diff --git a/src/T2DLL/T2OptionPlugin.h b/src/T2DLL/T2OptionPlugin.h index 20fb965..df9b6b9 100644 --- a/src/T2DLL/T2OptionPlugin.h +++ b/src/T2DLL/T2OptionPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OPTIONPLUGIN_H +#define T2DLL_T2OPTIONPLUGIN_H +#include "../common.h" #include "T2PluginSpecifier.h" class AFX_CLASS_EXPORT T2OptionPlugin { @@ -16,3 +17,4 @@ protected: T2PluginSpecifier mSpecifier; int m38; }; +#endif diff --git a/src/T2DLL/T2OptionPluginList.cpp b/src/T2DLL/T2OptionPluginList.cpp index 13c08e6..cf9a60b 100644 --- a/src/T2DLL/T2OptionPluginList.cpp +++ b/src/T2DLL/T2OptionPluginList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2OptionPlugin.h" #include "T2OptionPluginList.h" diff --git a/src/T2DLL/T2OptionPluginList.h b/src/T2DLL/T2OptionPluginList.h index b1f0a24..5a01825 100644 --- a/src/T2DLL/T2OptionPluginList.h +++ b/src/T2DLL/T2OptionPluginList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OPTIONPLUGINLIST_H +#define T2DLL_T2OPTIONPLUGINLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2OptionPluginList : private LArray { @@ -10,3 +11,4 @@ public: void OnIdle(T2TowerDoc* towerDoc); BOOL DispatchEvent(OPTIONEVENTTYPE eventType, T2TowerDoc* towerDoc, void* data); }; +#endif diff --git a/src/T2DLL/T2OutDecoration.cpp b/src/T2DLL/T2OutDecoration.cpp index e8d7d74..34aaee2 100644 --- a/src/T2DLL/T2OutDecoration.cpp +++ b/src/T2DLL/T2OutDecoration.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "GlobalFunc.h" #include "T2BitImage.h" @@ -7,7 +8,7 @@ #include "T2PaletteAnime.h" #include "T2Sprite.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #include "URect.h" #include "UT2Coordinate.h" diff --git a/src/T2DLL/T2OutDecoration.h b/src/T2DLL/T2OutDecoration.h index ce7d56d..172ae77 100644 --- a/src/T2DLL/T2OutDecoration.h +++ b/src/T2DLL/T2OutDecoration.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OUTDECORATION_H +#define T2DLL_T2OUTDECORATION_H +#include "../common.h" #include "LArray.h" #include "T2EventItem.h" @@ -50,3 +51,4 @@ struct T2RoofInfo { T2RoofInfo(int inLeft, int inTop, int inRight, int inBottom, BOOL inFlag); }; +#endif diff --git a/src/T2DLL/T2OutObj.cpp b/src/T2DLL/T2OutObj.cpp index d6f7090..8c21123 100644 --- a/src/T2DLL/T2OutObj.cpp +++ b/src/T2DLL/T2OutObj.cpp @@ -1,10 +1,11 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2FloorInfo.h" #include "T2OutObj.h" #include "T2OuterObjDef.h" #include "T2TemplatePluginList.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" T2OutObj::T2OutObj() { mID = 0; diff --git a/src/T2DLL/T2OutObj.h b/src/T2DLL/T2OutObj.h index f6cec0b..e5c5869 100644 --- a/src/T2DLL/T2OutObj.h +++ b/src/T2DLL/T2OutObj.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OUTOBJ_H +#define T2DLL_T2OUTOBJ_H +#include "../common.h" #include "T2HaveOutViewObject.h" enum { @@ -40,3 +41,4 @@ protected: RECT _3C; int _4C; }; +#endif diff --git a/src/T2DLL/T2OutObjArray.cpp b/src/T2DLL/T2OutObjArray.cpp index b38ac82..02bac2c 100644 --- a/src/T2DLL/T2OutObjArray.cpp +++ b/src/T2DLL/T2OutObjArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2OutObjArray.h" T2OutObjArray::T2OutObjArray(unsigned int inStartID) diff --git a/src/T2DLL/T2OutObjArray.h b/src/T2DLL/T2OutObjArray.h index 0f99639..95dc819 100644 --- a/src/T2DLL/T2OutObjArray.h +++ b/src/T2DLL/T2OutObjArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OUTOBJARRAY_H +#define T2DLL_T2OUTOBJARRAY_H +#include "../common.h" #include "T2ObjectArray.h" #include "T2OutObj.h" @@ -23,3 +24,4 @@ protected: T2OutObj mOutObj[kGroupSize]; }; +#endif diff --git a/src/T2DLL/T2OutObjArrayList.cpp b/src/T2DLL/T2OutObjArrayList.cpp index bf1b3fd..decdaee 100644 --- a/src/T2DLL/T2OutObjArrayList.cpp +++ b/src/T2DLL/T2OutObjArrayList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2OutObjArray.h" #include "T2OutObjArrayList.h" diff --git a/src/T2DLL/T2OutObjArrayList.h b/src/T2DLL/T2OutObjArrayList.h index 0ca19f2..fda0a5a 100644 --- a/src/T2DLL/T2OutObjArrayList.h +++ b/src/T2DLL/T2OutObjArrayList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OUTOBJARRAYLIST_H +#define T2DLL_T2OUTOBJARRAYLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2OutObjArrayList : public LArray { @@ -16,3 +17,4 @@ public: void Read(T2Archive& inArchive, T2TowerDoc* inDoc); void Write(T2Archive& inArchive); }; +#endif diff --git a/src/T2DLL/T2OutObjInfoDialog.cpp b/src/T2DLL/T2OutObjInfoDialog.cpp index 54cc3c0..fb98939 100644 --- a/src/T2DLL/T2OutObjInfoDialog.cpp +++ b/src/T2DLL/T2OutObjInfoDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2OutObj.h" #include "T2OutObjInfoDialog.h" diff --git a/src/T2DLL/T2OutObjInfoDialog.h b/src/T2DLL/T2OutObjInfoDialog.h index 27800a4..709558f 100644 --- a/src/T2DLL/T2OutObjInfoDialog.h +++ b/src/T2DLL/T2OutObjInfoDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OUTOBJINFODIALOG_H +#define T2DLL_T2OUTOBJINFODIALOG_H +#include "../common.h" #include "T2InfoDialog.h" class AFX_CLASS_EXPORT T2OutObjInfoDialog : public T2InfoDialog { @@ -11,3 +12,4 @@ protected: T2OutObj *mOutObj; int mUnk100; }; +#endif diff --git a/src/T2DLL/T2OuterObjDef.cpp b/src/T2DLL/T2OuterObjDef.cpp index 8b3adf1..e9f5cc0 100644 --- a/src/T2DLL/T2OuterObjDef.cpp +++ b/src/T2DLL/T2OuterObjDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2FloorInfo.h" #include "T2ImageObj.h" #include "T2InfoDialog.h" @@ -5,7 +6,7 @@ #include "T2OutObj.h" #include "T2OuterObjDef.h" #include "T2OuterObjList.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #include "UT2Coordinate.h" diff --git a/src/T2DLL/T2OuterObjDef.h b/src/T2DLL/T2OuterObjDef.h index 28683d0..b30faea 100644 --- a/src/T2DLL/T2OuterObjDef.h +++ b/src/T2DLL/T2OuterObjDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OUTEROBJDEF_H +#define T2DLL_T2OUTEROBJDEF_H +#include "../common.h" #include "T2ToolDef.h" class AFX_CLASS_EXPORT T2OuterObjDef : public T2ToolDef { @@ -19,3 +20,4 @@ public: protected: T2TenantDef *mTenantDef; }; +#endif diff --git a/src/T2DLL/T2OuterObjList.cpp b/src/T2DLL/T2OuterObjList.cpp index 10224a4..cbd2545 100644 --- a/src/T2DLL/T2OuterObjList.cpp +++ b/src/T2DLL/T2OuterObjList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2OuterObjList.h" #include "T2OutObj.h" diff --git a/src/T2DLL/T2OuterObjList.h b/src/T2DLL/T2OuterObjList.h index 8069ac1..f07a3b6 100644 --- a/src/T2DLL/T2OuterObjList.h +++ b/src/T2DLL/T2OuterObjList.h @@ -1,8 +1,10 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OUTEROBJLIST_H +#define T2DLL_T2OUTEROBJLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2OuterObjList : public LArray { public: ~T2OuterObjList(); }; +#endif diff --git a/src/T2DLL/T2OuterObjPlugin.cpp b/src/T2DLL/T2OuterObjPlugin.cpp index 0ad3022..0b87c23 100644 --- a/src/T2DLL/T2OuterObjPlugin.cpp +++ b/src/T2DLL/T2OuterObjPlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2OuterObjDef.h" #include "T2OuterObjPlugin.h" diff --git a/src/T2DLL/T2OuterObjPlugin.h b/src/T2DLL/T2OuterObjPlugin.h index 565859f..be98010 100644 --- a/src/T2DLL/T2OuterObjPlugin.h +++ b/src/T2DLL/T2OuterObjPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OUTEROBJPLUGIN_H +#define T2DLL_T2OUTEROBJPLUGIN_H +#include "../common.h" #include "T2ToolPlugin.h" class AFX_CLASS_EXPORT T2OuterObjPlugin : public T2ToolPlugin { @@ -10,3 +11,4 @@ public: private: void LoadT2OuterObjDef(T2WorldDef* inWorldDef); }; +#endif diff --git a/src/T2DLL/T2OutsideInfo.cpp b/src/T2DLL/T2OutsideInfo.cpp index df0e6a1..0fff65b 100644 --- a/src/T2DLL/T2OutsideInfo.cpp +++ b/src/T2DLL/T2OutsideInfo.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "LArray.h" #include "T2Archive.h" #include "T2FloorInfo.h" diff --git a/src/T2DLL/T2OutsideInfo.h b/src/T2DLL/T2OutsideInfo.h index abb7cf7..fe92cfc 100644 --- a/src/T2DLL/T2OutsideInfo.h +++ b/src/T2DLL/T2OutsideInfo.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2OUTSIDEINFO_H +#define T2DLL_T2OUTSIDEINFO_H +#include "../common.h" class AFX_CLASS_EXPORT T2OutsideInfo { public: @@ -28,3 +29,4 @@ protected: unsigned int mCurrentOutObjID; const T2FloorInfo &mFloorInfo; }; +#endif diff --git a/src/T2DLL/T2PaletteAnime.cpp b/src/T2DLL/T2PaletteAnime.cpp index fba291b..5fc1483 100644 --- a/src/T2DLL/T2PaletteAnime.cpp +++ b/src/T2DLL/T2PaletteAnime.cpp @@ -1,10 +1,11 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2DateTime.h" #include "T2DayLightFilter.h" #include "T2PaletteAnime.h" #include "T2PaletteAnimeDef.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "T2WeatherFilter.h" #include "T2WorldDef.h" diff --git a/src/T2DLL/T2PaletteAnime.h b/src/T2DLL/T2PaletteAnime.h index 31497b2..65d0a25 100644 --- a/src/T2DLL/T2PaletteAnime.h +++ b/src/T2DLL/T2PaletteAnime.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PALETTEANIME_H +#define T2DLL_T2PALETTEANIME_H +#include "../common.h" class AFX_CLASS_EXPORT T2PaletteAnime { public: @@ -80,3 +81,4 @@ inline BOOL T2PaletteAnime::IsShininDay() const { return true; } } +#endif diff --git a/src/T2DLL/T2PaletteAnimeDef.cpp b/src/T2DLL/T2PaletteAnimeDef.cpp index ee45d91..53e1232 100644 --- a/src/T2DLL/T2PaletteAnimeDef.cpp +++ b/src/T2DLL/T2PaletteAnimeDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "GlobalFunc.h" #include "T2DLL.h" diff --git a/src/T2DLL/T2PaletteAnimeDef.h b/src/T2DLL/T2PaletteAnimeDef.h index 6b45469..f1bbc33 100644 --- a/src/T2DLL/T2PaletteAnimeDef.h +++ b/src/T2DLL/T2PaletteAnimeDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PALETTEANIMEDEF_H +#define T2DLL_T2PALETTEANIMEDEF_H +#include "../common.h" class AFX_CLASS_EXPORT T2PaletteAnimeDef { public: @@ -36,3 +37,4 @@ private: LOGPALETTE *mSEPalette; LOGPALETTE *mUnknownPalette; }; +#endif diff --git a/src/T2DLL/T2People.cpp b/src/T2DLL/T2People.cpp index 4ce0737..616ee20 100644 --- a/src/T2DLL/T2People.cpp +++ b/src/T2DLL/T2People.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2Archive.h" #include "T2BitImage.h" @@ -24,9 +25,9 @@ #include "T2TenantDef.h" #include "T2TrafficInfo.h" #include "T2Transport.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" -#include "T2TowerMainView.h" +#include "../T2TowerMainView.h" #include "T2TowerMessage.h" #include "T2WordDefArray.h" #include "T2WorldDef.h" diff --git a/src/T2DLL/T2People.h b/src/T2DLL/T2People.h index f84f7ca..df374ec 100644 --- a/src/T2DLL/T2People.h +++ b/src/T2DLL/T2People.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLE_H +#define T2DLL_T2PEOPLE_H +#include "../common.h" #include "CLink.h" #include "T2Matter.h" #include "T2PeopleType.h" @@ -174,3 +175,4 @@ inline unsigned int T2People::GetSex() const { sex = !mPeopleType->IsMale(); return sex; } +#endif diff --git a/src/T2DLL/T2PeopleAnimeDef.cpp b/src/T2DLL/T2PeopleAnimeDef.cpp index a392cca..1904489 100644 --- a/src/T2DLL/T2PeopleAnimeDef.cpp +++ b/src/T2DLL/T2PeopleAnimeDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2People.h" #include "T2PeopleAnimeDef.h" diff --git a/src/T2DLL/T2PeopleAnimeDef.h b/src/T2DLL/T2PeopleAnimeDef.h index 1ee14d0..f0ae773 100644 --- a/src/T2DLL/T2PeopleAnimeDef.h +++ b/src/T2DLL/T2PeopleAnimeDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLEANIMEDEF_H +#define T2DLL_T2PEOPLEANIMEDEF_H +#include "../common.h" class AFX_CLASS_EXPORT T2PeopleAnimeDef { public: @@ -16,3 +17,4 @@ private: int m10; T2PeopleAnimeDefElem *mElems; }; +#endif diff --git a/src/T2DLL/T2PeopleAnimeDefElem.cpp b/src/T2DLL/T2PeopleAnimeDefElem.cpp index 4edc362..2e6c34d 100644 --- a/src/T2DLL/T2PeopleAnimeDefElem.cpp +++ b/src/T2DLL/T2PeopleAnimeDefElem.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2People.h" #include "T2PeopleAnimeDefElem.h" diff --git a/src/T2DLL/T2PeopleAnimeDefElem.h b/src/T2DLL/T2PeopleAnimeDefElem.h index 3f02175..2cebbae 100644 --- a/src/T2DLL/T2PeopleAnimeDefElem.h +++ b/src/T2DLL/T2PeopleAnimeDefElem.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLEANIMEDEFELEM_H +#define T2DLL_T2PEOPLEANIMEDEFELEM_H +#include "../common.h" class AFX_CLASS_EXPORT T2PeopleAnimeDefElem { public: @@ -14,3 +15,4 @@ private: int mHStart; int mHRange; }; +#endif diff --git a/src/T2DLL/T2PeopleArray.cpp b/src/T2DLL/T2PeopleArray.cpp index c5f37df..abb568a 100644 --- a/src/T2DLL/T2PeopleArray.cpp +++ b/src/T2DLL/T2PeopleArray.cpp @@ -1,5 +1,6 @@ +#include "StdAfx.h" #include "T2PeopleArray.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" T2PeopleArray::T2PeopleArray(unsigned int startID) : T2ObjectArray(startID) diff --git a/src/T2DLL/T2PeopleArray.h b/src/T2DLL/T2PeopleArray.h index ba692c6..f59f090 100644 --- a/src/T2DLL/T2PeopleArray.h +++ b/src/T2DLL/T2PeopleArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLEARRAY_H +#define T2DLL_T2PEOPLEARRAY_H +#include "../common.h" #include "T2ObjectArray.h" #include "T2People.h" @@ -29,3 +30,4 @@ protected: friend class DbgPeopleView; friend class T2TowerDoc; }; +#endif diff --git a/src/T2DLL/T2PeopleArrayList.cpp b/src/T2DLL/T2PeopleArrayList.cpp index 25e5984..a011897 100644 --- a/src/T2DLL/T2PeopleArrayList.cpp +++ b/src/T2DLL/T2PeopleArrayList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2PeopleArray.h" #include "T2PeopleArrayList.h" diff --git a/src/T2DLL/T2PeopleArrayList.h b/src/T2DLL/T2PeopleArrayList.h index cd668b7..7abaae8 100644 --- a/src/T2DLL/T2PeopleArrayList.h +++ b/src/T2DLL/T2PeopleArrayList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLEARRAYLIST_H +#define T2DLL_T2PEOPLEARRAYLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2PeopleArrayList : public LArray { @@ -23,3 +24,4 @@ public: protected: int mCounter; }; +#endif diff --git a/src/T2DLL/T2PeopleDef.cpp b/src/T2DLL/T2PeopleDef.cpp index 0049920..3b62df3 100644 --- a/src/T2DLL/T2PeopleDef.cpp +++ b/src/T2DLL/T2PeopleDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2PeopleDef.h" diff --git a/src/T2DLL/T2PeopleDef.h b/src/T2DLL/T2PeopleDef.h index 256bf9c..ef3bfcf 100644 --- a/src/T2DLL/T2PeopleDef.h +++ b/src/T2DLL/T2PeopleDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLEDEF_H +#define T2DLL_T2PEOPLEDEF_H +#include "../common.h" #include "T2MatterDef.h" class AFX_CLASS_EXPORT T2PeopleDef : public T2MatterDef { @@ -18,3 +19,4 @@ protected: int mStressBlueLimit; int mStressYellowLimit; }; +#endif diff --git a/src/T2DLL/T2PeopleDemandList.cpp b/src/T2DLL/T2PeopleDemandList.cpp index b2085a5..0451afd 100644 --- a/src/T2DLL/T2PeopleDemandList.cpp +++ b/src/T2DLL/T2PeopleDemandList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2PeopleDemandList.h" #include "T2PeopleTimeZoneList.h" diff --git a/src/T2DLL/T2PeopleDemandList.h b/src/T2DLL/T2PeopleDemandList.h index 8d1ab60..60dac78 100644 --- a/src/T2DLL/T2PeopleDemandList.h +++ b/src/T2DLL/T2PeopleDemandList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLEDEMANDLIST_H +#define T2DLL_T2PEOPLEDEMANDLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2PeopleDemandList : public LArray { @@ -23,3 +24,4 @@ protected: T2SeasonParamDef *mSeasonParamDef; }; +#endif diff --git a/src/T2DLL/T2PeopleInfoDialog.cpp b/src/T2DLL/T2PeopleInfoDialog.cpp index 8356f71..76aa3d7 100644 --- a/src/T2DLL/T2PeopleInfoDialog.cpp +++ b/src/T2DLL/T2PeopleInfoDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CTokenizer.h" #include "GlobalFunc.h" #include "T2DlgItemPPLEvalGage.h" @@ -12,7 +13,7 @@ #include "T2Tenant.h" #include "T2TenantDef.h" #include "T2ToolDef.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #include "UT2Utils.h" diff --git a/src/T2DLL/T2PeopleInfoDialog.h b/src/T2DLL/T2PeopleInfoDialog.h index 4f22886..b1c2454 100644 --- a/src/T2DLL/T2PeopleInfoDialog.h +++ b/src/T2DLL/T2PeopleInfoDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLEINFODIALOG_H +#define T2DLL_T2PEOPLEINFODIALOG_H +#include "../common.h" #include "T2InfoDialog.h" class AFX_CLASS_EXPORT T2PeopleInfoDialog : public T2InfoDialog { @@ -20,3 +21,4 @@ protected: int m104; CString m108; }; +#endif diff --git a/src/T2DLL/T2PeopleLinkIterator.cpp b/src/T2DLL/T2PeopleLinkIterator.cpp index c0bdf00..1a7b56a 100644 --- a/src/T2DLL/T2PeopleLinkIterator.cpp +++ b/src/T2DLL/T2PeopleLinkIterator.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2People.h" #include "T2PeopleLinkIterator.h" diff --git a/src/T2DLL/T2PeopleLinkIterator.h b/src/T2DLL/T2PeopleLinkIterator.h index 716e269..c2aa232 100644 --- a/src/T2DLL/T2PeopleLinkIterator.h +++ b/src/T2DLL/T2PeopleLinkIterator.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLELINKITERATOR_H +#define T2DLL_T2PEOPLELINKITERATOR_H +#include "../common.h" class AFX_CLASS_EXPORT T2PeopleLinkIterator { public: @@ -14,3 +15,4 @@ protected: T2People *mFirst; T2People *mCurrent; }; +#endif diff --git a/src/T2DLL/T2PeopleLoader.cpp b/src/T2DLL/T2PeopleLoader.cpp index e19a554..5889afc 100644 --- a/src/T2DLL/T2PeopleLoader.cpp +++ b/src/T2DLL/T2PeopleLoader.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2PeopleDef.h" #include "T2PeopleLoader.h" diff --git a/src/T2DLL/T2PeopleLoader.h b/src/T2DLL/T2PeopleLoader.h index 8bf497a..fc3f72e 100644 --- a/src/T2DLL/T2PeopleLoader.h +++ b/src/T2DLL/T2PeopleLoader.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLELOADER_H +#define T2DLL_T2PEOPLELOADER_H +#include "../common.h" class AFX_CLASS_EXPORT T2PeopleLoader { public: @@ -9,3 +10,4 @@ protected: static BOOL LoadSilhouette(T2PluginSpecifier*, T2TemplatePluginDB*); static BOOL LoadPeople(T2PluginSpecifier*, T2TemplatePluginDB*); }; +#endif diff --git a/src/T2DLL/T2PeoplePtrList.cpp b/src/T2DLL/T2PeoplePtrList.cpp index 40e1f22..354e65c 100644 --- a/src/T2DLL/T2PeoplePtrList.cpp +++ b/src/T2DLL/T2PeoplePtrList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2People.h" #include "T2PeopleArrayList.h" diff --git a/src/T2DLL/T2PeoplePtrList.h b/src/T2DLL/T2PeoplePtrList.h index 788b996..9e7c40c 100644 --- a/src/T2DLL/T2PeoplePtrList.h +++ b/src/T2DLL/T2PeoplePtrList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLEPTRLIST_H +#define T2DLL_T2PEOPLEPTRLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2PeoplePtrList : public LArray { @@ -24,3 +25,4 @@ public: protected: void Init(unsigned int count); }; +#endif diff --git a/src/T2DLL/T2PeopleTimeZoneList.cpp b/src/T2DLL/T2PeopleTimeZoneList.cpp index 7fc6d80..c0210dc 100644 --- a/src/T2DLL/T2PeopleTimeZoneList.cpp +++ b/src/T2DLL/T2PeopleTimeZoneList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2Archive.h" #include "T2PeopleTimeZoneList.h" diff --git a/src/T2DLL/T2PeopleTimeZoneList.h b/src/T2DLL/T2PeopleTimeZoneList.h index 2f90b65..8b5ee21 100644 --- a/src/T2DLL/T2PeopleTimeZoneList.h +++ b/src/T2DLL/T2PeopleTimeZoneList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLETIMEZONELIST_H +#define T2DLL_T2PEOPLETIMEZONELIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2PeopleTimeZoneList : public LArray { @@ -42,3 +43,4 @@ inline BOOL T2PeopleTimeZoneList::IsFixed() const { inline int T2PeopleTimeZoneList::GetNumOfTimeZone() const { return GetCount(); } +#endif diff --git a/src/T2DLL/T2PeopleType.cpp b/src/T2DLL/T2PeopleType.cpp index 96a6f95..7ad3966 100644 --- a/src/T2DLL/T2PeopleType.cpp +++ b/src/T2DLL/T2PeopleType.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2PeopleType.h" #include "T2TenantMemberDef.h" diff --git a/src/T2DLL/T2PeopleType.h b/src/T2DLL/T2PeopleType.h index b2d2969..25d980e 100644 --- a/src/T2DLL/T2PeopleType.h +++ b/src/T2DLL/T2PeopleType.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLETYPE_H +#define T2DLL_T2PEOPLETYPE_H +#include "../common.h" // Transport types enum { @@ -128,3 +129,4 @@ inline void T2PeopleType::DecreaseLife() { inline int T2PeopleType::GetEconoType() const { return mEconoType; } +#endif diff --git a/src/T2DLL/T2PeopleTypeArray.cpp b/src/T2DLL/T2PeopleTypeArray.cpp index 1512ae6..402da5e 100644 --- a/src/T2DLL/T2PeopleTypeArray.cpp +++ b/src/T2DLL/T2PeopleTypeArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2PeopleType.h" #include "T2PeopleTypeArray.h" diff --git a/src/T2DLL/T2PeopleTypeArray.h b/src/T2DLL/T2PeopleTypeArray.h index 48c4a2a..f667fc0 100644 --- a/src/T2DLL/T2PeopleTypeArray.h +++ b/src/T2DLL/T2PeopleTypeArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PEOPLETYPEARRAY_H +#define T2DLL_T2PEOPLETYPEARRAY_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2PeopleTypeArray : protected LArray { @@ -25,3 +26,4 @@ protected: friend class T2PoolView; }; +#endif diff --git a/src/T2DLL/T2PlaceParamDef.cpp b/src/T2DLL/T2PlaceParamDef.cpp index a89b4e1..70aa656 100644 --- a/src/T2DLL/T2PlaceParamDef.cpp +++ b/src/T2DLL/T2PlaceParamDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2PlaceParamDef.h" diff --git a/src/T2DLL/T2PlaceParamDef.h b/src/T2DLL/T2PlaceParamDef.h index 328b35f..99d541c 100644 --- a/src/T2DLL/T2PlaceParamDef.h +++ b/src/T2DLL/T2PlaceParamDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PLACEPARAMDEF_H +#define T2DLL_T2PLACEPARAMDEF_H +#include "../common.h" class AFX_CLASS_EXPORT T2PlaceParamDef { public: @@ -37,3 +38,4 @@ inline float T2PlaceParamDef::GetRate(EPlace place) const { inline short T2PlaceParamDef::GetScore(EPlace place) const { return mEntries[place].mScore; } +#endif diff --git a/src/T2DLL/T2PluginInfoTable.cpp b/src/T2DLL/T2PluginInfoTable.cpp index 7755b47..5358bc0 100644 --- a/src/T2DLL/T2PluginInfoTable.cpp +++ b/src/T2DLL/T2PluginInfoTable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CPluginInfo.h" #include "LArray.h" #include "T2PluginInfoTable.h" diff --git a/src/T2DLL/T2PluginInfoTable.h b/src/T2DLL/T2PluginInfoTable.h index 0a6615f..ddffcf4 100644 --- a/src/T2DLL/T2PluginInfoTable.h +++ b/src/T2DLL/T2PluginInfoTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PLUGININFOTABLE_H +#define T2DLL_T2PLUGININFOTABLE_H +#include "../common.h" #include "T2DlgItemImageTable.h" class AFX_CLASS_EXPORT T2PluginInfoTable : public T2DlgItemImageTable { @@ -17,3 +18,4 @@ protected: int mType; }; +#endif diff --git a/src/T2DLL/T2PluginLoader.cpp b/src/T2DLL/T2PluginLoader.cpp index 345d92e..0ac2414 100644 --- a/src/T2DLL/T2PluginLoader.cpp +++ b/src/T2DLL/T2PluginLoader.cpp @@ -1,5 +1,6 @@ +#include "StdAfx.h" #include "GlobalFunc.h" -#include "T2.h" +#include "../T2.h" #include "T2DLL.h" #include "T2PluginLoader.h" #include "T2PluginSpecifier.h" diff --git a/src/T2DLL/T2PluginLoader.h b/src/T2DLL/T2PluginLoader.h index 8653f8c..6743224 100644 --- a/src/T2DLL/T2PluginLoader.h +++ b/src/T2DLL/T2PluginLoader.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PLUGINLOADER_H +#define T2DLL_T2PLUGINLOADER_H +#include "../common.h" class AFX_CLASS_EXPORT T2PluginLoader { public: @@ -17,3 +18,4 @@ protected: CObList mList; DWORD mTypeFilter; }; +#endif diff --git a/src/T2DLL/T2PluginSpecifier.cpp b/src/T2DLL/T2PluginSpecifier.cpp index 69a4fed..0e32082 100644 --- a/src/T2DLL/T2PluginSpecifier.cpp +++ b/src/T2DLL/T2PluginSpecifier.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2PluginSpecifier.h" #include "CResFile.h" #include "GlobalFunc.h" diff --git a/src/T2DLL/T2PluginSpecifier.h b/src/T2DLL/T2PluginSpecifier.h index 8a3c6d0..1096574 100644 --- a/src/T2DLL/T2PluginSpecifier.h +++ b/src/T2DLL/T2PluginSpecifier.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PLUGINSPECIFIER_H +#define T2DLL_T2PLUGINSPECIFIER_H +#include "../common.h" class AFX_CLASS_EXPORT T2PluginSpecifier : public CObject { public: @@ -25,3 +26,4 @@ public: BOOL mIsLoaded; CTime mTime; }; +#endif diff --git a/src/T2DLL/T2Pool.cpp b/src/T2DLL/T2Pool.cpp index 007735c..8fd9b60 100644 --- a/src/T2DLL/T2Pool.cpp +++ b/src/T2DLL/T2Pool.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2Archive.h" #include "T2DateTime.h" diff --git a/src/T2DLL/T2Pool.h b/src/T2DLL/T2Pool.h index d874d2c..5efc340 100644 --- a/src/T2DLL/T2Pool.h +++ b/src/T2DLL/T2Pool.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2POOL_H +#define T2DLL_T2POOL_H +#include "../common.h" class AFX_CLASS_EXPORT T2Pool { public: @@ -43,3 +44,4 @@ protected: inline int T2Pool::GetPopulation() const { return mPopulation; } +#endif diff --git a/src/T2DLL/T2PoolDef.cpp b/src/T2DLL/T2PoolDef.cpp index 558fdd7..fe139d1 100644 --- a/src/T2DLL/T2PoolDef.cpp +++ b/src/T2DLL/T2PoolDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2PeopleType.h" #include "T2PoolDef.h" diff --git a/src/T2DLL/T2PoolDef.h b/src/T2DLL/T2PoolDef.h index b1c7fb0..eb347ee 100644 --- a/src/T2DLL/T2PoolDef.h +++ b/src/T2DLL/T2PoolDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2POOLDEF_H +#define T2DLL_T2POOLDEF_H +#include "../common.h" enum { kPoolUnitSize = 20 @@ -81,3 +82,4 @@ public: unsigned char mNumOfDemand; DemandInfo *mDemand; }; +#endif diff --git a/src/T2DLL/T2PrefDialogBox.cpp b/src/T2DLL/T2PrefDialogBox.cpp index 8f21e5c..5425253 100644 --- a/src/T2DLL/T2PrefDialogBox.cpp +++ b/src/T2DLL/T2PrefDialogBox.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CTokenizer.h" #include "T2BitImage.h" #include "T2DlgItemAllPurpose.h" @@ -5,7 +6,7 @@ #include "T2PluginInfoTable.h" #include "T2PluginLoader.h" #include "T2PrefDialogBox.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" T2PrefDialogBox::T2PrefDialogBox() { mCurrentTab = -1; diff --git a/src/T2DLL/T2PrefDialogBox.h b/src/T2DLL/T2PrefDialogBox.h index ec79ac5..deb1722 100644 --- a/src/T2DLL/T2PrefDialogBox.h +++ b/src/T2DLL/T2PrefDialogBox.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PREFDIALOGBOX_H +#define T2DLL_T2PREFDIALOGBOX_H +#include "../common.h" #include "T2Dialog.h" class AFX_CLASS_EXPORT T2PrefDialogBox : public T2Dialog { @@ -29,3 +30,4 @@ protected: CWnd *mAboutButton; CWnd *mMakePrefButton; }; +#endif diff --git a/src/T2DLL/T2PrefFile.cpp b/src/T2DLL/T2PrefFile.cpp index 3b973e8..63cdf5e 100644 --- a/src/T2DLL/T2PrefFile.cpp +++ b/src/T2DLL/T2PrefFile.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2PrefFile.h" T2PrefFile::T2PrefFile(const unsigned char* str1, const unsigned char* str2, int val) { diff --git a/src/T2DLL/T2PrefFile.h b/src/T2DLL/T2PrefFile.h index 9f6e9ce..6ea0b04 100644 --- a/src/T2DLL/T2PrefFile.h +++ b/src/T2DLL/T2PrefFile.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2PREFFILE_H +#define T2DLL_T2PREFFILE_H +#include "../common.h" class AFX_CLASS_EXPORT T2PrefFile { public: @@ -9,3 +10,4 @@ public: protected: CString mStr; }; +#endif diff --git a/src/T2DLL/T2RegistedTenantDB.cpp b/src/T2DLL/T2RegistedTenantDB.cpp index 1aee876..b1320fc 100644 --- a/src/T2DLL/T2RegistedTenantDB.cpp +++ b/src/T2DLL/T2RegistedTenantDB.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2EquipPtrList.h" #include "T2RegistedTenantDB.h" #include "T2RouteNavigator.h" diff --git a/src/T2DLL/T2RegistedTenantDB.h b/src/T2DLL/T2RegistedTenantDB.h index ee5bd72..7f46cdc 100644 --- a/src/T2DLL/T2RegistedTenantDB.h +++ b/src/T2DLL/T2RegistedTenantDB.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2REGISTEDTENANTDB_H +#define T2DLL_T2REGISTEDTENANTDB_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2RegistedTenantDB : private LArray { @@ -15,3 +16,4 @@ public: T2Tenant* FindEmptyParking() const; T2Tenant* FindHisParking(T2People*) const; }; +#endif diff --git a/src/T2DLL/T2RegistedTenantIterator.cpp b/src/T2DLL/T2RegistedTenantIterator.cpp index c9597c0..ba13f51 100644 --- a/src/T2DLL/T2RegistedTenantIterator.cpp +++ b/src/T2DLL/T2RegistedTenantIterator.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2EquipPtrList.h" #include "T2RegistedTenantDB.h" #include "T2RegistedTenantIterator.h" diff --git a/src/T2DLL/T2RegistedTenantIterator.h b/src/T2DLL/T2RegistedTenantIterator.h index ef948a6..aa9abee 100644 --- a/src/T2DLL/T2RegistedTenantIterator.h +++ b/src/T2DLL/T2RegistedTenantIterator.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2REGISTEDTENANTITERATOR_H +#define T2DLL_T2REGISTEDTENANTITERATOR_H +#include "../common.h" class AFX_CLASS_EXPORT T2RegistedTenantIterator { public: @@ -14,3 +15,4 @@ protected: POINT mPoint; int mIndex; }; +#endif diff --git a/src/T2DLL/T2RemoveFavoriteDialog.cpp b/src/T2DLL/T2RemoveFavoriteDialog.cpp index c10ea94..2c65212 100644 --- a/src/T2DLL/T2RemoveFavoriteDialog.cpp +++ b/src/T2DLL/T2RemoveFavoriteDialog.cpp @@ -1,9 +1,10 @@ +#include "StdAfx.h" #include "CTokenizer.h" #include "T2Name.h" #include "T2NameList.h" #include "T2NameTable.h" #include "T2RemoveFavoriteDialog.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" T2RemoveFavoriteDialog::T2RemoveFavoriteDialog() : mNameType(0) diff --git a/src/T2DLL/T2RemoveFavoriteDialog.h b/src/T2DLL/T2RemoveFavoriteDialog.h index 0688734..6fe4a14 100644 --- a/src/T2DLL/T2RemoveFavoriteDialog.h +++ b/src/T2DLL/T2RemoveFavoriteDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2REMOVEFAVORITEDIALOG_H +#define T2DLL_T2REMOVEFAVORITEDIALOG_H +#include "../common.h" #include "T2Dialog.h" class AFX_CLASS_EXPORT T2RemoveFavoriteDialog : public T2Dialog { @@ -20,3 +21,4 @@ protected: CWnd *mDeleteButton; T2NameTable *mNameTable; }; +#endif diff --git a/src/T2DLL/T2Request.cpp b/src/T2DLL/T2Request.cpp index 83c52f3..826ad60 100644 --- a/src/T2DLL/T2Request.cpp +++ b/src/T2DLL/T2Request.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2BitImage.h" #include "T2FloorInfo.h" @@ -7,8 +8,8 @@ #include "T2PeopleLinkIterator.h" #include "T2Request.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "UT2Coordinate.h" #include <MINMAX.H> diff --git a/src/T2DLL/T2Request.h b/src/T2DLL/T2Request.h index d946d97..5033fd4 100644 --- a/src/T2DLL/T2Request.h +++ b/src/T2DLL/T2Request.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2REQUEST_H +#define T2DLL_T2REQUEST_H +#include "../common.h" #include "T2DrawableObject.h" class AFX_CLASS_EXPORT T2Request : public T2DrawableObject { @@ -80,3 +81,4 @@ protected: BOOL mPeopleRemoved; int mNumOfContent; }; +#endif diff --git a/src/T2DLL/T2RequestArray.cpp b/src/T2DLL/T2RequestArray.cpp index 65c34a3..087c933 100644 --- a/src/T2DLL/T2RequestArray.cpp +++ b/src/T2DLL/T2RequestArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2RequestArray.h" T2RequestArray::T2RequestArray(unsigned int startID) diff --git a/src/T2DLL/T2RequestArray.h b/src/T2DLL/T2RequestArray.h index 3a6e652..12ad611 100644 --- a/src/T2DLL/T2RequestArray.h +++ b/src/T2DLL/T2RequestArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2REQUESTARRAY_H +#define T2DLL_T2REQUESTARRAY_H +#include "../common.h" #include "T2ObjectArray.h" #include "T2Request.h" @@ -18,3 +19,4 @@ public: protected: T2Request mRequests[64]; }; +#endif diff --git a/src/T2DLL/T2RequestArrayList.cpp b/src/T2DLL/T2RequestArrayList.cpp index 8fac11a..ae45dc3 100644 --- a/src/T2DLL/T2RequestArrayList.cpp +++ b/src/T2DLL/T2RequestArrayList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2RequestArray.h" #include "T2RequestArrayList.h" diff --git a/src/T2DLL/T2RequestArrayList.h b/src/T2DLL/T2RequestArrayList.h index 315143b..5ba6573 100644 --- a/src/T2DLL/T2RequestArrayList.h +++ b/src/T2DLL/T2RequestArrayList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2REQUESTARRAYLIST_H +#define T2DLL_T2REQUESTARRAYLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2RequestArrayList : private LArray { @@ -16,3 +17,4 @@ public: void Write(T2Archive&); void DispatchIdle(T2TowerDoc*); }; +#endif diff --git a/src/T2DLL/T2RequestIDArray.cpp b/src/T2DLL/T2RequestIDArray.cpp index 14236cd..6532ca6 100644 --- a/src/T2DLL/T2RequestIDArray.cpp +++ b/src/T2DLL/T2RequestIDArray.cpp @@ -1,8 +1,9 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2FloorInfo.h" #include "T2Request.h" #include "T2RequestIDArray.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" T2RequestIDArray::T2RequestIDArray() { } diff --git a/src/T2DLL/T2RequestIDArray.h b/src/T2DLL/T2RequestIDArray.h index 10b2fd9..df90411 100644 --- a/src/T2DLL/T2RequestIDArray.h +++ b/src/T2DLL/T2RequestIDArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2REQUESTIDARRAY_H +#define T2DLL_T2REQUESTIDARRAY_H +#include "../common.h" #include "LArray.h" enum EReqIDArrayPos { @@ -30,3 +31,4 @@ public: private: int GetIndex(int, ERequestUpDown) const; }; +#endif diff --git a/src/T2DLL/T2ReturnStack.cpp b/src/T2DLL/T2ReturnStack.cpp index 4c046bb..f2e1984 100644 --- a/src/T2DLL/T2ReturnStack.cpp +++ b/src/T2DLL/T2ReturnStack.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2ReturnStack.h" diff --git a/src/T2DLL/T2ReturnStack.h b/src/T2DLL/T2ReturnStack.h index c2db87f..bddac97 100644 --- a/src/T2DLL/T2ReturnStack.h +++ b/src/T2DLL/T2ReturnStack.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2RETURNSTACK_H +#define T2DLL_T2RETURNSTACK_H +#include "../common.h" class T2ReturnStack { public: @@ -29,3 +30,4 @@ public: Entry mEntries[3]; int mCount; }; +#endif diff --git a/src/T2DLL/T2RouteCEArray.cpp b/src/T2DLL/T2RouteCEArray.cpp index 537c3f0..d05a129 100644 --- a/src/T2DLL/T2RouteCEArray.cpp +++ b/src/T2DLL/T2RouteCEArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2RouteCEArray.h" T2RouteCEArray::T2RouteCEArray() { diff --git a/src/T2DLL/T2RouteCEArray.h b/src/T2DLL/T2RouteCEArray.h index 999b36d..54e6023 100644 --- a/src/T2DLL/T2RouteCEArray.h +++ b/src/T2DLL/T2RouteCEArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ROUTECEARRAY_H +#define T2DLL_T2ROUTECEARRAY_H +#include "../common.h" #include "T2CrossEquipArray.h" class AFX_CLASS_EXPORT T2RouteCEArray : public T2CrossEquipArray { @@ -12,3 +13,4 @@ public: virtual DWORD GetCEClassID() { return 'RCEA'; } }; +#endif diff --git a/src/T2DLL/T2RouteNavigator.cpp b/src/T2DLL/T2RouteNavigator.cpp index d07acb8..eb7995f 100644 --- a/src/T2DLL/T2RouteNavigator.cpp +++ b/src/T2DLL/T2RouteNavigator.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2FloorInfo.h" #include "T2FloorPtrList.h" #include "T2Mover.h" diff --git a/src/T2DLL/T2RouteNavigator.h b/src/T2DLL/T2RouteNavigator.h index b12a6b9..bea1650 100644 --- a/src/T2DLL/T2RouteNavigator.h +++ b/src/T2DLL/T2RouteNavigator.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ROUTENAVIGATOR_H +#define T2DLL_T2ROUTENAVIGATOR_H +#include "../common.h" enum { kRouteTypeNeg1 = -1, @@ -39,3 +40,4 @@ protected: inline T2FloorPtrList* T2RouteNavigator::GetFloorPtrList() const { return mFloorPtrList; } +#endif diff --git a/src/T2DLL/T2RoutingTable.cpp b/src/T2DLL/T2RoutingTable.cpp index df91553..5c08559 100644 --- a/src/T2DLL/T2RoutingTable.cpp +++ b/src/T2DLL/T2RoutingTable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2CrossEquipArray.h" #include "T2FInfoAreaIterator.h" #include "T2FloorInfo.h" diff --git a/src/T2DLL/T2RoutingTable.h b/src/T2DLL/T2RoutingTable.h index f2c3691..8d4f7e2 100644 --- a/src/T2DLL/T2RoutingTable.h +++ b/src/T2DLL/T2RoutingTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ROUTINGTABLE_H +#define T2DLL_T2ROUTINGTABLE_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2RoutingTable : private LArray { @@ -33,3 +34,4 @@ protected: T2FloorInfo *mFloorInfo; }; +#endif diff --git a/src/T2DLL/T2RoutingTableElem.cpp b/src/T2DLL/T2RoutingTableElem.cpp index 93a2489..02d655b 100644 --- a/src/T2DLL/T2RoutingTableElem.cpp +++ b/src/T2DLL/T2RoutingTableElem.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2RoutingTableElem.h" T2RoutingTableElem::T2RoutingTableElem() { diff --git a/src/T2DLL/T2RoutingTableElem.h b/src/T2DLL/T2RoutingTableElem.h index 376a1f6..1bcd2c5 100644 --- a/src/T2DLL/T2RoutingTableElem.h +++ b/src/T2DLL/T2RoutingTableElem.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2ROUTINGTABLEELEM_H +#define T2DLL_T2ROUTINGTABLEELEM_H +#include "../common.h" class AFX_CLASS_EXPORT T2RoutingTableElem { public: @@ -28,3 +29,4 @@ inline unsigned int T2RoutingTableElem::GetScore() const { return mScore; } inline int T2RoutingTableElem::GetTime() const { return mTime; } inline int T2RoutingTableElem::GetFinalHPos() const { return mFinalHPos; } inline BOOL T2RoutingTableElem::HasRoute() const { return (mNextFloorID != 0); } +#endif diff --git a/src/T2DLL/T2SantaClaus.cpp b/src/T2DLL/T2SantaClaus.cpp index 37f34c3..00bd1fc 100644 --- a/src/T2DLL/T2SantaClaus.cpp +++ b/src/T2DLL/T2SantaClaus.cpp @@ -1,15 +1,16 @@ +#include "StdAfx.h" #include "CResFile.h" #include "GlobalFunc.h" #include "T2BitImage.h" #include "T2DateTime.h" #include "T2ImageObj.h" -#include "T2MainWindow.h" +#include "../T2MainWindow.h" #include "T2SantaClaus.h" #include "T2Sprite.h" #include "T2ToolWindow.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" -#include "T2TowerMainView.h" +#include "../T2TowerMainView.h" #include "T2WorldDef.h" #include "UT2Coordinate.h" diff --git a/src/T2DLL/T2SantaClaus.h b/src/T2DLL/T2SantaClaus.h index a6ba866..fd721b6 100644 --- a/src/T2DLL/T2SantaClaus.h +++ b/src/T2DLL/T2SantaClaus.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SANTACLAUS_H +#define T2DLL_T2SANTACLAUS_H +#include "../common.h" #include "LAttachment.h" #include "T2EventItem.h" @@ -47,3 +48,4 @@ protected: virtual void ExecuteSelf(unsigned int inMessage, void* ioData); T2SantaClaus *mOwner; }; +#endif diff --git a/src/T2DLL/T2SearchDialog.cpp b/src/T2DLL/T2SearchDialog.cpp index 5a5bd84..01c5253 100644 --- a/src/T2DLL/T2SearchDialog.cpp +++ b/src/T2DLL/T2SearchDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "MoverSearchDlg.h" #include "PeopleSearchDlg.h" @@ -5,7 +6,7 @@ #include "T2DlgItem.h" #include "T2ImageObj.h" #include "T2SearchDialog.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "TenantSearchDlg.h" T2SearchDialog::T2SearchDialog(T2TowerDoc* inDoc) { diff --git a/src/T2DLL/T2SearchDialog.h b/src/T2DLL/T2SearchDialog.h index 719648b..24dc2b4 100644 --- a/src/T2DLL/T2SearchDialog.h +++ b/src/T2DLL/T2SearchDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SEARCHDIALOG_H +#define T2DLL_T2SEARCHDIALOG_H +#include "../common.h" #include "T2Dialog.h" class AFX_CLASS_EXPORT T2SearchDialog : public T2Dialog { @@ -17,3 +18,4 @@ protected: T2ImageObj *mImageObj; T2BitImage *mImage; }; +#endif diff --git a/src/T2DLL/T2SeasonParamDef.cpp b/src/T2DLL/T2SeasonParamDef.cpp index d453eb3..9b22520 100644 --- a/src/T2DLL/T2SeasonParamDef.cpp +++ b/src/T2DLL/T2SeasonParamDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2SeasonParamDef.h" diff --git a/src/T2DLL/T2SeasonParamDef.h b/src/T2DLL/T2SeasonParamDef.h index 5177238..c9a18b1 100644 --- a/src/T2DLL/T2SeasonParamDef.h +++ b/src/T2DLL/T2SeasonParamDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SEASONPARAMDEF_H +#define T2DLL_T2SEASONPARAMDEF_H +#include "../common.h" // unknown name struct T2SeasonParamDefElem { @@ -22,3 +23,4 @@ public: protected: T2SeasonParamDefElem mElems[12]; }; +#endif diff --git a/src/T2DLL/T2SerialDialog.cpp b/src/T2DLL/T2SerialDialog.cpp index 53f1641..8cf5593 100644 --- a/src/T2DLL/T2SerialDialog.cpp +++ b/src/T2DLL/T2SerialDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2SerialDialog.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2SerialDialog.h b/src/T2DLL/T2SerialDialog.h index dab8deb..cf17fa2 100644 --- a/src/T2DLL/T2SerialDialog.h +++ b/src/T2DLL/T2SerialDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SERIALDIALOG_H +#define T2DLL_T2SERIALDIALOG_H +#include "../common.h" class T2SerialDialog : public CDialog { public: @@ -16,3 +17,4 @@ protected: CString mStrings[4]; }; +#endif diff --git a/src/T2DLL/T2SettingDialog.cpp b/src/T2DLL/T2SettingDialog.cpp index 5eb6551..77334f6 100644 --- a/src/T2DLL/T2SettingDialog.cpp +++ b/src/T2DLL/T2SettingDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "SoundDlg.h" #include "SpeedDlg.h" diff --git a/src/T2DLL/T2SettingDialog.h b/src/T2DLL/T2SettingDialog.h index 8bf0fd5..1aafa9b 100644 --- a/src/T2DLL/T2SettingDialog.h +++ b/src/T2DLL/T2SettingDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SETTINGDIALOG_H +#define T2DLL_T2SETTINGDIALOG_H +#include "../common.h" #include "T2Dialog.h" class AFX_CLASS_EXPORT T2SettingDialog : public T2Dialog { @@ -16,3 +17,4 @@ protected: T2ImageObj *mImageObj; T2BitImage *mBitImage; }; +#endif diff --git a/src/T2DLL/T2Settlement.cpp b/src/T2DLL/T2Settlement.cpp index ed60b5f..8391f20 100644 --- a/src/T2DLL/T2Settlement.cpp +++ b/src/T2DLL/T2Settlement.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "LArray.h" #include "T2Archive.h" #include "T2DateTime.h" @@ -6,7 +7,7 @@ #include "T2Settlement.h" #include "T2TemplatePluginList.h" #include "T2TenantDef.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerMessage.h" T2Settlement::T2Settlement(T2TowerDoc* towerDoc, int funds) { diff --git a/src/T2DLL/T2Settlement.h b/src/T2DLL/T2Settlement.h index e879a82..3e8f598 100644 --- a/src/T2DLL/T2Settlement.h +++ b/src/T2DLL/T2Settlement.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SETTLEMENT_H +#define T2DLL_T2SETTLEMENT_H +#include "../common.h" enum { kFundGroup0, @@ -59,3 +60,4 @@ protected: int m1C; LArray *mCategoryTimeLimitList; }; +#endif diff --git a/src/T2DLL/T2SilhouetteDef.cpp b/src/T2DLL/T2SilhouetteDef.cpp index f514197..e4ec009 100644 --- a/src/T2DLL/T2SilhouetteDef.cpp +++ b/src/T2DLL/T2SilhouetteDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2BitImage.h" #include "T2ImageObj.h" diff --git a/src/T2DLL/T2SilhouetteDef.h b/src/T2DLL/T2SilhouetteDef.h index ba3b750..ca41861 100644 --- a/src/T2DLL/T2SilhouetteDef.h +++ b/src/T2DLL/T2SilhouetteDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SILHOUETTEDEF_H +#define T2DLL_T2SILHOUETTEDEF_H +#include "../common.h" #include "T2TemplatePlugin.h" class AFX_CLASS_EXPORT T2SilhouetteDef : public T2TemplatePlugin { @@ -32,3 +33,4 @@ inline int T2SilhouetteDef::GetWidth() const { inline int T2SilhouetteDef::GetRouteType() const { return mRouteType; } +#endif diff --git a/src/T2DLL/T2SilhouettePane.cpp b/src/T2DLL/T2SilhouettePane.cpp index 64d0b05..1c3a853 100644 --- a/src/T2DLL/T2SilhouettePane.cpp +++ b/src/T2DLL/T2SilhouettePane.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2BitImage.h" #include "T2People.h" #include "T2SilhouettePane.h" diff --git a/src/T2DLL/T2SilhouettePane.h b/src/T2DLL/T2SilhouettePane.h index 60bdec4..4079f90 100644 --- a/src/T2DLL/T2SilhouettePane.h +++ b/src/T2DLL/T2SilhouettePane.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SILHOUETTEPANE_H +#define T2DLL_T2SILHOUETTEPANE_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2SilhouettePane : public T2DlgItem { @@ -32,3 +33,4 @@ protected: BOOL mHasCustomColor; int mCustomColor; }; +#endif diff --git a/src/T2DLL/T2SoundPlayer.cpp b/src/T2DLL/T2SoundPlayer.cpp index 523b741..b332949 100644 --- a/src/T2DLL/T2SoundPlayer.cpp +++ b/src/T2DLL/T2SoundPlayer.cpp @@ -1,7 +1,8 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2SoundPlayer.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "Wave.h" BEGIN_MESSAGE_MAP(T2SoundPlayer, CWnd) @@ -118,7 +119,7 @@ BOOL T2SoundPlayer::LoadSound(T2SoundObjItem* inItem, const CString& inName, CWa mDirectSound->CreateSoundBuffer(&desc, &inItem->mDSBuffers[0], NULL); - inItem->mDSBuffers[0]->Lock(0, waveDataLength, &waveDataPtr, &waveDataLength, NULL, NULL, 0); + inItem->mDSBuffers[0]->Lock(0, waveDataLength, (void **) &waveDataPtr, &waveDataLength, NULL, NULL, 0); waveDataLength = inWave.GetData(waveDataPtr, waveDataLength); inItem->mDSBuffers[0]->Unlock(waveDataPtr, waveDataLength, NULL, 0); diff --git a/src/T2DLL/T2SoundPlayer.h b/src/T2DLL/T2SoundPlayer.h index 01eb326..cc2c8d4 100644 --- a/src/T2DLL/T2SoundPlayer.h +++ b/src/T2DLL/T2SoundPlayer.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SOUNDPLAYER_H +#define T2DLL_T2SOUNDPLAYER_H +#include "../common.h" enum PLAYMODE { PlayMode_0, @@ -90,3 +91,4 @@ private: BOOL mIsSoundOn; BOOL mIsFadeOut; }; +#endif diff --git a/src/T2DLL/T2Sprite.cpp b/src/T2DLL/T2Sprite.cpp index cd152b1..d15cd7b 100644 --- a/src/T2DLL/T2Sprite.cpp +++ b/src/T2DLL/T2Sprite.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2ImageObj.h" #include "T2Sprite.h" #include "T2SpriteObj.h" diff --git a/src/T2DLL/T2Sprite.h b/src/T2DLL/T2Sprite.h index 32748d3..f084cd0 100644 --- a/src/T2DLL/T2Sprite.h +++ b/src/T2DLL/T2Sprite.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SPRITE_H +#define T2DLL_T2SPRITE_H +#include "../common.h" #include "T2SpriteObj.h" class AFX_CLASS_EXPORT T2Sprite : protected CList<T2SpriteObj *, T2SpriteObj *> { @@ -37,3 +38,4 @@ private: friend class T2TowerDoc; }; +#endif diff --git a/src/T2DLL/T2SpriteObj.cpp b/src/T2DLL/T2SpriteObj.cpp index 3254758..db103b4 100644 --- a/src/T2DLL/T2SpriteObj.cpp +++ b/src/T2DLL/T2SpriteObj.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2SpriteObj.h" T2SpriteObj::T2SpriteObj() { diff --git a/src/T2DLL/T2SpriteObj.h b/src/T2DLL/T2SpriteObj.h index 0c554dd..3fb83ff 100644 --- a/src/T2DLL/T2SpriteObj.h +++ b/src/T2DLL/T2SpriteObj.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SPRITEOBJ_H +#define T2DLL_T2SPRITEOBJ_H +#include "../common.h" class AFX_CLASS_EXPORT T2SpriteObj { public: @@ -15,3 +16,4 @@ public: int mPattern; int mLayer; }; +#endif diff --git a/src/T2DLL/T2StairModule.cpp b/src/T2DLL/T2StairModule.cpp index e172798..fecc568 100644 --- a/src/T2DLL/T2StairModule.cpp +++ b/src/T2DLL/T2StairModule.cpp @@ -1,10 +1,11 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2FloorInfo.h" #include "T2People.h" #include "T2PeopleLinkIterator.h" #include "T2StairModule.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" T2StairModule::T2StairModule() { SetRectEmpty(&mModuleRect); diff --git a/src/T2DLL/T2StairModule.h b/src/T2DLL/T2StairModule.h index 342e4de..e4be26c 100644 --- a/src/T2DLL/T2StairModule.h +++ b/src/T2DLL/T2StairModule.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2STAIRMODULE_H +#define T2DLL_T2STAIRMODULE_H +#include "../common.h" #include "T2MoverModule.h" enum { @@ -25,3 +26,4 @@ protected: CRect mModuleRect; }; +#endif diff --git a/src/T2DLL/T2StairModuleList.cpp b/src/T2DLL/T2StairModuleList.cpp index 278b088..914f887 100644 --- a/src/T2DLL/T2StairModuleList.cpp +++ b/src/T2DLL/T2StairModuleList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2StairModule.h" #include "T2StairModuleList.h" diff --git a/src/T2DLL/T2StairModuleList.h b/src/T2DLL/T2StairModuleList.h index 2edb38d..ceaf8e0 100644 --- a/src/T2DLL/T2StairModuleList.h +++ b/src/T2DLL/T2StairModuleList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2STAIRMODULELIST_H +#define T2DLL_T2STAIRMODULELIST_H +#include "../common.h" #include "T2MoverModuleList.h" class AFX_CLASS_EXPORT T2StairModuleList : public T2MoverModuleList { @@ -20,3 +21,4 @@ protected: private: int GetIndex(int position, ERequestUpDown upDown) const; }; +#endif diff --git a/src/T2DLL/T2StewardDialog.cpp b/src/T2DLL/T2StewardDialog.cpp index bda8675..de13f83 100644 --- a/src/T2DLL/T2StewardDialog.cpp +++ b/src/T2DLL/T2StewardDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2DlgItemAnimation.h" #include "T2StewardDialog.h" diff --git a/src/T2DLL/T2StewardDialog.h b/src/T2DLL/T2StewardDialog.h index 0e4c730..2367091 100644 --- a/src/T2DLL/T2StewardDialog.h +++ b/src/T2DLL/T2StewardDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2STEWARDDIALOG_H +#define T2DLL_T2STEWARDDIALOG_H +#include "../common.h" #include "T2Dialog.h" class AFX_CLASS_EXPORT T2StewardDialog : public T2Dialog { @@ -9,3 +10,4 @@ public: static void MessageBox(const char* inText, const char* inTitle); static int MessageBoxYN(const char* inText, const char* inTitle); }; +#endif diff --git a/src/T2DLL/T2StopInfoArray.cpp b/src/T2DLL/T2StopInfoArray.cpp index b56424f..e814c21 100644 --- a/src/T2DLL/T2StopInfoArray.cpp +++ b/src/T2DLL/T2StopInfoArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2StopInfoArray.h" diff --git a/src/T2DLL/T2StopInfoArray.h b/src/T2DLL/T2StopInfoArray.h index 904de8a..9cc36ed 100644 --- a/src/T2DLL/T2StopInfoArray.h +++ b/src/T2DLL/T2StopInfoArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2STOPINFOARRAY_H +#define T2DLL_T2STOPINFOARRAY_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2StopInfoArray : private LArray { @@ -23,3 +24,4 @@ public: static T2StopInfoArray* ReadStopInfoArray(T2Archive& archive); static void WriteStopInfoArray(T2StopInfoArray* array, T2Archive& archive); }; +#endif diff --git a/src/T2DLL/T2SubPlugin.cpp b/src/T2DLL/T2SubPlugin.cpp index 4d265a7..a51c649 100644 --- a/src/T2DLL/T2SubPlugin.cpp +++ b/src/T2DLL/T2SubPlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2BitImage.h" #include "T2ImageObj.h" diff --git a/src/T2DLL/T2SubPlugin.h b/src/T2DLL/T2SubPlugin.h index 4f89ccb..2080386 100644 --- a/src/T2DLL/T2SubPlugin.h +++ b/src/T2DLL/T2SubPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2SUBPLUGIN_H +#define T2DLL_T2SUBPLUGIN_H +#include "../common.h" #include "CResourcePlugin.h" class AFX_CLASS_EXPORT T2SubPlugin : public CResourcePlugin { @@ -37,3 +38,4 @@ protected: T2BitImage *mImage; T2ImageObj *mImageObj; }; +#endif diff --git a/src/T2DLL/T2TempPluginComparator.cpp b/src/T2DLL/T2TempPluginComparator.cpp index 09da5fa..e4ff99a 100644 --- a/src/T2DLL/T2TempPluginComparator.cpp +++ b/src/T2DLL/T2TempPluginComparator.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2TemplatePlugin.h" #include "T2TempPluginComparator.h" diff --git a/src/T2DLL/T2TempPluginComparator.h b/src/T2DLL/T2TempPluginComparator.h index 1b19345..ec54913 100644 --- a/src/T2DLL/T2TempPluginComparator.h +++ b/src/T2DLL/T2TempPluginComparator.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TEMPPLUGINCOMPARATOR_H +#define T2DLL_T2TEMPPLUGINCOMPARATOR_H +#include "../common.h" #include "LComparator.h" class AFX_CLASS_EXPORT T2TempPluginComparator : public LComparator { @@ -12,3 +13,4 @@ public: protected: static T2TempPluginComparator* sT2TempPluginComparator; }; +#endif diff --git a/src/T2DLL/T2TemplatePlugin.cpp b/src/T2DLL/T2TemplatePlugin.cpp index b446eeb..01cad88 100644 --- a/src/T2DLL/T2TemplatePlugin.cpp +++ b/src/T2DLL/T2TemplatePlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2TemplatePlugin.h" T2TemplatePlugin::T2TemplatePlugin(DWORD type, T2PluginSpecifier& specifier, CResFile* resFile, CProgramPlugin* plugin) diff --git a/src/T2DLL/T2TemplatePlugin.h b/src/T2DLL/T2TemplatePlugin.h index df39975..3c92af5 100644 --- a/src/T2DLL/T2TemplatePlugin.h +++ b/src/T2DLL/T2TemplatePlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TEMPLATEPLUGIN_H +#define T2DLL_T2TEMPLATEPLUGIN_H +#include "../common.h" #include "CDefRsrcPlugin.h" class AFX_CLASS_EXPORT T2TemplatePlugin : public CDefRsrcPlugin { @@ -15,3 +16,4 @@ public: protected: CProgramPlugin *mPlugin; }; +#endif diff --git a/src/T2DLL/T2TemplatePluginDB.cpp b/src/T2DLL/T2TemplatePluginDB.cpp index f981d37..15b8fd6 100644 --- a/src/T2DLL/T2TemplatePluginDB.cpp +++ b/src/T2DLL/T2TemplatePluginDB.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2TemplatePlugin.h" #include "T2TemplatePluginDB.h" #include "T2TemplatePluginList.h" diff --git a/src/T2DLL/T2TemplatePluginDB.h b/src/T2DLL/T2TemplatePluginDB.h index 7a2ee45..71073df 100644 --- a/src/T2DLL/T2TemplatePluginDB.h +++ b/src/T2DLL/T2TemplatePluginDB.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TEMPLATEPLUGINDB_H +#define T2DLL_T2TEMPLATEPLUGINDB_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2TemplatePluginDB : private LArray { @@ -11,3 +12,4 @@ public: T2TemplatePluginList* GetTemplatePluginList(DWORD pluginType); T2TenantDef* FindFloor(); }; +#endif diff --git a/src/T2DLL/T2TemplatePluginList.cpp b/src/T2DLL/T2TemplatePluginList.cpp index d67a81c..ce5ed66 100644 --- a/src/T2DLL/T2TemplatePluginList.cpp +++ b/src/T2DLL/T2TemplatePluginList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2MoverDef.h" #include "T2OuterObjDef.h" #include "T2PeopleDef.h" diff --git a/src/T2DLL/T2TemplatePluginList.h b/src/T2DLL/T2TemplatePluginList.h index 0e1673a..45c1f22 100644 --- a/src/T2DLL/T2TemplatePluginList.h +++ b/src/T2DLL/T2TemplatePluginList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TEMPLATEPLUGINLIST_H +#define T2DLL_T2TEMPLATEPLUGINLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2TemplatePluginList : public LArray { @@ -30,3 +31,4 @@ protected: friend class T2ToolWindow; DWORD mPluginType; }; +#endif diff --git a/src/T2DLL/T2Tenant.cpp b/src/T2DLL/T2Tenant.cpp index dadaf21..c9567c8 100644 --- a/src/T2DLL/T2Tenant.cpp +++ b/src/T2DLL/T2Tenant.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "T2Archive.h" #include "T2BitImage.h" @@ -25,9 +26,9 @@ #include "T2TenantCEArray.h" #include "T2TenantMemberDef.h" #include "T2TenantMemberTableDef.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" -#include "T2TowerMainView.h" +#include "../T2TowerMainView.h" #include "T2Transport.h" #include "T2TrafficInfo.h" #include "T2WorldDef.h" diff --git a/src/T2DLL/T2Tenant.h b/src/T2DLL/T2Tenant.h index 6b374fc..1336aa1 100644 --- a/src/T2DLL/T2Tenant.h +++ b/src/T2DLL/T2Tenant.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TENANT_H +#define T2DLL_T2TENANT_H +#include "../common.h" #include "T2Equip.h" #include "T2TenantDef.h" @@ -343,3 +344,4 @@ inline void T2Tenant::CancelReserve() { if (mReserveCount > 0) mReserveCount--; } +#endif diff --git a/src/T2DLL/T2TenantArray.cpp b/src/T2DLL/T2TenantArray.cpp index b2a5823..bd970e1 100644 --- a/src/T2DLL/T2TenantArray.cpp +++ b/src/T2DLL/T2TenantArray.cpp @@ -1,8 +1,9 @@ +#include "StdAfx.h" #include "CProgramPlugin.h" #include "T2Tenant.h" #include "T2TenantArray.h" #include "T2TenantDef.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" T2TenantArray::T2TenantArray(unsigned int startID) : T2ObjectArray(startID) diff --git a/src/T2DLL/T2TenantArray.h b/src/T2DLL/T2TenantArray.h index a62d045..1ce91c1 100644 --- a/src/T2DLL/T2TenantArray.h +++ b/src/T2DLL/T2TenantArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TENANTARRAY_H +#define T2DLL_T2TENANTARRAY_H +#include "../common.h" #include "T2ObjectArray.h" class AFX_CLASS_EXPORT T2TenantArray : public T2ObjectArray { @@ -27,3 +28,4 @@ protected: T2Tenant *mTenants; }; +#endif diff --git a/src/T2DLL/T2TenantArrayList.cpp b/src/T2DLL/T2TenantArrayList.cpp index f6cb81d..115047f 100644 --- a/src/T2DLL/T2TenantArrayList.cpp +++ b/src/T2DLL/T2TenantArrayList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2Tenant.h" #include "T2TenantArray.h" diff --git a/src/T2DLL/T2TenantArrayList.h b/src/T2DLL/T2TenantArrayList.h index 213f3bc..27e37f5 100644 --- a/src/T2DLL/T2TenantArrayList.h +++ b/src/T2DLL/T2TenantArrayList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TENANTARRAYLIST_H +#define T2DLL_T2TENANTARRAYLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2TenantArrayList : public LArray { @@ -25,3 +26,4 @@ public: protected: int mCounter; }; +#endif diff --git a/src/T2DLL/T2TenantCEArray.cpp b/src/T2DLL/T2TenantCEArray.cpp index 3a67dc2..2e61716 100644 --- a/src/T2DLL/T2TenantCEArray.cpp +++ b/src/T2DLL/T2TenantCEArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2TenantCEArray.h" T2TenantCEArray::T2TenantCEArray() { diff --git a/src/T2DLL/T2TenantCEArray.h b/src/T2DLL/T2TenantCEArray.h index 1e112cc..c94f72e 100644 --- a/src/T2DLL/T2TenantCEArray.h +++ b/src/T2DLL/T2TenantCEArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TENANTCEARRAY_H +#define T2DLL_T2TENANTCEARRAY_H +#include "../common.h" #include "T2CrossEquipArray.h" class AFX_CLASS_EXPORT T2TenantCEArray : public T2CrossEquipArray { @@ -11,3 +12,4 @@ public: virtual DWORD GetCEClassID() { return 'TCEA'; } }; +#endif diff --git a/src/T2DLL/T2TenantDef.cpp b/src/T2DLL/T2TenantDef.cpp index e05e982..a82632c 100644 --- a/src/T2DLL/T2TenantDef.cpp +++ b/src/T2DLL/T2TenantDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2BitImage.h" #include "T2FloorInfo.h" @@ -9,8 +10,8 @@ #include "T2TenantDef.h" #include "T2TenantMemberTableDef.h" #include "T2TenantPlugin.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "T2TowerMessage.h" #include "T2WorldDef.h" #include "UT2Coordinate.h" diff --git a/src/T2DLL/T2TenantDef.h b/src/T2DLL/T2TenantDef.h index 81ff79d..9d39b08 100644 --- a/src/T2DLL/T2TenantDef.h +++ b/src/T2DLL/T2TenantDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TENANTDEF_H +#define T2DLL_T2TENANTDEF_H +#include "../common.h" #include "T2EquipDef.h" class AFX_CLASS_EXPORT T2TenantDef : public T2EquipDef { @@ -75,3 +76,4 @@ public: protected: float CalcNumOfCustomerUnit(); }; +#endif diff --git a/src/T2DLL/T2TenantInfoDialog.cpp b/src/T2DLL/T2TenantInfoDialog.cpp index f4ed236..1d4c040 100644 --- a/src/T2DLL/T2TenantInfoDialog.cpp +++ b/src/T2DLL/T2TenantInfoDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2Tenant.h" #include "T2TenantInfoDialog.h" diff --git a/src/T2DLL/T2TenantInfoDialog.h b/src/T2DLL/T2TenantInfoDialog.h index 1e0c77f..acace7c 100644 --- a/src/T2DLL/T2TenantInfoDialog.h +++ b/src/T2DLL/T2TenantInfoDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TENANTINFODIALOG_H +#define T2DLL_T2TENANTINFODIALOG_H +#include "../common.h" #include "T2EquipInfoDialog.h" class AFX_CLASS_EXPORT T2TenantInfoDialog : public T2EquipInfoDialog { @@ -10,3 +11,4 @@ public: T2Tenant* GetTenant() const { return (T2Tenant *) mObject; } T2TenantDef* GetTenantDef() const { return (T2TenantDef *) mEquipDef; } }; +#endif diff --git a/src/T2DLL/T2TenantMemberDef.cpp b/src/T2DLL/T2TenantMemberDef.cpp index f06f530..341aa23 100644 --- a/src/T2DLL/T2TenantMemberDef.cpp +++ b/src/T2DLL/T2TenantMemberDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2TenantMemberDef.h" diff --git a/src/T2DLL/T2TenantMemberDef.h b/src/T2DLL/T2TenantMemberDef.h index 02d0936..47e0633 100644 --- a/src/T2DLL/T2TenantMemberDef.h +++ b/src/T2DLL/T2TenantMemberDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TENANTMEMBERDEF_H +#define T2DLL_T2TENANTMEMBERDEF_H +#include "../common.h" class AFX_CLASS_EXPORT T2TenantMemberDef { public: @@ -73,3 +74,4 @@ inline unsigned int T2TenantMemberDef::GetPercent() const { inline void T2TenantMemberDef::SetPercent(unsigned int v) { mPercent = v; } +#endif diff --git a/src/T2DLL/T2TenantMemberTableDef.cpp b/src/T2DLL/T2TenantMemberTableDef.cpp index 9ca80f4..b29e5c3 100644 --- a/src/T2DLL/T2TenantMemberTableDef.cpp +++ b/src/T2DLL/T2TenantMemberTableDef.cpp @@ -1,10 +1,11 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2DateTime.h" #include "T2DayParamDef.h" #include "T2PlaceParamDef.h" #include "T2TenantMemberDef.h" #include "T2TenantMemberTableDef.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "UT2Utils.h" T2TenantMemberTableDef::T2TenantMemberTableDef(HINSTANCE instance, CResFile* resFile, float f) { diff --git a/src/T2DLL/T2TenantMemberTableDef.h b/src/T2DLL/T2TenantMemberTableDef.h index 90edb2c..22870dc 100644 --- a/src/T2DLL/T2TenantMemberTableDef.h +++ b/src/T2DLL/T2TenantMemberTableDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TENANTMEMBERTABLEDEF_H +#define T2DLL_T2TENANTMEMBERTABLEDEF_H +#include "../common.h" #include "T2PlaceParamDef.h" class AFX_CLASS_EXPORT T2TenantMemberTableDef { @@ -45,3 +46,4 @@ inline int T2TenantMemberTableDef::GetNumOfElem() const { inline unsigned int T2TenantMemberTableDef::GetSpecialFlag() const { return mSpecialFlag; } +#endif diff --git a/src/T2DLL/T2TenantPlugin.cpp b/src/T2DLL/T2TenantPlugin.cpp index e5c8082..6464333 100644 --- a/src/T2DLL/T2TenantPlugin.cpp +++ b/src/T2DLL/T2TenantPlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2TenantPlugin.h" diff --git a/src/T2DLL/T2TenantPlugin.h b/src/T2DLL/T2TenantPlugin.h index 3c7a3d7..b229a5f 100644 --- a/src/T2DLL/T2TenantPlugin.h +++ b/src/T2DLL/T2TenantPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TENANTPLUGIN_H +#define T2DLL_T2TENANTPLUGIN_H +#include "../common.h" #include "T2EquipPlugin.h" class AFX_CLASS_EXPORT T2TenantPlugin : public T2EquipPlugin { @@ -13,3 +14,4 @@ public: private: void LoadT2TenantDef(T2WorldDef*); }; +#endif diff --git a/src/T2DLL/T2Terrorist.cpp b/src/T2DLL/T2Terrorist.cpp index b42e389..2a9cfe4 100644 --- a/src/T2DLL/T2Terrorist.cpp +++ b/src/T2DLL/T2Terrorist.cpp @@ -1,8 +1,9 @@ +#include "StdAfx.h" #include "CResFile.h" #include "GlobalFunc.h" #include "LArray.h" -#include "T2.h" -#include "T2CtrlPalette.h" +#include "../T2.h" +#include "../T2CtrlPalette.h" #include "T2DateTime.h" #include "T2Dialog.h" #include "T2DlgItem.h" @@ -13,7 +14,7 @@ #include "T2FireBurning.h" #include "T2FloorInfo.h" #include "T2FloorPtrList.h" -#include "T2MainWindow.h" +#include "../T2MainWindow.h" #include "T2People.h" #include "T2RegistedTenantDB.h" #include "T2RouteNavigator.h" @@ -22,8 +23,8 @@ #include "T2Tenant.h" #include "T2Terrorist.h" #include "T2ToolWindow.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "T2WorldDef.h" #include "URect.h" #include "UT2Coordinate.h" diff --git a/src/T2DLL/T2Terrorist.h b/src/T2DLL/T2Terrorist.h index 2ea4032..9697c49 100644 --- a/src/T2DLL/T2Terrorist.h +++ b/src/T2DLL/T2Terrorist.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TERRORIST_H +#define T2DLL_T2TERRORIST_H +#include "../common.h" #include "T2EventItem.h" enum { @@ -35,3 +36,4 @@ protected: LArray *mSearcherL; LArray *mSearcherR; }; +#endif diff --git a/src/T2DLL/T2ToolCallback.h b/src/T2DLL/T2ToolCallback.h index 60b2515..2472215 100644 --- a/src/T2DLL/T2ToolCallback.h +++ b/src/T2DLL/T2ToolCallback.h @@ -1,7 +1,9 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TOOLCALLBACK_H +#define T2DLL_T2TOOLCALLBACK_H +#include "../common.h" class AFX_CLASS_EXPORT T2ToolCallback { public: virtual void toolCallback_vf00(int unkParam1, T2ToolIconItem *inItem) = 0; }; +#endif diff --git a/src/T2DLL/T2ToolDef.cpp b/src/T2DLL/T2ToolDef.cpp index 6ea6fa1..3f5e234 100644 --- a/src/T2DLL/T2ToolDef.cpp +++ b/src/T2DLL/T2ToolDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CFilePluginList.h" #include "CResFile.h" #include "CResourcePlugin.h" diff --git a/src/T2DLL/T2ToolDef.h b/src/T2DLL/T2ToolDef.h index d819b5c..636f374 100644 --- a/src/T2DLL/T2ToolDef.h +++ b/src/T2DLL/T2ToolDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TOOLDEF_H +#define T2DLL_T2TOOLDEF_H +#include "../common.h" #include "T2TemplatePlugin.h" enum { @@ -138,3 +139,4 @@ public: T2DateTime *mToolQuietUntil; T2DateTime *mCategoryQuietUntil; }; +#endif diff --git a/src/T2DLL/T2ToolDefDB.cpp b/src/T2DLL/T2ToolDefDB.cpp index 0f12394..34d086b 100644 --- a/src/T2DLL/T2ToolDefDB.cpp +++ b/src/T2DLL/T2ToolDefDB.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2ToolDef.h" #include "T2ToolDefDB.h" #include "T2ToolDefList.h" diff --git a/src/T2DLL/T2ToolDefDB.h b/src/T2DLL/T2ToolDefDB.h index cdc408e..2d8fecf 100644 --- a/src/T2DLL/T2ToolDefDB.h +++ b/src/T2DLL/T2ToolDefDB.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TOOLDEFDB_H +#define T2DLL_T2TOOLDEFDB_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2ToolDefDB : public LArray { @@ -12,3 +13,4 @@ public: T2ToolDefList* GetToolDefList(int inCategory); T2TenantDef* FindFloor(); }; +#endif diff --git a/src/T2DLL/T2ToolDefList.cpp b/src/T2DLL/T2ToolDefList.cpp index cf359ce..952273f 100644 --- a/src/T2DLL/T2ToolDefList.cpp +++ b/src/T2DLL/T2ToolDefList.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2TempPluginComparator.h" #include "T2TenantDef.h" #include "T2ToolDef.h" diff --git a/src/T2DLL/T2ToolDefList.h b/src/T2DLL/T2ToolDefList.h index 92b4425..1df9e5a 100644 --- a/src/T2DLL/T2ToolDefList.h +++ b/src/T2DLL/T2ToolDefList.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TOOLDEFLIST_H +#define T2DLL_T2TOOLDEFLIST_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2ToolDefList : public LArray { @@ -26,3 +27,4 @@ protected: int mCurrentItem; int mCurrentVariant; }; +#endif diff --git a/src/T2DLL/T2ToolHelpWnd.cpp b/src/T2DLL/T2ToolHelpWnd.cpp index c730a2a..60990bd 100644 --- a/src/T2DLL/T2ToolHelpWnd.cpp +++ b/src/T2DLL/T2ToolHelpWnd.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2ToolDef.h" #include "T2ToolHelpWnd.h" diff --git a/src/T2DLL/T2ToolHelpWnd.h b/src/T2DLL/T2ToolHelpWnd.h index b8266fd..e653ba2 100644 --- a/src/T2DLL/T2ToolHelpWnd.h +++ b/src/T2DLL/T2ToolHelpWnd.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TOOLHELPWND_H +#define T2DLL_T2TOOLHELPWND_H +#include "../common.h" enum { kToolHelpMode0 = 0, @@ -29,3 +30,4 @@ protected: CString mText; CString mComment; }; +#endif diff --git a/src/T2DLL/T2ToolPlugin.cpp b/src/T2DLL/T2ToolPlugin.cpp index db3d4e8..6cfe092 100644 --- a/src/T2DLL/T2ToolPlugin.cpp +++ b/src/T2DLL/T2ToolPlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2ToolPlugin.h" T2ToolPlugin::T2ToolPlugin(DWORD type, T2PluginSpecifier& specifier) diff --git a/src/T2DLL/T2ToolPlugin.h b/src/T2DLL/T2ToolPlugin.h index 3b0a3a0..1e55002 100644 --- a/src/T2DLL/T2ToolPlugin.h +++ b/src/T2DLL/T2ToolPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TOOLPLUGIN_H +#define T2DLL_T2TOOLPLUGIN_H +#include "../common.h" #include "CProgramPlugin.h" class AFX_CLASS_EXPORT T2ToolPlugin : public CProgramPlugin { @@ -7,3 +8,4 @@ public: T2ToolPlugin(DWORD type, T2PluginSpecifier& specifier); virtual ~T2ToolPlugin(); }; +#endif diff --git a/src/T2DLL/T2ToolWindow.cpp b/src/T2DLL/T2ToolWindow.cpp index 7e65ac6..575d3fa 100644 --- a/src/T2DLL/T2ToolWindow.cpp +++ b/src/T2DLL/T2ToolWindow.cpp @@ -1,11 +1,12 @@ -#include "T2.h" +#include "StdAfx.h" +#include "../T2.h" #include "T2DLL.h" #include "T2ImageObj.h" -#include "T2MainWindow.h" +#include "../T2MainWindow.h" #include "T2TemplatePluginList.h" #include "T2ToolDef.h" #include "T2ToolWindow.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #ifdef _DEBUG diff --git a/src/T2DLL/T2ToolWindow.h b/src/T2DLL/T2ToolWindow.h index 368bad3..85fb09d 100644 --- a/src/T2DLL/T2ToolWindow.h +++ b/src/T2DLL/T2ToolWindow.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TOOLWINDOW_H +#define T2DLL_T2TOOLWINDOW_H +#include "../common.h" class T2ToolIconItem; @@ -113,3 +114,4 @@ public: T2ToolIconList(); virtual ~T2ToolIconList(); }; +#endif diff --git a/src/T2DLL/T2TowerEvent.cpp b/src/T2DLL/T2TowerEvent.cpp index 11287d6..b2b8c9f 100644 --- a/src/T2DLL/T2TowerEvent.cpp +++ b/src/T2DLL/T2TowerEvent.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CProgramPlugin.h" #include "CResFile.h" #include "T2Archive.h" @@ -12,7 +13,7 @@ #include "T2Tenant.h" #include "T2TenantDef.h" #include "T2Terrorist.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" #include "T2TowerVision.h" #include "T2VisitVIP.h" diff --git a/src/T2DLL/T2TowerEvent.h b/src/T2DLL/T2TowerEvent.h index d69d128..80b7e1a 100644 --- a/src/T2DLL/T2TowerEvent.h +++ b/src/T2DLL/T2TowerEvent.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TOWEREVENT_H +#define T2DLL_T2TOWEREVENT_H +#include "../common.h" #include "LArray.h" class AFX_CLASS_EXPORT T2TowerEvent { @@ -48,3 +49,4 @@ public: T2Equip *mLatestBuild; int _90; }; +#endif diff --git a/src/T2DLL/T2TowerMessage.cpp b/src/T2DLL/T2TowerMessage.cpp index 3beea1d..33d5980 100644 --- a/src/T2DLL/T2TowerMessage.cpp +++ b/src/T2DLL/T2TowerMessage.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "GlobalFunc.h" #include "LArray.h" #include "T2Balloon.h" @@ -8,8 +9,8 @@ #include "T2People.h" #include "T2SoundPlayer.h" #include "T2StewardDialog.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "T2TowerMessage.h" #include "UT2Coordinate.h" diff --git a/src/T2DLL/T2TowerMessage.h b/src/T2DLL/T2TowerMessage.h index 300963d..44432f6 100644 --- a/src/T2DLL/T2TowerMessage.h +++ b/src/T2DLL/T2TowerMessage.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TOWERMESSAGE_H +#define T2DLL_T2TOWERMESSAGE_H +#include "../common.h" #include "LAttachment.h" class InfoBarMsgItem; @@ -57,3 +58,4 @@ public: unsigned int mEndTicks; CString mSoundID; }; +#endif diff --git a/src/T2DLL/T2TowerVision.cpp b/src/T2DLL/T2TowerVision.cpp index 5601487..ddaf56a 100644 --- a/src/T2DLL/T2TowerVision.cpp +++ b/src/T2DLL/T2TowerVision.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2OutObj.h" #include "T2TowerEvent.h" #include "T2TowerVision.h" diff --git a/src/T2DLL/T2TowerVision.h b/src/T2DLL/T2TowerVision.h index 3af5e4b..013443d 100644 --- a/src/T2DLL/T2TowerVision.h +++ b/src/T2DLL/T2TowerVision.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TOWERVISION_H +#define T2DLL_T2TOWERVISION_H +#include "../common.h" #include "T2EventItem.h" class AFX_CLASS_EXPORT T2TowerVision : public T2EventItem { @@ -16,3 +17,4 @@ protected: int _34; int _38; }; +#endif diff --git a/src/T2DLL/T2TrafficInfo.cpp b/src/T2DLL/T2TrafficInfo.cpp index 2079015..366d5cd 100644 --- a/src/T2DLL/T2TrafficInfo.cpp +++ b/src/T2DLL/T2TrafficInfo.cpp @@ -1,7 +1,8 @@ +#include "StdAfx.h" #include "T2Archive.h" #include "T2FloorInfo.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" +#include "../T2TowerDoc.h" +#include "../T2TowerMainView.h" #include "T2TrafficInfo.h" #include "URect.h" diff --git a/src/T2DLL/T2TrafficInfo.h b/src/T2DLL/T2TrafficInfo.h index 2e83f31..9dd6023 100644 --- a/src/T2DLL/T2TrafficInfo.h +++ b/src/T2DLL/T2TrafficInfo.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TRAFFICINFO_H +#define T2DLL_T2TRAFFICINFO_H +#include "../common.h" struct T2TrafficUnit { int x0; @@ -32,3 +33,4 @@ protected: unsigned int mWidth; T2TrafficUnit *mUnitData; }; +#endif diff --git a/src/T2DLL/T2Transport.cpp b/src/T2DLL/T2Transport.cpp index 67adf7a..65e958d 100644 --- a/src/T2DLL/T2Transport.cpp +++ b/src/T2DLL/T2Transport.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "LArray.h" #include "T2Archive.h" @@ -5,7 +6,7 @@ #include "T2People.h" #include "T2PeopleArrayList.h" #include "T2Pool.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2Transport.h" #include "T2WorldDef.h" diff --git a/src/T2DLL/T2Transport.h b/src/T2DLL/T2Transport.h index 6ba96d5..28e3359 100644 --- a/src/T2DLL/T2Transport.h +++ b/src/T2DLL/T2Transport.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TRANSPORT_H +#define T2DLL_T2TRANSPORT_H +#include "../common.h" class AFX_CLASS_EXPORT T2Transport { public: @@ -54,3 +55,4 @@ protected: CLink *mFirstLink; CLink *mLastLink; }; +#endif diff --git a/src/T2DLL/T2TreasureDialog.cpp b/src/T2DLL/T2TreasureDialog.cpp index 74bee65..90112ff 100644 --- a/src/T2DLL/T2TreasureDialog.cpp +++ b/src/T2DLL/T2TreasureDialog.cpp @@ -1,6 +1,7 @@ +#include "StdAfx.h" #include "CTokenizer.h" #include "T2PluginSpecifier.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TreasureDialog.h" #include "T2TreasurePane.h" diff --git a/src/T2DLL/T2TreasureDialog.h b/src/T2DLL/T2TreasureDialog.h index d7f7dbe..6fa95c2 100644 --- a/src/T2DLL/T2TreasureDialog.h +++ b/src/T2DLL/T2TreasureDialog.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TREASUREDIALOG_H +#define T2DLL_T2TREASUREDIALOG_H +#include "../common.h" #include "T2Dialog.h" class AFX_CLASS_EXPORT T2TreasureDialog : public T2Dialog { @@ -20,3 +21,4 @@ protected: T2DlgItem *mTextPane; char mText[256]; }; +#endif diff --git a/src/T2DLL/T2TreasurePane.cpp b/src/T2DLL/T2TreasurePane.cpp index 85057c2..485bc54 100644 --- a/src/T2DLL/T2TreasurePane.cpp +++ b/src/T2DLL/T2TreasurePane.cpp @@ -1,6 +1,7 @@ +#include "StdAfx.h" #include "T2BitImage.h" #include "T2PluginSpecifier.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TreasurePane.h" T2TreasurePane::T2TreasurePane(T2TowerDoc* inDoc, T2ImageObj* inImageObj, CPalette* inPalette) diff --git a/src/T2DLL/T2TreasurePane.h b/src/T2DLL/T2TreasurePane.h index 1916e97..7cdbd12 100644 --- a/src/T2DLL/T2TreasurePane.h +++ b/src/T2DLL/T2TreasurePane.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2TREASUREPANE_H +#define T2DLL_T2TREASUREPANE_H +#include "../common.h" #include "T2DlgItem.h" class AFX_CLASS_EXPORT T2TreasurePane : public T2DlgItem { @@ -18,3 +19,4 @@ protected: int mCurrentImage; DWORD mLastChangeAt; }; +#endif diff --git a/src/T2DLL/T2UnitInfo.cpp b/src/T2DLL/T2UnitInfo.cpp index 4b137e8..2781c50 100644 --- a/src/T2DLL/T2UnitInfo.cpp +++ b/src/T2DLL/T2UnitInfo.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2Archive.h" #include "T2UnitInfo.h" diff --git a/src/T2DLL/T2UnitInfo.h b/src/T2DLL/T2UnitInfo.h index df3549b..55c629b 100644 --- a/src/T2DLL/T2UnitInfo.h +++ b/src/T2DLL/T2UnitInfo.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2UNITINFO_H +#define T2DLL_T2UNITINFO_H +#include "../common.h" class AFX_CLASS_EXPORT T2UnitInfo { public: @@ -22,3 +23,4 @@ protected: unsigned int mVarA; unsigned int mVarB; }; +#endif diff --git a/src/T2DLL/T2VerticalTable.cpp b/src/T2DLL/T2VerticalTable.cpp index bf42d6b..7647ece 100644 --- a/src/T2DLL/T2VerticalTable.cpp +++ b/src/T2DLL/T2VerticalTable.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2VerticalTable.h" T2VerticalTable::T2VerticalTable(T2TowerDoc* towerDoc, T2ImageObj* imageObj, CPalette* palette) diff --git a/src/T2DLL/T2VerticalTable.h b/src/T2DLL/T2VerticalTable.h index ac8cccc..1ea0d43 100644 --- a/src/T2DLL/T2VerticalTable.h +++ b/src/T2DLL/T2VerticalTable.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2VERTICALTABLE_H +#define T2DLL_T2VERTICALTABLE_H +#include "../common.h" #include "T2DlgItemImageTable.h" class AFX_CLASS_EXPORT T2VerticalTable : public T2DlgItemImageTable { @@ -10,3 +11,4 @@ protected: virtual BOOL OnT2DlgItemEraseBkgnd(CDC*); BOOL mClearBackground; }; +#endif diff --git a/src/T2DLL/T2VisitVIP.cpp b/src/T2DLL/T2VisitVIP.cpp index fdda3e1..e82ccaa 100644 --- a/src/T2DLL/T2VisitVIP.cpp +++ b/src/T2DLL/T2VisitVIP.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CFilePlugin.h" #include "CFilePluginList.h" #include "CProgramPlugin.h" @@ -18,7 +19,7 @@ #include "T2RegistedTenantDB.h" #include "T2SoundPlayer.h" #include "T2Tenant.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" #include "T2TowerMessage.h" #include "T2WorldDef.h" diff --git a/src/T2DLL/T2VisitVIP.h b/src/T2DLL/T2VisitVIP.h index 5faae54..c732a66 100644 --- a/src/T2DLL/T2VisitVIP.h +++ b/src/T2DLL/T2VisitVIP.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2VISITVIP_H +#define T2DLL_T2VISITVIP_H +#include "../common.h" #include "T2EventItem.h" enum { @@ -46,3 +47,4 @@ protected: int mBeginDay; BOOL mCheckedIn; }; +#endif diff --git a/src/T2DLL/T2WeatherFilter.cpp b/src/T2DLL/T2WeatherFilter.cpp index fe56bba..db2b9b5 100644 --- a/src/T2DLL/T2WeatherFilter.cpp +++ b/src/T2DLL/T2WeatherFilter.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2WeatherFilter.h" T2WeatherFilter::T2WeatherFilter() { diff --git a/src/T2DLL/T2WeatherFilter.h b/src/T2DLL/T2WeatherFilter.h index bcf8596..0a188b3 100644 --- a/src/T2DLL/T2WeatherFilter.h +++ b/src/T2DLL/T2WeatherFilter.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2WEATHERFILTER_H +#define T2DLL_T2WEATHERFILTER_H +#include "../common.h" enum WeatherCode { WeatherCode_0, @@ -35,3 +36,4 @@ protected: DWORD mLastChange; DWORD mTimeSinceLastChange; }; +#endif diff --git a/src/T2DLL/T2WordDef.cpp b/src/T2DLL/T2WordDef.cpp index 3b92484..87d2015 100644 --- a/src/T2DLL/T2WordDef.cpp +++ b/src/T2DLL/T2WordDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2WordDef.h" diff --git a/src/T2DLL/T2WordDef.h b/src/T2DLL/T2WordDef.h index 6dc69b0..8613c7b 100644 --- a/src/T2DLL/T2WordDef.h +++ b/src/T2DLL/T2WordDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2WORDDEF_H +#define T2DLL_T2WORDDEF_H +#include "../common.h" class AFX_CLASS_EXPORT T2WordDef { public: @@ -15,3 +16,4 @@ protected: unsigned int mLevel; char mStr[32]; }; +#endif diff --git a/src/T2DLL/T2WordDefArray.cpp b/src/T2DLL/T2WordDefArray.cpp index 46f05d2..cd7e882 100644 --- a/src/T2DLL/T2WordDefArray.cpp +++ b/src/T2DLL/T2WordDefArray.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2WordDef.h" #include "T2WordDefArray.h" diff --git a/src/T2DLL/T2WordDefArray.h b/src/T2DLL/T2WordDefArray.h index 415c0d0..49e88fa 100644 --- a/src/T2DLL/T2WordDefArray.h +++ b/src/T2DLL/T2WordDefArray.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2WORDDEFARRAY_H +#define T2DLL_T2WORDDEFARRAY_H +#include "../common.h" class AFX_CLASS_EXPORT T2WordDefArray { public: @@ -10,3 +11,4 @@ public: protected: HINSTANCE mInstance; }; +#endif diff --git a/src/T2DLL/T2WorldDef.cpp b/src/T2DLL/T2WorldDef.cpp index 63358f3..0840358 100644 --- a/src/T2DLL/T2WorldDef.cpp +++ b/src/T2DLL/T2WorldDef.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "CResFile.h" #include "GlobalFunc.h" #include "T2Archive.h" @@ -9,7 +10,7 @@ #include "T2FloorInfo.h" #include "T2ImageObj.h" #include "T2Message.h" -#include "T2MWControl.h" +#include "../T2MWControl.h" #include "T2PaletteAnime.h" #include "T2PaletteAnimeDef.h" #include "T2Pool.h" @@ -17,9 +18,9 @@ #include "T2SeasonParamDef.h" #include "T2Tenant.h" #include "T2TenantDef.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2TowerEvent.h" -#include "T2TowerMainView.h" +#include "../T2TowerMainView.h" #include "T2WordDefArray.h" #include "T2WorldDef.h" #include "T2WorldPlugin.h" diff --git a/src/T2DLL/T2WorldDef.h b/src/T2DLL/T2WorldDef.h index d23bd97..8352cf3 100644 --- a/src/T2DLL/T2WorldDef.h +++ b/src/T2DLL/T2WorldDef.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2WORLDDEF_H +#define T2DLL_T2WORLDDEF_H +#include "../common.h" #include "T2PaletteAnimeDef.h" #include "T2TemplatePlugin.h" @@ -228,3 +229,4 @@ protected: inline /*virtual*/ int T2WorldDef::ExchangeMoney(int v) const { return (mMoneyNumerator == 1 && mMoneyDenominator == 1) ? v : ((v / mMoneyDenominator) * mMoneyNumerator); } +#endif diff --git a/src/T2DLL/T2WorldPlugin.cpp b/src/T2DLL/T2WorldPlugin.cpp index fc55a9c..f8d77b0 100644 --- a/src/T2DLL/T2WorldPlugin.cpp +++ b/src/T2DLL/T2WorldPlugin.cpp @@ -1,7 +1,8 @@ +#include "StdAfx.h" #include "CResFile.h" #include "T2FloorInfo.h" #include "T2Pool.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #include "T2WorldPlugin.h" #include "T2XEvent.h" diff --git a/src/T2DLL/T2WorldPlugin.h b/src/T2DLL/T2WorldPlugin.h index 1db1bea..74a7a43 100644 --- a/src/T2DLL/T2WorldPlugin.h +++ b/src/T2DLL/T2WorldPlugin.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2WORLDPLUGIN_H +#define T2DLL_T2WORLDPLUGIN_H +#include "../common.h" #include "CProgramPlugin.h" class AFX_CLASS_EXPORT T2WorldPlugin : public CProgramPlugin { @@ -37,3 +38,4 @@ protected: int mNumOfClockStyle; int m70; }; +#endif diff --git a/src/T2DLL/T2XEvent.cpp b/src/T2DLL/T2XEvent.cpp index a8624a8..8728ebc 100644 --- a/src/T2DLL/T2XEvent.cpp +++ b/src/T2DLL/T2XEvent.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2DlgItem.h" #include "T2WorldDef.h" #include "T2WorldPlugin.h" diff --git a/src/T2DLL/T2XEvent.h b/src/T2DLL/T2XEvent.h index b61a545..fde152d 100644 --- a/src/T2DLL/T2XEvent.h +++ b/src/T2DLL/T2XEvent.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_T2XEVENT_H +#define T2DLL_T2XEVENT_H +#include "../common.h" #include "LArray.h" #include "T2EventItem.h" @@ -35,3 +36,4 @@ protected: int mDlgItem4; CString mDlgText; }; +#endif diff --git a/src/T2DLL/TenantSearchDlg.cpp b/src/T2DLL/TenantSearchDlg.cpp index d2ec1bc..6e1e55a 100644 --- a/src/T2DLL/TenantSearchDlg.cpp +++ b/src/T2DLL/TenantSearchDlg.cpp @@ -1,10 +1,11 @@ +#include "StdAfx.h" #include "T2DlgItemListBox.h" #include "T2FloorInfo.h" #include "T2Name.h" #include "T2NameList.h" #include "T2Tenant.h" #include "T2TenantArrayList.h" -#include "T2TowerDoc.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #include "TenantSearchDlg.h" #include "UT2Utils.h" diff --git a/src/T2DLL/TenantSearchDlg.h b/src/T2DLL/TenantSearchDlg.h index 93be296..e545f1a 100644 --- a/src/T2DLL/TenantSearchDlg.h +++ b/src/T2DLL/TenantSearchDlg.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_TENANTSEARCHDLG_H +#define T2DLL_TENANTSEARCHDLG_H +#include "../common.h" #include "T2Dialog.h" class TenantSearchDlg : public T2Dialog { @@ -15,3 +16,4 @@ protected: T2TowerDoc *mDocument; }; +#endif diff --git a/src/T2DLL/UPoint.cpp b/src/T2DLL/UPoint.cpp index 79aeea5..0f4d3d3 100644 --- a/src/T2DLL/UPoint.cpp +++ b/src/T2DLL/UPoint.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "UPoint.h" /*static*/ void UPoint::MappingInRect(Point& ioPt, const RECT& inRect) { diff --git a/src/T2DLL/UPoint.h b/src/T2DLL/UPoint.h index 544b257..866d446 100644 --- a/src/T2DLL/UPoint.h +++ b/src/T2DLL/UPoint.h @@ -1,8 +1,10 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_UPOINT_H +#define T2DLL_UPOINT_H +#include "../common.h" class AFX_CLASS_EXPORT UPoint { public: static void MappingInRect(Point& ioPt, const RECT& inRect); static void MappingInRect(POINT& ioPt, const RECT& inRect); }; +#endif diff --git a/src/T2DLL/URect.cpp b/src/T2DLL/URect.cpp index 0bf07c6..e2cd64f 100644 --- a/src/T2DLL/URect.cpp +++ b/src/T2DLL/URect.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "URect.h" /*static*/ void URect::SetEmpty(RECT& outRect) { diff --git a/src/T2DLL/URect.h b/src/T2DLL/URect.h index 7badbd4..4b71ed9 100644 --- a/src/T2DLL/URect.h +++ b/src/T2DLL/URect.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_URECT_H +#define T2DLL_URECT_H +#include "../common.h" class AFX_CLASS_EXPORT URect : public CRect { public: @@ -10,3 +11,4 @@ public: static void Union(const RECT& inRect1, const RECT& inRect2, RECT& outRect); static POINT Center(const RECT& inRect); }; +#endif diff --git a/src/T2DLL/UT2BkgndInfo.cpp b/src/T2DLL/UT2BkgndInfo.cpp index 14e62aa..74f7e03 100644 --- a/src/T2DLL/UT2BkgndInfo.cpp +++ b/src/T2DLL/UT2BkgndInfo.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "UT2BkgndInfo.h" /*static*/ BkgndInfo* UT2BkgndInfo::SetupBkgndInfo(const RECT& rect, int z) { diff --git a/src/T2DLL/UT2BkgndInfo.h b/src/T2DLL/UT2BkgndInfo.h index ec23fb9..397504b 100644 --- a/src/T2DLL/UT2BkgndInfo.h +++ b/src/T2DLL/UT2BkgndInfo.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_UT2BKGNDINFO_H +#define T2DLL_UT2BKGNDINFO_H +#include "../common.h" struct BkgndInfo { int vRange; @@ -18,3 +19,4 @@ public: static void GetOffBkgndRect(int, RECT&); static void ReplaceID(const BkgndInfo*, unsigned int, int); }; +#endif diff --git a/src/T2DLL/UT2Coordinate.cpp b/src/T2DLL/UT2Coordinate.cpp index caecdb1..d681bee 100644 --- a/src/T2DLL/UT2Coordinate.cpp +++ b/src/T2DLL/UT2Coordinate.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "UT2Coordinate.h" /*static*/ void UT2Coordinate::UnitToQD(int& ioV, int& ioH, int inZoomLevel) { diff --git a/src/T2DLL/UT2Coordinate.h b/src/T2DLL/UT2Coordinate.h index b2d319d..419c4ef 100644 --- a/src/T2DLL/UT2Coordinate.h +++ b/src/T2DLL/UT2Coordinate.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_UT2COORDINATE_H +#define T2DLL_UT2COORDINATE_H +#include "../common.h" class AFX_CLASS_EXPORT UT2Coordinate { public: @@ -47,3 +48,4 @@ public: } static int RectWidth(const RECT& inRect) { return inRect.right - inRect.left; } }; +#endif diff --git a/src/T2DLL/UT2Utils.cpp b/src/T2DLL/UT2Utils.cpp index 3af844f..6349c97 100644 --- a/src/T2DLL/UT2Utils.cpp +++ b/src/T2DLL/UT2Utils.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "UT2Utils.h" /*static*/ unsigned int UT2Utils::Float2Int(float inValue) { diff --git a/src/T2DLL/UT2Utils.h b/src/T2DLL/UT2Utils.h index 32e1cfa..ac58541 100644 --- a/src/T2DLL/UT2Utils.h +++ b/src/T2DLL/UT2Utils.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_UT2UTILS_H +#define T2DLL_UT2UTILS_H +#include "../common.h" class AFX_CLASS_EXPORT UT2Utils { public: @@ -12,3 +13,4 @@ public: return (inRange == 0) ? 0 : (rand() % inRange); } }; +#endif diff --git a/src/T2DLL/WalkerDlg.cpp b/src/T2DLL/WalkerDlg.cpp index 4c2c842..85c6d53 100644 --- a/src/T2DLL/WalkerDlg.cpp +++ b/src/T2DLL/WalkerDlg.cpp @@ -1,9 +1,10 @@ -#include "T2.h" -#include "T2CtrlPalette.h" +#include "StdAfx.h" +#include "../T2.h" +#include "../T2CtrlPalette.h" #include "T2DlgItem.h" -#include "T2MainWindow.h" -#include "T2MWControl.h" -#include "T2TowerDoc.h" +#include "../T2MainWindow.h" +#include "../T2MWControl.h" +#include "../T2TowerDoc.h" #include "T2WorldDef.h" #include "WalkerDlg.h" diff --git a/src/T2DLL/WalkerDlg.h b/src/T2DLL/WalkerDlg.h index 9b04fc1..d1e9435 100644 --- a/src/T2DLL/WalkerDlg.h +++ b/src/T2DLL/WalkerDlg.h @@ -1,5 +1,6 @@ -#pragma once -#include "common.h" +#ifndef T2DLL_WALKERDLG_H +#define T2DLL_WALKERDLG_H +#include "../common.h" #include "T2Dialog.h" class WalkerDlg : public T2Dialog { @@ -17,3 +18,4 @@ protected: T2TowerDoc *mDocument; int mFC; }; +#endif diff --git a/src/T2DLL/Wave.cpp b/src/T2DLL/Wave.cpp index d3ed274..f10bbc3 100644 --- a/src/T2DLL/Wave.cpp +++ b/src/T2DLL/Wave.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" //----------------------------------------------------------------- // Wave Object // C++ Source - Wave.cpp @@ -6,7 +7,7 @@ //----------------------------------------------------------------- // Inclusions //----------------------------------------------------------------- -#include "common.h" +#include "../common.h" #include "GlobalFunc.h" //----------------------------------------------------------------- #include "Wave.h" diff --git a/src/T2DLL/Wave.h b/src/T2DLL/Wave.h index 0acfcd3..163068d 100644 --- a/src/T2DLL/Wave.h +++ b/src/T2DLL/Wave.h @@ -9,7 +9,7 @@ //----------------------------------------------------------------- // Inclusions //----------------------------------------------------------------- -#include "common.h" +#include "../common.h" #include <MMSystem.h> //----------------------------------------------------------------- diff --git a/src/T2FilePreview.cpp b/src/T2FilePreview.cpp index 95db5e3..c0801d0 100644 --- a/src/T2FilePreview.cpp +++ b/src/T2FilePreview.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #define ATOI_KLUDGE #include "T2FilePreview.h" #include <io.h> @@ -18,7 +19,9 @@ T2FilePreview::T2FilePreview() { } BEGIN_MESSAGE_MAP(T2FilePreview, CWnd) + //{{AFX_MSG_MAP(T2FilePreview) ON_WM_PAINT() + //}}AFX_MSG_MAP END_MESSAGE_MAP() void T2FilePreview::SetFile(const char *path) { diff --git a/src/T2FilePreview.h b/src/T2FilePreview.h index dce5513..c225974 100644 --- a/src/T2FilePreview.h +++ b/src/T2FilePreview.h @@ -2,17 +2,21 @@ #include "common.h" class T2FilePreview : public CWnd { - DECLARE_MESSAGE_MAP() - public: T2FilePreview(); ~T2FilePreview(); void SetFile(const char *path); -protected: - void OnPaint(); + //{{AFX_VIRTUAL(T2FilePreview) + //}}AFX_VIRTUAL +protected: CString mStr40; CString mStr44; + + //{{AFX_MSG(T2FilePreview) + afx_msg void OnPaint(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2GraphWindow.cpp b/src/T2GraphWindow.cpp index b1a8d14..2fbfc57 100644 --- a/src/T2GraphWindow.cpp +++ b/src/T2GraphWindow.cpp @@ -1,8 +1,9 @@ -#include "GlobalFunc.h" +#include "StdAfx.h" +#include "T2DLL/GlobalFunc.h" #include "T2GraphWindow.h" #include "T2HUnknown.h" #include "T2TowerDoc.h" -#include "T2WorldDef.h" +#include "T2DLL/T2WorldDef.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -21,10 +22,12 @@ T2GraphWindow::~T2GraphWindow() { } BEGIN_MESSAGE_MAP(T2GraphWindow, CFrameWnd) + //{{AFX_MSG_MAP(T2GraphWindow) ON_WM_ERASEBKGND() ON_WM_HSCROLL() ON_WM_SIZE() ON_WM_QUERYNEWPALETTE() + //}}AFX_MSG_MAP END_MESSAGE_MAP() BOOL T2GraphWindow::OnEraseBkgnd(CDC *pDC) { diff --git a/src/T2GraphWindow.h b/src/T2GraphWindow.h index 4286e73..a3051dd 100644 --- a/src/T2GraphWindow.h +++ b/src/T2GraphWindow.h @@ -2,19 +2,25 @@ #include "common.h" class T2GraphWindow : public CFrameWnd { +protected: + T2GraphWindow(); DECLARE_DYNCREATE(T2GraphWindow) - DECLARE_MESSAGE_MAP() public: - T2GraphWindow(); virtual ~T2GraphWindow(); void SetDocument(T2TowerDoc *inDoc); -protected: - BOOL OnEraseBkgnd(CDC *pDC); - void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScrollBar); - void OnSize(UINT nType, int cx, int cy); - BOOL OnQueryNewPalette(); - T2TowerDoc *mDocument; + + //{{AFX_VIRTUAL(T2GraphWindow) + //}}AFX_VIRTUAL + +protected: + //{{AFX_MSG(T2GraphWindow) + afx_msg BOOL OnEraseBkgnd(CDC *pDC); + afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScrollBar); + afx_msg void OnSize(UINT nType, int cx, int cy); + afx_msg BOOL OnQueryNewPalette(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2HUnknown.cpp b/src/T2HUnknown.cpp index 2ca8ab6..9ae7d52 100644 --- a/src/T2HUnknown.cpp +++ b/src/T2HUnknown.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2HUnknown.h" T2HUnknown::T2HUnknown(int capacity) { diff --git a/src/T2MWControl.cpp b/src/T2MWControl.cpp index 205827e..d9cd2c1 100644 --- a/src/T2MWControl.cpp +++ b/src/T2MWControl.cpp @@ -1,6 +1,7 @@ +#include "StdAfx.h" #include "T2MWControl.h" #include "T2TowerDoc.h" -#include "T2WorldDef.h" +#include "T2DLL/T2WorldDef.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -21,11 +22,13 @@ T2MWControl::T2MWControl() { } BEGIN_MESSAGE_MAP(T2MWControl, CWnd) + //{{AFX_MSG_MAP(T2MWControl) ON_WM_ERASEBKGND() ON_WM_QUERYNEWPALETTE() ON_WM_LBUTTONDOWN() ON_WM_LBUTTONUP() ON_WM_MOUSEMOVE() + //}}AFX_MSG_MAP END_MESSAGE_MAP() /*virtual*/ void T2MWControl::Setup(T2TowerDoc *inDoc) { diff --git a/src/T2MWControl.h b/src/T2MWControl.h index 005cde5..c972795 100644 --- a/src/T2MWControl.h +++ b/src/T2MWControl.h @@ -3,24 +3,29 @@ class T2MWControl : public CWnd { DECLARE_DYNCREATE(T2MWControl) - DECLARE_MESSAGE_MAP() public: T2MWControl(); virtual ~T2MWControl(); + T2TowerDoc *mDocument; + T2WorldDef *mWorldDef; + int mData; + virtual void Setup(T2TowerDoc *inDoc); virtual void SetData(int data); // type? virtual int GetData() const; // type? + //{{AFX_VIRTUAL(T2MWControl) + //}}AFX_VIRTUAL + protected: + //{{AFX_MSG(T2MWControl afx_msg BOOL OnEraseBkgnd(CDC* pDC); afx_msg BOOL OnQueryNewPalette(); afx_msg void OnLButtonDown(UINT nFlags, CPoint point); afx_msg void OnLButtonUp(UINT nFlags, CPoint point); afx_msg void OnMouseMove(UINT nFlags, CPoint point); - - T2TowerDoc *mDocument; - T2WorldDef *mWorldDef; - int mData; + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2MainWindow.cpp b/src/T2MainWindow.cpp index 096859a..4de25d7 100644 --- a/src/T2MainWindow.cpp +++ b/src/T2MainWindow.cpp @@ -1,17 +1,19 @@ +#include "StdAfx.h" #include "DbgEventList.h" #include "DbgIPS.h" #include "DbgStepRun.h" #include "T2.h" #include "T2CtrlPalette.h" -#include "T2DLL.h" +#include "T2DLL/T2DLL.h" #include "T2MainWindow.h" #include "T2MsgWindow.h" -#include "T2SoundPlayer.h" -#include "T2ToolWindow.h" +#include "T2DLL/T2SoundPlayer.h" +#include "T2DLL/T2ToolWindow.h" #include "T2TowerDoc.h" #include "T2TowerMainView.h" -#include "T2WorldDef.h" -#include "UT2Coordinate.h" +#include "T2DLL/T2WorldDef.h" +#include "T2DLL/UT2Coordinate.h" +#include "Resource.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -23,6 +25,7 @@ static char THIS_FILE[] = __FILE__; IMPLEMENT_DYNCREATE(T2MainWindow, CFrameWnd) BEGIN_MESSAGE_MAP(T2MainWindow, CFrameWnd) + //{{AFX_MSG_MAP(T2MainWindow) ON_WM_CREATE() ON_WM_DESTROY() ON_WM_CLOSE() @@ -32,9 +35,10 @@ BEGIN_MESSAGE_MAP(T2MainWindow, CFrameWnd) ON_WM_ERASEBKGND() ON_WM_ACTIVATE() ON_WM_ACTIVATEAPP() - ON_COMMAND(0x8018, OnCmdDebugEvent) - ON_UPDATE_COMMAND_UI(0x8018, OnUpdateCmdDebugEvent) - ON_COMMAND(0x8023, OnCmdDebugMode) + ON_COMMAND(ID_DBG_EVENT, OnCmdDebugEvent) + ON_UPDATE_COMMAND_UI(ID_DBG_EVENT, OnUpdateCmdDebugEvent) + ON_COMMAND(ID_DBG_MODE, OnCmdDebugMode) + //}}AFX_MSG_MAP END_MESSAGE_MAP() T2MainWindow::T2MainWindow() { @@ -630,7 +634,7 @@ afx_msg void T2MainWindow::OnClose() { afx_msg void T2MainWindow::OnCmdDebugMode() { HMENU oldMenu = ::GetMenu(*this); - HMENU newMenu = LoadMenu(AfxGetInstanceHandle(), MAKEINTRESOURCE(130)); + HMENU newMenu = LoadMenu(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_DEBUG_MENU)); m_hMenuDefault = newMenu; ::SetMenu(*this, newMenu); DestroyMenu(oldMenu); diff --git a/src/T2MainWindow.h b/src/T2MainWindow.h index eedd250..31f28a0 100644 --- a/src/T2MainWindow.h +++ b/src/T2MainWindow.h @@ -4,13 +4,12 @@ #define T2_MAIN_WINDOW ((T2MainWindow *) AfxGetMainWnd()) class T2MainWindow : public CFrameWnd { +protected: + T2MainWindow(); DECLARE_DYNCREATE(T2MainWindow) - DECLARE_MESSAGE_MAP() public: - T2MainWindow(); virtual ~T2MainWindow(); - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); virtual void AssertValid() const; virtual void Dump(CDumpContext& dc) const; void Setup(); @@ -35,6 +34,14 @@ public: protected: void InitSound(); void DeinitSound(); + + //{{AFX_VIRTUAL(T2MainWindow) + public: + virtual BOOL PreCreateWindow(CREATESTRUCT& cs); + //}}AFX_VIRTUAL + +protected: + //{{AFX_MSG(T2MainWindow) afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); afx_msg void OnDestroy(); afx_msg void OnSize(UINT nType, int cx, int cy); @@ -47,4 +54,6 @@ protected: afx_msg void OnUpdateCmdDebugEvent(CCmdUI *pCmdUI); afx_msg void OnClose(); afx_msg void OnCmdDebugMode(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2MsgWindow.cpp b/src/T2MsgWindow.cpp index d63d054..a6f52a8 100644 --- a/src/T2MsgWindow.cpp +++ b/src/T2MsgWindow.cpp @@ -1,9 +1,10 @@ -#include "T2DlgItemAnimation.h" -#include "T2ImageObj.h" +#include "StdAfx.h" +#include "T2DLL/T2DlgItemAnimation.h" +#include "T2DLL/T2ImageObj.h" #include "T2MsgWindow.h" #include "T2MWControl.h" #include "T2TowerDoc.h" -#include "T2WorldDef.h" +#include "T2DLL/T2WorldDef.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -38,10 +39,12 @@ T2MsgWindow::T2MsgWindow() { } BEGIN_MESSAGE_MAP(T2MsgWindow, CFrameWnd) + //{{AFX_MSG_MAP(T2MsgWindow) ON_WM_QUERYNEWPALETTE() ON_WM_ERASEBKGND() ON_WM_CREATE() ON_WM_CLOSE() + //}}AFX_MSG_MAP END_MESSAGE_MAP() void T2MsgWindow::SetDocument(T2TowerDoc *inDoc) { diff --git a/src/T2MsgWindow.h b/src/T2MsgWindow.h index 0a703d6..81c60e0 100644 --- a/src/T2MsgWindow.h +++ b/src/T2MsgWindow.h @@ -3,22 +3,12 @@ class T2MsgWindow : public CFrameWnd { DECLARE_DYNCREATE(T2MsgWindow) - DECLARE_MESSAGE_MAP() public: T2MsgWindow(); virtual ~T2MsgWindow(); void SetDocument(T2TowerDoc *inDoc); - virtual BOOL PreTranslateMessage(MSG *pMsg); - -protected: - afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); - afx_msg BOOL OnQueryNewPalette(); - afx_msg BOOL OnEraseBkgnd(CDC *pDC); - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT *pResult); - afx_msg void OnClose(); -protected: CString mWndClass; T2MWControl *mClockControl; T2MWControl *mCalendarControl; @@ -30,4 +20,20 @@ protected: T2WorldDef *mWorldDef; CToolTipCtrl mToolTip; BOOL mIsSetUp; + + //{{AFX_VIRTUAL(T2MsgWindow) + public: + virtual BOOL PreTranslateMessage(MSG *pMsg); + protected: + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT *pResult); + //}}AFX_VIRTUAL + +protected: + //{{AFX_MSG(T2MsgWindow) + afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); + afx_msg BOOL OnQueryNewPalette(); + afx_msg BOOL OnEraseBkgnd(CDC *pDC); + afx_msg void OnClose(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2NewDlg.cpp b/src/T2NewDlg.cpp index c08afe1..94fab17 100644 --- a/src/T2NewDlg.cpp +++ b/src/T2NewDlg.cpp @@ -1,9 +1,10 @@ -#include "GlobalFunc.h" -#include "T2BitImage.h" +#include "StdAfx.h" +#include "T2DLL/GlobalFunc.h" +#include "T2DLL/T2BitImage.h" #include "T2NewDlg.h" #include "T2NewDlgTmp.h" -#include "T2PluginLoader.h" -#include "T2PluginSpecifier.h" +#include "T2DLL/T2PluginLoader.h" +#include "T2DLL/T2PluginSpecifier.h" #include "T2TowerDoc.h" #ifdef _DEBUG @@ -16,7 +17,7 @@ static char THIS_FILE[] = __FILE__; IMPLEMENT_DYNCREATE(T2NewDlg, CFrameWnd) T2NewDlg::T2NewDlg() { - HRSRC rsrc = FindResource(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(100), "PALETTE"); + HRSRC rsrc = FindResource(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(IDR_DEFAULT_PALETTE), "PALETTE"); HGLOBAL theHandle = LoadResource(AfxGetApp()->m_hInstance, rsrc); void *resData = LockResource(theHandle); @@ -44,7 +45,7 @@ T2NewDlg::T2NewDlg() { free(theLogPalette); - mBitmap.LoadBitmap(170); + mBitmap.LoadBitmap(IDB_PATTERN_BRUSH); mBrush.CreatePatternBrush(&mBitmap); mPlugins = NULL; @@ -71,6 +72,7 @@ T2NewDlg::T2NewDlg() { } BEGIN_MESSAGE_MAP(T2NewDlg, CFrameWnd) + //{{AFX_MSG_MAP(T2NewDlg) ON_WM_CLOSE() ON_WM_TIMER() ON_WM_CREATE() @@ -79,8 +81,9 @@ BEGIN_MESSAGE_MAP(T2NewDlg, CFrameWnd) ON_WM_KEYDOWN() ON_COMMAND(IDOK, OnCommandOK) ON_COMMAND(IDCANCEL, OnCommandCancel) - ON_COMMAND(106, OnCommand106) - ON_COMMAND(107, OnCommand107) + ON_COMMAND(ID_LEFT, OnCommand106) + ON_COMMAND(ID_RIGHT, OnCommand107) + //}}AFX_MSG_MAP END_MESSAGE_MAP() void T2NewDlg::Setup(T2TowerDoc *inDoc, T2PluginLoader *inPluginLoader, BOOL inShowCancelButton) { @@ -176,7 +179,7 @@ int T2NewDlg::OnCreate(LPCREATESTRUCT lpCreateStruct) { return -1; T2NewDlgTmp newDlgTmp(this); - newDlgTmp.Create(166); + newDlgTmp.Create(T2NewDlgTmp::IDD); CRect rect1, rect2, rect3, rect4; newDlgTmp.GetWindowRect(rect1); @@ -239,10 +242,10 @@ int T2NewDlg::OnCreate(LPCREATESTRUCT lpCreateStruct) { rect5.left = rect5.right - 18; rect5.top = rect5.bottom - 68; - mButton4.Create(NULL, BS_ICON | WS_CHILD, rect5, this, 107); + mButton4.Create(NULL, BS_ICON | WS_CHILD, rect5, this, ID_RIGHT); mButton4.SetFont(&mFont); mButton4.ShowWindow(SW_SHOW); - mButton4.SetIcon(AfxGetApp()->LoadIcon(169)); + mButton4.SetIcon(AfxGetApp()->LoadIcon(IDI_RIGHT)); if (mPluginCount <= 6) mButton4.EnableWindow(false); @@ -266,10 +269,10 @@ int T2NewDlg::OnCreate(LPCREATESTRUCT lpCreateStruct) { rect5.left = rect6.left; rect5.right = rect5.left + 18; - mButton3.Create(NULL, BS_ICON | WS_CHILD, rect5, this, 106); + mButton3.Create(NULL, BS_ICON | WS_CHILD, rect5, this, ID_LEFT); mButton3.SetFont(&mFont); mButton3.ShowWindow(SW_SHOW); - mButton3.SetIcon(AfxGetApp()->LoadIcon(168)); + mButton3.SetIcon(AfxGetApp()->LoadIcon(IDI_LEFT)); mButton3.EnableWindow(false); diff --git a/src/T2NewDlg.h b/src/T2NewDlg.h index 5412231..caef686 100644 --- a/src/T2NewDlg.h +++ b/src/T2NewDlg.h @@ -1,5 +1,6 @@ #pragma once #include "common.h" +#include "resource.h" struct PluginRecord { T2BitImage *preview; @@ -12,28 +13,22 @@ struct PluginRecord { }; class T2NewDlg : public CFrameWnd { +protected: + T2NewDlg(); DECLARE_DYNCREATE(T2NewDlg) - DECLARE_MESSAGE_MAP() public: - T2NewDlg(); virtual ~T2NewDlg(); - virtual BOOL PreTranslateMessage(MSG *pMsg); void Setup(T2TowerDoc *inDoc, T2PluginLoader *inPluginLoader, BOOL inShowCancelButton); T2PluginSpecifier *GetSelectedPlugin(); -protected: + //{{AFX_VIRTUAL(T2NewDlg) + public: + virtual BOOL PreTranslateMessage(MSG *pMsg); + protected: virtual BOOL PreCreateWindow(CREATESTRUCT &cs); + //}}AFX_VIRTUAL - afx_msg void OnClose(); - afx_msg void OnTimer(UINT nIDEvent); - afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); - afx_msg BOOL OnQueryNewPalette(); - afx_msg void OnCommandOK(); - afx_msg void OnCommandCancel(); - afx_msg void OnCommand106(); - afx_msg void OnCommand107(); - afx_msg BOOL OnEraseBkgnd(CDC *pDC); void GoLeft(); void GoRight(); void DrawWorldPreview(CDC *pDC); @@ -59,4 +54,18 @@ protected: CButton mButton2; CButton mButton3; CButton mButton4; + +protected: + //{{AFX_MSG(T2NewDlg) + afx_msg void OnClose(); + afx_msg void OnTimer(UINT nIDEvent); + afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); + afx_msg BOOL OnQueryNewPalette(); + afx_msg void OnCommandOK(); + afx_msg void OnCommandCancel(); + afx_msg void OnCommand106(); + afx_msg void OnCommand107(); + afx_msg BOOL OnEraseBkgnd(CDC *pDC); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2NewDlgTmp.cpp b/src/T2NewDlgTmp.cpp index af5b407..8088b86 100644 --- a/src/T2NewDlgTmp.cpp +++ b/src/T2NewDlgTmp.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2NewDlgTmp.h" #ifdef _DEBUG @@ -6,17 +7,23 @@ static char THIS_FILE[] = __FILE__; #endif -T2NewDlgTmp::T2NewDlgTmp(CWnd *pParentWnd) - : CDialog(166, pParentWnd) +T2NewDlgTmp::T2NewDlgTmp(CWnd *pParent) + : CDialog(IDD, pParent) { + //{{AFX_DATA_INIT(T2NewDlgTmp) + //}}AFX_DATA_INIT } /*virtual*/ void T2NewDlgTmp::DoDataExchange(CDataExchange *pDX) { CWnd::DoDataExchange(pDX); - DDX_Control(pDX, 1, mOKButton); - DDX_Control(pDX, 2, mCancelButton); - DDX_Control(pDX, 1018, mStatic); + //{{AFX_DATA_MAP(T2NewDlgTmp) + DDX_Control(pDX, IDOK, mOKButton); + DDX_Control(pDX, IDCANCEL, mCancelButton); + DDX_Control(pDX, IDC_NEW_DLG_WORLDS, mStatic); + //}}AFX_DATA_MAP } BEGIN_MESSAGE_MAP(T2NewDlgTmp, CDialog) + //{{AFX_MSG_MAP(T2NewDlgTmp) + //}}AFX_MSG_MAP END_MESSAGE_MAP() diff --git a/src/T2NewDlgTmp.h b/src/T2NewDlgTmp.h index 9c82334..b556aa0 100644 --- a/src/T2NewDlgTmp.h +++ b/src/T2NewDlgTmp.h @@ -1,16 +1,25 @@ #pragma once #include "common.h" +#include "resource.h" class T2NewDlgTmp : public CDialog { - DECLARE_MESSAGE_MAP() - public: - T2NewDlgTmp(CWnd *pParentWnd); + T2NewDlgTmp(CWnd *pParent = NULL); + //{{AFX_DATA(T2NewDlgTmp) + enum { IDD = IDD_NEW_DLG_TMP }; CButton mOKButton; CButton mCancelButton; CStatic mStatic; + //}}AFX_DATA -protected: + //{{AFX_VIRTUAL(T2NewDlgTmp) + protected: virtual void DoDataExchange(CDataExchange *pDX); + //}}AFX_VIRTUAL + +protected: + //{{AFX_MSG(T2NewDlgTmp) + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2OpenFileDialog.cpp b/src/T2OpenFileDialog.cpp index 5aa86f8..8f29591 100644 --- a/src/T2OpenFileDialog.cpp +++ b/src/T2OpenFileDialog.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "T2OpenFileDialog.h" #ifdef _DEBUG @@ -15,7 +16,9 @@ T2OpenFileDialog::T2OpenFileDialog(BOOL bOpenFileDialog, const CHAR *lpszDefExt, } BEGIN_MESSAGE_MAP(T2OpenFileDialog, CCommonDialog) + //{{AFX_MSG_MAP(T2OpenFileDialog) ON_WM_CLOSE() + //}}AFX_MSG_MAP END_MESSAGE_MAP() /*virtual*/ BOOL T2OpenFileDialog::OnInitDialog() { diff --git a/src/T2OpenFileDialog.h b/src/T2OpenFileDialog.h index 0fcca2f..713d73c 100644 --- a/src/T2OpenFileDialog.h +++ b/src/T2OpenFileDialog.h @@ -1,20 +1,26 @@ #pragma once #include "common.h" +#include "resource.h" #include "T2FilePreview.h" -#include <AFXEXT.H> class T2OpenFileDialog : public CFileDialog { - DECLARE_DYNAMIC(T2OpenFileDialog) - DECLARE_MESSAGE_MAP() - public: + DECLARE_DYNAMIC(T2OpenFileDialog) T2OpenFileDialog(BOOL bOpenFileDialog, const CHAR *lpszDefExt, const CHAR *lpszFileName, DWORD dwFlags, const CHAR *lpszFilter, CWnd *pParentWnd); + + T2FilePreview mFilePreview; + + //{{AFX_VIRTUAL(T2OpenFileDialog) + public: virtual BOOL OnInitDialog(); + protected: + virtual void OnFileNameChange(); + //}}AFX_VIRTUAL protected: - virtual void OnFileNameChange(); + //{{AFX_MSG(T2OpenFileDialog) afx_msg void OnClose(); - - T2FilePreview mFilePreview; + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2OpenSelectDlg.cpp b/src/T2OpenSelectDlg.cpp index e0e2d99..00e6162 100644 --- a/src/T2OpenSelectDlg.cpp +++ b/src/T2OpenSelectDlg.cpp @@ -1,9 +1,10 @@ +#include "StdAfx.h" #include "Bitmap.h" -#include "GlobalFunc.h" +#include "T2DLL/GlobalFunc.h" #include "T2.h" -#include "T2BitImage.h" -#include "T2DLL.h" -#include "T2ImageObj.h" +#include "T2DLL/T2BitImage.h" +#include "T2DLL/T2DLL.h" +#include "T2DLL/T2ImageObj.h" #include "T2OpenSelectDlg.h" #include "T2TowerDoc.h" @@ -41,7 +42,7 @@ void T2OpenSelectDlg::Setup() { CBitmap theBitmap; CBrush theBrush; - HRSRC resource = FindResource(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(174), "PALETTE"); + HRSRC resource = FindResource(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(ID_OPEN_SELECT_PALETTE), "PALETTE"); HGLOBAL theHandle = LoadResource(AfxGetApp()->m_hInstance, resource); void *resData = LockResource(theHandle); @@ -69,7 +70,7 @@ void T2OpenSelectDlg::Setup() { free(theLogPalette); - theBitmap.LoadBitmap(170); + theBitmap.LoadBitmap(IDB_PATTERN_BRUSH); theBrush.CreatePatternBrush(&theBitmap); } @@ -84,19 +85,19 @@ int T2OpenSelectDlg::ShowOpenSelectDialog() { T2DLGTEMPLATE tmpl; tmpl.pt = rect.CenterPoint(); tmpl.moduleHandle = instance; - tmpl.resID = 1000; + tmpl.resID = kDlgResID; T2TowerDoc *theDoc = NULL; #line 137 mImageObj = new T2ImageObj; - mImage = new T2BitImage(instance, 172, true); - mImageObj->AddObject(instance, 172, mImage); + mImage = new T2BitImage(instance, IDB_OPEN_SELECT, true); + mImageObj->AddObject(instance, IDB_OPEN_SELECT, mImage); Realize(this, &tmpl, theDoc, mImageObj, &mPalette2, true, NULL, 0, false); if (gT2App->mStrE0 != "") { - PostMessage(WM_COMMAND, 103); + PostMessage(WM_COMMAND, kCmdLoadFromPath); } else { ShowWindow(SW_SHOW); SetActiveWindow(); @@ -113,18 +114,18 @@ int T2OpenSelectDlg::ShowOpenSelectDialog() { WORD code = HIWORD(inWParam); WORD id = LOWORD(inWParam); - if (id == 101 && code == 0) { + if (id == kCmdNew && code == 0) { ShowWindow(SW_HIDE); mTowerDoc->LoadsWorldPlugin(); DoClose(id); - } else if (id == 102 && code == 0) { + } else if (id == kCmdOpen && code == 0) { ShowWindow(SW_HIDE); T2_APP->OnCmdOpen(); DoClose(id); - } else if (id == 100 && code == 0) { + } else if (id == kCmdExit && code == 0) { PostQuitMessage(0); DoClose(id); - } else if (id == 103 && code == 0) { + } else if (id == kCmdLoadFromPath && code == 0) { GetCurrentT2TowerDoc()->SetPathName(gT2App->mStrE0); GetCurrentT2TowerDoc()->OnOpenDocument(gT2App->mStrE0); gT2App->mStrE0 = ""; diff --git a/src/T2OpenSelectDlg.h b/src/T2OpenSelectDlg.h index e65486a..5c676ea 100644 --- a/src/T2OpenSelectDlg.h +++ b/src/T2OpenSelectDlg.h @@ -1,6 +1,7 @@ #pragma once #include "common.h" -#include "T2Dialog.h" +#include "resource.h" +#include "T2DLL/T2Dialog.h" class Bitmap; @@ -13,6 +14,15 @@ public: int ShowOpenSelectDialog(); virtual void ListenToMessage(unsigned int msg, void *data); + enum { kDlgResID = 1000 }; + + enum { + kCmdExit = 100, + kCmdNew = 101, + kCmdOpen = 102, + kCmdLoadFromPath = 103, + }; + protected: virtual BOOL OnT2DialogCommand(WPARAM inWParam, LPARAM inLParam); virtual BOOL OnT2EraseBkgnd(CDC *pDC); diff --git a/src/T2OpenningWindow.cpp b/src/T2OpenningWindow.cpp index ee1cb40..6ed5e4e 100644 --- a/src/T2OpenningWindow.cpp +++ b/src/T2OpenningWindow.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "Bitmap.h" #include "T2.h" #include "T2OpenningWindow.h" @@ -28,9 +29,11 @@ T2OpenningWindow::T2OpenningWindow() { } BEGIN_MESSAGE_MAP(T2OpenningWindow, CFrameWnd) + //{{AFX_MSG_MAP(T2OpenningWindow) ON_WM_PAINT() ON_WM_LBUTTONDOWN() ON_WM_ERASEBKGND() + //}}AFX_MSG_MAP END_MESSAGE_MAP() void T2OpenningWindow::ShowOpenningWindow() { @@ -52,7 +55,7 @@ void T2OpenningWindow::ShowOpenningWindow() { ShowWindow(SW_SHOW); SetActiveWindow(); - PlaySound(MAKEINTRESOURCE(1), AfxGetInstanceHandle(), SND_ASYNC | SND_NOWAIT | SND_RESOURCE); + PlaySound(MAKEINTRESOURCE(ID_OPENING_SOUND), AfxGetInstanceHandle(), SND_ASYNC | SND_NOWAIT | SND_RESOURCE); T2_APP->app_vfB4(); DWORD startTick = GetTickCount(); @@ -102,7 +105,7 @@ void T2OpenningWindow::OnPaint() { CDC newDC; CBitmap bitmap; - bitmap.LoadBitmap(175); + bitmap.LoadBitmap(IDB_SPLASH_SCREEN); newDC.CreateCompatibleDC(&dc); newDC.SelectObject(&bitmap); diff --git a/src/T2OpenningWindow.h b/src/T2OpenningWindow.h index 7695cbc..8e2a7aa 100644 --- a/src/T2OpenningWindow.h +++ b/src/T2OpenningWindow.h @@ -1,25 +1,32 @@ #pragma once #include "common.h" +#include "resource.h" class Bitmap; class T2OpenningWindow : public CFrameWnd { +public: + T2OpenningWindow(); DECLARE_DYNCREATE(T2OpenningWindow) - DECLARE_MESSAGE_MAP() public: - T2OpenningWindow(); virtual ~T2OpenningWindow(); void ShowOpenningWindow(); -protected: - void OnPaint(); - void OnLButtonDown(UINT nFlags, CPoint point); - BOOL OnEraseBkgnd(CDC *pDC); - Bitmap *mBitmap; CPalette mPalette; int _CC; int _D0; CString mWndClass; + + //{{AFX_VIRTUAL(T2OpenningWindow) + //}}AFX_VIRTUAL + +protected: + //{{AFX_MSG(T2OpenningWindow) + afx_msg void OnPaint(); + afx_msg void OnLButtonDown(UINT nFlags, CPoint point); + afx_msg BOOL OnEraseBkgnd(CDC *pDC); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2PoolView.cpp b/src/T2PoolView.cpp index f02934a..0ff5429 100644 --- a/src/T2PoolView.cpp +++ b/src/T2PoolView.cpp @@ -1,8 +1,9 @@ -#include "T2PeopleDemandList.h" -#include "T2PeopleTimeZoneList.h" -#include "T2PeopleType.h" -#include "T2PeopleTypeArray.h" -#include "T2Pool.h" +#include "StdAfx.h" +#include "T2DLL/T2PeopleDemandList.h" +#include "T2DLL/T2PeopleTimeZoneList.h" +#include "T2DLL/T2PeopleType.h" +#include "T2DLL/T2PeopleTypeArray.h" +#include "T2DLL/T2Pool.h" #include "T2PoolView.h" #ifdef _DEBUG @@ -22,9 +23,11 @@ T2PoolView::~T2PoolView() { } BEGIN_MESSAGE_MAP(T2PoolView, CFrameWnd) + //{{AFX_MSG_MAP(T2PoolView) ON_WM_ERASEBKGND() ON_WM_VSCROLL() ON_WM_LBUTTONDOWN() + //}}AFX_MSG_MAP END_MESSAGE_MAP() void T2PoolView::SetPool(T2Pool *inPool) { diff --git a/src/T2PoolView.h b/src/T2PoolView.h index 7b24545..9f341bc 100644 --- a/src/T2PoolView.h +++ b/src/T2PoolView.h @@ -1,20 +1,27 @@ #pragma once #include "common.h" +#include "resource.h" class T2PoolView : public CFrameWnd { DECLARE_DYNCREATE(T2PoolView) - DECLARE_MESSAGE_MAP() public: T2PoolView(); virtual ~T2PoolView(); void SetPool(T2Pool *inPool); + T2Pool *mPool; + + //{{AFX_VIRTUAL(T2PoolView) + //}}AFX_VIRTUAL + protected: + void Draw(CDC *pDC, CPoint *inPt, T2PeopleTimeZoneList **outTimeZoneList, T2PeopleTypeArray **outPeopleTypeArray, int *outUnknown); + + //{{AFX_MSG(T2PoolView) afx_msg BOOL OnEraseBkgnd(CDC *pDC); afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar *pScrollBar); afx_msg void OnLButtonDown(UINT nFlags, CPoint point); - void Draw(CDC *pDC, CPoint *inPt, T2PeopleTimeZoneList **outTimeZoneList, T2PeopleTypeArray **outPeopleTypeArray, int *outUnknown); - - T2Pool *mPool; + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2SysInfoDlg.cpp b/src/T2SysInfoDlg.cpp index 04377a6..a9db052 100644 --- a/src/T2SysInfoDlg.cpp +++ b/src/T2SysInfoDlg.cpp @@ -1,5 +1,6 @@ -#include "T2PluginLoader.h" -#include "T2PluginSpecifier.h" +#include "StdAfx.h" +#include "T2DLL/T2PluginLoader.h" +#include "T2DLL/T2PluginSpecifier.h" #include "T2SysInfoDlg.h" #include "T2TowerDoc.h" @@ -9,20 +10,26 @@ static char THIS_FILE[] = __FILE__; #endif -T2SysInfoDlg::T2SysInfoDlg(CWnd *pParentWnd) - : CDialog(159, pParentWnd) +T2SysInfoDlg::T2SysInfoDlg(CWnd *pParent) + : CDialog(IDD, pParent) { + //{{AFX_DATA_INIT(T2SysInfoDlg) + //}}AFX_DATA_INIT } /*virtual*/ void T2SysInfoDlg::DoDataExchange(CDataExchange *pDX) { CWnd::DoDataExchange(pDX); - DDX_Control(pDX, 1009, mUsedMemory); - DDX_Control(pDX, 1008, mFreeMemory); - DDX_Control(pDX, 1007, mPluginList); + //{{AFX_DATA_MAP(T2SysInfoDlg) + DDX_Control(pDX, IDC_USED_MEMORY, mUsedMemory); + DDX_Control(pDX, IDC_FREE_MEMORY, mFreeMemory); + DDX_Control(pDX, IDC_PLUGIN_LIST, mPluginList); + //}}AFX_DATA_MAP } BEGIN_MESSAGE_MAP(T2SysInfoDlg, CDialog) - ON_NOTIFY(LVN_COLUMNCLICK, 1007, OnColumnClick) + //{{AFX_MSG_MAP(T2SysInfoDlg) + ON_NOTIFY(LVN_COLUMNCLICK, IDC_PLUGIN_LIST, OnColumnClick) + //}}AFX_MSG_MAP END_MESSAGE_MAP() void T2SysInfoDlg::SetDocument(T2TowerDoc *inDoc) { diff --git a/src/T2SysInfoDlg.h b/src/T2SysInfoDlg.h index e8d8d49..934b4e0 100644 --- a/src/T2SysInfoDlg.h +++ b/src/T2SysInfoDlg.h @@ -1,20 +1,31 @@ #pragma once #include "common.h" +#include "resource.h" class T2SysInfoDlg : public CDialog { - DECLARE_MESSAGE_MAP() - public: - T2SysInfoDlg(CWnd *pParentWnd); - void SetDocument(T2TowerDoc *inDoc); - virtual BOOL OnInitDialog(); - -protected: - virtual void DoDataExchange(CDataExchange *pDX); - afx_msg void OnColumnClick(NMHDR *pHdr, LRESULT *pResult); + T2SysInfoDlg(CWnd *pParent = NULL); + //{{AFX_DATA(T2SysInfoDlg) + enum { IDD = IDD_SYS_INFO }; CStatic mUsedMemory; CStatic mFreeMemory; CListCtrl mPluginList; T2TowerDoc *mDocument; + //}}AFX_DATA + + void SetDocument(T2TowerDoc *inDoc); + + //{{AFX_VIRTUAL(T2SysInfoDlg) + public: + virtual BOOL OnInitDialog(); + protected: + virtual void DoDataExchange(CDataExchange *pDX); + //}}AFX_VIRTUAL + +protected: + //{{AFX_MSG(T2SysInfoDlg) + afx_msg void OnColumnClick(NMHDR *pHdr, LRESULT *pResult); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; diff --git a/src/T2TowerDoc.cpp b/src/T2TowerDoc.cpp index 7fb998b..0bbb0f7 100644 --- a/src/T2TowerDoc.cpp +++ b/src/T2TowerDoc.cpp @@ -1,123 +1,127 @@ -#include "CFilePluginList.h" -#include "CObjectQueue.h" -#include "CPluginInfoArray.h" -#include "CPluginInfo.h" +#include "StdAfx.h" +#include "T2DLL/CFilePluginList.h" +#include "T2DLL/CObjectQueue.h" +#include "T2DLL/CPluginInfoArray.h" +#include "T2DLL/CPluginInfo.h" #include "DbgIPS.h" #include "DbgPeopleView.h" #include "DbgStepRun.h" -#include "GlobalFunc.h" +#include "T2DLL/GlobalFunc.h" #include "T2.h" -#include "T2AdvertisePlugin.h" -#include "T2Archive.h" -#include "T2ArrowWnd.h" -#include "T2BitImage.h" +#include "T2DLL/T2AdvertisePlugin.h" +#include "T2DLL/T2Archive.h" +#include "T2DLL/T2ArrowWnd.h" +#include "T2DLL/T2BitImage.h" #include "T2CtrlPalette.h" -#include "T2DateTime.h" -#include "T2Dialog.h" -#include "T2DlgItemAnimation.h" -#include "T2DlgItemProgress.h" -#include "T2DlgItemText.h" -#include "T2DLL.h" -#include "T2FInfoAreaIterator.h" -#include "T2FInfoPtIterator.h" -#include "T2FloorInfo.h" -#include "T2HallEventPlugin.h" +#include "T2DLL/T2DateTime.h" +#include "T2DLL/T2Dialog.h" +#include "T2DLL/T2DlgItemAnimation.h" +#include "T2DLL/T2DlgItemProgress.h" +#include "T2DLL/T2DlgItemText.h" +#include "T2DLL/T2DLL.h" +#include "T2DLL/T2FInfoAreaIterator.h" +#include "T2DLL/T2FInfoPtIterator.h" +#include "T2DLL/T2FloorInfo.h" +#include "T2DLL/T2HallEventPlugin.h" #include "T2MainWindow.h" -#include "T2Mover.h" -#include "T2MoverArray.h" -#include "T2MoverArrayList.h" -#include "T2MoverDef.h" -#include "T2MoverPlugin.h" -#include "T2MoviePlugin.h" -#include "T2MoviePluginList.h" +#include "T2DLL/T2Mover.h" +#include "T2DLL/T2MoverArray.h" +#include "T2DLL/T2MoverArrayList.h" +#include "T2DLL/T2MoverDef.h" +#include "T2DLL/T2MoverPlugin.h" +#include "T2DLL/T2MoviePlugin.h" +#include "T2DLL/T2MoviePluginList.h" #include "T2MsgWindow.h" #include "T2MWControl.h" -#include "T2Name.h" -#include "T2NameList.h" +#include "T2DLL/T2Name.h" +#include "T2DLL/T2NameList.h" #include "T2OpenSelectDlg.h" -#include "T2OptionPluginList.h" -#include "T2OuterObjDef.h" -#include "T2OuterObjList.h" -#include "T2OuterObjPlugin.h" -#include "T2OutObj.h" -#include "T2OutObjArray.h" -#include "T2OutObjArrayList.h" -#include "T2PaletteAnime.h" -#include "T2People.h" -#include "T2PeopleArray.h" -#include "T2PeopleArrayList.h" -#include "T2PeopleDef.h" -#include "T2PeopleLoader.h" -#include "T2PluginInfoTable.h" -#include "T2PluginLoader.h" -#include "T2PluginSpecifier.h" -#include "T2Pool.h" +#include "T2DLL/T2OptionPluginList.h" +#include "T2DLL/T2OuterObjDef.h" +#include "T2DLL/T2OuterObjList.h" +#include "T2DLL/T2OuterObjPlugin.h" +#include "T2DLL/T2OutObj.h" +#include "T2DLL/T2OutObjArray.h" +#include "T2DLL/T2OutObjArrayList.h" +#include "T2DLL/T2PaletteAnime.h" +#include "T2DLL/T2People.h" +#include "T2DLL/T2PeopleArray.h" +#include "T2DLL/T2PeopleArrayList.h" +#include "T2DLL/T2PeopleDef.h" +#include "T2DLL/T2PeopleLoader.h" +#include "T2DLL/T2PluginInfoTable.h" +#include "T2DLL/T2PluginLoader.h" +#include "T2DLL/T2PluginSpecifier.h" +#include "T2DLL/T2Pool.h" #include "T2PoolView.h" -#include "T2RegistedTenantDB.h" -#include "T2Request.h" -#include "T2RequestArrayList.h" -#include "T2RouteNavigator.h" -#include "T2SearchDialog.h" -#include "T2SettingDialog.h" -#include "T2Settlement.h" -#include "T2SilhouetteDef.h" -#include "T2SoundPlayer.h" -#include "T2StewardDialog.h" +#include "T2DLL/T2RegistedTenantDB.h" +#include "T2DLL/T2Request.h" +#include "T2DLL/T2RequestArrayList.h" +#include "T2DLL/T2RouteNavigator.h" +#include "T2DLL/T2SearchDialog.h" +#include "T2DLL/T2SettingDialog.h" +#include "T2DLL/T2Settlement.h" +#include "T2DLL/T2SilhouetteDef.h" +#include "T2DLL/T2SoundPlayer.h" +#include "T2DLL/T2StewardDialog.h" #include "T2SysInfoDlg.h" -#include "T2TemplatePluginDB.h" -#include "T2TemplatePluginList.h" -#include "T2Tenant.h" -#include "T2TenantArray.h" -#include "T2TenantArrayList.h" -#include "T2TenantDef.h" -#include "T2TenantPlugin.h" -#include "T2ToolWindow.h" +#include "T2DLL/T2TemplatePluginDB.h" +#include "T2DLL/T2TemplatePluginList.h" +#include "T2DLL/T2Tenant.h" +#include "T2DLL/T2TenantArray.h" +#include "T2DLL/T2TenantArrayList.h" +#include "T2DLL/T2TenantDef.h" +#include "T2DLL/T2TenantPlugin.h" +#include "T2DLL/T2ToolWindow.h" #include "T2TowerDoc.h" -#include "T2TowerEvent.h" +#include "T2DLL/T2TowerEvent.h" #include "T2TowerMainView.h" -#include "T2TowerMessage.h" -#include "T2TrafficInfo.h" -#include "T2TreasureDialog.h" -#include "T2UnitInfo.h" -#include "T2WorldDef.h" -#include "T2WorldPlugin.h" +#include "T2DLL/T2TowerMessage.h" +#include "T2DLL/T2TrafficInfo.h" +#include "T2DLL/T2TreasureDialog.h" +#include "T2DLL/T2UnitInfo.h" +#include "T2DLL/T2WorldDef.h" +#include "T2DLL/T2WorldPlugin.h" #include "T2WorldSelectDlg.h" -#include "UT2BkgndInfo.h" -#include "UT2Coordinate.h" -#include "UT2Utils.h" +#include "T2DLL/UT2BkgndInfo.h" +#include "T2DLL/UT2Coordinate.h" +#include "T2DLL/UT2Utils.h" +#include "resource.h" IMPLEMENT_DYNCREATE(T2TowerDoc, CDocument) BEGIN_MESSAGE_MAP(T2TowerDoc, CDocument) - ON_COMMAND(0x8009, OnSystemInformation) - ON_UPDATE_COMMAND_UI(0x800A, OnUpdateDebugStepRun) - ON_COMMAND(0x800A, OnDebugStepRun) - ON_UPDATE_COMMAND_UI(0x8010, OnUpdateDebugIdleSpeedMeasuring) - ON_COMMAND(0x8010, OnDebugIdleSpeedMeasuring) - ON_UPDATE_COMMAND_UI(0x8011, OnUpdateDebugAllLoadMeasuring) - ON_COMMAND(0x8011, OnDebugAllLoadMeasuring) - ON_UPDATE_COMMAND_UI(0x8012, OnUpdateDebugPool) - ON_COMMAND(0x8012, OnDebugPool) - ON_UPDATE_COMMAND_UI(0x8013, OnUpdateDebugDisplayIPS) - ON_COMMAND(0x8013, OnDebugDisplayIPS) - ON_UPDATE_COMMAND_UI(0x8014, OnUpdateDebugPeople) - ON_COMMAND(0x8014, OnDebugPeople) - ON_COMMAND(0x8015, OnDebugGradeUp) - ON_COMMAND(0x8016, OnDebugGradeDown) - ON_COMMAND(0x8019, OnPause) - ON_UPDATE_COMMAND_UI(0x8019, OnUpdatePause) - ON_COMMAND(0x801A, OnSetting) - ON_UPDATE_COMMAND_UI(0x801A, OnUpdateSetting) - ON_COMMAND(0x801B, OnHideElevatorRoom) - ON_UPDATE_COMMAND_UI(0x801B, OnUpdateHideElevatorRoom) - ON_COMMAND(0x8022, OnFavorite) - ON_UPDATE_COMMAND_UI(0x8022, OnUpdateFavorite) - ON_COMMAND(0x801F, OnHideControlWindow) - ON_UPDATE_COMMAND_UI(0x801F, OnUpdateHideControlWindow) - ON_COMMAND(0x8020, OnHideMessageWindow) - ON_UPDATE_COMMAND_UI(0x8020, OnUpdateHideMessageWindow) - ON_COMMAND(0x8021, OnHideToolWindow) - ON_UPDATE_COMMAND_UI(0x8021, OnUpdateHideToolWindow) + //{{AFX_MSG_MAP(T2TowerDoc) + ON_COMMAND(ID_SYSTEM_INFO, OnSystemInformation) + ON_UPDATE_COMMAND_UI(ID_DBG_STEP_RUN, OnUpdateDebugStepRun) + ON_COMMAND(ID_DBG_STEP_RUN, OnDebugStepRun) + ON_UPDATE_COMMAND_UI(ID_DBG_IDLE_SPEED_MEASURING, OnUpdateDebugIdleSpeedMeasuring) + ON_COMMAND(ID_DBG_IDLE_SPEED_MEASURING, OnDebugIdleSpeedMeasuring) + ON_UPDATE_COMMAND_UI(ID_DBG_ALL_LOAD_MEASURING, OnUpdateDebugAllLoadMeasuring) + ON_COMMAND(ID_DBG_ALL_LOAD_MEASURING, OnDebugAllLoadMeasuring) + ON_UPDATE_COMMAND_UI(ID_DBG_POOL, OnUpdateDebugPool) + ON_COMMAND(ID_DBG_POOL, OnDebugPool) + ON_UPDATE_COMMAND_UI(ID_DBG_DISPLAY_IPS, OnUpdateDebugDisplayIPS) + ON_COMMAND(ID_DBG_DISPLAY_IPS, OnDebugDisplayIPS) + ON_UPDATE_COMMAND_UI(ID_DBG_PEOPLE, OnUpdateDebugPeople) + ON_COMMAND(ID_DBG_PEOPLE, OnDebugPeople) + ON_COMMAND(ID_DBG_GRADE_UP, OnDebugGradeUp) + ON_COMMAND(ID_DBG_GRADE_DOWN, OnDebugGradeDown) + ON_COMMAND(ID_PAUSE, OnPause) + ON_UPDATE_COMMAND_UI(ID_PAUSE, OnUpdatePause) + ON_COMMAND(ID_SETTING, OnSetting) + ON_UPDATE_COMMAND_UI(ID_SETTING, OnUpdateSetting) + ON_COMMAND(ID_HIDE_ELEVATOR_ROOM, OnHideElevatorRoom) + ON_UPDATE_COMMAND_UI(ID_HIDE_ELEVATOR_ROOM, OnUpdateHideElevatorRoom) + ON_COMMAND(ID_FAVORITE, OnFavorite) + ON_UPDATE_COMMAND_UI(ID_FAVORITE, OnUpdateFavorite) + ON_COMMAND(ID_HIDE_CONTROL_WINDOW, OnHideControlWindow) + ON_UPDATE_COMMAND_UI(ID_HIDE_CONTROL_WINDOW, OnUpdateHideControlWindow) + ON_COMMAND(ID_HIDE_MESSAGE_WINDOW, OnHideMessageWindow) + ON_UPDATE_COMMAND_UI(ID_HIDE_MESSAGE_WINDOW, OnUpdateHideMessageWindow) + ON_COMMAND(ID_HIDE_TOOL_WINDOW, OnHideToolWindow) + ON_UPDATE_COMMAND_UI(ID_HIDE_TOOL_WINDOW, OnUpdateHideToolWindow) + //}}AFX_MSG_MAP END_MESSAGE_MAP() T2TowerDoc::T2TowerDoc() { @@ -1492,14 +1496,14 @@ int T2TowerDoc::HitTestLayer(T2BitImage *inImage, POINT inPt, HitTestResult &out } static int cursors[16] = { - 194, 184, - 187, 188, - 193, 183, - 195, 195, - 189, 190, - 185, 185, - 192, 192, - 210, 210 + IDC_DESTRUCT_B, IDC_DESTRUCT, + IDC_FINGER, IDC_FINGER_B, + IDC_INFO_B, IDC_INFO, + IDC_ZOOM, IDC_ZOOM, + IDC_HAND, IDC_HAND_B, + IDC_MIC, IDC_MIC, + IDC_SEARCH_RANGE, IDC_SEARCH_RANGE, + IDC_T2_NO, IDC_T2_NO }; /*virtual*/ void T2TowerDoc::SetCursorType(int inCursor, BOOL inIsPressed) { 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() }; diff --git a/src/T2TowerMainView.cpp b/src/T2TowerMainView.cpp index 64b2f37..18a2daa 100644 --- a/src/T2TowerMainView.cpp +++ b/src/T2TowerMainView.cpp @@ -1,28 +1,30 @@ +#include "StdAfx.h" #include "DbgEquipInfo.h" -#include "GlobalFunc.h" +#include "T2DLL/GlobalFunc.h" #include "T2.h" -#include "T2BitImage.h" -#include "T2CrossEquipArray.h" -#include "T2DLL.h" -#include "T2FInfoAreaIterator.h" -#include "T2FloorInfo.h" +#include "T2DLL/T2BitImage.h" +#include "T2DLL/T2CrossEquipArray.h" +#include "T2DLL/T2DLL.h" +#include "T2DLL/T2FInfoAreaIterator.h" +#include "T2DLL/T2FloorInfo.h" #include "T2MainWindow.h" -#include "T2Mover.h" -#include "T2MoverArray.h" -#include "T2MoverArrayList.h" -#include "T2Request.h" -#include "T2Tenant.h" -#include "T2TenantArray.h" -#include "T2TenantArrayList.h" -#include "T2ToolDef.h" -#include "T2ToolWindow.h" +#include "T2DLL/T2Mover.h" +#include "T2DLL/T2MoverArray.h" +#include "T2DLL/T2MoverArrayList.h" +#include "T2DLL/T2Request.h" +#include "T2DLL/T2Tenant.h" +#include "T2DLL/T2TenantArray.h" +#include "T2DLL/T2TenantArrayList.h" +#include "T2DLL/T2ToolDef.h" +#include "T2DLL/T2ToolWindow.h" #include "T2TowerDoc.h" #include "T2TowerMainView.h" -#include "T2WorldDef.h" -#include "URect.h" -#include "UT2BkgndInfo.h" -#include "UT2Coordinate.h" -#include "UT2Utils.h" +#include "T2DLL/T2WorldDef.h" +#include "T2DLL/URect.h" +#include "T2DLL/UT2BkgndInfo.h" +#include "T2DLL/UT2Coordinate.h" +#include "T2DLL/UT2Utils.h" +#include "resource.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -34,32 +36,34 @@ static char THIS_FILE[] = __FILE__; IMPLEMENT_DYNCREATE(T2TowerMainView, CView) BEGIN_MESSAGE_MAP(T2TowerMainView, CView) + //{{AFX_MSG_MAP(T2TowerMainView) ON_WM_CREATE() ON_WM_SIZE() - ON_COMMAND(0x8006, OnDebugNormalDisplay) - ON_UPDATE_COMMAND_UI(0x8006, OnUpdateDebugNormalDisplay) - ON_COMMAND(0x8008, OnDebugBkgndInfo) - ON_UPDATE_COMMAND_UI(0x8008, OnUpdateDebugBkgndInfo) - ON_COMMAND(0x8007, OnDebugFloorInfoTenant) - ON_UPDATE_COMMAND_UI(0x8007, OnUpdateDebugFloorInfoTenant) + ON_COMMAND(ID_DBG_NORMAL_DISPLAY, OnDebugNormalDisplay) + ON_UPDATE_COMMAND_UI(ID_DBG_NORMAL_DISPLAY, OnUpdateDebugNormalDisplay) + ON_COMMAND(ID_DBG_BKGNDINFO, OnDebugBkgndInfo) + ON_UPDATE_COMMAND_UI(ID_DBG_BKGNDINFO, OnUpdateDebugBkgndInfo) + ON_COMMAND(ID_DBG_FLOORINFO_TENANT, OnDebugFloorInfoTenant) + ON_UPDATE_COMMAND_UI(ID_DBG_FLOORINFO_TENANT, OnUpdateDebugFloorInfoTenant) ON_WM_LBUTTONDOWN() ON_WM_MOUSEMOVE() ON_WM_LBUTTONUP() - ON_UPDATE_COMMAND_UI(0x800B, OnUpdateDebugGrid) - ON_COMMAND(0x800B, OnDebugGrid) - ON_UPDATE_COMMAND_UI(0x800C, OnUpdateDebugFloorInfoMover) - ON_COMMAND(0x800C, OnDebugFloorInfoMover) + ON_UPDATE_COMMAND_UI(ID_DBG_GRID, OnUpdateDebugGrid) + ON_COMMAND(ID_DBG_GRID, OnDebugGrid) + ON_UPDATE_COMMAND_UI(ID_DBG_FLOORINFO_MOVER, OnUpdateDebugFloorInfoMover) + ON_COMMAND(ID_DBG_FLOORINFO_MOVER, OnDebugFloorInfoMover) ON_WM_RBUTTONDOWN() - ON_COMMAND(0x800E, OnDebugFloorInfoRequest) - ON_UPDATE_COMMAND_UI(0x800E, OnUpdateDebugFloorInfoRequest) - ON_UPDATE_COMMAND_UI(0x800F, OnUpdateDebugDisplaySpeedMeasuring) - ON_COMMAND(0x800F, OnDebugDisplaySpeedMeasuring) - ON_UPDATE_COMMAND_UI(0x8017, OnUpdateDebugOffscreenSpeedMeasuring) - ON_COMMAND(0x8017, OnDebugOffscreenSpeedMeasuring) + ON_COMMAND(ID_DBG_FLOORINFO_REQUEST, OnDebugFloorInfoRequest) + ON_UPDATE_COMMAND_UI(ID_DBG_FLOORINFO_REQUEST, OnUpdateDebugFloorInfoRequest) + ON_UPDATE_COMMAND_UI(ID_DBG_DISPLAY_SPEED_MEASURING, OnUpdateDebugDisplaySpeedMeasuring) + ON_COMMAND(ID_DBG_DISPLAY_SPEED_MEASURING, OnDebugDisplaySpeedMeasuring) + ON_UPDATE_COMMAND_UI(ID_DBG_OFFSCR_SPEED_MEASURING, OnUpdateDebugOffscreenSpeedMeasuring) + ON_COMMAND(ID_DBG_OFFSCR_SPEED_MEASURING, OnDebugOffscreenSpeedMeasuring) ON_WM_RBUTTONUP() ON_WM_TIMER() ON_WM_DESTROY() ON_COMMAND_RANGE(10000, 10010, OnCommand10000to10010) + //}}AFX_MSG_MAP END_MESSAGE_MAP() T2TowerMainView::T2TowerMainView() { 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() }; diff --git a/src/T2WorldSelectDlg.cpp b/src/T2WorldSelectDlg.cpp index 361aadb..935578b 100644 --- a/src/T2WorldSelectDlg.cpp +++ b/src/T2WorldSelectDlg.cpp @@ -1,10 +1,12 @@ -#include "GlobalFunc.h" -#include "T2BitImage.h" -#include "T2ImageObj.h" -#include "T2PluginLoader.h" -#include "T2PluginSpecifier.h" +#include "StdAfx.h" +#include "T2DLL/GlobalFunc.h" +#include "T2DLL/T2BitImage.h" +#include "T2DLL/T2ImageObj.h" +#include "T2DLL/T2PluginLoader.h" +#include "T2DLL/T2PluginSpecifier.h" #include "T2TowerDoc.h" #include "T2WorldSelectDlg.h" +#include "Resource.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -15,7 +17,7 @@ static char THIS_FILE[] = __FILE__; T2WorldSelectDlg::T2WorldSelectDlg() { mDeleteOnClose = true; - HRSRC rsrc = FindResource(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(100), "PALETTE"); + HRSRC rsrc = FindResource(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(IDR_DEFAULT_PALETTE), "PALETTE"); HGLOBAL theHandle = LoadResource(AfxGetApp()->m_hInstance, rsrc); void *resData = LockResource(theHandle); @@ -43,7 +45,7 @@ T2WorldSelectDlg::T2WorldSelectDlg() { free(theLogPalette); - mBitmap.LoadBitmap(170); + mBitmap.LoadBitmap(IDB_PATTERN_BRUSH); mBrush.CreatePatternBrush(&mBitmap); mPlugins = NULL; @@ -128,18 +130,18 @@ void T2WorldSelectDlg::ShowWorldSelectDlg(T2TowerDoc *inDoc, T2PluginLoader *inP T2DLGTEMPLATE tmpl; tmpl.pt = rect.CenterPoint(); tmpl.moduleHandle = instanceHandle; - tmpl.resID = 178; + tmpl.resID = kDlgResID; mDocumentAlso = NULL; #line 134 mImageObj = new T2ImageObj; - mArrowButtonImages = new T2BitImage(instanceHandle, 179, true); - mImageObj->AddObject(instanceHandle, 179, mArrowButtonImages); + mArrowButtonImages = new T2BitImage(instanceHandle, IDB_WORLD_SELECT, true); + mImageObj->AddObject(instanceHandle, IDB_WORLD_SELECT, mArrowButtonImages); Realize(this, &tmpl, mDocumentAlso, mImageObj, &mPalette, true, NULL, 0, true); - mBackButton = (CButton *) GetDescendantWindow(101); - mNextButton = (CButton *) GetDescendantWindow(102); + mBackButton = (CButton *) GetDescendantWindow(kCmdLeft); + mNextButton = (CButton *) GetDescendantWindow(kCmdRight); mBackButton->EnableWindow(false); } @@ -452,7 +454,7 @@ void T2WorldSelectDlg::GoRight() { /*virtual*/ void T2WorldSelectDlg::OnT2DlgLButtonDblClk(UINT nFlags, CPoint pt) { if (PtInRect(mRect1, pt)) { OnT2DlgLButtonDown(nFlags, pt); - OnT2DialogCommand(100, 0); + OnT2DialogCommand(kCmdOK, 0); } } @@ -674,13 +676,13 @@ void T2WorldSelectDlg::DrawWorldPreview(CDC *pDC) { WORD code = HIWORD(inWParam); WORD id = LOWORD(inWParam); - if (id == 100 && code == 0) { + if (id == kCmdOK && code == 0) { ShowWindow(SW_HIDE); mDocument->xUnkNameSelectWorld(GetSelectedPlugin()); DestroyWindow(); - } else if (id == 101 && code == 0) { + } else if (id == kCmdLeft && code == 0) { GoLeft(); - } else if (id == 102 && code == 0) { + } else if (id == kCmdRight && code == 0) { GoRight(); } else { result = T2Dialog::OnCommand(inWParam, inLParam); diff --git a/src/T2WorldSelectDlg.h b/src/T2WorldSelectDlg.h index df75a94..039fcf2 100644 --- a/src/T2WorldSelectDlg.h +++ b/src/T2WorldSelectDlg.h @@ -1,6 +1,7 @@ #pragma once #include "common.h" -#include "T2Dialog.h" +#include "T2DLL/T2Dialog.h" +#include "resource.h" struct PluginRecord { T2BitImage *preview; @@ -19,6 +20,14 @@ public: void ShowWorldSelectDlg(T2TowerDoc *inDoc, T2PluginLoader *inPluginLoader, BOOL inShowCancelButton); T2PluginSpecifier *GetSelectedPlugin(); + enum { kDlgResID = ID_WORLD_SELECT_T2DLG }; + + enum { + kCmdOK = 100, + kCmdLeft = 101, + kCmdRight = 102 + }; + protected: virtual BOOL PreCreateWindow(CREATESTRUCT &cs); virtual BOOL OnT2PreEraseBkgnd(CDC *pDC); diff --git a/src/common.h b/src/common.h index 958f0bb..88f98b8 100644 --- a/src/common.h +++ b/src/common.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef T2_COMMON_H +#define T2_COMMON_H #define VC_EXTRALEAN #include <AFX.H> @@ -401,3 +402,4 @@ inline int MSVC_STDCALL my_atoi(const char *s) { #define atoi my_atoi #endif +#endif diff --git a/src/resource.h b/src/resource.h new file mode 100644 index 0000000..1fc0ec2 --- /dev/null +++ b/src/resource.h @@ -0,0 +1,119 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by T2.rc +// +#define IDI_ICON1 1 +#define ID_OPENING_SOUND 1 +#define IDI_ICON2 2 +#define IDI_ICON3 3 +#define IDD_ABOUTBOX 100 +#define IDR_DEFAULT_PALETTE 100 +#define ID_LEFT 106 +#define ID_RIGHT 107 +#define IDR_MAINFRAME 128 +#define IDR_T2TYPE 129 +#define IDR_DEBUG_MENU 130 +#define IDD_ROUTING_TABLE 140 +#define IDD_WORLD_PLUGINS 151 +#define IDD_DBG_STEP_RUN 158 +#define IDD_SYS_INFO 159 +#define IDD_DBG_EQUIP_INFO 160 +#define IDD_NEW_DLG_TMP 166 +#define IDI_LEFT 168 +#define IDI_RIGHT 169 +#define IDB_PATTERN_BRUSH 170 +#define IDD_DBG_IPS 171 +#define IDB_OPEN_SELECT 172 +#define ID_OPEN_SELECT_PALETTE 174 +#define IDB_SPLASH_SCREEN 175 +#define ID_WORLD_SELECT_T2DLG 178 +#define IDB_WORLD_SELECT 179 +#define IDD_DBG_EVENT_LIST 182 +#define IDC_INFO 183 +#define IDC_DESTRUCT 184 +#define IDC_MIC 185 + +#define IDC_FINGER 187 +#define IDC_FINGER_B 188 +#define IDC_HAND 189 +#define IDC_HAND_B 190 +#define IDB_SETTINGS 189 + +#define IDC_SEARCH_RANGE 192 +#define IDC_INFO_B 193 +#define IDC_DESTRUCT_B 194 +#define IDC_ZOOM 195 +#define IDC_T2_NO 210 + +#define IDB_LOGO 223 +#define IDB_CREDITS 224 +#define IDD_256CHECK 227 +#define IDD_SERIAL 228 +#define IDB_COPYRIGHT 229 +#define IDC_WORLD_PLUGIN_LIST 1000 +#define IDC_SERIAL_1 1000 +#define IDC_SERIAL_2 1001 +#define IDC_SERIAL_3 1002 +#define IDC_SERIAL_4 1003 +#define IDC_DBG_STEP 1006 +#define IDC_PLUGIN_LIST 1007 +#define IDC_FREE_MEMORY 1008 +#define IDC_USED_MEMORY 1009 +#define IDC_CROSS_EQUIP_LIST 1010 +#define IDC_EQUIP_NAME 1011 +#define IDC_EQUIP_ID 1012 +#define IDC_DEBUG_INFO_LIST 1013 +#define IDC_DEBUG_INFO 1014 +#define IDC_TOOLPALETTE_PLUGIN_LIST 1015 +#define IDC_ROUTING_TABLE_EDIT 1016 +#define IDC_NEW_DLG_WORLDS 1018 +#define IDC_IPS 1019 +#define IDC_EVENT_LIST 1020 +#define IDC_EVENT_START 1021 +#define IDC_SERIAL_NUMBER 1024 +#define IDC_CREDITS 1025 +#define IDC_LOGO 1026 +#define IDC_SERIAL_LABEL 1027 +#define IDC_DEFAULT_CHECK 1028 +#define IDB_ERROR 32767 +#define ID_ZOOM_100_PERCENT 0x8003 +#define ID_ZOOM_50_PERCENT 0x8004 +#define ID_ZOOM_25_PERCENT 0x8005 +#define ID_DBG_NORMAL_DISPLAY 0x8006 +#define ID_DBG_FLOORINFO_TENANT 0x8007 +#define ID_DBG_BKGNDINFO 0x8008 +#define ID_SYSTEM_INFO 0x8009 +#define ID_DBG_STEP_RUN 0x800A +#define ID_DBG_GRID 0x800B +#define ID_DBG_FLOORINFO_MOVER 0x800C +#define ID_DBG_CROSS_EQUIP 0x800D +#define ID_DBG_FLOORINFO_REQUEST 0x800E +#define ID_DBG_DISPLAY_SPEED_MEASURING 0x800F +#define ID_DBG_IDLE_SPEED_MEASURING 0x8010 +#define ID_DBG_ALL_LOAD_MEASURING 0x8011 +#define ID_DBG_POOL 0x8012 +#define ID_DBG_DISPLAY_IPS 0x8013 +#define ID_DBG_PEOPLE 0x8014 +#define ID_DBG_GRADE_UP 0x8015 +#define ID_DBG_GRADE_DOWN 0x8016 +#define ID_DBG_OFFSCR_SPEED_MEASURING 0x8017 +#define ID_DBG_EVENT 0x8018 +#define ID_PAUSE 0x8019 +#define ID_SETTING 0x801A +#define ID_HIDE_ELEVATOR_ROOM 0x801B +#define ID_HIDE_CONTROL_WINDOW 0x801F +#define ID_HIDE_MESSAGE_WINDOW 0x8020 +#define ID_HIDE_TOOL_WINDOW 0x8021 +#define ID_FAVORITE 0x8022 +#define ID_DBG_MODE 0x8023 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif |