[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src/NetPanzer Classes/Network/Network...
From: |
Matthias Braun |
Subject: |
[netPanzer-CVS] netpanzer/src/NetPanzer Classes/Network/Network... |
Date: |
Sun, 07 Sep 2003 14:45:12 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/07 14:45:12
Modified files:
src/NetPanzer/Classes/Network: NetworkClient.hpp
src/NetPanzer/Interfaces: GameManager.cpp
src/NetPanzer/Interfaces/unix: NetworkClientUnix.cpp
NetworkClientUnix.hpp
Log message:
don't forget to check for incoming packets in the mainloop
Patches:
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.4
netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.4 Sun Sep
7 14:39:32 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp Sun Sep 7
14:45:12 2003
@@ -106,6 +106,8 @@
virtual void sendMessage(NetMessage *message, size_t size, int flags) =
0;
virtual int getMessage(NetMessage *message) = 0;
+
+ virtual void checkIncoming() = 0;
};
#endif // ** _NETWORK_CLIENT_HPP
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.22
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.23
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.22 Sun Sep 7
14:39:32 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Sun Sep 7 14:45:12 2003
@@ -1899,7 +1899,7 @@
// ******************************************************************
void GameManager::simLoop()
{
- // CLIENT->checkIncoming();
+ CLIENT->checkIncoming();
SERVER->checkIncoming();
if ( NetworkState::status == _network_state_server )
{ ServerMessageRouter::routeMessages(); }
@@ -2002,7 +2002,7 @@
// ******************************************************************
void GameManager::dedicatedSimLoop()
{
- // CLIENT->checkIncoming();
+ CLIENT->checkIncoming();
SERVER->checkIncoming();
if ( NetworkState::status == _network_state_server )
{ ServerMessageRouter::routeMessages(); }
Index: netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp:1.3 Sun Sep
7 14:39:33 2003
+++ netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp Sun Sep
7 14:45:12 2003
@@ -103,6 +103,9 @@
void NetworkClientUnix::sendMessage(NetMessage *message, size_t size, int
flags)
{
+ if(!clientsocket)
+ return;
+
message->size = size;
clientsocket->sendMessage((char*) message, message->size,
! (flags &
_network_send_no_guarantee) );
@@ -151,3 +154,8 @@
return false;
}
+void NetworkClientUnix::checkIncoming()
+{
+ if(clientsocket)
+ clientsocket->read();
+}
Index: netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp:1.3 Sun Sep
7 14:39:33 2003
+++ netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp Sun Sep
7 14:45:12 2003
@@ -43,6 +43,7 @@
virtual void sendMessage(NetMessage *message, size_t size, int flags);
virtual int getMessage(NetMessage *message);
+ virtual void checkIncoming();
private:
ClientSocket* clientsocket;
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer/src/NetPanzer Classes/Network/Network...,
Matthias Braun <=