Made all the assert() lines which check the valuenode sub-parameter index range the...

[synfig.git] / synfig-core / trunk / src / synfig / valuenode_segcalcvertex.cpp

diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
index 0e8e6b0..db77757 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file valuenode_segcalcvertex.cpp
-**     \brief Template File
+**     \brief Implementation of the "Segment Vertex" valuenode conversion.
 **
 **     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -59,9 +60,8 @@ ValueNode_SegCalcVertex::ValueNode_SegCalcVertex(const ValueBase::Type &x):
        if(x!=ValueBase::TYPE_VECTOR)
                throw Exception::BadType(ValueBase::type_name(x));
 
-       segment_=ValueNode_Composite::create(ValueBase::TYPE_SEGMENT);
-       amount_=ValueNode_Const::create(Real(0.5));
-
+       set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT));
+       set_link("amount",ValueNode_Const::create(Real(0.5)));
 }
 
 ValueNode_SegCalcVertex*
@@ -95,7 +95,7 @@ ValueNode_SegCalcVertex::get_name()const
 String
 ValueNode_SegCalcVertex::get_local_name()const
 {
-       return _("SegCalcVertex");
+       return _("Segment Vertex");
 }
 
 bool
@@ -107,7 +107,8 @@ ValueNode_SegCalcVertex::check_type(ValueBase::Type type)
 bool
 ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
        {
                segment_=x;
@@ -126,7 +127,8 @@ ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_SegCalcVertex::get_link_vfunc(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
                return segment_;
        if(i==1)
@@ -144,7 +146,8 @@ ValueNode_SegCalcVertex::link_count()const
 String
 ValueNode_SegCalcVertex::link_name(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
                return "segment";
        if(i==1)
@@ -155,7 +158,8 @@ ValueNode_SegCalcVertex::link_name(int i)const
 String
 ValueNode_SegCalcVertex::link_local_name(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
                return _("Segment");
        if(i==1)