BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

master #4

Merged
BRNSystems merged 3 commits from Mirrorlandia_minetest/minetest:master into master 2023-12-13 19:56:20 +01:00
Conversation 0 Commits 3 Files Changed 11 +14 -7
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a98200bb4c - Show all commits

4
src/client/client.cpp
View File

@ -393,8 +393,8 @@ void Client::connect(Address address, bool is_local_server)
void Client::step(float dtime) void Client::step(float dtime)
{ {
// Limit a bit // Limit a bit
if (dtime > 2.0) if (dtime > DTIME_LIMIT)
dtime = 2.0; dtime = DTIME_LIMIT;
m_animation_time += dtime; m_animation_time += dtime;
if(m_animation_time > 60.0) if(m_animation_time > 60.0)

6
src/collision.cpp
View File

@ -241,13 +241,13 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
/* /*
Calculate new velocity Calculate new velocity
*/ */
if (dtime > 0.5f) { if (dtime > DTIME_LIMIT) {
if (!time_notification_done) { if (!time_notification_done) {
time_notification_done = true; time_notification_done = true;
infostream << "collisionMoveSimple: maximum step interval exceeded," warningstream << "collisionMoveSimple: maximum step interval exceeded,"
" lost movement details!"<<std::endl; " lost movement details!"<<std::endl;
} }
dtime = 0.5f; dtime = DTIME_LIMIT;
} else { } else {
time_notification_done = false; time_notification_done = false;
} }

7
src/constants.h
View File

@ -56,6 +56,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// Override for the previous one when distance of block is very low // Override for the previous one when distance of block is very low
#define BLOCK_SEND_DISABLE_LIMITS_MAX_D 1 #define BLOCK_SEND_DISABLE_LIMITS_MAX_D 1
/*
Client/Server
*/
// Limit maximum dtime in client/server step(...) and for collision detection
#define DTIME_LIMIT 2.5f
/* /*
Map-related things Map-related things
*/ */

4
src/server.cpp
View File

@ -577,8 +577,8 @@ void Server::stop()
void Server::step(float dtime) void Server::step(float dtime)
{ {
// Limit a bit // Limit a bit
if (dtime > 2.0) if (dtime > DTIME_LIMIT)
dtime = 2.0; dtime = DTIME_LIMIT;
{ {
MutexAutoLock lock(m_step_dtime_mutex); MutexAutoLock lock(m_step_dtime_mutex);
m_step_dtime += dtime; m_step_dtime += dtime;