[Planeshift-cvs] CVS: planeshift/src/server/bulkobjects dictionary.cpp,1.42,1.43 dictionary.h,1.22,1.23

[Andy D. <kha...@us...>]

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

Modified Files:
	dictionary.cpp dictionary.h 
Log Message:
Fixed invoking wrong script if target was changed during an NPC exchange.

Index: dictionary.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/dictionary.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** dictionary.cpp	3 Jan 2005 07:56:34 -0000	1.42
--- dictionary.cpp	3 Jan 2005 23:06:56 -0000	1.43
***************
*** 631,640 ****
  }
  
! void NPCDialogResponse::ExecuteScript(Client *client)
  {
      active_quest = -1;  // not used by default
      for (size_t i=0; i<script.Length(); i++)
      {
!         if (!script[i]->Run((gemNPC *)client->GetTargetObject(),client,this))
          {
              Error3("Error running script in %s operation for client %s.",script[i]->GetName(),client->GetName() );
--- 631,640 ----
  }
  
! void NPCDialogResponse::ExecuteScript(Client *client, gemNPC* target)
  {
      active_quest = -1;  // not used by default
      for (size_t i=0; i<script.Length(); i++)
      {
!         if (!script[i]->Run(target,client,this))
          {
              Error3("Error running script in %s operation for client %s.",script[i]->GetName(),client->GetName() );

Index: dictionary.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/dictionary.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** dictionary.h	2 Jan 2005 00:30:38 -0000	1.22
--- dictionary.h	3 Jan 2005 23:06:56 -0000	1.23
***************
*** 202,206 ****
      const char *GetResponse();
  
!     void ExecuteScript(Client *client);
      void SetActiveQuest(int max);
      int  GetActiveQuest() { return active_quest; }
--- 202,206 ----
      const char *GetResponse();
  
!     void ExecuteScript(Client *client, gemNPC* target);
      void SetActiveQuest(int max);
      int  GetActiveQuest() { return active_quest; }