Backups/SA-MP
1
0
Fork 0
mirror of https://github.com/dashr9230/SA-MP.git synced 2026-10-10 03:33:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[saco] Match CRemotePlayer::FUNC_10014650; vehicle ids 2000-3000 index the object pool, offsets clamped to +/-100

Browse Source
This commit is contained in:
ricardoofnl
2026-09-03 03:37:09 +07:00
parent cfa984713e
commit 16b657842e
3 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saco/net/objectpool.h
+1 -1
View File
@@ -3,7 +3,7 @@
class CObjectPool
{
private:
public:
int field_0;
int field_4[MAX_OBJECTS];
int field_FA4[MAX_OBJECTS];
saco/net/remoteplayer.cpp
+48
View File
@@ -251,6 +251,54 @@ void CRemotePlayer::FUNC_10014540(short a1, short a2, short a3)
//----------------------------------------------------
void CRemotePlayer::FUNC_10014650()
{
if(field_10A != 17) return;
if(!field_C5.wVehicleID) return;
if(field_C5.wVehicleID == INVALID_VEHICLE_ID) return;
if(field_C5.wVehicleID >= (MAX_VEHICLES + 1000)) return;
CVehiclePool *pVehiclePool = pNetGame->GetVehiclePool();
CObjectPool *pObjectPool = pNetGame->GetObjectPool();
CEntity *pEntity;
if(field_C5.wVehicleID < MAX_VEHICLES) {
if(!pVehiclePool->field_3074[field_C5.wVehicleID]) return;
pEntity = (CEntity *)pVehiclePool->field_1134[field_C5.wVehicleID];
} else {
WORD wObjectID = field_C5.wVehicleID - MAX_VEHICLES;
if(wObjectID > MAX_OBJECTS) return;
if(!pObjectPool->field_4[wObjectID]) return;
pEntity = (CEntity *)pObjectPool->field_FA4[wObjectID];
}
if(!pEntity) return;
if(field_C5.vecOffset.X > 100.0f) return;
if(field_C5.vecOffset.X < -100.0f) return;
if(field_C5.vecOffset.Y > 100.0f) return;
if(field_C5.vecOffset.Y < -100.0f) return;
if(field_C5.vecOffset.Z > 100.0f) return;
if(field_C5.vecOffset.Z < -100.0f) return;
MATRIX4X4 matEntity;
MATRIX4X4 matPed;
VECTOR vecMove;
VECTOR vecTurn;
VECTOR vecOut;
pEntity->GetMatrix(&matEntity);
pEntity->GetMoveSpeedVector(&vecMove);
pEntity->GetTurnSpeedVector(&vecTurn);
m_pPlayerPed->GetMatrix(&matPed);
FUNC_100B4D10(&vecOut, &matEntity, &field_C5.vecOffset);
matPed.pos = vecOut;
m_pPlayerPed->SetMatrix(matPed);
}
//----------------------------------------------------
void CRemotePlayer::FUNC_10014500(int a1)
{
if(!a1) {
saco/net/remoteplayer.h
+3 -1
View File
@@ -23,7 +23,8 @@ public:
char field_AD[24];
// one 68-byte block: ResetAllSyncAttributes memsets it whole
struct {
char _pad0[62];
char _pad0[50];
VECTOR vecOffset; // 0xF7
WORD wVehicleID; // 0x103
char _pad1[4];
} field_C5;
@@ -79,6 +80,7 @@ public:
void FUNC_100143A0(); // .text:100143A0
void FUNC_10014500(int a1); // .text:10014500
void FUNC_10014540(short a1, short a2, short a3); // .text:10014540
void FUNC_10014650(); // .text:10014650
void FUNC_10017610(char *szText); // .text:10017610
void FUNC_100150D0(VECTOR *pPos, VECTOR *pMoveSpeed); // .text:100150D0
void FUNC_100155E0(int a1, VECTOR *pPos, VECTOR *pMoveSpeed); // .text:100155E0