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

[nostalgia/core/userland] Remove unnecessary copies

Browse Source
This commit is contained in:
Gary Talent 2021-03-24 22:40:33 -05:00
parent b825e88d29
commit 4ce18766cd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nostalgia/core/userland/gfx.cpp
View File

@ -18,7 +18,7 @@ static ox::Result<ox::Vector<char>> readFile(Context *ctx, const ox::FileAddress
oxRequire(stat, ctx->rom->stat(file)); oxRequire(stat, ctx->rom->stat(file));
ox::Vector<char> buff(stat.size); ox::Vector<char> buff(stat.size);
oxReturnError(ctx->rom->read(file, buff.data(), buff.size())); oxReturnError(ctx->rom->read(file, buff.data(), buff.size()));
return buff; return ox::move(buff);
} }
template<typename T> template<typename T>
@ -26,13 +26,14 @@ ox::Result<T> readObj(Context *ctx, const ox::FileAddress &file) {
oxRequire(buff, readFile(ctx, file)); oxRequire(buff, readFile(ctx, file));
T t; T t;
oxReturnError(ox::readClaw(buff.data(), buff.size(), &t)); oxReturnError(ox::readClaw(buff.data(), buff.size(), &t));
return t; return ox::move(t);
} }
ox::Error initConsole(Context *ctx) { ox::Error initConsole(Context *ctx) {
constexpr auto TilesheetAddr = "/TileSheets/Charset.ng"; constexpr auto TilesheetAddr = "/TileSheets/Charset.ng";
constexpr auto PaletteAddr = "/Palettes/Charset.npal";
setBgStatus(ctx, 0b0001); setBgStatus(ctx, 0b0001);
return loadBgTileSheet(ctx, 0, TilesheetAddr); return loadBgTileSheet(ctx, 0, TilesheetAddr, PaletteAddr);
} }
ox::Error loadSpriteTileSheet(Context*, ox::Error loadSpriteTileSheet(Context*,