X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_timedswap.cpp;h=c444fdabc0b6f1bf231d92bda06870e6ad1a1a5b;hb=71f558fb16eaaacd692807b902429e6a249c1540;hp=549feacfa59541e23ba88b5b47c0bbec571f26c0;hpb=8855fdd4a26f69afaa5a018c6eb9cfc770f0c09d;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
index 549feac..c444fda 100644
--- a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
@@ -1,6 +1,6 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_timedswap.cpp
-**	\brief Template File
+**	\brief Implementation of the "Timed Swap" valuenode conversion.
 **
 **	$Id$
 **
@@ -83,7 +83,7 @@ ValueNode_TimedSwap::ValueNode_TimedSwap(const ValueBase &value):
 		set_link("after",ValueNode_Const::create(value.get(Vector())));
 		break;
 	default:
-		throw Exception::BadType(ValueBase::type_name(get_type()));
+		throw Exception::BadType(ValueBase::type_local_name(get_type()));
 	}
 
 	set_link("time",ValueNode_Const::create(Time(2)));
@@ -258,7 +258,8 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const
 bool
 ValueNode_TimedSwap::set_link_vfunc(int i,ValueNode::Handle x)
 {
-	assert(i>=0 && i<4);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return set_before(x);
@@ -272,7 +273,8 @@ ValueNode_TimedSwap::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_TimedSwap::get_link_vfunc(int i)const
 {
-	assert(i>=0 && i<4);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return get_before();
@@ -292,7 +294,8 @@ ValueNode_TimedSwap::link_count()const
 String
 ValueNode_TimedSwap::link_local_name(int i)const
 {
-	assert(i>=0 && i<4);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return _("Before");
@@ -306,7 +309,8 @@ ValueNode_TimedSwap::link_local_name(int i)const
 String
 ValueNode_TimedSwap::link_name(int i)const
 {
-	assert(i>=0 && i<4);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return "before";