RsvgHandle *selectedtile;
RsvgHandle *ownedtile;
- int current_tile;
+ tile_t *current_tile;
+// int current_tile;
int select_mode;
+ int drag_group_mode;
int diff_x, diff_y;
int click_x, click_y;
int release_x, release_y; /*Currently unused*/
if (error)
FATAL_ERROR (error->message);
- game->current_tile = game->deck.num_tiles - 1;
+// game->current_tile = game->deck.num_tiles - 1;
+ game->current_tile = &game->deck.tiles[0];
game->select_mode = 1;
+ game->drag_group_mode = 0;
game->diff_x = game->diff_y = 0;
}
static gboolean on_key_press_event (GtkWidget *widget, GdkEventKey *event, game_t *game)
{
printf ("You pressed key %d\n", event->keyval);
+ if (event->keyval == 65505 || event->keyval == 65506)
+ game->drag_group_mode = 1;
return TRUE;
}
static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
{
int i, tile_x, tile_y;
- tile_t *curr_tile = &game->deck.tiles[game->current_tile];
+ tile_t *curr_tile;
+ player_t *curr_player = &game->players[0];
+ /*Handle tiles in player's hand */
+ for (i = 0; i < curr_player->hand.num_tiles; i++)
+ {
+ curr_tile = &curr_player->hand.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 = curr_player->hand.tiles[i].x;
+ tile_y = curr_player->hand.tiles[i].y;
+ if (event->x >= tile_x && event->x <= (tile_x + TILE_WIDTH) &&
+ 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;
+ }
+ }
+
+ /*Handle tiles in deck */
for (i = 0; i < game->deck.num_tiles; i++)
{
curr_tile = &game->deck.tiles[i];
{
game->select_mode = 0;
- game->current_tile = i;
- curr_tile = &game->deck.tiles[game->current_tile];
+// game->current_tile = i;
+ game->current_tile = curr_tile;
+
+//delete_this? curr_tile = &game->deck.tiles[game->current_tile];
if (!curr_tile->selected)
curr_tile->selected = 1;
else
}
if (game->select_mode)
{
- game->deck.tiles[game->current_tile].selected = 0;
+// game->deck.tiles[game->current_tile].selected = 0;
+ game->current_tile->selected = 0;
gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
game->selection_box.visible = 1;
- /*These next two lines are likely to be replaced by...*/
+ /*These next two lines appear to be dead
game->click_x = event->x;
- game->click_y = event->y;
- /*...these two lines*/
+ game->click_y = event->y;*/
+
game->selection_box.x1 = event->x;
game->selection_box.x2 = event->x;
game->selection_box.y1 = event->y;
box->visible = 0;
gtk_widget_queue_draw_area (widget, x_min, y_min, width, height);
- tile_group_t group;
- group.num_tiles = 0;
+// tile_group_t group;
+// group.num_tiles = 0;
+
+ tile_t* group[TILE_GROUP_MAX_TILES];
+ int num_tiles = 0;
int i, tile_x, tile_y, tile_x2, tile_y2;
for (i = 0; i < game->deck.num_tiles; i++)
/*or bottom edge*/
(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++;
+ {
+// group.tiles[group.num_tiles] = game->deck.tiles[i];
+// group.num_tiles++;
+
+ group[num_tiles] = &game->deck.tiles[i];;
+ 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++)
+ {
+// 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);
+ }
+/* int j;
+ int new_x = 0;
for (i = 0; i < group.num_tiles; i++)
- tile_print(group.tiles[i]);
+ {
+ 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->select_mode = 1;
}
else
{
+ if (game->drag_group_mode)
+ {
+
+ }
+
tile_t *tile;
- tile = &game->deck.tiles[game->current_tile];
+// tile = &game->deck.tiles[game->current_tile];
+ tile = game->current_tile;
/* First, invalidate the region where the tile currently is. */
gtk_widget_queue_draw_area (widget, tile->x - 1, tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);