diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/titanic/core/auto_sound_event.cpp (renamed from engines/titanic/objects/auto_sound_event.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/auto_sound_event.h (renamed from engines/titanic/objects/auto_sound_event.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/dont_save_file_item.cpp (renamed from engines/titanic/objects/dont_save_file_item.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/dont_save_file_item.h (renamed from engines/titanic/objects/dont_save_file_item.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/file_item.cpp (renamed from engines/titanic/objects/file_item.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/file_item.h (renamed from engines/titanic/objects/file_item.h) | 4 | ||||
-rw-r--r-- | engines/titanic/core/game_object.cpp (renamed from engines/titanic/objects/game_object.cpp) | 4 | ||||
-rw-r--r-- | engines/titanic/core/game_object.h (renamed from engines/titanic/objects/game_object.h) | 4 | ||||
-rw-r--r-- | engines/titanic/core/link_item.cpp (renamed from engines/titanic/objects/link_item.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/link_item.h (renamed from engines/titanic/objects/link_item.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/list.cpp (renamed from engines/titanic/objects/list.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/list.h (renamed from engines/titanic/objects/list.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/message_target.cpp (renamed from engines/titanic/objects/message_target.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/message_target.h (renamed from engines/titanic/objects/message_target.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/movie_clip.cpp (renamed from engines/titanic/objects/movie_clip.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/movie_clip.h (renamed from engines/titanic/objects/movie_clip.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/named_item.cpp (renamed from engines/titanic/objects/named_item.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/named_item.h (renamed from engines/titanic/objects/named_item.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/node_item.cpp (renamed from engines/titanic/objects/node_item.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/node_item.h (renamed from engines/titanic/objects/node_item.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/pet_control.cpp (renamed from engines/titanic/objects/pet_control.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/pet_control.h (renamed from engines/titanic/objects/pet_control.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/project_item.cpp (renamed from engines/titanic/objects/project_item.cpp) | 6 | ||||
-rw-r--r-- | engines/titanic/core/project_item.h (renamed from engines/titanic/objects/project_item.h) | 4 | ||||
-rw-r--r-- | engines/titanic/core/resource_key.cpp (renamed from engines/titanic/objects/resource_key.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/resource_key.h (renamed from engines/titanic/objects/resource_key.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/saveable_object.cpp (renamed from engines/titanic/objects/saveable_object.cpp) | 32 | ||||
-rw-r--r-- | engines/titanic/core/saveable_object.h (renamed from engines/titanic/objects/saveable_object.h) | 0 | ||||
-rw-r--r-- | engines/titanic/core/tree_item.cpp (renamed from engines/titanic/objects/tree_item.cpp) | 6 | ||||
-rw-r--r-- | engines/titanic/core/tree_item.h (renamed from engines/titanic/objects/tree_item.h) | 2 | ||||
-rw-r--r-- | engines/titanic/core/view_item.cpp (renamed from engines/titanic/objects/view_item.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/core/view_item.h (renamed from engines/titanic/objects/view_item.h) | 4 | ||||
-rw-r--r-- | engines/titanic/game/announce.cpp (renamed from engines/titanic/rooms/announce.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/game/announce.h (renamed from engines/titanic/rooms/announce.h) | 2 | ||||
-rw-r--r-- | engines/titanic/game/door_auto_sound_event.cpp (renamed from engines/titanic/rooms/door_auto_sound_event.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/game/door_auto_sound_event.h (renamed from engines/titanic/rooms/door_auto_sound_event.h) | 2 | ||||
-rw-r--r-- | engines/titanic/game/pet_position.cpp (renamed from engines/titanic/rooms/pet_position.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/game/pet_position.h (renamed from engines/titanic/rooms/pet_position.h) | 2 | ||||
-rw-r--r-- | engines/titanic/game/room_item.cpp (renamed from engines/titanic/rooms/room_item.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/game/room_item.h (renamed from engines/titanic/rooms/room_item.h) | 8 | ||||
-rw-r--r-- | engines/titanic/game/service_elevator_door.cpp (renamed from engines/titanic/rooms/service_elevator_door.cpp) | 2 | ||||
-rw-r--r-- | engines/titanic/game/service_elevator_door.h (renamed from engines/titanic/rooms/service_elevator_door.h) | 2 | ||||
-rw-r--r-- | engines/titanic/game/sub_glass.cpp | 54 | ||||
-rw-r--r-- | engines/titanic/game/sub_glass.h (renamed from engines/titanic/rooms/sub_glass.h) | 2 | ||||
-rw-r--r-- | engines/titanic/game/succubus.cpp (renamed from engines/titanic/rooms/sub_glass.cpp) | 0 | ||||
-rw-r--r-- | engines/titanic/game/succubus.h | 59 | ||||
-rw-r--r-- | engines/titanic/main_game_window.h | 2 | ||||
-rw-r--r-- | engines/titanic/module.mk | 44 | ||||
-rw-r--r-- | engines/titanic/titanic.cpp | 2 |
49 files changed, 206 insertions, 93 deletions
diff --git a/engines/titanic/objects/auto_sound_event.cpp b/engines/titanic/core/auto_sound_event.cpp index 7160ac7b24..1bd5f5473a 100644 --- a/engines/titanic/objects/auto_sound_event.cpp +++ b/engines/titanic/core/auto_sound_event.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/auto_sound_event.h" +#include "titanic/core/auto_sound_event.h" namespace Titanic { diff --git a/engines/titanic/objects/auto_sound_event.h b/engines/titanic/core/auto_sound_event.h index bcfc6a49c6..4180a68aa2 100644 --- a/engines/titanic/objects/auto_sound_event.h +++ b/engines/titanic/core/auto_sound_event.h @@ -23,7 +23,7 @@ #ifndef TITANIC_AUTO_SOUND_EVENT_H #define TITANIC_AUTO_SOUND_EVENT_H -#include "titanic/objects/game_object.h" +#include "titanic/core/game_object.h" namespace Titanic { diff --git a/engines/titanic/objects/dont_save_file_item.cpp b/engines/titanic/core/dont_save_file_item.cpp index bca66da521..389cef5a9c 100644 --- a/engines/titanic/objects/dont_save_file_item.cpp +++ b/engines/titanic/core/dont_save_file_item.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/dont_save_file_item.h" +#include "titanic/core/dont_save_file_item.h" namespace Titanic { diff --git a/engines/titanic/objects/dont_save_file_item.h b/engines/titanic/core/dont_save_file_item.h index 99deacc88c..f2b321c4fc 100644 --- a/engines/titanic/objects/dont_save_file_item.h +++ b/engines/titanic/core/dont_save_file_item.h @@ -23,7 +23,7 @@ #ifndef TITANIC_DONT_SAVE_FILE_ITEM_H #define TITANIC_DONT_SAVE_FILE_ITEM_H -#include "titanic/objects/file_item.h" +#include "titanic/core/file_item.h" namespace Titanic { diff --git a/engines/titanic/objects/file_item.cpp b/engines/titanic/core/file_item.cpp index 925fc4d000..0d3316dbf3 100644 --- a/engines/titanic/objects/file_item.cpp +++ b/engines/titanic/core/file_item.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/file_item.h" +#include "titanic/core/file_item.h" namespace Titanic { diff --git a/engines/titanic/objects/file_item.h b/engines/titanic/core/file_item.h index 94dd053ae8..0795b05d11 100644 --- a/engines/titanic/objects/file_item.h +++ b/engines/titanic/core/file_item.h @@ -24,8 +24,8 @@ #define TITANIC_FILE_ITEM_H #include "titanic/string.h" -#include "titanic/objects/list.h" -#include "titanic/objects/tree_item.h" +#include "titanic/core/list.h" +#include "titanic/core/tree_item.h" namespace Titanic { diff --git a/engines/titanic/objects/game_object.cpp b/engines/titanic/core/game_object.cpp index 2e35417bd5..3238258a61 100644 --- a/engines/titanic/objects/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -20,8 +20,8 @@ * */ -#include "titanic/objects/game_object.h" -#include "titanic/objects/resource_key.h" +#include "titanic/core/game_object.h" +#include "titanic/core/resource_key.h" namespace Titanic { diff --git a/engines/titanic/objects/game_object.h b/engines/titanic/core/game_object.h index 53814f6d3d..7d15882884 100644 --- a/engines/titanic/objects/game_object.h +++ b/engines/titanic/core/game_object.h @@ -24,8 +24,8 @@ #define TITANIC_GAME_OBJECT_H #include "common/rect.h" -#include "titanic/objects/movie_clip.h" -#include "titanic/objects/named_item.h" +#include "titanic/core/movie_clip.h" +#include "titanic/core/named_item.h" namespace Titanic { diff --git a/engines/titanic/objects/link_item.cpp b/engines/titanic/core/link_item.cpp index fe2a7cf162..1d85dfaa7b 100644 --- a/engines/titanic/objects/link_item.cpp +++ b/engines/titanic/core/link_item.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/link_item.h" +#include "titanic/core/link_item.h" namespace Titanic { diff --git a/engines/titanic/objects/link_item.h b/engines/titanic/core/link_item.h index efe5ec1cf5..22c07a2132 100644 --- a/engines/titanic/objects/link_item.h +++ b/engines/titanic/core/link_item.h @@ -23,7 +23,7 @@ #ifndef TITANIC_LINK_ITEM_H #define TITANIC_LINK_ITEM_H -#include "titanic/objects/named_item.h" +#include "titanic/core/named_item.h" namespace Titanic { diff --git a/engines/titanic/objects/list.cpp b/engines/titanic/core/list.cpp index 4e0178d31c..d733ce25c5 100644 --- a/engines/titanic/objects/list.cpp +++ b/engines/titanic/core/list.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/list.h" +#include "titanic/core/list.h" namespace Titanic { diff --git a/engines/titanic/objects/list.h b/engines/titanic/core/list.h index 1842d2b5f8..d990aec2fa 100644 --- a/engines/titanic/objects/list.h +++ b/engines/titanic/core/list.h @@ -26,7 +26,7 @@ #include "common/scummsys.h" #include "common/list.h" #include "titanic/simple_file.h" -#include "titanic/objects/saveable_object.h" +#include "titanic/core/saveable_object.h" namespace Titanic { diff --git a/engines/titanic/objects/message_target.cpp b/engines/titanic/core/message_target.cpp index bd162ff9eb..a7dd3a02a2 100644 --- a/engines/titanic/objects/message_target.cpp +++ b/engines/titanic/core/message_target.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/message_target.h" +#include "titanic/core/message_target.h" namespace Titanic { diff --git a/engines/titanic/objects/message_target.h b/engines/titanic/core/message_target.h index 5e29ddaf78..1afc48bd9b 100644 --- a/engines/titanic/objects/message_target.h +++ b/engines/titanic/core/message_target.h @@ -23,7 +23,7 @@ #ifndef TITANIC_MESSAGE_TARGET_H #define TITANIC_MESSAGE_TARGET_H -#include "titanic/objects/saveable_object.h" +#include "titanic/core/saveable_object.h" namespace Titanic { diff --git a/engines/titanic/objects/movie_clip.cpp b/engines/titanic/core/movie_clip.cpp index 2914cc844c..fec09f6542 100644 --- a/engines/titanic/objects/movie_clip.cpp +++ b/engines/titanic/core/movie_clip.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/movie_clip.h" +#include "titanic/core/movie_clip.h" namespace Titanic { diff --git a/engines/titanic/objects/movie_clip.h b/engines/titanic/core/movie_clip.h index e259d970fe..f16e3eb820 100644 --- a/engines/titanic/objects/movie_clip.h +++ b/engines/titanic/core/movie_clip.h @@ -23,7 +23,7 @@ #ifndef TITANIC_MOVIE_CLIP_H #define TITANIC_MOVIE_CLIP_H -#include "titanic/objects/list.h" +#include "titanic/core/list.h" namespace Titanic { diff --git a/engines/titanic/objects/named_item.cpp b/engines/titanic/core/named_item.cpp index f7d7c7b75d..10d9588590 100644 --- a/engines/titanic/objects/named_item.cpp +++ b/engines/titanic/core/named_item.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/named_item.h" +#include "titanic/core/named_item.h" namespace Titanic { diff --git a/engines/titanic/objects/named_item.h b/engines/titanic/core/named_item.h index d59b73065b..75635fcf72 100644 --- a/engines/titanic/objects/named_item.h +++ b/engines/titanic/core/named_item.h @@ -23,7 +23,7 @@ #ifndef TITANIC_NAMED_ITEM_H #define TITANIC_NAMED_ITEM_H -#include "titanic/objects/tree_item.h" +#include "titanic/core/tree_item.h" namespace Titanic { diff --git a/engines/titanic/objects/node_item.cpp b/engines/titanic/core/node_item.cpp index f2a55cf240..f44be6ddaf 100644 --- a/engines/titanic/objects/node_item.cpp +++ b/engines/titanic/core/node_item.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/node_item.h" +#include "titanic/core/node_item.h" namespace Titanic { diff --git a/engines/titanic/objects/node_item.h b/engines/titanic/core/node_item.h index bfb534881f..e05c2eb6ff 100644 --- a/engines/titanic/objects/node_item.h +++ b/engines/titanic/core/node_item.h @@ -23,7 +23,7 @@ #ifndef TITANIC_NODE_ITEM_H #define TITANIC_NODE_ITEM_H -#include "titanic/objects/named_item.h" +#include "titanic/core/named_item.h" namespace Titanic { diff --git a/engines/titanic/objects/pet_control.cpp b/engines/titanic/core/pet_control.cpp index 73ef957e78..eee18269d2 100644 --- a/engines/titanic/objects/pet_control.cpp +++ b/engines/titanic/core/pet_control.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/pet_control.h" +#include "titanic/core/pet_control.h" namespace Titanic { diff --git a/engines/titanic/objects/pet_control.h b/engines/titanic/core/pet_control.h index f6c9707df8..b1dc4610ae 100644 --- a/engines/titanic/objects/pet_control.h +++ b/engines/titanic/core/pet_control.h @@ -23,7 +23,7 @@ #ifndef TITANIC_PET_CONTROL_H #define TITANIC_PET_CONTROL_H -#include "titanic/objects/game_object.h" +#include "titanic/core/game_object.h" namespace Titanic { diff --git a/engines/titanic/objects/project_item.cpp b/engines/titanic/core/project_item.cpp index 2bd75156d8..7a8a082a37 100644 --- a/engines/titanic/objects/project_item.cpp +++ b/engines/titanic/core/project_item.cpp @@ -24,9 +24,9 @@ #include "titanic/game_manager.h" #include "titanic/titanic.h" #include "titanic/compressed_file.h" -#include "titanic/objects/dont_save_file_item.h" -#include "titanic/objects/pet_control.h" -#include "titanic/objects/project_item.h" +#include "titanic/core/dont_save_file_item.h" +#include "titanic/core/pet_control.h" +#include "titanic/core/project_item.h" namespace Titanic { diff --git a/engines/titanic/objects/project_item.h b/engines/titanic/core/project_item.h index 066dbf69e0..3c334986a8 100644 --- a/engines/titanic/objects/project_item.h +++ b/engines/titanic/core/project_item.h @@ -25,8 +25,8 @@ #include "common/scummsys.h" #include "titanic/simple_file.h" -#include "titanic/objects/file_item.h" -#include "titanic/objects/list.h" +#include "titanic/core/file_item.h" +#include "titanic/core/list.h" namespace Titanic { diff --git a/engines/titanic/objects/resource_key.cpp b/engines/titanic/core/resource_key.cpp index 612014bb37..eee749f15a 100644 --- a/engines/titanic/objects/resource_key.cpp +++ b/engines/titanic/core/resource_key.cpp @@ -21,7 +21,7 @@ */ #include "titanic/simple_file.h" -#include "titanic/objects/resource_key.h" +#include "titanic/core/resource_key.h" namespace Titanic { diff --git a/engines/titanic/objects/resource_key.h b/engines/titanic/core/resource_key.h index 9d1b70ffc9..1b3d900abc 100644 --- a/engines/titanic/objects/resource_key.h +++ b/engines/titanic/core/resource_key.h @@ -24,7 +24,7 @@ #define TITANIC_RESOURCE_KEY_H #include "titanic/string.h" -#include "titanic/objects/saveable_object.h" +#include "titanic/core/saveable_object.h" namespace Titanic { diff --git a/engines/titanic/objects/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp index 73980d159b..c7e749e9dd 100644 --- a/engines/titanic/objects/saveable_object.cpp +++ b/engines/titanic/core/saveable_object.cpp @@ -20,22 +20,22 @@ * */ -#include "titanic/objects/saveable_object.h" -#include "titanic/objects/file_item.h" -#include "titanic/objects/link_item.h" -#include "titanic/objects/list.h" -#include "titanic/objects/message_target.h" -#include "titanic/objects/movie_clip.h" -#include "titanic/objects/node_item.h" -#include "titanic/objects/project_item.h" -#include "titanic/objects/saveable_object.h" -#include "titanic/objects/tree_item.h" -#include "titanic/objects/view_item.h" -#include "titanic/rooms/announce.h" -#include "titanic/rooms/pet_position.h" -#include "titanic/rooms/room_item.h" -#include "titanic/rooms/service_elevator_door.h" -#include "titanic/rooms/sub_glass.h" +#include "titanic/core/saveable_object.h" +#include "titanic/core/file_item.h" +#include "titanic/core/link_item.h" +#include "titanic/core/list.h" +#include "titanic/core/message_target.h" +#include "titanic/core/movie_clip.h" +#include "titanic/core/node_item.h" +#include "titanic/core/project_item.h" +#include "titanic/core/saveable_object.h" +#include "titanic/core/tree_item.h" +#include "titanic/core/view_item.h" +#include "titanic/game/announce.h" +#include "titanic/game/pet_position.h" +#include "titanic/game/room_item.h" +#include "titanic/game/service_elevator_door.h" +#include "titanic/game/sub_glass.h" namespace Titanic { diff --git a/engines/titanic/objects/saveable_object.h b/engines/titanic/core/saveable_object.h index 4e7d949191..4e7d949191 100644 --- a/engines/titanic/objects/saveable_object.h +++ b/engines/titanic/core/saveable_object.h diff --git a/engines/titanic/objects/tree_item.cpp b/engines/titanic/core/tree_item.cpp index 3902df3d3a..d20e1da4f0 100644 --- a/engines/titanic/objects/tree_item.cpp +++ b/engines/titanic/core/tree_item.cpp @@ -20,9 +20,9 @@ * */ -#include "titanic/objects/tree_item.h" -#include "titanic/objects/dont_save_file_item.h" -#include "titanic/objects/file_item.h" +#include "titanic/core/tree_item.h" +#include "titanic/core/dont_save_file_item.h" +#include "titanic/core/file_item.h" namespace Titanic { diff --git a/engines/titanic/objects/tree_item.h b/engines/titanic/core/tree_item.h index d6450e313a..ea5de32161 100644 --- a/engines/titanic/objects/tree_item.h +++ b/engines/titanic/core/tree_item.h @@ -23,7 +23,7 @@ #ifndef TITANIC_TREE_ITEM_H #define TITANIC_TREE_ITEM_H -#include "titanic/objects/message_target.h" +#include "titanic/core/message_target.h" namespace Titanic { diff --git a/engines/titanic/objects/view_item.cpp b/engines/titanic/core/view_item.cpp index 1199ba9a62..e64229e3d3 100644 --- a/engines/titanic/objects/view_item.cpp +++ b/engines/titanic/core/view_item.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/objects/view_item.h" +#include "titanic/core/view_item.h" namespace Titanic { diff --git a/engines/titanic/objects/view_item.h b/engines/titanic/core/view_item.h index 1bd2d6d268..592bb21632 100644 --- a/engines/titanic/objects/view_item.h +++ b/engines/titanic/core/view_item.h @@ -23,8 +23,8 @@ #ifndef TITANIC_VIEW_ITEM_H #define TITANIC_VIEW_ITEM_H -#include "titanic/objects/named_item.h" -#include "titanic/objects/resource_key.h" +#include "titanic/core/named_item.h" +#include "titanic/core/resource_key.h" namespace Titanic { diff --git a/engines/titanic/rooms/announce.cpp b/engines/titanic/game/announce.cpp index b79056637b..098ae70aa7 100644 --- a/engines/titanic/rooms/announce.cpp +++ b/engines/titanic/game/announce.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/rooms/announce.h" +#include "titanic/game/announce.h" namespace Titanic { diff --git a/engines/titanic/rooms/announce.h b/engines/titanic/game/announce.h index 58f928d559..baa5f1a55a 100644 --- a/engines/titanic/rooms/announce.h +++ b/engines/titanic/game/announce.h @@ -23,7 +23,7 @@ #ifndef TITANIC_ANNOUNCE_H #define TITANIC_ANNOUNCE_H -#include "titanic/objects/game_object.h" +#include "titanic/core/game_object.h" namespace Titanic { diff --git a/engines/titanic/rooms/door_auto_sound_event.cpp b/engines/titanic/game/door_auto_sound_event.cpp index 279f4f98e6..158c147296 100644 --- a/engines/titanic/rooms/door_auto_sound_event.cpp +++ b/engines/titanic/game/door_auto_sound_event.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/rooms/door_auto_sound_event.h" +#include "titanic/game/door_auto_sound_event.h" namespace Titanic { diff --git a/engines/titanic/rooms/door_auto_sound_event.h b/engines/titanic/game/door_auto_sound_event.h index 4f960273b5..66e9594b40 100644 --- a/engines/titanic/rooms/door_auto_sound_event.h +++ b/engines/titanic/game/door_auto_sound_event.h @@ -23,7 +23,7 @@ #ifndef TITANIC_DOOR_AUTO_SOUND_EVENT_H #define TITANIC_DOOR_AUTO_SOUND_EVENT_H -#include "titanic/objects/auto_sound_event.h" +#include "titanic/core/auto_sound_event.h" namespace Titanic { diff --git a/engines/titanic/rooms/pet_position.cpp b/engines/titanic/game/pet_position.cpp index b5bf2e6c01..eb3156da32 100644 --- a/engines/titanic/rooms/pet_position.cpp +++ b/engines/titanic/game/pet_position.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/rooms/pet_position.h" +#include "titanic/game/pet_position.h" namespace Titanic { diff --git a/engines/titanic/rooms/pet_position.h b/engines/titanic/game/pet_position.h index dc27377eec..7ca6725059 100644 --- a/engines/titanic/rooms/pet_position.h +++ b/engines/titanic/game/pet_position.h @@ -23,7 +23,7 @@ #ifndef TITANIC_PET_POSITION_H #define TITANIC_PET_POSITION_H -#include "titanic/objects/game_object.h" +#include "titanic/core/game_object.h" namespace Titanic { diff --git a/engines/titanic/rooms/room_item.cpp b/engines/titanic/game/room_item.cpp index dce2bc093b..17e0ffca2d 100644 --- a/engines/titanic/rooms/room_item.cpp +++ b/engines/titanic/game/room_item.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/rooms/room_item.h" +#include "titanic/game/room_item.h" namespace Titanic { diff --git a/engines/titanic/rooms/room_item.h b/engines/titanic/game/room_item.h index 4df14aae7d..c213d38caa 100644 --- a/engines/titanic/rooms/room_item.h +++ b/engines/titanic/game/room_item.h @@ -24,10 +24,10 @@ #define TITANIC_ROOM_ITEM_H #include "common/rect.h" -#include "titanic/objects/list.h" -#include "titanic/objects/movie_clip.h" -#include "titanic/objects/named_item.h" -#include "titanic/objects/resource_key.h" +#include "titanic/core/list.h" +#include "titanic/core/movie_clip.h" +#include "titanic/core/named_item.h" +#include "titanic/core/resource_key.h" namespace Titanic { diff --git a/engines/titanic/rooms/service_elevator_door.cpp b/engines/titanic/game/service_elevator_door.cpp index 931a9d6474..717b61dc72 100644 --- a/engines/titanic/rooms/service_elevator_door.cpp +++ b/engines/titanic/game/service_elevator_door.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/rooms/service_elevator_door.h" +#include "titanic/game/service_elevator_door.h" namespace Titanic { diff --git a/engines/titanic/rooms/service_elevator_door.h b/engines/titanic/game/service_elevator_door.h index 5b924bc17c..3ad897c089 100644 --- a/engines/titanic/rooms/service_elevator_door.h +++ b/engines/titanic/game/service_elevator_door.h @@ -23,7 +23,7 @@ #ifndef TITANIC_SERVICE_ELEVATOR_DOOR_H #define TITANIC_SERVICE_ELEVATOR_DOOR_H -#include "titanic/rooms/door_auto_sound_event.h" +#include "titanic/game/door_auto_sound_event.h" namespace Titanic { diff --git a/engines/titanic/game/sub_glass.cpp b/engines/titanic/game/sub_glass.cpp new file mode 100644 index 0000000000..b16199deed --- /dev/null +++ b/engines/titanic/game/sub_glass.cpp @@ -0,0 +1,54 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "titanic/game/sub_glass.h" + +namespace Titanic { + +CSUBGlass::CSUBGlass() : _fieldBC(0), _fieldC0(0), _fieldC4(1), _fieldC8(0) { +} + +void CSUBGlass::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + file->writeNumberLine(_fieldBC, indent); + file->writeNumberLine(_fieldC0, indent); + file->writeNumberLine(_fieldC4, indent); + file->writeNumberLine(_fieldC8, indent); + file->writeNumberLine(_fieldCC, indent); + file->writeQuotedLine(_string, indent); + + CGameObject::save(file, indent); +} + +void CSUBGlass::load(SimpleFile *file) { + file->readNumber(); + _fieldBC = file->readNumber(); + _fieldC0 = file->readNumber(); + _fieldC4 = file->readNumber(); + _fieldC8 = file->readNumber(); + _fieldCC = file->readNumber(); + _string = file->readString(); + + CGameObject::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/rooms/sub_glass.h b/engines/titanic/game/sub_glass.h index b7a992db9c..00ff26fbeb 100644 --- a/engines/titanic/rooms/sub_glass.h +++ b/engines/titanic/game/sub_glass.h @@ -23,7 +23,7 @@ #ifndef TITANIC_SUB_GLASS_H #define TITANIC_SUB_GLASS_H -#include "titanic/objects/game_object.h" +#include "titanic/core/game_object.h" namespace Titanic { diff --git a/engines/titanic/rooms/sub_glass.cpp b/engines/titanic/game/succubus.cpp index 27f47fd017..27f47fd017 100644 --- a/engines/titanic/rooms/sub_glass.cpp +++ b/engines/titanic/game/succubus.cpp diff --git a/engines/titanic/game/succubus.h b/engines/titanic/game/succubus.h new file mode 100644 index 0000000000..f99597b53e --- /dev/null +++ b/engines/titanic/game/succubus.h @@ -0,0 +1,59 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef TITANIC_SUCCUBUS_H +#define TITANIC_SUCCUBUS_H + +#include "titanic/core/game_object.h" + +namespace Titanic { + +class CSuccUBus : public CGameObject { +private: + int _fieldBC; + int _fieldC0; + int _fieldC4; + int _fieldC8; + int _fieldCC; + CString _string; +public: + CSuccUBus(); + + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CSuccUBus"; } + + /** + * Save the data for the class to file + */ + virtual void save(SimpleFile *file, int indent) const; + + /** + * Load the data for the class from file + */ + virtual void load(SimpleFile *file); +}; + +} // End of namespace Titanic + +#endif /* TITANIC_SUCCUBUS_H */ diff --git a/engines/titanic/main_game_window.h b/engines/titanic/main_game_window.h index dc2fdfd025..4796a4fdcb 100644 --- a/engines/titanic/main_game_window.h +++ b/engines/titanic/main_game_window.h @@ -28,7 +28,7 @@ #include "titanic/game_manager.h" #include "titanic/game_view.h" #include "titanic/image.h" -#include "titanic/objects/project_item.h" +#include "titanic/core/project_item.h" namespace Titanic { diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index e74e8114f4..97053a52b7 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -15,28 +15,28 @@ MODULE_OBJS := \ string.o \ titanic.o \ video_surface.o \ - objects/auto_sound_event.o \ - objects/dont_save_file_item.o \ - objects/file_item.o \ - objects/game_object.o \ - objects/link_item.o \ - objects/list.o \ - objects/message_target.o \ - objects/movie_clip.o \ - objects/named_item.o \ - objects/node_item.o \ - objects/pet_control.o \ - objects/project_item.o \ - objects/resource_key.o \ - objects/saveable_object.o \ - objects/tree_item.o \ - objects/view_item.o \ - rooms/announce.o \ - rooms/door_auto_sound_event.o \ - rooms/pet_position.o \ - rooms/room_item.o \ - rooms/service_elevator_door.o \ - rooms/sub_glass.o + core/auto_sound_event.o \ + core/dont_save_file_item.o \ + core/file_item.o \ + core/game_object.o \ + core/link_item.o \ + core/list.o \ + core/message_target.o \ + core/movie_clip.o \ + core/named_item.o \ + core/node_item.o \ + core/pet_control.o \ + core/project_item.o \ + core/resource_key.o \ + core/saveable_object.o \ + core/tree_item.o \ + core/view_item.o \ + game/announce.o \ + game/door_auto_sound_event.o \ + game/pet_position.o \ + game/room_item.o \ + game/service_elevator_door.o \ + game/sub_glass.o # This module can be built as a plugin ifeq ($(ENABLE_TITANIC), DYNAMIC_PLUGIN) diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp index d998ec5837..47b7c1336a 100644 --- a/engines/titanic/titanic.cpp +++ b/engines/titanic/titanic.cpp @@ -28,7 +28,7 @@ #include "graphics/scaler.h" #include "graphics/thumbnail.h" #include "titanic/titanic.h" -#include "titanic/objects/saveable_object.h" +#include "titanic/core/saveable_object.h" namespace Titanic { |