diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-12-12 19:24:39 +0100 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-12-12 19:24:39 +0100 |
| commit | 72978e7e6f4c3af46880873f5a4e2f90386f3534 (patch) | |
| tree | aec10e045a2c81bb5cf24eda62e71211da0db2b9 /src/client | |
| parent | 659f470565efff7a8789d1cc8b1cd18ad7d15ad0 (diff) | |
| download | minetest-72978e7e6f4c3af46880873f5a4e2f90386f3534.tar.xz | |
Rename new_gravity to new new_acceleration
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/clientenvironment.cpp | 2 | ||||
| -rw-r--r-- | src/client/content_cao.cpp | 4 | ||||
| -rw-r--r-- | src/client/localplayer.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp index 6c7ea6578..9107cf274 100644 --- a/src/client/clientenvironment.cpp +++ b/src/client/clientenvironment.cpp @@ -235,7 +235,7 @@ void ClientEnvironment::step(float dtime) speed += d; } - lplayer->setSpeed(lplayer->physics_override_new_gravity + lplayer->setSpeed(lplayer->physics_override_new_acceleration ? (speed + old_speed) / 2.0f : speed ); diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp index 46007a622..c9778998a 100644 --- a/src/client/content_cao.cpp +++ b/src/client/content_cao.cpp @@ -1772,7 +1772,7 @@ void GenericCAO::processMessage(const std::string &data) bool sneak_glitch = !readU8(is); bool new_move = !readU8(is); // this one is off by default - bool new_gravity = readU8(is); + bool new_acceleration = readU8(is); if(m_is_local_player) @@ -1784,7 +1784,7 @@ void GenericCAO::processMessage(const std::string &data) player->physics_override_sneak = sneak; player->physics_override_sneak_glitch = sneak_glitch; player->physics_override_new_move = new_move; - player->physics_override_new_gravity = new_gravity; + player->physics_override_new_acceleration = new_acceleration; } } else if (cmd == AO_CMD_SET_ANIMATION) { // TODO: change frames send as v2s32 value diff --git a/src/client/localplayer.h b/src/client/localplayer.h index 04b78298b..2bb93f086 100644 --- a/src/client/localplayer.h +++ b/src/client/localplayer.h @@ -68,7 +68,7 @@ public: bool physics_override_sneak_glitch = false; // Temporary option for old move code bool physics_override_new_move = true; - bool physics_override_new_gravity = false; + bool physics_override_new_acceleration = false; void move(f32 dtime, Environment *env, f32 pos_max_d); void move(f32 dtime, Environment *env, f32 pos_max_d, |