diff -r 0050610c0368 -r c291a21b304e src/rail_gui.cpp
--- a/src/rail_gui.cpp	Tue Sep 30 17:50:21 2008 +0000
+++ b/src/rail_gui.cpp	Tue Sep 30 20:39:50 2008 +0000
@@ -843,7 +843,7 @@
 {
 	BuildRailToolbarWindow *w;
 
-	if (!IsValidPlayerID(_current_player)) return;
+	if (!IsValidCompanyID(_current_company)) return;
 	if (!ValParamRailtype(railtype)) return;
 
 	// don't recreate the window if we're clicking on a button and the window exists.
@@ -1718,7 +1718,7 @@
 /** Set the initial (default) railtype to use */
 static void SetDefaultRailGui()
 {
-	if (_local_player == PLAYER_SPECTATOR || !IsValidPlayerID(_local_player)) return;
+	if (_local_company == COMPANY_SPECTATOR || !IsValidCompanyID(_local_company)) return;
 
 	extern RailType _last_built_railtype;
 	RailType rt = (RailType)_settings_client.gui.default_rail_type;
@@ -1745,11 +1745,11 @@
 		switch (rt) {
 			case RAILTYPE_END + 0:
 				rt = RAILTYPE_RAIL;
-				while (rt < RAILTYPE_END && !HasRailtypeAvail(_local_player, rt)) rt++;
+				while (rt < RAILTYPE_END && !HasRailtypeAvail(_local_company, rt)) rt++;
 				break;
 
 			case RAILTYPE_END + 1:
-				rt = GetBestRailtype(_local_player);
+				rt = GetBestRailtype(_local_company);
 				break;
 
 			default: