testing cache

Author: mstop4

current-scripts/Demos/useful-scripts/objects/obj_control_manager_demo/Create_0.gml

@@ -4,7 +4,8 @@ control_labels[CONTROLS.LEFT] = "Left";
 control_labels[CONTROLS.RIGHT] = "Right";
 control_labels[CONTROLS.A] = "A";
 control_labels[CONTROLS.B] = "B";
-control_labels[CONTROLS.C] = "C";
+control_labels[CONTROLS.X] = "X";
+control_labels[CONTROLS.Y] = "Y";
 
 num_controls = CONTROLS.MAX;
 
@@ -17,4 +18,10 @@ control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEY
 control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.RIGHT, vk_right);
 control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.A, ord("A"));
 control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.B, ord("B"));
-control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.C, ord("C"));
+control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.X, ord("X"));
+control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.MOUSE, CONTROLS.Y, mb_left);
+
+control_manager.players[| 0].set_control(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.A, gp_face1);
+control_manager.players[| 0].set_control(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.B, gp_face2);
+control_manager.players[| 0].set_control(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.X, gp_face3);
+control_manager.players[| 0].set_control(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.Y, gp_face4);

current-scripts/Demos/useful-scripts/scripts/control_manager_structs/control_manager_structs.gml

@@ -5,7 +5,8 @@ enum CONTROLS {
 	RIGHT,
 	A,
 	B,
-	C,
+	X,
+	Y,
 	MAX
 }