diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/mapctrl.c freeciv-work/client/gui-gtk/mapctrl.c --- freeciv/client/gui-gtk/mapctrl.c Fri Jun 14 00:43:24 2002 +++ freeciv-work/client/gui-gtk/mapctrl.c Sun Aug 4 18:31:39 2002 @@ -281,7 +281,8 @@ { int xtile, ytile; - if(get_client_state() != CLIENT_GAME_RUNNING_STATE) + /* needed to move through the map with third bottom */ + if(get_client_state() < CLIENT_GAME_RUNNING_STATE) return TRUE; if ((ev->button == 1) && (ev->state & GDK_SHIFT_MASK)) { @@ -405,7 +406,8 @@ } ytile = ev->y / 2; - if(get_client_state() != CLIENT_GAME_RUNNING_STATE) + /* needed to move with third mouse button through minimap */ + if(get_client_state() < CLIENT_GAME_RUNNING_STATE) return TRUE; if (ev->button == 1) { diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/mapview.c freeciv-work/client/gui-gtk/mapview.c --- freeciv/client/gui-gtk/mapview.c Sat Jul 6 22:35:22 2002 +++ freeciv-work/client/gui-gtk/mapview.c Sun Aug 4 17:56:38 2002 @@ -758,7 +758,7 @@ **************************************************************************/ gint overview_canvas_expose(GtkWidget *w, GdkEventExpose *ev) { - if(get_client_state()!=CLIENT_GAME_RUNNING_STATE) { + if(get_client_state()window, civ_gc, radar_gfx_sprite->pixmap, ev->area.x, ev->area.y, @@ -937,7 +937,7 @@ map_resized=TRUE; } - if(get_client_state()!=CLIENT_GAME_RUNNING_STATE) { + if(get_client_state()value; - if(get_client_state()!=CLIENT_GAME_RUNNING_STATE) + if(get_client_state()= CLIENT_GAME_RUNNING_STATE) { queue_mapview_update(); } else { refresh_tile_mapcanvas(pcity->x, pcity->y, TRUE); @@ -1060,7 +1060,7 @@ game.heating=pinfo->heating; game.nuclearwinter=pinfo->nuclearwinter; game.cooling=pinfo->cooling; - if(get_client_state()!=CLIENT_GAME_RUNNING_STATE) { + if(get_client_state()=CLIENT_GAME_RUNNING_STATE) { int x = packet->x, y = packet->y; /* the tile itself */