Cleanup and named some unknown seat fields

TrinityCore · Jun 4, 2012 · a827cd7 · a827cd7
1 parent 2a4d1e8
commit a827cd7
Show file tree

Hide file tree

Showing 19 changed files with 98 additions and 164 deletions.
diff --git a/TestProject1/ExtensionsTest.cs b/TestProject1/ExtensionsTest.cs
@@ -4,17 +4,13 @@
 
 namespace TestProject1
 {
-
-
     /// <summary>
     ///This is a test class for ExtensionsTest and is intended
     ///to contain all ExtensionsTest Unit Tests
     ///</summary>
     [TestClass()]
     public class ExtensionsTest
     {
-
-
         private TestContext testContextInstance;
 
         /// <summary>

diff --git a/TestProject1/FormMainTest.cs b/TestProject1/FormMainTest.cs
@@ -1,42 +1,24 @@
-using System.Diagnostics.Contracts;
-using System.Linq;
+using System.Linq;
 using System.Windows.Forms;
 using VehicleGarage;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
-using VehicleGarage.DBCStores;
-using VehicleGarage.DBCStructures;
+using VehicleGarage.Forms;
 
 namespace TestProject1
 {
-
-
     /// <summary>
     ///This is a test class for FormMainTest and is intended
     ///to contain all FormMainTest Unit Tests
     ///</summary>
     [TestClass()]
     public class FormMainTest
     {
-
-
-        private TestContext testContextInstance;
-
         /// <summary>
         ///Gets or sets the test context which provides
         ///information about and functionality for the current test run.
         ///</summary>
-        public TestContext TestContext
-        {
-            get
-            {
-                return testContextInstance;
-            }
-            set
-            {
-                testContextInstance = value;
-            }
-        }
+        public TestContext TestContext { get; set; }
 
         #region Additional test attributes
         // 
@@ -68,15 +50,14 @@ public TestContext TestContext
         //
         #endregion
 
-
         /// <summary>
         ///A test for _lvSearchResults_SelectedIndexChanged
         ///</summary>
         [TestMethod()]
         [DeploymentItem("VehicleGarage.exe")]
         public void _lvSearchResults_SelectedIndexChangedTest()
         {
-            FormMain_Accessor target = new FormMain_Accessor(); // TODO: Initialize to an appropriate value
+            var target = new FormMain_Accessor(); // TODO: Initialize to an appropriate value
             object sender = null; // TODO: Initialize to an appropriate value
             EventArgs e = null; // TODO: Initialize to an appropriate value
             target._lvSearchResults_SelectedIndexChanged(sender, e);

diff --git a/VehicleGarage/DBCStores/DBC.cs b/VehicleGarage/DBCStores/DBC.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using VehicleGarage.DBCStructures;
 using VehicleGarage.Properties;
 

diff --git a/VehicleGarage/DBCStores/DBCHeader.cs b/VehicleGarage/DBCStores/DBCHeader.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-
+using System.Runtime.InteropServices;
 
 namespace VehicleGarage.DBCStores
 {
@@ -22,12 +17,12 @@ public bool IsDBC
 
         public long DataSize
         {
-            get { return (long)(RecordsCount * RecordSize); }
+            get { return RecordsCount * RecordSize; }
         }
 
         public long StartStringPosition
         {
-            get { return DataSize + (long)Marshal.SizeOf(typeof(DbcHeader)); }
+            get { return DataSize + Marshal.SizeOf(typeof(DbcHeader)); }
         }
     };
 }
diff --git a/VehicleGarage/DBCStores/DBCReader.cs b/VehicleGarage/DBCStores/DBCReader.cs
@@ -10,13 +10,13 @@ namespace VehicleGarage.DBCStores
 {
     public static class DBCReader
     {
-        public static /*unsafe*/ Dictionary<uint, T> ReadDBC<T>(Dictionary<uint, string> strDict) where T : struct
+        public static Dictionary<uint, T> ReadDBC<T>(Dictionary<uint, string> strDict) where T : struct
         {
             Contract.Requires(DBC.DBCPath != String.Empty);
             Contract.Requires(DBC.DBCPath != null);
 
             var dict = new Dictionary<uint, T>();
-            string fileName = Path.Combine(DBC.DBCPath, typeof(T).Name + ".dbc").Replace("Entry", String.Empty);
+            var fileName = Path.Combine(DBC.DBCPath, typeof(T).Name + ".dbc").Replace("Entry", String.Empty);
 
             using (var reader = new BinaryReader(new FileStream(fileName, FileMode.Open, FileAccess.Read), Encoding.UTF8))
             {
@@ -38,9 +38,9 @@ public static class DBCReader
                     var key = reader.ReadUInt32();
                     reader.BaseStream.Position -= 4;
 
-                    var T_entry = reader.ReadStruct<T>();
+                    var entry = reader.ReadStruct<T>();
 
-                    dict.Add(key, T_entry);
+                    dict.Add(key, entry);
                 }
 
                 // read dbc strings

diff --git a/VehicleGarage/DBCStructures/VehicleEntry.cs b/VehicleGarage/DBCStructures/VehicleEntry.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
+using System.Runtime.InteropServices;
 using VehicleGarage.DBCStores;
 
 namespace VehicleGarage.DBCStructures
@@ -42,10 +38,9 @@ public struct VehicleEntry
         public float MissleTargetImpactTexRadius;
         public int SeatIndicatorType;
         public int PowerType;
-        public int Unk1;        // New in 3.1 - Either -1 or 0 (most common)
-        public int Unk2;        // New in 3.1 - Always 0
+        public int Unk1;        // New in 3.1 - Either -1 or 0 (most common) - PowerType[1]?
+        public int Unk2;        // New in 3.1 - Always 0 - PowerType[2]?
 
-
         public string MissleTargetArcTexture
         {
             get { return DBC.VehicleStrings[_missleTargetArcTexture]; }

diff --git a/VehicleGarage/DBCStructures/VehiclePowerTypes.cs b/VehicleGarage/DBCStructures/VehiclePowerTypes.cs
@@ -1,5 +1,4 @@
-
-namespace VehicleGarage.DBCStructures
+namespace VehicleGarage.DBCStructures
 {
     public enum VehiclePowerTypes
     {

diff --git a/VehicleGarage/DBCStructures/VehicleSeatEntry.cs b/VehicleGarage/DBCStructures/VehicleSeatEntry.cs
@@ -1,7 +1,4 @@
-
-using System;
-
-namespace VehicleGarage.DBCStructures
+namespace VehicleGarage.DBCStructures
 {
     public struct VehicleSeatEntry
     {
@@ -51,18 +48,17 @@ public struct VehicleSeatEntry
         public int ExitUiSoundId;
         public int Skin;
         public int FlagsB;
-        public float Unk1;  // added in 3.1
-        public float Unk2;  // added in 3.1
-        public float Unk3;  // added in 3.1
-        public float Unk4;  // added in 3.1
-        public float Unk5;  // added in 3.1
-        public float Unk6;  // added in 3.1
-        public float Unk7;  // added in 3.1
-        public float Unk8;  // added in 3.1
-        public float Unk9;  // added in 3.1
-        public float Unk10; // added in 3.1
-        public float Unk11; // added in 3.1
-        public float Unk12; // added in 3.1
+        public float CameraEnteringDelay;
+        public float CameraEnteringDuration;
+        public float CameraExitingDelay;
+        public float CameraExitingDuration;
+        public float CameraOffsetX;
+        public float CameraOffsetY;
+        public float CameraOffsetZ;
+        public float CameraPosChaseRate;
+        public float CameraFacingChaseRate;
+        public float CameraEnteringZoom;
+        public float CameraSeatZoomMin;
+        public float CameraSeatZoomMax;
     }
-
 }
diff --git a/VehicleGarage/DBCStructures/VehicleUIIndSeatEntry.cs b/VehicleGarage/DBCStructures/VehicleUIIndSeatEntry.cs
@@ -1,5 +1,4 @@
-
-namespace VehicleGarage.DBCStructures
+namespace VehicleGarage.DBCStructures
 {
     public struct VehicleUIIndSeatEntry
     {

diff --git a/VehicleGarage/DBCStructures/VehicleUIIndicatorEntry.cs b/VehicleGarage/DBCStructures/VehicleUIIndicatorEntry.cs
@@ -1,5 +1,4 @@
-
-namespace VehicleGarage.DBCStructures
+namespace VehicleGarage.DBCStructures
 {
     public struct VehicleUIIndicatorEntry
     {