[Freeciv-commits] r26165 - in /branches/S2_5/client/gui-qt: pages.cpp plrdlg.cpp

[mlewczuk80]

Author: mir3x
Date: Mon Sep  1 14:35:42 2014
New Revision: 26165

URL: http://svn.gna.org/viewcvs/freeciv?rev=26165&view=rev
Log:
Removed barbarians from start page and intelligence report.

See patch #5137


Modified:
    branches/S2_5/client/gui-qt/pages.cpp
    branches/S2_5/client/gui-qt/plrdlg.cpp

Modified: branches/S2_5/client/gui-qt/pages.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/pages.cpp?rev=26165&r1=26164&r2=26165&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/pages.cpp       (original)
+++ branches/S2_5/client/gui-qt/pages.cpp       Mon Sep  1 14:35:42 2014
@@ -1177,7 +1177,9 @@
         break;
       }
     } conn_list_iterate_end;
-
+    if (is_barbarian(pplayer)) {
+      continue;
+    }
     if (pplayer->ai_controlled) {
       is_ready = true;
     } else {
@@ -1539,9 +1541,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: branches/S2_5/client/gui-qt/plrdlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/plrdlg.cpp?rev=26165&r1=26164&r2=26165&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/plrdlg.cpp      (original)
+++ branches/S2_5/client/gui-qt/plrdlg.cpp      Mon Sep  1 14:35:42 2014
@@ -432,7 +432,7 @@
     }
     entry_exist = false;
     players_iterate_alive(other) {
-      if (other == pplayer) {
+      if (other == pplayer || is_barbarian(other)) {
         continue;
       }
       state = player_diplstate_get(pplayer, other);
@@ -446,8 +446,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
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits