aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/drop_target.h2
-rw-r--r--engines/titanic/core/game_object.cpp4
-rw-r--r--engines/titanic/core/game_object.h6
-rw-r--r--engines/titanic/core/link_item.h2
-rw-r--r--engines/titanic/core/room_item.h4
-rw-r--r--engines/titanic/core/tree_item.h2
6 files changed, 10 insertions, 10 deletions
diff --git a/engines/titanic/core/drop_target.h b/engines/titanic/core/drop_target.h
index 22cb057bb7..6c1cdcfe38 100644
--- a/engines/titanic/core/drop_target.h
+++ b/engines/titanic/core/drop_target.h
@@ -29,7 +29,7 @@ namespace Titanic {
class CDropTarget : public CGameObject {
private:
- Common::Point _pos1;
+ Point _pos1;
int _fieldC4;
CString _string1;
int _fieldD4;
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 884873ec0e..06f2ce78af 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -26,7 +26,7 @@
namespace Titanic {
CGameObject::CGameObject(): CNamedItem() {
- _bounds = Common::Rect(0, 0, 15, 15);
+ _bounds = Rect(0, 0, 15, 15);
_field34 = 0;
_field38 = 0;
_field3C = 0;
@@ -122,7 +122,7 @@ void CGameObject::fn2() {
error("TODO");
}
-bool CGameObject::checkPoint(const Common::Point &pt, int v0, int v1) {
+bool CGameObject::checkPoint(const Point &pt, int v0, int v1) {
warning("TODO: CGameObject::checkPoint");
return false;
}
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 693f334608..809f7b8d20 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_GAME_OBJECT_H
#define TITANIC_GAME_OBJECT_H
-#include "common/rect.h"
+#include "titanic/rect.h"
#include "titanic/core/movie_clip.h"
#include "titanic/core/named_item.h"
@@ -31,7 +31,7 @@ namespace Titanic {
class CGameObject : public CNamedItem {
protected:
- Common::Rect _bounds;
+ Rect _bounds;
double _field34;
double _field38;
double _field3C;
@@ -75,7 +75,7 @@ public:
void fn2();
- bool checkPoint(const Common::Point &pt, int v0, int v1);
+ bool checkPoint(const Point &pt, int v0, int v1);
};
} // End of namespace Titanic
diff --git a/engines/titanic/core/link_item.h b/engines/titanic/core/link_item.h
index 733a4c9bdd..bbeef2c11c 100644
--- a/engines/titanic/core/link_item.h
+++ b/engines/titanic/core/link_item.h
@@ -46,7 +46,7 @@ protected:
int _field30;
int _field34;
public:
- Common::Rect _bounds;
+ Rect _bounds;
public:
CLASSDEF
CLinkItem();
diff --git a/engines/titanic/core/room_item.h b/engines/titanic/core/room_item.h
index a42ffab32e..7248b4aac3 100644
--- a/engines/titanic/core/room_item.h
+++ b/engines/titanic/core/room_item.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_ROOM_ITEM_H
#define TITANIC_ROOM_ITEM_H
-#include "common/rect.h"
+#include "titanic/rect.h"
#include "titanic/core/list.h"
#include "titanic/core/movie_clip.h"
#include "titanic/core/named_item.h"
@@ -33,7 +33,7 @@ namespace Titanic {
class CRoomItem : public CNamedItem {
public:
- Common::Rect _roomRect;
+ Rect _roomRect;
CMovieClipList _clipList;
int _roomNumber;
CResourceKey _transitionMovieKey;
diff --git a/engines/titanic/core/tree_item.h b/engines/titanic/core/tree_item.h
index a4156d6ad1..5669784cd7 100644
--- a/engines/titanic/core/tree_item.h
+++ b/engines/titanic/core/tree_item.h
@@ -122,7 +122,7 @@ public:
/**
* Gets the bounds occupied by the item
*/
- virtual Common::Rect getBounds() { return Common::Rect(); }
+ virtual Rect getBounds() { return Rect(); }
/**
* Called when the view changes