From 1e192fadc4901181284309232e5a0789ce2ff9eb Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 5 Jul 2005 06:59:29 +0000
Subject: [PATCH] handle @expressions in model.xml

---
 stepmania/src/Model.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp
index d715e200f0..f8b0fae2af 100644
--- a/stepmania/src/Model.cpp
+++ b/stepmania/src/Model.cpp
@@ -147,8 +147,20 @@ void Model::LoadFromNode( const CString& sDir, const XNode* pNode )
 	pNode->GetAttrValue( "Bones", s3 );
 	if( !s1.empty() || !s2.empty() || !s3.empty() )
 	{
+		LuaHelpers::RunAtExpressionS( s1 );
+		LuaHelpers::RunAtExpressionS( s2 );
+		LuaHelpers::RunAtExpressionS( s3 );
+
 		ASSERT( !s1.empty() && !s2.empty() && !s3.empty() );
-		LoadPieces( sDir+s1, sDir+s2, sDir+s3 );
+
+		if( s1.Left(1) != "/" )
+			s1 = sDir+s1;
+		if( s2.Left(1) != "/" )
+			s2 = sDir+s2;
+		if( s3.Left(1) != "/" )
+			s3 = sDir+s3;
+
+		LoadPieces( s1, s2, s3 );
 	}
 }