Fix score loader improperly reading player names with spaces

[neverball] / share / solid.h

diff --git a/share/solid.h b/share/solid.h
index 6038b83..4e694b0 100644 (file)
--- a/share/solid.h
+++ b/share/solid.h
@@ -106,6 +106,10 @@
 #define ITEM_GROW       2
 #define ITEM_SHRINK     3
 
+/* Path flags. */
+
+#define P_ORIENTED 1
+
 /*---------------------------------------------------------------------------*/
 
 struct s_mtrl
@@ -174,11 +178,16 @@ struct s_node
 struct s_path
 {
     float p[3];                                /* starting position          */
+    float e[4];                                /* orientation (quaternion)   */
     float t;                                   /* travel time                */
 
     int pi;
     int f;                                     /* enable flag                */
     int s;                                     /* smooth flag                */
+
+    int fl;                                    /* flags                      */
+
+    /* TODO: merge enable and smooth into flags. */
 };
 
 struct s_body
@@ -319,28 +328,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);
-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);
-
-/*---------------------------------------------------------------------------*/
-
-void put_file_state(FILE *, struct s_file *);
-void get_file_state(FILE *, struct s_file *);
-
 /*---------------------------------------------------------------------------*/
 
 #endif