[Planeshift-cvs] CVS: planeshift/src/server adminmanager.cpp,1.297,1.298 weathermanager.cpp,1.35,1.36 weathermanager.h,1.20,1.21

[Arianna B. <ar...@us...>]

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

Modified Files:
	adminmanager.cpp weathermanager.cpp weathermanager.h 
Log Message:
Weather issues

Index: adminmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v
retrieving revision 1.297
retrieving revision 1.298
diff -C2 -d -r1.297 -r1.298
*** adminmanager.cpp	17 Feb 2006 03:31:50 -0000	1.297
--- adminmanager.cpp	19 Feb 2006 10:35:43 -0000	1.298
***************
*** 3298,3302 ****
  
  void AdminManager::Thunder(MsgEntry* me, psAdminCmdMessage& msg, Client *client)
! {
      // Find the sector
      psSectorInfo *sectorinfo = NULL;
--- 3298,3302 ----
  
  void AdminManager::Thunder(MsgEntry* me, psAdminCmdMessage& msg, Client *client)
! {   
      // Find the sector
      psSectorInfo *sectorinfo = NULL;
***************
*** 3326,3332 ****
      
      if(sectorinfo->is_raining)
!     {
          // Queue thunder
!         psserver->GetWeatherManager()->QueueNextEvent(0, psWeatherMessage::LIGHTNING, 0, 0, sectorinfo->name, sectorinfo);
      }
      else
--- 3326,3333 ----
      
      if(sectorinfo->is_raining)
!     {   
          // Queue thunder
!         psserver->GetWeatherManager()->QueueNextEvent(0, psWeatherMessage::LIGHTNING, 0, 0, 
!             sectorinfo->name, sectorinfo, client->GetActor()->GetEntity()->GetID());
      }
      else

Index: weathermanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/weathermanager.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** weathermanager.cpp	27 Jan 2006 18:17:51 -0000	1.35
--- weathermanager.cpp	19 Feb 2006 10:35:45 -0000	1.36
***************
*** 125,128 ****
--- 125,129 ----
                                      const char *sector,
                                      psSectorInfo *si,
+                                     uint clientnum,
                                      int r,int g,int b)
  {
***************
*** 136,139 ****
--- 137,141 ----
                                     sector,
                                     si,
+                                    clientnum,
                                     r,g,b);
  
***************
*** 239,243 ****
                          0,
                          event->si->name,
!                         event->si);
                  }
                  if (event->duration == 0)
--- 241,246 ----
                          0,
                          event->si->name,
!                         event->si,
!                         event->clientnum);
                  }
                  if (event->duration == 0)
***************
*** 328,332 ****
                  info.mode = psWeatherMessage::LIGHTNING;
                  info.sector = event->sector;
!                 psWeatherMessage lightning(0,info);
  
                  if (lightning.valid)
--- 331,336 ----
                  info.mode = psWeatherMessage::LIGHTNING;
                  info.sector = event->sector;
!                
!                 psWeatherMessage lightning(0,info, event->clientnum);
  
                  if (lightning.valid)
***************
*** 345,349 ****
                          0,
                          event->si->name,
!                         event->si);
                  }
              }
--- 349,354 ----
                          0,
                          event->si->name,
!                         event->si, 
!                         event->clientnum);
                  }
              }
***************
*** 391,394 ****
--- 396,400 ----
                     const char *where,
                     psSectorInfo *sinfo,
+                    uint client,
                     int r,int g,int b)
    : psGameEvent(0,delayticks,"psWeatherGameEvent")
***************
*** 400,403 ****
--- 406,410 ----
      si     = sinfo;
      duration = length;
+     clientnum = client;
  
      cr = r;

Index: weathermanager.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/weathermanager.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** weathermanager.h	27 Jan 2006 18:17:51 -0000	1.20
--- weathermanager.h	19 Feb 2006 10:35:45 -0000	1.21
***************
*** 59,62 ****
--- 59,63 ----
                          const char *sector,
                          psSectorInfo *si,
+                         uint clientnum = 0,
                          int r = 0,
                          int g = 0,
***************
*** 82,85 ****
--- 83,87 ----
      csString sector;
      psSectorInfo *si;
+     uint clientnum;
  
      psWeatherGameEvent(WeatherManager *mgr,
***************
*** 90,93 ****
--- 92,96 ----
                         const char *sector,
                         psSectorInfo *si,
+                        uint client,
                         int r = 0,
                         int g = 0,