From eab1a85d62b7b16c503386ce10247665d828d5a0 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Tue, 13 Feb 2024 23:41:42 +0100 Subject: [PATCH 1/8] Remove intrinsics.h from always.h to speed up compile time --- deps/baseconfig/src/always.h | 1 - src/w3d/lib/cpudetect.cpp | 1 + src/w3d/lib/mpu.cpp | 1 + src/w3d/lib/rcfile.cpp | 4 ++++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/deps/baseconfig/src/always.h b/deps/baseconfig/src/always.h index cf568054d..cbb6de4e8 100644 --- a/deps/baseconfig/src/always.h +++ b/deps/baseconfig/src/always.h @@ -21,7 +21,6 @@ #include "bittype.h" #include "compiler.h" -#include "intrinsics.h" #include "macros.h" #include "platform.h" #include "stringex.h" diff --git a/src/w3d/lib/cpudetect.cpp b/src/w3d/lib/cpudetect.cpp index 94c459107..6c5f77cbc 100644 --- a/src/w3d/lib/cpudetect.cpp +++ b/src/w3d/lib/cpudetect.cpp @@ -13,6 +13,7 @@ * LICENSE */ #include "cpudetect.h" +#include "intrinsics.h" #include "systimer.h" #include #include diff --git a/src/w3d/lib/mpu.cpp b/src/w3d/lib/mpu.cpp index c10f521b4..1c4fc11d5 100644 --- a/src/w3d/lib/mpu.cpp +++ b/src/w3d/lib/mpu.cpp @@ -13,6 +13,7 @@ * LICENSE */ #include "mpu.h" +#include "intrinsics.h" unsigned long Get_CPU_Clock(unsigned long &high) { diff --git a/src/w3d/lib/rcfile.cpp b/src/w3d/lib/rcfile.cpp index ad0a2d17b..7e800daba 100644 --- a/src/w3d/lib/rcfile.cpp +++ b/src/w3d/lib/rcfile.cpp @@ -15,6 +15,9 @@ #include "rcfile.h" #ifdef PLATFORM_WINDOWS + +#include + RCFileClass::RCFileClass(HMODULE module, const char *name) : m_name(nullptr), m_unk(0), m_startPointer(nullptr), m_currentPointer(nullptr), m_endPointer(nullptr) { @@ -104,4 +107,5 @@ off_t RCFileClass::Seek(off_t offset, int whence) return m_currentPointer - m_startPointer; } + #endif From 2d09b309ed8d5c37153728fe2c3269139ccee1b9 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Tue, 13 Feb 2024 23:46:50 +0100 Subject: [PATCH 2/8] Remove utf.h from always.h to reduce compile time --- deps/baseconfig/src/always.h | 1 - src/game/client/system/image.cpp | 3 +++ src/game/common/system/asciistring.cpp | 3 +++ src/game/common/system/localfile.cpp | 1 + src/game/common/system/unicodestring.cpp | 3 +++ src/game/network/gamespy/thread/threadutils.cpp | 3 +++ src/platform/w3dengine/common/win32localfilesystem.cpp | 1 + src/w3d/lib/wwstring.cpp | 3 +++ 8 files changed, 17 insertions(+), 1 deletion(-) diff --git a/deps/baseconfig/src/always.h b/deps/baseconfig/src/always.h index cbb6de4e8..1ca6a12c6 100644 --- a/deps/baseconfig/src/always.h +++ b/deps/baseconfig/src/always.h @@ -28,7 +28,6 @@ #include "unichar.h" #ifdef PLATFORM_WINDOWS -#include "utf.h" #include #define NAME_MAX FILENAME_MAX diff --git a/src/game/client/system/image.cpp b/src/game/client/system/image.cpp index 3a550a14a..6bcc46c75 100644 --- a/src/game/client/system/image.cpp +++ b/src/game/client/system/image.cpp @@ -18,6 +18,9 @@ #include "ini.h" #include "namekeygenerator.h" #include +#if defined PLATFORM_WINDOWS +#include +#endif #ifndef GAME_DLL ImageCollection *g_theMappedImageCollection = nullptr; diff --git a/src/game/common/system/asciistring.cpp b/src/game/common/system/asciistring.cpp index bd698cc1d..db3d946ed 100644 --- a/src/game/common/system/asciistring.cpp +++ b/src/game/common/system/asciistring.cpp @@ -20,6 +20,9 @@ #include #include #include +#if defined PLATFORM_WINDOWS +#include +#endif Utf8String const Utf8String::s_emptyString(nullptr); diff --git a/src/game/common/system/localfile.cpp b/src/game/common/system/localfile.cpp index 6705a0c6c..e4d90c7f7 100644 --- a/src/game/common/system/localfile.cpp +++ b/src/game/common/system/localfile.cpp @@ -27,6 +27,7 @@ #define O_BINARY 0 #elif defined PLATFORM_WINDOWS #include +#include // Wraps the wide string call with an adapter from utf8. #undef open #define open(filename, oflags, ...) _wopen(UTF8To16(filename), oflags, ##__VA_ARGS__) diff --git a/src/game/common/system/unicodestring.cpp b/src/game/common/system/unicodestring.cpp index 590675eb7..71fe12abf 100644 --- a/src/game/common/system/unicodestring.cpp +++ b/src/game/common/system/unicodestring.cpp @@ -18,6 +18,9 @@ #include "memdynalloc.h" #include #include +#if defined PLATFORM_WINDOWS +#include +#endif #if !defined BUILD_WITH_ICU && defined PLATFORM_WINDOWS #include diff --git a/src/game/network/gamespy/thread/threadutils.cpp b/src/game/network/gamespy/thread/threadutils.cpp index d92854164..57ce3e3ed 100644 --- a/src/game/network/gamespy/thread/threadutils.cpp +++ b/src/game/network/gamespy/thread/threadutils.cpp @@ -13,6 +13,9 @@ * LICENSE */ #include "threadutils.h" +#if defined PLATFORM_WINDOWS +#include +#endif std::wstring MultiByteToWideCharSingleLine(const char *orig) { diff --git a/src/platform/w3dengine/common/win32localfilesystem.cpp b/src/platform/w3dengine/common/win32localfilesystem.cpp index da93118e9..55b204a92 100644 --- a/src/platform/w3dengine/common/win32localfilesystem.cpp +++ b/src/platform/w3dengine/common/win32localfilesystem.cpp @@ -20,6 +20,7 @@ #ifdef PLATFORM_WINDOWS #include #include +#include #else #include #include diff --git a/src/w3d/lib/wwstring.cpp b/src/w3d/lib/wwstring.cpp index b42a621e3..4d3623ea4 100644 --- a/src/w3d/lib/wwstring.cpp +++ b/src/w3d/lib/wwstring.cpp @@ -15,6 +15,9 @@ */ #include "wwstring.h" #include +#if defined PLATFORM_WINDOWS +#include +#endif #ifndef GAME_DLL FastCriticalSectionClass StringClass::m_mutex; From 29e1d22ee957cbf65e3443ffed4c93c75f9d6d2a Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Tue, 13 Feb 2024 23:50:30 +0100 Subject: [PATCH 3/8] Avoid including intrin.h in captainslog.h with MSVC to reduce compile time --- deps/captnlog/src/captainslog.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/deps/captnlog/src/captainslog.h b/deps/captnlog/src/captainslog.h index 6d7352e6d..2d8734300 100644 --- a/deps/captnlog/src/captainslog.h +++ b/deps/captnlog/src/captainslog.h @@ -131,8 +131,16 @@ void captainslog_free_varg_str(char *str); #if __has_builtin(__builtin_debugtrap) #define captainslog_debugtrap __builtin_debugtrap #elif defined _WIN32 && !defined __WATCOMC__ -#include -#define captainslog_debugtrap __debugbreak +# if defined(_M_IX86) +// Avoids including for faster compilation in MSVC. +trap_inline void captainslog_debugtrap(void) +{ + __asm int 3 +} +# else +# include +# define captainslog_debugtrap __debugbreak +# endif /* If we have GCC or compiler that tries to be compatible, use GCC inline assembly. */ #elif defined __GNUC__ || defined __clang__ #if defined(__i386__) || defined(__x86_64__) From 49fdb6d044ac6e20f74b1b6c43939e07d5afc14f Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Tue, 13 Feb 2024 23:55:21 +0100 Subject: [PATCH 4/8] Remove duplicate includes from always.h --- deps/baseconfig/src/always.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/deps/baseconfig/src/always.h b/deps/baseconfig/src/always.h index 1ca6a12c6..cf8767a26 100644 --- a/deps/baseconfig/src/always.h +++ b/deps/baseconfig/src/always.h @@ -19,13 +19,10 @@ #include "config.h" #include "targetver.h" -#include "bittype.h" #include "compiler.h" -#include "macros.h" #include "platform.h" #include "stringex.h" #include "typeoperators.h" -#include "unichar.h" #ifdef PLATFORM_WINDOWS #include From a1d1be205ff83365c6e60e4dd87036daff5e91c6 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Wed, 14 Feb 2024 00:04:57 +0100 Subject: [PATCH 5/8] Remove always.h from hot include files to reduce compile time --- deps/baseconfig/src/unichar.h | 2 ++ src/game/common/bitflags.h | 1 - src/game/common/system/asciistring.h | 2 +- src/game/common/system/unicodestring.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deps/baseconfig/src/unichar.h b/deps/baseconfig/src/unichar.h index de4c57952..de41025a7 100644 --- a/deps/baseconfig/src/unichar.h +++ b/deps/baseconfig/src/unichar.h @@ -14,6 +14,8 @@ */ #ifndef BASE_UNICHAR_H #define BASE_UNICHAR_H + +#include "macros.h" #include #ifdef U_CHAR diff --git a/src/game/common/bitflags.h b/src/game/common/bitflags.h index f382667ce..43ff528f6 100644 --- a/src/game/common/bitflags.h +++ b/src/game/common/bitflags.h @@ -14,7 +14,6 @@ */ #pragma once -#include "always.h" #include "asciistring.h" #include "ini.h" #include "xfer.h" diff --git a/src/game/common/system/asciistring.h b/src/game/common/system/asciistring.h index 3ac58baad..1101cded1 100644 --- a/src/game/common/system/asciistring.h +++ b/src/game/common/system/asciistring.h @@ -14,7 +14,7 @@ */ #pragma once -#include "always.h" +#include "unichar.h" #include #include #include diff --git a/src/game/common/system/unicodestring.h b/src/game/common/system/unicodestring.h index 8f9e5c730..e33a0ebfc 100644 --- a/src/game/common/system/unicodestring.h +++ b/src/game/common/system/unicodestring.h @@ -14,8 +14,8 @@ */ #pragma once -#include "always.h" #include "critsection.h" +#include "unichar.h" #include #include From 611a96577f06ac8840e56a13aa4c83087c31a16c Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Wed, 14 Feb 2024 00:07:26 +0100 Subject: [PATCH 6/8] Remove new from asciistring.h to reduce compile time --- src/game/client/gui/wininstancedata.cpp | 8 ++++++++ src/game/client/gui/wininstancedata.h | 2 +- src/game/common/system/asciistring.cpp | 12 ++++++++++++ src/game/common/system/asciistring.h | 9 +++++---- src/platform/w3dengine/client/w3droadbuffer.cpp | 12 ++++++++++++ src/platform/w3dengine/client/w3droadbuffer.h | 4 ++-- src/platform/w3dengine/client/water/w3dwater.cpp | 8 ++++++++ src/platform/w3dengine/client/water/w3dwater.h | 2 +- 8 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/game/client/gui/wininstancedata.cpp b/src/game/client/gui/wininstancedata.cpp index 2f1c9774f..21c42c09a 100644 --- a/src/game/client/gui/wininstancedata.cpp +++ b/src/game/client/gui/wininstancedata.cpp @@ -187,3 +187,11 @@ WinInstanceData &WinInstanceData::operator=(const WinInstanceData &that) return *this; } + +#ifdef GAME_DLL +#include +WinInstanceData *WinInstanceData::Hook_Ctor() +{ + return new (this) WinInstanceData; +} +#endif diff --git a/src/game/client/gui/wininstancedata.h b/src/game/client/gui/wininstancedata.h index f92919095..8cd093536 100644 --- a/src/game/client/gui/wininstancedata.h +++ b/src/game/client/gui/wininstancedata.h @@ -73,7 +73,7 @@ class WinInstanceData WinInstanceData &operator=(const WinInstanceData &that); #ifdef GAME_DLL - WinInstanceData *Hook_Ctor() { return new (this) WinInstanceData; } + WinInstanceData *Hook_Ctor(); #endif public: diff --git a/src/game/common/system/asciistring.cpp b/src/game/common/system/asciistring.cpp index db3d946ed..31400fa06 100644 --- a/src/game/common/system/asciistring.cpp +++ b/src/game/common/system/asciistring.cpp @@ -655,3 +655,15 @@ void Utf8String::Debug_Ignore_Leaks() // TODO, does not seem to be implemented anywhere? It is called though... } #endif // GAME_DEBUG + +#ifdef GAME_DLL +#include +Utf8String *Utf8String::Hook_Ctor1(const char *s) +{ + return new (this) Utf8String(s); +} +Utf8String *Utf8String::Hook_Ctor2(Utf8String const &string) +{ + return new (this) Utf8String(string); +} +#endif // GAME_DLL diff --git a/src/game/common/system/asciistring.h b/src/game/common/system/asciistring.h index 1101cded1..3c31da48a 100644 --- a/src/game/common/system/asciistring.h +++ b/src/game/common/system/asciistring.h @@ -17,8 +17,9 @@ #include "unichar.h" #include #include +#include #include -#include +#include #include // Using STLPort seems to screw up some of the C++11 header inclusions. @@ -188,9 +189,9 @@ class Utf8String public: static Utf8String const s_emptyString; -#ifdef GAME_DLL // This define is only set when building a hooking DLL. - Utf8String *Hook_Ctor1(const char *s) { return new (this) Utf8String(s); } - Utf8String *Hook_Ctor2(Utf8String const &string) { return new (this) Utf8String(string); } +#ifdef GAME_DLL + Utf8String *Hook_Ctor1(const char *s); + Utf8String *Hook_Ctor2(Utf8String const &string); #endif protected: diff --git a/src/platform/w3dengine/client/w3droadbuffer.cpp b/src/platform/w3dengine/client/w3droadbuffer.cpp index 328956bf1..535ffae74 100644 --- a/src/platform/w3dengine/client/w3droadbuffer.cpp +++ b/src/platform/w3dengine/client/w3droadbuffer.cpp @@ -2709,3 +2709,15 @@ void W3DRoadBuffer::Insert_Curve_Segment_At(int ndx1, int ndx2) } } } + +#ifdef GAME_DLL +#include +W3DRoadBuffer *W3DRoadBuffer::Hook_Ctor() +{ + return new (this) W3DRoadBuffer(); +} +void W3DRoadBuffer::Hook_Dtor() +{ + W3DRoadBuffer::~W3DRoadBuffer(); +} +#endif diff --git a/src/platform/w3dengine/client/w3droadbuffer.h b/src/platform/w3dengine/client/w3droadbuffer.h index abbcf2ad3..482b8b4f1 100644 --- a/src/platform/w3dengine/client/w3droadbuffer.h +++ b/src/platform/w3dengine/client/w3droadbuffer.h @@ -261,8 +261,8 @@ class W3DRoadBuffer int m_curNumRoadIndices; bool m_dirty; #ifdef GAME_DLL - W3DRoadBuffer *Hook_Ctor() { return new (this) W3DRoadBuffer(); } - void Hook_Dtor() { W3DRoadBuffer::~W3DRoadBuffer(); } + W3DRoadBuffer *Hook_Ctor(); + void Hook_Dtor(); #endif friend class BaseHeightMapRenderObjClass; }; diff --git a/src/platform/w3dengine/client/water/w3dwater.cpp b/src/platform/w3dengine/client/water/w3dwater.cpp index b524a5689..b66d2cedc 100644 --- a/src/platform/w3dengine/client/water/w3dwater.cpp +++ b/src/platform/w3dengine/client/water/w3dwater.cpp @@ -2419,3 +2419,11 @@ void WaterRenderObjClass::Setup_Jba_Water_Shader() } #endif } + +#ifdef GAME_DLL +#include +WaterRenderObjClass *WaterRenderObjClass::Hook_Ctor() +{ + return new (this) WaterRenderObjClass(); +} +#endif diff --git a/src/platform/w3dengine/client/water/w3dwater.h b/src/platform/w3dengine/client/water/w3dwater.h index dddf758af..17bd25ca1 100644 --- a/src/platform/w3dengine/client/water/w3dwater.h +++ b/src/platform/w3dengine/client/water/w3dwater.h @@ -86,7 +86,7 @@ class WaterRenderObjClass : public SnapShot, public RenderObjClass WaterRenderObjClass(); #ifdef GAME_DLL - WaterRenderObjClass *Hook_Ctor() { return new (this) WaterRenderObjClass(); } + WaterRenderObjClass *Hook_Ctor(); #endif virtual ~WaterRenderObjClass() override; From cdb800b8be1b3ab15b8b33ffa9c5efdbbefbdbe6 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Wed, 14 Feb 2024 00:09:46 +0100 Subject: [PATCH 7/8] Reduce includes in xfer.h to reduce compile time --- src/game/common/audio/audiomanager.cpp | 1 + src/game/common/system/xfer.cpp | 2 +- src/game/common/system/xfer.h | 19 ++++++++++++++----- src/game/common/system/xfercrc.cpp | 1 + .../object/helper/objectdefectionhelper.cpp | 1 + src/game/logic/object/update/laserupdate.h | 1 + .../object/update/mobmemberslavedupdate.h | 1 + .../client/drawable/draw/w3dropedraw.h | 1 + .../client/drawable/draw/w3dtracerdraw.h | 1 + 9 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/game/common/audio/audiomanager.cpp b/src/game/common/audio/audiomanager.cpp index 5d7a46414..84690eb54 100644 --- a/src/game/common/audio/audiomanager.cpp +++ b/src/game/common/audio/audiomanager.cpp @@ -16,6 +16,7 @@ #include "filesystem.h" #include "gamemusic.h" #include "gamesounds.h" +#include "matrix3d.h" #include "terrainlogic.h" #include "w3dview.h" #include diff --git a/src/game/common/system/xfer.cpp b/src/game/common/system/xfer.cpp index 1ebfe0fa8..86026ca6d 100644 --- a/src/game/common/system/xfer.cpp +++ b/src/game/common/system/xfer.cpp @@ -12,8 +12,8 @@ * A full copy of the GNU General Public License can be found in * LICENSE */ -#include "xfer.h" #include "bitflags.h" +#include "color.h" #include "endiantype.h" #include "gamestate.h" #include "matrix3d.h" diff --git a/src/game/common/system/xfer.h b/src/game/common/system/xfer.h index bd281a063..800611d74 100644 --- a/src/game/common/system/xfer.h +++ b/src/game/common/system/xfer.h @@ -15,18 +15,27 @@ #pragma once #include "asciistring.h" -#include "color.h" -#include "coord.h" #include "gametype.h" #include "kindof.h" -#include "matrix3d.h" #include "science.h" -#include "snapshot.h" -#include "unicodestring.h" #include #include template class BitFlags; +class Coord3D; +class Coord2D; +class ICoord2D; +class ICoord3D; +class IRegion2D; +class IRegion3D; +class Matrix3D; +class Region2D; +class Region3D; +class RGBColor; +class RGBAColorReal; +class RGBAColorInt; +class Utf16String; +class SnapShot; struct RealRange { diff --git a/src/game/common/system/xfercrc.cpp b/src/game/common/system/xfercrc.cpp index 3de17154a..91f65a1d0 100644 --- a/src/game/common/system/xfercrc.cpp +++ b/src/game/common/system/xfercrc.cpp @@ -14,6 +14,7 @@ */ #include "xfercrc.h" #include "endiantype.h" +#include "snapshot.h" // \brief Adds val to rotl m_crc void XferCRC::Add_CRC(uint32_t val) diff --git a/src/game/logic/object/helper/objectdefectionhelper.cpp b/src/game/logic/object/helper/objectdefectionhelper.cpp index dfe060826..f1d7e1f5e 100644 --- a/src/game/logic/object/helper/objectdefectionhelper.cpp +++ b/src/game/logic/object/helper/objectdefectionhelper.cpp @@ -15,6 +15,7 @@ #include "objectdefectionhelper.h" #include "audioeventrts.h" #include "audiomanager.h" +#include "color.h" #include "drawable.h" #include "gamelogic.h" diff --git a/src/game/logic/object/update/laserupdate.h b/src/game/logic/object/update/laserupdate.h index 02f0e188a..9cbd50e11 100644 --- a/src/game/logic/object/update/laserupdate.h +++ b/src/game/logic/object/update/laserupdate.h @@ -15,6 +15,7 @@ #pragma once #include "always.h" #include "clientupdatemodule.h" +#include "coord.h" #include "particlesysmanager.h" class LaserUpdateModuleData : public ModuleData diff --git a/src/game/logic/object/update/mobmemberslavedupdate.h b/src/game/logic/object/update/mobmemberslavedupdate.h index 8aebea535..6e698eac7 100644 --- a/src/game/logic/object/update/mobmemberslavedupdate.h +++ b/src/game/logic/object/update/mobmemberslavedupdate.h @@ -15,6 +15,7 @@ #pragma once #include "always.h" +#include "color.h" #include "updatemodule.h" class MobMemberSlavedUpdate : public UpdateModule, public SlavedUpdateInterface diff --git a/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h b/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h index 0806f4862..b28eedd6c 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h @@ -14,6 +14,7 @@ */ #pragma once #include "always.h" +#include "color.h" #include "w3dmodeldraw.h" class Line3DClass; diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h b/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h index 3565a5d81..9c5018d65 100644 --- a/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h +++ b/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h @@ -14,6 +14,7 @@ */ #pragma once #include "always.h" +#include "color.h" #include "w3dmodeldraw.h" class Line3DClass; From acacfd9fd5ce89f318419409132a102fa065b7aa Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Wed, 14 Feb 2024 00:13:44 +0100 Subject: [PATCH 8/8] Remove misc includes to reduce compile time --- src/game/common/audio/audioeventinfo.h | 1 - src/game/common/bitflags.cpp | 3 --- src/game/common/gamemain.cpp | 1 - src/game/logic/scriptengine/scriptparam.h | 1 - src/game/logic/system/gamelogic.h | 1 - src/w3d/renderer/rddesc.h | 4 ---- 6 files changed, 11 deletions(-) diff --git a/src/game/common/audio/audioeventinfo.h b/src/game/common/audio/audioeventinfo.h index 6f0739fe2..351f4fd35 100644 --- a/src/game/common/audio/audioeventinfo.h +++ b/src/game/common/audio/audioeventinfo.h @@ -14,7 +14,6 @@ */ #pragma once -#include "asciistring.h" #include "bitflags.h" #include "ini.h" #include "mempoolobj.h" diff --git a/src/game/common/bitflags.cpp b/src/game/common/bitflags.cpp index 2c13da8d4..dc9bc15d4 100644 --- a/src/game/common/bitflags.cpp +++ b/src/game/common/bitflags.cpp @@ -186,6 +186,3 @@ const char *BitFlags::s_bitNamesList[] = { "DISGUISED", nullptr, }; - -// TODO Temp to force instantiation. Fixes issue with Parameter::Read_Parameter. -// template class BitFlags; diff --git a/src/game/common/gamemain.cpp b/src/game/common/gamemain.cpp index 0de374783..350fd7773 100644 --- a/src/game/common/gamemain.cpp +++ b/src/game/common/gamemain.cpp @@ -13,7 +13,6 @@ * LICENSE */ #include "gamemain.h" -#include "bitflags.h" #include "disabledtypes.h" #include "main.h" #include "win32gameengine.h" diff --git a/src/game/logic/scriptengine/scriptparam.h b/src/game/logic/scriptengine/scriptparam.h index 9a9c7009d..a97995e55 100644 --- a/src/game/logic/scriptengine/scriptparam.h +++ b/src/game/logic/scriptengine/scriptparam.h @@ -15,7 +15,6 @@ #pragma once #include "always.h" -#include "asciistring.h" #include "bitflags.h" #include "coord.h" #include "datachunk.h" diff --git a/src/game/logic/system/gamelogic.h b/src/game/logic/system/gamelogic.h index 58e932c78..9792edf72 100644 --- a/src/game/logic/system/gamelogic.h +++ b/src/game/logic/system/gamelogic.h @@ -15,7 +15,6 @@ #pragma once #include "always.h" -#include "asciistring.h" #include "bitflags.h" #include "gametype.h" #include "rtsutils.h" diff --git a/src/w3d/renderer/rddesc.h b/src/w3d/renderer/rddesc.h index 7ea94d05e..29a5fd6c6 100644 --- a/src/w3d/renderer/rddesc.h +++ b/src/w3d/renderer/rddesc.h @@ -19,10 +19,6 @@ #include "w3dtypes.h" #include "wwstring.h" -#ifdef BUILD_WITH_D3D8 -#include -#endif - class ResolutionDescClass { public: