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

[Daniel F. <df...@us...>]

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

Modified Files:
	psnpcdialog.cpp 
Log Message:
NPC dialog (proximity) fixes

Index: psnpcdialog.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psnpcdialog.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** psnpcdialog.cpp	26 Mar 2006 22:13:26 -0000	1.74
--- psnpcdialog.cpp	10 Apr 2006 04:26:09 -0000	1.75
***************
*** 325,329 ****
      NpcResponse *resp = NULL;
      csString trigger_error;
! 
      trigger.Downcase();
  
--- 325,331 ----
      NpcResponse *resp = NULL;
      csString trigger_error;
! 	
!     if(trigger.GetData() == NULL) return NULL;
! 	
      trigger.Downcase();
  
***************
*** 605,608 ****
--- 607,611 ----
  NpcResponse *psNPCDialog::FindXMLResponse(Client *client, csString trigger)
  {
+     if(!client) return NULL;
      currentplayer = client->GetActor();
      currentClient = client;