diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..1e0d7dd --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,29 @@ +{ + "configurations": [ + { + "name": "Win32", + "includePath": [ + "${workspaceFolder}/**", + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.10240.0\\ucrt", + "${DIRECTX9_SDK_DIR}/include", + "${PLUGIN_SDK_DIR}/plugin_sa", + "${PLUGIN_SDK_DIR}/plugin_sa/game_sa", + "${PLUGIN_SDK_DIR}/shared", + "${PLUGIN_SDK_DIR}/shared/game" + ], + "defines": [ + "GTASA", + "_DEBUG", + "UNICODE", + "_UNICODE" + ], + "windowsSdkVersion": "10.0.10240.0", + "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/cl.exe", + "cStandard": "c99", + "cppStandard": "c++17", + "intelliSenseMode": "msvc-x86", + "configurationProvider": "ms-vscode.cmake-tools" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index fb83477..4039b77 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,4 @@ { - "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools", "files.associations": { "iosfwd": "cpp", "xlocbuf": "cpp", diff --git a/src/Menu.cpp b/src/Menu.cpp index e7b9360..3d6ee6f 100644 --- a/src/Menu.cpp +++ b/src/Menu.cpp @@ -380,15 +380,13 @@ void Menu::Main() ImGui::Columns(1); ImGui::Dummy(ImVec2(0, 10)); - ImGui::TextWrapped("Special thanks to,"); + ImGui::TextWrapped("Thanks to,"); ImGui::Columns(2, NULL, false); - ImGui::TextWrapped("Dowglas_"); ImGui::TextWrapped("Israel"); ImGui::NextColumn(); ImGui::TextWrapped("Junior-Djjr"); - ImGui::TextWrapped("Um-geek"); ImGui::Columns(1); diff --git a/src/Vehicle.cpp b/src/Vehicle.cpp index d226454..d34e5f5 100644 --- a/src/Vehicle.cpp +++ b/src/Vehicle.cpp @@ -85,16 +85,15 @@ Vehicle::Vehicle() { uint timer = CTimer::m_snTimeInMilliseconds; - static CPlayerPed *player = FindPlayerPed(); - static int hplayer = CPools::GetPedRef(player); + CPlayerPed *player = FindPlayerPed(); CVehicle *veh = player->m_pVehicle; - if (Command(hplayer)) + if (player && veh) { int hveh = CPools::GetVehicleRef(veh); + player->m_nPedFlags.CantBeKnockedOffBike = dont_fall_bike ? 1 : 2; Command(hveh, veh_heavy); - Command(hplayer, !dont_fall_bike); Command(hveh, veh_watertight); if (unlimited_nitro::enabled && player->m_pVehicle->m_nVehicleSubClass == VEHICLE_AUTOMOBILE) @@ -154,7 +153,7 @@ Vehicle::Vehicle() } neon::traffic_timer = timer; } - + if (bike_fly && veh && veh->IsDriver(player)) { if (veh->m_nVehicleSubClass == VEHICLE_BIKE || veh->m_nVehicleSubClass == VEHICLE_BMX) diff --git a/src/pch.h b/src/pch.h index 2102b54..35064bb 100644 --- a/src/pch.h +++ b/src/pch.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include