Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 03:37:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Zone overriding Client.

Browse source
This commit is contained in:
Matti Lahtinen 2017-06-18 13:14:01 +03:00 committed by GitHub
parent 112f186304
commit 600a39c9b2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -590,7 +590,7 @@ void MyAvatar::simulate(float deltaTime) {
auto entityTreeRenderer = qApp->getEntities(); auto entityTreeRenderer = qApp->getEntities();
EntityTreePointer entityTree = entityTreeRenderer ? entityTreeRenderer->getTree() : nullptr; EntityTreePointer entityTree = entityTreeRenderer ? entityTreeRenderer->getTree() : nullptr;
if (entityTree) { if (entityTree) {
bool flyingAllowed = true && _enableFlying; bool flyingAllowed = true;
bool collisionlessAllowed = true; bool collisionlessAllowed = true;
entityTree->withWriteLock([&] { entityTree->withWriteLock([&] {
std::shared_ptr<ZoneEntityItem> zone = entityTreeRenderer->myAvatarZone(); std::shared_ptr<ZoneEntityItem> zone = entityTreeRenderer->myAvatarZone();
@ -626,7 +626,7 @@ void MyAvatar::simulate(float deltaTime) {
entityTree->recurseTreeWithOperator(&moveOperator); entityTree->recurseTreeWithOperator(&moveOperator);
} }
}); });
_characterController.setFlyingAllowed(flyingAllowed); _characterController.setFlyingAllowed(flyingAllowed && _enableFlying);
_characterController.setCollisionlessAllowed(collisionlessAllowed); _characterController.setCollisionlessAllowed(collisionlessAllowed);
} }