aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/core/list.h7
-rw-r--r--engines/titanic/core/saveable_object.cpp1064
-rw-r--r--engines/titanic/core/saveable_object.h2
-rw-r--r--engines/titanic/image.h1
-rw-r--r--engines/titanic/messages/door_auto_sound_event.h2
-rw-r--r--engines/titanic/messages/pet_messages.h2
-rw-r--r--engines/titanic/module.mk1
-rw-r--r--engines/titanic/pet_control/pet_control_sub_base.h1
-rw-r--r--engines/titanic/pet_control/pet_val_base.h1
-rw-r--r--engines/titanic/simple_file.cpp6
10 files changed, 546 insertions, 541 deletions
diff --git a/engines/titanic/core/list.h b/engines/titanic/core/list.h
index d990aec2fa..00474b9f23 100644
--- a/engines/titanic/core/list.h
+++ b/engines/titanic/core/list.h
@@ -70,7 +70,7 @@ public:
file->writeNumberLine(Common::List<T *>::size(), indent);
// Iterate through writing entries
- Common::List<T *>::const_iterator i;
+ typename Common::List<typename T *>::const_iterator i;
for (i = Common::List<T *>::begin(); i != Common::List<T *>::end(); ++i) {
const ListItem *item = *i;
item->saveHeader(file, indent);
@@ -115,7 +115,8 @@ public:
* Clear the list and destroy any items in it
*/
void destroyContents() {
- for (Common::List<T *>::iterator i = Common::List<T *>::begin();
+ typename Common::List<T *>::iterator i;
+ for (i = Common::List<T *>::begin();
i != Common::List<T *>::end(); ++i) {
CSaveableObject *obj = *i;
delete obj;
@@ -127,7 +128,7 @@ public:
/**
* Add a new item to the list of the type the list contains
*/
- T *List::add() {
+ T *add() {
T *item = new T();
Common::List<T *>::push_back(item);
return item;
diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp
index dcd47b78a4..5a60798d9f 100644
--- a/engines/titanic/core/saveable_object.cpp
+++ b/engines/titanic/core/saveable_object.cpp
@@ -399,546 +399,546 @@ Common::HashMap<Common::String, CSaveableObject::CreateFunction> *
#define DEFFN(T) CSaveableObject *Function##T() { return new T(); }
#define ADDFN(T) (*_classList)[#T] = Function##T
-DEFFN(CArm);
-DEFFN(CAuditoryCentre);
-DEFFN(CBowlEar);
-DEFFN(CBrain);
-DEFFN(CBridgePiece);
-DEFFN(CCarry);
-DEFFN(CCarryParrot);
-DEFFN(CCentralCore);
-DEFFN(CChicken);
-DEFFN(CChickenCooler);
-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(CChickenCooler)
+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(CLinkItem);
-DEFFN(CMessageTarget);
-DEFFN(CMovieClip);
-DEFFN(CMovieClipList);
-DEFFN(CMultiDropTarget);
-DEFFN(CNodeItem);
-DEFFN(CProjectItem);
-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(CLinkItem)
+DEFFN(CMessageTarget)
+DEFFN(CMovieClip)
+DEFFN(CMovieClipList)
+DEFFN(CMultiDropTarget)
+DEFFN(CNodeItem)
+DEFFN(CProjectItem)
+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(CBridgeView);
+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(CBridgeView)
DEFFN(CBrokenPellBase)
-DEFFN(CBrokenPellerator);
-DEFFN(CBrokenPelleratorFroz);
-DEFFN(CCage);
-DEFFN(CCallPellerator);
-DEFFN(CCaptainsWheel);
-DEFFN(CCDROM);
-DEFFN(CCDROMComputer);
-DEFFN(CCDROMTray);
-DEFFN(CCellPointButton);
-DEFFN(CChickenDispensor);
-DEFFN(CCloseBrokenPel);
-DEFFN(CodeWheel);
-DEFFN(CComputer);
-DEFFN(CCookie);
-DEFFN(CComputerScreen);
-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(CIdleSummoner);
-DEFFN(CLemonDispensor);
-DEFFN(CLight);
-DEFFN(CLightSwitch);
-DEFFN(CLittleLiftButton);
-DEFFN(CLongStickDispenser);
-DEFFN(CMissiveOMat);
-DEFFN(CMissiveOMatButton);
-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(CRoomItem);
-DEFFN(CSauceDispensor);
-DEFFN(CSearchPoint);
-DEFFN(CSeasonBackground);
-DEFFN(CSeasonBarrel);
-DEFFN(CSeasonalAdjustment);
-DEFFN(CServiceElevatorWindow);
-DEFFN(CShipSetting);
-DEFFN(CShipSettingButton);
-DEFFN(CShowCellpoints);
-DEFFN(CSpeechDispensor);
-DEFFN(CStarlingPuret);
-DEFFN(CStartAction);
-DEFFN(CStopPhonographButton);
-DEFFN(CSUBGlass);
-DEFFN(CSweetBowl);
-DEFFN(CTelevision);
-DEFFN(CThirdClassCanal);
-DEFFN(CThrowTVDownWell);
-DEFFN(CTitaniaStillControl);
-DEFFN(CTOWParrotNav);
-DEFFN(CUpLighter);
-DEFFN(CUselessLever);
-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(CPlaceHolder);
-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(CBrokenPellerator)
+DEFFN(CBrokenPelleratorFroz)
+DEFFN(CCage)
+DEFFN(CCallPellerator)
+DEFFN(CCaptainsWheel)
+DEFFN(CCDROM)
+DEFFN(CCDROMComputer)
+DEFFN(CCDROMTray)
+DEFFN(CCellPointButton)
+DEFFN(CChickenDispensor)
+DEFFN(CCloseBrokenPel)
+DEFFN(CodeWheel)
+DEFFN(CComputer)
+DEFFN(CCookie)
+DEFFN(CComputerScreen)
+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(CIdleSummoner)
+DEFFN(CLemonDispensor)
+DEFFN(CLight)
+DEFFN(CLightSwitch)
+DEFFN(CLittleLiftButton)
+DEFFN(CLongStickDispenser)
+DEFFN(CMissiveOMat)
+DEFFN(CMissiveOMatButton)
+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(CRoomItem)
+DEFFN(CSauceDispensor)
+DEFFN(CSearchPoint)
+DEFFN(CSeasonBackground)
+DEFFN(CSeasonBarrel)
+DEFFN(CSeasonalAdjustment)
+DEFFN(CServiceElevatorWindow)
+DEFFN(CShipSetting)
+DEFFN(CShipSettingButton)
+DEFFN(CShowCellpoints)
+DEFFN(CSpeechDispensor)
+DEFFN(CStarlingPuret)
+DEFFN(CStartAction)
+DEFFN(CStopPhonographButton)
+DEFFN(CSUBGlass)
+DEFFN(CSweetBowl)
+DEFFN(CTelevision)
+DEFFN(CThirdClassCanal)
+DEFFN(CThrowTVDownWell)
+DEFFN(CTitaniaStillControl)
+DEFFN(CTOWParrotNav)
+DEFFN(CUpLighter)
+DEFFN(CUselessLever)
+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(CPlaceHolder)
+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(CVolumeControl);
+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(CVolumeControl)
-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(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(CEjectCylinderMsg);
-DEFFN(CErasePhonographCylinderMsg);
-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(CLemonFallsFromTreeMsg);
-DEFFN(CLightsMsg);
-DEFFN(CLockPhonographMsg);
-DEFFN(CMaitreDDefeatedMsg);
-DEFFN(CMaitreDHappyMsg);
-DEFFN(CMissiveOMatActionMsg);
-DEFFN(CMouseMsg);
-DEFFN(CMouseMoveMsg);
-DEFFN(CMouseButtonMsg);
-DEFFN(CMouseButtonDownMsg);
-DEFFN(CMouseButtonUpMsg);
-DEFFN(CMouseButtonDoubleClickMsg);
-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(CPanningAwayFromParrotMsg);
-DEFFN(CParrotSpeakMsg);
-DEFFN(CParrotTriesChickenMsg);
-DEFFN(CPassOnDragStartMsg);
-DEFFN(CPhonographPlayMsg);
-DEFFN(CPhonographReadyToPlayMsg);
-DEFFN(CPhonographRecordMsg);
-DEFFN(CPhonographStopMsg);
-DEFFN(CPlayRangeMsg);
-DEFFN(CPlayerTriesRestaurantTableMsg);
-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(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(CSummonBotQuerryMsg);
-DEFFN(CTakeHeadPieceMsg);
-DEFFN(CTextInputMsg);
-DEFFN(CTimeDilationMsg);
-DEFFN(CTimeMsg);
-DEFFN(CTitleSequenceEndedMsg);
-DEFFN(CTransitMsg);
-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(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(CEjectCylinderMsg)
+DEFFN(CErasePhonographCylinderMsg)
+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(CLemonFallsFromTreeMsg)
+DEFFN(CLightsMsg)
+DEFFN(CLockPhonographMsg)
+DEFFN(CMaitreDDefeatedMsg)
+DEFFN(CMaitreDHappyMsg)
+DEFFN(CMissiveOMatActionMsg)
+DEFFN(CMouseMsg)
+DEFFN(CMouseMoveMsg)
+DEFFN(CMouseButtonMsg)
+DEFFN(CMouseButtonDownMsg)
+DEFFN(CMouseButtonUpMsg)
+DEFFN(CMouseButtonDoubleClickMsg)
+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(CPanningAwayFromParrotMsg)
+DEFFN(CParrotSpeakMsg)
+DEFFN(CParrotTriesChickenMsg)
+DEFFN(CPassOnDragStartMsg)
+DEFFN(CPhonographPlayMsg)
+DEFFN(CPhonographReadyToPlayMsg)
+DEFFN(CPhonographRecordMsg)
+DEFFN(CPhonographStopMsg)
+DEFFN(CPlayRangeMsg)
+DEFFN(CPlayerTriesRestaurantTableMsg)
+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(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(CSummonBotQuerryMsg)
+DEFFN(CTakeHeadPieceMsg)
+DEFFN(CTextInputMsg)
+DEFFN(CTimeDilationMsg)
+DEFFN(CTimeMsg)
+DEFFN(CTitleSequenceEndedMsg)
+DEFFN(CTransitMsg)
+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(CDeskbot);
-DEFFN(CDoorbot);
-DEFFN(CLiftBot);
-DEFFN(CMaitreD);
-DEFFN(CMobile);
-DEFFN(CParrot);
-DEFFN(CStarlings);
-DEFFN(CSummonBots);
-DEFFN(CSuccUBus);
-DEFFN(CTitania);
-DEFFN(CAutoMusicPlayer);
-DEFFN(CAutoMusicPlayerBase);
-DEFFN(CAutoSoundPlayer);
-DEFFN(CAutoSoundPlayerADSR);
-DEFFN(CBackgroundSoundMaker);
-DEFFN(CBirdSong);
-DEFFN(CEnterViewTogglesOtherMusic);
-DEFFN(CGondolierSong);
-DEFFN(CMusicPlayer);
-DEFFN(CNodeAutoSoundPlayer);
-DEFFN(CRestrictedAutoMusicPlayer);
-DEFFN(CRoomAutoSoundPlayer);
-DEFFN(CSeasonNoises);
-DEFFN(CSeasonalMusicPlayer);
-DEFFN(CTitaniaSpeech);
-DEFFN(CTriggerAutoMusicPlayer);
-DEFFN(CViewAutoSoundPlayer);
-DEFFN(CViewTogglesOtherMusic);
-DEFFN(CWaterLappingSounds);
+DEFFN(CBarbot)
+DEFFN(CBellBot)
+DEFFN(CCallBot)
+DEFFN(CDeskbot)
+DEFFN(CDoorbot)
+DEFFN(CLiftBot)
+DEFFN(CMaitreD)
+DEFFN(CMobile)
+DEFFN(CParrot)
+DEFFN(CStarlings)
+DEFFN(CSummonBots)
+DEFFN(CSuccUBus)
+DEFFN(CTitania)
+DEFFN(CAutoMusicPlayer)
+DEFFN(CAutoMusicPlayerBase)
+DEFFN(CAutoSoundPlayer)
+DEFFN(CAutoSoundPlayerADSR)
+DEFFN(CBackgroundSoundMaker)
+DEFFN(CBirdSong)
+DEFFN(CEnterViewTogglesOtherMusic)
+DEFFN(CGondolierSong)
+DEFFN(CMusicPlayer)
+DEFFN(CNodeAutoSoundPlayer)
+DEFFN(CRestrictedAutoMusicPlayer)
+DEFFN(CRoomAutoSoundPlayer)
+DEFFN(CSeasonNoises)
+DEFFN(CSeasonalMusicPlayer)
+DEFFN(CTitaniaSpeech)
+DEFFN(CTriggerAutoMusicPlayer)
+DEFFN(CViewAutoSoundPlayer)
+DEFFN(CViewTogglesOtherMusic)
+DEFFN(CWaterLappingSounds)
void CSaveableObject::initClassList() {
_classList = new Common::HashMap<Common::String, CreateFunction>();
diff --git a/engines/titanic/core/saveable_object.h b/engines/titanic/core/saveable_object.h
index 4e7d949191..ed26163557 100644
--- a/engines/titanic/core/saveable_object.h
+++ b/engines/titanic/core/saveable_object.h
@@ -50,6 +50,8 @@ public:
*/
static CSaveableObject *createInstance(const Common::String &name);
public:
+ virtual ~CSaveableObject() {}
+
/**
* Return the class name
*/
diff --git a/engines/titanic/image.h b/engines/titanic/image.h
index adef011df1..9030e81ad7 100644
--- a/engines/titanic/image.h
+++ b/engines/titanic/image.h
@@ -67,6 +67,7 @@ public:
bool _flag;
public:
Image();
+ virtual ~Image() {}
virtual void proc6();
virtual void set(int width, int height);
diff --git a/engines/titanic/messages/door_auto_sound_event.h b/engines/titanic/messages/door_auto_sound_event.h
index ef417560dc..7eb1d04bf4 100644
--- a/engines/titanic/messages/door_auto_sound_event.h
+++ b/engines/titanic/messages/door_auto_sound_event.h
@@ -34,7 +34,7 @@ public:
int _fieldDC;
int _fieldE0;
public:
- CDoorAutoSoundEvent::CDoorAutoSoundEvent() : CAutoSoundEvent(),
+ CDoorAutoSoundEvent() : CAutoSoundEvent(),
_string1("z#44.wav"), _string2("z#43.wav"), _fieldDC(25), _fieldE0(25) {
}
diff --git a/engines/titanic/messages/pet_messages.h b/engines/titanic/messages/pet_messages.h
index 1aeaec0d0d..96e52eb61c 100644
--- a/engines/titanic/messages/pet_messages.h
+++ b/engines/titanic/messages/pet_messages.h
@@ -40,7 +40,7 @@ RAW_MESSAGE(CPETReceiveMsg);
RAW_MESSAGE(CPETSetStarDestinationMsg);
NUM_MESSAGE(CPETStarFieldLockMsg, _value);
RAW_MESSAGE(CPETStereoFieldOnOffMsg);
-SNUM_MESSAGE_VAL(CPETTargetMsg, _strValue, _numValue, nullptr, -1);
+SNUM_MESSAGE_VAL(CPETTargetMsg, _strValue, _numValue, (const char *)nullptr, -1);
} // End of namespace Titanic
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index 62dbdcb89f..258dc2ede5 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -2,7 +2,6 @@ MODULE := engines/titanic
MODULE_OBJS := \
compressed_file.o \
- compression.o \
detection.o \
direct_draw.o \
font.o \
diff --git a/engines/titanic/pet_control/pet_control_sub_base.h b/engines/titanic/pet_control/pet_control_sub_base.h
index 85423820f4..ead9a6e6dd 100644
--- a/engines/titanic/pet_control/pet_control_sub_base.h
+++ b/engines/titanic/pet_control/pet_control_sub_base.h
@@ -42,6 +42,7 @@ protected:
int _field4;
public:
CPetControlSubBase() : _field4(0) {}
+ virtual ~CPetControlSubBase() {}
virtual int proc1() { return 0; }
virtual int proc2() { return 0; }
diff --git a/engines/titanic/pet_control/pet_val_base.h b/engines/titanic/pet_control/pet_val_base.h
index a2701149a7..1d5399b70b 100644
--- a/engines/titanic/pet_control/pet_val_base.h
+++ b/engines/titanic/pet_control/pet_val_base.h
@@ -38,6 +38,7 @@ protected:
public:
CPetValBase() : _field4(0), _field8(0), _fieldC(0),
_field10(0), _field14(0) {}
+ virtual ~CPetValBase() {}
virtual void proc1() {}
virtual void proc2() {}
diff --git a/engines/titanic/simple_file.cpp b/engines/titanic/simple_file.cpp
index 9bc365bf33..ef6f26d827 100644
--- a/engines/titanic/simple_file.cpp
+++ b/engines/titanic/simple_file.cpp
@@ -61,7 +61,7 @@ void SimpleFile::close() {
void SimpleFile::safeRead(void *dst, size_t count) {
if (unsafeRead(dst, count) != count)
- error("Could not read %d bytes", count);
+ error("Could not read %d bytes", (int)count);
}
size_t SimpleFile::unsafeRead(void *dst, size_t count) {
@@ -229,7 +229,7 @@ void SimpleFile::writeString(const CString &str) {
const char *msgP = str.c_str();
char c;
- while (c = *msgP++) {
+ while ((c = *msgP++) != '\0') {
switch (c) {
case '\r':
write("\\r", 2);
@@ -272,7 +272,7 @@ void SimpleFile::writeQuotedLine(const CString &str, int indent) {
}
void SimpleFile::writeNumber(int val) {
- CString str = CString::format("%ld ", val);
+ CString str = CString::format("%d ", val);
write(str.c_str(), str.size());
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-15 02:46:43 +0000