X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=ball%2Fgame.h;h=4a4727c123c0ee49a854beb5172b68b9d69be51c;hb=9a5b5f027b27b45b4926604f48cf00904b37ec64;hp=943229ed399c288e125c43ccfb54653586e3ff37;hpb=50a2349b18ed8a94376e6bd41bc06da0208c97ee;p=neverball

diff --git a/ball/game.h b/ball/game.h
index 943229e..4a4727c 100644
--- a/ball/game.h
+++ b/ball/game.h
@@ -4,43 +4,39 @@
 #include <stdio.h>
 
 #include "level.h"
+#include "mode.h"
 
 /*---------------------------------------------------------------------------*/
 
-#define AUD_MENU   1
-#define AUD_START  2
-#define AUD_READY  3
-#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_MENU    "snd/menu.ogg"
+#define AUD_START _("snd/select.ogg")
+#define AUD_READY _("snd/ready.ogg")
+#define AUD_SET   _("snd/set.ogg")
+#define AUD_GO    _("snd/go.ogg")
+#define AUD_BALL    "snd/ball.ogg"
+#define AUD_BUMPS   "snd/bumplil.ogg"
+#define AUD_BUMPM   "snd/bump.ogg"
+#define AUD_BUMPL   "snd/bumpbig.ogg"
+#define AUD_COIN    "snd/coin.ogg"
+#define AUD_TICK    "snd/tick.ogg"
+#define AUD_TOCK    "snd/tock.ogg"
+#define AUD_SWITCH  "snd/switch.ogg"
+#define AUD_JUMP    "snd/jump.ogg"
+#define AUD_GOAL    "snd/goal.ogg"
+#define AUD_SCORE _("snd/record.ogg")
+#define AUD_FALL  _("snd/fall.ogg")
+#define AUD_TIME  _("snd/time.ogg")
+#define AUD_OVER  _("snd/over.ogg")
+#define AUD_GROW    "snd/grow.ogg"
+#define AUD_SHRINK  "snd/shrink.ogg"
 
 /*---------------------------------------------------------------------------*/
 
-#define MAX_DT      0.01666666         /* Maximum physics update cycle       */
-#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 ANGLE_BOUND 20.0f              /* Angle limit of floor tilting       */
+#define VIEWR_BOUND 10.0f              /* Maximum rate of view rotation      */
 #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 struct level *, int, int);
@@ -49,14 +45,15 @@ 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);
 
+void  game_set_ang(int, int);
 void  game_set_pos(int, int);
 void  game_set_x  (int);
 void  game_set_z  (int);
+void  game_set_cam(int);
 void  game_set_rot(float);
 void  game_set_fly(float);
 
@@ -66,8 +63,10 @@ void  game_kill_fade(void);
 void  game_step_fade(float);
 void  game_fade(float);
 
-int   put_game_state(FILE *);
-int   get_game_state(FILE *);
+/*---------------------------------------------------------------------------*/
+
+int input_put(FILE *);
+int input_get(FILE *);
 
 /*---------------------------------------------------------------------------*/