[Freeciv-Dev] Re: (PR#9405) create chooses wrong nation from leader name

["Jason Dorje Short" <jdorje@xxxxxxxxxxx>]

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

Christian Knoke wrote:
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=9405 >
> 
> CVS 16 JUL 2004 GTK2
> 
> $SUBJECT
> 
> create Victoria
> start
> 
> does not give the english nation for Victoria.

Geez, how do you catch these things so quickly?

jason

Index: server/srv_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/srv_main.c,v
retrieving revision 1.175
diff -u -r1.175 srv_main.c
--- server/srv_main.c   16 Jul 2004 14:43:49 -0000      1.175
+++ server/srv_main.c   17 Jul 2004 05:31:38 -0000
@@ -1212,9 +1212,12 @@
        pplayer->nation = nation;
        pplayer->city_style = get_nation_city_style(nation);
        pplayer->is_male = get_nation_leader_sex(nation, pplayer->name);
-       continue;
+       break;
       }
     }
+    if (pplayer->nation != NO_NATION_SELECTED) {
+      continue;
+    }
 
     nation = select_random_nation(common_class);
     if (nation == NO_NATION_SELECTED) {