rename 'max-interaction-distance' to 'interaction-distance'
This commit is contained in:
parent
b98954f95e
commit
dba3b62964
@ -197,11 +197,11 @@ void Player::setLoadingChunks(bool flag) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
float Player::getMaxInteractionDistance() const {
|
float Player::getMaxInteractionDistance() const {
|
||||||
return maxInteractionDistance;
|
return interactionDistance;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Player::setMaxInteractionDistance(float distance) {
|
void Player::setMaxInteractionDistance(float distance) {
|
||||||
maxInteractionDistance = std::max(1.0f, std::min(200.0f, distance));
|
interactionDistance = std::max(1.0f, std::min(200.0f, distance));
|
||||||
}
|
}
|
||||||
|
|
||||||
entityid_t Player::getEntity() const {
|
entityid_t Player::getEntity() const {
|
||||||
@ -258,7 +258,7 @@ dv::value Player::serialize() const {
|
|||||||
root["rotation"] = dv::to_value(rotation);
|
root["rotation"] = dv::to_value(rotation);
|
||||||
root["spawnpoint"] = dv::to_value(spawnpoint);
|
root["spawnpoint"] = dv::to_value(spawnpoint);
|
||||||
|
|
||||||
root["max-interaction-distance"] = maxInteractionDistance;
|
root["interaction-distance"] = interactionDistance;
|
||||||
root["flight"] = flight;
|
root["flight"] = flight;
|
||||||
root["noclip"] = noclip;
|
root["noclip"] = noclip;
|
||||||
root["suspended"] = suspended;
|
root["suspended"] = suspended;
|
||||||
@ -293,7 +293,7 @@ void Player::deserialize(const dv::value& src) {
|
|||||||
setSpawnPoint(glm::vec3(
|
setSpawnPoint(glm::vec3(
|
||||||
sparr[0].asNumber(), sparr[1].asNumber(), sparr[2].asNumber()));
|
sparr[0].asNumber(), sparr[1].asNumber(), sparr[2].asNumber()));
|
||||||
|
|
||||||
src.at("max-interaction-distance").get(maxInteractionDistance);
|
src.at("interaction-distance").get(interactionDistance);
|
||||||
|
|
||||||
flight = src["flight"].asBoolean();
|
flight = src["flight"].asBoolean();
|
||||||
noclip = src["noclip"].asBoolean();
|
noclip = src["noclip"].asBoolean();
|
||||||
|
|||||||
@ -57,7 +57,7 @@ class Player : public Serializable {
|
|||||||
bool infiniteItems = true;
|
bool infiniteItems = true;
|
||||||
bool instantDestruction = true;
|
bool instantDestruction = true;
|
||||||
bool loadingChunks = true;
|
bool loadingChunks = true;
|
||||||
float maxInteractionDistance = 10.0f;
|
float interactionDistance = 10.0f;
|
||||||
|
|
||||||
entityid_t eid = ENTITY_AUTO;
|
entityid_t eid = ENTITY_AUTO;
|
||||||
entityid_t selectedEid = 0;
|
entityid_t selectedEid = 0;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user