diff --git a/ddebug/CMakeLists.txt b/ddebug/CMakeLists.txt index 82d18a28..a13dbba8 100644 --- a/ddebug/CMakeLists.txt +++ b/ddebug/CMakeLists.txt @@ -3,7 +3,6 @@ set(HEADERS debugbreak.h mono.h) set(CPPS - debug.cpp $<$: lnxdebug.cpp lnxmono.cpp diff --git a/ddebug/debug.cpp b/ddebug/debug.cpp deleted file mode 100644 index 1696427b..00000000 --- a/ddebug/debug.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Descent 3 - * Copyright (C) 2024 Parallax Software - * Copyright (C) 2024 Descent Developers - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include - -#include "debug.h" - -void Debug_LogClose(); - -FILE *Debug_logfile = nullptr; - -bool Debug_Logfile(const char *filename) { - if (Debug_logfile == nullptr) { - Debug_logfile = fopen(filename, "w"); - if (Debug_logfile == nullptr) { - Debug_MessageBox(OSMBOX_OK, "Debug", "FYI Logfile couldn't be created."); - return false; - } - atexit(Debug_LogClose); - } - Debug_LogWrite("BEGINNING LOG\n\n"); - - return true; -} - -void Debug_LogWrite(const char *str) { - if (Debug_logfile) - fwrite(str, strlen(str), 1, Debug_logfile); -} - -void Debug_LogClose() { - if (Debug_logfile) { - Debug_LogWrite("\nEND LOG"); - fclose(Debug_logfile); - Debug_logfile = nullptr; - } -} diff --git a/ddebug/debug.h b/ddebug/debug.h index 988c7322..921c1daf 100644 --- a/ddebug/debug.h +++ b/ddebug/debug.h @@ -162,8 +162,6 @@ int Debug_ErrorBox(int type, const char *topstring, const char *title, const cha int Debug_MessageBox(int type, const char *title, const char *str); // these functions deal with debug spew support -bool Debug_Logfile(const char *filename); -void Debug_LogWrite(const char *str); void Debug_ConsolePrintf(int n, const char *format, ...); void Debug_ConsolePrintfAt(int n, int row, int col, const char *format, ...); diff --git a/ddebug/lnxmono.cpp b/ddebug/lnxmono.cpp index e52fc577..1ca5da65 100644 --- a/ddebug/lnxmono.cpp +++ b/ddebug/lnxmono.cpp @@ -59,16 +59,8 @@ void Debug_ConsolePrintf(int n, const char *format, ...) { std::vsnprintf(Mono_buffer, MAX_MONO_LENGTH, format, marker); va_end(marker); - Debug_LogWrite(Mono_buffer); - if (n == 0) { printf("%s", Mono_buffer); - - int end = strlen(Mono_buffer) - 1; - if ((end > 1) && (Mono_buffer[end] != 0x0a) && (Mono_buffer[end] != 0x0d)) { - printf("\n"); - Debug_LogWrite("\n"); - } } } diff --git a/ddebug/winmono.cpp b/ddebug/winmono.cpp index 53633c2d..a10179f9 100644 --- a/ddebug/winmono.cpp +++ b/ddebug/winmono.cpp @@ -22,7 +22,6 @@ #include #include -#include #include "debug.h" #include "mono.h" @@ -44,8 +43,6 @@ void Debug_ConsolePrintf(int n, const char *format, ...) { return; } - Debug_LogWrite(Mono_buffer); - if (n == 0) { OutputDebugString(Mono_buffer); }