From aaff7b1736a65ee7ee47f63674c053dd15c36f74 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 18 Feb 2014 02:34:19 +0100
Subject: DREAMWEB: Make GPL headers consistent in themselves.

---
 engines/dreamweb/vgagrafx.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/dreamweb/vgagrafx.cpp')

diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index d8984d312b..ef8b4830b2 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3


From 137f62554854905a7a3a72289235bbec71a922bd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 19 Feb 2014 21:41:43 +0100
Subject: DREAMWEB: Some British to American english

---
 engines/dreamweb/vgagrafx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/dreamweb/vgagrafx.cpp')

diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index ef8b4830b2..e8531343f8 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -235,7 +235,7 @@ void DreamWebEngine::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y
 
 void DreamWebEngine::showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height) {
 	if (effectsFlag) {
-		if (effectsFlag & 128) { //centred
+		if (effectsFlag & 128) { //centered
 			x -= width / 2;
 			y -= height / 2;
 		}
-- 
cgit v1.2.3


From 740b6e8fbdece44ae2a5295cb0549a53b6dc6ae7 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 27 Feb 2014 21:27:23 -0500
Subject: IMAGE: Move all ImageDecoders to image/

---
 engines/dreamweb/vgagrafx.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/dreamweb/vgagrafx.cpp')

diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index e8531343f8..c59d3e3ad5 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -23,7 +23,7 @@
 #include "dreamweb/dreamweb.h"
 #include "engines/util.h"
 #include "graphics/surface.h"
-#include "graphics/decoders/pcx.h"
+#include "image/pcx.h"
 
 namespace DreamWeb {
 
@@ -161,7 +161,7 @@ void DreamWebEngine::showPCX(const Common::String &suffix) {
 		return;
 	}
 
-	Graphics::PCXDecoder pcx;
+	Image::PCXDecoder pcx;
 	if (!pcx.loadStream(pcxFile)) {
 		warning("showpcx: Could not process '%s'", name.c_str());
 		return;
-- 
cgit v1.2.3