X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=d21109bcb80399761bad17ad9c44e3eeb0b166a4;hb=76bfec440d3ab46fc6fc30a2939d5ee2b5f1afb4;hp=f4a57887caa7e78eddbe1a7a65b743d6c0683ad1;hpb=8089441bdd45e81e838ecef4110195426186b57e;p=kub diff --git a/kub.c b/kub.c old mode 100755 new mode 100644 index f4a5788..d21109b --- a/kub.c +++ b/kub.c @@ -90,16 +90,24 @@ typedef struct selection_box { #define GAME_WINDOW_DEFAULT_WIDTH 800 #define GAME_WINDOW_DEFAULT_HEIGHT 600 +typedef struct state { + player_t players[GAME_MAX_PLAYERS]; + board_t board; + deck_t deck; +} state_t; + typedef struct game { player_t players[GAME_MAX_PLAYERS]; int num_players; board_t board; deck_t deck; selection_box_t selection_box; + state_t state; RsvgHandle *blanktile; RsvgHandle *selectedtile; RsvgHandle *ownedtile; + int current_player; tile_t *current_tile; // int current_tile; int select_mode; @@ -220,8 +228,21 @@ 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 int_compare(const void *vx, const void *vy) +{ + const int *x = vx, *y = vy; + return *y - *x; //Sort highest to lowest +} + +/* +static int tile_in_box(game_t *game, tile_t *tile) +{ + } +*/ static int tile_group_is_run_one(tile_group_t *tile_group) { @@ -347,6 +368,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; @@ -448,6 +484,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; @@ -457,16 +521,18 @@ static void hand_print(game_t *game, int player) } } -static void hand_draw(game_t *game, int player, cairo_t *cr, GdkRegion *region) +static void hand_draw(game_t *game, int player, cairo_t *cr, GdkRegion *region, GtkWidget *widget) { int i; - int gwdw = GAME_WINDOW_DEFAULT_WIDTH; - int gwdh = 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], - ((gwdw / game->players[player].hand.num_tiles)) * i, - (gwdh - TILE_HEIGHT - 6) ); + ((width/num_tiles)) * i, (height - TILE_HEIGHT - 6) ); } for (i = 0; i < game->players[player].hand.num_tiles; i++) { @@ -474,6 +540,20 @@ static void hand_draw(game_t *game, int player, cairo_t *cr, GdkRegion *region) } } +static void save_state(game_t *game) +{ + game->state.board = game->board; + game->state.deck = game->deck; + //game->state.players = game->players; +} + +static void restore_state(game_t *game) +{ + game->board = game->state.board; + game->deck = game->state.deck; + //game->players = game->state.players; +} + static void game_init(game_t *game) { int i; @@ -486,6 +566,7 @@ static void game_init(game_t *game) player_init(&game->players[i]); game->num_players += 1; } + game->current_player = 0; selection_box_init(&game->selection_box); board_init(&game->board); @@ -519,23 +600,71 @@ 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, 0, cr, event->region); + hand_draw(game, game->current_player, cr, event->region, widget); + //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 == 65505 || event->keyval == 65506) - game->drag_group_mode = 1; + 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++; + gtk_widget_queue_draw(widget); + } + } + 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) + game->current_player = 0; + else + game->current_player += 1; + gtk_widget_queue_draw(widget); + } + else if (event->keyval == 65307) //HIT ESCAPE + { + restore_state(game); + printf ("\tChanges Reverted\n"); + gtk_widget_queue_draw(widget); + } + else if (event->keyval == 65474) //HIT "F5" + { + gtk_widget_queue_draw(widget); + } + else if (event->keyval == 65505 || event->keyval == 65506) + game->drag_group_mode = 1; return TRUE; } @@ -560,15 +689,12 @@ 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; - 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; } @@ -642,13 +768,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; @@ -664,7 +788,7 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even /*or bottom-left corner*/ (tile_x >= x_min && tile_x <= x_max && tile_y2 >= y_min && tile_y2 <= y_max) || - /*or top-right corner of tile selected*/ + /*or top-right corner*/ (tile_x2 >= x_min && tile_x2 <= x_max && tile_y >= y_min && tile_y <= y_max) || /*or left edge*/ @@ -676,48 +800,48 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even /*or right edge*/ (y_min >= tile_y && y_min <= tile_y2 && x_min >= tile_x && x_min <= tile_x2) || - /*or bottom edge*/ + /*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++) - for (i = 0; i < num_tiles; i++) + qsort (tiles_to_remove, group.num_tiles, sizeof (int), int_compare); + + 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; @@ -752,11 +876,6 @@ static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event for (i = 0; i < game->deck.num_tiles; i++) { curr_tile = &game->deck.tiles[i]; - if (curr_tile->selected) - { - curr_tile->selected = 0; - gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2); - } tile_x = game->deck.tiles[i].x; tile_y = game->deck.tiles[i].y; @@ -771,7 +890,7 @@ static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event /*or bottom-left corner*/ (tile_x >= x_min && tile_x <= x_max && tile_y2 >= y_min && tile_y2 <= y_max) || - /*or top-right corner of tile selected*/ + /*or top-right corner*/ (tile_x2 >= x_min && tile_x2 <= x_max && tile_y >= y_min && tile_y <= y_max) || /*or left edge*/ @@ -783,19 +902,22 @@ static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event /*or right edge*/ (y_min >= tile_y && y_min <= tile_y2 && x_min >= tile_x && x_min <= tile_x2) || - /*or bottom edge*/ + /*or bottom edge of tile selected*/ (x_min >= tile_x && x_min <= tile_x2 && y_min >= tile_y && y_min <= tile_y) ) { curr_tile->selected = 1; gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2); } -/* + 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); - }*/ + if (curr_tile->selected) + { + curr_tile->selected = 0; + gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2); + } + } } } else @@ -835,6 +957,11 @@ 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; + //game->state.players = game.players; + //hand_print(&game, 0); //With Zero being passed, will print hand for player 1(players[0]) //deck_print(&game.deck); @@ -855,6 +982,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",