summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2021-01-29 14:03:27 +0100
committersfan5 <sfan5@live.de>2021-02-02 20:46:08 +0100
commitc834d2ab25694ef2d67dc24f85f304269d202c8e (patch)
treec62a57d0cdbca950b9c7cb1a58666b6b77760bc2 /src/server.h
parent5e392cf34f8e062dd0533619921223656e32598a (diff)
downloadminetest-c834d2ab25694ef2d67dc24f85f304269d202c8e.tar.gz
minetest-c834d2ab25694ef2d67dc24f85f304269d202c8e.tar.bz2
minetest-c834d2ab25694ef2d67dc24f85f304269d202c8e.zip
Drop wide/narrow conversion functions
The only valid usecase for these is interfacing with OS APIs that want a locale/OS-specific multibyte encoding. But they weren't used for that anywhere, instead UTF-8 is pretty much assumed when it comes to that. Since these are only a potential source of bugs and do not fulfil their purpose at all, drop them entirely.
Diffstat (limited to 'src/server.h')
-rw-r--r--src/server.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/server.h b/src/server.h
index 5c143a657..0b4084aa9 100644
--- a/src/server.h
+++ b/src/server.h
@@ -219,7 +219,7 @@ public:
void onMapEditEvent(const MapEditEvent &event);
// Connection must be locked when called
- std::wstring getStatusString();
+ std::string getStatusString();
inline double getUptime() const { return m_uptime_counter->get(); }
// read shutdown state
@@ -495,10 +495,8 @@ private:
void handleChatInterfaceEvent(ChatEvent *evt);
// This returns the answer to the sender of wmessage, or "" if there is none
- std::wstring handleChat(const std::string &name, const std::wstring &wname,
- std::wstring wmessage_input,
- bool check_shout_priv = false,
- RemotePlayer *player = NULL);
+ std::wstring handleChat(const std::string &name, std::wstring wmessage_input,
+ bool check_shout_priv = false, RemotePlayer *player = nullptr);
void handleAdminChat(const ChatEventChat *evt);
// When called, connection mutex should be locked