games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

Compile fix.

Browse Source
This commit is contained in:
Frank Zago
2009-08-18 01:57:39 +00:00
parent d8ddc4236b
commit c7a307dfed
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/FontBase.h Normal file
View File

@@ -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

3
client/GUIBase.h
View File

@@ -6,7 +6,7 @@
#include <set> #include <set>
#include <list> #include <list>
#include "../timeHandler.h" #include "../timeHandler.h"
#include "FontBase.h"
#ifdef max #ifdef max
#undef max #undef max
@@ -55,7 +55,6 @@ class CArmedInstance;
class CGTownInstance; class CGTownInstance;
class StackState; class StackState;
class CPlayerInterface; class CPlayerInterface;
enum EFonts;
struct Point struct Point
{ {

7
client/Graphics.h
View File

@@ -3,6 +3,7 @@
#include "../global.h" #include "../global.h"
#include "FontBase.h"
/* /*
* Graphics.h, part of VCMI engine * Graphics.h, part of VCMI engine
@@ -43,12 +44,6 @@ struct Font
int getWidth(const char *text) const; 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 class Graphics
{ {
public: public:

1
client/Makefile.am
View File

@@ -63,6 +63,7 @@ vcmiclient_SOURCES = \
CSpellWindow.h \ CSpellWindow.h \
Client.cpp \ Client.cpp \
Client.h \ Client.h \
FontBase.h \
FunctionList.h \ FunctionList.h \
GUIBase.cpp \ GUIBase.cpp \
GUIBase.h \ GUIBase.h \

3
client/SDL_Extensions.h
View File

@@ -6,6 +6,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <sstream> #include <sstream>
#include "FontBase.h"
/* /*
* SDL_Extensions.h, part of VCMI engine * SDL_Extensions.h, part of VCMI engine
@@ -17,8 +18,6 @@
* *
*/ */
enum EFonts;
extern SDL_Surface * screen, *screen2, *screenBuf; extern SDL_Surface * screen, *screen2, *screenBuf;
extern SDL_Color tytulowy, tlo, zwykly ; extern SDL_Color tytulowy, tlo, zwykly ;
extern TTF_Font * TNRB16, *TNR, *GEOR13, *GEORXX, *GEORM; extern TTF_Font * TNRB16, *TNR, *GEOR13, *GEORXX, *GEORM;