[Balder-cvs] balder2d/include networkmanager.h,1.6,1.7

[Reuben <col...@us...>]

Update of /cvsroot/balder/balder2d/include
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6414/include

Modified Files:
	networkmanager.h 
Log Message:
13-June-2006
	- Reuben updated the "config.xml" with some additional settings for
	multiplayer mode.  New settings include: server port, client port and
	connection time out (in seconds).
	- Reuben added new functionality to the NetworkManager class to allow
	it to actually activate a server or connect a client.
	- Reuben updated the menu to allow the network connection interface to
	output connection attempts status to the user.  This includes connection
	failure reasons and connection time-out indication.  User can cancel
	connection attempts in mid-process without the program locking up.

Index: networkmanager.h
===================================================================
RCS file: /cvsroot/balder/balder2d/include/networkmanager.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** networkmanager.h	3 Jun 2006 00:07:01 -0000	1.6
--- networkmanager.h	13 Jun 2006 19:55:30 -0000	1.7
***************
*** 22,34 ****
  #define NETWORKMANAGER_H
  
  #include "../include/balder2dtypes.h"
  #include <raknet/PacketEnumerations.h>
  #include <raknet/RakNetworkFactory.h>
! #include <raknet/RakPeerInterface.h>
  #include <raknet/NetworkTypes.h>
  #include <sstream>
  
  namespace Balder{
! 	
  class NetworkManager{
  public:
--- 22,40 ----
  #define NETWORKMANAGER_H
  
+ #define SERVER_PORT 44444
+ #define CLIENT_PORT 55555
+ 
  #include "../include/balder2dtypes.h"
+ #include "../include/configmanager.h"
+ #include "../include/gamemanager.h"
  #include <raknet/PacketEnumerations.h>
  #include <raknet/RakNetworkFactory.h>
! #include <raknet/RakServerInterface.h>
! #include <raknet/RakClientInterface.h>
  #include <raknet/NetworkTypes.h>
  #include <sstream>
  
  namespace Balder{
! 
  class NetworkManager{
  public:
***************
*** 41,49 ****
      int Disconnect();
  
!     const std::string getServerIP() {return server_ip_address;}
  
  private:
  
!     std::string server_ip_address;
      bool connected;
      bool is_host;
--- 47,66 ----
      int Disconnect();
  
!     const char* getServerIP() {return ConfigManager::GetServer();}
!     bool IsHost() {return is_host;}
!     int getConnectionTimeOut() {return connectionTimeOut;}
!     int IsServerActivated() {return server->IsActive();}
!     int IsClientConnected() {return client->IsConnected();}
  
  private:
  
!     void initializeNetworkSettings();
! 
!     int connectionTimeOut;
! 
!     short int serverPort;
!     short int clientPort;
!     short int serverMaxConnectionsAllowed;
! 
      bool connected;
      bool is_host;