*aAhem*.. Restored accidentally committed locally modified files

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

diff --git a/share/config.c b/share/config.c
index d0805bb..2615c25 100644 (file)
--- a/share/config.c
+++ b/share/config.c
@@ -247,8 +247,7 @@ void config_load(void)
                     config_key(val, CONFIG_KEY_RESTART, DEFAULT_KEY_RESTART);
 
                 else if (strcmp(key, "key_score_next") == 0)
-                    config_key(val, CONFIG_KEY_SCORE_NEXT,
-                               DEFAULT_KEY_SCORE_NEXT);
+                    config_key(val, CONFIG_KEY_SCORE_NEXT, DEFAULT_KEY_SCORE_NEXT);
 
                 else if (strcmp(key, "player") == 0)
                     config_set_s(CONFIG_PLAYER, val);

diff --git a/share/image.c b/share/image.c
index a358782..c5d574f 100644 (file)
--- a/share/image.c
+++ b/share/image.c
@@ -69,8 +69,7 @@ void image_snap(const char *filename)
 
             /* Allocate and initialize the row pointers. */
 
-            if ((bytep = (png_bytep *) png_malloc(writep,
-                                                  h * sizeof (png_bytep))))
+            if ((bytep = (png_bytep *) png_malloc(writep, h * sizeof (png_bytep))))
             {
                 for (i = 0; i < h; ++i)
                     bytep[h - i - 1] = (png_bytep) (p + i * w * 3);

diff --git a/share/mapc.c b/share/mapc.c
index acc6049..9fbdeb9 100644 (file)
--- a/share/mapc.c
+++ b/share/mapc.c
@@ -359,8 +359,7 @@ static void size_image(const char *name, int *w, int *h)
 
         if (image_n + 1 >= image_alloc)
         {
-            struct _imagedata *tmp =
-                (struct _imagedata *) malloc(sizeof(struct _imagedata)
+            struct _imagedata *tmp = (struct _imagedata *) malloc(sizeof(struct _imagedata)
                                           * (image_alloc + IMAGE_REALLOC));
             if (!tmp)
             {