[Scummvm-cvs-logs] CVS: scummvm/queen command.h,1.7,1.8 cutaway.cpp,1.76,1.77 cutaway.h,1.26,1.27 debug.cpp,1.1,1.2 debug.h,1.1,1.2 display.cpp,1.30,1.31 display.h,1.23,1.24 graphics.cpp,1.51,1.52 graphics.h,1.42,1.43 input.cpp,1.13,1.14 input.h,1.10,1.11 journal.cpp,1.5,1.6 journal.h,1.1,1.2 logic.cpp,1.111,1.112 logic.h,1.73,1.74 queen.cpp,1.46,1.47 queen.h,1.14,1.15 resource.cpp,1.29,1.30 resource.h,1.19,1.20 sound.cpp,1.14,1.15 sound.h,1.6,1.7 talk.cpp,1.49,1.50 talk.h,1.22,1.23 walk.h,1.14,1.15
Gregory Montoir
cyx at users.sourceforge.net
Mon Dec 1 20:19:40 CET 2003
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv23689/queen
Modified Files:
command.h cutaway.cpp cutaway.h debug.cpp debug.h display.cpp
display.h graphics.cpp graphics.h input.cpp input.h
journal.cpp journal.h logic.cpp logic.h queen.cpp queen.h
resource.cpp resource.h sound.cpp sound.h talk.cpp talk.h
walk.h
Log Message:
cleanup header includes
Index: command.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- command.h 30 Nov 2003 20:41:01 -0000 1.7
+++ command.h 1 Dec 2003 20:48:39 -0000 1.8
@@ -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 Graphics;
class Input;
class Walk;
-
+class Sound;
struct CmdText {
Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- cutaway.cpp 30 Nov 2003 20:41:02 -0000 1.76
+++ cutaway.cpp 1 Dec 2003 20:48:39 -0000 1.77
@@ -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"
Index: cutaway.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- cutaway.h 7 Nov 2003 10:57:20 -0000 1.26
+++ cutaway.h 1 Dec 2003 20:48:39 -0000 1.27
@@ -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;
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/debug.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug.cpp 9 Nov 2003 20:50:03 -0000 1.1
+++ debug.cpp 1 Dec 2003 20:48:40 -0000 1.2
@@ -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"
Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/debug.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug.h 9 Nov 2003 20:50:03 -0000 1.1
+++ debug.h 1 Dec 2003 20:48:40 -0000 1.2
@@ -22,7 +22,7 @@
#ifndef QUEENDEBUG_H
#define QUEENDEBUG_H
-#include "queen/queen.h"
+#include "common/util.h"
namespace Queen {
Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- display.cpp 30 Nov 2003 20:41:02 -0000 1.30
+++ display.cpp 1 Dec 2003 20:48:40 -0000 1.31
@@ -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"
Index: display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- display.h 30 Nov 2003 20:41:02 -0000 1.23
+++ display.h 1 Dec 2003 20:48:40 -0000 1.24
@@ -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 @@
RB_SCREEN = 2
};
-
enum JoePalette {
JP_CLOTHES = 0,
JP_DRESS = 1
@@ -60,6 +58,8 @@
static const uint8 _font[];
};
+class Input;
+class Resource;
class Display {
public:
Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- graphics.cpp 30 Nov 2003 20:41:02 -0000 1.51
+++ graphics.cpp 1 Dec 2003 20:48:40 -0000 1.52
@@ -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 {
Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- graphics.h 30 Nov 2003 20:41:02 -0000 1.42
+++ graphics.h 1 Dec 2003 20:48:40 -0000 1.43
@@ -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 @@
class Display;
class Input;
+class Resource;
class Graphics {
public:
Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/input.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- input.cpp 15 Nov 2003 21:16:00 -0000 1.13
+++ input.cpp 1 Dec 2003 20:48:40 -0000 1.14
@@ -21,8 +21,6 @@
#include "stdafx.h"
#include "queen/input.h"
-#include "common/system.h"
-#include "common/util.h"
namespace Queen {
Index: input.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/input.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- input.h 30 Nov 2003 20:41:02 -0000 1.10
+++ input.h 1 Dec 2003 20:48:40 -0000 1.11
@@ -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 {
Index: journal.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/journal.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- journal.cpp 30 Nov 2003 20:41:02 -0000 1.5
+++ journal.cpp 1 Dec 2003 20:48:40 -0000 1.6
@@ -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 {
Index: journal.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/journal.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- journal.h 26 Nov 2003 13:53:17 -0000 1.1
+++ journal.h 1 Dec 2003 20:48:40 -0000 1.2
@@ -22,9 +22,15 @@
#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:
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- logic.cpp 30 Nov 2003 20:41:02 -0000 1.111
+++ logic.cpp 1 Dec 2003 20:48:40 -0000 1.112
@@ -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"
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- logic.h 30 Nov 2003 20:41:02 -0000 1.73
+++ logic.h 1 Dec 2003 20:48:40 -0000 1.74
@@ -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 @@
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);
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- queen.cpp 1 Dec 2003 09:58:54 -0000 1.46
+++ queen.cpp 1 Dec 2003 20:48:40 -0000 1.47
@@ -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"
Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- queen.h 10 Nov 2003 01:04:11 -0000 1.14
+++ queen.h 1 Dec 2003 20:48:40 -0000 1.15
@@ -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 @@
class Graphics;
class Input;
+class Resource;
class Logic;
class Display;
class Sound;
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- resource.cpp 15 Nov 2003 21:33:04 -0000 1.29
+++ resource.cpp 1 Dec 2003 20:48:40 -0000 1.30
@@ -20,7 +20,6 @@
*/
#include "stdafx.h"
-#include "queen/queen.h"
#include "queen/resource.h"
namespace Queen {
Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- resource.h 9 Nov 2003 21:31:18 -0000 1.19
+++ resource.h 1 Dec 2003 20:48:40 -0000 1.20
@@ -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 {
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sound.cpp 16 Nov 2003 14:12:53 -0000 1.14
+++ sound.cpp 1 Dec 2003 20:48:40 -0000 1.15
@@ -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
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sound.h 15 Nov 2003 21:33:04 -0000 1.6
+++ sound.h 1 Dec 2003 20:48:40 -0000 1.7
@@ -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 {
Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- talk.cpp 30 Nov 2003 20:41:02 -0000 1.49
+++ talk.cpp 1 Dec 2003 20:48:40 -0000 1.50
@@ -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 @@
_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 @@
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 @@
// Up and down dialogue arrows
- if (_logic->language() != ENGLISH) {
+ if (_logic->resource()->getLanguage() != ENGLISH) {
arrowBobUp->active = (startOption > 1);
arrowBobDown->active = (yOffset > 4);
}
Index: talk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- talk.h 24 Nov 2003 19:22:52 -0000 1.22
+++ talk.h 1 Dec 2003 20:48:40 -0000 1.23
@@ -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;
Index: walk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/walk.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- walk.h 26 Nov 2003 20:40:43 -0000 1.14
+++ walk.h 1 Dec 2003 20:48:41 -0000 1.15
@@ -22,7 +22,7 @@
#ifndef QUEENWALK_H
#define QUEENWALK_H
-#include "queen/queen.h"
+#include "common/util.h"
#include "queen/structs.h"
namespace Queen {
More information about the Scummvm-git-logs
mailing list