diff --git a/src/main_loop.cpp b/src/main_loop.cpp index 6c6459755..ff0a2964d 100644 --- a/src/main_loop.cpp +++ b/src/main_loop.cpp @@ -184,7 +184,7 @@ void MainLoop::run() if (STKHost::get()->requestedShutdown()) STKHost::get()->shutdown(); else - ProtocolManager::getInstance()->update(); + ProtocolManager::getInstance()->update(dt); } PROFILER_POP_CPU_MARKER(); @@ -196,7 +196,7 @@ void MainLoop::run() { PROFILER_PUSH_CPU_MARKER("Protocol manager update", 0x7F, 0x00, 0x7F); if(NetworkConfig::get()->isNetworking()) - ProtocolManager::getInstance()->update(); + ProtocolManager::getInstance()->update(dt); PROFILER_POP_CPU_MARKER(); PROFILER_PUSH_CPU_MARKER("Database polling update", 0x00, 0x7F, 0x7F); diff --git a/src/network/protocol.hpp b/src/network/protocol.hpp index 2839c908f..12d3412fa 100644 --- a/src/network/protocol.hpp +++ b/src/network/protocol.hpp @@ -121,7 +121,7 @@ public: /** \brief Called by the protocol listener, synchronously with the main * loop. Must be re-defined.*/ - virtual void update() = 0; + virtual void update(float dt) = 0; /** \brief Called by the protocol listener as often as possible. * Must be re-defined. */ diff --git a/src/network/protocol_manager.cpp b/src/network/protocol_manager.cpp index 36ff96879..e1b3a676c 100644 --- a/src/network/protocol_manager.cpp +++ b/src/network/protocol_manager.cpp @@ -321,7 +321,7 @@ bool ProtocolManager::sendEvent(Event* event) * This function is called by the main thread (i.e. from main_loop). * This function IS FPS-dependant. */ -void ProtocolManager::update() +void ProtocolManager::update(float dt) { // before updating, notify protocols that they have received events m_events_to_process.lock(); @@ -346,7 +346,7 @@ void ProtocolManager::update() for (unsigned int i = 0; i < m_protocols.getData().size(); i++) { if (m_protocols.getData()[i]->getState() == PROTOCOL_STATE_RUNNING) - m_protocols.getData()[i]->update(); + m_protocols.getData()[i]->update(dt); } m_protocols.unlock(); } // update diff --git a/src/network/protocol_manager.hpp b/src/network/protocol_manager.hpp index f0b96b414..82d722edf 100644 --- a/src/network/protocol_manager.hpp +++ b/src/network/protocol_manager.hpp @@ -144,7 +144,7 @@ public: virtual void requestPause(Protocol* protocol); virtual void requestUnpause(Protocol* protocol); virtual void requestTerminate(Protocol* protocol); - virtual void update(); + virtual void update(float dt); virtual Protocol* getProtocol(uint32_t id); virtual Protocol* getProtocol(ProtocolType type); }; // class ProtocolManager diff --git a/src/network/protocols/client_lobby_room_protocol.cpp b/src/network/protocols/client_lobby_room_protocol.cpp index 319ed4bae..d8d06e406 100644 --- a/src/network/protocols/client_lobby_room_protocol.cpp +++ b/src/network/protocols/client_lobby_room_protocol.cpp @@ -269,7 +269,7 @@ bool ClientLobbyRoomProtocol::notifyEventAsynchronous(Event* event) //----------------------------------------------------------------------------- -void ClientLobbyRoomProtocol::update() +void ClientLobbyRoomProtocol::update(float dt) { switch (m_state) { diff --git a/src/network/protocols/client_lobby_room_protocol.hpp b/src/network/protocols/client_lobby_room_protocol.hpp index 6df192668..1e0547473 100644 --- a/src/network/protocols/client_lobby_room_protocol.hpp +++ b/src/network/protocols/client_lobby_room_protocol.hpp @@ -3,6 +3,7 @@ #include "network/protocols/lobby_room_protocol.hpp" #include "network/transport_address.hpp" +#include "utils/cpp2011.hpp" class STKPeer; @@ -64,11 +65,11 @@ public: void doneWithResults(); void leave(); - virtual bool notifyEvent(Event* event); - virtual bool notifyEventAsynchronous(Event* event); - virtual void setup(); - virtual void update(); - virtual void asynchronousUpdate() {} + virtual bool notifyEvent(Event* event) OVERRIDE; + virtual bool notifyEventAsynchronous(Event* event) OVERRIDE; + virtual void setup() OVERRIDE; + virtual void update(float dt) OVERRIDE; + virtual void asynchronousUpdate() OVERRIDE {} }; diff --git a/src/network/protocols/connect_to_peer.hpp b/src/network/protocols/connect_to_peer.hpp index 054c6ea62..b83080b48 100644 --- a/src/network/protocols/connect_to_peer.hpp +++ b/src/network/protocols/connect_to_peer.hpp @@ -56,7 +56,7 @@ public: virtual bool notifyEventAsynchronous(Event* event) OVERRIDE; virtual void setup() OVERRIDE; - virtual void update() OVERRIDE {} + virtual void update(float dt) OVERRIDE {} virtual void asynchronousUpdate() OVERRIDE; virtual void callback(Protocol *protocol) OVERRIDE; }; // class ConnectToPeer diff --git a/src/network/protocols/connect_to_server.hpp b/src/network/protocols/connect_to_server.hpp index 0fb020ac0..e69a8e370 100644 --- a/src/network/protocols/connect_to_server.hpp +++ b/src/network/protocols/connect_to_server.hpp @@ -63,7 +63,7 @@ public: virtual void setup() OVERRIDE; virtual void asynchronousUpdate() OVERRIDE; virtual void callback(Protocol *protocol) OVERRIDE; - virtual void update() OVERRIDE {} + virtual void update(float dt) OVERRIDE {} void setServerAddress(const TransportAddress &address); }; // class ConnectToServer diff --git a/src/network/protocols/controller_events_protocol.cpp b/src/network/protocols/controller_events_protocol.cpp index 66a88188e..f0e986b83 100644 --- a/src/network/protocols/controller_events_protocol.cpp +++ b/src/network/protocols/controller_events_protocol.cpp @@ -95,12 +95,6 @@ bool ControllerEventsProtocol::notifyEventAsynchronous(Event* event) return true; } // notifyEventAsynchronous -//----------------------------------------------------------------------------- - -void ControllerEventsProtocol::update() -{ -} // update - //----------------------------------------------------------------------------- /** Called from the local kart controller when an action (like steering, * acceleration, ...) was triggered. It compresses the current kart control diff --git a/src/network/protocols/controller_events_protocol.hpp b/src/network/protocols/controller_events_protocol.hpp index efa08c1a3..f357c3c46 100644 --- a/src/network/protocols/controller_events_protocol.hpp +++ b/src/network/protocols/controller_events_protocol.hpp @@ -22,6 +22,7 @@ #include "network/protocol.hpp" #include "input/input.hpp" +#include "utils/cpp2011.hpp" class Controller; class STKPeer; @@ -33,10 +34,10 @@ public: ControllerEventsProtocol(); virtual ~ControllerEventsProtocol(); - virtual bool notifyEventAsynchronous(Event* event); - virtual void update(); - virtual void setup() {}; - virtual void asynchronousUpdate() {} + virtual bool notifyEventAsynchronous(Event* event) OVERRIDE; + virtual void update(float dt) OVERRIDE {}; + virtual void setup() OVERRIDE {}; + virtual void asynchronousUpdate() OVERRIDE {} void controllerAction(Controller* controller, PlayerAction action, int value); diff --git a/src/network/protocols/game_events_protocol.cpp b/src/network/protocols/game_events_protocol.cpp index f100bf0e7..1bf40db47 100644 --- a/src/network/protocols/game_events_protocol.cpp +++ b/src/network/protocols/game_events_protocol.cpp @@ -63,16 +63,6 @@ bool GameEventsProtocol::notifyEvent(Event* event) return true; } // notifyEvent -// ---------------------------------------------------------------------------- -void GameEventsProtocol::setup() -{ -} // setup - -// ---------------------------------------------------------------------------- -void GameEventsProtocol::update() -{ -} // update - // ---------------------------------------------------------------------------- /** Called on the server when an item is collected. */ diff --git a/src/network/protocols/game_events_protocol.hpp b/src/network/protocols/game_events_protocol.hpp index 7389b93aa..eed98bc78 100644 --- a/src/network/protocols/game_events_protocol.hpp +++ b/src/network/protocols/game_events_protocol.hpp @@ -2,6 +2,7 @@ #define GAME_EVENTS_PROTOCOL_HPP #include "network/protocol.hpp" +#include "utils/cpp2011.hpp" class AbstractKart; class Item; @@ -18,17 +19,19 @@ public: GameEventsProtocol(); virtual ~GameEventsProtocol(); - virtual bool notifyEvent(Event* event); - virtual void setup(); - virtual void update(); + virtual bool notifyEvent(Event* event) OVERRIDE; void collectedItem(Item* item, AbstractKart* kart); void collectedItem(const NetworkString &ns); void kartFinishedRace(AbstractKart *kart, float time); void kartFinishedRace(const NetworkString &ns); + virtual void setup() OVERRIDE {}; + virtual void update(float dt) OVERRIDE {}; + virtual void asynchronousUpdate() OVERRIDE{} // ------------------------------------------------------------------------ - virtual void asynchronousUpdate() {} - // ------------------------------------------------------------------------ - virtual bool notifyEventAsynchronous(Event* event) { return false; } + virtual bool notifyEventAsynchronous(Event* event) OVERRIDE + { + return false; + } // notifyEventAsynchronous }; // class GameEventsProtocol diff --git a/src/network/protocols/get_peer_address.hpp b/src/network/protocols/get_peer_address.hpp index dbeb84f93..094639953 100644 --- a/src/network/protocols/get_peer_address.hpp +++ b/src/network/protocols/get_peer_address.hpp @@ -21,6 +21,7 @@ #include "network/protocol.hpp" #include "network/transport_address.hpp" +#include "utils/cpp2011.hpp" namespace Online { class XMLRequest; } @@ -37,19 +38,19 @@ public: GetPeerAddress(uint32_t peer_id, CallbackObject* callback_object); virtual ~GetPeerAddress(); - virtual void setup(); - virtual void asynchronousUpdate(); + virtual void setup() OVERRIDE; + virtual void asynchronousUpdate() OVERRIDE; void setPeerID(uint32_t m_peer_id); // ------------------------------------------------------------------------ /** Returns the address found. */ const TransportAddress &getAddress() const { return m_address; } // ------------------------------------------------------------------------ - virtual void update() {} + virtual void update(float dt) OVERRIDE {} // ------------------------------------------------------------------------ - virtual bool notifyEvent(Event* event) { return true; } + virtual bool notifyEvent(Event* event) OVERRIDE { return true; } // ------------------------------------------------------------------------ - virtual bool notifyEventAsynchronous(Event* event) { return true; } + virtual bool notifyEventAsynchronous(Event* event) OVERRIDE { return true; } }; // class GetPeerAddress diff --git a/src/network/protocols/get_public_address.hpp b/src/network/protocols/get_public_address.hpp index 61aa9c4f4..783597d04 100644 --- a/src/network/protocols/get_public_address.hpp +++ b/src/network/protocols/get_public_address.hpp @@ -20,6 +20,7 @@ #define GET_PUBLIC_ADDRESS_HPP #include "network/protocol.hpp" +#include "utils/cpp2011.hpp" #include @@ -27,34 +28,39 @@ class Network; class GetPublicAddress : public Protocol { - public: - GetPublicAddress(CallbackObject *callback = NULL); - virtual ~GetPublicAddress() {} +private: + void createStunRequest(); + std::string parseStunResponse(); - virtual bool notifyEvent(Event* event) { return true; } - virtual bool notifyEventAsynchronous(Event* event) { return true; } - virtual void setup() { m_state = NOTHING_DONE; } - virtual void update() {} - virtual void asynchronousUpdate(); + // Constants + static const uint32_t m_stun_magic_cookie; + static const int m_stun_server_port = 3478; - private: - void createStunRequest(); - std::string parseStunResponse(); + enum State + { + NOTHING_DONE, + STUN_REQUEST_SENT, + EXITING + } m_state; - // Constants - static const uint32_t m_stun_magic_cookie; - static const int m_stun_server_port = 3478; + uint8_t m_stun_tansaction_id[12]; + uint32_t m_stun_server_ip; + Network* m_transaction_host; - enum State - { - NOTHING_DONE, - STUN_REQUEST_SENT, - EXITING - } m_state; +public: + GetPublicAddress(CallbackObject *callback = NULL); + virtual ~GetPublicAddress() {} - uint8_t m_stun_tansaction_id[12]; - uint32_t m_stun_server_ip; - Network* m_transaction_host; -}; + virtual void asynchronousUpdate() OVERRIDE; + // ------------------------------------------------------------------------ + virtual void update(float dt) OVERRIDE {} + // ------------------------------------------------------------------------ + virtual bool notifyEvent(Event* event) OVERRIDE { return true; } + // ------------------------------------------------------------------------ + virtual bool notifyEventAsynchronous(Event* event) OVERRIDE { return true; } + // ------------------------------------------------------------------------ + virtual void setup() { m_state = NOTHING_DONE; } + +}; // class GetPublicAddress #endif // GET_PUBLIC_ADDRESS_HPP diff --git a/src/network/protocols/hide_public_address.hpp b/src/network/protocols/hide_public_address.hpp index f2279390c..858833bea 100644 --- a/src/network/protocols/hide_public_address.hpp +++ b/src/network/protocols/hide_public_address.hpp @@ -20,6 +20,7 @@ #define HIDE_PUBLIC_ADDRESS_HPP #include "network/protocol.hpp" +#include "utils/cpp2011.hpp" #include @@ -27,26 +28,29 @@ namespace Online { class XMLRequest; } class HidePublicAddress : public Protocol { - public: - HidePublicAddress(); - virtual ~HidePublicAddress(); +private: + Online::XMLRequest* m_request; + enum STATE + { + NONE, + REQUEST_PENDING, + DONE, + EXITING + }; + STATE m_state; - virtual bool notifyEvent(Event* event) { return true; } - virtual bool notifyEventAsynchronous(Event* event) { return true; } - virtual void setup(); - virtual void update() {} - virtual void asynchronousUpdate(); +public: + HidePublicAddress(); + virtual ~HidePublicAddress(); - protected: - Online::XMLRequest* m_request; - enum STATE - { - NONE, - REQUEST_PENDING, - DONE, - EXITING - }; - STATE m_state; -}; + virtual void asynchronousUpdate() OVERRIDE; + virtual void setup() OVERRIDE; + // ------------------------------------------------------------------------ + virtual bool notifyEvent(Event* event) OVERRIDE { return true; } + // ------------------------------------------------------------------------ + virtual bool notifyEventAsynchronous(Event* event) OVERRIDE { return true; } + // ------------------------------------------------------------------------ + virtual void update(float dt) OVERRIDE {} +}; // class HidePublicAddress #endif // HIDE_PUBLIC_ADDRESS_HPP diff --git a/src/network/protocols/kart_update_protocol.cpp b/src/network/protocols/kart_update_protocol.cpp index a6f41ad91..6c2f70b6e 100644 --- a/src/network/protocols/kart_update_protocol.cpp +++ b/src/network/protocols/kart_update_protocol.cpp @@ -67,7 +67,7 @@ bool KartUpdateProtocol::notifyEvent(Event* event) * or more updates before this client handles them, only the last one will * actually be handled (i.e. outdated kart position updates are discarded). */ -void KartUpdateProtocol::update() +void KartUpdateProtocol::update(float dt) { if (!World::getWorld()) return; diff --git a/src/network/protocols/kart_update_protocol.hpp b/src/network/protocols/kart_update_protocol.hpp index f5eb27201..be5e144f4 100644 --- a/src/network/protocols/kart_update_protocol.hpp +++ b/src/network/protocols/kart_update_protocol.hpp @@ -2,7 +2,9 @@ #define KART_UPDATE_PROTOCOL_HPP #include "network/protocol.hpp" +#include "utils/cpp2011.hpp" #include "utils/vec3.hpp" + #include "LinearMath/btQuaternion.h" #include @@ -27,10 +29,10 @@ public: KartUpdateProtocol(); virtual ~KartUpdateProtocol(); - virtual bool notifyEvent(Event* event); - virtual void setup(); - virtual void update(); - virtual void asynchronousUpdate() {}; + virtual bool notifyEvent(Event* event) OVERRIDE; + virtual void setup() OVERRIDE; + virtual void update(float dt) OVERRIDE; + virtual void asynchronousUpdate() OVERRIDE {}; }; // KartUpdateProtocol diff --git a/src/network/protocols/lobby_room_protocol.hpp b/src/network/protocols/lobby_room_protocol.hpp index 6290a836e..9fa9185e3 100644 --- a/src/network/protocols/lobby_room_protocol.hpp +++ b/src/network/protocols/lobby_room_protocol.hpp @@ -73,7 +73,7 @@ public: virtual ~LobbyRoomProtocol() {} // ------------------------------------------------------------------------ virtual void setup() = 0; - virtual void update() = 0; + virtual void update(float dt) = 0; }; // class LobbyRoomProtocol #endif // LOBBY_ROOM_PROTOCOL_HPP diff --git a/src/network/protocols/ping_protocol.hpp b/src/network/protocols/ping_protocol.hpp index def641311..fdb66adf2 100644 --- a/src/network/protocols/ping_protocol.hpp +++ b/src/network/protocols/ping_protocol.hpp @@ -3,6 +3,7 @@ #include "network/protocol.hpp" #include "network/transport_address.hpp" +#include "utils/cpp2011.hpp" class PingProtocol : public Protocol { @@ -16,16 +17,19 @@ private: /** Time of last ping. */ double m_last_ping_time; public: - PingProtocol(const TransportAddress& ping_dst, - double delay_between_pings); - virtual ~PingProtocol(); + PingProtocol(const TransportAddress& ping_dst, + double delay_between_pings); + virtual ~PingProtocol(); - virtual bool notifyEvent(Event* event) { return true; } - virtual bool notifyEventAsynchronous(Event* event) { return true; } - virtual void setup(); - virtual void update() {} - virtual void asynchronousUpdate(); + virtual void asynchronousUpdate() OVERRIDE; + virtual void setup() OVERRIDE; + // ------------------------------------------------------------------------ + virtual bool notifyEvent(Event* event) OVERRIDE { return true; } + // ------------------------------------------------------------------------ + virtual bool notifyEventAsynchronous(Event* event) OVERRIDE { return true; } + // ------------------------------------------------------------------------ + virtual void update(float dt) OVERRIDE {} }; #endif // PING_PROTOCOL_HPP diff --git a/src/network/protocols/request_connection.hpp b/src/network/protocols/request_connection.hpp index 2184efefd..de70737e0 100644 --- a/src/network/protocols/request_connection.hpp +++ b/src/network/protocols/request_connection.hpp @@ -38,12 +38,14 @@ public: RequestConnection(uint32_t server_id); virtual ~RequestConnection(); - - virtual bool notifyEvent(Event* event) { return true; } - virtual bool notifyEventAsynchronous(Event* event) { return true; } - virtual void setup(); - virtual void update() {} - virtual void asynchronousUpdate(); + virtual void setup() OVERRIDE; + virtual void asynchronousUpdate() OVERRIDE; + // ------------------------------------------------------------------------ + virtual bool notifyEvent(Event* event) OVERRIDE { return true; } + // ------------------------------------------------------------------------ + virtual bool notifyEventAsynchronous(Event* event) OVERRIDE { return true; } + // ------------------------------------------------------------------------ + virtual void update(float dt) OVERRIDE {} }; // RequestConnection diff --git a/src/network/protocols/server_lobby_room_protocol.cpp b/src/network/protocols/server_lobby_room_protocol.cpp index 3001d78cb..42039815b 100644 --- a/src/network/protocols/server_lobby_room_protocol.cpp +++ b/src/network/protocols/server_lobby_room_protocol.cpp @@ -112,7 +112,7 @@ bool ServerLobbyRoomProtocol::notifyEventAsynchronous(Event* event) * is known, register the server and its address with the stk server so that * client can find it. */ -void ServerLobbyRoomProtocol::update() +void ServerLobbyRoomProtocol::update(float dt) { switch (m_state) { diff --git a/src/network/protocols/server_lobby_room_protocol.hpp b/src/network/protocols/server_lobby_room_protocol.hpp index b293c5f93..4a4cb697f 100644 --- a/src/network/protocols/server_lobby_room_protocol.hpp +++ b/src/network/protocols/server_lobby_room_protocol.hpp @@ -55,7 +55,7 @@ public: virtual bool notifyEventAsynchronous(Event* event) OVERRIDE; virtual void setup() OVERRIDE; - virtual void update() OVERRIDE; + virtual void update(float dt) OVERRIDE; virtual void asynchronousUpdate() OVERRIDE {}; void startGame(); diff --git a/src/network/protocols/start_game_protocol.cpp b/src/network/protocols/start_game_protocol.cpp index 223c6f301..e913b1d10 100644 --- a/src/network/protocols/start_game_protocol.cpp +++ b/src/network/protocols/start_game_protocol.cpp @@ -170,7 +170,7 @@ void StartGameProtocol::startRace() } // startRace // ---------------------------------------------------------------------------- -void StartGameProtocol::update() +void StartGameProtocol::update(float dt) { switch(m_state) { diff --git a/src/network/protocols/start_game_protocol.hpp b/src/network/protocols/start_game_protocol.hpp index e3bbe0147..c300a5bbf 100644 --- a/src/network/protocols/start_game_protocol.hpp +++ b/src/network/protocols/start_game_protocol.hpp @@ -2,6 +2,8 @@ #define START_GAME_PROTOCOL_HPP #include "network/protocol.hpp" +#include "utils/cpp2011.hpp" + #include class GameSetup; @@ -39,10 +41,10 @@ public: virtual ~StartGameProtocol(); virtual bool notifyEventAsynchronous(Event* event); - virtual void setup(); - virtual void update(); + virtual void setup() OVERRIDE; + virtual void update(float dt) OVERRIDE; void ready(); - virtual void asynchronousUpdate() {} + virtual void asynchronousUpdate() OVERRIDE {} }; // class StartGameProtocol diff --git a/src/network/protocols/stop_server.hpp b/src/network/protocols/stop_server.hpp index feba521b1..6ec1c814e 100644 --- a/src/network/protocols/stop_server.hpp +++ b/src/network/protocols/stop_server.hpp @@ -2,6 +2,7 @@ #define STOP_SERVER_HPP #include "network/protocol.hpp" +#include "utils/cpp2011.hpp" namespace Online { class XMLRequest; } @@ -10,25 +11,26 @@ namespace Online { class XMLRequest; } class StopServer : public Protocol { - public: - StopServer(); - virtual ~StopServer(); +private: + Online::XMLRequest* m_request; + enum STATE + { + NONE, + REQUEST_PENDING, + DONE, + EXITING + }; + STATE m_state; +public: + StopServer(); + virtual ~StopServer(); - virtual bool notifyEventAsynchronous(Event* event); - virtual void setup(); - virtual void update() {} - virtual void asynchronousUpdate(); + virtual bool notifyEventAsynchronous(Event* event) OVERRIDE; + virtual void setup() OVERRIDE; + virtual void asynchronousUpdate() OVERRIDE; + // -------------------------------------------------------------------- + virtual void update(float dt) OVERRIDE {} - protected: - Online::XMLRequest* m_request; - enum STATE - { - NONE, - REQUEST_PENDING, - DONE, - EXITING - }; - STATE m_state; }; #endif // STOP_SERVER_HPP diff --git a/src/network/protocols/synchronization_protocol.hpp b/src/network/protocols/synchronization_protocol.hpp index 1bc1abfae..4190f2b95 100644 --- a/src/network/protocols/synchronization_protocol.hpp +++ b/src/network/protocols/synchronization_protocol.hpp @@ -2,6 +2,8 @@ #define SYNCHRONIZATION_PROTOCOL_HPP #include "network/protocol.hpp" +#include "utils/cpp2011.hpp" + #include #include @@ -28,12 +30,13 @@ public: SynchronizationProtocol(); virtual ~SynchronizationProtocol(); - virtual bool notifyEventAsynchronous(Event* event); - virtual void setup(); - virtual void update() {} - virtual void asynchronousUpdate(); + virtual bool notifyEventAsynchronous(Event* event) OVERRIDE; + virtual void setup() OVERRIDE; + virtual void asynchronousUpdate() OVERRIDE; void startCountdown(int ms_countdown); + // ------------------------------------------------------------------------ + virtual void update(float dt) OVERRIDE {} // ------------------------------------------------------------------------ int getCountdown() { return (int)(m_countdown*1000.0); } diff --git a/src/network/stk_host.cpp b/src/network/stk_host.cpp index cad666134..c3b01d29d 100644 --- a/src/network/stk_host.cpp +++ b/src/network/stk_host.cpp @@ -305,8 +305,8 @@ void STKHost::init() // Optional: start the network console m_network_console = new NetworkConsole(); m_network_console->run(); - -} // STKHost + +} // STKHost // ---------------------------------------------------------------------------- /** Destructor. Stops the listening thread, closes the packet log file and