Author: cazfi
Date: Thu Jul 7 22:14:54 2016
New Revision: 33199
URL: http://svn.gna.org/viewcvs/freeciv?rev=33199&view=rev
Log:
Fixed loading of ruleset when a nation has no init_units defined.
Reported by Sveinung Kvilhaugsvik <sveinung>
See bug #24766
Modified:
branches/S2_6/server/ruleset.c
Modified: branches/S2_6/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.c?rev=33199&r1=33198&r2=33199&view=diff
==============================================================================
--- branches/S2_6/server/ruleset.c (original)
+++ branches/S2_6/server/ruleset.c Thu Jul 7 22:14:54 2016
@@ -556,8 +556,8 @@
/**************************************************************************
Lookup a string prefix.entry in the file and return the corresponding
- improvement pointer. If (!required), return B_NEVER for match "None" or
- can't match. If (required), die when can't match.
+ improvement pointer. Return B_NEVER for match "None" or
+ can't match.
If description is not NULL, it is used in the warning message
instead of prefix (eg pass unit->name instead of prefix="units2.u27")
**************************************************************************/
@@ -610,9 +610,11 @@
}
slist = secfile_lookup_str_vec(file, &nval, "%s.%s", prefix, entry);
if (nval == 0) {
- ruleset_error(LOG_ERROR, "\"%s\": missing string vector %s.%s",
- filename, prefix, entry);
- return FALSE;
+ /* 'No vector' is considered same as empty vector */
+ if (slist != NULL) {
+ free(slist);
+ }
+ return TRUE;
}
if (nval > MAX_NUM_UNIT_LIST) {
ruleset_error(LOG_ERROR,
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
