X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_radialcomposite.cpp;h=6ab24e483c0af3804e8041769d8f9667700a67eb;hb=c6b0c050710376d3cf99b7c083a7c47f1a0516c9;hp=5797825849dd8a1648c6168830b19cbf83d3f749;hpb=4a851e51dfc20c03cda8c614edb91062741390b7;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
index 5797825..6ab24e4 100644
--- a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_radialcomposite.cpp
-**	\brief Template File
+**	\brief Implementation of the "Radial Composite" 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
@@ -140,8 +141,7 @@ ValueNode_RadialComposite::link_count()const
 bool
 ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 {
-	assert(i>=0);
-	assert(i<6);
+	assert(i>=0 && i<link_count());
 
 	if(PlaceholderValueNode::Handle::cast_dynamic(x))
 	{
@@ -152,7 +152,6 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 	switch(get_type())
 	{
 		case ValueBase::TYPE_VECTOR:
-			assert(i<2);
 			if(i==0 && x->get_type()!=ValueBase::TYPE_REAL)
 				return false;
 			if(i==1 && x->get_type()!=ValueBase::TYPE_ANGLE)
@@ -162,7 +161,6 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 			break;
 
 		case ValueBase::TYPE_COLOR:
-			assert(i<4);
 			if((i==0 || i==1 || i==3) && x->get_type()!=ValueBase::TYPE_REAL)
 				return false;
 			if((i==2) && x->get_type()!=ValueBase::TYPE_ANGLE)
@@ -181,14 +179,16 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_RadialComposite::get_link_vfunc(int i)const
 {
-	assert(i>=0 && i<6);
+	assert(i>=0 && i<link_count());
+
 	return components[i];
 }
 
 String
 ValueNode_RadialComposite::link_local_name(int i)const
 {
-	assert(i>=0 && i<6);
+	assert(i>=0 && i<link_count());
+
 	switch(get_type())
 	{
 		case ValueBase::TYPE_VECTOR:
@@ -220,7 +220,8 @@ ValueNode_RadialComposite::link_local_name(int i)const
 String
 ValueNode_RadialComposite::link_name(int i)const
 {
-	assert(i>=0 && i<5);
+	assert(i>=0 && i<link_count());
+
 	return strprintf("c%d",i);
 }