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

78 files changed, 78 insertions, 78 deletions

diff --git a/engines/titanic/carry/arm.cpp b/engines/titanic/carry/arm.cpp
index ee58aea445..880c93d309 100644
--- a/engines/titanic/carry/arm.cpp
+++ b/engines/titanic/carry/arm.cpp
@@ -40,7 +40,7 @@ CArm::CArm() : CCarry(), _string6("Key"),
 	_armRect(220, 208, 409, 350) {
 }
 
-void CArm::save(SimpleFile *file, int indent) const {
+void CArm::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string6, indent);
 	file->writeNumberLine(_field138, indent);
diff --git a/engines/titanic/carry/arm.h b/engines/titanic/carry/arm.h
index f19943de51..afef22ba49 100644
--- a/engines/titanic/carry/arm.h
+++ b/engines/titanic/carry/arm.h
@@ -55,7 +55,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/carry/auditory_centre.cpp b/engines/titanic/carry/auditory_centre.cpp
index e5dedcd654..d88989a801 100644
--- a/engines/titanic/carry/auditory_centre.cpp
+++ b/engines/titanic/carry/auditory_centre.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CAuditoryCentre::save(SimpleFile *file, int indent) const {
+void CAuditoryCentre::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CBrain::save(file, indent);
 }
diff --git a/engines/titanic/carry/auditory_centre.h b/engines/titanic/carry/auditory_centre.h
index c429fd78cd..d4b9beedc7 100644
--- a/engines/titanic/carry/auditory_centre.h
+++ b/engines/titanic/carry/auditory_centre.h
@@ -34,7 +34,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/carry/bowl_ear.cpp b/engines/titanic/carry/bowl_ear.cpp
index 70d2409a05..bb5172e580 100644
--- a/engines/titanic/carry/bowl_ear.cpp
+++ b/engines/titanic/carry/bowl_ear.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CBowlEar::save(SimpleFile *file, int indent) const {
+void CBowlEar::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CEar::save(file, indent);
 }
diff --git a/engines/titanic/carry/bowl_ear.h b/engines/titanic/carry/bowl_ear.h
index 1617ceda8d..39d5dc9ff8 100644
--- a/engines/titanic/carry/bowl_ear.h
+++ b/engines/titanic/carry/bowl_ear.h
@@ -34,7 +34,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/carry/brain.cpp b/engines/titanic/carry/brain.cpp
index 1fe0c1b5d8..8df0de9961 100644
--- a/engines/titanic/carry/brain.cpp
+++ b/engines/titanic/carry/brain.cpp
@@ -36,7 +36,7 @@ END_MESSAGE_MAP()
 CBrain::CBrain() : CCarry(), _field134(0), _field138(0) {
 }
 
-void CBrain::save(SimpleFile *file, int indent) const {
+void CBrain::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writePoint(_pos1, indent);
 	file->writeNumberLine(_field134, indent);
diff --git a/engines/titanic/carry/brain.h b/engines/titanic/carry/brain.h
index 3e24f5215b..fd70a7e0c9 100644
--- a/engines/titanic/carry/brain.h
+++ b/engines/titanic/carry/brain.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/carry/bridge_piece.cpp b/engines/titanic/carry/bridge_piece.cpp
index 1fe5e048ed..fc845feff0 100644
--- a/engines/titanic/carry/bridge_piece.cpp
+++ b/engines/titanic/carry/bridge_piece.cpp
@@ -33,7 +33,7 @@ END_MESSAGE_MAP()
 CBridgePiece::CBridgePiece() : CCarry(), _field140(0) {
 }
 
-void CBridgePiece::save(SimpleFile *file, int indent) const {
+void CBridgePiece::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string6, indent);
 	file->writePoint(_pos3, indent);
diff --git a/engines/titanic/carry/bridge_piece.h b/engines/titanic/carry/bridge_piece.h
index 5041cbc049..04bc7b9181 100644
--- a/engines/titanic/carry/bridge_piece.h
+++ b/engines/titanic/carry/bridge_piece.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/carry/carry.cpp b/engines/titanic/carry/carry.cpp
index ca022a6c8f..75b3b6f35b 100644
--- a/engines/titanic/carry/carry.cpp
+++ b/engines/titanic/carry/carry.cpp
@@ -52,7 +52,7 @@ CCarry::CCarry() : CGameObject(), _fieldDC(0), _fieldE0(1),
 	_string4("It doesn't seem to want this.") {
 }
 
-void CCarry::save(SimpleFile *file, int indent) const {
+void CCarry::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string1, indent);
 	file->writePoint(_origPos, indent);
diff --git a/engines/titanic/carry/carry.h b/engines/titanic/carry/carry.h
index f4476721cc..36589635f7 100644
--- a/engines/titanic/carry/carry.h
+++ b/engines/titanic/carry/carry.h
@@ -68,7 +68,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/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp
index b0916bb4c4..cf96204122 100644
--- a/engines/titanic/carry/carry_parrot.cpp
+++ b/engines/titanic/carry/carry_parrot.cpp
@@ -47,7 +47,7 @@ CCarryParrot::CCarryParrot() : CCarry(), _string6("PerchedParrot"),
 		_field148(25), _field14C(0), _field150(8) {
 }
 
-void CCarryParrot::save(SimpleFile *file, int indent) const {
+void CCarryParrot::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string6, indent);
 	file->writeNumberLine(_timerId, indent);
diff --git a/engines/titanic/carry/carry_parrot.h b/engines/titanic/carry/carry_parrot.h
index 1c5cc2e890..84c656ce8e 100644
--- a/engines/titanic/carry/carry_parrot.h
+++ b/engines/titanic/carry/carry_parrot.h
@@ -57,7 +57,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/carry/central_core.cpp b/engines/titanic/carry/central_core.cpp
index 97309e0a86..a50c95abbc 100644
--- a/engines/titanic/carry/central_core.cpp
+++ b/engines/titanic/carry/central_core.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CCentralCore::save(SimpleFile *file, int indent) const {
+void CCentralCore::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CBrain::save(file, indent);
 }
diff --git a/engines/titanic/carry/central_core.h b/engines/titanic/carry/central_core.h
index b397046088..852d2b63e1 100644
--- a/engines/titanic/carry/central_core.h
+++ b/engines/titanic/carry/central_core.h
@@ -34,7 +34,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/carry/chicken.cpp b/engines/titanic/carry/chicken.cpp
index 60627bdb7e..65404dc65d 100644
--- a/engines/titanic/carry/chicken.cpp
+++ b/engines/titanic/carry/chicken.cpp
@@ -45,7 +45,7 @@ CChicken::CChicken() : CCarry(), _string6("None"),
 		_field12C(1), _field13C(0), _timerId(0) {
 }
 
-void CChicken::save(SimpleFile *file, int indent) const {
+void CChicken::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field12C, indent);
 	file->writeQuotedLine(_string6, indent);
diff --git a/engines/titanic/carry/chicken.h b/engines/titanic/carry/chicken.h
index 946c102c48..e9e8f00000 100644
--- a/engines/titanic/carry/chicken.h
+++ b/engines/titanic/carry/chicken.h
@@ -55,7 +55,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/carry/crushed_tv.cpp b/engines/titanic/carry/crushed_tv.cpp
index 5abc8fac98..a265b611a9 100644
--- a/engines/titanic/carry/crushed_tv.cpp
+++ b/engines/titanic/carry/crushed_tv.cpp
@@ -34,7 +34,7 @@ END_MESSAGE_MAP()
 CCrushedTV::CCrushedTV() : CCarry() {
 }
 
-void CCrushedTV::save(SimpleFile *file, int indent) const {
+void CCrushedTV::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CCarry::save(file, indent);
 }
diff --git a/engines/titanic/carry/crushed_tv.h b/engines/titanic/carry/crushed_tv.h
index 3e7753499d..d141589ec8 100644
--- a/engines/titanic/carry/crushed_tv.h
+++ b/engines/titanic/carry/crushed_tv.h
@@ -41,7 +41,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/carry/ear.cpp b/engines/titanic/carry/ear.cpp
index d87b09d9b4..8d85e247f7 100644
--- a/engines/titanic/carry/ear.cpp
+++ b/engines/titanic/carry/ear.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CEar::CEar() : CHeadPiece() {
 }
 
-void CEar::save(SimpleFile *file, int indent) const {
+void CEar::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CHeadPiece::save(file, indent);
 }
diff --git a/engines/titanic/carry/ear.h b/engines/titanic/carry/ear.h
index 2a20620342..bdffdc2678 100644
--- a/engines/titanic/carry/ear.h
+++ b/engines/titanic/carry/ear.h
@@ -35,7 +35,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/carry/eye.cpp b/engines/titanic/carry/eye.cpp
index 21fc3faa7e..5de1789e54 100644
--- a/engines/titanic/carry/eye.cpp
+++ b/engines/titanic/carry/eye.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CEye::CEye() : CHeadPiece(), _eyeNum(0) {
 }
 
-void CEye::save(SimpleFile *file, int indent) const {
+void CEye::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_eyeNum, indent);
 	CHeadPiece::save(file, indent);
diff --git a/engines/titanic/carry/eye.h b/engines/titanic/carry/eye.h
index f7e17fa81f..2531666037 100644
--- a/engines/titanic/carry/eye.h
+++ b/engines/titanic/carry/eye.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/carry/feathers.cpp b/engines/titanic/carry/feathers.cpp
index e89f33564b..c2cf369bd8 100644
--- a/engines/titanic/carry/feathers.cpp
+++ b/engines/titanic/carry/feathers.cpp
@@ -29,7 +29,7 @@ EMPTY_MESSAGE_MAP(CFeathers, CCarry)
 CFeathers::CFeathers() : CCarry() {
 }
 
-void CFeathers::save(SimpleFile *file, int indent) const {
+void CFeathers::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CCarry::save(file, indent);
 }
diff --git a/engines/titanic/carry/feathers.h b/engines/titanic/carry/feathers.h
index f90de11abd..e2c8ab77db 100644
--- a/engines/titanic/carry/feathers.h
+++ b/engines/titanic/carry/feathers.h
@@ -36,7 +36,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/carry/fruit.cpp b/engines/titanic/carry/fruit.cpp
index 3355d6e006..832dccf45a 100644
--- a/engines/titanic/carry/fruit.cpp
+++ b/engines/titanic/carry/fruit.cpp
@@ -28,7 +28,7 @@ CFruit::CFruit() : CCarry(), _field12C(0),
 		_field130(0), _field134(0), _field138(0) {
 }
 
-void CFruit::save(SimpleFile *file, int indent) const {
+void CFruit::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field12C, indent);
 	file->writeNumberLine(_field130, indent);
diff --git a/engines/titanic/carry/fruit.h b/engines/titanic/carry/fruit.h
index 3d23afd389..595f27d56c 100644
--- a/engines/titanic/carry/fruit.h
+++ b/engines/titanic/carry/fruit.h
@@ -40,7 +40,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/carry/glass.cpp b/engines/titanic/carry/glass.cpp
index 1f0e059f54..051457af03 100644
--- a/engines/titanic/carry/glass.cpp
+++ b/engines/titanic/carry/glass.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CGlass::CGlass() : CCarry(), _string6("None") {
 }
 
-void CGlass::save(SimpleFile *file, int indent) const {
+void CGlass::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string6, indent);
 	CCarry::save(file, indent);
diff --git a/engines/titanic/carry/glass.h b/engines/titanic/carry/glass.h
index 55c032269a..4e540152fa 100644
--- a/engines/titanic/carry/glass.h
+++ b/engines/titanic/carry/glass.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/carry/hammer.cpp b/engines/titanic/carry/hammer.cpp
index f1dc3b2aa0..d3b912184c 100644
--- a/engines/titanic/carry/hammer.cpp
+++ b/engines/titanic/carry/hammer.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CHammer::CHammer() : CCarry() {
 }
 
-void CHammer::save(SimpleFile *file, int indent) const {
+void CHammer::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CCarry::save(file, indent);
 }
diff --git a/engines/titanic/carry/hammer.h b/engines/titanic/carry/hammer.h
index e3180e76a0..e35fdd1d85 100644
--- a/engines/titanic/carry/hammer.h
+++ b/engines/titanic/carry/hammer.h
@@ -35,7 +35,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/carry/head_piece.cpp b/engines/titanic/carry/head_piece.cpp
index 1eab585462..ae709644a0 100644
--- a/engines/titanic/carry/head_piece.cpp
+++ b/engines/titanic/carry/head_piece.cpp
@@ -28,7 +28,7 @@ CHeadPiece::CHeadPiece() : CCarry(), _string6("Not Working"),
 		_field12C(0), _field13C(0) {
 }
 
-void CHeadPiece::save(SimpleFile *file, int indent) const {
+void CHeadPiece::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field12C, indent);
 	file->writeQuotedLine(_string6, indent);
diff --git a/engines/titanic/carry/head_piece.h b/engines/titanic/carry/head_piece.h
index daa5925530..1989b0ef2d 100644
--- a/engines/titanic/carry/head_piece.h
+++ b/engines/titanic/carry/head_piece.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/carry/hose.cpp b/engines/titanic/carry/hose.cpp
index 1617feffc1..747d58c339 100644
--- a/engines/titanic/carry/hose.cpp
+++ b/engines/titanic/carry/hose.cpp
@@ -38,7 +38,7 @@ CHose::CHose() : CCarry(),
 	_string6("Succ-U-Bus auxiliary hose attachment incompatible with sliding glass cover.") {
 }
 
-void CHose::save(SimpleFile *file, int indent) const {
+void CHose::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_statics->_v1, indent);
 	file->writeQuotedLine(_statics->_v2, indent);
diff --git a/engines/titanic/carry/hose.h b/engines/titanic/carry/hose.h
index c16351b937..d45fc08bc4 100644
--- a/engines/titanic/carry/hose.h
+++ b/engines/titanic/carry/hose.h
@@ -46,7 +46,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/carry/hose_end.cpp b/engines/titanic/carry/hose_end.cpp
index 6f15d5be1b..f6097c4db7 100644
--- a/engines/titanic/carry/hose_end.cpp
+++ b/engines/titanic/carry/hose_end.cpp
@@ -30,7 +30,7 @@ CHoseEnd::CHoseEnd() : CHose() {
 	_string6 = "Connection refused by remote hose.";
 }
 
-void CHoseEnd::save(SimpleFile *file, int indent) const {
+void CHoseEnd::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string6, indent);
 	CHose::save(file, indent);
diff --git a/engines/titanic/carry/hose_end.h b/engines/titanic/carry/hose_end.h
index 796191e12f..8a82ec5363 100644
--- a/engines/titanic/carry/hose_end.h
+++ b/engines/titanic/carry/hose_end.h
@@ -36,7 +36,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/carry/key.cpp b/engines/titanic/carry/key.cpp
index 2c559bb6c9..6e947464f1 100644
--- a/engines/titanic/carry/key.cpp
+++ b/engines/titanic/carry/key.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CKey::CKey() : CCarry() {
 }
 
-void CKey::save(SimpleFile *file, int indent) const {
+void CKey::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CCarry::save(file, indent);
 }
diff --git a/engines/titanic/carry/key.h b/engines/titanic/carry/key.h
index e6973b5c7c..6b7a134991 100644
--- a/engines/titanic/carry/key.h
+++ b/engines/titanic/carry/key.h
@@ -35,7 +35,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/carry/liftbot_head.cpp b/engines/titanic/carry/liftbot_head.cpp
index 422d88ad0f..bcab8e8574 100644
--- a/engines/titanic/carry/liftbot_head.cpp
+++ b/engines/titanic/carry/liftbot_head.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CLiftbotHead::CLiftbotHead() : CCarry(), _field12C(0) {
 }
 
-void CLiftbotHead::save(SimpleFile *file, int indent) const {
+void CLiftbotHead::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field12C, indent);
 	CCarry::save(file, indent);
diff --git a/engines/titanic/carry/liftbot_head.h b/engines/titanic/carry/liftbot_head.h
index f2b60c1d7e..9dc625014b 100644
--- a/engines/titanic/carry/liftbot_head.h
+++ b/engines/titanic/carry/liftbot_head.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/carry/long_stick.cpp b/engines/titanic/carry/long_stick.cpp
index d5bf73b9b0..ab1e42b81f 100644
--- a/engines/titanic/carry/long_stick.cpp
+++ b/engines/titanic/carry/long_stick.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CLongStick::CLongStick() : CCarry() {
 }
 
-void CLongStick::save(SimpleFile *file, int indent) const {
+void CLongStick::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CCarry::save(file, indent);
 }
diff --git a/engines/titanic/carry/long_stick.h b/engines/titanic/carry/long_stick.h
index e2718a3d2b..60bff0d6f7 100644
--- a/engines/titanic/carry/long_stick.h
+++ b/engines/titanic/carry/long_stick.h
@@ -35,7 +35,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/carry/magazine.cpp b/engines/titanic/carry/magazine.cpp
index 68d898c399..cdf92fc707 100644
--- a/engines/titanic/carry/magazine.cpp
+++ b/engines/titanic/carry/magazine.cpp
@@ -35,7 +35,7 @@ END_MESSAGE_MAP()
 CMagazine::CMagazine() : CCarry() {
 }
 
-void CMagazine::save(SimpleFile *file, int indent) const {
+void CMagazine::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field12C, indent);
 	file->writeNumberLine(_field130, indent);
diff --git a/engines/titanic/carry/magazine.h b/engines/titanic/carry/magazine.h
index 16ef4bb2b0..afe9598d3b 100644
--- a/engines/titanic/carry/magazine.h
+++ b/engines/titanic/carry/magazine.h
@@ -45,7 +45,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/carry/maitred_left_arm.cpp b/engines/titanic/carry/maitred_left_arm.cpp
index 6fb93ecc63..b31c2a6f6d 100644
--- a/engines/titanic/carry/maitred_left_arm.cpp
+++ b/engines/titanic/carry/maitred_left_arm.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CMaitreDLeftArm::save(SimpleFile *file, int indent) const {
+void CMaitreDLeftArm::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field174, indent);
 	CArm::save(file, indent);
diff --git a/engines/titanic/carry/maitred_left_arm.h b/engines/titanic/carry/maitred_left_arm.h
index e46485cdac..e59d84e2b7 100644
--- a/engines/titanic/carry/maitred_left_arm.h
+++ b/engines/titanic/carry/maitred_left_arm.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/carry/maitred_right_arm.cpp b/engines/titanic/carry/maitred_right_arm.cpp
index 15767a2fc2..7030e83c9d 100644
--- a/engines/titanic/carry/maitred_right_arm.cpp
+++ b/engines/titanic/carry/maitred_right_arm.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CMaitreDRightArm::save(SimpleFile *file, int indent) const {
+void CMaitreDRightArm::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CArm::save(file, indent);
 }
diff --git a/engines/titanic/carry/maitred_right_arm.h b/engines/titanic/carry/maitred_right_arm.h
index c89b7e82a3..f8a7861640 100644
--- a/engines/titanic/carry/maitred_right_arm.h
+++ b/engines/titanic/carry/maitred_right_arm.h
@@ -34,7 +34,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/carry/mouth.cpp b/engines/titanic/carry/mouth.cpp
index 058ffc42d7..8c3791fa9c 100644
--- a/engines/titanic/carry/mouth.cpp
+++ b/engines/titanic/carry/mouth.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CMouth::CMouth() : CHeadPiece() {
 }
 
-void CMouth::save(SimpleFile *file, int indent) const {
+void CMouth::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CHeadPiece::save(file, indent);
 }
diff --git a/engines/titanic/carry/mouth.h b/engines/titanic/carry/mouth.h
index 1c446b2296..0efaf73bbb 100644
--- a/engines/titanic/carry/mouth.h
+++ b/engines/titanic/carry/mouth.h
@@ -35,7 +35,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/carry/napkin.cpp b/engines/titanic/carry/napkin.cpp
index cba2b4a560..ace5a389a0 100644
--- a/engines/titanic/carry/napkin.cpp
+++ b/engines/titanic/carry/napkin.cpp
@@ -32,7 +32,7 @@ END_MESSAGE_MAP()
 CNapkin::CNapkin() : CCarry() {
 }
 
-void CNapkin::save(SimpleFile *file, int indent) const {
+void CNapkin::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CCarry::save(file, indent);
 }
diff --git a/engines/titanic/carry/napkin.h b/engines/titanic/carry/napkin.h
index ac14b70efa..b94a61837d 100644
--- a/engines/titanic/carry/napkin.h
+++ b/engines/titanic/carry/napkin.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/carry/nose.cpp b/engines/titanic/carry/nose.cpp
index cd5085db44..4f3afe24ac 100644
--- a/engines/titanic/carry/nose.cpp
+++ b/engines/titanic/carry/nose.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CNose::CNose() : CHeadPiece() {
 }
 
-void CNose::save(SimpleFile *file, int indent) const {
+void CNose::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CHeadPiece::save(file, indent);
 }
diff --git a/engines/titanic/carry/nose.h b/engines/titanic/carry/nose.h
index 717b639e82..337617c1c7 100644
--- a/engines/titanic/carry/nose.h
+++ b/engines/titanic/carry/nose.h
@@ -35,7 +35,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/carry/note.cpp b/engines/titanic/carry/note.cpp
index 78286d71bd..388f87e638 100644
--- a/engines/titanic/carry/note.cpp
+++ b/engines/titanic/carry/note.cpp
@@ -31,7 +31,7 @@ END_MESSAGE_MAP()
 CNote::CNote() : CCarry(), _field138(1) {
 }
 
-void CNote::save(SimpleFile *file, int indent) const {
+void CNote::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string6, indent);
 	file->writeNumberLine(_field138, indent);
diff --git a/engines/titanic/carry/note.h b/engines/titanic/carry/note.h
index 22a95b0bd3..f0563f57da 100644
--- a/engines/titanic/carry/note.h
+++ b/engines/titanic/carry/note.h
@@ -41,7 +41,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/carry/parcel.cpp b/engines/titanic/carry/parcel.cpp
index d532bac92b..13e2f6dec4 100644
--- a/engines/titanic/carry/parcel.cpp
+++ b/engines/titanic/carry/parcel.cpp
@@ -29,7 +29,7 @@ EMPTY_MESSAGE_MAP(CParcel, CCarry)
 CParcel::CParcel() : CCarry() {
 }
 
-void CParcel::save(SimpleFile *file, int indent) const {
+void CParcel::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CCarry::save(file, indent);
 }
diff --git a/engines/titanic/carry/parcel.h b/engines/titanic/carry/parcel.h
index cb36bed23d..7209bd31cd 100644
--- a/engines/titanic/carry/parcel.h
+++ b/engines/titanic/carry/parcel.h
@@ -36,7 +36,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/carry/perch.cpp b/engines/titanic/carry/perch.cpp
index 976921beb0..281b3fce53 100644
--- a/engines/titanic/carry/perch.cpp
+++ b/engines/titanic/carry/perch.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CPerch::save(SimpleFile *file, int indent) const {
+void CPerch::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CCentralCore::save(file, indent);
 }
diff --git a/engines/titanic/carry/perch.h b/engines/titanic/carry/perch.h
index 1ed2ccaa9f..ef04d1130f 100644
--- a/engines/titanic/carry/perch.h
+++ b/engines/titanic/carry/perch.h
@@ -34,7 +34,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/carry/phonograph_cylinder.cpp b/engines/titanic/carry/phonograph_cylinder.cpp
index d7b9fe6c96..0684c56611 100644
--- a/engines/titanic/carry/phonograph_cylinder.cpp
+++ b/engines/titanic/carry/phonograph_cylinder.cpp
@@ -46,7 +46,7 @@ CPhonographCylinder::CPhonographCylinder() : CCarry(),
 		_bassInversionControl(false) {
 }
 
-void CPhonographCylinder::save(SimpleFile *file, int indent) const {
+void CPhonographCylinder::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_itemName, indent);
 	file->writeNumberLine(_bellsMuteControl, indent);
diff --git a/engines/titanic/carry/phonograph_cylinder.h b/engines/titanic/carry/phonograph_cylinder.h
index 8c4ca6489e..2f950d175c 100644
--- a/engines/titanic/carry/phonograph_cylinder.h
+++ b/engines/titanic/carry/phonograph_cylinder.h
@@ -63,7 +63,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/carry/phonograph_ear.cpp b/engines/titanic/carry/phonograph_ear.cpp
index 0b4142ca37..ceb71babd2 100644
--- a/engines/titanic/carry/phonograph_ear.cpp
+++ b/engines/titanic/carry/phonograph_ear.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CPhonographEar::save(SimpleFile *file, int indent) const {
+void CPhonographEar::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field140, indent);
 	CEar::save(file, indent);
diff --git a/engines/titanic/carry/phonograph_ear.h b/engines/titanic/carry/phonograph_ear.h
index 71ef38f926..d450f2868e 100644
--- a/engines/titanic/carry/phonograph_ear.h
+++ b/engines/titanic/carry/phonograph_ear.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/carry/photograph.cpp b/engines/titanic/carry/photograph.cpp
index 7f76f394bd..7f32a0623d 100644
--- a/engines/titanic/carry/photograph.cpp
+++ b/engines/titanic/carry/photograph.cpp
@@ -37,7 +37,7 @@ int CPhotograph::_v1;
 CPhotograph::CPhotograph() : CCarry(), _field12C(0), _field130(0) {
 }
 
-void CPhotograph::save(SimpleFile *file, int indent) const {
+void CPhotograph::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field12C, indent);
 	file->writeNumberLine(_v1, indent);
diff --git a/engines/titanic/carry/photograph.h b/engines/titanic/carry/photograph.h
index b7ce488d09..3161e4861e 100644
--- a/engines/titanic/carry/photograph.h
+++ b/engines/titanic/carry/photograph.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/carry/plug_in.cpp b/engines/titanic/carry/plug_in.cpp
index e4fe54dd27..c82a4cc422 100644
--- a/engines/titanic/carry/plug_in.cpp
+++ b/engines/titanic/carry/plug_in.cpp
@@ -31,7 +31,7 @@ END_MESSAGE_MAP()
 CPlugIn::CPlugIn() : CCarry(), _field12C(0) {
 }
 
-void CPlugIn::save(SimpleFile *file, int indent) const {
+void CPlugIn::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CCarry::save(file, indent);
 }
diff --git a/engines/titanic/carry/plug_in.h b/engines/titanic/carry/plug_in.h
index f48a74bd2b..e788d15869 100644
--- a/engines/titanic/carry/plug_in.h
+++ b/engines/titanic/carry/plug_in.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/carry/speech_centre.cpp b/engines/titanic/carry/speech_centre.cpp
index 86ed730284..b8076aee76 100644
--- a/engines/titanic/carry/speech_centre.cpp
+++ b/engines/titanic/carry/speech_centre.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CSpeechCentre::save(SimpleFile *file, int indent) const {
+void CSpeechCentre::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field13C, indent);
 	file->writeQuotedLine(_string1, indent);
diff --git a/engines/titanic/carry/speech_centre.h b/engines/titanic/carry/speech_centre.h
index 8f6fdfdcd0..e16556e60f 100644
--- a/engines/titanic/carry/speech_centre.h
+++ b/engines/titanic/carry/speech_centre.h
@@ -40,7 +40,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/carry/sweets.cpp b/engines/titanic/carry/sweets.cpp
index 71295a3441..f19a8287b7 100644
--- a/engines/titanic/carry/sweets.cpp
+++ b/engines/titanic/carry/sweets.cpp
@@ -31,7 +31,7 @@ END_MESSAGE_MAP()
 CSweets::CSweets() : CCarry() {
 }
 
-void CSweets::save(SimpleFile *file, int indent) const {
+void CSweets::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CCarry::save(file, indent);
 }
diff --git a/engines/titanic/carry/sweets.h b/engines/titanic/carry/sweets.h
index 7fc0787f76..8eb0a1623a 100644
--- a/engines/titanic/carry/sweets.h
+++ b/engines/titanic/carry/sweets.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/carry/test_carry.cpp b/engines/titanic/carry/test_carry.cpp
index 26b4f566e9..0e86c51d0a 100644
--- a/engines/titanic/carry/test_carry.cpp
+++ b/engines/titanic/carry/test_carry.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CTestArray::save(SimpleFile *file, int indent) const {
+void CTestArray::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_value1, indent);
 	file->writeNumberLine(_value2, indent);
diff --git a/engines/titanic/carry/test_carry.h b/engines/titanic/carry/test_carry.h
index 56526b424e..b9591a7842 100644
--- a/engines/titanic/carry/test_carry.h
+++ b/engines/titanic/carry/test_carry.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/carry/vision_centre.cpp b/engines/titanic/carry/vision_centre.cpp
index b85f99fbf1..8c8bab15f8 100644
--- a/engines/titanic/carry/vision_centre.cpp
+++ b/engines/titanic/carry/vision_centre.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CVisionCentre::save(SimpleFile *file, int indent) const {
+void CVisionCentre::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CBrain::save(file, indent);
 }
diff --git a/engines/titanic/carry/vision_centre.h b/engines/titanic/carry/vision_centre.h
index ce1d9599a2..6cf2d9d49e 100644
--- a/engines/titanic/carry/vision_centre.h
+++ b/engines/titanic/carry/vision_centre.h
@@ -34,7 +34,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