aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game
diff options
context:
space:
mode:
authorPaul Gilbert2016-03-21 20:53:49 -0400
committerPaul Gilbert2016-03-21 20:53:49 -0400
commit217360d0c5a0b8289c16b22fc46782c475fcc9f5 (patch)
tree5fef119ff142d15d2bd91e99dfc9700f86ac38ed /engines/titanic/game
parent9a66bc2e9e3638af940053ac58df36b489b3e345 (diff)
downloadscummvm-rg350-217360d0c5a0b8289c16b22fc46782c475fcc9f5.tar.gz
scummvm-rg350-217360d0c5a0b8289c16b22fc46782c475fcc9f5.tar.bz2
scummvm-rg350-217360d0c5a0b8289c16b22fc46782c475fcc9f5.zip
TITANIC: Add new derived Rect and Point classes
Diffstat (limited to 'engines/titanic/game')
-rw-r--r--engines/titanic/game/cdrom.h2
-rw-r--r--engines/titanic/game/end_game_credits.h2
-rw-r--r--engines/titanic/game/placeholder/lemon_on_bar.h2
-rw-r--r--engines/titanic/game/placeholder/tv_on_bar.h2
-rw-r--r--engines/titanic/game/sauce_dispensor.h4
-rw-r--r--engines/titanic/game/ship_setting.h2
-rw-r--r--engines/titanic/game/transport/lift_indicator.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/engines/titanic/game/cdrom.h b/engines/titanic/game/cdrom.h
index f810056e4f..c1280f6712 100644
--- a/engines/titanic/game/cdrom.h
+++ b/engines/titanic/game/cdrom.h
@@ -29,7 +29,7 @@ namespace Titanic {
class CCDROM : public CGameObject {
private:
- Common::Point _pos1;
+ Point _pos1;
public:
CLASSDEF
CCDROM();
diff --git a/engines/titanic/game/end_game_credits.h b/engines/titanic/game/end_game_credits.h
index 68e86c6220..ab14f2680b 100644
--- a/engines/titanic/game/end_game_credits.h
+++ b/engines/titanic/game/end_game_credits.h
@@ -30,7 +30,7 @@ namespace Titanic {
class CEndGameCredits : public CGameObject {
private:
int _fieldBC;
- Common::Point _pos1;
+ Point _pos1;
public:
CLASSDEF
CEndGameCredits();
diff --git a/engines/titanic/game/placeholder/lemon_on_bar.h b/engines/titanic/game/placeholder/lemon_on_bar.h
index c88698fcab..18559b0350 100644
--- a/engines/titanic/game/placeholder/lemon_on_bar.h
+++ b/engines/titanic/game/placeholder/lemon_on_bar.h
@@ -29,7 +29,7 @@ namespace Titanic {
class CLemonOnBar : public CPlaceHolder {
private:
- Common::Point _pos1;
+ Point _pos1;
public:
CLASSDEF
diff --git a/engines/titanic/game/placeholder/tv_on_bar.h b/engines/titanic/game/placeholder/tv_on_bar.h
index 3358cd6fec..3af59deb5b 100644
--- a/engines/titanic/game/placeholder/tv_on_bar.h
+++ b/engines/titanic/game/placeholder/tv_on_bar.h
@@ -29,7 +29,7 @@ namespace Titanic {
class CTVOnBar : public CPlaceHolder {
private:
- Common::Point _pos1;
+ Point _pos1;
public:
CLASSDEF
diff --git a/engines/titanic/game/sauce_dispensor.h b/engines/titanic/game/sauce_dispensor.h
index 6969adb326..8a5cc96eca 100644
--- a/engines/titanic/game/sauce_dispensor.h
+++ b/engines/titanic/game/sauce_dispensor.h
@@ -32,8 +32,8 @@ public:
CString _string3;
int _fieldEC;
int _fieldF0;
- Common::Point _pos1;
- Common::Point _pos2;
+ Point _pos1;
+ Point _pos2;
int _field104;
int _field108;
public:
diff --git a/engines/titanic/game/ship_setting.h b/engines/titanic/game/ship_setting.h
index cbf4e9f61a..2525224a28 100644
--- a/engines/titanic/game/ship_setting.h
+++ b/engines/titanic/game/ship_setting.h
@@ -31,7 +31,7 @@ namespace Titanic {
class CShipSetting : public CBackground, CEnterRoomMsgTarget {
private:
CString _string3;
- Common::Point _pos1;
+ Point _pos1;
CString _string4;
CString _string5;
protected:
diff --git a/engines/titanic/game/transport/lift_indicator.h b/engines/titanic/game/transport/lift_indicator.h
index 161f032480..80f8b0d05b 100644
--- a/engines/titanic/game/transport/lift_indicator.h
+++ b/engines/titanic/game/transport/lift_indicator.h
@@ -31,7 +31,7 @@ namespace Titanic {
class CLiftindicator : public CLift {
private:
int _fieldFC;
- Common::Point _pos2;
+ Point _pos2;
int _field108;
int _field10C;
protected: