Implement placement phase of game

[dvonn] / dvonn.c

diff --git a/dvonn.c b/dvonn.c
index 616ebf35e7ee6f69a3dabb5c4a5fc421481a78a7..d4099d9984505656984668d3a7d9c72d45c41cce 100644 (file)
--- a/dvonn.c
+++ b/dvonn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Carl Worth
+ * Copyright (C) 2009 Carl Worth
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,15 +34,15 @@ typedef struct {
     int cell_size;
 } layout_t;
 
-typedef struct _loa_game loa_game_t;
+typedef struct _dvonn_game dvonn_game_t;
 
 typedef struct {
-    loa_game_t *game;
+    dvonn_game_t *game;
     GtkWidget *window;
     layout_t layout;
 } view_t;
 
-struct _loa_game {
+struct _dvonn_game {
     view_t **views;
     int num_views;
 
@@ -72,7 +72,7 @@ on_delete_event_quit (GtkWidget  *widget,
 
 /* XXX: This really should have an interest rectangle. */
 static void
-loa_game_update_windows (loa_game_t *game)
+dvonn_game_update_windows (dvonn_game_t *game)
 {
     int i;
 
@@ -144,7 +144,7 @@ on_button_press_event (GtkWidget    *widget,
 {
     view_t *view = user_data;
     layout_t *layout = &view->layout;
-    loa_game_t *game = view->game;
+    dvonn_game_t *game = view->game;
     int x, y;
     char *error;
 
@@ -163,30 +163,32 @@ on_button_press_event (GtkWidget  *widget,
     if (game->board.cells[x][y].type == DVONN_CELL_INVALID)
        return TRUE;
 
-    if (game->board.cells[x][y].type == DVONN_CELL_EMPTY)
-       game->board.cells[x][y].type = DVONN_CELL_WHITE;
-    else if (game->board.cells[x][y].type == DVONN_CELL_WHITE)
-       game->board.cells[x][y].type = DVONN_CELL_EMPTY;
+    if (game->board.phase == DVONN_PHASE_PLACEMENT) {
+       if (dvonn_board_place (&game->board, x, y, &error))
+           dvonn_game_update_windows (game);
+       else
+           printf ("Illegal placement %c%d: %s\n",
+                   'a' + x,
+                   y + 1,
+                   error);
 
-    loa_game_update_windows (game);
-
-    return TRUE;
+       return TRUE;
+    }
 
     if (! game->has_selected) {
        if (game->board.cells[x][y].type == game->board.player) {
            game->has_selected = TRUE;
            game->selected_x = x;
            game->selected_y = y;
-           loa_game_update_windows (game);
+           dvonn_game_update_windows (game);
        }
        return TRUE;
     }
 
-    if (x == game->selected_x &&
-       y == game->selected_y)
+    if (x == game->selected_x && y == game->selected_y)
     {
        game->has_selected = FALSE;
-       loa_game_update_windows (game);
+       dvonn_game_update_windows (game);
        return TRUE;
     }
        
@@ -195,14 +197,14 @@ on_button_press_event (GtkWidget  *widget,
                          x, y, &error))
     {
        game->has_selected = FALSE;
-       loa_game_update_windows (game);
+       dvonn_game_update_windows (game);
        return TRUE;
     } else {
        printf ("Illegal move %c%d%c%d: %s\n",
                'a' + game->selected_x,
-               DVONN_BOARD_Y_SIZE - game->selected_y,
+               game->selected_y + 1,
                'a' + x,
-               DVONN_BOARD_Y_SIZE - y,
+               y + 1,
                error);
     }
 
@@ -224,7 +226,7 @@ on_expose_event_draw (GtkWidget             *widget,
 {
     view_t *view = user_data;
     layout_t *layout = &view->layout;
-    loa_game_t *game = view->game;
+    dvonn_game_t *game = view->game;
     cairo_t *cr;
     int x, y;
 
@@ -270,10 +272,21 @@ on_expose_event_draw (GtkWidget           *widget,
                            x + (y - DVONN_BOARD_Y_SIZE/2) / 2.0,
                            M_SQRT1_2 * y);
            ring_path (cr);
-           if (cell.type == DVONN_CELL_WHITE)
+           switch (cell.type) {
+           case DVONN_CELL_WHITE:
                cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
-           else
+               break;
+           case DVONN_CELL_BLACK:
+               cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */
+               break;
+           case DVONN_CELL_RED:
+               cairo_set_source_rgb (cr, 0.8, 0.2, 0.2); /* red */
+               break;
+           case DVONN_CELL_EMPTY:
+           default:
                cairo_set_source_rgba (cr, 0.0, 0.0, 0.2, 0.1);
+               break;
+           }
            cairo_fill (cr);
 
            cairo_restore (cr);
@@ -286,7 +299,7 @@ on_expose_event_draw (GtkWidget             *widget,
 }
 
 static void
-loa_game_init (loa_game_t *game)
+dvonn_game_init (dvonn_game_t *game)
 {
     game->views = NULL;
     game->num_views = 0;
@@ -297,7 +310,7 @@ loa_game_init (loa_game_t *game)
 }
 
 static void
-view_init (view_t *view, loa_game_t *game, GtkWidget *window)
+view_init (view_t *view, dvonn_game_t *game, GtkWidget *window)
 {
     view->game = game;
     view->window = window;
@@ -307,7 +320,7 @@ view_init (view_t *view, loa_game_t *game, GtkWidget *window)
 }
 
 static void
-loa_game_create_view (loa_game_t *game)
+dvonn_game_create_view (dvonn_game_t *game)
 {
     view_t *view;
     GtkWidget *window;
@@ -354,15 +367,15 @@ loa_game_create_view (loa_game_t *game)
 int
 main (int argc, char *argv[])
 {
-    loa_game_t game;
+    dvonn_game_t game;
 
-    loa_game_init (&game);
+    dvonn_game_init (&game);
 
     gtk_init (&argc, &argv);
 
     /* Create two views of the game (one for each player) */
-    loa_game_create_view (&game);
-    loa_game_create_view (&game);
+    dvonn_game_create_view (&game);
+    dvonn_game_create_view (&game);
     
     gtk_main ();