[Scummvm-cvs-logs] SF.net SVN: scummvm:[38874] scummvm/trunk/engines/sci/include

[fingolfin at users.sourceforge.net]

Revision: 38874
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38874&view=rev
Author:   fingolfin
Date:     2009-02-25 02:05:43 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/include/script.h
    scummvm/trunk/engines/sci/include/vocabulary.h

Modified: scummvm/trunk/engines/sci/include/script.h
===================================================================
--- scummvm/trunk/engines/sci/include/script.h	2009-02-24 23:19:52 UTC (rev 38873)
+++ scummvm/trunk/engines/sci/include/script.h	2009-02-25 02:05:43 UTC (rev 38874)
@@ -26,10 +26,13 @@
 #ifndef SCI_INCLUDE_SCRIPT_H
 #define SCI_INCLUDE_SCRIPT_H
 
-#include "sci/include/sciresource.h"
+#include "common/str.h"
 
 namespace Sci {
 
+struct EngineState;
+struct ResourceManager;
+
 /*#define SCRIPT_DEBUG */
 
 #define SCI_SCRIPTS_NR 1000

Modified: scummvm/trunk/engines/sci/include/vocabulary.h
===================================================================
--- scummvm/trunk/engines/sci/include/vocabulary.h	2009-02-24 23:19:52 UTC (rev 38873)
+++ scummvm/trunk/engines/sci/include/vocabulary.h	2009-02-25 02:05:43 UTC (rev 38874)
@@ -26,11 +26,14 @@
 #ifndef SCI_INCLUDE_VOCABULARY_H
 #define SCI_INCLUDE_VOCABULARY_H
 
+#include "common/str.h"
+
 #include "sci/include/versions.h"
-#include "sci/include/sciresource.h"
 
 namespace Sci {
 
+struct ResourceManager;
+
 /*#define VOCABULARY_DEBUG */
 /*#define SCI_SIMPLE_SAID_CODE */ /* Whether the simplified Said() matching should be used */
 /*#define SCI_SIMPLE_SAID_DEBUG */ /* uncomment to enable simple said debugging */


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