Changeset 2737

Timestamp:

Mar 4, 2009, 12:37:49 PM (16 years ago)

Author:

scheusso

Message:

removed some inconsistencies (data types)

Location:

code/branches/network/src/network/packet

Files:

• ClassID.cc (modified) (4 diffs)
• ClassID.h (modified) (1 diff)

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

@@ -39 +39 @@
 
 
-  ClassID::ClassID( unsigned int classID, std::string className )
+  ClassID::ClassID( uint32_t classID, std::string className )
  : Packet()
 {
@@ -48 +48 @@
   assert(data_);
   *(ENUM::Type *)(data_ + _PACKETID ) = ENUM::ClassID;
-  *(unsigned int *)(data_ + _CLASSID ) = classID;
-  *(unsigned int *)(data_ + _CLASSNAMELENGTH ) = classNameLength_;
+  *(uint32_t *)(data_ + _CLASSID ) = classID;
+  *(uint32_t *)(data_ + _CLASSNAMELENGTH ) = classNameLength_;
   memcpy( data_+_CLASSNAME, (void *)className.c_str(), classNameLength_ );
 }
@@ -63 +63 @@
 }
 
-unsigned int ClassID::getSize() const{
-  return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t) + classNameLength_;
-}
 
 bool ClassID::process(){
   COUT(3) << "processing classid: " << getClassID() << " name: " << getClassName() << std::endl;
   Identifier *id=ClassByString( std::string(getClassName()) );
-  if(id==NULL)
-    return false;
+  if(id==NULL){
+    COUT(0) << "Recieved a bad classname" << endl;
+    abort();
+  }
   id->setNetworkID( getClassID() );
   delete this;
@@ -78 +77 @@
 
 
-unsigned int ClassID::getClassID(){
+uint32_t ClassID::getClassID(){
   return *(uint32_t *)(data_ + _CLASSID);
 }

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

@@ -50 +50 @@
 {
 public:
-  ClassID( unsigned int classID, std::string className );
+  ClassID( uint32_t classID, std::string className );
   ClassID( uint8_t* data, unsigned int clientID );
   ~ClassID();
 
-  inline unsigned int getSize() const;
+  inline uint32_t getSize() const{ return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t) + classNameLength_; }
   bool process();
 
-  unsigned int getClassID();
-  unsigned int getClassNameLength(){ return classNameLength_; }
+  uint32_t getClassID();
+  uint32_t getClassNameLength(){ return classNameLength_; }
   const char *getClassName(){ return (const char*)(data_+_CLASSNAME); }
 private: