mirror of
https://github.com/moparisthebest/minetest
synced 2024-12-22 23:58:48 -05:00
Print errors from local log to chat
This commit is contained in:
parent
013921782b
commit
ab3911ba9e
12
src/game.cpp
12
src/game.cpp
@ -49,6 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
#include "main.h" // For g_settings
|
||||
#include "tooldef.h"
|
||||
#include "tile.h" // For TextureSource
|
||||
#include "logoutputbuffer.h"
|
||||
|
||||
/*
|
||||
Setting this to 1 enables a special camera mode that forces
|
||||
@ -642,6 +643,9 @@ void the_game(
|
||||
// Create node definition manager
|
||||
IWritableNodeDefManager *nodedef = createNodeDefManager();
|
||||
|
||||
// Add chat log output for errors to be shown in chat
|
||||
LogOutputBuffer chat_log_error_buf(LMT_ERROR);
|
||||
|
||||
/*
|
||||
Create server.
|
||||
SharedPtr will delete it when it goes out of scope.
|
||||
@ -2122,7 +2126,13 @@ void the_game(
|
||||
Get chat messages from client
|
||||
*/
|
||||
{
|
||||
// Get new messages
|
||||
// Get new messages from error log buffer
|
||||
while(!chat_log_error_buf.empty())
|
||||
{
|
||||
chat_lines.push_back(ChatLine(narrow_to_wide(
|
||||
chat_log_error_buf.get())));
|
||||
}
|
||||
// Get new messages from client
|
||||
std::wstring message;
|
||||
while(client.getChatMessage(message))
|
||||
{
|
||||
|
58
src/logoutputbuffer.h
Normal file
58
src/logoutputbuffer.h
Normal file
@ -0,0 +1,58 @@
|
||||
/*
|
||||
Minetest-c55
|
||||
Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef LOGOUTPUTBUFFER_HEADER
|
||||
#define LOGOUTPUTBUFFER_HEADER
|
||||
|
||||
#include "log.h"
|
||||
#include <queue>
|
||||
|
||||
class LogOutputBuffer : public ILogOutput
|
||||
{
|
||||
public:
|
||||
LogOutputBuffer(LogMessageLevel maxlev)
|
||||
{
|
||||
log_add_output(this, maxlev);
|
||||
}
|
||||
~LogOutputBuffer()
|
||||
{
|
||||
log_remove_output(this);
|
||||
}
|
||||
virtual void printLog(const std::string &line)
|
||||
{
|
||||
m_buf.push(line);
|
||||
}
|
||||
std::string get()
|
||||
{
|
||||
if(empty())
|
||||
return "";
|
||||
std::string s = m_buf.front();
|
||||
m_buf.pop();
|
||||
return s;
|
||||
}
|
||||
bool empty()
|
||||
{
|
||||
return m_buf.empty();
|
||||
}
|
||||
private:
|
||||
std::queue<std::string> m_buf;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user