openttd-mini: comparison openttd.h

equal deleted inserted replaced

-:ca99d5b3f42d
+:7e123fec5b0b
 	GM_NORMAL,
 	GM_EDITOR
 };
 enum SwitchModes {
-	SM_NONE = 0,
+	SM_NONE            =  0,
-	SM_NEWGAME = 1,
+	SM_NEWGAME         =  1,
-	SM_EDITOR = 2,
+	SM_EDITOR          =  2,
-	SM_LOAD = 3,
+	SM_LOAD            =  3,
-	SM_MENU = 4,
+	SM_MENU            =  4,
-	SM_SAVE = 5,
+	SM_SAVE            =  5,
-	SM_GENRANDLAND = 6,
+	SM_GENRANDLAND     =  6,
-	SM_LOAD_SCENARIO = 9,
+	SM_LOAD_SCENARIO   =  9,
-	SM_START_SCENARIO = 10,
+	SM_START_SCENARIO  = 10,
 	SM_START_HEIGHTMAP = 11,
-	SM_LOAD_HEIGHTMAP = 12,
+	SM_LOAD_HEIGHTMAP  = 12,
 };
 /* Modes for GenerateWorld */
 enum GenerateWorldModes {
 } TileInfo;
 /* Display Options */
 enum {
-	DO_SHOW_TOWN_NAMES =    1 << 0,
+	DO_SHOW_TOWN_NAMES    = 1 << 0,
 	DO_SHOW_STATION_NAMES = 1 << 1,
-	DO_SHOW_SIGNS =         1 << 2,
+	DO_SHOW_SIGNS         = 1 << 2,
-	DO_FULL_ANIMATION =     1 << 3,
+	DO_FULL_ANIMATION     = 1 << 3,
-	DO_TRANS_BUILDINGS =    1 << 4,
+	DO_TRANS_BUILDINGS    = 1 << 4,
-	DO_FULL_DETAIL =        1 << 5,
+	DO_FULL_DETAIL        = 1 << 5,
-	DO_WAYPOINTS =          1 << 6,
+	DO_WAYPOINTS          = 1 << 6,
-	DO_TRANS_SIGNS =        1 << 7,
+	DO_TRANS_SIGNS        = 1 << 7,
 };
 /* Landscape types */
 enum {
-	LT_NORMAL = 0,
+	LT_NORMAL     = 0,
-	LT_HILLY = 1,
+	LT_HILLY      = 1,
-	LT_DESERT = 2,
+	LT_DESERT     = 2,
-	LT_CANDY = 3,
+	LT_CANDY      = 3,
 	NUM_LANDSCAPE = 4,
 };
 enum {
 	int town_council_tolerance;	// minimum required town ratings to be allowed to demolish stuff
 } GameDifficulty;
 enum {
 	// Temperate
-	CT_PASSENGERS = 0,
+	CT_PASSENGERS   =  0,
-	CT_COAL = 1,
+	CT_COAL         =  1,
-	CT_MAIL = 2,
+	CT_MAIL         =  2,
-	CT_OIL = 3,
+	CT_OIL          =  3,
-	CT_LIVESTOCK = 4,
+	CT_LIVESTOCK    =  4,
-	CT_GOODS = 5,
+	CT_GOODS        =  5,
-	CT_GRAIN = 6,
+	CT_GRAIN        =  6,
-	CT_WOOD = 7,
+	CT_WOOD         =  7,
-	CT_IRON_ORE = 8,
+	CT_IRON_ORE     =  8,
-	CT_STEEL = 9,
+	CT_STEEL        =  9,
-	CT_VALUABLES = 10,
+	CT_VALUABLES    = 10,
-	CT_FOOD = 11,
+	CT_FOOD         = 11,
 	// Arctic
-	CT_WHEAT = 6,
+	CT_WHEAT        =  6,
-	CT_HILLY_UNUSED = 8,
+	CT_HILLY_UNUSED =  8,
-	CT_PAPER = 9,
+	CT_PAPER        =  9,
-	CT_GOLD = 10,
+	CT_GOLD         = 10,
 	// Tropic
-	CT_RUBBER = 1,
+	CT_RUBBER       =  1,
-	CT_FRUIT = 4,
+	CT_FRUIT        =  4,
-	CT_MAIZE = 6,
+	CT_MAIZE        =  6,
-	CT_COPPER_ORE = 8,
+	CT_COPPER_ORE   =  8,
-	CT_WATER = 9,
+	CT_WATER        =  9,
-	CT_DIAMONDS = 10,
+	CT_DIAMONDS     = 10,
 	// Toyland
-	CT_SUGAR = 1,
+	CT_SUGAR        =  1,
-	CT_TOYS = 3,
+	CT_TOYS         =  3,
-	CT_BATTERIES = 4,
+	CT_BATTERIES    =  4,
-	CT_CANDY = 5,
+	CT_CANDY        =  5,
-	CT_TOFFEE = 6,
+	CT_TOFFEE       =  6,
-	CT_COLA = 7,
+	CT_COLA         =  7,
-	CT_COTTON_CANDY = 8,
+	CT_COTTON_CANDY =  8,
-	CT_BUBBLES = 9,
+	CT_BUBBLES      =  9,
-	CT_PLASTIC = 10,
+	CT_PLASTIC      = 10,
 	CT_FIZZY_DRINKS = 11,
-	NUM_CARGO = 12,
+	NUM_CARGO       = 12,
-	CT_INVALID = 0xFF
+	CT_INVALID      = 0xFF
 };
 typedef uint AcceptedCargo[NUM_CARGO];
 typedef struct TileDesc {
 	GetSlopeTilehProc *get_slope_tileh_proc;
 } TileTypeProcs;
 enum {
-	WC_MAIN_WINDOW = 0x0,
+	WC_MAIN_WINDOW              = 0x00,
-	WC_MAIN_TOOLBAR = 0x1,
+	WC_MAIN_TOOLBAR             = 0x01,
-	WC_STATUS_BAR = 0x2,
+	WC_STATUS_BAR               = 0x02,
-	WC_BUILD_TOOLBAR = 0x3,
+	WC_BUILD_TOOLBAR            = 0x03,
-	WC_NEWS_WINDOW = 0x4,
+	WC_NEWS_WINDOW              = 0x04,
-	WC_TOWN_DIRECTORY = 0x5,
+	WC_TOWN_DIRECTORY           = 0x05,
-	WC_STATION_LIST = 0x6,
+	WC_STATION_LIST             = 0x06,
-	WC_TOWN_VIEW = 0x7,
+	WC_TOWN_VIEW                = 0x07,
-	WC_SMALLMAP = 0x8,
+	WC_SMALLMAP                 = 0x08,
-	WC_TRAINS_LIST = 0x9,
+	WC_TRAINS_LIST              = 0x09,
-	WC_ROADVEH_LIST = 0xA,
+	WC_ROADVEH_LIST             = 0x0A,
-	WC_SHIPS_LIST = 0xB,
+	WC_SHIPS_LIST               = 0x0B,
-	WC_AIRCRAFT_LIST = 0xC,
+	WC_AIRCRAFT_LIST            = 0x0C,
-	WC_VEHICLE_VIEW = 0xD,
+	WC_VEHICLE_VIEW             = 0x0D,
-	WC_VEHICLE_DETAILS = 0xE,
+	WC_VEHICLE_DETAILS          = 0x0E,
-	WC_VEHICLE_REFIT = 0xF,
+	WC_VEHICLE_REFIT            = 0x0F,
-	WC_VEHICLE_ORDERS = 0x10,
+	WC_VEHICLE_ORDERS           = 0x10,
-	WC_STATION_VIEW = 0x11,
+	WC_STATION_VIEW             = 0x11,
-	WC_VEHICLE_DEPOT = 0x12,
+	WC_VEHICLE_DEPOT            = 0x12,
-	WC_BUILD_VEHICLE = 0x13,
+	WC_BUILD_VEHICLE            = 0x13,
-	WC_BUILD_BRIDGE = 0x14,
+	WC_BUILD_BRIDGE             = 0x14,
-	WC_ERRMSG = 0x15,
+	WC_ERRMSG                   = 0x15,
-	WC_ASK_ABANDON_GAME = 0x16,
+	WC_ASK_ABANDON_GAME         = 0x16,
-	WC_QUIT_GAME = 0x17,
+	WC_QUIT_GAME                = 0x17,
-	WC_BUILD_STATION = 0x18,
+	WC_BUILD_STATION            = 0x18,
-	WC_BUS_STATION = 0x19,
+	WC_BUS_STATION              = 0x19,
-	WC_TRUCK_STATION = 0x1A,
+	WC_TRUCK_STATION            = 0x1A,
-	WC_BUILD_DEPOT = 0x1B,
+	WC_BUILD_DEPOT              = 0x1B,
-	WC_COMPANY = 0x1D,
+	WC_COMPANY                  = 0x1D,
-	WC_FINANCES = 0x1E,
+	WC_FINANCES                 = 0x1E,
-	WC_PLAYER_COLOR = 0x1F,
+	WC_PLAYER_COLOR             = 0x1F,
-	WC_QUERY_STRING = 0x20,
+	WC_QUERY_STRING             = 0x20,
-	WC_SAVELOAD = 0x21,
+	WC_SAVELOAD                 = 0x21,
-	WC_SELECT_GAME = 0x22,
+	WC_SELECT_GAME              = 0x22,
-	WC_TOOLBAR_MENU = 0x24,
+	WC_TOOLBAR_MENU             = 0x24,
-	WC_INCOME_GRAPH = 0x25,
+	WC_INCOME_GRAPH             = 0x25,
-	WC_OPERATING_PROFIT = 0x26,
+	WC_OPERATING_PROFIT         = 0x26,
-	WC_TOOLTIPS = 0x27,
+	WC_TOOLTIPS                 = 0x27,
-	WC_INDUSTRY_VIEW = 0x28,
+	WC_INDUSTRY_VIEW            = 0x28,
-	WC_PLAYER_FACE = 0x29,
+	WC_PLAYER_FACE              = 0x29,
-	WC_LAND_INFO = 0x2A,
+	WC_LAND_INFO                = 0x2A,
-	WC_TOWN_AUTHORITY = 0x2B,
+	WC_TOWN_AUTHORITY           = 0x2B,
-	WC_SUBSIDIES_LIST = 0x2C,
+	WC_SUBSIDIES_LIST           = 0x2C,
-	WC_GRAPH_LEGEND = 0x2D,
+	WC_GRAPH_LEGEND             = 0x2D,
-	WC_DELIVERED_CARGO = 0x2E,
+	WC_DELIVERED_CARGO          = 0x2E,
-	WC_PERFORMANCE_HISTORY = 0x2F,
+	WC_PERFORMANCE_HISTORY      = 0x2F,
-	WC_COMPANY_VALUE = 0x30,
+	WC_COMPANY_VALUE            = 0x30,
-	WC_COMPANY_LEAGUE = 0x31,
+	WC_COMPANY_LEAGUE           = 0x31,
-	WC_BUY_COMPANY = 0x32,
+	WC_BUY_COMPANY              = 0x32,
-	WC_PAYMENT_RATES = 0x33,
+	WC_PAYMENT_RATES            = 0x33,
-	WC_ENGINE_PREVIEW = 0x35,
+	WC_ENGINE_PREVIEW           = 0x35,
-	WC_MUSIC_WINDOW = 0x36,
+	WC_MUSIC_WINDOW             = 0x36,
-	WC_MUSIC_TRACK_SELECTION = 0x37,
+	WC_MUSIC_TRACK_SELECTION    = 0x37,
-	WC_SCEN_LAND_GEN = 0x38, // also used for landscaping toolbar
+	WC_SCEN_LAND_GEN            = 0x38, // also used for landscaping toolbar
-	WC_ASK_RESET_LANDSCAPE = 0x39,
+	WC_ASK_RESET_LANDSCAPE      = 0x39,
-	WC_SCEN_TOWN_GEN = 0x3A,
+	WC_SCEN_TOWN_GEN            = 0x3A,
-	WC_SCEN_INDUSTRY = 0x3B,
+	WC_SCEN_INDUSTRY            = 0x3B,
-	WC_SCEN_BUILD_ROAD = 0x3C,
+	WC_SCEN_BUILD_ROAD          = 0x3C,
-	WC_BUILD_TREES = 0x3D,
+	WC_BUILD_TREES              = 0x3D,
-	WC_SEND_NETWORK_MSG = 0x3E,
+	WC_SEND_NETWORK_MSG         = 0x3E,
-	WC_DROPDOWN_MENU = 0x3F,
+	WC_DROPDOWN_MENU            = 0x3F,
-	WC_BUILD_INDUSTRY = 0x40,
+	WC_BUILD_INDUSTRY           = 0x40,
-	WC_GAME_OPTIONS = 0x41,
+	WC_GAME_OPTIONS             = 0x41,
-	WC_NETWORK_WINDOW = 0x42,
+	WC_NETWORK_WINDOW           = 0x42,
-	WC_INDUSTRY_DIRECTORY = 0x43,
+	WC_INDUSTRY_DIRECTORY       = 0x43,
-	WC_MESSAGE_HISTORY = 0x44,
+	WC_MESSAGE_HISTORY          = 0x44,
-	WC_CHEATS = 0x45,
+	WC_CHEATS                   = 0x45,
-	WC_PERFORMANCE_DETAIL = 0x46,
+	WC_PERFORMANCE_DETAIL       = 0x46,
-	WC_CONSOLE = 0x47,
+	WC_CONSOLE                  = 0x47,
-	WC_EXTRA_VIEW_PORT = 0x48,
+	WC_EXTRA_VIEW_PORT          = 0x48,
-	WC_CLIENT_LIST = 0x49,
+	WC_CLIENT_LIST              = 0x49,
-	WC_NETWORK_STATUS_WINDOW = 0x4A,
+	WC_NETWORK_STATUS_WINDOW    = 0x4A,
-	WC_CUSTOM_CURRENCY = 0x4B,
+	WC_CUSTOM_CURRENCY          = 0x4B,
-	WC_REPLACE_VEHICLE = 0x4C,
+	WC_REPLACE_VEHICLE          = 0x4C,
-	WC_HIGHSCORE = 0x4D,
+	WC_HIGHSCORE                = 0x4D,
-	WC_ENDSCREEN = 0x4E,
+	WC_ENDSCREEN                = 0x4E,
-	WC_SIGN_LIST = 0x4F,
+	WC_SIGN_LIST                = 0x4F,
-	WC_GENERATE_LANDSCAPE = 0x50,
+	WC_GENERATE_LANDSCAPE       = 0x50,
 	WC_GENERATE_PROGRESS_WINDOW = 0x51,
-	WC_OK_CANCEL_QUERY = 0x52,
+	WC_OK_CANCEL_QUERY          = 0x52,
 };
 enum {
-	EXPENSES_CONSTRUCTION = 0,
+	EXPENSES_CONSTRUCTION =  0,
-	EXPENSES_NEW_VEHICLES = 1,
+	EXPENSES_NEW_VEHICLES =  1,
-	EXPENSES_TRAIN_RUN = 2,
+	EXPENSES_TRAIN_RUN    =  2,
-	EXPENSES_ROADVEH_RUN = 3,
+	EXPENSES_ROADVEH_RUN  =  3,
-	EXPENSES_AIRCRAFT_RUN = 4,
+	EXPENSES_AIRCRAFT_RUN =  4,
-	EXPENSES_SHIP_RUN = 5,
+	EXPENSES_SHIP_RUN     =  5,
-	EXPENSES_PROPERTY = 6,
+	EXPENSES_PROPERTY     =  6,
-	EXPENSES_TRAIN_INC = 7,
+	EXPENSES_TRAIN_INC    =  7,
-	EXPENSES_ROADVEH_INC = 8,
+	EXPENSES_ROADVEH_INC  =  8,
-	EXPENSES_AIRCRAFT_INC = 9,
+	EXPENSES_AIRCRAFT_INC =  9,
-	EXPENSES_SHIP_INC = 10,
+	EXPENSES_SHIP_INC     = 10,
-	EXPENSES_LOAN_INT = 11,
+	EXPENSES_LOAN_INT     = 11,
-	EXPENSES_OTHER = 12,
+	EXPENSES_OTHER        = 12,
 };
 // special string constants
 enum SpecialStrings {
 	// special strings for town names. the town name is generated dynamically on request.
-	SPECSTR_TOWNNAME_START = 0x20C0,
+	SPECSTR_TOWNNAME_START     = 0x20C0,
-	SPECSTR_TOWNNAME_ENGLISH = SPECSTR_TOWNNAME_START,
+	SPECSTR_TOWNNAME_ENGLISH   = SPECSTR_TOWNNAME_START,
 	SPECSTR_TOWNNAME_FRENCH,
 	SPECSTR_TOWNNAME_GERMAN,
 	SPECSTR_TOWNNAME_AMERICAN,
 	SPECSTR_TOWNNAME_LATIN,
 	SPECSTR_TOWNNAME_SILLY,
 	SPECSTR_TOWNNAME_SWISS,
 	SPECSTR_TOWNNAME_DANISH,
 	SPECSTR_TOWNNAME_TURKISH,
 	SPECSTR_TOWNNAME_ITALIAN,
 	SPECSTR_TOWNNAME_CATALAN,
-	SPECSTR_TOWNNAME_LAST = SPECSTR_TOWNNAME_CATALAN,
+	SPECSTR_TOWNNAME_LAST      = SPECSTR_TOWNNAME_CATALAN,
 	// special strings for player names on the form "TownName transport".
-	SPECSTR_PLAYERNAME_START = 0x70EA,
+	SPECSTR_PLAYERNAME_START   = 0x70EA,
 	SPECSTR_PLAYERNAME_ENGLISH = SPECSTR_PLAYERNAME_START,
 	SPECSTR_PLAYERNAME_FRENCH,
 	SPECSTR_PLAYERNAME_GERMAN,
 	SPECSTR_PLAYERNAME_AMERICAN,
 	SPECSTR_PLAYERNAME_LATIN,
 	SPECSTR_PLAYERNAME_SILLY,
-	SPECSTR_PLAYERNAME_LAST = SPECSTR_PLAYERNAME_SILLY,
+	SPECSTR_PLAYERNAME_LAST    = SPECSTR_PLAYERNAME_SILLY,
-	SPECSTR_ANDCO_NAME = 0x70E6,
+	SPECSTR_ANDCO_NAME         = 0x70E6,
-	SPECSTR_PRESIDENT_NAME = 0x70E7,
+	SPECSTR_PRESIDENT_NAME     = 0x70E7,
-	SPECSTR_SONGNAME = 0x70E8,
+	SPECSTR_SONGNAME           = 0x70E8,
 	// reserve 32 strings for the *.lng files
-	SPECSTR_LANGUAGE_START = 0x7100,
+	SPECSTR_LANGUAGE_START     = 0x7100,
-	SPECSTR_LANGUAGE_END = 0x711f,
+	SPECSTR_LANGUAGE_END       = 0x711f,
 	// reserve 32 strings for various screen resolutions
-	SPECSTR_RESOLUTION_START = 0x7120,
+	SPECSTR_RESOLUTION_START   = 0x7120,
-	SPECSTR_RESOLUTION_END = 0x713f,
+	SPECSTR_RESOLUTION_END     = 0x713f,
 	// reserve 32 strings for screenshot formats
-	SPECSTR_SCREENSHOT_START = 0x7140,
+	SPECSTR_SCREENSHOT_START   = 0x7140,
-	SPECSTR_SCREENSHOT_END = 0x715F,
+	SPECSTR_SCREENSHOT_END     = 0x715F,
 	// Used to implement SetDParamStr
-	STR_SPEC_DYNSTRING = 0xF800,
+	STR_SPEC_DYNSTRING         = 0xF800,
-	STR_SPEC_USERSTRING = 0xF808,
+	STR_SPEC_USERSTRING        = 0xF808,
 };
 typedef void PlaceProc(TileIndex tile);
 enum {
 VARDEF byte _savegame_sort_order;
 #define INVALID_STRING_ID 0xFFFF
 enum {
-	MAX_SCREEN_WIDTH = 2048,
+	MAX_SCREEN_WIDTH  = 2048,
 	MAX_SCREEN_HEIGHT = 1200,
 };
 /* In certain windows you navigate with the arrow keys. Do not scroll the
 * gameview when here. Bitencoded variable that only allows scrolling if all
 * elements are zero */
 enum {
-	SCROLL_CON =  0,
+	SCROLL_CON  = 0,
 	SCROLL_EDIT = 1,
 	SCROLL_SAVE = 2,
 	SCROLL_CHAT = 4,
 };
 VARDEF byte _no_scroll;

changeset 4344	7e123fec5b0b
parent 4330	cf31daa8b321
child 4348	d9ddb0558a48