Merge branch 'master' of https://bitbucket.org/Regalis11/repo

Conflicts:
	Subsurface_Solution.v12.suo

Subsurface/Screens/LobbyScreen.cs

@@ -187,7 +187,7 @@ namespace Subsurface
             {
                 GUITextBlock textBlock = new GUITextBlock(
                     new Rectangle(0, 0, 0, 25),
-                    c.Name, GUI.style, 
+                    c.Name + " ("+c.Job.Name+")", GUI.style, 
                     Alignment.Left, 
                     Alignment.Left,
                     characterList);
@@ -205,7 +205,7 @@ namespace Subsurface
 
                 GUITextBlock textBlock = new GUITextBlock(
                     new Rectangle(0, 0, 0, 25),
-                    c.Name,
+                    c.Name + " (" + c.Job.Name + ")",
                     Color.Transparent, Color.Black,
                     Alignment.Left, null, frame);
 

Subsurface/Screens/MainMenu.cs

@@ -10,15 +10,15 @@ namespace Subsurface
     {
         enum Tabs { Main = 0, NewGame = 1, LoadGame = 2, JoinServer = 3 }
 
-        GUIFrame[] menuTabs;
-        GUIListBox mapList;
+        private GUIFrame[] menuTabs;
+        private GUIListBox mapList;
 
-        GUIListBox saveList;
+        private GUIListBox saveList;
 
-        GUITextBox nameBox;
-        GUITextBox ipBox;
+        private GUITextBox nameBox;
+        private GUITextBox ipBox;
 
-        Game1 game;
+        private Game1 game;
 
         int selectedTab;
 
@@ -87,6 +87,18 @@ namespace Subsurface
 
             new GUITextBlock(new Rectangle(0, 0, 0, 30), "Load Game", Color.Transparent, Color.Black, Alignment.CenterX, null, menuTabs[(int)Tabs.LoadGame]);
 
+            if (!Directory.Exists(SaveUtil.SaveFolder))
+            {
+                DebugConsole.ThrowError("Save folder ''"+SaveUtil.SaveFolder+" not found! Attempting to create a new folder");
+                try
+                {
+                    Directory.CreateDirectory(SaveUtil.SaveFolder);
+                }
+                catch (Exception e)
+                {
+                    DebugConsole.ThrowError("Failed to create the folder ''"+SaveUtil.SaveFolder+"''!", e);
+                }
+            }
 
             string[] saveFiles = Directory.GetFiles(SaveUtil.SaveFolder, "*.save");
 

Subsurface/Screens/NetLobbyScreen.cs

@@ -227,7 +227,7 @@ namespace Subsurface
 
                 GUIListBox jobList = new GUIListBox(new Rectangle(0,180,200,0), GUI.style, playerFrame);
 
-                foreach (Job job in Job.jobList)
+                foreach (JobPrefab job in JobPrefab.List)
                 {
                     GUITextBlock jobText = new GUITextBlock(new Rectangle(0,0,0,20), job.Name, GUI.style, jobList);
                     GUIButton upButton = new GUIButton(new Rectangle(jobText.Rect.Width - 40, 0, 20, 20), "u", GUI.style, jobText);