[Xbubble-commits] xbubble-sdl/src board.c, 1.10, 1.11 board.h, 1.7, 1.8

[Martin Quinson]

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

Modified Files:
	board.c board.h 
Log Message:
Random cleanups

Index: board.h
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/board.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- board.h	15 Sep 2006 10:14:46 -0000	1.7
+++ board.h	16 Sep 2006 00:49:01 -0000	1.8
@@ -89,7 +89,6 @@
   double new_x,new_y;     /* Ball newly created */
   double ready_x,ready_y; /* Ball ready to be lauched (loaded in canon) */
   double alert_x,alert_y; /* alert sign */
-//  double canon_x,canon_y; /* canon */
   double countdown_x,countdown_y;
 
   /* borders locations */

Index: board.c
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/board.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- board.c	15 Sep 2006 10:14:46 -0000	1.10
+++ board.c	16 Sep 2006 00:49:01 -0000	1.11
@@ -118,7 +118,6 @@
   board->offset.y = offset->y; 
 
   board->scale = scale;
-  /*  board->zoom = scale/DEFAULT_SCALE; */
   board->period = period;
   board->nb_rising_bubbles = 0;
   board->placed_balls = vector_new( 10 );
@@ -128,7 +127,7 @@
   //#define ALERT_Y              ( -OFFSET_Y*0.5 )
   //#define NEW_X                1.0
   //#define NEW_Y                ( BOARD_HEIGHT - 0.75 )
-  //#define CANON_X              ( BOARD_WIDTH*0.5 )
+  //#define CANON_X              ( BOARD_WIDTH*0.5 ) 
   //#define CANON_Y              ( ROWS*ROW_HEIGHT + 0.5 )
   //#define COUNTDOWN_X          1.3
   //#define COUNTDOWN_Y          ( NEW_Y - 1.3 )
@@ -142,11 +141,6 @@
   board->ready_x=board2screen_x( BOARD_WIDTH*0.5       ,board);
   board->ready_y=board2screen_y( ROWS*ROW_HEIGHT + 0.5 ,board);
 
-   /* FIXME
-  board->canon_x=board2screen_x( BOARD_WIDTH*0.5       ,board);
-  board->canon_y=board2screen_y( ROWS*ROW_HEIGHT + 0.5 ,board);
-    */
-   
   board->countdown_x=board2screen_x( 1.3, board);
   board->countdown_y=board->new_y - 1.3*board->scale;