author | koda |
Mon, 04 Mar 2013 18:27:21 +0100 | |
changeset 8646 | e31044b7fbba |
parent 8567 | a31c453c6070 |
child 8720 | 5603527f9803 |
permissions | -rw-r--r-- |
315 | 1 |
/* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
4976 | 3 |
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com> |
6952 | 4 |
* Copyright (c) 2004-2012 Andrey Korotaev <unC0Rr@gmail.com> |
315 | 5 |
* |
6 |
* This program is free software; you can redistribute it and/or modify |
|
7 |
* it under the terms of the GNU General Public License as published by |
|
8 |
* the Free Software Foundation; version 2 of the License |
|
9 |
* |
|
10 |
* This program is distributed in the hope that it will be useful, |
|
11 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
12 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
13 |
* GNU General Public License for more details. |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License |
|
16 |
* along with this program; if not, write to the Free Software |
|
17 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA |
|
18 |
*/ |
|
19 |
||
1189
f66cdbbfc4b6
Fix compile under Ubuntu (why it compiles everywhere else?)
unc0rr
parents:
1083
diff
changeset
|
20 |
#include <QDebug> |
1844 | 21 |
#include <QInputDialog> |
1905 | 22 |
#include <QCryptographicHash> |
7728 | 23 |
#include <QSortFilterProxyModel> |
1844 | 24 |
|
697 | 25 |
#include "hwconsts.h" |
315 | 26 |
#include "newnetclient.h" |
27 |
#include "proto.h" |
|
28 |
#include "game.h" |
|
6732
c906dc78091f
Start switching to rooms list model. To be continued.
unc0rr
parents:
6722
diff
changeset
|
29 |
#include "roomslistmodel.h" |
7723 | 30 |
#include "playerslistmodel.h" |
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
31 |
#include "servermessages.h" |
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
32 |
#include "HWApplication.h" |
315 | 33 |
|
1082 | 34 |
char delimeter='\n'; |
315 | 35 |
|
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
36 |
HWNewNet::HWNewNet() : |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
37 |
isChief(false), |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
38 |
m_game_connected(false), |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
39 |
loginStep(0), |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
40 |
netClientState(Disconnected) |
315 | 41 |
{ |
6732
c906dc78091f
Start switching to rooms list model. To be continued.
unc0rr
parents:
6722
diff
changeset
|
42 |
m_roomsListModel = new RoomsListModel(this); |
7728 | 43 |
|
44 |
m_playersModel = new PlayersListModel(this); |
|
45 |
||
46 |
m_lobbyPlayersModel = new QSortFilterProxyModel(this); |
|
47 |
m_lobbyPlayersModel->setSourceModel(m_playersModel); |
|
48 |
m_lobbyPlayersModel->setSortRole(PlayersListModel::SortRole); |
|
49 |
m_lobbyPlayersModel->setDynamicSortFilter(true); |
|
50 |
m_lobbyPlayersModel->sort(0); |
|
51 |
||
52 |
m_roomPlayersModel = new QSortFilterProxyModel(this); |
|
53 |
m_roomPlayersModel->setSourceModel(m_playersModel); |
|
54 |
m_roomPlayersModel->setSortRole(PlayersListModel::SortRole); |
|
55 |
m_roomPlayersModel->setDynamicSortFilter(true); |
|
56 |
m_roomPlayersModel->sort(0); |
|
7731 | 57 |
m_roomPlayersModel->setFilterRole(PlayersListModel::RoomFilterRole); |
7834 | 58 |
m_roomPlayersModel->setFilterFixedString("true"); |
7728 | 59 |
|
60 |
// socket stuff |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
61 |
connect(&NetSocket, SIGNAL(readyRead()), this, SLOT(ClientRead())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
62 |
connect(&NetSocket, SIGNAL(connected()), this, SLOT(OnConnect())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
63 |
connect(&NetSocket, SIGNAL(disconnected()), this, SLOT(OnDisconnect())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
64 |
connect(&NetSocket, SIGNAL(error(QAbstractSocket::SocketError)), this, |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
65 |
SLOT(displayError(QAbstractSocket::SocketError))); |
8534
92da587691c9
Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents:
8489
diff
changeset
|
66 |
|
92da587691c9
Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents:
8489
diff
changeset
|
67 |
connect(this, SIGNAL(messageProcessed()), this, SLOT(ClientRead()), Qt::QueuedConnection); |
315 | 68 |
} |
69 |
||
1526
18e412dd7d50
Send QUIT message to server when netclient object is destroyed
unc0rr
parents:
1512
diff
changeset
|
70 |
HWNewNet::~HWNewNet() |
18e412dd7d50
Send QUIT message to server when netclient object is destroyed
unc0rr
parents:
1512
diff
changeset
|
71 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
72 |
if (m_game_connected) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
73 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
74 |
RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit")); |
6036 | 75 |
emit disconnected(tr("User quit")); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
76 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
77 |
NetSocket.flush(); |
1526
18e412dd7d50
Send QUIT message to server when netclient object is destroyed
unc0rr
parents:
1512
diff
changeset
|
78 |
} |
18e412dd7d50
Send QUIT message to server when netclient object is destroyed
unc0rr
parents:
1512
diff
changeset
|
79 |
|
315 | 80 |
void HWNewNet::Connect(const QString & hostName, quint16 port, const QString & nick) |
81 |
{ |
|
6036 | 82 |
netClientState = Connecting; |
5390
f41e87de8989
(fix issue 126) moved initial nickname popup to the netconnection page
koda
parents:
5230
diff
changeset
|
83 |
mynick = nick; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
84 |
myhost = hostName + QString(":%1").arg(port); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
85 |
NetSocket.connectToHost(hostName, port); |
315 | 86 |
} |
87 |
||
88 |
void HWNewNet::Disconnect() |
|
89 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
90 |
if (m_game_connected) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
91 |
RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit")); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
92 |
m_game_connected = false; |
2377 | 93 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
94 |
NetSocket.disconnectFromHost(); |
315 | 95 |
} |
96 |
||
1082 | 97 |
void HWNewNet::CreateRoom(const QString & room) |
315 | 98 |
{ |
6036 | 99 |
if(netClientState != InLobby) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
100 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
101 |
qWarning("Illegal try to create room!"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
102 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
103 |
} |
2377 | 104 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
105 |
myroom = room; |
2821 | 106 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
107 |
RawSendNet(QString("CREATE_ROOM%1%2").arg(delimeter).arg(room)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
108 |
isChief = true; |
1082 | 109 |
} |
110 |
||
111 |
void HWNewNet::JoinRoom(const QString & room) |
|
112 |
{ |
|
6036 | 113 |
if(netClientState != InLobby) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
114 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
115 |
qWarning("Illegal try to join room!"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
116 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
117 |
} |
2377 | 118 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
119 |
myroom = room; |
2821 | 120 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
121 |
RawSendNet(QString("JOIN_ROOM%1%2").arg(delimeter).arg(room)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
122 |
isChief = false; |
315 | 123 |
} |
124 |
||
125 |
void HWNewNet::AddTeam(const HWTeam & team) |
|
126 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
127 |
QString cmd = QString("ADD_TEAM") + delimeter + |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
128 |
team.name() + delimeter + |
7130 | 129 |
QString::number(team.color()) + delimeter + |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
130 |
team.grave() + delimeter + |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
131 |
team.fort() + delimeter + |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
132 |
team.voicepack() + delimeter + |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
133 |
team.flag() + delimeter + |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
134 |
QString::number(team.difficulty()); |
1245
d2eca4a053f5
Send hats info via net. Hats implementation complete now.
unc0rr
parents:
1189
diff
changeset
|
135 |
|
6024 | 136 |
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
|
137 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
138 |
cmd.append(delimeter); |
6015
daffc14a518a
cleaning up a little bit more, especially team class. we were leaking teams into heap memory on quick game starts btw
sheepluva
parents:
5998
diff
changeset
|
139 |
cmd.append(team.hedgehog(i).Name); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
140 |
cmd.append(delimeter); |
6015
daffc14a518a
cleaning up a little bit more, especially team class. we were leaking teams into heap memory on quick game starts btw
sheepluva
parents:
5998
diff
changeset
|
141 |
cmd.append(team.hedgehog(i).Hat); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
142 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
143 |
RawSendNet(cmd); |
315 | 144 |
} |
145 |
||
347 | 146 |
void HWNewNet::RemoveTeam(const HWTeam & team) |
147 |
{ |
|
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
|
148 |
RawSendNet(QString("REMOVE_TEAM") + delimeter + team.name()); |
347 | 149 |
} |
150 |
||
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
151 |
void HWNewNet::NewNick(const QString & nick) |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
152 |
{ |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
153 |
RawSendNet(QString("NICK%1%2").arg(delimeter).arg(nick)); |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
154 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
155 |
|
1404 | 156 |
void HWNewNet::ToggleReady() |
315 | 157 |
{ |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
158 |
RawSendNet(QString("TOGGLE_READY")); |
315 | 159 |
} |
160 |
||
161 |
void HWNewNet::SendNet(const QByteArray & buf) |
|
162 |
{ |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
163 |
QString msg = QString(buf.toBase64()); |
315 | 164 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
165 |
RawSendNet(QString("EM%1%2").arg(delimeter).arg(msg)); |
315 | 166 |
} |
167 |
||
168 |
void HWNewNet::RawSendNet(const QString & str) |
|
169 |
{ |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
170 |
RawSendNet(str.toUtf8()); |
315 | 171 |
} |
172 |
||
173 |
void HWNewNet::RawSendNet(const QByteArray & buf) |
|
174 |
{ |
|
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
175 |
qDebug() << "Client: " << QString(buf).split("\n"); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
176 |
NetSocket.write(buf); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
177 |
NetSocket.write("\n\n", 2); |
315 | 178 |
} |
179 |
||
180 |
void HWNewNet::ClientRead() |
|
181 |
{ |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
182 |
while (NetSocket.canReadLine()) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
183 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
184 |
QString s = QString::fromUtf8(NetSocket.readLine()); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
185 |
if (s.endsWith('\n')) s.chop(1); |
1082 | 186 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
187 |
if (s.size() == 0) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
188 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
189 |
ParseCmd(cmdbuf); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
190 |
cmdbuf.clear(); |
8534
92da587691c9
Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents:
8489
diff
changeset
|
191 |
emit messageProcessed(); |
92da587691c9
Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents:
8489
diff
changeset
|
192 |
return ; |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
193 |
} |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
194 |
else |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
195 |
cmdbuf << s; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
196 |
} |
315 | 197 |
} |
198 |
||
199 |
void HWNewNet::OnConnect() |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
200 |
{ |
6036 | 201 |
netClientState = Connected; |
315 | 202 |
} |
203 |
||
204 |
void HWNewNet::OnDisconnect() |
|
205 |
{ |
|
6036 | 206 |
netClientState = Disconnected; |
207 |
if(m_game_connected) emit disconnected(""); |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
208 |
m_game_connected = false; |
315 | 209 |
} |
210 |
||
211 |
void HWNewNet::displayError(QAbstractSocket::SocketError socketError) |
|
212 |
{ |
|
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
|
213 |
m_game_connected = false; |
2377 | 214 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
215 |
switch (socketError) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
216 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
217 |
case QAbstractSocket::RemoteHostClosedError: |
6722
e3a35bc838fb
Show message and return from network game pages on server shutdown
unc0rr
parents:
6700
diff
changeset
|
218 |
emit disconnected(tr("Remote host has closed connection")); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
219 |
break; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
220 |
case QAbstractSocket::HostNotFoundError: |
6036 | 221 |
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
|
222 |
break; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
223 |
case QAbstractSocket::ConnectionRefusedError: |
6036 | 224 |
emit disconnected(tr("Connection refused")); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
225 |
break; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
226 |
default: |
6036 | 227 |
emit disconnected(NetSocket.errorString()); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
228 |
} |
315 | 229 |
} |
230 |
||
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
231 |
void HWNewNet::SendPasswordHash(const QString & hash) |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
232 |
{ |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
233 |
RawSendNet(QString("PASSWORD%1%2").arg(delimeter).arg(hash)); |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
234 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
235 |
|
1082 | 236 |
void HWNewNet::ParseCmd(const QStringList & lst) |
315 | 237 |
{ |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
238 |
qDebug() << "Server: " << lst; |
1305 | 239 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
240 |
if(!lst.size()) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
241 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
242 |
qWarning("Net client: Bad message"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
243 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
244 |
} |
320 | 245 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
246 |
if (lst[0] == "NICK") |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
247 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
248 |
mynick = lst[1]; |
7732 | 249 |
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
|
250 |
m_nick_registered = false; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
251 |
return ; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
252 |
} |
1308
d5dcd6cfa5e2
Fix another server failure (when second client in room disconnects)
unc0rr
parents:
1307
diff
changeset
|
253 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
254 |
if (lst[0] == "PROTO") |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
255 |
return ; |
2108 | 256 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
257 |
if (lst[0] == "ERROR") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
258 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
259 |
if (lst.size() == 2) |
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
260 |
emit Error(HWApplication::translate("server", lst[1].toAscii().constData())); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
261 |
else |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
262 |
emit Error("Unknown error"); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
263 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
264 |
} |
315 | 265 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
266 |
if (lst[0] == "WARNING") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
267 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
268 |
if (lst.size() == 2) |
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
269 |
emit Warning(HWApplication::translate("server", lst[1].toAscii().constData())); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
270 |
else |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
271 |
emit Warning("Unknown warning"); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
272 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
273 |
} |
1307 | 274 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
275 |
if (lst[0] == "CONNECTED") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
276 |
{ |
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
|
277 |
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
|
278 |
{ |
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
|
279 |
// 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
|
280 |
qWarning() << "Server too old"; |
6737
ce5fbd98370f
- Increase server version number due to rooms list protocol changes
unc0rr
parents:
6735
diff
changeset
|
281 |
RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("Server too old")); |
ce5fbd98370f
- Increase server version number due to rooms list protocol changes
unc0rr
parents:
6735
diff
changeset
|
282 |
Disconnect(); |
ce5fbd98370f
- Increase server version number due to rooms list protocol changes
unc0rr
parents:
6735
diff
changeset
|
283 |
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
|
284 |
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
|
285 |
} |
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
|
286 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
287 |
RawSendNet(QString("NICK%1%2").arg(delimeter).arg(mynick)); |
6735 | 288 |
RawSendNet(QString("PROTO%1%2").arg(delimeter).arg(*cProtoVer)); |
6036 | 289 |
netClientState = Connected; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
290 |
m_game_connected = true; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
291 |
emit adminAccess(false); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
292 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
293 |
} |
315 | 294 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
295 |
if (lst[0] == "PING") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
296 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
297 |
if (lst.size() > 1) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
298 |
RawSendNet(QString("PONG%1%2").arg(delimeter).arg(lst[1])); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
299 |
else |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
300 |
RawSendNet(QString("PONG")); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
301 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
302 |
} |
1462 | 303 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
304 |
if (lst[0] == "ROOMS") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
305 |
{ |
6733 | 306 |
if(lst.size() % 8 != 1) |
307 |
{ |
|
308 |
qWarning("Net: Malformed ROOMS message"); |
|
309 |
return; |
|
310 |
} |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
311 |
QStringList tmp = lst; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
312 |
tmp.removeFirst(); |
6733 | 313 |
m_roomsListModel->setRoomsList(tmp); |
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
|
314 |
if (m_nick_registered == false) |
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
|
315 |
{ |
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
|
316 |
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
|
317 |
} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
318 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
319 |
} |
1313
f4c54e9e1b8c
- Introduce a bit of state miachine in client code (should be more robust and verbosive now)
unc0rr
parents:
1311
diff
changeset
|
320 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
321 |
if (lst[0] == "SERVER_MESSAGE") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
322 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
323 |
if(lst.size() < 2) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
324 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
325 |
qWarning("Net: Empty SERVERMESSAGE message"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
326 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
327 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
328 |
emit serverMessage(lst[1]); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
329 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
330 |
} |
1377 | 331 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
332 |
if (lst[0] == "CHAT") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
333 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
334 |
if(lst.size() < 3) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
335 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
336 |
qWarning("Net: Empty CHAT message"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
337 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
338 |
} |
6036 | 339 |
if (netClientState == InLobby) |
4897
11598e7aa7e6
make names in chats clickable. still color adjustments needed; and testing
sheepluva
parents:
4879
diff
changeset
|
340 |
emit chatStringLobby(lst[1], HWProto::formatChatMsgForFrontend(lst[2])); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
341 |
else |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
342 |
emit chatStringFromNet(HWProto::formatChatMsg(lst[1], lst[2])); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
343 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
344 |
} |
453 | 345 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
346 |
if (lst[0] == "INFO") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
347 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
348 |
if(lst.size() < 5) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
349 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
350 |
qWarning("Net: Malformed INFO message"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
351 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
352 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
353 |
QStringList tmp = lst; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
354 |
tmp.removeFirst(); |
6036 | 355 |
if (netClientState == InLobby) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
356 |
emit chatStringLobby(tmp.join("\n").prepend('\x01')); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
357 |
else |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
358 |
emit chatStringFromNet(tmp.join("\n").prepend('\x01')); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
359 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
360 |
} |
1577 | 361 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
362 |
if (lst[0] == "SERVER_VARS") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
363 |
{ |
3283 | 364 |
QStringList tmp = lst; |
365 |
tmp.removeFirst(); |
|
366 |
while (tmp.size() >= 2) |
|
367 |
{ |
|
368 |
if(tmp[0] == "MOTD_NEW") emit serverMessageNew(tmp[1]); |
|
369 |
else if(tmp[0] == "MOTD_OLD") emit serverMessageOld(tmp[1]); |
|
370 |
else if(tmp[0] == "LATEST_PROTO") emit latestProtocolVar(tmp[1].toInt()); |
|
3697 | 371 |
|
3283 | 372 |
tmp.removeFirst(); |
373 |
tmp.removeFirst(); |
|
374 |
} |
|
375 |
return; |
|
376 |
} |
|
377 |
||
8157 | 378 |
if (lst[0] == "BANLIST") |
379 |
{ |
|
380 |
QStringList tmp = lst; |
|
381 |
tmp.removeFirst(); |
|
382 |
emit bansList(tmp); |
|
383 |
return; |
|
384 |
} |
|
385 |
||
4917
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
386 |
if (lst[0] == "CLIENT_FLAGS") |
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
387 |
{ |
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
388 |
if(lst.size() < 3 || lst[1].size() < 2) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
389 |
{ |
4917
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
390 |
qWarning("Net: Malformed CLIENT_FLAGS message"); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
391 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
392 |
} |
4917
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
393 |
|
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
394 |
QString flags = lst[1]; |
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
395 |
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
|
396 |
const QStringList nicks = lst.mid(2); |
4917
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
397 |
|
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
398 |
while(flags.size() > 1) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
399 |
{ |
4917
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
400 |
flags.remove(0, 1); |
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
401 |
char c = flags[0].toAscii(); |
8021 | 402 |
bool inRoom = (netClientState == InRoom || netClientState == InGame); |
2377 | 403 |
|
4917
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
404 |
switch(c) |
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
405 |
{ |
7684
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
406 |
// 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
|
407 |
case 'r': |
8021 | 408 |
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
|
409 |
foreach (const QString & nick, nicks) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
410 |
{ |
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
|
411 |
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
|
412 |
{ |
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
|
413 |
if (isChief && !setFlag) ToggleReady(); |
993337e5021f
client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents:
7545
diff
changeset
|
414 |
else emit setMyReadyStatus(setFlag); |
993337e5021f
client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents:
7545
diff
changeset
|
415 |
} |
7728 | 416 |
m_playersModel->setFlag(nick, PlayersListModel::Ready, setFlag); |
6539 | 417 |
} |
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
|
418 |
break; |
6539 | 419 |
|
7684
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
420 |
// 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
|
421 |
case 'u': |
7727 | 422 |
foreach(const QString & nick, nicks) |
7728 | 423 |
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
|
424 |
break; |
8021 | 425 |
// flag indicating if a player has engine running |
7765
1e162c1d6dc7
'In game' client flag, both server and frontend support
unc0rr
parents:
7744
diff
changeset
|
426 |
case 'g': |
8021 | 427 |
if(inRoom) |
7765
1e162c1d6dc7
'In game' client flag, both server and frontend support
unc0rr
parents:
7744
diff
changeset
|
428 |
foreach(const QString & nick, nicks) |
1e162c1d6dc7
'In game' client flag, both server and frontend support
unc0rr
parents:
7744
diff
changeset
|
429 |
m_playersModel->setFlag(nick, PlayersListModel::InGame, setFlag); |
1e162c1d6dc7
'In game' client flag, both server and frontend support
unc0rr
parents:
7744
diff
changeset
|
430 |
break; |
1e162c1d6dc7
'In game' client flag, both server and frontend support
unc0rr
parents:
7744
diff
changeset
|
431 |
|
7684
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
432 |
// 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
|
433 |
case 'h': |
8021 | 434 |
if(inRoom) |
7684
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
435 |
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
|
436 |
{ |
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
437 |
if (nick == mynick) |
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
438 |
{ |
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
439 |
isChief = setFlag; |
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
440 |
emit roomMaster(isChief); |
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
441 |
} |
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
442 |
|
7728 | 443 |
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
|
444 |
} |
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
445 |
break; |
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
446 |
|
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
447 |
// 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
|
448 |
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
|
449 |
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
|
450 |
{ |
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
|
451 |
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
|
452 |
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
|
453 |
|
7728 | 454 |
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
|
455 |
} |
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
|
456 |
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
|
457 |
|
993337e5021f
client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents:
7545
diff
changeset
|
458 |
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
|
459 |
qWarning() << "Net: Unknown client-flag: " << c; |
4917
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
460 |
} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
461 |
} |
4917
8ff92bdc9f98
Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents:
4908
diff
changeset
|
462 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
463 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
464 |
} |
1405 | 465 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
466 |
if(lst[0] == "KICKED") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
467 |
{ |
6036 | 468 |
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
|
469 |
askRoomsList(); |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
470 |
emit LeftRoom(tr("You got kicked")); |
7732 | 471 |
m_playersModel->resetRoomFlags(); |
472 |
||
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
473 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
474 |
} |
1879 | 475 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
476 |
if(lst[0] == "LOBBY:JOINED") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
477 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
478 |
if(lst.size() < 2) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
479 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
480 |
qWarning("Net: Bad JOINED message"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
481 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
482 |
} |
2377 | 483 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
484 |
for(int i = 1; i < lst.size(); ++i) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
485 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
486 |
if (lst[i] == mynick) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
487 |
{ |
6036 | 488 |
netClientState = InLobby; |
7744
75e1d0c0ba72
- Nicks starting from not-letter char go to bottom of the list
unc0rr
parents:
7736
diff
changeset
|
489 |
RawSendNet(QString("LIST")); |
6036 | 490 |
emit connected(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
491 |
} |
1838
00a5fc50aa43
Use another event to change state from 'logging in' to 'lobby'
unc0rr
parents:
1829
diff
changeset
|
492 |
|
8567 | 493 |
m_playersModel->addPlayer(lst[i]); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
494 |
emit nickAddedLobby(lst[i], false); |
4897
11598e7aa7e6
make names in chats clickable. still color adjustments needed; and testing
sheepluva
parents:
4879
diff
changeset
|
495 |
emit chatStringLobby(lst[i], tr("%1 *** %2 has joined").arg('\x03').arg("|nick|")); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
496 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
497 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
498 |
} |
1566
6b63c75fdc68
Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents:
1560
diff
changeset
|
499 |
|
6733 | 500 |
if(lst[0] == "ROOM" && lst.size() == 10 && lst[1] == "ADD") |
501 |
{ |
|
502 |
QStringList tmp = lst; |
|
503 |
tmp.removeFirst(); |
|
504 |
tmp.removeFirst(); |
|
505 |
||
506 |
m_roomsListModel->addRoom(tmp); |
|
507 |
return; |
|
508 |
} |
|
509 |
||
510 |
if(lst[0] == "ROOM" && lst.size() == 11 && lst[1] == "UPD") |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
511 |
{ |
6733 | 512 |
QStringList tmp = lst; |
513 |
tmp.removeFirst(); |
|
514 |
tmp.removeFirst(); |
|
515 |
||
516 |
QString roomName = tmp.takeFirst(); |
|
517 |
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
|
518 |
|
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
|
519 |
// keep track of room name so correct name is displayed |
7710
fd5bcbd698a5
- Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents:
7684
diff
changeset
|
520 |
if(myroom == roomName) |
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
|
521 |
{ |
7712 | 522 |
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
|
523 |
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
|
524 |
} |
7710
fd5bcbd698a5
- Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents:
7684
diff
changeset
|
525 |
|
6733 | 526 |
return; |
527 |
} |
|
528 |
||
529 |
if(lst[0] == "ROOM" && lst.size() == 3 && lst[1] == "DEL") |
|
530 |
{ |
|
531 |
m_roomsListModel->removeRoom(lst[2]); |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
532 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
533 |
} |
1591 | 534 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
535 |
if(lst[0] == "LOBBY:LEFT") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
536 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
537 |
if(lst.size() < 2) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
538 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
539 |
qWarning("Net: Bad LOBBY:LEFT message"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
540 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
541 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
542 |
emit nickRemovedLobby(lst[1]); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
543 |
if (lst.size() < 3) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
544 |
emit chatStringLobby(tr("%1 *** %2 has left").arg('\x03').arg(lst[1])); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
545 |
else |
6222
96d10dcd6d84
+ make names in notice messages and leave messages clickable too
sheepluva
parents:
6182
diff
changeset
|
546 |
emit chatStringLobby(lst[1], tr("%1 *** %2 has left (%3)").arg('\x03').arg("|nick|", lst[2])); |
7725 | 547 |
|
7728 | 548 |
m_playersModel->removePlayer(lst[1]); |
7725 | 549 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
550 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
551 |
} |
1566
6b63c75fdc68
Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents:
1560
diff
changeset
|
552 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
553 |
if (lst[0] == "ASKPASSWORD") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
554 |
{ |
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8157
diff
changeset
|
555 |
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
|
556 |
m_nick_registered = true; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
557 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
558 |
} |
1841
fba7210b438b
Retrieve client password from web database and ask for it
unc0rr
parents:
1838
diff
changeset
|
559 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
560 |
if (lst[0] == "NOTICE") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
561 |
{ |
4879
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
562 |
if(lst.size() < 2) |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
563 |
{ |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
564 |
qWarning("Net: Bad NOTICE message"); |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
565 |
return; |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
566 |
} |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
567 |
|
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
568 |
bool ok; |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
569 |
int n = lst[1].toInt(&ok); |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
570 |
if(!ok) |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
571 |
{ |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
572 |
qWarning("Net: Bad NOTICE message"); |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
573 |
return; |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
574 |
} |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
575 |
|
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
576 |
handleNotice(n); |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
577 |
|
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
578 |
return; |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
579 |
} |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
580 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
581 |
if (lst[0] == "BYE") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
582 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
583 |
if (lst.size() < 2) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
584 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
585 |
qWarning("Net: Bad BYE message"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
586 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
587 |
} |
5861 | 588 |
if (lst[1] == "Authentication failed") |
589 |
{ |
|
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
590 |
emit AuthFailed(); |
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
591 |
m_game_connected = false; |
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
592 |
Disconnect(); |
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
593 |
//omitted 'emit disconnected()', we don't want the error message |
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
594 |
return; |
5861 | 595 |
} |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
596 |
m_game_connected = false; |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
597 |
Disconnect(); |
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
598 |
emit disconnected(HWApplication::translate("server", lst[1].toAscii().constData())); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
599 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
600 |
} |
1512
43742041c211
- Don't send 'Bad param' msg, as the only reason of it is just some lag
unc0rr
parents:
1475
diff
changeset
|
601 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
602 |
if (lst[0] == "ADMIN_ACCESS") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
603 |
{ |
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
|
604 |
// obsolete, see +a client flag |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
605 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
606 |
} |
1856
e71dbf958c87
Enable admin button when have privilege. Button does nothing yet.
unc0rr
parents:
1844
diff
changeset
|
607 |
|
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
|
608 |
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
|
609 |
{ |
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
|
610 |
if(lst.size() < 2) |
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
|
611 |
{ |
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
|
612 |
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
|
613 |
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
|
614 |
} |
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
|
615 |
|
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
|
616 |
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
|
617 |
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
|
618 |
} |
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
|
619 |
|
7535 | 620 |
if(netClientState == InLobby && lst[0] == "JOINED") |
621 |
{ |
|
622 |
if(lst.size() < 2 || lst[1] != mynick) |
|
623 |
{ |
|
624 |
qWarning("Net: Bad JOINED message"); |
|
625 |
return; |
|
626 |
} |
|
627 |
||
628 |
for(int i = 1; i < lst.size(); ++i) |
|
629 |
{ |
|
630 |
if (lst[i] == mynick) |
|
631 |
{ |
|
632 |
netClientState = InRoom; |
|
633 |
emit EnteredGame(); |
|
634 |
emit roomMaster(isChief); |
|
635 |
if (isChief) |
|
636 |
emit configAsked(); |
|
637 |
} |
|
638 |
||
8567 | 639 |
m_playersModel->playerJoinedRoom(lst[i]); |
7535 | 640 |
emit nickAdded(lst[i], isChief && (lst[i] != mynick)); |
641 |
emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i])); |
|
642 |
} |
|
643 |
return; |
|
644 |
} |
|
7526
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
645 |
|
7545 | 646 |
if(netClientState == InRoom || netClientState == InGame) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
647 |
{ |
7526
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
648 |
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
|
649 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
650 |
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
|
651 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
652 |
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
|
653 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
654 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
655 |
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
|
656 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
657 |
QByteArray em = QByteArray::fromBase64(lst[i].toAscii()); |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
658 |
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
|
659 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
660 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
661 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
662 |
|
8303
6331bceac95c
Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents:
8299
diff
changeset
|
663 |
if (lst[0] == "ROUND_FINISHED") |
6331bceac95c
Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents:
8299
diff
changeset
|
664 |
{ |
6331bceac95c
Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents:
8299
diff
changeset
|
665 |
emit FromNet(QByteArray("\x01o")); |
6331bceac95c
Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents:
8299
diff
changeset
|
666 |
return; |
6331bceac95c
Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents:
8299
diff
changeset
|
667 |
} |
6331bceac95c
Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents:
8299
diff
changeset
|
668 |
|
7526
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
669 |
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
|
670 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
671 |
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
|
672 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
673 |
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
|
674 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
675 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
676 |
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
|
677 |
tmp.removeFirst(); |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
678 |
emit AddNetTeam(tmp); |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
679 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
680 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
681 |
|
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
682 |
if (lst[0] == "REMOVE_TEAM") |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
683 |
{ |
7526
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
684 |
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
|
685 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
686 |
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
|
687 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
688 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
689 |
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
|
690 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
691 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
692 |
|
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
693 |
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
|
694 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
695 |
netClientState = InLobby; |
7732 | 696 |
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
|
697 |
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
|
698 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
699 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
700 |
|
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
701 |
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
|
702 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
703 |
netClientState = InGame; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
704 |
emit AskForRunGame(); |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
705 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
706 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
707 |
|
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
708 |
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
|
709 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
710 |
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
|
711 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
712 |
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
|
713 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
714 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
715 |
emit TeamAccepted(lst[1]); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
716 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
717 |
} |
7526
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
718 |
|
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
719 |
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
|
720 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
721 |
if(lst.size() < 3) |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
722 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
723 |
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
|
724 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
725 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
726 |
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
|
727 |
tmp.removeFirst(); |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
728 |
tmp.removeFirst(); |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
729 |
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
|
730 |
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
|
731 |
else |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
732 |
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
|
733 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
734 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
735 |
|
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
736 |
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
|
737 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
738 |
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
|
739 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
740 |
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
|
741 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
742 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
743 |
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
|
744 |
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
|
745 |
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
|
746 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
747 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
748 |
|
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
749 |
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
|
750 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
751 |
if (lst.size() != 3) |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
752 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
753 |
qWarning("Net: Bad 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
|
754 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
755 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
756 |
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
|
757 |
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
|
758 |
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
|
759 |
return; |
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 |
|
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
762 |
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
|
763 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
764 |
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
|
765 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
766 |
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
|
767 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
768 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
769 |
|
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
770 |
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
|
771 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
772 |
emit nickAdded(lst[i], isChief && (lst[i] != mynick)); |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
773 |
emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i])); |
7731 | 774 |
m_playersModel->playerJoinedRoom(lst[i]); |
7526
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
775 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
776 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
777 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
778 |
|
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
779 |
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
|
780 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
781 |
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
|
782 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
783 |
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
|
784 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
785 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
786 |
emit nickRemoved(lst[1]); |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
787 |
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
|
788 |
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
|
789 |
else |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
790 |
emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2])); |
7731 | 791 |
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
|
792 |
return; |
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 |
|
7684
db140521d102
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents:
7683
diff
changeset
|
795 |
// obsolete |
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[0] == "ROOM_CONTROL_ACCESS") |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
797 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
798 |
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
|
799 |
{ |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
800 |
qWarning("Net: Bad ROOM_CONTROL_ACCESS message"); |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
801 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
802 |
} |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
803 |
return; |
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
804 |
} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
805 |
} |
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
|
806 |
|
7526
ff3a05e29ddd
Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents:
7130
diff
changeset
|
807 |
qWarning() << "Net: Unknown message or wrong state:" << lst; |
315 | 808 |
} |
809 |
||
352 | 810 |
void HWNewNet::onHedgehogsNumChanged(const HWTeam& team) |
811 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
812 |
if (isChief) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
813 |
RawSendNet(QString("HH_NUM%1%2%1%3") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
814 |
.arg(delimeter) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
815 |
.arg(team.name()) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
816 |
.arg(team.numHedgehogs())); |
352 | 817 |
} |
818 |
||
372 | 819 |
void HWNewNet::onTeamColorChanged(const HWTeam& team) |
820 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
821 |
if (isChief) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
822 |
RawSendNet(QString("TEAM_COLOR%1%2%1%3") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
823 |
.arg(delimeter) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
824 |
.arg(team.name()) |
7130 | 825 |
.arg(team.color())); |
372 | 826 |
} |
827 |
||
1873
815a3ff1fe4b
Start refactoring some things. Frontend becomes temporarily unusable for network game
unc0rr
parents:
1866
diff
changeset
|
828 |
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
|
829 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
830 |
if (isChief) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
831 |
RawSendNet( |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
832 |
QString("CFG%1%2%1%3") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
833 |
.arg(delimeter) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
834 |
.arg(param) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
835 |
.arg(value.join(QString(delimeter))) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
836 |
); |
1797 | 837 |
} |
838 |
||
453 | 839 |
void HWNewNet::chatLineToNet(const QString& str) |
840 |
{ |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
841 |
if(str != "") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
842 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
843 |
RawSendNet(QString("CHAT") + delimeter + str); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
844 |
emit(chatStringFromMe(HWProto::formatChatMsg(mynick, str))); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
845 |
} |
1568 | 846 |
} |
847 |
||
848 |
void HWNewNet::chatLineToLobby(const QString& str) |
|
849 |
{ |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
850 |
if(str != "") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
851 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
852 |
RawSendNet(QString("CHAT") + delimeter + str); |
6182
d56d18802481
some more chat fixes and changes, I think. hum. what was that? um. aaah, I better go catch some sheep ... er sleep.. um..
sheepluva
parents:
6062
diff
changeset
|
853 |
emit chatStringLobby(mynick, HWProto::formatChatMsgForFrontend(str)); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
854 |
} |
453 | 855 |
} |
1315 | 856 |
|
2403 | 857 |
void HWNewNet::SendTeamMessage(const QString& str) |
858 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
859 |
RawSendNet(QString("TEAMCHAT") + delimeter + str); |
2403 | 860 |
} |
861 |
||
1315 | 862 |
void HWNewNet::askRoomsList() |
863 |
{ |
|
6036 | 864 |
if(netClientState != InLobby) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
865 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
866 |
qWarning("Illegal try to get rooms list!"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
867 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
868 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
869 |
RawSendNet(QString("LIST")); |
1315 | 870 |
} |
1339 | 871 |
|
6036 | 872 |
HWNewNet::ClientState HWNewNet::clientState() |
2821 | 873 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
874 |
return netClientState; |
2821 | 875 |
} |
876 |
||
877 |
QString HWNewNet::getNick() |
|
878 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
879 |
return mynick; |
2821 | 880 |
} |
881 |
||
882 |
QString HWNewNet::getRoom() |
|
883 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
884 |
return myroom; |
2821 | 885 |
} |
886 |
||
887 |
QString HWNewNet::getHost() |
|
888 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
889 |
return myhost; |
2821 | 890 |
} |
891 |
||
1339 | 892 |
bool HWNewNet::isRoomChief() |
893 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
894 |
return isChief; |
1339 | 895 |
} |
1344
4004e597f1bf
Clients send roundfinished message to server when the round is over
unc0rr
parents:
1339
diff
changeset
|
896 |
|
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
|
897 |
void HWNewNet::gameFinished(bool correctly) |
1344
4004e597f1bf
Clients send roundfinished message to server when the round is over
unc0rr
parents:
1339
diff
changeset
|
898 |
{ |
6739
97dab041f995
Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents:
6737
diff
changeset
|
899 |
if (netClientState == InGame) |
97dab041f995
Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents:
6737
diff
changeset
|
900 |
{ |
97dab041f995
Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents:
6737
diff
changeset
|
901 |
netClientState = InRoom; |
97dab041f995
Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents:
6737
diff
changeset
|
902 |
RawSendNet(QString("ROUNDFINISHED%1%2").arg(delimeter).arg(correctly ? "1" : "0")); |
97dab041f995
Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents:
6737
diff
changeset
|
903 |
} |
1344
4004e597f1bf
Clients send roundfinished message to server when the round is over
unc0rr
parents:
1339
diff
changeset
|
904 |
} |
1378 | 905 |
|
1860 | 906 |
void HWNewNet::banPlayer(const QString & nick) |
907 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
908 |
RawSendNet(QString("BAN%1%2").arg(delimeter).arg(nick)); |
1860 | 909 |
} |
910 |
||
8157 | 911 |
void HWNewNet::banIP(const QString & ip, const QString & reason, int seconds) |
912 |
{ |
|
913 |
RawSendNet(QString("BANIP%1%2%1%3%1%4").arg(delimeter).arg(ip).arg(reason).arg(seconds)); |
|
914 |
} |
|
915 |
||
916 |
void HWNewNet::banNick(const QString & nick, const QString & reason, int seconds) |
|
917 |
{ |
|
918 |
RawSendNet(QString("BANNICK%1%2%1%3%1%4").arg(delimeter).arg(nick).arg(reason).arg(seconds)); |
|
919 |
} |
|
920 |
||
921 |
void HWNewNet::getBanList() |
|
922 |
{ |
|
923 |
RawSendNet(QByteArray("BANLIST")); |
|
924 |
} |
|
925 |
||
926 |
void HWNewNet::removeBan(const QString & b) |
|
927 |
{ |
|
928 |
RawSendNet(QString("UNBAN%1%2").arg(delimeter).arg(b)); |
|
929 |
} |
|
930 |
||
1391 | 931 |
void HWNewNet::kickPlayer(const QString & nick) |
932 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
933 |
RawSendNet(QString("KICK%1%2").arg(delimeter).arg(nick)); |
1391 | 934 |
} |
1410
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
935 |
|
1577 | 936 |
void HWNewNet::infoPlayer(const QString & nick) |
937 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
938 |
RawSendNet(QString("INFO%1%2").arg(delimeter).arg(nick)); |
1577 | 939 |
} |
940 |
||
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
|
941 |
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
|
942 |
{ |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
943 |
if (!isInRoom()) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6539
diff
changeset
|
944 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
945 |
RawSendNet(QString("FOLLOW%1%2").arg(delimeter).arg(nick)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
946 |
isChief = false; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
947 |
} |
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
|
948 |
} |
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
|
949 |
|
8396 | 950 |
void HWNewNet::consoleCommand(const QString & cmd) |
951 |
{ |
|
952 |
RawSendNet(QString("CMD%1%2").arg(delimeter).arg(cmd)); |
|
953 |
} |
|
954 |
||
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
|
955 |
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
|
956 |
{ |
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
|
957 |
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
|
958 |
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
|
959 |
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
|
960 |
|
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
|
961 |
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
|
962 |
} |
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
|
963 |
|
1410
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
964 |
void HWNewNet::startGame() |
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
965 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
966 |
RawSendNet(QString("START_GAME")); |
1410
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
967 |
} |
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
968 |
|
5126 | 969 |
void HWNewNet::updateRoomName(const QString & name) |
970 |
{ |
|
971 |
RawSendNet(QString("ROOM_NAME%1%2").arg(delimeter).arg(name)); |
|
972 |
} |
|
973 |
||
974 |
||
1410
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
975 |
void HWNewNet::toggleRestrictJoins() |
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
976 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
977 |
RawSendNet(QString("TOGGLE_RESTRICT_JOINS")); |
1410
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
978 |
} |
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
979 |
|
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
980 |
void HWNewNet::toggleRestrictTeamAdds() |
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
981 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
982 |
RawSendNet(QString("TOGGLE_RESTRICT_TEAMS")); |
1410
eece43296890
Send appropriate messages to server on control menu actions
unc0rr
parents:
1405
diff
changeset
|
983 |
} |
1592
5ee77ee470a6
Start converting network protocol to no-disconnecting religion
unc0rr
parents:
1591
diff
changeset
|
984 |
|
8559 | 985 |
void HWNewNet::toggleRegisteredOnly() |
986 |
{ |
|
987 |
RawSendNet(QString("TOGGLE_REGISTERED_ONLY")); |
|
988 |
} |
|
989 |
||
2155
d897222d3339
Implement ability for server admin to clear accounts cache
unc0rr
parents:
2149
diff
changeset
|
990 |
void HWNewNet::clearAccountsCache() |
d897222d3339
Implement ability for server admin to clear accounts cache
unc0rr
parents:
2149
diff
changeset
|
991 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
992 |
RawSendNet(QString("CLEAR_ACCOUNTS_CACHE")); |
2155
d897222d3339
Implement ability for server admin to clear accounts cache
unc0rr
parents:
2149
diff
changeset
|
993 |
} |
d897222d3339
Implement ability for server admin to clear accounts cache
unc0rr
parents:
2149
diff
changeset
|
994 |
|
1592
5ee77ee470a6
Start converting network protocol to no-disconnecting religion
unc0rr
parents:
1591
diff
changeset
|
995 |
void HWNewNet::partRoom() |
5ee77ee470a6
Start converting network protocol to no-disconnecting religion
unc0rr
parents:
1591
diff
changeset
|
996 |
{ |
6036 | 997 |
netClientState = InLobby; |
7732 | 998 |
m_playersModel->resetRoomFlags(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2821
diff
changeset
|
999 |
RawSendNet(QString("PART")); |
1592
5ee77ee470a6
Start converting network protocol to no-disconnecting religion
unc0rr
parents:
1591
diff
changeset
|
1000 |
} |
1671 | 1001 |
|
1002 |
bool HWNewNet::isInRoom() |
|
1003 |
{ |
|
6036 | 1004 |
return netClientState >= InRoom; |
1671 | 1005 |
} |
1925 | 1006 |
|
3283 | 1007 |
void HWNewNet::setServerMessageNew(const QString & msg) |
1008 |
{ |
|
1009 |
RawSendNet(QString("SET_SERVER_VAR%1MOTD_NEW%1%2").arg(delimeter).arg(msg)); |
|
1010 |
} |
|
1011 |
||
1012 |
void HWNewNet::setServerMessageOld(const QString & msg) |
|
1925 | 1013 |
{ |
3283 | 1014 |
RawSendNet(QString("SET_SERVER_VAR%1MOTD_OLD%1%2").arg(delimeter).arg(msg)); |
1925 | 1015 |
} |
3283 | 1016 |
|
1017 |
void HWNewNet::setLatestProtocolVar(int proto) |
|
1018 |
{ |
|
1019 |
RawSendNet(QString("SET_SERVER_VAR%1LATEST_PROTO%1%2").arg(delimeter).arg(proto)); |
|
1020 |
} |
|
1021 |
||
1022 |
void HWNewNet::askServerVars() |
|
1023 |
{ |
|
3697 | 1024 |
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
|
1025 |
} |
4879
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1026 |
|
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1027 |
void HWNewNet::handleNotice(int n) |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1028 |
{ |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1029 |
switch(n) |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1030 |
{ |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1031 |
case 0: |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1032 |
{ |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5959
diff
changeset
|
1033 |
emit NickTaken(mynick); |
4879
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1034 |
break; |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1035 |
} |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1036 |
} |
55f939e2c19c
Ask for another nickname on collision. Works only with new server.
unc0rr
parents:
4535
diff
changeset
|
1037 |
} |
6732
c906dc78091f
Start switching to rooms list model. To be continued.
unc0rr
parents:
6722
diff
changeset
|
1038 |
|
c906dc78091f
Start switching to rooms list model. To be continued.
unc0rr
parents:
6722
diff
changeset
|
1039 |
RoomsListModel * HWNewNet::roomsListModel() |
c906dc78091f
Start switching to rooms list model. To be continued.
unc0rr
parents:
6722
diff
changeset
|
1040 |
{ |
c906dc78091f
Start switching to rooms list model. To be continued.
unc0rr
parents:
6722
diff
changeset
|
1041 |
return m_roomsListModel; |
c906dc78091f
Start switching to rooms list model. To be continued.
unc0rr
parents:
6722
diff
changeset
|
1042 |
} |
7723 | 1043 |
|
7728 | 1044 |
QAbstractItemModel *HWNewNet::lobbyPlayersModel() |
7723 | 1045 |
{ |
1046 |
return m_lobbyPlayersModel; |
|
1047 |
} |
|
1048 |
||
7728 | 1049 |
QAbstractItemModel *HWNewNet::roomPlayersModel() |
7723 | 1050 |
{ |
1051 |
return m_roomPlayersModel; |
|
8436
b89aacebb9db
- Also pass unknown cmds to the server when in room
unc0rr
parents:
8416
diff
changeset
|
1052 |
} |