openttd-ottdgrfs: comparison src/gfxinit.cpp

equal deleted inserted replaced

-:45d0233e7d79
+:187e3ef04cc9
 /* $Id$ */
+/** @file gfxinit.cpp */
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
 #include "functions.h"
 #include "variables.h"
 #include "fontcache.h"
 #include <string.h>
 typedef struct MD5File {
-	const char * filename;     // filename
+	const char * filename;     ///< filename
-	md5_byte_t hash[16]; // md5 sum of the file
+	md5_byte_t hash[16];       ///< md5 sum of the file
 } MD5File;
 typedef struct FileList {
-	MD5File basic[4];     // grf files that always have to be loaded
+	MD5File basic[4];          ///< grf files that always have to be loaded
-	MD5File landscape[3]; // landscape specific grf files
+	MD5File landscape[3];      ///< landscape specific grf files
 } FileList;
 enum {
 	SKIP = 0xFFFE,
 	END  = 0xFFFF
 static bool FileMD5(const MD5File file, bool warn)
 {
 	FILE *f;
 	char buf[MAX_PATH];
-	// open file
+	/* open file */
 	snprintf(buf, lengthof(buf), "%s%s", _paths.data_dir, file.filename);
 	f = fopen(buf, "rb");
 #if !defined(WIN32)
 	if (f == NULL) {
 *
 * (Note: Also checks sample.cat for corruption) */
 void CheckExternalFiles(void)
 {
 	uint i;
-	// count of files from this version
+	/* count of files from this version */
 	uint dos = 0;
 	uint win = 0;
 	for (i = 0; i < 2; i++) if (FileMD5(files_dos.basic[i], true)) dos++;
 	for (i = 0; i < 3; i++) if (FileMD5(files_dos.landscape[i], true)) dos++;
 	}
 }
 static const SpriteID trg1idx[] = {
-	   0,    1, // Mouse cursor, ZZZ
+	   0,    1, ///< Mouse cursor, ZZZ
 /* Medium font */
-	   2,   92, // ' ' till 'z'
+	   2,   92, ///< ' ' till 'z'
 	SKIP,   36,
-	 160,  160, // Move ¾ to the correct position
+	 160,  160, ///< Move ¾ to the correct position
-	  98,   98, // Up arrow
+	  98,   98, ///< Up arrow
 	 131,  133,
-	SKIP,    1, // skip currency sign
+	SKIP,    1, ///< skip currency sign
 	 135,  135,
 	SKIP,    1,
 	 137,  137,
 	SKIP,    1,
 	 139,  139,
-	 140,  140, // TODO Down arrow
+	 140,  140, ///< @todo Down arrow
 	 141,  141,
-	 142,  142, // TODO Check mark
+	 142,  142, ///< @todo Check mark
-	 143,  143, // TODO Cross
+	 143,  143, ///< @todo Cross
 	 144,  144,
-	 145,  145, // TODO Right arrow
+	 145,  145, ///< @todo Right arrow
 	 146,  149,
-	 118,  122, // Transport markers
+	 118,  122, ///< Transport markers
 	SKIP,    2,
 	 157,  157,
-	 114,  115, // Small up/down arrows
+	 114,  115, ///< Small up/down arrows
 	SKIP,    1,
 	 161,  225,
 /* Small font */
-	 226,  316, // ' ' till 'z'
+	 226,  316, ///< ' ' till 'z'
 	SKIP,   36,
-	 384,  384, // Move ¾ to the correct position
+	 384,  384, ///< Move ¾ to the correct position
-	 322,  322, // Up arrow
+	 322,  322, ///< Up arrow
 	 355,  357,
-	SKIP,    1, // skip currency sign
+	SKIP,    1, ///< skip currency sign
 	 359,  359,
 	SKIP,    1,
 	 361,  361,
 	SKIP,    1,
 	 363,  363,
-	 364,  364, // TODO Down arrow
+	 364,  364, ////< @todo Down arrow
 	 365,  366,
 	SKIP,    1,
 	 368,  368,
-	 369,  369, // TODO Right arrow
+	 369,  369, ///< @todo Right arrow
 	 370,  373,
 	SKIP,    7,
 	 381,  381,
 	SKIP,    3,
 	 385,  449,
 /* Big font */
-	 450,  540, // ' ' till 'z'
+	 450,  540, ///< ' ' till 'z'
 	SKIP,   36,
-	 608,  608, // Move ¾ to the correct position
+	 608,  608, ///< Move ¾ to the correct position
 	SKIP,    1,
 	 579,  581,
 	SKIP,    1,
 	 583,  583,
 	SKIP,    5,
 * the old sprite-count offset from SPR_OPENTTD_BASE. With this there is no
 * correspondence of any kind with the ID's in the grf file, but results in
 * a maximum use of sprite slots. */
 static const SpriteID _openttd_grf_indexes[] = {
 	SPR_IMG_AUTORAIL, SPR_CURSOR_WAYPOINT, // icons etc
-	134, 134,  // euro symbol medium size
+	134, 134,  ///< euro symbol medium size
-	582, 582,  // euro symbol large size
+	582, 582,  ///<  euro symbol large size
-	358, 358,  // euro symbol tiny
+	358, 358,  ///<  euro symbol tiny
 	SPR_CURSOR_CANAL, SPR_IMG_FASTFORWARD, // more icons
-	648, 648, // nordic char: æ
+	648, 648, ///<  nordic char: æ
-	616, 616, // nordic char: Æ
+	616, 616, ///<  nordic char: Æ
-	666, 666, // nordic char: ø
+	666, 666, ///<  nordic char: ø
-	634, 634, // nordic char: Ø
+	634, 634, ///<  nordic char: Ø
 	SPR_PIN_UP, SPR_CURSOR_CLONE_TRAIN, // more icons
-	382, 383, // ¼ ½ tiny
+	382, 383, ///<  ¼ ½ tiny
-	158, 159, // ¼ ½ medium
+	158, 159, ///<  ¼ ½ medium
-	606, 607, // ¼ ½ large
+	606, 607, ///<  ¼ ½ large
-	360, 360, // ¦ tiny
+	360, 360, ///<  ¦ tiny
-	362, 362, // ¨ tiny
+	362, 362, ///<  ¨ tiny
-	136, 136, // ¦ medium
+	136, 136, ///<  ¦ medium
-	138, 138, // ¨ medium
+	138, 138, ///<  ¨ medium
-	584, 584, // ¦ large
+	584, 584, ///<  ¦ large
-	586, 586, // ¨ large
+	586, 586, ///<  ¨ large
-	626, 626, // Ð large
+	626, 626, ///<  Ð large
-	658, 658, // ð large
+	658, 658, ///<  ð large
-	374, 374, // ´ tiny
+	374, 374, ///<  ´ tiny
-	378, 378, // ¸ tiny
+	378, 378, ///<  ¸ tiny
-	150, 150, // ´ medium
+	150, 150, ///<  ´ medium
-	154, 154, // ¸ medium
+	154, 154, ///<  ¸ medium
-	598, 598, // ´ large
+	598, 598, ///<  ´ large
-	602, 602, // ¸ large
+	602, 602, ///<  ¸ large
-	640, 640, // Þ large
+	640, 640, ///<  Þ large
-	672, 672, // þ large
+	672, 672, ///<  þ large
-	380, 380, // º tiny
+	380, 380, ///<  º tiny
-	156, 156, // º medium
+	156, 156, ///<  º medium
-	604, 604, // º large
+	604, 604, ///<  º large
-	317, 320, // { | } ~ tiny
+	317, 320, ///<  { | } ~ tiny
-	 93,  96, // { | } ~ medium
+	 93,  96, ///<  { | } ~ medium
-	541, 544, // { | } ~ large
+	541, 544, ///<  { | } ~ large
 	SPR_HOUSE_ICON, SPR_HOUSE_ICON,
-	585, 585, // § large
+	585, 585, ///<  § large
-	587, 587, // © large
+	587, 587, ///<  © large
-	592, 592, // ® large
+	592, 592, ///<  ® large
-	594, 597, // ° ± ² ³ large
+	594, 597, ///<  ° ± ² ³ large
-	633, 633, // × large
+	633, 633, ///<  × large
-	665, 665, // ÷ large
+	665, 665, ///<  ÷ large
 	SPR_SELL_TRAIN, SPR_SHARED_ORDERS_ICON,
-	377, 377, // · small
+	377, 377, ///<  · small
-	153, 153, // · medium
+	153, 153, ///<  · medium
-	601, 601, // · large
+	601, 601, ///<  · large
 	SPR_WARNING_SIGN, SPR_WARNING_SIGN,
 	END
 };

branch	cpp_gui
changeset 6285	187e3ef04cc9
parent 6268	4b5241e5dd10
child 6298	c30fe89622df
child 6573	7624f942237f