equal
deleted
inserted
replaced
239 |
239 |
240 if (lst[0] == "NICK") |
240 if (lst[0] == "NICK") |
241 { |
241 { |
242 mynick = lst[1]; |
242 mynick = lst[1]; |
243 m_playersModel->setNickname(mynick); |
243 m_playersModel->setNickname(mynick); |
|
244 m_nick_registered = false; |
244 return ; |
245 return ; |
245 } |
246 } |
246 |
247 |
247 if (lst[0] == "PROTO") |
248 if (lst[0] == "PROTO") |
248 return ; |
249 return ; |
302 return; |
303 return; |
303 } |
304 } |
304 QStringList tmp = lst; |
305 QStringList tmp = lst; |
305 tmp.removeFirst(); |
306 tmp.removeFirst(); |
306 m_roomsListModel->setRoomsList(tmp); |
307 m_roomsListModel->setRoomsList(tmp); |
|
308 if (m_nick_registered == false) |
|
309 { |
|
310 emit NickNotRegistered(mynick); |
|
311 } |
307 return; |
312 return; |
308 } |
313 } |
309 |
314 |
310 if (lst[0] == "SERVER_MESSAGE") |
315 if (lst[0] == "SERVER_MESSAGE") |
311 { |
316 { |
536 return; |
541 return; |
537 } |
542 } |
538 |
543 |
539 if (lst[0] == "ASKPASSWORD") |
544 if (lst[0] == "ASKPASSWORD") |
540 { |
545 { |
541 emit AskForPassword(mynick); |
546 emit NickRegistered(mynick); |
|
547 m_nick_registered = true; |
542 return; |
548 return; |
543 } |
549 } |
544 |
550 |
545 if (lst[0] == "NOTICE") |
551 if (lst[0] == "NOTICE") |
546 { |
552 { |
571 return; |
577 return; |
572 } |
578 } |
573 if (lst[1] == "Authentication failed") |
579 if (lst[1] == "Authentication failed") |
574 { |
580 { |
575 emit AuthFailed(); |
581 emit AuthFailed(); |
|
582 m_game_connected = false; |
|
583 Disconnect(); |
|
584 //omitted 'emit disconnected()', we don't want the error message |
|
585 return; |
576 } |
586 } |
577 m_game_connected = false; |
587 m_game_connected = false; |
578 Disconnect(); |
588 Disconnect(); |
579 emit disconnected(lst[1]); |
589 emit disconnected(lst[1]); |
580 return; |
590 return; |
624 for(int i = 1; i < lst.size(); ++i) |
634 for(int i = 1; i < lst.size(); ++i) |
625 { |
635 { |
626 QByteArray em = QByteArray::fromBase64(lst[i].toAscii()); |
636 QByteArray em = QByteArray::fromBase64(lst[i].toAscii()); |
627 emit FromNet(em); |
637 emit FromNet(em); |
628 } |
638 } |
|
639 return; |
|
640 } |
|
641 |
|
642 if (lst[0] == "ROUND_FINISHED") |
|
643 { |
|
644 emit FromNet(QByteArray("\x01o")); |
629 return; |
645 return; |
630 } |
646 } |
631 |
647 |
632 if (lst[0] == "ADD_TEAM") |
648 if (lst[0] == "ADD_TEAM") |
633 { |
649 { |