From a2e958540083d5b04c9082e3e6735c66effb2c08 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Sat, 23 Nov 2013 18:28:35 -0500
Subject: LASTEXPRESS: Rename Anna logic functions

Fix wrong call in
---
 engines/lastexpress/entities/anna.h | 113 ++++++++++++++++++------------------
 1 file changed, 56 insertions(+), 57 deletions(-)

(limited to 'engines/lastexpress/entities/anna.h')

diff --git a/engines/lastexpress/entities/anna.h b/engines/lastexpress/entities/anna.h
index 205ff9d42c..de79ccb826 100644
--- a/engines/lastexpress/entities/anna.h
+++ b/engines/lastexpress/entities/anna.h
@@ -113,7 +113,7 @@ public:
 	 */
 	DECLARE_FUNCTION_1(updateFromTime, uint32 time)
 
-	DECLARE_FUNCTION(function12)
+	DECLARE_FUNCTION(practiceMusic)
 
 	/**
 	 * Draws the entity along with another one
@@ -131,43 +131,43 @@ public:
 	 */
 	DECLARE_FUNCTION_1(updateFromTicks, uint32 ticks)
 
-	DECLARE_FUNCTION_2(function15, TimeValue timeValue, const char *sequence)
+	DECLARE_FUNCTION_2(compartmentLogic, TimeValue timeValue, const char *sequence)
 
 	/**
 	 * Setup Chapter 1
 	 */
 	DECLARE_FUNCTION(chapter1)
 
-	DECLARE_FUNCTION_2(function17, uint32, uint32)
+	DECLARE_FUNCTION_2(doWalkP1, uint32, uint32)
 
-	DECLARE_FUNCTION_1(function18, TimeValue timeValue)
+	DECLARE_FUNCTION_1(diningLogic, TimeValue timeValue)
 
 	/**
 	 * Handle Chapter 1 events
 	 */
-	DECLARE_FUNCTION(chapter1Handler)
-	DECLARE_FUNCTION(function20)
-	DECLARE_FUNCTION(function21)
+	DECLARE_FUNCTION(fleeTyler)
+	DECLARE_FUNCTION(waitDinner)
+	DECLARE_FUNCTION(goDinner)
 	DECLARE_FUNCTION(function22)
-	DECLARE_FUNCTION(function23)
-	DECLARE_FUNCTION(function24)
-	DECLARE_FUNCTION(function25)
-	DECLARE_FUNCTION(function26)
-	DECLARE_FUNCTION(function27)
-	DECLARE_FUNCTION(function28)
-	DECLARE_FUNCTION(function29)
+	DECLARE_FUNCTION(waitingDinner)
+	DECLARE_FUNCTION(waitingDinner2)
+	DECLARE_FUNCTION(eatingDinner)
+	DECLARE_FUNCTION(leaveDinner)
+	DECLARE_FUNCTION(freshenUp)
+	DECLARE_FUNCTION(goSalon)
+	DECLARE_FUNCTION(waitAugust)
 	DECLARE_FUNCTION(function30)
-	DECLARE_FUNCTION(function31)
-	DECLARE_FUNCTION(function32)
-	DECLARE_FUNCTION(function33)
-	DECLARE_FUNCTION(function34)
-	DECLARE_FUNCTION(function35)
-	DECLARE_FUNCTION(function36)
+	DECLARE_FUNCTION(leaveAugust)
+	DECLARE_FUNCTION(returnCompartment)
+	DECLARE_FUNCTION(readyForBed)
+	DECLARE_FUNCTION(asleep)
+	DECLARE_FUNCTION(wakeNight)
+	DECLARE_FUNCTION(goVassili)
 	DECLARE_FUNCTION(function37)
-	DECLARE_FUNCTION(function38)
-	DECLARE_FUNCTION_2(function39, CarIndex car, EntityPosition entityPosition)
-	DECLARE_FUNCTION(function40)
-	DECLARE_FUNCTION(function41)
+	DECLARE_FUNCTION(speakTatiana)
+	DECLARE_FUNCTION_2(doWalk1019, CarIndex car, EntityPosition entityPosition)
+	DECLARE_FUNCTION(leaveTatiana)
+	DECLARE_FUNCTION(goBackToSleep)
 
 	/**
 	 * Setup Chapter 2
@@ -177,37 +177,37 @@ public:
 	/**
 	 * Handle Chapter 2 events
 	 */
-	DECLARE_FUNCTION(chapter2Handler)
+	DECLARE_FUNCTION(inPart2)
 
 	/**
 	 * Setup Chapter 3
 	 */
 	DECLARE_FUNCTION(chapter3)
-	DECLARE_FUNCTION_1(function45, bool useAction1)
 
 	/**
 	 * Handle Chapter 3 events
 	 */
-	DECLARE_FUNCTION(chapter3Handler)
-	DECLARE_FUNCTION(function47)
-	DECLARE_FUNCTION(function48)
+	DECLARE_FUNCTION_1(exitCompartment, bool useAction1)
+	DECLARE_FUNCTION(practicing)
+	DECLARE_FUNCTION(goLunch)
+	DECLARE_FUNCTION(lunch)
 	DECLARE_FUNCTION(leaveTableWithAugust)
-	DECLARE_FUNCTION(function50)
-	DECLARE_FUNCTION(function51)
-	DECLARE_FUNCTION(function52)
-	DECLARE_FUNCTION(function53)
-	DECLARE_FUNCTION(function54)
-	DECLARE_FUNCTION(function55)
-	DECLARE_FUNCTION(function56)
-	DECLARE_FUNCTION(function57)
-	DECLARE_FUNCTION(function58)
-	DECLARE_FUNCTION(function59)
-	DECLARE_FUNCTION(function60)
-	DECLARE_FUNCTION(function61)
+	DECLARE_FUNCTION(leaveLunch)
+	DECLARE_FUNCTION(afterLunch)
+	DECLARE_FUNCTION(returnCompartment3)
+	DECLARE_FUNCTION(dressing)
+	DECLARE_FUNCTION(giveMaxToConductor2)
+	DECLARE_FUNCTION(goConcert)
+	DECLARE_FUNCTION(concert)
+	DECLARE_FUNCTION(leaveConcert)
+	DECLARE_FUNCTION(leaveConcertCathInCompartment)
+	DECLARE_FUNCTION(afterConcert)
+	DECLARE_FUNCTION(giveMaxBack)
+	DECLARE_FUNCTION(goBaggageCompartment)
 	DECLARE_FUNCTION(function62)
-	DECLARE_FUNCTION(function63)
-	DECLARE_FUNCTION(baggage)
-	DECLARE_FUNCTION(function65)
+	DECLARE_FUNCTION(deadBaggageCompartment)
+	DECLARE_FUNCTION(baggageFight)
+	DECLARE_FUNCTION(prepareVienna)
 
 	/**
 	 * Setup Chapter 4
@@ -217,14 +217,13 @@ public:
 	/**
 	 * Handle Chapter 4 events
 	 */
-	DECLARE_FUNCTION(chapter4Handler)
-
-	DECLARE_FUNCTION(function68)
-	DECLARE_FUNCTION(function69)
-	DECLARE_FUNCTION(function70)
-	DECLARE_FUNCTION(function71)
-	DECLARE_FUNCTION_2(function72, CarIndex car, EntityPosition entityPosition)
-	DECLARE_FUNCTION(function73)
+	DECLARE_FUNCTION(reading)
+	DECLARE_FUNCTION(sulking)
+	DECLARE_FUNCTION(goSalon4)
+	DECLARE_FUNCTION(returnCompartment4)
+	DECLARE_FUNCTION(enterCompartmentCathFollowsAnna)
+	DECLARE_FUNCTION_2(doWalkCathFollowsAnna, CarIndex car, EntityPosition entityPosition)
+	DECLARE_FUNCTION(letDownHair)
 
 	/**
 	 * Setup Chapter 5
@@ -234,13 +233,13 @@ public:
 	/**
 	 * Handle Chapter 5 events
 	 */
-	DECLARE_FUNCTION(chapter5Handler)
+	DECLARE_FUNCTION(tiedUp)
 	DECLARE_FUNCTION(function76)
-	DECLARE_FUNCTION(function77)
-	DECLARE_FUNCTION(function78)
-	DECLARE_FUNCTION(function79)
-	DECLARE_FUNCTION(function80)
+	DECLARE_FUNCTION(readyToScore)
+	DECLARE_FUNCTION(kidnapped)
+	DECLARE_FUNCTION(waiting)
 	DECLARE_FUNCTION(finalSequence)
+	DECLARE_FUNCTION(openFirebird)
 };
 
 } // End of namespace LastExpress
-- 
cgit v1.2.3