summaryrefslogtreecommitdiffstats
path: root/src/core/Pad.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-06-29 11:56:50 +0200
committerSergeanur <s.anureev@yandex.ua>2020-06-29 11:56:50 +0200
commitb26eec5dafc7720d2c8e61db7dd6da29442cab94 (patch)
tree4dfc58239c4555d4d4e6d0b327b65b7dab6cae65 /src/core/Pad.h
parentrenamed 2dfx shadowRange to Size (diff)
parentUpdate MemoryCard.cpp (diff)
downloadre3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar
re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar.gz
re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar.bz2
re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar.lz
re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar.xz
re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.tar.zst
re3-b26eec5dafc7720d2c8e61db7dd6da29442cab94.zip
Diffstat (limited to 'src/core/Pad.h')
-rw-r--r--src/core/Pad.h23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/core/Pad.h b/src/core/Pad.h
index 2f50a164..f76d7b5d 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -2,14 +2,14 @@
enum {
PLAYERCONTROL_ENABLED = 0,
- PLAYERCONTROL_DISABLED_1 = 1, // used by first person camera
- PLAYERCONTROL_DISABLED_2 = 2,
+ PLAYERCONTROL_CAMERA = 1,
+ PLAYERCONTROL_UNK2 = 2,
PLAYERCONTROL_GARAGE = 4,
- PLAYERCONTROL_DISABLED_8 = 8,
- PLAYERCONTROL_DISABLED_10 = 16,
- PLAYERCONTROL_DISABLED_20 = 32, // used on CPlayerInfo::MakePlayerSafe
- PLAYERCONTROL_DISABLED_40 = 64, // used on phone calls
- PLAYERCONTROL_DISABLED_80 = 128,// used on cutscenes
+ PLAYERCONTROL_UNK8 = 8,
+ PLAYERCONTROL_UNK10 = 16,
+ PLAYERCONTROL_PLAYERINFO = 32,
+ PLAYERCONTROL_PHONE = 64,
+ PLAYERCONTROL_CUTSCENE = 128,
PLAYERCONTROL_SHORTCUT_TAXI = 256,
};
@@ -198,13 +198,13 @@ public:
static void UpdatePads(void);
void ProcessPCSpecificStuff(void);
- void Update(int16 unk);
+ void Update(int16 pad);
static void DoCheats(void);
void DoCheats(int16 unk);
static void StopPadsShaking(void);
- void StopShaking(int16 unk);
+ void StopShaking(int16 pad);
static CPad *GetPad(int32 pad);
@@ -455,6 +455,11 @@ public:
void SetDisablePlayerControls(uint16 who) { DisablePlayerControls |= who; }
void SetEnablePlayerControls(uint16 who) { DisablePlayerControls &= ~who; }
bool IsPlayerControlsDisabledBy(uint16 who) { return DisablePlayerControls & who; }
+
+ int16 GetMode() { return Mode; }
+ void SetMode(int16 mode) { Mode = mode; }
+
+ static bool IsNoOrObsolete() { return bDisplayNoControllerMessage || bObsoleteControllerMessage; }
};
VALIDATE_SIZE(CPad, 0xFC);