[Planeshift-cvs] CVS: planeshift/src/client modehandler.cpp,1.59,1.60

[Ondrej H. <tan...@us...>]

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

Modified Files:
	modehandler.cpp 
Log Message:
Modified ModeHandler to match new psNewSector message


Index: modehandler.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/modehandler.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** modehandler.cpp	28 Apr 2004 23:31:14 -0000	1.59
--- modehandler.cpp	4 May 2004 12:54:09 -0000	1.60
***************
*** 247,256 ****
      psNewSectorMessage msg(me);
  
!     if (msg.s1 && msg.s2)
!     {
!         Debug3(LOG_ANY, "Crossed from sector %s to sector %s.",
!                msg.s1->QueryObject()->GetName(),
!                msg.s2->QueryObject()->GetName() );
!     }
      /*
       * Check for disconnecting rain from camera when going from raining 
--- 247,254 ----
      psNewSectorMessage msg(me);
  
!     Debug3(LOG_ANY, "Crossed from sector %s to sector %s.",
!                msg.oldSector.GetData(),
!                msg.newSector.GetData() );
! 
      /*
       * Check for disconnecting rain from camera when going from raining 
***************
*** 259,263 ****
       * back out the door.
       */
!     if (rain && rainsector == msg.s1->QueryObject()->GetName())
      {
          // Stops rain mesh following player around
--- 257,261 ----
       * back out the door.
       */
!     if (rain && rainsector == msg.oldSector)
      {
          // Stops rain mesh following player around
***************
*** 276,280 ****
       * but then comes out again immediately.
       */
!     else if (rain && rainsector == msg.s2->QueryObject()->GetName())
      {
          // Starts rain mesh following player around
--- 274,278 ----
       * but then comes out again immediately.
       */
!     else if (rain && rainsector == msg.newSector)
      {
          // Starts rain mesh following player around
***************
*** 303,307 ****
      {
          RainInfo *ri,key;
!         key.sector = msg.s2->QueryObject()->GetName();
          ri = rainlist.Find(&key);
          if (ri) // then raining in new sector
--- 301,305 ----
      {
          RainInfo *ri,key;
!         key.sector = msg.newSector;
          ri = rainlist.Find(&key);
          if (ri) // then raining in new sector
***************
*** 315,319 ****
       * Name used is sector name + " background".
       */
!     csString str(msg.s2->QueryObject()->GetName() );
      str.Append(" background");
      soundmanager->ChangeBGSong(str,iSoundManager::LOOP_SOUND);
--- 313,317 ----
       * Name used is sector name + " background".
       */
!     csString str(msg.newSector );
      str.Append(" background");
      soundmanager->ChangeBGSong(str,iSoundManager::LOOP_SOUND);