Skip to content

Standartize CVehicleSyncData quaternions variables #22

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 2 commits into from
Closed

Standartize CVehicleSyncData quaternions variables #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74a59c6
Standartize CVehicleSyncData quaternions
ziggi Feb 13, 2016
2c88f2d
sampgdk fix
ziggi Feb 13, 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
44 changes: 22 additions & 22 deletions src/CPlayerData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ CPlayerData::CPlayerData( WORD playerid )
memset(bCustomQuat, false, MAX_PLAYERS);
memset(vecCustomPos, NULL, sizeof(CVector));

dwFPS = 0;
dwFPS = 0;
dwLastDrunkLevel = 0;
wSurfingInfo = 0;

Expand All @@ -87,17 +87,17 @@ CPlayerData::~CPlayerData( void )

}

bool CPlayerData::SetPlayerTeamForPlayer(WORD teamplayerid, int team)
{
bool CPlayerData::SetPlayerTeamForPlayer(WORD teamplayerid, int team)
{
m_iTeams[teamplayerid] = team;

RakNet::BitStream bs;
bs.Write((WORD)teamplayerid);
bs.Write((BYTE)team);
pRakServer->RPC(&RPC_SetPlayerTeam, &bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, pRakServer->GetPlayerIDFromIndex(wPlayerID), 0, 0);
return true;
}

pRakServer->RPC(&RPC_SetPlayerTeam, &bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, pRakServer->GetPlayerIDFromIndex(wPlayerID), 0, 0);
return true;
}
int CPlayerData::GetPlayerTeamForPlayer(WORD teamplayerid)
{
CPlayer *p = pNetGame->pPlayerPool->pPlayer[teamplayerid];
Expand All @@ -106,9 +106,9 @@ int CPlayerData::GetPlayerTeamForPlayer(WORD teamplayerid)
return p->spawn.byteTeam;
}
return m_iTeams[teamplayerid];
}


}
bool CPlayerData::SetPlayerSkinForPlayer(WORD skinplayerid, int skin)
{
m_iSkins[skinplayerid] = skin;
Expand All @@ -117,9 +117,9 @@ bool CPlayerData::SetPlayerSkinForPlayer(WORD skinplayerid, int skin)
bs.Write((int)skinplayerid);
bs.Write((int)skin);
pRakServer->RPC(&RPC_SetPlayerSkin, &bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, pRakServer->GetPlayerIDFromIndex(wPlayerID), 0, 0);
return true;
}

return true;
}
int CPlayerData::GetPlayerSkinForPlayer(WORD skinplayerid)
{
CPlayer *p = pNetGame->pPlayerPool->pPlayer[skinplayerid];
Expand All @@ -130,8 +130,8 @@ int CPlayerData::GetPlayerSkinForPlayer(WORD skinplayerid)
return m_iSkins[skinplayerid];
}

bool CPlayerData::SetPlayerNameForPlayer(WORD nameplayerid, char *name)
{
bool CPlayerData::SetPlayerNameForPlayer(WORD nameplayerid, char *name)
{
memcpy(&m_szNames[nameplayerid], name, MAX_PLAYER_NAME);
BYTE len = static_cast<BYTE>(strlen(name));

Expand All @@ -141,10 +141,10 @@ bool CPlayerData::SetPlayerNameForPlayer(WORD nameplayerid, char *name)
bs.Write(name, len);
bs.Write((BYTE)1);

pRakServer->RPC(&RPC_SetPlayerName, &bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, pRakServer->GetPlayerIDFromIndex(wPlayerID), 0, 0);
pRakServer->RPC(&RPC_SetPlayerName, &bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, pRakServer->GetPlayerIDFromIndex(wPlayerID), 0, 0);
return true;
}

char *CPlayerData::GetPlayerNameForPlayer(WORD nameplayerid)
{
if (!m_szNames[nameplayerid][0])
Expand All @@ -162,9 +162,9 @@ bool CPlayerData::SetPlayerFightingStyleForPlayer(WORD styleplayerid, int style)
bs.Write((WORD)styleplayerid);
bs.Write((BYTE)style);
pRakServer->RPC(&RPC_SetFightingStyle, &bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, pRakServer->GetPlayerIDFromIndex(wPlayerID), 0, 0);
return true;
}

return true;
}
int CPlayerData::GetPlayerFightingStyleForPlayer(WORD styleplayerid)
{
CPlayer *p = pNetGame->pPlayerPool->pPlayer[styleplayerid];
Expand Down 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[0]);
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 Expand Up @@ -497,4 +497,4 @@ void RebuildSyncData(RakNet::BitStream *bsSync, WORD toplayerid)
break;
}
}
}
}
3 changes: 1 addition & 2 deletions src/Structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 - 0x0037
CVector vecPosition; // 0x0037 - 0x0043
CVector vecVelocity; // 0x0043 - 0x004F
float fHealth; // 0x004F - 0x0053
Expand Down