sheepy-clone: comparison QTfrontend/net/newnetclient.cpp

equal deleted inserted replaced

-:9819e69bc6db
+:e295995348f9
 #include "roomslistmodel.h"
 #include "playerslistmodel.h"
 #include "servermessages.h"
 #include "HWApplication.h"
-char delimeter='\n';
+char delimiter='\n';
 HWNewNet::HWNewNet() :
 isChief(false),
 m_game_connected(false),
 netClientState(Disconnected)
 HWNewNet::~HWNewNet()
 {
 if (m_game_connected)
 {
-RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit"));
+RawSendNet(QString("QUIT%1%2").arg(delimiter).arg("User quit"));
 emit disconnected(tr("User quit"));
 }
 NetSocket.flush();
 }
 }
 void HWNewNet::Disconnect()
 {
 if (m_game_connected)
-RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit"));
+RawSendNet(QString("QUIT%1%2").arg(delimiter).arg("User quit"));
 m_game_connected = false;
 NetSocket.disconnectFromHost();
 }
 }
 myroom = room;
 if(password.isEmpty())
-RawSendNet(QString("CREATE_ROOM%1%2").arg(delimeter).arg(room));
+RawSendNet(QString("CREATE_ROOM%1%2").arg(delimiter).arg(room));
 else
-RawSendNet(QString("CREATE_ROOM%1%2%1%3").arg(delimeter).arg(room).arg(password));
+RawSendNet(QString("CREATE_ROOM%1%2%1%3").arg(delimiter).arg(room).arg(password));
 isChief = true;
 }
 void HWNewNet::JoinRoom(const QString & room, const QString &password)
 }
 myroom = room;
 if(password.isEmpty())
-RawSendNet(QString("JOIN_ROOM%1%2").arg(delimeter).arg(room));
+RawSendNet(QString("JOIN_ROOM%1%2").arg(delimiter).arg(room));
 else
-RawSendNet(QString("JOIN_ROOM%1%2%1%3").arg(delimeter).arg(room).arg(password));
+RawSendNet(QString("JOIN_ROOM%1%2%1%3").arg(delimiter).arg(room).arg(password));
 isChief = false;
 }
 void HWNewNet::AddTeam(const HWTeam & team)
 {
-QString cmd = QString("ADD_TEAM") + delimeter +
+QString cmd = QString("ADD_TEAM") + delimiter +
-team.name() + delimeter +
+team.name() + delimiter +
-QString::number(team.color()) + delimeter +
+QString::number(team.color()) + delimiter +
-team.grave() + delimeter +
+team.grave() + delimiter +
-team.fort() + delimeter +
+team.fort() + delimiter +
-team.voicepack() + delimeter +
+team.voicepack() + delimiter +
-team.flag() + delimeter +
+team.flag() + delimiter +
 QString::number(team.difficulty());
 for(int i = 0; i < HEDGEHOGS_PER_TEAM; ++i)
 {
-cmd.append(delimeter);
+cmd.append(delimiter);
 cmd.append(team.hedgehog(i).Name);
-cmd.append(delimeter);
+cmd.append(delimiter);
 cmd.append(team.hedgehog(i).Hat);
 }
 RawSendNet(cmd);
 }
 void HWNewNet::RemoveTeam(const HWTeam & team)
 {
-RawSendNet(QString("REMOVE_TEAM") + delimeter + team.name());
+RawSendNet(QString("REMOVE_TEAM") + delimiter + team.name());
 }
 void HWNewNet::NewNick(const QString & nick)
 {
-RawSendNet(QString("NICK%1%2").arg(delimeter).arg(nick));
+RawSendNet(QString("NICK%1%2").arg(delimiter).arg(nick));
 }
 void HWNewNet::ToggleReady()
 {
 RawSendNet(QString("TOGGLE_READY"));
 void HWNewNet::SendNet(const QByteArray & buf)
 {
 QString msg = QString(buf.toBase64());
-RawSendNet(QString("EM%1%2").arg(delimeter).arg(msg));
+RawSendNet(QString("EM%1%2").arg(delimiter).arg(msg));
 }
 void HWNewNet::RawSendNet(const QString & str)
 {
 RawSendNet(str.toUtf8());
 {
 if(lst.size() < 3 || lst[2].toInt() < cMinServerVersion)
 {
 // TODO: Warn user, disconnect
 qWarning() << "Server too old";
-RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("Server too old"));
+RawSendNet(QString("QUIT%1%2").arg(delimiter).arg("Server too old"));
 Disconnect();
 emit disconnected(tr("The server is too old. Disconnecting now."));
 return;
 }
-RawSendNet(QString("NICK%1%2").arg(delimeter).arg(mynick));
+RawSendNet(QString("NICK%1%2").arg(delimiter).arg(mynick));
-RawSendNet(QString("PROTO%1%2").arg(delimeter).arg(*cProtoVer));
+RawSendNet(QString("PROTO%1%2").arg(delimiter).arg(*cProtoVer));
 netClientState = Connected;
 m_game_connected = true;
 emit adminAccess(false);
 return;
 }
 }
 if (lst[0] == "PING")
 {
 if (lst.size() > 1)
-RawSendNet(QString("PONG%1%2").arg(delimeter).arg(lst[1]));
+RawSendNet(QString("PONG%1%2").arg(delimiter).arg(lst[1]));
 else
 RawSendNet(QString("PONG"));
 return;
 }
 void HWNewNet::onHedgehogsNumChanged(const HWTeam& team)
 {
 if (isChief)
 RawSendNet(QString("HH_NUM%1%2%1%3")
-.arg(delimeter)
+.arg(delimiter)
 .arg(team.name())
 .arg(team.numHedgehogs()));
 }
 void HWNewNet::onTeamColorChanged(const HWTeam& team)
 {
 if (isChief)
 RawSendNet(QString("TEAM_COLOR%1%2%1%3")
-.arg(delimeter)
+.arg(delimiter)
 .arg(team.name())
 .arg(team.color()));
 }
 void HWNewNet::onParamChanged(const QString & param, const QStringList & value)
 {
 if (isChief)
 RawSendNet(
 QString("CFG%1%2%1%3")
-.arg(delimeter)
+.arg(delimiter)
 .arg(param)
-.arg(value.join(QString(delimeter)))
+.arg(value.join(QString(delimiter)))
 );
 }
 void HWNewNet::chatLineToNetWithEcho(const QString& str)
 {
 void HWNewNet::chatLineToNet(const QString& str)
 {
 if(str != "")
 {
-RawSendNet(QString("CHAT") + delimeter + str);
+RawSendNet(QString("CHAT") + delimiter + str);
 QString action = HWProto::chatStringToAction(str);
 if (action != NULL)
 emit(roomChatAction(mynick, action));
 else
 emit(roomChatMessage(mynick, str));
 void HWNewNet::chatLineToLobby(const QString& str)
 {
 if(str != "")
 {
-RawSendNet(QString("CHAT") + delimeter + str);
+RawSendNet(QString("CHAT") + delimiter + str);
 QString action = HWProto::chatStringToAction(str);
 if (action != NULL)
 emit(lobbyChatAction(mynick, action));
 else
 emit(lobbyChatMessage(mynick, str));
 }
 }
 void HWNewNet::SendTeamMessage(const QString& str)
 {
-RawSendNet(QString("TEAMCHAT") + delimeter + str);
+RawSendNet(QString("TEAMCHAT") + delimiter + str);
 }
 void HWNewNet::askRoomsList()
 {
 if(netClientState != InLobby)
 void HWNewNet::gameFinished(bool correctly)
 {
 if (netClientState == InGame)
 {
 netClientState = InRoom;
-RawSendNet(QString("ROUNDFINISHED%1%2").arg(delimeter).arg(correctly ? "1" : "0"));
+RawSendNet(QString("ROUNDFINISHED%1%2").arg(delimiter).arg(correctly ? "1" : "0"));
 }
 }
 void HWNewNet::banPlayer(const QString & nick)
 {
-RawSendNet(QString("BAN%1%2").arg(delimeter).arg(nick));
+RawSendNet(QString("BAN%1%2").arg(delimiter).arg(nick));
 }
 void HWNewNet::banIP(const QString & ip, const QString & reason, int seconds)
 {
-RawSendNet(QString("BANIP%1%2%1%3%1%4").arg(delimeter).arg(ip).arg(reason).arg(seconds));
+RawSendNet(QString("BANIP%1%2%1%3%1%4").arg(delimiter).arg(ip).arg(reason).arg(seconds));
 }
 void HWNewNet::banNick(const QString & nick, const QString & reason, int seconds)
 {
-RawSendNet(QString("BANNICK%1%2%1%3%1%4").arg(delimeter).arg(nick).arg(reason).arg(seconds));
+RawSendNet(QString("BANNICK%1%2%1%3%1%4").arg(delimiter).arg(nick).arg(reason).arg(seconds));
 }
 void HWNewNet::getBanList()
 {
 RawSendNet(QByteArray("BANLIST"));
 }
 void HWNewNet::removeBan(const QString & b)
 {
-RawSendNet(QString("UNBAN%1%2").arg(delimeter).arg(b));
+RawSendNet(QString("UNBAN%1%2").arg(delimiter).arg(b));
 }
 void HWNewNet::kickPlayer(const QString & nick)
 {
-RawSendNet(QString("KICK%1%2").arg(delimeter).arg(nick));
+RawSendNet(QString("KICK%1%2").arg(delimiter).arg(nick));
 }
 void HWNewNet::infoPlayer(const QString & nick)
 {
-RawSendNet(QString("INFO%1%2").arg(delimeter).arg(nick));
+RawSendNet(QString("INFO%1%2").arg(delimiter).arg(nick));
 }
 void HWNewNet::followPlayer(const QString & nick)
 {
 if (!isInRoom())
 {
-RawSendNet(QString("FOLLOW%1%2").arg(delimeter).arg(nick));
+RawSendNet(QString("FOLLOW%1%2").arg(delimiter).arg(nick));
 isChief = false;
 }
 }
 void HWNewNet::consoleCommand(const QString & cmd)
 {
-RawSendNet(QString("CMD%1%2").arg(delimeter).arg(cmd));
+RawSendNet(QString("CMD%1%2").arg(delimiter).arg(cmd));
 }
 bool HWNewNet::allPlayersReady()
 {
 int ready = 0;
 RawSendNet(QString("START_GAME"));
 }
 void HWNewNet::updateRoomName(const QString & name)
 {
-RawSendNet(QString("ROOM_NAME%1%2").arg(delimeter).arg(name));
+RawSendNet(QString("ROOM_NAME%1%2").arg(delimiter).arg(name));
 }
 void HWNewNet::toggleRestrictJoins()
 {
 return netClientState >= InRoom;
 }
 void HWNewNet::setServerMessageNew(const QString & msg)
 {
-RawSendNet(QString("SET_SERVER_VAR%1MOTD_NEW%1%2").arg(delimeter).arg(msg));
+RawSendNet(QString("SET_SERVER_VAR%1MOTD_NEW%1%2").arg(delimiter).arg(msg));
 }
 void HWNewNet::setServerMessageOld(const QString & msg)
 {
-RawSendNet(QString("SET_SERVER_VAR%1MOTD_OLD%1%2").arg(delimeter).arg(msg));
+RawSendNet(QString("SET_SERVER_VAR%1MOTD_OLD%1%2").arg(delimiter).arg(msg));
 }
 void HWNewNet::setLatestProtocolVar(int proto)
 {
-RawSendNet(QString("SET_SERVER_VAR%1LATEST_PROTO%1%2").arg(delimeter).arg(proto));
+RawSendNet(QString("SET_SERVER_VAR%1LATEST_PROTO%1%2").arg(delimiter).arg(proto));
 }
 void HWNewNet::askServerVars()
 {
 RawSendNet(QString("GET_SERVER_VAR"));
 .append(m_passwordHash)
 .append(cProtoVer->toAscii())
 .append("!hedgewars")
 , QCryptographicHash::Sha1).toHex();
-RawSendNet(QString("PASSWORD%1%2%1%3").arg(delimeter).arg(hash).arg(m_clientSalt));
+RawSendNet(QString("PASSWORD%1%2%1%3").arg(delimiter).arg(hash).arg(m_clientSalt));
 }

changeset 10695	e295995348f9
parent 10401	c31276023295
child 11046	47a8c19ecb60