Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 12, 2008, 7:40:47 PM (16 years ago)
Author:
scheusso
Message:

merged network branch back to trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/network/packet/Packet.h

    r1763 r1907  
    3232#include <enet/enet.h>
    3333
     34#include "util/Integers.h"
     35
    3436namespace network {
    3537
     
    4749    ClassID,
    4850    Chat,
    49     Welcome
     51    Welcome,
     52    DeleteObjects
    5053  };
    5154}
     
    7477  protected:
    7578    Packet();
    76     Packet(unsigned char *data, int clientID);
     79    Packet(uint8_t *data, unsigned int clientID);
    7780//    Packet(ENetPacket *packet, ENetPeer *peer);
    7881    enet_uint32 flags_;
    79     int clientID_;
     82    unsigned int clientID_;
    8083    ENUM::Direction packetDirection_;
    81     unsigned char *data_;
     84    uint8_t *data_;
    8285  private:
    8386    static std::map<ENetPacket *, Packet *> packetMap_;
Note: See TracChangeset for help on using the changeset viewer.