diff options
26 files changed, 49 insertions, 49 deletions
diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp index 382023da95..080cdb6aa2 100644 --- a/engines/titanic/core/saveable_object.cpp +++ b/engines/titanic/core/saveable_object.cpp @@ -38,18 +38,18 @@ #include "titanic/game/service_elevator_door.h" #include "titanic/game/sub_glass.h" -#include "titanic/messages/enter_bomb_room.h" -#include "titanic/messages/exit_arboretum.h" -#include "titanic/messages/exit_bridge.h" -#include "titanic/messages/exit_state_room.h" -#include "titanic/messages/move_player_in_parrot_room.h" -#include "titanic/messages/move_player_to.h" -#include "titanic/messages/move_player_to_from.h" -#include "titanic/messages/multi_move.h" -#include "titanic/messages/pan_from_pel.h" -#include "titanic/messages/restaurant_pan_handler.h" -#include "titanic/messages/restricted_move.h" -#include "titanic/messages/trip_down_canal.h" +#include "titanic/moves/enter_bomb_room.h" +#include "titanic/moves/exit_arboretum.h" +#include "titanic/moves/exit_bridge.h" +#include "titanic/moves/exit_state_room.h" +#include "titanic/moves/move_player_in_parrot_room.h" +#include "titanic/moves/move_player_to.h" +#include "titanic/moves/move_player_to_from.h" +#include "titanic/moves/multi_move.h" +#include "titanic/moves/pan_from_pel.h" +#include "titanic/moves/restaurant_pan_handler.h" +#include "titanic/moves/restricted_move.h" +#include "titanic/moves/trip_down_canal.h" #include "titanic/npcs/barbot.h" #include "titanic/npcs/bellbot.h" diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index 66157be507..dcfe38c2d5 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -38,19 +38,19 @@ MODULE_OBJS := \ game/room_item.o \ game/service_elevator_door.o \ game/sub_glass.o \ - messages/enter_bomb_room.o \ - messages/exit_arboretum.o \ - messages/exit_bridge.o \ - messages/exit_state_room.o \ - messages/exit_titania.o \ - messages/move_player_in_parrot_room.o \ - messages/move_player_to_from.o \ - messages/move_player_to.o \ - messages/multi_move.o \ - messages/pan_from_pel.o \ - messages/restaurant_pan_handler.o \ - messages/restricted_move.o \ - messages/trip_down_canal.o \ + moves/enter_bomb_room.o \ + moves/exit_arboretum.o \ + moves/exit_bridge.o \ + moves/exit_state_room.o \ + moves/exit_titania.o \ + moves/move_player_in_parrot_room.o \ + moves/move_player_to_from.o \ + moves/move_player_to.o \ + moves/multi_move.o \ + moves/pan_from_pel.o \ + moves/restaurant_pan_handler.o \ + moves/restricted_move.o \ + moves/trip_down_canal.o \ npcs/barbot.o \ npcs/bellbot.o \ npcs/character.o \ diff --git a/engines/titanic/moves/enter_bomb_room.cpp b/engines/titanic/moves/enter_bomb_room.cpp index 049c3f45ae..e989d47114 100644 --- a/engines/titanic/moves/enter_bomb_room.cpp +++ b/engines/titanic/moves/enter_bomb_room.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/enter_bomb_room.h" +#include "titanic/moves/enter_bomb_room.h" namespace Titanic { diff --git a/engines/titanic/moves/enter_bomb_room.h b/engines/titanic/moves/enter_bomb_room.h index 3ec5616db0..fc4d1360ec 100644 --- a/engines/titanic/moves/enter_bomb_room.h +++ b/engines/titanic/moves/enter_bomb_room.h @@ -23,7 +23,7 @@ #ifndef TITANIC_ENTER_BOMB_ROOM_H #define TITANIC_ENTER_BOMB_ROOM_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/exit_arboretum.cpp b/engines/titanic/moves/exit_arboretum.cpp index 0a50377afb..2b5b497f5c 100644 --- a/engines/titanic/moves/exit_arboretum.cpp +++ b/engines/titanic/moves/exit_arboretum.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/exit_arboretum.h" +#include "titanic/moves/exit_arboretum.h" namespace Titanic { diff --git a/engines/titanic/moves/exit_arboretum.h b/engines/titanic/moves/exit_arboretum.h index 4ee135e6bc..4e5815d284 100644 --- a/engines/titanic/moves/exit_arboretum.h +++ b/engines/titanic/moves/exit_arboretum.h @@ -23,7 +23,7 @@ #ifndef TITANIC_EXIT_ARBORETUM_H #define TITANIC_EXIT_ARBORETUM_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/exit_bridge.cpp b/engines/titanic/moves/exit_bridge.cpp index 27f923bf11..99138f946e 100644 --- a/engines/titanic/moves/exit_bridge.cpp +++ b/engines/titanic/moves/exit_bridge.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/exit_bridge.h" +#include "titanic/moves/exit_bridge.h" namespace Titanic { diff --git a/engines/titanic/moves/exit_bridge.h b/engines/titanic/moves/exit_bridge.h index 6d65a0028a..c85c1bcab7 100644 --- a/engines/titanic/moves/exit_bridge.h +++ b/engines/titanic/moves/exit_bridge.h @@ -23,7 +23,7 @@ #ifndef TITANIC_EXIT_BRIDGE_H #define TITANIC_EXIT_BRIDGE_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/exit_state_room.cpp b/engines/titanic/moves/exit_state_room.cpp index f1acd910d8..0dc4a4f967 100644 --- a/engines/titanic/moves/exit_state_room.cpp +++ b/engines/titanic/moves/exit_state_room.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/exit_state_room.h" +#include "titanic/moves/exit_state_room.h" namespace Titanic { diff --git a/engines/titanic/moves/exit_state_room.h b/engines/titanic/moves/exit_state_room.h index 12adcfba44..ecef4f1dc3 100644 --- a/engines/titanic/moves/exit_state_room.h +++ b/engines/titanic/moves/exit_state_room.h @@ -23,7 +23,7 @@ #ifndef TITANIC_EXIT_STATE_ROOM_H #define TITANIC_EXIT_STATE_ROOM_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/exit_titania.cpp b/engines/titanic/moves/exit_titania.cpp index e94d0cd706..99585f56d9 100644 --- a/engines/titanic/moves/exit_titania.cpp +++ b/engines/titanic/moves/exit_titania.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/exit_titania.h" +#include "titanic/moves/exit_titania.h" namespace Titanic { diff --git a/engines/titanic/moves/exit_titania.h b/engines/titanic/moves/exit_titania.h index 529886aee9..1d2226ae54 100644 --- a/engines/titanic/moves/exit_titania.h +++ b/engines/titanic/moves/exit_titania.h @@ -23,7 +23,7 @@ #ifndef TITANIC_EXIT_TITANIA_H #define TITANIC_EXIT_TITANIA_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/move_player_in_parrot_room.cpp b/engines/titanic/moves/move_player_in_parrot_room.cpp index b1040bfb75..cfe4cb689f 100644 --- a/engines/titanic/moves/move_player_in_parrot_room.cpp +++ b/engines/titanic/moves/move_player_in_parrot_room.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/move_player_in_parrot_room.h" +#include "titanic/moves/move_player_in_parrot_room.h" namespace Titanic { diff --git a/engines/titanic/moves/move_player_in_parrot_room.h b/engines/titanic/moves/move_player_in_parrot_room.h index f4e5779fd8..91f8b993a6 100644 --- a/engines/titanic/moves/move_player_in_parrot_room.h +++ b/engines/titanic/moves/move_player_in_parrot_room.h @@ -23,7 +23,7 @@ #ifndef TITANIC_MOVE_PLAYER_IN_PARROT_ROOM_H #define TITANIC_MOVE_PLAYER_IN_PARROT_ROOM_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/move_player_to.cpp b/engines/titanic/moves/move_player_to.cpp index 66a71e8fa5..8ce8f77896 100644 --- a/engines/titanic/moves/move_player_to.cpp +++ b/engines/titanic/moves/move_player_to.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/move_player_to_from.cpp b/engines/titanic/moves/move_player_to_from.cpp index 77c74d5b50..f349c5c265 100644 --- a/engines/titanic/moves/move_player_to_from.cpp +++ b/engines/titanic/moves/move_player_to_from.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/move_player_to_from.h" +#include "titanic/moves/move_player_to_from.h" namespace Titanic { diff --git a/engines/titanic/moves/multi_move.cpp b/engines/titanic/moves/multi_move.cpp index dd1948c435..6b35b88654 100644 --- a/engines/titanic/moves/multi_move.cpp +++ b/engines/titanic/moves/multi_move.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/multi_move.h" +#include "titanic/moves/multi_move.h" namespace Titanic { diff --git a/engines/titanic/moves/multi_move.h b/engines/titanic/moves/multi_move.h index 2cc4f4e6bb..102b4b7473 100644 --- a/engines/titanic/moves/multi_move.h +++ b/engines/titanic/moves/multi_move.h @@ -23,7 +23,7 @@ #ifndef TITANIC_MULTI_MOVE_H #define TITANIC_MULTI_MOVE_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/pan_from_pel.cpp b/engines/titanic/moves/pan_from_pel.cpp index 718927f9c7..db3c9bf49c 100644 --- a/engines/titanic/moves/pan_from_pel.cpp +++ b/engines/titanic/moves/pan_from_pel.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/pan_from_pel.h" +#include "titanic/moves/pan_from_pel.h" namespace Titanic { diff --git a/engines/titanic/moves/pan_from_pel.h b/engines/titanic/moves/pan_from_pel.h index abb565c9ce..41f3fdb339 100644 --- a/engines/titanic/moves/pan_from_pel.h +++ b/engines/titanic/moves/pan_from_pel.h @@ -23,7 +23,7 @@ #ifndef TITANIC_PAN_FROM_PEL_H #define TITANIC_PAN_FROM_PEL_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/restaurant_pan_handler.cpp b/engines/titanic/moves/restaurant_pan_handler.cpp index 14fd383cde..b2487a4cb1 100644 --- a/engines/titanic/moves/restaurant_pan_handler.cpp +++ b/engines/titanic/moves/restaurant_pan_handler.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/restaurant_pan_handler.h" +#include "titanic/moves/restaurant_pan_handler.h" namespace Titanic { diff --git a/engines/titanic/moves/restaurant_pan_handler.h b/engines/titanic/moves/restaurant_pan_handler.h index dd757bef7c..f2f2c0cc9b 100644 --- a/engines/titanic/moves/restaurant_pan_handler.h +++ b/engines/titanic/moves/restaurant_pan_handler.h @@ -23,7 +23,7 @@ #ifndef TITANIC_RESTAURANT_PAN_HANDLER_H #define TITANIC_RESTAURANT_PAN_HANDLER_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/restricted_move.cpp b/engines/titanic/moves/restricted_move.cpp index 147cf11c08..d6a046d30c 100644 --- a/engines/titanic/moves/restricted_move.cpp +++ b/engines/titanic/moves/restricted_move.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/restricted_move.h" +#include "titanic/moves/restricted_move.h" namespace Titanic { diff --git a/engines/titanic/moves/restricted_move.h b/engines/titanic/moves/restricted_move.h index 5feae2985b..48ddefe9b8 100644 --- a/engines/titanic/moves/restricted_move.h +++ b/engines/titanic/moves/restricted_move.h @@ -23,7 +23,7 @@ #ifndef TITANIC_RESTRICTED_MOVE_H #define TITANIC_RESTRICTED_MOVE_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { diff --git a/engines/titanic/moves/trip_down_canal.cpp b/engines/titanic/moves/trip_down_canal.cpp index be5f28321f..349a7e945c 100644 --- a/engines/titanic/moves/trip_down_canal.cpp +++ b/engines/titanic/moves/trip_down_canal.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/messages/trip_down_canal.h" +#include "titanic/moves/trip_down_canal.h" namespace Titanic { diff --git a/engines/titanic/moves/trip_down_canal.h b/engines/titanic/moves/trip_down_canal.h index 117ce94c12..0a5f918fb2 100644 --- a/engines/titanic/moves/trip_down_canal.h +++ b/engines/titanic/moves/trip_down_canal.h @@ -23,7 +23,7 @@ #ifndef TITANIC_TRIP_DOWN_CANAL_H #define TITANIC_TRIP_DOWN_CANAL_H -#include "titanic/messages/move_player_to.h" +#include "titanic/moves/move_player_to.h" namespace Titanic { |