drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

[nostalgia/core] Fix incorrect bit_cast uses

Browse Source
This commit is contained in:
Gary Talent
2021-11-02 00:41:31 -05:00
parent 9fd14b0744
commit e91d2653a3
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/core/gba/gfx.cpp
+2 -2
View File
@@ -177,7 +177,7 @@ ox::Error loadBgTileSheet(Context *ctx,
GbaTileMapTarget target;
target.pal.palette = &MEM_BG_PALETTE[section];
target.bgCtl = &bgCtl(section);
target.tileMap = &ox::bit_cast<uint16_t*>(MEM_BG_TILES)[section * 512];
target.tileMap = &reinterpret_cast<uint16_t*>(MEM_BG_TILES)[section * 512];
oxReturnError(ox::readMC(ts, tsStat.size, &target));
// load external palette if available
if (paletteAddr) {
@@ -198,7 +198,7 @@ ox::Error loadSpriteTileSheet(Context *ctx,
target.pal.palette = &MEM_SPRITE_PALETTE[section];
// Is this needed? Should this be written to an equivalent sprite value?
// target.bgCtl = &bgCtl(section);
target.tileMap = &ox::bit_cast<uint16_t*>(MEM_SPRITE_TILES)[section * 512];
target.tileMap = &reinterpret_cast<uint16_t*>(MEM_SPRITE_TILES)[section * 512];
oxReturnError(ox::readMC(ts, tsStat.size, &target));
// load external palette if available
if (paletteAddr) {