QTfrontend/net/newnetclient.cpp
author unc0rr
Tue, 16 Oct 2012 00:05:58 +0400
changeset 7757 c20e6c80e249
parent 7744 75e1d0c0ba72
child 7765 1e162c1d6dc7
permissions -rw-r--r--
Don't accept ROUNDFINISHED message twice. Fixes game hangs when half of teams quit game.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     1
/*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 884
diff changeset
     2
 * Hedgewars, a free turn based strategy game
4976
088d40d8aba2 Happy 2011 :)
koda
parents: 4973
diff changeset
     3
 * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
6952
7f70f37bbf08 license header year range adjustments
sheepluva
parents: 6739
diff changeset
     4
 * Copyright (c) 2004-2012 Andrey Korotaev <unC0Rr@gmail.com>
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     5
 *
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     6
 * This program is free software; you can redistribute it and/or modify
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     7
 * it under the terms of the GNU General Public License as published by
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     8
 * the Free Software Foundation; version 2 of the License
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     9
 *
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    10
 * This program is distributed in the hope that it will be useful,
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    13
 * GNU General Public License for more details.
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    14
 *
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    16
 * along with this program; if not, write to the Free Software
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    18
 */
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    19
1189
f66cdbbfc4b6 Fix compile under Ubuntu (why it compiles everywhere else?)
unc0rr
parents: 1083
diff changeset
    20
#include <QDebug>
1844
81abed9d4c11 Ask user password and send it to server
unc0rr
parents: 1842
diff changeset
    21
#include <QInputDialog>
1905
b1ec8db513f2 - Use QCryptographicHash for md5
unc0rr
parents: 1899
diff changeset
    22
#include <QCryptographicHash>
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    23
#include <QSortFilterProxyModel>
1844
81abed9d4c11 Ask user password and send it to server
unc0rr
parents: 1842
diff changeset
    24
697
44f167938201 pre-alpha network weapons selection
displacer
parents: 660
diff changeset
    25
#include "hwconsts.h"
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    26
#include "newnetclient.h"
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    27
#include "proto.h"
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    28
#include "game.h"
6732
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
    29
#include "roomslistmodel.h"
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
    30
#include "playerslistmodel.h"
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    31
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
    32
char delimeter='\n';
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    33
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
    34
HWNewNet::HWNewNet() :
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
    35
    isChief(false),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
    36
    m_game_connected(false),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
    37
    loginStep(0),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
    38
    netClientState(Disconnected)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    39
{
6732
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
    40
    m_roomsListModel = new RoomsListModel(this);
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    41
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    42
    m_playersModel = new PlayersListModel(this);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    43
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    44
    m_lobbyPlayersModel = new QSortFilterProxyModel(this);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    45
    m_lobbyPlayersModel->setSourceModel(m_playersModel);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    46
    m_lobbyPlayersModel->setSortRole(PlayersListModel::SortRole);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    47
    m_lobbyPlayersModel->setDynamicSortFilter(true);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    48
    m_lobbyPlayersModel->sort(0);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    49
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    50
    m_roomPlayersModel = new QSortFilterProxyModel(this);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    51
    m_roomPlayersModel->setSourceModel(m_playersModel);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    52
    m_roomPlayersModel->setSortRole(PlayersListModel::SortRole);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    53
    m_roomPlayersModel->setDynamicSortFilter(true);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    54
    m_roomPlayersModel->sort(0);
7731
262228c64f15 Room players list
unc0rr
parents: 7728
diff changeset
    55
    m_roomPlayersModel->setFilterRole(PlayersListModel::RoomFilterRole);
262228c64f15 Room players list
unc0rr
parents: 7728
diff changeset
    56
    m_roomPlayersModel->setFilterFixedString("1");
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    57
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    58
    // socket stuff
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    59
    connect(&NetSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    60
    connect(&NetSocket, SIGNAL(connected()), this, SLOT(OnConnect()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    61
    connect(&NetSocket, SIGNAL(disconnected()), this, SLOT(OnDisconnect()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    62
    connect(&NetSocket, SIGNAL(error(QAbstractSocket::SocketError)), this,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    63
            SLOT(displayError(QAbstractSocket::SocketError)));
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    64
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    65
1526
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    66
HWNewNet::~HWNewNet()
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    67
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    68
    if (m_game_connected)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    69
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    70
        RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit"));
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
    71
        emit disconnected(tr("User quit"));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    72
    }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    73
    NetSocket.flush();
1526
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    74
}
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    75
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    76
void HWNewNet::Connect(const QString & hostName, quint16 port, const QString & nick)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    77
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
    78
    netClientState = Connecting;
5390
f41e87de8989 (fix issue 126) moved initial nickname popup to the netconnection page
koda
parents: 5230
diff changeset
    79
    mynick = nick;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    80
    myhost = hostName + QString(":%1").arg(port);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    81
    NetSocket.connectToHost(hostName, port);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    82
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    83
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    84
void HWNewNet::Disconnect()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    85
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    86
    if (m_game_connected)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    87
        RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    88
    m_game_connected = false;
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
    89
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    90
    NetSocket.disconnectFromHost();
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    91
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    92
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
    93
void HWNewNet::CreateRoom(const QString & room)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    94
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
    95
    if(netClientState != InLobby)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    96
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    97
        qWarning("Illegal try to create room!");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    98
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    99
    }
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   100
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   101
    myroom = room;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   102
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   103
    RawSendNet(QString("CREATE_ROOM%1%2").arg(delimeter).arg(room));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   104
    isChief = true;
6539
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   105
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   106
    //set our ready status to be true
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   107
    RawSendNet(QString("TOGGLE_READY"));
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   108
}
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   109
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   110
void HWNewNet::JoinRoom(const QString & room)
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   111
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   112
    if(netClientState != InLobby)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   113
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   114
        qWarning("Illegal try to join room!");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   115
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   116
    }
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   117
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   118
    myroom = room;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   119
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   120
    RawSendNet(QString("JOIN_ROOM%1%2").arg(delimeter).arg(room));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   121
    isChief = false;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   122
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   123
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   124
void HWNewNet::AddTeam(const HWTeam & team)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   125
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   126
    QString cmd = QString("ADD_TEAM") + delimeter +
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   127
                  team.name() + delimeter +
7130
fcab1fd02bc6 - Allow switching colors with mouse wheel
unc0rr
parents: 6952
diff changeset
   128
                  QString::number(team.color()) + delimeter +
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   129
                  team.grave() + delimeter +
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   130
                  team.fort() + delimeter +
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   131
                  team.voicepack() + delimeter +
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   132
                  team.flag() + delimeter +
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   133
                  QString::number(team.difficulty());
1245
d2eca4a053f5 Send hats info via net. Hats implementation complete now.
unc0rr
parents: 1189
diff changeset
   134
6024
d38da7c19e43 some more cleanups and refactoring.
sheepluva
parents: 6015
diff changeset
   135
    for(int i = 0; i < HEDGEHOGS_PER_TEAM; ++i)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   136
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   137
        cmd.append(delimeter);
6015
daffc14a518a cleaning up a little bit more, especially team class. we were leaking teams into heap memory on quick game starts btw
sheepluva
parents: 5998
diff changeset
   138
        cmd.append(team.hedgehog(i).Name);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   139
        cmd.append(delimeter);
6015
daffc14a518a cleaning up a little bit more, especially team class. we were leaking teams into heap memory on quick game starts btw
sheepluva
parents: 5998
diff changeset
   140
        cmd.append(team.hedgehog(i).Hat);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   141
    }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   142
    RawSendNet(cmd);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   143
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   144
347
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   145
void HWNewNet::RemoveTeam(const HWTeam & team)
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   146
{
6015
daffc14a518a cleaning up a little bit more, especially team class. we were leaking teams into heap memory on quick game starts btw
sheepluva
parents: 5998
diff changeset
   147
    RawSendNet(QString("REMOVE_TEAM") + delimeter + team.name());
347
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   148
}
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   149
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   150
void HWNewNet::NewNick(const QString & nick)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   151
{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   152
    RawSendNet(QString("NICK%1%2").arg(delimeter).arg(nick));
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   153
}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   154
1404
2b6b6809c2e4 - Fix a bug in READY message handling
unc0rr
parents: 1391
diff changeset
   155
void HWNewNet::ToggleReady()
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   156
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   157
    RawSendNet(QString("TOGGLE_READY"));
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   158
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   159
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   160
void HWNewNet::SendNet(const QByteArray & buf)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   161
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   162
    QString msg = QString(buf.toBase64());
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   163
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   164
    RawSendNet(QString("EM%1%2").arg(delimeter).arg(msg));
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   165
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   166
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   167
void HWNewNet::RawSendNet(const QString & str)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   168
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   169
    RawSendNet(str.toUtf8());
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   170
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   171
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   172
void HWNewNet::RawSendNet(const QByteArray & buf)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   173
{
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   174
    qDebug() << "Client: " << QString(buf).split("\n");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   175
    NetSocket.write(buf);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   176
    NetSocket.write("\n\n", 2);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   177
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   178
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   179
void HWNewNet::ClientRead()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   180
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   181
    while (NetSocket.canReadLine())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   182
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   183
        QString s = QString::fromUtf8(NetSocket.readLine());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   184
        if (s.endsWith('\n')) s.chop(1);
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   185
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   186
        if (s.size() == 0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   187
        {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   188
            ParseCmd(cmdbuf);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   189
            cmdbuf.clear();
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   190
        }
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   191
        else
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   192
            cmdbuf << s;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   193
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   194
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   195
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   196
void HWNewNet::OnConnect()
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   197
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   198
    netClientState = Connected;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   199
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   200
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   201
void HWNewNet::OnDisconnect()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   202
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   203
    netClientState = Disconnected;
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   204
    if(m_game_connected) emit disconnected("");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   205
    m_game_connected = false;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   206
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   207
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   208
void HWNewNet::displayError(QAbstractSocket::SocketError socketError)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   209
{
5230
c088be28d5e8 Set m_game_connected to false after emitting Disconnected(). This fixes a bug in a case such that when entering an invalid password, the game would bring you back to the main menu.
Zorg <zorgiepoo@gmail.com>
parents: 5229
diff changeset
   210
    m_game_connected = false;
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   211
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   212
    switch (socketError)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   213
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   214
        case QAbstractSocket::RemoteHostClosedError:
6722
e3a35bc838fb Show message and return from network game pages on server shutdown
unc0rr
parents: 6700
diff changeset
   215
            emit disconnected(tr("Remote host has closed connection"));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   216
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   217
        case QAbstractSocket::HostNotFoundError:
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   218
            emit disconnected(tr("The host was not found. Please check the host name and port settings."));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   219
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   220
        case QAbstractSocket::ConnectionRefusedError:
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   221
            emit disconnected(tr("Connection refused"));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   222
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   223
        default:
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   224
            emit disconnected(NetSocket.errorString());
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   225
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   226
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   227
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   228
void HWNewNet::SendPasswordHash(const QString & hash)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   229
{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   230
    RawSendNet(QString("PASSWORD%1%2").arg(delimeter).arg(hash));
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   231
}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   232
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   233
void HWNewNet::ParseCmd(const QStringList & lst)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   234
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   235
    qDebug() << "Server: " << lst;
1305
453882eb4467 - Fix build of server (has some bugs now)
unc0rr
parents: 1302
diff changeset
   236
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   237
    if(!lst.size())
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   238
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   239
        qWarning("Net client: Bad message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   240
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   241
    }
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 319
diff changeset
   242
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   243
    if (lst[0] == "NICK")
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   244
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   245
        mynick = lst[1];
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   246
        m_playersModel->setNickname(mynick);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   247
        return ;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   248
    }
1308
d5dcd6cfa5e2 Fix another server failure (when second client in room disconnects)
unc0rr
parents: 1307
diff changeset
   249
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   250
    if (lst[0] == "PROTO")
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   251
        return ;
2108
a689375bbfee Silence frontend debug output
unc0rr
parents: 1990
diff changeset
   252
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   253
    if (lst[0] == "ERROR")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   254
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   255
        if (lst.size() == 2)
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   256
            emit Error(lst[1]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   257
        else
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   258
            emit Error("Unknown error");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   259
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   260
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   261
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   262
    if (lst[0] == "WARNING")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   263
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   264
        if (lst.size() == 2)
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   265
            emit Warning(lst[1]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   266
        else
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   267
            emit Warning("Unknown warning");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   268
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   269
    }
1307
ce26e16d18ab - Now actually fix
unc0rr
parents: 1305
diff changeset
   270
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   271
    if (lst[0] == "CONNECTED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   272
    {
4973
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   273
        if(lst.size() < 3 || lst[2].toInt() < cMinServerVersion)
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   274
        {
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   275
            // TODO: Warn user, disconnect
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   276
            qWarning() << "Server too old";
6737
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   277
            RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("Server too old"));
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   278
            Disconnect();
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   279
            emit disconnected(tr("The server is too old. Disconnecting now."));
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   280
            return;
4973
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   281
        }
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   282
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   283
        RawSendNet(QString("NICK%1%2").arg(delimeter).arg(mynick));
6735
050237b1500f Setup rooms list headers
unc0rr
parents: 6733
diff changeset
   284
        RawSendNet(QString("PROTO%1%2").arg(delimeter).arg(*cProtoVer));
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   285
        netClientState = Connected;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   286
        m_game_connected = true;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   287
        emit adminAccess(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   288
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   289
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   290
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   291
    if (lst[0] == "PING")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   292
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   293
        if (lst.size() > 1)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   294
            RawSendNet(QString("PONG%1%2").arg(delimeter).arg(lst[1]));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   295
        else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   296
            RawSendNet(QString("PONG"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   297
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   298
    }
1462
d3323637da1f Client sends PONG to server's PING
unc0rr
parents: 1427
diff changeset
   299
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   300
    if (lst[0] == "ROOMS")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   301
    {
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   302
        if(lst.size() % 8 != 1)
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   303
        {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   304
            qWarning("Net: Malformed ROOMS message");
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   305
            return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   306
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   307
        QStringList tmp = lst;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   308
        tmp.removeFirst();
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   309
        m_roomsListModel->setRoomsList(tmp);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   310
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   311
    }
1313
f4c54e9e1b8c - Introduce a bit of state miachine in client code (should be more robust and verbosive now)
unc0rr
parents: 1311
diff changeset
   312
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   313
    if (lst[0] == "SERVER_MESSAGE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   314
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   315
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   316
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   317
            qWarning("Net: Empty SERVERMESSAGE message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   318
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   319
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   320
        emit serverMessage(lst[1]);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   321
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   322
    }
1377
a9e768739345 - Customize QTextBrowser look
unc0rr
parents: 1369
diff changeset
   323
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   324
    if (lst[0] == "CHAT")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   325
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   326
        if(lst.size() < 3)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   327
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   328
            qWarning("Net: Empty CHAT message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   329
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   330
        }
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   331
        if (netClientState == InLobby)
4897
11598e7aa7e6 make names in chats clickable. still color adjustments needed; and testing
sheepluva
parents: 4879
diff changeset
   332
            emit chatStringLobby(lst[1], HWProto::formatChatMsgForFrontend(lst[2]));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   333
        else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   334
            emit chatStringFromNet(HWProto::formatChatMsg(lst[1], lst[2]));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   335
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   336
    }
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   337
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   338
    if (lst[0] == "INFO")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   339
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   340
        if(lst.size() < 5)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   341
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   342
            qWarning("Net: Malformed INFO message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   343
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   344
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   345
        QStringList tmp = lst;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   346
        tmp.removeFirst();
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   347
        if (netClientState == InLobby)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   348
            emit chatStringLobby(tmp.join("\n").prepend('\x01'));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   349
        else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   350
            emit chatStringFromNet(tmp.join("\n").prepend('\x01'));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   351
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   352
    }
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
   353
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   354
    if (lst[0] == "SERVER_VARS")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   355
    {
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   356
        QStringList tmp = lst;
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   357
        tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   358
        while (tmp.size() >= 2)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   359
        {
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   360
            if(tmp[0] == "MOTD_NEW") emit serverMessageNew(tmp[1]);
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   361
            else if(tmp[0] == "MOTD_OLD") emit serverMessageOld(tmp[1]);
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   362
            else if(tmp[0] == "LATEST_PROTO") emit latestProtocolVar(tmp[1].toInt());
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3555
diff changeset
   363
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   364
            tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   365
            tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   366
        }
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   367
        return;
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   368
    }
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   369
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   370
    if (lst[0] == "CLIENT_FLAGS")
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   371
    {
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   372
        if(lst.size() < 3 || lst[1].size() < 2)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   373
        {
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   374
            qWarning("Net: Malformed CLIENT_FLAGS message");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   375
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   376
        }
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   377
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   378
        QString flags = lst[1];
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   379
        bool setFlag = flags[0] == '+';
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   380
        const QStringList nicks = lst.mid(2);
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   381
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   382
        while(flags.size() > 1)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   383
        {
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   384
            flags.remove(0, 1);
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   385
            char c = flags[0].toAscii();
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   386
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   387
            switch(c)
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   388
            {
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   389
                // flag indicating if a player is ready to start a game
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   390
                case 'r':
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   391
                        foreach (const QString & nick, nicks)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   392
                        {
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   393
                            if (nick == mynick)
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   394
                            {
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   395
                                if (isChief && !setFlag) ToggleReady();
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   396
                                else emit setMyReadyStatus(setFlag);
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   397
                            }
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   398
                            emit setReadyStatus(nick, setFlag);
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   399
                            m_playersModel->setFlag(nick, PlayersListModel::Ready, setFlag);
6539
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   400
                        }
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   401
                        break;
6539
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   402
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   403
                // flag indicating if a player is a registered user
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   404
                case 'u':
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   405
                        emit setRegisteredStatus(nicks, setFlag);
7727
bd252cacabe8 Bring icons back
unc0rr
parents: 7725
diff changeset
   406
                        foreach(const QString & nick, nicks)
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   407
                            m_playersModel->setFlag(nick, PlayersListModel::Registered, setFlag);
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   408
                        break;
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   409
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   410
                // flag indicating if a player is the host/master of the room
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   411
                case 'h':
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   412
                        foreach (const QString & nick, nicks)
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   413
                        {
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   414
                            if (nick == mynick)
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   415
                            {
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   416
                                isChief = setFlag;
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   417
                                emit roomMaster(isChief);
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   418
                            }
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   419
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   420
                            emit setRoomMasterStatus(nick, setFlag);
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   421
                            m_playersModel->setFlag(nick, PlayersListModel::RoomAdmin, setFlag);
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   422
                        }
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   423
                        break;
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   424
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   425
                // flag indicating if a player is admin (if so -> worship them!)
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   426
                case 'a':
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   427
                        foreach (const QString & nick, nicks)
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   428
                        {
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   429
                            if (nick == mynick)
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   430
                                emit adminAccess(setFlag);
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   431
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   432
                            emit setAdminStatus(nick, setFlag);
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   433
                            m_playersModel->setFlag(nick, PlayersListModel::ServerAdmin, setFlag);
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   434
                        }
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   435
                        break;
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   436
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   437
                default:
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   438
                        qWarning() << "Net: Unknown client-flag: " << c;
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   439
            }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   440
        }
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   441
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   442
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   443
    }
1405
ee4b28a1861d Show players ready status in chat nick list
unc0rr
parents: 1404
diff changeset
   444
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   445
    if(lst[0] == "KICKED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   446
    {
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   447
        netClientState = InLobby;
6513
677b96d13e1f Auto refresh room list after leaving room. Fixes issue #320 for voluntarily and involuntarily coming to room list.
blackmetalowiec
parents: 6222
diff changeset
   448
        askRoomsList();
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   449
        emit LeftRoom(tr("You got kicked"));
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   450
        m_playersModel->resetRoomFlags();
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   451
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   452
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   453
    }
1879
bb114339eb4e Implement kick from room
unc0rr
parents: 1878
diff changeset
   454
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   455
    if(lst[0] == "LOBBY:JOINED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   456
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   457
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   458
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   459
            qWarning("Net: Bad JOINED message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   460
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   461
        }
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   462
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   463
        for(int i = 1; i < lst.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   464
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   465
            if (lst[i] == mynick)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   466
            {
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   467
                netClientState = InLobby;
7744
75e1d0c0ba72 - Nicks starting from not-letter char go to bottom of the list
unc0rr
parents: 7736
diff changeset
   468
                RawSendNet(QString("LIST"));
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   469
                emit connected();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   470
            }
1838
00a5fc50aa43 Use another event to change state from 'logging in' to 'lobby'
unc0rr
parents: 1829
diff changeset
   471
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   472
            emit nickAddedLobby(lst[i], false);
4897
11598e7aa7e6 make names in chats clickable. still color adjustments needed; and testing
sheepluva
parents: 4879
diff changeset
   473
            emit chatStringLobby(lst[i], tr("%1 *** %2 has joined").arg('\x03').arg("|nick|"));
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   474
            m_playersModel->addPlayer(lst[i]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   475
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   476
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   477
    }
1566
6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents: 1560
diff changeset
   478
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   479
    if(lst[0] == "ROOM" && lst.size() == 10 && lst[1] == "ADD")
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   480
    {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   481
        QStringList tmp = lst;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   482
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   483
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   484
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   485
        m_roomsListModel->addRoom(tmp);
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   486
        return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   487
    }
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   488
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   489
    if(lst[0] == "ROOM" && lst.size() == 11 && lst[1] == "UPD")
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   490
    {
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   491
        QStringList tmp = lst;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   492
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   493
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   494
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   495
        QString roomName = tmp.takeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   496
        m_roomsListModel->updateRoom(roomName, tmp);
7710
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents: 7684
diff changeset
   497
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents: 7684
diff changeset
   498
        // keep track of room name so correct name is displayed when you become room admin
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents: 7684
diff changeset
   499
        if(myroom == roomName)
7712
unc0rr
parents: 7710
diff changeset
   500
            myroom = tmp[1];
7710
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents: 7684
diff changeset
   501
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   502
        return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   503
    }
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   504
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   505
    if(lst[0] == "ROOM" && lst.size() == 3 && lst[1] == "DEL")
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   506
    {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   507
        m_roomsListModel->removeRoom(lst[2]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   508
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   509
    }
1591
1db9b654f880 Notify lobby when a room is created or deleted
unc0rr
parents: 1587
diff changeset
   510
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   511
    if(lst[0] == "LOBBY:LEFT")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   512
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   513
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   514
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   515
            qWarning("Net: Bad LOBBY:LEFT message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   516
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   517
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   518
        emit nickRemovedLobby(lst[1]);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   519
        if (lst.size() < 3)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   520
            emit chatStringLobby(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   521
        else
6222
96d10dcd6d84 + make names in notice messages and leave messages clickable too
sheepluva
parents: 6182
diff changeset
   522
            emit chatStringLobby(lst[1], tr("%1 *** %2 has left (%3)").arg('\x03').arg("|nick|", lst[2]));
7725
4ad05a478c6c Further work on moving to players list model
unc0rr
parents: 7723
diff changeset
   523
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   524
        m_playersModel->removePlayer(lst[1]);
7725
4ad05a478c6c Further work on moving to players list model
unc0rr
parents: 7723
diff changeset
   525
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   526
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   527
    }
1566
6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents: 1560
diff changeset
   528
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   529
    if (lst[0] == "ASKPASSWORD")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   530
    {
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   531
        emit AskForPassword(mynick);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   532
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   533
    }
1841
fba7210b438b Retrieve client password from web database and ask for it
unc0rr
parents: 1838
diff changeset
   534
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   535
    if (lst[0] == "NOTICE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   536
    {
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   537
        if(lst.size() < 2)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   538
        {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   539
            qWarning("Net: Bad NOTICE message");
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   540
            return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   541
        }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   542
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   543
        bool ok;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   544
        int n = lst[1].toInt(&ok);
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   545
        if(!ok)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   546
        {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   547
            qWarning("Net: Bad NOTICE message");
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   548
            return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   549
        }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   550
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   551
        handleNotice(n);
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   552
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   553
        return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   554
    }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   555
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   556
    if (lst[0] == "BYE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   557
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   558
        if (lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   559
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   560
            qWarning("Net: Bad BYE message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   561
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   562
        }
5861
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   563
        if (lst[1] == "Authentication failed")
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   564
        {
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   565
            emit AuthFailed();
5861
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   566
        }
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   567
        m_game_connected = false;
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   568
        Disconnect();
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   569
        emit disconnected(lst[1]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   570
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   571
    }
1512
43742041c211 - Don't send 'Bad param' msg, as the only reason of it is just some lag
unc0rr
parents: 1475
diff changeset
   572
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   573
    if (lst[0] == "ADMIN_ACCESS")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   574
    {
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   575
        // obsolete, see +a client flag
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   576
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   577
    }
1856
e71dbf958c87 Enable admin button when have privilege. Button does nothing yet.
unc0rr
parents: 1844
diff changeset
   578
7535
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   579
    if(netClientState == InLobby && lst[0] == "JOINED")
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   580
    {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   581
        if(lst.size() < 2 || lst[1] != mynick)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   582
        {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   583
            qWarning("Net: Bad JOINED message");
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   584
            return;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   585
        }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   586
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   587
        for(int i = 1; i < lst.size(); ++i)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   588
        {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   589
            if (lst[i] == mynick)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   590
            {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   591
                netClientState = InRoom;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   592
                emit EnteredGame();
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   593
                emit roomMaster(isChief);
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   594
                if (isChief)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   595
                    emit configAsked();
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   596
            }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   597
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   598
            emit nickAdded(lst[i], isChief && (lst[i] != mynick));
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   599
            emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
7731
262228c64f15 Room players list
unc0rr
parents: 7728
diff changeset
   600
            m_playersModel->playerJoinedRoom(lst[i]);
7535
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   601
        }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   602
        return;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   603
    }
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   604
7545
063601290761 Forgot this state
unc0rr
parents: 7535
diff changeset
   605
    if(netClientState == InRoom || netClientState == InGame)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   606
    {
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   607
        if (lst[0] == "EM")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   608
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   609
            if(lst.size() < 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   610
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   611
                qWarning("Net: Bad EM message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   612
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   613
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   614
            for(int i = 1; i < lst.size(); ++i)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   615
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   616
                QByteArray em = QByteArray::fromBase64(lst[i].toAscii());
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   617
                emit FromNet(em);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   618
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   619
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   620
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   621
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   622
        if (lst[0] == "ADD_TEAM")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   623
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   624
            if(lst.size() != 24)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   625
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   626
                qWarning("Net: Bad ADDTEAM message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   627
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   628
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   629
            QStringList tmp = lst;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   630
            tmp.removeFirst();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   631
            emit AddNetTeam(tmp);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   632
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   633
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   634
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   635
        if (lst[0] == "REMOVE_TEAM")
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   636
        {
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   637
            if(lst.size() != 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   638
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   639
                qWarning("Net: Bad REMOVETEAM message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   640
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   641
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   642
            emit RemoveNetTeam(HWTeam(lst[1]));
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   643
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   644
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   645
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   646
        if(lst[0] == "ROOMABANDONED")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   647
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   648
            netClientState = InLobby;
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   649
            m_playersModel->resetRoomFlags();
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   650
            emit LeftRoom(tr("Room destroyed"));
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   651
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   652
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   653
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   654
        if (lst[0] == "RUN_GAME")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   655
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   656
            netClientState = InGame;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   657
            emit AskForRunGame();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   658
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   659
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   660
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   661
        if (lst[0] == "TEAM_ACCEPTED")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   662
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   663
            if (lst.size() != 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   664
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   665
                qWarning("Net: Bad TEAM_ACCEPTED message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   666
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   667
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   668
            emit TeamAccepted(lst[1]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   669
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   670
        }
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   671
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   672
        if (lst[0] == "CFG")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   673
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   674
            if(lst.size() < 3)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   675
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   676
                qWarning("Net: Bad CFG message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   677
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   678
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   679
            QStringList tmp = lst;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   680
            tmp.removeFirst();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   681
            tmp.removeFirst();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   682
            if (lst[1] == "SCHEME")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   683
                emit netSchemeConfig(tmp);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   684
            else
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   685
                emit paramChanged(lst[1], tmp);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   686
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   687
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   688
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   689
        if (lst[0] == "HH_NUM")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   690
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   691
            if (lst.size() != 3)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   692
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   693
                qWarning("Net: Bad TEAM_ACCEPTED message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   694
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   695
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   696
            HWTeam tmptm(lst[1]);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   697
            tmptm.setNumHedgehogs(lst[2].toUInt());
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   698
            emit hhnumChanged(tmptm);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   699
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   700
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   701
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   702
        if (lst[0] == "TEAM_COLOR")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   703
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   704
            if (lst.size() != 3)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   705
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   706
                qWarning("Net: Bad TEAM_COLOR message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   707
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   708
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   709
            HWTeam tmptm(lst[1]);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   710
            tmptm.setColor(lst[2].toInt());
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   711
            emit teamColorChanged(tmptm);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   712
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   713
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   714
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   715
        if(lst[0] == "JOINED")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   716
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   717
            if(lst.size() < 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   718
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   719
                qWarning("Net: Bad JOINED message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   720
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   721
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   722
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   723
            for(int i = 1; i < lst.size(); ++i)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   724
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   725
                emit nickAdded(lst[i], isChief && (lst[i] != mynick));
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   726
                emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
7731
262228c64f15 Room players list
unc0rr
parents: 7728
diff changeset
   727
                m_playersModel->playerJoinedRoom(lst[i]);
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   728
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   729
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   730
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   731
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   732
        if(lst[0] == "LEFT")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   733
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   734
            if(lst.size() < 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   735
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   736
                qWarning("Net: Bad LEFT message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   737
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   738
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   739
            emit nickRemoved(lst[1]);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   740
            if (lst.size() < 3)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   741
                emit chatStringFromNet(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   742
            else
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   743
                emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2]));
7731
262228c64f15 Room players list
unc0rr
parents: 7728
diff changeset
   744
            m_playersModel->playerLeftRoom(lst[1]);
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   745
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   746
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   747
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   748
        // obsolete
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   749
        if (lst[0] == "ROOM_CONTROL_ACCESS")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   750
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   751
            if (lst.size() < 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   752
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   753
                qWarning("Net: Bad ROOM_CONTROL_ACCESS message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   754
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   755
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   756
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   757
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   758
    }
2340
3b35fd5f67c7 Fix a bug when you are unable to do anything in lobby when room is closed during round
unc0rr
parents: 2335
diff changeset
   759
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   760
    qWarning() << "Net: Unknown message or wrong state:" << lst;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   761
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   762
352
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   763
void HWNewNet::onHedgehogsNumChanged(const HWTeam& team)
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   764
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   765
    if (isChief)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   766
        RawSendNet(QString("HH_NUM%1%2%1%3")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   767
                   .arg(delimeter)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   768
                   .arg(team.name())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   769
                   .arg(team.numHedgehogs()));
352
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   770
}
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   771
372
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   772
void HWNewNet::onTeamColorChanged(const HWTeam& team)
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   773
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   774
    if (isChief)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   775
        RawSendNet(QString("TEAM_COLOR%1%2%1%3")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   776
                   .arg(delimeter)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   777
                   .arg(team.name())
7130
fcab1fd02bc6 - Allow switching colors with mouse wheel
unc0rr
parents: 6952
diff changeset
   778
                   .arg(team.color()));
372
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   779
}
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   780
1873
815a3ff1fe4b Start refactoring some things. Frontend becomes temporarily unusable for network game
unc0rr
parents: 1866
diff changeset
   781
void HWNewNet::onParamChanged(const QString & param, const QStringList & value)
1782
e7589e37a6d6 Options for bonus box probability tuning and number of turn until sudden death
unc0rr
parents: 1742
diff changeset
   782
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   783
    if (isChief)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   784
        RawSendNet(
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   785
            QString("CFG%1%2%1%3")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   786
            .arg(delimeter)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   787
            .arg(param)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   788
            .arg(value.join(QString(delimeter)))
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   789
        );
1797
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1793
diff changeset
   790
}
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1793
diff changeset
   791
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   792
void HWNewNet::chatLineToNet(const QString& str)
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   793
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   794
    if(str != "")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   795
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   796
        RawSendNet(QString("CHAT") + delimeter + str);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   797
        emit(chatStringFromMe(HWProto::formatChatMsg(mynick, str)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   798
    }
1568
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   799
}
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   800
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   801
void HWNewNet::chatLineToLobby(const QString& str)
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   802
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   803
    if(str != "")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   804
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   805
        RawSendNet(QString("CHAT") + delimeter + str);
6182
d56d18802481 some more chat fixes and changes, I think. hum. what was that? um. aaah, I better go catch some sheep ... er sleep.. um..
sheepluva
parents: 6062
diff changeset
   806
        emit chatStringLobby(mynick, HWProto::formatChatMsgForFrontend(str));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   807
    }
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   808
}
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   809
2403
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   810
void HWNewNet::SendTeamMessage(const QString& str)
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   811
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   812
    RawSendNet(QString("TEAMCHAT") + delimeter + str);
2403
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   813
}
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   814
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   815
void HWNewNet::askRoomsList()
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   816
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   817
    if(netClientState != InLobby)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   818
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   819
        qWarning("Illegal try to get rooms list!");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   820
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   821
    }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   822
    RawSendNet(QString("LIST"));
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   823
}
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
   824
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   825
HWNewNet::ClientState HWNewNet::clientState()
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   826
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   827
    return netClientState;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   828
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   829
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   830
QString HWNewNet::getNick()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   831
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   832
    return mynick;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   833
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   834
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   835
QString HWNewNet::getRoom()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   836
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   837
    return myroom;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   838
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   839
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   840
QString HWNewNet::getHost()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   841
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   842
    return myhost;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   843
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   844
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
   845
bool HWNewNet::isRoomChief()
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
   846
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   847
    return isChief;
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
   848
}
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
   849
4908
99d6797b7ff4 Frontend sends ROUNDFINISHED with information about whether the round was played till end (will be needed for stats)
unc0rr
parents: 4897
diff changeset
   850
void HWNewNet::gameFinished(bool correctly)
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
   851
{
6739
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
   852
    if (netClientState == InGame)
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
   853
    {
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
   854
        netClientState = InRoom;
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
   855
        RawSendNet(QString("ROUNDFINISHED%1%2").arg(delimeter).arg(correctly ? "1" : "0"));
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
   856
    }
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
   857
}
1378
1a391883261d Allow /me in chat
unc0rr
parents: 1377
diff changeset
   858
1860
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
   859
void HWNewNet::banPlayer(const QString & nick)
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
   860
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   861
    RawSendNet(QString("BAN%1%2").arg(delimeter).arg(nick));
1860
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
   862
}
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
   863
1391
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
   864
void HWNewNet::kickPlayer(const QString & nick)
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
   865
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   866
    RawSendNet(QString("KICK%1%2").arg(delimeter).arg(nick));
1391
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
   867
}
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   868
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
   869
void HWNewNet::infoPlayer(const QString & nick)
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
   870
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   871
    RawSendNet(QString("INFO%1%2").arg(delimeter).arg(nick));
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
   872
}
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
   873
2706
935b7d618cf0 sheepluva's patch to add a "follow" command to server and frontend, in order to stalk people and join them in their rooms
koda
parents: 2543
diff changeset
   874
void HWNewNet::followPlayer(const QString & nick)
935b7d618cf0 sheepluva's patch to add a "follow" command to server and frontend, in order to stalk people and join them in their rooms
koda
parents: 2543
diff changeset
   875
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   876
    if (!isInRoom())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   877
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   878
        RawSendNet(QString("FOLLOW%1%2").arg(delimeter).arg(nick));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   879
        isChief = false;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   880
    }
2706
935b7d618cf0 sheepluva's patch to add a "follow" command to server and frontend, in order to stalk people and join them in their rooms
koda
parents: 2543
diff changeset
   881
}
935b7d618cf0 sheepluva's patch to add a "follow" command to server and frontend, in order to stalk people and join them in their rooms
koda
parents: 2543
diff changeset
   882
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   883
void HWNewNet::startGame()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   884
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   885
    RawSendNet(QString("START_GAME"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   886
}
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   887
5126
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
   888
void HWNewNet::updateRoomName(const QString & name)
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
   889
{
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
   890
    RawSendNet(QString("ROOM_NAME%1%2").arg(delimeter).arg(name));
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
   891
}
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
   892
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
   893
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   894
void HWNewNet::toggleRestrictJoins()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   895
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   896
    RawSendNet(QString("TOGGLE_RESTRICT_JOINS"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   897
}
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   898
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   899
void HWNewNet::toggleRestrictTeamAdds()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   900
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   901
    RawSendNet(QString("TOGGLE_RESTRICT_TEAMS"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
   902
}
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
   903
2155
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
   904
void HWNewNet::clearAccountsCache()
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
   905
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   906
    RawSendNet(QString("CLEAR_ACCOUNTS_CACHE"));
2155
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
   907
}
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
   908
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
   909
void HWNewNet::partRoom()
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
   910
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   911
    netClientState = InLobby;
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   912
    m_playersModel->resetRoomFlags();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   913
    RawSendNet(QString("PART"));
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
   914
}
1671
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
   915
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
   916
bool HWNewNet::isInRoom()
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
   917
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   918
    return netClientState >= InRoom;
1671
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
   919
}
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
   920
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   921
void HWNewNet::setServerMessageNew(const QString & msg)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   922
{
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   923
    RawSendNet(QString("SET_SERVER_VAR%1MOTD_NEW%1%2").arg(delimeter).arg(msg));
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   924
}
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   925
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   926
void HWNewNet::setServerMessageOld(const QString & msg)
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
   927
{
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   928
    RawSendNet(QString("SET_SERVER_VAR%1MOTD_OLD%1%2").arg(delimeter).arg(msg));
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
   929
}
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   930
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   931
void HWNewNet::setLatestProtocolVar(int proto)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   932
{
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   933
    RawSendNet(QString("SET_SERVER_VAR%1LATEST_PROTO%1%2").arg(delimeter).arg(proto));
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   934
}
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   935
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   936
void HWNewNet::askServerVars()
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   937
{
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3555
diff changeset
   938
    RawSendNet(QString("GET_SERVER_VAR"));
3343
6289df7747c0 Clarify an ambiguity as to what to do here if your name is already taken.
nemo
parents: 3283
diff changeset
   939
}
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   940
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   941
void HWNewNet::handleNotice(int n)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   942
{
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   943
    switch(n)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   944
    {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   945
        case 0:
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   946
        {
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   947
            emit NickTaken(mynick);
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   948
            break;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   949
        }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   950
    }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   951
}
6732
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
   952
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
   953
RoomsListModel * HWNewNet::roomsListModel()
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
   954
{
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
   955
    return m_roomsListModel;
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
   956
}
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
   957
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   958
QAbstractItemModel *HWNewNet::lobbyPlayersModel()
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
   959
{
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
   960
    return m_lobbyPlayersModel;
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
   961
}
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
   962
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   963
QAbstractItemModel *HWNewNet::roomPlayersModel()
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
   964
{
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
   965
    return m_roomPlayersModel;
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
   966
}