From 918d121d9967e492a3c97f897226f700143454da Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 25 Oct 2019 02:07:46 +0200 Subject: [PATCH] - fixed missing include paths --- source/CMakeLists.txt | 2 + source/common/2d/v_drawtext.cpp | 2 +- source/common/fonts/hexfont.cpp | 2 +- source/common/fonts/v_text.h | 89 --------------------------------- source/common/utility/printf.h | 2 +- 5 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 source/common/fonts/v_text.h diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 37ff46e88..3fcb6fb7f 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -885,6 +885,8 @@ include_directories( libsmackerdec/include thirdparty/include common + common/2d + common/fonts common/utility common/console common/textures diff --git a/source/common/2d/v_drawtext.cpp b/source/common/2d/v_drawtext.cpp index 150d69f61..9e379ca68 100644 --- a/source/common/2d/v_drawtext.cpp +++ b/source/common/2d/v_drawtext.cpp @@ -44,7 +44,7 @@ #include "v_draw.h" #include "image.h" #include "v_2ddrawer.h" -#include "../fonts/v_font.h" +#include "v_font.h" class FFont; diff --git a/source/common/fonts/hexfont.cpp b/source/common/fonts/hexfont.cpp index 7111bd21c..74ac0d433 100644 --- a/source/common/fonts/hexfont.cpp +++ b/source/common/fonts/hexfont.cpp @@ -38,7 +38,7 @@ #include "utf8.h" #include "sc_man.h" #include "imagehelpers.h" -#include "../2d/v_draw.h" +#include "v_draw.h" #include "fontinternals.h" diff --git a/source/common/fonts/v_text.h b/source/common/fonts/v_text.h deleted file mode 100644 index f13ffc38a..000000000 --- a/source/common/fonts/v_text.h +++ /dev/null @@ -1,89 +0,0 @@ -/* -** v_text.h -** -**--------------------------------------------------------------------------- -** Copyright 1998-2006 Randy Heit -** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** 3. The name of the author may not be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -**--------------------------------------------------------------------------- -** -*/ - -#ifndef __V_TEXT_H__ -#define __V_TEXT_H__ - -#include "zstring.h" -#include "v_font.h" - -struct FBrokenLines -{ - unsigned Width; - FString Text; -}; - -#define TEXTCOLOR_ESCAPE '\034' -#define TEXTCOLOR_ESCAPESTR "\034" - -#define TEXTCOLOR_BRICK "\034A" -#define TEXTCOLOR_TAN "\034B" -#define TEXTCOLOR_GRAY "\034C" -#define TEXTCOLOR_GREY "\034C" -#define TEXTCOLOR_GREEN "\034D" -#define TEXTCOLOR_BROWN "\034E" -#define TEXTCOLOR_GOLD "\034F" -#define TEXTCOLOR_RED "\034G" -#define TEXTCOLOR_BLUE "\034H" -#define TEXTCOLOR_ORANGE "\034I" -#define TEXTCOLOR_WHITE "\034J" -#define TEXTCOLOR_YELLOW "\034K" -#define TEXTCOLOR_UNTRANSLATED "\034L" -#define TEXTCOLOR_BLACK "\034M" -#define TEXTCOLOR_LIGHTBLUE "\034N" -#define TEXTCOLOR_CREAM "\034O" -#define TEXTCOLOR_OLIVE "\034P" -#define TEXTCOLOR_DARKGREEN "\034Q" -#define TEXTCOLOR_DARKRED "\034R" -#define TEXTCOLOR_DARKBROWN "\034S" -#define TEXTCOLOR_PURPLE "\034T" -#define TEXTCOLOR_DARKGRAY "\034U" -#define TEXTCOLOR_CYAN "\034V" -#define TEXTCOLOR_ICE "\034W" -#define TEXTCOLOR_FIRE "\034X" -#define TEXTCOLOR_SAPPHIRE "\034Y" -#define TEXTCOLOR_TEAL "\034Z" - -#define TEXTCOLOR_NORMAL "\034-" -#define TEXTCOLOR_BOLD "\034+" - -#define TEXTCOLOR_CHAT "\034*" -#define TEXTCOLOR_TEAMCHAT "\034!" - -TArray V_BreakLines (FFont *font, int maxwidth, const uint8_t *str, bool preservecolor = false); -inline TArray V_BreakLines (FFont *font, int maxwidth, const char *str, bool preservecolor = false) - { return V_BreakLines (font, maxwidth, (const uint8_t *)str, preservecolor); } -inline TArray V_BreakLines (FFont *font, int maxwidth, const FString &str, bool preservecolor = false) - { return V_BreakLines (font, maxwidth, (const uint8_t *)str.GetChars(), preservecolor); } - -#endif //__V_TEXT_H__ diff --git a/source/common/utility/printf.h b/source/common/utility/printf.h index 479d5e9dc..0ef9fee53 100644 --- a/source/common/utility/printf.h +++ b/source/common/utility/printf.h @@ -14,4 +14,4 @@ void OSD_Printf(const char *fmt, ...) ATTRIBUTE((format(printf,1,2))); void I_Error(const char *fmt, ...) ATTRIBUTE((format(printf,1,2))); -#include "../fonts/v_text.h" +#include "v_text.h"