aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/core/project_item.cpp2
-rw-r--r--engines/titanic/core/saveable_object.cpp5
-rw-r--r--engines/titanic/module.mk20
-rw-r--r--engines/titanic/pet_control/pet_control.cpp (renamed from engines/titanic/game/pet/pet_control.cpp)2
-rw-r--r--engines/titanic/pet_control/pet_control.h (renamed from engines/titanic/game/pet/pet_control.h)16
-rw-r--r--engines/titanic/pet_control/pet_control_sub1.cpp (renamed from engines/titanic/game/pet/pet_control_sub1.cpp)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub1.h (renamed from engines/titanic/game/pet/pet_control_sub1.h)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub2.cpp (renamed from engines/titanic/game/pet/pet_control_sub2.cpp)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub2.h (renamed from engines/titanic/game/pet/pet_control_sub2.h)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub3.cpp (renamed from engines/titanic/game/pet/pet_control_sub3.cpp)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub3.h (renamed from engines/titanic/game/pet/pet_control_sub3.h)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub4.cpp (renamed from engines/titanic/game/pet/pet_control_sub4.cpp)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub4.h (renamed from engines/titanic/game/pet/pet_control_sub4.h)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub5.cpp (renamed from engines/titanic/game/pet/pet_control_sub5.cpp)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub5.h (renamed from engines/titanic/game/pet/pet_control_sub5.h)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub6.cpp (renamed from engines/titanic/game/pet/pet_control_sub6.cpp)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub6.h (renamed from engines/titanic/game/pet/pet_control_sub6.h)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub7.cpp (renamed from engines/titanic/game/pet/pet_control_sub7.cpp)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub7.h (renamed from engines/titanic/game/pet/pet_control_sub7.h)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub8.cpp (renamed from engines/titanic/game/pet/pet_control_sub8.cpp)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub8.h (renamed from engines/titanic/game/pet/pet_control_sub8.h)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub_base.cpp (renamed from engines/titanic/game/pet/pet_control_sub_base.cpp)2
-rw-r--r--engines/titanic/pet_control/pet_control_sub_base.h (renamed from engines/titanic/game/pet/pet_control_sub_base.h)0
23 files changed, 39 insertions, 40 deletions
diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp
index 2c3d070245..e759b87e9f 100644
--- a/engines/titanic/core/project_item.cpp
+++ b/engines/titanic/core/project_item.cpp
@@ -26,7 +26,7 @@
#include "titanic/compressed_file.h"
#include "titanic/core/dont_save_file_item.h"
#include "titanic/core/project_item.h"
-#include "titanic/game/pet/pet_control.h"
+#include "titanic/pet_control/pet_control.h"
namespace Titanic {
diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp
index 937fef9864..dcd47b78a4 100644
--- a/engines/titanic/core/saveable_object.cpp
+++ b/engines/titanic/core/saveable_object.cpp
@@ -161,9 +161,6 @@
#include "titanic/game/nose_holder.h"
#include "titanic/game/null_port_hole.h"
#include "titanic/game/nut_replacer.h"
-#include "titanic/game/pet/pet_control.h"
-#include "titanic/game/pet/pet_control_sub_base.h"
-#include "titanic/game/pet/pet_control_sub1.h"
#include "titanic/game/pet_disabler.h"
#include "titanic/game/phonograph.h"
#include "titanic/game/phonograph_lid.h"
@@ -372,6 +369,8 @@
#include "titanic/npcs/summon_bots.h"
#include "titanic/npcs/titania.h"
+#include "titanic/pet_control/pet_control.h"
+
#include "titanic/sound/auto_music_player.h"
#include "titanic/sound/auto_music_player_base.h"
#include "titanic/sound/auto_sound_player.h"
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index 9edb440fa4..922878bc8e 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -235,16 +235,6 @@ MODULE_OBJS := \
game/pet/pet_class3.o \
game/pet/pet_lift.o \
game/pet/pet_monitor.o \
- game/pet/pet_control.o \
- game/pet/pet_control_sub_base.o \
- game/pet/pet_control_sub1.o \
- game/pet/pet_control_sub2.o \
- game/pet/pet_control_sub3.o \
- game/pet/pet_control_sub4.o \
- game/pet/pet_control_sub5.o \
- game/pet/pet_control_sub6.o \
- game/pet/pet_control_sub7.o \
- game/pet/pet_control_sub8.o \
game/pet/pet_pellerator.o \
game/pet/pet_position.o \
game/pet/pet_sentinal.o \
@@ -382,6 +372,16 @@ MODULE_OBJS := \
npcs/summon_bots.o \
npcs/titania.o \
npcs/true_talk_npc.o \
+ pet_control/pet_control.o \
+ pet_control/pet_control_sub_base.o \
+ pet_control/pet_control_sub1.o \
+ pet_control/pet_control_sub2.o \
+ pet_control/pet_control_sub3.o \
+ pet_control/pet_control_sub4.o \
+ pet_control/pet_control_sub5.o \
+ pet_control/pet_control_sub6.o \
+ pet_control/pet_control_sub7.o \
+ pet_control/pet_control_sub8.o \
sound/auto_music_player.o \
sound/auto_music_player_base.o \
sound/auto_sound_player.o \
diff --git a/engines/titanic/game/pet/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index f85b767a85..354ed393a8 100644
--- a/engines/titanic/game/pet/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/game/pet/pet_control.h"
+#include "titanic/pet_control/pet_control.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control.h b/engines/titanic/pet_control/pet_control.h
index 33fa11d847..dab44266c4 100644
--- a/engines/titanic/game/pet/pet_control.h
+++ b/engines/titanic/pet_control/pet_control.h
@@ -24,14 +24,14 @@
#define TITANIC_PET_CONTROL_H
#include "titanic/core/game_object.h"
-#include "titanic/game/pet/pet_control_sub1.h"
-#include "titanic/game/pet/pet_control_sub2.h"
-#include "titanic/game/pet/pet_control_sub3.h"
-#include "titanic/game/pet/pet_control_sub4.h"
-#include "titanic/game/pet/pet_control_sub5.h"
-#include "titanic/game/pet/pet_control_sub6.h"
-#include "titanic/game/pet/pet_control_sub7.h"
-#include "titanic/game/pet/pet_control_sub8.h"
+#include "titanic/pet_control/pet_control_sub1.h"
+#include "titanic/pet_control/pet_control_sub2.h"
+#include "titanic/pet_control/pet_control_sub3.h"
+#include "titanic/pet_control/pet_control_sub4.h"
+#include "titanic/pet_control/pet_control_sub5.h"
+#include "titanic/pet_control/pet_control_sub6.h"
+#include "titanic/pet_control/pet_control_sub7.h"
+#include "titanic/pet_control/pet_control_sub8.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub1.cpp b/engines/titanic/pet_control/pet_control_sub1.cpp
index 5aa84bd192..808358678a 100644
--- a/engines/titanic/game/pet/pet_control_sub1.cpp
+++ b/engines/titanic/pet_control/pet_control_sub1.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/game/pet/pet_control_sub1.h"
+#include "titanic/pet_control/pet_control_sub1.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub1.h b/engines/titanic/pet_control/pet_control_sub1.h
index 31e1129cae..5e38523858 100644
--- a/engines/titanic/game/pet/pet_control_sub1.h
+++ b/engines/titanic/pet_control/pet_control_sub1.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_PET_CONTROL_SUB1_H
#define TITANIC_PET_CONTROL_SUB1_H
-#include "titanic/game/pet/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_control_sub_base.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub2.cpp b/engines/titanic/pet_control/pet_control_sub2.cpp
index c8c905ef3c..a48869e806 100644
--- a/engines/titanic/game/pet/pet_control_sub2.cpp
+++ b/engines/titanic/pet_control/pet_control_sub2.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/game/pet/pet_control_sub2.h"
+#include "titanic/pet_control/pet_control_sub2.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub2.h b/engines/titanic/pet_control/pet_control_sub2.h
index c4e2b208fd..a54142c225 100644
--- a/engines/titanic/game/pet/pet_control_sub2.h
+++ b/engines/titanic/pet_control/pet_control_sub2.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_PET_CONTROL_SUB2_H
#define TITANIC_PET_CONTROL_SUB2_H
-#include "titanic/game/pet/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_control_sub_base.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub3.cpp b/engines/titanic/pet_control/pet_control_sub3.cpp
index 5504b1384f..2f508be3e6 100644
--- a/engines/titanic/game/pet/pet_control_sub3.cpp
+++ b/engines/titanic/pet_control/pet_control_sub3.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/game/pet/pet_control_sub3.h"
+#include "titanic/pet_control/pet_control_sub3.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub3.h b/engines/titanic/pet_control/pet_control_sub3.h
index 1b67a1eb1f..1b37628131 100644
--- a/engines/titanic/game/pet/pet_control_sub3.h
+++ b/engines/titanic/pet_control/pet_control_sub3.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_PET_CONTROL_SUB3_H
#define TITANIC_PET_CONTROL_SUB3_H
-#include "titanic/game/pet/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_control_sub_base.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub4.cpp b/engines/titanic/pet_control/pet_control_sub4.cpp
index eb605b8826..35367a6186 100644
--- a/engines/titanic/game/pet/pet_control_sub4.cpp
+++ b/engines/titanic/pet_control/pet_control_sub4.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/game/pet/pet_control_sub4.h"
+#include "titanic/pet_control/pet_control_sub4.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub4.h b/engines/titanic/pet_control/pet_control_sub4.h
index 426137e519..b00acffdd9 100644
--- a/engines/titanic/game/pet/pet_control_sub4.h
+++ b/engines/titanic/pet_control/pet_control_sub4.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_PET_CONTROL_SUB4_H
#define TITANIC_PET_CONTROL_SUB4_H
-#include "titanic/game/pet/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_control_sub_base.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub5.cpp b/engines/titanic/pet_control/pet_control_sub5.cpp
index d46b3db16c..461fb1ebc1 100644
--- a/engines/titanic/game/pet/pet_control_sub5.cpp
+++ b/engines/titanic/pet_control/pet_control_sub5.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/game/pet/pet_control_sub5.h"
+#include "titanic/pet_control/pet_control_sub5.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub5.h b/engines/titanic/pet_control/pet_control_sub5.h
index d76cf8f8cc..2142a1050c 100644
--- a/engines/titanic/game/pet/pet_control_sub5.h
+++ b/engines/titanic/pet_control/pet_control_sub5.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_PET_CONTROL_SUB5_H
#define TITANIC_PET_CONTROL_SUB5_H
-#include "titanic/game/pet/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_control_sub_base.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub6.cpp b/engines/titanic/pet_control/pet_control_sub6.cpp
index 2a3f26e0fa..d33ea1f824 100644
--- a/engines/titanic/game/pet/pet_control_sub6.cpp
+++ b/engines/titanic/pet_control/pet_control_sub6.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/game/pet/pet_control_sub6.h"
+#include "titanic/pet_control/pet_control_sub6.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub6.h b/engines/titanic/pet_control/pet_control_sub6.h
index 4417665e16..d26c8f2753 100644
--- a/engines/titanic/game/pet/pet_control_sub6.h
+++ b/engines/titanic/pet_control/pet_control_sub6.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_PET_CONTROL_SUB6_H
#define TITANIC_PET_CONTROL_SUB6_H
-#include "titanic/game/pet/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_control_sub_base.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub7.cpp b/engines/titanic/pet_control/pet_control_sub7.cpp
index 7be9b11bc5..8333dc1508 100644
--- a/engines/titanic/game/pet/pet_control_sub7.cpp
+++ b/engines/titanic/pet_control/pet_control_sub7.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/game/pet/pet_control_sub7.h"
+#include "titanic/pet_control/pet_control_sub7.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub7.h b/engines/titanic/pet_control/pet_control_sub7.h
index cc42f9e27f..660fe2a542 100644
--- a/engines/titanic/game/pet/pet_control_sub7.h
+++ b/engines/titanic/pet_control/pet_control_sub7.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_PET_CONTROL_SUB7_H
#define TITANIC_PET_CONTROL_SUB7_H
-#include "titanic/game/pet/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_control_sub_base.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub8.cpp b/engines/titanic/pet_control/pet_control_sub8.cpp
index f88e8fdcf0..471630835f 100644
--- a/engines/titanic/game/pet/pet_control_sub8.cpp
+++ b/engines/titanic/pet_control/pet_control_sub8.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/game/pet/pet_control_sub8.h"
+#include "titanic/pet_control/pet_control_sub8.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub8.h b/engines/titanic/pet_control/pet_control_sub8.h
index 76dc6b1688..e6de1f89e1 100644
--- a/engines/titanic/game/pet/pet_control_sub8.h
+++ b/engines/titanic/pet_control/pet_control_sub8.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_PET_CONTROL_SUB8_H
#define TITANIC_PET_CONTROL_SUB8_H
-#include "titanic/game/pet/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_control_sub_base.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub_base.cpp b/engines/titanic/pet_control/pet_control_sub_base.cpp
index 9afb18895e..35194317c3 100644
--- a/engines/titanic/game/pet/pet_control_sub_base.cpp
+++ b/engines/titanic/pet_control/pet_control_sub_base.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "titanic/game/pet/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_control_sub_base.h"
namespace Titanic {
diff --git a/engines/titanic/game/pet/pet_control_sub_base.h b/engines/titanic/pet_control/pet_control_sub_base.h
index b11f5cc78b..b11f5cc78b 100644
--- a/engines/titanic/game/pet/pet_control_sub_base.h
+++ b/engines/titanic/pet_control/pet_control_sub_base.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 14:36:18 +0000