Merge branch 'master' into jgrpp

# Conflicts: # src/fios.h
2017-01-17 19:11:09 +00:00
parent 1ff60c44bf 2335acdc16
commit 90cd312428
94 changed files with 546 additions and 503 deletions
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1179,7 +1179,7 @@ struct NetworkStartServerWindow : public Window {
 			}

 			case WID_NSS_GENERATE_GAME: // Start game
-				if (CountSelectedGRFs (_grfconfig_newgame) >= MAX_FILE_SLOTS_IN_NETWORK) {
+				if ((uint) CountSelectedGRFs (_grfconfig_newgame) > NETWORK_MAX_GRF_COUNT) {
 					ShowErrorMessage(STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED, INVALID_STRING_ID, WL_ERROR);
 					break;
 				}