[Planeshift-cvs] CVS: planeshift/src/common/admin adminmessage.cpp,1.16,1.16.2.1

[Anders R. <ma...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv3315

Modified Files:
      Tag: MB
	adminmessage.cpp 
Log Message:
Inserted the 1.16 to 1.17 diff from main branch.


Index: adminmessage.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/admin/adminmessage.cpp,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** adminmessage.cpp	4 Mar 2003 07:13:38 -0000	1.16
--- adminmessage.cpp	13 Mar 2003 21:29:09 -0000	1.16.2.1
***************
*** 219,230 ****
  
      /// Read off knowledge areas
!     start = main.FindTag("knowledgearea");
!     while ( start != -1 )
      {
!         csString *area = new csString();
!         psXMLTag tag(main, start);
!         tag.GetTagParm("name", *area);
!         knowledgeAreas.Push(area);
!         start = main.FindTag("knowledgearea", start+1);
      }
  
--- 219,241 ----
  
      /// Read off knowledge areas
!     int knowledgeAreaStart = main.FindTag( "knowledgeareas" );
!     if ( knowledgeAreaStart != -1 )
      {
!         psXMLString knowledgeAreaSection;
!         main.GetTagSection( knowledgeAreaStart, 
!                             "knowledgeareas",   
!                             knowledgeAreaSection );
! 
!         int start = knowledgeAreaSection.FindTag("knowledgearea", 10 );
!   
!         while ( start != -1 )
!         {
!             csString *area = new csString();
!             psXMLTag tag(knowledgeAreaSection, start);
!             tag.GetTagParm("name", *area);
!             knowledgeAreas.Push(area);
!             start = knowledgeAreaSection.FindTag("knowledgearea", start+1);
!         }
!         
      }