Change m_client_event_queue's type to std::queue

As indicated in its name, m_client_event_queue should be a queue.
Change std::list to std::queue to improve the queue's performance.
This commit is contained in:
Loic Blot 2015-09-08 18:29:02 +02:00 committed by est31
parent fe6575b8d3
commit 1f1e14ab7f
2 changed files with 4 additions and 4 deletions

@ -2562,7 +2562,7 @@ void ClientEnvironment::damageLocalPlayer(u8 damage, bool handle_hp)
event.type = CEE_PLAYER_DAMAGE; event.type = CEE_PLAYER_DAMAGE;
event.player_damage.amount = damage; event.player_damage.amount = damage;
event.player_damage.send_to_server = handle_hp; event.player_damage.send_to_server = handle_hp;
m_client_event_queue.push_back(event); m_client_event_queue.push(event);
} }
void ClientEnvironment::updateLocalPlayerBreath(u16 breath) void ClientEnvironment::updateLocalPlayerBreath(u16 breath)
@ -2570,7 +2570,7 @@ void ClientEnvironment::updateLocalPlayerBreath(u16 breath)
ClientEnvEvent event; ClientEnvEvent event;
event.type = CEE_PLAYER_BREATH; event.type = CEE_PLAYER_BREATH;
event.player_breath.amount = breath; event.player_breath.amount = breath;
m_client_event_queue.push_back(event); m_client_event_queue.push(event);
} }
/* /*
@ -2604,7 +2604,7 @@ ClientEnvEvent ClientEnvironment::getClientEvent()
event.type = CEE_NONE; event.type = CEE_NONE;
else { else {
event = m_client_event_queue.front(); event = m_client_event_queue.front();
m_client_event_queue.pop_front(); m_client_event_queue.pop();
} }
return event; return event;
} }

@ -534,7 +534,7 @@ private:
IrrlichtDevice *m_irr; IrrlichtDevice *m_irr;
std::map<u16, ClientActiveObject*> m_active_objects; std::map<u16, ClientActiveObject*> m_active_objects;
std::vector<ClientSimpleObject*> m_simple_objects; std::vector<ClientSimpleObject*> m_simple_objects;
std::list<ClientEnvEvent> m_client_event_queue; std::queue<ClientEnvEvent> m_client_event_queue;
IntervalLimiter m_active_object_light_update_interval; IntervalLimiter m_active_object_light_update_interval;
IntervalLimiter m_lava_hurt_interval; IntervalLimiter m_lava_hurt_interval;
IntervalLimiter m_drowning_interval; IntervalLimiter m_drowning_interval;