MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflict with master

Browse Source
This commit is contained in:
Mickaël Malécot 2020-05-09 11:47:13 +02:00
parent f7f4c66bd2
commit 08db4ab8c1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core.c
View File

@ -291,9 +291,15 @@
#define MOUSE_SENSITIVITY 0.8f #define MOUSE_SENSITIVITY 0.8f
#endif #endif
#ifndef MAX_GAMEPADS
#define MAX_GAMEPADS 4 // Max number of gamepads supported #define MAX_GAMEPADS 4 // Max number of gamepads supported
#endif
#ifndef MAX_GAMEPAD_AXIS
#define MAX_GAMEPAD_AXIS 6 // Max number of axis supported (per gamepad) #define MAX_GAMEPAD_AXIS 6 // Max number of axis supported (per gamepad)
#endif
#ifndef MAX_GAMEPAD_BUTTONS
#define MAX_GAMEPAD_BUTTONS 32 // Max bumber of buttons supported (per gamepad) #define MAX_GAMEPAD_BUTTONS 32 // Max bumber of buttons supported (per gamepad)
#endif
#define MAX_CHARS_QUEUE 16 // Max number of characters in the input queue #define MAX_CHARS_QUEUE 16 // Max number of characters in the input queue