X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode.cpp;h=3c537d3fb280c362ed6d491f5d7375e65648ff5b;hb=791af4d0deaf3da6360107ffee4cde1862a3d8c1;hp=827ef4fa7ed092f1950a037e140c1ec1f338486c;hpb=e556a9e73eaf9af70f65f197de762d3b507f5d7e;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp
index 827ef4f..3c537d3 100644
--- a/synfig-core/trunk/src/synfig/valuenode.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode.cpp
@@ -65,6 +65,9 @@
 #include "valuenode_exp.h"
 #include "valuenode_switch.h"
 #include "valuenode_timeloop.h"
+#include "valuenode_reciprocal.h"
+#include "valuenode_duplicate.h"
+#include "valuenode_integer.h"
 
 #include "layer.h"
 
@@ -136,6 +139,9 @@ ValueNode::subsys_init()
 	ADD_VALUENODE(ValueNode_Exp,			"exp",				_("Exponential")		);
 	ADD_VALUENODE(ValueNode_Switch,			"switch",			_("Switch")				);
 	ADD_VALUENODE(ValueNode_TimeLoop,		"timeloop",			_("Time Loop")			);
+	ADD_VALUENODE(ValueNode_Reciprocal,		"reciprocal",		_("Reciprocal")			);
+	ADD_VALUENODE(ValueNode_Duplicate,		"duplicate",		_("Duplicate")			);
+	ADD_VALUENODE(ValueNode_Integer,		"fromint",			_("From Integer")		);
 
 #undef ADD_VALUENODE
 #undef ADD_VALUENODE2
@@ -159,19 +165,19 @@ ValueNode::subsys_stop()
 		for(iter=global_value_node_map.begin();iter!=global_value_node_map.end();++iter)
 		{
 			if(!iter->second->is_exported())
-				synfig::info("%s: count:%d name:%s type:%s",
+				synfig::info(_("%s: count:%d name:%s type:%s"),
 					iter->first.get_string().c_str(),
 					iter->second->count(),
 					iter->second->get_name().c_str(),
-					ValueBase::type_name(iter->second->get_type()).c_str()
+					ValueBase::type_local_name(iter->second->get_type()).c_str()
 				);
 			else
-				synfig::info("%s: id:%s count:%d name:%s type:%s",
+				synfig::info(_("%s: id:%s count:%d name:%s type:%s"),
 					iter->first.get_string().c_str(),
 					iter->second->get_id().c_str(),
 					iter->second->count(),
 					iter->second->get_name().c_str(),
-					ValueBase::type_name(iter->second->get_type()).c_str()
+					ValueBase::type_local_name(iter->second->get_type()).c_str()
 				);
 		}
 	}
@@ -195,6 +201,17 @@ LinkableValueNode::create(const String &name, const ValueBase& x)
 {
 	if(!book().count(name))
 		return 0;
+
+	if (!check_type(name, x.get_type()) &&
+		// the Duplicate ValueNode is an exception - we don't want the
+		// user creating it for themselves, so check_type() fails for
+		// it even when it is valid
+		!(name == "duplicate" && x.get_type() == ValueBase::TYPE_REAL))
+	{
+		error(_("Bad type: ValueNode '%s' doesn't accept type '%s'"), book()[name].local_name.c_str(), ValueBase::type_local_name(x.get_type()).c_str());
+		return 0;
+	}
+
 	return book()[name].factory(x);
 }
 
@@ -249,8 +266,6 @@ ValueNode::~ValueNode()
 	value_node_count--;
 
 	begin_delete();
-
-	//DEBUGPOINT();
 }
 
 void