summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-24 21:44:43 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-24 21:44:43 +0300
commitf3f5a316ca62e9d17776d4a49aab728aee65a5b5 (patch)
tree22affcd563bb8569adfd42de15ecd64f6819fa56 /src/net
parent43fd8a8d53d4bd811a8e4d468a78f201148e5896 (diff)
downloadmanaverse-f3f5a316ca62e9d17776d4a49aab728aee65a5b5.tar.gz
manaverse-f3f5a316ca62e9d17776d4a49aab728aee65a5b5.tar.bz2
manaverse-f3f5a316ca62e9d17776d4a49aab728aee65a5b5.tar.xz
manaverse-f3f5a316ca62e9d17776d4a49aab728aee65a5b5.zip
move threads creation into sdl helper.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/download.cpp9
-rw-r--r--src/net/ea/network.cpp7
2 files changed, 5 insertions, 11 deletions
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 1d49caea2..4d03ea783 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -26,6 +26,8 @@
#include "logger.h"
#include "main.h"
+#include "utils/sdlhelper.h"
+
#include <curl/curl.h>
#include <SDL.h>
@@ -169,12 +171,7 @@ bool Download::start()
{
logger->log("Starting download: %s", mUrl.c_str());
-#ifdef USE_SDL2
- mThread = SDL_CreateThread(downloadThread, "download", this);
-#else
- mThread = SDL_CreateThread(downloadThread, this);
-#endif
-
+ mThread = SDL::createThread(downloadThread, "download", this);
if (!mThread)
{
logger->log1(DOWNLOAD_ERROR_MESSAGE_THREAD);
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 3bcda3db3..92cbb14f8 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -30,6 +30,7 @@
#include "net/eathena/protocol.h"
#include "utils/gettext.h"
+#include "utils/sdlhelper.h"
#include <assert.h>
#include <sstream>
@@ -114,11 +115,7 @@ bool Network::connect(ServerInfo server)
mToSkip = 0;
mState = CONNECTING;
-#ifdef USE_SDL2
- mWorkerThread = SDL_CreateThread(networkThread, "network", this);
-#else
- mWorkerThread = SDL_CreateThread(networkThread, this);
-#endif
+ mWorkerThread = SDL::createThread(networkThread, "network", this);
if (!mWorkerThread)
{
setError("Unable to create network worker thread");