update version

TEdit · Mar 1, 2014 · 1740825 · 1740825
1 parent a6ee6f7
commit 1740825
Show file tree

Hide file tree

Showing 6 changed files with 1,165 additions and 1,060 deletions.
diff --git a/TEdit3Installer/Product.wxs b/TEdit3Installer/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="TEdit 3" Language="1033" Version="3.4.13298.0" Manufacturer="BinaryConstruct" UpgradeCode="1d9a5baf-12ad-4a55-9e83-bbfd95c7c820">
+  <Product Id="*" Name="TEdit 3" Language="1033" Version="3.4.13358.0" Manufacturer="BinaryConstruct" UpgradeCode="1d9a5baf-12ad-4a55-9e83-bbfd95c7c820">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <Media Id="1" Cabinet="disk1.cab" EmbedCab="yes" />
     <Directory Id="TARGETDIR" Name="SourceDir">

diff --git a/TEditXna/Editor/Undo/UndoManager.cs b/TEditXna/Editor/Undo/UndoManager.cs
@@ -60,7 +60,7 @@ public UndoBuffer Buffer
 
         public void SaveUndo()
         {
-            ValidateAndRemoveChests();
+            //ValidateAndRemoveChests();
             _maxIndex = _currentIndex;
             _buffer.Write(string.Format(UndoFile, _currentIndex));
             _currentIndex++;
@@ -120,7 +120,7 @@ private void ValidateAndRemoveChests()
             }
             else if (lastTile.Tile.Type == 55 || lastTile.Tile.Type == 85)
             {
-                if (existingLastTile.Type != 55 && existingLastTile.Type != 85 || !existingLastTile.IsActive)
+                if ((existingLastTile.Type != 55 && existingLastTile.Type != 85) || !existingLastTile.IsActive)
                 {
                     var cursign = _wvm.CurrentWorld.GetSignAtTile(lastTile.Location.X, lastTile.Location.Y);
                     if (cursign != null)

diff --git a/TEditXna/Properties/AssemblyInfo.cs b/TEditXna/Properties/AssemblyInfo.cs
@@ -52,4 +52,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.13304.0")]
+[assembly: AssemblyFileVersion("3.4.13358.0")]
diff --git a/TEditXna/Terraria/World.Settings.cs b/TEditXna/Terraria/World.Settings.cs
@@ -16,7 +16,7 @@ namespace TEditXNA.Terraria
 {
     public partial class World
     {
-        public static uint CompatibleVersion = 73;
+        public static uint CompatibleVersion = 77;
         private static readonly Dictionary<string, XNA.Color> _globalColors = new Dictionary<string, XNA.Color>();
         private static readonly Dictionary<string, int> _npcIds = new Dictionary<string, int>();
         private static readonly Dictionary<int, int> _npcFrames = new Dictionary<int, int>();