mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +02:00 
			
		
		
		
	Compile fix.
This commit is contained in:
		
							
								
								
									
										19
									
								
								client/FontBase.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								client/FontBase.h
									
									
									
									
									
										Normal 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 | ||||
| @@ -6,7 +6,7 @@ | ||||
| #include <set> | ||||
| #include <list> | ||||
| #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 | ||||
| { | ||||
|   | ||||
| @@ -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: | ||||
|   | ||||
| @@ -63,6 +63,7 @@ vcmiclient_SOURCES =  \ | ||||
| 	CSpellWindow.h \ | ||||
| 	Client.cpp \ | ||||
| 	Client.h \ | ||||
| 	FontBase.h \ | ||||
| 	FunctionList.h \ | ||||
| 	GUIBase.cpp \ | ||||
| 	GUIBase.h \ | ||||
|   | ||||
| @@ -6,6 +6,7 @@ | ||||
| #include <string> | ||||
| #include <vector> | ||||
| #include <sstream> | ||||
| #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; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user