shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-23 02:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix savesystem oddities.

Browse source
This commit is contained in:
Michael 2017-02-23 16:25:29 -05:00
parent ad76a525fe
commit 2bd4a815d3
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ShiftOS_TheReturn/Commands.cs
View file

@ -591,11 +591,11 @@ shiftorium.buy{{upgrade:""{upg.ID}""}}");
[Command("list")]
public static bool List()
{
Console.WriteLine("{ID}\t{WINDOW}");
Console.WriteLine("Window ID\tName");
foreach (var app in AppearanceManager.OpenForms)
{
//All .NET object instances have a unique hash code. Good for fake process management.
Console.WriteLine($"{app.GetHashCode()}\t{app.Text}");
//Windows are displayed the order in which they were opened.
Console.WriteLine($"{AppearanceManager.OpenForms.IndexOf(app)}\t{app.Text}");
}
return true;
}
@ -702,6 +702,32 @@ shiftorium.buy{{upgrade:""{upg.ID}""}}");
}
}
[RemoteLock]
[Command("close", usage = "{win:integer32}", description ="Closes the specified window.")]
[RequiresArgument("win")]
[RequiresUpgrade("close_command")]
public static bool CloseWindow(Dictionary<string, object> args)
{
int winNum = -1;
if (args.ContainsKey("win"))
winNum = Convert.ToInt32(args["win"].ToString());
string err = null;
if (winNum < 0 || winNum >= AppearanceManager.OpenForms.Count)
err = "The window number must be between 0 and " + (AppearanceManager.OpenForms.Count - 1).ToString() + ".";
if (string.IsNullOrEmpty(err))
{
Console.WriteLine($"Closing {AppearanceManager.OpenForms[winNum].Text}...");
AppearanceManager.Close(AppearanceManager.OpenForms[winNum].ParentWindow);
}
else
{
Console.WriteLine(err);
}
return true;
}
}
}

5
ShiftOS_TheReturn/SaveSystem.cs
View file

@ -288,14 +288,11 @@ namespace ShiftOS.Engine
string username = CurrentSave.Username;
string password = CurrentSave.Password;
if (!Utils.FileExists(Paths.GetPath("user.dat")))
{
Utils.WriteAllText(Paths.GetPath("user.dat"), $@"{{
username: ""{username}"",
password: ""{password}""
}}");
}
ServerManager.SendMessage("mud_save", JsonConvert.SerializeObject(CurrentSave, Formatting.Indented));
}
if (!Shiftorium.Silent)