DRASCULA: Merge some animation functions and document all animations

1 files changed, 44 insertions, 52 deletions

diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index bb601b5b2e..9f13d36c9e 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -654,63 +654,55 @@ public:
 	bool room_62(int);
 	bool room_102(int);
 
-	void animation_1_1();
-	void animation_2_1();
-	void animation_3_1();
-	void animation_4_1();
-	//
-	void animation_2_2();
-	void animation_4_2();
-	void animation_5_2();
-	void animation_6_2();
-	void animation_7_2();
-	void animation_11_2();
-	void animation_12_2();
-	void animation_13_2();
-	void animation_14_2();
 	void asco();
-	void animation_16_2();
-	void animation_20_2();
-	void animation_23_2();
-	void animation_23_joined();
-	void animation_23_joined2();
-	void animation_24_2();
-	void animation_25_2();
-	void animation_26_2();
-	void animation_27_2();
-	void animation_29_2();
-	void animation_31_2();
-	void animation_32_2();
-	void animation_33_2();
-	void animation_34_2();
-	void animation_35_2();
-	void animation_36_2();
+
+	void animation_1_1();		// Game introduction
+	void animation_2_1();		// John falls in love with BJ, who is then abducted by Drascula
+	void animation_3_1();		// John talks with the bartender to book a room
+	void animation_4_1();		// John talks with the pianist
+	//
+	void animation_2_2();		// John enters the chapel via the window 
+	void animation_4_2();		// John talks with the blind man (closeup)
+	void animation_5_2();		// John breaks the chapel window with the pike
+	void animation_6_2();		// The blind man (closeup) thanks John for giving him money and hands him the sickle
+	void animation_7_2();		// John uses the sickle
+	void animation_11_2();		// The drunk man says "they're all dead, thanks *hic*"
+	void animation_12_2();		// Conversation screen - John talks to the pianist after BJ is abducted by Drascula
+	void animation_13_2();		// ???
+	void animation_14_2();		// The glass box falls from the ceiling
+	void animation_16_2();		// The drunk tells us about Von Braun
+	void animation_20_2();		// Von Braun tells John that he needs to have special skills to fight vampires
+	void animation_23_2();		// Von Braun tests John's reactions to scratching noises
+	void animation_24_2();		// Conversation screen - John talks with Von Braun
+	void animation_25_2();		// The glass box is lifted back to the ceiling
+	void animation_26_2();		// John gives the book to the pianist and gets his earplugs in return
+	void animation_27_2();		// Von Braun admits that John is ready to fight vampires and gives him his money back
+	void animation_29_2();		// Von Braun tells John what ingredients he needs for the brew
+	void animation_31_2();		// Von Braun obtains the items needed for the brew from John and creates it
+	void animation_34_2();		// John kicks an object
+	void animation_35_2();		// John jumps into the well
+	void animation_36_2();		// John asks the bartender about the pianist
 	//
-	void animation_2_3();
-	void animation_3_3();
-	void animation_4_3();
-	void animation_5_3();
-	void animation_6_3();
-	void animation_ray();
+	void animation_2_3();		// John uses the cross with the Frankenstein-zombie ("yoda") and destroys him
+	void animation_6_3();		// Frankenstein is blocking John's path
 	//
-	void animation_1_4();
-	void animation_5_4();
-	void animation_6_4();
-	void animation_7_4();
-	void animation_8_4();
+	void animation_castle();	// Chapter 4 start - Drascula's castle exterior, lightning strikes
+	void animation_1_4();		// Conversation screen - John talks with Igor
+	void animation_5_4();		// John enters Igor's room dressed as Drascula
+	void animation_6_4();		// Igor says that he's going for supper
+	void animation_7_4();		// John removes Drascula's disguise
+	void animation_8_4();		// Secret passage behind bookcase is revealed
 	//
-	void animation_1_5();
-	void animation_5_5();
-	void animation_11_5();
-	void animation_12_5();
-	void animation_13_5();
-	void animation_14_5();
+	void animation_1_5();		// John finds BJ
+	void animation_5_5();		// ???
+	void animation_12_5();		// Frankenstein comes to life
+	void animation_14_5();		// John finds out that an object is empty
 	//
-	void animation_1_6();
-	void animation_5_6();
-	void animation_6_6();
-	void animation_9_6();
-	void animation_19_6();
+	void animation_1_6();		// ???
+	void animation_5_6();		// John is tied to the table. Drascula and Igor lower the pendulum
+	void animation_6_6();		// John uses the pendulum to break free
+	void animation_9_6();		// Game ending - John uses the cross on Drascula and reads BJ's letter
+	void animation_19_6();		// Someone pops up from behind a door when trying to open it
 
 	void update_1_pre();
 	void update_2();