Minor code simplification in share/i18n.c

[neverball] / share / config.c

diff --git a/share/config.c b/share/config.c
index f7d33b1..c514c6a 100644 (file)
--- a/share/config.c
+++ b/share/config.c
@@ -61,8 +61,8 @@ static void config_key(const char *s, int i, int d)
 
 void config_init(void)
 {
-    memset(option_d, 0, CONFIG_OPTION_D_COUNT * sizeof (int));
-    memset(option_s, 0, CONFIG_OPTION_S_COUNT * sizeof (char *));
+    memset(option_d, 0, sizeof (option_d));
+    memset(option_s, 0, sizeof (option_s));
 
     config_set_d(CONFIG_FULLSCREEN,           DEFAULT_FULLSCREEN);
     config_set_d(CONFIG_WIDTH,                DEFAULT_WIDTH);
@@ -105,12 +105,11 @@ void config_init(void)
     config_set_d(CONFIG_VIEW_DZ,              DEFAULT_VIEW_DZ);
     config_set_d(CONFIG_ROTATE_FAST,          DEFAULT_ROTATE_FAST);
     config_set_d(CONFIG_ROTATE_SLOW,          DEFAULT_ROTATE_SLOW);
-    config_set_d(CONFIG_LAST_SET,             DEFAULT_LAST_SET);
     config_set_d(CONFIG_MODE,                 DEFAULT_MODE);
     config_set_d(CONFIG_CHEAT,                DEFAULT_CHEAT);
     config_set_s(CONFIG_PLAYER,               DEFAULT_PLAYER);
     config_set_s(CONFIG_BALL,                 DEFAULT_BALL);
-    config_set_s(CONFIG_COIN,                 DEFAULT_COIN);
+    config_set_s(CONFIG_BALL_BONUS,           DEFAULT_BALL_BONUS);
     config_set_s(CONFIG_LANG,                 DEFAULT_LANG);
 }
 
@@ -199,11 +198,9 @@ void config_load(void)
                     config_set_d(CONFIG_ROTATE_FAST,          atoi(val));
                 else if (strcmp(key, "rotate_slow")           == 0)
                     config_set_d(CONFIG_ROTATE_SLOW,          atoi(val));
-                else if (strcmp(key, "last_set")              == 0)
-                    config_set_d(CONFIG_LAST_SET,             atoi(val));
                 else if (strcmp(key, "mode")                  == 0)
                     config_set_d(CONFIG_MODE,                 atoi(val));
-                else if (strcmp(key, "cheat")                 == 0 && ALLOW_CHEAT)
+                else if (strcmp(key, "cheat") == 0 && ALLOW_CHEAT)
                     config_set_d(CONFIG_CHEAT,                atoi(val));
 
                 else if (strcmp(key, "key_camera_1")  == 0)
@@ -217,14 +214,14 @@ void config_load(void)
                 else if (strcmp(key, "key_camera_l")  == 0)
                     config_key(val, CONFIG_KEY_CAMERA_L, DEFAULT_KEY_CAMERA_L);
 
-                else if (strcmp(key, "player") == 0)
-                    config_set_s(CONFIG_PLAYER, val);
-                else if (strcmp(key, "ball")   == 0)
-                    config_set_s(CONFIG_BALL,   val);
-                else if (strcmp(key, "coin")   == 0)
-                    config_set_s(CONFIG_COIN,   val);
-                else if (strcmp(key, "lang")   == 0)
-                    config_set_s(CONFIG_LANG,   val);
+                else if (strcmp(key, "player")     == 0)
+                    config_set_s(CONFIG_PLAYER,     val);
+                else if (strcmp(key, "ball")       == 0)
+                    config_set_s(CONFIG_BALL,       val);
+                else if (strcmp(key, "ball_bonus") == 0)
+                    config_set_s(CONFIG_BALL_BONUS, val);
+                else if (strcmp(key, "lang")       == 0)
+                    config_set_s(CONFIG_LANG,       val);
             }
 
         fclose(fp);
@@ -311,13 +308,13 @@ void config_save(void)
                 option_d[CONFIG_ROTATE_FAST]);
         fprintf(fp, "rotate_slow          %d\n",
                 option_d[CONFIG_ROTATE_SLOW]);
-        fprintf(fp, "last_set             %d\n",
-                option_d[CONFIG_LAST_SET]);
         fprintf(fp, "mode                 %d\n",
                 option_d[CONFIG_MODE]);
-       if (option_d[CONFIG_CHEAT])
-        fprintf(fp, "cheat                %d\n",
-                option_d[CONFIG_CHEAT]);
+
+        if (option_d[CONFIG_CHEAT])
+            fprintf(fp,
+                    "cheat                %d\n",
+                    option_d[CONFIG_CHEAT]);
 
         fprintf(fp, "key_camera_1         %s\n",
                 SDL_GetKeyName(option_d[CONFIG_KEY_CAMERA_1]));
@@ -332,7 +329,7 @@ void config_save(void)
 
         fprintf(fp, "player               %s\n", option_s[CONFIG_PLAYER]);
         fprintf(fp, "ball                 %s\n", option_s[CONFIG_BALL]);
-        fprintf(fp, "coin                 %s\n", option_s[CONFIG_COIN]);
+        fprintf(fp, "ball_bonus           %s\n", option_s[CONFIG_BALL_BONUS]);
         fprintf(fp, "lang                 %s\n", option_s[CONFIG_LANG]);
 
         fclose(fp);
@@ -355,9 +352,9 @@ int config_mode(int f, int w, int h)
 
     if (SDL_SetVideoMode(w, h, 0, SDL_OPENGL | (f ? SDL_FULLSCREEN : 0)))
     {
-       config_set_d(CONFIG_FULLSCREEN, f);
-       config_set_d(CONFIG_WIDTH, w);
-       config_set_d(CONFIG_HEIGHT, h);
+        config_set_d(CONFIG_FULLSCREEN, f);
+        config_set_d(CONFIG_WIDTH, w);
+        config_set_d(CONFIG_HEIGHT, h);
 
         glViewport(0, 0, w, h);
         glClearColor(0.0f, 0.0f, 0.1f, 0.0f);
@@ -436,9 +433,9 @@ void config_get_s(int i, char *dst, int len)
     strncpy(dst, option_s[i], len);
 }
 
-const char * config_simple_get_s(int i)
+const char *config_simple_get_s(int i)
 {
-       return option_s[i];
+    return option_s[i];
 }
 
 /*---------------------------------------------------------------------------*/
@@ -513,7 +510,7 @@ void config_push_persp(float fov, float n, float f)
     GLdouble s = sin(r);
     GLdouble c = cos(r) / s;
 
-    GLdouble a = ((GLdouble) option_d[CONFIG_WIDTH] / 
+    GLdouble a = ((GLdouble) option_d[CONFIG_WIDTH] /
                   (GLdouble) option_d[CONFIG_HEIGHT]);
 
     glMatrixMode(GL_PROJECTION);