X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=deeaeceee017785696c9e02c56b08726fa57e315;hb=3d62d96807ebbdc6dd7d7096e07444a3b1426a92;hp=f76bb97a59238a0ebe7a4a43a9429b6b38827acd;hpb=d5b72f7a44d69439a539e92c9c337646954af4ab;p=kub

diff --git a/kub.c b/kub.c
index f76bb97..deeaece 100644
--- 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,17 +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;		//Sort lowest to highest
-}
-
-static int int_compare(int *x, int *y)
-{
-    return y - x;	//Sort highest to lowest
+    const int *x = vx, *y = vy;
+    return *y - *x;	//Sort highest to lowest
 }
 
 /*
@@ -528,34 +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++)
-    {
-	tile_set_x_y(&game->players[player].hand.tiles[i],
-		     ((window_width / game->players[player].hand.num_tiles)) * i,
-		     (window_height - TILE_HEIGHT - 6) );
+    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++)
+    {
+	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)
 {
+    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)
@@ -629,39 +634,49 @@ static gboolean on_configure_event (GtkWidget *widget, GdkEventConfigure *event,
 */
 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);
+    else if (event->keyval == 65293)		//HIT ENTER
     {
 	save_state(game);
-	printf ("\tEnd of player %d's turn\n", game->current_player + 1);
-	if (game->current_player == game->num_players - 1)
+	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 == 65474)		//HIT "F5"
+    else if (event->keyval == 65474)		//HIT "F5"
     {
 	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;
 }
 
@@ -669,7 +684,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++)
@@ -686,15 +701,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;
         }
@@ -841,7 +854,7 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
 	    game->board.num_groups++;
 	}
 	board_print(game);
-	printf("\nBut is the board valid?\t\t%s\n", board_valid(&game->board));
+	printf("\nBut is the board valid?\t\t%s\n", board_valid(&game->board) ? "yes" : "no");
     }    
     game->select_mode = 1;
 
@@ -960,7 +973,9 @@ int main(int argc, char *argv[])
 
     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];
 
     //hand_print(&game, 0); //With Zero being passed, will print hand for player 1(players[0])
     //deck_print(&game.deck);