[Planeshift-cvs] CVS: planeshift/src/server/bulkobjects pscharacterlist.cpp,1.4,1.5 pscharacterlist.h,1.2,1.3 pscharacterloader.cpp,1.58,1.59

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

Update of /cvsroot/planeshift/planeshift/src/server/bulkobjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22719/src/server/bulkobjects

Modified Files:
	pscharacterlist.cpp pscharacterlist.h pscharacterloader.cpp 
Log Message:
Fixed the char picker window to hide all buttons until all char data is received from server

Index: pscharacterlist.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/pscharacterlist.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pscharacterlist.cpp	13 Mar 2004 08:58:06 -0000	1.4
--- pscharacterlist.cpp	17 Nov 2004 03:16:25 -0000	1.5
***************
*** 30,33 ****
--- 30,34 ----
  {
      memset(&characterentry,0,sizeof(characterentry));
+     validSize=0;
  }
  

Index: pscharacterlist.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/pscharacterlist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pscharacterlist.h	14 Feb 2004 06:57:19 -0000	1.2
--- pscharacterlist.h	17 Nov 2004 03:16:25 -0000	1.3
***************
*** 50,57 ****
  
      int GetListLength();
  
  private:
      psCharacterListEntry characterentry[MAX_CHARACTERS_IN_LIST];
! 
  };
  
--- 50,64 ----
  
      int GetListLength();
+     /** Get the number of valid characters in list.
+      */
+     int GetValidCount() { return validSize; }
+     
+     /** Set the number of valid characters in this list.
+       */
+     void SetValidCount( int size ) { validSize = size; }
  
  private:
      psCharacterListEntry characterentry[MAX_CHARACTERS_IN_LIST];
!     int validSize;
  };
  

Index: pscharacterloader.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/pscharacterloader.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** pscharacterloader.cpp	16 Nov 2004 07:35:28 -0000	1.58
--- pscharacterloader.cpp	17 Nov 2004 03:16:25 -0000	1.59
***************
*** 206,209 ****
--- 206,210 ----
          return false;
  
+     charlist->SetValidCount( result.Count() );        
      for (unsigned int i=0;i<result.Count();i++)
      {