[Xbubble-commits] xbubble-sdl/src board.c, 1.7, 1.8 board.h, 1.4, 1.5 theme.c, 1.4, 1.5 xbubble.c, 1.6, 1.7

[Martin Quinson]

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

Modified Files:
	board.c board.h theme.c xbubble.c 
Log Message:
Remove debug messages for working parts

Index: xbubble.c
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/xbubble.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xbubble.c	14 Sep 2006 08:52:54 -0000	1.6
+++ xbubble.c	14 Sep 2006 09:53:02 -0000	1.7
@@ -16,10 +16,9 @@
   binary_name = strdup(argv[0]);
    
   screen = window_make(MAX_X,MAX_Y);
-  DEBUG("MAX_X=%d MAX_Y=%d",MAX_X,MAX_Y);
 
   theme_t *theme = theme_init("fancy",zoom);
-  levels_t levels = levels_load("levels_empty.txt");
+  levels_t levels = levels_load("levels.txt");
   ruleset_t ruleset = DEFAULT_RULE_SET;
   game_t game = game_new(game_mode_single, &ruleset, theme, zoom, 
 			 levels_get_colors(levels, 1),

Index: theme.c
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/theme.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- theme.c	14 Sep 2006 08:22:44 -0000	1.4
+++ theme.c	14 Sep 2006 09:53:02 -0000	1.5
@@ -97,6 +97,7 @@
 
   theme->canon_a = set_new( NB_ANGLES );
   frame = frame_load("canon.png",theme->name,zoom);
+//  frame = frame_load("canon2.png",theme->name,zoom*4);
   for ( i = -CANON_ANGLE_MAX; i <= CANON_ANGLE_MAX; i++ ) {
     frame_t toadd = frame_new_raw(rotozoomSurface(frame->surf, -i*ANGLE_STEP*180.0/3.14159, 1, 1));
     if (!toadd) 

Index: board.c
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/board.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- board.c	14 Sep 2006 09:12:06 -0000	1.7
+++ board.c	14 Sep 2006 09:53:02 -0000	1.8
@@ -201,9 +201,6 @@
   
   board->state = board_state_waiting_for_canon;
 
-  DEBUG("board->new=%f;%f canon=%f;%f",
-	board->new_x,board->new_y,
-	board->canon_x,board->canon_y);
   return board;
 }
 
@@ -254,7 +251,6 @@
 /************************** countdown functions ***************************/
 
 static void start_countdown( board_t board ) {
-  warn("Set count to %d",board->ruleset->max_fire_delay);
   board->count = board->ruleset->max_fire_delay;
   board->countdown_state = ACTIVE;
 }
@@ -432,7 +428,6 @@
       if (( board->launch_requested )&&
 	  ( board->state == board_state_ready_to_fire )&&( transition_allowed )) {
 	/* launch bubble */
-	DEBUG("Launch the bubble %p",bubble);
 	bubble_set_state( bubble, LAUNCHED, MEDIUM_LAYER, 0);
 	bubble->vx = board->vx[ board->canon_angle + CANON_ANGLE_MAX ];
 	bubble->vy = board->vy[ board->canon_angle + CANON_ANGLE_MAX ];
@@ -868,7 +863,6 @@
 void board_cmd(board_t board, enum e_board_cmd cmd) {
    switch(cmd) {
     case canon_left:
-      DEBUG("left %f", board->canon_speed);
       if (board->canon_direction == canon_to_left)
 	board->canon_speed += MIN( (5-board->canon_speed)/10, 0.2 );
       else
@@ -877,7 +871,6 @@
       break;
       
     case canon_right:
-      DEBUG("right %f", board->canon_speed);
       if (board->canon_direction == canon_to_right)
 	board->canon_speed += MIN( (5-board->canon_speed)/10, 0.2 );
       else
@@ -891,7 +884,6 @@
       break;
       
     case canon_fire:
-      warn("Fire");
       board->launch_requested = 1;
       board_cmd(board, canon_stop);
       break;

Index: board.h
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/board.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- board.h	14 Sep 2006 08:48:19 -0000	1.4
+++ board.h	14 Sep 2006 09:53:02 -0000	1.5
@@ -13,7 +13,7 @@
   int single;         /* single player? (ie, new bubble color must be already there */
 } ruleset_t;
 
-#define DEFAULT_RULE_SET { 1, COUNTDOWN, 1, 1 }
+#define DEFAULT_RULE_SET { 1, 15*1000, 1, 1 }
 
 enum e_board_state {
   board_state_waiting_for_canon,