Putt code clean-up.

git-svn-id: https://s.snth.net/svn/neverball/trunk@429 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/putt/main.c b/putt/main.c
index e9e4b32..f0f7fc2 100644 (file)
--- a/putt/main.c
+++ b/putt/main.c
@@ -160,9 +160,9 @@ int main(int argc, char *argv[])
                 config_init();
                 config_load();
 
-               /* Initialize the language. */
-               
-               language_set(language_from_code(config_simple_get_s(CONFIG_LANG)));
+                /* Initialize the language. */
+                
+                language_set(language_from_code(config_simple_get_s(CONFIG_LANG)));
 
                 /* Cache Neverball's camera setting. */
 
@@ -205,8 +205,8 @@ int main(int argc, char *argv[])
                 {
                     int t1, t0 = SDL_GetTicks();
 
-                   SDL_Surface *icon = IMG_Load(config_data("icon/neverputt.png"));
-                   SDL_WM_SetIcon(icon, NULL);
+                    SDL_Surface *icon = IMG_Load(config_data("icon/neverputt.png"));
+                    SDL_WM_SetIcon(icon, NULL);
                     SDL_WM_SetCaption(TITLE, TITLE); 
 
                     /* Run the main game loop. */

diff --git a/putt/st_all.c b/putt/st_all.c
index bd2536b..abd119f 100644 (file)
--- a/putt/st_all.c
+++ b/putt/st_all.c
@@ -265,24 +265,26 @@ static int course_enter(void)
 
         if ((jd = gui_hstack(id)))
         {
-           shot_id = gui_image(jd, course_shot(0), w / 3, h / 3);
+            shot_id = gui_image(jd, course_shot(0), w / 3, h / 3);
             gui_filler(jd);
-           if ((kd = gui_varray(jd)))
-           {
+            if ((kd = gui_varray(jd)))
+            {
                 for(i = 0; i < n; i += m)
-               {
-                   if ((ld = gui_harray(kd)))
-                   {
-                       for (j = (m-1); j >= 0; j--)
-                       {
-                           if (i+j < n)
-                               gui_active(gui_image(ld, course_shot(i+j), w / 3 / m, h / 3 / m), i+j, 0);
-                           else
-                               gui_space(ld);
-                       }
-                   }
-               }
-           }
+                {
+                    if ((ld = gui_harray(kd)))
+                    {
+                        for (j = (m - 1); j >= 0; j--)
+                        {
+                            if (i + j < n)
+                                gui_active(gui_image(ld, course_shot(i + j),
+                                                     w / 3 / m, h / 3 / m),
+                                           i + j, 0);
+                            else
+                                gui_space(ld);
+                        }
+                    }
+                }
+            }
         }
 
         gui_space(id);
@@ -327,11 +329,11 @@ static void course_point(int id, int x, int y, int dx, int dy)
     if ((jd = gui_point(id, x, y)))
     {
         int i = gui_token(jd);
-       if (course_exists(i))
-       {
-           gui_set_image(shot_id, course_shot(i));
+        if (course_exists(i))
+        {
+            gui_set_image(shot_id, course_shot(i));
             gui_set_multi(desc_id, _(course_desc(i)));
-       }
+        }
         gui_pulse(jd, 1.2f);
     }
 }

diff --git a/putt/st_conf.c b/putt/st_conf.c
index 7b71d86..3686fac 100644 (file)
--- a/putt/st_conf.c
+++ b/putt/st_conf.c
@@ -131,8 +131,8 @@ static int conf_action(int i)
 
     case CONF_LANG:
         goto_state(&st_lang);
-       break;
-       
+        break;
+        
     case CONF_RESOL:
         goto_state(&st_resol);
         break;
@@ -193,17 +193,18 @@ static int conf_enter(void)
 
             /* Add mode selectors only for existing modes. */
 
-           if ((kd = gui_harray(jd)))
+            if ((kd = gui_harray(jd)))
             {
                 gui_state(kd, _("No"), GUI_SML, CONF_WIN, (f == 0));
                 gui_state(kd, _("Yes"),  GUI_SML, CONF_FULL, (f == 1));
             }
-           
-           {
-               static char msg[20];
-               sprintf(msg, "%d x %d", config_get_d(CONFIG_WIDTH), config_get_d(CONFIG_HEIGHT));
-               gui_state(jd, msg, GUI_SML, CONF_RESOL, 0);
-           }
+            
+            {
+                static char msg[20];
+                sprintf(msg, "%d x %d", config_get_d(CONFIG_WIDTH),
+                        config_get_d(CONFIG_HEIGHT));
+                gui_state(jd, msg, GUI_SML, CONF_RESOL, 0);
+            }
 
             if ((kd = gui_harray(jd)))
             {
@@ -260,7 +261,7 @@ static int conf_enter(void)
                 music_id[ 1] = gui_state(kd, NULL, GUI_SML, 201, (m ==  1));
                 music_id[ 0] = gui_state(kd, NULL, GUI_SML, 200, (m ==  0));
             }
-           gui_state(jd, _(language_get_name(language_from_code(config_simple_get_s(CONFIG_LANG)))), GUI_SML, CONF_LANG, 0);
+            gui_state(jd, _(language_get_name(language_from_code(config_simple_get_s(CONFIG_LANG)))), GUI_SML, CONF_LANG, 0);
         }
         if ((jd = gui_vstack(id)))
         {