X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=d5bf5b6ce3e29c34345617e5d0e870fb8b24c173;hb=HEAD;hp=223e4ea8e9c61ddbfb13dda4c6703b35ab1d21b3;hpb=78c8b58a75796aa9b3515157b72429dda67a92f6;p=kub

diff --git a/kub.c b/kub.c
old mode 100755
new mode 100644
index 223e4ea..d5bf5b6
--- a/kub.c
+++ b/kub.c
@@ -55,6 +55,7 @@ typedef struct tile {
     int y;
     int selected;
     int owned;
+    int in_hand;//Draw the tile in the hand, or elsewhere on the board?
 } tile_t;
 
 #define DECK_MAX_TILES 104
@@ -71,7 +72,7 @@ typedef struct tile_group {
     int num_tiles;
 } tile_group_t;
 
-#define BOARD_MAX_TILE_GROUPS (DECK_MAX_TILES / 3)
+#define BOARD_MAX_TILE_GROUPS DECK_MAX_TILES
 
 typedef struct board {
     tile_group_t groups[BOARD_MAX_TILE_GROUPS];
@@ -141,6 +142,7 @@ static void tile_init (tile_t *tile, color_t color, int number)
     tile->y = 0;
     tile->selected = 0;
     tile->owned = 0;
+    tile->in_hand = 1;
 }
 
 static void tile_set_x_y (tile_t *tile, int x, int y)
@@ -228,12 +230,13 @@ static int tile_compare(const void *one, const void *two)
 {
     const tile_t *tile_one = one;
     const tile_t *tile_two = two;
-    return tile_one->number - tile_two->number;
+    return tile_one->number - tile_two->number;	//Sort lowest to highest
 }
 
-static int tile_compare_1(tile_t *tile_one, tile_t *tile_two)
+static int int_compare(const void *vx, const void *vy)
 {
-    return tile_one->number - tile_two->number;
+    const int *x = vx, *y = vy;
+    return *y - *x;	//Sort highest to lowest
 }
 
 /*
@@ -367,6 +370,21 @@ static int tile_group_is_set(tile_group_t *tile_group)
     return 1;
 }
 
+static gboolean board_valid(board_t *board)
+{
+    int i;
+    gboolean valid = TRUE;
+    for (i = 0; i < board->num_groups; ++i)
+    {
+	if (!(tile_group_is_run_one(&board->groups[i])) &&
+	    !(tile_group_is_set(&board->groups[i])))
+	{
+	    valid = FALSE;
+	}
+    }
+    return valid;
+}
+
 static void deck_deal(game_t *game, deck_t *deck)
 {
     tile_t temp;
@@ -468,6 +486,34 @@ static void deck_draw(game_t *game, cairo_t *cr, GdkRegion *region)
     }
 }
 
+static void board_draw(game_t *game, cairo_t *cr, GdkRegion *region)
+{
+    int i, j;
+    for (i = 0; i < game->board.num_groups; i++)
+    {
+	for (j = 0; j < game->board.groups[i].num_tiles; j++)
+	{
+	    tile_draw(game, &game->board.groups[i].tiles[j], cr, region);
+	    //tile_print(game->board.groups[i].tiles[j]);
+	}
+    }
+}
+
+static void board_print(game_t *game)
+{
+    int i, j;
+    printf("\tBegin board print\n");
+    for (i = 0; i < game->board.num_groups; i++)
+    {
+	printf("\tBegin group %d\n", i);
+	for (j = 0; j < game->board.groups[i].num_tiles; j++)
+	{
+	    tile_print(game->board.groups[i].tiles[j]);
+	}
+	printf("\tEnd group %d\n", i);
+    }
+}
+
 static void hand_print(game_t *game, int player)
 {
     int i;
@@ -480,35 +526,41 @@ static void hand_print(game_t *game, int player)
 static void hand_draw(game_t *game, int player, cairo_t *cr, GdkRegion *region, GtkWidget *widget)
 {
     int i;
-    int window_width = widget->allocation.width;
-//    int window_width = GAME_WINDOW_DEFAULT_WIDTH;
-    int window_height = widget->allocation.height;
-//    int window_height = GAME_WINDOW_DEFAULT_HEIGHT;
-    for (i = 0; i < game->players[player].hand.num_tiles; i++)
+    int width = widget->allocation.width;
+//    int width = GAME_WINDOW_DEFAULT_WIDTH;
+    int height = widget->allocation.height;
+//    int height = GAME_WINDOW_DEFAULT_HEIGHT;
+    int num_tiles = game->players[player].hand.num_tiles;
+    for (i = 0; i < num_tiles; i++)
     {
-	tile_set_x_y(&game->players[player].hand.tiles[i],
-		     ((window_width / game->players[player].hand.num_tiles)) * i,
-		     (window_height - TILE_HEIGHT - 6) );
+	if (game->players[player].hand.tiles[i].in_hand)
+	    tile_set_x_y(&game->players[player].hand.tiles[i],
+			 ((width/num_tiles)) * i, (height - TILE_HEIGHT - 6) );
     }
     for (i = 0; i < game->players[player].hand.num_tiles; i++)
     {
-	tile_draw(game, &game->players[player].hand.tiles[i], cr, region);
+//	if (game->players[player].hand.tiles[i].in_hand)
+	    tile_draw(game, &game->players[player].hand.tiles[i], cr, region);
     }
 }
 
 static void save_state(game_t *game)
 {
-    //DO STUFF HERE
+    printf("State saved\n");
     game->state.board = game->board;
     game->state.deck = game->deck;
-    //game->state.players = game->players;
+    int i;
+    for (i=0; i < game->num_players; i++)
+	game->state.players[i] = game->players[i];
 }
 
 static void restore_state(game_t *game)
 {
     game->board = game->state.board;
     game->deck = game->state.deck;
-    //game->players = game->state.players;
+    int i;
+    for (i=0; i < game->num_players; i++)
+	game->players[i] = game->state.players[i];
 }
 
 static void game_init(game_t *game)
@@ -557,55 +609,78 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_
     cr = gdk_cairo_create (widget->window);
 
     deck_draw(game, cr, event->region);
+    board_draw(game, cr, event->region);
 
     if (game->selection_box.visible)
 	selection_box_draw(&game->selection_box, cr);
 
     hand_draw(game, game->current_player, cr, event->region, widget);
-//    hand_draw(game, 0, cr, event->region);
+    //hand_draw(game, 0, cr, event->region);
 
     cairo_destroy (cr);
 
     return TRUE;
 }
+/*
+static gboolean on_configure_event (GtkWidget *widget, GdkEventConfigure *event, game_t *game)
+{
+    cairo_t *cr;
+
+    cr = gdk_cairo_create (event->window);
 
+    hand_draw(game, game->current_player, cr, event->window, widget);
+//    gtk_widget_queue_draw(widget);
+}
+*/
 static gboolean on_key_press_event (GtkWidget *widget, GdkEventKey *event, game_t *game)
 {
+    player_t *player = &game->players[game->current_player];
     cairo_t *cr;
-
     cr = gdk_cairo_create (widget->window);
-
     printf ("You pressed key %d\n", event->keyval);
 
-    if (event->keyval == 65293)		//HIT ENTER
+    if (event->keyval == 100)		//HIT "d"
     {
+	//Draw(take) top tile from deck and put in hand
+	if (game->deck.num_tiles > 0)
+	{
+	    tile_t top_tile = game->deck.tiles[game->deck.num_tiles-1];
+	    game->deck.num_tiles--;
+	    player->hand.tiles[player->hand.num_tiles] = top_tile;
+	    player->hand.tiles[player->hand.num_tiles].owned=1;
+	    player->hand.num_tiles++;
+	    printf("Tile added to hand\n");
+	    gtk_widget_queue_draw(widget);
+	}
+    }
+    else if (event->keyval == 115)		//HIT "s"
 	save_state(game);
-	printf ("\tEnd of player %d's turn\n", game->current_player + 1);
-	if (game->current_player == game->num_players - 1)
+    else if (event->keyval == 65293)		//HIT ENTER
+    {
+	player_t *player = &game->players[game->current_player];
+	int i;
+	for (i = 0; i < player->hand.num_tiles; i++)
+	    player->hand.tiles[i].in_hand = 1;
+	save_state(game);
+	printf ("\tEnd of player %d's turn\n", game->current_player+1);
+	if (game->current_player == game->num_players-1)
 	    game->current_player = 0;
 	else
 	    game->current_player += 1;
 	gtk_widget_queue_draw(widget);
     }
-
-    if (event->keyval == 65307)		//HIT ESCAPE
+    else if (event->keyval == 65307)		//HIT ESCAPE
     {
 	restore_state(game);
 	printf ("\tChanges Reverted\n");
 	gtk_widget_queue_draw(widget);
     }
-
-    if (event->keyval == 112)		//HIT "P"
+    else if (event->keyval == 65474)		//HIT "F5"
     {
-	deck_print(&game->deck);
-	//hand_draw(game, game->current_player, cr, event->region, widget);
-	//on_expose_event(widget, event, game);
+	gtk_widget_queue_draw(widget);
     }
-
-
-    if (event->keyval == 65505 || event->keyval == 65506)
+    else if (event->keyval == 65505 || event->keyval == 65506)
 	game->drag_group_mode = 1;
-
     return TRUE;
 }
 
@@ -613,7 +688,7 @@ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event,
 {
     int i, tile_x, tile_y;
     tile_t *curr_tile;
-    player_t *curr_player = &game->players[0];
+    player_t *curr_player = &game->players[game->current_player];
 
     /*Handle tiles in player's hand */
     for (i = 0; i < curr_player->hand.num_tiles; i++)
@@ -630,15 +705,13 @@ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event,
 	    event->y >= tile_y && event->y <= (tile_y + TILE_HEIGHT) )
         {
 	    game->select_mode = 0;
-
 	    game->current_tile = curr_tile;
-
+	    curr_tile->in_hand = 0;
 	    if (!curr_tile->selected)
 		curr_tile->selected = 1;
 	    else
 		curr_tile->selected = 0;
 	    gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
-
 	    game->diff_x = event->x - tile_x;
 	    game->diff_y = event->y - tile_y;
         }
@@ -712,13 +785,11 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
 	box->visible = 0;	
 	gtk_widget_queue_draw_area (widget, x_min, y_min, width, height);
 
-//	tile_group_t group;
-//	group.num_tiles = 0;
-
-	tile_t* group[TILE_GROUP_MAX_TILES];
-	int num_tiles = 0;
+	tile_group_t group;
+	group.num_tiles = 0;
 
 	int i, tile_x, tile_y, tile_x2, tile_y2;
+	int tiles_to_remove[game->deck.num_tiles];
 	for (i = 0; i < game->deck.num_tiles; i++)
         {
 	    tile_x = game->deck.tiles[i].x;
@@ -749,46 +820,45 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
 		/*or bottom edge of tile selected*/
 		(x_min >= tile_x && x_min <= tile_x2 &&
 		 y_min >= tile_y && y_min <= tile_y) )
-            {		
-//		group.tiles[group.num_tiles] = game->deck.tiles[i];
-//		group.num_tiles++;
+            {
+		tiles_to_remove[group.num_tiles] = i;
 
-		group[num_tiles] = &game->deck.tiles[i];
-		num_tiles++;
+		group.tiles[group.num_tiles] = game->deck.tiles[i];
+		group.num_tiles++;
             }
         }
-	//printf("is run %d\n", tile_group_is_run_one(&group) );
-	//printf("is set %d\n", tile_group_is_set(&group) );
+	printf("is run %d\n", tile_group_is_run_one(&group) );
+	printf("is set %d\n", tile_group_is_set(&group) );
 
-//	int matching_y = y_min;
-	
-//	for (i = 0; i < group.num_tiles; i++)
+	qsort (tiles_to_remove, group.num_tiles, sizeof (int), int_compare);
 
-	for (i = 0; i < num_tiles; i++)
+	for (i = 0; i < group.num_tiles; i++)
 	{
-//	    tile_print(group.tiles[i]);
-	    gtk_widget_queue_draw_area (widget, group[i]->x - 1 , group[i]->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
-	    group[i]->x = x_min + (i * (TILE_WIDTH));
-	    group[i]->y = y_min;
-	    gtk_widget_queue_draw_area (widget, group[i]->x - 1 , group[i]->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+	    tile_print(group.tiles[i]);
+	    gtk_widget_queue_draw_area (widget, group.tiles[i].x - 1,
+					group.tiles[i].y - 1, TILE_WIDTH + 1,
+					TILE_HEIGHT + 2);
+
+	    group.tiles[i].x = x_min + (i * (TILE_WIDTH));
+	    group.tiles[i].y = y_min;
+
+	    gtk_widget_queue_draw_area (widget, group.tiles[i].x - 1,
+					group.tiles[i].y - 1, TILE_WIDTH + 1,
+					TILE_HEIGHT + 2);
+
+	    //Remove tile from deck
+	    if (tiles_to_remove[i] != game->deck.num_tiles - 1)
+		game->deck.tiles[tiles_to_remove[i]] = game->deck.tiles[game->deck.num_tiles-1];
+	    game->deck.num_tiles--;
 	}    
-/*	int j;
-	int new_x = 0;
-	for (i = 0; i < group.num_tiles; i++)
+
+	if (group.num_tiles > 0)
 	{
-	    for (j = 0; j < game->deck.num_tiles; j++)
-	    {
-		if (group.tiles[i].x == game->deck.tiles[j].x &&
-		    group.tiles[i].y == game->deck.tiles[j].y)
-		{
-		    new_x = x_min + (i * (TILE_WIDTH));
-		    gtk_widget_queue_draw_area (widget, game->deck.tiles[j].x - 1 , game->deck.tiles[j].y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
-		    game->deck.tiles[j].x = new_x;
-		    game->deck.tiles[j].y = matching_y;
-		    gtk_widget_queue_draw_area (widget, new_x - 1 , matching_y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
-		}
-	    }
-	}*/
+	    game->board.groups[game->board.num_groups] = group;
+	    game->board.num_groups++;
+	}
+	board_print(game);
+	printf("\nBut is the board valid?\t\t%s\n", board_valid(&game->board) ? "yes" : "no");
     }    
     game->select_mode = 1;
 
@@ -904,6 +974,13 @@ int main(int argc, char *argv[])
     deck_print(&game.deck);
     deck_spread(&game.deck);
     deck_deal(&game, &game.deck);
+
+    game.state.board = game.board;
+    game.state.deck = game.deck;
+    int i;
+    for (i=0; i < game.num_players; i++)
+	game.state.players[i] = game.players[i];
+
     //hand_print(&game, 0); //With Zero being passed, will print hand for player 1(players[0])
     //deck_print(&game.deck);
 
@@ -924,6 +1001,8 @@ int main(int argc, char *argv[])
 		      G_CALLBACK (gtk_main_quit), NULL);
     g_signal_connect (G_OBJECT (window), "expose_event",
 		      G_CALLBACK (on_expose_event), &game);
+//    g_signal_connect (G_OBJECT (window), "configure_event",
+//		      G_CALLBACK (on_configure_event), &game);
     g_signal_connect (G_OBJECT (window), "key_press_event",
 		      G_CALLBACK (on_key_press_event), &game);
     g_signal_connect (G_OBJECT (window), "button_press_event",