[Planeshift-cvs] CVS: planeshift/src/server/bulkobjects psnpcdialog.h,1.9,1.10 psnpcdialog.cpp,1.21,1.22

[Keith F. <ven...@us...>]

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

Modified Files:
	psnpcdialog.h psnpcdialog.cpp 
Log Message:
Made Respond return whether a response actually happened or not.

Index: psnpcdialog.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psnpcdialog.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** psnpcdialog.h	22 Jul 2004 20:31:35 -0000	1.9
--- psnpcdialog.h	13 Oct 2004 07:26:43 -0000	1.10
***************
*** 93,97 ****
      bool LoadKnowledgeAreas(int NPCID);
  
!     void Respond(const char *text,Client *client,bool use_exact);
      bool AddWord(const char *word);
      bool AddSynonym(const char *word,const char *synonym);
--- 93,97 ----
      bool LoadKnowledgeAreas(int NPCID);
  
!     bool Respond(const char *text,Client *client,bool use_exact);
      bool AddWord(const char *word);
      bool AddSynonym(const char *word,const char *synonym);

Index: psnpcdialog.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psnpcdialog.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** psnpcdialog.cpp	9 Sep 2004 23:00:47 -0000	1.21
--- psnpcdialog.cpp	13 Oct 2004 07:26:43 -0000	1.22
***************
*** 388,392 ****
  }
  
! void psNPCDialog::Respond(const char *text,Client *client,bool use_exact)
  {
      csString trigger;
--- 388,392 ----
  }
  
! bool psNPCDialog::Respond(const char *text,Client *client,bool use_exact)
  {
      csString trigger;
***************
*** 433,437 ****
      //    SubstituteKeywords();
  
!     if (resp) resp->ExecuteScript(client);
  }
  
--- 433,442 ----
      //    SubstituteKeywords();
  
!     if (resp)
!     {
!         resp->ExecuteScript(client);
!         return true;
!     }
!     return false;
  }