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

Squashed 'deps/nostalgia/' changes from 050339ba..e7a66390

Browse Source 
e7a66390 [nostalgia/core/opengl] Fix duplicate and missing symbol
ffdc0ddb [nostalgia/core] Add support for specifying palette banks
e941781f [ox/std] Cleanup Result::copyTo variants
b869f490 [ox/std] Add or_value to Optional, Result
caf8d93c [nostalgia] Delete .gitlab-ci.yml
afbf2caf [nostalgia] Remove conan from devenv
20914eaa [nostalgia] Add Gitea action file
c5f76ff5 [nostalgia/core] Add setBgBpp function

git-subtree-dir: deps/nostalgia
git-subtree-split: e7a663901a4db72b647263c9de2ec4a45dd2e5e5
This commit is contained in:
Gary Talent
2023-12-26 12:15:45 -06:00
parent b7278c3d04
commit cf0d078a1e
13 changed files with 168 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/modules/scene/src/scene.cpp
View File

@@ -18,7 +18,7 @@ ox::Error Scene::setupDisplay(core::Context &ctx) const noexcept {
}
auto const&palette = m_sceneStatic.palettes[0];
oxReturnError(core::loadBgTileSheet(ctx, 0, m_sceneStatic.tilesheet));
oxReturnError(core::loadBgPalette(ctx, palette));
oxReturnError(core::loadBgPalette(ctx, 0, palette));
// disable all backgrounds
core::setBgStatus(ctx, 0);
for (auto layerNo = 0u; auto const&layer : m_sceneStatic.tileMapIdx) {