summaryrefslogtreecommitdiff
path: root/src/road.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/road.cpp')
-rw-r--r--src/road.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/road.cpp b/src/road.cpp
index 26b3d75f8..9650ed91c 100644
--- a/src/road.cpp
+++ b/src/road.cpp
@@ -84,8 +84,9 @@ bool HasRoadTypesAvail(const CompanyID company, const RoadTypes rts)
if (company == OWNER_TOWN || _game_mode == GM_EDITOR || IsGeneratingWorld()) {
avail_roadtypes = ROADTYPES_ROAD;
} else {
- if (!Company::IsValidID(company)) return false;
- avail_roadtypes = (RoadTypes)Company::Get(company)->avail_roadtypes | ROADTYPES_ROAD; // road is available for always for everybody
+ Company *c = Company::GetIfValid(company);
+ if (c == NULL) return false;
+ avail_roadtypes = (RoadTypes)c->avail_roadtypes | ROADTYPES_ROAD; // road is available for always for everybody
}
return (rts & ~avail_roadtypes) == 0;
}