Merge branch 'control-selector' into tutorial-time

This commit is contained in:
mazmazz 2018-11-11 09:22:06 -05:00
commit 3be9981231

View file

@ -128,7 +128,7 @@ extern INT32 gamecontroldefault[num_gamecontrolschemes][num_gamecontrols][2]; //
#define PLAYER1INPUTDOWN(gc) (gamekeydown[gamecontrol[gc][0]] || gamekeydown[gamecontrol[gc][1]])
#define PLAYER2INPUTDOWN(gc) (gamekeydown[gamecontrolbis[gc][0]] || gamekeydown[gamecontrolbis[gc][1]])
#define num_gclist_tutorial 6 // 13
#define num_gclist_tutorial 8 // 13
#define num_gclist_movement 4
#define num_gclist_camera 2
#define num_gclist_jump 1