From 68f877184586c18c1c44eba16d921576b6bc0bce Mon Sep 17 00:00:00 2001 From: "Azamat H. Hackimov" Date: Wed, 25 Sep 2024 23:47:03 +0300 Subject: [PATCH] Fix compilation of editor --- Descent3/SLEW.cpp | 1 + editor/GenericDeathDialog.cpp | 1 + editor/HObject.cpp | 1 + editor/HRoom.cpp | 1 + editor/HTexture.cpp | 1 + editor/HView.cpp | 1 + editor/LevelDialog.cpp | 1 + editor/OrphanRemoveDlg.cpp | 1 + editor/PreferencesDialog.cpp | 1 + editor/SelectRangeDialog.cpp | 1 + editor/TableFileFilterMng.cpp | 1 + editor/TableManage.cpp | 1 + editor/TerrainSoundDialog.cpp | 1 + editor/TriggerDialog.cpp | 1 + editor/editorDoc.cpp | 1 + editor/levelkeypad.cpp | 1 + win32/winapp.cpp | 2 +- 17 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Descent3/SLEW.cpp b/Descent3/SLEW.cpp index a7d8a133..9c9a7db5 100644 --- a/Descent3/SLEW.cpp +++ b/Descent3/SLEW.cpp @@ -197,6 +197,7 @@ #ifdef EDITOR #include "editor\mainfrm.h" #include "editor\d3edit.h" +#include "pserror.h" #endif #include diff --git a/editor/GenericDeathDialog.cpp b/editor/GenericDeathDialog.cpp index 2c990935..f66cad2d 100644 --- a/editor/GenericDeathDialog.cpp +++ b/editor/GenericDeathDialog.cpp @@ -22,6 +22,7 @@ #include "stdafx.h" #include "editor.h" #include "GenericDeathDialog.h" +#include "pserror.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/editor/HObject.cpp b/editor/HObject.cpp index 0898abe5..cc4f283e 100644 --- a/editor/HObject.cpp +++ b/editor/HObject.cpp @@ -233,6 +233,7 @@ #include "d3edit.h" #include "mono.h" +#include "pserror.h" #include "vclip.h" #include "terrain.h" #include "player.h" diff --git a/editor/HRoom.cpp b/editor/HRoom.cpp index 181eaf77..5c86e8c8 100644 --- a/editor/HRoom.cpp +++ b/editor/HRoom.cpp @@ -411,6 +411,7 @@ #include "terrain.h" #include "HTexture.h" #include "trigger.h" +#include "pserror.h" // Make the Marked room/face the current room/face void SetMarkedRoom() { diff --git a/editor/HTexture.cpp b/editor/HTexture.cpp index 1fcea774..b2149ee1 100644 --- a/editor/HTexture.cpp +++ b/editor/HTexture.cpp @@ -169,6 +169,7 @@ #include "room.h" #include "descent.h" #include "erooms.h" +#include "pserror.h" #define HTEX_CALIB_VAL ((float)(1.0 / 128.0)) diff --git a/editor/HView.cpp b/editor/HView.cpp index b7c9ab60..b788f650 100644 --- a/editor/HView.cpp +++ b/editor/HView.cpp @@ -122,6 +122,7 @@ #include "terrain.h" #include "erooms.h" #include "editor.h" +#include "pserror.h" #define FACE_VIEW_DIST 5.0 diff --git a/editor/LevelDialog.cpp b/editor/LevelDialog.cpp index 5f8d8a33..1e0c30e3 100644 --- a/editor/LevelDialog.cpp +++ b/editor/LevelDialog.cpp @@ -27,6 +27,7 @@ #include "room.h" #include "ambient.h" #include "hlsoundlib.h" +#include "pserror.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/editor/OrphanRemoveDlg.cpp b/editor/OrphanRemoveDlg.cpp index 8f2060fe..fd25da70 100644 --- a/editor/OrphanRemoveDlg.cpp +++ b/editor/OrphanRemoveDlg.cpp @@ -57,6 +57,7 @@ #include "weaponpage.h" #include "ddio.h" #include "mem.h" +#include "pserror.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/editor/PreferencesDialog.cpp b/editor/PreferencesDialog.cpp index 05ba3458..a92a025d 100644 --- a/editor/PreferencesDialog.cpp +++ b/editor/PreferencesDialog.cpp @@ -104,6 +104,7 @@ #include "PreferencesDialog.h" #include "game.h" #include "pilot.h" +#include "pserror.h" #include "slew.h" #ifdef _DEBUG diff --git a/editor/SelectRangeDialog.cpp b/editor/SelectRangeDialog.cpp index 9ea6d809..aa882f4d 100644 --- a/editor/SelectRangeDialog.cpp +++ b/editor/SelectRangeDialog.cpp @@ -21,6 +21,7 @@ #include "stdafx.h" #include "editor.h" +#include "pserror.h" #include "SelectRangeDialog.h" #include "terrain.h" diff --git a/editor/TableFileFilterMng.cpp b/editor/TableFileFilterMng.cpp index f8a2f31b..49275e73 100644 --- a/editor/TableFileFilterMng.cpp +++ b/editor/TableFileFilterMng.cpp @@ -193,6 +193,7 @@ #include "fireball.h" #include "mem.h" #include "polymodel.h" +#include "pserror.h" #include "ddio.h" #include "DallasUtilities.h" #include "matcen.h" diff --git a/editor/TableManage.cpp b/editor/TableManage.cpp index 3e887223..3772e1a9 100644 --- a/editor/TableManage.cpp +++ b/editor/TableManage.cpp @@ -40,6 +40,7 @@ #include "cfile.h" // #include "AppDatabase.h" #include "mem.h" +#include "pserror.h" //////////////////////////////////////////////////////////////// // GenericPageNode Class Members diff --git a/editor/TerrainSoundDialog.cpp b/editor/TerrainSoundDialog.cpp index 66f8b064..d6e2643e 100644 --- a/editor/TerrainSoundDialog.cpp +++ b/editor/TerrainSoundDialog.cpp @@ -21,6 +21,7 @@ #include "stdafx.h" #include "editor.h" +#include "pserror.h" #include "TerrainSoundDialog.h" #ifdef _DEBUG diff --git a/editor/TriggerDialog.cpp b/editor/TriggerDialog.cpp index 8fb1e99c..a26a6591 100644 --- a/editor/TriggerDialog.cpp +++ b/editor/TriggerDialog.cpp @@ -136,6 +136,7 @@ #include "FindIntersection.h" #include "erooms.h" #include "mono.h" +#include "pserror.h" #include "DallasMainDlg.h" diff --git a/editor/editorDoc.cpp b/editor/editorDoc.cpp index de0ed0dc..949e1f09 100644 --- a/editor/editorDoc.cpp +++ b/editor/editorDoc.cpp @@ -88,6 +88,7 @@ #include "ddio.h" #include "manage.h" #include "DallasMainDlg.h" +#include "pserror.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/editor/levelkeypad.cpp b/editor/levelkeypad.cpp index 67e1083a..6bb03d98 100644 --- a/editor/levelkeypad.cpp +++ b/editor/levelkeypad.cpp @@ -29,6 +29,7 @@ #include "aiambient.h" #include "objinfo.h" #include "game.h" +#include "pserror.h" #include "soundload.h" #ifdef _DEBUG diff --git a/win32/winapp.cpp b/win32/winapp.cpp index 2ddbf516..47a88970 100644 --- a/win32/winapp.cpp +++ b/win32/winapp.cpp @@ -651,7 +651,7 @@ LRESULT WINAPI MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { case WM_DESTROY: // get window handle and clear it. if (i == MAX_WIN32APPS) - debug_break(); + DEBUG_BREAK(); Win32_AppObjects[i].hWnd = NULL; Win32_AppObjects[i].app = NULL; i = -1;