<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40239 >
$subject - necessary to distinguish between AI players.
- ML
diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/gui_main.c
freeciv/client/gui-gtk-2.0/gui_main.c
--- freeciv/client/gui-gtk-2.0/gui_main.c 2008-03-08 16:32:57.000000000
+0200
+++ freeciv/client/gui-gtk-2.0/gui_main.c 2008-05-08 10:15:36.000000000
+0300
@@ -1629,7 +1629,11 @@
is_ready = pplayer->ai.control ? TRUE: pplayer->is_ready;
if (pplayer->nation == NO_NATION_SELECTED) {
nation = _("Random");
- leader = "";
+ if (pplayer->was_created) {
+ leader = player_name(pplayer);
+ } else {
+ leader = "";
+ }
} else {
nation = nation_adjective_for_player(pplayer);
leader = player_name(pplayer);
diff -Nurd -X.diff_ignore freeciv/client/packhand.c freeciv/client/packhand.c
--- freeciv/client/packhand.c 2008-05-02 05:03:22.000000000 +0300
+++ freeciv/client/packhand.c 2008-05-08 10:19:14.000000000 +0300
@@ -1695,6 +1695,7 @@
pplayer->is_male=pinfo->is_male;
team_add_player(pplayer, team_by_number(pinfo->team));
pplayer->score.game = pinfo->score;
+ pplayer->was_created = pinfo->was_created;
pplayer->economic.gold=pinfo->gold;
pplayer->economic.tax=pinfo->tax;
diff -Nurd -X.diff_ignore freeciv/common/packets.def freeciv/common/packets.def
--- freeciv/common/packets.def 2008-03-08 16:32:49.000000000 +0200
+++ freeciv/common/packets.def 2008-05-08 10:17:45.000000000 +0300
@@ -654,6 +654,7 @@
UINT32 score;
BOOL is_male;
+ BOOL was_created;
GOVERNMENT government;
GOVERNMENT target_government;
BOOL embassy[MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS];
diff -Nurd -X.diff_ignore freeciv/server/plrhand.c freeciv/server/plrhand.c
--- freeciv/server/plrhand.c 2008-04-08 15:32:21.000000000 +0300
+++ freeciv/server/plrhand.c 2008-05-08 10:20:03.000000000 +0300
@@ -860,6 +860,7 @@
packet->is_male=plr->is_male;
packet->team = plr->team ? team_number(plr->team) : -1;
packet->is_ready = plr->is_ready;
+ packet->was_created = plr->was_created;
if (city_styles != NULL) {
packet->city_style = city_style_of_player(plr);
} else {
diff -Nurd -X.diff_ignore freeciv/version.in freeciv/version.in
--- freeciv/version.in 2008-04-06 11:24:53.000000000 +0300
+++ freeciv/version.in 2008-05-08 10:20:27.000000000 +0300
@@ -23,4 +23,4 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING="+Freeciv.Devel.2008.Apr.06"
+NETWORK_CAPSTRING="+Freeciv.Devel.2008.May.08"
diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/gui_main.c
freeciv/client/gui-gtk-2.0/gui_main.c
--- freeciv/client/gui-gtk-2.0/gui_main.c 2008-01-15 04:04:31.000000000
+0200
+++ freeciv/client/gui-gtk-2.0/gui_main.c 2008-05-08 10:52:08.000000000
+0300
@@ -1566,7 +1566,11 @@
is_ready = pplayer->ai.control ? TRUE: pplayer->is_ready;
if (pplayer->nation == NO_NATION_SELECTED) {
nation = _("Random");
- leader = "";
+ if (pplayer->was_created) {
+ leader = player_name(pplayer);
+ } else {
+ leader = "";
+ }
} else {
nation = nation_adjective_for_player(pplayer);
leader = player_name(pplayer);
diff -Nurd -X.diff_ignore freeciv/client/packhand.c freeciv/client/packhand.c
--- freeciv/client/packhand.c 2008-04-09 16:01:51.000000000 +0300
+++ freeciv/client/packhand.c 2008-05-08 11:04:02.000000000 +0300
@@ -1531,6 +1531,11 @@
pplayer->is_male=pinfo->is_male;
team_add_player(pplayer, team_get_by_id(pinfo->team));
pplayer->score.game = pinfo->score;
+ if (has_capability("CreatedName", aconnection.capability)) {
+ pplayer->was_created = pinfo->was_created;
+ } else {
+ pplayer->was_created = FALSE;
+ }
pplayer->economic.gold=pinfo->gold;
pplayer->economic.tax=pinfo->tax;
diff -Nurd -X.diff_ignore freeciv/common/packets.def freeciv/common/packets.def
--- freeciv/common/packets.def 2008-01-15 04:04:30.000000000 +0200
+++ freeciv/common/packets.def 2008-05-08 10:31:03.000000000 +0300
@@ -639,6 +639,7 @@
UINT32 score;
BOOL is_male;
+ BOOL was_created; add-cap(CreatedName)
GOVERNMENT government;
GOVERNMENT target_government;
BOOL embassy[MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS];
diff -Nurd -X.diff_ignore freeciv/server/plrhand.c freeciv/server/plrhand.c
--- freeciv/server/plrhand.c 2008-01-31 17:13:30.000000000 +0200
+++ freeciv/server/plrhand.c 2008-05-08 10:29:28.000000000 +0300
@@ -842,6 +842,7 @@
packet->is_male=plr->is_male;
packet->team = plr->team ? plr->team->index : -1;
packet->is_ready = plr->is_ready;
+ packet->was_created = plr->was_created;
if (city_styles != NULL) {
packet->city_style = city_style_of_player(plr);
} else {
diff -Nurd -X.diff_ignore freeciv/version.in freeciv/version.in
--- freeciv/version.in 2008-04-21 00:10:28.000000000 +0300
+++ freeciv/version.in 2008-05-08 10:30:57.000000000 +0300
@@ -24,4 +24,4 @@
# - Avoid adding a new manditory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-FREECIV_NETWORK_CAPSTRING(["+2.1g"])
+FREECIV_NETWORK_CAPSTRING(["+2.1g CreatedName"])
_______________________________________________
Freeciv-dev mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-dev
