projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with not recognizing ".mode_loop: false" for music
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index b6ee0b933cb1b12307578c73fe3b2b18eb705825..1623cdc4685b6da6d5c8ae52c862e3256e41aa56 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-14,6
+14,8
@@
#include "anim.h"
#include "main.h"
#include "tools.h"
#include "anim.h"
#include "main.h"
#include "tools.h"
+#include "events.h"
+#include "screens.h"
/* values for global toon animation definition */
/* values for global toon animation definition */
@@
-915,7
+917,10
@@
static void PlayGlobalAnimMusic(struct GlobalAnimPartControlInfo *part)
if (!setup.sound_music)
return;
if (!setup.sound_music)
return;
- PlayMusic(music);
+ if (IS_LOOP_MUSIC(music))
+ PlayMusicLoop(music);
+ else
+ PlayMusic(music);
#if 0
printf("::: PLAY MUSIC %d.%d.%d: %d\n",
#if 0
printf("::: PLAY MUSIC %d.%d.%d: %d\n",
@@
-1451,7
+1456,8
@@
static boolean DoGlobalAnim_EventAction(struct GlobalAnimPartControlInfo *part)
return FALSE;
boolean action_executed = (DoGadgetAction(anim_event_action) ||
return FALSE;
boolean action_executed = (DoGadgetAction(anim_event_action) ||
- DoScreenAction(anim_event_action));
+ DoScreenAction(anim_event_action) ||
+ DoKeysymAction(anim_event_action));
// check if further actions are allowed to be executed
if (part->control_info.style & STYLE_MULTIPLE_ACTIONS)
// check if further actions are allowed to be executed
if (part->control_info.style & STYLE_MULTIPLE_ACTIONS)