Fix issues with unity compile

CMakeLists.txt

@@ -165,7 +165,7 @@ add_subdirectory(modules)
 if (EnableCotire)
     set_target_properties(cathook PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${CMAKE_SOURCE_DIR}/include/common.hpp")
     set_target_properties(cathook PROPERTIES COTIRE_ADD_UNITY_BUILD true)
-    set_target_properties(cathook PROPERTIES COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES 30)
+    set_target_properties(cathook PROPERTIES COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES -j4)
     set_source_files_properties(${ignore_files} PROPERTIES COTIRE_EXCLUDED true)
     cotire(cathook)
 endif()

src/hacks/AntiDisguise.cpp

@@ -8,11 +8,10 @@
 #include <settings/Bool.hpp>
 #include "common.hpp"
 
-static settings::Boolean enable{ "remove.disguise", "0" };
-static settings::Boolean no_invisibility{ "remove.cloak", "0" };
-
 namespace hacks::tf2::antidisguise
 {
+static settings::Boolean enable{ "remove.disguise", "0" };
+static settings::Boolean no_invisibility{ "remove.cloak", "0" };
 
 void cm()
 {

src/settings/SettingCommands.cpp

@@ -12,6 +12,8 @@
   Created on 29.07.18.
 */
 
+namespace settings::commands {
+
 static void getAndSortAllConfigs();
 
 static CatCommand cat("cat", "", [](const CCommand &args) {
@@ -311,3 +313,4 @@ static InitRoutine init([]() {
     save.cmd->m_bHasCompletionCallback = true;
     save.cmd->m_fnCompletionCallback   = save_CompletionCallback;
 });
+}

src/visual/EffectChams.cpp

@@ -11,6 +11,8 @@
 #include "common.hpp"
 #include "Backtrack.hpp"
 
+namespace effect_chams
+{
 static settings::Boolean flat{ "chams.flat", "false" };
 static settings::Boolean health{ "chams.health", "false" };
 static settings::Boolean teammates{ "chams.show.teammates", "false" };
@@ -28,9 +30,6 @@ static settings::Boolean chamsself{ "chams.self", "true" };
 static settings::Boolean rainbow{ "chams.self-rainbow", "true" };
 static settings::Boolean disco_chams{ "chams.disco", "false" };
 
-namespace effect_chams
-{
-
 settings::Boolean enable{ "chams.enable", "false" };
 CatCommand fix_black_chams("fix_black_chams", "Fix Black Chams", []() {
     effect_chams::g_EffectChams.Shutdown();

src/visual/EffectGlow.cpp

@@ -11,22 +11,6 @@
 #include <settings/Bool.hpp>
 #include "common.hpp"
 
-static settings::Boolean health{ "glow.health", "false" };
-static settings::Boolean teammates{ "glow.show.teammates", "false" };
-static settings::Boolean players{ "glow.show.players", "true" };
-static settings::Boolean medkits{ "glow.show.medkits", "false" };
-static settings::Boolean ammobox{ "glow.show.ammoboxes", "false" };
-static settings::Boolean buildings{ "glow.show.buildings", "true" };
-static settings::Boolean stickies{ "glow.show.stickies", "true" };
-static settings::Boolean teammate_buildings{ "glow.show.teammate-buildings", "false" };
-static settings::Boolean show_powerups{ "glow.show.powerups", "true" };
-static settings::Boolean weapons_white{ "glow.white-weapons", "true" };
-static settings::Boolean glowself{ "glow.self", "true" };
-static settings::Boolean rainbow{ "glow.self-rainbow", "true" };
-static settings::Int blur_scale{ "glow.blur-scale", "5" };
-// https://puu.sh/vobH4/5da8367aef.png
-static settings::Int solid_when{ "glow.solid-when", "0" };
-
 IMaterialSystem *materials = nullptr;
 
 CScreenSpaceEffectRegistration *CScreenSpaceEffectRegistration::s_pHead = NULL;
@@ -44,6 +28,22 @@ CScreenSpaceEffectRegistration::CScreenSpaceEffectRegistration(const char *pName
 
 namespace effect_glow
 {
+
+static settings::Boolean health{ "glow.health", "false" };
+static settings::Boolean teammates{ "glow.show.teammates", "false" };
+static settings::Boolean players{ "glow.show.players", "true" };
+static settings::Boolean medkits{ "glow.show.medkits", "false" };
+static settings::Boolean ammobox{ "glow.show.ammoboxes", "false" };
+static settings::Boolean buildings{ "glow.show.buildings", "true" };
+static settings::Boolean stickies{ "glow.show.stickies", "true" };
+static settings::Boolean teammate_buildings{ "glow.show.teammate-buildings", "false" };
+static settings::Boolean show_powerups{ "glow.show.powerups", "true" };
+static settings::Boolean weapons_white{ "glow.white-weapons", "true" };
+static settings::Boolean glowself{ "glow.self", "true" };
+static settings::Boolean rainbow{ "glow.self-rainbow", "true" };
+static settings::Int blur_scale{ "glow.blur-scale", "5" };
+// https://puu.sh/vobH4/5da8367aef.png
+static settings::Int solid_when{ "glow.solid-when", "0" };
 settings::Boolean enable{ "glow.enable", "false" };
 
 struct ShaderStencilState_t

src/visual/EventLogging.cpp

@@ -10,6 +10,9 @@
 #include <init.hpp>
 #include "KeyValues.h"
 
+
+namespace event_logging
+{
 static settings::Boolean enable{ "chat.log-events", "false" };
 static settings::Boolean event_hurt{ "chat.log-events.hurt", "false" };
 static settings::Boolean event_connect{ "chat.log-events.joining", "true" };
@@ -252,8 +255,9 @@ static LoggingEventListener event_listener{};
 
 InitRoutine init([]() { g_IGameEventManager->AddListener(&event_listener, false); });
 
-bool event_logging::isEnabled()
+bool isEnabled()
 {
     return *enable;
 }
+}
 #endif

src/visual/picopng.cpp

@@ -1,4 +1,5 @@
 #include <vector>
+#include "picopng.hpp"
 
 /*
 decodePNG: The picoPNG function, decodes a PNG file buffer in memory, into a raw pixel buffer.
@@ -20,7 +21,7 @@ convert_to_rgba32: optional parameter, true by default.
   works for trusted PNG files. Use LodePNG instead of picoPNG if you need this information.
 return: 0 if success, not 0 if some error occured.
 */
-int decodePNG(unsigned char *&out_image, int &image_width, int &image_height, const unsigned char *in_png, size_t in_size, bool convert_to_rgba32 = true)
+int decodePNG(unsigned char *&out_image, int &image_width, int &image_height, const unsigned char *in_png, size_t in_size, bool convert_to_rgba32)
 {
     // picoPNG version 20101224
     // Copyright (c) 2005-2010 Lode Vandevenne