equal
deleted
inserted
replaced
41 class HWNewNet : public QObject |
41 class HWNewNet : public QObject |
42 { |
42 { |
43 Q_OBJECT |
43 Q_OBJECT |
44 |
44 |
45 public: |
45 public: |
46 enum ClientState { Disconnected, Connecting, Redirected, Connected, InLobby, InRoom, InGame }; |
46 enum ClientState { Disconnected, Connecting, Redirected, Connected, InLobby, InRoom, InGame, InDemo }; |
47 |
47 |
48 HWNewNet(); |
48 HWNewNet(); |
49 ~HWNewNet(); |
49 ~HWNewNet(); |
50 void Connect(const QString & hostName, quint16 port, bool useTls, const QString & nick); |
50 void Connect(const QString & hostName, quint16 port, bool useTls, const QString & nick); |
51 void ContinueConnection(); |
51 void ContinueConnection(); |
71 QString myhost; |
71 QString myhost; |
72 QSslSocket NetSocket; |
72 QSslSocket NetSocket; |
73 QString seed; |
73 QString seed; |
74 bool m_game_connected; |
74 bool m_game_connected; |
75 bool m_nick_registered; |
75 bool m_nick_registered; |
|
76 bool m_demo_data_pending; |
76 RoomsListModel * m_roomsListModel; |
77 RoomsListModel * m_roomsListModel; |
77 PlayersListModel * m_playersModel; |
78 PlayersListModel * m_playersModel; |
78 QSortFilterProxyModel * m_lobbyPlayersModel; |
79 QSortFilterProxyModel * m_lobbyPlayersModel; |
79 QSortFilterProxyModel * m_roomPlayersModel; |
80 QSortFilterProxyModel * m_roomPlayersModel; |
80 QString m_lastRoom; |
81 QString m_lastRoom; |
95 |
96 |
96 ClientState netClientState; |
97 ClientState netClientState; |
97 |
98 |
98 signals: |
99 signals: |
99 void AskForRunGame(); |
100 void AskForRunGame(); |
|
101 void AskForOfficialServerDemo(); |
100 void connected(); |
102 void connected(); |
101 void disconnected(const QString & reason); |
103 void disconnected(const QString & reason); |
102 void redirected(quint16 port); |
104 void redirected(quint16 port); |
103 void Error(const QString & errmsg); |
105 void Error(const QString & errmsg); |
104 void Warning(const QString & wrnmsg); |
106 void Warning(const QString & wrnmsg); |