aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game/pickup
diff options
context:
space:
mode:
authorPaul Gilbert2016-06-29 19:53:16 -0400
committerPaul Gilbert2016-07-15 19:25:58 -0400
commit5ccc0a66da38d23520234e7060efaf966d3345b9 (patch)
tree9cff2311be2b8e9cd1f62e76ae74e15f3d4c18fc /engines/titanic/game/pickup
parenta82bcd3ce7ef0ae604af45fdb56668fca47e7137 (diff)
downloadscummvm-rg350-5ccc0a66da38d23520234e7060efaf966d3345b9.tar.gz
scummvm-rg350-5ccc0a66da38d23520234e7060efaf966d3345b9.tar.bz2
scummvm-rg350-5ccc0a66da38d23520234e7060efaf966d3345b9.zip
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
Diffstat (limited to 'engines/titanic/game/pickup')
-rw-r--r--engines/titanic/game/pickup/pick_up.cpp2
-rw-r--r--engines/titanic/game/pickup/pick_up.h2
-rw-r--r--engines/titanic/game/pickup/pick_up_bar_glass.cpp2
-rw-r--r--engines/titanic/game/pickup/pick_up_bar_glass.h2
-rw-r--r--engines/titanic/game/pickup/pick_up_hose.cpp2
-rw-r--r--engines/titanic/game/pickup/pick_up_hose.h2
-rw-r--r--engines/titanic/game/pickup/pick_up_lemon.cpp2
-rw-r--r--engines/titanic/game/pickup/pick_up_lemon.h2
-rw-r--r--engines/titanic/game/pickup/pick_up_speech_centre.cpp2
-rw-r--r--engines/titanic/game/pickup/pick_up_speech_centre.h2
-rw-r--r--engines/titanic/game/pickup/pick_up_vis_centre.cpp2
-rw-r--r--engines/titanic/game/pickup/pick_up_vis_centre.h2
12 files changed, 12 insertions, 12 deletions
diff --git a/engines/titanic/game/pickup/pick_up.cpp b/engines/titanic/game/pickup/pick_up.cpp
index 58ffc5ad09..c660a36a32 100644
--- a/engines/titanic/game/pickup/pick_up.cpp
+++ b/engines/titanic/game/pickup/pick_up.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CPickUp::save(SimpleFile *file, int indent) const {
+void CPickUp::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_fieldBC, indent);
CGameObject::save(file, indent);
diff --git a/engines/titanic/game/pickup/pick_up.h b/engines/titanic/game/pickup/pick_up.h
index d5a858017d..76537d1e74 100644
--- a/engines/titanic/game/pickup/pick_up.h
+++ b/engines/titanic/game/pickup/pick_up.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/game/pickup/pick_up_bar_glass.cpp b/engines/titanic/game/pickup/pick_up_bar_glass.cpp
index 1d475c2a85..85b883281e 100644
--- a/engines/titanic/game/pickup/pick_up_bar_glass.cpp
+++ b/engines/titanic/game/pickup/pick_up_bar_glass.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CPickUpBarGlass::save(SimpleFile *file, int indent) const {
+void CPickUpBarGlass::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
CPickUp::save(file, indent);
}
diff --git a/engines/titanic/game/pickup/pick_up_bar_glass.h b/engines/titanic/game/pickup/pick_up_bar_glass.h
index f1c75555ad..f9bcb00192 100644
--- a/engines/titanic/game/pickup/pick_up_bar_glass.h
+++ b/engines/titanic/game/pickup/pick_up_bar_glass.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/game/pickup/pick_up_hose.cpp b/engines/titanic/game/pickup/pick_up_hose.cpp
index e6902cb6b3..7375ddaa63 100644
--- a/engines/titanic/game/pickup/pick_up_hose.cpp
+++ b/engines/titanic/game/pickup/pick_up_hose.cpp
@@ -26,7 +26,7 @@ namespace Titanic {
int CPickUpHose::_v1;
-void CPickUpHose::save(SimpleFile *file, int indent) const {
+void CPickUpHose::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeQuotedLine(_string1, indent);
file->writeNumberLine(_v1, indent);
diff --git a/engines/titanic/game/pickup/pick_up_hose.h b/engines/titanic/game/pickup/pick_up_hose.h
index 9014934ba1..68bec367d4 100644
--- a/engines/titanic/game/pickup/pick_up_hose.h
+++ b/engines/titanic/game/pickup/pick_up_hose.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/game/pickup/pick_up_lemon.cpp b/engines/titanic/game/pickup/pick_up_lemon.cpp
index 7364fee299..772114f76c 100644
--- a/engines/titanic/game/pickup/pick_up_lemon.cpp
+++ b/engines/titanic/game/pickup/pick_up_lemon.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CPickUpLemon::save(SimpleFile *file, int indent) const {
+void CPickUpLemon::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
CPickUp::save(file, indent);
}
diff --git a/engines/titanic/game/pickup/pick_up_lemon.h b/engines/titanic/game/pickup/pick_up_lemon.h
index dc2942f366..9bed9ceb73 100644
--- a/engines/titanic/game/pickup/pick_up_lemon.h
+++ b/engines/titanic/game/pickup/pick_up_lemon.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/game/pickup/pick_up_speech_centre.cpp b/engines/titanic/game/pickup/pick_up_speech_centre.cpp
index 74c473943e..0b9a8d2c48 100644
--- a/engines/titanic/game/pickup/pick_up_speech_centre.cpp
+++ b/engines/titanic/game/pickup/pick_up_speech_centre.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CPickUpSpeechCentre::save(SimpleFile *file, int indent) const {
+void CPickUpSpeechCentre::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
CPickUp::save(file, indent);
}
diff --git a/engines/titanic/game/pickup/pick_up_speech_centre.h b/engines/titanic/game/pickup/pick_up_speech_centre.h
index 5d7d133ccc..a74566b4d5 100644
--- a/engines/titanic/game/pickup/pick_up_speech_centre.h
+++ b/engines/titanic/game/pickup/pick_up_speech_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/game/pickup/pick_up_vis_centre.cpp b/engines/titanic/game/pickup/pick_up_vis_centre.cpp
index 8fda66fe3d..796e46778c 100644
--- a/engines/titanic/game/pickup/pick_up_vis_centre.cpp
+++ b/engines/titanic/game/pickup/pick_up_vis_centre.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CPickUpVisCentre::save(SimpleFile *file, int indent) const {
+void CPickUpVisCentre::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
CPickUp::save(file, indent);
}
diff --git a/engines/titanic/game/pickup/pick_up_vis_centre.h b/engines/titanic/game/pickup/pick_up_vis_centre.h
index 4345fceda9..059c4f85b0 100644
--- a/engines/titanic/game/pickup/pick_up_vis_centre.h
+++ b/engines/titanic/game/pickup/pick_up_vis_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