moved game controller base mappings file to new 'conf' sub-directory

[rocksndiamonds.git] / src / libgame / system.h

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 72a0754e1b5b5e5ab54904abce54b023eb03d760..2f6c2809fff688814c214e9030b4975d5e5e3f16 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -498,6 +498,7 @@
 #define SCORES_DIRECTORY       "scores"
 #define DOCS_DIRECTORY         "docs"
 #define CACHE_DIRECTORY                "cache"
 #define SCORES_DIRECTORY       "scores"
 #define DOCS_DIRECTORY         "docs"
 #define CACHE_DIRECTORY                "cache"

+#define CONF_DIRECTORY         "conf"

 
 #define GFX_CLASSIC_SUBDIR     "gfx_classic"
 #define SND_CLASSIC_SUBDIR     "snd_classic"
 
 #define GFX_CLASSIC_SUBDIR     "gfx_classic"
 #define SND_CLASSIC_SUBDIR     "snd_classic"


@@ -800,6 +801,7 @@ struct OptionInfo
   char *sounds_directory;
   char *music_directory;
   char *docs_directory;
   char *sounds_directory;
   char *music_directory;
   char *docs_directory;

+  char *conf_directory;

 
   char *execute_command;
 
 
   char *execute_command;
 


@@ -941,13 +943,14 @@ struct GfxInfo
 
 struct OverlayInfo
 {
 
 struct OverlayInfo
 {

-  boolean active;
+  boolean enabled;             /* overlay generally enabled or disabled */
+  boolean active;              /* overlay activated (depending on game mode) */

 };
 
 struct JoystickInfo
 {
   int status;
 };
 
 struct JoystickInfo
 {
   int status;

-  int fd[MAX_PLAYERS];         /* file descriptor of player's joystick */
+  int nr[MAX_PLAYERS];         /* joystick number for each player */

 };
 
 struct SetupJoystickInfo
 };
 
 struct SetupJoystickInfo


@@ -1469,6 +1472,7 @@ void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int));
 void InitGfxCustomArtworkInfo();
 void InitGfxOtherSettings();
 void InitOverlayInfo();
 void InitGfxCustomArtworkInfo();
 void InitGfxOtherSettings();
 void InitOverlayInfo();

+void SetOverlayEnabled(boolean);

 void SetOverlayActive(boolean);
 boolean GetOverlayActive();
 void SetDrawDeactivationMask(int);
 void SetOverlayActive(boolean);
 boolean GetOverlayActive();
 void SetDrawDeactivationMask(int);


@@ -1547,5 +1551,6 @@ boolean CheckCloseWindowEvent(ClientMessageEvent *);
 void InitJoysticks();
 boolean ReadJoystick(int, int *, int *, boolean *, boolean *);
 boolean CheckJoystickOpened(int);
 void InitJoysticks();
 boolean ReadJoystick(int, int *, int *, boolean *, boolean *);
 boolean CheckJoystickOpened(int);

+void ClearJoystickState();

 
 #endif /* SYSTEM_H */
 
 #endif /* SYSTEM_H */