Author: cazfi
Date: Tue Jul 26 10:57:49 2016
New Revision: 33326
URL: http://svn.gna.org/viewcvs/freeciv?rev=33326&view=rev
Log:
Made first default team name "Team 1", and no longer "Team 0"
See patch #7506
Modified:
trunk/common/team.c
trunk/data/alien/game.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2civ3/game.ruleset
trunk/data/classic/game.ruleset
trunk/data/experimental/game.ruleset
trunk/data/sandbox/game.ruleset
trunk/data/stub/game.ruleset
Modified: trunk/common/team.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/team.c?rev=33326&r1=33325&r2=33326&view=diff
==============================================================================
--- trunk/common/team.c (original)
+++ trunk/common/team.c Tue Jul 26 10:57:49 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 2005 - The Freeciv Project
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
@@ -32,7 +32,7 @@
struct team *team;
char *defined_name; /* Defined by the ruleset. */
char *rule_name; /* Usable untranslated name. */
-#ifdef ENABLE_NLS
+#ifdef FREECIV_ENABLE_NLS
char *name_translation; /* Translated name. */
#endif
};
@@ -64,7 +64,7 @@
tslot->team = NULL;
tslot->defined_name = NULL;
tslot->rule_name = NULL;
-#ifdef ENABLE_NLS
+#ifdef FREECIV_ENABLE_NLS
tslot->name_translation = NULL;
#endif
}
@@ -94,11 +94,11 @@
if (NULL != tslot->rule_name) {
free(tslot->rule_name);
}
-#ifdef ENABLE_NLS
+#ifdef FREECIV_ENABLE_NLS
if (NULL != tslot->name_translation) {
free(tslot->name_translation);
}
-#endif
+#endif /* FREECIV_ENABLE_NLS */
} team_slots_iterate_end;
free(team_slots.slots);
team_slots.slots = NULL;
@@ -210,17 +210,17 @@
fc_assert(NULL == tslot->defined_name);
fc_assert(NULL == tslot->rule_name);
-#ifdef ENABLE_NLS
+#ifdef FREECIV_ENABLE_NLS
fc_assert(NULL == tslot->name_translation);
-#endif
-
- fc_snprintf(buf, sizeof(buf), "Team %d", team_slot_index(tslot));
+#endif /* FREECIV_ENABLE_NLS */
+
+ fc_snprintf(buf, sizeof(buf), "Team %d", team_slot_index(tslot) + 1);
tslot->rule_name = fc_strdup(buf);
-#ifdef ENABLE_NLS
- fc_snprintf(buf, sizeof(buf), _("Team %d"), team_slot_index(tslot));
+#ifdef FREECIV_ENABLE_NLS
+ fc_snprintf(buf, sizeof(buf), _("Team %d"), team_slot_index(tslot) + 1);
tslot->name_translation = fc_strdup(buf);
-#endif
+#endif /* FREECIV_ENABLE_NLS */
log_verbose("No name defined for team %d! Creating a default name: %s.",
team_slot_index(tslot), tslot->rule_name);
@@ -252,7 +252,7 @@
****************************************************************************/
const char *team_slot_name_translation(const struct team_slot *tslot)
{
-#ifdef ENABLE_NLS
+#ifdef FREECIV_ENABLE_NLS
fc_assert_ret_val(team_slots_initialised(), NULL);
fc_assert_ret_val(NULL != tslot, NULL);
@@ -265,9 +265,9 @@
}
return tslot->name_translation;
-#else
+#else /* FREECIV_ENABLE_NLS */
return team_slot_rule_name(tslot);
-#endif /* ENABLE_NLS */
+#endif /* FREECIV_ENABLE_NLS */
}
/****************************************************************************
@@ -302,14 +302,13 @@
}
tslot->rule_name = fc_strdup(Qn_(team_name));
-#ifdef ENABLE_NLS
+#ifdef FREECIV_ENABLE_NLS
if (NULL != tslot->name_translation) {
free(tslot->name_translation);
}
tslot->name_translation = fc_strdup(Q_(team_name));
-#endif
-}
-
+#endif /* FREECIV_ENABLE_NLS */
+}
/****************************************************************************
Creates a new team for the slot. If slot is NULL, it will lookup to a
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=33326&r1=33325&r2=33326&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Tue Jul 26 10:57:49 2016
@@ -807,10 +807,10 @@
; freeciv optional team names definition.
;
; names =
-; _("Team 0"),
; _("Team 1"),
; _("Team 2"),
; _("Team 3"),
+; _("Team 4"),
; etc...
[settings]
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=33326&r1=33325&r2=33326&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset (original)
+++ trunk/data/civ1/game.ruleset Tue Jul 26 10:57:49 2016
@@ -801,10 +801,10 @@
; freeciv optional team names definition.
;
; names =
-; _("Team 0"),
; _("Team 1"),
; _("Team 2"),
; _("Team 3"),
+; _("Team 4"),
; etc...
[settings]
Modified: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=33326&r1=33325&r2=33326&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset (original)
+++ trunk/data/civ2/game.ruleset Tue Jul 26 10:57:49 2016
@@ -835,10 +835,10 @@
; freeciv optional team names definition.
;
; names =
-; _("Team 0"),
; _("Team 1"),
; _("Team 2"),
; _("Team 3"),
+; _("Team 4"),
; etc...
[settings]
Modified: trunk/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=33326&r1=33325&r2=33326&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset (original)
+++ trunk/data/civ2civ3/game.ruleset Tue Jul 26 10:57:49 2016
@@ -988,10 +988,10 @@
; freeciv optional team names definition.
;
; names =
-; _("Team 0"),
; _("Team 1"),
; _("Team 2"),
; _("Team 3"),
+; _("Team 4"),
; etc...
[settings]
Modified: trunk/data/classic/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=33326&r1=33325&r2=33326&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset (original)
+++ trunk/data/classic/game.ruleset Tue Jul 26 10:57:49 2016
@@ -869,10 +869,10 @@
; freeciv optional team names definition.
;
; names =
-; _("Team 0"),
; _("Team 1"),
; _("Team 2"),
; _("Team 3"),
+; _("Team 4"),
; etc...
[settings]
Modified: trunk/data/experimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=33326&r1=33325&r2=33326&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset (original)
+++ trunk/data/experimental/game.ruleset Tue Jul 26 10:57:49 2016
@@ -898,10 +898,10 @@
; freeciv optional team names definition.
;
; names =
-; _("Team 0"),
; _("Team 1"),
; _("Team 2"),
; _("Team 3"),
+; _("Team 4"),
; etc...
[settings]
Modified: trunk/data/sandbox/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=33326&r1=33325&r2=33326&view=diff
==============================================================================
--- trunk/data/sandbox/game.ruleset (original)
+++ trunk/data/sandbox/game.ruleset Tue Jul 26 10:57:49 2016
@@ -1075,10 +1075,10 @@
; freeciv optional team names definition.
;
; names =
-; _("Team 0"),
; _("Team 1"),
; _("Team 2"),
; _("Team 3"),
+; _("Team 4"),
; etc...
[settings]
Modified: trunk/data/stub/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/game.ruleset?rev=33326&r1=33325&r2=33326&view=diff
==============================================================================
--- trunk/data/stub/game.ruleset (original)
+++ trunk/data/stub/game.ruleset Tue Jul 26 10:57:49 2016
@@ -460,10 +460,10 @@
; freeciv optional team names definition.
;
; names =
-; _("Team 0"),
; _("Team 1"),
; _("Team 2"),
; _("Team 3"),
+; _("Team 4"),
; etc...
[settings]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
