X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=ball%2Fgame.h;h=7a74aed8ac628a8f9c43aad6d3035446b8d28437;hb=afcca7618054cd6c5e900cb32f71466c45edb0cd;hp=fa2c22dc3477f007e495df52fa914a9c79ab3e2b;hpb=b22315daffe76ca7775f894747e27838881573b9;p=neverball

diff --git a/ball/game.h b/ball/game.h
index fa2c22d..7a74aed 100644
--- a/ball/game.h
+++ b/ball/game.h
@@ -3,6 +3,8 @@
 
 #include <stdio.h>
 
+#include "level.h"
+
 /*---------------------------------------------------------------------------*/
 
 #define AUD_MENU   1
@@ -30,27 +32,20 @@
 #define MAX_DN      16                 /* Maximum subdivisions of dt         */
 #define RESPONSE    0.05f              /* Input smoothing time               */
 
-#define ANGLE_BOUND 22.f               /* Angle limit of floor tilting       */
-#define NO_AA       1                  /* Disable Angle Acceleration         */
-
-
-#define GAME_NONE 0
-#define GAME_TIME 1
-#define GAME_GOAL 2
-#define GAME_FALL 3
+#define ANGLE_BOUND 20.f               /* Angle limit of floor tilting       */
+#define NO_AA       0                  /* Disable Angle Acceleration         */
 
 /*---------------------------------------------------------------------------*/
 
-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);
+int   game_step(const float[3], float, int *);
 
 void  game_set_pos(int, int);
 void  game_set_x  (int);