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] Fix game/playerped.cpp so it compiles; retail confirms 2-arg SetArmedWeapon and marker opcodes 0x0187/0x018B

Browse Source
This commit is contained in:
ricardoofnl
2026-09-02 23:57:35 +07:00
parent db9020f727
commit 28ca7ea41c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saco/game/playerped.cpp
+6 -6
View File
@@ -35,7 +35,7 @@ CPlayerPed::CPlayerPed()
field_2AC = 1;
m_dwArrow = 0;
field_2B9 = 0;
m_iPissingState = 0;
field_2F2 = 0;
m_iDanceState = 0;
field_2DE = 0;
field_2E2 = 0;
@@ -795,7 +795,7 @@ void CPlayerPed::PutDirectlyInVehicle(int iVehicleID, int iSeat)
if(!GamePool_Ped_GetAt(m_dwGTAId)) return;
if(GetCurrentWeapon() == WEAPON_PARACHUTE) {
SetArmedWeapon(0);
SetArmedWeapon(0, false);
}
VEHICLE_TYPE *pVehicle = GamePool_Vehicle_GetAt(iVehicleID);
@@ -826,10 +826,10 @@ void CPlayerPed::PutDirectlyInVehicle(int iVehicleID, int iSeat)
if(pNetGame) {
CVehiclePool* pVehiclePool = pNetGame->GetVehiclePool();
VEHICLEID TrainVehicleId = pVehiclePool->FindIDFromGtaPtr(pVehicle);
if(TrainVehicleId == INVALID_VEHICLE_ID || TrainVehicleId > MAX_VEHICLES) return;
VEHICLEID TrainVehicleId = pVehiclePool->FUNC_1001EB90((int)pVehicle);
if(TrainVehicleId > MAX_VEHICLES) return;
CVehicle* pTrain = pVehiclePool->GetAt(TrainVehicleId);
CVehicle* pTrain = (CVehicle *)pVehiclePool->FUNC_10001120(TrainVehicleId);
if ( pTrain && pTrain->IsATrainPart() && m_pPed == GamePool_FindPlayerPed() ) {
ScriptCommand(&camera_on_vehicle, pTrain->m_dwGTAId, 3, 2);
}
@@ -848,7 +848,7 @@ void CPlayerPed::EnterVehicle(int iVehicleID, BOOL bPassenger)
bIgnoreNextEntry = TRUE;
if(GetCurrentWeapon() == WEAPON_PARACHUTE) {
SetArmedWeapon(0);
SetArmedWeapon(0, false);
}
if(bPassenger) {
saco/game/scripting.h
+2
View File
@@ -53,6 +53,8 @@ const SCRIPT_COMMAND set_marker_color = { 0x0165, "ii" }; // var_marker, co
const SCRIPT_COMMAND enable_zone_names = { 0x09BA, "i" };
const SCRIPT_COMMAND create_radar_marker_without_sphere = { 0x04CE, "fffiv" }; // x, y, z, marker_type, var_marker
const SCRIPT_COMMAND show_on_radar = { 0x0168, "ii" }; // var_marker, size
const SCRIPT_COMMAND create_arrow_above_actor = { 0x0187, "iv" }; // var_actor, var_marker
const SCRIPT_COMMAND show_on_radar2 = { 0x018B, "ii" }; // var_marker, size
const SCRIPT_COMMAND create_icon_marker_sphere = { 0x02A7, "fffiv" };