From: Holger Schemel Date: Wed, 25 Nov 2015 09:27:41 +0000 (+0100) Subject: added definitions for new screen transition effect (not yet implemented) X-Git-Tag: 4.0.0.0-rc1~120 X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=5e13b105ad48e61a5cd46941c61a16ad00445248 added definitions for new screen transition effect (not yet implemented) --- diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 93a62e07..8a1a011e 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -2712,6 +2712,7 @@ int get_parameter_value(char *value_raw, char *suffix, int type) string_has_parameter(value, "fade") ? FADE_MODE_FADE : string_has_parameter(value, "crossfade") ? FADE_MODE_CROSSFADE : string_has_parameter(value, "melt") ? FADE_MODE_MELT : + string_has_parameter(value, "curtain") ? FADE_MODE_CURTAIN : FADE_MODE_DEFAULT); } else if (strPrefix(suffix, ".font")) /* (may also be ".font_xyz") */ diff --git a/src/libgame/system.h b/src/libgame/system.h index 03db4647..fdda818e 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -255,7 +255,8 @@ #define FADE_TYPE_TRANSFORM (1 << 2) #define FADE_TYPE_CROSSFADE (1 << 3) #define FADE_TYPE_MELT (1 << 4) -#define FADE_TYPE_SKIP (1 << 5) +#define FADE_TYPE_CURTAIN (1 << 5) +#define FADE_TYPE_SKIP (1 << 6) #define FADE_MODE_NONE (FADE_TYPE_NONE) #define FADE_MODE_FADE_IN (FADE_TYPE_FADE_IN) @@ -264,6 +265,7 @@ #define FADE_MODE_TRANSFORM (FADE_TYPE_TRANSFORM | FADE_TYPE_FADE_IN) #define FADE_MODE_CROSSFADE (FADE_MODE_TRANSFORM | FADE_TYPE_CROSSFADE) #define FADE_MODE_MELT (FADE_MODE_TRANSFORM | FADE_TYPE_MELT) +#define FADE_MODE_CURTAIN (FADE_MODE_TRANSFORM | FADE_TYPE_CURTAIN) #define FADE_MODE_SKIP_FADE_IN (FADE_TYPE_SKIP | FADE_TYPE_FADE_IN) #define FADE_MODE_SKIP_FADE_OUT (FADE_TYPE_SKIP | FADE_TYPE_FADE_OUT)