Merge branch '2.3' into 2.4

2021-05-16 12:55:21 +02:00
parent ea616c7187 1452d9548e
commit 2f5b522413
150 changed files with 7726 additions and 4099 deletions
@@ -379,10 +379,18 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext

          case FUNC_SCREENSHOT:
            if (!(functionsContext.activeSwitches & switch_mask)) {
-              mainRequestFlags |= (1 << REQUEST_SCREENSHOT);
+              mainRequestFlags |= (1u << REQUEST_SCREENSHOT);
            }
            break;

+#if defined(PXX2)
+          case FUNC_RACING_MODE:
+            if (isRacingModeEnabled()) {
+              newActiveFunctions |= (1u << FUNCTION_RACING_MODE);
+            }
+            break;
+#endif
+
 #if defined(DEBUG)
          case FUNC_TEST:
            testFunc();