0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix display chat messages disappearing

Browse source 
Previously `message_aging != 0` was not checked for each chat message resulting in all messages to be cleared when there is no space left.

Also when SDL_GetTicks() of the latest chatmessage returned a different value than when it was constructed the just added chatmessage was cleared aswell.

This commit also refactors to make sure SDL_GetTicks() is only called once there becasue it might be a rather slow operation (depending on plattform depended implementation).
This commit is contained in:
gfgtdf 2019-02-08 21:58:28 +01:00 • committed by GitHub
parent 702f93def9
commit 2f54ecbc53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/display_chat_manager.cpp
View file

@ -182,16 +182,26 @@ void display_chat_manager::add_chat_message(const std::time_t& time, const std::
prune_chat_messages();
}
static unsigned int safe_subtract(unsigned int a, unsigned int b)
{
return (a > b) ? a - b : 0;
}
void display_chat_manager::prune_chat_messages(bool remove_all)
{
//NOTE: prune_chat_messages(false) seems to be only called when a new message is added, which in
// particular means the aging feature won't work unless new messages are addded regularly
const unsigned message_aging = preferences::chat_message_aging();
const unsigned message_ttl = remove_all ? 0 : message_aging * 60 * 1000;
const unsigned max_chat_messages = preferences::chat_lines();
const bool enable_aging = message_aging != 0;
const unsigned remove_before = enable_aging ? safe_subtract(SDL_GetTicks(), message_aging * 60 * 1000) : 0;
int movement = 0;
if(message_aging != 0 || remove_all || chat_messages_.size() > max_chat_messages) {
if(enable_aging || remove_all || chat_messages_.size() > max_chat_messages) {
while (!chat_messages_.empty() &&
(chat_messages_.front().created_at + message_ttl < SDL_GetTicks() ||
(remove_all ||
chat_messages_.front().created_at < remove_before ||
chat_messages_.size() > max_chat_messages))
{
const chat_message &old = chat_messages_.front();