Added check for invalid shield/sword gfx options (older version confi…

…gs could have it "wrong" because of deleted options) (#49)
Zarby89 · Oct 31, 2017 · b8323a9 · b8323a9
1 parent 65f712e
commit b8323a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/EnemizerGui/EnemizerForm.cs b/EnemizerGui/EnemizerForm.cs
@@ -292,7 +292,16 @@ private void UpdateExtrasTabUIFromConfig()
 
  private void UpdateGraphicsTabUIFromConfig()
  {
+ if((int)config.OptionFlags.SwordGraphics > swordGraphicsCombobox.Items.Count)
+ {
+ config.OptionFlags.SwordGraphics = SwordTypes.Normal;
+ }
  swordGraphicsCombobox.SelectedIndex = (int)config.OptionFlags.SwordGraphics;
+
+ if((int)config.OptionFlags.ShieldGraphics >= shieldSpriteCombobox.Items.Count)
+ {
+ config.OptionFlags.ShieldGraphics = ShieldTypes.Normal;
+ }
  shieldSpriteCombobox.SelectedIndex = (int)config.OptionFlags.ShieldGraphics;
  }
 

diff --git a/EnemizerLibrary/Version.cs b/EnemizerLibrary/Version.cs
@@ -10,7 +10,7 @@ public class Version
  {
  public const int MajorVersion = 6;
  public const int MinorVersion = 0;
- public const int BuildNumber = 10; // max 99 to show up in rom
+ public const int BuildNumber = 11; // max 99 to show up in rom
  public static string CurrentVersion = $"{MajorVersion}.{MinorVersion}.{BuildNumber.ToString("D2")}";
  public static bool CheckUpdate()
  {

diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
@@ -178,7 +178,7 @@
  {
  "AssemblyRegister" = "3:1"
  "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:EnemizerLibrary, Version=6.0.6509.34204, Culture=neutral, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:EnemizerLibrary, Version=6.0.6513.191, Culture=neutral, processorArchitecture=MSIL"
  "ScatterAssemblies"
  {
  "_2896B7332445E328168218B8E8DDA736"
@@ -365,15 +365,15 @@
  {
  "Name" = "8:Microsoft Visual Studio"
  "ProductName" = "8:Enemizer"
- "ProductCode" = "8:{07DB327D-925D-48E4-9E74-2810A69A60EA}"
- "PackageCode" = "8:{40CDD52D-13EC-40A9-AF3F-FE0753E786BA}"
+ "ProductCode" = "8:{F78B50CC-73AD-4677-98B3-BA2370BA9962}"
+ "PackageCode" = "8:{F99C6E61-2A74-470A-B65D-46544909A0C8}"
  "UpgradeCode" = "8:{A462B5FE-AB93-4F7C-94A6-ACB91E41E24B}"
  "AspNetVersion" = "8:4.0.30319.0"
  "RestartWWWService" = "11:FALSE"
  "RemovePreviousVersions" = "11:TRUE"
  "DetectNewerInstalledVersion" = "11:TRUE"
  "InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:6.0.10"
+ "ProductVersion" = "8:6.0.11"
  "Manufacturer" = "8:Enemizer"
  "ARPHELPTELEPHONE" = "8:"
  "ARPHELPLINK" = "8:"