[Planeshift-cvs] CVS: planeshift/src/client/gui pawsexchangewindow.cpp,1.44,1.45

[Anders R. <ma...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10622/src/client/gui

Modified Files:
	pawsexchangewindow.cpp 
Log Message:
- Moved checks for prerequisites from quest to response. This to allow to append
  more prerequisites while parsing a quest_script to individual responses. The
  prerequisite on the response is initialized with the prerequisite from the quest.
- Moved searching for "trigger error" out of FindResponse in dictionary. Now all
  the trying and failing is done in NpcDict.
- Changed Quest Script parsing to use psQuestPrereqOp operations instead
  of ResponseOperation operations. This will do so that find response
  catch that a respone isn't available much earlier in the process.
- Removed use of unneeded temp string in NPCDialogDict::FindTerm.
- Rewrote FindOrGeneralizeTrigger to only call FindResponse once per generalization.
- Fixed so that when you receive some money from a respone money operation,
  the user friendly string is printed.


Index: pawsexchangewindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsexchangewindow.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** pawsexchangewindow.cpp	5 Dec 2005 21:25:32 -0000	1.44
--- pawsexchangewindow.cpp	7 Dec 2005 21:23:41 -0000	1.45
***************
*** 214,224 ****
              if ( widget )
                  widget->Close();
! 			totalTriasOffered->SetText("");
! 			totalTriasReceived->SetText("");
! 			int i;
              for (i = 0; i < EXCHANGE_SLOT_COUNT; i++)
              {                   
                  offeringSlots[i]->Clear();
! 				receivingSlots[i]->Clear();
              }
              break;
--- 214,224 ----
              if ( widget )
                  widget->Close();
!             totalTriasOffered->SetText("");
!             totalTriasReceived->SetText("");
!             int i;
              for (i = 0; i < EXCHANGE_SLOT_COUNT; i++)
              {                   
                  offeringSlots[i]->Clear();
!                 receivingSlots[i]->Clear();
              }
              break;