From 25c4837b1dbb45709dfd25ffdbc66d14e20b773b Mon Sep 17 00:00:00 2001 From: "Azamat H. Hackimov" Date: Sun, 25 Aug 2024 00:57:17 +0300 Subject: [PATCH] Editor: fix compilation Add `"mono.h"` where needed. --- editor/AmbientSoundPattern.cpp | 1 + editor/EPath.cpp | 2 +- editor/Erooms.cpp | 1 + editor/FilePageDialog.cpp | 1 + editor/HRoom.cpp | 1 + editor/LightingDialog.cpp | 1 + editor/MegacellDialog.cpp | 1 + editor/ObjCScript.cpp | 1 + editor/ObjectDialog.cpp | 2 +- editor/Read3ds.cpp | 1 + editor/ScriptEditorDlg.cpp | 1 + editor/ScriptStudio.cpp | 2 +- editor/StatusDlg.cpp | 1 + editor/TerrainDialog.cpp | 1 + editor/TextureDialog.cpp | 1 + editor/TriggerDialog.cpp | 2 +- editor/ViewerPropDlg.cpp | 1 + editor/WorldObjectsGenericDialog.cpp | 1 + editor/WorldObjectsPlayerDialog.cpp | 1 + editor/WorldSoundsDialog.cpp | 1 + editor/WorldWeaponsDialog.cpp | 1 + editor/ebnode.cpp | 2 +- editor/editor_lighting.cpp | 2 +- editor/editor_object_lighting.cpp | 1 + editor/rad_cast.cpp | 2 +- editor/rad_hemicube.cpp | 1 + editor/rad_init.cpp | 1 + editor/roomkeypaddialog.cpp | 2 +- 28 files changed, 28 insertions(+), 8 deletions(-) diff --git a/editor/AmbientSoundPattern.cpp b/editor/AmbientSoundPattern.cpp index dfc14c1e..74b13e25 100644 --- a/editor/AmbientSoundPattern.cpp +++ b/editor/AmbientSoundPattern.cpp @@ -30,6 +30,7 @@ #include "gamefilepage.h" #include "ddio.h" #include "mem.h" +#include "mono.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/editor/EPath.cpp b/editor/EPath.cpp index 1aa25330..fbda8e8d 100644 --- a/editor/EPath.cpp +++ b/editor/EPath.cpp @@ -78,7 +78,7 @@ #endif #include "epath.h" - +#include "mono.h" #include "object.h" #include "findintersection.h" diff --git a/editor/Erooms.cpp b/editor/Erooms.cpp index 76bf1b02..bf70e461 100644 --- a/editor/Erooms.cpp +++ b/editor/Erooms.cpp @@ -561,6 +561,7 @@ #include "lighting.h" #include "trigger.h" #include "mem.h" +#include "mono.h" #include "doorway.h" #ifndef NEWEDITOR diff --git a/editor/FilePageDialog.cpp b/editor/FilePageDialog.cpp index 32c8ffc0..2e9113bc 100644 --- a/editor/FilePageDialog.cpp +++ b/editor/FilePageDialog.cpp @@ -28,6 +28,7 @@ #include "EditLineDialog.h" #include "pserror.h" #include "mem.h" +#include "mono.h" #include "FilePageAddDlg.h" #ifdef _DEBUG diff --git a/editor/HRoom.cpp b/editor/HRoom.cpp index 01c88173..181eaf77 100644 --- a/editor/HRoom.cpp +++ b/editor/HRoom.cpp @@ -407,6 +407,7 @@ #include "group.h" #include "door.h" #include "doorway.h" +#include "mono.h" #include "terrain.h" #include "HTexture.h" #include "trigger.h" diff --git a/editor/LightingDialog.cpp b/editor/LightingDialog.cpp index ce50bc62..ce264aea 100644 --- a/editor/LightingDialog.cpp +++ b/editor/LightingDialog.cpp @@ -264,6 +264,7 @@ #include "lighting.h" #include "bsp.h" #include "ddio.h" +#include "mono.h" #include "vclip.h" #ifdef _DEBUG diff --git a/editor/MegacellDialog.cpp b/editor/MegacellDialog.cpp index 46f7b09d..fdc5ef2d 100644 --- a/editor/MegacellDialog.cpp +++ b/editor/MegacellDialog.cpp @@ -34,6 +34,7 @@ #include "bitmap.h" #include "ddio.h" #include "mem.h" +#include "mono.h" #include "EditLineDialog.h" #ifdef _DEBUG diff --git a/editor/ObjCScript.cpp b/editor/ObjCScript.cpp index bb013e5b..ae349e82 100644 --- a/editor/ObjCScript.cpp +++ b/editor/ObjCScript.cpp @@ -129,6 +129,7 @@ #include "gamefile.h" #include "pserror.h" #include "mem.h" +#include "mono.h" #include #include diff --git a/editor/ObjectDialog.cpp b/editor/ObjectDialog.cpp index 6c9b7e33..73fc2084 100644 --- a/editor/ObjectDialog.cpp +++ b/editor/ObjectDialog.cpp @@ -246,7 +246,7 @@ #include "physics.h" #include "door.h" #include "mem.h" - +#include "mono.h" #include "PowerupPropDialog.h" #ifdef _DEBUG diff --git a/editor/Read3ds.cpp b/editor/Read3ds.cpp index 6086c512..70beb8a1 100644 --- a/editor/Read3ds.cpp +++ b/editor/Read3ds.cpp @@ -110,6 +110,7 @@ #include #include #include "mem.h" +#include "mono.h" #include "vecmat.h" // 3ds MAX id's diff --git a/editor/ScriptEditorDlg.cpp b/editor/ScriptEditorDlg.cpp index 285647b2..c094b512 100644 --- a/editor/ScriptEditorDlg.cpp +++ b/editor/ScriptEditorDlg.cpp @@ -58,6 +58,7 @@ #include "OsirisStatusDlg.h" #include "pserror.h" #include "mem.h" +#include "mono.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/editor/ScriptStudio.cpp b/editor/ScriptStudio.cpp index 60c9444e..a6348b48 100644 --- a/editor/ScriptStudio.cpp +++ b/editor/ScriptStudio.cpp @@ -86,7 +86,7 @@ #include "OsirisStatusDlg.h" #include "ObjCScript.h" #include "mem.h" - +#include "mono.h" #include "pserror.h" #include "d3x.h" #include "ddio.h" diff --git a/editor/StatusDlg.cpp b/editor/StatusDlg.cpp index 4c334411..a8255fbc 100644 --- a/editor/StatusDlg.cpp +++ b/editor/StatusDlg.cpp @@ -22,6 +22,7 @@ #include "stdafx.h" #include "editor.h" #include "StatusDlg.h" +#include "mono.h" #include "pserror.h" #ifdef _DEBUG diff --git a/editor/TerrainDialog.cpp b/editor/TerrainDialog.cpp index 70239cfb..9c02cce1 100644 --- a/editor/TerrainDialog.cpp +++ b/editor/TerrainDialog.cpp @@ -228,6 +228,7 @@ #include "findintersection.h" #include "config.h" #include "mem.h" +#include "mono.h" #include "gr.h" #ifdef _DEBUG diff --git a/editor/TextureDialog.cpp b/editor/TextureDialog.cpp index 42849763..a68ef86f 100644 --- a/editor/TextureDialog.cpp +++ b/editor/TextureDialog.cpp @@ -159,6 +159,7 @@ #include "gr.h" #include "descent.h" #include "erooms.h" +#include "mono.h" #include "room.h" #include "terrain.h" diff --git a/editor/TriggerDialog.cpp b/editor/TriggerDialog.cpp index 6513808c..8fb1e99c 100644 --- a/editor/TriggerDialog.cpp +++ b/editor/TriggerDialog.cpp @@ -135,7 +135,7 @@ #include "HView.h" #include "FindIntersection.h" #include "erooms.h" -//@@#include "d3x.h" +#include "mono.h" #include "DallasMainDlg.h" diff --git a/editor/ViewerPropDlg.cpp b/editor/ViewerPropDlg.cpp index c5d601fc..849f5ef9 100644 --- a/editor/ViewerPropDlg.cpp +++ b/editor/ViewerPropDlg.cpp @@ -41,6 +41,7 @@ #include "stdafx.h" #include "editor.h" #include "ViewerPropDlg.h" +#include "mono.h" #include "object.h" #ifdef _DEBUG diff --git a/editor/WorldObjectsGenericDialog.cpp b/editor/WorldObjectsGenericDialog.cpp index 7bb1e376..037c7c8c 100644 --- a/editor/WorldObjectsGenericDialog.cpp +++ b/editor/WorldObjectsGenericDialog.cpp @@ -41,6 +41,7 @@ #include "vclip.h" #include "QuickCompile.h" #include "mem.h" +#include "mono.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/editor/WorldObjectsPlayerDialog.cpp b/editor/WorldObjectsPlayerDialog.cpp index 95193b69..0120a0eb 100644 --- a/editor/WorldObjectsPlayerDialog.cpp +++ b/editor/WorldObjectsPlayerDialog.cpp @@ -129,6 +129,7 @@ #include "shippage.h" #include "ship.h" #include "manage.h" +#include "mono.h" #include "polymodel.h" #include "PhysicsDlg.h" #include "PlayerWeaponsDialog.h" diff --git a/editor/WorldSoundsDialog.cpp b/editor/WorldSoundsDialog.cpp index b18b3ee9..9ab9b56c 100644 --- a/editor/WorldSoundsDialog.cpp +++ b/editor/WorldSoundsDialog.cpp @@ -127,6 +127,7 @@ #include "soundload.h" #include "soundpage.h" #include "manage.h" +#include "mono.h" #include "hlsoundlib.h" #include "ddio.h" diff --git a/editor/WorldWeaponsDialog.cpp b/editor/WorldWeaponsDialog.cpp index c0858565..9b623187 100644 --- a/editor/WorldWeaponsDialog.cpp +++ b/editor/WorldWeaponsDialog.cpp @@ -310,6 +310,7 @@ #include "GenericLightDialog.h" #include "ddio.h" #include "mem.h" +#include "mono.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/editor/ebnode.cpp b/editor/ebnode.cpp index cc9c2178..1c12183e 100644 --- a/editor/ebnode.cpp +++ b/editor/ebnode.cpp @@ -131,7 +131,7 @@ #include "bnode.h" #include "room.h" #include "mem.h" -#include "memory.h" +#include "mono.h" #include "vecmat.h" #include "object.h" #include "3d.h" diff --git a/editor/editor_lighting.cpp b/editor/editor_lighting.cpp index 995b57a9..83a7df20 100644 --- a/editor/editor_lighting.cpp +++ b/editor/editor_lighting.cpp @@ -47,11 +47,11 @@ #include "bsp.h" #include "Application.h" #include "AppDatabase.h" -#include "program.h" #include "loadlevel.h" #include "special_face.h" #include "boa.h" #include "mem.h" +#include "mono.h" struct spec_vertex { float x, y; diff --git a/editor/editor_object_lighting.cpp b/editor/editor_object_lighting.cpp index 3b2dee91..5708c7b8 100644 --- a/editor/editor_object_lighting.cpp +++ b/editor/editor_object_lighting.cpp @@ -30,6 +30,7 @@ #include "lightmap_info.h" #include "object_lighting.h" #include "mem.h" +#include "mono.h" void ComputeObjectSurfaceRes(rad_surface *surf, object *obj, int subnum, int facenum) { int i; diff --git a/editor/rad_cast.cpp b/editor/rad_cast.cpp index 3ebfdac0..87995890 100644 --- a/editor/rad_cast.cpp +++ b/editor/rad_cast.cpp @@ -199,7 +199,7 @@ */ #include -#include +#include "mono.h" #include "radiosity.h" #include "rad_cast.h" #include "terrain.h" diff --git a/editor/rad_hemicube.cpp b/editor/rad_hemicube.cpp index 0057e925..f7f1a35a 100644 --- a/editor/rad_hemicube.cpp +++ b/editor/rad_hemicube.cpp @@ -26,6 +26,7 @@ #include "d3edit.h" #include "ddio.h" #include "mem.h" +#include "mono.h" #include #include diff --git a/editor/rad_init.cpp b/editor/rad_init.cpp index 7d9c39db..add423c4 100644 --- a/editor/rad_init.cpp +++ b/editor/rad_init.cpp @@ -29,6 +29,7 @@ #include "vecmat.h" #include #include "mem.h" +#include "mono.h" // Some radiosity globals int Shoot_method = SM_HEMICUBE; diff --git a/editor/roomkeypaddialog.cpp b/editor/roomkeypaddialog.cpp index f36a9072..5acbc7de 100644 --- a/editor/roomkeypaddialog.cpp +++ b/editor/roomkeypaddialog.cpp @@ -266,8 +266,8 @@ #include "EditLineDialog.h" #include "hlsoundlib.h" #include "mem.h" +#include "mono.h" #include "damage_external.h" -#include "boa.h" #ifdef _DEBUG #define new DEBUG_NEW