[Scummvm-cvs-logs] SF.net SVN: scummvm:[46320] scummvm/trunk/engines/draci
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Dec 9 22:03:22 CET 2009
Revision: 46320
http://scummvm.svn.sourceforge.net/scummvm/?rev=46320&view=rev
Author: fingolfin
Date: 2009-12-09 21:03:22 +0000 (Wed, 09 Dec 2009)
Log Message:
-----------
DRACI: Reduce header interdependencies; some cleanup
Modified Paths:
--------------
scummvm/trunk/engines/draci/animation.cpp
scummvm/trunk/engines/draci/animation.h
scummvm/trunk/engines/draci/barchive.cpp
scummvm/trunk/engines/draci/detection.cpp
scummvm/trunk/engines/draci/draci.cpp
scummvm/trunk/engines/draci/draci.h
scummvm/trunk/engines/draci/font.cpp
scummvm/trunk/engines/draci/font.h
scummvm/trunk/engines/draci/game.cpp
scummvm/trunk/engines/draci/game.h
scummvm/trunk/engines/draci/module.mk
scummvm/trunk/engines/draci/mouse.cpp
scummvm/trunk/engines/draci/mouse.h
scummvm/trunk/engines/draci/saveload.cpp
scummvm/trunk/engines/draci/screen.cpp
scummvm/trunk/engines/draci/screen.h
scummvm/trunk/engines/draci/script.cpp
scummvm/trunk/engines/draci/script.h
scummvm/trunk/engines/draci/sprite.cpp
scummvm/trunk/engines/draci/sprite.h
scummvm/trunk/engines/draci/walking.cpp
Modified: scummvm/trunk/engines/draci/animation.cpp
===================================================================
--- scummvm/trunk/engines/draci/animation.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/animation.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -1,4 +1,3 @@
-
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
@@ -26,6 +25,11 @@
#include "draci/draci.h"
#include "draci/animation.h"
+#include "draci/barchive.h"
+#include "draci/game.h"
+#include "draci/screen.h"
+#include "draci/sound.h"
+#include "draci/surface.h"
namespace Draci {
@@ -611,4 +615,4 @@
return anim;
}
-}
+} // End of namespace Draci
Modified: scummvm/trunk/engines/draci/animation.h
===================================================================
--- scummvm/trunk/engines/draci/animation.h 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/animation.h 2009-12-09 21:03:22 UTC (rev 46320)
@@ -26,9 +26,8 @@
#ifndef DRACI_ANIMATION_H
#define DRACI_ANIMATION_H
+#include "common/rect.h"
#include "draci/sprite.h"
-#include "draci/sound.h"
-#include "common/rect.h"
namespace Draci {
@@ -56,6 +55,8 @@
enum { kIgnoreIndex = -2 };
class DraciEngine;
+class Surface;
+struct SoundSample;
class Animation {
@@ -215,6 +216,6 @@
int _lastIndex;
};
-}
+} // End of namespace Draci
#endif // DRACI_ANIMATION_H
Modified: scummvm/trunk/engines/draci/barchive.cpp
===================================================================
--- scummvm/trunk/engines/draci/barchive.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/barchive.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -402,6 +402,3 @@
}
} // End of namespace Draci
-
-
-
Modified: scummvm/trunk/engines/draci/detection.cpp
===================================================================
--- scummvm/trunk/engines/draci/detection.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/detection.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -27,6 +27,7 @@
#include "draci/saveload.h"
#include "base/plugins.h"
+#include "common/system.h"
#include "engines/advancedDetector.h"
#include "engines/metaengine.h"
Modified: scummvm/trunk/engines/draci/draci.cpp
===================================================================
--- scummvm/trunk/engines/draci/draci.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/draci.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -35,13 +35,17 @@
#include "graphics/font.h"
#include "draci/draci.h"
+#include "draci/animation.h"
#include "draci/barchive.h"
-#include "draci/script.h"
#include "draci/font.h"
-#include "draci/sprite.h"
-#include "draci/screen.h"
+#include "draci/game.h"
#include "draci/mouse.h"
+#include "draci/music.h"
#include "draci/saveload.h"
+#include "draci/screen.h"
+#include "draci/script.h"
+#include "draci/sound.h"
+#include "draci/sprite.h"
namespace Draci {
Modified: scummvm/trunk/engines/draci/draci.h
===================================================================
--- scummvm/trunk/engines/draci/draci.h 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/draci.h 2009-12-09 21:03:22 UTC (rev 46320)
@@ -28,21 +28,13 @@
#include <math.h>
-#include "common/system.h"
#include "engines/engine.h"
-#include "draci/game.h"
-#include "draci/mouse.h"
-#include "draci/screen.h"
-#include "draci/font.h"
-#include "draci/script.h"
-#include "draci/barchive.h"
-#include "draci/animation.h"
-#include "draci/sound.h"
-#include "draci/music.h"
-
struct ADGameDescription;
+class MidiDriver;
+class OSystem;
+
/**
* This is the namespace of the Draci engine.
*
@@ -53,6 +45,17 @@
*/
namespace Draci {
+class Screen;
+class Mouse;
+class Game;
+class Script;
+class AnimationManager;
+class Sound;
+class MusicPlayer;
+class Font;
+class BArchive;
+class SoundArchive;
+
class DraciEngine : public Engine {
public:
DraciEngine(OSystem *syst, const ADGameDescription *gameDesc);
@@ -125,4 +128,3 @@
} // End of namespace Draci
#endif // DRACI_H
-
Modified: scummvm/trunk/engines/draci/font.cpp
===================================================================
--- scummvm/trunk/engines/draci/font.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/font.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -27,6 +27,7 @@
#include "draci/draci.h"
#include "draci/font.h"
+#include "draci/surface.h"
namespace Draci {
Modified: scummvm/trunk/engines/draci/font.h
===================================================================
--- scummvm/trunk/engines/draci/font.h 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/font.h 2009-12-09 21:03:22 UTC (rev 46320)
@@ -33,6 +33,8 @@
extern const char * const kFontSmall;
extern const char * const kFontBig;
+class Surface;
+
/**
* Default font colours. They all seem to remain constant except for the
* first one which varies depending on the character speaking.
Modified: scummvm/trunk/engines/draci/game.cpp
===================================================================
--- scummvm/trunk/engines/draci/game.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/game.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -23,14 +23,21 @@
*
*/
+#include "common/serializer.h"
#include "common/stream.h"
+#include "common/system.h"
#include "common/util.h"
#include "draci/draci.h"
+#include "draci/animation.h"
#include "draci/game.h"
#include "draci/barchive.h"
+#include "draci/font.h"
+#include "draci/mouse.h"
+#include "draci/screen.h"
#include "draci/script.h"
-#include "draci/animation.h"
+#include "draci/sound.h"
+#include "draci/surface.h"
namespace Draci {
@@ -1689,4 +1696,4 @@
_program._length = f->_length;
}
-}
+} // End of namespace Draci
Modified: scummvm/trunk/engines/draci/game.h
===================================================================
--- scummvm/trunk/engines/draci/game.h 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/game.h 2009-12-09 21:03:22 UTC (rev 46320)
@@ -27,15 +27,16 @@
#define DRACI_GAME_H
#include "common/str.h"
-#include "common/serializer.h"
-#include "draci/barchive.h"
#include "draci/script.h"
-#include "draci/animation.h"
-#include "draci/sprite.h"
#include "draci/walking.h"
+namespace Common {
+ class Serializer;
+}
+
namespace Draci {
+class BArchive;
class DraciEngine;
enum {
Modified: scummvm/trunk/engines/draci/module.mk
===================================================================
--- scummvm/trunk/engines/draci/module.mk 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/module.mk 2009-12-09 21:03:22 UTC (rev 46320)
@@ -1,20 +1,20 @@
MODULE := engines/draci
MODULE_OBJS := \
+ animation.o \
+ barchive.o \
+ detection.o \
draci.o \
- detection.o \
- barchive.o \
- script.o \
font.o \
+ game.o \
+ mouse.o \
+ music.o \
saveload.o \
+ screen.o \
+ script.o \
sound.o \
- music.o \
sprite.o \
- screen.o \
surface.o \
- mouse.o \
- game.o \
- animation.o \
walking.o
MODULE_DIRS += \
Modified: scummvm/trunk/engines/draci/mouse.cpp
===================================================================
--- scummvm/trunk/engines/draci/mouse.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/mouse.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -27,7 +27,11 @@
#include "draci/game.h"
#include "draci/mouse.h"
#include "draci/barchive.h"
+#include "draci/screen.h"
+#include "draci/sprite.h"
+#include "graphics/cursorman.h"
+
namespace Draci {
Mouse::Mouse(DraciEngine *vm) {
@@ -123,4 +127,4 @@
sp.getWidth() / 2, sp.getHeight() / 2);
}
-}
+} // End of namespace Draci
Modified: scummvm/trunk/engines/draci/mouse.h
===================================================================
--- scummvm/trunk/engines/draci/mouse.h 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/mouse.h 2009-12-09 21:03:22 UTC (rev 46320)
@@ -27,7 +27,6 @@
#define DRACI_MOUSE_H
#include "common/events.h"
-#include "graphics/cursorman.h"
namespace Draci {
@@ -75,6 +74,6 @@
DraciEngine *_vm;
};
-}
+} // End of namespace Draci
#endif // DRACI_MOUSE_H
Modified: scummvm/trunk/engines/draci/saveload.cpp
===================================================================
--- scummvm/trunk/engines/draci/saveload.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/saveload.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -24,6 +24,7 @@
*/
#include "draci/draci.h"
+#include "draci/game.h"
#include "draci/saveload.h"
#include "common/serializer.h"
Modified: scummvm/trunk/engines/draci/screen.cpp
===================================================================
--- scummvm/trunk/engines/draci/screen.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/screen.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -24,10 +24,14 @@
*/
#include "common/stream.h"
+#include "common/system.h"
#include "draci/draci.h"
#include "draci/screen.h"
+#include "draci/surface.h"
+#include "draci/sprite.h"
+
namespace Draci {
Screen::Screen(DraciEngine *vm) : _vm(vm) {
@@ -145,5 +149,3 @@
}
} // End of namespace Draci
-
-
Modified: scummvm/trunk/engines/draci/screen.h
===================================================================
--- scummvm/trunk/engines/draci/screen.h 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/screen.h 2009-12-09 21:03:22 UTC (rev 46320)
@@ -26,8 +26,7 @@
#ifndef DRACI_SCREEN_H
#define DRACI_SCREEN_H
-#include "draci/surface.h"
-#include "draci/sprite.h"
+#include "common/scummsys.h"
namespace Draci {
@@ -39,6 +38,7 @@
};
class DraciEngine;
+class Surface;
class Screen {
Modified: scummvm/trunk/engines/draci/script.cpp
===================================================================
--- scummvm/trunk/engines/draci/script.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/script.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -29,8 +29,15 @@
#include "common/stack.h"
#include "draci/draci.h"
+#include "draci/animation.h"
+#include "draci/barchive.h"
+#include "draci/game.h"
+#include "draci/mouse.h"
+#include "draci/music.h"
+#include "draci/screen.h"
#include "draci/script.h"
-#include "draci/game.h"
+#include "draci/sound.h"
+#include "draci/surface.h"
namespace Draci {
@@ -1201,4 +1208,3 @@
}
} // End of namespace Draci
-
Modified: scummvm/trunk/engines/draci/script.h
===================================================================
--- scummvm/trunk/engines/draci/script.h 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/script.h 2009-12-09 21:03:22 UTC (rev 46320)
@@ -27,31 +27,33 @@
#define DRACI_SCRIPT_H
#include "common/array.h"
-#include "common/str.h"
#include "common/stream.h"
+namespace Common {
+ class MemoryReadStream;
+}
+
namespace Draci {
-/** The maximum number of parameters for a GPL command */
-const int kMaxParams = 3;
+enum {
+ /** The maximum number of parameters for a GPL command */
+ kMaxParams = 3,
+ kNumCommands = 55
+};
+
class DraciEngine;
class Script;
-enum {
- kNumCommands = 55
-};
-
typedef void (Script::*GPLHandler)(const Common::Array<int> &);
typedef int (Script::*GPLOperatorHandler)(int, int) const;
typedef int (Script::*GPLFunctionHandler)(int) const;
/**
- * Represents a single command in the GPL scripting language bytecode.
- * Each command is represented in the bytecode by a command number and a
- * subnumber.
+ * Represents a single command in the GPL scripting language bytecode.
+ * Each command is represented in the bytecode by a command number and a
+ * subnumber.
*/
-
enum GPL2ParameterType {
kGPL2Num = 1,
kGPL2Str = 2,
Modified: scummvm/trunk/engines/draci/sprite.cpp
===================================================================
--- scummvm/trunk/engines/draci/sprite.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/sprite.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -26,8 +26,9 @@
#include "common/stream.h"
#include "draci/draci.h"
+#include "draci/font.h"
#include "draci/sprite.h"
-#include "draci/font.h"
+#include "draci/surface.h"
namespace Draci {
@@ -351,4 +352,3 @@
}
} // End of namespace Draci
-
Modified: scummvm/trunk/engines/draci/sprite.h
===================================================================
--- scummvm/trunk/engines/draci/sprite.h 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/sprite.h 2009-12-09 21:03:22 UTC (rev 46320)
@@ -26,8 +26,8 @@
#ifndef DRACI_SPRITE_H
#define DRACI_SPRITE_H
-#include "draci/surface.h"
-#include "draci/font.h"
+#include "common/scummsys.h"
+#include "common/rect.h"
namespace Draci {
@@ -37,11 +37,15 @@
};
struct Displacement {
- int relX, relY;
- double extraScaleX, extraScaleY;
+ int relX, relY;
+ double extraScaleX, extraScaleY;
};
+
extern const Displacement kNoDisplacement;
+class Surface;
+class Font;
+
class Drawable {
public:
virtual void draw(Surface *surface, bool markDirty, int relX, int relY) const = 0;
Modified: scummvm/trunk/engines/draci/walking.cpp
===================================================================
--- scummvm/trunk/engines/draci/walking.cpp 2009-12-09 20:11:02 UTC (rev 46319)
+++ scummvm/trunk/engines/draci/walking.cpp 2009-12-09 21:03:22 UTC (rev 46320)
@@ -27,8 +27,9 @@
#include "common/stream.h"
+#include "draci/draci.h"
#include "draci/animation.h"
-#include "draci/draci.h"
+#include "draci/game.h"
#include "draci/walking.h"
#include "draci/sprite.h"
@@ -764,4 +765,4 @@
}
}
-}
+} // End of namespace Draci
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list