From 3ebb01525015fe42f82717fa9b8ebf78d4422189 Mon Sep 17 00:00:00 2001 From: kotae4 <83557652+kotae4@users.noreply.github.com> Date: Sat, 20 Nov 2021 15:25:09 -0500 Subject: [PATCH] changed to c++17 on all configurations * my version of VS doesn't recognize stdcpp20 and falls back to default c++14, which results in failed compilation because std::optional was introduced in c++17 --- AmongUsMenu.vcxproj | 4 ++-- hooks/PlayerControl.cpp | 1 + user/gitparams.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AmongUsMenu.vcxproj b/AmongUsMenu.vcxproj index cdcd30e8..259ff575 100644 --- a/AmongUsMenu.vcxproj +++ b/AmongUsMenu.vcxproj @@ -456,7 +456,7 @@ pch-il2cpp.h true $(ProjectDir)appdata;$(ProjectDir)events;$(ProjectDir)framework;$(ProjectDir)gui;$(ProjectDir)hooks;$(ProjectDir)includes;$(ProjectDir)resources;$(ProjectDir)rpc;$(ProjectDir)user - stdcpp20 + stdcpp17 MultiThreadedDebug true false @@ -592,7 +592,7 @@ git rev-parse --abbrev-ref HEAD >> user/gitparams.h pch-il2cpp.h true $(ProjectDir)appdata;$(ProjectDir)events;$(ProjectDir)framework;$(ProjectDir)gui;$(ProjectDir)hooks;$(ProjectDir)includes;$(ProjectDir)resources;$(ProjectDir)rpc;$(ProjectDir)user - stdcpp20 + stdcpp17 MultiThreaded None true diff --git a/hooks/PlayerControl.cpp b/hooks/PlayerControl.cpp index 73f8ae8f..b4170753 100644 --- a/hooks/PlayerControl.cpp +++ b/hooks/PlayerControl.cpp @@ -5,6 +5,7 @@ #include "esp.hpp" #include "_rpc.h" #include +#include void dPlayerControl_CompleteTask(PlayerControl* __this, uint32_t idx, MethodInfo* method) { std::optional taskType = std::nullopt; diff --git a/user/gitparams.h b/user/gitparams.h index a74ecd33..5363dfc6 100644 --- a/user/gitparams.h +++ b/user/gitparams.h @@ -1,2 +1,2 @@ -#define GIT_CUR_COMMIT 89cf161f9068845716b3dce3ce95acc23a265f20 -#define GIT_BRANCH 2021.1.9s +#define GIT_CUR_COMMIT db280a4b512421a09c5b751e8f9a746605308e42 +#define GIT_BRANCH RoleColors