--- a/src/road.cpp	Tue Sep 30 17:50:21 2008 +0000
+++ b/src/road.cpp	Tue Sep 30 20:39:50 2008 +0000
@@ -77,25 +77,25 @@
 	return org_rb;
 }
 
-bool HasRoadTypesAvail(const PlayerID p, const RoadTypes rts)
+bool HasRoadTypesAvail(const CompanyID company, const RoadTypes rts)
 {
 	RoadTypes avail_roadtypes;
 
-	if (p == OWNER_TOWN || _game_mode == GM_EDITOR || IsGeneratingWorld()) {
+	if (company == OWNER_TOWN || _game_mode == GM_EDITOR || IsGeneratingWorld()) {
 		avail_roadtypes = ROADTYPES_ROAD;
 	} else {
-		if (!IsValidPlayerID(p)) return false;
-		avail_roadtypes = (RoadTypes)GetPlayer(p)->avail_roadtypes | ROADTYPES_ROAD; // road is available for always for everybody
+		if (!IsValidCompanyID(company)) return false;
+		avail_roadtypes = (RoadTypes)GetCompany(company)->avail_roadtypes | ROADTYPES_ROAD; // road is available for always for everybody
 	}
 	return (rts & ~avail_roadtypes) == 0;
 }
 
 bool ValParamRoadType(const RoadType rt)
 {
-	return HasRoadTypesAvail(_current_player, RoadTypeToRoadTypes(rt));
+	return HasRoadTypesAvail(_current_company, RoadTypeToRoadTypes(rt));
 }
 
-RoadTypes GetPlayerRoadtypes(PlayerID p)
+RoadTypes GetCompanyRoadtypes(CompanyID company)
 {
 	RoadTypes rt = ROADTYPES_NONE;
 
@@ -104,7 +104,7 @@
 		const EngineInfo *ei = &e->info;
 
 		if (HasBit(ei->climates, _settings_game.game_creation.landscape) &&
-				(HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) {
+				(HasBit(e->company_avail, company) || _date >= e->intro_date + 365)) {
 			SetBit(rt, HasBit(ei->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD);
 		}
 	}