QTfrontend/net/newnetclient.cpp
author alfadur
Fri, 12 Apr 2019 23:29:58 +0300
changeset 14797 ce2268ae261f
parent 13969 4d761adb4e6c
child 14838 bdb47255d7e4
permissions -rw-r--r--
add missing room joined message
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>
11046
47a8c19ecb60 more copyright fixes
sheepluva
parents: 10695
diff changeset
     4
 * Copyright (c) 2004-2015 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
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
    35
char delimiter='\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
    {
13673
1aa5e884326a Fix some string/translation inconsistencies in strings related to leaving
Wuzzy <Wuzzy2@mail.ru>
parents: 13658
diff changeset
    77
        RawSendNet(QString("QUIT%1").arg(delimiter));
13846
d8e606cf8ff5 Simplify /quit chat command
Wuzzy <Wuzzy2@mail.ru>
parents: 13695
diff changeset
    78
        emit disconnected("");
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)
13673
1aa5e884326a Fix some string/translation inconsistencies in strings related to leaving
Wuzzy <Wuzzy2@mail.ru>
parents: 13658
diff changeset
    94
        RawSendNet(QString("QUIT%1").arg(delimiter));
2948
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
{
13322
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   102
    if(netClientState != InLobby || !ByteLength(room))
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())
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   111
        RawSendNet(QString("CREATE_ROOM%1%2").arg(delimiter).arg(room));
9541
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   112
    else
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   113
        RawSendNet(QString("CREATE_ROOM%1%2%1%3").arg(delimiter).arg(room).arg(password));
9541
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())
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   129
        RawSendNet(QString("JOIN_ROOM%1%2").arg(delimiter).arg(room));
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   130
    else
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   131
        RawSendNet(QString("JOIN_ROOM%1%2%1%3").arg(delimiter).arg(room).arg(password));
9549
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
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   138
    QString cmd = QString("ADD_TEAM") + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   139
                  team.name() + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   140
                  QString::number(team.color()) + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   141
                  team.grave() + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   142
                  team.fort() + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   143
                  team.voicepack() + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   144
                  team.flag() + delimiter +
6616
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
    {
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   149
        cmd.append(delimiter);
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);
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   151
        cmd.append(delimiter);
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
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   159
    RawSendNet(QString("REMOVE_TEAM") + delimiter + 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
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   164
    RawSendNet(QString("NICK%1%2").arg(delimiter).arg(nick));
5998
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
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   176
    RawSendNet(QString("EM%1%2").arg(delimiter).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
13322
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   179
int HWNewNet::ByteLength(const QString & str)
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   180
{
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   181
	return str.toUtf8().size();
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   182
}
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   183
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   184
void HWNewNet::RawSendNet(const QString & str)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   185
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   186
    RawSendNet(str.toUtf8());
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   187
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   188
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   189
void HWNewNet::RawSendNet(const QByteArray & buf)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   190
{
11461
5dbc0f976b4a assume frontend buffer utf-8 to avoid garbage strings in debug
nemo
parents: 11046
diff changeset
   191
    qDebug() << "Client: " << QString(QString::fromUtf8(buf)).split("\n");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   192
    NetSocket.write(buf);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   193
    NetSocket.write("\n\n", 2);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   194
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   195
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   196
void HWNewNet::ClientRead()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   197
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   198
    while (NetSocket.canReadLine())
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
        QString s = QString::fromUtf8(NetSocket.readLine());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   201
        if (s.endsWith('\n')) s.chop(1);
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   202
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   203
        if (s.size() == 0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   204
        {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   205
            ParseCmd(cmdbuf);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   206
            cmdbuf.clear();
8534
92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents: 8489
diff changeset
   207
            emit messageProcessed();
92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents: 8489
diff changeset
   208
            return ;
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   209
        }
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   210
        else
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   211
            cmdbuf << s;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   212
    }
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::OnConnect()
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   216
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   217
    netClientState = Connected;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   218
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   219
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   220
void HWNewNet::OnDisconnect()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   221
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   222
    netClientState = Disconnected;
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   223
    if(m_game_connected) emit disconnected("");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   224
    m_game_connected = false;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   225
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   226
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   227
void HWNewNet::displayError(QAbstractSocket::SocketError socketError)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   228
{
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
   229
    m_game_connected = false;
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   230
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   231
    switch (socketError)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   232
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   233
        case QAbstractSocket::RemoteHostClosedError:
6722
e3a35bc838fb Show message and return from network game pages on server shutdown
unc0rr
parents: 6700
diff changeset
   234
            emit disconnected(tr("Remote host has closed connection"));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   235
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   236
        case QAbstractSocket::HostNotFoundError:
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   237
            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
   238
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   239
        case QAbstractSocket::ConnectionRefusedError:
13658
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   240
            if (getHost() == (QString("%1:%2").arg(NETGAME_DEFAULT_SERVER).arg(NETGAME_DEFAULT_PORT)))
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   241
                // Error for official server
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   242
                emit disconnected(tr("The connection was refused by the official server or timed out. Something seems to be wrong with the official server at the moment. This might be a temporary problem. Please try again later."));
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   243
            else
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   244
                // Error for every other host
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   245
                emit disconnected(tr("The connection was refused by the host or timed out. This might have one of the following reasons:\n- The Hedgewars Server program does currently not run on the host\n- The specified port number is incorrect\n- There is a temporary network problem\n\nPlease check the host name and port settings and/or try again later."));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   246
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   247
        default:
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   248
            emit disconnected(NetSocket.errorString());
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   249
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   250
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   251
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   252
void HWNewNet::SendPasswordHash(const QString & hash)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   253
{
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   254
    // don't send it immediately, only store and check if server asked us for a password
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   255
    m_passwordHash = hash.toLatin1();
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   256
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   257
    maybeSendPassword();
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   258
}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   259
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   260
void HWNewNet::ParseCmd(const QStringList & lst)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   261
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   262
    qDebug() << "Server: " << lst;
1305
453882eb4467 - Fix build of server (has some bugs now)
unc0rr
parents: 1302
diff changeset
   263
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   264
    if(!lst.size())
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   265
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   266
        qWarning("Net client: Bad message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   267
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   268
    }
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 319
diff changeset
   269
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   270
    if (lst[0] == "NICK")
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   271
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   272
        mynick = lst[1];
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   273
        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
   274
        m_nick_registered = false;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   275
        return ;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   276
    }
1308
d5dcd6cfa5e2 Fix another server failure (when second client in room disconnects)
unc0rr
parents: 1307
diff changeset
   277
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   278
    if (lst[0] == "PROTO")
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   279
        return ;
2108
a689375bbfee Silence frontend debug output
unc0rr
parents: 1990
diff changeset
   280
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   281
    if (lst[0] == "ERROR")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   282
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   283
        if (lst.size() == 2)
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   284
            emit Error(HWApplication::translate("server", lst[1].toLatin1().constData()));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   285
        else
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   286
            emit Error("Unknown error");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   287
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   288
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   289
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   290
    if (lst[0] == "WARNING")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   291
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   292
        if (lst.size() == 2)
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   293
            emit Warning(HWApplication::translate("server", lst[1].toLatin1().constData()));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   294
        else
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   295
            emit Warning("Unknown warning");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   296
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   297
    }
1307
ce26e16d18ab - Now actually fix
unc0rr
parents: 1305
diff changeset
   298
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   299
    if (lst[0] == "CONNECTED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   300
    {
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
   301
        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
   302
        {
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
   303
            // 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
   304
            qWarning() << "Server too old";
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   305
            RawSendNet(QString("QUIT%1%2").arg(delimiter).arg("Server too old"));
6737
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   306
            Disconnect();
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   307
            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
   308
            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
   309
        }
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
   310
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   311
        RawSendNet(QString("NICK%1%2").arg(delimiter).arg(mynick));
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   312
        RawSendNet(QString("PROTO%1%2").arg(delimiter).arg(*cProtoVer));
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   313
        netClientState = Connected;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   314
        m_game_connected = true;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   315
        emit adminAccess(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   316
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   317
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   318
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   319
    if (lst[0] == "SERVER_AUTH")
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   320
    {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   321
        if(lst.size() < 2)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   322
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   323
            qWarning("Net: Malformed SERVER_AUTH message");
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   324
            return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   325
        }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   326
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
   327
        if(lst[1] != m_serverHash)
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   328
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   329
            Error("Server authentication error");
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   330
            Disconnect();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   331
        } else
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   332
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   333
            // empty m_serverHash variable means no authentication was performed
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   334
            // or server passed authentication
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   335
            m_serverHash.clear();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   336
        }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   337
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   338
        return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   339
    }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   340
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   341
    if (lst[0] == "PING")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   342
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   343
        if (lst.size() > 1)
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   344
            RawSendNet(QString("PONG%1%2").arg(delimiter).arg(lst[1]));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   345
        else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   346
            RawSendNet(QString("PONG"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   347
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   348
    }
1462
d3323637da1f Client sends PONG to server's PING
unc0rr
parents: 1427
diff changeset
   349
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   350
    if (lst[0] == "ROOMS")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   351
    {
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   352
        if(lst.size() % 9 != 1)
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   353
        {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   354
            qWarning("Net: Malformed ROOMS message");
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   355
            return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   356
        }
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   357
        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
   358
        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
   359
        {
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
   360
            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
   361
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   362
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   363
    }
1313
f4c54e9e1b8c - Introduce a bit of state miachine in client code (should be more robust and verbosive now)
unc0rr
parents: 1311
diff changeset
   364
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   365
    if (lst[0] == "SERVER_MESSAGE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   366
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   367
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   368
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   369
            qWarning("Net: Empty SERVERMESSAGE message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   370
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   371
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   372
        emit serverMessage(lst[1]);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   373
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   374
    }
1377
a9e768739345 - Customize QTextBrowser look
unc0rr
parents: 1369
diff changeset
   375
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   376
    if (lst[0] == "CHAT")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   377
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   378
        if(lst.size() < 3)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   379
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   380
            qWarning("Net: Empty CHAT message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   381
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   382
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   383
13692
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   384
        QString action;
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   385
        QString message;
13969
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   386
        QString sender = lst[1];
13695
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   387
        // '[' is a special character used in fake nick names of server messages.
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   388
        // Those are supposed to be translated
13969
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   389
        if(!sender.startsWith('['))
13692
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   390
        {
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   391
            // Normal message
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   392
            message = lst[2];
13695
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   393
            // Another kind of fake nick. '(' nicks are server messages, but they must not be translated
13969
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   394
            if(!sender.startsWith('('))
13695
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   395
            {
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   396
                // Check for action (/me command)
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   397
                action = HWProto::chatStringToAction(message);
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   398
            }
13969
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   399
            else
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   400
            {
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   401
                // If parenthesis were used, replace them with square brackets
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   402
                // for a consistent style.
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   403
                sender.replace(0, 1, '[');
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   404
                sender.replace(sender.length()-1, 1, ']');
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   405
            }
13692
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   406
        }
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   407
        else
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   408
        {
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   409
            // Server message
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   410
            // Server messages are translated client-side
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   411
            message = HWApplication::translate("server", lst[2].toLatin1().constData());
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   412
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   413
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   414
        if (netClientState == InLobby)
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   415
        {
13692
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   416
            if (!action.isNull())
13969
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   417
                emit lobbyChatAction(sender, action);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   418
            else
13969
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   419
                emit lobbyChatMessage(sender, message);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   420
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   421
        else
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   422
        {
13969
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   423
            emit chatStringFromNet(HWProto::formatChatMsg(sender, message));
13692
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   424
            if (!action.isNull())
13969
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   425
                emit roomChatAction(sender, action);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   426
            else
13969
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13846
diff changeset
   427
                emit roomChatMessage(sender, message);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   428
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   429
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   430
    }
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   431
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   432
    if (lst[0] == "INFO")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   433
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   434
        if(lst.size() < 5)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   435
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   436
            qWarning("Net: Malformed INFO message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   437
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   438
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   439
        emit playerInfo(lst[1], lst[2], lst[3], lst[4]);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   440
        if (netClientState != InLobby)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   441
        {
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   442
            QStringList tmp = lst;
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   443
            tmp.removeFirst();
8762
388d2bf73ff9 fix player info
sheepluva
parents: 8759
diff changeset
   444
            emit chatStringFromNet(tmp.join(" ").prepend('\x01'));
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   445
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   446
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   447
    }
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
   448
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   449
    if (lst[0] == "SERVER_VARS")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   450
    {
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   451
        QStringList tmp = lst;
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   452
        tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   453
        while (tmp.size() >= 2)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   454
        {
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   455
            if(tmp[0] == "MOTD_NEW") emit serverMessageNew(tmp[1]);
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   456
            else if(tmp[0] == "MOTD_OLD") emit serverMessageOld(tmp[1]);
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   457
            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
   458
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   459
            tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   460
            tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   461
        }
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   462
        return;
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   463
    }
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   464
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   465
    if (lst[0] == "BANLIST")
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   466
    {
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   467
        QStringList tmp = lst;
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   468
        tmp.removeFirst();
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   469
        emit bansList(tmp);
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   470
        return;
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   471
    }
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   472
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   473
    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
   474
    {
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   475
        if(lst.size() < 3 || lst[1].size() < 2)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   476
        {
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   477
            qWarning("Net: Malformed CLIENT_FLAGS message");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   478
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   479
        }
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   480
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   481
        QString flags = lst[1];
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   482
        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
   483
        const QStringList nicks = lst.mid(2);
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   484
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   485
        while(flags.size() > 1)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   486
        {
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   487
            flags.remove(0, 1);
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   488
            char c = flags[0].toLatin1();
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   489
            bool inRoom = (netClientState == InRoom || netClientState == InGame);
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   490
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   491
            switch(c)
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   492
            {
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   493
                // 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
   494
                case 'r':
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   495
                    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
   496
                        foreach (const QString & nick, nicks)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   497
                        {
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
   498
                            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
   499
                            {
8983
a25e18295959 Restore ready toggle for room admins (issue 432)
unc0rr
parents: 8891
diff changeset
   500
                                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
   501
                            }
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   502
                            m_playersModel->setFlag(nick, PlayersListModel::Ready, setFlag);
6539
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   503
                        }
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
   504
                        break;
6539
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   505
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   506
                // 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
   507
                case 'u':
7727
bd252cacabe8 Bring icons back
unc0rr
parents: 7725
diff changeset
   508
                        foreach(const QString & nick, nicks)
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   509
                            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
   510
                        break;
9503
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   511
                // flag indicating if a player is in room
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   512
                case 'i':
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   513
                        foreach(const QString & nick, nicks)
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   514
                            m_playersModel->setFlag(nick, PlayersListModel::InRoom, setFlag);
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   515
                        break;
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   516
                // flag indicating if a player is contributor
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   517
                case 'c':
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   518
                        foreach(const QString & nick, nicks)
10144
b9d5a91605c7 Fix issue 780 (copy-paste fail)
unc0rr
parents: 10108
diff changeset
   519
                            m_playersModel->setFlag(nick, PlayersListModel::Contributor, setFlag);
9503
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   520
                        break;
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   521
                // flag indicating if a player has engine running
7765
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   522
                case 'g':
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   523
                    if(inRoom)
7765
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   524
                        foreach(const QString & nick, nicks)
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   525
                            m_playersModel->setFlag(nick, PlayersListModel::InGame, setFlag);
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   526
                        break;
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   527
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   528
                // 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
   529
                case 'h':
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   530
                    if(inRoom)
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   531
                        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
   532
                        {
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   533
                            if (nick == mynick)
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   534
                            {
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   535
                                isChief = setFlag;
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   536
                                emit roomMaster(isChief);
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   537
                            }
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   538
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   539
                            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
   540
                        }
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   541
                        break;
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   542
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   543
                // 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
   544
                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
   545
                        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
   546
                        {
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
   547
                            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
   548
                                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
   549
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   550
                            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
   551
                        }
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
   552
                        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
   553
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
   554
                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
   555
                        qWarning() << "Net: Unknown client-flag: " << c;
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   556
            }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   557
        }
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   558
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   559
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   560
    }
1405
ee4b28a1861d Show players ready status in chat nick list
unc0rr
parents: 1404
diff changeset
   561
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   562
    if(lst[0] == "KICKED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   563
    {
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   564
        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
   565
        askRoomsList();
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   566
        emit LeftRoom(tr("You got kicked"));
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   567
        m_playersModel->resetRoomFlags();
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   568
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   569
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   570
    }
1879
bb114339eb4e Implement kick from room
unc0rr
parents: 1878
diff changeset
   571
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   572
    if(lst[0] == "LOBBY:JOINED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   573
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   574
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   575
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   576
            qWarning("Net: Bad JOINED message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   577
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   578
        }
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   579
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   580
        for(int i = 1; i < lst.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   581
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   582
            if (lst[i] == mynick)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   583
            {
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   584
                // check if server is authenticated or no authentication was performed at all
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   585
                if(!m_serverHash.isEmpty())
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   586
                {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   587
                    Error(tr("Server authentication error"));
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   588
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   589
                    Disconnect();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   590
                }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   591
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   592
                netClientState = InLobby;
11463
fe46826de291 Don't send LIST command on join
unc0rr
parents: 11461
diff changeset
   593
                //RawSendNet(QString("LIST")); //deprecated
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   594
                emit connected();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   595
            }
1838
00a5fc50aa43 Use another event to change state from 'logging in' to 'lobby'
unc0rr
parents: 1829
diff changeset
   596
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   597
            m_playersModel->addPlayer(lst[i], false);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   598
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   599
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   600
    }
1566
6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents: 1560
diff changeset
   601
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   602
    if(lst[0] == "ROOM" && lst.size() == 11 && lst[1] == "ADD")
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   603
    {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   604
        QStringList tmp = lst;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   605
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   606
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   607
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   608
        m_roomsListModel->addRoom(tmp);
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   609
        return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   610
    }
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   611
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   612
    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
   613
    {
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   614
        QStringList tmp = lst;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   615
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   616
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   617
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   618
        QString roomName = tmp.takeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   619
        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
   620
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
   621
        // 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
   622
        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
   623
        {
7712
unc0rr
parents: 7710
diff changeset
   624
            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
   625
            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
   626
        }
7710
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents: 7684
diff changeset
   627
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   628
        return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   629
    }
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   630
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   631
    if(lst[0] == "ROOM" && lst.size() == 3 && lst[1] == "DEL")
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   632
    {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   633
        m_roomsListModel->removeRoom(lst[2]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   634
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   635
    }
1591
1db9b654f880 Notify lobby when a room is created or deleted
unc0rr
parents: 1587
diff changeset
   636
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   637
    if(lst[0] == "LOBBY:LEFT")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   638
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   639
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   640
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   641
            qWarning("Net: Bad LOBBY:LEFT message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   642
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   643
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   644
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   645
        if (lst.size() < 3)
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   646
            m_playersModel->removePlayer(lst[1]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   647
        else
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   648
            m_playersModel->removePlayer(lst[1], lst[2]);
7725
4ad05a478c6c Further work on moving to players list model
unc0rr
parents: 7723
diff changeset
   649
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   650
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   651
    }
1566
6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents: 1560
diff changeset
   652
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   653
    if (lst[0] == "ASKPASSWORD")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   654
    {
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   655
        // server should send us salt of at least 16 characters
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   656
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   657
        if(lst.size() < 2 || lst[1].size() < 16)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   658
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   659
            qWarning("Net: Bad ASKPASSWORD message");
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   660
            return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   661
        }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   662
8291
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8157
diff changeset
   663
        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
   664
        m_nick_registered = true;
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   665
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   666
        // store server salt
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   667
        // 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
   668
        m_serverSalt = lst[1];
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   669
        m_clientSalt = QUuid::createUuid().toString();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   670
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   671
        maybeSendPassword();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   672
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   673
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   674
    }
1841
fba7210b438b Retrieve client password from web database and ask for it
unc0rr
parents: 1838
diff changeset
   675
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   676
    if (lst[0] == "NOTICE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   677
    {
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   678
        if(lst.size() < 2)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   679
        {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   680
            qWarning("Net: Bad NOTICE message");
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   681
            return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   682
        }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   683
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   684
        bool ok;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   685
        int n = lst[1].toInt(&ok);
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   686
        if(!ok)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   687
        {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   688
            qWarning("Net: Bad NOTICE message");
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   689
            return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   690
        }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   691
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   692
        handleNotice(n);
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   693
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   694
        return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   695
    }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   696
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   697
    if (lst[0] == "BYE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   698
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   699
        if (lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   700
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   701
            qWarning("Net: Bad BYE message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   702
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   703
        }
5861
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   704
        if (lst[1] == "Authentication failed")
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   705
        {
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   706
            emit AuthFailed();
8401
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   707
            m_game_connected = false;
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   708
            Disconnect();
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   709
            //omitted 'emit disconnected()', we don't want the error message
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   710
            return;
5861
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   711
        }
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   712
        m_game_connected = false;
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   713
        Disconnect();
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   714
        emit disconnected(HWApplication::translate("server", lst[1].toLatin1().constData()));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   715
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   716
    }
1512
43742041c211 - Don't send 'Bad param' msg, as the only reason of it is just some lag
unc0rr
parents: 1475
diff changeset
   717
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
   718
    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
   719
    {
9730
20dca3377887 Fix erroneous message in console debug
unc0rr
parents: 9702
diff changeset
   720
        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
   721
        {
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
   722
            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
   723
            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
   724
        }
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
   725
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
   726
        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
   727
        emit roomNameUpdated(myroom);
9730
20dca3377887 Fix erroneous message in console debug
unc0rr
parents: 9702
diff changeset
   728
        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
   729
    }
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
   730
7535
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   731
    if(netClientState == InLobby && lst[0] == "JOINED")
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   732
    {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   733
        if(lst.size() < 2 || lst[1] != mynick)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   734
        {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   735
            qWarning("Net: Bad JOINED message");
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   736
            return;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   737
        }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   738
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   739
        for(int i = 1; i < lst.size(); ++i)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   740
        {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   741
            if (lst[i] == mynick)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   742
            {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   743
                netClientState = InRoom;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   744
                emit EnteredGame();
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   745
                emit roomMaster(isChief);
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   746
                if (isChief)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   747
                    emit configAsked();
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   748
            }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   749
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   750
            m_playersModel->playerJoinedRoom(lst[i], isChief && (lst[i] != mynick));
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   751
7535
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   752
            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
   753
        }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   754
        return;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   755
    }
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   756
7545
063601290761 Forgot this state
unc0rr
parents: 7535
diff changeset
   757
    if(netClientState == InRoom || netClientState == InGame)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   758
    {
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   759
        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
   760
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   761
            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
   762
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   763
                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
   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
            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
   767
            {
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   768
                QByteArray em = QByteArray::fromBase64(lst[i].toLatin1());
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   769
                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
   770
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   771
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   772
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   773
8303
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   774
        if (lst[0] == "ROUND_FINISHED")
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   775
        {
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   776
            emit FromNet(QByteArray("\x01o"));
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   777
            return;
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   778
        }
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   779
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   780
        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
   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.size() != 24)
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
                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
   785
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   786
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   787
            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
   788
            tmp.removeFirst();
10400
47e2189eae44 This should make frontend aware of your own teams in game on rejoin
unc0rr
parents: 10248
diff changeset
   789
            HWTeam team(tmp);
47e2189eae44 This should make frontend aware of your own teams in game on rejoin
unc0rr
parents: 10248
diff changeset
   790
            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
   791
            return;
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
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   794
        if (lst[0] == "REMOVE_TEAM")
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   795
        {
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   796
            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
   797
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   798
                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
   799
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   800
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   801
            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
   802
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   803
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   804
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   805
        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
   806
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   807
            netClientState = InLobby;
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   808
            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
   809
            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
   810
            return;
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
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   813
        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
   814
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   815
            netClientState = InGame;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   816
            emit AskForRunGame();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   817
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   818
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   819
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   820
        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
   821
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   822
            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
   823
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   824
                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
   825
                return;
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
            emit TeamAccepted(lst[1]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   828
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   829
        }
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   830
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   831
        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
   832
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   833
            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
   834
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   835
                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
   836
                return;
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
            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
   839
            tmp.removeFirst();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   840
            tmp.removeFirst();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   841
            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
   842
                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
   843
            else
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   844
                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
   845
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   846
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   847
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   848
        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
   849
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   850
            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
   851
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   852
                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
   853
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   854
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   855
            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
   856
            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
   857
            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
   858
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   859
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   860
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   861
        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
   862
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   863
            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
   864
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   865
                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
   866
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   867
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   868
            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
   869
            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
   870
            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
   871
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   872
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   873
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   874
        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
   875
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   876
            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
   877
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   878
                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
   879
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   880
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   881
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   882
            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
   883
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   884
                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
   885
                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
   886
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   887
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   888
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   889
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   890
        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
   891
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   892
            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
   893
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   894
                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
   895
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   896
            }
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   897
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   898
            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
   899
                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
   900
            else
13673
1aa5e884326a Fix some string/translation inconsistencies in strings related to leaving
Wuzzy <Wuzzy2@mail.ru>
parents: 13658
diff changeset
   901
            {
1aa5e884326a Fix some string/translation inconsistencies in strings related to leaving
Wuzzy <Wuzzy2@mail.ru>
parents: 13658
diff changeset
   902
                QString leaveMsg = QString(lst[2]);
13846
d8e606cf8ff5 Simplify /quit chat command
Wuzzy <Wuzzy2@mail.ru>
parents: 13695
diff changeset
   903
                emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1]).arg(HWApplication::translate("server", leaveMsg.toLatin1().constData())));
13673
1aa5e884326a Fix some string/translation inconsistencies in strings related to leaving
Wuzzy <Wuzzy2@mail.ru>
parents: 13658
diff changeset
   904
            }
7731
262228c64f15 Room players list
unc0rr
parents: 7728
diff changeset
   905
            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
   906
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   907
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   908
    }
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
   909
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   910
    qWarning() << "Net: Unknown message or wrong state:" << lst;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   911
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   912
352
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   913
void HWNewNet::onHedgehogsNumChanged(const HWTeam& team)
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   914
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   915
    if (isChief)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   916
        RawSendNet(QString("HH_NUM%1%2%1%3")
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   917
                   .arg(delimiter)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   918
                   .arg(team.name())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   919
                   .arg(team.numHedgehogs()));
352
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   920
}
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   921
372
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   922
void HWNewNet::onTeamColorChanged(const HWTeam& team)
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   923
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   924
    if (isChief)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   925
        RawSendNet(QString("TEAM_COLOR%1%2%1%3")
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   926
                   .arg(delimiter)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   927
                   .arg(team.name())
7130
fcab1fd02bc6 - Allow switching colors with mouse wheel
unc0rr
parents: 6952
diff changeset
   928
                   .arg(team.color()));
372
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   929
}
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   930
1873
815a3ff1fe4b Start refactoring some things. Frontend becomes temporarily unusable for network game
unc0rr
parents: 1866
diff changeset
   931
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
   932
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   933
    if (isChief)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   934
        RawSendNet(
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   935
            QString("CFG%1%2%1%3")
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   936
            .arg(delimiter)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   937
            .arg(param)
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   938
            .arg(value.join(QString(delimiter)))
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   939
        );
1797
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1793
diff changeset
   940
}
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1793
diff changeset
   941
8765
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   942
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
   943
{
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   944
    if(str != "")
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   945
    {
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   946
        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
   947
        chatLineToNet(str);
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   948
    }
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   949
}
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
   950
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   951
void HWNewNet::chatLineToNet(const QString& str)
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   952
{
13322
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   953
    if(ByteLength(str))
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   954
    {
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   955
        RawSendNet(QString("CHAT") + delimiter + str);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   956
        QString action = HWProto::chatStringToAction(str);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   957
        if (action != NULL)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   958
            emit(roomChatAction(mynick, action));
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   959
        else
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   960
            emit(roomChatMessage(mynick, str));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   961
    }
1568
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   962
}
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   963
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   964
void HWNewNet::chatLineToLobby(const QString& str)
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
   965
{
13322
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   966
    if(ByteLength(str))
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   967
    {
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   968
        RawSendNet(QString("CHAT") + delimiter + str);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   969
        QString action = HWProto::chatStringToAction(str);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   970
        if (action != NULL)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   971
            emit(lobbyChatAction(mynick, action));
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   972
        else
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   973
            emit(lobbyChatMessage(mynick, str));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   974
    }
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   975
}
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   976
2403
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   977
void HWNewNet::SendTeamMessage(const QString& str)
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   978
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   979
    RawSendNet(QString("TEAMCHAT") + delimiter + str);
2403
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   980
}
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
   981
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   982
void HWNewNet::askRoomsList()
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   983
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   984
    if(netClientState != InLobby)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   985
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   986
        qWarning("Illegal try to get rooms list!");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   987
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   988
    }
11463
fe46826de291 Don't send LIST command on join
unc0rr
parents: 11461
diff changeset
   989
    //RawSendNet(QString("LIST")); //deprecated
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
   990
}
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
   991
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   992
HWNewNet::ClientState HWNewNet::clientState()
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   993
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   994
    return netClientState;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   995
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   996
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   997
QString HWNewNet::getNick()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   998
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   999
    return mynick;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1000
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1001
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1002
QString HWNewNet::getRoom()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1003
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1004
    return myroom;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1005
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1006
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1007
QString HWNewNet::getHost()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1008
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1009
    return myhost;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1010
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1011
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
  1012
bool HWNewNet::isRoomChief()
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
  1013
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1014
    return isChief;
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
  1015
}
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
  1016
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
  1017
void HWNewNet::gameFinished(bool correctly)
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
  1018
{
6739
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
  1019
    if (netClientState == InGame)
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
  1020
    {
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
  1021
        netClientState = InRoom;
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1022
        RawSendNet(QString("ROUNDFINISHED%1%2").arg(delimiter).arg(correctly ? "1" : "0"));
6739
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
  1023
    }
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
  1024
}
1378
1a391883261d Allow /me in chat
unc0rr
parents: 1377
diff changeset
  1025
1860
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
  1026
void HWNewNet::banPlayer(const QString & nick)
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
  1027
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1028
    RawSendNet(QString("BAN%1%2").arg(delimiter).arg(nick));
1860
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
  1029
}
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
  1030
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1031
void HWNewNet::banIP(const QString & ip, const QString & reason, int seconds)
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1032
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1033
    RawSendNet(QString("BANIP%1%2%1%3%1%4").arg(delimiter).arg(ip).arg(reason).arg(seconds));
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1034
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1035
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1036
void HWNewNet::banNick(const QString & nick, const QString & reason, int seconds)
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1037
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1038
    RawSendNet(QString("BANNICK%1%2%1%3%1%4").arg(delimiter).arg(nick).arg(reason).arg(seconds));
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1039
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1040
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1041
void HWNewNet::getBanList()
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1042
{
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1043
    RawSendNet(QByteArray("BANLIST"));
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1044
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1045
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1046
void HWNewNet::removeBan(const QString & b)
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1047
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1048
    RawSendNet(QString("UNBAN%1%2").arg(delimiter).arg(b));
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1049
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1050
1391
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
  1051
void HWNewNet::kickPlayer(const QString & nick)
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
  1052
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1053
    RawSendNet(QString("KICK%1%2").arg(delimiter).arg(nick));
1391
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
  1054
}
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1055
11865
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents: 11463
diff changeset
  1056
void HWNewNet::delegateToPlayer(const QString & nick)
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents: 11463
diff changeset
  1057
{
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents: 11463
diff changeset
  1058
    RawSendNet(QString("DELEGATE%1%2").arg(delimiter).arg(nick));
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents: 11463
diff changeset
  1059
}
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents: 11463
diff changeset
  1060
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1061
void HWNewNet::infoPlayer(const QString & nick)
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1062
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1063
    RawSendNet(QString("INFO%1%2").arg(delimiter).arg(nick));
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1064
}
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1065
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
  1066
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
  1067
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1068
    if (!isInRoom())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1069
    {
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1070
        RawSendNet(QString("FOLLOW%1%2").arg(delimiter).arg(nick));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1071
        isChief = false;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1072
    }
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
  1073
}
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
  1074
8396
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1075
void HWNewNet::consoleCommand(const QString & cmd)
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1076
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1077
    RawSendNet(QString("CMD%1%2").arg(delimiter).arg(cmd));
8396
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1078
}
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1079
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
  1080
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
  1081
{
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
  1082
    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
  1083
    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
  1084
        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
  1085
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
  1086
    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
  1087
}
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
  1088
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1089
void HWNewNet::startGame()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1090
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1091
    RawSendNet(QString("START_GAME"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1092
}
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1093
5126
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1094
void HWNewNet::updateRoomName(const QString & name)
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1095
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1096
    RawSendNet(QString("ROOM_NAME%1%2").arg(delimiter).arg(name));
5126
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1097
}
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1098
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1099
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1100
void HWNewNet::toggleRestrictJoins()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1101
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1102
    RawSendNet(QString("TOGGLE_RESTRICT_JOINS"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1103
}
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1104
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1105
void HWNewNet::toggleRestrictTeamAdds()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1106
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1107
    RawSendNet(QString("TOGGLE_RESTRICT_TEAMS"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1108
}
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1109
8559
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1110
void HWNewNet::toggleRegisteredOnly()
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1111
{
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1112
    RawSendNet(QString("TOGGLE_REGISTERED_ONLY"));
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1113
}
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1114
2155
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1115
void HWNewNet::clearAccountsCache()
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1116
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1117
    RawSendNet(QString("CLEAR_ACCOUNTS_CACHE"));
2155
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1118
}
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1119
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1120
void HWNewNet::partRoom()
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1121
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
  1122
    netClientState = InLobby;
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
  1123
    m_playersModel->resetRoomFlags();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1124
    RawSendNet(QString("PART"));
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1125
}
1671
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1126
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1127
bool HWNewNet::isInRoom()
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1128
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
  1129
    return netClientState >= InRoom;
1671
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1130
}
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
  1131
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1132
void HWNewNet::setServerMessageNew(const QString & msg)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1133
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1134
    RawSendNet(QString("SET_SERVER_VAR%1MOTD_NEW%1%2").arg(delimiter).arg(msg));
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1135
}
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1136
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1137
void HWNewNet::setServerMessageOld(const QString & msg)
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
  1138
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1139
    RawSendNet(QString("SET_SERVER_VAR%1MOTD_OLD%1%2").arg(delimiter).arg(msg));
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
  1140
}
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1141
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1142
void HWNewNet::setLatestProtocolVar(int proto)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1143
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1144
    RawSendNet(QString("SET_SERVER_VAR%1LATEST_PROTO%1%2").arg(delimiter).arg(proto));
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1145
}
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1146
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1147
void HWNewNet::askServerVars()
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1148
{
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3555
diff changeset
  1149
    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
  1150
}
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1151
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1152
void HWNewNet::handleNotice(int n)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1153
{
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1154
    switch(n)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1155
    {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1156
        case 0:
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
  1157
            emit NickTaken(mynick);
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1158
            break;
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1159
        case 2:
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1160
            emit askForRoomPassword();
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1161
            break;
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1162
    }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1163
}
6732
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1164
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1165
RoomsListModel * HWNewNet::roomsListModel()
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1166
{
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1167
    return m_roomsListModel;
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1168
}
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1169
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
  1170
QAbstractItemModel *HWNewNet::lobbyPlayersModel()
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1171
{
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1172
    return m_lobbyPlayersModel;
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1173
}
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1174
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
  1175
QAbstractItemModel *HWNewNet::roomPlayersModel()
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1176
{
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1177
    return m_roomPlayersModel;
8436
b89aacebb9db - Also pass unknown cmds to the server when in room
unc0rr
parents: 8416
diff changeset
  1178
}
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1179
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1180
void HWNewNet::roomPasswordEntered(const QString &password)
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1181
{
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1182
    if(!myroom.isEmpty())
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1183
        JoinRoom(myroom, password);
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1184
}
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1185
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1186
void HWNewNet::maybeSendPassword()
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1187
{
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1188
/* 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
  1189
 * at this point we have salt chosen by server
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1190
 * 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
  1191
 * and static salt (predefined string + protocol number)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1192
 * server should respond with hash of the same set in different order.
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1193
 */
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1194
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1195
    if(m_passwordHash.isEmpty() || m_serverSalt.isEmpty())
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1196
        return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1197
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
  1198
    QString hash = QCryptographicHash::hash(
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1199
                m_clientSalt.toLatin1()
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1200
                .append(m_serverSalt.toLatin1())
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1201
                .append(m_passwordHash)
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1202
                .append(cProtoVer->toLatin1())
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1203
                .append("!hedgewars")
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
  1204
                , QCryptographicHash::Sha1).toHex();
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1205
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1206
    m_serverHash = QCryptographicHash::hash(
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1207
                m_serverSalt.toLatin1()
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1208
                .append(m_clientSalt.toLatin1())
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1209
                .append(m_passwordHash)
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1210
                .append(cProtoVer->toLatin1())
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1211
                .append("!hedgewars")
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
  1212
                , QCryptographicHash::Sha1).toHex();
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1213
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1214
    RawSendNet(QString("PASSWORD%1%2%1%3").arg(delimiter).arg(hash).arg(m_clientSalt));
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1215
}