Correct logic of BSP back/front tests

[neverball] / share / solid.h

diff --git a/share/solid.h b/share/solid.h
index a97219a..6038b83 100644 (file)
--- a/share/solid.h
+++ b/share/solid.h
@@ -53,7 +53,6 @@
  *     d  Dictionary    (struct s_dict)
  *     i  Index         (int)
  *     a  Text          (char)
-
  *
  * The Ys are as follows:
  *
@@ -224,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?                */
 };
 
 struct s_bill
@@ -260,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
@@ -336,9 +331,9 @@ 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);
-int   sol_swch_test(struct s_file *);
-int   sol_goal_test(struct s_file *, float *, int);
+int   sol_swch_test(struct s_file *, int);
 
+struct s_goal *sol_goal_test(struct s_file *, float *, int);
 struct s_item *sol_item_test(struct s_file *, float *, float);
 
 /*---------------------------------------------------------------------------*/