Remove code duplication, leverage ContentInfo.

This commit is contained in:
King_DuckZ 2020-03-20 16:48:54 +01:00
parent a190a76b5d
commit 30ef4cd49d

View file

@ -136,9 +136,8 @@ std::vector<uint8_t> BasicBlock<Const>::icon_palette() const {
template <bool Const>
bool BasicBlock<Const>::has_magic() const {
const constexpr uint16_t magic = ('S' << 8) | 'C'; //0x5343 "SC"
const data_type* const ptr = frame(0).data();
return magic == static_cast<uint16_t>((ptr[0] << 8) | ptr[1]);
ContentInfo cinfo(frame(0));
return cinfo.magic == cinfo.SCMagic;
}
template <bool Const>