Store replay date/time as an ISO 8601 formatted string. This involves

[neverball] / ball / level.h

diff --git a/ball/level.h b/ball/level.h
index f406e3c..3e64557 100644 (file)
--- a/ball/level.h
+++ b/ball/level.h
@@ -6,54 +6,52 @@
 
 /*---------------------------------------------------------------------------*/
 
-/* A score structure */
-
 struct score
 {
-    char player[NSCORE+1][MAXNAM]; /* player name */
-    int  timer[NSCORE+1];          /* time elapsed */
-    int  coins[NSCORE+1];          /* coins collected */
+    char player[NSCORE + 1][MAXNAM];
+
+    int  timer [NSCORE + 1]; /* Time elapsed    */
+    int  coins [NSCORE + 1]; /* Coins collected */
 };
 
 void score_init_hs(struct score *, int, int);
 
 /*---------------------------------------------------------------------------*/
 
-/* A simple level */
-
 struct level
 {
-    /* Level identity */
-       
-    char file[MAXSTR];    /* sol main file */
-    char name[MAXSTR];    /* the level name */
-    int  version;         /* the level version */
-    char author[MAXSTR];  /* the author */
-    
-    /* Time and goal information */
-    
-    int time;             /* time limit */
-    int goal;             /* coins needed */
-
-    struct score time_score;  /* "best time" score */
-    struct score goal_score;  /* "unlock goal" score */
-    struct score coin_score;  /* "most coin" score */
-
-    /* Regarding set information */
-    
-    struct set * set;       /* set (NULL in single mode) */
-    int number;             /* level number in the set */
-    const char *numbername; /* string representation of the number (eg. B1) */
-    int is_locked;          /* Is the level unplayable */
-    int is_bonus;           /* Is the level an extra-bonus level? */ 
-    
-    /* Other metadata (files are relative the data file) */
-    
-    char message[MAXSTR]; /* intro message */
-    char back[MAXSTR];    /* sol background file */
-    char grad[MAXSTR];    /* gradiant backgound image */
-    char shot[MAXSTR];    /* screenshot image */
-    char song[MAXSTR];    /* song file */
+    char file[PATHMAX];
+    char back[PATHMAX];
+    char grad[PATHMAX];
+    char shot[PATHMAX];
+    char song[PATHMAX];
+
+    char message[MAXSTR];
+
+    char version[MAXSTR];
+    char author[MAXSTR];
+
+    int time; /* Time limit   */
+    int goal; /* Coins needed */
+
+    struct
+    {
+        struct score best_times;
+        struct score unlock_goal;
+        struct score most_coins;
+    }
+    score;
+
+    /* Set information. */
+
+    struct set *set;
+
+    int  number;
+    char repr[3]; /* String representation of the number (eg. "B1") */
+
+    int is_locked;
+    int is_bonus;
+    int is_completed;
 };
 
 int level_load(const char *, struct level *);
@@ -71,7 +69,7 @@ struct level_game
 
     int goal;          /* coins needed */
     int time;          /* time limit */
-    
+
     /* MODE_CHALLENGE only */
     int score;         /* coin total */
     int balls;         /* live count */
@@ -81,7 +79,8 @@ struct level_game
     int state;         /* state ending */
     int coins;         /* coins collected */
     int timer;         /* time elapsed */
-    
+    int state_value;   /* more precision about the state: skip for goal */
+
     /* rank = 3  => unclassed */
     int coin_rank;     /* rank in the level high-scores */
     int goal_rank;     /* rank in the level high-scores */
@@ -89,6 +88,10 @@ struct level_game
     int score_rank;    /* rank in the set high-scores */
     int times_rank;    /* rank in the set high-scores */
 
+    /* What about the game and the set? */
+    int dead;          /* Is the game over and lost? */
+    int win;           /* Is the game over and win? */
+    int unlock;        /* Is the next level newly unlocked */
     const struct level *next_level; /* next level (NULL no next level) */
 };
 
@@ -103,10 +106,11 @@ const char *mode_to_str(int);
 
 /*---------------------------------------------------------------------------*/
 
-#define GAME_NONE 0
-#define GAME_TIME 1
-#define GAME_GOAL 2
-#define GAME_FALL 3
+#define GAME_NONE 0     /* No event (or aborted) */
+#define GAME_TIME 1     /* Time's up */
+#define GAME_GOAL 2     /* Goal reached */
+#define GAME_FALL 3     /* Fall out */
+#define GAME_SPEC 4     /* Special goal reached */
 
 const char *state_to_str(int);