Reformatted src/userinterface.c.

Signed-off-by: Bradley Smith <brad@brad-smith.co.uk>

2 files changed, 103 insertions, 91 deletions

diff --git a/src/sign.c b/src/sign.c
index 07c9d7a..9b1743e 100644
--- a/src/sign.c
+++ b/src/sign.c
@@ -1,3 +1,5 @@
+/* TODO: Either this needs to go, or it needs a copyright header */
+
 #include <stdio.h>
 #include <glib.h>
 
diff --git a/src/userinterface.c b/src/userinterface.c
index cdee3db..8562454 100644
--- a/src/userinterface.c
+++ b/src/userinterface.c
@@ -53,10 +53,9 @@ user_interface_get_type (void)
       NULL
     };
 
-    _user_interface_type = g_type_register_static (G_TYPE_INTERFACE, 
-					"UserInterface", 
-					&interface_info,
-					0);
+    _user_interface_type = g_type_register_static (G_TYPE_INTERFACE,
+                           "UserInterface",
+                           &interface_info, 0);
   }
 
   return _user_interface_type;
@@ -67,127 +66,138 @@ user_interface_base_init (UserInterfaceClass * klass)
 {
   static gboolean initialized = FALSE;
 
-  if (!initialized) {
-    /*GObjectClass *gobject_class = 
-	    g_type_class_peek (((GTypeInterface *) klass)->g_instance_type);
-
-    g_object_class_install_property (gobject_class, ARG_MAP,*/
-    g_object_interface_install_property (
-		    klass,
-		    g_param_spec_object ("map",
-			    "Map",
-			    "Reference to the Game Map object",
-			    G_TYPE_MAP,
-			    G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+  if (!initialized)
+  {
+    /*GObjectClass *gobject_class =
+       g_type_class_peek (((GTypeInterface *) klass)->g_instance_type);
+
+       g_object_class_install_property (gobject_class, ARG_MAP, */
+    g_object_interface_install_property (klass,
+                     g_param_spec_object ("map",
+                                  "Map",
+                                  "Reference to the Game Map object",
+                                  G_TYPE_MAP,
+                                  G_PARAM_READWRITE
+                                  |
+                                  G_PARAM_CONSTRUCT));
     initialized = TRUE;
   }
 }
 
-void user_interface_add_thing (UserInterface *ui,
-			       gint x, 
-			       gint y, 
-			       gint thing)
+void
+user_interface_add_thing (UserInterface * ui, gint x, gint y, gint thing)
 {
   USER_INTERFACE_GET_CLASS (ui)->user_interface_add_thing (ui, x, y, thing);
 }
 
-void user_interface_draw (UserInterface *ui)
+void
+user_interface_draw (UserInterface * ui)
 {
   USER_INTERFACE_GET_CLASS (ui)->user_interface_draw (ui);
 }
 
-void user_interface_move_robot (UserInterface *ui,
-				       gint from_x, 
-				       gint from_y, 
-				       gint to_x, 
-				       gint to_y, 
-				       gint cdir,
-				       glong energy,
-				       glong score, 
-				       glong shields)
+void
+user_interface_move_robot (UserInterface * ui,
+               gint from_x,
+               gint from_y,
+               gint to_x,
+               gint to_y,
+               gint cdir,
+               glong energy, glong score, glong shields)
 {
-  USER_INTERFACE_GET_CLASS (ui)->user_interface_move_robot (ui, from_x, from_y, to_x, to_y, cdir, energy, score, shields);
+  USER_INTERFACE_GET_CLASS (ui)->user_interface_move_robot (ui, from_x,
+                                from_y, to_x,
+                                to_y, cdir,
+                                energy, score,
+                                shields);
 }
 
 /* user_interfaces to animate the robot */
- void user_interface_robot_smell (UserInterface *ui,
-					gint x, 
-					gint y, 
-					gint cdir,
-				        glong energy,
-				        glong score, 
-				        glong shields)
+void
+user_interface_robot_smell (UserInterface * ui,
+                gint x,
+                gint y,
+                gint cdir,
+                glong energy, glong score, glong shields)
 {
-  USER_INTERFACE_GET_CLASS (ui)->user_interface_robot_smell (ui, x, y, cdir, energy, score, shields);
+  USER_INTERFACE_GET_CLASS (ui)->user_interface_robot_smell (ui, x, y, cdir,
+                                 energy, score,
+                                 shields);
 }
 
-void user_interface_robot_zap (UserInterface *ui,
-				      gint x, 
-				      gint y, 
-				      gint cdir, 
-				      gint x_to, 
-				      gint y_to,
-				      glong energy,
-				      glong score, 
-				      glong shields)
+void
+user_interface_robot_zap (UserInterface * ui,
+              gint x,
+              gint y,
+              gint cdir,
+              gint x_to,
+              gint y_to, glong energy, glong score, glong shields)
 {
-  USER_INTERFACE_GET_CLASS (ui)->user_interface_robot_zap (ui, x, y, cdir, x_to, y_to, energy, score, shields);
+  USER_INTERFACE_GET_CLASS (ui)->user_interface_robot_zap (ui, x, y, cdir,
+                               x_to, y_to, energy,
+                               score, shields);
 }
 
-void user_interface_robot_feel (UserInterface *ui,
-				       gint x, 
-				       gint y, 
-				       gint cdir, 
-				       gint x_to, 
-				       gint y_to,
-				       glong energy,
-				       glong score, 
-				       glong shields)
+void
+user_interface_robot_feel (UserInterface * ui,
+               gint x,
+               gint y,
+               gint cdir,
+               gint x_to,
+               gint y_to,
+               glong energy, glong score, glong shields)
 {
-  USER_INTERFACE_GET_CLASS (ui)->user_interface_robot_feel (ui, x, y, cdir, x_to, y_to, energy, score, shields);
+  USER_INTERFACE_GET_CLASS (ui)->user_interface_robot_feel (ui, x, y, cdir,
+                                x_to, y_to,
+                                energy, score,
+                                shields);
 }
 
-void user_interface_robot_grab (UserInterface *ui,
-				       gint x, 
-				       gint y, 
-				       gint cdir, 
-				       gint x_to, 
-				       gint y_to,
-				       glong energy,
-				       glong score, 
-				       glong shields)
+void
+user_interface_robot_grab (UserInterface * ui,
+               gint x,
+               gint y,
+               gint cdir,
+               gint x_to,
+               gint y_to,
+               glong energy, glong score, glong shields)
 {
-  USER_INTERFACE_GET_CLASS (ui)->user_interface_robot_grab (ui, x, y, cdir, x_to, y_to, energy, score, shields);
+  USER_INTERFACE_GET_CLASS (ui)->user_interface_robot_grab (ui, x, y, cdir,
+                                x_to, y_to,
+                                energy, score,
+                                shields);
 }
 
-void user_interface_robot_look (UserInterface *ui,
-				       gint x, 
-				       gint y, 
-				       gint cdir, 
-				       gint x_to, 
-				       gint y_to,
-				       glong energy,
-				       glong score, 
-				       glong shields)
+void
+user_interface_robot_look (UserInterface * ui,
+               gint x,
+               gint y,
+               gint cdir,
+               gint x_to,
+               gint y_to,
+               glong energy, glong score, glong shields)
 {
-  USER_INTERFACE_GET_CLASS (ui)->user_interface_robot_look (ui, x, y, cdir, x_to, y_to, energy, score, shields);
+  USER_INTERFACE_GET_CLASS (ui)->user_interface_robot_look (ui, x, y, cdir,
+                                x_to, y_to,
+                                energy, score,
+                                shields);
 }
 
 /* user_interfaces to get/display data from/to user */
-void user_interface_get_string (UserInterface *ui,
-				       gchar *prompt, 
-				       gchar *buff, 
-				       gint len)
+void
+user_interface_get_string (UserInterface * ui,
+               gchar * prompt, gchar * buff, gint len)
 {
-  USER_INTERFACE_GET_CLASS (ui)->user_interface_get_string (ui, prompt, buff, len);
+  USER_INTERFACE_GET_CLASS (ui)->user_interface_get_string (ui, prompt, buff,
+                                len);
 }
 
-void user_interface_update_status (UserInterface *ui,
-				   const gchar *s, 
-				   glong energy, 
-				   glong score, 
-				   glong shields)
+void
+user_interface_update_status (UserInterface * ui,
+                  const gchar * s,
+                  glong energy, glong score, glong shields)
 {
- USER_INTERFACE_GET_CLASS (ui)->user_interface_update_status (ui, s, energy, score, shields);
+  USER_INTERFACE_GET_CLASS (ui)->user_interface_update_status (ui, s, energy,
+                                   score,
+                                   shields);
 }
-