Index: src/settings_gui.cpp
===================================================================
--- src/settings_gui.cpp	(Revision 11548)
+++ src/settings_gui.cpp	(Arbeitskopie)
@@ -826,9 +826,11 @@
 			bool disabled = false;
 
 			// We do not allow changes of some items when we are a client in a networkgame
-			if (!(sd->save.conv & SLF_NETWORK_NO) && _networking && !_network_server) editable = false;
-			if ((sdb->flags & SGF_NETWORK_ONLY) && !_networking) editable = false;
-			if ((sdb->flags & SGF_NO_NETWORK) && _networking) editable = false;
+			if (_game_mode != GM_EDITOR) {
+				if (!(sd->save.conv & SLF_NETWORK_NO) && _networking && !_network_server) editable = false;
+				if ((sdb->flags & SGF_NETWORK_ONLY) && !_networking) editable = false;
+				if ((sdb->flags & SGF_NO_NETWORK) && _networking) editable = false;
+			}
 
 			if (sdb->cmd == SDT_BOOLX) {
 				static const int _bool_ctabs[2][2] = {{9, 4}, {7, 6}};
Index: src/players.cpp
===================================================================
--- src/players.cpp	(Revision 11548)
+++ src/players.cpp	(Arbeitskopie)
@@ -1104,9 +1104,6 @@
 		}
 		fclose(fp);
 	}
-
-	/* Initialize end of game variable (when to show highscore chart) */
-	_patches.ending_year = 2051;
 }
 
 /* Save/load of players */
Index: src/genworld.cpp
===================================================================
--- src/genworld.cpp	(Revision 11548)
+++ src/genworld.cpp	(Arbeitskopie)
@@ -260,6 +260,9 @@
 	/* Set the date before loading sprites as some newgrfs check it */
 	SetDate(ConvertYMDToDate(_patches.starting_year, 0, 1));
 
+	/* The player has got 101 years to get enough points for the highscore */
+	_patches.ending_year = _patches.starting_year + 101;
+
 	/* Load the right landscape stuff */
 	GfxLoadSprites();
 	LoadStringWidthTable();