Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/game/StarPlayer.cpp2
-rw-r--r--source/game/StarVehicle.cpp2
-rw-r--r--source/game/StarVehicle.hpp2
-rw-r--r--source/game/interfaces/StarLoungingEntities.hpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/source/game/StarPlayer.cpp b/source/game/StarPlayer.cpp
index 400c49e..d844e35 100644
--- a/source/game/StarPlayer.cpp
+++ b/source/game/StarPlayer.cpp
@@ -1440,7 +1440,7 @@ bool Player::canUseTool() const {
bool canUse = !isDead() && !isTeleporting() && !m_techController->toolUsageSuppressed();
if (canUse) {
if (auto loungeAnchor = as<LoungeAnchor>(m_movementController->entityAnchor()))
- if (loungeAnchor->suppressTools)
+ if (loungeAnchor->suppressTools.value(loungeAnchor->controllable))
return false;
}
return canUse;
diff --git a/source/game/StarVehicle.cpp b/source/game/StarVehicle.cpp
index 2b40417..f8eeef1 100644
--- a/source/game/StarVehicle.cpp
+++ b/source/game/StarVehicle.cpp
@@ -46,7 +46,7 @@ Vehicle::Vehicle(Json baseConfig, String path, Json dynamicConfig)
loungePosition.dance.set(pair.second.optString("dance"));
loungePosition.directives.set(pair.second.optString("directives"));
loungePosition.statusEffects.set(pair.second.getArray("statusEffects", {}).transformed(jsonToPersistentStatusEffect));
- loungePosition.suppressTools = pair.second.getBool("suppressTools", false);
+ loungePosition.suppressTools = pair.second.optBool("suppressTools");
}
for (auto const& pair : configValue("physicsCollisions", JsonObject()).iterateObject()) {
diff --git a/source/game/StarVehicle.hpp b/source/game/StarVehicle.hpp
index d397426..4340f9a 100644
--- a/source/game/StarVehicle.hpp
+++ b/source/game/StarVehicle.hpp
@@ -96,7 +96,7 @@ private:
Maybe<Vec2F> exitBottomOffset;
JsonObject armorCosmeticOverrides;
Maybe<String> cursorOverride;
- bool suppressTools;
+ Maybe<bool> suppressTools;
bool cameraFocus;
NetElementBool enabled;
diff --git a/source/game/interfaces/StarLoungingEntities.hpp b/source/game/interfaces/StarLoungingEntities.hpp
index e654269..89510a3 100644
--- a/source/game/interfaces/StarLoungingEntities.hpp
+++ b/source/game/interfaces/StarLoungingEntities.hpp
@@ -31,7 +31,7 @@ struct LoungeAnchor : EntityAnchor {
Maybe<Directives> directives;
JsonObject armorCosmeticOverrides;
Maybe<String> cursorOverride;
- bool suppressTools;
+ Maybe<bool> suppressTools;
bool cameraFocus;
};