diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-04-09 17:36:33 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-10-18 08:21:32 +0000 |
| commit | e875242f380662573880e7400fe3e736a2d3375a (patch) | |
| tree | 1c026e19d98764b57c7619502d8c88535aa58d8e /src/net | |
| parent | eb206d0a5a9b8d73b103c094e376c5e13cd4c218 (diff) | |
| download | mana-e875242f380662573880e7400fe3e736a2d3375a.tar.gz mana-e875242f380662573880e7400fe3e736a2d3375a.tar.bz2 mana-e875242f380662573880e7400fe3e736a2d3375a.tar.xz mana-e875242f380662573880e7400fe3e736a2d3375a.zip | |
General code cleanups
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/net.cpp | 4 | ||||
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/network.h | 2 |
3 files changed, 3 insertions, 5 deletions
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); |