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 triggering gadgets) for global animations
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index 70600166488ce6cd34396635e7b5cedf467d9e45..d1ae06a105391ab6b4deda15d2199ce6ec1279fa 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-1248,7
+1248,9
@@
void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
{
struct GlobalAnimPartControlInfo *part;
struct GraphicInfo *c = &anim->control_info;
{
struct GlobalAnimPartControlInfo *part;
struct GraphicInfo *c = &anim->control_info;
+ int num_parts = anim->num_parts + (anim->has_base ? 1 : 0);
int state, active_part_nr;
int state, active_part_nr;
+ int i;
#if 0
printf("::: HandleGlobalAnim_Main: %d, %d => %d\n",
#if 0
printf("::: HandleGlobalAnim_Main: %d, %d => %d\n",
@@
-1289,13
+1291,8
@@
void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
case ANIM_STOP:
anim->state = ANIM_STATE_INACTIVE;
case ANIM_STOP:
anim->state = ANIM_STATE_INACTIVE;
- {
- int num_parts = anim->num_parts + (anim->has_base ? 1 : 0);
- int i;
-
- for (i = 0; i < num_parts; i++)
- StopGlobalAnimSoundAndMusic(&anim->part[i]);
- }
+ for (i = 0; i < num_parts; i++)
+ StopGlobalAnimSoundAndMusic(&anim->part[i]);
return;
return;
@@
-1305,9
+1302,6
@@
void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
if (c->anim_mode & ANIM_ALL || anim->num_parts == 0)
{
if (c->anim_mode & ANIM_ALL || anim->num_parts == 0)
{
- int num_parts = anim->num_parts + (anim->has_base ? 1 : 0);
- int i;
-
#if 0
printf("::: HandleGlobalAnim_Main: %d, %d => %d\n",
anim->mode_nr, anim->nr, num_parts);
#if 0
printf("::: HandleGlobalAnim_Main: %d, %d => %d\n",
anim->mode_nr, anim->nr, num_parts);
@@
-1359,6
+1353,11
@@
void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
part = &anim->part[anim->active_part_nr];
part = &anim->part[anim->active_part_nr];
+ // first set all animation parts to "inactive", ...
+ for (i = 0; i < num_parts; i++)
+ anim->part[i].state = ANIM_STATE_INACTIVE;
+
+ // ... then set current animation parts to "running"
part->state = ANIM_STATE_RUNNING;
anim->state = HandleGlobalAnim_Part(part, anim->state);
part->state = ANIM_STATE_RUNNING;
anim->state = HandleGlobalAnim_Part(part, anim->state);
@@
-1439,6
+1438,16
@@
static void DoAnimationExt()
#endif
}
#endif
}
+static boolean DoGlobalAnim_EventAction(struct GlobalAnimPartControlInfo *part)
+{
+ int anim_event_action = part->control_info.anim_event_action;
+
+ if (anim_event_action == -1)
+ return FALSE;
+
+ return DoGadgetAction(anim_event_action);
+}
+
static void InitGlobalAnim_Clickable()
{
int mode_nr;
static void InitGlobalAnim_Clickable()
{
int mode_nr;
@@
-1469,7
+1478,8
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
boolean any_part_clicked = FALSE;
int mode_nr;
boolean any_part_clicked = FALSE;
int mode_nr;
- for (mode_nr = 0; mode_nr < NUM_GAME_MODES; mode_nr++)
+ // check game modes in reverse draw order (to stop when clicked)
+ for (mode_nr = NUM_GAME_MODES - 1; mode_nr >= 0; mode_nr--)
{
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[mode_nr];
int anim_nr;
{
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[mode_nr];
int anim_nr;
@@
-1495,6
+1505,9
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
if (!part->clickable)
continue;
if (!part->clickable)
continue;
+ if (part->state != ANIM_STATE_RUNNING)
+ continue;
+
// always handle "any" click events (clicking anywhere on screen) ...
if (isClickablePart(part, ANIM_EVENT_ANY))
anything_clicked = part->clicked = TRUE;
// always handle "any" click events (clicking anywhere on screen) ...
if (isClickablePart(part, ANIM_EVENT_ANY))
anything_clicked = part->clicked = TRUE;
@@
-1506,9
+1519,14
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
if (isClickedPart(part, mx, my, clicked))
{
#if 0
if (isClickedPart(part, mx, my, clicked))
{
#if 0
- printf("::: %d.%d CLICKED\n", anim_nr, part_nr);
+ printf("::: %d.%d CLICKED [%d]\n", anim_nr, part_nr,
+ part->control_info.anim_event_action);
#endif
#endif
+ // after executing event action, force click to be ignored
+ if (DoGlobalAnim_EventAction(part))
+ return TRUE;
+
any_part_clicked = TRUE;
if (isClickablePart(part, ANIM_EVENT_SELF))
any_part_clicked = TRUE;
if (isClickablePart(part, ANIM_EVENT_SELF))
@@
-1533,9
+1551,23
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
{
struct GlobalAnimPartControlInfo *part2 = &anim2->part[part2_nr];
{
struct GlobalAnimPartControlInfo *part2 = &anim2->part[part2_nr];
+ if (part2->state != ANIM_STATE_RUNNING)
+ continue;
+
if (isClickablePart(part2, mask))
if (isClickablePart(part2, mask))
+ {
anything_clicked = part2->clicked = TRUE;
anything_clicked = part2->clicked = TRUE;
+#if 0
+ printf("::: %d.%d TRIGGER CLICKED [%d]\n", anim2_nr, part2_nr,
+ part2->control_info.anim_event_action);
+#endif
+
+ // after executing event action, force click to be ignored
+ if (DoGlobalAnim_EventAction(part2))
+ return TRUE;
+ }
+
#if 0
struct GraphicInfo *c = &part2->control_info;
#if 0
struct GraphicInfo *c = &part2->control_info;