Change: Cleanup a little more cruft

Author: leezer3

source/ObjectViewer/InterfaceS.cs

@@ -126,13 +126,5 @@ internal struct Options {
 		// ================================
 
 #pragma warning restore 0649
-
-		// round to power of two
-		internal static int RoundToPowerOfTwo(int Value) {
-			Value -= 1;
-			for (int i = 1; i < sizeof(int) * 8; i *= 2) {
-				Value = Value | Value >> i;
-			} return Value + 1;
-		}
 	}
 }

source/ObjectViewer/ObjectManager.cs

@@ -1893,8 +1893,7 @@ internal static UnifiedObject LoadObject(string FileName, Encoding Encoding, boo
             {
                 while (true)
                 {
-                    string f;
-                    f = OpenBveApi.Path.CombineFile(System.IO.Path.GetDirectoryName(FileName), System.IO.Path.GetFileName(FileName) + ".x");
+                    string f = OpenBveApi.Path.CombineFile(System.IO.Path.GetDirectoryName(FileName), System.IO.Path.GetFileName(FileName) + ".x");
                     if (System.IO.File.Exists(f))
                     {
                         FileName = f;
@@ -2010,8 +2009,7 @@ internal static StaticObject LoadStaticObject(string FileName, Encoding Encoding
             {
                 while (true)
                 {
-                    string f;
-                    f = OpenBveApi.Path.CombineFile(System.IO.Path.GetDirectoryName(FileName), System.IO.Path.GetFileName(FileName) + ".x");
+                    string f = OpenBveApi.Path.CombineFile(System.IO.Path.GetDirectoryName(FileName), System.IO.Path.GetFileName(FileName) + ".x");
                     if (System.IO.File.Exists(f))
                     {
                         FileName = f;

source/ObjectViewer/Parsers/CsvB3dObjectParser.cs

@@ -206,10 +206,8 @@ private static int SecondIndexOfAny(string testString, string[] values)
 		/// <summary>Loads a CSV or B3D object from a file.</summary>
 		/// <param name="FileName">The text file to load the animated object from. Must be an absolute file name.</param>
 		/// <param name="Encoding">The encoding the file is saved in. If the file uses a byte order mark, the encoding indicated by the byte order mark is used and the Encoding parameter is ignored.</param>
-		/// <param name="ForceTextureRepeatX">Whether to force TextureWrapMode.Repeat for the X axis of the texture.</param>
-		/// <param name="ForceTextureRepeatY">Whether to force TextureWrapMode.Repeat for the Y axis of the texture.</param>
 		/// <returns>The object loaded.</returns>
-		internal static ObjectManager.StaticObject ReadObject(string FileName, Encoding Encoding, bool ForceTextureRepeatX, bool ForceTextureRepeatY) {
+		internal static ObjectManager.StaticObject ReadObject(string FileName, Encoding Encoding) {
 			System.Globalization.CultureInfo Culture = System.Globalization.CultureInfo.InvariantCulture;
 			bool IsB3D = string.Equals(System.IO.Path.GetExtension(FileName), ".b3d", StringComparison.OrdinalIgnoreCase);
 			// initialize object

source/ObjectViewer/Parsers/Ls3DGrpParser.cs

@@ -231,7 +231,7 @@ internal static ObjectManager.AnimatedObjectCollection ReadObject(string FileNam
 							}
 							else if(CurrentObjects[i].Name.ToLowerInvariant().EndsWith(".l3dobj"))
 							{
-								Object = (ObjectManager.StaticObject)ObjectManager.LoadObject(CurrentObjects[i].Name, Encoding, false, false, false, CurrentObjects[i].Rotation);
+								Object = (ObjectManager.StaticObject)ObjectManager.LoadObject(CurrentObjects[i].Name, Encoding, false, CurrentObjects[i].Rotation);
 							}
 							else
 							{

source/ObjectViewer/RendererS.cs

@@ -857,8 +857,7 @@ private static void RenderOverlays()
             {
                 if (ObjectManager.ObjectsUsed == 0 & ObjectManager.AnimatedWorldObjectsUsed == 0)
                 {
-                    string[][] Keys;
-                    Keys = new string[][] { new string[] { "F7" }, new string[] { "F8" }, new string[] { "F10" } };
+                    string[][] Keys = { new string[] { "F7" }, new string[] { "F8" }, new string[] { "F10" } };
                     RenderKeys(4.0, 4.0, 20.0, Keys);
 					DrawString(Fonts.SmallFont, "Open one or more objects", new Point(32,4),TextAlignment.TopLeft, TextColor);
 	                DrawString(Fonts.SmallFont, "Display the options window", new Point(32,24),TextAlignment.TopLeft, TextColor);
@@ -868,8 +867,7 @@ private static void RenderOverlays()
                 else
                 {
 	                DrawString(Fonts.SmallFont, "Position: " + World.AbsoluteCameraPosition.X.ToString("0.00", Culture) + ", " + World.AbsoluteCameraPosition.Y.ToString("0.00", Culture) + ", " + World.AbsoluteCameraPosition.Z.ToString("0.00", Culture), new Point((int)(0.5 * ScreenWidth -88),4),TextAlignment.TopLeft, TextColor);
-                    string[][] Keys;
-                    Keys = new string[][] { new string[] { "F5" }, new string[] { "F7" }, new string[] { "del" }, new string[] { "F8" }, new string[] { "F10" } };
+                    string[][] Keys = { new string[] { "F5" }, new string[] { "F7" }, new string[] { "del" }, new string[] { "F8" }, new string[] { "F10" } };
                     RenderKeys(4.0, 4.0, 24.0, Keys);
 	                DrawString(Fonts.SmallFont, "Reload the currently open objects", new Point(32,4),TextAlignment.TopLeft, TextColor);
 	                DrawString(Fonts.SmallFont, "Open additional objects", new Point(32,24),TextAlignment.TopLeft, TextColor);

source/ObjectViewer/TextureManager.cs

@@ -7,7 +7,7 @@
 using OpenTK.Graphics.OpenGL;
 namespace OpenBve
 {
-	internal static partial class Textures
+	internal static class Textures
 	{
 		/// <summary>Holds all currently registered textures.</summary>
 		internal static Texture[] RegisteredTextures = new Texture[16];