[Planeshift-cvs] CVS: planeshift/src/client/gui pawscharcreatemain.cpp,1.61,1.62

[Borrillis <bor...@us...>]

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

Modified Files:
	pawscharcreatemain.cpp 
Log Message:
Fix bug in character creation, error if no race selected and you clicked 'paths'

Index: pawscharcreatemain.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharcreatemain.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** pawscharcreatemain.cpp	9 May 2005 23:25:22 -0000	1.61
--- pawscharcreatemain.cpp	19 May 2005 13:36:02 -0000	1.62
***************
*** 925,935 ****
                  name->SetText(firstname);
  
-             // Set our choices in the creation manager
-             createManager->SetCustomization( race->location[PSTRAIT_LOCATION_FACE][currentGender].Length()?race->location[PSTRAIT_LOCATION_FACE][currentGender][currentFaceChoice]->uid:0,
-                                              race->location[PSTRAIT_LOCATION_HAIR_STYLE][currentGender].Length()?race->location[PSTRAIT_LOCATION_HAIR_STYLE][currentGender][currentHairStyleChoice]->uid:0,
-                                              race->location[PSTRAIT_LOCATION_BEARD_STYLE][currentGender].Length()?race->location[PSTRAIT_LOCATION_BEARD_STYLE][currentGender][currentBeardStyleChoice]->uid:0,
-                                              race->location[PSTRAIT_LOCATION_HAIR_COLOR][currentGender].Length()?race->location[PSTRAIT_LOCATION_HAIR_COLOR][currentGender][currentHairColour]->uid:0, 
-                                              race->location[PSTRAIT_LOCATION_SKIN_TONE][currentGender].Length()?race->location[PSTRAIT_LOCATION_SKIN_TONE][currentGender][currentSkinColour]->uid:0 );
-             
              // Check to see a race was selected.
              if ( createManager->GetSelectedRace() == -1 )
--- 925,928 ----
***************
*** 946,949 ****
--- 939,950 ----
                  return true;                          
              }
+ 
+             // Set our choices in the creation manager
+             createManager->SetCustomization( race->location[PSTRAIT_LOCATION_FACE][currentGender].Length()?race->location[PSTRAIT_LOCATION_FACE][currentGender][currentFaceChoice]->uid:0,
+                                              race->location[PSTRAIT_LOCATION_HAIR_STYLE][currentGender].Length()?race->location[PSTRAIT_LOCATION_HAIR_STYLE][currentGender][currentHairStyleChoice]->uid:0,
+                                              race->location[PSTRAIT_LOCATION_BEARD_STYLE][currentGender].Length()?race->location[PSTRAIT_LOCATION_BEARD_STYLE][currentGender][currentBeardStyleChoice]->uid:0,
+                                              race->location[PSTRAIT_LOCATION_HAIR_COLOR][currentGender].Length()?race->location[PSTRAIT_LOCATION_HAIR_COLOR][currentGender][currentHairColour]->uid:0, 
+                                              race->location[PSTRAIT_LOCATION_SKIN_TONE][currentGender].Length()?race->location[PSTRAIT_LOCATION_SKIN_TONE][currentGender][currentSkinColour]->uid:0 );
+             
              
              if ( widget->GetID() == NEXT_BUTTON )