From c9c2a4f479474fe03acce598ba2687a0f4817083 Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Mon, 26 May 2014 08:44:16 +0200
Subject: Added Arrow- and FireCharge-Dispensing to DispenserEntity.

---
 src/BlockEntities/DispenserEntity.cpp | 107 ++++++++++++++++++++++++++++------
 src/BlockEntities/DispenserEntity.h   |  15 +++--
 2 files changed, 95 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 2a32f69d9..7257513df 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -6,8 +6,10 @@
 #include "../Simulator/FluidSimulator.h"
 #include "../Chunk.h"
 
-
-
+#include "../World.h"
+#include "../Entities/ArrowEntity.h"
+#include "../Entities/FireChargeEntity.h"
+#include "../Matrix4.h"
 
 
 cDispenserEntity::cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
@@ -69,7 +71,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 			}
 			break;
 		}  // E_ITEM_BUCKET
-		
+
 		case E_ITEM_WATER_BUCKET:
 		{
 			LOGD("Dispensing water bucket in slot %d; DispBlock is \"%s\" (%d).", a_SlotNum, ItemTypeToString(DispBlock).c_str(), DispBlock);
@@ -83,7 +85,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 			}
 			break;
 		}
-		
+
 		case E_ITEM_LAVA_BUCKET:
 		{
 			LOGD("Dispensing lava bucket in slot %d; DispBlock is \"%s\" (%d).", a_SlotNum, ItemTypeToString(DispBlock).c_str(), DispBlock);
@@ -97,7 +99,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 			}
 			break;
 		}
-		
+
 		case E_ITEM_SPAWN_EGG:
 		{
 			double MobX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
@@ -108,7 +110,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 			}
 			break;
 		}
-		
+
 		case E_BLOCK_TNT:
 		{
 			// Spawn a primed TNT entity, if space allows:
@@ -128,7 +130,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 			if (DispChunk->GetBlock(DispX, DispY, DispZ) == E_BLOCK_AIR)
 			{
 				DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_FIRE, 0);
-				
+
 				bool ItemBroke = m_Contents.DamageItem(a_SlotNum, 1);
 
 				if (ItemBroke)
@@ -138,13 +140,63 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 			}
 			break;
 		}
-		
+
 		case E_ITEM_FIRE_CHARGE:
 		{
-			// TODO: Spawn fireball entity
+			Vector3d Speed = GetProjectileLookVector(a_Chunk);
+
+			double MobX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
+			double MobZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
+
+
+			cFireChargeEntity* fireCharge = new cFireChargeEntity(NULL /*was this*/, MobX, (double) DispY + 0.3, MobZ, Speed);
+
+
+			if (fireCharge == NULL)
+			{
+				break;
+			}
+			if (!fireCharge->Initialize(m_World))
+			{
+
+				delete fireCharge;
+				break;
+			}
+			m_World->BroadcastSpawnEntity(*fireCharge);
+
+			m_Contents.ChangeSlotCount(a_SlotNum, -1);
+
+			break;
+		}
+
+		case E_ITEM_ARROW:
+		{
+			Vector3d Speed = GetProjectileLookVector(a_Chunk);
+
+			double MobX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
+			double MobZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
+
+
+			cArrowEntity* Arrow = new cArrowEntity(NULL /*was this*/, MobX, (double) DispY + 0.3, MobZ, Speed);
+
+
+			if (Arrow == NULL)
+			{
+				break;
+			}
+			if (!Arrow->Initialize(m_World))
+			{
+
+				delete Arrow;
+				break;
+			}
+			m_World->BroadcastSpawnEntity(*Arrow);
+
+			m_Contents.ChangeSlotCount(a_SlotNum, -1);
+
 			break;
 		}
-		
+
 		default:
 		{
 			DropFromSlot(a_Chunk, a_SlotNum);
@@ -154,8 +206,29 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 }
 
 
+Vector3d cDispenserEntity::GetProjectileLookVector(cChunk & a_Chunk)
+{
+	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);
+	int Direction = 0;
+	switch (Meta)
+	{
+		case E_META_DROPSPENSER_FACING_YP: Direction = 0; break; // YP & YM don't have associated smoke dirs, just do 4 (centre of block)
+		case E_META_DROPSPENSER_FACING_YM: Direction = 0; break;
+		case E_META_DROPSPENSER_FACING_XM: Direction = 90; break; // WEST
+		case E_META_DROPSPENSER_FACING_XP: Direction = 270; break; // EAST
+		case E_META_DROPSPENSER_FACING_ZM: Direction = 180; break;
+		case E_META_DROPSPENSER_FACING_ZP: Direction = 0; break;
+	}
+
+	Matrix4d m;
+	m.Init(Vector3d(), 0, Direction, 0);
+	Vector3d Look = m.Transform(Vector3d(0, 0, 1));
 
+	Vector3d Speed = Look * 20;
+	Speed.y = Speed.y + 1;
 
+	return Speed;
+}
 
 
 bool cDispenserEntity::ScoopUpLiquid(int a_SlotNum, short a_BucketItemType)
@@ -167,14 +240,14 @@ bool cDispenserEntity::ScoopUpLiquid(int a_SlotNum, short a_BucketItemType)
 		m_Contents.SetSlot(a_SlotNum, LiquidBucket);
 		return true;
 	}
-	
+
 	// There are stacked buckets at the selected slot, see if a full bucket will fit somewhere else
 	if (m_Contents.HowManyCanFit(LiquidBucket) < 1)
 	{
 		// Cannot fit into m_Contents
 		return false;
 	}
-	
+
 	m_Contents.ChangeSlotCount(a_SlotNum, -1);
 	m_Contents.AddItem(LiquidBucket);
 	return true;
@@ -195,7 +268,7 @@ bool cDispenserEntity::EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum
 		// Not a suitable block in front
 		return false;
 	}
-	
+
 	cItem EmptyBucket(E_ITEM_BUCKET, 1);
 	if (m_Contents.GetSlot(a_SlotNum).m_ItemCount == 1)
 	{
@@ -203,20 +276,16 @@ bool cDispenserEntity::EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum
 		m_Contents.SetSlot(a_SlotNum, EmptyBucket);
 		return true;
 	}
-	
+
 	// There are full buckets stacked at this slot, check if we can fit in the empty bucket
 	if (m_Contents.HowManyCanFit(EmptyBucket) < 1)
 	{
 		// The empty bucket wouldn't fit into m_Contents
 		return false;
 	}
-	
+
 	// The empty bucket fits in, remove one full bucket and add the empty one
 	m_Contents.ChangeSlotCount(a_SlotNum, -1);
 	m_Contents.AddItem(EmptyBucket);
 	return true;
 }
-
-
-
-
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index fdfe4e5b4..02a34be37 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -12,11 +12,11 @@ class cDispenserEntity :
 	public cDropSpenserEntity
 {
 	typedef cDropSpenserEntity super;
-	
+
 public:
 
 	// tolua_end
-	
+
 	/// Constructor used for normal operation
 	cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
 
@@ -25,14 +25,13 @@ public:
 private:
 	// cDropSpenser overrides:
 	virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) override;
-	
+
 	/// If such a bucket can fit, adds it to m_Contents and returns true
 	bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType);
-	
+
+	// Returns how to aim the projectile
+	Vector3d GetProjectileLookVector(cChunk & a_Chunk);
+
 	/// If the a_BlockInFront is liquidable and the empty bucket can fit, does the m_Contents processing and returns true
 	bool EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum);
 } ;  // tolua_export
-
-
-
-
-- 
cgit v1.2.3


From 74801f564775ae4c6b70834f76167a54b8a84826 Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Mon, 26 May 2014 14:47:04 +0200
Subject: - Added support for more types of projectiles in the Dispenser -
 Improved the method of spawning projectiles in the world - Added another
 method for spawning the projectiles

---
 src/BlockEntities/DispenserEntity.cpp | 82 +++++++++++++++++++----------------
 src/BlockEntities/DispenserEntity.h   |  7 +++
 2 files changed, 51 insertions(+), 38 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 7257513df..e2032a041 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -9,9 +9,12 @@
 #include "../World.h"
 #include "../Entities/ArrowEntity.h"
 #include "../Entities/FireChargeEntity.h"
+#include "../Entities/ProjectileEntity.h"
 #include "../Matrix4.h"
 
 
+
+
 cDispenserEntity::cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
 	super(E_BLOCK_DISPENSER, a_BlockX, a_BlockY, a_BlockZ, a_World)
 {
@@ -143,56 +146,37 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_FIRE_CHARGE:
 		{
-			Vector3d Speed = GetProjectileLookVector(a_Chunk);
-
-			double MobX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
-			double MobZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
-
-
-			cFireChargeEntity* fireCharge = new cFireChargeEntity(NULL /*was this*/, MobX, (double) DispY + 0.3, MobZ, Speed);
-
-
-			if (fireCharge == NULL)
-			{
-				break;
-			}
-			if (!fireCharge->Initialize(m_World))
-			{
-
-				delete fireCharge;
-				break;
-			}
-			m_World->BroadcastSpawnEntity(*fireCharge);
-
-			m_Contents.ChangeSlotCount(a_SlotNum, -1);
+			spawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFireCharge);
 
 			break;
 		}
 
 		case E_ITEM_ARROW:
 		{
-			Vector3d Speed = GetProjectileLookVector(a_Chunk);
-
-			double MobX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
-			double MobZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
+			spawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkArrow);
 
+			break;
+		}
 
-			cArrowEntity* Arrow = new cArrowEntity(NULL /*was this*/, MobX, (double) DispY + 0.3, MobZ, Speed);
+		case E_ITEM_SNOWBALL:
+		{
+			// Not working as there is no such entity yet?
+			spawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkSnowball);
 
+			break;
+		}
 
-			if (Arrow == NULL)
-			{
-				break;
-			}
-			if (!Arrow->Initialize(m_World))
-			{
+		case E_ITEM_EGG:
+		{
+			// Not working as there is no such entity yet?
+			spawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkEgg);
 
-				delete Arrow;
-				break;
-			}
-			m_World->BroadcastSpawnEntity(*Arrow);
+			break;
+		}
 
-			m_Contents.ChangeSlotCount(a_SlotNum, -1);
+		case E_ITEM_FIREWORK_ROCKET:
+		{
+			spawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFirework);
 
 			break;
 		}
@@ -206,6 +190,20 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 }
 
 
+
+void cDispenserEntity::spawnProjectileFromDispenser(cChunk& a_Chunk, int& DispX, int& DispY, int& DispZ, cProjectileEntity::eKind kind)
+{
+	Vector3d Speed = GetProjectileLookVector(a_Chunk);
+	cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
+
+	double EntityX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
+	double EntityZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
+
+	m_World->CreateProjectile((double) EntityX, (double) DispY, (double) EntityZ, cProjectileEntity::pkArrow, NULL, NULL, &Speed);
+}
+
+
+
 Vector3d cDispenserEntity::GetProjectileLookVector(cChunk & a_Chunk)
 {
 	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);
@@ -231,6 +229,10 @@ Vector3d cDispenserEntity::GetProjectileLookVector(cChunk & a_Chunk)
 }
 
 
+
+
+
+
 bool cDispenserEntity::ScoopUpLiquid(int a_SlotNum, short a_BucketItemType)
 {
 	cItem LiquidBucket(a_BucketItemType, 1);
@@ -289,3 +291,7 @@ bool cDispenserEntity::EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum
 	m_Contents.AddItem(EmptyBucket);
 	return true;
 }
+
+
+
+
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index 02a34be37..9290bee5c 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -29,9 +29,16 @@ private:
 	/// If such a bucket can fit, adds it to m_Contents and returns true
 	bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType);
 
+	// Spawns a projectile of the given kind in front of the dispenser
+	void spawnProjectileFromDispenser(cChunk& a_Chunk, int& DispX, int& DispY, int& DispZ, cProjectileEntity::eKind kind);
+
 	// Returns how to aim the projectile
 	Vector3d GetProjectileLookVector(cChunk & a_Chunk);
 
 	/// If the a_BlockInFront is liquidable and the empty bucket can fit, does the m_Contents processing and returns true
 	bool EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum);
 } ;  // tolua_export
+
+
+
+
-- 
cgit v1.2.3


From 1128dc783f4ee0913f3395c0a79ebdbbce2cfdee Mon Sep 17 00:00:00 2001
From: Joannis <joannis.orlandos@gmail.com>
Date: Tue, 27 May 2014 11:08:06 +0200
Subject: - Fixed the ampersands and asterisks to fit the format. - Fixed the
 method "SpawnProjectileFromDispenser" to use CamelCasing.

---
 src/BlockEntities/DispenserEntity.cpp | 14 +++++++-------
 src/BlockEntities/DispenserEntity.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index e2032a041..0f64118ef 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -146,14 +146,14 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_FIRE_CHARGE:
 		{
-			spawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFireCharge);
+			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFireCharge);
 
 			break;
 		}
 
 		case E_ITEM_ARROW:
 		{
-			spawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkArrow);
+			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkArrow);
 
 			break;
 		}
@@ -161,7 +161,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		case E_ITEM_SNOWBALL:
 		{
 			// Not working as there is no such entity yet?
-			spawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkSnowball);
+			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkSnowball);
 
 			break;
 		}
@@ -169,14 +169,14 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		case E_ITEM_EGG:
 		{
 			// Not working as there is no such entity yet?
-			spawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkEgg);
+			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkEgg);
 
 			break;
 		}
 
 		case E_ITEM_FIREWORK_ROCKET:
 		{
-			spawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFirework);
+			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFirework);
 
 			break;
 		}
@@ -191,7 +191,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 
 
-void cDispenserEntity::spawnProjectileFromDispenser(cChunk& a_Chunk, int& DispX, int& DispY, int& DispZ, cProjectileEntity::eKind kind)
+void cDispenserEntity::SpawnProjectileFromDispenser(cChunk & a_Chunk, int & DispX, int & DispY, int & DispZ, cProjectileEntity::eKind kind)
 {
 	Vector3d Speed = GetProjectileLookVector(a_Chunk);
 	cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
@@ -199,7 +199,7 @@ void cDispenserEntity::spawnProjectileFromDispenser(cChunk& a_Chunk, int& DispX,
 	double EntityX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
 	double EntityZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
 
-	m_World->CreateProjectile((double) EntityX, (double) DispY, (double) EntityZ, cProjectileEntity::pkArrow, NULL, NULL, &Speed);
+	m_World->CreateProjectile((double) EntityX, (double) DispY, (double) EntityZ, cProjectileEntity::pkArrow, NULL, NULL, & Speed);
 }
 
 
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index 9290bee5c..8bc2475c9 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -30,7 +30,7 @@ private:
 	bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType);
 
 	// Spawns a projectile of the given kind in front of the dispenser
-	void spawnProjectileFromDispenser(cChunk& a_Chunk, int& DispX, int& DispY, int& DispZ, cProjectileEntity::eKind kind);
+	void SpawnProjectileFromDispenser(cChunk& a_Chunk, int& DispX, int& DispY, int& DispZ, cProjectileEntity::eKind kind);
 
 	// Returns how to aim the projectile
 	Vector3d GetProjectileLookVector(cChunk & a_Chunk);
-- 
cgit v1.2.3


From e5fd782524cdf4b838ad689baef44a61aa4933c2 Mon Sep 17 00:00:00 2001
From: Joannis <joannis.orlandos@gmail.com>
Date: Wed, 28 May 2014 09:10:09 +0200
Subject: - Implemented vertical dispensing for projectiles. - Fixed some
 terrible commit issues on my side.

---
 src/BlockEntities/DispenserEntity.cpp | 54 +++++++++++++++++++++++++----------
 src/BlockEntities/DispenserEntity.h   |  2 +-
 2 files changed, 40 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 0f64118ef..638a844e6 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -147,6 +147,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		case E_ITEM_FIRE_CHARGE:
 		{
 			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFireCharge);
+			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
 		}
@@ -154,6 +155,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		case E_ITEM_ARROW:
 		{
 			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkArrow);
+			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
 		}
@@ -162,6 +164,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		{
 			// Not working as there is no such entity yet?
 			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkSnowball);
+			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
 		}
@@ -170,6 +173,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		{
 			// Not working as there is no such entity yet?
 			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkEgg);
+			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
 		}
@@ -177,6 +181,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		case E_ITEM_FIREWORK_ROCKET:
 		{
 			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFirework);
+			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
 		}
@@ -199,7 +204,7 @@ void cDispenserEntity::SpawnProjectileFromDispenser(cChunk & a_Chunk, int & Disp
 	double EntityX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
 	double EntityZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
 
-	m_World->CreateProjectile((double) EntityX, (double) DispY, (double) EntityZ, cProjectileEntity::pkArrow, NULL, NULL, & Speed);
+	m_World->CreateProjectile((double) EntityX, (double) DispY + 0.5, (double) EntityZ, cProjectileEntity::pkArrow, NULL, NULL, &Speed);
 }
 
 
@@ -210,22 +215,45 @@ Vector3d cDispenserEntity::GetProjectileLookVector(cChunk & a_Chunk)
 	int Direction = 0;
 	switch (Meta)
 	{
-		case E_META_DROPSPENSER_FACING_YP: Direction = 0; break; // YP & YM don't have associated smoke dirs, just do 4 (centre of block)
-		case E_META_DROPSPENSER_FACING_YM: Direction = 0; break;
-		case E_META_DROPSPENSER_FACING_XM: Direction = 90; break; // WEST
-		case E_META_DROPSPENSER_FACING_XP: Direction = 270; break; // EAST
+		case E_META_DROPSPENSER_FACING_YP: Direction = -1; break;	// UP
+		case E_META_DROPSPENSER_FACING_YM: Direction = -2; break;	// DOWN
+		case E_META_DROPSPENSER_FACING_XM: Direction = 90; break;	// WEST
+		case E_META_DROPSPENSER_FACING_XP: Direction = 270; break;	// EAST
 		case E_META_DROPSPENSER_FACING_ZM: Direction = 180; break;
 		case E_META_DROPSPENSER_FACING_ZP: Direction = 0; break;
 	}
 
-	Matrix4d m;
-	m.Init(Vector3d(), 0, Direction, 0);
-	Vector3d Look = m.Transform(Vector3d(0, 0, 1));
+	if(Direction >= 0)
+	{
+		Matrix4d m;
+		m.Init(Vector3d(), 0, Direction, 0);
+		Vector3d Look = m.Transform(Vector3d(0, 0, 1));
+
+		Vector3d Speed = Look * 20;
+		Speed.y = Speed.y + 1;
+
+		return Speed;
+
+	} else if(Direction == -1)
+	{
+		Matrix4d m;
+		m.Init(Vector3d(), 0, 180, 0);
+		Vector3d Look = m.Transform(Vector3d(0, 1, 0));
+
+		Vector3d Speed = Look * 20;
+
+		return Speed;
 
-	Vector3d Speed = Look * 20;
-	Speed.y = Speed.y + 1;
+	} else {
 
-	return Speed;
+		Matrix4d m;
+		m.Init(Vector3d(), 0, -360, 0);
+		Vector3d Look = m.Transform(Vector3d(0, -1, 0));
+
+		Vector3d Speed = Look * 20;
+
+		return Speed;
+	}
 }
 
 
@@ -291,7 +319,3 @@ bool cDispenserEntity::EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum
 	m_Contents.AddItem(EmptyBucket);
 	return true;
 }
-
-
-
-
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index 8bc2475c9..0b7cd6bea 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -30,7 +30,7 @@ private:
 	bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType);
 
 	// Spawns a projectile of the given kind in front of the dispenser
-	void SpawnProjectileFromDispenser(cChunk& a_Chunk, int& DispX, int& DispY, int& DispZ, cProjectileEntity::eKind kind);
+	void SpawnProjectileFromDispenser(cChunk & a_Chunk, int & DispX, int & DispY, int & DispZ, cProjectileEntity::eKind kind);
 
 	// Returns how to aim the projectile
 	Vector3d GetProjectileLookVector(cChunk & a_Chunk);
-- 
cgit v1.2.3


From 4bc02781af063456db438885d7f3cc8830d5cd92 Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Wed, 28 May 2014 14:34:33 +0200
Subject: - Fixed an issue where dispensers would only shoot arrows
 (appearantly some commits didn't come through) - Cleaned up the code
 according to suggestions.

---
 src/BlockEntities/DispenserEntity.cpp | 57 +++++++++++++++--------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 638a844e6..2b0487c4a 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -198,13 +198,13 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 void cDispenserEntity::SpawnProjectileFromDispenser(cChunk & a_Chunk, int & DispX, int & DispY, int & DispZ, cProjectileEntity::eKind kind)
 {
-	Vector3d Speed = GetProjectileLookVector(a_Chunk);
+	Vector3d Angle = GetProjectileLookVector(a_Chunk);
 	cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
 
 	double EntityX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
 	double EntityZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
 
-	m_World->CreateProjectile((double) EntityX, (double) DispY + 0.5, (double) EntityZ, cProjectileEntity::pkArrow, NULL, NULL, &Speed);
+	m_World->CreateProjectile((double) EntityX, (double) DispY + 0.5, (double) EntityZ, kind, NULL, NULL, &Angle);
 }
 
 
@@ -213,47 +213,38 @@ Vector3d cDispenserEntity::GetProjectileLookVector(cChunk & a_Chunk)
 {
 	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);
 	int Direction = 0;
+	Matrix4d m;
+	Vector3d Look;
+
 	switch (Meta)
 	{
-		case E_META_DROPSPENSER_FACING_YP: Direction = -1; break;	// UP
-		case E_META_DROPSPENSER_FACING_YM: Direction = -2; break;	// DOWN
+		case E_META_DROPSPENSER_FACING_YP:
+			m.Init(Vector3d(), 0, 180, 0);
+			Look = m.Transform(Vector3d(0, 1, 0));
+
+			return Look * 20; // UP
+			break;
+
+		case E_META_DROPSPENSER_FACING_YM:
+			m.Init(Vector3d(), 0, -360, 0);
+			Look = m.Transform(Vector3d(0, -1, 0));
+
+			return Look * 20;; // DOWN
+			break;
+
 		case E_META_DROPSPENSER_FACING_XM: Direction = 90; break;	// WEST
 		case E_META_DROPSPENSER_FACING_XP: Direction = 270; break;	// EAST
 		case E_META_DROPSPENSER_FACING_ZM: Direction = 180; break;
 		case E_META_DROPSPENSER_FACING_ZP: Direction = 0; break;
 	}
 
-	if(Direction >= 0)
-	{
-		Matrix4d m;
-		m.Init(Vector3d(), 0, Direction, 0);
-		Vector3d Look = m.Transform(Vector3d(0, 0, 1));
-
-		Vector3d Speed = Look * 20;
-		Speed.y = Speed.y + 1;
+	m.Init(Vector3d(), 0, Direction, 0);
+	Look = m.Transform(Vector3d(0, 0, 1));
 
-		return Speed;
+	Vector3d Angle = Look * 20;
+	Angle.y = Angle.y + 1;
 
-	} else if(Direction == -1)
-	{
-		Matrix4d m;
-		m.Init(Vector3d(), 0, 180, 0);
-		Vector3d Look = m.Transform(Vector3d(0, 1, 0));
-
-		Vector3d Speed = Look * 20;
-
-		return Speed;
-
-	} else {
-
-		Matrix4d m;
-		m.Init(Vector3d(), 0, -360, 0);
-		Vector3d Look = m.Transform(Vector3d(0, -1, 0));
-
-		Vector3d Speed = Look * 20;
-
-		return Speed;
-	}
+	return Angle;
 }
 
 
-- 
cgit v1.2.3


From 427bddc18970bb66aa1f396c4fd19e52e3ad602d Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Wed, 28 May 2014 15:16:45 +0200
Subject: - Removed breaks. I thought it wouldn't compile without them but the
 issue was appearantly solved with an earlier commit.

---
 src/BlockEntities/DispenserEntity.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 2b0487c4a..341994be8 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -223,14 +223,12 @@ Vector3d cDispenserEntity::GetProjectileLookVector(cChunk & a_Chunk)
 			Look = m.Transform(Vector3d(0, 1, 0));
 
 			return Look * 20; // UP
-			break;
 
 		case E_META_DROPSPENSER_FACING_YM:
 			m.Init(Vector3d(), 0, -360, 0);
 			Look = m.Transform(Vector3d(0, -1, 0));
 
 			return Look * 20;; // DOWN
-			break;
 
 		case E_META_DROPSPENSER_FACING_XM: Direction = 90; break;	// WEST
 		case E_META_DROPSPENSER_FACING_XP: Direction = 270; break;	// EAST
-- 
cgit v1.2.3


From ab633c8bd65b333630053334cb1119f38788698d Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Thu, 29 May 2014 20:19:36 +0200
Subject: - Prefixed all args with "a_" - Added braces around the cases.

---
 src/BlockEntities/DispenserEntity.cpp | 14 +++++++++-----
 src/BlockEntities/DispenserEntity.h   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 341994be8..799d41a1e 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -196,15 +196,15 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 
 
-void cDispenserEntity::SpawnProjectileFromDispenser(cChunk & a_Chunk, int & DispX, int & DispY, int & DispZ, cProjectileEntity::eKind kind)
+void cDispenserEntity::SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_DispX, int & a_DispY, int & a_DispZ, cProjectileEntity::eKind a_kind)
 {
 	Vector3d Angle = GetProjectileLookVector(a_Chunk);
-	cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
+	cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(a_DispX, a_DispZ);
 
-	double EntityX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
-	double EntityZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
+	double EntityX = 0.5 + (a_DispX + DispChunk->GetPosX() * cChunkDef::Width);
+	double EntityZ = 0.5 + (a_DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
 
-	m_World->CreateProjectile((double) EntityX, (double) DispY + 0.5, (double) EntityZ, kind, NULL, NULL, &Angle);
+	m_World->CreateProjectile((double) EntityX, (double) a_DispY + 0.5, (double) EntityZ, a_kind, NULL, NULL, &Angle);
 }
 
 
@@ -219,16 +219,20 @@ Vector3d cDispenserEntity::GetProjectileLookVector(cChunk & a_Chunk)
 	switch (Meta)
 	{
 		case E_META_DROPSPENSER_FACING_YP:
+		{
 			m.Init(Vector3d(), 0, 180, 0);
 			Look = m.Transform(Vector3d(0, 1, 0));
 
 			return Look * 20; // UP
+		}
 
 		case E_META_DROPSPENSER_FACING_YM:
+		{
 			m.Init(Vector3d(), 0, -360, 0);
 			Look = m.Transform(Vector3d(0, -1, 0));
 
 			return Look * 20;; // DOWN
+		}
 
 		case E_META_DROPSPENSER_FACING_XM: Direction = 90; break;	// WEST
 		case E_META_DROPSPENSER_FACING_XP: Direction = 270; break;	// EAST
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index 0b7cd6bea..76aaccd3c 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -30,7 +30,7 @@ private:
 	bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType);
 
 	// Spawns a projectile of the given kind in front of the dispenser
-	void SpawnProjectileFromDispenser(cChunk & a_Chunk, int & DispX, int & DispY, int & DispZ, cProjectileEntity::eKind kind);
+	void SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_DispX, int & a_DispY, int & a_DispZ, cProjectileEntity::eKind a_kind);
 
 	// Returns how to aim the projectile
 	Vector3d GetProjectileLookVector(cChunk & a_Chunk);
-- 
cgit v1.2.3


From b436359237a9faa1dc5709e4359b73aa6faf4f78 Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Sat, 31 May 2014 16:08:15 +0200
Subject: - Changed the name of the ProjectileLookVector method.

Note: I still think the new name is unclear. Any other suggestions are
welcome.
---
 src/BlockEntities/DispenserEntity.cpp | 4 ++--
 src/BlockEntities/DispenserEntity.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 799d41a1e..db1b405cd 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -198,7 +198,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 void cDispenserEntity::SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_DispX, int & a_DispY, int & a_DispZ, cProjectileEntity::eKind a_kind)
 {
-	Vector3d Angle = GetProjectileLookVector(a_Chunk);
+	Vector3d Angle = GetShootVector(a_Chunk);
 	cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(a_DispX, a_DispZ);
 
 	double EntityX = 0.5 + (a_DispX + DispChunk->GetPosX() * cChunkDef::Width);
@@ -209,7 +209,7 @@ void cDispenserEntity::SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_Di
 
 
 
-Vector3d cDispenserEntity::GetProjectileLookVector(cChunk & a_Chunk)
+Vector3d cDispenserEntity::GetShootVector(cChunk & a_Chunk)
 {
 	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);
 	int Direction = 0;
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index 76aaccd3c..adbe2070c 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -33,7 +33,7 @@ private:
 	void SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_DispX, int & a_DispY, int & a_DispZ, cProjectileEntity::eKind a_kind);
 
 	// Returns how to aim the projectile
-	Vector3d GetProjectileLookVector(cChunk & a_Chunk);
+	Vector3d GetShootVector(cChunk & a_Chunk);
 
 	/// If the a_BlockInFront is liquidable and the empty bucket can fit, does the m_Contents processing and returns true
 	bool EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum);
-- 
cgit v1.2.3


From 545478802b7a8b81ecb9d20ad3355eff1427f575 Mon Sep 17 00:00:00 2001
From: Joannis <joannis.orlandos@gmail.com>
Date: Tue, 3 Jun 2014 09:26:14 +0200
Subject: - Added doxy comments and exported to lua - Manipulation of the
 ShootVector is not to be done by the function that wants to spawn a
 projectile.

---
 src/BlockEntities/DispenserEntity.cpp | 74 +++++++++++++++++++++++++++--------
 src/BlockEntities/DispenserEntity.h   | 12 +++---
 2 files changed, 64 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index db1b405cd..043a140e3 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -146,7 +146,18 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_FIRE_CHARGE:
 		{
-			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFireCharge);
+			if(Meta == E_META_DROPSPENSER_FACING_YP || Meta == E_META_DROPSPENSER_FACING_YM)
+			{
+				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFireCharge, GetShootVector(a_Chunk) * 20);
+			}
+			else
+			{
+				Vector3d ShootVector = GetShootVector(a_Chunk);
+				ShootVector = ShootVector * 20;
+
+				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFireCharge, ShootVector);
+			}
+
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
@@ -154,7 +165,19 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_ARROW:
 		{
-			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkArrow);
+			if(Meta == E_META_DROPSPENSER_FACING_YP || Meta == E_META_DROPSPENSER_FACING_YM)
+			{
+				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkArrow, GetShootVector(a_Chunk) * 20);
+			}
+			else
+			{
+				Vector3d ShootVector = GetShootVector(a_Chunk);
+				ShootVector = ShootVector * 20;
+				ShootVector.y = ShootVector.y + 1;
+
+				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkArrow, ShootVector);
+			}
+
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
@@ -162,8 +185,19 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_SNOWBALL:
 		{
-			// Not working as there is no such entity yet?
-			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkSnowball);
+			if(Meta == E_META_DROPSPENSER_FACING_YP || Meta == E_META_DROPSPENSER_FACING_YM)
+			{
+				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkSnowball, GetShootVector(a_Chunk) * 20);
+			}
+			else
+			{
+				Vector3d ShootVector = GetShootVector(a_Chunk);
+				ShootVector = ShootVector * 20;
+				ShootVector.y = ShootVector.y + 1;
+
+				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkSnowball, ShootVector);
+			}
+
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
@@ -171,8 +205,19 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_EGG:
 		{
-			// Not working as there is no such entity yet?
-			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkEgg);
+			if(Meta == E_META_DROPSPENSER_FACING_YP || Meta == E_META_DROPSPENSER_FACING_YM)
+			{
+				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkEgg, GetShootVector(a_Chunk) * 20);
+			}
+			else
+			{
+				Vector3d ShootVector = GetShootVector(a_Chunk);
+				ShootVector = ShootVector * 20;
+				ShootVector.y = ShootVector.y + 1;
+
+				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkEgg, ShootVector);
+			}
+
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
@@ -180,7 +225,8 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_FIREWORK_ROCKET:
 		{
-			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFirework);
+			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFirework, GetShootVector(a_Chunk) * 0);
+
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
@@ -196,15 +242,14 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 
 
-void cDispenserEntity::SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_DispX, int & a_DispY, int & a_DispZ, cProjectileEntity::eKind a_kind)
+void cDispenserEntity::SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_DispX, int & a_DispY, int & a_DispZ, cProjectileEntity::eKind a_kind, Vector3d a_ShootVector)
 {
-	Vector3d Angle = GetShootVector(a_Chunk);
 	cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(a_DispX, a_DispZ);
 
 	double EntityX = 0.5 + (a_DispX + DispChunk->GetPosX() * cChunkDef::Width);
 	double EntityZ = 0.5 + (a_DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
 
-	m_World->CreateProjectile((double) EntityX, (double) a_DispY + 0.5, (double) EntityZ, a_kind, NULL, NULL, &Angle);
+	m_World->CreateProjectile((double) EntityX, (double) a_DispY + 0.5, (double) EntityZ, a_kind, NULL, NULL, &a_ShootVector);
 }
 
 
@@ -223,7 +268,7 @@ Vector3d cDispenserEntity::GetShootVector(cChunk & a_Chunk)
 			m.Init(Vector3d(), 0, 180, 0);
 			Look = m.Transform(Vector3d(0, 1, 0));
 
-			return Look * 20; // UP
+			return Look; // UP
 		}
 
 		case E_META_DROPSPENSER_FACING_YM:
@@ -231,7 +276,7 @@ Vector3d cDispenserEntity::GetShootVector(cChunk & a_Chunk)
 			m.Init(Vector3d(), 0, -360, 0);
 			Look = m.Transform(Vector3d(0, -1, 0));
 
-			return Look * 20;; // DOWN
+			return Look; // DOWN
 		}
 
 		case E_META_DROPSPENSER_FACING_XM: Direction = 90; break;	// WEST
@@ -243,10 +288,7 @@ Vector3d cDispenserEntity::GetShootVector(cChunk & a_Chunk)
 	m.Init(Vector3d(), 0, Direction, 0);
 	Look = m.Transform(Vector3d(0, 0, 1));
 
-	Vector3d Angle = Look * 20;
-	Angle.y = Angle.y + 1;
-
-	return Angle;
+	return Look;
 }
 
 
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index adbe2070c..558cf41c5 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -22,6 +22,12 @@ public:
 
 	static const char * GetClassStatic(void) { return "cDispenserEntity"; }
 
+	/** Spawns a projectile of the given kind in front of the dispenser */
+	void SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_DispX, int & a_DispY, int & a_DispZ, cProjectileEntity::eKind a_kind, Vector3d a_ShootVector); // tolua_export
+
+	/** Returns how to aim the projectile */
+	Vector3d GetShootVector(cChunk & a_Chunk); // tolua_export
+
 private:
 	// cDropSpenser overrides:
 	virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) override;
@@ -29,12 +35,6 @@ private:
 	/// If such a bucket can fit, adds it to m_Contents and returns true
 	bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType);
 
-	// Spawns a projectile of the given kind in front of the dispenser
-	void SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_DispX, int & a_DispY, int & a_DispZ, cProjectileEntity::eKind a_kind);
-
-	// Returns how to aim the projectile
-	Vector3d GetShootVector(cChunk & a_Chunk);
-
 	/// If the a_BlockInFront is liquidable and the empty bucket can fit, does the m_Contents processing and returns true
 	bool EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum);
 } ;  // tolua_export
-- 
cgit v1.2.3


From daae75b30b7d5e70a26e1518cd7c75988dbfdf9f Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Tue, 3 Jun 2014 17:21:38 +0200
Subject: - Cleaned up the code massively - Stopped using cChunk in the
 GetShootVector class. Parameter is now the Metadata of the block - Stopped
 using cChunk in the SpawnProjectileFromDispenser method now using coordinates
 and finding the chunk by itself. - Removed the matrix calculations from
 GetShootVector.

---
 src/BlockEntities/DispenserEntity.cpp | 113 +++++++++-------------------------
 src/BlockEntities/DispenserEntity.h   |   8 +--
 2 files changed, 31 insertions(+), 90 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 043a140e3..2ac7c085c 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -146,17 +146,11 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_FIRE_CHARGE:
 		{
-			if(Meta == E_META_DROPSPENSER_FACING_YP || Meta == E_META_DROPSPENSER_FACING_YM)
-			{
-				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFireCharge, GetShootVector(a_Chunk) * 20);
-			}
-			else
-			{
-				Vector3d ShootVector = GetShootVector(a_Chunk);
-				ShootVector = ShootVector * 20;
+			cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
+			int BlockX = (DispX + DispChunk->GetPosX() * cChunkDef::Width);
+			int BlockZ = (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
 
-				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFireCharge, ShootVector);
-			}
+			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkFireCharge, GetShootVector(Meta) * 20);
 
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
@@ -165,18 +159,11 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_ARROW:
 		{
-			if(Meta == E_META_DROPSPENSER_FACING_YP || Meta == E_META_DROPSPENSER_FACING_YM)
-			{
-				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkArrow, GetShootVector(a_Chunk) * 20);
-			}
-			else
-			{
-				Vector3d ShootVector = GetShootVector(a_Chunk);
-				ShootVector = ShootVector * 20;
-				ShootVector.y = ShootVector.y + 1;
+			cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
+			int BlockX = (DispX + DispChunk->GetPosX() * cChunkDef::Width);
+			int BlockZ = (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
 
-				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkArrow, ShootVector);
-			}
+			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkArrow, GetShootVector(Meta) * 20);
 
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
@@ -185,18 +172,11 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_SNOWBALL:
 		{
-			if(Meta == E_META_DROPSPENSER_FACING_YP || Meta == E_META_DROPSPENSER_FACING_YM)
-			{
-				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkSnowball, GetShootVector(a_Chunk) * 20);
-			}
-			else
-			{
-				Vector3d ShootVector = GetShootVector(a_Chunk);
-				ShootVector = ShootVector * 20;
-				ShootVector.y = ShootVector.y + 1;
+			cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
+			int BlockX = (DispX + DispChunk->GetPosX() * cChunkDef::Width);
+			int BlockZ = (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
 
-				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkSnowball, ShootVector);
-			}
+			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkSnowball, GetShootVector(Meta) * 20);
 
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
@@ -205,27 +185,18 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_EGG:
 		{
-			if(Meta == E_META_DROPSPENSER_FACING_YP || Meta == E_META_DROPSPENSER_FACING_YM)
-			{
-				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkEgg, GetShootVector(a_Chunk) * 20);
-			}
-			else
-			{
-				Vector3d ShootVector = GetShootVector(a_Chunk);
-				ShootVector = ShootVector * 20;
-				ShootVector.y = ShootVector.y + 1;
+			cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
+			int BlockX = (DispX + DispChunk->GetPosX() * cChunkDef::Width);
+			int BlockZ = (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
 
-				SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkEgg, ShootVector);
-			}
-
-			m_Contents.ChangeSlotCount(a_SlotNum, -1);
+			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkEgg, GetShootVector(Meta) * 20);
 
 			break;
 		}
 
 		case E_ITEM_FIREWORK_ROCKET:
 		{
-			SpawnProjectileFromDispenser(a_Chunk, DispX, DispY, DispZ, cProjectileEntity::pkFirework, GetShootVector(a_Chunk) * 0);
+			// TODO: Add the fireworks entity
 
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
@@ -242,60 +213,34 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 
 
-void cDispenserEntity::SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_DispX, int & a_DispY, int & a_DispZ, cProjectileEntity::eKind a_kind, Vector3d a_ShootVector)
+void cDispenserEntity::SpawnProjectileFromDispenser(int & a_BlockX, int & a_BlockY, int & a_BlockZ, cProjectileEntity::eKind a_kind, Vector3d a_ShootVector)
 {
-	cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(a_DispX, a_DispZ);
-
-	double EntityX = 0.5 + (a_DispX + DispChunk->GetPosX() * cChunkDef::Width);
-	double EntityZ = 0.5 + (a_DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
+	if(a_kind != E_ITEM_FIRE_CHARGE)
+		a_ShootVector.y = a_ShootVector.y + 1;
 
-	m_World->CreateProjectile((double) EntityX, (double) a_DispY + 0.5, (double) EntityZ, a_kind, NULL, NULL, &a_ShootVector);
+	m_World->CreateProjectile((double) a_BlockX + 0.5, (double) a_BlockY + 0.5, (double) a_BlockZ + 0.5, a_kind, NULL, NULL, &a_ShootVector);
 }
 
 
-
-Vector3d cDispenserEntity::GetShootVector(cChunk & a_Chunk)
+Vector3d cDispenserEntity::GetShootVector(NIBBLETYPE & a_Meta)
 {
-	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);
-	int Direction = 0;
-	Matrix4d m;
-	Vector3d Look;
-
-	switch (Meta)
+	switch(a_Meta)
 	{
-		case E_META_DROPSPENSER_FACING_YP:
-		{
-			m.Init(Vector3d(), 0, 180, 0);
-			Look = m.Transform(Vector3d(0, 1, 0));
+		case E_META_DROPSPENSER_FACING_YP:	return Vector3d(0, 1, 0);		// UP
+		case E_META_DROPSPENSER_FACING_YM:	return Vector3d(0, -1, 0);		// DOWN
 
-			return Look; // UP
-		}
-
-		case E_META_DROPSPENSER_FACING_YM:
-		{
-			m.Init(Vector3d(), 0, -360, 0);
-			Look = m.Transform(Vector3d(0, -1, 0));
-
-			return Look; // DOWN
-		}
+		case E_META_DROPSPENSER_FACING_XM:	return Vector3d(-1, 0, 0);		// WEST
+		case E_META_DROPSPENSER_FACING_XP:	return Vector3d(1, 0, 0);		// EAST
 
-		case E_META_DROPSPENSER_FACING_XM: Direction = 90; break;	// WEST
-		case E_META_DROPSPENSER_FACING_XP: Direction = 270; break;	// EAST
-		case E_META_DROPSPENSER_FACING_ZM: Direction = 180; break;
-		case E_META_DROPSPENSER_FACING_ZP: Direction = 0; break;
+		case E_META_DROPSPENSER_FACING_ZM:	return Vector3d(0, 0, -1);
+		case E_META_DROPSPENSER_FACING_ZP:	return Vector3d(0, 0, 1);
 	}
-
-	m.Init(Vector3d(), 0, Direction, 0);
-	Look = m.Transform(Vector3d(0, 0, 1));
-
-	return Look;
 }
 
 
 
 
 
-
 bool cDispenserEntity::ScoopUpLiquid(int a_SlotNum, short a_BucketItemType)
 {
 	cItem LiquidBucket(a_BucketItemType, 1);
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index 558cf41c5..5a2de7965 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -23,10 +23,10 @@ public:
 	static const char * GetClassStatic(void) { return "cDispenserEntity"; }
 
 	/** Spawns a projectile of the given kind in front of the dispenser */
-	void SpawnProjectileFromDispenser(cChunk & a_Chunk, int & a_DispX, int & a_DispY, int & a_DispZ, cProjectileEntity::eKind a_kind, Vector3d a_ShootVector); // tolua_export
+	void SpawnProjectileFromDispenser(int & a_BlockX, int & a_BlockY, int & a_BlockZ, cProjectileEntity::eKind a_kind, Vector3d a_ShootVector);
 
 	/** Returns how to aim the projectile */
-	Vector3d GetShootVector(cChunk & a_Chunk); // tolua_export
+	Vector3d GetShootVector(NIBBLETYPE & a_Meta);
 
 private:
 	// cDropSpenser overrides:
@@ -38,7 +38,3 @@ private:
 	/// If the a_BlockInFront is liquidable and the empty bucket can fit, does the m_Contents processing and returns true
 	bool EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum);
 } ;  // tolua_export
-
-
-
-
-- 
cgit v1.2.3


From 2ecf425c39452a96398346d114525eeff7cbf50a Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Tue, 3 Jun 2014 18:19:06 +0200
Subject: - Fixed a bug where I used the FireCharge ITEM instead of the
 Projectile ENUM

---
 src/BlockEntities/DispenserEntity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 2ac7c085c..904ab871b 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -215,7 +215,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 void cDispenserEntity::SpawnProjectileFromDispenser(int & a_BlockX, int & a_BlockY, int & a_BlockZ, cProjectileEntity::eKind a_kind, Vector3d a_ShootVector)
 {
-	if(a_kind != E_ITEM_FIRE_CHARGE)
+	if(a_kind != cProjectileEntity::pkFireCharge)
 		a_ShootVector.y = a_ShootVector.y + 1;
 
 	m_World->CreateProjectile((double) a_BlockX + 0.5, (double) a_BlockY + 0.5, (double) a_BlockZ + 0.5, a_kind, NULL, NULL, &a_ShootVector);
-- 
cgit v1.2.3


From c0716bfcf6cce720f41e98544eb4a4532a694a0a Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Tue, 3 Jun 2014 19:39:56 +0200
Subject: - Fixed a bug where I didn't return anything in the GetShootVector
 function. This was however passed as "working" by GCC.

---
 src/BlockEntities/DispenserEntity.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 904ab871b..bbf924417 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -235,6 +235,8 @@ Vector3d cDispenserEntity::GetShootVector(NIBBLETYPE & a_Meta)
 		case E_META_DROPSPENSER_FACING_ZM:	return Vector3d(0, 0, -1);
 		case E_META_DROPSPENSER_FACING_ZP:	return Vector3d(0, 0, 1);
 	}
+
+	return Vector3d(0, 1, 0);
 }
 
 
-- 
cgit v1.2.3


From 7993caa553e3317da21763226bf6bd5c2e965f8c Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Tue, 3 Jun 2014 19:43:15 +0200
Subject: - Fixed an issue where there were 2 "DispChunk"-s in the same
 function. Resused the initial one.

---
 src/BlockEntities/DispenserEntity.cpp | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index bbf924417..a4a660034 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -38,7 +38,10 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		// Would dispense into / interact with a non-loaded chunk, ignore the tick
 		return;
 	}
+
 	BLOCKTYPE DispBlock = DispChunk->GetBlock(DispX, DispY, DispZ);
+	int BlockX = (DispX + DispChunk->GetPosX() * cChunkDef::Width);
+	int BlockZ = (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
 
 	// Dispense the item:
 	switch (m_Contents.GetSlot(a_SlotNum).m_ItemType)
@@ -146,10 +149,6 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_FIRE_CHARGE:
 		{
-			cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
-			int BlockX = (DispX + DispChunk->GetPosX() * cChunkDef::Width);
-			int BlockZ = (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
-
 			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkFireCharge, GetShootVector(Meta) * 20);
 
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
@@ -159,10 +158,6 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_ARROW:
 		{
-			cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
-			int BlockX = (DispX + DispChunk->GetPosX() * cChunkDef::Width);
-			int BlockZ = (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
-
 			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkArrow, GetShootVector(Meta) * 20);
 
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
@@ -172,10 +167,6 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_SNOWBALL:
 		{
-			cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
-			int BlockX = (DispX + DispChunk->GetPosX() * cChunkDef::Width);
-			int BlockZ = (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
-
 			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkSnowball, GetShootVector(Meta) * 20);
 
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
@@ -185,12 +176,10 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 		case E_ITEM_EGG:
 		{
-			cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
-			int BlockX = (DispX + DispChunk->GetPosX() * cChunkDef::Width);
-			int BlockZ = (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
-
 			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkEgg, GetShootVector(Meta) * 20);
 
+			m_Contents.ChangeSlotCount(a_SlotNum, -1);
+
 			break;
 		}
 
-- 
cgit v1.2.3


From 2c103a713e0ce77ccb8b86c98e2571d5ba6dd9c0 Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Wed, 4 Jun 2014 12:35:45 +0200
Subject: - Fixed a lot of astethics

---
 src/BlockEntities/DispenserEntity.cpp | 26 +++++++++++++-------------
 src/BlockEntities/DispenserEntity.h   |  5 ++++-
 2 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index a4a660034..242ac4024 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -10,7 +10,6 @@
 #include "../Entities/ArrowEntity.h"
 #include "../Entities/FireChargeEntity.h"
 #include "../Entities/ProjectileEntity.h"
-#include "../Matrix4.h"
 
 
 
@@ -150,7 +149,6 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		case E_ITEM_FIRE_CHARGE:
 		{
 			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkFireCharge, GetShootVector(Meta) * 20);
-
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
@@ -159,7 +157,6 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		case E_ITEM_ARROW:
 		{
 			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkArrow, GetShootVector(Meta) * 20);
-
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
@@ -168,7 +165,6 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		case E_ITEM_SNOWBALL:
 		{
 			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkSnowball, GetShootVector(Meta) * 20);
-
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
@@ -177,7 +173,6 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		case E_ITEM_EGG:
 		{
 			SpawnProjectileFromDispenser(BlockX, DispY, BlockZ, cProjectileEntity::pkEgg, GetShootVector(Meta) * 20);
-
 			m_Contents.ChangeSlotCount(a_SlotNum, -1);
 
 			break;
@@ -202,10 +197,12 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 
 
-void cDispenserEntity::SpawnProjectileFromDispenser(int & a_BlockX, int & a_BlockY, int & a_BlockZ, cProjectileEntity::eKind a_kind, Vector3d a_ShootVector)
+void cDispenserEntity::SpawnProjectileFromDispenser(int & a_BlockX, int & a_BlockY, int & a_BlockZ, cProjectileEntity::eKind a_Kind, Vector3d a_ShootVector)
 {
-	if(a_kind != cProjectileEntity::pkFireCharge)
+	if( a_kind != cProjectileEntity::pkFireCharge )
+	{
 		a_ShootVector.y = a_ShootVector.y + 1;
+	}
 
 	m_World->CreateProjectile((double) a_BlockX + 0.5, (double) a_BlockY + 0.5, (double) a_BlockZ + 0.5, a_kind, NULL, NULL, &a_ShootVector);
 }
@@ -215,14 +212,14 @@ Vector3d cDispenserEntity::GetShootVector(NIBBLETYPE & a_Meta)
 {
 	switch(a_Meta)
 	{
-		case E_META_DROPSPENSER_FACING_YP:	return Vector3d(0, 1, 0);		// UP
-		case E_META_DROPSPENSER_FACING_YM:	return Vector3d(0, -1, 0);		// DOWN
+		case E_META_DROPSPENSER_FACING_YP: return Vector3d(0, 1, 0);		// UP
+		case E_META_DROPSPENSER_FACING_YM: return Vector3d(0, -1, 0);		// DOWN
 
-		case E_META_DROPSPENSER_FACING_XM:	return Vector3d(-1, 0, 0);		// WEST
-		case E_META_DROPSPENSER_FACING_XP:	return Vector3d(1, 0, 0);		// EAST
+		case E_META_DROPSPENSER_FACING_XM: return Vector3d(-1, 0, 0);		// WEST
+		case E_META_DROPSPENSER_FACING_XP: return Vector3d(1, 0, 0);		// EAST
 
-		case E_META_DROPSPENSER_FACING_ZM:	return Vector3d(0, 0, -1);
-		case E_META_DROPSPENSER_FACING_ZP:	return Vector3d(0, 0, 1);
+		case E_META_DROPSPENSER_FACING_ZM: return Vector3d(0, 0, -1);
+		case E_META_DROPSPENSER_FACING_ZP: return Vector3d(0, 0, 1);
 	}
 
 	return Vector3d(0, 1, 0);
@@ -290,3 +287,6 @@ bool cDispenserEntity::EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum
 	m_Contents.AddItem(EmptyBucket);
 	return true;
 }
+
+
+
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index 5a2de7965..9410a1129 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -23,7 +23,7 @@ public:
 	static const char * GetClassStatic(void) { return "cDispenserEntity"; }
 
 	/** Spawns a projectile of the given kind in front of the dispenser */
-	void SpawnProjectileFromDispenser(int & a_BlockX, int & a_BlockY, int & a_BlockZ, cProjectileEntity::eKind a_kind, Vector3d a_ShootVector);
+	void SpawnProjectileFromDispenser(int & a_BlockX, int & a_BlockY, int & a_BlockZ, cProjectileEntity::eKind a_Kind, Vector3d a_ShootVector);
 
 	/** Returns how to aim the projectile */
 	Vector3d GetShootVector(NIBBLETYPE & a_Meta);
@@ -38,3 +38,6 @@ private:
 	/// If the a_BlockInFront is liquidable and the empty bucket can fit, does the m_Contents processing and returns true
 	bool EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum);
 } ;  // tolua_export
+
+
+
-- 
cgit v1.2.3


From e5b345a9c95225c18728f5692bf12ffae82ba4cd Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Wed, 4 Jun 2014 12:37:51 +0200
Subject: - Fixed variable names in a function.

---
 src/BlockEntities/DispenserEntity.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 242ac4024..7b468bdea 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -199,12 +199,12 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 void cDispenserEntity::SpawnProjectileFromDispenser(int & a_BlockX, int & a_BlockY, int & a_BlockZ, cProjectileEntity::eKind a_Kind, Vector3d a_ShootVector)
 {
-	if( a_kind != cProjectileEntity::pkFireCharge )
+	if( a_Kind != cProjectileEntity::pkFireCharge )
 	{
 		a_ShootVector.y = a_ShootVector.y + 1;
 	}
 
-	m_World->CreateProjectile((double) a_BlockX + 0.5, (double) a_BlockY + 0.5, (double) a_BlockZ + 0.5, a_kind, NULL, NULL, &a_ShootVector);
+	m_World->CreateProjectile((double) a_BlockX + 0.5, (double) a_BlockY + 0.5, (double) a_BlockZ + 0.5, a_Kind, NULL, NULL, &a_ShootVector);
 }
 
 
-- 
cgit v1.2.3


From 852e162f95742d5c5454e458ed7883e4b0209a73 Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Wed, 4 Jun 2014 12:40:01 +0200
Subject: - Removed the code that removed fireworks from a dispenser even
 thought they weren't launched.

---
 src/BlockEntities/DispenserEntity.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 7b468bdea..475125719 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -181,9 +181,6 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 		case E_ITEM_FIREWORK_ROCKET:
 		{
 			// TODO: Add the fireworks entity
-
-			m_Contents.ChangeSlotCount(a_SlotNum, -1);
-
 			break;
 		}
 
-- 
cgit v1.2.3


From 720ae4f75777a8286014e9934429ab248df6d9e9 Mon Sep 17 00:00:00 2001
From: JoannisO <Joannis.Orlandos@gmail.com>
Date: Thu, 5 Jun 2014 12:26:27 +0200
Subject: - Fixed a lot of alignment

---
 src/BlockEntities/DispenserEntity.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index 475125719..97e25ca6d 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -196,7 +196,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
 
 void cDispenserEntity::SpawnProjectileFromDispenser(int & a_BlockX, int & a_BlockY, int & a_BlockZ, cProjectileEntity::eKind a_Kind, Vector3d a_ShootVector)
 {
-	if( a_Kind != cProjectileEntity::pkFireCharge )
+	if (a_Kind != cProjectileEntity::pkFireCharge)
 	{
 		a_ShootVector.y = a_ShootVector.y + 1;
 	}
@@ -209,14 +209,14 @@ Vector3d cDispenserEntity::GetShootVector(NIBBLETYPE & a_Meta)
 {
 	switch(a_Meta)
 	{
-		case E_META_DROPSPENSER_FACING_YP: return Vector3d(0, 1, 0);		// UP
-		case E_META_DROPSPENSER_FACING_YM: return Vector3d(0, -1, 0);		// DOWN
+		case E_META_DROPSPENSER_FACING_YP: return Vector3d( 0,  1,  0);	 // UP
+		case E_META_DROPSPENSER_FACING_YM: return Vector3d( 0, -1,  0);	 // DOWN
 
-		case E_META_DROPSPENSER_FACING_XM: return Vector3d(-1, 0, 0);		// WEST
-		case E_META_DROPSPENSER_FACING_XP: return Vector3d(1, 0, 0);		// EAST
+		case E_META_DROPSPENSER_FACING_XM: return Vector3d(-1,  0,  0);	 // WEST
+		case E_META_DROPSPENSER_FACING_XP: return Vector3d( 1,  0,  0);	 // EAST
 
-		case E_META_DROPSPENSER_FACING_ZM: return Vector3d(0, 0, -1);
-		case E_META_DROPSPENSER_FACING_ZP: return Vector3d(0, 0, 1);
+		case E_META_DROPSPENSER_FACING_ZM: return Vector3d( 0,  0, -1);
+		case E_META_DROPSPENSER_FACING_ZP: return Vector3d( 0,  0,  1);
 	}
 
 	return Vector3d(0, 1, 0);
-- 
cgit v1.2.3