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

fixes and such

This commit is contained in:
rjindael 2023-07-17 22:27:42 -07:00
parent fe784681fc
commit 4266b1f83f
No known key found for this signature in database
GPG Key ID: D069369C906CCF31
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) add_subdirectory(${DEPENDENCIES_DIR}/Luau ${CMAKE_BINARY_DIR}/Dependencies/Luau)
# RNR # RNR
add_link_options(-static)
add_subdirectory(Engine) add_subdirectory(Engine)
add_subdirectory(Client) add_subdirectory(Client)

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

@ -114,12 +114,12 @@ namespace RNR
char error_text[255]; char error_text[255];
if (this == newParent) 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); throw std::runtime_error(error_text);
} }
if (isAncestorOf(newParent)) 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); throw std::runtime_error(error_text);
} }