X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_exp.cpp;h=33e9a37adc11bbf2128049569e795517cc262c3d;hb=a93e9a8c03f239eb067331491d3a276c696b27ea;hp=822a3eb1ecafdd7c543bc970c71e97746193fb5c;hpb=b37086823c5bfee9c76f6b265584a414100963ef;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_exp.cpp b/synfig-core/trunk/src/synfig/valuenode_exp.cpp
index 822a3eb..33e9a37 100644
--- a/synfig-core/trunk/src/synfig/valuenode_exp.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_exp.cpp
@@ -59,7 +59,7 @@ ValueNode_Exp::ValueNode_Exp(const ValueBase &value):
 		set_link("scale",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();
@@ -102,20 +102,14 @@ ValueNode_Exp::get_local_name()const
 }
 
 bool
-ValueNode_Exp::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Exp::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i==0 || i==1);
-	if(i==0)
-	{
-		exp_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	}
-	if(i==1)
+	assert(i>=0 && i<link_count());
+
+	switch(i)
 	{
-		scale_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(exp_,   ValueBase::TYPE_REAL);
+	case 1: CHECK_TYPE_AND_SET_VALUE(scale_, ValueBase::TYPE_REAL);
 	}
 	return false;
 }
@@ -123,7 +117,8 @@ ValueNode_Exp::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_Exp::get_link_vfunc(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return exp_;
 	if(i==1)
@@ -141,7 +136,8 @@ ValueNode_Exp::link_count()const
 String
 ValueNode_Exp::link_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return "exp";
 	if(i==1)
@@ -152,7 +148,8 @@ ValueNode_Exp::link_name(int i)const
 String
 ValueNode_Exp::link_local_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return _("Exponent");
 	if(i==1)