From d9b9289dc025d950049008f83c9b8b7c115a94dd Mon Sep 17 00:00:00 2001 From: xrSimpodin <16670637+xrSimpodin@users.noreply.github.com> Date: Fri, 10 Mar 2023 13:08:00 +0300 Subject: [PATCH 1/3] revert 56bc46a [skip ci] --- ogsr_engine/xrGame/ui/UIInventoryUtilities.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/ogsr_engine/xrGame/ui/UIInventoryUtilities.cpp b/ogsr_engine/xrGame/ui/UIInventoryUtilities.cpp index 2e7c12c0a..bb0929690 100644 --- a/ogsr_engine/xrGame/ui/UIInventoryUtilities.cpp +++ b/ogsr_engine/xrGame/ui/UIInventoryUtilities.cpp @@ -156,7 +156,6 @@ bool InventoryUtilities::FreeRoom_inBelt(TIItemContainer& item_list, PIItem _ite } } } -/* //разместить элемент на найденном месте if (found_place) { @@ -168,7 +167,6 @@ bool InventoryUtilities::FreeRoom_inBelt(TIItemContainer& item_list, PIItem _ite } } } -*/ } // remove item_list.erase(std::remove(item_list.begin(), item_list.end(), _item), item_list.end()); From c56f935929b69a30e33456e8908872cf53945efa Mon Sep 17 00:00:00 2001 From: xrSimpodin <16670637+xrSimpodin@users.noreply.github.com> Date: Fri, 10 Mar 2023 13:12:57 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=20=D1=81=D0=BE=D0=B2=D0=B5=D1=82=D1=83=20?= =?UTF-8?q?@Graff46?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] --- ogsr_engine/xrGame/CarLights.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ogsr_engine/xrGame/CarLights.cpp b/ogsr_engine/xrGame/CarLights.cpp index c5da86b55..e984efabd 100644 --- a/ogsr_engine/xrGame/CarLights.cpp +++ b/ogsr_engine/xrGame/CarLights.cpp @@ -192,17 +192,24 @@ bool CCarLights::IsLight(u16 bone_id) } bool CCarLights::findLight(u16 bone_id, SCarLight*& light) { - LIGHTS_I i, e = m_lights.end(); SCarLight find_light; find_light.bone_id = bone_id; - i = std::find_if(m_lights.begin(), e, SFindLightPredicate(&find_light)); - light = *i; - return i != e; //-V783 + + auto e = m_lights.end(); + auto i = std::find_if(m_lights.begin(), e, SFindLightPredicate(&find_light)); + if (i != e) + { + light = *i; + return true; + } + else + return false; } + CCarLights::~CCarLights() { LIGHTS_I i = m_lights.begin(), e = m_lights.end(); for (; i != e; ++i) xr_delete(*i); m_lights.clear(); -} \ No newline at end of file +} From f99d9df66997d3b3b56c39a92dc2d844595d2790 Mon Sep 17 00:00:00 2001 From: Graff46 Date: Mon, 5 Jun 2023 16:29:22 +0300 Subject: [PATCH 3/3] Registration class `FS_Path` for Lua MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Некоторые методы экспортированные из `CLocatorAPI` в Lua (например `.def("get_path", &CLocatorAPI::get_path)`, метод `get_path`) возвращают экземпляры `FS_Path`, но Lua "не понимает" этот тип и бросает ошибку. Я вернул регистрацию `FS_Path` для Lua, но без методов. --- ogsr_engine/xrGame/fs_registrator_script.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ogsr_engine/xrGame/fs_registrator_script.cpp b/ogsr_engine/xrGame/fs_registrator_script.cpp index 246e452ed..e3bd1a980 100644 --- a/ogsr_engine/xrGame/fs_registrator_script.cpp +++ b/ogsr_engine/xrGame/fs_registrator_script.cpp @@ -279,8 +279,8 @@ void fs_registrator::script_register(lua_State* L) class_("FS_file_list").def("Size", &FS_file_list::Size).def("GetAt", &FS_file_list::GetAt).def("Free", &FS_file_list::Free), - /* class_("FS_Path") - .def_readonly("m_Path", &FS_Path::m_Path) + class_("FS_Path"), + /* .def_readonly("m_Path", &FS_Path::m_Path) .def_readonly("m_Root", &FS_Path::m_Root) .def_readonly("m_Add", &FS_Path::m_Add) .def_readonly("m_DefExt", &FS_Path::m_DefExt)