[Planeshift-cvs] CVS: planeshift/src/client/gui pawscharparents.cpp,1.1,1.2 pawscharparents.h,1.1,1.2 pawschild.cpp,1.2,1.3 pawschild.h,1.1,1.2 pawslife.cpp,1.2,1.3

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

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv7927/src/client/gui

Modified Files:
	pawscharparents.cpp pawscharparents.h pawschild.cpp 
	pawschild.h pawslife.cpp 
Log Message:
Character creation choices are now sent to the server and the server runs the right scripts for them. 

Index: pawscharparents.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharparents.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pawscharparents.cpp	7 Nov 2003 06:44:40 -0000	1.1
--- pawscharparents.cpp	21 Nov 2003 00:33:33 -0000	1.2
***************
*** 42,45 ****
--- 42,48 ----
      
      dataLoaded = false;
+     
+     lastFatherChoice = -1;
+     lastReligionChoice = -1;
  }
  
***************
*** 81,84 ****
--- 84,92 ----
              pawsListBoxRow* row = widget->GetSelectedRow();            
              fatherJobDesc->SetText( createManager->GetDescription(row->GetID()) );
+             
+             createManager->RemoveChoice( lastFatherChoice );
+             createManager->AddChoice( row->GetID() );
+             lastFatherChoice = row->GetID();
+             
              return;
          }
***************
*** 88,91 ****
--- 96,104 ----
              pawsListBoxRow* row = widget->GetSelectedRow();            
              religionDesc->SetText( createManager->GetDescription(row->GetID()) );
+             
+             createManager->RemoveChoice( lastReligionChoice );
+             createManager->AddChoice( row->GetID() );
+             lastReligionChoice = row->GetID();
+ 
              return;
          }
***************
*** 127,130 ****
--- 140,145 ----
          case NEXT_BUTTON:
          {
+             
+         
              Hide();
              createManager->GetChildhoodData();

Index: pawscharparents.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharparents.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pawscharparents.h	7 Nov 2003 06:44:40 -0000	1.1
--- pawscharparents.h	21 Nov 2003 00:33:33 -0000	1.2
***************
*** 66,71 ****
        */
      void PopulateFields();
-      
      
  };
  
--- 66,72 ----
        */
      void PopulateFields();
      
+     int lastFatherChoice;
+     int lastReligionChoice;           
  };
  

Index: pawschild.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawschild.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pawschild.cpp	11 Nov 2003 21:55:27 -0000	1.2
--- pawschild.cpp	21 Nov 2003 00:33:33 -0000	1.3
***************
*** 45,48 ****
--- 45,53 ----
     
      dataLoaded = false;
+     
+     lastSibilingsChoice = 0;
+     lastEventChoice     = 0;
+     lastActivityChoice  = 0;
+     lastHouseChoice     = 0;
  }
  
***************
*** 180,183 ****
--- 185,193 ----
          case EVENT_LISTBOX:
          {
+              
+             createManager->RemoveChoice( lastEventChoice );
+             createManager->AddChoice( row->GetID() );
+             lastEventChoice = row->GetID();
+             
              eventDesc->SetText( createManager->GetDescription(row->GetID()) );
              return;        
***************
*** 185,188 ****
--- 195,203 ----
          case ACTIVITY_LISTBOX:
          {
+  
+             createManager->RemoveChoice( lastActivityChoice );
+             createManager->AddChoice( row->GetID() );
+             lastActivityChoice = row->GetID();        
+             
              activityDesc->SetText( createManager->GetDescription(row->GetID()) );
              return;        
***************
*** 190,194 ****
  
          case HOUSE_LISTBOX:
!         {            
              houseDesc->SetText( createManager->GetDescription(row->GetID()) );
              return;
--- 205,214 ----
  
          case HOUSE_LISTBOX:
!         {   
!  
!             createManager->RemoveChoice( lastHouseChoice );
!             createManager->AddChoice( row->GetID() );
!             lastHouseChoice = row->GetID();                 
!             
              houseDesc->SetText( createManager->GetDescription(row->GetID()) );
              return;
***************
*** 197,200 ****
--- 217,225 ----
          case SIBLINGS_LISTBOX:
          {            
+  
+             createManager->RemoveChoice( lastSibilingsChoice );
+             createManager->AddChoice( row->GetID() );
+             lastSibilingsChoice = row->GetID();
+                     
              siblingsDesc->SetText( createManager->GetDescription(row->GetID()) );
              return;

Index: pawschild.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawschild.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pawschild.h	7 Nov 2003 06:44:40 -0000	1.1
--- pawschild.h	21 Nov 2003 00:33:33 -0000	1.2
***************
*** 58,61 ****
--- 58,66 ----
      
      bool dataLoaded;
+     
+     int lastSibilingsChoice;
+     int lastEventChoice;
+     int lastActivityChoice;
+     int lastHouseChoice;    
  };
  

Index: pawslife.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawslife.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pawslife.cpp	11 Nov 2003 21:55:27 -0000	1.2
--- pawslife.cpp	21 Nov 2003 00:33:33 -0000	1.3
***************
*** 83,86 ****
--- 83,87 ----
                      text->SetText( createManager->lifeEventData[addindex].name );
                      row->SetID( createManager->lifeEventData[addindex].id );                
+                     createManager->AddLifeEvent( row->GetID() );
                  }                                    
                  
***************
*** 94,98 ****
              pawsListBoxRow* moved = choiceSelection->GetMoved();    
              int id = moved->GetID();
!             
              int index = createManager->FindLifeEvent( id );
              
--- 95,99 ----
              pawsListBoxRow* moved = choiceSelection->GetMoved();    
              int id = moved->GetID();
!             createManager->RemoveLifeEvent( id );
              int index = createManager->FindLifeEvent( id );
              
***************
*** 102,105 ****
--- 103,107 ----
                  choiceSelection->RemoveFromAvailable( createManager->lifeEventData[index].adds[ridx] );
                  choiceSelection->RemoveFromSelected( createManager->lifeEventData[index].adds[ridx] );
+                 createManager->RemoveLifeEvent( createManager->lifeEventData[index].adds[ridx] );
              }