From 6670c55a07f1ca2f07af4752d9872d40674e7d6d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 6 Sep 2005 05:56:59 +0000 Subject: [PATCH] oops. Multiple attributes with the same name aren't allowed. Transition back to a child node. --- stepmania/src/Actor.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index 016ddcac3c..64471ba3ed 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -222,25 +222,6 @@ void Actor::LoadFromNode( const CString& sDir, const XNode* pNode ) { m_sName = pAttr->m_sValue; } - else if( pAttr->m_sName == "Input" ) - { - /* Parameters are set as globals by ActorUtil::LoadFromActorFile. - * If parameters are specified here, save them to the actor. Accessing - * parameters as globals directly is deprecated. */ - const CString &sName = pAttr->m_sValue; - - Lua *L = LUA->Get(); - this->PushSelf( L ); - LuaHelpers::Push( sName, L ); - lua_getglobal( L, sName ); - - if( lua_isnil(L, -1) ) - RageException::Throw( "Actor in \"%s\" requires parameter \"%s\" that is not set", sDir.c_str(), sName.c_str() ); - - lua_settable( L, -3 ); - lua_pop( L, 1 ); - LUA->Release( L ); - } else if( pAttr->m_sName == "BaseRotationXDegrees" ) SetBaseRotationX( strtof( pAttr->m_sValue, NULL ) ); else if( pAttr->m_sName == "BaseRotationYDegrees" ) SetBaseRotationY( strtof( pAttr->m_sValue, NULL ) ); else if( pAttr->m_sName == "BaseRotationZDegrees" ) SetBaseRotationZ( strtof( pAttr->m_sValue, NULL ) );