diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-01 23:12:21 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-01 23:12:21 +0100 |
| commit | 62adbdab992ec177f60dec76447508741de4e7db (patch) | |
| tree | f71d5970526fe06b04f6ba7953bec70f665aaf5e /src/server/worldserver/Master.cpp | |
| parent | 234f0971200a0d75db61b163afc433270bce632b (diff) | |
| parent | 01b705c84422902201a9ae51b1fb457f9f53d601 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
Diffstat (limited to 'src/server/worldserver/Master.cpp')
| -rw-r--r-- | src/server/worldserver/Master.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 7587a9d1904..fe872c1977f 100644 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * This program is free software; you can redistribute it and/or modify it @@ -254,7 +254,7 @@ int Master::Run() } ///- Launch the world listener socket - uint16 wsport = sWorld->getIntConfig(CONFIG_PORT_WORLD); + uint16 wsport = uint16(sWorld->getIntConfig(CONFIG_PORT_WORLD)); std::string bind_ip = ConfigMgr::GetStringDefault("BindIP", "0.0.0.0"); if (sWorldSocketMgr->StartNetwork(wsport, bind_ip.c_str()) == -1) @@ -364,7 +364,7 @@ bool Master::_StartDB() return false; } - async_threads = ConfigMgr::GetIntDefault("WorldDatabase.WorkerThreads", 1); + async_threads = uint8(ConfigMgr::GetIntDefault("WorldDatabase.WorkerThreads", 1)); if (async_threads < 1 || async_threads > 32) { sLog->outError(LOG_FILTER_WORLDSERVER, "World database: invalid number of worker threads specified. " @@ -372,7 +372,7 @@ bool Master::_StartDB() return false; } - synch_threads = ConfigMgr::GetIntDefault("WorldDatabase.SynchThreads", 1); + synch_threads = uint8(ConfigMgr::GetIntDefault("WorldDatabase.SynchThreads", 1)); ///- Initialise the world database if (!WorldDatabase.Open(dbstring, async_threads, synch_threads)) { @@ -388,7 +388,7 @@ bool Master::_StartDB() return false; } - async_threads = ConfigMgr::GetIntDefault("CharacterDatabase.WorkerThreads", 1); + async_threads = uint8(ConfigMgr::GetIntDefault("CharacterDatabase.WorkerThreads", 1)); if (async_threads < 1 || async_threads > 32) { sLog->outError(LOG_FILTER_WORLDSERVER, "Character database: invalid number of worker threads specified. " @@ -396,7 +396,7 @@ bool Master::_StartDB() return false; } - synch_threads = ConfigMgr::GetIntDefault("CharacterDatabase.SynchThreads", 2); + synch_threads = uint8(ConfigMgr::GetIntDefault("CharacterDatabase.SynchThreads", 2)); ///- Initialise the Character database if (!CharacterDatabase.Open(dbstring, async_threads, synch_threads)) @@ -413,7 +413,7 @@ bool Master::_StartDB() return false; } - async_threads = ConfigMgr::GetIntDefault("LoginDatabase.WorkerThreads", 1); + async_threads = uint8(ConfigMgr::GetIntDefault("LoginDatabase.WorkerThreads", 1)); if (async_threads < 1 || async_threads > 32) { sLog->outError(LOG_FILTER_WORLDSERVER, "Login database: invalid number of worker threads specified. " @@ -421,7 +421,7 @@ bool Master::_StartDB() return false; } - synch_threads = ConfigMgr::GetIntDefault("LoginDatabase.SynchThreads", 1); + synch_threads = uint8(ConfigMgr::GetIntDefault("LoginDatabase.SynchThreads", 1)); ///- Initialise the login database if (!LoginDatabase.Open(dbstring, async_threads, synch_threads)) { |