dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.

Browse Source
This commit is contained in:
rubidium
2006-08-22 14:38:37 +00:00
parent 5f4dbbd522
commit 480af9c917
97 changed files with 5385 additions and 5386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ai/default/default.c
View File

@@ -1865,13 +1865,13 @@ typedef struct AiRailFinder {
} AiRailFinder; } AiRailFinder;
static const byte _ai_table_15[4][8] = { static const byte _ai_table_15[4][8] = {
{0, 0, 4, 3, 3, 1, 128+0, 64}, {0, 0, 4, 3, 3, 1, 128 + 0, 64},
{1, 1, 2, 0, 4, 2, 128+1, 65}, {1, 1, 2, 0, 4, 2, 128 + 1, 65},
{0, 2, 2, 3, 5, 1, 128+2, 66}, {0, 2, 2, 3, 5, 1, 128 + 2, 66},
{1, 3, 5, 0, 3, 2, 128+3, 67} {1, 3, 5, 0, 3, 2, 128 + 3, 67}
}; };
static const byte _dir_table_1[] = {3, 9, 12, 6}; static const byte _dir_table_1[] = { 3, 9, 12, 6};
static const byte _dir_table_2[] = {12, 6, 3, 9}; static const byte _dir_table_2[] = {12, 6, 3, 9};
@@ -2729,8 +2729,9 @@ typedef struct AiRoadEnum {
} AiRoadEnum; } AiRoadEnum;
static const byte _dir_by_track[] = { static const byte _dir_by_track[] = {
0,1,0,1,2,1, 0,0, 0, 1, 0, 1, 2, 1,
2,3,3,2,3,0, 0, 0,
2, 3, 3, 2, 3, 0,
}; };
static void AiBuildRoadRecursive(AiRoadFinder *arf, TileIndex tile, int dir); static void AiBuildRoadRecursive(AiRoadFinder *arf, TileIndex tile, int dir);

6
aircraft_cmd.c
View File

@@ -1721,18 +1721,18 @@ static AircraftStateHandler * const _aircraft_state_handlers[] = {
AircraftEventHandler_Landing, // LANDING = 15 AircraftEventHandler_Landing, // LANDING = 15
AircraftEventHandler_EndLanding, // ENDLANDING = 16 AircraftEventHandler_EndLanding, // ENDLANDING = 16
AircraftEventHandler_HeliLanding, // HELILANDING = 17 AircraftEventHandler_HeliLanding, // HELILANDING = 17
AircraftEventHandler_HeliEndLanding,// HELIENDLANDING = 18 AircraftEventHandler_HeliEndLanding, // HELIENDLANDING = 18
AircraftEventHandler_AtTerminal, // TERM7 = 19 AircraftEventHandler_AtTerminal, // TERM7 = 19
AircraftEventHandler_AtTerminal, // TERM8 = 20 AircraftEventHandler_AtTerminal, // TERM8 = 20
AircraftEventHandler_AtTerminal, // HELIPAD3 = 21 AircraftEventHandler_AtTerminal, // HELIPAD3 = 21
AircraftEventHandler_AtTerminal, // HELIPAD4 = 22 AircraftEventHandler_AtTerminal, // HELIPAD4 = 22
}; };
static void AirportClearBlock(const Vehicle* v, const AirportFTAClass* Airport) static void AirportClearBlock(const Vehicle *v, const AirportFTAClass *Airport)
{ {
// we have left the previous block, and entered the new one. Free the previous block // we have left the previous block, and entered the new one. Free the previous block
if (Airport->layout[v->u.air.previous_pos].block != Airport->layout[v->u.air.pos].block) { if (Airport->layout[v->u.air.previous_pos].block != Airport->layout[v->u.air.pos].block) {
Station* st = GetStation(v->u.air.targetairport); Station *st = GetStation(v->u.air.targetairport);
CLRBITS(st->airport_flags, Airport->layout[v->u.air.previous_pos].block); CLRBITS(st->airport_flags, Airport->layout[v->u.air.previous_pos].block);
} }

120
aircraft_gui.c
View File

@@ -224,14 +224,14 @@ static void NewAircraftWndProc(Window *w, WindowEvent *e)
} }
static const Widget _new_aircraft_widgets[] = { static const Widget _new_aircraft_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW },
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 239, 0, 13, STR_A005_NEW_AIRCRAFT, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 239, 0, 13, STR_A005_NEW_AIRCRAFT, STR_018C_WINDOW_TITLE_DRAG_THIS },
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 227, 14, 109, 0x401, STR_A025_AIRCRAFT_SELECTION_LIST}, { WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 227, 14, 109, 0x401, STR_A025_AIRCRAFT_SELECTION_LIST },
{ WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 228, 239, 14, 109, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 228, 239, 14, 109, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST },
{ WWT_IMGBTN, RESIZE_TB, 14, 0, 239, 110, 181, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_TB, 14, 0, 239, 110, 181, 0x0, STR_NULL },
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 114, 182, 193, STR_A006_BUILD_AIRCRAFT, STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 114, 182, 193, STR_A006_BUILD_AIRCRAFT, STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT },
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 115, 227, 182, 193, STR_A037_RENAME, STR_A038_RENAME_AIRCRAFT_TYPE}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 115, 227, 182, 193, STR_A037_RENAME, STR_A038_RENAME_AIRCRAFT_TYPE },
{ WWT_RESIZEBOX, RESIZE_TB, 14, 228, 239, 182, 193, 0x0, STR_RESIZE_BUTTON}, { WWT_RESIZEBOX, RESIZE_TB, 14, 228, 239, 182, 193, 0x0, STR_RESIZE_BUTTON },
{ WIDGETS_END}, { WIDGETS_END},
}; };
@@ -311,11 +311,11 @@ static void AircraftRefitWndProc(Window *w, WindowEvent *e)
} }
static const Widget _aircraft_refit_widgets[] = { static const Widget _aircraft_refit_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW },
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 239, 0, 13, STR_A03C_REFIT, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 239, 0, 13, STR_A03C_REFIT, STR_018C_WINDOW_TITLE_DRAG_THIS },
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 239, 14, 145, 0x0, STR_A03E_SELECT_TYPE_OF_CARGO_FOR}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 239, 14, 145, 0x0, STR_A03E_SELECT_TYPE_OF_CARGO_FOR },
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 239, 146, 167, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 239, 146, 167, 0x0, STR_NULL },
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 239, 168, 179, STR_A03D_REFIT_AIRCRAFT, STR_A03F_REFIT_AIRCRAFT_TO_CARRY}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 239, 168, 179, STR_A03D_REFIT_AIRCRAFT, STR_A03F_REFIT_AIRCRAFT_TO_CARRY },
{ WIDGETS_END}, { WIDGETS_END},
}; };
@@ -467,20 +467,20 @@ do_change_service_int:
static const Widget _aircraft_details_widgets[] = { static const Widget _aircraft_details_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW },
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 349, 0, 13, STR_A00C_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 349, 0, 13, STR_A00C_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS },
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 350, 389, 0, 13, STR_01AA_NAME, STR_A032_NAME_AIRCRAFT}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 350, 389, 0, 13, STR_01AA_NAME, STR_A032_NAME_AIRCRAFT },
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 389, 14, 55, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 389, 14, 55, 0x0, STR_NULL },
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 389, 56, 101, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 389, 56, 101, 0x0, STR_NULL },
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 10, 102, 107, STR_0188, STR_884D_INCREASE_SERVICING_INTERVAL}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 10, 102, 107, STR_0188, STR_884D_INCREASE_SERVICING_INTERVAL },
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 10, 108, 113, STR_0189, STR_884E_DECREASE_SERVICING_INTERVAL}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 10, 108, 113, STR_0189, STR_884E_DECREASE_SERVICING_INTERVAL },
{ WWT_IMGBTN, RESIZE_NONE, 14, 11, 389, 102, 113, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 11, 389, 102, 113, 0x0, STR_NULL },
{ WIDGETS_END}, { WIDGETS_END},
}; };
static const WindowDesc _aircraft_details_desc = { static const WindowDesc _aircraft_details_desc = {
-1,-1, 390, 114, -1, -1, 390, 114,
WC_VEHICLE_DETAILS,WC_VEHICLE_VIEW, WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_aircraft_details_widgets, _aircraft_details_widgets,
AircraftDetailsWndProc AircraftDetailsWndProc
@@ -519,7 +519,7 @@ static const Widget _aircraft_view_widgets[] = {
{ WWT_PUSHIMGBTN, RESIZE_LR, 14, 232, 249, 32, 49, SPR_CLONE_AIRCRAFT, STR_CLONE_AIRCRAFT_INFO }, { WWT_PUSHIMGBTN, RESIZE_LR, 14, 232, 249, 32, 49, SPR_CLONE_AIRCRAFT, STR_CLONE_AIRCRAFT_INFO },
{ WWT_PANEL, RESIZE_LRB, 14, 232, 249, 104, 103, 0x0, STR_NULL }, { WWT_PANEL, RESIZE_LRB, 14, 232, 249, 104, 103, 0x0, STR_NULL },
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 238, 249, 104, 115, 0x0, STR_NULL }, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 238, 249, 104, 115, 0x0, STR_NULL },
{ WIDGETS_END } { WIDGETS_END},
}; };
@@ -907,19 +907,19 @@ static void AircraftDepotWndProc(Window *w, WindowEvent *e)
} }
static const Widget _aircraft_depot_widgets[] = { static const Widget _aircraft_depot_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW },
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 318, 0, 13, STR_A002_AIRCRAFT_HANGAR, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 318, 0, 13, STR_A002_AIRCRAFT_HANGAR, STR_018C_WINDOW_TITLE_DRAG_THIS },
{ WWT_STICKYBOX, RESIZE_LR, 14, 319, 330, 0, 13, 0x0, STR_STICKY_BUTTON}, { WWT_STICKYBOX, RESIZE_LR, 14, 319, 330, 0, 13, 0x0, STR_STICKY_BUTTON },
{ WWT_PANEL, RESIZE_LRB, 14, 296, 318, 14, 13, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_LRB, 14, 296, 318, 14, 13, 0x0, STR_NULL },
{ WWT_IMGBTN, RESIZE_LRTB, 14, 296, 318, 14, 61, 0x2A9, STR_A023_DRAG_AIRCRAFT_TO_HERE_TO}, { WWT_IMGBTN, RESIZE_LRTB, 14, 296, 318, 14, 61, 0x2A9, STR_A023_DRAG_AIRCRAFT_TO_HERE_TO },
{ WWT_MATRIX, RESIZE_RB, 14, 0, 295, 14, 61, 0x204, STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT}, { WWT_MATRIX, RESIZE_RB, 14, 0, 295, 14, 61, 0x204, STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT },
{ WWT_SCROLLBAR, RESIZE_LRB, 14, 319, 330, 14, 61, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_SCROLLBAR, RESIZE_LRB, 14, 319, 330, 14, 61, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST },
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 105, 62, 73, STR_A003_NEW_AIRCRAFT, STR_A022_BUILD_NEW_AIRCRAFT}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 105, 62, 73, STR_A003_NEW_AIRCRAFT, STR_A022_BUILD_NEW_AIRCRAFT },
{WWT_NODISTXTBTN, RESIZE_TB, 14, 106, 212, 62, 73, STR_CLONE_AIRCRAFT, STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW}, {WWT_NODISTXTBTN, RESIZE_TB, 14, 106, 212, 62, 73, STR_CLONE_AIRCRAFT, STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW },
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 213, 318, 62, 73, STR_00E4_LOCATION, STR_A024_CENTER_MAIN_VIEW_ON_HANGAR}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 213, 318, 62, 73, STR_00E4_LOCATION, STR_A024_CENTER_MAIN_VIEW_ON_HANGAR },
{ WWT_PANEL, RESIZE_RTB, 14, 319, 318, 62, 73, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_RTB, 14, 319, 318, 62, 73, 0x0, STR_NULL },
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 319, 330, 62, 73, 0x0, STR_RESIZE_BUTTON}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 319, 330, 62, 73, 0x0, STR_RESIZE_BUTTON },
{ WIDGETS_END}, { WIDGETS_END},
}; };
@@ -971,34 +971,34 @@ static void DrawSmallOrderList(const Vehicle *v, int x, int y)
static const Widget _player_aircraft_widgets[] = { static const Widget _player_aircraft_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW },
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 247, 0, 13, STR_A009_AIRCRAFT, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 247, 0, 13, STR_A009_AIRCRAFT, STR_018C_WINDOW_TITLE_DRAG_THIS },
{ WWT_STICKYBOX, RESIZE_LR, 14, 248, 259, 0, 13, 0x0, STR_STICKY_BUTTON}, { WWT_STICKYBOX, RESIZE_LR, 14, 248, 259, 0, 13, 0x0, STR_STICKY_BUTTON },
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 80, 14, 25, STR_SORT_BY, STR_SORT_ORDER_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 80, 14, 25, STR_SORT_BY, STR_SORT_ORDER_TIP },
{ WWT_PANEL, RESIZE_NONE, 14, 81, 235, 14, 25, 0x0, STR_SORT_CRITERIA_TIP}, { WWT_PANEL, RESIZE_NONE, 14, 81, 235, 14, 25, 0x0, STR_SORT_CRITERIA_TIP },
{ WWT_TEXTBTN, RESIZE_NONE, 14, 236, 247, 14, 25, STR_0225, STR_SORT_CRITERIA_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 236, 247, 14, 25, STR_0225, STR_SORT_CRITERIA_TIP },
{ WWT_PANEL, RESIZE_RIGHT, 14, 248, 259, 14, 25, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_RIGHT, 14, 248, 259, 14, 25, 0x0, STR_NULL },
{ WWT_MATRIX, RESIZE_RB, 14, 0, 247, 26, 169, 0x401, STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT}, { WWT_MATRIX, RESIZE_RB, 14, 0, 247, 26, 169, 0x401, STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT },
{ WWT_SCROLLBAR, RESIZE_LRB, 14, 248, 259, 26, 169, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_SCROLLBAR, RESIZE_LRB, 14, 248, 259, 26, 169, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST },
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 124, 170, 181, STR_A003_NEW_AIRCRAFT, STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 124, 170, 181, STR_A003_NEW_AIRCRAFT, STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES },
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 125, 247, 170, 181, STR_REPLACE_VEHICLES, STR_REPLACE_HELP}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 125, 247, 170, 181, STR_REPLACE_VEHICLES, STR_REPLACE_HELP },
{ WWT_PANEL, RESIZE_RTB, 14, 248, 247, 170, 181, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_RTB, 14, 248, 247, 170, 181, 0x0, STR_NULL },
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 248, 259, 170, 181, 0x0, STR_RESIZE_BUTTON}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 248, 259, 170, 181, 0x0, STR_RESIZE_BUTTON },
{ WIDGETS_END}, { WIDGETS_END},
}; };
static const Widget _other_player_aircraft_widgets[] = { static const Widget _other_player_aircraft_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW },
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 247, 0, 13, STR_A009_AIRCRAFT, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 247, 0, 13, STR_A009_AIRCRAFT, STR_018C_WINDOW_TITLE_DRAG_THIS },
{ WWT_STICKYBOX, RESIZE_LR, 14, 248, 259, 0, 13, 0x0, STR_STICKY_BUTTON}, { WWT_STICKYBOX, RESIZE_LR, 14, 248, 259, 0, 13, 0x0, STR_STICKY_BUTTON },
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 80, 14, 25, STR_SORT_BY, STR_SORT_ORDER_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 80, 14, 25, STR_SORT_BY, STR_SORT_ORDER_TIP },
{ WWT_PANEL, RESIZE_NONE, 14, 81, 235, 14, 25, 0x0, STR_SORT_CRITERIA_TIP}, { WWT_PANEL, RESIZE_NONE, 14, 81, 235, 14, 25, 0x0, STR_SORT_CRITERIA_TIP },
{ WWT_TEXTBTN, RESIZE_NONE, 14, 236, 247, 14, 25, STR_0225, STR_SORT_CRITERIA_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 236, 247, 14, 25, STR_0225, STR_SORT_CRITERIA_TIP },
{ WWT_PANEL, RESIZE_RIGHT, 14, 248, 259, 14, 25, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_RIGHT, 14, 248, 259, 14, 25, 0x0, STR_NULL },
{ WWT_MATRIX, RESIZE_RB, 14, 0, 247, 26, 169, 0x401, STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT}, { WWT_MATRIX, RESIZE_RB, 14, 0, 247, 26, 169, 0x401, STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT },
{ WWT_SCROLLBAR, RESIZE_LRB, 14, 248, 259, 26, 169, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_SCROLLBAR, RESIZE_LRB, 14, 248, 259, 26, 169, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST },
{ WWT_PANEL, RESIZE_RTB, 14, 0, 247, 170, 181, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_RTB, 14, 0, 247, 170, 181, 0x0, STR_NULL },
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 248, 259, 170, 181, 0x0, STR_RESIZE_BUTTON}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 248, 259, 170, 181, 0x0, STR_RESIZE_BUTTON },
{ WIDGETS_END}, { WIDGETS_END},
}; };

16
airport.h
View File

@@ -30,14 +30,14 @@ enum {
}; };
enum { enum {
AMED_NOSPDCLAMP = 1<<0, AMED_NOSPDCLAMP = 1 << 0,
AMED_TAKEOFF = 1<<1, AMED_TAKEOFF = 1 << 1,
AMED_SLOWTURN = 1<<2, AMED_SLOWTURN = 1 << 2,
AMED_LAND = 1<<3, AMED_LAND = 1 << 3,
AMED_EXACTPOS = 1<<4, AMED_EXACTPOS = 1 << 4,
AMED_BRAKE = 1<<5, AMED_BRAKE = 1 << 5,
AMED_HELI_RAISE = 1<<6, AMED_HELI_RAISE = 1 << 6,
AMED_HELI_LOWER = 1<<7, AMED_HELI_LOWER = 1 << 7,
}; };
/* Movement States on Airports (headings target) */ /* Movement States on Airports (headings target) */

12
airport_gui.c
View File

@@ -113,12 +113,12 @@ static void BuildAirToolbWndProc(Window *w, WindowEvent *e)
} }
static const Widget _air_toolbar_widgets[] = { static const Widget _air_toolbar_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW },
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 73, 0, 13, STR_A000_AIRPORTS, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 7, 11, 73, 0, 13, STR_A000_AIRPORTS, STR_018C_WINDOW_TITLE_DRAG_THIS },
{ WWT_STICKYBOX, RESIZE_NONE, 7, 74, 85, 0, 13, 0x0, STR_STICKY_BUTTON}, { WWT_STICKYBOX, RESIZE_NONE, 7, 74, 85, 0, 13, 0x0, STR_STICKY_BUTTON },
{ WWT_PANEL, RESIZE_NONE, 7, 0, 41, 14, 35, 0x2E8, STR_A01E_BUILD_AIRPORT}, { WWT_PANEL, RESIZE_NONE, 7, 0, 41, 14, 35, 0x2E8, STR_A01E_BUILD_AIRPORT },
{ WWT_PANEL, RESIZE_NONE, 7, 42, 63, 14, 35, 0x2BF, STR_018D_DEMOLISH_BUILDINGS_ETC}, { WWT_PANEL, RESIZE_NONE, 7, 42, 63, 14, 35, 0x2BF, STR_018D_DEMOLISH_BUILDINGS_ETC },
{ WWT_PANEL, RESIZE_NONE, 7, 64, 85, 14, 35, SPR_IMG_LANDSCAPING, STR_LANDSCAPING_TOOLBAR_TIP}, { WWT_PANEL, RESIZE_NONE, 7, 64, 85, 14, 35, SPR_IMG_LANDSCAPING, STR_LANDSCAPING_TOOLBAR_TIP },
{ WIDGETS_END}, { WIDGETS_END},
}; };

1268
airport_movement.h
View File

File diff suppressed because it is too large Load Diff

14
command.h
View File

@@ -140,10 +140,10 @@ enum {
}; };
enum { enum {
DC_EXEC = 1, DC_EXEC = 0x01,
DC_AUTO = 2, // don't allow building on structures DC_AUTO = 0x02, // don't allow building on structures
DC_QUERY_COST = 4, // query cost only, don't build. DC_QUERY_COST = 0x04, // query cost only, don't build.
DC_NO_WATER = 8, // don't allow building on water DC_NO_WATER = 0x08, // don't allow building on water
DC_NO_RAIL_OVERLAP = 0x10, // don't allow overlap of rails (used in buildrail) DC_NO_RAIL_OVERLAP = 0x10, // don't allow overlap of rails (used in buildrail)
DC_AI_BUILDING = 0x20, // special building rules for AI DC_AI_BUILDING = 0x20, // special building rules for AI
DC_NO_TOWN_RATING = 0x40, // town rating does not disallow you from building DC_NO_TOWN_RATING = 0x40, // town rating does not disallow you from building
@@ -155,9 +155,9 @@ enum {
#define CMD_MSG(x) ((x)<<16) #define CMD_MSG(x) ((x)<<16)
enum { enum {
CMD_AUTO = 0x200, CMD_AUTO = 0x0200,
CMD_NO_WATER = 0x400, CMD_NO_WATER = 0x0400,
CMD_NETWORK_COMMAND = 0x800, // execute the command without sending it on the network CMD_NETWORK_COMMAND = 0x0800, // execute the command without sending it on the network
CMD_NO_TEST_IF_IN_NETWORK = 0x1000, // When enabled, the command will bypass the no-DC_EXEC round if in network CMD_NO_TEST_IF_IN_NETWORK = 0x1000, // When enabled, the command will bypass the no-DC_EXEC round if in network
CMD_SHOW_NO_ERROR = 0x2000, CMD_SHOW_NO_ERROR = 0x2000,
}; };

24
date.c
View File

@@ -34,18 +34,18 @@ void SetDate(Date date)
#define M(a, b) ((a << 5) | b) #define M(a, b) ((a << 5) | b)
static const uint16 _month_date_from_year_day[] = { static const uint16 _month_date_from_year_day[] = {
M(0,1),M(0,2),M(0,3),M(0,4),M(0,5),M(0,6),M(0,7),M(0,8),M(0,9),M(0,10),M(0,11),M(0,12),M(0,13),M(0,14),M(0,15),M(0,16),M(0,17),M(0,18),M(0,19),M(0,20),M(0,21),M(0,22),M(0,23),M(0,24),M(0,25),M(0,26),M(0,27),M(0,28),M(0,29),M(0,30),M(0,31), M( 0, 1), M( 0, 2), M( 0, 3), M( 0, 4), M( 0, 5), M( 0, 6), M( 0, 7), M( 0, 8), M( 0, 9), M( 0, 10), M( 0, 11), M( 0, 12), M( 0, 13), M( 0, 14), M( 0, 15), M( 0, 16), M( 0, 17), M( 0, 18), M( 0, 19), M( 0, 20), M( 0, 21), M( 0, 22), M( 0, 23), M( 0, 24), M( 0, 25), M( 0, 26), M( 0, 27), M( 0, 28), M( 0, 29), M( 0, 30), M( 0, 31),
M(1,1),M(1,2),M(1,3),M(1,4),M(1,5),M(1,6),M(1,7),M(1,8),M(1,9),M(1,10),M(1,11),M(1,12),M(1,13),M(1,14),M(1,15),M(1,16),M(1,17),M(1,18),M(1,19),M(1,20),M(1,21),M(1,22),M(1,23),M(1,24),M(1,25),M(1,26),M(1,27),M(1,28),M(1,29), M( 1, 1), M( 1, 2), M( 1, 3), M( 1, 4), M( 1, 5), M( 1, 6), M( 1, 7), M( 1, 8), M( 1, 9), M( 1, 10), M( 1, 11), M( 1, 12), M( 1, 13), M( 1, 14), M( 1, 15), M( 1, 16), M( 1, 17), M( 1, 18), M( 1, 19), M( 1, 20), M( 1, 21), M( 1, 22), M( 1, 23), M( 1, 24), M( 1, 25), M( 1, 26), M( 1, 27), M( 1, 28), M( 1, 29),
M(2,1),M(2,2),M(2,3),M(2,4),M(2,5),M(2,6),M(2,7),M(2,8),M(2,9),M(2,10),M(2,11),M(2,12),M(2,13),M(2,14),M(2,15),M(2,16),M(2,17),M(2,18),M(2,19),M(2,20),M(2,21),M(2,22),M(2,23),M(2,24),M(2,25),M(2,26),M(2,27),M(2,28),M(2,29),M(2,30),M(2,31), M( 2, 1), M( 2, 2), M( 2, 3), M( 2, 4), M( 2, 5), M( 2, 6), M( 2, 7), M( 2, 8), M( 2, 9), M( 2, 10), M( 2, 11), M( 2, 12), M( 2, 13), M( 2, 14), M( 2, 15), M( 2, 16), M( 2, 17), M( 2, 18), M( 2, 19), M( 2, 20), M( 2, 21), M( 2, 22), M( 2, 23), M( 2, 24), M( 2, 25), M( 2, 26), M( 2, 27), M( 2, 28), M( 2, 29), M( 2, 30), M( 2, 31),
M(3,1),M(3,2),M(3,3),M(3,4),M(3,5),M(3,6),M(3,7),M(3,8),M(3,9),M(3,10),M(3,11),M(3,12),M(3,13),M(3,14),M(3,15),M(3,16),M(3,17),M(3,18),M(3,19),M(3,20),M(3,21),M(3,22),M(3,23),M(3,24),M(3,25),M(3,26),M(3,27),M(3,28),M(3,29),M(3,30), M( 3, 1), M( 3, 2), M( 3, 3), M( 3, 4), M( 3, 5), M( 3, 6), M( 3, 7), M( 3, 8), M( 3, 9), M( 3, 10), M( 3, 11), M( 3, 12), M( 3, 13), M( 3, 14), M( 3, 15), M( 3, 16), M( 3, 17), M( 3, 18), M( 3, 19), M( 3, 20), M( 3, 21), M( 3, 22), M( 3, 23), M( 3, 24), M( 3, 25), M( 3, 26), M( 3, 27), M( 3, 28), M( 3, 29), M( 3, 30),
M(4,1),M(4,2),M(4,3),M(4,4),M(4,5),M(4,6),M(4,7),M(4,8),M(4,9),M(4,10),M(4,11),M(4,12),M(4,13),M(4,14),M(4,15),M(4,16),M(4,17),M(4,18),M(4,19),M(4,20),M(4,21),M(4,22),M(4,23),M(4,24),M(4,25),M(4,26),M(4,27),M(4,28),M(4,29),M(4,30),M(4,31), M( 4, 1), M( 4, 2), M( 4, 3), M( 4, 4), M( 4, 5), M( 4, 6), M( 4, 7), M( 4, 8), M( 4, 9), M( 4, 10), M( 4, 11), M( 4, 12), M( 4, 13), M( 4, 14), M( 4, 15), M( 4, 16), M( 4, 17), M( 4, 18), M( 4, 19), M( 4, 20), M( 4, 21), M( 4, 22), M( 4, 23), M( 4, 24), M( 4, 25), M( 4, 26), M( 4, 27), M( 4, 28), M( 4, 29), M( 4, 30), M( 4, 31),
M(5,1),M(5,2),M(5,3),M(5,4),M(5,5),M(5,6),M(5,7),M(5,8),M(5,9),M(5,10),M(5,11),M(5,12),M(5,13),M(5,14),M(5,15),M(5,16),M(5,17),M(5,18),M(5,19),M(5,20),M(5,21),M(5,22),M(5,23),M(5,24),M(5,25),M(5,26),M(5,27),M(5,28),M(5,29),M(5,30), M( 5, 1), M( 5, 2), M( 5, 3), M( 5, 4), M( 5, 5), M( 5, 6), M( 5, 7), M( 5, 8), M( 5, 9), M( 5, 10), M( 5, 11), M( 5, 12), M( 5, 13), M( 5, 14), M( 5, 15), M( 5, 16), M( 5, 17), M( 5, 18), M( 5, 19), M( 5, 20), M( 5, 21), M( 5, 22), M( 5, 23), M( 5, 24), M( 5, 25), M( 5, 26), M( 5, 27), M( 5, 28), M( 5, 29), M( 5, 30),
M(6,1),M(6,2),M(6,3),M(6,4),M(6,5),M(6,6),M(6,7),M(6,8),M(6,9),M(6,10),M(6,11),M(6,12),M(6,13),M(6,14),M(6,15),M(6,16),M(6,17),M(6,18),M(6,19),M(6,20),M(6,21),M(6,22),M(6,23),M(6,24),M(6,25),M(6,26),M(6,27),M(6,28),M(6,29),M(6,30),M(6,31), M( 6, 1), M( 6, 2), M( 6, 3), M( 6, 4), M( 6, 5), M( 6, 6), M( 6, 7), M( 6, 8), M( 6, 9), M( 6, 10), M( 6, 11), M( 6, 12), M( 6, 13), M( 6, 14), M( 6, 15), M( 6, 16), M( 6, 17), M( 6, 18), M( 6, 19), M( 6, 20), M( 6, 21), M( 6, 22), M( 6, 23), M( 6, 24), M( 6, 25), M( 6, 26), M( 6, 27), M( 6, 28), M( 6, 29), M( 6, 30), M( 6, 31),
M(7,1),M(7,2),M(7,3),M(7,4),M(7,5),M(7,6),M(7,7),M(7,8),M(7,9),M(7,10),M(7,11),M(7,12),M(7,13),M(7,14),M(7,15),M(7,16),M(7,17),M(7,18),M(7,19),M(7,20),M(7,21),M(7,22),M(7,23),M(7,24),M(7,25),M(7,26),M(7,27),M(7,28),M(7,29),M(7,30),M(7,31), M( 7, 1), M( 7, 2), M( 7, 3), M( 7, 4), M( 7, 5), M( 7, 6), M( 7, 7), M( 7, 8), M( 7, 9), M( 7, 10), M( 7, 11), M( 7, 12), M( 7, 13), M( 7, 14), M( 7, 15), M( 7, 16), M( 7, 17), M( 7, 18), M( 7, 19), M( 7, 20), M( 7, 21), M( 7, 22), M( 7, 23), M( 7, 24), M( 7, 25), M( 7, 26), M( 7, 27), M( 7, 28), M( 7, 29), M( 7, 30), M( 7, 31),
M(8,1),M(8,2),M(8,3),M(8,4),M(8,5),M(8,6),M(8,7),M(8,8),M(8,9),M(8,10),M(8,11),M(8,12),M(8,13),M(8,14),M(8,15),M(8,16),M(8,17),M(8,18),M(8,19),M(8,20),M(8,21),M(8,22),M(8,23),M(8,24),M(8,25),M(8,26),M(8,27),M(8,28),M(8,29),M(8,30), M( 8, 1), M( 8, 2), M( 8, 3), M( 8, 4), M( 8, 5), M( 8, 6), M( 8, 7), M( 8, 8), M( 8, 9), M( 8, 10), M( 8, 11), M( 8, 12), M( 8, 13), M( 8, 14), M( 8, 15), M( 8, 16), M( 8, 17), M( 8, 18), M( 8, 19), M( 8, 20), M( 8, 21), M( 8, 22), M( 8, 23), M( 8, 24), M( 8, 25), M( 8, 26), M( 8, 27), M( 8, 28), M( 8, 29), M( 8, 30),
M(9,1),M(9,2),M(9,3),M(9,4),M(9,5),M(9,6),M(9,7),M(9,8),M(9,9),M(9,10),M(9,11),M(9,12),M(9,13),M(9,14),M(9,15),M(9,16),M(9,17),M(9,18),M(9,19),M(9,20),M(9,21),M(9,22),M(9,23),M(9,24),M(9,25),M(9,26),M(9,27),M(9,28),M(9,29),M(9,30),M(9,31), M( 9, 1), M( 9, 2), M( 9, 3), M( 9, 4), M( 9, 5), M( 9, 6), M( 9, 7), M( 9, 8), M( 9, 9), M( 9, 10), M( 9, 11), M( 9, 12), M( 9, 13), M( 9, 14), M( 9, 15), M( 9, 16), M( 9, 17), M( 9, 18), M( 9, 19), M( 9, 20), M( 9, 21), M( 9, 22), M( 9, 23), M( 9, 24), M( 9, 25), M( 9, 26), M( 9, 27), M( 9, 28), M( 9, 29), M( 9, 30), M( 9, 31),
M(10,1),M(10,2),M(10,3),M(10,4),M(10,5),M(10,6),M(10,7),M(10,8),M(10,9),M(10,10),M(10,11),M(10,12),M(10,13),M(10,14),M(10,15),M(10,16),M(10,17),M(10,18),M(10,19),M(10,20),M(10,21),M(10,22),M(10,23),M(10,24),M(10,25),M(10,26),M(10,27),M(10,28),M(10,29),M(10,30), M(10, 1), M(10, 2), M(10, 3), M(10, 4), M(10, 5), M(10, 6), M(10, 7), M(10, 8), M(10, 9), M(10, 10), M(10, 11), M(10, 12), M(10, 13), M(10, 14), M(10, 15), M(10, 16), M(10, 17), M(10, 18), M(10, 19), M(10, 20), M(10, 21), M(10, 22), M(10, 23), M(10, 24), M(10, 25), M(10, 26), M(10, 27), M(10, 28), M(10, 29), M(10, 30),
M(11,1),M(11,2),M(11,3),M(11,4),M(11,5),M(11,6),M(11,7),M(11,8),M(11,9),M(11,10),M(11,11),M(11,12),M(11,13),M(11,14),M(11,15),M(11,16),M(11,17),M(11,18),M(11,19),M(11,20),M(11,21),M(11,22),M(11,23),M(11,24),M(11,25),M(11,26),M(11,27),M(11,28),M(11,29),M(11,30),M(11,31), M(11, 1), M(11, 2), M(11, 3), M(11, 4), M(11, 5), M(11, 6), M(11, 7), M(11, 8), M(11, 9), M(11, 10), M(11, 11), M(11, 12), M(11, 13), M(11, 14), M(11, 15), M(11, 16), M(11, 17), M(11, 18), M(11, 19), M(11, 20), M(11, 21), M(11, 22), M(11, 23), M(11, 24), M(11, 25), M(11, 26), M(11, 27), M(11, 28), M(11, 29), M(11, 30), M(11, 31),
}; };
#undef M #undef M

2
depot.c
View File

@@ -107,7 +107,7 @@ void InitializeDepot(void)
static const SaveLoad _depot_desc[] = { static const SaveLoad _depot_desc[] = {
SLE_CONDVAR(Depot, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Depot, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Depot, xy, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Depot, xy, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_VAR(Depot,town_index, SLE_UINT16), SLE_VAR(Depot, town_index, SLE_UINT16),
SLE_END() SLE_END()
}; };

32
disaster_cmd.c
View File

@@ -54,24 +54,24 @@ static void DisasterClearSquare(TileIndex tile)
} }
} }
static const SpriteID _disaster_images_1[] = {0xF41,0xF41,0xF41,0xF41,0xF41,0xF41,0xF41,0xF41}; static const SpriteID _disaster_images_1[] = {0xF41, 0xF41, 0xF41, 0xF41, 0xF41, 0xF41, 0xF41, 0xF41};
static const SpriteID _disaster_images_2[] = {0xF44,0xF44,0xF44,0xF44,0xF44,0xF44,0xF44,0xF44}; static const SpriteID _disaster_images_2[] = {0xF44, 0xF44, 0xF44, 0xF44, 0xF44, 0xF44, 0xF44, 0xF44};
static const SpriteID _disaster_images_3[] = {0xF4E,0xF4E,0xF4E,0xF4E,0xF4E,0xF4E,0xF4E,0xF4E}; static const SpriteID _disaster_images_3[] = {0xF4E, 0xF4E, 0xF4E, 0xF4E, 0xF4E, 0xF4E, 0xF4E, 0xF4E};
static const SpriteID _disaster_images_4[] = {0xF46,0xF46,0xF47,0xF47,0xF48,0xF48,0xF49,0xF49}; static const SpriteID _disaster_images_4[] = {0xF46, 0xF46, 0xF47, 0xF47, 0xF48, 0xF48, 0xF49, 0xF49};
static const SpriteID _disaster_images_5[] = {0xF4A,0xF4A,0xF4B,0xF4B,0xF4C,0xF4C,0xF4D,0xF4D}; static const SpriteID _disaster_images_5[] = {0xF4A, 0xF4A, 0xF4B, 0xF4B, 0xF4C, 0xF4C, 0xF4D, 0xF4D};
static const SpriteID _disaster_images_6[] = {0xF50,0xF50,0xF50,0xF50,0xF50,0xF50,0xF50,0xF50}; static const SpriteID _disaster_images_6[] = {0xF50, 0xF50, 0xF50, 0xF50, 0xF50, 0xF50, 0xF50, 0xF50};
static const SpriteID _disaster_images_7[] = {0xF51,0xF51,0xF51,0xF51,0xF51,0xF51,0xF51,0xF51}; static const SpriteID _disaster_images_7[] = {0xF51, 0xF51, 0xF51, 0xF51, 0xF51, 0xF51, 0xF51, 0xF51};
static const SpriteID _disaster_images_8[] = {0xF52,0xF52,0xF52,0xF52,0xF52,0xF52,0xF52,0xF52}; static const SpriteID _disaster_images_8[] = {0xF52, 0xF52, 0xF52, 0xF52, 0xF52, 0xF52, 0xF52, 0xF52};
static const SpriteID _disaster_images_9[] = {0xF3E,0xF3E,0xF3E,0xF3E,0xF3E,0xF3E,0xF3E,0xF3E}; static const SpriteID _disaster_images_9[] = {0xF3E, 0xF3E, 0xF3E, 0xF3E, 0xF3E, 0xF3E, 0xF3E, 0xF3E};
static const SpriteID * const _disaster_images[] = { static const SpriteID * const _disaster_images[] = {
_disaster_images_1,_disaster_images_1, _disaster_images_1, _disaster_images_1,
_disaster_images_2,_disaster_images_2, _disaster_images_2, _disaster_images_2,
_disaster_images_3,_disaster_images_3, _disaster_images_3, _disaster_images_3,
_disaster_images_8,_disaster_images_8,_disaster_images_9, _disaster_images_8, _disaster_images_8, _disaster_images_9,
_disaster_images_6,_disaster_images_6, _disaster_images_6, _disaster_images_6,
_disaster_images_7,_disaster_images_7, _disaster_images_7, _disaster_images_7,
_disaster_images_4,_disaster_images_5, _disaster_images_4, _disaster_images_5,
}; };
static void DisasterVehicleUpdateImage(Vehicle *v) static void DisasterVehicleUpdateImage(Vehicle *v)

24
economy.c
View File

@@ -1040,12 +1040,12 @@ no_add:;
} }
static const SaveLoad _subsidies_desc[] = { static const SaveLoad _subsidies_desc[] = {
SLE_VAR(Subsidy,cargo_type, SLE_UINT8), SLE_VAR(Subsidy, cargo_type, SLE_UINT8),
SLE_VAR(Subsidy,age, SLE_UINT8), SLE_VAR(Subsidy, age, SLE_UINT8),
SLE_CONDVAR(Subsidy,from, SLE_FILE_U8 | SLE_VAR_U16, 0, 4), SLE_CONDVAR(Subsidy, from, SLE_FILE_U8 | SLE_VAR_U16, 0, 4),
SLE_CONDVAR(Subsidy,from, SLE_UINT16, 5, SL_MAX_VERSION), SLE_CONDVAR(Subsidy, from, SLE_UINT16, 5, SL_MAX_VERSION),
SLE_CONDVAR(Subsidy,to, SLE_FILE_U8 | SLE_VAR_U16, 0, 4), SLE_CONDVAR(Subsidy, to, SLE_FILE_U8 | SLE_VAR_U16, 0, 4),
SLE_CONDVAR(Subsidy,to, SLE_UINT16, 5, SL_MAX_VERSION), SLE_CONDVAR(Subsidy, to, SLE_UINT16, 5, SL_MAX_VERSION),
SLE_END() SLE_END()
}; };
@@ -1647,12 +1647,12 @@ static void SaveLoad_CAPR(void)
} }
static const SaveLoad _economy_desc[] = { static const SaveLoad _economy_desc[] = {
SLE_VAR(Economy,max_loan, SLE_INT32), SLE_VAR(Economy, max_loan, SLE_INT32),
SLE_VAR(Economy,max_loan_unround, SLE_INT32), SLE_VAR(Economy, max_loan_unround, SLE_INT32),
SLE_VAR(Economy,fluct, SLE_FILE_I16 | SLE_VAR_I32), SLE_VAR(Economy, fluct, SLE_FILE_I16 | SLE_VAR_I32),
SLE_VAR(Economy,interest_rate, SLE_UINT8), SLE_VAR(Economy, interest_rate, SLE_UINT8),
SLE_VAR(Economy,infl_amount, SLE_UINT8), SLE_VAR(Economy, infl_amount, SLE_UINT8),
SLE_VAR(Economy,infl_amount_pr, SLE_UINT8), SLE_VAR(Economy, infl_amount_pr, SLE_UINT8),
SLE_END() SLE_END()
}; };

52
engine.c
View File

@@ -40,18 +40,18 @@ enum {
#define MC(cargo) (1 << cargo) #define MC(cargo) (1 << cargo)
const uint32 _default_refitmasks[NUM_VEHICLE_TYPES] = { const uint32 _default_refitmasks[NUM_VEHICLE_TYPES] = {
/* Trains */ /* Trains */
MC(GC_PASSENGERS)|MC(GC_COAL)|MC(GC_MAIL)|MC(GC_LIVESTOCK)|MC(GC_GOODS)|MC(GC_GRAIN)|MC(GC_WOOD)|MC(GC_IRON_ORE)| MC(GC_PASSENGERS) | MC(GC_COAL) | MC(GC_MAIL) | MC(GC_LIVESTOCK) | MC(GC_GOODS) | MC(GC_GRAIN) | MC(GC_WOOD) | MC(GC_IRON_ORE) |
MC(GC_STEEL)|MC(GC_VALUABLES)|MC(GC_PAPER)|MC(GC_FOOD)|MC(GC_FRUIT)|MC(GC_COPPER_ORE)|MC(GC_WATER)|MC(GC_SUGAR)| MC(GC_STEEL) | MC(GC_VALUABLES) | MC(GC_PAPER) | MC(GC_FOOD) | MC(GC_FRUIT) | MC(GC_COPPER_ORE) | MC(GC_WATER) | MC(GC_SUGAR) |
MC(GC_TOYS)|MC(GC_CANDY)|MC(GC_TOFFEE)|MC(GC_COLA)|MC(GC_COTTON_CANDY)|MC(GC_BUBBLES)|MC(GC_PLASTIC)|MC(GC_FIZZY_DRINKS), MC(GC_TOYS) | MC(GC_CANDY) | MC(GC_TOFFEE) | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES) | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS),
/* Road vehicles (not refittable by default) */ /* Road vehicles (not refittable by default) */
0, 0,
/* Ships */ /* Ships */
MC(GC_COAL)|MC(GC_MAIL)|MC(GC_LIVESTOCK)|MC(GC_GOODS)|MC(GC_GRAIN)|MC(GC_WOOD)|MC(GC_IRON_ORE)|MC(GC_STEEL)|MC(GC_VALUABLES)| MC(GC_COAL) | MC(GC_MAIL) | MC(GC_LIVESTOCK) | MC(GC_GOODS) | MC(GC_GRAIN) | MC(GC_WOOD) | MC(GC_IRON_ORE) | MC(GC_STEEL) | MC(GC_VALUABLES) |
MC(GC_PAPER)|MC(GC_FOOD)|MC(GC_FRUIT)|MC(GC_COPPER_ORE)|MC(GC_WATER)|MC(GC_RUBBER)|MC(GC_SUGAR)|MC(GC_TOYS)|MC(GC_BATTERIES)| MC(GC_PAPER) | MC(GC_FOOD) | MC(GC_FRUIT) | MC(GC_COPPER_ORE) | MC(GC_WATER) | MC(GC_RUBBER) | MC(GC_SUGAR) | MC(GC_TOYS) | MC(GC_BATTERIES) |
MC(GC_CANDY)|MC(GC_TOFFEE)|MC(GC_COLA)|MC(GC_COTTON_CANDY)|MC(GC_BUBBLES)|MC(GC_PLASTIC)|MC(GC_FIZZY_DRINKS), MC(GC_CANDY) | MC(GC_TOFFEE) | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES) | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS),
/* Aircraft */ /* Aircraft */
MC(GC_PASSENGERS)|MC(GC_MAIL)|MC(GC_GOODS)|MC(GC_VALUABLES)|MC(GC_FOOD)|MC(GC_FRUIT)|MC(GC_SUGAR)|MC(GC_TOYS)| MC(GC_PASSENGERS) | MC(GC_MAIL) | MC(GC_GOODS) | MC(GC_VALUABLES) | MC(GC_FOOD) | MC(GC_FRUIT) | MC(GC_SUGAR) | MC(GC_TOYS) |
MC(GC_BATTERIES)|MC(GC_CANDY)|MC(GC_TOFFEE)|MC(GC_COLA)|MC(GC_COTTON_CANDY)|MC(GC_BUBBLES)|MC(GC_PLASTIC)|MC(GC_FIZZY_DRINKS), MC(GC_BATTERIES) | MC(GC_CANDY) | MC(GC_TOFFEE) | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES) | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS),
/* Special/Disaster */ /* Special/Disaster */
0,0 0,0
}; };
@@ -606,25 +606,25 @@ static void Load_ERNW(void)
} }
static const SaveLoad _engine_desc[] = { static const SaveLoad _engine_desc[] = {
SLE_CONDVAR(Engine,intro_date, SLE_FILE_U16 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Engine, intro_date, SLE_FILE_U16 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Engine,intro_date, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Engine, intro_date, SLE_INT32, 31, SL_MAX_VERSION),
SLE_CONDVAR(Engine,age, SLE_FILE_U16 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Engine, age, SLE_FILE_U16 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Engine,age, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Engine, age, SLE_INT32, 31, SL_MAX_VERSION),
SLE_VAR(Engine,reliability, SLE_UINT16), SLE_VAR(Engine, reliability, SLE_UINT16),
SLE_VAR(Engine,reliability_spd_dec, SLE_UINT16), SLE_VAR(Engine, reliability_spd_dec, SLE_UINT16),
SLE_VAR(Engine,reliability_start, SLE_UINT16), SLE_VAR(Engine, reliability_start, SLE_UINT16),
SLE_VAR(Engine,reliability_max, SLE_UINT16), SLE_VAR(Engine, reliability_max, SLE_UINT16),
SLE_VAR(Engine,reliability_final, SLE_UINT16), SLE_VAR(Engine, reliability_final, SLE_UINT16),
SLE_VAR(Engine,duration_phase_1, SLE_UINT16), SLE_VAR(Engine, duration_phase_1, SLE_UINT16),
SLE_VAR(Engine,duration_phase_2, SLE_UINT16), SLE_VAR(Engine, duration_phase_2, SLE_UINT16),
SLE_VAR(Engine,duration_phase_3, SLE_UINT16), SLE_VAR(Engine, duration_phase_3, SLE_UINT16),
SLE_VAR(Engine,lifelength, SLE_UINT8), SLE_VAR(Engine, lifelength, SLE_UINT8),
SLE_VAR(Engine,flags, SLE_UINT8), SLE_VAR(Engine, flags, SLE_UINT8),
SLE_VAR(Engine,preview_player, SLE_UINT8), SLE_VAR(Engine, preview_player, SLE_UINT8),
SLE_VAR(Engine,preview_wait, SLE_UINT8), SLE_VAR(Engine, preview_wait, SLE_UINT8),
SLE_VAR(Engine,railtype, SLE_UINT8), SLE_VAR(Engine, railtype, SLE_UINT8),
SLE_VAR(Engine,player_avail, SLE_UINT8), SLE_VAR(Engine, player_avail, SLE_UINT8),
// reserve extra space in savegame here. (currently 16 bytes) // reserve extra space in savegame here. (currently 16 bytes)
SLE_CONDNULL(16, 2, SL_MAX_VERSION), SLE_CONDNULL(16, 2, SL_MAX_VERSION),

4
genworld_gui.c
View File

@@ -59,7 +59,7 @@ static inline void SetNewLandscapeType(byte landscape)
// no longer static to allow calling from outside module // no longer static to allow calling from outside module
const Widget _generate_landscape_widgets[] = { const Widget _generate_landscape_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 13, 11, 337, 0, 13, STR_WORLD_GENERATION_CAPTION,STR_NULL}, { WWT_CAPTION, RESIZE_NONE, 13, 11, 337, 0, 13, STR_WORLD_GENERATION_CAPTION, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 13, 0, 337, 14, 267, STR_NULL, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 13, 0, 337, 14, 267, STR_NULL, STR_NULL},
{ WWT_PANEL_2, RESIZE_NONE, 12, 10, 86, 24, 78, 0x1312, STR_030E_SELECT_TEMPERATE_LANDSCAPE}, { WWT_PANEL_2, RESIZE_NONE, 12, 10, 86, 24, 78, 0x1312, STR_030E_SELECT_TEMPERATE_LANDSCAPE},
@@ -110,7 +110,7 @@ const Widget _generate_landscape_widgets[] = {
const Widget _heightmap_load_widgets[] = { const Widget _heightmap_load_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 13, 11, 337, 0, 13, STR_WORLD_GENERATION_CAPTION,STR_NULL}, { WWT_CAPTION, RESIZE_NONE, 13, 11, 337, 0, 13, STR_WORLD_GENERATION_CAPTION, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 13, 0, 337, 14, 235, STR_NULL, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 13, 0, 337, 14, 235, STR_NULL, STR_NULL},
{ WWT_PANEL_2, RESIZE_NONE, 12, 10, 86, 24, 78, 0x1312, STR_030E_SELECT_TEMPERATE_LANDSCAPE}, { WWT_PANEL_2, RESIZE_NONE, 12, 10, 86, 24, 78, 0x1312, STR_030E_SELECT_TEMPERATE_LANDSCAPE},

54
graph_gui.c
View File

@@ -259,15 +259,15 @@ static void GraphLegendWndProc(Window *w, WindowEvent *e)
static const Widget _graph_legend_widgets[] = { static const Widget _graph_legend_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 249, 0, 13, STR_704E_KEY_TO_COMPANY_GRAPHS, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 249, 0, 13, STR_704E_KEY_TO_COMPANY_GRAPHS, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 249, 14, 113, 0x0,STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 249, 14, 113, 0x0, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 16, 27, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 16, 27, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 28, 39, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 28, 39, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 40, 51, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 40, 51, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 52, 63, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 52, 63, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 64, 75, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 64, 75, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 76, 87, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 76, 87, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 88, 99, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 88, 99, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 100, 111, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 2, 247, 100, 111, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WIDGETS_END}, { WIDGETS_END},
}; };
@@ -1059,25 +1059,25 @@ static const Widget _performance_rating_detail_widgets[] = {
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 298, 0, 13, STR_PERFORMANCE_DETAIL, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 298, 0, 13, STR_PERFORMANCE_DETAIL, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 14, 27, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 14, 27, 0x0, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 28, 47, 0x0,STR_PERFORMANCE_DETAIL_VEHICLES_TIP}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 28, 47, 0x0, STR_PERFORMANCE_DETAIL_VEHICLES_TIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 48, 67, 0x0,STR_PERFORMANCE_DETAIL_STATIONS_TIP}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 48, 67, 0x0, STR_PERFORMANCE_DETAIL_STATIONS_TIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 68, 87, 0x0,STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 68, 87, 0x0, STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 88, 107, 0x0,STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 88, 107, 0x0, STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 108, 127, 0x0,STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 108, 127, 0x0, STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 128, 147, 0x0,STR_PERFORMANCE_DETAIL_DELIVERED_TIP}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 128, 147, 0x0, STR_PERFORMANCE_DETAIL_DELIVERED_TIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 148, 167, 0x0,STR_PERFORMANCE_DETAIL_CARGO_TIP}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 148, 167, 0x0, STR_PERFORMANCE_DETAIL_CARGO_TIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 168, 187, 0x0,STR_PERFORMANCE_DETAIL_MONEY_TIP}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 168, 187, 0x0, STR_PERFORMANCE_DETAIL_MONEY_TIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 188, 207, 0x0,STR_PERFORMANCE_DETAIL_LOAN_TIP}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 188, 207, 0x0, STR_PERFORMANCE_DETAIL_LOAN_TIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 208, 227, 0x0,STR_PERFORMANCE_DETAIL_TOTAL_TIP}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 298, 208, 227, 0x0, STR_PERFORMANCE_DETAIL_TOTAL_TIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 38, 14, 26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 2, 38, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 39, 75, 14, 26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 39, 75, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 76, 112, 14, 26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 76, 112, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 113, 149, 14, 26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 113, 149, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 150, 186, 14, 26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 150, 186, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 187, 223, 14, 26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 187, 223, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 224, 260, 14, 26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 224, 260, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WWT_IMGBTN, RESIZE_NONE, 14, 261, 297, 14, 26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY}, { WWT_IMGBTN, RESIZE_NONE, 14, 261, 297, 14, 26, 0x0, STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
{ WIDGETS_END}, { WIDGETS_END},
}; };

46
industry_cmd.c
View File

@@ -1763,10 +1763,10 @@ static void UpdateIndustryStatistics(Industry *i)
} }
static const byte _new_industry_rand[4][32] = { static const byte _new_industry_rand[4][32] = {
{12,12,12,12,12,12,12, 0, 0, 6, 6, 9, 9, 3, 3, 3,18,18, 4, 4, 2, 2, 5, 5, 5, 5, 5, 5, 1, 1, 8, 8}, {12, 12, 12, 12, 12, 12, 12, 0, 0, 6, 6, 9, 9, 3, 3, 3, 18, 18, 4, 4, 2, 2, 5, 5, 5, 5, 5, 5, 1, 1, 8, 8},
{16,16,16, 0, 0, 0, 9, 9, 9, 9,13,13, 3, 3, 3, 3,15,15,15, 4, 4,11,11,11,11,11,14,14, 1, 1, 7, 7}, {16, 16, 16, 0, 0, 0, 9, 9, 9, 9, 13, 13, 3, 3, 3, 3, 15, 15, 15, 4, 4, 11, 11, 11, 11, 11, 14, 14, 1, 1, 7, 7},
{21,21,21,24,22,22,22,22,23,23,16,16,16, 4, 4,19,19,19,13,13,20,20,20,11,11,11,17,17,17,10,10,10}, {21, 21, 21, 24, 22, 22, 22, 22, 23, 23, 16, 16, 16, 4, 4, 19, 19, 19, 13, 13, 20, 20, 20, 11, 11, 11, 17, 17, 17, 10, 10, 10},
{30,30,30,36,36,31,31,31,27,27,27,28,28,28,26,26,26,34,34,34,35,35,35,29,29,29,32,32,32,33,33,33}, {30, 30, 30, 36, 36, 31, 31, 31, 27, 27, 27, 28, 28, 28, 26, 26, 26, 34, 34, 34, 35, 35, 35, 29, 29, 29, 32, 32, 32, 33, 33, 33},
}; };
static void MaybeNewIndustry(uint32 r) static void MaybeNewIndustry(uint32 r)
@@ -1905,7 +1905,7 @@ const TileTypeProcs _tile_type_industry_procs = {
ClearTile_Industry, /* clear_tile_proc */ ClearTile_Industry, /* clear_tile_proc */
GetAcceptedCargo_Industry, /* get_accepted_cargo_proc */ GetAcceptedCargo_Industry, /* get_accepted_cargo_proc */
GetTileDesc_Industry, /* get_tile_desc_proc */ GetTileDesc_Industry, /* get_tile_desc_proc */
GetTileTrackStatus_Industry,/* get_tile_track_status_proc */ GetTileTrackStatus_Industry, /* get_tile_track_status_proc */
ClickTile_Industry, /* click_tile_proc */ ClickTile_Industry, /* click_tile_proc */
AnimateTile_Industry, /* animate_tile_proc */ AnimateTile_Industry, /* animate_tile_proc */
TileLoop_Industry, /* tile_loop_proc */ TileLoop_Industry, /* tile_loop_proc */
@@ -1918,28 +1918,28 @@ const TileTypeProcs _tile_type_industry_procs = {
static const SaveLoad _industry_desc[] = { static const SaveLoad _industry_desc[] = {
SLE_CONDVAR(Industry, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Industry, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Industry, xy, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Industry, xy, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_VAR(Industry,width, SLE_UINT8), SLE_VAR(Industry, width, SLE_UINT8),
SLE_VAR(Industry,height, SLE_UINT8), SLE_VAR(Industry, height, SLE_UINT8),
SLE_REF(Industry,town, REF_TOWN), SLE_REF(Industry, town, REF_TOWN),
SLE_ARR(Industry,produced_cargo, SLE_UINT8, 2), SLE_ARR(Industry, produced_cargo, SLE_UINT8, 2),
SLE_ARR(Industry,cargo_waiting, SLE_UINT16, 2), SLE_ARR(Industry, cargo_waiting, SLE_UINT16, 2),
SLE_ARR(Industry,production_rate, SLE_UINT8, 2), SLE_ARR(Industry, production_rate, SLE_UINT8, 2),
SLE_ARR(Industry,accepts_cargo, SLE_UINT8, 3), SLE_ARR(Industry, accepts_cargo, SLE_UINT8, 3),
SLE_VAR(Industry,prod_level, SLE_UINT8), SLE_VAR(Industry, prod_level, SLE_UINT8),
SLE_ARR(Industry,last_mo_production,SLE_UINT16, 2), SLE_ARR(Industry, last_mo_production, SLE_UINT16, 2),
SLE_ARR(Industry,last_mo_transported,SLE_UINT16, 2), SLE_ARR(Industry, last_mo_transported, SLE_UINT16, 2),
SLE_ARR(Industry,pct_transported,SLE_UINT8, 2), SLE_ARR(Industry, pct_transported, SLE_UINT8, 2),
SLE_ARR(Industry,total_production,SLE_UINT16, 2), SLE_ARR(Industry, total_production, SLE_UINT16, 2),
SLE_ARR(Industry,total_transported,SLE_UINT16, 2), SLE_ARR(Industry, total_transported, SLE_UINT16, 2),
SLE_VAR(Industry,counter, SLE_UINT16), SLE_VAR(Industry, counter, SLE_UINT16),
SLE_VAR(Industry,type, SLE_UINT8), SLE_VAR(Industry, type, SLE_UINT8),
SLE_VAR(Industry,owner, SLE_UINT8), SLE_VAR(Industry, owner, SLE_UINT8),
SLE_VAR(Industry,color_map, SLE_UINT8), SLE_VAR(Industry, color_map, SLE_UINT8),
SLE_CONDVAR(Industry, last_prod_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Industry, last_prod_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Industry, last_prod_year, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Industry, last_prod_year, SLE_INT32, 31, SL_MAX_VERSION),
SLE_VAR(Industry,was_cargo_delivered,SLE_UINT8), SLE_VAR(Industry, was_cargo_delivered, SLE_UINT8),
// reserve extra space in savegame here. (currently 32 bytes) // reserve extra space in savegame here. (currently 32 bytes)
SLE_CONDNULL(32, 2, SL_MAX_VERSION), SLE_CONDNULL(32, 2, SL_MAX_VERSION),

50
industry_gui.c
View File

@@ -75,7 +75,7 @@ static const Widget _build_industry_land1_widgets[] = {
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024C_PAPER_MILL, STR_026E_CONSTRUCT_PAPER_MILL}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024C_PAPER_MILL, STR_026E_CONSTRUCT_PAPER_MILL},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_024D_FOOD_PROCESSING_PLANT,STR_026F_CONSTRUCT_FOOD_PROCESSING}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_024E_PRINTING_WORKS, STR_0270_CONSTRUCT_PRINTING_WORKS}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_024E_PRINTING_WORKS, STR_0270_CONSTRUCT_PRINTING_WORKS},
{ WIDGETS_END}, { WIDGETS_END},
}; };
@@ -85,7 +85,7 @@ static const Widget _build_industry_land2_widgets[] = {
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 115, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 115, 0x0, STR_NULL},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0250_LUMBER_MILL, STR_0273_CONSTRUCT_LUMBER_MILL_TO}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0250_LUMBER_MILL, STR_0273_CONSTRUCT_LUMBER_MILL_TO},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024D_FOOD_PROCESSING_PLANT,STR_026F_CONSTRUCT_FOOD_PROCESSING}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0254_WATER_TOWER, STR_0277_CONSTRUCT_WATER_TOWER_CAN}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0254_WATER_TOWER, STR_0277_CONSTRUCT_WATER_TOWER_CAN},
@@ -105,10 +105,10 @@ static const Widget _build_industry_land3_widgets[] = {
static const Widget _build_industry_land0_widgets_extra[] = { static const Widget _build_industry_land0_widgets_extra[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY,STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 187, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 187, 0x0, STR_NULL},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0241_POWER_STATION,STR_0263_CONSTRUCT_POWER_STATION}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_0242_SAWMILL, STR_0264_CONSTRUCT_SAWMILL}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_0242_SAWMILL, STR_0264_CONSTRUCT_SAWMILL},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
@@ -132,14 +132,14 @@ static const Widget _build_industry_land1_widgets_extra[] = {
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024C_PAPER_MILL, STR_026E_CONSTRUCT_PAPER_MILL}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024C_PAPER_MILL, STR_026E_CONSTRUCT_PAPER_MILL},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_024D_FOOD_PROCESSING_PLANT,STR_026F_CONSTRUCT_FOOD_PROCESSING}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_024E_PRINTING_WORKS, STR_0270_CONSTRUCT_PRINTING_WORKS}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_024E_PRINTING_WORKS, STR_0270_CONSTRUCT_PRINTING_WORKS},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 81+3, 92+3, STR_0240_COAL_MINE, STR_CONSTRUCT_COAL_MINE_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 84, 95, STR_0240_COAL_MINE, STR_CONSTRUCT_COAL_MINE_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 94+3, 105+3, STR_0243_FOREST, STR_CONSTRUCT_FOREST_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 97, 108, STR_0243_FOREST, STR_CONSTRUCT_FOREST_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 107+3, 118+3, STR_0248_FARM, STR_CONSTRUCT_FARM_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 110, 121, STR_0248_FARM, STR_CONSTRUCT_FARM_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 120+3, 131+3, STR_024A_OIL_WELLS, STR_CONSTRUCT_OIL_WELLS_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 123, 134, STR_024A_OIL_WELLS, STR_CONSTRUCT_OIL_WELLS_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 133+3, 144+3, STR_024F_GOLD_MINE, STR_CONSTRUCT_GOLD_MINE_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 136, 147, STR_024F_GOLD_MINE, STR_CONSTRUCT_GOLD_MINE_TIP},
{ WIDGETS_END}, { WIDGETS_END},
}; };
@@ -149,18 +149,18 @@ static const Widget _build_industry_land2_widgets_extra[] = {
{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 200, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 200, 0x0, STR_NULL},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0250_LUMBER_MILL, STR_0273_CONSTRUCT_LUMBER_MILL_TO}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0250_LUMBER_MILL, STR_0273_CONSTRUCT_LUMBER_MILL_TO},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024D_FOOD_PROCESSING_PLANT,STR_026F_CONSTRUCT_FOOD_PROCESSING}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0254_WATER_TOWER, STR_0277_CONSTRUCT_WATER_TOWER_CAN}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0254_WATER_TOWER, STR_0277_CONSTRUCT_WATER_TOWER_CAN},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 81+3, 92+3, STR_024A_OIL_WELLS,STR_CONSTRUCT_OIL_WELLS_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 84, 95, STR_024A_OIL_WELLS, STR_CONSTRUCT_OIL_WELLS_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 94+3, 105+3, STR_0255_DIAMOND_MINE, STR_CONSTRUCT_DIAMOND_MINE_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 97, 108, STR_0255_DIAMOND_MINE, STR_CONSTRUCT_DIAMOND_MINE_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 107+3, 118+3, STR_0256_COPPER_ORE_MINE, STR_CONSTRUCT_COPPER_ORE_MINE_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 110, 121, STR_0256_COPPER_ORE_MINE, STR_CONSTRUCT_COPPER_ORE_MINE_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 120+3, 131+3, STR_0248_FARM, STR_CONSTRUCT_FARM_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 123, 134, STR_0248_FARM, STR_CONSTRUCT_FARM_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 133+3, 144+3, STR_0251_FRUIT_PLANTATION, STR_CONSTRUCT_FRUIT_PLANTATION_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 136, 147, STR_0251_FRUIT_PLANTATION, STR_CONSTRUCT_FRUIT_PLANTATION_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 146+3, 157+3, STR_0252_RUBBER_PLANTATION,STR_CONSTRUCT_RUBBER_PLANTATION_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 149, 160, STR_0252_RUBBER_PLANTATION, STR_CONSTRUCT_RUBBER_PLANTATION_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 159+3, 170+3, STR_0253_WATER_SUPPLY, STR_CONSTRUCT_WATER_SUPPLY_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 162, 173, STR_0253_WATER_SUPPLY, STR_CONSTRUCT_WATER_SUPPLY_TIP},
{ WIDGETS_END}, { WIDGETS_END},
}; };
@@ -174,13 +174,13 @@ static const Widget _build_industry_land3_widgets_extra[] = {
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_025C_TOY_FACTORY, STR_027F_CONSTRUCT_TOY_FACTORY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_025C_TOY_FACTORY, STR_027F_CONSTRUCT_TOY_FACTORY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_025E_FIZZY_DRINK_FACTORY, STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_025E_FIZZY_DRINK_FACTORY, STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68+3, 79+3, STR_0257_COTTON_CANDY_FOREST,STR_CONSTRUCT_COTTON_CANDY_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 71, 82, STR_0257_COTTON_CANDY_FOREST, STR_CONSTRUCT_COTTON_CANDY_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 81+3, 92+3, STR_0259_BATTERY_FARM, STR_CONSTRUCT_BATTERY_FARM_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 84, 95, STR_0259_BATTERY_FARM, STR_CONSTRUCT_BATTERY_FARM_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 94+3, 105+3, STR_025A_COLA_WELLS, STR_CONSTRUCT_COLA_WELLS_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 97, 108, STR_025A_COLA_WELLS, STR_CONSTRUCT_COLA_WELLS_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 107+3, 118+3, STR_025D_PLASTIC_FOUNTAINS,STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 110, 121, STR_025D_PLASTIC_FOUNTAINS, STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 120+3, 131+3, STR_025F_BUBBLE_GENERATOR, STR_CONSTRUCT_BUBBLE_GENERATOR_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 123, 134, STR_025F_BUBBLE_GENERATOR, STR_CONSTRUCT_BUBBLE_GENERATOR_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 133+3, 144+3, STR_0260_TOFFEE_QUARRY, STR_CONSTRUCT_TOFFEE_QUARRY_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 136, 147, STR_0260_TOFFEE_QUARRY, STR_CONSTRUCT_TOFFEE_QUARRY_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 146+3, 157+3, STR_0261_SUGAR_MINE, STR_CONSTRUCT_SUGAR_MINE_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 149, 160, STR_0261_SUGAR_MINE, STR_CONSTRUCT_SUGAR_MINE_TIP},
{ WIDGETS_END}, { WIDGETS_END},
}; };

2
intro_gui.c
View File

@@ -21,7 +21,7 @@ static const Widget _select_game_widgets[] = {
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 22, 33, STR_0141_LOAD_GAME, STR_02FC_LOAD_A_SAVED_GAME}, { WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 22, 33, STR_0141_LOAD_GAME, STR_02FC_LOAD_A_SAVED_GAME},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 40, 51, STR_029A_PLAY_SCENARIO, STR_0303_START_A_NEW_GAME_USING}, { WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 40, 51, STR_029A_PLAY_SCENARIO, STR_0303_START_A_NEW_GAME_USING},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 40, 51, STR_PLAY_HEIGHTMAP, STR_PLAY_HEIGHTMAP_HINT}, { WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 40, 51, STR_PLAY_HEIGHTMAP, STR_PLAY_HEIGHTMAP_HINT},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 58, 69, STR_0220_CREATE_SCENARIO,STR_02FE_CREATE_A_CUSTOMIZED_GAME}, { WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 58, 69, STR_0220_CREATE_SCENARIO, STR_02FE_CREATE_A_CUSTOMIZED_GAME},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 58, 69, STR_MULTIPLAYER, STR_0300_SELECT_MULTIPLAYER_GAME}, { WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 58, 69, STR_MULTIPLAYER, STR_0300_SELECT_MULTIPLAYER_GAME},
{ WWT_PANEL_2, RESIZE_NONE, 12, 10, 86, 77, 131, 0x1312, STR_030E_SELECT_TEMPERATE_LANDSCAPE}, { WWT_PANEL_2, RESIZE_NONE, 12, 10, 86, 77, 131, 0x1312, STR_030E_SELECT_TEMPERATE_LANDSCAPE},

4
landscape.c
View File

@@ -50,8 +50,8 @@ const TileTypeProcs * const _tile_type_procs[16] = {
/* landscape slope => sprite */ /* landscape slope => sprite */
const byte _tileh_to_sprite[32] = { const byte _tileh_to_sprite[32] = {
0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0,
0,0,0,0,0,0,0,16,0,0,0,17,0,15,18,0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 17, 0, 15, 18, 0,
}; };
const byte _inclined_tileh[] = { const byte _inclined_tileh[] = {

26
main_gui.c
View File

@@ -1187,13 +1187,13 @@ static const Widget _scen_edit_land_gen_widgets[] = {
static const int8 _multi_terraform_coords[][2] = { static const int8 _multi_terraform_coords[][2] = {
{ 0, -2}, { 0, -2},
{ 4, 0},{ -4, 0},{ 0, 2}, { 4, 0}, { -4, 0}, { 0, 2},
{ -8, 2},{ -4, 4},{ 0, 6},{ 4, 4},{ 8, 2}, { -8, 2}, { -4, 4}, { 0, 6}, { 4, 4}, { 8, 2},
{-12, 0},{ -8, -2},{ -4, -4},{ 0, -6},{ 4, -4},{ 8, -2},{ 12, 0}, {-12, 0}, { -8, -2}, { -4, -4}, { 0, -6}, { 4, -4}, { 8, -2}, { 12, 0},
{-16, 2},{-12, 4},{ -8, 6},{ -4, 8},{ 0, 10},{ 4, 8},{ 8, 6},{ 12, 4},{ 16, 2}, {-16, 2}, {-12, 4}, { -8, 6}, { -4, 8}, { 0, 10}, { 4, 8}, { 8, 6}, { 12, 4}, { 16, 2},
{-20, 0},{-16, -2},{-12, -4},{ -8, -6},{ -4, -8},{ 0,-10},{ 4, -8},{ 8, -6},{ 12, -4},{ 16, -2},{ 20, 0}, {-20, 0}, {-16, -2}, {-12, -4}, { -8, -6}, { -4, -8}, { 0,-10}, { 4, -8}, { 8, -6}, { 12, -4}, { 16, -2}, { 20, 0},
{-24, 2},{-20, 4},{-16, 6},{-12, 8},{ -8, 10},{ -4, 12},{ 0, 14},{ 4, 12},{ 8, 10},{ 12, 8},{ 16, 6},{ 20, 4},{ 24, 2}, {-24, 2}, {-20, 4}, {-16, 6}, {-12, 8}, { -8, 10}, { -4, 12}, { 0, 14}, { 4, 12}, { 8, 10}, { 12, 8}, { 16, 6}, { 20, 4}, { 24, 2},
{-28, 0},{-24, -2},{-20, -4},{-16, -6},{-12, -8},{ -8,-10},{ -4,-12},{ 0,-14},{ 4,-12},{ 8,-10},{ 12, -8},{ 16, -6},{ 20, -4},{ 24, -2},{ 28, 0}, {-28, 0}, {-24, -2}, {-20, -4}, {-16, -6}, {-12, -8}, { -8,-10}, { -4,-12}, { 0,-14}, { 4,-12}, { 8,-10}, { 12, -8}, { 16, -6}, { 20, -4}, { 24, -2}, { 28, 0},
}; };
// TODO - Merge with terraform_gui.c (move there) after I have cooled down at its braindeadness // TODO - Merge with terraform_gui.c (move there) after I have cooled down at its braindeadness
@@ -1529,7 +1529,7 @@ static const Widget _scenedit_industry_desert_widgets[] = {
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0250_LUMBER_MILL, STR_0273_CONSTRUCT_LUMBER_MILL_TO}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0250_LUMBER_MILL, STR_0273_CONSTRUCT_LUMBER_MILL_TO},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0251_FRUIT_PLANTATION, STR_0274_PLANT_FRUIT_PLANTATION}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0251_FRUIT_PLANTATION, STR_0274_PLANT_FRUIT_PLANTATION},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0252_RUBBER_PLANTATION,STR_0275_PLANT_RUBBER_PLANTATION}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0252_RUBBER_PLANTATION, STR_0275_PLANT_RUBBER_PLANTATION},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 81, 92, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 81, 92, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 94, 105, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 94, 105, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 107, 118, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 107, 118, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
@@ -1545,19 +1545,19 @@ static const Widget _scenedit_industry_desert_widgets[] = {
static const Widget _scenedit_industry_candy_widgets[] = { static const Widget _scenedit_industry_candy_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_023F_INDUSTRY_GENERATION,STR_NULL}, { WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_023F_INDUSTRY_GENERATION, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 7, 0, 169, 14, 224, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 7, 0, 169, 14, 224, 0x0, STR_NULL},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_MANY_RANDOM_INDUSTRIES, STR_RANDOM_INDUSTRIES_TIP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_MANY_RANDOM_INDUSTRIES, STR_RANDOM_INDUSTRIES_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0257_COTTON_CANDY_FOREST,STR_027A_PLANT_COTTON_CANDY_FOREST}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0257_COTTON_CANDY_FOREST, STR_027A_PLANT_COTTON_CANDY_FOREST},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0258_CANDY_FACTORY, STR_027B_CONSTRUCT_CANDY_FACTORY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0258_CANDY_FACTORY, STR_027B_CONSTRUCT_CANDY_FACTORY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0259_BATTERY_FARM, STR_027C_CONSTRUCT_BATTERY_FARM}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0259_BATTERY_FARM, STR_027C_CONSTRUCT_BATTERY_FARM},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 81, 92, STR_025A_COLA_WELLS, STR_027D_CONSTRUCT_COLA_WELLS}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 81, 92, STR_025A_COLA_WELLS, STR_027D_CONSTRUCT_COLA_WELLS},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 94, 105, STR_025B_TOY_SHOP, STR_027E_CONSTRUCT_TOY_SHOP}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 94, 105, STR_025B_TOY_SHOP, STR_027E_CONSTRUCT_TOY_SHOP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 107, 118, STR_025C_TOY_FACTORY, STR_027F_CONSTRUCT_TOY_FACTORY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 107, 118, STR_025C_TOY_FACTORY, STR_027F_CONSTRUCT_TOY_FACTORY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 120, 131, STR_025D_PLASTIC_FOUNTAINS, STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 120, 131, STR_025D_PLASTIC_FOUNTAINS, STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 133, 144, STR_025E_FIZZY_DRINK_FACTORY,STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 133, 144, STR_025E_FIZZY_DRINK_FACTORY, STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 146, 157, STR_025F_BUBBLE_GENERATOR, STR_0282_CONSTRUCT_BUBBLE_GENERATOR}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 146, 157, STR_025F_BUBBLE_GENERATOR, STR_0282_CONSTRUCT_BUBBLE_GENERATOR},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 159, 170, STR_0260_TOFFEE_QUARRY, STR_0283_CONSTRUCT_TOFFEE_QUARRY}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 159, 170, STR_0260_TOFFEE_QUARRY, STR_0283_CONSTRUCT_TOFFEE_QUARRY},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 172, 183, STR_0261_SUGAR_MINE, STR_0284_CONSTRUCT_SUGAR_MINE}, { WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 172, 183, STR_0261_SUGAR_MINE, STR_0284_CONSTRUCT_SUGAR_MINE},
@@ -1603,8 +1603,8 @@ static bool TryBuildIndustry(TileIndex tile, int type)
static const byte _industry_type_list[4][16] = { static const byte _industry_type_list[4][16] = {
{0, 1, 2, 3, 4, 5, 6, 8, 9, 18, 11, 12}, { 0, 1, 2, 3, 4, 5, 6, 8, 9, 18, 11, 12},
{0, 1, 14, 3, 4, 13, 7, 15, 9, 16, 11, 12}, { 0, 1, 14, 3, 4, 13, 7, 15, 9, 16, 11, 12},
{25, 19, 20, 4, 13, 23, 21, 24, 22, 11, 16, 17, 10}, {25, 19, 20, 4, 13, 23, 21, 24, 22, 11, 16, 17, 10},
{26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36}, {26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36},
}; };

4
misc.c
View File

@@ -273,7 +273,7 @@ static const SaveLoadGlobVarList _date_desc[] = {
SLEG_VAR(_date_fract, SLE_UINT16), SLEG_VAR(_date_fract, SLE_UINT16),
SLEG_VAR(_tick_counter, SLE_UINT16), SLEG_VAR(_tick_counter, SLE_UINT16),
SLEG_VAR(_vehicle_id_ctr_day, SLE_UINT16), SLEG_VAR(_vehicle_id_ctr_day, SLE_UINT16),
SLEG_VAR(_age_cargo_skip_counter,SLE_UINT8), SLEG_VAR(_age_cargo_skip_counter, SLE_UINT8),
SLEG_VAR(_avail_aircraft, SLE_UINT8), SLEG_VAR(_avail_aircraft, SLE_UINT8),
SLEG_CONDVAR(_cur_tileloop_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLEG_CONDVAR(_cur_tileloop_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLEG_CONDVAR(_cur_tileloop_tile, SLE_UINT32, 6, SL_MAX_VERSION), SLEG_CONDVAR(_cur_tileloop_tile, SLE_UINT32, 6, SL_MAX_VERSION),
@@ -304,7 +304,7 @@ static const SaveLoadGlobVarList _view_desc[] = {
SLEG_CONDVAR(_saved_scrollpos_x, SLE_INT32, 6, SL_MAX_VERSION), SLEG_CONDVAR(_saved_scrollpos_x, SLE_INT32, 6, SL_MAX_VERSION),
SLEG_CONDVAR(_saved_scrollpos_y, SLE_FILE_I16 | SLE_VAR_I32, 0, 5), SLEG_CONDVAR(_saved_scrollpos_y, SLE_FILE_I16 | SLE_VAR_I32, 0, 5),
SLEG_CONDVAR(_saved_scrollpos_y, SLE_INT32, 6, SL_MAX_VERSION), SLEG_CONDVAR(_saved_scrollpos_y, SLE_INT32, 6, SL_MAX_VERSION),
SLEG_VAR(_saved_scrollpos_zoom,SLE_UINT8), SLEG_VAR(_saved_scrollpos_zoom, SLE_UINT8),
SLEG_END() SLEG_END()
}; };

10
misc_gui.c
View File

@@ -302,10 +302,10 @@ void ShowAboutWindow(void)
static int _tree_to_plant; static int _tree_to_plant;
static const uint32 _tree_sprites[] = { static const uint32 _tree_sprites[] = {
0x655,0x663,0x678,0x62B,0x647,0x639,0x64E,0x632,0x67F,0x68D,0x69B,0x6A9, 0x655, 0x663, 0x678, 0x62B, 0x647, 0x639, 0x64E, 0x632, 0x67F, 0x68D, 0x69B, 0x6A9,
0x6AF,0x6D2,0x6D9,0x6C4,0x6CB,0x6B6,0x6BD,0x6E0, 0x6AF, 0x6D2, 0x6D9, 0x6C4, 0x6CB, 0x6B6, 0x6BD, 0x6E0,
0x72E,0x734,0x74A,0x74F,0x76B,0x78F,0x788,0x77B,0x75F,0x774,0x720,0x797, 0x72E, 0x734, 0x74A, 0x74F, 0x76B, 0x78F, 0x788, 0x77B, 0x75F, 0x774, 0x720, 0x797,
0x79E,0x7A5 | PALETTE_TO_GREEN,0x7AC | PALETTE_TO_RED,0x7B3,0x7BA,0x7C1 | PALETTE_TO_RED,0x7C8 | PALETTE_TO_PALE_GREEN,0x7CF | PALETTE_TO_YELLOW,0x7D6 | PALETTE_TO_RED 0x79E, 0x7A5 | PALETTE_TO_GREEN, 0x7AC | PALETTE_TO_RED, 0x7B3, 0x7BA, 0x7C1 | PALETTE_TO_RED, 0x7C8 | PALETTE_TO_PALE_GREEN, 0x7CF | PALETTE_TO_YELLOW, 0x7D6 | PALETTE_TO_RED
}; };
static void BuildTreesWndProc(Window *w, WindowEvent *e) static void BuildTreesWndProc(Window *w, WindowEvent *e)
@@ -1196,7 +1196,7 @@ static const Widget _load_dialog_2_widgets[] = {
static const Widget _load_dialog_3_widgets[] = { static const Widget _load_dialog_3_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 256, 0, 13, STR_4011_LOAD_HEIGHTMAP,STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 256, 0, 13, STR_4011_LOAD_HEIGHTMAP, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 127, 14, 25, STR_SORT_BY_NAME, STR_SORT_ORDER_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 127, 14, 25, STR_SORT_BY_NAME, STR_SORT_ORDER_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 128, 256, 14, 25, STR_SORT_BY_DATE, STR_SORT_ORDER_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 128, 256, 14, 25, STR_SORT_BY_DATE, STR_SORT_ORDER_TIP},
{ WWT_IMGBTN, RESIZE_RIGHT, 14, 0, 256, 26, 47, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_RIGHT, 14, 0, 256, 26, 47, 0x0, STR_NULL},

2
music_gui.c
View File

@@ -299,7 +299,7 @@ static void MusicTrackSelectionWndProc(Window *w, WindowEvent *e)
} }
static const Widget _music_track_selection_widgets[] = { static const Widget _music_track_selection_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5,STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 431, 0, 13, STR_01EB_MUSIC_PROGRAM_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 431, 0, 13, STR_01EB_MUSIC_PROGRAM_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 431, 14, 217, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 431, 14, 217, 0x0, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 181, 22, 215, 0x0, STR_01FA_CLICK_ON_MUSIC_TRACK_TO}, { WWT_IMGBTN, RESIZE_NONE, 14, 2, 181, 22, 215, 0x0, STR_01FA_CLICK_ON_MUSIC_TRACK_TO},

14
network.h
View File

@@ -102,13 +102,13 @@ typedef struct NetworkPlayerInfo {
} NetworkPlayerInfo; } NetworkPlayerInfo;
typedef struct NetworkClientInfo { typedef struct NetworkClientInfo {
uint16 client_index; /// Index of the client (same as ClientState->index) uint16 client_index; // Index of the client (same as ClientState->index)
char client_name[NETWORK_CLIENT_NAME_LENGTH]; /// Name of the client char client_name[NETWORK_CLIENT_NAME_LENGTH]; // Name of the client
byte client_lang; /// The language of the client byte client_lang; // The language of the client
byte client_playas; /// As which player is this client playing (PlayerID) byte client_playas; // As which player is this client playing (PlayerID)
uint32 client_ip; /// IP-address of the client (so he can be banned) uint32 client_ip; // IP-address of the client (so he can be banned)
Date join_date; /// Gamedate the player has joined Date join_date; // Gamedate the player has joined
char unique_id[NETWORK_NAME_LENGTH]; /// Every play sends an unique id so we can indentify him char unique_id[NETWORK_NAME_LENGTH]; // Every play sends an unique id so we can indentify him
} NetworkClientInfo; } NetworkClientInfo;
typedef struct NetworkGameList { typedef struct NetworkGameList {

6
network_gui.c
View File

@@ -519,7 +519,7 @@ static const Widget _network_game_window_widgets[] = {
{ WWT_TEXTBTN, RESIZE_NONE, BGC, 170, 180, 23, 32, STR_0225, STR_NETWORK_CONNECTION_TIP}, { WWT_TEXTBTN, RESIZE_NONE, BGC, 170, 180, 23, 32, STR_0225, STR_NETWORK_CONNECTION_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 10, 170, 42, 53, STR_NETWORK_GAME_NAME, STR_NETWORK_GAME_NAME_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 10, 170, 42, 53, STR_NETWORK_GAME_NAME, STR_NETWORK_GAME_NAME_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 171, 250, 42, 53, STR_NETWORK_CLIENTS_CAPTION,STR_NETWORK_CLIENTS_CAPTION_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 171, 250, 42, 53, STR_NETWORK_CLIENTS_CAPTION, STR_NETWORK_CLIENTS_CAPTION_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 251, 290, 42, 53, STR_EMPTY, STR_NETWORK_INFO_ICONS_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 251, 290, 42, 53, STR_EMPTY, STR_NETWORK_INFO_ICONS_TIP},
{ WWT_MATRIX, RESIZE_NONE, BGC, 10, 290, 54, 222, (12 << 8) + 1, STR_NETWORK_CLICK_GAME_TO_SELECT}, { WWT_MATRIX, RESIZE_NONE, BGC, 10, 290, 54, 222, (12 << 8) + 1, STR_NETWORK_CLICK_GAME_TO_SELECT},
@@ -978,7 +978,7 @@ static const Widget _network_lobby_window_widgets[] = {
// buttons // buttons
{ WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 10, 151, 200, 211, STR_NETWORK_JOIN_COMPANY, STR_NETWORK_JOIN_COMPANY_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 10, 151, 200, 211, STR_NETWORK_JOIN_COMPANY, STR_NETWORK_JOIN_COMPANY_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 10, 151, 215, 226, STR_NETWORK_NEW_COMPANY, STR_NETWORK_NEW_COMPANY_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 10, 151, 215, 226, STR_NETWORK_NEW_COMPANY, STR_NETWORK_NEW_COMPANY_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 158, 268, 200, 211, STR_NETWORK_SPECTATE_GAME,STR_NETWORK_SPECTATE_GAME_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 158, 268, 200, 211, STR_NETWORK_SPECTATE_GAME, STR_NETWORK_SPECTATE_GAME_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 158, 268, 215, 226, STR_NETWORK_REFRESH, STR_NETWORK_REFRESH_TIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 158, 268, 215, 226, STR_NETWORK_REFRESH, STR_NETWORK_REFRESH_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 278, 388, 200, 211, STR_012E_CANCEL, STR_NULL}, { WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 278, 388, 200, 211, STR_012E_CANCEL, STR_NULL},
@@ -1445,7 +1445,7 @@ static void NetworkJoinStatusWindowWndProc(Window *w, WindowEvent *e)
static const Widget _network_join_status_window_widget[] = { static const Widget _network_join_status_window_widget[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 249, 0, 13, STR_NETWORK_CONNECTING, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 249, 0, 13, STR_NETWORK_CONNECTING, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 249, 14, 84, 0x0,STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 249, 14, 84, 0x0, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 75, 175, 69, 80, STR_NETWORK_DISCONNECT, STR_NULL}, { WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 75, 175, 69, 80, STR_NETWORK_DISCONNECT, STR_NULL},
{ WIDGETS_END}, { WIDGETS_END},
}; };

32
newgrf_cargo.c
View File

@@ -11,8 +11,8 @@
const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO] = { const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO] = {
/* LT_NORMAL */ {GC_PASSENGERS, GC_COAL, GC_MAIL, GC_OIL, GC_LIVESTOCK, GC_GOODS, GC_GRAIN, GC_WOOD, GC_IRON_ORE, GC_STEEL, GC_VALUABLES, GC_PAPER_TEMP}, /* LT_NORMAL */ {GC_PASSENGERS, GC_COAL, GC_MAIL, GC_OIL, GC_LIVESTOCK, GC_GOODS, GC_GRAIN, GC_WOOD, GC_IRON_ORE, GC_STEEL, GC_VALUABLES, GC_PAPER_TEMP},
/* LT_HILLY */ {GC_PASSENGERS, GC_COAL, GC_MAIL, GC_OIL, GC_LIVESTOCK, GC_GOODS, GC_GRAIN, GC_WOOD, GC_INVALID, GC_PAPER, GC_VALUABLES, GC_FOOD }, /* LT_HILLY */ {GC_PASSENGERS, GC_COAL, GC_MAIL, GC_OIL, GC_LIVESTOCK, GC_GOODS, GC_GRAIN, GC_WOOD, GC_INVALID, GC_PAPER, GC_VALUABLES, GC_FOOD },
/* LT_DESERT */ {GC_PASSENGERS, GC_RUBBER,GC_MAIL, GC_OIL, GC_FRUIT, GC_GOODS, GC_GRAIN, GC_WOOD, GC_COPPER_ORE, GC_WATER, GC_VALUABLES, GC_FOOD }, /* LT_DESERT */ {GC_PASSENGERS, GC_RUBBER, GC_MAIL, GC_OIL, GC_FRUIT, GC_GOODS, GC_GRAIN, GC_WOOD, GC_COPPER_ORE, GC_WATER, GC_VALUABLES, GC_FOOD },
/* LT_CANDY */ {GC_PASSENGERS, GC_SUGAR, GC_MAIL, GC_TOYS,GC_BATTERIES, GC_CANDY, GC_TOFFEE,GC_COLA, GC_COTTON_CANDY,GC_BUBBLES,GC_PLASTIC, GC_FIZZY_DRINKS }, /* LT_CANDY */ {GC_PASSENGERS, GC_SUGAR, GC_MAIL, GC_TOYS, GC_BATTERIES, GC_CANDY, GC_TOFFEE, GC_COLA, GC_COTTON_CANDY, GC_BUBBLES, GC_PLASTIC, GC_FIZZY_DRINKS },
/** /**
* - GC_INVALID (255) means that cargo is not available for that climate * - GC_INVALID (255) means that cargo is not available for that climate
* - GC_PAPER_TEMP (27) is paper in temperate climate in TTDPatch * - GC_PAPER_TEMP (27) is paper in temperate climate in TTDPatch
@@ -25,10 +25,10 @@ const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO] = {
/** BEGIN --- TRANSLATE FROM GLOBAL CARGO TO LOCAL CARGO ID'S **/ /** BEGIN --- TRANSLATE FROM GLOBAL CARGO TO LOCAL CARGO ID'S **/
/** Map global cargo ID's to local-cargo ID's */ /** Map global cargo ID's to local-cargo ID's */
const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID] = { const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID] = {
CT_PASSENGERS,CT_COAL, CT_MAIL, CT_OIL, CT_LIVESTOCK,CT_GOODS, CT_GRAIN, CT_WOOD, /* 0- 7 */ CT_PASSENGERS, CT_COAL, CT_MAIL, CT_OIL, CT_LIVESTOCK, CT_GOODS, CT_GRAIN, CT_WOOD, /* 0- 7 */
CT_IRON_ORE, CT_STEEL, CT_VALUABLES, CT_PAPER, CT_FOOD, CT_FRUIT, CT_COPPER_ORE, CT_WATER, /* 8-15 */ CT_IRON_ORE, CT_STEEL, CT_VALUABLES, CT_PAPER, CT_FOOD, CT_FRUIT, CT_COPPER_ORE, CT_WATER, /* 8-15 */
CT_RUBBER, CT_SUGAR, CT_TOYS, CT_BATTERIES,CT_CANDY, CT_TOFFEE, CT_COLA, CT_COTTON_CANDY, /* 16-23 */ CT_RUBBER, CT_SUGAR, CT_TOYS, CT_BATTERIES, CT_CANDY, CT_TOFFEE, CT_COLA, CT_COTTON_CANDY, /* 16-23 */
CT_BUBBLES, CT_PLASTIC,CT_FIZZY_DRINKS,CT_PAPER /* unsup. */,CT_HILLY_UNUSED, /* 24-28 */ CT_BUBBLES, CT_PLASTIC, CT_FIZZY_DRINKS, CT_PAPER /* unsup. */, CT_HILLY_UNUSED, /* 24-28 */
CT_INVALID, CT_INVALID /* 29-30 */ CT_INVALID, CT_INVALID /* 29-30 */
}; };
@@ -37,17 +37,13 @@ const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID] = {
#define MC(cargo) (1 << cargo) #define MC(cargo) (1 << cargo)
const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE] = const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE] =
{ /* LT_NORMAL: temperate */ { /* LT_NORMAL: temperate */
MC(GC_PASSENGERS)|MC(GC_COAL)|MC(GC_MAIL)|MC(GC_OIL)|MC(GC_LIVESTOCK)|MC(GC_GOODS)|MC(GC_GRAIN)|MC(GC_WOOD)| MC(GC_PASSENGERS) | MC(GC_COAL) | MC(GC_MAIL) | MC(GC_OIL) | MC(GC_LIVESTOCK) | MC(GC_GOODS) | MC(GC_GRAIN) | MC(GC_WOOD) | MC(GC_IRON_ORE) | MC(GC_STEEL) | MC(GC_VALUABLES),
MC(GC_IRON_ORE)|MC(GC_STEEL)|MC(GC_VALUABLES),
/* LT_HILLY: arctic */ /* LT_HILLY: arctic */
MC(GC_PASSENGERS)|MC(GC_COAL)|MC(GC_MAIL)|MC(GC_OIL)|MC(GC_LIVESTOCK)|MC(GC_GOODS)| MC(GC_PASSENGERS) | MC(GC_COAL) | MC(GC_MAIL) | MC(GC_OIL) | MC(GC_LIVESTOCK) | MC(GC_GOODS) | MC(GC_GRAIN) | MC(GC_WOOD) | MC(GC_VALUABLES) | MC(GC_PAPER) | MC(GC_FOOD),
MC(GC_GRAIN)|MC(GC_WOOD)|MC(GC_VALUABLES)|MC(GC_PAPER)|MC(GC_FOOD),
/* LT_DESERT: rainforest/desert */ /* LT_DESERT: rainforest/desert */
MC(GC_PASSENGERS)|MC(GC_MAIL)|MC(GC_OIL)|MC(GC_GOODS)|MC(GC_GRAIN)|MC(GC_WOOD)| MC(GC_PASSENGERS) | MC(GC_MAIL) | MC(GC_OIL) | MC(GC_GOODS) | MC(GC_GRAIN) | MC(GC_WOOD) | MC(GC_VALUABLES) | MC(GC_FOOD) | MC(GC_FRUIT) | MC(GC_COPPER_ORE) | MC(GC_WATER) | MC(GC_RUBBER),
MC(GC_VALUABLES)|MC(GC_FOOD)|MC(GC_FRUIT)|MC(GC_COPPER_ORE)|MC(GC_WATER)|MC(GC_RUBBER),
/* LT_CANDY: toyland */ /* LT_CANDY: toyland */
MC(GC_PASSENGERS)|MC(GC_MAIL)|MC(GC_SUGAR)|MC(GC_TOYS)|MC(GC_BATTERIES)|MC(GC_CANDY)| MC(GC_PASSENGERS) | MC(GC_MAIL) | MC(GC_SUGAR) | MC(GC_TOYS) | MC(GC_BATTERIES) | MC(GC_CANDY) | MC(GC_TOFFEE) | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES) | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS)
MC(GC_TOFFEE)|MC(GC_COLA)|MC(GC_COTTON_CANDY)|MC(GC_BUBBLES)|MC(GC_PLASTIC)|MC(GC_FIZZY_DRINKS)
}; };
/** END --- TRANSLATE FROM GLOBAL CARGO TO LOCAL CARGO ID'S **/ /** END --- TRANSLATE FROM GLOBAL CARGO TO LOCAL CARGO ID'S **/
@@ -57,12 +53,12 @@ const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE] =
const uint32 cargo_classes[16] = { const uint32 cargo_classes[16] = {
/* Passengers */ MC(GC_PASSENGERS), /* Passengers */ MC(GC_PASSENGERS),
/* Mail */ MC(GC_MAIL), /* Mail */ MC(GC_MAIL),
/* Express */ MC(GC_GOODS)|MC(GC_FOOD)|MC(GC_CANDY), /* Express */ MC(GC_GOODS) | MC(GC_FOOD) | MC(GC_CANDY),
/* Armoured */ MC(GC_VALUABLES), /* Armoured */ MC(GC_VALUABLES),
/* Bulk */ MC(GC_COAL)|MC(GC_GRAIN)|MC(GC_IRON_ORE)|MC(GC_COPPER_ORE)|MC(GC_FRUIT)|MC(GC_SUGAR)|MC(GC_TOFFEE)|MC(GC_COTTON_CANDY), /* Bulk */ MC(GC_COAL) | MC(GC_GRAIN) | MC(GC_IRON_ORE) | MC(GC_COPPER_ORE) | MC(GC_FRUIT) | MC(GC_SUGAR) | MC(GC_TOFFEE) | MC(GC_COTTON_CANDY),
/* Piece */ MC(GC_LIVESTOCK)|MC(GC_WOOD)|MC(GC_STEEL)|MC(GC_PAPER)|MC(GC_TOYS)|MC(GC_BATTERIES)|MC(GC_BUBBLES)|MC(GC_FIZZY_DRINKS), /* Piece */ MC(GC_LIVESTOCK) | MC(GC_WOOD) | MC(GC_STEEL) | MC(GC_PAPER) | MC(GC_TOYS) | MC(GC_BATTERIES) | MC(GC_BUBBLES) | MC(GC_FIZZY_DRINKS),
/* Liquids */ MC(GC_OIL)|MC(GC_WATER)|MC(GC_RUBBER)|MC(GC_COLA)|MC(GC_PLASTIC), /* Liquids */ MC(GC_OIL) | MC(GC_WATER) | MC(GC_RUBBER) | MC(GC_COLA) | MC(GC_PLASTIC),
/* Chilled */ MC(GC_FOOD)|MC(GC_FRUIT), /* Chilled */ MC(GC_FOOD) | MC(GC_FRUIT),
/* Undefined */ 0, 0, 0, 0, 0, 0, 0, 0 /* Undefined */ 0, 0, 0, 0, 0, 0, 0, 0
}; };
#undef MC #undef MC

6
news.h
View File

@@ -51,9 +51,9 @@ enum NewsMode {
}; };
enum NewsFlags { enum NewsFlags {
NF_VIEWPORT = 1, NF_VIEWPORT = 0x01,
NF_TILE = 4, NF_TILE = 0x04,
NF_VEHICLE = 8, NF_VEHICLE = 0x08,
NF_FORCE_BIG = 0x10, NF_FORCE_BIG = 0x10,
NF_NOEXPIRE = 0x20, NF_NOEXPIRE = 0x20,
NF_INCOLOR = 0x40, NF_INCOLOR = 0x40,

30
openttd.c
View File

@@ -910,21 +910,21 @@ static void ScrollMainViewport(int x, int y)
static const int8 scrollamt[16][2] = { static const int8 scrollamt[16][2] = {
{ 0, 0}, { 0, 0},
{-2, 0}, // 1:left {-2, 0}, // 1 : left
{ 0,-2}, // 2:up { 0, -2}, // 2 : up
{-2,-1}, // 3:left + up {-2, -1}, // 3 : left + up
{ 2, 0}, // 4:right { 2, 0}, // 4 : right
{ 0, 0}, // 5:left + right { 0, 0}, // 5 : left + right
{ 2,-1}, // 6:right + up { 2, -1}, // 6 : right + up
{ 0,-2}, // 7:left + right + up = up { 0, -2}, // 7 : left + right + up = up
{ 0 ,2}, // 8:down { 0 ,2}, // 8 : down
{-2 ,1}, // 9:down+left {-2 ,1}, // 9 : down+left
{ 0, 0}, // 10:impossible { 0, 0}, // 10 : impossible
{-2, 0}, // 11:left + up + down = left {-2, 0}, // 11 : left + up + down = left
{ 2, 1}, // 12:down+right { 2, 1}, // 12 : down+right
{ 0, 2}, // 13:left + right + down = down { 0, 2}, // 13 : left + right + down = down
{ 0,-2}, // 14:left + right + up = up { 0, -2}, // 14 : left + right + up = up
{ 0, 0}, // 15:impossible { 0, 0}, // 15 : impossible
}; };
static void HandleKeyScrolling(void) static void HandleKeyScrolling(void)

32
openttd.h
View File

@@ -337,22 +337,22 @@ typedef struct {
enum { 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,

8
order_cmd.c
View File

@@ -1115,10 +1115,10 @@ void InitializeOrders(void)
} }
static const SaveLoad _order_desc[] = { static const SaveLoad _order_desc[] = {
SLE_VAR(Order,type, SLE_UINT8), SLE_VAR(Order, type, SLE_UINT8),
SLE_VAR(Order,flags, SLE_UINT8), SLE_VAR(Order, flags, SLE_UINT8),
SLE_VAR(Order,station, SLE_UINT16), SLE_VAR(Order, station, SLE_UINT16),
SLE_REF(Order,next, REF_ORDER), SLE_REF(Order, next, REF_ORDER),
// reserve extra space in savegame here. (currently 10 bytes) // reserve extra space in savegame here. (currently 10 bytes)
SLE_CONDNULL(10, 5, SL_MAX_VERSION), SLE_CONDNULL(10, 5, SL_MAX_VERSION),

58
pathfind.c
View File

@@ -115,13 +115,15 @@ static const byte _bits_mask[4] = {
}; };
static const byte _tpf_new_direction[14] = { static const byte _tpf_new_direction[14] = {
0,1,0,1,2,1, 0,0, 0, 1, 0, 1, 2, 1,
2,3,3,2,3,0, 0, 0,
2, 3, 3, 2, 3, 0,
}; };
static const byte _tpf_prev_direction[14] = { static const byte _tpf_prev_direction[14] = {
0,1,1,0,1,2, 0,0, 0, 1, 1, 0, 1, 2,
2,3,2,3,0,3, 0, 0,
2, 3, 2, 3, 0, 3,
}; };
@@ -230,23 +232,23 @@ static uint SkipToEndOfTunnel(TrackPathFinder* tpf, TileIndex tile, DiagDirectio
} }
const byte _ffb_64[128] = { const byte _ffb_64[128] = {
0,0,1,0,2,0,1,0, 0, 0, 1, 0, 2, 0, 1, 0,
3,0,1,0,2,0,1,0, 3, 0, 1, 0, 2, 0, 1, 0,
4,0,1,0,2,0,1,0, 4, 0, 1, 0, 2, 0, 1, 0,
3,0,1,0,2,0,1,0, 3, 0, 1, 0, 2, 0, 1, 0,
5,0,1,0,2,0,1,0, 5, 0, 1, 0, 2, 0, 1, 0,
3,0,1,0,2,0,1,0, 3, 0, 1, 0, 2, 0, 1, 0,
4,0,1,0,2,0,1,0, 4, 0, 1, 0, 2, 0, 1, 0,
3,0,1,0,2,0,1,0, 3, 0, 1, 0, 2, 0, 1, 0,
0,0,0,2,0,4,4,6, 0, 0, 0, 2, 0, 4, 4, 6,
0,8,8,10,8,12,12,14, 0, 8, 8, 10, 8, 12, 12, 14,
0,16,16,18,16,20,20,22, 0, 16, 16, 18, 16, 20, 20, 22,
16,24,24,26,24,28,28,30, 16, 24, 24, 26, 24, 28, 28, 30,
0,32,32,34,32,36,36,38, 0, 32, 32, 34, 32, 36, 36, 38,
32,40,40,42,40,44,44,46, 32, 40, 40, 42, 40, 44, 44, 46,
32,48,48,50,48,52,52,54, 32, 48, 48, 50, 48, 52, 52, 54,
48,56,56,58,56,60,60,62, 48, 56, 56, 58, 56, 60, 60, 62,
}; };
static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction) static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction)
@@ -414,12 +416,12 @@ typedef struct {
} StackedItem; } StackedItem;
static const byte _new_track[6][4] = { static const byte _new_track[6][4] = {
{0,0xff,8,0xff,}, {0, 0xff, 8, 0xff,},
{0xff,1,0xff,9,}, {0xff, 1, 0xff, 9,},
{0xff,2,10,0xff,}, {0xff, 2, 10, 0xff,},
{3,0xff,0xff,11,}, {3, 0xff, 0xff, 11,},
{12,4,0xff,0xff,}, {12, 4, 0xff, 0xff,},
{0xff,0xff,5,13,}, {0xff, 0xff, 5, 13,},
}; };
typedef struct HashLink { typedef struct HashLink {
@@ -659,8 +661,8 @@ static uint DistanceMoo(TileIndex t0, TileIndex t1)
// is currently limited to 16384 // is currently limited to 16384
static const byte _length_of_track[16] = { static const byte _length_of_track[16] = {
DIAG_FACTOR,DIAG_FACTOR,STR_FACTOR,STR_FACTOR,STR_FACTOR,STR_FACTOR,0,0, DIAG_FACTOR, DIAG_FACTOR, STR_FACTOR, STR_FACTOR, STR_FACTOR, STR_FACTOR, 0, 0,
DIAG_FACTOR,DIAG_FACTOR,STR_FACTOR,STR_FACTOR,STR_FACTOR,STR_FACTOR,0,0 DIAG_FACTOR, DIAG_FACTOR, STR_FACTOR, STR_FACTOR, STR_FACTOR, STR_FACTOR, 0, 0
}; };
// new more optimized pathfinder for trains... // new more optimized pathfinder for trains...

2
player_gui.c
View File

@@ -304,7 +304,7 @@ static void SelectPlayerColorWndProc(Window *w, WindowEvent *e)
} }
static const Widget _select_player_color_widgets[] = { static const Widget _select_player_color_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5,STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 149, 0, 13, STR_7007_NEW_COLOR_SCHEME, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 149, 0, 13, STR_7007_NEW_COLOR_SCHEME, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 137, 14, 127, 0x0, STR_7034_CLICK_ON_SELECTED_NEW_COLOR}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 137, 14, 127, 0x0, STR_7034_CLICK_ON_SELECTED_NEW_COLOR},
{ WWT_SCROLLBAR, RESIZE_NONE, 14, 138, 149, 14, 127, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_SCROLLBAR, RESIZE_NONE, 14, 138, 149, 14, 127, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},

142
players.c
View File

@@ -1108,26 +1108,26 @@ void LoadFromHighScore(void)
// Save/load of players // Save/load of players
static const SaveLoad _player_desc[] = { static const SaveLoad _player_desc[] = {
SLE_VAR(Player,name_2, SLE_UINT32), SLE_VAR(Player, name_2, SLE_UINT32),
SLE_VAR(Player,name_1, SLE_STRINGID), SLE_VAR(Player, name_1, SLE_STRINGID),
SLE_VAR(Player,president_name_1,SLE_UINT16), SLE_VAR(Player, president_name_1,SLE_UINT16),
SLE_VAR(Player,president_name_2,SLE_UINT32), SLE_VAR(Player, president_name_2,SLE_UINT32),
SLE_VAR(Player,face, SLE_UINT32), SLE_VAR(Player, face, SLE_UINT32),
// money was changed to a 64 bit field in savegame version 1. // money was changed to a 64 bit field in savegame version 1.
SLE_CONDVAR(Player,money64, SLE_VAR_I64 | SLE_FILE_I32, 0, 0), SLE_CONDVAR(Player, money64, SLE_VAR_I64 | SLE_FILE_I32, 0, 0),
SLE_CONDVAR(Player,money64, SLE_INT64, 1, SL_MAX_VERSION), SLE_CONDVAR(Player, money64, SLE_INT64, 1, SL_MAX_VERSION),
SLE_VAR(Player,current_loan, SLE_INT32), SLE_VAR(Player, current_loan, SLE_INT32),
SLE_VAR(Player,player_color, SLE_UINT8), SLE_VAR(Player, player_color, SLE_UINT8),
SLE_VAR(Player,player_money_fraction,SLE_UINT8), SLE_VAR(Player, player_money_fraction, SLE_UINT8),
SLE_VAR(Player,avail_railtypes, SLE_UINT8), SLE_VAR(Player, avail_railtypes, SLE_UINT8),
SLE_VAR(Player,block_preview, SLE_UINT8), SLE_VAR(Player, block_preview, SLE_UINT8),
SLE_VAR(Player,cargo_types, SLE_UINT16), SLE_VAR(Player, cargo_types, SLE_UINT16),
SLE_CONDVAR(Player, location_of_house, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Player, location_of_house, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Player, location_of_house, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Player, location_of_house, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(Player, last_build_coordinate, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Player, last_build_coordinate, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
@@ -1135,29 +1135,29 @@ static const SaveLoad _player_desc[] = {
SLE_CONDVAR(Player, inaugurated_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Player, inaugurated_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Player, inaugurated_year, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Player, inaugurated_year, SLE_INT32, 31, SL_MAX_VERSION),
SLE_ARR(Player,share_owners, SLE_UINT8, 4), SLE_ARR(Player, share_owners, SLE_UINT8, 4),
SLE_VAR(Player,num_valid_stat_ent,SLE_UINT8), SLE_VAR(Player, num_valid_stat_ent, SLE_UINT8),
SLE_VAR(Player,quarters_of_bankrupcy,SLE_UINT8), SLE_VAR(Player, quarters_of_bankrupcy, SLE_UINT8),
SLE_VAR(Player,bankrupt_asked, SLE_UINT8), SLE_VAR(Player, bankrupt_asked, SLE_UINT8),
SLE_VAR(Player,bankrupt_timeout,SLE_INT16), SLE_VAR(Player, bankrupt_timeout, SLE_INT16),
SLE_VAR(Player,bankrupt_value, SLE_INT32), SLE_VAR(Player, bankrupt_value, SLE_INT32),
// yearly expenses was changed to 64-bit in savegame version 2. // yearly expenses was changed to 64-bit in savegame version 2.
SLE_CONDARR(Player,yearly_expenses, SLE_FILE_I32|SLE_VAR_I64, 3*13, 0, 1), SLE_CONDARR(Player, yearly_expenses, SLE_FILE_I32 | SLE_VAR_I64, 3 * 13, 0, 1),
SLE_CONDARR(Player,yearly_expenses, SLE_INT64, 3*13, 2, SL_MAX_VERSION), SLE_CONDARR(Player, yearly_expenses, SLE_INT64, 3 * 13, 2, SL_MAX_VERSION),
SLE_CONDVAR(Player,is_ai, SLE_BOOL, 2, SL_MAX_VERSION), SLE_CONDVAR(Player, is_ai, SLE_BOOL, 2, SL_MAX_VERSION),
SLE_CONDVAR(Player,is_active, SLE_BOOL, 4, SL_MAX_VERSION), SLE_CONDVAR(Player, is_active, SLE_BOOL, 4, SL_MAX_VERSION),
// Engine renewal settings // Engine renewal settings
SLE_CONDNULL(512, 16, 18), SLE_CONDNULL(512, 16, 18),
SLE_CONDREF(Player,engine_renew_list, REF_ENGINE_RENEWS, 19, SL_MAX_VERSION), SLE_CONDREF(Player, engine_renew_list, REF_ENGINE_RENEWS, 19, SL_MAX_VERSION),
SLE_CONDVAR(Player,engine_renew, SLE_BOOL, 16, SL_MAX_VERSION), SLE_CONDVAR(Player, engine_renew, SLE_BOOL, 16, SL_MAX_VERSION),
SLE_CONDVAR(Player,engine_renew_months, SLE_INT16, 16, SL_MAX_VERSION), SLE_CONDVAR(Player, engine_renew_months, SLE_INT16, 16, SL_MAX_VERSION),
SLE_CONDVAR(Player,engine_renew_money, SLE_UINT32, 16, SL_MAX_VERSION), SLE_CONDVAR(Player, engine_renew_money, SLE_UINT32, 16, SL_MAX_VERSION),
SLE_CONDVAR(Player,renew_keep_length, SLE_BOOL, 2, SL_MAX_VERSION), // added with 16.1, but was blank since 2 SLE_CONDVAR(Player, renew_keep_length, SLE_BOOL, 2, SL_MAX_VERSION), // added with 16.1, but was blank since 2
// reserve extra space in savegame here. (currently 63 bytes) // reserve extra space in savegame here. (currently 63 bytes)
SLE_CONDNULL(63, 2, SL_MAX_VERSION), SLE_CONDNULL(63, 2, SL_MAX_VERSION),
@@ -1167,76 +1167,76 @@ static const SaveLoad _player_desc[] = {
static const SaveLoad _player_economy_desc[] = { static const SaveLoad _player_economy_desc[] = {
// these were changed to 64-bit in savegame format 2 // these were changed to 64-bit in savegame format 2
SLE_CONDVAR(PlayerEconomyEntry,income, SLE_INT32, 0, 1), SLE_CONDVAR(PlayerEconomyEntry, income, SLE_INT32, 0, 1),
SLE_CONDVAR(PlayerEconomyEntry,expenses, SLE_INT32, 0, 1), SLE_CONDVAR(PlayerEconomyEntry, expenses, SLE_INT32, 0, 1),
SLE_CONDVAR(PlayerEconomyEntry,company_value, SLE_FILE_I32 | SLE_VAR_I64, 0, 1), SLE_CONDVAR(PlayerEconomyEntry, company_value, SLE_FILE_I32 | SLE_VAR_I64, 0, 1),
SLE_CONDVAR(PlayerEconomyEntry,income, SLE_FILE_I64 | SLE_VAR_I32, 2, SL_MAX_VERSION), SLE_CONDVAR(PlayerEconomyEntry, income, SLE_FILE_I64 | SLE_VAR_I32, 2, SL_MAX_VERSION),
SLE_CONDVAR(PlayerEconomyEntry,expenses,SLE_FILE_I64 | SLE_VAR_I32, 2, SL_MAX_VERSION), SLE_CONDVAR(PlayerEconomyEntry, expenses, SLE_FILE_I64 | SLE_VAR_I32, 2, SL_MAX_VERSION),
SLE_CONDVAR(PlayerEconomyEntry,company_value, SLE_INT64, 2, SL_MAX_VERSION), SLE_CONDVAR(PlayerEconomyEntry, company_value, SLE_INT64, 2, SL_MAX_VERSION),
SLE_VAR(PlayerEconomyEntry,delivered_cargo, SLE_INT32), SLE_VAR(PlayerEconomyEntry, delivered_cargo, SLE_INT32),
SLE_VAR(PlayerEconomyEntry,performance_history, SLE_INT32), SLE_VAR(PlayerEconomyEntry, performance_history, SLE_INT32),
SLE_END() SLE_END()
}; };
static const SaveLoad _player_ai_desc[] = { static const SaveLoad _player_ai_desc[] = {
SLE_VAR(PlayerAI,state, SLE_UINT8), SLE_VAR(PlayerAI, state, SLE_UINT8),
SLE_VAR(PlayerAI,tick, SLE_UINT8), SLE_VAR(PlayerAI, tick, SLE_UINT8),
SLE_CONDVAR(PlayerAI,state_counter, SLE_FILE_U16 | SLE_VAR_U32, 0, 12), SLE_CONDVAR(PlayerAI, state_counter, SLE_FILE_U16 | SLE_VAR_U32, 0, 12),
SLE_CONDVAR(PlayerAI,state_counter, SLE_UINT32, 13, SL_MAX_VERSION), SLE_CONDVAR(PlayerAI, state_counter, SLE_UINT32, 13, SL_MAX_VERSION),
SLE_VAR(PlayerAI,timeout_counter, SLE_UINT16), SLE_VAR(PlayerAI, timeout_counter, SLE_UINT16),
SLE_VAR(PlayerAI,state_mode, SLE_UINT8), SLE_VAR(PlayerAI, state_mode, SLE_UINT8),
SLE_VAR(PlayerAI,banned_tile_count, SLE_UINT8), SLE_VAR(PlayerAI, banned_tile_count, SLE_UINT8),
SLE_VAR(PlayerAI,railtype_to_use, SLE_UINT8), SLE_VAR(PlayerAI, railtype_to_use, SLE_UINT8),
SLE_VAR(PlayerAI,cargo_type, SLE_UINT8), SLE_VAR(PlayerAI, cargo_type, SLE_UINT8),
SLE_VAR(PlayerAI,num_wagons, SLE_UINT8), SLE_VAR(PlayerAI, num_wagons, SLE_UINT8),
SLE_VAR(PlayerAI,build_kind, SLE_UINT8), SLE_VAR(PlayerAI, build_kind, SLE_UINT8),
SLE_VAR(PlayerAI,num_build_rec, SLE_UINT8), SLE_VAR(PlayerAI, num_build_rec, SLE_UINT8),
SLE_VAR(PlayerAI,num_loco_to_build, SLE_UINT8), SLE_VAR(PlayerAI, num_loco_to_build, SLE_UINT8),
SLE_VAR(PlayerAI,num_want_fullload, SLE_UINT8), SLE_VAR(PlayerAI, num_want_fullload, SLE_UINT8),
SLE_VAR(PlayerAI,route_type_mask, SLE_UINT8), SLE_VAR(PlayerAI, route_type_mask, SLE_UINT8),
SLE_CONDVAR(PlayerAI, start_tile_a, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(PlayerAI, start_tile_a, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(PlayerAI, start_tile_a, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(PlayerAI, start_tile_a, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(PlayerAI, cur_tile_a, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(PlayerAI, cur_tile_a, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(PlayerAI, cur_tile_a, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(PlayerAI, cur_tile_a, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_VAR(PlayerAI,start_dir_a, SLE_UINT8), SLE_VAR(PlayerAI, start_dir_a, SLE_UINT8),
SLE_VAR(PlayerAI,cur_dir_a, SLE_UINT8), SLE_VAR(PlayerAI, cur_dir_a, SLE_UINT8),
SLE_CONDVAR(PlayerAI, start_tile_b, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(PlayerAI, start_tile_b, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(PlayerAI, start_tile_b, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(PlayerAI, start_tile_b, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(PlayerAI, cur_tile_b, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(PlayerAI, cur_tile_b, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(PlayerAI, cur_tile_b, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(PlayerAI, cur_tile_b, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_VAR(PlayerAI,start_dir_b, SLE_UINT8), SLE_VAR(PlayerAI, start_dir_b, SLE_UINT8),
SLE_VAR(PlayerAI,cur_dir_b, SLE_UINT8), SLE_VAR(PlayerAI, cur_dir_b, SLE_UINT8),
SLE_REF(PlayerAI,cur_veh, REF_VEHICLE), SLE_REF(PlayerAI, cur_veh, REF_VEHICLE),
SLE_ARR(PlayerAI,wagon_list, SLE_UINT16, 9), SLE_ARR(PlayerAI, wagon_list, SLE_UINT16, 9),
SLE_ARR(PlayerAI,order_list_blocks, SLE_UINT8, 20), SLE_ARR(PlayerAI, order_list_blocks, SLE_UINT8, 20),
SLE_ARR(PlayerAI,banned_tiles, SLE_UINT16, 16), SLE_ARR(PlayerAI, banned_tiles, SLE_UINT16, 16),
SLE_CONDNULL(64, 2, SL_MAX_VERSION), SLE_CONDNULL(64, 2, SL_MAX_VERSION),
SLE_END() SLE_END()
}; };
static const SaveLoad _player_ai_build_rec_desc[] = { static const SaveLoad _player_ai_build_rec_desc[] = {
SLE_CONDVAR(AiBuildRec,spec_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(AiBuildRec, spec_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(AiBuildRec,spec_tile, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(AiBuildRec, spec_tile, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(AiBuildRec,use_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(AiBuildRec, use_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(AiBuildRec,use_tile, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(AiBuildRec, use_tile, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_VAR(AiBuildRec,rand_rng, SLE_UINT8), SLE_VAR(AiBuildRec, rand_rng, SLE_UINT8),
SLE_VAR(AiBuildRec,cur_building_rule,SLE_UINT8), SLE_VAR(AiBuildRec, cur_building_rule, SLE_UINT8),
SLE_VAR(AiBuildRec,unk6, SLE_UINT8), SLE_VAR(AiBuildRec, unk6, SLE_UINT8),
SLE_VAR(AiBuildRec,unk7, SLE_UINT8), SLE_VAR(AiBuildRec, unk7, SLE_UINT8),
SLE_VAR(AiBuildRec,buildcmd_a, SLE_UINT8), SLE_VAR(AiBuildRec, buildcmd_a, SLE_UINT8),
SLE_VAR(AiBuildRec,buildcmd_b, SLE_UINT8), SLE_VAR(AiBuildRec, buildcmd_b, SLE_UINT8),
SLE_VAR(AiBuildRec,direction, SLE_UINT8), SLE_VAR(AiBuildRec, direction, SLE_UINT8),
SLE_VAR(AiBuildRec,cargo, SLE_UINT8), SLE_VAR(AiBuildRec, cargo, SLE_UINT8),
SLE_END() SLE_END()
}; };

16
rail.h
View File

@@ -105,13 +105,13 @@ typedef enum Trackdirs {
/** These are a combination of tracks and directions. Values are 0-5 in one /** These are a combination of tracks and directions. Values are 0-5 in one
direction (corresponding to the Track enum) and 8-13 in the other direction. */ direction (corresponding to the Track enum) and 8-13 in the other direction. */
typedef enum TrackdirBits { typedef enum TrackdirBits {
TRACKDIR_BIT_NONE = 0x0, TRACKDIR_BIT_NONE = 0x0000,
TRACKDIR_BIT_X_NE = 0x1, TRACKDIR_BIT_X_NE = 0x0001,
TRACKDIR_BIT_Y_SE = 0x2, TRACKDIR_BIT_Y_SE = 0x0002,
TRACKDIR_BIT_UPPER_E = 0x4, TRACKDIR_BIT_UPPER_E = 0x0004,
TRACKDIR_BIT_LOWER_E = 0x8, TRACKDIR_BIT_LOWER_E = 0x0008,
TRACKDIR_BIT_LEFT_S = 0x10, TRACKDIR_BIT_LEFT_S = 0x0010,
TRACKDIR_BIT_RIGHT_S = 0x20, TRACKDIR_BIT_RIGHT_S = 0x0020,
/* Again, note the two missing values here. This enables trackdir -> track conversion by doing (trackdir & 0xFF) */ /* Again, note the two missing values here. This enables trackdir -> track conversion by doing (trackdir & 0xFF) */
TRACKDIR_BIT_X_SW = 0x0100, TRACKDIR_BIT_X_SW = 0x0100,
TRACKDIR_BIT_Y_NW = 0x0200, TRACKDIR_BIT_Y_NW = 0x0200,
@@ -205,7 +205,7 @@ extern RailtypeInfo _railtypes[RAILTYPE_END];
// these are the maximums used for updating signal blocks, and checking if a depot is in a pbs block // these are the maximums used for updating signal blocks, and checking if a depot is in a pbs block
enum { enum {
NUM_SSD_ENTRY = 256, // max amount of blocks NUM_SSD_ENTRY = 256, // max amount of blocks
NUM_SSD_STACK = 32 ,// max amount of blocks to check recursively NUM_SSD_STACK = 32, // max amount of blocks to check recursively
}; };
/** /**

10
rail_gui.c
View File

@@ -97,9 +97,9 @@ static void PlaceExtraDepotRail(TileIndex tile, uint16 extra)
} }
static const uint16 _place_depot_extra[12] = { static const uint16 _place_depot_extra[12] = {
0x604, 0x2102, 0x1202, 0x505, 0x0604, 0x2102, 0x1202, 0x0505,
0x2400, 0x2801, 0x1800, 0x1401, 0x2400, 0x2801, 0x1800, 0x1401,
0x2203, 0x904, 0x0A05, 0x1103, 0x2203, 0x0904, 0x0A05, 0x1103,
}; };
@@ -501,7 +501,7 @@ static void BuildRailToolbWndProc(Window *w, WindowEvent *e)
static const Widget _build_rail_widgets[] = { static const Widget _build_rail_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5,STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 359, 0, 13, STR_100A_RAILROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 7, 11, 359, 0, 13, STR_100A_RAILROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_STICKYBOX, RESIZE_NONE, 7, 360, 371, 0, 13, 0x0, STR_STICKY_BUTTON}, { WWT_STICKYBOX, RESIZE_NONE, 7, 360, 371, 0, 13, 0x0, STR_STICKY_BUTTON},
@@ -963,7 +963,7 @@ static void BuildTrainDepotWndProc(Window *w, WindowEvent *e)
} }
static const Widget _build_depot_widgets[] = { static const Widget _build_depot_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5,STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 139, 0, 13, STR_1014_TRAIN_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 7, 11, 139, 0, 13, STR_1014_TRAIN_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_PANEL, RESIZE_NONE, 7, 0, 139, 14, 121, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 7, 0, 139, 14, 121, 0x0, STR_NULL},
{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 17, 66, 0x0, STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO}, { WWT_PANEL, RESIZE_NONE, 14, 71, 136, 17, 66, 0x0, STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO},
@@ -1043,7 +1043,7 @@ static void BuildWaypointWndProc(Window *w, WindowEvent *e)
static const Widget _build_waypoint_widgets[] = { static const Widget _build_waypoint_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 343, 0, 13, STR_WAYPOINT,STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 7, 11, 343, 0, 13, STR_WAYPOINT, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_PANEL, RESIZE_NONE, 7, 0, 343, 14, 91, 0x0, 0}, { WWT_PANEL, RESIZE_NONE, 7, 0, 343, 14, 91, 0x0, 0},
{ WWT_PANEL, RESIZE_NONE, 7, 3, 68, 17, 76, 0x0, STR_WAYPOINT_GRAPHICS_TIP}, { WWT_PANEL, RESIZE_NONE, 7, 3, 68, 17, 76, 0x0, STR_WAYPOINT_GRAPHICS_TIP},

4
road_gui.c
View File

@@ -381,7 +381,7 @@ static void BuildRoadDepotWndProc(Window *w, WindowEvent *e)
} }
static const Widget _build_road_depot_widgets[] = { static const Widget _build_road_depot_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5,STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 139, 0, 13, STR_1806_ROAD_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 7, 11, 139, 0, 13, STR_1806_ROAD_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_PANEL, RESIZE_NONE, 7, 0, 139, 14, 121, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 7, 0, 139, 14, 121, 0x0, STR_NULL},
{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 17, 66, 0x0, STR_1813_SELECT_ROAD_VEHICLE_DEPOT}, { WWT_PANEL, RESIZE_NONE, 14, 71, 136, 17, 66, 0x0, STR_1813_SELECT_ROAD_VEHICLE_DEPOT},
@@ -475,7 +475,7 @@ static const Widget _bus_station_picker_widgets[] = {
{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 69, 118, 0x0, STR_3051_SELECT_BUS_STATION_ORIENTATION}, { WWT_PANEL, RESIZE_NONE, 14, 71, 136, 69, 118, 0x0, STR_3051_SELECT_BUS_STATION_ORIENTATION},
{ WWT_PANEL, RESIZE_NONE, 14, 3, 68, 69, 118, 0x0, STR_3051_SELECT_BUS_STATION_ORIENTATION}, { WWT_PANEL, RESIZE_NONE, 14, 3, 68, 69, 118, 0x0, STR_3051_SELECT_BUS_STATION_ORIENTATION},
{ WWT_PANEL, RESIZE_NONE, 14, 3, 68, 17, 66, 0x0, STR_3051_SELECT_BUS_STATION_ORIENTATION}, { WWT_PANEL, RESIZE_NONE, 14, 3, 68, 17, 66, 0x0, STR_3051_SELECT_BUS_STATION_ORIENTATION},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 10, 69, 133, 144, STR_02DB_OFF,STR_3065_DON_T_HIGHLIGHT_COVERAGE}, { WWT_TEXTBTN, RESIZE_NONE, 14, 10, 69, 133, 144, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 70, 129, 133, 144, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA}, { WWT_TEXTBTN, RESIZE_NONE, 14, 70, 129, 133, 144, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA},
{ WIDGETS_END}, { WIDGETS_END},
}; };

2
roadveh_cmd.c
View File

@@ -1204,7 +1204,7 @@ static const byte _road_veh_data_1[] = {
15, 15, 11, 11 15, 15, 11, 11
}; };
static const byte _roadveh_data_2[4] = { 0,1,8,9 }; static const byte _roadveh_data_2[4] = { 0, 1, 8, 9 };
static void RoadVehController(Vehicle *v) static void RoadVehController(Vehicle *v)
{ {

4
roadveh_gui.c
View File

@@ -273,7 +273,7 @@ do_change_service_int:
static const Widget _roadveh_details_widgets[] = { static const Widget _roadveh_details_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 339, 0, 13, STR_900C_DETAILS,STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 339, 0, 13, STR_900C_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 340, 379, 0, 13, STR_01AA_NAME, STR_902E_NAME_ROAD_VEHICLE}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 340, 379, 0, 13, STR_01AA_NAME, STR_902E_NAME_ROAD_VEHICLE},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 379, 14, 55, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 379, 14, 55, 0x0, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 379, 56, 88, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 379, 56, 88, 0x0, STR_NULL},
@@ -585,7 +585,7 @@ static const Widget _new_road_veh_widgets[] = {
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 235, 14, 125, 0x801, STR_9026_ROAD_VEHICLE_SELECTION}, { WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 235, 14, 125, 0x801, STR_9026_ROAD_VEHICLE_SELECTION},
{ WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 236, 247, 14, 125, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 236, 247, 14, 125, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
{ WWT_IMGBTN, RESIZE_TB, 14, 0, 247, 126, 197, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_TB, 14, 0, 247, 126, 197, 0x0, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 117, 198, 209, STR_9007_BUILD_VEHICLE,STR_9027_BUILD_THE_HIGHLIGHTED_ROAD}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 117, 198, 209, STR_9007_BUILD_VEHICLE, STR_9027_BUILD_THE_HIGHLIGHTED_ROAD},
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 118, 235, 198, 209, STR_9034_RENAME, STR_9035_RENAME_ROAD_VEHICLE_TYPE}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 118, 235, 198, 209, STR_9034_RENAME, STR_9035_RENAME_ROAD_VEHICLE_TYPE},
{ WWT_RESIZEBOX, RESIZE_TB, 14, 236, 247, 198, 209, 0x0, STR_RESIZE_BUTTON}, { WWT_RESIZEBOX, RESIZE_TB, 14, 236, 247, 198, 209, 0x0, STR_RESIZE_BUTTON},
{ WIDGETS_END}, { WIDGETS_END},

6
saveload.h
View File

@@ -100,7 +100,7 @@ enum VarTypes {
SLE_VAR_U64 = 8 << 4, SLE_VAR_U64 = 8 << 4,
SLE_VAR_NULL = 9 << 4, ///< useful to write zeros in savegame. SLE_VAR_NULL = 9 << 4, ///< useful to write zeros in savegame.
SLE_VAR_STRB = 10 << 4, ///< normal string (with pre-allocated buffer) SLE_VAR_STRB = 10 << 4, ///< normal string (with pre-allocated buffer)
SLE_VAR_STRBQ= 11 << 4, ///< string enclosed in quotes (with pre-allocated buffer) SLE_VAR_STRBQ = 11 << 4, ///< string enclosed in quotes (with pre-allocated buffer)
SLE_VAR_STR = 12 << 4, ///< string pointer SLE_VAR_STR = 12 << 4, ///< string pointer
SLE_VAR_STRQ = 13 << 4, ///< string enclosed in quotes SLE_VAR_STRQ = 13 << 4, ///< string enclosed in quotes
/* 2 more possible memory-primitives */ /* 2 more possible memory-primitives */
@@ -123,7 +123,7 @@ enum VarTypes {
SLE_CHAR = SLE_FILE_I8 | SLE_VAR_CHAR, SLE_CHAR = SLE_FILE_I8 | SLE_VAR_CHAR,
SLE_STRINGID = SLE_FILE_STRINGID | SLE_VAR_U16, SLE_STRINGID = SLE_FILE_STRINGID | SLE_VAR_U16,
SLE_STRINGBUF = SLE_FILE_STRING | SLE_VAR_STRB, SLE_STRINGBUF = SLE_FILE_STRING | SLE_VAR_STRB,
SLE_STRINGBQUOTE= SLE_FILE_STRING | SLE_VAR_STRBQ, SLE_STRINGBQUOTE = SLE_FILE_STRING | SLE_VAR_STRBQ,
SLE_STRING = SLE_FILE_STRING | SLE_VAR_STR, SLE_STRING = SLE_FILE_STRING | SLE_VAR_STR,
SLE_STRINGQUOTE = SLE_FILE_STRING | SLE_VAR_STRQ, SLE_STRINGQUOTE = SLE_FILE_STRING | SLE_VAR_STRQ,
@@ -131,7 +131,7 @@ enum VarTypes {
SLE_UINT = SLE_UINT32, SLE_UINT = SLE_UINT32,
SLE_INT = SLE_INT32, SLE_INT = SLE_INT32,
SLE_STRB = SLE_STRINGBUF, SLE_STRB = SLE_STRINGBUF,
SLE_STRBQ= SLE_STRINGBQUOTE, SLE_STRBQ = SLE_STRINGBQUOTE,
SLE_STR = SLE_STRING, SLE_STR = SLE_STRING,
SLE_STRQ = SLE_STRINGQUOTE, SLE_STRQ = SLE_STRINGQUOTE,

6
settings.c
View File

@@ -1148,12 +1148,12 @@ static int32 EngineRenewMoneyUpdate(int32 p1)
static const SettingDesc _music_settings[] = { static const SettingDesc _music_settings[] = {
SDT_VAR(MusicFileSettings, playlist, SLE_UINT8, S, 0, 0, 0, 5, STR_NULL, NULL), SDT_VAR(MusicFileSettings, playlist, SLE_UINT8, S, 0, 0, 0, 5, STR_NULL, NULL),
SDT_VAR(MusicFileSettings, music_vol, SLE_UINT8, S, 0, 128, 0, 100, STR_NULL, NULL), SDT_VAR(MusicFileSettings, music_vol, SLE_UINT8, S, 0, 128, 0, 100, STR_NULL, NULL),
SDT_VAR(MusicFileSettings, effect_vol,SLE_UINT8, S, 0, 128, 0, 100, STR_NULL, NULL), SDT_VAR(MusicFileSettings, effect_vol, SLE_UINT8, S, 0, 128, 0, 100, STR_NULL, NULL),
SDT_LIST(MusicFileSettings, custom_1, SLE_UINT8, S, 0, NULL, STR_NULL, NULL), SDT_LIST(MusicFileSettings, custom_1, SLE_UINT8, S, 0, NULL, STR_NULL, NULL),
SDT_LIST(MusicFileSettings, custom_2, SLE_UINT8, S, 0, NULL, STR_NULL, NULL), SDT_LIST(MusicFileSettings, custom_2, SLE_UINT8, S, 0, NULL, STR_NULL, NULL),
SDT_BOOL(MusicFileSettings, playing, S, 0, true, STR_NULL, NULL), SDT_BOOL(MusicFileSettings, playing, S, 0, true, STR_NULL, NULL),
SDT_BOOL(MusicFileSettings, shuffle, S, 0,false, STR_NULL, NULL), SDT_BOOL(MusicFileSettings, shuffle, S, 0, false, STR_NULL, NULL),
SDT_STR(MusicFileSettings, extmidi, SLE_STRB, S, 0, EXTERNAL_PLAYER,STR_NULL, NULL), SDT_STR(MusicFileSettings, extmidi, SLE_STRB, S, 0, EXTERNAL_PLAYER, STR_NULL, NULL),
SDT_END() SDT_END()
}; };

4
settings_gui.c
View File

@@ -532,7 +532,7 @@ static const Widget _game_difficulty_widgets[] = {
{ WWT_PUSHTXTBTN, RESIZE_NONE, 3, 97, 183, 16, 27, STR_6802_MEDIUM, STR_NULL}, { WWT_PUSHTXTBTN, RESIZE_NONE, 3, 97, 183, 16, 27, STR_6802_MEDIUM, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 3, 184, 270, 16, 27, STR_6803_HARD, STR_NULL}, { WWT_PUSHTXTBTN, RESIZE_NONE, 3, 184, 270, 16, 27, STR_6803_HARD, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 3, 271, 357, 16, 27, STR_6804_CUSTOM, STR_NULL}, { WWT_PUSHTXTBTN, RESIZE_NONE, 3, 271, 357, 16, 27, STR_6804_CUSTOM, STR_NULL},
{ WWT_TEXTBTN, RESIZE_NONE, 10, 0, 369, 30, 41, STR_6838_SHOW_HI_SCORE_CHART,STR_NULL}, { WWT_TEXTBTN, RESIZE_NONE, 10, 0, 369, 30, 41, STR_6838_SHOW_HI_SCORE_CHART, STR_NULL},
{ WWT_PANEL, RESIZE_NONE, 10, 0, 369, 42, 262, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 10, 0, 369, 42, 262, 0x0, STR_NULL},
{ WWT_PANEL, RESIZE_NONE, 10, 0, 369, 263, 278, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 10, 0, 369, 263, 278, 0x0, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 3, 105, 185, 265, 276, STR_OPTIONS_SAVE_CHANGES, STR_NULL}, { WWT_PUSHTXTBTN, RESIZE_NONE, 3, 105, 185, 265, 276, STR_OPTIONS_SAVE_CHANGES, STR_NULL},
@@ -1010,7 +1010,7 @@ static const Widget _newgrf_widgets[] = {
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 279, 0, 13, STR_NEWGRF_SETTINGS_CAPTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 279, 0, 13, STR_NEWGRF_SETTINGS_CAPTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_PANEL, RESIZE_NONE, 14, 0, 279, 183, 276, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 14, 0, 279, 183, 276, 0x0, STR_NULL},
{ WWT_MATRIX, RESIZE_NONE, 14, 0, 267, 14, 182, 0xC01,/*small rows*/ STR_NEWGRF_TIP}, { WWT_MATRIX, RESIZE_NONE, 14, 0, 267, 14, 182, 0xC01, /*small rows*/ STR_NEWGRF_TIP},
{ WWT_SCROLLBAR, RESIZE_NONE, 14, 268, 279, 14, 182, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_SCROLLBAR, RESIZE_NONE, 14, 268, 279, 14, 182, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 147, 158, 244, 255, STR_0188, STR_NULL}, { WWT_TEXTBTN, RESIZE_NONE, 14, 147, 158, 244, 255, STR_0188, STR_NULL},

4
ship_cmd.c
View File

@@ -290,11 +290,11 @@ static void UpdateShipDeltaXY(Vehicle *v, int dir)
MKIT( -3, -3, 6, 6), MKIT( -3, -3, 6, 6),
MKIT(-16, -3, 32, 6), MKIT(-16, -3, 32, 6),
MKIT( -3, -3, 6, 6), MKIT( -3, -3, 6, 6),
MKIT( -3,-16, 6, 32), MKIT( -3, -16, 6, 32),
MKIT( -3, -3, 6, 6), MKIT( -3, -3, 6, 6),
MKIT(-16, -3, 32, 6), MKIT(-16, -3, 32, 6),
MKIT( -3, -3, 6, 6), MKIT( -3, -3, 6, 6),
MKIT( -3,-16, 6, 32), MKIT( -3, -16, 6, 32),
}; };
#undef MKIT #undef MKIT
uint32 x = _delta_xy_table[dir]; uint32 x = _delta_xy_table[dir];

2
ship_gui.c
View File

@@ -269,7 +269,7 @@ do_change_service_int:
static const Widget _ship_details_widgets[] = { static const Widget _ship_details_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 364, 0, 13, STR_9811_DETAILS,STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 364, 0, 13, STR_9811_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 365, 404, 0, 13, STR_01AA_NAME, STR_982F_NAME_SHIP}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 365, 404, 0, 13, STR_01AA_NAME, STR_982F_NAME_SHIP},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 404, 14, 55, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 404, 14, 55, 0x0, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 404, 56, 88, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 404, 56, 88, 0x0, STR_NULL},

14
signs.c
View File

@@ -226,13 +226,13 @@ void InitializeSigns(void)
} }
static const SaveLoad _sign_desc[] = { static const SaveLoad _sign_desc[] = {
SLE_VAR(SignStruct,str, SLE_UINT16), SLE_VAR(SignStruct, str, SLE_UINT16),
SLE_CONDVAR(SignStruct,x, SLE_FILE_I16 | SLE_VAR_I32, 0, 4), SLE_CONDVAR(SignStruct, x, SLE_FILE_I16 | SLE_VAR_I32, 0, 4),
SLE_CONDVAR(SignStruct,y, SLE_FILE_I16 | SLE_VAR_I32, 0, 4), SLE_CONDVAR(SignStruct, y, SLE_FILE_I16 | SLE_VAR_I32, 0, 4),
SLE_CONDVAR(SignStruct,x, SLE_INT32, 5, SL_MAX_VERSION), SLE_CONDVAR(SignStruct, x, SLE_INT32, 5, SL_MAX_VERSION),
SLE_CONDVAR(SignStruct,y, SLE_INT32, 5, SL_MAX_VERSION), SLE_CONDVAR(SignStruct, y, SLE_INT32, 5, SL_MAX_VERSION),
SLE_CONDVAR(SignStruct,owner, SLE_UINT8, 6, SL_MAX_VERSION), SLE_CONDVAR(SignStruct, owner, SLE_UINT8, 6, SL_MAX_VERSION),
SLE_VAR(SignStruct,z, SLE_UINT8), SLE_VAR(SignStruct, z, SLE_UINT8),
SLE_END() SLE_END()
}; };

276
smallmap_gui.c
View File

@@ -53,130 +53,130 @@ static bool _smallmap_show_towns = true;
/* Legend text giving the colours to look for on the minimap */ /* Legend text giving the colours to look for on the minimap */
static const uint16 _legend_land_contours[] = { static const uint16 _legend_land_contours[] = {
MK(0x5A,STR_00F0_100M), MK(0x5A, STR_00F0_100M),
MK(0x5C,STR_00F1_200M), MK(0x5C, STR_00F1_200M),
MK(0x5E,STR_00F2_300M), MK(0x5E, STR_00F2_300M),
MK(0x1F,STR_00F3_400M), MK(0x1F, STR_00F3_400M),
MK(0x27,STR_00F4_500M), MK(0x27, STR_00F4_500M),
MS(0xD7,STR_00EB_ROADS), MS(0xD7, STR_00EB_ROADS),
MK(0x0A,STR_00EC_RAILROADS), MK(0x0A, STR_00EC_RAILROADS),
MK(0x98,STR_00ED_STATIONS_AIRPORTS_DOCKS), MK(0x98, STR_00ED_STATIONS_AIRPORTS_DOCKS),
MK(0xB5,STR_00EE_BUILDINGS_INDUSTRIES), MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES),
MK(0x0F,STR_00EF_VEHICLES), MK(0x0F, STR_00EF_VEHICLES),
MKEND() MKEND()
}; };
static const uint16 _legend_vehicles[] = { static const uint16 _legend_vehicles[] = {
MK(0xB8,STR_00F5_TRAINS), MK(0xB8, STR_00F5_TRAINS),
MK(0xBF,STR_00F6_ROAD_VEHICLES), MK(0xBF, STR_00F6_ROAD_VEHICLES),
MK(0x98,STR_00F7_SHIPS), MK(0x98, STR_00F7_SHIPS),
MK(0x0F,STR_00F8_AIRCRAFT), MK(0x0F, STR_00F8_AIRCRAFT),
MS(0xD7,STR_00F9_TRANSPORT_ROUTES), MS(0xD7, STR_00F9_TRANSPORT_ROUTES),
MK(0xB5,STR_00EE_BUILDINGS_INDUSTRIES), MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES),
MKEND() MKEND()
}; };
static const uint16 _legend_industries_normal[] = { static const uint16 _legend_industries_normal[] = {
MK(0xD7,STR_00FA_COAL_MINE), MK(0xD7, STR_00FA_COAL_MINE),
MK(0xB8,STR_00FB_POWER_STATION), MK(0xB8, STR_00FB_POWER_STATION),
MK(0x56,STR_00FC_FOREST), MK(0x56, STR_00FC_FOREST),
MK(0xC2,STR_00FD_SAWMILL), MK(0xC2, STR_00FD_SAWMILL),
MK(0xBF,STR_00FE_OIL_REFINERY), MK(0xBF, STR_00FE_OIL_REFINERY),
MK(0x0F,STR_0105_BANK), MK(0x0F, STR_0105_BANK),
MS(0x30,STR_00FF_FARM), MS(0x30, STR_00FF_FARM),
MK(0xAE,STR_0100_FACTORY), MK(0xAE, STR_0100_FACTORY),
MK(0x98,STR_0102_OIL_WELLS), MK(0x98, STR_0102_OIL_WELLS),
MK(0x37,STR_0103_IRON_ORE_MINE), MK(0x37, STR_0103_IRON_ORE_MINE),
MK(0x0A,STR_0104_STEEL_MILL), MK(0x0A, STR_0104_STEEL_MILL),
MKEND() MKEND()
}; };
static const uint16 _legend_industries_hilly[] = { static const uint16 _legend_industries_hilly[] = {
MK(0xD7,STR_00FA_COAL_MINE), MK(0xD7, STR_00FA_COAL_MINE),
MK(0xB8,STR_00FB_POWER_STATION), MK(0xB8, STR_00FB_POWER_STATION),
MK(0x56,STR_00FC_FOREST), MK(0x56, STR_00FC_FOREST),
MK(0x0A,STR_0106_PAPER_MILL), MK(0x0A, STR_0106_PAPER_MILL),
MK(0xBF,STR_00FE_OIL_REFINERY), MK(0xBF, STR_00FE_OIL_REFINERY),
MK(0x37,STR_0108_FOOD_PROCESSING_PLANT), MK(0x37, STR_0108_FOOD_PROCESSING_PLANT),
MS(0x30,STR_00FF_FARM), MS(0x30, STR_00FF_FARM),
MK(0xAE,STR_0101_PRINTING_WORKS), MK(0xAE, STR_0101_PRINTING_WORKS),
MK(0x98,STR_0102_OIL_WELLS), MK(0x98, STR_0102_OIL_WELLS),
MK(0xC2,STR_0107_GOLD_MINE), MK(0xC2, STR_0107_GOLD_MINE),
MK(0x0F,STR_0105_BANK), MK(0x0F, STR_0105_BANK),
MKEND() MKEND()
}; };
static const uint16 _legend_industries_desert[] = { static const uint16 _legend_industries_desert[] = {
MK(0xBF,STR_00FE_OIL_REFINERY), MK(0xBF, STR_00FE_OIL_REFINERY),
MK(0x98,STR_0102_OIL_WELLS), MK(0x98, STR_0102_OIL_WELLS),
MK(0x0F,STR_0105_BANK), MK(0x0F, STR_0105_BANK),
MK(0xB8,STR_0109_DIAMOND_MINE), MK(0xB8, STR_0109_DIAMOND_MINE),
MK(0x37,STR_0108_FOOD_PROCESSING_PLANT), MK(0x37, STR_0108_FOOD_PROCESSING_PLANT),
MK(0x0A,STR_010A_COPPER_ORE_MINE), MK(0x0A, STR_010A_COPPER_ORE_MINE),
MK(0x30,STR_00FF_FARM), MK(0x30, STR_00FF_FARM),
MS(0x56,STR_010B_FRUIT_PLANTATION), MS(0x56, STR_010B_FRUIT_PLANTATION),
MK(0x27,STR_010C_RUBBER_PLANTATION), MK(0x27, STR_010C_RUBBER_PLANTATION),
MK(0x25,STR_010D_WATER_SUPPLY), MK(0x25, STR_010D_WATER_SUPPLY),
MK(0xD0,STR_010E_WATER_TOWER), MK(0xD0, STR_010E_WATER_TOWER),
MK(0xAE,STR_0100_FACTORY), MK(0xAE, STR_0100_FACTORY),
MK(0xC2,STR_010F_LUMBER_MILL), MK(0xC2, STR_010F_LUMBER_MILL),
MKEND() MKEND()
}; };
static const uint16 _legend_industries_candy[] = { static const uint16 _legend_industries_candy[] = {
MK(0x30,STR_0110_COTTON_CANDY_FOREST), MK(0x30, STR_0110_COTTON_CANDY_FOREST),
MK(0xAE,STR_0111_CANDY_FACTORY), MK(0xAE, STR_0111_CANDY_FACTORY),
MK(0x27,STR_0112_BATTERY_FARM), MK(0x27, STR_0112_BATTERY_FARM),
MK(0x37,STR_0113_COLA_WELLS), MK(0x37, STR_0113_COLA_WELLS),
MK(0xD0,STR_0114_TOY_SHOP), MK(0xD0, STR_0114_TOY_SHOP),
MK(0x0A,STR_0115_TOY_FACTORY), MK(0x0A, STR_0115_TOY_FACTORY),
MS(0x25,STR_0116_PLASTIC_FOUNTAINS), MS(0x25, STR_0116_PLASTIC_FOUNTAINS),
MK(0xB8,STR_0117_FIZZY_DRINK_FACTORY), MK(0xB8, STR_0117_FIZZY_DRINK_FACTORY),
MK(0x98,STR_0118_BUBBLE_GENERATOR), MK(0x98, STR_0118_BUBBLE_GENERATOR),
MK(0xC2,STR_0119_TOFFEE_QUARRY), MK(0xC2, STR_0119_TOFFEE_QUARRY),
MK(0x0F,STR_011A_SUGAR_MINE), MK(0x0F, STR_011A_SUGAR_MINE),
MKEND() MKEND()
}; };
static const uint16 _legend_routes[] = { static const uint16 _legend_routes[] = {
MK(0xD7,STR_00EB_ROADS), MK(0xD7, STR_00EB_ROADS),
MK(0x0A,STR_00EC_RAILROADS), MK(0x0A, STR_00EC_RAILROADS),
MK(0xB5,STR_00EE_BUILDINGS_INDUSTRIES), MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES),
MS(0x56,STR_011B_RAILROAD_STATION), MS(0x56, STR_011B_RAILROAD_STATION),
MK(0xC2,STR_011C_TRUCK_LOADING_BAY), MK(0xC2, STR_011C_TRUCK_LOADING_BAY),
MK(0xBF,STR_011D_BUS_STATION), MK(0xBF, STR_011D_BUS_STATION),
MK(0xB8,STR_011E_AIRPORT_HELIPORT), MK(0xB8, STR_011E_AIRPORT_HELIPORT),
MK(0x98,STR_011F_DOCK), MK(0x98, STR_011F_DOCK),
MKEND() MKEND()
}; };
static const uint16 _legend_vegetation[] = { static const uint16 _legend_vegetation[] = {
MK(0x52,STR_0120_ROUGH_LAND), MK(0x52, STR_0120_ROUGH_LAND),
MK(0x54,STR_0121_GRASS_LAND), MK(0x54, STR_0121_GRASS_LAND),
MK(0x37,STR_0122_BARE_LAND), MK(0x37, STR_0122_BARE_LAND),
MK(0x25,STR_0123_FIELDS), MK(0x25, STR_0123_FIELDS),
MK(0x57,STR_0124_TREES), MK(0x57, STR_0124_TREES),
MK(0xD0,STR_00FC_FOREST), MK(0xD0, STR_00FC_FOREST),
MS(0x0A,STR_0125_ROCKS), MS(0x0A, STR_0125_ROCKS),
MK(0xC2,STR_012A_DESERT), MK(0xC2, STR_012A_DESERT),
MK(0x98,STR_012B_SNOW), MK(0x98, STR_012B_SNOW),
MK(0xD7,STR_00F9_TRANSPORT_ROUTES), MK(0xD7, STR_00F9_TRANSPORT_ROUTES),
MK(0xB5,STR_00EE_BUILDINGS_INDUSTRIES), MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES),
MKEND() MKEND()
}; };
static const uint16 _legend_land_owners[] = { static const uint16 _legend_land_owners[] = {
MK(0xCA,STR_0126_WATER), MK(0xCA, STR_0126_WATER),
MK(0x54,STR_0127_NO_OWNER), MK(0x54, STR_0127_NO_OWNER),
MK(0xB4,STR_0128_TOWNS), MK(0xB4, STR_0128_TOWNS),
MK(0x20,STR_0129_INDUSTRIES), MK(0x20, STR_0129_INDUSTRIES),
MKEND() MKEND()
}; };
#undef MK #undef MK
@@ -269,48 +269,48 @@ static inline uint32 ApplyMask(uint32 colour, const AndOr *mask)
static const AndOr _smallmap_contours_andor[] = { static const AndOr _smallmap_contours_andor[] = {
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0x000A0A00),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x000A0A00), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0x98989898),MKCOLOR(0x00000000)}, {MKCOLOR(0x98989898), MKCOLOR(0x00000000)},
{MKCOLOR(0xCACACACA),MKCOLOR(0x00000000)}, {MKCOLOR(0xCACACACA), MKCOLOR(0x00000000)},
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0xB5B5B5B5),MKCOLOR(0x00000000)}, {MKCOLOR(0xB5B5B5B5), MKCOLOR(0x00000000)},
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x000A0A00),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x000A0A00), MKCOLOR(0xFF0000FF)},
}; };
static const AndOr _smallmap_vehicles_andor[] = { static const AndOr _smallmap_vehicles_andor[] = {
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0xCACACACA),MKCOLOR(0x00000000)}, {MKCOLOR(0xCACACACA), MKCOLOR(0x00000000)},
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0xB5B5B5B5),MKCOLOR(0x00000000)}, {MKCOLOR(0xB5B5B5B5), MKCOLOR(0x00000000)},
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)},
}; };
static const AndOr _smallmap_vegetation_andor[] = { static const AndOr _smallmap_vegetation_andor[] = {
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00575700),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00575700), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0xCACACACA),MKCOLOR(0x00000000)}, {MKCOLOR(0xCACACACA), MKCOLOR(0x00000000)},
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0xB5B5B5B5),MKCOLOR(0x00000000)}, {MKCOLOR(0xB5B5B5B5), MKCOLOR(0x00000000)},
{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)}, {MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)},
{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)},
{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)}, {MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)},
}; };
typedef uint32 GetSmallMapPixels(TileIndex tile); // typedef callthrough function typedef uint32 GetSmallMapPixels(TileIndex tile); // typedef callthrough function
@@ -393,27 +393,27 @@ static inline uint32 GetSmallMapVehiclesPixels(TileIndex tile)
/* Industry colours... a total of 175 gfx - XXX - increase if more industries */ /* Industry colours... a total of 175 gfx - XXX - increase if more industries */
static const byte _industry_smallmap_colors[175] = { static const byte _industry_smallmap_colors[175] = {
215,215,215,215,215,215,215,184, 215, 215, 215, 215, 215, 215, 215, 184,
184,184,184,194,194,194,194,194, 184, 184, 184, 194, 194, 194, 194, 194,
86, 86,191,191,191,191,191,191, 86, 86, 191, 191, 191, 191, 191, 191,
152,152,152,152,152,152,152,152, 152, 152, 152, 152, 152, 152, 152, 152,
152, 48, 48, 48, 48, 48, 48,174, 152, 48, 48, 48, 48, 48, 48, 174,
174,174,174,174,174,174,174, 10, 174, 174, 174, 174, 174, 174, 174, 10,
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
10, 10, 15, 15, 55, 55, 55, 55, 10, 10, 15, 15, 55, 55, 55, 55,
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
194,194,194,194,194,194,194,194, 194, 194, 194, 194, 194, 194, 194, 194,
194,194,194,194,194,194,194,194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 15, 15,184,184,184,184,184, 194, 15, 15, 184, 184, 184, 184, 184,
184,184,184,184, 55, 55, 55, 55, 184, 184, 184, 184, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 86, 39, 37, 37, 55, 55, 55, 55, 86, 39, 37, 37,
208,174,174,174,174,194,194,194, 208, 174, 174, 174, 174, 194, 194, 194,
194, 48, 48,174,174,174,174, 39, 194, 48, 48, 174, 174, 174, 174, 39,
39, 55,208,208,208,208, 10, 10, 39, 55, 208, 208, 208, 208, 10, 10,
10, 10, 10, 10, 37, 37, 37, 37, 10, 10, 10, 10, 37, 37, 37, 37,
37, 37, 37, 37,184,184,184,184, 37, 37, 37, 37, 184, 184, 184, 184,
152,152,152,152,194,194,194, 15, 152, 152, 152, 152, 194, 194, 194, 15,
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
}; };
@@ -1005,8 +1005,8 @@ static const Widget _extra_view_port_widgets[] = {
{ WWT_6, RESIZE_RB, 14, 2, 297, 16, 231, 0x0, STR_NULL}, { WWT_6, RESIZE_RB, 14, 2, 297, 16, 231, 0x0, STR_NULL},
{ WWT_PANEL, RESIZE_TB, 14, 0, 21, 234, 255, 0x2DF, STR_017F_ZOOM_THE_VIEW_IN}, { WWT_PANEL, RESIZE_TB, 14, 0, 21, 234, 255, 0x2DF, STR_017F_ZOOM_THE_VIEW_IN},
{ WWT_PANEL, RESIZE_TB, 14, 22, 43, 234, 255, 0x2E0, STR_0180_ZOOM_THE_VIEW_OUT}, { WWT_PANEL, RESIZE_TB, 14, 22, 43, 234, 255, 0x2E0, STR_0180_ZOOM_THE_VIEW_OUT},
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 44, 171, 234, 255, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW,STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 44, 171, 234, 255, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT},
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 172, 298, 234, 255, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN,STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 172, 298, 234, 255, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT},
{ WWT_PANEL, RESIZE_RTB, 14, 299, 299, 234, 255, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_RTB, 14, 299, 299, 234, 255, 0x0, STR_NULL},
{ WWT_PANEL, RESIZE_RTB, 14, 0, 287, 256, 267, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_RTB, 14, 0, 287, 256, 267, 0x0, STR_NULL},
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 288, 299, 256, 267, 0x0, STR_RESIZE_BUTTON}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 288, 299, 256, 267, 0x0, STR_RESIZE_BUTTON},

4
spritecache.c
View File

@@ -385,7 +385,7 @@ static void* AllocSprite(size_t mem_req)
static uint RotateSprite(uint s) static uint RotateSprite(uint s)
{ {
static const byte _rotate_tile_sprite[19] = { 0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,17,18,16,15 }; static const byte _rotate_tile_sprite[19] = { 0, 2, 4, 6, 8, 10, 12, 14, 1, 3, 5, 7, 9, 11, 13, 17, 18, 16, 15 };
static const byte _coast_map[9] = {0, 4, 3, 1, 2, 6, 8, 5, 7}; static const byte _coast_map[9] = {0, 4, 3, 1, 2, 6, 8, 5, 7};
static const byte _fence_map[6] = {1, 0, 5, 4, 3, 2}; static const byte _fence_map[6] = {1, 0, 5, 4, 3, 2};
@@ -399,7 +399,7 @@ static uint RotateSprite(uint s)
X19(4000) X19(4000)
X19(4023) X19(4023)
X19(4042) X19(4042)
MAP(4061,4069,_coast_map) MAP(4061, 4069, _coast_map)
X19(4126) X19(4126)
X19(4145) X19(4145)
X19(4164) X19(4164)

10
station.h
View File

@@ -98,15 +98,15 @@ struct Station {
}; };
enum { enum {
FACIL_TRAIN = 1, FACIL_TRAIN = 0x01,
FACIL_TRUCK_STOP = 2, FACIL_TRUCK_STOP = 0x02,
FACIL_BUS_STOP = 4, FACIL_BUS_STOP = 0x04,
FACIL_AIRPORT = 8, FACIL_AIRPORT = 0x08,
FACIL_DOCK = 0x10, FACIL_DOCK = 0x10,
}; };
enum { enum {
// HVOT_PENDING_DELETE = 1<<0, // not needed anymore // HVOT_PENDING_DELETE = 1 << 0, // not needed anymore
HVOT_TRAIN = 1 << 1, HVOT_TRAIN = 1 << 1,
HVOT_BUS = 1 << 2, HVOT_BUS = 1 << 2,
HVOT_TRUCK = 1 << 3, HVOT_TRUCK = 1 << 3,

64
station_cmd.c
View File

@@ -1901,8 +1901,8 @@ static const TileIndexDiffC _dock_tileoffs_chkaround[] = {
{ 0, 0}, { 0, 0},
{ 0, -1} { 0, -1}
}; };
static const byte _dock_w_chk[4] = { 2,1,2,1 }; static const byte _dock_w_chk[4] = { 2, 1, 2, 1 };
static const byte _dock_h_chk[4] = { 1,2,1,2 }; static const byte _dock_h_chk[4] = { 1, 2, 1, 2 };
/** Build a dock/haven. /** Build a dock/haven.
* @param tile tile where dock will be built * @param tile tile where dock will be built
@@ -2978,41 +2978,41 @@ static const SaveLoad _station_desc[] = {
// alpha_order was stored here in savegame format 0 - 3 // alpha_order was stored here in savegame format 0 - 3
SLE_CONDNULL(1, 0, 3), SLE_CONDNULL(1, 0, 3),
SLE_VAR(Station,string_id, SLE_STRINGID), SLE_VAR(Station, string_id, SLE_STRINGID),
SLE_VAR(Station,had_vehicle_of_type,SLE_UINT16), SLE_VAR(Station, had_vehicle_of_type, SLE_UINT16),
SLE_VAR(Station,time_since_load, SLE_UINT8), SLE_VAR(Station, time_since_load, SLE_UINT8),
SLE_VAR(Station,time_since_unload, SLE_UINT8), SLE_VAR(Station, time_since_unload, SLE_UINT8),
SLE_VAR(Station,delete_ctr, SLE_UINT8), SLE_VAR(Station, delete_ctr, SLE_UINT8),
SLE_VAR(Station,owner, SLE_UINT8), SLE_VAR(Station, owner, SLE_UINT8),
SLE_VAR(Station,facilities, SLE_UINT8), SLE_VAR(Station, facilities, SLE_UINT8),
SLE_VAR(Station,airport_type, SLE_UINT8), SLE_VAR(Station, airport_type, SLE_UINT8),
// truck/bus_stop_status was stored here in savegame format 0 - 6 // truck/bus_stop_status was stored here in savegame format 0 - 6
SLE_CONDVAR(Station,truck_stop_status_obsolete, SLE_UINT8, 0, 5), SLE_CONDVAR(Station, truck_stop_status_obsolete, SLE_UINT8, 0, 5),
SLE_CONDVAR(Station,bus_stop_status_obsolete, SLE_UINT8, 0, 5), SLE_CONDVAR(Station, bus_stop_status_obsolete, SLE_UINT8, 0, 5),
// blocked_months was stored here in savegame format 0 - 4.0 // blocked_months was stored here in savegame format 0 - 4.0
SLE_CONDVAR(Station,blocked_months_obsolete, SLE_UINT8, 0, 4), SLE_CONDVAR(Station, blocked_months_obsolete, SLE_UINT8, 0, 4),
SLE_CONDVAR(Station,airport_flags, SLE_VAR_U32 | SLE_FILE_U16, 0, 2), SLE_CONDVAR(Station, airport_flags, SLE_VAR_U32 | SLE_FILE_U16, 0, 2),
SLE_CONDVAR(Station,airport_flags, SLE_UINT32, 3, SL_MAX_VERSION), SLE_CONDVAR(Station, airport_flags, SLE_UINT32, 3, SL_MAX_VERSION),
SLE_CONDNULL(2, 0, 25), /* Ex last-vehicle */ SLE_CONDNULL(2, 0, 25), /* Ex last-vehicle */
SLE_CONDVAR(Station,last_vehicle_type, SLE_UINT8 , 26, SL_MAX_VERSION), SLE_CONDVAR(Station, last_vehicle_type, SLE_UINT8, 26, SL_MAX_VERSION),
// Was custom station class and id // Was custom station class and id
SLE_CONDNULL(2, 3, 25), SLE_CONDNULL(2, 3, 25),
SLE_CONDVAR(Station,build_date, SLE_FILE_U16 | SLE_VAR_I32, 3, 30), SLE_CONDVAR(Station, build_date, SLE_FILE_U16 | SLE_VAR_I32, 3, 30),
SLE_CONDVAR(Station,build_date, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Station, build_date, SLE_INT32, 31, SL_MAX_VERSION),
SLE_CONDREF(Station,bus_stops, REF_ROADSTOPS, 6, SL_MAX_VERSION), SLE_CONDREF(Station, bus_stops, REF_ROADSTOPS, 6, SL_MAX_VERSION),
SLE_CONDREF(Station,truck_stops, REF_ROADSTOPS, 6, SL_MAX_VERSION), SLE_CONDREF(Station, truck_stops, REF_ROADSTOPS, 6, SL_MAX_VERSION),
/* Used by newstations for graphic variations */ /* Used by newstations for graphic variations */
SLE_CONDVAR(Station,random_bits, SLE_UINT16, 27, SL_MAX_VERSION), SLE_CONDVAR(Station, random_bits, SLE_UINT16, 27, SL_MAX_VERSION),
SLE_CONDVAR(Station,waiting_triggers, SLE_UINT8, 27, SL_MAX_VERSION), SLE_CONDVAR(Station, waiting_triggers, SLE_UINT8, 27, SL_MAX_VERSION),
SLE_CONDVAR(Station,num_specs, SLE_UINT8, 27, SL_MAX_VERSION), SLE_CONDVAR(Station, num_specs, SLE_UINT8, 27, SL_MAX_VERSION),
// reserve extra space in savegame here. (currently 32 bytes) // reserve extra space in savegame here. (currently 32 bytes)
SLE_CONDNULL(32, 2, SL_MAX_VERSION), SLE_CONDNULL(32, 2, SL_MAX_VERSION),
@@ -3021,15 +3021,15 @@ static const SaveLoad _station_desc[] = {
}; };
static const SaveLoad _goods_desc[] = { static const SaveLoad _goods_desc[] = {
SLE_VAR(GoodsEntry,waiting_acceptance, SLE_UINT16), SLE_VAR(GoodsEntry, waiting_acceptance, SLE_UINT16),
SLE_VAR(GoodsEntry,days_since_pickup, SLE_UINT8), SLE_VAR(GoodsEntry, days_since_pickup, SLE_UINT8),
SLE_VAR(GoodsEntry,rating, SLE_UINT8), SLE_VAR(GoodsEntry, rating, SLE_UINT8),
SLE_CONDVAR(GoodsEntry,enroute_from, SLE_FILE_U8 | SLE_VAR_U16, 0, 6), SLE_CONDVAR(GoodsEntry, enroute_from, SLE_FILE_U8 | SLE_VAR_U16, 0, 6),
SLE_CONDVAR(GoodsEntry,enroute_from, SLE_UINT16, 7, SL_MAX_VERSION), SLE_CONDVAR(GoodsEntry, enroute_from, SLE_UINT16, 7, SL_MAX_VERSION),
SLE_VAR(GoodsEntry,enroute_time, SLE_UINT8), SLE_VAR(GoodsEntry, enroute_time, SLE_UINT8),
SLE_VAR(GoodsEntry,last_speed, SLE_UINT8), SLE_VAR(GoodsEntry, last_speed, SLE_UINT8),
SLE_VAR(GoodsEntry,last_age, SLE_UINT8), SLE_VAR(GoodsEntry, last_age, SLE_UINT8),
SLE_CONDVAR(GoodsEntry,feeder_profit, SLE_INT32, 14, SL_MAX_VERSION), SLE_CONDVAR(GoodsEntry, feeder_profit, SLE_INT32, 14, SL_MAX_VERSION),
SLE_END() SLE_END()
}; };

2
strgen/strgen.c
View File

@@ -103,7 +103,7 @@ static char _cases[MAX_NUM_CASES][16];
static int _numcases; static int _numcases;
// for each plural value, this is the number of plural forms. // for each plural value, this is the number of plural forms.
static const byte _plural_form_counts[] = { 2,1,2,3,3,3,3,3,4 }; static const byte _plural_form_counts[] = { 2, 1, 2, 3, 3, 3, 3, 3, 4 };
static const char *_cur_ident; static const char *_cur_ident;

396
table/ai_rail.h
View File

@@ -29,296 +29,296 @@ typedef struct {
#define MKEND {4, 0, {0, 0}}} #define MKEND {4, 0, {0, 0}}}
static const AiDefaultRailBlock _raildata_ai_0 = { static const AiDefaultRailBlock _raildata_ai_0 = {
MKHDR(1,2,1,0,1) MKHDR(1, 2, 1, 0, 1)
MKDEPOT(2, -1,1), MKDEPOT(2, -1, 1),
MKSTATION(0x15, 0,-1), MKSTATION(0x15, 0, -1),
MKRAIL(0x26, 0,1), MKRAIL(0x26, 0, 1),
MKCLRRAIL(1, 0,2), MKCLRRAIL(1, 0, 2),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_1 = { static const AiDefaultRailBlock _raildata_ai_1 = {
MKHDR(1,2,1,0,3) MKHDR(1, 2, 1, 0, 3)
MKDEPOT(2, -1,-1), MKDEPOT(2, -1, -1),
MKRAIL(0x26, 0,-1), MKRAIL(0x26, 0, -1),
MKSTATION(0x15, 0,0), MKSTATION(0x15, 0, 0),
MKCLRRAIL(3, 0,-2), MKCLRRAIL(3, 0, -2),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_2 = { static const AiDefaultRailBlock _raildata_ai_2 = {
MKHDR(1,2,1,0,0) MKHDR(1, 2, 1, 0, 0)
MKDEPOT(1, -1,-1), MKDEPOT(1, -1, -1),
MKRAIL(0x15, -1,0), MKRAIL(0x15, -1, 0),
MKSTATION(0x14, 0,0), MKSTATION(0x14, 0, 0),
MKCLRRAIL(0, -2,0), MKCLRRAIL(0, -2, 0),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_3 = { static const AiDefaultRailBlock _raildata_ai_3 = {
MKHDR(1,2,1,0,2) MKHDR(1, 2, 1, 0, 2)
MKDEPOT(1, 1,-1), MKDEPOT(1, 1, -1),
MKRAIL(0x15, 1,0), MKRAIL(0x15, 1, 0),
MKSTATION(0x14, -1,0), MKSTATION(0x14, -1, 0),
MKCLRRAIL(2, 2,0), MKCLRRAIL(2, 2, 0),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_4 = { static const AiDefaultRailBlock _raildata_ai_4 = {
MKHDR(1,2,2,0,255) MKHDR(1, 2, 2, 0, 255)
MKSTATION(0x15, 0,0), MKSTATION(0x15, 0, 0),
MKCLRRAIL(3, 0,-1), MKCLRRAIL(3, 0, -1),
MKCLRRAIL(1, 0,2), MKCLRRAIL(1, 0, 2),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_5 = { static const AiDefaultRailBlock _raildata_ai_5 = {
MKHDR(1,2,2,0,255) MKHDR(1, 2, 2, 0, 255)
MKSTATION(0x14, 0,0), MKSTATION(0x14, 0, 0),
MKCLRRAIL(0, -1,0), MKCLRRAIL(0, -1, 0),
MKCLRRAIL(2, 2,0), MKCLRRAIL(2, 2, 0),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_6 = { static const AiDefaultRailBlock _raildata_ai_6 = {
MKHDR(2,3,1,0,1) MKHDR(2, 3, 1, 0, 1)
MKSTATION(0x27, 0,-2), MKSTATION(0x27, 0, -2),
MKRAIL(0xC2, 0,1), MKRAIL(0xC2, 0, 1),
MKRAIL(0xC2, 1,1), MKRAIL(0xC2, 1, 1),
MKRAIL(0x1A, 0,2), MKRAIL(0x1A, 0, 2),
MKRAIL(0x26, 1,2), MKRAIL(0x26, 1, 2),
MKDEPOT(3, 1,3), MKDEPOT(3, 1, 3),
MKCLRRAIL(1, 0,3), MKCLRRAIL(1, 0, 3),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_7 = { static const AiDefaultRailBlock _raildata_ai_7 = {
MKHDR(2,3,1,0,3) MKHDR(2, 3, 1, 0, 3)
MKDEPOT(1, 0,-3), MKDEPOT(1, 0, -3),
MKRAIL(0x1A, 0,-2), MKRAIL(0x1A, 0, -2),
MKRAIL(0x26, 1,-2), MKRAIL(0x26, 1, -2),
MKRAIL(0xC2, 0,-1), MKRAIL(0xC2, 0, -1),
MKRAIL(0xC2, 1,-1), MKRAIL(0xC2, 1, -1),
MKSTATION(0x27, 0,0), MKSTATION(0x27, 0, 0),
MKCLRRAIL(3, 1,-3), MKCLRRAIL(3, 1, -3),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_8 = { static const AiDefaultRailBlock _raildata_ai_8 = {
MKHDR(2,3,1,0,2) MKHDR(2, 3, 1, 0, 2)
MKSTATION(0x26, -2,0), MKSTATION(0x26, -2, 0),
MKRAIL(0xC1, 1,0), MKRAIL(0xC1, 1, 0),
MKRAIL(0xC1, 1,1), MKRAIL(0xC1, 1, 1),
MKRAIL(0x29, 2,0), MKRAIL(0x29, 2, 0),
MKRAIL(0x15, 2,1), MKRAIL(0x15, 2, 1),
MKDEPOT(0, 3,0), MKDEPOT(0, 3, 0),
MKCLRRAIL(2, 3,1), MKCLRRAIL(2, 3, 1),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_9 = { static const AiDefaultRailBlock _raildata_ai_9 = {
MKHDR(2,3,1,0,0) MKHDR(2, 3, 1, 0, 0)
MKDEPOT(2, -3,-1), MKDEPOT(2, -3, -1),
MKRAIL(0x29, -2,-1), MKRAIL(0x29, -2, -1),
MKRAIL(0x15, -2,0), MKRAIL(0x15, -2, 0),
MKRAIL(0xC1, -1,-1), MKRAIL(0xC1, -1, -1),
MKRAIL(0xC1, -1,0), MKRAIL(0xC1, -1, 0),
MKSTATION(0x26, 0,-1), MKSTATION(0x26, 0, -1),
MKCLRRAIL(0, -3,0), MKCLRRAIL(0, -3, 0),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_10 = { static const AiDefaultRailBlock _raildata_ai_10 = {
MKHDR(2,3,2,0,255) MKHDR(2, 3, 2, 0, 255)
MKRAIL(0x1A, 0,-3), MKRAIL(0x1A, 0, -3),
MKRAIL(0x20, 1,-3), MKRAIL(0x20, 1, -3),
MKRAIL(0xC2, 0,-2), MKRAIL(0xC2, 0, -2),
MKRAIL(0xC2, 1,-2), MKRAIL(0xC2, 1, -2),
MKSTATION(0x27, 0,-1), MKSTATION(0x27, 0, -1),
MKRAIL(0xC2, 0,2), MKRAIL(0xC2, 0, 2),
MKRAIL(0xC2, 1,2), MKRAIL(0xC2, 1, 2),
MKRAIL(0x1A, 0,3), MKRAIL(0x1A, 0, 3),
MKRAIL(0x4, 1,3), MKRAIL(0x4, 1, 3),
MKCLRRAIL(3, 0,-4), MKCLRRAIL(3, 0, -4),
MKCLRRAIL(1, 0,4), MKCLRRAIL(1, 0, 4),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_11 = { static const AiDefaultRailBlock _raildata_ai_11 = {
MKHDR(2,3,2,0,255) MKHDR(2, 3, 2, 0, 255)
MKRAIL(0x29, -3,0), MKRAIL(0x29, -3, 0),
MKRAIL(0x10, -3,1), MKRAIL(0x10, -3, 1),
MKRAIL(0xC1, -2,0), MKRAIL(0xC1, -2, 0),
MKRAIL(0xC1, -2,1), MKRAIL(0xC1, -2, 1),
MKSTATION(0x26, -1,0), MKSTATION(0x26, -1, 0),
MKRAIL(0xC1, 2,0), MKRAIL(0xC1, 2, 0),
MKRAIL(0xC1, 2,1), MKRAIL(0xC1, 2, 1),
MKRAIL(0x29, 3,0), MKRAIL(0x29, 3, 0),
MKRAIL(0x4, 3,1), MKRAIL(0x4, 3, 1),
MKCLRRAIL(0, -4,0), MKCLRRAIL(0, -4, 0),
MKCLRRAIL(2, 4,0), MKCLRRAIL(2, 4, 0),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_12 = { static const AiDefaultRailBlock _raildata_ai_12 = {
MKHDR(2,3,2,1,3) MKHDR(2, 3, 2, 1, 3)
MKRAIL(0x88, -1,-3), MKRAIL(0x88, -1, -3),
MKRAIL(0x6, 0,-3), MKRAIL(0x6, 0, -3),
MKRAIL(0x2, -1,-2), MKRAIL(0x2, -1, -2),
MKRAIL(0x42, 0,-2), MKRAIL(0x42, 0, -2),
MKRAIL(0x2, -1,-1), MKRAIL(0x2, -1, -1),
MKRAIL(0x2, 0,-1), MKRAIL(0x2, 0, -1),
MKRAIL(0x2, -1,0), MKRAIL(0x2, -1, 0),
MKRAIL(0x2, 0,0), MKRAIL(0x2, 0, 0),
MKRAIL(0x82, -1,1), MKRAIL(0x82, -1, 1),
MKRAIL(0x2, 0,1), MKRAIL(0x2, 0, 1),
MKRAIL(0xA, -1,2), MKRAIL(0xA, -1, 2),
MKRAIL(0x44, 0,2), MKRAIL(0x44, 0, 2),
MKCLRRAIL(3, 0,-4), MKCLRRAIL(3, 0, -4),
MKCLRRAIL(1, -1,3), MKCLRRAIL(1, -1, 3),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_13 = { static const AiDefaultRailBlock _raildata_ai_13 = {
MKHDR(2,3,2,1,0) MKHDR(2, 3, 2, 1, 0)
MKRAIL(0x21, -3,0), MKRAIL(0x21, -3, 0),
MKRAIL(0x50, -3,1), MKRAIL(0x50, -3, 1),
MKRAIL(0x81, -2,0), MKRAIL(0x81, -2, 0),
MKRAIL(0x1, -2,1), MKRAIL(0x1, -2, 1),
MKRAIL(0x1, -1,0), MKRAIL(0x1, -1, 0),
MKRAIL(0x1, -1,1), MKRAIL(0x1, -1, 1),
MKRAIL(0x1, 0,0), MKRAIL(0x1, 0, 0),
MKRAIL(0x1, 0,1), MKRAIL(0x1, 0, 1),
MKRAIL(0x1, 1,0), MKRAIL(0x1, 1, 0),
MKRAIL(0x41, 1,1), MKRAIL(0x41, 1, 1),
MKRAIL(0xA0, 2,0), MKRAIL(0xA0, 2, 0),
MKRAIL(0x11, 2,1), MKRAIL(0x11, 2, 1),
MKCLRRAIL(0, -4,0), MKCLRRAIL(0, -4, 0),
MKCLRRAIL(2, 3,1), MKCLRRAIL(2, 3, 1),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_14 = { static const AiDefaultRailBlock _raildata_ai_14 = {
MKHDR(2,3,2,1,1) MKHDR(2, 3, 2, 1, 1)
MKRAIL(0x88, -1,-3), MKRAIL(0x88, -1, -3),
MKRAIL(0x6, 0,-3), MKRAIL(0x6, 0, -3),
MKRAIL(0x2, -1,-2), MKRAIL(0x2, -1, -2),
MKRAIL(0x42, 0,-2), MKRAIL(0x42, 0, -2),
MKRAIL(0x2, -1,-1), MKRAIL(0x2, -1, -1),
MKRAIL(0x2, 0,-1), MKRAIL(0x2, 0, -1),
MKRAIL(0x2, -1,0), MKRAIL(0x2, -1, 0),
MKRAIL(0x2, 0,0), MKRAIL(0x2, 0, 0),
MKRAIL(0x82, -1,1), MKRAIL(0x82, -1, 1),
MKRAIL(0x2, 0,1), MKRAIL(0x2, 0, 1),
MKRAIL(0xA, -1,2), MKRAIL(0xA, -1, 2),
MKRAIL(0x44, 0,2), MKRAIL(0x44, 0, 2),
MKCLRRAIL(1, -1,3), MKCLRRAIL(1, -1, 3),
MKCLRRAIL(3, 0,-4), MKCLRRAIL(3, 0, -4),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_15 = { static const AiDefaultRailBlock _raildata_ai_15 = {
MKHDR(2,3,2,1,2) MKHDR(2, 3, 2, 1, 2)
MKRAIL(0x21, -3,0), MKRAIL(0x21, -3, 0),
MKRAIL(0x50, -3,1), MKRAIL(0x50, -3, 1),
MKRAIL(0x81, -2,0), MKRAIL(0x81, -2, 0),
MKRAIL(0x1, -2,1), MKRAIL(0x1, -2, 1),
MKRAIL(0x1, -1,0), MKRAIL(0x1, -1, 0),
MKRAIL(0x1, -1,1), MKRAIL(0x1, -1, 1),
MKRAIL(0x1, 0,0), MKRAIL(0x1, 0, 0),
MKRAIL(0x1, 0,1), MKRAIL(0x1, 0, 1),
MKRAIL(0x1, 1,0), MKRAIL(0x1, 1, 0),
MKRAIL(0x41, 1,1), MKRAIL(0x41, 1, 1),
MKRAIL(0xA0, 2,0), MKRAIL(0xA0, 2, 0),
MKRAIL(0x11, 2,1), MKRAIL(0x11, 2, 1),
MKCLRRAIL(2, 3,1), MKCLRRAIL(2, 3, 1),
MKCLRRAIL(0, -4,0), MKCLRRAIL(0, -4, 0),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_16 = { static const AiDefaultRailBlock _raildata_ai_16 = {
MKHDR(1,3,1,0,1) MKHDR(1, 3, 1, 0, 1)
MKSTATION(0x17, 0,-2), MKSTATION(0x17, 0, -2),
MKRAIL(0x1A, 0,1), MKRAIL(0x1A, 0, 1),
MKCLRRAIL(1, 0,2), MKCLRRAIL(1, 0, 2),
MKDEPOT(0, 1,1), MKDEPOT(0, 1, 1),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_17 = { static const AiDefaultRailBlock _raildata_ai_17 = {
MKHDR(1,3,1,0,3) MKHDR(1, 3, 1, 0, 3)
MKCLRRAIL(3, 0,-2), MKCLRRAIL(3, 0, -2),
MKRAIL(0x26, 0,-1), MKRAIL(0x26, 0, -1),
MKDEPOT(2, -1,-1), MKDEPOT(2, -1, -1),
MKSTATION(0x17, 0,0), MKSTATION(0x17, 0, 0),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_18 = { static const AiDefaultRailBlock _raildata_ai_18 = {
MKHDR(1,3,1,0,0) MKHDR(1, 3, 1, 0, 0)
MKCLRRAIL(0, -2,0), MKCLRRAIL(0, -2, 0),
MKRAIL(0x29, -1,0), MKRAIL(0x29, -1, 0),
MKDEPOT(3, -1,1), MKDEPOT(3, -1, 1),
MKSTATION(0x16, 0,0), MKSTATION(0x16, 0, 0),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_19 = { static const AiDefaultRailBlock _raildata_ai_19 = {
MKHDR(1,3,1,0,2) MKHDR(1, 3, 1, 0, 2)
MKSTATION(0x16, -2,0), MKSTATION(0x16, -2, 0),
MKDEPOT(2, 0,-1), MKDEPOT(2, 0, -1),
MKRAIL(0x20, 1,-1), MKRAIL(0x20, 1, -1),
MKRAIL(0x15, 1,0), MKRAIL(0x15, 1, 0),
MKCLRRAIL(2, 2,0), MKCLRRAIL(2, 2, 0),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_20 = { static const AiDefaultRailBlock _raildata_ai_20 = {
MKHDR(2,3,1,0,1) MKHDR(2, 3, 1, 0, 1)
MKSTATION(0x26, -2,0), MKSTATION(0x26, -2, 0),
MKRAIL(0xC1, 1,0), MKRAIL(0xC1, 1, 0),
MKRAIL(0xC1, 1,1), MKRAIL(0xC1, 1, 1),
MKRAIL(0x26, 2,0), MKRAIL(0x26, 2, 0),
MKRAIL(0x26, 2,1), MKRAIL(0x26, 2, 1),
MKDEPOT(1, 2,-1), MKDEPOT(1, 2, -1),
MKCLRRAIL(1, 2,2), MKCLRRAIL(1, 2, 2),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_21 = { static const AiDefaultRailBlock _raildata_ai_21 = {
MKHDR(2,3,1,0,3) MKHDR(2, 3, 1, 0, 3)
MKDEPOT(2, -3,-1), MKDEPOT(2, -3, -1),
MKRAIL(0x3F, -2,-1), MKRAIL(0x3F, -2, -1),
MKRAIL(0x10, -2,0), MKRAIL(0x10, -2, 0),
MKRAIL(0xC1, -1,-1), MKRAIL(0xC1, -1, -1),
MKRAIL(0xC1, -1,0), MKRAIL(0xC1, -1, 0),
MKSTATION(0x26, 0,-1), MKSTATION(0x26, 0, -1),
MKCLRRAIL(3, -2,-2), MKCLRRAIL(3, -2, -2),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_22 = { static const AiDefaultRailBlock _raildata_ai_22 = {
MKHDR(2,3,1,0,0) MKHDR(2, 3, 1, 0, 0)
MKSTATION(0x27, 0,-2), MKSTATION(0x27, 0, -2),
MKRAIL(0xC2, 0,1), MKRAIL(0xC2, 0, 1),
MKRAIL(0xC2, 1,1), MKRAIL(0xC2, 1, 1),
MKRAIL(0x15, 0,2), MKRAIL(0x15, 0, 2),
MKRAIL(0x4, 1,2), MKRAIL(0x4, 1, 2),
MKRAIL(0x15, -1,2), MKRAIL(0x15, -1, 2),
MKDEPOT(1, -1,1), MKDEPOT(1, -1, 1),
MKCLRRAIL(0, -2,2), MKCLRRAIL(0, -2, 2),
MKEND MKEND
}; };
static const AiDefaultRailBlock _raildata_ai_23 = { static const AiDefaultRailBlock _raildata_ai_23 = {
MKHDR(2,3,1,0,2) MKHDR(2, 3, 1, 0, 2)
MKDEPOT(1, 0,-3), MKDEPOT(1, 0, -3),
MKRAIL(0x1A, 0,-2), MKRAIL(0x1A, 0, -2),
MKRAIL(0x29, 1,-2), MKRAIL(0x29, 1, -2),
MKRAIL(0xC2, 0,-1), MKRAIL(0xC2, 0, -1),
MKRAIL(0xC2, 1,-1), MKRAIL(0xC2, 1, -1),
MKSTATION(0x27, 0,0), MKSTATION(0x27, 0, 0),
MKCLRRAIL(2, 2,-2), MKCLRRAIL(2, 2, -2),
MKEND MKEND
}; };

16
table/clear_land.h
View File

@@ -12,17 +12,17 @@ static const SpriteID _landscape_clear_sprites[8] = {
}; };
static const byte _fence_mod_by_tileh[32] = { static const byte _fence_mod_by_tileh[32] = {
0,2,4,0,0,2,4,0, 0, 2, 4, 0, 0, 2, 4, 0,
0,2,4,0,0,2,4,0, 0, 2, 4, 0, 0, 2, 4, 0,
0,2,4,0,0,2,4,4, 0, 2, 4, 0, 0, 2, 4, 4,
0,2,4,2,0,2,4,0, 0, 2, 4, 2, 0, 2, 4, 0,
}; };
static const byte _fence_mod_by_tileh_2[32] = { static const byte _fence_mod_by_tileh_2[32] = {
1,1,5,5,3,3,1,1, 1, 1, 5, 5, 3, 3, 1, 1,
1,1,5,5,3,3,1,1, 1, 1, 5, 5, 3, 3, 1, 1,
1,1,5,5,3,3,1,5, 1, 1, 5, 5, 3, 3, 1, 5,
1,1,5,5,3,3,3,1, 1, 1, 5, 5, 3, 3, 3, 1,
}; };

30
table/files.h
View File

@@ -25,31 +25,31 @@
static FileList files_dos = { static FileList files_dos = {
{ {
{ "TRG1.GRF", {0x93,0x11,0x67,0x62,0x80,0xe5,0xb1,0x40,0x77,0xa8,0xee,0x41,0xc1,0xb4,0x21,0x92} }, // 0 - 4792 inclusive { "TRG1.GRF", {0x93, 0x11, 0x67, 0x62, 0x80, 0xe5, 0xb1, 0x40, 0x77, 0xa8, 0xee, 0x41, 0xc1, 0xb4, 0x21, 0x92} }, // 0 - 4792 inclusive
{ "TRGI.GRF", {0xda,0x6a,0x6c,0x9d,0xcc,0x45,0x1e,0xec,0x88,0xd7,0x92,0x11,0x43,0x7b,0x76,0xa8} }, // 4793 - 4889 inclusive { "TRGI.GRF", {0xda, 0x6a, 0x6c, 0x9d, 0xcc, 0x45, 0x1e, 0xec, 0x88, 0xd7, 0x92, 0x11, 0x43, 0x7b, 0x76, 0xa8} }, // 4793 - 4889 inclusive
{ "dosdummy.grf", {0x07,0x01,0xe6,0xc4,0x07,0x6a,0x5b,0xc3,0xf4,0x9f,0x01,0xad,0x21,0x6c,0xa0,0xc2} }, // 4890 - 4895 inclusive { "dosdummy.grf", {0x07, 0x01, 0xe6, 0xc4, 0x07, 0x6a, 0x5b, 0xc3, 0xf4, 0x9f, 0x01, 0xad, 0x21, 0x6c, 0xa0, 0xc2} }, // 4890 - 4895 inclusive
{ "nsignalsw.grf", {0x65,0xb9,0xd7,0x30,0x56,0x06,0xcc,0x9e,0x27,0x57,0xc8,0xe4,0x9b,0xb3,0x66,0x81} }, // 4896 - 5381 inclusive { "nsignalsw.grf", {0x65, 0xb9, 0xd7, 0x30, 0x56, 0x06, 0xcc, 0x9e, 0x27, 0x57, 0xc8, 0xe4, 0x9b, 0xb3, 0x66, 0x81} }, // 4896 - 5381 inclusive
{ NULL, { 0 } } { NULL, { 0 } }
}, },
{ { "TRGC.GRF", {0xed,0x44,0x66,0x37,0xe0,0x34,0x10,0x4c,0x55,0x59,0xb3,0x2c,0x18,0xaf,0xe7,0x8d} }, { { "TRGC.GRF", {0xed, 0x44, 0x66, 0x37, 0xe0, 0x34, 0x10, 0x4c, 0x55, 0x59, 0xb3, 0x2c, 0x18, 0xaf, 0xe7, 0x8d} },
{ "TRGH.GRF", {0xee,0x66,0x16,0xfb,0x0e,0x6e,0xf6,0xb2,0x48,0x92,0xc5,0x8c,0x93,0xd8,0x6f,0xc9} }, { "TRGH.GRF", {0xee, 0x66, 0x16, 0xfb, 0x0e, 0x6e, 0xf6, 0xb2, 0x48, 0x92, 0xc5, 0x8c, 0x93, 0xd8, 0x6f, 0xc9} },
{ "TRGT.GRF", {0xfc,0xde,0x1d,0x7e,0x8a,0x74,0x19,0x7d,0x72,0xa6,0x26,0x95,0x88,0x4b,0x90,0x9e} } { "TRGT.GRF", {0xfc, 0xde, 0x1d, 0x7e, 0x8a, 0x74, 0x19, 0x7d, 0x72, 0xa6, 0x26, 0x95, 0x88, 0x4b, 0x90, 0x9e} }
} }
}; };
static FileList files_win = { static FileList files_win = {
{ {
{ "TRG1R.GRF", {0xb0,0x4c,0xe5,0x93,0xd8,0xc5,0x01,0x6e,0x07,0x47,0x3a,0x74,0x3d,0x7d,0x33,0x58} }, // 0 - 4792 inclusive { "TRG1R.GRF", {0xb0, 0x4c, 0xe5, 0x93, 0xd8, 0xc5, 0x01, 0x6e, 0x07, 0x47, 0x3a, 0x74, 0x3d, 0x7d, 0x33, 0x58} }, // 0 - 4792 inclusive
{ "TRGIR.GRF", {0x0c,0x24,0x84,0xff,0x6b,0xe4,0x9f,0xc6,0x3a,0x83,0xbe,0x6a,0xb5,0xc3,0x8f,0x32} }, // 4793 - 4895 inclusive { "TRGIR.GRF", {0x0c, 0x24, 0x84, 0xff, 0x6b, 0xe4, 0x9f, 0xc6, 0x3a, 0x83, 0xbe, 0x6a, 0xb5, 0xc3, 0x8f, 0x32} }, // 4793 - 4895 inclusive
{ "nsignalsw.grf", {0x65,0xb9,0xd7,0x30,0x56,0x06,0xcc,0x9e,0x27,0x57,0xc8,0xe4,0x9b,0xb3,0x66,0x81} }, // 4896 - 5381 inclusive { "nsignalsw.grf", {0x65, 0xb9, 0xd7, 0x30, 0x56, 0x06, 0xcc, 0x9e, 0x27, 0x57, 0xc8, 0xe4, 0x9b, 0xb3, 0x66, 0x81} }, // 4896 - 5381 inclusive
{ NULL, { 0 } }, { NULL, { 0 } },
{ NULL, { 0 } } { NULL, { 0 } }
}, },
{ { "TRGCR.GRF", {0x36,0x68,0xf4,0x10,0xc7,0x61,0xa0,0x50,0xb5,0xe7,0x09,0x5a,0x2b,0x14,0x87,0x9b} }, { { "TRGCR.GRF", {0x36, 0x68, 0xf4, 0x10, 0xc7, 0x61, 0xa0, 0x50, 0xb5, 0xe7, 0x09, 0x5a, 0x2b, 0x14, 0x87, 0x9b} },
{ "TRGHR.GRF", {0x06,0xbf,0x2b,0x7a,0x31,0x76,0x6f,0x04,0x8b,0xaa,0xc2,0xeb,0xe4,0x34,0x57,0xb1} }, { "TRGHR.GRF", {0x06, 0xbf, 0x2b, 0x7a, 0x31, 0x76, 0x6f, 0x04, 0x8b, 0xaa, 0xc2, 0xeb, 0xe4, 0x34, 0x57, 0xb1} },
{ "TRGTR.GRF", {0xde,0x53,0x65,0x05,0x17,0xfe,0x66,0x1c,0xea,0xa3,0x13,0x8c,0x6e,0xdb,0x0e,0xb8} } { "TRGTR.GRF", {0xde, 0x53, 0x65, 0x05, 0x17, 0xfe, 0x66, 0x1c, 0xea, 0xa3, 0x13, 0x8c, 0x6e, 0xdb, 0x0e, 0xb8} }
} }
}; };
static MD5File sample_cat_win = { "SAMPLE.CAT", {0x92,0x12,0xe8,0x1e,0x72,0xba,0xdd,0x4b,0xbe,0x1e,0xae,0xae,0x66,0x45,0x8e,0x10} }; static MD5File sample_cat_win = { "SAMPLE.CAT", {0x92, 0x12, 0xe8, 0x1e, 0x72, 0xba, 0xdd, 0x4b, 0xbe, 0x1e, 0xae, 0xae, 0x66, 0x45, 0x8e, 0x10} };
static MD5File sample_cat_dos = { "SAMPLE.CAT", {0x42,0x2e,0xa3,0xdd,0x07,0x4d,0x28,0x59,0xbb,0x51,0x63,0x9a,0x6e,0x0e,0x85,0xda} }; static MD5File sample_cat_dos = { "SAMPLE.CAT", {0x42, 0x2e, 0xa3, 0xdd, 0x07, 0x4d, 0x28, 0x59, 0xbb, 0x51, 0x63, 0x9a, 0x6e, 0x0e, 0x85, 0xda} };

300
table/genland.h
View File

@@ -1,157 +1,157 @@
/* $Id$ */ /* $Id$ */
#define M(x,y) {x, y} #define M(x, y) {x, y}
static const TileIndexDiffC _make_desert_or_rainforest_data[] = { static const TileIndexDiffC _make_desert_or_rainforest_data[] = {
M(-5,-6), M(-5, -6),
M(-4,-6), M(-4, -6),
M(-3,-6), M(-3, -6),
M(-2,-6), M(-2, -6),
M(-1,-6), M(-1, -6),
M(0,-5), M( 0, -5),
M(1,-5), M( 1, -5),
M(2,-5), M( 2, -5),
M(3,-5), M( 3, -5),
M(4,-5), M( 4, -5),
M(5,-5), M( 5, -5),
M(-5,-5), M(-5, -5),
M(-4,-5), M(-4, -5),
M(-3,-5), M(-3, -5),
M(-2,-5), M(-2, -5),
M(-1,-5), M(-1, -5),
M(0,-4), M( 0, -4),
M(1,-4), M( 1, -4),
M(2,-4), M( 2, -4),
M(3,-4), M( 3, -4),
M(4,-4), M( 4, -4),
M(5,-4), M( 5, -4),
M(-5,-4), M(-5, -4),
M(-4,-4), M(-4, -4),
M(-3,-4), M(-3, -4),
M(-2,-4), M(-2, -4),
M(-1,-4), M(-1, -4),
M(0,-3), M( 0, -3),
M(1,-3), M( 1, -3),
M(2,-3), M( 2, -3),
M(3,-3), M( 3, -3),
M(4,-3), M( 4, -3),
M(5,-3), M( 5, -3),
M(-5,-3), M(-5, -3),
M(-4,-3), M(-4, -3),
M(-3,-3), M(-3, -3),
M(-2,-3), M(-2, -3),
M(-1,-3), M(-1, -3),
M(0,-2), M( 0, -2),
M(1,-2), M( 1, -2),
M(2,-2), M( 2, -2),
M(3,-2), M( 3, -2),
M(4,-2), M( 4, -2),
M(5,-2), M( 5, -2),
M(-5,-2), M(-5, -2),
M(-4,-2), M(-4, -2),
M(-3,-2), M(-3, -2),
M(-2,-2), M(-2, -2),
M(-1,-2), M(-1, -2),
M(0,-1), M( 0, -1),
M(1,-1), M( 1, -1),
M(2,-1), M( 2, -1),
M(3,-1), M( 3, -1),
M(4,-1), M( 4, -1),
M(5,-1), M( 5, -1),
M(-5,-1), M(-5, -1),
M(-4,-1), M(-4, -1),
M(-3,-1), M(-3, -1),
M(-2,-1), M(-2, -1),
M(-1,-1), M(-1, -1),
M(0,0), M( 0, 0),
M(1,0), M( 1, 0),
M(2,0), M( 2, 0),
M(3,0), M( 3, 0),
M(4,0), M( 4, 0),
M(5,0), M( 5, 0),
M(-5,0), M(-5, 0),
M(-4,0), M(-4, 0),
M(-3,0), M(-3, 0),
M(-2,0), M(-2, 0),
M(-1,0), M(-1, 0),
M(0,1), M( 0, 1),
M(1,1), M( 1, 1),
M(2,1), M( 2, 1),
M(3,1), M( 3, 1),
M(4,1), M( 4, 1),
M(5,1), M( 5, 1),
M(-5,1), M(-5, 1),
M(-4,1), M(-4, 1),
M(-3,1), M(-3, 1),
M(-2,1), M(-2, 1),
M(-1,1), M(-1, 1),
M(0,2), M( 0, 2),
M(1,2), M( 1, 2),
M(2,2), M( 2, 2),
M(3,2), M( 3, 2),
M(4,2), M( 4, 2),
M(5,2), M( 5, 2),
M(-5,2), M(-5, 2),
M(-4,2), M(-4, 2),
M(-3,2), M(-3, 2),
M(-2,2), M(-2, 2),
M(-1,2), M(-1, 2),
M(0,3), M( 0, 3),
M(1,3), M( 1, 3),
M(2,3), M( 2, 3),
M(3,3), M( 3, 3),
M(4,3), M( 4, 3),
M(5,3), M( 5, 3),
M(-5,3), M(-5, 3),
M(-4,3), M(-4, 3),
M(-3,3), M(-3, 3),
M(-2,3), M(-2, 3),
M(-1,3), M(-1, 3),
M(0,4), M( 0, 4),
M(1,4), M( 1, 4),
M(2,4), M( 2, 4),
M(3,4), M( 3, 4),
M(4,4), M( 4, 4),
M(5,4), M( 5, 4),
M(-5,4), M(-5, 4),
M(-4,4), M(-4, 4),
M(-3,4), M(-3, 4),
M(-2,4), M(-2, 4),
M(-1,4), M(-1, 4),
M(0,5), M( 0, 5),
M(1,5), M( 1, 5),
M(2,5), M( 2, 5),
M(3,5), M( 3, 5),
M(4,5), M( 4, 5),
M(5,5), M( 5, 5),
M(6,-3), M( 6, -3),
M(-6,-4), M(-6, -4),
M(-3,5), M(-3, 5),
M(-3,-7), M(-3, -7),
M(6,-2), M( 6, -2),
M(-6,-3), M(-6, -3),
M(-2,5), M(-2, 5),
M(-2,-7), M(-2, -7),
M(6,-1), M( 6, -1),
M(-6,-2), M(-6, -2),
M(-1,5), M(-1, 5),
M(-1,-7), M(-1, -7),
M(6,0), M( 6, 0),
M(-6,-1), M(-6, -1),
M(0,6), M( 0, 6),
M(0,-6), M( 0, -6),
M(6,1), M( 6, 1),
M(-6,0), M(-6, 0),
M(1,6), M( 1, 6),
M(1,-6), M( 1, -6),
M(6,2), M( 6, 2),
M(-6,1), M(-6, 1),
M(2,6), M( 2, 6),
M(2,-6), M( 2, -6),
M(6,3), M( 6, 3),
M(-6,2), M(-6, 2),
M(3,6), M( 3, 6),
M(3,-6) M( 3, -6)
}; };

80
table/road_land.h
View File

@@ -59,7 +59,7 @@ static const DrawRoadTileStruct _road_display_datas2_2[] = {
}; };
static const DrawRoadTileStruct _road_display_datas2_3[] = { static const DrawRoadTileStruct _road_display_datas2_3[] = {
MAKELINE(0x57f,1,8) MAKELINE(0x57f, 1, 8)
ENDLINE ENDLINE
}; };
@@ -68,18 +68,18 @@ static const DrawRoadTileStruct _road_display_datas2_4[] = {
}; };
static const DrawRoadTileStruct _road_display_datas2_5[] = { static const DrawRoadTileStruct _road_display_datas2_5[] = {
MAKELINE(0x57f,1,8) MAKELINE(0x57f, 1, 8)
MAKELINE(0x57e,14,8) MAKELINE(0x57e, 14, 8)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_6[] = { static const DrawRoadTileStruct _road_display_datas2_6[] = {
MAKELINE(0x57e,8,1) MAKELINE(0x57e, 8, 1)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_7[] = { static const DrawRoadTileStruct _road_display_datas2_7[] = {
MAKELINE(0x57f,1,8) MAKELINE(0x57f, 1, 8)
ENDLINE ENDLINE
}; };
@@ -88,33 +88,33 @@ static const DrawRoadTileStruct _road_display_datas2_8[] = {
}; };
static const DrawRoadTileStruct _road_display_datas2_9[] = { static const DrawRoadTileStruct _road_display_datas2_9[] = {
MAKELINE(0x57f,8,14) MAKELINE(0x57f, 8, 14)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_10[] = { static const DrawRoadTileStruct _road_display_datas2_10[] = {
MAKELINE(0x57f,8,14) MAKELINE(0x57f, 8, 14)
MAKELINE(0x57e,8,1) MAKELINE(0x57e, 8, 1)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_11[] = { static const DrawRoadTileStruct _road_display_datas2_11[] = {
MAKELINE(0x57f,8,14) MAKELINE(0x57f, 8, 14)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_12[] = { static const DrawRoadTileStruct _road_display_datas2_12[] = {
MAKELINE(0x57e,8,1) MAKELINE(0x57e, 8, 1)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_13[] = { static const DrawRoadTileStruct _road_display_datas2_13[] = {
MAKELINE(0x57e,14,8) MAKELINE(0x57e, 14, 8)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_14[] = { static const DrawRoadTileStruct _road_display_datas2_14[] = {
MAKELINE(0x57e,8,1) MAKELINE(0x57e, 8, 1)
ENDLINE ENDLINE
}; };
@@ -135,9 +135,9 @@ static const DrawRoadTileStruct _road_display_datas2_18[] = {
}; };
static const DrawRoadTileStruct _road_display_datas2_19[] = { static const DrawRoadTileStruct _road_display_datas2_19[] = {
MAKELINE(0x1212,0,2) MAKELINE(0x1212, 0, 2)
MAKELINE(0x1212,3,9) MAKELINE(0x1212, 3, 9)
MAKELINE(0x1212,10,12) MAKELINE(0x1212, 10, 12)
ENDLINE ENDLINE
}; };
@@ -146,23 +146,23 @@ static const DrawRoadTileStruct _road_display_datas2_20[] = {
}; };
static const DrawRoadTileStruct _road_display_datas2_21[] = { static const DrawRoadTileStruct _road_display_datas2_21[] = {
MAKELINE(0x1212,0,2) MAKELINE(0x1212, 0, 2)
MAKELINE(0x1212,0,10) MAKELINE(0x1212, 0, 10)
MAKELINE(0x1212,12,2) MAKELINE(0x1212, 12, 2)
MAKELINE(0x1212,12,10) MAKELINE(0x1212, 12, 10)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_22[] = { static const DrawRoadTileStruct _road_display_datas2_22[] = {
MAKELINE(0x1212,10,0) MAKELINE(0x1212, 10, 0)
MAKELINE(0x1212,3,3) MAKELINE(0x1212, 3, 3)
MAKELINE(0x1212,0,10) MAKELINE(0x1212, 0, 10)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_23[] = { static const DrawRoadTileStruct _road_display_datas2_23[] = {
MAKELINE(0x1212,0,2) MAKELINE(0x1212, 0, 2)
MAKELINE(0x1212,0,10) MAKELINE(0x1212, 0, 10)
ENDLINE ENDLINE
}; };
@@ -171,42 +171,42 @@ static const DrawRoadTileStruct _road_display_datas2_24[] = {
}; };
static const DrawRoadTileStruct _road_display_datas2_25[] = { static const DrawRoadTileStruct _road_display_datas2_25[] = {
MAKELINE(0x1212,12,2) MAKELINE(0x1212, 12, 2)
MAKELINE(0x1212,9,9) MAKELINE(0x1212, 9, 9)
MAKELINE(0x1212,2,12) MAKELINE(0x1212, 2, 12)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_26[] = { static const DrawRoadTileStruct _road_display_datas2_26[] = {
MAKELINE(0x1212,2,0) MAKELINE(0x1212, 2, 0)
MAKELINE(0x1212,10,0) MAKELINE(0x1212, 10, 0)
MAKELINE(0x1212,2,12) MAKELINE(0x1212, 2, 12)
MAKELINE(0x1212,10,12) MAKELINE(0x1212, 10, 12)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_27[] = { static const DrawRoadTileStruct _road_display_datas2_27[] = {
MAKELINE(0x1212,2,12) MAKELINE(0x1212, 2, 12)
MAKELINE(0x1212,10,12) MAKELINE(0x1212, 10, 12)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_28[] = { static const DrawRoadTileStruct _road_display_datas2_28[] = {
MAKELINE(0x1212,2,0) MAKELINE(0x1212, 2, 0)
MAKELINE(0x1212,9,3) MAKELINE(0x1212, 9, 3)
MAKELINE(0x1212,12,10) MAKELINE(0x1212, 12, 10)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_29[] = { static const DrawRoadTileStruct _road_display_datas2_29[] = {
MAKELINE(0x1212,12,2) MAKELINE(0x1212, 12, 2)
MAKELINE(0x1212,12,10) MAKELINE(0x1212, 12, 10)
ENDLINE ENDLINE
}; };
static const DrawRoadTileStruct _road_display_datas2_30[] = { static const DrawRoadTileStruct _road_display_datas2_30[] = {
MAKELINE(0x1212,2,0) MAKELINE(0x1212, 2, 0)
MAKELINE(0x1212,10,0) MAKELINE(0x1212, 10, 0)
ENDLINE ENDLINE
}; };

1824
table/roadveh.h
View File

File diff suppressed because it is too large Load Diff

4
table/unmovable_land.h
View File

@@ -13,8 +13,8 @@ typedef struct DrawTileUnmovableStruct {
#define TILE_SEQ_END() { 0x80, 0, 0, 0, 0, 0, 0 } #define TILE_SEQ_END() { 0x80, 0, 0, 0, 0, 0, 0 }
static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = { static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = {
{0xA29, 7,7, 2,2, 70, 0}, {0xA29, 7, 7, 2, 2, 70, 0},
{0xA2A, 4,4, 7,7, 61, 0}, {0xA2A, 4, 4, 7, 7, 61, 0},
}; };

112
town_cmd.c
View File

@@ -789,23 +789,23 @@ static void UpdateTownRadius(Town *t)
{ {
static const uint16 _town_radius_data[23][5] = { static const uint16 _town_radius_data[23][5] = {
{ 4, 0, 0, 0, 0}, // 0 { 4, 0, 0, 0, 0}, // 0
{16, 0, 0, 0, 0}, { 16, 0, 0, 0, 0},
{25, 0, 0, 0, 0}, { 25, 0, 0, 0, 0},
{36, 0, 0, 0, 0}, { 36, 0, 0, 0, 0},
{49, 0, 4, 0, 0}, { 49, 0, 4, 0, 0},
{64, 0, 4, 0, 0}, // 20 { 64, 0, 4, 0, 0}, // 20
{64, 0, 9, 0, 1}, { 64, 0, 9, 0, 1},
{64, 0, 9, 0, 4}, { 64, 0, 9, 0, 4},
{64, 0, 16, 0, 4}, { 64, 0, 16, 0, 4},
{81, 0, 16, 0, 4}, { 81, 0, 16, 0, 4},
{81, 0, 16, 0, 4}, // 40 { 81, 0, 16, 0, 4}, // 40
{81, 0, 25, 0, 9}, { 81, 0, 25, 0, 9},
{81, 36, 25, 0, 9}, { 81, 36, 25, 0, 9},
{81, 36, 25, 16, 9}, { 81, 36, 25, 16, 9},
{81, 49, 0, 25, 9}, { 81, 49, 0, 25, 9},
{81, 64, 0, 25, 9}, // 60 { 81, 64, 0, 25, 9}, // 60
{81, 64, 0, 36, 9}, { 81, 64, 0, 36, 9},
{81, 64, 0, 36, 16}, { 81, 64, 0, 36, 16},
{100, 81, 0, 49, 16}, {100, 81, 0, 49, 16},
{100, 81, 0, 49, 25}, {100, 81, 0, 49, 25},
{121, 81, 0, 49, 25}, // 80 {121, 81, 0, 49, 25}, // 80
@@ -1878,59 +1878,59 @@ static const SaveLoad _town_desc[] = {
SLE_CONDVAR(Town, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Town, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Town, xy, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Town, xy, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(Town,population, SLE_FILE_U16 | SLE_VAR_U32, 0, 2), SLE_CONDVAR(Town, population, SLE_FILE_U16 | SLE_VAR_U32, 0, 2),
SLE_CONDVAR(Town,population, SLE_UINT32, 3, SL_MAX_VERSION), SLE_CONDVAR(Town, population, SLE_UINT32, 3, SL_MAX_VERSION),
SLE_VAR(Town,num_houses, SLE_UINT16), SLE_VAR(Town, num_houses, SLE_UINT16),
SLE_VAR(Town,townnametype,SLE_UINT16), SLE_VAR(Town, townnametype, SLE_UINT16),
SLE_VAR(Town,townnameparts,SLE_UINT32), SLE_VAR(Town, townnameparts, SLE_UINT32),
SLE_VAR(Town,flags12, SLE_UINT8), SLE_VAR(Town, flags12, SLE_UINT8),
SLE_VAR(Town,statues, SLE_UINT8), SLE_VAR(Town, statues, SLE_UINT8),
// sort_index_obsolete was stored here in savegame format 0 - 1 // sort_index_obsolete was stored here in savegame format 0 - 1
SLE_CONDNULL(1, 0, 1), SLE_CONDNULL(1, 0, 1),
SLE_VAR(Town,have_ratings,SLE_UINT8), SLE_VAR(Town, have_ratings, SLE_UINT8),
SLE_ARR(Town,ratings, SLE_INT16, 8), SLE_ARR(Town, ratings, SLE_INT16, 8),
// failed bribe attempts are stored since savegame format 4 // failed bribe attempts are stored since savegame format 4
SLE_CONDARR(Town,unwanted, SLE_INT8, 8, 4,SL_MAX_VERSION), SLE_CONDARR(Town, unwanted, SLE_INT8, 8, 4,SL_MAX_VERSION),
SLE_CONDVAR(Town,max_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), SLE_CONDVAR(Town, max_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
SLE_CONDVAR(Town,max_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), SLE_CONDVAR(Town, max_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
SLE_CONDVAR(Town,new_max_pass,SLE_FILE_U16 | SLE_VAR_U32, 0, 8), SLE_CONDVAR(Town, new_max_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
SLE_CONDVAR(Town,new_max_mail,SLE_FILE_U16 | SLE_VAR_U32, 0, 8), SLE_CONDVAR(Town, new_max_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
SLE_CONDVAR(Town,act_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), SLE_CONDVAR(Town, act_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
SLE_CONDVAR(Town,act_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), SLE_CONDVAR(Town, act_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
SLE_CONDVAR(Town,new_act_pass,SLE_FILE_U16 | SLE_VAR_U32, 0, 8), SLE_CONDVAR(Town, new_act_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
SLE_CONDVAR(Town,new_act_mail,SLE_FILE_U16 | SLE_VAR_U32, 0, 8), SLE_CONDVAR(Town, new_act_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
SLE_CONDVAR(Town,max_pass, SLE_UINT32, 9, SL_MAX_VERSION), SLE_CONDVAR(Town, max_pass, SLE_UINT32, 9, SL_MAX_VERSION),
SLE_CONDVAR(Town,max_mail, SLE_UINT32, 9, SL_MAX_VERSION), SLE_CONDVAR(Town, max_mail, SLE_UINT32, 9, SL_MAX_VERSION),
SLE_CONDVAR(Town,new_max_pass,SLE_UINT32, 9, SL_MAX_VERSION), SLE_CONDVAR(Town, new_max_pass, SLE_UINT32, 9, SL_MAX_VERSION),
SLE_CONDVAR(Town,new_max_mail,SLE_UINT32, 9, SL_MAX_VERSION), SLE_CONDVAR(Town, new_max_mail, SLE_UINT32, 9, SL_MAX_VERSION),
SLE_CONDVAR(Town,act_pass, SLE_UINT32, 9, SL_MAX_VERSION), SLE_CONDVAR(Town, act_pass, SLE_UINT32, 9, SL_MAX_VERSION),
SLE_CONDVAR(Town,act_mail, SLE_UINT32, 9, SL_MAX_VERSION), SLE_CONDVAR(Town, act_mail, SLE_UINT32, 9, SL_MAX_VERSION),
SLE_CONDVAR(Town,new_act_pass,SLE_UINT32, 9, SL_MAX_VERSION), SLE_CONDVAR(Town, new_act_pass, SLE_UINT32, 9, SL_MAX_VERSION),
SLE_CONDVAR(Town,new_act_mail,SLE_UINT32, 9, SL_MAX_VERSION), SLE_CONDVAR(Town, new_act_mail, SLE_UINT32, 9, SL_MAX_VERSION),
SLE_VAR(Town,pct_pass_transported,SLE_UINT8), SLE_VAR(Town, pct_pass_transported, SLE_UINT8),
SLE_VAR(Town,pct_mail_transported,SLE_UINT8), SLE_VAR(Town, pct_mail_transported, SLE_UINT8),
SLE_VAR(Town,act_food, SLE_UINT16), SLE_VAR(Town, act_food, SLE_UINT16),
SLE_VAR(Town,act_water, SLE_UINT16), SLE_VAR(Town, act_water, SLE_UINT16),
SLE_VAR(Town,new_act_food,SLE_UINT16), SLE_VAR(Town, new_act_food, SLE_UINT16),
SLE_VAR(Town,new_act_water,SLE_UINT16), SLE_VAR(Town, new_act_water, SLE_UINT16),
SLE_VAR(Town,time_until_rebuild, SLE_UINT8), SLE_VAR(Town, time_until_rebuild, SLE_UINT8),
SLE_VAR(Town,grow_counter, SLE_UINT8), SLE_VAR(Town, grow_counter, SLE_UINT8),
SLE_VAR(Town,growth_rate, SLE_UINT8), SLE_VAR(Town, growth_rate, SLE_UINT8),
SLE_VAR(Town,fund_buildings_months, SLE_UINT8), SLE_VAR(Town, fund_buildings_months, SLE_UINT8),
SLE_VAR(Town,road_build_months, SLE_UINT8), SLE_VAR(Town, road_build_months, SLE_UINT8),
SLE_VAR(Town,exclusivity, SLE_UINT8), SLE_VAR(Town, exclusivity, SLE_UINT8),
SLE_VAR(Town,exclusive_counter, SLE_UINT8), SLE_VAR(Town, exclusive_counter, SLE_UINT8),
// reserve extra space in savegame here. (currently 30 bytes) // reserve extra space in savegame here. (currently 30 bytes)
SLE_CONDNULL(30, 2, SL_MAX_VERSION), SLE_CONDNULL(30, 2, SL_MAX_VERSION),

2
town_gui.c
View File

@@ -298,7 +298,7 @@ static const Widget _town_view_widgets[] = {
{ WWT_6, RESIZE_NONE, 13, 2, 257, 16, 103, 0x0, STR_NULL}, { WWT_6, RESIZE_NONE, 13, 2, 257, 16, 103, 0x0, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 13, 0, 259, 106, 137, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 13, 0, 259, 106, 137, 0x0, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 13, 0, 85, 138, 149, STR_00E4_LOCATION, STR_200B_CENTER_THE_MAIN_VIEW_ON}, { WWT_PUSHTXTBTN, RESIZE_NONE, 13, 0, 85, 138, 149, STR_00E4_LOCATION, STR_200B_CENTER_THE_MAIN_VIEW_ON},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 13, 86, 171, 138, 149, STR_2020_LOCAL_AUTHORITY,STR_2021_SHOW_INFORMATION_ON_LOCAL}, { WWT_PUSHTXTBTN, RESIZE_NONE, 13, 86, 171, 138, 149, STR_2020_LOCAL_AUTHORITY, STR_2021_SHOW_INFORMATION_ON_LOCAL},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 13, 172, 259, 138, 149, STR_0130_RENAME, STR_200C_CHANGE_TOWN_NAME}, { WWT_PUSHTXTBTN, RESIZE_NONE, 13, 172, 259, 138, 149, STR_0130_RENAME, STR_200C_CHANGE_TOWN_NAME},
{ WIDGETS_END}, { WIDGETS_END},
}; };

24
train_cmd.c
View File

@@ -35,8 +35,8 @@
static bool TrainCheckIfLineEnds(Vehicle *v); static bool TrainCheckIfLineEnds(Vehicle *v);
static void TrainController(Vehicle *v); static void TrainController(Vehicle *v);
static const byte _vehicle_initial_x_fract[4] = {10,8,4,8}; static const byte _vehicle_initial_x_fract[4] = {10, 8, 4, 8};
static const byte _vehicle_initial_y_fract[4] = {8,4,8,10}; static const byte _vehicle_initial_y_fract[4] = { 8, 4, 8, 10};
static const byte _state_dir_table[4] = { 0x20, 8, 0x10, 4 }; static const byte _state_dir_table[4] = { 0x20, 8, 0x10, 4 };
/** /**
@@ -2171,12 +2171,12 @@ static void FillWithStationData(TrainTrackFollowerData* fd, const Vehicle* v)
} }
static const byte _initial_tile_subcoord[6][4][3] = { static const byte _initial_tile_subcoord[6][4][3] = {
{{ 15, 8, 1 },{ 0, 0, 0 },{ 0, 8, 5 },{ 0, 0, 0 }}, {{ 15, 8, 1 }, { 0, 0, 0 }, { 0, 8, 5 }, { 0, 0, 0 }},
{{ 0, 0, 0 },{ 8, 0, 3 },{ 0, 0, 0 },{ 8,15, 7 }}, {{ 0, 0, 0 }, { 8, 0, 3 }, { 0, 0, 0 }, { 8, 15, 7 }},
{{ 0, 0, 0 },{ 7, 0, 2 },{ 0, 7, 6 },{ 0, 0, 0 }}, {{ 0, 0, 0 }, { 7, 0, 2 }, { 0, 7, 6 }, { 0, 0, 0 }},
{{ 15, 8, 2 },{ 0, 0, 0 },{ 0, 0, 0 },{ 8,15, 6 }}, {{ 15, 8, 2 }, { 0, 0, 0 }, { 0, 0, 0 }, { 8, 15, 6 }},
{{ 15, 7, 0 },{ 8, 0, 4 },{ 0, 0, 0 },{ 0, 0, 0 }}, {{ 15, 7, 0 }, { 8, 0, 4 }, { 0, 0, 0 }, { 0, 0, 0 }},
{{ 0, 0, 0 },{ 0, 0, 0 },{ 0, 8, 4 },{ 7,15, 0 }}, {{ 0, 0, 0 }, { 0, 0, 0 }, { 0, 8, 4 }, { 7, 15, 0 }},
}; };
static const uint32 _reachable_tracks[4] = { static const uint32 _reachable_tracks[4] = {
@@ -2712,10 +2712,10 @@ typedef struct {
static const RailtypeSlowdownParams _railtype_slowdown[] = { static const RailtypeSlowdownParams _railtype_slowdown[] = {
// normal accel // normal accel
{256/4, 256/2, 256/4, 2}, // normal {256 / 4, 256 / 2, 256 / 4, 2}, // normal
{256/4, 256/2, 256/4, 2}, // electrified {256 / 4, 256 / 2, 256 / 4, 2}, // electrified
{256/4, 256/2, 256/4, 2}, // monorail {256 / 4, 256 / 2, 256 / 4, 2}, // monorail
{0, 256/2, 256/4, 2}, // maglev {0, 256 / 2, 256 / 4, 2}, // maglev
}; };
/* Modify the speed of the vehicle due to a turn */ /* Modify the speed of the vehicle due to a turn */

2
train_gui.c
View File

@@ -872,7 +872,7 @@ static const Widget _rail_vehicle_refit_widgets[] = {
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 239, 0, 13, STR_983B_REFIT, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 239, 0, 13, STR_983B_REFIT, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 239, 14, 135, 0x0, STR_RAIL_SELECT_TYPE_OF_CARGO_FOR}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 239, 14, 135, 0x0, STR_RAIL_SELECT_TYPE_OF_CARGO_FOR},
{ WWT_IMGBTN, RESIZE_NONE, 14, 0, 239, 136, 157, 0x0, STR_NULL}, { WWT_IMGBTN, RESIZE_NONE, 14, 0, 239, 136, 157, 0x0, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 239, 158, 169, STR_RAIL_REFIT_VEHICLE,STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED}, { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 239, 158, 169, STR_RAIL_REFIT_VEHICLE, STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED},
{ WIDGETS_END}, { WIDGETS_END},
}; };

20
tunnelbridge_cmd.c
View File

@@ -846,9 +846,9 @@ uint GetBridgeHeight(TileIndex t)
} }
static const byte _bridge_foundations[][31] = { static const byte _bridge_foundations[][31] = {
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 _S _W _N _E // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 _S _W _N _E
{ 0,16,18, 3,20, 5, 0, 7,22, 0,10,11,12,13,14, 0, 0, 0, 0, 0, 0, 0, 0,18, 0, 0, 0,16, 0,22,20 }, { 0, 16, 18, 3, 20, 5, 0, 7, 22, 0, 10, 11, 12, 13, 14, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 16, 0, 22, 20 },
{ 0,15,17, 0,19, 5, 6, 7,21, 9,10,11, 0,13,14, 0, 0, 0, 0, 0, 0, 0, 0,17, 0, 0, 0,15, 0,21,19 } { 0, 15, 17, 0, 19, 5, 6, 7, 21, 9, 10, 11, 0, 13, 14, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 15, 0, 21, 19 }
}; };
extern const byte _road_sloped_sprites[14]; extern const byte _road_sloped_sprites[14];
@@ -1218,7 +1218,7 @@ static const StringID _bridge_tile_str[(MAX_BRIDGES + 3) + (MAX_BRIDGES + 3)] =
STR_5027_TUBULAR_RAIL_BRIDGE, STR_5027_TUBULAR_RAIL_BRIDGE,
STR_5027_TUBULAR_RAIL_BRIDGE, STR_5027_TUBULAR_RAIL_BRIDGE,
STR_5027_TUBULAR_RAIL_BRIDGE, STR_5027_TUBULAR_RAIL_BRIDGE,
0,0,0, 0, 0, 0,
STR_5025_WOODEN_ROAD_BRIDGE, STR_5025_WOODEN_ROAD_BRIDGE,
STR_5026_CONCRETE_ROAD_BRIDGE, STR_5026_CONCRETE_ROAD_BRIDGE,
@@ -1233,7 +1233,7 @@ static const StringID _bridge_tile_str[(MAX_BRIDGES + 3) + (MAX_BRIDGES + 3)] =
STR_5028_TUBULAR_ROAD_BRIDGE, STR_5028_TUBULAR_ROAD_BRIDGE,
STR_5028_TUBULAR_ROAD_BRIDGE, STR_5028_TUBULAR_ROAD_BRIDGE,
STR_5028_TUBULAR_ROAD_BRIDGE, STR_5028_TUBULAR_ROAD_BRIDGE,
0,0,0, 0, 0, 0,
}; };
static void GetTileDesc_TunnelBridge(TileIndex tile, TileDesc *td) static void GetTileDesc_TunnelBridge(TileIndex tile, TileDesc *td)
@@ -1330,10 +1330,10 @@ static void ChangeTileOwner_TunnelBridge(TileIndex tile, PlayerID old_player, Pl
} }
static const byte _tunnel_fractcoord_1[4] = {0x8E,0x18,0x81,0xE8}; static const byte _tunnel_fractcoord_1[4] = {0x8E, 0x18, 0x81, 0xE8};
static const byte _tunnel_fractcoord_2[4] = {0x81,0x98,0x87,0x38}; static const byte _tunnel_fractcoord_2[4] = {0x81, 0x98, 0x87, 0x38};
static const byte _tunnel_fractcoord_3[4] = {0x82,0x88,0x86,0x48}; static const byte _tunnel_fractcoord_3[4] = {0x82, 0x88, 0x86, 0x48};
static const byte _exit_tunnel_track[4] = {1,2,1,2}; static const byte _exit_tunnel_track[4] = {1, 2, 1, 2};
static const byte _road_exit_tunnel_state[4] = {8, 9, 0, 1}; static const byte _road_exit_tunnel_state[4] = {8, 9, 0, 1};
static const byte _road_exit_tunnel_frame[4] = {2, 7, 9, 4}; static const byte _road_exit_tunnel_frame[4] = {2, 7, 9, 4};
@@ -1459,7 +1459,7 @@ const TileTypeProcs _tile_type_tunnelbridge_procs = {
ClearTile_TunnelBridge, /* clear_tile_proc */ ClearTile_TunnelBridge, /* clear_tile_proc */
GetAcceptedCargo_TunnelBridge, /* get_accepted_cargo_proc */ GetAcceptedCargo_TunnelBridge, /* get_accepted_cargo_proc */
GetTileDesc_TunnelBridge, /* get_tile_desc_proc */ GetTileDesc_TunnelBridge, /* get_tile_desc_proc */
GetTileTrackStatus_TunnelBridge,/* get_tile_track_status_proc */ GetTileTrackStatus_TunnelBridge, /* get_tile_track_status_proc */
ClickTile_TunnelBridge, /* click_tile_proc */ ClickTile_TunnelBridge, /* click_tile_proc */
AnimateTile_TunnelBridge, /* animate_tile_proc */ AnimateTile_TunnelBridge, /* animate_tile_proc */
TileLoop_TunnelBridge, /* tile_loop_clear */ TileLoop_TunnelBridge, /* tile_loop_clear */

30
variables.h
View File

@@ -82,7 +82,7 @@ VARDEF byte _saved_scrollpos_zoom;
// ********* END OF SAVE REGION // ********* END OF SAVE REGION
typedef struct Patches { typedef struct Patches {
bool modified_catchment; //different-size catchment areas bool modified_catchment; // different-size catchment areas
bool vehicle_speed; // show vehicle speed bool vehicle_speed; // show vehicle speed
bool build_on_slopes; // allow building on slopes bool build_on_slopes; // allow building on slopes
bool mammoth_trains; // allow very long trains bool mammoth_trains; // allow very long trains
@@ -113,11 +113,11 @@ typedef struct Patches {
byte tgen_smoothness; // how rough is the terrain from 0-3 byte tgen_smoothness; // how rough is the terrain from 0-3
uint32 generation_seed; // noise seed for world generation uint32 generation_seed; // noise seed for world generation
byte tree_placer; // the tree placer algorithm byte tree_placer; // the tree placer algorithm
byte heightmap_rotation;// rotation director for the heightmap byte heightmap_rotation; // rotation director for the heightmap
uint16 progress_update_interval;// interval between two updates of the progress in hundreds of milliseconds uint16 progress_update_interval; // interval between two updates of the progress in hundreds of milliseconds
byte se_flat_world_height; // land height a flat world gets in SE byte se_flat_world_height; // land height a flat world gets in SE
bool bribe; // enable bribing the local authority bool bribe; // enable bribing the local authority
bool nonuniform_stations;// allow nonuniform train stations bool nonuniform_stations; // allow nonuniform train stations
bool always_small_airport; // always allow small airports bool always_small_airport; // always allow small airports
bool realistic_acceleration; // realistic acceleration for trains bool realistic_acceleration; // realistic acceleration for trains
bool wagon_speed_limits; // enable wagon speed limits bool wagon_speed_limits; // enable wagon speed limits
@@ -130,15 +130,15 @@ typedef struct Patches {
uint8 toolbar_pos; // position of toolbars, 0=left, 1=center, 2=right uint8 toolbar_pos; // position of toolbars, 0=left, 1=center, 2=right
uint8 window_snap_radius; // Windows snap at each other if closer than this uint8 window_snap_radius; // Windows snap at each other if closer than this
UnitID max_trains; //max trains in game per player (these are 16bit because the unitnumber field can't hold more) UnitID max_trains; // max trains in game per player (these are 16bit because the unitnumber field can't hold more)
UnitID max_roadveh; //max trucks in game per player UnitID max_roadveh; // max trucks in game per player
UnitID max_aircraft; //max planes in game per player UnitID max_aircraft; // max planes in game per player
UnitID max_ships; //max ships in game per player UnitID max_ships; // max ships in game per player
bool servint_ispercent; // service intervals are in percents bool servint_ispercent; // service intervals are in percents
uint16 servint_trains; // service interval for trains uint16 servint_trains; // service interval for trains
uint16 servint_roadveh; // service interval for road vehicles uint16 servint_roadveh; // service interval for road vehicles
uint16 servint_aircraft;// service interval for aircraft uint16 servint_aircraft; // service interval for aircraft
uint16 servint_ships; // service interval for ships uint16 servint_ships; // service interval for ships
bool autorenew; bool autorenew;
@@ -173,8 +173,8 @@ typedef struct Patches {
bool allow_shares; // allow the buying/selling of shares bool allow_shares; // allow the buying/selling of shares
byte dist_local_authority; // distance for town local authority, default 20 byte dist_local_authority; // distance for town local authority, default 20
byte wait_oneway_signal; //waitingtime in days before a oneway signal byte wait_oneway_signal; // waitingtime in days before a oneway signal
byte wait_twoway_signal; //waitingtime in days before a twoway signal byte wait_twoway_signal; // waitingtime in days before a twoway signal
uint8 map_x; // Size of map uint8 map_x; // Size of map
uint8 map_y; uint8 map_y;
@@ -236,9 +236,9 @@ typedef struct Cheats {
Cheat build_in_pause; // build while in pause mode Cheat build_in_pause; // build while in pause mode
Cheat no_jetcrash; // no jet will crash on small airports anymore Cheat no_jetcrash; // no jet will crash on small airports anymore
Cheat switch_climate; Cheat switch_climate;
Cheat change_date; //changes date ingame Cheat change_date; // changes date ingame
Cheat setup_prod; //setup raw-material production in game Cheat setup_prod; // setup raw-material production in game
Cheat elrail; //allow electric engines to be powered on conventional rail Cheat elrail; // allow electric engines to be powered on conventional rail
} Cheats; } Cheats;
VARDEF Cheats _cheats; VARDEF Cheats _cheats;
@@ -284,7 +284,7 @@ VARDEF uint32 _decode_parameters[20];
VARDEF uint32 _pressed_key; // Low 8 bits = ASCII, High 16 bits = keycode VARDEF uint32 _pressed_key; // Low 8 bits = ASCII, High 16 bits = keycode
VARDEF bool _ctrl_pressed; // Is Ctrl pressed? VARDEF bool _ctrl_pressed; // Is Ctrl pressed?
VARDEF bool _shift_pressed; // Is Alt pressed? VARDEF bool _shift_pressed; // Is Alt pressed?
VARDEF byte _dirkeys; // 1=left, 2=up, 4=right, 8=down VARDEF byte _dirkeys; // 1 = left, 2 = up, 4 = right, 8 = down
VARDEF bool _fullscreen; VARDEF bool _fullscreen;
VARDEF bool _fast_forward; VARDEF bool _fast_forward;

480
vehicle.c
View File

@@ -1100,131 +1100,131 @@ typedef struct BubbleMovement {
#define ME(i) { i, 4, 0, 0 } #define ME(i) { i, 4, 0, 0 }
static const BubbleMovement _bubble_float_sw[] = { static const BubbleMovement _bubble_float_sw[] = {
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(1,0,1,1), MK(1, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(1,0,1,2), MK(1, 0, 1, 2),
ME(1) ME(1)
}; };
static const BubbleMovement _bubble_float_ne[] = { static const BubbleMovement _bubble_float_ne[] = {
MK(0,0,1,0), MK( 0, 0, 1, 0),
MK(-1,0,1,1), MK(-1, 0, 1, 1),
MK(0,0,1,0), MK( 0, 0, 1, 0),
MK(-1,0,1,2), MK(-1, 0, 1, 2),
ME(1) ME(1)
}; };
static const BubbleMovement _bubble_float_se[] = { static const BubbleMovement _bubble_float_se[] = {
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,1,1,1), MK(0, 1, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,1,1,2), MK(0, 1, 1, 2),
ME(1) ME(1)
}; };
static const BubbleMovement _bubble_float_nw[] = { static const BubbleMovement _bubble_float_nw[] = {
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,-1,1,1), MK(0, -1, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,-1,1,2), MK(0, -1, 1, 2),
ME(1) ME(1)
}; };
static const BubbleMovement _bubble_burst[] = { static const BubbleMovement _bubble_burst[] = {
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,7), MK(0, 0, 1, 7),
MK(0,0,1,8), MK(0, 0, 1, 8),
MK(0,0,1,9), MK(0, 0, 1, 9),
ME(0) ME(0)
}; };
static const BubbleMovement _bubble_absorb[] = { static const BubbleMovement _bubble_absorb[] = {
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,2), MK(0, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(0,0,1,1), MK(0, 0, 1, 1),
MK(2,1,3,0), MK(2, 1, 3, 0),
MK(1,1,3,1), MK(1, 1, 3, 1),
MK(2,1,3,0), MK(2, 1, 3, 0),
MK(1,1,3,2), MK(1, 1, 3, 2),
MK(2,1,3,0), MK(2, 1, 3, 0),
MK(1,1,3,1), MK(1, 1, 3, 1),
MK(2,1,3,0), MK(2, 1, 3, 0),
MK(1,0,1,2), MK(1, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(1,0,1,1), MK(1, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(1,0,1,2), MK(1, 0, 1, 2),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(1,0,1,1), MK(1, 0, 1, 1),
MK(0,0,1,0), MK(0, 0, 1, 0),
MK(1,0,1,2), MK(1, 0, 1, 2),
ME(2), ME(2),
MK(0,0,0,0xA), MK(0, 0, 0, 0xA),
MK(0,0,0,0xB), MK(0, 0, 0, 0xB),
MK(0,0,0,0xC), MK(0, 0, 0, 0xC),
MK(0,0,0,0xD), MK(0, 0, 0, 0xD),
MK(0,0,0,0xE), MK(0, 0, 0, 0xE),
ME(0) ME(0)
}; };
#undef ME #undef ME
@@ -2138,56 +2138,56 @@ PalSpriteID GetVehiclePalette(const Vehicle *v)
// Save and load of vehicles // Save and load of vehicles
const SaveLoad _common_veh_desc[] = { const SaveLoad _common_veh_desc[] = {
SLE_VAR(Vehicle,subtype, SLE_UINT8), SLE_VAR(Vehicle, subtype, SLE_UINT8),
SLE_REF(Vehicle,next, REF_VEHICLE_OLD), SLE_REF(Vehicle, next, REF_VEHICLE_OLD),
SLE_VAR(Vehicle,string_id, SLE_STRINGID), SLE_VAR(Vehicle, string_id, SLE_STRINGID),
SLE_CONDVAR(Vehicle,unitnumber, SLE_FILE_U8 | SLE_VAR_U16, 0, 7), SLE_CONDVAR(Vehicle, unitnumber, SLE_FILE_U8 | SLE_VAR_U16, 0, 7),
SLE_CONDVAR(Vehicle,unitnumber, SLE_UINT16, 8, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, unitnumber, SLE_UINT16, 8, SL_MAX_VERSION),
SLE_VAR(Vehicle,owner, SLE_UINT8), SLE_VAR(Vehicle, owner, SLE_UINT8),
SLE_CONDVAR(Vehicle,tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Vehicle, tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Vehicle,tile, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, tile, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,dest_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Vehicle, dest_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Vehicle,dest_tile, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, dest_tile, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,x_pos, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Vehicle, x_pos, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Vehicle,x_pos, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, x_pos, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,y_pos, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Vehicle, y_pos, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Vehicle,y_pos, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, y_pos, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_VAR(Vehicle,z_pos, SLE_UINT8), SLE_VAR(Vehicle, z_pos, SLE_UINT8),
SLE_VAR(Vehicle,direction, SLE_UINT8), SLE_VAR(Vehicle, direction, SLE_UINT8),
SLE_VAR(Vehicle,cur_image, SLE_UINT16), SLE_VAR(Vehicle, cur_image, SLE_UINT16),
SLE_VAR(Vehicle,spritenum, SLE_UINT8), SLE_VAR(Vehicle, spritenum, SLE_UINT8),
SLE_VAR(Vehicle,sprite_width, SLE_UINT8), SLE_VAR(Vehicle, sprite_width, SLE_UINT8),
SLE_VAR(Vehicle,sprite_height, SLE_UINT8), SLE_VAR(Vehicle, sprite_height, SLE_UINT8),
SLE_VAR(Vehicle,z_height, SLE_UINT8), SLE_VAR(Vehicle, z_height, SLE_UINT8),
SLE_VAR(Vehicle,x_offs, SLE_INT8), SLE_VAR(Vehicle, x_offs, SLE_INT8),
SLE_VAR(Vehicle,y_offs, SLE_INT8), SLE_VAR(Vehicle, y_offs, SLE_INT8),
SLE_VAR(Vehicle,engine_type, SLE_UINT16), SLE_VAR(Vehicle, engine_type, SLE_UINT16),
SLE_VAR(Vehicle,max_speed, SLE_UINT16), SLE_VAR(Vehicle, max_speed, SLE_UINT16),
SLE_VAR(Vehicle,cur_speed, SLE_UINT16), SLE_VAR(Vehicle, cur_speed, SLE_UINT16),
SLE_VAR(Vehicle,subspeed, SLE_UINT8), SLE_VAR(Vehicle, subspeed, SLE_UINT8),
SLE_VAR(Vehicle,acceleration, SLE_UINT8), SLE_VAR(Vehicle, acceleration, SLE_UINT8),
SLE_VAR(Vehicle,progress, SLE_UINT8), SLE_VAR(Vehicle, progress, SLE_UINT8),
SLE_VAR(Vehicle,vehstatus, SLE_UINT8), SLE_VAR(Vehicle, vehstatus, SLE_UINT8),
SLE_CONDVAR(Vehicle,last_station_visited, SLE_FILE_U8 | SLE_VAR_U16, 0, 4), SLE_CONDVAR(Vehicle, last_station_visited, SLE_FILE_U8 | SLE_VAR_U16, 0, 4),
SLE_CONDVAR(Vehicle,last_station_visited, SLE_UINT16, 5, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, last_station_visited, SLE_UINT16, 5, SL_MAX_VERSION),
SLE_VAR(Vehicle,cargo_type, SLE_UINT8), SLE_VAR(Vehicle, cargo_type, SLE_UINT8),
SLE_VAR(Vehicle,cargo_days, SLE_UINT8), SLE_VAR(Vehicle, cargo_days, SLE_UINT8),
SLE_CONDVAR(Vehicle,cargo_source, SLE_FILE_U8 | SLE_VAR_U16, 0, 6), SLE_CONDVAR(Vehicle, cargo_source, SLE_FILE_U8 | SLE_VAR_U16, 0, 6),
SLE_CONDVAR(Vehicle,cargo_source, SLE_UINT16, 7, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, cargo_source, SLE_UINT16, 7, SL_MAX_VERSION),
SLE_VAR(Vehicle,cargo_cap, SLE_UINT16), SLE_VAR(Vehicle, cargo_cap, SLE_UINT16),
SLE_VAR(Vehicle,cargo_count, SLE_UINT16), SLE_VAR(Vehicle, cargo_count, SLE_UINT16),
SLE_VAR(Vehicle,day_counter, SLE_UINT8), SLE_VAR(Vehicle, day_counter, SLE_UINT8),
SLE_VAR(Vehicle,tick_counter, SLE_UINT8), SLE_VAR(Vehicle, tick_counter, SLE_UINT8),
SLE_VAR(Vehicle,cur_order_index, SLE_UINT8), SLE_VAR(Vehicle, cur_order_index, SLE_UINT8),
SLE_VAR(Vehicle,num_orders, SLE_UINT8), SLE_VAR(Vehicle, num_orders, SLE_UINT8),
/* This next line is for version 4 and prior compatibility.. it temporarily reads /* This next line is for version 4 and prior compatibility.. it temporarily reads
type and flags (which were both 4 bits) into type. Later on this is type and flags (which were both 4 bits) into type. Later on this is
@@ -2200,36 +2200,36 @@ const SaveLoad _common_veh_desc[] = {
SLE_CONDVARX(offsetof(Vehicle, current_order) + offsetof(Order, flags), SLE_UINT8, 5, SL_MAX_VERSION), SLE_CONDVARX(offsetof(Vehicle, current_order) + offsetof(Order, flags), SLE_UINT8, 5, SL_MAX_VERSION),
SLE_CONDVARX(offsetof(Vehicle, current_order) + offsetof(Order, station), SLE_UINT16, 5, SL_MAX_VERSION), SLE_CONDVARX(offsetof(Vehicle, current_order) + offsetof(Order, station), SLE_UINT16, 5, SL_MAX_VERSION),
SLE_REF(Vehicle,orders, REF_ORDER), SLE_REF(Vehicle, orders, REF_ORDER),
SLE_CONDVAR(Vehicle,age, SLE_FILE_U16 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Vehicle, age, SLE_FILE_U16 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Vehicle,age, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, age, SLE_INT32, 31, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,max_age, SLE_FILE_U16 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Vehicle, max_age, SLE_FILE_U16 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Vehicle,max_age, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, max_age, SLE_INT32, 31, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,date_of_last_service, SLE_FILE_U16 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Vehicle, date_of_last_service, SLE_FILE_U16 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Vehicle,date_of_last_service, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, date_of_last_service, SLE_INT32, 31, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,service_interval, SLE_FILE_U16 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Vehicle, service_interval, SLE_FILE_U16 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Vehicle,service_interval, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, service_interval, SLE_INT32, 31, SL_MAX_VERSION),
SLE_VAR(Vehicle,reliability, SLE_UINT16), SLE_VAR(Vehicle, reliability, SLE_UINT16),
SLE_VAR(Vehicle,reliability_spd_dec,SLE_UINT16), SLE_VAR(Vehicle, reliability_spd_dec, SLE_UINT16),
SLE_VAR(Vehicle,breakdown_ctr, SLE_UINT8), SLE_VAR(Vehicle, breakdown_ctr, SLE_UINT8),
SLE_VAR(Vehicle,breakdown_delay, SLE_UINT8), SLE_VAR(Vehicle, breakdown_delay, SLE_UINT8),
SLE_VAR(Vehicle,breakdowns_since_last_service, SLE_UINT8), SLE_VAR(Vehicle, breakdowns_since_last_service, SLE_UINT8),
SLE_VAR(Vehicle,breakdown_chance, SLE_UINT8), SLE_VAR(Vehicle, breakdown_chance, SLE_UINT8),
SLE_CONDVAR(Vehicle,build_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Vehicle, build_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Vehicle,build_year, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, build_year, SLE_INT32, 31, SL_MAX_VERSION),
SLE_VAR(Vehicle,load_unload_time_rem, SLE_UINT16), SLE_VAR(Vehicle, load_unload_time_rem, SLE_UINT16),
SLE_VAR(Vehicle,profit_this_year, SLE_INT32), SLE_VAR(Vehicle, profit_this_year, SLE_INT32),
SLE_VAR(Vehicle,profit_last_year, SLE_INT32), SLE_VAR(Vehicle, profit_last_year, SLE_INT32),
SLE_VAR(Vehicle,value, SLE_UINT32), SLE_VAR(Vehicle, value, SLE_UINT32),
SLE_VAR(Vehicle,random_bits, SLE_UINT8), SLE_VAR(Vehicle, random_bits, SLE_UINT8),
SLE_VAR(Vehicle,waiting_triggers, SLE_UINT8), SLE_VAR(Vehicle, waiting_triggers, SLE_UINT8),
SLE_REF(Vehicle,next_shared, REF_VEHICLE), SLE_REF(Vehicle, next_shared, REF_VEHICLE),
SLE_REF(Vehicle,prev_shared, REF_VEHICLE), SLE_REF(Vehicle, prev_shared, REF_VEHICLE),
// reserve extra space in savegame here. (currently 10 bytes) // reserve extra space in savegame here. (currently 10 bytes)
SLE_CONDNULL(10, 2, SL_MAX_VERSION), SLE_CONDNULL(10, 2, SL_MAX_VERSION),
@@ -2239,15 +2239,15 @@ const SaveLoad _common_veh_desc[] = {
static const SaveLoad _train_desc[] = { static const SaveLoad _train_desc[] = {
SLE_WRITEBYTE(Vehicle,type,VEH_Train, 0), // Train type. VEH_Train in mem, 0 in file. SLE_WRITEBYTE(Vehicle, type, VEH_Train, 0), // Train type. VEH_Train in mem, 0 in file.
SLE_INCLUDEX(0, INC_VEHICLE_COMMON), SLE_INCLUDEX(0, INC_VEHICLE_COMMON),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRail,crash_anim_pos), SLE_UINT16), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRail, crash_anim_pos), SLE_UINT16),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRail,force_proceed), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRail, force_proceed), SLE_UINT8),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRail,railtype), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRail, railtype), SLE_UINT8),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRail,track), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRail, track), SLE_UINT8),
SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleRail,flags), SLE_UINT8, 2, SL_MAX_VERSION), SLE_CONDVARX(offsetof(Vehicle, u) + offsetof(VehicleRail, flags), SLE_UINT8, 2, SL_MAX_VERSION),
SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleRail,days_since_order_progr), SLE_UINT16, 2, SL_MAX_VERSION), SLE_CONDVARX(offsetof(Vehicle, u) + offsetof(VehicleRail, days_since_order_progr), SLE_UINT16, 2, SL_MAX_VERSION),
SLE_CONDNULL(2, 2, 19), SLE_CONDNULL(2, 2, 19),
// reserve extra space in savegame here. (currently 11 bytes) // reserve extra space in savegame here. (currently 11 bytes)
@@ -2257,19 +2257,19 @@ static const SaveLoad _train_desc[] = {
}; };
static const SaveLoad _roadveh_desc[] = { static const SaveLoad _roadveh_desc[] = {
SLE_WRITEBYTE(Vehicle,type,VEH_Road, 1), // Road type. VEH_Road in mem, 1 in file. SLE_WRITEBYTE(Vehicle, type, VEH_Road, 1), // Road type. VEH_Road in mem, 1 in file.
SLE_INCLUDEX(0, INC_VEHICLE_COMMON), SLE_INCLUDEX(0, INC_VEHICLE_COMMON),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,state), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRoad, state), SLE_UINT8),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,frame), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRoad, frame), SLE_UINT8),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,blocked_ctr), SLE_UINT16), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRoad, blocked_ctr), SLE_UINT16),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,overtaking), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRoad, overtaking), SLE_UINT8),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,overtaking_ctr),SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRoad, overtaking_ctr), SLE_UINT8),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,crashed_ctr), SLE_UINT16), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRoad, crashed_ctr), SLE_UINT16),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,reverse_ctr), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleRoad, reverse_ctr), SLE_UINT8),
SLE_CONDREFX(offsetof(Vehicle,u)+offsetof(VehicleRoad,slot), REF_ROADSTOPS, 6, SL_MAX_VERSION), SLE_CONDREFX(offsetof(Vehicle, u) + offsetof(VehicleRoad, slot), REF_ROADSTOPS, 6, SL_MAX_VERSION),
SLE_CONDNULL(1, 6, SL_MAX_VERSION), SLE_CONDNULL(1, 6, SL_MAX_VERSION),
SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,slot_age), SLE_UINT8, 6, SL_MAX_VERSION), SLE_CONDVARX(offsetof(Vehicle, u) + offsetof(VehicleRoad, slot_age), SLE_UINT8, 6, SL_MAX_VERSION),
// reserve extra space in savegame here. (currently 16 bytes) // reserve extra space in savegame here. (currently 16 bytes)
SLE_CONDNULL(16, 2, SL_MAX_VERSION), SLE_CONDNULL(16, 2, SL_MAX_VERSION),
@@ -2277,9 +2277,9 @@ static const SaveLoad _roadveh_desc[] = {
}; };
static const SaveLoad _ship_desc[] = { static const SaveLoad _ship_desc[] = {
SLE_WRITEBYTE(Vehicle,type,VEH_Ship, 2), // Ship type. VEH_Ship in mem, 2 in file. SLE_WRITEBYTE(Vehicle, type, VEH_Ship, 2), // Ship type. VEH_Ship in mem, 2 in file.
SLE_INCLUDEX(0, INC_VEHICLE_COMMON), SLE_INCLUDEX(0, INC_VEHICLE_COMMON),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleShip,state), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleShip, state), SLE_UINT8),
// reserve extra space in savegame here. (currently 16 bytes) // reserve extra space in savegame here. (currently 16 bytes)
SLE_CONDNULL(16, 2, SL_MAX_VERSION), SLE_CONDNULL(16, 2, SL_MAX_VERSION),
@@ -2288,17 +2288,17 @@ static const SaveLoad _ship_desc[] = {
}; };
static const SaveLoad _aircraft_desc[] = { static const SaveLoad _aircraft_desc[] = {
SLE_WRITEBYTE(Vehicle,type,VEH_Aircraft, 3), // Aircraft type. VEH_Aircraft in mem, 3 in file. SLE_WRITEBYTE(Vehicle, type, VEH_Aircraft, 3), // Aircraft type. VEH_Aircraft in mem, 3 in file.
SLE_INCLUDEX(0, INC_VEHICLE_COMMON), SLE_INCLUDEX(0, INC_VEHICLE_COMMON),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleAir,crashed_counter), SLE_UINT16), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleAir, crashed_counter), SLE_UINT16),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleAir,pos), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleAir, pos), SLE_UINT8),
SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleAir,targetairport), SLE_FILE_U8 | SLE_VAR_U16, 0, 4), SLE_CONDVARX(offsetof(Vehicle, u) + offsetof(VehicleAir, targetairport), SLE_FILE_U8 | SLE_VAR_U16, 0, 4),
SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleAir,targetairport), SLE_UINT16, 5, SL_MAX_VERSION), SLE_CONDVARX(offsetof(Vehicle, u) + offsetof(VehicleAir, targetairport), SLE_UINT16, 5, SL_MAX_VERSION),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleAir,state), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleAir, state), SLE_UINT8),
SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleAir,previous_pos), SLE_UINT8, 2, SL_MAX_VERSION), SLE_CONDVARX(offsetof(Vehicle, u) + offsetof(VehicleAir, previous_pos), SLE_UINT8, 2, SL_MAX_VERSION),
// reserve extra space in savegame here. (currently 15 bytes) // reserve extra space in savegame here. (currently 15 bytes)
SLE_CONDNULL(15, 2, SL_MAX_VERSION), SLE_CONDNULL(15, 2, SL_MAX_VERSION),
@@ -2309,28 +2309,28 @@ static const SaveLoad _aircraft_desc[] = {
static const SaveLoad _special_desc[] = { static const SaveLoad _special_desc[] = {
SLE_WRITEBYTE(Vehicle,type,VEH_Special, 4), SLE_WRITEBYTE(Vehicle,type,VEH_Special, 4),
SLE_VAR(Vehicle,subtype, SLE_UINT8), SLE_VAR(Vehicle, subtype, SLE_UINT8),
SLE_CONDVAR(Vehicle,tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Vehicle, tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Vehicle,tile, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, tile, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,x_pos, SLE_FILE_I16 | SLE_VAR_I32, 0, 5), SLE_CONDVAR(Vehicle, x_pos, SLE_FILE_I16 | SLE_VAR_I32, 0, 5),
SLE_CONDVAR(Vehicle,x_pos, SLE_INT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, x_pos, SLE_INT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,y_pos, SLE_FILE_I16 | SLE_VAR_I32, 0, 5), SLE_CONDVAR(Vehicle, y_pos, SLE_FILE_I16 | SLE_VAR_I32, 0, 5),
SLE_CONDVAR(Vehicle,y_pos, SLE_INT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, y_pos, SLE_INT32, 6, SL_MAX_VERSION),
SLE_VAR(Vehicle,z_pos, SLE_UINT8), SLE_VAR(Vehicle, z_pos, SLE_UINT8),
SLE_VAR(Vehicle,cur_image, SLE_UINT16), SLE_VAR(Vehicle, cur_image, SLE_UINT16),
SLE_VAR(Vehicle,sprite_width, SLE_UINT8), SLE_VAR(Vehicle, sprite_width, SLE_UINT8),
SLE_VAR(Vehicle,sprite_height, SLE_UINT8), SLE_VAR(Vehicle, sprite_height, SLE_UINT8),
SLE_VAR(Vehicle,z_height, SLE_UINT8), SLE_VAR(Vehicle, z_height, SLE_UINT8),
SLE_VAR(Vehicle,x_offs, SLE_INT8), SLE_VAR(Vehicle, x_offs, SLE_INT8),
SLE_VAR(Vehicle,y_offs, SLE_INT8), SLE_VAR(Vehicle, y_offs, SLE_INT8),
SLE_VAR(Vehicle,progress, SLE_UINT8), SLE_VAR(Vehicle, progress, SLE_UINT8),
SLE_VAR(Vehicle,vehstatus, SLE_UINT8), SLE_VAR(Vehicle, vehstatus, SLE_UINT8),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleSpecial,unk0), SLE_UINT16), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleSpecial, unk0), SLE_UINT16),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleSpecial,unk2), SLE_UINT8), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleSpecial, unk2), SLE_UINT8),
// reserve extra space in savegame here. (currently 16 bytes) // reserve extra space in savegame here. (currently 16 bytes)
SLE_CONDNULL(16, 2, SL_MAX_VERSION), SLE_CONDNULL(16, 2, SL_MAX_VERSION),
@@ -2339,40 +2339,40 @@ static const SaveLoad _special_desc[] = {
}; };
static const SaveLoad _disaster_desc[] = { static const SaveLoad _disaster_desc[] = {
SLE_WRITEBYTE(Vehicle,type,VEH_Disaster, 5), SLE_WRITEBYTE(Vehicle, type, VEH_Disaster, 5),
SLE_REF(Vehicle,next, REF_VEHICLE_OLD), SLE_REF(Vehicle, next, REF_VEHICLE_OLD),
SLE_VAR(Vehicle,subtype, SLE_UINT8), SLE_VAR(Vehicle, subtype, SLE_UINT8),
SLE_CONDVAR(Vehicle,tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Vehicle, tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Vehicle,tile, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, tile, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,dest_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLE_CONDVAR(Vehicle, dest_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
SLE_CONDVAR(Vehicle,dest_tile, SLE_UINT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, dest_tile, SLE_UINT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,x_pos, SLE_FILE_I16 | SLE_VAR_I32, 0, 5), SLE_CONDVAR(Vehicle, x_pos, SLE_FILE_I16 | SLE_VAR_I32, 0, 5),
SLE_CONDVAR(Vehicle,x_pos, SLE_INT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, x_pos, SLE_INT32, 6, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle,y_pos, SLE_FILE_I16 | SLE_VAR_I32, 0, 5), SLE_CONDVAR(Vehicle, y_pos, SLE_FILE_I16 | SLE_VAR_I32, 0, 5),
SLE_CONDVAR(Vehicle,y_pos, SLE_INT32, 6, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, y_pos, SLE_INT32, 6, SL_MAX_VERSION),
SLE_VAR(Vehicle,z_pos, SLE_UINT8), SLE_VAR(Vehicle, z_pos, SLE_UINT8),
SLE_VAR(Vehicle,direction, SLE_UINT8), SLE_VAR(Vehicle, direction, SLE_UINT8),
SLE_VAR(Vehicle,x_offs, SLE_INT8), SLE_VAR(Vehicle, x_offs, SLE_INT8),
SLE_VAR(Vehicle,y_offs, SLE_INT8), SLE_VAR(Vehicle, y_offs, SLE_INT8),
SLE_VAR(Vehicle,sprite_width, SLE_UINT8), SLE_VAR(Vehicle, sprite_width, SLE_UINT8),
SLE_VAR(Vehicle,sprite_height, SLE_UINT8), SLE_VAR(Vehicle, sprite_height, SLE_UINT8),
SLE_VAR(Vehicle,z_height, SLE_UINT8), SLE_VAR(Vehicle, z_height, SLE_UINT8),
SLE_VAR(Vehicle,owner, SLE_UINT8), SLE_VAR(Vehicle, owner, SLE_UINT8),
SLE_VAR(Vehicle,vehstatus, SLE_UINT8), SLE_VAR(Vehicle, vehstatus, SLE_UINT8),
SLE_CONDVARX(offsetof(Vehicle, current_order) + offsetof(Order, station), SLE_FILE_U8 | SLE_VAR_U16, 0, 4), SLE_CONDVARX(offsetof(Vehicle, current_order) + offsetof(Order, station), SLE_FILE_U8 | SLE_VAR_U16, 0, 4),
SLE_CONDVARX(offsetof(Vehicle, current_order) + offsetof(Order, station), SLE_UINT16, 5, SL_MAX_VERSION), SLE_CONDVARX(offsetof(Vehicle, current_order) + offsetof(Order, station), SLE_UINT16, 5, SL_MAX_VERSION),
SLE_VAR(Vehicle,cur_image, SLE_UINT16), SLE_VAR(Vehicle, cur_image, SLE_UINT16),
SLE_CONDVAR(Vehicle,age, SLE_FILE_U16 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Vehicle, age, SLE_FILE_U16 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Vehicle,age, SLE_INT32, 31, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, age, SLE_INT32, 31, SL_MAX_VERSION),
SLE_VAR(Vehicle,tick_counter, SLE_UINT8), SLE_VAR(Vehicle, tick_counter, SLE_UINT8),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleDisaster,image_override), SLE_UINT16), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleDisaster, image_override), SLE_UINT16),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleDisaster,unk2), SLE_UINT16), SLE_VARX(offsetof(Vehicle, u) + offsetof(VehicleDisaster, unk2), SLE_UINT16),
// reserve extra space in savegame here. (currently 16 bytes) // reserve extra space in savegame here. (currently 16 bytes)
SLE_CONDNULL(16, 2, SL_MAX_VERSION), SLE_CONDNULL(16, 2, SL_MAX_VERSION),

20
vehicle.h
View File

@@ -8,7 +8,7 @@
#include "rail.h" #include "rail.h"
enum { enum {
VEH_Invalid = 0, VEH_Invalid = 0x00,
VEH_Train = 0x10, VEH_Train = 0x10,
VEH_Road = 0x11, VEH_Road = 0x11,
VEH_Ship = 0x12, VEH_Ship = 0x12,
@@ -18,10 +18,10 @@ enum {
} ; } ;
enum VehStatus { enum VehStatus {
VS_HIDDEN = 1, VS_HIDDEN = 0x01,
VS_STOPPED = 2, VS_STOPPED = 0x02,
VS_UNCLICKABLE = 4, VS_UNCLICKABLE = 0x04,
VS_DEFPAL = 0x8, VS_DEFPAL = 0x08,
VS_TRAIN_SLOWING = 0x10, VS_TRAIN_SLOWING = 0x10,
VS_SHADOW = 0x20, VS_SHADOW = 0x20,
VS_AIRCRAFT_BROKEN = 0x40, VS_AIRCRAFT_BROKEN = 0x40,
@@ -156,8 +156,8 @@ struct Vehicle {
// 0xfd == custom sprite, 0xfe == custom second head sprite // 0xfd == custom sprite, 0xfe == custom second head sprite
// 0xff == reserved for another custom sprite // 0xff == reserved for another custom sprite
uint16 cur_image; // sprite number for this vehicle uint16 cur_image; // sprite number for this vehicle
byte sprite_width;// width of vehicle sprite byte sprite_width; // width of vehicle sprite
byte sprite_height;// height of vehicle sprite byte sprite_height; // height of vehicle sprite
byte z_height; // z-height of vehicle sprite byte z_height; // z-height of vehicle sprite
int8 x_offs; // x offset for vehicle sprite int8 x_offs; // x offset for vehicle sprite
int8 y_offs; // y offset for vehicle sprite int8 y_offs; // y offset for vehicle sprite
@@ -180,13 +180,13 @@ struct Vehicle {
CargoID cargo_type; // type of cargo this vehicle is carrying CargoID cargo_type; // type of cargo this vehicle is carrying
byte cargo_days; // how many days have the pieces been in transit byte cargo_days; // how many days have the pieces been in transit
StationID cargo_source;// source of cargo StationID cargo_source; // source of cargo
uint16 cargo_cap; // total capacity uint16 cargo_cap; // total capacity
uint16 cargo_count;// how many pieces are used uint16 cargo_count; // how many pieces are used
byte cargo_subtype; ///< Used for livery refits (NewGRF variations) byte cargo_subtype; ///< Used for livery refits (NewGRF variations)
byte day_counter; // increased by one for each day byte day_counter; // increased by one for each day
byte tick_counter;// increased by one for each tick byte tick_counter; // increased by one for each tick
/* Begin Order-stuff */ /* Begin Order-stuff */
Order current_order; ///< The current order (+ status, like: loading) Order current_order; ///< The current order (+ status, like: loading)

2
viewport.h
View File

@@ -72,7 +72,7 @@ void VpSelectTilesWithMethod(int x, int y, int method);
// highlighting draw styles // highlighting draw styles
enum { enum {
HT_NONE = 0, HT_NONE = 0x00,
HT_RECT = 0x80, HT_RECT = 0x80,
HT_POINT = 0x40, HT_POINT = 0x40,
HT_LINE = 0x20, /* used for autorail highlighting (longer streches) HT_LINE = 0x20, /* used for autorail highlighting (longer streches)

2
water_cmd.c
View File

@@ -750,7 +750,7 @@ const TileTypeProcs _tile_type_water_procs = {
ClearTile_Water, /* clear_tile_proc */ ClearTile_Water, /* clear_tile_proc */
GetAcceptedCargo_Water, /* get_accepted_cargo_proc */ GetAcceptedCargo_Water, /* get_accepted_cargo_proc */
GetTileDesc_Water, /* get_tile_desc_proc */ GetTileDesc_Water, /* get_tile_desc_proc */
GetTileTrackStatus_Water,/* get_tile_track_status_proc */ GetTileTrackStatus_Water, /* get_tile_track_status_proc */
ClickTile_Water, /* click_tile_proc */ ClickTile_Water, /* click_tile_proc */
AnimateTile_Water, /* animate_tile_proc */ AnimateTile_Water, /* animate_tile_proc */
TileLoop_Water, /* tile_loop_clear */ TileLoop_Water, /* tile_loop_clear */

8
window.h
View File

@@ -156,7 +156,7 @@ enum WindowKeyCodes {
// Special ones // Special ones
WKC_NONE = 0, WKC_NONE = 0,
WKC_ESC=1, WKC_ESC = 1,
WKC_BACKSPACE = 2, WKC_BACKSPACE = 2,
WKC_INSERT = 3, WKC_INSERT = 3,
WKC_DELETE = 4, WKC_DELETE = 4,
@@ -236,9 +236,9 @@ enum {
WDF_DEF_WIDGET = 2, /* default widget control for some widgets in the on click event */ WDF_DEF_WIDGET = 2, /* default widget control for some widgets in the on click event */
WDF_STD_BTN = 4, /* default handling for close and drag widgets (widget no 0 and 1) */ WDF_STD_BTN = 4, /* default handling for close and drag widgets (widget no 0 and 1) */
WDF_UNCLICK_BUTTONS=16, /* Unclick buttons when the window event times out */ WDF_UNCLICK_BUTTONS = 16, /* Unclick buttons when the window event times out */
WDF_STICKY_BUTTON =32, /* Set window to sticky mode; they are not closed unless closed with 'X' (widget 2) */ WDF_STICKY_BUTTON = 32, /* Set window to sticky mode; they are not closed unless closed with 'X' (widget 2) */
WDF_RESIZABLE =64, /* A window can be resized */ WDF_RESIZABLE = 64, /* A window can be resized */
}; };
/* can be used as x or y coordinates to cause a specific placement */ /* can be used as x or y coordinates to cause a specific placement */