projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved code to separate function
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 9e1e04dd96bc7bb9b26e19d59db6dbe85f0e1151..88577ac27add45a3315bb7ee3e06e5d825640b5b 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-2370,10
+2370,13
@@
enum
GFX_ARG_DRAW_ORDER,
GFX_ARG_INIT_DELAY_FIXED,
GFX_ARG_INIT_DELAY_RANDOM,
GFX_ARG_DRAW_ORDER,
GFX_ARG_INIT_DELAY_FIXED,
GFX_ARG_INIT_DELAY_RANDOM,
+ GFX_ARG_INIT_DELAY_ACTION,
GFX_ARG_ANIM_DELAY_FIXED,
GFX_ARG_ANIM_DELAY_RANDOM,
GFX_ARG_ANIM_DELAY_FIXED,
GFX_ARG_ANIM_DELAY_RANDOM,
+ GFX_ARG_ANIM_DELAY_ACTION,
GFX_ARG_POST_DELAY_FIXED,
GFX_ARG_POST_DELAY_RANDOM,
GFX_ARG_POST_DELAY_FIXED,
GFX_ARG_POST_DELAY_RANDOM,
+ GFX_ARG_POST_DELAY_ACTION,
GFX_ARG_INIT_EVENT,
GFX_ARG_INIT_EVENT_ACTION,
GFX_ARG_ANIM_EVENT,
GFX_ARG_INIT_EVENT,
GFX_ARG_INIT_EVENT_ACTION,
GFX_ARG_ANIM_EVENT,
@@
-2386,6
+2389,7
@@
enum
GFX_ARG_FADE_DELAY,
GFX_ARG_POST_DELAY,
GFX_ARG_AUTO_DELAY,
GFX_ARG_FADE_DELAY,
GFX_ARG_POST_DELAY,
GFX_ARG_AUTO_DELAY,
+ GFX_ARG_AUTO_DELAY_UNIT,
GFX_ARG_ALIGN,
GFX_ARG_VALIGN,
GFX_ARG_SORT_PRIORITY,
GFX_ARG_ALIGN,
GFX_ARG_VALIGN,
GFX_ARG_SORT_PRIORITY,
@@
-2544,7
+2548,7
@@
enum
// program information and versioning definitions
#define PROGRAM_VERSION_SUPER 4
#define PROGRAM_VERSION_MAJOR 1
// program information and versioning definitions
#define PROGRAM_VERSION_SUPER 4
#define PROGRAM_VERSION_MAJOR 1
-#define PROGRAM_VERSION_MINOR
1
+#define PROGRAM_VERSION_MINOR
3
#define PROGRAM_VERSION_PATCH 1
#define PROGRAM_VERSION_EXTRA ""
#define PROGRAM_VERSION_PATCH 1
#define PROGRAM_VERSION_EXTRA ""
@@
-2552,7
+2556,7
@@
enum
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
#define PROGRAM_EMAIL_STRING "info@artsoft.org"
#define PROGRAM_WEBSITE_STRING "http://www.artsoft.org/"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
#define PROGRAM_EMAIL_STRING "info@artsoft.org"
#define PROGRAM_WEBSITE_STRING "http://www.artsoft.org/"
-#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-201
8
by Holger Schemel"
+#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-201
9
by Holger Schemel"
#define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment"
#define PROGRAM_ICON_FILENAME "RocksIcon32x32.png"
#define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment"
#define PROGRAM_ICON_FILENAME "RocksIcon32x32.png"
@@
-2715,12
+2719,24
@@
struct MenuMainInfo
struct TextPosInfo network_players;
};
struct TextPosInfo network_players;
};
+struct MenuSetupButtonInfo
+{
+ struct MenuPosInfo prev_player;
+ struct MenuPosInfo next_player;
+};
+
+struct MenuSetupInfo
+{
+ struct MenuSetupButtonInfo button;
+};
+
struct TitleFadingInfo
{
int fade_mode;
int fade_delay;
int post_delay;
int auto_delay;
struct TitleFadingInfo
{
int fade_mode;
int fade_delay;
int post_delay;
int auto_delay;
+ int auto_delay_unit;
};
struct TitleMessageInfo
};
struct TitleMessageInfo
@@
-2739,6
+2755,7
@@
struct TitleMessageInfo
int fade_delay;
int post_delay;
int auto_delay;
int fade_delay;
int post_delay;
int auto_delay;
+ int auto_delay_unit;
};
struct InitInfo
};
struct InitInfo
@@
-2801,6
+2818,7
@@
struct MenuInfo
int music[NUM_SPECIAL_GFX_ARGS];
struct MenuMainInfo main;
int music[NUM_SPECIAL_GFX_ARGS];
struct MenuMainInfo main;
+ struct MenuSetupInfo setup;
};
struct DoorInfo
};
struct DoorInfo
@@
-2851,6
+2869,8
@@
struct PreviewInfo
int step_offset;
int step_delay;
int anim_mode;
int step_offset;
int step_delay;
int anim_mode;
+
+ boolean redefined; // redefined by custom artwork
};
struct EditorTabsInfo
};
struct EditorTabsInfo
@@
-3410,6
+3430,18
@@
struct GlobalAnimInfo
int music[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS];
};
int music[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS];
};
+struct GlobalAnimEventListInfo
+{
+ int *event_value;
+ int num_event_values;
+};
+
+struct GlobalAnimEventInfo
+{
+ struct GlobalAnimEventListInfo **event_list;
+ int num_event_lists;
+};
+
struct GraphicInfo
{
Bitmap **bitmaps; // bitmaps in all required sizes
struct GraphicInfo
{
Bitmap **bitmaps; // bitmaps in all required sizes
@@
-3447,10
+3479,13
@@
struct GraphicInfo
int init_delay_fixed; // optional initial delay values for global
int init_delay_random; // animations (pause interval before start)
int init_delay_fixed; // optional initial delay values for global
int init_delay_random; // animations (pause interval before start)
+ int init_delay_action; // optional action called on animation start
int anim_delay_fixed; // optional delay values for bored/sleeping
int anim_delay_random; // and global animations (animation length)
int anim_delay_fixed; // optional delay values for bored/sleeping
int anim_delay_random; // and global animations (animation length)
+ int anim_delay_action; // optional action called on animation end
int post_delay_fixed; // optional delay values after bored/global
int post_delay_random; // animations (pause before next animation)
int post_delay_fixed; // optional delay values after bored/global
int post_delay_random; // animations (pause before next animation)
+ int post_delay_action; // optional action called after post delay
int init_event; // optional event triggering animation start
int init_event_action; // optional action called on animation start
int init_event; // optional event triggering animation start
int init_event_action; // optional action called on animation start
@@
-3476,6
+3511,7
@@
struct GraphicInfo
int fade_delay; // optional setting for drawing title screens
int post_delay; // optional setting for drawing title screens
int auto_delay; // optional setting for drawing title screens
int fade_delay; // optional setting for drawing title screens
int post_delay; // optional setting for drawing title screens
int auto_delay; // optional setting for drawing title screens
+ int auto_delay_unit; // optional setting for drawing title screens
int align, valign; // optional setting for drawing title screens
int sort_priority; // optional setting for drawing title screens
int align, valign; // optional setting for drawing title screens
int sort_priority; // optional setting for drawing title screens
@@
-3699,6
+3735,7
@@
extern struct TokenIntPtrInfo image_config_vars[];
extern struct FontInfo font_info[];
extern struct GlobalAnimInfo global_anim_info[];
extern struct GlobalAnimNameInfo global_anim_name_info[];
extern struct FontInfo font_info[];
extern struct GlobalAnimInfo global_anim_info[];
extern struct GlobalAnimNameInfo global_anim_name_info[];
+extern struct GlobalAnimEventInfo global_anim_event_info;
extern struct MusicPrefixInfo music_prefix_info[];
extern struct GraphicInfo *graphic_info;
extern struct SoundInfo *sound_info;
extern struct MusicPrefixInfo music_prefix_info[];
extern struct GraphicInfo *graphic_info;
extern struct SoundInfo *sound_info;