diff --git a/src/nostalgia/modules/core/src/gba/gfx.cpp b/src/nostalgia/modules/core/src/gba/gfx.cpp index bf791570..fd3ed4ce 100644 --- a/src/nostalgia/modules/core/src/gba/gfx.cpp +++ b/src/nostalgia/modules/core/src/gba/gfx.cpp @@ -190,8 +190,8 @@ ox::Error loadSpritePalette(Context &ctx, unsigned cbb, ox::FileAddress const&pa } ox::Error initConsole(Context &ctx) noexcept { - constexpr ox::FileAddress TilesheetAddr("/TileSheets/Charset.ng"); - constexpr ox::FileAddress PaletteAddr("/Palettes/Charset.npal"); + constexpr ox::FileAddress TilesheetAddr = ox::StringLiteral("/TileSheets/Charset.ng"); + constexpr ox::FileAddress PaletteAddr = ox::StringLiteral("/Palettes/Charset.npal"); setBgStatus(ctx, 0b0001); oxReturnError(loadBgTileSheet(ctx, 0, TilesheetAddr, PaletteAddr)); setBgCbb(ctx, 0, 0); diff --git a/src/nostalgia/modules/core/src/opengl/gfx.cpp b/src/nostalgia/modules/core/src/opengl/gfx.cpp index 1698e049..5984c784 100644 --- a/src/nostalgia/modules/core/src/opengl/gfx.cpp +++ b/src/nostalgia/modules/core/src/opengl/gfx.cpp @@ -377,9 +377,9 @@ ox::Error initGfx( const auto spriteVshad = ox::sfmt(renderer::spritevshadTmpl, glutils::GlslVersion); const auto spriteFshad = ox::sfmt(renderer::spritefshadTmpl, glutils::GlslVersion); auto &gctx = glctx(ctx); - oxReturnError(glutils::buildShaderProgram(bgVshad.c_str(), bgFshad.c_str()).moveTo(&gctx.bgShader)); + oxReturnError(glutils::buildShaderProgram(bgVshad, bgFshad).moveTo(&gctx.bgShader)); oxReturnError( - glutils::buildShaderProgram(spriteVshad.c_str(), spriteFshad.c_str()).moveTo(&gctx.spriteShader)); + glutils::buildShaderProgram(spriteVshad, spriteFshad).moveTo(&gctx.spriteShader)); for (auto &bg : gctx.cbbs) { initBackgroundBufferset(gctx.bgShader, bg); } @@ -465,8 +465,8 @@ ox::Error loadSpriteTileSheet( } ox::Error initConsole(Context &ctx) noexcept { - constexpr ox::FileAddress TilesheetAddr("/TileSheets/Charset.ng"); - constexpr ox::FileAddress PaletteAddr("/Palettes/Charset.npal"); + constexpr ox::FileAddress TilesheetAddr = ox::StringLiteral("/TileSheets/Charset.ng"); + constexpr ox::FileAddress PaletteAddr = ox::StringLiteral("/Palettes/Charset.npal"); setBgStatus(ctx, 0b0001); setBgCbb(ctx, 0, 0); return loadBgTileSheet(ctx, 0, TilesheetAddr, PaletteAddr); @@ -528,8 +528,8 @@ void hideSprite(Context &ctx, uint_t idx) noexcept { auto &gctx = glctx(ctx); auto vbo = &gctx.spriteBlocks.vertices[idx * renderer::SpriteVertexVboLength]; auto ebo = &gctx.spriteBlocks.elements[idx * renderer::SpriteVertexEboLength]; - renderer::setSpriteBufferObject(idx * renderer::SpriteVertexVboRows, 0, - 0, 0, 0, false, vbo, ebo); + renderer::setSpriteBufferObject( + idx * renderer::SpriteVertexVboRows, 0, 0, 0, 0, false, vbo, ebo); gctx.spriteBlocks.updated = true; } diff --git a/src/nostalgia/player/app.cpp b/src/nostalgia/player/app.cpp index 6239c3c7..ae91fa89 100644 --- a/src/nostalgia/player/app.cpp +++ b/src/nostalgia/player/app.cpp @@ -35,7 +35,7 @@ static void keyEventHandler(turbine::Context &tctx, turbine::Key key, bool down) ox::Error run(ox::UniquePtr &&fs) noexcept { oxRequireM(tctx, turbine::init(std::move(fs), "Nostalgia")); oxRequireM(cctx, core::init(*tctx)); - constexpr ox::FileAddress SceneAddr("/Scenes/Chester.nscn"); + constexpr ox::FileAddress SceneAddr = ox::StringLiteral("/Scenes/Chester.nscn"); oxRequire(scn, keel::readObj(tctx->keelCtx, SceneAddr)); turbine::setUpdateHandler(*tctx, updateHandler); turbine::setKeyEventHandler(*tctx, keyEventHandler);