projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added option to not trigger further animations if CE change event consumed
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 13141d7f8d3c9f1eee7eaeca0fdcc901de96a6af..d9addaf1fc074a8ef0f8bde81ead0dfd780f579d 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-11527,8
+11527,9
@@
static boolean string_has_parameter(char *s, char *s_contained)
char next_char = s[strlen(s_contained)];
// check if next character is delimiter or whitespace
char next_char = s[strlen(s_contained)];
// check if next character is delimiter or whitespace
- return (next_char == ',' || next_char == '\0' ||
- next_char == ' ' || next_char == '\t' ? TRUE : FALSE);
+ if (next_char == ',' || next_char == '\0' ||
+ next_char == ' ' || next_char == '\t')
+ return TRUE;
}
// check if string contains another parameter string after a comma
}
// check if string contains another parameter string after a comma
@@
-11741,13
+11742,8
@@
static int get_anim_parameter_values(char *s)
// if animation event found, add it to global animation event list
if (event_value != ANIM_EVENT_NONE)
// if animation event found, add it to global animation event list
if (event_value != ANIM_EVENT_NONE)
- {
list_pos = AddGlobalAnimEventValue(list_pos, event_value);
list_pos = AddGlobalAnimEventValue(list_pos, event_value);
- // continue with next part of the string, starting with next comma
- s = strchr(s + 1, ',');
- }
-
while (s != NULL)
{
// add optional "click:anim_X" or "click:anim_X.part_X" parameter
while (s != NULL)
{
// add optional "click:anim_X" or "click:anim_X.part_X" parameter
@@
-11829,6
+11825,7
@@
int get_parameter_value(char *value_raw, char *suffix, int type)
strEqual(value, "lower") ? POS_LOWER :
strEqual(value, "bottom") ? POS_BOTTOM :
strEqual(value, "any") ? POS_ANY :
strEqual(value, "lower") ? POS_LOWER :
strEqual(value, "bottom") ? POS_BOTTOM :
strEqual(value, "any") ? POS_ANY :
+ strEqual(value, "ce") ? POS_CE :
strEqual(value, "last") ? POS_LAST : POS_UNDEFINED);
}
else if (strEqual(suffix, ".align"))
strEqual(value, "last") ? POS_LAST : POS_UNDEFINED);
}
else if (strEqual(suffix, ".align"))
@@
-11918,6
+11915,9
@@
int get_parameter_value(char *value_raw, char *suffix, int type)
if (string_has_parameter(value, "multiple_actions"))
result |= STYLE_MULTIPLE_ACTIONS;
if (string_has_parameter(value, "multiple_actions"))
result |= STYLE_MULTIPLE_ACTIONS;
+
+ if (string_has_parameter(value, "consume_ce_event"))
+ result |= STYLE_CONSUME_CE_EVENT;
}
else if (strEqual(suffix, ".fade_mode"))
{
}
else if (strEqual(suffix, ".fade_mode"))
{