NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic

This commit is contained in:
dean11 2013-12-12 10:37:40 +01:00
parent af7f0e01a8 49cfbbebd5
commit 2ea252919a
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Code/Network/NetworkAPI/NetworkClient.cpp
View File

@ -233,9 +233,9 @@ bool NetworkClient::IsConnected()
return privateData->connection->IsConnected(); return privateData->connection->IsConnected();
} }
void NetworkClient::Send(CustomNetProtocol& protocol) void NetworkClient::Send(CustomProtocolObject& protocol)
{ {
this->privateData->Send(protocol); this->privateData->Send(*protocol.GetProtocol());
} }
void NetworkClient::SetRecieverObject(RecieverObject recvObj, NetworkProtocolCallbackType type) void NetworkClient::SetRecieverObject(RecieverObject recvObj, NetworkProtocolCallbackType type)

3
Code/Network/NetworkAPI/NetworkClient.h
View File

@ -19,6 +19,7 @@ namespace Oyster
{ {
extern "C" extern "C"
{ {
struct CustomProtocolObject;
class NET_PROTOCOL_EXPORT NetworkClient class NET_PROTOCOL_EXPORT NetworkClient
{ {
public: public:
@ -33,7 +34,7 @@ namespace Oyster
bool IsConnected(); bool IsConnected();
void Send(CustomNetProtocol& protocol); void Send(CustomProtocolObject& protocol);
void SetRecieverObject(RecieverObject recvObj, NetworkProtocolCallbackType type); void SetRecieverObject(RecieverObject recvObj, NetworkProtocolCallbackType type);

1
Code/Network/NetworkAPI/Translator.cpp
View File

@ -8,6 +8,7 @@
#include "../NetworkDependencies/Messages/MessageHeader.h" #include "../NetworkDependencies/Messages/MessageHeader.h"
#include "../NetworkDependencies/OysterByte.h" #include "../NetworkDependencies/OysterByte.h"
using namespace Oyster::Network; using namespace Oyster::Network;
using namespace ::Messages; using namespace ::Messages;
using namespace Utility::DynamicMemory; using namespace Utility::DynamicMemory;

2
Code/Network/OysterNetworkClient/ClientMain.cpp
View File

@ -34,7 +34,7 @@ int main()
ThreadedClient* client = new ThreadedClient; ThreadedClient* client = new ThreadedClient;
//Connect to server //Connect to server
errorCode = client->Connect(9876, "localhost"); errorCode = client->Connect(15151, "193.11.186.101");
if(errorCode != 0) if(errorCode != 0)
{ {