From 30ac3f583849f68ea7a29df5be6c53b3ef1fe26d Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 9 Sep 2013 19:28:50 +0100 Subject: Added a few changes [SEE DESC] * Revised pickup comments * SlotArea pickup tossing now reflects Player.cpp * Removed unneeded ItemShears comment (was working already) * Sand and gravel pickups spawn with correct speed --- source/Blocks/BlockHandler.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source/Blocks') diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp index 5134c1103..2627ac6b4 100644 --- a/source/Blocks/BlockHandler.cpp +++ b/source/Blocks/BlockHandler.cpp @@ -351,6 +351,14 @@ void cBlockHandler::DropBlock(cWorld * a_World, cEntity * a_Digger, int a_BlockX if (!Pickups.empty()) { + // Add random offset to the spawn position: + // Commented out until bug with pickups not spawning properly is fixed, see World.cpp + /* + int MicroX = (int)(a_BlockX * 32) + (r1.randInt(16) + r1.randInt(16) - 16); + int MicroY = (int)(a_BlockY * 32) + (r1.randInt(16) + r1.randInt(16) - 16); + int MicroZ = (int)(a_BlockZ * 32) + (r1.randInt(16) + r1.randInt(16) - 16); + */ + a_World->SpawnItemPickups(Pickups, a_BlockX, a_BlockY, a_BlockZ); } } -- cgit v1.2.3 From e0c649dcc40f13f146abcae5e8262252cc7b53e1 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 9 Sep 2013 19:36:53 +0100 Subject: Fixed DropSpensers not rotating properly --- source/Blocks/BlockDropSpenser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/Blocks') diff --git a/source/Blocks/BlockDropSpenser.h b/source/Blocks/BlockDropSpenser.h index e5572da8a..b7f20825d 100644 --- a/source/Blocks/BlockDropSpenser.h +++ b/source/Blocks/BlockDropSpenser.h @@ -31,7 +31,7 @@ public: a_BlockType = m_BlockType; // FIXME: Do not use cPiston class for dispenser placement! - a_BlockMeta = cPiston::RotationPitchToMetaData(a_Player->GetRotation(), 0); + a_BlockMeta = cPiston::RotationPitchToMetaData(a_Player->GetRotation(), a_Player->GetPitch()); return true; } } ; -- cgit v1.2.3