equal
deleted
inserted
replaced
488 netClientState = InLobby; |
488 netClientState = InLobby; |
489 RawSendNet(QString("LIST")); |
489 RawSendNet(QString("LIST")); |
490 emit connected(); |
490 emit connected(); |
491 } |
491 } |
492 |
492 |
|
493 m_playersModel->addPlayer(lst[i]); |
493 emit nickAddedLobby(lst[i], false); |
494 emit nickAddedLobby(lst[i], false); |
494 emit chatStringLobby(lst[i], tr("%1 *** %2 has joined").arg('\x03').arg("|nick|")); |
495 emit chatStringLobby(lst[i], tr("%1 *** %2 has joined").arg('\x03').arg("|nick|")); |
495 m_playersModel->addPlayer(lst[i]); |
|
496 } |
496 } |
497 return; |
497 return; |
498 } |
498 } |
499 |
499 |
500 if(lst[0] == "ROOM" && lst.size() == 10 && lst[1] == "ADD") |
500 if(lst[0] == "ROOM" && lst.size() == 10 && lst[1] == "ADD") |
634 emit roomMaster(isChief); |
634 emit roomMaster(isChief); |
635 if (isChief) |
635 if (isChief) |
636 emit configAsked(); |
636 emit configAsked(); |
637 } |
637 } |
638 |
638 |
|
639 m_playersModel->playerJoinedRoom(lst[i]); |
639 emit nickAdded(lst[i], isChief && (lst[i] != mynick)); |
640 emit nickAdded(lst[i], isChief && (lst[i] != mynick)); |
640 emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i])); |
641 emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i])); |
641 m_playersModel->playerJoinedRoom(lst[i]); |
|
642 } |
642 } |
643 return; |
643 return; |
644 } |
644 } |
645 |
645 |
646 if(netClientState == InRoom || netClientState == InGame) |
646 if(netClientState == InRoom || netClientState == InGame) |