Prevent compiler warnings about unused parameters.
[synfig.git] / synfig-studio / trunk / src / gtkmm / state_smoothmove.cpp
index 450cd53..1e1539a 100644 (file)
@@ -204,7 +204,7 @@ StateSmoothMove_Context::refresh_tool_options()
 }
 
 Smach::event_result
-StateSmoothMove_Context::event_refresh_tool_options(const Smach::event& x)
+StateSmoothMove_Context::event_refresh_tool_options(const Smach::event& /*x*/)
 {
        refresh_tool_options();
        return Smach::RESULT_ACCEPT;
@@ -260,9 +260,13 @@ DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vecto
 
        int i;
 
+       // process vertex and position ducks first
        for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++)
        {
-               if(((*iter)->get_type()!=Duck::TYPE_VERTEX&&(*iter)->get_type()!=Duck::TYPE_POSITION))continue;
+               // skip this duck if it is NOT a vertex or a position
+               if (((*iter)->get_type() != Duck::TYPE_VERTEX &&
+                        (*iter)->get_type() != Duck::TYPE_POSITION))
+                       continue;
                Point p(positions[i]);
 
                float dist(1.0f-(p-drag_offset_).mag()/get_radius());
@@ -273,9 +277,13 @@ DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vecto
                (*iter)->set_trans_point(p+last_[i]);
        }
 
+       // then process non vertex and non position ducks
        for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++)
        {
-               if(!((*iter)->get_type()!=Duck::TYPE_VERTEX&&(*iter)->get_type()!=Duck::TYPE_POSITION))continue;
+               // skip this duck if it IS a vertex or a position
+               if (!((*iter)->get_type() != Duck::TYPE_VERTEX &&
+                        (*iter)->get_type() != Duck::TYPE_POSITION))
+                       continue;
                Point p(positions[i]);
 
                float dist(1.0f-(p-drag_offset_).mag()/get_radius());