Bitl
/
Novetus_src
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

config part 3: fully compliable but still HEAVILY a WIP.

This commit is contained in:
Bitl 2023-05-22 22:48:25 -07:00
parent 43c7856fba
commit ad8c128aa4
9 changed files with 154 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Novetus/Novetus.Bootstrapper/NovetusLaunchForm.cs
View File

@ -17,11 +17,12 @@ namespace Novetus.Bootstrapper
private void NovetusLaunchForm_Load(object sender, EventArgs e) private void NovetusLaunchForm_Load(object sender, EventArgs e)
{ {
if (File.Exists(LocalPaths.ConfigPath)) FileManagement.ReadInfoFile(LocalPaths.InfoPath,
{
FileManagement.ReadInfoFile(LocalPaths.InfoPath,
LocalPaths.VersionTermList, LocalPaths.VersionTermList,
LocalPaths.LauncherPath); LocalPaths.LauncherPath);
if (File.Exists(LocalPaths.ConfigPath))
{
ReadConfigValues(LocalPaths.ConfigPath); ReadConfigValues(LocalPaths.ConfigPath);
} }

36
Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs
View File

@ -89,6 +89,11 @@ namespace Novetus.Core
public void CreateFile() public void CreateFile()
{ {
INI = new INIFile(FullPath); INI = new INIFile(FullPath);
DeployDefaults();
}
public virtual void DeployDefaults()
{
GenerateDefaults(); GenerateDefaults();
GenerateDefaultsEvent(); GenerateDefaultsEvent();
} }
@ -169,12 +174,24 @@ namespace Novetus.Core
public int ReadSettingInt(string name) public int ReadSettingInt(string name)
{ {
return Convert.ToInt32(ReadSetting(name)); bool result = int.TryParse(ReadSetting(name), out int value);
if(result)
{
return value;
}
return 0;
} }
public bool ReadSettingBool(string name) public bool ReadSettingBool(string name)
{ {
return Convert.ToBoolean(ReadSetting(name)); bool result = bool.TryParse(ReadSetting(name), out bool value);
if (result)
{
return value;
}
return false;
} }
public virtual void ReadSettingEvent() public virtual void ReadSettingEvent()
@ -271,7 +288,7 @@ namespace Novetus.Core
public override void ReadSettingEvent() public override void ReadSettingEvent()
{ {
FileManagement.ReloadLoadoutValue(); //FileManagement.ReloadLoadoutValue();
} }
} }
#endregion #endregion
@ -793,10 +810,7 @@ namespace Novetus.Core
GlobalVars.ProgramInformation.InitialBootup = Convert.ToBoolean(initialBootup); GlobalVars.ProgramInformation.InitialBootup = Convert.ToBoolean(initialBootup);
GlobalVars.ProgramInformation.VersionName = verNumber; GlobalVars.ProgramInformation.VersionName = verNumber;
GlobalVars.ProgramInformation.IsSnapshot = Convert.ToBoolean(isSnapshot); GlobalVars.ProgramInformation.IsSnapshot = Convert.ToBoolean(isSnapshot);
GlobalVars.UserConfiguration.SaveSetting("SelectedClient", GlobalVars.ProgramInformation.DefaultClient); RegisterDefaults();
GlobalVars.UserConfiguration.SaveSetting("Map", GlobalVars.ProgramInformation.DefaultMap);
GlobalVars.UserConfiguration.SaveSetting("MapPath", GlobalPaths.MapsDir + @"\\" + GlobalVars.ProgramInformation.DefaultMap);
GlobalVars.UserConfiguration.SaveSetting("MapPathSnip", GlobalPaths.MapsDirBase + @"\\" + GlobalVars.ProgramInformation.DefaultMap);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -805,6 +819,14 @@ namespace Novetus.Core
} }
} }
public static void RegisterDefaults()
{
GlobalVars.UserConfiguration.SaveSetting("SelectedClient", GlobalVars.ProgramInformation.DefaultClient);
GlobalVars.UserConfiguration.SaveSetting("Map", GlobalVars.ProgramInformation.DefaultMap);
GlobalVars.UserConfiguration.SaveSetting("MapPath", GlobalPaths.MapsDir + @"\\" + GlobalVars.ProgramInformation.DefaultMap);
GlobalVars.UserConfiguration.SaveSetting("MapPathSnip", GlobalPaths.MapsDirBase + @"\\" + GlobalVars.ProgramInformation.DefaultMap);
}
public static void TurnOffInitialSequence() public static void TurnOffInitialSequence()
{ {
//READ //READ

1
Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs
View File

@ -110,7 +110,6 @@ namespace Novetus.Core
#region File Names #region File Names
public static readonly string ConfigName = "config.ini"; public static readonly string ConfigName = "config.ini";
public static readonly string CMDConfigName = "config_cmd.ini";
public static string ConfigNameCustomization = "config_customization.ini"; public static string ConfigNameCustomization = "config_customization.ini";
public static readonly string InfoName = "info.ini"; public static readonly string InfoName = "info.ini";
public static readonly string ScriptName = "CSMPFunctions"; public static readonly string ScriptName = "CSMPFunctions";

14
Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs
View File

@ -79,7 +79,7 @@ namespace NovetusLauncher
void CheckBox1CheckedChanged(object sender, EventArgs e) void CheckBox1CheckedChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.CloseOnLaunch = checkBox1.Checked; GlobalVars.UserConfiguration.SaveSettingBool("CloseOnLaunch", checkBox1.Checked);
} }
void Button4Click(object sender, EventArgs e) void Button4Click(object sender, EventArgs e)
@ -179,7 +179,7 @@ namespace NovetusLauncher
void NumericUpDown3ValueChanged(object sender, EventArgs e) void NumericUpDown3ValueChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.PlayerLimit = Convert.ToInt32(numericUpDown3.Value); GlobalVars.UserConfiguration.SaveSettingInt("PlayerLimit", Convert.ToInt32(numericUpDown3.Value));
} }
void Button22Click(object sender, EventArgs e) void Button22Click(object sender, EventArgs e)
@ -199,7 +199,7 @@ namespace NovetusLauncher
void CheckBox4CheckedChanged(object sender, EventArgs e) void CheckBox4CheckedChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.UPnP = checkBox4.Checked; GlobalVars.UserConfiguration.SaveSettingBool("UPnP", checkBox4.Checked);
} }
void CheckBox4Click(object sender, EventArgs e) void CheckBox4Click(object sender, EventArgs e)
@ -225,7 +225,7 @@ namespace NovetusLauncher
private void checkBox2_CheckedChanged(object sender, EventArgs e) private void checkBox2_CheckedChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.DiscordRichPresence = checkBox2.Checked; GlobalVars.UserConfiguration.SaveSettingBool("DiscordRichPresence", checkBox2.Checked);
} }
void CheckBox2Click(object sender, EventArgs e) void CheckBox2Click(object sender, EventArgs e)
@ -266,17 +266,17 @@ namespace NovetusLauncher
private void checkBox9_CheckedChanged(object sender, EventArgs e) private void checkBox9_CheckedChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.ShowServerNotifications = checkBox9.Checked; GlobalVars.UserConfiguration.SaveSettingBool("ShowServerNotifications", checkBox9.Checked);
} }
private void textBox7_TextChanged(object sender, EventArgs e) private void textBox7_TextChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.ServerBrowserServerName = textBox7.Text; GlobalVars.UserConfiguration.SaveSetting("ServerBrowserServerName", textBox7.Text);
} }
private void textBox8_TextChanged(object sender, EventArgs e) private void textBox8_TextChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.ServerBrowserServerAddress = textBox8.Text; GlobalVars.UserConfiguration.SaveSetting("ServerBrowserServerAddress", textBox8.Text);
} }
private void textBox8_Click(object sender, EventArgs e) private void textBox8_Click(object sender, EventArgs e)

42
Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs
View File

@ -88,8 +88,8 @@ namespace NovetusLauncher
void CheckBox1CheckedChanged(object sender, EventArgs e) void CheckBox1CheckedChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.CloseOnLaunch = checkBox1.Checked; GlobalVars.UserConfiguration.SaveSettingBool("CloseOnLaunch", checkBox1.Checked);
} }
void Button4Click(object sender, EventArgs e) void Button4Click(object sender, EventArgs e)
{ {
@ -188,8 +188,8 @@ namespace NovetusLauncher
void NumericUpDown3ValueChanged(object sender, EventArgs e) void NumericUpDown3ValueChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.PlayerLimit = Convert.ToInt32(numericUpDown3.Value); GlobalVars.UserConfiguration.SaveSettingInt("PlayerLimit", Convert.ToInt32(numericUpDown3.Value));
} }
void Button22Click(object sender, EventArgs e) void Button22Click(object sender, EventArgs e)
{ {
@ -208,8 +208,8 @@ namespace NovetusLauncher
void CheckBox4CheckedChanged(object sender, EventArgs e) void CheckBox4CheckedChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.UPnP = checkBox4.Checked; GlobalVars.UserConfiguration.SaveSettingBool("UPnP", checkBox4.Checked);
} }
void CheckBox4Click(object sender, EventArgs e) void CheckBox4Click(object sender, EventArgs e)
{ {
@ -234,8 +234,8 @@ namespace NovetusLauncher
private void checkBox2_CheckedChanged(object sender, EventArgs e) private void checkBox2_CheckedChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.DiscordRichPresence = checkBox2.Checked; GlobalVars.UserConfiguration.SaveSettingBool("DiscordRichPresence", checkBox2.Checked);
} }
void CheckBox2Click(object sender, EventArgs e) void CheckBox2Click(object sender, EventArgs e)
{ {
@ -308,22 +308,22 @@ namespace NovetusLauncher
browser.Show(); browser.Show();
} }
private void checkBox9_CheckedChanged(object sender, EventArgs e) private void checkBox9_CheckedChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.ShowServerNotifications = checkBox9.Checked; GlobalVars.UserConfiguration.SaveSettingBool("ShowServerNotifications", checkBox9.Checked);
} }
private void textBox7_TextChanged(object sender, EventArgs e) private void textBox7_TextChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.ServerBrowserServerName = textBox7.Text; GlobalVars.UserConfiguration.SaveSetting("ServerBrowserServerName", textBox7.Text);
} }
private void textBox8_TextChanged(object sender, EventArgs e) private void textBox8_TextChanged(object sender, EventArgs e)
{ {
GlobalVars.UserConfiguration.ServerBrowserServerAddress = textBox8.Text; GlobalVars.UserConfiguration.SaveSetting("ServerBrowserServerAddress", textBox8.Text);
} }
private void textBox8_Click(object sender, EventArgs e) private void textBox8_Click(object sender, EventArgs e)
{ {
launcherForm.ShowMasterServerWarning(); launcherForm.ShowMasterServerWarning();
} }

97
Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
View File

@ -99,8 +99,8 @@ namespace NovetusLauncher
if (FormStyle == Settings.Style.Stylish) if (FormStyle == Settings.Style.Stylish)
{ {
Parent.Text = "Novetus " + GlobalVars.ProgramInformation.Version + " [CLIENT: " + Parent.Text = "Novetus " + GlobalVars.ProgramInformation.Version + " [CLIENT: " +
GlobalVars.UserConfiguration.SelectedClient + " | MAP: " + GlobalVars.UserConfiguration.ReadSetting("SelectedClient") + " | MAP: " +
GlobalVars.UserConfiguration.Map + "]"; GlobalVars.UserConfiguration.ReadSetting("Map") + "]";
} }
Splash splash = SplashReader.GetSplash(); Splash splash = SplashReader.GetSplash();
@ -175,11 +175,11 @@ namespace NovetusLauncher
{ {
WriteConfigValues(); WriteConfigValues();
} }
if (GlobalVars.UserConfiguration.DiscordRichPresence) if (GlobalVars.UserConfiguration.ReadSettingBool("DiscordRichPresence"))
{ {
IDiscordRPC.Shutdown(); IDiscordRPC.Shutdown();
} }
if (GlobalVars.UserConfiguration.WebProxyEnabled) if (GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
{ {
GlobalVars.Proxy.Stop(); GlobalVars.Proxy.Stop();
} }
@ -221,7 +221,7 @@ namespace NovetusLauncher
{ {
ClientBox.Items.Add(dir.Name); ClientBox.Items.Add(dir.Name);
} }
ClientBox.SelectedItem = GlobalVars.UserConfiguration.SelectedClient; ClientBox.SelectedItem = GlobalVars.UserConfiguration.ReadSetting("SelectedClient");
Tree.Nodes.Clear(); Tree.Nodes.Clear();
_TreeCache.Nodes.Clear(); _TreeCache.Nodes.Clear();
MapDescBox.Text = ""; MapDescBox.Text = "";
@ -354,7 +354,7 @@ namespace NovetusLauncher
break; break;
} }
if (GlobalVars.UserConfiguration.CloseOnLaunch && !GlobalVars.isConsoleOnly) if (GlobalVars.UserConfiguration.ReadSettingBool("CloseOnLaunch") && !GlobalVars.isConsoleOnly)
{ {
Parent.Visible = false; Parent.Visible = false;
} }
@ -374,7 +374,7 @@ namespace NovetusLauncher
switch (LocalVars.Clicks) switch (LocalVars.Clicks)
{ {
case 1: case 1:
SplashLabel.Text = "Hi " + GlobalVars.UserConfiguration.PlayerName + "!"; SplashLabel.Text = "Hi " + GlobalVars.UserConfiguration.ReadSetting("SelectedClient") + "!";
break; break;
case 3: case 3:
SplashLabel.Text = "How are you doing today?"; SplashLabel.Text = "How are you doing today?";
@ -452,7 +452,7 @@ namespace NovetusLauncher
{ {
ClientManagement.UpdateRichPresence(ClientManagement.GetStateForType(GlobalVars.GameOpened)); ClientManagement.UpdateRichPresence(ClientManagement.GetStateForType(GlobalVars.GameOpened));
if (GlobalVars.UserConfiguration.CloseOnLaunch) if (GlobalVars.UserConfiguration.ReadSettingBool("CloseOnLaunch"))
{ {
Parent.Visible = true; Parent.Visible = true;
} }
@ -548,21 +548,21 @@ namespace NovetusLauncher
case 0: case 0:
if (FormStyle != Settings.Style.Extended) if (FormStyle != Settings.Style.Extended)
{ {
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended; GlobalVars.UserConfiguration.SaveSettingInt("LauncherStyle", (int)Settings.Style.Extended);
RestartApp(); RestartApp();
} }
break; break;
case 1: case 1:
if (FormStyle != Settings.Style.Compact) if (FormStyle != Settings.Style.Compact)
{ {
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Compact; GlobalVars.UserConfiguration.SaveSettingInt("LauncherStyle", (int)Settings.Style.Compact);
RestartApp(); RestartApp();
} }
break; break;
case 2: case 2:
if (FormStyle != Settings.Style.Stylish) if (FormStyle != Settings.Style.Stylish)
{ {
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Stylish; GlobalVars.UserConfiguration.SaveSettingInt("LauncherStyle", (int)Settings.Style.Stylish);
RestartApp(); RestartApp();
} }
break; break;
@ -580,28 +580,26 @@ namespace NovetusLauncher
public void ReadConfigValues(bool initial = false) public void ReadConfigValues(bool initial = false)
{ {
FileManagement.Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, false); CloseOnLaunchCheckbox.Checked = GlobalVars.UserConfiguration.ReadSettingBool("CloseOnLaunch");
PlayerIDTextBox.Text = GlobalVars.UserConfiguration.ReadSetting("UserID");
CloseOnLaunchCheckbox.Checked = GlobalVars.UserConfiguration.CloseOnLaunch;
PlayerIDTextBox.Text = GlobalVars.UserConfiguration.UserID.ToString();
PlayerTripcodeLabel.Text = GlobalVars.PlayerTripcode.ToString(); PlayerTripcodeLabel.Text = GlobalVars.PlayerTripcode.ToString();
PlayerLimitBox.Value = Convert.ToDecimal(GlobalVars.UserConfiguration.PlayerLimit); PlayerLimitBox.Value = Convert.ToDecimal(GlobalVars.UserConfiguration.ReadSettingInt("PlayerLimit"));
PlayerNameTextBox.Text = GlobalVars.UserConfiguration.PlayerName; PlayerNameTextBox.Text = GlobalVars.UserConfiguration.ReadSetting("PlayerName");
SelectedClientLabel.Text = GlobalVars.UserConfiguration.SelectedClient; SelectedClientLabel.Text = GlobalVars.UserConfiguration.ReadSetting("SelectedClient");
SelectedMapLabel.Text = GlobalVars.UserConfiguration.Map; SelectedMapLabel.Text = GlobalVars.UserConfiguration.ReadSetting("Map");
Tree.SelectedNode = TreeNodeHelper.SearchTreeView(GlobalVars.UserConfiguration.Map, Tree.Nodes); Tree.SelectedNode = TreeNodeHelper.SearchTreeView(GlobalVars.UserConfiguration.ReadSetting("Map"), Tree.Nodes);
Tree.Focus(); Tree.Focus();
IPBox.Text = GlobalVars.CurrentServer.ToString(); IPBox.Text = GlobalVars.CurrentServer.ToString();
HostPortBox.Value = Convert.ToDecimal(GlobalVars.UserConfiguration.RobloxPort); HostPortBox.Value = Convert.ToDecimal(GlobalVars.UserConfiguration.ReadSettingInt("RobloxPort"));
IPLabel.Text = GlobalVars.CurrentServer.ServerIP; IPLabel.Text = GlobalVars.CurrentServer.ServerIP;
PortLabel.Text = GlobalVars.CurrentServer.ServerPort.ToString(); PortLabel.Text = GlobalVars.CurrentServer.ServerPort.ToString();
DiscordRichPresenceCheckbox.Checked = GlobalVars.UserConfiguration.DiscordRichPresence; DiscordRichPresenceCheckbox.Checked = GlobalVars.UserConfiguration.ReadSettingBool("DiscordRichPresence");
uPnPCheckBox.Checked = GlobalVars.UserConfiguration.UPnP; uPnPCheckBox.Checked = GlobalVars.UserConfiguration.ReadSettingBool("UPnP");
ShowServerNotifsCheckBox.Checked = GlobalVars.UserConfiguration.ShowServerNotifications; ShowServerNotifsCheckBox.Checked = GlobalVars.UserConfiguration.ReadSettingBool("ShowServerNotifications");
ServerBrowserNameBox.Text = GlobalVars.UserConfiguration.ServerBrowserServerName; ServerBrowserNameBox.Text = GlobalVars.UserConfiguration.ReadSetting("ServerBrowserServerName");
ServerBrowserAddressBox.Text = GlobalVars.UserConfiguration.ServerBrowserServerAddress; ServerBrowserAddressBox.Text = GlobalVars.UserConfiguration.ReadSetting("ServerBrowserServerAddress");
switch (GlobalVars.UserConfiguration.LauncherStyle) switch ((Settings.Style)GlobalVars.UserConfiguration.ReadSettingInt("LauncherStyle"))
{ {
case Settings.Style.Compact: case Settings.Style.Compact:
StyleSelectorBox.SelectedIndex = 1; StyleSelectorBox.SelectedIndex = 1;
@ -621,19 +619,18 @@ namespace NovetusLauncher
public void WriteConfigValues(bool ShowBox = false) public void WriteConfigValues(bool ShowBox = false)
{ {
FileManagement.Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, true); /*
ClientManagement.ReadClientValues(); ClientManagement.ReadClientValues();
Util.ConsolePrint("Config Saved.", 3); Util.ConsolePrint("Config Saved.", 3);
if (ShowBox) if (ShowBox)
{ {
MessageBox.Show("Config Saved!", "Novetus - Config Saved", MessageBoxButtons.OK, MessageBoxIcon.Information); MessageBox.Show("Config Saved!", "Novetus - Config Saved", MessageBoxButtons.OK, MessageBoxIcon.Information);
} }*/
} }
public void WriteCustomizationValues() public void WriteCustomizationValues()
{ {
FileManagement.Customization(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigNameCustomization, true); //Util.ConsolePrint("Config Saved.", 3);
Util.ConsolePrint("Config Saved.", 3);
} }
public void ResetConfigValuesInternal() public void ResetConfigValuesInternal()
@ -669,7 +666,7 @@ namespace NovetusLauncher
public bool GenerateIfInvalid() public bool GenerateIfInvalid()
{ {
string clientpath = GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\clientinfo.nov"; string clientpath = GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.ReadSetting("SelectedClient") + @"\\clientinfo.nov";
if (!File.Exists(clientpath)) if (!File.Exists(clientpath))
{ {
@ -682,7 +679,7 @@ namespace NovetusLauncher
{ {
Util.LogExceptions(ex); Util.LogExceptions(ex);
MessageBox.Show("Failed to generate default clientinfo.nov. Info: " + ex.Message + "\n\nLoading default client '" + GlobalVars.ProgramInformation.DefaultClient + "'", "Novetus - Client Info Generation Error", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Failed to generate default clientinfo.nov. Info: " + ex.Message + "\n\nLoading default client '" + GlobalVars.ProgramInformation.DefaultClient + "'", "Novetus - Client Info Generation Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
GlobalVars.UserConfiguration.SelectedClient = GlobalVars.ProgramInformation.DefaultClient; GlobalVars.UserConfiguration.SaveSetting("SelectedClient", GlobalVars.ProgramInformation.DefaultClient);
return false; return false;
} }
} }
@ -697,7 +694,7 @@ namespace NovetusLauncher
{ {
if (Tabs.SelectedTab == Tabs.TabPages[TabPageClients]) if (Tabs.SelectedTab == Tabs.TabPages[TabPageClients])
{ {
ClientBox.SelectedItem = GlobalVars.UserConfiguration.SelectedClient; ClientBox.SelectedItem = GlobalVars.UserConfiguration.ReadSetting("PlayerLimit");
} }
} }
@ -732,13 +729,13 @@ namespace NovetusLauncher
} }
ClientDescriptionBox.Text = GlobalVars.SelectedClientInfo.Description; ClientDescriptionBox.Text = GlobalVars.SelectedClientInfo.Description;
SelectedClientLabel.Text = GlobalVars.UserConfiguration.SelectedClient; SelectedClientLabel.Text = GlobalVars.UserConfiguration.ReadSetting("SelectedClient");
} }
public void GeneratePlayerID() public void GeneratePlayerID()
{ {
NovetusFuncs.GeneratePlayerID(); NovetusFuncs.GeneratePlayerID();
PlayerIDTextBox.Text = Convert.ToString(GlobalVars.UserConfiguration.UserID); PlayerIDTextBox.Text = GlobalVars.UserConfiguration.ReadSetting("UserID");
} }
public async void InstallAddon() public async void InstallAddon()
@ -807,7 +804,7 @@ namespace NovetusLauncher
string[] fileexts = new string[] { ".rbxl", ".rbxlx", ".bz2" }; string[] fileexts = new string[] { ".rbxl", ".rbxlx", ".bz2" };
TreeNodeHelper.ListDirectory(Tree, mapdir, fileexts); TreeNodeHelper.ListDirectory(Tree, mapdir, fileexts);
TreeNodeHelper.CopyNodes(Tree.Nodes, _TreeCache.Nodes); TreeNodeHelper.CopyNodes(Tree.Nodes, _TreeCache.Nodes);
Tree.SelectedNode = TreeNodeHelper.SearchTreeView(GlobalVars.UserConfiguration.Map, Tree.Nodes); Tree.SelectedNode = TreeNodeHelper.SearchTreeView(GlobalVars.UserConfiguration.ReadSetting("Map"), Tree.Nodes);
if (FormStyle == Settings.Style.Stylish) if (FormStyle == Settings.Style.Stylish)
{ {
Tree.SelectedNode.BackColor = SystemColors.Highlight; Tree.SelectedNode.BackColor = SystemColors.Highlight;
@ -855,13 +852,13 @@ namespace NovetusLauncher
{ {
if (Tree.SelectedNode.Nodes.Count == 0) if (Tree.SelectedNode.Nodes.Count == 0)
{ {
GlobalVars.UserConfiguration.Map = Tree.SelectedNode.Text.ToString(); GlobalVars.UserConfiguration.SaveSetting("Map", Tree.SelectedNode.Text.ToString());
GlobalVars.UserConfiguration.MapPathSnip = Tree.SelectedNode.FullPath.ToString().Replace(@"\", @"\\"); GlobalVars.UserConfiguration.SaveSetting("MapPathSnip", Tree.SelectedNode.FullPath.ToString().Replace(@"\", @"\\"));
GlobalVars.UserConfiguration.MapPath = GlobalPaths.BasePath + @"\\" + GlobalVars.UserConfiguration.MapPathSnip; GlobalVars.UserConfiguration.SaveSetting("MapPath", GlobalPaths.BasePath + @"\\" + GlobalVars.UserConfiguration.ReadSetting("MapPathSnip"));
if (FormStyle != Settings.Style.Stylish) if (FormStyle != Settings.Style.Stylish)
{ {
SelectedMapLabel.Text = GlobalVars.UserConfiguration.Map; SelectedMapLabel.Text = GlobalVars.UserConfiguration.ReadSetting("Map");
LoadMapDesc(); LoadMapDesc();
} }
} }
@ -968,7 +965,7 @@ namespace NovetusLauncher
public void ChangeServerPort() public void ChangeServerPort()
{ {
GlobalVars.UserConfiguration.RobloxPort = Convert.ToInt32(HostPortBox.Value); GlobalVars.UserConfiguration.SaveSettingInt("RobloxPort", Convert.ToInt32(HostPortBox.Value));
} }
public void ChangeClient() public void ChangeClient()
@ -991,13 +988,13 @@ namespace NovetusLauncher
if (ClientBox.SelectedItem == null) if (ClientBox.SelectedItem == null)
return; return;
string ourselectedclient = GlobalVars.UserConfiguration.SelectedClient; string ourselectedclient = GlobalVars.UserConfiguration.ReadSetting("SelectedClient");
GlobalVars.UserConfiguration.SelectedClient = ClientBox.SelectedItem.ToString(); GlobalVars.UserConfiguration.SaveSetting("SelectedClient", ClientBox.SelectedItem.ToString());
if (!string.IsNullOrWhiteSpace(ourselectedclient)) if (!string.IsNullOrWhiteSpace(ourselectedclient))
{ {
if (!ourselectedclient.Equals(GlobalVars.UserConfiguration.SelectedClient)) if (!ourselectedclient.Equals(GlobalVars.UserConfiguration.ReadSetting("SelectedClient")))
{ {
ReadClientValues(true); ReadClientValues(true);
} }
@ -1051,8 +1048,8 @@ namespace NovetusLauncher
public void ChangeName() public void ChangeName()
{ {
GlobalVars.UserConfiguration.PlayerName = PlayerNameTextBox.Text; GlobalVars.UserConfiguration.SaveSetting("PlayerName", PlayerNameTextBox.Text);
int autoNameID = GetSpecialNameID(GlobalVars.UserConfiguration.PlayerName); int autoNameID = GetSpecialNameID(GlobalVars.UserConfiguration.ReadSetting("PlayerName"));
if (LocalVars.launcherInitState == false && autoNameID > 0) if (LocalVars.launcherInitState == false && autoNameID > 0)
{ {
PlayerIDTextBox.Text = autoNameID.ToString(); PlayerIDTextBox.Text = autoNameID.ToString();
@ -1066,16 +1063,16 @@ namespace NovetusLauncher
{ {
if (PlayerIDTextBox.Text.Equals("")) if (PlayerIDTextBox.Text.Equals(""))
{ {
GlobalVars.UserConfiguration.UserID = 0; GlobalVars.UserConfiguration.SaveSettingInt("UserID", 0);
} }
else else
{ {
GlobalVars.UserConfiguration.UserID = Convert.ToInt32(PlayerIDTextBox.Text); GlobalVars.UserConfiguration.SaveSettingInt("UserID", Convert.ToInt32(PlayerIDTextBox.Text));
} }
} }
else else
{ {
GlobalVars.UserConfiguration.UserID = 0; GlobalVars.UserConfiguration.SaveSettingInt("UserID", 0);
} }
} }

41
Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs
View File

@ -105,14 +105,12 @@ namespace NovetusLauncher
public void ReadConfigValues(bool initial = false) public void ReadConfigValues(bool initial = false)
{ {
FileManagement.Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, false); launcherFormStylishInterface1.minimizeOnLaunchBox.IsChecked = GlobalVars.UserConfiguration.ReadSettingBool("CloseOnLaunch");
launcherFormStylishInterface1.userIDBox.Text = GlobalVars.UserConfiguration.ReadSetting("UserID");
launcherFormStylishInterface1.minimizeOnLaunchBox.IsChecked = GlobalVars.UserConfiguration.CloseOnLaunch;
launcherFormStylishInterface1.userIDBox.Text = GlobalVars.UserConfiguration.UserID.ToString();
launcherFormStylishInterface1.tripcodeLabel.Content = GlobalVars.PlayerTripcode.ToString(); launcherFormStylishInterface1.tripcodeLabel.Content = GlobalVars.PlayerTripcode.ToString();
launcherFormStylishInterface1.maxPlayersBox.Text = GlobalVars.UserConfiguration.PlayerLimit.ToString(); launcherFormStylishInterface1.maxPlayersBox.Text = GlobalVars.UserConfiguration.ReadSetting("PlayerLimit");
launcherFormStylishInterface1.userNameBox.Text = GlobalVars.UserConfiguration.PlayerName; launcherFormStylishInterface1.userNameBox.Text = GlobalVars.UserConfiguration.ReadSetting("PlayerName");
launcherFormStylishInterface1.mapsBox.SelectedNode = TreeNodeHelper.SearchTreeView(GlobalVars.UserConfiguration.Map, launcherFormStylishInterface1.mapsBox.Nodes); launcherFormStylishInterface1.mapsBox.SelectedNode = TreeNodeHelper.SearchTreeView(GlobalVars.UserConfiguration.ReadSetting("Map"), launcherFormStylishInterface1.mapsBox.Nodes);
launcherFormStylishInterface1.mapsBox.Focus(); launcherFormStylishInterface1.mapsBox.Focus();
//stupid fucking HACK because we aren't selecting it properly. //stupid fucking HACK because we aren't selecting it properly.
if (launcherFormStylishInterface1.mapsBox.SelectedNode != null) if (launcherFormStylishInterface1.mapsBox.SelectedNode != null)
@ -120,14 +118,14 @@ namespace NovetusLauncher
launcherFormStylishInterface1.mapsBox.SelectedNode.BackColor = SystemColors.Highlight; launcherFormStylishInterface1.mapsBox.SelectedNode.BackColor = SystemColors.Highlight;
launcherFormStylishInterface1.mapsBox.SelectedNode.ForeColor = SystemColors.HighlightText; launcherFormStylishInterface1.mapsBox.SelectedNode.ForeColor = SystemColors.HighlightText;
} }
launcherFormStylishInterface1.serverPortBox.Text = GlobalVars.UserConfiguration.RobloxPort.ToString(); launcherFormStylishInterface1.serverPortBox.Text = GlobalVars.UserConfiguration.ReadSetting("RobloxPort");
launcherFormStylishInterface1.discordRichPresenceBox.IsChecked = GlobalVars.UserConfiguration.DiscordRichPresence; launcherFormStylishInterface1.discordRichPresenceBox.IsChecked = GlobalVars.UserConfiguration.ReadSettingBool("DiscordRichPresence");
launcherFormStylishInterface1.uPnPBox.IsChecked = GlobalVars.UserConfiguration.UPnP; launcherFormStylishInterface1.uPnPBox.IsChecked = GlobalVars.UserConfiguration.ReadSettingBool("UPnP");
launcherFormStylishInterface1.NotifBox.IsChecked = GlobalVars.UserConfiguration.ShowServerNotifications; launcherFormStylishInterface1.NotifBox.IsChecked = GlobalVars.UserConfiguration.ReadSettingBool("ShowServerNotifications");
launcherFormStylishInterface1.browserNameBox.Text = GlobalVars.UserConfiguration.ServerBrowserServerName; launcherFormStylishInterface1.browserNameBox.Text = GlobalVars.UserConfiguration.ReadSetting("ServerBrowserServerName");
launcherFormStylishInterface1.browserAddressBox.Text = GlobalVars.UserConfiguration.ServerBrowserServerAddress; launcherFormStylishInterface1.browserAddressBox.Text = GlobalVars.UserConfiguration.ReadSetting("ServerBrowserServerAddress");
switch (GlobalVars.UserConfiguration.LauncherStyle) switch ((Settings.Style)GlobalVars.UserConfiguration.ReadSettingInt("LauncherStyle"))
{ {
case Settings.Style.Compact: case Settings.Style.Compact:
launcherFormStylishInterface1.styleBox.SelectedIndex = 1; launcherFormStylishInterface1.styleBox.SelectedIndex = 1;
@ -146,12 +144,11 @@ namespace NovetusLauncher
public void WriteConfigValues(bool ShowBox = false) public void WriteConfigValues(bool ShowBox = false)
{ {
FileManagement.Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, true); //ReadClientValues();
ReadClientValues(); //if (ShowBox)
if (ShowBox) //{
{ //MessageBox.Show("Config Saved!", "Novetus - Config Saved", MessageBoxButtons.OK, MessageBoxIcon.Information);
MessageBox.Show("Config Saved!", "Novetus - Config Saved", MessageBoxButtons.OK, MessageBoxIcon.Information); //}
}
} }
public void ResetConfigValues(bool ShowBox = false) public void ResetConfigValues(bool ShowBox = false)
@ -174,7 +171,7 @@ namespace NovetusLauncher
{ {
foreach (object o in launcherFormStylishInterface1.clientListBox.Items) foreach (object o in launcherFormStylishInterface1.clientListBox.Items)
{ {
if ((o is ClientListItem) && (o as ClientListItem).ClientName.Contains(GlobalVars.UserConfiguration.SelectedClient)) if ((o is ClientListItem) && (o as ClientListItem).ClientName.Contains(GlobalVars.UserConfiguration.ReadSetting("SelectedClient")))
{ {
launcherFormStylishInterface1.clientListBox.SelectedItem = o; launcherFormStylishInterface1.clientListBox.SelectedItem = o;
break; break;
@ -199,7 +196,7 @@ namespace NovetusLauncher
launcherFormStylishInterface1.clientWarningBox.Text = "No warnings provided."; launcherFormStylishInterface1.clientWarningBox.Text = "No warnings provided.";
} }
launcherFormStylishInterface1.clientDescBox.Text = GlobalVars.UserConfiguration.SelectedClient + ": " + GlobalVars.SelectedClientInfo.Description; launcherFormStylishInterface1.clientDescBox.Text = GlobalVars.UserConfiguration.ReadSetting("SelectedClient") + ": " + GlobalVars.SelectedClientInfo.Description;
} }
#endregion #endregion
} }

52
Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs
View File

@ -76,7 +76,7 @@ namespace NovetusLauncher
foreach (object o in clientListBox.Items) foreach (object o in clientListBox.Items)
{ {
if ((o is ClientListItem) && (o as ClientListItem).ClientName.Contains(GlobalVars.UserConfiguration.SelectedClient)) if ((o is ClientListItem) && (o as ClientListItem).ClientName.Contains(GlobalVars.UserConfiguration.ReadSetting("SelectedClient")))
{ {
clientListBox.SelectedItem = o; clientListBox.SelectedItem = o;
break; break;
@ -139,8 +139,8 @@ namespace NovetusLauncher
LoadMapDesc(); LoadMapDesc();
FormParent.Text = "Novetus " + GlobalVars.ProgramInformation.Version + " [CLIENT: " + FormParent.Text = "Novetus " + GlobalVars.ProgramInformation.Version + " [CLIENT: " +
GlobalVars.UserConfiguration.SelectedClient + " | MAP: " + GlobalVars.UserConfiguration.ReadSetting("SelectedClient") + " | MAP: " +
GlobalVars.UserConfiguration.Map + "]"; GlobalVars.UserConfiguration.ReadSetting("Map") + "]";
} }
private void clientListBox_SelectionChanged(object sender, SelectionChangedEventArgs e) private void clientListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
@ -166,14 +166,14 @@ namespace NovetusLauncher
if (clientListBox.SelectedItem == null) if (clientListBox.SelectedItem == null)
return; return;
string ourselectedclient = GlobalVars.UserConfiguration.SelectedClient; string ourselectedclient = GlobalVars.UserConfiguration.ReadSetting("SelectedClient");
ClientListItem cli = (ClientListItem)clientListBox.SelectedItem ?? null; ClientListItem cli = (ClientListItem)clientListBox.SelectedItem ?? null;
GlobalVars.UserConfiguration.SelectedClient = (cli != null) ? cli.ToString() : ""; GlobalVars.UserConfiguration.SaveSetting("SelectedClient", (cli != null) ? cli.ToString() : "");
if (!string.IsNullOrWhiteSpace(ourselectedclient)) if (!string.IsNullOrWhiteSpace(ourselectedclient))
{ {
if (!ourselectedclient.Equals(GlobalVars.UserConfiguration.SelectedClient)) if (!ourselectedclient.Equals(GlobalVars.UserConfiguration.ReadSetting("SelectedClient")))
{ {
FormParent.ReadClientValues(true); FormParent.ReadClientValues(true);
} }
@ -188,8 +188,8 @@ namespace NovetusLauncher
} }
FormParent.Text = "Novetus " + GlobalVars.ProgramInformation.Version + " [CLIENT: " + FormParent.Text = "Novetus " + GlobalVars.ProgramInformation.Version + " [CLIENT: " +
GlobalVars.UserConfiguration.SelectedClient + " | MAP: " + GlobalVars.UserConfiguration.ReadSetting("SelectedClient") + " | MAP: " +
GlobalVars.UserConfiguration.Map + "]"; GlobalVars.UserConfiguration.ReadSetting("Map") + "]";
ClientManagement.UpdateRichPresence(ClientManagement.GetStateForType(GlobalVars.GameOpened)); ClientManagement.UpdateRichPresence(ClientManagement.GetStateForType(GlobalVars.GameOpened));
@ -250,7 +250,7 @@ namespace NovetusLauncher
private void regenerateIDButton_Click(object sender, RoutedEventArgs e) private void regenerateIDButton_Click(object sender, RoutedEventArgs e)
{ {
NovetusFuncs.GeneratePlayerID(); NovetusFuncs.GeneratePlayerID();
userIDBox.Text = Convert.ToString(GlobalVars.UserConfiguration.UserID); userIDBox.Text = GlobalVars.UserConfiguration.ReadSetting("UserID");
} }
private void addMapButton_Click(object sender, RoutedEventArgs e) private void addMapButton_Click(object sender, RoutedEventArgs e)
@ -292,8 +292,8 @@ namespace NovetusLauncher
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.PlayerName = userNameBox.Text; GlobalVars.UserConfiguration.SaveSetting("PlayerName", userNameBox.Text);
int autoNameID = launcherForm.GetSpecialNameID(GlobalVars.UserConfiguration.PlayerName); int autoNameID = launcherForm.GetSpecialNameID(GlobalVars.UserConfiguration.ReadSetting("PlayerName"));
if (LocalVars.launcherInitState == false && autoNameID > 0) if (LocalVars.launcherInitState == false && autoNameID > 0)
{ {
userIDBox.Text = autoNameID.ToString(); userIDBox.Text = autoNameID.ToString();
@ -310,16 +310,16 @@ namespace NovetusLauncher
{ {
if (userIDBox.Text.Equals("")) if (userIDBox.Text.Equals(""))
{ {
GlobalVars.UserConfiguration.UserID = 0; GlobalVars.UserConfiguration.SaveSettingInt("UserID", 0);
} }
else else
{ {
GlobalVars.UserConfiguration.UserID = Convert.ToInt32(userIDBox.Text); GlobalVars.UserConfiguration.SaveSettingInt("UserID", Convert.ToInt32(userIDBox.Text));
} }
} }
else else
{ {
GlobalVars.UserConfiguration.UserID = 0; GlobalVars.UserConfiguration.SaveSettingInt("UserID", 0);
} }
} }
@ -334,70 +334,70 @@ namespace NovetusLauncher
{ {
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.RobloxPort = Convert.ToInt32(serverPortBox.Text); GlobalVars.UserConfiguration.SaveSettingInt("RobloxPort", Convert.ToInt32(serverPortBox.Text));
} }
private void maxPlayersBox_TextChanged(object sender, TextChangedEventArgs e) private void maxPlayersBox_TextChanged(object sender, TextChangedEventArgs e)
{ {
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.PlayerLimit = Convert.ToInt32(maxPlayersBox.Text); GlobalVars.UserConfiguration.SaveSettingInt("PlayerLimit", Convert.ToInt32(maxPlayersBox.Text));
} }
private void uPnPBox_Checked(object sender, RoutedEventArgs e) private void uPnPBox_Checked(object sender, RoutedEventArgs e)
{ {
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.UPnP = (bool)uPnPBox.IsChecked; GlobalVars.UserConfiguration.SaveSettingBool("UPnP", (bool)uPnPBox.IsChecked);
} }
private void uPnPBox_Unchecked(object sender, RoutedEventArgs e) private void uPnPBox_Unchecked(object sender, RoutedEventArgs e)
{ {
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.UPnP = (bool)uPnPBox.IsChecked; GlobalVars.UserConfiguration.SaveSettingBool("UPnP", (bool)uPnPBox.IsChecked);
} }
private void NotifBox_Checked(object sender, RoutedEventArgs e) private void NotifBox_Checked(object sender, RoutedEventArgs e)
{ {
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.ShowServerNotifications = (bool)NotifBox.IsChecked; GlobalVars.UserConfiguration.SaveSettingBool("ShowServerNotifications", (bool)NotifBox.IsChecked);
} }
private void NotifBox_Unchecked(object sender, RoutedEventArgs e) private void NotifBox_Unchecked(object sender, RoutedEventArgs e)
{ {
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.ShowServerNotifications = (bool)NotifBox.IsChecked; GlobalVars.UserConfiguration.SaveSettingBool("ShowServerNotifications", (bool)NotifBox.IsChecked);
} }
private void browserNameBox_TextChanged(object sender, TextChangedEventArgs e) private void browserNameBox_TextChanged(object sender, TextChangedEventArgs e)
{ {
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.ServerBrowserServerName = browserNameBox.Text; GlobalVars.UserConfiguration.SaveSetting("ServerBrowserServerName", browserNameBox.Text);
} }
private void browserAddressBox_TextChanged(object sender, TextChangedEventArgs e) private void browserAddressBox_TextChanged(object sender, TextChangedEventArgs e)
{ {
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.ServerBrowserServerAddress = browserAddressBox.Text; GlobalVars.UserConfiguration.SaveSetting("ServerBrowserServerAddress", browserAddressBox.Text);
} }
private void discordRichPresenceBox_Checked(object sender, RoutedEventArgs e) private void discordRichPresenceBox_Checked(object sender, RoutedEventArgs e)
{ {
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.DiscordRichPresence = (bool)discordRichPresenceBox.IsChecked; GlobalVars.UserConfiguration.SaveSettingBool("DiscordRichPresence", (bool)discordRichPresenceBox.IsChecked);
} }
private void discordRichPresenceBox_Unchecked(object sender, RoutedEventArgs e) private void discordRichPresenceBox_Unchecked(object sender, RoutedEventArgs e)
{ {
if (!IsLoaded) if (!IsLoaded)
return; return;
GlobalVars.UserConfiguration.DiscordRichPresence = (bool)discordRichPresenceBox.IsChecked; GlobalVars.UserConfiguration.SaveSettingBool("DiscordRichPresence", (bool)discordRichPresenceBox.IsChecked);
} }
private void minimizeOnLaunchBox_Checked(object sender, RoutedEventArgs e) private void minimizeOnLaunchBox_Checked(object sender, RoutedEventArgs e)
@ -482,11 +482,11 @@ namespace NovetusLauncher
switch (styleBox.SelectedIndex) switch (styleBox.SelectedIndex)
{ {
case 0: case 0:
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended; GlobalVars.UserConfiguration.SaveSettingInt("LauncherStyle", (int)Settings.Style.Extended);
launcherForm.RestartApp(); launcherForm.RestartApp();
break; break;
case 1: case 1:
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Compact; GlobalVars.UserConfiguration.SaveSettingInt("LauncherStyle", (int)Settings.Style.Compact);
launcherForm.RestartApp(); launcherForm.RestartApp();
break; break;
default: default:

25
Novetus/NovetusLauncher/Forms/NovetusConsole.cs
View File

@ -85,22 +85,7 @@ namespace NovetusLauncher
return; return;
} }
string CFGName = GlobalPaths.CMDConfigName; cmdConfig = GlobalVars.UserConfiguration;
if (ConsoleArgs["configname"] != null)
{
CFGName = ConsoleArgs["configname"];
}
if (ConsoleArgs["confignooverride"] == null)
{
cmdConfig = new FileFormat.Config(CFGName);
GlobalVars.UserConfiguration = cmdConfig;
}
else
{
cmdConfig = GlobalVars.UserConfiguration;
}
//disableCommands = true; //disableCommands = true;
bool no3d = false; bool no3d = false;
@ -570,14 +555,6 @@ namespace NovetusLauncher
{ {
CommandLineArguments.Arguments ConsoleArgs = new CommandLineArguments.Arguments(argList); CommandLineArguments.Arguments ConsoleArgs = new CommandLineArguments.Arguments(argList);
if (ConsoleArgs["confignodelete"] == null || ConsoleArgs["confignooverride"] == null)
{
if (File.Exists(cmdConfig.FullPath))
{
Util.FixedFileDelete(cmdConfig.FullPath);
}
}
ConsoleForm.CloseEvent(e); ConsoleForm.CloseEvent(e);
} }
} }