[Freeciv-commits] r25291 - /branches/S2_5/server/techtools.c

[0jacobnk . gna]

Author: jtn
Date: Fri Jun 27 21:11:56 2014
New Revision: 25291

URL: http://svn.gna.org/viewcvs/freeciv?rev=25291&view=rev
Log:
Prevent tech loss removing self root_req techs.

See bug #22161.

Modified:
    branches/S2_5/server/techtools.c

Modified: branches/S2_5/server/techtools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/techtools.c?rev=25291&r1=25290&r2=25291&view=diff
==============================================================================
--- branches/S2_5/server/techtools.c    (original)
+++ branches/S2_5/server/techtools.c    Fri Jun 27 21:11:56 2014
@@ -51,7 +51,7 @@
 /* Define this to add information about tech upkeep. */
 #undef TECH_UPKEEP_DEBUGGING
 
-static Tech_type_id pick_random_tech_researched(struct player* plr);
+static Tech_type_id pick_random_tech_to_lose(struct player* plr);
 static void player_tech_lost(struct player* plr, Tech_type_id tech);
 static void forget_tech_transfered(struct player *pplayer, Tech_type_id tech);
 
@@ -513,7 +513,7 @@
       tech = A_FUTURE;
       research->future_tech--;
     } else {
-      tech = pick_random_tech_researched(plr);
+      tech = pick_random_tech_to_lose(plr);
 
       if (tech != A_NONE) {
         notify_player(plr, NULL, E_TECH_GAIN, ftc_server,
@@ -555,27 +555,33 @@
 }
 
 /****************************************************************************
-  Returns a random researched tech.
-****************************************************************************/
-static Tech_type_id pick_random_tech_researched(struct player* plr)
-{
-  int chosen, researched = 0;
+  Choose a random tech for player to lose.
+****************************************************************************/
+static Tech_type_id pick_random_tech_to_lose(struct player* plr)
+{
+  bv_techs eligible_techs;
+  int chosen, eligible = 0;
+
+  BV_CLR_ALL(eligible_techs);
 
   advance_index_iterate(A_FIRST, i) {
-    if (player_invention_state(plr, i) == TECH_KNOWN) {
-      researched++;
+    /* Never lose self root_req techs */
+    if (advance_required(i, AR_ROOT) != i
+        && player_invention_state(plr, i) == TECH_KNOWN) {
+      BV_SET(eligible_techs, i);
+      eligible++;
     }
   } advance_index_iterate_end;
 
-  if (researched == 0) {
-    /* no technology at all */
+  if (eligible == 0) {
+    /* no researched technology at all */
     return A_NONE;
   }
 
-  chosen = fc_rand(researched) + 1;
+  chosen = fc_rand(eligible) + 1;
 
   advance_index_iterate(A_FIRST, i) {
-    if (player_invention_state(plr, i) == TECH_KNOWN) {
+    if (BV_ISSET(eligible_techs, i)) {
       chosen--;
       if (chosen == 0) {
         return i;


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