Remove unused sol_load_gl parameter

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

diff --git a/ball/game_client.c b/ball/game_client.c
index eaa1a2d..d3e6de8 100644 (file)
--- a/ball/game_client.c
+++ b/ball/game_client.c
@@ -422,9 +422,7 @@ int  game_client_init(const char *file_name)
     if (client_state)
         game_client_free();
 
-    if (!sol_load_gl(&file, file_name,
-                     config_get_d(CONFIG_TEXTURES),
-                     config_get_d(CONFIG_SHADOW)))
+    if (!sol_load_gl(&file, file_name, config_get_d(CONFIG_SHADOW)))
         return (client_state = 0);
 
     reflective = sol_reflective(&file);
@@ -477,8 +475,7 @@ int  game_client_init(const char *file_name)
     first_update = 1;
 
     back_init(grad_name, config_get_d(CONFIG_GEOMETRY));
-    sol_load_gl(&back, back_name,
-                config_get_d(CONFIG_TEXTURES), 0);
+    sol_load_gl(&back, back_name, 0);
 
     return client_state;
 }

diff --git a/putt/game.c b/putt/game.c
index e4fc8c7..92959e7 100644 (file)
--- a/putt/game.c
+++ b/putt/game.c
@@ -86,9 +86,7 @@ void game_init(const char *s)
     jump_b = 0;
 
     view_init();
-    sol_load_gl(&file, s,
-                config_get_d(CONFIG_TEXTURES),
-                config_get_d(CONFIG_SHADOW));
+    sol_load_gl(&file, s, config_get_d(CONFIG_SHADOW));
 }
 
 void game_free(void)

diff --git a/share/ball.c b/share/ball.c
index bac3e78..cc9e29f 100644 (file)
--- a/share/ball.c
+++ b/share/ball.c
@@ -78,8 +78,6 @@ static int ball_opts(const struct s_file *fp, float *alpha)
 
 void ball_init(void)
 {
-    int T = config_get_d(CONFIG_TEXTURES);
-
     char *solid_file = concat_string(config_get_s(CONFIG_BALL_FILE),
                                      "-solid.sol", NULL);
     char *inner_file = concat_string(config_get_s(CONFIG_BALL_FILE),
@@ -95,13 +93,13 @@ void ball_init(void)
     inner_alpha = 1.0f;
     outer_alpha = 1.0f;
 
-    if ((has_solid = sol_load_gl(&solid, solid_file, T, 0)))
+    if ((has_solid = sol_load_gl(&solid, solid_file, 0)))
         solid_flags = ball_opts(&solid, &solid_alpha);
 
-    if ((has_inner = sol_load_gl(&inner, inner_file, T, 0)))
+    if ((has_inner = sol_load_gl(&inner, inner_file, 0)))
         inner_flags = ball_opts(&inner, &inner_alpha);
 
-    if ((has_outer = sol_load_gl(&outer, outer_file, T, 0)))
+    if ((has_outer = sol_load_gl(&outer, outer_file, 0)))
         outer_flags = ball_opts(&outer, &outer_alpha);
 
     free(solid_file);

diff --git a/share/item.c b/share/item.c
index 8bf63d8..ce272d1 100644 (file)
--- a/share/item.c
+++ b/share/item.c
@@ -80,11 +80,9 @@ void item_color(const struct s_item *hp, float *c)
 
 void item_init(void)
 {
-    int T = config_get_d(CONFIG_TEXTURES);
-
-    sol_load_gl(&item_coin_file,   "item/coin/coin.sol",     T, 0);
-    sol_load_gl(&item_grow_file,   "item/grow/grow.sol",     T, 0);
-    sol_load_gl(&item_shrink_file, "item/shrink/shrink.sol", T, 0);
+    sol_load_gl(&item_coin_file,   "item/coin/coin.sol",     0);
+    sol_load_gl(&item_grow_file,   "item/grow/grow.sol",     0);
+    sol_load_gl(&item_shrink_file, "item/shrink/shrink.sol", 0);
 }
 
 void item_free(void)

diff --git a/share/solid_gl.c b/share/solid_gl.c
index 5a04d3f..ca92be3 100644 (file)
--- a/share/solid_gl.c
+++ b/share/solid_gl.c
@@ -670,7 +670,7 @@ static GLuint sol_find_texture(const char *name)
     return 0;
 }
 
-static void sol_load_textures(struct s_file *fp, int k)
+static void sol_load_textures(struct s_file *fp)
 {
     int i;
 
@@ -696,11 +696,11 @@ static void sol_load_textures(struct s_file *fp, int k)
 
 /*---------------------------------------------------------------------------*/
 
-int sol_load_gl(struct s_file *fp, const char *filename, int k, int s)
+int sol_load_gl(struct s_file *fp, const char *filename, int s)
 {
     if (sol_load_only_file(fp, filename))
     {
-        sol_load_textures(fp, k);
+        sol_load_textures(fp);
         sol_load_objects (fp, s);
         return 1;
     }

diff --git a/share/solid_gl.h b/share/solid_gl.h
index 0fbc4d7..f67fb29 100644 (file)
--- a/share/solid_gl.h
+++ b/share/solid_gl.h
@@ -19,7 +19,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-int   sol_load_gl(struct s_file *, const char *, int, int);
+int   sol_load_gl(struct s_file *, const char *, int);
 void  sol_free_gl(struct s_file *);
 
 int   sol_reflective(const struct s_file *);