Author: cazfi
Date: Mon Jul 4 23:51:25 2016
New Revision: 33165
URL: http://svn.gna.org/viewcvs/freeciv?rev=33165&view=rev
Log:
Save custom team names to the rulesets.
See bug #24822
Modified:
branches/S2_6/common/game.h
branches/S2_6/server/ruleset.c
branches/S2_6/tools/ruledit/rulesave.c
Modified: branches/S2_6/common/game.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/game.h?rev=33165&r1=33164&r2=33165&view=diff
==============================================================================
--- branches/S2_6/common/game.h (original)
+++ branches/S2_6/common/game.h Mon Jul 4 23:51:25 2016
@@ -271,6 +271,7 @@
const char **allowed_styles;
char **nc_astyles;
size_t as_count;
+ int named_teams;
} ruledit;
} server;
};
Modified: branches/S2_6/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.c?rev=33165&r1=33164&r2=33165&view=diff
==============================================================================
--- branches/S2_6/server/ruleset.c (original)
+++ branches/S2_6/server/ruleset.c Mon Jul 4 23:51:25 2016
@@ -5745,6 +5745,7 @@
if (team_slot_count() < teams) {
teams = team_slot_count();
}
+ game.server.ruledit.named_teams = teams;
for (i = 0; i < teams; i++) {
team_slot_set_defined_name(team_slot_by_number(i), svec[i]);
}
Modified: branches/S2_6/tools/ruledit/rulesave.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/rulesave.c?rev=33165&r1=33164&r2=33165&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/rulesave.c (original)
+++ branches/S2_6/tools/ruledit/rulesave.c Mon Jul 4 23:51:25 2016
@@ -638,6 +638,7 @@
const char *style_names[32]; /* FIXME: Should determine max length
automatically.
* currently it's 3 (bits 0,1, and 2) so
there's plenty of
* safety margin here. */
+ const char *tnames[game.server.ruledit.named_teams];
enum trade_route_type trt;
int i;
enum gen_action quiet_actions[ACTION_COUNT];
@@ -962,7 +963,16 @@
rgbcolor_save(sfile, pcol, "playercolors.colorlist%d", col_idx++);
} rgbcolor_list_iterate_end;
- /* TODO: Team names */
+
+ if (game.server.ruledit.named_teams > 0) {
+ for (i = 0; i < game.server.ruledit.named_teams; i++) {
+ tnames[i] = team_slot_rule_name(team_slot_by_number(i));
+ }
+
+ secfile_insert_str_vec(sfile, tnames,
+ game.server.ruledit.named_teams,
+ "teams.names");
+ }
sect_idx = 0;
disaster_type_iterate(pd) {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
