Merge branch 'master' into script_dev

2020-02-24 12:10:59 +03:00
parent 7d78879c48 cbf396e6e9
commit 6260d51d44
6 changed files with 13 additions and 13 deletions
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -9,7 +9,7 @@ enum {
 	PLAYERCONTROL_DISABLED_10 = 16,
 	PLAYERCONTROL_DISABLED_20 = 32, // used on CPlayerInfo::MakePlayerSafe
 	PLAYERCONTROL_DISABLED_40 = 64, // used on phone calls
-	PLAYERCONTROL_DISABLED_80 = 128,
+	PLAYERCONTROL_DISABLED_80 = 128,// used on cutscenes
 };

 class CControllerState