[PlaneShift-svn] SF.net SVN: planeshift:[6657] trunk/src/client/gui/pawsslot.cpp

[<wel...@us...>]

Revision: 6657
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6657&view=rev
Author:   weltall2
Date:     2010-12-31 12:19:26 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------
allow to move bartender slots if ctrl is pressed. ctrl+alt will delete and no button pressed will just execute the action

Modified Paths:
--------------
    trunk/src/client/gui/pawsslot.cpp

Modified: trunk/src/client/gui/pawsslot.cpp
===================================================================
--- trunk/src/client/gui/pawsslot.cpp	2010-12-31 12:18:48 UTC (rev 6656)
+++ trunk/src/client/gui/pawsslot.cpp	2010-12-31 12:19:26 UTC (rev 6657)
@@ -126,10 +126,14 @@
             action.Empty();
             return true;
         }
-        //in case they are not just act normally
-        printf("This is a bartender button with action: %s\n", action.GetData());
-        psengine->GetCmdHandler()->Execute(action.GetData());
-        return true;
+        //if we aren't pressing ctrl we execute the command else we allow drag and drop
+        else if(!(modifiers & CSMASK_CTRL))
+        {
+            //in case they are not just act normally
+            printf("This is a bartender button with action: %s\n", action.GetData());
+            psengine->GetCmdHandler()->Execute(action.GetData());
+            return true;
+        }
     }
      
     if ( !empty && psengine->GetMouseBinds()->CheckBind("ContextMenu",button,modifiers) )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.