[Scummvm-cvs-logs] SF.net SVN: scummvm: [20857] scummvm/trunk/engines/cine

[fingolfin at users.sourceforge.net]

Revision: 20857
Author:   fingolfin
Date:     2006-02-24 17:01:27 -0800 (Fri, 24 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20857&view=rev

Log Message:
-----------
Reducing the header dependencies in cine a bit more

Modified Paths:
--------------
    scummvm/trunk/engines/cine/anim.cpp
    scummvm/trunk/engines/cine/bg.cpp
    scummvm/trunk/engines/cine/cine.cpp
    scummvm/trunk/engines/cine/cine.h
    scummvm/trunk/engines/cine/flip_support.cpp
    scummvm/trunk/engines/cine/flip_support.h
    scummvm/trunk/engines/cine/gfx.cpp
    scummvm/trunk/engines/cine/main_loop.cpp
    scummvm/trunk/engines/cine/msg.cpp
    scummvm/trunk/engines/cine/object.cpp
    scummvm/trunk/engines/cine/part.cpp
    scummvm/trunk/engines/cine/prc.cpp
    scummvm/trunk/engines/cine/script.cpp
    scummvm/trunk/engines/cine/sfx_player.cpp
    scummvm/trunk/engines/cine/sound_driver.cpp
    scummvm/trunk/engines/cine/various.cpp
    scummvm/trunk/engines/cine/various.h
Modified: scummvm/trunk/engines/cine/anim.cpp
===================================================================
--- scummvm/trunk/engines/cine/anim.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/anim.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -23,6 +23,12 @@
  */
 
 #include "cine/cine.h"
+#include "cine/anim.h"
+#include "cine/flip_support.h"
+#include "cine/gfx.h"
+#include "cine/pal.h"
+#include "cine/part.h"
+#include "cine/various.h"
 
 namespace Cine {
 

Modified: scummvm/trunk/engines/cine/bg.cpp
===================================================================
--- scummvm/trunk/engines/cine/bg.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/bg.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 

Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/cine.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -26,6 +26,7 @@
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/config-manager.h"
+#include "common/system.h"
 
 #include "base/gameDetector.h"
 #include "base/plugins.h"
@@ -36,6 +37,8 @@
 #include "sound/mixer.h"
 
 #include "cine/cine.h"
+#include "cine/main_loop.h"
+#include "cine/sfx_player.h"
 #include "cine/sound_driver.h"
 
 

Modified: scummvm/trunk/engines/cine/cine.h
===================================================================
--- scummvm/trunk/engines/cine/cine.h	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/cine.h	2006-02-25 01:01:27 UTC (rev 20857)
@@ -28,22 +28,17 @@
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/util.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/system.h"
 
 #include "base/engine.h"
 #include "base/gameDetector.h"
 
 #include "cine/various.h"
-#include "cine/flip_support.h"
 #include "cine/texte.h"
 #include "cine/object.h"
 #include "cine/rel.h"
 #include "cine/script.h"
 #include "cine/part.h"
 #include "cine/prc.h"
-#include "cine/main_loop.h"
 #include "cine/resource.h"
 #include "cine/msg.h"
 #include "cine/bg.h"
@@ -52,11 +47,11 @@
 #include "cine/anim.h"
 #include "cine/unpack.h"
 #include "cine/bg_list.h"
-#include "cine/sfx_player.h"
-#include "cine/sound_driver.h"
 
 namespace Cine {
 
+class AdlibMusic;
+
 enum CineGameId {
 	GID_FW = 1,
 	GID_OS

Modified: scummvm/trunk/engines/cine/flip_support.cpp
===================================================================
--- scummvm/trunk/engines/cine/flip_support.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/flip_support.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -22,7 +22,7 @@
  *
  */
 
-#include "cine/cine.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 

Modified: scummvm/trunk/engines/cine/flip_support.h
===================================================================
--- scummvm/trunk/engines/cine/flip_support.h	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/flip_support.h	2006-02-25 01:01:27 UTC (rev 20857)
@@ -25,6 +25,9 @@
 #ifndef CINE_FLIPSUPPORT_H_
 #define CINE_FLIPSUPPORT_H_
 
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+
 namespace Cine {
 
 void flipU16(uint16 *);

Modified: scummvm/trunk/engines/cine/gfx.cpp
===================================================================
--- scummvm/trunk/engines/cine/gfx.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/gfx.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -24,6 +24,8 @@
 
 #include "cine/cine.h"
 
+#include "common/system.h"
+
 namespace Cine {
 
 byte *screenBuffer;

Modified: scummvm/trunk/engines/cine/main_loop.cpp
===================================================================
--- scummvm/trunk/engines/cine/main_loop.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/main_loop.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -22,8 +22,13 @@
  *
  */
 
-#include "cine/cine.h"
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+#include "common/system.h"
 
+#include "cine/main_loop.h"
+#include "cine/various.h"
+
 namespace Cine {
 
 mouseStatusStruct mouseData;

Modified: scummvm/trunk/engines/cine/msg.cpp
===================================================================
--- scummvm/trunk/engines/cine/msg.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/msg.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 

Modified: scummvm/trunk/engines/cine/object.cpp
===================================================================
--- scummvm/trunk/engines/cine/object.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/object.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 

Modified: scummvm/trunk/engines/cine/part.cpp
===================================================================
--- scummvm/trunk/engines/cine/part.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/part.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 

Modified: scummvm/trunk/engines/cine/prc.cpp
===================================================================
--- scummvm/trunk/engines/cine/prc.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/prc.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -24,6 +24,7 @@
 
 #include "cine/cine.h"
 #include "cine/auto00.h"
+#include "cine/flip_support.h"
 
 namespace Cine {
 

Modified: scummvm/trunk/engines/cine/script.cpp
===================================================================
--- scummvm/trunk/engines/cine/script.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/script.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -23,6 +23,9 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
+#include "cine/sfx_player.h"
+#include "cine/sound_driver.h"
 
 namespace Cine {
 

Modified: scummvm/trunk/engines/cine/sfx_player.cpp
===================================================================
--- scummvm/trunk/engines/cine/sfx_player.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/sfx_player.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -27,6 +27,8 @@
 #include "common/file.h"
 
 #include "cine/cine.h"
+#include "cine/sfx_player.h"
+#include "cine/sound_driver.h"
 
 namespace Cine {
 

Modified: scummvm/trunk/engines/cine/sound_driver.cpp
===================================================================
--- scummvm/trunk/engines/cine/sound_driver.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/sound_driver.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/sfx_player.h"
 #include "cine/sound_driver.h"
 
 #include "sound/mixer.h"
@@ -30,6 +31,8 @@
 
 namespace Cine {
 
+extern AdlibMusic *g_cine_adlib;
+
 uint8 snd_useAdlib = 0;
 uint16 snd_fadeOutCounter = 0;
 uint16 snd_songTicksCounter = 0;

Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/various.cpp	2006-02-25 01:01:27 UTC (rev 20857)
@@ -23,7 +23,10 @@
  */
 
 #include "cine/cine.h"
+#include "cine/flip_support.h"
+#include "cine/main_loop.h"
 #include "cine/font.h"
+#include "cine/sfx_player.h"
 
 namespace Cine {
 

Modified: scummvm/trunk/engines/cine/various.h
===================================================================
--- scummvm/trunk/engines/cine/various.h	2006-02-25 00:46:56 UTC (rev 20856)
+++ scummvm/trunk/engines/cine/various.h	2006-02-25 01:01:27 UTC (rev 20857)
@@ -25,6 +25,9 @@
 #ifndef CINE_VARIOUS_H_
 #define CINE_VARIOUS_H_
 
+#include "common/stdafx.h"
+#include "common/file.h"
+
 #include "cine/cine.h"
 
 namespace Cine {