From 5ccc0a66da38d23520234e7060efaf966d3345b9 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 29 Jun 2016 19:53:16 -0400 Subject: TITANIC: Removed const modifier from all saveable objects Turns out that CGameObject::save regenerates the _movieRangeInfo list. So the const suffix can no longer be used for the entire hierarchy --- engines/titanic/npcs/barbot.cpp | 2 +- engines/titanic/npcs/barbot.h | 2 +- engines/titanic/npcs/bellbot.cpp | 2 +- engines/titanic/npcs/bellbot.h | 2 +- engines/titanic/npcs/callbot.cpp | 2 +- engines/titanic/npcs/callbot.h | 2 +- engines/titanic/npcs/character.cpp | 2 +- engines/titanic/npcs/character.h | 2 +- engines/titanic/npcs/deskbot.cpp | 2 +- engines/titanic/npcs/deskbot.h | 2 +- engines/titanic/npcs/doorbot.cpp | 2 +- engines/titanic/npcs/doorbot.h | 2 +- engines/titanic/npcs/liftbot.cpp | 2 +- engines/titanic/npcs/liftbot.h | 2 +- engines/titanic/npcs/maitre_d.cpp | 2 +- engines/titanic/npcs/maitre_d.h | 2 +- engines/titanic/npcs/mobile.cpp | 2 +- engines/titanic/npcs/mobile.h | 2 +- engines/titanic/npcs/parrot.cpp | 2 +- engines/titanic/npcs/parrot.h | 2 +- engines/titanic/npcs/robot_controller.cpp | 2 +- engines/titanic/npcs/robot_controller.h | 2 +- engines/titanic/npcs/starlings.cpp | 2 +- engines/titanic/npcs/starlings.h | 2 +- engines/titanic/npcs/succubus.cpp | 2 +- engines/titanic/npcs/succubus.h | 2 +- engines/titanic/npcs/summon_bots.cpp | 2 +- engines/titanic/npcs/summon_bots.h | 2 +- engines/titanic/npcs/titania.cpp | 2 +- engines/titanic/npcs/titania.h | 2 +- engines/titanic/npcs/true_talk_npc.cpp | 2 +- engines/titanic/npcs/true_talk_npc.h | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) (limited to 'engines/titanic/npcs') diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp index 8abf41d426..8f1c5e6ab3 100644 --- a/engines/titanic/npcs/barbot.cpp +++ b/engines/titanic/npcs/barbot.cpp @@ -171,7 +171,7 @@ CBarbot::CBarbot() : CTrueTalkNPC() { _field340 = 95; } -void CBarbot::save(SimpleFile *file, int indent) const { +void CBarbot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_field108, indent); file->writeNumberLine(_field10C, indent); diff --git a/engines/titanic/npcs/barbot.h b/engines/titanic/npcs/barbot.h index fa06f8f638..27a091ef29 100644 --- a/engines/titanic/npcs/barbot.h +++ b/engines/titanic/npcs/barbot.h @@ -181,7 +181,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp index 48747228f8..7ee0128a1e 100644 --- a/engines/titanic/npcs/bellbot.cpp +++ b/engines/titanic/npcs/bellbot.cpp @@ -27,7 +27,7 @@ namespace Titanic { CBellBot::CBellBot() : CTrueTalkNPC(), _field108(0) { } -void CBellBot::save(SimpleFile *file, int indent) const { +void CBellBot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_field108, indent); diff --git a/engines/titanic/npcs/bellbot.h b/engines/titanic/npcs/bellbot.h index c3d38f65ec..6be0615303 100644 --- a/engines/titanic/npcs/bellbot.h +++ b/engines/titanic/npcs/bellbot.h @@ -37,7 +37,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/callbot.cpp b/engines/titanic/npcs/callbot.cpp index 3fb7ee2f59..eb0d4b71d5 100644 --- a/engines/titanic/npcs/callbot.cpp +++ b/engines/titanic/npcs/callbot.cpp @@ -27,7 +27,7 @@ namespace Titanic { CCallBot::CCallBot() : CGameObject(), _fieldC8(0) { } -void CCallBot::save(SimpleFile *file, int indent) const { +void CCallBot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeQuotedLine(_string1, indent); file->writeNumberLine(_fieldC8, indent); diff --git a/engines/titanic/npcs/callbot.h b/engines/titanic/npcs/callbot.h index 299a329c07..6848121529 100644 --- a/engines/titanic/npcs/callbot.h +++ b/engines/titanic/npcs/callbot.h @@ -38,7 +38,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/character.cpp b/engines/titanic/npcs/character.cpp index df905d98b3..ed36db16d3 100644 --- a/engines/titanic/npcs/character.cpp +++ b/engines/titanic/npcs/character.cpp @@ -33,7 +33,7 @@ END_MESSAGE_MAP() CCharacter::CCharacter() : CGameObject(), _fieldBC(0), _fieldC0(0), _fieldC4(1) { } -void CCharacter::save(SimpleFile *file, int indent) const { +void CCharacter::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_fieldBC, indent); file->writeNumberLine(_fieldC0, indent); diff --git a/engines/titanic/npcs/character.h b/engines/titanic/npcs/character.h index c0cc8ff65f..2362f01dac 100644 --- a/engines/titanic/npcs/character.h +++ b/engines/titanic/npcs/character.h @@ -44,7 +44,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp index 3fe92367ce..d11b135983 100644 --- a/engines/titanic/npcs/deskbot.cpp +++ b/engines/titanic/npcs/deskbot.cpp @@ -55,7 +55,7 @@ int CDeskbot::_v2; CDeskbot::CDeskbot() : CTrueTalkNPC(), _deskbotActive(false), _classNum(0) { } -void CDeskbot::save(SimpleFile *file, int indent) const { +void CDeskbot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_v1, indent); file->writeNumberLine(_v2, indent); diff --git a/engines/titanic/npcs/deskbot.h b/engines/titanic/npcs/deskbot.h index 3e155f6788..ff5459910b 100644 --- a/engines/titanic/npcs/deskbot.h +++ b/engines/titanic/npcs/deskbot.h @@ -53,7 +53,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index 17db94f2d7..76db55f92c 100644 --- a/engines/titanic/npcs/doorbot.cpp +++ b/engines/titanic/npcs/doorbot.cpp @@ -34,7 +34,7 @@ CDoorbot::CDoorbot() : CTrueTalkNPC() { _field114 = 0; } -void CDoorbot::save(SimpleFile *file, int indent) const { +void CDoorbot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_v1, indent); file->writeNumberLine(_v2, indent); diff --git a/engines/titanic/npcs/doorbot.h b/engines/titanic/npcs/doorbot.h index f0c46e5a16..9ea7de6c77 100644 --- a/engines/titanic/npcs/doorbot.h +++ b/engines/titanic/npcs/doorbot.h @@ -43,7 +43,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp index 0125406d6a..43daa017c1 100644 --- a/engines/titanic/npcs/liftbot.cpp +++ b/engines/titanic/npcs/liftbot.cpp @@ -30,7 +30,7 @@ int CLiftBot::_v2; CLiftBot::CLiftBot() : CTrueTalkNPC(), _field108(1) { } -void CLiftBot::save(SimpleFile *file, int indent) const { +void CLiftBot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_v1, indent); file->writeNumberLine(_field108, indent); diff --git a/engines/titanic/npcs/liftbot.h b/engines/titanic/npcs/liftbot.h index d0db94e95d..e993da0d32 100644 --- a/engines/titanic/npcs/liftbot.h +++ b/engines/titanic/npcs/liftbot.h @@ -42,7 +42,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/maitre_d.cpp b/engines/titanic/npcs/maitre_d.cpp index d100a0b301..903f3a49c9 100644 --- a/engines/titanic/npcs/maitre_d.cpp +++ b/engines/titanic/npcs/maitre_d.cpp @@ -31,7 +31,7 @@ CMaitreD::CMaitreD() : CTrueTalkNPC(), _field11C(0), _field12C(0), _field130(1), _field134(0), _field138(0) { } -void CMaitreD::save(SimpleFile *file, int indent) const { +void CMaitreD::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_field108, indent); file->writeQuotedLine(_string2, indent); diff --git a/engines/titanic/npcs/maitre_d.h b/engines/titanic/npcs/maitre_d.h index bae682bc74..6a63348d28 100644 --- a/engines/titanic/npcs/maitre_d.h +++ b/engines/titanic/npcs/maitre_d.h @@ -47,7 +47,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/mobile.cpp b/engines/titanic/npcs/mobile.cpp index 55b37f52f1..83f886ed21 100644 --- a/engines/titanic/npcs/mobile.cpp +++ b/engines/titanic/npcs/mobile.cpp @@ -29,7 +29,7 @@ EMPTY_MESSAGE_MAP(CMobile, CCharacter) CMobile::CMobile() : CCharacter(), _fieldDC(0) { } -void CMobile::save(SimpleFile *file, int indent) const { +void CMobile::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writePoint(_pos1, indent); file->writeNumberLine(_fieldDC, indent); diff --git a/engines/titanic/npcs/mobile.h b/engines/titanic/npcs/mobile.h index 3ec19a4371..42effc6715 100644 --- a/engines/titanic/npcs/mobile.h +++ b/engines/titanic/npcs/mobile.h @@ -39,7 +39,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp index a4cfa0872b..49e4f4066e 100644 --- a/engines/titanic/npcs/parrot.cpp +++ b/engines/titanic/npcs/parrot.cpp @@ -92,7 +92,7 @@ CParrot::CParrot() : CTrueTalkNPC() { _assetNumber = 0x13880; } -void CParrot::save(SimpleFile *file, int indent) const { +void CParrot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_assetNumber, indent); diff --git a/engines/titanic/npcs/parrot.h b/engines/titanic/npcs/parrot.h index 0019437ce0..010d9af503 100644 --- a/engines/titanic/npcs/parrot.h +++ b/engines/titanic/npcs/parrot.h @@ -98,7 +98,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/robot_controller.cpp b/engines/titanic/npcs/robot_controller.cpp index c6ef4222ef..98866e4505 100644 --- a/engines/titanic/npcs/robot_controller.cpp +++ b/engines/titanic/npcs/robot_controller.cpp @@ -27,7 +27,7 @@ namespace Titanic { CRobotController::CRobotController() : CGameObject(), _string1("BellBot") { } -void CRobotController::save(SimpleFile *file, int indent) const { +void CRobotController::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeQuotedLine(_string1, indent); diff --git a/engines/titanic/npcs/robot_controller.h b/engines/titanic/npcs/robot_controller.h index 998453eb62..54b0a20b24 100644 --- a/engines/titanic/npcs/robot_controller.h +++ b/engines/titanic/npcs/robot_controller.h @@ -37,7 +37,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/starlings.cpp b/engines/titanic/npcs/starlings.cpp index dcb9fbda81..333f4c4b7a 100644 --- a/engines/titanic/npcs/starlings.cpp +++ b/engines/titanic/npcs/starlings.cpp @@ -29,7 +29,7 @@ int CStarlings::_v1; CStarlings::CStarlings() : CCharacter() { } -void CStarlings::save(SimpleFile *file, int indent) const { +void CStarlings::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_v1, indent); diff --git a/engines/titanic/npcs/starlings.h b/engines/titanic/npcs/starlings.h index f7b144273c..40cb1b8083 100644 --- a/engines/titanic/npcs/starlings.h +++ b/engines/titanic/npcs/starlings.h @@ -37,7 +37,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp index 7570338274..f66a59cb84 100644 --- a/engines/titanic/npcs/succubus.cpp +++ b/engines/titanic/npcs/succubus.cpp @@ -84,7 +84,7 @@ CSuccUBus::CSuccUBus() : CTrueTalkNPC() { _field1D8 = 0; } -void CSuccUBus::save(SimpleFile *file, int indent) const { +void CSuccUBus::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_v0, indent); diff --git a/engines/titanic/npcs/succubus.h b/engines/titanic/npcs/succubus.h index e46592caa1..a78a88b69a 100644 --- a/engines/titanic/npcs/succubus.h +++ b/engines/titanic/npcs/succubus.h @@ -93,7 +93,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/summon_bots.cpp b/engines/titanic/npcs/summon_bots.cpp index 661b3f0490..8796e5ffda 100644 --- a/engines/titanic/npcs/summon_bots.cpp +++ b/engines/titanic/npcs/summon_bots.cpp @@ -28,7 +28,7 @@ CSummonBots::CSummonBots() : CRobotController(), _string2("NULL"), _fieldC8(0), _fieldCC(0) { } -void CSummonBots::save(SimpleFile *file, int indent) const { +void CSummonBots::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_fieldC8, indent); file->writeNumberLine(_fieldCC, indent); diff --git a/engines/titanic/npcs/summon_bots.h b/engines/titanic/npcs/summon_bots.h index 80aef73486..245d047bfa 100644 --- a/engines/titanic/npcs/summon_bots.h +++ b/engines/titanic/npcs/summon_bots.h @@ -39,7 +39,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp index 3a71d7fea1..34c21d0efe 100644 --- a/engines/titanic/npcs/titania.cpp +++ b/engines/titanic/npcs/titania.cpp @@ -38,7 +38,7 @@ CTitania::CTitania() : CCharacter() { _field100 = 1; } -void CTitania::save(SimpleFile *file, int indent) const { +void CTitania::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_fieldD4, indent); file->writeNumberLine(_fieldD8, indent); diff --git a/engines/titanic/npcs/titania.h b/engines/titanic/npcs/titania.h index 4c4c81267b..3eb95c08d3 100644 --- a/engines/titanic/npcs/titania.h +++ b/engines/titanic/npcs/titania.h @@ -48,7 +48,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp index 0eaf21359e..51d7c2e003 100644 --- a/engines/titanic/npcs/true_talk_npc.cpp +++ b/engines/titanic/npcs/true_talk_npc.cpp @@ -44,7 +44,7 @@ CTrueTalkNPC::CTrueTalkNPC() : _assetName("z451.dlg"), _fieldF4(0), _fieldF8(0), _speechTimerId(0), _field100(0), _field104(0) { } -void CTrueTalkNPC::save(SimpleFile *file, int indent) const { +void CTrueTalkNPC::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_assetNumber, indent); file->writeQuotedLine(_assetName, indent); diff --git a/engines/titanic/npcs/true_talk_npc.h b/engines/titanic/npcs/true_talk_npc.h index 3126d92d3e..7202f253de 100644 --- a/engines/titanic/npcs/true_talk_npc.h +++ b/engines/titanic/npcs/true_talk_npc.h @@ -84,7 +84,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file -- cgit v1.2.3