Placeholder
/
rnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'trunk' of github.com:lrre-foss/rnr into trunk

This commit is contained in:
floralrainfall 2023-07-18 01:36:19 -04:00
parent eda5b0aa22 56eaaed9d7
commit 020114f089
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/CMakeLists.txt
View File

@ -5,5 +5,7 @@ set(LUAU_BUILD_TESTS OFF CACHE BOOL "" FORCE)
add_subdirectory(${DEPENDENCIES_DIR}/Luau ${CMAKE_BINARY_DIR}/Dependencies/Luau)
# RNR
add_link_options(-static)
add_subdirectory(Engine)
add_subdirectory(Client)

4
Projects/Engine/Source/App/V8/Tree/Instance.cpp
View File

@ -114,12 +114,12 @@ namespace RNR
char error_text[255];
if (this == newParent)
{
snprintf(error_text, 255, "Attempt to set %s as its own parent", m_name);
snprintf(error_text, 255, "Attempt to set %s as its own parent", m_name.c_str());
throw std::runtime_error(error_text);
}
if (isAncestorOf(newParent))
{
snprintf(error_text, 255, "Attempt to set parent of %s to %s results in circular reference", newParent->getName(), m_name);
snprintf(error_text, 255, "Attempt to set parent of %s to %s results in circular reference", newParent->getName().c_str(), m_name.c_str());
throw std::runtime_error(error_text);
}