KK-branch, Updated message in intro, merged current trunk (3120) with branch

[neverball] / share / config.h

diff --git a/share/config.h b/share/config.h
index 9375742..64e83da 100644 (file)
--- a/share/config.h
+++ b/share/config.h
@@ -24,7 +24,9 @@
  */
 
 #include <SDL.h>
+
 #include "base_config.h"
+#include "lang.h"
 
 /*---------------------------------------------------------------------------*/
 
@@ -38,9 +40,10 @@ enum {
     CONFIG_GEOMETRY,
     CONFIG_REFLECTION,
     CONFIG_MULTISAMPLE,
+    CONFIG_MIPMAP,
+    CONFIG_ANISO,
     CONFIG_BACKGROUND,
     CONFIG_SHADOW,
-    CONFIG_AUDIO_RATE,
     CONFIG_AUDIO_BUFF,
     CONFIG_MOUSE_SENSE,
     CONFIG_MOUSE_INVERT,
@@ -71,13 +74,14 @@ enum {
     CONFIG_VIEW_DZ,
     CONFIG_ROTATE_FAST,
     CONFIG_ROTATE_SLOW,
-    CONFIG_CHEAT,
     CONFIG_KEY_FORWARD,
     CONFIG_KEY_BACKWARD,
     CONFIG_KEY_LEFT,
     CONFIG_KEY_RIGHT,
     CONFIG_KEY_PAUSE,
     CONFIG_KEY_RESTART,
+    CONFIG_CHEAT,
+    CONFIG_STATS,
 
     CONFIG_OPTION_D_COUNT
 };
@@ -85,7 +89,6 @@ enum {
 enum {
     CONFIG_PLAYER,
     CONFIG_BALL,
-    CONFIG_BALL_BONUS,
 
     CONFIG_OPTION_S_COUNT
 };
@@ -101,9 +104,10 @@ enum {
 #define DEFAULT_GEOMETRY             1
 #define DEFAULT_REFLECTION           1
 #define DEFAULT_MULTISAMPLE          0
+#define DEFAULT_MIPMAP               0
+#define DEFAULT_ANISO                1
 #define DEFAULT_BACKGROUND           1
 #define DEFAULT_SHADOW               1
-#define DEFAULT_AUDIO_RATE           44100
 #define DEFAULT_AUDIO_BUFF           AUDIO_BUFF_HI
 #define DEFAULT_MOUSE_SENSE          300
 #define DEFAULT_MOUSE_INVERT         0
@@ -134,16 +138,16 @@ enum {
 #define DEFAULT_VIEW_DZ              200
 #define DEFAULT_ROTATE_SLOW          100
 #define DEFAULT_ROTATE_FAST          200
-#define DEFAULT_CHEAT                0
 #define DEFAULT_PLAYER               ""
 #define DEFAULT_BALL                 "png/ball.png"
-#define DEFAULT_BALL_BONUS           "png/ball-bonus.png"
+#define DEFAULT_CHEAT                0
 #define DEFAULT_KEY_FORWARD          SDLK_UP
 #define DEFAULT_KEY_BACKWARD         SDLK_DOWN
 #define DEFAULT_KEY_LEFT             SDLK_LEFT
 #define DEFAULT_KEY_RIGHT            SDLK_RIGHT
 #define DEFAULT_KEY_PAUSE            SDLK_SPACE
 #define DEFAULT_KEY_RESTART          SDLK_r
+#define DEFAULT_STATS                0
 
 /*---------------------------------------------------------------------------*/
 
@@ -161,8 +165,6 @@ int  config_get_d(int);
 
 void config_set_s(int, const char *);
 void config_get_s(int, char *, int);
-const char *config_simple_get_s(int i);
-
 
 /*---------------------------------------------------------------------------*/
 
@@ -172,6 +174,12 @@ int  config_get_grab(void);
 
 /*---------------------------------------------------------------------------*/
 
+int  config_cheat(void);
+void config_set_cheat(void);
+void config_clr_cheat(void);
+
+/*---------------------------------------------------------------------------*/
+
 void config_push_persp(float, float, float);
 void config_push_ortho(void);
 void config_pop_matrix(void);