[Scummvm-cvs-logs] SF.net SVN: scummvm: [22225] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 22225
Author:   kirben
Date:     2006-04-29 07:23:16 -0700 (Sat, 29 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22225&view=rev

Log Message:
-----------
Cleanup includes

Modified Paths:
--------------
    scummvm/trunk/engines/simon/cursor.cpp
    scummvm/trunk/engines/simon/debug.cpp
    scummvm/trunk/engines/simon/debugger.cpp
    scummvm/trunk/engines/simon/game.cpp
    scummvm/trunk/engines/simon/icons.cpp
    scummvm/trunk/engines/simon/items.cpp
    scummvm/trunk/engines/simon/midi.cpp
    scummvm/trunk/engines/simon/midiparser_s1d.cpp
    scummvm/trunk/engines/simon/saveload.cpp
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/engines/simon/verb.cpp
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/cursor.cpp
===================================================================
--- scummvm/trunk/engines/simon/cursor.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/cursor.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -22,10 +22,10 @@
 
 #include "common/stdafx.h"
 
-#include "simon/simon.h"
-#include "simon/intern.h"
 #include "common/system.h"
 
+#include "simon/simon.h"
+
 namespace Simon {
 
 #ifdef PALMOS_68K

Modified: scummvm/trunk/engines/simon/debug.cpp
===================================================================
--- scummvm/trunk/engines/simon/debug.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/debug.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -22,9 +22,10 @@
 
 // Simon debug functions
 #include "common/stdafx.h"
+
+#include "simon/debug.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
-#include "simon/debug.h"
 #include "simon/vga.h"
 
 #include <sys/stat.h>

Modified: scummvm/trunk/engines/simon/debugger.cpp
===================================================================
--- scummvm/trunk/engines/simon/debugger.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/debugger.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -21,8 +21,10 @@
  */
 
 #include "common/stdafx.h"
+
 #include "common/config-manager.h"
 #include "common/debugger.cpp"
+
 #include "simon/debugger.h"
 #include "simon/simon.h"
 

Modified: scummvm/trunk/engines/simon/game.cpp
===================================================================
--- scummvm/trunk/engines/simon/game.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/game.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -31,9 +31,7 @@
 #include "common/md5.h"
 
 #include "simon/simon.h"
-#include "simon/intern.h"
 
-
 namespace Simon {
 static DetectedGameList GAME_detectGames(const FSList &fslist);
 }

Modified: scummvm/trunk/engines/simon/icons.cpp
===================================================================
--- scummvm/trunk/engines/simon/icons.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/icons.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -25,7 +25,6 @@
 #include "common/file.h"
 
 #include "simon/simon.h"
-#include "simon/intern.h"
 
 namespace Simon {
 

Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -24,12 +24,11 @@
 
 #include "common/stdafx.h"
 
+#include "common/system.h"
+
 #include "simon/animation.h"
 #include "simon/simon.h"
-#include "simon/intern.h"
 
-#include "common/system.h"
-
 #ifdef _WIN32_WCE
 extern bool isSmartphone(void);
 #endif

Modified: scummvm/trunk/engines/simon/midi.cpp
===================================================================
--- scummvm/trunk/engines/simon/midi.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/midi.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -22,12 +22,14 @@
 
 
 #include "common/stdafx.h"
-#include "common/scummsys.h"
+
+#include "common/file.h"
 #include "common/system.h"
-#include "common/file.h"
-#include "sound/mixer.h"
+
 #include "simon/simon.h"
 
+#include "sound/mixer.h"
+
 namespace Simon {
 
 

Modified: scummvm/trunk/engines/simon/midiparser_s1d.cpp
===================================================================
--- scummvm/trunk/engines/simon/midiparser_s1d.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/midiparser_s1d.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -21,10 +21,12 @@
  */
 
 #include "common/stdafx.h"
-#include "sound/midiparser.h"
-#include "sound/mididrv.h"
+
 #include "common/util.h"
 
+#include "sound/mididrv.h"
+#include "sound/midiparser.h"
+
 #include <stdio.h>
 
 namespace Simon {

Modified: scummvm/trunk/engines/simon/saveload.cpp
===================================================================
--- scummvm/trunk/engines/simon/saveload.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/saveload.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -22,15 +22,15 @@
 
 #include "common/stdafx.h"
 
+#include "common/savefile.h"
+#include "common/system.h"
+
 #include "gui/about.h"
 #include "gui/message.h"
 
 #include "simon/simon.h"
 #include "simon/intern.h"
 
-#include "common/savefile.h"
-#include "common/system.h"
-
 namespace Simon {
 
 int SimonEngine::countSaveGames() {

Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -24,7 +24,6 @@
 
 #include "backends/fs/fs.h"
 
-
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/system.h"

Modified: scummvm/trunk/engines/simon/verb.cpp
===================================================================
--- scummvm/trunk/engines/simon/verb.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/verb.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -22,6 +22,7 @@
 
 // Verb and hitarea handling
 #include "common/stdafx.h"
+
 #include "simon/simon.h"
 #include "simon/intern.h"
 

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-04-29 14:11:29 UTC (rev 22224)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-04-29 14:23:16 UTC (rev 22225)
@@ -22,6 +22,7 @@
 
 // Video script opcodes for Simon1/Simon2
 #include "common/stdafx.h"
+
 #include "simon/simon.h"
 #include "simon/intern.h"
 #include "simon/vga.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.