From 1c4bde3e84653673c48e2b20f2160e579cd91ba4 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 28 Sep 2018 18:38:38 +1200 Subject: [PATCH] Fix build warnings --- interface/src/avatar/MyAvatar.cpp | 2 +- libraries/shared/src/Preferences.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index dc760dc140..c23b7e0431 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -3307,7 +3307,7 @@ float MyAvatar::getRawDriveKey(DriveKeys key) const { } void MyAvatar::relayDriveKeysToCharacterController() { - if (getDriveKey(TRANSLATE_Y) > 0.0f && (!qApp->isHMDMode() || useAdvancedMovementControls() && getFlyingHMDPref())) { + if (getDriveKey(TRANSLATE_Y) > 0.0f && (!qApp->isHMDMode() || (useAdvancedMovementControls() && getFlyingHMDPref()))) { _characterController.jump(); } } diff --git a/libraries/shared/src/Preferences.h b/libraries/shared/src/Preferences.h index 102e78544c..4a58d71c54 100644 --- a/libraries/shared/src/Preferences.h +++ b/libraries/shared/src/Preferences.h @@ -346,7 +346,7 @@ public: : BoolPreference(category, name, getter, setter) { } Type getType() override { return Checkbox; } - const bool getIndented() { return _isIndented; } + bool getIndented() { return _isIndented; } void setIndented(const bool indented) { _isIndented = indented; } protected: bool _isIndented { false };