aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-24 18:42:32 -0400
committerPaul Gilbert2016-08-24 18:42:32 -0400
commite733f8113f69f37b14e8a2447f5e7dce89a1670d (patch)
tree085e260735f91cedc9a6572baad64e51ec4b6400 /engines/titanic/core
parentfaf52df0653006ad8107e91bb24bc747e4b01e29 (diff)
downloadscummvm-rg350-e733f8113f69f37b14e8a2447f5e7dce89a1670d.tar.gz
scummvm-rg350-e733f8113f69f37b14e8a2447f5e7dce89a1670d.tar.bz2
scummvm-rg350-e733f8113f69f37b14e8a2447f5e7dce89a1670d.zip
TITANIC: Implemented more game classes
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/drop_target.h2
-rw-r--r--engines/titanic/core/game_object.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/core/drop_target.h b/engines/titanic/core/drop_target.h
index 8c497b6bc2..e07b640c9f 100644
--- a/engines/titanic/core/drop_target.h
+++ b/engines/titanic/core/drop_target.h
@@ -34,7 +34,7 @@ class CDropTarget : public CGameObject {
bool EnterViewMsg(CEnterViewMsg *msg);
bool VisibleMsg(CVisibleMsg *msg);
bool DropZoneLostObjectMsg(CDropZoneLostObjectMsg *msg);
-private:
+protected:
Point _pos1;
int _itemFrame;
CString _itemMatchName;
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index cafd96e38e..d089ce5ed0 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -349,7 +349,7 @@ protected:
/**
* Play an arbitrary clip
*/
- void playClip(const CString &name, uint flags);
+ void playClip(const CString &name, uint flags = 0);
/**
* Play a clip
@@ -364,7 +364,7 @@ protected:
/**
* Play a clip randomly from a passed list of names
*/
- void playRandomClip(const char *const *names, uint flags);
+ void playRandomClip(const char *const *names, uint flags = 0);
/**
* Return the current view/node/room as a single string