diff options
| author | Paul Gilbert | 2016-08-14 23:07:24 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-14 23:07:24 -0400 |
| commit | cbf5fb0beee0e0157c2d9a8e4cac2d35106e5c34 (patch) | |
| tree | 29784298750a69a6d3e583894feda5c02dfea8cd /engines/titanic | |
| parent | b128ba1ae925c3695e408812c833f0e7ca7b884b (diff) | |
| download | scummvm-rg350-cbf5fb0beee0e0157c2d9a8e4cac2d35106e5c34.tar.gz scummvm-rg350-cbf5fb0beee0e0157c2d9a8e4cac2d35106e5c34.tar.bz2 scummvm-rg350-cbf5fb0beee0e0157c2d9a8e4cac2d35106e5c34.zip | |
TITANIC: Move BilgeSuccUBus & ParrotSuccUBus to npcs/ folder
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/core/saveable_object.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/module.mk | 4 | ||||
| -rw-r--r-- | engines/titanic/npcs/bilge_succubus.cpp (renamed from engines/titanic/game/bilge_succubus.cpp) | 2 | ||||
| -rw-r--r-- | engines/titanic/npcs/bilge_succubus.h (renamed from engines/titanic/game/bilge_succubus.h) | 0 | ||||
| -rw-r--r-- | engines/titanic/npcs/parrot_succubus.cpp (renamed from engines/titanic/game/parrot/parrot_succubus.cpp) | 2 | ||||
| -rw-r--r-- | engines/titanic/npcs/parrot_succubus.h (renamed from engines/titanic/game/parrot/parrot_succubus.h) | 0 |
6 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp index 62cee47045..080c34b08b 100644 --- a/engines/titanic/core/saveable_object.cpp +++ b/engines/titanic/core/saveable_object.cpp @@ -92,7 +92,7 @@ #include "titanic/game/bar_menu.h" #include "titanic/game/bar_menu_button.h" #include "titanic/game/belbot_get_light.h" -#include "titanic/game/bilge_succubus.h" +#include "titanic/npcs/bilge_succubus.h" #include "titanic/game/bomb.h" #include "titanic/game/bottom_of_well_monitor.h" #include "titanic/game/bowl_unlocker.h" @@ -228,7 +228,7 @@ #include "titanic/game/parrot/parrot_nut_bowl_actor.h" #include "titanic/game/parrot/parrot_nut_eater.h" #include "titanic/game/parrot/parrot_perch_holder.h" -#include "titanic/game/parrot/parrot_succubus.h" +#include "titanic/npcs/parrot_succubus.h" #include "titanic/game/parrot/parrot_trigger.h" #include "titanic/game/parrot/player_meets_parrot.h" #include "titanic/game/pet/pet.h" diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index 5c041174a2..34d93b6411 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -81,7 +81,6 @@ MODULE_OBJS := \ game/arb_background.o \ game/arboretum_gate.o \ game/auto_animate.o \ - game/bilge_succubus.o \ game/bar_menu.o \ game/bar_menu_button.o \ game/bar_bell.o \ @@ -221,7 +220,6 @@ MODULE_OBJS := \ game/parrot/parrot_nut_bowl_actor.o \ game/parrot/parrot_nut_eater.o \ game/parrot/parrot_perch_holder.o \ - game/parrot/parrot_succubus.o \ game/parrot/parrot_trigger.o \ game/parrot/player_meets_parrot.o \ game/pet/pet.o \ @@ -343,6 +341,7 @@ MODULE_OBJS := \ moves/trip_down_canal.o \ npcs/barbot.o \ npcs/bellbot.o \ + npcs/bilge_succubus.o \ npcs/callbot.o \ npcs/character.o \ npcs/deskbot.o \ @@ -351,6 +350,7 @@ MODULE_OBJS := \ npcs/maitre_d.o \ npcs/mobile.o \ npcs/parrot.o \ + npcs/parrot_succubus.o \ npcs/robot_controller.o \ npcs/starlings.o \ npcs/succubus.o \ diff --git a/engines/titanic/game/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp index 88ddf70741..16064bf212 100644 --- a/engines/titanic/game/bilge_succubus.cpp +++ b/engines/titanic/npcs/bilge_succubus.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/game/bilge_succubus.h" +#include "titanic/npcs/bilge_succubus.h" #include "titanic/carry/chicken.h" #include "titanic/core/view_item.h" #include "titanic/pet_control/pet_control.h" diff --git a/engines/titanic/game/bilge_succubus.h b/engines/titanic/npcs/bilge_succubus.h index 754949a306..754949a306 100644 --- a/engines/titanic/game/bilge_succubus.h +++ b/engines/titanic/npcs/bilge_succubus.h diff --git a/engines/titanic/game/parrot/parrot_succubus.cpp b/engines/titanic/npcs/parrot_succubus.cpp index 02a29b748e..49c4afa1f1 100644 --- a/engines/titanic/game/parrot/parrot_succubus.cpp +++ b/engines/titanic/npcs/parrot_succubus.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/game/parrot/parrot_succubus.h" +#include "titanic/npcs/parrot_succubus.h" namespace Titanic { diff --git a/engines/titanic/game/parrot/parrot_succubus.h b/engines/titanic/npcs/parrot_succubus.h index 6f5d9e602a..6f5d9e602a 100644 --- a/engines/titanic/game/parrot/parrot_succubus.h +++ b/engines/titanic/npcs/parrot_succubus.h |