Skip to content

Commit 2be4b68

Browse files
committed
Fixed clang among some unix errors
1 parent 41e97ea commit 2be4b68

1 file changed

Lines changed: 11 additions & 20 deletions

File tree

src/port/ui/ObjectViewer.cpp

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,12 @@
1919
std::unordered_map<uintptr_t, std::string> functionNameCache;
2020
extern "C" struct CameraFOVStatus sFOVState;
2121

22-
const char* ObjectListNames[] = {
23-
"Mario",
24-
"Unused 1",
25-
"Destructive",
26-
"Unused 3",
27-
"General Actor",
28-
"Pushable",
29-
"Level",
30-
"Unused 7",
31-
"Default",
32-
"Surface",
33-
"Pole-like",
34-
"Spawner",
35-
"Unimportant"
36-
};
22+
const char* ObjectListNames[] = { "Mario", "Unused 1", "Destructive", "Unused 3", "General Actor",
23+
"Pushable", "Level", "Unused 7", "Default", "Surface",
24+
"Pole-like", "Spawner", "Unimportant" };
3725

3826
void ObjectViewer::InitElement() {
39-
#ifndef __APPLE__
27+
#ifndef __unix__
4028
HANDLE hProcess = GetCurrentProcess();
4129
SymSetOptions(SYMOPT_NO_IMAGE_SEARCH | SYMOPT_IGNORE_IMAGEDIR);
4230
SymInitialize(hProcess, "debug", true);
@@ -48,7 +36,7 @@ const char* GetFunctionName(const uintptr_t addr) {
4836
return functionNameCache[addr].c_str();
4937
}
5038

51-
#ifndef __APPLE__
39+
#ifndef __unix__
5240
char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)];
5341
PSYMBOL_INFO pSymbol = reinterpret_cast<PSYMBOL_INFO>(buffer);
5442

@@ -232,7 +220,8 @@ void ObjectViewer::DrawElement() {
232220
ImGui::TableNextColumn();
233221
ImGui::TextDisabled("Custom/Rando");
234222
ImGui::TableNextColumn();
235-
ImGui::TextColored(obj->custom ? ImVec4(0.4f, 0.8f, 1.0f, 1.0f) : ImVec4(1.0f, 0.4f, 0.4f, 1.0f), "%s", obj->custom ? "Yes" : "No");
223+
ImGui::TextColored(obj->custom ? ImVec4(0.4f, 0.8f, 1.0f, 1.0f) : ImVec4(1.0f, 0.4f, 0.4f, 1.0f),
224+
"%s", obj->custom ? "Yes" : "No");
236225

237226
ImGui::TableNextRow();
238227
ImGui::TableNextColumn();
@@ -350,7 +339,8 @@ void ObjectViewer::DrawElement() {
350339
if (!listHasMatches)
351340
continue;
352341

353-
if (ImGui::TreeNode(reinterpret_cast<void*>(static_cast<intptr_t>(i)), "Object List [%s]", ObjectListNames[i])) {
342+
if (ImGui::TreeNode(reinterpret_cast<void*>(static_cast<intptr_t>(i)), "Object List [%s]",
343+
ObjectListNames[i])) {
354344
ObjectNode* node = list->next;
355345
int objIndex = 0;
356346

@@ -365,7 +355,8 @@ void ObjectViewer::DrawElement() {
365355

366356
ImGui::PushID(obj);
367357

368-
bool nodeOpen = ImGui::TreeNode(obj, "Object %02d [Model: %s (%d)]", objIndex++, modelIdName.at(obj->modelId), obj->modelId);
358+
bool nodeOpen = ImGui::TreeNode(obj, "Object %02d [Model: %s (%d)]", objIndex++,
359+
modelIdName.at(obj->modelId), obj->modelId);
369360
// OTRTODO: Implement this later
370361
// if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem)) {
371362
// obj->header.gfx.node.flags |= GRAPH_RENDER_DRAW_DEBUG;

0 commit comments

Comments
 (0)