King_DuckZ/memoserv
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename palette() to icon_palette().

Browse source
This commit is contained in:
King_DuckZ 2020-03-20 14:59:27 +01:00
parent c5987d882d
commit 1bca8f0201
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/memcard/include/memcard/block.hpp
View file

@ -41,7 +41,7 @@ public:
static constexpr std::size_t size() { return FrameSize * 64; }
std::vector<uint8_t> palette() const;
std::vector<uint8_t> icon_palette() const;
bool has_magic() const;
IconDisplayFlag icon_display_flag() const;
int block_count() const;

2
subprojects/memcard/src/block.cpp
View file

@ -97,7 +97,7 @@ auto BasicBlock<Const>::frame(unsigned int idx) const -> const data_type* {
}
template <bool Const>
std::vector<uint8_t> BasicBlock<Const>::palette() const {
std::vector<uint8_t> BasicBlock<Const>::icon_palette() const {
const auto ptr = frame(0);
return extract_palette(ptr, ptr + FrameSize);
}

2
subprojects/memcard/src/icon_fetch.cpp
View file

@ -119,7 +119,7 @@ namespace {
std::vector<std::vector<char>> icon_fetch (const psx::ConstBlock& block, int width, int height) {
const constexpr int in_height = 16, in_width = 16;
const bool scale = (in_width != width or in_height != height);
const std::vector<uint8_t> palette = block.palette();
const std::vector<uint8_t> palette = block.icon_palette();
assert(palette.size() == 16 * 4);
const int32_t palette_padded_size = (not scale) * (((palette.size() * CHAR_BIT + 31) bitand ~31) / CHAR_BIT);
assert(palette.size() == static_cast<std::size_t>(palette_padded_size) or scale);