Fix game crash when loading save/ new game
This commit is contained in:
parent
e458cbc95e
commit
5b1903df0c
29
.vscode/c_cpp_properties.json
vendored
Normal file
29
.vscode/c_cpp_properties.json
vendored
Normal file
@ -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
|
||||||
|
}
|
1
.vscode/settings.json
vendored
1
.vscode/settings.json
vendored
@ -1,5 +1,4 @@
|
|||||||
{
|
{
|
||||||
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
|
|
||||||
"files.associations": {
|
"files.associations": {
|
||||||
"iosfwd": "cpp",
|
"iosfwd": "cpp",
|
||||||
"xlocbuf": "cpp",
|
"xlocbuf": "cpp",
|
||||||
|
@ -380,15 +380,13 @@ void Menu::Main()
|
|||||||
ImGui::Columns(1);
|
ImGui::Columns(1);
|
||||||
|
|
||||||
ImGui::Dummy(ImVec2(0, 10));
|
ImGui::Dummy(ImVec2(0, 10));
|
||||||
ImGui::TextWrapped("Special thanks to,");
|
ImGui::TextWrapped("Thanks to,");
|
||||||
ImGui::Columns(2, NULL, false);
|
ImGui::Columns(2, NULL, false);
|
||||||
|
|
||||||
ImGui::TextWrapped("Dowglas_");
|
|
||||||
ImGui::TextWrapped("Israel");
|
ImGui::TextWrapped("Israel");
|
||||||
|
|
||||||
ImGui::NextColumn();
|
ImGui::NextColumn();
|
||||||
ImGui::TextWrapped("Junior-Djjr");
|
ImGui::TextWrapped("Junior-Djjr");
|
||||||
ImGui::TextWrapped("Um-geek");
|
|
||||||
|
|
||||||
ImGui::Columns(1);
|
ImGui::Columns(1);
|
||||||
|
|
||||||
|
@ -85,16 +85,15 @@ Vehicle::Vehicle()
|
|||||||
{
|
{
|
||||||
uint timer = CTimer::m_snTimeInMilliseconds;
|
uint timer = CTimer::m_snTimeInMilliseconds;
|
||||||
|
|
||||||
static CPlayerPed *player = FindPlayerPed();
|
CPlayerPed *player = FindPlayerPed();
|
||||||
static int hplayer = CPools::GetPedRef(player);
|
|
||||||
CVehicle *veh = player->m_pVehicle;
|
CVehicle *veh = player->m_pVehicle;
|
||||||
|
|
||||||
if (Command<Commands::IS_CHAR_IN_ANY_CAR>(hplayer))
|
if (player && veh)
|
||||||
{
|
{
|
||||||
int hveh = CPools::GetVehicleRef(veh);
|
int hveh = CPools::GetVehicleRef(veh);
|
||||||
|
|
||||||
|
player->m_nPedFlags.CantBeKnockedOffBike = dont_fall_bike ? 1 : 2;
|
||||||
Command<Commands::SET_CAR_HEAVY>(hveh, veh_heavy);
|
Command<Commands::SET_CAR_HEAVY>(hveh, veh_heavy);
|
||||||
Command<Commands::SET_CHAR_CAN_BE_KNOCKED_OFF_BIKE>(hplayer, !dont_fall_bike);
|
|
||||||
Command<Commands::SET_CAR_WATERTIGHT>(hveh, veh_watertight);
|
Command<Commands::SET_CAR_WATERTIGHT>(hveh, veh_watertight);
|
||||||
|
|
||||||
if (unlimited_nitro::enabled && player->m_pVehicle->m_nVehicleSubClass == VEHICLE_AUTOMOBILE)
|
if (unlimited_nitro::enabled && player->m_pVehicle->m_nVehicleSubClass == VEHICLE_AUTOMOBILE)
|
||||||
|
Loading…
Reference in New Issue
Block a user