X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_atan2.cpp;h=5f7381ba4be116214c6c18c448eb6498f1f7ba5d;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=dc63017c68f4abb38a399baba97a0e056f429b72;hpb=beb09459a38eb7f953bfe7e78affa504af20d857;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_atan2.cpp b/synfig-core/trunk/src/synfig/valuenode_atan2.cpp
index dc63017..5f7381b 100644
--- a/synfig-core/trunk/src/synfig/valuenode_atan2.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_atan2.cpp
@@ -1,12 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_atan2.cpp
-**	\brief Template File
+**	\brief Implementation of the "aTan2" valuenode conversion.
 **
 **	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 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
@@ -60,7 +60,7 @@ ValueNode_Atan2::ValueNode_Atan2(const ValueBase &value):
 		set_link("y",ValueNode_Const::create(Angle::sin(value.get(Angle())).get()));
 		break;
 	default:
-		throw Exception::BadType(ValueBase::type_name(value.get_type()));
+		throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
 	}
 
 	DCAST_HACK_ENABLE();
@@ -110,20 +110,14 @@ ValueNode_Atan2::check_type(ValueBase::Type type)
 }
 
 bool
-ValueNode_Atan2::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Atan2::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i==0 || i==1);
-	if(i==0)
-	{
-		x_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	}
-	if(i==1)
+	assert(i>=0 && i<link_count());
+
+	switch(i)
 	{
-		y_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(x_, ValueBase::TYPE_REAL);
+	case 1: CHECK_TYPE_AND_SET_VALUE(y_, ValueBase::TYPE_REAL);
 	}
 	return false;
 }
@@ -131,7 +125,8 @@ ValueNode_Atan2::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_Atan2::get_link_vfunc(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return x_;
 	if(i==1)
@@ -149,7 +144,8 @@ ValueNode_Atan2::link_count()const
 String
 ValueNode_Atan2::link_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return "x";
 	if(i==1)
@@ -160,7 +156,8 @@ ValueNode_Atan2::link_name(int i)const
 String
 ValueNode_Atan2::link_local_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return _("X");
 	if(i==1)