(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int

This commit is contained in:
rubidium
2010-05-13 09:44:44 +00:00
parent 793b0f0736
commit 398418b8fa
52 changed files with 170 additions and 251 deletions

View File

@@ -1098,7 +1098,7 @@ static const uint8 _farm_sounds[] = { SND_24_SHEEP, SND_25_COW, SND_26_HORSE };
/** Array with... hem... a sound of toyland */
static const uint8 _plastic_mine_sounds[] = { SND_33_PLASTIC_MINE };
enum {
enum IndustryTypes {
IT_COAL_MINE = 0,
IT_POWER_STATION = 1,
IT_SAWMILL = 2,

View File

@@ -33,9 +33,7 @@ enum TileSource {
TS_END
};
enum {
NUM_TRACKS_AT_PCP = 6
};
static const uint NUM_TRACKS_AT_PCP = 6;
/** Which PPPs are possible at all on a given PCP */
static const byte AllowedPPPonPCP[DIAGDIR_END] = {
@@ -316,12 +314,10 @@ struct SortableSpriteStruct {
int8 z_offset;
};
enum {
/** Distance between wire and rail */
ELRAIL_ELEVATION = 10,
/** Wires that a draw one level higher than the north corner. */
ELRAIL_ELEVRAISE = ELRAIL_ELEVATION + TILE_HEIGHT
};
/** Distance between wire and rail */
static const uint ELRAIL_ELEVATION = 10;
/** Wires that a draw one level higher than the north corner. */
static const uint ELRAIL_ELEVRAISE = ELRAIL_ELEVATION + TILE_HEIGHT;
static const SortableSpriteStruct CatenarySpriteData[] = {
/* X direction

View File

@@ -9,9 +9,7 @@
/** @file landscape_sprite.h Offsets of sprites to replace for non-temperate landscapes. */
enum {
END = 0xFFFF
};
static const SpriteID END = 0xFFFF;
static const SpriteID _landscape_spriteindexes_1[] = {
0xF67, 0xF9F,

View File

@@ -154,13 +154,11 @@ static const Colour _palettes[][256] = {
#define GET_PALETTE(x) _palettes[x]
/** Description of the length of the palette cycle animations */
enum {
EPV_CYCLES_DARK_WATER = 5, ///< length of the dark blue water animation
EPV_CYCLES_LIGHTHOUSE = 4, ///< length of the lighthouse/stadium animation
EPV_CYCLES_OIL_REFINERY = 7, ///< length of the oil refinery's fire animation
EPV_CYCLES_FIZZY_DRINK = 5, ///< length of the fizzy drinks animation
EPV_CYCLES_GLITTER_WATER = 15, ///< length of the glittery water animation
};
static const uint EPV_CYCLES_DARK_WATER = 5; ///< length of the dark blue water animation
static const uint EPV_CYCLES_LIGHTHOUSE = 4; ///< length of the lighthouse/stadium animation
static const uint EPV_CYCLES_OIL_REFINERY = 7; ///< length of the oil refinery's fire animation
static const uint EPV_CYCLES_FIZZY_DRINK = 5; ///< length of the fizzy drinks animation
static const uint EPV_CYCLES_GLITTER_WATER = 15; ///< length of the glittery water animation
/** Description of tables for the palette animation */
struct ExtraPaletteValues {

View File

@@ -14,10 +14,8 @@ struct DefaultUnicodeMapping {
byte key; ///< Character index of sprite
};
enum {
CLRA = 0, ///< Identifier to clear all glyphs at this codepoint
CLRL = 1, ///< Identifier to clear glyphs for large font at this codepoint
};
static const byte CLRA = 0; ///< Identifier to clear all glyphs at this codepoint
static const byte CLRL = 1; ///< Identifier to clear glyphs for large font at this codepoint
/* Default unicode mapping table for sprite based glyphs.
* This table allows us use unicode characters even though the glyphs don't