From 40691b17e0235873e753c864c48bc0d848d801a6 Mon Sep 17 00:00:00 2001 From: Sergey Marochkin Date: Thu, 18 Feb 2016 17:30:59 +0000 Subject: [PATCH 1/3] Compilation fix --- src/CCallbackManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CCallbackManager.cpp b/src/CCallbackManager.cpp index b9ac332..e92a34d 100644 --- a/src/CCallbackManager.cpp +++ b/src/CCallbackManager.cpp @@ -5,7 +5,7 @@ std::vector CCallbackManager::m_vecAMX; void CCallbackManager::RegisterAMX(AMX *pAMX) { // Add gamemode to the first position in vector - if (pNetGame && pNetGame->pGameModePool && &pNetGame->pGameModePool->m_amx == pAMX) + if (pNetGame && pNetGame->pGameModePool && &pNetGame->pGameModePool->amx == pAMX) { std::vector::iterator it = m_vecAMX.begin(); m_vecAMX.insert(it, pAMX); From 6a3ce11bae1d3b267d3fc098b83dd310f79b4655 Mon Sep 17 00:00:00 2001 From: Sergey Marochkin Date: Thu, 18 Feb 2016 17:31:56 +0000 Subject: [PATCH 2/3] Standartize fQuaternion in CVehicleSyncData --- src/CPlayerData.cpp | 2 +- src/Structs.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/CPlayerData.cpp b/src/CPlayerData.cpp index 49d4e99..5a63569 100644 --- a/src/CPlayerData.cpp +++ b/src/CPlayerData.cpp @@ -429,7 +429,7 @@ void RebuildSyncData(RakNet::BitStream *bsSync, WORD toplayerid) WORD keys = p->vehicleSyncData.wKeys &= ~pPlayerData[playerid]->dwDisabledKeys; bsSync->Write(keys); - bsSync->WriteNormQuat(p->vehicleSyncData.fQuaternionAngle, p->vehicleSyncData.vecQuaternion.fX, p->vehicleSyncData.vecQuaternion.fY, p->vehicleSyncData.vecQuaternion.fZ); + bsSync->WriteNormQuat(p->vehicleSyncData.fQuaternion[0], p->vehicleSyncData.fQuaternion[1], p->vehicleSyncData.fQuaternion[2], p->vehicleSyncData.fQuaternion[3]); bsSync->Write((char*)&p->vehicleSyncData.vecPosition, sizeof(CVector)); bsSync->WriteVector(p->vehicleSyncData.vecVelocity.fX, p->vehicleSyncData.vecVelocity.fY, p->vehicleSyncData.vecVelocity.fZ); bsSync->Write((WORD)p->vehicleSyncData.fHealth); diff --git a/src/Structs.h b/src/Structs.h index 2a156f9..e799534 100644 --- a/src/Structs.h +++ b/src/Structs.h @@ -129,8 +129,7 @@ struct CVehicleSyncData WORD wUDAnalog; // 0x0021 - 0x0023 WORD wLRAnalog; // 0x0023 - 0x0025 WORD wKeys; // 0x0025 - 0x0027 - float fQuaternionAngle; // 0x0027 - 0x002B - CVector vecQuaternion; // 0x002B - 0x0037 + float fQuaternion[4]; // 0x0027 - 0x0037x CVector vecPosition; // 0x0037 - 0x0043 CVector vecVelocity; // 0x0043 - 0x004F float fHealth; // 0x004F - 0x0053 From 85c139075214f07676320adcfeb13c003dde8f1d Mon Sep 17 00:00:00 2001 From: Sergey Marochkin Date: Thu, 18 Feb 2016 17:32:44 +0000 Subject: [PATCH 3/3] Fix for byteCameraZoom and byteWeaponState --- src/Structs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Structs.h b/src/Structs.h index e799534..a8ddebe 100644 --- a/src/Structs.h +++ b/src/Structs.h @@ -113,8 +113,8 @@ struct CAimSyncData CVector vecFront; // 1 - 13 CVector vecPosition; // 13 - 25 float fZAim; // 25 - 29 - BYTE byteWeaponState : 6; // 29 - BYTE byteCameraZoom : 2; // 29 + BYTE byteCameraZoom : 6; // 29 + BYTE byteWeaponState : 2; // 29 BYTE unk; // 30 - 31 WORD wCameraObject; // 31 - 33 WORD wCameraVehicle; // 33 - 35