[Freeciv-Dev] (PR#11689) startdialog is bad when loading all-AI game

["Vasco Alexandre da Silva Costa" <vasc@xxxxxxxxxxxxxx>]

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

> [chrisk - Sat Dec 25 19:05:53 2004]:
> 
> 
> CVS 25 DEC 2004 S2 GTK2
> 
> When you load a AI-only game with civclient, there is no way to toggle any
> AI player human. No chatline, no option in options dialog.
> 
> If you continue and start the game, civclient becomes mostly unresponsive.
> Esp., it is not possible to enter /aitoggle command in the chatline,
because
> the cursor goes away...

Here is a patch. It will most likely break the other clients and it
changes strings.


Index: client/connectdlg_common.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/connectdlg_common.c,v
retrieving revision 1.24.2.3
diff -u -u -r1.24.2.3 connectdlg_common.c
--- client/connectdlg_common.c  16 Nov 2004 18:13:59 -0000      1.24.2.3
+++ client/connectdlg_common.c  29 Dec 2004 17:18:25 -0000
@@ -486,7 +486,6 @@
   my_snprintf(buf, sizeof(buf), "/take \"%s\" \"%s\"",
              user_name, player_name);
   send_chat(buf);
-  send_chat("/start");
 }
 
 /**************************************************************** 
Index: client/gui-gtk-2.0/pages.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/pages.c,v
retrieving revision 1.1.2.13
diff -u -u -r1.1.2.13 pages.c
--- client/gui-gtk-2.0/pages.c  23 Nov 2004 15:39:49 -0000      1.1.2.13
+++ client/gui-gtk-2.0/pages.c  29 Dec 2004 17:18:25 -0000
@@ -1360,7 +1360,7 @@
 /**************************************************************************
   change the player name to that of the nation's leader and start the game.
 **************************************************************************/
-static void nation_start_callback(void)
+static void nation_join_callback(void)
 {
   GtkTreeIter it;
   char *name;
@@ -1373,6 +1373,7 @@
   sz_strlcpy(player_name, name);
 
   send_start_saved_game();
+  set_client_page(PAGE_START);
 }
 
 #define MIN_DIMENSION 5
@@ -1507,7 +1508,7 @@
   gtk_tree_selection_set_mode(nation_selection, GTK_SELECTION_SINGLE);
 
   g_signal_connect(view, "row_activated",
-                   G_CALLBACK(nation_start_callback), NULL);
+                   G_CALLBACK(nation_join_callback), NULL);
 
   label = g_object_new(GTK_TYPE_LABEL,
                        "use-underline", TRUE,
@@ -1543,9 +1544,9 @@
   g_signal_connect(button, "clicked",
       G_CALLBACK(main_callback), NULL);
 
-  button = gtk_stockbutton_new(GTK_STOCK_EXECUTE, _("_Start"));
+  button = gtk_stockbutton_new(GTK_STOCK_JUMP_TO, _("_Join Game"));
   g_signal_connect(button, "clicked",
-      G_CALLBACK(nation_start_callback), NULL);
+      G_CALLBACK(nation_join_callback), NULL);
   gtk_container_add(GTK_CONTAINER(bbox), button);
 
   return box;