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

Removed sendPacket function and destructor.

Browse Source
This commit is contained in:
hiker 2015-10-26 17:55:19 +11:00
parent cf51d2f0e0
commit 0bd2b48ea0
3 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/network/network_manager.cpp
View File

@ -32,15 +32,6 @@ NetworkManager::NetworkManager()
{ {
} // NetworkManager } // NetworkManager
//-----------------------------------------------------------------------------
NetworkManager::~NetworkManager()
{
ProtocolManager::kill();
STKHost::destroy();
} // ~Networkmanager
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
/** \brief Function to start the Network Manager (start threads). /** \brief Function to start the Network Manager (start threads).
*/ */
@ -60,16 +51,3 @@ bool NetworkManager::connect(const TransportAddress& address)
return STKPeer::connectToHost(STKHost::get(), address, 2, 0); return STKPeer::connectToHost(STKHost::get(), address, 2, 0);
} // connect } // connect
//-----------------------------------------------------------------------------
void NetworkManager::sendPacket(STKPeer* peer, const NetworkString& data,
bool reliable)
{
if (peer)
peer->sendPacket(data, reliable);
} // sendPacket
//-----------------------------------------------------------------------------

6
src/network/network_manager.hpp
View File

@ -49,7 +49,7 @@ class NetworkManager : public AbstractSingleton<NetworkManager>
{ {
protected: protected:
NetworkManager(); NetworkManager();
virtual ~NetworkManager(); virtual ~NetworkManager() {};
private: private:
@ -63,10 +63,6 @@ public:
virtual bool connect(const TransportAddress& peer); virtual bool connect(const TransportAddress& peer);
virtual void sendPacket(const NetworkString& data, virtual void sendPacket(const NetworkString& data,
bool reliable = true) = 0; bool reliable = true) = 0;
virtual void sendPacket(STKPeer* peer,
const NetworkString& data,
bool reliable = true);
// Game related functions // Game related functions
virtual bool isServer() = 0; virtual bool isServer() = 0;

16
src/network/protocol_manager.cpp
View File

@ -173,20 +173,20 @@ void ProtocolManager::propagateEvent(Event* event)
void ProtocolManager::sendMessage(Protocol* sender, const NetworkString& message, void ProtocolManager::sendMessage(Protocol* sender, const NetworkString& message,
bool reliable) bool reliable)
{ {
NetworkString newMessage(1+message.size()); NetworkString new_message(1+message.size());
newMessage.ai8(sender->getProtocolType()); // add one byte to add protocol type new_message.ai8(sender->getProtocolType()); // add one byte to add protocol type
newMessage += message; new_message += message;
NetworkManager::getInstance()->sendPacket(newMessage, reliable); NetworkManager::getInstance()->sendPacket(new_message, reliable);
} // sendMessage } // sendMessage
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void ProtocolManager::sendMessage(Protocol* sender, STKPeer* peer, void ProtocolManager::sendMessage(Protocol* sender, STKPeer* peer,
const NetworkString& message, bool reliable) const NetworkString& message, bool reliable)
{ {
NetworkString newMessage(1+message.size()); NetworkString new_message(1+message.size());
newMessage.ai8(sender->getProtocolType()); // add one byte to add protocol type new_message.ai8(sender->getProtocolType()); // add one byte to add protocol type
newMessage += message; new_message += message;
NetworkManager::getInstance()->sendPacket(peer, newMessage, reliable); peer->sendPacket(new_message, reliable);
} // sendMessage } // sendMessage
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------