[Freeciv-Dev] Re: (PR#10218) Too few nations in civ1 ruleset

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10218 >

I *think* this patch should fix it.  nation_count includes the barbarian 
and observer nations while playable_nation_count does not (this should 
be better documented).

Can anyone test this?

jason


Index: server/citytools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/citytools.c,v
retrieving revision 1.274
diff -u -r1.274 citytools.c
--- server/citytools.c  14 Sep 2004 03:29:22 -0000      1.274
+++ server/citytools.c  21 Sep 2004 21:38:27 -0000
@@ -1175,7 +1175,7 @@
   
   if (is_capital(pcity)
       && city_list_size(&cplayer->cities) >= game.civilwarsize
-      && game.nplayers < game.nation_count
+      && game.nplayers < game.playable_nation_count
       && game.civilwarsize < GAME_MAX_CIVILWARSIZE
       && get_num_human_and_ai_players() < MAX_NUM_PLAYERS
       && civil_war_triggered(cplayer)) {