#define ANIM_CLASS_BIT_TITLE_INITIAL 0
#define ANIM_CLASS_BIT_TITLE 1
#define ANIM_CLASS_BIT_MAIN 2
-#define ANIM_CLASS_BIT_SUBMENU 3
-#define ANIM_CLASS_BIT_MENU 4
-#define ANIM_CLASS_BIT_TOONS 5
+#define ANIM_CLASS_BIT_SCORES 3
+#define ANIM_CLASS_BIT_SUBMENU 4
+#define ANIM_CLASS_BIT_MENU 5
+#define ANIM_CLASS_BIT_TOONS 6
-#define NUM_ANIM_CLASSES 6
+#define NUM_ANIM_CLASSES 7
#define ANIM_CLASS_NONE 0
#define ANIM_CLASS_TITLE_INITIAL (1 << ANIM_CLASS_BIT_TITLE_INITIAL)
#define ANIM_CLASS_TITLE (1 << ANIM_CLASS_BIT_TITLE)
#define ANIM_CLASS_MAIN (1 << ANIM_CLASS_BIT_MAIN)
+#define ANIM_CLASS_SCORES (1 << ANIM_CLASS_BIT_SCORES)
#define ANIM_CLASS_SUBMENU (1 << ANIM_CLASS_BIT_SUBMENU)
#define ANIM_CLASS_MENU (1 << ANIM_CLASS_BIT_MENU)
#define ANIM_CLASS_TOONS (1 << ANIM_CLASS_BIT_TOONS)
+#define ANIM_CLASS_TOONS_SCORES (ANIM_CLASS_TOONS | \
+ ANIM_CLASS_SCORES)
+
#define ANIM_CLASS_TOONS_MENU_MAIN (ANIM_CLASS_TOONS | \
ANIM_CLASS_MENU | \
ANIM_CLASS_MAIN)
boolean has_base; // animation has base/main/default animation part
+ int last_x, last_y;
+
int init_delay_counter;
int state;
{ GAME_MODE_SETUP, ANIM_CLASS_TOONS_MENU_SUBMENU },
{ GAME_MODE_PSEUDO_MAINONLY, ANIM_CLASS_TOONS_MENU_MAIN },
{ GAME_MODE_PSEUDO_TYPENAME, ANIM_CLASS_TOONS_MENU_MAIN },
- { GAME_MODE_SCORES, ANIM_CLASS_TOONS },
+ { GAME_MODE_PSEUDO_SCORESOLD, ANIM_CLASS_TOONS_SCORES },
+ { GAME_MODE_PSEUDO_SCORESNEW, ANIM_CLASS_TOONS_SCORES },
{ -1, -1 }
};
{ ANIM_CLASS_BIT_TITLE_INITIAL, GAME_MODE_TITLE_INITIAL },
{ ANIM_CLASS_BIT_TITLE, GAME_MODE_TITLE },
{ ANIM_CLASS_BIT_MAIN, GAME_MODE_MAIN },
+ { ANIM_CLASS_BIT_SCORES, GAME_MODE_SCORES },
{ ANIM_CLASS_BIT_SUBMENU, GAME_MODE_PSEUDO_SUBMENU },
{ ANIM_CLASS_BIT_MENU, GAME_MODE_PSEUDO_MENU },
{ ANIM_CLASS_BIT_TOONS, GAME_MODE_PSEUDO_TOONS },
static int game_mode_anim_classes[NUM_GAME_MODES];
static int anim_class_game_modes[NUM_ANIM_CLASSES];
+static int anim_status_last_before_fading = GAME_MODE_DEFAULT;
static int anim_status_last = GAME_MODE_DEFAULT;
static int anim_classes_last = ANIM_CLASS_NONE;
anim->has_base = FALSE;
+ anim->last_x = POS_OFFSCREEN;
+ anim->last_y = POS_OFFSCREEN;
+
anim->init_delay_counter = 0;
anim->state = ANIM_STATE_INACTIVE;
anim->has_base = FALSE;
+ anim->last_x = POS_OFFSCREEN;
+ anim->last_y = POS_OFFSCREEN;
+
anim->init_delay_counter = 0;
anim->state = ANIM_STATE_INACTIVE;
anim_class_game_modes[anim_class_game_modes_list[i].class_bit] =
anim_class_game_modes_list[i].game_mode;
+ anim_status_last_before_fading = GAME_MODE_LOADING;
anim_status_last = GAME_MODE_LOADING;
anim_classes_last = ANIM_CLASS_NONE;
}
if (drawing_target == DRAW_TO_FADE_TARGET)
after_fading = TRUE;
+ // special case: changing from/to this screen is done without fading
+ if (global.anim_status == GAME_MODE_PSEUDO_TYPENAME ||
+ anim_status_last == GAME_MODE_PSEUDO_TYPENAME)
+ after_fading = TRUE;
+
// ---------- part 1 ------------------------------------------------------
// start or stop global animations by change of game mode
// (special handling of animations for "current screen" and "all screens")
- // stop animations for last screen
- game_mode_anim_action[anim_status_last] = ANIM_STOP;
+ if (global.anim_status_next != anim_status_last_before_fading)
+ {
+ // stop animations for last screen before fading to new screen
+ game_mode_anim_action[anim_status_last] = ANIM_STOP;
- // start animations for current screen
- game_mode_anim_action[global.anim_status] = ANIM_START;
+ // start animations for current screen after fading to new screen
+ game_mode_anim_action[global.anim_status] = ANIM_START;
+ }
// start animations for all screens after loading new artwork set
if (anim_status_last == GAME_MODE_LOADING)
if (drawing_target == DRAW_TO_SCREEN)
{
if (after_fading)
+ {
anim_classes_last = anim_classes_next;
+ anim_status_last_before_fading = global.anim_status;
+ }
anim_status_last = global.anim_status;
StopGlobalAnimMusic(part);
}
-static boolean matchesAnimEventMask(int bits, int mask)
-{
- return (bits & (mask & ANIM_EVENT_CLICK_ANIM_ALL) &&
- bits & (mask & ANIM_EVENT_CLICK_PART_ALL));
-}
-
static boolean isClickablePart(struct GlobalAnimPartControlInfo *part, int mask)
{
struct GraphicInfo *c = &part->control_info;
-
- boolean clickable_self = FALSE;
- boolean clickable_triggered = FALSE;
-
- if (mask & ANIM_EVENT_CLICK_SELF)
- clickable_self = (c->init_event & ANIM_EVENT_CLICK_SELF ||
- c->anim_event & ANIM_EVENT_CLICK_SELF);
-
- clickable_triggered = (matchesAnimEventMask(c->init_event, mask) ||
- matchesAnimEventMask(c->anim_event, mask));
-
- return (clickable_self || clickable_triggered);
+ int trigger_mask = ANIM_EVENT_ANIM_MASK | ANIM_EVENT_PART_MASK;
+ int mask_anim_only = mask & ANIM_EVENT_ANIM_MASK;
+
+ if (mask & ANIM_EVENT_ANY)
+ return (c->init_event & ANIM_EVENT_ANY ||
+ c->anim_event & ANIM_EVENT_ANY);
+ else if (mask & ANIM_EVENT_SELF)
+ return (c->init_event & ANIM_EVENT_SELF ||
+ c->anim_event & ANIM_EVENT_SELF);
+ else
+ return ((c->init_event & trigger_mask) == mask ||
+ (c->anim_event & trigger_mask) == mask ||
+ (c->init_event & trigger_mask) == mask_anim_only ||
+ (c->anim_event & trigger_mask) == mask_anim_only);
}
static boolean isClickedPart(struct GlobalAnimPartControlInfo *part,
int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
{
+ struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[part->mode_nr];
+ struct GlobalAnimMainControlInfo *anim = &ctrl->anim[part->anim_nr];
struct GraphicInfo *g = &part->graphic_info;
struct GraphicInfo *c = &part->control_info;
boolean viewport_changed = SetGlobalAnimPart_Viewport(part);
if (c->y != ARG_UNDEFINED_VALUE)
part->y = c->y;
+ if (c->position == POS_LAST &&
+ anim->last_x > -g->width && anim->last_x < part->viewport_width &&
+ anim->last_y > -g->height && anim->last_y < part->viewport_height)
+ {
+ part->x = anim->last_x;
+ part->y = anim->last_y;
+ }
+
if (c->step_xoffset != ARG_UNDEFINED_VALUE)
part->step_xoffset = c->step_xoffset;
if (c->step_yoffset != ARG_UNDEFINED_VALUE)
part->x += part->step_xoffset;
part->y += part->step_yoffset;
+ anim->last_x = part->x;
+ anim->last_y = part->y;
+
return ANIM_STATE_RUNNING;
}
{
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 i;
#if 0
printf("::: HandleGlobalAnim_Main: %d, %d => %d\n",
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;
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);
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
{
+ boolean anything_clicked = FALSE;
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;
- for (anim_nr = 0; anim_nr < ctrl->num_anims; anim_nr++)
+ // check animations in reverse draw order (to stop when clicked)
+ for (anim_nr = ctrl->num_anims - 1; anim_nr >= 0; anim_nr--)
{
struct GlobalAnimMainControlInfo *anim = &ctrl->anim[anim_nr];
int part_nr;
- for (part_nr = 0; part_nr < anim->num_parts_all; part_nr++)
+ // check animation parts in reverse draw order (to stop when clicked)
+ for (part_nr = anim->num_parts_all - 1; part_nr >= 0; part_nr--)
{
struct GlobalAnimPartControlInfo *part = &anim->part[part_nr];
continue;
}
- if (part->clickable &&
- isClickedPart(part, mx, my, clicked))
+ if (!part->clickable)
+ continue;
+
+ // always handle "any" click events (clicking anywhere on screen) ...
+ if (isClickablePart(part, ANIM_EVENT_ANY))
+ anything_clicked = part->clicked = TRUE;
+
+ // ... but only handle the first (topmost) clickable animation
+ if (any_part_clicked)
+ continue;
+
+ if (isClickedPart(part, mx, my, clicked))
{
#if 0
printf("::: %d.%d CLICKED\n", anim_nr, part_nr);
#endif
- if (isClickablePart(part, ANIM_EVENT_CLICK_SELF))
- any_part_clicked = part->clicked = TRUE;
+ any_part_clicked = TRUE;
+
+ if (isClickablePart(part, ANIM_EVENT_SELF))
+ anything_clicked = part->clicked = TRUE;
// check if this click is defined to trigger other animations
- int old_anim_nr = part->old_anim_nr;
- int old_part_nr = part->old_nr;
- int mask = ANIM_EVENT_CLICK_ANIM_1 << old_anim_nr;
+ int gic_anim_nr = part->old_anim_nr + 1; // X as in "anim_X"
+ int gic_part_nr = part->old_nr + 1; // Y as in "part_Y"
+ int mask = gic_anim_nr << ANIM_EVENT_ANIM_BIT;
- if (part->is_base)
- mask |= ANIM_EVENT_CLICK_PART_ALL;
- else
- mask |= ANIM_EVENT_CLICK_PART_1 << old_part_nr;
+ if (!part->is_base)
+ mask |= gic_part_nr << ANIM_EVENT_PART_BIT;
int anim2_nr;
struct GlobalAnimPartControlInfo *part2 = &anim2->part[part2_nr];
if (isClickablePart(part2, mask))
- any_part_clicked = part2->clicked = TRUE;
+ anything_clicked = part2->clicked = TRUE;
#if 0
struct GraphicInfo *c = &part2->control_info;
}
}
- return any_part_clicked;
+ return anything_clicked;
}
static void ResetGlobalAnim_Clickable()
projects / rocksndiamonds.git / blobdiff