From 2b1ef5f4f28f73d1952448f6055adcc989d46aab Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 12 Apr 2020 11:02:05 +0300 Subject: [PATCH] - common fixes for compilation with GCC and Clang --- src/common/console/c_dispatch.cpp | 2 +- src/common/objects/dobjtype.h | 2 ++ src/common/textures/formats/multipatchtexture.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/console/c_dispatch.cpp b/src/common/console/c_dispatch.cpp index db1d6e25b2..03f3ebd461 100644 --- a/src/common/console/c_dispatch.cpp +++ b/src/common/console/c_dispatch.cpp @@ -486,7 +486,7 @@ void FUnsafeConsoleCommand::Run(FCommandLine &args, int key) { if (UnsafeExecutionContext) { - Printf(TEXTCOLOR_RED "Cannot execute unsafe command " TEXTCOLOR_GOLD "%s\n", m_Name); + Printf(TEXTCOLOR_RED "Cannot execute unsafe command " TEXTCOLOR_GOLD "%s\n", m_Name.GetChars()); return; } diff --git a/src/common/objects/dobjtype.h b/src/common/objects/dobjtype.h index db0893b141..16adbf72fc 100644 --- a/src/common/objects/dobjtype.h +++ b/src/common/objects/dobjtype.h @@ -5,6 +5,8 @@ #error You must #include "dobject.h" to get dobjtype.h #endif +#include + typedef std::pair FTypeAndOffset; #if 0 diff --git a/src/common/textures/formats/multipatchtexture.h b/src/common/textures/formats/multipatchtexture.h index f9f5913e1d..190cd49b75 100644 --- a/src/common/textures/formats/multipatchtexture.h +++ b/src/common/textures/formats/multipatchtexture.h @@ -7,6 +7,8 @@ #include "image.h" class FImageTexture; +class FTextureManager; + //========================================================================== // // TexPart is the data that will get passed to the final texture.