ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dont change weapon when picking up a drop

Browse Source
This commit is contained in:
Lorenc Pekaj 2018-07-12 10:25:49 +10:00
parent d882605a1c
commit 2f689a843f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pawno/include/irresistible/features/weapon_drop.inc
View File

@ -50,13 +50,14 @@ hook OnPlayerDeath( playerid, killerid, reason )
static static
Float: X, Float: Y, Float: Z; Float: X, Float: Y, Float: Z;
GetPlayerPos( playerid, X, Y, Z ); if ( IsPlayerConnected( killerid ) && ! IsPlayerNPC( killerid ) )
if ( IsPlayerConnected( killerid ) )
{ {
if ( IsPlayerJailed( playerid ) || IsPlayerInPaintBall( playerid ) || IsPlayerInEvent( playerid ) || IsPlayerDueling( playerid ) ) if ( IsPlayerJailed( playerid ) || IsPlayerInPaintBall( playerid ) || IsPlayerInEvent( playerid ) || IsPlayerDueling( playerid ) )
return 1; return 1;
GetPlayerPos( playerid, X, Y, Z );
new new
killer_rank = GetPlayerRank( killerid ), killer_rank = GetPlayerRank( killerid ),
expire_time = gettime( ) + 180; expire_time = gettime( ) + 180;
@ -118,13 +119,15 @@ hook OnPlayerPickUpDynPickup( playerid, pickupid )
} }
else else
{ {
new current_weapon = GetPlayerWeapon( playerid );
GetPlayerKeys( playerid, keys, existing_weapon, existing_weapon ); GetPlayerKeys( playerid, keys, existing_weapon, existing_weapon );
GetPlayerWeaponData( playerid, g_weaponDropData[ dropid ] [ E_SLOT_ID ], existing_weapon, existing_ammo ); GetPlayerWeaponData( playerid, g_weaponDropData[ dropid ] [ E_SLOT_ID ], existing_weapon, existing_ammo );
// printf("Existing Weapon %d, Dropped Weapon %d, Slot id %d", existing_weapon, g_weaponDropData[ dropid ] [ E_WEAPON_ID ], g_weaponDropData[ dropid ] [ E_SLOT_ID ] ); new holding_replace_key = ( keys & KEY_ACTION );
// if ( existing_weapon > g_weaponDropData[ dropid ] [ E_WEAPON_ID ] && ! ( keys & KEY_ACTION ) && existing_ammo ) // if ( existing_weapon > g_weaponDropData[ dropid ] [ E_WEAPON_ID ] && ! ( keys & KEY_ACTION ) && existing_ammo )
if ( existing_weapon != g_weaponDropData[ dropid ] [ E_WEAPON_ID ] && ! ( keys & KEY_ACTION ) && existing_ammo ) if ( existing_weapon != g_weaponDropData[ dropid ] [ E_WEAPON_ID ] && ! holding_replace_key && existing_ammo )
{ {
ShowPlayerHelpDialog( playerid, 2500, "Hold ~r~~k~~PED_ANSWER_PHONE~~w~ To Take %s", ReturnWeaponName( g_weaponDropData[ dropid ] [ E_WEAPON_ID ] ) ); ShowPlayerHelpDialog( playerid, 2500, "Hold ~r~~k~~PED_ANSWER_PHONE~~w~ To Take %s", ReturnWeaponName( g_weaponDropData[ dropid ] [ E_WEAPON_ID ] ) );
return 1; return 1;
@ -135,6 +138,11 @@ hook OnPlayerPickUpDynPickup( playerid, pickupid )
#endif #endif
GivePlayerWeapon( playerid, g_weaponDropData[ dropid ] [ E_WEAPON_ID ], g_weaponDropData[ dropid ] [ E_AMMO ] ); GivePlayerWeapon( playerid, g_weaponDropData[ dropid ] [ E_WEAPON_ID ], g_weaponDropData[ dropid ] [ E_AMMO ] );
// don't change player weapon
if ( ! holding_replace_key ) {
SetPlayerArmedWeapon( playerid, current_weapon );
}
} }
// destroy health pickup // destroy health pickup