From 258901bab96f0050385a9912c8ea0fe2a41b2d6f Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Wed, 19 Sep 2007 08:40:12 +0000
Subject: Merged common/stdafx.h into common/scummsys.h. All referencing files
 have been updated.

svn-id: r28966
---
 graphics/cursorman.h           |  1 -
 graphics/dxa_player.cpp        |  3 +--
 graphics/font.cpp              | 21 ++++++++++-----------
 graphics/fontman.h             |  1 -
 graphics/fonts/consolefont.cpp |  1 -
 graphics/fonts/newfont.cpp     |  1 -
 graphics/fonts/newfont_big.cpp |  1 -
 graphics/fonts/scummfont.cpp   | 33 ++++++++++++++++-----------------
 graphics/imagedec.h            |  1 -
 graphics/imageman.h            |  7 +++----
 graphics/mpeg_player.cpp       |  1 -
 graphics/primitives.cpp        |  1 -
 graphics/scaler.h              |  1 -
 graphics/scaler/intern.h       |  1 -
 graphics/scaler/scale2x.cpp    |  1 -
 graphics/scaler/scale3x.cpp    |  1 -
 graphics/scaler/scalebit.cpp   |  1 -
 graphics/scaler/thumbnail.cpp  |  1 -
 graphics/surface.cpp           |  1 -
 19 files changed, 30 insertions(+), 49 deletions(-)

(limited to 'graphics')

diff --git a/graphics/cursorman.h b/graphics/cursorman.h
index 2f139e8d57..c15c65cb94 100644
--- a/graphics/cursorman.h
+++ b/graphics/cursorman.h
@@ -25,7 +25,6 @@
 #ifndef GRAPHICS_CURSORMAN_H
 #define GRAPHICS_CURSORMAN_H
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/stack.h"
 #include "common/singleton.h"
diff --git a/graphics/dxa_player.cpp b/graphics/dxa_player.cpp
index ee17b4b6ff..28a1bc4dbd 100644
--- a/graphics/dxa_player.cpp
+++ b/graphics/dxa_player.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/endian.h"
 #include "graphics/dxa_player.h"
 #include "common/util.h"
@@ -559,7 +558,7 @@ void DXAPlayer::decodeNextFrame() {
 		default:
 			error("decodeFrame: Unknown compression type %d", type);
 		}
-		
+
 		if (type == 3) {
 			for (int j = 0; j < _curHeight; ++j) {
 				for (int i = 0; i < _width; ++i) {
diff --git a/graphics/font.cpp b/graphics/font.cpp
index 8fd92a9476..bec80e9ec0 100644
--- a/graphics/font.cpp
+++ b/graphics/font.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/stream.h"
 #include "common/file.h"
 #include "common/endian.h"
@@ -130,7 +129,7 @@ struct NewFontData {
 	BBX*		bbx;	/* character bounding box or NULL if fixed */
 	int		defaultchar;	/* default char (not glyph index)*/
 	long	bits_size;	/* # words of bitmap_t bits*/
-	
+
 	/* unused by runtime system, read in by convbdf*/
 	char *	facename;	/* facename of font*/
 	char *	copyright;	/* copyright info for loadable fonts*/
@@ -169,7 +168,7 @@ void free_font(NewFontData* pf) {
 NewFontData* bdf_read_font(Common::SeekableReadStream &fp) {
 	NewFontData* pf;
 	uint32 pos = fp.pos();
-	
+
 	pf = (NewFontData*)calloc(1, sizeof(NewFontData));
 	if (!pf)
 		goto errout;
@@ -275,8 +274,8 @@ int bdf_read_header(Common::SeekableReadStream &fp, NewFontData* pf) {
 				warning("Error: bad 'ENCODING'");
 				return 0;
 			}
-			if (encoding >= 0 && 
-				encoding <= limit_char && 
+			if (encoding >= 0 &&
+				encoding <= limit_char &&
 				encoding >= start_char) {
 
 				if (firstchar > encoding)
@@ -298,15 +297,15 @@ int bdf_read_header(Common::SeekableReadStream &fp, NewFontData* pf) {
 	pf->height = pf->ascent + pf->descent;
 
 	/* calc default char*/
-	if (pf->defaultchar < 0 || 
-		pf->defaultchar < firstchar || 
+	if (pf->defaultchar < 0 ||
+		pf->defaultchar < firstchar ||
 		pf->defaultchar > limit_char )
 		pf->defaultchar = firstchar;
 
 	/* calc font size (offset/width entries)*/
 	pf->firstchar = firstchar;
 	pf->size = lastchar - firstchar + 1;
-	
+
 	/* use the font boundingbox to get initial maxwidth*/
 	/*maxwidth = pf->fbbw - pf->fbbx;*/
 	maxwidth = pf->fbbw;
@@ -320,7 +319,7 @@ int bdf_read_header(Common::SeekableReadStream &fp, NewFontData* pf) {
 	pf->offset = (unsigned long *)malloc(pf->size * sizeof(unsigned long));
 	pf->width = (unsigned char *)malloc(pf->size * sizeof(unsigned char));
 	pf->bbx = (BBX *)malloc(pf->size * sizeof(BBX));
-	
+
 	if (!pf->bits || !pf->offset || !pf->width) {
 		warning("Error: no memory for font load");
 		return 0;
@@ -420,7 +419,7 @@ int bdf_read_bitmaps(Common::SeekableReadStream &fp, NewFontData* pf) {
 
 				for (k = 0; k < ch_words; ++k) {
 					bitmap_t value;
-					
+
 					value = bdf_hexval((unsigned char *)buf);
 					if (bbw > 8) {
 						WRITE_UINT16(ch_bitmap, value);
@@ -551,7 +550,7 @@ bitmap_t bdf_hexval(unsigned char *buf) {
 			c = c - 'A' + 10;
 		else if (c >= 'a' && c <= 'f')
 			c = c - 'a' + 10;
-		else 
+		else
 			c = 0;
 		val = (val << 4) | c;
 	}
diff --git a/graphics/fontman.h b/graphics/fontman.h
index 9911629432..eeefab77ec 100644
--- a/graphics/fontman.h
+++ b/graphics/fontman.h
@@ -25,7 +25,6 @@
 #ifndef GRAPHICS_FONTMAN_H
 #define GRAPHICS_FONTMAN_H
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/singleton.h"
 #include "common/str.h"
diff --git a/graphics/fonts/consolefont.cpp b/graphics/fonts/consolefont.cpp
index af1c9e589c..113bf87649 100644
--- a/graphics/fonts/consolefont.cpp
+++ b/graphics/fonts/consolefont.cpp
@@ -1,5 +1,4 @@
 /* Generated by convbdf on Sat Jun 17 01:37:46 2006. */
-#include "common/stdafx.h"
 #include "graphics/font.h"
 
 /* Font information:
diff --git a/graphics/fonts/newfont.cpp b/graphics/fonts/newfont.cpp
index 0a55a26de2..8d0e879117 100644
--- a/graphics/fonts/newfont.cpp
+++ b/graphics/fonts/newfont.cpp
@@ -1,5 +1,4 @@
 /* Generated by convbdf on Sat Jun 17 01:34:15 2006. */
-#include "common/stdafx.h"
 #include "graphics/font.h"
 
 /* Font information:
diff --git a/graphics/fonts/newfont_big.cpp b/graphics/fonts/newfont_big.cpp
index 3fc2af6b0e..45b797a3ae 100644
--- a/graphics/fonts/newfont_big.cpp
+++ b/graphics/fonts/newfont_big.cpp
@@ -1,5 +1,4 @@
 /* Generated by convbdf on Tue Jun 13 00:00:22 2006. */
-#include "common/stdafx.h"
 #include "graphics/font.h"
 
 /* Font information:
diff --git a/graphics/fonts/scummfont.cpp b/graphics/fonts/scummfont.cpp
index 0dc0c50f18..87078e1475 100644
--- a/graphics/fonts/scummfont.cpp
+++ b/graphics/fonts/scummfont.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "graphics/font.h"
 
 namespace Graphics {
@@ -30,23 +29,23 @@ namespace Graphics {
 // Built-in font
 static const byte guifont[] = {
 	// Header
-	0, 0, 99, 1, 226, 8, 
+	0, 0, 99, 1, 226, 8,
 	// Character width table
-	4, 8, 6, 8, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	8, 2, 1, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	4, 3, 7, 8, 7, 7, 8, 4, 5, 5, 8, 7, 4, 7, 3, 8, 
-	7, 7, 7, 7, 8, 7, 7, 7, 7, 7, 3, 4, 7, 5, 7, 7, 
-	8, 7, 7, 7, 7, 7, 7, 7, 7, 5, 7, 7, 7, 8, 7, 7, 
-	7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 5, 8, 5, 8, 8, 
-	7, 7, 7, 6, 7, 7, 7, 7, 7, 5, 6, 7, 5, 8, 7, 7, 
-	7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 5, 3, 5, 7, 8, 
-	7, 7, 7, 7, 7, 7, 0, 6, 7, 7, 7, 5, 5, 5, 7, 0, 
-	6, 8, 8, 7, 7, 7, 7, 7, 0, 7, 7, 0, 0, 0, 0, 0, 
-	7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 7, 
+	4, 8, 6, 8, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	8, 2, 1, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	4, 3, 7, 8, 7, 7, 8, 4, 5, 5, 8, 7, 4, 7, 3, 8,
+	7, 7, 7, 7, 8, 7, 7, 7, 7, 7, 3, 4, 7, 5, 7, 7,
+	8, 7, 7, 7, 7, 7, 7, 7, 7, 5, 7, 7, 7, 8, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 5, 8, 5, 8, 8,
+	7, 7, 7, 6, 7, 7, 7, 7, 7, 5, 6, 7, 5, 8, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 5, 3, 5, 7, 8,
+	7, 7, 7, 7, 7, 7, 0, 6, 7, 7, 7, 5, 5, 5, 7, 0,
+	6, 8, 8, 7, 7, 7, 7, 7, 0, 7, 7, 0, 0, 0, 0, 0,
+	7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 7,
 	// Character table
 	0,   0,   0,   0,   0,   0,   0,   0,   	// 0
 	1,   3,   6,   12,  24,  62,  3,   0,   	// 1
diff --git a/graphics/imagedec.h b/graphics/imagedec.h
index 997c8c0861..6fac4c40c6 100644
--- a/graphics/imagedec.h
+++ b/graphics/imagedec.h
@@ -25,7 +25,6 @@
 #ifndef GRAPHICS_IMAGEDEC_H
 #define GRAPHICS_IMAGEDEC_H
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/str.h"
 #include "common/stream.h"
diff --git a/graphics/imageman.h b/graphics/imageman.h
index ac5fae6a83..d1c8e0dad9 100644
--- a/graphics/imageman.h
+++ b/graphics/imageman.h
@@ -25,7 +25,6 @@
 #ifndef GRAPHICS_IMAGEMAN_H
 #define GRAPHICS_IMAGEMAN_H
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/singleton.h"
 #include "common/str.h"
@@ -34,7 +33,7 @@
 
 namespace Graphics {
 struct Surface;
- 
+
 class ImageManager : public Common::Singleton<ImageManager> {
 public:
 	~ImageManager();
@@ -56,7 +55,7 @@ public:
 	 */
 	void remArchive(const Common::String &name);
 
-	/** 
+	/**
 	 * registers a surface to the ImageManager.
 	 * surf->free(), also delete surf, will be called when the ImageManager will
 	 * be destroyed or if ImageManager::unregisterSurface is called.
@@ -101,7 +100,7 @@ private:
 	};
 	typedef Common::List<Archive>::iterator ZipIterator;
 #endif
-	
+
 	Iterator searchHandle(const Common::String &name);
 
 	Common::List<Entry*> _surfaces;
diff --git a/graphics/mpeg_player.cpp b/graphics/mpeg_player.cpp
index d17d503a87..3c0fd08cb3 100644
--- a/graphics/mpeg_player.cpp
+++ b/graphics/mpeg_player.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "graphics/mpeg_player.h"
 #include "common/file.h"
 #include "common/system.h"
diff --git a/graphics/primitives.cpp b/graphics/primitives.cpp
index 3b57c1c94c..9fdcb13b7b 100644
--- a/graphics/primitives.cpp
+++ b/graphics/primitives.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/util.h"
 
 namespace Graphics {
diff --git a/graphics/scaler.h b/graphics/scaler.h
index f544b7d85b..ccd2c3991a 100644
--- a/graphics/scaler.h
+++ b/graphics/scaler.h
@@ -25,7 +25,6 @@
 #ifndef GRAPHICS_SCALER_H
 #define GRAPHICS_SCALER_H
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "graphics/surface.h"
 
diff --git a/graphics/scaler/intern.h b/graphics/scaler/intern.h
index 68294d98c2..ff515530dd 100644
--- a/graphics/scaler/intern.h
+++ b/graphics/scaler/intern.h
@@ -26,7 +26,6 @@
 #ifndef GRAPHICS_SCALER_INTERN_H
 #define GRAPHICS_SCALER_INTERN_H
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "graphics/colormasks.h"
 
diff --git a/graphics/scaler/scale2x.cpp b/graphics/scaler/scale2x.cpp
index 9426da1b74..226d379c91 100644
--- a/graphics/scaler/scale2x.cpp
+++ b/graphics/scaler/scale2x.cpp
@@ -32,7 +32,6 @@
  * - derivative works of the program are allowed.
  */
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 #include "graphics/scaler/intern.h"
diff --git a/graphics/scaler/scale3x.cpp b/graphics/scaler/scale3x.cpp
index 9d9e0ebfd7..8aa33dd170 100644
--- a/graphics/scaler/scale3x.cpp
+++ b/graphics/scaler/scale3x.cpp
@@ -32,7 +32,6 @@
  * - derivative works of the program are allowed.
  */
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 #include "graphics/scaler/intern.h"
diff --git a/graphics/scaler/scalebit.cpp b/graphics/scaler/scalebit.cpp
index c68abfeb0a..2210697d71 100644
--- a/graphics/scaler/scalebit.cpp
+++ b/graphics/scaler/scalebit.cpp
@@ -33,7 +33,6 @@
  * - derivative works of the program are allowed.
  */
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 #include "graphics/scaler/intern.h"
diff --git a/graphics/scaler/thumbnail.cpp b/graphics/scaler/thumbnail.cpp
index b17f66bb3d..f1caa5d2e5 100644
--- a/graphics/scaler/thumbnail.cpp
+++ b/graphics/scaler/thumbnail.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/graphics/surface.cpp b/graphics/surface.cpp
index 80163f7f47..2b07af1ccb 100644
--- a/graphics/surface.cpp
+++ b/graphics/surface.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/util.h"
 #include "graphics/primitives.h"
 #include "graphics/surface.h"
-- 
cgit v1.2.3