diff options
| author | Max Horn | 2009-09-17 16:50:53 +0000 |
|---|---|---|
| committer | Max Horn | 2009-09-17 16:50:53 +0000 |
| commit | eb77efda785dd7df31a90fb3fd57ea17bf49a606 (patch) | |
| tree | 5a31e8292859154a920a0abdf945df0cbd0e4ab4 /engines/sci/engine/vm.h | |
| parent | 9651562e72ac4c73393a2aba87e835269c25210f (diff) | |
| download | scummvm-rg350-eb77efda785dd7df31a90fb3fd57ea17bf49a606.tar.gz scummvm-rg350-eb77efda785dd7df31a90fb3fd57ea17bf49a606.tar.bz2 scummvm-rg350-eb77efda785dd7df31a90fb3fd57ea17bf49a606.zip | |
SCI: Add a global getSciVersion() function and make use of it
svn-id: r44170
Diffstat (limited to 'engines/sci/engine/vm.h')
| -rw-r--r-- | engines/sci/engine/vm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h index fa1b4f8817..f712193753 100644 --- a/engines/sci/engine/vm.h +++ b/engines/sci/engine/vm.h @@ -67,10 +67,10 @@ class ResourceManager; #define SCRIPT_FUNCTAREAPTR_MAGIC 8 -8 /** Offset of the name pointer */ -#define SCRIPT_NAME_OFFSET (version < SCI_VERSION_1_1 ? 14 -8 : 16) +#define SCRIPT_NAME_OFFSET (getSciVersion() < SCI_VERSION_1_1 ? 14 -8 : 16) /** Object-relative offset of the -info- selector */ -#define SCRIPT_INFO_OFFSET (version < SCI_VERSION_1_1 ? 12 -8 : 14) +#define SCRIPT_INFO_OFFSET (getSciVersion() < SCI_VERSION_1_1 ? 12 -8 : 14) /** Flag fo the -info- selector */ #define SCRIPT_INFO_CLONE 0x0001 @@ -82,12 +82,12 @@ class ResourceManager; /** Magical object identifier */ #define SCRIPT_OBJECT_MAGIC_NUMBER 0x1234 /** Offset of this identifier */ -#define SCRIPT_OBJECT_MAGIC_OFFSET (version < SCI_VERSION_1_1 ? -8 : 0) +#define SCRIPT_OBJECT_MAGIC_OFFSET (getSciVersion() < SCI_VERSION_1_1 ? -8 : 0) /** Script-relative offset of the species ID */ #define SCRIPT_SPECIES_OFFSET 8 -8 -#define SCRIPT_SUPERCLASS_OFFSET (version < SCI_VERSION_1_1 ? 10 -8 : 12) +#define SCRIPT_SUPERCLASS_OFFSET (getSciVersion() < SCI_VERSION_1_1 ? 10 -8 : 12) /** Magic adjustment value for lofsa and lofss */ #define SCRIPT_LOFS_MAGIC 3 |