X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_twotone.cpp;h=497af2eb4957f0d2f7f2605fba0651f336114e73;hb=70dccb34d96712a0d2eb26332ee4d32ed2678c25;hp=b07e38231489695958af9d6fb68191773bbb826b;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
index b07e382..497af2e 100644
--- a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
@@ -1,6 +1,6 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_twotone.cpp
-**	\brief Template File
+**	\brief Implementation of the "Two-Tone" valuenode conversion.
 **
 **	$Id$
 **
@@ -116,7 +116,8 @@ synfig::ValueNode_TwoTone::operator()(Time t)const
 bool
 ValueNode_TwoTone::set_link_vfunc(int i,ValueNode::Handle x)
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0:
@@ -133,7 +134,8 @@ ValueNode_TwoTone::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_TwoTone::get_link_vfunc(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0:
@@ -153,29 +155,33 @@ ValueNode_TwoTone::link_count()const
 String
 ValueNode_TwoTone::link_local_name(int i)const
 {
-	assert(i>=0 && i<2);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0:
 			return _("Color1");
 		case 1:
 			return _("Color2");
+		default:
+			return String();
 	}
-	return String();
 }
 
 String
 ValueNode_TwoTone::link_name(int i)const
 {
-	assert(i>=0 && i<2);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0:
 			return "color1";
 		case 1:
 			return "color2";
+		default:
+			return String();
 	}
-	return String();
 }
 
 int