mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r4133) - Some miscellaneous changes (unconverted TownID in function definition, Owner instead of byte, remove obsolete member and compare waypoint index with 0 not STR_NULL)
This commit is contained in:
parent
d7b34a1d4c
commit
17bdb11feb
|
@ -23,7 +23,7 @@ struct Industry {
|
||||||
uint16 counter;
|
uint16 counter;
|
||||||
|
|
||||||
byte type;
|
byte type;
|
||||||
byte owner;
|
Owner owner;
|
||||||
byte color_map;
|
byte color_map;
|
||||||
byte last_prod_year;
|
byte last_prod_year;
|
||||||
byte was_cargo_delivered;
|
byte was_cargo_delivered;
|
||||||
|
|
3
town.h
3
town.h
|
@ -26,9 +26,6 @@ struct Town {
|
||||||
// Which players have a statue?
|
// Which players have a statue?
|
||||||
byte statues;
|
byte statues;
|
||||||
|
|
||||||
// Sort index in listings
|
|
||||||
byte sort_index_obsolete;
|
|
||||||
|
|
||||||
// Player ratings as well as a mask that determines which players have a rating.
|
// Player ratings as well as a mask that determines which players have a rating.
|
||||||
byte have_ratings;
|
byte have_ratings;
|
||||||
uint8 unwanted[MAX_PLAYERS]; // how many months companies aren't wanted by towns (bribe)
|
uint8 unwanted[MAX_PLAYERS]; // how many months companies aren't wanted by towns (bribe)
|
||||||
|
|
|
@ -334,7 +334,7 @@ static const WindowDesc _town_view_scen_desc = {
|
||||||
TownViewWndProc
|
TownViewWndProc
|
||||||
};
|
};
|
||||||
|
|
||||||
void ShowTownViewWindow(uint town)
|
void ShowTownViewWindow(TownID town)
|
||||||
{
|
{
|
||||||
Window *w;
|
Window *w;
|
||||||
|
|
||||||
|
|
|
@ -237,7 +237,7 @@ int32 CmdBuildTrainWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2)
|
||||||
wp->xy = tile;
|
wp->xy = tile;
|
||||||
wp->build_date = _date;
|
wp->build_date = _date;
|
||||||
|
|
||||||
if (wp->town_index == STR_NULL)
|
if (wp->town_index == 0)
|
||||||
MakeDefaultWaypointName(wp);
|
MakeDefaultWaypointName(wp);
|
||||||
|
|
||||||
UpdateWaypointSign(wp);
|
UpdateWaypointSign(wp);
|
||||||
|
|
Loading…
Reference in New Issue