[Scummvm-cvs-logs] scummvm master -> 1bbbb14b30b68319248ce4ead40a1e9a46f1e5f1

sev- sev at scummvm.org
Tue Aug 23 19:13:29 CEST 2016


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

Summary:
3d6d6fa2dd DIRECTOR: Reduce header dependency
dbf2876b70 DIRECTOR: Further reduction of include dependency
1bbbb14b30 DIRECTOR: Added test D3 target


Commit: 3d6d6fa2dd6edeaf01efb6bed3010a8f9150f360
    https://github.com/scummvm/scummvm/commit/3d6d6fa2dd6edeaf01efb6bed3010a8f9150f360
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-23T19:13:21+02:00

Commit Message:
DIRECTOR: Reduce header dependency

Changed paths:
    engines/director/director.h
    engines/director/frame.cpp
    engines/director/frame.h
    engines/director/lingo/lingo-builtins.cpp
    engines/director/lingo/lingo-code.cpp
    engines/director/lingo/lingo-codegen.cpp
    engines/director/lingo/lingo-funcs.cpp
    engines/director/lingo/lingo-the.cpp
    engines/director/lingo/lingo.cpp
    engines/director/lingo/lingo.h
    engines/director/score.cpp
    engines/director/score.h



diff --git a/engines/director/director.h b/engines/director/director.h
index cccae8f..23519f1 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -23,14 +23,11 @@
 #ifndef DIRECTOR_DIRECTOR_H
 #define DIRECTOR_DIRECTOR_H
 
-#include "common/scummsys.h"
 #include "common/random.h"
 #include "common/substream.h"
 
-#include "common/str.h"
 #include "common/hashmap.h"
 #include "engines/engine.h"
-#include "engines/director/sound.h"
 
 namespace Common {
 class MacResManager;
@@ -49,6 +46,7 @@ enum DirectorGameID {
 
 class Archive;
 struct DirectorGameDescription;
+class DirectorSound;
 class Lingo;
 class Score;
 struct Cast;
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index abb880a..1409120 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -21,12 +21,14 @@
  */
 
 #include "common/system.h"
+#include "graphics/font.h"
 #include "graphics/macgui/macwindowmanager.h"
 #include "image/bmp.h"
 
 #include "director/director.h"
 #include "director/frame.h"
 #include "director/images.h"
+#include "director/resource.h"
 #include "director/score.h"
 #include "director/sprite.h"
 
diff --git a/engines/director/frame.h b/engines/director/frame.h
index f9cef67..c06157c 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -24,7 +24,10 @@
 #define DIRECTOR_FRAME_H
 
 #include "graphics/managed_surface.h"
-#include "image/image_decoder.h"
+
+namespace Image {
+	class ImageDecoder;
+}
 
 namespace Director {
 
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index b7d4b4d..bad585c 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "engines/director/lingo/lingo.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 1e78b2d..754b60a 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -43,7 +43,7 @@
 // ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 // THIS SOFTWARE.
 
-#include "engines/director/lingo/lingo.h"
+#include "director/lingo/lingo.h"
 #include "common/file.h"
 #include "audio/decoders/wave.h"
 
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index 9f3b1e2..c145184 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -43,7 +43,7 @@
 // ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 // THIS SOFTWARE.
 
-#include "engines/director/lingo/lingo.h"
+#include "director/lingo/lingo.h"
 #include "common/file.h"
 #include "audio/decoders/wave.h"
 
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index da2cd5f..2189f1f 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -43,11 +43,12 @@
 // ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 // THIS SOFTWARE.
 
-#include "engines/director/lingo/lingo.h"
+#include "director/lingo/lingo.h"
 #include "common/file.h"
 #include "audio/decoders/wave.h"
 #include "common/util.h"
 #include "director/lingo/lingo-gr.h"
+#include "director/sound.h"
 
 namespace Director {
 
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 879ff48..2bf6cfb 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "engines/director/lingo/lingo.h"
+#include "director/lingo/lingo.h"
 #include "director/sprite.h"
 
 namespace Director {
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 21a5b53..5297380 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/archive.h"
+#include "common/file.h"
 #include "common/str-array.h"
 
 #include "director/lingo/lingo.h"
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index a4eea7a..dec6d68 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -23,13 +23,10 @@
 #ifndef DIRECTOR_LINGO_LINGO_H
 #define DIRECTOR_LINGO_LINGO_H
 
-#include "common/debug.h"
-#include "common/hashmap.h"
-#include "common/hash-str.h"
 #include "audio/audiostream.h"
-#include "common/str.h"
-#include "engines/director/director.h"
-#include "engines/director/score.h"
+#include "common/hash-str.h"
+#include "director/director.h"
+#include "director/score.h"
 #include "director/lingo/lingo-gr.h"
 #include "director/lingo/lingo-the.h"
 
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 2812f29..cf9aef1 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -20,28 +20,20 @@
  *
  */
 
-#include "common/stream.h"
-#include "common/debug.h"
-#include "common/file.h"
-#include "common/archive.h"
 #include "common/config-manager.h"
-#include "common/unzip.h"
 
+#include "engines/util.h"
+#include "graphics/font.h"
 #include "graphics/palette.h"
 #include "common/events.h"
-#include "engines/util.h"
-#include "graphics/managed_surface.h"
-#include "graphics/macgui/macwindowmanager.h"
-#include "graphics/fontman.h"
-#include "graphics/fonts/bdf.h"
+#include "common/system.h"
 
 #include "director/score.h"
 #include "director/frame.h"
-#include "director/sprite.h"
-#include "director/images.h"
 #include "director/resource.h"
-#include "director/lingo/lingo.h"
 #include "director/sound.h"
+#include "director/sprite.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/score.h b/engines/director/score.h
index 9d92de9..dc6a62b 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -23,23 +23,22 @@
 #ifndef DIRECTOR_SCORE_H
 #define DIRECTOR_SCORE_H
 
+#include "common/substream.h"
 #include "common/rect.h"
-#include "common/stream.h"
-#include "common/array.h"
-#include "director/resource.h"
-#include "graphics/managed_surface.h"
-#include "common/str.h"
-#include "image/image_decoder.h"
-#include "graphics/font.h"
+
+namespace Graphics {
+	class ManagedSurface;
+	class Font;
+}
 
 namespace Director {
 
-class Lingo;
+class Archive;
+class DirectorEngine;
 class DirectorSound;
 class Frame;
+class Lingo;
 class Sprite;
-class Score;
-class DirectorEngine;
 
 enum CastType {
 	kCastBitmap = 1,


Commit: dbf2876b706c76a75f647a20cc00ef7a687c1e6c
    https://github.com/scummvm/scummvm/commit/dbf2876b706c76a75f647a20cc00ef7a687c1e6c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-23T19:13:21+02:00

Commit Message:
DIRECTOR: Further reduction of include dependency

Changed paths:
    engines/director/director.cpp
    engines/director/images.cpp
    engines/director/lingo/lingo-code.cpp
    engines/director/lingo/lingo.h
    engines/director/movie.cpp
    engines/director/movie.h
    engines/director/resource.cpp
    engines/director/resource.h
    engines/director/score.cpp
    engines/director/sound.cpp
    engines/director/sound.h



diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 01b5085..9aeba71 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -20,31 +20,19 @@
  *
  */
 
-#include "audio/mixer.h"
-
 #include "common/config-manager.h"
-#include "common/debug.h"
 #include "common/debug-channels.h"
-#include "common/scummsys.h"
 #include "common/error.h"
-#include "common/events.h"
 #include "common/macresman.h"
-#include "common/stream.h"
-#include "common/system.h"
-#include "common/textconsole.h"
-#include "common/fs.h"
-
-#include "engines/util.h"
 
-#include "graphics/surface.h"
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
 #include "director/images.h"
 #include "director/resource.h"
 #include "director/score.h"
-#include "director/lingo/lingo.h"
 #include "director/sound.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index db149eb..6295d5b 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -20,17 +20,8 @@
  *
  */
 
-#include "common/stream.h"
 #include "common/substream.h"
 #include "common/textconsole.h"
-#include "graphics/pixelformat.h"
-#include "graphics/surface.h"
-#include "graphics/palette.h"
-#include "image/codecs/codec.h"
-#include "common/util.h"
-#include "common/debug.h"
-#include "image/codecs/bmp_raw.h"
-#include "common/system.h"
 
 #include "director/images.h"
 
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 754b60a..9e3350a 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -44,9 +44,6 @@
 // THIS SOFTWARE.
 
 #include "director/lingo/lingo.h"
-#include "common/file.h"
-#include "audio/decoders/wave.h"
-
 #include "director/lingo/lingo-gr.h"
 
 namespace Director {
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index dec6d68..a921f49 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -25,6 +25,7 @@
 
 #include "audio/audiostream.h"
 #include "common/hash-str.h"
+
 #include "director/director.h"
 #include "director/score.h"
 #include "director/lingo/lingo-gr.h"
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 3c34e2d..fef2b57 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -21,11 +21,12 @@
  *
  */
 
+#include "common/system.h"
 #include "video/qt_decoder.h"
+
 #include "director/movie.h"
 #include "director/score.h"
-#include "common/debug.h"
-#include "common/system.h"
+
 namespace Director {
 
 Movie::Movie(Common::String fileName, DirectorEngine *vm) {
diff --git a/engines/director/movie.h b/engines/director/movie.h
index e26d10a..84bc116 100644
--- a/engines/director/movie.h
+++ b/engines/director/movie.h
@@ -24,9 +24,8 @@
 #ifndef DIRECTOR_MOVIE_H
 #define DIRECTOR_MOVIE_H
 
-#include "common/str.h"
-#include "common/rect.h"
 #include "graphics/managed_surface.h"
+
 #include "director/director.h"
 
 namespace Video {
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index aef7d39..787becf 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -24,9 +24,6 @@
 
 #include "common/debug.h"
 #include "common/macresman.h"
-#include "common/substream.h"
-#include "common/util.h"
-#include "common/textconsole.h"
 
 namespace Director {
 
diff --git a/engines/director/resource.h b/engines/director/resource.h
index fda8b79..2d5a4ae 100644
--- a/engines/director/resource.h
+++ b/engines/director/resource.h
@@ -23,12 +23,7 @@
 #ifndef DIRECTOR_RESOURCE_H
 #define DIRECTOR_RESOURCE_H
 
-#include "common/scummsys.h"
-#include "common/endian.h"
-#include "common/func.h"
-#include "common/hashmap.h"
 #include "common/file.h"
-#include "common/str.h"
 #include "common/substream.h"
 
 namespace Common {
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index cf9aef1..9b4f572 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -20,13 +20,13 @@
  *
  */
 
+#include "common/system.h"
 #include "common/config-manager.h"
+#include "common/events.h"
 
 #include "engines/util.h"
 #include "graphics/font.h"
 #include "graphics/palette.h"
-#include "common/events.h"
-#include "common/system.h"
 
 #include "director/score.h"
 #include "director/frame.h"
diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index d6c78a5..af6e0d2 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -20,12 +20,12 @@
 *
 */
 
-#include "director/sound.h"
 #include "audio/decoders/wave.h"
 #include "common/file.h"
 #include "audio/decoders/aiff.h"
 #include "common/system.h"
-#include "common/debug.h"
+
+#include "director/sound.h"
 
 namespace Director {
 
diff --git a/engines/director/sound.h b/engines/director/sound.h
index 4327b63..850842b 100644
--- a/engines/director/sound.h
+++ b/engines/director/sound.h
@@ -22,7 +22,6 @@
 
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
-#include "common/str.h"
 
 #ifndef DIRECTOR_SOUND_H
 #define DIRECTOR_SOUND_H


Commit: 1bbbb14b30b68319248ce4ead40a1e9a46f1e5f1
    https://github.com/scummvm/scummvm/commit/1bbbb14b30b68319248ce4ead40a1e9a46f1e5f1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-23T19:13:21+02:00

Commit Message:
DIRECTOR: Added test D3 target

Changed paths:
    engines/director/detection_tables.h



diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 65eff50..e03b831 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -40,6 +40,19 @@ static const DirectorGameDescription gameDescriptions[] = {
 		3
 	},
 
+	{ // Generic D3 entry
+		{
+			"director",
+			"",
+			AD_ENTRY1("D3", 0),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
 	{
 		{
 			"theapartment",






More information about the Scummvm-git-logs mailing list