[Planeshift-cvs] CVS: planeshift/src/server progressionmanager.cpp,1.187,1.188 psserverdr.cpp,1.107,1.108

[DaveG <da...@us...>]

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

Modified Files:
	progressionmanager.cpp psserverdr.cpp 
Log Message:
psString::ReplaceAllSubString now has wholeWord as false by default, and returns the number of replaces.

Index: progressionmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/progressionmanager.cpp,v
retrieving revision 1.187
retrieving revision 1.188
diff -C2 -d -r1.187 -r1.188
*** progressionmanager.cpp	5 Dec 2005 14:20:12 -0000	1.187
--- progressionmanager.cpp	8 Dec 2005 22:37:59 -0000	1.188
***************
*** 2721,2725 ****
      buff.Format("$%d", param );
       
!     scriptString.ReplaceAllSubString( buff, text,false );
      script.Replace( scriptString.GetData() );
  }
--- 2721,2725 ----
      buff.Format("$%d", param );
       
!     scriptString.ReplaceAllSubString( buff, text );
      script.Replace( scriptString.GetData() );
  }

Index: psserverdr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverdr.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** psserverdr.cpp	1 Dec 2005 22:09:34 -0000	1.107
--- psserverdr.cpp	8 Dec 2005 22:37:59 -0000	1.108
***************
*** 224,228 ****
          psString out;
          actor->GetProxList()->DebugDumpContents(out);
!         out.ReplaceAllSubString("\n", " ",false);
  
          status.Append(out);
--- 224,228 ----
          psString out;
          actor->GetProxList()->DebugDumpContents(out);
!         out.ReplaceAllSubString("\n", " ");
  
          status.Append(out);