- Replaced SCI_VERSION_FTU_LOFS_ABSOLUTE with the GF_SCI1_LOFSABSOLUTE game flag

- Moved the version defines outside of versions.h

svn-id: r40559

2 files changed, 1 insertions, 19 deletions

diff --git a/engines/sci/scicore/versions.h b/engines/sci/scicore/versions.h
index b1eed18748..0c2b131d10 100644
--- a/engines/sci/scicore/versions.h
+++ b/engines/sci/scicore/versions.h
@@ -30,14 +30,6 @@
 
 namespace Sci {
 
-#define SCI_VERSION(_major_, _minor_, _patchlevel_) (((_major_)<<20) | ((_minor_)<<10) | _patchlevel_)
-/* This allows version numbers to be compared directly */
-
-#define SCI_VERSION_MAJOR(_version_) ((_version_) >> 20)
-#define SCI_VERSION_MINOR(_version_) (((_version_) >> 10) & 0x3ff)
-#define SCI_VERSION_PATCHLEVEL(_version_) ((_version_) & 0x3ff)
-#define SCI_VERSION_IGNORE_PATCHLEVEL(_version_) ((_version) & ~0x3ff)
-
 /* Version number guide:
 ** - Always use the version number of the first known version to have a special feature.
 ** - Don't assume that special feature changes are linked just because they appeared to change
@@ -46,19 +38,9 @@ namespace Sci {
 ** - "FTU" means "First To Use"
 */
 
-#define SCI_VERSION_FTU_LOFS_ABSOLUTE SCI_VERSION(1,000,200)
-/* First version known to do this: ?
-   In later versions (SCI1 and beyond), the argument of lofs[as]
-   instructions is absolute rather than relative.
-*/
-
 #define SCI_VERSION_FTU_DOSOUND_VARIANT_2 SCI_VERSION(1,000,510)
 
 
-typedef int sci_version_t;
-
-struct EngineState;
-
 } // End of namespace Sci
 
 #endif // SCI_SCICORE_VERSIONS_H
diff --git a/engines/sci/scicore/vocabulary.h b/engines/sci/scicore/vocabulary.h
index 2124ed36d8..d0c807aebf 100644
--- a/engines/sci/scicore/vocabulary.h
+++ b/engines/sci/scicore/vocabulary.h
@@ -31,7 +31,7 @@
 #include "common/hash-str.h"
 #include "common/list.h"
 
-#include "sci/scicore/versions.h"
+#include "sci/sci.h"
 
 namespace Sci {