--- a/sources/interface.h Mon Jan 11 16:39:30 2016 +0200 +++ b/sources/interface.h Mon Jan 11 16:43:00 2016 +0200 @@ -58,7 +58,7 @@ void set_player_names (const StringList& names); void need_refresh(); void tab_complete (const String& part, String complete); - RCONSession* get_session() { return &Session; } + RCONSession* get_session() { return &m_session; } void handle_command(const String& input); void disconnected(); @@ -69,26 +69,26 @@ void __cdecl print_text (const char* fmtstr, ...); private: - StringList InputHistory; - int InputCursor; - int CursorPosition; - int InputPanning; - bool NeedRefresh; - bool NeedStatusBarRender; - bool NeedInputRender; - bool NeedOutputRender; - bool NeedNicklistRender; - struct { char ch; int x; } CursorCharacter; - Vector<ColoredLine> OutputLines; - int OutputScroll; - String Title; - InputState CurrentInputState; - std::function<void(bool)> DisconnectConfirmFunction; - IPAddress CurrentAddress; - String StatusBarText; - StringList PlayerNames; - String PasteBuffer; - RCONSession Session; + StringList m_inputHistory; + int m_inputCursor; + int m_cursorPosition; + int m_inputPanning; + bool m_needRefresh; + bool m_needStatusBarRender; + bool m_needInputRender; + bool m_needOutputRender; + bool m_needNicklistRender; + struct { char ch; int x; } m_cursorCharacter; + Vector<ColoredLine> m_outputLines; + int m_outputScroll; + String m_title; + InputState m_inputState; + std::function<void(bool)> m_disconnectCallback; + IPAddress m_remoteAddress; + String m_statusBarText; + StringList m_playerNames; + String m_pasteBuffer; + RCONSession m_session; void render_titlebar(); void safe_disconnect (std::function<void(bool)> afterwards);