projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed function 'NextEvent' to 'WaitEvent'
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 1b1dc2a453b5f64d73ba4b922ee4cb6d73ddecfb..3cf8bea6231c944b36ec44102233a4928560f403 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"
@@
-778,6
+779,8
@@
struct ProgramInfo
int version_build;
int version_ident;
int version_build;
int version_ident;
+ char *version_string;
+
char *(*window_title_function)(void);
void (*exit_message_function)(char *, va_list);
void (*exit_function)(int);
char *(*window_title_function)(void);
void (*exit_message_function)(char *, va_list);
void (*exit_function)(int);
@@
-800,6
+803,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;
@@
-1063,6
+1067,7
@@
struct SetupSystemInfo
struct SetupInternalInfo
{
char *program_title;
struct SetupInternalInfo
{
char *program_title;
+ char *program_version;
char *program_author;
char *program_email;
char *program_website;
char *program_author;
char *program_email;
char *program_website;
@@
-1085,6
+1090,7
@@
struct SetupInternalInfo
int default_window_height;
boolean choose_from_top_leveldir;
int default_window_height;
boolean choose_from_top_leveldir;
+ boolean show_scaling_in_title;
};
struct SetupDebugInfo
};
struct SetupDebugInfo
@@
-1093,6
+1099,7
@@
struct SetupDebugInfo
Key frame_delay_key[10];
boolean frame_delay_use_mod_key;
boolean frame_delay_game_only;
Key frame_delay_key[10];
boolean frame_delay_use_mod_key;
boolean frame_delay_game_only;
+ boolean show_frames_per_second;
};
struct SetupInfo
};
struct SetupInfo
@@
-1445,7
+1452,7
@@
extern int FrameCounter;
/* function definitions */
void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
/* function definitions */
void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
- int);
+
char *,
int);
void InitScoresInfo();
void SetWindowTitle();
void InitScoresInfo();
void SetWindowTitle();
@@
-1474,6
+1481,7
@@
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 *);
@@
-1536,8
+1544,9
@@
void CloseAudio(void);
void SetAudioMode(boolean);
boolean PendingEvent(void);
void SetAudioMode(boolean);
boolean PendingEvent(void);
-void
Nex
tEvent(Event *event);
+void
Wai
tEvent(Event *event);
void PeekEvent(Event *event);
void PeekEvent(Event *event);
+void CheckQuitEvent(void);
Key GetEventKey(KeyEvent *, boolean);
KeyMod HandleKeyModState(Key, int);
KeyMod GetKeyModState();
Key GetEventKey(KeyEvent *, boolean);
KeyMod HandleKeyModState(Key, int);
KeyMod GetKeyModState();
@@
-1549,5
+1558,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 */