misc. fixes
This commit is contained in:
parent
d14d39ca58
commit
8093437cf7
|
|
@ -2172,10 +2172,15 @@ public class GlobalFuncs
|
||||||
ConsolePrint("ERROR - Failed to launch Novetus. (The client has been detected as modified.)", 2);
|
ConsolePrint("ERROR - Failed to launch Novetus. (The client has been detected as modified.)", 2);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if URI || LAUNCHER
|
#if LAUNCHER
|
||||||
MessageBox.Show("Failed to launch Novetus. (Error: The client has been detected as modified.)", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show("Failed to launch Novetus. (Error: The client has been detected as modified.)", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if URI
|
||||||
|
throw new IOException("The client has been detected as modified.");
|
||||||
|
#else
|
||||||
return;
|
return;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -2267,10 +2272,15 @@ public class GlobalFuncs
|
||||||
ConsolePrint("ERROR - Failed to launch Novetus. (The client has been detected as modified.)", 2);
|
ConsolePrint("ERROR - Failed to launch Novetus. (The client has been detected as modified.)", 2);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if URI || LAUNCHER
|
#if LAUNCHER
|
||||||
MessageBox.Show("Failed to launch Novetus. (Error: The client has been detected as modified.)", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show("Failed to launch Novetus. (Error: The client has been detected as modified.)", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if URI
|
||||||
|
throw new IOException("The client has been detected as modified.");
|
||||||
|
#else
|
||||||
return;
|
return;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -2335,6 +2345,11 @@ public class GlobalFuncs
|
||||||
#if URI || LAUNCHER || CMD || BASICLAUNCHER
|
#if URI || LAUNCHER || CMD || BASICLAUNCHER
|
||||||
LogExceptions(ex);
|
LogExceptions(ex);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if URI
|
||||||
|
//toss the exception back to the URI
|
||||||
|
throw new Exception(ex.Message);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,6 @@ namespace NovetusURI
|
||||||
this.label1.Name = "label1";
|
this.label1.Name = "label1";
|
||||||
this.label1.Size = new System.Drawing.Size(291, 21);
|
this.label1.Size = new System.Drawing.Size(291, 21);
|
||||||
this.label1.TabIndex = 2;
|
this.label1.TabIndex = 2;
|
||||||
this.label1.Text = "Initializing...";
|
|
||||||
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
||||||
//
|
//
|
||||||
// LoaderForm
|
// LoaderForm
|
||||||
|
|
|
||||||
|
|
@ -69,19 +69,36 @@ namespace NovetusURI
|
||||||
#region Form Events
|
#region Form Events
|
||||||
void LoaderFormLoad(object sender, EventArgs e)
|
void LoaderFormLoad(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
|
GlobalFuncs.UpdateStatus(label1, "Initializing...");
|
||||||
|
|
||||||
if (GlobalVars.UserConfiguration.URIQuickConfigure)
|
if (GlobalVars.UserConfiguration.URIQuickConfigure)
|
||||||
{
|
{
|
||||||
GlobalFuncs.UpdateStatus(label1, "Loading Player Configuration Menu....");
|
GlobalFuncs.UpdateStatus(label1, "Loading Player Configuration Menu....");
|
||||||
QuickConfigure main = new QuickConfigure();
|
QuickConfigure main = new QuickConfigure();
|
||||||
main.ShowDialog();
|
main.ShowDialog();
|
||||||
System.Threading.Timer timer = new System.Threading.Timer(new TimerCallback(CheckIfFinished), null, 1, 0);
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GlobalFuncs.Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, true);
|
||||||
|
GlobalFuncs.ReadClientValues();
|
||||||
|
LocalVars.ReadyToLaunch = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
System.Threading.Timer timer = new System.Threading.Timer(new TimerCallback(CheckIfFinished), null, 1, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void StartGame()
|
void StartGame()
|
||||||
{
|
{
|
||||||
GlobalFuncs.LaunchRBXClient(ScriptType.Client, false, true, new EventHandler(ClientExited), label1);
|
try
|
||||||
Visible = false;
|
{
|
||||||
|
GlobalFuncs.LaunchRBXClient(ScriptType.Client, false, true, new EventHandler(ClientExited), label1);
|
||||||
|
Visible = false;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
GlobalFuncs.LogExceptions(ex);
|
||||||
|
Close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ClientExited(object sender, EventArgs e)
|
void ClientExited(object sender, EventArgs e)
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,7 @@
|
||||||
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
iVBORw0KGgoAAAANSUhEUgAAAfQAAAH0CAYAAADL1t+KAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
|
iVBORw0KGgoAAAANSUhEUgAAAfQAAAH0CAYAAADL1t+KAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
|
||||||
wwAADsMBx2+oZAAA/7JJREFUeF7s/Qd0XPl15/vW2KNgyUGyLUuWZMlxbI+zFS2p1c2IDFREKISqQgVk
|
wgAADsIBFShKgAAA/7JJREFUeF7s/Qd0XPl15/vW2KNgyUGyLUuWZMlxbI+zFS2p1c2IDFREKISqQgVk
|
||||||
5swOCq1gxc6JbLKbbOYckSNjk52jWmrZ9773/NZLvvd6ZrzefTP3Yr/f/odz/ufUKQDsLops6b/X+q4K
|
5swOCq1gxc6JbLKbbOYckSNjk52jWmrZ9773/NZLvvd6ZrzefTP3Yr/f/odz/ufUKQDsLops6b/X+q4K
|
||||||
AMEWxKoP9qlCVciOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt2
|
AMEWxKoP9qlCVciOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt2
|
||||||
7NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eO
|
7NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eOHTt27NixY8eO
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ namespace NovetusURI
|
||||||
void ReadConfigValues(string cfgpath)
|
void ReadConfigValues(string cfgpath)
|
||||||
{
|
{
|
||||||
GlobalFuncs.Config(cfgpath, false);
|
GlobalFuncs.Config(cfgpath, false);
|
||||||
DontShowBox.Checked = GlobalVars.UserConfiguration.URIQuickConfigure;
|
DontShowBox.Checked = !GlobalVars.UserConfiguration.URIQuickConfigure;
|
||||||
IDBox.Text = GlobalVars.UserConfiguration.UserID.ToString();
|
IDBox.Text = GlobalVars.UserConfiguration.UserID.ToString();
|
||||||
TripcodeLabel.Text = GlobalVars.PlayerTripcode.ToString();
|
TripcodeLabel.Text = GlobalVars.PlayerTripcode.ToString();
|
||||||
NameBox.Text = GlobalVars.UserConfiguration.PlayerName;
|
NameBox.Text = GlobalVars.UserConfiguration.PlayerName;
|
||||||
|
|
@ -81,7 +81,7 @@ namespace NovetusURI
|
||||||
|
|
||||||
private void DontShowBox_CheckedChanged(object sender, EventArgs e)
|
private void DontShowBox_CheckedChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
GlobalVars.UserConfiguration.URIQuickConfigure = DontShowBox.Checked;
|
GlobalVars.UserConfiguration.URIQuickConfigure = !DontShowBox.Checked;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QuickConfigureClose(object sender, CancelEventArgs e)
|
void QuickConfigureClose(object sender, CancelEventArgs e)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue