[Planeshift-cvs] CVS: planeshift/src/server gem.cpp,1.471,1.472

[Luca P. <lpa...@us...>]

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

Modified Files:
	gem.cpp 
Log Message:
fixed delayed messages. they were meant to be delayed for subsequent messages, so now I've shortened only the first message to 2 seconds.

Index: gem.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/gem.cpp,v
retrieving revision 1.471
retrieving revision 1.472
diff -C2 -d -r1.471 -r1.472
*** gem.cpp	20 Aug 2007 17:56:34 -0000	1.471
--- gem.cpp	25 Aug 2007 13:02:01 -0000	1.472
***************
*** 3080,3087 ****
          chtype = CHAT_NPC_NARRATE;
  
!     // delay NPC answer by 2 seconds to better simulate
!     // NPC thinking before answering. This has nothing to do with amount of text
!     // spoken.
!     timeDelay += (csTicks)(2000);
      psChatMessage msg(destClientID,GetName(),actText,chtype,false);
      
--- 3080,3089 ----
          chtype = CHAT_NPC_NARRATE;
  
!     // first response gets 2 seconds delay to simulate NPC thinking
!     // subsequent ones add to the current time delay, and send delayed
!     if (timeDelay==0)
!         timeDelay = (csTicks)(2000);
!     else 
!         timeDelay += (csTicks)(1000 + 30*strlen(actText));
      psChatMessage msg(destClientID,GetName(),actText,chtype,false);
      
***************
*** 3617,3622 ****
              psChatMessage newMsg(who->GetClientNum(), GetName(), strsay, CHAT_NPC, false);
  
!             // Add to the current time delay, and send delayed
!             timeDelay += (csTicks)(1000 + 30*strlen(strsay));
              psserver->GetEventManager()->SendMessageDelayed(newMsg.msg,timeDelay);
          }
--- 3619,3628 ----
              psChatMessage newMsg(who->GetClientNum(), GetName(), strsay, CHAT_NPC, false);
  
!             // first response gets 2 seconds delay to simulate NPC thinking
!             // subsequent ones add to the current time delay, and send delayed
!             if (timeDelay==0)
!                 timeDelay = (csTicks)(2000);
!             else 
!                 timeDelay += (csTicks)(1000 + 30*strlen(strsay));
              psserver->GetEventManager()->SendMessageDelayed(newMsg.msg,timeDelay);
          }