diff options
| -rw-r--r-- | industry.h | 2 | ||||
| -rw-r--r-- | town.h | 3 | ||||
| -rw-r--r-- | town_gui.c | 2 | ||||
| -rw-r--r-- | waypoint.c | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/industry.h b/industry.h index d2e67304c..338d9c85b 100644 --- a/industry.h +++ b/industry.h @@ -23,7 +23,7 @@ struct Industry { uint16 counter; byte type; - byte owner; + Owner owner; byte color_map; byte last_prod_year; byte was_cargo_delivered; @@ -26,9 +26,6 @@ struct Town { // Which players have a statue? byte statues; - // Sort index in listings - byte sort_index_obsolete; - // Player ratings as well as a mask that determines which players have a rating. byte have_ratings; uint8 unwanted[MAX_PLAYERS]; // how many months companies aren't wanted by towns (bribe) diff --git a/town_gui.c b/town_gui.c index 587f80449..124be37dc 100644 --- a/town_gui.c +++ b/town_gui.c @@ -334,7 +334,7 @@ static const WindowDesc _town_view_scen_desc = { TownViewWndProc }; -void ShowTownViewWindow(uint town) +void ShowTownViewWindow(TownID town) { Window *w; diff --git a/waypoint.c b/waypoint.c index 7d2087a35..c58556880 100644 --- a/waypoint.c +++ b/waypoint.c @@ -237,7 +237,7 @@ int32 CmdBuildTrainWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2) wp->xy = tile; wp->build_date = _date; - if (wp->town_index == STR_NULL) + if (wp->town_index == 0) MakeDefaultWaypointName(wp); UpdateWaypointSign(wp); |