[Planeshift-cvs] CVS: planeshift/src/server actionmanager.cpp, 1.39, 1.40

[tomtt <to...@us...>]

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

Modified Files:
	actionmanager.cpp 
Log Message:
Added support for a security lock that opens door without leaving lock unlocked.

Index: actionmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/actionmanager.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** actionmanager.cpp	14 Dec 2006 02:18:19 -0000	1.39
--- actionmanager.cpp	16 Dec 2006 00:59:43 -0000	1.40
***************
*** 680,700 ****
      uint32_t options = psGUIInteractMessage::EXAMINE;
      if (action->IsEntrance())
-     {
          options |= psGUIInteractMessage::ENTER;
-     }
      else if (action->IsGameBoard())
          options |= psGUIInteractMessage::PLAYGAME;
      else
          options |= psGUIInteractMessage::USE;
-     options |= psGUIInteractMessage::CLOSE;
  
!     if (realItem && realItem->IsContainer()) options |= psGUIInteractMessage::COMBINE;
!     if (realItem && realItem->IsLockable())
      {
!         if( realItem->IsLocked())
!             options |= psGUIInteractMessage::UNLOCK;
!         else
!             options |= psGUIInteractMessage::LOCK;
      }
  
      psGUIInteractMessage interactMsg( client->GetClientNum(), options );
--- 680,700 ----
      uint32_t options = psGUIInteractMessage::EXAMINE;
      if (action->IsEntrance())
          options |= psGUIInteractMessage::ENTER;
      else if (action->IsGameBoard())
          options |= psGUIInteractMessage::PLAYGAME;
      else
          options |= psGUIInteractMessage::USE;
  
!     if (realItem && realItem->IsSecurityLocked())
!         options |= psGUIInteractMessage::ENTERLOCKED;
!     else if(realItem && realItem->IsLocked())
!         options |= psGUIInteractMessage::UNLOCK;
!     else
      {
!         options |= psGUIInteractMessage::LOCK;
!         if (realItem && realItem->IsContainer()) 
!             options |= psGUIInteractMessage::COMBINE;
      }
+     options |= psGUIInteractMessage::CLOSE;
  
      psGUIInteractMessage interactMsg( client->GetClientNum(), options );