--- a/sources/network/rconsession.h Wed Jul 20 18:29:13 2016 +0300 +++ b/sources/network/rconsession.h Wed Jul 20 22:56:16 2016 +0300 @@ -20,10 +20,10 @@ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -95,25 +95,25 @@ RCONSession(); ~RCONSession(); - const IPAddress& address() const; - void connect (IPAddress address); - void disconnect(); - void handle_packet (Datagram& datagram); - void process_server_updates (Bytestream& packet); - int num_admins() const; - void send (const Bytestream& packet); - void send_hello(); - void send_password(); - void set_password (const String& password); - UDPSocket* socket(); - void tick(); - void bump_last_ping(); - bool send_command (const String& message); - RCONSessionState state() const; - const String& level() const; - bool is_active() const; - void request_tab_complete (const String& part); - void set_interface (class Interface* iface); + const IPAddress& address() const; + void bumpLastPing(); + void connect(IPAddress address); + void disconnect(); + int getAdminCount() const; + const String& getLevel() const; + UDPSocket* getSocket(); + RCONSessionState getState() const; + void handlePacket(Datagram& datagram); + bool isActive() const; + void processServerUpdates(Bytestream& packet); + void requestTabCompletion(const String& part); + void send(const Bytestream& packet); + bool sendCommand(const String& message); + void sendHello(); + void sendPassword(); + void setInterface(class Interface* interface); + void setPassword(const String& password); + void tick(); private: RCONSessionState m_state; @@ -124,7 +124,7 @@ String m_salt; int m_serverProtocol; String m_hostname; - int m_numAdmins; + int m_adminCount; String m_level; String m_lastTabComplete; class Interface* m_interface;