Fix vc compile issues

This commit is contained in:
Grinch_ 2021-08-28 11:13:18 +06:00
parent c0869efcae
commit 53bae2ecb9
6 changed files with 21 additions and 24 deletions

View File

@ -6,10 +6,10 @@
"${workspaceFolder}/**", "${workspaceFolder}/**",
"${PLUGIN_SDK_DIR}/*", "${PLUGIN_SDK_DIR}/*",
"${DIRECTX9_SDK_DIR}/Include/*", "${DIRECTX9_SDK_DIR}/Include/*",
"${PLUGIN_SDK_DIR}/plugin_sa/*", // "${PLUGIN_SDK_DIR}/plugin_sa/*",
"${PLUGIN_SDK_DIR}/plugin_sa/game_sa/*", // "${PLUGIN_SDK_DIR}/plugin_sa/game_sa/*",
// "${PLUGIN_SDK_DIR}/plugin_vc/*", "${PLUGIN_SDK_DIR}/plugin_vc/*",
// "${PLUGIN_SDK_DIR}/plugin_vc/game_vc/*", "${PLUGIN_SDK_DIR}/plugin_vc/game_vc/*",
"${PLUGIN_SDK_DIR}/shared/*", "${PLUGIN_SDK_DIR}/shared/*",
"${PLUGIN_SDK_DIR}/shared/game/*", "${PLUGIN_SDK_DIR}/shared/game/*",
"C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\ucrt\\*", "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\ucrt\\*",
@ -20,7 +20,7 @@
"IS_PLATFORM_WIN", "IS_PLATFORM_WIN",
"_CRT_SECURE_NO_WARNINGS", "_CRT_SECURE_NO_WARNINGS",
"_CRT_NON_CONFORMING_SWPRINTFS", "_CRT_NON_CONFORMING_SWPRINTFS",
"GTASA", "GTAVC",
"_DX9_SDK_INSTALLED", "_DX9_SDK_INSTALLED",
"PLUGIN_SGV_10US" "PLUGIN_SGV_10US"
], ],

View File

@ -2,5 +2,5 @@
#define MENU_NAME "Cheat Menu" #define MENU_NAME "Cheat Menu"
#define MENU_VERSION_NUMBER "2.9" #define MENU_VERSION_NUMBER "2.9"
#define MENU_VERSION MENU_VERSION_NUMBER"-beta" #define MENU_VERSION MENU_VERSION_NUMBER"-beta"
#define BUILD_NUMBER "20210823" #define BUILD_NUMBER "20210828"
#define MENU_TITLE MENU_NAME " v" MENU_VERSION "(" BUILD_NUMBER ")" #define MENU_TITLE MENU_NAME " v" MENU_VERSION "(" BUILD_NUMBER ")"

View File

@ -146,16 +146,6 @@ Player::Player()
CPlayerPed* player = FindPlayerPed(); CPlayerPed* player = FindPlayerPed();
int hplayer = CPools::GetPedRef(player); int hplayer = CPools::GetPedRef(player);
if (m_bDrunkEffect && !m_TopDownCamera::m_bEnabled)
{
Command<eScriptCommands::COMMAND_SET_PLAYER_DRUNKENNESS> (0, 100);
}
if (m_TopDownCamera::m_bEnabled)
{
TopDownCameraView();
}
if (m_KeepPosition::m_bEnabled) if (m_KeepPosition::m_bEnabled)
{ {
if (Command<Commands::IS_CHAR_DEAD>(hplayer)) if (Command<Commands::IS_CHAR_DEAD>(hplayer))
@ -195,6 +185,16 @@ Player::Player()
} }
#ifdef GTASA #ifdef GTASA
if (m_bDrunkEffect && !m_TopDownCamera::m_bEnabled)
{
Command<eScriptCommands::COMMAND_SET_PLAYER_DRUNKENNESS> (0, 100);
}
if (m_TopDownCamera::m_bEnabled)
{
TopDownCameraView();
}
if (m_bAimSkinChanger && Ui::HotKeyPressed(Menu::m_HotKeys::aimSkinChanger)) if (m_bAimSkinChanger && Ui::HotKeyPressed(Menu::m_HotKeys::aimSkinChanger))
{ {
CPed* targetPed = player->m_pPlayerTargettedPed; CPed* targetPed = player->m_pPlayerTargettedPed;

View File

@ -40,7 +40,7 @@ Vehicle::Vehicle()
{ {
uint timer = CTimer::m_snTimeInMilliseconds; uint timer = CTimer::m_snTimeInMilliseconds;
CPlayerPed* pPlayer = FindPlayerPed(); CPlayerPed* pPlayer = FindPlayerPed();
CVehicle* pVeh = FindPlayerVehicle(-1, false); CVehicle* pVeh = BY_GAME(FindPlayerVehicle(-1, false), FindPlayerVehicle());
if (pPlayer && pVeh) if (pPlayer && pVeh)
{ {
@ -1270,4 +1270,4 @@ void Vehicle::Draw()
} }
ImGui::EndTabBar(); ImGui::EndTabBar();
} }
} }

View File

@ -228,11 +228,6 @@ bool Visual::TimeCycColorEdit3(const char* label, uchar* r, uchar* g, uchar* b,
return rtn; return rtn;
} }
char __cdecl GetWaterLevelNoWaves(float x, float y, float z, int a4, __int64 a5)
{
return 0;
}
bool Visual::TimeCycColorEdit4(const char* label, uchar* r, uchar* g, uchar* b, uchar* a, ImGuiColorEditFlags flags) bool Visual::TimeCycColorEdit4(const char* label, uchar* r, uchar* g, uchar* b, uchar* a, ImGuiColorEditFlags flags)
{ {
bool rtn = false; bool rtn = false;

View File

@ -86,7 +86,9 @@ project "CheatMenuVC"
"../src/Visual.h", "../src/Visual.h",
"../src/Visual.cpp", "../src/Visual.cpp",
"../src/ResourceStore.h", "../src/ResourceStore.h",
"../src/ResourceStore.cpp" "../src/ResourceStore.cpp",
"../src/FileHandler.h",
"../src/FileHandler.cpp"
} }
includedirs { includedirs {
PSDK_DIR .. "/plugin_vc/", PSDK_DIR .. "/plugin_vc/",