Author: jtn Date: Wed Nov 25 01:56:07 2015 New Revision: 30755 URL: http://svn.gna.org/viewcvs/freeciv?rev=30755&view=rev Log: Mention 'nationset' option when issuing an error message about lack of nations in a ruleset with multiple nationsets.
Reported by akfaew@gna. See gna bug #24116. Modified: branches/S2_5/server/settings.c branches/S2_5/server/stdinhand.c Modified: branches/S2_5/server/settings.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/settings.c?rev=30755&r1=30754&r2=30755&view=diff ============================================================================== --- branches/S2_5/server/settings.c (original) +++ branches/S2_5/server/settings.c Wed Nov 25 01:56:07 2015 @@ -540,7 +540,8 @@ * (However, new connections will start out detached.) */ if (normal_player_count() > server.playable_nations) { notify_conn(NULL, NULL, E_SETTING, ftc_server, "%s", - _("Warning: not enough nations for all current players.")); + _("Warning: not enough nations in this nationset " + "for all current players.")); } send_nation_availability(game.est_connections, TRUE); Modified: branches/S2_5/server/stdinhand.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/stdinhand.c?rev=30755&r1=30754&r2=30755&view=diff ============================================================================== --- branches/S2_5/server/stdinhand.c (original) +++ branches/S2_5/server/stdinhand.c Wed Nov 25 01:56:07 2015 @@ -1065,8 +1065,14 @@ } /* Check that we have nations available */ if (normal_player_count() >= server.playable_nations) { - fc_snprintf(buf, buflen, - _("Can't add more players, not enough nations.")); + if (nation_set_count() > 1) { + fc_snprintf(buf, buflen, + _("Can't add more players, not enough playable nations " + "in current nationset (see 'nationset' setting).")); + } else { + fc_snprintf(buf, buflen, + _("Can't add more players, not enough playable nations.")); + } return C_FAIL; } } @@ -5655,9 +5661,16 @@ _("No players; game will not start.")); return FALSE; } else if (normal_player_count() > server.playable_nations) { - start_cmd_reply(caller, notify, - _("Not enough nations for all players; game will " - "not start.")); + if (nation_set_count() > 1) { + start_cmd_reply(caller, notify, + _("Not enough nations in the current nationset " + "for all players; game will not start. " + "(See 'nationset' setting.)")); + } else { + start_cmd_reply(caller, notify, + _("Not enough nations for all players; game will " + "not start.")); + } return FALSE; } else if (check) { return TRUE; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits