Changeset 2669 for code/trunk

Timestamp:

Feb 15, 2009, 5:38:12 PM (16 years ago)

Author:

scheusso

Message:

minor change in classID

Location:

code/trunk/src/network/packet

Files:

• ClassID.cc (modified) (3 diffs)
• ClassID.h (modified) (2 diffs)

code/trunk/src/network/packet/ClassID.cc

@@ -37 +37 @@
 namespace packet {
 
-#define PACKET_FLAGS_CLASSID  ENET_PACKET_FLAG_RELIABLE
-#define _PACKETID             0
-#define _CLASSID              _PACKETID + sizeof(ENUM::Type)
-#define _CLASSNAMELENGTH      _CLASSID + sizeof(uint32_t)
-#define _CLASSNAME            _CLASSNAMELENGTH + sizeof(classNameLength_)
+
 
   ClassID::ClassID( unsigned int classID, std::string className )
@@ -72 +68 @@
 
 bool ClassID::process(){
-  COUT(3) << "processing classid: " << getClassID() << " name: " << (const char*)(data_+_CLASSNAME) << std::endl;
-  Identifier *id=ClassByID( std::string((const char*)(data_+_CLASSNAME) ));
+  COUT(3) << "processing classid: " << getClassID() << " name: " << getClassName() << std::endl;
+  Identifier *id=ClassByString( std::string(getClassName()) );
   if(id==NULL)
     return false;
@@ -81 +77 @@
 }
 
+
 unsigned int ClassID::getClassID(){
   return *(uint32_t *)(data_ + _CLASSID);

code/trunk/src/network/packet/ClassID.h

@@ -38 +38 @@
 namespace packet {
 
+#define PACKET_FLAGS_CLASSID  ENET_PACKET_FLAG_RELIABLE
+#define _PACKETID             0
+#define _CLASSID              _PACKETID + sizeof(ENUM::Type)
+#define _CLASSNAMELENGTH      _CLASSID + sizeof(uint32_t)
+#define _CLASSNAME            _CLASSNAMELENGTH + sizeof(classNameLength_)
+  
 /**
         @author
@@ -53 +59 @@
   unsigned int getClassID();
   unsigned int getClassNameLength(){ return classNameLength_; }
-  unsigned char *getClassName();
+  const char *getClassName(){ return (const char*)(data_+_CLASSNAME); }
 private:
   uint32_t classNameLength_;