X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_cos.cpp;h=167a76145453e7fd4690d59918596d7e0895870d;hb=6fcfeb5b77c28b403b9fecc9bafcde6834447c9a;hp=50543b2a6039589ad387cd00e7e218c192769ccf;hpb=02132a5a2f9e5b5fd0fc5198574fba0319c1a885;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_cos.cpp b/synfig-core/trunk/src/synfig/valuenode_cos.cpp
index 50543b2..167a761 100644
--- a/synfig-core/trunk/src/synfig/valuenode_cos.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_cos.cpp
@@ -1,6 +1,6 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_cos.cpp
-**	\brief Template File
+**	\brief Implementation of the "Cos" valuenode conversion.
 **
 **	$Id$
 **
@@ -56,11 +56,11 @@ ValueNode_Cos::ValueNode_Cos(const ValueBase &value):
 	switch(value.get_type())
 	{
 	case ValueBase::TYPE_REAL:
-		set_link("angle",ValueNode_Const::create(Angle::deg(90)));
+		set_link("angle",ValueNode_Const::create(Angle::deg(0)));
 		set_link("amp",ValueNode_Const::create(value.get(Real())));
 		break;
 	default:
-		throw Exception::BadType(ValueBase::type_name(value.get_type()));
+		throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
 	}
 
 	DCAST_HACK_ENABLE();
@@ -113,20 +113,14 @@ ValueNode_Cos::check_type(ValueBase::Type type)
 }
 
 bool
-ValueNode_Cos::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Cos::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i==0 || i==1);
-	if(i==0)
-	{
-		angle_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	}
-	if(i==1)
+	assert(i>=0 && i<link_count());
+
+	switch(i)
 	{
-		amp_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(angle_, ValueBase::TYPE_ANGLE);
+	case 1: CHECK_TYPE_AND_SET_VALUE(amp_,   ValueBase::TYPE_REAL);
 	}
 	return false;
 }
@@ -134,7 +128,8 @@ ValueNode_Cos::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_Cos::get_link_vfunc(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return angle_;
 	if(i==1)
@@ -152,7 +147,8 @@ ValueNode_Cos::link_count()const
 String
 ValueNode_Cos::link_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return "angle";
 	if(i==1)
@@ -163,7 +159,8 @@ ValueNode_Cos::link_name(int i)const
 String
 ValueNode_Cos::link_local_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return _("Angle");
 	if(i==1)