X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=f96d530f0b8aef6041007f456a59660ca0c90c23;hb=2a1101854ff7336e35d52f76a3114870c8a6b15d;hp=21068dbc417c8a3b2c47fdc94db895e337593957;hpb=b124c56f1cf069a6c77802919b1a9cbbedb77029;p=rocksndiamonds.git diff --git a/src/libgame/system.h b/src/libgame/system.h index 21068dbc..f96d530f 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -177,13 +177,14 @@ #define ANIM_RANDOM (1 << 4) #define ANIM_CE_VALUE (1 << 5) #define ANIM_CE_SCORE (1 << 6) -#define ANIM_REVERSE (1 << 7) -#define ANIM_OPAQUE_PLAYER (1 << 8) +#define ANIM_CE_DELAY (1 << 7) +#define ANIM_REVERSE (1 << 8) +#define ANIM_OPAQUE_PLAYER (1 << 9) /* values for special (non game element) animation modes */ -#define ANIM_HORIZONTAL (1 << 9) -#define ANIM_VERTICAL (1 << 10) -#define ANIM_STATIC_PANEL (1 << 11) +#define ANIM_HORIZONTAL (1 << 10) +#define ANIM_VERTICAL (1 << 11) +#define ANIM_STATIC_PANEL (1 << 12) #define ANIM_DEFAULT ANIM_LOOP @@ -332,6 +333,27 @@ #define SCOREFILE_EXTENSION "sco" #endif +#define ERROR_BASENAME "stderr.txt" + +#define CHAR_PATH_SEPARATOR_UNIX '/' +#define CHAR_PATH_SEPARATOR_DOS '\\' + +#define STRING_PATH_SEPARATOR_UNIX "/" +#define STRING_PATH_SEPARATOR_DOS "\\" + +#define STRING_NEWLINE_UNIX "\n" +#define STRING_NEWLINE_DOS "\r\n" + +#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS) +#define CHAR_PATH_SEPARATOR CHAR_PATH_SEPARATOR_DOS +#define STRING_PATH_SEPARATOR STRING_PATH_SEPARATOR_DOS +#define STRING_NEWLINE STRING_NEWLINE_DOS +#else +#define CHAR_PATH_SEPARATOR CHAR_PATH_SEPARATOR_UNIX +#define STRING_PATH_SEPARATOR STRING_PATH_SEPARATOR_UNIX +#define STRING_NEWLINE STRING_NEWLINE_UNIX +#endif + /* areas in bitmap PIX_DOOR */ /* meaning in PIX_DB_DOOR: (3 PAGEs) @@ -507,6 +529,9 @@ struct ProgramInfo char *cookie_prefix; char *filename_prefix; /* prefix to cut off from DOS filenames */ + char *error_filename; /* filename where to write error messages to */ + FILE *error_file; /* (used instead of 'stderr' on some systems) */ + int version_major; int version_minor; int version_patch; @@ -654,6 +679,9 @@ struct SetupEditorInfo boolean el_headlines; + boolean el_by_game; + boolean el_by_type; + boolean show_element_token; }; @@ -670,6 +698,7 @@ struct SetupEditorCascadeInfo boolean el_chars; boolean el_ce; boolean el_ge; + boolean el_ref; boolean el_user; boolean el_dynamic; };