Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6116 in orxonox.OLD


Ignore:
Timestamp:
Dec 14, 2005, 11:19:11 PM (18 years ago)
Author:
rennerc
Message:

renamed EntityManager to NetworkGameManager

Location:
branches/network/src/lib
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/network/src/lib/network/Makefile.am

    r6106 r6116  
    1313                      server_socket.cc \
    1414                      handshake.cc \
    15                       entity_manager.cc \
     15                      network_game_manager.cc \
    1616                      converter.cc
    1717
    … …  
    2828                 server_socket.h \
    2929                 handshake.h \
    30                  entity_manager.h \
     30                 network_game_manager.h \
    3131                 converter.h
    3232

  • branches/network/src/lib/network/handshake.cc

    r6115 r6116  
    2222#include "handshake.h"
    2323
    24 Handshake::Handshake( bool server, int clientId, int entityManagerId )
     24Handshake::Handshake( bool server, int clientId, int networkGameManagerId )
    2525{
    2626  /* set the class id for the base object */
    2727  this->setClassID(CL_HANDSHAKE, "Handshake");
    2828
    29   if ( clientId > 255 )
    30   {
    31     PRINTF(1)("clientId is too big for type byte (%d)! connection to client %d will not work!", clientId, clientId);
    32   }
    33 
    34   if ( entityManagerId > 255 )
    35   {
    36     PRINTF(1)("entityManagerId is too big for type byte (%d)! connection to client %d will not work!", entityManagerId, clientId);
    37   }
    38 
    3929  this->setIsServer(server);
    4030  this->clientId = clientId;
    41   this->entityManagerId = entityManagerId;
     31  this->networkGameManagerId = networkGameManagerId;
    4232  this->state = 0;
    4333  this->isOk = false;
    … …  
    110100    this->isOk = true;
    111101    this->newHostId = data[0];
    112     this->newEntityManagerId = data[1];
     102    this->newNetworkGameManagerId = data[1];
    113103
    114104    if ( newHostId == 0 )
    … …  
    120110    else
    121111    {
    122       PRINTF(0)("got my hostID: %d\n", newHostId);
     112      PRINTF(0)("got my hostID: %d and networkGameManagerId: %d\n", newHostId, newNetworkGameManagerId);
    123113    }
    124114    return;
    … …  
    189179      //memcpy(data, &clientId, 4);
    190180      data[0] = (byte)clientId;
    191       data[1] = (byte)entityManagerId;
     181      data[1] = (byte)networkGameManagerId;
    192182    }
    193183    *reciever = clientId;

  • branches/network/src/lib/network/handshake.h

    r6115 r6116  
    3434{
    3535  public:
    36     Handshake(bool server, int clientId = 0, int entityManagerId = 0);
     36    Handshake(bool server, int clientId = 0, int networkGameManagerId = 0);
    3737    inline bool       completed(){ return hasState( HS_COMPLETED ); }
    3838    inline bool       ok(){ return isOk; }
    3939    inline int        getHostId(){ return newHostId; }
     40    inline int        getNetworkGameManagerId(){ return newNetworkGameManagerId; }
    4041
    4142    inline void       doReject(){ setState(HS_DO_REJECT); }
    … …  
    4950    int               state;
    5051    int               clientId;
    51     int               entityManagerId;
     52    int               networkGameManagerId;
    5253    int               newHostId;
    53     int               newEntityManagerId;
     54    int               newNetworkGameManagerId;
    5455    bool              isOk;
    5556

  • branches/network/src/lib/network/network_game_manager.cc

    r6111 r6116  
    2121
    2222/* include your own header */
    23 #include "entity_manager.h"
     23#include "network_game_manager.h"
    2424
    2525
    … …  
    3030 * Standard constructor
    3131 */
    32 EntityManager::EntityManager()
     32NetworkGameManager::NetworkGameManager()
    3333{
    3434  /* set the class id for the base object */
    … …  
    3939 * Standard destructor
    4040 */
    41 EntityManager::~EntityManager()
     41NetworkGameManager::~NetworkGameManager()
    4242{
    4343}
    4444
    4545
    46 void EntityManager::writeBytes(const byte* data, int length)
     46void NetworkGameManager::writeBytes(const byte* data, int length)
    4747{
    4848}
    4949
    50 int EntityManager::readBytes(byte* data, int maxLength, int * reciever)
     50int NetworkGameManager::readBytes(byte* data, int maxLength, int * reciever)
    5151{
    5252}
    5353
    54 void EntityManager::writeDebug() const
     54void NetworkGameManager::writeDebug() const
    5555{
    5656}
    5757
    58 void EntityManager::readDebug() const
     58void NetworkGameManager::readDebug() const
    5959{
    6060}
    … …  
    6666 * @param classID: The ID of the class of which an entity should be created
    6767 */
    68 void EntityManager::createEntity(int classID)
     68void NetworkGameManager::createEntity(int classID)
    6969{
    7070}
    … …  
    7575 * @param uniqueID: The ID of the entity object which should be removed
    7676 */
    77 void EntityManager::removeEntity(int uniqueID)
     77void NetworkGameManager::removeEntity(int uniqueID)
    7878{
    7979}
    … …  
    8585 * @param classID: The ID of the class of which an entity should be created
    8686 */
    87 void EntityManager::requestCreateEntity(int classID)
     87void NetworkGameManager::requestCreateEntity(int classID)
    8888{
    8989}
    … …  
    9393 * @param uniqueID: The ID of the entity object which should be removed
    9494 */
    95 void EntityManager::requestRemoveEntity(int uniqueID)
     95void NetworkGameManager::requestRemoveEntity(int uniqueID)
    9696{
    9797}
    … …  
    102102 * @param classID: The ID of the class of which an entity should be created
    103103 */
    104 void EntityManager::executeCreateEntity(int classID)
     104void NetworkGameManager::executeCreateEntity(int classID)
    105105{
    106106}
    … …  
    111111 * @param uniqueID: The ID of the entity object which should be removed
    112112 */
    113 void EntityManager::executeRemoveEntity(int uniqueID)
     113void NetworkGameManager::executeRemoveEntity(int uniqueID)
    114114{
    115115}
    … …  
    119119 * @return: true if the entity can be created, false otherwise
    120120 */
    121 bool EntityManager::canCreateEntity(int classID)
     121bool NetworkGameManager::canCreateEntity(int classID)
    122122{
    123123}

  • branches/network/src/lib/network/network_game_manager.h

    r6111 r6116  
    44 */
    55
    6 #ifndef _ENTITY_MANGER
    7 #define _ENTITY_MANAGER
     6#ifndef _NETWORK_GAME_MANGER
     7#define _NETWORK_GAME_MANAGER
    88
    99/* include this file, it contains some default definitions */
    … …  
    4545 * a class that can create and remove entities
    4646 */
    47 class EntityManager: public Synchronizeable
     47class NetworkGameManager: public Synchronizeable
    4848{
    4949  public:
    50     EntityManager();
    51     ~EntityManager();
     50    NetworkGameManager();
     51    ~NetworkGameManager();
    5252
    5353    virtual void writeBytes(const byte* data, int length);

  • branches/network/src/lib/sound/sound_engine.cc

    r6105 r6116  
    291291
    292292
    293   ALchar deviceName[] =
     293  ALubyte deviceName[] =
    294294
    295295#ifdef __WIN32__
Note: See TracChangeset for help on using the changeset viewer.