Author: mir3x
Date: Mon Sep 1 14:35:22 2014
New Revision: 26164
URL: http://svn.gna.org/viewcvs/freeciv?rev=26164&view=rev
Log:
Removed barbarians from start page and intelligence report.
See patch #5137
Modified:
trunk/client/gui-qt/pages.cpp
trunk/client/gui-qt/plrdlg.cpp
Modified: trunk/client/gui-qt/pages.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/pages.cpp?rev=26164&r1=26163&r2=26164&view=diff
==============================================================================
--- trunk/client/gui-qt/pages.cpp (original)
+++ trunk/client/gui-qt/pages.cpp Mon Sep 1 14:35:22 2014
@@ -1177,7 +1177,9 @@
break;
}
} conn_list_iterate_end;
-
+ if (is_barbarian(pplayer)) {
+ continue;
+ }
if (pplayer->ai_controlled) {
is_ready = true;
} else {
@@ -1535,9 +1537,11 @@
splayer = "\"" + splayer + "\"";
if (!splayer.compare(s)) {
- send_chat(str.toLocal8Bit().data());
- send_chat("/away");
- return;
+ if (pplayer->ai_controlled) {
+ send_chat(str.toLocal8Bit().data());
+ send_chat("/away");
+ return;
+ }
}
} players_iterate_end;
}
Modified: trunk/client/gui-qt/plrdlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/plrdlg.cpp?rev=26164&r1=26163&r2=26164&view=diff
==============================================================================
--- trunk/client/gui-qt/plrdlg.cpp (original)
+++ trunk/client/gui-qt/plrdlg.cpp Mon Sep 1 14:35:22 2014
@@ -433,7 +433,7 @@
}
entry_exist = false;
players_iterate_alive(other) {
- if (other == pplayer) {
+ if (other == pplayer || is_barbarian(other)) {
continue;
}
state = player_diplstate_get(pplayer, other);
@@ -448,8 +448,7 @@
ally_str = ally_str + nation_plural_for_player(other) + ", ";
entry_exist = true;
}
- }
- players_iterate_alive_end;
+ } players_iterate_alive_end;
if (entry_exist) {
ally_str.replace(ally_str.lastIndexOf(","), 1, ".");
}
_______________________________________________
Freeciv-commits mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
