mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-24 00:39:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'door_copies' into 'master'

Browse Source 
Do not make redundant copies

See merge request OpenMW/openmw!4347
This commit is contained in:
jvoisin 2024-09-01 21:26:18 +00:00
commit ba18b811f0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openmw/mwlua/types/door.cpp
View File

@ -47,18 +47,18 @@ namespace MWLua
{ "Closing", MWWorld::DoorState::Closing },
}));
door["getDoorState"] = [](const Object& o) -> MWWorld::DoorState {
auto door = doorPtr(o);
const MWWorld::Ptr& door = doorPtr(o);
return door.getClass().getDoorState(door);
};
door["isOpen"] = [](const Object& o) {
auto door = doorPtr(o);
const MWWorld::Ptr& door = doorPtr(o);
bool doorIsIdle = door.getClass().getDoorState(door) == MWWorld::DoorState::Idle;
bool doorIsOpen = door.getRefData().getPosition().rot[2] != door.getCellRef().getPosition().rot[2];
return doorIsIdle && doorIsOpen;
};
door["isClosed"] = [](const Object& o) {
auto door = doorPtr(o);
const MWWorld::Ptr& door = doorPtr(o);
bool doorIsIdle = door.getClass().getDoorState(door) == MWWorld::DoorState::Idle;
bool doorIsOpen = door.getRefData().getPosition().rot[2] != door.getCellRef().getPosition().rot[2];
@ -70,7 +70,7 @@ namespace MWLua
if (!allowChanges)
throw std::runtime_error("Can only be used in global scripts or in local scripts on self.");
auto door = doorPtr(o);
const MWWorld::Ptr& door = doorPtr(o);
auto world = MWBase::Environment::get().getWorld();
if (!openState.has_value())