Merge branch 'master' of https://github.com/Saltosion/Cyber

Assets/Scripts/Console/Term.cs

@@ -35,11 +35,11 @@ namespace Cyber.Console {
         /// See <see cref="DebugConsole.Println"/>.
         /// </summary>
         /// <param name="text">Text.</param>
-        public static void Println(string text) {
+        public static void Println(object text) {
             if (Console == null) {
                 Debug.Log(text);
             } else {
-                Console.Println(text);
+                Console.Println(text.ToString());
             }
         }
 
@@ -47,11 +47,11 @@ namespace Cyber.Console {
         /// See <see cref="DebugConsole.Print"/>.
         /// </summary>
         /// <param name="text">Text.</param>
-        public static void Print(string text) {
+        public static void Print(object text) {
             if (Console == null) {
                 Debug.Log(text);
             } else {
-                Console.Print(text);
+                Console.Print(text.ToString());
             }
         }
 

Assets/Scripts/Controls/InventoryInterface.cs

@@ -187,7 +187,7 @@ namespace Cyber.Controls {
                             Lerper.LerpTransformPosition(ItemGridCellMeshes[CurrentIndex].transform, new Vector3(), 10f);
 
                             // Switch items
-                            Inventory.Drive.SwitchSlots(GrabbedItemIndex, CurrentIndex);
+                            Client.Send(PktType.InventoryAction, Inventory.ActionHandler.BuildSlotSwitch(GrabbedItemIndex, CurrentIndex));
 
                             // Reset grabbing
                             GrabbedItem = null;

Assets/Scripts/Items/InventoryAction.cs

@@ -19,7 +19,12 @@ namespace Cyber.Items {
         /// <summary>
         /// Use the item in the given slot.
         /// </summary>
-        Use
+        Use,
+
+        /// <summary>
+        /// Switch items between two slots.
+        /// </summary>
+        Switch
 
     }
 }

Assets/Scripts/Items/InventoryActionHandler.cs

@@ -50,6 +50,10 @@ namespace Cyber.Items {
             return new InventoryActionPkt(InventoryAction.Equip, itemIdx);
         }
 
+        public InventoryActionPkt BuildSlotSwitch(int switchFrom, int switchTo) {
+            return new InventoryActionPkt(InventoryAction.Switch, new int[]{ switchFrom, switchTo });
+        }
+
         /// <summary>
         /// Handles an <see cref="InventoryActionPkt"/> to handle. Ran on server and client.
         /// </summary>
@@ -76,6 +80,9 @@ namespace Cyber.Items {
                     return true;
                 }
                 return false;
+            case InventoryAction.Switch:
+                Inventory.Drive.SwitchSlots(intList[0], intList[1]);
+                return true;
             }
             return false;
         }