Remove vestiges of loa in favor of dvonn

A very minimal shell of this program began as copy-and-paste from
my loa game (of the same license). Finish fixing any remaining
leftovers from that copy-and-paste.

diff --git a/dvonn.c b/dvonn.c
index 616ebf35e7ee6f69a3dabb5c4a5fc421481a78a7..e19ea437e435ee262c3a1407641e095c6888e528 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;
 
@@ -168,7 +168,7 @@ on_button_press_event (GtkWidget    *widget,
     else if (game->board.cells[x][y].type == DVONN_CELL_WHITE)
        game->board.cells[x][y].type = DVONN_CELL_EMPTY;
 
-    loa_game_update_windows (game);
+    dvonn_game_update_windows (game);
 
     return TRUE;
 
@@ -177,7 +177,7 @@ on_button_press_event (GtkWidget    *widget,
            game->has_selected = TRUE;
            game->selected_x = x;
            game->selected_y = y;
-           loa_game_update_windows (game);
+           dvonn_game_update_windows (game);
        }
        return TRUE;
     }
@@ -186,7 +186,7 @@ on_button_press_event (GtkWidget    *widget,
        y == game->selected_y)
     {
        game->has_selected = FALSE;
-       loa_game_update_windows (game);
+       dvonn_game_update_windows (game);
        return TRUE;
     }
        
@@ -195,7 +195,7 @@ 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",
@@ -224,7 +224,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;
 
@@ -286,7 +286,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 +297,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 +307,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 +354,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 ();