[Planeshift-cvs] CVS: planeshift/src/common/psprop/npc psnpcdialog.cpp,1.16,1.17 dictionary.cpp,1.5,1.6

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

Update of /cvsroot/planeshift/planeshift/src/common/psprop/npc
In directory sc8-pr-cvs1:/tmp/cvs-serv11293

Modified Files:
	psnpcdialog.cpp dictionary.cpp 
Log Message:
dictionary now searches for the trigger using the prior response, and if not
found, uses the trigger by itself, and if that is not found, looks for trigger +
"error", and if that is not found then returns a standard error.

Index: psnpcdialog.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/psprop/npc/psnpcdialog.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** psnpcdialog.cpp	20 Jan 2003 21:12:14 -0000	1.16
--- psnpcdialog.cpp	20 Jan 2003 23:46:28 -0000	1.17
***************
*** 384,388 ****
      }
  
- 
      SubstituteKeywords();
  
--- 384,387 ----

Index: dictionary.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/psprop/npc/dictionary.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dictionary.cpp	12 Dec 2002 05:24:45 -0000	1.5
--- dictionary.cpp	20 Jan 2003 23:46:28 -0000	1.6
***************
*** 228,233 ****
      if (!trig) // if still not found
      {
!         key.area = "general";
!         key.trigger.Append("|error");
  
          trig = triggers.Find(&key);
--- 228,232 ----
      if (!trig) // if still not found
      {
!         key.trigger.Append(" error");
  
          trig = triggers.Find(&key);