aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game/parrot
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/parrot
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/parrot')
-rw-r--r--engines/titanic/game/parrot/parrot_lobby_controller.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_lobby_controller.h2
-rw-r--r--engines/titanic/game/parrot/parrot_lobby_link_updater.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_lobby_link_updater.h2
-rw-r--r--engines/titanic/game/parrot/parrot_lobby_object.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_lobby_object.h2
-rw-r--r--engines/titanic/game/parrot/parrot_lobby_view_object.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_lobby_view_object.h2
-rw-r--r--engines/titanic/game/parrot/parrot_loser.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_loser.h2
-rw-r--r--engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_nut_bowl_actor.h2
-rw-r--r--engines/titanic/game/parrot/parrot_nut_eater.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_nut_eater.h2
-rw-r--r--engines/titanic/game/parrot/parrot_perch_holder.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_perch_holder.h2
-rw-r--r--engines/titanic/game/parrot/parrot_succubus.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_succubus.h2
-rw-r--r--engines/titanic/game/parrot/parrot_trigger.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_trigger.h2
-rw-r--r--engines/titanic/game/parrot/player_meets_parrot.cpp2
-rw-r--r--engines/titanic/game/parrot/player_meets_parrot.h2
22 files changed, 22 insertions, 22 deletions
diff --git a/engines/titanic/game/parrot/parrot_lobby_controller.cpp b/engines/titanic/game/parrot/parrot_lobby_controller.cpp
index 2376cea25c..f1e054a8dd 100644
--- a/engines/titanic/game/parrot/parrot_lobby_controller.cpp
+++ b/engines/titanic/game/parrot/parrot_lobby_controller.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CParrotLobbyController::save(SimpleFile *file, int indent) const {
+void CParrotLobbyController::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
CParrotLobbyObject::save(file, indent);
}
diff --git a/engines/titanic/game/parrot/parrot_lobby_controller.h b/engines/titanic/game/parrot/parrot_lobby_controller.h
index 6515a23944..9f5ddcab75 100644
--- a/engines/titanic/game/parrot/parrot_lobby_controller.h
+++ b/engines/titanic/game/parrot/parrot_lobby_controller.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/parrot/parrot_lobby_link_updater.cpp b/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp
index e62e9dde48..25d5ec724b 100644
--- a/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp
+++ b/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CParrotLobbyLinkUpdater::save(SimpleFile *file, int indent) const {
+void CParrotLobbyLinkUpdater::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
CParrotLobbyObject::save(file, indent);
}
diff --git a/engines/titanic/game/parrot/parrot_lobby_link_updater.h b/engines/titanic/game/parrot/parrot_lobby_link_updater.h
index 2f3ce7bac4..a433f0be84 100644
--- a/engines/titanic/game/parrot/parrot_lobby_link_updater.h
+++ b/engines/titanic/game/parrot/parrot_lobby_link_updater.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/parrot/parrot_lobby_object.cpp b/engines/titanic/game/parrot/parrot_lobby_object.cpp
index 8090a1d46c..9d556b5b91 100644
--- a/engines/titanic/game/parrot/parrot_lobby_object.cpp
+++ b/engines/titanic/game/parrot/parrot_lobby_object.cpp
@@ -38,7 +38,7 @@ void CParrotLobbyObject::init() {
_v4 = 7;
}
-void CParrotLobbyObject::save(SimpleFile *file, int indent) const {
+void CParrotLobbyObject::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_v1, indent);
file->writeNumberLine(_v2, indent);
diff --git a/engines/titanic/game/parrot/parrot_lobby_object.h b/engines/titanic/game/parrot/parrot_lobby_object.h
index 5b53276eb0..967ad23fd8 100644
--- a/engines/titanic/game/parrot/parrot_lobby_object.h
+++ b/engines/titanic/game/parrot/parrot_lobby_object.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/game/parrot/parrot_lobby_view_object.cpp b/engines/titanic/game/parrot/parrot_lobby_view_object.cpp
index 740eac83de..ae398036a8 100644
--- a/engines/titanic/game/parrot/parrot_lobby_view_object.cpp
+++ b/engines/titanic/game/parrot/parrot_lobby_view_object.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CParrotLobbyViewObject::save(SimpleFile *file, int indent) const {
+void CParrotLobbyViewObject::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_fieldBC, indent);
CParrotLobbyObject::save(file, indent);
diff --git a/engines/titanic/game/parrot/parrot_lobby_view_object.h b/engines/titanic/game/parrot/parrot_lobby_view_object.h
index 1e3e398c2c..656924ff9f 100644
--- a/engines/titanic/game/parrot/parrot_lobby_view_object.h
+++ b/engines/titanic/game/parrot/parrot_lobby_view_object.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/parrot/parrot_loser.cpp b/engines/titanic/game/parrot/parrot_loser.cpp
index e82506e137..6e23ef8314 100644
--- a/engines/titanic/game/parrot/parrot_loser.cpp
+++ b/engines/titanic/game/parrot/parrot_loser.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CParrotLoser::save(SimpleFile *file, int indent) const {
+void CParrotLoser::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
CGameObject::save(file, indent);
}
diff --git a/engines/titanic/game/parrot/parrot_loser.h b/engines/titanic/game/parrot/parrot_loser.h
index 806195db19..c1e6c9fddd 100644
--- a/engines/titanic/game/parrot/parrot_loser.h
+++ b/engines/titanic/game/parrot/parrot_loser.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/parrot/parrot_nut_bowl_actor.cpp b/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
index 0917319da0..c83d66cbdf 100644
--- a/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
@@ -28,7 +28,7 @@ CParrotNutBowlActor::CParrotNutBowlActor() : CGameObject(),
_value1(0), _value2(0) {
}
-void CParrotNutBowlActor::save(SimpleFile *file, int indent) const {
+void CParrotNutBowlActor::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_value1, indent);
file->writeNumberLine(_value2, indent);
diff --git a/engines/titanic/game/parrot/parrot_nut_bowl_actor.h b/engines/titanic/game/parrot/parrot_nut_bowl_actor.h
index d1ccca6a71..34be83a918 100644
--- a/engines/titanic/game/parrot/parrot_nut_bowl_actor.h
+++ b/engines/titanic/game/parrot/parrot_nut_bowl_actor.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/parrot/parrot_nut_eater.cpp b/engines/titanic/game/parrot/parrot_nut_eater.cpp
index 9d58632c89..309b379ab8 100644
--- a/engines/titanic/game/parrot/parrot_nut_eater.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_eater.cpp
@@ -28,7 +28,7 @@ CParrotNutEater::CParrotNutEater() : CGameObject(), _fieldBC(0),
_fieldC0(69), _fieldC4(132), _fieldC8(0), _fieldCC(68) {
}
-void CParrotNutEater::save(SimpleFile *file, int indent) const {
+void CParrotNutEater::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_fieldBC, indent);
diff --git a/engines/titanic/game/parrot/parrot_nut_eater.h b/engines/titanic/game/parrot/parrot_nut_eater.h
index 6a7afd94cf..fe0a3aeb0f 100644
--- a/engines/titanic/game/parrot/parrot_nut_eater.h
+++ b/engines/titanic/game/parrot/parrot_nut_eater.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/game/parrot/parrot_perch_holder.cpp b/engines/titanic/game/parrot/parrot_perch_holder.cpp
index 00dfe4a1c9..dd8523990b 100644
--- a/engines/titanic/game/parrot/parrot_perch_holder.cpp
+++ b/engines/titanic/game/parrot/parrot_perch_holder.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CParrotPerchHolder::save(SimpleFile *file, int indent) const {
+void CParrotPerchHolder::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
CMultiDropTarget::save(file, indent);
}
diff --git a/engines/titanic/game/parrot/parrot_perch_holder.h b/engines/titanic/game/parrot/parrot_perch_holder.h
index f355263846..8c7a441001 100644
--- a/engines/titanic/game/parrot/parrot_perch_holder.h
+++ b/engines/titanic/game/parrot/parrot_perch_holder.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/parrot/parrot_succubus.cpp b/engines/titanic/game/parrot/parrot_succubus.cpp
index e29c6a6781..02a29b748e 100644
--- a/engines/titanic/game/parrot/parrot_succubus.cpp
+++ b/engines/titanic/game/parrot/parrot_succubus.cpp
@@ -28,7 +28,7 @@ CParrotSuccUBus::CParrotSuccUBus() : CSuccUBus(), _field1DC(0),
_field1EC(0), _field1F0(376), _field1F4(393) {
}
-void CParrotSuccUBus::save(SimpleFile *file, int indent) const {
+void CParrotSuccUBus::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_field1DC, indent);
file->writeQuotedLine(_string3, indent);
diff --git a/engines/titanic/game/parrot/parrot_succubus.h b/engines/titanic/game/parrot/parrot_succubus.h
index e60d35cd6c..7984cc6a8c 100644
--- a/engines/titanic/game/parrot/parrot_succubus.h
+++ b/engines/titanic/game/parrot/parrot_succubus.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/game/parrot/parrot_trigger.cpp b/engines/titanic/game/parrot/parrot_trigger.cpp
index aeab3c1ea7..36e99ada33 100644
--- a/engines/titanic/game/parrot/parrot_trigger.cpp
+++ b/engines/titanic/game/parrot/parrot_trigger.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CParrotTrigger::save(SimpleFile *file, int indent) const {
+void CParrotTrigger::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_value, indent);
CGameObject::save(file, indent);
diff --git a/engines/titanic/game/parrot/parrot_trigger.h b/engines/titanic/game/parrot/parrot_trigger.h
index 33aea157ad..f2d1d7e904 100644
--- a/engines/titanic/game/parrot/parrot_trigger.h
+++ b/engines/titanic/game/parrot/parrot_trigger.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/parrot/player_meets_parrot.cpp b/engines/titanic/game/parrot/player_meets_parrot.cpp
index 15dd29009a..6db9345bc0 100644
--- a/engines/titanic/game/parrot/player_meets_parrot.cpp
+++ b/engines/titanic/game/parrot/player_meets_parrot.cpp
@@ -24,7 +24,7 @@
namespace Titanic {
-void CPlayerMeetsParrot::save(SimpleFile *file, int indent) const {
+void CPlayerMeetsParrot::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
CGameObject::save(file, indent);
}
diff --git a/engines/titanic/game/parrot/player_meets_parrot.h b/engines/titanic/game/parrot/player_meets_parrot.h
index 53fa63a95c..0a720993a5 100644
--- a/engines/titanic/game/parrot/player_meets_parrot.h
+++ b/engines/titanic/game/parrot/player_meets_parrot.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