GNAP: Move more enums to header files

6 files changed, 286 insertions, 282 deletions

diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp
index d61859a07c..a9b86b7344 100644
--- a/engines/gnap/scenes/group3.cpp
+++ b/engines/gnap/scenes/group3.cpp
@@ -27,23 +27,6 @@
 
 namespace Gnap {
 
-enum {
-	kHS30Platypus		= 0,
-	kHS30PillMachine	= 1,
-	kHS30Device		= 2,
-	kHS30ExitCircus	= 3,
-	kHS30WalkArea1	= 4
-};
-
-enum {
-	kAS30LeaveScene				= 0,
-	kAS30UsePillMachine			= 1,
-	kAS30UsePillMachine2			= 2,
-	kAS30LookPillMachine			= 3,
-	kAS30UsePillMachine3			= 4,
-	kAS30UsePillMachine4			= 5
-};
-
 Scene30::Scene30(GnapEngine *vm) : Scene(vm) {
 	_kidSequenceId = -1;
 }
@@ -284,25 +267,6 @@ void Scene30::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS31Platypus			= 0,
-	kHS31MeasuringClown	= 1,
-	kHS31BeerBarrel		= 2,
-	kHS31Device			= 3,
-	kHS31ExitCircus		= 4,
-	kHS31ExitOutsideClown	= 5,
-	kHS31WalkArea1		= 6
-};
-
-enum {
-	kAS31UseBeerBarrel				= 1,
-	kAS31FillEmptyBucketWithBeer		= 2,
-	kAS31FillEmptyBucketWithBeerDone	= 3,
-	kAS31PlatMeasuringClown			= 4,
-	kAS31UseMeasuringClown			= 5,
-	kAS31LeaveScene					= 6
-};
-
 Scene31::Scene31(GnapEngine *vm) : Scene(vm) {
 	_beerGuyDistracted = false;
 	_currClerkSequenceId = -1;
@@ -664,27 +628,7 @@ void Scene31::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS32Platypus		= 0,
-	kHS32ExitTruck	= 1,
-	kHS32Device		= 2,
-	kHS32WalkArea1	= 3,
-	kHS32WalkArea2	= 4,
-	kHS32WalkArea3	= 5,
-	kHS32WalkArea4	= 6,
-	kHS32WalkArea5	= 7,
-	kHS32WalkArea6	= 8,
-	kHS32WalkArea7	= 9,
-	kHS32WalkArea8	= 10
-};
-
-enum {
-	kAS32LeaveScene					= 0
-};
-
-Scene32::Scene32(GnapEngine *vm) : Scene(vm) {
-
-}
+Scene32::Scene32(GnapEngine *vm) : Scene(vm) {}
 
 int Scene32::init() {
 	_vm->_gameSys->setAnimation(0, 0, 0);
@@ -835,25 +779,6 @@ void Scene32::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS33Platypus		= 0,
-	kHS33Chicken		= 1,
-	kHS33Device		= 2,
-	kHS33ExitHouse	= 3,
-	kHS33ExitBarn		= 4,
-	kHS33ExitCreek	= 5,
-	kHS33ExitPigpen	= 6,
-	kHS33WalkArea1	= 7,
-	kHS33WalkArea2	= 8
-};
-
-enum {
-	kAS33LeaveScene			= 0,
-	kAS33TalkChicken			= 1,
-	kAS33UseChicken			= 2,
-	kAS33UseChickenDone		= 3
-};
-
 Scene33::Scene33(GnapEngine *vm) : Scene(vm) {
 	_currChickenSequenceId = -1;
 	_nextChickenSequenceId = -1;
@@ -1135,32 +1060,6 @@ void Scene33::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS38Platypus			= 0,
-	kHS38ExitHouse		= 1,
-	kHS38ExitCave			= 2,
-	kHS38TrapDoorLid1		= 3,
-	kHS38TrapDoorLid2		= 4,
-	kHS38HuntingTrophy	= 5,
-	kHS38WalkArea1		= 6,
-	kHS38Device			= 7,
-	kHS38WalkArea2		= 8,
-	kHS38WalkArea3		= 9,
-	kHS38WalkArea4		= 10,
-	kHS38WalkArea5		= 11,
-	kHS38WalkArea6		= 12
-};
-
-enum {
-	kAS38LeaveScene				= 0,
-	kAS38ExitCave					= 1,
-	kAS38UseHuntingTrophy			= 2,
-	kAS38HoldingHuntingTrophy		= 3,
-	kAS38ReleaseHuntingTrophy		= 4,
-	kAS38UsePlatypusWithTrapDoor	= 5,
-	kAS38PlatypusHoldingTrapDoor	= 6
-};
-
 Scene38::Scene38(GnapEngine *vm) : Scene(vm) {
 }
 
@@ -1467,20 +1366,6 @@ void Scene38::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS39Platypus			= 0,
-	kHS39ExitInsideHouse	= 1,
-	kHS39ExitUfoParty		= 2,
-	kHS39Sign				= 3,
-	kHS39Device			= 4,
-	kHS39WalkArea1		= 5,
-	kHS39WalkArea2		= 6
-};
-
-enum {
-	kAS39LeaveScene				= 0
-};
-
 Scene39::Scene39(GnapEngine *vm) : Scene(vm) {
 	_currGuySequenceId = -1;
 	_nextGuySequenceId = -1;
diff --git a/engines/gnap/scenes/group3.h b/engines/gnap/scenes/group3.h
index fa57f1781e..e80debb149 100644
--- a/engines/gnap/scenes/group3.h
+++ b/engines/gnap/scenes/group3.h
@@ -27,6 +27,121 @@
 
 namespace Gnap {
 
+enum {
+	kHS30Platypus		= 0,
+	kHS30PillMachine	= 1,
+	kHS30Device			= 2,
+	kHS30ExitCircus		= 3,
+	kHS30WalkArea1		= 4
+};
+
+enum {
+	kHS31Platypus			= 0,
+	kHS31MeasuringClown		= 1,
+	kHS31BeerBarrel			= 2,
+	kHS31Device				= 3,
+	kHS31ExitCircus			= 4,
+	kHS31ExitOutsideClown	= 5,
+	kHS31WalkArea1			= 6
+};
+
+enum {
+	kHS32Platypus	= 0,
+	kHS32ExitTruck	= 1,
+	kHS32Device		= 2,
+	kHS32WalkArea1	= 3,
+	kHS32WalkArea2	= 4,
+	kHS32WalkArea3	= 5,
+	kHS32WalkArea4	= 6,
+	kHS32WalkArea5	= 7,
+	kHS32WalkArea6	= 8,
+	kHS32WalkArea7	= 9,
+	kHS32WalkArea8	= 10
+};
+
+enum {
+	kHS33Platypus	= 0,
+	kHS33Chicken	= 1,
+	kHS33Device		= 2,
+	kHS33ExitHouse	= 3,
+	kHS33ExitBarn	= 4,
+	kHS33ExitCreek	= 5,
+	kHS33ExitPigpen	= 6,
+	kHS33WalkArea1	= 7,
+	kHS33WalkArea2	= 8
+};
+
+enum {
+	kHS38Platypus		= 0,
+	kHS38ExitHouse		= 1,
+	kHS38ExitCave		= 2,
+	kHS38TrapDoorLid1	= 3,
+	kHS38TrapDoorLid2	= 4,
+	kHS38HuntingTrophy	= 5,
+	kHS38WalkArea1		= 6,
+	kHS38Device			= 7,
+	kHS38WalkArea2		= 8,
+	kHS38WalkArea3		= 9,
+	kHS38WalkArea4		= 10,
+	kHS38WalkArea5		= 11,
+	kHS38WalkArea6		= 12
+};
+
+enum {
+	kHS39Platypus			= 0,
+	kHS39ExitInsideHouse	= 1,
+	kHS39ExitUfoParty		= 2,
+	kHS39Sign				= 3,
+	kHS39Device				= 4,
+	kHS39WalkArea1			= 5,
+	kHS39WalkArea2			= 6
+};
+
+enum {
+	kAS30LeaveScene			= 0,
+	kAS30UsePillMachine		= 1,
+	kAS30UsePillMachine2	= 2,
+	kAS30LookPillMachine	= 3,
+	kAS30UsePillMachine3	= 4,
+	kAS30UsePillMachine4	= 5
+};
+
+enum {
+	kAS31UseBeerBarrel					= 1,
+	kAS31FillEmptyBucketWithBeer		= 2,
+	kAS31FillEmptyBucketWithBeerDone	= 3,
+	kAS31PlatMeasuringClown				= 4,
+	kAS31UseMeasuringClown				= 5,
+	kAS31LeaveScene						= 6
+};
+
+enum {
+	kAS32LeaveScene	= 0
+};
+
+enum {
+	kAS33LeaveScene		= 0,
+	kAS33TalkChicken	= 1,
+	kAS33UseChicken		= 2,
+	kAS33UseChickenDone	= 3
+};
+
+enum {
+	kAS38LeaveScene					= 0,
+	kAS38ExitCave					= 1,
+	kAS38UseHuntingTrophy			= 2,
+	kAS38HoldingHuntingTrophy		= 3,
+	kAS38ReleaseHuntingTrophy		= 4,
+	kAS38UsePlatypusWithTrapDoor	= 5,
+	kAS38PlatypusHoldingTrapDoor	= 6
+};
+
+enum {
+	kAS39LeaveScene	= 0
+};
+
+/*****************************************************************************/
+
 class GnapEngine;
 class CutScene;
 
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp
index 90cb91f393..1550703e90 100644
--- a/engines/gnap/scenes/group4.cpp
+++ b/engines/gnap/scenes/group4.cpp
@@ -27,18 +27,6 @@
 
 namespace Gnap {
 
-enum {
-	kHS40Platypus			= 0,
-	kHS40ExitCave			= 1,
-	kHS40ExitToyStand		= 2,
-	kHS40ExitBBQ			= 3,
-	kHS40ExitUfo			= 4,
-	kHS40ExitKissinBooth	= 5,
-	kHS40ExitDancefloor	= 6,
-	kHS40ExitShoe			= 7,
-	kHS40Device			= 8
-};
-
 Scene40::Scene40(GnapEngine *vm) : Scene(vm) {
 }
 
@@ -192,38 +180,6 @@ void Scene40::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS41Platypus		= 0,
-	kHS41ExitCave		= 1,
-	kHS41Exit			= 2,
-	kHS41ExitBBQ		= 3,
-	kHS41ToyVendor	= 4,
-	kHS41Kid			= 5,
-	kHS41ToyUfo		= 6,
-	kHS41Device		= 7,
-	kHS41WalkArea1	= 8
-};
-
-enum {
-	kHS41UfoExitLeft	= 1,
-	kHS41UfoExitRight	= 2,
-	kHS41UfoDevice	= 3,
-	kHS41UfoWalkArea1	= 4
-};
-
-enum {
-	kAS41LeaveScene				= 0,
-	kAS41UseQuarterWithToyVendor	= 1,
-	kAS41TalkToyVendor			= 2,
-	kAS41UseGumWithToyUfo			= 3,
-	kAS41UseChickenBucketWithKid	= 4,
-	kAS41GrabKid					= 5,
-	kAS41GiveBackToyUfo			= 6,
-	kAS41ToyUfoLeaveScene			= 7,
-	kAS41ToyUfoRefresh			= 8,
-	kAS41UfoGumAttached			= 9
-};
-
 Scene41::Scene41(GnapEngine *vm) : Scene(vm) {
 	_currKidSequenceId = -1;
 	_nextKidSequenceId = -1;
@@ -753,36 +709,6 @@ void Scene41::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS42Platypus		= 0,
-	kHS42ExitUfoParty	= 1,
-	kHS42ExitToyStand	= 2,
-	kHS42ExitUfo		= 3,
-	kHS42BBQVendor	= 4,
-	kHS42ChickenLeg	= 5,
-	kHS42Device		= 6,
-	kHS42WalkArea1	= 7,
-	kHS42WalkArea2	= 8
-};
-
-enum {
-	kHS42UfoExitLeft	= 1,
-	kHS42UfoExitRight	= 2,
-	kHS42UfoHotSauce	= 3,
-	kHS42UfoDevice	= 4
-};
-
-enum {
-	kAS42LeaveScene					= 0,
-	kAS42TalkBBQVendor				= 1,
-	kAS42UseQuarterWithBBQVendor		= 2,
-	kAS42UseQuarterWithBBQVendorDone	= 3,
-	kAS42GrabChickenLeg				= 4,
-	kAS42ToyUfoLeaveScene				= 5,
-	kAS42ToyUfoRefresh				= 6,
-	kAS42ToyUfoPickUpHotSauce			= 7
-};
-
 Scene42::Scene42(GnapEngine *vm) : Scene(vm) {
 	_currBBQVendorSequenceId = -1;
 	_nextBBQVendorSequenceId = -1;
@@ -1228,27 +1154,6 @@ void Scene42::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS43Platypus			= 0,
-	kHS43Device			= 1,
-	kHS43ExitUfoParty		= 2,
-	kHS43ExitBBQ			= 3,
-	kHS43ExitKissinBooth	= 4,
-	kHS43TwoHeadedGuy		= 5,
-	kHS43Key				= 6,
-	kHS43Ufo				= 7,
-	kHS43WalkArea1		= 8,
-	kHS43WalkArea2		= 9
-};
-
-enum {
-	kHS43UfoExitLeft	= 1,
-	kHS43UfoExitRight	= 2,
-	kHS43UfoKey		= 3,
-	kHS43UfoBucket	= 4,
-	kHS43UfoDevice	= 5
-};
-
 Scene43::Scene43(GnapEngine *vm) : Scene(vm) {
 	_currTwoHeadedGuySequenceId = -1;
 	_nextTwoHeadedGuySequenceId = -1;
@@ -1684,25 +1589,6 @@ void Scene43::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS44Platypus		= 0,
-	kHS44ExitUfoParty	= 1,
-	kHS44ExitUfo		= 2,
-	kHS44ExitShow		= 3,
-	kHS44KissingLady	= 4,
-	kHS44Spring		= 5,
-	kHS44SpringGuy	= 6,
-	kHS44Device		= 7,
-	kHS44WalkArea1	= 8,
-	kHS44WalkArea2	= 9
-};
-
-enum {
-	kHS44UfoExitLeft	= 1,
-	kHS44UfoExitRight	= 2,
-	kHS44UfoDevice	= 3
-};
-
 Scene44::Scene44(GnapEngine *vm) : Scene(vm) {
 	_nextSpringGuySequenceId = -1;
 	_nextKissingLadySequenceId = -1;
@@ -2183,23 +2069,6 @@ void Scene44::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS45Platypus			= 0,
-	kHS45ExitUfoParty		= 1,
-	kHS45ExitShoe			= 2,
-	kHS45ExitRight		= 3,
-	kHS45ExitDiscoBall	= 4,
-	kHS45DiscoBall		= 5,
-	kHS45Device			= 6,
-	kHS45WalkArea1		= 7
-};
-
-enum {
-	kHS45UfoExitLeft	= 1,
-	kHS45UfoExitRight	= 2,
-	kHS45UfoDevice	= 3
-};
-
 Scene45::Scene45(GnapEngine *vm) : Scene(vm) {
 	_currDancerSequenceId = -1;
 }
@@ -2580,23 +2449,6 @@ void Scene45::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS46Platypus			= 0,
-	kHS46ExitUfoParty		= 1,
-	kHS46ExitKissinBooth	= 2,
-	kHS46ExitDisco		= 3,
-	kHS46SackGuy			= 4,
-	kHS46ItchyGuy			= 5,
-	kHS46Device			= 6,
-	kHS46WalkArea1		= 7
-};
-
-enum {
-	kHS46UfoExitLeft	= 1,
-	kHS46UfoExitRight	= 2,
-	kHS46UfoDevice	= 3
-};
-
 Scene46::Scene46(GnapEngine *vm) : Scene(vm) {
 	_currSackGuySequenceId = -1;
 	_nextItchyGuySequenceId = -1;
diff --git a/engines/gnap/scenes/group4.h b/engines/gnap/scenes/group4.h
index 28f03eec6d..542834de7d 100644
--- a/engines/gnap/scenes/group4.h
+++ b/engines/gnap/scenes/group4.h
@@ -27,6 +27,156 @@
 
 namespace Gnap {
 
+enum {
+	kHS40Platypus			= 0,
+	kHS40ExitCave			= 1,
+	kHS40ExitToyStand		= 2,
+	kHS40ExitBBQ			= 3,
+	kHS40ExitUfo			= 4,
+	kHS40ExitKissinBooth	= 5,
+	kHS40ExitDancefloor		= 6,
+	kHS40ExitShoe			= 7,
+	kHS40Device				= 8
+};
+
+enum {
+	kHS41Platypus	= 0,
+	kHS41ExitCave	= 1,
+	kHS41Exit		= 2,
+	kHS41ExitBBQ	= 3,
+	kHS41ToyVendor	= 4,
+	kHS41Kid		= 5,
+	kHS41ToyUfo		= 6,
+	kHS41Device		= 7,
+	kHS41WalkArea1	= 8
+};
+
+enum {
+	kHS41UfoExitLeft	= 1,
+	kHS41UfoExitRight	= 2,
+	kHS41UfoDevice		= 3,
+	kHS41UfoWalkArea1	= 4
+};
+
+enum {
+	kHS42Platypus		= 0,
+	kHS42ExitUfoParty	= 1,
+	kHS42ExitToyStand	= 2,
+	kHS42ExitUfo		= 3,
+	kHS42BBQVendor		= 4,
+	kHS42ChickenLeg		= 5,
+	kHS42Device			= 6,
+	kHS42WalkArea1		= 7,
+	kHS42WalkArea2		= 8
+};
+
+enum {
+	kHS42UfoExitLeft	= 1,
+	kHS42UfoExitRight	= 2,
+	kHS42UfoHotSauce	= 3,
+	kHS42UfoDevice		= 4
+};
+
+enum {
+	kHS43Platypus			= 0,
+	kHS43Device				= 1,
+	kHS43ExitUfoParty		= 2,
+	kHS43ExitBBQ			= 3,
+	kHS43ExitKissinBooth	= 4,
+	kHS43TwoHeadedGuy		= 5,
+	kHS43Key				= 6,
+	kHS43Ufo				= 7,
+	kHS43WalkArea1			= 8,
+	kHS43WalkArea2			= 9
+};
+
+enum {
+	kHS43UfoExitLeft	= 1,
+	kHS43UfoExitRight	= 2,
+	kHS43UfoKey			= 3,
+	kHS43UfoBucket		= 4,
+	kHS43UfoDevice		= 5
+};
+
+enum {
+	kHS44Platypus		= 0,
+	kHS44ExitUfoParty	= 1,
+	kHS44ExitUfo		= 2,
+	kHS44ExitShow		= 3,
+	kHS44KissingLady	= 4,
+	kHS44Spring			= 5,
+	kHS44SpringGuy		= 6,
+	kHS44Device			= 7,
+	kHS44WalkArea1		= 8,
+	kHS44WalkArea2		= 9
+};
+
+enum {
+	kHS44UfoExitLeft	= 1,
+	kHS44UfoExitRight	= 2,
+	kHS44UfoDevice		= 3
+};
+
+enum {
+	kHS45Platypus		= 0,
+	kHS45ExitUfoParty	= 1,
+	kHS45ExitShoe		= 2,
+	kHS45ExitRight		= 3,
+	kHS45ExitDiscoBall	= 4,
+	kHS45DiscoBall		= 5,
+	kHS45Device			= 6,
+	kHS45WalkArea1		= 7
+};
+
+enum {
+	kHS45UfoExitLeft	= 1,
+	kHS45UfoExitRight	= 2,
+	kHS45UfoDevice		= 3
+};
+
+enum {
+	kHS46Platypus			= 0,
+	kHS46ExitUfoParty		= 1,
+	kHS46ExitKissinBooth	= 2,
+	kHS46ExitDisco			= 3,
+	kHS46SackGuy			= 4,
+	kHS46ItchyGuy			= 5,
+	kHS46Device				= 6,
+	kHS46WalkArea1			= 7
+};
+
+enum {
+	kHS46UfoExitLeft	= 1,
+	kHS46UfoExitRight	= 2,
+	kHS46UfoDevice		= 3
+};
+
+enum {
+	kAS41LeaveScene					= 0,
+	kAS41UseQuarterWithToyVendor	= 1,
+	kAS41TalkToyVendor				= 2,
+	kAS41UseGumWithToyUfo			= 3,
+	kAS41UseChickenBucketWithKid	= 4,
+	kAS41GrabKid					= 5,
+	kAS41GiveBackToyUfo				= 6,
+	kAS41ToyUfoLeaveScene			= 7,
+	kAS41ToyUfoRefresh				= 8,
+	kAS41UfoGumAttached				= 9
+};
+
+enum {
+	kAS42LeaveScene						= 0,
+	kAS42TalkBBQVendor					= 1,
+	kAS42UseQuarterWithBBQVendor		= 2,
+	kAS42UseQuarterWithBBQVendorDone	= 3,
+	kAS42GrabChickenLeg					= 4,
+	kAS42ToyUfoLeaveScene				= 5,
+	kAS42ToyUfoRefresh					= 6,
+	kAS42ToyUfoPickUpHotSauce			= 7
+};
+
+/*****************************************************************************/
+
 class GnapEngine;
 class CutScene;
 
diff --git a/engines/gnap/scenes/group5.cpp b/engines/gnap/scenes/group5.cpp
index 68b957f753..3bcab4cfc5 100644
--- a/engines/gnap/scenes/group5.cpp
+++ b/engines/gnap/scenes/group5.cpp
@@ -27,24 +27,6 @@
 
 namespace Gnap {
 
-enum {
-	kHS53Platypus		 = 0,
-	kHS53Device		 = 1,
-	kHS53PhoneKey1	 = 2,
-	kHS53PhoneKey2	 = 3,
-	kHS53PhoneKey3	 = 4,
-	kHS53PhoneKey4	 = 5,
-	kHS53PhoneKey5	 = 6,
-	kHS53PhoneKey6	 = 7,
-	kHS53PhoneKey7	 = 8,
-	kHS53PhoneKey8	 = 9,
-	kHS53PhoneKey9	 = 10,
-	kHS53PhoneKey0	 = 11,
-	kHS53PhoneKeySharp = 12,
-	kHS53PhoneKeyStar	 = 13,
-	kHS53PhoneExit	 = 14
-};
-
 Scene53::Scene53(GnapEngine *vm) : Scene(vm) {
 	_isGnapPhoning = false;
 	_currHandSequenceId = -1;
diff --git a/engines/gnap/scenes/group5.h b/engines/gnap/scenes/group5.h
index d9ffc19b74..c7d209b6b3 100644
--- a/engines/gnap/scenes/group5.h
+++ b/engines/gnap/scenes/group5.h
@@ -28,6 +28,26 @@
 
 namespace Gnap {
 
+enum {
+	kHS53Platypus		= 0,
+	kHS53Device			= 1,
+	kHS53PhoneKey1		= 2,
+	kHS53PhoneKey2		= 3,
+	kHS53PhoneKey3		= 4,
+	kHS53PhoneKey4		= 5,
+	kHS53PhoneKey5		= 6,
+	kHS53PhoneKey6		= 7,
+	kHS53PhoneKey7		= 8,
+	kHS53PhoneKey8		= 9,
+	kHS53PhoneKey9		= 10,
+	kHS53PhoneKey0		= 11,
+	kHS53PhoneKeySharp	= 12,
+	kHS53PhoneKeyStar	= 13,
+	kHS53PhoneExit		= 14
+};
+
+/*****************************************************************************/
+
 class GnapEngine;
 
 class Scene53: public Scene {