[Freeciv-commits] r33164 - in /trunk: common/game.h server/ruleset.c tools/ruleutil/rulesave.c

[cazfi74]

Author: cazfi
Date: Mon Jul  4 23:51:18 2016
New Revision: 33164

URL: http://svn.gna.org/viewcvs/freeciv?rev=33164&view=rev
Log:
Save custom team names to the rulesets.

See bug #24822

Modified:
    trunk/common/game.h
    trunk/server/ruleset.c
    trunk/tools/ruleutil/rulesave.c

Modified: trunk/common/game.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/game.h?rev=33164&r1=33163&r2=33164&view=diff
==============================================================================
--- trunk/common/game.h (original)
+++ trunk/common/game.h Mon Jul  4 23:51:18 2016
@@ -272,6 +272,7 @@
         const char **allowed_styles;
         char **nc_astyles;
         size_t as_count;
+        int named_teams;
       } ruledit;
     } server;
   };

Modified: trunk/server/ruleset.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=33164&r1=33163&r2=33164&view=diff
==============================================================================
--- trunk/server/ruleset.c      (original)
+++ trunk/server/ruleset.c      Mon Jul  4 23:51:18 2016
@@ -6295,6 +6295,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: trunk/tools/ruleutil/rulesave.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruleutil/rulesave.c?rev=33164&r1=33163&r2=33164&view=diff
==============================================================================
--- trunk/tools/ruleutil/rulesave.c     (original)
+++ trunk/tools/ruleutil/rulesave.c     Mon Jul  4 23:51:18 2016
@@ -741,6 +741,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];
@@ -1130,7 +1131,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");
+  }
 
   comment_disasters(sfile);
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits