From 995d0b56aaa0c7c1c754989cf1292a1b051db6ef Mon Sep 17 00:00:00 2001 From: Proxy-99 <77501848+Proxy-99@users.noreply.github.com> Date: Mon, 17 Jun 2024 17:50:20 +0300 Subject: [PATCH 1/5] Revert "Bump client net module version" This reverts commit f8d9b434b622f0bf2e4d4919c1a2a7226ad56512. --- Shared/sdk/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shared/sdk/version.h b/Shared/sdk/version.h index 9069c14d9b7..52a4280b27f 100644 --- a/Shared/sdk/version.h +++ b/Shared/sdk/version.h @@ -108,7 +108,7 @@ #define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR) #define _NETCODE_VERSION_BRANCH_ID 0x4 // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk) -#define _CLIENT_NET_MODULE_VERSION 0x0AE // (0x000 - 0xfff) Lvl9 wizards only +#define _CLIENT_NET_MODULE_VERSION 0x0AD // (0x000 - 0xfff) Lvl9 wizards only #define _SERVER_NET_MODULE_VERSION 0x0AB // (0x000 - 0xfff) Lvl9 wizards only #define _NETCODE_VERSION 0x1DA // (0x000 - 0xfff) Increment when net messages change (pre-release) From efb41545efaa139be21da36d8c03a6325fca9216 Mon Sep 17 00:00:00 2001 From: Proxy-99 <77501848+Proxy-99@users.noreply.github.com> Date: Mon, 17 Jun 2024 18:28:03 +0300 Subject: [PATCH 2/5] fix engine --- Client/mods/deathmatch/logic/CClientVehicle.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Client/mods/deathmatch/logic/CClientVehicle.cpp b/Client/mods/deathmatch/logic/CClientVehicle.cpp index cc3993adc96..41909c2b379 100644 --- a/Client/mods/deathmatch/logic/CClientVehicle.cpp +++ b/Client/mods/deathmatch/logic/CClientVehicle.cpp @@ -1117,8 +1117,12 @@ void CClientVehicle::SetVariant(unsigned char ucVariant, unsigned char ucVariant // clear our component data to regenerate it m_ComponentData.clear(); - ReCreate(); + + if (!m_bEngineOn) + { + m_pVehicle->SetEngineOn(m_bEngineOn); + } } bool CClientVehicle::IsEngineBroken() From 88b507aed58448c452bda5668512eecc33b64f98 Mon Sep 17 00:00:00 2001 From: Proxy-99 <77501848+Proxy-99@users.noreply.github.com> Date: Mon, 17 Jun 2024 18:29:56 +0300 Subject: [PATCH 3/5] Reapply "Bump client net module version" This reverts commit 995d0b56aaa0c7c1c754989cf1292a1b051db6ef. --- Shared/sdk/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shared/sdk/version.h b/Shared/sdk/version.h index 52a4280b27f..9069c14d9b7 100644 --- a/Shared/sdk/version.h +++ b/Shared/sdk/version.h @@ -108,7 +108,7 @@ #define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR) #define _NETCODE_VERSION_BRANCH_ID 0x4 // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk) -#define _CLIENT_NET_MODULE_VERSION 0x0AD // (0x000 - 0xfff) Lvl9 wizards only +#define _CLIENT_NET_MODULE_VERSION 0x0AE // (0x000 - 0xfff) Lvl9 wizards only #define _SERVER_NET_MODULE_VERSION 0x0AB // (0x000 - 0xfff) Lvl9 wizards only #define _NETCODE_VERSION 0x1DA // (0x000 - 0xfff) Increment when net messages change (pre-release) From e2775cd48e66caa66af238cc2da65b37a114cdcf Mon Sep 17 00:00:00 2001 From: Proxy-99 <77501848+Proxy-99@users.noreply.github.com> Date: Mon, 17 Jun 2024 23:44:21 +0300 Subject: [PATCH 4/5] set the engine after warp --- Client/mods/deathmatch/logic/CClientVehicle.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Client/mods/deathmatch/logic/CClientVehicle.cpp b/Client/mods/deathmatch/logic/CClientVehicle.cpp index 41909c2b379..108ba7c2cfc 100644 --- a/Client/mods/deathmatch/logic/CClientVehicle.cpp +++ b/Client/mods/deathmatch/logic/CClientVehicle.cpp @@ -1118,11 +1118,6 @@ void CClientVehicle::SetVariant(unsigned char ucVariant, unsigned char ucVariant // clear our component data to regenerate it m_ComponentData.clear(); ReCreate(); - - if (!m_bEngineOn) - { - m_pVehicle->SetEngineOn(m_bEngineOn); - } } bool CClientVehicle::IsEngineBroken() @@ -2589,7 +2584,6 @@ void CClientVehicle::Create() m_pVehicle->SetOverrideLights(m_ucOverrideLights); m_pVehicle->SetRemap(static_cast(m_ucPaintjob)); m_pVehicle->SetBodyDirtLevel(m_fDirtLevel); - m_pVehicle->SetEngineOn(m_bEngineOn); m_pVehicle->SetAreaCode(m_ucInterior); m_pVehicle->SetSmokeTrailEnabled(m_bSmokeTrail); m_pVehicle->SetGravity(&m_vecGravity); @@ -2642,6 +2636,8 @@ void CClientVehicle::Create() if (m_pDriver) m_pDriver->WarpIntoVehicle(this, 0); + m_pVehicle->SetEngineOn(m_bEngineOn); + // Warp the passengers back in for (unsigned int i = 0; i < 8; i++) { From bf296aa67a0767a22c3c0b3c762ac09f71d758c8 Mon Sep 17 00:00:00 2001 From: Proxy-99 <77501848+Proxy-99@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:26:15 +0300 Subject: [PATCH 5/5] foramt correction --- Client/mods/deathmatch/logic/CClientVehicle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/mods/deathmatch/logic/CClientVehicle.cpp b/Client/mods/deathmatch/logic/CClientVehicle.cpp index 108ba7c2cfc..64ca38ba730 100644 --- a/Client/mods/deathmatch/logic/CClientVehicle.cpp +++ b/Client/mods/deathmatch/logic/CClientVehicle.cpp @@ -2636,7 +2636,7 @@ void CClientVehicle::Create() if (m_pDriver) m_pDriver->WarpIntoVehicle(this, 0); - m_pVehicle->SetEngineOn(m_bEngineOn); + m_pVehicle->SetEngineOn(m_bEngineOn); // Warp the passengers back in for (unsigned int i = 0; i < 8; i++)