[Planeshift-cvs] CVS: planeshift/src/npcclient npcbehave.cpp, 1.171, 1.172 npcbehave.h, 1.82, 1.83 npcclient.cpp, 1.138, 1.139

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

Update of /cvsroot/planeshift/planeshift/src/npcclient
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/src/npcclient

Modified Files:
	npcbehave.cpp npcbehave.h npcclient.cpp 
Log Message:
- Added more printout when NPC's are killed because they fall through the floor.
- Added [first] to syntax printout for '/waypoint path format [first]'
- Added psResumeScriptEvent::ToString.
- Changed name of game event for psNPCTick to actual be psNPcTick. The old
  copy past value could be a little confusing when trying to read logs.


Index: npcbehave.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/npcclient/npcbehave.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -d -r1.171 -r1.172
*** npcbehave.cpp	20 Mar 2007 20:23:05 -0000	1.171
--- npcbehave.cpp	31 Mar 2007 13:30:22 -0000	1.172
***************
*** 3384,3387 ****
--- 3384,3398 ----
  }
  
+ csString psResumeScriptEvent::ToString() const
+ {
+     csString result;
+     result.Format("Resuming script operation %s for %s",scriptOp->GetName(),npc->GetName().GetDataSafe());
+     if (npc->GetEntity())
+     {
+         result.AppendFmt("(EID: %u)",npc->GetName().GetDataSafe(),npc->GetEntity()->GetID());
+     }
+     return result;
+ }
+ 
  //---------------------------------------------------------------------------
  

Index: npcbehave.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/npcclient/npcbehave.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** npcbehave.h	9 Mar 2007 21:12:20 -0000	1.82
--- npcbehave.h	31 Mar 2007 13:30:23 -0000	1.83
***************
*** 910,913 ****
--- 910,914 ----
      psResumeScriptEvent(int offsetticks, NPC *c,EventManager *mgr,Behavior *which,ScriptOperation * script);
      virtual void Trigger();  // Abstract event processing function
+     virtual csString ToString() const;
  };
  

Index: npcclient.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/npcclient/npcclient.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** npcclient.cpp	25 Mar 2007 08:50:35 -0000	1.138
--- npcclient.cpp	31 Mar 2007 13:30:23 -0000	1.139
***************
*** 1823,1827 ****
  
  psNPCTick::psNPCTick(int offsetticks, psNPCClient *c)
! : psGameEvent(0,offsetticks,"psResumeScriptEvent")
  {
      client = c;
--- 1823,1827 ----
  
  psNPCTick::psNPCTick(int offsetticks, psNPCClient *c)
! : psGameEvent(0,offsetticks,"psNPCTick")
  {
      client = c;