[Scummvm-git-logs] scummvm master -> abf59531e615e7038a244e0fa265a3eb317378f2

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
abf59531e6 ULTIMA4: Compilation fix


Commit: abf59531e615e7038a244e0fa265a3eb317378f2
    https://github.com/scummvm/scummvm/commit/abf59531e615e7038a244e0fa265a3eb317378f2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-16T19:41:23-07:00

Commit Message:
ULTIMA4: Compilation fix

Changed paths:
    engines/ultima/ultima4/core/debugger_actions.h
    engines/ultima/ultima4/gfx/imagemgr.cpp
    engines/ultima/ultima4/map/location.cpp
    engines/ultima/ultima4/map/maploader.cpp
    engines/ultima/ultima4/map/mapmgr.cpp
    engines/ultima/ultima4/map/movement.cpp


diff --git a/engines/ultima/ultima4/core/debugger_actions.h b/engines/ultima/ultima4/core/debugger_actions.h
index 519775d8f4..5b1d9e65a6 100644
--- a/engines/ultima/ultima4/core/debugger_actions.h
+++ b/engines/ultima/ultima4/core/debugger_actions.h
@@ -65,6 +65,8 @@ protected:
 	 */
 	virtual void printN(const char *fmt, ...) = 0;
 public:
+	virtual ~DebuggerActions() {}
+
 	/**
 	 * Summons a creature given by 'creatureName'. This can either be given
 	 * as the creature's name, or the creature's id.  Once it finds the
diff --git a/engines/ultima/ultima4/gfx/imagemgr.cpp b/engines/ultima/ultima4/gfx/imagemgr.cpp
index 3c482f3785..f2df213d70 100644
--- a/engines/ultima/ultima4/gfx/imagemgr.cpp
+++ b/engines/ultima/ultima4/gfx/imagemgr.cpp
@@ -20,12 +20,12 @@
  *
  */
 
-#include "ultima/ultima4/core/config.h"
-#include "ultima/ultima4/core/error.h"
 #include "ultima/ultima4/gfx/image.h"
 #include "ultima/ultima4/gfx/imageloader.h"
 #include "ultima/ultima4/gfx/imagemgr.h"
-#include "ultima/ultima4/game/intro.h"
+#include "ultima/ultima4/controllers/intro_controller.h"
+#include "ultima/ultima4/core/config.h"
+#include "ultima/ultima4/core/error.h"
 #include "ultima/ultima4/core/settings.h"
 #include "ultima/ultima4/filesys/u4file.h"
 #include "ultima/ultima4/ultima4.h"
diff --git a/engines/ultima/ultima4/map/location.cpp b/engines/ultima/ultima4/map/location.cpp
index 235fe897a4..3eb8f0f61c 100644
--- a/engines/ultima/ultima4/map/location.cpp
+++ b/engines/ultima/ultima4/map/location.cpp
@@ -23,7 +23,7 @@
 #include "ultima/ultima4/map/location.h"
 #include "ultima/ultima4/map/annotation.h"
 #include "ultima/ultima4/game/context.h"
-#include "ultima/ultima4/map/combat.h"
+#include "ultima/ultima4/controllers/combat_controller.h"
 #include "ultima/ultima4/game/creature.h"
 #include "ultima/ultima4/events/event.h"
 #include "ultima/ultima4/game/game.h"
diff --git a/engines/ultima/ultima4/map/maploader.cpp b/engines/ultima/ultima4/map/maploader.cpp
index 47a9f2d1f1..4465c8657b 100644
--- a/engines/ultima/ultima4/map/maploader.cpp
+++ b/engines/ultima/ultima4/map/maploader.cpp
@@ -24,7 +24,7 @@
 #include "ultima/ultima4/core/config.h"
 #include "ultima/ultima4/map/maploader.h"
 #include "ultima/ultima4/map/city.h"
-#include "ultima/ultima4/map/combat.h"
+#include "ultima/ultima4/controllers/combat_controller.h"
 #include "ultima/ultima4/conversation/conversation.h"
 #include "ultima/ultima4/conversation/dialogueloader.h"
 #include "ultima/ultima4/map/dungeon.h"
diff --git a/engines/ultima/ultima4/map/mapmgr.cpp b/engines/ultima/ultima4/map/mapmgr.cpp
index de3c8436a9..1c427c852a 100644
--- a/engines/ultima/ultima4/map/mapmgr.cpp
+++ b/engines/ultima/ultima4/map/mapmgr.cpp
@@ -23,7 +23,7 @@
 #include "ultima/ultima4/ultima4.h"
 #include "ultima/ultima4/map/annotation.h"
 #include "ultima/ultima4/map/city.h"
-#include "ultima/ultima4/map/combat.h"
+#include "ultima/ultima4/controllers/combat_controller.h"
 #include "ultima/ultima4/map/dungeon.h"
 #include "ultima/ultima4/core/error.h"
 #include "ultima/ultima4/map/map.h"
diff --git a/engines/ultima/ultima4/map/movement.cpp b/engines/ultima/ultima4/map/movement.cpp
index 811a94a8ee..b0c4d6a783 100644
--- a/engines/ultima/ultima4/map/movement.cpp
+++ b/engines/ultima/ultima4/map/movement.cpp
@@ -22,7 +22,7 @@
 
 #include "ultima/ultima4/map/movement.h"
 #include "ultima/ultima4/map/annotation.h"
-#include "ultima/ultima4/map/combat.h"
+#include "ultima/ultima4/controllers/combat_controller.h"
 #include "ultima/ultima4/game/context.h"
 #include "ultima/ultima4/map/dungeon.h"
 #include "ultima/ultima4/events/event.h"