[Planeshift-cvs] CVS: planeshift/src/client/gui pawscharbirth.cpp,1.1,1.2 pawscharbirth.h,1.1,1.2 pawscharparents.cpp,1.11,1.12 pawschild.cpp,1.10,1.11 pawschild.h,1.7,1.8

[Andy D. <kha...@us...>]

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

Modified Files:
	pawscharbirth.cpp pawscharbirth.h pawscharparents.cpp 
	pawschild.cpp pawschild.h 
Log Message:
Fixed a bunch of randomize buttons on char creation.

Index: pawscharbirth.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharbirth.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pawscharbirth.cpp	21 Jun 2004 10:26:54 -0000	1.1
--- pawscharbirth.cpp	22 Jun 2004 17:52:50 -0000	1.2
***************
*** 59,63 ****
          
      // add the months to the list
!     pawsComboBox* months = (pawsComboBox*)FindWidget("month");
      if(!months)
          return false;
--- 59,63 ----
          
      // add the months to the list
!     months = (pawsComboBox*)FindWidget("month");
      if(!months)
          return false;
***************
*** 75,79 ****
  
      // add the days to the list
!     pawsComboBox* days = (pawsComboBox*)FindWidget("day");
      if(!days)
          return false;
--- 75,79 ----
  
      // add the days to the list
!     days = (pawsComboBox*)FindWidget("day");
      if(!days)
          return false;
***************
*** 122,126 ****
      }
  
-     //Randomize();
      return true;
  }
--- 122,125 ----
***************
*** 139,142 ****
--- 138,147 ----
      } 
  
+     if(name == "randomize")
+     {
+         Randomize();
+         return true;
+     }
+ 
  	int id = widget->GetID();
      switch ( id )
***************
*** 150,156 ****
      case NEXT_BUTTON:
          {
-             pawsComboBox* months = (pawsComboBox*)FindWidget("month");
-             pawsComboBox* days = (pawsComboBox*)FindWidget("day");
- 
              if(months->GetSelectedRowNum() == -1)
              {
--- 155,158 ----
***************
*** 174,180 ****
  }
  
  void pawsCharBirth::PopulateFields()
  {    
-     UpdateCP();
      sibCount = 0;
      for ( int x=0; x < createManager->childhoodData.Length(); x++ )
--- 176,201 ----
  }
  
+ void pawsCharBirth::Randomize()
+ {
+     months->Select(psengine->GetRandomGen().Get(months->GetRowCount()));
+     days->Select(psengine->GetRandomGen().Get(days->GetRowCount()));
+    
+     char widgetName[100];                
+     sprintf( widgetName, "sibling%d", psengine->GetRandomGen().Get(sibCount) );
+     pawsRadioButton* widget = (pawsRadioButton*) FindWidget(widgetName);
+     pawsRadioButtonGroup* group = (pawsRadioButtonGroup*) FindWidget("Siblings");
+     group->SetActive(widgetName);
+     
+     // Choose a random one to begin with.
+     createManager->AddChoice( widget->GetID() );
+     lastSibilingsChoice = widget->GetID();                           
+     pawsMultiLineTextBox* siblingsDesc = (pawsMultiLineTextBox*) FindWidget("sibling_desc");
+     siblingsDesc->SetText( createManager->GetDescription(widget->GetID()) );
+     
+     UpdateCP();
+ }
+ 
  void pawsCharBirth::PopulateFields()
  {    
      sibCount = 0;
      for ( int x=0; x < createManager->childhoodData.Length(); x++ )
***************
*** 192,196 ****
                  sibCount++;                                      
              }             
!     }  
  }
  
--- 213,219 ----
                  sibCount++;                                      
              }             
!     }
! 
!     Randomize();
  }
  

Index: pawscharbirth.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharbirth.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pawscharbirth.h	21 Jun 2004 10:26:54 -0000	1.1
--- pawscharbirth.h	22 Jun 2004 17:52:50 -0000	1.2
***************
*** 44,47 ****
--- 44,48 ----
      void Show();
      void Draw();
+     void Randomize();
  
      Zodiac* GetZodiac(const char* name);
***************
*** 61,64 ****
--- 62,68 ----
      pawsTextBox* cpBox;
      void UpdateCP();
+ 
+     pawsComboBox* months;
+     pawsComboBox* days;
  };
  

Index: pawscharparents.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharparents.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pawscharparents.cpp	21 Jun 2004 10:26:54 -0000	1.11
--- pawscharparents.cpp	22 Jun 2004 17:52:50 -0000	1.12
***************
*** 84,89 ****
      if ( !cpBox )
          return false;        
!         
!     Randomize();        
      return true;
  }
--- 84,88 ----
      if ( !cpBox )
          return false;        
!              
      return true;
  }
***************
*** 133,148 ****
      // Check to see if we are waiting for data from the server. Should have a waiting
      // curser if this fails.     
!     if ( dataLoaded == false )
      {
          dataLoaded = true;
- 
-         if ( createManager->HasParentData() )
-         {
-             PopulateFields();
-         }
-         else
-         {
-             dataLoaded = false;
-         }        
      }                
  }
--- 132,139 ----
      // Check to see if we are waiting for data from the server. Should have a waiting
      // curser if this fails.     
!     if ( dataLoaded == false && createManager->HasParentData())
      {
+         PopulateFields();
          dataLoaded = true;
      }                
  }
***************
*** 259,263 ****
           }                         
      }
!     
  }
  
--- 250,255 ----
           }                         
      }
!     Randomize();
!     UpdateCP();
  }
  

Index: pawschild.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawschild.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pawschild.cpp	21 Jun 2004 10:26:54 -0000	1.10
--- pawschild.cpp	22 Jun 2004 17:52:50 -0000	1.11
***************
*** 86,90 ****
  bool pawsChildhoodWindow::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget )
  {
!        
      switch ( widget->GetID() )
      {
--- 86,96 ----
  bool pawsChildhoodWindow::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget )
  {
!     
!     if(name == "randomize")
!     {
!         Randomize();
!         return true;
!     }
! 
      switch ( widget->GetID() )
      {
***************
*** 153,156 ****
--- 159,175 ----
          }   
      }  
+     Randomize();
+ }
+ 
+ void pawsChildhoodWindow::Randomize()
+ {
+     pawsListBox* birthBox = (pawsListBox*)FindWidget("bevent");
+     pawsListBox* activityBox = (pawsListBox*)FindWidget("activity");
+     pawsListBox* houseBox = (pawsListBox*)FindWidget("house");
+ 
+     birthBox->Select(birthBox->GetRow(psengine->GetRandomGen().Get(birthBox->GetRowCount())));
+     activityBox->Select(activityBox->GetRow(psengine->GetRandomGen().Get(activityBox->GetRowCount())));
+     houseBox->Select(houseBox->GetRow(psengine->GetRandomGen().Get(houseBox->GetRowCount())));
+     UpdateCP();
  }
  
***************
*** 160,171 ****
      // Check to see if we are waiting for data from the server. Should have a waiting
      // curser if this fails.     
!     if ( dataLoaded == false )
      {
-         dataLoaded = true;
- 
-         if ( createManager->HasChildhoodData() )        
              PopulateFields();
!         else
!             dataLoaded = false;                
      }
  }
--- 179,186 ----
      // Check to see if we are waiting for data from the server. Should have a waiting
      // curser if this fails.     
!     if ( dataLoaded == false && createManager->HasChildhoodData() )        
      {
              PopulateFields();
!             dataLoaded = true;                
      }
  }

Index: pawschild.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawschild.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pawschild.h	21 Jun 2004 10:26:54 -0000	1.7
--- pawschild.h	22 Jun 2004 17:52:50 -0000	1.8
***************
*** 44,47 ****
--- 44,48 ----
      bool OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget );
      virtual void Draw();
+     void Randomize();
  
  private: