i am in hell

1 files changed, 48 insertions, 60 deletions

diff --git a/src/T2DLL/T2Dialog.cpp b/src/T2DLL/T2Dialog.cpp
index f990466..d240f07 100644
--- a/src/T2DLL/T2Dialog.cpp
+++ b/src/T2DLL/T2Dialog.cpp
@@ -1,44 +1,32 @@
-#include "CToggleButtonDisabled.h"
-#include "CTokenizer.h"
 #include "T2AdvertiseTable.h"
 #include "T2Dialog.h"
-#include "T2DlgItem.h"
 #include "T2DlgItemAnimation.h"
 #include "T2DlgItemArrows.h"
-#include "T2DlgItemBelongGage.h"
-#include "T2DlgItemBox.h"
-#include "T2DlgItemCANCEL.h"
-#include "T2DlgItemCheck.h"
-#include "T2DlgItemCustomerGage.h"
 #include "T2DlgItemEdit.h"
-#include "T2DlgItemHScr.h"
 #include "T2DlgItemIButton.h"
 #include "T2DlgItemICheck.h"
 #include "T2DlgItemIRepeater.h"
-#include "T2DlgItemImage.h"
 #include "T2DlgItemListBox.h"
 #include "T2DlgItemMerchandiseField.h"
 #include "T2DlgItemMovie.h"
-#include "T2DlgItemOK.h"
-#include "T2DlgItemPPLEvalGage.h"
 #include "T2DlgItemPeopleView.h"
 #include "T2DlgItemPopup.h"
-#include "T2DlgItemProfitsGage.h"
 #include "T2DlgItemProgress.h"
 #include "T2DlgItemRadioButton.h"
 #include "T2DlgItemRadioText.h"
 #include "T2DlgItemSTimeTbl.h"
-#include "T2DlgItemStressGage.h"
-#include "T2DlgItemTButton.h"
-#include "T2DlgItemTable.h"
-#include "T2DlgItemText.h"
-#include "T2DlgItemVScr.h"
-#include "T2MovieTable.h"
 #include "T2PluginInfoTable.h"
 #include "T2TowerDoc.h"
 #include "T2WorldDef.h"
 
-IMPLEMENT_DYNAMIC(T2Dialog, CWnd)
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+#line 19
+IMPLEMENT_DYNCREATE(T2Dialog, CWnd)
 
 T2Dialog::T2Dialog() {
 	mInModalLoop = false;
@@ -243,7 +231,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         if (i == 10) {
             mFontNums[mFontCount] = fontNum;
 #line 228
-            mFonts[mFontCount] = DEBUG_NEW CFont;
+            mFonts[mFontCount] = new CFont;
 
             CString str;
             if (mFontName[0] == '!') {
@@ -271,7 +259,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.left = inTokenizer.NextInteger();
         rect.top = inTokenizer.NextInteger();
 #line 263
-        T2DlgItemOK *item = DEBUG_NEW T2DlgItemOK(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemOK *item = new T2DlgItemOK(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, 1);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -281,7 +269,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.left = inTokenizer.NextInteger();
         rect.top = inTokenizer.NextInteger();
 #line 274
-        T2DlgItemCANCEL *item = DEBUG_NEW T2DlgItemCANCEL(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemCANCEL *item = new T2DlgItemCANCEL(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, 2);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -295,7 +283,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 289
-        T2DlgItemTButton *item = DEBUG_NEW T2DlgItemTButton(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemTButton *item = new T2DlgItemTButton(mTowerDoc, mImageObj, mPalette);
         item->Create(text, inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -309,7 +297,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 304
-        T2DlgItemIButton *item = DEBUG_NEW T2DlgItemIButton(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemIButton *item = new T2DlgItemIButton(mTowerDoc, mImageObj, mPalette);
         item->Create(text, inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -320,19 +308,19 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.left = inTokenizer.NextInteger();
         rect.top = inTokenizer.NextInteger();
 #line 316
-        T2DlgItemCheck *item = DEBUG_NEW T2DlgItemCheck(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemCheck *item = new T2DlgItemCheck(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
             item->SetFont(*mFonts[mCurrentFont]);
-    } else if (!_stricmp(token, "IBUTTON")) {
+    } else if (!_stricmp(token, "ICHECK")) {
         UINT id = inTokenizer.NextInteger();
         CString text = inTokenizer.NextString();
         RECT rect;
         rect.left = inTokenizer.NextInteger();
         rect.top = inTokenizer.NextInteger();
 #line 329
-        T2DlgItemICheck *item = DEBUG_NEW T2DlgItemICheck(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemICheck *item = new T2DlgItemICheck(mTowerDoc, mImageObj, mPalette);
         item->Create(text, inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -346,7 +334,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 344
-        T2DlgItemIRepeater *item = DEBUG_NEW T2DlgItemIRepeater(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemIRepeater *item = new T2DlgItemIRepeater(mTowerDoc, mImageObj, mPalette);
         item->Create(text, inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -358,7 +346,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.left = inTokenizer.NextInteger();
         rect.top = inTokenizer.NextInteger();
 #line 357
-        T2DlgItemRadioButton *item = DEBUG_NEW T2DlgItemRadioButton(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemRadioButton *item = new T2DlgItemRadioButton(mTowerDoc, mImageObj, mPalette);
         item->Create(text, inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -372,7 +360,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 371
-        T2DlgItemRadioText *item = DEBUG_NEW T2DlgItemRadioText(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemRadioText *item = new T2DlgItemRadioText(mTowerDoc, mImageObj, mPalette);
         item->Create(text, inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -386,7 +374,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.bottom = inTokenizer.NextInteger();
         int maxChars = inTokenizer.NextInteger();
 #line 386
-        T2DlgItemEdit *item = DEBUG_NEW T2DlgItemEdit(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemEdit *item = new T2DlgItemEdit(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags | WS_CLIPCHILDREN, rect, this, id);
         item->CreateSubItem(&maxChars);
         if (mCurrentFont >= 0)
@@ -399,7 +387,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 400
-        T2DlgItemHScr *item = DEBUG_NEW T2DlgItemHScr(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemHScr *item = new T2DlgItemHScr(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -412,7 +400,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 414
-        T2DlgItemVScr *item = DEBUG_NEW T2DlgItemVScr(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemVScr *item = new T2DlgItemVScr(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -425,7 +413,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 428
-        T2DlgItemBox *item = DEBUG_NEW T2DlgItemBox(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemBox *item = new T2DlgItemBox(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -439,7 +427,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 443
-        T2DlgItemText *item = DEBUG_NEW T2DlgItemText(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemText *item = new T2DlgItemText(mTowerDoc, mImageObj, mPalette);
         item->Create(text, inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -452,7 +440,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         theTemplate.pt.y = inTokenizer.NextInteger();
         theTemplate.moduleHandle = mTemplate.moduleHandle;
 #line 457
-        T2Dialog *theDialog = DEBUG_NEW T2Dialog;
+        T2Dialog *theDialog = new T2Dialog;
         theDialog->Realize(this, &theTemplate, mTowerDoc, mImageObj, NULL, false, this, id, true);
     } else if (!_stricmp(token, "PPVIEW")) {
         UINT id = inTokenizer.NextInteger();
@@ -462,7 +450,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 468
-        T2DlgItemPeopleView *item = DEBUG_NEW T2DlgItemPeopleView(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemPeopleView *item = new T2DlgItemPeopleView(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -475,7 +463,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 482
-        T2DlgItemProfitsGage *item = DEBUG_NEW T2DlgItemProfitsGage(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemProfitsGage *item = new T2DlgItemProfitsGage(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -488,7 +476,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 496
-        T2DlgItemCustomerGage *item = DEBUG_NEW T2DlgItemCustomerGage(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemCustomerGage *item = new T2DlgItemCustomerGage(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -501,7 +489,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 510
-        T2DlgItemStressGage *item = DEBUG_NEW T2DlgItemStressGage(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemStressGage *item = new T2DlgItemStressGage(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -514,7 +502,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 524
-        T2DlgItemPPLEvalGage *item = DEBUG_NEW T2DlgItemPPLEvalGage(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemPPLEvalGage *item = new T2DlgItemPPLEvalGage(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -527,7 +515,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 538
-        T2DlgItemBelongGage *item = DEBUG_NEW T2DlgItemBelongGage(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemBelongGage *item = new T2DlgItemBelongGage(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -540,7 +528,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 552
-        T2DlgItemTable *item = DEBUG_NEW T2DlgItemTable(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemTable *item = new T2DlgItemTable(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -554,7 +542,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 566
-        T2DlgItemPopup *item = DEBUG_NEW T2DlgItemPopup(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemPopup *item = new T2DlgItemPopup(mTowerDoc, mImageObj, mPalette);
         item->Create(text, inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -567,7 +555,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 580
-        T2PluginInfoTable *item = DEBUG_NEW T2PluginInfoTable(mTowerDoc, mImageObj, mPalette);
+        T2PluginInfoTable *item = new T2PluginInfoTable(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -581,7 +569,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 594
-        T2DlgItemImage *item = DEBUG_NEW T2DlgItemImage(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemImage *item = new T2DlgItemImage(mTowerDoc, mImageObj, mPalette);
         item->Create(text, inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -595,7 +583,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.bottom = inTokenizer.NextInteger();
         int maxChars = inTokenizer.NextInteger();
 #line 608
-        T2DlgItemMerchandiseField *item = DEBUG_NEW T2DlgItemMerchandiseField(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemMerchandiseField *item = new T2DlgItemMerchandiseField(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags | WS_CLIPCHILDREN, rect, this, id);
         item->CreateSubItem(&maxChars);
         if (mCurrentFont >= 0)
@@ -606,7 +594,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.left = inTokenizer.NextInteger();
         rect.top = inTokenizer.NextInteger();
 #line 619
-        T2DlgItemArrows *item = DEBUG_NEW T2DlgItemArrows(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemArrows *item = new T2DlgItemArrows(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags | WS_CLIPCHILDREN, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -619,7 +607,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 634
-        T2DlgItemListBox *item = DEBUG_NEW T2DlgItemListBox(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemListBox *item = new T2DlgItemListBox(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags | WS_CLIPCHILDREN, rect, this, id);
         item->CreateSubItem();
         if (mCurrentFont >= 0)
@@ -633,7 +621,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 649
-        CToggleButtonDisabled *item = DEBUG_NEW CToggleButtonDisabled(mTowerDoc, mImageObj, mPalette);
+        CToggleButtonDisabled *item = new CToggleButtonDisabled(mTowerDoc, mImageObj, mPalette);
         item->Create(text, inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -646,7 +634,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 662
-        T2DlgItemSTimeTbl *item = DEBUG_NEW T2DlgItemSTimeTbl(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemSTimeTbl *item = new T2DlgItemSTimeTbl(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -659,7 +647,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 676
-        T2DlgItemMovie *item = DEBUG_NEW T2DlgItemMovie(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemMovie *item = new T2DlgItemMovie(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags | WS_CLIPCHILDREN, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -672,7 +660,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 690
-        T2MovieTable *item = DEBUG_NEW T2MovieTable(mTowerDoc, mImageObj, mPalette);
+        T2MovieTable *item = new T2MovieTable(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -685,7 +673,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 705
-        T2DlgItemAnimation *item = DEBUG_NEW T2DlgItemAnimation(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemAnimation *item = new T2DlgItemAnimation(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags | WS_CLIPCHILDREN, rect, this, id);
         if (mCurrentFont >= 0)
             item->SetFont(*mFonts[mCurrentFont]);
@@ -697,7 +685,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 719
-        T2DlgItemProgress *item = DEBUG_NEW T2DlgItemProgress(mTowerDoc, mImageObj, mPalette);
+        T2DlgItemProgress *item = new T2DlgItemProgress(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags | WS_CLIPCHILDREN, rect, this, id);
         item->CreateSubItem();
         if (mCurrentFont >= 0)
@@ -710,7 +698,7 @@ void T2Dialog::CreateDlgItemLoop(T2DialogDef& def, char* data) {
         rect.right = inTokenizer.NextInteger();
         rect.bottom = inTokenizer.NextInteger();
 #line 733
-        T2AdvertiseTable *item = DEBUG_NEW T2AdvertiseTable(mTowerDoc, mImageObj, mPalette);
+        T2AdvertiseTable *item = new T2AdvertiseTable(mTowerDoc, mImageObj, mPalette);
         item->Create("", inDef.flags, rect, this, id);
         item->CreateSubItem(NULL);
         if (mCurrentFont >= 0)
@@ -816,12 +804,12 @@ void T2Dialog::DoClose(int nResult) {
 		DestroyWindow();
 }
 
-/*virtual*/ int T2Dialog::PreTranslateMessage(MSG* msg) {
+/*virtual*/ BOOL T2Dialog::PreTranslateMessage(MSG* msg) {
 	return CWnd::PreTranslateMessage(msg);
 }
 
-/*virtual*/ int T2Dialog::PreCreateWindow(CREATESTRUCT&) {
-	return 1;
+/*virtual*/ BOOL T2Dialog::PreCreateWindow(CREATESTRUCT&) {
+	return true;
 }
 
 void T2Dialog::MakeRadioGroup(int inBaseID, int inCount, int inSelected) {