equal
deleted
inserted
replaced
373 emit roomMaster(isChief); |
373 emit roomMaster(isChief); |
374 if (isChief) |
374 if (isChief) |
375 emit configAsked(); |
375 emit configAsked(); |
376 } |
376 } |
377 emit nickAdded(lst[i]); |
377 emit nickAdded(lst[i]); |
378 emit chatStringFromNet(QString(tr("[%1 has joined the room]")).arg(lst[i])); |
378 emit chatStringFromNet(QString(tr("[ %1 has joined the room ]")).arg(lst[i])); |
379 } |
379 } |
380 return; |
380 return; |
381 } |
381 } |
382 |
382 |
383 if(lst[0] == "LOBBY:JOINED") { |
383 if(lst[0] == "LOBBY:JOINED") { |
395 RawSendNet(QString("LIST")); |
395 RawSendNet(QString("LIST")); |
396 emit Connected(); |
396 emit Connected(); |
397 } |
397 } |
398 |
398 |
399 emit nickAddedLobby(lst[i]); |
399 emit nickAddedLobby(lst[i]); |
400 emit chatStringLobby(QString(tr("[%1 has joined]")).arg(lst[i])); |
400 emit chatStringLobby(QString(tr("[ %1 has joined ]")).arg(lst[i])); |
401 } |
401 } |
402 return; |
402 return; |
403 } |
403 } |
404 |
404 |
405 if(lst[0] == "LEFT") { |
405 if(lst[0] == "LEFT") { |
408 qWarning("Net: Bad LEFT message"); |
408 qWarning("Net: Bad LEFT message"); |
409 return; |
409 return; |
410 } |
410 } |
411 emit nickRemoved(lst[1]); |
411 emit nickRemoved(lst[1]); |
412 if (lst.size() < 3) |
412 if (lst.size() < 3) |
413 emit chatStringFromNet(QString(tr("[%1 has left]")).arg(lst[1])); |
413 emit chatStringFromNet(QString(tr("[ %1 has left ]")).arg(lst[1])); |
414 else |
414 else |
415 emit chatStringFromNet(QString(tr("[ %1 has left (%2)]")).arg(lst[1], lst[2])); |
415 emit chatStringFromNet(QString(tr("[ %1 has left (%2) ]")).arg(lst[1], lst[2])); |
416 return; |
416 return; |
417 } |
417 } |
418 |
418 |
419 if(lst[0] == "ROOM") { |
419 if(lst[0] == "ROOM") { |
420 if(lst.size() < 2) |
420 if(lst.size() < 2) |
432 qWarning("Net: Bad LOBBY:LEFT message"); |
432 qWarning("Net: Bad LOBBY:LEFT message"); |
433 return; |
433 return; |
434 } |
434 } |
435 emit nickRemovedLobby(lst[1]); |
435 emit nickRemovedLobby(lst[1]); |
436 if (lst.size() < 3) |
436 if (lst.size() < 3) |
437 emit chatStringLobby(QString(tr("[%1 has left]")).arg(lst[1])); |
437 emit chatStringLobby(QString(tr("[ %1 has left ]")).arg(lst[1])); |
438 else |
438 else |
439 emit chatStringLobby(QString(tr("[ %1 has left (%2)]")).arg(lst[1], lst[2])); |
439 emit chatStringLobby(QString(tr("[ %1 has left (%2) ]")).arg(lst[1], lst[2])); |
440 return; |
440 return; |
441 } |
441 } |
442 |
442 |
443 if (lst[0] == "RUN_GAME") { |
443 if (lst[0] == "RUN_GAME") { |
444 netClientState = 5; |
444 netClientState = 5; |