mirror of
https://github.com/minetest/minetest.git
synced 2024-12-24 23:22:24 +01:00
Server now supports replies without prefix
This commit is contained in:
parent
d2c0b4905a
commit
da19aee307
@ -3247,8 +3247,6 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
|
|||||||
// Parse commands
|
// Parse commands
|
||||||
if(message[0] == L'/')
|
if(message[0] == L'/')
|
||||||
{
|
{
|
||||||
line += L"Server: ";
|
|
||||||
|
|
||||||
size_t strip_size = 1;
|
size_t strip_size = 1;
|
||||||
if (message[1] == L'#') // support old-style commans
|
if (message[1] == L'#') // support old-style commans
|
||||||
++strip_size;
|
++strip_size;
|
||||||
@ -3266,9 +3264,15 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
|
|||||||
player,
|
player,
|
||||||
privs);
|
privs);
|
||||||
|
|
||||||
line += processServerCommand(ctx);
|
std::wstring reply(processServerCommand(ctx));
|
||||||
send_to_sender = ctx->flags & SEND_TO_SENDER;
|
send_to_sender = ctx->flags & SEND_TO_SENDER;
|
||||||
send_to_others = ctx->flags & SEND_TO_OTHERS;
|
send_to_others = ctx->flags & SEND_TO_OTHERS;
|
||||||
|
|
||||||
|
if (ctx->flags & SEND_NO_PREFIX)
|
||||||
|
line += reply;
|
||||||
|
else
|
||||||
|
line += L"Server: " + reply;
|
||||||
|
|
||||||
delete ctx;
|
delete ctx;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -27,6 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||||||
|
|
||||||
#define SEND_TO_SENDER (1<<0)
|
#define SEND_TO_SENDER (1<<0)
|
||||||
#define SEND_TO_OTHERS (1<<1)
|
#define SEND_TO_OTHERS (1<<1)
|
||||||
|
#define SEND_NO_PREFIX (1<<2)
|
||||||
|
|
||||||
struct ServerCommandContext
|
struct ServerCommandContext
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user