[Planeshift-cvs] CVS: planeshift/src/server gem.cpp,1.330,1.331 gem.h,1.150,1.151

[DaveG <da...@us...>]

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

Modified Files:
	gem.cpp gem.h 
Log Message:
making security levels set after initial load not try to set the default GM properties (needs to use the set functions, to do correctly)

Index: gem.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/gem.cpp,v
retrieving revision 1.330
retrieving revision 1.331
diff -C2 -d -r1.330 -r1.331
*** gem.cpp	17 Mar 2006 22:13:14 -0000	1.330
--- gem.cpp	18 Mar 2006 23:09:53 -0000	1.331
***************
*** 2177,2183 ****
--- 2177,2189 ----
  {
      if ( !c )
+     {
+         // NPC
          SetSecurityLevel( -1 );
+     }
      else
+     {
          SetSecurityLevel( c->GetSecurityLevel() );
+         SetGMDefaults();
+     }
                  
      return SetupCharData(); 
***************
*** 2193,2203 ****
  }
  
! void gemActor::SetSecurityLevel(int level)
  {
!     securityLevel = level;
!     
!     // Set initial attributes for GMs
! 
!     if ( CacheManager::GetSingleton().GetCommandManager()->Validate(level, "default invincible") )
      {
          invincible = true;
--- 2199,2206 ----
  }
  
! // This function should only be run on initial load
! void gemActor::SetGMDefaults()
  {
!     if ( CacheManager::GetSingleton().GetCommandManager()->Validate(securityLevel, "default invincible") )
      {
          invincible = true;
***************
*** 2212,2216 ****
      }
  
!     if ( CacheManager::GetSingleton().GetCommandManager()->Validate(level, "default invisible") )
      {
          visible = false;
--- 2215,2219 ----
      }
  
!     if ( CacheManager::GetSingleton().GetCommandManager()->Validate(securityLevel, "default invisible") )
      {
          visible = false;

Index: gem.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/gem.h,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** gem.h	17 Mar 2006 22:13:14 -0000	1.150
--- gem.h	18 Mar 2006 23:09:53 -0000	1.151
***************
*** 486,489 ****
--- 486,492 ----
      bool invincible;        // cannot be attacked
  
+     /// Set initial attributes for GMs
+     void SetGMDefaults();
+ 
  public:
      csRef<iPcLinearMovement> pcmove;
***************
*** 518,523 ****
      bool IsSitting() { return GetMode() == PSCHARACTER_MODE_SIT; }
  
!     //int GetSecurityLevel() { return securityLevel; }
!     void SetSecurityLevel(int level);
  
      // Last Production Pos is used to require people to move around while /digging
--- 521,525 ----
      bool IsSitting() { return GetMode() == PSCHARACTER_MODE_SIT; }
  
!     void SetSecurityLevel(int level) { securityLevel = level; }
  
      // Last Production Pos is used to require people to move around while /digging