[Scummvm-git-logs] scummvm master -> bfd2b487eba0a51a9e86b79b567bdd34b65008df

sev- sev at scummvm.org
Tue May 2 22:07:30 CEST 2017


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:
c750d17b0c DIRECTOR: Fix #include paths
98f0006ad9 DIRECTOR: Reduce header dependency
bfd2b487eb DIRECTOR: Fix code formatting


Commit: c750d17b0cf284e82e14f6245ab378c7d98ab3c0
    https://github.com/scummvm/scummvm/commit/c750d17b0cf284e82e14f6245ab378c7d98ab3c0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-05-02T22:04:21+02:00

Commit Message:
DIRECTOR: Fix #include paths

Changed paths:
    engines/director/cachedmactext.cpp
    engines/director/frame.h
    engines/director/score.h
    engines/director/stxt.cpp
    engines/director/stxt.h


diff --git a/engines/director/cachedmactext.cpp b/engines/director/cachedmactext.cpp
index d2a40ad..51ee910 100644
--- a/engines/director/cachedmactext.cpp
+++ b/engines/director/cachedmactext.cpp
@@ -20,12 +20,13 @@
  *
  */
 
-#include "engines/director/cachedmactext.h"
-#include "engines/director/cast.h"
 #include "graphics/macgui/macfontmanager.h"
 #include "graphics/macgui/mactext.h"
 #include "graphics/macgui/macwindowmanager.h"
 
+#include "director/cachedmactext.h"
+#include "director/cast.h"
+
 namespace Director {
 
 void CachedMacText::makeMacText() {
diff --git a/engines/director/frame.h b/engines/director/frame.h
index e254171..5cf4845 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -24,7 +24,7 @@
 #define DIRECTOR_FRAME_H
 
 #include "graphics/managed_surface.h"
-#include "engines/director/stxt.h"
+#include "director/stxt.h"
 
 namespace Image {
 	class ImageDecoder;
diff --git a/engines/director/score.h b/engines/director/score.h
index b091774..40ef85c 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -28,7 +28,7 @@
 #include "director/archive.h"
 #include "director/cast.h"
 #include "director/images.h"
-#include "engines/director/stxt.h"
+#include "director/stxt.h"
 
 namespace Graphics {
 	class ManagedSurface;
diff --git a/engines/director/stxt.cpp b/engines/director/stxt.cpp
index 4bdc42d..398b9a6 100644
--- a/engines/director/stxt.cpp
+++ b/engines/director/stxt.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "engines/director/stxt.h"
+#include "director/stxt.h"
 
 namespace Director {
 
diff --git a/engines/director/stxt.h b/engines/director/stxt.h
index ab1c823..7ac1ca5 100644
--- a/engines/director/stxt.h
+++ b/engines/director/stxt.h
@@ -23,7 +23,7 @@
 #ifndef DIRECTOR_STXT_H
 #define DIRECTOR_STXT_H
 
-#include "engines/director/director.h"
+#include "director/director.h"
 
 namespace Director {
 


Commit: 98f0006ad91558312a9a52fec152b71df0643a05
    https://github.com/scummvm/scummvm/commit/98f0006ad91558312a9a52fec152b71df0643a05
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-05-02T22:06:39+02:00

Commit Message:
DIRECTOR: Reduce header dependency

Changed paths:
    engines/director/frame.h


diff --git a/engines/director/frame.h b/engines/director/frame.h
index 5cf4845..bf35af8 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -24,7 +24,6 @@
 #define DIRECTOR_FRAME_H
 
 #include "graphics/managed_surface.h"
-#include "director/stxt.h"
 
 namespace Image {
 	class ImageDecoder;


Commit: bfd2b487eba0a51a9e86b79b567bdd34b65008df
    https://github.com/scummvm/scummvm/commit/bfd2b487eba0a51a9e86b79b567bdd34b65008df
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-05-02T22:06:59+02:00

Commit Message:
DIRECTOR: Fix code formatting

Changed paths:
    engines/director/stxt.cpp
    engines/director/stxt.h


diff --git a/engines/director/stxt.cpp b/engines/director/stxt.cpp
index 398b9a6..5d5515b 100644
--- a/engines/director/stxt.cpp
+++ b/engines/director/stxt.cpp
@@ -24,7 +24,7 @@
 
 namespace Director {
 
-Stxt::Stxt (Common::SeekableSubReadStreamEndian &textStream) {
+Stxt::Stxt(Common::SeekableSubReadStreamEndian &textStream) {
 	// TODO: Side effects on textStream make this a little hard to understand in context?
 	uint32 unk1 = textStream.readUint32();
 	uint32 strLen = textStream.readUint32();
diff --git a/engines/director/stxt.h b/engines/director/stxt.h
index 7ac1ca5..116a17a 100644
--- a/engines/director/stxt.h
+++ b/engines/director/stxt.h
@@ -29,7 +29,8 @@ namespace Director {
 
 class Stxt {
 public:
-	Stxt (Common::SeekableSubReadStreamEndian &textStream);
+	Stxt(Common::SeekableSubReadStreamEndian &textStream);
+
 public:
 	Common::String _ftext;
 	uint32 _fontId;





More information about the Scummvm-git-logs mailing list