ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed setupClient (which is now done in the constructor).

Browse Source
This commit is contained in:
hiker 2015-11-02 09:14:35 +11:00
parent 0b62d2f82b
commit d7d2115abd
2 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/network/stk_host.cpp
View File

@ -52,6 +52,15 @@ STKHost::STKHost()
{
m_is_server = false;
init();
m_network = new Network(/*peer_count*/1, /*channel_limit*/2,
/*max_in_bandwidth*/0, /*max_out_bandwidth*/0);
if (!m_network)
{
Log::fatal ("STKHost", "An error occurred while trying to create "
"an ENet client host.");
}
} // STKHost
// ----------------------------------------------------------------------------
@ -77,8 +86,8 @@ STKHost::STKHost(const irr::core::stringw &server_name)
/*max_out_bandwidth*/ 0, &addr);
if (!m_network)
{
Log::fatal("STKHost", "An error occurred while trying to create an ENet"
" server host.");
Log::fatal("STKHost", "An error occurred while trying to create an "
"ENet server host.");
}
startListening();
@ -344,30 +353,6 @@ void* STKHost::mainLoop(void* self)
return NULL;
} // mainLoop
// ----------------------------------------------------------------------------
/** \brief Setups the host as a client.
* In fact there is only one peer connected to this host.
* \param peer_count : The maximum number of peers.
* \param channel_limit : The maximum number of channels per peer.
* \param max_incoming_bandwidth : The maximum incoming bandwidth.
* \param max_outgoing_bandwidth : The maximum outgoing bandwidth.
*/
void STKHost::setupClient(int peer_count, int channel_limit,
uint32_t max_incoming_bandwidth,
uint32_t max_outgoing_bandwidth)
{
m_network = new Network(peer_count, channel_limit,
max_incoming_bandwidth,
max_outgoing_bandwidth, NULL);
if (!m_network)
{
Log::fatal ("STKHost", "An error occurred while trying to create "
"an ENet client host.");
}
} // setupClient
// ----------------------------------------------------------------------------
/** \brief Tells if a peer is known.
* \return True if the peer is known, false elseway.

18
src/network/stk_host.hpp
View File

@ -115,18 +115,30 @@ private:
public:
/** Creates the singleton for a client. */
/** Creates the singleton for a client. In case of an error
* m_stk_host is NULL (which can be tested using isNetworking(). */
static void create()
{
assert(m_stk_host == NULL);
m_stk_host = new STKHost();
}
if(!m_stk_host->m_network)
{
delete m_stk_host;
m_stk_host = NULL;
}
} // create
// ------------------------------------------------------------------------
/** Creates the singleton for a server. */
/** Creates the singleton for a server. In case of an error
* m_stk_host is NULL (which can be tested using isNetworking(). */
static void create(const irr::core::stringw &server_name)
{
assert(m_stk_host == NULL);
m_stk_host = new STKHost(server_name);
if(!m_stk_host->m_network)
{
delete m_stk_host;
m_stk_host = NULL;
}
} // create
// ------------------------------------------------------------------------
/** Returns the instance of STKHost. */