diff --git a/cmake/imgui.cmake b/cmake/imgui.cmake index cf434b89..825e9c86 100644 --- a/cmake/imgui.cmake +++ b/cmake/imgui.cmake @@ -27,7 +27,7 @@ set( ${IMGUI_PATH}/imgui_demo.cpp ${IMGUI_PATH}/imgui_draw.cpp ${IMGUI_PATH}/imgui_widgets.cpp - ${IMGUI_PATH}/backends/imgui_impl_sdl.cpp + ${IMGUI_PATH}/backends/imgui_impl_sdl2.cpp ${IMGUI_PATH}/backends/imgui_impl_sdlrenderer.cpp ${IMGUI_PATH}/misc/cpp/imgui_stdlib.cpp ${IMGUI_FILE_DLG_PATH}/ImGuiFileDialog.cpp diff --git a/src/app/core/controller.cc b/src/app/core/controller.cc index 65b66100..e5f3da2e 100644 --- a/src/app/core/controller.cc +++ b/src/app/core/controller.cc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/app/core/controller.h b/src/app/core/controller.h index d3bb255b..b3dec147 100644 --- a/src/app/core/controller.h +++ b/src/app/core/controller.h @@ -2,7 +2,7 @@ #define YAZE_APP_CORE_CONTROLLER_H #include -#include +#include #include #include #include diff --git a/src/app/zelda3/dungeon/room.cc b/src/app/zelda3/dungeon/room.cc index 72c47f67..fb738897 100644 --- a/src/app/zelda3/dungeon/room.cc +++ b/src/app/zelda3/dungeon/room.cc @@ -20,6 +20,8 @@ void Room::LoadTorches() {} void Room::LoadSecrets() {} +void Room::Resync() {} + void Room::LoadObjectsFromArray(int loc) {} void Room::LoadSpritesFromArray(int loc) {} diff --git a/src/lib/ImGuiFileDialog b/src/lib/ImGuiFileDialog index af4800e8..2917cd9e 160000 --- a/src/lib/ImGuiFileDialog +++ b/src/lib/ImGuiFileDialog @@ -1 +1 @@ -Subproject commit af4800e85a79154c8c08cf28d4cfee82bdc0cd03 +Subproject commit 2917cd9ec120bce7b4297e7f3afb660071707e05 diff --git a/src/lib/imgui b/src/lib/imgui index e57871bb..f65bcf48 160000 --- a/src/lib/imgui +++ b/src/lib/imgui @@ -1 +1 @@ -Subproject commit e57871bb95faec757e51214bc0e1ae29b13258ab +Subproject commit f65bcf481ab34cd07d3909aab1479f409fa79f2f