projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added function for getting current draw deactivation mask
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index be19fccd8a3fbb201d06623900e4f08d118bc9e0..bec4097365c6afe914b1c9a39dc0a51868787fef 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"
@@
-531,6
+532,8
@@
#define TAPEFILE_EXTENSION "tape"
#define SCOREFILE_EXTENSION "score"
#define TAPEFILE_EXTENSION "tape"
#define SCOREFILE_EXTENSION "score"
+#define GAMECONTROLLER_BASENAME "gamecontrollerdb.txt"
+
#define LOG_OUT_BASENAME "stdout.txt"
#define LOG_ERR_BASENAME "stderr.txt"
#define LOG_OUT_BASENAME "stdout.txt"
#define LOG_ERR_BASENAME "stderr.txt"
@@
-798,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;
@@
-939,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
@@
-1467,9
+1472,11
@@
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);
+int GetDrawDeactivationMask(void);
void SetDrawBackgroundMask(int);
void SetWindowBackgroundBitmap(Bitmap *);
void SetMainBackgroundBitmap(Bitmap *);
void SetDrawBackgroundMask(int);
void SetWindowBackgroundBitmap(Bitmap *);
void SetMainBackgroundBitmap(Bitmap *);
@@
-1544,5
+1551,7
@@
boolean CheckCloseWindowEvent(ClientMessageEvent *);
void InitJoysticks();
boolean ReadJoystick(int, int *, int *, boolean *, boolean *);
void InitJoysticks();
boolean ReadJoystick(int, int *, int *, boolean *, boolean *);
+boolean CheckJoystickOpened(int);
+void ClearJoystickState();
#endif /* SYSTEM_H */
#endif /* SYSTEM_H */