Author: cazfi
Date: Tue Mar 1 03:10:53 2016
New Revision: 32140
URL: http://svn.gna.org/viewcvs/freeciv?rev=32140&view=rev
Log:
Added deprecation warnings about "prefered" entries
See patch #7016
Modified:
branches/S2_6/client/tilespec.c
branches/S2_6/server/ruleset.c
Modified: branches/S2_6/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.c?rev=32140&r1=32139&r2=32140&view=diff
==============================================================================
--- branches/S2_6/client/tilespec.c (original)
+++ branches/S2_6/client/tilespec.c Tue Mar 1 03:10:53 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/**********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
#include "astring.h"
#include "bitvector.h"
#include "capability.h"
+#include "deprecations.h"
#include "fcintl.h"
#include "log.h"
#include "mem.h"
@@ -2251,6 +2252,10 @@
t->preferred_themes =
(char **) secfile_lookup_str_vec(file, &num_preferred_themes,
"tilespec.prefered_themes");
+ if (num_preferred_themes > 0) {
+ log_deprecation("Entry tilespec.prefered_themes in tilespec."
+ " Use correct spelling tilespec.preferred_themes
instead");
+ }
}
t->num_preferred_themes = num_preferred_themes;
for (i = 0; i < t->num_preferred_themes; i++) {
Modified: branches/S2_6/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.c?rev=32140&r1=32139&r2=32140&view=diff
==============================================================================
--- branches/S2_6/server/ruleset.c (original)
+++ branches/S2_6/server/ruleset.c Tue Mar 1 03:10:53 2016
@@ -4992,6 +4992,10 @@
/* section: tileset */
pref_text = secfile_lookup_str_default(file, "", "tileset.prefered");
+ if (pref_text != NULL) {
+ log_deprecation("Entry tileset.prefered in game.ruleset."
+ " Use correct spelling tileset.preferred instead");
+ }
pref_text = secfile_lookup_str_default(file, pref_text, "tileset.preferred");
if (pref_text[0] != '\0') {
/* There was tileset suggestion */
@@ -5003,6 +5007,10 @@
/* section: soundset */
pref_text = secfile_lookup_str_default(file, "", "soundset.prefered");
+ if (pref_text != NULL) {
+ log_deprecation("Entry soundset.prefered in game.ruleset."
+ " Use correct spelling soundset.preferred instead");
+ }
pref_text = secfile_lookup_str_default(file, pref_text,
"soundset.preferred");
if (pref_text[0] != '\0') {
/* There was soundset suggestion */
@@ -5014,6 +5022,10 @@
/* section: musicset */
pref_text = secfile_lookup_str_default(file, "", "musicset.prefered");
+ if (pref_text != NULL) {
+ log_deprecation("Entry musicset.prefered in game.ruleset."
+ " Use correct spelling musicset.preferred instead");
+ }
pref_text = secfile_lookup_str_default(file, pref_text,
"musicset.preferred");
if (pref_text[0] != '\0') {
/* There was musicset suggestion */
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
