added "passthrough" option for clickable global animations

This change adds a new option for the "graphicsinfo.conf" file for
defining a "passthrough" option for global animations that causes
clicks on clickable global animations not to be consumed, but to
be passed-through to the underlying screen controls (or other global
animations under the clicked global animation). The new option works
like this:

global.anim_1.part_1.MAIN.anim_event:            click
global.anim_1.part_1.MAIN.style:                 passthrough_clicks

The second option is the new one (the first one already existed).
When clicking this global animation (on the main menu screen), the
click will passed-through to the main menu screen to be further
processed by screen controls like gadgets or menu buttons.

diff --git a/src/anim.c b/src/anim.c
index d1ae06a105391ab6b4deda15d2199ce6ec1279fa..0a4946a2a1da9a739a0c80f44f8edf0690d82efb 100644 (file)
--- a/src/anim.c
+++ b/src/anim.c
@@ -1003,6 +1003,13 @@ static boolean isClickedPart(struct GlobalAnimPartControlInfo *part,
   return TRUE;
 }
 
+static boolean setPartClicked(struct GlobalAnimPartControlInfo *part)
+{
+  part->clicked = TRUE;
+
+  return (part->control_info.style & STYLE_PASSTHROUGH ? FALSE : TRUE);
+}
+
 int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
 {
   struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[part->mode_nr];
@@ -1510,7 +1517,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
 
        // always handle "any" click events (clicking anywhere on screen) ...
        if (isClickablePart(part, ANIM_EVENT_ANY))
-         anything_clicked = part->clicked = TRUE;
+         anything_clicked = setPartClicked(part);
 
        // ... but only handle the first (topmost) clickable animation
        if (any_part_clicked)
@@ -1530,7 +1537,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
          any_part_clicked = TRUE;
 
          if (isClickablePart(part, ANIM_EVENT_SELF))
-           anything_clicked = part->clicked = TRUE;
+           anything_clicked = setPartClicked(part);
 
          // check if this click is defined to trigger other animations
          int gic_anim_nr = part->old_anim_nr + 1;      // X as in "anim_X"
@@ -1556,7 +1563,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
 
              if (isClickablePart(part2, mask))
              {
-               anything_clicked = part2->clicked = TRUE;
+               setPartClicked(part2);
 
 #if 0
                printf("::: %d.%d TRIGGER CLICKED [%d]\n", anim2_nr, part2_nr,

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index d57b503061e83e0aac175d7e350cd6fb32b5423f..4a71d544c166cd0563494cc18d2d4078fbe4a385 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -2928,6 +2928,9 @@ int get_parameter_value(char *value_raw, char *suffix, int type)
 
     if (string_has_parameter(value, "reverse"))
       result |= STYLE_REVERSE;
+
+    if (string_has_parameter(value, "passthrough_clicks"))
+      result |= STYLE_PASSTHROUGH;
   }
   else if (strEqual(suffix, ".fade_mode"))
   {

diff --git a/src/libgame/system.h b/src/libgame/system.h
index ab8f43b0a85172467403a575bedb67b599c4938d..e396a369212db4e87817f1a6f8b7e8d5e063ff80 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -330,6 +330,9 @@
 #define STYLE_INNER_CORNERS    (1 << 1)
 #define STYLE_REVERSE          (1 << 2)
 
+/* values for special event handling style (used for global animation) */
+#define STYLE_PASSTHROUGH      (1 << 3)
+
 #define STYLE_DEFAULT          STYLE_NONE
 
 /* values for special global animation events */