PEGASUS: Remove t prefix from typedefs

Some other minor cleanup too

10 files changed, 398 insertions, 399 deletions

diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
index 878b0c3d86..6f512fa8aa 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
@@ -53,8 +53,8 @@ const TimeValue kSinclairInterruptionTime2 = 6835;
 const TimeValue kSinclairInterruptionTime3 = 9835;
 const TimeValue kSinclairInterruptionTime4 = 12555;
 
-const tInputBits kPullbackInterruptFilter = kFilterAllInput;
-const tInputBits kRecalibrationInterruptFilter = kFilterAllInput;
+const InputBits kPullbackInterruptFilter = kFilterAllInput;
+const InputBits kRecalibrationInterruptFilter = kFilterAllInput;
 
 const TimeValue kCaldoriaReplicatorIntroIn = 4933;
 const TimeValue kCaldoriaReplicatorIntroOut = 6557;
@@ -146,9 +146,9 @@ const TimeValue k5To2Time = 41240;
 
 const TimeValue k5To3Time = 41280;
 
-//	MMFuseFunction functions...
+//	FuseFunction functions...
 
-const tNotificationFlags kSinclairLoopDoneFlag = kLastNeighborhoodNotificationFlag << 1;
+const NotificationFlags kSinclairLoopDoneFlag = kLastNeighborhoodNotificationFlag << 1;
 
 void doorBombTimerExpiredFunction(FunctionPtr *, void *caldoria) {
 	((Caldoria *)caldoria)->doorBombTimerExpired();
@@ -341,7 +341,7 @@ uint16 Caldoria::getDateResID() const {
 	return kDate2318ID;
 }
 
-TimeValue Caldoria::getViewTime(const tRoomID room, const tDirectionConstant direction) {
+TimeValue Caldoria::getViewTime(const RoomID room, const DirectionConstant direction) {
 	ExtraTable::Entry extra;	
 	uint32 extraID = 0xffffffff;
 
@@ -444,7 +444,7 @@ void Caldoria::startSpotOnceOnly(TimeValue startTime, TimeValue stopTime) {
 	}
 }
 
-void Caldoria::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &entry) {	
+void Caldoria::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &entry) {	
 	Neighborhood::findSpotEntry(room, direction, flags, entry);
 
 	switch (room) {
@@ -506,7 +506,7 @@ void Caldoria::startDoorOpenMovie(const TimeValue startTime, const TimeValue sto
 		Neighborhood::startDoorOpenMovie(startTime, stopTime);
 }
 
-void Caldoria::startTurnPush(const tTurnDirection turnDirection, const TimeValue newViewTime, const tDirectionConstant destDirection) {
+void Caldoria::startTurnPush(const TurnDirection turnDirection, const TimeValue newViewTime, const DirectionConstant destDirection) {
 	switch (GameState.getCurrentRoom()) {
 	case kCaldoria05:
 	case kCaldoria07:
@@ -540,7 +540,7 @@ void Caldoria::bumpIntoWall() {
 	Neighborhood::bumpIntoWall();
 }
 
-void Caldoria::closeDoorOffScreen(const tRoomID room, const tDirectionConstant direction) {
+void Caldoria::closeDoorOffScreen(const RoomID room, const DirectionConstant direction) {
 	switch (room) {
 	case kCaldoria08:
 		if (direction == kNorth)
@@ -570,7 +570,7 @@ void Caldoria::closeDoorOffScreen(const tRoomID room, const tDirectionConstant d
 	}
 }
 
-int16 Caldoria::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) {
+int16 Caldoria::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) {
 	int16 result = Neighborhood::getStaticCompassAngle(room, dir);
 
 	switch (room) {
@@ -668,7 +668,7 @@ void Caldoria::getExtraCompassMove(const ExtraTable::Entry &entry, FaderMoveSpec
 }
 
 void Caldoria::loadAmbientLoops() {
-	tRoomID room = GameState.getCurrentRoom();
+	RoomID room = GameState.getCurrentRoom();
 
 	if (room == kCaldoria00 && GameState.getCaldoriaWokenUp())
 		loadLoopSound1("Sounds/Caldoria/Apartment Music.AIFF", 0x100 / 4);
@@ -684,7 +684,7 @@ void Caldoria::loadAmbientLoops() {
 		loadLoopSound1("Sounds/Caldoria/A50NLB00.22K.AIFF", 0x100 / 4);
 }
 
-void Caldoria::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) {
+void Caldoria::checkContinuePoint(const RoomID room, const DirectionConstant direction) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kCaldoria06, kSouth):
 	case MakeRoomView(kCaldoria13, kNorth):
@@ -706,7 +706,7 @@ void Caldoria::spotCompleted() {
 		startExtraSequence(kBinocularsZoomInOnShip, kExtraCompletedFlag, kFilterNoInput);
 }
 
-void Caldoria::arriveAt(const tRoomID room, const tDirectionConstant direction) {
+void Caldoria::arriveAt(const RoomID room, const DirectionConstant direction) {
 	switch (room) {
 	case kCaldoria56:
 		if (!GameState.getCaldoriaGunAimed())
@@ -981,7 +981,7 @@ void Caldoria::downButton(const Input &input) {
 	}
 }
 
-void Caldoria::turnTo(const tDirectionConstant direction) {
+void Caldoria::turnTo(const DirectionConstant direction) {
 	Neighborhood::turnTo(direction);
 
 	switch (GameState.getCurrentRoom()) {
@@ -1106,7 +1106,7 @@ void Caldoria::zoomToSinclair() {
 	startExtraSequence(kCa53EastZoomToSinclair, kExtraCompletedFlag, kFilterAllInput);
 }
 
-void Caldoria::receiveNotification(Notification *notification, const tNotificationFlags flags) {	
+void Caldoria::receiveNotification(Notification *notification, const NotificationFlags flags) {	
 	Neighborhood::receiveNotification(notification, flags);
 
 	if ((flags & kExtraCompletedFlag) != 0) {
@@ -1255,8 +1255,8 @@ void Caldoria::receiveNotification(Notification *notification, const tNotificati
 	g_AIArea->checkMiddleArea();
 }
 
-tInputBits Caldoria::getInputFilter() {
-	tInputBits result = Neighborhood::getInputFilter();
+InputBits Caldoria::getInputFilter() {
+	InputBits result = Neighborhood::getInputFilter();
 
 	switch (GameState.getCurrentRoom()) {
 	case kCaldoria00:
@@ -1471,7 +1471,7 @@ void Caldoria::clickInHotspot(const Input &input, const Hotspot *spot) {
 	}
 }
 
-void Caldoria::clickOnDoorbell(const tHotSpotID doorBellSpotID) {
+void Caldoria::clickOnDoorbell(const HotSpotID doorBellSpotID) {
 	uint32 extra;
 	ExtraTable::Entry entry;
 
@@ -1501,7 +1501,7 @@ void Caldoria::clickOnDoorbell(const tHotSpotID doorBellSpotID) {
 	requestSpotSound(kCaldoriaNobodyHomeIn, kCaldoriaNobodyHomeOut, kFilterNoInput, kSpotSoundCompletedFlag);
 }
 
-tCanOpenDoorReason Caldoria::canOpenDoor(DoorTable::Entry &entry) {
+CanOpenDoorReason Caldoria::canOpenDoor(DoorTable::Entry &entry) {
 	switch (GameState.getCurrentRoom()) {
 	case kCaldoria16:
 	case kCaldoria38:
@@ -1519,7 +1519,7 @@ void Caldoria::doorOpened() {
 	_privateFlags.setFlag(kCaldoriaPrivateCanOpenElevatorDoorFlag, false);
 }
 
-GameInteraction *Caldoria::makeInteraction(const tInteractionID interactionID) {
+GameInteraction *Caldoria::makeInteraction(const InteractionID interactionID) {
 	switch (interactionID) {
 	case kCaldoria4DInteractionID:
 		return new Caldoria4DSystem(this);
@@ -1534,7 +1534,7 @@ GameInteraction *Caldoria::makeInteraction(const tInteractionID interactionID) {
 	return 0;
 }
 
-void Caldoria::newInteraction(const tInteractionID interactionID) {
+void Caldoria::newInteraction(const InteractionID interactionID) {
 	Neighborhood::newInteraction(interactionID);
 
 	if (!_currentInteraction) {
@@ -1552,7 +1552,7 @@ void Caldoria::newInteraction(const tInteractionID interactionID) {
 //	the inventory is too full or because the player lets go of the item before
 //	dropping it into the inventory).
 Hotspot *Caldoria::getItemScreenSpot(Item *item, DisplayElement *element) {
-	tHotSpotID destSpotID = kNoHotSpotID;
+	HotSpotID destSpotID = kNoHotSpotID;
 	
 	switch (item->getObjectID()) {
 	case kKeyCard:
@@ -1853,7 +1853,7 @@ Common::String Caldoria::getEnvScanMovie() {
 	Common::String movieName = Neighborhood::getEnvScanMovie();
 
 	if (movieName.empty()) {
-		tRoomID room = GameState.getCurrentRoom();
+		RoomID room = GameState.getCurrentRoom();
 
 		if (room >= kCaldoria00 && room <= kCaldoria14) {
 			// Inside apartment.
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h
index 538eaafc01..c1e2a2c29d 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.h
@@ -36,352 +36,352 @@ const TimeScale kCaldoriaFrameDuration = 40;
 
 //	Alternate IDs.
 
-const tAlternateID kAltCaldoriaNormal = 0;
-const tAlternateID kAltCaldoriaRoofDoorBlown = 2;
-const tAlternateID kAltCaldoriaSinclairDown = 3;
+const AlternateID kAltCaldoriaNormal = 0;
+const AlternateID kAltCaldoriaRoofDoorBlown = 2;
+const AlternateID kAltCaldoriaSinclairDown = 3;
 
 //	Room IDs.
 
-const tRoomID kCaldoria00 = 1;
-const tRoomID kCaldoria01 = 2;
-const tRoomID kCaldoria02 = 3;
-const tRoomID kCaldoria03 = 4;
-const tRoomID kCaldoria04 = 5;
-const tRoomID kCaldoria05 = 6;
-const tRoomID kCaldoria06 = 7;
-const tRoomID kCaldoria07 = 8;
-const tRoomID kCaldoria08 = 9;
-const tRoomID kCaldoria09 = 10;
-const tRoomID kCaldoria10 = 11;
-const tRoomID kCaldoriaToilet = 12;
-const tRoomID kCaldoria11 = 13;
-const tRoomID kCaldoria12 = 14;
-const tRoomID kCaldoriaVidPhone = 15;
-const tRoomID kCaldoriaReplicator = 16;
-const tRoomID kCaldoriaDrawers = 17;
-const tRoomID kCaldoria13 = 18;
-const tRoomID kCaldoria14 = 19;
-const tRoomID kCaldoria15 = 20;
-const tRoomID kCaldoria16 = 21;
-const tRoomID kCaldoria17 = 22;
-const tRoomID kCaldoria18 = 23;
-const tRoomID kCaldoria19 = 24;
-const tRoomID kCaldoria20 = 25;
-const tRoomID kCaldoria21 = 26;
-const tRoomID kCaldoria22 = 27;
-const tRoomID kCaldoria23 = 28;
-const tRoomID kCaldoria24 = 29;
-const tRoomID kCaldoria25 = 30;
-const tRoomID kCaldoria26 = 31;
-const tRoomID kCaldoria27 = 32;
-const tRoomID kCaldoria28 = 33;
-const tRoomID kCaldoria29 = 34;
-const tRoomID kCaldoria30 = 35;
-const tRoomID kCaldoria31 = 36;
-const tRoomID kCaldoria32 = 37;
-const tRoomID kCaldoria33 = 38;
-const tRoomID kCaldoria34 = 39;
-const tRoomID kCaldoria35 = 40;
-const tRoomID kCaldoria36 = 41;
-const tRoomID kCaldoria37 = 42;
-const tRoomID kCaldoria38 = 43;
-const tRoomID kCaldoria39 = 44;
-const tRoomID kCaldoria40 = 45;
-const tRoomID kCaldoria41 = 46;
-const tRoomID kCaldoriaBinoculars = 47;
-const tRoomID kCaldoria42 = 48;
-const tRoomID kCaldoriaKiosk = 49;
-const tRoomID kCaldoria44 = 50;
-const tRoomID kCaldoria45 = 51;
-const tRoomID kCaldoria46 = 52;
-const tRoomID kCaldoria47 = 53;
-const tRoomID kCaldoria48 = 54;
-const tRoomID kCaldoria49 = 55;
-const tRoomID kCaldoria50 = 56;
-const tRoomID kCaldoria51 = 57;
-const tRoomID kCaldoria52 = 58;
-const tRoomID kCaldoria53 = 59;
-const tRoomID kCaldoria54 = 60;
-const tRoomID kCaldoria55 = 61;
-const tRoomID kCaldoria56 = 62;
-const tRoomID kCaldoriaDeathRoom = 0;
+const RoomID kCaldoria00 = 1;
+const RoomID kCaldoria01 = 2;
+const RoomID kCaldoria02 = 3;
+const RoomID kCaldoria03 = 4;
+const RoomID kCaldoria04 = 5;
+const RoomID kCaldoria05 = 6;
+const RoomID kCaldoria06 = 7;
+const RoomID kCaldoria07 = 8;
+const RoomID kCaldoria08 = 9;
+const RoomID kCaldoria09 = 10;
+const RoomID kCaldoria10 = 11;
+const RoomID kCaldoriaToilet = 12;
+const RoomID kCaldoria11 = 13;
+const RoomID kCaldoria12 = 14;
+const RoomID kCaldoriaVidPhone = 15;
+const RoomID kCaldoriaReplicator = 16;
+const RoomID kCaldoriaDrawers = 17;
+const RoomID kCaldoria13 = 18;
+const RoomID kCaldoria14 = 19;
+const RoomID kCaldoria15 = 20;
+const RoomID kCaldoria16 = 21;
+const RoomID kCaldoria17 = 22;
+const RoomID kCaldoria18 = 23;
+const RoomID kCaldoria19 = 24;
+const RoomID kCaldoria20 = 25;
+const RoomID kCaldoria21 = 26;
+const RoomID kCaldoria22 = 27;
+const RoomID kCaldoria23 = 28;
+const RoomID kCaldoria24 = 29;
+const RoomID kCaldoria25 = 30;
+const RoomID kCaldoria26 = 31;
+const RoomID kCaldoria27 = 32;
+const RoomID kCaldoria28 = 33;
+const RoomID kCaldoria29 = 34;
+const RoomID kCaldoria30 = 35;
+const RoomID kCaldoria31 = 36;
+const RoomID kCaldoria32 = 37;
+const RoomID kCaldoria33 = 38;
+const RoomID kCaldoria34 = 39;
+const RoomID kCaldoria35 = 40;
+const RoomID kCaldoria36 = 41;
+const RoomID kCaldoria37 = 42;
+const RoomID kCaldoria38 = 43;
+const RoomID kCaldoria39 = 44;
+const RoomID kCaldoria40 = 45;
+const RoomID kCaldoria41 = 46;
+const RoomID kCaldoriaBinoculars = 47;
+const RoomID kCaldoria42 = 48;
+const RoomID kCaldoriaKiosk = 49;
+const RoomID kCaldoria44 = 50;
+const RoomID kCaldoria45 = 51;
+const RoomID kCaldoria46 = 52;
+const RoomID kCaldoria47 = 53;
+const RoomID kCaldoria48 = 54;
+const RoomID kCaldoria49 = 55;
+const RoomID kCaldoria50 = 56;
+const RoomID kCaldoria51 = 57;
+const RoomID kCaldoria52 = 58;
+const RoomID kCaldoria53 = 59;
+const RoomID kCaldoria54 = 60;
+const RoomID kCaldoria55 = 61;
+const RoomID kCaldoria56 = 62;
+const RoomID kCaldoriaDeathRoom = 0;
 
 //	Hot Spot Activation IDs.
 
-const tHotSpotActivationID kActivate4DClosed = 1;
-const tHotSpotActivationID kActivate4DOpen = 2;
-const tHotSpotActivationID kActivateMirrorReady = 3;
-const tHotSpotActivationID kActivateStylistReady = 4;
-const tHotSpotActivationID kActivateReplicatorReady = 5;
-const tHotSpotActivationID kActivateOJOnThePad = 6;
-const tHotSpotActivationID kActivateDrawersClosed = 7;
-const tHotSpotActivationID kActivateRightOpen = 8;
-const tHotSpotActivationID kActivateLeftOpen = 9;
-const tHotSpotActivationID kActivateFocusedOnShip = 10;
-const tHotSpotActivationID kActivateNotFocusedOnShip = 11;
-const tHotSpotActivationID kActivateReadyForCard = 12;
-const tHotSpotActivationID kActivateReadyToTransport = 13;
-const tHotSpotActivationID kActivateRoofSlotEmpty = 14;
-const tHotSpotActivationID kActivateZoomedOnSinclair = 15;
+const HotSpotActivationID kActivate4DClosed = 1;
+const HotSpotActivationID kActivate4DOpen = 2;
+const HotSpotActivationID kActivateMirrorReady = 3;
+const HotSpotActivationID kActivateStylistReady = 4;
+const HotSpotActivationID kActivateReplicatorReady = 5;
+const HotSpotActivationID kActivateOJOnThePad = 6;
+const HotSpotActivationID kActivateDrawersClosed = 7;
+const HotSpotActivationID kActivateRightOpen = 8;
+const HotSpotActivationID kActivateLeftOpen = 9;
+const HotSpotActivationID kActivateFocusedOnShip = 10;
+const HotSpotActivationID kActivateNotFocusedOnShip = 11;
+const HotSpotActivationID kActivateReadyForCard = 12;
+const HotSpotActivationID kActivateReadyToTransport = 13;
+const HotSpotActivationID kActivateRoofSlotEmpty = 14;
+const HotSpotActivationID kActivateZoomedOnSinclair = 15;
 
 //	Hot Spot IDs.
 
-const tHotSpotID kCa4DEnvironOpenSpotID = 5000;
-const tHotSpotID kCa4DEnvironCloseSpotID = 5001;
-const tHotSpotID kCa4DVisualSpotID = 5002;
-const tHotSpotID kCa4DAudioSpotID = 5003;
-const tHotSpotID kCa4DChoice1SpotID = 5004;
-const tHotSpotID kCa4DChoice2SpotID = 5005;
-const tHotSpotID kCa4DChoice3SpotID = 5006;
-const tHotSpotID kCa4DChoice4SpotID = 5007;
-const tHotSpotID kCaBathroomMirrorSpotID = 5008;
-const tHotSpotID kCaHairStyle1SpotID = 5009;
-const tHotSpotID kCaHairStyle2SpotID = 5010;
-const tHotSpotID kCaHairStyle3SpotID = 5011;
-const tHotSpotID kCaShowerSpotID = 5012;
-const tHotSpotID kCaBathroomToiletSpotID = 5013;
-const tHotSpotID kCaldoriaVidPhoneSpotID = 5014;
-const tHotSpotID kCaldoriaReplicatorSpotID = 5015;
-const tHotSpotID kCaldoriaDrawersSpotID = 5016;
-const tHotSpotID kCaldoriaVidPhoneOutSpotID = 5017;
-const tHotSpotID kCaBedroomVidPhoneActivationSpotID = 5018;
-const tHotSpotID kCaldoriaReplicatorOutSpotID = 5019;
-const tHotSpotID kCaldoriaMakeOJSpotID = 5020;
-const tHotSpotID kCaldoriaMakeStickyBunsSpotID = 5021;
-const tHotSpotID kCaldoriaOrangeJuiceSpotID = 5022;
-const tHotSpotID kCaldoriaOrangeJuiceDropSpotID = 5023;
-const tHotSpotID kCaldoriaDrawersOutSpotID = 5024;
-const tHotSpotID kCaldoriaLeftDrawerOpenSpotID = 5025;
-const tHotSpotID kCaldoriaRightDrawerOpenSpotID = 5026;
-const tHotSpotID kCaldoriaKeyCardSpotID = 5027;
-const tHotSpotID kCaldoriaLeftDrawerCloseSpotID = 5028;
-const tHotSpotID kCaldoriaRightDrawerWithKeysCloseSpotID = 5029;
-const tHotSpotID kCaldoriaRightDrawerNoKeysCloseSpotID = 5030;
-const tHotSpotID kCaldoriaFourthFloorElevatorSpotID = 5031;
-const tHotSpotID kCaldoria20DoorbellSpotID = 5032;
-const tHotSpotID kCaldoria21DoorbellSpotID = 5033;
-const tHotSpotID kCaldoria26DoorbellSpotID = 5034;
-const tHotSpotID kCaldoriaFourthFloorElevator1 = 5035;
-const tHotSpotID kCaldoriaFourthFloorElevator2 = 5036;
-const tHotSpotID kCaldoriaFourthFloorElevator3 = 5037;
-const tHotSpotID kCaldoriaFourthFloorElevator4 = 5038;
-const tHotSpotID kCaldoriaFourthFloorElevator5 = 5039;
-const tHotSpotID kCaldoriaGroundElevator1 = 5040;
-const tHotSpotID kCaldoriaGroundElevator2 = 5041;
-const tHotSpotID kCaldoriaGroundElevator3 = 5042;
-const tHotSpotID kCaldoriaGroundElevator4 = 5043;
-const tHotSpotID kCaldoriaGroundElevator5 = 5044;
-const tHotSpotID kCaldoria29DoorbellSpotID = 5045;
-const tHotSpotID kCaldoria34DoorbellSpotID = 5046;
-const tHotSpotID kCaldoria35DoorbellSpotID = 5047;
-const tHotSpotID kCaldoriaGroundElevatorSpotID = 5048;
-const tHotSpotID kCaldoriaBinocularZoomInSpotID = 5049;
-const tHotSpotID kCaldoriaBinocularsOutSpotID = 5050;
-const tHotSpotID kCaldoriaZoomInOnShipSpotID = 5051;
-const tHotSpotID kCaldoriaKioskSpotID = 5052;
-const tHotSpotID kCaldoriaKioskOutSpotID = 5053;
-const tHotSpotID kCaldoriaKioskInfoSpotID = 5054;
-const tHotSpotID kCaldoriaGTCardDropSpotID = 5055;
-const tHotSpotID kCaldoriaGTTokyoSpotID = 5056;
-const tHotSpotID kCaldoriaGTTSASpotID = 5057;
-const tHotSpotID kCaldoriaGTBeachSpotID = 5058;
-const tHotSpotID kCaldoriaGTOtherSpotID = 5059;
-const tHotSpotID kCaldoriaRoofElevator1 = 5060;
-const tHotSpotID kCaldoriaRoofElevator2 = 5061;
-const tHotSpotID kCaldoriaRoofElevator3 = 5062;
-const tHotSpotID kCaldoriaRoofElevator4 = 5063;
-const tHotSpotID kCaldoriaRoofElevator5 = 5064;
-const tHotSpotID kCaldoriaRoofElevatorSpotID = 5065;
-const tHotSpotID kCaldoriaRoofDoorSpotID = 5066;
-const tHotSpotID kCaldoriaRoofCardDropSpotID = 5067;
-const tHotSpotID kCaldoria53EastSinclairTargetSpotID = 5068;
+const HotSpotID kCa4DEnvironOpenSpotID = 5000;
+const HotSpotID kCa4DEnvironCloseSpotID = 5001;
+const HotSpotID kCa4DVisualSpotID = 5002;
+const HotSpotID kCa4DAudioSpotID = 5003;
+const HotSpotID kCa4DChoice1SpotID = 5004;
+const HotSpotID kCa4DChoice2SpotID = 5005;
+const HotSpotID kCa4DChoice3SpotID = 5006;
+const HotSpotID kCa4DChoice4SpotID = 5007;
+const HotSpotID kCaBathroomMirrorSpotID = 5008;
+const HotSpotID kCaHairStyle1SpotID = 5009;
+const HotSpotID kCaHairStyle2SpotID = 5010;
+const HotSpotID kCaHairStyle3SpotID = 5011;
+const HotSpotID kCaShowerSpotID = 5012;
+const HotSpotID kCaBathroomToiletSpotID = 5013;
+const HotSpotID kCaldoriaVidPhoneSpotID = 5014;
+const HotSpotID kCaldoriaReplicatorSpotID = 5015;
+const HotSpotID kCaldoriaDrawersSpotID = 5016;
+const HotSpotID kCaldoriaVidPhoneOutSpotID = 5017;
+const HotSpotID kCaBedroomVidPhoneActivationSpotID = 5018;
+const HotSpotID kCaldoriaReplicatorOutSpotID = 5019;
+const HotSpotID kCaldoriaMakeOJSpotID = 5020;
+const HotSpotID kCaldoriaMakeStickyBunsSpotID = 5021;
+const HotSpotID kCaldoriaOrangeJuiceSpotID = 5022;
+const HotSpotID kCaldoriaOrangeJuiceDropSpotID = 5023;
+const HotSpotID kCaldoriaDrawersOutSpotID = 5024;
+const HotSpotID kCaldoriaLeftDrawerOpenSpotID = 5025;
+const HotSpotID kCaldoriaRightDrawerOpenSpotID = 5026;
+const HotSpotID kCaldoriaKeyCardSpotID = 5027;
+const HotSpotID kCaldoriaLeftDrawerCloseSpotID = 5028;
+const HotSpotID kCaldoriaRightDrawerWithKeysCloseSpotID = 5029;
+const HotSpotID kCaldoriaRightDrawerNoKeysCloseSpotID = 5030;
+const HotSpotID kCaldoriaFourthFloorElevatorSpotID = 5031;
+const HotSpotID kCaldoria20DoorbellSpotID = 5032;
+const HotSpotID kCaldoria21DoorbellSpotID = 5033;
+const HotSpotID kCaldoria26DoorbellSpotID = 5034;
+const HotSpotID kCaldoriaFourthFloorElevator1 = 5035;
+const HotSpotID kCaldoriaFourthFloorElevator2 = 5036;
+const HotSpotID kCaldoriaFourthFloorElevator3 = 5037;
+const HotSpotID kCaldoriaFourthFloorElevator4 = 5038;
+const HotSpotID kCaldoriaFourthFloorElevator5 = 5039;
+const HotSpotID kCaldoriaGroundElevator1 = 5040;
+const HotSpotID kCaldoriaGroundElevator2 = 5041;
+const HotSpotID kCaldoriaGroundElevator3 = 5042;
+const HotSpotID kCaldoriaGroundElevator4 = 5043;
+const HotSpotID kCaldoriaGroundElevator5 = 5044;
+const HotSpotID kCaldoria29DoorbellSpotID = 5045;
+const HotSpotID kCaldoria34DoorbellSpotID = 5046;
+const HotSpotID kCaldoria35DoorbellSpotID = 5047;
+const HotSpotID kCaldoriaGroundElevatorSpotID = 5048;
+const HotSpotID kCaldoriaBinocularZoomInSpotID = 5049;
+const HotSpotID kCaldoriaBinocularsOutSpotID = 5050;
+const HotSpotID kCaldoriaZoomInOnShipSpotID = 5051;
+const HotSpotID kCaldoriaKioskSpotID = 5052;
+const HotSpotID kCaldoriaKioskOutSpotID = 5053;
+const HotSpotID kCaldoriaKioskInfoSpotID = 5054;
+const HotSpotID kCaldoriaGTCardDropSpotID = 5055;
+const HotSpotID kCaldoriaGTTokyoSpotID = 5056;
+const HotSpotID kCaldoriaGTTSASpotID = 5057;
+const HotSpotID kCaldoriaGTBeachSpotID = 5058;
+const HotSpotID kCaldoriaGTOtherSpotID = 5059;
+const HotSpotID kCaldoriaRoofElevator1 = 5060;
+const HotSpotID kCaldoriaRoofElevator2 = 5061;
+const HotSpotID kCaldoriaRoofElevator3 = 5062;
+const HotSpotID kCaldoriaRoofElevator4 = 5063;
+const HotSpotID kCaldoriaRoofElevator5 = 5064;
+const HotSpotID kCaldoriaRoofElevatorSpotID = 5065;
+const HotSpotID kCaldoriaRoofDoorSpotID = 5066;
+const HotSpotID kCaldoriaRoofCardDropSpotID = 5067;
+const HotSpotID kCaldoria53EastSinclairTargetSpotID = 5068;
 
 //	Extra sequence IDs.
 
-const tExtraID kCaldoriaWakeUpView1 = 0;
-const tExtraID kCaldoria00WakeUp1 = 1;
-const tExtraID kCaldoria00WakeUp2 = 2;
-const tExtraID kCaldoria00SitDown = 3;
-const tExtraID k4DEnvironOpenToINN = 4;
-const tExtraID k4DINNInterruption = 5;
-const tExtraID k4DINNIntro = 6;
-const tExtraID k4DINNMarkJohnson = 7;
-const tExtraID k4DINNMeganLove = 8;
-const tExtraID k4DINNFadeOut = 9;
-const tExtraID k4DEnvironOpenFromINN = 10;
-const tExtraID k4DEnvironOpen = 11;
-const tExtraID k4DEnvironOpenView = 12;
-const tExtraID k4DEnvironClose = 13;
-const tExtraID k4DIslandLoop = 14;
-const tExtraID k4DDesertLoop = 15;
-const tExtraID k4DMountainLoop = 16;
-const tExtraID k4DIsland1ToIsland0 = 17;
-const tExtraID k4DIsland2ToIsland0 = 18;
-const tExtraID k4DIsland0ToDesert0 = 19;
-const tExtraID k4DIsland1ToDesert0 = 20;
-const tExtraID k4DIsland2ToDesert0 = 21;
-const tExtraID k4DIsland0ToMountain0 = 22;
-const tExtraID k4DIsland1ToMountain0 = 23;
-const tExtraID k4DIsland2ToMountain0 = 24;
-const tExtraID k4DDesert0ToIsland0 = 25;
-const tExtraID k4DDesert1ToIsland0 = 26;
-const tExtraID k4DDesert2ToIsland0 = 27;
-const tExtraID k4DDesert0ToMountain0 = 28;
-const tExtraID k4DDesert1ToMountain0 = 29;
-const tExtraID k4DDesert2ToMountain0 = 30;
-const tExtraID k4DMountain0ToIsland0 = 31;
-const tExtraID k4DMountain1ToIsland0 = 32;
-const tExtraID k4DMountain2ToIsland0 = 33;
-const tExtraID k4DMountain0ToDesert0 = 34;
-const tExtraID k4DMountain1ToDesert0 = 35;
-const tExtraID k4DMountain2ToDesert0 = 36;
-const tExtraID kCaBathroomGreeting = 37;
-const tExtraID kCaBathroomBodyFat = 38;
-const tExtraID kCaBathroomStylistIntro = 39;
-const tExtraID kCaBathroomRetrothrash = 40;
-const tExtraID kCaBathroomRetrothrashReturn = 41;
-const tExtraID kCaBathroomGeoWave = 42;
-const tExtraID kCaBathroomGeoWaveReturn = 43;
-const tExtraID kCaBathroomAgencyStandard = 44;
-const tExtraID kCaldoriaShowerTitle = 45;
-const tExtraID kCaldoriaShowerButton = 46;
-const tExtraID kCaldoriaShowerDown = 47;
-const tExtraID kCaldoriaShowerUp = 48;
-const tExtraID kCaBedroomVidPhone = 49;
-const tExtraID kCaBedroomMessage1 = 50;
-const tExtraID kCaBedroomMessage2 = 51;
-const tExtraID kCreateOrangeJuice = 52;
-const tExtraID kDisposeOrangeJuice = 53;
-const tExtraID kReplicatorNorthViewWithOJ = 54;
-const tExtraID kLeftDrawerOpen = 55;
-const tExtraID kLeftDrawerClose = 56;
-const tExtraID kRightDrawerOpenWithKeys = 57;
-const tExtraID kRightDrawerCloseWithKeys = 58;
-const tExtraID kRightDrawerOpenNoKeys = 59;
-const tExtraID kRightDrawerCloseNoKeys = 60;
-const tExtraID kRightDrawerOpenViewWithKeys = 61;
-const tExtraID kRightDrawerOpenViewNoKeys = 62;
-const tExtraID kCaldoria16ElevatorUp = 63;
-const tExtraID kCaldoria16ElevatorDown = 64;
-const tExtraID kCaldoria16SouthViewWithElevator = 65;
-const tExtraID kCaldoria20Doorbell = 66;
-const tExtraID kCaldoria21Doorbell = 67;
-const tExtraID kCaldoria26Doorbell = 68;
-const tExtraID kCaldoriaFourthToGround = 69;
-const tExtraID kCaldoriaRoofToFourth = 70;
-const tExtraID kCaldoriaRoofToGround = 71;
-const tExtraID kCaldoriaGroundToFourth = 72;
-const tExtraID kCaldoriaGroundToRoof = 73;
-const tExtraID kCaldoriaFourthToRoof = 74;
-const tExtraID kCaldoria29Doorbell = 75;
-const tExtraID kCaldoria34Doorbell = 76;
-const tExtraID kCaldoria35Doorbell = 77;
-const tExtraID kBinocularsZoomInOnShip = 78;
-const tExtraID kCaldoriaKioskVideo = 79;
-const tExtraID kCaldoriaTransporterArrowLoop = 80;
-const tExtraID kArriveAtCaldoriaFromTSA = 81;
-const tExtraID kCaGTOtherChoice = 82;
-const tExtraID kCaGTCardSwipe = 83;
-const tExtraID kCaGTSelectTSA = 84;
-const tExtraID kCaGTFryTheFly = 85;
-const tExtraID kCaGTGoToTSA = 86;
-const tExtraID kCaGTSelectBeach = 87;
-const tExtraID kCaGTGoToBeach = 88;
-const tExtraID kCaGTArriveAtBeach = 89;
-const tExtraID kCaGTSelectTokyo = 90;
-const tExtraID kCaGTGoToTokyo = 91;
-const tExtraID kCaGTArriveAtTokyo = 92;
-const tExtraID kCa48NorthRooftopClosed = 93;
-const tExtraID kCa48NorthExplosion = 94;
-const tExtraID kCa48NorthExplosionDeath = 95;
-const tExtraID kCa49NorthVoiceAnalysis = 96;
-const tExtraID kCa50SinclairShoots = 97;
-const tExtraID kCa53EastZoomToSinclair = 98;
-const tExtraID kCa53EastDeath2 = 99;
-const tExtraID kCa53EastShootSinclair = 100;
-const tExtraID kCa53EastZoomOutFromSinclair = 101;
-const tExtraID kCa54SouthDeath = 102;
-const tExtraID kCaldoria56BombStage1 = 103;
-const tExtraID kCaldoria56BombStage2 = 104;
-const tExtraID kCaldoria56BombStage3 = 105;
-const tExtraID kCaldoria56BombStage4 = 106;
-const tExtraID kCaldoria56BombStage5 = 107;
-const tExtraID kCaldoria56BombStage6 = 108;
-const tExtraID kCaldoria56BombStage7 = 109;
-const tExtraID kCaldoria56BombExplodes = 110;
+const ExtraID kCaldoriaWakeUpView1 = 0;
+const ExtraID kCaldoria00WakeUp1 = 1;
+const ExtraID kCaldoria00WakeUp2 = 2;
+const ExtraID kCaldoria00SitDown = 3;
+const ExtraID k4DEnvironOpenToINN = 4;
+const ExtraID k4DINNInterruption = 5;
+const ExtraID k4DINNIntro = 6;
+const ExtraID k4DINNMarkJohnson = 7;
+const ExtraID k4DINNMeganLove = 8;
+const ExtraID k4DINNFadeOut = 9;
+const ExtraID k4DEnvironOpenFromINN = 10;
+const ExtraID k4DEnvironOpen = 11;
+const ExtraID k4DEnvironOpenView = 12;
+const ExtraID k4DEnvironClose = 13;
+const ExtraID k4DIslandLoop = 14;
+const ExtraID k4DDesertLoop = 15;
+const ExtraID k4DMountainLoop = 16;
+const ExtraID k4DIsland1ToIsland0 = 17;
+const ExtraID k4DIsland2ToIsland0 = 18;
+const ExtraID k4DIsland0ToDesert0 = 19;
+const ExtraID k4DIsland1ToDesert0 = 20;
+const ExtraID k4DIsland2ToDesert0 = 21;
+const ExtraID k4DIsland0ToMountain0 = 22;
+const ExtraID k4DIsland1ToMountain0 = 23;
+const ExtraID k4DIsland2ToMountain0 = 24;
+const ExtraID k4DDesert0ToIsland0 = 25;
+const ExtraID k4DDesert1ToIsland0 = 26;
+const ExtraID k4DDesert2ToIsland0 = 27;
+const ExtraID k4DDesert0ToMountain0 = 28;
+const ExtraID k4DDesert1ToMountain0 = 29;
+const ExtraID k4DDesert2ToMountain0 = 30;
+const ExtraID k4DMountain0ToIsland0 = 31;
+const ExtraID k4DMountain1ToIsland0 = 32;
+const ExtraID k4DMountain2ToIsland0 = 33;
+const ExtraID k4DMountain0ToDesert0 = 34;
+const ExtraID k4DMountain1ToDesert0 = 35;
+const ExtraID k4DMountain2ToDesert0 = 36;
+const ExtraID kCaBathroomGreeting = 37;
+const ExtraID kCaBathroomBodyFat = 38;
+const ExtraID kCaBathroomStylistIntro = 39;
+const ExtraID kCaBathroomRetrothrash = 40;
+const ExtraID kCaBathroomRetrothrashReturn = 41;
+const ExtraID kCaBathroomGeoWave = 42;
+const ExtraID kCaBathroomGeoWaveReturn = 43;
+const ExtraID kCaBathroomAgencyStandard = 44;
+const ExtraID kCaldoriaShowerTitle = 45;
+const ExtraID kCaldoriaShowerButton = 46;
+const ExtraID kCaldoriaShowerDown = 47;
+const ExtraID kCaldoriaShowerUp = 48;
+const ExtraID kCaBedroomVidPhone = 49;
+const ExtraID kCaBedroomMessage1 = 50;
+const ExtraID kCaBedroomMessage2 = 51;
+const ExtraID kCreateOrangeJuice = 52;
+const ExtraID kDisposeOrangeJuice = 53;
+const ExtraID kReplicatorNorthViewWithOJ = 54;
+const ExtraID kLeftDrawerOpen = 55;
+const ExtraID kLeftDrawerClose = 56;
+const ExtraID kRightDrawerOpenWithKeys = 57;
+const ExtraID kRightDrawerCloseWithKeys = 58;
+const ExtraID kRightDrawerOpenNoKeys = 59;
+const ExtraID kRightDrawerCloseNoKeys = 60;
+const ExtraID kRightDrawerOpenViewWithKeys = 61;
+const ExtraID kRightDrawerOpenViewNoKeys = 62;
+const ExtraID kCaldoria16ElevatorUp = 63;
+const ExtraID kCaldoria16ElevatorDown = 64;
+const ExtraID kCaldoria16SouthViewWithElevator = 65;
+const ExtraID kCaldoria20Doorbell = 66;
+const ExtraID kCaldoria21Doorbell = 67;
+const ExtraID kCaldoria26Doorbell = 68;
+const ExtraID kCaldoriaFourthToGround = 69;
+const ExtraID kCaldoriaRoofToFourth = 70;
+const ExtraID kCaldoriaRoofToGround = 71;
+const ExtraID kCaldoriaGroundToFourth = 72;
+const ExtraID kCaldoriaGroundToRoof = 73;
+const ExtraID kCaldoriaFourthToRoof = 74;
+const ExtraID kCaldoria29Doorbell = 75;
+const ExtraID kCaldoria34Doorbell = 76;
+const ExtraID kCaldoria35Doorbell = 77;
+const ExtraID kBinocularsZoomInOnShip = 78;
+const ExtraID kCaldoriaKioskVideo = 79;
+const ExtraID kCaldoriaTransporterArrowLoop = 80;
+const ExtraID kArriveAtCaldoriaFromTSA = 81;
+const ExtraID kCaGTOtherChoice = 82;
+const ExtraID kCaGTCardSwipe = 83;
+const ExtraID kCaGTSelectTSA = 84;
+const ExtraID kCaGTFryTheFly = 85;
+const ExtraID kCaGTGoToTSA = 86;
+const ExtraID kCaGTSelectBeach = 87;
+const ExtraID kCaGTGoToBeach = 88;
+const ExtraID kCaGTArriveAtBeach = 89;
+const ExtraID kCaGTSelectTokyo = 90;
+const ExtraID kCaGTGoToTokyo = 91;
+const ExtraID kCaGTArriveAtTokyo = 92;
+const ExtraID kCa48NorthRooftopClosed = 93;
+const ExtraID kCa48NorthExplosion = 94;
+const ExtraID kCa48NorthExplosionDeath = 95;
+const ExtraID kCa49NorthVoiceAnalysis = 96;
+const ExtraID kCa50SinclairShoots = 97;
+const ExtraID kCa53EastZoomToSinclair = 98;
+const ExtraID kCa53EastDeath2 = 99;
+const ExtraID kCa53EastShootSinclair = 100;
+const ExtraID kCa53EastZoomOutFromSinclair = 101;
+const ExtraID kCa54SouthDeath = 102;
+const ExtraID kCaldoria56BombStage1 = 103;
+const ExtraID kCaldoria56BombStage2 = 104;
+const ExtraID kCaldoria56BombStage3 = 105;
+const ExtraID kCaldoria56BombStage4 = 106;
+const ExtraID kCaldoria56BombStage5 = 107;
+const ExtraID kCaldoria56BombStage6 = 108;
+const ExtraID kCaldoria56BombStage7 = 109;
+const ExtraID kCaldoria56BombExplodes = 110;
 
 //	Caldoria interactions.
 
-const tInteractionID kCaldoria4DInteractionID = 0;
-const tInteractionID kCaldoriaBombInteractionID = 1;
-const tInteractionID kCaldoriaMessagesInteractionID = 2;
-const tInteractionID kCaldoriaMirrorInteractionID = 3;
+const InteractionID kCaldoria4DInteractionID = 0;
+const InteractionID kCaldoriaBombInteractionID = 1;
+const InteractionID kCaldoriaMessagesInteractionID = 2;
+const InteractionID kCaldoriaMirrorInteractionID = 3;
 
 //	Caldoria:
 
-const tDisplayOrder kVidPhoneOrder = kMonitorLayer;
-const tDisplayOrder k4DSpritesOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaMessagesOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaElevatorOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaA05LightLoopOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaA07LightLoopOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaBombGridOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1;
+const DisplayOrder kVidPhoneOrder = kMonitorLayer;
+const DisplayOrder k4DSpritesOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaMessagesOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaElevatorOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaA05LightLoopOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaA07LightLoopOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaBombGridOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1;
 
 /////////////////////////////////////////////
 //
 //	Caldoria
 
-const tCoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105;
-const tCoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28;
+const CoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105;
+const CoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28;
 
-const tCoordType kCaldoria4DSpritesLeft = kNavAreaLeft + 10;
-const tCoordType kCaldoria4DSpritesTop = kNavAreaTop + 142;
+const CoordType kCaldoria4DSpritesLeft = kNavAreaLeft + 10;
+const CoordType kCaldoria4DSpritesTop = kNavAreaTop + 142;
 
-const tCoordType kCaldoriaMessageLeft = kNavAreaLeft + 202;
-const tCoordType kCaldoriaMessageTop = kNavAreaTop + 26;
+const CoordType kCaldoriaMessageLeft = kNavAreaLeft + 202;
+const CoordType kCaldoriaMessageTop = kNavAreaTop + 26;
 
-const tCoordType kCaldoriaElevatorLeft = kNavAreaLeft + 407;
-const tCoordType kCaldoriaElevatorTop = kNavAreaTop + 138;
+const CoordType kCaldoriaElevatorLeft = kNavAreaLeft + 407;
+const CoordType kCaldoriaElevatorTop = kNavAreaTop + 138;
 
-const tCoordType kCaldoriaA05LightLoopLeft = kNavAreaLeft + 213;
-const tCoordType kCaldoriaA05LightLoopTop = kNavAreaTop + 215;
+const CoordType kCaldoriaA05LightLoopLeft = kNavAreaLeft + 213;
+const CoordType kCaldoriaA05LightLoopTop = kNavAreaTop + 215;
 
-const tCoordType kCaldoriaA07LightLoopLeft = kNavAreaLeft + 414;
-const tCoordType kCaldoriaA07LightLoopTop = kNavAreaTop + 215;
+const CoordType kCaldoriaA07LightLoopLeft = kNavAreaLeft + 414;
+const CoordType kCaldoriaA07LightLoopTop = kNavAreaTop + 215;
 
-const tCoordType kCaldoriaGunSpriteLeft = kNavAreaLeft + 276;
-const tCoordType kCaldoriaGunSpriteTop = kNavAreaTop + 115;
+const CoordType kCaldoriaGunSpriteLeft = kNavAreaLeft + 276;
+const CoordType kCaldoriaGunSpriteTop = kNavAreaTop + 115;
 
-const tCoordType kCaldoria11MessageLoopLeft = kNavAreaLeft + 135;
-const tCoordType kCaldoria11MessageLoopTop = kNavAreaTop + 214;
+const CoordType kCaldoria11MessageLoopLeft = kNavAreaLeft + 135;
+const CoordType kCaldoria11MessageLoopTop = kNavAreaTop + 214;
 
-const tCoordType kCaldoria12MessageLoopLeft = kNavAreaLeft + 209;
-const tCoordType kCaldoria12MessageLoopTop = kNavAreaTop + 170;
+const CoordType kCaldoria12MessageLoopLeft = kNavAreaLeft + 209;
+const CoordType kCaldoria12MessageLoopTop = kNavAreaTop + 170;
 
-const tCoordType kCaldoria13MessageLoopLeft = kNavAreaLeft + 480;
-const tCoordType kCaldoria13MessageLoopTop = kNavAreaTop + 191;
+const CoordType kCaldoria13MessageLoopLeft = kNavAreaLeft + 480;
+const CoordType kCaldoria13MessageLoopTop = kNavAreaTop + 191;
 
-const tCoordType kCaldoria14MessageLoopLeft = kNavAreaLeft + 248;
-const tCoordType kCaldoria14MessageLoopTop = kNavAreaTop + 191;
+const CoordType kCaldoria14MessageLoopLeft = kNavAreaLeft + 248;
+const CoordType kCaldoria14MessageLoopTop = kNavAreaTop + 191;
 
-const tCoordType kCaldoria48CardBombLoopLeft = kNavAreaLeft + 337;
-const tCoordType kCaldoria48CardBombLoopTop = kNavAreaTop + 205;
+const CoordType kCaldoria48CardBombLoopLeft = kNavAreaLeft + 337;
+const CoordType kCaldoria48CardBombLoopTop = kNavAreaTop + 205;
 
-const tCoordType kCaldoriaBombGridLeft = kNavAreaLeft + 290;
-const tCoordType kCaldoriaBombGridTop = kNavAreaTop + 58;
+const CoordType kCaldoriaBombGridLeft = kNavAreaLeft + 290;
+const CoordType kCaldoriaBombGridTop = kNavAreaTop + 58;
 
-const tCoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58;
-const tCoordType kCaldoriaBombTimerTop = kNavAreaTop + 204;
+const CoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58;
+const CoordType kCaldoriaBombTimerTop = kNavAreaTop + 204;
 
 //	Caldoria display IDs.
 
-const tDisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID;
-const tDisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1;
-const tDisplayElementID kCaldoriaMessagesID = kCaldoria4DSpritesID + 1;
-const tDisplayElementID kCaldoriaUtilityID = kCaldoriaMessagesID + 1;
-const tDisplayElementID kCaldoriaBombGridID = kCaldoriaUtilityID + 1;
-const tDisplayElementID kCaldoriaBombTimerID = kCaldoriaBombGridID + 1;
+const DisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID;
+const DisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1;
+const DisplayElementID kCaldoriaMessagesID = kCaldoria4DSpritesID + 1;
+const DisplayElementID kCaldoriaUtilityID = kCaldoriaMessagesID + 1;
+const DisplayElementID kCaldoriaBombGridID = kCaldoriaUtilityID + 1;
+const DisplayElementID kCaldoriaBombTimerID = kCaldoriaBombGridID + 1;
 
 const TimeValue kCaldoria4DBlankChoiceIn = 29730;
 const TimeValue kCaldoria4DBlankChoiceOut = 33910;
@@ -412,7 +412,7 @@ public:
 	
 	void pickedUpItem(Item *);
 	
-	virtual GameInteraction *makeInteraction(const tInteractionID);
+	virtual GameInteraction *makeInteraction(const InteractionID);
 	
 	virtual Common::String getBriefingMovie();
 	virtual Common::String getEnvScanMovie();
@@ -422,7 +422,7 @@ public:
 	bool wantsCursor();
 	void flushGameState();
 
-	void checkContinuePoint(const tRoomID, const tDirectionConstant);
+	void checkContinuePoint(const RoomID, const DirectionConstant);
 
 protected:
 	enum {
@@ -452,36 +452,36 @@ protected:
 
 	void setUpAIRules();
 	void doAIRecalibration();
-	TimeValue getViewTime(const tRoomID, const tDirectionConstant);
-	void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &);
+	TimeValue getViewTime(const RoomID, const DirectionConstant);
+	void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &);
 	void startSpotOnceOnly(TimeValue, TimeValue);
 	void startExitMovie(const ExitTable::Entry &);
 	void startZoomMovie(const ZoomTable::Entry &);
 	void startDoorOpenMovie(const TimeValue, const TimeValue);
-	void startTurnPush(const tTurnDirection, const TimeValue, const tDirectionConstant);
+	void startTurnPush(const TurnDirection, const TimeValue, const DirectionConstant);
 	void bumpIntoWall();
-	int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant);
+	int16 getStaticCompassAngle(const RoomID, const DirectionConstant);
 	void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &);
 	void getZoomCompassMove(const ZoomTable::Entry &, FaderMoveSpec &);
 	void getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec &);
 	void spotCompleted();
-	void arriveAt(const tRoomID, const tDirectionConstant);
+	void arriveAt(const RoomID, const DirectionConstant);
 	void arriveAtCaldoria00();
 	void arriveAtCaldoriaToilet();
 	void arriveAtCaldoria44();
 	void arriveAtCaldoria49();
 	void arriveAtCaldoria56();
 	void arriveAtCaldoriaDeath();
-	void turnTo(const tDirectionConstant);
+	void turnTo(const DirectionConstant);
 	void zoomTo(const Hotspot *);
 	void downButton(const Input &);
-	void receiveNotification(Notification *, const tNotificationFlags);
-	tInputBits getInputFilter();
+	void receiveNotification(Notification *, const NotificationFlags);
+	InputBits getInputFilter();
 	void activateHotspots();
 	void clickInHotspot(const Input &, const Hotspot *);
-	void newInteraction(const tInteractionID);
+	void newInteraction(const InteractionID);
 	
-	void clickOnDoorbell(const tHotSpotID);
+	void clickOnDoorbell(const HotSpotID);
 	
 	Hotspot *getItemScreenSpot(Item *, DisplayElement *);
 	void dropItemIntoRoom(Item *, Hotspot *);
@@ -489,7 +489,7 @@ protected:
 	void updateElevatorMovie();
 	void openElevatorMovie();
 	void emptyOJGlass();
-	void closeDoorOffScreen(const tRoomID, const tDirectionConstant);
+	void closeDoorOffScreen(const RoomID, const DirectionConstant);
 	void doorBombTimerExpired();
 	void sinclairTimerExpired();
 	void checkSinclairShootsOS();
@@ -498,7 +498,7 @@ protected:
 	void playEndMessage();
 	void checkInterruptSinclair();
 	
-	tCanOpenDoorReason canOpenDoor(DoorTable::Entry &);
+	CanOpenDoorReason canOpenDoor(DoorTable::Entry &);
 	void doorOpened();
 	
 	void updateCursor(const Common::Point, const Hotspot *);
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
index 252979a0fb..31a102a061 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
@@ -44,7 +44,7 @@ const TimeValue kSwitchable2Stop = kSwitchable2Start + kSwitchableDuration;
 const TimeValue kSwitchable3Start = kSwitchable2Stop + kNonswitchableDuration;
 const TimeValue kSwitchable3Stop = kSwitchable3Start + kSwitchableDuration;
 
-const tNotificationFlags kVidPhoneDoneFlag = 1;
+const NotificationFlags kVidPhoneDoneFlag = 1;
 
 const TimeValue kRockMusicLoopIn = 0;
 const TimeValue kRockMusicLoopOut = 2088;
@@ -75,28 +75,28 @@ enum {
 	k4DFirstVideoChoice = k4DIslandChoice
 };
 
-tExtraID s_transitionExtras0[3][3] = {
-	{0xffffffff, k4DIsland0ToDesert0, k4DIsland0ToMountain0},
-	{k4DDesert0ToIsland0, 0xffffffff, k4DDesert0ToMountain0},
-	{k4DMountain0ToIsland0, k4DMountain0ToDesert0, 0xffffffff}
+static const ExtraID s_transitionExtras0[3][3] = {
+	{ 0xffffffff, k4DIsland0ToDesert0, k4DIsland0ToMountain0 },
+	{ k4DDesert0ToIsland0, 0xffffffff, k4DDesert0ToMountain0 },
+	{ k4DMountain0ToIsland0, k4DMountain0ToDesert0, 0xffffffff }
 };
 
-tExtraID s_transitionExtras1[3][3] = {
-	{0xffffffff, k4DIsland1ToDesert0, k4DIsland1ToMountain0},
-	{k4DDesert1ToIsland0, 0xffffffff, k4DDesert1ToMountain0},
-	{k4DMountain1ToIsland0, k4DMountain1ToDesert0, 0xffffffff}
+static const ExtraID s_transitionExtras1[3][3] = {
+	{ 0xffffffff, k4DIsland1ToDesert0, k4DIsland1ToMountain0 },
+	{ k4DDesert1ToIsland0, 0xffffffff, k4DDesert1ToMountain0 },
+	{ k4DMountain1ToIsland0, k4DMountain1ToDesert0, 0xffffffff }
 };
 
-tExtraID s_transitionExtras2[3][3] = {
-	{0xffffffff, k4DIsland2ToDesert0, k4DIsland2ToMountain0},
-	{k4DDesert2ToIsland0, 0xffffffff, k4DDesert2ToMountain0},
-	{k4DMountain2ToIsland0, k4DMountain2ToDesert0, 0xffffffff}
+static const ExtraID s_transitionExtras2[3][3] = {
+	{ 0xffffffff, k4DIsland2ToDesert0, k4DIsland2ToMountain0 },
+	{ k4DDesert2ToIsland0, 0xffffffff, k4DDesert2ToMountain0 },
+	{ k4DMountain2ToIsland0, k4DMountain2ToDesert0, 0xffffffff }
 };
 
-tExtraID s_shutDownExtras[3][3] = {
-	{0xffffffff, k4DIsland1ToIsland0, k4DIsland2ToIsland0},
-	{k4DDesert0ToIsland0, k4DDesert1ToIsland0, k4DDesert2ToIsland0},
-	{k4DMountain0ToIsland0, k4DMountain1ToIsland0, k4DMountain2ToIsland0}
+static const ExtraID s_shutDownExtras[3][3] = {
+	{ 0xffffffff, k4DIsland1ToIsland0, k4DIsland2ToIsland0 },
+	{ k4DDesert0ToIsland0, k4DDesert1ToIsland0, k4DDesert2ToIsland0 },
+	{ k4DMountain0ToIsland0, k4DMountain1ToIsland0, k4DMountain2ToIsland0 }
 };
 
 Caldoria4DSystem::Caldoria4DSystem(Neighborhood *owner) : GameInteraction(kCaldoria4DInteractionID, owner),
@@ -128,7 +128,7 @@ void Caldoria4DSystem::openInteraction() {
 	startIdling();
 }
 
-void Caldoria4DSystem::loopExtra(const tExtraID extraID) {
+void Caldoria4DSystem::loopExtra(const ExtraID extraID) {
 	ExtraTable::Entry extraEntry;
 	
 	_owner->getExtraEntry(extraID, extraEntry);
@@ -139,7 +139,7 @@ void Caldoria4DSystem::loopExtra(const tExtraID extraID) {
 void Caldoria4DSystem::useIdleTime() {
 	if (_whichMenu == k4DShuttingDown) {
 		TimeValue movieTime = _owner->getNavMovie()->getTime() - _loopStart;
-		tExtraID extraID;
+		ExtraID extraID;
 
 		if (movieTime < kSwitchable1Stop)
 			extraID = s_shutDownExtras[_videoChoice - k4DFirstVideoChoice][0];
@@ -157,7 +157,7 @@ void Caldoria4DSystem::useIdleTime() {
 		}
 	} else if (_clickedHotspotID != kNoHotSpotID) {
 		TimeValue movieTime = _owner->getNavMovie()->getTime() - _loopStart;
-		tExtraID extraID;
+		ExtraID extraID;
 
 		if (movieTime < kSwitchable1Stop) {
 			extraID = s_transitionExtras0[_videoChoice - k4DFirstVideoChoice][_clickedHotspotID - kCa4DChoice1SpotID];
@@ -289,7 +289,7 @@ void Caldoria4DSystem::clickInHotspot(const Input &input, const Hotspot *spot) {
 	}
 }
 
-void Caldoria4DSystem::receiveNotification(Notification *, const tNotificationFlags) {
+void Caldoria4DSystem::receiveNotification(Notification *, const NotificationFlags) {
 	if (_whichMenu == k4DShuttingDown) {
 		_owner->requestDeleteCurrentInteraction();
 	} else {
@@ -364,7 +364,6 @@ void Caldoria4DSystem::makeAcousticChoice() {
 
 void Caldoria4DSystem::shutDown4DSystem() {
 	_whichMenu = k4DShuttingDown;
-
 }
 
 } // End of namespace Pegasus
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.h b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.h
index e0217918fa..63de7e1c4e 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.h
@@ -50,7 +50,7 @@ protected:
 	void handleInput(const Input &, const Hotspot *);
 	void activateHotspots();
 	void clickInHotspot(const Input &, const Hotspot *);
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 	void setSpritesMovie();
 	void makeIslandChoice();
 	void makeRockChoice();
@@ -61,7 +61,7 @@ protected:
 	void makeAcousticChoice();
 	
 	void useIdleTime();
-	void loopExtra(const tExtraID);
+	void loopExtra(const ExtraID);
 	
 	Movie _4DSpritesMovie;
 	TimeScale _4DSpritesScale;
@@ -70,7 +70,7 @@ protected:
 	uint _audioChoice;
 	Notification *_neighborhoodNotification;
 	TimeValue _loopStart;
-	tHotSpotID _clickedHotspotID;
+	HotSpotID _clickedHotspotID;
 };
 
 } // End of namespace Pegasus
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp b/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
index 9ec3124251..c9ee68aefb 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
@@ -48,12 +48,12 @@ static const uint32 kOnTime3 = kOffTime2 + kFlashOnTime;
 static const uint32 kOffTime3 = kOnTime3 + kFlashOffTime;
 static const uint32 kOnTime4 = kOffTime3 + kFlashOnTime;
 
-static const tHotSpotID kVertextHotSpotBaseID = 10000;
+static const HotSpotID kVertextHotSpotBaseID = 10000;
 
-static const tCoordType kVertextHotSpotWidth = 24;
-static const tCoordType kVertextHotSpotHeight = 24;
+static const CoordType kVertextHotSpotWidth = 24;
+static const CoordType kVertextHotSpotHeight = 24;
 
-static const tNotificationFlags kBombTimerExpiredFlag = 1;
+static const NotificationFlags kBombTimerExpiredFlag = 1;
 
 static const VertexType kBombLevelOne[] = {
 	0, 1, 0, 1, 0,			// hot vertices first.
@@ -696,20 +696,20 @@ static const VertexType kBombLevelSix[] = {
 	0, 0
 };
 
-static const tCoordType kBombGridWidth = 140;
-static const tCoordType kBombGridHeight = 140;
+static const CoordType kBombGridWidth = 140;
+static const CoordType kBombGridHeight = 140;
 
-static const tCoordType kDotOriginX = 0;
-static const tCoordType kDotOriginY = 0;
+static const CoordType kDotOriginX = 0;
+static const CoordType kDotOriginY = 0;
 
-static const tCoordType kVertOriginX = 2;
-static const tCoordType kVertOriginY = 6;
+static const CoordType kVertOriginX = 2;
+static const CoordType kVertOriginY = 6;
 
-static const tCoordType kHorizOriginX = 6;
-static const tCoordType kHorizOriginY = 2;
+static const CoordType kHorizOriginX = 6;
+static const CoordType kHorizOriginY = 2;
 
-static const tCoordType kDiagOriginX = 6;
-static const tCoordType kDiagOriginY = 6;
+static const CoordType kDiagOriginX = 6;
+static const CoordType kDiagOriginY = 6;
 
 static const int g_originsX[] = {
 	kDiagOriginX,
@@ -738,11 +738,11 @@ struct HotVerticesList {
 	VertexType hotVerts[25];
 };
 
-tCoordType vertToX(VertexType vertex) {
+CoordType vertToX(VertexType vertex) {
 	return (vertex % 5) * 32;
 }
 
-tCoordType vertToY(VertexType vertex) {
+CoordType vertToY(VertexType vertex) {
 	return (vertex / 5) * 32;
 }
 
@@ -1000,7 +1000,7 @@ bool allEdgesUsed(BombEdgeList edges) {
 	return true;
 }
 
-BombGrid::BombGrid(const tDisplayElementID id) : Picture(id) {
+BombGrid::BombGrid(const DisplayElementID id) : Picture(id) {
 	Common::Rect bounds(0, 0, kBombGridWidth, kBombGridHeight);
 
 	allocateSurface(bounds);
@@ -1098,7 +1098,7 @@ void BombGrid::drawEdges(BombEdgeList edges) {
 	gfx->setCurSurface(gfx->getWorkArea());
 }
 
-BombTimer::BombTimer(const tDisplayElementID id) : IdlerAnimation(id) {	
+BombTimer::BombTimer(const DisplayElementID id) : IdlerAnimation(id) {	
 	_middle = -1;
 	_leftImage.getImageFromPICTResource(((PegasusEngine *)g_engine)->_resFork, kTimerLeftPICTID);
 	_rightImage.getImageFromPICTResource(((PegasusEngine *)g_engine)->_resFork, kTimerRightPICTID);
@@ -1224,7 +1224,7 @@ void CaldoriaBomb::startBombAmbient(Common::String ambient) {
 	_owner->loadLoopSound1(ambient);
 }
 
-void CaldoriaBomb::receiveNotification(Notification *notification, const tNotificationFlags) {	
+void CaldoriaBomb::receiveNotification(Notification *notification, const NotificationFlags) {	
 	if (notification == _neighborhoodNotification) {
 		switch (_owner->getLastExtra()) {
 		case kCaldoria56BombStage1:
@@ -1297,7 +1297,7 @@ void CaldoriaBomb::clickInHotspot(const Input &input, const Hotspot *hotspot) {
 	}
 }
 
-tInputBits CaldoriaBomb::getInputFilter() {
+InputBits CaldoriaBomb::getInputFilter() {
 	// Disallow arrow buttons.
 	return GameInteraction::getInputFilter() & kFilterAllButtons;
 }
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriabomb.h b/engines/pegasus/neighborhood/caldoria/caldoriabomb.h
index fc48231708..55d0409dec 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriabomb.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoriabomb.h
@@ -75,7 +75,7 @@ static const VertexType kEdgeOneHalf = 7;
 
 class BombTimer : public IdlerAnimation {
 public:
-	BombTimer(const tDisplayElementID);
+	BombTimer(const DisplayElementID);
 	virtual ~BombTimer() {}
 
 	void draw(const Common::Rect &);
@@ -89,7 +89,7 @@ protected:
 
 class BombGrid : public Picture {
 public:
-	BombGrid(const tDisplayElementID);
+	BombGrid(const DisplayElementID);
 	virtual ~BombGrid() {}
 
 	void drawEdges(BombEdgeList);
@@ -131,11 +131,11 @@ protected:
 	void openInteraction();
 	void initInteraction();
 	void closeInteraction();
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 	void activateHotspots();
 	void clickInHotspot(const Input &, const Hotspot *);
 	void handleInput(const Input &, const Hotspot *);
-	tInputBits getInputFilter();
+	InputBits getInputFilter();
 	void startBombAmbient(Common::String);
 	
 	Notification *_neighborhoodNotification;
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp b/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
index bd5480de0e..3e97f97904 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
@@ -30,9 +30,9 @@
 
 namespace Pegasus {
 
-const tNotificationFlags kMessageDoneFlag = 1;
+const NotificationFlags kMessageDoneFlag = 1;
 
-CaldoriaMessages::CaldoriaMessages(Neighborhood *owner, const tNotificationID id, NotificationManager *manager) :
+CaldoriaMessages::CaldoriaMessages(Neighborhood *owner, const NotificationID id, NotificationManager *manager) :
 		GameInteraction(kCaldoriaMessagesInteractionID, owner), Notification(id, manager), _messageMovie(kCaldoriaMessagesID) {
 }
 
@@ -54,7 +54,7 @@ void CaldoriaMessages::closeInteraction() {
 	_neighborhoodNotification->cancelNotification(this);
 }
 
-void CaldoriaMessages::receiveNotification(Notification *notification, const tNotificationFlags) {	
+void CaldoriaMessages::receiveNotification(Notification *notification, const NotificationFlags) {	
 	if (notification == _neighborhoodNotification) {
 		switch (GameInteraction::_owner->getLastExtra()) {
 		case kCaBedroomVidPhone:
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamessages.h b/engines/pegasus/neighborhood/caldoria/caldoriamessages.h
index 1ef0ab0692..04079b52be 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriamessages.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamessages.h
@@ -38,14 +38,14 @@ class Neighborhood;
 
 class CaldoriaMessages : public GameInteraction, public Notification, public NotificationReceiver {
 public:
-	CaldoriaMessages(Neighborhood *, const tNotificationID, NotificationManager *);
+	CaldoriaMessages(Neighborhood *, const NotificationID, NotificationManager *);
 	virtual ~CaldoriaMessages() {}
 
 protected:
 	void openInteraction();
 	void initInteraction();
 	void closeInteraction();
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 	void clickInHotspot(const Input &, const Hotspot *);
 	void play1Message(uint);
 	
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp b/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
index 4d6dc6b758..2b70ead442 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
@@ -109,7 +109,7 @@ void CaldoriaMirror::clickInHotspot(const Input &input, const Hotspot *spot) {
 	}
 }
 
-void CaldoriaMirror::receiveNotification(Notification *, const tNotificationFlags) {
+void CaldoriaMirror::receiveNotification(Notification *, const NotificationFlags) {
 	switch (_owner->getLastExtra()) {
 	case kCaBathroomRetrothrash:
 	case kCaBathroomGeoWave:
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamirror.h b/engines/pegasus/neighborhood/caldoria/caldoriamirror.h
index 6b4339e69f..1ca47ec774 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriamirror.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamirror.h
@@ -44,7 +44,7 @@ protected:
 	void handleInput(const Input &, const Hotspot *);
 	void activateHotspots();
 	void clickInHotspot(const Input &, const Hotspot *);
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 
 	Notification *_neighborhoodNotification;
 };