From 03e22da03015f10b8324c09f1fd6f02b63658b08 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 30 Nov 2004 01:26:56 +0000
Subject: [PATCH] simplify

---
 stepmania/src/ScreenPackages.cpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/stepmania/src/ScreenPackages.cpp b/stepmania/src/ScreenPackages.cpp
index 0605a519b6..a09ad04307 100644
--- a/stepmania/src/ScreenPackages.cpp
+++ b/stepmania/src/ScreenPackages.cpp
@@ -483,24 +483,20 @@ void ScreenPackages::EnterURL( const CString & sURL )
 	else
 		m_bIsPackage = false;
 
-	int k=0,j=0;
-	while( k >= 0 )
+	m_sBaseAddress = "http://" + Server;
+	if( Port != 80 )
+		m_sBaseAddress += ssprintf( ":%d", Port );
+	m_sBaseAddress += "/";
+
+	if( sAddress.Right(1) != "/" )
 	{
-		j = k+1;
-		k = sAddress.Find( '/', j );
+		m_sEndName = Basename( sAddress );
+		m_sBaseAddress += Dirname( sAddress );
 	}
-
-	//If there is no '/' in the address, ignore it all
-	//for base address.
-	if( sAddress.Find( '/', 0 ) < 0 )
-		j = 0;
-
-	m_sEndName = sAddress.Right( sAddress.length() - j + 1 );
-
-	if( Port == 80 )
-		m_sBaseAddress = "http://" + Server + "/" + CString(sAddress.substr(0, j));
 	else
-		m_sBaseAddress = "http://" + Server + ssprintf( ":%d/", Port ) + CString(sAddress.substr(0, j));
+	{
+		m_sEndName = "";
+	}
 
 	//Open the file...