[PlaneShift-svn] SF.net SVN: planeshift:[1921] stable

[<mg...@us...>]

Revision: 1921
          http://planeshift.svn.sourceforge.net/planeshift/?rev=1921&view=rev
Author:   mgist
Date:     2008-07-16 23:33:45 +0000 (Wed, 16 Jul 2008)

Log Message:
-----------
- Removed r1872, it needs more work done to it.

Modified Paths:
--------------
    stable/docs/history.txt
    stable/src/client/gui/pawsslot.cpp
    stable/src/client/gui/psmainwidget.cpp
    stable/src/client/pscharcontrol.cpp
    stable/src/client/psmovement.cpp
    stable/src/client/psmovement.h

Modified: stable/docs/history.txt
===================================================================
--- stable/docs/history.txt	2008-07-16 23:32:48 UTC (rev 1920)
+++ stable/docs/history.txt	2008-07-16 23:33:45 UTC (rev 1921)
@@ -8,7 +8,6 @@
 - Fix to guild window xml, patch by Caarrie.
 
 *** 2008-07-06 by Roland Schulz
-- Fix to FS#1336 by Boite - use mouselook only when focussed on main widget.
 - Fix to FS#1694 by Zwenze - added GM /checkitem command.
 - Fix to FS#1376 by Oskaris - display bug in ownership when splitting a stack
   in furnace

Modified: stable/src/client/gui/pawsslot.cpp
===================================================================
--- stable/src/client/gui/pawsslot.cpp	2008-07-16 23:32:48 UTC (rev 1920)
+++ stable/src/client/gui/pawsslot.cpp	2008-07-16 23:33:45 UTC (rev 1921)
@@ -86,23 +86,18 @@
         psengine->GetMsgHandler()->SendMessage( out.msg );
         return true;
     }
-    else
+    else if ( dragDrop && (!empty || psengine->GetSlotManager()->IsDragging()) )
     {
-        bool grab = psengine->GetMouseBinds()->CheckBind("EntityDragDrop", button, modifiers);
-        bool grabAll = psengine->GetMouseBinds()->CheckBind("EntityDragDropAll", button, modifiers);
-        bool grabOne = psengine->GetMouseBinds()->CheckBind("EntityDragDropOne", button, modifiers);
-        if ( dragDrop && (grab || grabAll || grabOne) && (!empty || psengine->GetSlotManager()->IsDragging()) )
-        {
-            // Grab one item if EntityDragDropOne modifiers key are used. Grab everything in the slot
-            // if EntityDragDropAll modifiers key are used
-            mgr->Handle( this, grabOne, grabAll );
+        // Grab one item if shift key are used. Grab everything in the slot 
+        // if either middle mouse button or ctrl key are used
+        mgr->Handle( this, modifiers==1, button==2 || modifiers==2 );
         return true;
-        }else if ( parent )
+    }
+    else if ( parent )
         return parent->OnButtonPressed(button, modifiers, this);
     else
         return pawsWidget::OnMouseDown(button, modifiers, x, y );
 }
-}
 
 void pawsSlot::SetToolTip( const char* text )
 {

Modified: stable/src/client/gui/psmainwidget.cpp
===================================================================
--- stable/src/client/gui/psmainwidget.cpp	2008-07-16 23:32:48 UTC (rev 1920)
+++ stable/src/client/gui/psmainwidget.cpp	2008-07-16 23:33:45 UTC (rev 1921)
@@ -354,11 +354,6 @@
     {
         GEMClientObject* over = FindMouseOverObject( x, y );
 
-        const psControl* mouseLookTrigger = psengine->GetCharControl()->GetTrigger("MouseLook");
-        if(mouseLookTrigger->button==button && mouseLookTrigger->mods==keyModifier){
-            psengine->GetCharControl()->GetMovementManager()->MouseLookCanAct(true);
-        }
-
         if (psengine->GetMouseBinds()->CheckBind("EntitySelect", button, keyModifier))
         {
             if ( over )

Modified: stable/src/client/pscharcontrol.cpp
===================================================================
--- stable/src/client/pscharcontrol.cpp	2008-07-16 23:32:48 UTC (rev 1920)
+++ stable/src/client/pscharcontrol.cpp	2008-07-16 23:33:45 UTC (rev 1921)
@@ -527,7 +527,7 @@
     // RS: invert mouselook status so the mouselook button can be
     // used to temporarily switch out of mouselook mode too
     movement->MouseLook(!movement->MouseLook());
-    if (!movement->MouseZoom() && movement->MouseLook()) { // KL: No CenterMouse while in MouseZoom mode.
+    if (!movement->MouseZoom()) { // KL: No CenterMouse while in MouseZoom mode.
         charcontrol->CenterMouse(value);
     }
  

Modified: stable/src/client/psmovement.cpp
===================================================================
--- stable/src/client/psmovement.cpp	2008-07-16 23:32:48 UTC (rev 1920)
+++ stable/src/client/psmovement.cpp	2008-07-16 23:33:45 UTC (rev 1921)
@@ -89,7 +89,6 @@
     toggleRun = false;
     mouseAutoMove = false;
     mouseLook = false;
-    mouseLookCanAct = false;
     mouseZoom = false;
     mouseMove = false;
     sneaking = false;
@@ -600,9 +599,6 @@
     SetMouseSensX( v2 );
 }
 
-void psMovementManager::MouseLookCanAct(bool v){
-    mouseLookCanAct = v;
-}
 
 void psMovementManager::MouseLook(bool v)
 {
@@ -610,9 +606,6 @@
 	{
 		return;
 	}
-
-    if(mouseLookCanAct || !v)
-    {
 	mouseLook = v;
 	psCamera* camera = psengine->GetPSCamera();
 	if( camera->RotateCameraWithPlayer() )
@@ -627,8 +620,6 @@
 		}
 	}
 }
-    mouseLookCanAct = false;
-}
 
 void psMovementManager::MouseLook(iEvent& ev)
 {

Modified: stable/src/client/psmovement.h
===================================================================
--- stable/src/client/psmovement.h	2008-07-16 23:32:48 UTC (rev 1920)
+++ stable/src/client/psmovement.h	2008-07-16 23:33:45 UTC (rev 1921)
@@ -108,7 +108,6 @@
     bool autoMove;
     bool toggleRun;
     bool mouseLook;
-    bool mouseLookCanAct;
     bool mouseZoom;
     bool mouseMove;
     bool sneaking;
@@ -173,9 +172,6 @@
     bool GetInvertedMouse() { return invertedMouse; }
     void LoadMouseSettings();
 
-    void MouseLookCanAct(bool v);
-    bool MouseLookCanAct(){ return mouseLookCanAct; }
-
     void MouseLook(bool v);
     bool MouseLook() { return mouseLook; }
     void MouseLook(iEvent& ev);


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