diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-06-19 10:10:15 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-06-19 10:10:15 +0200 |
| commit | 61d02a395b0ca594640f0fb917d7162a5aba2c37 (patch) | |
| tree | 7dd6f7f540dda3d89d37bc7e19f3f4d27dd53c85 /src/net/tmwa/network.h | |
| parent | 5da59b807d9840fb23feb42df729bf5e88ee9678 (diff) | |
| parent | ac0b338b3e026d0d05a447894de9a6a994da82dc (diff) | |
| download | mana-61d02a395b0ca594640f0fb917d7162a5aba2c37.tar.gz mana-61d02a395b0ca594640f0fb917d7162a5aba2c37.tar.bz2 mana-61d02a395b0ca594640f0fb917d7162a5aba2c37.tar.xz mana-61d02a395b0ca594640f0fb917d7162a5aba2c37.zip | |
Merge branch 'master' into online-player-listonline-player-list
Conflicts:
src/net/tmwa/chathandler.cpp
Diffstat (limited to 'src/net/tmwa/network.h')
| -rw-r--r-- | src/net/tmwa/network.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index 36d8cafd..4069f916 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -90,15 +90,13 @@ class Network NET_ERROR }; - protected: + private: friend int networkThread(void *data); friend class MessageOut; - static Network *instance(); - void setError(const std::string &error); - Uint16 readWord(int pos); + uint16_t readWord(int pos); bool realConnect(); |