Move dbg to own file

Author: ChillerDragon

src/bots/base.h

@@ -5,6 +5,7 @@
 
 #include <twbl/hotreload.h>
 #include <twbl/teeworlds/base/color.h>
+#include <twbl/teeworlds/base/dbg.h>
 #include <twbl/teeworlds/base/system.h>
 #include <twbl/teeworlds/base/vmath.h>
 #include <twbl/teeworlds/character.h>

src/test/mock_callback_ctx.cpp

@@ -1,4 +1,5 @@
 #include <twbl/callback_ctx.h>
+#include <twbl/teeworlds/base/dbg.h>
 #include <twbl/teeworlds/base/system.h>
 
 #include "mock_callback_ctx.h"

src/twbl/teeworlds/base/dbg.cpp

@@ -0,0 +1,49 @@
+#include <cstdarg>
+#include <twbl/teeworlds/base/system.h>
+
+void dbg_break()
+{
+#ifdef __GNUC__
+	__builtin_trap();
+#else
+	abort();
+#endif
+}
+
+void dbg_msg(const char *sys, const char *fmt, ...)
+{
+	va_list args;
+	char str[1024 * 4];
+	char *msg;
+	int i, len;
+
+	char timestr[80];
+	str_timestamp_format(timestr, sizeof(timestr), FORMAT_SPACE);
+
+	str_format(str, sizeof(str), "[%s][%s]: ", timestr, sys);
+
+	len = str_length(str);
+	msg = (char *)str + len;
+
+	va_start(args, fmt);
+#if defined(CONF_FAMILY_WINDOWS) && !defined(__GNUC__)
+	_vsprintf_p(msg, sizeof(str) - len, fmt, args);
+#else
+	vsnprintf(msg, sizeof(str) - len, fmt, args);
+#endif
+	va_end(args);
+
+	puts(str);
+}
+
+void dbg_assert_imp(const char *filename, int line, bool test, const char *msg)
+{
+	if(!test)
+	{
+		fprintf(stderr, "assert: %s(%d): %s\n", filename, line, msg);
+		dbg_break();
+	}
+}
+
+#define dbg_assert(test, msg) dbg_assert_imp(__FILE__, __LINE__, test, msg)
+void dbg_assert_imp(const char *filename, int line, bool test, const char *msg);

src/twbl/teeworlds/base/dbg.h

@@ -0,0 +1,50 @@
+#ifndef TWBL_SRC_TWBL_TEEWORLDS_BASE_DBG_H
+#define TWBL_SRC_TWBL_TEEWORLDS_BASE_DBG_H
+
+#if __has_include(<base/dbg.h>)
+#include <base/dbg.h>
+#elif __has_include(<base/system.h>)
+#include <base/system.h>
+#else
+
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+
+#include <twbl/teeworlds/base/detect.h>
+
+#ifdef CONF_FAMILY_UNIX
+#include <sys/stat.h>
+#endif
+
+#ifdef CONF_FAMILY_WINDOWS
+#define NOMINMAX
+#include <windows.h>
+
+#include <string>
+#endif
+
+#ifdef __GNUC__
+#define GNUC_ATTRIBUTE(x) __attribute__(x)
+#else
+#define GNUC_ATTRIBUTE(x)
+#endif
+
+void dbg_msg(const char *sys, const char *fmt, ...)
+	GNUC_ATTRIBUTE((format(printf, 2, 3)));
+
+void dbg_break();
+void dbg_assert_imp(const char *filename, int line, bool test, const char *msg);
+
+void dbg_assert(int test, const char *msg);
+#define dbg_assert(test, msg) dbg_assert_imp(__FILE__, __LINE__, test, msg)
+
+#define dbg_assert(test, msg) dbg_assert_imp(__FILE__, __LINE__, test, msg)
+void dbg_assert_imp(const char *filename, int line, bool test, const char *msg);
+
+#if defined(CONF_FAMILY_WINDOWS)
+std::wstring windows_utf8_to_wide(const char *str);
+#endif
+
+#endif // __has_include(<base/system.h>)
+#endif // TWBL_SRC_TWBL_TEEWORLDS_BASE_DBG_H

src/twbl/teeworlds/base/system.cpp

@@ -8,6 +8,7 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cstring>
+#include <twbl/teeworlds/base/dbg.h>
 
 #include "system.h"
 
@@ -96,53 +97,6 @@ void str_truncate(char *dst, int dst_size, const char *src, int truncation_len)
 	str_copy(dst, src, size);
 }
 
-void dbg_break()
-{
-#ifdef __GNUC__
-	__builtin_trap();
-#else
-	abort();
-#endif
-}
-
-void dbg_msg(const char *sys, const char *fmt, ...)
-{
-	va_list args;
-	char str[1024 * 4];
-	char *msg;
-	int i, len;
-
-	char timestr[80];
-	str_timestamp_format(timestr, sizeof(timestr), FORMAT_SPACE);
-
-	str_format(str, sizeof(str), "[%s][%s]: ", timestr, sys);
-
-	len = str_length(str);
-	msg = (char *)str + len;
-
-	va_start(args, fmt);
-#if defined(CONF_FAMILY_WINDOWS) && !defined(__GNUC__)
-	_vsprintf_p(msg, sizeof(str) - len, fmt, args);
-#else
-	vsnprintf(msg, sizeof(str) - len, fmt, args);
-#endif
-	va_end(args);
-
-	puts(str);
-}
-
-void dbg_assert_imp(const char *filename, int line, bool test, const char *msg)
-{
-	if(!test)
-	{
-		fprintf(stderr, "assert: %s(%d): %s\n", filename, line, msg);
-		dbg_break();
-	}
-}
-
-#define dbg_assert(test, msg) dbg_assert_imp(__FILE__, __LINE__, test, msg)
-void dbg_assert_imp(const char *filename, int line, bool test, const char *msg);
-
 #if defined(CONF_FAMILY_WINDOWS)
 static inline time_t filetime_to_unixtime(LPFILETIME filetime)
 {

src/twbl/teeworlds/base/system.h

@@ -62,18 +62,6 @@ void str_copy(char (&dst)[N], const char *src)
 
 void str_truncate(char *dst, int dst_size, const char *src, int truncation_len);
 
-void dbg_msg(const char *sys, const char *fmt, ...)
-	GNUC_ATTRIBUTE((format(printf, 2, 3)));
-
-void dbg_break();
-void dbg_assert_imp(const char *filename, int line, bool test, const char *msg);
-
-void dbg_assert(int test, const char *msg);
-#define dbg_assert(test, msg) dbg_assert_imp(__FILE__, __LINE__, test, msg)
-
-#define dbg_assert(test, msg) dbg_assert_imp(__FILE__, __LINE__, test, msg)
-void dbg_assert_imp(const char *filename, int line, bool test, const char *msg);
-
 #if defined(CONF_FAMILY_WINDOWS)
 std::wstring windows_utf8_to_wide(const char *str);
 #endif

src/twbl/teeworlds/character.cpp

@@ -0,0 +1,15 @@
+#if __has_include(<game/server/entities/character.h>)
+#include <engine/shared/protocol.h>
+#include <game/server/entities/character.h>
+#include <game/server/player.h>
+#else
+
+#include <twbl/teeworlds/base/dbg.h>
+#include <twbl/teeworlds/character.h>
+
+int CCharacter::GetCid()
+{
+	dbg_assert(m_ClientId != -1, "client id is not set");
+	return m_ClientId;
+}
+#endif

src/twbl/teeworlds/character.h

@@ -28,12 +28,7 @@ class CCharacter
 	CCharacterCore m_Core;
 
 	int m_ClientId = -1;
-	int GetCid()
-	{
-		dbg_assert(m_ClientId != -1, "client id is not set");
-		return m_ClientId;
-	}
-
+	int GetCid();
 	vec2 GetPos() const { return m_Pos; }
 	bool IsGrounded() const { return m_IsGrounded; }
 

src/twbl/tracer.cpp

@@ -1,3 +1,4 @@
+#include <twbl/teeworlds/base/dbg.h>
 #include <twbl/teeworlds/base/system.h>
 
 #include "tracer.h"