[Planeshift-cvs] CVS: planeshift/src/client/gui pawsgmgui.cpp,1.58,1.59

[Arianna B. <ar...@us...>]

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

Modified Files:
	pawsgmgui.cpp 
Log Message:
Fixed bug #1208

Index: pawsgmgui.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsgmgui.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** pawsgmgui.cpp	16 Oct 2005 20:24:43 -0000	1.58
--- pawsgmgui.cpp	27 Oct 2005 11:58:21 -0000	1.59
***************
*** 270,274 ****
              last = NormalizeCharacterName(last);
  
!             cmd.Format("/changename %s to %s %s",GetSelectedName(),first.GetData(),last.GetData());
              updateAfter = true;
              
--- 270,274 ----
              last = NormalizeCharacterName(last);
  
!             cmd.Format("/changename %s no %s %s",GetSelectedName(),first.GetData(),last.GetData());
              updateAfter = true;
              
***************
*** 381,384 ****
--- 381,385 ----
  			}
  			csRef<iDocumentNode> root    = doc->GetRoot();
+ 			if(!root)
  			{
  				Error1("No XML root in Edit Location");
***************
*** 386,389 ****
--- 387,391 ----
  			}
  			csRef<iDocumentNode> topNode = root->GetNode( "locations" );
+ 			if(!topNode)
  			{
  				Error1("No <locations> tag in Edit Location");
***************
*** 726,729 ****
--- 728,732 ----
  	}
  	csRef<iDocumentNode> topNode = root->GetNode( "locations" );
+ 	if(!topNode)
  	{
  		Error1("No <locations> tag in Action List");
***************
*** 902,910 ****
      {
          csString text(value);
!         size_t place = text.FindFirst(' ');
  
          csString firstName,lastName;
          
!         if (place == csArrayItemNotFound)
          {        
              firstName = text;
--- 905,913 ----
      {
          csString text(value);
!         int place = (int)text.FindFirst(' ');
  
          csString firstName,lastName;
          
!         if (place == -1)
          {        
              firstName = text;
***************
*** 917,921 ****
  
          csString cmd;
!         cmd.Format("/changename %s to %s %s", GetSelectedName(), firstName.GetData(), lastName.GetData());
          psengine->GetCmdHandler()->Execute(cmd);
          //Need to update our list
--- 920,924 ----
  
          csString cmd;
!         cmd.Format("/changename %s no %s %s", GetSelectedName(), firstName.GetData(), lastName.GetData());
          psengine->GetCmdHandler()->Execute(cmd);
          //Need to update our list