Skip to content

Commit b13604b

Browse files
authored
Merge branch 'development' into disable-hud
2 parents bd47b6c + 6ed5e0a commit b13604b

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

RTEA.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@
816816
<ClInclude Include="Source\Managers\ActivityMan.h" />
817817
<ClInclude Include="Source\Managers\AudioMan.h" />
818818
<ClInclude Include="Source\Managers\ConsoleMan.h" />
819-
<ClInclude Include="managers\FrameMan.h" />
819+
<ClInclude Include="Source\Managers\FrameMan.h" />
820820
<ClInclude Include="Source\Managers\LuaMan.h" />
821821
<ClInclude Include="Source\Managers\MetaMan.h" />
822822
<ClInclude Include="Source\Managers\MovableMan.h" />

RTEA.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@
674674
<ClCompile Include="Source\Managers\ConsoleMan.cpp">
675675
<Filter>Managers</Filter>
676676
</ClCompile>
677-
<ClCompile Include="managers\FrameMan.cpp">
677+
<ClCompile Include="Source\Managers\FrameMan.cpp">
678678
<Filter>Managers</Filter>
679679
</ClCompile>
680680
<ClCompile Include="Source\Managers\LuaMan.cpp">

Source/Managers/LuaMan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ namespace RTE {
11061106
g_ThreadMan.GetPriorityThreadPool().submit([luaState]() {
11071107
ZoneScopedN("Lua Garbage Collection");
11081108
std::lock_guard<std::recursive_mutex> lock(luaState->GetMutex());
1109-
lua_gc(luaState->GetLuaState(), LUA_GCSTEP, 30);
1109+
lua_gc(luaState->GetLuaState(), LUA_GCCOLLECT, 0); // we'd use GCSTEP but fuck lua it's trash
11101110
lua_gc(luaState->GetLuaState(), LUA_GCSTOP, 0);
11111111
})
11121112
);

0 commit comments

Comments
 (0)