[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.7,1.8 res.cpp,1.9,1.10 simon.cpp,1.65,1.66 simon.h,1.11,1.12

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv15540

Modified Files:
	midi.cpp res.cpp simon.cpp simon.h 
Log Message:
if possible, always #include headers in the source files, not in other headers

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- midi.cpp	24 Oct 2002 09:40:20 -0000	1.7
+++ midi.cpp	10 Nov 2002 15:24:17 -0000	1.8
@@ -23,6 +23,7 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "common/system.h"
+#include "common/file.h"
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 #include "simon/simon.h"

Index: res.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/res.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- res.cpp	5 Nov 2002 10:36:31 -0000	1.9
+++ res.cpp	10 Nov 2002 15:24:17 -0000	1.10
@@ -21,6 +21,7 @@
 
 // Resource file routines for Simon1/Simon2
 #include "stdafx.h"
+#include "common/file.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
 

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- simon.cpp	10 Nov 2002 05:25:33 -0000	1.65
+++ simon.cpp	10 Nov 2002 15:24:17 -0000	1.66
@@ -24,6 +24,7 @@
 #include "simon/intern.h"
 #include "simon/vga.h"
 #include "sound/mididrv.h"
+#include "common/file.h"
 #include "common/gameDetector.h"
 #include <errno.h>
 #include <time.h>

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- simon.h	5 Nov 2002 16:46:58 -0000	1.11
+++ simon.h	10 Nov 2002 15:24:17 -0000	1.12
@@ -23,10 +23,9 @@
 #define SIMON_H
 
 #include <stdio.h>
-#include "engine.h"
+#include "common/engine.h"
 #include "simon/midi.h"
 #include "sound/mixer.h"
-#include "file.h"
 
 /* Various other settings */
 //#define DUMP_CONTINOUS_MAINSCRIPT