AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use PRI defines for format strings (fixes macOS build)

This commit is contained in:
Luke Street 2021-06-01 10:34:34 -04:00
parent 13350ca3d9
commit 02ed24a7f1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/ImGuiEntitySupport.cpp
View File

@ -214,12 +214,13 @@ static constexpr bool ImGuiEnumInput(const char* label, E& val) {
void ImGuiAnimRes(const char* label, metaforce::CAnimRes& res) { void ImGuiAnimRes(const char* label, metaforce::CAnimRes& res) {
if (res.GetId().IsValid()) { if (res.GetId().IsValid()) {
ImGui::Text("Model: 0x%08lX", res.GetId().Value()); ImGui::Text("Model: 0x%08" PRIX64, res.GetId().Value());
} else { } else {
ImGui::Text("Model: [none]"); ImGui::Text("Model: [none]");
} }
// TODO: More // TODO: More
} }
namespace metaforce { namespace metaforce {
void CDamageVulnerability::ImGuiEditWindow(const char* title, bool& open) { void CDamageVulnerability::ImGuiEditWindow(const char* title, bool& open) {
if (!open) { if (!open) {
@ -253,10 +254,11 @@ void CDamageVulnerability::ImGuiEditWindow(const char* title, bool& open) {
} }
ImGui::End(); ImGui::End();
} }
void ImGuiUniqueId(const char* label, TUniqueId uid) { void ImGuiUniqueId(const char* label, TUniqueId uid) {
ImGui::PushID(uid.Value()); ImGui::PushID(uid.Value());
if (uid != kInvalidUniqueId && ImGuiConsole::entities[uid.Value()].ent != nullptr) { if (uid != kInvalidUniqueId && ImGuiConsole::entities[uid.Value()].ent != nullptr) {
ImGui::Text("%s: 0x%04X", label, uid.Value()); ImGui::Text("%s: 0x%04" PRIX16, label, uid.Value());
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::SmallButton("View")) { if (ImGui::SmallButton("View")) {
ImGuiConsole::inspectingEntities.insert(uid); ImGuiConsole::inspectingEntities.insert(uid);
@ -355,8 +357,8 @@ void CEntity::ImGuiInspect() {
} }
} }
if (ImGui::CollapsingHeader("Entity", ImGuiTreeNodeFlags_DefaultOpen)) { if (ImGui::CollapsingHeader("Entity", ImGuiTreeNodeFlags_DefaultOpen)) {
ImGui::Text("ID: 0x%04X", x8_uid.Value()); ImGui::Text("ID: 0x%04" PRIX16, x8_uid.Value());
ImGui::Text("Editor ID: 0x%08X", xc_editorId.id); ImGui::Text("Editor ID: 0x%08" PRIX32, xc_editorId.id);
ImGui::Text("Area: %i", x4_areaId); ImGui::Text("Area: %i", x4_areaId);
ImGui::Text("Name: %s", x10_name.c_str()); ImGui::Text("Name: %s", x10_name.c_str());
BITFIELD_CHECKBOX("Active", x30_24_active); BITFIELD_CHECKBOX("Active", x30_24_active);