Merge remote-tracking branch 'Mr_Goldberg/master' into overlay_h

This commit is contained in:
Nemirtingas 2020-01-10 08:16:16 +01:00
commit 118dee9278
81 changed files with 2782 additions and 204 deletions

View file

@ -1353,7 +1353,7 @@ void Callback(Common_Message *msg)
if (msg->lobby_messages().type() == Lobby_Messages::JOIN) {
PRINT_DEBUG("LOBBY MESSAGE: JOIN\n");
enter_lobby(lobby, (uint64)msg->source_id());
trigger_lobby_member_join_leave((uint64)lobby->room_id(), (uint64)msg->source_id(), false, true);
trigger_lobby_member_join_leave((uint64)lobby->room_id(), (uint64)msg->source_id(), false, true, 0.01);
}
if (msg->lobby_messages().type() == Lobby_Messages::MEMBER_DATA) {