diff options
| author | Colin Snover | 2017-04-17 21:07:23 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-04-23 13:07:25 -0500 |
| commit | d53f3f6095975405558c2902a870ff3fa8c01a8b (patch) | |
| tree | e84fca0e08f70a8a4c6ef19448b784fdad2e72bf /engines/sci/engine/script.h | |
| parent | 6f95b1a440c8579a5010c39ca84e2c5fcdfac682 (diff) | |
| download | scummvm-rg350-d53f3f6095975405558c2902a870ff3fa8c01a8b.tar.gz scummvm-rg350-d53f3f6095975405558c2902a870ff3fa8c01a8b.tar.bz2 scummvm-rg350-d53f3f6095975405558c2902a870ff3fa8c01a8b.zip | |
SCI32: Exclude SCI3 code from compilation when SCI32 is disabled
Diffstat (limited to 'engines/sci/engine/script.h')
| -rw-r--r-- | engines/sci/engine/script.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h index f63b312647..e0faa11575 100644 --- a/engines/sci/engine/script.h +++ b/engines/sci/engine/script.h @@ -253,11 +253,13 @@ public: */ void syncStringHeap(Common::Serializer &ser); +#ifdef ENABLE_SCI32 /** * Resolve a relocation in an SCI3 script * @param offset The offset to relocate from */ int relocateOffsetSci3(uint32 offset) const; +#endif /** * Gets an offset to the beginning of the code block in a SCI1.1 or later @@ -282,6 +284,7 @@ private: */ void relocateSci0Sci21(reg_t block); +#ifdef ENABLE_SCI32 /** * Processes a relocation block within a SCI3 script * This function is idempotent, but it must only be called after all @@ -289,13 +292,16 @@ private: * @param obj_pos Location (segment, offset) of the block */ void relocateSci3(reg_t block); +#endif bool relocateLocal(SegmentId segment, int location); +#ifdef ENABLE_SCI32 /** * Gets a pointer to the beginning of the objects in a SCI3 script */ SciSpan<const byte> getSci3ObjectsPointer(); +#endif /** * Initializes the script's objects (SCI0) @@ -311,12 +317,14 @@ private: */ void initializeObjectsSci11(SegManager *segMan, SegmentId segmentId); +#ifdef ENABLE_SCI32 /** * Initializes the script's objects (SCI3) * @param segMan A reference to the segment manager * @param segmentId The script's segment id */ void initializeObjectsSci3(SegManager *segMan, SegmentId segmentId); +#endif LocalVariables *allocLocalsSegment(SegManager *segMan); |