diff --git a/client/FontBase.h b/client/FontBase.h new file mode 100644 index 000000000..2c404f18e --- /dev/null +++ b/client/FontBase.h @@ -0,0 +1,19 @@ +#ifndef __FONTBASE_H__ +#define __FONTBASE_H__ + +/* + * Graphics.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ + +enum EFonts +{ + FONT_BIG, FONT_CALLI, FONT_CREDITS, FONT_HIGH_SCORE, FONT_MEDIUM, FONT_SMALL, FONT_TIMES, FONT_TINY, FONT_VERD +}; + +#endif diff --git a/client/GUIBase.h b/client/GUIBase.h index 5320e079d..4b8a5cdd4 100644 --- a/client/GUIBase.h +++ b/client/GUIBase.h @@ -6,7 +6,7 @@ #include #include #include "../timeHandler.h" - +#include "FontBase.h" #ifdef max #undef max @@ -55,7 +55,6 @@ class CArmedInstance; class CGTownInstance; class StackState; class CPlayerInterface; -enum EFonts; struct Point { diff --git a/client/Graphics.h b/client/Graphics.h index be2558a3d..58ada63a4 100644 --- a/client/Graphics.h +++ b/client/Graphics.h @@ -3,6 +3,7 @@ #include "../global.h" +#include "FontBase.h" /* * Graphics.h, part of VCMI engine @@ -43,12 +44,6 @@ struct Font int getWidth(const char *text) const; }; -enum EFonts -{ - FONT_BIG, FONT_CALLI, FONT_CREDITS, FONT_HIGH_SCORE, FONT_MEDIUM, FONT_SMALL, FONT_TIMES, FONT_TINY, FONT_VERD -}; - - class Graphics { public: diff --git a/client/Makefile.am b/client/Makefile.am index ea55724e1..8eba14750 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -63,6 +63,7 @@ vcmiclient_SOURCES = \ CSpellWindow.h \ Client.cpp \ Client.h \ + FontBase.h \ FunctionList.h \ GUIBase.cpp \ GUIBase.h \ diff --git a/client/SDL_Extensions.h b/client/SDL_Extensions.h index daa69b1e3..114368b31 100644 --- a/client/SDL_Extensions.h +++ b/client/SDL_Extensions.h @@ -6,6 +6,7 @@ #include #include #include +#include "FontBase.h" /* * SDL_Extensions.h, part of VCMI engine @@ -17,8 +18,6 @@ * */ -enum EFonts; - extern SDL_Surface * screen, *screen2, *screenBuf; extern SDL_Color tytulowy, tlo, zwykly ; extern TTF_Font * TNRB16, *TNR, *GEOR13, *GEORXX, *GEORM;