Skip to content

Small fixes #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ziggi wants to merge 4 commits into from
Closed

Small fixes #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
644a731
Merge remote-tracking branch 'refs/remotes/kurta999/YSF_' into YSF_
ziggi Feb 18, 2016
40691b1
Compilation fix
ziggi Feb 18, 2016
6a3ce11
Standartize fQuaternion in CVehicleSyncData
ziggi Feb 18, 2016
85c1390
Fix for byteCameraZoom and byteWeaponState
ziggi Feb 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CCallbackManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ std::vector<AMX *> 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<AMX*>::iterator it = m_vecAMX.begin();
m_vecAMX.insert(it, pAMX);
Expand Down
2 changes: 1 addition & 1 deletion src/CPlayerData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 3 additions & 4 deletions src/Structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down