Restored replay overwrite fix (Windows); didn't seem to be related to the failed...

[neverball] / ball / game.h

diff --git a/ball/game.h b/ball/game.h
index 91cb0c9..1de0fe6 100644 (file)
--- a/ball/game.h
+++ b/ball/game.h
@@ -3,6 +3,9 @@
 
 #include <stdio.h>
 
+#include "level.h"
+#include "mode.h"
+
 /*---------------------------------------------------------------------------*/
 
 #define AUD_MENU   1
@@ -11,18 +14,22 @@
 #define AUD_SET    4
 #define AUD_GO     5
 #define AUD_BALL   6
-#define AUD_BUMP   7
-#define AUD_COIN   8
-#define AUD_TICK   9
-#define AUD_TOCK   10
-#define AUD_SWITCH 11
-#define AUD_JUMP   12
-#define AUD_GOAL   13
-#define AUD_SCORE  14
-#define AUD_FALL   15
-#define AUD_TIME   16
-#define AUD_OVER   17
-#define AUD_COUNT  18
+#define AUD_BUMPS  7
+#define AUD_BUMPM  8
+#define AUD_BUMPL  9
+#define AUD_COIN   10
+#define AUD_TICK   11
+#define AUD_TOCK   12
+#define AUD_SWITCH 13
+#define AUD_JUMP   14
+#define AUD_GOAL   15
+#define AUD_SCORE  16
+#define AUD_FALL   17
+#define AUD_TIME   18
+#define AUD_OVER   19
+#define AUD_GROW   20
+#define AUD_SHRINK 21
+#define AUD_COUNT  22
 
 /*---------------------------------------------------------------------------*/
 
@@ -33,21 +40,14 @@
 #define ANGLE_BOUND 20.f               /* Angle limit of floor tilting       */
 #define NO_AA       0                  /* Disable Angle Acceleration         */
 
-
-#define GAME_NONE 0
-#define GAME_TIME 1
-#define GAME_GOAL 2
-#define GAME_FALL 3
-
 /*---------------------------------------------------------------------------*/
 
-int   game_init(const char *, const char *, const char *, int, int);
+int   game_init(const struct level *, int, int);
 void  game_free(void);
 
 int   curr_clock(void);
 int   curr_coins(void);
 int   curr_goal(void);
-char *curr_intro(void);
 
 void  game_draw(int, float);
 int   game_step(const float[3], float, int);