[gnome-games/gnibbles-clutter] Fixed coding style to follow the GNU coding style (removed tabs etc)



commit 74673a7ec07b26b4d3c3be270835874b3be5cc08
Author: Guillaume Beland <guillaume beland gmail com>
Date:   Fri Aug 21 13:10:07 2009 -0400

    Fixed coding style to follow the GNU coding style (removed tabs etc)

 gnibbles/board.c       |   10 +++---
 gnibbles/boni.c        |   40 +++++++++++-----------
 gnibbles/bonus.c       |    2 +-
 gnibbles/ggz-network.c |   40 +++++++++++-----------
 gnibbles/gnibbles.c    |   38 +++++++++++-----------
 gnibbles/gnibbles.h    |    2 +-
 gnibbles/main.c        |   83 ++++++++++++++++++++++++-----------------------
 gnibbles/main.h        |    4 +-
 gnibbles/preferences.c |   83 +++++++++++++++++++++++-------------------------
 gnibbles/properties.c  |   49 ++++++++++++++++++----------
 gnibbles/scoreboard.c  |   11 +++---
 gnibbles/scoreboard.h  |    2 +-
 gnibbles/server.c      |   24 +++++++-------
 gnibbles/warp.c        |   16 +++++-----
 gnibbles/warpmanager.c |   64 ++++++++++++++++++------------------
 gnibbles/worm.c        |   19 ++++++-----
 16 files changed, 249 insertions(+), 238 deletions(-)
---
diff --git a/gnibbles/board.c b/gnibbles/board.c
index e898cdf..040a767 100644
--- a/gnibbles/board.c
+++ b/gnibbles/board.c
@@ -393,13 +393,13 @@ gnibbles_board_level_add_bonus (GnibblesBoard *board, gint regular)
       x = rand () % (BOARDWIDTH - 1);
       y = rand () % (BOARDHEIGHT - 1);
       if (board->walls[x][y] != EMPTYCHAR)
-	      good = 0;
+        good = 0;
       if (board->walls[x + 1][y] != EMPTYCHAR)
-	      good = 0;
+        good = 0;
       if (board->walls[x][y + 1] != EMPTYCHAR)
-	      good = 0;
+        good = 0;
       if (board->walls[x + 1][y + 1] != EMPTYCHAR)
-	      good = 0;
+        good = 0;
     }
     gnibbles_boni_add_bonus (boni, x, y, BONUSREGULAR, 0, 300);
   } else if (boni->missed <= MAXMISSED) {
@@ -442,7 +442,7 @@ gnibbles_board_level_add_bonus (GnibblesBoard *board, gint regular)
     case 19:
     case 20:
       if (properties->numworms > 1)
-	      gnibbles_boni_add_bonus (boni, x, y, BONUSREVERSE, good, 150);
+        gnibbles_boni_add_bonus (boni, x, y, BONUSREVERSE, good, 150);
       break;
     }
   }
diff --git a/gnibbles/boni.c b/gnibbles/boni.c
index c896bce..a537b3c 100644
--- a/gnibbles/boni.c
+++ b/gnibbles/boni.c
@@ -75,8 +75,8 @@ gnibbles_boni_add_bonus (GnibblesBoni * boni, gint t_x, gint t_y,
   if (boni->numbonuses == MAXBONUSES)
     return;
   boni->bonuses[boni->numbonuses] = gnibbles_bonus_new (t_x, t_y,
-							                                          t_type, t_fake,
-							                                          t_countdown);
+                                                        t_type, t_fake,
+                                                        t_countdown);
   board->walls[t_x][t_y] = (gchar) t_type + 'A';
   board->walls[t_x + 1][t_y] = (gchar) t_type + 'A';
   board->walls[t_x][t_y + 1] = (gchar) t_type + 'A';
@@ -121,12 +121,12 @@ gnibbles_boni_fake (GnibblesBoni * boni, gint x, gint y)
 
   for (i = 0; i < boni->numbonuses; i++) {
     if ((x == boni->bonuses[i]->x &&
-	      y == boni->bonuses[i]->y) ||
-    	  (x == boni->bonuses[i]->x + 1 &&
-	      y == boni->bonuses[i]->y) ||
-	      (x == boni->bonuses[i]->x &&
-	      y == boni->bonuses[i]->y + 1) ||
-	      (x == boni->bonuses[i]->x + 1 && y == boni->bonuses[i]->y + 1)) {
+        y == boni->bonuses[i]->y) ||
+        (x == boni->bonuses[i]->x + 1 &&
+        y == boni->bonuses[i]->y) ||
+        (x == boni->bonuses[i]->x &&
+        y == boni->bonuses[i]->y + 1) ||
+        (x == boni->bonuses[i]->x + 1 && y == boni->bonuses[i]->y + 1)) {
       return (boni->bonuses[i]->fake);
     }
   }
@@ -146,12 +146,12 @@ gnibbles_boni_remove_bonus (GnibblesBoni * boni, gint x, gint y)
 #endif
   for (i = 0; i < boni->numbonuses; i++) {
     if ((x == boni->bonuses[i]->x &&
-	      y == boni->bonuses[i]->y) ||
-	      (x == boni->bonuses[i]->x + 1 &&
-	      y == boni->bonuses[i]->y) ||
-	      (x == boni->bonuses[i]->x &&
-	      y == boni->bonuses[i]->y + 1) ||
-	      (x == boni->bonuses[i]->x + 1 && y == boni->bonuses[i]->y + 1)) {
+        y == boni->bonuses[i]->y) ||
+        (x == boni->bonuses[i]->x + 1 &&
+        y == boni->bonuses[i]->y) ||
+        (x == boni->bonuses[i]->x &&
+        y == boni->bonuses[i]->y + 1) ||
+        (x == boni->bonuses[i]->x + 1 && y == boni->bonuses[i]->y + 1)) {
 
       board->walls[boni->bonuses[i]->x][boni->bonuses[i]->y] = EMPTYCHAR;
       board->walls[boni->bonuses[i]->x + 1][boni->bonuses[i]->y] = EMPTYCHAR;
@@ -172,12 +172,12 @@ gnibbles_boni_remove_bonus_final (GnibblesBoni * boni, gint x, gint y)
 
   for (i = 0; i < boni->numbonuses; i++) {
     if ((x == boni->bonuses[i]->x &&
-	      y == boni->bonuses[i]->y) ||
-	      (x == boni->bonuses[i]->x + 1 &&
-	      y == boni->bonuses[i]->y) ||
-	      (x == boni->bonuses[i]->x &&
-	      y == boni->bonuses[i]->y + 1) ||
-	      (x == boni->bonuses[i]->x + 1 && y == boni->bonuses[i]->y + 1)) {
+        y == boni->bonuses[i]->y) ||
+        (x == boni->bonuses[i]->x + 1 &&
+        y == boni->bonuses[i]->y) ||
+        (x == boni->bonuses[i]->x &&
+        y == boni->bonuses[i]->y + 1) ||
+        (x == boni->bonuses[i]->x + 1 && y == boni->bonuses[i]->y + 1)) {
 
       board->walls[boni->bonuses[i]->x][boni->bonuses[i]->y] = EMPTYCHAR;
       board->walls[boni->bonuses[i]->x + 1][boni->bonuses[i]->y] = EMPTYCHAR;
diff --git a/gnibbles/bonus.c b/gnibbles/bonus.c
index 626c726..6185407 100644
--- a/gnibbles/bonus.c
+++ b/gnibbles/bonus.c
@@ -70,7 +70,7 @@ animate_bonus2 (ClutterAnimation *animation, ClutterActor *actor)
 
 GnibblesBonus *
 gnibbles_bonus_new (gint t_x, gint t_y, gint t_type,
-		    gint t_fake, gint t_countdown)
+                    gint t_fake, gint t_countdown)
 {
   GnibblesBonus *tmp;
 
diff --git a/gnibbles/ggz-network.c b/gnibbles/ggz-network.c
index fb17545..ddade1c 100644
--- a/gnibbles/ggz-network.c
+++ b/gnibbles/ggz-network.c
@@ -133,29 +133,29 @@ get_players (void)
       return -1;
     if (seats[i] != GGZ_SEAT_OPEN) {
       if (ggz_read_string (fd, (char *) &names[i], 17) < 0)
-	return -1;
+        return -1;
       /*display_set_name(i, game.names[i]); */
       if (old == GGZ_SEAT_OPEN && !firsttime) {
-	tmp = g_strdup_printf (_("%s joined the game.\n"), names[i]);
-	add_chat_text (tmp);
-	g_free (tmp);
+        tmp = g_strdup_printf (_("%s joined the game.\n"), names[i]);
+        add_chat_text (tmp);
+        g_free (tmp);
       }
     } 
 
     if (seats[i] == GGZ_SEAT_ABANDONED) {
       if (i == 0) {
-	tmp =
-	  g_strdup_printf (_
-			   ("The game ended because the host %s left the game.\n"),
-			   names[i]);
-	add_chat_text (tmp);
-	g_free (tmp);
+        tmp =
+          g_strdup_printf (_
+            ("The game ended because the host %s left the game.\n"),
+            names[i]);
+        add_chat_text (tmp);
+        g_free (tmp);
       } else {
-	tmp =
-	  g_strdup_printf (_("%s left the game.\n"),
-			   names[i]);
-	add_chat_text (tmp);
-	g_free (tmp);
+        tmp =
+          g_strdup_printf (_("%s left the game.\n"),
+                           names[i]);
+                           add_chat_text (tmp);
+                           g_free (tmp);
       }
     }
   }
@@ -370,7 +370,7 @@ ggz_game_launched (void)
   end_game (TRUE);
 
   str = g_strdup_printf (_("Welcome to a network game of %s."),
-			 NETWORK_ENGINE);
+                         NETWORK_ENGINE);
   add_chat_text (str);
   add_chat_text ("\n");
   g_free (str);
@@ -405,16 +405,16 @@ on_network_game (void)
   if (ggz_initialized == FALSE) {
     ggz_initialized = TRUE;
     ggz_gtk_initialize (FALSE,
-		      ggz_connected, ggz_game_launched, ggz_closed,
-		      NETWORK_ENGINE, NETWORK_VERSION, "gnibbles.xml",
-		      "GGZ Gaming Zone");
+                        ggz_connected, ggz_game_launched, ggz_closed,
+                        NETWORK_ENGINE, NETWORK_VERSION, "gnibbles.xml",
+                        "GGZ Gaming Zone");
 
     ggzbox = ggz_gtk_create_main_area (window);
     gtk_notebook_append_page (GTK_NOTEBOOK (notebook), ggzbox, NULL);
   }
   pwent = getpwuid(getuid());
   ggz_embed_ensure_server ("GGZ Gaming Zone", "gnome.ggzgamingzone.org",
-			   5688, pwent->pw_name);
+                           5688, pwent->pw_name);
 
   gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), NETWORK_PAGE);
 }
diff --git a/gnibbles/gnibbles.c b/gnibbles/gnibbles.c
index 72b0fc7..cd2755b 100644
--- a/gnibbles/gnibbles.c
+++ b/gnibbles/gnibbles.c
@@ -93,7 +93,7 @@ gnibbles_load_pixmap_file (const gchar * pixmap, gint xsize, gint ysize)
   if (!filename) {
     char *message =
       g_strdup_printf (_("Nibbles couldn't find pixmap file:\n%s\n\n"
-			 "Please check your Nibbles installation"), pixmap);
+                       "Please check your Nibbles installation"), pixmap);
     gnibbles_error (message);
     g_free(message);
   }
@@ -150,7 +150,7 @@ gnibbles_load_pixmap (gint tilesize)
       g_object_unref (boni_pixmaps[i]);
 
     boni_pixmaps[i] = gnibbles_load_pixmap_file (bonus_files[i],
-  					                                     2 * tilesize, 2 * tilesize);
+                                                 2 * tilesize, 2 * tilesize);
   }
 
   for (i = 0; i < 11; i++) {
@@ -158,7 +158,7 @@ gnibbles_load_pixmap (gint tilesize)
       g_object_unref (wall_pixmaps[i]);
       
     wall_pixmaps[i] = gnibbles_load_pixmap_file (small_files[i],
-  	 	  		                                     2 * tilesize, 2 * tilesize);
+                                                 2 * tilesize, 2 * tilesize);
   }
 
   for (i = 0; i < 7; i++) {
@@ -188,7 +188,7 @@ gnibbles_load_logo (gint tilesize)
     g_object_unref (logo_pixmap);
   
   logo_pixmap = gnibbles_load_pixmap_file ("gnibbles-logo.svg",
-                               			       board->width * tilesize, 
+                                           board->width * tilesize, 
                                            board->height * tilesize);
 }
 
@@ -204,7 +204,7 @@ gnibbles_init ()
 
   for (i = 0; i < properties->numworms; i++) {
     gnibbles_scoreboard_register (scoreboard, worms[i], 
-	                 colorval_name (properties->wormprops[i]->color));
+                   colorval_name (properties->wormprops[i]->color));
   }
 
   for (i = 0; i < properties->numworms; i++) {
@@ -245,13 +245,13 @@ gnibbles_move_worms (void)
   for (i = 0; i < boni->numbonuses; i++) {
     if (!(boni->bonuses[i]->countdown--)) {
       if (boni->bonuses[i]->type == BONUSREGULAR && !boni->bonuses[i]->fake) {
-	      gnibbles_boni_remove_bonus (boni, 
+        gnibbles_boni_remove_bonus (boni, 
                                     boni->bonuses[i]->x, 
                                     boni->bonuses[i]->y);
-	      boni->missed++;
-	      gnibbles_board_level_add_bonus (board, 1);
+        boni->missed++;
+        gnibbles_board_level_add_bonus (board, 1);
       } else {
-	      gnibbles_boni_remove_bonus (boni, 
+        gnibbles_boni_remove_bonus (boni, 
                                     boni->bonuses[i]->x, 
                                     boni->bonuses[i]->y);
       }
@@ -283,23 +283,23 @@ gnibbles_move_worms (void)
     for (j = 0; j < properties->numworms; j++) {
       if (i != j 
           && worms[i]->xhead == worms[j]->xhead
-	        && worms[i]->yhead == worms[j]->yhead
-	        && worms[i]->lives > 0
-	        && worms[j]->lives > 0
+          && worms[i]->yhead == worms[j]->yhead
+          && worms[i]->lives > 0
+          && worms[j]->lives > 0
           && !worms[i]->stop)
-	      dead[i] = TRUE;
+        dead[i] = TRUE;
     }
   }
 
   for (i = 0; i < properties->numworms; i++) {
     if (dead[i]) {
       if (properties->numworms > 1)
-	      worms[i]->score *= .7;
+        worms[i]->score *= .7;
       if (!gnibbles_worm_lose_life (worms[i])) {
         /* One of the worms lost one life, but the round continues. */
         gnibbles_worm_reset (worms[i]);
-	      games_sound_play ("crash");
-	    }
+        games_sound_play ("crash");
+      }
     }
   }
 
@@ -376,7 +376,7 @@ gnibbles_show_scores (GtkWidget * window, gint pos)
                                             highscores, 
                                             _("Nibbles Scores"));
     games_scores_dialog_set_category_description (GAMES_SCORES_DIALOG
-	                                                (scoresdialog),
+                                                  (scoresdialog),
                                                   _("Speed:"));
   }
   if (pos > 0) {
@@ -386,11 +386,11 @@ gnibbles_show_scores (GtkWidget * window, gint pos)
                                pos == 1 ? _("Your score is the best!") :
                                _("Your score has made the top ten."));
     games_scores_dialog_set_message (GAMES_SCORES_DIALOG (scoresdialog),
-				     message);
+                                     message);
     g_free (message);
   } else {
     games_scores_dialog_set_message (GAMES_SCORES_DIALOG (scoresdialog),
-				                             NULL);
+                                     NULL);
   }
 
   gtk_dialog_run (GTK_DIALOG (scoresdialog));
diff --git a/gnibbles/gnibbles.h b/gnibbles/gnibbles.h
index 1795407..0fb41b3 100644
--- a/gnibbles/gnibbles.h
+++ b/gnibbles/gnibbles.h
@@ -69,7 +69,7 @@ void gnibbles_undraw_worms (gint data);
 void gnibbles_show_scores (GtkWidget * window, gint pos);
 void gnibbles_log_score (GtkWidget * window);
 void gnibbles_add_spec_bonus (gint t_x, gint t_y,
-			      gint t_type, gint t_fake, gint t_countdown);
+                              gint t_type, gint t_fake, gint t_countdown);
 void gnibbles_remove_spec_bonus (gint x, gint y);
 
 #endif
diff --git a/gnibbles/main.c b/gnibbles/main.c
index 1038a81..f03a4e0 100644
--- a/gnibbles/main.c
+++ b/gnibbles/main.c
@@ -174,7 +174,7 @@ window_state_cb (GtkWidget * widget, GdkEventWindowState * event)
   /* Handle fullscreen, in case something else takes us to/from fullscreen. */
   if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
     set_fullscreen_actions (event->new_window_state
-			    & GDK_WINDOW_STATE_FULLSCREEN);
+                            & GDK_WINDOW_STATE_FULLSCREEN);
     
   return FALSE;
 }
@@ -237,19 +237,20 @@ about_cb (GtkAction * action, gpointer data)
 #if GTK_CHECK_VERSION (2, 11, 0)
        "program-name", _("Nibbles"),
 #else
-			 "name", _("Nibbles"),
+       "name", _("Nibbles"),
 #endif
-			 "version", VERSION,
-			 "copyright",
-			 "Copyright \xc2\xa9 1999-2008 Sean MacIsaac, Ian Peters, Andreas Røsdal",
-			 "license", license, "comments",
-			 _("A worm game for GNOME.\n\nNibbles is a part of GNOME Games."), "authors", authors,
-			 "documenters", documenters, "translator-credits",
-			 _("translator-credits"), "logo-icon-name",
-			 "gnome-gnibbles", "website",
-			 "http://www.gnome.org/projects/gnome-games/";,
-			 "website-label", _("GNOME Games web site"),
-			 "wrap-license", TRUE, NULL);
+       "version", VERSION,
+       "copyright",
+       "Copyright \xc2\xa9 1999-2008 Sean MacIsaac, Ian Peters, Andreas Røsdal",
+       "license", license, "comments",
+       _("A worm game for GNOME.\n\nNibbles is a part of GNOME Games."), 
+       "authors", authors,
+       "documenters", documenters, "translator-credits",
+       _("translator-credits"), "logo-icon-name",
+       "gnome-gnibbles", "website",
+       "http://www.gnome.org/projects/gnome-games/";,
+       "website-label", _("GNOME Games web site"),
+       "wrap-license", TRUE, NULL);
   g_free (license);
 }
 
@@ -330,17 +331,17 @@ new_game_2_cb (GtkWidget * widget, gpointer data)
   if (!paused) {
     if (!keyboard_id)
       keyboard_id = g_signal_connect (G_OBJECT (stage),
-				                              "key-press-event",
-                        				      G_CALLBACK (key_press_cb), NULL);
+                                      "key-press-event",
+                                      G_CALLBACK (key_press_cb), NULL);
 #ifdef GGZ_CLIENT
     if (!main_id && ggz_network_mode && network_is_host ()) {
       main_id = g_timeout_add (GAMEDELAY * (properties->gamespeed + NETDELAY),
-			                         (GSourceFunc) network_loop, NULL);
+                               (GSourceFunc) network_loop, NULL);
     } else
 #endif
     if (!main_id && !ggz_network_mode) {
       main_id = g_timeout_add (GAMEDELAY * properties->gamespeed,
-			                         (GSourceFunc) main_loop, NULL);
+                               (GSourceFunc) main_loop, NULL);
     }
 #ifdef GGZ_CLIENT
     if (!add_bonus_id && network_is_host ()) {
@@ -348,8 +349,8 @@ new_game_2_cb (GtkWidget * widget, gpointer data)
     if (!add_bonus_id) {
 #endif
       add_bonus_id = g_timeout_add (BONUSDELAY *
-				                            properties->gamespeed,
-                            		    (GSourceFunc) add_bonus_cb, NULL);
+                                    properties->gamespeed,
+                                    (GSourceFunc) add_bonus_cb, NULL);
     }
   }
 
@@ -434,16 +435,16 @@ pause_game_cb (GtkAction * action, gpointer data)
     if (main_id || erase_id || restart_id || dummy_id) {
       paused = 1;
       if (main_id) {
-	      g_source_remove (main_id);
-	      main_id = 0;
+        g_source_remove (main_id);
+        main_id = 0;
       }
       if (keyboard_id) {
-	      g_signal_handler_disconnect (G_OBJECT (stage), keyboard_id);
-	      keyboard_id = 0;
+        g_signal_handler_disconnect (G_OBJECT (stage), keyboard_id);
+        keyboard_id = 0;
       }
       if (add_bonus_id) {
-	      g_source_remove (add_bonus_id);
-	      add_bonus_id = 0;
+        g_source_remove (add_bonus_id);
+        add_bonus_id = 0;
       }
     }
   }
@@ -566,7 +567,7 @@ erase_worms_cb (gpointer datap)
     gnibbles_undraw_worms (ERASESIZE - data);
     erase_id = g_timeout_add (ERASETIME / ERASESIZE,
                               (GSourceFunc) erase_worms_cb,
-                  			      GINT_TO_POINTER (data - 1));
+                              GINT_TO_POINTER (data - 1));
   }
 
   return FALSE;
@@ -590,7 +591,7 @@ main_loop (gpointer data)
       return FALSE;
 
     str = g_strdup_printf (_("Game over! The game has been won by %s!"),
-			                     names[winner]);
+                           names[winner]);
 #ifdef GGZ_CLIENT
     add_chat_text (str);
 #endif
@@ -609,7 +610,7 @@ main_loop (gpointer data)
 
     add_bonus_id = 0;
     erase_id = g_timeout_add_seconds (3,
-			                                (GSourceFunc) erase_worms_cb,
+                                      (GSourceFunc) erase_worms_cb,
                           			      (gpointer) ERASESIZE);
     gnibbles_log_score (window);
 
@@ -628,8 +629,8 @@ main_loop (gpointer data)
     
     add_bonus_id = 0;
     erase_id = g_timeout_add_seconds (3,
-			                                (GSourceFunc) erase_worms_cb,
-                          			      (gpointer) ERASESIZE);
+                                      (GSourceFunc) erase_worms_cb,
+                                      (gpointer) ERASESIZE);
     gnibbles_log_score (window);
     return (FALSE);
   }
@@ -652,12 +653,12 @@ main_loop (gpointer data)
       main_id = 0;
     }
     if ((current_level < MAXLEVEL) && (!properties->random
-				                               || ggz_network_mode)) {
+                                       || ggz_network_mode)) {
       current_level++;
     } else if (properties->random && !ggz_network_mode) {
       tmp = rand () % MAXLEVEL + 1;
       while (tmp == current_level)
-	      tmp = rand () % MAXLEVEL + 1;
+        tmp = rand () % MAXLEVEL + 1;
       current_level = tmp;
     }
     restart_id = g_timeout_add_seconds (1, (GSourceFunc) restart_game, NULL);
@@ -687,8 +688,8 @@ main_loop (gpointer data)
     }
     add_bonus_id = 0;
     erase_id = g_timeout_add (ERASETIME / ERASESIZE,
-			                       (GSourceFunc) erase_worms_cb,
-			                       (gpointer) ERASESIZE);
+                             (GSourceFunc) erase_worms_cb,
+                             (gpointer) ERASESIZE);
     restart_id = g_timeout_add_seconds (1, (GSourceFunc) restart_game, NULL);
     return FALSE;
   }
@@ -782,7 +783,7 @@ create_menus (GtkUIManager * ui_manager)
 
   gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
   gtk_action_group_add_actions (action_group, action_entry,
-				G_N_ELEMENTS (action_entry), window);
+                                G_N_ELEMENTS (action_entry), window);
 
   gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
   gtk_ui_manager_add_ui_from_string (ui_manager, ui_description, -1, NULL);
@@ -842,9 +843,9 @@ setup_window ()
   g_signal_connect (G_OBJECT (window), "destroy", 
                     G_CALLBACK (gtk_main_quit), NULL);
   g_signal_connect (G_OBJECT (window), "delete_event",
-            		    G_CALLBACK (delete_cb), NULL);
+                    G_CALLBACK (delete_cb), NULL);
   g_signal_connect (G_OBJECT (window), "window_state_event",
-		                G_CALLBACK (window_state_cb), NULL);
+                    G_CALLBACK (window_state_cb), NULL);
 
   gtk_widget_realize (window);
 
@@ -875,10 +876,10 @@ setup_window ()
 #endif
 
   g_signal_connect (G_OBJECT (clutter_widget), "configure_event",
-		                G_CALLBACK (configure_event_cb), NULL);
+                    G_CALLBACK (configure_event_cb), NULL);
 
   g_signal_connect (G_OBJECT (window), "focus_out_event",
-		                G_CALLBACK (show_cursor_cb), NULL);
+                    G_CALLBACK (show_cursor_cb), NULL);
 
   gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook), packing, NULL);
@@ -968,8 +969,8 @@ hide_logo (void)
 {
   g_signal_connect_after (
     clutter_actor_animate (logo, CLUTTER_EASE_IN_QUAD, 150,
-                         "opacity", 0,
-                         NULL),
+                           "opacity", 0,
+                           NULL),
     "completed", G_CALLBACK (on_hide_logo_completed), logo);
 }
 
diff --git a/gnibbles/main.h b/gnibbles/main.h
index c904a18..fcc5bd0 100644
--- a/gnibbles/main.h
+++ b/gnibbles/main.h
@@ -25,8 +25,8 @@
 
 #include "gnibbles.h"
 
-#define MAIN_PAGE           	0
-#define NETWORK_PAGE           	1
+#define MAIN_PAGE 0
+#define NETWORK_PAGE 1
 
 
 gboolean ggz_network_mode;
diff --git a/gnibbles/preferences.c b/gnibbles/preferences.c
index d9d66ad..2870610 100644
--- a/gnibbles/preferences.c
+++ b/gnibbles/preferences.c
@@ -57,7 +57,7 @@ network_set_preferences (void)
 #ifdef GGZ_CLIENT
   if (ggz_network_mode) {
     network_req_settings (properties->gamespeed,
-			  properties->fakes, properties->startlevel);
+                          properties->fakes, properties->startlevel);
   }
 #endif
 }
@@ -238,9 +238,9 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
     running = 1;
 
   pref_dialog = gtk_dialog_new_with_buttons (_("Nibbles Preferences"),
-					     GTK_WINDOW (window), 0,
-					     GTK_STOCK_CLOSE,
-					     GTK_RESPONSE_CLOSE, NULL);
+                                             GTK_WINDOW (window), 0,  
+                                             GTK_STOCK_CLOSE,
+                                             GTK_RESPONSE_CLOSE, NULL);
   gtk_dialog_set_has_separator (GTK_DIALOG (pref_dialog), FALSE);
   gtk_container_set_border_width (GTK_CONTAINER (pref_dialog), 5);
   gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (pref_dialog)->vbox), 2);
@@ -248,7 +248,7 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
   notebook = gtk_notebook_new ();
   gtk_container_set_border_width (GTK_CONTAINER (notebook), 5);
   gtk_container_add (GTK_CONTAINER (GTK_DIALOG (pref_dialog)->vbox),
-		     notebook);
+                     notebook);
 
   label = gtk_label_new (_("Game"));
   table = gtk_table_new (1, 2, FALSE);
@@ -262,7 +262,7 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
     gtk_widget_set_sensitive (frame, FALSE);
 
   gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 0, 1, 0,
-		    GTK_FILL | GTK_EXPAND, 0, 0);
+                    GTK_FILL | GTK_EXPAND, 0, 0);
 
   vbox = gtk_vbox_new (FALSE, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
@@ -273,37 +273,37 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
   if (properties->gamespeed == 4)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
-		    (game_speed_cb), (gpointer) 4);
+                    (game_speed_cb), (gpointer) 4);
 
   button = gtk_radio_button_new_with_label (gtk_radio_button_get_group
-					    (GTK_RADIO_BUTTON (button)),
-					    _("My second day"));
+                                            (GTK_RADIO_BUTTON (button)),
+                                            _("My second day"));
 
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   if (properties->gamespeed == 3)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
-		    (game_speed_cb), (gpointer) 3);
+                    (game_speed_cb), (gpointer) 3);
 
   button = gtk_radio_button_new_with_label (gtk_radio_button_get_group
-					    (GTK_RADIO_BUTTON (button)),
-					    _("Not too shabby"));
+                                            (GTK_RADIO_BUTTON (button)),
+                                            _("Not too shabby"));
 
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   if (properties->gamespeed == 2)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
-		    (game_speed_cb), (gpointer) 2);
+                    (game_speed_cb), (gpointer) 2);
 
   button = gtk_radio_button_new_with_label (gtk_radio_button_get_group
-					    (GTK_RADIO_BUTTON (button)),
-					    _("Finger-twitching good"));
+                                            (GTK_RADIO_BUTTON (button)),
+                                            _("Finger-twitching good"));
 
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   if (properties->gamespeed == 1)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
-		    (game_speed_cb), (gpointer) 1);
+                    (game_speed_cb), (gpointer) 1);
 
 
   /* Options */
@@ -322,7 +322,7 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
   if (properties->random)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
-		    (random_order_cb), NULL);
+                    (random_order_cb), NULL);
 
   button = gtk_check_button_new_with_mnemonic (_("_Enable fake bonuses"));
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
@@ -332,14 +332,14 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
   if (properties->fakes)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
-		    (fake_bonus_cb), NULL);
+                    (fake_bonus_cb), NULL);
 
   button = gtk_check_button_new_with_mnemonic (_("E_nable sounds"));
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   if (properties->sound)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
-		    (sound_cb), NULL);
+                    (sound_cb), NULL);
 
   table2 = gtk_table_new (3, 2, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox), table2, FALSE, FALSE, 0);
@@ -356,11 +356,10 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
     gtk_widget_set_sensitive (GTK_WIDGET (label2), FALSE);
   if (running)
     gtk_widget_set_sensitive (GTK_WIDGET (label2), FALSE);
-  gtk_table_attach (GTK_TABLE (table2), label2, 0, 1, 0, 1, GTK_FILL, 0, 0,
-		    0);
+  gtk_table_attach (GTK_TABLE (table2), label2, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
 
   adjustment = gtk_adjustment_new ((gfloat) properties->startlevel, 1.0,
-				   MAXLEVEL, 1.0, 5.0, 0.0);
+                                   MAXLEVEL, 1.0, 5.0, 0.0);
 
   levelspinner = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 0, 0);
   start_level_spin_button = levelspinner;
@@ -374,18 +373,17 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
     gtk_widget_set_sensitive (GTK_WIDGET (levelspinner), FALSE);
   gtk_table_attach_defaults (GTK_TABLE (table2), levelspinner, 1, 2, 0, 1);
   g_signal_connect (GTK_OBJECT (adjustment), "value_changed",
-		    G_CALLBACK (start_level_cb), levelspinner);
+                    G_CALLBACK (start_level_cb), levelspinner);
 
   label2 = gtk_label_new_with_mnemonic (_("Number of _human players:"));
   gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
 
-  gtk_table_attach (GTK_TABLE (table2), label2, 0, 1, 1, 2, GTK_FILL, 0, 0,
-		    0);
+  gtk_table_attach (GTK_TABLE (table2), label2, 0, 1, 1, 2, GTK_FILL, 0, 0,  0);
   if (running || ggz_network_mode)
     gtk_widget_set_sensitive (label2, FALSE);
 
   adjustment = gtk_adjustment_new ((gfloat) properties->human, 0.0,
-				   NUMWORMS, 1.0, 1.0, 0.0);
+                                   NUMWORMS, 1.0, 1.0, 0.0);
 
   num_human = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 0, 0);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (num_human), FALSE);
@@ -395,18 +393,17 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
   if (running || ggz_network_mode)
     gtk_widget_set_sensitive (num_human, FALSE);
   g_signal_connect (GTK_OBJECT (adjustment), "value_changed",
-		    G_CALLBACK (num_worms_cb), num_human);
+                    G_CALLBACK (num_worms_cb), num_human);
 
   label2 = gtk_label_new_with_mnemonic (_("Number of _AI players:"));
   gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
 
-  gtk_table_attach (GTK_TABLE (table2), label2, 0, 1, 2, 3, GTK_FILL, 0, 0,
-		    0);
+  gtk_table_attach (GTK_TABLE (table2), label2, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
   if (running || ggz_network_mode)
     gtk_widget_set_sensitive (label2, FALSE);
 
   adjustment = gtk_adjustment_new ((gfloat) properties->ai, 0.0,
-				   NUMWORMS, 1.0, 1.0, 0.0);
+                                   NUMWORMS, 1.0, 1.0, 0.0);
 
   num_ai = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 0, 0);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (num_ai), FALSE);
@@ -416,7 +413,7 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
   if (running || ggz_network_mode)
     gtk_widget_set_sensitive (num_ai, FALSE);
   g_signal_connect (GTK_OBJECT (adjustment), "value_changed",
-		    G_CALLBACK (num_worms_cb), num_ai);
+                    G_CALLBACK (num_worms_cb), num_ai);
 
   for (i = 0; i < NUMWORMS; i++) {
     char up_key[64];
@@ -443,11 +440,11 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
     g_snprintf (down_key, sizeof (down_key), KEY_WORM_DOWN, i);
 
     games_controls_list_add_controls (GAMES_CONTROLS_LIST (controls),
-				      left_key, _("Move left"), GDK_Left,
+                                      left_key, _("Move left"), GDK_Left,
                                       right_key, _("Move right"), GDK_Right,
                                       up_key, _("Move up"), GDK_Up,
-                                      down_key, _("Move down"), GDK_Down,
-				      NULL);
+                                      down_key, _("Move down"), GDK_Down, 
+                                      NULL);
     gtk_container_add (GTK_CONTAINER (frame), controls);
 
     gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
@@ -479,26 +476,26 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
     gtk_combo_box_append_text (GTK_COMBO_BOX (omenu), _("Purple"));
     gtk_combo_box_append_text (GTK_COMBO_BOX (omenu), _("Gray"));
     g_signal_connect (GTK_OBJECT (omenu), "changed",
-		      G_CALLBACK (set_worm_color_cb),
-		      GINT_TO_POINTER (i));
+                      G_CALLBACK (set_worm_color_cb),
+                      GINT_TO_POINTER (i));
     gtk_combo_box_set_active (GTK_COMBO_BOX (omenu),
-			      properties->wormprops[i]->color - WORMRED);
+                              properties->wormprops[i]->color - WORMRED);
     gtk_table_attach_defaults (GTK_TABLE (table2), omenu, 1, 2, 0, 1);
 
     set_worm_controls_sensitivity (i, properties->wormprops[i]->relmove);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
-				  properties->wormprops[i]->relmove);
+                                  properties->wormprops[i]->relmove);
     g_signal_connect (G_OBJECT (button), "toggled",
-		      G_CALLBACK (worm_relative_movement_cb),
-		      GINT_TO_POINTER (i));
+                      G_CALLBACK (worm_relative_movement_cb),
+                      GINT_TO_POINTER (i));
   }
 
   g_signal_connect (G_OBJECT (pref_dialog), "response",
-		    G_CALLBACK (apply_cb), NULL);
+                    G_CALLBACK (apply_cb), NULL);
   g_signal_connect (G_OBJECT (pref_dialog), "destroy",
-		    G_CALLBACK (destroy_cb), NULL);
+                    G_CALLBACK (destroy_cb), NULL);
   g_signal_connect (G_OBJECT (pref_dialog), "close",
-		    G_CALLBACK (destroy_cb), NULL);
+                    G_CALLBACK (destroy_cb), NULL);
 
   gtk_widget_show_all (pref_dialog);
 
diff --git a/gnibbles/properties.c b/gnibbles/properties.c
index a238196..05b8164 100644
--- a/gnibbles/properties.c
+++ b/gnibbles/properties.c
@@ -84,7 +84,8 @@ gnibbles_properties_update (GnibblesProperties * tmp)
   gchar *category;
   gchar *color_name;
 
-  tmp->human = games_conf_get_integer (KEY_PREFERENCES_GROUP, KEY_NUM_WORMS, NULL);
+  tmp->human = games_conf_get_integer (KEY_PREFERENCES_GROUP, 
+                                       KEY_NUM_WORMS, NULL);
   if (tmp->human < 0)
     tmp->human = 0;
   else if (tmp->human > NUMWORMS)
@@ -98,17 +99,21 @@ gnibbles_properties_update (GnibblesProperties * tmp)
 
   tmp->numworms = tmp->human + tmp->ai;
 
-  tmp->gamespeed = games_conf_get_integer (KEY_PREFERENCES_GROUP, KEY_SPEED, NULL);
+  tmp->gamespeed = games_conf_get_integer (KEY_PREFERENCES_GROUP, 
+                                           KEY_SPEED, NULL);
   if (tmp->gamespeed < 1)
     tmp->gamespeed = 2;
   else if (tmp->gamespeed > MAX_SPEED)
     tmp->gamespeed = MAX_SPEED;
 
-  tmp->fakes = games_conf_get_boolean (KEY_PREFERENCES_GROUP, KEY_FAKES, NULL);
+  tmp->fakes = games_conf_get_boolean (KEY_PREFERENCES_GROUP, 
+                                       KEY_FAKES, NULL);
 
-  tmp->random = games_conf_get_boolean (KEY_PREFERENCES_GROUP, KEY_RANDOM, NULL);
+  tmp->random = games_conf_get_boolean (KEY_PREFERENCES_GROUP, 
+                                        KEY_RANDOM, NULL);
 
-  tmp->startlevel = games_conf_get_integer (KEY_PREFERENCES_GROUP, KEY_START_LEVEL, NULL);
+  tmp->startlevel = games_conf_get_integer (KEY_PREFERENCES_GROUP, 
+                                            KEY_START_LEVEL, NULL);
   if (tmp->startlevel < 1)
     tmp->startlevel = 1;
   if (tmp->startlevel > MAXLEVEL)
@@ -117,7 +122,8 @@ gnibbles_properties_update (GnibblesProperties * tmp)
   tmp->sound = games_conf_get_boolean (KEY_PREFERENCES_GROUP, KEY_SOUND, NULL);
   games_sound_enable (tmp->sound);
 
-  tmp->tilesize = games_conf_get_integer (KEY_PREFERENCES_GROUP, KEY_TILE_SIZE, NULL);
+  tmp->tilesize = games_conf_get_integer (KEY_PREFERENCES_GROUP, 
+                                          KEY_TILE_SIZE, NULL);
   if (tmp->tilesize < 1)
     tmp->tilesize = 5;
   if (tmp->tilesize > 30)
@@ -127,7 +133,8 @@ gnibbles_properties_update (GnibblesProperties * tmp)
     tmp->wormprops[i] = g_slice_new0 (GnibblesWormProps);
 
     g_snprintf (buffer, sizeof (buffer), KEY_WORM_COLOR, i);
-    color_name = games_conf_get_string_with_default (KEY_PREFERENCES_GROUP, buffer, "red");
+    color_name = games_conf_get_string_with_default (KEY_PREFERENCES_GROUP,
+                                                     buffer, "red");
     tmp->wormprops[i]->color = colorval_from_name (color_name);
     g_free (color_name);
 
@@ -137,24 +144,29 @@ gnibbles_properties_update (GnibblesProperties * tmp)
       tmp->wormprops[i]->color = (i % NUM_COLORS) + WORMRED;
 
     g_snprintf (buffer, sizeof (buffer), KEY_WORM_REL_MOVE, i);
-    tmp->wormprops[i]->relmove = games_conf_get_boolean (KEY_PREFERENCES_GROUP,
- 							 buffer, NULL);
+    tmp->wormprops[i]->relmove = 
+                 games_conf_get_boolean (KEY_PREFERENCES_GROUP,
+                                         buffer, NULL);
 
     g_snprintf (buffer, sizeof (buffer), KEY_WORM_UP, i);
-    tmp->wormprops[i]->up = games_conf_get_keyval_with_default (KEY_PREFERENCES_GROUP,
-                                                                buffer, GDK_Up);
+    tmp->wormprops[i]->up = 
+                 games_conf_get_keyval_with_default (KEY_PREFERENCES_GROUP,
+                                                     buffer, GDK_Up);
 
     g_snprintf (buffer, sizeof (buffer), KEY_WORM_DOWN, i);
-    tmp->wormprops[i]->down = games_conf_get_keyval_with_default (KEY_PREFERENCES_GROUP,
-						                  buffer, GDK_Down);
+    tmp->wormprops[i]->down = 
+                 games_conf_get_keyval_with_default (KEY_PREFERENCES_GROUP,
+                                                     buffer, GDK_Down);
 
     g_snprintf (buffer, sizeof (buffer), KEY_WORM_LEFT, i);
-    tmp->wormprops[i]->left = games_conf_get_keyval_with_default (KEY_PREFERENCES_GROUP,
-                                                                  buffer, GDK_Left);
+    tmp->wormprops[i]->left = 
+                 games_conf_get_keyval_with_default (KEY_PREFERENCES_GROUP,
+                                                     buffer, GDK_Left);
 
     g_snprintf (buffer, sizeof (buffer), KEY_WORM_RIGHT, i);
-    tmp->wormprops[i]->right = games_conf_get_keyval_with_default (KEY_PREFERENCES_GROUP,
-                                                                   buffer, GDK_Right);
+    tmp->wormprops[i]->right = 
+                 games_conf_get_keyval_with_default (KEY_PREFERENCES_GROUP,
+                                                     buffer, GDK_Right);
   }
 
   category = g_strdup_printf ("%d.%d", tmp->gamespeed, tmp->fakes);
@@ -201,7 +213,8 @@ gnibbles_properties_destroy (GnibblesProperties * props)
   for (i = 0; i < NUMWORMS; i++)
     g_slice_free (GnibblesWormProps, props->wormprops[i]);
 
-  g_signal_handler_disconnect (games_conf_get_default (), props->conf_notify_id);
+  g_signal_handler_disconnect (games_conf_get_default (), 
+                               props->conf_notify_id);
 
   g_slice_free (GnibblesProperties, props);
 }
diff --git a/gnibbles/scoreboard.c b/gnibbles/scoreboard.c
index a6d753e..0488a8d 100644
--- a/gnibbles/scoreboard.c
+++ b/gnibbles/scoreboard.c
@@ -37,8 +37,7 @@ gnibbles_scoreboard_new (GtkWidget * t_statusbar)
   char buffer[255];
   GtkWidget *hbox;
 
-  GnibblesScoreboard *tmp = (GnibblesScoreboard *) malloc (sizeof
-							   (GnibblesScoreboard));
+  GnibblesScoreboard *tmp = g_new (GnibblesScoreboard, 1);
 
   tmp->count = 0;
 
@@ -62,7 +61,7 @@ gnibbles_scoreboard_new (GtkWidget * t_statusbar)
 
 void
 gnibbles_scoreboard_register (GnibblesScoreboard * scoreboard,
-			      GnibblesWorm * t_worm, gchar * colorname)
+                              GnibblesWorm * t_worm, gchar * colorname)
 {
   GdkColor color;
 
@@ -86,9 +85,9 @@ gnibbles_scoreboard_update (GnibblesScoreboard * scoreboard)
 
   for (i = 0; i < scoreboard->count; i++) {
     buffer = g_strdup_printf ("%02d, %04d",
-			      (scoreboard->worms[i]->lives > -1) ?
-			      scoreboard->worms[i]->lives : 0,
-			      scoreboard->worms[i]->score);
+            (scoreboard->worms[i]->lives > -1) ?
+            scoreboard->worms[i]->lives : 0,
+            scoreboard->worms[i]->score);
     buffer2 = gtk_label_get_text (GTK_LABEL (scoreboard->data[i]));
     if (strcmp (buffer, buffer2))
       gtk_label_set_text (GTK_LABEL (scoreboard->data[i]), buffer);
diff --git a/gnibbles/scoreboard.h b/gnibbles/scoreboard.h
index 2f44200..1c91a26 100644
--- a/gnibbles/scoreboard.h
+++ b/gnibbles/scoreboard.h
@@ -38,7 +38,7 @@ GnibblesScoreboard *gnibbles_scoreboard_new (GtkWidget * t_statusbar);
 
 void gnibbles_scoreboard_register (GnibblesScoreboard * scoreboard,
                                    GnibblesWorm * t_worm,
-			                             gchar * colorname);
+                                   gchar * colorname);
 
 void gnibbles_scoreboard_update (GnibblesScoreboard * scoreboard);
 
diff --git a/gnibbles/server.c b/gnibbles/server.c
index ddd2122..f9f05eb 100644
--- a/gnibbles/server.c
+++ b/gnibbles/server.c
@@ -170,12 +170,12 @@ game_send_players (void)
     for (i = 0; i < ggzdmod_get_num_seats (game.ggz); i++) {
       GGZSeat seat = ggzdmod_get_seat (game.ggz, i);
       if (ggz_write_int (mfd, seat.type) < 0)
-	return -1;
+        return -1;
       if (seat.type != GGZ_SEAT_OPEN
-	  /* FIXME: This is a problem since seat.name
-	   * can in theory be NULL. --JDS */
-	  && ggz_write_string (mfd, seat.name) < 0)
-	return -1;
+    /* FIXME: This is a problem since seat.name
+     * can in theory be NULL. --JDS */
+          && ggz_write_string (mfd, seat.name) < 0)
+        return -1;
     }
   }
   return 0;
@@ -270,7 +270,7 @@ game_handle_noboni (int seat)
     if (fd == -1)
       continue;
     if (ggz_write_int (fd, GN_MSG_NOBONI) < 0 || ggz_write_int (fd, x) < 0
-	|| ggz_write_int (fd, y) < 0)
+        || ggz_write_int (fd, y) < 0)
       return -1;
   }
 
@@ -298,9 +298,9 @@ game_handle_boni (int seat)
     if (fd == -1)
       continue;
     if (ggz_write_int (fd, GN_MSG_BONI) < 0 || ggz_write_int (fd, x) < 0
-	|| ggz_write_int (fd, y) < 0
-	|| ggz_write_int (fd, type) < 0
-	|| ggz_write_int (fd, fake) < 0 || ggz_write_int (fd, countdown) < 0)
+        || ggz_write_int (fd, y) < 0
+        || ggz_write_int (fd, type) < 0 
+        || ggz_write_int (fd, fake) < 0 || ggz_write_int (fd, countdown) < 0)
       return -1;
   }
 
@@ -326,8 +326,8 @@ game_handle_settings (int seat)
     if (fd == -1)
       continue;
     if (ggz_write_int (fd, GN_MSG_SETTINGS) < 0
-	|| ggz_write_int (fd, speed) < 0 || ggz_write_int (fd, fakes) < 0
-	|| ggz_write_int (fd, startlevel) < 0)
+        || ggz_write_int (fd, speed) < 0 || ggz_write_int (fd, fakes) < 0
+        || ggz_write_int (fd, startlevel) < 0)
       return -1;
   }
 
@@ -352,7 +352,7 @@ game_handle_move (int seat)
     if (fd == -1)
       continue;
     if (ggz_write_int (fd, GN_MSG_MOVE) < 0 || ggz_write_int (fd, seat) < 0
-	|| ggz_write_int (fd, move) < 0)
+        || ggz_write_int (fd, move) < 0)
       return -1;
   }
 
diff --git a/gnibbles/warp.c b/gnibbles/warp.c
index fd3ec24..0d94269 100644
--- a/gnibbles/warp.c
+++ b/gnibbles/warp.c
@@ -42,9 +42,9 @@ animate_warp1 (ClutterAnimation *animation, ClutterActor *actor)
 {
   g_signal_connect_after (
     clutter_actor_animate (actor, CLUTTER_LINEAR, 1100,
-                                "opacity", 0x96,
-                                NULL),
-      "completed", G_CALLBACK (animate_warp2), actor);
+                           "opacity", 0x96,
+                           NULL),
+     "completed", G_CALLBACK (animate_warp2), actor);
 
 }
 
@@ -55,7 +55,7 @@ animate_warp2 (ClutterAnimation *animation, ClutterActor *actor)
     clutter_actor_animate (actor, CLUTTER_LINEAR, 1100,
                            "opacity", 0xff,
                            NULL),
-      "completed", G_CALLBACK (animate_warp1), actor);
+    "completed", G_CALLBACK (animate_warp1), actor);
 
 }
 
@@ -95,9 +95,9 @@ gnibbles_warp_draw (GnibblesWarp *warp)
   clutter_actor_set_scale (warp->actor, 2.0, 2.0);
   g_signal_connect_after (
     clutter_actor_animate (warp->actor, CLUTTER_EASE_OUT_CIRC, 410,
-                         "scale-x", 1.0, "scale-y", 1.0,
-                         "fixed::scale-gravity", CLUTTER_GRAVITY_CENTER,
-                         "opacity", 0xff,
-                         NULL),
+                          "scale-x", 1.0, "scale-y", 1.0,
+                          "fixed::scale-gravity", CLUTTER_GRAVITY_CENTER,
+                          "opacity", 0xff,
+                          NULL),
     "completed", G_CALLBACK (animate_warp1), warp->actor);
 }
diff --git a/gnibbles/warpmanager.c b/gnibbles/warpmanager.c
index 9d34622..b610f30 100644
--- a/gnibbles/warpmanager.c
+++ b/gnibbles/warpmanager.c
@@ -75,9 +75,9 @@ gnibbles_warpmanager_add_warp (GnibblesWarpManager * warpmanager, gint t_x,
   if (t_x < 0) {
     for (i = 0; i < warpmanager->numwarps; i++) {
       if (warpmanager->warps[i]->wx == t_x) {
-	      warpmanager->warps[i]->wx = t_wx;
-	      warpmanager->warps[i]->wy = t_wy;
-	      return;
+        warpmanager->warps[i]->wx = t_wx;
+        warpmanager->warps[i]->wy = t_wy;
+        return;
       }
     }
 
@@ -89,15 +89,15 @@ gnibbles_warpmanager_add_warp (GnibblesWarpManager * warpmanager, gint t_x,
   } else {
     for (i = 0; i < warpmanager->numwarps; i++) {
       if (warpmanager->warps[i]->x == t_wx) {
-	      warpmanager->warps[i]->x = t_x;
-	      warpmanager->warps[i]->y = t_y;
-	      draw = i;
-	      add = 0;
+        warpmanager->warps[i]->x = t_x;
+        warpmanager->warps[i]->y = t_y;
+        draw = i;
+        add = 0;
       }
     }
     if (add) {
       if (warpmanager->numwarps == MAXWARPS)
-	      return;
+        return;
       warpmanager->warps[warpmanager->numwarps] = 
                     gnibbles_warp_new (t_x, t_y, t_wx, t_wy);
       draw = warpmanager->numwarps;
@@ -121,33 +121,33 @@ gnibbles_warpmanager_worm_change_pos (GnibblesWarpManager * warpmanager,
 
   for (i = 0; i < warpmanager->numwarps; i++) {
     if ((worm->xhead == warpmanager->warps[i]->x &&
-	      worm->yhead == warpmanager->warps[i]->y) ||
-	      (worm->xhead == warpmanager->warps[i]->x + 1 &&
-	      worm->yhead == warpmanager->warps[i]->y) ||
-	      (worm->xhead == warpmanager->warps[i]->x &&
-	      worm->yhead == warpmanager->warps[i]->y + 1) ||
-	      (worm->xhead == warpmanager->warps[i]->x + 1 &&
-	      worm->yhead == warpmanager->warps[i]->y + 1)) {
+        worm->yhead == warpmanager->warps[i]->y) ||
+        (worm->xhead == warpmanager->warps[i]->x + 1 &&
+        worm->yhead == warpmanager->warps[i]->y) ||
+        (worm->xhead == warpmanager->warps[i]->x &&
+        worm->yhead == warpmanager->warps[i]->y + 1) ||
+        (worm->xhead == warpmanager->warps[i]->x + 1 &&
+        worm->yhead == warpmanager->warps[i]->y + 1)) {
       
       if (warpmanager->warps[i]->wx == -1) {
-	       good = 0;
-	      while (!good) {
-	      // In network games, warps should be fair. 
-	        if (ggz_network_mode) {
-	          x = 10 % BOARDWIDTH;
-	          y = 10 % BOARDHEIGHT;
-	        } else {
-	          x = rand () % BOARDWIDTH;
-	          y = rand () % BOARDHEIGHT;
-	        }
-	        if (board->walls[x][y] == EMPTYCHAR)
-	          good = 1;
-	      }
+         good = 0;
+        while (!good) {
+        // In network games, warps should be fair. 
+          if (ggz_network_mode) {
+            x = 10 % BOARDWIDTH;
+            y = 10 % BOARDHEIGHT;
+          } else {
+            x = rand () % BOARDWIDTH;
+            y = rand () % BOARDHEIGHT;
+          }
+          if (board->walls[x][y] == EMPTYCHAR)
+            good = 1;
+        }
       } else {
-	      x = warpmanager->warps[i]->wx;
-	      y = warpmanager->warps[i]->wy;
-	      if (board->walls[x][y] != EMPTYCHAR)
-	        gnibbles_boni_remove_bonus (boni, x, y);
+        x = warpmanager->warps[i]->wx;
+        y = warpmanager->warps[i]->wy;
+        if (board->walls[x][y] != EMPTYCHAR)
+          gnibbles_boni_remove_bonus (boni, x, y);
       }
 
       worm->xhead = x;
diff --git a/gnibbles/worm.c b/gnibbles/worm.c
index 0f84f51..9903d41 100644
--- a/gnibbles/worm.c
+++ b/gnibbles/worm.c
@@ -765,7 +765,8 @@ gnibbles_worm_test_move_head (GnibblesWorm * worm)
 
   gnibbles_worm_position_move_head(worm, &x, &y);
 
-  if (board->walls[x][y] > EMPTYCHAR && board->walls[x][y] < 'z' + properties->numworms)
+  if (board->walls[x][y] > EMPTYCHAR 
+      && board->walls[x][y] < 'z' + properties->numworms)
     return (FALSE);
 
   return TRUE;
@@ -849,13 +850,13 @@ gnibbles_worm_ai_deadend (gint x, gint y, gint lengthleft)
       cy = BOARDHEIGHT - 1;
 
     if ((board->walls[cx][cy] <= EMPTYCHAR
-	      || board->walls[x][y] >= 'z' + properties->numworms)
-	      && deadendboard[cx][cy] != deadend_runnumber) {
+        || board->walls[x][y] >= 'z' + properties->numworms)
+        && deadendboard[cx][cy] != deadend_runnumber) {
        
       deadendboard[cx][cy] = deadend_runnumber;
       lengthleft = gnibbles_worm_ai_deadend(cx, cy, lengthleft - 1);
       if (!lengthleft)
-	      return 0;
+        return 0;
     }
   }
   return lengthleft;
@@ -951,19 +952,19 @@ gnibbles_worm_ai_tooclose (GnibblesWorm * worm)
     switch (worm->direction) {
       case WORMUP:
         if (dy > 0 && dy <= 3 && dx >= -1 && dx <= 1)
- 	        return 1;
+          return 1;
         break;
       case WORMDOWN:
         if (dy < 0 && dy >= -3 && dx >= -1 && dx <= 1)
-	        return 1;
+          return 1;
         break;
       case WORMLEFT:
         if (dx > 0 && dx <= 3 && dy >= -1 && dy <= 1)
-	        return 1;
+          return 1;
         break;
       case WORMRIGHT:
         if (dx < 0 && dx >= -3 && dy >= -1 && dy <= 1)
-	        return 1;
+          return 1;
         break;
     }
   }
@@ -1019,7 +1020,7 @@ gnibbles_worm_ai_wander (gint x, gint y, gint dir, gint ox, gint oy)
         return 0;
       } else {
         if (ox == x && oy == y)
-	        return 0;
+          return 0;
         return gnibbles_worm_ai_wander (x, y, dir, ox, oy);
       }
     break;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]