Complete.Org: Mailing Lists: Archives: freeciv-dev: December 2005:
[Freeciv-Dev] (PR#14987) cannot pick current nation
Home

[Freeciv-Dev] (PR#14987) cannot pick current nation

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Subject: [Freeciv-Dev] (PR#14987) cannot pick current nation
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon, 26 Dec 2005 21:28:10 -0800
Reply-to: bugs@xxxxxxxxxxx

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14987 >

Here's a simple fix.  I will commit immediately.

-jason

Index: client/gui-gtk-2.0/dialogs.c
===================================================================
--- client/gui-gtk-2.0/dialogs.c        (revision 11391)
+++ client/gui-gtk-2.0/dialogs.c        (working copy)
@@ -678,10 +678,14 @@
 
     s = crop_blankspace(get_nation_flag_sprite(tileset, pnation));
     img = sprite_get_pixbuf(s);
-    used = (pnation->player != NULL);
+    used = (pnation->player != NULL && pnation->player != races_player);
     gtk_list_store_set(store, &it, 0, pnation->index, 1, used, 2, img, -1);
     free_sprite(s);
 
+    if (pnation->player == races_player) {
+      /* FIXME: should select this one by default. */
+    }
+
     g_value_init(&value, G_TYPE_STRING);
     g_value_set_static_string(&value, pnation->name);
     gtk_list_store_set_value(store, &it, 3, &value);

[Prev in Thread] Current Thread [Next in Thread]