From: <wel...@us...> - 2009-02-10 17:07:13
|
Revision: 3007 http://planeshift.svn.sourceforge.net/planeshift/?rev=3007&view=rev Author: weltall2 Date: 2009-02-10 17:07:10 +0000 (Tue, 10 Feb 2009) Log Message: ----------- fixed missing icons during item drag and drop procedure by loyni Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2009-02-10 16:59:19 UTC (rev 3006) +++ trunk/src/client/psslotmgr.cpp 2009-02-10 17:07:10 UTC (rev 3007) @@ -86,7 +86,6 @@ int purifyStatus = parent->GetPurifyStatus(); int newStack = parent->StackCount() - count; - parent->StackCount( newStack ); pawsSlot* widget = new pawsSlot(); widget->SetRelativeFrame( 0,0, parent->DefaultFrame().Width(), parent->DefaultFrame().Height() ); @@ -96,6 +95,7 @@ else widget->PlaceItem( NULL, count ); + parent->StackCount( newStack ); widget->SetPurifyStatus( purifyStatus ); widget->SetBackgroundAlpha(0); widget->SetParent( NULL ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-17 21:32:55
|
Revision: 4058 http://planeshift.svn.sourceforge.net/planeshift/?rev=4058&view=rev Author: mgist Date: 2009-07-17 21:32:48 +0000 (Fri, 17 Jul 2009) Log Message: ----------- - End rotating on item drop cancel. Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2009-07-17 20:20:45 UTC (rev 4057) +++ trunk/src/client/psslotmgr.cpp 2009-07-17 21:32:48 UTC (rev 4058) @@ -99,6 +99,7 @@ psengine->GetSceneManipulator()->RemoveSelected(); isPlacing = false; + isRotating = false; } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-17 23:51:53
|
Revision: 4062 http://planeshift.svn.sourceforge.net/planeshift/?rev=4062&view=rev Author: mgist Date: 2009-07-17 23:51:50 +0000 (Fri, 17 Jul 2009) Log Message: ----------- - Fixed rotation direction. Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2009-07-17 23:36:03 UTC (rev 4061) +++ trunk/src/client/psslotmgr.cpp 2009-07-17 23:51:50 UTC (rev 4062) @@ -230,7 +230,7 @@ { // Get final rotation. psPoint p = PawsManager::GetSingleton().GetMouse()->GetPosition(); - float yrot = 6 * PI * ((float)p.x - basePoint.x) / psengine->GetG2D()->GetWidth(); + float yrot = 6 * PI * ((float)basePoint.x - p.x) / psengine->GetG2D()->GetWidth(); // Send drop message. csVector3 pos = outline->GetMovable()->GetPosition(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-05 16:27:11
|
Revision: 4315 http://planeshift.svn.sourceforge.net/planeshift/?rev=4315&view=rev Author: mgist Date: 2009-09-05 16:27:05 +0000 (Sat, 05 Sep 2009) Log Message: ----------- - Potential fix for bug 3105. Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2009-09-05 14:04:30 UTC (rev 4314) +++ trunk/src/client/psslotmgr.cpp 2009-09-05 16:27:05 UTC (rev 4315) @@ -128,6 +128,10 @@ draggingSlot.slot->PlaceItem(res, draggingSlot.meshFactName, oldStack); PawsManager::GetSingleton().SetDragDropWidget( NULL ); + + psengine->GetSceneManipulator()->RemoveSelected(); + isPlacing = false; + isRotating = false; } void psSlotManager::OnNumberEntered(const char *name,int param,int count) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-05 16:30:36
|
Revision: 4316 http://planeshift.svn.sourceforge.net/planeshift/?rev=4316&view=rev Author: mgist Date: 2009-09-05 16:30:29 +0000 (Sat, 05 Sep 2009) Log Message: ----------- - Improvement to last commit. Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2009-09-05 16:27:05 UTC (rev 4315) +++ trunk/src/client/psslotmgr.cpp 2009-09-05 16:30:29 UTC (rev 4316) @@ -111,8 +111,15 @@ void psSlotManager::CancelDrag() { isDragging = false; + + if(isPlacing) + { + psengine->GetSceneManipulator()->RemoveSelected(); + isPlacing = false; + isRotating = false; + } + pawsSlot* dragging = (pawsSlot*)PawsManager::GetSingleton().GetDragDropWidget(); - if ( !dragging ) return; @@ -128,10 +135,6 @@ draggingSlot.slot->PlaceItem(res, draggingSlot.meshFactName, oldStack); PawsManager::GetSingleton().SetDragDropWidget( NULL ); - - psengine->GetSceneManipulator()->RemoveSelected(); - isPlacing = false; - isRotating = false; } void psSlotManager::OnNumberEntered(const char *name,int param,int count) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-05 17:23:32
|
Revision: 4317 http://planeshift.svn.sourceforge.net/planeshift/?rev=4317&view=rev Author: mgist Date: 2009-09-05 17:23:26 +0000 (Sat, 05 Sep 2009) Log Message: ----------- - Another fix for bug 3105. Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2009-09-05 16:30:29 UTC (rev 4316) +++ trunk/src/client/psslotmgr.cpp 2009-09-05 17:23:26 UTC (rev 4317) @@ -300,10 +300,17 @@ psSlotMovementMsg msg( draggingSlot.containerID, draggingSlot.slotID, slot->ContainerID(), slot->ID(), draggingSlot.stackCount ); + msg.SendMessage(); + // Reset widgets/objects/status. PawsManager::GetSingleton().SetDragDropWidget( NULL ); - msg.SendMessage(); isDragging = false; + if(isPlacing) + { + psengine->GetSceneManipulator()->RemoveSelected(); + isPlacing = false; + isRotating = false; + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-12-12 09:23:35
|
Revision: 6515 http://planeshift.svn.sourceforge.net/planeshift/?rev=6515&view=rev Author: rlydontknow Date: 2010-12-12 09:23:29 +0000 (Sun, 12 Dec 2010) Log Message: ----------- fixed dropped guading logic (drop unguarded per default) Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2010-12-12 00:15:08 UTC (rev 6514) +++ trunk/src/client/psslotmgr.cpp 2010-12-12 09:23:29 UTC (rev 6515) @@ -77,7 +77,7 @@ if(isPlacing) { // Drop the item at the current position. - DropItem(csMouseEventHelper::GetModifiers(&ev) & CSMASK_SHIFT); + DropItem(!(csMouseEventHelper::GetModifiers(&ev) & CSMASK_SHIFT)); return true; } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-31 12:24:03
|
Revision: 6658 http://planeshift.svn.sourceforge.net/planeshift/?rev=6658&view=rev Author: weltall2 Date: 2010-12-31 12:23:57 +0000 (Fri, 31 Dec 2010) Log Message: ----------- empty the previous slot if we are moving a bartender slot content to another Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2010-12-31 12:19:26 UTC (rev 6657) +++ trunk/src/client/psslotmgr.cpp 2010-12-31 12:23:57 UTC (rev 6658) @@ -353,6 +353,13 @@ slot->PlaceItem( draggingSlot.slot->ImageName(), "", "", draggingSlot.stackCount); slot->SetBartenderAction( draggingSlot.slot->GetBartenderAction() ); slot->SetToolTip(draggingSlot.slot->GetToolTip()); + //if the original slot was a bartender clear it as we are moving it to a new one + if(draggingSlot.slot->IsBartender()) + { + draggingSlot.slot->Clear(); + csString empty; + draggingSlot.slot->SetBartenderAction(empty); + } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-31 13:45:20
|
Revision: 6662 http://planeshift.svn.sourceforge.net/planeshift/?rev=6662&view=rev Author: weltall2 Date: 2010-12-31 13:45:14 +0000 (Fri, 31 Dec 2010) Log Message: ----------- removed superflous call also here Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2010-12-31 13:41:33 UTC (rev 6661) +++ trunk/src/client/psslotmgr.cpp 2010-12-31 13:45:14 UTC (rev 6662) @@ -359,7 +359,6 @@ if(draggingSlot.slot->IsBartender()) { draggingSlot.slot->Clear(); - draggingSlot.slot->clearBartenderAction(); } } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-31 13:46:13
|
Revision: 6663 http://planeshift.svn.sourceforge.net/planeshift/?rev=6663&view=rev Author: weltall2 Date: 2010-12-31 13:46:06 +0000 (Fri, 31 Dec 2010) Log Message: ----------- use the struct in place of accessing the slot which was dragged data Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2010-12-31 13:45:14 UTC (rev 6662) +++ trunk/src/client/psslotmgr.cpp 2010-12-31 13:46:06 UTC (rev 6663) @@ -353,8 +353,8 @@ { CancelDrag(); slot->PlaceItem( draggingSlot.slot->ImageName(), "", "", draggingSlot.stackCount); - slot->SetBartenderAction( draggingSlot.slot->GetBartenderAction() ); - slot->SetToolTip(draggingSlot.slot->GetToolTip()); + slot->SetBartenderAction(draggingSlot.bartenderAction); + slot->SetToolTip(draggingSlot.toolTip); //if the original slot was a bartender clear it as we are moving it to a new one if(draggingSlot.slot->IsBartender()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-31 14:23:34
|
Revision: 6667 http://planeshift.svn.sourceforge.net/planeshift/?rev=6667&view=rev Author: weltall2 Date: 2010-12-31 14:23:28 +0000 (Fri, 31 Dec 2010) Log Message: ----------- improved dragging of bartender slots by ignoring the action if you drop it in the same slot. commented also a printf Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2010-12-31 14:12:34 UTC (rev 6666) +++ trunk/src/client/psslotmgr.cpp 2010-12-31 14:23:28 UTC (rev 6667) @@ -219,7 +219,7 @@ void psSlotManager::SetDragDetails( pawsSlot* slot, int count ) { - printf("SetDragDetails: \n"); + //printf("SetDragDetails: \n"); draggingSlot.containerID = slot->ContainerID(); draggingSlot.slotID = slot->ID(); draggingSlot.stackCount = count; @@ -352,13 +352,17 @@ if ( slot->IsBartender() ) { CancelDrag(); - slot->PlaceItem( draggingSlot.slot->ImageName(), "", "", draggingSlot.stackCount); - slot->SetBartenderAction(draggingSlot.bartenderAction); - slot->SetToolTip(draggingSlot.toolTip); - //if the original slot was a bartender clear it as we are moving it to a new one - if(draggingSlot.slot->IsBartender()) + //do nothing if it's the same slot + if(slot != draggingSlot.slot) { - draggingSlot.slot->Clear(); + slot->PlaceItem( draggingSlot.slot->ImageName(), "", "", draggingSlot.stackCount); + slot->SetBartenderAction(draggingSlot.bartenderAction); + slot->SetToolTip(draggingSlot.toolTip); + //if the original slot was a bartender clear it as we are moving it to a new one + if(draggingSlot.slot->IsBartender()) + { + draggingSlot.slot->Clear(); + } } } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-31 14:40:26
|
Revision: 6668 http://planeshift.svn.sourceforge.net/planeshift/?rev=6668&view=rev Author: weltall2 Date: 2010-12-31 14:40:19 +0000 (Fri, 31 Dec 2010) Log Message: ----------- don't handle slot drag and drop to the same slot in place cancel the drag and drop Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2010-12-31 14:23:28 UTC (rev 6667) +++ trunk/src/client/psslotmgr.cpp 2010-12-31 14:40:19 UTC (rev 6668) @@ -345,24 +345,28 @@ } else { + //do nothing if it's the same slot + if(slot == draggingSlot.slot) + { + CancelDrag(); + return; + } //printf("Dropping Slot Here\n"); //printf("Target Slot Information: \n"); //printf("Bartender Slot: %d\n", slot->IsBartender()); //printf("Sending slot movement message\n"); if ( slot->IsBartender() ) { + //we cancel dragging because we aren't moving the original item but just taking + //a reference to it. If it's among bartender slots we will handle them differently CancelDrag(); - //do nothing if it's the same slot - if(slot != draggingSlot.slot) + slot->PlaceItem( draggingSlot.slot->ImageName(), "", "", draggingSlot.stackCount); + slot->SetBartenderAction(draggingSlot.bartenderAction); + slot->SetToolTip(draggingSlot.toolTip); + //if the original slot was a bartender clear it as we are moving it to a new one + if(draggingSlot.slot->IsBartender()) { - slot->PlaceItem( draggingSlot.slot->ImageName(), "", "", draggingSlot.stackCount); - slot->SetBartenderAction(draggingSlot.bartenderAction); - slot->SetToolTip(draggingSlot.toolTip); - //if the original slot was a bartender clear it as we are moving it to a new one - if(draggingSlot.slot->IsBartender()) - { - draggingSlot.slot->Clear(); - } + draggingSlot.slot->Clear(); } } else @@ -370,6 +374,7 @@ //printf("Slot->ID: %d\n", slot->ID() ); //printf("Container: %d\n", slot->ContainerID() ); //printf("DraggingSlot.ID %d\n", draggingSlot.slotID); + if ( draggingSlot.containerID == CONTAINER_SPELL_BOOK ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-01-08 16:32:35
|
Revision: 6728 http://planeshift.svn.sourceforge.net/planeshift/?rev=6728&view=rev Author: weltall2 Date: 2011-01-08 16:32:29 +0000 (Sat, 08 Jan 2011) Log Message: ----------- hide stack count if dragging a slot which hidden it Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2011-01-08 15:47:49 UTC (rev 6727) +++ trunk/src/client/psslotmgr.cpp 2011-01-08 16:32:29 UTC (rev 6728) @@ -209,6 +209,7 @@ widget->SetPurifyStatus( purifyStatus ); widget->SetBackgroundAlpha(0); widget->SetParent( NULL ); + widget->DrawStackCount(parent->IsDrawingStackCount()); SetDragDetails( parent, count ); parent->StackCount( newStack ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-03-06 21:58:10
|
Revision: 7057 http://planeshift.svn.sourceforge.net/planeshift/?rev=7057&view=rev Author: weltall2 Date: 2011-03-06 21:58:04 +0000 (Sun, 06 Mar 2011) Log Message: ----------- fixed slot handling with different stackcount Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2011-03-06 15:17:42 UTC (rev 7056) +++ trunk/src/client/psslotmgr.cpp 2011-03-06 21:58:04 UTC (rev 7057) @@ -347,9 +347,10 @@ else { //do nothing if it's the same slot - if(slot == draggingSlot.slot) + if(slot == draggingSlot.slot && draggingSlot.stackCount == slot->StackCount()) { CancelDrag(); + printf("here\n"); return; } //printf("Dropping Slot Here\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2013-06-30 21:54:36
|
Revision: 8726 http://sourceforge.net/p/planeshift/code/8726 Author: lpancallo Date: 2013-06-30 21:54:33 +0000 (Sun, 30 Jun 2013) Log Message: ----------- fixed slot error by Eredin. Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2013-06-21 22:03:04 UTC (rev 8725) +++ trunk/src/client/psslotmgr.cpp 2013-06-30 21:54:33 UTC (rev 8726) @@ -226,7 +226,7 @@ widget->DrawStackCount(parent->IsDrawingStackCount()); SetDragDetails(parent, count); - //parent->StackCount( newStack ); + parent->StackCount( newStack ); isDragging = true; PawsManager::GetSingleton().SetDragDropWidget( widget ); } @@ -260,6 +260,7 @@ { return; } + // Get WS position. psPoint p = PawsManager::GetSingleton().GetMouse()->GetPosition(); @@ -336,7 +337,6 @@ void psSlotManager::Handle( pawsSlot* slot, bool grabOne, bool grabAll ) { - //printf("In psSlotManager::Handle( pawsSlot *)\n"); if ( !isDragging ) { // Make sure other code isn't drag-and-dropping a different object. @@ -378,26 +378,8 @@ CancelDrag(); return; } - //printf("Dropping Slot Here\n"); - //printf("Target Slot Information: \n"); - //printf("Bartender Slot: %d\n", slot->IsBartender()); - //printf("Sending slot movement message\n"); - if ( slot->IsBartender() && !slot->GetLock() ) + if( !slot->GetLock() ) { - //we cancel dragging because we aren't moving the original item but just taking - //a reference to it. If it's among bartender slots we will handle them differently - CancelDrag(); - slot->PlaceItem( ((pawsSlot *)draggingSlot.slot)->ImageName(), "", "", draggingSlot.stackCount); - slot->SetBartenderAction(draggingSlot.Action); - slot->SetToolTip(draggingSlot.toolTip); - //if the original slot was a bartender clear it as we are moving it to a new one - if( ((pawsSlot *)draggingSlot.slot)->IsBartender()) - { - ((pawsSlot *)draggingSlot.slot)->Clear(); - } - } - else if( !slot->GetLock() ) - { //printf("Slot->ID: %d\n", slot->ID() ); //printf("Container: %d\n", slot->ContainerID() ); //printf("DraggingSlot.ID %d\n", draggingSlot.slotID); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2013-08-09 08:51:15
|
Revision: 8754 http://sourceforge.net/p/planeshift/code/8754 Author: lpancallo Date: 2013-08-09 08:51:12 +0000 (Fri, 09 Aug 2013) Log Message: ----------- valgrind memory leaks fixes by Ralph Campbell. #6093 Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2013-08-09 08:49:09 UTC (rev 8753) +++ trunk/src/client/psslotmgr.cpp 2013-08-09 08:51:12 UTC (rev 8754) @@ -76,7 +76,7 @@ } else if(ev.Name == MouseDown) { - if(button == 0) // Left + if(button == csmbLeft) // Left { if(isPlacing) { @@ -89,7 +89,7 @@ PlaceItem(); } } - else if(button == 1) // right + else if(button == csmbRight) // right { if(!isRotating) { @@ -113,7 +113,7 @@ } else if(ev.Name == MouseUp) { - if(button == 1) // right + if(button == csmbRight) // right { if(isRotating) { @@ -370,8 +370,8 @@ } else { - //do nothing if it's the same slot and we aren't dragging a split item - if(slot == draggingSlot.slot && !draggingSlot.split) + //do nothing if it's the same slot + if(slot == draggingSlot.slot ) { CancelDrag(); return; @@ -516,6 +516,7 @@ } else //dragging from a Slot { + CancelDrag(); if( !draggingSlot.Action.IsEmpty() ) { target->PlaceItem( ((pawsSlot *)draggingSlot.slot)->ImageName(), draggingSlot.toolTip, draggingSlot.toolTip, draggingSlot.Action ); @@ -526,7 +527,6 @@ target->PlaceItem( ((pawsSlot *)draggingSlot.slot)->ImageName(), draggingSlot.toolTip, draggingSlot.toolTip, t ); draggingSlot.stackCount--; } - CancelDrag(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2013-10-30 01:34:10
|
Revision: 8936 http://sourceforge.net/p/planeshift/code/8936 Author: joelyon Date: 2013-10-30 01:34:06 +0000 (Wed, 30 Oct 2013) Log Message: ----------- initialize draggingslot.stackcount to 0 prior to first use. Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2013-10-30 01:31:41 UTC (rev 8935) +++ trunk/src/client/psslotmgr.cpp 2013-10-30 01:34:06 UTC (rev 8936) @@ -46,6 +46,7 @@ isDragging = false; isPlacing = false; isRotating = false; + draggingSlot.stackCount = 0; // Initialize event shortcuts MouseMove = csevMouseMove (psengine->GetEventNameRegistry(), 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2013-11-20 17:54:23
|
Revision: 9011 http://sourceforge.net/p/planeshift/code/9011 Author: ralphcampbell Date: 2013-11-20 17:54:21 +0000 (Wed, 20 Nov 2013) Log Message: ----------- Fix 6228 - Shift-Click-Split Broken Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2013-11-19 19:52:09 UTC (rev 9010) +++ trunk/src/client/psslotmgr.cpp 2013-11-20 17:54:21 UTC (rev 9011) @@ -373,8 +373,11 @@ } else { - //do nothing if it's the same slot - if(slot == draggingSlot.slot ) + // Do nothing if it's the same slot and we aren't dropping a split stack. + // Note that crafters use this to pick up one item from a stack, + // drop it on the stack, and have the server put the item in a + // different slot. + if(slot == draggingSlot.slot && !draggingSlot.split) { CancelDrag(); return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-01-03 04:33:43
|
Revision: 9189 http://sourceforge.net/p/planeshift/code/9189 Author: ralphcampbell Date: 2014-01-03 04:33:41 +0000 (Fri, 03 Jan 2014) Log Message: ----------- Make the default stack count more useful. Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2014-01-03 00:01:21 UTC (rev 9188) +++ trunk/src/client/psslotmgr.cpp 2014-01-03 04:33:41 UTC (rev 9189) @@ -354,11 +354,15 @@ if ( stackCount == 1 || grabOne ) { + int old_count = last_count; OnNumberEntered("StackCount",tmpID, 1); + last_count = old_count; } else if ( grabAll ) { + int old_count = last_count; OnNumberEntered("StackCount",tmpID, stackCount); + last_count = old_count; } else // Ask for the number of items to grab { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-02-16 16:56:04
|
Revision: 9267 http://sourceforge.net/p/planeshift/code/9267 Author: ralphcampbell Date: 2014-02-16 16:56:01 +0000 (Sun, 16 Feb 2014) Log Message: ----------- inplace flag doesn't need to be set when dropping items into the world. Modified Paths: -------------- trunk/src/client/psslotmgr.cpp Modified: trunk/src/client/psslotmgr.cpp =================================================================== --- trunk/src/client/psslotmgr.cpp 2014-02-16 05:22:53 UTC (rev 9266) +++ trunk/src/client/psslotmgr.cpp 2014-02-16 16:56:01 UTC (rev 9267) @@ -308,24 +308,15 @@ void psSlotManager::DropItem(bool guard) { - bool inplace = true; - // get final position and rotation psPoint p = PawsManager::GetSingleton().GetMouse()->GetPosition(); csVector3 pos; csVector3 rot; psengine->GetSceneManipulator()->GetPosition(pos, rot, csVector2(p.x, p.y)); - // Don't drop money inplace - if(draggingSlot.containerID == CONTAINER_INVENTORY_MONEY) - { - inplace = false; - } - // Send drop message. psSlotMovementMsg msg( draggingSlot.containerID, draggingSlot.slotID, - CONTAINER_WORLD, 0, draggingSlot.stackCount, &pos, - &rot, guard, inplace); + CONTAINER_WORLD, 0, draggingSlot.stackCount, &pos, &rot, guard, false); msg.SendMessage(); // Remove outline mesh. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |