fixed driveby weapons, fixed put-away-item--duplication, updated YSI …

…link
Southclaws · Jan 17, 2017 · a36719f · a36719f
1 parent 4f3cc61
commit a36719f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/gamemodes/ScavengeSurvive.pwn b/gamemodes/ScavengeSurvive.pwn
@@ -115,7 +115,7 @@ public OnGameModeInit()
 
 #include <crashdetect>				// By Zeex					https://github.com/Zeex/samp-plugin-crashdetect
 #include <sscanf2>					// By Y_Less:				https://github.com/maddinat0r/sscanf
-#include <YSI\y_utils>				// By Y_Less, 4:			https://github.com/Southclaws/YSI-4.0
+#include <YSI\y_utils>				// By Y_Less, 4:			https://github.com/Misiur/YSI-Includes
 #include <YSI\y_va>
 #include <YSI\y_timers>
 #include <YSI\y_hooks>

diff --git a/gamemodes/sss/core/char/backpack.pwn b/gamemodes/sss/core/char/backpack.pwn
@@ -259,6 +259,9 @@ stock AddItemToPlayer(playerid, itemid, useinventory = false, playeraction = tru
 	if(useinventory)
 		required = AddItemToInventory(playerid, itemid);
 
+	if(required == 0)
+		return 0;
+
 	if(!IsValidItem(bag_PlayerBagID[playerid]))
 	{
 		if(required > 0)

diff --git a/gamemodes/sss/core/vehicle/core.pwn b/gamemodes/sss/core/vehicle/core.pwn
@@ -563,7 +563,7 @@ PlayerVehicleUpdate(playerid)
 	PlayerTextDrawShow(playerid, veh_DamageUI[playerid]);
 	PlayerTextDrawShow(playerid, veh_EngineUI[playerid]);
 
-	if(IsWeaponDriveby(GetPlayerWeapon(playerid)))
+	if(IsBaseWeaponDriveby(GetPlayerWeapon(playerid)))
 	{
 		if(GetTickCountDifference(GetTickCount(), GetPlayerVehicleExitTick(playerid)) > 3000 && playerstate == PLAYER_STATE_DRIVER)
 			SetPlayerArmedWeapon(playerid, 0);

diff --git a/gamemodes/sss/core/world/defences.pwn b/gamemodes/sss/core/world/defences.pwn
@@ -894,7 +894,6 @@ timer MoveDefence[1500](itemid, playerid)
 
 	new
 		ItemType:itemtype = GetItemType(itemid),
-		objectid = GetItemObjectID(itemid),
 		Float:rx,
 		Float:ry,
 		Float:rz,

diff --git a/gamemodes/sss/core/world/tent.pwn b/gamemodes/sss/core/world/tent.pwn
@@ -234,8 +234,6 @@ hook OnPlayerPickUpItem(playerid, itemid)
 
 hook OnPlayerUseItemWithItem(playerid, itemid, withitemid)
 {
-	dbg("global", CORE, "[OnPlayerUseItemWithItem] in /gamemodes/sss/core/item/tentpack.pwn");
-
 	if(GetItemType(withitemid) == item_TentPack)
 	{
 		new tentid = GetItemArrayDataAtCell(withitemid, 0);