From 859ace0201ad8c7863908515f0bb6d5546326b01 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 23 Aug 2003 19:10:05 +0000
Subject: [PATCH] fix slashes and collapse path when loading a texture in Model

---
 stepmania/src/Model.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp
index 3d0b2a762e..8c09555c5b 100644
--- a/stepmania/src/Model.cpp
+++ b/stepmania/src/Model.cpp
@@ -401,6 +401,16 @@ bool Model::LoadMilkshapeAscii( CString sPath )
                 sscanf (szLine, "\"%[^\"]\"", szName);
                 strcpy( Material.szDiffuseTexture, szName );
 
+				if( strcmp(Material.szDiffuseTexture, "")!=0 )
+				{
+					CString sFile = Material.szDiffuseTexture;
+					FixSlashesInPlace( sFile );
+					CString sPath = sDir + Material.szDiffuseTexture;
+					CollapsePath( sPath );
+					if( IsAFile(sPath) )
+						Material.aniTexture.Load( sPath );
+				}
+
                 // alpha texture
                 if (!fgets (szLine, 256, file))
                 {
@@ -410,12 +420,6 @@ bool Model::LoadMilkshapeAscii( CString sPath )
                 strcpy (szName, "");
                 sscanf (szLine, "\"%[^\"]\"", szName);
                 strcpy( Material.szAlphaTexture, szName );
-
-				if( strcmp(Material.szDiffuseTexture, "")!=0 )
-				{
-					if( IsAFile(sDir+Material.szDiffuseTexture) )
-						Material.aniTexture.Load( sDir+Material.szDiffuseTexture );
-				}
             }
         }
     }