equal
deleted
inserted
replaced
503 netClientState = InLobby; |
503 netClientState = InLobby; |
504 RawSendNet(QString("LIST")); |
504 RawSendNet(QString("LIST")); |
505 emit connected(); |
505 emit connected(); |
506 } |
506 } |
507 |
507 |
508 m_playersModel->addPlayer(lst[i]); |
508 m_playersModel->addPlayer(lst[i], false); |
509 emit nickAddedLobby(lst[i], false); |
|
510 } |
509 } |
511 return; |
510 return; |
512 } |
511 } |
513 |
512 |
514 if(lst[0] == "ROOM" && lst.size() == 10 && lst[1] == "ADD") |
513 if(lst[0] == "ROOM" && lst.size() == 10 && lst[1] == "ADD") |
553 qWarning("Net: Bad LOBBY:LEFT message"); |
552 qWarning("Net: Bad LOBBY:LEFT message"); |
554 return; |
553 return; |
555 } |
554 } |
556 |
555 |
557 if (lst.size() < 3) |
556 if (lst.size() < 3) |
558 emit nickRemovedLobby(lst[1]); |
557 m_playersModel->removePlayer(lst[1]); |
559 else |
558 else |
560 emit nickRemovedLobby(lst[1], lst[2]); |
559 m_playersModel->removePlayer(lst[1], lst[2]); |
561 |
|
562 m_playersModel->removePlayer(lst[1]); |
|
563 |
560 |
564 return; |
561 return; |
565 } |
562 } |
566 |
563 |
567 if (lst[0] == "ASKPASSWORD") |
564 if (lst[0] == "ASKPASSWORD") |
648 emit roomMaster(isChief); |
645 emit roomMaster(isChief); |
649 if (isChief) |
646 if (isChief) |
650 emit configAsked(); |
647 emit configAsked(); |
651 } |
648 } |
652 |
649 |
653 m_playersModel->playerJoinedRoom(lst[i]); |
650 m_playersModel->playerJoinedRoom(lst[i], isChief && (lst[i] != mynick)); |
654 emit nickAdded(lst[i], isChief && (lst[i] != mynick)); |
651 |
655 emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i])); |
652 emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i])); |
656 } |
653 } |
657 return; |
654 return; |
658 } |
655 } |
659 |
656 |
781 return; |
778 return; |
782 } |
779 } |
783 |
780 |
784 for(int i = 1; i < lst.size(); ++i) |
781 for(int i = 1; i < lst.size(); ++i) |
785 { |
782 { |
786 emit nickAdded(lst[i], isChief && (lst[i] != mynick)); |
|
787 emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i])); |
783 emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i])); |
788 m_playersModel->playerJoinedRoom(lst[i]); |
784 m_playersModel->playerJoinedRoom(lst[i], isChief && (lst[i] != mynick)); |
789 } |
785 } |
790 return; |
786 return; |
791 } |
787 } |
792 |
788 |
793 if(lst[0] == "LEFT") |
789 if(lst[0] == "LEFT") |
795 if(lst.size() < 2) |
791 if(lst.size() < 2) |
796 { |
792 { |
797 qWarning("Net: Bad LEFT message"); |
793 qWarning("Net: Bad LEFT message"); |
798 return; |
794 return; |
799 } |
795 } |
800 emit nickRemoved(lst[1]); |
796 |
801 if (lst.size() < 3) |
797 if (lst.size() < 3) |
802 emit chatStringFromNet(tr("%1 *** %2 has left").arg('\x03').arg(lst[1])); |
798 emit chatStringFromNet(tr("%1 *** %2 has left").arg('\x03').arg(lst[1])); |
803 else |
799 else |
804 emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2])); |
800 emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2])); |
805 m_playersModel->playerLeftRoom(lst[1]); |
801 m_playersModel->playerLeftRoom(lst[1]); |