thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Fix compilation when SCI32 is disabled

Browse source
This commit is contained in:
Filippos Karapetis 2020-01-19 23:01:20 +02:00
parent 7aa824372e
commit d89c355fee
2 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/util.cpp
View file

@ -67,13 +67,11 @@ void WRITE_SCI11ENDIAN_UINT16(void *ptr, uint16 val) {
WRITE_LE_UINT16(ptr, val); WRITE_LE_UINT16(ptr, val);
} }
#ifdef ENABLE_SCI32
void WRITE_SCI11ENDIAN_UINT32(void *ptr, uint32 val) { void WRITE_SCI11ENDIAN_UINT32(void *ptr, uint32 val) {
if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_1_1) if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_1_1)
WRITE_BE_UINT32(ptr, val); WRITE_BE_UINT32(ptr, val);
else else
WRITE_LE_UINT32(ptr, val); WRITE_LE_UINT32(ptr, val);
} }
#endif
} // End of namespace Sci } // End of namespace Sci

4
engines/sci/util.h
View file

@ -43,9 +43,7 @@ void WRITE_SCIENDIAN_UINT16(void *ptr, uint16 val);
uint16 READ_SCI11ENDIAN_UINT16(const void *ptr); uint16 READ_SCI11ENDIAN_UINT16(const void *ptr);
uint32 READ_SCI11ENDIAN_UINT32(const void *ptr); uint32 READ_SCI11ENDIAN_UINT32(const void *ptr);
void WRITE_SCI11ENDIAN_UINT16(void *ptr, uint16 val); void WRITE_SCI11ENDIAN_UINT16(void *ptr, uint16 val);
#ifdef ENABLE_SCI32
void WRITE_SCI11ENDIAN_UINT32(void *ptr, uint32 val); void WRITE_SCI11ENDIAN_UINT32(void *ptr, uint32 val);
#endif
// Wrappers for reading integer values in resources that are // Wrappers for reading integer values in resources that are
// LE in SCI1.1 Mac, but BE in SCI32 Mac // LE in SCI1.1 Mac, but BE in SCI32 Mac
uint16 READ_SCI32ENDIAN_UINT16(const void *ptr); uint16 READ_SCI32ENDIAN_UINT16(const void *ptr);
@ -203,12 +201,10 @@ public:
WRITE_SCI11ENDIAN_UINT16(this->data() + index, value); WRITE_SCI11ENDIAN_UINT16(this->data() + index, value);
} }
#ifdef ENABLE_SCI32
inline void setUint32SEAt(const size_type index, uint32 value) { inline void setUint32SEAt(const size_type index, uint32 value) {
this->validate(index, sizeof(uint32), Common::kValidateWrite); this->validate(index, sizeof(uint32), Common::kValidateWrite);
WRITE_SCI11ENDIAN_UINT32(this->data() + index, value); WRITE_SCI11ENDIAN_UINT32(this->data() + index, value);
} }
#endif
#pragma mark - #pragma mark -
#pragma mark SciSpanImpl - ForwardIterator #pragma mark SciSpanImpl - ForwardIterator