From b0b1afc6179bb05e354d9dab4fa94cc0d405a382 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Wed, 30 Dec 2015 14:00:30 +1100
Subject: [PATCH] Fix level saving from last commit.

---
 .../2D/Screens/Menu/LoadLevelScreen.cs        |  6 ++--
 .../2D/Screens/Menu/SaveLevelScreen.cs        | 28 +++++++++----------
 .../2D/Screens/Menu/TexturePackScreen.cs      |  6 ++--
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs b/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs
index fc4d9515e..9815cc8d6 100644
--- a/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs
@@ -14,10 +14,8 @@ namespace ClassicalSharp {
 			Array.Copy( cwFiles, 0, files, 0, cwFiles.Length );
 			Array.Copy( datFiles, 0, files, cwFiles.Length, datFiles.Length );
 			
-			for( int i = 0; i < files.Length; i++ ) {
-				string absolutePath = files[i];
-				files[i] = absolutePath.Substring( dir.Length );
-			}
+			for( int i = 0; i < files.Length; i++ ) 
+				files[i] = Path.GetFileName( files[i] );
 			Array.Sort( files );
 		}
 		
diff --git a/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs b/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs
index ec607ef0c..85cdb0602 100644
--- a/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs
@@ -83,31 +83,31 @@ namespace ClassicalSharp {
 				MakeDescWidget( "Please enter a filename" );
 				return;
 			}
-			text = Path.Combine( Program.AppDirectory, text );
-			text = Path.ChangeExtension( text, ".cw" );
+			string file = Path.ChangeExtension( text, ".cw" );
+			text = Path.Combine( Program.AppDirectory, "maps" );
+			text = Path.Combine( text, file );
 			
 			if( File.Exists( text ) ) {
-				buttons[1] = ButtonWidget.Create( game, 0, 90, 260, 30, "Overwrite existing?", 
+				buttons[1] = ButtonWidget.Create( game, 0, 90, 260, 30, "Overwrite existing?",
 				                                 Anchor.Centre, Anchor.Centre, titleFont, OverwriteButtonClick );
 			} else {
-				SetPath( text );
+				// NOTE: We don't immediately save here, because otherwise the 'saving...'
+				// will not be rendered in time because saving is done on the main thread.
+				MakeDescWidget( "Saving.." );
+				textPath = text;
 				RemoveOverwriteButton();
 			}
 		}
 		
 		void OverwriteButtonClick( Game game, Widget widget ) {
 			string text = inputWidget.GetText();
-			text = Path.ChangeExtension( text, ".cw" );
+			string file = Path.ChangeExtension( text, ".cw" );
+			text = Path.Combine( Program.AppDirectory, "maps" );
+			text = Path.Combine( text, file );
 			
-			SetPath( text );
-			RemoveOverwriteButton();
-		}
-		
-		void SetPath( string text ) {
-			// NOTE: We don't immediately save here, because otherwise the 'saving...'
-			// will not be rendered in time because saving is done on the main thread.
 			MakeDescWidget( "Saving.." );
 			textPath = text;
+			RemoveOverwriteButton();
 		}
 		
 		void RemoveOverwriteButton() {
@@ -118,8 +118,6 @@ namespace ClassicalSharp {
 		
 		string textPath;
 		void SaveMap( string path ) {
-			path = Path.Combine( "maps", path );
-			path = Path.Combine( Program.AppDirectory, path );
 			try {
 				if( File.Exists( path ) )
 					File.Delete( path );
@@ -132,7 +130,7 @@ namespace ClassicalSharp {
 				MakeDescWidget( "&cError while trying to save map" );
 				return;
 			}
-			game.Chat.Add( "&eSaved map to: " + path );
+			game.Chat.Add( "&eSaved map to: " + Path.GetFileName( path ) );
 			game.SetNewScreen( new PauseScreen( game ) );
 		}
 		
diff --git a/ClassicalSharp/2D/Screens/Menu/TexturePackScreen.cs b/ClassicalSharp/2D/Screens/Menu/TexturePackScreen.cs
index c217d63de..100b8336b 100644
--- a/ClassicalSharp/2D/Screens/Menu/TexturePackScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/TexturePackScreen.cs
@@ -12,10 +12,8 @@ namespace ClassicalSharp {
 			string dir = Path.Combine( Program.AppDirectory, TexturePackExtractor.Dir );
 			files = Directory.GetFiles( dir, "*.zip" );
 			
-			for( int i = 0; i < files.Length; i++ ) {
-				string absolutePath = files[i];
-				files[i] = absolutePath.Substring( dir.Length );
-			}
+			for( int i = 0; i < files.Length; i++ )
+				files[i] = Path.GetFileName( files[i] );
 			Array.Sort( files );
 		}