diff --git a/MudEngine/WinPC_Engine/Game/Characters/MyCharacter.cs b/MudEngine/WinPC_Engine/Game/Characters/MyCharacter.cs deleted file mode 100644 index 695c3f9..0000000 --- a/MudEngine/WinPC_Engine/Game/Characters/MyCharacter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -using MudEngine.Game; - -namespace MudEngine.Game.Characters -{ - class MyCharacter : StandardCharacter - { - public int Age { get; set; } - - public MyCharacter(StandardGame game, String name, String desc) - : base(game, name, desc) - { - } - - public override bool Save(string filename) - { - base.Save(filename, true); - - this.SaveData.AddSaveData("Age", Age.ToString()); - return this.SaveData.Save(filename); - } - } -} diff --git a/MudEngine/WinPC_Engine/Game/Characters/StandardCharacter.cs b/MudEngine/WinPC_Engine/Game/Characters/StandardCharacter.cs index 2ff7030..06dc9f4 100644 --- a/MudEngine/WinPC_Engine/Game/Characters/StandardCharacter.cs +++ b/MudEngine/WinPC_Engine/Game/Characters/StandardCharacter.cs @@ -167,11 +167,16 @@ namespace MudEngine.Game.Characters try { this.Immovable = Convert.ToBoolean(this.SaveData.GetData("Immovable")); } catch { this.LoadFailedMessage("Immovable"); } - this.Password = this.SaveData.GetData("Password"); + try { this.Password = this.SaveData.GetData("Password"); } + catch { this.LoadFailedMessage("Password"); } - String role = this.SaveData.GetData("Role"); + try + { + String role = this.SaveData.GetData("Role"); - this.Role = GetRole(role); + this.Role = GetRole(role); + } + catch { this.LoadFailedMessage("Role"); } } #endregion diff --git a/MudEngine/WinPC_Engine/Game/Environment/Environment.cs b/MudEngine/WinPC_Engine/Game/Environment/Environment.cs index 1162004..8f1e9a9 100644 --- a/MudEngine/WinPC_Engine/Game/Environment/Environment.cs +++ b/MudEngine/WinPC_Engine/Game/Environment/Environment.cs @@ -74,11 +74,16 @@ namespace MudEngine.Game.Environment try { this.Filename = this.SaveData.GetData("Filename"); } catch { LoadFailedMessage("Filename"); } - this.Enabled = Convert.ToBoolean(this.SaveData.GetData("Enabled")); + try { this.Enabled = Convert.ToBoolean(this.SaveData.GetData("Enabled")); } + catch { this.LoadFailedMessage("Enabled");} - String role = this.SaveData.GetData("RequiredRole"); + try + { + String role = this.SaveData.GetData("RequiredRole"); - this.RequiredRole = CharacterRole.GetRole(role); + this.RequiredRole = CharacterRole.GetRole(role); + } + catch { this.LoadFailedMessage("RequiredRole"); } } public void Update() diff --git a/MudEngine/WinPC_Engine/GameScripts/BaseScript.cs b/MudEngine/WinPC_Engine/GameScripts/BaseScript.cs index 1eb5b28..ec5dc85 100644 --- a/MudEngine/WinPC_Engine/GameScripts/BaseScript.cs +++ b/MudEngine/WinPC_Engine/GameScripts/BaseScript.cs @@ -67,22 +67,19 @@ namespace MudEngine.GameScripts public virtual void Load(String filename) { - try - { - if (!File.Exists(filename)) - return; - this.SaveData.Load(filename); - - this.Name = this.SaveData.GetData("Name"); - this.ID = this.SaveData.GetData("ID"); - this.Description = this.SaveData.GetData("Description"); - } - catch (Exception ex) - { - Logger.WriteLine(ex.Message); + if (!File.Exists(filename)) return; - } - return; + + this.SaveData.Load(filename); + + try { this.Name = this.SaveData.GetData("Name"); } + catch { this.LoadFailedMessage("Name"); } + + try { this.ID = this.SaveData.GetData("ID"); } + catch { this.LoadFailedMessage("ID"); } + + try { this.Description = this.SaveData.GetData("Description"); } + catch { this.LoadFailedMessage("Description"); } } public void LoadFailedMessage(String property) diff --git a/MudEngine/WinPC_Engine/WinPC_Engine.csproj b/MudEngine/WinPC_Engine/WinPC_Engine.csproj index 3c7a9ee..c7fcf73 100644 --- a/MudEngine/WinPC_Engine/WinPC_Engine.csproj +++ b/MudEngine/WinPC_Engine/WinPC_Engine.csproj @@ -78,7 +78,6 @@ -