Merge remote-tracking branch 'upstream/master'

This commit is contained in:
dP
2025-06-14 17:01:17 +05:00
1132 changed files with 59429 additions and 52888 deletions
+7 -8
View File
@@ -84,9 +84,9 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z
width -= pixels;
switch (mode) {
case CM_BM_TINT_REMAP:
case BM_COLOUR_REMAP:
case BM_CRASH_REMAP: {
case BlitterMode::ColourRemap:
case BlitterMode::CMTintRemap:
case BlitterMode::CrashRemap: {
const uint8_t *remap = bp->remap;
do {
uint m = remap[*src];
@@ -96,13 +96,13 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z
break;
}
case BM_BLACK_REMAP:
case BlitterMode::BlackRemap:
MemSetT(dst, 0, pixels);
dst += pixels;
break;
case BM_TRANSPARENT:
case BM_TRANSPARENT_REMAP: {
case BlitterMode::Transparent:
case BlitterMode::TransparentRemap: {
const uint8_t *remap = bp->remap;
src += pixels;
do {
@@ -149,8 +149,7 @@ Sprite *Blitter_8bppOptimized::Encode(const SpriteLoader::SpriteCollection &spri
* memory around as this function is called quite often
* and the memory usage is quite low. */
static ReusableBuffer<uint8_t> temp_buffer;
SpriteData *temp_dst = (SpriteData *)temp_buffer.Allocate(memory);
memset(temp_dst, 0, sizeof(*temp_dst));
SpriteData *temp_dst = reinterpret_cast<SpriteData *>(temp_buffer.ZeroAllocate(memory));
uint8_t *dst = temp_dst->data;
/* Make the sprites per zoom-level */