Refactoring

Sources/Jazz2.vcxproj

@@ -187,7 +187,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_HAS_EXCEPTIONS=0;DEATH_DEBUG;DEATH_TRACE;DEATH_TRACE_ASYNC;WITH_GLEW;WITH_GLFW;__WITH_SDL;WITH_AUDIO;WITH_THREADS;WITH_VORBIS;WITH_VORBIS_DYNAMIC;WITH_OPENMPT;WITH_ZLIB;WITH_BACKWARD;WITH_ANGELSCRIPT;WITH_MULTIPLAYER;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_HAS_EXCEPTIONS=0;DEATH_DEBUG;DEATH_TRACE;DEATH_TRACE_ASYNC;WITH_GLEW;__WITH_GLFW;WITH_SDL;WITH_AUDIO;WITH_THREADS;WITH_VORBIS;WITH_VORBIS_DYNAMIC;WITH_OPENMPT;WITH_ZLIB;WITH_BACKWARD;WITH_ANGELSCRIPT;WITH_MULTIPLAYER;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -317,7 +317,7 @@
     <ClInclude Include="$(ExtensionLibraryPath)\IO\Compression\DeflateStream.h" />
     <ClInclude Include="$(ExtensionLibraryPath)\IO\Compression\Lz4Stream.h" />
     <ClInclude Include="$(ExtensionLibraryPath)\IO\Compression\ZstdStream.h" />
-    <ClInclude Include="Common.h" />
+    <ClInclude Include="Main.h" />
     <ClInclude Include="Jazz2\Actors\ActorBase.h" />
     <ClInclude Include="Jazz2\Actors\Collectibles\CarrotCollectible.h" />
     <ClInclude Include="Jazz2\Actors\Collectibles\CarrotFlyCollectible.h" />
@@ -643,6 +643,7 @@
     <ClInclude Include="nCine\I18n.h" />
     <ClInclude Include="nCine\IAppEventHandler.h" />
     <ClInclude Include="nCine\Backends\GlfwInputManager.h" />
+    <ClInclude Include="nCine\imconfig.h" />
     <ClInclude Include="nCine\Input\IInputEventHandler.h" />
     <ClInclude Include="nCine\Input\IInputManager.h" />
     <ClInclude Include="nCine\Input\ImGuiJoyMappedInput.h" />
@@ -714,6 +715,7 @@
     <ClInclude Include="$(ExtensionLibraryPath)\Base\StackAlloc.h" />
     <ClInclude Include="$(ExtensionLibraryPath)\IO\BoundedFileStream.h" />
     <ClInclude Include="simdjson\simdjson.h" />
+    <ClInclude Include="TermLogo.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(ExtensionLibraryPath)\Cpu.cpp" />

Sources/Jazz2.vcxproj.filters

@@ -243,7 +243,7 @@
     <ClInclude Include="Resources.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common.h">
+    <ClInclude Include="Main.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="nCine\Graphics\IGfxCapabilities.h">
@@ -1548,6 +1548,12 @@
     <ClInclude Include="Jazz2\UI\InGameConsole.h">
       <Filter>Header Files\Jazz2\UI</Filter>
     </ClInclude>
+    <ClInclude Include="nCine\imconfig.h">
+      <Filter>Header Files\nCine</Filter>
+    </ClInclude>
+    <ClInclude Include="TermLogo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp">

Sources/Jazz2/Actors/Multiplayer/LocalPlayerOnServer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 #include "PlayerOnServer.h"
 

Sources/Jazz2/Actors/Multiplayer/PlayerOnServer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 #include "../Player.h"
 

Sources/Jazz2/Actors/Multiplayer/RemotablePlayer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 #include "../Player.h"
 

Sources/Jazz2/Actors/Multiplayer/RemoteActor.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 #include "../ActorBase.h"
 

Sources/Jazz2/Actors/Multiplayer/RemotePlayerOnServer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 #include "PlayerOnServer.h"
 

Sources/Jazz2/AnimState.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 
 namespace Jazz2
 {

Sources/Jazz2/Compatibility/AnimSetMapping.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 #include "JJ2Version.h"
 
 #include "../../nCine/Base/HashMap.h"

Sources/Jazz2/Compatibility/EventConverter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 #include "JJ2Event.h"
 #include "../EventType.h"
 

Sources/Jazz2/Compatibility/JJ2Anims.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 #include "JJ2Version.h"
 #include "AnimSetMapping.h"
 

Sources/Jazz2/Compatibility/JJ2Block.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 
 #include <Containers/StringView.h>
 #include <IO/Stream.h>

Sources/Jazz2/Compatibility/JJ2Data.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 #include "AnimSetMapping.h"
 #include "JJ2Version.h"
 

Sources/Jazz2/Compatibility/JJ2Episode.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 #include "JJ2Level.h"
 
 #include <memory>

Sources/Jazz2/Compatibility/JJ2Event.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 
 namespace Jazz2::Compatibility
 {

Sources/Jazz2/Compatibility/JJ2Level.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 #include "JJ2Block.h"
 #include "JJ2Event.h"
 #include "JJ2Version.h"

Sources/Jazz2/Compatibility/JJ2Strings.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 #include "JJ2Level.h"
 
 #include <Containers/SmallVector.h>

Sources/Jazz2/Compatibility/JJ2Tileset.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 #include "JJ2Block.h"
 #include "JJ2Version.h"
 

Sources/Jazz2/Compatibility/JJ2Version.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Common.h"
+#include "../../Main.h"
 
 namespace Jazz2::Compatibility
 {

Sources/Jazz2/ContentResolver.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 #include "AnimState.h"
 #include "GameDifficulty.h"
 #include "LevelDescriptor.h"

Sources/Jazz2/Direction.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 
 namespace Jazz2
 {

Sources/Jazz2/EventType.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 
 namespace Jazz2
 {

Sources/Jazz2/ExitType.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 
 namespace Jazz2
 {

Sources/Jazz2/GameDifficulty.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 
 namespace Jazz2
 {

Sources/Jazz2/IResumable.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 
 #include <IO/Stream.h>
 

Sources/Jazz2/IRootController.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 #include "LevelInitialization.h"
 
 #include <Containers/Function.h>

Sources/Jazz2/IStateHandler.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 #include "../nCine/Input/InputEvents.h"
 #include "../nCine/Primitives/Vector2.h"
 

Sources/Jazz2/LevelDescriptor.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 #include "WeatherType.h"
 
 #include "../nCine/Primitives/Vector4.h"

Sources/Jazz2/LevelFlags.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Common.h"
+#include "../Main.h"
 
 namespace Jazz2
 {

Sources/Jazz2/LevelHandler.cpp

@@ -4,7 +4,7 @@
 #include "UI/DiscordRpcClient.h"
 #include "UI/HUD.h"
 #include "UI/InGameConsole.h"
-#include "../Common.h"
+#include "../Main.h"
 
 #if defined(WITH_ANGELSCRIPT)
 #	include "Scripting/LevelScriptLoader.h"

Sources/Jazz2/Multiplayer/ConnectionResult.cpp

@@ -2,7 +2,7 @@
 
 #if defined(WITH_MULTIPLAYER)
 
-#include "../../Common.h"
+#include "../../Main.h"
 
 namespace Jazz2::Multiplayer
 {

Sources/Jazz2/Multiplayer/ConnectionResult.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 #include "Reason.h"
 

Sources/Jazz2/Multiplayer/INetworkHandler.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 #include "ConnectionResult.h"
 #include "Peer.h"
 #include "Reason.h"
-#include "../../Common.h"
+#include "../../Main.h"
 
 #include <Containers/StringView.h>
 

Sources/Jazz2/Multiplayer/MultiLevelHandler.cpp

@@ -7,7 +7,7 @@
 #include "../UI/ControlScheme.h"
 #include "../UI/HUD.h"
 #include "../UI/InGameConsole.h"
-#include "../../Common.h"
+#include "../../Main.h"
 
 #if defined(WITH_ANGELSCRIPT)
 #	include "../Scripting/LevelScriptLoader.h"

Sources/Jazz2/Multiplayer/MultiLevelHandler.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 #include "../LevelHandler.h"
 #include "MultiplayerGameMode.h"

Sources/Jazz2/Multiplayer/MultiplayerGameMode.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 namespace Jazz2::Multiplayer
 {

Sources/Jazz2/Multiplayer/NetworkManager.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 #include "Peer.h"
 #include "Reason.h"
 #include "ServerDiscovery.h"
-#include "../../Common.h"
+#include "../../Main.h"
 #include "../../nCine/Threading/Thread.h"
 #include "../../nCine/Threading/ThreadSync.h"
 

Sources/Jazz2/Multiplayer/PacketTypes.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
-#include "../../Common.h"
+#include "../../Main.h"
 
 namespace Jazz2::Multiplayer
 {

Sources/Jazz2/Multiplayer/Peer.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
-#include "../../Common.h"
+#include "../../Main.h"
 
 struct _ENetPeer;
 

Sources/Jazz2/Multiplayer/Reason.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
-#include "../../Common.h"
+#include "../../Main.h"
 
 namespace Jazz2::Multiplayer
 {

Sources/Jazz2/Multiplayer/ServerDiscovery.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#if defined(WITH_MULTIPLAYER)
+#if defined(WITH_MULTIPLAYER) || defined(DOXYGEN_GENERATING_OUTPUT)
 
 #include "INetworkHandler.h"
-#include "../../Common.h"
+#include "../../Main.h"
 #include "../../nCine/Base/TimeStamp.h"
 #include "../../nCine/Threading/Thread.h"