Remove "geometry" option

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

diff --git a/ball/game_client.c b/ball/game_client.c
index 31e0219..a549d55 100644 (file)
--- a/ball/game_client.c
+++ b/ball/game_client.c
@@ -435,7 +435,7 @@ int  game_client_init(const char *file_name)
     ups          = 0;
     first_update = 1;
 
-    back_init(grad_name, config_get_d(CONFIG_GEOMETRY));
+    back_init(grad_name);
     sol_load_gl(&dr.back, back_name, 0);
 
     return dr.state;

diff --git a/ball/st_ball.c b/ball/st_ball.c
index 07a9372..d15b287 100644 (file)
--- a/ball/st_ball.c
+++ b/ball/st_ball.c
@@ -146,7 +146,7 @@ static void load_ball_demo(void)
     game_client_fly(0);
     game_kill_fade();
 
-    back_init("back/gui.png", config_get_d(CONFIG_GEOMETRY));
+    back_init("back/gui.png");
 }
 
 static int ball_gui(void)

diff --git a/ball/st_conf.c b/ball/st_conf.c
index 5d5919e..d050de4 100644 (file)
--- a/ball/st_conf.c
+++ b/ball/st_conf.c
@@ -40,13 +40,12 @@ extern const char ICON[];
 
 /*---------------------------------------------------------------------------*/
 
-enum {
+enum
+{
     CONF_FULL = 1,
     CONF_WIN,
     CONF_TEXHI,
     CONF_TEXLO,
-    CONF_GEOHI,
-    CONF_GEOLO,
     CONF_REFON,
     CONF_REFOF,
     CONF_BACON,
@@ -98,18 +97,6 @@ static int conf_action(int i)
         goto_state(&st_conf);
         break;
 
-    case CONF_GEOHI:
-        goto_state(&st_null);
-        config_set_d(CONFIG_GEOMETRY, 1);
-        goto_state(&st_conf);
-        break;
-
-    case CONF_GEOLO:
-        goto_state(&st_null);
-        config_set_d(CONFIG_GEOMETRY, 0);
-        goto_state(&st_conf);
-        break;
-
     case CONF_REFON:
         goto_state(&st_null);
         config_set_d(CONFIG_REFLECTION, 1);
@@ -201,7 +188,6 @@ static int conf_gui(void)
     {
         int f = config_get_d(CONFIG_FULLSCREEN);
         int t = config_get_d(CONFIG_TEXTURES);
-        int g = config_get_d(CONFIG_GEOMETRY);
         int r = config_get_d(CONFIG_REFLECTION);
         int b = config_get_d(CONFIG_BACKGROUND);
         int h = config_get_d(CONFIG_SHADOW);
@@ -259,15 +245,6 @@ static int conf_gui(void)
         if ((jd = gui_harray(id)) &&
             (kd = gui_harray(jd)))
         {
-            gui_state(kd, _("Low"),  GUI_SML, CONF_GEOLO, (g == 0));
-            gui_state(kd, _("High"), GUI_SML, CONF_GEOHI, (g == 1));
-
-            gui_label(jd, _("Geometry"), GUI_SML, GUI_ALL, 0, 0);
-        }
-
-        if ((jd = gui_harray(id)) &&
-            (kd = gui_harray(jd)))
-        {
             gui_state(kd, _("Off"), GUI_SML, CONF_REFOF, (r == 0));
             gui_state(kd, _("On"),  GUI_SML, CONF_REFON, (r == 1));
 
@@ -365,7 +342,7 @@ static int conf_gui(void)
 static int conf_enter(struct state *st, struct state *prev)
 {
     game_client_free();
-    back_init("back/gui.png", config_get_d(CONFIG_GEOMETRY));
+    back_init("back/gui.png");
     audio_music_fade_to(0.5f, "bgm/inter.ogg");
 
     return conf_gui();
@@ -418,15 +395,13 @@ static int null_enter(struct state *st, struct state *prev)
 
 static void null_leave(struct state *st, struct state *next, int id)
 {
-    int g = config_get_d(CONFIG_GEOMETRY);
-
     part_init(GOAL_HEIGHT, JUMP_HEIGHT);
     shad_init();
     ball_init();
     item_init();
-    goal_init(g);
-    jump_init(g);
-    swch_init(g);
+    goal_init();
+    jump_init();
+    swch_init();
     gui_init();
     hud_init();
 }

diff --git a/ball/st_name.c b/ball/st_name.c
index e166e78..06fb8db 100644 (file)
--- a/ball/st_name.c
+++ b/ball/st_name.c
@@ -128,7 +128,7 @@ static int name_enter(struct state *st, struct state *prev)
     if (draw_back)
     {
         game_client_free();
-        back_init("back/gui.png", config_get_d(CONFIG_GEOMETRY));
+        back_init("back/gui.png");
     }
 
     SDL_EnableUNICODE(1);

diff --git a/putt/hole.c b/putt/hole.c
index e8c7c72..50b8baa 100644 (file)
--- a/putt/hole.c
+++ b/putt/hole.c
@@ -231,7 +231,7 @@ void hole_goto(int h, int p)
         player = (hole - 1) % party + 1;
         done   = 0;
 
-        back_init(hole_v[hole].back, 1);
+        back_init(hole_v[hole].back);
         game_init(hole_v[hole].file);
 
         for (i = 1; i <= party; i++)

diff --git a/putt/st_conf.c b/putt/st_conf.c
index c640b5a..0fbffeb 100644 (file)
--- a/putt/st_conf.c
+++ b/putt/st_conf.c
@@ -29,13 +29,12 @@
 
 /*---------------------------------------------------------------------------*/
 
-enum {
+enum
+{
     CONF_FULL = 1,
     CONF_WIN,
     CONF_TEXHI,
     CONF_TEXLO,
-    CONF_GEOHI,
-    CONF_GEOLO,
     CONF_SHDON,
     CONF_SHDOF,
     CONF_BACK,
@@ -81,18 +80,6 @@ static int conf_action(int i)
         goto_state(&st_conf);
         break;
 
-    case CONF_GEOHI:
-        goto_state(&st_null);
-        config_set_d(CONFIG_GEOMETRY, 1);
-        goto_state(&st_conf);
-        break;
-
-    case CONF_GEOLO:
-        goto_state(&st_null);
-        config_set_d(CONFIG_GEOMETRY, 0);
-        goto_state(&st_conf);
-        break;
-
     case CONF_SHDON:
         goto_state(&st_null);
         config_set_d(CONFIG_SHADOW, 1);
@@ -145,7 +132,7 @@ static int conf_enter(struct state *st, struct state *prev)
 {
     int id, jd, kd;
 
-    back_init("back/gui.png", config_get_d(CONFIG_GEOMETRY));
+    back_init("back/gui.png");
 
     /* Initialize the configuration GUI. */
 
@@ -153,7 +140,6 @@ static int conf_enter(struct state *st, struct state *prev)
     {
         int f = config_get_d(CONFIG_FULLSCREEN);
         int t = config_get_d(CONFIG_TEXTURES);
-        int g = config_get_d(CONFIG_GEOMETRY);
         int h = config_get_d(CONFIG_SHADOW);
         int s = config_get_d(CONFIG_SOUND_VOLUME);
         int m = config_get_d(CONFIG_MUSIC_VOLUME);
@@ -204,15 +190,6 @@ static int conf_enter(struct state *st, struct state *prev)
         if ((jd = gui_harray(id)) &&
             (kd = gui_harray(jd)))
         {
-            gui_state(kd, _("Low"),  GUI_SML, CONF_GEOLO, (g == 0));
-            gui_state(kd, _("High"), GUI_SML, CONF_GEOHI, (g == 1));
-
-            gui_label(jd, _("Geometry"), GUI_SML, GUI_ALL, 0, 0);
-        }
-
-        if ((jd = gui_harray(id)) &&
-            (kd = gui_harray(jd)))
-        {
             gui_state(kd, _("Off"),  GUI_SML, CONF_SHDOF, (h == 0));
             gui_state(kd, _("On"),   GUI_SML, CONF_SHDON, (h == 1));
 
@@ -345,14 +322,12 @@ static int null_enter(struct state *st, struct state *prev)
 
 static void null_leave(struct state *st, struct state *next, int id)
 {
-    int g = config_get_d(CONFIG_GEOMETRY);
-
     shad_init();
     ball_init();
-    mark_init(g);
-    flag_init(g);
-    jump_init(g);
-    swch_init(g);
+    mark_init();
+    flag_init();
+    jump_init();
+    swch_init();
     gui_init();
 }
 

diff --git a/share/back.c b/share/back.c
index e8f1033..37a0ec9 100644 (file)
--- a/share/back.c
+++ b/share/back.c
@@ -30,10 +30,10 @@ static GLuint back_text;
 
 /*---------------------------------------------------------------------------*/
 
-void back_init(const char *s, int b)
+void back_init(const char *s)
 {
-    int i, slices = b ? 32 : 16;
-    int j, stacks = b ? 16 :  8;
+    int i, slices = 32;
+    int j, stacks = 16;
 
     back_free();
     back_text = make_image_from_file(s);

diff --git a/share/back.h b/share/back.h
index 78d5887..3393a61 100644 (file)
--- a/share/back.h
+++ b/share/back.h
@@ -6,7 +6,7 @@
 #define BACK_DIST 256.0f
 #define FAR_DIST  512.0f
 
-void back_init(const char *, int);
+void back_init(const char *);
 void back_free(void);
 void back_draw(float);
 

diff --git a/share/config.c b/share/config.c
index c2ed447..5b05644 100644 (file)
--- a/share/config.c
+++ b/share/config.c
@@ -32,7 +32,6 @@ int CONFIG_HEIGHT;
 int CONFIG_STEREO;
 int CONFIG_CAMERA;
 int CONFIG_TEXTURES;
-int CONFIG_GEOMETRY;
 int CONFIG_REFLECTION;
 int CONFIG_MULTISAMPLE;
 int CONFIG_MIPMAP;
@@ -122,7 +121,6 @@ static struct
     { &CONFIG_STEREO,       "stereo",       0 },
     { &CONFIG_CAMERA,       "camera",       0 },
     { &CONFIG_TEXTURES,     "textures",     1 },
-    { &CONFIG_GEOMETRY,     "geometry",     1 },
     { &CONFIG_REFLECTION,   "reflection",   1 },
     { &CONFIG_MULTISAMPLE,  "multisample",  0 },
     { &CONFIG_MIPMAP,       "mipmap",       0 },

diff --git a/share/config.h b/share/config.h
index 4716723..b975d12 100644 (file)
--- a/share/config.h
+++ b/share/config.h
@@ -38,7 +38,6 @@ extern int CONFIG_HEIGHT;
 extern int CONFIG_STEREO;
 extern int CONFIG_CAMERA;
 extern int CONFIG_TEXTURES;
-extern int CONFIG_GEOMETRY;
 extern int CONFIG_REFLECTION;
 extern int CONFIG_MULTISAMPLE;
 extern int CONFIG_MIPMAP;

diff --git a/share/geom.c b/share/geom.c
index a103bc9..7144dd3 100644 (file)
--- a/share/geom.c
+++ b/share/geom.c
@@ -32,9 +32,9 @@
 
 static GLuint mark_list;
 
-void mark_init(int b)
+void mark_init(void)
 {
-    int i, slices = b ? 32 : 16;
+    int i, slices = 32;
 
     mark_list = glGenLists(1);
 
@@ -82,9 +82,9 @@ void mark_free(void)
 
 static GLuint goal_list;
 
-void goal_init(int b)
+void goal_init(void)
 {
-    int i, n = b ? 32 : 8;
+    int i, n = 32;
 
     goal_list = glGenLists(1);
 
@@ -126,9 +126,9 @@ void goal_draw(void)
 
 static GLuint jump_list;
 
-void jump_init(int b)
+void jump_init(void)
 {
-    int k, i, n = b ? 32 : 8;
+    int k, i, n = 32;
 
     jump_list = glGenLists(2);
 
@@ -181,9 +181,9 @@ static GLfloat swch_colors[8][4] = {
     { 0.0f, 1.0f, 0.0f, 0.8f }, /* green in */
     { 0.0f, 1.0f, 0.0f, 0.0f }};
 
-void swch_init(int b)
+void swch_init(void)
 {
-    int k, i, n = b ? 32 : 8;
+    int k, i, n = 32;
 
     swch_list = glGenLists(4);
 
@@ -230,9 +230,9 @@ void swch_draw(int b, int e)
 
 static GLuint flag_list;
 
-void flag_init(int b)
+void flag_init(void)
 {
-    int i, n = b ? 8 : 4;
+    int i, n = 8;
 
     flag_list = glGenLists(1);
 

diff --git a/share/geom.h b/share/geom.h
index a21b660..7e54e3d 100644 (file)
--- a/share/geom.h
+++ b/share/geom.h
@@ -16,31 +16,31 @@
 
 /*---------------------------------------------------------------------------*/
 
-void mark_init(int);
+void mark_init(void);
 void mark_free(void);
 void mark_draw(void);
 
 /*---------------------------------------------------------------------------*/
 
-void goal_init(int);
+void goal_init(void);
 void goal_free(void);
 void goal_draw(void);
 
 /*---------------------------------------------------------------------------*/
 
-void jump_init(int);
+void jump_init(void);
 void jump_free(void);
 void jump_draw(int);
 
 /*---------------------------------------------------------------------------*/
 
-void swch_init(int);
+void swch_init(void);
 void swch_free(void);
 void swch_draw(int, int);
 
 /*---------------------------------------------------------------------------*/
 
-void flag_init(int);
+void flag_init(void);
 void flag_free(void);
 void flag_draw(void);
 

diff --git a/share/st_resol.c b/share/st_resol.c
index d82a036..9a1ff7f 100644 (file)
--- a/share/st_resol.c
+++ b/share/st_resol.c
@@ -116,7 +116,7 @@ static int resol_gui(void)
 
 static int resol_enter(struct state *st, struct state *prev)
 {
-    back_init("back/gui.png", config_get_d(CONFIG_GEOMETRY));
+    back_init("back/gui.png");
 
     modes = SDL_ListModes(NULL, SDL_OPENGL | SDL_FULLSCREEN);