X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fcartoons.c;h=b2f2eb2b8f4ca5528a8d79f1a1b8b64f16c3a419;hp=9d5642f02ff4502273cb35f0b38f2c2f41d8fcdc;hb=8ae535c1c76e1c33572afbcd4b2d3d9c3d7ba63e;hpb=f15e4ecc5482d13e8249f3a0aa7e32c0b565f9e5

diff --git a/src/cartoons.c b/src/cartoons.c
index 9d5642f0..b2f2eb2b 100644
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -14,10 +14,15 @@
 #include "tools.h"
 
 
-/* values for global animation definition */
-#define NUM_GLOBAL_ANIMS_AND_TOONS	(NUM_GLOBAL_ANIMS + 1)
+/* values for global toon animation definition */
+#define NUM_GLOBAL_TOON_ANIMS		1
+#define NUM_GLOBAL_TOON_PARTS		MAX_NUM_TOONS
+
+/* values for global animation definition (including toons) */
+#define NUM_GLOBAL_ANIMS_AND_TOONS	(NUM_GLOBAL_ANIMS +		\
+					 NUM_GLOBAL_TOON_ANIMS)
 #define NUM_GLOBAL_ANIM_PARTS_AND_TOONS	MAX(NUM_GLOBAL_ANIM_PARTS_ALL,	\
-					    MAX_NUM_TOONS)
+					    NUM_GLOBAL_TOON_PARTS)
 
 struct GlobalAnimPartControlInfo
 {
@@ -29,18 +34,25 @@ struct GlobalAnimPartControlInfo
   struct GraphicInfo graphic_info;
   struct GraphicInfo control_info;
 
+  int viewport_x;
+  int viewport_y;
+  int viewport_width;
+  int viewport_height;
+
   int x, y;
   int step_xoffset, step_yoffset;
 
   unsigned int initial_anim_sync_frame;
-  unsigned int step_frames, step_frames_value;
   unsigned int step_delay, step_delay_value;
 
-  unsigned int init_delay, init_delay_value;
-  unsigned int anim_delay, anim_delay_value;
-  unsigned int post_delay, post_delay_value;
+  int init_delay_counter;
+  int anim_delay_counter;
+  int post_delay_counter;
+
+  int drawing_stage;
 
   int state;
+  int last_game_status;
 };
 
 struct GlobalAnimMainControlInfo
@@ -59,7 +71,7 @@ struct GlobalAnimMainControlInfo
 
   boolean has_base;
 
-  unsigned int init_delay, init_delay_value;
+  int init_delay_counter;
 
   int state;
 };
@@ -181,8 +193,7 @@ static void InitToonControls()
 
   anim->has_base = FALSE;
 
-  anim->init_delay = 0;
-  anim->init_delay_value = 0;
+  anim->init_delay_counter = 0;
 
   anim->state = ANIM_STATE_INACTIVE;
 
@@ -209,13 +220,13 @@ static void InitToonControls()
     part->control_info.x = ARG_UNDEFINED_VALUE;
     part->control_info.y = ARG_UNDEFINED_VALUE;
 
-    part->step_frames = 0;
-    part->step_frames_value = graphic_info[control].step_frames;
+    part->initial_anim_sync_frame = 0;
 
     part->step_delay = 0;
     part->step_delay_value = graphic_info[control].step_delay;
 
     part->state = ANIM_STATE_INACTIVE;
+    part->last_game_status = -1;
 
     anim->num_parts++;
     part_nr++;
@@ -266,8 +277,7 @@ void InitGlobalAnimControls()
 
       anim->has_base = FALSE;
 
-      anim->init_delay = 0;
-      anim->init_delay_value = 0;
+      anim->init_delay_counter = 0;
 
       anim->state = ANIM_STATE_INACTIVE;
 
@@ -296,13 +306,13 @@ void InitGlobalAnimControls()
 	part->graphic_info = graphic_info[graphic];
 	part->control_info = graphic_info[control];
 
-	part->step_frames = 0;
-	part->step_frames_value = graphic_info[control].step_frames;
+	part->initial_anim_sync_frame = 0;
 
 	part->step_delay = 0;
 	part->step_delay_value = graphic_info[control].step_delay;
 
 	part->state = ANIM_STATE_INACTIVE;
+	part->last_game_status = -1;
 
 	if (p < GLOBAL_ANIM_ID_PART_BASE)
 	{
@@ -327,7 +337,7 @@ void InitGlobalAnimControls()
   InitToonControls();
 }
 
-void DrawGlobalAnim()
+void DrawGlobalAnimExt(int drawing_stage)
 {
   int mode_nr;
 
@@ -337,7 +347,8 @@ void DrawGlobalAnim()
   if (!do_animations || !setup.toons)
     return;
 
-  DoAnimationExt();
+  if (drawing_stage == DRAW_GLOBAL_ANIM_STAGE_1)
+    DoAnimationExt();
 
   for (mode_nr = 0; mode_nr < NUM_SPECIAL_GFX_ARGS; mode_nr++)
   {
@@ -355,7 +366,7 @@ void DrawGlobalAnim()
       int part_first, part_last;
       int part_nr;
 
-      if (anim->state != ANIM_STATE_RUNNING)
+      if (!(anim->state & ANIM_STATE_RUNNING))
 	continue;
 
       part_first = part_last = anim->active_part_nr;
@@ -383,7 +394,10 @@ void DrawGlobalAnim()
 	int sync_frame;
 	int frame;
 
-	if (part->state != ANIM_STATE_RUNNING)
+	if (!(part->state & ANIM_STATE_RUNNING))
+	  continue;
+
+	if (part->drawing_stage != drawing_stage)
 	  continue;
 
 	if (part->x < 0)
@@ -392,8 +406,8 @@ void DrawGlobalAnim()
 	  width += part->x;
 	  cut_x = -part->x;
 	}
-	else if (part->x > FULL_SXSIZE - g->width)
-	  width -= (part->x - (FULL_SXSIZE - g->width));
+	else if (part->x > part->viewport_width - g->width)
+	  width -= (part->x - (part->viewport_width - g->width));
 
 	if (part->y < 0)
 	{
@@ -401,11 +415,11 @@ void DrawGlobalAnim()
 	  height += part->y;
 	  cut_y = -part->y;
 	}
-	else if (part->y > FULL_SYSIZE - g->height)
-	  height -= (part->y - (FULL_SYSIZE - g->height));
+	else if (part->y > part->viewport_height - g->height)
+	  height -= (part->y - (part->viewport_height - g->height));
 
-	dst_x += REAL_SX;
-	dst_y += REAL_SY;
+	dst_x += part->viewport_x;
+	dst_y += part->viewport_y;
 
 	sync_frame = anim_sync_frame - part->initial_anim_sync_frame;
 	frame = getAnimationFrame(g->anim_frames, g->anim_delay,
@@ -425,21 +439,102 @@ void DrawGlobalAnim()
   }
 }
 
+void DrawGlobalAnim(int drawing_stage)
+{
+  if (!do_animations || !setup.toons)
+    return;
+
+  DrawGlobalAnimExt(drawing_stage);
+}
+
+boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part)
+{
+  int viewport_x;
+  int viewport_y;
+  int viewport_width;
+  int viewport_height;
+  boolean changed = FALSE;
+
+  if (part->last_game_status == game_status)
+    return FALSE;
+
+  part->last_game_status = game_status;
+
+  part->drawing_stage = DRAW_GLOBAL_ANIM_STAGE_1;
+
+  if (part->control_info.class == get_hash_from_key("window") ||
+      part->control_info.class == get_hash_from_key("border"))
+  {
+    viewport_x = 0;
+    viewport_y = 0;
+    viewport_width  = WIN_XSIZE;
+    viewport_height = WIN_YSIZE;
+
+    part->drawing_stage = DRAW_GLOBAL_ANIM_STAGE_2;
+  }
+  else if (part->control_info.class == get_hash_from_key("door_1"))
+  {
+    viewport_x = DX;
+    viewport_y = DY;
+    viewport_width  = DXSIZE;
+    viewport_height = DYSIZE;
+  }
+  else if (part->control_info.class == get_hash_from_key("door_2"))
+  {
+    viewport_x = VX;
+    viewport_y = VY;
+    viewport_width  = VXSIZE;
+    viewport_height = VYSIZE;
+  }
+  else		// default: "playfield"
+  {
+    viewport_x = REAL_SX;
+    viewport_y = REAL_SY;
+    viewport_width  = FULL_SXSIZE;
+    viewport_height = FULL_SYSIZE;
+  }
+
+  if (viewport_x != part->viewport_x ||
+      viewport_y != part->viewport_y ||
+      viewport_width  != part->viewport_width ||
+      viewport_height != part->viewport_height)
+  {
+    part->viewport_x = viewport_x;
+    part->viewport_y = viewport_y;
+    part->viewport_width  = viewport_width;
+    part->viewport_height = viewport_height;
+
+    changed = TRUE;
+  }
+
+  return changed;
+}
+
 int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
 {
   struct GraphicInfo *g = &part->graphic_info;
   struct GraphicInfo *c = &part->control_info;
+  boolean viewport_changed = SetGlobalAnimPart_Viewport(part);
+
+  if (viewport_changed)
+    state |= ANIM_STATE_RESTART;
 
   if (state & ANIM_STATE_RESTART)
   {
     ResetDelayCounterExt(&part->step_delay, anim_sync_frame);
 
-    part->initial_anim_sync_frame = (g->anim_global_sync ? 0 : anim_sync_frame);
-    part->step_frames = 0;
+    part->init_delay_counter =
+      (c->init_delay_fixed + GetSimpleRandom(c->init_delay_random));
+
+    part->anim_delay_counter =
+      (c->anim_delay_fixed + GetSimpleRandom(c->anim_delay_random));
+
+    part->initial_anim_sync_frame =
+      (g->anim_global_sync ? 0 : anim_sync_frame + part->init_delay_counter);
 
     if (c->direction & MV_HORIZONTAL)
     {
-      int pos_bottom = FULL_SYSIZE - g->height;
+      int pos_bottom = part->viewport_height - g->height;
 
       if (c->position == POS_TOP)
 	part->y = 0;
@@ -462,14 +557,14 @@ int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
       else
       {
 	part->step_xoffset = -c->step_offset;
-	part->x = FULL_SXSIZE + part->step_xoffset;
+	part->x = part->viewport_width + part->step_xoffset;
       }
 
       part->step_yoffset = 0;
     }
     else if (c->direction & MV_VERTICAL)
     {
-      int pos_right = FULL_SXSIZE - g->width;
+      int pos_right = part->viewport_width - g->width;
 
       if (c->position == POS_LEFT)
 	part->x = 0;
@@ -486,7 +581,7 @@ int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
       else
       {
 	part->step_yoffset = -c->step_offset;
-	part->y = FULL_SYSIZE + part->step_yoffset;
+	part->y = part->viewport_height + part->step_yoffset;
       }
 
       part->step_xoffset = 0;
@@ -511,16 +606,45 @@ int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
       part->step_yoffset = c->step_yoffset;
   }
 
-  if ((part->x <= -g->width    && part->step_xoffset <= 0) ||
-      (part->x >=  FULL_SXSIZE && part->step_xoffset >= 0) ||
-      (part->y <= -g->height   && part->step_yoffset <= 0) ||
-      (part->y >=  FULL_SYSIZE && part->step_yoffset >= 0))
-    return ANIM_STATE_RESTART;
+  if (part->init_delay_counter > 0)
+  {
+    part->init_delay_counter--;
+
+    return ANIM_STATE_WAITING;
+  }
 
-  if (part->step_frames_value != ARG_UNDEFINED_VALUE &&
-      part->step_frames >= part->step_frames_value)
+  if ((part->x <= -g->width              && part->step_xoffset <= 0) ||
+      (part->x >=  part->viewport_width  && part->step_xoffset >= 0) ||
+      (part->y <= -g->height             && part->step_yoffset <= 0) ||
+      (part->y >=  part->viewport_height && part->step_yoffset >= 0))
     return ANIM_STATE_RESTART;
 
+  if (part->anim_delay_counter > 0)
+  {
+    part->anim_delay_counter--;
+
+    if (part->anim_delay_counter == 0)
+    {
+      part->post_delay_counter =
+	(c->post_delay_fixed + GetSimpleRandom(c->post_delay_random));
+
+      if (part->post_delay_counter > 0)
+	return ANIM_STATE_RUNNING;
+
+      return ANIM_STATE_RESTART | ANIM_STATE_RUNNING;
+    }
+  }
+
+  if (part->post_delay_counter > 0)
+  {
+    part->post_delay_counter--;
+
+    if (part->post_delay_counter == 0)
+      return ANIM_STATE_RESTART;
+
+    return ANIM_STATE_WAITING;
+  }
+
   if (!DelayReachedExt(&part->step_delay, part->step_delay_value,
 		       anim_sync_frame))
     return ANIM_STATE_RUNNING;
@@ -540,8 +664,6 @@ int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
   part->x += part->step_xoffset;
   part->y += part->step_yoffset;
 
-  part->step_frames++;
-
   return ANIM_STATE_RUNNING;
 }
 
@@ -549,7 +671,6 @@ void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
 {
   struct GlobalAnimPartControlInfo *part;
   struct GraphicInfo *c = &anim->control_info;
-  struct GraphicInfo *cp;
   boolean skip = FALSE;
 
 #if 0
@@ -609,7 +730,6 @@ void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
     for (i = 0; i < num_parts; i++)
     {
       part = &anim->part[i];
-      cp = &part->control_info;
 
       switch (action)
       {
@@ -639,43 +759,6 @@ void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
       if (skip)
 	continue;
 
-      if (part->state & ANIM_STATE_RESTART)
-      {
-#if 0
-	printf("::: RESTART %d.%d\n", part->anim_nr, part->nr);
-#endif
-
-	if (!(part->state & ANIM_STATE_WAITING))
-	{
-#if 0
-	  printf("::: WAITING %d.%d\n", part->anim_nr, part->nr);
-#endif
-
-	  ResetDelayCounterExt(&part->init_delay, anim_sync_frame);
-
-	  part->init_delay_value =
-	    (cp->init_delay_fixed + GetSimpleRandom(cp->init_delay_random));
-
-	  part->state |= ANIM_STATE_WAITING;
-	}
-
-	if (!DelayReachedExt(&part->init_delay, part->init_delay_value,
-			     anim_sync_frame))
-	  return;
-
-#if 0
-	printf("::: RUNNING %d.%d\n", part->anim_nr, part->nr);
-#endif
-
-	part->state = ANIM_STATE_RESTART | ANIM_STATE_RUNNING;
-      }
-
-#if 0
-      printf("::: DO PART %d.%d [%d, %d, %d] [%d]\n", part->anim_nr, part->nr,
-	     part->restart, part->waiting, part->running,
-	     anim->running);
-#endif
-
       part->state = HandleGlobalAnim_Part(part, part->state);
     }
 
@@ -685,37 +768,16 @@ void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
   if (skip)
     return;
 
-  if (anim->state == ANIM_STATE_RESTART)	// directly after restart
+  if (anim->state & ANIM_STATE_RESTART)		// directly after restart
     anim->active_part_nr = getGlobalAnimationPart(anim);
 
   part = &anim->part[anim->active_part_nr];
 
-  if (anim->state & ANIM_STATE_RESTART)
-  {
-    if (!(anim->state & ANIM_STATE_WAITING))
-    {
-      cp = &part->control_info;
-
-      ResetDelayCounterExt(&part->init_delay, anim_sync_frame);
-
-      part->init_delay_value =
-	(cp->init_delay_fixed + GetSimpleRandom(cp->init_delay_random));
-
-      anim->state |= ANIM_STATE_WAITING;
-    }
-
-    if (!DelayReachedExt(&part->init_delay, part->init_delay_value,
-			 anim_sync_frame))
-      return;
-
-    anim->state = ANIM_STATE_RESTART | ANIM_STATE_RUNNING;
-  }
-
   part->state = ANIM_STATE_RUNNING;
 
   anim->state = HandleGlobalAnim_Part(part, anim->state);
 
-  if (anim->state == ANIM_STATE_RESTART)
+  if (anim->state & ANIM_STATE_RESTART)
     anim->part_counter++;
 }