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
---
 engines/scumm/smush/channel.cpp       | 2 +-
 engines/scumm/smush/chunk.cpp         | 4 ++--
 engines/scumm/smush/codec1.cpp        | 2 +-
 engines/scumm/smush/codec37.cpp       | 2 +-
 engines/scumm/smush/codec47.cpp       | 2 +-
 engines/scumm/smush/imuse_channel.cpp | 4 ++--
 engines/scumm/smush/saud_channel.cpp  | 4 ++--
 engines/scumm/smush/smush_font.cpp    | 2 +-
 engines/scumm/smush/smush_mixer.cpp   | 2 +-
 engines/scumm/smush/smush_mixer.h     | 2 +-
 engines/scumm/smush/smush_player.cpp  | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'engines/scumm/smush')

diff --git a/engines/scumm/smush/channel.cpp b/engines/scumm/smush/channel.cpp
index 065712fcad..5b8cd3a853 100644
--- a/engines/scumm/smush/channel.cpp
+++ b/engines/scumm/smush/channel.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "scumm/smush/channel.h"
 
 namespace Scumm {
diff --git a/engines/scumm/smush/chunk.cpp b/engines/scumm/smush/chunk.cpp
index ee24773c82..5e6f05b3e4 100644
--- a/engines/scumm/smush/chunk.cpp
+++ b/engines/scumm/smush/chunk.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "scumm/smush/chunk.h"
 #include "scumm/scumm.h"
 #include "scumm/file.h"
@@ -133,7 +133,7 @@ uint32 FileChunk::read(void *buffer, uint32 dataSize) {
 
 	dataSize = _data->read(buffer, dataSize);
 	_curPos += dataSize;
-	
+
 	return dataSize;
 }
 
diff --git a/engines/scumm/smush/codec1.cpp b/engines/scumm/smush/codec1.cpp
index a1f04b6a29..d0d92fcd79 100644
--- a/engines/scumm/smush/codec1.cpp
+++ b/engines/scumm/smush/codec1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 namespace Scumm {
diff --git a/engines/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp
index 5207374313..22ba1b443d 100644
--- a/engines/scumm/smush/codec37.cpp
+++ b/engines/scumm/smush/codec37.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/util.h"
 #include "scumm/bomp.h"
diff --git a/engines/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp
index 739c7308d3..0ad3815b1e 100644
--- a/engines/scumm/smush/codec47.cpp
+++ b/engines/scumm/smush/codec47.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/util.h"
 #include "scumm/bomp.h"
diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp
index 951a4bdc7e..3a0efbc6b7 100644
--- a/engines/scumm/smush/imuse_channel.cpp
+++ b/engines/scumm/smush/imuse_channel.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "scumm/scumm.h"	// For DEBUG_SMUSH
@@ -236,7 +236,7 @@ byte *ImuseChannel::getSoundData() {
 
 	_sbuffer = 0;
 	_sbufferSize = 0;
-	
+
 	return tmp;
 }
 
diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp
index 1bd74b2446..17296704ea 100644
--- a/engines/scumm/smush/saud_channel.cpp
+++ b/engines/scumm/smush/saud_channel.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "scumm/util.h"
@@ -168,7 +168,7 @@ byte *SaudChannel::getSoundData() {
 
 	_sbuffer = 0;
 	_sbufferSize = 0;
-	
+
 	return tmp;
 }
 
diff --git a/engines/scumm/smush/smush_font.cpp b/engines/scumm/smush/smush_font.cpp
index 094421cdcb..328fe694c1 100644
--- a/engines/scumm/smush/smush_font.cpp
+++ b/engines/scumm/smush/smush_font.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/file.h"
 #include "scumm/scumm.h"
 #include "scumm/util.h"
diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp
index 04103bb8d8..0a0cda5b76 100644
--- a/engines/scumm/smush/smush_mixer.cpp
+++ b/engines/scumm/smush/smush_mixer.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/util.h"
 
 #include "scumm/smush/smush_mixer.h"
diff --git a/engines/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h
index 86adcd3bdc..0bf6de2762 100644
--- a/engines/scumm/smush/smush_mixer.h
+++ b/engines/scumm/smush/smush_mixer.h
@@ -26,7 +26,7 @@
 #ifndef SCUMM_SMUSH_MIXER_H
 #define SCUMM_SMUSH_MIXER_H
 
-#include "common/stdafx.h"
+
 #include "scumm/sound.h"
 
 namespace Scumm {
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 612f2771db..7c66c8124d 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "engines/engine.h"
 
-- 
cgit v1.2.3