[Xbubble-commits] xbubble-sdl/src game.c,1.5,1.6

[Martin Quinson]

Update of /cvsroot/xbubble/xbubble-sdl/src
In directory haydn:/tmp/cvs-serv11053

Modified Files:
	game.c 
Log Message:
kill more old cruft

Index: game.c
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/game.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- game.c	14 Sep 2006 08:52:54 -0000	1.5
+++ game.c	14 Sep 2006 08:57:49 -0000	1.6
@@ -40,28 +40,6 @@
 
 #include "graphic_utils.h"
 
-/* FIXME
-extern Display *display;
-extern Window root;
-extern Window win;
-extern int screen;
-extern int depth;
-*/
-
-/* FIXME
-extern GC dialog_gc;
-extern GC dialog_text_gc;
-extern XFontStruct *dialog_font;
-extern XFontStruct *menu_font;
-extern Pixmap win_bg;
-extern Pixmap cup_on;
-extern Pixmap cup_off;
-extern Pixmap cup_on_mask;
-extern Pixmap cup_off_mask;
-extern Pixmap board_decoration;
-extern Pixmap board_decoration_mask;
-*/
-
 extern int titlefont_color[3];
 extern int menufont_color[3];
 
@@ -107,15 +85,6 @@
   double canon_angle[2];
   board_t board[2];
   opponent_t opponent[2];
-  /* FIXME
-  GC board_gc;
-  Pixmap board_pixmap[2];
-  Pixmap board_bg[2];
-  Window board_window[2];
-  Window msg_box[2];
-  Window cup_box[2];
-  Window tags[2];
-  */
   ruleset_t ruleset[2];
 };
 
@@ -363,7 +332,7 @@
    }   
 }
 
-static void animate_game( game_t game, int dt ) {
+static void game_animate( game_t game, int dt ) {
   int i, color, lost=0;
   for ( i = 0; i < game->nb_boards; i++ ) { 
     board_animate( game->board[i], dt );
@@ -552,7 +521,7 @@
       break;
     }
 
-    animate_game( game, fps_frame_duration );
+    game_animate( game, fps_frame_duration );
 
     /* check if game is not over */
     if ( game->multi_player ) {
@@ -609,18 +578,12 @@
 	 ( board_get_state( game->board[1] ) == board_state_frozen )))
       game->state = game_state_finished;
     else
-      animate_game( game, fps_frame_duration );
+      game_animate( game, fps_frame_duration );
     break;
 
   default:
     break;
   }
-  
-  /* to restart computer thinking we do a non-local exit */
-  if ( game->need_restart_thinking ) {
-    game->need_restart_thinking = 0;
-    siglongjmp( restart_thinking, 1 );
-  }
 }