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

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

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

Modified Files:
	psnpcdialog.h psnpcdialog.cpp 
Log Message:
Fixed npc dialog showing up in reverse order.

Index: psnpcdialog.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psnpcdialog.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** psnpcdialog.h	13 Oct 2004 07:26:43 -0000	1.10
--- psnpcdialog.h	22 Oct 2004 05:54:59 -0000	1.11
***************
*** 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);
--- 93,97 ----
      bool LoadKnowledgeAreas(int NPCID);
  
!     NPCDialogResponse *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.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** psnpcdialog.cpp	13 Oct 2004 07:26:43 -0000	1.22
--- psnpcdialog.cpp	22 Oct 2004 05:54:59 -0000	1.23
***************
*** 388,395 ****
  }
  
! bool psNPCDialog::Respond(const char *text,Client *client,bool use_exact)
  {
      csString trigger;
!     NPCDialogResponse *resp;
  
      currentplayer = client->GetActor();
--- 388,395 ----
  }
  
! NPCDialogResponse *psNPCDialog::Respond(const char *text,Client *client,bool use_exact)
  {
      csString trigger;
!     NPCDialogResponse *resp=NULL;
  
      currentplayer = client->GetActor();
***************
*** 433,442 ****
      //    SubstituteKeywords();
  
!     if (resp)
!     {
!         resp->ExecuteScript(client);
!         return true;
!     }
!     return false;
  }
  
--- 433,437 ----
      //    SubstituteKeywords();
  
!     return resp;
  }