QTfrontend/net/newnetclient.cpp
author unc0rr
Mon, 25 Aug 2014 22:52:59 +0400
changeset 10401 c31276023295
parent 10400 47e2189eae44
child 10695 e295995348f9
permissions -rw-r--r--
- Revert try to add local team on rejoin - Don't allow more than 8 teams in local game widget
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>
9998
736015b847e3 update copyright to 2014
sheepluva
parents: 9906
diff changeset
     4
 * Copyright (c) 2004-2014 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
10108
c68cf030eded update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents: 10076
diff changeset
    17
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
315
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>
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
    24
#include <QUuid>
1844
81abed9d4c11 Ask user password and send it to server
unc0rr
parents: 1842
diff changeset
    25
697
44f167938201 pre-alpha network weapons selection
displacer
parents: 660
diff changeset
    26
#include "hwconsts.h"
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    27
#include "newnetclient.h"
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    28
#include "proto.h"
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    29
#include "game.h"
6732
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
    30
#include "roomslistmodel.h"
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
    31
#include "playerslistmodel.h"
8401
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
    32
#include "servermessages.h"
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
    33
#include "HWApplication.h"
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    34
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
    35
char delimeter='\n';
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    36
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
    37
HWNewNet::HWNewNet() :
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
    38
    isChief(false),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
    39
    m_game_connected(false),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
    40
    netClientState(Disconnected)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    41
{
10248
7b9b44a051f8 Fix some of issues found by coverity
unc0rr
parents: 10144
diff changeset
    42
    m_private_game = false;
7b9b44a051f8 Fix some of issues found by coverity
unc0rr
parents: 10144
diff changeset
    43
    m_nick_registered = false;
7b9b44a051f8 Fix some of issues found by coverity
unc0rr
parents: 10144
diff changeset
    44
6732
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
    45
    m_roomsListModel = new RoomsListModel(this);
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    46
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    47
    m_playersModel = new PlayersListModel(this);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    48
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    49
    m_lobbyPlayersModel = new QSortFilterProxyModel(this);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    50
    m_lobbyPlayersModel->setSourceModel(m_playersModel);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    51
    m_lobbyPlayersModel->setSortRole(PlayersListModel::SortRole);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    52
    m_lobbyPlayersModel->setDynamicSortFilter(true);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    53
    m_lobbyPlayersModel->sort(0);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    54
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    55
    m_roomPlayersModel = new QSortFilterProxyModel(this);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    56
    m_roomPlayersModel->setSourceModel(m_playersModel);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    57
    m_roomPlayersModel->setSortRole(PlayersListModel::SortRole);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    58
    m_roomPlayersModel->setDynamicSortFilter(true);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    59
    m_roomPlayersModel->sort(0);
7731
262228c64f15 Room players list
unc0rr
parents: 7728
diff changeset
    60
    m_roomPlayersModel->setFilterRole(PlayersListModel::RoomFilterRole);
7834
3a65b70b1285 Oops, fix room players list emptyness
unc0rr
parents: 7775
diff changeset
    61
    m_roomPlayersModel->setFilterFixedString("true");
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    62
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    63
    // socket stuff
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    64
    connect(&NetSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    65
    connect(&NetSocket, SIGNAL(connected()), this, SLOT(OnConnect()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    66
    connect(&NetSocket, SIGNAL(disconnected()), this, SLOT(OnDisconnect()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    67
    connect(&NetSocket, SIGNAL(error(QAbstractSocket::SocketError)), this,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    68
            SLOT(displayError(QAbstractSocket::SocketError)));
8534
92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents: 8489
diff changeset
    69
92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents: 8489
diff changeset
    70
    connect(this, SIGNAL(messageProcessed()), this, SLOT(ClientRead()), Qt::QueuedConnection);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    71
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    72
1526
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    73
HWNewNet::~HWNewNet()
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    74
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    75
    if (m_game_connected)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    76
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    77
        RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit"));
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
    78
        emit disconnected(tr("User quit"));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    79
    }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    80
    NetSocket.flush();
1526
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    81
}
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    82
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    83
void HWNewNet::Connect(const QString & hostName, quint16 port, const QString & nick)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    84
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
    85
    netClientState = Connecting;
5390
f41e87de8989 (fix issue 126) moved initial nickname popup to the netconnection page
koda
parents: 5230
diff changeset
    86
    mynick = nick;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    87
    myhost = hostName + QString(":%1").arg(port);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    88
    NetSocket.connectToHost(hostName, port);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    89
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    90
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    91
void HWNewNet::Disconnect()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    92
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    93
    if (m_game_connected)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    94
        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
    95
    m_game_connected = false;
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
    96
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    97
    NetSocket.disconnectFromHost();
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    98
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    99
9541
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   100
void HWNewNet::CreateRoom(const QString & room, const QString & password)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   101
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   102
    if(netClientState != InLobby)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   103
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   104
        qWarning("Illegal try to create room!");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   105
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   106
    }
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   107
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   108
    myroom = room;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   109
9541
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   110
    if(password.isEmpty())
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   111
        RawSendNet(QString("CREATE_ROOM%1%2").arg(delimeter).arg(room));
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   112
    else
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   113
        RawSendNet(QString("CREATE_ROOM%1%2%1%3").arg(delimeter).arg(room).arg(password));
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   114
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   115
    isChief = true;
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   116
}
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   117
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   118
void HWNewNet::JoinRoom(const QString & room, const QString &password)
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   119
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   120
    if(netClientState != InLobby)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   121
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   122
        qWarning("Illegal try to join room!");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   123
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   124
    }
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   125
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   126
    myroom = room;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   127
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   128
    if(password.isEmpty())
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   129
        RawSendNet(QString("JOIN_ROOM%1%2").arg(delimeter).arg(room));
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   130
    else
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   131
        RawSendNet(QString("JOIN_ROOM%1%2%1%3").arg(delimeter).arg(room).arg(password));
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   132
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   133
    isChief = false;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   134
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   135
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   136
void HWNewNet::AddTeam(const HWTeam & team)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   137
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   138
    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
   139
                  team.name() + delimeter +
7130
fcab1fd02bc6 - Allow switching colors with mouse wheel
unc0rr
parents: 6952
diff changeset
   140
                  QString::number(team.color()) + delimeter +
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   141
                  team.grave() + delimeter +
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   142
                  team.fort() + delimeter +
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   143
                  team.voicepack() + delimeter +
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   144
                  team.flag() + delimeter +
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   145
                  QString::number(team.difficulty());
1245
d2eca4a053f5 Send hats info via net. Hats implementation complete now.
unc0rr
parents: 1189
diff changeset
   146
6024
d38da7c19e43 some more cleanups and refactoring.
sheepluva
parents: 6015
diff changeset
   147
    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
   148
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   149
        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
   150
        cmd.append(team.hedgehog(i).Name);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   151
        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
   152
        cmd.append(team.hedgehog(i).Hat);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   153
    }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   154
    RawSendNet(cmd);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   155
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   156
347
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   157
void HWNewNet::RemoveTeam(const HWTeam & team)
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   158
{
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
   159
    RawSendNet(QString("REMOVE_TEAM") + delimeter + team.name());
347
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   160
}
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   161
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   162
void HWNewNet::NewNick(const QString & nick)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   163
{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   164
    RawSendNet(QString("NICK%1%2").arg(delimeter).arg(nick));
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   165
}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   166
1404
2b6b6809c2e4 - Fix a bug in READY message handling
unc0rr
parents: 1391
diff changeset
   167
void HWNewNet::ToggleReady()
315
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(QString("TOGGLE_READY"));
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::SendNet(const QByteArray & buf)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   173
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   174
    QString msg = QString(buf.toBase64());
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   175
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   176
    RawSendNet(QString("EM%1%2").arg(delimeter).arg(msg));
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::RawSendNet(const QString & str)
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
    RawSendNet(str.toUtf8());
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   182
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   183
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   184
void HWNewNet::RawSendNet(const QByteArray & buf)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   185
{
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   186
    qDebug() << "Client: " << QString(buf).split("\n");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   187
    NetSocket.write(buf);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   188
    NetSocket.write("\n\n", 2);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   189
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   190
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   191
void HWNewNet::ClientRead()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   192
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   193
    while (NetSocket.canReadLine())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   194
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   195
        QString s = QString::fromUtf8(NetSocket.readLine());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   196
        if (s.endsWith('\n')) s.chop(1);
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   197
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   198
        if (s.size() == 0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   199
        {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   200
            ParseCmd(cmdbuf);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   201
            cmdbuf.clear();
8534
92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents: 8489
diff changeset
   202
            emit messageProcessed();
92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents: 8489
diff changeset
   203
            return ;
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   204
        }
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   205
        else
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   206
            cmdbuf << s;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   207
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   208
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   209
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   210
void HWNewNet::OnConnect()
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   211
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   212
    netClientState = Connected;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   213
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   214
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   215
void HWNewNet::OnDisconnect()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   216
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   217
    netClientState = Disconnected;
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   218
    if(m_game_connected) emit disconnected("");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   219
    m_game_connected = false;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   220
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   221
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   222
void HWNewNet::displayError(QAbstractSocket::SocketError socketError)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   223
{
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
   224
    m_game_connected = false;
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   225
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   226
    switch (socketError)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   227
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   228
        case QAbstractSocket::RemoteHostClosedError:
6722
e3a35bc838fb Show message and return from network game pages on server shutdown
unc0rr
parents: 6700
diff changeset
   229
            emit disconnected(tr("Remote host has closed connection"));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   230
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   231
        case QAbstractSocket::HostNotFoundError:
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   232
            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
   233
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   234
        case QAbstractSocket::ConnectionRefusedError:
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   235
            emit disconnected(tr("Connection refused"));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   236
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   237
        default:
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   238
            emit disconnected(NetSocket.errorString());
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   239
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   240
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   241
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   242
void HWNewNet::SendPasswordHash(const QString & hash)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   243
{
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   244
    // don't send it immediately, only store and check if server asked us for a password
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
   245
    m_passwordHash = hash.toAscii();
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   246
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   247
    maybeSendPassword();
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   248
}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   249
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   250
void HWNewNet::ParseCmd(const QStringList & lst)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   251
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   252
    qDebug() << "Server: " << lst;
1305
453882eb4467 - Fix build of server (has some bugs now)
unc0rr
parents: 1302
diff changeset
   253
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   254
    if(!lst.size())
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   255
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   256
        qWarning("Net client: Bad message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   257
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   258
    }
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 319
diff changeset
   259
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   260
    if (lst[0] == "NICK")
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   261
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   262
        mynick = lst[1];
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   263
        m_playersModel->setNickname(mynick);
8299
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8291
diff changeset
   264
        m_nick_registered = false;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   265
        return ;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   266
    }
1308
d5dcd6cfa5e2 Fix another server failure (when second client in room disconnects)
unc0rr
parents: 1307
diff changeset
   267
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   268
    if (lst[0] == "PROTO")
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   269
        return ;
2108
a689375bbfee Silence frontend debug output
unc0rr
parents: 1990
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] == "ERROR")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   272
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   273
        if (lst.size() == 2)
8401
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   274
            emit Error(HWApplication::translate("server", lst[1].toAscii().constData()));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   275
        else
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   276
            emit Error("Unknown error");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   277
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   278
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   279
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   280
    if (lst[0] == "WARNING")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   281
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   282
        if (lst.size() == 2)
8401
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   283
            emit Warning(HWApplication::translate("server", lst[1].toAscii().constData()));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   284
        else
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   285
            emit Warning("Unknown warning");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   286
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   287
    }
1307
ce26e16d18ab - Now actually fix
unc0rr
parents: 1305
diff changeset
   288
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   289
    if (lst[0] == "CONNECTED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   290
    {
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
   291
        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
   292
        {
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
   293
            // 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
   294
            qWarning() << "Server too old";
6737
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   295
            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
   296
            Disconnect();
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   297
            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
   298
            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
   299
        }
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
   300
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   301
        RawSendNet(QString("NICK%1%2").arg(delimeter).arg(mynick));
6735
050237b1500f Setup rooms list headers
unc0rr
parents: 6733
diff changeset
   302
        RawSendNet(QString("PROTO%1%2").arg(delimeter).arg(*cProtoVer));
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   303
        netClientState = Connected;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   304
        m_game_connected = true;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   305
        emit adminAccess(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   306
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   307
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   308
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   309
    if (lst[0] == "SERVER_AUTH")
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   310
    {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   311
        if(lst.size() < 2)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   312
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   313
            qWarning("Net: Malformed SERVER_AUTH message");
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   314
            return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   315
        }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   316
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
   317
        if(lst[1] != m_serverHash)
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   318
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   319
            Error("Server authentication error");
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   320
            Disconnect();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   321
        } else
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   322
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   323
            // empty m_serverHash variable means no authentication was performed
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   324
            // or server passed authentication
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   325
            m_serverHash.clear();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   326
        }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   327
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   328
        return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   329
    }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   330
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   331
    if (lst[0] == "PING")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   332
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   333
        if (lst.size() > 1)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   334
            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
   335
        else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   336
            RawSendNet(QString("PONG"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   337
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   338
    }
1462
d3323637da1f Client sends PONG to server's PING
unc0rr
parents: 1427
diff changeset
   339
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   340
    if (lst[0] == "ROOMS")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   341
    {
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   342
        if(lst.size() % 9 != 1)
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   343
        {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   344
            qWarning("Net: Malformed ROOMS message");
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   345
            return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   346
        }
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   347
        m_roomsListModel->setRoomsList(lst.mid(1));
8720
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548)
koda
parents: 8567
diff changeset
   348
        if (m_private_game == false && m_nick_registered == false)
8299
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8291
diff changeset
   349
        {
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8291
diff changeset
   350
            emit NickNotRegistered(mynick);
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8291
diff changeset
   351
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   352
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   353
    }
1313
f4c54e9e1b8c - Introduce a bit of state miachine in client code (should be more robust and verbosive now)
unc0rr
parents: 1311
diff changeset
   354
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   355
    if (lst[0] == "SERVER_MESSAGE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   356
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   357
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   358
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   359
            qWarning("Net: Empty SERVERMESSAGE message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   360
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   361
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   362
        emit serverMessage(lst[1]);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   363
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   364
    }
1377
a9e768739345 - Customize QTextBrowser look
unc0rr
parents: 1369
diff changeset
   365
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   366
    if (lst[0] == "CHAT")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   367
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   368
        if(lst.size() < 3)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   369
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   370
            qWarning("Net: Empty CHAT message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   371
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   372
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   373
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   374
        QString action = HWProto::chatStringToAction(lst[2]);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   375
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   376
        if (netClientState == InLobby)
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   377
        {
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   378
            if (action != NULL)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   379
                emit lobbyChatAction(lst[1], action);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   380
            else
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   381
                emit lobbyChatMessage(lst[1], lst[2]);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   382
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   383
        else
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   384
        {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   385
            emit chatStringFromNet(HWProto::formatChatMsg(lst[1], lst[2]));
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   386
            if (action != NULL)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   387
                emit roomChatAction(lst[1], action);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   388
            else
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   389
                emit roomChatMessage(lst[1], lst[2]);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   390
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   391
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   392
    }
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   393
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   394
    if (lst[0] == "INFO")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   395
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   396
        if(lst.size() < 5)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   397
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   398
            qWarning("Net: Malformed INFO message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   399
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   400
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   401
        emit playerInfo(lst[1], lst[2], lst[3], lst[4]);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   402
        if (netClientState != InLobby)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   403
        {
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   404
            QStringList tmp = lst;
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   405
            tmp.removeFirst();
8762
388d2bf73ff9 fix player info
sheepluva
parents: 8759
diff changeset
   406
            emit chatStringFromNet(tmp.join(" ").prepend('\x01'));
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   407
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   408
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   409
    }
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
   410
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   411
    if (lst[0] == "SERVER_VARS")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   412
    {
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   413
        QStringList tmp = lst;
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   414
        tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   415
        while (tmp.size() >= 2)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   416
        {
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   417
            if(tmp[0] == "MOTD_NEW") emit serverMessageNew(tmp[1]);
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   418
            else if(tmp[0] == "MOTD_OLD") emit serverMessageOld(tmp[1]);
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   419
            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
   420
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   421
            tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   422
            tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   423
        }
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   424
        return;
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   425
    }
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   426
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   427
    if (lst[0] == "BANLIST")
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   428
    {
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   429
        QStringList tmp = lst;
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   430
        tmp.removeFirst();
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   431
        emit bansList(tmp);
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   432
        return;
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   433
    }
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   434
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   435
    if (lst[0] == "CLIENT_FLAGS" || lst[0] == "CF")
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   436
    {
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   437
        if(lst.size() < 3 || lst[1].size() < 2)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   438
        {
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   439
            qWarning("Net: Malformed CLIENT_FLAGS message");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   440
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   441
        }
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   442
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   443
        QString flags = lst[1];
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   444
        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
   445
        const QStringList nicks = lst.mid(2);
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   446
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   447
        while(flags.size() > 1)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   448
        {
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   449
            flags.remove(0, 1);
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   450
            char c = flags[0].toAscii();
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   451
            bool inRoom = (netClientState == InRoom || netClientState == InGame);
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   452
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   453
            switch(c)
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   454
            {
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   455
                // 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
   456
                case 'r':
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   457
                    if(inRoom)
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
   458
                        foreach (const QString & nick, nicks)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   459
                        {
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
   460
                            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
   461
                            {
8983
a25e18295959 Restore ready toggle for room admins (issue 432)
unc0rr
parents: 8891
diff changeset
   462
                                emit setMyReadyStatus(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
   463
                            }
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   464
                            m_playersModel->setFlag(nick, PlayersListModel::Ready, setFlag);
6539
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   465
                        }
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
   466
                        break;
6539
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   467
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   468
                // 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
   469
                case 'u':
7727
bd252cacabe8 Bring icons back
unc0rr
parents: 7725
diff changeset
   470
                        foreach(const QString & nick, nicks)
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   471
                            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
   472
                        break;
9503
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   473
                // flag indicating if a player is in room
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   474
                case 'i':
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   475
                        foreach(const QString & nick, nicks)
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   476
                            m_playersModel->setFlag(nick, PlayersListModel::InRoom, setFlag);
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   477
                        break;
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   478
                // flag indicating if a player is contributor
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   479
                case 'c':
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   480
                        foreach(const QString & nick, nicks)
10144
b9d5a91605c7 Fix issue 780 (copy-paste fail)
unc0rr
parents: 10108
diff changeset
   481
                            m_playersModel->setFlag(nick, PlayersListModel::Contributor, setFlag);
9503
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   482
                        break;
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   483
                // flag indicating if a player has engine running
7765
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   484
                case 'g':
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   485
                    if(inRoom)
7765
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   486
                        foreach(const QString & nick, nicks)
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   487
                            m_playersModel->setFlag(nick, PlayersListModel::InGame, setFlag);
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   488
                        break;
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   489
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   490
                // 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
   491
                case 'h':
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   492
                    if(inRoom)
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   493
                        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
   494
                        {
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   495
                            if (nick == mynick)
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   496
                            {
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   497
                                isChief = setFlag;
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   498
                                emit roomMaster(isChief);
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   499
                            }
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   500
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   501
                            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
   502
                        }
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   503
                        break;
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   504
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   505
                // 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
   506
                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
   507
                        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
   508
                        {
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
   509
                            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
   510
                                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
   511
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   512
                            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
   513
                        }
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
   514
                        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
   515
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
   516
                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
   517
                        qWarning() << "Net: Unknown client-flag: " << c;
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   518
            }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   519
        }
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   520
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   521
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   522
    }
1405
ee4b28a1861d Show players ready status in chat nick list
unc0rr
parents: 1404
diff changeset
   523
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   524
    if(lst[0] == "KICKED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   525
    {
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   526
        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
   527
        askRoomsList();
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   528
        emit LeftRoom(tr("You got kicked"));
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   529
        m_playersModel->resetRoomFlags();
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   530
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   531
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   532
    }
1879
bb114339eb4e Implement kick from room
unc0rr
parents: 1878
diff changeset
   533
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   534
    if(lst[0] == "LOBBY:JOINED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   535
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   536
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   537
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   538
            qWarning("Net: Bad JOINED message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   539
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   540
        }
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   541
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   542
        for(int i = 1; i < lst.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   543
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   544
            if (lst[i] == mynick)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   545
            {
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   546
                // check if server is authenticated or no authentication was performed at all
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   547
                if(!m_serverHash.isEmpty())
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   548
                {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   549
                    Error(tr("Server authentication error"));
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   550
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   551
                    Disconnect();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   552
                }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   553
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   554
                netClientState = InLobby;
7744
75e1d0c0ba72 - Nicks starting from not-letter char go to bottom of the list
unc0rr
parents: 7736
diff changeset
   555
                RawSendNet(QString("LIST"));
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   556
                emit connected();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   557
            }
1838
00a5fc50aa43 Use another event to change state from 'logging in' to 'lobby'
unc0rr
parents: 1829
diff changeset
   558
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   559
            m_playersModel->addPlayer(lst[i], false);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   560
        }
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
    }
1566
6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents: 1560
diff changeset
   563
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   564
    if(lst[0] == "ROOM" && lst.size() == 11 && lst[1] == "ADD")
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   565
    {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   566
        QStringList tmp = lst;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   567
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   568
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   569
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   570
        m_roomsListModel->addRoom(tmp);
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   571
        return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   572
    }
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   573
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   574
    if(lst[0] == "ROOM" && lst.size() == 12 && lst[1] == "UPD")
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   575
    {
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   576
        QStringList tmp = lst;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   577
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   578
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   579
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   580
        QString roomName = tmp.takeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   581
        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
   582
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   583
        // keep track of room name so correct name is displayed
9906
93c16a4b0c6a Only emit roomNameUpdated when it actually is changed
unc0rr
parents: 9730
diff changeset
   584
        if(myroom == roomName && myroom != tmp[1])
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   585
        {
7712
unc0rr
parents: 7710
diff changeset
   586
            myroom = tmp[1];
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   587
            emit roomNameUpdated(myroom);
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   588
        }
7710
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents: 7684
diff changeset
   589
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   590
        return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   591
    }
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   592
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   593
    if(lst[0] == "ROOM" && lst.size() == 3 && lst[1] == "DEL")
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   594
    {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   595
        m_roomsListModel->removeRoom(lst[2]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   596
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   597
    }
1591
1db9b654f880 Notify lobby when a room is created or deleted
unc0rr
parents: 1587
diff changeset
   598
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   599
    if(lst[0] == "LOBBY:LEFT")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   600
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   601
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   602
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   603
            qWarning("Net: Bad LOBBY:LEFT message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   604
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   605
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   606
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   607
        if (lst.size() < 3)
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   608
            m_playersModel->removePlayer(lst[1]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   609
        else
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   610
            m_playersModel->removePlayer(lst[1], lst[2]);
7725
4ad05a478c6c Further work on moving to players list model
unc0rr
parents: 7723
diff changeset
   611
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   612
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   613
    }
1566
6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents: 1560
diff changeset
   614
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   615
    if (lst[0] == "ASKPASSWORD")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   616
    {
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   617
        // server should send us salt of at least 16 characters
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   618
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   619
        if(lst.size() < 2 || lst[1].size() < 16)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   620
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   621
            qWarning("Net: Bad ASKPASSWORD message");
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   622
            return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   623
        }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   624
8291
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8157
diff changeset
   625
        emit NickRegistered(mynick);
8299
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8291
diff changeset
   626
        m_nick_registered = true;
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   627
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   628
        // store server salt
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   629
        // when this variable is set, it is assumed that server asked us for a password
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   630
        m_serverSalt = lst[1];
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   631
        m_clientSalt = QUuid::createUuid().toString();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   632
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   633
        maybeSendPassword();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   634
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   635
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   636
    }
1841
fba7210b438b Retrieve client password from web database and ask for it
unc0rr
parents: 1838
diff changeset
   637
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   638
    if (lst[0] == "NOTICE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   639
    {
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   640
        if(lst.size() < 2)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   641
        {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   642
            qWarning("Net: Bad NOTICE message");
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   643
            return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   644
        }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   645
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   646
        bool ok;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   647
        int n = lst[1].toInt(&ok);
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   648
        if(!ok)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   649
        {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   650
            qWarning("Net: Bad NOTICE message");
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   651
            return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   652
        }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   653
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   654
        handleNotice(n);
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   655
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   656
        return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   657
    }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   658
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   659
    if (lst[0] == "BYE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   660
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   661
        if (lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   662
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   663
            qWarning("Net: Bad BYE message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   664
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   665
        }
5861
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   666
        if (lst[1] == "Authentication failed")
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   667
        {
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   668
            emit AuthFailed();
8401
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   669
            m_game_connected = false;
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   670
            Disconnect();
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   671
            //omitted 'emit disconnected()', we don't want the error message
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   672
            return;
5861
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   673
        }
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   674
        m_game_connected = false;
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   675
        Disconnect();
8401
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   676
        emit disconnected(HWApplication::translate("server", lst[1].toAscii().constData()));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   677
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   678
    }
1512
43742041c211 - Don't send 'Bad param' msg, as the only reason of it is just some lag
unc0rr
parents: 1475
diff changeset
   679
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   680
    if(lst[0] == "JOINING")
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   681
    {
9730
20dca3377887 Fix erroneous message in console debug
unc0rr
parents: 9702
diff changeset
   682
        if(lst.size() != 2)
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   683
        {
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   684
            qWarning("Net: Bad JOINING message");
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   685
            return;
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   686
        }
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   687
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   688
        myroom = lst[1];
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   689
        emit roomNameUpdated(myroom);
9730
20dca3377887 Fix erroneous message in console debug
unc0rr
parents: 9702
diff changeset
   690
        return;
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   691
    }
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   692
7535
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   693
    if(netClientState == InLobby && lst[0] == "JOINED")
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   694
    {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   695
        if(lst.size() < 2 || lst[1] != mynick)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   696
        {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   697
            qWarning("Net: Bad JOINED message");
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   698
            return;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   699
        }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   700
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   701
        for(int i = 1; i < lst.size(); ++i)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   702
        {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   703
            if (lst[i] == mynick)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   704
            {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   705
                netClientState = InRoom;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   706
                emit EnteredGame();
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   707
                emit roomMaster(isChief);
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   708
                if (isChief)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   709
                    emit configAsked();
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   710
            }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   711
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   712
            m_playersModel->playerJoinedRoom(lst[i], isChief && (lst[i] != mynick));
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   713
7535
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   714
            emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   715
        }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   716
        return;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   717
    }
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   718
7545
063601290761 Forgot this state
unc0rr
parents: 7535
diff changeset
   719
    if(netClientState == InRoom || netClientState == InGame)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   720
    {
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   721
        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
   722
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   723
            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
   724
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   725
                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
   726
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   727
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   728
            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
   729
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   730
                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
   731
                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
   732
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   733
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   734
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   735
8303
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   736
        if (lst[0] == "ROUND_FINISHED")
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   737
        {
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   738
            emit FromNet(QByteArray("\x01o"));
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   739
            return;
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   740
        }
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   741
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   742
        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
   743
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   744
            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
   745
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   746
                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
   747
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   748
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   749
            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
   750
            tmp.removeFirst();
10400
47e2189eae44 This should make frontend aware of your own teams in game on rejoin
unc0rr
parents: 10248
diff changeset
   751
            HWTeam team(tmp);
47e2189eae44 This should make frontend aware of your own teams in game on rejoin
unc0rr
parents: 10248
diff changeset
   752
            emit AddNetTeam(team);
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   753
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   754
        }
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
        if (lst[0] == "REMOVE_TEAM")
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   757
        {
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   758
            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
   759
            {
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: 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
   761
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   762
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   763
            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
   764
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   765
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   766
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   767
        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
   768
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   769
            netClientState = InLobby;
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   770
            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
   771
            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
   772
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   773
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   774
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   775
        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
   776
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   777
            netClientState = InGame;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   778
            emit AskForRunGame();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   779
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   780
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   781
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   782
        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
   783
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   784
            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
   785
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   786
                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
   787
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   788
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   789
            emit TeamAccepted(lst[1]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   790
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   791
        }
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   792
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   793
        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
   794
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   795
            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
   796
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   797
                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
   798
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   799
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   800
            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
   801
            tmp.removeFirst();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   802
            tmp.removeFirst();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   803
            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
   804
                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
   805
            else
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   806
                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
   807
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   808
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   809
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   810
        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
   811
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   812
            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
   813
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   814
                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
   815
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   816
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   817
            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
   818
            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
   819
            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
   820
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   821
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   822
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   823
        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
   824
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   825
            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
   826
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   827
                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
   828
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   829
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   830
            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
   831
            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
   832
            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
   833
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   834
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   835
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   836
        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
   837
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   838
            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
   839
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   840
                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
   841
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   842
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   843
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   844
            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
   845
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   846
                emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   847
                m_playersModel->playerJoinedRoom(lst[i], isChief && (lst[i] != mynick));
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   848
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   849
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   850
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   851
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   852
        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
   853
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   854
            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
   855
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   856
                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
   857
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   858
            }
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   859
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   860
            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
   861
                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
   862
            else
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   863
                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
   864
            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
   865
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   866
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   867
    }
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
   868
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   869
    qWarning() << "Net: Unknown message or wrong state:" << lst;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   870
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   871
352
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   872
void HWNewNet::onHedgehogsNumChanged(const HWTeam& team)
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   873
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   874
    if (isChief)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   875
        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
   876
                   .arg(delimeter)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   877
                   .arg(team.name())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   878
                   .arg(team.numHedgehogs()));
352
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   879
}
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   880
372
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   881
void HWNewNet::onTeamColorChanged(const HWTeam& team)
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   882
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   883
    if (isChief)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   884
        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
   885
                   .arg(delimeter)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   886
                   .arg(team.name())
7130
fcab1fd02bc6 - Allow switching colors with mouse wheel
unc0rr
parents: 6952
diff changeset
   887
                   .arg(team.color()));
372
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   888
}
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   889
1873
815a3ff1fe4b Start refactoring some things. Frontend becomes temporarily unusable for network game
unc0rr
parents: 1866
diff changeset
   890
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
   891
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   892
    if (isChief)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   893
        RawSendNet(
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   894
            QString("CFG%1%2%1%3")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   895
            .arg(delimeter)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   896
            .arg(param)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   897
            .arg(value.join(QString(delimeter)))
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   898
        );
1797
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1793
diff changeset
   899
}
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1793
diff changeset
   900
8765
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   901
void HWNewNet::chatLineToNetWithEcho(const QString& str)
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   902
{
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   903
    if(str != "")
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   904
    {
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   905
        emit chatStringFromNet(HWProto::formatChatMsg(mynick, str));
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   906
        chatLineToNet(str);
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   907
    }
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   908
}
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   909
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   910
void HWNewNet::chatLineToNet(const QString& str)
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   911
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   912
    if(str != "")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   913
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   914
        RawSendNet(QString("CHAT") + delimeter + str);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   915
        QString action = HWProto::chatStringToAction(str);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   916
        if (action != NULL)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   917
            emit(roomChatAction(mynick, action));
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   918
        else
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   919
            emit(roomChatMessage(mynick, str));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   920
    }
1568
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   921
}
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   922
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   923
void HWNewNet::chatLineToLobby(const QString& str)
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   924
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   925
    if(str != "")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   926
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   927
        RawSendNet(QString("CHAT") + delimeter + str);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   928
        QString action = HWProto::chatStringToAction(str);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   929
        if (action != NULL)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   930
            emit(lobbyChatAction(mynick, action));
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   931
        else
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   932
            emit(lobbyChatMessage(mynick, str));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   933
    }
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   934
}
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   935
2403
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   936
void HWNewNet::SendTeamMessage(const QString& str)
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   937
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   938
    RawSendNet(QString("TEAMCHAT") + delimeter + str);
2403
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   939
}
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   940
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   941
void HWNewNet::askRoomsList()
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   942
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   943
    if(netClientState != InLobby)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   944
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   945
        qWarning("Illegal try to get rooms list!");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   946
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   947
    }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   948
    RawSendNet(QString("LIST"));
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   949
}
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
   950
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   951
HWNewNet::ClientState HWNewNet::clientState()
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   952
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   953
    return netClientState;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   954
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   955
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   956
QString HWNewNet::getNick()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   957
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   958
    return mynick;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   959
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   960
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   961
QString HWNewNet::getRoom()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   962
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   963
    return myroom;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   964
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   965
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   966
QString HWNewNet::getHost()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   967
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   968
    return myhost;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   969
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   970
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
   971
bool HWNewNet::isRoomChief()
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
   972
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   973
    return isChief;
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
   974
}
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
   975
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
   976
void HWNewNet::gameFinished(bool correctly)
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
   977
{
6739
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
   978
    if (netClientState == InGame)
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
   979
    {
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
   980
        netClientState = InRoom;
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
   981
        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
   982
    }
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
   983
}
1378
1a391883261d Allow /me in chat
unc0rr
parents: 1377
diff changeset
   984
1860
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
   985
void HWNewNet::banPlayer(const QString & nick)
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
   986
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   987
    RawSendNet(QString("BAN%1%2").arg(delimeter).arg(nick));
1860
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
   988
}
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
   989
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   990
void HWNewNet::banIP(const QString & ip, const QString & reason, int seconds)
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   991
{
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   992
    RawSendNet(QString("BANIP%1%2%1%3%1%4").arg(delimeter).arg(ip).arg(reason).arg(seconds));
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   993
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   994
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   995
void HWNewNet::banNick(const QString & nick, const QString & reason, int seconds)
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   996
{
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   997
    RawSendNet(QString("BANNICK%1%2%1%3%1%4").arg(delimeter).arg(nick).arg(reason).arg(seconds));
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   998
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   999
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1000
void HWNewNet::getBanList()
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1001
{
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1002
    RawSendNet(QByteArray("BANLIST"));
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1003
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1004
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1005
void HWNewNet::removeBan(const QString & b)
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1006
{
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1007
    RawSendNet(QString("UNBAN%1%2").arg(delimeter).arg(b));
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1008
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1009
1391
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
  1010
void HWNewNet::kickPlayer(const QString & nick)
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
  1011
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1012
    RawSendNet(QString("KICK%1%2").arg(delimeter).arg(nick));
1391
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
  1013
}
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1014
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1015
void HWNewNet::infoPlayer(const QString & nick)
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1016
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1017
    RawSendNet(QString("INFO%1%2").arg(delimeter).arg(nick));
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1018
}
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1019
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
  1020
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
  1021
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1022
    if (!isInRoom())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1023
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1024
        RawSendNet(QString("FOLLOW%1%2").arg(delimeter).arg(nick));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1025
        isChief = false;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1026
    }
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
  1027
}
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
  1028
8396
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1029
void HWNewNet::consoleCommand(const QString & cmd)
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1030
{
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1031
    RawSendNet(QString("CMD%1%2").arg(delimeter).arg(cmd));
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1032
}
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1033
8416
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1034
bool HWNewNet::allPlayersReady()
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1035
{
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1036
    int ready = 0;
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1037
    for (int i = 0; i < m_roomPlayersModel->rowCount(); i++)
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1038
        if (m_roomPlayersModel->index(i, 0).data(PlayersListModel::Ready).toBool()) ready++;
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1039
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1040
    return (ready == m_roomPlayersModel->rowCount());
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1041
}
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1042
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1043
void HWNewNet::startGame()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1044
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1045
    RawSendNet(QString("START_GAME"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1046
}
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1047
5126
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1048
void HWNewNet::updateRoomName(const QString & name)
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1049
{
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1050
    RawSendNet(QString("ROOM_NAME%1%2").arg(delimeter).arg(name));
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1051
}
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1052
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1053
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1054
void HWNewNet::toggleRestrictJoins()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1055
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1056
    RawSendNet(QString("TOGGLE_RESTRICT_JOINS"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1057
}
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1058
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1059
void HWNewNet::toggleRestrictTeamAdds()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1060
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1061
    RawSendNet(QString("TOGGLE_RESTRICT_TEAMS"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1062
}
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1063
8559
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1064
void HWNewNet::toggleRegisteredOnly()
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1065
{
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1066
    RawSendNet(QString("TOGGLE_REGISTERED_ONLY"));
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1067
}
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1068
2155
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1069
void HWNewNet::clearAccountsCache()
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1070
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1071
    RawSendNet(QString("CLEAR_ACCOUNTS_CACHE"));
2155
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1072
}
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1073
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1074
void HWNewNet::partRoom()
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1075
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
  1076
    netClientState = InLobby;
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
  1077
    m_playersModel->resetRoomFlags();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1078
    RawSendNet(QString("PART"));
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1079
}
1671
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1080
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1081
bool HWNewNet::isInRoom()
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1082
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
  1083
    return netClientState >= InRoom;
1671
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1084
}
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
  1085
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1086
void HWNewNet::setServerMessageNew(const QString & msg)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1087
{
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1088
    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
  1089
}
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1090
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1091
void HWNewNet::setServerMessageOld(const QString & msg)
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
  1092
{
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1093
    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
  1094
}
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1095
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1096
void HWNewNet::setLatestProtocolVar(int proto)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1097
{
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1098
    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
  1099
}
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1100
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1101
void HWNewNet::askServerVars()
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1102
{
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3555
diff changeset
  1103
    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
  1104
}
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1105
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1106
void HWNewNet::handleNotice(int n)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1107
{
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1108
    switch(n)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1109
    {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1110
        case 0:
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
  1111
            emit NickTaken(mynick);
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1112
            break;
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1113
        case 2:
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1114
            emit askForRoomPassword();
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1115
            break;
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1116
    }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1117
}
6732
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1118
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1119
RoomsListModel * HWNewNet::roomsListModel()
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1120
{
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1121
    return m_roomsListModel;
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1122
}
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1123
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
  1124
QAbstractItemModel *HWNewNet::lobbyPlayersModel()
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1125
{
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1126
    return m_lobbyPlayersModel;
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1127
}
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1128
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
  1129
QAbstractItemModel *HWNewNet::roomPlayersModel()
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1130
{
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1131
    return m_roomPlayersModel;
8436
b89aacebb9db - Also pass unknown cmds to the server when in room
unc0rr
parents: 8416
diff changeset
  1132
}
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1133
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1134
void HWNewNet::roomPasswordEntered(const QString &password)
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1135
{
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1136
    if(!myroom.isEmpty())
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1137
        JoinRoom(myroom, password);
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1138
}
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1139
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1140
void HWNewNet::maybeSendPassword()
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1141
{
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1142
/* When we got password hash, and server asked us for a password, perform mutual authentication:
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1143
 * at this point we have salt chosen by server
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1144
 * client sends client salt and hash of secret (password hash) salted with client salt, server salt,
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1145
 * and static salt (predefined string + protocol number)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1146
 * server should respond with hash of the same set in different order.
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1147
 */
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1148
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1149
    if(m_passwordHash.isEmpty() || m_serverSalt.isEmpty())
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1150
        return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1151
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
  1152
    QString hash = QCryptographicHash::hash(
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1153
                m_clientSalt.toAscii()
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1154
                .append(m_serverSalt.toAscii())
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1155
                .append(m_passwordHash)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1156
                .append(cProtoVer->toAscii())
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1157
                .append("!hedgewars")
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
  1158
                , QCryptographicHash::Sha1).toHex();
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1159
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1160
    m_serverHash = QCryptographicHash::hash(
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1161
                m_serverSalt.toAscii()
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1162
                .append(m_clientSalt.toAscii())
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1163
                .append(m_passwordHash)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1164
                .append(cProtoVer->toAscii())
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1165
                .append("!hedgewars")
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
  1166
                , QCryptographicHash::Sha1).toHex();
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1167
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1168
    RawSendNet(QString("PASSWORD%1%2%1%3").arg(delimeter).arg(hash).arg(m_clientSalt));
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1169
}