projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added support for more event types for global animations (yet to be added)
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index be19967a77e4b5a63f03148318e45810ad03903a..9f20487fb0e4f5aebb8bd2108b2f7e19040db114 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-10064,17
+10064,35
@@
static boolean string_has_parameter(char *s, char *s_contained)
static int get_anim_parameter_value(char *s)
{
static int get_anim_parameter_value(char *s)
{
- char *pattern_1 = "click:anim_";
+ int event_value[] =
+ {
+ ANIM_EVENT_CLICK
+ };
+ char *pattern_1[] =
+ {
+ "click:anim_"
+ };
char *pattern_2 = ".part_";
char *matching_char = NULL;
char *s_ptr = s;
char *pattern_2 = ".part_";
char *matching_char = NULL;
char *s_ptr = s;
+ int pattern_1_len = 0;
int result = ANIM_EVENT_NONE;
int result = ANIM_EVENT_NONE;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(event_value); i++)
+ {
+ matching_char = strstr(s_ptr, pattern_1[i]);
+ pattern_1_len = strlen(pattern_1[i]);
+ result = event_value[i];
+
+ if (matching_char != NULL)
+ break;
+ }
- matching_char = strstr(s_ptr, pattern_1);
if (matching_char == NULL)
return ANIM_EVENT_NONE;
if (matching_char == NULL)
return ANIM_EVENT_NONE;
- s_ptr = matching_char +
strlen(pattern_1)
;
+ s_ptr = matching_char +
pattern_1_len
;
// check for main animation number ("anim_X" or "anim_XX")
if (*s_ptr >= '0' && *s_ptr <= '9')
// check for main animation number ("anim_X" or "anim_XX")
if (*s_ptr >= '0' && *s_ptr <= '9')