Remove drawball for real this time and fix an accidental regression.

[neverball] / ball / levels.h

diff --git a/ball/levels.h b/ball/levels.h
index 3784ea7..c93bac2 100644 (file)
--- a/ball/levels.h
+++ b/ball/levels.h
@@ -1,62 +1,23 @@
 #ifndef LEVELS_H
 #define LEVELS_H
 
+#include "game.h"
+
 /*---------------------------------------------------------------------------*/
 
-#define MODE_CHALLENGE 1
-#define MODE_NORMAL    2
-#define MODE_PRACTICE  3
-#define MODE_SINGLE    4
-
-const char *mode_to_str(int);
-
-const char *level_shot(int);
-const char *level_coin_n(int, int);
-const char *level_time_n(int, int);
-int         level_coin_c(int, int);
-int         level_time_c(int, int);
-int         level_coin_t(int, int);
-int         level_time_t(int, int);
-
-void level_init(const char *, const char *, const char *);
-void level_free(void);
-
-int  level_exists(int);
-int  level_opened(int);
-int  level_locked(int);
-int  level_extra_bonus(int i);
-int  level_extra_bonus_opened(void);
-int  level_set_completed(void);
-const char * level_number_name(int);
-
-int  curr_times_total(void);
-int  curr_coins_total(void);
-int  curr_count(void);
-int  curr_score(void);
-int  curr_balls(void);
-int  curr_level(void);
+const struct level_game *curr_lg(void);
 
 int  level_replay(const char *);
 void level_play_single(const char *);
-void level_play(int, int);
+void level_play(const struct level *, int);
 int  level_play_go(void);
 void level_next(void);
 
-void level_stop(int);
-int  level_dead(void);
-int  level_last(void);
-int  level_sort(int *, int *);
-int  level_done(int *, int *);
-int  count_extra_balls(int, int);
-       
-
-void level_name(int, const char *, int, int);
-void level_snap(int);
-void level_song(void);
+void level_stop(int, int, int, int);
 
-int level_mode(void);
+int  count_extra_balls(int, int);
 
-void level_cheat(void);
+void level_update_player_name(void);
 
 /*---------------------------------------------------------------------------*/