drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions 1 Releases 9 Activity

[nostalgia/core/gba] Fix strong Error issues

Browse Source
This commit is contained in:
Gary Talent 2019-07-31 00:07:23 -05:00
parent 6138d0a37e
commit 2fb1c7e401
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nostalgia/core/gba/gfx.cpp
View File

@ -166,13 +166,13 @@ ox::Error initGfx(Context*) {
/* |||| */
REG_DISPCNT = 0x1100;
return 0;
return OxError(0);
}
// Do NOT use Context in the GBA version of this function.
ox::Error initConsole(Context*) {
const auto PaletteStart = sizeof(GbaImageDataHeader);
ox::Error err = 0;
ox::Error err(0);
ox::FileStore32 fs(loadRom(), 32 * ox::units::MB);
ox::FileSystem32 fileSystem(fs);
const auto CharsetInode = fileSystem.stat("/TileSheets/Charset.ng").value.inode;
@ -196,16 +196,16 @@ ox::Error initConsole(Context*) {
err |= fs.read(CharsetInode, __builtin_offsetof(GbaImageData, tiles),
sizeof(Tile8) * imgData.tileCount, (uint16_t*) &TILE8_ADDR[0][1], nullptr);
} else {
err = 1;
err = OxError(1);
}
} else {
err = 1;
err = OxError(1);
}
return err;
}
ox::Error loadTileSheet(Context*, InodeId_t inode) {
ox::Error err = 0;
ox::Error err(0);
const auto PaletteStart = sizeof(GbaImageDataHeader);
GbaImageDataHeader imgData;
@ -227,10 +227,10 @@ ox::Error loadTileSheet(Context*, InodeId_t inode) {
err |= fs.read(inode, __builtin_offsetof(GbaImageData, tiles),
sizeof(Tile8) * imgData.tileCount, (uint16_t*) &TILE8_ADDR[0][1], nullptr);
} else {
err = 1;
err = OxError(1);
}
} else {
err = 1;
err = OxError(1);
}
return err;
}