[Planeshift-cvs] CVS: planeshift/src/common/net charmessages.cpp,1.24,1.25 charmessages.h,1.26,1.27

[Andrew C. <ac...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28904/src/common/net

Modified Files:
	charmessages.cpp charmessages.h 
Log Message:
Updates to traits system, zooms in on face in the char creation screen. 

Index: charmessages.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/charmessages.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** charmessages.cpp	11 Apr 2005 13:09:51 -0000	1.24
--- charmessages.cpp	9 May 2005 23:25:25 -0000	1.25
***************
*** 152,156 ****
  psCharUploadMessage::psCharUploadMessage(bool verify,  const char* name, const char* lastname, int race, int gender, 
                           csArray<uint32_t> choices, int motherMod, int fatherMod, csArray<uint32_t> lifeEvents,
!                          int selectedEyes, int selectedHairStyle, int selectedBeardStyle, 
                           int selectedHairColour, int selectedSkinColour, const char* bio )
  {
--- 152,156 ----
  psCharUploadMessage::psCharUploadMessage(bool verify,  const char* name, const char* lastname, int race, int gender, 
                           csArray<uint32_t> choices, int motherMod, int fatherMod, csArray<uint32_t> lifeEvents,
!                          int selectedFace, int selectedHairStyle, int selectedBeardStyle, 
                           int selectedHairColour, int selectedSkinColour, const char* bio )
  {
***************
*** 171,175 ****
      msg->Add( (int32_t)gender );
      
!     msg->Add( (int32_t)selectedEyes );
      msg->Add( (int32_t)selectedHairStyle );
      msg->Add( (int32_t)selectedBeardStyle );
--- 171,175 ----
      msg->Add( (int32_t)gender );
      
!     msg->Add( (int32_t)selectedFace );
      msg->Add( (int32_t)selectedHairStyle );
      msg->Add( (int32_t)selectedBeardStyle );
***************
*** 273,277 ****
      gender = me->GetUInt32();
      
!     selectedEyes = me->GetUInt32();
      selectedHairStyle = me->GetUInt32();
      selectedBeardStyle = me->GetUInt32();
--- 273,277 ----
      gender = me->GetUInt32();
      
!     selectedFace = me->GetUInt32();
      selectedHairStyle = me->GetUInt32();
      selectedBeardStyle = me->GetUInt32();

Index: charmessages.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/charmessages.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** charmessages.h	31 Mar 2005 21:07:03 -0000	1.26
--- charmessages.h	9 May 2005 23:25:26 -0000	1.27
***************
*** 50,54 ****
  enum PSTRAIT_LOCATION {
      PSTRAIT_LOCATION_NONE = 0,
!     PSTRAIT_LOCATION_EYE_COLOR,
      PSTRAIT_LOCATION_HAIR_STYLE,
      PSTRAIT_LOCATION_BEARD_STYLE,
--- 50,54 ----
  enum PSTRAIT_LOCATION {
      PSTRAIT_LOCATION_NONE = 0,
!     PSTRAIT_LOCATION_FACE,
      PSTRAIT_LOCATION_HAIR_STYLE,
      PSTRAIT_LOCATION_BEARD_STYLE,
***************
*** 158,162 ****
      psCharUploadMessage( bool verify, const char* name, const char* lastname, int race, int gender, 
                           csArray<uint32_t> choices, int motherMod, int fatherMod, csArray<uint32_t> lifeEvents,
!                          int selectedEyes, int selectedHairStyle, int selectedBeardStyle, 
                           int selectedHairColour, int selectedSkinColour, const char* bio );
                           
--- 158,162 ----
      psCharUploadMessage( bool verify, const char* name, const char* lastname, int race, int gender, 
                           csArray<uint32_t> choices, int motherMod, int fatherMod, csArray<uint32_t> lifeEvents,
!                          int selectedFace, int selectedHairStyle, int selectedBeardStyle, 
                           int selectedHairColour, int selectedSkinColour, const char* bio );
                           
***************
*** 174,178 ****
      csArray<uint32_t> lifeEvents;
      
!     int selectedEyes;
      int selectedHairStyle;
      int selectedBeardStyle;
--- 174,178 ----
      csArray<uint32_t> lifeEvents;
      
!     int selectedFace;
      int selectedHairStyle;
      int selectedBeardStyle;