1 files changed, 577 insertions, 577 deletions

diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp
index d3c64a13ec..62cee47045 100644
--- a/engines/titanic/core/saveable_object.cpp
+++ b/engines/titanic/core/saveable_object.cpp
@@ -420,594 +420,594 @@ Common::HashMap<Common::String, CSaveableObject::CreateFunction> *
 	CSaveableObject::_classList = nullptr;
 Common::List<ClassDef *> *CSaveableObject::_classDefs;
 
-#define DEFFN(T) ClassDef *T::_type; \
-	CSaveableObject *Function##T() { return new T(); }
+#define DEFFN(T) CSaveableObject *Function##T() { return new T(); } \
+	ClassDef *T::_type
 #define ADDFN(CHILD, PARENT) \
 	CHILD::_type = new TypeTemplate<CHILD>(#CHILD, PARENT::_type); \
 	(*_classList)[#CHILD] = Function##CHILD
 
-DEFFN(CArm)
-DEFFN(CAuditoryCentre)
-DEFFN(CBowlEar)
-DEFFN(CBrain)
-DEFFN(CBridgePiece)
-DEFFN(CCarry)
-DEFFN(CCarryParrot)
-DEFFN(CCentralCore)
-DEFFN(CChicken)
-DEFFN(CCrushedTV)
-DEFFN(CEar)
-DEFFN(CEye)
-DEFFN(CFeathers)
-DEFFN(CFruit)
-DEFFN(CGlass)
-DEFFN(CHammer)
-DEFFN(CHeadPiece)
-DEFFN(CHose)
-DEFFN(CHoseEnd)
-DEFFN(CKey)
-DEFFN(CLiftbotHead)
-DEFFN(CLongStick)
-DEFFN(CMagazine)
-DEFFN(CMaitreDLeftArm)
-DEFFN(CMaitreDRightArm)
-DEFFN(CMouth)
-DEFFN(CNapkin)
-DEFFN(CNose)
-DEFFN(CNote)
-DEFFN(CParcel)
-DEFFN(CPerch)
-DEFFN(CPhonographCylinder)
-DEFFN(CPhonographEar)
-DEFFN(CPhotograph)
-DEFFN(CPlugIn)
-DEFFN(CSpeechCentre)
-DEFFN(CSweets)
-DEFFN(CVisionCentre)
+DEFFN(CArm);
+DEFFN(CAuditoryCentre);
+DEFFN(CBowlEar);
+DEFFN(CBrain);
+DEFFN(CBridgePiece);
+DEFFN(CCarry);
+DEFFN(CCarryParrot);
+DEFFN(CCentralCore);
+DEFFN(CChicken);
+DEFFN(CCrushedTV);
+DEFFN(CEar);
+DEFFN(CEye);
+DEFFN(CFeathers);
+DEFFN(CFruit);
+DEFFN(CGlass);
+DEFFN(CHammer);
+DEFFN(CHeadPiece);
+DEFFN(CHose);
+DEFFN(CHoseEnd);
+DEFFN(CKey);
+DEFFN(CLiftbotHead);
+DEFFN(CLongStick);
+DEFFN(CMagazine);
+DEFFN(CMaitreDLeftArm);
+DEFFN(CMaitreDRightArm);
+DEFFN(CMouth);
+DEFFN(CNapkin);
+DEFFN(CNose);
+DEFFN(CNote);
+DEFFN(CParcel);
+DEFFN(CPerch);
+DEFFN(CPhonographCylinder);
+DEFFN(CPhonographEar);
+DEFFN(CPhotograph);
+DEFFN(CPlugIn);
+DEFFN(CSpeechCentre);
+DEFFN(CSweets);
+DEFFN(CVisionCentre);
 
-DEFFN(CBackground)
-DEFFN(CClickResponder)
-DEFFN(CDontSaveFileItem)
-DEFFN(CDropTarget)
-DEFFN(CFileItem)
-DEFFN(CFileListItem)
-DEFFN(CGameObject)
-DEFFN(CGameObjectDescItem)
-DEFFN(CLinkItem)
-DEFFN(ListItem)
-DEFFN(CMailMan)
-DEFFN(CMessageTarget)
-DEFFN(CMovieClip)
-DEFFN(CMultiDropTarget)
-DEFFN(CNamedItem)
-DEFFN(CNodeItem)
-DEFFN(CProjectItem)
-DEFFN(CResourceKey)
-DEFFN(CRoomItem)
-DEFFN(CSaveableObject)
-DEFFN(CStaticImage)
-DEFFN(CTurnOnObject)
-DEFFN(CTurnOnPlaySound)
-DEFFN(CTurnOnTurnOff)
-DEFFN(CTreeItem)
-DEFFN(CViewItem)
+DEFFN(CBackground);
+DEFFN(CClickResponder);
+DEFFN(CDontSaveFileItem);
+DEFFN(CDropTarget);
+DEFFN(CFileItem);
+DEFFN(CFileListItem);
+DEFFN(CGameObject);
+DEFFN(CGameObjectDescItem);
+DEFFN(CLinkItem);
+DEFFN(ListItem);
+DEFFN(CMailMan);
+DEFFN(CMessageTarget);
+DEFFN(CMovieClip);
+DEFFN(CMultiDropTarget);
+DEFFN(CNamedItem);
+DEFFN(CNodeItem);
+DEFFN(CProjectItem);
+DEFFN(CResourceKey);
+DEFFN(CRoomItem);
+DEFFN(CSaveableObject);
+DEFFN(CStaticImage);
+DEFFN(CTurnOnObject);
+DEFFN(CTurnOnPlaySound);
+DEFFN(CTurnOnTurnOff);
+DEFFN(CTreeItem);
+DEFFN(CViewItem);
 
-DEFFN(CAnnounce)
-DEFFN(CAnnoyBarbot)
-DEFFN(CArbBackground)
-DEFFN(CArboretumGate)
-DEFFN(CAutoAnimate)
-DEFFN(CBarBell)
-DEFFN(CBarMenu)
-DEFFN(CBarMenuButton)
-DEFFN(CBelbotGetLight)
-DEFFN(CBilgeSuccUBus)
-DEFFN(CBomb)
-DEFFN(CBottomOfWellMonitor)
-DEFFN(CBowlUnlocker)
-DEFFN(CBrainSlot)
-DEFFN(CBridgeDoor)
-DEFFN(CBridgeView)
-DEFFN(CBrokenPellBase)
-DEFFN(CBrokenPellerator)
-DEFFN(CBrokenPelleratorFroz)
-DEFFN(CCage)
-DEFFN(CCallPellerator)
-DEFFN(CCaptainsWheel)
-DEFFN(CCDROM)
-DEFFN(CCDROMComputer)
-DEFFN(CCDROMTray)
-DEFFN(CCellPointButton)
-DEFFN(CChevCode)
-DEFFN(CChevPanel)
-DEFFN(CChickenCooler)
-DEFFN(CChickenDispensor)
-DEFFN(CCloseBrokenPel)
-DEFFN(CodeWheel)
-DEFFN(CComputer)
-DEFFN(CComputerScreen)
-DEFFN(CCookie)
-DEFFN(CCredits)
-DEFFN(CCreditsButton)
-DEFFN(CDeadArea)
-DEFFN(CDeskClickResponder)
-DEFFN(CDoorbotElevatorHandler)
-DEFFN(CDoorbotHomeHandler)
-DEFFN(CEarSweetBowl)
-DEFFN(CEjectPhonographButton)
-DEFFN(CElevatorActionArea)
-DEFFN(CEmmaControl)
-DEFFN(CEmptyNutBowl)
-DEFFN(CEndCreditText)
-DEFFN(CEndCredits)
-DEFFN(CEndExplodeShip)
-DEFFN(CEndGameCredits)
-DEFFN(CEndSequenceControl)
-DEFFN(CFan)
-DEFFN(CFanControl)
-DEFFN(CFanDecrease)
-DEFFN(CFanIncrease)
-DEFFN(CFanNoises)
-DEFFN(CFloorIndicator)
-DEFFN(CGamesConsole)
-DEFFN(CGetLiftEye2)
-DEFFN(CGlassSmasher)
-DEFFN(CHammerClip)
-DEFFN(CHammerDispensor)
-DEFFN(CHammerDispensorButton)
-DEFFN(CHeadSlot)
-DEFFN(CHeadSmashEvent)
-DEFFN(CHeadSmashLever)
-DEFFN(CHeadSpinner)
-DEFFN(CIdleSummoner)
-DEFFN(CLeaveSecClassState)
-DEFFN(CLemonDispensor)
-DEFFN(CLight)
-DEFFN(CLightSwitch)
-DEFFN(CLittleLiftButton)
-DEFFN(CLongStickDispenser)
-DEFFN(CMissiveOMat)
-DEFFN(CMissiveOMatButton)
-DEFFN(CMovieTester)
-DEFFN(CMusicalInstrument)
-DEFFN(CMusicConsoleButton)
-DEFFN(CMusicRoomPhonograph)
-DEFFN(CMusicRoomStopPhonographButton)
-DEFFN(CMusicSystemLock)
-DEFFN(CNavHelmet)
-DEFFN(CNavigationComputer)
-DEFFN(CNoNutBowl)
-DEFFN(CNoseHolder)
-DEFFN(CNullPortHole)
-DEFFN(CNutReplacer)
-DEFFN(CPetDisabler)
-DEFFN(CPhonograph)
-DEFFN(CPhonographLid)
-DEFFN(CPlayMusicButton)
-DEFFN(CPlayOnAct)
-DEFFN(CPortHole)
-DEFFN(CRecordPhonographButton)
-DEFFN(CReplacementEar)
-DEFFN(CReservedTable)
-DEFFN(CRestaurantCylinderHolder)
-DEFFN(CRestaurantPhonograph)
-DEFFN(CSauceDispensor)
-DEFFN(CSearchPoint)
-DEFFN(CSeasonBackground)
-DEFFN(CSeasonBarrel)
-DEFFN(CSeasonalAdjustment)
-DEFFN(CServiceElevatorWindow)
-DEFFN(CShipSetting)
-DEFFN(CShipSettingButton)
-DEFFN(CShowCellpoints)
-DEFFN(CSpeechDispensor)
-DEFFN(CSplashAnimation)
-DEFFN(CStarlingPuret)
-DEFFN(CStartAction)
-DEFFN(CStopPhonographButton)
-DEFFN(CSUBGlass)
-DEFFN(CSUBWrapper)
-DEFFN(CSweetBowl)
-DEFFN(CTelevision)
-DEFFN(CThirdClassCanal)
-DEFFN(CThrowTVDownWell)
-DEFFN(CTitaniaStillControl)
-DEFFN(CTOWParrotNav)
-DEFFN(CUpLighter)
-DEFFN(CUselessLever)
-DEFFN(CVolumeControl)
-DEFFN(CWheelButton)
-DEFFN(CWheelHotSpot)
-DEFFN(CWheelSpin)
-DEFFN(CWheelSpinHorn)
-DEFFN(CGondolierBase)
-DEFFN(CGondolierChest)
-DEFFN(CGondolierFace)
-DEFFN(CGondolierMixer)
-DEFFN(CGondolierSlider)
-DEFFN(CMaitreDArmHolder)
-DEFFN(CMaitreDBody)
-DEFFN(CMaitreDLegs)
-DEFFN(CMaitreDProdReceptor)
-DEFFN(CParrotLobbyController)
-DEFFN(CParrotLobbyLinkUpdater)
-DEFFN(CParrotLobbyObject)
-DEFFN(CParrotLobbyViewObject)
-DEFFN(CParrotLoser)
-DEFFN(CParrotNutBowlActor)
-DEFFN(CParrotNutEater)
-DEFFN(CParrotPerchHolder)
-DEFFN(CParrotSuccUBus)
-DEFFN(CParrotTrigger)
-DEFFN(CPlayerMeetsParrot)
-DEFFN(CPET)
-DEFFN(CPETClass1)
-DEFFN(CPETClass2)
-DEFFN(CPETClass3)
-DEFFN(CPetControl)
-DEFFN(CPetDragChev)
-DEFFN(CPetGraphic)
-DEFFN(CPetGraphic2)
-DEFFN(PETLeaf)
-DEFFN(CPETLift)
-DEFFN(CPETMonitor)
-DEFFN(CPETPellerator)
-DEFFN(CPETPosition)
-DEFFN(CPETSentinal)
-DEFFN(CPETSounds)
-DEFFN(CPETTransition)
-DEFFN(CPETTransport)
-DEFFN(CPickUp)
-DEFFN(CPickUpBarGlass)
-DEFFN(CPickUpHose)
-DEFFN(CPickUpLemon)
-DEFFN(CPickUpSpeechCentre)
-DEFFN(CPickUpVisCentre)
-DEFFN(CBarShelfVisCentre)
-DEFFN(CLemonOnBar)
-DEFFN(CPlaceHolderItem)
-DEFFN(CTVOnBar)
-DEFFN(CArmchair)
-DEFFN(CBasin)
-DEFFN(CBedfoot)
-DEFFN(CBedhead)
-DEFFN(CChestOfDrawers)
-DEFFN(CDesk)
-DEFFN(CDeskchair)
-DEFFN(CDrawer)
-DEFFN(CSGTDoors)
-DEFFN(SGTNav)
-DEFFN(CSGTNavigation)
-DEFFN(CSGTRestaurantDoors)
-DEFFN(CSGTStateControl)
-DEFFN(CSGTStateRoom)
-DEFFN(CSGTTV)
-DEFFN(CSGTUpperDoorsSound)
-DEFFN(CToilet)
-DEFFN(CVase)
-DEFFN(CWashstand)
+DEFFN(CAnnounce);
+DEFFN(CAnnoyBarbot);
+DEFFN(CArbBackground);
+DEFFN(CArboretumGate);
+DEFFN(CAutoAnimate);
+DEFFN(CBarBell);
+DEFFN(CBarMenu);
+DEFFN(CBarMenuButton);
+DEFFN(CBelbotGetLight);
+DEFFN(CBilgeSuccUBus);
+DEFFN(CBomb);
+DEFFN(CBottomOfWellMonitor);
+DEFFN(CBowlUnlocker);
+DEFFN(CBrainSlot);
+DEFFN(CBridgeDoor);
+DEFFN(CBridgeView);
+DEFFN(CBrokenPellBase);
+DEFFN(CBrokenPellerator);
+DEFFN(CBrokenPelleratorFroz);
+DEFFN(CCage);
+DEFFN(CCallPellerator);
+DEFFN(CCaptainsWheel);
+DEFFN(CCDROM);
+DEFFN(CCDROMComputer);
+DEFFN(CCDROMTray);
+DEFFN(CCellPointButton);
+DEFFN(CChevCode);
+DEFFN(CChevPanel);
+DEFFN(CChickenCooler);
+DEFFN(CChickenDispensor);
+DEFFN(CCloseBrokenPel);
+DEFFN(CodeWheel);
+DEFFN(CComputer);
+DEFFN(CComputerScreen);
+DEFFN(CCookie);
+DEFFN(CCredits);
+DEFFN(CCreditsButton);
+DEFFN(CDeadArea);
+DEFFN(CDeskClickResponder);
+DEFFN(CDoorbotElevatorHandler);
+DEFFN(CDoorbotHomeHandler);
+DEFFN(CEarSweetBowl);
+DEFFN(CEjectPhonographButton);
+DEFFN(CElevatorActionArea);
+DEFFN(CEmmaControl);
+DEFFN(CEmptyNutBowl);
+DEFFN(CEndCreditText);
+DEFFN(CEndCredits);
+DEFFN(CEndExplodeShip);
+DEFFN(CEndGameCredits);
+DEFFN(CEndSequenceControl);
+DEFFN(CFan);
+DEFFN(CFanControl);
+DEFFN(CFanDecrease);
+DEFFN(CFanIncrease);
+DEFFN(CFanNoises);
+DEFFN(CFloorIndicator);
+DEFFN(CGamesConsole);
+DEFFN(CGetLiftEye2);
+DEFFN(CGlassSmasher);
+DEFFN(CHammerClip);
+DEFFN(CHammerDispensor);
+DEFFN(CHammerDispensorButton);
+DEFFN(CHeadSlot);
+DEFFN(CHeadSmashEvent);
+DEFFN(CHeadSmashLever);
+DEFFN(CHeadSpinner);
+DEFFN(CIdleSummoner);
+DEFFN(CLeaveSecClassState);
+DEFFN(CLemonDispensor);
+DEFFN(CLight);
+DEFFN(CLightSwitch);
+DEFFN(CLittleLiftButton);
+DEFFN(CLongStickDispenser);
+DEFFN(CMissiveOMat);
+DEFFN(CMissiveOMatButton);
+DEFFN(CMovieTester);
+DEFFN(CMusicalInstrument);
+DEFFN(CMusicConsoleButton);
+DEFFN(CMusicRoomPhonograph);
+DEFFN(CMusicRoomStopPhonographButton);
+DEFFN(CMusicSystemLock);
+DEFFN(CNavHelmet);
+DEFFN(CNavigationComputer);
+DEFFN(CNoNutBowl);
+DEFFN(CNoseHolder);
+DEFFN(CNullPortHole);
+DEFFN(CNutReplacer);
+DEFFN(CPetDisabler);
+DEFFN(CPhonograph);
+DEFFN(CPhonographLid);
+DEFFN(CPlayMusicButton);
+DEFFN(CPlayOnAct);
+DEFFN(CPortHole);
+DEFFN(CRecordPhonographButton);
+DEFFN(CReplacementEar);
+DEFFN(CReservedTable);
+DEFFN(CRestaurantCylinderHolder);
+DEFFN(CRestaurantPhonograph);
+DEFFN(CSauceDispensor);
+DEFFN(CSearchPoint);
+DEFFN(CSeasonBackground);
+DEFFN(CSeasonBarrel);
+DEFFN(CSeasonalAdjustment);
+DEFFN(CServiceElevatorWindow);
+DEFFN(CShipSetting);
+DEFFN(CShipSettingButton);
+DEFFN(CShowCellpoints);
+DEFFN(CSpeechDispensor);
+DEFFN(CSplashAnimation);
+DEFFN(CStarlingPuret);
+DEFFN(CStartAction);
+DEFFN(CStopPhonographButton);
+DEFFN(CSUBGlass);
+DEFFN(CSUBWrapper);
+DEFFN(CSweetBowl);
+DEFFN(CTelevision);
+DEFFN(CThirdClassCanal);
+DEFFN(CThrowTVDownWell);
+DEFFN(CTitaniaStillControl);
+DEFFN(CTOWParrotNav);
+DEFFN(CUpLighter);
+DEFFN(CUselessLever);
+DEFFN(CVolumeControl);
+DEFFN(CWheelButton);
+DEFFN(CWheelHotSpot);
+DEFFN(CWheelSpin);
+DEFFN(CWheelSpinHorn);
+DEFFN(CGondolierBase);
+DEFFN(CGondolierChest);
+DEFFN(CGondolierFace);
+DEFFN(CGondolierMixer);
+DEFFN(CGondolierSlider);
+DEFFN(CMaitreDArmHolder);
+DEFFN(CMaitreDBody);
+DEFFN(CMaitreDLegs);
+DEFFN(CMaitreDProdReceptor);
+DEFFN(CParrotLobbyController);
+DEFFN(CParrotLobbyLinkUpdater);
+DEFFN(CParrotLobbyObject);
+DEFFN(CParrotLobbyViewObject);
+DEFFN(CParrotLoser);
+DEFFN(CParrotNutBowlActor);
+DEFFN(CParrotNutEater);
+DEFFN(CParrotPerchHolder);
+DEFFN(CParrotSuccUBus);
+DEFFN(CParrotTrigger);
+DEFFN(CPlayerMeetsParrot);
+DEFFN(CPET);
+DEFFN(CPETClass1);
+DEFFN(CPETClass2);
+DEFFN(CPETClass3);
+DEFFN(CPetControl);
+DEFFN(CPetDragChev);
+DEFFN(CPetGraphic);
+DEFFN(CPetGraphic2);
+DEFFN(PETLeaf);
+DEFFN(CPETLift);
+DEFFN(CPETMonitor);
+DEFFN(CPETPellerator);
+DEFFN(CPETPosition);
+DEFFN(CPETSentinal);
+DEFFN(CPETSounds);
+DEFFN(CPETTransition);
+DEFFN(CPETTransport);
+DEFFN(CPickUp);
+DEFFN(CPickUpBarGlass);
+DEFFN(CPickUpHose);
+DEFFN(CPickUpLemon);
+DEFFN(CPickUpSpeechCentre);
+DEFFN(CPickUpVisCentre);
+DEFFN(CBarShelfVisCentre);
+DEFFN(CLemonOnBar);
+DEFFN(CPlaceHolderItem);
+DEFFN(CTVOnBar);
+DEFFN(CArmchair);
+DEFFN(CBasin);
+DEFFN(CBedfoot);
+DEFFN(CBedhead);
+DEFFN(CChestOfDrawers);
+DEFFN(CDesk);
+DEFFN(CDeskchair);
+DEFFN(CDrawer);
+DEFFN(CSGTDoors);
+DEFFN(SGTNav);
+DEFFN(CSGTNavigation);
+DEFFN(CSGTRestaurantDoors);
+DEFFN(CSGTStateControl);
+DEFFN(CSGTStateRoom);
+DEFFN(CSGTTV);
+DEFFN(CSGTUpperDoorsSound);
+DEFFN(CToilet);
+DEFFN(CVase);
+DEFFN(CWashstand);
 
-DEFFN(CGondolier)
-DEFFN(CLift)
-DEFFN(CLiftindicator)
-DEFFN(CPellerator)
-DEFFN(CServiceElevator)
-DEFFN(CTransport)
+DEFFN(CGondolier);
+DEFFN(CLift);
+DEFFN(CLiftindicator);
+DEFFN(CPellerator);
+DEFFN(CServiceElevator);
+DEFFN(CTransport);
 
-DEFFN(CActButton)
-DEFFN(CChangesSeasonButton)
-DEFFN(CChevLeftOff)
-DEFFN(CChevLeftOn)
-DEFFN(CChevRightOff)
-DEFFN(CChevRightOn)
-DEFFN(CChevSendRecSwitch)
-DEFFN(CChevSwitch)
-DEFFN(CEditControl)
-DEFFN(CElevatorButton)
-DEFFN(CGetFromSucc)
-DEFFN(CHelmetOnOff)
-DEFFN(CHomePhoto)
-DEFFN(CIconNavAction)
-DEFFN(CIconNavButt)
-DEFFN(CIconNavDown)
-DEFFN(CIconNavImage)
-DEFFN(CIconNavLeft)
-DEFFN(CIconNavReceive)
-DEFFN(CIconNavRight)
-DEFFN(CIconNavSend)
-DEFFN(CIconNavUp)
-DEFFN(CKeybrdButt)
-DEFFN(CMoveObjectButton)
-DEFFN(CMusicControl)
-DEFFN(CMusicSlider)
-DEFFN(CMusicSliderPitch)
-DEFFN(CMusicSliderSpeed)
-DEFFN(CMusicSwitch)
-DEFFN(CMusicSwitchInversion)
-DEFFN(CMusicSwitchReverse)
-DEFFN(CMusicVoiceMute)
-DEFFN(CPetModeOff)
-DEFFN(CPetModeOn)
-DEFFN(CPetModePanel)
-DEFFN(CPetPannel1)
-DEFFN(CPetPannel2)
-DEFFN(CPetPannel3)
-DEFFN(CSendToSucc)
-DEFFN(CSGTSelector)
-DEFFN(CSliderButton)
-DEFFN(CSmallChevLeftOff)
-DEFFN(CSmallChevLeftOn)
-DEFFN(CSmallChevRightOff)
-DEFFN(CSmallChevRightOn)
-DEFFN(CStatusChangeButton)
-DEFFN(CSTButton)
-DEFFN(CTextDown)
-DEFFN(CTextSkrew)
-DEFFN(CTextUp)
-DEFFN(CToggleButton)
-DEFFN(CToggleSwitch)
+DEFFN(CActButton);
+DEFFN(CChangesSeasonButton);
+DEFFN(CChevLeftOff);
+DEFFN(CChevLeftOn);
+DEFFN(CChevRightOff);
+DEFFN(CChevRightOn);
+DEFFN(CChevSendRecSwitch);
+DEFFN(CChevSwitch);
+DEFFN(CEditControl);
+DEFFN(CElevatorButton);
+DEFFN(CGetFromSucc);
+DEFFN(CHelmetOnOff);
+DEFFN(CHomePhoto);
+DEFFN(CIconNavAction);
+DEFFN(CIconNavButt);
+DEFFN(CIconNavDown);
+DEFFN(CIconNavImage);
+DEFFN(CIconNavLeft);
+DEFFN(CIconNavReceive);
+DEFFN(CIconNavRight);
+DEFFN(CIconNavSend);
+DEFFN(CIconNavUp);
+DEFFN(CKeybrdButt);
+DEFFN(CMoveObjectButton);
+DEFFN(CMusicControl);
+DEFFN(CMusicSlider);
+DEFFN(CMusicSliderPitch);
+DEFFN(CMusicSliderSpeed);
+DEFFN(CMusicSwitch);
+DEFFN(CMusicSwitchInversion);
+DEFFN(CMusicSwitchReverse);
+DEFFN(CMusicVoiceMute);
+DEFFN(CPetModeOff);
+DEFFN(CPetModeOn);
+DEFFN(CPetModePanel);
+DEFFN(CPetPannel1);
+DEFFN(CPetPannel2);
+DEFFN(CPetPannel3);
+DEFFN(CSendToSucc);
+DEFFN(CSGTSelector);
+DEFFN(CSliderButton);
+DEFFN(CSmallChevLeftOff);
+DEFFN(CSmallChevLeftOn);
+DEFFN(CSmallChevRightOff);
+DEFFN(CSmallChevRightOn);
+DEFFN(CStatusChangeButton);
+DEFFN(CSTButton);
+DEFFN(CTextDown);
+DEFFN(CTextSkrew);
+DEFFN(CTextUp);
+DEFFN(CToggleButton);
+DEFFN(CToggleSwitch);
 
-DEFFN(CActMsg)
-DEFFN(CActivationmsg)
-DEFFN(CAddHeadPieceMsg)
-DEFFN(CAnimateMaitreDMsg)
-DEFFN(CArboretumGateMsg)
-DEFFN(CArmPickedUpFromTableMsg)
-DEFFN(CAutoSoundEvent)
-DEFFN(CBilgeAutoSoundEvent)
-DEFFN(CBilgeDispensorEvent)
-DEFFN(CBodyInBilgeRoomMsg)
-DEFFN(CBowlStateChange)
-DEFFN(CCarryObjectArrivedMsg)
-DEFFN(CChangeMusicMsg)
-DEFFN(CChangeSeasonMsg)
-DEFFN(CCheckAllPossibleCodes)
-DEFFN(CCheckChevCode)
-DEFFN(CChildDragEndMsg)
-DEFFN(CChildDragMoveMsg)
-DEFFN(CChildDragStartMsg)
-DEFFN(CClearChevPanelBits)
-DEFFN(CCorrectMusicPlayedMsg)
-DEFFN(CCreateMusicPlayerMsg)
-DEFFN(CCylinderHolderReadyMsg)
-DEFFN(CDeactivationMsg)
-DEFFN(CDeliverCCarryMsg)
-DEFFN(CDisableMaitreDProdReceptor)
-DEFFN(CDismissBotMsg)
-DEFFN(CDoffNavHelmet)
-DEFFN(CDonNavHelmet)
-DEFFN(CDoorAutoSoundEvent)
-DEFFN(CDoorbotNeededInElevatorMsg)
-DEFFN(CDoorbotNeededInHomeMsg)
-DEFFN(CDropObjectMsg)
-DEFFN(CDropZoneGotObjectMsg)
-DEFFN(CDropZoneLostObjectMsg)
-DEFFN(CEditControlMsg)
-DEFFN(CEnterNodeMsg)
-DEFFN(CEnterRoomMsg)
-DEFFN(CEnterViewMsg)
-DEFFN(CEjectCylinderMsg)
-DEFFN(CErasePhonographCylinderMsg)
-DEFFN(CFrameMsg)
-DEFFN(CFreshenCookieMsg)
-DEFFN(CGetChevClassBits)
-DEFFN(CGetChevClassNum)
-DEFFN(CGetChevCodeFromRoomNameMsg)
-DEFFN(CGetChevFloorBits)
-DEFFN(CGetChevFloorNum)
-DEFFN(CGetChevLiftBits)
-DEFFN(CGetChevLiftNum)
-DEFFN(CGetChevRoomBits)
-DEFFN(CGetChevRoomNum)
-DEFFN(CHoseConnectedMsg)
-DEFFN(CInitializeAnimMsg)
-DEFFN(CIsEarBowlPuzzleDone)
-DEFFN(CIsHookedOnMsg)
-DEFFN(CIsParrotPresentMsg)
-DEFFN(CKeyCharMsg)
-DEFFN(CLeaveNodeMsg)
-DEFFN(CLeaveRoomMsg)
-DEFFN(CLeaveViewMsg)
-DEFFN(CLemonFallsFromTreeMsg)
-DEFFN(CLightsMsg)
-DEFFN(CLoadSuccessMsg)
-DEFFN(CLockPhonographMsg)
-DEFFN(CMaitreDDefeatedMsg)
-DEFFN(CMaitreDHappyMsg)
-DEFFN(CMessage)
-DEFFN(CMissiveOMatActionMsg)
-DEFFN(CMouseMsg)
-DEFFN(CMouseMoveMsg)
-DEFFN(CMouseButtonMsg)
-DEFFN(CMouseButtonDownMsg)
-DEFFN(CMouseButtonUpMsg)
-DEFFN(CMouseDoubleClickMsg)
-DEFFN(CMouseDragMsg)
-DEFFN(CMouseDragStartMsg)
-DEFFN(CMouseDragMoveMsg)
-DEFFN(CMouseDragEndMsg)
-DEFFN(CMoveToStartPosMsg)
-DEFFN(CMovieEndMsg)
-DEFFN(CMovieFrameMsg)
-DEFFN(CMusicHasStartedMsg)
-DEFFN(CMusicHasStoppedMsg)
-DEFFN(CMusicSettingChangedMsg)
-DEFFN(CNPCPlayAnimationMsg)
-DEFFN(CNPCPlayIdleAnimationMsg)
-DEFFN(CNPCPlayTalkingAnimationMsg)
-DEFFN(CNPCQueueIdleAnimMsg)
-DEFFN(CNutPuzzleMsg)
-DEFFN(COnSummonBotMsg)
-DEFFN(COpeningCreditsMsg)
-DEFFN(CPETDeliverMsg)
-DEFFN(CPETGainedObjectMsg)
-DEFFN(CPETHelmetOnOffMsg)
-DEFFN(CPETKeyboardOnOffMsg)
-DEFFN(CPETLostObjectMsg)
-DEFFN(CPETObjectSelectedMsg)
-DEFFN(CPETObjectStateMsg)
-DEFFN(CPETPhotoOnOffMsg)
-DEFFN(CPETPlaySoundMsg)
-DEFFN(CPETReceiveMsg)
-DEFFN(CPETSetStarDestinationMsg)
-DEFFN(CPETStarFieldLockMsg)
-DEFFN(CPETStereoFieldOnOffMsg)
-DEFFN(CPETTargetMsg)
-DEFFN(CPETUpMsg)
-DEFFN(CPETDownMsg)
-DEFFN(CPETLeftMsg)
-DEFFN(CPETRightMsg)
-DEFFN(CPETActivateMsg)
-DEFFN(CPanningAwayFromParrotMsg)
-DEFFN(CParrotSpeakMsg)
-DEFFN(CParrotTriesChickenMsg)
-DEFFN(CPassOnDragStartMsg)
-DEFFN(CPhonographPlayMsg)
-DEFFN(CPhonographReadyToPlayMsg)
-DEFFN(CPhonographRecordMsg)
-DEFFN(CPhonographStopMsg)
-DEFFN(CPlayRangeMsg)
-DEFFN(CPlayerTriesRestaurantTableMsg)
-DEFFN(CPreEnterNodeMsg)
-DEFFN(CPreEnterRoomMsg)
-DEFFN(CPreEnterViewMsg)
-DEFFN(CPreSaveMsg)
-DEFFN(CProdMaitreDMsg)
-DEFFN(CPumpingMsg)
-DEFFN(CPutBotBackInHisBoxMsg)
-DEFFN(CPutParrotBackMsg)
-DEFFN(CPuzzleSolvedMsg)
-DEFFN(CQueryCylinderHolderMsg)
-DEFFN(CQueryCylinderMsg)
-DEFFN(CQueryCylinderNameMsg)
-DEFFN(CQueryCylinderTypeMsg)
-DEFFN(CQueryMusicControlSettingMsg)
-DEFFN(CQueryPhonographState)
-DEFFN(CRecordOntoCylinderMsg)
-DEFFN(CRemoveFromGameMsg)
-DEFFN(CReplaceBowlAndNutsMsg)
-DEFFN(CRestaurantMusicChanged)
-DEFFN(CSendCCarryMsg)
-DEFFN(CSenseWorkingMsg)
-DEFFN(CServiceElevatorDoor)
-DEFFN(CServiceElevatorFloorChangeMsg)
-DEFFN(CServiceElevatorFloorRequestMsg)
-DEFFN(CServiceElevatorMsg)
-DEFFN(CSetChevButtonImageMsg)
-DEFFN(CSetChevClassBits)
-DEFFN(CSetChevFloorBits)
-DEFFN(CSetChevLiftBits)
-DEFFN(CSetChevPanelBitMsg)
-DEFFN(CSetChevPanelButtonsMsg)
-DEFFN(CSetChevRoomBits)
-DEFFN(CSetFrameMsg)
-DEFFN(CSetMusicControlsMsg)
-DEFFN(CSetVarMsg)
-DEFFN(CSetVolumeMsg)
-DEFFN(CShipSettingMsg)
-DEFFN(CShowTextMsg)
-DEFFN(CSignalObject)
-DEFFN(CSpeechFallsFromTreeMsg)
-DEFFN(CStartMusicMsg)
-DEFFN(CStatusChangeMsg)
-DEFFN(CStopMusicMsg)
-DEFFN(CSubAcceptCCarryMsg)
-DEFFN(CSubDeliverCCarryMsg)
-DEFFN(CSubSendCCarryMsg)
-DEFFN(CSUBTransition)
-DEFFN(CSubTurnOffMsg)
-DEFFN(CSubTurnOnMsg)
-DEFFN(CSummonBotMsg)
-DEFFN(CSummonBotQueryMsg)
-DEFFN(CTakeHeadPieceMsg)
-DEFFN(CTextInputMsg)
-DEFFN(CTimeDilationMsg)
-DEFFN(CTimeMsg)
-DEFFN(CTimerMsg)
-DEFFN(CTitleSequenceEndedMsg)
-DEFFN(CTransitMsg)
-DEFFN(CTranslateObjectMsg)
-DEFFN(CTransportMsg)
-DEFFN(CTriggerAutoMusicPlayerMsg)
-DEFFN(CTriggerNPCEvent)
-DEFFN(CTrueTalkGetAnimSetMsg)
-DEFFN(CTrueTalkGetAssetDetailsMsg)
-DEFFN(CTrueTalkGetStateValueMsg)
-DEFFN(CTrueTalkNotifySpeechEndedMsg)
-DEFFN(CTrueTalkNotifySpeechStartedMsg)
-DEFFN(CTrueTalkQueueUpAnimSetMsg)
-DEFFN(CTrueTalkSelfQueueAnimSetMsg)
-DEFFN(CTrueTalkTriggerActionMsg)
-DEFFN(CTurnOff)
-DEFFN(CTurnOn)
-DEFFN(CUse)
-DEFFN(CUseWithCharMsg)
-DEFFN(CUseWithOtherMsg)
-DEFFN(CVirtualKeyCharMsg)
-DEFFN(CVisibleMsg)
+DEFFN(CActMsg);
+DEFFN(CActivationmsg);
+DEFFN(CAddHeadPieceMsg);
+DEFFN(CAnimateMaitreDMsg);
+DEFFN(CArboretumGateMsg);
+DEFFN(CArmPickedUpFromTableMsg);
+DEFFN(CAutoSoundEvent);
+DEFFN(CBilgeAutoSoundEvent);
+DEFFN(CBilgeDispensorEvent);
+DEFFN(CBodyInBilgeRoomMsg);
+DEFFN(CBowlStateChange);
+DEFFN(CCarryObjectArrivedMsg);
+DEFFN(CChangeMusicMsg);
+DEFFN(CChangeSeasonMsg);
+DEFFN(CCheckAllPossibleCodes);
+DEFFN(CCheckChevCode);
+DEFFN(CChildDragEndMsg);
+DEFFN(CChildDragMoveMsg);
+DEFFN(CChildDragStartMsg);
+DEFFN(CClearChevPanelBits);
+DEFFN(CCorrectMusicPlayedMsg);
+DEFFN(CCreateMusicPlayerMsg);
+DEFFN(CCylinderHolderReadyMsg);
+DEFFN(CDeactivationMsg);
+DEFFN(CDeliverCCarryMsg);
+DEFFN(CDisableMaitreDProdReceptor);
+DEFFN(CDismissBotMsg);
+DEFFN(CDoffNavHelmet);
+DEFFN(CDonNavHelmet);
+DEFFN(CDoorAutoSoundEvent);
+DEFFN(CDoorbotNeededInElevatorMsg);
+DEFFN(CDoorbotNeededInHomeMsg);
+DEFFN(CDropObjectMsg);
+DEFFN(CDropZoneGotObjectMsg);
+DEFFN(CDropZoneLostObjectMsg);
+DEFFN(CEditControlMsg);
+DEFFN(CEnterNodeMsg);
+DEFFN(CEnterRoomMsg);
+DEFFN(CEnterViewMsg);
+DEFFN(CEjectCylinderMsg);
+DEFFN(CErasePhonographCylinderMsg);
+DEFFN(CFrameMsg);
+DEFFN(CFreshenCookieMsg);
+DEFFN(CGetChevClassBits);
+DEFFN(CGetChevClassNum);
+DEFFN(CGetChevCodeFromRoomNameMsg);
+DEFFN(CGetChevFloorBits);
+DEFFN(CGetChevFloorNum);
+DEFFN(CGetChevLiftBits);
+DEFFN(CGetChevLiftNum);
+DEFFN(CGetChevRoomBits);
+DEFFN(CGetChevRoomNum);
+DEFFN(CHoseConnectedMsg);
+DEFFN(CInitializeAnimMsg);
+DEFFN(CIsEarBowlPuzzleDone);
+DEFFN(CIsHookedOnMsg);
+DEFFN(CIsParrotPresentMsg);
+DEFFN(CKeyCharMsg);
+DEFFN(CLeaveNodeMsg);
+DEFFN(CLeaveRoomMsg);
+DEFFN(CLeaveViewMsg);
+DEFFN(CLemonFallsFromTreeMsg);
+DEFFN(CLightsMsg);
+DEFFN(CLoadSuccessMsg);
+DEFFN(CLockPhonographMsg);
+DEFFN(CMaitreDDefeatedMsg);
+DEFFN(CMaitreDHappyMsg);
+DEFFN(CMessage);
+DEFFN(CMissiveOMatActionMsg);
+DEFFN(CMouseMsg);
+DEFFN(CMouseMoveMsg);
+DEFFN(CMouseButtonMsg);
+DEFFN(CMouseButtonDownMsg);
+DEFFN(CMouseButtonUpMsg);
+DEFFN(CMouseDoubleClickMsg);
+DEFFN(CMouseDragMsg);
+DEFFN(CMouseDragStartMsg);
+DEFFN(CMouseDragMoveMsg);
+DEFFN(CMouseDragEndMsg);
+DEFFN(CMoveToStartPosMsg);
+DEFFN(CMovieEndMsg);
+DEFFN(CMovieFrameMsg);
+DEFFN(CMusicHasStartedMsg);
+DEFFN(CMusicHasStoppedMsg);
+DEFFN(CMusicSettingChangedMsg);
+DEFFN(CNPCPlayAnimationMsg);
+DEFFN(CNPCPlayIdleAnimationMsg);
+DEFFN(CNPCPlayTalkingAnimationMsg);
+DEFFN(CNPCQueueIdleAnimMsg);
+DEFFN(CNutPuzzleMsg);
+DEFFN(COnSummonBotMsg);
+DEFFN(COpeningCreditsMsg);
+DEFFN(CPETDeliverMsg);
+DEFFN(CPETGainedObjectMsg);
+DEFFN(CPETHelmetOnOffMsg);
+DEFFN(CPETKeyboardOnOffMsg);
+DEFFN(CPETLostObjectMsg);
+DEFFN(CPETObjectSelectedMsg);
+DEFFN(CPETObjectStateMsg);
+DEFFN(CPETPhotoOnOffMsg);
+DEFFN(CPETPlaySoundMsg);
+DEFFN(CPETReceiveMsg);
+DEFFN(CPETSetStarDestinationMsg);
+DEFFN(CPETStarFieldLockMsg);
+DEFFN(CPETStereoFieldOnOffMsg);
+DEFFN(CPETTargetMsg);
+DEFFN(CPETUpMsg);
+DEFFN(CPETDownMsg);
+DEFFN(CPETLeftMsg);
+DEFFN(CPETRightMsg);
+DEFFN(CPETActivateMsg);
+DEFFN(CPanningAwayFromParrotMsg);
+DEFFN(CParrotSpeakMsg);
+DEFFN(CParrotTriesChickenMsg);
+DEFFN(CPassOnDragStartMsg);
+DEFFN(CPhonographPlayMsg);
+DEFFN(CPhonographReadyToPlayMsg);
+DEFFN(CPhonographRecordMsg);
+DEFFN(CPhonographStopMsg);
+DEFFN(CPlayRangeMsg);
+DEFFN(CPlayerTriesRestaurantTableMsg);
+DEFFN(CPreEnterNodeMsg);
+DEFFN(CPreEnterRoomMsg);
+DEFFN(CPreEnterViewMsg);
+DEFFN(CPreSaveMsg);
+DEFFN(CProdMaitreDMsg);
+DEFFN(CPumpingMsg);
+DEFFN(CPutBotBackInHisBoxMsg);
+DEFFN(CPutParrotBackMsg);
+DEFFN(CPuzzleSolvedMsg);
+DEFFN(CQueryCylinderHolderMsg);
+DEFFN(CQueryCylinderMsg);
+DEFFN(CQueryCylinderNameMsg);
+DEFFN(CQueryCylinderTypeMsg);
+DEFFN(CQueryMusicControlSettingMsg);
+DEFFN(CQueryPhonographState);
+DEFFN(CRecordOntoCylinderMsg);
+DEFFN(CRemoveFromGameMsg);
+DEFFN(CReplaceBowlAndNutsMsg);
+DEFFN(CRestaurantMusicChanged);
+DEFFN(CSendCCarryMsg);
+DEFFN(CSenseWorkingMsg);
+DEFFN(CServiceElevatorDoor);
+DEFFN(CServiceElevatorFloorChangeMsg);
+DEFFN(CServiceElevatorFloorRequestMsg);
+DEFFN(CServiceElevatorMsg);
+DEFFN(CSetChevButtonImageMsg);
+DEFFN(CSetChevClassBits);
+DEFFN(CSetChevFloorBits);
+DEFFN(CSetChevLiftBits);
+DEFFN(CSetChevPanelBitMsg);
+DEFFN(CSetChevPanelButtonsMsg);
+DEFFN(CSetChevRoomBits);
+DEFFN(CSetFrameMsg);
+DEFFN(CSetMusicControlsMsg);
+DEFFN(CSetVarMsg);
+DEFFN(CSetVolumeMsg);
+DEFFN(CShipSettingMsg);
+DEFFN(CShowTextMsg);
+DEFFN(CSignalObject);
+DEFFN(CSpeechFallsFromTreeMsg);
+DEFFN(CStartMusicMsg);
+DEFFN(CStatusChangeMsg);
+DEFFN(CStopMusicMsg);
+DEFFN(CSubAcceptCCarryMsg);
+DEFFN(CSubDeliverCCarryMsg);
+DEFFN(CSubSendCCarryMsg);
+DEFFN(CSUBTransition);
+DEFFN(CSubTurnOffMsg);
+DEFFN(CSubTurnOnMsg);
+DEFFN(CSummonBotMsg);
+DEFFN(CSummonBotQueryMsg);
+DEFFN(CTakeHeadPieceMsg);
+DEFFN(CTextInputMsg);
+DEFFN(CTimeDilationMsg);
+DEFFN(CTimeMsg);
+DEFFN(CTimerMsg);
+DEFFN(CTitleSequenceEndedMsg);
+DEFFN(CTransitMsg);
+DEFFN(CTranslateObjectMsg);
+DEFFN(CTransportMsg);
+DEFFN(CTriggerAutoMusicPlayerMsg);
+DEFFN(CTriggerNPCEvent);
+DEFFN(CTrueTalkGetAnimSetMsg);
+DEFFN(CTrueTalkGetAssetDetailsMsg);
+DEFFN(CTrueTalkGetStateValueMsg);
+DEFFN(CTrueTalkNotifySpeechEndedMsg);
+DEFFN(CTrueTalkNotifySpeechStartedMsg);
+DEFFN(CTrueTalkQueueUpAnimSetMsg);
+DEFFN(CTrueTalkSelfQueueAnimSetMsg);
+DEFFN(CTrueTalkTriggerActionMsg);
+DEFFN(CTurnOff);
+DEFFN(CTurnOn);
+DEFFN(CUse);
+DEFFN(CUseWithCharMsg);
+DEFFN(CUseWithOtherMsg);
+DEFFN(CVirtualKeyCharMsg);
+DEFFN(CVisibleMsg);
 
-DEFFN(CEnterBombRoom)
-DEFFN(CEnterBridge)
-DEFFN(CEnterExitFirstClassState)
-DEFFN(CEnterExitMiniLift)
-DEFFN(CEnterExitSecClassMiniLift)
-DEFFN(CEnterExitView)
-DEFFN(CEnterSecClassState)
-DEFFN(CExitArboretum)
-DEFFN(CExitBridge)
-DEFFN(CExitLift)
-DEFFN(CExitPellerator)
-DEFFN(CExitStateRoom)
-DEFFN(CExitTiania)
-DEFFN(CMovePlayerInParrotRoom)
-DEFFN(CMovePlayerTo)
-DEFFN(CMovePlayerToFrom)
-DEFFN(CMultiMove)
-DEFFN(CPanFromPel)
-DEFFN(CRestaurantPanHandler)
-DEFFN(CScraliontisTable)
-DEFFN(CRestrictedMove)
-DEFFN(CTripDownCanal)
+DEFFN(CEnterBombRoom);
+DEFFN(CEnterBridge);
+DEFFN(CEnterExitFirstClassState);
+DEFFN(CEnterExitMiniLift);
+DEFFN(CEnterExitSecClassMiniLift);
+DEFFN(CEnterExitView);
+DEFFN(CEnterSecClassState);
+DEFFN(CExitArboretum);
+DEFFN(CExitBridge);
+DEFFN(CExitLift);
+DEFFN(CExitPellerator);
+DEFFN(CExitStateRoom);
+DEFFN(CExitTiania);
+DEFFN(CMovePlayerInParrotRoom);
+DEFFN(CMovePlayerTo);
+DEFFN(CMovePlayerToFrom);
+DEFFN(CMultiMove);
+DEFFN(CPanFromPel);
+DEFFN(CRestaurantPanHandler);
+DEFFN(CScraliontisTable);
+DEFFN(CRestrictedMove);
+DEFFN(CTripDownCanal);
 
-DEFFN(CBarbot)
-DEFFN(CBellBot)
-DEFFN(CCallBot)
-DEFFN(CCharacter)
-DEFFN(CDeskbot)
-DEFFN(CDoorbot)
-DEFFN(CLiftBot)
-DEFFN(CMaitreD)
-DEFFN(CMobile)
-DEFFN(CParrot)
-DEFFN(CRobotController)
-DEFFN(CStarlings)
-DEFFN(CSummonBots)
-DEFFN(CSuccUBus)
-DEFFN(CTitania)
-DEFFN(CTrueTalkNPC)
-DEFFN(CAutoMusicPlayer)
-DEFFN(CAutoMusicPlayerBase)
-DEFFN(CAutoSoundPlayer)
-DEFFN(CAutoSoundPlayerADSR)
-DEFFN(CBackgroundSoundMaker)
-DEFFN(CBirdSong)
-DEFFN(CDomeFromTopOfWell)
-DEFFN(CEnterViewTogglesOtherMusic)
-DEFFN(CGondolierSong)
-DEFFN(CMusicPlayer)
-DEFFN(CNodeAutoSoundPlayer)
-DEFFN(CRestrictedAutoMusicPlayer)
-DEFFN(CRoomAutoSoundPlayer)
-DEFFN(CRoomTriggerAutoMusicPlayer)
-DEFFN(CSeasonNoises)
-DEFFN(CSeasonalMusicPlayer)
-DEFFN(CTitaniaSpeech)
-DEFFN(CTriggerAutoMusicPlayer)
-DEFFN(CViewAutoSoundPlayer)
-DEFFN(CViewTogglesOtherMusic)
-DEFFN(CWaterLappingSounds)
-DEFFN(CStarControl)
-DEFFN(CTimeEventInfo)
+DEFFN(CBarbot);
+DEFFN(CBellBot);
+DEFFN(CCallBot);
+DEFFN(CCharacter);
+DEFFN(CDeskbot);
+DEFFN(CDoorbot);
+DEFFN(CLiftBot);
+DEFFN(CMaitreD);
+DEFFN(CMobile);
+DEFFN(CParrot);
+DEFFN(CRobotController);
+DEFFN(CStarlings);
+DEFFN(CSummonBots);
+DEFFN(CSuccUBus);
+DEFFN(CTitania);
+DEFFN(CTrueTalkNPC);
+DEFFN(CAutoMusicPlayer);
+DEFFN(CAutoMusicPlayerBase);
+DEFFN(CAutoSoundPlayer);
+DEFFN(CAutoSoundPlayerADSR);
+DEFFN(CBackgroundSoundMaker);
+DEFFN(CBirdSong);
+DEFFN(CDomeFromTopOfWell);
+DEFFN(CEnterViewTogglesOtherMusic);
+DEFFN(CGondolierSong);
+DEFFN(CMusicPlayer);
+DEFFN(CNodeAutoSoundPlayer);
+DEFFN(CRestrictedAutoMusicPlayer);
+DEFFN(CRoomAutoSoundPlayer);
+DEFFN(CRoomTriggerAutoMusicPlayer);
+DEFFN(CSeasonNoises);
+DEFFN(CSeasonalMusicPlayer);
+DEFFN(CTitaniaSpeech);
+DEFFN(CTriggerAutoMusicPlayer);
+DEFFN(CViewAutoSoundPlayer);
+DEFFN(CViewTogglesOtherMusic);
+DEFFN(CWaterLappingSounds);
+DEFFN(CStarControl);
+DEFFN(CTimeEventInfo);
 
 void CSaveableObject::initClassList() {
 	_classDefs = new Common::List<ClassDef *>();