X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_blinecalcvertex.cpp;h=e32d9bc3044690e19240c7c93b8a4737003005e1;hb=1ba01d62f55407997aca33ed89d171ea7e5979d1;hp=1d4ae12f6c8fe80485e64335ae2ef36ca68e2ca4;hpb=b37086823c5bfee9c76f6b265584a414100963ef;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_blinecalcvertex.cpp b/synfig-core/trunk/src/synfig/valuenode_blinecalcvertex.cpp
index 1d4ae12..e32d9bc 100644
--- a/synfig-core/trunk/src/synfig/valuenode_blinecalcvertex.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_blinecalcvertex.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 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
@@ -58,7 +59,7 @@ ValueNode_BLineCalcVertex::ValueNode_BLineCalcVertex(const ValueBase::Type &x):
 	LinkableValueNode(x)
 {
 	if(x!=ValueBase::TYPE_VECTOR)
-		throw Exception::BadType(ValueBase::type_name(x));
+		throw Exception::BadType(ValueBase::type_local_name(x));
 
 	ValueNode_BLine* value_node(new ValueNode_BLine());
 	set_link("bline",value_node);
@@ -86,7 +87,7 @@ ValueNode_BLineCalcVertex::~ValueNode_BLineCalcVertex()
 ValueBase
 ValueNode_BLineCalcVertex::operator()(Time t)const
 {
-	const std::vector<ValueBase> bline((*bline_)(t));
+	const std::vector<ValueBase> bline((*bline_)(t).get_list());
 	handle<ValueNode_BLine> bline_value_node(bline_);
 	const bool looped(bline_value_node->get_loop());
 	int size = bline.size(), from_vertex;
@@ -140,23 +141,15 @@ ValueNode_BLineCalcVertex::get_local_name()const
 }
 
 bool
-ValueNode_BLineCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_BLineCalcVertex::set_link_vfunc(int i,ValueNode::Handle value)
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-		case 0:
-			bline_=x;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
-		case 1:
-			loop_=x;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
-		case 2:
-			amount_=x;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(bline_,  ValueBase::TYPE_LIST);
+	case 1: CHECK_TYPE_AND_SET_VALUE(loop_,   ValueBase::TYPE_BOOL);
+	case 2: CHECK_TYPE_AND_SET_VALUE(amount_, ValueBase::TYPE_REAL);
 	}
 	return false;
 }
@@ -165,6 +158,7 @@ ValueNode::LooseHandle
 ValueNode_BLineCalcVertex::get_link_vfunc(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return bline_;
@@ -185,6 +179,7 @@ String
 ValueNode_BLineCalcVertex::link_name(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return "bline";
@@ -198,6 +193,7 @@ String
 ValueNode_BLineCalcVertex::link_local_name(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return _("BLine");