Merge pull request #3277 from IntelOrca/refactor-twitch

Refactor and clean up twitch.cpp

openrct2.vcxproj

@@ -30,6 +30,8 @@
     <ClCompile Include="src\cmdline_sprite.c" />
     <ClCompile Include="src\config.c" />
     <ClCompile Include="src\core\Console.cpp" />
+    <ClCompile Include="src\core\Diagnostics.cpp" />
+    <ClCompile Include="src\core\Guard.cpp" />
     <ClCompile Include="src\core\Json.cpp" />
     <ClCompile Include="src\core\Path.cpp" />
     <ClCompile Include="src\core\Stopwatch.cpp" />
@@ -394,4 +396,4 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>

openrct2.vcxproj.filters

@@ -576,6 +576,12 @@
     <ClCompile Include="src\core\textinputbuffer.c">
       <Filter>Source\Core</Filter>
     </ClCompile>
+    <ClCompile Include="src\core\Diagnostics.cpp">
+      <Filter>Source\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="src\core\Guard.cpp">
+      <Filter>Source\Core</Filter>
+    </ClCompile>
     <ClCompile Include="src\platform\crash.cpp">
       <Filter>Source\Platform</Filter>
     </ClCompile>
@@ -583,7 +589,7 @@
       <Filter>Source\Core</Filter>
     </ClCompile>
     <ClCompile Include="src\windows\themes.c">
-      <Filter>Source\Interface</Filter>
+      <Filter>Source\Windows</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>

src/core/Diagnostics.cpp

@@ -0,0 +1,22 @@
+#include <SDL_platform.h>
+
+#if defined(DEBUG) && defined(__WINDOWS__)
+    #define WIN32_LEAN_AND_MEAN
+    #include <windows.h>
+#endif
+
+#include "Diagnostics.hpp"
+
+namespace Debug
+{
+    void Break()
+    {
+#if DEBUG
+#if __WINDOWS__
+        if (IsDebuggerPresent()) {
+            DebugBreak();
+        }
+#endif
+#endif
+    }
+}

src/core/Diagnostics.hpp

@@ -1,22 +1,9 @@
 #pragma once
 
-#if _WIN32
-#include <debugapi.h>
-#endif
-
 /**
  * Utility methods for asserting and logging.
  */
 namespace Debug
 {
-	void Break()
-	{
-#if DEBUG
-#if _WIN32
-		if (IsDebuggerPresent()) {
-			DebugBreak();
-		}
-#endif
-#endif
-	}
+    void Break();
 }

src/core/Guard.cpp

@@ -0,0 +1,24 @@
+#include <cassert>
+#include <stdio.h>
+
+#include "Console.hpp"
+#include "Diagnostics.hpp"
+#include "Guard.hpp"
+
+namespace Guard
+{
+    void Assert(bool expression, const char * message)
+    {
+        if (expression) return;
+
+        if (message != nullptr)
+        {
+            Console::Error::WriteLine(message);
+        }
+
+#if DEBUG
+        Debug::Break();
+#endif
+        assert(false);
+    }
+}

src/core/Guard.hpp

@@ -1,30 +1,11 @@
 #pragma once
 
-#include <cassert>
-#include <stdio.h>
-
-#include "Console.hpp"
-#include "Diagnostics.hpp"
-
 /**
  * Utility methods for asserting function parameters.
  */
 namespace Guard
 {
-    void Assert(bool expression, const char * message = nullptr)
-    {
-        if (expression) return;
-
-        if (message != nullptr)
-        {
-            Console::Error::WriteLine(message);
-        }
-
-#if DEBUG
-        Debug::Break();
-#endif
-        assert(false);
-    }
+    void Assert(bool expression, const char * message = nullptr);
 
     template<typename T>
     void ArgumentNotNull(T * argument, const char * message = nullptr)