Split SOL data structures into base, varying and rendering parts

[neverball] / share / geom.c

diff --git a/share/geom.c b/share/geom.c
index a103bc9..0dd3694 100644 (file)
--- a/share/geom.c
+++ b/share/geom.c
@@ -21,7 +21,6 @@
 #include "geom.h"
 #include "part.h"
 #include "vec3.h"
-#include "solid.h"
 #include "image.h"
 #include "config.h"
 #include "video.h"
@@ -32,9 +31,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 +81,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 +125,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 +180,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);
 
@@ -216,7 +215,7 @@ void swch_init(int b)
 void swch_free(void)
 {
     if (glIsList(swch_list))
-        glDeleteLists(swch_list, 2);
+        glDeleteLists(swch_list, 4);
 
     swch_list = 0;
 }
@@ -230,9 +229,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);