Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CleanUp

Browse source
This commit is contained in:
jarod42 2004-06-26 13:01:06 +00:00
parent a6fc8c2375
commit bdd9f47bf7
7 changed files with 178 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/video/cursor.cpp
View file

@ -68,19 +68,19 @@ const char CursorTypeType[] = "cursor-type";
*/
CursorType* Cursors;
CursorStates CursorState; /// current cursor state (point,...)
int CursorAction; /// action for selection
int CursorValue; /// value for CursorAction (spell type f.e.)
CursorStates CursorState; ///< current cursor state (point,...)
int CursorAction; ///< action for selection
int CursorValue; ///< value for CursorAction (spell type f.e.)
// Event changed mouse position, can alter at any moment
int CursorX; /// cursor position on screen X
int CursorY; /// cursor position on screen Y
int CursorX; ///< cursor position on screen X
int CursorY; ///< cursor position on screen Y
int CursorStartX; /// rectangle started on screen X
int CursorStartY; /// rectangle started on screen Y
int CursorStartX; ///< rectangle started on screen X
int CursorStartY; ///< rectangle started on screen Y
int SubScrollX; /// pixels the mouse moved while scrolling
int SubScrollY; /// pixels the mouse moved while scrolling
int SubScrollX; ///< pixels the mouse moved while scrolling
int SubScrollY; ///< pixels the mouse moved while scrolling
/// X position of starting point of selection rectangle, in screen pixels.
int CursorStartScrMapX;
@ -89,7 +89,7 @@ int CursorStartScrMapY;
/*--- DRAW BUILDING CURSOR ------------------------------------------------*/
static int BuildingCursor; /// Flag (0/1): last cursor was building
static int BuildingCursor; ///< Flag (0/1): last cursor was building
/// area of tiles covered by building cursor (SX,SY;EX,EY)
static int BuildingCursorSX;
@ -100,11 +100,11 @@ static int BuildingCursorEX;
/// area of tiles covered by building cursor (SX,SY;EX,EY)
static int BuildingCursorEY;
UnitType* CursorBuilding; /// building cursor
UnitType* CursorBuilding; ///< building cursor
/*--- DRAW SPRITE CURSOR ---------------------------------------------------*/
CursorType* GameCursor; /// current shown cursor-type
CursorType* GameCursor; ///< current shown cursor-type
/*----------------------------------------------------------------------------
-- Functions

40
src/video/font.cpp
View file

@ -53,24 +53,24 @@
/// Font color mapping
typedef struct _font_color_mapping_ {
char* ColorName; /// Font color name
SDL_Color Color[NumFontColors]; /// Array of colors
struct _font_color_mapping_* Next; /// Next pointer
char* ColorName; ///< Font color name
SDL_Color Color[NumFontColors]; ///< Array of colors
struct _font_color_mapping_* Next; ///< Next pointer
} FontColorMapping;
static FontColorMapping* FontColor;
static FontColorMapping* FontColor; ///< FIXME
/// Font color mappings
static FontColorMapping* FontColorMappings;
/// Font mapping
typedef struct _font_mapping_ {
char* Ident; /// Font name
int Font; /// Ident number
struct _font_mapping_* Next; /// Next pointer
char* Ident; ///< Font name
int Font; ///< Ident number
struct _font_mapping_* Next; ///< Next pointer
} FontMapping;
static FontMapping* FontMappings;
static FontMapping* FontMappings; ///< FIXME
/**
** Fonts table
@ -79,27 +79,19 @@ static FontMapping* FontMappings;
*/
static ColorFont Fonts[MaxFonts];
/// Last text color
static FontColorMapping* LastTextColor;
/// Default text color
static FontColorMapping* DefaultTextColor;
/// Reverse text color
static FontColorMapping* ReverseTextColor;
/// Default normal color index
static char* DefaultNormalColorIndex;
/// Default reverse color index
static char* DefaultReverseColorIndex;
static FontColorMapping* LastTextColor; ///< Last text color
static FontColorMapping* DefaultTextColor; ///< Default text color
static FontColorMapping* ReverseTextColor; ///< Reverse text color
static char* DefaultNormalColorIndex; ///< Default normal color index
static char* DefaultReverseColorIndex; ///< Default reverse color index
/// Draw character with current video depth.
static void VideoDrawChar(const Graphic*, int, int, int, int, int, int);
#ifdef USE_OPENGL
/// Font bitmaps
static GLubyte* FontBitmaps[MaxFonts][NumFontColors];
/// Font bitmap widths
static int FontBitmapWidths[MaxFonts];
/// Current font
static int CurrentFont;
static GLubyte* FontBitmaps[MaxFonts][NumFontColors]; ///< Font bitmaps
static int FontBitmapWidths[MaxFonts]; ///< Font bitmap widths
static int CurrentFont; ///< Current font
#endif
/*----------------------------------------------------------------------------