X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fcartoons.c;h=2e74c72b92a5683da4063eb88a88ff1fd6381775;hp=6768c505f062829e2cd6aa2493bc5a3391f80f91;hb=3466bff66861926f480a96e5b8923a4e044d50a4;hpb=6f25a5c9cc138edfbfe689fdfed1488bc6e60b23

diff --git a/src/cartoons.c b/src/cartoons.c
index 6768c505..2e74c72b 100644
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -24,17 +24,30 @@
 #define NUM_GLOBAL_ANIM_PARTS_AND_TOONS	MAX(NUM_GLOBAL_ANIM_PARTS_ALL,	\
 					    NUM_GLOBAL_TOON_PARTS)
 
-#define ANIM_CLASS_BIT_SUBMENU		0
-#define ANIM_CLASS_BIT_MENU		1
-#define ANIM_CLASS_BIT_TOONS		2
+#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 NUM_ANIM_CLASSES		3
+#define NUM_ANIM_CLASSES		6
 
 #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_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_MENU_MAIN	(ANIM_CLASS_TOONS |	\
+					 ANIM_CLASS_MENU  |	\
+					 ANIM_CLASS_MAIN)
+
+#define ANIM_CLASS_TOONS_MENU_SUBMENU	(ANIM_CLASS_TOONS |	\
+					 ANIM_CLASS_MENU  |	\
+					 ANIM_CLASS_SUBMENU)
 
 struct GlobalAnimPartControlInfo
 {
@@ -42,7 +55,9 @@ struct GlobalAnimPartControlInfo
   int anim_nr;
   int mode_nr;
 
+  int sound;
   int graphic;
+
   struct GraphicInfo graphic_info;
   struct GraphicInfo control_info;
 
@@ -104,14 +119,25 @@ struct GameModeAnimClass
   int class;
 } game_mode_anim_classes_list[] =
 {
-  { GAME_MODE_LEVELS, ANIM_CLASS_TOONS | ANIM_CLASS_MENU | ANIM_CLASS_SUBMENU },
-  { GAME_MODE_LEVELNR,ANIM_CLASS_TOONS | ANIM_CLASS_MENU | ANIM_CLASS_SUBMENU },
-  { GAME_MODE_INFO,   ANIM_CLASS_TOONS | ANIM_CLASS_MENU | ANIM_CLASS_SUBMENU },
-  { GAME_MODE_SETUP,  ANIM_CLASS_TOONS | ANIM_CLASS_MENU | ANIM_CLASS_SUBMENU },
-  { GAME_MODE_MAIN,   ANIM_CLASS_TOONS | ANIM_CLASS_MENU		      },
-  { GAME_MODE_SCORES, ANIM_CLASS_TOONS					      },
-
-  { -1,		      -1						      }
+  { GAME_MODE_TITLE_INITIAL_1,		ANIM_CLASS_TITLE_INITIAL	},
+  { GAME_MODE_TITLE_INITIAL_2,		ANIM_CLASS_TITLE_INITIAL	},
+  { GAME_MODE_TITLE_INITIAL_3,		ANIM_CLASS_TITLE_INITIAL	},
+  { GAME_MODE_TITLE_INITIAL_4,		ANIM_CLASS_TITLE_INITIAL	},
+  { GAME_MODE_TITLE_INITIAL_5,		ANIM_CLASS_TITLE_INITIAL	},
+  { GAME_MODE_TITLE_1,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_TITLE_2,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_TITLE_3,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_TITLE_4,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_TITLE_5,			ANIM_CLASS_TITLE		},
+  { GAME_MODE_LEVELS, 			ANIM_CLASS_TOONS_MENU_SUBMENU	},
+  { GAME_MODE_LEVELNR,			ANIM_CLASS_TOONS_MENU_SUBMENU	},
+  { GAME_MODE_INFO,			ANIM_CLASS_TOONS_MENU_SUBMENU	},
+  { 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		},
+
+  { -1,					-1				}
 };
 
 struct AnimClassGameMode
@@ -120,11 +146,14 @@ struct AnimClassGameMode
   int game_mode;
 } anim_class_game_modes_list[] =
 {
-  { ANIM_CLASS_BIT_SUBMENU,	GAME_MODE_PSEUDO_SUBMENU	},
-  { ANIM_CLASS_BIT_MENU,	GAME_MODE_PSEUDO_MENU		},
-  { ANIM_CLASS_BIT_TOONS,	GAME_MODE_PSEUDO_TOONS		},
-
-  { -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_SUBMENU,		GAME_MODE_PSEUDO_SUBMENU	},
+  { ANIM_CLASS_BIT_MENU,		GAME_MODE_PSEUDO_MENU		},
+  { ANIM_CLASS_BIT_TOONS,		GAME_MODE_PSEUDO_TOONS		},
+
+  { -1,					-1				}
 };
 
 /* forward declaration for internal use */
@@ -282,12 +311,14 @@ static void InitToonControls()
   for (i = 0; i < num_toons; i++)
   {
     struct GlobalAnimPartControlInfo *part = &anim->part[part_nr];
+    int sound = SND_UNDEFINED;
     int graphic = IMG_TOON_1 + i;
     int control = graphic;
 
     part->nr = part_nr;
     part->anim_nr = anim_nr;
     part->mode_nr = mode_nr;
+    part->sound = sound;
     part->graphic = graphic;
     part->graphic_info = graphic_info[graphic];
     part->control_info = graphic_info[control];
@@ -319,7 +350,7 @@ void InitGlobalAnimControls()
 {
   int i, m, a, p;
   int mode_nr, anim_nr, part_nr;
-  int graphic, control;
+  int sound, graphic, control;
 
   anim_sync_frame = 0;
 
@@ -367,6 +398,7 @@ void InitGlobalAnimControls()
       {
 	struct GlobalAnimPartControlInfo *part = &anim->part[part_nr];
 
+	sound   = global_anim_info[a].sound[p][m];
 	graphic = global_anim_info[a].graphic[p][m];
 	control = global_anim_info[ctrl_id].graphic[p][m];
 
@@ -379,9 +411,15 @@ void InitGlobalAnimControls()
 	       m, a, p, mode_nr, anim_nr, part_nr, control);
 #endif
 
+#if 0
+	printf("::: mode == %d, anim = %d, part = %d [%d, %d, %d] [%d]\n",
+	       m, a, p, mode_nr, anim_nr, part_nr, sound);
+#endif
+
 	part->nr = part_nr;
 	part->anim_nr = anim_nr;
 	part->mode_nr = mode_nr;
+	part->sound = sound;
 	part->graphic = graphic;
 	part->graphic_info = graphic_info[graphic];
 	part->control_info = graphic_info[control];
@@ -677,6 +715,44 @@ boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part)
   return changed;
 }
 
+void PlayGlobalAnimSound(struct GlobalAnimPartControlInfo *part)
+{
+  int sound = part->sound;
+
+  if (sound == SND_UNDEFINED)
+    return;
+
+  if ((!setup.sound_simple && !IS_LOOP_SOUND(sound)) ||
+      (!setup.sound_loops && IS_LOOP_SOUND(sound)))
+    return;
+
+  // !!! TODO: ADD STEREO POSITION FOR MOVING ANIMATIONS !!!
+  if (IS_LOOP_SOUND(sound))
+    PlaySoundLoop(sound);
+  else
+    PlaySound(sound);
+
+#if 0
+  printf("::: PLAY %d.%d.%d: %d\n",
+	 part->anim_nr, part->nr, part->mode_nr, sound);
+#endif
+}
+
+void StopGlobalAnimSound(struct GlobalAnimPartControlInfo *part)
+{
+  int sound = part->sound;
+
+  if (sound == SND_UNDEFINED)
+    return;
+
+  StopSound(sound);
+
+#if 0
+  printf("::: STOP %d.%d.%d: %d\n",
+	 part->anim_nr, part->nr, part->mode_nr, sound);
+#endif
+}
+
 int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
 {
   struct GraphicInfo *g = &part->graphic_info;
@@ -771,20 +847,43 @@ int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
       part->step_xoffset = c->step_xoffset;
     if (c->step_yoffset != ARG_UNDEFINED_VALUE)
       part->step_yoffset = c->step_yoffset;
+
+    if (part->init_delay_counter == 0)
+      PlayGlobalAnimSound(part);
   }
 
   if (part->init_delay_counter > 0)
   {
     part->init_delay_counter--;
 
+    if (part->init_delay_counter == 0)
+      PlayGlobalAnimSound(part);
+
     return ANIM_STATE_WAITING;
   }
 
+  // check if moving animation has left the visible screen area
   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;
+  {
+    // do not stop animation before "anim" or "post" counter are finished
+    if (part->anim_delay_counter == 0 &&
+	part->post_delay_counter == 0)
+    {
+      StopGlobalAnimSound(part);
+
+      part->post_delay_counter =
+	(c->post_delay_fixed + GetSimpleRandom(c->post_delay_random));
+
+      if (part->post_delay_counter > 0)
+	return ANIM_STATE_RUNNING;
+
+      // drawing last frame not needed here -- animation not visible anymore
+      return ANIM_STATE_RESTART;
+    }
+  }
 
   if (part->anim_delay_counter > 0)
   {
@@ -792,12 +891,15 @@ int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
 
     if (part->anim_delay_counter == 0)
     {
+      StopGlobalAnimSound(part);
+
       part->post_delay_counter =
 	(c->post_delay_fixed + GetSimpleRandom(c->post_delay_random));
 
       if (part->post_delay_counter > 0)
 	return ANIM_STATE_RUNNING;
 
+      // additional state "RUNNING" required to not skip drawing last frame
       return ANIM_STATE_RESTART | ANIM_STATE_RUNNING;
     }
   }
@@ -879,6 +981,14 @@ void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
     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++)
+	  StopGlobalAnimSound(&anim->part[i]);
+      }
+
       return;
 
     default: