From 1bac98a47e30f211bce015cb8baf0e9fc650611c Mon Sep 17 00:00:00 2001 From: Scionwest_cp Date: Tue, 24 Nov 2009 16:10:36 -0800 Subject: [PATCH] Currency Editor: * Program.cs - Removed test code. Mud Designer: * Program.cs - Message box added informing developers why the editors wont launch if the source is not placed in the _InstallLocation. Mud Engine: * Now includes a reference to the ManagedScripting assembly. * BaseObject.cs - Added ScriptObject property. Visual Designer: * frmDesigner.cs - Removed File->Close test save code. --- CurrencyEditor/Program.cs | 14 ++++++++++++++ MUDEngine/MUDEngine.csproj | 4 ++++ MUDEngine/Objects/BaseObject.cs | 6 ++++++ MudDesigner/Program.cs | 18 +++++++++++++++++- VisualDesigner/frmDesigner.cs | 4 ---- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/CurrencyEditor/Program.cs b/CurrencyEditor/Program.cs index d798248..6fea6d9 100644 --- a/CurrencyEditor/Program.cs +++ b/CurrencyEditor/Program.cs @@ -22,3 +22,17 @@ namespace CurrencyEditor } } } + +namespace Project2 +{ + public class MyClass + { + public string DoSomething(string argument1, string argument2) + { + if (!argument1.Equals(argument2)) + return "The two arguments are different"; + else + return "The two arguments are the same"; + } + } +} \ No newline at end of file diff --git a/MUDEngine/MUDEngine.csproj b/MUDEngine/MUDEngine.csproj index 32030de..a2ea3a5 100644 --- a/MUDEngine/MUDEngine.csproj +++ b/MUDEngine/MUDEngine.csproj @@ -31,6 +31,10 @@ 4 + + False + ..\ManagedScriptingWIN.dll + 3.5 diff --git a/MUDEngine/Objects/BaseObject.cs b/MUDEngine/Objects/BaseObject.cs index 9c17884..21bc309 100644 --- a/MUDEngine/Objects/BaseObject.cs +++ b/MUDEngine/Objects/BaseObject.cs @@ -23,5 +23,11 @@ namespace MUDEngine.Objects get; set; } + + public ManagedScripting.ScriptObject Script + { + get; + set; + } } } diff --git a/MudDesigner/Program.cs b/MudDesigner/Program.cs index 19faa82..be66087 100644 --- a/MudDesigner/Program.cs +++ b/MudDesigner/Program.cs @@ -31,7 +31,23 @@ namespace MudDesigner //If running in debug mode we need to hard-code the paths as during normal running of the apps //all of the apps are running within the Apps directory. #if DEBUG - string[] apps = System.IO.Directory.GetFiles(_InstallLocation, "*.exe", System.IO.SearchOption.AllDirectories); + string[] apps = new string[] { }; + try + { + apps = System.IO.Directory.GetFiles(_InstallLocation, "*.exe", System.IO.SearchOption.AllDirectories); + } + catch + { + MessageBox.Show("Error: The directory '" + _InstallLocation + "' does not exist!\n\n" + + "The engine has a #DEBUG constant defined in the project properties." + + "\nIf you are wanting to run the Designer from within Visual Studio, please change the\n" + + "MudDesigner.Program._InstallLocation Field to the current ROOT directory of your source code." + + "\n\nIf you are running a Release build of the engine, with all of the editors contained within the" + + " same directory, then edit the MudDesigner project properties to remove the #DEBUG constant." + + "\n" + appName + " will not load.", + "Mud Designer", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } List legalApps = new List(); foreach (string app in apps) diff --git a/VisualDesigner/frmDesigner.cs b/VisualDesigner/frmDesigner.cs index 293a0f0..077841c 100644 --- a/VisualDesigner/frmDesigner.cs +++ b/VisualDesigner/frmDesigner.cs @@ -45,10 +45,6 @@ namespace VisualDesigner /// private void closeToolStripMenuItem_Click(object sender, EventArgs e) { - foreach (ScriptObject obj in engine.GetObjects()) - { - XmlSerialization.Save(obj.Name + ".xml", obj); - } Application.Exit(); }