Author: cazfi Date: Wed Aug 3 11:59:03 2016 New Revision: 33438 URL: http://svn.gna.org/viewcvs/freeciv?rev=33438&view=rev Log: Give sensible error about unknown default_government in ruleset.
See bug #24905 Modified: trunk/server/ruleset.c Modified: trunk/server/ruleset.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=33438&r1=33437&r2=33438&view=diff ============================================================================== --- trunk/server/ruleset.c (original) +++ trunk/server/ruleset.c Wed Aug 3 11:59:03 2016 @@ -4275,10 +4275,19 @@ * a specific ruleset to a gov not explicitly known by the nation set. */ if (sval != NULL) { game.default_government = government_by_rule_name(sval); - game.info.default_government_id - = government_number(game.default_government); - } - + if (game.default_government == NULL) { + ruleset_error(LOG_ERROR, + "Tried to set unknown government type \"%s\" as default_government!", + sval); + ok = FALSE; + } else { + game.info.default_government_id + = government_number(game.default_government); + } + } + } + + if (ok) { sec = secfile_sections_by_name_prefix(file, NATION_SET_SECTION_PREFIX); if (sec) { section_list_iterate(sec, psection) { _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits