Remove SOL body flags

[neverball] / share / config.c

diff --git a/share/config.c b/share/config.c
index 2425dc5..0dddce3 100644 (file)
--- a/share/config.c
+++ b/share/config.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "common.h"
+#include "fs.h"
 
 /*---------------------------------------------------------------------------*/
 
@@ -57,6 +58,9 @@ int CONFIG_JOYSTICK_DEVICE;
 int CONFIG_JOYSTICK_AXIS_X;
 int CONFIG_JOYSTICK_AXIS_Y;
 int CONFIG_JOYSTICK_AXIS_U;
+int CONFIG_JOYSTICK_AXIS_X_INVERT;
+int CONFIG_JOYSTICK_AXIS_Y_INVERT;
+int CONFIG_JOYSTICK_AXIS_U_INVERT;
 int CONFIG_JOYSTICK_BUTTON_A;
 int CONFIG_JOYSTICK_BUTTON_B;
 int CONFIG_JOYSTICK_BUTTON_R;
@@ -77,12 +81,6 @@ int CONFIG_KEY_CAMERA_3;
 int CONFIG_KEY_CAMERA_TOGGLE;
 int CONFIG_KEY_CAMERA_R;
 int CONFIG_KEY_CAMERA_L;
-int CONFIG_VIEW_FOV;
-int CONFIG_VIEW_DP;
-int CONFIG_VIEW_DC;
-int CONFIG_VIEW_DZ;
-int CONFIG_ROTATE_FAST;
-int CONFIG_ROTATE_SLOW;
 int CONFIG_KEY_FORWARD;
 int CONFIG_KEY_BACKWARD;
 int CONFIG_KEY_LEFT;
@@ -91,6 +89,12 @@ int CONFIG_KEY_PAUSE;
 int CONFIG_KEY_RESTART;
 int CONFIG_KEY_SCORE_NEXT;
 int CONFIG_KEY_ROTATE_FAST;
+int CONFIG_VIEW_FOV;
+int CONFIG_VIEW_DP;
+int CONFIG_VIEW_DC;
+int CONFIG_VIEW_DZ;
+int CONFIG_ROTATE_FAST;
+int CONFIG_ROTATE_SLOW;
 int CONFIG_CHEAT;
 int CONFIG_STATS;
 int CONFIG_UNIFORM;
@@ -143,11 +147,14 @@ static struct
     { &CONFIG_SOUND_VOLUME, "sound_volume", 10 },
     { &CONFIG_MUSIC_VOLUME, "music_volume", 6 },
 
-    { &CONFIG_JOYSTICK,               "joystick",               0 },
+    { &CONFIG_JOYSTICK,               "joystick",               1 },
     { &CONFIG_JOYSTICK_DEVICE,        "joystick_device",        0 },
     { &CONFIG_JOYSTICK_AXIS_X,        "joystick_axis_x",        0 },
     { &CONFIG_JOYSTICK_AXIS_Y,        "joystick_axis_y",        1 },
     { &CONFIG_JOYSTICK_AXIS_U,        "joystick_axis_u",        2 },
+    { &CONFIG_JOYSTICK_AXIS_X_INVERT, "joystick_axis_x_invert", 0 },
+    { &CONFIG_JOYSTICK_AXIS_Y_INVERT, "joystick_axis_y_invert", 0 },
+    { &CONFIG_JOYSTICK_AXIS_U_INVERT, "joystick_axis_u_invert", 0 },
     { &CONFIG_JOYSTICK_BUTTON_A,      "joystick_button_a",      0 },
     { &CONFIG_JOYSTICK_BUTTON_B,      "joystick_button_b",      1 },
     { &CONFIG_JOYSTICK_BUTTON_R,      "joystick_button_r",      2 },
@@ -169,12 +176,6 @@ static struct
     { &CONFIG_KEY_CAMERA_TOGGLE, "key_camera_toggle", SDLK_e },
     { &CONFIG_KEY_CAMERA_R,      "key_camera_r",      SDLK_d },
     { &CONFIG_KEY_CAMERA_L,      "key_camera_l",      SDLK_s },
-    { &CONFIG_VIEW_FOV,          "view_fov",          50 },
-    { &CONFIG_VIEW_DP,           "view_dp",           75 },
-    { &CONFIG_VIEW_DC,           "view_dc",           25 },
-    { &CONFIG_VIEW_DZ,           "view_dz",           200 },
-    { &CONFIG_ROTATE_FAST,       "rotate_fast",       200 },
-    { &CONFIG_ROTATE_SLOW,       "rotate_slow",       100 },
     { &CONFIG_KEY_FORWARD,       "key_forward",       SDLK_UP },
     { &CONFIG_KEY_BACKWARD,      "key_backward",      SDLK_DOWN },
     { &CONFIG_KEY_LEFT,          "key_left",          SDLK_LEFT },
@@ -183,11 +184,18 @@ static struct
     { &CONFIG_KEY_RESTART,       "key_restart",       SDLK_r },
     { &CONFIG_KEY_SCORE_NEXT,    "key_score_next",    SDLK_TAB },
     { &CONFIG_KEY_ROTATE_FAST,   "key_rotate_fast",   SDLK_LSHIFT },
-    { &CONFIG_CHEAT,             "cheat",             0 },
-    { &CONFIG_STATS,             "stats",             0 },
-    { &CONFIG_UNIFORM,           "uniform",           0 },
-    { &CONFIG_SCREENSHOT,        "screenshot",        0 },
-    { &CONFIG_LOCK_GOALS,        "lock_goals",        0 }
+
+    { &CONFIG_VIEW_FOV,    "view_fov",    50 },
+    { &CONFIG_VIEW_DP,     "view_dp",     75 },
+    { &CONFIG_VIEW_DC,     "view_dc",     25 },
+    { &CONFIG_VIEW_DZ,     "view_dz",     200 },
+    { &CONFIG_ROTATE_FAST, "rotate_fast", 300 },
+    { &CONFIG_ROTATE_SLOW, "rotate_slow", 150 },
+    { &CONFIG_CHEAT,       "cheat",       0 },
+    { &CONFIG_STATS,       "stats",       0 },
+    { &CONFIG_UNIFORM,     "uniform",     0 },
+    { &CONFIG_SCREENSHOT,  "screenshot",  0 },
+    { &CONFIG_LOCK_GOALS,  "lock_goals",  0 }
 };
 
 static struct
@@ -342,13 +350,13 @@ static int scan_key_and_value(char **dst_key, char **dst_val, char *line)
 
 void config_load(void)
 {
-    FILE *fp;
+    fs_file fh;
 
-    if ((fp = fopen(config_user(USER_CONFIG_FILE), "r")))
+    if ((fh = fs_open(USER_CONFIG_FILE, "r")))
     {
         char *line, *key, *val;
 
-        while (read_line(&line, fp))
+        while (read_line(&line, fh))
         {
             if (scan_key_and_value(&key, &val, line))
             {
@@ -410,7 +418,7 @@ void config_load(void)
             }
             free(line);
         }
-        fclose(fp);
+        fs_close(fh);
 
         dirty = 0;
     }
@@ -418,9 +426,9 @@ void config_load(void)
 
 void config_save(void)
 {
-    FILE *fp;
+    fs_file fh;
 
-    if (dirty && (fp = fopen(config_user(USER_CONFIG_FILE), "w")))
+    if (dirty && (fh = fs_open(USER_CONFIG_FILE, "w")))
     {
         int i;
 
@@ -465,9 +473,9 @@ void config_save(void)
             }
 
             if (s)
-                fprintf(fp, "%-25s %s\n", option_d[i].name, s);
+                fs_printf(fh, "%-25s %s\n", option_d[i].name, s);
             else
-                fprintf(fp, "%-25s %d\n", option_d[i].name, option_d[i].cur);
+                fs_printf(fh, "%-25s %d\n", option_d[i].name, option_d[i].cur);
         }
 
         /* Write out string options. */
@@ -475,10 +483,10 @@ void config_save(void)
         for (i = 0; i < ARRAYSIZE(option_s); i++)
         {
             if (option_s[i].cur && *option_s[i].cur)
-                fprintf(fp, "%-25s %s\n", option_s[i].name, option_s[i].cur);
+                fs_printf(fh, "%-25s %s\n", option_s[i].name, option_s[i].cur);
         }
 
-        fclose(fp);
+        fs_close(fh);
     }
 
     dirty = 0;
@@ -520,9 +528,9 @@ void config_set_s(int i, const char *src)
     dirty = 1;
 }
 
-void config_get_s(int i, char *dst, int len)
+const char *config_get_s(int i)
 {
-    strncpy(dst, option_s[i].cur, len);
+    return option_s[i].cur;
 }
 
 /*---------------------------------------------------------------------------*/