oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

cavegen.cpp, chat.cpp: modernize code

Browse source
This commit is contained in:
Loic Blot 2017-08-16 08:26:04 +02:00
parent 9dd0f952e0
commit 90dfafcda2
No known key found for this signature in database
GPG key ID: EFAA458E8C153987
3 changed files with 20 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/chat.cpp
View file

@ -34,10 +34,6 @@ ChatBuffer::ChatBuffer(u32 scrollback):
m_empty_formatted_line.first = true;
}
ChatBuffer::~ChatBuffer()
{
}
void ChatBuffer::addLine(std::wstring name, std::wstring text)
{
ChatLine line(name, text);
@ -79,9 +75,8 @@ const ChatLine& ChatBuffer::getLine(u32 index) const
void ChatBuffer::step(f32 dtime)
{
for (u32 i = 0; i < m_unformatted.size(); ++i)
{
m_unformatted[i].age += dtime;
for (ChatLine &line : m_unformatted) {
line.age += dtime;
}
}
@ -198,8 +193,8 @@ const ChatFormattedLine& ChatBuffer::getFormattedLine(u32 row) const
s32 index = m_scroll + (s32) row;
if (index >= 0 && index < (s32) m_formatted.size())
return m_formatted[index];
else
return m_empty_formatted_line;
return m_empty_formatted_line;
}
void ChatBuffer::scroll(s32 rows)
@ -357,10 +352,11 @@ s32 ChatBuffer::getTopScrollPos() const
s32 rows = (s32) m_rows;
if (rows == 0)
return 0;
else if (formatted_count <= rows)
if (formatted_count <= rows)
return formatted_count - rows;
else
return 0;
return 0;
}
s32 ChatBuffer::getBottomScrollPos() const
@ -381,10 +377,6 @@ ChatPrompt::ChatPrompt(const std::wstring &prompt, u32 history_limit):
{
}
ChatPrompt::~ChatPrompt()
{
}
void ChatPrompt::input(wchar_t ch)
{
m_line.insert(m_cursor, 1, ch);
@ -484,18 +476,15 @@ void ChatPrompt::nickCompletion(const std::list<std::string>& names, bool backwa
// find all names that start with the selected prefix
std::vector<std::wstring> completions;
for (std::list<std::string>::const_iterator
i = names.begin();
i != names.end(); ++i)
{
if (str_starts_with(narrow_to_wide(*i), prefix, true))
{
std::wstring completion = narrow_to_wide(*i);
for (const std::string &name : names) {
if (str_starts_with(narrow_to_wide(name), prefix, true)) {
std::wstring completion = narrow_to_wide(name);
if (prefix_start == 0)
completion += L": ";
completions.push_back(completion);
}
}
if (completions.empty())
return;
@ -658,10 +647,6 @@ ChatBackend::ChatBackend():
{
}
ChatBackend::~ChatBackend()
{
}
void ChatBackend::addMessage(std::wstring name, std::wstring text)
{
// Note: A message may consist of multiple lines, for example the MOTD.