Skip to content

Commit 1ff15d3

Browse files
committedJul 1, 2018
Drop ClientEvent CEE_PLAYER_BREATH: triggering function is not called.
Also drop 3 useless IntervalLimiter
1 parent 49509d2 commit 1ff15d3

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed
 

Diff for: ‎src/clientenvironment.cpp

+1-12
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,7 @@ void ClientEnvironment::step(float dtime)
203203
lplayer->move(dtime_part, this, position_max_increment,
204204
&player_collisions);
205205
}
206-
}
207-
while(dtime_downcount > 0.001);
208-
209-
//std::cout<<"Looped "<<loopcount<<" times."<<std::endl;
206+
} while (dtime_downcount > 0.001);
210207

211208
bool player_immortal = lplayer->getCAO() && lplayer->getCAO()->isImmortal();
212209

@@ -483,14 +480,6 @@ void ClientEnvironment::damageLocalPlayer(u8 damage, bool handle_hp)
483480
m_client_event_queue.push(event);
484481
}
485482

486-
void ClientEnvironment::updateLocalPlayerBreath(u16 breath)
487-
{
488-
ClientEnvEvent event;
489-
event.type = CEE_PLAYER_BREATH;
490-
event.player_breath.amount = breath;
491-
m_client_event_queue.push(event);
492-
}
493-
494483
/*
495484
Client likes to call these
496485
*/

Diff for: ‎src/clientenvironment.h

+1-9
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ class LocalPlayer;
4242
enum ClientEnvEventType
4343
{
4444
CEE_NONE,
45-
CEE_PLAYER_DAMAGE,
46-
CEE_PLAYER_BREATH
45+
CEE_PLAYER_DAMAGE
4746
};
4847

4948
struct ClientEnvEvent
@@ -56,9 +55,6 @@ struct ClientEnvEvent
5655
u8 amount;
5756
bool send_to_server;
5857
} player_damage;
59-
struct{
60-
u16 amount;
61-
} player_breath;
6258
};
6359
};
6460

@@ -113,7 +109,6 @@ class ClientEnvironment : public Environment
113109
*/
114110

115111
void damageLocalPlayer(u8 damage, bool handle_hp=true);
116-
void updateLocalPlayerBreath(u16 breath);
117112

118113
/*
119114
Client likes to call these
@@ -151,9 +146,6 @@ class ClientEnvironment : public Environment
151146
std::vector<ClientSimpleObject*> m_simple_objects;
152147
std::queue<ClientEnvEvent> m_client_event_queue;
153148
IntervalLimiter m_active_object_light_update_interval;
154-
IntervalLimiter m_lava_hurt_interval;
155-
IntervalLimiter m_drowning_interval;
156-
IntervalLimiter m_breathing_interval;
157149
std::list<std::string> m_player_names;
158150
v3s16 m_camera_offset;
159151
};

0 commit comments

Comments
 (0)