games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-20 00:26:25 +02:00
parent 93d78edfb9
commit baa73f5433
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/CServerHandler.cpp
View File

@@ -90,22 +90,22 @@ public:
{ {
boost::mutex::scoped_lock interfaceLock(GH.interfaceMutex); boost::mutex::scoped_lock interfaceLock(GH.interfaceMutex);
T & ptr = static_cast<T &>(pack); auto & ref = static_cast<T&>(pack);
ApplyOnLobbyHandlerNetPackVisitor visitor(*handler); ApplyOnLobbyHandlerNetPackVisitor visitor(*handler);
logNetwork->trace("\tImmediately apply on lobby: %s", typeid(ptr).name()); logNetwork->trace("\tImmediately apply on lobby: %s", typeid(ref).name());
ptr.visit(visitor); ref.visit(visitor);
return visitor.getResult(); return visitor.getResult();
} }
void applyOnLobbyScreen(CLobbyScreen * lobby, CServerHandler * handler, CPackForLobby & pack) const override void applyOnLobbyScreen(CLobbyScreen * lobby, CServerHandler * handler, CPackForLobby & pack) const override
{ {
T & ptr = static_cast<T &>(pack); auto & ref = static_cast<T &>(pack);
ApplyOnLobbyScreenNetPackVisitor visitor(*handler, lobby); ApplyOnLobbyScreenNetPackVisitor visitor(*handler, lobby);
logNetwork->trace("\tApply on lobby from queue: %s", typeid(ptr).name()); logNetwork->trace("\tApply on lobby from queue: %s", typeid(ref).name());
ptr.visit(visitor); ref.visit(visitor);
} }
}; };
@@ -260,11 +260,11 @@ void CServerHandler::connectToServer(const std::string & addr, const ui16 port)
if (!isServerLocal()) if (!isServerLocal())
{ {
Settings serverAddress = settings.write["server"]["remoteHostname"]; Settings remoteAddress = settings.write["server"]["remoteHostname"];
serverAddress->String() = addr; remoteAddress->String() = addr;
Settings serverPort = settings.write["server"]["remotePort"]; Settings remotePort = settings.write["server"]["remotePort"];
serverPort->Integer() = port; remotePort->Integer() = port;
} }
networkHandler->connectToRemote(*this, addr, port); networkHandler->connectToRemote(*this, addr, port);
@@ -312,7 +312,7 @@ void CServerHandler::onConnectionEstablished(const std::shared_ptr<INetworkConne
void CServerHandler::applyPackOnLobbyScreen(CPackForLobby & pack) void CServerHandler::applyPackOnLobbyScreen(CPackForLobby & pack)
{ {
boost::mutex::scoped_lock interfaceLock(GH.interfaceMutex); boost::mutex::scoped_lock interfaceLock(GH.interfaceMutex);
CBaseForLobbyApply * apply = applier->getApplier(CTypeList::getInstance().getTypeID(&pack)); //find the applier const CBaseForLobbyApply * apply = applier->getApplier(CTypeList::getInstance().getTypeID(&pack)); //find the applier
apply->applyOnLobbyScreen(dynamic_cast<CLobbyScreen *>(SEL), this, pack); apply->applyOnLobbyScreen(dynamic_cast<CLobbyScreen *>(SEL), this, pack);
GH.windows().totalRedraw(); GH.windows().totalRedraw();
} }

2
client/CServerHandler.h
View File

@@ -82,7 +82,7 @@ public:
}; };
/// structure to handle running server and connecting to it /// structure to handle running server and connecting to it
class CServerHandler : public IServerAPI, public LobbyInfo, public INetworkClientListener, public INetworkTimerListener, boost::noncopyable class CServerHandler final : public IServerAPI, public LobbyInfo, public INetworkClientListener, public INetworkTimerListener, boost::noncopyable
{ {
friend class ApplyOnLobbyHandlerNetPackVisitor; friend class ApplyOnLobbyHandlerNetPackVisitor;

4
lib/network/NetworkConnection.cpp
View File

@@ -26,7 +26,7 @@ void NetworkConnection::start()
boost::asio::async_read(*socket, boost::asio::async_read(*socket,
readBuffer, readBuffer,
boost::asio::transfer_exactly(messageHeaderSize), boost::asio::transfer_exactly(messageHeaderSize),
std::bind(&NetworkConnection::onHeaderReceived,this, _1)); [this](const auto & ec, const auto & endpoint) { onHeaderReceived(ec); });
} }
void NetworkConnection::onHeaderReceived(const boost::system::error_code & ec) void NetworkConnection::onHeaderReceived(const boost::system::error_code & ec)
@@ -42,7 +42,7 @@ void NetworkConnection::onHeaderReceived(const boost::system::error_code & ec)
boost::asio::async_read(*socket, boost::asio::async_read(*socket,
readBuffer, readBuffer,
boost::asio::transfer_exactly(messageSize), boost::asio::transfer_exactly(messageSize),
std::bind(&NetworkConnection::onPacketReceived,this, _1, messageSize)); [this, messageSize](const auto & ec, const auto & endpoint) { onPacketReceived(ec, messageSize); });
} }
uint32_t NetworkConnection::readPacketSize() uint32_t NetworkConnection::readPacketSize()

4
lib/network/NetworkServer.cpp
View File

@@ -14,8 +14,8 @@
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN
NetworkServer::NetworkServer(INetworkServerListener & listener, const std::shared_ptr<NetworkContext> & context) NetworkServer::NetworkServer(INetworkServerListener & listener, const std::shared_ptr<NetworkContext> & context)
: listener(listener) : io(context)
, io(context) , listener(listener)
{ {
} }

4
lobby/SQLiteConnection.h
View File

@@ -9,8 +9,8 @@
*/ */
#pragma once #pragma once
typedef struct sqlite3 sqlite3; using sqlite3 = struct sqlite3;
typedef struct sqlite3_stmt sqlite3_stmt; using sqlite3_stmt = struct sqlite3_stmt;
class SQLiteInstance; class SQLiteInstance;
class SQLiteStatement; class SQLiteStatement;