From 3f50736e486fe9e2f74b5f953e75a76b406b2ab2 Mon Sep 17 00:00:00 2001 From: Amos <48657826+Mauler125@users.noreply.github.com> Date: Sat, 22 Jan 2022 15:42:35 +0100 Subject: [PATCH] Light cleanup --- r5dev/core/dllmain.cpp | 4 ++-- r5dev/core/r5dev.h | 14 +++++++------- r5dev/engine/sys_dll.cpp | 2 +- r5dev/public/utility.cpp | 4 ++-- r5dev/sdklauncher/sdklauncher.cpp | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/r5dev/core/dllmain.cpp b/r5dev/core/dllmain.cpp index 0d865211..fd7aa57e 100644 --- a/r5dev/core/dllmain.cpp +++ b/r5dev/core/dllmain.cpp @@ -34,8 +34,8 @@ void R5Dev_Init() spdlog::info("\n"); for (int i = 0; i < (&R5R_LOGO)[1] - R5R_LOGO; i++) { - std::string unescaped = StringEscape(R5R_LOGO[i]); - spdlog::info("{}{}{}\n", g_svRedF.c_str(), unescaped.c_str(), g_svReset.c_str()); + std::string svEscaped = StringEscape(R5R_LOGO[i]); + spdlog::info("{}{}{}\n", g_svRedF.c_str(), svEscaped.c_str(), g_svReset.c_str()); } spdlog::info("\n"); } diff --git a/r5dev/core/r5dev.h b/r5dev/core/r5dev.h index a2d6f2f5..25de6e43 100644 --- a/r5dev/core/r5dev.h +++ b/r5dev/core/r5dev.h @@ -11,11 +11,11 @@ __declspec(dllexport) void DummyExport() const std::string R5R_LOGO[] = { - R"(+-----------------------------------------------------------------+)", - R"(| ___ ___ ___ _ _ _ ___ __ ___ |)", - R"(| | _ \ __| _ \___| |___ __ _ __| |___ __| | __ _|_ ) / \| _ ) |)", - R"(| | /__ \ / -_) / _ \/ _` / _` / -_) _` | \ V // / | () | _ \ |)", - R"(| |_|_\___/_|_\___|_\___/\__,_\__,_\___\__,_| \_//___(_)__/|___/ |)", - R"(| |)", - R"(+-----------------------------------------------------------------+)" + R"(+---------------------------------------------------------------------+)", + R"(| ___ ___ ___ _ _ _ ___ __ _ _ |)", + R"(| | _ \ __| _ \___| |___ __ _ __| |___ __| | __ _|_ ) / \ / | |__ |)", + R"(| | /__ \ / -_) / _ \/ _` / _` / -_) _` | \ V // / | () || | '_ \ |)", + R"(| |_|_\___/_|_\___|_\___/\__,_\__,_\___\__,_| \_//___(_)__(_)_|_.__/ |)", + R"(| |)", + R"(+---------------------------------------------------------------------+)" }; diff --git a/r5dev/engine/sys_dll.cpp b/r5dev/engine/sys_dll.cpp index 32ad375b..0282c864 100644 --- a/r5dev/engine/sys_dll.cpp +++ b/r5dev/engine/sys_dll.cpp @@ -7,7 +7,7 @@ //----------------------------------------------------------------------------- int HSys_Error_Internal(char* fmt, va_list args) { - printf("\n______________________________________________________________\n"); + printf("\n_______________________________________________________________\n"); printf("] ENGINE ERROR ################################################\n"); vprintf(fmt, args); diff --git a/r5dev/public/utility.cpp b/r5dev/public/utility.cpp index 72fdc3bb..73a2b517 100644 --- a/r5dev/public/utility.cpp +++ b/r5dev/public/utility.cpp @@ -341,7 +341,7 @@ std::string StringEscape(const std::string& input) { switch (c) { - case '\'': results += "\\'"; break; + //case '\'': results += "\\'"; break; case '\a': results += "\\a"; break; case '\b': results += "\\b"; break; case '\f': results += "\\f"; break; @@ -365,7 +365,7 @@ std::string StringUnescape(const std::string& input) { switch (c) { - case '\\': results += "\'"; break; + //case '\\': results += "\'"; break; case '\\a': results += "\a"; break; case '\\b': results += "\b"; break; case '\\f': results += "\f"; break; diff --git a/r5dev/sdklauncher/sdklauncher.cpp b/r5dev/sdklauncher/sdklauncher.cpp index dbc6f9a7..fcb58505 100644 --- a/r5dev/sdklauncher/sdklauncher.cpp +++ b/r5dev/sdklauncher/sdklauncher.cpp @@ -248,8 +248,8 @@ int main(int argc, char* argv[], char* envp[]) { try { - eLaunchMode iinput = (eLaunchMode)std::stoi(input); - switch (iinput) + eLaunchMode mode = (eLaunchMode)std::stoi(input); + switch (mode) { case eLaunchMode::LM_DEBUG_GAME: {