diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-10-13 09:00:01 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-10-13 09:00:01 -0600 |
| commit | 0aed5e4eb3af56ba0bf9ceb0343c262a7427b6ba (patch) | |
| tree | e63bc37eb35cd10bc012d4d54fe7d76a81a5edc1 /src/net | |
| parent | 5987d6ff5e737d72193089418a3bf31f9f5a5c8f (diff) | |
| download | mana-0aed5e4eb3af56ba0bf9ceb0343c262a7427b6ba.tar.gz mana-0aed5e4eb3af56ba0bf9ceb0343c262a7427b6ba.tar.bz2 mana-0aed5e4eb3af56ba0bf9ceb0343c262a7427b6ba.tar.xz mana-0aed5e4eb3af56ba0bf9ceb0343c262a7427b6ba.zip | |
Add an asynchronous download class
And use it to download news, updates, and the server list.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/loginhandler.h | 3 | ||||
| -rw-r--r-- | src/net/net.cpp | 10 | ||||
| -rw-r--r-- | src/net/net.h | 4 | ||||
| -rw-r--r-- | src/net/serverinfo.h | 3 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index 12a0c26f..2ac34c1e 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -22,8 +22,7 @@ #ifndef LOGINHANDLER_H #define LOGINHANDLER_H -#include "logindata.h" - +#include "net/logindata.h" #include "net/serverinfo.h" #include "net/worldinfo.h" diff --git a/src/net/net.cpp b/src/net/net.cpp index 1d771f0a..5eccccf9 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -125,7 +125,7 @@ Net::TradeHandler *Net::getTradeHandler() namespace Net { bool networkLoaded = false; -} +} // namespace Net void Net::connectToServer(const ServerInfo &server) { @@ -134,7 +134,7 @@ void Net::connectToServer(const ServerInfo &server) if (networkLoaded) { - Net::getGeneralHandler()->reload(); + getGeneralHandler()->reload(); } else { @@ -145,11 +145,11 @@ void Net::connectToServer(const ServerInfo &server) #endif } - Net::getGeneralHandler()->load(); + getGeneralHandler()->load(); networkLoaded = true; - Net::getLoginHandler()->setServer(server); + getLoginHandler()->setServer(server); - Net::getLoginHandler()->connect(); + getLoginHandler()->connect(); } diff --git a/src/net/net.h b/src/net/net.h index 5b0c92f4..7a49121d 100644 --- a/src/net/net.h +++ b/src/net/net.h @@ -19,11 +19,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "net/serverinfo.h" - #ifndef NET_H #define NET_H +class ServerInfo; + namespace Net { class AdminHandler; diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index f410e516..4f68c6d6 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -23,6 +23,7 @@ #define SERVERINFO_H #include <string> +#include <vector> class ServerInfo { @@ -49,4 +50,6 @@ public: } }; +typedef std::vector<ServerInfo> ServerInfos; + #endif // SERVERINFO_H |