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/core/background.cpp            | 2 +-
 engines/titanic/core/background.h              | 2 +-
 engines/titanic/core/click_responder.cpp       | 2 +-
 engines/titanic/core/click_responder.h         | 2 +-
 engines/titanic/core/dont_save_file_item.cpp   | 2 +-
 engines/titanic/core/dont_save_file_item.h     | 2 +-
 engines/titanic/core/drop_target.cpp           | 2 +-
 engines/titanic/core/drop_target.h             | 2 +-
 engines/titanic/core/file_item.cpp             | 2 +-
 engines/titanic/core/file_item.h               | 2 +-
 engines/titanic/core/game_object.cpp           | 2 +-
 engines/titanic/core/game_object.h             | 2 +-
 engines/titanic/core/game_object_desc_item.cpp | 2 +-
 engines/titanic/core/game_object_desc_item.h   | 2 +-
 engines/titanic/core/link_item.cpp             | 2 +-
 engines/titanic/core/link_item.h               | 2 +-
 engines/titanic/core/list.cpp                  | 2 +-
 engines/titanic/core/list.h                    | 8 ++++----
 engines/titanic/core/mail_man.cpp              | 2 +-
 engines/titanic/core/mail_man.h                | 2 +-
 engines/titanic/core/message_target.cpp        | 2 +-
 engines/titanic/core/message_target.h          | 2 +-
 engines/titanic/core/multi_drop_target.cpp     | 2 +-
 engines/titanic/core/multi_drop_target.h       | 2 +-
 engines/titanic/core/named_item.cpp            | 2 +-
 engines/titanic/core/named_item.h              | 2 +-
 engines/titanic/core/node_item.cpp             | 2 +-
 engines/titanic/core/node_item.h               | 2 +-
 engines/titanic/core/project_item.cpp          | 4 ++--
 engines/titanic/core/project_item.h            | 4 ++--
 engines/titanic/core/resource_key.cpp          | 2 +-
 engines/titanic/core/resource_key.h            | 2 +-
 engines/titanic/core/room_item.cpp             | 2 +-
 engines/titanic/core/room_item.h               | 2 +-
 engines/titanic/core/saveable_object.cpp       | 6 +++---
 engines/titanic/core/saveable_object.h         | 6 +++---
 engines/titanic/core/static_image.cpp          | 2 +-
 engines/titanic/core/static_image.h            | 2 +-
 engines/titanic/core/tree_item.cpp             | 2 +-
 engines/titanic/core/tree_item.h               | 2 +-
 engines/titanic/core/turn_on_object.cpp        | 2 +-
 engines/titanic/core/turn_on_object.h          | 2 +-
 engines/titanic/core/turn_on_play_sound.cpp    | 2 +-
 engines/titanic/core/turn_on_play_sound.h      | 2 +-
 engines/titanic/core/turn_on_turn_off.cpp      | 2 +-
 engines/titanic/core/turn_on_turn_off.h        | 2 +-
 engines/titanic/core/view_item.cpp             | 2 +-
 engines/titanic/core/view_item.h               | 2 +-
 48 files changed, 57 insertions(+), 57 deletions(-)

(limited to 'engines/titanic/core')

diff --git a/engines/titanic/core/background.cpp b/engines/titanic/core/background.cpp
index 52ff4c4ac2..f180df8867 100644
--- a/engines/titanic/core/background.cpp
+++ b/engines/titanic/core/background.cpp
@@ -33,7 +33,7 @@ END_MESSAGE_MAP()
 CBackground::CBackground() : CGameObject(), _fieldBC(0), _fieldC0(0), _fieldDC(0) {
 }
 
-void CBackground::save(SimpleFile *file, int indent) const {
+void CBackground::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_fieldBC, indent);
 	file->writeNumberLine(_fieldC0, indent);
diff --git a/engines/titanic/core/background.h b/engines/titanic/core/background.h
index f4969d4454..ef9a6c3e7b 100644
--- a/engines/titanic/core/background.h
+++ b/engines/titanic/core/background.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/core/click_responder.cpp b/engines/titanic/core/click_responder.cpp
index 9e8564b6d5..f9694557df 100644
--- a/engines/titanic/core/click_responder.cpp
+++ b/engines/titanic/core/click_responder.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CClickResponder::save(SimpleFile *file, int indent) const {
+void CClickResponder::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string1, indent);
 	file->writeQuotedLine(_string2, indent);
diff --git a/engines/titanic/core/click_responder.h b/engines/titanic/core/click_responder.h
index 68d3e34cdd..c682530f76 100644
--- a/engines/titanic/core/click_responder.h
+++ b/engines/titanic/core/click_responder.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/core/dont_save_file_item.cpp b/engines/titanic/core/dont_save_file_item.cpp
index 00b7dd22ce..87ab77e78b 100644
--- a/engines/titanic/core/dont_save_file_item.cpp
+++ b/engines/titanic/core/dont_save_file_item.cpp
@@ -26,7 +26,7 @@ namespace Titanic {
 
 EMPTY_MESSAGE_MAP(CDontSaveFileItem, CFileItem)
 
-void CDontSaveFileItem::save(SimpleFile *file, int indent) const {
+void CDontSaveFileItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
 }
 
diff --git a/engines/titanic/core/dont_save_file_item.h b/engines/titanic/core/dont_save_file_item.h
index 7517976825..242e37372a 100644
--- a/engines/titanic/core/dont_save_file_item.h
+++ b/engines/titanic/core/dont_save_file_item.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/core/drop_target.cpp b/engines/titanic/core/drop_target.cpp
index 9782967105..05ea6445c3 100644
--- a/engines/titanic/core/drop_target.cpp
+++ b/engines/titanic/core/drop_target.cpp
@@ -29,7 +29,7 @@ CDropTarget::CDropTarget() : CGameObject(), _fieldC4(0),
 	_fieldFC(0), _field10C(1), _field110(8), _field114(20) {
 }
 
-void CDropTarget::save(SimpleFile *file, int indent) const {
+void CDropTarget::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writePoint(_pos1, indent);
 	file->writeNumberLine(_fieldC4, indent);
diff --git a/engines/titanic/core/drop_target.h b/engines/titanic/core/drop_target.h
index 6c1cdcfe38..99734d71f4 100644
--- a/engines/titanic/core/drop_target.h
+++ b/engines/titanic/core/drop_target.h
@@ -50,7 +50,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/core/file_item.cpp b/engines/titanic/core/file_item.cpp
index 566f9104a9..824195d97c 100644
--- a/engines/titanic/core/file_item.cpp
+++ b/engines/titanic/core/file_item.cpp
@@ -26,7 +26,7 @@ namespace Titanic {
 
 EMPTY_MESSAGE_MAP(CFileItem, CTreeItem)
 
-void CFileItem::save(SimpleFile *file, int indent) const {
+void CFileItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
 	CTreeItem::save(file, indent);
 }
diff --git a/engines/titanic/core/file_item.h b/engines/titanic/core/file_item.h
index e8e4935de0..4210251af0 100644
--- a/engines/titanic/core/file_item.h
+++ b/engines/titanic/core/file_item.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/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index af866ddac4..29ad735a66 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -80,7 +80,7 @@ CGameObject::~CGameObject() {
 	delete _text;
 }
 
-void CGameObject::save(SimpleFile *file, int indent) const {
+void CGameObject::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(7, indent);
 	error("TODO: CGameObject::save");
 
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 98d6d6099e..1afe834876 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -523,7 +523,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/core/game_object_desc_item.cpp b/engines/titanic/core/game_object_desc_item.cpp
index 77174e5d06..409334c9d7 100644
--- a/engines/titanic/core/game_object_desc_item.cpp
+++ b/engines/titanic/core/game_object_desc_item.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CGameObjectDescItem::CGameObjectDescItem(): CTreeItem() {
 }
 
-void CGameObjectDescItem::save(SimpleFile *file, int indent) const {
+void CGameObjectDescItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	_clipList.save(file, indent);
 	file->writeQuotedLine(_string1, indent);
diff --git a/engines/titanic/core/game_object_desc_item.h b/engines/titanic/core/game_object_desc_item.h
index 5bfc483b44..df9ef7bdd1 100644
--- a/engines/titanic/core/game_object_desc_item.h
+++ b/engines/titanic/core/game_object_desc_item.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/core/link_item.cpp b/engines/titanic/core/link_item.cpp
index a0460bd2c6..a56122fa43 100644
--- a/engines/titanic/core/link_item.cpp
+++ b/engines/titanic/core/link_item.cpp
@@ -43,7 +43,7 @@ CString CLinkItem::formName() {
 	return "";
 }
 
-void CLinkItem::save(SimpleFile *file, int indent) const {
+void CLinkItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(2, indent);
 	file->writeQuotedLine("L", indent);
 	file->writeNumberLine(_cursorId, indent + 1);
diff --git a/engines/titanic/core/link_item.h b/engines/titanic/core/link_item.h
index 328d5bcc06..09f3a7ab48 100644
--- a/engines/titanic/core/link_item.h
+++ b/engines/titanic/core/link_item.h
@@ -56,7 +56,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/core/list.cpp b/engines/titanic/core/list.cpp
index d733ce25c5..8e90e9ff40 100644
--- a/engines/titanic/core/list.cpp
+++ b/engines/titanic/core/list.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void ListItem::save(SimpleFile *file, int indent) const {
+void ListItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
 }
 
diff --git a/engines/titanic/core/list.h b/engines/titanic/core/list.h
index 4052a018c7..eb87d7fe1c 100644
--- a/engines/titanic/core/list.h
+++ b/engines/titanic/core/list.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
@@ -76,7 +76,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) {
 		file->writeNumberLine(0, indent);
 
 		// Write out number of items
@@ -84,9 +84,9 @@ public:
 		file->writeNumberLine(Common::List<T *>::size(), indent);
 
 		// Iterate through writing entries
-		typename Common::List<T *>::const_iterator i;
+		typename Common::List<T *>::iterator i;
 		for (i = Common::List<T *>::begin(); i != Common::List<T *>::end(); ++i) {
-			const ListItem *item = *i;
+			ListItem *item = *i;
 			item->saveHeader(file, indent);
 			item->save(file, indent + 1);
 			item->saveFooter(file, indent);
diff --git a/engines/titanic/core/mail_man.cpp b/engines/titanic/core/mail_man.cpp
index 8226ebfc80..afe13bebad 100644
--- a/engines/titanic/core/mail_man.cpp
+++ b/engines/titanic/core/mail_man.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CMailMan::save(SimpleFile *file, int indent) const {
+void CMailMan::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_value, indent);
 	CGameObject::save(file, indent);
diff --git a/engines/titanic/core/mail_man.h b/engines/titanic/core/mail_man.h
index 982aae4cc0..27a6cd11c0 100644
--- a/engines/titanic/core/mail_man.h
+++ b/engines/titanic/core/mail_man.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/core/message_target.cpp b/engines/titanic/core/message_target.cpp
index b99fa5c606..4815d03973 100644
--- a/engines/titanic/core/message_target.cpp
+++ b/engines/titanic/core/message_target.cpp
@@ -37,7 +37,7 @@ const MSGMAP *CMessageTarget::getThisMessageMap() {
 	return &messageMap;
 }
 
-void CMessageTarget::save(SimpleFile *file, int indent) const {
+void CMessageTarget::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
 	CSaveableObject::save(file, indent);
 }
diff --git a/engines/titanic/core/message_target.h b/engines/titanic/core/message_target.h
index 42e9e5a3c4..5508c47c95 100644
--- a/engines/titanic/core/message_target.h
+++ b/engines/titanic/core/message_target.h
@@ -90,7 +90,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/core/multi_drop_target.cpp b/engines/titanic/core/multi_drop_target.cpp
index 1f6e6cf210..f2998199b1 100644
--- a/engines/titanic/core/multi_drop_target.cpp
+++ b/engines/titanic/core/multi_drop_target.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-void CMultiDropTarget::save(SimpleFile *file, int indent) const {
+void CMultiDropTarget::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string5, indent);
 	file->writeQuotedLine(_string6, indent);
diff --git a/engines/titanic/core/multi_drop_target.h b/engines/titanic/core/multi_drop_target.h
index ddf20e441e..22cc0941a3 100644
--- a/engines/titanic/core/multi_drop_target.h
+++ b/engines/titanic/core/multi_drop_target.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/core/named_item.cpp b/engines/titanic/core/named_item.cpp
index 981627a280..2b741f7657 100644
--- a/engines/titanic/core/named_item.cpp
+++ b/engines/titanic/core/named_item.cpp
@@ -36,7 +36,7 @@ CString CNamedItem::dumpItem(int indent) const {
 	return result;
 }
 
-void CNamedItem::save(SimpleFile *file, int indent) const {
+void CNamedItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
 	file->writeQuotedLine(_name, indent);
 
diff --git a/engines/titanic/core/named_item.h b/engines/titanic/core/named_item.h
index 9763e1b332..889a847e9d 100644
--- a/engines/titanic/core/named_item.h
+++ b/engines/titanic/core/named_item.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/core/node_item.cpp b/engines/titanic/core/node_item.cpp
index 57acbdb3b8..79188dd385 100644
--- a/engines/titanic/core/node_item.cpp
+++ b/engines/titanic/core/node_item.cpp
@@ -29,7 +29,7 @@ EMPTY_MESSAGE_MAP(CNodeItem, CNamedItem)
 CNodeItem::CNodeItem() : CNamedItem(), _nodeNumber(0) {
 }
 
-void CNodeItem::save(SimpleFile *file, int indent) const {
+void CNodeItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
 	file->writeQuotedLine("N", indent);
 	file->writeNumberLine(_nodePos.x, indent + 1);
diff --git a/engines/titanic/core/node_item.h b/engines/titanic/core/node_item.h
index 85003bf97c..ff57448c7f 100644
--- a/engines/titanic/core/node_item.h
+++ b/engines/titanic/core/node_item.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/core/project_item.cpp b/engines/titanic/core/project_item.cpp
index 586301b9f4..a768d0e955 100644
--- a/engines/titanic/core/project_item.cpp
+++ b/engines/titanic/core/project_item.cpp
@@ -43,7 +43,7 @@ static const char *const SAVEGAME_STR = "TNIC";
 
 EMPTY_MESSAGE_MAP(CProjectItem, CFileItem)
 
-void CFileListItem::save(SimpleFile *file, int indent) const {
+void CFileListItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
 	file->writeQuotedLine(_name, indent);
 
@@ -63,7 +63,7 @@ CProjectItem::CProjectItem() : _nextRoomNumber(0), _nextMessageNumber(0),
 		_nextObjectNumber(0), _gameManager(nullptr) {
 }
 
-void CProjectItem::save(SimpleFile *file, int indent) const {
+void CProjectItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(6, indent);
 	file->writeQuotedLine("Next Avail. Object Number", indent);
 	file->writeNumberLine(_nextObjectNumber, indent);
diff --git a/engines/titanic/core/project_item.h b/engines/titanic/core/project_item.h
index d0b8d77598..9270bdf6d1 100644
--- a/engines/titanic/core/project_item.h
+++ b/engines/titanic/core/project_item.h
@@ -61,7 +61,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
@@ -156,7 +156,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/core/resource_key.cpp b/engines/titanic/core/resource_key.cpp
index a6a06153de..3b390af2d4 100644
--- a/engines/titanic/core/resource_key.cpp
+++ b/engines/titanic/core/resource_key.cpp
@@ -27,7 +27,7 @@
 
 namespace Titanic {
 
-void CResourceKey::save(SimpleFile *file, int indent) const {
+void CResourceKey::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine("Resource Key...", indent);
 	file->writeQuotedLine(_key, indent);
diff --git a/engines/titanic/core/resource_key.h b/engines/titanic/core/resource_key.h
index 8a6f86f193..eb08334de7 100644
--- a/engines/titanic/core/resource_key.h
+++ b/engines/titanic/core/resource_key.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/core/room_item.cpp b/engines/titanic/core/room_item.cpp
index b3a3fe41cc..78bd678138 100644
--- a/engines/titanic/core/room_item.cpp
+++ b/engines/titanic/core/room_item.cpp
@@ -30,7 +30,7 @@ CRoomItem::CRoomItem() : CNamedItem(), _roomNumber(0),
 		_roomDimensionX(0.0), _roomDimensionY(0.0) {
 }
 
-void CRoomItem::save(SimpleFile *file, int indent) const {
+void CRoomItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(3, indent);
 	file->writeQuotedLine("Exit Movies", indent);
 	_exitMovieKey.save(file, indent);
diff --git a/engines/titanic/core/room_item.h b/engines/titanic/core/room_item.h
index eb7f4c43bf..bcdc95ebe0 100644
--- a/engines/titanic/core/room_item.h
+++ b/engines/titanic/core/room_item.h
@@ -52,7 +52,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/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp
index ad98ac4dfd..d3c64a13ec 100644
--- a/engines/titanic/core/saveable_object.cpp
+++ b/engines/titanic/core/saveable_object.cpp
@@ -1614,7 +1614,7 @@ CSaveableObject *CSaveableObject::createInstance(const Common::String &name) {
 	return (*_classList)[name]();
 }
 
-void CSaveableObject::save(SimpleFile *file, int indent) const {
+void CSaveableObject::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
 }
 
@@ -1622,11 +1622,11 @@ void CSaveableObject::load(SimpleFile *file) {
 	file->readNumber();
 }
 
-void CSaveableObject::saveHeader(SimpleFile *file, int indent) const {
+void CSaveableObject::saveHeader(SimpleFile *file, int indent) {
 	file->writeClassStart(getType()->_className, indent);
 }
 
-void CSaveableObject::saveFooter(SimpleFile *file, int indent) const {
+void CSaveableObject::saveFooter(SimpleFile *file, int indent) {
 	file->writeClassEnd(indent);
 }
 
diff --git a/engines/titanic/core/saveable_object.h b/engines/titanic/core/saveable_object.h
index e067df2b99..6d80ad121d 100644
--- a/engines/titanic/core/saveable_object.h
+++ b/engines/titanic/core/saveable_object.h
@@ -85,7 +85,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
@@ -96,13 +96,13 @@ public:
 	 * Write out a header definition for the class to file
 	 * prior to saving the actual data for the class
 	 */
-	virtual void saveHeader(SimpleFile *file, int indent) const;
+	virtual void saveHeader(SimpleFile *file, int indent);
 	
 	/**
 	 * Writes out a footer for the class after it's data has
 	 * been written to file
 	 */
-	virtual void saveFooter(SimpleFile *file, int indent) const;
+	virtual void saveFooter(SimpleFile *file, int indent);
 };
 
 } // End of namespace Titanic
diff --git a/engines/titanic/core/static_image.cpp b/engines/titanic/core/static_image.cpp
index cc8e1ddc1a..67286108d8 100644
--- a/engines/titanic/core/static_image.cpp
+++ b/engines/titanic/core/static_image.cpp
@@ -26,7 +26,7 @@ namespace Titanic {
 
 EMPTY_MESSAGE_MAP(CStaticImage, CGameObject)
 
-void CStaticImage::save(SimpleFile *file, int indent) const {
+void CStaticImage::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	CGameObject::save(file, indent);
 }
diff --git a/engines/titanic/core/static_image.h b/engines/titanic/core/static_image.h
index 953cf4d6bf..27f861ef55 100644
--- a/engines/titanic/core/static_image.h
+++ b/engines/titanic/core/static_image.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/core/tree_item.cpp b/engines/titanic/core/tree_item.cpp
index 21496ee8a5..de3d87e0d3 100644
--- a/engines/titanic/core/tree_item.cpp
+++ b/engines/titanic/core/tree_item.cpp
@@ -65,7 +65,7 @@ CString CTreeItem::dumpItem(int indent) const {
 	return result;
 }
 
-void CTreeItem::save(SimpleFile *file, int indent) const {
+void CTreeItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(0, indent);
 	CMessageTarget::save(file, indent);
 }
diff --git a/engines/titanic/core/tree_item.h b/engines/titanic/core/tree_item.h
index 77d7aa59b5..a15a5ae52f 100644
--- a/engines/titanic/core/tree_item.h
+++ b/engines/titanic/core/tree_item.h
@@ -62,7 +62,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/core/turn_on_object.cpp b/engines/titanic/core/turn_on_object.cpp
index a24843b3bb..221602bb7b 100644
--- a/engines/titanic/core/turn_on_object.cpp
+++ b/engines/titanic/core/turn_on_object.cpp
@@ -32,7 +32,7 @@ END_MESSAGE_MAP()
 CTurnOnObject::CTurnOnObject() : CBackground(), _msgName("NULL") {
 }
 
-void CTurnOnObject::save(SimpleFile *file, int indent) const {
+void CTurnOnObject::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_msgName, indent);
 
diff --git a/engines/titanic/core/turn_on_object.h b/engines/titanic/core/turn_on_object.h
index 3ac5a897f1..7150069909 100644
--- a/engines/titanic/core/turn_on_object.h
+++ b/engines/titanic/core/turn_on_object.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/core/turn_on_play_sound.cpp b/engines/titanic/core/turn_on_play_sound.cpp
index d56aef8bb7..2f9dba24a6 100644
--- a/engines/titanic/core/turn_on_play_sound.cpp
+++ b/engines/titanic/core/turn_on_play_sound.cpp
@@ -28,7 +28,7 @@ CTurnOnPlaySound::CTurnOnPlaySound() : CTurnOnObject(),
 		_string3("NULL"), _fieldF8(80), _fieldFC(0) {
 }
 
-void CTurnOnPlaySound::save(SimpleFile *file, int indent) const {
+void CTurnOnPlaySound::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string3, indent);
 	file->writeNumberLine(_fieldF8, indent);
diff --git a/engines/titanic/core/turn_on_play_sound.h b/engines/titanic/core/turn_on_play_sound.h
index 263709b844..58d33ab78b 100644
--- a/engines/titanic/core/turn_on_play_sound.h
+++ b/engines/titanic/core/turn_on_play_sound.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/core/turn_on_turn_off.cpp b/engines/titanic/core/turn_on_turn_off.cpp
index a6a65e30f2..d43ddf7038 100644
--- a/engines/titanic/core/turn_on_turn_off.cpp
+++ b/engines/titanic/core/turn_on_turn_off.cpp
@@ -28,7 +28,7 @@ CTurnOnTurnOff::CTurnOnTurnOff() : CBackground(), _fieldE0(0),
 	_fieldE4(0), _fieldE8(0), _fieldEC(0), _fieldF0(0) {
 }
 
-void CTurnOnTurnOff::save(SimpleFile *file, int indent) const {
+void CTurnOnTurnOff::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_fieldE0, indent);
 	file->writeNumberLine(_fieldE4, indent);
diff --git a/engines/titanic/core/turn_on_turn_off.h b/engines/titanic/core/turn_on_turn_off.h
index 5683a0db0e..2df8830b0f 100644
--- a/engines/titanic/core/turn_on_turn_off.h
+++ b/engines/titanic/core/turn_on_turn_off.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/core/view_item.cpp b/engines/titanic/core/view_item.cpp
index 8faf100238..56069a9799 100644
--- a/engines/titanic/core/view_item.cpp
+++ b/engines/titanic/core/view_item.cpp
@@ -53,7 +53,7 @@ void CViewItem::setData(double v) {
 	_field54 = sin(_field28) * -30.0;
 }
 
-void CViewItem::save(SimpleFile *file, int indent) const {
+void CViewItem::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	_resourceKey.save(file, indent);
 	file->writeQuotedLine("V", indent);
diff --git a/engines/titanic/core/view_item.h b/engines/titanic/core/view_item.h
index d85117a0ec..4e25c007d9 100644
--- a/engines/titanic/core/view_item.h
+++ b/engines/titanic/core/view_item.h
@@ -65,7 +65,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