[xiph-commits] r11496 - trunk/planarity

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2006-06-01 17:09:55 -0700 (Thu, 01 Jun 2006)
New Revision: 11496

Modified:
   trunk/planarity/dialog_level.c
   trunk/planarity/levelstate.c
   trunk/planarity/version.h
Log:
Correct a timer bug where resuming a board from the board menu would
reset timer to zero seconds.



Modified: trunk/planarity/dialog_level.c
===================================================================
--- trunk/planarity/dialog_level.c	2006-06-01 23:58:38 UTC (rev 11495)
+++ trunk/planarity/dialog_level.c	2006-06-02 00:09:55 UTC (rev 11496)
@@ -41,7 +41,8 @@
   g->level_dialog_active=0;
   pop_curtain(g);
   levelstate_go();
-  enter_game(g);
+  prepare_reenter_game(g);
+  reenter_game(g);
 } 
 
 static void unlevel_quit (Gameboard *g){

Modified: trunk/planarity/levelstate.c
===================================================================
--- trunk/planarity/levelstate.c	2006-06-01 23:58:38 UTC (rev 11495)
+++ trunk/planarity/levelstate.c	2006-06-02 00:09:55 UTC (rev 11496)
@@ -405,12 +405,14 @@
       generate_board(&gameboard->g,curr->gm.num);
       activate_verticies(&gameboard->g);
       impress_location(&gameboard->g);
+      set_timer(0);
     }
   }else{
     /* no board in progress; fetch a new board */
     generate_board(&gameboard->g,curr->gm.num);
     activate_verticies(&gameboard->g);
     impress_location(&gameboard->g);
+    set_timer(0);
   }
 
   graph_dirty=0;

Modified: trunk/planarity/version.h
===================================================================
--- trunk/planarity/version.h	2006-06-01 23:58:38 UTC (rev 11495)
+++ trunk/planarity/version.h	2006-06-02 00:09:55 UTC (rev 11496)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Thu Jun  1 19:53:10 EDT 2006] */
+/* DO NOT EDIT: Automated versioning hack [Thu Jun  1 20:08:17 EDT 2006] */