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

[keel,nostalgia,studio] Fix implicit conversions

Browse Source
This commit is contained in:
Gary Talent
2023-06-07 00:41:31 -05:00
parent 3fdfee33a9
commit aa19cdf535
18 changed files with 162 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nostalgia/core/studio/tilesheeteditor-imgui.cpp
View File

@@ -35,7 +35,7 @@ ox::Error toPngFile(const ox::String &path, const TileSheet::SubSheet &s, const
++idx;
}
constexpr auto fmt = alpha ? LCT_RGBA : LCT_RGB;
return OxError(lodepng_encode_file(path.c_str(), outData.data(), width, height, fmt, 8));
return OxError(static_cast<ox::ErrorCode>(lodepng_encode_file(path.c_str(), outData.data(), width, height, fmt, 8)));
}
TileSheetEditorImGui::TileSheetEditorImGui(turbine::Context *ctx, ox::CRStringView path): m_tileSheetEditor(ctx, path) {
@@ -361,8 +361,8 @@ void TileSheetEditorImGui::drawPaletteSelector() noexcept {
}
// header
if (ImGui::BeginTable("PaletteTable", 3, ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingStretchProp)) {
ImGui::TableSetupColumn("No.", 0, 0.45);
ImGui::TableSetupColumn("", 0, 0.22);
ImGui::TableSetupColumn("No.", 0, 0.45f);
ImGui::TableSetupColumn("", 0, 0.22f);
ImGui::TableSetupColumn("Color16", 0, 3);
ImGui::TableHeadersRow();
if (auto pal = m_tileSheetEditor.pal()) {