diff options
| author | Salanto <62221668+Salanto@users.noreply.github.com> | 2024-07-12 11:48:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-12 11:48:01 +0200 |
| commit | fb64ca386c51cc3942e1f38cfd76132b1b50e9db (patch) | |
| tree | f805cd22b191a028312e7f546b571fb35488fa50 /src/networkmanager.cpp | |
| parent | c745d0a1b78732550ae790fee12bd23b71a4f25e (diff) | |
Add playerlist widget element (#996)
* Commit
* Boyfailure code commit
* Cooking code spaghetti
* Accidental overwrite recursive function call hell
* Implemented player list
* Add partial moderator widget
Sleepy time! Hee-Hoo!
* Moderator Dialog - Step 1 - WIP
* Appease the clang gods
* Clang appeasement policy
* *sacrifices goat to clang*
* Added player report, reworked implementation, ...
* Added player-specific report
* Reworked implementation
* No longer uses JSON.
* Removed preset loader.
---------
Co-authored-by: TrickyLeifa <date.epoch@gmail.com>
Co-authored-by: Leifa <26681464+TrickyLeifa@users.noreply.github.com>
Diffstat (limited to 'src/networkmanager.cpp')
| -rw-r--r-- | src/networkmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp index fc30060c..500b2c83 100644 --- a/src/networkmanager.cpp +++ b/src/networkmanager.cpp @@ -149,7 +149,7 @@ void NetworkManager::connect_to_server(ServerInfo server) qInfo().noquote() << QObject::tr("Connecting to %1").arg(server.toString()); m_connection = new WebSocketConnection(ao_app, this); - connect(m_connection, &WebSocketConnection::connectedToServer, this, [] { qInfo() << "Established connection to server."; }); + connect(m_connection, &WebSocketConnection::connectedToServer, ao_app, &AOApplication::server_connected); connect(m_connection, &WebSocketConnection::disconnectedFromServer, ao_app, &AOApplication::server_disconnected); connect(m_connection, &WebSocketConnection::errorOccurred, this, [](QString error) { qCritical() << "Connection error:" << error; }); connect(m_connection, &WebSocketConnection::receivedPacket, this, &NetworkManager::handle_server_packet); @@ -188,7 +188,7 @@ void NetworkManager::ship_server_packet(AOPacket packet) void NetworkManager::join_to_server() { - ship_server_packet(AOPacket("askchaa").toString()); + ship_server_packet(AOPacket("askchaa")); } void NetworkManager::handle_server_packet(AOPacket packet) |