Group key config symbols together

[neverball] / share / solid.h

diff --git a/share/solid.h b/share/solid.h
index 0ccfa8e..7f5d643 100644 (file)
--- a/share/solid.h
+++ b/share/solid.h
@@ -223,7 +223,6 @@ struct s_swch
     int   f;                                   /* current state              */
     int   i;                                   /* is invisible?              */
     int   e;                                   /* is a ball inside it?       */
-    int   b;                                   /* which ball started it?     */
 };
 
 struct s_bill
@@ -248,10 +247,6 @@ struct s_jump
     float p[3];                                /* position                   */
     float q[3];                                /* target position            */
     float r;                                   /* radius                     */
-
-    int   b;                                   /* balls inside of jump       */
-                                               /* ball 1: 1, 2: 2, 3:4, 4:8, */
-                                               /* 5:16, 6:32, etc            */
 };
 
 struct s_ball
@@ -263,9 +258,6 @@ struct s_ball
     float E[3][3];                             /* basis of pendulum          */
     float W[3];                                /* angular pendulum velocity  */
     float r;                                   /* radius                     */
-    int   P;                                   /* play state                 */
-    int   m;                                   /* is ball mobile?            */
-    float O[3];                                /* original position          */
 };
 
 struct s_view
@@ -327,28 +319,11 @@ struct s_file
 
 /*---------------------------------------------------------------------------*/
 
-void sol_body_p(float p[3], const struct s_file *, const struct s_body *);
-
-/*---------------------------------------------------------------------------*/
-
 int   sol_load_only_file(struct s_file *, const char *);
 int   sol_load_only_head(struct s_file *, const char *);
 int   sol_stor(struct s_file *, const char *);
 void  sol_free(struct s_file *);
 
-float sol_step(struct s_file *, const float *, float, int, int *);
-
-int   sol_jump_test(struct s_file *, float *);
-int   sol_swch_test(struct s_file *);
-int   sol_goal_test(struct s_file *, float *, int);
-
-struct s_item *sol_item_test(struct s_file *, float *, float);
-
-/*---------------------------------------------------------------------------*/
-
-void put_file_state(FILE *, struct s_file *);
-void get_file_state(FILE *, struct s_file *);
-
 /*---------------------------------------------------------------------------*/
 
 #endif