aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2019-07-24 12:35:08 +0200
committerEugene Sandulenko2019-09-03 17:17:27 +0200
commit9ea453bc4c54f547972ad05404bde8029ab1219e (patch)
tree9e07f26625dd860d81d1fbd3b7f710124b060332
parente53367e2256889f1c6a8fa7adfd96cd20a3e55a8 (diff)
downloadscummvm-rg350-9ea453bc4c54f547972ad05404bde8029ab1219e.tar.gz
scummvm-rg350-9ea453bc4c54f547972ad05404bde8029ab1219e.tar.bz2
scummvm-rg350-9ea453bc4c54f547972ad05404bde8029ab1219e.zip
HDB: Reduce header dependency
-rw-r--r--engines/hdb/gfx.cpp10
-rw-r--r--engines/hdb/gfx.h13
-rw-r--r--engines/hdb/hdb.h6
3 files changed, 18 insertions, 11 deletions
diff --git a/engines/hdb/gfx.cpp b/engines/hdb/gfx.cpp
index 5bb557fa74..c59964c0a3 100644
--- a/engines/hdb/gfx.cpp
+++ b/engines/hdb/gfx.cpp
@@ -20,6 +20,9 @@
*
*/
+#include "common/cosinetables.h"
+#include "common/sinetables.h"
+
#include "hdb/hdb.h"
#include "hdb/gfx.h"
#include "hdb/mpc.h"
@@ -220,6 +223,13 @@ void Gfx::loadSaveFile(Common::InSaveFile *in) {
turnOnSnow();
}
+double Gfx::getSin(int index) {
+ return _sines->at(index);
+}
+double Gfx::getCos(int index) {
+ return _cosines->at(index);
+}
+
void Gfx::fillScreen(uint32 color) {
_globalSurface.fillRect(Common::Rect(kScreenWidth, kScreenHeight), color);
g_system->fillScreen(color);
diff --git a/engines/hdb/gfx.h b/engines/hdb/gfx.h
index 38243c2efe..903b57948c 100644
--- a/engines/hdb/gfx.h
+++ b/engines/hdb/gfx.h
@@ -25,6 +25,11 @@
#include "graphics/managed_surface.h"
+namespace Common {
+ class SineTable;
+ class CosineTable;
+}
+
namespace HDB {
struct TileLookup {
@@ -137,12 +142,8 @@ public:
// Trig Functions
- double getSin(int index) {
- return _sines->at(index);
- }
- double getCos(int index) {
- return _cosines->at(index);
- }
+ double getSin(int index);
+ double getCos(int index);
// Bonus star functions
diff --git a/engines/hdb/hdb.h b/engines/hdb/hdb.h
index af04c3ba26..36f5142f2c 100644
--- a/engines/hdb/hdb.h
+++ b/engines/hdb/hdb.h
@@ -25,14 +25,10 @@
#include "common/scummsys.h"
#include "common/array.h"
-#include "common/error.h"
-#include "common/file.h"
#include "common/events.h"
#include "common/str.h"
#include "common/random.h"
#include "common/savefile.h"
-#include "common/sinetables.h"
-#include "common/cosinetables.h"
#include "common/config-manager.h"
#include "graphics/surface.h"
#include "graphics/thumbnail.h"
@@ -44,7 +40,6 @@
#include "gui/debugger.h"
#include "engines/engine.h"
#include "engines/util.h"
-#include "console.h"
namespace HDB {
class Tile;
@@ -75,6 +70,7 @@ enum {
#include "hdb/ai.h"
#include "hdb/ai-player.h"
+#include "hdb/console.h"
#include "hdb/file-manager.h"
#include "hdb/input.h"
#include "hdb/lua-script.h"