From 2c441fbede79cffd0981b14c8a8860a5deda14a0 Mon Sep 17 00:00:00 2001 From: Shinovon Date: Fri, 1 May 2026 12:14:15 +0500 Subject: [PATCH] Logs --- src/core/common.h | 4 ++-- src/core/re3.cpp | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/core/common.h b/src/core/common.h index d8e795b..f781b76 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -354,7 +354,7 @@ __inline__ void TRACE(char *f, ...) { } // this is re3 only, and so the function #else #define debug(f, ...) re3_debug("[DBG]: " f, ## __VA_ARGS__) #define Error(f, ...) re3_debug("[ERROR]: " f, ## __VA_ARGS__) -#ifndef MASTER +#if !defined MASTER || defined LOGS #define TRACE(f, ...) re3_trace(__FILE__, __LINE__, __FUNCTION__, f, ## __VA_ARGS__) #define USERERROR(f, ...) re3_usererror(f, ## __VA_ARGS__) #else @@ -367,7 +367,7 @@ __inline__ void TRACE(char *f, ...) { } // this is re3 only, and so the function #undef ASSERT #endif -#ifndef MASTER +#if !defined MASTER || defined LOGS #define assert(_Expression) (void)( (!!(_Expression)) || (re3_assert(#_Expression, __FILE__, __LINE__, __FUNCTION__), 0) ) #else #define assert(_Expression) (_Expression) diff --git a/src/core/re3.cpp b/src/core/re3.cpp index fd6f437..885a08a 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -1105,12 +1105,12 @@ extern bool gbRenderWorld2; #endif #ifndef __MWERKS__ -#ifndef MASTER +#if !defined MASTER || defined LOGS const int re3_buffsize = 1024; static char re3_buff[re3_buffsize]; #endif -#ifndef MASTER +#if !defined MASTER || defined LOGS void re3_assert(const char *expr, const char *filename, unsigned int lineno, const char *func) { #ifdef _WIN32 @@ -1166,9 +1166,13 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con } #endif +#ifdef LOGS_RDEBUG +extern "C" void RDebug_Printf(const char*, ...); +#endif + void re3_debug(const char *format, ...) { -#ifndef MASTER +#if !defined MASTER || defined LOGS va_list va; va_start(va, format); #ifdef _WIN32 @@ -1179,11 +1183,15 @@ void re3_debug(const char *format, ...) va_end(va); printf("%s", re3_buff); +#ifdef LOGS_RDEBUG + RDebug_Printf("%s", re3_buff); +#else CDebug::DebugAddText(re3_buff); #endif +#endif } -#ifndef MASTER +#if !defined MASTER || defined LOGS void re3_trace(const char *filename, unsigned int lineno, const char *func, const char *format, ...) { char buff[re3_buffsize *2]; @@ -1205,7 +1213,7 @@ void re3_trace(const char *filename, unsigned int lineno, const char *func, cons } #endif -#ifndef MASTER +#if !defined MASTER || defined LOGS void re3_usererror(const char *format, ...) { va_list va;