projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed name of preprocessor constant to improve readability
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 2011aaacf3e6932985f32011b946555c7199b8e2..2db4961c53cbedd3c9d939c9e13339b8c7558025 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-22,6
+22,8
@@
#include "windows.h"
#elif defined(PLATFORM_ANDROID)
#include "android.h"
#include "windows.h"
#elif defined(PLATFORM_ANDROID)
#include "android.h"
+#elif defined(PLATFORM_EMSCRIPTEN)
+#include "emscripten.h"
#endif
#include "sdl.h"
#endif
#include "sdl.h"
@@
-353,16
+355,21
@@
#define ANIM_DEFAULT ANIM_LOOP
#define ANIM_DEFAULT ANIM_LOOP
-// values for special drawing styles
(currently only for crumbled graphics)
+// values for special drawing styles
and event handling
#define STYLE_NONE 0
#define STYLE_NONE 0
+
+// values used for crumbled graphics
#define STYLE_ACCURATE_BORDERS (1 << 0)
#define STYLE_INNER_CORNERS (1 << 1)
#define STYLE_ACCURATE_BORDERS (1 << 0)
#define STYLE_INNER_CORNERS (1 << 1)
+
+// values used for game panel graphics
#define STYLE_REVERSE (1 << 2)
#define STYLE_REVERSE (1 << 2)
+#define STYLE_LEFTMOST_POSITION (1 << 3)
-// values
for special event handling style (used for global animation)
-#define STYLE_BLOCK (1 <<
3
)
-#define STYLE_PASSTHROUGH (1 <<
4
)
-#define STYLE_MULTIPLE_ACTIONS (1 <<
5
)
+// values
used for global animations
+#define STYLE_BLOCK (1 <<
4
)
+#define STYLE_PASSTHROUGH (1 <<
5
)
+#define STYLE_MULTIPLE_ACTIONS (1 <<
6
)
#define STYLE_DEFAULT STYLE_NONE
#define STYLE_DEFAULT STYLE_NONE
@@
-511,7
+518,7
@@
#define MAX_PLAYERS 4
// maximum number of player names
#define MAX_PLAYERS 4
// maximum number of player names
-#define MAX_PLAYER_NAMES 1
0
+#define MAX_PLAYER_NAMES 1
2
// maximum allowed length of player name
#define MAX_PLAYER_NAME_LEN 10
// maximum allowed length of player name
#define MAX_PLAYER_NAME_LEN 10
@@
-576,6
+583,9
@@
JOY_BUTTON_2 : \
JOY_NO_ACTION)
JOY_BUTTON_2 : \
JOY_NO_ACTION)
+// maximum number of level sets in the level set history
+#define MAX_LEVELDIR_HISTORY 12
+
// default name for empty highscore entry
#define EMPTY_PLAYER_NAME "no name"
// default name for empty highscore entry
#define EMPTY_PLAYER_NAME "no name"
@@
-761,9
+771,15
@@
#define TREE_TYPE_MUSIC_DIR ARTWORK_TYPE_MUSIC
#define TREE_TYPE_LEVEL_DIR 3
#define TREE_TYPE_LEVEL_NR 4
#define TREE_TYPE_MUSIC_DIR ARTWORK_TYPE_MUSIC
#define TREE_TYPE_LEVEL_DIR 3
#define TREE_TYPE_LEVEL_NR 4
+#define TREE_TYPE_PLAYER_NAME 5
#define NUM_BASE_TREE_TYPES 4
#define NUM_BASE_TREE_TYPES 4
-#define NUM_TREE_TYPES 5
+#define NUM_TREE_TYPES 6
+
+#define TREE_TYPE_IS_DIR(type) ((type) == TREE_TYPE_GRAPHICS_DIR || \
+ (type) == TREE_TYPE_SOUNDS_DIR || \
+ (type) == TREE_TYPE_MUSIC_DIR || \
+ (type) == TREE_TYPE_LEVEL_DIR)
#define INFOTEXT_UNDEFINED ""
#define INFOTEXT_GRAPHICS_DIR "Custom Graphics"
#define INFOTEXT_UNDEFINED ""
#define INFOTEXT_GRAPHICS_DIR "Custom Graphics"
@@
-771,8
+787,15
@@
#define INFOTEXT_MUSIC_DIR "Custom Music"
#define INFOTEXT_LEVEL_DIR "Level Sets"
#define INFOTEXT_LEVEL_NR "Levels"
#define INFOTEXT_MUSIC_DIR "Custom Music"
#define INFOTEXT_LEVEL_DIR "Level Sets"
#define INFOTEXT_LEVEL_NR "Levels"
+#define INFOTEXT_PLAYER_NAME "Players & Teams"
+
+#define BACKLINK_TEXT_MAIN ".. (main menu)"
+#define BACKLINK_TEXT_SETUP ".. (setup menu)"
+#define BACKLINK_TEXT_PARENT ".. (parent directory)"
-#define TREE_INFOTEXT(t) ((t) == TREE_TYPE_LEVEL_NR ? \
+#define TREE_INFOTEXT(t) ((t) == TREE_TYPE_PLAYER_NAME ? \
+ INFOTEXT_PLAYER_NAME : \
+ (t) == TREE_TYPE_LEVEL_NR ? \
INFOTEXT_LEVEL_NR : \
(t) == TREE_TYPE_LEVEL_DIR ? \
INFOTEXT_LEVEL_DIR : \
INFOTEXT_LEVEL_NR : \
(t) == TREE_TYPE_LEVEL_DIR ? \
INFOTEXT_LEVEL_DIR : \
@@
-784,6
+807,10
@@
INFOTEXT_MUSIC_DIR : \
INFOTEXT_UNDEFINED)
INFOTEXT_MUSIC_DIR : \
INFOTEXT_UNDEFINED)
+#define TREE_BACKLINK_TEXT(t) ((t) == TREE_TYPE_LEVEL_DIR ? \
+ BACKLINK_TEXT_MAIN : \
+ BACKLINK_TEXT_SETUP)
+
#define TREE_USERDIR(t) ((t) == TREE_TYPE_LEVEL_DIR ? \
getUserLevelDir(NULL) : \
(t) == TREE_TYPE_GRAPHICS_DIR ? \
#define TREE_USERDIR(t) ((t) == TREE_TYPE_LEVEL_DIR ? \
getUserLevelDir(NULL) : \
(t) == TREE_TYPE_GRAPHICS_DIR ? \
@@
-1275,6
+1302,8
@@
struct SetupEditorInfo
boolean show_element_token;
boolean show_element_token;
+ boolean show_read_only_warning;
+
boolean use_template_for_new_levels;
};
boolean use_template_for_new_levels;
};
@@
-1283,6
+1312,11
@@
struct SetupAutoSetupInfo
int editor_zoom_tilesize;
};
int editor_zoom_tilesize;
};
+struct SetupLevelSetupInfo
+{
+ char *last_level_series[MAX_LEVELDIR_HISTORY + 1];
+};
+
struct SetupEditorCascadeInfo
{
boolean el_bd;
struct SetupEditorCascadeInfo
{
boolean el_bd;
@@
-1416,7
+1450,8
@@
struct SetupInfo
boolean skip_levels;
boolean increment_levels;
boolean auto_play_next_level;
boolean skip_levels;
boolean increment_levels;
boolean auto_play_next_level;
- boolean skip_scores_after_game;
+ boolean count_score_after_game;
+ boolean show_scores_after_game;
boolean time_limit;
boolean fullscreen;
int window_scaling_percent;
boolean time_limit;
boolean fullscreen;
int window_scaling_percent;
@@
-1426,10
+1461,13
@@
struct SetupInfo
boolean ask_on_escape;
boolean ask_on_escape_editor;
boolean ask_on_game_over;
boolean ask_on_escape;
boolean ask_on_escape_editor;
boolean ask_on_game_over;
+ boolean ask_on_quit_game;
+ boolean ask_on_quit_program;
boolean quick_switch;
boolean input_on_focus;
boolean prefer_aga_graphics;
boolean prefer_lowpass_sounds;
boolean quick_switch;
boolean input_on_focus;
boolean prefer_aga_graphics;
boolean prefer_lowpass_sounds;
+ boolean prefer_extra_panel_items;
boolean game_speed_extended;
int game_frame_delay;
boolean sp_show_border_elements;
boolean game_speed_extended;
int game_frame_delay;
boolean sp_show_border_elements;
@@
-1452,6
+1490,8
@@
struct SetupInfo
char *network_server_hostname;
struct SetupAutoSetupInfo auto_setup;
char *network_server_hostname;
struct SetupAutoSetupInfo auto_setup;
+ struct SetupLevelSetupInfo level_setup;
+
struct SetupEditorInfo editor;
struct SetupEditorCascadeInfo editor_cascade;
struct SetupShortcutInfo shortcut;
struct SetupEditorInfo editor;
struct SetupEditorCascadeInfo editor_cascade;
struct SetupShortcutInfo shortcut;
@@
-1525,6
+1565,7
@@
struct TreeInfo
boolean level_group; // directory contains more level series directories
boolean parent_link; // entry links back to parent directory
boolean level_group; // directory contains more level series directories
boolean parent_link; // entry links back to parent directory
+ boolean is_copy; // this entry is a copy of another entry in the tree
boolean in_user_dir; // user defined levels are stored in home directory
boolean user_defined; // levels in user directory and marked as "private"
boolean readonly; // readonly levels can not be changed with editor
boolean in_user_dir; // user defined levels are stored in home directory
boolean user_defined; // levels in user directory and marked as "private"
boolean readonly; // readonly levels can not be changed with editor