projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added event actions (by simulating keyboard input) for global animations
[rocksndiamonds.git]
/
src
/
libgame
/
misc.c
diff --git
a/src/libgame/misc.c
b/src/libgame/misc.c
index 4a71d544c166cd0563494cc18d2d4078fbe4a385..6432523e41ce5c5755a6e385c28abd30995b5aee 100644
(file)
--- a/
src/libgame/misc.c
+++ b/
src/libgame/misc.c
@@
-2819,6
+2819,14
@@
int get_anim_action_parameter_value(char *token)
checked_free(gfx_token);
}
checked_free(gfx_token);
}
+ if (result == -1)
+ {
+ Key key = getKeyFromX11KeyName(token);
+
+ if (key != KSYM_UNDEFINED)
+ result = -(int)key;
+ }
+
if (result == -1)
result = ANIM_EVENT_ACTION_NONE;
if (result == -1)
result = ANIM_EVENT_ACTION_NONE;
@@
-2909,7
+2917,7
@@
int get_parameter_value(char *value_raw, char *suffix, int type)
else if (strEqual(suffix, ".init_event_action") ||
strEqual(suffix, ".anim_event_action"))
{
else if (strEqual(suffix, ".init_event_action") ||
strEqual(suffix, ".anim_event_action"))
{
- result = get_anim_action_parameter_value(value);
+ result = get_anim_action_parameter_value(value
_raw
);
}
else if (strEqual(suffix, ".class"))
{
}
else if (strEqual(suffix, ".class"))
{
@@
-2931,6
+2939,9
@@
int get_parameter_value(char *value_raw, char *suffix, int type)
if (string_has_parameter(value, "passthrough_clicks"))
result |= STYLE_PASSTHROUGH;
if (string_has_parameter(value, "passthrough_clicks"))
result |= STYLE_PASSTHROUGH;
+
+ if (string_has_parameter(value, "multiple_actions"))
+ result |= STYLE_MULTIPLE_ACTIONS;
}
else if (strEqual(suffix, ".fade_mode"))
{
}
else if (strEqual(suffix, ".fade_mode"))
{