Remove SOL body flags

[neverball] / share / base_config.h

diff --git a/share/base_config.h b/share/base_config.h
index e86f669..9a2d68e 100644 (file)
--- a/share/base_config.h
+++ b/share/base_config.h
@@ -21,15 +21,30 @@
  */
 
 #include <stdio.h>
-#include "i18n.h"
+#include <SDL_endian.h>
 
 /*---------------------------------------------------------------------------*/
 
-#define VERSION       "1.4.1svn"      /* Game version */
+#ifndef VERSION
+#define VERSION "unknown"
+#endif
 
+#ifndef CONFIG_DATA
 #define CONFIG_DATA   "./data"        /* Game data directory */
+#endif
+
+#ifndef CONFIG_LOCALE
 #define CONFIG_LOCALE "./locale"      /* Game localisation */
-#define CONFIG_USER   ".neverball-svn"    /* User config directory */
+#endif
+
+/* User config directory */
+#ifndef CONFIG_USER
+#ifdef _WIN32
+#define CONFIG_USER   "Neverball"
+#else
+#define CONFIG_USER   ".neverball"
+#endif
+#endif
 
 /*
  * Global settings are stored in USER_CONFIG_FILE.  Replays are stored
@@ -37,10 +52,9 @@
  * directory as given by the HOME environment var.  If the config file
  * is deleted, it will be recreated using the defaults.
  */
-#define USER_CONFIG_FILE "neverballrc"
-#define USER_REPLAY_FILE _("Last.nbr")
-#define REPLAY_EXT ".nbr"
-#define ALLOW_CHEAT     1
+
+#define USER_CONFIG_FILE    "neverballrc"
+#define USER_REPLAY_FILE    "Last"
 
 /*---------------------------------------------------------------------------*/
 
@@ -74,15 +88,12 @@
 #define PATHMAX 64
 #define MAXNAM 9
 
-#define GUI_FACE                    _("ttf/DejaVuSans-Bold.ttf")
+#define UPS 90
+#define DT  (1.0f / (float) UPS)
 
 /*---------------------------------------------------------------------------*/
 
-const char *config_data(const char *);
-const char *config_user(const char *);
-
-int  config_data_path(const char *, const char *);
-int  config_user_path(const char *);
+void config_paths(const char *);
 
 /*---------------------------------------------------------------------------*/