aboutsummaryrefslogtreecommitdiff
path: root/src/player/inc/human_player.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/player/inc/human_player.h')
-rw-r--r--src/player/inc/human_player.h25
1 files changed, 4 insertions, 21 deletions
diff --git a/src/player/inc/human_player.h b/src/player/inc/human_player.h
index 08f47d9..ca52112 100644
--- a/src/player/inc/human_player.h
+++ b/src/player/inc/human_player.h
@@ -6,6 +6,7 @@
#include <instance.h>
#include <mouse.h>
#include <pad.h>
+#include <peripheral.h>
#include <player.h>
#include <stdbool.h>
#include <stddef.h>
@@ -19,35 +20,17 @@ enum {MAX_SELECTED_INSTANCES = 4};
struct human_player_cfg
{
- enum human_player_periph
- {
- HUMAN_PLAYER_PERIPH_PAD,
- HUMAN_PLAYER_PERIPH_TOUCH,
- HUMAN_PLAYER_PERIPH_KEYBOARD_MOUSE
- } sel_periph;
-
+ enum peripheral_type sel_periph;
struct player_cfg pl;
int padn;
+ struct camera_dim dim;
};
struct human_player
{
struct player pl;
struct camera cam;
- enum human_player_periph sel_periph;
-
- union
- {
- struct pad pad;
-
- struct human_player_kbm
- {
- struct mouse mouse;
- struct keyboard keyboard;
- bool long_press, pan;
- unsigned int lp_t;
- } kbm;
- } periph;
+ union peripheral periph;
struct sel_instance
{