Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-24 00:23:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Damage: Remove damage ignore timer

Browse Source
This commit is contained in:
SmallJoker 2017-08-13 09:49:29 +02:00 committed by paramat
parent d677f292cc
commit 03caa1e319
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/client.cpp
View File

@ -264,14 +264,9 @@ 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 > 2.0)
dtime = 2.0; dtime = 2.0;
if(m_ignore_damage_timer > dtime)
m_ignore_damage_timer -= dtime;
else
m_ignore_damage_timer = 0.0;
m_animation_time += dtime; m_animation_time += dtime;
if(m_animation_time > 60.0) if(m_animation_time > 60.0)
m_animation_time -= 60.0; m_animation_time -= 60.0;
@ -394,18 +389,16 @@ void Client::step(float dtime)
ClientEnvEvent envEvent = m_env.getClientEnvEvent(); ClientEnvEvent envEvent = m_env.getClientEnvEvent();
if (envEvent.type == CEE_PLAYER_DAMAGE) { if (envEvent.type == CEE_PLAYER_DAMAGE) {
if (m_ignore_damage_timer <= 0) { u8 damage = envEvent.player_damage.amount;
u8 damage = envEvent.player_damage.amount;
if (envEvent.player_damage.send_to_server) if (envEvent.player_damage.send_to_server)
sendDamage(damage); sendDamage(damage);
// Add to ClientEvent queue // Add to ClientEvent queue
ClientEvent *event = new ClientEvent(); ClientEvent *event = new ClientEvent();
event->type = CE_PLAYER_DAMAGE; event->type = CE_PLAYER_DAMAGE;
event->player_damage.amount = damage; event->player_damage.amount = damage;
m_client_event_queue.push(event); m_client_event_queue.push(event);
}
} }
} }

1
src/client.h
View File

@ -469,7 +469,6 @@ private:
float m_connection_reinit_timer = 0.1f; float m_connection_reinit_timer = 0.1f;
float m_avg_rtt_timer = 0.0f; float m_avg_rtt_timer = 0.0f;
float m_playerpos_send_timer = 0.0f; float m_playerpos_send_timer = 0.0f;
float m_ignore_damage_timer = 0.0f; // Used after server moves player
IntervalLimiter m_map_timer_and_unload_interval; IntervalLimiter m_map_timer_and_unload_interval;
IWritableTextureSource *m_tsrc; IWritableTextureSource *m_tsrc;

4
src/network/clientpackethandler.cpp
View File

@ -573,10 +573,6 @@ void Client::handleCommand_MovePlayer(NetworkPacket* pkt)
event->player_force_move.pitch = pitch; event->player_force_move.pitch = pitch;
event->player_force_move.yaw = yaw; event->player_force_move.yaw = yaw;
m_client_event_queue.push(event); m_client_event_queue.push(event);
// Ignore damage for a few seconds, so that the player doesn't
// get damage from falling on ground
m_ignore_damage_timer = 3.0;
} }
void Client::handleCommand_DeathScreen(NetworkPacket* pkt) void Client::handleCommand_DeathScreen(NetworkPacket* pkt)