X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_range.cpp;h=3a8ee7f196f8e45582db473ea38dd99d32ba1961;hb=6fcfeb5b77c28b403b9fecc9bafcde6834447c9a;hp=df9d12e189ef1ff5241d25df6409e7f5b11ed0f0;hpb=b37086823c5bfee9c76f6b265584a414100963ef;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_range.cpp b/synfig-core/trunk/src/synfig/valuenode_range.cpp
index df9d12e..3a8ee7f 100644
--- a/synfig-core/trunk/src/synfig/valuenode_range.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_range.cpp
@@ -83,7 +83,7 @@ synfig::ValueNode_Range::ValueNode_Range(const ValueBase &value):
 		break;
 	default:
 		assert(0);
-		throw runtime_error("synfig::ValueNode_Range:Bad type "+ValueBase::type_name(id));
+		throw runtime_error(get_local_name()+_(":Bad type ")+ValueBase::type_local_name(id));
 	}
 
 	assert(min_->get_type()==id);
@@ -150,30 +150,22 @@ synfig::ValueNode_Range::operator()(Time t)const
 bool
 ValueNode_Range::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-		case 0:
-			min_=value;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
-		case 1:
-			max_=value;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
-		case 2:
-			link_=value;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(min_,  get_type());
+	case 1: CHECK_TYPE_AND_SET_VALUE(max_,  get_type());
+	case 2: CHECK_TYPE_AND_SET_VALUE(link_, get_type());
 	}
-
 	return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_Range::get_link_vfunc(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return min_;
@@ -192,7 +184,8 @@ ValueNode_Range::link_count()const
 String
 ValueNode_Range::link_local_name(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return _("Min");
@@ -205,7 +198,8 @@ ValueNode_Range::link_local_name(int i)const
 String
 ValueNode_Range::link_name(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return "min";