[Freeciv-Dev] Re: Game Starting Version 10

[Raimar Falke <hawk@xxxxxxxxxxxxxxxxxxxxxxx>]

On Wed, Feb 13, 2002 at 10:32:37PM -0500, Daniel L Speyer wrote:
> Here is yet another version of the improved game starting patch.  It fixes
> the intermittant freeze on end-game and generally cleans up the code.
> 
> What now stands between this version and incorporation?
> 
> BTW, version 9 was never released, just in case you're wondering what
> happened to it.

$ patch --dry-run -p1 <conndlg10.patch
patching file client/civclient.c
Hunk #1 succeeded at 551 (offset 3 lines).
patching file client/clinet.c
Hunk #1 succeeded at 79 (offset -3 lines).
Hunk #2 succeeded at 135 (offset 1 line).
Hunk #3 succeeded at 223 (offset -10 lines).
patching file client/gui-gtk/connectdlg.c
Hunk #8 succeeded at 442 with fuzz 1.
patching file client/gui-gtk/connectdlg.h
patching file client/gui-gtk/gui_main.c
Hunk #1 FAILED at 130.
Hunk #2 FAILED at 660.
2 out of 2 hunks FAILED -- saving rejects to file client/gui-gtk/gui_main.c.rej
patching file client/gui-gtk/menu.c
Hunk #2 succeeded at 71 (offset -1 lines).
Hunk #3 succeeded at 186 with fuzz 2.
Hunk #4 succeeded at 570 (offset -2 lines).
patch: **** malformed patch at line 867: diff -r -u 
freeciv-01-26-02/configure.in freeciv/configure.in

This part
        v      v
@@ -955,8 +962,9 @@
 *****************************************************************/
 void update_menus(void)
 {
+  menus_set_sensitive("<main>/_Game/Quit client only", is_server_running());
+  menus_set_sensitive("<main>/_Game/_Disconnect",!is_server_running());
   if(get_client_state()!=CLIENT_GAME_RUNNING_STATE) {
     menus_set_sensitive("<main>/_Reports", FALSE);
     menus_set_sensitive("<main>/_Kingdom", FALSE);
diff -r -u freeciv-01-26-02/configure.in freeciv/configure.in

is obviously wrong: the old version should have 8 lines and the new
version 9. Old version has 6 and new version has 8. I only get this if
I change the patch by hand.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
  Windows: From the people who brought you edlin...