Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Removed extra username text from join/leave messages #2673

Merged
merged 3 commits into from
Feb 17, 2021
Merged

Removed extra username text from join/leave messages #2673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c990ec
removed extra username text
tritonas00 Feb 8, 2021
3497f69
removed extra leading spaces
tritonas00 Feb 8, 2021
d53e3c7
correct space order
tritonas00 Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions source/main/network/Network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ void Network::RecvThread()
{
// Console is now threadsafe, no need to send fake chatmessages to ourselves
Str<300> text;
text << user->username << _L(" left the game");
text << _L("left the game");
App::GetConsole()->putNetMessage(user->uniqueid, Console::CONSOLE_SYSTEM_NOTICE, text.ToCStr());
LOG_THREAD(text);

Expand All @@ -337,12 +337,11 @@ void Network::RecvThread()
{
memcpy(&user_info, buffer, sizeof(RoRnet::UserInfo));
Str<300> text;
text << user_info.username;
if (user_info.authstatus != 0) // Show nothing for guests (no special authorization)
{
text << " (" << UserAuthToStringShort(user_info) << ")";
text << "(" << UserAuthToStringShort(user_info) << ") ";
}
text << _L(" joined the game");
text << _L("joined the game");

// NB: Console is threadsafe
App::GetConsole()->putNetMessage(
Expand Down
2 changes: 1 addition & 1 deletion source/main/physics/ActorManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ void ActorManager::HandleActorStreamData(std::vector<RoR::NetRecvPacket> packet_
else
{
Str<200> text;
text << _L(" spawned a new vehicle: ") << filename;
text << _L("spawned a new vehicle: ") << filename;
App::GetConsole()->putNetMessage(
reg->origin_sourceid, Console::CONSOLE_SYSTEM_NOTICE, text.ToCStr());

Expand Down