Merge pull request #637 from stevehalliwell/MultipleCommandInfos

Allow multiple CommandInfos to be added to a class

Assets/Fungus/Scripts/Commands/SpawnObject.cs

@@ -11,7 +11,11 @@ namespace Fungus
     /// </summary>
     [CommandInfo("Scripting", 
                  "Spawn Object", 
-                 "Spawns a new object based on a reference to a scene or prefab game object.")]
+                 "Spawns a new object based on a reference to a scene or prefab game object.", 
+        Priority = 10)]
+    [CommandInfo("GameObject",
+                 "Instantiate",
+                 "Instantiate a game object")]
     [AddComponentMenu("")]
     [ExecuteInEditMode]
     public class SpawnObject : Command

Assets/Fungus/Scripts/Components/Command.cs

@@ -11,6 +11,8 @@ namespace Fungus
     /// <summary>
     /// Attribute class for Fungus commands.
     /// </summary>
+    /// 
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
     public class CommandInfoAttribute : Attribute
     {
         /// <summary>

Assets/Fungus/Scripts/Editor/CommandEditor.cs

@@ -16,17 +16,22 @@ namespace Fungus.EditorUtils
 
         public static CommandInfoAttribute GetCommandInfo(System.Type commandType)
         {
+            CommandInfoAttribute retval = null;
+
             object[] attributes = commandType.GetCustomAttributes(typeof(CommandInfoAttribute), false);
             foreach (object obj in attributes)
             {
                 CommandInfoAttribute commandInfoAttr = obj as CommandInfoAttribute;
                 if (commandInfoAttr != null)
                 {
-                    return commandInfoAttr;
+                    if (retval == null)
+                        retval = commandInfoAttr;
+                    else if (retval.Priority < commandInfoAttr.Priority)
+                        retval = commandInfoAttr;
                 }
             }
             
-            return null;
+            return retval;
         }
 
         public virtual void DrawCommandInspectorGUI()