projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030208-2-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 086b5afad879c989e2370e2922cdc7cdf73f91f9..532f079a5ca09a477cadf3955203e22696f7a8f0 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-206,8
+206,8
@@
#define VERSION_PATCH(x) ((x) % 100)
/* functions for parent/child process identification */
#define VERSION_PATCH(x) ((x) % 100)
/* functions for parent/child process identification */
-#define IS_PARENT_PROCESS(
pid) ((pid) > 0 || (pid) == -1
)
-#define IS_CHILD_PROCESS(
pid) ((pid) == 0
)
+#define IS_PARENT_PROCESS(
) (audio.mixer_pid != getpid()
)
+#define IS_CHILD_PROCESS(
) (audio.mixer_pid == getpid()
)
/* type definitions */
/* type definitions */
@@
-305,6
+305,8
@@
struct GfxInfo
Bitmap *background_bitmap;
int background_bitmap_mask;
Bitmap *background_bitmap;
int background_bitmap_mask;
+
+ boolean menu_main_hide_static_text;
};
struct FontInfo
};
struct FontInfo
@@
-498,8
+500,10
@@
struct FileInfo
char *default_filename;
char *filename;
char *default_filename;
char *filename;
- int *default_parameter; /* array of file parameters */
- int *parameter; /* array of file parameters */
+ char **default_parameter; /* array of file parameters */
+ char **parameter; /* array of file parameters */
+
+ boolean redefined;
};
struct SetupFileList
};
struct SetupFileList
@@
-521,6
+525,7
@@
struct PropertyMapping
int base_index;
int ext1_index;
int ext2_index;
int base_index;
int ext1_index;
int ext2_index;
+ int ext3_index;
int artwork_index;
};
int artwork_index;
};
@@
-542,10
+547,12
@@
struct ArtworkListInfo
int num_base_prefixes;
int num_ext1_suffixes;
int num_ext2_suffixes;
int num_base_prefixes;
int num_ext1_suffixes;
int num_ext2_suffixes;
+ int num_ext3_suffixes;
char **base_prefixes; /* base token prefixes array */
char **ext1_suffixes; /* property suffixes array 1 */
char **ext2_suffixes; /* property suffixes array 2 */
char **base_prefixes; /* base token prefixes array */
char **ext1_suffixes; /* property suffixes array 1 */
char **ext2_suffixes; /* property suffixes array 2 */
+ char **ext3_suffixes; /* property suffixes array 3 */
int num_property_mapping_entries;
int num_property_mapping_entries;
@@
-652,6
+659,7
@@
Bitmap *LoadCustomImage(char *);
void ReloadCustomImage(Bitmap *, char *);
Bitmap *ZoomBitmap(Bitmap *, int, int);
void ReloadCustomImage(Bitmap *, char *);
Bitmap *ZoomBitmap(Bitmap *, int, int);
+void CreateBitmapWithSmallBitmaps(Bitmap *);
inline void OpenAudio(void);
inline void CloseAudio(void);
inline void OpenAudio(void);
inline void CloseAudio(void);