Skip to content

editor: Make interior world models removable #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dutchman101 merged 2 commits into from
Sep 25, 2021
Merged

editor: Make interior world models removable #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2776d9
Save interior to element data
Zangomangu Aug 23, 2021
3438b5a
Use -1 for removing models outside interiors
Zangomangu Sep 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions [editor]/edf/edf.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,7 @@ function edfCreateElement(elementType, creatorClient, fromResource, parametersTa
edfSetElementRotation(newElement, dataValue[1], dataValue[2], dataValue[3])
elseif dataField == "interior" then
setElementInterior(newElement, dataValue)
setElementData(newElement, dataField, dataValue)
elseif dataField == "dimension" then
setElementDimension(newElement, dataValue)
elseif dataField == "alpha" then
Expand Down
3 changes: 3 additions & 0 deletions [editor]/editor_main/client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,6 +1347,9 @@ function handleWorldBuildingMode(keyState)
creationParameters.radius = radius
creationParameters.position = { g_worldBuildingInfo.x, g_worldBuildingInfo.y, g_worldBuildingInfo.z }
creationParameters.interior = g_workingInterior
if creationParameters.interior == 0 then
creationParameters.interior = -1
end
triggerServerEvent ( "doCreateElement", localPlayer, "removeWorldObject", "editor_main", creationParameters, false )
else
creationParameters = {}
Expand Down