[Planeshift-cvs] CVS: planeshift/src/server/bulkobjects psnpcdialog.cpp,1.54,1.55

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

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

Modified Files:
	psnpcdialog.cpp 
Log Message:
Reverse some 64-bit fix and more fixes.

Index: psnpcdialog.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psnpcdialog.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** psnpcdialog.cpp	1 Sep 2005 16:17:16 -0000	1.54
--- psnpcdialog.cpp	1 Sep 2005 20:07:30 -0000	1.55
***************
*** 264,268 ****
          if (!wordInName.Length())
              break;
!         size_t pos = str.FindSubString(wordInName,0,XML_CASE_INSENSITIVE);
          if (pos != -1)
          {
--- 264,268 ----
          if (!wordInName.Length())
              break;
!         int pos = (int)str.FindSubString(wordInName,0,XML_CASE_INSENSITIVE);
          if (pos != -1)
          {
***************
*** 364,368 ****
  {
      psString dollarsign("$"),response(resp);
!     size_t where = response.FindSubString(dollarsign);
  
      while (where!=-1)
--- 364,368 ----
  {
      psString dollarsign("$"),response(resp);
!     int where = response.FindSubString(dollarsign);
  
      while (where!=-1)