Changeset 86

Timestamp:

Jul 19, 2014, 1:17:49 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• 7dtd-server-fixes/bin/Release/Assembly-CSharp.dll (modified) ( previous)
• 7dtd-server-fixes/src/AdminToolsStuff.cs (modified) (2 diffs)
• NamePatcher/NamePatcher.cs (modified) (2 diffs)
• NamePatcher/NamePatcher.userprefs (modified) (1 diff)
• assembly-patcher/Assembly-Patcher.userprefs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs

@@ -11 +11 @@
                 List<string> allowed = new List<string> ();
 
+                ConsoleSdtd console = ConnectionManager.Instance.gameManager.m_GUIConsole;
+
                 foreach (AdminToolsCommandPermissions atcp in perms) {
                         if (tmpInfo.SteamID != null && tmpInfo.SteamID.Length > 0) {
                                 if ((atcp.PermissionLevel >= tmpInfo.PermissionLevel) || (atcp.PermissionLevel >= 1000)) {
-                                        allowed.Add (atcp.Command);
+                                        addAllowed (console, allowed, atcp.Command);
                                 }
                         } else {
                                 if (atcp.PermissionLevel >= 1000) {
-                                        allowed.Add (atcp.Command);
+                                        addAllowed (console, allowed, atcp.Command);
                                 }
                         }
@@ -25 +27 @@
                 return allowed.ToArray ();
         }
+
+        private static void addAllowed (ConsoleSdtd console, List<string> list, string cmd)
+        {
+                ConsoleCommand cc = console.getCommand (cmd);
+                if (cc != null) {
+                        foreach (string ccName in cc.Names()) {
+                                if (!list.Contains (ccName)) {
+                                        list.Add (ccName);
+                                }
+                        }
+                } else {
+                        list.Add (cmd);
+                }
+        }
 }
 

binary-improvements/NamePatcher/NamePatcher.cs

@@ -86 +86 @@
                         foreach (FieldDefinition fd in mainModule.GetType ("ConnectionManager").Fields) {
                                 TypeReference fdType = fd.FieldType;
+                                if (fdType.FullName.Equals ("GameManager")) {
+                                        Console.WriteLine ("Renaming and making public ConnectionManager field -> gameManager");
+                                        fd.Attributes = fd.Attributes & (~Mono.Cecil.FieldAttributes.Private) | Mono.Cecil.FieldAttributes.Public;
+                                        NameNormalizer.setName (fd, "gameManager");
+                                }
                                 if (fdType.FullName.Contains ("Dictionary") && fdType.FullName.Contains ("ClientInfo")) {
                                         Console.WriteLine ("Renaming and making public ConnectionManager field -> connectedClients");
@@ -143 +148 @@
                                 if (consoleCommandTypeName.Length > 0) {
                                         foreach (MethodDefinition md in typeConsole.Methods) {
-                                                if (md.Parameters.Count == 1 && md.Parameters [0].ParameterType.Name.Equals (consoleCommandTypeName)) {
-                                                        Console.WriteLine ("Renaming console method -> AddCommand");
-                                                        NameNormalizer.setName (md, "AddCommand");
+                                                if (!md.IsConstructor) {
+                                                        if (md.Parameters.Count == 1 && md.Parameters [0].ParameterType.Name.Equals (consoleCommandTypeName)) {
+                                                                Console.WriteLine ("Renaming console method -> AddCommand");
+                                                                NameNormalizer.setName (md, "AddCommand");
+                                                        }
+                                                        if (md.Parameters.Count == 1 && md.Parameters [0].ParameterType.FullName.Equals ("System.String") && md.ReturnType.FullName.Equals (consoleCommandTypeName)) {
+                                                                Console.WriteLine ("Renaming console method -> getCommand");
+                                                                NameNormalizer.setName (md, "getCommand");
+                                                        }
                                                 }
                                         }

binary-improvements/NamePatcher/NamePatcher.userprefs

@@ -3 +3 @@
   <MonoDevelop.Ide.Workbench ActiveDocument="NamePatcher.cs">
     <Files>
-      <File FileName="NamePatcher.cs" Line="109" Column="57" />
+      <File FileName="NamePatcher.cs" Line="98" Column="5" />
       <File FileName="NameNormalizer.cs" Line="188" Column="1" />
     </Files>

binary-improvements/assembly-patcher/Assembly-Patcher.userprefs

@@ -3 +3 @@
   <MonoDevelop.Ide.Workbench ActiveDocument="Main.cs">
     <Files>
-      <File FileName="Main.cs" Line="29" Column="54" />
+      <File FileName="Main.cs" Line="28" Column="4" />
       <File FileName="AssemblyInfo.cs" Line="21" Column="1" />
     </Files>