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 0e251fe..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,
@@ -78,6 +81,7 @@ enum {
     CONFIG_KEY_PAUSE,
     CONFIG_KEY_RESTART,
     CONFIG_CHEAT,
+    CONFIG_STATS,
 
     CONFIG_OPTION_D_COUNT
 };
@@ -100,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
@@ -142,6 +147,7 @@ enum {
 #define DEFAULT_KEY_RIGHT            SDLK_RIGHT
 #define DEFAULT_KEY_PAUSE            SDLK_SPACE
 #define DEFAULT_KEY_RESTART          SDLK_r
+#define DEFAULT_STATS                0
 
 /*---------------------------------------------------------------------------*/