From 73b80c29c61d7a6052c2e8acc718d0144660eb31 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 18 Dec 2019 07:12:43 -0800 Subject: [PATCH] ULTIMA6: Added portraits/ folder --- engines/ultima/module.mk | 6 +++++- engines/ultima/ultima6/portraits/portrait.cpp | 6 +++--- engines/ultima/ultima6/portraits/portrait_md.cpp | 2 +- engines/ultima/ultima6/portraits/portrait_se.cpp | 2 +- engines/ultima/ultima6/portraits/portrait_u6.cpp | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/engines/ultima/module.mk b/engines/ultima/module.mk index 5fda8fd1eeb..a94c4f2eb14 100644 --- a/engines/ultima/module.mk +++ b/engines/ultima/module.mk @@ -34,7 +34,11 @@ MODULE_OBJS += \ ultima6/pathfinder/path_finder.o \ ultima6/pathfinder/sched_path_finder.o \ ultima6/pathfinder/seek_path.o \ - ultima6/pathfinder/u6_astar_path.o + ultima6/pathfinder/u6_astar_path.o \ + ultima6/portraits/portrait.o \ + ultima6/portraits/portrait_md.o \ + ultima6/portraits/portrait_se.o \ + ultima6/portraits/portrait_u6.o endif ifdef ENABLE_ULTIMA8 diff --git a/engines/ultima/ultima6/portraits/portrait.cpp b/engines/ultima/ultima6/portraits/portrait.cpp index 06121c07055..9c074ac8101 100644 --- a/engines/ultima/ultima6/portraits/portrait.cpp +++ b/engines/ultima/ultima6/portraits/portrait.cpp @@ -33,9 +33,9 @@ #include "ultima/ultima6/actors/actor.h" #include "ultima/ultima6/portraits/portrait.h" -#include "PortraitU6.h" -#include "PortraitMD.h" -#include "PortraitSE.h" +#include "ultima/ultima6/portraits/portrait_u6.h" +#include "ultima/ultima6/portraits/portrait_md.h" +#include "ultima/ultima6/portraits/portrait_se.h" #include "ultima/ultima6/files/u6_lzw.h" #include "ultima/ultima6/misc/u6_misc.h" diff --git a/engines/ultima/ultima6/portraits/portrait_md.cpp b/engines/ultima/ultima6/portraits/portrait_md.cpp index ad9df2d52c5..2983b1e2880 100644 --- a/engines/ultima/ultima6/portraits/portrait_md.cpp +++ b/engines/ultima/ultima6/portraits/portrait_md.cpp @@ -30,7 +30,7 @@ #include "ultima/ultima6/actors/actor_manager.h" #include "ultima/ultima6/actors/actor.h" -#include "PortraitMD.h" +#include "ultima/ultima6/portraits/portrait_md.h" #include "ultima/ultima6/misc/u6_misc.h" #include "ultima/ultima6/save/obj_list.h" #include "ultima/ultima6/script/script.h" diff --git a/engines/ultima/ultima6/portraits/portrait_se.cpp b/engines/ultima/ultima6/portraits/portrait_se.cpp index c20e4121258..b538dd10ebb 100644 --- a/engines/ultima/ultima6/portraits/portrait_se.cpp +++ b/engines/ultima/ultima6/portraits/portrait_se.cpp @@ -31,7 +31,7 @@ #include "ultima/ultima6/actors/actor_manager.h" #include "ultima/ultima6/actors/actor.h" #include "ultima/ultima6/core/game_clock.h" -#include "PortraitSE.h" +#include "ultima/ultima6/portraits/portrait_se.h" #include "ultima/ultima6/misc/u6_misc.h" namespace Ultima { diff --git a/engines/ultima/ultima6/portraits/portrait_u6.cpp b/engines/ultima/ultima6/portraits/portrait_u6.cpp index a59197215f7..79ed65dbbef 100644 --- a/engines/ultima/ultima6/portraits/portrait_u6.cpp +++ b/engines/ultima/ultima6/portraits/portrait_u6.cpp @@ -31,7 +31,7 @@ #include "ultima/ultima6/actors/actor_manager.h" #include "ultima/ultima6/actors/actor.h" -#include "PortraitU6.h" +#include "ultima/ultima6/portraits/portrait_u6.h" #include "ultima/ultima6/files/u6_lzw.h" #include "ultima/ultima6/misc/u6_misc.h"