Skip to content

unify(debug): Merge and move GameEngine's Debug files to Core #1384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 2 commits into from
Aug 3, 2025
Merged

unify(debug): Merge and move GameEngine's Debug files to Core #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba35ee2
unify(debug): Merge GameEngine's Debug code (#1384)
xezon Jul 29, 2025
84951b9
unify(debug): Move GameEngine's Debug files to Core (#1384)
xezon Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set(GAMEENGINE_SRC
# Include/Common/CustomMatchPreferences.h
# Include/Common/DamageFX.h
# Include/Common/DataChunk.h
# Include/Common/Debug.h
Include/Common/Debug.h
# Include/Common/Dict.h
# Include/Common/Directory.h
# Include/Common/DisabledTypes.h
Expand Down Expand Up @@ -637,7 +637,7 @@ set(GAMEENGINE_SRC
# Source/Common/System/CDManager.cpp
# Source/Common/System/CriticalSection.cpp
# Source/Common/System/DataChunk.cpp
# Source/Common/System/Debug.cpp
Source/Common/System/Debug.cpp
# Source/Common/System/Directory.cpp
# Source/Common/System/DisabledTypes.cpp
# Source/Common/System/encrypt.cpp
Expand Down
0 ...MD/Code/GameEngine/Include/Common/Debug.h → Core/GameEngine/Include/Common/Debug.h
View file
Open in desktop
File renamed without changes.
10 changes: 2 additions & 8 deletions ...GameEngine/Source/Common/System/Debug.cpp → ...GameEngine/Source/Common/System/Debug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ void DebugCrash(const char *format, ...)
if (useLogging)
{
#ifdef DEBUG_LOGGING
if (ignoringAsserts())
if (ignoringAsserts())
{
doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!");
}
Expand Down Expand Up @@ -728,13 +728,6 @@ void ReleaseCrash(const char *reason)
ShowWindow(ApplicationHWnd, SW_HIDE);
}
}
//#if defined(RTS_DEBUG)
// /* static */ char buff[8192]; // not so static so we can be threadsafe
// snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason);/
// ::MessageBox(NULL, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
//#else
// ::MessageBox(NULL, "Sorry, a serious error occurred.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
//#endif

char prevbuf[ _MAX_PATH ];
char curbuf[ _MAX_PATH ];
Expand Down Expand Up @@ -772,6 +765,7 @@ void ReleaseCrash(const char *reason)
ShowWindow(ApplicationHWnd, SW_HIDE);
}
}

#if defined(RTS_DEBUG)
/* static */ char buff[8192]; // not so static so we can be threadsafe
snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason);
Expand Down
3 changes: 1 addition & 2 deletions Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ void WWDebug_DBWin32_Message_Handler( const char * message);
** WWDEBUG_SAY(("dir = %f",dir));
*/

// TheSuperHackers @compile feliwir 12/04/2025 Both Debug headers are identical. Use ZH.
#include "../../../../../GeneralsMD/Code/GameEngine/Include/Common/Debug.h"
#include "../../../../../Core/GameEngine/Include/Common/Debug.h"

#ifdef DEBUG_LOGGING
#define WWDEBUG_SAY(x) DEBUG_LOG(x)
Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set(GAMEENGINE_SRC
Include/Common/CustomMatchPreferences.h
Include/Common/DamageFX.h
Include/Common/DataChunk.h
Include/Common/Debug.h
# Include/Common/Debug.h
Include/Common/Dict.h
Include/Common/Directory.h
Include/Common/DisabledTypes.h
Expand Down Expand Up @@ -594,7 +594,7 @@ set(GAMEENGINE_SRC
Source/Common/System/CDManager.cpp
Source/Common/System/CriticalSection.cpp
Source/Common/System/DataChunk.cpp
Source/Common/System/Debug.cpp
# Source/Common/System/Debug.cpp
Source/Common/System/Directory.cpp
Source/Common/System/DisabledTypes.cpp
Source/Common/System/encrypt.cpp
Expand Down
258 changes: 0 additions & 258 deletions Generals/Code/GameEngine/Include/Common/Debug.h
View file
Open in desktop

This file was deleted.

Loading
Loading