mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 22:39:42 +00:00
Code Issues 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 }, { "Closing", MWWorld::DoorState::Closing },
})); }));
door["getDoorState"] = [](const Object& o) -> MWWorld::DoorState { door["getDoorState"] = [](const Object& o) -> MWWorld::DoorState {
auto door = doorPtr(o); const MWWorld::Ptr& door = doorPtr(o);
return door.getClass().getDoorState(door); return door.getClass().getDoorState(door);
}; };
door["isOpen"] = [](const Object& o) { 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 doorIsIdle = door.getClass().getDoorState(door) == MWWorld::DoorState::Idle;
bool doorIsOpen = door.getRefData().getPosition().rot[2] != door.getCellRef().getPosition().rot[2]; bool doorIsOpen = door.getRefData().getPosition().rot[2] != door.getCellRef().getPosition().rot[2];
return doorIsIdle && doorIsOpen; return doorIsIdle && doorIsOpen;
}; };
door["isClosed"] = [](const Object& o) { 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 doorIsIdle = door.getClass().getDoorState(door) == MWWorld::DoorState::Idle;
bool doorIsOpen = door.getRefData().getPosition().rot[2] != door.getCellRef().getPosition().rot[2]; bool doorIsOpen = door.getRefData().getPosition().rot[2] != door.getCellRef().getPosition().rot[2];
@ -70,7 +70,7 @@ namespace MWLua
if (!allowChanges) if (!allowChanges)
throw std::runtime_error("Can only be used in global scripts or in local scripts on self."); 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(); auto world = MWBase::Environment::get().getWorld();
if (!openState.has_value()) if (!openState.has_value())