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

Removed unnecessary #include, and disabled copying of STKPeer.

Browse Source
This commit is contained in:
hiker 2015-10-22 18:46:01 +11:00
parent a102d97e3a
commit c59f958c2f
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/event.hpp
View File

@ -24,11 +24,14 @@
#ifndef EVENT_HPP #ifndef EVENT_HPP
#define EVENT_HPP #define EVENT_HPP
#include "network/stk_peer.hpp"
#include "network/network_string.hpp" #include "network/network_string.hpp"
#include "utils/leak_check.hpp" #include "utils/leak_check.hpp"
#include "utils/types.hpp" #include "utils/types.hpp"
#include "enet/enet.h"
class STKPeer;
/*! /*!
* \enum EVENT_TYPE * \enum EVENT_TYPE
* \brief Represents a network event type. * \brief Represents a network event type.

11
src/network/stk_peer.cpp
View File

@ -34,17 +34,6 @@ STKPeer::STKPeer()
m_token_set = false; m_token_set = false;
} // STKPeer } // STKPeer
//-----------------------------------------------------------------------------
/** Copy constructor.
*/
STKPeer::STKPeer(const STKPeer& peer)
{
m_enet_peer = peer.m_enet_peer;
m_player_profile = peer.m_player_profile;
m_client_server_token = peer.m_client_server_token;
m_token_set = peer.m_token_set;
} // STKPeer
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** Destructor. /** Destructor.
*/ */

4
src/network/stk_peer.hpp
View File

@ -23,6 +23,7 @@
#ifndef STK_PEER_HPP #ifndef STK_PEER_HPP
#define STK_PEER_HPP #define STK_PEER_HPP
#include "utils/no_copy.hpp"
#include "utils/types.hpp" #include "utils/types.hpp"
#include <enet/enet.h> #include <enet/enet.h>
@ -36,7 +37,7 @@ class TransportAddress;
* \brief Represents a peer. * \brief Represents a peer.
* This class is used to interface the ENetPeer structure. * This class is used to interface the ENetPeer structure.
*/ */
class STKPeer class STKPeer : public NoCopy
{ {
friend class Event; friend class Event;
protected: protected:
@ -53,7 +54,6 @@ protected:
public: public:
STKPeer(); STKPeer();
STKPeer(const STKPeer& peer);
virtual ~STKPeer(); virtual ~STKPeer();
virtual void sendPacket(const NetworkString& data, bool reliable = true); virtual void sendPacket(const NetworkString& data, bool reliable = true);