summaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorCalinou <calinou9999@gmail.com>2012-06-24 23:18:16 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-07-21 02:27:58 +0300
commit61e58ee9b75683834819b84a85ba1256e2033c3f (patch)
tree3d35bb69693976c623519f5c4cda0105b7adb189 /src/server.cpp
parentf21af8da9c1ca72b720fc8c2249baa349af84a47 (diff)
downloadminetest-61e58ee9b75683834819b84a85ba1256e2033c3f.tar.gz
minetest-61e58ee9b75683834819b84a85ba1256e2033c3f.tar.bz2
minetest-61e58ee9b75683834819b84a85ba1256e2033c3f.zip
Message cleanups (consistency) and prevent /me when not allowed to shout
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server.cpp b/src/server.cpp
index d703f7d9b..f793c770b 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2280,7 +2280,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
std::wstring message;
message += L"*** ";
message += name;
- message += L" joined game";
+ message += L" joined the game.";
BroadcastChatMessage(message);
}
}
@@ -2288,7 +2288,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
// Warnings about protocol version can be issued here
if(getClient(peer_id)->net_proto_version < PROTOCOL_VERSION)
{
- SendChatMessage(peer_id, L"# Server: WARNING: YOUR CLIENT IS OLD AND MAY WORK PROPERLY WITH THIS SERVER");
+ SendChatMessage(peer_id, L"# Server: WARNING: YOUR CLIENT IS OLD AND MAY WORK PROPERLY WITH THIS SERVER!");
}
/*
@@ -2710,7 +2710,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
line += message;
send_to_others = true;
} else {
- line += L"Server: You are not allowed to shout";
+ line += L"-!- You don't have permission to shout.";
send_to_sender = true;
}
}
@@ -2819,11 +2819,11 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
bool success = scriptapi_set_password(m_lua, playername, newpwd);
if(success){
actionstream<<player->getName()<<" changes password"<<std::endl;
- SendChatMessage(peer_id, L"Password change successful");
+ SendChatMessage(peer_id, L"Password change successful.");
} else {
actionstream<<player->getName()<<" tries to change password but "
<<"it fails"<<std::endl;
- SendChatMessage(peer_id, L"Password change failed or inavailable");
+ SendChatMessage(peer_id, L"Password change failed or inavailable.");
}
}
else if(command == TOSERVER_PLAYERITEM)
@@ -4685,7 +4685,7 @@ void Server::handlePeerChange(PeerChange &c)
std::wstring name = narrow_to_wide(player->getName());
message += L"*** ";
message += name;
- message += L" left game";
+ message += L" left the game.";
if(c.timeout)
message += L" (timed out)";
}