From e875242f380662573880e7400fe3e736a2d3375a Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Tue, 9 Apr 2024 17:36:33 +0200 Subject: General code cleanups --- src/net/net.cpp | 4 +--- src/net/tmwa/generalhandler.cpp | 2 +- src/net/tmwa/network.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/net') diff --git a/src/net/net.cpp b/src/net/net.cpp index 86f7dc13..3a389db2 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -21,7 +21,6 @@ #include "net/net.h" -#include "main.h" #include "log.h" #include "net/adminhandler.h" @@ -179,8 +178,7 @@ void connectToServer(ServerInfo &server) void unload() { - GeneralHandler *handler = getGeneralHandler(); - if (handler) + if (GeneralHandler *handler = getGeneralHandler()) { handler->unload(); } diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 832d6973..d8923caa 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -103,7 +103,7 @@ GeneralHandler::GeneralHandler(): stats.emplace_back("dex", _("Dexterity %+d")); stats.emplace_back("luck", _("Luck %+d")); - setStatsList(stats); + setStatsList(std::move(stats)); listen(Event::ClientChannel); listen(Event::GameChannel); diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index 4069f916..fa0237dd 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -58,7 +58,7 @@ class Network void disconnect(); - ServerInfo getServer() const + const ServerInfo &getServer() const { return mServer; } void registerHandler(MessageHandler *handler); -- cgit v1.2.3-70-g09d2