stratagus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stratagus-CVS] stratagus/src/include editor.h fc_types.h font....


From: address@hidden
Subject: [Stratagus-CVS] stratagus/src/include editor.h fc_types.h font....
Date: 22 Dec 2003 12:50:37 +1100

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       03/12/22 12:50:36

Modified files:
        src/include    : editor.h fc_types.h font.h icons.h 

Log message:
        Tabs Cleanup

Patches:
Index: stratagus/src/include/editor.h
diff -u stratagus/src/include/editor.h:1.21 stratagus/src/include/editor.h:1.22
--- stratagus/src/include/editor.h:1.21 Sat Dec 20 16:33:26 2003
+++ stratagus/src/include/editor.h      Mon Dec 22 12:50:36 2003
@@ -5,12 +5,12 @@
 //     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
 //             \/                  \/          \//_____/            \/
 //  ______________________                           ______________________
-//                       T H E   W A R   B E G I N S
-//        Stratagus - A free fantasy real time strategy game engine
+//                        T H E   W A R   B E G I N S
+//         Stratagus - A free fantasy real time strategy game engine
 //
-/address@hidden editor.h       -       The editor file. */
+/address@hidden editor.h - The editor file. */
 //
-//     (c) Copyright 2002 by Lutz Sammer
+//      (c) Copyright 2002-2004 by Lutz Sammer
 //
 //      This program is free software; you can redistribute it and/or modify
 //      it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: editor.h,v 1.21 2003/12/20 05:33:26 jsalmon3 Exp $
+//      $Id: editor.h,v 1.22 2003/12/22 01:50:36 wizzard Exp $
 
 #ifndef __EDITOR_H__
 #define __EDITOR_H__
@@ -34,7 +34,7 @@
 //@{
 
 /*----------------------------------------------------------------------------
---             Variables
+--  Variables
 ----------------------------------------------------------------------------*/
 
        /// Editor is running
@@ -43,28 +43,28 @@
 extern char EditorMapLoaded;
        /// Current editor state type.
 typedef enum _editor_state_type_ {
-       EditorSelecting,                                                /// 
Select
-       EditorEditTile,                                         /// Edit tiles
-       EditorEditUnit,                                         /// Edit units
-} EditorStateType;                                             /// Current 
editor state
+       EditorSelecting,  /// Select
+       EditorEditTile,   /// Edit tiles
+       EditorEditUnit,   /// Edit units
+} EditorStateType;    /// Current editor state
        /// Current editor state.
 extern EditorStateType EditorState;
 
        /// Editor CCL start file
 extern const char* EditorStartFile;
 
-extern char** EditorUnitTypes;                         /// Sorted editor 
unit-type table
+extern char** EditorUnitTypes;  /// Sorted editor unit-type table
 
-extern int MaxUnitIndex;                               /// Max unit icon draw 
index
+extern int MaxUnitIndex;  /// Max unit icon draw index
 
-extern char* EditorSelectIcon;                         /// Editor's select icon
-extern char* EditorUnitsIcon;                          /// Editor's units icon
+extern char* EditorSelectIcon;  /// Editor's select icon
+extern char* EditorUnitsIcon;   /// Editor's units icon
 
 /*----------------------------------------------------------------------------
---             Functions
+--  Functions
 ----------------------------------------------------------------------------*/
 
-       ///             Editor main event loop
+       /// Editor main event loop
 extern void EditorMainLoop(void);
        /// Update editor display
 extern void EditorUpdateDisplay(void);
@@ -75,9 +75,9 @@
        /// Register ccl features
 extern void EditorCclRegister(void);
 
-   /// Edit tile
+       /// Edit tile
 extern void EditTile(int x, int y, int tile);
-   /// Edit tiles
+       /// Edit tiles
 extern void EditTiles(int x, int y, int tile, int size);
 
        /// Change the view of a tile
@@ -89,4 +89,4 @@
 
 //@}
 
-#endif         // !__EDITOR_H__
+#endif // !__EDITOR_H__
Index: stratagus/src/include/fc_types.h
diff -u stratagus/src/include/fc_types.h:1.7 
stratagus/src/include/fc_types.h:1.8
--- stratagus/src/include/fc_types.h:1.7        Sat Dec 20 16:33:26 2003
+++ stratagus/src/include/fc_types.h    Mon Dec 22 12:50:36 2003
@@ -5,12 +5,12 @@
 //     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
 //             \/                  \/          \//_____/            \/
 //  ______________________                           ______________________
-//                       T H E   W A R   B E G I N S
-//        Stratagus - A free fantasy real time strategy game engine
+//                        T H E   W A R   B E G I N S
+//         Stratagus - A free fantasy real time strategy game engine
 //
-/address@hidden fc_types.h     -       Stratagus Types. */
+/address@hidden fc_types.h - Stratagus Types. */
 //
-//     (c) Copyright 2002 by Lutz Sammer
+//      (c) Copyright 2002-2004 by Lutz Sammer
 //
 //      This program is free software; you can redistribute it and/or modify
 //      it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: fc_types.h,v 1.7 2003/12/20 05:33:26 jsalmon3 Exp $
+//      $Id: fc_types.h,v 1.8 2003/12/22 01:50:36 wizzard Exp $
 
 #ifndef __FC_TYPES_H__
 #define __FC_TYPES_H__
@@ -34,10 +34,10 @@
 //@{
 
 /*----------------------------------------------------------------------------
---             Declarations
+--  Declarations
 ----------------------------------------------------------------------------*/
 
-//             This is needed to have recursive forward references
+// This is needed to have recursive forward references
 
 #if !defined(__STRUCT_PLAYER__) && !defined(DOXYGEN)
 #define __STRUCT_PLAYER__
@@ -56,4 +56,4 @@
 
 //@}
 
-#endif         // !__FC_TYPES_H__
+#endif // !__FC_TYPES_H__
Index: stratagus/src/include/font.h
diff -u stratagus/src/include/font.h:1.31 stratagus/src/include/font.h:1.32
--- stratagus/src/include/font.h:1.31   Sat Dec 20 16:33:26 2003
+++ stratagus/src/include/font.h        Mon Dec 22 12:50:36 2003
@@ -4,13 +4,13 @@
 //      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ |
 //     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
 //             \/                  \/          \//_____/            \/
-//  ______________________                          ______________________
-//                       T H E   W A R   B E G I N S
-//        Stratagus - A free fantasy real time strategy game engine
+//  ______________________                            ______________________
+//                        T H E   W A R   B  E G I N S
+//         Stratagus - A free fantasy real time strategy game engine
 //
-/address@hidden font.h         -       The font headerfile. */
+/address@hidden font.h - The font headerfile. */
 //
-//     (c) Copyright 1998-2003 by Lutz Sammer and Jimmy Salmon
+//      (c) Copyright 1998-2004 by Lutz Sammer and Jimmy Salmon
 //
 //      This program is free software; you can redistribute it and/or modify
 //      it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: font.h,v 1.31 2003/12/20 05:33:26 jsalmon3 Exp $
+//      $Id: font.h,v 1.32 2003/12/22 01:50:36 wizzard Exp $
 
 #ifndef __FONT_H__
 #define __FONT_H__
@@ -34,95 +34,93 @@
 //@{
 
 /*----------------------------------------------------------------------------
---             Documentation
+--  Documentation
 ----------------------------------------------------------------------------*/
 
 /**
-**             @struct _color_font_ font.h
+**  @struct _color_font_ font.h
 **
-**             \#include "font.h"
+**  \#include "font.h"
 **
-**             typedef struct _color_font_ ColorFont;
+**  typedef struct _color_font_ ColorFont;
 **
-**                             Defines the fonts used in the Stratagus engine. 
We support
-**                             proportional multicolor fonts of 7 colors. The 
eighth color is
-**                             transparent. (Currently the fonts aren't packed)
+**  Defines the fonts used in the Stratagus engine. We support
+**  proportional multicolor fonts of 7 colors. The eighth color is
+**  transparent. (Currently the fonts aren't packed)
 **
-**             ColorFont::File
+**  ColorFont::File
 **
-**                             File containing the graphics for the font.
+**    File containing the graphics for the font.
 **
-**             ColorFont::Width
+**  ColorFont::Width
 **
-**                             Maximal width of a character in pixels.
+**    Maximal width of a character in pixels.
 **
-**             ColorFont::Height
+**  ColorFont::Height
 **
-**                             Height of all characters in pixels.
+**    Height of all characters in pixels.
 **
-**             ColorFont::CharWidth[]
+**  ColorFont::CharWidth[]
 **
-**                             The width of each font glyph in pixels. The 
index 0 is the
-**                             width of the SPACE (' ', 0x20).
+**    The width of each font glyph in pixels. The index 0 is the
+**    width of the SPACE (' ', 0x20).
 **
-**             ColorFont::Graphic
+**  ColorFont::Graphic
 **
-**                             Contains the graphics of the font, loaded from 
ColorFont::File.
-**                             Only 7 colors are supported.
-**                             @li #0           is background color
-**                             @li #1           is the light font color
-**                             @li #2           is the middle = main font color
-**                             @li #3           is the dark font color
-**                             @li #4           is the font/shadow antialias 
color
-**                             @li #5           is the dark shadow color
-**                             @li #6           is the light shadow color
-**                             @li #255 is transparent
+**    Contains the graphics of the font, loaded from ColorFont::File.
+**    Only 7 colors are supported.
+**    @li #0   is background color
+**    @li #1   is the light font color
+**    @li #2   is the middle = main font color
+**    @li #3   is the dark font color
+**    @li #4   is the font/shadow antialias color
+**    @li #5   is the dark shadow color
+**    @li #6   is the light shadow color
+**    @li #255 is transparent
 */
 
 /*----------------------------------------------------------------------------
---             Includes
+--  Includes
 ----------------------------------------------------------------------------*/
 
 #include "ccl.h"
 
 /*----------------------------------------------------------------------------
---             Definitions
+--  Definitions
 ----------------------------------------------------------------------------*/
 
        /// Color font definition
 typedef struct _color_font_ {
-       char*           File;                                           /// 
File containing font data
-
-       int                             Width;                                  
        /// Max width of characters in file
-       int                             Height;                                 
        /// Max height of characters in file
-
-       char            CharWidth[208];                         /// Real font 
width (starting with ' ')
+       char* File;            /// File containing font data
+       int   Width;           /// Max width of characters in file
+       int   Height;          /// Max height of characters in file
+       char  CharWidth[208];  /// Real font width (starting with ' ')
 
 // --- FILLED UP ---
 
-       Graphic*                Graphic;                                /// 
Graphic object used to draw
+       Graphic* Graphic;  /// Graphic object used to draw
 } ColorFont;
 
 /**
-**             Font selector for the font functions.
+**  Font selector for the font functions.
 */
 enum _game_font_ {
-       SmallFont,                                                              
/// Small font used in stats
-       GameFont,                                                               
/// Normal font used in game
-       LargeFont,                                                              
/// Large font used in menus
-       SmallTitleFont,                                         /// Small font 
used in episoden titles
-       LargeTitleFont,                                         /// Large font 
used in episoden titles
-       User1Font,                                                              
/// User font 1
-       User2Font,                                                              
/// User font 2
-       User3Font,                                                              
/// User font 3
-       User4Font,                                                              
/// User font 4
-       User5Font,                                                              
/// User font 5
+       SmallFont,       /// Small font used in stats
+       GameFont,        /// Normal font used in game
+       LargeFont,       /// Large font used in menus
+       SmallTitleFont,  /// Small font used in episoden titles
+       LargeTitleFont,  /// Large font used in episoden titles
+       User1Font,       /// User font 1
+       User2Font,       /// User font 2
+       User3Font,       /// User font 3
+       User4Font,       /// User font 4
+       User5Font,       /// User font 5
        // ... more to come or not
-       MaxFonts,                                                               
/// Number of fonts supported
+       MaxFonts,        /// Number of fonts supported
 };
 
 /**
-**             Color selector for the font functions.
+**  Color selector for the font functions.
 */
 #define FontRed "red"
 #define FontGreen "green"
@@ -131,43 +129,43 @@
 #define FontGrey "grey"
 
 /*----------------------------------------------------------------------------
---             Variables
+--  Variables
 ----------------------------------------------------------------------------*/
 
 /**
-**             Font names
-**             FIXME: should use the names of the real fonts.
+**  Font names
+**  FIXME: should use the names of the real fonts.
 */
 extern char *FontNames[];
 
 /*----------------------------------------------------------------------------
---             Functions
+--  Functions
 ----------------------------------------------------------------------------*/
 
        /// Set the default text colors for normal and reverse text
-extern void SetDefaultTextColors(char* normal,char* reverse);
+extern void SetDefaultTextColors(char* normal, char* reverse);
        /// Get the default text colors for normal and reverse text
-extern void GetDefaultTextColors(char** normalp,char** reversep);
+extern void GetDefaultTextColors(char** normalp, char** reversep);
        /// Returns the pixel length of a text
-extern int VideoTextLength(unsigned font,const unsigned char* text);
+extern int VideoTextLength(unsigned font, const unsigned char* text);
        /// Returns the height of the font
 extern int VideoTextHeight(unsigned font);
        /// Draw text unclipped
-extern int VideoDrawText(int x,int y,unsigned font,const unsigned char* text);
+extern int VideoDrawText(int x, int y, unsigned font, const unsigned char* 
text);
        /// Draw text unclipped
-extern int VideoDrawTextClip(int x,int y,unsigned font,const unsigned char* 
text);
+extern int VideoDrawTextClip(int x, int y, unsigned font, const unsigned char* 
text);
        /// Draw reverse text unclipped
-extern int VideoDrawReverseText(int x,int y,unsigned font,const unsigned char* 
text);
+extern int VideoDrawReverseText(int x, int y, unsigned font, const unsigned 
char* text);
        /// Draw text centered and unclipped
-extern int VideoDrawTextCentered(int x,int y,unsigned font,const unsigned 
char* text);
+extern int VideoDrawTextCentered(int x, int y, unsigned font, const unsigned 
char* text);
        /// Draw number unclipped
-extern int VideoDrawNumber(int x,int y,unsigned font,int number);
+extern int VideoDrawNumber(int x, int y, unsigned font, int number);
        /// Draw reverse number unclipped
-extern int VideoDrawReverseNumber(int x,int y,unsigned font,int number);
+extern int VideoDrawReverseNumber(int x, int y, unsigned font, int number);
        /// Draw number clipped
-extern int VideoDrawNumberClip(int x,int y,unsigned font,int number);
+extern int VideoDrawNumberClip(int x, int y, unsigned font, int number);
        /// Draw reverse number clipped
-extern int VideoDrawReverseNumberClip(int x,int y,unsigned font,int number);
+extern int VideoDrawReverseNumberClip(int x, int y, unsigned font, int number);
 
        /// Load and initialize the fonts
 extern void LoadFonts(void);
@@ -186,4 +184,4 @@
 
 //@}
 
-#endif         // !__FONT_H__
+#endif // !__FONT_H__
Index: stratagus/src/include/icons.h
diff -u stratagus/src/include/icons.h:1.40 stratagus/src/include/icons.h:1.41
--- stratagus/src/include/icons.h:1.40  Sat Dec 20 16:33:26 2003
+++ stratagus/src/include/icons.h       Mon Dec 22 12:50:36 2003
@@ -5,12 +5,12 @@
 //     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
 //             \/                  \/          \//_____/            \/
 //  ______________________                           ______________________
-//                       T H E   W A R   B E G I N S
-//        Stratagus - A free fantasy real time strategy game engine
+//                        T H E   W A R   B E G I N S
+//         Stratagus - A free fantasy real time strategy game engine
 //
-/address@hidden icons.h        -       The icons headerfile. */
+/address@hidden icons.h - The icons headerfile. */
 //
-//     (c) Copyright 1998-2001 by Lutz Sammer
+//      (c) Copyright 1998-2004 by Lutz Sammer
 //
 //      This program is free software; you can redistribute it and/or modify
 //      it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: icons.h,v 1.40 2003/12/20 05:33:26 jsalmon3 Exp $
+//      $Id: icons.h,v 1.41 2003/12/22 01:50:36 wizzard Exp $
 
 #ifndef __ICONS_H__
 #define __ICONS_H__
@@ -34,193 +34,196 @@
 //@{
 
 /*----------------------------------------------------------------------------
---             Documentation
+--  Documentation
 ----------------------------------------------------------------------------*/
 
 /**
-**             @struct _icon_ icons.h
+**  @struct _icon_ icons.h
 **
-**             \#include "icons.h"
+**  \#include "icons.h"
 **
-**             typedef struct _icon_ Icon;
+**  typedef struct _icon_ Icon;
 **
-**             This structure contains all informations about an icon.
-**             Currently only rectangular static icons of 46x38 pixels are 
supported.
-**             In the future it is planned to support animated and not 
rectangular
-**             icons and icons of different sizes.
+**  This structure contains all informations about an icon.
+**  Currently only rectangular static icons of 46x38 pixels are supported.
+**  In the future it is planned to support animated and not rectangular
+**  icons and icons of different sizes.
 **
-**             The icon structure members:
+**  The icon structure members:
 **
-**             Icon::Ident
+**  Icon::Ident
 **
-**                             Unique identifier of the icon, used to 
reference it in config
-**                             files and during startup.  Don't use this in 
game, use instead
-**                             the pointer to this structure.
+**    Unique identifier of the icon, used to reference it in config
+**    files and during startup.  Don't use this in game, use instead
+**    the pointer to this structure.
 **
-**             Icon::Tileset
+**  Icon::Tileset
 **
-**                             Unique identifier of the tileset, used to allow 
different
-**                             graphics for the same icons depending on the 
tileset. Resolved
-**                             during startup in InitIcons().
-**                             @see Tileset::Ident
+**    Unique identifier of the tileset, used to allow different
+**    graphics for the same icons depending on the tileset. Resolved
+**    during startup in InitIcons().
+**    @see Tileset::Ident
 **
-**             Icon::File
+**  Icon::File
 **
-**                             Pointer to icon file (file containing the 
graphics), each icon
-**                             could have an own icon file or some up to all 
icons could share
-**                             the same icon file.
+**    Pointer to icon file (file containing the graphics), each icon
+**    could have an own icon file or some up to all icons could share
+**    the same icon file.
 **
-**             Icon::Index
+**  Icon::Index
 **
-**                             Index into the icon file. You know one up to 
all icons could
-**                             be in the same file. This index distinguishes 
them.
+**    Index into the icon file. You know one up to all icons could
+**    be in the same file. This index distinguishes them.
 **
-**             Icon::X
+**  Icon::X
 **
-**                             X pixel index into the graphic image.
-**                             (Icon::Index%5)*IconWidth.
+**    X pixel index into the graphic image.
+**    (Icon::Index%5)*IconWidth.
 **
-**             Icon::Y
+**  Icon::Y
 **
-**                             Y pixel index into the graphic image.
-**                             (Icon::Index/5)*IconHeight.
+**    Y pixel index into the graphic image.
+**    (Icon::Index/5)*IconHeight.
 **
-**             Icon::Width
+**  Icon::Width
 **
-**                             Icon width in pixels.
+**    Icon width in pixels.
 **
-**             Icon::Height
+**  Icon::Height
 **
-**                             Icon height in pixels.
+**    Icon height in pixels.
 **
-**             Icon::Graphic
+**  Icon::Graphic
 **
-**                             Graphic image containing the loaded graphics. 
Loaded by
-**                             LoadIcons(). All icons belonging to the same 
icon file shares
-**                             this structure.
+**    Graphic image containing the loaded graphics. Loaded by
+**    LoadIcons(). All icons belonging to the same icon file shares
+**    this structure.
 */
 
 /**
-**             @struct _icon_config_ icons.h
+**  @struct _icon_config_ icons.h
 **
-**             \#include "icons.h"
+**  \#include "icons.h"
 **
-**             typedef struct _icon_config_ IconConfig;
+**  typedef struct _icon_config_ IconConfig;
 **
-**             This structure contains all configuration informations about an 
icon.
+**  This structure contains all configuration informations about an icon.
 **
-**             IconConfig::Name
+**  IconConfig::Name
 **
-**                             Unique identifier of the icon, used to 
reference icons in config
-**                             files and during startup.  The name is resolved 
during game
-**                             start and the pointer placed in the next field.
-**                             @see Icon::Ident
+**    Unique identifier of the icon, used to reference icons in config
+**    files and during startup.  The name is resolved during game
+**    start and the pointer placed in the next field.
+**    @see Icon::Ident
 **
-**             IconConfig::Icon
+**  IconConfig::Icon
 **
-**                             Pointer to an icon. This pointer is resolved 
during game start.
+**    Pointer to an icon. This pointer is resolved during game start.
 **
-**             Example how this can be used in C initializers:
+**    Example how this can be used in C initializers:
 **
-**             @code
-**                             { "icon-peasant" },
-**             @endcode
+**    @code
+**      { "icon-peasant" },
+**    @endcode
 */
 
 /*----------------------------------------------------------------------------
---             Includes
+--  Includes
 ----------------------------------------------------------------------------*/
 
 #include "video.h"
 #include "iolib.h"
 
 /*----------------------------------------------------------------------------
---             Defines
+--  Defines
 ----------------------------------------------------------------------------*/
 
-#define IconActive             1                               /// cursor on 
icon
-#define IconClicked            2                               /// mouse 
button down on icon
-#define IconSelected           4                               /// this the 
selected icon
-#define IconAutoCast           8                               /// auto cast 
icon
+#define IconActive   1  /// cursor on icon
+#define IconClicked  2  /// mouse button down on icon
+#define IconSelected 4  /// this the selected icon
+#define IconAutoCast 8  /// auto cast icon
 
 /*----------------------------------------------------------------------------
---             Declarations
+--  Declarations
 ----------------------------------------------------------------------------*/
 
 /**
-**             A structure describing an icon file, which could contain one or 
more
-**             icons. @internal use only.
+**  A structure describing an icon file, which could contain one or more
+**  icons. @internal use only.
 **
-**             @todo
-**                             IconFile::Icons member isn't setup and used.
+**  @todo
+**    IconFile::Icons member isn't setup and used.
 */
 typedef struct _icon_file_ {
-       char*           FileName;                               /// Icon file 
name/path
-
-       //unsigned              Width;                                          
/// Icon width
-       //unsigned              Height;                                         
/// Icon height
-
-               /** FIXME: unsed */
-       //unsigned              Icons;                                          
/// Number of icons in this file
+       char* FileName;  /// Icon file name/path
+#if 0
+       unsigned Width;   /// Icon width
+       unsigned Height;  /// Icon height
+
+       /** FIXME: unsed */
+       unsigned Icons;  /// Number of icons in this file
+#endif
 
 // --- FILLED UP ---
-       Graphic*                Sprite;                                         
/// Graphic data loaded
+       Graphic* Sprite;  /// Graphic data loaded
 } IconFile;
 
-       ///             Icon: rectangle image used in menus
+       /// Icon: rectangle image used in menus
 typedef struct _icon_ {
-       char*           Ident;                                          /// 
Icon identifier
-       char*           Tileset;                                /// Tileset 
identifier
+       char* Ident;    /// Icon identifier
+       char* Tileset;  /// Tileset identifier
 
-       IconFile*               File;                                           
/// File containing the data
-       unsigned                Index;                                          
/// Index into file
+       IconFile* File;   /// File containing the data
+       unsigned  Index;  /// Index into file
 
-       unsigned                Width;                                          
/// Icon width
-       unsigned                Height;                                         
/// Icon height
+       unsigned Width;   /// Icon width
+       unsigned Height;  /// Icon height
 
 // --- FILLED UP ---
-       Graphic*                Sprite;                         /// Graphic 
data loaded
+       Graphic* Sprite;  /// Graphic data loaded
 } Icon;
 
-#define NoIcon         NULL                                            /// 
used for errors == no valid icon
+#define NoIcon NULL  /// used for errors == no valid icon
 
-       ///             Icon reference (used in config tables)
+       /// Icon reference (used in config tables)
 typedef struct _icon_config_ {
-       char*           Name;                                           /// 
config icon name
-       Icon*           Icon;                                           /// 
icon pointer to use to run time
+       char* Name;  /// config icon name
+       Icon* Icon;  /// icon pointer to use to run time
 } IconConfig;
 
 /*----------------------------------------------------------------------------
---             Variables
+--  Variables
 ----------------------------------------------------------------------------*/
 
-extern char** IconWcNames;                             /// pud original -> 
internal
+extern char** IconWcNames;  /// pud original -> internal
 
-               /** FIXME: Not needed */
-extern int IconWidth;                                          /// icon width 
in panels
-               /** FIXME: Not needed */
-extern int IconHeight;                                                 /// 
icon height in panels
+       /** FIXME: Not needed */
+extern int IconWidth;  /// icon width in panels
+       /** FIXME: Not needed */
+extern int IconHeight;  /// icon height in panels
 
 /*----------------------------------------------------------------------------
---             Functions
+--  Functions
 ----------------------------------------------------------------------------*/
 
-extern void InitIcons(void);                           /// Init icons
-extern void LoadIcons(void);                           /// Load icons
-extern void CleanIcons(void);                          /// Cleanup icons
+extern void InitIcons(void);   /// Init icons
+extern void LoadIcons(void);   /// Load icons
+extern void CleanIcons(void);  /// Cleanup icons
 
        /// Name -> icon
 extern Icon* IconByIdent(const char* ident);
        /// Icon -> name
 extern const char* IdentOfIcon(const Icon* icon);
        /// Draw icon
-extern void DrawIcon(const Player*,Icon*,int,int);
+extern void DrawIcon(const Player*, Icon*, int, int);
        /// Draw icon of an unit
-extern void DrawUnitIcon(const Player*,Icon*,unsigned,int,int);
+extern void DrawUnitIcon(const Player*, Icon*, unsigned, int, int);
 
-extern void SaveIcons(CLFile*);                                /// Save icons
-extern void IconCclRegister(void);             /// Register CCL features
+       /// Save icons
+extern void SaveIcons(CLFile*);
+       /// Register CCL features
+extern void IconCclRegister(void);
 
 //@}
 
-#endif         // !__ICONS_H__
+#endif // !__ICONS_H__




reply via email to

[Prev in Thread] Current Thread [Next in Thread]