[Freeciv-Dev] Re: (PR#17793) Wait cursor and non-simultaneous movement (gtk2 client, trunk)

["Andreas Røsdal" <andrearo@xxxxxxxxxxxx>]

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

On Sat, 10 Jun 2006, Per I. Mathisen wrote:
> > set simultaneousphases 0
> 
> Now the wait cursor appears whenever you press 'end turn' to indicate that 
> you are done moving. However, you may still want to set gotos or change 
> city production, which it would be nice to have a normal cursor for.

This patch sets the wait cursor to only replace the default cursor 
between turns. It will allow you to have other cursors such as goto 
and select between turns.


Slightly unrelated to the cursor-issue: another question is whether it 
really should be possible to move units in games with alternating 
movement, after you have pressed 'end turn'. When you press 'end turn', 
you have sort of confirmed that you are done playing that turn. Allowing 
players to change things between turns breaks with the consept 
of turn-based games.  

  Andreas

Index: client/control.c
===================================================================
--- client/control.c    (revisjon 12025)
+++ client/control.c    (arbeidskopi)
@@ -890,11 +890,6 @@
     return;
   }
 
-  if (turn_done_sent || waiting_for_end_turn) {
-    update_mouse_cursor(CURSOR_WAIT);
-    return;
-  }
-
   if (!ptile) {
     if (hover_tile) {
       /* hover_tile is the tile which is currently under the mouse cursor. */
@@ -919,6 +914,8 @@
               && can_player_see_city_internals(game.player_ptr, pcity)) {
       /* Set mouse cursor to select a city. */
       mouse_cursor_type = CURSOR_SELECT;
+    } else if (turn_done_sent || waiting_for_end_turn) {
+      mouse_cursor_type = CURSOR_WAIT;
     } else {
       /* Set default mouse cursor, because nothing selectable found. */
     }