From d89c355feecbb53abb13a05f0893a75f4915f289 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 19 Jan 2020 23:01:20 +0200 Subject: [PATCH] SCI: Fix compilation when SCI32 is disabled --- engines/sci/util.cpp | 2 -- engines/sci/util.h | 4 ---- 2 files changed, 6 deletions(-) diff --git a/engines/sci/util.cpp b/engines/sci/util.cpp index 095c46281ad..24770f6fa28 100644 --- a/engines/sci/util.cpp +++ b/engines/sci/util.cpp @@ -67,13 +67,11 @@ void WRITE_SCI11ENDIAN_UINT16(void *ptr, uint16 val) { WRITE_LE_UINT16(ptr, val); } -#ifdef ENABLE_SCI32 void WRITE_SCI11ENDIAN_UINT32(void *ptr, uint32 val) { if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_1_1) WRITE_BE_UINT32(ptr, val); else WRITE_LE_UINT32(ptr, val); } -#endif } // End of namespace Sci diff --git a/engines/sci/util.h b/engines/sci/util.h index edaa0ca476b..082915f6782 100644 --- a/engines/sci/util.h +++ b/engines/sci/util.h @@ -43,9 +43,7 @@ void WRITE_SCIENDIAN_UINT16(void *ptr, uint16 val); uint16 READ_SCI11ENDIAN_UINT16(const void *ptr); uint32 READ_SCI11ENDIAN_UINT32(const void *ptr); void WRITE_SCI11ENDIAN_UINT16(void *ptr, uint16 val); -#ifdef ENABLE_SCI32 void WRITE_SCI11ENDIAN_UINT32(void *ptr, uint32 val); -#endif // Wrappers for reading integer values in resources that are // LE in SCI1.1 Mac, but BE in SCI32 Mac uint16 READ_SCI32ENDIAN_UINT16(const void *ptr); @@ -203,12 +201,10 @@ public: WRITE_SCI11ENDIAN_UINT16(this->data() + index, value); } -#ifdef ENABLE_SCI32 inline void setUint32SEAt(const size_type index, uint32 value) { this->validate(index, sizeof(uint32), Common::kValidateWrite); WRITE_SCI11ENDIAN_UINT32(this->data() + index, value); } -#endif #pragma mark - #pragma mark SciSpanImpl - ForwardIterator