From 53bae2ecb912ef9f428731fb2a8bddaa6fd24a8b Mon Sep 17 00:00:00 2001
From: Grinch_ <user.grinch@gmail.com>
Date: Sat, 28 Aug 2021 11:13:18 +0600
Subject: [PATCH] Fix vc compile issues

---
 .vscode/c_cpp_properties.json | 10 +++++-----
 src/MenuInfo.h                |  2 +-
 src/Player.cpp                | 20 ++++++++++----------
 src/Vehicle.cpp               |  4 ++--
 src/Visual.cpp                |  5 -----
 tools/premake5.lua            |  4 +++-
 6 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index aa011ad..9bf22bb 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -6,10 +6,10 @@
                 "${workspaceFolder}/**",
                 "${PLUGIN_SDK_DIR}/*",
                 "${DIRECTX9_SDK_DIR}/Include/*",
-                "${PLUGIN_SDK_DIR}/plugin_sa/*",
-                "${PLUGIN_SDK_DIR}/plugin_sa/game_sa/*",
-                // "${PLUGIN_SDK_DIR}/plugin_vc/*",
-                // "${PLUGIN_SDK_DIR}/plugin_vc/game_vc/*",
+                // "${PLUGIN_SDK_DIR}/plugin_sa/*",
+                // "${PLUGIN_SDK_DIR}/plugin_sa/game_sa/*",
+                "${PLUGIN_SDK_DIR}/plugin_vc/*",
+                "${PLUGIN_SDK_DIR}/plugin_vc/game_vc/*",
                 "${PLUGIN_SDK_DIR}/shared/*",
                 "${PLUGIN_SDK_DIR}/shared/game/*",
                 "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\ucrt\\*",
@@ -20,7 +20,7 @@
                 "IS_PLATFORM_WIN",
                 "_CRT_SECURE_NO_WARNINGS",
                 "_CRT_NON_CONFORMING_SWPRINTFS",
-                "GTASA",
+                "GTAVC",
                 "_DX9_SDK_INSTALLED",
                 "PLUGIN_SGV_10US"
             ],
diff --git a/src/MenuInfo.h b/src/MenuInfo.h
index bfc7da3..adadc45 100644
--- a/src/MenuInfo.h
+++ b/src/MenuInfo.h
@@ -2,5 +2,5 @@
 #define MENU_NAME "Cheat Menu"
 #define MENU_VERSION_NUMBER "2.9"
 #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 ")"
diff --git a/src/Player.cpp b/src/Player.cpp
index 3a8d3b9..221ed3a 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -146,16 +146,6 @@ Player::Player()
 		CPlayerPed* player = FindPlayerPed();
 		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 (Command<Commands::IS_CHAR_DEAD>(hplayer))
@@ -195,6 +185,16 @@ Player::Player()
 		}
 
 #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))
 		{
 			CPed* targetPed = player->m_pPlayerTargettedPed;
diff --git a/src/Vehicle.cpp b/src/Vehicle.cpp
index b885604..8abcc6f 100644
--- a/src/Vehicle.cpp
+++ b/src/Vehicle.cpp
@@ -40,7 +40,7 @@ Vehicle::Vehicle()
 	{
 		uint timer = CTimer::m_snTimeInMilliseconds;
 		CPlayerPed* pPlayer = FindPlayerPed();
-		CVehicle* pVeh = FindPlayerVehicle(-1, false);
+		CVehicle* pVeh = BY_GAME(FindPlayerVehicle(-1, false), FindPlayerVehicle());
 
 		if (pPlayer && pVeh)
 		{
@@ -1270,4 +1270,4 @@ void Vehicle::Draw()
 		}
 		ImGui::EndTabBar();
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Visual.cpp b/src/Visual.cpp
index 1a33d10..7d308d2 100644
--- a/src/Visual.cpp
+++ b/src/Visual.cpp
@@ -228,11 +228,6 @@ bool Visual::TimeCycColorEdit3(const char* label, uchar* r, uchar* g, uchar* b,
 	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 rtn = false;
diff --git a/tools/premake5.lua b/tools/premake5.lua
index e7e06bd..38ee450 100644
--- a/tools/premake5.lua
+++ b/tools/premake5.lua
@@ -86,7 +86,9 @@ project "CheatMenuVC"
         "../src/Visual.h", 
         "../src/Visual.cpp",
         "../src/ResourceStore.h", 
-        "../src/ResourceStore.cpp"
+        "../src/ResourceStore.cpp",
+        "../src/FileHandler.h", 
+        "../src/FileHandler.cpp"
     }
     includedirs {
         PSDK_DIR .. "/plugin_vc/",