aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
Diffstat (limited to 'queen')
-rw-r--r--queen/command.h8
-rw-r--r--queen/cutaway.cpp2
-rw-r--r--queen/cutaway.h5
-rw-r--r--queen/debug.cpp1
-rw-r--r--queen/debug.h2
-rw-r--r--queen/display.cpp1
-rw-r--r--queen/display.h6
-rw-r--r--queen/graphics.cpp2
-rw-r--r--queen/graphics.h5
-rw-r--r--queen/input.cpp2
-rw-r--r--queen/input.h4
-rw-r--r--queen/journal.cpp2
-rw-r--r--queen/journal.h8
-rw-r--r--queen/logic.cpp1
-rw-r--r--queen/logic.h3
-rw-r--r--queen/queen.cpp9
-rw-r--r--queen/queen.h7
-rw-r--r--queen/resource.cpp1
-rw-r--r--queen/resource.h8
-rw-r--r--queen/sound.cpp4
-rw-r--r--queen/sound.h2
-rw-r--r--queen/talk.cpp8
-rw-r--r--queen/talk.h4
-rw-r--r--queen/walk.h2
24 files changed, 55 insertions, 42 deletions
diff --git a/queen/command.h b/queen/command.h
index 4825d029d8..0b7f29e61a 100644
--- a/queen/command.h
+++ b/queen/command.h
@@ -1,4 +1,4 @@
- /* ScummVM - Scumm Interpreter
+/* ScummVM - Scumm Interpreter
* Copyright (C) 2003 The ScummVM project
*
* This program is free software; you can redistribute it and/or
@@ -22,8 +22,8 @@
#ifndef QUEENCOMMAND_H
#define QUEENCOMMAND_H
-#include "queen/queen.h"
-#include "queen/defs.h"
+#include "common/util.h"
+#include "queen/structs.h"
#include "queen/verb.h"
namespace Queen {
@@ -32,7 +32,7 @@ class Logic;
class Graphics;
class Input;
class Walk;
-
+class Sound;
struct CmdText {
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp
index f5742027a8..0ec053239f 100644
--- a/queen/cutaway.cpp
+++ b/queen/cutaway.cpp
@@ -24,6 +24,8 @@
#include "queen/display.h"
#include "queen/graphics.h"
#include "queen/input.h"
+#include "queen/logic.h"
+#include "queen/resource.h"
#include "queen/sound.h"
#include "queen/talk.h"
#include "queen/walk.h"
diff --git a/queen/cutaway.h b/queen/cutaway.h
index f482619492..238ae1005f 100644
--- a/queen/cutaway.h
+++ b/queen/cutaway.h
@@ -22,12 +22,13 @@
#ifndef QUEENCUTAWAY_H
#define QUEENCUTAWAY_H
-#include "queen/queen.h"
-#include "queen/graphics.h"
+#include "common/util.h"
+#include "queen/structs.h"
namespace Queen {
class Graphics;
+class Input;
class Logic;
class Resource;
class Sound;
diff --git a/queen/debug.cpp b/queen/debug.cpp
index c3d407101d..820987b126 100644
--- a/queen/debug.cpp
+++ b/queen/debug.cpp
@@ -23,6 +23,7 @@
#include "queen/debug.h"
#include "queen/defs.h"
#include "queen/graphics.h"
+#include "queen/input.h"
#include "queen/logic.h"
#include "queen/resource.h"
#include "queen/structs.h"
diff --git a/queen/debug.h b/queen/debug.h
index b541b85632..2d49a71be0 100644
--- a/queen/debug.h
+++ b/queen/debug.h
@@ -22,7 +22,7 @@
#ifndef QUEENDEBUG_H
#define QUEENDEBUG_H
-#include "queen/queen.h"
+#include "common/util.h"
namespace Queen {
diff --git a/queen/display.cpp b/queen/display.cpp
index 700840dd8d..b231c25a5a 100644
--- a/queen/display.cpp
+++ b/queen/display.cpp
@@ -21,7 +21,6 @@
#include "stdafx.h"
#include "queen/display.h"
-#include "queen/defs.h"
#include "queen/input.h"
#include "queen/logic.h" // For RandomSource
#include "queen/resource.h"
diff --git a/queen/display.h b/queen/display.h
index e922fc9c9e..5a7c0575b7 100644
--- a/queen/display.h
+++ b/queen/display.h
@@ -22,9 +22,8 @@
#ifndef QUEENDISPLAY_H
#define QUEENDISPLAY_H
-#include "queen/queen.h"
+#include "common/util.h"
#include "queen/defs.h"
-#include "queen/structs.h"
namespace Queen {
@@ -35,7 +34,6 @@ enum RenderingBuffer {
RB_SCREEN = 2
};
-
enum JoePalette {
JP_CLOTHES = 0,
JP_DRESS = 1
@@ -60,6 +58,8 @@ struct TextRenderer {
static const uint8 _font[];
};
+class Input;
+class Resource;
class Display {
public:
diff --git a/queen/graphics.cpp b/queen/graphics.cpp
index 6b90ec8321..239959d268 100644
--- a/queen/graphics.cpp
+++ b/queen/graphics.cpp
@@ -21,7 +21,9 @@
#include "stdafx.h"
#include "queen/graphics.h"
+#include "queen/logic.h"
#include "queen/display.h"
+#include "queen/resource.h"
namespace Queen {
diff --git a/queen/graphics.h b/queen/graphics.h
index 601de0468b..899ed65940 100644
--- a/queen/graphics.h
+++ b/queen/graphics.h
@@ -22,9 +22,9 @@
#ifndef QUEENGRAPHICS_H
#define QUEENGRAPHICS_H
-#include "queen/queen.h"
-#include "queen/input.h"
+#include "common/str.h"
#include "queen/defs.h"
+#include "common/util.h"
#include "queen/structs.h"
namespace Queen {
@@ -131,6 +131,7 @@ struct BamData {
class Display;
class Input;
+class Resource;
class Graphics {
public:
diff --git a/queen/input.cpp b/queen/input.cpp
index a394fed6a7..6f184c328c 100644
--- a/queen/input.cpp
+++ b/queen/input.cpp
@@ -21,8 +21,6 @@
#include "stdafx.h"
#include "queen/input.h"
-#include "common/system.h"
-#include "common/util.h"
namespace Queen {
diff --git a/queen/input.h b/queen/input.h
index 3be94ea909..a6acd75f5b 100644
--- a/queen/input.h
+++ b/queen/input.h
@@ -22,11 +22,9 @@
#ifndef INPUT_H
#define INPUT_H
+#include "common/util.h"
#include "queen/defs.h"
#include "queen/verb.h"
-#include "common/scummsys.h"
-
-class OSystem;
namespace Queen {
diff --git a/queen/journal.cpp b/queen/journal.cpp
index 7be4146a54..bdb56c46be 100644
--- a/queen/journal.cpp
+++ b/queen/journal.cpp
@@ -20,10 +20,12 @@
*/
#include "stdafx.h"
+#include "base/engine.h" // For g_engine
#include "queen/journal.h"
#include "queen/display.h"
#include "queen/graphics.h"
#include "queen/logic.h"
+#include "queen/resource.h"
#include "queen/sound.h"
namespace Queen {
diff --git a/queen/journal.h b/queen/journal.h
index c1d9a32da7..8432f7d604 100644
--- a/queen/journal.h
+++ b/queen/journal.h
@@ -22,10 +22,16 @@
#ifndef QUEENJOURNAL_H
#define QUEENJOURNAL_H
-#include "queen/queen.h"
+#include "common/util.h"
namespace Queen {
+class Logic;
+class Graphics;
+class Display;
+class Sound;
+struct GameConfig;
+
class Journal {
public:
diff --git a/queen/logic.cpp b/queen/logic.cpp
index 7043b26910..564fb9ef23 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -29,6 +29,7 @@
#include "queen/graphics.h"
#include "queen/input.h"
#include "queen/journal.h"
+#include "queen/resource.h"
#include "queen/sound.h"
#include "queen/talk.h"
#include "queen/walk.h"
diff --git a/queen/logic.h b/queen/logic.h
index fc66980590..244eac143d 100644
--- a/queen/logic.h
+++ b/queen/logic.h
@@ -22,7 +22,7 @@
#ifndef QUEENLOGIC_H
#define QUEENLOGIC_H
-#include "queen/queen.h"
+#include "common/util.h"
#include "queen/defs.h"
#include "queen/structs.h"
#include "queen/verb.h"
@@ -202,7 +202,6 @@ public:
uint16 numFrames() { return _numFrames; }
int talkSpeed() const { return _settings.talkSpeed; }
- Language language() { return _resource->getLanguage(); }
void zoneSet(uint16 screen, uint16 zone, uint16 x1, uint16 y1, uint16 x2, uint16 y2);
void zoneSet(uint16 screen, uint16 zone, const Box& box);
diff --git a/queen/queen.cpp b/queen/queen.cpp
index 758dc8bcac..7e3742f629 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -20,17 +20,24 @@
*/
#include "stdafx.h"
+
#include "backends/fs/fs.h"
+
#include "base/gameDetector.h"
#include "base/plugins.h"
+
#include "common/config-manager.h"
#include "common/file.h"
+#include "common/timer.h"
+
+#include "queen/queen.h"
#include "queen/command.h"
#include "queen/cutaway.h"
#include "queen/display.h"
#include "queen/graphics.h"
#include "queen/input.h"
-#include "queen/queen.h"
+#include "queen/logic.h"
+#include "queen/resource.h"
#include "queen/sound.h"
#include "queen/talk.h"
#include "queen/walk.h"
diff --git a/queen/queen.h b/queen/queen.h
index 8151b87920..e3aa9e0039 100644
--- a/queen/queen.h
+++ b/queen/queen.h
@@ -22,13 +22,7 @@
#ifndef QUEEN_H
#define QUEEN_H
-#include <stdio.h>
#include "base/engine.h"
-#include "common/util.h"
-#include "common/timer.h"
-#include "sound/mixer.h"
-#include "queen/resource.h"
-#include "queen/logic.h"
class GameDetector;
@@ -36,6 +30,7 @@ namespace Queen {
class Graphics;
class Input;
+class Resource;
class Logic;
class Display;
class Sound;
diff --git a/queen/resource.cpp b/queen/resource.cpp
index 36066ddfd2..d8c7501dd8 100644
--- a/queen/resource.cpp
+++ b/queen/resource.cpp
@@ -20,7 +20,6 @@
*/
#include "stdafx.h"
-#include "queen/queen.h"
#include "queen/resource.h"
namespace Queen {
diff --git a/queen/resource.h b/queen/resource.h
index d3e4e20c33..fde96e823e 100644
--- a/queen/resource.h
+++ b/queen/resource.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef QUEEN_RESOURCE_H
-#define QUEEN_RESOURCE_H
+#ifndef QUEENRESOURCE_H
+#define QUEENRESOURCE_H
#include "common/file.h"
-#include "common/savefile.h"
-#include "defs.h"
+#include "common/util.h"
+#include "queen/defs.h"
namespace Queen {
diff --git a/queen/sound.cpp b/queen/sound.cpp
index d927de6028..4926493ca4 100644
--- a/queen/sound.cpp
+++ b/queen/sound.cpp
@@ -20,11 +20,9 @@
*/
#include "stdafx.h"
-#include "common/file.h"
-#include "common/util.h"
+#include "queen/sound.h"
#include "queen/input.h"
#include "queen/resource.h"
-#include "queen/sound.h"
#define SB_HEADER_SIZE 110
#define STOP_MUSIC -1
diff --git a/queen/sound.h b/queen/sound.h
index 5af30e8396..5902857d69 100644
--- a/queen/sound.h
+++ b/queen/sound.h
@@ -22,9 +22,9 @@
#ifndef QUEENSOUND_H
#define QUEENSOUND_H
+#include "common/util.h"
#include "sound/mixer.h"
#include "queen/defs.h"
-#include "common/str.h"
namespace Queen {
diff --git a/queen/talk.cpp b/queen/talk.cpp
index c099850683..f28626a5a7 100644
--- a/queen/talk.cpp
+++ b/queen/talk.cpp
@@ -23,7 +23,9 @@
#include "queen/talk.h"
#include "queen/display.h"
#include "queen/graphics.h"
+#include "queen/input.h"
#include "queen/logic.h"
+#include "queen/resource.h"
#include "queen/sound.h"
namespace Queen {
@@ -1246,7 +1248,7 @@ int16 Talk::selectSentence() {
_logic->zoneClearAll(ZONE_PANEL);
- if (_logic->language() != ENGLISH) {
+ if (_logic->resource()->getLanguage() != ENGLISH) {
_logic->zoneSet(ZONE_PANEL, ARROW_ZONE_UP, MAX_TEXT_WIDTH + 1, 0, 319, 24);
_logic->zoneSet(ZONE_PANEL, ARROW_ZONE_DOWN, MAX_TEXT_WIDTH + 1, 25, 319, 49);
}
@@ -1272,7 +1274,7 @@ int16 Talk::selectSentence() {
i,
0,
yOffset * LINE_HEIGHT - PUSHUP,
- (_logic->language() == ENGLISH) ? 319 : MAX_TEXT_WIDTH,
+ (_logic->resource()->getLanguage() == ENGLISH) ? 319 : MAX_TEXT_WIDTH,
(yOffset + optionLines) * LINE_HEIGHT - PUSHUP);
}
@@ -1296,7 +1298,7 @@ int16 Talk::selectSentence() {
// Up and down dialogue arrows
- if (_logic->language() != ENGLISH) {
+ if (_logic->resource()->getLanguage() != ENGLISH) {
arrowBobUp->active = (startOption > 1);
arrowBobDown->active = (yOffset > 4);
}
diff --git a/queen/talk.h b/queen/talk.h
index e102dc0842..3c0887150a 100644
--- a/queen/talk.h
+++ b/queen/talk.h
@@ -22,11 +22,13 @@
#ifndef QUEEN_TALK_H
#define QUEEN_TALK_H
-#include "queen/queen.h"
+#include "common/util.h"
+#include "queen/structs.h"
namespace Queen {
class Graphics;
+class Input;
class Logic;
class Resource;
class Sound;
diff --git a/queen/walk.h b/queen/walk.h
index b503270c4a..9c3c45f64e 100644
--- a/queen/walk.h
+++ b/queen/walk.h
@@ -22,7 +22,7 @@
#ifndef QUEENWALK_H
#define QUEENWALK_H
-#include "queen/queen.h"
+#include "common/util.h"
#include "queen/structs.h"
namespace Queen {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:41:19 +0000