[Planeshift-cvs] CVS: planeshift/src/client/gui pawscharcreatemain.cpp,1.71,1.72 pawscharcreatemain.h,1.23,1.24

[Arianna B. <ar...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28169

Modified Files:
	pawscharcreatemain.cpp pawscharcreatemain.h 
Log Message:
Fixes for 64-bit warnings 

Index: pawscharcreatemain.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharcreatemain.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** pawscharcreatemain.cpp	1 Sep 2005 13:03:29 -0000	1.71
--- pawscharcreatemain.cpp	1 Sep 2005 19:30:38 -0000	1.72
***************
*** 233,237 ****
  }
  
! void pawsCreationMain::ChangeSkinColour( size_t currentChoice )
  {    
      if ( race->location[PSTRAIT_LOCATION_SKIN_TONE][currentGender].Length() == 0 )
--- 233,237 ----
  }
  
! void pawsCreationMain::ChangeSkinColour( int currentChoice )
  {    
      if ( race->location[PSTRAIT_LOCATION_SKIN_TONE][currentGender].Length() == 0 )
***************
*** 245,249 ****
  
  
! void pawsCreationMain::ChangeHairColour( size_t currentChoice )
  {
      if ( race->location[PSTRAIT_LOCATION_HAIR_COLOR][currentGender].Length() == 0 )
--- 245,249 ----
  
  
! void pawsCreationMain::ChangeHairColour( int currentChoice )
  {
      if ( race->location[PSTRAIT_LOCATION_HAIR_COLOR][currentGender].Length() == 0 )
***************
*** 313,317 ****
  }
  
! void pawsCreationMain::ChangeHairStyle( size_t currentChoice )
  {     
      if ( race->location[PSTRAIT_LOCATION_HAIR_STYLE][currentGender].Length() == 0 )
--- 313,317 ----
  }
  
! void pawsCreationMain::ChangeHairStyle( int currentChoice )
  {     
      if ( race->location[PSTRAIT_LOCATION_HAIR_STYLE][currentGender].Length() == 0 )
***************
*** 369,373 ****
  
  
! void pawsCreationMain::ChangeBeardStyle( size_t currentChoice )
  {     
      if ( race->location[PSTRAIT_LOCATION_BEARD_STYLE][currentGender].Length() == 0 )
--- 369,373 ----
  
  
! void pawsCreationMain::ChangeBeardStyle( int currentChoice )
  {     
      if ( race->location[PSTRAIT_LOCATION_BEARD_STYLE][currentGender].Length() == 0 )
***************
*** 430,434 ****
  
  
! void pawsCreationMain::ChangeFace( size_t currentChoice )
  { 
      if ( race->location[PSTRAIT_LOCATION_FACE][currentGender].Length() == 0 )
--- 430,434 ----
  
  
! void pawsCreationMain::ChangeFace( int currentChoice )
  { 
      if ( race->location[PSTRAIT_LOCATION_FACE][currentGender].Length() == 0 )
***************
*** 556,560 ****
              if ( currentFaceChoice < 0 )
              {
!                 currentFaceChoice =  race->location[PSTRAIT_LOCATION_FACE][currentGender].Length()-1;
              }    
                                 
--- 556,560 ----
              if ( currentFaceChoice < 0 )
              {
!                 currentFaceChoice =  (int)race->location[PSTRAIT_LOCATION_FACE][currentGender].Length()-1;
              }    
                                 
***************
*** 620,624 ****
              
              if ( currentHairStyleChoice < 0 )
!                 currentHairStyleChoice = race->location[PSTRAIT_LOCATION_HAIR_STYLE][currentGender].Length()-1;
                                  
              ChangeHairStyle( currentHairStyleChoice );  
--- 620,624 ----
              
              if ( currentHairStyleChoice < 0 )
!                 currentHairStyleChoice = (int)race->location[PSTRAIT_LOCATION_HAIR_STYLE][currentGender].Length()-1;
                                  
              ChangeHairStyle( currentHairStyleChoice );  
***************
*** 663,667 ****
              
              if ( currentBeardStyleChoice < 0 )
!                 currentBeardStyleChoice = race->location[PSTRAIT_LOCATION_BEARD_STYLE][currentGender].Length()-1;
                                  
              ChangeBeardStyle( currentBeardStyleChoice );  
--- 663,667 ----
              
              if ( currentBeardStyleChoice < 0 )
!                 currentBeardStyleChoice = (int)race->location[PSTRAIT_LOCATION_BEARD_STYLE][currentGender].Length()-1;
                                  
              ChangeBeardStyle( currentBeardStyleChoice );  
***************
*** 707,711 ****
              
              if ( currentHairColour < 0 )
!                 currentHairColour = race->location[PSTRAIT_LOCATION_HAIR_COLOR][currentGender].Length()-1;
                                  
              ChangeHairColour( currentHairColour );  
--- 707,711 ----
              
              if ( currentHairColour < 0 )
!                 currentHairColour = (int)race->location[PSTRAIT_LOCATION_HAIR_COLOR][currentGender].Length()-1;
                                  
              ChangeHairColour( currentHairColour );  
***************
*** 749,753 ****
              
              if ( currentSkinColour < 0 )
!                 currentSkinColour = race->location[PSTRAIT_LOCATION_SKIN_TONE][currentGender].Length()-1;
                                  
              ChangeSkinColour( currentSkinColour );  
--- 749,753 ----
              
              if ( currentSkinColour < 0 )
!                 currentSkinColour = (int)race->location[PSTRAIT_LOCATION_SKIN_TONE][currentGender].Length()-1;
                                  
              ChangeSkinColour( currentSkinColour );  

Index: pawscharcreatemain.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharcreatemain.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** pawscharcreatemain.h	1 Sep 2005 13:03:29 -0000	1.23
--- pawscharcreatemain.h	1 Sep 2005 19:30:38 -0000	1.24
***************
*** 70,74 ****
        * @param currentFaceChoice  The number of the current choice in the available list.
        */
!     void ChangeFace( size_t currentFaceChoice );   
  
      /** Gray race buttons that are unavailable with the current gender.
--- 70,74 ----
        * @param currentFaceChoice  The number of the current choice in the available list.
        */
!     void ChangeFace( int currentFaceChoice );   
  
      /** Gray race buttons that are unavailable with the current gender.
***************
*** 88,96 ****
      
      /// The current face customization choice.
!     size_t currentFaceChoice;
  
!     void ChangeBeardStyle( size_t currentChoice );                        
      pawsTextBox* beardStyleLabel;    
!     size_t currentBeardStyleChoice;    
      int lastAddedBeardStyle;
      
--- 88,96 ----
      
      /// The current face customization choice.
!     int currentFaceChoice;
  
!     void ChangeBeardStyle( int currentChoice );                        
      pawsTextBox* beardStyleLabel;    
!     int currentBeardStyleChoice;    
      int lastAddedBeardStyle;
      
***************
*** 98,112 ****
        * @param currentChoice  The number of the current choice in the available list.
        */        
!     void ChangeHairStyle( size_t currentChoice );                        
      pawsTextBox* hairStyleLabel;    
!     size_t currentHairStyleChoice;    
      int lastAddedHairStyle;
      
!     void ChangeHairColour( size_t currentChoice );                        
!     size_t currentHairColour;
      pawsTextBox* hairColourLabel;
          
!     void ChangeSkinColour( size_t currentChoice );                        
!     size_t currentSkinColour;
      pawsTextBox* skinColourLabel;
              
--- 98,112 ----
        * @param currentChoice  The number of the current choice in the available list.
        */        
!     void ChangeHairStyle( int currentChoice );                        
      pawsTextBox* hairStyleLabel;    
!     int currentHairStyleChoice;    
      int lastAddedHairStyle;
      
!     void ChangeHairColour( int currentChoice );                        
!     int currentHairColour;
      pawsTextBox* hairColourLabel;
          
!     void ChangeSkinColour( int currentChoice );                        
!     int currentSkinColour;
      pawsTextBox* skinColourLabel;